diff --git a/doc/languages-frameworks/agda.section.md b/doc/languages-frameworks/agda.section.md index ae126b16cad79..53fcd8971005d 100644 --- a/doc/languages-frameworks/agda.section.md +++ b/doc/languages-frameworks/agda.section.md @@ -125,11 +125,10 @@ To install Agda without GHC, use `ghc = null;`. ## Writing Agda packages {#writing-agda-packages} -To write a nix derivation for an Agda library, first check that the library has a `*.agda-lib` file. +To write a nix derivation for an Agda library, first check that the library has a (single) `*.agda-lib` file. A derivation can then be written using `agdaPackages.mkDerivation`. This has similar arguments to `stdenv.mkDerivation` with the following additions: -* `everythingFile` can be used to specify the location of the `Everything.agda` file, defaulting to `./Everything.agda`. If this file does not exist then either it should be patched in or the `buildPhase` should be overridden (see below). * `libraryName` should be the name that appears in the `*.agda-lib` file, defaulting to `pname`. * `libraryFile` should be the file name of the `*.agda-lib` file, defaulting to `${libraryName}.agda-lib`. @@ -150,9 +149,9 @@ agdaPackages.mkDerivation { ### Building Agda packages {#building-agda-packages} -The default build phase for `agdaPackages.mkDerivation` runs `agda` on the `Everything.agda` file. +The default build phase for `agdaPackages.mkDerivation` runs `agda --build-library`. If something else is needed to build the package (e.g. `make`) then the `buildPhase` should be overridden. -Additionally, a `preBuild` or `configurePhase` can be used if there are steps that need to be done prior to checking the `Everything.agda` file. +Additionally, a `preBuild` or `configurePhase` can be used if there are steps that need to be done prior to checking the library. `agda` and the Agda libraries contained in `buildInputs` are made available during the build phase. ### Installing Agda packages {#installing-agda-packages} @@ -180,7 +179,7 @@ the Agda package set is small and can (still) be maintained by hand. ### Adding Agda packages to Nixpkgs {#adding-agda-packages-to-nixpkgs} -To add an Agda package to `nixpkgs`, the derivation should be written to `pkgs/development/libraries/agda/${library-name}/` and an entry should be added to `pkgs/top-level/agda-packages.nix`. Here it is called in a scope with access to all other Agda libraries, so the top line of the `default.nix` can look like: +To add an Agda package to `nixpkgs`, the derivation should be written to `pkgs/development/libraries/agda/${library-name}/default.nix` and an entry should be added to `pkgs/top-level/agda-packages.nix`. Here it is called in a scope with access to all other Agda libraries, so the derivation could look like: ```nix { @@ -188,37 +187,21 @@ To add an Agda package to `nixpkgs`, the derivation should be written to `pkgs/d standard-library, fetchFromGitHub, }: -{ } -``` - -Note that the derivation function is called with `mkDerivation` set to `agdaPackages.mkDerivation`, therefore you -could use a similar set as in your `default.nix` from [Writing Agda Packages](#writing-agda-packages) with -`agdaPackages.mkDerivation` replaced with `mkDerivation`. -Here is an example skeleton derivation for iowa-stdlib: - -```nix mkDerivation { - version = "1.5.0"; - pname = "iowa-stdlib"; - + pname = "my-library"; + version = "1.0"; src = <...>; - - libraryFile = ""; - libraryName = "IAL-1.3"; - - buildPhase = '' - runHook preBuild - - patchShebangs find-deps.sh - make - - runHook postBuild - ''; + buildInputs = [ standard-library ]; + meta = <...>; } ``` -This library has a file called `.agda-lib`, and so we give an empty string to `libraryFile` as nothing precedes `.agda-lib` in the filename. This file contains `name: IAL-1.3`, and so we let `libraryName = "IAL-1.3"`. This library does not use an `Everything.agda` file and instead has a Makefile, so there is no need to set `everythingFile` and we set a custom `buildPhase`. +You can look at other files under `pkgs/development/libraries/agda/` for more inspiration. + +Note that the derivation function is called with `mkDerivation` set to `agdaPackages.mkDerivation`, therefore you +could use a similar set as in your `default.nix` from [Writing Agda Packages](#writing-agda-packages) with +`agdaPackages.mkDerivation` replaced with `mkDerivation`. When writing an Agda package it is essential to make sure that no `.agda-lib` file gets added to the store as a single file (for example by using `writeText`). This causes Agda to think that the nix store is a Agda library and it will attempt to write to it whenever it typechecks something. See [https://github.com/agda/agda/issues/4613](https://github.com/agda/agda/issues/4613). @@ -226,7 +209,7 @@ In the pull request adding this library, you can test whether it builds correctly by writing in a comment: ``` -@ofborg build agdaPackages.iowa-stdlib +@ofborg build agdaPackages.my-library ``` ### Maintaining Agda packages {#agda-maintaining-packages} diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index bf496bb33a9f9..e248ee6ec7053 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -27,11 +27,12 @@ - `space-orbit` package has been removed due to lack of upstream maintenance. Debian upstream stopped tracking it in 2011. - Derivations setting both `separateDebugInfo` and one of `allowedReferences`, `allowedRequistes`, `disallowedReferences` or `disallowedRequisites` must now set `__structuredAttrs` to `true`. The effect of reference whitelisting or blacklisting will be disabled on the `debug` output created by `separateDebugInfo`. - - `victoriametrics` no longer contains VictoriaLogs components. These have been separated into the new package `victorialogs`. - `mx-puppet-discord` was removed from nixpkgs along with its NixOS module as it was unmaintained and was the only user of sha1 hashes in tree. +- `kbd` package's `outputs` now include a `man` and `scripts` outputs. The `unicode_start` and `unicode_stop` Bash scripts are now part of the `scripts` output, allowing most usages of the `kbd` package to not pull in `bash`. + - `conduwuit` was removed due to upstream ceasing development and deleting their repository. For existing data, a migration to `matrix-conduit`, `matrix-continuwuity` or `matrix-tuwunel` may be possible. - `gnome-keyring` no longer ships with an SSH agent anymore because it has been deprecated upstream. You should use `gcr_4` instead, which provides the same features. More information on why this was done can be found on [the relevant GCR upstream PR](https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/67). @@ -109,6 +110,8 @@ - `meta.mainProgram`: Changing this `meta` entry can lead to a package rebuild due to being used to determine the `NIX_MAIN_PROGRAM` environment variable. +- `lisp-modules` were brought in sync with the [June 2025 Quicklisp release](http://blog.quicklisp.org/2025/07/june-2025-quicklisp-dist-now-available.html). + - `searx` was updated to use `envsubst` instead of `sed` for parsing secrets from environment variables. If your previous configuration included a secret reference like `server.secret_key = "@SEARX_SECRET_KEY@"`, you must migrate to the new envsubst syntax: `server.secret_key = "$SEARX_SECRET_KEY"`. diff --git a/lib/default.nix b/lib/default.nix index 875a1b9bb3efd..d45e6de0c33f2 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -287,7 +287,6 @@ let init crossLists unique - uniqueStrings allUnique intersectLists subtractLists diff --git a/lib/licenses.nix b/lib/licenses.nix index 67a2b4c2f0408..4e42b57a4b13e 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -713,6 +713,16 @@ lib.mapAttrs mkLicense ( spdxId = "HPND-sell-variant"; }; + hpndDoc = { + fullName = "Historical Permission Notice and Disclaimer - documentation variant"; + spdxId = "HPND-doc"; + }; + + hpndDocSell = { + fullName = "Historical Permission Notice and Disclaimer - documentation sell variant"; + spdxId = "HPND-doc-sell"; + }; + hpndUc = { spdxId = "HPND-UC"; fullName = "Historical Permission Notice and Disclaimer - University of California variant"; @@ -1305,6 +1315,14 @@ lib.mapAttrs mkLicense ( # Marc Weber (small nix contributor) }; + tekHvcLicense = { + fullName = "TekHVC License"; + url = "https://gitlab.freedesktop.org/xorg/lib/libx11/-/blob/7f8305c779ac6948d7261764f5ffb8ae9aa975b1/COPYING#L138-171"; + # TODO: add spdxId when it gets accepted to spdx + # https://tools.spdx.org/app/license_requests/458 + # https://github.com/spdx/license-list-XML/issues/2757 + }; + tsl = { shortName = "TSL"; fullName = "Timescale License Agreegment"; diff --git a/lib/lists.nix b/lib/lists.nix index 226e264176a0a..ec0fe22d2afa2 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -11,7 +11,7 @@ let warn pipe ; - inherit (lib.attrsets) mapAttrs attrNames; + inherit (lib.attrsets) mapAttrs; inherit (lib) max; in rec { @@ -1839,10 +1839,6 @@ rec { /** Remove duplicate elements from the `list`. O(n^2) complexity. - :::{.note} - If the list only contains strings and order is not important, the complexity can be reduced to O(n log n) by using [`lib.lists.uniqueStrings`](#function-library-lib.lists.uniqueStrings) instead. - ::: - # Inputs `list` @@ -1868,43 +1864,6 @@ rec { */ unique = foldl' (acc: e: if elem e acc then acc else acc ++ [ e ]) [ ]; - /** - Removes duplicate strings from the `list`. O(n log n) complexity. - - :::{.note} - Order is not preserved. - - All elements of the list must be strings without context. - - This function fails when the list contains a non-string element or a [string with context](https://nix.dev/manual/nix/latest/language/string-context.html). - In that case use [`lib.lists.unique`](#function-library-lib.lists.unique) instead. - ::: - - # Inputs - - `list` - - : List of strings - - # Type - - ``` - uniqueStrings :: [ String ] -> [ String ] - ``` - - # Examples - :::{.example} - ## `lib.lists.uniqueStrings` usage example - - ```nix - uniqueStrings [ "foo" "bar" "foo" ] - => [ "bar" "foo" ] # order is not preserved - ``` - - ::: - */ - uniqueStrings = list: attrNames (groupBy id list); - /** Check if list contains only unique elements. O(n^2) complexity. diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 60fa5832efa98..77247d269808e 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -563,6 +563,51 @@ let # See https://go.dev/wiki/GoArm GOARM = toString (lib.intersectLists [ (final.parsed.cpu.version or "") ] [ "5" "6" "7" ]); }; + + node = { + # See these locations for a list of known architectures/platforms: + # - https://nodejs.org/api/os.html#osarch + # - https://nodejs.org/api/os.html#osplatform + arch = + if final.isAarch then + "arm" + lib.optionalString final.is64bit "64" + else if final.isMips32 then + "mips" + lib.optionalString final.isLittleEndian "el" + else if final.isMips64 && final.isLittleEndian then + "mips64el" + else if final.isPower then + "ppc" + lib.optionalString final.is64bit "64" + else if final.isx86_64 then + "x64" + else if final.isx86_32 then + "ia32" + else if final.isS390x then + "s390x" + else if final.isRiscV64 then + "riscv64" + else if final.isLoongArch64 then + "loong64" + else + null; + + platform = + if final.isAndroid then + "android" + else if final.isDarwin then + "darwin" + else if final.isFreeBSD then + "freebsd" + else if final.isLinux then + "linux" + else if final.isOpenBSD then + "openbsd" + else if final.isSunOS then + "sunos" + else if final.isWindows then + "win32" + else + null; + }; }; in assert final.useAndroidPrebuilt -> final.isAndroid; diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 880396a0de72b..22188b4b3bae5 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -113,7 +113,6 @@ let toIntBase10 toShellVars types - uniqueStrings updateManyAttrsByPath versions xor @@ -1941,69 +1940,6 @@ runTests { expected = false; }; - testUniqueStrings_empty = { - expr = uniqueStrings [ ]; - expected = [ ]; - }; - testUniqueStrings_singles = { - expr = uniqueStrings [ - "all" - "unique" - "already" - ]; - expected = [ - "all" - "already" - "unique" - ]; - }; - testUniqueStrings_allDuplicates = { - expr = uniqueStrings [ - "dup" - "dup" - "dup" - ]; - expected = [ "dup" ]; - }; - testUniqueStrings_some_duplicates = { - expr = uniqueStrings [ - "foo" - "foo" - "bar" - "bar" - "baz" - ]; - expected = [ - "bar" - "baz" - "foo" - ]; - }; - testUniqueStrings_unicode = { - expr = uniqueStrings [ - "café" - "@" - "#" - "@" - "#" - "$" - "😎" - "😎" - "🙃" - "" - "" - ]; - expected = [ - "" - "#" - "$" - "@" - "café" - "😎" - "🙃" - ]; - }; - # ATTRSETS testConcatMapAttrs = { diff --git a/maintainers/scripts/haskell/merge-and-open-pr.sh b/maintainers/scripts/haskell/merge-and-open-pr.sh index ea985acfc9a0b..e5f5aa5e28319 100755 --- a/maintainers/scripts/haskell/merge-and-open-pr.sh +++ b/maintainers/scripts/haskell/merge-and-open-pr.sh @@ -80,13 +80,7 @@ echo "Merging https://github.com/NixOS/nixpkgs/pull/${curr_haskell_updates_pr_nu gh pr merge --repo NixOS/nixpkgs --merge "$curr_haskell_updates_pr_num" # Update stackage, Hackage hashes, and regenerate Haskell package set -echo "Updating Stackage..." -./maintainers/scripts/haskell/update-stackage.sh --do-commit -echo "Updating Hackage hashes..." -./maintainers/scripts/haskell/update-hackage.sh --do-commit -echo "Regenerating Hackage packages..." -# Using fast here because after the hackage-update eval errors will likely break the transitive dependencies check. -./maintainers/scripts/haskell/regenerate-hackage-packages.sh --fast --do-commit +./maintainers/scripts/haskell/update-package-set.sh # Push these new commits to the haskell-updates branch echo "Pushing commits just created to the remote $push_remote/haskell-updates branch..." diff --git a/maintainers/scripts/haskell/regenerate-hackage-packages.sh b/maintainers/scripts/haskell/regenerate-hackage-packages.sh index 58bb433f010ea..585847094f94f 100755 --- a/maintainers/scripts/haskell/regenerate-hackage-packages.sh +++ b/maintainers/scripts/haskell/regenerate-hackage-packages.sh @@ -107,10 +107,10 @@ nixfmt pkgs/development/haskell-modules/hackage-packages.nix if [[ "$DO_COMMIT" -eq 1 ]]; then git add pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml git add pkgs/development/haskell-modules/hackage-packages.nix -git commit -F - << EOF +git commit --edit -F - << EOF haskellPackages: regenerate package set based on current config -This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh +(generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh) EOF fi diff --git a/maintainers/scripts/haskell/update-hackage.sh b/maintainers/scripts/haskell/update-hackage.sh index 27a77d5db9df9..e6cf7fa2bea79 100755 --- a/maintainers/scripts/haskell/update-hackage.sh +++ b/maintainers/scripts/haskell/update-hackage.sh @@ -1,10 +1,34 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p curl jq git gnused -I nixpkgs=. - -# See regenerate-hackage-packages.sh for details on the purpose of this script. +# +# SYNOPSIS +# +# Update Hackage index and hashes data exposed via pkgs.all-cabal-hashes. +# +# DESCRIPTION +# +# Find latest revision of the commercialhaskell/all-cabal-hashes repository's +# hackage branch and update pkgs/data/misc/hackage/pin.json accordingly. +# +# This data is used by hackage2nix to generate hackage-packages.nix. Since +# hackage2nix uses the latest version of a package unless an explicit +# constraint is configured, running this script indirectly updates packages +# (when hackage2nix is executed afterwards). +# +# Prints a version difference to stdout if the pin has been updated, nothing +# otherwise. +# +# EXIT STATUS +# +# Always exit with zero (even if nothing changed) unless there was an error. set -euo pipefail +if [[ "${1:-}" == "--do-commit" ]]; then + echo "$0: --do-commit is no longer supported. Use update-package-set.sh instead." + exit 100 +fi + pin_file=pkgs/data/misc/hackage/pin.json current_commit="$(jq -r .commit $pin_file)" old_date="$(jq -r .msg $pin_file | sed 's/Update from Hackage at //')" @@ -14,6 +38,7 @@ commit_msg="$(echo "$git_info" | jq -r .commit.commit.message)" new_date="$(echo "$commit_msg" | sed 's/Update from Hackage at //')" if [ "$current_commit" != "$head_commit" ]; then + echo "Updating all-cabal-hashes from $old_date to $new_date" >&2 url="https://github.com/commercialhaskell/all-cabal-hashes/archive/$head_commit.tar.gz" hash="$(nix-prefetch-url "$url")" jq -n \ @@ -23,13 +48,9 @@ if [ "$current_commit" != "$head_commit" ]; then --arg commit_msg "$commit_msg" \ '{commit: $commit, url: $url, sha256: $hash, msg: $commit_msg}' \ > $pin_file +else + echo "No new all-cabal-hashes version" >&2 + exit 0 fi -if [[ "${1:-}" == "--do-commit" ]]; then -git add pkgs/data/misc/hackage/pin.json -git commit -F - << EOF -all-cabal-hashes: $old_date -> $new_date - -This commit has been generated by maintainers/scripts/haskell/update-hackage.sh -EOF -fi +echo "$old_date -> $new_date" diff --git a/maintainers/scripts/haskell/update-package-set.sh b/maintainers/scripts/haskell/update-package-set.sh new file mode 100755 index 0000000000000..94ccf2827555f --- /dev/null +++ b/maintainers/scripts/haskell/update-package-set.sh @@ -0,0 +1,53 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash +#! nix-shell -p git -I nixpkgs=. +set -euo pipefail + +filesToStage=( + 'pkgs/data/misc/hackage/pin.json' + 'pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml' + 'pkgs/development/haskell-modules/hackage-packages.nix' +) + +if ! git diff --quiet --cached; then + echo "Please commit staged changes before running $0" >&2 + exit 100 +fi + +if ! git diff --quiet -- "${filesToStage[@]}"; then + echo -n "Please commit your changes to the following files before running $0: " >&2 + echo "${filesToStage[@]}" >&2 + exit 100 +fi + +stackage_diff="$(./maintainers/scripts/haskell/update-stackage.sh)" +hackage_diff="$(./maintainers/scripts/haskell/update-hackage.sh)" +readonly stackage_diff hackage_diff + +# Prefer Stackage version diff in the commit header, fall back to Hackage +if [[ -n "$stackage_diff" ]]; then + commit_message="haskellPackages: stackage $stackage_diff" + if [[ -n "$hackage_diff" ]]; then + commit_message="$commit_message + +all-cabal-hashes: $hackage_diff" + fi +elif [[ -n "$hackage_diff" ]]; then + commit_message="haskellPackages: hackage $hackage_diff + +all-cabal-hashes: $hackage_diff" +else + echo "Neither Hackage nor Stackage changed. Nothing to do." >&2 + exit 0 +fi + +commit_message="$commit_message + +(generated by maintainers/scripts/haskell/update-package-set.sh)" + +# Using fast here because after the hackage-update eval errors will likely break the transitive dependencies check. +./maintainers/scripts/haskell/regenerate-hackage-packages.sh --fast + +# A --do-commit flag probably doesn't make much sense +git add -- "${filesToStage[@]}" +git commit -m "$commit_message" diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh index 8401ec1f21087..5a91d3dc9cbc7 100755 --- a/maintainers/scripts/haskell/update-stackage.sh +++ b/maintainers/scripts/haskell/update-stackage.sh @@ -1,9 +1,36 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p curl jq git gnused gnugrep -I nixpkgs=. # shellcheck shell=bash +# +# SYNOPSIS +# +# Update version constraints in hackage2nix config file from Stackage. +# +# DESCRIPTION +# +# Fetches the latest snapshot of the configured Stackage solver which is +# configured via the SOLVER (either LTS or Nightly) and VERSION variables in +# the script. +# +# VERSION is only applicable if SOLVER is LTS. SOLVER=LTS and VERSION=22 +# will cause update-stackage.sh to fetch the latest LTS-22.XX version. +# If empty, the latest version of the solver is used. +# +# If the configuration file has been updated, update-stackage.sh prints a +# version difference to stdout, e.g. 23.11 -> 23.13. Otherwise, stdout remains +# empty. +# +# EXIT STATUS +# +# Always exit with zero (even if nothing changed) unless there was an error. set -eu -o pipefail +if [[ "${1:-}" == "--do-commit" ]]; then + echo "$0: --do-commit is no longer supported. Use update-package-set.sh instead." + exit 100 +fi + # Stackage solver to use, LTS or Nightly # (should be capitalized like the display name) SOLVER=LTS @@ -31,11 +58,11 @@ old_version=$(grep '^# Stackage' $stackage_config | sed -e 's/.\+ \([A-Za-z]\+ [ version="$SOLVER $(sed -rn "s/^--.*http:..(www.)?stackage.org.snapshot.$(toLower "$SOLVER")-//p" "$tmpfile")" if [[ "$old_version" == "$version" ]]; then - echo "No new stackage version" + echo "No new stackage version" >&2 exit 0 # Nothing to do fi -echo "Updating Stackage from $old_version to $version." +echo "Updating Stackage from $old_version to $version." >&2 # Create a simple yaml version of the file. sed -r \ @@ -78,11 +105,4 @@ sed -r \ # ShellCheck: latest version of command-line dev tool. # Agda: The Agda community is fast-moving; we strive to always include the newest versions of Agda and the Agda packages in nixpkgs. -if [[ "${1:-}" == "--do-commit" ]]; then -git add $stackage_config -git commit -F - << EOF -haskellPackages: stackage $old_version -> $version - -This commit has been generated by maintainers/scripts/haskell/update-stackage.sh -EOF -fi +echo "$old_version -> $version" diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index 774d0edbe6597..fcbb5d6017a13 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -166,6 +166,8 @@ - `command-not-found` package is now disabled by default; it works only for nix-channels based systems, and requires setup for it to work. +- The systemd target `kbrequest.target` is now unset by default, instead of being forcibly symlinked to `rescue.target`. In case you were relying on this behavior (Alt + ArrowUp on the tty causing the current target to be changed to `rescue.target`), you can restore it by setting `systemd.targets.rescue.aliases = [ "kbrequest.target" ];` in your configuration. + ## Other Notable Changes {#sec-release-25.11-notable-changes} diff --git a/nixos/lib/systemd-lib.nix b/nixos/lib/systemd-lib.nix index 97a797b47b0f0..03d0705b3e929 100644 --- a/nixos/lib/systemd-lib.nix +++ b/nixos/lib/systemd-lib.nix @@ -524,7 +524,6 @@ rec { # Stupid misc. symlinks. ln -s ${cfg.defaultUnit} $out/default.target ln -s ${cfg.ctrlAltDelUnit} $out/ctrl-alt-del.target - ln -s rescue.target $out/kbrequest.target ln -s ../remote-fs.target $out/multi-user.target.wants/ ''} diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 198251bf34e32..61b39cb8e2cf0 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -1311,7 +1311,7 @@ let name = "lastlog"; enable = cfg.updateWtmp; control = "required"; - modulePath = "${package}/lib/security/pam_lastlog.so"; + modulePath = "${pkgs.util-linux.lastlog}/lib/security/pam_lastlog2.so"; settings = { silent = true; }; @@ -2311,6 +2311,29 @@ in environment.etc = lib.mapAttrs' makePAMService enabledServices; + systemd = + lib.optionalAttrs + (lib.any (service: service.updateWtmp) (lib.attrValues config.security.pam.services)) + { + tmpfiles.packages = [ pkgs.util-linux.lastlog ]; # /lib/tmpfiles.d/lastlog2-tmpfiles.conf + services.lastlog2-import = { + enable = true; + wantedBy = [ "default.target" ]; + after = [ + "local-fs.target" + "systemd-tmpfiles-setup.service" + ]; + # TODO: ${pkgs.util-linux.lastlog}/lib/systemd/system/lastlog2-import.service + # uses unpatched /usr/bin/mv, needs to be fixed on staging + # in the meantime, use a service drop-in here + serviceConfig.ExecStartPost = [ + "" + "${lib.getExe' pkgs.coreutils "mv"} /var/log/lastlog /var/log/lastlog.migrated" + ]; + }; + packages = [ pkgs.util-linux.lastlog ]; # lib/systemd/system/lastlog2-import.service + }; + security.pam.services = { other.text = '' auth required pam_warn.so diff --git a/nixos/modules/system/boot/systemd/sysupdate.nix b/nixos/modules/system/boot/systemd/sysupdate.nix index 4c71b17149549..0f8bc2dd966b1 100644 --- a/nixos/modules/system/boot/systemd/sysupdate.nix +++ b/nixos/modules/system/boot/systemd/sysupdate.nix @@ -11,7 +11,14 @@ let format = pkgs.formats.ini { listToValue = toString; }; - definitionsDirectory = utils.systemdUtils.lib.definitions "sysupdate.d" format cfg.transfers; + # TODO: Switch back to using utils.systemdUtils.lib.definitions once + # https://github.com/systemd/systemd/pull/38187 is resolved. Also ensure + # utils.systemdUtils.lib.definitions is capable of setting a custom file + # suffix. + sysupdateTransfers = lib.mapAttrs' (name: value: { + name = "sysupdate.d/${name}.transfer"; + value.source = format.generate "${name}.transfer" value; + }) cfg.transfers; in { options.systemd.sysupdate = { @@ -114,14 +121,23 @@ in }; config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = config.systemd.package.withSysupdate; + message = "Cannot enable systemd-sysupdate with systemd package not built with sysupdate support"; + } + ]; systemd.additionalUpstreamSystemUnits = [ "systemd-sysupdate.service" "systemd-sysupdate.timer" "systemd-sysupdate-reboot.service" "systemd-sysupdate-reboot.timer" + "systemd-sysupdated.service" ]; + systemd.services.systemd-sysupdated.aliases = [ "dbus-org.freedesktop.sysupdate1.service" ]; + systemd.timers = { "systemd-sysupdate" = { wantedBy = [ "timers.target" ]; @@ -133,8 +149,11 @@ in }; }; - environment.etc."sysupdate.d".source = definitionsDirectory; + environment.etc = sysupdateTransfers; }; - meta.maintainers = with lib.maintainers; [ nikstur ]; + meta.maintainers = with lib.maintainers; [ + nikstur + jmbaur + ]; } diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 9631036f035ce..e6c5d24d6693c 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1135,6 +1135,7 @@ in packagekit = runTest ./packagekit.nix; paisa = runTest ./paisa.nix; pam-file-contents = runTest ./pam/pam-file-contents.nix; + pam-lastlog = runTest ./pam/pam-lastlog.nix; pam-oath-login = runTest ./pam/pam-oath-login.nix; pam-u2f = runTest ./pam/pam-u2f.nix; pam-ussh = runTest ./pam/pam-ussh.nix; diff --git a/nixos/tests/pam/pam-lastlog.nix b/nixos/tests/pam/pam-lastlog.nix new file mode 100644 index 0000000000000..cefc8a3d4e450 --- /dev/null +++ b/nixos/tests/pam/pam-lastlog.nix @@ -0,0 +1,30 @@ +{ ... }: + +{ + name = "pam-lastlog"; + + nodes.machine = + { ... }: + { + # we abuse run0 for a quick login as root as to not require setting up accounts and passwords + security.pam.services.systemd-run0 = { + updateWtmp = true; # enable lastlog + }; + }; + + testScript = '' + with subtest("Test legacy lastlog import"): + # create old lastlog file to test import + # empty = nothing will actually be imported, but the service will run + machine.succeed("touch /var/log/lastlog") + machine.wait_for_unit("lastlog2-import.service") + machine.succeed("journalctl -b --grep 'Starting Import lastlog data into lastlog2 database'") + machine.succeed("stat /var/log/lastlog.migrated") + + with subtest("Test lastlog entries are created by logins"): + machine.wait_for_unit("multi-user.target") + machine.succeed("run0 --pty true") # perform full login + print(machine.succeed("lastlog2 --active --user root")) + machine.succeed("stat /var/lib/lastlog/lastlog2.db") + ''; +} diff --git a/nixos/tests/systemd-sysupdate.nix b/nixos/tests/systemd-sysupdate.nix index 059f2db5df413..5ab5da7381716 100644 --- a/nixos/tests/systemd-sysupdate.nix +++ b/nixos/tests/systemd-sysupdate.nix @@ -1,7 +1,7 @@ # Tests downloading a signed update artifact from a server to a target machine. # This test does not rely on the `systemd.timer` units provided by the -# `systemd-sysupdate` module but triggers the `systemd-sysupdate` service -# manually to make the test more robust. +# `systemd-sysupdate` module but triggers the `updatectl` tool directly to +# demonstrate how to initiate updates manually. { lib, pkgs, ... }: @@ -62,7 +62,8 @@ in testScript = '' server.wait_for_unit("nginx.service") - target.succeed("systemctl start systemd-sysupdate") + print(target.succeed("updatectl list")) + target.succeed("updatectl update") assert "nixos" in target.wait_until_succeeds("cat /nixos_1.txt", timeout=5) ''; } diff --git a/pkgs/applications/blockchains/bitcoin-knots/default.nix b/pkgs/applications/blockchains/bitcoin-knots/default.nix index 49e97d731593e..53f57d737d2e2 100644 --- a/pkgs/applications/blockchains/bitcoin-knots/default.nix +++ b/pkgs/applications/blockchains/bitcoin-knots/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - fetchFromGitHub, autoreconfHook, pkg-config, util-linux, @@ -22,30 +21,20 @@ python3, withGui, withWallet ? true, - gnupg, - # Signatures from the following GPG public keys checked during verification of the source code. - # The list can be found at https://github.com/bitcoinknots/guix.sigs/tree/knots/builder-keys - builderKeys ? [ - "1A3E761F19D2CC7785C5502EA291A2C45D0C504A" # luke-jr.gpg - "32FE1E61B1C711186CA378DEFD8981F1BC41ABB9" # oomahq.gpg - "CACC7CBB26B3D2EE8FC2F2BC0E37EBAB8574F005" # leo-haf.gpg - ], }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation rec { pname = if withGui then "bitcoin-knots" else "bitcoind-knots"; version = "28.1.knots20250305"; src = fetchurl { - url = "https://bitcoinknots.org/files/28.x/${finalAttrs.version}/bitcoin-${finalAttrs.version}.tar.gz"; - # hash retrieved from signed SHA256SUMS + url = "https://bitcoinknots.org/files/28.x/${version}/bitcoin-${version}.tar.gz"; hash = "sha256-DKO3+43Tn/BTKQVrLrCkeMtzm8SfbaJD8rPlb6lDA8A="; }; nativeBuildInputs = [ autoreconfHook pkg-config - gnupg ] ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ hexdump ] @@ -69,58 +58,11 @@ stdenv.mkDerivation (finalAttrs: { qttools ]; - preUnpack = - let - majorVersion = lib.versions.major finalAttrs.version; - - publicKeys = fetchFromGitHub { - owner = "bitcoinknots"; - repo = "guix.sigs"; - rev = "b998306d462f39b6077518521700d7156fec76b8"; - sha256 = "sha256-q4tumAfTr828AZNOa9ia7Y0PYoe6W47V/7SEApTzl3w="; - }; - - checksums = fetchurl { - url = "https://bitcoinknots.org/files/${majorVersion}.x/${finalAttrs.version}/SHA256SUMS"; - hash = "sha256-xWJKaZBLm9H6AuMBSC21FLy/5TRUI0AQVIUF/2PvDhs="; - }; - - signatures = fetchurl { - url = "https://bitcoinknots.org/files/${majorVersion}.x/${finalAttrs.version}/SHA256SUMS.asc"; - hash = "sha256-SywdBEzZqsf2aDeOs7J9n513RTCm+TJA/QYP5+h7Ifo="; - }; - - verifyBuilderKeys = - let - script = publicKey: '' - echo "Checking if public key ${publicKey} signed the checksum file..." - grep "^\[GNUPG:\] VALIDSIG .* ${publicKey}$" verify.log > /dev/null - echo "OK" - ''; - in - builtins.concatStringsSep "\n" (builtins.map script builderKeys); - in - '' - pushd $(mktemp -d) - export GNUPGHOME=$PWD/gnupg - mkdir -m 700 -p $GNUPGHOME - gpg --no-autostart --batch --import ${publicKeys}/builder-keys/* - ln -s ${checksums} ./SHA256SUMS - ln -s ${signatures} ./SHA256SUMS.asc - ln -s $src ./bitcoin-${finalAttrs.version}.tar.gz - gpg --no-autostart --batch --verify --status-fd 1 SHA256SUMS.asc SHA256SUMS > verify.log - ${verifyBuilderKeys} - grep bitcoin-${finalAttrs.version}.tar.gz SHA256SUMS > SHA256SUMS.filtered - echo "Verifying the checksum of bitcoin-${finalAttrs.version}.tar.gz..." - sha256sum -c SHA256SUMS.filtered - popd - ''; - configureFlags = [ "--with-boost-libdir=${boost.out}/lib" "--disable-bench" ] - ++ lib.optionals (!finalAttrs.doCheck) [ + ++ lib.optionals (!doCheck) [ "--disable-tests" "--disable-gui-tests" ] @@ -148,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Derivative of Bitcoin Core with a collection of improvements"; homepage = "https://bitcoinknots.org/"; - changelog = "https://github.com/bitcoinknots/bitcoin/blob/v${finalAttrs.version}/doc/release-notes.md"; + changelog = "https://github.com/bitcoinknots/bitcoin/blob/v${version}/doc/release-notes.md"; maintainers = with lib.maintainers; [ prusnak mmahut @@ -156,4 +98,4 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; platforms = lib.platforms.unix; }; -}) +} diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index 1c63e4293929b..809f8665050fb 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - fetchFromGitHub, cmake, pkg-config, installShellFiles, @@ -24,16 +23,6 @@ withGui, withWallet ? true, enableTracing ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isStatic, - gnupg, - # Signatures from the following GPG public keys checked during verification of the source code. - # The list can be found at https://github.com/bitcoin-core/guix.sigs/tree/main/builder-keys - builderKeys ? [ - "152812300785C96444D3334D17565732E08E5E41" # achow101.gpg - "9EDAFF80E080659604F4A76B2EBB056FD847F8A7" # Emzy.gpg - "71A3B16735405025D447E8F274810B012346C9A6" # laanwj.gpg - "6B002C6EA3F91B1B0DF0C9BC8F617F1200A6D25C" # glozow.gpg - "D1DBF2C4B96F2DEBF4C16654410108112E7EA81F" # hebasto.gpg - ], }: let @@ -59,7 +48,6 @@ stdenv.mkDerivation (finalAttrs: { cmake pkg-config installShellFiles - gnupg ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook @@ -82,51 +70,6 @@ stdenv.mkDerivation (finalAttrs: { qttools ]; - preUnpack = - let - publicKeys = fetchFromGitHub { - owner = "bitcoin-core"; - repo = "guix.sigs"; - rev = "a788388207bd244d5ab07b31ecd6c126f213a6c6"; - sha256 = "sha256-gbenuEWP6pqY9ywPd/yZy6QfWI7jvSObwto27DRXjGI="; - }; - - checksums = fetchurl { - url = "https://bitcoincore.org/bin/bitcoin-core-${finalAttrs.version}/SHA256SUMS"; - hash = "sha256-lOwVH0UqIhOT0I9rAvswuqy+tZ8ZRhH0kGnn9VCbRv4="; - }; - - signatures = fetchurl { - url = "https://bitcoincore.org/bin/bitcoin-core-${finalAttrs.version}/SHA256SUMS.asc"; - hash = "sha256-s05cRmZ9aoPdSZTaz6D6qmVwX6OprqxynPn5vZQ7bbw="; - }; - - verifyBuilderKeys = - let - script = publicKey: '' - echo "Checking if public key ${publicKey} signed the checksum file..." - grep "^\[GNUPG:\] VALIDSIG .* ${publicKey}$" verify.log > /dev/null - echo "OK" - ''; - in - builtins.concatStringsSep "\n" (builtins.map script builderKeys); - in - '' - pushd $(mktemp -d) - export GNUPGHOME=$PWD/gnupg - mkdir -m 700 -p $GNUPGHOME - gpg --no-autostart --batch --import ${publicKeys}/builder-keys/* - ln -s ${checksums} ./SHA256SUMS - ln -s ${signatures} ./SHA256SUMS.asc - ln -s $src ./bitcoin-${finalAttrs.version}.tar.gz - gpg --no-autostart --batch --verify --status-fd 1 SHA256SUMS.asc SHA256SUMS > verify.log - ${verifyBuilderKeys} - grep bitcoin-${finalAttrs.version}.tar.gz SHA256SUMS > SHA256SUMS.filtered - echo "Verifying the checksum of bitcoin-${finalAttrs.version}.tar.gz..." - sha256sum -c SHA256SUMS.filtered - popd - ''; - postInstall = '' cd .. installShellCompletion --bash contrib/completions/bash/bitcoin-cli.bash diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index e5e031b2b1f4d..773b149a0b6f9 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -28,14 +28,13 @@ in stdenv.mkDerivation rec { pname = "tiled"; - # nixpkgs-update: no auto update - version = "1.11.2"; + version = "1.11.90"; src = fetchFromGitHub { owner = "mapeditor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9oUKn51MQcsStgIJrp9XW5YAIpAUcO0kzfGnYA3gz/E="; + sha256 = "sha256-gGsozdFEE5c315DF+EsIY9wGv50wwrOBycejTkVwEHA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index b2cfd2db9fd1d..61ff8b7d877ff 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.1475"; + version = "9.1.1566"; outputs = [ "out" @@ -11,7 +11,7 @@ rec { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-KKUzS0dS9K/jlfP+igyLX1Fwjb7Y5ZAzGLjqHvkA3bs="; + hash = "sha256-/hzyjFGjl8Wu9tHtFgnnHtGbcJ5AIjCMUNCScrdIgwU="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/full.nix b/pkgs/applications/editors/vim/full.nix index 71f2f4a784fae..ad6697ea3443f 100644 --- a/pkgs/applications/editors/vim/full.nix +++ b/pkgs/applications/editors/vim/full.nix @@ -26,6 +26,7 @@ libXmu, libsodium, libICE, + wayland-scanner, vimPlugins, makeWrapper, wrapGAppsHook3, @@ -33,6 +34,7 @@ features ? "huge", # One of tiny, small, normal, big or huge wrapPythonDrv ? false, guiSupport ? config.vim.gui or (if stdenv.hostPlatform.isDarwin then "gtk2" else "gtk3"), + waylandSupport ? !stdenv.hostPlatform.isDarwin, luaSupport ? config.vim.lua or true, perlSupport ? config.vim.perl or false, # Perl interpreter pythonSupport ? config.vim.python or true, # Python interpreter @@ -120,6 +122,7 @@ stdenv.mkDerivation { "--disable-nextaf_check" "--disable-carbon_check" "--disable-gtktest" + (lib.strings.enableFeature waylandSupport "wayland") ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "vim_cv_toupper_broken=no" @@ -185,6 +188,7 @@ stdenv.mkDerivation { ] ++ lib.optional (guiSupport == "gtk2") gtk2-x11 ++ lib.optional (guiSupport == "gtk3") gtk3-x11 + ++ lib.optional waylandSupport wayland-scanner ++ lib.optional luaSupport lua ++ lib.optional pythonSupport python3 ++ lib.optional tclSupport tcl diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix index 3afecf4ffc905..ba0190c093d1d 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix @@ -12,18 +12,18 @@ pkgs, }: let - version = "0.0.27-unstable-2025-08-14"; + version = "0.0.27-unstable-2025-08-06"; src = fetchFromGitHub { owner = "yetone"; repo = "avante.nvim"; - rev = "be0937a459624ce1170f158f9d8660d0ade47eb4"; - hash = "sha256-1NzzyWW2Tp91wa+Ujv2cDTv/Cb/HgA6LiDuwxVWdJwU="; + rev = "2fc63d4128d2dc2fef0913c7480b4586959ebe4e"; + hash = "sha256-hHa300Ldszsnp6AuYVJwOFc5FfuRTd3phyM6/qBUIQo="; }; avante-nvim-lib = rustPlatform.buildRustPackage { pname = "avante-nvim-lib"; inherit version src; - cargoHash = "sha256-pTWCT2s820mjnfTscFnoSKC37RE7DAPKxP71QuM+JXQ="; + cargoHash = "sha256-8mBpzndz34RrmhJYezd4hLrJyhVL4S4IHK3plaue1k8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/emulators/libretro/cores/flycast.nix b/pkgs/applications/emulators/libretro/cores/flycast.nix index 3899f4f32820e..2fbae3a49af2b 100644 --- a/pkgs/applications/emulators/libretro/cores/flycast.nix +++ b/pkgs/applications/emulators/libretro/cores/flycast.nix @@ -8,13 +8,13 @@ }: mkLibretroCore { core = "flycast"; - version = "0-unstable-2025-08-12"; + version = "0-unstable-2025-08-01"; src = fetchFromGitHub { owner = "flyinghead"; repo = "flycast"; - rev = "33833cfd1ed2d94d907223442fdb8cdafd8d5d80"; - hash = "sha256-6YXWJi3xbImfBMWILzsnwJGvj2XDoHcrWgLDPwaHfJs="; + rev = "40e400ab084175d3bd0f9e10cf8d6ac78c8b9544"; + hash = "sha256-k/w1tmuGuRD98bR/kmc/9pLFGeobHMhKQapJOv8qVJo="; fetchSubmodules = true; }; diff --git a/pkgs/applications/graphics/gimp/2.0/default.nix b/pkgs/applications/graphics/gimp/2.0/default.nix index be4bed838edfc..985ae05e71b17 100644 --- a/pkgs/applications/graphics/gimp/2.0/default.nix +++ b/pkgs/applications/graphics/gimp/2.0/default.nix @@ -28,6 +28,7 @@ libwmf, zlib, libzip, + xz, ghostscript, aalib, shared-mime-info, @@ -133,6 +134,7 @@ stdenv.mkDerivation (finalAttrs: { libwmf zlib libzip + xz ghostscript aalib shared-mime-info diff --git a/pkgs/applications/misc/googleearth-pro/default.nix b/pkgs/applications/misc/googleearth-pro/default.nix index 078fb5c79689b..f8f8dba0321bf 100644 --- a/pkgs/applications/misc/googleearth-pro/default.nix +++ b/pkgs/applications/misc/googleearth-pro/default.nix @@ -20,7 +20,7 @@ fontconfig, dpkg, libproxy, - libxml2, + libxml2_13, gst_all_1, dbus, makeWrapper, @@ -37,14 +37,6 @@ let "amd64" else throw "Unsupported system ${stdenv.hostPlatform.system} "; - - libxml2' = libxml2.overrideAttrs rec { - version = "2.13.8"; - src = fetchurl { - url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz"; - hash = "sha256-J3KUyzMRmrcbK8gfL0Rem8lDW4k60VuyzSsOhZoO6Eo="; - }; - }; in mkDerivation rec { pname = "googleearth-pro"; @@ -78,7 +70,7 @@ mkDerivation rec { libXrender libproxy libxcb - libxml2' + libxml2_13 sqlite zlib alsa-lib diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index f0be1d3a5c990..e7e05416dfa84 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -526,6 +526,24 @@ let # preventing compilations of chromium with versions below their intended version, not about running the very # exact version or even running a newer version. ./patches/chromium-136-nodejs-assert-minimal-version-instead-of-exact-match.patch + ] + ++ lib.optionals (chromiumVersionAtLeast "138") [ + (fetchpatch { + # Unbreak building with Rust 1.89+ which introduced + # a new mismatched_lifetime_syntaxes lint. + # https://issues.chromium.org/issues/424424323 + name = "chromium-138-rust-1.86-mismatched_lifetime_syntaxes.patch"; + # https://chromium-review.googlesource.com/c/chromium/src/+/6658267 + url = "https://chromium.googlesource.com/chromium/src/+/94a87ff38c51fd1a71980a5051d3553978391608^!?format=TEXT"; + decode = "base64 -d"; + includes = [ "build/rust/cargo_crate.gni" ]; + hash = "sha256-xf1Jq5v3InXkiVH0uT7+h1HPwZse5MDcHKuJNjSLR6k="; + }) + ] + ++ lib.optionals (!chromiumVersionAtLeast "138") [ + # Rebased variant of the patch above for + # electron 35 (M134) and 36 (M136) + ./patches/chromium-134-rust-1.86-mismatched_lifetime_syntaxes.patch ]; postPatch = diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 990eafa066778..58cb30f335ad1 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -79,13 +79,7 @@ let pulseSupport ungoogled ; - gnChromium = buildPackages.gn.overrideAttrs (oldAttrs: { - version = if (upstream-info.deps.gn ? "version") then upstream-info.deps.gn.version else "0"; - src = fetchgit { - url = "https://gn.googlesource.com/gn"; - inherit (upstream-info.deps.gn) rev hash; - }; - }); + gnChromium = buildPackages.gn.override upstream-info.deps.gn; }); browser = callPackage ./browser.nix { diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index c7e26d4620abd..b529df32de1c8 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -12,8 +12,9 @@ "hash": "sha256-UouvzNFStYScnyfIJcz1Om7cDhC7EyShZQ/Icu73BPo=" }, "gn": { + "version": "0-unstable-2025-06-19", "rev": "97b68a0bb62b7528bc3491c7949d6804223c2b82", - "hash": "sha256-m+z10s40Q/iYcoMw3o/+tmhIdqHMsYJjdGabHrK/aqo=" + "hash": "sha256-gwptzuirIdPAV9XCaAT09aM/fY7d6xgBU7oSu9C4tmE=" }, "npmHash": "sha256-R2gOpfPOUAmnsnUTIvzDPHuHNzL/b2fwlyyfTrywEcI=" }, @@ -809,8 +810,9 @@ "hash": "sha256-UouvzNFStYScnyfIJcz1Om7cDhC7EyShZQ/Icu73BPo=" }, "gn": { + "version": "0-unstable-2025-06-19", "rev": "97b68a0bb62b7528bc3491c7949d6804223c2b82", - "hash": "sha256-m+z10s40Q/iYcoMw3o/+tmhIdqHMsYJjdGabHrK/aqo=" + "hash": "sha256-gwptzuirIdPAV9XCaAT09aM/fY7d6xgBU7oSu9C4tmE=" }, "ungoogled-patches": { "rev": "139.0.7258.138-1", diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-134-rust-1.86-mismatched_lifetime_syntaxes.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-134-rust-1.86-mismatched_lifetime_syntaxes.patch new file mode 100644 index 0000000000000..51e60a711a7a5 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-134-rust-1.86-mismatched_lifetime_syntaxes.patch @@ -0,0 +1,14 @@ +diff --git a/build/rust/cargo_crate.gni b/build/rust/cargo_crate.gni +index 8266c44cbd1dfb8a53797dbe911ea74c32ce070e..ec7d751f2d068151dfeb71aa1f6510483bebd95c 100644 +--- a/build/rust/cargo_crate.gni ++++ b/build/rust/cargo_crate.gni +@@ -285,6 +285,9 @@ template("cargo_crate") { + } + rustenv = _rustenv + ++ # TODO(crbug.com/424424323): Clean up and enable. ++ rustflags += [ "-Amismatched_lifetime_syntaxes" ] ++ + if (!defined(build_native_rust_unit_tests)) { + build_native_rust_unit_tests = _crate_type != "proc-macro" + } diff --git a/pkgs/applications/networking/browsers/chromium/update.mjs b/pkgs/applications/networking/browsers/chromium/update.mjs index 42483eb06b401..838c07ae68143 100755 --- a/pkgs/applications/networking/browsers/chromium/update.mjs +++ b/pkgs/applications/networking/browsers/chromium/update.mjs @@ -62,7 +62,7 @@ for (const attr_path of Object.keys(lockfile)) { chromedriver: !ungoogled ? await fetch_chromedriver_binaries(await get_latest_chromium_release('mac')) : undefined, deps: { depot_tools: {}, - gn: {}, + gn: await fetch_gn(chromium_rev, lockfile_initial[attr_path].deps.gn), 'ungoogled-patches': !ungoogled ? undefined : { rev: ungoogled_patches.rev, hash: ungoogled_patches.hash, @@ -78,12 +78,6 @@ for (const attr_path of Object.keys(lockfile)) { hash: depot_tools.hash, } - const gn = await fetch_gn(chromium_rev, lockfile_initial[attr_path].deps.gn) - lockfile[attr_path].deps.gn = { - rev: gn.rev, - hash: gn.hash, - } - // DEPS update loop lockfile[attr_path].DEPS = await resolve_DEPS(depot_tools.out, chromium_rev) for (const [path, value] of Object.entries(lockfile[attr_path].DEPS)) { @@ -133,10 +127,34 @@ for (const attr_path of Object.keys(lockfile)) { async function fetch_gn(chromium_rev, gn_previous) { const DEPS_file = await get_gitiles_file('https://chromium.googlesource.com/chromium/src', chromium_rev, 'DEPS') - const gn_rev = /^\s+'gn_version': 'git_revision:(?.+)',$/m.exec(DEPS_file).groups.rev - const hash = gn_rev === gn_previous.rev ? gn_previous.hash : '' + const { rev } = /^\s+'gn_version': 'git_revision:(?.+)',$/m.exec(DEPS_file).groups + + const cache_hit = rev === gn_previous.rev; + if (cache_hit) { + return gn_previous + } + + const commit_date = await get_gitiles_commit_date('https://gn.googlesource.com/gn', rev) + const version = `0-unstable-${commit_date}` - return await prefetch_gitiles('https://gn.googlesource.com/gn', gn_rev, hash) + const expr = [`(import ./. {}).gn.override { version = "${version}"; rev = "${rev}"; hash = ""; }`] + const derivation = await $nixpkgs`nix-instantiate --expr ${expr}` + + return { + version, + rev, + hash: await prefetch_FOD(derivation), + } +} + + +async function get_gitiles_commit_date(base_url, rev) { + const url = `${base_url}/+/${rev}?format=json` + const response = await (await fetch(url)).text() + const json = JSON.parse(response.replace(`)]}'\n`, '')) + + const date = new Date(json.commiter.time) + return date.toISOString().split("T")[0] } @@ -259,4 +277,3 @@ async function prefetch_FOD(...args) { return hash } - diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 2744cc0768755..42031b80805b9 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -48,6 +48,13 @@ let # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. (if lib.versionOlder version "140" then ./no-buildconfig.patch else ./no-buildconfig-tb140.patch) ] + ++ lib.optional (lib.versionAtLeast version "140") (fetchpatch2 { + # https://bugzilla.mozilla.org/show_bug.cgi?id=1982003 + name = "rustc-1.89.patch"; + url = "https://raw.githubusercontent.com/openbsd/ports/3ef8a2538893109bea8211ef13a870822264e096/mail/mozilla-thunderbird/patches/patch-third_party_rust_allocator-api2_src_stable_vec_mod_rs"; + extraPrefix = ""; + hash = "sha256-eL+RNVLMkj8x/8qQJVUFHDdDpS0ahV1XEN1L0reaYG4="; + }) ++ lib.optionals (lib.versionOlder version "139") [ # clang-19 fixes for char_traits build issue # https://github.com/rnpgp/rnp/pull/2242/commits/e0790a2c4ff8e09d52522785cec1c9db23d304ac diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index bbfd19e15745f..46ed77495f2e5 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -40,7 +40,7 @@ libsecret, libsoup_2_4, libvorbis, - libxml2, + libxml2_13, llvmPackages, more, nspr, @@ -90,19 +90,6 @@ let ''; }; - libxml2' = libxml2.overrideAttrs (oldAttrs: rec { - version = "2.13.8"; - src = fetchurl { - url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz"; - hash = "sha256-J3KUyzMRmrcbK8gfL0Rem8lDW4k60VuyzSsOhZoO6Eo="; - }; - meta = oldAttrs.meta // { - knownVulnerabilities = oldAttrs.meta.knownVulnerabilities or [ ] ++ [ - "CVE-2025-6021" - ]; - }; - }); - in stdenv.mkDerivation rec { @@ -174,7 +161,7 @@ stdenv.mkDerivation rec { libsecret libsoup_2_4 libvorbis - libxml2' + libxml2_13 llvmPackages.libunwind nspr nss diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 93452cac87f2c..0ed21e8e034f7 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -96,18 +96,23 @@ stdenv.mkDerivation (finalAttrs: { separateDebugInfo = true; __structuredAttrs = true; - hardeningDisable = [ "format" ]; - enableParallelBuilding = true; enableParallelInstalling = true; patches = [ + # This patch does two things: (1) use the right name for `docbook2texi', + # and (2) make sure `gitman.info' isn't produced since it's broken + # (duplicate node names). ./docbook2texi.patch + # Fix references to gettext.sh at runtime: hard-code it to + # ${pkgs.gettext}/bin/gettext.sh instead of assuming gettext.sh is in $PATH ./git-sh-i18n.patch + # Do not search for sendmail in /usr, only in $PATH ./git-send-email-honor-PATH.patch - ./installCheck-path.patch ] ++ lib.optionals withSsh [ + # Hard-code the ssh executable to ${pkgs.openssh}/bin/ssh instead of + # searching in $PATH ./ssh-path.patch ]; @@ -476,9 +481,6 @@ stdenv.mkDerivation (finalAttrs: { disable_test t1301-shared-repo # /build/git-2.44.0/contrib/completion/git-completion.bash: line 452: compgen: command not found disable_test t9902-completion - - # Our patched gettext never fallbacks - disable_test t0201-gettext-fallbacks '' + lib.optionalString (!sendEmailSupport) '' # Disable sendmail tests diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index dda07cb984dc8..98542ee3aabcf 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -146,11 +146,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString nixosTestRunner "-for-vm-tests" + lib.optionalString toolsOnly "-utils" + lib.optionalString userOnly "-user"; - version = "10.0.2"; + version = "10.0.3"; src = fetchurl { url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz"; - hash = "sha256-73hvI5jLUYRgD2mu9NXWke/URXajz/QSbTjUxv7Id1k="; + hash = "sha256-XIkSZ7FTSndEZduLGg38sMXm1+y29xNFYlrfTgiJlFs="; }; depsBuildBuild = [ @@ -170,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: { perl # Don't change this to python3 and python3.pkgs.*, breaks cross-compilation - python3Packages.python + (python3Packages.python.withPackages (ps: with ps; [ distlib ])) ] ++ lib.optionals gtkSupport [ wrapGAppsHook3 ] ++ lib.optionals enableDocs [ @@ -293,9 +293,9 @@ stdenv.mkDerivation (finalAttrs: { # avoid conflicts with libc++ include for mv VERSION QEMU_VERSION substituteInPlace configure \ - --replace '$source_path/VERSION' '$source_path/QEMU_VERSION' + --replace-fail '$source_path/VERSION' '$source_path/QEMU_VERSION' substituteInPlace meson.build \ - --replace "'VERSION'" "'QEMU_VERSION'" + --replace-fail "'VERSION'" "'QEMU_VERSION'" substituteInPlace python/qemu/machine/machine.py \ --replace-fail /var/tmp "$TMPDIR" ''; diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index b4609940fedc0..aeb214727ef64 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -90,8 +90,6 @@ let pname, meta, buildInputs ? [ ], - everythingFile ? "./Everything.agda", - includePaths ? [ ], libraryName ? pname, libraryFile ? "${libraryName}.agda-lib", buildPhase ? null, @@ -100,17 +98,14 @@ let ... }: let - agdaWithArgs = withPackages (filter (p: p ? isAgdaDerivation) buildInputs); - includePathArgs = concatMapStrings (path: "-i" + path + " ") ( - includePaths ++ [ (dirOf everythingFile) ] - ); + agdaWithPkgs = withPackages (filter (p: p ? isAgdaDerivation) buildInputs); in { inherit libraryName libraryFile; isAgdaDerivation = true; - buildInputs = buildInputs ++ [ agdaWithArgs ]; + buildInputs = buildInputs ++ [ agdaWithPkgs ]; buildPhase = if buildPhase != null then @@ -118,8 +113,7 @@ let else '' runHook preBuild - agda ${includePathArgs} ${everythingFile} - rm ${everythingFile} ${lib.interfaceFile Agda.version everythingFile} + agda --build-library runHook postBuild ''; diff --git a/pkgs/build-support/agda/lib.nix b/pkgs/build-support/agda/lib.nix index 4bdb80a6ca002..c11c17e668a91 100644 --- a/pkgs/build-support/agda/lib.nix +++ b/pkgs/build-support/agda/lib.nix @@ -6,8 +6,8 @@ * The resulting path may not be normalized. * * Examples: - * interfaceFile pkgs.agda.version "./Everything.agda" == "_build/2.6.4.3/agda/./Everything.agdai" - * interfaceFile pkgs.agda.version "src/Everything.lagda.tex" == "_build/2.6.4.3/agda/src/Everything.agdai" + * interfaceFile pkgs.agda.version "./Foo.agda" == "_build/AGDA_VERSION/agda/./Foo.agdai" + * interfaceFile pkgs.agda.version "src/Foo.lagda.tex" == "_build/AGDA_VERSION/agda/src/Foo.agdai" */ interfaceFile = agdaVersion: agdaFile: 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 b56bb39c97a9c..2b7cd00783a5f 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 @@ -30,4 +30,8 @@ if $targetPassed && [[ "$targetValue" != "@defaultTarget@" ]] && (( "${NIX_CC_WR echo "Warning: supplying the --target $targetValue != @defaultTarget@ 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 elif [[ $0 != *cpp ]]; then extraBefore+=(-target @defaultTarget@ @machineFlags@) + + if [[ "@explicitAbiValue@" != "" ]]; then + extraBefore+=(-mabi=@explicitAbiValue@) + fi fi diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index c5cbb98d00d32..346a7d64222fc 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -93,12 +93,14 @@ let getLib getName getVersion + hasPrefix mapAttrsToList optional optionalAttrs optionals optionalString removePrefix + removeSuffix replaceStrings toList versionAtLeast @@ -362,6 +364,22 @@ let else targetPlatform.darwinPlatform ); + + # Header files that use `__FILE__` (e.g., for error reporting) lead + # to unwanted references to development packages and outputs in built + # binaries, like C++ programs depending on GCC and Boost at runtime. + # + # We use `-fmacro-prefix-map` to avoid the store references in these + # situations while keeping them in compiler diagnostics and debugging + # and profiling output. + # + # Unfortunately, doing this with GCC runs into issues with compiler + # argument length limits due to , so we + # disable it there in favour of our existing patch. + # + # TODO: Drop `mangle-NIX_STORE-in-__FILE__.patch` from GCC and make + # this unconditional once the upstream bug is fixed. + useMacroPrefixMap = !isGNU; in assert includeFortifyHeaders' -> fortify-headers != null; @@ -454,6 +472,14 @@ stdenvNoCC.mkDerivation { substituteAll "$wrapper" "$out/bin/$dst" chmod +x "$out/bin/$dst" } + + include() { + printf -- '%s %s\n' "$1" "$2" + ${lib.optionalString useMacroPrefixMap '' + local scrubbed="$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-''${2#"$NIX_STORE"/*-}" + printf -- '-fmacro-prefix-map=%s=%s\n' "$2" "$scrubbed" + ''} + } '' + ( @@ -663,13 +689,13 @@ stdenvNoCC.mkDerivation { echo "-B${libc_lib}${libc.libdir or "/lib/"}" >> $out/nix-support/libc-crt1-cflags '' + '' - echo "-${ + include "-${ if isArocc then "I" else "idirafter" - } ${libc_dev}${libc.incdir or "/include"}" >> $out/nix-support/libc-cflags + }" "${libc_dev}${libc.incdir or "/include"}" >> $out/nix-support/libc-cflags '' + optionalString isGNU '' for dir in "${cc}"/lib/gcc/*/*/include-fixed; do - echo '-idirafter' ''${dir} >> $out/nix-support/libc-cflags + include '-idirafter' ''${dir} >> $out/nix-support/libc-cflags done '' + '' @@ -685,7 +711,7 @@ stdenvNoCC.mkDerivation { # like option that forces the libc headers before all -idirafter, # hence -isystem here. + optionalString includeFortifyHeaders' '' - echo "-isystem ${fortify-headers}/include" >> $out/nix-support/libc-cflags + include -isystem "${fortify-headers}/include" >> $out/nix-support/libc-cflags '' ) @@ -708,19 +734,19 @@ stdenvNoCC.mkDerivation { # https://github.com/NixOS/nixpkgs/pull/209870#issuecomment-1500550903) + optionalString (libcxx == null && isClang && (useGccForLibs && gccForLibs.langCC or false)) '' for dir in ${gccForLibs}/include/c++/*; do - echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags + include -isystem "$dir" >> $out/nix-support/libcxx-cxxflags done for dir in ${gccForLibs}/include/c++/*/${targetPlatform.config}; do - echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags + include -isystem "$dir" >> $out/nix-support/libcxx-cxxflags done '' + optionalString (libcxx.isLLVM or false) '' - echo "-isystem ${getDev libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags + include -isystem "${getDev libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags echo "-stdlib=libc++" >> $out/nix-support/libcxx-ldflags '' # GCC NG friendly libc++ + optionalString (libcxx != null && libcxx.isGNU or false) '' - echo "-isystem ${getDev libcxx}/include" >> $out/nix-support/libcxx-cxxflags + include -isystem "${getDev libcxx}/include" >> $out/nix-support/libcxx-cxxflags '' ## @@ -885,12 +911,24 @@ stdenvNoCC.mkDerivation { ## General Clang support ## Needs to go after ^ because the for loop eats \n and makes this file an invalid script ## - + optionalString isClang '' - # Escape twice: once for this script, once for the one it gets substituted into. - export machineFlags=${escapeShellArg (escapeShellArgs machineFlags)} - export defaultTarget=${targetPlatform.config} - substituteAll ${./add-clang-cc-cflags-before.sh} $out/nix-support/add-local-cc-cflags-before.sh - '' + + optionalString isClang ( + let + hasUnsupportedGnuSuffix = hasPrefix "gnuabielfv" targetPlatform.parsed.abi.name; + clangCompatibleConfig = + if hasUnsupportedGnuSuffix then + removeSuffix (removePrefix "gnu" targetPlatform.parsed.abi.name) targetPlatform.config + else + targetPlatform.config; + explicitAbiValue = if hasUnsupportedGnuSuffix then targetPlatform.parsed.abi.abi else ""; + in + '' + # Escape twice: once for this script, once for the one it gets substituted into. + export machineFlags=${escapeShellArg (escapeShellArgs machineFlags)} + export defaultTarget=${clangCompatibleConfig} + export explicitAbiValue=${explicitAbiValue} + substituteAll ${./add-clang-cc-cflags-before.sh} $out/nix-support/add-local-cc-cflags-before.sh + '' + ) ## ## Extra custom steps @@ -921,6 +959,7 @@ stdenvNoCC.mkDerivation { inherit libc_bin libc_dev libc_lib; inherit darwinPlatformForCC; default_hardening_flags_str = builtins.toString defaultHardeningFlags; + inherit useMacroPrefixMap; } // lib.mapAttrs (_: lib.optionalString targetPlatform.isDarwin) { # These will become empty strings when not targeting Darwin. diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh index 33a2b62a49b00..1c8b26061b034 100644 --- a/pkgs/build-support/cc-wrapper/setup-hook.sh +++ b/pkgs/build-support/cc-wrapper/setup-hook.sh @@ -68,12 +68,21 @@ ccWrapper_addCVars () { local role_post getHostRoleEnvHook + local found= + if [ -d "$1/include" ]; then export NIX_CFLAGS_COMPILE${role_post}+=" -isystem $1/include" + found=1 fi if [ -d "$1/Library/Frameworks" ]; then export NIX_CFLAGS_COMPILE${role_post}+=" -iframework $1/Library/Frameworks" + found=1 + fi + + if [[ -n "@useMacroPrefixMap@" && -n ${NIX_STORE:-} && -n $found ]]; then + local scrubbed="$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${1#"$NIX_STORE"/*-}" + export NIX_CFLAGS_COMPILE${role_post}+=" -fmacro-prefix-map=$1=$scrubbed" fi } diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 7e51efed66ac7..1a412617835f4 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -93,9 +93,7 @@ gnupg = [ "https://gnupg.org/ftp/gcrypt/" "https://mirrors.dotsrc.org/gcrypt/" - "https://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/" "https://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/" - "http://www.ring.gr.jp/pub/net/" ]; # IBiblio (former metalab/sunsite) diff --git a/pkgs/build-support/node/build-npm-package/default.nix b/pkgs/build-support/node/build-npm-package/default.nix index 3383f14ba5f7a..747043e3d12a9 100644 --- a/pkgs/build-support/node/build-npm-package/default.nix +++ b/pkgs/build-support/node/build-npm-package/default.nix @@ -103,17 +103,6 @@ lib.extendMkDerivation { # Stripping takes way too long with the amount of files required by a typical Node.js project. dontStrip = args.dontStrip or true; - env = { - npm_config_arch = - { - "x86_64" = "x64"; - "aarch64" = "arm64"; - } - .${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name; - npm_config_platform = stdenv.hostPlatform.parsed.kernel.name; - } - // (args.env or { }); - meta = (args.meta or { }) // { platforms = args.meta.platforms or nodejs.meta.platforms; }; diff --git a/pkgs/build-support/node/build-npm-package/hooks/default.nix b/pkgs/build-support/node/build-npm-package/hooks/default.nix index 54c9fd2a561bb..a28b0fbaa3795 100644 --- a/pkgs/build-support/node/build-npm-package/hooks/default.nix +++ b/pkgs/build-support/node/build-npm-package/hooks/default.nix @@ -1,6 +1,7 @@ { lib, srcOnly, + stdenv, makeSetupHook, makeWrapper, nodejs, @@ -18,6 +19,8 @@ substitutions = { nodeSrc = srcOnly nodejs; nodeGyp = "${nodejs}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js"; + npmArch = stdenv.targetPlatform.node.arch; + npmPlatform = stdenv.targetPlatform.node.platform; # Specify `diff`, `jq`, and `prefetch-npm-deps` by abspath to ensure that the user's build # inputs do not cause us to find the wrong binaries. diff --git a/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh b/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh index 6a301e715ef8c..7fabd80eec1fe 100644 --- a/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh +++ b/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh @@ -16,6 +16,8 @@ npmConfigHook() { export HOME="$TMPDIR" export npm_config_nodedir="@nodeSrc@" export npm_config_node_gyp="@nodeGyp@" + export npm_config_arch="@npmArch@" + export npm_config_platform="@npmPlatform@" if [ -z "${npmDeps-}" ]; then echo diff --git a/pkgs/build-support/nuke-references/darwin-sign-fixup.sh b/pkgs/build-support/nuke-references/darwin-sign-fixup.sh deleted file mode 100644 index 940c18e5a6271..0000000000000 --- a/pkgs/build-support/nuke-references/darwin-sign-fixup.sh +++ /dev/null @@ -1,5 +0,0 @@ -# Fixup hook for nukeReferences, not stdenv - -source @signingUtils@ - -fixupHooks+=(signIfRequired) diff --git a/pkgs/build-support/nuke-references/default.nix b/pkgs/build-support/nuke-references/default.nix index 6bdb81477aac4..13f2061b5aa8a 100644 --- a/pkgs/build-support/nuke-references/default.nix +++ b/pkgs/build-support/nuke-references/default.nix @@ -11,12 +11,6 @@ shell ? stdenvNoCC.shell, }: -let - stdenv = stdenvNoCC; - - darwinCodeSign = stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64; -in - stdenvNoCC.mkDerivation { name = "nuke-references"; @@ -32,17 +26,14 @@ stdenvNoCC.mkDerivation { chmod a+x $out/bin/nuke-refs ''; - postFixup = lib.optionalString darwinCodeSign '' - mkdir -p $out/nix-support - substituteAll ${./darwin-sign-fixup.sh} $out/nix-support/setup-hooks.sh - ''; - # FIXME: get rid of perl dependency. env = { inherit perl; inherit (builtins) storeDir; shell = lib.getBin shell + (shell.shellPath or ""); - signingUtils = lib.optionalString darwinCodeSign signingUtils; + signingUtils = lib.optionalString ( + stdenvNoCC.targetPlatform.isDarwin && stdenvNoCC.targetPlatform.isAarch64 + ) signingUtils; }; meta.mainProgram = "nuke-refs"; diff --git a/pkgs/build-support/nuke-references/nuke-refs.sh b/pkgs/build-support/nuke-references/nuke-refs.sh index 21eb855cbad9a..8a5a65973fca6 100644 --- a/pkgs/build-support/nuke-references/nuke-refs.sh +++ b/pkgs/build-support/nuke-references/nuke-refs.sh @@ -2,8 +2,8 @@ fixupHooks=() -if [ -e @out@/nix-support/setup-hooks.sh ]; then - source @out@/nix-support/setup-hooks.sh +if [[ -n "@signingUtils@" ]]; then + source "@signingUtils@" fi excludes="" @@ -25,9 +25,8 @@ for i in "$@"; do cat "$i" | @perl@/bin/perl -pe "s|\Q@storeDir@\E/$excludes[a-z0-9]{32}-|@storeDir@/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" > "$i.tmp" if test -x "$i"; then chmod +x "$i.tmp"; fi mv "$i.tmp" "$i" - - for hook in "${fixupHooks[@]}"; do - eval "$hook" "$i" - done + if [[ -n "@signingUtils@" ]]; then + signIfRequired "$i" + fi fi done diff --git a/pkgs/build-support/remove-references-to/darwin-sign-fixup.sh b/pkgs/build-support/remove-references-to/darwin-sign-fixup.sh deleted file mode 100644 index 940c18e5a6271..0000000000000 --- a/pkgs/build-support/remove-references-to/darwin-sign-fixup.sh +++ /dev/null @@ -1,5 +0,0 @@ -# Fixup hook for nukeReferences, not stdenv - -source @signingUtils@ - -fixupHooks+=(signIfRequired) diff --git a/pkgs/build-support/remove-references-to/default.nix b/pkgs/build-support/remove-references-to/default.nix index 6ae3e3125c851..13d3eb8a78d81 100644 --- a/pkgs/build-support/remove-references-to/default.nix +++ b/pkgs/build-support/remove-references-to/default.nix @@ -10,13 +10,7 @@ shell ? stdenvNoCC.shell, }: -let - stdenv = stdenvNoCC; - - darwinCodeSign = stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64; -in - -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { name = "remove-references-to"; dontUnpack = true; @@ -29,16 +23,13 @@ stdenv.mkDerivation { chmod a+x $out/bin/remove-references-to ''; - postFixup = lib.optionalString darwinCodeSign '' - mkdir -p $out/nix-support - substituteAll ${./darwin-sign-fixup.sh} $out/nix-support/setup-hooks.sh - ''; - env = { inherit (builtins) storeDir; shell = lib.getBin shell + (shell.shellPath or ""); - } - // lib.optionalAttrs darwinCodeSign { inherit signingUtils; }; + signingUtils = lib.optionalString ( + stdenvNoCC.targetPlatform.isDarwin && stdenvNoCC.targetPlatform.isAarch64 + ) signingUtils; + }; meta.mainProgram = "remove-references-to"; } diff --git a/pkgs/build-support/remove-references-to/remove-references-to.sh b/pkgs/build-support/remove-references-to/remove-references-to.sh index a4d068eb591ee..e24524d0c5746 100755 --- a/pkgs/build-support/remove-references-to/remove-references-to.sh +++ b/pkgs/build-support/remove-references-to/remove-references-to.sh @@ -2,10 +2,6 @@ fixupHooks=() -if [ -e @out@/nix-support/setup-hooks.sh ]; then - source @out@/nix-support/setup-hooks.sh -fi - # References to remove targets=() while getopts t: o; do @@ -30,8 +26,9 @@ for target in "${targets[@]}" ; do sed -i -e "s|$target|eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee|g" "${regions[@]}" done -for region in "${regions[@]}"; do - for hook in "${fixupHooks[@]}"; do - eval "$hook" "$region" +if [[ -n "@signingUtils@" ]]; then + source "@signingUtils@" + for region in "${regions[@]}"; do + signIfRequired "$region" done -done +fi diff --git a/pkgs/build-support/rust/replace-workspace-values.py b/pkgs/build-support/rust/replace-workspace-values.py index 426d1b9612964..708ce14a7e8f1 100644 --- a/pkgs/build-support/rust/replace-workspace-values.py +++ b/pkgs/build-support/rust/replace-workspace-values.py @@ -123,6 +123,7 @@ def main() -> None: and crate_manifest["lints"]["workspace"] is True ): crate_manifest["lints"] = workspace_manifest["lints"] + changed = True if not changed: return diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/crate_lints.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/crate_lints.toml new file mode 100644 index 0000000000000..f1df81cbf22fe --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/crate_lints.toml @@ -0,0 +1,15 @@ +[package] +name = "im_using_workspaces" +version = { workspace = true } +publish = false +keywords = [ + "workspace", + "other_thing", + "third_thing", +] + +[lints] +workspace = true + +[dependencies] +bar = "1.0.0" diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/default.nix index 138b7179b95fd..b52026190e290 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/default.nix @@ -4,4 +4,8 @@ runCommand "git-dependency-workspace-inheritance-test" { } '' cp --no-preserve=mode ${./crate.toml} "$out" ${replaceWorkspaceValues} "$out" ${./workspace.toml} diff -u "$out" ${./want.toml} + + cp --no-preserve=mode ${./crate_lints.toml} "$out" + ${replaceWorkspaceValues} "$out" ${./workspace.toml} + diff -u "$out" ${./want_lints.toml} '' diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/want_lints.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/want_lints.toml new file mode 100644 index 0000000000000..59655e6ade054 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/want_lints.toml @@ -0,0 +1,15 @@ +[package] +name = "im_using_workspaces" +version = "1.0.0" +publish = false +keywords = [ + "workspace", + "other_thing", + "third_thing", +] + +[lints] +dbg_macro = "warn" + +[dependencies] +bar = "1.0.0" diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/workspace.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/workspace.toml index c58112a782d03..ff67ed9b51b0b 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/workspace.toml +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/workspace.toml @@ -3,3 +3,6 @@ version = "1.0.0" [workspace.dependencies] foo = { version = "1.0.0", features = ["meow"] } + +[workspace.lints] +dbg_macro = "warn" diff --git a/pkgs/build-support/src-only/default.nix b/pkgs/build-support/src-only/default.nix index d43bada43794f..b732c61560419 100644 --- a/pkgs/build-support/src-only/default.nix +++ b/pkgs/build-support/src-only/default.nix @@ -37,28 +37,48 @@ attrs: let - args = attrs.drvAttrs or attrs; - name = args.name or "${args.pname}-${args.version}"; - stdenv = args.stdenv or (lib.warn "srcOnly: stdenv not provided, using stdenvNoCC" stdenvNoCC); - drv = stdenv.mkDerivation ( - args - // { - name = "${name}-source"; - - outputs = [ "out" ]; - - phases = [ - "unpackPhase" - "patchPhase" - "installPhase" - ]; - separateDebugInfo = false; - - dontUnpack = false; - - dontInstall = false; - installPhase = "cp -pr --reflink=auto -- . $out"; - } - ); + argsToOverride = args: { + name = "${args.name or "${args.pname}-${args.version}"}-source"; + + outputs = [ "out" ]; + + phases = [ + "unpackPhase" + "patchPhase" + "installPhase" + ]; + separateDebugInfo = false; + + dontUnpack = lib.warnIf (args.dontUnpack or false + ) "srcOnly: derivation has dontUnpack set, overriding" false; + + dontInstall = false; + installPhase = "cp -pr --reflink=auto -- . $out"; + }; in -lib.warnIf (args.dontUnpack or false) "srcOnly: derivation has dontUnpack set, overriding" drv + +# If we are passed a derivation (based on stdenv*), we can use overrideAttrs to +# update the arguments to mkDerivation. This gives us the proper awareness of +# what arguments were effectively passed *to* mkDerivation as opposed to +# builtins.derivation (by mkDerivation). For example, stdenv.mkDerivation +# accepts an `env` attribute set which is postprocessed before being passed to +# builtins.derivation. This can lead to evaluation failures, if we assume +# that drvAttrs is equivalent to the arguments passed to mkDerivation. +# See https://github.com/NixOS/nixpkgs/issues/269539. +if lib.isDerivation attrs && attrs ? overrideAttrs then + attrs.overrideAttrs (_finalAttrs: prevAttrs: argsToOverride prevAttrs) +else + let + # If we don't have overrideAttrs, it is extremely unlikely that we are seeing + # a derivation constructed by stdenv.mkDerivation. Since srcOnly assumes + # that we are using stdenv's setup.sh, it therefore doesn't make sense to + # have derivation specific logic in this branch. + # TODO(@sternenseemann): remove drvAttrs special casing in NixOS 26.05 + args = + lib.warnIf (lib.isDerivation attrs) + "srcOnly: derivations not created by a variant of stdenv.mkDerivation are not supported. Code relying on behaviour of srcOnly with non-stdenv derivations may break in the future." + attrs.drvAttrs or attrs; + stdenv = args.stdenv or (lib.warn "srcOnly: stdenv not provided, using stdenvNoCC" stdenvNoCC); + drv = stdenv.mkDerivation (args // argsToOverride args); + in + drv diff --git a/pkgs/build-support/src-only/tests.nix b/pkgs/build-support/src-only/tests.nix index f739715e717d9..bd6fa6f6ca5a7 100644 --- a/pkgs/build-support/src-only/tests.nix +++ b/pkgs/build-support/src-only/tests.nix @@ -5,19 +5,43 @@ hello, emptyDirectory, zlib, + git, + withCFlags, stdenv, testers, }: let + # Extract (effective) arguments passed to stdenv.mkDerivation and compute the + # arguments we would need to pass to srcOnly manually in order to get the same + # as `srcOnly drv`, i.e. the arguments passed to stdenv.mkDerivation plus the + # used stdenv itself. + getEquivAttrs = + drv: + let + drv' = drv.overrideAttrs ( + _finalAttrs: prevAttrs: { + passthru = prevAttrs.passthru or { } // { + passedAttrs = prevAttrs; + }; + } + ); + in + drv'.passedAttrs // { inherit (drv') stdenv; }; + + canEvalDrv = drv: (builtins.tryEval drv.drvPath).success; + emptySrc = srcOnly emptyDirectory; zlibSrc = srcOnly zlib; # It can be invoked in a number of ways. Let's make sure they're equivalent. - zlibSrcDrvAttrs = srcOnly zlib.drvAttrs; + zlibSrcEquiv = srcOnly (getEquivAttrs zlib); # zlibSrcFreeform = # ???; helloSrc = srcOnly hello; - helloSrcDrvAttrs = srcOnly hello.drvAttrs; + helloSrcEquiv = srcOnly (getEquivAttrs hello); + + gitSrc = srcOnly git; + gitSrcEquiv = srcOnly (getEquivAttrs git); # The srcOnly invocation leaks a lot of attrs into the srcOnly derivation, # so for comparing with the freeform invocation, we need to make a selection. @@ -33,42 +57,81 @@ let ; }; helloDrvSimpleSrc = srcOnly helloDrvSimple; - helloDrvSimpleSrcFreeform = srcOnly ( - { - inherit (helloDrvSimple) - name - pname - version - src - patches - stdenv - ; - } - # __impureHostDeps get duplicated in helloDrvSimpleSrc (on darwin) - # This is harmless, but fails the test for what is arguably an - # unrelated non-problem, so we just work around it here. - # The inclusion of __impureHostDeps really shouldn't be required, - # and should be removed from this test. - // lib.optionalAttrs (helloDrvSimple ? __impureHostDeps) { - inherit (helloDrvSimple) __impureHostDeps; + helloDrvSimpleSrcFreeform = srcOnly ({ + inherit (helloDrvSimple) + name + pname + version + src + patches + stdenv + ; + }); + + # Test the issue reported in https://github.com/NixOS/nixpkgs/issues/269539 + stdenvAdapterDrv = + let + drv = (withCFlags [ "-Werror" "-Wall" ] stdenv).mkDerivation { + name = "drv-using-stdenv-adapter"; + }; + in + # Confirm the issue we are trying to avoid exists + assert !(canEvalDrv (srcOnly drv.drvAttrs)); + drv; + stdenvAdapterDrvSrc = srcOnly stdenvAdapterDrv; + stdenvAdapterDrvSrcEquiv = srcOnly ( + getEquivAttrs stdenvAdapterDrv + // { + # The upside of using overrideAttrs is that any stdenv adapter related + # modifications are only applied once. Using the adapter here again would + # mean applying it twice in total (since withCFlags functions more or less + # like an automatic overrideAttrs). + inherit stdenv; } ); + # Issue similar to https://github.com/NixOS/nixpkgs/issues/269539 + structuredAttrsDrv = + let + drv = stdenv.mkDerivation { + name = "drv-using-structured-attrs"; + src = emptyDirectory; + + env.NIX_DEBUG = true; + __structuredAttrs = true; + }; + in + # Confirm the issue we are trying to avoid exists + assert !(canEvalDrv (srcOnly drv.drvAttrs)); + drv; + structuredAttrsDrvSrc = srcOnly structuredAttrsDrv; + structuredAttrsDrvSrcEquiv = srcOnly (getEquivAttrs structuredAttrsDrv); + in runCommand "srcOnly-tests" { moreTests = [ - (testers.testEqualDerivation "zlibSrcDrvAttrs == zlibSrc" zlibSrcDrvAttrs zlibSrc) + (testers.testEqualDerivation "zlibSrcEquiv == zlibSrc" zlibSrcEquiv zlibSrc) # (testers.testEqualDerivation # "zlibSrcFreeform == zlibSrc" # zlibSrcFreeform # zlibSrc) - (testers.testEqualDerivation "helloSrcDrvAttrs == helloSrc" helloSrcDrvAttrs helloSrc) + (testers.testEqualDerivation "helloSrcEquiv == helloSrc" helloSrcEquiv helloSrc) + (testers.testEqualDerivation "helloSrcEquiv == helloSrc" helloSrcEquiv helloSrc) + (testers.testEqualDerivation "gitSrcEquiv == gitSrc" gitSrcEquiv gitSrc) (testers.testEqualDerivation "helloDrvSimpleSrcFreeform == helloDrvSimpleSrc" helloDrvSimpleSrcFreeform helloDrvSimpleSrc ) + (testers.testEqualDerivation "stdenvAdapterDrvSrcEquiv == stdenvAdapterDrvSrc" + stdenvAdapterDrvSrcEquiv + stdenvAdapterDrvSrc + ) + (testers.testEqualDerivation "structuredAttrsDrvSrcEquiv == structuredAttrsDrvSrc" + structuredAttrsDrvSrcEquiv + structuredAttrsDrvSrc + ) ]; } '' diff --git a/pkgs/by-name/ab/abseil-cpp_202501/package.nix b/pkgs/by-name/ab/abseil-cpp_202501/package.nix index c1884d4a953d8..7fffca86c0373 100644 --- a/pkgs/by-name/ab/abseil-cpp_202501/package.nix +++ b/pkgs/by-name/ab/abseil-cpp_202501/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "abseil-cpp"; - version = "20250512.1"; + version = "20250127.1"; src = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; tag = finalAttrs.version; - hash = "sha256-eB7OqTO9Vwts9nYQ/Mdq0Ds4T1KgmmpYdzU09VPWOhk="; + hash = "sha256-QTywqQCkyGFpdbtDBvUwz9bGXxbJs/qoFKF6zYAZUmQ="; }; cmakeFlags = [ diff --git a/pkgs/by-name/ab/abseil-cpp_202505/package.nix b/pkgs/by-name/ab/abseil-cpp_202505/package.nix new file mode 100644 index 0000000000000..c1884d4a953d8 --- /dev/null +++ b/pkgs/by-name/ab/abseil-cpp_202505/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + gtest, + static ? stdenv.hostPlatform.isStatic, + cxxStandard ? null, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "abseil-cpp"; + version = "20250512.1"; + + src = fetchFromGitHub { + owner = "abseil"; + repo = "abseil-cpp"; + tag = finalAttrs.version; + hash = "sha256-eB7OqTO9Vwts9nYQ/Mdq0Ds4T1KgmmpYdzU09VPWOhk="; + }; + + cmakeFlags = [ + (lib.cmakeBool "ABSL_BUILD_TEST_HELPERS" true) + (lib.cmakeBool "ABSL_USE_EXTERNAL_GOOGLETEST" true) + (lib.cmakeBool "BUILD_SHARED_LIBS" (!static)) + ] + ++ lib.optionals (cxxStandard != null) [ + (lib.cmakeFeature "CMAKE_CXX_STANDARD" cxxStandard) + ]; + + strictDeps = true; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ gtest ]; + + meta = { + description = "Open-source collection of C++ code designed to augment the C++ standard library"; + homepage = "https://abseil.io/"; + changelog = "https://github.com/abseil/abseil-cpp/releases/tag/${finalAttrs.version}"; + license = lib.licenses.asl20; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.GaetanLepage ]; + }; +}) diff --git a/pkgs/by-name/af/affine-bin/package.nix b/pkgs/by-name/af/affine-bin/package.nix index 1ad8f5064466c..804f31d6339e1 100644 --- a/pkgs/by-name/af/affine-bin/package.nix +++ b/pkgs/by-name/af/affine-bin/package.nix @@ -13,14 +13,8 @@ }: let hostPlatform = stdenvNoCC.hostPlatform; - nodePlatform = hostPlatform.parsed.kernel.name; # nodejs's `process.platform` - nodeArch = # nodejs's `process.arch` - { - "x86_64" = "x64"; - "aarch64" = "arm64"; - } - .${hostPlatform.parsed.cpu.name} - or (throw "affine-bin(${buildType}): unsupported CPU family ${hostPlatform.parsed.cpu.name}"); + nodePlatform = hostPlatform.node.platform; + nodeArch = hostPlatform.node.arch; in stdenvNoCC.mkDerivation ( finalAttrs: diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index 3336fa529d70c..819ea7abe9129 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -26,14 +26,8 @@ }: let hostPlatform = stdenvNoCC.hostPlatform; - nodePlatform = hostPlatform.parsed.kernel.name; # nodejs's `process.platform` - nodeArch = # nodejs's `process.arch` - { - "x86_64" = "x64"; - "aarch64" = "arm64"; - } - .${hostPlatform.parsed.cpu.name} - or (throw "affine(${buildType}): unsupported CPU family ${hostPlatform.parsed.cpu.name}"); + nodePlatform = hostPlatform.node.platform; + nodeArch = hostPlatform.node.arch; electron = electron_35; nodejs = nodejs_22; yarn-berry = yarn-berry_4.override { inherit nodejs; }; diff --git a/pkgs/by-name/al/alsa-ucm-conf/package.nix b/pkgs/by-name/al/alsa-ucm-conf/package.nix index 9827a1d2839fa..40be0117fc3a3 100644 --- a/pkgs/by-name/al/alsa-ucm-conf/package.nix +++ b/pkgs/by-name/al/alsa-ucm-conf/package.nix @@ -2,18 +2,18 @@ directoryListingUpdater, fetchurl, lib, - stdenv, + stdenvNoCC, coreutils, kmod, }: -stdenv.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "alsa-ucm-conf"; - version = "1.2.12"; + version = "1.2.14"; src = fetchurl { url = "mirror://alsa/lib/alsa-ucm-conf-${finalAttrs.version}.tar.bz2"; - hash = "sha256-Fo58BUm3v4mRCS+iv7kDYx33edxMQ+6PQnf8t3LYwDU="; + hash = "sha256-MumAn1ktkrl4qhAy41KTwzuNDx7Edfk3Aiw+6aMGnCE="; }; dontBuild = true; @@ -24,21 +24,10 @@ stdenv.mkDerivation (finalAttrs: { 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" - ) - '' - + lib.optionalString stdenv.hostPlatform.isLinux '' - for file in "''${files[@]}"; do - substituteInPlace "$file" \ - --replace-fail '/sbin/modprobe' '${kmod}/bin/modprobe' - done + + lib.optionalString stdenvNoCC.hostPlatform.isLinux '' + substituteInPlace ucm2/common/ctl/led.conf \ + --replace-fail '/sbin/modprobe' '${kmod}/bin/modprobe' '' + '' @@ -62,7 +51,11 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.roastiek ]; + maintainers = with lib.maintainers; [ + roastiek + mvs + ]; + platforms = lib.platforms.linux ++ lib.platforms.freebsd; }; }) diff --git a/pkgs/by-name/au/audit/musl.patch b/pkgs/by-name/au/audit/musl.patch deleted file mode 100644 index 8485a0759548d..0000000000000 --- a/pkgs/by-name/au/audit/musl.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 87c782153deb10bd8c3345723a8bcee343826e78 Mon Sep 17 00:00:00 2001 -From: Grimmauld -Date: Thu, 10 Jul 2025 18:58:31 +0200 -Subject: [PATCH 1/2] lib/audit_logging.h: fix includes for musl - -`sys/types.h` is indirectly included with `glibc`, -but needs to be specified explicitly on musl. ---- - lib/audit_logging.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/audit_logging.h b/lib/audit_logging.h -index 9082a2720..c58861b1e 100644 ---- a/lib/audit_logging.h -+++ b/lib/audit_logging.h -@@ -25,6 +25,7 @@ - - // Next include is to pick up the function attribute macros - #include -+#include - #include - - #ifdef __cplusplus - -From 98adfcc4bfa66ac25db0b609d7172d7d40c4f85f Mon Sep 17 00:00:00 2001 -From: Grimmauld -Date: Fri, 11 Jul 2025 08:11:21 +0200 -Subject: [PATCH 2/2] Guard __attr_dealloc_free seperately from __attr_dealloc - -Otherwise, header include order matters when building against a libc that -does not itself define __attr_dealloc_free, such as musl. ---- - auparse/auparse.h | 2 ++ - lib/audit_logging.h | 2 ++ - lib/libaudit.h | 2 ++ - 3 files changed, 6 insertions(+) - -diff --git a/auparse/auparse.h b/auparse/auparse.h -index 48375e2c7..ba5139625 100644 ---- a/auparse/auparse.h -+++ b/auparse/auparse.h -@@ -31,6 +31,8 @@ - #endif - #ifndef __attr_dealloc - # define __attr_dealloc(dealloc, argno) -+#endif -+#ifndef __attr_dealloc_free - # define __attr_dealloc_free - #endif - #ifndef __attribute_malloc__ -diff --git a/lib/audit_logging.h b/lib/audit_logging.h -index c58861b1e..fab7e75d1 100644 ---- a/lib/audit_logging.h -+++ b/lib/audit_logging.h -@@ -40,6 +40,8 @@ extern "C" { - #endif - #ifndef __attr_dealloc - # define __attr_dealloc(dealloc, argno) -+#endif -+#ifndef __attr_dealloc_free - # define __attr_dealloc_free - #endif - // Warn unused result -diff --git a/lib/libaudit.h b/lib/libaudit.h -index 2c51853b7..cce5dc493 100644 ---- a/lib/libaudit.h -+++ b/lib/libaudit.h -@@ -43,6 +43,8 @@ - // malloc and free assignments - #ifndef __attr_dealloc - # define __attr_dealloc(dealloc, argno) -+#endif -+#ifndef __attr_dealloc_free - # define __attr_dealloc_free - #endif - #ifndef __attribute_malloc__ diff --git a/pkgs/by-name/au/audit/package.nix b/pkgs/by-name/au/audit/package.nix index 177bf7212c057..e33b1116c061d 100644 --- a/pkgs/by-name/au/audit/package.nix +++ b/pkgs/by-name/au/audit/package.nix @@ -4,12 +4,14 @@ fetchFromGitHub, autoreconfHook, bash, + bashNonInteractive, buildPackages, linuxHeaders, python3, swig, pkgsCross, libcap_ng, + installShellFiles, # Enabling python support while cross compiling would be possible, but the # configure script tries executing python to gather info instead of relying on @@ -21,20 +23,15 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "audit"; - version = "4.1.0"; + version = "4.1.1-unstable-2025-08-01"; src = fetchFromGitHub { owner = "linux-audit"; repo = "audit-userspace"; - tag = "v${finalAttrs.version}"; - hash = "sha256-MWlHaGue7Ca8ks34KNg74n4Rfj8ivqAhLOJHeyE2Q04="; + rev = "bee5984843d0b38992a369825a87a65fb54b18fc"; # musl fixes, --disable-legacy-actions and --runstatedir support + hash = "sha256-l3JHWEHz2xGrYxEvfCUD29W8xm5llUnXwX5hLymRG74="; }; - patches = [ - # https://github.com/linux-audit/audit-userspace/pull/476 - ./musl.patch - ]; - postPatch = '' substituteInPlace bindings/swig/src/auditswig.i \ --replace-fail "/usr/include/linux/audit.h" \ @@ -61,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook + installShellFiles ] ++ lib.optionals enablePython [ python3 @@ -76,14 +74,34 @@ stdenv.mkDerivation (finalAttrs: { # z/OS plugin is not useful on Linux, and pulls in an extra openldap # dependency otherwise "--disable-zos-remote" + # remove legacy start/stop scripts to remove a bash dependency in $lib + # People interested in logging auditd interactions (e.g. for compliance) can start/stop audit using `auditctl --signal` + # See also https://github.com/linux-audit/audit-userspace?tab=readme-ov-file#starting-and-stopping-the-daemon + "--disable-legacy-actions" "--with-arm" "--with-aarch64" + "--with-io_uring" + # allows putting audit files in /run/audit, which removes the requirement + # to wait for tmpfiles to set up the /var/run -> /run symlink + "--runstatedir=/run" # capability dropping, currently mostly for plugins as those get spawned as root # see auditd-plugins(5) "--with-libcap-ng=yes" (if enablePython then "--with-python" else "--without-python") ]; + __structuredAttrs = true; + + # lib output is part of the mandatory nixos system closure, so avoid bash here + outputChecks.lib.disallowedRequisites = [ + bash + bashNonInteractive + ]; + + postInstall = '' + installShellCompletion --bash init.d/audit.bash_completion + ''; + enableParallelBuilding = true; passthru = { @@ -98,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://people.redhat.com/sgrubb/audit/"; description = "Audit Library"; - changelog = "https://github.com/linux-audit/audit-userspace/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/linux-audit/audit-userspace/releases/tag/v4.1.1"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ grimmauld ]; pkgConfigModules = [ diff --git a/pkgs/by-name/aw/aws-c-auth/package.nix b/pkgs/by-name/aw/aws-c-auth/package.nix index d915ec34e5621..48c1a85ac8433 100644 --- a/pkgs/by-name/aw/aws-c-auth/package.nix +++ b/pkgs/by-name/aw/aws-c-auth/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "aws-c-auth"; # nixpkgs-update: no auto update - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-auth"; rev = "v${version}"; - hash = "sha256-p8D79BRjaPlhzap/FWbqMlkrbVELSgeJW8CljxBAaCI="; + hash = "sha256-HzDUINTmgjW7rNEe+5iwZBv6ayxNKmGAJy+Lg4tp1t0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/aw/aws-c-cal/aws-c-cal-musl-compat.patch b/pkgs/by-name/aw/aws-c-cal/aws-c-cal-musl-compat.patch deleted file mode 100644 index 2cf1d4e81e0b5..0000000000000 --- a/pkgs/by-name/aw/aws-c-cal/aws-c-cal-musl-compat.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Emil Lerch -Date: Wed, 28 Apr 2021 17:46:24 -0700 -Subject: [PATCH] Allow dlopen to fail on musl systems - -Now that references are forced when linking statically, the assertion is -no longer necessary. See https://github.com/awslabs/aws-c-cal/pull/54 ---- - source/unix/openssl_platform_init.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/source/unix/openssl_platform_init.c b/source/unix/openssl_platform_init.c -index 5266ecc1..99f210bd 100644 ---- a/source/unix/openssl_platform_init.c -+++ b/source/unix/openssl_platform_init.c -@@ -496,7 +502,6 @@ static enum aws_libcrypto_version s_resolve_libcrypto(void) { - /* Try to auto-resolve against what's linked in/process space */ - FLOGF("searching process and loaded modules"); - void *process = dlopen(NULL, RTLD_NOW); -- AWS_FATAL_ASSERT(process && "Unable to load symbols from process space"); - enum aws_libcrypto_version result = s_resolve_libcrypto_symbols(AWS_LIBCRYPTO_LC, process); - if (result == AWS_LIBCRYPTO_NONE) { - result = s_resolve_libcrypto_symbols(AWS_LIBCRYPTO_1_0_2, process); -@@ -504,7 +509,9 @@ static enum aws_libcrypto_version s_resolve_libcrypto(void) { - if (result == AWS_LIBCRYPTO_NONE) { - result = s_resolve_libcrypto_symbols(AWS_LIBCRYPTO_1_1_1, process); - } -- dlclose(process); -+ if (process) { -+ dlclose(process); -+ } - - if (result == AWS_LIBCRYPTO_NONE) { - FLOGF("libcrypto symbols were not statically linked, searching for shared libraries"); diff --git a/pkgs/by-name/aw/aws-c-cal/package.nix b/pkgs/by-name/aw/aws-c-cal/package.nix index eceed99856936..97689d28c004e 100644 --- a/pkgs/by-name/aw/aws-c-cal/package.nix +++ b/pkgs/by-name/aw/aws-c-cal/package.nix @@ -11,20 +11,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "aws-c-cal"; # nixpkgs-update: no auto update - version = "0.8.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-cal"; rev = "v${finalAttrs.version}"; - hash = "sha256-dYFUYdMQMT8CZFMrCrhQ8JPEhA4CVf+f7VLFt3JNmn8="; + hash = "sha256-ufMoB71xebxO/Cu/xVQ3BMrcCgIlkG+MXH2Ru2i6uXo="; }; - patches = [ - # Fix openssl adaptor code for musl based static binaries. - ./aws-c-cal-musl-compat.patch - ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ diff --git a/pkgs/by-name/aw/aws-c-common/package.nix b/pkgs/by-name/aw/aws-c-common/package.nix index 4dc2d76162bfe..e2b86d35fec96 100644 --- a/pkgs/by-name/aw/aws-c-common/package.nix +++ b/pkgs/by-name/aw/aws-c-common/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; # nixpkgs-update: no auto update - version = "0.10.3"; + version = "0.12.4"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-common"; rev = "v${version}"; - hash = "sha256-sA6CsLLHh4Ce/+ffl4OhisMSgdrD+EmXvTNGSq7/vvk="; + hash = "sha256-hKCIPZlLPyH7D3Derk2onyqTzWGUtCx+f2+EKtAKlwA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/aw/aws-c-compression/package.nix b/pkgs/by-name/aw/aws-c-compression/package.nix index dfd3f53b29352..04ea9c4105bb2 100644 --- a/pkgs/by-name/aw/aws-c-compression/package.nix +++ b/pkgs/by-name/aw/aws-c-compression/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "aws-c-compression"; # nixpkgs-update: no auto update - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-compression"; rev = "v${version}"; - sha256 = "sha256-EjvOf2UMju6pycPdYckVxqQ34VOhrIIyvK+O3AVRED4="; + sha256 = "sha256-gpru+hnppgLHhcPfVBOaMdcT6e8wUjZmY7Caaa/KAW4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/aw/aws-c-event-stream/package.nix b/pkgs/by-name/aw/aws-c-event-stream/package.nix index 30b47942fe509..d71b3861e6ab5 100644 --- a/pkgs/by-name/aw/aws-c-event-stream/package.nix +++ b/pkgs/by-name/aw/aws-c-event-stream/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "aws-c-event-stream"; # nixpkgs-update: no auto update - version = "0.5.0"; + version = "0.5.5"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-event-stream"; rev = "v${version}"; - hash = "sha256-lg1qS/u5Fi8nt/tv2ekd8dgQ7rlrF3DrRxqidAoEywY="; + hash = "sha256-wVjpDKKwoksq5gFtvhH76c7ciP0XmMozhkWmzY6GwgU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/aw/aws-c-http/package.nix b/pkgs/by-name/aw/aws-c-http/package.nix index 37a52c7c985f3..8d7ebf6c5eaa2 100644 --- a/pkgs/by-name/aw/aws-c-http/package.nix +++ b/pkgs/by-name/aw/aws-c-http/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "aws-c-http"; # nixpkgs-update: no auto update - version = "0.9.2"; + version = "0.10.4"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-http"; rev = "v${version}"; - hash = "sha256-3nT64dFUcuwPfhQDwY5MTe/xPdr7XZMBpVL7V0y9tng="; + hash = "sha256-t9PoxOjgV9qLris+C18SaEwXodBGcgK591LZl0dajxU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/aw/aws-c-io/package.nix b/pkgs/by-name/aw/aws-c-io/package.nix index 2d6201cf37a25..68efabd3aef1a 100644 --- a/pkgs/by-name/aw/aws-c-io/package.nix +++ b/pkgs/by-name/aw/aws-c-io/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "aws-c-io"; # nixpkgs-update: no auto update - version = "0.15.3"; + version = "0.21.2"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-io"; rev = "v${version}"; - hash = "sha256-/pG/+MHAu/TYTtY/RQrr1U1ev2FZ1p/O8kIRUDDOcvQ="; + hash = "sha256-QNf4TJIqtypDliiu6I72CbgjyJhdS9Uuim9tZOb3SJs="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/aw/aws-c-mqtt/package.nix b/pkgs/by-name/aw/aws-c-mqtt/package.nix index 1734aea049ad2..d09cb15ed80ea 100644 --- a/pkgs/by-name/aw/aws-c-mqtt/package.nix +++ b/pkgs/by-name/aw/aws-c-mqtt/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "aws-c-mqtt"; # nixpkgs-update: no auto update - version = "0.11.0"; + version = "0.13.3"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-mqtt"; rev = "v${version}"; - hash = "sha256-gIoC3OG6VFzNH9/DjuC42eCIuN+w1AikaGAbx6ao8qQ="; + hash = "sha256-Nf8c5iVl+NOPZFjsAPCMOGq2e7D8e7PafuMQh6t0DYw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/aw/aws-c-s3/package.nix b/pkgs/by-name/aw/aws-c-s3/package.nix index 0282ca459b942..88419b389db46 100644 --- a/pkgs/by-name/aw/aws-c-s3/package.nix +++ b/pkgs/by-name/aw/aws-c-s3/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "aws-c-s3"; # nixpkgs-update: no auto update - version = "0.7.1"; + version = "0.8.6"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-s3"; rev = "v${version}"; - hash = "sha256-UE42U3UszobaUdo0ry9IlwTbSbGqmYkux19ILrVgUZY="; + hash = "sha256-g2w1igjv0N0o6+bewypJm2coHTvhYN2v8usdMN7TBI4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/aw/aws-c-sdkutils/package.nix b/pkgs/by-name/aw/aws-c-sdkutils/package.nix index 2de7db683f34a..3fe0136297b74 100644 --- a/pkgs/by-name/aw/aws-c-sdkutils/package.nix +++ b/pkgs/by-name/aw/aws-c-sdkutils/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "aws-c-sdkutils"; # nixpkgs-update: no auto update - version = "0.2.1"; + version = "0.2.4"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-sdkutils"; rev = "v${version}"; - hash = "sha256-Z9c+uBiGMXW5v+khdNaElhno16ikBO4voTzwd2mP6rA="; + hash = "sha256-zc8E5ESZxXBJ6WA/V5i2Us61UcNf9wXa2k63NWqGRtI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/aw/aws-checksums/package.nix b/pkgs/by-name/aw/aws-checksums/package.nix index 6e16456209426..1b7d8fb346687 100644 --- a/pkgs/by-name/aw/aws-checksums/package.nix +++ b/pkgs/by-name/aw/aws-checksums/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "aws-checksums"; # nixpkgs-update: no auto update - version = "0.2.2"; + version = "0.2.7"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-checksums"; rev = "v${version}"; - sha256 = "sha256-hiqV6FrOZ19YIxL3UKBuexLJwoC2mY7lqysnV7ze0gg="; + sha256 = "sha256-dYDTDWZJJ0JlvkMfLS376uUt5QzSmbV0UNRC4aq35TY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/aw/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch b/pkgs/by-name/aw/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch deleted file mode 100644 index 34f2434dbf9d0..0000000000000 --- a/pkgs/by-name/aw/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch +++ /dev/null @@ -1,65 +0,0 @@ -From b3a46b9a2a9f86ff416a0ff5f84882c0dedebd14 Mon Sep 17 00:00:00 2001 -From: Jan Tojnar -Date: Sun, 9 Jan 2022 01:57:18 +0100 -Subject: [PATCH] build: Make includedir properly overrideable - -This is required by some package managers like Nix. - -Co-authored-by: Artturin ---- - CMakeLists.txt | 26 +++++++++++++++----------- - 1 file changed, 15 insertions(+), 11 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9f062ca..b28f13c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -49,6 +49,10 @@ if(${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64") - set(FIND_LIBRARY_USE_LIB64_PATHS true) - endif() - -+if(NOT DEFINED CMAKE_INSTALL_INCLUDEDIR) -+ set(CMAKE_INSTALL_INCLUDEDIR "include") -+endif() -+ - if(NOT CMAKE_CXX_STANDARD) - set(CMAKE_CXX_STANDARD 11) - endif() -@@ -329,7 +333,7 @@ endif() - target_include_directories(${PROJECT_NAME} PUBLIC - $ - $ -- $) -+ $) - - aws_use_package(aws-c-http) - aws_use_package(aws-c-mqtt) -@@ -346,16 +350,16 @@ aws_add_sanitizers(${PROJECT_NAME}) - - target_link_libraries(${PROJECT_NAME} PUBLIC ${DEP_AWS_LIBS}) - --install(FILES ${AWS_CRT_HEADERS} DESTINATION "include/aws/crt" COMPONENT Development) --install(FILES ${AWS_CRT_AUTH_HEADERS} DESTINATION "include/aws/crt/auth" COMPONENT Development) --install(FILES ${AWS_CRT_CHECKSUM_HEADERS} DESTINATION "include/aws/crt/checksum" COMPONENT Development) --install(FILES ${AWS_CRT_CRYPTO_HEADERS} DESTINATION "include/aws/crt/crypto" COMPONENT Development) --install(FILES ${AWS_CRT_IO_HEADERS} DESTINATION "include/aws/crt/io" COMPONENT Development) --install(FILES ${AWS_CRT_IOT_HEADERS} DESTINATION "include/aws/iot" COMPONENT Development) --install(FILES ${AWS_CRT_MQTT_HEADERS} DESTINATION "include/aws/crt/mqtt" COMPONENT Development) --install(FILES ${AWS_CRT_HTTP_HEADERS} DESTINATION "include/aws/crt/http" COMPONENT Development) --install(FILES ${AWS_CRT_ENDPOINT_HEADERS} DESTINATION "include/aws/crt/endpoints" COMPONENT Development) --install(FILES ${AWS_CRT_CBOR_HEADERS} DESTINATION "include/aws/crt/cbor" COMPONENT Development) -+install(FILES ${AWS_CRT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt" COMPONENT Development) -+install(FILES ${AWS_CRT_AUTH_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/auth" COMPONENT Development) -+install(FILES ${AWS_CRT_CHECKSUM_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/checksum" COMPONENT Development) -+install(FILES ${AWS_CRT_CRYPTO_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/crypto" COMPONENT Development) -+install(FILES ${AWS_CRT_IO_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/io" COMPONENT Development) -+install(FILES ${AWS_CRT_IOT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/iot" COMPONENT Development) -+install(FILES ${AWS_CRT_MQTT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/mqtt" COMPONENT Development) -+install(FILES ${AWS_CRT_HTTP_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/http" COMPONENT Development) -+install(FILES ${AWS_CRT_ENDPOINT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/endpoints" COMPONENT Development) -+install(FILES ${AWS_CRT_CBOR_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/cbor" COMPONENT Development) - - install( - TARGETS ${PROJECT_NAME} --- -2.46.0 diff --git a/pkgs/by-name/aw/aws-crt-cpp/package.nix b/pkgs/by-name/aw/aws-crt-cpp/package.nix index 3cf463a5fdf1a..b8b35b095602b 100644 --- a/pkgs/by-name/aw/aws-crt-cpp/package.nix +++ b/pkgs/by-name/aw/aws-crt-cpp/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "aws-crt-cpp"; # nixpkgs-update: no auto update - version = "0.29.4"; + version = "0.33.1"; outputs = [ "out" @@ -31,17 +31,13 @@ stdenv.mkDerivation rec { owner = "awslabs"; repo = "aws-crt-cpp"; rev = "v${version}"; - sha256 = "sha256-Uv1BHM39f9soq7kziedqRhHqQ/xwnqcz++1UM5nuo8g="; + sha256 = "sha256-C8KWe5+CXujD8nN3gLkjaaMld15sat/ohwEKhyWELKI="; }; - patches = [ - # Correct include path for split outputs. - # https://github.com/awslabs/aws-crt-cpp/pull/325 - ./0001-build-Make-includedir-properly-overrideable.patch - ]; - postPatch = '' - substituteInPlace CMakeLists.txt --replace '-Werror' "" + substituteInPlace CMakeLists.txt \ + --replace-fail "$" "$" \ + --replace-fail '-Werror' "" ''; nativeBuildInputs = [ diff --git a/pkgs/by-name/aw/aws-sdk-cpp/package.nix b/pkgs/by-name/aw/aws-sdk-cpp/package.nix index 82147ae7213ca..d49d199b2203d 100644 --- a/pkgs/by-name/aw/aws-sdk-cpp/package.nix +++ b/pkgs/by-name/aw/aws-sdk-cpp/package.nix @@ -33,13 +33,13 @@ in stdenv.mkDerivation rec { pname = "aws-sdk-cpp"; # nixpkgs-update: no auto update - version = "1.11.448"; + version = "1.11.612"; src = fetchFromGitHub { owner = "aws"; repo = "aws-sdk-cpp"; rev = version; - hash = "sha256-K0UFs7vOeZeQIs3G5L4FfEWXDGTXT9ssr/vQwa1l2lw="; + hash = "sha256-W4eKgUvN2NLYEOO47HTJYJpEmyn10gNK29RIrvoXkek="; }; postPatch = '' diff --git a/pkgs/by-name/aw/awscli/package.nix b/pkgs/by-name/aw/awscli/package.nix index 39cc67df9f878..298f46a9773c1 100644 --- a/pkgs/by-name/aw/awscli/package.nix +++ b/pkgs/by-name/aw/awscli/package.nix @@ -14,14 +14,14 @@ let pname = "awscli"; # N.B: if you change this, change botocore and boto3 to a matching version too # check e.g. https://github.com/aws/aws-cli/blob/1.33.21/setup.py - version = "1.40.31"; + version = "1.42.4"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; tag = version; - hash = "sha256-BjQyA7uK9F/5myPXsMpD0HZK69Se3WveYMHNCzhVNKc="; + hash = "sha256-vkQFhSsK9MWhp+jvomkVdjxXuBOH4GnFgz/9jtPRNIs="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/aw/awscli2/package.nix b/pkgs/by-name/aw/awscli2/package.nix index 3a0b12557d179..451bb46c7de11 100644 --- a/pkgs/by-name/aw/awscli2/package.nix +++ b/pkgs/by-name/aw/awscli2/package.nix @@ -53,6 +53,7 @@ let build-system = with final; [ setuptools ]; + postPatch = null; src = prev.src.override { inherit version; hash = "sha256-+OzBu6VmdBNFfFKauVW/jGe0XbeZ0VkGYmFxnjKFgKA="; diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix index 4e68c32368e20..aa6b562a3b96d 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 = "20250528"; + version = "20250707"; src = fetchurl { url = "https://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-DcOJpeApiqWFNTtgeW1dYy3mYNreWNAKzWCtcihGyaM="; + hash = "sha256-phJApAZdkMOSXdd0+Po9c97sGnMiiobulfzYIGPSiwg="; }; patches = [ diff --git a/pkgs/by-name/bo/borgbackup/package.nix b/pkgs/by-name/bo/borgbackup/package.nix index a3a49005af9fe..cdeb0d332a6b3 100644 --- a/pkgs/by-name/bo/borgbackup/package.nix +++ b/pkgs/by-name/bo/borgbackup/package.nix @@ -4,6 +4,7 @@ acl, e2fsprogs, fetchFromGitHub, + fetchpatch, libb2, lz4, openssh, @@ -30,6 +31,14 @@ python.pkgs.buildPythonApplication rec { hash = "sha256-1RRizsHY6q1ruofTkRZ4sSN4k6Hoo+sG85w2zz+7yL8="; }; + patches = [ + (fetchpatch { + name = "allow-msgpack-1.1.1.patch"; + url = "https://github.com/borgbackup/borg/commit/f6724bfef2515ed5bf66c9a0434655c60a82aae2.patch"; + hash = "sha256-UfLaAFKEAHvbIR5WDYJY7bz3aiffdwAXJKfzZZU+NT8="; + }) + ]; + postPatch = '' # sandbox does not support setuid/setgid/sticky bits substituteInPlace src/borg/testsuite/archiver.py \ diff --git a/pkgs/by-name/bu/bundler/package.nix b/pkgs/by-name/bu/bundler/package.nix index ba02429ae0b9e..e1e5c1fdbc36f 100644 --- a/pkgs/by-name/bu/bundler/package.nix +++ b/pkgs/by-name/bu/bundler/package.nix @@ -13,8 +13,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.6.9"; - source.sha256 = "sha256-olZ1/70FWuEYZ2bMHhILTPYliOiKu1m5nFfiKxxVyes="; + version = "2.7.1"; + source.sha256 = "sha256-CtWgAqh5d2sqmL5lL1V6yHMb4zU2EtY/pO8bJwbcHgs="; dontPatchShebangs = true; postFixup = '' diff --git a/pkgs/by-name/ca/cacert/package.nix b/pkgs/by-name/ca/cacert/package.nix index 0ff9953cdc89c..67f54f65cc11f 100644 --- a/pkgs/by-name/ca/cacert/package.nix +++ b/pkgs/by-name/ca/cacert/package.nix @@ -23,7 +23,7 @@ let lib.concatStringsSep "\n\n" extraCertificateStrings ); - srcVersion = "3.113.1"; + srcVersion = "3.114"; version = if nssOverride != null then nssOverride.version else srcVersion; meta = with lib; { homepage = "https://curl.haxx.se/docs/caextract.html"; @@ -47,7 +47,7 @@ let owner = "nss-dev"; repo = "nss"; rev = "NSS_${lib.replaceStrings [ "." ] [ "_" ] version}_RTM"; - hash = "sha256-Yfs9Hh98ASJe1D4qyQEXaTC2xjeDI2Cdxp5Xgy0rYdQ="; + hash = "sha256-YVtXk1U9JtqfOH7+m/+bUI/yXJcydqjjGbCy/5xbMe8="; }; dontBuild = true; diff --git a/pkgs/by-name/ca/cargo-c/package.nix b/pkgs/by-name/ca/cargo-c/package.nix index d3bfa878785c4..287040197f519 100644 --- a/pkgs/by-name/ca/cargo-c/package.nix +++ b/pkgs/by-name/ca/cargo-c/package.nix @@ -10,18 +10,21 @@ rav1e, }: +let + # this version may need to be updated along with package version + cargoVersion = "0.89.0"; +in rustPlatform.buildRustPackage rec { pname = "cargo-c"; - version = "0.10.2"; + version = "0.10.14"; src = fetchCrate { inherit pname; - # this version may need to be updated along with package version - version = "${version}+cargo-0.80.0"; - hash = "sha256-ltxd4n3oo8ZF/G/zmR4FSVtNOkxwCjDv6PdxkmWxZ+8="; + version = "${version}+cargo-${cargoVersion}"; + hash = "sha256-t6cbufPdpyaFzwEFWt19Nid2S5FXCJCS+SHJ0aJICX0="; }; - cargoHash = "sha256-tCJ7Giyj7Wqowhk0N7CkvAiWvF6DBNw7G7aAnn2+mp8="; + cargoHash = "sha256-nW+akmbpIGZnhJLBdwDAGI4m5eSwdT2Z/iY2RV4zMQY="; nativeBuildInputs = [ pkg-config @@ -45,8 +48,11 @@ rustPlatform.buildRustPackage rec { runHook postInstallCheck ''; - passthru.tests = { - inherit rav1e; + passthru = { + tests = { + inherit rav1e; + }; + updateScript.command = [ ./update.sh ]; }; meta = { diff --git a/pkgs/by-name/ca/cargo-c/update.sh b/pkgs/by-name/ca/cargo-c/update.sh new file mode 100755 index 0000000000000..fe1137043aea1 --- /dev/null +++ b/pkgs/by-name/ca/cargo-c/update.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash curl coreutils nix-update jq + +set -ex + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" + +latestVersion=`curl https://crates.io/api/v1/crates/cargo-c/versions | jq '.versions[0].num | split("+cargo-")'` +crateVersion=`jq -r '.[0]' <<< $latestVersion` +cargoVersion=`jq -r '.[1]' <<< $latestVersion` + +sed -E -i "s/(cargoVersion = ).*;/\1\"$cargoVersion\";/" $SCRIPT_DIR/package.nix + +nix-update cargo-c --version="$crateVersion" diff --git a/pkgs/by-name/ch/chameleon-cli/package.nix b/pkgs/by-name/ch/chameleon-cli/package.nix deleted file mode 100644 index fec07c5141104..0000000000000 --- a/pkgs/by-name/ch/chameleon-cli/package.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch, - cmake, - makeWrapper, - xz, - python3, -}: - -let - # https://github.com/RfidResearchGroup/ChameleonUltra/blob/main/software/script/requirements.txt - pythonPath = - with python3.pkgs; - makePythonPath [ - colorama - prompt-toolkit - pyserial - ]; -in - -stdenv.mkDerivation (finalAttrs: { - pname = "chameleon-cli"; - version = "2.0.0-unstable-2025-08-04"; - - src = fetchFromGitHub { - owner = "RfidResearchGroup"; - repo = "ChameleonUltra"; - rev = "098e0a914b206900f7ea7ae7265486c4349ab644"; - sparseCheckout = [ "software" ]; - hash = "sha256-WKxP4jLHkTqBO+nwxhr8DRb3TzDIMlwjA4v+6txQbDo="; - }; - - sourceRoot = "${finalAttrs.src.name}/software"; - - patches = [ - # Use execute_tool to simplify running hardnested tool, - # also fix when the dir conatains hardnested is read only - # https://github.com/RfidResearchGroup/ChameleonUltra/pull/266 - (fetchpatch { - url = "https://github.com/RfidResearchGroup/ChameleonUltra/commit/39270fd09ee61ef0659bf3b79ffa4d2b27f3ba63.patch"; - hash = "sha256-OlHQ2cL+NFdTsSPFI9geg3dabATRjyKxGp5gGG+eDl8="; - stripLen = 1; - }) - ]; - - postPatch = '' - substituteInPlace src/CMakeLists.txt \ - --replace-fail "liblzma" "lzma" \ - --replace-fail "FetchContent_MakeAvailable(xz)" "" - ''; - - nativeBuildInputs = [ - cmake - makeWrapper - ]; - - buildInputs = [ - xz - ]; - - cmakeFlags = [ - "-S" - "../src" - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/libexec - cp -r ../script/* $out/libexec - rm -r $out/libexec/tests - rm $out/libexec/requirements.txt - makeWrapper ${lib.getExe python3} $out/bin/chameleon-cli \ - --add-flags "$out/libexec/chameleon_cli_main.py" \ - --prefix PYTHONPATH : ${pythonPath} - - runHook postInstall - ''; - - passthru.updateScript = ./update.sh; - - meta = { - description = "Command line interface for Chameleon Ultra"; - homepage = "https://github.com/RfidResearchGroup/ChameleonUltra"; - license = lib.licenses.gpl3Only; - mainProgram = "chameleon-cli"; - maintainers = with lib.maintainers; [ azuwis ]; - }; -}) diff --git a/pkgs/by-name/ch/chameleon-cli/update.sh b/pkgs/by-name/ch/chameleon-cli/update.sh deleted file mode 100755 index 2875b72ffacdb..0000000000000 --- a/pkgs/by-name/ch/chameleon-cli/update.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p coreutils nix-update - -# This update script exists, because nix-update is unable to ignore `dev` -# tags that exist on the upstream repo. -# -# Once https://github.com/Mic92/nix-update/issues/322 is resolved it can be -# removed. - -set -exuo pipefail - -cd "$(git rev-parse --show-toplevel)" - -nix-update --version=branch chameleon-cli - -tag=$(git ls-remote --tags --refs --sort='-version:refname' https://github.com/RfidResearchGroup/ChameleonUltra.git 'v*' | head -n 1 | cut --delimiter=/ --field=3-) -tag="${tag#v}" -sed -i -e 's|version = "[^-]*-unstable-|version = "'"${tag}"'-unstable-|' pkgs/by-name/ch/chameleon-cli/package.nix diff --git a/pkgs/by-name/ch/chatbox/package.nix b/pkgs/by-name/ch/chatbox/package.nix index 75d9a8577deae..87cabe193265d 100644 --- a/pkgs/by-name/ch/chatbox/package.nix +++ b/pkgs/by-name/ch/chatbox/package.nix @@ -6,11 +6,11 @@ }: let pname = "chatbox"; - version = "1.15.4"; + version = "1.15.2"; src = fetchurl { url = "https://download.chatboxai.app/releases/Chatbox-${version}-x86_64.AppImage"; - hash = "sha256-plKibAg1tv0Togt+Jlwm8qrTp7UbBmuEM20xKLi7bb4="; + hash = "sha256-KxL073BIfZfjFndwtkDNXwlt1xny76BMV9CQF3x7ATQ="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/by-name/ch/chhoto-url/package.nix b/pkgs/by-name/ch/chhoto-url/package.nix index 2a9abd251ea65..2f73b19d3f686 100644 --- a/pkgs/by-name/ch/chhoto-url/package.nix +++ b/pkgs/by-name/ch/chhoto-url/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "chhoto-url"; - version = "6.2.13"; + version = "6.2.12"; src = fetchFromGitHub { owner = "SinTan1729"; repo = "chhoto-url"; tag = finalAttrs.version; - hash = "sha256-onGmDAVhT2lzq2pQ5runGuHgPdh1MjgFLU7DUvN7nt0="; + hash = "sha256-hV/YWxOPRTojVTFIXwzqImBKyQ1dCDq5+bgCdS7T1p0="; }; sourceRoot = "${finalAttrs.src.name}/actix"; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail "./resources/" "${placeholder "out"}/share/chhoto-url/resources/" ''; - cargoHash = "sha256-GbjbVr82Aj/CRdBl9gPGwHiyrc7l2F918DNnlEoPI58="; + cargoHash = "sha256-9wXbd56KOQ7suZqtg2cSFf2FGQJADFMHJbwAAxJ2V4g="; postInstall = '' mkdir -p $out/share/chhoto-url diff --git a/pkgs/by-name/ci/ciscoPacketTracer7/package.nix b/pkgs/by-name/ci/ciscoPacketTracer7/package.nix index bbdead8e26a8d..2dc1b9a5d31c5 100644 --- a/pkgs/by-name/ci/ciscoPacketTracer7/package.nix +++ b/pkgs/by-name/ci/ciscoPacketTracer7/package.nix @@ -1,116 +1,149 @@ { - stdenv, lib, + stdenvNoCC, + requireFile, + autoPatchelfHook, + dpkg, + makeWrapper, + alsa-lib, + dbus, + expat, + fontconfig, + glib, + libdrm, + libglvnd, + libpulseaudio, + libudev0-shim, + libxkbcommon, + libxml2_13, + libxslt, + nspr, + nss, + xorg, buildFHSEnv, copyDesktopItems, - dpkg, - fetchurl, - libxml2, - lndir, makeDesktopItem, - makeWrapper, - requireFile, + packetTracerSource ? null, }: let version = "7.3.1"; - ptFiles = stdenv.mkDerivation { - pname = "PacketTracer7drv"; + unwrapped = stdenvNoCC.mkDerivation { + pname = "ciscoPacketTracer7-unwrapped"; inherit version; - dontUnpack = true; - src = requireFile { - name = "PacketTracer_${builtins.replaceStrings [ "." ] [ "" ] version}_amd64.deb"; - hash = "sha256-w5gC0V3WHQC6J/uMEW2kX9hWKrS0mZZVWtZriN6s4n8="; - url = "https://www.netacad.com"; - }; + src = + if (packetTracerSource != null) then + packetTracerSource + else + requireFile { + name = "PacketTracer_731_amd64.deb"; + hash = "sha256-w5gC0V3WHQC6J/uMEW2kX9hWKrS0mZZVWtZriN6s4n8="; + url = "https://www.netacad.com"; + }; nativeBuildInputs = [ + autoPatchelfHook dpkg makeWrapper ]; - installPhase = '' + buildInputs = [ + alsa-lib + dbus + expat + fontconfig + glib + libdrm + libglvnd + libpulseaudio + libudev0-shim + libxkbcommon + libxml2_13 + libxslt + nspr + nss + ] + ++ (with xorg; [ + libICE + libSM + libX11 + libXScrnSaver + ]); + + unpackPhase = '' + runHook preUnpack + dpkg-deb -x $src $out - makeWrapper "$out/opt/pt/bin/PacketTracer7" "$out/bin/packettracer7" \ - --prefix LD_LIBRARY_PATH : "$out/opt/pt/bin" + chmod 755 "$out" + + runHook postUnpack ''; - }; - desktopItem = makeDesktopItem { - name = "cisco-pt7.desktop"; - desktopName = "Cisco Packet Tracer 7"; - icon = "${ptFiles}/opt/pt/art/app.png"; - exec = "packettracer7 %f"; - mimeTypes = [ - "application/x-pkt" - "application/x-pka" - "application/x-pkz" - ]; - }; + installPhase = '' + runHook preInstall - libxml2' = libxml2.overrideAttrs (oldAttrs: rec { - version = "2.13.8"; - src = fetchurl { - url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz"; - hash = "sha256-J3KUyzMRmrcbK8gfL0Rem8lDW4k60VuyzSsOhZoO6Eo="; - }; - meta = oldAttrs.meta // { - knownVulnerabilities = oldAttrs.meta.knownVulnerabilities or [ ] ++ [ - "CVE-2025-6021" - ]; - }; - }); + makeWrapper "$out/opt/pt/bin/PacketTracer7" "$out/bin/packettracer7" \ + --prefix LD_LIBRARY_PATH : "$out/opt/pt/bin" - fhs = buildFHSEnv { - pname = "packettracer7"; - inherit version; - runScript = "${ptFiles}/bin/packettracer7"; - - targetPkgs = - pkgs: with pkgs; [ - alsa-lib - dbus - expat - fontconfig - glib - libglvnd - libpulseaudio - libudev0-shim - libxkbcommon - libxml2' - libxslt - nspr - nss - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libXScrnSaver - ]; + runHook postInstall + ''; + }; + + fhs-env = buildFHSEnv { + name = "ciscoPacketTracer7-fhs-env"; + runScript = lib.getExe' unwrapped "packettracer7"; + targetPkgs = _: [ libudev0-shim ]; }; in -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { pname = "ciscoPacketTracer7"; inherit version; dontUnpack = true; + nativeBuildInputs = [ + copyDesktopItems + ]; + installPhase = '' - mkdir $out - ${lndir}/bin/lndir -silent ${fhs} $out - ''; + runHook preInstall - desktopItems = [ desktopItem ]; + mkdir -p $out/bin + ln -s ${fhs-env}/bin/${fhs-env.name} $out/bin/packettracer7 - nativeBuildInputs = [ copyDesktopItems ]; + mkdir -p $out/share/icons/hicolor/48x48/apps + ln -s ${unwrapped}/opt/pt/art/app.png $out/share/icons/hicolor/48x48/apps/cisco-packet-tracer-7.png + ln -s ${unwrapped}/usr/share/icons/gnome/48x48/mimetypes $out/share/icons/hicolor/48x48/mimetypes + ln -s ${unwrapped}/usr/share/mime $out/share/mime + + runHook postInstall + ''; - meta = with lib; { + desktopItems = [ + (makeDesktopItem { + name = "cisco-pt7.desktop"; + desktopName = "Cisco Packet Tracer 7"; + icon = "cisco-packet-tracer-7"; + exec = "packettracer7 %f"; + mimeTypes = [ + "application/x-pkt" + "application/x-pka" + "application/x-pkz" + ]; + }) + ]; + + meta = { description = "Network simulation tool from Cisco"; homepage = "https://www.netacad.com/courses/packet-tracer"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ ]; + license = lib.licenses.unfree; + mainProgram = "packettracer7"; + maintainers = with lib.maintainers; [ + gepbird + ]; platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix index 114eb60728f15..3a86c98ae9cf2 100644 --- a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix +++ b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix @@ -3,11 +3,11 @@ stdenvNoCC, requireFile, autoPatchelfHook, + dpkg, makeWrapper, alsa-lib, dbus, expat, - fetchurl, fontconfig, glib, libdrm, @@ -15,13 +15,12 @@ libpulseaudio, libudev0-shim, libxkbcommon, - libxml2, + libxml2_13, libxslt, nspr, - wayland, nss, + wayland, xorg, - dpkg, buildFHSEnv, copyDesktopItems, makeDesktopItem, @@ -41,19 +40,6 @@ let "8.2.2" = "CiscoPacketTracer822_amd64_signed.deb"; }; - libxml2' = libxml2.overrideAttrs (oldAttrs: rec { - version = "2.13.8"; - src = fetchurl { - url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz"; - hash = "sha256-J3KUyzMRmrcbK8gfL0Rem8lDW4k60VuyzSsOhZoO6Eo="; - }; - meta = oldAttrs.meta // { - knownVulnerabilities = oldAttrs.meta.knownVulnerabilities or [ ] ++ [ - "CVE-2025-6021" - ]; - }; - }); - unwrapped = stdenvNoCC.mkDerivation { name = "ciscoPacketTracer8-unwrapped"; inherit version; @@ -68,9 +54,13 @@ let url = "https://www.netacad.com"; }; - buildInputs = [ + nativeBuildInputs = [ autoPatchelfHook + dpkg makeWrapper + ]; + + buildInputs = [ alsa-lib dbus expat @@ -81,7 +71,7 @@ let libpulseaudio libudev0-shim libxkbcommon - libxml2' + libxml2_13 libxslt nspr nss @@ -111,7 +101,7 @@ let unpackPhase = '' runHook preUnpack - ${lib.getExe' dpkg "dpkg-deb"} -x $src $out + dpkg-deb -x $src $out chmod 755 "$out" runHook postUnpack @@ -130,7 +120,7 @@ let fhs-env = buildFHSEnv { name = "ciscoPacketTracer8-fhs-env"; runScript = lib.getExe' unwrapped "packettracer8"; - targetPkgs = pkgs: [ libudev0-shim ]; + targetPkgs = _: [ libudev0-shim ]; }; in @@ -151,7 +141,7 @@ stdenvNoCC.mkDerivation { ln -s ${fhs-env}/bin/${fhs-env.name} $out/bin/packettracer8 mkdir -p $out/share/icons/hicolor/48x48/apps - ln -s ${unwrapped}/opt/pt/art/app.png $out/share/icons/hicolor/48x48/apps/cisco-packet-tracer.png + ln -s ${unwrapped}/opt/pt/art/app.png $out/share/icons/hicolor/48x48/apps/cisco-packet-tracer-8.png ln -s ${unwrapped}/usr/share/icons/gnome/48x48/mimetypes $out/share/icons/hicolor/48x48/mimetypes ln -s ${unwrapped}/usr/share/mime $out/share/mime @@ -162,7 +152,7 @@ stdenvNoCC.mkDerivation { (makeDesktopItem { name = "cisco-pt8.desktop"; desktopName = "Cisco Packet Tracer 8"; - icon = "cisco-packet-tracer"; + icon = "cisco-packet-tracer-8"; exec = "packettracer8 %f"; mimeTypes = [ "application/x-pkt" diff --git a/pkgs/by-name/cl/clouddrive2/package.nix b/pkgs/by-name/cl/clouddrive2/package.nix index 5c8bcfd3fa2be..8d5649807fc4b 100644 --- a/pkgs/by-name/cl/clouddrive2/package.nix +++ b/pkgs/by-name/cl/clouddrive2/package.nix @@ -11,16 +11,16 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "clouddrive2"; - version = "0.9.5"; + version = "0.9.4"; src = fetchurl { url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz"; hash = { - x86_64-linux = "sha256-Gsq5rvr0SeGxCRwAeeFRZBPOe32EIa7uO6SAIuinezA="; - aarch64-linux = "sha256-M+lCUzoiy/sImBZrOjjeP4eqG3F4wbkMQg9Ho3ELGFo="; - x86_64-darwin = "sha256-Uyz1wuHICSq5C+n3ZjPinZznhajd6QR36CZgQBm+QRE="; - aarch64-darwin = "sha256-ZQxRHTzLUAhnL1rRLR9l8Ix5XzxeTAds7XAmEgZ9Xmo="; + x86_64-linux = "sha256-i6+YoZfCFaVcF7XO7wPo8AEpU0LrD4bcsIqLNz/V3aM="; + aarch64-linux = "sha256-BV+47uJnvH/Gapz7dACnXIM49x7u/MTdbXiFRGq2DVc="; + x86_64-darwin = "sha256-Jjsdx203akCmlveGZD1x8fO6V0N5d3AzGAFIAzgOkHs="; + aarch64-darwin = "sha256-DuSZoXTQyfC3CIwNGTsGuQNP410rK9qMBei5T7TZN7A="; } .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/by-name/cp/cpuinfo/package.nix b/pkgs/by-name/cp/cpuinfo/package.nix index 36f4ad91c1f8f..fdde7e38af041 100644 --- a/pkgs/by-name/cp/cpuinfo/package.nix +++ b/pkgs/by-name/cp/cpuinfo/package.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "cpuinfo"; - version = "0-unstable-2025-06-10"; + version = "0-unstable-2025-07-24"; src = fetchFromGitHub { owner = "pytorch"; repo = "cpuinfo"; - rev = "d7427551d6531037da216d20cd36feb19ed4905f"; - hash = "sha256-gJgvE3823NyVOIL0Grkldde3U/N9NNqlLAA0btj3TSg="; + rev = "33ed0be77d7767d0e2010e2c3cf972ef36c7c307"; + hash = "sha256-0rZzbZkOo6DAt1YnH4rtx0FvmCuYH8M6X3DNJ0gURpU="; }; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; diff --git a/pkgs/by-name/cr/cracklib/package.nix b/pkgs/by-name/cr/cracklib/package.nix index 76bdad640f0b0..886428ae76520 100644 --- a/pkgs/by-name/cr/cracklib/package.nix +++ b/pkgs/by-name/cr/cracklib/package.nix @@ -1,70 +1,82 @@ -let - version = "2.10.0"; -in { stdenv, lib, - buildPackages, - fetchurl, + fetchFromGitHub, + autoreconfHook, zlib, - gettext, - fetchpatch2, - lists ? [ - (fetchurl { - url = "https://github.com/cracklib/cracklib/releases/download/v${version}/cracklib-words-${version}.gz"; - hash = "sha256-JDLo/bSLIijC2DUl+8Q704i2zgw5cxL6t68wvuivPpY="; - }) - ], + bash, + buildPackages, + nix-update-script, + pkgsCross, + pkgsStatic, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cracklib"; - inherit version; + version = "2.10.3"; - src = fetchurl { - url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-cAw5YMplCx6vAhfWmskZuBHyB1o4dGd7hMceOG3V51Y="; + src = fetchFromGitHub { + owner = "cracklib"; + repo = "cracklib"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ORpJje4TGw1STtvRiNEwUwSDbLXdS+WgXGlc1Wtf/gw="; }; - patches = lib.optionals stdenv.hostPlatform.isDarwin [ - # Fixes build failure on Darwin due to missing byte order functions. - # https://github.com/cracklib/cracklib/pull/96 - (fetchpatch2 { - url = "https://github.com/cracklib/cracklib/commit/dff319e543272c1fb958261cf9ee8bb82960bc40.patch"; - hash = "sha256-QaWpEVV6l1kl4OIkJAqkXPVThbo040Rv9X2dY/+syqs="; - stripLen = 1; - }) + sourceRoot = "${finalAttrs.src.name}/src"; + + outputs = [ + "bin" + "out" + "dev" + "man" ]; - nativeBuildInputs = lib.optional ( - stdenv.hostPlatform != stdenv.buildPlatform - ) buildPackages.cracklib; + strictDeps = true; + enableParallelBuilding = true; + + nativeBuildInputs = [ + autoreconfHook + ] + ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.cracklib ]; + buildInputs = [ zlib - gettext + bash ]; - postPatch = - lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' - chmod +x util/cracklib-format - patchShebangs util + configureFlags = [ + "--without-python" + ]; + postInstall = + # For cross compilation use the tools from nativeBuildInputs. Otherwise use + # the ones in the util directory of the source tree. + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + PATH=$PATH:util '' + '' - ln -vs ${toString lists} dicts/ + cracklib-format $out/share/cracklib/cracklib-small \ + | cracklib-packer $out/share/cracklib/pw_dict ''; - postInstall = '' - make dict-local - ''; - doInstallCheck = true; - installCheckTarget = "test"; + passthru = { + updateScript = nix-update-script { }; + tests = { + cross = + let + systemString = if stdenv.buildPlatform.isAarch64 then "gnu64" else "aarch64-multiplatform"; + in + pkgsCross.${systemString}.cracklib; + static = pkgsStatic.cracklib; + }; + }; - meta = with lib; { + meta = { homepage = "https://github.com/cracklib/cracklib"; - description = "Library for checking the strength of passwords"; - license = licenses.lgpl21; # Different license for the wordlist: http://www.openwall.com/wordlists - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; + description = "Password checking library"; + changelog = "https://github.com/cracklib/cracklib/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ lovek323 ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/cr/crush/package.nix b/pkgs/by-name/cr/crush/package.nix index 8ccf5e0f0454b..d7578f1aaffc1 100644 --- a/pkgs/by-name/cr/crush/package.nix +++ b/pkgs/by-name/cr/crush/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "crush"; - version = "0.6.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "crush"; tag = "v${finalAttrs.version}"; - hash = "sha256-QUYNJ2Ifny9Zj9YVQHcH80E2qa4clWVg2T075IEWujM="; + hash = "sha256-u2w19Xmcm3cx/B8QRNGaP2qeg+Cif/L92RNlJav6H3w="; }; - vendorHash = "sha256-vdzAVVGr7uTW/A/I8TcYW189E3960SCIqatu7Kb60hg="; + vendorHash = "sha256-H92TgZoWdYQ863AAb2116zJtmgkKXh2hRoEBRcn5zeA="; # rename TestMain to prevent it from running, as it panics in the sandbox. postPatch = '' diff --git a/pkgs/by-name/dj/djvulibre/CVE-2021-3500+CVE-2021-32490+CVE-2021-32491+CVE-2021-32492+CVE-2021-32493.patch b/pkgs/by-name/dj/djvulibre/CVE-2021-3500+CVE-2021-32490+CVE-2021-32491+CVE-2021-32492+CVE-2021-32493.patch deleted file mode 100644 index e305c5618d19d..0000000000000 --- a/pkgs/by-name/dj/djvulibre/CVE-2021-3500+CVE-2021-32490+CVE-2021-32491+CVE-2021-32492+CVE-2021-32493.patch +++ /dev/null @@ -1,105 +0,0 @@ -From cd8b5c97b27a5c1dc83046498b6ca49ad20aa9b6 Mon Sep 17 00:00:00 2001 -From: Leon Bottou -Date: Tue, 11 May 2021 14:44:09 -0400 -Subject: [PATCH] Reviewed Fedora patches and adopted some of them (or variants - thereof) - - - Patch0: djvulibre-3.5.22-cdefs.patch (forward ported) -Does not make imuch sense. GSmartPointer.h already includes "stddef.h" - - Patch6: djvulibre-3.5.27-export-file.patch (forward ported) -Incorrect: inkscape command is --export-png, not --export-filename. - - Patch8: djvulibre-3.5.27-check-image-size.patch (forward ported) -Correct: adopted a variant of this - - Patch9: djvulibre-3.5.27-integer-overflow.patch (forward ported) -Correct: adopted a variant of this - - Patch10: djvulibre-3.5.27-check-input-pool.patch (forward ported) -Adopted: input validation never hurts - - Patch11: djvulibre-3.5.27-djvuport-stack-overflow.patch (forward ported) -Dubious: Instead I changed djvufile to prevent a file from including itself -which is the only way I can imagine to create an file creation loop. - - Patch12: djvulibre-3.5.27-unsigned-short-overflow.patch (forward ported) -Adopted: but without including limits.h ---- - libdjvu/DataPool.cpp | 3 ++- - libdjvu/DjVuFile.cpp | 2 ++ - libdjvu/GBitmap.cpp | 2 ++ - libdjvu/IW44Image.cpp | 4 ++++ - tools/ddjvu.cpp | 7 +++++-- - 5 files changed, 15 insertions(+), 3 deletions(-) - -diff --git a/libdjvu/DataPool.cpp b/libdjvu/DataPool.cpp -index 5fcbedf..b58fc45 100644 ---- a/libdjvu/DataPool.cpp -+++ b/libdjvu/DataPool.cpp -@@ -790,7 +790,8 @@ DataPool::create(const GP & pool, int start, int length) - { - DEBUG_MSG("DataPool::DataPool: pool=" << (void *)((DataPool *)pool) << " start=" << start << " length= " << length << "\n"); - DEBUG_MAKE_INDENT(3); -- -+ if (!pool) -+ G_THROW( ERR_MSG("DataPool.zero_DataPool") ); - DataPool *xpool=new DataPool(); - GP retval=xpool; - xpool->init(); -diff --git a/libdjvu/DjVuFile.cpp b/libdjvu/DjVuFile.cpp -index 143346b..2587491 100644 ---- a/libdjvu/DjVuFile.cpp -+++ b/libdjvu/DjVuFile.cpp -@@ -576,6 +576,8 @@ DjVuFile::process_incl_chunk(ByteStream & str, int file_num) - GURL incl_url=pcaster->id_to_url(this, incl_str); - if (incl_url.is_empty()) // Fallback. Should never be used. - incl_url=GURL::UTF8(incl_str,url.base()); -+ if (incl_url == url) // Infinite loop avoidance -+ G_THROW( ERR_MSG("DjVuFile.malformed") ); - - // Now see if there is already a file with this *name* created - { -diff --git a/libdjvu/GBitmap.cpp b/libdjvu/GBitmap.cpp -index c2fdbe4..8ad64b2 100644 ---- a/libdjvu/GBitmap.cpp -+++ b/libdjvu/GBitmap.cpp -@@ -1284,6 +1284,8 @@ GBitmap::decode(unsigned char *runs) - // initialize pixel array - if (nrows==0 || ncolumns==0) - G_THROW( ERR_MSG("GBitmap.not_init") ); -+ if (ncolumns + border != (unsigned short)(ncolumns+border)) -+ G_THROW("GBitmap: image size exceeds maximum (corrupted file?)"); - bytes_per_row = ncolumns + border; - if (runs==0) - G_THROW( ERR_MSG("GBitmap.null_arg") ); -diff --git a/libdjvu/IW44Image.cpp b/libdjvu/IW44Image.cpp -index e8d4b44..4a1797e 100644 ---- a/libdjvu/IW44Image.cpp -+++ b/libdjvu/IW44Image.cpp -@@ -676,9 +676,13 @@ IW44Image::Map::image(signed char *img8, int rowsize, int pixsep, int fast) - // Allocate reconstruction buffer - short *data16; - size_t sz = bw * bh; -+ if (sz == 0) -+ G_THROW("IW44Image: image size is zero (corrupted file?)"); - if (sz / (size_t)bw != (size_t)bh) // multiplication overflow - G_THROW("IW44Image: image size exceeds maximum (corrupted file?)"); - GPBuffer gdata16(data16,sz); -+ if (data16 == 0) -+ G_THROW("IW44Image: unable to allocate image buffer"); - // Copy coefficients - int i; - short *p = data16; -diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp -index 7109952..e7b489b 100644 ---- a/tools/ddjvu.cpp -+++ b/tools/ddjvu.cpp -@@ -393,8 +393,11 @@ render(ddjvu_page_t *page, int pageno) - } else if (style == DDJVU_FORMAT_GREY8) - rowsize = rrect.w; - else -- rowsize = rrect.w * 3; -- if (! (image = (char*)malloc(rowsize * rrect.h))) -+ rowsize = rrect.w * 3; -+ size_t bufsize = (size_t)rowsize * rrect.h; -+ if (bufsize / rowsize != rrect.h) -+ die(i18n("Integer overflow when allocating image buffer for page %d"), pageno); -+ if (! (image = (char*)malloc(bufsize))) - die(i18n("Cannot allocate image buffer for page %d"), pageno); - - /* Render */ \ No newline at end of file diff --git a/pkgs/by-name/dj/djvulibre/c++17-register-class.patch b/pkgs/by-name/dj/djvulibre/c++17-register-class.patch deleted file mode 100644 index 88251b34f7732..0000000000000 --- a/pkgs/by-name/dj/djvulibre/c++17-register-class.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur a/libdjvu/GBitmap.h b/libdjvu/GBitmap.h ---- a/libdjvu/GBitmap.h 2020-11-20 09:57:32.000000000 -0700 -+++ b/libdjvu/GBitmap.h 2023-07-07 07:07:45.519912414 -0600 -@@ -620,7 +620,7 @@ - inline int - GBitmap::read_run(unsigned char *&data) - { -- register int z=*data++; -+ int z=*data++; - return (z>=RUNOVERFLOWVALUE)? - ((z&~RUNOVERFLOWVALUE)<<8)|(*data++):z; - } -@@ -628,7 +628,7 @@ - inline int - GBitmap::read_run(const unsigned char *&data) - { -- register int z=*data++; -+ int z=*data++; - return (z>=RUNOVERFLOWVALUE)? - ((z&~RUNOVERFLOWVALUE)<<8)|(*data++):z; - } diff --git a/pkgs/by-name/dj/djvulibre/package.nix b/pkgs/by-name/dj/djvulibre/package.nix index ba1b0361f53ff..ecf5185939dc6 100644 --- a/pkgs/by-name/dj/djvulibre/package.nix +++ b/pkgs/by-name/dj/djvulibre/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "djvulibre"; - version = "3.5.28"; + version = "3.5.29"; src = fetchurl { url = "mirror://sourceforge/djvu/${pname}-${version}.tar.gz"; - sha256 = "1p1fiygq9ny8aimwc4vxwjc6k9ykgdsq1sq06slfbzalfvm0kl7w"; + hash = "sha256-07SwOuK9yoUWo2726ye3d/BSjJ7aJnRdmWKCSj/f7M8="; }; outputs = [ @@ -40,14 +40,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = [ - # Remove uses of the `register` storage class specifier, which was removed in C++17. - # Fixes compilation with clang 16, which defaults to C++17. - ./c++17-register-class.patch - - ./CVE-2021-3500+CVE-2021-32490+CVE-2021-32491+CVE-2021-32492+CVE-2021-32493.patch - ]; - meta = with lib; { description = "Big set of CLI tools to make/modify/optimize/show/export DJVU files"; homepage = "https://djvu.sourceforge.net"; diff --git a/pkgs/by-name/dr/draupnir/hashes.json b/pkgs/by-name/dr/draupnir/hashes.json index a509437a39888..25bf893bf38c0 100644 --- a/pkgs/by-name/dr/draupnir/hashes.json +++ b/pkgs/by-name/dr/draupnir/hashes.json @@ -1,3 +1,3 @@ { - "yarn_offline_cache_hash": "sha256-SoCuCzrKUWWsD/oEh2W3/T1/hhd7ghfpeBojo84sEI8=" + "yarn_offline_cache_hash": "sha256-xB9SKCM9m2LotwxIzGgT72mLgrDW2spqvR5VoyexIAA=" } diff --git a/pkgs/by-name/dr/draupnir/package.json b/pkgs/by-name/dr/draupnir/package.json index bbd5e30084f3e..5cbbdbf553c85 100644 --- a/pkgs/by-name/dr/draupnir/package.json +++ b/pkgs/by-name/dr/draupnir/package.json @@ -1,6 +1,6 @@ { "name": "draupnir", - "version": "2.6.1", + "version": "2.6.0", "description": "A moderation tool for Matrix", "main": "lib/index.js", "repository": "https://github.com/the-draupnir-project/Draupnir.git", @@ -63,8 +63,8 @@ "jsdom": "^24.0.0", "matrix-appservice-bridge": "^10.3.1", "matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.7.1-element.6", - "matrix-protection-suite": "npm:@gnuxie/matrix-protection-suite@3.11.0", - "matrix-protection-suite-for-matrix-bot-sdk": "npm:@gnuxie/matrix-protection-suite-for-matrix-bot-sdk@3.11.0", + "matrix-protection-suite": "npm:@gnuxie/matrix-protection-suite@3.10.0", + "matrix-protection-suite-for-matrix-bot-sdk": "npm:@gnuxie/matrix-protection-suite-for-matrix-bot-sdk@3.8.0", "pg": "^8.8.0", "yaml": "^2.3.2" }, diff --git a/pkgs/by-name/dr/draupnir/package.nix b/pkgs/by-name/dr/draupnir/package.nix index c36d4823a41b3..ef61dcf66e029 100644 --- a/pkgs/by-name/dr/draupnir/package.nix +++ b/pkgs/by-name/dr/draupnir/package.nix @@ -22,13 +22,13 @@ let in mkYarnPackage rec { pname = "draupnir"; - version = "2.6.1"; + version = "2.6.0"; src = fetchFromGitHub { owner = "the-draupnir-project"; repo = "Draupnir"; tag = "v${version}"; - hash = "sha256-KO2jm9yD/LnJSY1dAbPQ2fJZhmrxWJHU+TIaZzK97bg="; + hash = "sha256-v6dHexu9x60onBoHbdI+15p6r5m6mi7bRLgZ9jqF19s="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/e2/e2fsprogs/package.nix b/pkgs/by-name/e2/e2fsprogs/package.nix index be1620f2ffe8d..90955113c3541 100644 --- a/pkgs/by-name/e2/e2fsprogs/package.nix +++ b/pkgs/by-name/e2/e2fsprogs/package.nix @@ -18,24 +18,20 @@ stdenv.mkDerivation rec { pname = "e2fsprogs"; - version = "1.47.2"; + version = "1.47.3"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${version}/e2fsprogs-${version}.tar.xz"; - hash = "sha256-CCQuZMoOgZTZwcqtSXYrGSCaBjGBmbY850rk7y105jw="; + hash = "sha256-hX5u+AD+qiu0V4+8gQIUvl08iLBy6lPFOEczqWVzcyk="; }; - # 2025-05-31: Fix libarchive, from https://github.com/tytso/e2fsprogs/pull/230 patches = [ + # Upstream patch that fixes musl build (and probably others). + # Should be included in next release after 1.47.3. (fetchpatch { - name = "0001-create_inode_libarchive.c-define-libarchive-dylib-for-darwin.patch"; - url = "https://github.com/tytso/e2fsprogs/commit/e86c65bc7ee276cd9ca920d96e18ed0cddab3412.patch"; - hash = "sha256-HFZAznaNl5rzgVEvYx1LDKh2jd/VEXD/o0wypIh4TR8="; - }) - (fetchpatch { - name = "0002-mkgnutar.pl-avoid-uninitialized-username-variable.patch"; - url = "https://github.com/tytso/e2fsprogs/commit/9217c359db1d1b6d031a0e2ca9a885634fed00da.patch"; - hash = "sha256-iDXmLq77eJolH1mkXSbvZ9tRVtGQt2F45CdkVphUZSs="; + name = "stdio-portability.patch"; + url = "https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/patch/?id=f79abd8554e600eacc2a7c864a8332b670c9e262"; + hash = "sha256-zZ7zmSMTwGyS3X3b/D/mVG0bV2ul5xtY5DJx9YUvQO8="; }) ]; diff --git a/pkgs/by-name/ed/edencommon/package.nix b/pkgs/by-name/ed/edencommon/package.nix index 85fe05ee86ab4..0eaa0c65fa5f0 100644 --- a/pkgs/by-name/ed/edencommon/package.nix +++ b/pkgs/by-name/ed/edencommon/package.nix @@ -6,7 +6,6 @@ cmake, ninja, - sanitiseHeaderPathsHook, glog, gflags, @@ -46,7 +45,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ninja - sanitiseHeaderPathsHook ]; buildInputs = [ diff --git a/pkgs/by-name/ei/eigen/package.nix b/pkgs/by-name/ei/eigen/package.nix index eaa2988481847..898f83d2d1362 100644 --- a/pkgs/by-name/ei/eigen/package.nix +++ b/pkgs/by-name/ei/eigen/package.nix @@ -20,6 +20,14 @@ stdenv.mkDerivation { ./include-dir.patch ]; + # ref. https://gitlab.com/libeigen/eigen/-/merge_requests/977 + # This was merged upstream and can be removed on next release + postPatch = '' + substituteInPlace Eigen/src/SVD/BDCSVD.h --replace-fail \ + "if (l == 0) {" \ + "if (i >= k && l == 0) {" + ''; + nativeBuildInputs = [ cmake ]; meta = with lib; { diff --git a/pkgs/by-name/el/element-desktop/keytar/default.nix b/pkgs/by-name/el/element-desktop/keytar/default.nix index 38461bbbc1e79..b8fb11b92a552 100644 --- a/pkgs/by-name/el/element-desktop/keytar/default.nix +++ b/pkgs/by-name/el/element-desktop/keytar/default.nix @@ -53,16 +53,7 @@ stdenv.mkDerivation rec { # Make sure the native modules are built against electron's ABI "--nodedir=${electron.headers}" # https://nodejs.org/api/os.html#osarch - "--arch=${ - if stdenv.hostPlatform.parsed.cpu.name == "i686" then - "ia32" - else if stdenv.hostPlatform.parsed.cpu.name == "x86_64" then - "x64" - else if stdenv.hostPlatform.parsed.cpu.name == "aarch64" then - "arm64" - else - stdenv.hostPlatform.parsed.cpu.name - }" + "--arch=${stdenv.hostPlatform.node.arch}" ]; installPhase = '' diff --git a/pkgs/by-name/en/enblend-enfuse/package.nix b/pkgs/by-name/en/enblend-enfuse/package.nix index 931359afb4331..a7d013ea5c746 100644 --- a/pkgs/by-name/en/enblend-enfuse/package.nix +++ b/pkgs/by-name/en/enblend-enfuse/package.nix @@ -8,6 +8,7 @@ glew, gsl, lcms2, + libjpeg, libpng, libtiff, libGLU, @@ -35,6 +36,7 @@ stdenv.mkDerivation { glew gsl lcms2 + libjpeg libpng libtiff libGLU diff --git a/pkgs/by-name/eo/eos-installer/package.nix b/pkgs/by-name/eo/eos-installer/package.nix index db327b5dd08c7..caf17d6772033 100644 --- a/pkgs/by-name/eo/eos-installer/package.nix +++ b/pkgs/by-name/eo/eos-installer/package.nix @@ -14,6 +14,7 @@ gtk3, systemdMinimal, udisks, + xz, }: stdenv.mkDerivation rec { @@ -42,6 +43,7 @@ stdenv.mkDerivation rec { gtk3 systemdMinimal udisks + xz ]; preConfigure = '' diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix index fce4a85e7f8cf..1cb87cff635e0 100644 --- a/pkgs/by-name/es/esphome/package.nix +++ b/pkgs/by-name/es/esphome/package.nix @@ -69,7 +69,8 @@ python.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools==80.9.0" "setuptools" + --replace-fail "setuptools==80.9.0" "setuptools" \ + --replace-fail "wheel>=0.43,<0.46" "wheel" ''; # Remove esptool and platformio from requirements diff --git a/pkgs/by-name/fb/fbthrift/package.nix b/pkgs/by-name/fb/fbthrift/package.nix index b7b61a363a82d..8d6ab8df0fb0c 100644 --- a/pkgs/by-name/fb/fbthrift/package.nix +++ b/pkgs/by-name/fb/fbthrift/package.nix @@ -7,7 +7,6 @@ cmake, ninja, - sanitiseHeaderPathsHook, openssl, gflags, @@ -64,7 +63,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ninja - sanitiseHeaderPathsHook ]; buildInputs = [ diff --git a/pkgs/by-name/fi/fizz/package.nix b/pkgs/by-name/fi/fizz/package.nix index 62b7842324213..b100518c0e0d8 100644 --- a/pkgs/by-name/fi/fizz/package.nix +++ b/pkgs/by-name/fi/fizz/package.nix @@ -6,7 +6,6 @@ cmake, ninja, - sanitiseHeaderPathsHook, openssl, glog, @@ -48,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ninja - sanitiseHeaderPathsHook ]; buildInputs = [ diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix index 4589aeac7ed92..569696bf9f7ea 100644 --- a/pkgs/by-name/fo/folly/package.nix +++ b/pkgs/by-name/fo/folly/package.nix @@ -8,7 +8,6 @@ cmake, ninja, pkg-config, - sanitiseHeaderPathsHook, double-conversion, fast-float, @@ -59,7 +58,6 @@ stdenv.mkDerivation (finalAttrs: { cmake ninja pkg-config - sanitiseHeaderPathsHook ]; # See CMake/folly-deps.cmake in the Folly source tree. diff --git a/pkgs/by-name/ga/game-music-emu/package.nix b/pkgs/by-name/ga/game-music-emu/package.nix index ca782008a7b9f..b7410ac393786 100644 --- a/pkgs/by-name/ga/game-music-emu/package.nix +++ b/pkgs/by-name/ga/game-music-emu/package.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { remove-references-to -t ${stdenv.cc.cc} "$(readlink -f $out/lib/libgme.so)" ''; - meta = with lib; { + meta = { homepage = "https://github.com/libgme/game-music-emu/"; description = "Collection of video game music file emulators"; - license = licenses.lgpl21Plus; - platforms = platforms.all; - maintainers = with maintainers; [ ]; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix index 884cb31f11cb4..664edf9b73df3 100644 --- a/pkgs/by-name/gi/gitaly/package.nix +++ b/pkgs/by-name/gi/gitaly/package.nix @@ -7,7 +7,7 @@ }: let - version = "18.2.2"; + version = "18.2.1"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -21,7 +21,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-+OmduG9neb15m3i57qPfE42HI4w/zgmA5T6bhlwzrT0="; + hash = "sha256-h4JklXImKwudJT3pb/UhHwQHKd87c5aSH1xYC0lRWKo="; }; vendorHash = "sha256-RjDV4NGmmdT9STQBHiYf3UUYwPmuSg6970/W/ekxin0="; diff --git a/pkgs/by-name/gi/gitlab-container-registry/fix-broken-urlcache-tests.diff b/pkgs/by-name/gi/gitlab-container-registry/fix-broken-urlcache-tests.diff deleted file mode 100644 index 2da75604d95f3..0000000000000 --- a/pkgs/by-name/gi/gitlab-container-registry/fix-broken-urlcache-tests.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/registry/storage/driver/middleware/urlcache/urlcache_test.go b/registry/storage/driver/middleware/urlcache/urlcache_test.go -index 67ef4abc0e..6644c80837 100644 ---- a/registry/storage/driver/middleware/urlcache/urlcache_test.go -+++ b/registry/storage/driver/middleware/urlcache/urlcache_test.go -@@ -37,7 +37,7 @@ - name: "missing redis cache", - options: make(map[string]any), - wantErr: true, -- errContains: "urlcache middleware requires `cache` Redis configured", -+ errContains: "`_redisCache` key has not been passed to urlcache middleware", - }, - { - name: "default configuration with redis", -@@ -231,7 +231,7 @@ - "_redisCache": "not a redis cache", - }, - wantErr: true, -- errContains: "unusable redis cache object", -+ errContains: "redis cache passed to the middleware cannot be used as the type is wrong", - }, - } - diff --git a/pkgs/by-name/gi/gitlab-container-registry/package.nix b/pkgs/by-name/gi/gitlab-container-registry/package.nix index cbf8c0f80ede2..217966c4b1eb4 100644 --- a/pkgs/by-name/gi/gitlab-container-registry/package.nix +++ b/pkgs/by-name/gi/gitlab-container-registry/package.nix @@ -6,7 +6,7 @@ buildGoModule rec { pname = "gitlab-container-registry"; - version = "4.26.0"; + version = "4.25.0"; rev = "v${version}-gitlab"; # nixpkgs-update: no auto update @@ -14,16 +14,10 @@ buildGoModule rec { owner = "gitlab-org"; repo = "container-registry"; inherit rev; - hash = "sha256-XACKJW5sRXNM4Q24DXEVtjzhVfxoBd+JWHJr1s01ocA="; + hash = "sha256-7jzKFC29NAHi5iag6aA/5LzH6IyqMa3yAxtzV9OsBnQ="; }; - patches = [ - # https://gitlab.com/gitlab-org/container-registry/-/merge_requests/2447 - # Can be removed with next released when merged - ./fix-broken-urlcache-tests.diff - ]; - - vendorHash = "sha256-J4p3vXLmDFYl/z6crqanlmG1FB4Dq04HLx9IhC3usQ4="; + vendorHash = "sha256-z9IlfyJ48FQzhbY38GbZaeQjg3cMDU8tLCXKhazP64A="; checkFlags = let diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix index e5d5874ba7bb9..452d624d23e2d 100644 --- a/pkgs/by-name/gi/gitlab-pages/package.nix +++ b/pkgs/by-name/gi/gitlab-pages/package.nix @@ -6,14 +6,14 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "18.2.2"; + version = "18.2.1"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-PPa9SYyE3G+peP2xSpNw7WDDO7WiWKSRpd5tBODkA0g="; + hash = "sha256-z1Pl3xeaoqeF/9qOVcuCpuciu1r6NQ4UhlLe9gy9+nE="; }; vendorHash = "sha256-OubXCpvGtGqegQmdb6R1zw/0DfQ4FdbJGt7qYYRnWnA="; diff --git a/pkgs/by-name/gi/gitlab/data.json b/pkgs/by-name/gi/gitlab/data.json index e14fe7e4fd697..c170a0a5d80bd 100644 --- a/pkgs/by-name/gi/gitlab/data.json +++ b/pkgs/by-name/gi/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "18.2.2", - "repo_hash": "0fqpfprxmgxaz5g0d5z4gsir1zj9fkhli7iq1ahx413ymsiqrxd0", - "yarn_hash": "0c6njrciqcjaswh784yxly4qza6k2ghq1ljbdkcn65cna4f4hwgk", + "version": "18.2.1", + "repo_hash": "1i0y46w18476gn98fmkixdjiyrwajz2347p57dg2ijch4ivzpmlv", + "yarn_hash": "04mqinnbhr6zgab2p1bq6y6b20bf4c4cynkgfc67mzm9xhybr3fk", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v18.2.2-ee", + "rev": "v18.2.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "18.2.2", - "GITLAB_PAGES_VERSION": "18.2.2", + "GITALY_SERVER_VERSION": "18.2.1", + "GITLAB_PAGES_VERSION": "18.2.1", "GITLAB_SHELL_VERSION": "14.43.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.7.0", - "GITLAB_WORKHORSE_VERSION": "18.2.2" + "GITLAB_WORKHORSE_VERSION": "18.2.1" } } diff --git a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix index 2bec55c365707..739a24476dec8 100644 --- a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix @@ -10,7 +10,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "18.2.2"; + version = "18.2.1"; # nixpkgs-update: no auto update src = fetchFromGitLab { diff --git a/pkgs/by-name/gl/glslang/package.nix b/pkgs/by-name/gl/glslang/package.nix index 47fcfdf24115d..a4e3e5a6987d5 100644 --- a/pkgs/by-name/gl/glslang/package.nix +++ b/pkgs/by-name/gl/glslang/package.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation rec { pname = "glslang"; - version = "15.3.0"; + version = "15.4.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; rev = version; - hash = "sha256-HwFP4KJuA+BMQVvBWV0BCRj9U5I3CLEU+5bBtde2f6w="; + hash = "sha256-sPc+G7/ua7LQ7scuSvqWs7Q7Q+gFvXQ5wGQsEXbWH6w="; }; outputs = [ diff --git a/pkgs/by-name/gn/gn/generic.nix b/pkgs/by-name/gn/gn/generic.nix deleted file mode 100644 index 98328fcd97f38..0000000000000 --- a/pkgs/by-name/gn/gn/generic.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ - stdenv, - lib, - fetchgit, - fetchpatch, - cctools, - writeText, - ninja, - python3, - ... -}: - -{ - rev, - revNum, - version, - sha256, -}: - -let - revShort = builtins.substring 0 7 rev; - lastCommitPosition = writeText "last_commit_position.h" '' - #ifndef OUT_LAST_COMMIT_POSITION_H_ - #define OUT_LAST_COMMIT_POSITION_H_ - - #define LAST_COMMIT_POSITION_NUM ${revNum} - #define LAST_COMMIT_POSITION "${revNum} (${revShort})" - - #endif // OUT_LAST_COMMIT_POSITION_H_ - ''; - -in -stdenv.mkDerivation { - pname = "gn-unstable"; - inherit version; - - src = fetchgit { - # Note: The TAR-Archives (+archive/${rev}.tar.gz) are not deterministic! - url = "https://gn.googlesource.com/gn"; - inherit rev sha256; - }; - - nativeBuildInputs = [ - ninja - python3 - ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - cctools - ]; - - env.NIX_CFLAGS_COMPILE = "-Wno-error"; - # Relax hardening as otherwise gn unstable 2024-06-06 and later fail with: - # cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security] - hardeningDisable = [ "format" ]; - - buildPhase = '' - python build/gen.py --no-last-commit-position - ln -s ${lastCommitPosition} out/last_commit_position.h - ninja -j $NIX_BUILD_CORES -C out gn - ''; - - installPhase = '' - install -vD out/gn "$out/bin/gn" - ''; - - setupHook = ./setup-hook.sh; - - meta = with lib; { - description = "Meta-build system that generates build files for Ninja"; - mainProgram = "gn"; - homepage = "https://gn.googlesource.com/gn"; - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = with maintainers; [ - stesie - matthewbauer - ]; - }; -} diff --git a/pkgs/by-name/gn/gn/package.nix b/pkgs/by-name/gn/gn/package.nix index fa3322edd2222..988151f91b129 100644 --- a/pkgs/by-name/gn/gn/package.nix +++ b/pkgs/by-name/gn/gn/package.nix @@ -1,10 +1,102 @@ -{ callPackage, ... }@args: +{ + stdenv, + lib, + fetchgit, + cctools, + ninja, + python3, -callPackage ./generic.nix args { # Note: Please use the recommended version for Chromium stable, i.e. from # /pkgs/applications/networking/browsers/chromium/info.json - rev = "85cc21e94af590a267c1c7a47020d9b420f8a033"; - revNum = "2233"; # git describe $rev --match initial-commit | cut -d- -f3 - version = "2025-04-28"; - sha256 = "sha256-+nKP2hBUKIqdNfDz1vGggXSdCuttOt0GwyGUQ3Z1ZHI="; + version ? + # This is a workaround for update-source-version to be able to update this + let + _version = "0-unstable-2025-06-19"; + in + _version, + rev ? "97b68a0bb62b7528bc3491c7949d6804223c2b82", + hash ? "sha256-gwptzuirIdPAV9XCaAT09aM/fY7d6xgBU7oSu9C4tmE=", +}: + +stdenv.mkDerivation { + pname = "gn"; + inherit version; + + src = fetchgit { + url = "https://gn.googlesource.com/gn"; + inherit rev hash; + leaveDotGit = true; + deepClone = true; + postFetch = '' + cd "$out" + mkdir .nix-files + git rev-parse --short=12 HEAD > .nix-files/REV_SHORT + git describe --match initial-commit | cut -d- -f3 > .nix-files/REV_NUM + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; + }; + + nativeBuildInputs = [ + ninja + python3 + ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + cctools + ]; + + env.NIX_CFLAGS_COMPILE = "-Wno-error"; + # Relax hardening as otherwise gn unstable 2024-06-06 and later fail with: + # cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security] + hardeningDisable = [ "format" ]; + + configurePhase = '' + runHook preConfigure + + python build/gen.py --no-last-commit-position + cat > out/last_commit_position.h << EOF + #ifndef OUT_LAST_COMMIT_POSITION_H_ + #define OUT_LAST_COMMIT_POSITION_H_ + + #define LAST_COMMIT_POSITION_NUM $(<.nix-files/REV_NUM) + #define LAST_COMMIT_POSITION "$(<.nix-files/REV_NUM) ($(<.nix-files/REV_SHORT))" + + #endif // OUT_LAST_COMMIT_POSITION_H_ + EOF + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + ninja -v -j $NIX_BUILD_CORES -C out gn + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -vD out/gn "$out/bin/gn" + + runHook postInstall + ''; + + setupHook = ./setup-hook.sh; + + passthru.updateScript = ./update.sh; + + meta = { + description = "Meta-build system that generates build files for Ninja"; + mainProgram = "gn"; + homepage = "https://gn.googlesource.com/gn"; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ + stesie + matthewbauer + marcin-serwin + emilylange + ]; + }; } diff --git a/pkgs/by-name/gn/gn/update.sh b/pkgs/by-name/gn/gn/update.sh new file mode 100755 index 0000000000000..692426e8f149c --- /dev/null +++ b/pkgs/by-name/gn/gn/update.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p jq curl common-updater-scripts + +set -ex + +rev=$( + curl --location "https://raw.githubusercontent.com/NixOS/nixpkgs/refs/heads/master/pkgs/applications/networking/browsers/chromium/info.json" \ + | jq -r ".chromium.deps.gn.rev" +) + +commit_time=$( + curl "https://gn.googlesource.com/gn/+/$rev?format=json" \ + | sed "s/)]}'//" \ + | jq -r ".committer.time" \ + | awk '{print $2, $3, $5, $4 $6}' +) + +commit_date=$(TZ= date --date "$commit_time" --iso-8601) +version="0-unstable-$commit_date" + +update-source-version --rev="$rev" --version-key="_version" "gn" "$version" diff --git a/pkgs/by-name/gn/gnome-disk-utility/package.nix b/pkgs/by-name/gn/gnome-disk-utility/package.nix index 6a61d64e49f67..5231521e24318 100644 --- a/pkgs/by-name/gn/gnome-disk-utility/package.nix +++ b/pkgs/by-name/gn/gnome-disk-utility/package.nix @@ -1,31 +1,32 @@ { lib, stdenv, - gettext, fetchurl, - pkg-config, - udisks2, - libhandy, - libsecret, - libdvdread, - meson, - ninja, - gtk3, + adwaita-icon-theme, + desktop-file-utils, + docbook-xsl-nons, + gettext, glib, - wrapGAppsHook3, - libnotify, - itstool, gnome, gnome-settings-daemon, - adwaita-icon-theme, - libxml2, gsettings-desktop-schemas, + gtk3, + itstool, libcanberra-gtk3, - libxslt, - docbook-xsl-nons, - desktop-file-utils, + libdvdread, + libhandy, + libnotify, libpwquality, + libsecret, + libxml2, + libxslt, + meson, + ninja, + pkg-config, systemd, + udisks2, + wrapGAppsHook3, + xz, }: stdenv.mkDerivation rec { @@ -38,32 +39,33 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson - ninja - pkg-config + desktop-file-utils + docbook-xsl-nons gettext itstool + libxml2 libxslt - docbook-xsl-nons - desktop-file-utils + meson + ninja + pkg-config wrapGAppsHook3 - libxml2 ]; buildInputs = [ - gtk3 + adwaita-icon-theme glib + gnome-settings-daemon + gsettings-desktop-schemas + gtk3 + libcanberra-gtk3 + libdvdread libhandy - libsecret - libpwquality libnotify - libdvdread - libcanberra-gtk3 - udisks2 - adwaita-icon-theme + libpwquality + libsecret systemd - gnome-settings-daemon - gsettings-desktop-schemas + udisks2 + xz ]; passthru = { diff --git a/pkgs/by-name/gp/gperftools/package.nix b/pkgs/by-name/gp/gperftools/package.nix index 6a4fe6e6af6c2..5875bf80311cd 100644 --- a/pkgs/by-name/gp/gperftools/package.nix +++ b/pkgs/by-name/gp/gperftools/package.nix @@ -5,36 +5,32 @@ fetchpatch, autoreconfHook, libunwind, - perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gperftools"; - version = "2.15"; + version = "2.17"; src = fetchFromGitHub { owner = "gperftools"; repo = "gperftools"; - rev = "gperftools-${version}"; - sha256 = "sha256-3ibr8AHzo7txX1U+9oOWA60qeeJs/OGeevv+sgBwQa0="; + tag = "gperftools-${finalAttrs.version}"; + sha256 = "sha256-Tm+sYKwFSHAxOALgr9UGv7vBMlWqUymXsvNu7Sku6Kk="; }; patches = [ # Add the --disable-general-dynamic-tls configure option: # https://bugzilla.redhat.com/show_bug.cgi?id=1483558 (fetchpatch { - url = "https://src.fedoraproject.org/rpms/gperftools/raw/f62d87a34f56f64fb8eb86727e34fbc2d3f5294a/f/gperftools-2.7.90-disable-generic-dynamic-tls.patch"; - sha256 = "02falhpaqkl27hl1dib4yvmhwsddmgbw0krb46w31fyf3awb2ydv"; + url = "https://src.fedoraproject.org/rpms/gperftools/raw/88ce8ee43a12b1a8146781a1b4d9abbd8df8af0e/f/gperftools-2.17-disable-generic-dynamic-tls.patch"; + hash = "sha256-IOLUf9mCEA+fVSJKU94akcnXTIm7+t+S9cjBHsEDwFA="; }) ]; nativeBuildInputs = [ autoreconfHook ]; # tcmalloc uses libunwind in a way that works correctly only on non-ARM dynamically linked linux - buildInputs = [ - perl - ] - ++ lib.optional ( + buildInputs = lib.optional ( stdenv.hostPlatform.isLinux && !(stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isStatic) ) libunwind; @@ -54,11 +50,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + meta = { + changelog = "https://github.com/gperftools/gperftools/releases/tag/${finalAttrs.src.tag}"; homepage = "https://github.com/gperftools/gperftools"; description = "Fast, multi-threaded malloc() and nifty performance analysis tools"; - platforms = platforms.all; - license = licenses.bsd3; - maintainers = with maintainers; [ vcunat ]; + platforms = lib.platforms.all; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ vcunat ]; }; -} +}) diff --git a/pkgs/by-name/gr/grpc/package.nix b/pkgs/by-name/gr/grpc/package.nix index f863c0b3f77bc..71eda06acd598 100644 --- a/pkgs/by-name/gr/grpc/package.nix +++ b/pkgs/by-name/gr/grpc/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, fetchpatch, - fetchurl, buildPackages, cmake, zlib, @@ -26,7 +25,7 @@ # nixpkgs-update: no auto update stdenv.mkDerivation rec { pname = "grpc"; - version = "1.73.1"; # N.B: if you change this, please update: + version = "1.74.0"; # N.B: if you change this, please update: # pythonPackages.grpcio # pythonPackages.grpcio-channelz # pythonPackages.grpcio-health-checking @@ -39,7 +38,7 @@ stdenv.mkDerivation rec { owner = "grpc"; repo = "grpc"; tag = "v${version}"; - hash = "sha256-VAr+f+xqZfrP4XfCnZ9KxVTO6pHQe9gB2DgaQuen840="; + hash = "sha256-97+llHIubNYwULSD0KxEcGN+T8bQWufaEH6QT9oTgwg="; fetchSubmodules = true; }; @@ -54,11 +53,6 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.hostPlatform.isDarwin [ # fix build of 1.63.0 and newer on darwin: https://github.com/grpc/grpc/issues/36654 ./dynamic-lookup-darwin.patch - # https://github.com/grpc/grpc/issues/39170 - (fetchurl { - url = "https://raw.githubusercontent.com/rdhafidh/vcpkg/0ae97b7b81562bd66ab99d022551db1449c079f9/ports/grpc/00017-add-src-upb.patch"; - hash = "sha256-0zaJqeCM90DTtUR6xCUorahUpiJF3D/KODYkUXQh2ok="; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/gt/gtest/package.nix b/pkgs/by-name/gt/gtest/package.nix index 33c07f339651d..f279587ffe9d1 100644 --- a/pkgs/by-name/gt/gtest/package.nix +++ b/pkgs/by-name/gt/gtest/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, cmake, ninja, - sanitiseHeaderPathsHook, # Enable C++17 support # https://github.com/google/googletest/issues/3081 # Projects that require a higher standard can override this package. @@ -48,7 +47,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja - sanitiseHeaderPathsHook ]; cmakeFlags = [ diff --git a/pkgs/by-name/hd/hdr10plus/package.nix b/pkgs/by-name/hd/hdr10plus/package.nix index 9358179afd410..d0e319eb68178 100644 --- a/pkgs/by-name/hd/hdr10plus/package.nix +++ b/pkgs/by-name/hd/hdr10plus/package.nix @@ -4,7 +4,6 @@ rust, rustPlatform, hdr10plus_tool, - fetchFromGitHub, cargo-c, fontconfig, }: @@ -19,24 +18,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hdr10plus"; # Version of the library, not the tool # See https://github.com/quietvoid/hdr10plus_tool/blob/main/hdr10plus/Cargo.toml - version = "2.1.3"; - - src = fetchFromGitHub { - owner = "quietvoid"; - repo = "hdr10plus_tool"; - # repo release snapshots are versioned per the tool - # https://github.com/quietvoid/hdr10plus_tool/releases/latest - tag = "1.7.0"; - hash = "sha256-eueB+ZrOrnySEwUpCTvC4qARCsDcHJhm088XepLTlOE="; - }; - - cargoHash = "sha256-3D0HjDtKwYoi9bpQnosC/TPNBjfiWi5m1CH1eGQpGg0="; + version = "2.1.4"; outputs = [ "out" "dev" ]; + inherit (hdr10plus_tool) src cargoDeps cargoHash; + nativeBuildInputs = [ cargo-c ]; buildInputs = [ fontconfig ]; diff --git a/pkgs/by-name/hw/hwdata/package.nix b/pkgs/by-name/hw/hwdata/package.nix index 84a8760a8a971..729918d9f25db 100644 --- a/pkgs/by-name/hw/hwdata/package.nix +++ b/pkgs/by-name/hw/hwdata/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hwdata"; - version = "0.397"; + version = "0.398"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${finalAttrs.version}"; - hash = "sha256-+sspONNszkXVl357Gs40AYvppIYFvlaeVMuei9gpLLU="; + hash = "sha256-rHpXkltESdfBDZ/dySzPgoLPs3l5jyBfNFaZYlALfnk="; }; doCheck = false; # this does build machine-specific checks (e.g. enumerates PCI bus) diff --git a/pkgs/by-name/im/imaginer/package.nix b/pkgs/by-name/im/imaginer/package.nix new file mode 100644 index 0000000000000..a73faf7fad894 --- /dev/null +++ b/pkgs/by-name/im/imaginer/package.nix @@ -0,0 +1,69 @@ +{ + lib, + appstream-glib, + blueprint-compiler, + desktop-file-utils, + fetchFromGitHub, + gettext, + glib, + gobject-introspection, + libadwaita, + libsoup_3, + meson, + ninja, + pkg-config, + python3Packages, + wrapGAppsHook4, +}: + +python3Packages.buildPythonApplication rec { + pname = "imaginer"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "ImaginerApp"; + repo = "Imaginer"; + rev = "v${version}"; + hash = "sha256-x1ZnmfaMfxnITiuFDlMPfTU8KZbd1ME9jDevnlsrbJs="; + }; + + format = "other"; + dontWrapGApps = true; + + nativeBuildInputs = [ + appstream-glib + blueprint-compiler + desktop-file-utils + gettext + glib + gobject-introspection + meson + ninja + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + libadwaita + libsoup_3 + ]; + + propagatedBuildInputs = with python3Packages; [ + openai + pillow + pygobject3 + requests + ]; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = with lib; { + homepage = "https://github.com/ImaginerApp/Imaginer"; + description = "AI image generator for GNOME"; + mainProgram = "imaginer"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ _0xMRTT ]; + }; +} diff --git a/pkgs/by-name/im/imath/package.nix b/pkgs/by-name/im/imath/package.nix index f72e0341ee060..4ce7105df9361 100644 --- a/pkgs/by-name/im/imath/package.nix +++ b/pkgs/by-name/im/imath/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "imath"; - version = "3.1.12"; + version = "3.2.0"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "imath"; rev = "v${version}"; - sha256 = "sha256-r4FNyNsWdmpZrHOpSvaSUWRYhAU+qnW4lE5uYPKn7Mw="; + sha256 = "sha256-tdJh8aRVakdu2zDeGA/0JCCNzdv6s6x55eUpgNJtuI0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ip/iproute2/package.nix b/pkgs/by-name/ip/iproute2/package.nix index 254c37e6b4739..77fe6c6bcc292 100644 --- a/pkgs/by-name/ip/iproute2/package.nix +++ b/pkgs/by-name/ip/iproute2/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, buildPackages, bison, flex, @@ -11,6 +12,7 @@ elfutils, libmnl, libbpf, + python3, gitUpdater, pkgsStatic, }: @@ -25,6 +27,16 @@ stdenv.mkDerivation rec { }; patches = [ + (fetchpatch { + name = "color-assume-background-is-dark-if-unknown.patch"; + url = "https://git.kernel.org/pub/scm/network/iproute2/iproute2-next.git/patch/?id=cc0f1109d2864686180ba2ce6fba5fcb3bf437bf"; + hash = "sha256-BGD70cXKnDvk7IEU5RQA+pn1dErWjgr74GeSkYtFXoI="; + }) + (fetchpatch { + name = "color-do-not-use-dark-blue-in-dark-background-palette.patch"; + url = "https://git.kernel.org/pub/scm/network/iproute2/iproute2-next.git/patch/?id=46a4659313c2610427a088d8f03b731819f2b87a"; + hash = "sha256-TXrmGZNsYWdYLsLoBXZEr3cd8HT4EhRg+jACRrC0gKE="; + }) (fetchurl { name = "musl-endian.patch"; url = "https://lore.kernel.org/netdev/20240712191209.31324-1-contact@hacktivis.me/raw"; @@ -85,6 +97,7 @@ stdenv.mkDerivation rec { db iptables libmnl + python3 ] # needed to uploaded bpf programs ++ lib.optionals (!stdenv.hostPlatform.isStatic) [ diff --git a/pkgs/by-name/ja/jansson/package.nix b/pkgs/by-name/ja/jansson/package.nix index bb0035b976694..1478f46feae73 100644 --- a/pkgs/by-name/ja/jansson/package.nix +++ b/pkgs/by-name/ja/jansson/package.nix @@ -35,6 +35,12 @@ stdenv.mkDerivation (finalAttrs: { "-DJANSSON_BUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" ]; + postFixup = '' + # Incorrectly references the dev output, libjansson.so is in out + substituteInPlace $dev/lib/cmake/jansson/janssonTargets-release.cmake \ + --replace-fail "\''${_IMPORT_PREFIX}/lib" "$out/lib" + ''; + passthru = { tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; updateScript = nix-update-script { }; diff --git a/pkgs/by-name/je/jellyfin-tui/package.nix b/pkgs/by-name/je/jellyfin-tui/package.nix index 5b7840e4b4a65..0c6b659a011e2 100644 --- a/pkgs/by-name/je/jellyfin-tui/package.nix +++ b/pkgs/by-name/je/jellyfin-tui/package.nix @@ -43,10 +43,6 @@ rustPlatform.buildRustPackage rec { ''; doInstallCheck = true; - postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' - install -Dm644 src/extra/jellyfin-tui.desktop $out/share/applications/jellyfin-tui.desktop - ''; - passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/kb/kbd/package.nix b/pkgs/by-name/kb/kbd/package.nix index 986d1c15cdcec..ff4a1c3403fdb 100644 --- a/pkgs/by-name/kb/kbd/package.nix +++ b/pkgs/by-name/kb/kbd/package.nix @@ -8,35 +8,42 @@ flex, check, pam, + bash, coreutils, gzip, bzip2, xz, zstd, gitUpdater, + withVlock ? true, }: stdenv.mkDerivation rec { pname = "kbd"; - version = "2.7.1"; + version = "2.8.0"; src = fetchurl { url = "mirror://kernel/linux/utils/kbd/${pname}-${version}.tar.xz"; - sha256 = "sha256-8WfYmdkrVszxL29JNVFz+ThwqV8V2K7r9f3NKKYhrKg="; + hash = "sha256-AfWAbafR009ZS3sqauGrIyFTRM8QZOjtzTqQ/vl3ahE="; }; # vlock is moved into its own output, since it depends on pam. This # reduces closure size for most use cases. outputs = [ "out" - "vlock" "dev" + "scripts" + "man" + ] + ++ lib.optionals withVlock [ + "vlock" ]; configureFlags = [ "--enable-optional-progs" "--enable-libkeymap" "--disable-nls" + (lib.enableFeature withVlock "vlock") ] ++ lib.optionals (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" @@ -74,23 +81,29 @@ stdenv.mkDerivation rec { src/vlock/Makefile.am ''; + enableParallelBuilding = true; + postInstall = '' - for i in $out/bin/unicode_{start,stop}; do - substituteInPlace "$i" \ - --replace /usr/bin/tty ${coreutils}/bin/tty + for s in unicode_{start,stop}; do + substituteInPlace ''${!outputBin}/bin/$s \ + --replace-fail /usr/bin/tty ${coreutils}/bin/tty + moveToOutput "bin/$s" "$scripts" done ''; buildInputs = [ check - pam - ]; + bash + ] + ++ lib.optionals withVlock [ pam ]; + NIX_LDFLAGS = lib.optional stdenv.hostPlatform.isStatic "-laudit"; nativeBuildInputs = [ autoreconfHook pkg-config flex ]; + strictDeps = true; passthru.tests = { inherit (nixosTests) keymap kbd-setfont-decompress kbd-update-search-paths-patch; diff --git a/pkgs/by-name/ke/kexec-tools/package.nix b/pkgs/by-name/ke/kexec-tools/package.nix index 13d3f55f1f409..9c32fb24d70d1 100644 --- a/pkgs/by-name/ke/kexec-tools/package.nix +++ b/pkgs/by-name/ke/kexec-tools/package.nix @@ -23,17 +23,19 @@ stdenv.mkDerivation rec { }; patches = [ - # Use ELFv2 ABI on ppc64be - (fetchpatch { - url = "https://raw.githubusercontent.com/void-linux/void-packages/6c1192cbf166698932030c2e3de71db1885a572d/srcpkgs/kexec-tools/patches/ppc64-elfv2.patch"; - sha256 = "19wzfwb0azm932v0vhywv4221818qmlmvdfwpvvpfyw4hjsc2s1l"; - }) # Fix for static builds, will likely be removable on the next release (fetchpatch { url = "https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/patch/?id=daa29443819d3045338792b5ba950ed90e79d7a5"; hash = "sha256-Nq5HIcLY6KSvvrs2sbfE/vovMbleJYElHW9AVRU5rSA="; }) ] + ++ lib.optionals (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isAbiElfv2) [ + # Use ELFv2 ABI on ppc64be + (fetchpatch { + url = "https://raw.githubusercontent.com/void-linux/void-packages/6c1192cbf166698932030c2e3de71db1885a572d/srcpkgs/kexec-tools/patches/ppc64-elfv2.patch"; + sha256 = "19wzfwb0azm932v0vhywv4221818qmlmvdfwpvvpfyw4hjsc2s1l"; + }) + ] ++ lib.optional (stdenv.hostPlatform.useLLVM or false) ./fix-purgatory-llvm-libunwind.patch; hardeningDisable = [ diff --git a/pkgs/by-name/kh/khronos-ocl-icd-loader/package.nix b/pkgs/by-name/kh/khronos-ocl-icd-loader/package.nix index 60fb02025d957..0632ad6a08f66 100644 --- a/pkgs/by-name/kh/khronos-ocl-icd-loader/package.nix +++ b/pkgs/by-name/kh/khronos-ocl-icd-loader/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "opencl-icd-loader"; - version = "2024.10.24"; + version = "2025.07.22"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-ICD-Loader"; rev = "v${version}"; - hash = "sha256-A+Rd/3LyBoUW2MrRDMOcwsTqTADuNxSQdF1HHgfq3mY="; + hash = "sha256-jwviNwX7C7b9lqIS4oZ4YLEFBfBdmQfXHxW3FPPYxYs="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ku/kubectl-ai/package.nix b/pkgs/by-name/ku/kubectl-ai/package.nix index 6a35ec8699e9f..ac29224c97a72 100644 --- a/pkgs/by-name/ku/kubectl-ai/package.nix +++ b/pkgs/by-name/ku/kubectl-ai/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "kubectl-ai"; - version = "0.0.22"; + version = "0.0.20"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "kubectl-ai"; tag = "v${finalAttrs.version}"; - hash = "sha256-sU8CATzhp0seUJNYjvxFkRoA/Xqb57kZqGpEOCxypUA="; + hash = "sha256-iyyaQBulncPNJXm7ir/aOjJxJvd0Q178weneiwQbGcU="; }; - vendorHash = "sha256-OJnpd8z4e6ytoUi5ydFHYPMA77ryU7Tp8wriuab7yuk="; + vendorHash = "sha256-a84HesnInU7JZZTx0Rm1Qgsmo7SJC0kMnckgmUk0Vow="; # Build the main command subPackages = [ "cmd" ]; diff --git a/pkgs/by-name/li/libLAS/package.nix b/pkgs/by-name/li/libLAS/package.nix index 5409edbf5e351..138f56e8391e9 100644 --- a/pkgs/by-name/li/libLAS/package.nix +++ b/pkgs/by-name/li/libLAS/package.nix @@ -8,6 +8,7 @@ libgeotiff, libtiff, laszip_2, + zlib, fixDarwinDylibNames, }: @@ -57,6 +58,7 @@ stdenv.mkDerivation rec { libgeotiff libtiff laszip_2 + zlib ]; cmakeFlags = [ diff --git a/pkgs/by-name/li/libadwaita/package.nix b/pkgs/by-name/li/libadwaita/package.nix index db1fed30f6621..8153e16a1583e 100644 --- a/pkgs/by-name/li/libadwaita/package.nix +++ b/pkgs/by-name/li/libadwaita/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libadwaita"; - version = "1.7.4"; + version = "1.7.5"; outputs = [ "out" @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GNOME"; repo = "libadwaita"; tag = finalAttrs.version; - hash = "sha256-HHSKqYOtIfG6JR8zvXl06tq0iHVVNIpVJLDwyB+nI0I="; + hash = "sha256-KlaRwOWHvzm+VwMygiEh8wqJfEwwA+x7o9T72Qpqnmo="; }; depsBuildBuild = [ diff --git a/pkgs/by-name/li/libappimage/package.nix b/pkgs/by-name/li/libappimage/package.nix index 8d2a1013aff80..9e63c725c93b7 100644 --- a/pkgs/by-name/li/libappimage/package.nix +++ b/pkgs/by-name/li/libappimage/package.nix @@ -16,6 +16,7 @@ librsvg, squashfuse, xdg-utils-cxx, + xz, # for liblzma zlib, }: stdenv.mkDerivation rec { @@ -66,6 +67,7 @@ stdenv.mkDerivation rec { libarchive squashfuse xdg-utils-cxx + xz ]; propagatedBuildInputs = [ diff --git a/pkgs/by-name/li/libarchive/fix-darwin-tmpdir-handling.patch b/pkgs/by-name/li/libarchive/fix-darwin-tmpdir-handling.patch new file mode 100644 index 0000000000000..3e88c15dbdf2f --- /dev/null +++ b/pkgs/by-name/li/libarchive/fix-darwin-tmpdir-handling.patch @@ -0,0 +1,22 @@ +From 87bbe8ec8d343c70ae42ccb9606ec80ad73ceffb Mon Sep 17 00:00:00 2001 +From: Emily +Date: Tue, 29 Jul 2025 16:53:15 +0100 +Subject: [PATCH] Fix setup_mac_metadata when TMPDIR does not end with a slash + +--- + libarchive/archive_read_disk_entry_from_file.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c +index 19d049770b..87389642db 100644 +--- a/libarchive/archive_read_disk_entry_from_file.c ++++ b/libarchive/archive_read_disk_entry_from_file.c +@@ -364,7 +364,7 @@ setup_mac_metadata(struct archive_read_disk *a, + tempdir = _PATH_TMP; + archive_string_init(&tempfile); + archive_strcpy(&tempfile, tempdir); +- archive_strcat(&tempfile, "tar.md.XXXXXX"); ++ archive_strcat(&tempfile, "/tar.md.XXXXXX"); + tempfd = mkstemp(tempfile.s); + if (tempfd < 0) { + archive_set_error(&a->archive, errno, diff --git a/pkgs/by-name/li/libarchive/package.nix b/pkgs/by-name/li/libarchive/package.nix index 640914afd9a00..a3e0d592c26ef 100644 --- a/pkgs/by-name/li/libarchive/package.nix +++ b/pkgs/by-name/li/libarchive/package.nix @@ -48,6 +48,11 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/libarchive/libarchive/commit/489d0b8e2f1fafd3b7ebf98f389ca67462c34651.patch?full_index=1"; hash = "sha256-r+tSJ+WA0VKCjg+8MfS5/RqcB+aAMZ2dK0YUh+U1q78="; }) + # Fix the tests on Darwin when `$TMPDIR` does not end with a slash + # and its parent directory is not writable by the build user, as on + # Nix ≥ 2.30.0 and Lix ≥ 2.91.2, ≥ 2.92.2, ≥ 2.93.1. + # + ./fix-darwin-tmpdir-handling.patch ]; outputs = [ diff --git a/pkgs/by-name/li/libcamera/package.nix b/pkgs/by-name/li/libcamera/package.nix index 0822c26bf80e3..b84c6794de6e6 100644 --- a/pkgs/by-name/li/libcamera/package.nix +++ b/pkgs/by-name/li/libcamera/package.nix @@ -27,12 +27,12 @@ stdenv.mkDerivation rec { pname = "libcamera"; - version = "0.5.1"; + version = "0.5.2"; src = fetchgit { url = "https://git.libcamera.org/libcamera/libcamera.git"; rev = "v${version}"; - hash = "sha256-JV5sa/jiqubcenSeYC4jlB/RgGJt3o1HTIyy7U4Ljlg="; + hash = "sha256-nr1LmnedZMGBWLf2i5uw4E/OMeXObEKgjuO+PUx/GDY="; }; outputs = [ @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - ../src/ipa/ipa-sign-install.sh src/ipa-priv-key.pem $out/lib/libcamera/ipa_*.so + ../src/ipa/ipa-sign-install.sh src/ipa-priv-key.pem $out/lib/libcamera/ipa/ipa_*.so ''; strictDeps = true; diff --git a/pkgs/by-name/li/libdrm/package.nix b/pkgs/by-name/li/libdrm/package.nix index d4a6345f6ac41..ccd9f305f5649 100644 --- a/pkgs/by-name/li/libdrm/package.nix +++ b/pkgs/by-name/li/libdrm/package.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "libdrm"; - version = "2.4.124"; + version = "2.4.125"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-rDYpP2HKSq+vSxaip6//MSqk9cN8n715fenjwIY8o3k="; + hash = "sha256-1LrpJ5elD4GpNSR2LgQQpJzYTPoPmXeVvAFyrI+x2Wo="; }; outputs = [ diff --git a/pkgs/by-name/li/libgeotiff/package.nix b/pkgs/by-name/li/libgeotiff/package.nix index a8adeb40a9625..30d1a94372a1f 100644 --- a/pkgs/by-name/li/libgeotiff/package.nix +++ b/pkgs/by-name/li/libgeotiff/package.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtiff proj + zlib ]; #hardeningDisable = [ "format" ]; diff --git a/pkgs/by-name/li/libmypaint/package.nix b/pkgs/by-name/li/libmypaint/package.nix index 6b20366a57d8c..1ccc5c2087a82 100644 --- a/pkgs/by-name/li/libmypaint/package.nix +++ b/pkgs/by-name/li/libmypaint/package.nix @@ -56,7 +56,15 @@ stdenv.mkDerivation rec { doCheck = true; - preConfigure = "./autogen.sh"; + # don't rely on rigid autotools versions, instead preload whatever is in $PATH in the build environment. + # libmypaint 1.6.1 only officially supports autotools up to 1.16, + # 2.0.0 alphas support up to autotools 1.17. + # However, we are now on autotools 1.18, so this would otherwise break. + preConfigure = '' + export AUTOMAKE=automake + export ACLOCAL=aclocal + ./autogen.sh + ''; meta = with lib; { homepage = "http://mypaint.org/"; diff --git a/pkgs/by-name/li/libnftnl/package.nix b/pkgs/by-name/li/libnftnl/package.nix index 36a77b3ebf29e..21cede656fd1e 100644 --- a/pkgs/by-name/li/libnftnl/package.nix +++ b/pkgs/by-name/li/libnftnl/package.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "1.2.9"; + version = "1.3.0"; pname = "libnftnl"; src = fetchurl { url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.xz"; - hash = "sha256-6MIWJV4SnyYnBjn+53dSZWZaMbEaqSAlPD5dXWLfxLg="; + hash = "sha256-D0vkeou4t3o1DuWMvUtfrmJgrUhqUncGqxXP4d1Vo8Q="; }; configureFlags = lib.optional ( diff --git a/pkgs/by-name/li/libopenmpt/package.nix b/pkgs/by-name/li/libopenmpt/package.nix index 12a8f08529cbb..2eece1e4d8a34 100644 --- a/pkgs/by-name/li/libopenmpt/package.nix +++ b/pkgs/by-name/li/libopenmpt/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "libopenmpt"; - version = "0.8.0"; + version = "0.8.2"; outputs = [ "out" @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - hash = "sha256-VT7pxjxLPLybZk1bwx2LxO6zRfrYgJ8Dy/kxR6EIqzI="; + hash = "sha256-hE5P+Y29mUK75KEEgib5H4vFtGC3vsZInmfO2z4KrDc="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/li/libplacebo/package.nix b/pkgs/by-name/li/libplacebo/package.nix index 6960879bdc8a1..9ec11a30a7205 100644 --- a/pkgs/by-name/li/libplacebo/package.nix +++ b/pkgs/by-name/li/libplacebo/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitLab, + fetchpatch, meson, ninja, pkg-config, @@ -31,6 +32,14 @@ stdenv.mkDerivation rec { hash = "sha256-ccoEFpp6tOFdrfMyE0JNKKMAdN4Q95tP7j7vzUj+lSQ="; }; + patches = [ + (fetchpatch { + name = "python-compat.patch"; + url = "https://code.videolan.org/videolan/libplacebo/-/commit/12509c0f1ee8c22ae163017f0a5e7b8a9d983a17.patch"; + hash = "sha256-RrlFu0xgLB05IVrzL2EViTPuATYXraM1KZMxnZCvgrk="; + }) + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/by-name/li/libplacebo_5/package.nix b/pkgs/by-name/li/libplacebo_5/package.nix index 9691db7ca0ef5..57ea29690d5bb 100644 --- a/pkgs/by-name/li/libplacebo_5/package.nix +++ b/pkgs/by-name/li/libplacebo_5/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitLab, + fetchpatch, meson, ninja, pkg-config, @@ -28,6 +29,14 @@ stdenv.mkDerivation rec { hash = "sha256-YEefuEfJURi5/wswQKskA/J1UGzessQQkBpltJ0Spq8="; }; + patches = [ + (fetchpatch { + name = "python-compat.patch"; + url = "https://code.videolan.org/videolan/libplacebo/-/commit/12509c0f1ee8c22ae163017f0a5e7b8a9d983a17.patch"; + hash = "sha256-RrlFu0xgLB05IVrzL2EViTPuATYXraM1KZMxnZCvgrk="; + }) + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/by-name/li/libraqm/package.nix b/pkgs/by-name/li/libraqm/package.nix index 9df38707bcb34..7c5f35caa2d60 100644 --- a/pkgs/by-name/li/libraqm/package.nix +++ b/pkgs/by-name/li/libraqm/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "libraqm"; - version = "0.10.2"; + version = "0.10.3"; src = fetchFromGitHub { owner = "HOST-Oman"; repo = "libraqm"; rev = "v${version}"; - sha256 = "sha256-KhGE66GS5rIieVXJUFA3jSsXEpbdnzN0VIAF/zOelU4="; + sha256 = "sha256-URW29aEONbMN/DQ6mkKksnwtbIL+SGm5VvKsC9h5MH4="; }; buildInputs = [ diff --git a/pkgs/by-name/li/libtiff/package.nix b/pkgs/by-name/li/libtiff/package.nix index c73dfa2d0c94d..33bfd037d577a 100644 --- a/pkgs/by-name/li/libtiff/package.nix +++ b/pkgs/by-name/li/libtiff/package.nix @@ -16,12 +16,10 @@ zlib, zstd, - # Because lerc is C++ and static libraries don't track dependencies, - # that every downstream dependent of libtiff has to link with a C++ - # compiler, or the C++ standard library won't be linked, resulting - # in undefined symbol errors. Without systematic support for this - # in build systems, fixing this would require modifying the build - # system of every libtiff user. Hopefully at some point build + # Because lerc is C++ and static libraries don't track dependencies, every downstream dependent of + # libtiff has to link with a C++ compiler, or the C++ standard library won't be linked, resulting + # in undefined symbol errors. Without systematic support for this in build systems, fixing this + # would require modifying the build system of every libtiff user. Hopefully at some point build # systems will figure this out, and then we can enable this. # # See https://github.com/mesonbuild/meson/issues/14234 @@ -84,22 +82,16 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - zstd - ] - ++ lib.optionals withLerc [ - lerc - ]; - - # TODO: opengl support (bogus configure detection) - propagatedBuildInputs = [ libdeflate libjpeg - # libwebp depends on us; this will cause infinite - # recursion otherwise + # libwebp depends on us; this will cause infinite recursion otherwise (libwebp.override { tiffSupport = false; }) xz zlib zstd + ] + ++ lib.optionals withLerc [ + lerc ]; cmakeFlags = [ @@ -109,6 +101,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; doCheck = true; + # Avoid flakiness like https://gitlab.com/libtiff/libtiff/-/commit/94f6f7315b1 enableParallelChecking = false; @@ -122,7 +115,9 @@ stdenv.mkDerivation (finalAttrs: { openimageio freeimage ; + inherit (python3Packages) pillow imread; + pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; diff --git a/pkgs/by-name/li/libx11/package.nix b/pkgs/by-name/li/libx11/package.nix new file mode 100644 index 0000000000000..cde598fa68cd7 --- /dev/null +++ b/pkgs/by-name/li/libx11/package.nix @@ -0,0 +1,96 @@ +{ + lib, + stdenv, + fetchurl, + buildPackages, + pkg-config, + xorgproto, + libpthread-stubs, + libxcb, + xtrans, + writeScript, + testers, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libx11"; + version = "1.8.12"; + + outputs = [ + "out" + "dev" + "man" + ]; + + src = fetchurl { + url = "mirror://xorg/individual/lib/libX11-${finalAttrs.version}.tar.xz"; + hash = "sha256-+gJvm7AST01sgI+a70BXqtZeezXY/0OVHO8Kvga7mpo="; + }; + + strictDeps = true; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + xorgproto + libpthread-stubs + libxcb + xtrans + ]; + + propagatedBuildInputs = [ + xorgproto + libxcb + ]; + + configureFlags = + lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-malloc0returnsnull" + ++ lib.optional (stdenv.targetPlatform.useLLVM or false) "ac_cv_path_RAWCPP=cpp"; + + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { CPP = "clang -E -"; }; + + postInstall = '' + # Remove useless DocBook XML files. + rm -r $out/share/doc + ''; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname libX11 \ + --url https://xorg.freedesktop.org/releases/individual/lib/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + + meta = { + description = "Core X11 protocol client library (aka \"Xlib\")"; + homepage = "https://gitlab.freedesktop.org/xorg/lib/libx11"; + license = with lib.licenses; [ + mit + mitOpenGroup + x11 + hpndDoc + hpndSellVariant + tekHvcLicense + hpndDocSell + hpnd + bsd1 + isc + # The "source code modified by FUJITSU LIMITED under the Joint Development Agreement for the + # CDE/Motif PST" is possibly unfree. + # upstream issue: https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues/217 + # unfree + ]; + maintainers = [ ]; + pkgConfigModules = [ + "x11" + "x11-xcb" + ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/li/libxau/package.nix b/pkgs/by-name/li/libxau/package.nix new file mode 100644 index 0000000000000..e9c67d2beb87f --- /dev/null +++ b/pkgs/by-name/li/libxau/package.nix @@ -0,0 +1,48 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + xorgproto, + writeScript, + testers, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libxau"; + version = "1.0.12"; + + outputs = [ + "out" + "dev" + ]; + + src = fetchurl { + url = "mirror://xorg/individual/lib/libXau-${finalAttrs.version}.tar.xz"; + hash = "sha256-dNDk36PTmtiTnpm9o39ZZ6ulKCEQdoKEZNJ3fUd/wPs="; + }; + + strictDeps = true; + nativeBuildInputs = [ pkg-config ]; + propagatedBuildInputs = [ xorgproto ]; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname libXau \ + --url https://xorg.freedesktop.org/releases/individual/lib/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + + meta = { + description = "Functions for handling Xauthority files and entries."; + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxau"; + license = lib.licenses.mitOpenGroup; + maintainers = [ ]; + pkgConfigModules = [ "xau" ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/li/libxcb/package.nix b/pkgs/by-name/li/libxcb/package.nix new file mode 100644 index 0000000000000..349ddf5b786e2 --- /dev/null +++ b/pkgs/by-name/li/libxcb/package.nix @@ -0,0 +1,94 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + python3, + libpthread-stubs, + libxau, + libxdmcp, + xcb-proto, + windows, + writeScript, + testers, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libxcb"; + version = "1.17.0"; + + outputs = [ + "out" + "dev" + "man" + "doc" + ]; + + src = fetchurl { + url = "mirror://xorg/individual/lib/libxcb-${finalAttrs.version}.tar.xz"; + hash = "sha256-WZ6/mZZxD+pxYi5uGE86itW0PQ5fqMTkBxI8iKWabVU="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + python3 + ]; + + buildInputs = [ + libpthread-stubs + libxau + libxdmcp + xcb-proto + ]; + + # $dev/include/xcb/xcb.h includes pthread.h + propagatedBuildInputs = lib.optional stdenv.hostPlatform.isMinGW windows.pthreads; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/lib/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + + meta = { + description = "C interface to the X Window System protocol"; + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb"; + # gitlab wrongly says X11 Distribute Modifications + license = lib.licenses.x11; + maintainers = [ ]; + pkgConfigModules = [ + "xcb" + "xcb-composite" + "xcb-damage" + "xcb-dpms" + "xcb-dri2" + "xcb-dri3" + "xcb-glx" + "xcb-present" + "xcb-randr" + "xcb-record" + "xcb-render" + "xcb-res" + "xcb-screensaver" + "xcb-shape" + "xcb-shm" + "xcb-sync" + "xcb-xf86dri" + "xcb-xfixes" + "xcb-xinerama" + "xcb-xinput" + "xcb-xkb" + "xcb-xtest" + "xcb-xv" + "xcb-xvmc" + ]; + platforms = lib.platforms.unix ++ lib.platforms.windows; + }; +}) diff --git a/pkgs/by-name/li/libxdmcp/package.nix b/pkgs/by-name/li/libxdmcp/package.nix new file mode 100644 index 0000000000000..974b024247566 --- /dev/null +++ b/pkgs/by-name/li/libxdmcp/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + xorgproto, + writeScript, + testers, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libxdmcp"; + version = "1.1.5"; + + outputs = [ + "out" + "dev" + "doc" + ]; + + src = fetchurl { + url = "mirror://xorg/individual/lib/libXdmcp-${finalAttrs.version}.tar.xz"; + hash = "sha256-2KUiKCjDratwrfaaVYPx0y617OBDBPf4OStqNTqiIow="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto ]; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname libXdmcp \ + --url https://xorg.freedesktop.org/releases/individual/lib/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + + meta = { + description = "X Display Manager Control Protocol library"; + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxdmcp"; + license = lib.licenses.mitOpenGroup; + maintainers = [ ]; + pkgConfigModules = [ "xdmcp" ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/li/libxext/package.nix b/pkgs/by-name/li/libxext/package.nix new file mode 100644 index 0000000000000..1b0843881116c --- /dev/null +++ b/pkgs/by-name/li/libxext/package.nix @@ -0,0 +1,74 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + libX11, + xorgproto, + libxau, + writeScript, + testers, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libxext"; + version = "1.3.6"; + + outputs = [ + "out" + "dev" + "man" + "doc" + ]; + + src = fetchurl { + url = "mirror://xorg/individual/lib/libXext-${finalAttrs.version}.tar.xz"; + hash = "sha256-7bWfojmU5AX9xbQAr99YIK5hYLlPNePcPaRFehbol1M="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + libX11 + xorgproto + ]; + propagatedBuildInputs = [ + xorgproto + libxau + ]; + + configureFlags = lib.optional ( + stdenv.hostPlatform != stdenv.buildPlatform + ) "--enable-malloc0returnsnull"; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname libXext \ + --url https://xorg.freedesktop.org/releases/individual/lib/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + + meta = { + description = "Xlib-based library for common extensions to the X11 protocol"; + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxext"; + license = with lib.licenses; [ + mitOpenGroup + x11 + hpnd + hpndSellVariant + hpndDocSell + hpndDoc + mit + isc + ]; + maintainers = [ ]; + pkgConfigModules = [ "xext" ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/li/libyuv/dither-honour-byte-order.patch b/pkgs/by-name/li/libyuv/dither-honour-byte-order.patch new file mode 100644 index 0000000000000..4ea63a754ba1b --- /dev/null +++ b/pkgs/by-name/li/libyuv/dither-honour-byte-order.patch @@ -0,0 +1,32 @@ +diff '--color=auto' -ruN a/source/row_common.cc b/source/row_common.cc +--- a/source/row_common.cc 2025-07-15 17:55:24.611751521 +0200 ++++ b/source/row_common.cc 2025-07-15 18:01:57.808312551 +0200 +@@ -104,8 +104,13 @@ + #if defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || \ + defined(_M_IX86) || defined(__arm__) || defined(_M_ARM) || \ + (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) ++#define WRITE16(p, v) *(uint16_t*)(p) = v + #define WRITEWORD(p, v) *(uint32_t*)(p) = v + #else ++static inline void WRITE16(uint8_t* p, uint16_t v) { ++ p[0] = (uint8_t)(v & 255); ++ p[1] = (uint8_t)((v >> 8) & 255); ++} + static inline void WRITEWORD(uint8_t* p, uint32_t v) { + p[0] = (uint8_t)(v & 255); + p[1] = (uint8_t)((v >> 8) & 255); +@@ -408,10 +413,10 @@ + uint8_t b1 = STATIC_CAST(uint8_t, clamp255(src_argb[4] + dither1) >> 3); + uint8_t g1 = STATIC_CAST(uint8_t, clamp255(src_argb[5] + dither1) >> 2); + uint8_t r1 = STATIC_CAST(uint8_t, clamp255(src_argb[6] + dither1) >> 3); +- *(uint16_t*)(dst_rgb + 0) = +- STATIC_CAST(uint16_t, b0 | (g0 << 5) | (r0 << 11)); +- *(uint16_t*)(dst_rgb + 2) = +- STATIC_CAST(uint16_t, b1 | (g1 << 5) | (r1 << 11)); ++ WRITE16((dst_rgb + 0), ++ STATIC_CAST(uint16_t, b0 | (g0 << 5) | (r0 << 11))); ++ WRITE16((dst_rgb + 2), ++ STATIC_CAST(uint16_t, b1 | (g1 << 5) | (r1 << 11))); + dst_rgb += 4; + src_argb += 8; + } diff --git a/pkgs/by-name/li/libyuv/package.nix b/pkgs/by-name/li/libyuv/package.nix index d2cc602d19603..42b3893a4aae1 100644 --- a/pkgs/by-name/li/libyuv/package.nix +++ b/pkgs/by-name/li/libyuv/package.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation { hash = "sha256-4Irs+hlAvr6v5UKXmKHhg4IK3cTWdsFWxt1QTS0rizU="; }; + patches = [ + # Fixes wrong byte order in ARGBToRGB565DitherRow_C on big-endian + ./dither-honour-byte-order.patch + ]; + nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/li/lilv/package.nix b/pkgs/by-name/li/lilv/package.nix index 4935cb394ee96..9a1ecddac6f9f 100644 --- a/pkgs/by-name/li/lilv/package.nix +++ b/pkgs/by-name/li/lilv/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "lilv"; - version = "0.24.24"; + version = "0.24.26"; outputs = [ "out" @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.xz"; - hash = "sha256-a7a+n4hQQXbQZC8S3oCbK54txVYhporbjH7bma76u08="; + hash = "sha256-Iv7tMLwPlSOEolwvb0sE5tQ4NkCHmO1lqKk0wFXV2Kw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/linux-pam/package.nix b/pkgs/by-name/li/linux-pam/package.nix index 1078aaebbba27..b8cc88f6e71cc 100644 --- a/pkgs/by-name/li/linux-pam/package.nix +++ b/pkgs/by-name/li/linux-pam/package.nix @@ -2,97 +2,118 @@ lib, stdenv, buildPackages, - fetchurl, - fetchpatch, + fetchFromGitHub, flex, db4, gettext, + ninja, audit, libxcrypt, nixosTests, - autoreconfHook269, - pkg-config-unwrapped, + meson, + pkg-config, + systemdLibs, + docbook5, + libxslt, + libxml2, + w3m-batch, + findXMLCatalogs, + docbook_xsl_ns, + nix-update-script, + withLogind ? lib.meta.availableOn stdenv.hostPlatform systemdLibs, + withAudit ? lib.meta.availableOn stdenv.hostPlatform audit, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "linux-pam"; - version = "1.6.1"; + version = "1.7.1"; - src = fetchurl { - url = "https://github.com/linux-pam/linux-pam/releases/download/v${version}/Linux-PAM-${version}.tar.xz"; - hash = "sha256-+JI8dAFZBS1xnb/CovgZQtaN00/K9hxwagLJuA/u744="; + src = fetchFromGitHub { + owner = "linux-pam"; + repo = "linux-pam"; + tag = "v${finalAttrs.version}"; + hash = "sha256-kANcwxifQz2tYPSrSBSFiYNTm51Gr10L/zroCqm8ZHQ="; }; - patches = [ - ./suid-wrapper-path.patch - # required for fixing CVE-2025-6020 - (fetchpatch { - url = "https://github.com/linux-pam/linux-pam/commit/10b80543807e3fc5af5f8bcfd8bb6e219bb3cecc.patch"; - hash = "sha256-VS3D3wUbDxDXRriIuEvvgeZixzDA58EfiLygfFeisGg="; - }) - # Manually cherry-picked from 475bd60c552b98c7eddb3270b0b4196847c0072e - ./CVE-2025-6020.patch - ]; - - # Case-insensitivity workaround for https://github.com/linux-pam/linux-pam/issues/569 - postPatch = - lib.optionalString (stdenv.buildPlatform.isDarwin && stdenv.buildPlatform != stdenv.hostPlatform) - '' - rm CHANGELOG - touch ChangeLog - ''; + # patching unix_chkpwd is required as the nix store entry does not have the necessary bits + postPatch = '' + substituteInPlace modules/module-meson.build \ + --replace-fail "sbindir / 'unix_chkpwd'" "'/run/wrappers/bin/unix_chkpwd'" + ''; outputs = [ "out" "doc" - "man" # "modules" + "man" + # "modules" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - # autoreconfHook269 is needed for `suid-wrapper-path.patch` above. - # pkg-config-unwrapped is needed for `AC_CHECK_LIB` and `AC_SEARCH_LIBS` nativeBuildInputs = [ flex - autoreconfHook269 - pkg-config-unwrapped - ] - ++ lib.optional stdenv.buildPlatform.isDarwin gettext; + meson + ninja + pkg-config + gettext + + libxslt + libxml2 + w3m-batch + findXMLCatalogs + docbook_xsl_ns + docbook5 + ]; buildInputs = [ db4 libxcrypt ] - ++ lib.optional stdenv.buildPlatform.isLinux audit; + ++ lib.optionals withAudit [ + audit + ] + ++ lib.optionals withLogind [ + systemdLibs + ]; enableParallelBuilding = true; - configureFlags = [ - "--includedir=${placeholder "out"}/include/security" - "--enable-sconfigdir=/etc/security" - # The module is deprecated. We re-enable it explicitly until NixOS - # module stops using it. - "--enable-lastlog" - ]; - - installFlags = [ - "SCONFIGDIR=${placeholder "out"}/etc/security" + mesonAutoFeatures = "auto"; + mesonFlags = [ + (lib.mesonEnable "logind" withLogind) + (lib.mesonEnable "audit" withAudit) + (lib.mesonEnable "pam_lastlog" (!stdenv.hostPlatform.isMusl)) # TODO: switch to pam_lastlog2, pam_lastlog is deprecated and broken on musl + (lib.mesonEnable "pam_unix" true) + # (lib.mesonBool "pam-debug" true) # warning: slower execution due to debug makes VM tests fail! + (lib.mesonOption "sysconfdir" "etc") # relative to meson prefix, which is $out + (lib.mesonEnable "elogind" false) + (lib.mesonEnable "econf" false) + (lib.mesonEnable "selinux" false) + (lib.mesonEnable "nis" false) + (lib.mesonBool "xtests" false) + (lib.mesonBool "examples" false) ]; doCheck = false; # fails - passthru.tests = { - inherit (nixosTests) - pam-oath-login - pam-u2f - shadow - sssd-ldap - ; + passthru = { + tests = { + inherit (nixosTests) + pam-oath-login + pam-u2f + pam-lastlog + shadow + sssd-ldap + ; + }; + updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { + changelog = "https://github.com/linux-pam/linux-pam/releases/tag/${finalAttrs.src.tag}"; homepage = "https://github.com/linux-pam/linux-pam"; description = "Pluggable Authentication Modules, a flexible mechanism for authenticating user"; - platforms = platforms.linux; - license = licenses.bsd3; + platforms = lib.platforms.linux; + license = lib.licenses.bsd3; + badPlatforms = [ lib.systems.inspect.platformPatterns.isStatic ]; }; -} +}) diff --git a/pkgs/by-name/li/linux-pam/suid-wrapper-path.patch b/pkgs/by-name/li/linux-pam/suid-wrapper-path.patch deleted file mode 100644 index a427ccf388162..0000000000000 --- a/pkgs/by-name/li/linux-pam/suid-wrapper-path.patch +++ /dev/null @@ -1,6 +0,0 @@ -It needs the SUID version during runtime, and that can't be in /nix/store/** ---- a/modules/pam_unix/Makefile.am -+++ b/modules/pam_unix/Makefile.am -@@ -21 +21 @@ -- -DCHKPWD_HELPER=\"$(sbindir)/unix_chkpwd\" \ -+ -DCHKPWD_HELPER=\"/run/wrappers/bin/unix_chkpwd\" \ diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix index 37abf8462ef7d..1a5a7472b87a4 100644 --- a/pkgs/by-name/ma/maturin/package.nix +++ b/pkgs/by-name/ma/maturin/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "1.8.6"; + version = "1.9.3"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-Dfq8kBg6gk1j/Y1flOb2yw9hhY40n5gi4h08znI2Yw8="; + hash = "sha256-VhL4nKXyONXbxriEHta0vCnWY1j82oDOLoxVigaggSc="; }; - cargoHash = "sha256-LDVmNtpu+J8rnSlpTslwm6QcyN6E3ZlVdpmowKc/kZo="; + cargoHash = "sha256-Iom4GoTBFJ9P5UQnYF5JbeQeO2Eh1MwKOwbo+PhgtQM="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix index 78680308f3469..ca0071b302311 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -16,14 +16,14 @@ python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "1.8.2"; + version = "1.8.3"; format = "setuptools"; src = fetchFromGitHub { owner = "mesonbuild"; repo = "meson"; tag = version; - hash = "sha256-xH3JPlXXkLKKT8Gay6qHG/JXTT1UcUCQaSC65Vxhfl0="; + hash = "sha256-Htjr/gZ4G53XY/kuGsbToZOo+ptDoNA737aaqDT1AUo="; }; patches = [ diff --git a/pkgs/by-name/me/meson/setup-hook.sh b/pkgs/by-name/me/meson/setup-hook.sh index 7d9fd6de0e6db..a9feb15eedd31 100644 --- a/pkgs/by-name/me/meson/setup-hook.sh +++ b/pkgs/by-name/me/meson/setup-hook.sh @@ -72,7 +72,7 @@ mesonCheckPhase() { TERM=dumb ninja -j"$buildCores" $ninjaFlags "${ninjaFlagsArray[@]}" meson-test-prereq echoCmd 'mesonCheckPhase flags' "${flagsArray[@]}" - meson test --no-rebuild --print-errorlogs "${flagsArray[@]}" + meson test --no-rebuild --print-errorlogs --max-lines=1000000 "${flagsArray[@]}" runHook postCheck } diff --git a/pkgs/by-name/mv/mvfst/package.nix b/pkgs/by-name/mv/mvfst/package.nix index 748b9fa92b98b..b5e2341283403 100644 --- a/pkgs/by-name/mv/mvfst/package.nix +++ b/pkgs/by-name/mv/mvfst/package.nix @@ -6,7 +6,6 @@ cmake, ninja, - sanitiseHeaderPathsHook, folly, gflags, @@ -43,7 +42,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ninja - sanitiseHeaderPathsHook ]; buildInputs = [ diff --git a/pkgs/by-name/ne/netpbm/package.nix b/pkgs/by-name/ne/netpbm/package.nix index e20d3c45f5be2..70c18dc05275d 100644 --- a/pkgs/by-name/ne/netpbm/package.nix +++ b/pkgs/by-name/ne/netpbm/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "11.10.5"; + version = "11.11.0"; outputs = [ "bin" @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "5085"; - sha256 = "sha256-04ObCW+xMvGOkhTwYAhVoBG1QIe0/DKfEYbSpDkEGCU="; + rev = "5101"; + sha256 = "sha256-/oS+h4VujaNM7AnMq6e5/8A0cVZysJzFSGgJ4p01oJU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ng/nghttp2/package.nix b/pkgs/by-name/ng/nghttp2/package.nix index c4558c101191b..20cabbec1f7aa 100644 --- a/pkgs/by-name/ng/nghttp2/package.nix +++ b/pkgs/by-name/ng/nghttp2/package.nix @@ -46,11 +46,11 @@ assert enableJemalloc -> enableApp; stdenv.mkDerivation rec { pname = "nghttp2"; - version = "1.65.0"; + version = "1.66.0"; src = fetchurl { - url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-C9u3jcIYcEhP1URJBnZXtg47G3Im4RdM9WQBbG0zB/U="; + url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2"; + hash = "sha256-HUhK03NU35/KuXCBTpOl3KkaUyVug/T1jdcxGcYyEBc="; }; outputs = [ @@ -113,9 +113,6 @@ stdenv.mkDerivation rec { '' + lib.optionalString (enablePython) '' patchShebangs $out/share/nghttp2 - '' - + lib.optionalString (!enablePython) '' - rm -r $out/share ''; passthru.tests = { diff --git a/pkgs/by-name/ni/ninja/package.nix b/pkgs/by-name/ni/ninja/package.nix index 9ddb6ed581746..2be38addad58a 100644 --- a/pkgs/by-name/ni/ninja/package.nix +++ b/pkgs/by-name/ni/ninja/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { version = { "1.11" = "1.11.1"; - latest = "1.12.1"; + latest = "1.13.1"; } .${ninjaRelease}; @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { { # TODO: Remove Ninja 1.11 as soon as possible. "1.11" = "sha256-LvV/Fi2ARXBkfyA1paCRmLUwCh/rTyz+tGMg2/qEepI="; - latest = "sha256-RT5u+TDvWxG5EVQEYj931EZyrHUSAqK73OKDAascAwA="; + latest = "sha256-GhAF5wUT19E02ZekW+ywsCMVGYrt56hES+MHCH4lNG4="; } .${ninjaRelease} or (throw "Unsupported Ninja release: ${ninjaRelease}"); }; diff --git a/pkgs/by-name/nx/nxwitness-client/package.nix b/pkgs/by-name/nx/nxwitness-client/package.nix index e8fbdf169cab6..741eb0f8dc7b8 100644 --- a/pkgs/by-name/nx/nxwitness-client/package.nix +++ b/pkgs/by-name/nx/nxwitness-client/package.nix @@ -12,7 +12,7 @@ libudev-zero, libxcb, libxkbfile, - libxml2, + libxml2_13, libxslt, openal, qt6Packages, @@ -26,19 +26,6 @@ let version = "6.0.3"; build = "40736"; - libxml2_13 = libxml2.overrideAttrs (oldAttrs: rec { - version = "2.13.8"; - src = fetchurl { - url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz"; - hash = "sha256-J3KUyzMRmrcbK8gfL0Rem8lDW4k60VuyzSsOhZoO6Eo="; - }; - meta = oldAttrs.meta // { - knownVulnerabilities = oldAttrs.meta.knownVulnerabilities or [ ] ++ [ - "CVE-2025-6021" - ]; - }; - }); - buildInputs = [ glib gst_all_1.gst-plugins-base diff --git a/pkgs/by-name/om/omnissa-horizon-client/package.nix b/pkgs/by-name/om/omnissa-horizon-client/package.nix index f33afecb0e96b..5521d5bebcec3 100644 --- a/pkgs/by-name/om/omnissa-horizon-client/package.nix +++ b/pkgs/by-name/om/omnissa-horizon-client/package.nix @@ -114,22 +114,7 @@ let xorg.libXScrnSaver xorg.libXtst zlib - - # c.f. https://github.com/NixOS/nixpkgs/pull/418543 - (libxml2.overrideAttrs (oldAttrs: rec { - version = "2.13.8"; - src = fetchurl { - url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz"; - hash = "sha256-J3KUyzMRmrcbK8gfL0Rem8lDW4k60VuyzSsOhZoO6Eo="; - }; - meta = oldAttrs.meta // { - knownVulnerabilities = oldAttrs.meta.knownVulnerabilities or [ ] ++ [ - "CVE-2025-49794" - "CVE-2025-49796" - "CVE-2025-6021" - ]; - }; - })) + libxml2_13 (writeTextDir "etc/omnissa/config" configText) ]; diff --git a/pkgs/by-name/op/opencl-clhpp/package.nix b/pkgs/by-name/op/opencl-clhpp/package.nix index d7e3fc23f36d2..b3b728561ade4 100644 --- a/pkgs/by-name/op/opencl-clhpp/package.nix +++ b/pkgs/by-name/op/opencl-clhpp/package.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "opencl-clhpp"; - version = "2024.10.24"; + version = "2025.07.22"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-CLHPP"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - sha256 = "sha256-3RVZJIt03pRmjrPa9q6h6uqFCuTnxvEqjUGUmdwybbY="; + sha256 = "sha256-afiHjAhdhjtNkGggCO69MwHiQuJZb028lfpQl3HIvXw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/opencl-headers/package.nix b/pkgs/by-name/op/opencl-headers/package.nix index b0bfde105a11e..86ab51dc5e339 100644 --- a/pkgs/by-name/op/opencl-headers/package.nix +++ b/pkgs/by-name/op/opencl-headers/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "opencl-headers"; - version = "2024.10.24"; + version = "2025.07.22"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-Headers"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-KDlruE0IG8d+lAChxYyc6dg5XOvqCMrMyO69sdAzejA="; + sha256 = "sha256-XcDzBt4EAsip+5/lbZwPBO7/nDGAognUkJO/2Jg4OeY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/op/opensnitch-ui/package.nix b/pkgs/by-name/op/opensnitch-ui/package.nix index 0c9bdbdb1ca8f..2c7a17b2266f6 100644 --- a/pkgs/by-name/op/opensnitch-ui/package.nix +++ b/pkgs/by-name/op/opensnitch-ui/package.nix @@ -12,6 +12,13 @@ python3Packages.buildPythonApplication { inherit (opensnitch) src version; sourceRoot = "${opensnitch.src.name}/ui"; + patches = [ + # https://github.com/evilsocket/opensnitch/pull/1413 + # unicode-slugify has failing tests and is overall unmaintained and broken. + # python-slugify is a preferrable replacement + ./use_python_slugify.patch + ]; + postPatch = '' substituteInPlace opensnitch/utils/__init__.py \ --replace-fail /usr/lib/python3/dist-packages/data ${python3Packages.pyasn}/${python3Packages.python.sitePackages}/pyasn/data @@ -38,7 +45,7 @@ python3Packages.buildPythonApplication { pyinotify pyqt5 qt-material - unicode-slugify + python-slugify unidecode ]; diff --git a/pkgs/by-name/op/opensnitch-ui/use_python_slugify.patch b/pkgs/by-name/op/opensnitch-ui/use_python_slugify.patch new file mode 100644 index 0000000000000..877b5006251aa --- /dev/null +++ b/pkgs/by-name/op/opensnitch-ui/use_python_slugify.patch @@ -0,0 +1,11 @@ +diff --git a/requirements.txt b/requirements.txt +index 66e0de13..68d651b1 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -1,5 +1,5 @@ + grpcio-tools>=1.10.1 + pyinotify==0.9.6 +-unicode_slugify==0.1.5 ++python-slugify>=7.0.0 + pyqt5>=5.6 + protobuf diff --git a/pkgs/by-name/pa/paperless-ngx/dep-updates.patch b/pkgs/by-name/pa/paperless-ngx/dep-updates.patch new file mode 100644 index 0000000000000..3ce6dbd72dd14 --- /dev/null +++ b/pkgs/by-name/pa/paperless-ngx/dep-updates.patch @@ -0,0 +1,108 @@ +diff --git a/src/paperless/settings.py b/src/paperless/settings.py +index 3b69b2fc2..8549b9396 100644 +--- a/src/paperless/settings.py ++++ b/src/paperless/settings.py +@@ -11,7 +11,6 @@ from typing import Final + from urllib.parse import urlparse + + from celery.schedules import crontab +-from concurrent_log_handler.queue import setup_logging_queues + from django.utils.translation import gettext_lazy as _ + from dotenv import load_dotenv + +@@ -803,8 +802,6 @@ USE_TZ = True + # Logging # + ############################################################################### + +-setup_logging_queues() +- + LOGGING_DIR.mkdir(parents=True, exist_ok=True) + + LOGROTATE_MAX_SIZE = os.getenv("PAPERLESS_LOGROTATE_MAX_SIZE", 1024 * 1024) +diff --git a/src/paperless_mail/mail.py b/src/paperless_mail/mail.py +index b62e37166..415a69163 100644 +--- a/src/paperless_mail/mail.py ++++ b/src/paperless_mail/mail.py +@@ -29,7 +29,7 @@ from imap_tools import MailBoxUnencrypted + from imap_tools import MailMessage + from imap_tools import MailMessageFlags + from imap_tools import errors +-from imap_tools.mailbox import MailBoxTls ++from imap_tools.mailbox import MailBoxStartTls + from imap_tools.query import LogicOperator + + from documents.data_models import ConsumableDocument +@@ -419,7 +419,7 @@ def get_mailbox(server, port, security) -> MailBox: + if security == MailAccount.ImapSecurity.NONE: + mailbox = MailBoxUnencrypted(server, port) + elif security == MailAccount.ImapSecurity.STARTTLS: +- mailbox = MailBoxTls(server, port, ssl_context=ssl_context) ++ mailbox = MailBoxStartTls(server, port, ssl_context=ssl_context) + elif security == MailAccount.ImapSecurity.SSL: + mailbox = MailBox(server, port, ssl_context=ssl_context) + else: +diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py +index 5a1a6c6859a..95689b5124d 100644 +--- a/src/documents/serialisers.py ++++ b/src/documents/serialisers.py +@@ -2038,6 +2038,24 @@ def validate(self, attrs): + + return attrs + ++ @staticmethod ++ def normalize_workflow_trigger_sources(trigger): ++ """ ++ Convert sources to strings to handle django-multiselectfield v1.0 changes ++ """ ++ if trigger and "sources" in trigger: ++ trigger["sources"] = [ ++ str(s.value if hasattr(s, "value") else s) for s in trigger["sources"] ++ ] ++ ++ def create(self, validated_data): ++ WorkflowTriggerSerializer.normalize_workflow_trigger_sources(validated_data) ++ return super().create(validated_data) ++ ++ def update(self, instance, validated_data): ++ WorkflowTriggerSerializer.normalize_workflow_trigger_sources(validated_data) ++ return super().update(instance, validated_data) ++ + + class WorkflowActionEmailSerializer(serializers.ModelSerializer): + id = serializers.IntegerField(allow_null=True, required=False) +@@ -2202,6 +2220,8 @@ def update_triggers_and_actions(self, instance: Workflow, triggers, actions): + if triggers is not None and triggers is not serializers.empty: + for trigger in triggers: + filter_has_tags = trigger.pop("filter_has_tags", None) ++ # Convert sources to strings to handle django-multiselectfield v1.0 changes ++ WorkflowTriggerSerializer.normalize_workflow_trigger_sources(trigger) + trigger_instance, _ = WorkflowTrigger.objects.update_or_create( + id=trigger.get("id"), + defaults=trigger, +diff --git a/src/documents/tests/test_management_exporter.py b/src/documents/tests/test_management_exporter.py +index 68d20476593..7415467de79 100644 +--- a/src/documents/tests/test_management_exporter.py ++++ b/src/documents/tests/test_management_exporter.py +@@ -123,7 +123,7 @@ def setUp(self) -> None: + + self.trigger = WorkflowTrigger.objects.create( + type=WorkflowTrigger.WorkflowTriggerType.CONSUMPTION, +- sources=[1], ++ sources=[str(WorkflowTrigger.DocumentSourceChoices.CONSUME_FOLDER.value)], + filter_filename="*", + ) + self.action = WorkflowAction.objects.create(assign_title="new title") +diff --git a/src/documents/tests/test_migration_workflows.py b/src/documents/tests/test_migration_workflows.py +index 9895188188a..60e429d68c2 100644 +--- a/src/documents/tests/test_migration_workflows.py ++++ b/src/documents/tests/test_migration_workflows.py +@@ -104,7 +104,7 @@ def setUpBeforeMigration(self, apps): + + trigger = WorkflowTrigger.objects.create( + type=0, +- sources=[DocumentSource.ConsumeFolder], ++ sources=[str(DocumentSource.ConsumeFolder)], + filter_path="*/path/*", + filter_filename="*file*", + ) + diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index 33a6208604579..607adc324deb4 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -2,6 +2,8 @@ lib, stdenv, fetchFromGitHub, + fetchPypi, + fetchpatch, node-gyp, nodejs_20, nixosTests, @@ -41,6 +43,18 @@ let packageOverrides = final: prev: { django = prev.django_5_2; + fido2 = prev.fido2.overridePythonAttrs { + version = "1.2.0"; + + src = fetchPypi { + pname = "fido2"; + version = "1.2.0"; + hash = "sha256-45+VkgEi1kKD/aXlWB2VogbnBPpChGv6RmL4aqDTMzs="; + }; + + pytestFlags = [ ]; + }; + # tesseract5 may be overwritten in the paperless module and we need to propagate that to make the closure reduction effective ocrmypdf = prev.ocrmypdf.override { tesseract = tesseract5; }; }; @@ -138,6 +152,15 @@ python.pkgs.buildPythonApplication rec { inherit version src; + # Manual partial backport of: + # - https://github.com/paperless-ngx/paperless-ngx/commit/9889c59d3daa8f4ac8ec2400c00ddc36a7ca63c9 + # - https://github.com/paperless-ngx/paperless-ngx/pull/10538 + # Fixes build with latest dependency versions. + # FIXME: remove in next update + patches = [ + ./dep-updates.patch + ]; + postPatch = '' # pytest-xdist with to many threads makes the tests flaky if (( $NIX_BUILD_CORES > 3)); then @@ -154,11 +177,16 @@ python.pkgs.buildPythonApplication rec { ]; pythonRelaxDeps = [ - # https://github.com/NixOS/nixpkgs/pull/432489 "django" - "scikit-learn" - + "django-allauth" + "django-auditlog" + "django-guardian" + "django-multiselectfield" + "imap-tools" + "pathvalidate" "redis" + "scikit-learn" + "tika-client" ]; dependencies = @@ -180,6 +208,7 @@ python.pkgs.buildPythonApplication rec { tag = version; hash = "sha256-1HmEJ5E4Vp/CoyzUegqQXpzKUuz3dLx2EEv7dk8fq8w="; }; + patches = [ ]; } )) django-auditlog diff --git a/pkgs/by-name/pd/pdm/package.nix b/pkgs/by-name/pd/pdm/package.nix index 7bddb9c35873f..c561562a50d89 100644 --- a/pkgs/by-name/pd/pdm/package.nix +++ b/pkgs/by-name/pd/pdm/package.nix @@ -28,7 +28,7 @@ let in python.pkgs.buildPythonApplication rec { pname = "pdm"; - version = "2.24.2"; + version = "2.25.5"; pyproject = true; disabled = python.pkgs.pythonOlder "3.8"; @@ -37,7 +37,7 @@ python.pkgs.buildPythonApplication rec { owner = "pdm-project"; repo = "pdm"; tag = version; - hash = "sha256-z2p7guCQrKpDSYRHaGcHuwoTDsprrvJo9SH3sGBILSQ="; + hash = "sha256-OXwtmcwRYRL9CZwAoJz9ID9oI3zz+5MkvU0vI5NjvEE="; }; pythonRelaxDeps = [ "hishel" ]; @@ -126,6 +126,9 @@ python.pkgs.buildPythonApplication rec { "test_use_python_write_file_multiple_versions" "test_repository_get_token_from_oidc" "test_repository_get_token_misconfigured_github" + + # https://github.com/pdm-project/pdm/issues/3590 + "test_install_from_lock_with_higher_version" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/pk/pkg-config-unwrapped/gcc-15.patch b/pkgs/by-name/pk/pkg-config-unwrapped/gcc-15.patch new file mode 100644 index 0000000000000..b210395ef1138 --- /dev/null +++ b/pkgs/by-name/pk/pkg-config-unwrapped/gcc-15.patch @@ -0,0 +1,35 @@ +From 4444e3e5b7130c1664d7617e079e776ac0437661 Mon Sep 17 00:00:00 2001 +From: Dmitry Bogatov +Date: Thu, 26 Jun 2025 00:26:31 +0000 +Subject: [PATCH] Avoid using "bool" as identifier (was made a keyword in + gcc-15) + +--- + glib/glib/goption.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/glib/glib/goption.c b/glib/glib/goption.c +index 0a22f6f..bdd8837 100644 +--- a/glib/glib/goption.c ++++ b/glib/glib/goption.c +@@ -166,7 +166,7 @@ typedef struct + gpointer arg_data; + union + { +- gboolean bool; ++ gboolean bool_value; + gint integer; + gchar *str; + gchar **array; +@@ -1600,7 +1600,7 @@ free_changes_list (GOptionContext *context, + switch (change->arg_type) + { + case G_OPTION_ARG_NONE: +- *(gboolean *)change->arg_data = change->prev.bool; ++ *(gboolean *)change->arg_data = change->prev.bool_value; + break; + case G_OPTION_ARG_INT: + *(gint *)change->arg_data = change->prev.integer; +-- +2.47.2 + diff --git a/pkgs/by-name/pk/pkg-config-unwrapped/package.nix b/pkgs/by-name/pk/pkg-config-unwrapped/package.nix index 95731b61f2c1a..2f2d616e8f248 100644 --- a/pkgs/by-name/pk/pkg-config-unwrapped/package.nix +++ b/pkgs/by-name/pk/pkg-config-unwrapped/package.nix @@ -25,9 +25,11 @@ stdenv.mkDerivation rec { # Process Requires.private properly, see # http://bugs.freedesktop.org/show_bug.cgi?id=4738, migrated to # https://gitlab.freedesktop.org/pkg-config/pkg-config/issues/28 - patches = - lib.optional (!vanilla) ./requires-private.patch - ++ lib.optional stdenv.hostPlatform.isCygwin ./2.36.3-not-win32.patch; + patches = [ + ./gcc-15.patch + ] + ++ lib.optional (!vanilla) ./requires-private.patch + ++ lib.optional stdenv.hostPlatform.isCygwin ./2.36.3-not-win32.patch; # These three tests fail due to a (desired) behavior change from our ./requires-private.patch postPatch = diff --git a/pkgs/by-name/pl/plex-desktop/package.nix b/pkgs/by-name/pl/plex-desktop/package.nix index 13b35878c96d2..6dae4b0a9212f 100644 --- a/pkgs/by-name/pl/plex-desktop/package.nix +++ b/pkgs/by-name/pl/plex-desktop/package.nix @@ -12,6 +12,7 @@ libpulseaudio, libva, libxkbcommon, + libxml2_13, makeShellWrapper, minizip, nss, @@ -56,9 +57,11 @@ let buildInputs = [ elfutils ffmpeg_6-headless + libedit libpulseaudio libva libxkbcommon + libxml2_13 minizip nss stdenv.cc.cc @@ -104,8 +107,6 @@ let rm $out/lib/libdrm.so* rm $out/lib/libdrm* - ln -s ${libedit}/lib/libedit.so.0 $out/lib/libedit.so.2 - # Keep dependencies where the version from nixpkgs is higher. cp usr/lib/x86_64-linux-gnu/libasound.so.2 $out/lib/libasound.so.2 cp usr/lib/x86_64-linux-gnu/libjbig.so.0 $out/lib/libjbig.so.0 @@ -116,7 +117,6 @@ let cp usr/lib/x86_64-linux-gnu/libtiff.so.5 $out/lib/libtiff.so.5 cp usr/lib/x86_64-linux-gnu/libwebp.so.6 $out/lib/libwebp.so.6 cp usr/lib/x86_64-linux-gnu/libxkbfile.so.1.0.2 $out/lib/libxkbfile.so.1 - cp usr/lib/x86_64-linux-gnu/libxml2.so.2 $out/lib/libxml2.so.2 cp usr/lib/x86_64-linux-gnu/libxslt.so.1.1.34 $out/lib/libxslt.so.1 runHook postInstall diff --git a/pkgs/by-name/po/poetry/package.nix b/pkgs/by-name/po/poetry/package.nix index b17bd307b3ddf..b96a4cce5b147 100644 --- a/pkgs/by-name/po/poetry/package.nix +++ b/pkgs/by-name/po/poetry/package.nix @@ -2,6 +2,7 @@ lib, python3, fetchFromGitHub, + fetchPypi, }: let @@ -25,6 +26,16 @@ let hash = "sha256-CgaWlqjvBTN7GuerzmO5IiEdXxYH6pmTDj9IsNJlCBE="; }; }); + + findpython = super.findpython.overridePythonAttrs (old: rec { + version = "0.6.3"; + + src = fetchPypi { + inherit (old) pname; + inherit version; + hash = "sha256-WGPqVVVtiq3Gk0gaFKxPNiSVJxnvwcVZGrsLSp6WXJQ="; + }; + }); } // (plugins self); python = python3.override (old: { diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix index 7984f5da15f49..0f799ed295810 100644 --- a/pkgs/by-name/pr/pretalx/package.nix +++ b/pkgs/by-name/pr/pretalx/package.nix @@ -4,6 +4,7 @@ gettext, python3, fetchFromGitHub, + fetchPypi, plugins ? [ ], nixosTests, }: @@ -14,6 +15,15 @@ let packageOverrides = final: prev: { django = prev.django_5_1; + django-csp = prev.django-csp.overridePythonAttrs rec { + version = "3.8"; + src = fetchPypi { + inherit version; + pname = "django_csp"; + hash = "sha256-7w8an32Nporm4WnALprGYcDs8E23Dg0dhWQFEqaEccA="; + }; + }; + django-extensions = prev.django-extensions.overridePythonAttrs { # Compat issues with Django 5.1 # https://github.com/django-extensions/django-extensions/issues/1885 diff --git a/pkgs/by-name/pu/publicsuffix-list/package.nix b/pkgs/by-name/pu/publicsuffix-list/package.nix index 37ea38de462ae..31d3a894674fd 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-2025-06-10"; + version = "0-unstable-2025-07-22"; src = fetchFromGitHub { owner = "publicsuffix"; repo = "list"; - rev = "9f9c1865c17a23edce0491aa6e697cc987fcdafa"; - hash = "sha256-BX8pFGtqTTlWgsZ5IJP7hApG4ysSYHTibT3+hwugSHA="; + rev = "66d74ce941749134f5b0c9f0b9ab3393084b0c21"; + hash = "sha256-FKDL0cWyIP/zwKgqwZ8qb/Oc99CvXdXllMVnL2nnWRo="; }; dontBuild = true; diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix index 103afd11c6793..9e649914c0bd4 100644 --- a/pkgs/by-name/py/pyright/package.nix +++ b/pkgs/by-name/py/pyright/package.nix @@ -7,13 +7,13 @@ }: let - version = "1.1.402"; + version = "1.1.403"; src = fetchFromGitHub { owner = "Microsoft"; repo = "pyright"; tag = version; - hash = "sha256-gB3psPkWVHUrXGQuuqMzy64Ir7hIRpMZ4dkZqusa1mo="; + hash = "sha256-vqE/3wK0rtFT9f399djm4QElRccXdOXyODsQMQySa9k="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -44,7 +44,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-3eFxGufA41RwuLrwy6Y4Q25mTbfDjm1Ddo2XOwL9lAk="; + npmDepsHash = "sha256-Tc7v6sDu0PR//ukvw9hULX0KGpRkA0hEaeuKlPnpYl4="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -58,7 +58,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-HxvVBnvM0ocwc1ck0YEj5q5ea4bAfRmftZauJrnhHck="; + npmDepsHash = "sha256-wzjdeZr6tbaBuOWDJXeTFkQRUHnxYryvI7sfGsSEpVQ="; postPatch = '' chmod +w ../../ diff --git a/pkgs/by-name/qp/qpdf/disable-timestamp-test.patch b/pkgs/by-name/qp/qpdf/disable-timestamp-test.patch new file mode 100644 index 0000000000000..97509f27a3187 --- /dev/null +++ b/pkgs/by-name/qp/qpdf/disable-timestamp-test.patch @@ -0,0 +1,31 @@ +diff --git a/libtests/qtest/qutil/qutil.out b/libtests/qtest/qutil/qutil.out +index a5f7b108c7..08c6c2eccc 100644 +--- a/libtests/qtest/qutil/qutil.out ++++ b/libtests/qtest/qutil/qutil.out +@@ -126,13 +126,6 @@ + create file + rename over existing + delete file +----- timestamp +-D:20210209144925-05'00' +-2021-02-09T14:49:25-05:00 +-D:20210210011925+05'30' +-2021-02-10T01:19:25+05:30 +-D:20210209191925Z +-2021-02-09T19:19:25Z + ---- is_long_long + done + ---- memory usage +diff --git a/libtests/qutil.cc b/libtests/qutil.cc +index 78ae82c8e3..daa9281a19 100644 +--- a/libtests/qutil.cc ++++ b/libtests/qutil.cc +@@ -766,8 +766,6 @@ + hex_encode_decode_test(); + std::cout << "---- rename/delete" << std::endl; + rename_delete_test(); +- std::cout << "---- timestamp" << std::endl; +- timestamp_test(); + std::cout << "---- is_long_long" << std::endl; + is_long_long_test(); + std::cout << "---- memory usage" << std::endl; diff --git a/pkgs/by-name/qp/qpdf/package.nix b/pkgs/by-name/qp/qpdf/package.nix index aab8a8f3e046b..82c7ded43f252 100644 --- a/pkgs/by-name/qp/qpdf/package.nix +++ b/pkgs/by-name/qp/qpdf/package.nix @@ -6,6 +6,7 @@ libjpeg, perl, zlib, + ctestCheckHook, # for passthru.tests cups-filters, @@ -45,9 +46,15 @@ stdenv.mkDerivation (finalAttrs: { libjpeg ]; + nativeCheckInputs = [ ctestCheckHook ]; + nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; + cmakeFlags = [ + (lib.cmakeBool "SHOW_FAILED_TEST_OUTPUT" true) + ]; + preConfigure = '' patchShebangs qtest/bin/qtest-driver patchShebangs run-qtest @@ -57,6 +64,16 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; + # Cursed system‐dependent(?!) failure with libc++ because another + # test in the same process sets the global locale; skip for now. + # + # See: + # * + # * + ${if stdenv.cc.libcxx != null then "patches" else null} = [ + ./disable-timestamp-test.patch + ]; + passthru.tests = { pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; inherit (python3.pkgs) pikepdf; diff --git a/pkgs/by-name/ra/rav1e/package.nix b/pkgs/by-name/ra/rav1e/package.nix index cd4e0e92260e1..8b79f8811ce0d 100644 --- a/pkgs/by-name/ra/rav1e/package.nix +++ b/pkgs/by-name/ra/rav1e/package.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "rav1e"; - version = "0.8.0"; + version = "0.8.1"; src = fetchCrate { inherit pname version; - hash = "sha256-hVeBrfZxqkxzUeuut0XgU4qph1z4gPzV/9mS7X9byto="; + hash = "sha256-GCfh2v3w5C8h4GuPKkTMUAhPspT1W0drrRpELCJWeTI="; }; - cargoHash = "sha256-EDXzpHrdaHd3FQEuVnkQzqsYAjShsGc4XLhDAfmVXK8="; + cargoHash = "sha256-KQsAEs608OyzwZtJRXw7Zwh5X+4yFJpacOMoij58vh0="; nativeBuildInputs = [ cargo-c diff --git a/pkgs/by-name/rd/rdkafka/package.nix b/pkgs/by-name/rd/rdkafka/package.nix index 976c1c044179d..89c5701e38807 100644 --- a/pkgs/by-name/rd/rdkafka/package.nix +++ b/pkgs/by-name/rd/rdkafka/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rdkafka"; - version = "2.10.1"; + version = "2.11.0"; src = fetchFromGitHub { owner = "confluentinc"; repo = "librdkafka"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-+ACn+1fjWEnUB32gUCoMpnq+6YBu+rufPT8LY920DBk="; + sha256 = "sha256-37lCQ+CFeTRQwL6FCl79RSGw+nRKr0DeuXob9CjiVnk="; }; outputs = [ diff --git a/pkgs/by-name/re/re2/package.nix b/pkgs/by-name/re/re2/package.nix index 0afcc9c6b974a..39a5ecea8eff9 100644 --- a/pkgs/by-name/re/re2/package.nix +++ b/pkgs/by-name/re/re2/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "re2"; - version = "2024-07-02"; + version = "2025-08-05"; src = fetchFromGitHub { owner = "google"; repo = "re2"; rev = finalAttrs.version; - hash = "sha256-IeANwJlJl45yf8iu/AZNDoiyIvTCZIeK1b74sdCfAIc="; + hash = "sha256-Q4/xab6Jqhai/WIMND5YWOrPmNyDDf3HysKDqum3RgQ="; }; outputs = [ diff --git a/pkgs/by-name/re/re2c/package.nix b/pkgs/by-name/re/re2c/package.nix index 5442dd079c5aa..e9d5c449ddd93 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.2"; + version = "4.3"; src = fetchFromGitHub { owner = "skvadrik"; repo = "re2c"; rev = version; - hash = "sha256-7Niq+Xxq/r86qOeJl6/gNdH1XKm6m0fPhbPmgazZFkU="; + hash = "sha256-zPOENMfXXgTwds1t+Lrmz9+GTHJf2yRpQsGT7nLRvcg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/release-plz/package.nix b/pkgs/by-name/re/release-plz/package.nix index 535fdaea13a87..84ffbab32ec66 100644 --- a/pkgs/by-name/re/release-plz/package.nix +++ b/pkgs/by-name/re/release-plz/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "release-plz"; - version = "0.3.140"; + version = "0.3.139"; src = fetchFromGitHub { owner = "MarcoIeni"; repo = "release-plz"; rev = "release-plz-v${version}"; - hash = "sha256-pJHyf1aSn4YqzFYW6otuRY+gJ6TBCKFGQuH2Py5uWlE="; + hash = "sha256-s2PvMJu0RLO2AOMMonq4xdZlQXHrvKoqh4v9tp72Ud0="; }; - cargoHash = "sha256-LfadgdrGD9g/PNeFs/XNUk2x0h1i3znzMhIV+w1DjMk="; + cargoHash = "sha256-S5YhAcEhTbiM0VCAy3IiObc1uCPbsIi0QqeFxocVqw4="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index 76fc909d6ef4a..8dea56005858c 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -16,18 +16,39 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ruff"; - version = "0.12.4"; + version = "0.12.8"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; tag = finalAttrs.version; - hash = "sha256-XuHVKxzXYlm3iEhdAVCyd62uNyb3jeJRl3B0hnvUzX0="; + hash = "sha256-ypYtAUQBFSf+cgly9K5eRMegtWrRmLmqrgfRmCJvXEk="; }; + # Patch out test that fails due to ANSI escape codes being written as-is, + # causing a snapshot test to fail. The output itself is correct. + # + # This is the relevant test's output as of 0.12.5 + # > 0 │-/home/ferris/project/code.py:1:1: E902 Permission denied (os error 13) + # > 1 │-/home/ferris/project/notebook.ipynb:1:1: E902 Permission denied (os error 13) + # > 2 │-/home/ferris/project/pyproject.toml:1:1: E902 Permission denied (os error 13) + # > 0 │+␛[1m/home/ferris/project/code.py␛[0m␛[36m:␛[0m1␛[36m:␛[0m1␛[36m:␛[0m ␛[1m␛[31mE902␛[0m Permission denied (os error 13) + # > 1 │+␛[1m/home/ferris/project/notebook.ipynb␛[0m␛[36m:␛[0m1␛[36m:␛[0m1␛[36m:␛[0m ␛[1m␛[31mE902␛[0m Permission denied (os error 13) + # > 2 │+␛[1m/home/ferris/project/pyproject.toml␛[0m␛[36m:␛[0m1␛[36m:␛[0m1␛[36m:␛[0m ␛[1m␛[31mE902␛[0m Permission denied (os error 13) + # > ────────────┴─────────────────────────────────────────────────────────────────── + postPatch = '' + substituteInPlace crates/ruff/src/commands/check.rs --replace-fail ' + #[test] + fn unreadable_files() -> Result<()> {' \ + ' + #[test] + #[ignore = "ANSI Escape Codes trigger snapshot diff"] + fn unreadable_files() -> Result<()> {' + ''; + cargoBuildFlags = [ "--package=ruff" ]; - cargoHash = "sha256-cyjaGI7JoreAmHtUrRKNyiCaE8zveP/dFJROC2iIXr4="; + cargoHash = "sha256-0iYwS8Ssi4JDxwr0Q2+iKvYHb179L6BiiuXa2D4qiOA="; nativeBuildInputs = [ installShellFiles ]; @@ -66,6 +87,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "--exclude=ty_project" "--exclude=ty_python_semantic" "--exclude=ty_server" + "--exclude=ty_static" "--exclude=ty_test" "--exclude=ty_vendored" "--exclude=ty_wasm" diff --git a/pkgs/by-name/s2/s2n-tls/package.nix b/pkgs/by-name/s2/s2n-tls/package.nix index 79155dfb0d828..175edbdd09cbf 100644 --- a/pkgs/by-name/s2/s2n-tls/package.nix +++ b/pkgs/by-name/s2/s2n-tls/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.5.22"; + version = "1.5.23"; src = fetchFromGitHub { owner = "aws"; repo = "s2n-tls"; rev = "v${version}"; - hash = "sha256-NIHtyoGjhAIiq9AsoKs3RtmMHePA4HIecPJTfkIin2Q="; + hash = "sha256-gg8JrkZ9W93sEQ4uEqCh+oaAqtUH+xAz4FdS0GD4F90="; }; nativeBuildInputs = [ cmake ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { # Glob for 'shared' or 'static' subdir for f in $out/lib/s2n/cmake/*/s2n-targets.cmake; do substituteInPlace "$f" \ - --replace 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include"' 'INTERFACE_INCLUDE_DIRECTORIES ""' + --replace-fail 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include"' 'INTERFACE_INCLUDE_DIRECTORIES ""' done ''; diff --git a/pkgs/by-name/sa/sanitiseHeaderPathsHook/package.nix b/pkgs/by-name/sa/sanitiseHeaderPathsHook/package.nix deleted file mode 100644 index 6e6bd00ebf2f8..0000000000000 --- a/pkgs/by-name/sa/sanitiseHeaderPathsHook/package.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - lib, - makeSetupHook, - removeReferencesTo, -}: - -makeSetupHook { - name = "sanitise-header-paths-hook"; - - substitutions = { - removeReferencesTo = lib.getExe removeReferencesTo; - }; - - meta = { - description = "Setup hook to sanitise header file paths to avoid leaked references through `__FILE__`"; - maintainers = [ lib.maintainers.emily ]; - }; -} ./sanitise-header-paths-hook.bash diff --git a/pkgs/by-name/sa/sanitiseHeaderPathsHook/sanitise-header-paths-hook.bash b/pkgs/by-name/sa/sanitiseHeaderPathsHook/sanitise-header-paths-hook.bash deleted file mode 100644 index 60e311e12a841..0000000000000 --- a/pkgs/by-name/sa/sanitiseHeaderPathsHook/sanitise-header-paths-hook.bash +++ /dev/null @@ -1,10 +0,0 @@ -sanitiseHeaderPaths() { - local header - while IFS= read -r -d '' header; do - nixLog "sanitising header path in $header" - sed -i "1i#line 1 \"$header\"" "$header" - @removeReferencesTo@ -t "${!outputInclude}" "$header" - done < <(find "${!outputInclude}/include" -type f -print0) -} - -preFixupHooks+=(sanitiseHeaderPaths) diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix index d6c21368d2d9d..a3d3b7ee7fb15 100644 --- a/pkgs/by-name/sd/sdl3/package.nix +++ b/pkgs/by-name/sd/sdl3/package.nix @@ -62,7 +62,7 @@ assert lib.assertMsg (ibusSupport -> dbusSupport) "SDL3 requires dbus support to stdenv.mkDerivation (finalAttrs: { pname = "sdl3"; - version = "3.2.18"; + version = "3.2.20"; outputs = [ "lib" @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "libsdl-org"; repo = "SDL"; tag = "release-${finalAttrs.version}"; - hash = "sha256-z3SMxPoO5zWOvJvgkla3vMg51qdKqbMGudIwOr3265s="; + hash = "sha256-ESYjTN2prkAeHcTYurZaWeM3RgEKtwCZrt9gSMcOAe0="; }; postPatch = diff --git a/pkgs/by-name/sh/shadow/package.nix b/pkgs/by-name/sh/shadow/package.nix index ca4d9db1d2336..74cbbbe5b5741 100644 --- a/pkgs/by-name/sh/shadow/package.nix +++ b/pkgs/by-name/sh/shadow/package.nix @@ -33,13 +33,13 @@ in stdenv.mkDerivation rec { pname = "shadow"; - version = "4.17.4"; + version = "4.18.0"; src = fetchFromGitHub { owner = "shadow-maint"; repo = "shadow"; rev = version; - hash = "sha256-HlSO1VCrMJtYlSL9/GvVw4mp/pEtuDju6V+6etrAAEk="; + hash = "sha256-M7We3JboNpr9H0ELbKcFtMvfmmVYaX9dYcsQ3sVX0lM="; }; outputs = [ @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxcrypt ] - ++ lib.optional (pam != null && stdenv.hostPlatform.isLinux) pam + ++ lib.optional (pam != null && (lib.meta.availableOn stdenv.hostPlatform pam)) pam ++ lib.optional withLibbsd libbsd ++ lib.optional withTcb tcb; diff --git a/pkgs/by-name/si/simplotask/package.nix b/pkgs/by-name/si/simplotask/package.nix index d98b732ee1282..66c0d21ebe0dd 100644 --- a/pkgs/by-name/si/simplotask/package.nix +++ b/pkgs/by-name/si/simplotask/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "simplotask"; - version = "1.18.0"; + version = "1.17.2"; src = fetchFromGitHub { owner = "umputun"; repo = "spot"; tag = "v${finalAttrs.version}"; - hash = "sha256-0XAxjh9TWMqMkeSEhdgXX9DflHnT40f7VkHgp1QjQUg="; + hash = "sha256-7EavT4IHEAe3nq6tkhX7qHpDzy7UTdBMZ7x/bquv4Z8="; }; vendorHash = null; diff --git a/pkgs/by-name/sn/snappy/package.nix b/pkgs/by-name/sn/snappy/package.nix index 566dddcc44733..40b0eba2f88a4 100644 --- a/pkgs/by-name/sn/snappy/package.nix +++ b/pkgs/by-name/sn/snappy/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, cmake, + fetchpatch, static ? stdenv.hostPlatform.isStatic, }: @@ -19,6 +20,22 @@ stdenv.mkDerivation rec { patches = [ ./revert-PUBLIC.patch + # Re-enable RTTI, without which other applications can't subclass snappy::Source + # While the patch was rejected upstream, it does not make it any less necessary to carry forward. + # ==> lack of RTTI *breaks* Ceph (and others) <== + # + # https://tracker.ceph.com/issues/53060 + # https://build.opensuse.org/package/show/openSUSE:Factory/snappy + # + # Should this patch fail to apply use the above site to get the updated patch (rev in the url below). + # On the page there's a "latest revision" section which lists the last request which was merged into it. + # Click the "Request " link, then view any file using "View file", and copy the rev from your address bar. + # For a different revision (in case nixpkgs is behind or something) you can go through the full revision history. + # Should the patch not be available for the nixpkgs version, ideally wait until the patch becomes available before bumping, or vendor it if necessary. + (fetchpatch { + url = "https://build.opensuse.org/public/source/openSUSE:Factory/snappy/reenable-rtti.patch?rev=e3449869b466869fc6b8a03a1a528fa6"; + hash = "sha256-JhVhkHh7XPx1Bzf5xnOgWLgwh1oihX3O+emQWzE4Dho="; + }) ]; outputs = [ diff --git a/pkgs/by-name/sp/spirv-cross/package.nix b/pkgs/by-name/sp/spirv-cross/package.nix index 3751d3186beaf..20b464dd5ea0e 100644 --- a/pkgs/by-name/sp/spirv-cross/package.nix +++ b/pkgs/by-name/sp/spirv-cross/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "spirv-cross"; - version = "1.4.313.0"; + version = "1.4.321.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Cross"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-Rvb3XlTGoQKABSK/jKnbOePS4BKLDAW4L+t2SLw2RMA="; + hash = "sha256-qmJK29PtjDE4+6uF8Mj6noAcRoeM3rHWRbUvcr6JzI0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sp/spirv-headers/package.nix b/pkgs/by-name/sp/spirv-headers/package.nix index ba28dbbb1efd1..6a4546588bf38 100644 --- a/pkgs/by-name/sp/spirv-headers/package.nix +++ b/pkgs/by-name/sp/spirv-headers/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "spirv-headers"; - version = "1.4.313.0"; + version = "1.4.321.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-bUgt7m3vJYoozxgrA5hVTRcbPg3OAzht0e+MgTH7q9k="; + hash = "sha256-LRjMy9xtOErbJbMh+g2IKXfmo/hWpegZM72F8E122oY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/sp/spirv-tools/package.nix b/pkgs/by-name/sp/spirv-tools/package.nix index 3f0dabe9a26f9..f158e801d2dd4 100644 --- a/pkgs/by-name/sp/spirv-tools/package.nix +++ b/pkgs/by-name/sp/spirv-tools/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "spirv-tools"; - version = "1.4.313.0"; + version = "1.4.321.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; rev = "vulkan-sdk-${version}"; - hash = "sha256-nGyEOREua/W2mdb8DhmqXW0gDThnXnIlhnURAUhCO2g="; + hash = "sha256-yAdd/mXY8EJnE0vCu0n/aVxMH9059T/7cAdB9nP1vQQ="; }; # The cmake options are sufficient for turning on static building, but not diff --git a/pkgs/by-name/st/strace/package.nix b/pkgs/by-name/st/strace/package.nix index 42ce3aecae21d..bb08112461f04 100644 --- a/pkgs/by-name/st/strace/package.nix +++ b/pkgs/by-name/st/strace/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "strace"; - version = "6.15"; + version = "6.16"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-hVLfqwirwioPIEjJj9lUH9TXG2iCUHlSeA2rfHxRL1E="; + hash = "sha256-PXrufk8ESy9n89UainbtoYB26fsndN5UrDUdd31Ov/o="; }; separateDebugInfo = true; diff --git a/pkgs/by-name/ta/tageditor/package.nix b/pkgs/by-name/ta/tageditor/package.nix index de03722f3c4ea..f0babd818ed28 100644 --- a/pkgs/by-name/ta/tageditor/package.nix +++ b/pkgs/by-name/ta/tageditor/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "tageditor"; - version = "3.9.6"; + version = "3.9.5"; src = fetchFromGitHub { owner = "martchus"; repo = "tageditor"; tag = "v${version}"; - hash = "sha256-weGLC8TPSA9XQ/TuLj4DBswmlEbpxPplsxI4sqygHfU="; + hash = "sha256-Sia6Y/V81WQj4oWjZAAR4o3TngfWq7sWxxiKEuFjQ2M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/tf/tfmigrate/package.nix b/pkgs/by-name/tf/tfmigrate/package.nix index 54460e85527c4..0b8ba744f031f 100644 --- a/pkgs/by-name/tf/tfmigrate/package.nix +++ b/pkgs/by-name/tf/tfmigrate/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "tfmigrate"; - version = "0.4.3"; + version = "0.4.2"; src = fetchFromGitHub { owner = "minamijoyo"; repo = "tfmigrate"; tag = "v${finalAttrs.version}"; - hash = "sha256-tuLbcxJj8TsG3I/o3cHO2DtQm9ql3wlhYBtYiMbRW7o="; + hash = "sha256-+5nw+EgFTor8XL4cibxkpJL4fdEQ6UuEj5wyOjpaANA="; }; - vendorHash = "sha256-TqZi5NZ+4eSzq98/ZM4Gab7Sud7bz1DNHrp5nGaGHDE="; + vendorHash = "sha256-mm34U4nLow4lCz/AgfqYZJRb71GpQjR14+tm0hfmdDc="; checkFlags = [ "-skip TestExecutorDir" # assumes /usr/bin to be present diff --git a/pkgs/by-name/th/thrift/package.nix b/pkgs/by-name/th/thrift/package.nix index 574c028e463df..7b32a64faad91 100644 --- a/pkgs/by-name/th/thrift/package.nix +++ b/pkgs/by-name/th/thrift/package.nix @@ -33,11 +33,17 @@ stdenv.mkDerivation rec { cmake flex pkg-config - python3 - python3.pkgs.setuptools - ] - ++ lib.optionals (!static) [ - python3.pkgs.twisted + (python3.withPackages ( + ps: + with ps; + [ + setuptools + six + ] + ++ lib.optionals (!static) [ + twisted + ] + )) ]; buildInputs = [ diff --git a/pkgs/by-name/tr/triton-llvm/package.nix b/pkgs/by-name/tr/triton-llvm/package.nix index b9f1a112e8208..2d0b979f8494b 100644 --- a/pkgs/by-name/tr/triton-llvm/package.nix +++ b/pkgs/by-name/tr/triton-llvm/package.nix @@ -6,7 +6,6 @@ pkg-config, cmake, ninja, - git, libxml2, libxcrypt, libedit, @@ -89,7 +88,6 @@ stdenv.mkDerivation (finalAttrs: { pkg-config cmake ninja - git python ] ++ lib.optionals (buildDocs || buildMan) [ diff --git a/pkgs/by-name/um/umockdev/package.nix b/pkgs/by-name/um/umockdev/package.nix index ae00af50d2eba..91d213d7e08cc 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.19.1"; + version = "0.19.2"; 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-LOzg6ONmuJtAcL508zicn3+iGspW2KU1fpbjDNjU9CY="; + hash = "sha256-b92mdUTzZslfFVbeDR+C2xPyMbwDYsffA8w0uiaykmg="; }; patches = [ diff --git a/pkgs/by-name/un/unbound/package.nix b/pkgs/by-name/un/unbound/package.nix index 41948b705f0d4..fe24b22775b11 100644 --- a/pkgs/by-name/un/unbound/package.nix +++ b/pkgs/by-name/un/unbound/package.nix @@ -56,13 +56,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "unbound"; - version = "1.23.0"; + version = "1.23.1"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = "unbound"; tag = "release-${finalAttrs.version}"; - hash = "sha256-a9WNUVDy7ORB40VFUhkUxEaBho+HVNJ105AqdGDr+tI="; + hash = "sha256-65bv/AYQ3Dxwuwv49dU2UuA2imZFbUWnQEJESJvqC6w="; }; outputs = [ diff --git a/pkgs/by-name/un/unityhub/package.nix b/pkgs/by-name/un/unityhub/package.nix index ab7dd5b92db97..f6462328da7c8 100644 --- a/pkgs/by-name/un/unityhub/package.nix +++ b/pkgs/by-name/un/unityhub/package.nix @@ -96,18 +96,7 @@ stdenv.mkDerivation rec { xorg.libXcursor glib gdk-pixbuf - (libxml2.overrideAttrs (oldAttrs: rec { - version = "2.13.8"; - src = fetchurl { - url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz"; - hash = "sha256-J3KUyzMRmrcbK8gfL0Rem8lDW4k60VuyzSsOhZoO6Eo="; - }; - meta = oldAttrs.meta // { - knownVulnerabilities = oldAttrs.meta.knownVulnerabilities or [ ] ++ [ - "CVE-2025-6021" - ]; - }; - })) + libxml2_13 zlib clang git # for git-based packages in unity package manager diff --git a/pkgs/by-name/un/unzip/package.nix b/pkgs/by-name/un/unzip/package.nix index a9716e71eafbf..1b35d4f52f936 100644 --- a/pkgs/by-name/un/unzip/package.nix +++ b/pkgs/by-name/un/unzip/package.nix @@ -85,6 +85,11 @@ stdenv.mkDerivation rec { sha256 = "67ab260ae6adf8e7c5eda2d1d7846929b43562943ec4aff629bd7018954058b1"; }); + # gcc-15 uses c23 standard, which removed non-prototype function declarations. + postPatch = '' + sed -i '/localtime()/ d' unix/unxcfg.h + ''; + nativeBuildInputs = [ bzip2 ]; buildInputs = [ bzip2 ] ++ lib.optional enableNLS libnatspec; diff --git a/pkgs/by-name/ur/urlwatch/package.nix b/pkgs/by-name/ur/urlwatch/package.nix index 73429bad880c4..972cd24c1cfde 100644 --- a/pkgs/by-name/ur/urlwatch/package.nix +++ b/pkgs/by-name/ur/urlwatch/package.nix @@ -12,26 +12,22 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "thp"; repo = "urlwatch"; - tag = version; + rev = version; hash = "sha256-X1UR9JrQuujOIUg87W0YqfXsM3A5nttWjjJMIe3hgk8="; }; build-system = with python3Packages; [ setuptools ]; dependencies = with python3Packages; [ - aioxmpp - beautifulsoup4 - cssbeautifier cssselect jq - jsbeautifier keyring lxml markdown2 matrix-client minidb - platformdirs playwright + platformdirs pushbullet-py pycodestyle pyyaml @@ -45,13 +41,12 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Tool for monitoring webpages for updates"; + mainProgram = "urlwatch"; homepage = "https://thp.io/2008/urlwatch/"; - changelog = "https://github.com/thp/urlwatch/blob/${src.tag}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ kmein tv ]; - mainProgram = "urlwatch"; }; } diff --git a/pkgs/by-name/ut/util-linux/fix-darwin-build.patch b/pkgs/by-name/ut/util-linux/fix-darwin-build.patch deleted file mode 100644 index c65266e886905..0000000000000 --- a/pkgs/by-name/ut/util-linux/fix-darwin-build.patch +++ /dev/null @@ -1,35 +0,0 @@ -From e47c6f751a7ef87640c61316ada774e8e9cc6b07 Mon Sep 17 00:00:00 2001 -From: Eugene Gershnik -Date: Mon, 6 May 2024 09:29:39 -0700 -Subject: [PATCH] libuuid: fix uuid_time on macOS without attribute((alias)) - -Weak aliases are not supported by clang on Darwin. -Instead this fix uses inline asm to make `_uuid_time` an alias to -`___uuid_time` - -It appears that on macOS the time API is purely 32 or 64 bit depending -on the build type. There is no ABI issue on that platform and `uuid_time` -can be unconditionally aliased to `_uuid_time`. This is all conjectural, -however, since I have no ability to make 32-bit builds for macOS - the -Apple toolchain doesn't support this since 2019. - -Fixes util-linux/util-linux#2873 ---- - libuuid/src/uuid_time.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/libuuid/src/uuid_time.c b/libuuid/src/uuid_time.c -index 9b415b3ee73..df0478e1909 100644 ---- a/libuuid/src/uuid_time.c -+++ b/libuuid/src/uuid_time.c -@@ -85,6 +85,10 @@ time_t __uuid_time(const uuid_t uu, struct timeval *ret_tv) - } - #if defined(__USE_TIME_BITS64) && defined(__GLIBC__) - extern time_t uuid_time64(const uuid_t uu, struct timeval *ret_tv) __attribute__((weak, alias("__uuid_time"))); -+#elif defined(__clang__) && defined(__APPLE__) -+__asm__(".globl _uuid_time"); -+__asm__(".set _uuid_time, ___uuid_time"); -+extern time_t uuid_time(const uuid_t uu, struct timeval *ret_tv); - #else - extern time_t uuid_time(const uuid_t uu, struct timeval *ret_tv) __attribute__((weak, alias("__uuid_time"))); - #endif diff --git a/pkgs/by-name/ut/util-linux/fix-mount-regression.patch b/pkgs/by-name/ut/util-linux/fix-mount-regression.patch deleted file mode 100644 index 973ba7493e7d9..0000000000000 --- a/pkgs/by-name/ut/util-linux/fix-mount-regression.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 7dbfe31a83f45d5aef2b508697e9511c569ffbc8 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Mon, 24 Mar 2025 14:31:05 +0100 -Subject: [PATCH] libmount: fix --no-canonicalize regression - -Fixes: https://github.com/util-linux/util-linux/issues/3474 -Signed-off-by: Karel Zak ---- - libmount/src/context.c | 3 --- - sys-utils/mount.8.adoc | 2 +- - 2 files changed, 1 insertion(+), 4 deletions(-) - -diff --git a/libmount/src/context.c b/libmount/src/context.c -index 0323cb23d34..15a8ad3bbd0 100644 ---- a/libmount/src/context.c -+++ b/libmount/src/context.c -@@ -530,9 +530,6 @@ int mnt_context_is_xnocanonicalize( - assert(cxt); - assert(type); - -- if (mnt_context_is_nocanonicalize(cxt)) -- return 1; -- - ol = mnt_context_get_optlist(cxt); - if (!ol) - return 0; -diff --git a/sys-utils/mount.8.adoc b/sys-utils/mount.8.adoc -index 4f23f8d1f0e..5103b91c578 100644 ---- a/sys-utils/mount.8.adoc -+++ b/sys-utils/mount.8.adoc -@@ -756,7 +756,7 @@ Allow to make a target directory (mountpoint) if it does not exist yet. The opti - *X-mount.nocanonicalize*[**=**_type_]:: - Allows disabling of canonicalization for mount source and target paths. By default, the `mount` command resolves all paths to their absolute paths without symlinks. However, this behavior may not be desired in certain situations, such as when binding a mount over a symlink, or a symlink over a directory or another symlink. The optional argument _type_ can be either "source" or "target" (mountpoint). If no _type_ is specified, then canonicalization is disabled for both types. This mount option does not affect the conversion of source tags (e.g. LABEL= or UUID=) and fstab processing. - + --The command line option *--no-canonicalize* overrides this mount option and affects all path and tag conversions in all situations, but it does not modify flags for open_tree syscalls. -+The command-line option *--no-canonicalize* overrides this mount option and affects all path and tag conversions in all situations, but for backward compatibility, it does not modify open_tree syscall flags and does not allow the bind-mount over a symlink use case. - + - Note that *mount*(8) still sanitizes and canonicalizes the source and target paths specified on the command line by non-root users, regardless of the X-mount.nocanonicalize setting. - diff --git a/pkgs/by-name/ut/util-linux/libmount-subdir-remove-unused-code.patch b/pkgs/by-name/ut/util-linux/libmount-subdir-remove-unused-code.patch deleted file mode 100644 index 557924570c849..0000000000000 --- a/pkgs/by-name/ut/util-linux/libmount-subdir-remove-unused-code.patch +++ /dev/null @@ -1,31 +0,0 @@ -From cfb80587da7bf3d6a8eeb9b846702d6d731aa1c6 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Wed, 9 Apr 2025 11:32:08 +0200 -Subject: [PATCH] libmount: (subdir) remove unused code - -The optlist already handles quoted values, so there's no need to do it -in the callers. - -Signed-off-by: Karel Zak -(cherry picked from commit 5462fa3435544344727b8644205ae427dfd5fcba) ---- - libmount/src/hook_subdir.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/libmount/src/hook_subdir.c b/libmount/src/hook_subdir.c -index 5949af7d8..1e5d79958 100644 ---- a/libmount/src/hook_subdir.c -+++ b/libmount/src/hook_subdir.c -@@ -329,9 +329,6 @@ static int is_subdir_required(struct libmnt_context *cxt, int *rc, char **subdir - - dir = mnt_opt_get_value(opt); - -- if (dir && *dir == '"') -- dir++; -- - if (!dir || !*dir) { - DBG(HOOK, ul_debug("failed to parse X-mount.subdir '%s'", dir)); - *rc = -MNT_ERR_MOUNTOPT; --- -2.49.0 - diff --git a/pkgs/by-name/ut/util-linux/libmount-subdir-restrict-for-real-mounts-only.patch b/pkgs/by-name/ut/util-linux/libmount-subdir-restrict-for-real-mounts-only.patch deleted file mode 100644 index d96a303a9cc4c..0000000000000 --- a/pkgs/by-name/ut/util-linux/libmount-subdir-restrict-for-real-mounts-only.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 22b91501d30a65d25ecf48ce5169ec70848117b8 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Wed, 9 Apr 2025 12:15:57 +0200 -Subject: [PATCH] libmount: (subdir) restrict for real mounts only - -It's now possible to use, for example, for bind operations, but it -does not make sense as you can specify the target with the -subdirectory. - -Signed-off-by: Karel Zak -(cherry picked from commit 437a271f7108f689d350f1b3d837490d3d283c3c) ---- - libmount/src/hook_subdir.c | 21 ++++++++++++++++----- - sys-utils/mount.8.adoc | 6 ++++-- - 2 files changed, 20 insertions(+), 7 deletions(-) - -diff --git a/libmount/src/hook_subdir.c b/libmount/src/hook_subdir.c -index 1e5d79958..7cbb2c88d 100644 ---- a/libmount/src/hook_subdir.c -+++ b/libmount/src/hook_subdir.c -@@ -313,6 +313,7 @@ static int is_subdir_required(struct libmnt_context *cxt, int *rc, char **subdir - struct libmnt_optlist *ol; - struct libmnt_opt *opt; - const char *dir = NULL; -+ unsigned long flags = 0; - - assert(cxt); - assert(rc); -@@ -328,16 +329,26 @@ static int is_subdir_required(struct libmnt_context *cxt, int *rc, char **subdir - return 0; - - dir = mnt_opt_get_value(opt); -- - if (!dir || !*dir) { - DBG(HOOK, ul_debug("failed to parse X-mount.subdir '%s'", dir)); - *rc = -MNT_ERR_MOUNTOPT; -- } else { -- *subdir = strdup(dir); -- if (!*subdir) -- *rc = -ENOMEM; -+ return 0; -+ } -+ -+ *rc = mnt_optlist_get_flags(ol, &flags, cxt->map_linux, 0); -+ if (*rc) -+ return 0; -+ -+ if (flags & MS_REMOUNT || flags & MS_BIND || flags & MS_MOVE -+ || mnt_context_propagation_only(cxt)) { -+ DBG(HOOK, ul_debug("ignore subdir= (bind/move/remount/..)")); -+ return 0; - } - -+ *subdir = strdup(dir); -+ if (!*subdir) -+ *rc = -ENOMEM; -+ - return *rc == 0; - } - -diff --git a/sys-utils/mount.8.adoc b/sys-utils/mount.8.adoc -index 6a17cd5eb..d9ce31fd4 100644 ---- a/sys-utils/mount.8.adoc -+++ b/sys-utils/mount.8.adoc -@@ -763,8 +763,10 @@ Note that *mount*(8) still sanitizes and canonicalizes the source and target pat - *X-mount.noloop*:: - Do not create and mount a loop device, even if the source of the mount is a regular file. - --*X-mount.subdir=*__directory__:: --Allow mounting sub-directory from a filesystem instead of the root directory. For now, this feature is implemented by temporary filesystem root directory mount in unshared namespace and then bind the sub-directory to the final mount point and umount the root of the filesystem. The sub-directory mount shows up atomically for the rest of the system although it is implemented by multiple *mount*(2) syscalls. -+**X-mount.subdir=**_directory_:: -+Allow mounting a subdirectory of a filesystem instead of the root directory. This is effective only when a new instance of a filesystem is attached to the system. The option is silently ignored for operations like remount, bind mount, or move. -++ -+For now, this feature is implemented by a temporary filesystem root-directory mount in an unshared namespace and then binding the sub-directory to the final mount point and unmounting the root of the filesystem. The sub-directory mount shows up atomically for the rest of the system although it is implemented by multiple *mount*(2) syscalls. - + - Note that this feature will not work in session with an unshared private mount namespace (after *unshare --mount*) on old kernels or with *mount*(8) without support for file-descriptors-based mount kernel API. In this case, you need *unshare --mount --propagation shared*. - + --- -2.49.0 - diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix index fb957238eaad2..1f2a43e182756 100644 --- a/pkgs/by-name/ut/util-linux/package.nix +++ b/pkgs/by-name/ut/util-linux/package.nix @@ -17,7 +17,7 @@ cryptsetup, ncursesSupport ? true, ncurses, - pamSupport ? true, + pamSupport ? lib.meta.availableOn stdenv.hostPlatform pam, pam, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd, @@ -28,7 +28,10 @@ installShellFiles, writeSupport ? stdenv.hostPlatform.isLinux, shadowSupport ? stdenv.hostPlatform.isLinux, + # Doesn't build on Darwin, only makes sense on systems which have pam + withLastlog ? !stdenv.hostPlatform.isDarwin && lib.meta.availableOn stdenv.hostPlatform pam, gitUpdater, + nixosTests, }: let @@ -36,24 +39,15 @@ let in stdenv.mkDerivation (finalPackage: rec { pname = "util-linux" + lib.optionalString isMinimal "-minimal"; - version = "2.41"; + version = "2.41.1"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/util-linux-${version}.tar.xz"; - hash = "sha256-ge6Ts8/f6318QJDO3rode7zpFB/QtQG2hrP+R13cpMY="; + hash = "sha256-vprZonb0MFq33S9SJci+H/VDUvVl/03t6WKMGqp97Fc="; }; patches = [ ./rtcwake-search-PATH-for-shutdown.patch - # https://github.com/util-linux/util-linux/pull/3013 - ./fix-darwin-build.patch - # https://github.com/util-linux/util-linux/pull/3479 (fixes https://github.com/util-linux/util-linux/issues/3474) - ./fix-mount-regression.patch - # https://github.com/util-linux/util-linux/pull/3530 - ./libmount-subdir-remove-unused-code.patch - ./libmount-subdir-restrict-for-real-mounts-only.patch - ] - ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ (fetchurl { name = "bits-only-build-when-cpu_set_t-is-available.patch"; url = "https://lore.kernel.org/util-linux/20250501075806.88759-1-hi@alyssa.is/raw"; @@ -72,10 +66,15 @@ stdenv.mkDerivation (finalPackage: rec { "out" "lib" "man" + "login" + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + "mount" + "swap" ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ "mount" ] - ++ [ "login" ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ "swap" ]; + ++ lib.optionals withLastlog [ + "lastlog" + ]; separateDebugInfo = true; postPatch = '' @@ -129,8 +128,7 @@ stdenv.mkDerivation (finalPackage: rec { "--disable-ipcrm" "--disable-ipcs" ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # Doesn't build on Darwin, also doesn't really make sense on Darwin + ++ lib.optionals (!withLastlog) [ "--disable-liblastlog2" ] ++ lib.optionals stdenv.hostPlatform.isStatic [ @@ -145,12 +143,10 @@ stdenv.mkDerivation (finalPackage: rec { ]; nativeBuildInputs = [ - pkg-config - installShellFiles - ] - ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ autoconf automake116x + installShellFiles + pkg-config ] ++ lib.optionals translateManpages [ po4a ] ++ lib.optionals (cryptsetupSupport == "dlopen") [ cryptsetup ]; @@ -183,6 +179,18 @@ stdenv.mkDerivation (finalPackage: rec { prefix=$login _moveSbin ln -svf "$login/bin/"* $bin/bin/ '' + + lib.optionalString withLastlog '' + # moveToOutput "lib/liblastlog2*" "$lastlog" + ${lib.optionalString (!stdenv.hostPlatform.isStatic) ''moveToOutput "lib/security" "$lastlog"''} + moveToOutput "lib/tmpfiles.d/lastlog2-tmpfiles.conf" "$lastlog" + + moveToOutput "lib/systemd/system/lastlog2-import.service" "$lastlog" + substituteInPlace $lastlog/lib/systemd/system/lastlog2-import.service \ + --replace-fail "$bin/bin/lastlog2" "$lastlog/bin/lastlog2" + + moveToOutput "bin/lastlog2" "$lastlog" + ln -svf "$lastlog/bin/"* $bin/bin/ + '' + lib.optionalString stdenv.hostPlatform.isLinux '' moveToOutput sbin/swapon "$swap" @@ -209,6 +217,10 @@ stdenv.mkDerivation (finalPackage: rec { # encode upstream assumption to be used in man-db # https://github.com/util-linux/util-linux/commit/8886d84e25a457702b45194d69a47313f76dc6bc hasCol = stdenv.hostPlatform.libc == "glibc"; + + tests = { + inherit (nixosTests) pam-lastlog; + }; }; meta = { diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 3638f3b5b91af..ce3acab23aa78 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uv"; - version = "0.8.2"; + version = "0.8.6"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-qMXXkf2hLyzd+4H85kGHiQIdAbvhMA2z+1z05ZF0hts="; + hash = "sha256-82KKnz42Nn2Ef8DHBWBMPTrQVsM+klIOV8hqSKnXqEY="; }; - cargoHash = "sha256-G5mLFKy/khHlP32/VFudtJJC1CWpBNyx4yPx1Gc8pcY="; + cargoHash = "sha256-l2/PMPiSPE6WpXOuU21NsMx0vsz9cuy/QeCiSTkbvVw="; buildInputs = [ rust-jemalloc-sys diff --git a/pkgs/by-name/vu/vulkan-extension-layer/package.nix b/pkgs/by-name/vu/vulkan-extension-layer/package.nix index 1d9d8346daca6..b64bfb519150f 100644 --- a/pkgs/by-name/vu/vulkan-extension-layer/package.nix +++ b/pkgs/by-name/vu/vulkan-extension-layer/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "vulkan-extension-layer"; - version = "1.4.321"; + version = "1.4.321.0"; src = fetchFromGitHub { owner = "KhronosGroup"; diff --git a/pkgs/by-name/vu/vulkan-headers/package.nix b/pkgs/by-name/vu/vulkan-headers/package.nix index 8510c2fb43af5..c1b118fc6cef4 100644 --- a/pkgs/by-name/vu/vulkan-headers/package.nix +++ b/pkgs/by-name/vu/vulkan-headers/package.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.4.313.0"; + version = "1.4.321.0"; # Adding `ninja` here to enable Ninja backend. Otherwise on gcc-14 or # later the build fails as: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-cbt0QHifjRCak+3V9J5PjNXDIEBvnwVYFa7rcmNv1VU="; + hash = "sha256-Yznjiiu/EEW7B37hbO0aw8Lvc6aVxOy7J/zSwmGxVc0="; }; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/vu/vulkan-loader/package.nix b/pkgs/by-name/vu/vulkan-loader/package.nix index c2e61f455bf52..323dbd95dcbe2 100644 --- a/pkgs/by-name/vu/vulkan-loader/package.nix +++ b/pkgs/by-name/vu/vulkan-loader/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vulkan-loader"; - version = "1.4.313.0"; + version = "1.4.321.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-CeIjyW90Ri0MvhyFfYgss5Rjh5fHKhQf7CgBEcB/nPk="; + hash = "sha256-i06il1GRkjSlhY36XpIUCcd1Wy+If+Eennzbb//1dzk="; }; patches = [ ./fix-pkgconfig.patch ]; diff --git a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix index 88791c0cd7740..47bd85ab67b86 100644 --- a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix +++ b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix @@ -22,18 +22,18 @@ vulkan-loader, vulkan-utility-libraries, writeText, - libsForQt5, + qt6, }: stdenv.mkDerivation rec { pname = "vulkan-tools-lunarg"; - version = "1.4.313.0"; + version = "1.4.321.0"; src = fetchFromGitHub { owner = "LunarG"; repo = "VulkanTools"; rev = "vulkan-sdk-${version}"; - hash = "sha256-VJxomhzHEIbQ8CUzlUN2fvBF+M9854FlIR0fE2RgppM="; + hash = "sha256-Wd37AYfZ8Ia5kXS9Nvxyj7s+W2DPHUONtqD+tX45XGk="; }; nativeBuildInputs = [ @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { jq which pkg-config - libsForQt5.qt5.wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ @@ -60,8 +60,8 @@ stdenv.mkDerivation rec { wayland xcbutilkeysyms xcbutilwm - libsForQt5.qt5.qtbase - libsForQt5.qt5.qtwayland + qt6.qtbase + qt6.qtwayland ]; cmakeFlags = [ @@ -70,7 +70,6 @@ stdenv.mkDerivation rec { preConfigure = '' patchShebangs scripts/* - substituteInPlace via/CMakeLists.txt --replace "jsoncpp_static" "jsoncpp" ''; # Include absolute paths to layer libraries in their associated diff --git a/pkgs/by-name/vu/vulkan-tools/package.nix b/pkgs/by-name/vu/vulkan-tools/package.nix index 3b37dea8f772c..dfd2fc5236976 100644 --- a/pkgs/by-name/vu/vulkan-tools/package.nix +++ b/pkgs/by-name/vu/vulkan-tools/package.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "vulkan-tools"; - version = "1.4.313.0"; + version = "1.4.321.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Tools"; rev = "vulkan-sdk-${version}"; - hash = "sha256-47RVuhK9NDtOazG4awTjwbZSnG+thGw6GpyKmcCgWpQ="; + hash = "sha256-cd7aLDhXiZ4Wlnrx2dfCQG3j+9vosM3SeohhCNvVN48="; }; patches = [ ./wayland-scanner.patch ]; diff --git a/pkgs/by-name/vu/vulkan-utility-libraries/package.nix b/pkgs/by-name/vu/vulkan-utility-libraries/package.nix index 59ea1f8ca1fa9..71601060ee97c 100644 --- a/pkgs/by-name/vu/vulkan-utility-libraries/package.nix +++ b/pkgs/by-name/vu/vulkan-utility-libraries/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vulkan-utility-libraries"; - version = "1.4.313.0"; + version = "1.4.321.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Utility-Libraries"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-MmC4UVa9P/0h7r8IBp1LhP9EztwyZv/ASWKKj8Gk1T8="; + hash = "sha256-MaEn0qVTnhp5kKCbyMhFXysIcAnZF+ba4+KaVD4wSPY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vu/vulkan-validation-layers/package.nix b/pkgs/by-name/vu/vulkan-validation-layers/package.nix index 901a1fdd960e3..5ec68fa4c0b1a 100644 --- a/pkgs/by-name/vu/vulkan-validation-layers/package.nix +++ b/pkgs/by-name/vu/vulkan-validation-layers/package.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; - version = "1.4.313.0"; + version = "1.4.321.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-FavJ9QIv9J/QlY8bBSQ4C+8ZeNzge3Rov97GPOjltuA="; + hash = "sha256-aTO8AIwN6/oOcxu6AgYBoOQiUHQkT6MJGAYNgP5js9I="; }; strictDeps = true; diff --git a/pkgs/by-name/vu/vulkan-volk/package.nix b/pkgs/by-name/vu/vulkan-volk/package.nix index ac586b3a05ddf..22be9032106eb 100644 --- a/pkgs/by-name/vu/vulkan-volk/package.nix +++ b/pkgs/by-name/vu/vulkan-volk/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "volk"; - version = "1.4.313.0"; + version = "1.4.321.0"; src = fetchFromGitHub { owner = "zeux"; repo = "volk"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-MXJjHfrSZiDHnCJMaKYgy2480DxNv86pbHx2ebWU2ug="; + hash = "sha256-Revi0OVvLI23yh1R6mNfcUCo1DXlACLjIw+k6EZQb/U="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/wa/wangle/package.nix b/pkgs/by-name/wa/wangle/package.nix index 2341006916f01..7f4aacb50d798 100644 --- a/pkgs/by-name/wa/wangle/package.nix +++ b/pkgs/by-name/wa/wangle/package.nix @@ -6,7 +6,6 @@ cmake, ninja, - sanitiseHeaderPathsHook, folly, fizz, @@ -44,7 +43,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ninja - sanitiseHeaderPathsHook ]; buildInputs = [ diff --git a/pkgs/by-name/wa/waytrogen/package.nix b/pkgs/by-name/wa/waytrogen/package.nix index 922b7e0e19e42..27aec72ba5b3c 100644 --- a/pkgs/by-name/wa/waytrogen/package.nix +++ b/pkgs/by-name/wa/waytrogen/package.nix @@ -16,19 +16,19 @@ desktop-file-utils, }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation rec { pname = "waytrogen"; version = "0.7.3"; src = fetchFromGitHub { owner = "nikolaizombie1"; repo = "waytrogen"; - tag = finalAttrs.version; + tag = version; hash = "sha256-vFzOGadWR5xwhIKrKPHoAHstoeyFw4GrS5aYlpvEF5E="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit (finalAttrs) pname version src; + inherit pname version src; hash = "sha256-k6n6aWEJ/8Dkbd68CJfJ7kbRTltCuQ4AtZ5dALFD3lU="; }; @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { in the Rust 🦀 programming language. Supports hyprpaper, swaybg, mpvpaper and swww wallpaper changers. ''; homepage = "https://github.com/nikolaizombie1/waytrogen"; - changelog = "https://github.com/nikolaizombie1/waytrogen/releases/tag/${finalAttrs.version}"; + changelog = "https://github.com/nikolaizombie1/waytrogen/releases/tag/${version}"; license = lib.licenses.unlicense; maintainers = with lib.maintainers; [ genga898 @@ -76,4 +76,4 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "waytrogen"; platforms = lib.platforms.linux; }; -}) +} diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix index b0500def65f7a..36bbdc21b1ea1 100644 --- a/pkgs/by-name/we/weblate/package.nix +++ b/pkgs/by-name/we/weblate/package.nix @@ -150,7 +150,10 @@ python.pkgs.buildPythonApplication rec { ++ drf-spectacular.optional-dependencies.sidecar ++ drf-standardized-errors.optional-dependencies.openapi; - pythonRelaxDeps = [ "certifi" ]; + pythonRelaxDeps = [ + "certifi" + "lxml" + ]; optional-dependencies = { postgres = with python.pkgs; [ psycopg ]; diff --git a/pkgs/by-name/xk/xkeyboard-config/package.nix b/pkgs/by-name/xk/xkeyboard-config/package.nix index 2862769bb6cbd..666de77d7b000 100644 --- a/pkgs/by-name/xk/xkeyboard-config/package.nix +++ b/pkgs/by-name/xk/xkeyboard-config/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch2, pkg-config, meson, ninja, @@ -20,6 +21,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Fp4HWpLZV6V3h8GZ6E41nfKTG3GWwcW0o9V27mI1qHw="; }; + patches = [ + # Patch that reverts a commit in 2.45 that broke the us-mac keyboard layout. + # Remove when 2.46 is released. + # https://github.com/NixOS/nixpkgs/issues/426375 + (fetchpatch2 { + url = "https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/11dbaeb23d06c0d21efe538c90b44ffc8fc3a071.patch"; + hash = "sha256-qZkO1GQvbtTFeXqCuA7bjgQX5jq9c+LiKa/ziP1w2sI="; + }) + ]; + strictDeps = true; nativeBuildInputs = [ diff --git a/pkgs/by-name/ze/zeromq/package.nix b/pkgs/by-name/ze/zeromq/package.nix index 845aef375bc5a..918099c8b6240 100644 --- a/pkgs/by-name/ze/zeromq/package.nix +++ b/pkgs/by-name/ze/zeromq/package.nix @@ -8,6 +8,7 @@ asciidoc, xmlto, enableDrafts ? false, + fetchpatch, # for passthru.tests azmq, cppzmq, @@ -25,10 +26,20 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "zeromq"; repo = "libzmq"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-q2h5y0Asad+fGB9haO4Vg7a1ffO2JSb7czzlhmT3VmI="; }; + # Use proper STREQUAL instead of EQUAL to compare strings + # See: https://github.com/zeromq/libzmq/pull/4711 + patches = [ + (fetchpatch { + url = "https://github.com/zeromq/libzmq/pull/4711/commits/55bd6b3df06734730d3012c17bc26681e25b549d.patch"; + hash = "sha256-/FVah+s7f1hWXv3MXkYfIiV1XAiMVDa0tmt4BQmSgmY="; + name = "cacheline_undefined.patch"; + }) + ]; + strictDeps = true; nativeBuildInputs = [ diff --git a/pkgs/by-name/zi/zizmor/package.nix b/pkgs/by-name/zi/zizmor/package.nix index 0ce9a1fd6dade..cde6a31644789 100644 --- a/pkgs/by-name/zi/zizmor/package.nix +++ b/pkgs/by-name/zi/zizmor/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "zizmor"; - version = "1.12.1"; + version = "1.11.0"; src = fetchFromGitHub { owner = "zizmorcore"; repo = "zizmor"; tag = "v${finalAttrs.version}"; - hash = "sha256-GnKSbcsVYzbhsrwIUAEArltzQe0IE2tiIr2CqsMQyzk="; + hash = "sha256-zxEF76zpqwLroC5GjSkwIC3+XdXmErvabIEqhVe0zCA="; }; - cargoHash = "sha256-wLJlaV59sAo97KI6Ekw42aaG6hVkul1wFvcC+71+Zp4="; + cargoHash = "sha256-vxDyao9pX/CfS08vFmq3vXtgDIg5NXlEwpzroGW48dA="; nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ installShellFiles diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index bd1c6b104bd2b..07da1f56012e9 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "0b40331fe9f6ba2ce9cf1b8afe0a04aa79d36878", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/0b40331fe9f6ba2ce9cf1b8afe0a04aa79d36878.tar.gz", - "sha256": "03mjsvybfh8bq5v475pqqs5bs9xdb0pm2qrw9w892q0q0ir5b6na", - "msg": "Update from Hackage at 2025-06-01T18:10:16Z" + "commit": "e184dedb360769d6e8e041e711559185f39ab55c", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e184dedb360769d6e8e041e711559185f39ab55c.tar.gz", + "sha256": "16qlwrw96lf52yvmmhfl948wpimbnqm9z87j27agcdmigf5icg1s", + "msg": "Update from Hackage at 2025-07-07T21:33:55Z" } diff --git a/pkgs/development/compilers/gcc/common/builder.nix b/pkgs/development/compilers/gcc/common/builder.nix index 7080666572d61..b1b5daeb00f1a 100644 --- a/pkgs/development/compilers/gcc/common/builder.nix +++ b/pkgs/development/compilers/gcc/common/builder.nix @@ -126,6 +126,20 @@ originalAttrs: EXTRA_LDFLAGS_FOR_TARGET="$EXTRA_LDFLAGS" fi + # We include `-fmacro-prefix-map` in `cc-wrapper` for non‐GCC + # platforms only, but they get picked up and passed down to + # e.g. GFortran calls that complain about the option not + # applying to the language. Hack around it by asking GCC not + # to complain. + # + # TODO: Someone please fix this to do things that make sense. + if [[ $EXTRA_FLAGS_FOR_BUILD == *-fmacro-prefix-map* ]]; then + EXTRA_FLAGS_FOR_BUILD+=" -Wno-complain-wrong-lang" + fi + if [[ $EXTRA_FLAGS_FOR_TARGET == *-fmacro-prefix-map* ]]; then + EXTRA_FLAGS_FOR_TARGET+=" -Wno-complain-wrong-lang" + fi + # CFLAGS_FOR_TARGET are needed for the libstdc++ configure script to find # the startfiles. # FLAGS_FOR_TARGET are needed for the target libraries to receive the -Bxxx diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index 88d405c3c8e75..17d32f60d6cd2 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -20,6 +20,7 @@ enablePlugin, disableGdbPlugin ? !enablePlugin, enableShared, + targetPrefix, langC, langCC, @@ -58,10 +59,6 @@ let crossDarwin = (!lib.systems.equals targetPlatform hostPlatform) && targetPlatform.libc == "libSystem"; - targetPrefix = lib.optionalString ( - !lib.systems.equals stdenv.targetPlatform stdenv.hostPlatform - ) "${stdenv.targetPlatform.config}-"; - crossConfigureFlags = # Ensure that -print-prog-name is able to find the correct programs. [ diff --git a/pkgs/development/compilers/gcc/common/dependencies.nix b/pkgs/development/compilers/gcc/common/dependencies.nix index 839d6474836e1..7438cb64f8eaa 100644 --- a/pkgs/development/compilers/gcc/common/dependencies.nix +++ b/pkgs/development/compilers/gcc/common/dependencies.nix @@ -12,7 +12,6 @@ gmp, mpfr, libmpc, - sanitiseHeaderPathsHook, libucontext ? null, libxcrypt ? null, isSnapshot ? false, @@ -42,10 +41,6 @@ in texinfo which gettext - - # Prevent GCC leaking into the runtime closure of C++ packages - # through headers using `__FILE__`. - sanitiseHeaderPathsHook ] ++ optionals (perl != null) [ perl ] ++ optionals (with stdenv.targetPlatform; isVc4 || isRedox || isSnapshot && flex != null) [ flex ] diff --git a/pkgs/development/compilers/gcc/common/meta.nix b/pkgs/development/compilers/gcc/common/meta.nix index 716b6e875f24a..c69f9956ddfc1 100644 --- a/pkgs/development/compilers/gcc/common/meta.nix +++ b/pkgs/development/compilers/gcc/common/meta.nix @@ -1,4 +1,8 @@ -{ lib, version }: +{ + lib, + version, + targetPrefix, +}: let inherit (lib) @@ -24,5 +28,6 @@ in platforms = platforms.unix; teams = [ teams.gcc ]; + mainProgram = "${targetPrefix}gcc"; } diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index 1550dd43f913a..3e78d7946b5d8 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -48,7 +48,6 @@ !enablePlugin || (stdenv.targetPlatform.isAvr && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64), nukeReferences, - sanitiseHeaderPathsHook, callPackage, majorMinorVersion, apple-sdk, @@ -109,6 +108,10 @@ let !lib.systems.equals targetPlatform hostPlatform ) "${targetPlatform.config}${stageNameAddon}-"; + targetPrefix = lib.optionalString ( + !lib.systems.equals stdenv.targetPlatform stdenv.hostPlatform + ) "${stdenv.targetPlatform.config}-"; + callFile = callPackageWith { # lets inherit @@ -169,7 +172,6 @@ let pkgsBuildTarget profiledCompiler reproducibleBuild - sanitiseHeaderPathsHook staticCompiler stdenv targetPackages @@ -322,7 +324,7 @@ pipe "target" ]; - configureFlags = callFile ./common/configure-flags.nix { }; + configureFlags = callFile ./common/configure-flags.nix { inherit targetPrefix; }; inherit targetConfig; @@ -409,13 +411,14 @@ pipe inherit enableShared enableMultilib; meta = { - inherit (callFile ./common/meta.nix { }) + inherit (callFile ./common/meta.nix { inherit targetPrefix; }) homepage license description longDescription platforms teams + mainProgram ; }; } diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index 9e6f94b121dce..1b52cd4903dac 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -66,6 +66,10 @@ in # Do not try looking for binaries and libraries in /lib and /usr/lib ./13/no-sys-dirs-riscv.patch # Mangle the nix store hash in __FILE__ to prevent unneeded runtime references + # + # TODO: Remove these and the `useMacroPrefixMap` conditional + # in `cc-wrapper` once + # is fixed. ./13/mangle-NIX_STORE-in-__FILE__.patch ]; "14" = [ diff --git a/pkgs/development/compilers/ghc/8.10.7-binary.nix b/pkgs/development/compilers/ghc/8.10.7-binary.nix index 72beccc6ee3b2..78eb0941ac72d 100644 --- a/pkgs/development/compilers/ghc/8.10.7-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.7-binary.nix @@ -308,7 +308,7 @@ stdenv.mkDerivation { for exe in $(find . -type f -executable); do isScript $exe && continue ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib - install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe + install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe '' + lib.optionalString stdenv.hostPlatform.isAarch64 '' # Resign the binary and set the linker-signed flag. Ignore failures when the file is an object file. @@ -464,7 +464,7 @@ stdenv.mkDerivation { for exe in $(find "$out" -type f -executable); do isScript $exe && continue ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib - install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe + install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe done for file in $(find "$out" -name setup-config); do diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix index 7dc6c0a626888..57836ad5f3c23 100644 --- a/pkgs/development/compilers/ghc/8.10.7.nix +++ b/pkgs/development/compilers/ghc/8.10.7.nix @@ -69,6 +69,10 @@ in || (stdenv.hostPlatform != stdenv.targetPlatform) ), + # Enable NUMA support in RTS + enableNuma ? lib.meta.availableOn stdenv.targetPlatform numactl, + numactl, + # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) ( @@ -265,7 +269,7 @@ let basePackageSet = if hostPlatform != targetPlatform then targetPackages else pkgsHostTarget; in { - inherit (basePackageSet) gmp ncurses; + inherit (basePackageSet) gmp ncurses numactl; # dynamic inherits are not possible in Nix libffi = basePackageSet.${libffi_name}; }; @@ -363,6 +367,12 @@ stdenv.mkDerivation ( sha256 = "1rmv3132xhxbka97v0rx7r6larx5f5nnvs4mgm9q3rmgpjyd1vf9"; includes = [ "libraries/ghci/ghci.cabal.in" ]; }) + + # Correctly record libnuma's library and include directories in the + # package db. This fixes linking whenever stdenv and propagation won't + # quite pass the correct -L flags to the linker, e.g. when using GHC + # outside of stdenv/nixpkgs or build->build compilation in pkgsStatic. + ./ghc-8.10-9.2-rts-package-db-libnuma-dirs.patch ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Make Block.h compile with c++ compilers. Remove with the next release @@ -511,6 +521,11 @@ stdenv.mkDerivation ( ++ lib.optionals (disableLargeAddressSpace) [ "--disable-large-address-space" ] + ++ lib.optionals enableNuma [ + "--enable-numa" + "--with-libnuma-includes=${lib.getDev targetLibs.numactl}/include" + "--with-libnuma-libraries=${lib.getLib targetLibs.numactl}/lib" + ] ++ lib.optionals enableUnregisterised [ "--enable-unregisterised" ]; @@ -562,8 +577,13 @@ stdenv.mkDerivation ( buildInputs = [ bash ] ++ (libDeps hostPlatform); - depsTargetTarget = map lib.getDev (libDeps targetPlatform); - depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); + # stage1 GHC doesn't need to link against libnuma, so it's target specific + depsTargetTarget = map lib.getDev ( + libDeps targetPlatform ++ lib.optionals enableNuma [ targetLibs.numactl ] + ); + depsTargetTargetPropagated = map (lib.getOutput "out") ( + libDeps targetPlatform ++ lib.optionals enableNuma [ targetLibs.numactl ] + ); # required, because otherwise all symbols from HSffi.o are stripped, and # that in turn causes GHCi to abort diff --git a/pkgs/development/compilers/ghc/8.6.5-binary.nix b/pkgs/development/compilers/ghc/8.6.5-binary.nix index 7837142b9a54a..7c15730205b2f 100644 --- a/pkgs/development/compilers/ghc/8.6.5-binary.nix +++ b/pkgs/development/compilers/ghc/8.6.5-binary.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { for exe in $(find . -type f -executable); do isScript $exe && continue ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib - install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe + install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe done '' + @@ -210,7 +210,7 @@ stdenv.mkDerivation rec { for exe in $(find "$out" -type f -executable); do isScript $exe && continue ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib - install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe + install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe done for file in $(find "$out" -name setup-config); do diff --git a/pkgs/development/compilers/ghc/9.0.2-binary.nix b/pkgs/development/compilers/ghc/9.0.2-binary.nix index 0e6a0b4bb6286..0b077dc8ae96a 100644 --- a/pkgs/development/compilers/ghc/9.0.2-binary.nix +++ b/pkgs/development/compilers/ghc/9.0.2-binary.nix @@ -281,7 +281,7 @@ stdenv.mkDerivation { for exe in $(find . -type f -executable); do isScript $exe && continue ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib - install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe + install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe done '' + @@ -432,7 +432,7 @@ stdenv.mkDerivation { for exe in $(find "$out" -type f -executable); do isScript $exe && continue ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib - install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe + install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe done for file in $(find "$out" -name setup-config); do diff --git a/pkgs/development/compilers/ghc/9.2.4-binary.nix b/pkgs/development/compilers/ghc/9.2.4-binary.nix index e9354461fdad9..77986b76d64b6 100644 --- a/pkgs/development/compilers/ghc/9.2.4-binary.nix +++ b/pkgs/development/compilers/ghc/9.2.4-binary.nix @@ -275,7 +275,7 @@ stdenv.mkDerivation { for exe in $(find . -type f -executable); do isScript $exe && continue ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib - install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe + install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe done '' + @@ -417,7 +417,7 @@ stdenv.mkDerivation { for exe in $(find "$out" -type f -executable); do isScript $exe && continue ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib - install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe + install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe done for file in $(find "$out" -name setup-config); do diff --git a/pkgs/development/compilers/ghc/9.6.3-binary.nix b/pkgs/development/compilers/ghc/9.6.3-binary.nix index 9128c3717e764..72367c6b3d80f 100644 --- a/pkgs/development/compilers/ghc/9.6.3-binary.nix +++ b/pkgs/development/compilers/ghc/9.6.3-binary.nix @@ -274,7 +274,7 @@ stdenv.mkDerivation { for exe in $(find . -type f -executable); do isMachO $exe || continue ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib - install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe + install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe done '' @@ -409,7 +409,7 @@ stdenv.mkDerivation { for exe in $(find "$out" -type f -executable); do isMachO $exe || continue ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib - install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe + install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe done for file in $(find "$out" -name setup-config); do diff --git a/pkgs/development/compilers/ghc/9.8.4-binary.nix b/pkgs/development/compilers/ghc/9.8.4-binary.nix index 35e26baba9567..e8e1e5e4397a9 100644 --- a/pkgs/development/compilers/ghc/9.8.4-binary.nix +++ b/pkgs/development/compilers/ghc/9.8.4-binary.nix @@ -288,7 +288,7 @@ stdenv.mkDerivation { for exe in $(find . -type f -executable); do isMachO $exe || continue ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib - install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe + install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe done '' @@ -424,7 +424,7 @@ stdenv.mkDerivation { for exe in $(find "$out" -type f -executable); do isMachO $exe || continue ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib - install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe + install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe done for file in $(find "$out" -name setup-config); do diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index f7fa6925774cc..7d652f4f81118 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -91,6 +91,10 @@ && !stdenv.hostPlatform.isStatic, elfutils, + # Enable NUMA support in RTS + enableNuma ? lib.meta.availableOn stdenv.targetPlatform numactl, + numactl, + # What flavour to build. Flavour string may contain a flavour and flavour # transformers as accepted by hadrian. ghcFlavour ? @@ -110,7 +114,7 @@ # While split sections are now enabled by default in ghc 8.8 for windows, # they seem to lead to `too many sections` errors when building base for # profiling. - ++ lib.optionals (!stdenv.targetPlatform.isWindows) [ "split_sections" ]; + ++ (if stdenv.targetPlatform.isWindows then [ "no_split_sections" ] else [ "split_sections" ]); in baseFlavour + lib.concatMapStrings (t: "+${t}") transformers, @@ -248,6 +252,14 @@ ./Cabal-3.12-paths-fix-cycle-aarch64-darwin.patch ) ] + ++ lib.optionals stdenv.targetPlatform.isWindows [ + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13919 + (fetchpatch { + name = "include-modern-utimbuf.patch"; + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/7e75928ed0f1c4654de6ddd13d0b00bf4b5c6411.patch"; + hash = "sha256-sb+AHdkGkCu8MW0xoQIpD5kEc0zYX8udAMDoC+TWc0Q="; + }) + ] # Prevents passing --hyperlinked-source to haddock. Note that this can # be configured via a user defined flavour now. Unfortunately, it is # impossible to import an existing flavour in UserSettings, so patching @@ -291,6 +303,11 @@ url = "https://gitlab.haskell.org/ghc/ghc/-/commit/39bb6e583d64738db51441a556d499aa93a4fc4a.patch"; sha256 = "0w5fx413z924bi2irsy1l4xapxxhrq158b5gn6jzrbsmhvmpirs0"; }) + ] + + # Missing ELF symbols + ++ lib.optionals stdenv.targetPlatform.isAndroid [ + ./ghc-define-undefined-elf-st-visibility.patch ]; stdenv = stdenvNoCC; @@ -329,7 +346,8 @@ assert !enableNativeBignum -> gmp != null; assert stdenv.buildPlatform == stdenv.hostPlatform || stdenv.hostPlatform == stdenv.targetPlatform; # It is currently impossible to cross-compile GHC with Hadrian. -assert stdenv.buildPlatform == stdenv.hostPlatform; +assert lib.assertMsg (stdenv.buildPlatform == stdenv.hostPlatform) + "GHC >= 9.6 can't be cross-compiled. If you meant to build a GHC cross-compiler, use `buildPackages`."; let inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -407,6 +425,8 @@ let ld = cc.bintools; "ld.gold" = cc.bintools; + windres = cc.bintools; + otool = cc.bintools.bintools; # GHC needs install_name_tool on all darwin platforms. The same one can @@ -465,6 +485,7 @@ let gmp libffi ncurses + numactl ; }; @@ -649,6 +670,11 @@ stdenv.mkDerivation ( "--with-libdw-includes=${lib.getDev targetLibs.elfutils}/include" "--with-libdw-libraries=${lib.getLib targetLibs.elfutils}/lib" ] + ++ lib.optionals enableNuma [ + "--enable-numa" + "--with-libnuma-includes=${lib.getDev targetLibs.numactl}/include" + "--with-libnuma-libraries=${lib.getLib targetLibs.numactl}/lib" + ] ++ lib.optionals targetPlatform.isDarwin [ # Darwin uses llvm-ar. GHC will try to use `-L` with `ar` when it is `llvm-ar` # but it doesn’t currently work because Cabal never uses `-L` on Darwin. See: @@ -715,8 +741,13 @@ stdenv.mkDerivation ( buildInputs = [ bash ] ++ (libDeps hostPlatform); - depsTargetTarget = map lib.getDev (libDeps targetPlatform); - depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); + # stage0:ghc (i.e. stage1) doesn't need to link against libnuma, so it's target specific + depsTargetTarget = map lib.getDev ( + libDeps targetPlatform ++ lib.optionals enableNuma [ targetLibs.numactl ] + ); + depsTargetTargetPropagated = map (lib.getOutput "out") ( + libDeps targetPlatform ++ lib.optionals enableNuma [ targetLibs.numactl ] + ); hadrianFlags = [ "--flavour=${ghcFlavour}" @@ -820,6 +851,10 @@ stdenv.mkDerivation ( "${llvmPackages.clang}/bin/${llvmPackages.clang.targetPrefix}clang" }" '' + + lib.optionalString stdenv.targetPlatform.isWindows '' + ghc-settings-edit "$settingsFile" \ + "windres command" "${toolPath "windres" installCC}" + '' + '' # Install the bash completion file. diff --git a/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/pkgs/development/compilers/ghc/common-make-native-bignum.nix index 0bd5b9b506efc..9b9d386ecdb17 100644 --- a/pkgs/development/compilers/ghc/common-make-native-bignum.nix +++ b/pkgs/development/compilers/ghc/common-make-native-bignum.nix @@ -68,6 +68,10 @@ || (stdenv.hostPlatform != stdenv.targetPlatform) ), + # Enable NUMA support in RTS + enableNuma ? lib.meta.availableOn stdenv.targetPlatform numactl, + numactl, + # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) ( @@ -261,6 +265,7 @@ let gmp libffi ncurses + numactl ; }; @@ -296,88 +301,22 @@ stdenv.mkDerivation ( stripLen = 1; extraPrefix = "libraries/unix/"; }) - ] - ++ lib.optionals (lib.versionOlder version "9.4") [ - # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; - sha256 = "sha256-8w8QUCsODaTvknCDGgTfFNZa8ZmvIKaKS+2ZJZ9foYk="; - extraPrefix = "utils/haddock/"; - stripLen = 1; - }) - ] - - ++ lib.optionals (lib.versionOlder version "9.4.6") [ - # Fix docs build with sphinx >= 6.0 - # https://gitlab.haskell.org/ghc/ghc/-/issues/22766 - (fetchpatch { - name = "ghc-docs-sphinx-6.0.patch"; - url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; - sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; - }) - ] - ++ [ # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 ./docs-sphinx-7.patch - ] - - ++ lib.optionals (lib.versionOlder version "9.2.2") [ - # Add flag that fixes C++ exception handling; opt-in. Merged in 9.4 and 9.2.2. - # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/7423 - (fetchpatch { - name = "ghc-9.0.2-fcompact-unwind.patch"; - # Note that the test suite is not packaged. - url = "https://gitlab.haskell.org/ghc/ghc/-/commit/c6132c782d974a7701e7f6447bdcd2bf6db4299a.patch?merge_request_iid=7423"; - sha256 = "sha256-b4feGZIaKDj/UKjWTNY6/jH4s2iate0wAgMxG3rAbZI="; - }) - ] - - ++ lib.optionals (lib.versionAtLeast version "9.2") [ - # Don't generate code that doesn't compile when --enable-relocatable is passed to Setup.hs - # Can be removed if the Cabal library included with ghc backports the linked fix - (fetchpatch { - url = "https://github.com/haskell/cabal/commit/6c796218c92f93c95e94d5ec2d077f6956f68e98.patch"; - stripLen = 1; - extraPrefix = "libraries/Cabal/"; - sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY="; - }) - ] - ++ lib.optionals (version == "9.4.6") [ - # Work around a type not being defined when including Rts.h in bytestring's cbits - # due to missing feature macros. See https://gitlab.haskell.org/ghc/ghc/-/issues/23810. - ./9.4.6-bytestring-posix-source.patch - ] - - ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ - # Prevent the paths module from emitting symbols that we don't use - # when building with separate outputs. - # - # These cause problems as they're not eliminated by GHC's dead code - # elimination on aarch64-darwin. (see - # https://github.com/NixOS/nixpkgs/issues/140774 for details). + # Correctly record libnuma's library and include directories in the + # package db. This fixes linking whenever stdenv and propagation won't + # quite pass the correct -L flags to the linker, e.g. when using GHC + # outside of stdenv/nixpkgs or build->build compilation in pkgsStatic. ( - if lib.versionAtLeast version "9.2" then - ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch + if lib.versionAtLeast version "9.4" then + ./ghc-9.4-rts-package-db-libnuma-dirs.patch else - ./Cabal-3.2-3.4-paths-fix-cycle-aarch64-darwin.patch + ./ghc-8.10-9.2-rts-package-db-libnuma-dirs.patch ) ] - # Fixes stack overrun in rts which crashes an process whenever - # freeHaskellFunPtr is called with nixpkgs' hardening flags. - # https://gitlab.haskell.org/ghc/ghc/-/issues/25485 - # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13599 - # TODO: patch doesn't apply for < 9.4, but may still be necessary? - ++ lib.optionals (lib.versionAtLeast version "9.4") [ - (fetchpatch { - name = "ghc-rts-adjustor-fix-i386-stack-overrun.patch"; - url = "https://gitlab.haskell.org/ghc/ghc/-/commit/39bb6e583d64738db51441a556d499aa93a4fc4a.patch"; - sha256 = "0w5fx413z924bi2irsy1l4xapxxhrq158b5gn6jzrbsmhvmpirs0"; - }) - ] - # Before GHC 9.6, GHC, when used to compile C sources (i.e. to drive the CC), would first # invoke the C compiler to generate assembly and later call the assembler on the result of # that operation. Unfortunately, that is brittle in a lot of cases, e.g. when using mismatched @@ -414,7 +353,83 @@ stdenv.mkDerivation ( [ # TODO(@sternenseemann): backport changes to GHC < 9.4 if possible ] - ); + ) + + ++ lib.optionals (lib.versionAtLeast version "9.2") [ + # Don't generate code that doesn't compile when --enable-relocatable is passed to Setup.hs + # Can be removed if the Cabal library included with ghc backports the linked fix + (fetchpatch { + url = "https://github.com/haskell/cabal/commit/6c796218c92f93c95e94d5ec2d077f6956f68e98.patch"; + stripLen = 1; + extraPrefix = "libraries/Cabal/"; + sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY="; + }) + ] + + ++ lib.optionals (lib.versionOlder version "9.2.2") [ + # Add flag that fixes C++ exception handling; opt-in. Merged in 9.4 and 9.2.2. + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/7423 + (fetchpatch { + name = "ghc-9.0.2-fcompact-unwind.patch"; + # Note that the test suite is not packaged. + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/c6132c782d974a7701e7f6447bdcd2bf6db4299a.patch?merge_request_iid=7423"; + sha256 = "sha256-b4feGZIaKDj/UKjWTNY6/jH4s2iate0wAgMxG3rAbZI="; + }) + ] + + # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 + ++ lib.optionals (lib.versionOlder version "9.4") [ + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; + sha256 = "sha256-8w8QUCsODaTvknCDGgTfFNZa8ZmvIKaKS+2ZJZ9foYk="; + extraPrefix = "utils/haddock/"; + stripLen = 1; + }) + ] + + # Fixes stack overrun in rts which crashes an process whenever + # freeHaskellFunPtr is called with nixpkgs' hardening flags. + # https://gitlab.haskell.org/ghc/ghc/-/issues/25485 + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13599 + # TODO: patch doesn't apply for < 9.4, but may still be necessary? + ++ lib.optionals (lib.versionAtLeast version "9.4") [ + (fetchpatch { + name = "ghc-rts-adjustor-fix-i386-stack-overrun.patch"; + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/39bb6e583d64738db51441a556d499aa93a4fc4a.patch"; + sha256 = "0w5fx413z924bi2irsy1l4xapxxhrq158b5gn6jzrbsmhvmpirs0"; + }) + ] + + ++ lib.optionals (lib.versionOlder version "9.4.6") [ + # Fix docs build with sphinx >= 6.0 + # https://gitlab.haskell.org/ghc/ghc/-/issues/22766 + (fetchpatch { + name = "ghc-docs-sphinx-6.0.patch"; + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; + sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; + }) + ] + + ++ lib.optionals (version == "9.4.6") [ + # Work around a type not being defined when including Rts.h in bytestring's cbits + # due to missing feature macros. See https://gitlab.haskell.org/ghc/ghc/-/issues/23810. + ./9.4.6-bytestring-posix-source.patch + ] + + ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ + # Prevent the paths module from emitting symbols that we don't use + # when building with separate outputs. + # + # These cause problems as they're not eliminated by GHC's dead code + # elimination on aarch64-darwin. (see + # https://github.com/NixOS/nixpkgs/issues/140774 for details). + ( + if lib.versionAtLeast version "9.2" then + ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch + else + ./Cabal-3.2-3.4-paths-fix-cycle-aarch64-darwin.patch + ) + ]; postPatch = "patchShebangs ."; @@ -563,6 +578,11 @@ stdenv.mkDerivation ( ++ lib.optionals (disableLargeAddressSpace) [ "--disable-large-address-space" ] + ++ lib.optionals enableNuma [ + "--enable-numa" + "--with-libnuma-includes=${lib.getDev targetLibs.numactl}/include" + "--with-libnuma-libraries=${lib.getLib targetLibs.numactl}/lib" + ] ++ lib.optionals enableUnregisterised [ "--enable-unregisterised" ]; @@ -618,8 +638,13 @@ stdenv.mkDerivation ( buildInputs = [ bash ] ++ (libDeps hostPlatform); - depsTargetTarget = map lib.getDev (libDeps targetPlatform); - depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); + # stage1 GHC doesn't need to link against libnuma, so it's target specific + depsTargetTarget = map lib.getDev ( + libDeps targetPlatform ++ lib.optionals enableNuma [ targetLibs.numactl ] + ); + depsTargetTargetPropagated = map (lib.getOutput "out") ( + libDeps targetPlatform ++ lib.optionals enableNuma [ targetLibs.numactl ] + ); # required, because otherwise all symbols from HSffi.o are stripped, and # that in turn causes GHCi to abort diff --git a/pkgs/development/compilers/ghc/ghc-8.10-9.2-rts-package-db-libnuma-dirs.patch b/pkgs/development/compilers/ghc/ghc-8.10-9.2-rts-package-db-libnuma-dirs.patch new file mode 100644 index 0000000000000..698c111e6721e --- /dev/null +++ b/pkgs/development/compilers/ghc/ghc-8.10-9.2-rts-package-db-libnuma-dirs.patch @@ -0,0 +1,100 @@ +From 3d17e6fa39fb18d4300fbf2a0c4b9ddb4adf746b Mon Sep 17 00:00:00 2001 +From: sterni +Date: Thu, 17 Jul 2025 21:21:29 +0200 +Subject: [PATCH] rts: record libnuma include and lib dirs in package conf +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The --with-libnuma-libraries and --with-libnuma-includes flags were +originally introduced for hadrian in def486c90ef6f37d81d0d9c6df7544 +and curiously never supported by the make build system — even though +the addition was made in the 9.0 series and even backported to the +8.10 series. + +While the make build system knows when to link against libnuma, it won't +enforce its specific directories by adding them to rts.conf in the +package db. This commit implements this retroactively for the make build +system, modeled after how make does the same sort of thing for Libdw. +The Libdw logic also affects the bindist configure file in +distrib/configure.ac which isn't replicate since we don't need it. +--- + mk/config.mk.in | 4 ++++ + rts/ghc.mk | 8 ++++++++ + rts/package.conf.in | 5 +++-- + rts/rts.cabal.in | 1 + + 4 files changed, 16 insertions(+), 2 deletions(-) + +diff --git a/mk/config.mk.in b/mk/config.mk.in +index 35f6e2d087..d2b1329eb5 100644 +--- a/mk/config.mk.in ++++ b/mk/config.mk.in +@@ -333,6 +333,10 @@ LibdwIncludeDir=@LibdwIncludeDir@ + # rts/Libdw.c:set_initial_registers() + GhcRtsWithLibdw=$(strip $(if $(filter $(TargetArch_CPP),i386 x86_64 s390x),@UseLibdw@,NO)) + ++UseLibNuma=@UseLibNuma@ ++LibNumaLibDir=@LibNumaLibDir@ ++LibNumaIncludeDir=@LibNumaIncludeDir@ ++ + ################################################################################ + # + # Paths (see paths.mk) +diff --git a/rts/ghc.mk b/rts/ghc.mk +index 9c535def5a..7782c4b768 100644 +--- a/rts/ghc.mk ++++ b/rts/ghc.mk +@@ -576,6 +576,14 @@ rts_PACKAGE_CPP_OPTS += -DLIBDW_INCLUDE_DIR= + rts_PACKAGE_CPP_OPTS += -DLIBDW_LIB_DIR= + endif + ++ifeq "$(UseLibNuma)" "YES" ++rts_PACKAGE_CPP_OPTS += -DLIBNUMA_INCLUDE_DIR=$(LibNumaIncludeDir) ++rts_PACKAGE_CPP_OPTS += -DLIBNUMA_LIB_DIR=$(LibNumaLibDir) ++else ++rts_PACKAGE_CPP_OPTS += -DLIBNUMA_INCLUDE_DIR= ++rts_PACKAGE_CPP_OPTS += -DLIBNUMA_LIB_DIR= ++endif ++ + # ----------------------------------------------------------------------------- + # dependencies + +diff --git a/rts/package.conf.in b/rts/package.conf.in +index 9bdbf3659a..46f728b09a 100644 +--- a/rts/package.conf.in ++++ b/rts/package.conf.in +@@ -18,9 +18,9 @@ hidden-modules: + import-dirs: + + #if defined(INSTALLING) +-library-dirs: LIB_DIR"/rts" FFI_LIB_DIR LIBDW_LIB_DIR ++library-dirs: LIB_DIR"/rts" FFI_LIB_DIR LIBDW_LIB_DIR LIBNUMA_LIB_DIR + #else /* !INSTALLING */ +-library-dirs: TOP"/rts/dist/build" FFI_LIB_DIR LIBDW_LIB_DIR ++library-dirs: TOP"/rts/dist/build" FFI_LIB_DIR LIBDW_LIB_DIR LIBNUMA_LIB_DIR + #endif + + hs-libraries: "HSrts" FFI_LIB +@@ -76,6 +76,7 @@ include-dirs: TOP"/rts/dist/build" + FFI_INCLUDE_DIR + LIBDW_INCLUDE_DIR + TOP"/includes/dist-install/build" ++ LIBNUMA_INCLUDE_DIR + #endif + + includes: Stg.h +diff --git a/rts/rts.cabal.in b/rts/rts.cabal.in +index 0a06414d95..f71fb079ec 100644 +--- a/rts/rts.cabal.in ++++ b/rts/rts.cabal.in +@@ -150,6 +150,7 @@ library + include-dirs: build ../includes includes + includes/dist-derivedconstants/header @FFIIncludeDir@ + @LibdwIncludeDir@ ++ @LibNumaIncludeDir@ + includes: Stg.h + install-includes: Cmm.h HsFFI.h MachDeps.h Rts.h RtsAPI.h Stg.h + ghcautoconf.h ghcconfig.h ghcplatform.h ghcversion.h +-- +2.50.0 + diff --git a/pkgs/development/compilers/ghc/ghc-9.4-rts-package-db-libnuma-dirs.patch b/pkgs/development/compilers/ghc/ghc-9.4-rts-package-db-libnuma-dirs.patch new file mode 100644 index 0000000000000..6607ec02f3f70 --- /dev/null +++ b/pkgs/development/compilers/ghc/ghc-9.4-rts-package-db-libnuma-dirs.patch @@ -0,0 +1,100 @@ +From a0b547f41939304adfc0c430314c342dd69306ae Mon Sep 17 00:00:00 2001 +From: sterni +Date: Thu, 17 Jul 2025 21:21:29 +0200 +Subject: [PATCH] rts: record libnuma include and lib dirs in package conf +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The --with-libnuma-libraries and --with-libnuma-includes flags were +originally introduced for hadrian in def486c90ef6f37d81d0d9c6df7544 +and curiously never supported by the make build system — even though +the addition was made in the 9.0 series and even backported to the +8.10 series. + +While the make build system knows when to link against libnuma, it won't +enforce its specific directories by adding them to rts.conf in the +package db. This commit implements this retroactively for the make build +system, modeled after how make does the same sort of thing for Libdw. +The Libdw logic also affects the bindist configure file in +distrib/configure.ac which isn't replicate since we don't need it. +--- + mk/config.mk.in | 4 ++++ + rts/ghc.mk | 8 ++++++++ + rts/package.conf.in | 5 +++-- + rts/rts.cabal.in | 1 + + 4 files changed, 16 insertions(+), 2 deletions(-) + +diff --git a/mk/config.mk.in b/mk/config.mk.in +index 2ff2bea9b6..d95f927dbd 100644 +--- a/mk/config.mk.in ++++ b/mk/config.mk.in +@@ -324,6 +324,10 @@ LibdwIncludeDir=@LibdwIncludeDir@ + # rts/Libdw.c:set_initial_registers() + GhcRtsWithLibdw=$(strip $(if $(filter $(TargetArch_CPP),i386 x86_64 s390x),@UseLibdw@,NO)) + ++UseLibNuma=@UseLibNuma@ ++LibNumaLibDir=@LibNumaLibDir@ ++LibNumaIncludeDir=@LibNumaIncludeDir@ ++ + ################################################################################ + # + # Paths (see paths.mk) +diff --git a/rts/ghc.mk b/rts/ghc.mk +index 36a82f9f2c..854bb8e013 100644 +--- a/rts/ghc.mk ++++ b/rts/ghc.mk +@@ -573,6 +573,14 @@ rts_PACKAGE_CPP_OPTS += -DLIBDW_INCLUDE_DIR= + rts_PACKAGE_CPP_OPTS += -DLIBDW_LIB_DIR= + endif + ++ifeq "$(UseLibNuma)" "YES" ++rts_PACKAGE_CPP_OPTS += -DLIBNUMA_INCLUDE_DIR=$(LibNumaIncludeDir) ++rts_PACKAGE_CPP_OPTS += -DLIBNUMA_LIB_DIR=$(LibNumaLibDir) ++else ++rts_PACKAGE_CPP_OPTS += -DLIBNUMA_INCLUDE_DIR= ++rts_PACKAGE_CPP_OPTS += -DLIBNUMA_LIB_DIR= ++endif ++ + # ----------------------------------------------------------------------------- + # dependencies + +diff --git a/rts/package.conf.in b/rts/package.conf.in +index cb5a436f5c..9e5ae48adb 100644 +--- a/rts/package.conf.in ++++ b/rts/package.conf.in +@@ -18,9 +18,9 @@ hidden-modules: + import-dirs: + + #if defined(INSTALLING) +-library-dirs: LIB_DIR FFI_LIB_DIR LIBDW_LIB_DIR ++library-dirs: LIB_DIR FFI_LIB_DIR LIBDW_LIB_DIR LIBNUMA_LIB_DIR + #else /* !INSTALLING */ +-library-dirs: TOP"/rts/dist-install/build" FFI_LIB_DIR LIBDW_LIB_DIR ++library-dirs: TOP"/rts/dist-install/build" FFI_LIB_DIR LIBDW_LIB_DIR LIBNUMA_LIB_DIR + #endif + + hs-libraries: "HSrts" FFI_LIB +@@ -74,6 +74,7 @@ include-dirs: TOP"/rts/include" + TOP"/rts/dist-install/build/include" + FFI_INCLUDE_DIR + LIBDW_INCLUDE_DIR ++ LIBNUMA_INCLUDE_DIR + #endif + + includes: Rts.h +diff --git a/rts/rts.cabal.in b/rts/rts.cabal.in +index a8882268ac..debf2ba0a0 100644 +--- a/rts/rts.cabal.in ++++ b/rts/rts.cabal.in +@@ -154,6 +154,7 @@ library + include-dirs: include + @FFIIncludeDir@ + @LibdwIncludeDir@ ++ @LibNumaIncludeDir@ + includes: Rts.h + install-includes: Cmm.h HsFFI.h MachDeps.h Rts.h RtsAPI.h Stg.h + ghcautoconf.h ghcconfig.h ghcplatform.h ghcversion.h +-- +2.50.0 + diff --git a/pkgs/development/compilers/ghc/ghc-define-undefined-elf-st-visibility.patch b/pkgs/development/compilers/ghc/ghc-define-undefined-elf-st-visibility.patch new file mode 100644 index 0000000000000..bd3b3ea60485d --- /dev/null +++ b/pkgs/development/compilers/ghc/ghc-define-undefined-elf-st-visibility.patch @@ -0,0 +1,24 @@ +diff --git a/rts/linker/ElfTypes.h b/rts/linker/ElfTypes.h +index f5e2f819d9..7f75087738 100644 +--- a/rts/linker/ElfTypes.h ++++ b/rts/linker/ElfTypes.h +@@ -33,6 +33,9 @@ + #define Elf_Sym Elf64_Sym + #define Elf_Rel Elf64_Rel + #define Elf_Rela Elf64_Rela ++#if !defined(ELF64_ST_VISIBILITY) ++#define ELF64_ST_VISIBILITY(o) ((o)&0x3) ++#endif + #if !defined(ELF_ST_VISIBILITY) + #define ELF_ST_VISIBILITY ELF64_ST_VISIBILITY + #endif +@@ -60,6 +63,9 @@ + #define Elf_Sym Elf32_Sym + #define Elf_Rel Elf32_Rel + #define Elf_Rela Elf32_Rela ++#if !defined(ELF32_ST_VISIBILITY) ++#define ELF32_ST_VISIBILITY(o) ((o)&0x3) ++#endif + #if !defined(ELF_ST_VISIBILITY) + #define ELF_ST_VISIBILITY ELF32_ST_VISIBILITY + #endif /* ELF_ST_VISIBILITY */ diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix index a3fc7aea6e48c..aed38dafb9d1e 100644 --- a/pkgs/development/compilers/go/1.24.nix +++ b/pkgs/development/compilers/go/1.24.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.24.5"; + version = "1.24.6"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-dP2wnyNS4rJbeUPlaDbJtHNj0o3sHItWxKlXDzC49Z8="; + hash = "sha256-4ctVgqq1iGaLwEwH3hhogHD2uMmyqvNh+CHhm9R8/b0="; }; strictDeps = true; diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index 5d8506627aa7a..928ec4fab8bb2 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -296,7 +296,7 @@ stdenv.mkDerivation ( # Just like the `llvm-lit-cfg` patch, but for `polly`. (getVersionFile "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch") ++ - lib.optional (lib.versions.major release_version == "20" && stdenv.hostPlatform.isRiscV) + lib.optional (lib.versions.major release_version == "20") # Test failure on riscv64, fixed in llvm 21 # https://github.com/llvm/llvm-project/issues/150818 ( diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 4ab4a1e1ab66a..d20085c940143 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -30,7 +30,7 @@ let "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag="; "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I="; - "20.1.6".officialRelease.sha256 = "sha256-PfCzECiCM+k0hHqEUSr1TSpnII5nqIxg+Z8ICjmMj0Y="; + "20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw="; "21.1.0-rc3".officialRelease.sha256 = "sha256-quZuqDIm8OrkDJqu7vJKUP8MF1xCuQNFwW9SnKMFoS8="; "22.0.0-git".gitRelease = { rev = "97d5d483ecc67d0b786a53d065b7202908cb4047"; @@ -86,4 +86,4 @@ let llvmPackages = lib.mapAttrs' (version: args: mkPackage (args // { inherit version; })) versions; in -llvmPackages // { inherit mkPackage versions; } +llvmPackages // { inherit mkPackage; } diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix index ef3a32eff46f2..3588d94e690d9 100644 --- a/pkgs/development/compilers/openjdk/generic.nix +++ b/pkgs/development/compilers/openjdk/generic.nix @@ -8,6 +8,7 @@ fetchpatch, buildPackages, + autoPatchelfHook, pkg-config, autoconf, lndir, @@ -45,7 +46,6 @@ versionCheckHook, - bash, liberation_ttf, cacert, @@ -242,7 +242,13 @@ stdenv.mkDerivation (finalAttrs: { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ + autoPatchelfHook pkg-config + unzip + zip + which + # Probably for BUILD_CC but not sure, not in closure. + zlib ] ++ lib.optionals atLeast11 [ autoconf @@ -256,13 +262,6 @@ stdenv.mkDerivation (finalAttrs: { # Certificates generated using keytool in `installPhase` buildPackages.jdk8 ] - ++ [ - unzip - zip - which - # Probably for BUILD_CC but not sure, not in closure. - zlib - ] ++ lib.optionals atLeast21 [ ensureNewerSourcesForZipFilesHook ] @@ -277,49 +276,35 @@ stdenv.mkDerivation (finalAttrs: { file cups freetype - ] - ++ lib.optionals (atLeast11 && !atLeast21) [ - harfbuzz - ] - ++ [ alsa-lib libjpeg giflib - ] - ++ lib.optionals atLeast11 [ - libpng - zlib # duplicate - lcms2 - ] - ++ [ libX11 libICE - ] - ++ lib.optionals (!atLeast11) [ libXext - ] - ++ [ libXrender - ] - ++ lib.optionals atLeast11 [ - libXext - ] - ++ [ libXtst libXt - libXtst # duplicate libXi libXinerama libXcursor libXrandr fontconfig ] + ++ lib.optionals (atLeast11 && !atLeast21) [ + harfbuzz + ] + ++ lib.optionals atLeast11 [ + libpng + zlib # duplicate + lcms2 + ] ++ lib.optionals (!headless && enableGtk) [ (if atLeast11 then gtk3 else gtk2) glib ]; - propagatedBuildInputs = lib.optionals (!atLeast11) [ setJavaClassPath ]; + propagatedBuildInputs = [ setJavaClassPath ]; nativeInstallCheckInputs = lib.optionals atLeast23 [ versionCheckHook @@ -328,14 +313,13 @@ stdenv.mkDerivation (finalAttrs: { # JDK's build system attempts to specifically detect # and special-case WSL, and we don't want it to do that, # so pass the correct platform names explicitly - ${if atLeast17 then "configurePlatforms" else null} = [ + configurePlatforms = lib.optionals atLeast17 [ "build" "host" ]; # https://openjdk.org/groups/build/doc/building.html configureFlags = [ - "--with-boot-jdk=${jdk-bootstrap'.home}" # https://github.com/openjdk/jdk/blob/471f112bca715d04304cbe35c6ed63df8c7b7fee/make/autoconf/util_paths.m4#L315 # Ignoring value of READELF from the environment. Use command line variables instead. "READELF=${stdenv.cc.targetPrefix}readelf" @@ -344,6 +328,12 @@ stdenv.mkDerivation (finalAttrs: { "NM=${stdenv.cc.targetPrefix}nm" "OBJDUMP=${stdenv.cc.targetPrefix}objdump" "OBJCOPY=${stdenv.cc.targetPrefix}objcopy" + "--with-boot-jdk=${jdk-bootstrap'.home}" + "--enable-unlimited-crypto" + "--with-native-debug-symbols=internal" + "--with-stdc++lib=dynamic" + "--with-zlib=system" + "--with-giflib=system" ] ++ ( if atLeast23 then @@ -366,10 +356,6 @@ stdenv.mkDerivation (finalAttrs: { "--with-milestone=fcs" ] ) - ++ [ - "--enable-unlimited-crypto" - "--with-native-debug-symbols=internal" - ] ++ lib.optionals (!atLeast21) ( if atLeast11 then [ @@ -381,23 +367,10 @@ stdenv.mkDerivation (finalAttrs: { "--disable-freetype-bundling" ] ) - ++ ( - if atLeast11 then - [ - "--with-libjpeg=system" - "--with-giflib=system" - "--with-libpng=system" - "--with-zlib=system" - "--with-lcms=system" - ] - else - [ - "--with-zlib=system" - "--with-giflib=system" - ] - ) - ++ [ - "--with-stdc++lib=dynamic" + ++ lib.optionals atLeast11 [ + "--with-libjpeg=system" + "--with-libpng=system" + "--with-lcms=system" ] ++ lib.optionals (featureVersion == "11") [ "--disable-warnings-as-errors" @@ -422,8 +395,8 @@ stdenv.mkDerivation (finalAttrs: { buildFlags = if atLeast17 then [ "images" ] else [ "all" ]; - separateDebugInfo = atLeast11; - __structuredAttrs = atLeast11; + separateDebugInfo = true; + __structuredAttrs = true; # -j flag is explicitly rejected by the build system: # Error: 'make -jN' is not supported, use 'make JOBS=N' @@ -431,6 +404,12 @@ stdenv.mkDerivation (finalAttrs: { # still runs in parallel. enableParallelBuilding = false; + preConfigure = + # Set number of jobs to use when building. + '' + configureFlags+=("--with-jobs=''${NIX_BUILD_CORES}") + ''; + env = { NIX_CFLAGS_COMPILE = if atLeast17 then @@ -481,13 +460,14 @@ stdenv.mkDerivation (finalAttrs: { DISABLE_HOTSPOT_OS_VERSION_CHECK = "ok"; }; - ${if atLeast23 then "versionCheckProgram" else null} = "${placeholder "out"}/bin/java"; + versionCheckProgram = lib.optionalString atLeast23 "${placeholder "out"}/bin/java"; - ${if !atLeast11 then "doCheck" else null} = false; # fails with "No rule to make target 'y'." + # Fails with "No rule to make target 'y'." + doCheck = false; doInstallCheck = atLeast23; - ${if atLeast17 then "postPatch" else null} = '' + postPatch = '' chmod +x configure patchShebangs --build configure '' @@ -496,43 +476,38 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs --build make/scripts ''; - ${if !atLeast17 then "preConfigure" else null} = '' - chmod +x configure - substituteInPlace configure --replace /bin/bash "${bash}/bin/bash" - '' - + lib.optionalString (!atLeast11) '' - substituteInPlace hotspot/make/linux/adlc_updater --replace /bin/sh "${stdenv.shell}" - substituteInPlace hotspot/make/linux/makefiles/dtrace.make --replace /usr/include/sys/sdt.h "/no-such-path" - ''; - installPhase = '' mkdir -p $out/lib - mv build/*/images/${if atLeast11 then "jdk" else "j2sdk-image"} $out/lib/openjdk - - # Remove some broken manpages. + '' + # Remove some broken manpages. + + '' rm -rf $out/lib/openjdk/man/ja* - - # Mirror some stuff in top-level. + '' + # Mirror some stuff in top-level. + + '' mkdir -p $out/share + ln -s $out/lib/openjdk/bin $out/bin ln -s $out/lib/openjdk/include $out/include ln -s $out/lib/openjdk/man $out/share/man '' - + lib.optionalString atLeast17 '' - - # IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081) - '' + # IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081) + lib.optionalString atLeast11 '' ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip '' + # jni.h expects jni_md.h to be in the header search path. + '' - - # jni.h expects jni_md.h to be in the header search path. ln -s $out/include/linux/*_md.h $out/include/ - - # Remove crap from the installation. - rm -rf $out/lib/openjdk/demo${lib.optionalString (!atLeast11) " $out/lib/openjdk/sample"} - ${lib.optionalString headless ( + '' + # Remove crap from the installation. + + ( + '' + rm -rf $out/lib/openjdk/demo + '' + + lib.optionalString (!atLeast11) '' + rm -rf $out/lib/openjdk/sample + '' + + lib.optionalString headless ( if atLeast11 then '' rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so @@ -543,37 +518,41 @@ stdenv.mkDerivation (finalAttrs: { rm $out/lib/openjdk/jre/bin/policytool rm $out/lib/openjdk/bin/{policytool,appletviewer} '' - )} - '' - + lib.optionalString (!atLeast11) '' - + ) + ) + + lib.optionalString (!atLeast11) ( # Move the JRE to a separate output - mkdir -p $jre/lib/openjdk - mv $out/lib/openjdk/jre $jre/lib/openjdk/jre - mkdir $out/lib/openjdk/jre - lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre - + '' + mkdir -p $jre/lib/openjdk + mv $out/lib/openjdk/jre $jre/lib/openjdk/jre + mkdir $out/lib/openjdk/jre + lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre + + ln -s $jre/lib/openjdk/jre $out/jre + ln -s $jre/lib/openjdk/jre/bin $jre/bin + '' # Make sure cmm/*.pf are not symlinks: # https://youtrack.jetbrains.com/issue/IDEA-147272 - rm -rf $out/lib/openjdk/jre/lib/cmm - ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm - + + '' + rm -rf $out/lib/openjdk/jre/lib/cmm + ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm + '' # Setup fallback fonts - ${lib.optionalString (!headless) '' + + lib.optionalString (!headless) '' mkdir -p $jre/lib/openjdk/jre/lib/fonts ln -s ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback - ''} - + '' # Remove duplicate binaries. - for i in $(cd $out/lib/openjdk/bin && echo *); do - if [ "$i" = java ]; then continue; fi - if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then - ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i - fi - done - + + '' + for i in $(ls $out/lib/openjdk/bin); do + if [ "$i" = java ]; then continue; fi + if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then + ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i + fi + done + '' # Generate certificates. - ( + + '' cd $jre/lib/openjdk/jre/lib/security rm cacerts perl ${./8/generate-cacerts.pl} ${ @@ -582,73 +561,41 @@ stdenv.mkDerivation (finalAttrs: { else "keytool" } ${cacert}/etc/ssl/certs/ca-bundle.crt - ) - '' - + '' - - ln -s $out/lib/openjdk/bin $out/bin - '' - + lib.optionalString (!atLeast11) '' - ln -s $jre/lib/openjdk/jre/bin $jre/bin - ln -s $jre/lib/openjdk/jre $out/jre - ''; + '' + ); preFixup = - ( - if atLeast11 then - '' - # Propagate the setJavaClassPath setup hook so that any package - # that depends on the JDK has $CLASSPATH set up properly. - mkdir -p $out/nix-support - #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 - echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs - '' - else - '' - # Propagate the setJavaClassPath setup hook from the JRE so that - # any package that depends on the JRE has $CLASSPATH set up - # properly. - mkdir -p $jre/nix-support - printWords ${setJavaClassPath} > $jre/nix-support/propagated-build-inputs - '' - ) - + '' - - # Set JAVA_HOME automatically. + # Set JAVA_HOME automatically. + '' mkdir -p $out/nix-support cat < $out/nix-support/setup-hook if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi EOF + '' + # Propagate the setJavaClassPath setup hook from the JRE so that + # any package that depends on the JRE has $CLASSPATH set up + # properly. + + lib.optionalString (!atLeast11) '' + mkdir -p $jre/nix-support + printWords "${setJavaClassPath}" > $jre/nix-support/propagated-build-inputs ''; + # If binaries in the jre output have RPATH dependencies on libraries from the out output, Nix will + # detect a cyclic reference and abort the build. + # To fix that, we need to patch the binaries from each output in separate auto-patchelf executions. + dontAutoPatchelf = true; postFixup = '' - # Build the set of output library directories to rpath against - LIBDIRS="" - for output in $(getAllOutputNames); do - if [ "$output" = debug ]; then continue; fi - LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | ${ - if atLeast17 then "sort -u" else "sort | uniq" - } | tr '\n' ':'):$LIBDIRS" - done - # Add the local library paths to remove dependencies on the bootstrap - for output in $(getAllOutputNames); do - if [ "$output" = debug ]; then continue; fi - OUTPUTDIR=$(eval echo \$$output) - BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) - echo "$BINLIBS" | while read i; do - patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true - patchelf --shrink-rpath "$i" || true - done - done + autoPatchelf -- $out + '' + + lib.optionalString (!atLeast11) '' + autoPatchelf -- $jre ''; - # TODO: The OpenJDK 8 derivation got this wrong. - disallowedReferences = [ - (if atLeast11 then jdk-bootstrap' else jdk-bootstrap) - ]; + disallowedReferences = [ jdk-bootstrap' ]; passthru = { home = "${finalAttrs.finalPackage}/lib/openjdk"; + # Shouldn't this be `jdk-bootstrap = jdk-bootstrap'`? inherit jdk-bootstrap; inherit (source) updateScript; } diff --git a/pkgs/development/compilers/rust/1_88.nix b/pkgs/development/compilers/rust/1_89.nix similarity index 67% rename from pkgs/development/compilers/rust/1_88.nix rename to pkgs/development/compilers/rust/1_89.nix index fef90efe0927b..d9acb3b17096a 100644 --- a/pkgs/development/compilers/rust/1_88.nix +++ b/pkgs/development/compilers/rust/1_89.nix @@ -44,8 +44,8 @@ let in import ./default.nix { - rustcVersion = "1.88.0"; - rustcSha256 = "sha256-OpdURDSEiuPRk9HWvIPW8ky4XCYa2V+VX95H7GTPz74="; + rustcVersion = "1.89.0"; + rustcSha256 = "sha256-JXb59EDdmbAVG9KPWaoKxhAtXE8+1O+KgQyN0FBXJQ0="; llvmSharedForBuild = llvmSharedFor pkgsBuildBuild; llvmSharedForHost = llvmSharedFor pkgsBuildHost; @@ -103,29 +103,29 @@ import ./default.nix # Note: the version MUST be the same version that we are building. Upstream # ensures that each released compiler can compile itself: # https://github.com/NixOS/nixpkgs/pull/351028#issuecomment-2438244363 - bootstrapVersion = "1.88.0"; + bootstrapVersion = "1.89.0"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "987738444da172dc2d8c9ab93c6178f0000ced44a3089013839e5916755c4844"; - x86_64-unknown-linux-gnu = "ad6f0cc845e7fcca17fd451bafd2c04a7bbcb543f8f3ef5bc412fd1fef99ef7b"; - x86_64-unknown-linux-musl = "8bea28e71582d1bb29031ea2783a6cf2be626fdbcec24b5bca75c85b9b3ca92d"; - arm-unknown-linux-gnueabihf = "cd269f3d53c286c0d0b0014947a4023d86698eac96b456ce746260ef21eec6af"; - armv7-unknown-linux-gnueabihf = "718b8110c8f8ea40282b4a0e2efa09c4a91472eec45739f3b37ecc03f2b53954"; - aarch64-unknown-linux-gnu = "dbc75abc31d142eacf15e60d0e51c4f291539974221d217b80786756b0ce1d6b"; - aarch64-unknown-linux-musl = "9ccb8f16656d2d4e412553ebaf13489198b915519873752dcebb886de50063c6"; - x86_64-apple-darwin = "b36b0bfac17e0a1f6cc06b9fdc4e2131ad578b4122a67792236b58650ae4c5c8"; - aarch64-apple-darwin = "dee921b9a41b1c3fbb088ad31dcca3b232de2cb89c268db75f40912eeaa474db"; - powerpc64-unknown-linux-gnu = "b56e903c6e4d661b6025d45b2675c31d513db207dbd85929c1a25473129275e3"; - powerpc64le-unknown-linux-gnu = "e1f16b2885237695f3cce7fc2f0128a938fc07462b076cb61bd2f06e5f8baf38"; - riscv64gc-unknown-linux-gnu = "6a72741671555fad7ffaceeaa32510c877438087ae71901ccf4a2b03a76c8439"; - s390x-unknown-linux-gnu = "498ec8be66b2c6d8bc77dd06e226d3cc7448bc508ebb9f6d7650db79350d0cb7"; - loongarch64-unknown-linux-gnu = "d4cb16ce9e2f04a7c44efe0abe5fc6cf2b9084f349fac042070882300719cbde"; - loongarch64-unknown-linux-musl = "b9c0c6ca12312dbf8ab80571816fc68b615628ae4fdd0f204c11b71264550b87"; - x86_64-unknown-freebsd = "961de5d723b034c1308d2b4a4d710fe006fb87bdbf914d045c01a5df87a0b332"; + i686-unknown-linux-gnu = "676ef74ce8ce3137ca66e3941b0221516e1713862053d8aa219e91b491417dd9"; + x86_64-unknown-linux-gnu = "542f517d0624cbee516627221482b166bf0ffe5fd560ec32beb778c01f5c99b6"; + x86_64-unknown-linux-musl = "35695721d53d7eb83ce0153be4c399babf5afd8597bed84f3386d9aac2b4b391"; + arm-unknown-linux-gnueabihf = "e618d08b1547c143cfbfc040023914f4a33a4fcf7addff6778d7cfccbd444c5e"; + armv7-unknown-linux-gnueabihf = "09a295d2d6821a404ca3bf5d1163b9642139105618d0583241b05b7dbf6e22dc"; + aarch64-unknown-linux-gnu = "26d6de84ac59da702aa8c2f903e3c344e3259da02e02ce92ad1c735916b29a4a"; + aarch64-unknown-linux-musl = "b5fdcad8289adf94c45727c33773a05acca994b01b333cf7a508f95fa6adc454"; + x86_64-apple-darwin = "8590528cade978ecb5249184112887489c9d77ae846539e3ef4d04214a6d8663"; + aarch64-apple-darwin = "87baeb57fb29339744ac5f99857f0077b12fa463217fc165dfd8f77412f38118"; + powerpc64-unknown-linux-gnu = "30d97f8d757c6ff171815c8af36eed85e44401a58c5e04f25b721c7776ed8337"; + powerpc64le-unknown-linux-gnu = "80db8e203357a050780fb8a2cdc027b81d5ae1634fa999c3be69cf8a2e10bbf6"; + riscv64gc-unknown-linux-gnu = "3885629641fd670e50c9e6553bdc6505457ef2163757a27dbf33fbc6351b2161"; + s390x-unknown-linux-gnu = "696dad74886467a5092ee8bd2265aaab85039fc563803166966c7cae389e2ef7"; + loongarch64-unknown-linux-gnu = "171696c45e4a91ccf17a239f00d5a3a8bbd40125d7a274506e1630423d714bec"; + loongarch64-unknown-linux-musl = "86e5d8b0f0c868559de3ec2a0902d0e516a710adb845c8904595c54807e821c2"; + x86_64-unknown-freebsd = "4baf0d5a44e64eecc91dc7ab89d8b0a8f8607e1d39b6989767861b34459a0396"; }; - selectRustPackage = pkgs: pkgs.rust_1_88; + selectRustPackage = pkgs: pkgs.rust_1_89; } ( diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 844ffa50e7ab1..29c584e86c6a9 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -82,13 +82,6 @@ stdenv.mkDerivation (finalAttrs: { # See: https://github.com/NixOS/nixpkgs/pull/56540#issuecomment-471624656 stripDebugList = [ "bin" ]; - # The Rust pkg-config crate does not support prefixed pkg-config executables[1], - # but it does support checking these idiosyncratic PKG_CONFIG_${TRIPLE} - # environment variables. - # [1]: https://github.com/rust-lang/pkg-config-rs/issues/53 - "PKG_CONFIG_${builtins.replaceStrings [ "-" ] [ "_" ] stdenv.buildPlatform.rust.rustcTarget}" = - "${pkgsBuildHost.stdenv.cc.targetPrefix}pkg-config"; - NIX_LDFLAGS = toString ( # when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch' # This doesn't apply to cross-building for FreeBSD because the host @@ -118,9 +111,9 @@ stdenv.mkDerivation (finalAttrs: { stdenv: "${prefixForStdenv stdenv}${if (stdenv.cc.isClang or false) then "clang" else "cc"}"; cxxPrefixForStdenv = stdenv: "${prefixForStdenv stdenv}${if (stdenv.cc.isClang or false) then "clang++" else "c++"}"; - setBuild = "--set=target.${stdenv.buildPlatform.rust.rustcTarget}"; - setHost = "--set=target.${stdenv.hostPlatform.rust.rustcTarget}"; - setTarget = "--set=target.${stdenv.targetPlatform.rust.rustcTarget}"; + setBuild = "--set=target.\"${stdenv.buildPlatform.rust.rustcTarget}\""; + setHost = "--set=target.\"${stdenv.hostPlatform.rust.rustcTarget}\""; + setTarget = "--set=target.\"${stdenv.targetPlatform.rust.rustcTarget}\""; ccForBuild = ccPrefixForStdenv pkgsBuildBuild.targetPackages.stdenv; cxxForBuild = cxxPrefixForStdenv pkgsBuildBuild.targetPackages.stdenv; ccForHost = ccPrefixForStdenv pkgsBuildHost.targetPackages.stdenv; diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix index 73fc4b2491412..d8ef7d21f5436 100644 --- a/pkgs/development/compilers/shaderc/default.nix +++ b/pkgs/development/compilers/shaderc/default.nix @@ -18,25 +18,27 @@ let glslang = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "15.3.0"; - hash = "sha256-HwFP4KJuA+BMQVvBWV0BCRj9U5I3CLEU+5bBtde2f6w="; + # No corresponding tag for efd24d75bcbc55620e759f6bf42c45a32abac5f8 on 2025-06-23 + rev = "efd24d75bcbc55620e759f6bf42c45a32abac5f8"; + hash = "sha256-wMd1ylwDOM/uBbhpyMAduM9X7ao08TNq3HdoNGfSjcQ="; }; spirv-tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "v2025.1"; - hash = "sha256-2Wv0dxVQ8NvuDRTcsXkH1GKmuA6lsIuwTl0j6kbTefo="; + rev = "v2025.3.rc1"; + hash = "sha256-yAdd/mXY8EJnE0vCu0n/aVxMH9059T/7cAdB9nP1vQQ="; }; spirv-headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "vulkan-sdk-1.4.309.0"; - hash = "sha256-Q1i6i5XimULuGufP6mimwDW674anAETUiIEvDQwvg5Y="; + # No corresponding tag for 2a611a970fdbc41ac2e3e328802aed9985352dca on 2025-06-19 + rev = "2a611a970fdbc41ac2e3e328802aed9985352dca"; + hash = "sha256-LRjMy9xtOErbJbMh+g2IKXfmo/hWpegZM72F8E122oY="; }; in stdenv.mkDerivation (finalAttrs: { pname = "shaderc"; - version = "2025.2"; + version = "2025.3"; outputs = [ "out" @@ -50,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "google"; repo = "shaderc"; rev = "v${finalAttrs.version}"; - hash = "sha256-u3gmH2lrkwBTZg9j4jInQceXK4MUWhKZPSPsN98mEkk="; + hash = "sha256-q5Z0wER8DbkmfT/MNrmnn9J9rzur2YjzAncaO1aRNXA="; }; postPatch = '' diff --git a/pkgs/development/compilers/zig/cc.nix b/pkgs/development/compilers/zig/cc.nix index bfbfb49de3651..f2716d395e691 100644 --- a/pkgs/development/compilers/zig/cc.nix +++ b/pkgs/development/compilers/zig/cc.nix @@ -14,7 +14,7 @@ in runCommand "zig-cc-${zig.version}" { pname = "zig-cc"; - inherit (zig) version meta; + inherit (zig) version; nativeBuildInputs = [ makeWrapper ]; @@ -24,6 +24,10 @@ runCommand "zig-cc-${zig.version}" }; inherit zig; + + meta = zig.meta // { + mainProgram = "${targetPrefix}clang"; + }; } '' mkdir -p $out/bin diff --git a/pkgs/development/cuda-modules/cudatoolkit/default.nix b/pkgs/development/cuda-modules/cudatoolkit/default.nix index e4f72bb933953..ddb34fb0459a7 100644 --- a/pkgs/development/cuda-modules/cudatoolkit/default.nix +++ b/pkgs/development/cuda-modules/cudatoolkit/default.nix @@ -20,7 +20,7 @@ libxcrypt-legacy, libxkbcommon, libkrb5, - libxml2, + libxml2_13, krb5, makeWrapper, markForCudatoolkitRootHook, @@ -154,14 +154,9 @@ backendStdenv.mkDerivation { ncurses6 python310 python311 - # Replace once https://github.com/NixOS/nixpkgs/pull/421740 is merged. - (libxml2.overrideAttrs rec { - version = "2.13.8"; - src = fetchurl { - url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz"; - hash = "sha256-J3KUyzMRmrcbK8gfL0Rem8lDW4k60VuyzSsOhZoO6Eo="; - }; - }) + ] + ++ lib.optionals (cudaAtLeast "12.9") [ + libxml2_13 python312 ]; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2de8190498fec..4d345073e5b28 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -102,6 +102,9 @@ with haskellLib; cabalInstallOverlay = cself: csuper: { Cabal = cself.Cabal_3_14_2_0; Cabal-syntax = cself.Cabal-syntax_3_14_2_0; + + # Only needed for cabal2nix, hpack < 0.37 forbids Cabal >= 3.14 + hpack = cself.hpack_0_38_1; }; in { @@ -166,11 +169,14 @@ with haskellLib; # May as well… (self.generateOptparseApplicativeCompletions [ "guardian" ]) ]; + + cabal2nix-unstable = super.cabal2nix-unstable.overrideScope cabalInstallOverlay; } ) cabal-install cabal-install-solver guardian + cabal2nix-unstable ; # Expected test output for these accidentally checks the absolute location of the source directory @@ -309,10 +315,9 @@ with haskellLib; sha256 = "10zkvclyir3zf21v41zdsvg68vrkq89n64kv9k54742am2i4aygf"; }) super.weeder; - # Version 2.1.1 is deprecated, but part of Stackage LTS at the moment. - # https://github.com/commercialhaskell/stackage/issues/7500 - # https://github.com/yesodweb/shakespeare/issues/280 - shakespeare = doDistribute self.shakespeare_2_1_0_1; + # Test suite doesn't find necessary test files when compiling + # https://github.com/yesodweb/shakespeare/issues/294 + shakespeare = dontCheck super.shakespeare; # Work around -Werror failures until a more permanent solution is released # https://github.com/haskell-cryptography/HsOpenSSL/issues/88 @@ -543,7 +548,7 @@ with haskellLib; name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "0d968aciaxmblahk79x2m708rvbg19flj5naxzg0zdp9j2jwlcqf"; + sha256 = "sha256-whpBFmOHBTm1clXoAwInsQw7mnxrQOyaUj7byogku5c="; # 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 @@ -558,18 +563,6 @@ with haskellLib; # TODO(@sternenseemann): submit upstreamable patch resolving this # (this should be possible by also taking PREFIX into account). ./patches/git-annex-no-usr-prefix.patch - - # Pick fix for git 2.50 related test suite failures from 10.20250630 - # https://git-annex.branchable.com/bugs/test_suite_fail_with_git_2.50/ - (pkgs.fetchpatch { - name = "git-annex-workaround-for-git-2.50.patch"; - url = "https://git.joeyh.name/index.cgi/git-annex.git/patch/?id=fb155b1e3e59cc1f9cf8a4fe7d47cba49d1c81af"; - sha256 = "sha256-w6eXW0JqshXTd0/tNPZ0fOW2SVmA90G5eFhsd9y05BI="; - excludes = [ - "doc/**" - "CHANGELOG" - ]; - }) ]; postPatch = '' @@ -1381,21 +1374,6 @@ with haskellLib; VulkanMemoryAllocator = addExtraLibrary pkgs.vulkan-headers super.VulkanMemoryAllocator; vulkan-utils = addExtraLibrary pkgs.vulkan-headers super.vulkan-utils; - # Support for vulkan-headers 1.4.313.0 - # https://github.com/YoshikuniJujo/gpu-vulkan-middle/issues/10 - gpu-vulkan-middle = overrideCabal (drv: { - version = - let - fixed = "0.1.0.76"; - in - lib.warnIf (lib.versionAtLeast drv.version fixed) - "haskellPackages.gpu-vulkan-middle: default version ${drv.version} >= ${fixed}, consider dropping override" - fixed; - sha256 = "sha256-VQAVo/84qPBFkQSmY3pT4WXOK9zrFMpK7WN9/UdED6E="; - revision = null; - editedCabalFile = null; - }) super.gpu-vulkan-middle; - # Generate cli completions for dhall. dhall = self.generateOptparseApplicativeCompletions [ "dhall" ] super.dhall; # 2025-01-27: allow aeson >= 2.2, 9.8 versions of text and bytestring @@ -1578,39 +1556,6 @@ with haskellLib; # https://github.com/haskell-servant/servant-ekg/issues/15 servant-ekg = doJailbreak super.servant-ekg; - # Fixes bug in an Ord instance that was causing the test suite to fail - # https://github.com/fpringle/servant-routes/issues/33 - servant-routes = appendPatches [ - (pkgs.fetchpatch { - name = "servant-routes-fix-ord.patch"; - url = "https://github.com/fpringle/servant-routes/commit/d1ef071f11c6a0810637beb8ea0b08f8e524b48a.patch"; - sha256 = "1c2xpi7sz0621fj9r1010587d1l39j6mm8l4vqmz9pldccmcb0f2"; - }) - ] super.servant-routes; - - # Fix test suite with text >= 2.1.2 - servant-client = - appendPatches - [ - (pkgs.fetchpatch { - name = "servant-client-text-2.1.2.patch"; - url = "https://github.com/haskell-servant/servant/commit/9cda0cfb356a01ad402ee949e0b0d5c0494eace2.patch"; - sha256 = "19vpn7h108wra9b84r642zxg0mii66rq4vjbqhi7ackkdb0mx9yn"; - relative = "servant-client"; - # patch to servant-client.cabal doesn't apply on 0.20.2 - includes = [ "README.md" ]; - }) - ] - ( - overrideCabal (drv: { - postPatch = super.postPatch or "" + '' - # Restore the symlink (to the file we patch) which becomes a regular file - # in the hackage tarball - ln -sf README.md README.lhs - ''; - }) super.servant-client - ); - # it wants to build a statically linked binary by default hledger-flow = overrideCabal (drv: { postPatch = (drv.postPatch or "") + '' @@ -1661,16 +1606,6 @@ with haskellLib; # https://github.com/NixOS/nixpkgs/issues/198495 (dontCheckIf (pkgs.postgresqlTestHook.meta.broken) super.persistent-postgresql); - # Downgrade persistent-test to a version that's compatible with - # persistent < 2.16 (which Stackage prescribed). Unfortunately, the - # bad version of persistent-test slipped into Stackage LTS because - # PVP allows it and LTS doesn't continuously run test suites (contrary - # to nightly). - # See also https://github.com/yesodweb/persistent/pull/1584#issuecomment-2939756529 - # https://github.com/commercialhaskell/stackage/issues/7768 - persistent-test_2_13_1_4 = dontDistribute super.persistent-test; - persistent-test = doDistribute self.persistent-test_2_13_1_3; - # Needs matching lsp-types # Allow lens >= 5.3 lsp_2_4_0_0 = doDistribute ( @@ -2084,35 +2019,6 @@ with haskellLib; # https://github.com/obsidiansystems/database-id/issues/1 database-id-class = doJailbreak super.database-id-class; - cabal2nix-unstable = overrideCabal { - passthru = { - updateScript = ../../../maintainers/scripts/haskell/update-cabal2nix-unstable.sh; - - # This is used by regenerate-hackage-packages.nix to supply the configuration - # values we can easily generate automatically without checking them in. - compilerConfig = - pkgs.runCommand "hackage2nix-${self.ghc.haskellCompilerName}-config.yaml" - { - nativeBuildInputs = [ - self.ghc - ]; - } - '' - cat > "$out" << EOF - # generated by haskellPackages.cabal2nix-unstable.compilerConfig - compiler: ${self.ghc.haskellCompilerName} - - core-packages: - EOF - - ghc-pkg list \ - | tail -n '+2' \ - | sed -e 's/[()]//g' -e 's/\s\+/ - /' \ - >> "$out" - ''; - }; - } super.cabal2nix-unstable; - # Too strict version bounds on base # https://github.com/gibiansky/IHaskell/issues/1217 ihaskell-display = doJailbreak super.ihaskell-display; @@ -2194,7 +2100,7 @@ with haskellLib; self: super: { # stack needs to be built with the same hpack version that the upstream releases use. # https://github.com/NixOS/nixpkgs/issues/223390 - hpack = self.hpack_0_38_0; + hpack = self.hpack_0_38_1; } ); @@ -3047,6 +2953,20 @@ with haskellLib; # https://github.com/snoyberg/http-client/pull/563 http-client-tls = doJailbreak super.http-client-tls; + # agda2hs 1.3 is not compatible with Agda 2.8.0 + agda2hs = lib.pipe super.agda2hs [ + (warnAfterVersion "1.3") + (overrideSrc { + version = "1.3-unstable-2025-07-25"; + src = pkgs.fetchFromGitHub { + owner = "agda"; + repo = "agda2hs"; + rev = "01cc0532b522f64223782617cbde1a6f21b8880e"; + hash = "sha256-SXhnkZa8OmgpYRTb2IVTfebtX+GG5mkVcqKchl2Noic="; + }; + }) + ]; + bsb-http-chunked = lib.pipe super.bsb-http-chunked [ (warnAfterVersion "0.0.0.4") # Last released in 2018 @@ -3318,9 +3238,352 @@ with haskellLib; src = amazonkaSrc + "/${dir}"; }) drv; - isAmazonkaService = - name: lib.hasPrefix "amazonka-" name && name != "amazonka-test" && name != "amazonka-s3-streaming"; - amazonkaServices = lib.filter isAmazonkaService (lib.attrNames super); + # To get the list of amazonka services run: + # > nix eval --impure --expr 'builtins.attrNames (import ./. {}).haskellPackages' --json | jq '.[]' | grep '^"amazonka' + # NB: we exclude amazonka-test and amazonka-s3-streaming + amazonkaServices = [ + "amazonka" + "amazonka-accessanalyzer" + "amazonka-account" + "amazonka-alexa-business" + "amazonka-amp" + "amazonka-amplify" + "amazonka-amplifybackend" + "amazonka-amplifyuibuilder" + "amazonka-apigateway" + "amazonka-apigatewaymanagementapi" + "amazonka-apigatewayv2" + "amazonka-appconfig" + "amazonka-appconfigdata" + "amazonka-appflow" + "amazonka-appintegrations" + "amazonka-application-autoscaling" + "amazonka-application-insights" + "amazonka-applicationcostprofiler" + "amazonka-appmesh" + "amazonka-apprunner" + "amazonka-appstream" + "amazonka-appsync" + "amazonka-arc-zonal-shift" + "amazonka-athena" + "amazonka-auditmanager" + "amazonka-autoscaling" + "amazonka-autoscaling-plans" + "amazonka-backup" + "amazonka-backup-gateway" + "amazonka-backupstorage" + "amazonka-batch" + "amazonka-billingconductor" + "amazonka-braket" + "amazonka-budgets" + "amazonka-certificatemanager" + "amazonka-certificatemanager-pca" + "amazonka-chime" + "amazonka-chime-sdk-identity" + "amazonka-chime-sdk-media-pipelines" + "amazonka-chime-sdk-meetings" + "amazonka-chime-sdk-messaging" + "amazonka-chime-sdk-voice" + "amazonka-cloud9" + "amazonka-cloudcontrol" + "amazonka-clouddirectory" + "amazonka-cloudformation" + "amazonka-cloudfront" + "amazonka-cloudhsm" + "amazonka-cloudhsmv2" + "amazonka-cloudsearch" + "amazonka-cloudsearch-domains" + "amazonka-cloudtrail" + "amazonka-cloudwatch" + "amazonka-cloudwatch-events" + "amazonka-cloudwatch-logs" + "amazonka-codeartifact" + "amazonka-codebuild" + "amazonka-codecommit" + "amazonka-codedeploy" + "amazonka-codeguru-reviewer" + "amazonka-codeguruprofiler" + "amazonka-codepipeline" + "amazonka-codestar" + "amazonka-codestar-connections" + "amazonka-codestar-notifications" + "amazonka-cognito-identity" + "amazonka-cognito-idp" + "amazonka-cognito-sync" + "amazonka-comprehend" + "amazonka-comprehendmedical" + "amazonka-compute-optimizer" + "amazonka-config" + "amazonka-connect" + "amazonka-connect-contact-lens" + "amazonka-connectcampaigns" + "amazonka-connectcases" + "amazonka-connectparticipant" + "amazonka-contrib-rds-utils" + "amazonka-controltower" + "amazonka-core" + "amazonka-cost-explorer" + "amazonka-cur" + "amazonka-customer-profiles" + "amazonka-databrew" + "amazonka-dataexchange" + "amazonka-datapipeline" + "amazonka-datasync" + "amazonka-detective" + "amazonka-devicefarm" + "amazonka-devops-guru" + "amazonka-directconnect" + "amazonka-discovery" + "amazonka-dlm" + "amazonka-dms" + "amazonka-docdb" + "amazonka-docdb-elastic" + "amazonka-drs" + "amazonka-ds" + "amazonka-dynamodb" + "amazonka-dynamodb-dax" + "amazonka-dynamodb-streams" + "amazonka-ebs" + "amazonka-ec2" + "amazonka-ec2-instance-connect" + "amazonka-ecr" + "amazonka-ecr-public" + "amazonka-ecs" + "amazonka-efs" + "amazonka-eks" + "amazonka-elastic-inference" + "amazonka-elasticache" + "amazonka-elasticbeanstalk" + "amazonka-elasticsearch" + "amazonka-elastictranscoder" + "amazonka-elb" + "amazonka-elbv2" + "amazonka-emr" + "amazonka-emr-containers" + "amazonka-emr-serverless" + "amazonka-evidently" + "amazonka-finspace" + "amazonka-finspace-data" + "amazonka-fis" + "amazonka-fms" + "amazonka-forecast" + "amazonka-forecastquery" + "amazonka-frauddetector" + "amazonka-fsx" + "amazonka-gamelift" + "amazonka-gamesparks" + "amazonka-glacier" + "amazonka-globalaccelerator" + "amazonka-glue" + "amazonka-grafana" + "amazonka-greengrass" + "amazonka-greengrassv2" + "amazonka-groundstation" + "amazonka-guardduty" + "amazonka-health" + "amazonka-healthlake" + "amazonka-honeycode" + "amazonka-iam" + "amazonka-iam-policy" + "amazonka-identitystore" + "amazonka-imagebuilder" + "amazonka-importexport" + "amazonka-inspector" + "amazonka-inspector2" + "amazonka-iot" + "amazonka-iot-analytics" + "amazonka-iot-dataplane" + "amazonka-iot-jobs-dataplane" + "amazonka-iot-roborunner" + "amazonka-iot1click-devices" + "amazonka-iot1click-projects" + "amazonka-iotdeviceadvisor" + "amazonka-iotevents" + "amazonka-iotevents-data" + "amazonka-iotfleethub" + "amazonka-iotfleetwise" + "amazonka-iotsecuretunneling" + "amazonka-iotsitewise" + "amazonka-iotthingsgraph" + "amazonka-iottwinmaker" + "amazonka-iotwireless" + "amazonka-ivs" + "amazonka-ivschat" + "amazonka-kafka" + "amazonka-kafkaconnect" + "amazonka-kendra" + "amazonka-keyspaces" + "amazonka-kinesis" + "amazonka-kinesis-analytics" + "amazonka-kinesis-firehose" + "amazonka-kinesis-video" + "amazonka-kinesis-video-archived-media" + "amazonka-kinesis-video-media" + "amazonka-kinesis-video-signaling" + "amazonka-kinesis-video-webrtc-storage" + "amazonka-kinesisanalyticsv2" + "amazonka-kms" + "amazonka-lakeformation" + "amazonka-lambda" + "amazonka-lex-models" + "amazonka-lex-runtime" + "amazonka-lexv2-models" + "amazonka-license-manager" + "amazonka-license-manager-linux-subscriptions" + "amazonka-license-manager-user-subscriptions" + "amazonka-lightsail" + "amazonka-location" + "amazonka-lookoutequipment" + "amazonka-lookoutmetrics" + "amazonka-lookoutvision" + "amazonka-m2" + "amazonka-macie" + "amazonka-maciev2" + "amazonka-managedblockchain" + "amazonka-marketplace-analytics" + "amazonka-marketplace-catalog" + "amazonka-marketplace-entitlement" + "amazonka-marketplace-metering" + "amazonka-mechanicalturk" + "amazonka-mediaconnect" + "amazonka-mediaconvert" + "amazonka-medialive" + "amazonka-mediapackage" + "amazonka-mediapackage-vod" + "amazonka-mediastore" + "amazonka-mediastore-dataplane" + "amazonka-mediatailor" + "amazonka-memorydb" + "amazonka-mgn" + "amazonka-migration-hub-refactor-spaces" + "amazonka-migrationhub" + "amazonka-migrationhub-config" + "amazonka-migrationhuborchestrator" + "amazonka-migrationhubstrategy" + "amazonka-ml" + "amazonka-mobile" + "amazonka-mq" + "amazonka-mtl" + "amazonka-mwaa" + "amazonka-neptune" + "amazonka-network-firewall" + "amazonka-networkmanager" + "amazonka-nimble" + "amazonka-oam" + "amazonka-omics" + "amazonka-opensearch" + "amazonka-opensearchserverless" + "amazonka-opsworks" + "amazonka-opsworks-cm" + "amazonka-organizations" + "amazonka-outposts" + "amazonka-panorama" + "amazonka-personalize" + "amazonka-personalize-events" + "amazonka-personalize-runtime" + "amazonka-pi" + "amazonka-pinpoint" + "amazonka-pinpoint-email" + "amazonka-pinpoint-sms-voice" + "amazonka-pinpoint-sms-voice-v2" + "amazonka-pipes" + "amazonka-polly" + "amazonka-pricing" + "amazonka-privatenetworks" + "amazonka-proton" + "amazonka-qldb" + "amazonka-qldb-session" + "amazonka-quicksight" + "amazonka-ram" + "amazonka-rbin" + "amazonka-rds" + "amazonka-rds-data" + "amazonka-redshift" + "amazonka-redshift-data" + "amazonka-redshift-serverless" + "amazonka-rekognition" + "amazonka-resiliencehub" + "amazonka-resource-explorer-v2" + "amazonka-resourcegroups" + "amazonka-resourcegroupstagging" + "amazonka-robomaker" + "amazonka-rolesanywhere" + "amazonka-route53" + "amazonka-route53-autonaming" + "amazonka-route53-domains" + "amazonka-route53-recovery-cluster" + "amazonka-route53-recovery-control-config" + "amazonka-route53-recovery-readiness" + "amazonka-route53resolver" + "amazonka-rum" + "amazonka-s3" + "amazonka-s3-encryption" + #"amazonka-s3-streaming" + "amazonka-s3outposts" + "amazonka-sagemaker" + "amazonka-sagemaker-a2i-runtime" + "amazonka-sagemaker-edge" + "amazonka-sagemaker-featurestore-runtime" + "amazonka-sagemaker-geospatial" + "amazonka-sagemaker-metrics" + "amazonka-sagemaker-runtime" + "amazonka-savingsplans" + "amazonka-scheduler" + "amazonka-schemas" + "amazonka-sdb" + "amazonka-secretsmanager" + "amazonka-securityhub" + "amazonka-securitylake" + "amazonka-serverlessrepo" + "amazonka-service-quotas" + "amazonka-servicecatalog" + "amazonka-servicecatalog-appregistry" + "amazonka-ses" + "amazonka-sesv2" + "amazonka-shield" + "amazonka-signer" + "amazonka-simspaceweaver" + "amazonka-sms" + "amazonka-sms-voice" + "amazonka-snow-device-management" + "amazonka-snowball" + "amazonka-sns" + "amazonka-sqs" + "amazonka-ssm" + "amazonka-ssm-contacts" + "amazonka-ssm-incidents" + "amazonka-ssm-sap" + "amazonka-sso" + "amazonka-sso-admin" + "amazonka-sso-oidc" + "amazonka-stepfunctions" + "amazonka-storagegateway" + "amazonka-sts" + "amazonka-support" + "amazonka-support-app" + "amazonka-swf" + "amazonka-synthetics" + #"amazonka-test" + "amazonka-textract" + "amazonka-timestream-query" + "amazonka-timestream-write" + "amazonka-transcribe" + "amazonka-transfer" + "amazonka-translate" + "amazonka-voice-id" + "amazonka-waf" + "amazonka-waf-regional" + "amazonka-wafv2" + "amazonka-wellarchitected" + "amazonka-wisdom" + "amazonka-workdocs" + "amazonka-worklink" + "amazonka-workmail" + "amazonka-workmailmessageflow" + "amazonka-workspaces" + "amazonka-workspaces-web" + "amazonka-xray" + ]; amazonkaServiceOverrides = ( lib.genAttrs amazonkaServices ( name: diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 775742748ab5e..0f3efdf5924cb 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -383,8 +383,12 @@ self: super: libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ]; }) (disableCabalFlag "fixity-th" super.fourmolu); - # https://github.com/NixOS/nixpkgs/issues/149692 - Agda = disableCabalFlag "optimise-heavily" super.Agda; + Agda = lib.pipe super.Agda [ + # https://github.com/NixOS/nixpkgs/issues/149692 + (disableCabalFlag "optimise-heavily") + # https://github.com/agda/agda/issues/8016 + (appendConfigureFlag "--ghc-option=-Wwarn=deprecations") + ]; # https://github.com/NixOS/nixpkgs/issues/198495 eventsourcing-postgresql = dontCheck super.eventsourcing-postgresql; 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 b8748b911eb91..38f53d3e04c9a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -133,6 +133,9 @@ self: super: { hlint = self.hlint_3_4_1; + # test suite depends on vcr since hpack >= 0.38.1 which requires GHC2021 + hpack_0_38_1 = dontCheck super.hpack_0_38_1; + mime-string = disableOptimization super.mime-string; # weeder 2.3.* no longer supports GHC 8.10 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 d4bd67400d813..3258dd3414651 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -91,7 +91,7 @@ self: super: { some = addBuildDepend self.base-orphans super.some; # This became a core library in ghc 8.10., so we don’t have an "exception" attribute anymore. - exceptions = self.exceptions_0_10_9; + exceptions = self.exceptions_0_10_10; mime-string = disableOptimization super.mime-string; } 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 a476886358b11..ab90e94de5ca9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -117,6 +117,9 @@ self: super: { "haskell-language-server has dropped support for ghc 9.0 in version 2.4.0.0, please use a newer ghc version or an older nixpkgs version" (markBroken super.haskell-language-server); + # test suite depends on vcr since hpack >= 0.38.1 which requires GHC2021 + hpack_0_38_1 = dontCheck super.hpack_0_38_1; + # Needs to use ghc-lib due to incompatible GHC ghc-tags = doDistribute self.ghc-tags_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 552cb1f755e3d..63162d068237b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix @@ -78,7 +78,7 @@ with haskellLib; tagged = doDistribute self.tagged_0_8_9; time-compat = doDistribute self.time-compat_1_9_8; extensions = doDistribute self.extensions_0_1_0_3; - doctest = doDistribute self.doctest_0_24_0; + doctest = doDistribute self.doctest_0_24_2; # see :/doctest_0_24_2 =/ below ghc-syntax-highlighter = doDistribute self.ghc-syntax-highlighter_0_0_13_0; ghc-lib = doDistribute self.ghc-lib_9_12_2_20250421; ghc-exactprint = doDistribute self.ghc-exactprint_1_12_0_0; @@ -128,14 +128,14 @@ with haskellLib; relude = dontCheck super.relude; - doctest_0_24_0 = overrideCabal (drv: { + doctest_0_24_2 = overrideCabal (drv: { testFlags = drv.testFlags or [ ] ++ [ # These tests require cabal-install (would cause infinite recursion) "--skip=/Cabal.Options" "--skip=/Cabal.Paths/paths" "--skip=/Cabal.ReplOptions" # >= 0.23 ]; - }) super.doctest_0_24_0; + }) super.doctest_0_24_2; # https://gitlab.haskell.org/ghc/ghc/-/issues/25930 generic-lens = dontCheck super.generic-lens; @@ -178,5 +178,5 @@ with haskellLib; }; # Allow Cabal 3.14 - hpack = doDistribute self.hpack_0_38_0; + hpack = doDistribute self.hpack_0_38_1; } diff --git a/pkgs/development/haskell-modules/configuration-ghcjs-8.x.nix b/pkgs/development/haskell-modules/configuration-ghcjs-8.x.nix index 7b23cb9f4b072..56776f094cb94 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_9; + exceptions = dontCheck self.exceptions_0_10_10; ## OTHER PACKAGES diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index ff7ec02444af0..75bb85edb1523 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -16,6 +16,7 @@ broken-packages: - AC-BuildPlatform # failure in job https://hydra.nixos.org/build/233219130 at 2023-09-02 - AC-EasyRaster-GTK # failure in job https://hydra.nixos.org/build/233226232 at 2023-09-02 - AC-HalfInteger # failure in job https://hydra.nixos.org/build/233239266 at 2023-09-02 + - ac-library-hs # failure in job https://hydra.nixos.org/build/302800699 at 2025-07-27 - ac-machine # failure in job https://hydra.nixos.org/build/233253535 at 2023-09-02 - AC-MiniTest # failure in job https://hydra.nixos.org/build/233216015 at 2023-09-02 - AC-Terminal # failure in job https://hydra.nixos.org/build/233192747 at 2023-09-02 @@ -256,6 +257,7 @@ broken-packages: - ascii-string # failure in job https://hydra.nixos.org/build/233249978 at 2023-09-02 - ascii-vector-avc # failure in job https://hydra.nixos.org/build/233208533 at 2023-09-02 - ascii85-conduit # failure in job https://hydra.nixos.org/build/233235427 at 2023-09-02 + - ascii85x # failure in job https://hydra.nixos.org/build/302801241 at 2025-07-27 - asciidiagram # failure in job https://hydra.nixos.org/build/233259020 at 2023-09-02 - asif # failure in job https://hydra.nixos.org/build/233251551 at 2023-09-02 - asil # failure in job https://hydra.nixos.org/build/233204081 at 2023-09-02 @@ -313,6 +315,7 @@ broken-packages: - auto # failure in job https://hydra.nixos.org/build/233211088 at 2023-09-02 - auto-split # failure in job https://hydra.nixos.org/build/295091795 at 2025-04-22 - autoapply # failure in job https://hydra.nixos.org/build/295091805 at 2025-04-22 + - autodocodec-exact # failure in job https://hydra.nixos.org/build/302801281 at 2025-07-27 - autom # failure in job https://hydra.nixos.org/build/234461198 at 2023-09-13 - automata # failure in job https://hydra.nixos.org/build/295091890 at 2025-04-22 - autonix-deps # failure in job https://hydra.nixos.org/build/233258269 at 2023-09-02 @@ -326,6 +329,7 @@ broken-packages: - avwx # failure in job https://hydra.nixos.org/build/233258167 at 2023-09-02 - awesome-prelude # failure in job https://hydra.nixos.org/build/233232761 at 2023-09-02 - awesomium-raw # failure in job https://hydra.nixos.org/build/233241036 at 2023-09-02 + - aws-academy-grade-exporter # failure in job https://hydra.nixos.org/build/302801316 at 2025-07-27 - aws-cloudfront-signed-cookies # failure in job https://hydra.nixos.org/build/252736035 at 2024-03-16 - aws-cloudfront-signer # failure in job https://hydra.nixos.org/build/233194723 at 2023-09-02 - aws-easy # failure building library in job https://hydra.nixos.org/build/237244335 at 2023-10-21 @@ -375,7 +379,6 @@ broken-packages: - base32-lens # failure in job https://hydra.nixos.org/build/233226670 at 2023-09-02 - base58address # failure in job https://hydra.nixos.org/build/233221633 at 2023-09-02 - base62 # failure in job https://hydra.nixos.org/build/233250040 at 2023-09-02 - - base64-bytes # failure in job https://hydra.nixos.org/build/295091866 at 2025-04-22 - base64-conduit # failure in job https://hydra.nixos.org/build/233197196 at 2023-09-02 - base64-lens # failure in job https://hydra.nixos.org/build/233252600 at 2023-09-02 - based # failure in job https://hydra.nixos.org/build/233211900 at 2023-09-02 @@ -515,6 +518,8 @@ broken-packages: - bliplib # failure in job https://hydra.nixos.org/build/233195751 at 2023-09-02 - blockchain # failure in job https://hydra.nixos.org/build/233245492 at 2023-09-02 - blockhash # failure in job https://hydra.nixos.org/build/233227049 at 2023-09-02 + - blockio-uring # failure in job https://hydra.nixos.org/build/302801498, https://github.com/well-typed/blockio-uring/issues/44 at 2025-07-27 + - blockio-uring # https://github.com/well-typed/blockio-uring/issues/44, added 2025-07-27 - Blogdown # failure in job https://hydra.nixos.org/build/233239841 at 2023-09-02 - BlogLiterately # failure in job https://hydra.nixos.org/build/233202164 at 2023-09-02 - bloodhound-amazonka-auth # failure building library in job https://hydra.nixos.org/build/237245625 at 2023-10-21 @@ -718,7 +723,6 @@ broken-packages: - Cassava # failure in job https://hydra.nixos.org/build/233245677 at 2023-09-02 - cassava-conduit # failure in job https://hydra.nixos.org/build/233220495 at 2023-09-02 - cassava-records # failure in job https://hydra.nixos.org/build/233259049 at 2023-09-02 - - cassette # failure in job https://hydra.nixos.org/build/233201251 at 2023-09-02 - castle # failure in job https://hydra.nixos.org/build/233204027 at 2023-09-02 - catamorphism # failure in job https://hydra.nixos.org/build/233208488 at 2023-09-02 - Catana # failure in job https://hydra.nixos.org/build/233196550 at 2023-09-02 @@ -726,6 +730,7 @@ broken-packages: - category-printf # failure in job https://hydra.nixos.org/build/233216355 at 2023-09-02 - category-traced # failure in job https://hydra.nixos.org/build/233193963 at 2023-09-02 - catnplus # failure in job https://hydra.nixos.org/build/233241280 at 2023-09-02 + - cauldron # failure in job https://hydra.nixos.org/build/302801682 at 2025-07-27 - cautious-file # failure in job https://hydra.nixos.org/build/233218702 at 2023-09-02 - cautious-gen # failure in job https://hydra.nixos.org/build/233258367 at 2023-09-02 - cayene-lpp # failure in job https://hydra.nixos.org/build/233228959 at 2023-09-02 @@ -871,8 +876,6 @@ broken-packages: - cmph # failure in job https://hydra.nixos.org/build/233225766 at 2023-09-02 - CMQ # failure in job https://hydra.nixos.org/build/233233168 at 2023-09-02 - cmt # failure in job https://hydra.nixos.org/build/233233474 at 2023-09-02 - - co-log-concurrent # failure in job https://hydra.nixos.org/build/295092333 at 2025-04-22 - - co-log-json # failure in job https://hydra.nixos.org/build/295092337 at 2025-04-22 - co-log-polysemy-formatting # failure building executable 'example' in job https://hydra.nixos.org/build/237249360 at 2023-10-21 - co-log-sys # failure in job https://hydra.nixos.org/build/233206587 at 2023-09-02 - cobot-tools # failure in job https://hydra.nixos.org/build/233259173 at 2023-09-02 @@ -1015,7 +1018,6 @@ broken-packages: - contra-tracers # failure in job https://hydra.nixos.org/build/233197959 at 2023-09-02 - contracheck-applicative # failure in job https://hydra.nixos.org/build/233255104 at 2023-09-02 - Contract # failure in job https://hydra.nixos.org/build/233242103 at 2023-09-02 - - control-block # failure in job https://hydra.nixos.org/build/295092490 at 2025-04-22 - control-dsl # failure in job https://hydra.nixos.org/build/233249037 at 2023-09-02 - control-iso # failure in job https://hydra.nixos.org/build/233229763 at 2023-09-02 - control-monad-failure # failure in job https://hydra.nixos.org/build/233240265 at 2023-09-02 @@ -1024,6 +1026,7 @@ broken-packages: - contstuff-monads-tf # failure in job https://hydra.nixos.org/build/233224064 at 2023-09-02 - contstuff-transformers # failure in job https://hydra.nixos.org/build/233244153 at 2023-09-02 - conversion-bytestring # failure in job https://hydra.nixos.org/build/295092506 at 2025-04-22 + - convex-schema-parser # failure in job https://hydra.nixos.org/build/302801971 at 2025-07-27 - cookie-tray # failure in job https://hydra.nixos.org/build/295092527 at 2025-04-22 - cooklang-hs # failure in job https://hydra.nixos.org/build/295092511 at 2025-04-22 - copilot-bluespec # failure in job https://hydra.nixos.org/build/253685418 at 2024-03-31 @@ -1116,6 +1119,7 @@ broken-packages: - cuckoo # failure in job https://hydra.nixos.org/build/233210915 at 2023-09-02 - cuckoo-filter # failure in job https://hydra.nixos.org/build/233226484 at 2023-09-02 - cudd # failure in job https://hydra.nixos.org/build/252716117 at 2024-03-16 + - cuddle # failure in job https://hydra.nixos.org/build/302802065 at 2025-07-27 - curl-aeson # failure in job https://hydra.nixos.org/build/233210106 at 2023-09-02 - curl-runnings # failure in job https://hydra.nixos.org/build/233258680 at 2023-09-02 - currency-convert # failure in job https://hydra.nixos.org/build/233224509 at 2023-09-02 @@ -1305,9 +1309,7 @@ broken-packages: - dia-base # failure in job https://hydra.nixos.org/build/233230896 at 2023-09-02 - diagnose # failure in job https://hydra.nixos.org/build/233231767 at 2023-09-02 - diagrams-boolean # failure in job https://hydra.nixos.org/build/233202036 at 2023-09-02 - - diagrams-gtk # failure in job https://hydra.nixos.org/build/295092833 at 2025-04-22 - diagrams-haddock # failure in job https://hydra.nixos.org/build/295092844 at 2025-04-22 - - diagrams-pandoc # failure in job https://hydra.nixos.org/build/295092840 at 2025-04-22 - diagrams-pdf # failure in job https://hydra.nixos.org/build/233197864 at 2023-09-02 - diagrams-qrcode # failure in job https://hydra.nixos.org/build/233229542 at 2023-09-02 - diagrams-rubiks-cube # failure in job https://hydra.nixos.org/build/233213426 at 2023-09-02 @@ -1349,7 +1351,6 @@ broken-packages: - direm # failure in job https://hydra.nixos.org/build/233211496 at 2023-09-02 - dirstream # failure in job https://hydra.nixos.org/build/273442606 at 2024-10-01 - disco # failure in job https://hydra.nixos.org/build/233212298 at 2023-09-02 - - discord-haskell # failure in job https://hydra.nixos.org/build/295092870 at 2025-04-22 - discord-register # failure in job https://hydra.nixos.org/build/295092898 at 2025-04-22 - discord-types # failure in job https://hydra.nixos.org/build/233251778 at 2023-09-02 - discordian-calendar # failure in job https://hydra.nixos.org/build/233218124 at 2023-09-02 @@ -1401,7 +1402,6 @@ broken-packages: - DOH # failure in job https://hydra.nixos.org/build/233231913 at 2023-09-02 - doi # failure in job https://hydra.nixos.org/build/295092999 at 2025-04-22 - dom-events # failure in job https://hydra.nixos.org/build/233231199 at 2023-09-02 - - dom-parser # failure in job https://hydra.nixos.org/build/233235797 at 2023-09-02 - dom-selector # failure in job https://hydra.nixos.org/build/233212663 at 2023-09-02 - domaindriven-core # failure in job https://hydra.nixos.org/build/233234739 at 2023-09-02 - dominion # failure in job https://hydra.nixos.org/build/252714022 at 2024-03-16 @@ -1409,7 +1409,6 @@ broken-packages: - dormouse-uri # failure in job https://hydra.nixos.org/build/233191706 at 2023-09-02 - dot-linker # failure in job https://hydra.nixos.org/build/233237512 at 2023-09-02 - dotfs # failure in job https://hydra.nixos.org/build/233200762 at 2023-09-02 - - double-x-encoding # failure in job https://hydra.nixos.org/build/253694746 at 2024-03-31 - doublezip # failure in job https://hydra.nixos.org/build/233219270 at 2023-09-02 - doublify-toolkit # failure in job https://hydra.nixos.org/build/233223302 at 2023-09-02 - dovin # failure in job https://hydra.nixos.org/build/252714139 at 2024-03-16 @@ -1446,7 +1445,6 @@ broken-packages: - dualizer # failure in job https://hydra.nixos.org/build/233237592 at 2023-09-02 - duckling # failure in job https://hydra.nixos.org/build/233247880 at 2023-09-02 - duet # failure in job https://hydra.nixos.org/build/233219004 at 2023-09-02 - - dumb-cas # failure in job https://hydra.nixos.org/build/252730634 at 2024-03-16 - dump-core # failure in job https://hydra.nixos.org/build/233244428 at 2023-09-02 - dunai-core # failure in job https://hydra.nixos.org/build/233255804 at 2023-09-02 - Dung # failure in job https://hydra.nixos.org/build/233206343 at 2023-09-02 @@ -1507,7 +1505,6 @@ broken-packages: - editline # failure in job https://hydra.nixos.org/build/233259515 at 2023-09-02 - edits # failure in job https://hydra.nixos.org/build/295093075 at 2025-04-22 - effect-handlers # failure in job https://hydra.nixos.org/build/233234988 at 2023-09-02 - - effect-stack # failure in job https://hydra.nixos.org/build/233212358 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 - effective-aspects # failure in job https://hydra.nixos.org/build/233223120 at 2023-09-02 @@ -1656,6 +1653,7 @@ broken-packages: - exinst-hashable # failure in job https://hydra.nixos.org/build/233210438 at 2023-09-02 - exists # failure in job https://hydra.nixos.org/build/233243541 at 2023-09-02 - exitcode # failure in job https://hydra.nixos.org/build/233238454 at 2023-09-02 + - exotic-list-monads # failure in job https://hydra.nixos.org/build/302802593 at 2025-07-27 - exp-cache # failure in job https://hydra.nixos.org/build/233220561 at 2023-09-02 - exp-extended # failure in job https://hydra.nixos.org/build/233236139 at 2023-09-02 - experimenter # failure in job https://hydra.nixos.org/build/252726011 at 2024-03-16 @@ -1905,7 +1903,6 @@ broken-packages: - frown # failure in job https://hydra.nixos.org/build/233208462 at 2023-09-02 - frp-arduino # failure in job https://hydra.nixos.org/build/233192216 at 2023-09-02 - frpnow # failure in job https://hydra.nixos.org/build/233236056 at 2023-09-02 - - fs-api # failure in job https://hydra.nixos.org/build/299137683 at 2025-06-23 - fs-events # failure in job https://hydra.nixos.org/build/233218231 at 2023-09-02 - fsh-csv # failure in job https://hydra.nixos.org/build/233220196 at 2023-09-02 - FSM # failure in job https://hydra.nixos.org/build/233247343 at 2023-09-02 @@ -1926,7 +1923,6 @@ broken-packages: - funcons-tools # failure in job https://hydra.nixos.org/build/295122838 at 2025-04-22 - function-instances-algebra # failure in job https://hydra.nixos.org/build/233202209 at 2023-09-02 - functional-arrow # failure in job https://hydra.nixos.org/build/295093396 at 2025-04-22 - - functor-combinators # failure in job https://hydra.nixos.org/build/252714438 at 2024-03-16 - functor-friends # failure in job https://hydra.nixos.org/build/233208108 at 2023-09-02 - functor-infix # failure in job https://hydra.nixos.org/build/233228794 at 2023-09-02 - functor-utils # failure in job https://hydra.nixos.org/build/233213259 at 2023-09-02 @@ -1952,7 +1948,6 @@ broken-packages: - fwgl # failure in job https://hydra.nixos.org/build/233246210 at 2023-09-02 - fwgl-javascript # broken by fwgl, manually entered here, because it does not appear in transitive-broken.yaml at 2024-07-09 - fx # failure in job https://hydra.nixos.org/build/295093438 at 2025-04-22 - - fxpak # failure in job https://hydra.nixos.org/build/265955610 at 2024-07-14 - g-npm # failure in job https://hydra.nixos.org/build/233215965 at 2023-09-02 - g4ip # failure in job https://hydra.nixos.org/build/233248315 at 2023-09-02 - gambler # failure in job https://hydra.nixos.org/build/252732701 at 2024-03-16 @@ -1980,7 +1975,6 @@ broken-packages: - GeneralTicTacToe # failure in job https://hydra.nixos.org/build/233207939 at 2023-09-02 - generator # failure in job https://hydra.nixos.org/build/233213384 at 2023-09-02 - generators # failure in job https://hydra.nixos.org/build/233246459 at 2023-09-02 - - generic-aeson # failure in job https://hydra.nixos.org/build/233198064 at 2023-09-02 - generic-binary # failure in job https://hydra.nixos.org/build/233214473 at 2023-09-02 - generic-church # failure in job https://hydra.nixos.org/build/233213419 at 2023-09-02 - generic-enum # failure in job https://hydra.nixos.org/build/233220316 at 2023-09-02 @@ -2010,7 +2004,6 @@ broken-packages: - gentlemark # failure in job https://hydra.nixos.org/build/233202158 at 2023-09-02 - genvalidity-appendful # failure in job https://hydra.nixos.org/build/295093519 at 2025-04-22 - genvalidity-mergeful # failure in job https://hydra.nixos.org/build/295093508 at 2025-04-22 - - genvalidity-network-uri # failure in job https://hydra.nixos.org/build/299137822 at 2025-06-23 - geo-resolver # failure in job https://hydra.nixos.org/build/233206563 at 2023-09-02 - geo-uk # failure in job https://hydra.nixos.org/build/233221284 at 2023-09-02 - geocode-google # failure in job https://hydra.nixos.org/build/233191594 at 2023-09-02 @@ -2078,6 +2071,7 @@ broken-packages: - gi-gio-hs-list-model # failure in job https://hydra.nixos.org/build/233241640 at 2023-09-02 - gi-gstapp # failure in job https://hydra.nixos.org/build/253686159 at 2024-03-31 - gi-gsttag # failure in job https://hydra.nixos.org/build/233197576 at 2023-09-02 + - gi-gtk4-layer-shell # failure in job https://hydra.nixos.org/build/302803068 at 2025-07-27 - gi-gtksheet # failure in job https://hydra.nixos.org/build/233211386 at 2023-09-02 - 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 @@ -2086,6 +2080,7 @@ broken-packages: - giak # failure in job https://hydra.nixos.org/build/233242229 at 2023-09-02 - gibberish # failure in job https://hydra.nixos.org/build/255688714 at 2024-04-16 - Gifcurry # failure in job https://hydra.nixos.org/build/233200204 at 2023-09-02 + - ginger2 # failure in job https://hydra.nixos.org/build/302803092 at 2025-07-27 - gingersnap # failure in job https://hydra.nixos.org/build/233227186 at 2023-09-02 - 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 @@ -2455,7 +2450,6 @@ broken-packages: - haskelldb-wx # failure in job https://hydra.nixos.org/build/233197525 at 2023-09-02 - HaskellForMaths # failure in job https://hydra.nixos.org/build/233237608 at 2023-09-02 - HaskellLM # failure in job https://hydra.nixos.org/build/233237641 at 2023-09-02 - - HaskellNet # failure in job https://hydra.nixos.org/build/295091001 at 2025-04-22 - HaskellNN # failure in job https://hydra.nixos.org/build/233209323 at 2023-09-02 - Haskelloids # failure in job https://hydra.nixos.org/build/233204861 at 2023-09-02 - haskellscrabble # failure in job https://hydra.nixos.org/build/233251248 at 2023-09-02 @@ -2471,7 +2465,6 @@ broken-packages: - haskoin # failure in job https://hydra.nixos.org/build/233201668 at 2023-09-02 - haskoin-store # failure in job https://hydra.nixos.org/build/299138382 at 2025-06-23 - haskoin-util # failure in job https://hydra.nixos.org/build/233222171 at 2023-09-02 - - haskoin-wallet # failure in job https://hydra.nixos.org/build/233206922 at 2023-09-02 - haskore-realtime # failure in job https://hydra.nixos.org/build/301391170 at 2025-07-01 - haskore-vintage # failure in job https://hydra.nixos.org/build/233230742 at 2023-09-02 - HaskRel # failure in job https://hydra.nixos.org/build/295090970 at 2025-04-22 @@ -2522,6 +2515,7 @@ broken-packages: - hbeat # failure in job https://hydra.nixos.org/build/233228628 at 2023-09-02 - hblas # failure in job https://hydra.nixos.org/build/233232561 at 2023-09-02 - hblock # failure in job https://hydra.nixos.org/build/233205351 at 2023-09-02 + - hblosc # failure in job https://hydra.nixos.org/build/302803521 at 2025-07-27 - hburg # failure in job https://hydra.nixos.org/build/233247429 at 2023-09-02 - hcad # failure in job https://hydra.nixos.org/build/233219976 at 2023-09-02 - HCard # failure in job https://hydra.nixos.org/build/233231922 at 2023-09-02 @@ -2561,6 +2555,7 @@ broken-packages: - heckle # failure in job https://hydra.nixos.org/build/233228954 at 2023-09-02 - heddit # failure in job https://hydra.nixos.org/build/233229058 at 2023-09-02 - hedgehog-checkers # failure in job https://hydra.nixos.org/build/233229405 at 2023-09-02 + - hedgehog-extras # failure in job https://hydra.nixos.org/build/302803553, https://github.com/input-output-hk/hedgehog-extras/issues/93 at 2025-07-27 - hedgehog-gen # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237243271 at 2023-10-21 - hedgehog-generic # failure in job https://hydra.nixos.org/build/233204695 at 2023-09-02 - hedgehog-golden # failure in job https://hydra.nixos.org/build/233219619 at 2023-09-02 @@ -2880,7 +2875,6 @@ broken-packages: - hs-scrape # failure in job https://hydra.nixos.org/build/233244221 at 2023-09-02 - hs-server-starter # failure in job https://hydra.nixos.org/build/295094379 at 2025-04-22 - hs-snowtify # failure in job https://hydra.nixos.org/build/233200511 at 2023-09-02 - - hs-speedscope # failure in job https://hydra.nixos.org/build/295094385 at 2025-04-22 - hs-tags # failure in job https://hydra.nixos.org/build/233258358 at 2023-09-02 - hs-tango # failure in job https://hydra.nixos.org/build/276377558 at 2024-11-06 - hs-term-emulator # failure in job https://hydra.nixos.org/build/233252262 at 2023-09-02 @@ -3134,6 +3128,7 @@ broken-packages: - IDynamic # failure in job https://hydra.nixos.org/build/233196222 at 2023-09-02 - ieee-utils # failure in job https://hydra.nixos.org/build/233224430 at 2023-09-02 - iexcloud # failure in job https://hydra.nixos.org/build/233224874 at 2023-09-02 + - if-instance # failure in job https://hydra.nixos.org/build/302803982 at 2025-07-27 - ifcxt # failure in job https://hydra.nixos.org/build/233196911 at 2023-09-02 - IFS # failure in job https://hydra.nixos.org/build/233246865 at 2023-09-02 - ig # failure in job https://hydra.nixos.org/build/233203872 at 2023-09-02 @@ -3221,7 +3216,6 @@ broken-packages: - interspersed # failure in job https://hydra.nixos.org/build/252722645 at 2024-03-16 - interval # failure in job https://hydra.nixos.org/build/233239434 at 2023-09-02 - interval-algebra # failure in job https://hydra.nixos.org/build/233208487 at 2023-09-02 - - interval-patterns # failure in job https://hydra.nixos.org/build/239259401 at 2023-11-10 - interval-tree-clock # failure in job https://hydra.nixos.org/build/233234316 at 2023-09-02 - IntFormats # failure in job https://hydra.nixos.org/build/233195190 at 2023-09-02 - intricacy # failure in job https://hydra.nixos.org/build/252711846 at 2024-03-16 @@ -3259,7 +3253,6 @@ broken-packages: - isdicom # failure in job https://hydra.nixos.org/build/233214249 at 2023-09-02 - IsNull # failure in job https://hydra.nixos.org/build/233233011 at 2023-09-02 - iso-deriving # failure in job https://hydra.nixos.org/build/252738238 at 2024-03-16 - - iso8601-duration # failure in job https://hydra.nixos.org/build/233190968 at 2023-09-02 - isobmff # failure in job https://hydra.nixos.org/build/233237273 at 2023-09-02 - isotope # failure in job https://hydra.nixos.org/build/233204650 at 2023-09-02 - it-has # failure in job https://hydra.nixos.org/build/233212395 at 2023-09-02 @@ -3332,6 +3325,7 @@ broken-packages: - json-qq # failure in job https://hydra.nixos.org/build/233196259 at 2023-09-02 - json-rpc-generic # failure in job https://hydra.nixos.org/build/233201371 at 2023-09-02 - json-rpc-server # failure in job https://hydra.nixos.org/build/233201284 at 2023-09-02 + - json-schema # failure in job https://hydra.nixos.org/build/303231342 at 2025-07-27 - json-syntax # failure in job https://hydra.nixos.org/build/233250639 at 2023-09-02 - json-to-haskell # failure in job https://hydra.nixos.org/build/252711573 at 2024-03-16 - json-to-type # failure in job https://hydra.nixos.org/build/275143966 at 2024-10-21 @@ -3658,6 +3652,7 @@ broken-packages: - llvm-base # failure in job https://hydra.nixos.org/build/233244366 at 2023-09-02 - llvm-codegen # failure in job https://hydra.nixos.org/build/295095119 at 2025-04-22 - llvm-extension # failure in job https://hydra.nixos.org/build/266355631 at 2024-07-14 + - llvm-extra # failure in job https://hydra.nixos.org/build/303481607 at 2025-07-27 - llvm-general-pure # failure in job https://hydra.nixos.org/build/233246430 at 2023-09-02 - llvm-hs # failure in job https://hydra.nixos.org/build/233205149 at 2023-09-02 - llvm-hs-pure # failure in job https://hydra.nixos.org/build/252721738 at 2024-03-16 @@ -3810,6 +3805,8 @@ broken-packages: - mcm # failure in job https://hydra.nixos.org/build/233229087 at 2023-09-02 - mcmaster-gloss-examples # failure in job https://hydra.nixos.org/build/234457610 at 2023-09-13 - mcmc-synthesis # failure in job https://hydra.nixos.org/build/233208414 at 2023-09-02 + - mcp # failure in job https://hydra.nixos.org/build/302804588 at 2025-07-27 + - mcp-server # failure in job https://hydra.nixos.org/build/302804602 at 2025-07-27 - mcpi # failure in job https://hydra.nixos.org/build/233231465 at 2023-09-02 - mdapi # failure in job https://hydra.nixos.org/build/233257724 at 2023-09-02 - mdcat # failure in job https://hydra.nixos.org/build/233249429 at 2023-09-02 @@ -3995,7 +3992,6 @@ broken-packages: - monoid-absorbing # failure in job https://hydra.nixos.org/build/233236465 at 2023-09-02 - monoid-owns # failure in job https://hydra.nixos.org/build/233259043 at 2023-09-02 - monoidmap # failure in job https://hydra.nixos.org/build/295095498 at 2025-04-22 - - monoidmap-internal # failure in job https://hydra.nixos.org/build/295095513 at 2025-04-22 - monoidplus # failure in job https://hydra.nixos.org/build/233226759 at 2023-09-02 - monoids # failure in job https://hydra.nixos.org/build/233231684 at 2023-09-02 - monopati # failure in job https://hydra.nixos.org/build/233234119 at 2023-09-02 @@ -4017,6 +4013,7 @@ broken-packages: - movie-monad # failure in job https://hydra.nixos.org/build/233215402 at 2023-09-02 - mpppc # failure in job https://hydra.nixos.org/build/233223008 at 2023-09-02 - mpris # failure in job https://hydra.nixos.org/build/233259241 at 2023-09-02 + - mptcp-pm # failure in job https://hydra.nixos.org/build/303231350 at 2025-07-27 - mpvguihs # failure in job https://hydra.nixos.org/build/233196650 at 2023-09-02 - mqtt # failure in job https://hydra.nixos.org/build/233202067 at 2023-09-02 - mqtt-hs # failure in job https://hydra.nixos.org/build/233239399 at 2023-09-02 @@ -4026,7 +4023,8 @@ broken-packages: - ms-auth # failure in job https://hydra.nixos.org/build/233193383 at 2023-09-02 - ms-azure-api # failure in job https://hydra.nixos.org/build/233202229 at 2023-09-02 - ms-graph-api # failure in job https://hydra.nixos.org/build/233219042 at 2023-09-02 - - msgpack # failure in job https://hydra.nixos.org/build/233258131 at 2023-09-02 + - msgpack-aeson # failure in job https://hydra.nixos.org/build/303231349 at 2025-07-27 + - msgpack-rpc # failure in job https://hydra.nixos.org/build/303231348 at 2025-07-27 - msgpack-types # failure in job https://hydra.nixos.org/build/233235351 at 2023-09-02 - msh # failure in job https://hydra.nixos.org/build/233196466 at 2023-09-02 - MTGBuilder # failure in job https://hydra.nixos.org/build/233227528 at 2023-09-02 @@ -4273,7 +4271,6 @@ broken-packages: - ohhecs # failure in job https://hydra.nixos.org/build/267987310 at 2024-07-31 - ohloh-hs # failure in job https://hydra.nixos.org/build/233228177 at 2023-09-02 - oi # failure in job https://hydra.nixos.org/build/233190838 at 2023-09-02 - - oidc-client # failure in job https://hydra.nixos.org/build/295095776 at 2025-04-22 - okapi # failure in job https://hydra.nixos.org/build/233193822 at 2023-09-02 - old-version # failure in job https://hydra.nixos.org/build/233198538 at 2023-09-02 - ollama-haskell # failure in job https://hydra.nixos.org/build/276371507 at 2024-11-06 @@ -4331,7 +4328,6 @@ broken-packages: - openssh-protocol # failure in job https://hydra.nixos.org/build/233196013 at 2023-09-02 - opentelemetry-extra # failure in job https://hydra.nixos.org/build/233194254 at 2023-09-02 - opentelemetry-http-client # failure in job https://hydra.nixos.org/build/233221983 at 2023-09-02 - - opentelemetry-plugin # failure in job https://hydra.nixos.org/build/295095836 at 2025-04-22 - opentheory-char # failure in job https://hydra.nixos.org/build/233222347 at 2023-09-02 - opentype # failure in job https://hydra.nixos.org/build/233213443 at 2023-09-02 - OpenVGRaw # failure in job https://hydra.nixos.org/build/233254457 at 2023-09-02 @@ -4389,12 +4385,14 @@ broken-packages: - overloaded-records # failure in job https://hydra.nixos.org/build/233235922 at 2023-09-02 - overture # failure in job https://hydra.nixos.org/build/233245959 at 2023-09-02 - owoify-hs # failure in job https://hydra.nixos.org/build/233213422 at 2023-09-02 + - ox-arrays # failure in job https://hydra.nixos.org/build/302805170 at 2025-07-27 - pa-field-parser # failure in job https://hydra.nixos.org/build/295095885 at 2025-04-22 - pack # failure in job https://hydra.nixos.org/build/233243562 at 2023-09-02 - package-description-remote # failure in job https://hydra.nixos.org/build/233221358 at 2023-09-02 - package-vt # failure in job https://hydra.nixos.org/build/233225831 at 2023-09-02 - packdeps # failure in job https://hydra.nixos.org/build/233216607 at 2023-09-02 - packed # failure in job https://hydra.nixos.org/build/233231889 at 2023-09-02 + - packed-data # failure in job https://hydra.nixos.org/build/302805203 at 2025-07-27 - packed-dawg # failure in job https://hydra.nixos.org/build/233207332 at 2023-09-02 - packed-multikey-map # failure in job https://hydra.nixos.org/build/233234157 at 2023-09-02 - packedstring # failure in job https://hydra.nixos.org/build/233240511 at 2023-09-02 @@ -4690,6 +4688,7 @@ broken-packages: - plural # failure in job https://hydra.nixos.org/build/233198934 at 2023-09-02 - ply-loader # failure in job https://hydra.nixos.org/build/252720663 at 2024-03-16 - plzwrk # failure in job https://hydra.nixos.org/build/233219630 at 2023-09-02 + - pms-domain-model # failure in job https://hydra.nixos.org/build/302805399 at 2025-07-27 - pngload-fixed # failure in job https://hydra.nixos.org/build/233233956 at 2023-09-02 - pocket # failure in job https://hydra.nixos.org/build/233244120 at 2023-09-02 - podenv # failure in job https://hydra.nixos.org/build/233210257 at 2023-09-02 @@ -4738,7 +4737,6 @@ broken-packages: - pontarius-xpmn # failure in job https://hydra.nixos.org/build/233217546 at 2023-09-02 - pool # failure in job https://hydra.nixos.org/build/233205364 at 2023-09-02 - pool-conduit # failure in job https://hydra.nixos.org/build/233246643 at 2023-09-02 - - poolboy # failure in job https://hydra.nixos.org/build/233195085 at 2023-09-02 - pop3-client # failure in job https://hydra.nixos.org/build/233251475 at 2023-09-02 - popkey # failure in job https://hydra.nixos.org/build/233203892 at 2023-09-02 - poppler # failure in job https://hydra.nixos.org/build/233196044 at 2023-09-02 @@ -4978,7 +4976,6 @@ broken-packages: - quickbooks # failure in job https://hydra.nixos.org/build/233227666 at 2023-09-02 - quickcheck-arbitrary-template # failure in job https://hydra.nixos.org/build/233223045 at 2023-09-02 - quickcheck-combinators # failure in job https://hydra.nixos.org/build/233209131 at 2023-09-02 - - quickcheck-lockstep # failure in job https://hydra.nixos.org/build/295096463 at 2025-04-22 - quickcheck-property-comb # failure in job https://hydra.nixos.org/build/233204877 at 2023-09-02 - quickcheck-property-monad # failure in job https://hydra.nixos.org/build/233228775 at 2023-09-02 - quickcheck-rematch # failure in job https://hydra.nixos.org/build/233205449 at 2023-09-02 @@ -5129,6 +5126,7 @@ broken-packages: - regexqq # failure in job https://hydra.nixos.org/build/233233149 at 2023-09-02 - regions # failure in job https://hydra.nixos.org/build/233196483 at 2023-09-02 - register-machine-typelevel # failure in job https://hydra.nixos.org/build/233217514 at 2023-09-02 + - registry-messagepack # failure in job https://hydra.nixos.org/build/303231364 at 2025-07-27 - registry-options # failure in job https://hydra.nixos.org/build/295096594 at 2025-04-22 - regress # failure in job https://hydra.nixos.org/build/233208901 at 2023-09-02 - regular # failure in job https://hydra.nixos.org/build/233232656 at 2023-09-02 @@ -5400,7 +5398,6 @@ broken-packages: - 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 - - servant-cli # failure in job https://hydra.nixos.org/build/233259212 at 2023-09-02 - servant-client-js # failure in job https://hydra.nixos.org/build/233194725 at 2023-09-02 - servant-combinators # failure in job https://hydra.nixos.org/build/233249924 at 2023-09-02 - servant-db # failure in job https://hydra.nixos.org/build/233234946 at 2023-09-02 @@ -5408,6 +5405,7 @@ broken-packages: - servant-docs-simple # failure in job https://hydra.nixos.org/build/233237374 at 2023-09-02 - servant-ekg # failure in job https://hydra.nixos.org/build/295096851 at 2025-04-22 - servant-errors # failure in job https://hydra.nixos.org/build/233239712 at 2023-09-02 + - servant-event-stream # failure in job https://hydra.nixos.org/build/302806100 at 2025-07-27 - servant-gdp # failure in job https://hydra.nixos.org/build/233191664 at 2023-09-02 - servant-generate # failure in job https://hydra.nixos.org/build/233199452 at 2023-09-02 - servant-generic # failure in job https://hydra.nixos.org/build/233211338 at 2023-09-02 @@ -5442,7 +5440,6 @@ broken-packages: - servant-to-elm # failure in job https://hydra.nixos.org/build/253681347 at 2024-03-31 - servant-tracing # failure in job https://hydra.nixos.org/build/233229308 at 2023-09-02 - servant-typed-error # failure in job https://hydra.nixos.org/build/252727241 at 2024-03-16 - - servant-typescript # failure in job https://hydra.nixos.org/build/253932573 at 2024-03-31 - servant-util # failure in job https://hydra.nixos.org/build/252729690 at 2024-03-16 - servant-wasm # failure in job https://hydra.nixos.org/build/233191644 at 2023-09-02 - servant-xml-conduit # failure in job https://hydra.nixos.org/build/243828707 at 2024-01-01 @@ -5591,6 +5588,7 @@ broken-packages: - skemmtun # failure in job https://hydra.nixos.org/build/233223893 at 2023-09-02 - sketch-frp-copilot # copilot >=4.3 && <4.4, - skew-list # failure in job https://hydra.nixos.org/build/295097034 at 2025-04-22 + - skews # time out in job https://hydra.nixos.org/build/302806286 at 2025-07-27 - skopedate # failure in job https://hydra.nixos.org/build/233220634 at 2023-09-02 - skulk # failure in job https://hydra.nixos.org/build/233258672 at 2023-09-02 - skylighting-extensions # failure in job https://hydra.nixos.org/build/233221387 at 2023-09-02 @@ -5682,6 +5680,7 @@ broken-packages: - socketed # failure in job https://hydra.nixos.org/build/233210087 at 2023-09-02 - socketio # failure in job https://hydra.nixos.org/build/233214659 at 2023-09-02 - sockets # failure in job https://hydra.nixos.org/build/295097095 at 2025-04-22 + - socks5 # failure in job https://hydra.nixos.org/build/302806344 at 2025-07-27 - sodium # failure in job https://hydra.nixos.org/build/233213989 at 2023-09-02 - soegtk # failure in job https://hydra.nixos.org/build/233198991 at 2023-09-02 - softfloat-hs # failure in job https://hydra.nixos.org/build/233205242 at 2023-09-02 @@ -5691,6 +5690,7 @@ broken-packages: - sonic-visualiser # failure in job https://hydra.nixos.org/build/233257956 at 2023-09-02 - Sonnex # failure in job https://hydra.nixos.org/build/233229367 at 2023-09-02 - SoOSiM # failure in job https://hydra.nixos.org/build/233224114 at 2023-09-02 + - sop-satisfier # failure in job https://hydra.nixos.org/build/302806351 at 2025-07-27 - sorted # failure in job https://hydra.nixos.org/build/233222633 at 2023-09-02 - sorting # failure in job https://hydra.nixos.org/build/233214204 at 2023-09-02 - sorty # failure in job https://hydra.nixos.org/build/233211118 at 2023-09-02 @@ -5978,7 +5978,6 @@ broken-packages: - system-test # failure in job https://hydra.nixos.org/build/233240318 at 2023-09-02 - systemd-ntfy # failure in job https://hydra.nixos.org/build/236686880 at 2023-10-04 - systemd-socket-activation # failure in job https://hydra.nixos.org/build/295097415 at 2025-04-22 - - systranything # failure in job https://hydra.nixos.org/build/295097462 at 2025-04-22 - t-regex # failure in job https://hydra.nixos.org/build/233254486 at 2023-09-02 - t3-server # failure in job https://hydra.nixos.org/build/233220511 at 2023-09-02 - table # failure in job https://hydra.nixos.org/build/233223186 at 2023-09-02 @@ -6023,6 +6022,7 @@ broken-packages: - 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 + - tasty-papi # failure in job https://hydra.nixos.org/build/302806735, https://github.com/Shimuuar/tasty-papi/issues/4#issuecomment-3123432375 at 2025-07-27 - tasty-process # failure in job https://hydra.nixos.org/build/253680638 at 2024-03-31 - tasty-stats # failure in job https://hydra.nixos.org/build/233228752 at 2023-09-02 - tasty-test-reporter # failure in job https://hydra.nixos.org/build/233208181 at 2023-09-02 @@ -6184,7 +6184,6 @@ broken-packages: - tiger # failure in job https://hydra.nixos.org/build/233249333 at 2023-09-02 - TigerHash # failure in job https://hydra.nixos.org/build/233208162 at 2023-09-02 - tightrope # failure in job https://hydra.nixos.org/build/233215237 at 2023-09-02 - - tiktoken # failure in job https://hydra.nixos.org/build/273448419 at 2024-10-01 - tikzsd # failure in job https://hydra.nixos.org/build/233224431 at 2023-09-02 - time-extras # failure in job https://hydra.nixos.org/build/233204030 at 2023-09-02 - time-parsers # failure in job https://hydra.nixos.org/build/295097665 at 2025-04-22 @@ -6328,6 +6327,7 @@ broken-packages: - turing-music # failure in job https://hydra.nixos.org/build/233203435 at 2023-09-02 - turtle-options # failure in job https://hydra.nixos.org/build/233255831 at 2023-09-02 - tweak # failure in job https://hydra.nixos.org/build/233211020 at 2023-09-02 + - twee # failure in job https://hydra.nixos.org/build/302807024 at 2025-07-27 - twentefp-websockets # failure in job https://hydra.nixos.org/build/233207022 at 2023-09-02 - twhs # failure in job https://hydra.nixos.org/build/233201182 at 2023-09-02 - twilio # failure in job https://hydra.nixos.org/build/233199959 at 2023-09-02 @@ -6383,6 +6383,7 @@ broken-packages: - typed-wire # failure in job https://hydra.nixos.org/build/233237626 at 2023-09-02 - typedquery # failure in job https://hydra.nixos.org/build/233215307 at 2023-09-02 - typehash # failure in job https://hydra.nixos.org/build/233207184 at 2023-09-02 + - typelet # failure in job https://hydra.nixos.org/build/302807072 at 2025-07-27 - typelevel-rewrite-rules # failure in job https://hydra.nixos.org/build/233243365 at 2023-09-02 - typelevel-tensor # failure in job https://hydra.nixos.org/build/233190827 at 2023-09-02 - typeparams # failure in job https://hydra.nixos.org/build/233192078 at 2023-09-02 @@ -6763,6 +6764,7 @@ broken-packages: - X11-xfixes # failure in job https://hydra.nixos.org/build/233256494 at 2023-09-02 - x86-64bit # failure in job https://hydra.nixos.org/build/252737465 at 2024-03-16 - xcffib # failure in job https://hydra.nixos.org/build/295098351 at 2025-04-22 + - xcframework # failure in job https://hydra.nixos.org/build/302807506 at 2025-07-27 - xchat-plugin # failure in job https://hydra.nixos.org/build/233238679 at 2023-09-02 - xcp # failure in job https://hydra.nixos.org/build/233208926 at 2023-09-02 - Xec # failure in job https://hydra.nixos.org/build/233191564 at 2023-09-02 @@ -6789,7 +6791,7 @@ broken-packages: - xml-extractors # failure in job https://hydra.nixos.org/build/252718569 at 2024-03-16 - xml-html-conduit-lens # failure in job https://hydra.nixos.org/build/233238471 at 2023-09-02 - xml-indexed-cursor # failure in job https://hydra.nixos.org/build/295098303 at 2025-04-22 - - xml-lens # failure in job https://hydra.nixos.org/build/295098347 at 2025-04-22 + - xml-isogen # failure in job https://hydra.nixos.org/build/303231372 at 2025-07-27 - xml-parsec # failure in job https://hydra.nixos.org/build/233208461 at 2023-09-02 - xml-parser # failure in job https://hydra.nixos.org/build/252721082 at 2024-03-16 - xml-prettify # failure in job https://hydra.nixos.org/build/233225974 at 2023-09-02 @@ -6809,6 +6811,7 @@ broken-packages: - xmonad-vanessa # failure in job https://hydra.nixos.org/build/233214303 at 2023-09-02 - xmonad-wallpaper # failure in job https://hydra.nixos.org/build/233217165 at 2023-09-02 - xmonad-windownames # failure in job https://hydra.nixos.org/build/233258043 at 2023-09-02 + - xnobar # failure in job https://hydra.nixos.org/build/302807518 at 2025-07-27 - xorshift-plus # failure in job https://hydra.nixos.org/build/233255176 at 2023-09-02 - Xorshift128Plus # failure in job https://hydra.nixos.org/build/233225679 at 2023-09-02 - xsact # failure in job https://hydra.nixos.org/build/233221821 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 11b6d196b68c4..11b1ddd1a08f7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -31,6 +31,8 @@ default-package-overrides: - extensions < 0.1.0.2 # Incompatible with Cabal < 3.12, the newest extensions version is only needed on ghc 9.10 # 2021-11-09: ghc-bignum is bundled starting with 9.0.1; only 1.0 builds with GHCs prior to 9.2.1 - ghc-bignum == 1.0 + # 2025-07-26: HLS doesn't support hiedb >= 0.7 yet + - hiedb < 0.7 # 2024-08-17: Stackage doesn't contain hnix-store-core >= 0.8 yet, so we need to restrict hnix-store-remote - hnix-store-remote < 0.7 # 2025-01-17: need to match stackage version of hosc @@ -94,7 +96,6 @@ extra-packages: - hlint == 3.4.1 # 2022-09-21: preserve for ghc 8.10 - hlint == 3.6.* # 2025-04-14: needed for hls with ghc-lib-parser 9.6 - hnix-store-core < 0.7 # 2023-12-11: required by hnix-store-remote 0.6 - - hpack == 0.38.0 # 2025-04-23: preserve for stack == 3.5.1 - hspec < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - hspec-core < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 @@ -109,7 +110,6 @@ extra-packages: - ormolu == 0.5.2.0 # 2023-08-08: preserve for ghc 9.0 - ormolu == 0.7.2.0 # 2023-11-13: for ghc-lib-parser 9.6 compat - ormolu == 0.7.7.0 # 2025-01-27: for ghc 9.10 compat - - persistent-test < 2.13.1.4 # 2025-06-04: incompatible with persistent < 2.16, see conf*-common.nix - postgresql-binary < 0.14 # 2025-01-19: Needed for building postgrest - primitive-unlifted == 0.1.3.1 # 2024-03-16: preserve for ghc 9.2 - retrie < 1.2.0.0 # 2022-12-30: preserve for ghc < 9.2 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 338c7fde2257f..16b83fc122c7e 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 23.24 +# Stackage LTS 23.27 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -107,7 +107,7 @@ default-package-overrides: - attoparsec-binary ==0.2 - attoparsec-data ==1.0.5.4 - attoparsec-expr ==0.1.1.2 - - attoparsec-framer ==0.1.0.9 + - attoparsec-framer ==0.1.0.10 - attoparsec-iso8601 ==1.1.1.0 - attoparsec-path ==0.0.0.1 - attoparsec-time ==1.0.3.1 @@ -133,7 +133,7 @@ default-package-overrides: - aws-xray-client ==0.1.0.2 - aws-xray-client-persistent ==0.1.0.5 - aws-xray-client-wai ==0.1.0.2 - - backprop ==0.2.6.5 + - backprop ==0.2.7.2 - backtracking ==0.1.0 - bank-holiday-germany ==1.3.1.0 - bank-holidays-england ==0.2.0.11 @@ -161,12 +161,12 @@ default-package-overrides: - bcp47 ==0.2.0.6 - bcp47-orphans ==0.1.0.6 - bcrypt ==0.0.11 - - beam-core ==0.10.3.1 + - beam-core ==0.10.4.0 - beam-migrate ==0.5.3.1 - beam-postgres ==0.5.4.2 - beam-sqlite ==0.5.4.0 - - bech32 ==1.1.8 - - bech32-th ==1.1.8 + - bech32 ==1.1.9 + - bech32-th ==1.1.9 - bench-show ==0.3.2 - benchpress ==0.2.2.25 - bencode ==0.6.1.1 @@ -252,12 +252,12 @@ default-package-overrides: - bson-lens ==0.1.1 - btrfs ==0.2.1.0 - buffer-pipe ==0.0 - - bugsnag ==1.1.0.1 + - bugsnag ==1.1.0.2 - bugsnag-hs ==0.2.0.12 - - bugsnag-wai ==1.0.0.1 + - bugsnag-wai ==1.0.1.1 - bugsnag-yesod ==1.0.1.0 - bugzilla-redhat ==1.0.1.1 - - burrito ==2.0.1.13 + - burrito ==2.0.1.14 - bv ==0.5 - bv-little ==1.3.2 - bv-sized ==1.0.6 @@ -270,7 +270,7 @@ default-package-overrides: - byteorder ==1.0.4 - bytes ==0.17.4 - byteset ==0.1.1.2 - - byteslice ==0.2.14.0 + - byteslice ==0.2.15.0 - bytesmith ==0.3.11.1 - bytestring-builder ==0.10.8.2.0 - bytestring-conversion ==0.3.2 @@ -292,14 +292,14 @@ default-package-overrides: - cabal-add ==0.1 - cabal-appimage ==0.4.1.0 - cabal-clean ==0.2.20230609 - - cabal-debian ==5.2.5 + - cabal-debian ==5.2.6 - cabal-doctest ==1.0.11 - cabal-file ==0.1.1 - cabal-fix ==0.1.0.0 - cabal-flatpak ==0.1.2 - cabal-gild ==1.5.0.3 - cabal-install-parsers ==0.6.1.1 - - cabal-plan ==0.7.5.0 + - cabal-plan ==0.7.6.0 - cabal-rpm ==2.2.1 - cabal-sort ==0.1.2.1 - cabal2spec ==2.7.1 @@ -322,7 +322,7 @@ default-package-overrides: - cased ==0.1.0.0 - cases ==0.1.4.4 - casing ==0.1.4.1 - - cassava ==0.5.3.2 + - cassava ==0.5.4.0 - cassava-conduit ==0.6.6 - cassava-megaparsec ==2.1.1 - cast ==0.1.0.2 @@ -347,7 +347,7 @@ default-package-overrides: - Chart-cairo ==1.9.4.1 - Chart-diagrams ==1.9.5.1 - chart-svg ==0.7.0.0 - - ChasingBottoms ==1.3.1.15 + - ChasingBottoms ==1.3.1.16 - check-email ==1.0.2 - checkers ==0.6.0 - checksum ==0.0.0.1 @@ -413,7 +413,7 @@ default-package-overrides: - commutative-semigroups ==0.2.0.2 - comonad ==5.0.9 - compact ==0.2.0.0 - - compactmap ==0.1.4.5 + - compactmap ==0.1.4.6 - companion ==0.1.0 - compdata ==0.13.1 - compensated ==0.8.3 @@ -437,7 +437,7 @@ default-package-overrides: - conduit-algorithms ==0.0.14.0 - conduit-combinators ==1.3.0 - conduit-concurrent-map ==0.1.4 - - conduit-extra ==1.3.7 + - conduit-extra ==1.3.8 - conduit-parse ==0.2.1.1 - conduit-zstd ==0.0.2.0 - conferer ==1.1.0.0 @@ -671,7 +671,7 @@ default-package-overrides: - doctest ==0.22.6 - doctest-discover ==0.2.0.0 - doctest-driver-gen ==0.3.0.8 - - doctest-exitcode-stdio ==0.0 + - doctest-exitcode-stdio ==0.0.0.1 - doctest-extract ==0.1.2 - doctest-lib ==0.1.1.1 - doctest-parallel ==0.3.1.1 @@ -717,10 +717,10 @@ default-package-overrides: - effectful-plugin ==1.1.0.4 - effectful-th ==1.0.0.3 - egison-pattern-src ==0.2.1.2 - - either ==5.0.2 + - either ==5.0.3 - either-unwrap ==1.1 - ekg ==0.4.1.2 - - ekg-core ==0.1.1.8 + - ekg-core ==0.1.2.0 - ekg-json ==0.1.1.1 - ekg-statsd ==0.2.6.2 - elerea ==2.9.0 @@ -792,7 +792,7 @@ default-package-overrides: - explainable-predicates ==0.1.2.4 - explicit-exception ==0.2 - express ==1.0.18 - - extended-reals ==0.2.6.0 + - extended-reals ==0.2.7.0 - extensible ==0.9.2 - extensible-effects ==5.0.0.1 - extensible-exceptions ==0.1.1.4 @@ -809,7 +809,7 @@ default-package-overrides: - falsify ==0.2.0 - fast-builder ==0.1.5.0 - fast-digits ==0.3.2.0 - - fast-logger ==3.2.5 + - fast-logger ==3.2.6 - fast-math ==1.0.2 - fast-myers-diff ==0.0.1 - fcf-family ==0.2.0.2 @@ -817,7 +817,7 @@ default-package-overrides: - feature-flags ==0.1.0.1 - fedora-krb ==0.1.0 - fedora-releases ==0.2.1 - - fedora-repoquery ==0.7.2 + - fedora-repoquery ==0.7.3 - feed ==1.3.2.1 - FenwickTree ==0.1.2.1 - fft ==0.1.8.7 @@ -867,7 +867,7 @@ default-package-overrides: - focus ==1.0.3.2 - focuslist ==0.1.1.0 - fold-debounce ==0.2.0.16 - - foldable1-classes-compat ==0.1.1 + - foldable1-classes-compat ==0.1.2 - foldl ==1.4.18 - folds ==0.7.8 - FontyFruity ==0.5.3.5 @@ -879,7 +879,7 @@ default-package-overrides: - format-numbers ==0.1.0.1 - formatn ==0.3.1.0 - formatting ==7.2.0 - - fortran-src ==0.16.5 + - fortran-src ==0.16.7 - foundation ==0.0.30 - fourmolu ==0.15.0.0 - Frames ==0.7.4.2 @@ -901,7 +901,7 @@ default-package-overrides: - funcmp ==1.9 - function-builder ==0.3.0.1 - functor-classes-compat ==2.0.0.2 - - functor-combinators ==0.4.1.3 + - functor-combinators ==0.4.1.4 - functor-products ==0.1.2.2 - fused-effects ==1.1.2.5 - fusion-plugin ==0.2.7 @@ -1012,7 +1012,7 @@ default-package-overrides: - gi-gdkx11 ==3.0.17 - gi-gdkx113 ==3.0.17 - gi-gdkx114 ==4.0.9 - - gi-gio ==2.0.37 + - gi-gio ==2.0.38 - gi-glib ==2.0.30 - gi-gmodule ==2.0.6 - gi-gobject ==2.0.31 @@ -1066,15 +1066,15 @@ default-package-overrides: - gpolyline ==0.1.0.1 - graph-core ==0.3.0.0 - graphite ==0.10.0.1 - - graphql ==1.5.0.0 + - graphql ==1.5.0.1 - graphql-client ==1.2.4 - graphql-spice ==1.0.6.0 - graphs ==0.7.3 - - graphula ==2.1.0.1 + - graphula ==2.1.2.0 - graphviz ==2999.20.2.1 - gravatar ==0.8.1 - greskell ==2.0.3.3 - - greskell-core ==1.0.0.4 + - greskell-core ==1.0.0.6 - greskell-websocket ==1.0.0.4 - gridtables ==0.1.0.0 - grisette ==0.9.0.0 @@ -1087,15 +1087,15 @@ default-package-overrides: - gtk2hs-buildtools ==0.13.12.0 - gtk3 ==0.15.10 - guarded-allocation ==0.0.1 - - hackage-cli ==0.1.0.2 - - hackage-security ==0.6.3.0 + - hackage-cli ==0.1.0.3 + - hackage-security ==0.6.3.1 - hackage-security-HTTP ==0.1.1.2 - haddock-library ==1.11.0 - haha ==0.3.1.1 - hakyll ==4.16.6.0 - hakyll-convert ==0.3.0.5 - hal ==1.1 - - half ==0.3.2 + - half ==0.3.3 - hall-symbols ==0.1.0.6 - hamlet ==1.2.0 - hamtsolo ==1.0.4 @@ -1115,8 +1115,8 @@ default-package-overrides: - hashids ==1.1.1.0 - hashmap ==1.3.3 - hashtables ==1.3.1 - - haskell-gi ==0.26.15 - - haskell-gi-base ==0.26.8 + - haskell-gi ==0.26.16 + - haskell-gi-base ==0.26.9 - haskell-gi-overloading ==1.0 - haskell-lexer ==1.1.2 - haskell-src ==1.0.4.1 @@ -1211,6 +1211,7 @@ default-package-overrides: - HMock ==0.5.1.2 - hmpfr ==0.4.5 - hnix-store-core ==0.8.0.0 + - hoare ==0.1.1.0 - hoauth2 ==2.14.0 - hoogle ==5.0.18.4 - hopenssl ==2.2.5 @@ -1256,12 +1257,12 @@ default-package-overrides: - hslua-core ==2.3.2 - hslua-list ==1.1.4 - hslua-marshalling ==2.3.1 - - hslua-module-doclayout ==1.2.0 + - hslua-module-doclayout ==1.2.0.1 - hslua-module-path ==1.1.1 - hslua-module-system ==1.1.3 - hslua-module-text ==1.1.1 - hslua-module-version ==1.1.1 - - hslua-module-zip ==1.1.3 + - hslua-module-zip ==1.1.4 - hslua-objectorientation ==2.3.1 - hslua-packaging ==2.3.1 - hslua-repl ==0.1.2 @@ -1330,7 +1331,7 @@ default-package-overrides: - http-semantics ==0.3.0 - http-streams ==0.8.9.9 - http-types ==0.12.4 - - http2 ==5.3.9 + - http2 ==5.3.10 - httpd-shed ==0.4.1.2 - human-readable-duration ==0.2.1.4 - HUnit ==1.6.2.0 @@ -1433,7 +1434,7 @@ default-package-overrides: - io-streams ==1.5.2.2 - io-streams-haproxy ==1.0.1.0 - ip ==1.7.8 - - ip6addr ==2.0.0 + - ip6addr ==2.0.0.1 - iproute ==1.7.15 - IPv6Addr ==2.0.6.1 - IPv6DB ==0.3.3.4 @@ -1479,7 +1480,7 @@ default-package-overrides: - JuicyPixels-scale-dct ==0.1.2 - junit-xml ==0.1.0.4 - justified-containers ==0.3.0.0 - - kan-extensions ==5.2.6 + - kan-extensions ==5.2.7 - kansas-comet ==0.4.3 - katip ==0.8.8.2 - katip-logstash ==0.1.0.2 @@ -1543,13 +1544,13 @@ default-package-overrides: - leapseconds-announced ==2017.1.0.1 - learn-physics ==0.6.7 - leb128-cereal ==1.2 - - lens ==5.3.4 + - lens ==5.3.5 - lens-action ==0.2.6 - lens-aeson ==1.2.3 - lens-csv ==0.1.1.0 - lens-family ==2.1.3 - lens-family-core ==2.1.3 - - lens-family-th ==0.5.3.1 + - lens-family-th ==0.5.3.2 - lens-misc ==0.0.2.0 - lens-properties ==4.11.1 - lens-regex ==0.1.3 @@ -1568,7 +1569,7 @@ default-package-overrides: - lift-type ==0.1.2.0 - lifted-async ==0.10.2.7 - lifted-base ==0.2.3.12 - - linear ==1.23.1 + - linear ==1.23.2 - linear-base ==0.4.0 - linear-circuit ==0.1.0.4 - linear-generics ==0.2.3 @@ -1593,7 +1594,7 @@ default-package-overrides: - locators ==0.3.0.5 - loch-th ==0.2.2 - lockfree-queue ==0.2.4 - - log-base ==0.12.0.1 + - log-base ==0.12.1.0 - log-domain ==0.13.2 - logfloat ==0.14.0 - logger-thread ==0.1.0.2 @@ -1635,7 +1636,7 @@ default-package-overrides: - markov-chain ==0.0.3.4 - markov-chain-usage-model ==0.0.0 - markup-parse ==0.1.1.1 - - massiv ==1.0.4.1 + - massiv ==1.0.5.0 - massiv-io ==1.0.0.1 - massiv-serialise ==1.0.0.2 - massiv-test ==1.1.0.1 @@ -1709,7 +1710,7 @@ default-package-overrides: - mmark ==0.0.8.0 - mmark-cli ==0.0.5.2 - mmark-ext ==0.2.1.5 - - mmorph ==1.2.0 + - mmorph ==1.2.1 - mnist-idx ==0.1.3.2 - mnist-idx-conduit ==0.4.0.0 - mockcat ==0.5.2.0 @@ -1812,7 +1813,7 @@ default-package-overrides: - nanospec ==0.2.2 - nanovg ==0.8.1.0 - nats ==1.1.2 - - natural-arithmetic ==0.2.2.0 + - natural-arithmetic ==0.2.3.0 - natural-induction ==0.2.0.0 - natural-sort ==0.1.2 - natural-transformation ==0.4.1 @@ -1948,7 +1949,7 @@ default-package-overrides: - pandoc ==3.6 - pandoc-cli ==3.6 - pandoc-lua-engine ==0.4.1.1 - - pandoc-lua-marshal ==0.3.0 + - pandoc-lua-marshal ==0.3.1 - pandoc-plot ==1.9.1 - pandoc-server ==0.1.0.11 - pandoc-throw ==0.1.0.0 @@ -1987,7 +1988,7 @@ default-package-overrides: - pathtype ==0.8.1.3 - pathwalk ==0.3.1.2 - patience ==0.3 - - patrol ==1.0.0.11 + - patrol ==1.0.1.0 - pava ==0.1.1.4 - pcg-random ==0.1.4.0 - pcre-heavy ==1.0.0.4 @@ -2008,7 +2009,7 @@ default-package-overrides: - persistable-types-HDBC-pg ==0.0.3.5 - persistent ==2.14.6.3 - persistent-discover ==0.1.0.7 - - persistent-documentation ==0.1.0.5 + - persistent-documentation ==0.1.0.6 - persistent-lens ==1.0.0 - persistent-mongoDB ==2.13.1.0 - persistent-mtl ==0.5.1 @@ -2019,7 +2020,7 @@ default-package-overrides: - persistent-redis ==2.13.0.2 - persistent-sqlite ==2.13.3.0 - persistent-template ==2.12.0.0 - - persistent-test ==2.13.1.4 + - persistent-test ==2.13.1.3 - persistent-typed-db ==0.1.0.7 - pfile ==0.1.0.1 - pg-harness-client ==0.6.0 @@ -2121,7 +2122,7 @@ default-package-overrides: - process-extras ==0.7.4 - product-isomorphic ==0.0.3.4 - product-profunctors ==0.11.1.1 - - profunctors ==5.6.2 + - profunctors ==5.6.3 - project-template ==0.2.1.0 - projectroot ==0.2.0.1 - prometheus ==2.3.0 @@ -2166,12 +2167,12 @@ default-package-overrides: - quickcheck-assertions ==0.3.0 - quickcheck-classes ==0.6.5.0 - quickcheck-classes-base ==0.6.2.0 - - quickcheck-groups ==0.0.1.4 + - quickcheck-groups ==0.0.1.5 - quickcheck-higherorder ==0.1.0.1 - - quickcheck-instances ==0.3.32 + - quickcheck-instances ==0.3.33 - quickcheck-io ==0.2.0 - - quickcheck-monoid-subclasses ==0.3.0.5 - - quickcheck-quid ==0.0.1.7 + - quickcheck-monoid-subclasses ==0.3.0.6 + - quickcheck-quid ==0.0.1.8 - quickcheck-simple ==0.1.1.1 - quickcheck-state-machine ==0.10.1 - quickcheck-text ==0.1.2.1 @@ -2291,12 +2292,12 @@ default-package-overrides: - rhine-gloss ==1.5 - rhine-terminal ==1.5 - riak-protobuf ==0.25.0.0 - - richenv ==0.1.0.2 + - richenv ==0.1.0.3 - rio ==0.1.22.0 - rio-orphans ==0.1.2.0 - rio-prettyprint ==0.1.8.0 - rng-utils ==0.3.1 - - roc-id ==0.2.0.4 + - roc-id ==0.2.0.5 - rocksdb-haskell ==1.0.1 - rocksdb-haskell-jprupp ==2.1.7 - rocksdb-query ==0.4.3 @@ -2342,12 +2343,12 @@ default-package-overrides: - sampling ==0.3.5 - samsort ==0.1.0.0 - sandi ==0.5 - - sandwich ==0.3.0.3 - - sandwich-contexts ==0.3.0.2 + - sandwich ==0.3.0.4 + - sandwich-contexts ==0.3.0.3 - sandwich-hedgehog ==0.1.3.1 - sandwich-quickcheck ==0.1.0.7 - sandwich-slack ==0.1.2.0 - - sandwich-webdriver ==0.3.0.0 + - sandwich-webdriver ==0.3.0.1 - saturn ==1.0.0.8 - say ==0.1.0.1 - sayable ==1.2.5.0 @@ -2363,7 +2364,7 @@ default-package-overrides: - scientist ==0.0.0.0 - scotty ==0.22 - scrypt ==0.5.0 - - search-algorithms ==0.3.3 + - search-algorithms ==0.3.4 - secp256k1-haskell ==1.4.6 - securemem ==0.1.10 - select-rpms ==0.2.0 @@ -2383,18 +2384,18 @@ default-package-overrides: - sequence-formats ==1.10.0.0 - sequenceTools ==1.5.3.1 - serialise ==0.2.6.1 - - servant ==0.20.2 + - servant ==0.20.3.0 - servant-auth ==0.4.2.0 - servant-auth-client ==0.4.2.0 - servant-auth-docs ==0.2.11.0 - - servant-auth-server ==0.4.9.0 + - servant-auth-server ==0.4.9.1 - servant-auth-swagger ==0.2.11.0 - servant-blaze ==0.9.1 - servant-checked-exceptions ==2.2.0.1 - servant-checked-exceptions-core ==2.2.0.1 - servant-cli ==0.1.1.0 - - servant-client ==0.20.2 - - servant-client-core ==0.20.2 + - servant-client ==0.20.3.0 + - servant-client-core ==0.20.3.0 - servant-conduit ==0.16.1 - servant-docs ==0.13.1 - servant-elm ==0.7.3 @@ -2413,7 +2414,7 @@ default-package-overrides: - servant-quickcheck ==0.1.1.0 - servant-rate-limit ==0.2.0.0 - servant-rawm ==1.0.0.0 - - servant-server ==0.20.2 + - servant-server ==0.20.3.0 - servant-static-th ==1.0.0.1 - servant-swagger ==1.2.1 - servant-swagger-ui ==0.3.5.5.0.1 @@ -2436,7 +2437,7 @@ default-package-overrides: - SHA ==1.6.4.4 - shake ==0.19.8 - shake-plus ==0.3.4.0 - - shakespeare ==2.1.1 + - shakespeare ==2.1.4 - shakespeare-text ==1.1.0 - shared-memory ==0.2.0.1 - shell-conduit ==5.0.0 @@ -2512,14 +2513,14 @@ default-package-overrides: - soxlib ==0.0.3.2 - special-values ==0.1.0.0 - speculate ==0.4.20 - - specup ==0.2.0.5 + - specup ==0.2.0.6 - speedy-slice ==0.3.2 - sphinx ==0.6.1 - Spintax ==0.3.7.0 - splice ==0.6.1.1 - split ==0.2.5 - split-record ==0.1.1.4 - - splitmix ==0.1.1 + - splitmix ==0.1.3.1 - splitmix-distributions ==1.0.0 - Spock-api ==0.14.0.0 - spoon ==0.3.1 @@ -2646,7 +2647,7 @@ default-package-overrides: - tagchup ==0.4.1.2 - tagged ==0.8.8 - tagged-binary ==0.2.0.1 - - tagged-identity ==0.1.4 + - tagged-identity ==0.1.5 - tagged-transformer ==0.8.3 - tagsoup ==0.14.8 - tagstream-conduit ==0.5.6 @@ -2662,7 +2663,7 @@ default-package-overrides: - tasty-bench-fit ==0.1.1 - tasty-checklist ==1.0.6.0 - tasty-dejafu ==2.1.0.2 - - tasty-discover ==5.0.1 + - tasty-discover ==5.0.2 - tasty-expected-failure ==0.12.3 - tasty-fail-fast ==0.0.3 - tasty-focus ==1.0.1 @@ -2675,7 +2676,7 @@ default-package-overrides: - tasty-inspection-testing ==0.2.1 - tasty-kat ==0.0.3 - tasty-leancheck ==0.0.2 - - tasty-lua ==1.1.1 + - tasty-lua ==1.1.1.1 - tasty-papi ==0.1.2.0 - tasty-program ==1.1.0 - tasty-quickcheck ==0.11 @@ -2737,7 +2738,7 @@ default-package-overrides: - text-regex-replace ==0.1.1.5 - text-rope ==0.2 - text-short ==0.1.6 - - text-show ==3.11.1 + - text-show ==3.11.2 - text-show-instances ==3.9.10 - text-zipper ==0.13 - textlocal ==0.1.0.5 @@ -2810,7 +2811,7 @@ default-package-overrides: - toml-reader ==0.2.2.0 - toml-reader-parse ==0.1.1.1 - tomland ==1.3.3.3 - - tools-yj ==0.1.0.27 + - tools-yj ==0.1.0.45 - tophat ==1.0.8.0 - topograph ==1.0.1 - torrent ==10000.1.3 @@ -2913,7 +2914,7 @@ default-package-overrides: - universum ==1.8.2.2 - unix-bytestring ==0.4.0.3 - unix-compat ==0.7.4 - - unix-time ==0.4.16 + - unix-time ==0.4.17 - unjson ==0.15.4 - unlifted ==0.2.3.0 - unliftio ==0.2.25.1 @@ -2969,13 +2970,13 @@ default-package-overrides: - vector-builder ==0.3.8.6 - vector-bytes-instances ==0.1.1 - vector-extras ==0.2.8.2 - - vector-hashtables ==0.1.2.0 - - vector-instances ==3.4.2 + - vector-hashtables ==0.1.2.1 + - vector-instances ==3.4.3 - vector-mmap ==0.0.3 - vector-rotcev ==0.1.0.2 - vector-sized ==1.6.1 - vector-space ==0.16 - - vector-split ==1.0.0.3 + - vector-split ==1.0.0.4 - vector-stream ==0.1.0.1 - vector-th-unbox ==0.2.2 - verset ==0.0.1.11 @@ -2992,7 +2993,7 @@ default-package-overrides: - vty ==6.2 - vty-crossplatform ==0.4.0.0 - vty-unix ==0.2.0.0 - - vty-windows ==0.2.0.3 + - vty-windows ==0.2.0.4 - wai ==3.2.4 - wai-app-static ==3.1.9 - wai-cli ==0.2.3 @@ -3023,7 +3024,7 @@ default-package-overrides: - wai-transformers ==0.1.0 - wai-websockets ==3.0.1.2 - wakame ==0.1.0.0 - - warp ==3.4.7 + - warp ==3.4.8 - warp-tls ==3.4.9 - wave ==0.2.1 - wcwidth ==0.0.2 @@ -3049,8 +3050,8 @@ default-package-overrides: - welford-online-mean-variance ==0.2.0.0 - what4 ==1.6.3 - wherefrom-compat ==0.1.1.1 - - wide-word ==0.1.7.0 - - wild-bind ==0.1.2.11 + - wide-word ==0.1.7.1 + - wild-bind ==0.1.2.12 - wild-bind-x11 ==0.2.0.17 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index c53cd7260bd4b..6c2b389503a20 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -721,7 +721,6 @@ dont-distribute-packages: - dhall-secret - dia-functions - diagrams-html5 - - diagrams-reflex - diagrams-wx - dialog - diff @@ -1026,7 +1025,6 @@ dont-distribute-packages: - frpnow-gtk - frpnow-gtk3 - frpnow-vty - - fs-sim - ftdi - ftp-client-conduit - FTPLine @@ -1196,7 +1194,7 @@ dont-distribute-packages: - gridland - grisette - grisette-monad-coroutine - - grisette_0_12_0_0 + - grisette_0_13_0_0 - gross - groundhog-converters - groundhog-inspector @@ -1363,7 +1361,6 @@ dont-distribute-packages: - haskelldb-hsql-postgresql - haskelldb-hsql-sqlite3 - haskelldb-th - - HaskellNet-SSL - haskelm - haskey - haskey-mtl @@ -1584,7 +1581,7 @@ dont-distribute-packages: - HPong - hpqtypes-effectful - hpqtypes-extras - - hpqtypes-extras_1_17_0_1 + - hpqtypes-extras_1_18_0_0 - hprotoc - hprotoc-fork - hps @@ -1872,7 +1869,6 @@ dont-distribute-packages: - json-pointer-hasql - json-query - json-rpc-client - - json-schema - json-state - json-togo - json2-hdbc @@ -1935,12 +1931,13 @@ dont-distribute-packages: - kit - kmeans-par - kmeans-vector + - knead - knit-haskell - koji-install - koji-tool + - koji-tool_1_3 - korfu - ks-test - - kubernetes-api-client - kubernetes-client - kure-your-boilerplate - kurita @@ -2010,7 +2007,6 @@ dont-distribute-packages: - legion-discovery - legion-discovery-client - legion-extra - - leksah - leksah-server - lens-utils - lenz @@ -2062,7 +2058,6 @@ dont-distribute-packages: - liquidhaskell-cabal-demo - list-t-attoparsec - list-t-html-parser - - list1 - listenbrainz-client - ListT - liszt @@ -2073,6 +2068,7 @@ dont-distribute-packages: - llvm-base-types - llvm-base-util - llvm-data-interop + - llvm-dsl - llvm-general - llvm-general-quote - llvm-hs-pretty @@ -2133,7 +2129,6 @@ dont-distribute-packages: - magic-wormhole - mahoro - maid - - mail-pool - MailchimpSimple - mailgun - majordomo @@ -2281,14 +2276,11 @@ dont-distribute-packages: - mpretty - mprover - mps - - mptcp-pm - mptcpanalyzer - - msgpack-aeson - msgpack-arbitrary - msgpack-binary - msgpack-idl - msgpack-persist - - msgpack-rpc - msgpack-rpc-conduit - msgpack-testsuite - msi-kb-backlit @@ -2532,6 +2524,7 @@ dont-distribute-packages: - partage - partial-semigroup-test - passman-cli + - patch-image - pathfindingcore - patterns - paypal-rest-client @@ -2616,6 +2609,16 @@ dont-distribute-packages: - Plot-ho-matic - PlslTools - plugins-auto + - pms-application-service + - pms-domain-service + - pms-infra-cmdrun + - pms-infra-procspawn + - pms-infra-socket + - pms-infra-watch + - pms-infrastructure + - pms-ui-notification + - pms-ui-request + - pms-ui-response - png-file - pngload - pointless-lenses @@ -2632,7 +2635,6 @@ dont-distribute-packages: - polysemy-hasql - polysemy-hasql-test - polysemy-kvstore-jsonfile - - polysemy-log-co - polysemy-methodology - polysemy-methodology-co-log - polysemy-methodology-composite @@ -2718,6 +2720,7 @@ dont-distribute-packages: - psql - ptera - ptera-th + - pty-mcp-server - publicsuffixlist - puffytools - Pugs @@ -2815,6 +2818,7 @@ dont-distribute-packages: - rbr - rc - rdioh + - rds-data-polysemy - react-flux-servant - reactive - reactive-banana-sdl @@ -2838,12 +2842,10 @@ dont-distribute-packages: - refh - reflex-animation - reflex-backend-wai - - reflex-dom-colonnade - reflex-ghci - reflex-gloss-scene - reflex-libtelnet - reflex-localize - - reflex-localize-dom - reflex-monad-auth - reflex-process - reform-blaze @@ -2862,7 +2864,6 @@ dont-distribute-packages: - regions-monadsfd - regions-monadstf - regions-mtl - - registry-messagepack - regular-extras - regular-web - regular-xmlpickler @@ -3256,7 +3257,6 @@ dont-distribute-packages: - spelling-suggest - sphero - spice - - spike - SpinCounter - splines - sprinkles @@ -3490,7 +3490,6 @@ dont-distribute-packages: - trasa-client - trasa-extra - trasa-form - - trasa-reflex - trasa-server - trasa-th - traversal-template @@ -3769,7 +3768,6 @@ dont-distribute-packages: - xml-catalog - xml-enumerator - xml-enumerator-combinators - - xml-isogen - xml-monad - xml-pipe - xml-push diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 7628751f973f6..985e291c0cf66 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -504,11 +504,27 @@ builtins.intersectAttrs super { # can't use pkg-config (LLVM has no official .pc files), we need to pass the # `dev` and `lib` output in, or Cabal will have trouble finding the library. # Since it looks a bit neater having it in a list, we circumvent the singular - # LLVM input here. - llvm-ffi = addBuildDepends [ - pkgs.llvmPackages_16.llvm.lib - pkgs.llvmPackages_16.llvm.dev - ] (super.llvm-ffi.override { LLVM = null; }); + # LLVM input that llvm-ffi declares. + llvm-ffi = + let + chosenLlvmVersion = 20; + nextLlvmAttr = "llvmPackages_${toString (chosenLlvmVersion + 1)}"; + shouldUpgrade = + pkgs ? ${nextLlvmAttr} && (lib.strings.match ".+rc.+" pkgs.${nextLlvmAttr}.llvm.version) == null; + in + lib.warnIf shouldUpgrade + "haskellPackages.llvm-ffi: ${nextLlvmAttr} is available in Nixpkgs, consider updating." + lib.pipe + super.llvm-ffi + [ + # ATTN: There is no matching flag for the latest supported LLVM version, + # so you may need to remove this when updating chosenLlvmVersion + (enableCabalFlag "LLVM${toString chosenLlvmVersion}00") + (addBuildDepends [ + pkgs."llvmPackages_${toString chosenLlvmVersion}".llvm.lib + pkgs."llvmPackages_${toString chosenLlvmVersion}".llvm.dev + ]) + ]; # Needs help finding LLVM. spaceprobe = addBuildTool self.buildHaskellPackages.llvmPackages.llvm super.spaceprobe; @@ -834,6 +850,14 @@ builtins.intersectAttrs super { pkgs.z3 ] super.crucible-llvm; + # yaml doesn't build its executables (json2yaml, yaml2json) by default: + # https://github.com/snoyberg/yaml/issues/194 + yaml = lib.pipe super.yaml [ + (disableCabalFlag "no-exe") + enableSeparateBinOutput + (addBuildDepend self.optparse-applicative) + ]; + # Compile manpages (which are in RST and are compiled with Sphinx). futhark = overrideCabal @@ -1122,6 +1146,25 @@ builtins.intersectAttrs super { ]; }) super.relocant; + # https://gitlab.iscpif.fr/gargantext/haskell-pgmq/blob/9a869df2842eccc86a0f31a69fb8dc5e5ca218a8/README.md#running-test-cases + haskell-pgmq = overrideCabal (drv: { + env = drv.env or { } // { + postgresqlEnableTCP = toString true; + }; + testToolDepends = drv.testToolDepends or [ ] ++ [ + # otherwise .dev gets selected?! + (lib.getBin (pkgs.postgresql.withPackages (ps: [ ps.pgmq ]))) + pkgs.postgresqlTestHook + ]; + }) super.haskell-pgmq; + + # https://gitlab.iscpif.fr/gargantext/haskell-bee/blob/19c8775f0d960c669235bf91131053cb6f69a1c1/README.md#redis + haskell-bee-redis = overrideCabal (drv: { + testToolDepends = drv.testToolDepends or [ ] ++ [ + pkgs.redisTestHook + ]; + }) super.haskell-bee-redis; + 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; @@ -1233,6 +1276,33 @@ builtins.intersectAttrs super { ] }" ''; + + passthru = { + updateScript = ../../../maintainers/scripts/haskell/update-cabal2nix-unstable.sh; + + # This is used by regenerate-hackage-packages.nix to supply the configuration + # values we can easily generate automatically without checking them in. + compilerConfig = + pkgs.runCommand "hackage2nix-${self.ghc.haskellCompilerName}-config.yaml" + { + nativeBuildInputs = [ + self.ghc + ]; + } + '' + cat > "$out" << EOF + # generated by haskellPackages.cabal2nix-unstable.compilerConfig + compiler: ${self.ghc.haskellCompilerName} + + core-packages: + EOF + + ghc-pkg list \ + | tail -n '+2' \ + | sed -e 's/[()]//g' -e 's/\s\+/ - /' \ + >> "$out" + ''; + }; }) (justStaticExecutables super.cabal2nix-unstable); # test suite needs local redis daemon @@ -1294,6 +1364,13 @@ builtins.intersectAttrs super { (self.generateOptparseApplicativeCompletions [ "cloudy" ]) ]; + # We don't have multiple GHC versions to test against in PATH + ghc-hie = overrideCabal (drv: { + testFlags = drv.testFlags or [ ] ++ [ + "--skip=/GHC.Iface.Ext.Binary/readHieFile" + ]; + }) super.ghc-hie; + # Wants running postgresql database accessible over ip, so postgresqlTestHook # won't work (or would need to patch test suite). domaindriven-core = dontCheck super.domaindriven-core; @@ -1344,6 +1421,16 @@ builtins.intersectAttrs super { (overrideCabal { mainProgram = "agda"; }) # Split outputs to reduce closure size enableSeparateBinOutput + # Build the primitive library to generate its interface files. + # These are needed in order to use Agda in Nix builds. + (overrideCabal (drv: { + postInstall = drv.postInstall or "" + '' + agdaExe=''${bin:-$out}/bin/agda + + echo "Generating Agda core library interface files..." + (cd "$("$agdaExe" --print-agda-data-dir)/lib/prim" && "$agdaExe" --build-library) + ''; + })) ]; # ats-format uses cli-setup in Setup.hs which is quite happy to write @@ -1715,6 +1802,20 @@ builtins.intersectAttrs super { xmobar = enableSeparateBinOutput super.xmobar; + # These test cases access the network + hpack_0_38_1 = doDistribute ( + overrideCabal (drv: { + testFlags = drv.testFlags or [ ] ++ [ + "--skip" + "/Hpack.Defaults/ensureFile/with 404/does not create any files/" + "--skip" + "/Hpack.Defaults/ensureFile/downloads file if missing/" + "--skip" + "/EndToEnd/hpack/defaults/fails if defaults don't exist/" + ]; + }) super.hpack_0_38_1 + ); + # 2024-08-09: Disable some cabal-doctest tests pending further investigation. inherit (lib.mapAttrs ( diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index acfead1a5125b..cfdb273f696ad 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -88,7 +88,7 @@ in enableSharedLibraries ? !stdenv.hostPlatform.isStatic && (ghc.enableShared or false) - && !stdenv.hostPlatform.useAndroidPrebuilt, + && !stdenv.hostPlatform.useAndroidPrebuilt, # TODO: figure out why /build leaks into RPATH enableDeadCodeElimination ? (!stdenv.hostPlatform.isDarwin), # TODO: use -dead_strip for darwin # Disabling this for ghcjs prevents this crash: https://gitlab.haskell.org/ghc/ghc/-/issues/23235 enableStaticLibraries ? diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 833c327d60072..17f8d836258ac 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1490,7 +1490,6 @@ self: { blaze-html, boxes, bytestring, - Cabal, case-insensitive, containers, data-hash, @@ -1499,9 +1498,13 @@ self: { dlist, edit-distance, emacs, + enummapset, equivalence, exceptions, + filelock, + filemanip, filepath, + generic-data, ghc-compact, gitrev, happy, @@ -1510,16 +1513,19 @@ self: { monad-control, mtl, murmur-hash, + nonempty-containers, parallel, peano, pqueue, pretty, process, + process-extras, regex-tdfa, split, stm, STMonadTrans, strict, + template-haskell, text, time, transformers, @@ -1531,20 +1537,11 @@ self: { }: mkDerivation { pname = "Agda"; - version = "2.7.0.1"; - sha256 = "13pn0mbxyfy04fcdl68l2m36b40hwk8iwpkqdfad3xsf9l5ddxil"; - revision = "3"; - editedCabalFile = "0vmsy5hjivysiqkzk65ca1y8ivbzly5z55zi12bgsmj7jqrd8vrf"; + version = "2.8.0"; + sha256 = "184vjq260zf5w9c8nz11nbhpsvq3a1yxp7mhaz7synlaww3ik146"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; - setupHaskellDepends = [ - base - Cabal - directory - filepath - process - ]; libraryHaskellDepends = [ aeson ansi-terminal @@ -1562,9 +1559,13 @@ self: { directory dlist edit-distance + enummapset equivalence exceptions + filelock + filemanip filepath + generic-data ghc-compact gitrev hashable @@ -1572,16 +1573,19 @@ self: { monad-control mtl murmur-hash + nonempty-containers parallel peano pqueue pretty process + process-extras regex-tdfa split stm STMonadTrans strict + template-haskell text time transformers @@ -1597,9 +1601,13 @@ self: { ]; executableHaskellDepends = [ base + bytestring directory + filelock filepath + gitrev process + template-haskell ]; executableToolDepends = [ emacs ]; description = "A dependently typed functional programming language and proof assistant"; @@ -7005,10 +7013,8 @@ self: { }: mkDerivation { pname = "ChasingBottoms"; - version = "1.3.1.15"; - sha256 = "0if8h6xq10y1xa90cwmx2jkxjn9628rzs8y6fsjmpjdcvcyr5wnj"; - revision = "2"; - editedCabalFile = "11h7gfnlxfrfpvax74lbdwaz8jazy833q6mzrgs9p8cyj6q69ibn"; + version = "1.3.1.16"; + sha256 = "08zg018arf4qvp970dcnf0nyaqp7wkp5ba2dhck3v4l49k5cax9m"; libraryHaskellDepends = [ base containers @@ -8110,6 +8116,31 @@ self: { } ) { }; + "ConsoleAsk" = callPackage ( + { + mkDerivation, + base, + lens, + parsec, + regex-tdfa, + text, + }: + mkDerivation { + pname = "ConsoleAsk"; + version = "0.1.0.1"; + sha256 = "0mbrvaqdxfx7vfcqy6rbva0ml6a7a2yklgzh3vx008yaavzw4hy6"; + libraryHaskellDepends = [ + base + lens + parsec + regex-tdfa + text + ]; + description = "Simple CLI user input library"; + license = lib.licenses.mit; + } + ) { }; + "ConstraintKinds" = callPackage ( { mkDerivation, @@ -22336,10 +22367,8 @@ self: { }: mkDerivation { pname = "HaskellNet"; - version = "0.6.1.2"; - sha256 = "0yd0n6c9favb6kv37flz2cn9wz5kapx3iqljq2h7l6qvx6kd92v5"; - revision = "1"; - editedCabalFile = "1j5g09v40rvsk4crfjabs0mma5nlwsbzbny25803bc6805jh9058"; + version = "0.6.2"; + sha256 = "134gmv5b4f02f24m86ql256dssdvkgqjp2cw36p6958ydbdsx6s4"; libraryHaskellDepends = [ array base @@ -22356,8 +22385,6 @@ self: { ]; description = "Client support for POP3, SMTP, and IMAP"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -22394,7 +22421,6 @@ self: { ]; description = "Helpers to connect to SSL/TLS mail servers with HaskellNet"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "HaskellNet-SSL-example"; } ) { }; @@ -23978,8 +24004,8 @@ self: { }: mkDerivation { pname = "HsSyck"; - version = "0.53"; - sha256 = "17r4jwnkjinmzpw9m2crjwccdyv9wmpljnv1ldgljkr9p9mb5ywf"; + version = "0.55"; + sha256 = "1ccm9r40898kfgkrnwz0ybcdps83li9wk565fm37gdpsvmi19faf"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base @@ -24096,6 +24122,8 @@ self: { pname = "HsYAML"; version = "0.2.1.5"; sha256 = "13av46629msknp1spmcczgd2hpsyj0ca590vpiy7df8l6cfwjyk5"; + revision = "1"; + editedCabalFile = "1l5ig8a1c13rwcx530li93p0kkxcsjpjyr303v19z6n8zmdvnz6a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -24700,6 +24728,8 @@ self: { pname = "IPv6DB"; version = "0.3.3.4"; sha256 = "1mkf2fqlg2n9q3l3p8rxdcmb7k281lz37x6hiry1wvxbn92d4pja"; + revision = "1"; + editedCabalFile = "18wx26x4nyyywbl7inwna68kmxs8sbyckmrhdz4png9gn7ix4sr0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -26815,6 +26845,8 @@ self: { pname = "LPFP"; version = "1.1.5"; sha256 = "11mlcd1pq2vb0kwjm2z6304qslvmdcfdbly37yr27zhn860zfzz2"; + revision = "2"; + editedCabalFile = "1530y0rmj3gwhk0ghpaf0977wz0n2pq86dfcb401y0ala7f4z167"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -29699,8 +29731,8 @@ self: { }: mkDerivation { pname = "MicroHs"; - version = "0.12.6.1"; - sha256 = "145fk10clh4mmfd58212kr1b56fr4j19vrlrq6d4jdv4zrvk5iwl"; + version = "0.13.0.0"; + sha256 = "02wl86ql8xcp9w7vlhvh0m95am6ssmw8fzkbs597qlhpwp91ax3w"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -31721,7 +31753,7 @@ self: { } ) { }; - "NanoID_3_4_1" = callPackage ( + "NanoID_3_4_1_1" = callPackage ( { mkDerivation, aeson, @@ -31736,8 +31768,8 @@ self: { }: mkDerivation { pname = "NanoID"; - version = "3.4.1"; - sha256 = "1rrz4wmhba372fg9w8rg6fgynwqmy5dhyz5i74xab5mbjgv169rs"; + version = "3.4.1.1"; + sha256 = "1dfl5vj6fwxwrhgx11vzxij2p19q3kqri130fxgw2l6ajlckyh8x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -34971,8 +35003,8 @@ self: { }: mkDerivation { pname = "PenroseKiteDart"; - version = "1.3"; - sha256 = "0yjfc7zahrf4h02xhlbhzh0r8nzns5v1a2rp2sg3gi073v59gpps"; + version = "1.4.3"; + sha256 = "1nrp9cr7jxjvplkfgp4lxh3rvzf1pms8bm7kwhc4w4fzmpy3p3p1"; libraryHaskellDepends = [ base containers @@ -36449,7 +36481,7 @@ self: { } ) { }; - "QuickCheck_2_15_0_1" = callPackage ( + "QuickCheck_2_16_0_0" = callPackage ( { mkDerivation, base, @@ -36463,10 +36495,8 @@ self: { }: mkDerivation { pname = "QuickCheck"; - version = "2.15.0.1"; - sha256 = "0zvfydg44ibs1br522rzvdlxj9mpz0h62js1hay1sj5gvdnj3cm3"; - revision = "1"; - editedCabalFile = "0cgfp4s51cjphsn9cls6rndisvqmi94vn95xan9g1yz6p5xk7z8c"; + version = "2.16.0.0"; + sha256 = "1h02m26hvhfcs82rrfmfznwh4vj799gn55kysmv3sr8ixak3ymhb"; libraryHaskellDepends = [ base containers @@ -46710,8 +46740,8 @@ self: { { mkDerivation }: mkDerivation { pname = "Win32"; - version = "2.14.2.0"; - sha256 = "0qmm44py2r1z5mj12vr33s01kci5hmh479pr6v8ljqgm2imlfr4j"; + version = "2.14.2.1"; + sha256 = "0583vy22b89z4zdgg52ayga46mw8qmj0lw7qm99q6wggnjgmmlb9"; description = "A binding to Windows Win32 API"; license = lib.licenses.bsd3; platforms = lib.platforms.windows; @@ -49364,8 +49394,8 @@ self: { }: mkDerivation { pname = "ac-library-hs"; - version = "1.5.0.0"; - sha256 = "15jvxwsx50qcv58wx4a2m4f1h5ic476cnb78n757shyfm0asn9ag"; + version = "1.5.2.0"; + sha256 = "028781j64wv42j9i2gmgccmlakyjchpxqk13rk5n59xavlyv7yw9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -49374,6 +49404,7 @@ self: { bytestring primitive random + transformers vector vector-algorithms wide-word @@ -49384,6 +49415,7 @@ self: { bytestring primitive random + transformers vector vector-algorithms wide-word @@ -49428,7 +49460,9 @@ self: { ]; description = "Data structures and algorithms"; license = lib.licenses.cc0; + hydraPlatforms = lib.platforms.none; mainProgram = "example-lazy-segtree"; + broken = true; } ) { }; @@ -52296,8 +52330,8 @@ self: { pname = "active"; version = "0.2.1"; sha256 = "150kwir36aj9q219qi80mlqd0vxm4941dh6x4xp58rbd5a3mhmv1"; - revision = "4"; - editedCabalFile = "0s5aiyskly1j4wd4hs2c52bdawx9340pgdx0378xvivixd48cd8x"; + revision = "5"; + editedCabalFile = "0wxl3pfdz4krx7lg1rckvmjkm2hj5vlwx3kyzzfrpsfhc9zq7f1g"; libraryHaskellDepends = [ base lens @@ -53708,8 +53742,8 @@ self: { pname = "aeson"; version = "2.2.3.0"; sha256 = "1akbrh8iz47f0ai30yabg1n4vcf1fx0a9gzj45fx0si553s5r8ns"; - revision = "3"; - editedCabalFile = "16sajjm1fqrjjgdy651ff7hyj89di7ys9wk4qnm9h6nnpbr5krb1"; + revision = "4"; + editedCabalFile = "0yw5kahz82kls4svn0qssckvx143k73h5nqg0z1d4s7ibqww4j3x"; libraryHaskellDepends = [ base bytestring @@ -59448,8 +59482,8 @@ self: { pname = "align-audio"; version = "0.0.0.1"; sha256 = "1r1660igj6bmzhccw30vj0wsz7jjkd5k0vbr4nrcbpcwkxllshnb"; - revision = "2"; - editedCabalFile = "15hqn6q6991qp60pvykw3ryrcyqz94vhwcj1y28sxdpn5ga8mrl9"; + revision = "3"; + editedCabalFile = "1j50cp7i77dplkd3g7nnyn9xgcr8r8d4lh6nh9xcnjfkn8p6g539"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -69871,8 +69905,8 @@ self: { }: mkDerivation { pname = "amazonka-mtl"; - version = "0.1.1.1"; - sha256 = "19rcmfq5ly92jm96w5770286kihd5gsdc45rmpbkhm71xl2aa0pq"; + version = "0.1.1.3"; + sha256 = "06ng492c6r0zwyjyr0h6b665sp6v17i245svdsag3ha8ni303hka"; libraryHaskellDepends = [ amazonka amazonka-core @@ -75709,8 +75743,8 @@ self: { }: mkDerivation { pname = "android-activity"; - version = "0.2.0.1"; - sha256 = "1pb250zsmh9z7h8wcqnqhbvhhdwwhmrwj8qr1w8053pxylsr5npn"; + version = "0.2.0.2"; + sha256 = "1l82k9if392682wr31b6g74wv25qwl5cgxwcmhnrp4lm8w0n428d"; libraryHaskellDepends = [ base data-default @@ -76691,8 +76725,8 @@ self: { pname = "ansi-terminal-game"; version = "1.9.3.0"; sha256 = "1yy7hzdcawdmwl8wqzabbamzjdg260xbwryj0hdjn7b0n6qlqymk"; - revision = "2"; - editedCabalFile = "1gjaa3kj05v5zyjn27y17w05nx018bx28znj7r0al0c6267n0la8"; + revision = "3"; + editedCabalFile = "0m4df8a2p18j29zsgffnyf69hjkyam3rg3xc4zvmxafidj877ykk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78132,8 +78166,8 @@ self: { }: mkDerivation { pname = "aoc"; - version = "0.1.0.2"; - sha256 = "0x5lpirk74zf4283gpvmw71dv8mgil80l1awv42f8sfxg5nx805g"; + version = "0.2.0.0"; + sha256 = "0hamr2sqw00njwg4sdir81fmsgc29ic21m0rzqnrfmd5jgdmg27h"; libraryHaskellDepends = [ base containers @@ -83461,8 +83495,8 @@ self: { pname = "arithmoi"; version = "0.13.1.0"; sha256 = "0ka0sqkrkqrln6ci8fxzls9r5bhwii48xc39bbapdqbn4sc2c5bf"; - revision = "1"; - editedCabalFile = "1q36pbxsz3vcig7gjr0m38bn5d34az2cjkhcag4n2ra86zdqrnvv"; + revision = "2"; + editedCabalFile = "1q81krc6qgg495qqlnh7kbzg2fk57amgiqa5xmxwhxrhlffjsk3d"; configureFlags = [ "-f-llvm" ]; libraryHaskellDepends = [ array @@ -85093,6 +85127,62 @@ self: { } ) { }; + "ascii85x" = callPackage ( + { + mkDerivation, + array, + attoparsec, + base, + bytestring, + hedgehog, + JuicyPixels, + optparse-applicative, + text, + vector, + }: + mkDerivation { + pname = "ascii85x"; + version = "0.2.4.1"; + sha256 = "1jr0qqcyx173gy5izz99z5s3v9a78ks48g7am4lfab7py3k0xri3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array + attoparsec + base + bytestring + JuicyPixels + text + vector + ]; + executableHaskellDepends = [ + array + attoparsec + base + bytestring + JuicyPixels + optparse-applicative + text + vector + ]; + testHaskellDepends = [ + array + attoparsec + base + bytestring + hedgehog + JuicyPixels + text + vector + ]; + description = "Displays TI-85 variable files as text"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "ascii85x"; + broken = true; + } + ) { }; + "asciichart" = callPackage ( { mkDerivation, @@ -88875,8 +88965,8 @@ self: { }: mkDerivation { pname = "attoparsec-framer"; - version = "0.1.0.9"; - sha256 = "0kh54qdzjqa7lxd8s679b3my5nsy55rwqwd84nblmfczi73bjc0p"; + version = "0.1.0.10"; + sha256 = "1ziskifj6mly9ywsag8395ladwscrwzjpn628nbmn29x28zq0n61"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88988,6 +89078,7 @@ self: { containers, deepseq, directory, + fail, filepath, ghc-prim, haddock-use-refs, @@ -88996,6 +89087,7 @@ self: { QuickCheck, quickcheck-unicode, scientific, + semigroups, tagged, tasty, tasty-bench, @@ -89008,17 +89100,19 @@ self: { }: mkDerivation { pname = "attoparsec-isotropic"; - version = "0.14.4"; - sha256 = "17rgqqkshn7pdyk54ac4vc3xs4p2kqh3mbd0ppsy7shyry7c1ahs"; + version = "0.14.5"; + sha256 = "1bvxy2gydz3kv0fbhp77bwk75l73kz7qc4aa7wlldga90f8y3vhj"; libraryHaskellDepends = [ array base bytestring containers deepseq + fail ghc-prim haddock-use-refs scientific + semigroups tagged text trace-embrace @@ -89028,11 +89122,16 @@ self: { array base bytestring + containers deepseq + fail + haddock-use-refs http-types QuickCheck quickcheck-unicode scientific + semigroups + tagged tasty tasty-bench tasty-quickcheck @@ -89049,13 +89148,18 @@ self: { containers deepseq directory + fail filepath ghc-prim + haddock-use-refs http-types parsec scientific + semigroups + tagged tasty-bench text + trace-embrace transformers unordered-containers vector @@ -89453,6 +89557,8 @@ self: { pname = "audacity"; version = "0.0.2.2"; sha256 = "1glvk4mkq8j48s0xm86xb1l3xrb6m3cijcckdm48zq3pz7yg3hd8"; + revision = "1"; + editedCabalFile = "1zijgx43yd713czj9r5b2yv26dii4d4i6ar9n0l1c9zqaqv7vh6p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90224,6 +90330,96 @@ self: { } ) { }; + "autodocodec_0_5_0_0" = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + containers, + dlist, + doctest, + hashable, + mtl, + scientific, + text, + time, + unordered-containers, + validity, + validity-scientific, + vector, + }: + mkDerivation { + pname = "autodocodec"; + version = "0.5.0.0"; + sha256 = "172z14rfrl7jn0cwsbspyzb884szrmvq1rixd2b8ymc8d278l049"; + libraryHaskellDepends = [ + aeson + base + bytestring + containers + dlist + hashable + mtl + scientific + text + time + unordered-containers + validity + validity-scientific + vector + ]; + testHaskellDepends = [ + base + doctest + ]; + description = "Self-documenting encoder and decoder"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + } + ) { }; + + "autodocodec-exact" = callPackage ( + { + mkDerivation, + aeson, + aeson-pretty, + autodocodec, + base, + bytestring, + containers, + mtl, + pretty-show, + scientific, + text, + unordered-containers, + vector, + }: + mkDerivation { + pname = "autodocodec-exact"; + version = "0.0.0.1"; + sha256 = "07ljrfxhkrl7k33nhg51m30334yvjp7jrix6hlwzgfqgr4nsbdas"; + libraryHaskellDepends = [ + aeson + aeson-pretty + autodocodec + base + bytestring + containers + mtl + pretty-show + scientific + text + unordered-containers + vector + ]; + description = "Exact decoder for autodocodec"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + "autodocodec-nix" = callPackage ( { mkDerivation, @@ -90394,6 +90590,40 @@ self: { } ) { }; + "autodocodec-servant-multipart_0_0_0_2" = callPackage ( + { + mkDerivation, + aeson, + autodocodec, + base, + bytestring, + servant-multipart, + servant-multipart-api, + text, + unordered-containers, + vector, + }: + mkDerivation { + pname = "autodocodec-servant-multipart"; + version = "0.0.0.2"; + sha256 = "0zdghkqmrr2d4lj71c3qh62bqvc5frhid8s8zkh3hwkkla7a1ld4"; + libraryHaskellDepends = [ + aeson + autodocodec + base + bytestring + servant-multipart + servant-multipart-api + text + unordered-containers + vector + ]; + description = "Autodocodec interpreters for Servant Multipart"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + } + ) { }; + "autodocodec-swagger2" = callPackage ( { mkDerivation, @@ -90464,6 +90694,46 @@ self: { } ) { }; + "autodocodec-yaml_0_4_0_2" = callPackage ( + { + mkDerivation, + autodocodec, + autodocodec-schema, + base, + bytestring, + containers, + path, + path-io, + safe-coloured-text, + scientific, + text, + vector, + yaml, + }: + mkDerivation { + pname = "autodocodec-yaml"; + version = "0.4.0.2"; + sha256 = "17ll6bb0qs7nm9s2kf1b2zn67kjv5lwcrs2igllk5vlsajk4difl"; + libraryHaskellDepends = [ + autodocodec + autodocodec-schema + base + bytestring + containers + path + path-io + safe-coloured-text + scientific + text + vector + yaml + ]; + description = "Autodocodec interpreters for yaml"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + } + ) { }; + "autoexporter" = callPackage ( { mkDerivation, @@ -91934,6 +92204,44 @@ self: { } ) { }; + "aws-academy-grade-exporter" = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + cassava, + optparse-applicative, + postgresql-simple, + req, + text, + vector, + }: + mkDerivation { + pname = "aws-academy-grade-exporter"; + version = "0.1.0.0"; + sha256 = "1wh0sz2x4kfh97yi3811r3vg2qf6i6zp2hyifzz1jy1nra93b6av"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson + base + bytestring + cassava + optparse-applicative + postgresql-simple + req + text + vector + ]; + description = "Export grades from AWS Academy to different formats"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "aws-academy-grade-exporter"; + broken = true; + } + ) { }; + "aws-arn" = callPackage ( { mkDerivation, @@ -93762,8 +94070,8 @@ self: { }: mkDerivation { pname = "aws-spend-summary"; - version = "0.2.0.2"; - sha256 = "0zp9bdrhxl4z8fyjqcilndpj6qw5scs1byh1fzj8v9r4zzg59zsg"; + version = "0.3.0.0"; + sha256 = "0lnwlvjqjs4hxqfblrhgqjq6309c466hlnamryprgd3l8nhnpak3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95451,7 +95759,6 @@ self: { microlens, microlens-th, mwc-random, - primitive, reflection, time, transformers, @@ -95460,14 +95767,13 @@ self: { }: mkDerivation { pname = "backprop"; - version = "0.2.6.5"; - sha256 = "0rc6dsf0zasl9vah8kv61qk2z7s644lzsrmkd7fwxwj1480kb482"; + version = "0.2.7.2"; + sha256 = "1v7r2gr18kcrcf12dmjpg2cqg1lanpqfpjwbqqnm1sbibvf467w7"; libraryHaskellDepends = [ base containers deepseq microlens - primitive reflection transformers vector @@ -96252,8 +96558,8 @@ self: { pname = "ban-instance"; version = "0.1.0.1"; sha256 = "0504qsjbqbrdf9avfrhs290baszc9dickx7wknbyxwrzpzzbpggk"; - revision = "4"; - editedCabalFile = "1ip2abbxnj2cwc3b0l88s0014zakx4g84ifnnaqq8rg6mcn5ppik"; + revision = "5"; + editedCabalFile = "1a0xh0kfdpqgppaisb0hlm4k40gssbxh5jjz2j2l8xn2bnmv95cb"; libraryHaskellDepends = [ base template-haskell @@ -97685,6 +97991,8 @@ self: { pname = "base64-bytes"; version = "0.1.1.1"; sha256 = "0gvh2yg7mqwrswcq5p0h35bifsvm18cdvsjzazz37yrwan0i31vs"; + revision = "1"; + editedCabalFile = "17kl1813wdqbh6hjrm7npm2w65d0ir4bpbklggr4bxzxabwbsg2c"; libraryHaskellDepends = [ base byte-order @@ -97714,8 +98022,6 @@ self: { ]; description = "Base64 encoding of byte sequences"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -97785,8 +98091,8 @@ self: { pname = "base64-bytestring-type"; version = "1.0.1"; sha256 = "03kq4rjj6by02rf3hg815jfdqpdk0xygm5f46r2pn8mb99yd01zn"; - revision = "21"; - editedCabalFile = "1y3j1lkqlqw8l4p0g8s3iac0gd84nz3pqccrzfj7n23fp19zr1q3"; + revision = "22"; + editedCabalFile = "0a5640qjbd3f96v9sf6r1laqpqk83xh073qlq75174kcg5zi4rxa"; libraryHaskellDepends = [ aeson base @@ -99873,8 +100179,8 @@ self: { }: mkDerivation { pname = "beam-automigrate"; - version = "0.1.6.0"; - sha256 = "09pq0i3zb68ad20qznvf4kqf3y3zz0pjfi84g87rxay6y4sj6vi1"; + version = "0.1.7.0"; + sha256 = "019b0kykdjqmf2xcj11pi2s67ssy2al882nsj5aq2h1mq6c7bx63"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -99974,8 +100280,8 @@ self: { }: mkDerivation { pname = "beam-core"; - version = "0.10.3.1"; - sha256 = "0n3fyjhcljd44ri7z3kb1sd3izv047v82m9n7597r7sbipv8cysc"; + version = "0.10.4.0"; + sha256 = "1zxqyxxyid186s86lfw0sq030jckh83j3rwj6ibx4wg3flslk515"; libraryHaskellDepends = [ aeson base @@ -100489,6 +100795,72 @@ self: { } ) { }; + "beam-sqlite_0_5_4_1" = callPackage ( + { + mkDerivation, + aeson, + attoparsec, + base, + beam-core, + beam-migrate, + bytestring, + direct-sqlite, + dlist, + free, + hashable, + monad-control, + mtl, + network-uri, + scientific, + sqlite-simple, + tasty, + tasty-expected-failure, + tasty-hunit, + text, + time, + transformers-base, + }: + mkDerivation { + pname = "beam-sqlite"; + version = "0.5.4.1"; + sha256 = "1f5yjsx7zfbfbxs3xd64rwn2m3vjffrbdn5xadhm1axhghi6srki"; + libraryHaskellDepends = [ + aeson + attoparsec + base + beam-core + beam-migrate + bytestring + direct-sqlite + dlist + free + hashable + monad-control + mtl + network-uri + scientific + sqlite-simple + text + time + transformers-base + ]; + testHaskellDepends = [ + base + beam-core + beam-migrate + sqlite-simple + tasty + tasty-expected-failure + tasty-hunit + text + time + ]; + description = "Beam driver for SQLite"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + } + ) { }; + "beam-th" = callPackage ( { mkDerivation, @@ -100718,8 +101090,8 @@ self: { }: mkDerivation { pname = "bech32"; - version = "1.1.8"; - sha256 = "0y9k93c5rxh0wjdyz4f1qpp6kljdbsrmy5appp4aqvwq2nqz9aas"; + version = "1.1.9"; + sha256 = "0l3h4c1aqjqrlxdc4gq409dwly61i7k2d7g3gz0gya9nf39xc3f4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100776,8 +101148,8 @@ self: { }: mkDerivation { pname = "bech32-th"; - version = "1.1.8"; - sha256 = "0dg79llv3rrakhskzpbs1qdwjn8i1whn1fn3xqkd9scmwh26a2n2"; + version = "1.1.9"; + sha256 = "0bc3wx5np17lb1y4s843f8m65687ainiv8biqfhfg7i2gfsc60cs"; libraryHaskellDepends = [ base bech32 @@ -102149,8 +102521,8 @@ self: { pname = "bhoogle"; version = "0.1.4.4"; sha256 = "1z19h0jgnipj16rqbrflcjnqaslafq9bvwkyg8q0il76q7s4wyxa"; - revision = "1"; - editedCabalFile = "182j2bc4cqddzv5vd2fkkyx2qs9ya7vg9r234xr5gyp35waln1i9"; + revision = "2"; + editedCabalFile = "1kpzvlzydrfqjhmpjirb51xhnwircdcnmhbn82nvnvm5s4h0pajd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -111007,8 +111379,8 @@ self: { }: mkDerivation { pname = "blockfrost-api"; - version = "0.12.2.0"; - sha256 = "04w745ws2nf90yix2idd6shahqfi7mwx83j4divjrkfb57pd8v6p"; + version = "0.13.0.0"; + sha256 = "0nghxnx9kjwk2frzsy0zrskvn3yffy7xp2fa70hl25bsc4sa2zar"; libraryHaskellDepends = [ aeson base @@ -111070,8 +111442,8 @@ self: { }: mkDerivation { pname = "blockfrost-client"; - version = "0.9.2.0"; - sha256 = "04q48afris70y4j4ya52kvj9n1iy8jqn6ygydp11idr15fpjj4qh"; + version = "0.10.0.0"; + sha256 = "0jyg2mc8jmwpsix46nh8r6bc2p1j5rdrjsrcdyyvqz5a2ri6hac7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111242,6 +111614,61 @@ self: { } ) { }; + "blockio-uring" = callPackage ( + { + mkDerivation, + async, + base, + containers, + liburing, + primitive, + quickcheck-classes, + random, + tasty, + tasty-hunit, + tasty-quickcheck, + time, + unix, + vector, + }: + mkDerivation { + pname = "blockio-uring"; + version = "0.1.0.0"; + sha256 = "1g4sd7wqxf86i1c5iqiar6mpdszk99v7p71jcrx3dm8pap69r1x7"; + libraryHaskellDepends = [ + base + primitive + vector + ]; + libraryPkgconfigDepends = [ liburing ]; + testHaskellDepends = [ + base + primitive + quickcheck-classes + tasty + tasty-hunit + tasty-quickcheck + vector + ]; + testPkgconfigDepends = [ liburing ]; + benchmarkHaskellDepends = [ + async + base + containers + primitive + random + time + unix + vector + ]; + benchmarkPkgconfigDepends = [ liburing ]; + description = "Perform batches of asynchronous disk IO operations"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { inherit (pkgs) liburing; }; + "blogination" = callPackage ( { mkDerivation, @@ -113624,8 +114051,8 @@ self: { pname = "boomwhacker"; version = "0.0.2"; sha256 = "0q5cq5j7dy1qm5jqpcl1imwiqqm0h21yvqwnvabsjnfrvfvryqg2"; - revision = "1"; - editedCabalFile = "0hwqdahpbinw9m7h05q0fhakj4w8mlvqz0ah6609x6wgb0dggmyb"; + revision = "2"; + editedCabalFile = "0jqys322j818dc24fyb37a59qs66m3b46j05y4vswipakwm1kgmk"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -116865,6 +117292,8 @@ self: { pname = "brotli"; version = "0.0.0.2"; sha256 = "09y460adrq6cp9d8qlf8522yb0qc1vgjxv4d56kq2rdf9khqic6z"; + revision = "1"; + editedCabalFile = "1a0lbghilwpa6hb5msivb7hjqnnxi2bxlfgiawv0mjpc7gidhbz7"; libraryHaskellDepends = [ base bytestring @@ -116947,8 +117376,8 @@ self: { pname = "brotli-streams"; version = "0.0.0.0"; sha256 = "14jc1nhm50razsl99d95amdf4njf75dnzx8vqkihgrgp7qisyz3z"; - revision = "9"; - editedCabalFile = "1rhy0d1jy3v9r1skg3bdlnjj5avxy968ih1cyg9x9yb7rbyf3za5"; + revision = "10"; + editedCabalFile = "0v0zg5q9ahf8kvfm9zwlj4ws1yd3bvdxyxkak3xk7nca49vb8mcm"; libraryHaskellDepends = [ base brotli @@ -118142,8 +118571,64 @@ self: { }: mkDerivation { pname = "bugsnag"; - version = "1.1.0.1"; - sha256 = "1n2lq9iyz5m0s1mx22cwaci18f9i37g6xgdq3nbbyysmylrw09w2"; + version = "1.1.0.2"; + sha256 = "1f0jsad9z9zsj8sbirq6h1x0s7245rxv5gpciz4p8wv9ryi8d3m3"; + 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; + } + ) { }; + + "bugsnag_1_2_0_0" = 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.2.0.0"; + sha256 = "0hhr4z1jdsbg8jx2416dgpad0lirzdjiv79s4ykhfimn2pqk9liq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118172,6 +118657,7 @@ self: { ]; description = "Bugsnag error reporter for Haskell"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -118303,8 +118789,8 @@ self: { }: mkDerivation { pname = "bugsnag-wai"; - version = "1.0.0.1"; - sha256 = "0f3x4m9nl277rhg2pwrja9xh6fffrwl2dm1cf3jiyngkrbrfck0w"; + version = "1.0.1.1"; + sha256 = "0wi0ip7fjzk3hvw2i19wjj08pn0bvmnx9j68lh4hgc8a0bdr69bg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -119197,8 +119683,8 @@ self: { }: mkDerivation { pname = "burrito"; - version = "2.0.1.13"; - sha256 = "1bg3nd994xrwpirqn2hsbk831fralal946sac3ljslxjlvxar8v6"; + version = "2.0.1.14"; + sha256 = "1mywmf72rsj5p6mrg3454wsihlh1b26x4acb2gp0awx4bg96j09i"; libraryHaskellDepends = [ base bytestring @@ -120631,8 +121117,8 @@ self: { }: mkDerivation { pname = "byteslice"; - version = "0.2.14.0"; - sha256 = "0s9cnb7p1wr5vh3j95a952222xf2xzli451las5il3n04n4rxq1n"; + version = "0.2.15.0"; + sha256 = "10fcb7g9m4rkd6mza2km64agsgkwrbl7crv5hdcd5yljq6gyx2fm"; libraryHaskellDepends = [ base bytestring @@ -122728,8 +123214,8 @@ self: { pname = "cabal-add"; version = "0.1"; sha256 = "1szbi0z8yf98641rwnj856gcfsvvflxwrfxraxy6rl60m7i0mab1"; - revision = "2"; - editedCabalFile = "1qb5xq7r68psc2dpp8wdfcfd1w4nls7xfla1fkc9vppd8zxmi87m"; + revision = "3"; + editedCabalFile = "0siv5ajqxcbs9c0ky94p5qk51w6cgf1zyc3rckxvlc25f4kygw4v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122765,6 +123251,67 @@ self: { } ) { }; + "cabal-add_0_2" = callPackage ( + { + mkDerivation, + base, + bytestring, + Cabal, + cabal-install-parsers, + Cabal-syntax, + containers, + Diff, + directory, + filepath, + mtl, + optparse-applicative, + process, + string-qq, + tasty, + temporary, + }: + mkDerivation { + pname = "cabal-add"; + version = "0.2"; + sha256 = "0fd098gkfmxrhq0k4j1ll5g4xwwzgmhdx0mj9hnp5xanj7z1laxg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + bytestring + Cabal + Cabal-syntax + containers + mtl + ]; + executableHaskellDepends = [ + base + bytestring + cabal-install-parsers + Cabal-syntax + directory + filepath + optparse-applicative + process + ]; + testHaskellDepends = [ + base + bytestring + Cabal + Diff + directory + process + string-qq + tasty + temporary + ]; + description = "Extend Cabal build-depends from the command line"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "cabal-add"; + } + ) { }; + "cabal-appimage" = callPackage ( { mkDerivation, @@ -123132,8 +123679,8 @@ self: { }: mkDerivation { pname = "cabal-cargs"; - version = "1.6.0"; - sha256 = "1kn21l5w838db558nijblar6i3z5jkh12d6l1yccxmd70lrb39vv"; + version = "1.7.0"; + sha256 = "17q51lg7vhdzvy9s8f3zplxa4mij2bjclzxry5f9d2pgiq4290p9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123314,8 +123861,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "5.2.5"; - sha256 = "0nkrvs1a9kj2nqz9pklxzni5wbirwgqim9haqn8lglqliycrdzbx"; + version = "5.2.6"; + sha256 = "081h14nw6spfpr6l0cd9knc2jw8g3zhlwyhq7zrxvfrlqwwwm14w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123762,8 +124309,8 @@ self: { pname = "cabal-flatpak"; version = "0.1.2"; sha256 = "05ig175b2glxppn5wr05pnncqkp8yhhy1m7ymmc1jk5pmiy3zvzi"; - revision = "1"; - editedCabalFile = "0fhwfjrq20zqh64cb0iv2civljacllgy3zqsyjlydmphs95v5hhv"; + revision = "2"; + editedCabalFile = "01iqpfj5nvl19580ckl4b0aljl86svplxzpkavp5r0jbwaqi0ll3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -124659,7 +125206,7 @@ self: { } ) { }; - "cabal-install-parsers_0_6_2" = callPackage ( + "cabal-install-parsers_0_6_3" = callPackage ( { mkDerivation, aeson, @@ -124691,8 +125238,8 @@ self: { }: mkDerivation { pname = "cabal-install-parsers"; - version = "0.6.2"; - sha256 = "1362p021irm0kaz7n8gdjy1ppjk914zza114cmpm87ris0i1a9jn"; + version = "0.6.3"; + sha256 = "1vcy6y1p750g4v9zqmsakrcvw78p43n2b745fl02xq7xyr5lpfij"; libraryHaskellDepends = [ aeson base @@ -125063,8 +125610,8 @@ self: { }: mkDerivation { pname = "cabal-plan"; - version = "0.7.5.0"; - sha256 = "0svvsh3ir9z1pdjbbhi8fkcqv66812hixnv18vifhcw0v8w94ymi"; + version = "0.7.6.0"; + sha256 = "0n6q56gyyiflagka0bhmp077py71xdc9j921yyl7818q6b6ha3hs"; configureFlags = [ "-fexe" ]; isLibrary = true; isExecutable = true; @@ -125553,6 +126100,8 @@ self: { pname = "cabal-sort"; version = "0.1.2.2"; sha256 = "1gyx5d485mzya147d7gwh0i9bkvdqxixrb80bfv5sn710p07bfdz"; + revision = "1"; + editedCabalFile = "0hlz8y734rgcqjlncv0bwi05m30iviz6bi9bsafvsv1w25lxlpc4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -126870,8 +127419,8 @@ self: { }: mkDerivation { pname = "cachix"; - version = "1.7.8"; - sha256 = "18vp2r0q6ibk5snsys7qh65vmshp4344z29pqdp8qfwzk5yqc3hc"; + version = "1.7.9"; + sha256 = "02q0z2f668y826f9rspwwn1kw3ma1igwsh2fp291g4sz8x6z66fv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127031,8 +127580,8 @@ self: { }: mkDerivation { pname = "cachix-api"; - version = "1.7.8"; - sha256 = "0rvmfwmgyn6jpivq45f5v5sg0s007ansjmizflxgiqn4sfqbkndr"; + version = "1.7.9"; + sha256 = "1jp55yvih27xkpky4i6pl37ajwyql84cniz2nhgwdb67qac5nmgi"; libraryHaskellDepends = [ aeson async @@ -131855,10 +132404,10 @@ self: { }: mkDerivation { pname = "cassava"; - version = "0.5.3.2"; - sha256 = "1jd9s10z2y3hizrpy3iaw2vvqmk342zxhwkky57ba39cbli5vlis"; + version = "0.5.4.0"; + sha256 = "0vdbmvb36sg08glig1dqc8kb1s07l5fcn2n0c58iglkv5djsbpnr"; revision = "1"; - editedCabalFile = "0xkqzvj5xd6d37gpf2rm9cp2p2lhkc3jgd0gvlmv99vcmy125rdj"; + editedCabalFile = "1w7mih2wpbgv0bn2cg2ip0ffsn2y7aywqixi1lig30yarsyc873x"; configureFlags = [ "-f-bytestring--lt-0_10_4" ]; libraryHaskellDepends = [ array @@ -132182,16 +132731,21 @@ self: { ) { }; "cassette" = callPackage ( - { mkDerivation, base }: + { + mkDerivation, + base, + profunctors, + }: mkDerivation { pname = "cassette"; - version = "0.1.0"; - sha256 = "04qnk1s4bdj3wbbxdwzzvpnhkcgma8c4qfkg454ybg7f8kyv6h7x"; - libraryHaskellDepends = [ base ]; - description = "A combinator library for simultaneously defining parsers and pretty printers"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; + version = "0.2.0.1"; + sha256 = "1rl5bb7bhprvnqcr55psbgws96xvjfci5nimhly3avs7pvkwxbhj"; + libraryHaskellDepends = [ + base + profunctors + ]; + description = "Combinators to simultaneously define parsers and pretty printers"; + license = lib.licenses.asl20; } ) { }; @@ -132830,41 +133384,36 @@ self: { "cauldron" = callPackage ( { mkDerivation, - algebraic-graphs, base, - bytestring, containers, tasty, tasty-hunit, - text, transformers, }: mkDerivation { pname = "cauldron"; - version = "0.6.1.0"; - sha256 = "04anjjpjvj51x27mq9n2sc88v6398bz5ljzq049d879avl0i08sj"; + version = "0.8.0.0"; + sha256 = "1vkvxkr3lr99xvd4vqga18idcpw3p1mv8hr94qagvfqdxrd68wcl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - algebraic-graphs base - bytestring containers - text ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - algebraic-graphs base containers tasty tasty-hunit - text transformers ]; + doHaddock = false; description = "Dependency injection library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "cauldron-example-wiring"; + broken = true; } ) { }; @@ -133244,8 +133793,8 @@ self: { pname = "cborg"; version = "0.2.10.0"; sha256 = "15y7p5rsv76fpklh4rgrxlxxaivpbchxdfdw96mqqjgw7060gzhp"; - revision = "2"; - editedCabalFile = "0m1ndq1a4yya5p7093lw3ynpcw2q74s73im0bhm9jp6a19cj88m5"; + revision = "3"; + editedCabalFile = "1ahqlq51kjc8cf5sybbmrh4rf6vsbkcd67rhxhrr9rc5w6nl9h27"; libraryHaskellDepends = [ array base @@ -133311,8 +133860,8 @@ self: { pname = "cborg-json"; version = "0.2.6.0"; sha256 = "1p6xdimwypmlsc0zdyw1vyyapnhwn2g8b9n0a83ca6h4r90722yv"; - revision = "3"; - editedCabalFile = "1dlmm5jyl8a8rxpkvr2dk5dlsvxrap3x4pbwnx4mg3q7sz25rs8r"; + revision = "4"; + editedCabalFile = "06pjqx8v7j8f6rvkf84vahva8y02lykaymnjdrjqrc5rgy01c6m0"; libraryHaskellDepends = [ aeson aeson-pretty @@ -136240,7 +136789,7 @@ self: { } ) { }; - "chart-svg_0_8_0_3" = callPackage ( + "chart-svg_0_8_1_0" = callPackage ( { mkDerivation, base, @@ -136264,8 +136813,8 @@ self: { }: mkDerivation { pname = "chart-svg"; - version = "0.8.0.3"; - sha256 = "0qvnxm90vka02pplz9fxncsplnsbxkh9xcp81wik0g795g7xkpsp"; + version = "0.8.1.0"; + sha256 = "1rsix6qdxhsgjg4zp7rh5di6y5mjxjv0mzv9g82ryl3vlcryyaj4"; libraryHaskellDepends = [ base bytestring @@ -147182,10 +147731,10 @@ self: { }: mkDerivation { pname = "co-log-concurrent"; - version = "0.5.1.0"; - sha256 = "07qmx9z03vmgq2cgz4352fsav7r1nx8n7svmrhg2lkdiyp0j7a59"; - revision = "3"; - editedCabalFile = "17pmkgly1882hbwa6b2qb0y1wh4x4nawhw1vl8fsy252caxkck0s"; + version = "0.5.1.1"; + sha256 = "1yw5ljanhc176k4xj1pfqkhq6c63hv5an7pm06vjiakmk6j4rqlg"; + revision = "1"; + editedCabalFile = "071xrzj7bjnb32f5dlsqa726cmw9s9q22bv7ch4gj2r83crng68g"; libraryHaskellDepends = [ base co-log-core @@ -147193,8 +147742,6 @@ self: { ]; description = "Asynchronous backend for co-log library"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -147285,8 +147832,8 @@ self: { }: mkDerivation { pname = "co-log-json"; - version = "0.1.0.0"; - sha256 = "0212dcaw4anjn569a8gpv30k09b9lk99r70bbsh7kb8hb268rk83"; + version = "0.1.0.2"; + sha256 = "0lr8599hqiyg70qw5pmdbrpm1lyps819h7anxxi4ip2r1im2p3xd"; libraryHaskellDepends = [ aeson base @@ -147298,8 +147845,6 @@ self: { ]; description = "Structured messages support in co-log ecosystem"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -152522,8 +153067,8 @@ self: { }: mkDerivation { pname = "compactmap"; - version = "0.1.4.5"; - sha256 = "1xa4wa4qjd7yjghkaakpgrz9kw4iyy0zlc9cpajyysaxdq4k7czf"; + version = "0.1.4.6"; + sha256 = "1lkvhmdz77m6jm43946q2g6ijl7w6kqs9n68g1gzfxw6akmpy39y"; libraryHaskellDepends = [ base vector @@ -156492,8 +157037,10 @@ self: { }: mkDerivation { pname = "conduit-extra"; - version = "1.3.7"; - sha256 = "0mrbaf4lrnczgn1kxjwpmzxk226wprw10y9xg621g74h4s36zgdj"; + version = "1.3.8"; + sha256 = "08l2728vyr3dppnj4z3yagi2265ixp8g8ayhz07x3x88jj73w7s9"; + revision = "1"; + editedCabalFile = "1fq0cs2fcn2kd1mvp9ygsp7rm5qridwp1wwnr60jmpahvihb4cp9"; libraryHaskellDepends = [ async attoparsec @@ -156553,8 +157100,6 @@ self: { conduit, conduit-combinators, conduit-extra, - directory, - doctest, either, exceptions, filepath, @@ -156563,19 +157108,22 @@ self: { monad-control, mtl, regex-posix, + resourcet, semigroups, streaming-commons, text, time, transformers, transformers-base, + transformers-either, unix, unix-compat, + unliftio-core, }: mkDerivation { pname = "conduit-find"; - version = "0.1.0.3"; - sha256 = "13gbpvqxs3k2vlsbdn0vr90z4y8kaz7hlw9bywyqd8jna3ff13a9"; + version = "0.1.0.4"; + sha256 = "03mrfqmxryrv21adk6ijf3isfffjhf91qkjqqrlfkm3fxhz2xp4m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156591,13 +157139,16 @@ self: { monad-control mtl regex-posix + resourcet semigroups streaming-commons text time transformers transformers-base + transformers-either unix-compat + unliftio-core ]; executableHaskellDepends = [ attoparsec @@ -156612,6 +157163,7 @@ self: { monad-control mtl regex-posix + resourcet semigroups streaming-commons text @@ -156619,14 +157171,13 @@ self: { transformers transformers-base unix + unliftio-core ]; testHaskellDepends = [ attoparsec base conduit conduit-combinators - directory - doctest either exceptions filepath @@ -156635,6 +157186,7 @@ self: { monad-control mtl regex-posix + resourcet semigroups streaming-commons text @@ -156642,6 +157194,7 @@ self: { transformers transformers-base unix-compat + unliftio-core ]; description = "A file-finding conduit that allows user control over traversals"; license = lib.licenses.mit; @@ -161102,8 +161655,8 @@ self: { }: mkDerivation { pname = "control-block"; - version = "0.0.1"; - sha256 = "06l9s8inrdqp9z4zsd178rk3211zmhx4acwxq1py801lpb7vgn8v"; + version = "0.0.2"; + sha256 = "0p79ic8yq9jw86jiyxs6k6z740w25ckkdn0lp3rj8rxya2h7viaw"; libraryHaskellDepends = [ base indexed-traversable @@ -161111,8 +161664,6 @@ self: { ]; description = "Higher-order functions with their function arguments at the end, for channeling the full power of BlockArguments and LambdaCase"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -161906,6 +162457,70 @@ self: { } ) { }; + "convex-schema-parser" = callPackage ( + { + mkDerivation, + aeson, + base, + containers, + deepseq, + directory, + filepath, + fsnotify, + HUnit, + mtl, + optparse-applicative, + parsec, + process, + split, + stm, + yaml, + }: + mkDerivation { + pname = "convex-schema-parser"; + version = "0.1.3.0"; + sha256 = "01z32fdxzwqbn8i7izh4amqa3jv4zfkxjn2zcy3fmyc7js72az68"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + base + containers + directory + filepath + mtl + parsec + process + split + ]; + executableHaskellDepends = [ + aeson + base + deepseq + directory + filepath + fsnotify + optparse-applicative + parsec + process + stm + yaml + ]; + testHaskellDepends = [ + base + containers + HUnit + mtl + parsec + ]; + doHaddock = false; + description = "A type-safe client generator for Convex for both Rust and Python"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "convex-schema-parser"; + broken = true; + } + ) { }; + "convexHullNd" = callPackage ( { mkDerivation, @@ -164460,6 +165075,8 @@ self: { pname = "countdown-numbers-game"; version = "0.0.0.1"; sha256 = "1warpkqimxjvqrm1jq4nbj3g3bz009alklqs46dh23p3lrgcif61"; + revision = "1"; + editedCabalFile = "05106icwf7kvnwj5109yim2xyx8q5lxvccbn2dqb0q571h5v1a5q"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -167180,6 +167797,8 @@ self: { pname = "criterion"; version = "1.6.4.0"; sha256 = "0l9gxar759nskhm7gskr3j08bw8515amw6rr4n3zx3978dxg8aq6"; + revision = "1"; + editedCabalFile = "0wwzijzvqrv7swpalr24i3j4pjcjm266ybhhah853d783zz37vzz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -172223,6 +172842,104 @@ self: { } ) { inherit (pkgs) cudd; }; + "cuddle" = callPackage ( + { + mkDerivation, + base, + base16-bytestring, + boxes, + bytestring, + capability, + cborg, + containers, + data-default-class, + foldable1-classes-compat, + generic-optics, + hashable, + hspec, + hspec-megaparsec, + HUnit, + megaparsec, + mtl, + mutable-containers, + optics-core, + optparse-applicative, + ordered-containers, + parser-combinators, + prettyprinter, + QuickCheck, + random, + regex-tdfa, + scientific, + string-qq, + text, + tree-diff, + }: + mkDerivation { + pname = "cuddle"; + version = "0.5.0.0"; + sha256 = "1vjm6v5wf1hbj7ikwmfxf4ah62g4j33nhqqc1xjb9dll5jlvadyn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + base16-bytestring + boxes + bytestring + capability + cborg + containers + data-default-class + foldable1-classes-compat + generic-optics + hashable + megaparsec + mtl + mutable-containers + optics-core + ordered-containers + parser-combinators + prettyprinter + random + regex-tdfa + scientific + text + tree-diff + ]; + executableHaskellDepends = [ + base + base16-bytestring + bytestring + cborg + megaparsec + mtl + optparse-applicative + prettyprinter + random + text + ]; + testHaskellDepends = [ + base + bytestring + data-default-class + hspec + hspec-megaparsec + HUnit + megaparsec + prettyprinter + QuickCheck + string-qq + text + tree-diff + ]; + description = "CDDL Generator and test utilities"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + mainProgram = "cuddle"; + broken = true; + } + ) { }; + "cue-sheet" = callPackage ( { mkDerivation, @@ -176662,6 +177379,36 @@ self: { } ) { }; + "data-debruijn" = callPackage ( + { + mkDerivation, + base, + containers, + deepseq, + ghc-bignum, + ghc-prim, + QuickCheck, + }: + mkDerivation { + pname = "data-debruijn"; + version = "0.1.0.0"; + sha256 = "1zwi7wsznmhph5nljhxzk1rbz5a8qz79j8djdkqc169z5f7fkssv"; + revision = "1"; + editedCabalFile = "1njc7m4g0nwj9ww2gk2z83xbll8pcchmmix109fwgwgz9jv26ckr"; + libraryHaskellDepends = [ + base + containers + deepseq + ghc-bignum + ghc-prim + QuickCheck + ]; + doHaddock = false; + description = "Fast and safe implementation of common compiler machinery"; + license = lib.licenses.agpl3Only; + } + ) { }; + "data-default" = callPackage ( { mkDerivation, @@ -180568,8 +181315,8 @@ self: { }: mkDerivation { pname = "dataframe"; - version = "0.1.0.3"; - sha256 = "0p4syk43nz1b9x9fzm3hgrdgksjs3siqgczaf2bqmgrra61fw8nh"; + version = "0.2.0.1"; + sha256 = "1qgdlmyz4mlvqb1qicspv7yiddyla8kxczx7018myryws9861f52"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181759,7 +182506,7 @@ self: { } ) { }; - "dbus_1_4_0" = callPackage ( + "dbus_1_4_1" = callPackage ( { mkDerivation, base, @@ -181795,8 +182542,8 @@ self: { }: mkDerivation { pname = "dbus"; - version = "1.4.0"; - sha256 = "1rb5q8g0n3fj9b57wlds7ldji029fqym4dvpvq10hmn7qw313dz6"; + version = "1.4.1"; + sha256 = "016xrx8gnvldpwgalpsxzvkwagavpzw9m7j65w5msskaxk474ln7"; libraryHaskellDepends = [ base bytestring @@ -183532,17 +184279,19 @@ self: { containers, hspec, markdown-unlit, + scientific, text, vector, }: mkDerivation { pname = "debug-print"; - version = "0.2.0.1"; - sha256 = "1bcdmnkxcyicw4f57vlx64iyfj3lwz1157s89k4gdyk3ilc2x8g4"; + version = "0.2.1.0"; + sha256 = "1mgl8sc69fbpcx3hrb8b1dcsgs2zzflms5ryf3zbs8j91yvpx02s"; libraryHaskellDepends = [ aeson base containers + scientific text vector ]; @@ -183865,8 +184614,8 @@ self: { pname = "decimal-literals"; version = "0.1.0.1"; sha256 = "0lbpnc4c266fbqjzzrnig648zzsqfaphlxqwyly9xd15qggzasb0"; - revision = "3"; - editedCabalFile = "1650vnqwjsqg2mghsvghiyzg5qqbz36vibkq8614adhyjpcd3w07"; + revision = "4"; + editedCabalFile = "1jiayinmqx35lm7n5dwgfqfq8pafdz7q1ysv8lqqjaiylrlm092r"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base @@ -184304,7 +185053,7 @@ self: { } ) { }; - "deepseq_1_5_1_0" = callPackage ( + "deepseq_1_5_2_0" = callPackage ( { mkDerivation, base, @@ -184312,8 +185061,8 @@ self: { }: mkDerivation { pname = "deepseq"; - version = "1.5.1.0"; - sha256 = "0yz1b3c4fpa1pknwd64fba37wbr7mxzawd0han2ifq70mgiqfkiz"; + version = "1.5.2.0"; + sha256 = "1rgv1kn3igdip34bpn24syirmsjllipd98l301y5n225gw6q1mq9"; libraryHaskellDepends = [ base ghc-prim @@ -185477,6 +186226,8 @@ self: { pname = "deltaq"; version = "1.0.0.0"; sha256 = "00zpvwxar13rq84li7j21ycapdnyx128cs2yqvn6hwnrr8w25w9d"; + revision = "1"; + editedCabalFile = "1i4lkq6w34ik7csx6wpwy4by2vbdijilpynwjf9kr7dfn5ac2gz1"; libraryHaskellDepends = [ base Chart @@ -190552,8 +191303,8 @@ self: { pname = "diagrams-builder"; version = "0.8.0.6"; sha256 = "17yi5dmcxx4sgk3wha386zbv9h69pwq72j8i21vmfh35brxhs9f4"; - revision = "2"; - editedCabalFile = "1mkxn0r6wmxyvdhwly1a6j0z4j234mfv7aimirwl7jmcv55lwbs4"; + revision = "3"; + editedCabalFile = "0pi4509j5i8jgxn0a9z39ac1sr8n2n97v8pfyla9s30sc63ybjag"; configureFlags = [ "-fcairo" "-fps" @@ -190658,7 +191409,7 @@ self: { } ) { }; - "diagrams-cairo_1_4_3" = callPackage ( + "diagrams-cairo_1_5" = callPackage ( { mkDerivation, array, @@ -190685,8 +191436,10 @@ self: { }: mkDerivation { pname = "diagrams-cairo"; - version = "1.4.3"; - sha256 = "0irj7jigi9dfprjilndyx0kwg7vjpbhrsxhlsqc8n1sy1b4s2aha"; + version = "1.5"; + sha256 = "1s0cq1sv158b7pszhipc4f5555zfqz1xxa7hdd13afx7jnh68z3i"; + revision = "1"; + editedCabalFile = "19daz3jx4kc4pqr0ffq4wrpfwk95xz3fnhlacba9q96aw3c1vcnd"; libraryHaskellDepends = [ array base @@ -190780,8 +191533,8 @@ self: { pname = "diagrams-canvas"; version = "1.4.2"; sha256 = "0ns1xmgcjqig7qld7r77rbcrk779cmzj7xfqj6a7sbdci3in2dgm"; - revision = "1"; - editedCabalFile = "08pm7i10k7a046jjrdbzhmlrv05wp171mblgs8y18m6vc8hw87v6"; + revision = "2"; + editedCabalFile = "0if7b5dzgrdqz491ma31kizasiyaa3pc0m570r4ccr4m2gs7jz2m"; libraryHaskellDepends = [ base blank-canvas @@ -190919,8 +191672,8 @@ self: { pname = "diagrams-contrib"; version = "1.4.6"; sha256 = "1x5z361xmqfa503brmf0zwyq3lldm9kgixx90v14s4dsz52my46k"; - revision = "1"; - editedCabalFile = "00zgzy7b3vkjd0f22hbp2lknwl1x5nd6d1ng30wq4qlncwdxqkpz"; + revision = "3"; + editedCabalFile = "07yslc0ds8sj412xgy13dxa7g2a8psgx06nds99yd55bfppias32"; libraryHaskellDepends = [ base circle-packing @@ -191031,10 +191784,8 @@ self: { }: mkDerivation { pname = "diagrams-gi-cairo"; - version = "1.4.2"; - sha256 = "0k6fw1vvqa4pra4czd90n7i7h1vf6hn08a4jip1xbqkf57d89bn6"; - revision = "1"; - editedCabalFile = "1r1ph8nc7xgh3by63dsamkvhi6bvw1bgvhnc8f664iiziaj9p08a"; + version = "1.5"; + sha256 = "1wkr52maf7320k75si6lbwds39i0zw0mhd8b4y5h262ifqfkyi1s"; libraryHaskellDepends = [ array base @@ -191106,8 +191857,8 @@ self: { pname = "diagrams-gtk"; version = "1.4"; sha256 = "1sga2wwkircjgryd4pn9i0wvvcnh3qnhpxas32crpdq939idwsxn"; - revision = "6"; - editedCabalFile = "0fiv5w3pk8rbj6d28qyay13h25px7fs1flzqdriz1n74f6prnj98"; + revision = "7"; + editedCabalFile = "065hmxb3hhaa7g1xbay0wa29zcyivxrp289l9wrak7pg610ri3j3"; libraryHaskellDepends = [ base cairo @@ -191117,8 +191868,6 @@ self: { ]; description = "Backend for rendering diagrams directly to GTK windows"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -191591,8 +192340,8 @@ self: { pname = "diagrams-lib"; version = "1.5"; sha256 = "0gp9k6cfc62j6rlfiziig6j5shf05d0vbcvss40rzjk8qi012i11"; - revision = "1"; - editedCabalFile = "092pidlcpqxrjqjmpwgiznqkjzz1qwbkxb8526k2gi7n1zy2bw3v"; + revision = "2"; + editedCabalFile = "0499yz41prmsixfq2h9virqr9fkn9akllxxf0yc2kqkv7ran2ij9"; libraryHaskellDepends = [ active adjunctions @@ -191676,8 +192425,8 @@ self: { }: mkDerivation { pname = "diagrams-pandoc"; - version = "0.4"; - sha256 = "164f0k1jk8p604h31wypy2z2jy5x0gfbkbmmrd64c9jp7j71iyc4"; + version = "0.4.1"; + sha256 = "1gil467zp3n6wymiw4d492izf1hhac01j4nafmahjh4ybvi840xr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191722,9 +192471,7 @@ self: { ]; description = "A Pandoc filter to express diagrams inline using the Haskell EDSL _Diagrams_"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "diagrams-pandoc"; - broken = true; } ) { }; @@ -191798,6 +192545,8 @@ self: { pname = "diagrams-pgf"; version = "1.5"; sha256 = "13zm00ayyk6gvlh4l2wdmrdqic386v69i3krylgvrajhdsd050al"; + revision = "1"; + editedCabalFile = "0vzi1dim76arwjrh9yqb9l2004ffsir8rws4vx26is5wzxsqf8y1"; libraryHaskellDepends = [ base bytestring @@ -191888,8 +192637,8 @@ self: { pname = "diagrams-postscript"; version = "1.5.2"; sha256 = "08kqhnd5r60kisjraypwjfcri1v4f32rf14js413871pgic4rhy5"; - revision = "1"; - editedCabalFile = "0ndvf9nhvgwvwnc0k9in3n83l3jif1nzsyyrmpk5plif590hj1zp"; + revision = "2"; + editedCabalFile = "060zkv836i1df97nqkna8fnqkyxv4wgmk7yn74whyf1fii4rf86g"; libraryHaskellDepends = [ base bytestring @@ -192013,6 +192762,8 @@ self: { pname = "diagrams-rasterific"; version = "1.5"; sha256 = "02bq6819a8xxa20kggmg9j5wa72zh4gbcvbpv1b1pzbg57bp2s8k"; + revision = "1"; + editedCabalFile = "1f5l5w28kbnajc0kd304fs2h9svc2inb90qbjmqyii30bf0b2n15"; libraryHaskellDepends = [ base bytestring @@ -192075,7 +192826,6 @@ self: { ]; description = "reflex backend for diagrams drawing EDSL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -192211,6 +192961,8 @@ self: { pname = "diagrams-svg"; version = "1.5"; sha256 = "1g11fvcgx99xg71c9sd6m7pfclnzcfx72alcx3avlb4qzz56wn52"; + revision = "2"; + editedCabalFile = "1d7n707vmcbk1l1fi956hagyyzzn3hd11wxyabm1mirv8qxrha0s"; libraryHaskellDepends = [ base base64-bytestring @@ -195478,8 +196230,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "1.17.1"; - sha256 = "1lw1n8m297ad0rcbn48ysg85l35sg5bh3gwbnm2698cd051b4yad"; + version = "1.18.0"; + sha256 = "0g3xlhjfqslv6565fgzq0m0qdsf50kv9m5shb71yr4hwvar4w7qc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195516,8 +196268,6 @@ self: { ]; description = "Write bots for Discord in Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -200287,7 +201037,7 @@ self: { } ) { }; - "doctest_0_24_0" = callPackage ( + "doctest_0_24_2" = callPackage ( { mkDerivation, base, @@ -200314,8 +201064,8 @@ self: { }: mkDerivation { pname = "doctest"; - version = "0.24.0"; - sha256 = "1cylb84kmlw7a38xnfyx0sxcpgahmfm7bsbv0vf2x3slsgz597kx"; + version = "0.24.2"; + sha256 = "1dpffnr24zaricmkwc13npap569crwwfha1w9vz3fhywmh0dnfjk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -200489,10 +201239,8 @@ self: { }: mkDerivation { pname = "doctest-exitcode-stdio"; - version = "0.0"; - sha256 = "1g3c7yrqq2mwqbmvs8vkx1a3cf0p0x74b7fnn344dsk7bsfpgv0x"; - revision = "2"; - editedCabalFile = "0gfnxkbm126m0d4pnqgl5ca6ab8x5p1vpbxjxgz1sxczablsmk5b"; + version = "0.0.0.1"; + sha256 = "0kg5xiw4giyvqpcj6cxqqnysvixhxlwm0pbg3qks8dzwb5w79dvk"; libraryHaskellDepends = [ base doctest-lib @@ -200522,6 +201270,8 @@ self: { pname = "doctest-extract"; version = "0.1.2"; sha256 = "1dizs0r9pdankbv5ijfgqva5ha8p5xxl7x8y1sjql6h7ch8pz0p6"; + revision = "1"; + editedCabalFile = "1m71h2iwizh9rms2dq29wwzbsfz8qzqw7q8vldpmk7nm1572rhss"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -200639,6 +201389,92 @@ self: { } ) { }; + "doctest-parallel_0_4" = callPackage ( + { + mkDerivation, + base, + base-compat, + Cabal, + code-page, + containers, + deepseq, + directory, + exceptions, + filepath, + ghc, + ghc-exactprint, + ghc-paths, + Glob, + hspec, + hspec-core, + HUnit, + mockery, + process, + QuickCheck, + random, + setenv, + silently, + stringbuilder, + syb, + template-haskell, + transformers, + unordered-containers, + }: + mkDerivation { + pname = "doctest-parallel"; + version = "0.4"; + sha256 = "1y907fg2y7ayddwv38rjv6nyc18w682dxwkq3msqnlkddglqlxfx"; + libraryHaskellDepends = [ + base + base-compat + Cabal + code-page + containers + deepseq + directory + exceptions + filepath + ghc + ghc-exactprint + ghc-paths + Glob + process + random + syb + template-haskell + transformers + unordered-containers + ]; + testHaskellDepends = [ + base + base-compat + code-page + containers + deepseq + directory + exceptions + filepath + ghc + ghc-paths + hspec + hspec-core + HUnit + mockery + process + QuickCheck + setenv + silently + stringbuilder + syb + transformers + ]; + doHaddock = false; + description = "Test interactive Haskell examples"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + } + ) { }; + "doctest-prop" = callPackage ( { mkDerivation, @@ -201141,8 +201977,8 @@ self: { }: mkDerivation { pname = "dollaridoos"; - version = "0.1.0.0"; - sha256 = "1pipbyfpny8mq540rpfkgkwbc3mc13yf6xm1h9vxm0fnaa8kcbw9"; + version = "0.2.0.0"; + sha256 = "09hbm1dkgg8qb4y22hbqwmy858nbaxjn9vizv7z58gd2756gia7s"; libraryHaskellDepends = [ base profunctors @@ -201263,8 +202099,6 @@ self: { ]; description = "Simple monadic DOM parser"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -202391,8 +203225,8 @@ self: { }: mkDerivation { pname = "double-x-encoding"; - version = "1.2.1"; - sha256 = "0sg8sh9a1krzfhdwxcd3ja56kzr6hif11s4iqicrdqz3qgi905ia"; + version = "1.2.2"; + sha256 = "0wzawzwsw2dkmw5yvnva8la6v2iwr5ni353imi0qmsgssvg0va6s"; libraryHaskellDepends = [ base Cabal-syntax @@ -202405,8 +203239,6 @@ self: { ]; description = "Encoding scheme to encode any Unicode string with only [0-9a-zA-Z_]"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -204970,8 +205802,8 @@ self: { pname = "dumb-cas"; version = "0.2.1.1"; sha256 = "0rqh1sy500gbgqr69z220yb8g7gp117z0iw1kly9zxqhrzn3sv9f"; - revision = "1"; - editedCabalFile = "031hcc34r20gpvsicllwcvvzirx2bm5nsdabp75a0m05rj3wzmvv"; + revision = "2"; + editedCabalFile = "0gg7yxb8r8f53pw6j33ifm9l5a934q7x261kbydj1kf8zbq0pwfd"; libraryHaskellDepends = [ base containers @@ -204987,8 +205819,6 @@ self: { ]; description = "A computer “algebra” system that knows nothing about algebra, at the core"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -205706,8 +206536,8 @@ self: { }: mkDerivation { pname = "dwergaz"; - version = "0.3.0.2"; - sha256 = "0849adznjgfg4z1llq5kfwi3ypjj9bj1jw7anax6g86izzvs75jj"; + version = "0.3.1.0"; + sha256 = "1c40js81v95hl90zv7nbsmdn8z05s8f2arjhzvsbimckvjrg03x9"; libraryHaskellDepends = [ base pretty @@ -209173,8 +210003,8 @@ self: { }: mkDerivation { pname = "effect-stack"; - version = "0.3"; - sha256 = "08zalj8svp78ykqbf5nhd6khgygz8dplcvjd19w3hvgm08y4kxqi"; + version = "0.3.0.1"; + sha256 = "04y5rqvjzz5fsvlkwqwjlwngz3j3p83anzh77d7fbmkii8fb9g87"; libraryHaskellDepends = [ base constraints @@ -209183,8 +210013,6 @@ self: { ]; description = "Reducing the pain of transformer stacks with duplicated effects"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -209254,6 +210082,73 @@ self: { } ) { }; + "effectful_2_6_0_0" = callPackage ( + { + mkDerivation, + async, + base, + bytestring, + containers, + directory, + effectful-core, + exceptions, + lifted-base, + primitive, + process, + safe-exceptions, + stm, + strict-mutable-base, + tasty, + tasty-bench, + tasty-hunit, + text, + time, + unix, + unliftio, + }: + mkDerivation { + pname = "effectful"; + version = "2.6.0.0"; + sha256 = "1k850pgslnfdhfwqcwr4hv2ymab4cszklrh4rxmwhwixrbb7m3l8"; + libraryHaskellDepends = [ + async + base + bytestring + directory + effectful-core + process + stm + strict-mutable-base + time + unliftio + ]; + testHaskellDepends = [ + base + containers + effectful-core + exceptions + lifted-base + primitive + safe-exceptions + strict-mutable-base + tasty + tasty-hunit + unliftio + ]; + benchmarkHaskellDepends = [ + async + base + tasty-bench + text + unix + unliftio + ]; + description = "An easy to use, performant extensible effects library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + "effectful-core" = callPackage ( { mkDerivation, @@ -209287,6 +210182,40 @@ self: { } ) { }; + "effectful-core_2_6_0_0" = callPackage ( + { + mkDerivation, + base, + containers, + deepseq, + exceptions, + monad-control, + primitive, + strict-mutable-base, + transformers-base, + unliftio-core, + }: + mkDerivation { + pname = "effectful-core"; + version = "2.6.0.0"; + sha256 = "1zi1cgnyfzz5csml8saf9zxixrc7q074ywgh0cjd5k2v3zj79rw1"; + libraryHaskellDepends = [ + base + containers + deepseq + exceptions + monad-control + primitive + strict-mutable-base + transformers-base + unliftio-core + ]; + description = "An easy to use, performant extensible effects library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + "effectful-plugin" = callPackage ( { mkDerivation, @@ -209316,6 +210245,34 @@ self: { } ) { }; + "effectful-plugin_2_0_0_0" = callPackage ( + { + mkDerivation, + base, + containers, + effectful-core, + ghc, + }: + mkDerivation { + pname = "effectful-plugin"; + version = "2.0.0.0"; + sha256 = "11xy98k20r9bw2436digcn3mjdk5qlf12i0h7d0xizsqsdazyvy6"; + libraryHaskellDepends = [ + base + containers + effectful-core + ghc + ]; + testHaskellDepends = [ + base + effectful-core + ]; + description = "A GHC plugin for improving disambiguation of effects"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + "effectful-st" = callPackage ( { mkDerivation, @@ -210247,15 +211204,13 @@ self: { profunctors, QuickCheck, semigroupoids, - test-framework, - test-framework-quickcheck2, + tasty, + tasty-quickcheck, }: mkDerivation { pname = "either"; - version = "5.0.2"; - sha256 = "1gl748ia68bldbqb2fl7vjv44g0y8ivn659fjmy1qyypgyb5p95z"; - revision = "2"; - editedCabalFile = "1lx6ls938vssg75ib2fr1ww4nsig2rkhjc6x57yfinx1yb9r62vz"; + version = "5.0.3"; + sha256 = "00a8h2jgrpqdlsi8vjrm2qa6rmw33ksirxv9s6i90nlmhhg6jrkd"; libraryHaskellDepends = [ base bifunctors @@ -210266,8 +211221,8 @@ self: { testHaskellDepends = [ base QuickCheck - test-framework - test-framework-quickcheck2 + tasty + tasty-quickcheck ]; description = "Combinators for working with sums"; license = lib.licenses.bsd3; @@ -210612,18 +211567,18 @@ self: { mkDerivation, base, containers, + ghc-prim, text, unordered-containers, }: mkDerivation { pname = "ekg-core"; - version = "0.1.1.8"; - sha256 = "028c3g1fz0rfxpfn98wxxmklnxx3szwvjxl9n9ls2w011vqslvia"; - revision = "1"; - editedCabalFile = "1lwss6aha8bjmjb3xji58jznca7k7nss76qva5pihgb20j7xs7vi"; + version = "0.1.2.0"; + sha256 = "12d4xzkdczbrmhhpgymf9brjn0kpq5645dq57xw05sylalfyslzz"; libraryHaskellDepends = [ base containers + ghc-prim text unordered-containers ]; @@ -216854,8 +217809,8 @@ self: { }: mkDerivation { pname = "erebos-tester"; - version = "0.3.2"; - sha256 = "0m3fi03q0l55r6amxcq0l01sqcg8m6hqbx1zhdaq75s3yyx4wb71"; + version = "0.3.3"; + sha256 = "0xcwijr034dw5s4f6jyb727449wayyd31lv8afmfr49i0jmwhgay"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -217766,6 +218721,79 @@ self: { } ) { }; + "ersatz_0_6" = callPackage ( + { + mkDerivation, + array, + attoparsec, + base, + bytestring, + containers, + data-default, + fail, + lens, + mtl, + optparse-applicative, + parsec, + process, + semigroups, + streams, + tasty, + tasty-hunit, + temporary, + transformers, + unordered-containers, + }: + mkDerivation { + pname = "ersatz"; + version = "0.6"; + sha256 = "05wg6hvrxijdw6pnzpzdcf85ybjdhax731f70gxl1hvwfllrp43j"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array + attoparsec + base + bytestring + containers + data-default + lens + mtl + process + semigroups + streams + temporary + transformers + unordered-containers + ]; + executableHaskellDepends = [ + array + base + bytestring + containers + fail + lens + mtl + optparse-applicative + parsec + semigroups + ]; + testHaskellDepends = [ + array + base + containers + data-default + tasty + tasty-hunit + ]; + description = "A monad for expressing SAT or QSAT problems using observable sharing"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + "ersatz-toysat" = callPackage ( { mkDerivation, @@ -220820,10 +221848,8 @@ self: { }: mkDerivation { pname = "eventlog2html"; - version = "0.11.1"; - sha256 = "1rfyw285g48c7dck8kjykx9n4brw7ngm275n64g1wwwkm4ybn43n"; - revision = "1"; - editedCabalFile = "0kxb0990f8x394j2l7y5y2xz43lqdlm4bc6gihfqnkc6w5qsqhji"; + version = "0.12.0"; + sha256 = "1jbp46hcx4kcnkln9vd8b36fjwhxlmlcv08narr6w5bfxz1dpzy6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -222220,25 +223246,23 @@ self: { } ) { }; - "exceptions_0_10_9" = callPackage ( + "exceptions_0_10_10" = callPackage ( { mkDerivation, base, mtl, QuickCheck, stm, + tasty, + tasty-hunit, + tasty-quickcheck, template-haskell, - test-framework, - test-framework-hunit, - test-framework-quickcheck2, transformers, }: mkDerivation { pname = "exceptions"; - version = "0.10.9"; - sha256 = "0h5y2rqg7kz4ic59n5i7619766mzfpqcdill3l712nihs3q2nk4v"; - revision = "1"; - editedCabalFile = "11p0d1gd3ybgbyplhr18wy2k7cy3hf6ab288ymy3ddayc4a927k6"; + version = "0.10.10"; + sha256 = "1cddmj2y5h2hqjgmk14c698g8hhq0x2rycdl5vgz8vvzzsg83zq8"; libraryHaskellDepends = [ base mtl @@ -222251,10 +223275,10 @@ self: { mtl QuickCheck stm + tasty + tasty-hunit + tasty-quickcheck template-haskell - test-framework - test-framework-hunit - test-framework-quickcheck2 transformers ]; description = "Extensible optionally-pure exceptions"; @@ -223438,8 +224462,8 @@ self: { }: mkDerivation { pname = "exotic-list-monads"; - version = "1.1.1"; - sha256 = "063nmcqp9swzmhbdbdvl63kll1mqw3gywwrzx64s5hdk893rzkrf"; + version = "1.2.0"; + sha256 = "1wxdhh869v69schj88xz9anzmj4qly3wrh8jmkwga6h5krhvqkgh"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base @@ -223450,6 +224474,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Non-standard monads on lists and non-empty lists"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -224609,8 +225635,10 @@ self: { }: mkDerivation { pname = "extended-reals"; - version = "0.2.6.0"; - sha256 = "0cy5fb6b9kidxqadpymy0pqvswlsqxwxqqhfx9di1l66ynks2b6z"; + version = "0.2.7.0"; + sha256 = "0q9k3fl8n30mlsv1c459470bjd4bqyg0vqycjc76qkzxwljl6pwk"; + revision = "1"; + editedCabalFile = "1w69ym1cpsdxh7344j6j0kabrdazfx7n9yzqgxcjplsd92gwr97k"; libraryHaskellDepends = [ base deepseq @@ -227092,8 +228120,8 @@ self: { }: mkDerivation { pname = "fast-logger"; - version = "3.2.5"; - sha256 = "0cddv18k0n1hdbjf0szqq7pl5r0h4srzxy8pmr66a4pc1w410lii"; + version = "3.2.6"; + sha256 = "1hy5cczg64q6cafahfcfjsij48w80zskgjnn3ks0w5w4vqiccrmx"; libraryHaskellDepends = [ array auto-update @@ -228555,8 +229583,8 @@ self: { }: mkDerivation { pname = "fbrnch"; - version = "1.6.2"; - sha256 = "0yqpxma3qgdkacbabaffz0498phl79yvn2pbhn10gb6f18lzxcsf"; + version = "1.7.1"; + sha256 = "1xsq70xpd0qgz0krlmm31b821ir94sc8qa0qpshjlcfja882p11l"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -229609,6 +230637,34 @@ self: { } ) { }; + "fedora-releases_0_3_0" = callPackage ( + { + mkDerivation, + aeson, + base, + bodhi, + cached-json-file, + extra, + safe, + }: + mkDerivation { + pname = "fedora-releases"; + version = "0.3.0"; + sha256 = "1lipp022kxj72i9d25f8if4dppa706zvb1a62lx3gw1xw1p55j8b"; + 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, @@ -229630,8 +230686,8 @@ self: { }: mkDerivation { pname = "fedora-repoquery"; - version = "0.7.2"; - sha256 = "0glmc6fqcw7r400nczlnalbdp98ddvvywrxng9jz5y7bindy1vh7"; + version = "0.7.3"; + sha256 = "1sdyvbvrh1z32y8hsbfwzyrffl57niri0rgpp580syh11l621sj1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -232470,6 +233526,8 @@ self: { pname = "filepath"; version = "1.5.4.0"; sha256 = "1bswvf1hrsslb8xlwvsccz12h5habrdpqq4zgcyjg4zm6b28dajl"; + revision = "1"; + editedCabalFile = "0b7hmqygr29ppazwbmrrl60bshpqg7zhvzq5g4wl3pgj19iw55ql"; libraryHaskellDepends = [ base bytestring @@ -232732,8 +233790,8 @@ self: { pname = "filestore"; version = "0.6.5"; sha256 = "0z29273vdqjsrj4vby0gp7d12wg9nkzq9zgqg18db0p5948jw1dh"; - revision = "2"; - editedCabalFile = "1m6qi647v475gcim8nfb6cgahhc99rszc8k1z2mpzm797qxg9xbs"; + revision = "3"; + editedCabalFile = "003vfb6j47vihjba1py9ls9l269gkg89rf732gb5lwdximxg7wf0"; libraryHaskellDepends = [ base bytestring @@ -233622,8 +234680,8 @@ self: { }: mkDerivation { pname = "finite"; - version = "1.4.1.2"; - sha256 = "10hnqz4klgrpfbvla07h8yghpv22bsyijf0cibfzwl9j779vb4nc"; + version = "1.5.0.0"; + sha256 = "02fw2m1qn4rpz25jnd9vb16417srpzwz0lhzin04dwc6gjq74i8g"; libraryHaskellDepends = [ array base @@ -238635,17 +239693,15 @@ self: { QuickCheck, quickcheck-instances, tagged, + tasty, tasty-bench, - test-framework, - test-framework-quickcheck2, + tasty-quickcheck, transformers, }: mkDerivation { pname = "foldable1-classes-compat"; - version = "0.1.1"; - sha256 = "17xmc3525crnd86rrl2c50rfnhibwh5xbqrnmvzvyns4d3l4vvdg"; - revision = "2"; - editedCabalFile = "0m1cd2g2f2983nb9h4d3amq058k2yri6hbh5v026y5lxhg9fq0i8"; + version = "0.1.2"; + sha256 = "1n6a8ga07gdwnhy485qzy23algcmnzppfcxfy8c6qipamn4hw5p3"; libraryHaskellDepends = [ base ghc-prim @@ -238656,8 +239712,8 @@ self: { containers QuickCheck quickcheck-instances - test-framework - test-framework-quickcheck2 + tasty + tasty-quickcheck transformers ]; benchmarkHaskellDepends = [ @@ -240593,8 +241649,8 @@ self: { }: mkDerivation { pname = "fortran-src"; - version = "0.16.5"; - sha256 = "1adqczpb1d2zclgvg03z3izcmmncgxj7bff9zz5p8zc77v8865m4"; + version = "0.16.7"; + sha256 = "12d46b232aks34nvb3jc66dhz0nxq3z8ngbs6rfn71paj2mfj5cv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -242435,8 +243491,8 @@ self: { }: mkDerivation { pname = "freckle-app"; - version = "1.23.1.0"; - sha256 = "0ik1ay4vm0qw5jg1zvbdfl1p0gxawlrah9lphg9y2cqq48yj4zql"; + version = "1.23.3.0"; + sha256 = "0405dj2isvhgib85km2fppq32aan5sghsny2ilwv39pr2g6kkwkm"; libraryHaskellDepends = [ aeson annotated-exception @@ -242677,8 +243733,8 @@ self: { }: mkDerivation { pname = "freckle-http"; - version = "0.1.0.0"; - sha256 = "1a8isx1z9injzmbcfj19i4m8cccbl754chx8ayxww76ahd1s6v81"; + version = "0.2.0.0"; + sha256 = "0an1bqpsslr8zlpmvvp5hjw5fwpwqjr6w0m4ib7sa1d0218xzdnz"; libraryHaskellDepends = [ aeson annotated-exception @@ -243796,8 +244852,8 @@ self: { pname = "free-vector-spaces"; version = "0.1.5.2"; sha256 = "0p0flpai3n9ism9dd3kyf1fa8s8rpb4cc00m3bplb9s8zb6aghpb"; - revision = "2"; - editedCabalFile = "1jlaljmfhsb4yb8iqmw1zaa3kkiayg6li6bk04a3camh2jc8k22m"; + revision = "3"; + editedCabalFile = "1nhbj4ch0fayqbd90qzwhlda929rny81422grdqifghqrr1lq4lv"; libraryHaskellDepends = [ base lens @@ -245403,10 +246459,8 @@ self: { }: mkDerivation { pname = "fs-api"; - version = "0.3.0.1"; - sha256 = "0yjfldwmxqg4fgcymyb9bb9axwsfsnldnxxfmk54spkmiab8kr49"; - revision = "1"; - editedCabalFile = "17z9clqfs0hm8jl2hdgk0jqvjdxm8i4lk0av489nhsj2qp6ikvmy"; + version = "0.4.0.0"; + sha256 = "1aw9x4cgflm2fy5ps3cgpwfzgfp7r7r9fps2vkzbqz03gjpql0dm"; libraryHaskellDepends = [ base bytestring @@ -245434,8 +246488,6 @@ self: { ]; description = "Abstract interface for the file system"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -245461,6 +246513,7 @@ self: { bifunctors, bytestring, containers, + deepseq, fs-api, generics-sop, io-classes, @@ -245479,10 +246532,8 @@ self: { }: mkDerivation { pname = "fs-sim"; - version = "0.3.1.0"; - sha256 = "0qq7fc9b37haz2dcywyxhkszy58i3fr7z8nyrrp16x46v5cs6jwq"; - revision = "1"; - editedCabalFile = "1pbpi5hngw723z2nr9zwp9rzfxh1p1q8jk8ln01brm7xf3kkq2pb"; + version = "0.4.0.0"; + sha256 = "0wirx3mk2dmjw13adbf4d9qpgx7b9kk0y5my7s3yx1lsm2z9m4pw"; libraryHaskellDepends = [ base base16-bytestring @@ -245501,6 +246552,7 @@ self: { bifunctors bytestring containers + deepseq fs-api generics-sop io-classes @@ -245517,7 +246569,6 @@ self: { ]; description = "Simulated file systems"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -246985,8 +248036,8 @@ self: { }: mkDerivation { pname = "functor-combinators"; - version = "0.4.1.3"; - sha256 = "0123y4n01rga8kb86w74hzjwvz8jfr15c1abkrrngacp60bd25rl"; + version = "0.4.1.4"; + sha256 = "1yqfbnwv649viy1qpzvk8f9xip0id1k7q6m0j2ssiapfpig43xys"; libraryHaskellDepends = [ assoc base @@ -247031,8 +248082,6 @@ self: { ]; description = "Tools for functor combinator-based program design"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -249083,8 +250132,8 @@ self: { }: mkDerivation { pname = "fxpak"; - version = "0.1.2"; - sha256 = "1mrpbz32aczrh5aw550p1vzvj8zqhcnmj574sc012r3z1c0g1cin"; + version = "0.1.3"; + sha256 = "1fn88wzhazx9jwddjxq4l4q1xr9g9yl5dsbc9slizb8mnkrkacd9"; libraryHaskellDepends = [ base bytestring @@ -249092,8 +250141,6 @@ self: { ]; description = "Interface to the FXPak/FXPak Pro USB interface"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -252083,6 +253130,8 @@ self: { pname = "generic-aeson"; version = "0.2.0.14"; sha256 = "0ssras2db9fqgyfhhw2pk827xf4dd4g9s9vwj8g85vaqxyvzyd8x"; + revision = "1"; + editedCabalFile = "047mgqq08f1zmnw9400b246bjgpg1r5barz53kbqhfqiaq7ybz85"; libraryHaskellDepends = [ aeson attoparsec @@ -252096,8 +253145,6 @@ self: { ]; description = "Derivation of Aeson instances using GHC generics"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -252486,8 +253533,8 @@ self: { { mkDerivation, base }: mkDerivation { pname = "generic-enumeration"; - version = "0.1.0.3"; - sha256 = "02ywn0byg4g42hl28mqc07jifj48jxzmnjm4plfdz4pnxs40kwzg"; + version = "0.1.0.4"; + sha256 = "0f83fnvmmi4yvdn9i2r1vkpk6cy4lqpxgjv26f380akyf30av90p"; libraryHaskellDepends = [ base ]; description = "Generically derived enumerations"; license = lib.licenses.mit; @@ -252656,6 +253703,8 @@ self: { pname = "generic-lens-lite"; version = "0.1.1"; sha256 = "1ldc13g7l5jjgca80c2hymkbgq9pf8b5j4x3dr83kz6wq2p76q12"; + revision = "1"; + editedCabalFile = "1wg3qxik9mgd49jkrgzargpncj6d1pg1zy13xg9yck5w4i10rixw"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Monomorphic field lens like with generic-lens"; @@ -252667,8 +253716,8 @@ self: { { mkDerivation, base }: mkDerivation { pname = "generic-lexicographic-order"; - version = "0.1.0.0"; - sha256 = "096c1fan7isxynyk968llm3p204kgcmh8xp4krnmspz0xvcn7sh0"; + version = "0.1.0.1"; + sha256 = "01vylkficx9ylri9200pvqgqc89lm9x4iy3s4bfal96pv8q59knx"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Derive Bounded and Enum for sum types and Enum for product types"; @@ -252845,6 +253894,8 @@ self: { pname = "generic-optics-lite"; version = "0.1.1"; sha256 = "1dd2dw72fyyimnyq8bw57k7lbh0lnjipvk08dyj87h357ykjv3ql"; + revision = "1"; + editedCabalFile = "1z3bf20fj03bfp4zigdxzw4v30hmxgwkdzdmgbn4hibpcz2j24p0"; libraryHaskellDepends = [ base generic-lens-lite @@ -254849,8 +255900,6 @@ self: { ]; description = "GenValidity support for URI"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -256507,7 +257556,7 @@ self: { } ) { }; - "ghc_9_12_1" = + "ghc_9_12_2" = callPackage ( { @@ -256541,8 +257590,8 @@ self: { }: mkDerivation { pname = "ghc"; - version = "9.12.1"; - sha256 = "179gp0lqrxhvzc0pyxwmkvxpilm6c201s1pjws3dl8qqyddliiqs"; + version = "9.12.2"; + sha256 = "0l5rrnfv933m37dziqaf5iv4nqirig1mfaj037by94s486ggx5f7"; setupHaskellDepends = [ base Cabal @@ -257217,8 +258266,8 @@ self: { }: mkDerivation { pname = "ghc-debugger"; - version = "0.2.0.0"; - sha256 = "0k02y36kz9412i0fk9vvdidcyc5qh0cq47jbgk78i8c7276dm4j3"; + version = "0.4.0.0"; + sha256 = "0nzmlnhv5liwkibva0djvc06c0d2wwpqa9x4lvpb2snkid0yliyl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -257228,10 +258277,12 @@ self: { binary bytestring containers + directory exceptions filepath ghc ghci + hie-bios mtl process unix @@ -258123,6 +259174,63 @@ self: { } ) { }; + "ghc-hie" = callPackage ( + { + mkDerivation, + array, + base, + bytestring, + containers, + deepseq, + directory, + filepath, + ghc, + ghc-boot, + hspec, + hspec-discover, + process, + QuickCheck, + temporary, + transformers, + }: + mkDerivation { + pname = "ghc-hie"; + version = "0.0.2"; + sha256 = "1z51fbm0n9knqrp01gqd7xx0pkfwyr9kgaginvqmdw45gi8rqhm7"; + libraryHaskellDepends = [ + array + base + bytestring + containers + deepseq + directory + filepath + ghc + ghc-boot + transformers + ]; + testHaskellDepends = [ + array + base + bytestring + containers + deepseq + directory + filepath + ghc + ghc-boot + hspec + process + QuickCheck + temporary + transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "HIE-file parsing machinery that supports multiple versions of GHC"; + license = lib.licenses.mit; + } + ) { }; + "ghc-hotswap" = callPackage ( { mkDerivation, @@ -259807,8 +260915,8 @@ self: { }: mkDerivation { pname = "ghc-prof"; - version = "1.4.1.13"; - sha256 = "0g85216s10pm515wi0dl95znq3vdac3zvagizg8vy82zfmsgxwcp"; + version = "1.4.1.14"; + sha256 = "16zl8x8abkh2fbyzsd6k48vm2na0bbm0cv2b9sfi3jac7mi3v3kq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -260654,16 +261762,18 @@ self: { base, containers, ghc, + template-haskell, transformers, }: mkDerivation { pname = "ghc-tcplugin-api"; - version = "0.14.0.0"; - sha256 = "089lw1gjxrk54s1agl5gxkwg49368z6i6m260snz05nfia4m7fak"; + version = "0.15.0.0"; + sha256 = "024gwhs575rirrizlriigxvz0b9az2c63vbbdfm3dd4qa5ln3jmq"; libraryHaskellDepends = [ base containers ghc + template-haskell transformers ]; description = "An API for type-checker plugins"; @@ -261489,6 +262599,68 @@ self: { } ) { }; + "ghci4luatex" = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + cmdargs, + containers, + hspec, + network-simple, + process, + QuickCheck, + stm, + text, + }: + mkDerivation { + pname = "ghci4luatex"; + version = "0.1"; + sha256 = "1x3kdwxcallnyvssbxaj4scf6rc0f5yx3js1bzzwmi9p3imxj4x8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + base + bytestring + cmdargs + containers + network-simple + process + stm + text + ]; + executableHaskellDepends = [ + aeson + base + bytestring + cmdargs + containers + network-simple + process + stm + text + ]; + testHaskellDepends = [ + aeson + base + bytestring + cmdargs + containers + hspec + network-simple + process + QuickCheck + stm + text + ]; + description = "A GHCi session in LaTeX"; + license = lib.licenses.bsd3; + mainProgram = "ghci4luatex"; + } + ) { }; + "ghcid" = callPackage ( { mkDerivation, @@ -261896,8 +263068,8 @@ self: { }: mkDerivation { pname = "ghcitui"; - version = "0.4.1.0"; - sha256 = "05c9s43qhzxc280xycicwrm95kl1jpz14pzlcnv0a29i8589gpdz"; + version = "0.4.1.1"; + sha256 = "1s7imyvv7pg3yyrajgl5fqv1q35188ianm8y689mzb5ikbwr5wq4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -261969,8 +263141,8 @@ self: { { mkDerivation }: mkDerivation { pname = "ghcjs-base"; - version = "0.8.0.3"; - sha256 = "1cff0sgcwdas30dgxg9mdab5rk0s1v2qkkb9cr47dl3d5wmc4add"; + version = "0.8.0.4"; + sha256 = "081w3234jramsmafnl86v37lwbckr2vc93gr9pdwc31yzni9kbml"; description = "base library for GHCJS"; license = lib.licenses.mit; platforms = [ "javascript-ghcjs" ]; @@ -262755,6 +263927,8 @@ self: { pname = "ghostscript-parallel"; version = "0.0.1"; sha256 = "1sja6nhp8p9h2z0yr5qwxd8d59zzpb11ybmsbargza6ddaplpxny"; + revision = "1"; + editedCabalFile = "1sd1rh0fm29c3h4vm42fv6vbqplcm32ilqzimdp7vxfp3mhbblpr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -263994,51 +265168,6 @@ self: { ) { inherit (pkgs) libgit2-glib; }; "gi-gio" = callPackage ( - { - mkDerivation, - base, - bytestring, - Cabal, - containers, - gi-glib, - gi-gobject, - glib, - haskell-gi, - haskell-gi-base, - haskell-gi-overloading, - text, - transformers, - }: - mkDerivation { - pname = "gi-gio"; - version = "2.0.37"; - sha256 = "0a3z1aj1fqnpwxcf27anjcp2wpg3mbn86xybk150260bb00jzxpb"; - setupHaskellDepends = [ - base - Cabal - gi-glib - gi-gobject - haskell-gi - ]; - libraryHaskellDepends = [ - base - bytestring - containers - gi-glib - gi-gobject - haskell-gi - haskell-gi-base - haskell-gi-overloading - text - transformers - ]; - libraryPkgconfigDepends = [ glib ]; - description = "Gio bindings"; - license = lib.licenses.lgpl21Only; - } - ) { inherit (pkgs) glib; }; - - "gi-gio_2_0_38" = callPackage ( { mkDerivation, base, @@ -264080,7 +265209,6 @@ self: { libraryPkgconfigDepends = [ glib ]; description = "Gio bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; } ) { inherit (pkgs) glib; }; @@ -265129,6 +266257,53 @@ self: { } ) { inherit (pkgs) gtk4; }; + "gi-gtk4-layer-shell" = callPackage ( + { + mkDerivation, + base, + bytestring, + Cabal, + containers, + gi-gdk4, + gi-gtk4, + gtk4-layer-shell, + haskell-gi, + haskell-gi-base, + haskell-gi-overloading, + text, + transformers, + }: + mkDerivation { + pname = "gi-gtk4-layer-shell"; + version = "0.1.0"; + sha256 = "0x1bafara3nq2f76lmmzvkm51i16za0fymh0zpvqx4mvac8lhpzz"; + setupHaskellDepends = [ + base + Cabal + gi-gdk4 + gi-gtk4 + haskell-gi + ]; + libraryHaskellDepends = [ + base + bytestring + containers + gi-gdk4 + gi-gtk4 + haskell-gi + haskell-gi-base + haskell-gi-overloading + text + transformers + ]; + libraryPkgconfigDepends = [ gtk4-layer-shell ]; + description = "gtk4-layer-shell bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { inherit (pkgs) gtk4-layer-shell; }; + "gi-gtkosxapplication" = callPackage ( { mkDerivation, @@ -266539,8 +267714,8 @@ self: { }: mkDerivation { pname = "gi-webkit"; - version = "6.0.4"; - sha256 = "0cabpym4p654psrck548wpkdf43wbm8zn0r2lrqiijx72f6xwij5"; + version = "6.0.5"; + sha256 = "1a7nmzry1h24i35imhp2d9x32bn32fwswpvrp72lk8yyb12v7i5g"; setupHaskellDepends = [ base Cabal @@ -267143,6 +268318,8 @@ self: { pname = "ginger"; version = "0.10.6.0"; sha256 = "0j5arz8x2ksbcwy5iq8p7pzy71rl0nhadlv2d6933ibdgvzbsb7j"; + revision = "1"; + editedCabalFile = "1226x5dlcpaczy3kx5h27fmq4g03h4aa1nc1aw9r7x18h8rjay04"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -267203,6 +268380,98 @@ self: { } ) { }; + "ginger2" = callPackage ( + { + mkDerivation, + aeson, + array, + base, + base64-bytestring, + bytestring, + cmark, + containers, + directory, + filepath, + megaparsec, + mtl, + optparse-applicative, + quickcheck-instances, + random, + regex-tdfa, + scientific, + SHA, + tasty, + tasty-hunit, + tasty-quickcheck, + template-haskell, + text, + time, + vector, + yaml, + }: + mkDerivation { + pname = "ginger2"; + version = "2.2.0.0"; + sha256 = "0a8aa944v7b8qlwqykkrvm334ic8c8lfb8zwls7wx1cyh68kif66"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + array + base + base64-bytestring + bytestring + containers + filepath + megaparsec + mtl + random + regex-tdfa + scientific + SHA + tasty + tasty-quickcheck + template-haskell + text + time + vector + ]; + executableHaskellDepends = [ + aeson + base + cmark + containers + directory + filepath + optparse-applicative + random + text + vector + yaml + ]; + testHaskellDepends = [ + base + base64-bytestring + bytestring + containers + megaparsec + mtl + quickcheck-instances + random + tasty + tasty-hunit + tasty-quickcheck + text + vector + ]; + description = "Jinja templates for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "ginger2"; + broken = true; + } + ) { }; + "gingersnap" = callPackage ( { mkDerivation, @@ -267727,8 +268996,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "10.20250520"; - sha256 = "15qb4pm3chhb5x0halx5qd4s1rcbci1q22sskm0mw4xjn2yfhc99"; + version = "10.20250630"; + sha256 = "1varfir2vmnr29kfsjpqc5vd6msansch6xiag1d0s4bj5wpn1pq3"; configureFlags = [ "-fassistant" "-f-benchmark" @@ -269183,6 +270452,70 @@ self: { } ) { }; + "github-actions" = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + containers, + filepath, + hedgehog, + hoist-error, + pretty-show, + string-interpolate, + tasty, + tasty-discover, + tasty-golden, + tasty-golden-extra, + tasty-hedgehog, + tasty-hunit, + text, + vector, + yaml, + }: + mkDerivation { + pname = "github-actions"; + version = "0.1.0.0"; + sha256 = "0aa4j8cbij6ags49pmdlfjgwfhj4w1960cjijfhncjm1dr5gij1z"; + revision = "1"; + editedCabalFile = "13n5nxpqgak96fqyywp1kx0yvzp7m2r19fn84z0khb5bq5nglv01"; + libraryHaskellDepends = [ + aeson + base + containers + hedgehog + hoist-error + string-interpolate + text + vector + ]; + testHaskellDepends = [ + aeson + base + bytestring + containers + filepath + hedgehog + hoist-error + pretty-show + string-interpolate + tasty + tasty-discover + tasty-golden + tasty-golden-extra + tasty-hedgehog + tasty-hunit + text + vector + yaml + ]; + testToolDepends = [ tasty-discover ]; + description = "Github Actions"; + license = lib.licenses.bsd3; + } + ) { }; + "github-app-token" = callPackage ( { mkDerivation, @@ -278547,8 +279880,8 @@ self: { }: mkDerivation { pname = "gothic"; - version = "0.1.8.2"; - sha256 = "1mqkkla4ipibp7y7aiy466qrqcapra4n2xx8an07c1inwkpsxzw1"; + version = "0.1.8.3"; + sha256 = "0lf0yhq4q2vcw9b69l7ixdscmz5drxiag9l31iz1ypb8cyjspi1q"; libraryHaskellDepends = [ aeson base @@ -279307,8 +280640,8 @@ self: { }: mkDerivation { pname = "gpu-vulkan-middle"; - version = "0.1.0.75"; - sha256 = "1m22f7p78pwpipkvlsg95izivhz4z2cxiww4l4qy329s1cyyy0w6"; + version = "0.1.0.76"; + sha256 = "188g8i3zszb3xm5cl57bvhmwwrg1adx679h4j52z1a1qzyiia02m"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base @@ -281254,8 +282587,8 @@ self: { }: mkDerivation { pname = "graphql"; - version = "1.5.0.0"; - sha256 = "1vgvrk225fgn94cmdk5yy6a6d8p10igwx1fbvll94x4izkq57h9y"; + version = "1.5.0.1"; + sha256 = "0kx0pnf16zwdjxc1ig46mbv7px7r7v6xn6kmlypl0d73ik8jfzrq"; libraryHaskellDepends = [ base conduit @@ -281392,6 +282725,8 @@ self: { pname = "graphql-client"; version = "1.2.4"; sha256 = "0rm7x5hrjz7fqfixpaab2c8fmwpn6m3p14zr0wq2bll8qf0hj15c"; + revision = "1"; + editedCabalFile = "0fi7q2zxfm85pdpn9b4jzh49rnakm5dvcmjkr0g39738zprgwaph"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -281653,8 +282988,8 @@ self: { }: mkDerivation { pname = "graphula"; - version = "2.1.0.1"; - sha256 = "1bc8nr6m9lahbfg5h1i9y25kv5ikr7dcqs4ga4hzii07zvq6ks84"; + version = "2.1.2.0"; + sha256 = "11w4sp6jpygpqd0xjnhwdrj5gizz4nrn01md2hc98fxm19a0la03"; libraryHaskellDepends = [ base containers @@ -282557,8 +283892,8 @@ self: { }: mkDerivation { pname = "greskell-core"; - version = "1.0.0.4"; - sha256 = "0cvqrbpfa0flsvjvmdg6pf1m0dd1gxgk22n8wqbnvwak8c528hff"; + version = "1.0.0.6"; + sha256 = "14xsjs4xf3db8ppz4xypshzvyvxsn7s7syr8vqkrbll8vz9laab8"; libraryHaskellDepends = [ aeson base @@ -283127,7 +284462,7 @@ self: { } ) { }; - "grisette_0_12_0_0" = callPackage ( + "grisette_0_13_0_0" = callPackage ( { mkDerivation, array, @@ -283167,8 +284502,8 @@ self: { }: mkDerivation { pname = "grisette"; - version = "0.12.0.0"; - sha256 = "0dcwbc53321jg6jfmsr72kmsx8w7c6x9aq4yllwfvbzh092ljlib"; + version = "0.13.0.0"; + sha256 = "0115al5kw0vfsp11cndra6qrjiakm2w0gpi8ai4g47fysn8xbx6p"; libraryHaskellDepends = [ array async @@ -289225,8 +290560,8 @@ self: { }: mkDerivation { pname = "hackage-cli"; - version = "0.1.0.2"; - sha256 = "1q7k8fy6mqb7h4q4bm8qp0ma2nhspszkwy8d606hb66sdiw7k73k"; + version = "0.1.0.3"; + sha256 = "19mnvvhhcagq1l3qc37qxxv7pwzfw6p15194f21z7harj5y1ly5c"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -289607,8 +290942,8 @@ self: { pname = "hackage-repo-tool"; version = "0.1.1.4"; sha256 = "1nqm6rri8rkhrqvppyzy04s3875c4wjcay8gny4ygbr65c6iw81v"; - revision = "1"; - editedCabalFile = "09fx1z32m36riv3hmjrv36knlmmrrjq2hbl30i2qfk7pfcbcjlgw"; + revision = "2"; + editedCabalFile = "0ghjpd02ccv6xdp0n6mxylq09ff5w7yzvpw3v3w4i62l43fi9j7q"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -289655,6 +290990,8 @@ self: { pname = "hackage-revdeps"; version = "0.1.1"; sha256 = "0ckkcp2ndzv219hpl42vfzw0hvb5vblsx2bvdsa98wikkxnmn47j"; + revision = "1"; + editedCabalFile = "078lhc7lzs24qqizplyf4ipggxkqqsfmgq6vnrgbyhxiia2smc4b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -289722,8 +291059,10 @@ self: { }: mkDerivation { pname = "hackage-security"; - version = "0.6.3.0"; - sha256 = "0w0d94gbqpi8b3ddkb32px8xj0qxaaxwdbl8x45y55331b23a7a0"; + version = "0.6.3.1"; + sha256 = "05sckvvwj10krkhp1457mgp1hgq45p7r2sp850g3b5689i91mvqx"; + revision = "1"; + editedCabalFile = "1si6mkc8gimkpqkdl2wyzxp14v7yphp40hxvp77im7bhr8brsa77"; libraryHaskellDepends = [ base base16-bytestring @@ -291361,6 +292700,7 @@ self: { aeson, attoparsec, base, + bytestring, data-default, doctest, filepath, @@ -291379,8 +292719,8 @@ self: { }: mkDerivation { pname = "haiji"; - version = "0.3.4.0"; - sha256 = "1m97lnd993xpxcbm3n2qgqzqjb5j3jvkzkdcb1h9qjd3lr88j1cf"; + version = "0.4.0.0"; + sha256 = "1r6bzh95a4qg0waday49qqrm1kmss667hksp0wcl749w5g32jnaq"; libraryHaskellDepends = [ aeson attoparsec @@ -291398,6 +292738,7 @@ self: { testHaskellDepends = [ aeson base + bytestring data-default doctest filepath @@ -292095,8 +293436,8 @@ self: { pname = "hakyll"; version = "4.16.6.0"; sha256 = "1933k6aiawa0kdws7ajm9picjchnfrkkd0qd8xb9l2yv1fvcywg2"; - revision = "1"; - editedCabalFile = "0w6z4dq378aai39n9samlfahqr5s1p0fz1xl6kgfp9z8bvq9daa7"; + revision = "3"; + editedCabalFile = "0q2yl6vqf6qqc7azqwsls7b2pm3y42shhdcpyszrpi16zgx9y137"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -293291,14 +294632,14 @@ self: { bytestring, deepseq, QuickCheck, + tasty, + tasty-quickcheck, template-haskell, - test-framework, - test-framework-quickcheck2, }: mkDerivation { pname = "half"; - version = "0.3.2"; - sha256 = "0f7hgnfy8qpjsjv78gk01di3riwfbrb961msn19qmsplnsgjx68r"; + version = "0.3.3"; + sha256 = "00mb2xfz0q8sq8zxqpw3ycp1p8gjhlgc0wxh5xr7kzyn52b08xpl"; libraryHaskellDepends = [ base binary @@ -293310,8 +294651,8 @@ self: { binary bytestring QuickCheck - test-framework - test-framework-quickcheck2 + tasty + tasty-quickcheck ]; description = "Half-precision floating-point"; license = lib.licenses.bsd3; @@ -297629,6 +298970,55 @@ self: { } ) { }; + "harpie_0_1_3_0" = callPackage ( + { + mkDerivation, + adjunctions, + base, + distributive, + doctest-parallel, + first-class-families, + prettyprinter, + QuickCheck, + quickcheck-instances, + random, + vector, + vector-algorithms, + }: + mkDerivation { + pname = "harpie"; + version = "0.1.3.0"; + sha256 = "1agkp62rcgk705hp8hlppfiidv5vsz0ps6pq3pvlnn1g73vv5ivr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + adjunctions + base + distributive + first-class-families + prettyprinter + QuickCheck + quickcheck-instances + random + vector + vector-algorithms + ]; + executableHaskellDepends = [ + adjunctions + base + first-class-families + ]; + testHaskellDepends = [ + base + doctest-parallel + ]; + description = "Haskell array programming"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "harpie-bug-issue1"; + } + ) { }; + "harpie-numhask" = callPackage ( { mkDerivation, @@ -298632,8 +300022,8 @@ self: { }: mkDerivation { pname = "hash-string"; - version = "0.1.0.1"; - sha256 = "136a5pkygam99fx52r1dhrxydkzk1v83n0ip5iaczdx99cwki0gb"; + version = "0.1.0.2"; + sha256 = "0ri03id2jwpsn77mnnvvicx6niy5q5q7mr38r6y64am4j6yfh2q3"; libraryHaskellDepends = [ base bytestring @@ -300562,6 +301952,293 @@ self: { } ) { }; + "haskell-bee" = callPackage ( + { + mkDerivation, + aeson, + base, + safe-exceptions, + stm, + tasty, + tasty-quickcheck, + text, + unbounded-delays, + }: + mkDerivation { + pname = "haskell-bee"; + version = "0.1.0.0"; + sha256 = "1wsdwfqswvq9vbsk8vpdx58bqrznqix2p8d527fwvksvg9rpq5r0"; + libraryHaskellDepends = [ + aeson + base + safe-exceptions + stm + text + unbounded-delays + ]; + testHaskellDepends = [ + aeson + base + tasty + tasty-quickcheck + ]; + description = "A lightweight library for asynchronous job workers with multiple broker backends"; + license = lib.licenses.agpl3Plus; + } + ) { }; + + "haskell-bee-pgmq" = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + containers, + deepseq, + haskell-bee, + haskell-bee-tests, + haskell-pgmq, + hspec, + mtl, + postgresql-libpq, + postgresql-simple, + random-strings, + safe, + safe-exceptions, + scientific, + tasty, + tasty-hspec, + text, + time, + units, + unix-time, + }: + mkDerivation { + pname = "haskell-bee-pgmq"; + version = "0.1.0.0"; + sha256 = "1cf8mc1ddl1vhh7nyjsla5ccymy3963sz2j9l337pvpm492lxf0a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + base + bytestring + containers + deepseq + haskell-bee + haskell-pgmq + postgresql-libpq + postgresql-simple + safe + safe-exceptions + scientific + text + time + units + unix-time + ]; + executableHaskellDepends = [ + aeson + base + haskell-bee + haskell-pgmq + mtl + postgresql-simple + text + ]; + testHaskellDepends = [ + aeson + base + containers + haskell-bee + haskell-bee-tests + hspec + postgresql-simple + random-strings + tasty + tasty-hspec + text + ]; + description = "PostgreSQL/PGMQ broker implementation for haskell-bee"; + license = lib.licenses.agpl3Plus; + mainProgram = "simple-worker"; + } + ) { }; + + "haskell-bee-redis" = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + containers, + deepseq, + haskell-bee, + haskell-bee-tests, + hedis, + hspec, + random-strings, + safe, + safe-exceptions, + scientific, + stm, + tasty, + tasty-hspec, + tasty-hunit, + tasty-quickcheck, + text, + time, + units, + unix-time, + }: + mkDerivation { + pname = "haskell-bee-redis"; + version = "0.1.0.0"; + sha256 = "19qq0gkpqb0ywchsz0z2q5qpvj3f260k1175zkjc49mzwl6q26x4"; + libraryHaskellDepends = [ + aeson + base + bytestring + containers + deepseq + haskell-bee + hedis + safe + safe-exceptions + scientific + stm + text + time + units + unix-time + ]; + testHaskellDepends = [ + aeson + base + containers + haskell-bee + haskell-bee-tests + hedis + hspec + random-strings + stm + tasty + tasty-hspec + tasty-hunit + tasty-quickcheck + text + unix-time + ]; + description = "Redis broker implementation for haskell-bee"; + license = lib.licenses.agpl3Plus; + } + ) { }; + + "haskell-bee-stm" = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + containers, + deepseq, + haskell-bee, + haskell-bee-tests, + hspec, + random-strings, + safe, + safe-exceptions, + scientific, + stm, + tasty, + tasty-hspec, + tasty-hunit, + tasty-quickcheck, + text, + time, + units, + unix-time, + }: + mkDerivation { + pname = "haskell-bee-stm"; + version = "0.1.0.0"; + sha256 = "1m34642h4nkl03yrvpgrhnprkj09xylg5rfg169gadwk8jm6w0bw"; + libraryHaskellDepends = [ + aeson + base + bytestring + containers + deepseq + haskell-bee + safe + safe-exceptions + scientific + stm + text + time + units + unix-time + ]; + testHaskellDepends = [ + aeson + base + containers + haskell-bee + haskell-bee-tests + hspec + random-strings + stm + tasty + tasty-hspec + tasty-hunit + tasty-quickcheck + text + unix-time + ]; + description = "STM broker implementation for haskell-bee"; + license = lib.licenses.agpl3Plus; + } + ) { }; + + "haskell-bee-tests" = callPackage ( + { + mkDerivation, + aeson, + base, + containers, + haskell-bee, + hedis, + hspec, + postgresql-simple, + random-strings, + stm, + tasty, + tasty-hspec, + text, + }: + mkDerivation { + pname = "haskell-bee-tests"; + version = "0.1.0.0"; + sha256 = "1bcg8c8fm9yaq4k3v8m79qq6miqjgbmc3xbdnr4mn5z8ayi1s2cr"; + libraryHaskellDepends = [ + aeson + base + containers + haskell-bee + hedis + hspec + postgresql-simple + random-strings + stm + tasty + tasty-hspec + text + ]; + description = "Reusable test suite for any haskell-bee Broker implementation"; + license = lib.licenses.agpl3Plus; + } + ) { }; + "haskell-bitmex-client" = callPackage ( { mkDerivation, @@ -301754,8 +303431,8 @@ self: { }: mkDerivation { pname = "haskell-gi"; - version = "0.26.15"; - sha256 = "07lpd31j582czgvrivyh0fp3bbjmhvqicgy47pv2j69x450q2wsa"; + version = "0.26.16"; + sha256 = "0v5pjysap2v5a9njc1z9c6by2sv18p9kkqcpzpxwqjs9hh4mxq5q"; setupHaskellDepends = [ base Cabal @@ -301799,6 +303476,82 @@ self: { inherit (pkgs) gobject-introspection; }; + "haskell-gi_0_26_17" = + 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.17"; + sha256 = "0vg75z5qgf0km59gv6dvpzckyxdli3i5d8lk8xck55smaf9h6f6i"; + 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, @@ -301806,16 +303559,18 @@ self: { bytestring, containers, glib, + optics-core, text, }: mkDerivation { pname = "haskell-gi-base"; - version = "0.26.8"; - sha256 = "19sp8yi9inxq7vqw6zpf2rlk56algxajkf8gyl0iqbx95kb4x1bb"; + version = "0.26.9"; + sha256 = "1li1q8k5zn7yxqn3rdh5sjkq4lsr9gsbhkvxh6wzca39n37vnnf3"; libraryHaskellDepends = [ base bytestring containers + optics-core text ]; libraryPkgconfigDepends = [ glib ]; @@ -301862,6 +303617,90 @@ self: { } ) { }; + "haskell-google-genai-client" = callPackage ( + { + mkDerivation, + aeson, + base, + base64-bytestring, + bytestring, + case-insensitive, + containers, + deepseq, + exceptions, + hspec, + http-api-data, + http-client, + http-client-tls, + http-media, + http-types, + iso8601-time, + microlens, + monad-logger, + mtl, + network, + QuickCheck, + random, + safe-exceptions, + semigroups, + text, + time, + transformers, + unordered-containers, + vector, + }: + mkDerivation { + pname = "haskell-google-genai-client"; + version = "0.1.0"; + sha256 = "020qnab47jn1ixmwds8w4nbyzd2j1kpg7ykd71lfc71vnr4mh93h"; + libraryHaskellDepends = [ + aeson + base + base64-bytestring + bytestring + case-insensitive + containers + deepseq + exceptions + http-api-data + http-client + http-client-tls + http-media + http-types + iso8601-time + microlens + monad-logger + mtl + network + random + safe-exceptions + text + time + transformers + unordered-containers + vector + ]; + testHaskellDepends = [ + aeson + base + bytestring + containers + hspec + iso8601-time + mtl + QuickCheck + semigroups + text + time + transformers + unordered-containers + vector + ]; + description = "Auto-generated Gemini API Client for Haskell"; + license = lib.licenses.mit; + } + ) { }; + "haskell-google-trends" = callPackage ( { mkDerivation, @@ -302308,6 +304147,8 @@ self: { pname = "haskell-language-server"; version = "2.11.0.0"; sha256 = "1acd42sqa76nkrwkb6jcrimbf8va6ikkynv9ssbbamyy4vmx1aa4"; + revision = "1"; + editedCabalFile = "06ah5cdcg52azd0jx7n4n7xwrhphjc2k4k8gqda44m1kiv5z2v18"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -303192,6 +305033,62 @@ self: { } ) { }; + "haskell-pgmq" = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + containers, + hspec, + postgresql-simple, + random-strings, + safe, + stm, + tasty, + tasty-hspec, + text, + time, + units, + }: + mkDerivation { + pname = "haskell-pgmq"; + version = "0.1.0.0"; + sha256 = "1kslpx1zah97k9z2k967rwkjm01p9c0vz0if4hhpa52rprcadm7k"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson + base + bytestring + postgresql-simple + safe + text + time + units + ]; + executableHaskellDepends = [ + base + postgresql-simple + ]; + testHaskellDepends = [ + aeson + base + containers + hspec + postgresql-simple + random-strings + stm + tasty + tasty-hspec + text + ]; + description = "Haskell interface for Tembo's PGMQ PostgreSQL extension"; + license = lib.licenses.agpl3Plus; + } + ) { }; + "haskell-platform-test" = callPackage ( { mkDerivation, @@ -308120,9 +310017,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Lightweight CLI wallet for Bitcoin and Bitcoin Cash"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; mainProgram = "hw"; - broken = true; } ) { }; @@ -308646,8 +310541,8 @@ self: { }: mkDerivation { pname = "hasktorch"; - version = "0.2.1.3"; - sha256 = "18j3mvbag1anmkc5s8486i1a6am3iljm48aixxf5fi1bg2mkq46k"; + version = "0.2.1.4"; + sha256 = "0g5k796s66mz53cabfd0gl099rrjk1pfxc55qfg2j97mn69hgb1q"; setupHaskellDepends = [ base Cabal @@ -311363,8 +313258,8 @@ self: { }: mkDerivation { pname = "hasql-resource-pool"; - version = "1.9.1.2"; - sha256 = "1cg1wgrb7xbnqqqzy31y5lskcb66vmsr6ifmv0xi1qy0kb0c2y7i"; + version = "1.9.1.3"; + sha256 = "10hgwdpnd82yhsjflbskngwkjmkpp49qrvxspgka24ngp8q08zyz"; libraryHaskellDepends = [ base-prelude clock @@ -313253,6 +315148,8 @@ self: { pname = "haxr"; version = "3000.11.5.1"; sha256 = "1r5ipm1qzlkxk1xc9hv86kli5aa4nw7i9a6n42ixkcspwb8fjhzd"; + revision = "1"; + editedCabalFile = "0m9x1cs789qs7k3zc197zri1nbh6g1y05xraq5a1k10s0xs5sjdy"; libraryHaskellDepends = [ array base @@ -313891,6 +315788,33 @@ self: { } ) { }; + "hblosc" = callPackage ( + { + mkDerivation, + base, + bytestring, + hspec, + }: + mkDerivation { + pname = "hblosc"; + version = "0.1.0.2"; + sha256 = "0xsp5cwj8mqss6rwbm5ndjkzl2yhw7x135s9gvhwm6xj36pz0gnb"; + libraryHaskellDepends = [ + base + bytestring + ]; + testHaskellDepends = [ + base + bytestring + hspec + ]; + description = "Blosc (numerical compression library) bindings for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + "hbro" = callPackage ( { mkDerivation, @@ -317179,8 +319103,8 @@ self: { pname = "hedgehog-classes"; version = "0.2.5.4"; sha256 = "0z9ik5asddc2pnz430jsi1pyahkh6jy36ng0vwm7ywcq7cvhcvlz"; - revision = "5"; - editedCabalFile = "19jxkb9dszkvch4cd30n4nsp36p86xdbgqbliqv836m2qwayjmyp"; + revision = "6"; + editedCabalFile = "1gj6lrvy11bxnv26ayg1b98dv44ahwqngi8d5rxw1h1m13a7yzkk"; libraryHaskellDepends = [ aeson base @@ -317230,22 +319154,25 @@ self: { async, base, bytestring, + containers, deepseq, Diff, directory, exceptions, filepath, + generic-lens, hedgehog, http-conduit, + hw-prelude, lifted-async, lifted-base, + microlens, mmorph, monad-control, mtl, network, process, resourcet, - retry, stm, tar, tasty, @@ -317262,34 +319189,38 @@ self: { }: mkDerivation { pname = "hedgehog-extras"; - version = "0.7.0.0"; - sha256 = "0dhkhai2q831fb8z9cyv065gdf0468x0sbns1np74v8qnzwbhgav"; - revision = "1"; - editedCabalFile = "1f8xc2dr158c3nppj4rny611vfli74fpggnx1s75ln846xq2yzkj"; + version = "0.9.0.0"; + sha256 = "0l067gvm7vvhr5jrcys9676kfhdvaivbwiqh85n0zlcnkf3mjff0"; libraryHaskellDepends = [ aeson aeson-pretty async base bytestring + containers deepseq Diff directory exceptions filepath + generic-lens hedgehog http-conduit + hw-prelude lifted-async lifted-base + microlens mmorph monad-control mtl network process resourcet - retry stm tar + tasty + tasty-discover + tasty-hedgehog temporary text time @@ -317302,10 +319233,12 @@ self: { testHaskellDepends = [ base hedgehog + lifted-base network process resourcet tasty + tasty-discover tasty-hedgehog time transformers @@ -317313,6 +319246,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "Supplemental library for hedgehog"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -317329,8 +319264,8 @@ self: { pname = "hedgehog-fakedata"; version = "0.0.1.5"; sha256 = "00k26d83v0646klrg0k3cf94r4fnnx3ykxv7i8shjjgbkbzlzz78"; - revision = "2"; - editedCabalFile = "1b8v4j8zkvdfx786nfxxdkxj57b2qh4p9h16wiy0kc3l1dsj6llm"; + revision = "3"; + editedCabalFile = "1gfknhs1lslw7s00ciqn14r9b1lpph0827hhbb6bg9r52lylv9g3"; libraryHaskellDepends = [ base fakedata @@ -318591,8 +320526,8 @@ self: { pname = "heist"; version = "1.1.1.2"; sha256 = "1377740si611j0szp64axy0xj1fi2a6w8i9s3xij89h34m7rb3rz"; - revision = "4"; - editedCabalFile = "112bhvishyhknb7gzii56sqaz5gxzb1png2k73rsnfmranvzl3ka"; + revision = "5"; + editedCabalFile = "0rx4cx09zlg9kdl2sn5fn2ka7a7c26xrvbhkp60pzdnj1hdnsbqi"; libraryHaskellDepends = [ aeson attoparsec @@ -319890,6 +321825,63 @@ self: { } ) { }; + "heph-sparse-set" = callPackage ( + { + mkDerivation, + base, + containers, + criterion, + deepseq, + hedgehog, + mtl, + nothunks, + primitive, + random, + tasty, + tasty-discover, + tasty-hedgehog, + tasty-hunit, + vector, + }: + mkDerivation { + pname = "heph-sparse-set"; + version = "0.1.0.0"; + sha256 = "0w1h6xa62xp1bwpz4czdr6vzml311zq76i1swq6iqpw2wch0dbvn"; + libraryHaskellDepends = [ + base + deepseq + primitive + vector + ]; + testHaskellDepends = [ + base + containers + deepseq + hedgehog + nothunks + primitive + tasty + tasty-discover + tasty-hedgehog + tasty-hunit + vector + ]; + testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ + base + containers + criterion + deepseq + mtl + primitive + random + vector + ]; + description = "Really fast mutable sparse sets"; + license = lib.licenses.bsd3; + } + ) { }; + "heptapod" = callPackage ( { mkDerivation, @@ -320998,6 +322990,36 @@ self: { } ) { }; + "heredocs-r2" = callPackage ( + { + mkDerivation, + base, + bytestring, + hspec, + parsec, + template-haskell, + text, + }: + mkDerivation { + pname = "heredocs-r2"; + version = "0.1.0.2"; + sha256 = "1dzsgblbn4hijd6hgrwc951h1v6fjbg7gjbl8l3ihy79jm75ifbx"; + libraryHaskellDepends = [ + base + parsec + template-haskell + ]; + testHaskellDepends = [ + base + bytestring + hspec + text + ]; + description = "Heredocument on Haskell"; + license = lib.licenses.bsd3; + } + ) { }; + "herf-time" = callPackage ( { mkDerivation, @@ -325473,6 +327495,77 @@ self: { } ) { }; + "hiedb_0_7_0_0" = callPackage ( + { + mkDerivation, + algebraic-graphs, + ansi-terminal, + array, + base, + bytestring, + containers, + directory, + extra, + filepath, + ghc, + ghc-paths, + hie-compat, + hspec, + lucid, + mtl, + optparse-applicative, + process, + sqlite-simple, + temporary, + terminal-size, + text, + }: + mkDerivation { + pname = "hiedb"; + version = "0.7.0.0"; + sha256 = "0mhajz4wlgdzg079r9dcrhkl6dx5fdwq2x1c892frq0gqd18k5ln"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + algebraic-graphs + ansi-terminal + array + base + bytestring + containers + directory + extra + filepath + ghc + hie-compat + lucid + mtl + optparse-applicative + sqlite-simple + terminal-size + text + ]; + executableHaskellDepends = [ + base + ghc-paths + ]; + testHaskellDepends = [ + algebraic-graphs + base + directory + filepath + ghc-paths + hspec + process + temporary + ]; + description = "Generates a references DB from .hie files"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hiedb"; + } + ) { }; + "hiedb-plugin" = callPackage ( { mkDerivation, @@ -329806,7 +331899,7 @@ self: { } ) { }; - "hledger_1_42_2" = callPackage ( + "hledger_1_43_2" = callPackage ( { mkDerivation, aeson, @@ -329825,6 +331918,8 @@ self: { hashable, haskeline, hledger-lib, + http-client, + http-types, lucid, math-functions, megaparsec, @@ -329833,6 +331928,7 @@ self: { mtl, process, regex-tdfa, + req, safe, shakespeare, split, @@ -329851,8 +331947,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.42.2"; - sha256 = "0c6g90xdwavp23azv4b1k9sn309j96150adc5ihm4lhijvldphcr"; + version = "1.43.2"; + sha256 = "043gw3amc29fbjxlzyc4m97bw5i5462352lmk61adlxcd12l47i1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -329872,6 +331968,8 @@ self: { hashable haskeline hledger-lib + http-client + http-types lucid math-functions megaparsec @@ -329880,6 +331978,7 @@ self: { mtl process regex-tdfa + req safe shakespeare split @@ -329911,12 +332010,15 @@ self: { githash haskeline hledger-lib + http-client + http-types math-functions megaparsec microlens mtl process regex-tdfa + req safe shakespeare split @@ -329948,12 +332050,15 @@ self: { githash haskeline hledger-lib + http-client + http-types math-functions megaparsec microlens mtl process regex-tdfa + req safe shakespeare split @@ -329971,7 +332076,7 @@ self: { wizards ]; description = "Command-line interface for the hledger accounting system"; - license = lib.licenses.gpl3Only; + license = lib.licenses.gpl3Plus; hydraPlatforms = lib.platforms.none; mainProgram = "hledger"; maintainers = [ @@ -330208,8 +332313,8 @@ self: { pname = "hledger-iadd"; version = "1.3.21"; sha256 = "00x0vbfp08kqs1nbknndk9h56hcidf6xnrk0ldz45dvjrmgcv3w2"; - revision = "8"; - editedCabalFile = "166vkhghms83x0c03m6kg6v5fx3x8wyr445zjy6vxfsbni6ks4h7"; + revision = "9"; + editedCabalFile = "0fhkk8gsqiv7mxjk8jlz43i2h0cqampr8w5f1lxcnfz9g4k0bv5l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -330289,8 +332394,8 @@ self: { pname = "hledger-interest"; version = "1.6.7"; sha256 = "1jirygghw82zi8z160j45qzfcj1l89vckqr7hrv78h3f3pim6np4"; - revision = "1"; - editedCabalFile = "1hl3vgwhlk15xrhafmp5y017cm4y7zkn2n8l9frsc0xz67h9571z"; + revision = "2"; + editedCabalFile = "1inrlrz2rgk99sspm33r7rnfiycx8pllsh95ais9x05fp88cxhcf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -330507,7 +332612,7 @@ self: { } ) { }; - "hledger-lib_1_42_2" = callPackage ( + "hledger-lib_1_43_2" = callPackage ( { mkDerivation, aeson, @@ -330515,7 +332620,6 @@ self: { ansi-terminal, array, base, - base-compat, blaze-html, blaze-markup, bytestring, @@ -330562,15 +332666,14 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "1.42.2"; - sha256 = "0m0z70m4bm7bhrhjczdhwgz8afvjc1lrxwdr8kzgg0yyq2xrmxxx"; + version = "1.43.2"; + sha256 = "18037qwz7d0h4i86ac0w3hkrvx22vdxf04fjbg0qjlizgb3dlazf"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal array base - base-compat blaze-html blaze-markup bytestring @@ -330620,7 +332723,6 @@ self: { ansi-terminal array base - base-compat blaze-html blaze-markup bytestring @@ -330666,7 +332768,7 @@ self: { utf8-string ]; description = "A library providing the core functionality of hledger"; - license = lib.licenses.gpl3Only; + license = lib.licenses.gpl3Plus; hydraPlatforms = lib.platforms.none; } ) { }; @@ -330875,7 +332977,7 @@ self: { } ) { }; - "hledger-ui_1_42_2" = callPackage ( + "hledger-ui_1_43_2" = callPackage ( { mkDerivation, ansi-terminal, @@ -330911,10 +333013,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.42.2"; - sha256 = "17jmjphvrxcmg69b3p82sapf8x14w5xw10crbpcs6ws0wmlmmq71"; - revision = "1"; - editedCabalFile = "0lh28f9pxx6zxn91wna6ywj50igraqb6dyg797qqm2q3zz0kapif"; + version = "1.43.2"; + sha256 = "1xz5ndkg5mci689n82dnmwhhr8a08qw12czsf4b82ha7zlmbkmnv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -330951,7 +333051,7 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Terminal interface for the hledger accounting system"; - license = lib.licenses.gpl3Only; + license = lib.licenses.gpl3Plus; hydraPlatforms = lib.platforms.none; mainProgram = "hledger-ui"; maintainers = [ lib.maintainers.maralorn ]; @@ -331113,12 +333213,11 @@ self: { } ) { }; - "hledger-web_1_42_2" = callPackage ( + "hledger-web_1_43_2" = callPackage ( { mkDerivation, aeson, base, - base-compat, base64, blaze-html, blaze-markup, @@ -331133,6 +333232,7 @@ self: { Decimal, directory, extra, + file-embed, filepath, githash, hjsmin, @@ -331168,14 +333268,13 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.42.2"; - sha256 = "0ciz1y97aw7493avj8i9hnzjinc1fwj20wns036qa6yxglsj0qkm"; + version = "1.43.2"; + sha256 = "0d4sv9k3m7s0764lbq2l8w9p2p47cby177l0avl5w3fa9y8d0gyd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base - base-compat base64 blaze-html blaze-markup @@ -331190,6 +333289,7 @@ self: { Decimal directory extra + file-embed filepath githash hjsmin @@ -331223,16 +333323,10 @@ self: { yesod-static yesod-test ]; - executableHaskellDepends = [ - base - base-compat - ]; - testHaskellDepends = [ - base - base-compat - ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; description = "Web user interface for the hledger accounting system"; - license = lib.licenses.gpl3Only; + license = lib.licenses.gpl3Plus; hydraPlatforms = lib.platforms.none; mainProgram = "hledger-web"; maintainers = [ lib.maintainers.maralorn ]; @@ -337405,8 +339499,8 @@ self: { }: mkDerivation { pname = "hoist-error"; - version = "0.3.0.0"; - sha256 = "160967zsp8rzsvs12crsxh3854lnhxiidv8adixb4nf9hxvdnka6"; + version = "0.3.1.0"; + sha256 = "12hq6xz6jrsjd6nc03iv033abx73m1b2baszlk6b7k6r850fw4q5"; libraryHaskellDepends = [ base mtl @@ -339985,8 +342079,8 @@ self: { pname = "horizontal-rule"; version = "0.7.0.0"; sha256 = "0s4hf7frj1gc41v83qk8fgdfn49msmvhcfw6vjklx6w7b6pkfx9x"; - revision = "1"; - editedCabalFile = "1jb71y6mxkrcnps1jdh6rkkrznhzcsyl8c7s565xjalabql56nkq"; + revision = "2"; + editedCabalFile = "02cql9yvsvbi6xf7kplidmxay7n70lxb1z2499vngn7197b6d5kh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -341037,139 +343131,6 @@ self: { } ) { }; - "hpack_0_38_0" = callPackage ( - { - mkDerivation, - aeson, - base, - bifunctors, - bytestring, - Cabal, - containers, - crypton, - deepseq, - directory, - filepath, - Glob, - hspec, - hspec-discover, - http-client, - http-client-tls, - http-types, - HUnit, - infer-license, - interpolate, - mockery, - mtl, - pretty, - QuickCheck, - scientific, - template-haskell, - temporary, - text, - transformers, - unordered-containers, - vector, - yaml, - }: - mkDerivation { - pname = "hpack"; - version = "0.38.0"; - sha256 = "0iysz3xnxhjj49hjz9gv56awaldamrbidkiw0xd873g5yfyhyljp"; - revision = "1"; - editedCabalFile = "02pqfqqijvr2z3ki2rnb9nlavhzm59qbbvhq89bfdvhcicfgmmf4"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson - base - bifunctors - bytestring - Cabal - containers - crypton - deepseq - directory - filepath - Glob - http-client - http-client-tls - http-types - infer-license - mtl - pretty - scientific - text - transformers - unordered-containers - vector - yaml - ]; - executableHaskellDepends = [ - aeson - base - bifunctors - bytestring - Cabal - containers - crypton - deepseq - directory - filepath - Glob - http-client - http-client-tls - http-types - infer-license - mtl - pretty - scientific - text - transformers - unordered-containers - vector - yaml - ]; - testHaskellDepends = [ - aeson - base - bifunctors - bytestring - Cabal - containers - crypton - deepseq - directory - filepath - Glob - hspec - http-client - http-client-tls - http-types - HUnit - infer-license - interpolate - mockery - mtl - pretty - QuickCheck - scientific - template-haskell - temporary - text - transformers - unordered-containers - vector - yaml - ]; - testToolDepends = [ hspec-discover ]; - description = "A modern format for Haskell packages"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - mainProgram = "hpack"; - } - ) { }; - "hpack_0_38_1" = callPackage ( { mkDerivation, @@ -342870,7 +344831,7 @@ self: { } ) { }; - "hpqtypes-extras_1_17_0_1" = callPackage ( + "hpqtypes-extras_1_18_0_0" = callPackage ( { mkDerivation, base, @@ -342894,8 +344855,8 @@ self: { }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.17.0.1"; - sha256 = "1f2ipf4hwp3iqfb79bbx8h97l1cy8vyc1w5h0q1fvg2yvxl52szp"; + version = "1.18.0.0"; + sha256 = "1vqyb1izw6ascmkkqkm33iahydrabpb7rq2r3qkhxkjbhrgfk5j5"; libraryHaskellDepends = [ base base16-bytestring @@ -343612,6 +345573,26 @@ self: { } ) { }; + "hquantlib-time_0_1_2" = callPackage ( + { + mkDerivation, + base, + time, + }: + mkDerivation { + pname = "hquantlib-time"; + version = "0.1.2"; + sha256 = "0i0klg4l4vipw8802ghb2ddd1fpn7wrg027pqfh1yf6x1m1r2k8z"; + libraryHaskellDepends = [ + base + time + ]; + description = "HQuantLib Time is a business calendar functions extracted from HQuantLib"; + license = lib.licenses.lgpl3Plus; + hydraPlatforms = lib.platforms.none; + } + ) { }; + "hquery" = callPackage ( { mkDerivation, @@ -346712,14 +348693,15 @@ self: { base, extra, ghc-events, + machines, optparse-applicative, text, vector, }: mkDerivation { pname = "hs-speedscope"; - version = "0.2.1"; - sha256 = "1qzmcn718mbg5pckvbcw2n36srmbixkyp45hrkdcdnqcsvf5agln"; + version = "0.3.0"; + sha256 = "089mg3q9f6pkvkx4zxgnv69hyzs06cr4ljkaij5kzgq35i12l4x3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -346727,6 +348709,7 @@ self: { base extra ghc-events + machines optparse-applicative text vector @@ -346734,9 +348717,7 @@ self: { executableHaskellDepends = [ base ]; description = "Convert an eventlog into the speedscope json format"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hs-speedscope"; - broken = true; } ) { }; @@ -350604,7 +352585,6 @@ self: { cmdargs, directory, filepath, - filepath-bytestring, libssh2, mtl, tasty, @@ -350617,8 +352597,8 @@ self: { }: mkDerivation { pname = "hsftp"; - version = "1.3.1"; - sha256 = "0027bmn11fl3lbyd4aw77w5b4xdf53izpxnnpp1qnwpxd8j92w82"; + version = "1.4.0"; + sha256 = "01fzgrk9w6xy7wxkpg2znw5g2wkqrcz6vj1f0pdffvg0bslfn4g0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -350628,7 +352608,6 @@ self: { cmdargs directory filepath - filepath-bytestring libssh2 mtl time @@ -350641,7 +352620,6 @@ self: { cmdargs directory filepath - filepath-bytestring libssh2 mtl time @@ -350654,7 +352632,6 @@ self: { cmdargs directory filepath - filepath-bytestring libssh2 mtl tasty @@ -351568,6 +353545,56 @@ self: { } ) { }; + "hslua_2_4_0" = callPackage ( + { + mkDerivation, + base, + bytestring, + exceptions, + hslua-aeson, + hslua-classes, + hslua-core, + hslua-marshalling, + hslua-objectorientation, + hslua-packaging, + hslua-typing, + tasty, + tasty-hslua, + tasty-hunit, + text, + }: + mkDerivation { + pname = "hslua"; + version = "2.4.0"; + sha256 = "093cjgrzxyvd7kg7ap5bszbfpgzcggwsnypm2q2ij6hyqz8x8gqk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + hslua-aeson + hslua-classes + hslua-core + hslua-marshalling + hslua-objectorientation + hslua-packaging + hslua-typing + ]; + testHaskellDepends = [ + base + bytestring + exceptions + hslua-core + tasty + tasty-hslua + tasty-hunit + text + ]; + description = "Bindings to Lua, an embeddable scripting language"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + } + ) { }; + "hslua-aeson" = callPackage ( { mkDerivation, @@ -351881,8 +353908,8 @@ self: { }: mkDerivation { pname = "hslua-module-doclayout"; - version = "1.2.0"; - sha256 = "1x3znkdz1l8p8gsvazz85936p107xscsaah1ac3padyiswhair1j"; + version = "1.2.0.1"; + sha256 = "139l4sh9pllm0zjgv3w7scbpd0cgn23r95fdlchavsdfwkpvcx17"; libraryHaskellDepends = [ base doclayout @@ -351989,6 +354016,55 @@ self: { } ) { }; + "hslua-module-system_1_2_0" = callPackage ( + { + mkDerivation, + base, + bytestring, + directory, + exceptions, + hslua-core, + hslua-marshalling, + hslua-packaging, + process, + tasty, + tasty-hunit, + tasty-lua, + temporary, + text, + time, + }: + mkDerivation { + pname = "hslua-module-system"; + version = "1.2.0"; + sha256 = "0wbbz0h33wrhdpxz40gqgijkra19jg0zyy4snmj75qxcq2cc9dw2"; + libraryHaskellDepends = [ + base + bytestring + directory + exceptions + hslua-core + hslua-marshalling + hslua-packaging + process + temporary + text + time + ]; + testHaskellDepends = [ + base + hslua-core + hslua-packaging + tasty + tasty-hunit + tasty-lua + ]; + description = "Lua module wrapper around Haskell's System module"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + } + ) { }; + "hslua-module-text" = callPackage ( { mkDerivation, @@ -352071,8 +354147,6 @@ self: { { mkDerivation, base, - bytestring, - filepath, hslua-core, hslua-list, hslua-marshalling, @@ -352088,14 +354162,10 @@ self: { }: mkDerivation { pname = "hslua-module-zip"; - version = "1.1.3"; - sha256 = "1fws5jwf1zwqilgm05y28ywgxavygnjpdlj43nhfg8cmng1p0kyq"; - revision = "1"; - editedCabalFile = "1ml14hycwh4wg8351b8dq94qyppkzhw8jk0b0dgahqvy7p5w86y3"; + version = "1.1.4"; + sha256 = "1ij2rmy8m4pw7k7w5vvb3g934kms60vhzhhp8kryknbi6bsg8lsy"; libraryHaskellDepends = [ base - bytestring - filepath hslua-core hslua-list hslua-marshalling @@ -352107,20 +354177,12 @@ self: { ]; testHaskellDepends = [ base - bytestring - filepath hslua-core - hslua-list - hslua-marshalling hslua-module-system hslua-packaging - hslua-typing tasty tasty-hunit tasty-lua - text - time - zip-archive ]; description = "Lua module to work with file zips"; license = lib.licenses.mit; @@ -352185,6 +354247,46 @@ self: { } ) { }; + "hslua-objectorientation_2_4_0" = callPackage ( + { + mkDerivation, + base, + bytestring, + containers, + hslua-core, + hslua-marshalling, + hslua-typing, + tasty, + tasty-hslua, + text, + }: + mkDerivation { + pname = "hslua-objectorientation"; + version = "2.4.0"; + sha256 = "0gm7l5gqbxrvniivz82wl9rmwgmrg2swji3q0wk43s2xxhajbihs"; + libraryHaskellDepends = [ + base + containers + hslua-core + hslua-marshalling + hslua-typing + text + ]; + testHaskellDepends = [ + base + bytestring + hslua-core + hslua-marshalling + hslua-typing + tasty + tasty-hslua + ]; + description = "Object orientation tools for HsLua"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + } + ) { }; + "hslua-packaging" = callPackage ( { mkDerivation, @@ -352233,6 +354335,50 @@ self: { } ) { }; + "hslua-packaging_2_3_2" = callPackage ( + { + mkDerivation, + base, + bytestring, + containers, + hslua-core, + hslua-marshalling, + hslua-objectorientation, + hslua-typing, + tasty, + tasty-hslua, + tasty-hunit, + text, + }: + mkDerivation { + pname = "hslua-packaging"; + version = "2.3.2"; + sha256 = "1w7929fr6pkwm9x25ags1nk5xrfq9kn3g113wi5c02a8m8zqwh8s"; + libraryHaskellDepends = [ + base + containers + hslua-core + hslua-marshalling + hslua-objectorientation + hslua-typing + text + ]; + testHaskellDepends = [ + base + bytestring + hslua-core + hslua-marshalling + tasty + tasty-hslua + tasty-hunit + text + ]; + description = "Utilities to build Lua modules"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + } + ) { }; + "hslua-repl" = callPackage ( { mkDerivation, @@ -353133,6 +355279,33 @@ self: { } ) { }; + "hspec-annotated-exception" = callPackage ( + { + mkDerivation, + annotated-exception, + base, + hspec, + HUnit, + lens, + text, + }: + mkDerivation { + pname = "hspec-annotated-exception"; + version = "0.0.0.0"; + sha256 = "0cmhplcqqbn9ggv5fwdij3kmj52jvkm8j4z3gbrgyd66y1i9wmhb"; + libraryHaskellDepends = [ + annotated-exception + base + hspec + HUnit + lens + text + ]; + description = "Hspec hook that unwraps test failures from AnnotatedException"; + license = lib.licenses.mit; + } + ) { }; + "hspec-api" = callPackage ( { mkDerivation, @@ -353392,6 +355565,8 @@ self: { pname = "hspec-core"; version = "2.11.12"; sha256 = "030400w95775jrivbi7n1nnx6j5z717rqd3986ggklb8h9hjalfc"; + revision = "1"; + editedCabalFile = "0yq9nnawcgbgxiz4ymfa8k66jrvgrhmv8j7g880x8k6q8q4ncqlq"; libraryHaskellDepends = [ ansi-terminal array @@ -354320,6 +356495,8 @@ self: { pname = "hspec-meta"; version = "2.11.12"; sha256 = "1612pg5gihqjxrzqqvbbgckaqiwq3rmz3rg07lrjhzklg975nj69"; + revision = "2"; + editedCabalFile = "1jrk14s51psb0zjici56220iyb98i3q06sd3rsyx594s3cddgn5d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -355674,55 +357851,69 @@ self: { } ) { inherit (pkgs) sqlite; }; - "hsqml" = callPackage ( - { - mkDerivation, - base, - c2hs, - Cabal, - containers, - directory, - filepath, - qt5, - QuickCheck, - tagged, - template-haskell, - text, - transformers, - }: - mkDerivation { - pname = "hsqml"; - version = "0.3.5.1"; - sha256 = "046inz0pa5s052w653pk2km9finj44c6y2yx7iqihn4h4vnqbim0"; - setupHaskellDepends = [ - base - Cabal - filepath - template-haskell - ]; - libraryHaskellDepends = [ - base - containers - filepath - tagged - text - transformers - ]; - libraryPkgconfigDepends = [ qt5 ]; - libraryToolDepends = [ c2hs ]; - testHaskellDepends = [ - base - containers - directory - QuickCheck - tagged - text - ]; - description = "Haskell binding for Qt Quick"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - } - ) { qt5 = null; }; + "hsqml" = + callPackage + ( + { + mkDerivation, + base, + bytestring, + c2hs, + Cabal, + containers, + directory, + filepath, + qt5, + Qt5Network, + QuickCheck, + tagged, + template-haskell, + text, + transformers, + }: + mkDerivation { + pname = "hsqml"; + version = "0.3.6.1"; + sha256 = "0wvnxc3kad9ja4s16n9nj6nqknckal93ifbprq6nwd0x5i6zvknm"; + setupHaskellDepends = [ + base + Cabal + filepath + template-haskell + ]; + libraryHaskellDepends = [ + base + bytestring + containers + directory + filepath + QuickCheck + tagged + text + transformers + ]; + libraryPkgconfigDepends = [ + qt5 + Qt5Network + ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ + base + containers + directory + QuickCheck + tagged + text + ]; + description = "Haskell binding for Qt Quick"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) + { + Qt5Network = null; + qt5 = null; + }; "hsqml-datamodel" = callPackage ( { @@ -355787,8 +357978,8 @@ self: { }: mkDerivation { pname = "hsqml-demo-manic"; - version = "0.3.4.0"; - sha256 = "09lnd6am51z98j4kwwidj4jw0bcrx8904r526w50y38afngysqx6"; + version = "0.3.5.0"; + sha256 = "1y5wfqdilmgkshvd5zz0ajpjx41rn68n6gp43nx1qamz036plklv"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -355819,8 +358010,8 @@ self: { }: mkDerivation { pname = "hsqml-demo-morris"; - version = "0.3.1.1"; - sha256 = "166r06yhnmg063d48dh7973wg85nfmvp1c5gmy79ilycc8xgvmhm"; + version = "0.3.2.0"; + sha256 = "0bc0ll794bmz0m12y2s6pcwxlm16ppcldhr0gbs4xfwcb2mylrd2"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -355852,8 +358043,8 @@ self: { }: mkDerivation { pname = "hsqml-demo-notes"; - version = "0.3.3.0"; - sha256 = "0gjlsqlspchav6lvc4ld15192x70j8cyzw903dgla7g9sj8fg813"; + version = "0.3.4.0"; + sha256 = "1k15v0wyv59dkd7wgzpkv8qy8g0i3sw5dpsjf003cy59rl8g8y3q"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -355882,8 +358073,8 @@ self: { }: mkDerivation { pname = "hsqml-demo-samples"; - version = "0.3.4.0"; - sha256 = "0y82caz4fb4cz4qfmdg7h5zr959yw2q162zz980jz179188a8pr2"; + version = "0.3.5.0"; + sha256 = "0xihibxfy86ml20hhzr66mzygk0lhwhwjpz09ig47fvdlhs0239d"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -361594,8 +363785,8 @@ self: { }: mkDerivation { pname = "http2"; - version = "5.3.9"; - sha256 = "0wcv9ziz0865j66avlax7f4i9l5k7ydcn96bacy78snmvcciblqf"; + version = "5.3.10"; + sha256 = "0rs21pgnmd0qcg1j360pm8r9c4hm18bcivhnq3krqjl32zb1frpl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -361880,6 +364071,7 @@ self: { base, bytestring, crypton-x509-store, + crypton-x509-system, crypton-x509-validation, http2, network, @@ -361892,14 +364084,15 @@ self: { }: mkDerivation { pname = "http2-tls"; - version = "0.4.6"; - sha256 = "1fi7mk5lkpgr194da9wcwwn7hwdj5cw9kzdiqr3w8dwixnddqrl9"; + version = "0.4.8"; + sha256 = "1sy2q6zyc68fjk03fc9pnd6sshjwr6djbyw45gningpfcrw41qv6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring crypton-x509-store + crypton-x509-system crypton-x509-validation http2 network @@ -361939,6 +364132,8 @@ self: { iproute, network, network-byte-order, + network-control, + psqueues, quic, QuickCheck, sockaddr, @@ -361949,8 +364144,8 @@ self: { }: mkDerivation { pname = "http3"; - version = "0.0.24"; - sha256 = "1i7dzw9ib9h0i2zjnwsqxbs188p71ly1ad1vdnjnbhyr4gq6aw77"; + version = "0.1.0"; + sha256 = "1ygm1a6ph24a84vsdqb7l2bn1ylzd3dl0bc6blvpqq6yhhm34cpa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -361966,6 +364161,8 @@ self: { iproute network network-byte-order + network-control + psqueues quic sockaddr stm @@ -361978,8 +364175,10 @@ self: { base base16-bytestring bytestring + case-insensitive conduit conduit-extra + containers crypton hspec http-semantics @@ -372048,6 +374247,8 @@ self: { doHaddock = false; description = "Branch on whether a constraint is satisfied"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -378491,7 +380692,7 @@ self: { } ) { }; - "inspection-testing_0_6" = callPackage ( + "inspection-testing_0_6_2" = callPackage ( { mkDerivation, base, @@ -378503,8 +380704,8 @@ self: { }: mkDerivation { pname = "inspection-testing"; - version = "0.6"; - sha256 = "13j6bqybkqd1nrhx648j0nmsjgyqnmbgssm5pxynmkqw62yylbry"; + version = "0.6.2"; + sha256 = "0zi1q86sd9jy5dpqfs2j71acdl7kvik0ps78xirpdhyldhwwyqws"; libraryHaskellDepends = [ base containers @@ -379193,8 +381394,8 @@ self: { pname = "int-cast"; version = "0.2.0.0"; sha256 = "0s8rqm5d9f4y2sskajsw8ff7q8xp52vwqa18m6bajldp11m9a1p0"; - revision = "7"; - editedCabalFile = "0z1bffrx787f2697a6gfkmbxkj3ymgs88kid9ckcla08n11zw2ql"; + revision = "8"; + editedCabalFile = "10a33fvsy4qkckw6ciqiigy4r5f1pflw16l284scsdas56lk1pqq"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base @@ -379292,8 +381493,8 @@ self: { }: mkDerivation { pname = "int-like"; - version = "0.3.0"; - sha256 = "0nyxhq5715cb5dpvs6ap6zkm08xai1ivhpvj6jsj3kiy0fxyscmw"; + version = "0.3.1"; + sha256 = "093kq89lj49wmr878i3nx4yw7x0csh7wmnbil4w7whcy7zfmfabx"; libraryHaskellDepends = [ algebraic-graphs base @@ -380825,6 +383026,7 @@ self: { hashable, heaps, hspec, + indexed-traversable, lattices, parsec, QuickCheck, @@ -380835,8 +383037,8 @@ self: { }: mkDerivation { pname = "interval-patterns"; - version = "0.8.0"; - sha256 = "1paciwq4wzl0kqkl5zzj486dsq5pg6275nj15gicv1czj7m9ncg9"; + version = "0.8.1"; + sha256 = "1wq080qvc1xbw6kd86ffl7017prz27g5658yyyvmjrshv5krxrhx"; libraryHaskellDepends = [ base containers @@ -380844,6 +383046,7 @@ self: { groups hashable heaps + indexed-traversable lattices semirings time @@ -380857,6 +383060,7 @@ self: { hashable heaps hspec + indexed-traversable lattices parsec QuickCheck @@ -380867,8 +383071,6 @@ self: { ]; description = "Intervals, and monoids thereof"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -381726,8 +383928,8 @@ self: { }: mkDerivation { pname = "io-classes"; - version = "1.8.0.0"; - sha256 = "154bpq8w65xyy4slbd12d0r02gv5bz0q09rlpxyjwx63kpzy5xw1"; + version = "1.8.0.1"; + sha256 = "0ivhs0wpl2i8fw5g2ch3ck5adzwsp1dlfl1j3vy872i3cfygcbdi"; libraryHaskellDepends = [ array async @@ -381942,8 +384144,8 @@ self: { }: mkDerivation { pname = "io-sim"; - version = "1.8.0.0"; - sha256 = "00dmqfbq9j906f5ga1vqqmrvzdmwxwrw6gcigmdspwnpaq73yydr"; + version = "1.8.0.1"; + sha256 = "1xv0j1l46n0wv76sll796avrvl3aaxnf0dsqjkp66fw0yprdbh5n"; libraryHaskellDepends = [ base containers @@ -382552,8 +384754,8 @@ self: { }: mkDerivation { pname = "ip6addr"; - version = "2.0.0"; - sha256 = "1drhjv6xmwfnx2yvxxs03ds415gxdgylzkmb5wy9g7b12q91kxf5"; + version = "2.0.0.1"; + sha256 = "18g1y923ll8sh1flg9ddf5nyi7ndngf99p3d39q6icimffnyqkfh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -384379,14 +386581,15 @@ self: { bytestring-lexing, hspec, hspec-core, + hspec-discover, QuickCheck, quickcheck-instances, time, }: mkDerivation { pname = "iso8601-duration"; - version = "0.1.2.0"; - sha256 = "1hzzcgc1k3dn4l5yxzqq9d62n2hfkrcg0ag14dly7ak3gx9l8l3n"; + version = "0.1.2.1"; + sha256 = "0swdzv13y0ww4vlddcfwlwdcp0n5v824dcn5hfa5lxlp06xvy86h"; libraryHaskellDepends = [ attoparsec base @@ -384403,10 +386606,9 @@ self: { quickcheck-instances time ]; + testToolDepends = [ hspec-discover ]; description = "Types and parser for ISO8601 durations"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -390134,15 +392336,17 @@ self: { base, bytestring, jsaddle, + template-haskell, }: mkDerivation { pname = "jsaddle-wasm"; - version = "0.1.1.0"; - sha256 = "0srdxphbx4f70z97l1v64xdww2ggxap7wb1lyplacrml3pq7qr5d"; + version = "0.1.2.0"; + sha256 = "1anr6gg5900mcywwkx8s5j4wpq7hs0zgxc8b2mxf9nlagjjparfz"; libraryHaskellDepends = [ base bytestring jsaddle + template-haskell ]; doHaddock = false; description = "Run JSaddle JSM with the GHC Wasm backend"; @@ -391762,6 +393966,7 @@ self: { description = "Types and type classes for defining JSON schemas"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -394032,8 +396237,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.5.5"; - sha256 = "1rv21hdgjmmd6mynv8prfdcn48by3zch9qz6clmkjijvph0zg0nl"; + version = "0.5.8"; + sha256 = "1pb7z95cmqaxbmba2grrbf8dm56821y40v12l4402milnahzl3k9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -395272,10 +397477,8 @@ self: { }: mkDerivation { pname = "kan-extensions"; - version = "5.2.6"; - sha256 = "1k7cxqj9hl1b4axlw5903hrxh4vg5rdrzjmpa44xrhws3hy2i0ps"; - revision = "1"; - editedCabalFile = "0cq87wbjx4zppyxamqqcy2hsahs3n3k23qnp6q7lrh5303wp5fg0"; + version = "5.2.7"; + sha256 = "0n716zyihbnq3s1zhqbh3fm0qzhgy2hk79ziy8b6bvydjpzsq8y3"; libraryHaskellDepends = [ adjunctions array @@ -400431,6 +402634,7 @@ self: { ]; description = "Repa-like array processing using LLVM JIT"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -400831,6 +403035,65 @@ self: { } ) { }; + "koji-tool_1_3" = callPackage ( + { + mkDerivation, + base, + directory, + extra, + filepath, + formatting, + http-conduit, + http-directory, + koji, + pretty-simple, + rpm-nvr, + safe, + select-rpms, + simple-cmd, + simple-cmd-args, + text, + time, + utf8-string, + xdg-userdirs, + }: + mkDerivation { + pname = "koji-tool"; + version = "1.3"; + sha256 = "0ibbkl0lvgfwh16hihgqbc9gsgxdlz2w1ra7kfjs9cmx5l8w1gpg"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base + directory + extra + filepath + formatting + http-conduit + http-directory + koji + pretty-simple + rpm-nvr + safe + select-rpms + simple-cmd + simple-cmd-args + text + time + utf8-string + xdg-userdirs + ]; + testHaskellDepends = [ + base + simple-cmd + ]; + description = "Koji CLI tool for querying tasks and installing builds"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "koji-tool"; + } + ) { }; + "koneko" = callPackage ( { mkDerivation, @@ -401705,8 +403968,8 @@ self: { }: mkDerivation { pname = "kubernetes-api-client"; - version = "0.6.0.1"; - sha256 = "0j1jldj300n2fnr6q7ciiszcp2p3gs33cjxpjk481rrz84xlgaf5"; + version = "0.6.1.1"; + sha256 = "0f3sfs6z9xwf7811s7mbh03a4jsyfcvjx1lvycs7gv1ak1jhm27z"; libraryHaskellDepends = [ aeson attoparsec @@ -401789,7 +404052,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Client library for Kubernetes"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -404951,6 +407213,8 @@ self: { pname = "langchain-hs"; version = "0.0.2.0"; sha256 = "0gh3gmmppfms1jg5zaxksalh90675r4pl6lmz63szkpwl9rmc9kz"; + revision = "2"; + editedCabalFile = "0qk56yswclxrf903c34ifadd8ja2l3zxfc0b2vzlgf1x7zf4cikl"; libraryHaskellDepends = [ aeson async @@ -408492,8 +410756,8 @@ self: { pname = "lapack-ffi-tools"; version = "0.1.3.2"; sha256 = "0y30qwxzbggn3aqr437j3bi1yfa1fpdq96xq7vxbi1fnll8a9432"; - revision = "1"; - editedCabalFile = "0z8ahg1bxcphdyhjaxwmfhdhwwg1d2mhx3dvl6af3c9sql9r5xjw"; + revision = "2"; + editedCabalFile = "0k96wssmadcjrhdzcd6q3n7qx9kpb2wb3i9c61xygwx6x9q13wm3"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -409458,8 +411722,8 @@ self: { pname = "lattices"; version = "2.2.1"; sha256 = "0rknzbzwcbg87hjiz4jwqb81w14pywkipxjrrlrp0m5i8ciky1i7"; - revision = "2"; - editedCabalFile = "1y01fx2d3ad601zg13n52k8d4lcx1s3b6hhbwmyblhdj7x9xyl2i"; + revision = "3"; + editedCabalFile = "0ry6d23sy0pqgzn2cfbr0yrsxcf1mix2irhv1x9bzv99cz2az3qm"; libraryHaskellDepends = [ base containers @@ -412174,7 +414438,6 @@ self: { ]; description = "Haskell IDE written in Haskell"; license = "GPL"; - hydraPlatforms = lib.platforms.none; mainProgram = "leksah"; } ) { inherit (pkgs) gtk3; }; @@ -412375,7 +414638,6 @@ self: { generic-deriving, ghc-prim, hashable, - HUnit, indexed-traversable, indexed-traversable-instances, kan-extensions, @@ -412388,10 +414650,10 @@ self: { simple-reflect, strict, tagged, + tasty, + tasty-hunit, + tasty-quickcheck, template-haskell, - test-framework, - test-framework-hunit, - test-framework-quickcheck2, text, th-abstraction, these, @@ -412402,8 +414664,8 @@ self: { }: mkDerivation { pname = "lens"; - version = "5.3.4"; - sha256 = "12n8jdwlpa5lcp2yi26a4fwncn1v1lyznaa9fasszk6qp0afvdpi"; + version = "5.3.5"; + sha256 = "1s0ziznj60l9z3z5dacq58kaq8cdfxcz0r75f5hwj25ivzrsrszg"; libraryHaskellDepends = [ array assoc @@ -412445,13 +414707,12 @@ self: { bytestring containers deepseq - HUnit mtl QuickCheck simple-reflect - test-framework - test-framework-hunit - test-framework-quickcheck2 + tasty + tasty-hunit + tasty-quickcheck text transformers ]; @@ -412712,8 +414973,8 @@ self: { }: mkDerivation { pname = "lens-family-th"; - version = "0.5.3.1"; - sha256 = "0fhv44qb3gdwiay3imhwhqhdpiczncjz2w6jiiqk11qn4a63rv7l"; + version = "0.5.3.2"; + sha256 = "1lkzrnajlgnxd5wmxaa8z4j3kxry5iwarc15n9jkxygb0b20x3rh"; libraryHaskellDepends = [ base template-haskell @@ -412949,8 +415210,8 @@ self: { pname = "lens-properties"; version = "4.11.1"; sha256 = "1caciyn75na3f25q9qxjl7ibjam22xlhl5k2pqfiak10lxsmnz2g"; - revision = "7"; - editedCabalFile = "14n9yzar4zfqigyayxhi11a0g954nb4jcz0fahgpxyl2vbg7h1ch"; + revision = "8"; + editedCabalFile = "0lp0nkbm38v2i361w79dmqq20v3gn95bh1xixbs20549k73cxxj3"; libraryHaskellDepends = [ base lens @@ -413455,8 +415716,8 @@ self: { pname = "lentil"; version = "1.5.8.0"; sha256 = "08g15kzynync0kl9f247sifzqpkjyvigc5r31w2n3vivi3pdcafn"; - revision = "1"; - editedCabalFile = "0n991bjlcjchmjlgfxg709sp6vsi6c5igzs7904i6hfabq3z47q5"; + revision = "2"; + editedCabalFile = "0qcibmqkw96658fx3dcfy90k8w4a7xdvllb8h0hk14v0lwvi4cmm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -416841,8 +419102,8 @@ self: { }: mkDerivation { pname = "libtorch-ffi"; - version = "2.0.1.3"; - sha256 = "0hamxxlf69r3m826a3x59k11cmlv4m2340mr3xmcbyqga2zs04a6"; + version = "2.0.1.5"; + sha256 = "0qk8wdfp2c3xwn8ydszxn5zpifcgbp5ns75rinyyqybz0rls1xk8"; libraryHaskellDepends = [ async base @@ -418723,7 +420984,6 @@ self: { distributive, ghc-prim, hashable, - HUnit, indexed-traversable, lens, QuickCheck, @@ -418732,10 +420992,10 @@ self: { semigroupoids, simple-reflect, tagged, + tasty, + tasty-hunit, + tasty-quickcheck, template-haskell, - test-framework, - test-framework-hunit, - test-framework-quickcheck2, transformers, transformers-compat, unordered-containers, @@ -418744,8 +421004,8 @@ self: { }: mkDerivation { pname = "linear"; - version = "1.23.1"; - sha256 = "0ybch2f4yc7mhxryr5f29i7j8ryq1i1n69fgldskxjrj825qkb3x"; + version = "1.23.2"; + sha256 = "05v91is8rwm34a86gra2q03d5f1klj4nmlxx8r3cx0gbkdhrvmmv"; libraryHaskellDepends = [ adjunctions base @@ -418776,13 +421036,12 @@ self: { binary bytestring deepseq - HUnit QuickCheck reflection simple-reflect - test-framework - test-framework-hunit - test-framework-quickcheck2 + tasty + tasty-hunit + tasty-quickcheck vector ]; description = "Linear Algebra"; @@ -422261,22 +424520,14 @@ self: { ) { }; "list1" = callPackage ( - { - mkDerivation, - base, - smash, - }: + { mkDerivation, base }: mkDerivation { pname = "list1"; - version = "0.0.2"; - sha256 = "0lxx1m2vrf14fb8r4qzfp6y8iqxai3cdpg2dzh9az383qxhy0zmh"; - libraryHaskellDepends = [ - base - smash - ]; + version = "0.1.0"; + sha256 = "1kyl7gg0prq7cyr0radwqcwdmqj3d0w2rjs1406nkryjfibsxgkh"; + libraryHaskellDepends = [ base ]; description = "Helpers for working with NonEmpty lists"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -422644,6 +424895,8 @@ self: { pname = "literatex"; version = "0.4.0.0"; sha256 = "06whn0rx1gy2pzl4678z087pfragy2sjaw34ljx6sfvxg0wn03bx"; + revision = "1"; + editedCabalFile = "1kqa99vrq35hk0n58cj5sgp6s87jgwhafz78jzrwi67v94w3hi01"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -423457,6 +425710,7 @@ self: { ]; description = "Support for writing an EDSL with LLVM-JIT as target"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -423558,6 +425812,8 @@ self: { doHaddock = false; description = "Utility functions for the llvm interface"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -423566,24 +425822,24 @@ self: { mkDerivation, base, enumset, - LLVM, + LLVM-21git, }: mkDerivation { pname = "llvm-ffi"; - version = "16.0"; - sha256 = "14cf6qhdq69ggx41259ih55g6z1vn0694wrh3s8m6f7adq990ra9"; + version = "21.0"; + sha256 = "1dfl6zxcghhyyp49lgkknlq8nkvii7aag7y8b38ny93cpcczgx0g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base enumset ]; - librarySystemDepends = [ LLVM ]; + librarySystemDepends = [ LLVM-21git ]; description = "FFI bindings to the LLVM compiler toolkit"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.thielema ]; } - ) { LLVM = null; }; + ) { LLVM-21git = null; }; "llvm-ffi-tools" = callPackage ( { @@ -424249,8 +426505,8 @@ self: { }: mkDerivation { pname = "llvm-tf"; - version = "16.0"; - sha256 = "1nscccmk0nf52p9r0af354p4n4vr1fbaym4x164wwwid7xc1x65g"; + version = "21.0"; + sha256 = "108a6kw5xfbxq4y613702r79bix6djyn3szi188d38vmwzs4a8qx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -425425,8 +427681,8 @@ self: { }: mkDerivation { pname = "log-base"; - version = "0.12.0.1"; - sha256 = "021chwkggy7q5c3hysfg3aj6pv60wla1cv8iyppibx70ilqpzqs4"; + version = "0.12.1.0"; + sha256 = "1c4dimdgzbia8h201prbl1w8g4qixn9fr100d7aawr256xhi7jci"; libraryHaskellDepends = [ aeson aeson-pretty @@ -425603,7 +427859,7 @@ self: { bytestring, deepseq, http-client, - http-client-openssl, + http-client-tls, http-types, log-base, network-uri, @@ -425618,8 +427874,8 @@ self: { }: mkDerivation { pname = "log-elasticsearch"; - version = "0.13.0.1"; - sha256 = "1l9p4zpf18rkwkv485swrlwyx2l3iqd332273mkz64ybjqllsdkx"; + version = "0.13.0.2"; + sha256 = "1hnd866bcp5fqnxlh3z39d2kn9mza9vp554sm34cmaclmkzfp0cw"; libraryHaskellDepends = [ aeson aeson-pretty @@ -425628,7 +427884,7 @@ self: { bytestring deepseq http-client - http-client-openssl + http-client-tls http-types log-base network-uri @@ -431262,8 +433518,8 @@ self: { }: mkDerivation { pname = "lz4-bytes"; - version = "0.1.2.0"; - sha256 = "1jgsz96n7n7g4403w0h3zjvlhdh11vy4s7wqka0ppsikjjl7f1ni"; + version = "0.2.0.0"; + sha256 = "10g253lwwmiz7ci70lyxfjln8mczj5r3m2nmcgidh4r9h31x30yv"; libraryHaskellDepends = [ base byte-order @@ -433266,7 +435522,6 @@ self: { ]; description = "Preconfigured email connection pool on top of smtp"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "exe"; } ) { }; @@ -436428,6 +438683,48 @@ self: { } ) { }; + "markup-parse_0_2_0_0" = callPackage ( + { + mkDerivation, + base, + bytestring, + containers, + deepseq, + Diff, + doctest-parallel, + flatparse, + string-interpolate, + tasty, + tasty-golden, + these, + }: + mkDerivation { + pname = "markup-parse"; + version = "0.2.0.0"; + sha256 = "1z08d3chvgl9zk9y2crfjih0crh5dv7pih6x0n7af38l6lhsgkhz"; + libraryHaskellDepends = [ + base + bytestring + containers + deepseq + flatparse + string-interpolate + these + ]; + testHaskellDepends = [ + base + bytestring + Diff + doctest-parallel + tasty + tasty-golden + ]; + description = "A markup parser"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + "markup-preview" = callPackage ( { mkDerivation, @@ -436999,47 +439296,6 @@ self: { ) { }; "massiv" = callPackage ( - { - mkDerivation, - base, - bytestring, - deepseq, - doctest, - exceptions, - primitive, - random, - scheduler, - unliftio-core, - vector, - vector-stream, - }: - mkDerivation { - pname = "massiv"; - version = "1.0.4.1"; - sha256 = "11gvl0z49aariw3vy8g46di1x5xibf6l7zf6b3l701hvg0hffyn7"; - libraryHaskellDepends = [ - base - bytestring - deepseq - exceptions - primitive - random - scheduler - unliftio-core - vector - vector-stream - ]; - testHaskellDepends = [ - base - doctest - ]; - description = "Massiv (Массив) is an Array Library"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.sheepforce ]; - } - ) { }; - - "massiv_1_0_5_0" = callPackage ( { mkDerivation, base, @@ -437076,7 +439332,6 @@ self: { ]; description = "Massiv (Массив) is an Array Library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.sheepforce ]; } ) { }; @@ -438925,8 +441180,8 @@ self: { }: mkDerivation { pname = "mattermost-api"; - version = "90000.0.0"; - sha256 = "1ka3r4bnfwlbjnkws8vkg8i9gj8wzsyss137p7hxrx4sr75s6iyv"; + version = "90000.1.0"; + sha256 = "0mp2qch4amgiixmx7zv158fb3ld1dpfad17sb43gxwadrj9afxdh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -438988,8 +441243,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "90000.0.0"; - sha256 = "0lrb8l8nbrdp4y2ala8hchr8ikv5hqw710ffiiw1sz6z2dqiqbxm"; + version = "90000.1.0"; + sha256 = "08ifm97c80a8vp9cqlwk7jb7105y2q6w77zvy2p42vk1l1p6yq4m"; libraryHaskellDepends = [ base containers @@ -439855,6 +442110,149 @@ self: { } ) { }; + "mcp" = callPackage ( + { + mkDerivation, + aeson, + async, + base, + base64-bytestring, + bytestring, + containers, + cryptonite, + http-conduit, + http-types, + jose, + memory, + mtl, + optparse-applicative, + random, + scientific, + servant, + servant-auth, + servant-auth-server, + servant-server, + stm, + text, + time, + transformers, + unordered-containers, + uuid, + wai, + wai-extra, + warp, + }: + mkDerivation { + pname = "mcp"; + version = "0.2.0.1"; + sha256 = "0mmm890m86dv16hw7mjbznswhw1jrm7kbn45qqhfp661k3kwlw1j"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + async + base + base64-bytestring + bytestring + containers + cryptonite + http-conduit + http-types + jose + memory + mtl + random + servant + servant-auth + servant-auth-server + servant-server + stm + text + time + transformers + unordered-containers + uuid + wai + wai-extra + warp + ]; + executableHaskellDepends = [ + aeson + base + containers + optparse-applicative + scientific + text + time + ]; + testHaskellDepends = [ base ]; + description = "A Haskell implementation of the Model Context Protocol (MCP)"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + "mcp-server" = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + containers, + hspec, + http-types, + network-uri, + QuickCheck, + template-haskell, + text, + vector, + wai, + warp, + }: + mkDerivation { + pname = "mcp-server"; + version = "0.1.0.14"; + sha256 = "0lyr19sg5cjsgiq16v0cfkf1rkwgvyacz4siflf4wapllrkr82fz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + base + bytestring + containers + http-types + network-uri + template-haskell + text + vector + wai + warp + ]; + executableHaskellDepends = [ + base + containers + network-uri + text + ]; + testHaskellDepends = [ + aeson + base + bytestring + containers + hspec + network-uri + QuickCheck + template-haskell + text + ]; + description = "Library for building Model Context Protocol (MCP) servers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + "mcpi" = callPackage ( { mkDerivation, @@ -440276,8 +442674,8 @@ self: { pname = "med-module"; version = "0.1.3"; sha256 = "04p1aj85hsr3wpnnfg4nxbqsgq41ga63mrg2w39d8ls8ljvajvna"; - revision = "1"; - editedCabalFile = "0m69cvm2nzx2g0y8jfkymap529fm0k65wg82dycj0dc60p9fj66r"; + revision = "2"; + editedCabalFile = "0b557rrqki2rjb922s1yqkd7gbm9cjhzg52f0h5mp19v53nds3vz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -441172,6 +443570,8 @@ self: { pname = "megaparsec-tests"; version = "9.7.0"; sha256 = "17jwz62f8lnrfmmfrsv1jcvn9wmpk4jlhmxjwk5qqx2iyijnrpb1"; + revision = "1"; + editedCabalFile = "108nv4c045xg3ks0v7c0figqrl7v90l87cahhmn5mc24vdpxhkrj"; libraryHaskellDepends = [ base bytestring @@ -441718,7 +444118,7 @@ self: { } ) { }; - "mem-info_0_4_1_0" = callPackage ( + "mem-info_0_4_1_1" = callPackage ( { mkDerivation, base, @@ -441743,8 +444143,8 @@ self: { }: mkDerivation { pname = "mem-info"; - version = "0.4.1.0"; - sha256 = "0613k5qil4j1cfh335gyjf708md9cicbhm5xji7v8fzfmzsqxx1c"; + version = "0.4.1.1"; + sha256 = "10b3lmqh4nbyfpglgjb04xx0wd65vxfyc53m3l89linhvij61kmc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -444460,8 +446860,8 @@ self: { pname = "microaeson"; version = "0.1.0.2"; sha256 = "025vnzs4j2nmkin5x8h5hbrj25spamqppg68wfqlnbrr1519lxfz"; - revision = "1"; - editedCabalFile = "1faq5mjz8jy739lbaizy1v5wrvkxsjzp6lhjmb06a3yv71h6m594"; + revision = "2"; + editedCabalFile = "04kq6sh1fl0xgkai0d055s7hkwf21vlksgqizh4xfvsb2xbakgiz"; libraryHaskellDepends = [ array base @@ -445557,8 +447957,8 @@ self: { pname = "midi-music-box"; version = "0.0.1.2"; sha256 = "0rnjwis6y0lnyfjxnxqk3zsh78ylccq5v21avb97vybmj0pld1l9"; - revision = "6"; - editedCabalFile = "0b8039mw0wacjxxwx1ws2wczwdgxm4iiymdkykk7lp5ii75vvfww"; + revision = "7"; + editedCabalFile = "02xnldnw5ci6chpbj18mz82m8pp582zpy9z3bdy5yi7q7k415h0p"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -445705,6 +448105,8 @@ self: { pname = "midimory"; version = "0.0.2.3"; sha256 = "1k9pm0ai9i66c7l4px84cf5db3nsq5ab9ndplcyfh05snbdy70vz"; + revision = "1"; + editedCabalFile = "1sq7xipm92nfcbf6cad1yclzl36gghqlnnvs1r0579njjcchbgl5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -446101,9 +448503,11 @@ self: { directory, filepath, hspec, + hspec-discover, http-client, http-date, http-types, + http2, network, old-locale, parsec, @@ -446124,8 +448528,8 @@ self: { }: mkDerivation { pname = "mighttpd2"; - version = "4.0.8"; - sha256 = "0yqj3m7y493bzjmx1ycyid4s40h11l46w8lv1783drlw7wpakmya"; + version = "4.0.9"; + sha256 = "1qd43hlyvhnslxrvy4h0rj5qs6nbxnz8d23myqjspa9jl8rzb1bg"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -446143,6 +448547,7 @@ self: { filepath http-date http-types + http2 network parsec resourcet @@ -446182,6 +448587,7 @@ self: { hspec http-client ]; + testToolDepends = [ hspec-discover ]; description = "High performance web server on WAI/warp"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -447078,8 +449484,8 @@ self: { }: mkDerivation { pname = "minici"; - version = "0.1.7"; - sha256 = "0kwlgsjn7ikddk59bksb4abb0dc262a61mh4694p8s7x3psjris1"; + version = "0.1.8"; + sha256 = "0fady7w644gcrjd9yy7ngbi1dj2rp87lnzmxjr307w8kdb2aqdcj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -449068,25 +451474,28 @@ self: { bytestring, concurrent-output, containers, + data-default, directory, + extra, filepath, filepattern, - ghc-prim, hspec, HsYAML, + MissingH, monad-parallel, process, SafeSemaphore, text, + text-builder-linear, + text-display, time, unix-compat, - unordered-containers, xdg-basedir, }: mkDerivation { pname = "miv"; - version = "0.4.8"; - sha256 = "1b3lplsnjf992rvidj48swccl8f8aqdik1sf481g7vwv2mz7d7m6"; + version = "0.4.9"; + sha256 = "1z3hwvg3jb82hf6hrlzl9vv1fqy1llgfj2rps27fbccz50i6v6ps"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -449095,33 +451504,26 @@ self: { bytestring concurrent-output containers + data-default directory + extra filepath filepattern - ghc-prim HsYAML + MissingH monad-parallel process SafeSemaphore text + text-builder-linear + text-display time unix-compat - unordered-containers xdg-basedir ]; testHaskellDepends = [ base - bytestring - containers - directory - ghc-prim hspec - HsYAML - monad-parallel - process - text - time - unordered-containers ]; description = "Vim plugin manager written in Haskell"; license = lib.licenses.mit; @@ -449591,6 +451993,8 @@ self: { pname = "mmark-cli"; version = "0.0.5.2"; sha256 = "05i8wy3zls6fp1qmdz4ayydhgvq6jnhh2rj4r3frvp8nl70kkv26"; + revision = "1"; + editedCabalFile = "1p1ia1vxaa8qpbc4hclmavjnk8xj1b6qqzprq3gysy5l38s340aj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -449671,10 +452075,8 @@ self: { }: mkDerivation { pname = "mmorph"; - version = "1.2.0"; - sha256 = "1022d8mm523dihkf85mqsqxpm9rnyicmv91c8rm4csv7xdc80cv1"; - revision = "3"; - editedCabalFile = "1582vcpjiyimb1vwnhgq8gp805iziwa8sivv2frir0cgq4z236yz"; + version = "1.2.1"; + sha256 = "1rjclyxyr5ajnpmkrlwap77h5fmdwys8bpwfj0n87v33hh1dcn8f"; libraryHaskellDepends = [ base mtl @@ -456467,8 +458869,8 @@ self: { }: mkDerivation { pname = "monoidmap-aeson"; - version = "0.0.0.5"; - sha256 = "1m5pw94lrybjvf6hnfzl0v974fg2i53r5s8aw4qv9cbxizhh68ag"; + version = "0.0.0.6"; + sha256 = "0fd2cd4a8ncb3hibfknq0sf7j8nmmisr4bwc42yp6l0ddfsdbbd6"; libraryHaskellDepends = [ aeson base @@ -456509,8 +458911,8 @@ self: { }: mkDerivation { pname = "monoidmap-examples"; - version = "0.0.0.0"; - sha256 = "1pqswi2r41r7hrrzwg4ygj67jsgmmsyyqyn7n47lnf4q331l1hv6"; + version = "0.0.0.1"; + sha256 = "1q7vssgknncjq1f187zvg6630r6kk12mdmq1985skm98ynl1n8wx"; libraryHaskellDepends = [ base containers @@ -456553,8 +458955,8 @@ self: { }: mkDerivation { pname = "monoidmap-internal"; - version = "0.0.0.0"; - sha256 = "0di3b4x4f5mkmi71rpfa0zv5048z4hkzzdy1zw1qla46sn1646jg"; + version = "0.0.0.1"; + sha256 = "1khqa1pnxfngbay9gzjvls7hy7pddr8pd32c0z1na9mj8q8hz63c"; libraryHaskellDepends = [ base containers @@ -456587,8 +458989,6 @@ self: { ]; description = "Internal support for monoidmap"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -456603,8 +459003,8 @@ self: { }: mkDerivation { pname = "monoidmap-quickcheck"; - version = "0.0.0.2"; - sha256 = "0sqgd61a6abwr7rdiqm25cs2kl496v8ji0rax9dw0sdc3zh6m4j2"; + version = "0.0.0.3"; + sha256 = "065b7rk64yg89ll546n338jny9d3y0pmp2alwf5z7z5n25nf40cq"; libraryHaskellDepends = [ base containers @@ -460128,6 +462528,7 @@ self: { badPlatforms = lib.platforms.darwin; hydraPlatforms = lib.platforms.none; mainProgram = "mptcp-pm"; + broken = true; } ) { }; @@ -460813,8 +463214,8 @@ self: { pname = "msgpack"; version = "1.0.1.0"; sha256 = "1ljb9rdhdbxqs32brrwd42c8v3z7yrl6pr4mzmid1rfqdipard77"; - revision = "2"; - editedCabalFile = "07m8xrwfxp0p6dgg7bz1vwsypcwi9ix84bxva462261ncyaayd9p"; + revision = "3"; + editedCabalFile = "10qhv3v617zq8r3b08mqb3h1h6vzmvyq2rps6kdvs8gvqb5mkiss"; libraryHaskellDepends = [ base binary @@ -460838,8 +463239,6 @@ self: { ]; description = "A Haskell implementation of MessagePack"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -460883,6 +463282,7 @@ self: { description = "Aeson adapter for MessagePack"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -461159,6 +463559,7 @@ self: { description = "A MessagePack-RPC Implementation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -464343,8 +466744,8 @@ self: { pname = "multistate"; version = "0.8.0.4"; sha256 = "0y42c21ha0chqhrn40a4bikdbirsw7aqg4i866frpagz1ivr915q"; - revision = "1"; - editedCabalFile = "0m1wv2yv1isw1qkzfa2fgjx0md7irp9djcgy16739wvl8hnj1ciq"; + revision = "2"; + editedCabalFile = "1gdxarys4x4bws8d8smw219z7zrjbyl8k7d2fqv1ray1x52zxr3n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -469644,8 +472045,8 @@ self: { }: mkDerivation { pname = "natural-arithmetic"; - version = "0.2.2.0"; - sha256 = "1ps6lcp0s3izphp3hx73p2v91cs1r2iz4rh1hwrmxd9pfar815ya"; + version = "0.2.3.0"; + sha256 = "1lf7v804lnvb63mw232qkyqrhdrbk37s6icx4wysiw8z90v6c10j"; libraryHaskellDepends = [ base unlifted @@ -474021,8 +476422,8 @@ self: { }: mkDerivation { pname = "network-protocol-xmpp"; - version = "0.5.1"; - sha256 = "1fd8rq235lbpkdlashsqk01ymxbbh6q1hng706h5lw0v49wpvd7i"; + version = "0.5.2"; + sha256 = "0jm46pkhys8a2rvyss8dv1b61im56il0kkwswg521xv6mfqk1csm"; libraryHaskellDepends = [ base bytestring @@ -480450,8 +482851,8 @@ self: { }: mkDerivation { pname = "notmuch"; - version = "0.3.1.1"; - sha256 = "18z8pbqagdyd5rqv42i6060vv40gv84dx3sf52vvrayga19k1ydw"; + version = "0.3.2"; + sha256 = "0yx7lkncs7xn3w3sdplwj7ghsblm9q4w97af9vw9rszhpd50b1cd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -480471,7 +482872,7 @@ self: { ]; libraryToolDepends = [ c2hs ]; description = "Haskell binding to Notmuch, the mail indexer"; - license = lib.licenses.gpl3Only; + license = lib.licenses.gpl3Plus; } ) { @@ -482726,6 +485127,29 @@ self: { } ) { }; + "numhask_0_13_0_0" = callPackage ( + { + mkDerivation, + base, + doctest-parallel, + QuickCheck, + }: + mkDerivation { + pname = "numhask"; + version = "0.13.0.0"; + sha256 = "13174w30c9pmmfjc5gn9yfzvlyr6ljm0diyh0q0gysiq0wspx2ni"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base + doctest-parallel + QuickCheck + ]; + description = "A numeric class hierarchy"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + "numhask-array" = callPackage ( { mkDerivation, @@ -485405,6 +487829,8 @@ self: { pname = "ods2csv"; version = "0.1.0.1"; sha256 = "1a1qrknqh24hgv5v46vnxnaqcnx3n92rcwgh3b6h6k27kassx4xa"; + revision = "1"; + editedCabalFile = "0sb7k4sw64ld5jdsx1g522q911d4z9c92mh0vfjb0p7h4r1h71hm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -486293,6 +488719,8 @@ self: { pname = "oidc-client"; version = "0.8.0.0"; sha256 = "0fmffnf6gg99d15nn84ih36lr7qasa1zfkb62sgb0icik8dwv83m"; + revision = "1"; + editedCabalFile = "1zaaldni8i7kdxpmbpd2nlva0ygycn9955yh9qvcm08cd2wvq15d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -486330,8 +488758,6 @@ self: { ]; description = "OpenID Connect 1.0 library for RP"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -486541,6 +488967,75 @@ self: { } ) { }; + "ollama-haskell_0_2_0_0" = callPackage ( + { + mkDerivation, + aeson, + base, + base64-bytestring, + bytestring, + containers, + directory, + filepath, + http-client, + http-client-tls, + http-types, + mtl, + scientific, + silently, + stm, + tasty, + tasty-hunit, + text, + time, + }: + mkDerivation { + pname = "ollama-haskell"; + version = "0.2.0.0"; + sha256 = "00vgffjzhyc060x59gxrqazzclkm3bspmvzva5kc2c2319l93wy8"; + libraryHaskellDepends = [ + aeson + base + base64-bytestring + bytestring + containers + directory + filepath + http-client + http-client-tls + http-types + mtl + stm + text + time + ]; + testHaskellDepends = [ + aeson + base + base64-bytestring + bytestring + containers + directory + filepath + http-client + http-client-tls + http-types + mtl + scientific + silently + stm + tasty + tasty-hunit + text + time + ]; + description = "Haskell client for ollama"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + "ollama-holes-plugin" = callPackage ( { mkDerivation, @@ -489408,8 +491903,8 @@ self: { }: mkDerivation { pname = "opencascade-hs"; - version = "0.5.0.1"; - sha256 = "1a397mxry4k5hq6gwnjn1lc3q8fz5pg7ff6imr1fwyf9b6rhls9j"; + version = "0.5.1.0"; + sha256 = "12c77xnh0h0h2sw23q5v891iddnmsq5j1853b90wypm6p18kpnsw"; libraryHaskellDepends = [ base resourcet @@ -489432,8 +491927,8 @@ self: { }: mkDerivation { pname = "opencc"; - version = "0.1.1.0"; - sha256 = "06jz04352bgqnfvzds75n65x352x07ffj8aan01q6m2mjs3xidfa"; + version = "0.1.2.0"; + sha256 = "0vl57aglagq0zpxld3hhp4sda783m5sncdxwyxyjypl433yjyzgq"; libraryHaskellDepends = [ base bytestring @@ -490821,8 +493316,8 @@ self: { }: mkDerivation { pname = "opentelemetry-plugin"; - version = "1.1.1"; - sha256 = "1sp6bzy0is704x18522b2kmbbsw3nbfz9x69rvidmpz0x52cpwbg"; + version = "1.1.2"; + sha256 = "12lm7b4kjqlvc3j2i4q7xqavr0d98wazfaqyvph20afvfq90zwf8"; libraryHaskellDepends = [ base bytestring @@ -490840,8 +493335,6 @@ self: { ]; description = "GHC plugin for open telemetry"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -492465,7 +494958,7 @@ self: { } ) { }; - "optima_0_4_0_6" = callPackage ( + "optima_0_4_0_7" = callPackage ( { mkDerivation, attoparsec, @@ -492478,8 +494971,8 @@ self: { }: mkDerivation { pname = "optima"; - version = "0.4.0.6"; - sha256 = "06wy9d3zidly70d3n9bbxfl9yx2hx03xw8k9p8vhjb0xj526vpgk"; + version = "0.4.0.7"; + sha256 = "0cqy4ifddmyjmp8hj5ksi7f1b2bvxlwljm6q2cjxfpp3ig6alzr6"; libraryHaskellDepends = [ attoparsec attoparsec-data @@ -492843,6 +495336,39 @@ self: { } ) { }; + "optparse-applicative_0_19_0_0" = callPackage ( + { + mkDerivation, + base, + prettyprinter, + prettyprinter-ansi-terminal, + process, + QuickCheck, + text, + transformers, + }: + mkDerivation { + pname = "optparse-applicative"; + version = "0.19.0.0"; + sha256 = "0waq6i6jk0zj9vb00m62khfcm9xdnz3afzs471vhqwr1v3psw5ng"; + libraryHaskellDepends = [ + base + prettyprinter + prettyprinter-ansi-terminal + process + text + transformers + ]; + testHaskellDepends = [ + base + QuickCheck + ]; + description = "Utilities and combinators for parsing command line options"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + "optparse-applicative-cmdline-util" = callPackage ( { mkDerivation, @@ -495188,6 +497714,8 @@ self: { pname = "os-string"; version = "2.0.7"; sha256 = "186b4swiga0nk05np512iw50pz9w88l3bqz47pr241997bykb71k"; + revision = "1"; + editedCabalFile = "0504jf7wa84z3a8gd60cx7df6232xq31wqc532jcxrxh3hl0hm6b"; libraryHaskellDepends = [ base bytestring @@ -495746,8 +498274,8 @@ self: { }: mkDerivation { pname = "oughta"; - version = "0.2.0.0"; - sha256 = "1ls97l94jpv5mlmiqccm4z8p80vnk8z0mv2937zcl1c7bx67ra3j"; + version = "0.3.0.0"; + sha256 = "1153jnvscsc3i8zz0sih7vy42vlsgynw0hvjvh0zxxqcyx4cc27i"; libraryHaskellDepends = [ base bytestring @@ -496134,6 +498662,64 @@ self: { } ) { }; + "ox-arrays" = callPackage ( + { + mkDerivation, + base, + bytestring, + deepseq, + ghc-typelits-knownnat, + ghc-typelits-natnormalise, + hedgehog, + hmatrix, + orthotope, + random, + tasty, + tasty-bench, + tasty-hedgehog, + template-haskell, + vector, + }: + mkDerivation { + pname = "ox-arrays"; + version = "0.1.0.0"; + sha256 = "0kix255p5n1dg9y3s00il3x4s1r4d3fn1v6ljm6zgy8j40lg1nzh"; + libraryHaskellDepends = [ + base + deepseq + ghc-typelits-knownnat + ghc-typelits-natnormalise + orthotope + template-haskell + vector + ]; + testHaskellDepends = [ + base + bytestring + ghc-typelits-knownnat + ghc-typelits-natnormalise + hedgehog + orthotope + random + tasty + tasty-hedgehog + vector + ]; + benchmarkHaskellDepends = [ + base + hmatrix + orthotope + tasty-bench + vector + ]; + doHaddock = false; + description = "An efficient CPU-based multidimensional array (tensor) library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + "pa-error-tree" = callPackage ( { mkDerivation, @@ -496661,6 +499247,7 @@ self: { extra, filepath, hspec, + linear-base, listsafe, mtl, optparse-applicative, @@ -496672,16 +499259,16 @@ self: { }: mkDerivation { pname = "packed-data"; - version = "0.1.0.3"; - sha256 = "1h0aqcpfygj29mij5ln7zaypf4a6v37ycnlhh5shb7pvh0nfajn3"; + version = "0.2.0.0"; + sha256 = "07hkm3a98aadihm3zvvq299xmswf8xzdyzx06qcs7nbdqwkqx2zk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring - bytestring-strict-builder deepseq extra + linear-base mtl template-haskell ]; @@ -496710,7 +499297,9 @@ self: { vector ]; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "examples"; + broken = true; } ) { }; @@ -497746,22 +500335,47 @@ self: { "palindromes" = callPackage ( { mkDerivation, - array, base, - bytestring, - containers, + conduit, + criterion, + deepseq, + directory, + filepath, + HUnit, + levenshtein, + QuickCheck, + strict, + vector, }: mkDerivation { pname = "palindromes"; - version = "0.4"; - sha256 = "1k0kvd8p1ivwmpmf8khwmb4vyk8z0di74xn5840zy9jhf1cwx4kn"; + version = "1.1.0.0"; + sha256 = "1dfq0b2f11xwbdn9hyrrr4ywzz415nb32n4yfjrqf35myaqdbfcz"; isLibrary = true; isExecutable = true; + libraryHaskellDepends = [ + base + conduit + vector + ]; executableHaskellDepends = [ - array base - bytestring - containers + directory + ]; + testHaskellDepends = [ + base + HUnit + levenshtein + QuickCheck + vector + ]; + benchmarkHaskellDepends = [ + base + criterion + deepseq + directory + filepath + strict ]; description = "Finding palindromes in strings"; license = lib.licenses.bsd3; @@ -499571,8 +502185,8 @@ self: { }: mkDerivation { pname = "pandoc-lua-marshal"; - version = "0.3.0"; - sha256 = "0d8vfbmgd107b9lq9dq0b39v3dhznqh11j0ci0i8hsb7g3dkks5g"; + version = "0.3.1"; + sha256 = "0869amr9w5s90dha694vy6rwfni7p1wp9dyjyyk2jvh8h22gcpr0"; libraryHaskellDepends = [ aeson base @@ -499801,6 +502415,8 @@ self: { pname = "pandoc-plot"; version = "1.9.1"; sha256 = "0d6lknjnlzg4a7sx311kpdi94yq7fp19lhvwbsf7rvc3ykx0hjm3"; + revision = "1"; + editedCabalFile = "0ykgv0cxiwvcx0pkkmx841cdwv2sas033mq928mg6dlcbvw32nx1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -500211,8 +502827,8 @@ self: { pname = "pandoc-types"; version = "1.23.1"; sha256 = "1hd18l1c5yh7x24gsligkbraadq12hn7mim16xyjnicdsa1s03xd"; - revision = "2"; - editedCabalFile = "1whymq4w5z08l5ng829kn8aslczda6svi6c6q72cnv200mlq7d1c"; + revision = "3"; + editedCabalFile = "0w2n4vzxs3jasrivaq49clxdlccnfv2gh4mkp8s7krxa1arambrz"; libraryHaskellDepends = [ aeson base @@ -503612,8 +506228,8 @@ self: { pname = "parser-combinators-tests"; version = "1.3.0"; sha256 = "0sw6ws7za93y3lbmxp6jp1k17zi3wdg7698ab133kcw82f6mzba2"; - revision = "1"; - editedCabalFile = "0h6lwj0mdlirlwcadjvyblvgqg6yksw2bnp77qkjxm2kk3rw56hn"; + revision = "2"; + editedCabalFile = "1b038wk6b1kria8627qb0nfrz4v67j2yq5rx01m3vigfxf6h4422"; isLibrary = false; isExecutable = false; testHaskellDepends = [ @@ -506147,6 +508763,7 @@ self: { exceptions, hspec, http-client, + http-client-tls, http-types, network-uri, text, @@ -506155,8 +508772,8 @@ self: { }: mkDerivation { pname = "patrol"; - version = "1.0.0.11"; - sha256 = "0adci15r7mm0ddbg4zb10kngyl0c7ipaws7drd7idmzrb0gb82kd"; + version = "1.0.1.0"; + sha256 = "1yk90shi4idxdzf82mvxpsbgslx3psrwpxgwhnqpcl0kj4sdblf1"; libraryHaskellDepends = [ aeson base @@ -506165,6 +508782,63 @@ self: { containers exceptions http-client + http-client-tls + http-types + network-uri + text + time + uuid + ]; + testHaskellDepends = [ + aeson + base + bytestring + case-insensitive + containers + hspec + http-client + http-types + network-uri + text + time + uuid + ]; + description = "Sentry SDK"; + license = lib.licenses.mit; + } + ) { }; + + "patrol_1_1_0_0" = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + case-insensitive, + containers, + exceptions, + hspec, + http-client, + http-client-tls, + http-types, + network-uri, + text, + time, + uuid, + }: + mkDerivation { + pname = "patrol"; + version = "1.1.0.0"; + sha256 = "0ijfflc9gv3ks5y3irng0mpsbcfwx41v59xgm8840310sz6kj4p1"; + libraryHaskellDepends = [ + aeson + base + bytestring + case-insensitive + containers + exceptions + http-client + http-client-tls http-types network-uri text @@ -506188,6 +508862,7 @@ self: { ]; description = "Sentry SDK"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -508033,6 +510708,28 @@ self: { } ) { }; + "pear" = callPackage ( + { + mkDerivation, + base, + doctest, + markdown-unlit, + }: + mkDerivation { + pname = "pear"; + version = "1.0.0.1"; + sha256 = "1svbmj1v7y3hq9f43x4szvs6h83zz085y1h5lncci4i4yx7qfrhj"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base + doctest + ]; + testToolDepends = [ markdown-unlit ]; + description = "Pear Trees: An indexed type using type-level binary numbers"; + license = lib.licenses.mit; + } + ) { }; + "pec" = callPackage ( { mkDerivation, @@ -510545,46 +513242,6 @@ self: { ) { }; "persistent-documentation" = callPackage ( - { - mkDerivation, - base, - containers, - hspec, - hspec-discover, - mtl, - persistent, - persistent-template, - template-haskell, - text, - }: - mkDerivation { - pname = "persistent-documentation"; - version = "0.1.0.5"; - sha256 = "032mfnsz5kpy1022gc2w9y0g4fjhqwq07zb2r8arjdhzzhbirwk2"; - libraryHaskellDepends = [ - base - containers - mtl - persistent - template-haskell - text - ]; - testHaskellDepends = [ - base - containers - hspec - hspec-discover - persistent - persistent-template - text - ]; - testToolDepends = [ hspec-discover ]; - description = "Documentation DSL for persistent entities"; - license = lib.licenses.asl20; - } - ) { }; - - "persistent-documentation_0_1_0_6" = callPackage ( { mkDerivation, base, @@ -510621,7 +513278,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Documentation DSL for persistent entities"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -511720,6 +514376,105 @@ self: { } ) { }; + "persistent-postgresql_2_13_7_0" = callPackage ( + { + mkDerivation, + aeson, + attoparsec, + base, + blaze-builder, + bytestring, + conduit, + containers, + fast-logger, + hspec, + hspec-expectations, + hspec-expectations-lifted, + http-api-data, + HUnit, + monad-logger, + mtl, + path-pieces, + persistent, + persistent-qq, + persistent-test, + postgresql-libpq, + postgresql-simple, + QuickCheck, + quickcheck-instances, + resource-pool, + resourcet, + string-conversions, + text, + time, + transformers, + unliftio, + unliftio-core, + unordered-containers, + vault, + vector, + }: + mkDerivation { + pname = "persistent-postgresql"; + version = "2.13.7.0"; + sha256 = "1774fh28jls2r692164ln66ipa6gl3sqj8pb04nf3sl1m498qjd7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + attoparsec + base + blaze-builder + bytestring + conduit + containers + monad-logger + mtl + persistent + postgresql-libpq + postgresql-simple + resource-pool + resourcet + string-conversions + text + time + transformers + unliftio-core + vault + ]; + testHaskellDepends = [ + aeson + base + bytestring + containers + fast-logger + hspec + hspec-expectations + hspec-expectations-lifted + http-api-data + HUnit + monad-logger + path-pieces + persistent + persistent-qq + persistent-test + QuickCheck + quickcheck-instances + resourcet + text + time + transformers + unliftio + unliftio-core + unordered-containers + vector + ]; + description = "Backend for the persistent library using postgresql"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + } + ) { }; + "persistent-postgresql-streaming" = callPackage ( { mkDerivation, @@ -512366,7 +515121,7 @@ self: { } ) { }; - "persistent-test_2_13_1_3" = callPackage ( + "persistent-test" = callPackage ( { mkDerivation, aeson, @@ -512432,11 +515187,10 @@ self: { ]; description = "Tests for Persistent"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; - "persistent-test" = callPackage ( + "persistent-test_2_13_1_4" = callPackage ( { mkDerivation, aeson, @@ -512471,6 +515225,8 @@ self: { pname = "persistent-test"; version = "2.13.1.4"; sha256 = "1k2wq6ag4jvqr1krdjfx84mmx0mg09hy38w569zxwdrd03ffcjpy"; + revision = "1"; + editedCabalFile = "1kzqhvs4h8xpx2x153gh64rc006mvjxv6fzsyxvnfknmqcx8xn19"; libraryHaskellDepends = [ aeson base @@ -512502,6 +515258,7 @@ self: { ]; description = "Tests for Persistent"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -512529,8 +515286,8 @@ self: { pname = "persistent-typed-db"; version = "0.1.0.7"; sha256 = "0fkshbf35mnlx4aqkij0lzzmpfxw34zkwgq8s2lm3rrrqw7gw59l"; - revision = "1"; - editedCabalFile = "19l1nfd82l8lsjsi00virsapwlnany5cdwgzw9hmm9bkwxfsk9v8"; + revision = "2"; + editedCabalFile = "0m5ajvfcj10k1mnlwdyd1n9s3py70g4sinzh0gkvch9q1bl6qiwz"; libraryHaskellDepends = [ aeson base @@ -513989,6 +516746,7 @@ self: { bytestring, containers, directory, + file-embed, filepath, hspec, hspec-core, @@ -513996,16 +516754,21 @@ self: { megaparsec, optparse-applicative, prettyprinter, + process, + random, scientific, silently, text, + time, utf8-string, + vector, + xml-conduit, yaml, }: mkDerivation { pname = "phino"; - version = "0.0.0.1"; - sha256 = "1sl4iqrcmmjn2gc294rz4yfj5k0hd7ngl9ax57k22h2qac90rrkc"; + version = "0.0.0.14"; + sha256 = "1nl2n0y636bdppxc29p4zyxlyra2zjiy3a1s6xw2yin64q3gqrim"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -514015,13 +516778,18 @@ self: { bytestring containers directory + file-embed filepath megaparsec optparse-applicative prettyprinter + random scientific text + time utf8-string + vector + xml-conduit yaml ]; executableHaskellDepends = [ base ]; @@ -514036,8 +516804,10 @@ self: { megaparsec optparse-applicative prettyprinter + process silently text + xml-conduit yaml ]; testToolDepends = [ hspec-discover ]; @@ -519444,8 +522214,8 @@ self: { pname = "pipes-safe"; version = "2.3.5"; sha256 = "13npagy597g6zfr2f3vj4a98h2ssg2ps7lmdzrgdsvm8m28x3cph"; - revision = "3"; - editedCabalFile = "1wic8km3c17g2xrmxd4qj5qmppb76k7srxrgj8jg1vs6g2l7v6cs"; + revision = "4"; + editedCabalFile = "1x0p9fiilz21ck5n52lg2p17qi7n0mkk566qzzwd4jnvhbcsb8jf"; libraryHaskellDepends = [ base containers @@ -522415,6 +525185,735 @@ self: { } ) { }; + "pms-application-service" = callPackage ( + { + mkDerivation, + aeson, + async, + async-pool, + base, + data-default, + fast-logger, + hspec, + hspec-discover, + lens, + monad-logger, + mtl, + pms-domain-model, + safe-exceptions, + stm, + text, + unix, + yaml, + }: + mkDerivation { + pname = "pms-application-service"; + version = "0.0.4.0"; + sha256 = "0a91pa5rs2vplixky8bap4gl8i8mm3j7454w7s4pihyf4h7wfhpl"; + libraryHaskellDepends = [ + aeson + async + async-pool + base + data-default + fast-logger + lens + monad-logger + mtl + pms-domain-model + safe-exceptions + text + yaml + ]; + testHaskellDepends = [ + async + base + data-default + hspec + hspec-discover + lens + monad-logger + pms-domain-model + stm + unix + ]; + testToolDepends = [ hspec-discover ]; + description = "pms-application-service"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + } + ) { }; + + "pms-domain-model" = callPackage ( + { + mkDerivation, + aeson, + async, + base, + bytestring, + data-default, + fast-logger, + filepath, + hspec, + hspec-discover, + lens, + monad-logger, + mtl, + safe-exceptions, + stm, + strip-ansi-escape, + text, + transformers, + unix, + }: + mkDerivation { + pname = "pms-domain-model"; + version = "0.0.5.0"; + sha256 = "0z0a04j6x4jrq6xpfdd6jnbq7q7p71y51gar6i6g0apfliiydq9w"; + libraryHaskellDepends = [ + aeson + base + bytestring + data-default + fast-logger + filepath + lens + monad-logger + mtl + safe-exceptions + stm + strip-ansi-escape + text + transformers + ]; + testHaskellDepends = [ + aeson + async + base + data-default + hspec + hspec-discover + lens + monad-logger + stm + unix + ]; + testToolDepends = [ hspec-discover ]; + description = "pms-domain-model"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + "pms-domain-service" = callPackage ( + { + mkDerivation, + aeson, + async, + base, + bytestring, + conduit, + data-default, + directory, + fast-logger, + filepath, + hspec, + hspec-discover, + lens, + monad-logger, + mtl, + mustache, + network-uri, + pms-domain-model, + safe-exceptions, + stm, + template-haskell, + text, + transformers, + unix, + unordered-containers, + }: + mkDerivation { + pname = "pms-domain-service"; + version = "0.0.4.0"; + sha256 = "1akacdrh2ngyvik46sjhag8kp9hyyr7rv9grswx7i3ngy6pk64yn"; + libraryHaskellDepends = [ + aeson + base + bytestring + conduit + data-default + directory + fast-logger + filepath + lens + monad-logger + mtl + mustache + network-uri + pms-domain-model + safe-exceptions + stm + template-haskell + text + transformers + unordered-containers + ]; + testHaskellDepends = [ + async + base + data-default + hspec + hspec-discover + lens + monad-logger + pms-domain-model + stm + unix + ]; + testToolDepends = [ hspec-discover ]; + description = "pms-domain-service"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + } + ) { }; + + "pms-infra-cmdrun" = callPackage ( + { + mkDerivation, + aeson, + async, + base, + bytestring, + conduit, + data-default, + directory, + fast-logger, + filepath, + hspec, + hspec-discover, + lens, + monad-logger, + mtl, + pms-domain-model, + process, + safe-exceptions, + stm, + text, + transformers, + unix, + }: + mkDerivation { + pname = "pms-infra-cmdrun"; + version = "0.0.2.0"; + sha256 = "0c4jhci5im04ks49if7ncbqipbln2ixw2f262qw64ir5a5hdygzy"; + libraryHaskellDepends = [ + aeson + async + base + bytestring + conduit + data-default + directory + fast-logger + filepath + lens + monad-logger + mtl + pms-domain-model + process + safe-exceptions + stm + text + transformers + ]; + testHaskellDepends = [ + async + base + data-default + hspec + hspec-discover + lens + monad-logger + pms-domain-model + stm + unix + ]; + testToolDepends = [ hspec-discover ]; + description = "pms-infra-cmdrun"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + } + ) { }; + + "pms-infra-procspawn" = callPackage ( + { + mkDerivation, + aeson, + async, + base, + bytestring, + conduit, + data-default, + directory, + fast-logger, + filepath, + hspec, + hspec-discover, + lens, + monad-logger, + mtl, + pms-domain-model, + process, + safe-exceptions, + stm, + text, + transformers, + unix, + }: + mkDerivation { + pname = "pms-infra-procspawn"; + version = "0.0.1.0"; + sha256 = "1wg0508h2svl0pk9yrwrnmssrqnm2vnlws9w9nm5ydqlqibdr282"; + libraryHaskellDepends = [ + aeson + async + base + bytestring + conduit + data-default + directory + fast-logger + filepath + lens + monad-logger + mtl + pms-domain-model + process + safe-exceptions + stm + text + transformers + ]; + testHaskellDepends = [ + async + base + data-default + hspec + hspec-discover + lens + monad-logger + pms-domain-model + stm + unix + ]; + testToolDepends = [ hspec-discover ]; + description = "pms-infra-procspawn"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + } + ) { }; + + "pms-infra-socket" = callPackage ( + { + mkDerivation, + aeson, + async, + base, + base16-bytestring, + bytestring, + conduit, + data-default, + directory, + fast-logger, + filepath, + hspec, + hspec-discover, + lens, + monad-logger, + mtl, + network, + pms-domain-model, + process, + safe-exceptions, + stm, + text, + transformers, + unix, + }: + mkDerivation { + pname = "pms-infra-socket"; + version = "0.0.1.0"; + sha256 = "01iz8ws1wc04k52djy37wrlyrr8g33n7zvd03md06wjycahhrri5"; + libraryHaskellDepends = [ + aeson + async + base + base16-bytestring + bytestring + conduit + data-default + directory + fast-logger + filepath + lens + monad-logger + mtl + network + pms-domain-model + process + safe-exceptions + stm + text + transformers + ]; + testHaskellDepends = [ + async + base + data-default + hspec + hspec-discover + lens + monad-logger + pms-domain-model + stm + unix + ]; + testToolDepends = [ hspec-discover ]; + description = "pms-infra-socket"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + } + ) { }; + + "pms-infra-watch" = callPackage ( + { + mkDerivation, + aeson, + async, + base, + bytestring, + conduit, + data-default, + directory, + fast-logger, + filepath, + fsnotify, + hspec, + hspec-discover, + lens, + monad-logger, + mtl, + pms-domain-model, + process, + safe-exceptions, + stm, + text, + transformers, + unix, + }: + mkDerivation { + pname = "pms-infra-watch"; + version = "0.0.3.0"; + sha256 = "0lwiydxf9p7pvri6s3p0wg0lya9imp6rpggb2mrpb49nqknnpxpx"; + libraryHaskellDepends = [ + aeson + async + base + bytestring + conduit + data-default + directory + fast-logger + filepath + fsnotify + lens + monad-logger + mtl + pms-domain-model + process + safe-exceptions + stm + text + transformers + ]; + testHaskellDepends = [ + async + base + data-default + hspec + hspec-discover + lens + monad-logger + pms-domain-model + stm + unix + ]; + testToolDepends = [ hspec-discover ]; + description = "pms-infra-watch"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + } + ) { }; + + "pms-infrastructure" = callPackage ( + { + mkDerivation, + aeson, + async, + base, + bytestring, + conduit, + data-default, + directory, + fast-logger, + filepath, + hie-bios, + hspec, + hspec-discover, + lens, + monad-logger, + mtl, + pms-domain-model, + posix-pty, + process, + safe-exceptions, + stm, + strip-ansi-escape, + text, + transformers, + unix, + }: + mkDerivation { + pname = "pms-infrastructure"; + version = "0.0.4.0"; + sha256 = "1vawlgs6i1rpw2266zbzxwykjsf5p61w88vi2lyj69dgl3dd0kiz"; + libraryHaskellDepends = [ + aeson + async + base + bytestring + conduit + data-default + directory + fast-logger + filepath + hie-bios + lens + monad-logger + mtl + pms-domain-model + posix-pty + process + safe-exceptions + stm + strip-ansi-escape + text + transformers + ]; + testHaskellDepends = [ + async + base + data-default + hspec + hspec-discover + lens + monad-logger + pms-domain-model + stm + unix + ]; + testToolDepends = [ hspec-discover ]; + description = "pms-infrastructure"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + } + ) { }; + + "pms-ui-notification" = callPackage ( + { + mkDerivation, + aeson, + async, + base, + bytestring, + conduit, + data-default, + fast-logger, + hspec, + hspec-discover, + lens, + monad-logger, + mtl, + pms-domain-model, + safe-exceptions, + stm, + text, + transformers, + unix, + }: + mkDerivation { + pname = "pms-ui-notification"; + version = "0.0.3.0"; + sha256 = "1fq1kasqmghbic59v815032spcl9wahm9wqjyjmg93di92xz8mm3"; + libraryHaskellDepends = [ + aeson + base + bytestring + conduit + data-default + fast-logger + lens + monad-logger + mtl + pms-domain-model + safe-exceptions + stm + text + transformers + ]; + testHaskellDepends = [ + async + base + data-default + hspec + hspec-discover + lens + monad-logger + pms-domain-model + stm + unix + ]; + testToolDepends = [ hspec-discover ]; + description = "pms-ui-notification"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + } + ) { }; + + "pms-ui-request" = callPackage ( + { + mkDerivation, + aeson, + async, + base, + bytestring, + conduit, + data-default, + fast-logger, + hspec, + hspec-discover, + lens, + monad-logger, + mtl, + pms-domain-model, + safe-exceptions, + stm, + text, + transformers, + unix, + }: + mkDerivation { + pname = "pms-ui-request"; + version = "0.0.4.0"; + sha256 = "1yg42dy0jrv0xhz657kys41i0prr2xn417ji2p6wahgnlfkiy6am"; + libraryHaskellDepends = [ + aeson + base + bytestring + conduit + data-default + fast-logger + lens + monad-logger + mtl + pms-domain-model + safe-exceptions + stm + text + transformers + ]; + testHaskellDepends = [ + async + base + data-default + hspec + hspec-discover + lens + monad-logger + pms-domain-model + stm + unix + ]; + testToolDepends = [ hspec-discover ]; + description = "pms-ui-request"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + } + ) { }; + + "pms-ui-response" = callPackage ( + { + mkDerivation, + aeson, + async, + base, + bytestring, + conduit, + data-default, + fast-logger, + hspec, + hspec-discover, + lens, + monad-logger, + mtl, + pms-domain-model, + safe-exceptions, + stm, + text, + transformers, + unix, + }: + mkDerivation { + pname = "pms-ui-response"; + version = "0.0.4.0"; + sha256 = "0045ddj3v34aycvnh72fvy9159iv4vad1jghd1ndslhphav1d91b"; + libraryHaskellDepends = [ + aeson + base + bytestring + conduit + data-default + fast-logger + lens + monad-logger + mtl + pms-domain-model + safe-exceptions + stm + text + transformers + ]; + testHaskellDepends = [ + async + base + data-default + hspec + hspec-discover + lens + monad-logger + pms-domain-model + stm + unix + ]; + testToolDepends = [ hspec-discover ]; + description = "pms-ui-response"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + } + ) { }; + "png-file" = callPackage ( { mkDerivation, @@ -525037,7 +528536,6 @@ self: { ]; description = "Colog adapters for polysemy-log"; license = "BSD-2-Clause-Patent"; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -526622,32 +530120,30 @@ self: { "poolboy" = callPackage ( { mkDerivation, - async, base, hspec, hspec-core, - stm, + timeit, unliftio, + unordered-containers, }: mkDerivation { pname = "poolboy"; - version = "0.2.2.0"; - sha256 = "0d0lxqyf73w7nvgydbgv692zzc0zg2hk8sdd3lb6xyzdqkkd0vf3"; + version = "0.4.0.1"; + sha256 = "0ifdp2p2c257k52c9prm072c1gmfx55a40gaanba083viq6cxzal"; libraryHaskellDepends = [ - async base - stm unliftio + unordered-containers ]; testHaskellDepends = [ base hspec hspec-core + timeit ]; description = "Simple work queue for bounded concurrency"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -527994,10 +531490,8 @@ self: { { mkDerivation, base }: mkDerivation { pname = "positive-integer"; - version = "0.1.0.0"; - sha256 = "17vqxdmqbsp6366dipq5xdfb3aq5mrshlvkw8zv30byl7p6iaz51"; - revision = "1"; - editedCabalFile = "101bbp5zv7w5ldr7j2nxpmm21mpnpzz4knrcv5inqfs0k69w1z7c"; + version = "0.1.2.0"; + sha256 = "0m0l02v3ybsilkcvyc82ma57bbha4rhncsf5574b0m3zmxq17kaq"; libraryHaskellDepends = [ base ]; description = "Type of positive integers"; license = lib.licenses.mit; @@ -531719,6 +535213,7 @@ self: { base, bytestring, criterion, + deepseq, ppad-base16, ppad-chacha, ppad-poly1305, @@ -531729,8 +535224,8 @@ self: { }: mkDerivation { pname = "ppad-aead"; - version = "0.1.0"; - sha256 = "1vvz39m852yp3j0mdm1mx3i5rgl78z0limlgm70al34gv1gxv3mh"; + version = "0.2.0"; + sha256 = "1s14bplwjfavg50xfyy65r2f8lg4man31jc83m3l32k6h4jvg983"; libraryHaskellDepends = [ base bytestring @@ -531751,6 +535246,7 @@ self: { base bytestring criterion + deepseq ppad-base16 ]; description = "A pure AEAD-ChaCha20-Poly1305 construction"; @@ -531818,8 +535314,8 @@ self: { }: mkDerivation { pname = "ppad-base58"; - version = "0.2.0"; - sha256 = "1bn0fv1vmsc698lpl8x1brgi00bl9rcnh7r8v81rcxnjqf9xfdcb"; + version = "0.2.1"; + sha256 = "0s94985p1d1zh0ip404pgi12bj97naydr525i45aac64w8iis03y"; libraryHaskellDepends = [ base bytestring @@ -531859,8 +535355,8 @@ self: { }: mkDerivation { pname = "ppad-bech32"; - version = "0.2.2"; - sha256 = "1bp4p6adfi7awy3k2fbi3akjqr5gyiijilgxg5r0hzpnzmzpxvzr"; + version = "0.2.3"; + sha256 = "0g8fk0bwx88zr4k4mijd8zn5jhi6gcsn6hvdp8jxb3r4a97a4yyv"; libraryHaskellDepends = [ base bytestring @@ -531903,8 +535399,8 @@ self: { }: mkDerivation { pname = "ppad-bip32"; - version = "0.1.1"; - sha256 = "0q76ffxzrbr0fiv18ghgfjrv0y61nvsb6971pl49377c2835qa1l"; + version = "0.2.0"; + sha256 = "1h7i6km0ai3wvyrhfhl31gpaq21vcggrgk0gvr0cjhkmmscd3d5w"; libraryHaskellDepends = [ base bytestring @@ -531960,8 +535456,8 @@ self: { }: mkDerivation { pname = "ppad-bip39"; - version = "0.2.1"; - sha256 = "1aqcjq1xika89qhxf54z25shg4kz8pmr6k70k48w7lyk85h3l97b"; + version = "0.3.0"; + sha256 = "18bshwr4hpnxk2v73kqxcsjbjffpss41whmd3scm20wq3al2xvva"; libraryHaskellDepends = [ base bytestring @@ -532004,6 +535500,7 @@ self: { base, bytestring, criterion, + deepseq, ppad-base16, primitive, tasty, @@ -532011,8 +535508,8 @@ self: { }: mkDerivation { pname = "ppad-chacha"; - version = "0.1.0"; - sha256 = "15idv1nrl2rl5rmx42dw1zwpdr7wvrr08j0k4vwy0s12cc40aka6"; + version = "0.2.0"; + sha256 = "1zqrg1af6rlflq74lamxd9f0p8sfhvmhjv3ii89mkckhizr8fqrc"; libraryHaskellDepends = [ base bytestring @@ -532030,6 +535527,7 @@ self: { base bytestring criterion + deepseq ppad-base16 ]; description = "A pure ChaCha20 stream cipher"; @@ -532053,8 +535551,8 @@ self: { }: mkDerivation { pname = "ppad-hkdf"; - version = "0.2.1"; - sha256 = "1y5rmkaq8wgibsx6bvppbaqp13fb9al5yn4ni9x2ll685545m398"; + version = "0.3.0"; + sha256 = "194nwcjpdals55wf5khvl393d0q4fzdmx9424s9j2n0z70ry29pw"; libraryHaskellDepends = [ base bytestring @@ -532145,8 +535643,8 @@ self: { }: mkDerivation { pname = "ppad-pbkdf"; - version = "0.1.1"; - sha256 = "05g3k4gyjkpn9k5fhz37lq10qgzlwayf4xiy5m4kjijv7l1wcxqp"; + version = "0.2.0"; + sha256 = "1zir2zm4bgimrgiv94dzqvn794dhwywl63b4im9sg9c61gh91r9m"; libraryHaskellDepends = [ base bytestring @@ -532188,8 +535686,8 @@ self: { }: mkDerivation { pname = "ppad-poly1305"; - version = "0.2.0"; - sha256 = "1vv3ln9lzszx3h0dji4fqznh86qh40sl34msljddgyj3h709lzk6"; + version = "0.3.0"; + sha256 = "06db9qvi688nyhw8fqk8vqxhl6sddfkrg5ap15xd2lf75rl1v7kw"; libraryHaskellDepends = [ base bytestring @@ -532322,8 +535820,8 @@ self: { }: mkDerivation { pname = "ppad-secp256k1"; - version = "0.3.0"; - sha256 = "1k2glxrrpgdngzy0j5mgbkh9a0a5b0cp5c1lmvaiwipik50n9rb3"; + version = "0.4.0"; + sha256 = "0wrmbz0s19g7b6qardn7isgmkrl5svw5nf360ksvhwagicv51g7l"; libraryHaskellDepends = [ base bytestring @@ -537158,8 +540656,8 @@ self: { pname = "probability-polynomial"; version = "1.0.0.1"; sha256 = "1f06x4d2cbd9j7rxgwdpxn8ff8w32xag96qk86mwggnzlw091gib"; - revision = "1"; - editedCabalFile = "10avhbz8k3yg1hzjp5qbkhv3mmmhrvii5mpjcxqcw9pq635x0kc8"; + revision = "2"; + editedCabalFile = "039np4z6lzz81n90k1sqbr7n8bxfmh8v4xvbppzzpgk6kp5fxpfm"; libraryHaskellDepends = [ base containers @@ -538567,10 +542065,8 @@ self: { }: mkDerivation { pname = "profunctors"; - version = "5.6.2"; - sha256 = "0an9v003ivxmjid0s51qznbjhd5fsa1dkcfsrhxllnjja1xmv5b5"; - revision = "3"; - editedCabalFile = "0y2g5dhmvkbd8zsckpgxd1g4hr3g56g0iqi6crjjc8wqd12bly71"; + version = "5.6.3"; + sha256 = "1wqf3isrrgmqxz5h42phsa7lawl6442r1da89hg82bld6qkz9imr"; libraryHaskellDepends = [ base base-orphans @@ -539849,6 +543345,36 @@ self: { } ) { }; + "prometheus-wai" = callPackage ( + { + mkDerivation, + autoexporter, + base, + bytestring, + containers, + http-types, + prometheus, + text, + wai, + }: + mkDerivation { + pname = "prometheus-wai"; + version = "0.0.0.0"; + sha256 = "027i17zyxk3wgzw7161h57rnmgb5iqqnlnlcg129q28dw005wg9h"; + libraryHaskellDepends = [ + base + bytestring + containers + http-types + prometheus + text + wai + ]; + libraryToolDepends = [ autoexporter ]; + license = lib.licenses.mit; + } + ) { }; + "prometheus-wai-middleware" = callPackage ( { mkDerivation, @@ -543128,6 +546654,53 @@ self: { } ) { }; + "pty-mcp-server" = callPackage ( + { + mkDerivation, + base, + optparse-applicative, + pms-application-service, + pms-domain-model, + pms-domain-service, + pms-infra-cmdrun, + pms-infra-procspawn, + pms-infra-socket, + pms-infra-watch, + pms-infrastructure, + pms-ui-notification, + pms-ui-request, + pms-ui-response, + safe-exceptions, + }: + mkDerivation { + pname = "pty-mcp-server"; + version = "0.0.5.0"; + sha256 = "0vra3p8cfzijkz3m5aw3m97vf3awqfc5ga72ks7hmk4fbf7hiwkq"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base + optparse-applicative + pms-application-service + pms-domain-model + pms-domain-service + pms-infra-cmdrun + pms-infra-procspawn + pms-infra-socket + pms-infra-watch + pms-infrastructure + pms-ui-notification + pms-ui-request + pms-ui-response + safe-exceptions + ]; + description = "pty-mcp-server"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + mainProgram = "pty-mcp-server"; + } + ) { }; + "pub" = callPackage ( { mkDerivation, @@ -545392,8 +548965,8 @@ self: { }: mkDerivation { pname = "push-notify-apn"; - version = "0.4.0.3"; - sha256 = "024xanv7wcpmbd2mv4v8gw281gsnx5z15a39zh0v07bgiq7q04wb"; + version = "0.5.0.0"; + sha256 = "128k7awxxs07lymqln224lnxvcqwcc263jzpsbsadzp6zpwpg641"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -546720,11 +550293,11 @@ self: { bytestring, containers, cryptonite, + extra, hspec, optparse-applicative, process, simple-sql-parser, - split, sqlite-simple, syb, text, @@ -546732,38 +550305,32 @@ self: { }: mkDerivation { pname = "qhs"; - version = "0.3.3"; - sha256 = "1wm11y9gnfrjrq5i5nl74vkg242mr08223kw6cracnmr4n6xqm0q"; + version = "0.4.0"; + sha256 = "10b996ymvsmcmjyiaw567idr52mc017cgppma9va8yw94xqgdx7s"; isLibrary = false; isExecutable = true; - executableHaskellDepends = [ + libraryHaskellDepends = [ base bytestring containers cryptonite + extra optparse-applicative simple-sql-parser - split sqlite-simple syb text zlib ]; + executableHaskellDepends = [ base ]; testHaskellDepends = [ base - bytestring containers - cryptonite + extra hspec - optparse-applicative process - simple-sql-parser - split - sqlite-simple - syb - text - zlib ]; + doHaddock = false; description = "Command line tool qhs, SQL queries on CSV and TSV files"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -547858,6 +551425,8 @@ self: { pname = "quantification"; version = "0.8"; sha256 = "1dw47hy0pvar4mkdp6xjz8ywpic2zs3q0xah9zlbnfpibhjjc1a9"; + revision = "1"; + editedCabalFile = "1abpn4sz7g9ih4c3iclpqnwng15dwa7553pxyvwvgy19x6sfgck2"; libraryHaskellDepends = [ base binary @@ -548701,6 +552270,7 @@ self: { crypton, crypton-x509, crypton-x509-system, + crypton-x509-validation, fast-logger, filepath, hspec, @@ -548719,8 +552289,8 @@ self: { }: mkDerivation { pname = "quic"; - version = "0.2.14"; - sha256 = "1f486d4mqc18pfx5krwxv9mh1zkmyjbjddkx4yixjf2yfhq6a855"; + version = "0.2.17"; + sha256 = "15fk5786rkryjixqiqk9y7zh5wazwakp6gkk5jr4ryckjdgjyyjj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -548734,6 +552304,7 @@ self: { crypton crypton-x509 crypton-x509-system + crypton-x509-validation fast-logger filepath iproute @@ -548790,8 +552361,10 @@ self: { "quick-process" = callPackage ( { mkDerivation, + array, attoparsec, base, + base-orphans, bytestring, casing, conduit, @@ -548803,16 +552376,20 @@ self: { either, exceptions, filepath, + generic-data, + generic-deriving, generic-lens, generic-random, + ghc-prim, hashable, - HList, lens, mmorph, monad-control, + monad-time, mtl, - pretty, + pretty-simple, process, + profunctors, QuickCheck, quickcheck-instances, regex-compat, @@ -548824,6 +552401,7 @@ self: { sbv, semigroups, streaming-commons, + tagged, tasty, tasty-discover, tasty-hunit, @@ -548843,14 +552421,17 @@ self: { unix-compat, unliftio, unliftio-core, + wl-pprint-text, }: mkDerivation { pname = "quick-process"; - version = "0.0.1"; - sha256 = "1dgv63w8qlb35xjsyn0716xsmb9jimdwly0c7704pmlfnw5sp38s"; + version = "0.0.3"; + sha256 = "180zxzsg2xh24nw7gdzmk134hx7vl61hfc3dsvrdr0rwkp1xmngi"; libraryHaskellDepends = [ + array attoparsec base + base-orphans bytestring casing conduit @@ -548862,16 +552443,20 @@ self: { either exceptions filepath + generic-data + generic-deriving generic-lens generic-random + ghc-prim hashable - HList lens mmorph monad-control + monad-time mtl - pretty + pretty-simple process + profunctors QuickCheck regex-compat regex-posix @@ -548882,6 +552467,7 @@ self: { sbv semigroups streaming-commons + tagged template-haskell temporary text @@ -548895,13 +552481,13 @@ self: { unix unix-compat unliftio-core + wl-pprint-text ]; testHaskellDepends = [ base bytestring directory generic-lens - HList lens QuickCheck quickcheck-instances @@ -549336,8 +552922,8 @@ self: { }: mkDerivation { pname = "quickcheck-groups"; - version = "0.0.1.4"; - sha256 = "1k1pbxcp8ppzyym2wavvpn6p5d74cddh1ldlg1kv55ypfszzzf21"; + version = "0.0.1.5"; + sha256 = "1ibchcgj1bqfsc6dx3n4bii6dhylxjn8zl9vhhvk48zsk99q4jaz"; libraryHaskellDepends = [ base groups @@ -549420,10 +553006,10 @@ self: { }: mkDerivation { pname = "quickcheck-instances"; - version = "0.3.32"; - sha256 = "10zz62j1jplk392c90hkg9mfk8piyp5ify94jp3rld722phg5xa8"; + version = "0.3.33"; + sha256 = "0rl8y3rb4fm4nqz122bp5f2aya4f8bc9m9i9n2vwlyq2gdacs0v8"; revision = "1"; - editedCabalFile = "0d7vgsvvkipa1d1gh7z7ha12fv49frcv81dz09qy0m6kvn5lawl7"; + editedCabalFile = "1xkc7rsfgya4rwiizh0yfincws3knpdnh08m280v1dgik4kv37vh"; libraryHaskellDepends = [ array base @@ -549508,8 +553094,8 @@ self: { }: mkDerivation { pname = "quickcheck-lockstep"; - version = "0.7.0"; - sha256 = "0dcy47ab2813saml3jdiar9xlx8ml8c55awcg92i6amazhgwpyw2"; + version = "0.8.0"; + sha256 = "1y3icjvd9qbv38q1cxkn48d6fp4b7c0j0j0l3mwkfi8ph8qjg2y6"; libraryHaskellDepends = [ base constraints @@ -549535,8 +553121,6 @@ self: { ]; description = "Library for lockstep-style testing with 'quickcheck-dynamic'"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -549553,15 +553137,14 @@ self: { pretty-show, QuickCheck, quickcheck-classes, - quickcheck-instances, semigroupoids, text, vector, }: mkDerivation { pname = "quickcheck-monoid-subclasses"; - version = "0.3.0.5"; - sha256 = "0hnrm69vavc2b1h4cishdvn7j0x8l8mk8fggbai3kn77w6cnf3il"; + version = "0.3.0.6"; + sha256 = "03gngckzwhln7c86dixg8szrnqwgdl9svy6hfnzgyjpn4qfqwcmv"; libraryHaskellDepends = [ base containers @@ -549569,7 +553152,6 @@ self: { pretty-show QuickCheck quickcheck-classes - quickcheck-instances semigroupoids ]; testHaskellDepends = [ @@ -549581,7 +553163,6 @@ self: { monoid-subclasses QuickCheck quickcheck-classes - quickcheck-instances text vector ]; @@ -549701,8 +553282,8 @@ self: { }: mkDerivation { pname = "quickcheck-quid"; - version = "0.0.1.7"; - sha256 = "1r0ip3a281dgvy6bplhr76wg5n0l4qz0k6i6r3fzh4848r6z9say"; + version = "0.0.1.8"; + sha256 = "0qx08f6z1y21qn63z5hkhlvj1rgn921ads03lrppmggg9kvrk5x0"; libraryHaskellDepends = [ base containers @@ -555890,8 +559471,8 @@ self: { }: mkDerivation { pname = "rdf4h"; - version = "5.2.0"; - sha256 = "03f1dcw4zii4yvq7azhcgpkf59wibjdlvkifb88jp8maiaadzr75"; + version = "5.2.1"; + sha256 = "1jah12gcmc85qpbhw6igi28rvmww38fqmj1waqw7c16y0lxnkvxb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -556056,10 +559637,8 @@ self: { }: mkDerivation { pname = "rds-data"; - version = "0.2.0.0"; - sha256 = "08lk0m1vgvbsmbvf5gv9nlab161a05w6n964w90g7wf1rqmj54d7"; - isLibrary = false; - isExecutable = false; + version = "0.2.0.1"; + sha256 = "1kfi9qmq07v9bvs7a08221r4c7r4hl74f1iavnk6d5gaqms38sfz"; libraryHaskellDepends = [ aeson amazonka-core @@ -556203,6 +559782,138 @@ self: { } ) { }; + "rds-data-polysemy" = callPackage ( + { + mkDerivation, + aeson, + aeson-pretty, + amazonka, + amazonka-core, + amazonka-rds, + amazonka-rds-data, + amazonka-secretsmanager, + base, + base64-bytestring, + bytestring, + contravariant, + generic-lens, + hedgehog, + hedgehog-extras, + http-client, + hw-polysemy, + hw-prelude, + microlens, + mtl, + optparse-applicative, + polysemy-log, + polysemy-plugin, + polysemy-time, + rds-data, + resourcet, + stm, + tasty, + tasty-discover, + tasty-hedgehog, + testcontainers, + text, + time, + transformers, + ulid, + uuid, + }: + mkDerivation { + pname = "rds-data-polysemy"; + version = "0.1.0.0"; + sha256 = "13anncaj8yw3y4csg7kbda6wrb9s8g5spd9k5h1ygrwy1az697sr"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + aeson + amazonka + amazonka-core + amazonka-rds + amazonka-rds-data + amazonka-secretsmanager + base + base64-bytestring + bytestring + contravariant + generic-lens + hw-polysemy + hw-prelude + microlens + mtl + polysemy-log + polysemy-plugin + rds-data + text + time + transformers + ulid + uuid + ]; + executableHaskellDepends = [ + aeson + amazonka + amazonka-rds-data + base + bytestring + generic-lens + hedgehog + http-client + hw-polysemy + hw-prelude + microlens + optparse-applicative + polysemy-log + polysemy-plugin + polysemy-time + rds-data + resourcet + stm + testcontainers + text + time + ulid + uuid + ]; + testHaskellDepends = [ + aeson + aeson-pretty + amazonka + amazonka-core + amazonka-rds + amazonka-rds-data + amazonka-secretsmanager + base + base64-bytestring + bytestring + generic-lens + hedgehog + hedgehog-extras + hw-polysemy + microlens + polysemy-log + polysemy-plugin + rds-data + tasty + tasty-discover + tasty-hedgehog + testcontainers + text + time + ulid + uuid + ]; + testToolDepends = [ tasty-discover ]; + doHaddock = false; + description = "Codecs for use with AWS rds-data"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "rds-data"; + } + ) { }; + "rdtsc" = callPackage ( { mkDerivation, base }: mkDerivation { @@ -560678,8 +564389,8 @@ self: { }: mkDerivation { pname = "reflex"; - version = "0.9.3.3"; - sha256 = "0iklqcszxmj3dian0mjpz75483084ar8i328ydcx68xk9l9rlqbf"; + version = "0.9.3.4"; + sha256 = "1qh2xbg4q2gif25hinz72j8ka2w976lccklknwgijxaayh92if4a"; libraryHaskellDepends = [ base bifunctors @@ -561036,7 +564747,6 @@ self: { ]; description = "Use colonnade with reflex-dom"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -562045,7 +565755,6 @@ self: { description = "Helper widgets for reflex-localize"; license = lib.licenses.mit; badPlatforms = [ "aarch64-linux" ] ++ lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -564751,6 +568460,7 @@ self: { description = "MessagePack encoders / decoders"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -568955,6 +572665,34 @@ self: { } ) { }; + "resource-pool_0_5_0_0" = callPackage ( + { + mkDerivation, + base, + hashable, + primitive, + stm, + text, + time, + }: + mkDerivation { + pname = "resource-pool"; + version = "0.5.0.0"; + sha256 = "1l0l26fgwjilqh55z7vylw9i735hich8amwgl1a63dgcwyvhlxgs"; + libraryHaskellDepends = [ + base + hashable + primitive + stm + text + time + ]; + description = "A high-performance striped resource pooling implementation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + "resource-pool-catchio" = callPackage ( { mkDerivation, @@ -572760,8 +576498,8 @@ self: { }: mkDerivation { pname = "richenv"; - version = "0.1.0.2"; - sha256 = "0yxl6cnhg7n29f93mj4a5wkp1v1i2y38824n2bg8b64ik1hlg876"; + version = "0.1.0.3"; + sha256 = "0v6ymwypp6023srv9axh0rc98bsvkhk29nwhap9rb33x8ibb8vr9"; libraryHaskellDepends = [ aeson base @@ -574720,8 +578458,8 @@ self: { }: mkDerivation { pname = "roc-id"; - version = "0.2.0.4"; - sha256 = "126ijgk7wi06694xcqvjz9amg61pzi2hnx7gq631zwxa6d98czzk"; + version = "0.2.0.5"; + sha256 = "1a70y8l45lyglq6rrxrp20jfpwg87gkga4wdxdf15nzh0p1a417f"; libraryHaskellDepends = [ base MonadRandom @@ -581799,7 +585537,6 @@ self: { exceptions, filepath, free, - haskell-src-exts, microlens, microlens-th, monad-control, @@ -581826,8 +585563,8 @@ self: { }: mkDerivation { pname = "sandwich"; - version = "0.3.0.3"; - sha256 = "0j53b68vgidwahmbbhcrshh9043k1g230lypyfavcwbpcgrzxkpb"; + version = "0.3.0.4"; + sha256 = "1j6xlnhb58kg776jl1bp82lfi95a9xy27haqanbx67mw7n471gc6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -581844,7 +585581,6 @@ self: { exceptions filepath free - haskell-src-exts microlens microlens-th monad-control @@ -581883,7 +585619,6 @@ self: { exceptions filepath free - haskell-src-exts microlens microlens-th monad-control @@ -581922,7 +585657,6 @@ self: { exceptions filepath free - haskell-src-exts microlens microlens-th monad-control @@ -581982,7 +585716,6 @@ self: { string-interpolate, temporary, text, - time, transformers, unix-compat, unliftio, @@ -581991,8 +585724,8 @@ self: { }: mkDerivation { pname = "sandwich-contexts"; - version = "0.3.0.2"; - sha256 = "01klfrf9n1z6h1iqgb3ccch1dxihp28lh60d44xj3xmfz2q4y5iq"; + version = "0.3.0.3"; + sha256 = "0bd0a3akg7rbpp94cwyrpjjw104468y7caxnvl6iwl3fnc6gvy7c"; libraryHaskellDepends = [ aeson base @@ -582020,7 +585753,6 @@ self: { string-interpolate temporary text - time transformers unix-compat unliftio @@ -582054,8 +585786,8 @@ self: { exceptions, filepath, http-client, - kubernetes-client, - kubernetes-client-core, + kubernetes-api, + kubernetes-api-client, lens, lens-aeson, minio-hs, @@ -582081,8 +585813,8 @@ self: { }: mkDerivation { pname = "sandwich-contexts-kubernetes"; - version = "0.1.0.0"; - sha256 = "04p2g6jjra3bh4a4zb00lidckm91ba3cvwvrvjh28i3flh15b6wr"; + version = "0.1.1.0"; + sha256 = "00g2fq9xnk8icrvfjmqkhl3g7pz7159kqajx10vgy4xgdxp25zfz"; libraryHaskellDepends = [ aeson base @@ -582091,8 +585823,8 @@ self: { exceptions filepath http-client - kubernetes-client - kubernetes-client-core + kubernetes-api + kubernetes-api-client lens lens-aeson minio-hs @@ -582450,8 +586182,8 @@ self: { }: mkDerivation { pname = "sandwich-webdriver"; - version = "0.3.0.0"; - sha256 = "1s4j2i91csn1wplw1vnz7s8kin5v580a7m98yfas8p7nlm9bihp4"; + version = "0.3.0.1"; + sha256 = "18vb8vdcpdy6zkqynhqwzy2217lbz0jrdhd2c21wr6ly4rfmf0jr"; libraryHaskellDepends = [ aeson base @@ -582515,6 +586247,7 @@ self: { sandwich sandwich-contexts string-interpolate + temporary text time transformers @@ -583551,7 +587284,7 @@ self: { } ) { inherit (pkgs) z3; }; - "sbv_11_7" = callPackage ( + "sbv_12_0" = callPackage ( { mkDerivation, array, @@ -583564,6 +587297,8 @@ self: { deepseq, directory, filepath, + haskell-src-exts, + haskell-src-meta, libBF, mtl, pretty, @@ -583586,8 +587321,8 @@ self: { }: mkDerivation { pname = "sbv"; - version = "11.7"; - sha256 = "1nq1yjc4wfjmqhp0y61aqmva99vxnpj2mpksyai63ijmx9zq8yzs"; + version = "12.0"; + sha256 = "14c9i9aa6rbm6kfxjcdbcy7vajh3v6bhsginhn1v6hg8430f93rp"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array @@ -583600,6 +587335,8 @@ self: { deepseq directory filepath + haskell-src-exts + haskell-src-meta libBF mtl pretty @@ -588824,8 +592561,8 @@ self: { }: mkDerivation { pname = "search-algorithms"; - version = "0.3.3"; - sha256 = "00b1fxgjg57m6qm8017yvqbs6qvblw4iazir005flzjm6jls12kz"; + version = "0.3.4"; + sha256 = "1r6nnwb0ry95xqg8psdwgfx6h264kd437a3mr5z7gv7vdarb3r2h"; libraryHaskellDepends = [ base containers @@ -589737,6 +593474,42 @@ self: { } ) { }; + "select-rpms_0_3_0" = callPackage ( + { + mkDerivation, + base, + directory, + extra, + filepath, + Glob, + rpm-nvr, + safe, + simple-cmd, + simple-cmd-args, + simple-prompt, + }: + mkDerivation { + pname = "select-rpms"; + version = "0.3.0"; + sha256 = "0xzhhic205nvh8n2mdb85675x8kdvlgjy0d4xxyw1nq8p078cn51"; + libraryHaskellDepends = [ + base + directory + extra + filepath + Glob + rpm-nvr + safe + simple-cmd + simple-cmd-args + simple-prompt + ]; + description = "Select a subset of RPM packages"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + } + ) { }; + "selections" = callPackage ( { mkDerivation, base }: mkDerivation { @@ -591822,7 +595595,7 @@ self: { } ) { }; - "sequence-formats_1_11_0_1" = callPackage ( + "sequence-formats_1_11_0_2" = callPackage ( { mkDerivation, attoparsec, @@ -591847,8 +595620,8 @@ self: { }: mkDerivation { pname = "sequence-formats"; - version = "1.11.0.1"; - sha256 = "1qzawb3qnn76j7dvb0q8jbblbayggr5hja0x723y09nv1y9lg6g5"; + version = "1.11.0.2"; + sha256 = "1y6sv7xlzbkvlrihmkclv1hp5g3nsrnz37xika3jzksqv4grv412"; libraryHaskellDepends = [ attoparsec base @@ -592397,8 +596170,8 @@ self: { pname = "serialise"; version = "0.2.6.1"; sha256 = "1x3p9vi6daf50xgv5xxjnclqcq9ynqg1qw7af3ppa1nizycrg533"; - revision = "4"; - editedCabalFile = "1ipcrg5g450a3aq15l5rhngpfck8krz7c7bvhhrd8fv3q645yjbh"; + revision = "5"; + editedCabalFile = "0kfai48gza3zzi3s3ll1gng2wbpdmr5z5isx8snlh49vafsqjzx6"; libraryHaskellDepends = [ array base @@ -592794,6 +596567,7 @@ self: { constraints, containers, deepseq, + generics-sop, hspec, hspec-discover, http-api-data, @@ -592812,10 +596586,8 @@ self: { }: mkDerivation { pname = "servant"; - version = "0.20.2"; - sha256 = "0rakyjrmn05sb2gxk4bkxlb23zfwm1pjkdg9mh7b4hjgsdwy4fba"; - revision = "1"; - editedCabalFile = "17n769vwyyc5hshm71r33ksvn26qcz19017wl9p8xj4igav790pa"; + version = "0.20.3.0"; + sha256 = "00k6pwqxpyjp5qm5pjl8qb75iqmpql5iv3ac43xdvikcixffcwzj"; libraryHaskellDepends = [ aeson attoparsec @@ -592826,6 +596598,7 @@ self: { constraints containers deepseq + generics-sop http-api-data http-media http-types @@ -592846,6 +596619,7 @@ self: { hspec http-media mtl + network-uri QuickCheck quickcheck-instances text @@ -592904,15 +596678,12 @@ self: { containers, servant, servant-server, - template-haskell, text, }: mkDerivation { pname = "servant-activeresource"; - version = "0.1.0.0"; - sha256 = "0dcip0vbry344pv8za5ldxr9g71vyb63ks3jdpjc7z4vixp5rbsp"; - revision = "1"; - editedCabalFile = "006mbw5mvj5kzz8bigws55xallwrsvdsi5b5y9wc4d7l8a63z0gd"; + version = "0.2.0.0"; + sha256 = "0gxw9yxsr4ri2lwr4y0qhf0cgqknrdjgpqn87wy1n4pas2k6sc15"; libraryHaskellDepends = [ aeson base @@ -592920,7 +596691,6 @@ self: { containers servant servant-server - template-haskell text ]; testHaskellDepends = [ @@ -592930,10 +596700,9 @@ self: { containers servant servant-server - template-haskell text ]; - description = "Servant endpoints compatible with Rails's ActiveResources"; + description = "Servant endpoints compatible with Rails's ActiveResource"; license = lib.licenses.bsd3; } ) { }; @@ -593455,7 +597224,7 @@ self: { bytestring, case-insensitive, cookie, - data-default-class, + data-default, entropy, hspec, hspec-discover, @@ -593483,10 +597252,8 @@ self: { }: mkDerivation { pname = "servant-auth-server"; - version = "0.4.9.0"; - sha256 = "0fhk2z9n9ax4g7iisdgcd87wgj9wvazhl86kjh364gsj1g8a5y99"; - revision = "1"; - editedCabalFile = "0skvvqkyqzgjdg5b2l9fd1ri144s649g5yddpclwciraimip7gw1"; + version = "0.4.9.1"; + sha256 = "04sy2g81pp0pr31xi6h1hqm199z6r4xv3fy2x307dlydxmdm8qb3"; libraryHaskellDepends = [ aeson base @@ -593495,7 +597262,7 @@ self: { bytestring case-insensitive cookie - data-default-class + data-default entropy http-types jose @@ -594280,9 +598047,7 @@ self: { ]; description = "Command line interface for Servant API clients"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "greet-cli"; - broken = true; } ) { }; @@ -594297,6 +598062,7 @@ self: { deepseq, entropy, exceptions, + generics-sop, hspec, hspec-discover, http-api-data, @@ -594325,10 +598091,10 @@ self: { }: mkDerivation { pname = "servant-client"; - version = "0.20.2"; - sha256 = "026bp0qk2bx672834yjxmqrfacyzzdssm89bd0niz1xzxzmw5r7g"; - revision = "2"; - editedCabalFile = "1sm0xspcsxn6n70nirpglcmx07sn6vmag8kvvw9i2dr2hcfkgk55"; + version = "0.20.3.0"; + sha256 = "0kxmixgv5nmir2bk3zfrhaal4969rf414wi2ccnngjm3395bqrwn"; + revision = "1"; + editedCabalFile = "0644af144zy4axv8hhqhv8mj7amnqd09fbz5rglr6l60d27hpqx1"; libraryHaskellDepends = [ base base-compat @@ -594356,6 +598122,7 @@ self: { base-compat bytestring entropy + generics-sop hspec http-api-data http-client @@ -594388,6 +598155,7 @@ self: { { mkDerivation, aeson, + attoparsec, base, base-compat, base64-bytestring, @@ -594408,15 +598176,17 @@ self: { sop-core, template-haskell, text, + transformers, }: mkDerivation { pname = "servant-client-core"; - version = "0.20.2"; - sha256 = "10nv810ns8v1d9a2fkg9bgi7h9gm4yap1y6mg2r15d569i27rrvc"; + version = "0.20.3.0"; + sha256 = "1vv6xf340hyk60vv6jb1zxfpsb7x2ykacb84yrn3h1w4k075hlyn"; revision = "1"; - editedCabalFile = "13200adlbl8mydi35x1r8w4q9ra8y079figgjxl5jsrhvps54608"; + editedCabalFile = "1g8arzgcqc9qp1fimrs8iwqvzgsp6br76kkh72hsz0nsg6gmlvc1"; libraryHaskellDepends = [ aeson + attoparsec base base-compat base64-bytestring @@ -594438,9 +598208,12 @@ self: { testHaskellDepends = [ base base-compat + bytestring deepseq hspec QuickCheck + servant + transformers ]; testToolDepends = [ hspec-discover ]; description = "Core functionality and class for client function generation for servant APIs"; @@ -595242,6 +599015,8 @@ self: { testHaskellDepends = [ base ]; description = "Servant support for Server-Sent events"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -598184,8 +601959,8 @@ self: { }: mkDerivation { pname = "servant-routes"; - version = "0.1.0.0"; - sha256 = "1m17cpbmyi8y2h27p9y28193b2d46qmr8bhswvjn89nd5z42d6x2"; + version = "0.1.1.0"; + sha256 = "0r9db46gbi9rcsrdvqndfa9433szbp5a0c1ad3z3qchpf3i2dxfm"; libraryHaskellDepends = [ aeson aeson-pretty @@ -598216,6 +601991,52 @@ self: { } ) { }; + "servant-routes-golden" = callPackage ( + { + mkDerivation, + aeson, + aeson-pretty, + base, + hspec, + hspec-core, + hspec-discover, + hspec-golden, + QuickCheck, + servant, + servant-routes, + text, + }: + mkDerivation { + pname = "servant-routes-golden"; + version = "0.1.0.0"; + sha256 = "16kc5q0vc7hjy7dfd3smnlcs6308sligzgr3hcnx1mqxnfmv0svp"; + libraryHaskellDepends = [ + aeson + aeson-pretty + base + hspec-core + hspec-golden + servant-routes + text + ]; + testHaskellDepends = [ + aeson + aeson-pretty + base + hspec + hspec-core + hspec-golden + QuickCheck + servant + servant-routes + text + ]; + testToolDepends = [ hspec-discover ]; + description = "Golden test your Servant APIs using `servant-routes`"; + license = lib.licenses.bsd3; + } + ) { }; + "servant-ruby" = callPackage ( { mkDerivation, @@ -598492,10 +602313,10 @@ self: { }: mkDerivation { pname = "servant-server"; - version = "0.20.2"; - sha256 = "0fqgnzzgbj4w441h3v841lav7gxazakz04s354r24pq4rh6m1kqy"; + version = "0.20.3.0"; + sha256 = "05crwklbncd393zq00gi04zgnfyy2wk31s0xf5hy6yjrsbshlmih"; revision = "1"; - editedCabalFile = "0qjl1yrr0l7kynrndv8qmpzl0jz9nzb7c4v9r7kxq05nnb7xpqbz"; + editedCabalFile = "1z2h1gmxphwd76chyah405ww4ciyxq7rvggghr6lh0z1m3p2k90h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -599670,12 +603491,13 @@ self: { servant, servant-foreign, string-interpolate, + temporary, text, }: mkDerivation { pname = "servant-typescript"; - version = "0.1.0.2"; - sha256 = "03nf4gqiy7jpdaxmddv859im0czpjrdss72cgjhkd96vqf4g4kam"; + version = "0.1.0.3"; + sha256 = "0x10dsd16bjqkk7s8kb1yfhrvkzqw5v0smxm8vf3bm8q10anf2dp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -599704,6 +603526,7 @@ self: { servant servant-foreign string-interpolate + temporary text ]; testHaskellDepends = [ @@ -599722,9 +603545,7 @@ self: { ]; description = "TypeScript client generation for Servant"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "servant-typescript-exe"; - broken = true; } ) { }; @@ -603826,84 +607647,6 @@ self: { } ) { }; - "shakespeare_2_1_0_1" = callPackage ( - { - mkDerivation, - aeson, - base, - blaze-html, - blaze-markup, - bytestring, - containers, - directory, - exceptions, - file-embed, - ghc-prim, - hspec, - HUnit, - parsec, - process, - scientific, - template-haskell, - text, - th-lift, - time, - transformers, - unordered-containers, - vector, - }: - mkDerivation { - pname = "shakespeare"; - version = "2.1.0.1"; - sha256 = "0byj0zhxi1pr8l5f18phzkwcf7z38lyk2zznz8hbkqadfgrmbdkc"; - libraryHaskellDepends = [ - aeson - base - blaze-html - blaze-markup - bytestring - containers - directory - exceptions - file-embed - ghc-prim - parsec - process - scientific - template-haskell - text - th-lift - time - transformers - unordered-containers - vector - ]; - testHaskellDepends = [ - aeson - base - blaze-html - blaze-markup - bytestring - containers - directory - exceptions - ghc-prim - hspec - HUnit - parsec - process - template-haskell - text - time - transformers - ]; - description = "A toolkit for making compile-time interpolated templates"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - maintainers = [ lib.maintainers.psibi ]; - } - ) { }; - "shakespeare" = callPackage ( { mkDerivation, @@ -603932,8 +607675,8 @@ self: { }: mkDerivation { pname = "shakespeare"; - version = "2.1.1"; - sha256 = "1j6jniy8d8dgc61h4n2kw668y8f30cqnsfwmgad1s4fqj1bplh0r"; + version = "2.1.4"; + sha256 = "1c9lvb0aw00r0wibm061c614phlwsrf888amjn9nc168ix0cxv6x"; libraryHaskellDepends = [ aeson base @@ -604986,7 +608729,7 @@ self: { } ) { }; - "shellify_0_14_0_0" = callPackage ( + "shellify_0_14_0_1" = callPackage ( { mkDerivation, base, @@ -605008,8 +608751,8 @@ self: { }: mkDerivation { pname = "shellify"; - version = "0.14.0.0"; - sha256 = "09i55y57innmjbgb0x1bvrbpk0c5py0bb004wxnqpw4b8swxc60r"; + version = "0.14.0.1"; + sha256 = "1gnr4ii3wn7i0b8facg5a9d3b83lwm7nyk56576ll3nyywqh577i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -612530,6 +616273,8 @@ self: { ]; description = "A very quick-and-dirty WebSocket server"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -616515,8 +620260,8 @@ self: { pname = "snap"; version = "1.1.3.3"; sha256 = "1mqckzm9gasa04ls691zgw4c6m53mgcj86yd2p5qvy07mpn9rdvx"; - revision = "3"; - editedCabalFile = "1nzkb0jq359lpwz4a1ldx1fh8xs735wfwf2z6qq0z7y0c4zxb9da"; + revision = "4"; + editedCabalFile = "1zqvs7kx3jy8vmgwqc344cyv6f3zpx0vg9w5nb9lf5h23bl85k0i"; libraryHaskellDepends = [ aeson attoparsec @@ -619439,8 +623184,8 @@ self: { }: mkDerivation { pname = "snappy"; - version = "0.2.0.3"; - sha256 = "0jy747dg58smzzr1mzrm751bkwvnaaghn65ppfkqbpqz6jw45qq2"; + version = "0.2.0.4"; + sha256 = "1marmb148hq6fnwmb5q1kqmzjsxpnqcgszmm4jdapiijlmms1b76"; libraryHaskellDepends = [ base bytestring @@ -621042,6 +624787,67 @@ self: { } ) { }; + "socks5" = callPackage ( + { + mkDerivation, + async, + base, + binary, + bytestring, + data-default, + hspec, + iproute, + mtl, + network, + network-run, + optparse-applicative, + text, + tls, + }: + mkDerivation { + pname = "socks5"; + version = "0.6.0.1"; + sha256 = "1q4084wvfhyni3dw0xa5a08k3lkylr6g5bzv6d463iqwn5skjwsq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async + base + binary + bytestring + iproute + mtl + network + network-run + text + tls + ]; + executableHaskellDepends = [ + base + bytestring + data-default + network + optparse-applicative + text + tls + ]; + testHaskellDepends = [ + async + base + bytestring + data-default + hspec + network + network-run + tls + ]; + description = "A SOCKS5 (RFC 1928) implementation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + "sodium" = callPackage ( { mkDerivation, @@ -621540,6 +625346,36 @@ self: { } ) { }; + "sop-satisfier" = callPackage ( + { + mkDerivation, + base, + containers, + tasty, + tasty-hunit, + transformers, + }: + mkDerivation { + pname = "sop-satisfier"; + version = "0.3.4.5"; + sha256 = "1q0w5syb0x04k6iy4rhssw7wnj1vy562lhw9lmvygi37wir6vjj1"; + libraryHaskellDepends = [ + base + containers + transformers + ]; + testHaskellDepends = [ + base + tasty + tasty-hunit + ]; + description = "Check satisfiability of expressions on natural numbers"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + "sophia" = callPackage ( { mkDerivation, @@ -624159,8 +627995,8 @@ self: { }: mkDerivation { pname = "specup"; - version = "0.2.0.5"; - sha256 = "1b84drxgqaij48rwwannnkms1mzd5mw4i4r442am6wz4y7v45309"; + version = "0.2.0.6"; + sha256 = "1b7bvrb2ad1p78g82q7a3pzi4pgq2qrsas8vl9nglljyn2l259va"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -625080,6 +628916,7 @@ self: { math-functions, process, random, + template-haskell, test-framework, test-framework-hunit, testu01, @@ -625088,8 +628925,8 @@ self: { }: mkDerivation { pname = "splitmix"; - version = "0.1.1"; - sha256 = "1iqjxg3jdjmpj6rchnab1scr6b12p1mk7y75ywn06qisc0dc8y6n"; + version = "0.1.3.1"; + sha256 = "0w32z3rhsnijb9s5k6h60rhbzgzkw8xq1glfbjbl1znlkgbx1g5n"; libraryHaskellDepends = [ base deepseq @@ -625105,6 +628942,7 @@ self: { math-functions process random + template-haskell test-framework test-framework-hunit tf-random @@ -625536,8 +629374,8 @@ self: { pname = "spreadsheet"; version = "0.1.3.10"; sha256 = "022q6an3jl0s8bnwgma8v03b6m4zq3q0drl6nsrcs0nav8n1z5r0"; - revision = "1"; - editedCabalFile = "1dd37qgmy7nzxkbarflh5fm33gy7yqy91pa4pa3x4yggp9v52f61"; + revision = "2"; + editedCabalFile = "1zw9lf90r43vnmybbzmgahw4w423zfjhz4b0nmssnvdbk2lj5yps"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -626666,6 +630504,8 @@ self: { pname = "sqlite"; version = "0.5.5"; sha256 = "1i2bkfyswmannwb1fx6y8ma3pzgx28nl05a35gz1gar28rsx7gyk"; + revision = "1"; + editedCabalFile = "0pp4b2z41n9rpln4zrc6d9100v8g60m3ggjrjbq5fk0xjan4gp7k"; libraryHaskellDepends = [ base bytestring @@ -627656,7 +631496,7 @@ self: { } ) { inherit (pkgs) nlopt; }; - "srtree_2_0_1_4" = callPackage ( + "srtree_2_0_1_5" = callPackage ( { mkDerivation, ad, @@ -627691,8 +631531,8 @@ self: { }: mkDerivation { pname = "srtree"; - version = "2.0.1.4"; - sha256 = "04r9lxf3nffpmmv978h8mfzr0shcbcrwarxs8s2mgpdvdx5qm1sa"; + version = "2.0.1.5"; + sha256 = "0h856i6gsh01rpp08lkvdrigylhbf1h016xwkccmmyd20iz3023l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -628551,8 +632391,8 @@ self: { pname = "stache"; version = "2.3.4"; sha256 = "0kgiyxws2kir8q8zrqkzmk103y7hl6nksxl70f6fy8m9fqkjga51"; - revision = "4"; - editedCabalFile = "03bgp2b2kpijnvdsvcr4adas7iyz3v12cp6j044b248cw6hklayd"; + revision = "5"; + editedCabalFile = "1kvqv42w223r53mjkj2am6j65qly8bvahr5fxvlbnx88bairp0zm"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -628683,8 +632523,8 @@ self: { }: mkDerivation { pname = "stack"; - version = "3.5.1"; - sha256 = "12423vw5k576c1yy0mg40cjia8j6b9jsf8p2489ixlvm192fza7f"; + version = "3.7.1"; + sha256 = "03n8191slbq9zs9h437qda1w24nnf73p7x48x8lqp8sbcn6plaj1"; configureFlags = [ "-fdisable-git-info" "-fhide-dependency-versions" @@ -630839,8 +634679,8 @@ self: { }: mkDerivation { pname = "stackctl"; - version = "1.7.3.4"; - sha256 = "0y0prp85gf5yns5lb9285g2xqfy8w5ck2ajkpiljnmff2zqnlyzb"; + version = "1.7.3.5"; + sha256 = "1naf2n41d0vhhnkkc4bnkapzqdmap6kp8xh27dqjcg7kmv3hllhi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -631153,6 +634993,8 @@ self: { pname = "stan"; version = "0.2.1.0"; sha256 = "1mf01bpy291131jfl4fcslv0jfn8i8jqwr29v1v48j6c6q49rias"; + revision = "1"; + editedCabalFile = "0b7lf7g8kg7xxxl3zgfxk86bs0pl9i9xm1cvn1n2bpmfvymm19qa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -632531,6 +636373,18 @@ self: { } ) { }; + "stats-monad" = callPackage ( + { mkDerivation, base }: + mkDerivation { + pname = "stats-monad"; + version = "0.1.0.1"; + sha256 = "1cg0db7malqm75rlxxcmp2w00pvlf1kki4fz5p7lc86qy7241vzb"; + libraryHaskellDepends = [ base ]; + description = "A discrete probability monad with statistics"; + license = lib.licenses.bsd3; + } + ) { }; + "statsd" = callPackage ( { mkDerivation, @@ -633667,6 +637521,8 @@ self: { pname = "stm"; version = "2.5.3.1"; sha256 = "1rrh4s07vav9mlhpqsq9r6r0gh3f4k8g1gjlx63ngkpdj59ldc7b"; + revision = "1"; + editedCabalFile = "1pfrf0r1f3hl9x3nxv5nja6hrflm72z3cls4x5vljnzmrp4mf6s2"; libraryHaskellDepends = [ array base @@ -638838,8 +642694,8 @@ self: { pname = "string-interpolate"; version = "0.3.4.0"; sha256 = "13hb3spabggr6gsn9xhwpwldjvpl2l7z4lgssis82c40n108b0w8"; - revision = "2"; - editedCabalFile = "0mw6ws7ixdcfhn7pkgci8v1pk26wnid123pi5f1y88hnmnrzs13k"; + revision = "3"; + editedCabalFile = "0grq9v023186gfq3a2as9974qlwcjx3dhxqczpq22bq2wfpw24x7"; libraryHaskellDepends = [ base bytestring @@ -642840,6 +646696,8 @@ self: { pname = "sum-pyramid"; version = "0.0.1"; sha256 = "1zh7g16d345g8wffgj7wswfryrxxf7ik02fwrncqyc9yxmc7hm6y"; + revision = "1"; + editedCabalFile = "0pq6b89ygb0c2sd7b73zic7f8g589jz08ff0a1fpwr4xj5mawkmd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -644345,8 +648203,8 @@ self: { }: mkDerivation { pname = "sv2v"; - version = "0.0.13"; - sha256 = "0gg8972im84gp60qavpmsdxcmjwzsbbg3va2f0fdxz5yqyc96cdn"; + version = "0.0.13.1"; + sha256 = "1idv0mm1n02k9qzqqshylp310bcjlg5m3dh7l6dvz575553r4d1l"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -645269,6 +649127,7 @@ self: { boolexpr, brick, brick-list-skip, + brick-tabular-list, bytestring, clock, colour, @@ -645288,6 +649147,7 @@ self: { fused-effects, fused-effects-lens, fuzzy, + generic-data, githash, hashable, hsnoise, @@ -645301,24 +649161,30 @@ self: { megaparsec, minimorph, MissingH, + monad-logger, + monoidmap, + monoidmap-aeson, mtl, murmur3, natural-sort, nonempty-containers, optparse-applicative, + ordered-containers, palette, pandoc, pandoc-types, parser-combinators, prettyprinter, QuickCheck, + quickcheck-instances, random, scientific, + servant, servant-docs, + servant-JuicyPixels, servant-multipart, servant-server, SHA, - simple-enumeration, split, sqlite-simple, syb, @@ -645352,8 +649218,8 @@ self: { }: mkDerivation { pname = "swarm"; - version = "0.6.0.0"; - sha256 = "0y2ijxfn8yns6fk87mj7nzlnq5k62mhc5xp8nhzzs5yf2v4p72j6"; + version = "0.7.0.0"; + sha256 = "0i0n5vrsz7d8x45lbjzmk1jln368bcz6cy3hn3yaafvhyacqii82"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -645366,6 +649232,7 @@ self: { boolexpr brick brick-list-skip + brick-tabular-list bytestring clock colour @@ -645385,6 +649252,7 @@ self: { fused-effects fused-effects-lens fuzzy + generic-data githash hashable hsnoise @@ -645397,10 +649265,14 @@ self: { lsp megaparsec minimorph + monad-logger + monoidmap + monoidmap-aeson mtl murmur3 natural-sort nonempty-containers + ordered-containers palette pandoc pandoc-types @@ -645408,11 +649280,12 @@ self: { prettyprinter random scientific + servant servant-docs + servant-JuicyPixels servant-multipart servant-server SHA - simple-enumeration split sqlite-simple syb @@ -645439,10 +649312,17 @@ self: { yaml ]; executableHaskellDepends = [ + aeson base brick + bytestring + containers + extra fused-effects githash + http-client + http-client-tls + http-types lens optparse-applicative sqlite-simple @@ -645472,6 +649352,7 @@ self: { mtl nonempty-containers QuickCheck + quickcheck-instances SHA tasty tasty-expected-failure @@ -645488,6 +649369,7 @@ self: { base containers extra + fused-effects lens mtl tasty-bench @@ -646226,6 +650108,74 @@ self: { } ) { }; + "sydtest_0_20_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, + quickcheck-io, + random, + random-shuffle, + safe, + safe-coloured-text, + safe-coloured-text-terminfo, + stm, + svg-builder, + text, + vector, + }: + mkDerivation { + pname = "sydtest"; + version = "0.20.0.0"; + sha256 = "0f1ipp6wqykkyiibn1prx61ysvydf4bybiqg5mlzgi5h1cnqh22i"; + libraryHaskellDepends = [ + async + autodocodec + base + bytestring + containers + deepseq + dlist + fast-myers-diff + filepath + MonadRandom + mtl + opt-env-conf + path + path-io + pretty-show + QuickCheck + quickcheck-io + random + random-shuffle + safe + safe-coloured-text + safe-coloured-text-terminfo + stm + svg-builder + text + vector + ]; + description = "A modern testing framework for Haskell with good defaults and advanced testing features"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + "sydtest-aeson" = callPackage ( { mkDerivation, @@ -649613,6 +653563,8 @@ self: { pname = "synthesizer-llvm"; version = "1.1.0.1"; sha256 = "166551a0g4m48f0mxccwcrgg488i4v8jpj6rjhd39mh6gxb874yr"; + revision = "1"; + editedCabalFile = "1kjiqwmfp2g7mqg6818qdhjjc5lw8hxf895763npjv5dx62b6dc3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -650631,11 +654583,15 @@ self: { bytestring, extra, gi-ayatana-appindicator3, - gi-gdk, + gi-gdk3, gi-glib, gi-gobject, - gi-gtk, + gi-gtk3, + hspec-expectations, optparse-applicative, + tasty, + tasty-autocollect, + tasty-hunit-compat, text, typed-process, unliftio, @@ -650643,31 +654599,45 @@ self: { }: mkDerivation { pname = "systranything"; - version = "0.1.2.0"; - sha256 = "1da3zqkknx9yg8spwjpaxx4sizwl598p2dwr2nnrl6dw033c6m1f"; - isLibrary = false; + version = "0.1.3.0"; + sha256 = "17y8zwbrxmbfr8g7gwbsvhxrwf330l6n2xqm6247ia8k5ap4drfy"; + isLibrary = true; isExecutable = true; - executableHaskellDepends = [ + enableSeparateDataOutput = true; + libraryHaskellDepends = [ aeson base bytestring extra gi-ayatana-appindicator3 - gi-gdk + gi-gdk3 gi-glib gi-gobject - gi-gtk - optparse-applicative + gi-gtk3 text typed-process + ]; + executableHaskellDepends = [ + base + gi-glib + gi-gtk3 + optparse-applicative unliftio yaml ]; + testHaskellDepends = [ + base + hspec-expectations + tasty + tasty-autocollect + tasty-hunit-compat + text + yaml + ]; + testToolDepends = [ tasty-autocollect ]; description = "Let you put anything in the system tray"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "systranything"; - broken = true; } ) { }; @@ -651639,10 +655609,8 @@ self: { }: mkDerivation { pname = "tagged-identity"; - version = "0.1.4"; - sha256 = "0mq4q4i16lzm1d0ckarwjk2a47y28lfrv0hc31y0xblb9q50xxwl"; - revision = "1"; - editedCabalFile = "03r7ys57zbyadkka5rzb418y5ksb88nnmvxjs58j0pmp71h0zfa6"; + version = "0.1.5"; + sha256 = "1n8zfgb80856rhizkclq6bfdcixbi0ymvx0f508x70crrvk38xdv"; libraryHaskellDepends = [ base mtl @@ -654889,8 +658857,8 @@ self: { pname = "tasty"; version = "1.5.3"; sha256 = "10076vlklbcyiz7plakrihava5sy3dvwhskjldqzhfl18jvcg82l"; - revision = "1"; - editedCabalFile = "1l7nwf37v29qb1m2q3264473dzhvr6r764skzi9whkr7pjfylmlx"; + revision = "2"; + editedCabalFile = "04llcf1i3gawdik0bjhxdgls2wkiqlx0gi76nfh784nv2qzxlpbb"; libraryHaskellDepends = [ ansi-terminal base @@ -655293,63 +659261,6 @@ self: { ) { }; "tasty-discover" = callPackage ( - { - mkDerivation, - base, - bytestring, - containers, - filepath, - Glob, - hedgehog, - hspec, - hspec-core, - tasty, - tasty-golden, - tasty-hedgehog, - tasty-hspec, - tasty-hunit, - tasty-quickcheck, - tasty-smallcheck, - }: - mkDerivation { - pname = "tasty-discover"; - version = "5.0.1"; - sha256 = "143d0bcbvnvybbgrfdjr0wqmpdghjkn1297qmxk5ji33r8pqf4wc"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base - containers - filepath - Glob - tasty - ]; - executableHaskellDepends = [ - base - filepath - ]; - testHaskellDepends = [ - base - bytestring - containers - hedgehog - hspec - hspec-core - tasty - tasty-golden - tasty-hedgehog - tasty-hspec - tasty-hunit - tasty-quickcheck - tasty-smallcheck - ]; - description = "Test discovery for the tasty framework"; - license = lib.licenses.mit; - mainProgram = "tasty-discover"; - } - ) { }; - - "tasty-discover_5_0_2" = callPackage ( { mkDerivation, base, @@ -655402,7 +659313,6 @@ self: { ]; description = "Test discovery for the tasty framework"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "tasty-discover"; } ) { }; @@ -655615,8 +659525,8 @@ self: { pname = "tasty-golden-extra"; version = "0.1.0.0"; sha256 = "1bfd9ql3pws2vd37nbc5a8b49p7zbq3n48slxkrrwx1szaxkp8nj"; - revision = "2"; - editedCabalFile = "1vj6yr1ysnn5x76r3j824gdny121z69vr9367yi3mp4jxl1w44kw"; + revision = "3"; + editedCabalFile = "1hdkxsn075bc6f318vk81bddagxsyp390604v3azskfp52bwbl8r"; libraryHaskellDepends = [ aeson aeson-diff @@ -655834,8 +659744,8 @@ self: { pname = "tasty-hspec"; version = "1.2.0.4"; sha256 = "1hk1nkjvhp89xxgzj6dhbgw0fknnghpng6afq4i39hjkwv5p78ni"; - revision = "6"; - editedCabalFile = "1i2zj9q7lxiaqs8mlwhw72ar7bnkr5k5y99pjalaisb6hp9380ds"; + revision = "7"; + editedCabalFile = "0s1y34i8g7fva0z10ws3ipcy2jmlvqk0v4hdbx8rqnby5n0l5kay"; libraryHaskellDepends = [ base hspec @@ -656295,14 +660205,11 @@ self: { QuickCheck, tasty, tasty-hunit, - text, }: mkDerivation { pname = "tasty-lua"; - version = "1.1.1"; - sha256 = "186322a9gwndnpis4r7nzlca4iymrz712bbbxpm0pxsw63xary06"; - revision = "1"; - editedCabalFile = "180jy8dhr7mdfgj5xgnwddm5lh8ahbvs78y07g9zgpsxkdnm5ghn"; + version = "1.1.1.1"; + sha256 = "03b2n3gw2w70cnl57w3sh3cv5ka270sf07jlxpb4zs0z5gh83p1r"; libraryHaskellDepends = [ base bytestring @@ -656312,11 +660219,9 @@ self: { lua-arbitrary QuickCheck tasty - text ]; testHaskellDepends = [ base - bytestring directory filepath hslua-core @@ -656418,6 +660323,8 @@ self: { description = "Bencmarking using instruction counting"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { inherit (pkgs) papi; }; @@ -656586,8 +660493,8 @@ self: { pname = "tasty-quickcheck"; version = "0.11.1"; sha256 = "0si4ccgqlv8h33d6310rrqba7f4pz3g8cinqfj42yd7damsdxm73"; - revision = "1"; - editedCabalFile = "0l4ck9xqbylrdhyi0gwvws7jakn3qcyd146g9wwcqmjryzkzpj68"; + revision = "3"; + editedCabalFile = "1wzvha4xam8npx5mk33c056grmrqnjd6m38nnm6d7y99w2mn1a7w"; libraryHaskellDepends = [ base optparse-applicative @@ -656659,6 +660566,8 @@ self: { pname = "tasty-rerun"; version = "1.1.20"; sha256 = "0px58jm1yqbg32qf2s0yk09d2qdjxkkz9df89f31q3nzw85jv2ky"; + revision = "1"; + editedCabalFile = "13xmx91hp7i0qzrhada9ckliqkynwlwa8x6pjbvxjcy1y0qsd7hk"; libraryHaskellDepends = [ base containers @@ -657075,8 +660984,8 @@ self: { pname = "tasty-wai"; version = "0.1.2.0"; sha256 = "18yw2qzzg969c99rpa8p154hxbm9i4iq64pma3jkr2gfdm6j4vvg"; - revision = "2"; - editedCabalFile = "140kajnwrk614hswxyjymgpzy61m6riv5s25p4zkgv8aa1yhbk06"; + revision = "3"; + editedCabalFile = "0jxvhn4yasi1cl9rxwfpsdjh0bz79i4javy9qf4hqi7vzzxll6i4"; libraryHaskellDepends = [ base bytestring @@ -657146,20 +661055,18 @@ self: { base, dollaridoos, profunctors, - semigroups, }: mkDerivation { pname = "tax"; - version = "0.2.0.0"; - sha256 = "13911rksr268v2jbdm7kkwlglni7s8lb417lryr7m2x9vfg31jqb"; + version = "0.2.1.0"; + sha256 = "1cgfvfi89rv4c12754hsah13ggfhq1hk4axs3sz7dvdwlw25swxr"; libraryHaskellDepends = [ base dollaridoos profunctors - semigroups ]; description = "Types and combinators for taxes"; - license = lib.licenses.agpl3Only; + license = lib.licenses.agpl3Plus; } ) { }; @@ -657174,8 +661081,8 @@ self: { }: mkDerivation { pname = "tax-ato"; - version = "2024.1.0.1"; - sha256 = "1mggzkkd4sxf7bccqwpz49jgxh36mbixl95j2sbsnyac91kgkmxa"; + version = "2025.1"; + sha256 = "0xg8wl83cgla3v2bjx4sk4szlyxam1223xrsa6v6ggwiqm9la5sq"; libraryHaskellDepends = [ base lens @@ -658838,8 +662745,8 @@ self: { }: mkDerivation { pname = "telescope"; - version = "0.3.0"; - sha256 = "06hfflc1ala8b8zm0838yrd51lwj5bqg1qdqwn9fs0hr1jp5nx1r"; + version = "0.4.0"; + sha256 = "13bls8czlwk6df5p5i37cs4sdf0wmz4w4bnjjhpf8kk7bnglpr97"; libraryHaskellDepends = [ base binary @@ -661714,6 +665621,8 @@ self: { pname = "test-framework"; version = "0.8.2.2"; sha256 = "04ijf5x6xx8i5lqv9ir33zs1rfzc4qkwwz8c1fdycnzvydcv4dnp"; + revision = "1"; + editedCabalFile = "1yv1qsr6bxphxk9430id9bqhfmkffdqmfg0k017dp9pnn4pqj0zh"; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint @@ -661923,6 +665832,8 @@ self: { pname = "test-framework-quickcheck2"; version = "0.3.0.6"; sha256 = "1d0w2q9sm8aayk0aj1zr2irpnqwpzixn6pdfq1i904vs1kkb2xin"; + revision = "1"; + editedCabalFile = "1af2gw9gvq143jdqmsnxj23cgss9ffdyr67951a5x151aps04y7z"; libraryHaskellDepends = [ base extensible-exceptions @@ -664063,6 +667974,36 @@ self: { } ) { }; + "text-convert" = callPackage ( + { + mkDerivation, + base, + bytestring, + hspec, + QuickCheck, + text, + }: + mkDerivation { + pname = "text-convert"; + version = "0.1.0.1"; + sha256 = "1jwckq3y4c964kviqrbk1x1gvp6hl97mb4pgl140cgh5nvz58dvl"; + libraryHaskellDepends = [ + base + bytestring + text + ]; + testHaskellDepends = [ + base + bytestring + hspec + QuickCheck + text + ]; + description = "Convert between various textual representations"; + license = lib.licenses.bsd3; + } + ) { }; + "text-cp437" = callPackage ( { mkDerivation, @@ -664132,6 +668073,60 @@ self: { } ) { }; + "text-encode" = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + casing, + cassava, + http-api-data, + http-types, + persistent, + postgresql-simple, + sqlite-simple, + text, + text-convert, + }: + mkDerivation { + pname = "text-encode"; + version = "0.2.0.0"; + sha256 = "0512n1l1xfnzknm4c917n7wylhh52jsk7szxy6fcb6dvl2cr9v41"; + libraryHaskellDepends = [ + aeson + base + bytestring + casing + cassava + http-api-data + http-types + persistent + postgresql-simple + sqlite-simple + text + text-convert + ]; + testHaskellDepends = [ + aeson + base + bytestring + casing + cassava + http-api-data + http-types + persistent + postgresql-simple + sqlite-simple + text + text-convert + ]; + doHaddock = false; + description = "Classes and newtypes for deriving uniform textual encodings"; + license = lib.licenses.bsd3; + } + ) { }; + "text-format" = callPackage ( { mkDerivation, @@ -665432,10 +669427,8 @@ self: { }: mkDerivation { pname = "text-show"; - version = "3.11.1"; - sha256 = "18n4smbwwh9as0kpm2c18153y6lj5pbk2hy6ra9im0fwqk7xan6x"; - revision = "1"; - editedCabalFile = "1g96fwpf0y8hqbjiqdxz4ayyh9qwhacfynkmij80dksk7qxzwxml"; + version = "3.11.2"; + sha256 = "10nm8kj524hkl65qvxkrjjyykzgj85n3p96gv7zc7j3x90v9g1z2"; libraryHaskellDepends = [ array base @@ -665527,8 +669520,8 @@ self: { pname = "text-show-instances"; version = "3.9.10"; sha256 = "09cb391gi0hgkjk4ap4d83vg13lczrghmb9db96a4ckw1bp9pbc1"; - revision = "3"; - editedCabalFile = "1ghlw5jwcxpclsvffn51lhc4i7mljg0jczg78kjghwnv0prjm8r8"; + revision = "4"; + editedCabalFile = "1k5h1lqc8z593cwnmy2yngh3nlq2b4zfbjwkmyqddg192xia8bbh"; libraryHaskellDepends = [ aeson base @@ -670248,6 +674241,77 @@ self: { } ) { }; + "tidal_1_10_0" = callPackage ( + { + mkDerivation, + base, + bytestring, + clock, + colour, + containers, + criterion, + deepseq, + exceptions, + hosc, + hspec, + mtl, + network, + parsec, + primitive, + random, + text, + tidal-core, + tidal-link, + transformers, + weigh, + }: + mkDerivation { + pname = "tidal"; + version = "1.10.0"; + sha256 = "07ky2bj0hfm734sf4c2pymxlxs0rmgdd13q7fmb390p5m5fbxy54"; + revision = "2"; + editedCabalFile = "0pka2nxlmf2sh3c4cmpjzb9zmcmhqhf5bz8qprcmxvmzkwm5a4yz"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base + bytestring + clock + colour + containers + deepseq + exceptions + hosc + mtl + network + parsec + primitive + random + text + tidal-core + tidal-link + transformers + ]; + testHaskellDepends = [ + base + containers + deepseq + hosc + hspec + parsec + tidal-core + ]; + benchmarkHaskellDepends = [ + base + criterion + tidal-core + weigh + ]; + description = "Pattern language for improvised music"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + } + ) { }; + "tidal-core" = callPackage ( { mkDerivation, @@ -670255,14 +674319,14 @@ self: { colour, containers, deepseq, - microspec, + hspec, parsec, text, }: mkDerivation { pname = "tidal-core"; - version = "1.9.6"; - sha256 = "0lny9f5crvx61cwlwbfl7xj34i2gl4j9wlvba8ga82hhysyxzg3i"; + version = "1.10.0"; + sha256 = "1dg6z0z52zxrqai4jfgqrp4ghsdkcflixwspcbnyrxq1d4jw0zdf"; libraryHaskellDepends = [ base colour @@ -670275,7 +674339,7 @@ self: { base containers deepseq - microspec + hspec ]; description = "Core pattern library for TidalCycles, a pattern language for improvised music"; license = lib.licenses.gpl3Only; @@ -670305,7 +674369,7 @@ self: { } ) { }; - "tidal-link_1_1_0" = callPackage ( + "tidal-link_1_2_0" = callPackage ( { mkDerivation, base, @@ -670316,8 +674380,8 @@ self: { }: mkDerivation { pname = "tidal-link"; - version = "1.1.0"; - sha256 = "0qd157gxdb06dwpmsimp9w49lqbpp93ms4bmxn1xwz3p2dhcwbrj"; + version = "1.2.0"; + sha256 = "15sqmdafz8ha2rlk4k327pjfc2kpcvq211avchanmmlvn7dflvsv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -670637,6 +674701,8 @@ self: { pname = "tiktoken"; version = "1.0.3"; sha256 = "0hy3y9rdgjirk8ji7458qnc7h9d2b6yipfri25qkay96kq91kmj6"; + revision = "1"; + editedCabalFile = "0pwxqznjqbdsy99g4l1cyx8anns7wr92kpnbh19y9y99f1913jbn"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base @@ -670669,8 +674735,6 @@ self: { ]; description = "Haskell implementation of tiktoken"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -676916,6 +680980,7 @@ self: { "tools-yj" = callPackage ( { mkDerivation, + array, base, bytestring, containers, @@ -676926,47 +680991,10 @@ self: { }: mkDerivation { pname = "tools-yj"; - version = "0.1.0.27"; - sha256 = "1blcyq5ihqk2kidvywvv187jqgisnnak6rgp2jhw7zbpd4da7hs8"; - libraryHaskellDepends = [ - base - bytestring - containers - data-default - mono-traversable - stm - text - ]; - testHaskellDepends = [ - base - bytestring - containers - data-default - mono-traversable - stm - text - ]; - description = "Tribial tools"; - license = lib.licenses.bsd3; - } - ) { }; - - "tools-yj_0_1_0_30" = callPackage ( - { - mkDerivation, - base, - bytestring, - containers, - data-default, - mono-traversable, - stm, - text, - }: - mkDerivation { - pname = "tools-yj"; - version = "0.1.0.30"; - sha256 = "0dd7l31p74h0nqszv4095zdp5lmjg8s9sxsn59da808f8z1pzf41"; + version = "0.1.0.45"; + sha256 = "04n78afz82kmpyffy8vilfdw584qhhb5bfm3p1rnv9bjnrqv7jxn"; libraryHaskellDepends = [ + array base bytestring containers @@ -676976,6 +681004,7 @@ self: { text ]; testHaskellDepends = [ + array base bytestring containers @@ -676986,7 +681015,6 @@ self: { ]; description = "Tribial tools"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -678256,8 +682284,8 @@ self: { }: mkDerivation { pname = "trace-embrace"; - version = "1.0.11"; - sha256 = "0cnbw0yxaq3lpq8z66fkjsr3d9dss66l837mnbicfksbsn27m22i"; + version = "1.2.0"; + sha256 = "05wgj9pf9vqafa1h7sbjxzy2lx213qwrpr4f2dq7s7i2l9hf2a3k"; libraryHaskellDepends = [ aeson base @@ -678280,6 +682308,7 @@ self: { yaml ]; testHaskellDepends = [ + aeson base bytestring containers @@ -680116,7 +684145,6 @@ self: { ]; description = "Reactive Type Safe Routing"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -681642,8 +685670,8 @@ self: { pname = "trial-optparse-applicative"; version = "0.0.0.0"; sha256 = "1h8pfznf1dp9z3r2kl2ljgmxxkfp3va9yqba00fyvw85lna2aggn"; - revision = "4"; - editedCabalFile = "05rzzcsqvhil7wbsz23syd35h9jqbmmabx89v3h86ng7my3w1nc1"; + revision = "5"; + editedCabalFile = "0jvl3q2lh134z1r9zq2acpsilbjzpjia3xdh51szp6r708jnlpg1"; libraryHaskellDepends = [ base optparse-applicative @@ -684336,7 +688364,9 @@ self: { ]; description = "An equational theorem prover"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "twee"; + broken = true; } ) { }; @@ -688543,6 +692573,8 @@ self: { ]; description = "Plugin to faciliate type-level let"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -688892,6 +692924,7 @@ self: { dlist, hspec, hspec-discover, + safe, template-haskell, text, th-data-compat, @@ -688900,8 +692933,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.11.1.1"; - sha256 = "0zg4wwp5asnzz0n2yhrqb825dldr57m1j6w0l3sdxsi4jmibs4bj"; + version = "0.12.0.1"; + sha256 = "1cl6dq9mdm3caw3zzwpw7vcyv41apk0d0fxrxrm7d0vp4wvjckff"; libraryHaskellDepends = [ aeson aeson-pretty @@ -688909,6 +692942,7 @@ self: { base bytestring dlist + safe template-haskell text th-data-compat @@ -690800,6 +694834,39 @@ self: { } ) { }; + "uku" = callPackage ( + { + mkDerivation, + base, + containers, + ilist, + protolude, + text, + }: + mkDerivation { + pname = "uku"; + version = "0.0.2.0"; + sha256 = "16hgrnhiy3xy3qizg9xpb6br7rqcwrxjxr750bcs9yds35lwqlpf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + containers + ilist + protolude + text + ]; + executableHaskellDepends = [ + base + protolude + text + ]; + description = "Display Ukulele fingering charts in the terminal"; + license = lib.licenses.isc; + mainProgram = "uku"; + } + ) { }; + "ulid" = callPackage ( { mkDerivation, @@ -694715,6 +698782,8 @@ self: { pname = "unix"; version = "2.8.7.0"; sha256 = "10zv2vcq82vv56hll5mpvfwfsx6ymp2f75fwxvp5a1xgbafqgpfb"; + revision = "1"; + editedCabalFile = "1mvyq9qajqhjrv8m3zch07v8h0b3i4fj40d8jfcpbmqsq6h8sa9d"; libraryHaskellDepends = [ base bytestring @@ -695026,8 +699095,8 @@ self: { }: mkDerivation { pname = "unix-time"; - version = "0.4.16"; - sha256 = "1s9qws7z2z9d9ayljz98zdlsja3zvrbcb00n4arzwi3kdl9agqmc"; + version = "0.4.17"; + sha256 = "130z416958xqd6yvjidmm66674y9vkwgxj965kvwhnncbnz0afpn"; libraryHaskellDepends = [ base binary @@ -696426,6 +700495,29 @@ self: { } ) { }; + "unzip-traversable" = callPackage ( + { + mkDerivation, + base, + bifunctors, + }: + mkDerivation { + pname = "unzip-traversable"; + version = "0.1.1"; + sha256 = "0p5pf6rii89y9skms9a4qblj43b92bzym688q01w7zsa8y16dgv8"; + libraryHaskellDepends = [ + base + bifunctors + ]; + testHaskellDepends = [ + base + bifunctors + ]; + description = "Unzip functions for general Traversable containers"; + license = lib.licenses.bsd2; + } + ) { }; + "uom-plugin" = callPackage ( { mkDerivation, @@ -698884,8 +702976,8 @@ self: { }: mkDerivation { pname = "utxorpc"; - version = "0.0.16.0"; - sha256 = "0jhk3x5qbp2rvknbir8s6y4vq8sy5qcs0p9md1g8kbi872ipglng"; + version = "0.0.17.0"; + sha256 = "1jzb0v8gjy15b97a66gmjaxxf3mcxwigaavl5cnzga5z9kz8pyw1"; libraryHaskellDepends = [ base proto-lens @@ -701487,6 +705579,36 @@ self: { } ) { }; + "variety" = callPackage ( + { + mkDerivation, + base, + bytestring, + containers, + exact-combinatorics, + HUnit, + QuickCheck, + }: + mkDerivation { + pname = "variety"; + version = "0.1.0.2"; + sha256 = "0bzavj283kraw1ffx1fi5ihxvk168mqs1s6j6vpl7qmxc0zmrn5a"; + libraryHaskellDepends = [ + base + bytestring + containers + exact-combinatorics + ]; + testHaskellDepends = [ + base + HUnit + QuickCheck + ]; + description = "integer arithmetic codes"; + license = lib.licenses.mit; + } + ) { }; + "vary" = callPackage ( { mkDerivation, @@ -701505,8 +705627,8 @@ self: { }: mkDerivation { pname = "vary"; - version = "0.1.1.2"; - sha256 = "1snil2rmlhbjrlazjycririwr9w4irznf5g4mgmjadb0xny9gwyx"; + version = "0.1.1.3"; + sha256 = "1rw05k5v0idr1ypcmfp7xxyqdaff12yc3x8csv2flspwmyvvlsn3"; libraryHaskellDepends = [ aeson base @@ -701988,8 +706110,8 @@ self: { }: mkDerivation { pname = "vcr"; - version = "0.0.0"; - sha256 = "0h3rjrncjhh8b0lhpj3ilz8dqfrw3qj1qr7q9vpa098nkkvfyqxf"; + version = "0.1.0"; + sha256 = "1s6gp1m84izlsvw5z7ll39mw2r456xmbh7cx53f8gkwl2m2pyyrq"; libraryHaskellDepends = [ async base @@ -703044,8 +707166,8 @@ self: { }: mkDerivation { pname = "vector-hashtables"; - version = "0.1.2.0"; - sha256 = "1s0c3d4f61rgvb0i8c2m3lazxbxg2cpv1pq4k4lnr7nga7sama9r"; + version = "0.1.2.1"; + sha256 = "1cdfvrpnia7bgqaw8yg0n23svbsdz72gss0hrkrvc5rwzxwhz49k"; libraryHaskellDepends = [ base hashable @@ -703111,8 +707233,8 @@ self: { }: mkDerivation { pname = "vector-instances"; - version = "3.4.2"; - sha256 = "0rynfy4agx66mwslj50bfqdyrylr2zba3r6dg5yqykpnfxp2vn9l"; + version = "3.4.3"; + sha256 = "1ajc65vj5j02qzfx11zvgmfx4lh5r99h4hg8wacdkyk1vw1rh9b7"; libraryHaskellDepends = [ base comonad @@ -703527,8 +707649,8 @@ self: { }: mkDerivation { pname = "vector-split"; - version = "1.0.0.3"; - sha256 = "1y2imndpyx15jmiajhabi34522jcayrz05zrxiv1srj4fssz56bd"; + version = "1.0.0.4"; + sha256 = "1m5b0v9izczkh3860a0l0lbwcygv9kf30552941gfmv8k931zq4d"; libraryHaskellDepends = [ base vector @@ -704589,10 +708711,11 @@ self: { }: mkDerivation { pname = "vext"; - version = "0.1.7.0"; - sha256 = "0ynwgb2d3xs6qn99qhdz417p1pjc6y1mjllk6v17rvxiim88yd36"; + version = "0.1.8.0"; + sha256 = "05mw1mijpm1k7hjsr5xx6nwk2ipk2ghi8n1m60zarhlqwmbcvjms"; libraryHaskellDepends = [ base + byteslice natural-arithmetic primitive run-st @@ -707324,58 +711447,6 @@ self: { ) { }; "vty-windows" = callPackage ( - { - mkDerivation, - base, - blaze-builder, - bytestring, - containers, - deepseq, - directory, - filepath, - microlens, - microlens-mtl, - microlens-th, - mtl, - parsec, - stm, - transformers, - utf8-string, - vector, - vty, - Win32, - }: - mkDerivation { - pname = "vty-windows"; - version = "0.2.0.3"; - sha256 = "12f91izwg4r18zvdbnkwd8jk7agdyy3w3bcljrm92hib43i210id"; - libraryHaskellDepends = [ - base - blaze-builder - bytestring - containers - deepseq - directory - filepath - microlens - microlens-mtl - microlens-th - mtl - parsec - stm - transformers - utf8-string - vector - vty - Win32 - ]; - description = "Windows backend for Vty"; - license = lib.licenses.bsd3; - platforms = lib.platforms.windows; - } - ) { }; - - "vty-windows_0_2_0_4" = callPackage ( { mkDerivation, base, @@ -707424,7 +711495,6 @@ self: { description = "Windows backend for Vty"; license = lib.licenses.bsd3; platforms = lib.platforms.windows; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -712991,8 +717061,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.4.7"; - sha256 = "1s0kynqliqwn79gydrdxsgfdw6qffs5fmvhmxiydc379fxf07k7s"; + version = "3.4.8"; + sha256 = "0l67bz23l5sbhsmi9pz5vr0cf2mkkzpl0gjkf9309g0lxfq0mpyl"; libraryHaskellDepends = [ array async @@ -713171,8 +717241,8 @@ self: { }: mkDerivation { pname = "warp-quic"; - version = "0.0.2"; - sha256 = "1hb9xv5v7l1iwhv7qgm9y3prrjkpvcd5snmw6xc9wsk3fr82xl1r"; + version = "0.0.3"; + sha256 = "0vbgbvkl5j8x0lrz568cd2viq0vl5dwzavfincz7a01v5w90qr9c"; libraryHaskellDepends = [ base bytestring @@ -713246,8 +717316,8 @@ self: { pname = "warp-systemd"; version = "0.3.0.0"; sha256 = "1yvkg49wla7axk8vdh5c7d0pxlhyb66ka0xiqi6a3ra3zmw5xi3c"; - revision = "2"; - editedCabalFile = "09pkrig9xq95k3n1yrhfcfa8i3dkdim4nd03mgm22523jk9b3hbw"; + revision = "3"; + editedCabalFile = "1rb5qgfvyblpj15ikrlngyc87wdbp6xp90r7v7gyczshgdhnsg8d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -713633,8 +717703,8 @@ self: { }: mkDerivation { pname = "waterfall-cad"; - version = "0.5.0.1"; - sha256 = "1869qwkbi3mlvciz916y6hv6l4h7z16fflf9xac4i0p9frly50jg"; + version = "0.5.1.0"; + sha256 = "173pv3a7n3jcf4j2jb7sirdib0x850qsifhlz858bkzamhqlxkr8"; libraryHaskellDepends = [ base filepath @@ -713668,8 +717738,8 @@ self: { }: mkDerivation { pname = "waterfall-cad-examples"; - version = "0.5.0.1"; - sha256 = "1k9qs6jnh23d1r9xdpc07002a89rwn1zy5lgvbvlmmlsjny3v7fv"; + version = "0.5.1.0"; + sha256 = "0vrlhgvbkwgk2nvmw8h6sg3fygi3sxs7qllyvwkzzs91kavnkb4d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -713722,8 +717792,8 @@ self: { }: mkDerivation { pname = "waterfall-cad-svg"; - version = "0.5.0.1"; - sha256 = "0vyq23iryzsqjjdyb9ws5jbjm3rkb00ssmabnzx6vlnvzf5cfb1s"; + version = "0.5.1.0"; + sha256 = "1gjm36f7w3xf7q8gfm6xk5ssj594z45vfkqkr3x9rgny8rn7w3p5"; libraryHaskellDepends = [ attoparsec base @@ -714194,6 +718264,7 @@ self: { attoparsec, base, bytestring, + directory, hspec, http-client, QuickCheck, @@ -714202,12 +718273,13 @@ self: { }: mkDerivation { pname = "web-cookiejar"; - version = "0.1.0.0"; - sha256 = "0hc9cpqs2h7kcxlrvlsmqm7xxq1cdi7zax3c7md5ldbzgzwiwr28"; + version = "0.1.3.0"; + sha256 = "0n8r23nk89hlp5z5zirj2yng818fba39f5yz0l351z7rpx0pi8vy"; libraryHaskellDepends = [ attoparsec base bytestring + directory http-client time ]; @@ -715812,8 +719884,8 @@ self: { }: mkDerivation { pname = "webauthn"; - version = "0.10.0.0"; - sha256 = "0ndgwv8d7yndl9kb4fzvfp5wrz1pfshsp2xwhwnynd2a9mz3yqwp"; + version = "0.11.0.0"; + sha256 = "11fah0xsblggpnviggzpz18y8snhyn6wm7hng8665d7s4ylr9z4w"; libraryHaskellDepends = [ aeson asn1-encoding @@ -716768,8 +720840,8 @@ self: { }: mkDerivation { pname = "webfinger-client"; - version = "0.2.2.0"; - sha256 = "0i8gixjsz6hw77gplrk26d15m6d3ddm1ac2hgcmv641msvbfr9p2"; + version = "0.2.2.1"; + sha256 = "0rwfzjgx8g2ic6763sbv9ybnkcg84kgmmvw476sswaw2338spwd0"; libraryHaskellDepends = [ aeson base @@ -717773,8 +721845,8 @@ self: { pname = "websockets"; version = "0.13.0.0"; sha256 = "1da95b71akggyikbxdmja3gcaqrz8sp6ri5jrsyavc2ickvi9y4s"; - revision = "4"; - editedCabalFile = "1g6f94cn20a4073cbinv2sfwglbqlpjxgzgj7svi6ff4vkfn0ins"; + revision = "5"; + editedCabalFile = "0nm0lj8cv5z5y2d0bz0rfl3bz100swhind4wn95b7q2ma2x80dlv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -719674,8 +723746,8 @@ self: { }: mkDerivation { pname = "wide-word"; - version = "0.1.7.0"; - sha256 = "01rx0bcc6kanyjp1vf9icymdgkmsx279m7rby2gpb1w0d6swnss8"; + version = "0.1.7.1"; + sha256 = "1h42k00inir628qb2r8966bhn354bnkgadpx5fgm6g1kh879y15a"; libraryHaskellDepends = [ base binary @@ -720247,8 +724319,8 @@ self: { }: mkDerivation { pname = "wild-bind"; - version = "0.1.2.11"; - sha256 = "0mdwx0qwlmm22pajvg5s3rzm6xf83z14lfxwbwh8fiphxlgyhnin"; + version = "0.1.2.12"; + sha256 = "1bjm2vxa6xg7j6wl28rg8djxabpjss22z1w1ymlm2lw5fb148frn"; libraryHaskellDepends = [ base containers @@ -722509,6 +726581,8 @@ self: { pname = "word8set"; version = "0.1.2"; sha256 = "0jbr571rxw0vxxc95568kdxrw9d0kk6np9wrwjd6rj6ybh532zr7"; + revision = "1"; + editedCabalFile = "1w3w1f8kig5mvrl06y5f48lrr44zxwa0w8lvwa6vks4fvv1ia0lj"; libraryHaskellDepends = [ base deepseq @@ -724706,33 +728780,37 @@ self: { aeson, base, binary, - binary-parsers, bytestring, network, + postgresql-simple, text, time, }: mkDerivation { pname = "wsjtx-udp"; - version = "0.1.3.5"; - sha256 = "1x2975pj2i0c4w1s00s4qc24sa24y29magilfxbhy8v1w1hfqcv7"; + version = "0.5.0.0"; + sha256 = "0fz92fjynvaz73i8v229ibj9z7bjjc4v467hmakc1v7xcjdxajj7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base binary - binary-parsers bytestring network text time ]; - executableHaskellDepends = [ base ]; + executableHaskellDepends = [ + aeson + base + bytestring + network + postgresql-simple + ]; description = "WSJT-X UDP protocol"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - mainProgram = "wsjtx-dump-udp"; broken = true; } ) { }; @@ -726166,6 +730244,37 @@ self: { } ) { }; + "xcframework" = callPackage ( + { + mkDerivation, + base, + Cabal, + Cabal-hooks, + directory, + filepath, + process, + temporary, + }: + mkDerivation { + pname = "xcframework"; + version = "0.1.0.0"; + sha256 = "1pzgkijqmws848z5m6zizsywxydwxl3vzh47z4qjdy2b8z8m0qk0"; + libraryHaskellDepends = [ + base + Cabal + Cabal-hooks + directory + filepath + process + temporary + ]; + description = "Cabal hooks for producing an XCFramework from a Haskell library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + "xchat-plugin" = callPackage ( { mkDerivation, @@ -726550,6 +730659,47 @@ self: { } ) { }; + "xenomorph" = callPackage ( + { + mkDerivation, + base, + bytestring, + hspec, + hspec-discover, + html-entities, + text, + unordered-containers, + vector, + xeno, + }: + mkDerivation { + pname = "xenomorph"; + version = "0.0.1.0"; + sha256 = "1c7pdqk7758jzgfcmv2q6gbp9gwh1ka6hkfggiw5xmc2nky084bv"; + libraryHaskellDepends = [ + base + bytestring + html-entities + text + unordered-containers + vector + xeno + ]; + testHaskellDepends = [ + base + bytestring + hspec + html-entities + text + unordered-containers + vector + xeno + ]; + testToolDepends = [ hspec-discover ]; + license = lib.licenses.bsd3; + } + ) { }; + "xenstore" = callPackage ( { mkDerivation, @@ -728247,6 +732397,7 @@ self: { description = "Generate XML-isomorphic types"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -728264,8 +732415,8 @@ self: { pname = "xml-lens"; version = "0.3.1"; sha256 = "0i6c4xqacinhxnyszzna7s9x79rrcs1c7jq6zimcwh4302l5d6cm"; - revision = "3"; - editedCabalFile = "1zwkii9klqaknnf06h56nvh9090xczqff1mq89mq7wk9y585qd3s"; + revision = "4"; + editedCabalFile = "1zicqdzvca53rg2ai14nkyq1f46w6kz6bd4mjmqzx778xn17d22f"; libraryHaskellDepends = [ base case-insensitive @@ -728276,8 +732427,6 @@ self: { ]; description = "Lenses, traversals, and prisms for xml-conduit"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -729531,8 +733680,8 @@ self: { }: mkDerivation { pname = "xmobar"; - version = "0.49"; - sha256 = "0mw01jxkcvm186csg71y21zig9rkxkp304i3ym4pgr3rilhp3p5z"; + version = "0.50"; + sha256 = "026s0q718z89vzjgva19vg58dm1l016i67mzi0wbj7kgai89w909"; configureFlags = [ "-fwith_alsa" "-fwith_conduit" @@ -730335,6 +734484,8 @@ self: { description = "Text-based notification server for XMobar"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -730354,6 +734505,8 @@ self: { pname = "xor"; version = "0.0.1.3"; sha256 = "12hqm6imp3qvnnrkds77jsi0zx2dza1h9g88adnxiksv62fybymv"; + revision = "1"; + editedCabalFile = "0n0mdli5qypi9khk42lqqkn464w22vjwx0dg2dg6mvdq0r37qwab"; libraryHaskellDepends = [ base bytestring @@ -739765,7 +743918,7 @@ self: { } ) { }; - "yesod-test_1_6_19" = callPackage ( + "yesod-test_1_6_23" = callPackage ( { mkDerivation, aeson, @@ -739779,6 +743932,7 @@ self: { conduit, containers, cookie, + directory, hspec, hspec-core, html-conduit, @@ -739788,6 +743942,7 @@ self: { mtl, network, pretty-show, + process, text, time, transformers, @@ -739802,8 +743957,8 @@ self: { }: mkDerivation { pname = "yesod-test"; - version = "1.6.19"; - sha256 = "0snq06yps28lkxfc1mhsvbv2kq0h0mi16zjdfrahm4zaz8axkqka"; + version = "1.6.23"; + sha256 = "1bisgnvfda16ryg9npdn4s041z7vvvgdmpkq9wqwccpw4vwylklv"; libraryHaskellDepends = [ aeson attoparsec @@ -739816,6 +743971,7 @@ self: { conduit containers cookie + directory hspec-core html-conduit http-types @@ -739824,6 +743980,7 @@ self: { mtl network pretty-show + process text time transformers @@ -744187,6 +748344,8 @@ self: { pname = "zinza"; version = "0.2.1"; sha256 = "1k4k2yvijg0vwp3ykp9l77n3qdpivikqxx78ilvk6nx6w9sj58c8"; + revision = "1"; + editedCabalFile = "1ikbfa3g3636v70v7xa0x89xn91g2w8nngrxnaxwjyhaldskxvzc"; libraryHaskellDepends = [ base containers @@ -744330,7 +748489,7 @@ self: { } ) { }; - "zip_2_2_0" = callPackage ( + "zip_2_2_1" = callPackage ( { mkDerivation, base, @@ -744361,8 +748520,8 @@ self: { }: mkDerivation { pname = "zip"; - version = "2.2.0"; - sha256 = "0l83f3bkx9npmna637wy607vr20z3gx8isgmjh8yany6f3nb805d"; + version = "2.2.1"; + sha256 = "1wq0nl034b2nknd627adzffj6rymykvkdn5b0smydcv5wp7i6p6j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ diff --git a/pkgs/development/interpreters/python/cpython/3.13/revert-gh134724.patch b/pkgs/development/interpreters/python/cpython/3.13/revert-gh134724.patch new file mode 100644 index 0000000000000..f48dcf3b39da9 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.13/revert-gh134724.patch @@ -0,0 +1,373 @@ +commit 4a37dd6cef1556c64c2665061b5e01bbd2bb3a82 +Author: Gregory P. Smith <68491+gpshead@users.noreply.github.com> +Date: Sun Jul 27 08:30:25 2025 -0700 + + [3.13] gh-134698: Hold a lock when the thread state is detached in ssl (GH-134724) (#137126) + + Lock when the thread state is detached. + (cherry picked from commit e047a35b23c1aa69ab8d5da56f36319cec4d36b8) or really from the 3.14 backport fd565fdfc9c0001900d03d627e2fda83f1bcca90 + + Co-authored-by: Peter Bierma + +diff --git b/Modules/_ssl.c a/Modules/_ssl.c +index 981c3d6a936..aa846f68641 100644 +--- b/Modules/_ssl.c ++++ a/Modules/_ssl.c +@@ -42,14 +42,14 @@ + /* Redefined below for Windows debug builds after important #includes */ + #define _PySSL_FIX_ERRNO + +-#define PySSL_BEGIN_ALLOW_THREADS_S(save, mutex) \ +- do { (save) = PyEval_SaveThread(); PyMutex_Lock(mutex); } while(0) +-#define PySSL_END_ALLOW_THREADS_S(save, mutex) \ +- do { PyMutex_Unlock(mutex); PyEval_RestoreThread(save); _PySSL_FIX_ERRNO; } while(0) +-#define PySSL_BEGIN_ALLOW_THREADS(self) { \ ++#define PySSL_BEGIN_ALLOW_THREADS_S(save) \ ++ do { (save) = PyEval_SaveThread(); } while(0) ++#define PySSL_END_ALLOW_THREADS_S(save) \ ++ do { PyEval_RestoreThread(save); _PySSL_FIX_ERRNO; } while(0) ++#define PySSL_BEGIN_ALLOW_THREADS { \ + PyThreadState *_save = NULL; \ +- PySSL_BEGIN_ALLOW_THREADS_S(_save, &self->tstate_mutex); +-#define PySSL_END_ALLOW_THREADS(self) PySSL_END_ALLOW_THREADS_S(_save, &self->tstate_mutex); } ++ PySSL_BEGIN_ALLOW_THREADS_S(_save); ++#define PySSL_END_ALLOW_THREADS PySSL_END_ALLOW_THREADS_S(_save); } + + #if defined(HAVE_POLL_H) + #include +@@ -304,9 +304,6 @@ typedef struct { + PyObject *psk_client_callback; + PyObject *psk_server_callback; + #endif +- /* Lock to synchronize calls when the thread state is detached. +- See also gh-134698. */ +- PyMutex tstate_mutex; + } PySSLContext; + + typedef struct { +@@ -332,9 +329,6 @@ typedef struct { + * and shutdown methods check for chained exceptions. + */ + PyObject *exc; +- /* Lock to synchronize calls when the thread state is detached. +- See also gh-134698. */ +- PyMutex tstate_mutex; + } PySSLSocket; + + typedef struct { +@@ -846,14 +840,13 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock, + self->server_hostname = NULL; + self->err = err; + self->exc = NULL; +- self->tstate_mutex = (PyMutex){0}; + + /* Make sure the SSL error state is initialized */ + ERR_clear_error(); + +- PySSL_BEGIN_ALLOW_THREADS(sslctx) ++ PySSL_BEGIN_ALLOW_THREADS + self->ssl = SSL_new(ctx); +- PySSL_END_ALLOW_THREADS(sslctx) ++ PySSL_END_ALLOW_THREADS + if (self->ssl == NULL) { + Py_DECREF(self); + _setSSLError(get_state_ctx(self), NULL, 0, __FILE__, __LINE__); +@@ -919,12 +912,12 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock, + BIO_set_nbio(SSL_get_wbio(self->ssl), 1); + } + +- PySSL_BEGIN_ALLOW_THREADS(self) ++ PySSL_BEGIN_ALLOW_THREADS + if (socket_type == PY_SSL_CLIENT) + SSL_set_connect_state(self->ssl); + else + SSL_set_accept_state(self->ssl); +- PySSL_END_ALLOW_THREADS(self) ++ PySSL_END_ALLOW_THREADS + + self->socket_type = socket_type; + if (sock != NULL) { +@@ -993,10 +986,10 @@ _ssl__SSLSocket_do_handshake_impl(PySSLSocket *self) + /* Actually negotiate SSL connection */ + /* XXX If SSL_do_handshake() returns 0, it's also a failure. */ + do { +- PySSL_BEGIN_ALLOW_THREADS(self) ++ PySSL_BEGIN_ALLOW_THREADS + ret = SSL_do_handshake(self->ssl); + err = _PySSL_errno(ret < 1, self->ssl, ret); +- PySSL_END_ALLOW_THREADS(self) ++ PySSL_END_ALLOW_THREADS + self->err = err; + + if (PyErr_CheckSignals()) +@@ -2369,10 +2362,9 @@ PySSL_select(PySocketSockObject *s, int writing, PyTime_t timeout) + ms = (int)_PyTime_AsMilliseconds(timeout, _PyTime_ROUND_CEILING); + assert(ms <= INT_MAX); + +- Py_BEGIN_ALLOW_THREADS ++ PySSL_BEGIN_ALLOW_THREADS + rc = poll(&pollfd, 1, (int)ms); +- Py_END_ALLOW_THREADS +- _PySSL_FIX_ERRNO; ++ PySSL_END_ALLOW_THREADS + #else + /* Guard against socket too large for select*/ + if (!_PyIsSelectable_fd(s->sock_fd)) +@@ -2384,14 +2376,13 @@ PySSL_select(PySocketSockObject *s, int writing, PyTime_t timeout) + FD_SET(s->sock_fd, &fds); + + /* Wait until the socket becomes ready */ +- Py_BEGIN_ALLOW_THREADS ++ PySSL_BEGIN_ALLOW_THREADS + nfds = Py_SAFE_DOWNCAST(s->sock_fd+1, SOCKET_T, int); + if (writing) + rc = select(nfds, NULL, &fds, NULL, &tv); + else + rc = select(nfds, &fds, NULL, NULL, &tv); +- Py_END_ALLOW_THREADS +- _PySSL_FIX_ERRNO; ++ PySSL_END_ALLOW_THREADS + #endif + + /* Return SOCKET_TIMED_OUT on timeout, SOCKET_OPERATION_OK otherwise +@@ -2462,10 +2453,10 @@ _ssl__SSLSocket_write_impl(PySSLSocket *self, Py_buffer *b) + } + + do { +- PySSL_BEGIN_ALLOW_THREADS(self) ++ PySSL_BEGIN_ALLOW_THREADS + retval = SSL_write_ex(self->ssl, b->buf, (size_t)b->len, &count); + err = _PySSL_errno(retval == 0, self->ssl, retval); +- PySSL_END_ALLOW_THREADS(self) ++ PySSL_END_ALLOW_THREADS + self->err = err; + + if (PyErr_CheckSignals()) +@@ -2523,10 +2514,10 @@ _ssl__SSLSocket_pending_impl(PySSLSocket *self) + int count = 0; + _PySSLError err; + +- PySSL_BEGIN_ALLOW_THREADS(self) ++ PySSL_BEGIN_ALLOW_THREADS + count = SSL_pending(self->ssl); + err = _PySSL_errno(count < 0, self->ssl, count); +- PySSL_END_ALLOW_THREADS(self) ++ PySSL_END_ALLOW_THREADS + self->err = err; + + if (count < 0) +@@ -2617,10 +2608,10 @@ _ssl__SSLSocket_read_impl(PySSLSocket *self, Py_ssize_t len, + deadline = _PyDeadline_Init(timeout); + + do { +- PySSL_BEGIN_ALLOW_THREADS(self) ++ PySSL_BEGIN_ALLOW_THREADS + retval = SSL_read_ex(self->ssl, mem, (size_t)len, &count); + err = _PySSL_errno(retval == 0, self->ssl, retval); +- PySSL_END_ALLOW_THREADS(self) ++ PySSL_END_ALLOW_THREADS + self->err = err; + + if (PyErr_CheckSignals()) +@@ -2719,7 +2710,7 @@ _ssl__SSLSocket_shutdown_impl(PySSLSocket *self) + } + + while (1) { +- PySSL_BEGIN_ALLOW_THREADS(self) ++ PySSL_BEGIN_ALLOW_THREADS + /* Disable read-ahead so that unwrap can work correctly. + * Otherwise OpenSSL might read in too much data, + * eating clear text data that happens to be +@@ -2732,7 +2723,7 @@ _ssl__SSLSocket_shutdown_impl(PySSLSocket *self) + SSL_set_read_ahead(self->ssl, 0); + ret = SSL_shutdown(self->ssl); + err = _PySSL_errno(ret < 0, self->ssl, ret); +- PySSL_END_ALLOW_THREADS(self) ++ PySSL_END_ALLOW_THREADS + self->err = err; + + /* If err == 1, a secure shutdown with SSL_shutdown() is complete */ +@@ -3124,10 +3115,9 @@ _ssl__SSLContext_impl(PyTypeObject *type, int proto_version) + // no other thread can be touching this object yet. + // (Technically, we can't even lock if we wanted to, as the + // lock hasn't been initialized yet.) +- Py_BEGIN_ALLOW_THREADS ++ PySSL_BEGIN_ALLOW_THREADS + ctx = SSL_CTX_new(method); +- Py_END_ALLOW_THREADS +- _PySSL_FIX_ERRNO; ++ PySSL_END_ALLOW_THREADS + + if (ctx == NULL) { + _setSSLError(get_ssl_state(module), NULL, 0, __FILE__, __LINE__); +@@ -3153,7 +3143,6 @@ _ssl__SSLContext_impl(PyTypeObject *type, int proto_version) + self->psk_client_callback = NULL; + self->psk_server_callback = NULL; + #endif +- self->tstate_mutex = (PyMutex){0}; + + /* Don't check host name by default */ + if (proto_version == PY_SSL_VERSION_TLS_CLIENT) { +@@ -3270,10 +3259,9 @@ context_clear(PySSLContext *self) + Py_CLEAR(self->psk_server_callback); + #endif + if (self->keylog_bio != NULL) { +- Py_BEGIN_ALLOW_THREADS ++ PySSL_BEGIN_ALLOW_THREADS + BIO_free_all(self->keylog_bio); +- Py_END_ALLOW_THREADS +- _PySSL_FIX_ERRNO; ++ PySSL_END_ALLOW_THREADS + self->keylog_bio = NULL; + } + return 0; +@@ -3992,8 +3980,7 @@ _password_callback(char *buf, int size, int rwflag, void *userdata) + _PySSLPasswordInfo *pw_info = (_PySSLPasswordInfo*) userdata; + PyObject *fn_ret = NULL; + +- pw_info->thread_state = PyThreadState_Swap(pw_info->thread_state); +- _PySSL_FIX_ERRNO; ++ PySSL_END_ALLOW_THREADS_S(pw_info->thread_state); + + if (pw_info->error) { + /* already failed previously. OpenSSL 3.0.0-alpha14 invokes the +@@ -4023,13 +4010,13 @@ _password_callback(char *buf, int size, int rwflag, void *userdata) + goto error; + } + +- pw_info->thread_state = PyThreadState_Swap(pw_info->thread_state); ++ PySSL_BEGIN_ALLOW_THREADS_S(pw_info->thread_state); + memcpy(buf, pw_info->password, pw_info->size); + return pw_info->size; + + error: + Py_XDECREF(fn_ret); +- pw_info->thread_state = PyThreadState_Swap(pw_info->thread_state); ++ PySSL_BEGIN_ALLOW_THREADS_S(pw_info->thread_state); + pw_info->error = 1; + return -1; + } +@@ -4082,10 +4069,10 @@ _ssl__SSLContext_load_cert_chain_impl(PySSLContext *self, PyObject *certfile, + SSL_CTX_set_default_passwd_cb(self->ctx, _password_callback); + SSL_CTX_set_default_passwd_cb_userdata(self->ctx, &pw_info); + } +- PySSL_BEGIN_ALLOW_THREADS_S(pw_info.thread_state, &self->tstate_mutex); ++ PySSL_BEGIN_ALLOW_THREADS_S(pw_info.thread_state); + r = SSL_CTX_use_certificate_chain_file(self->ctx, + PyBytes_AS_STRING(certfile_bytes)); +- PySSL_END_ALLOW_THREADS_S(pw_info.thread_state, &self->tstate_mutex); ++ PySSL_END_ALLOW_THREADS_S(pw_info.thread_state); + if (r != 1) { + if (pw_info.error) { + ERR_clear_error(); +@@ -4100,11 +4087,11 @@ _ssl__SSLContext_load_cert_chain_impl(PySSLContext *self, PyObject *certfile, + } + goto error; + } +- PySSL_BEGIN_ALLOW_THREADS_S(pw_info.thread_state, &self->tstate_mutex); ++ PySSL_BEGIN_ALLOW_THREADS_S(pw_info.thread_state); + r = SSL_CTX_use_PrivateKey_file(self->ctx, + PyBytes_AS_STRING(keyfile ? keyfile_bytes : certfile_bytes), + SSL_FILETYPE_PEM); +- PySSL_END_ALLOW_THREADS_S(pw_info.thread_state, &self->tstate_mutex); ++ PySSL_END_ALLOW_THREADS_S(pw_info.thread_state); + Py_CLEAR(keyfile_bytes); + Py_CLEAR(certfile_bytes); + if (r != 1) { +@@ -4121,9 +4108,9 @@ _ssl__SSLContext_load_cert_chain_impl(PySSLContext *self, PyObject *certfile, + } + goto error; + } +- PySSL_BEGIN_ALLOW_THREADS_S(pw_info.thread_state, &self->tstate_mutex); ++ PySSL_BEGIN_ALLOW_THREADS_S(pw_info.thread_state); + r = SSL_CTX_check_private_key(self->ctx); +- PySSL_END_ALLOW_THREADS_S(pw_info.thread_state, &self->tstate_mutex); ++ PySSL_END_ALLOW_THREADS_S(pw_info.thread_state); + if (r != 1) { + _setSSLError(get_state_ctx(self), NULL, 0, __FILE__, __LINE__); + goto error; +@@ -4340,9 +4327,9 @@ _ssl__SSLContext_load_verify_locations_impl(PySSLContext *self, + cafile_buf = PyBytes_AS_STRING(cafile_bytes); + if (capath) + capath_buf = PyBytes_AS_STRING(capath_bytes); +- PySSL_BEGIN_ALLOW_THREADS(self) ++ PySSL_BEGIN_ALLOW_THREADS + r = SSL_CTX_load_verify_locations(self->ctx, cafile_buf, capath_buf); +- PySSL_END_ALLOW_THREADS(self) ++ PySSL_END_ALLOW_THREADS + if (r != 1) { + if (errno != 0) { + PyErr_SetFromErrno(PyExc_OSError); +@@ -4394,11 +4381,10 @@ _ssl__SSLContext_load_dh_params_impl(PySSLContext *self, PyObject *filepath) + return NULL; + + errno = 0; +- Py_BEGIN_ALLOW_THREADS ++ PySSL_BEGIN_ALLOW_THREADS + dh = PEM_read_DHparams(f, NULL, NULL, NULL); + fclose(f); +- Py_END_ALLOW_THREADS +- _PySSL_FIX_ERRNO; ++ PySSL_END_ALLOW_THREADS + if (dh == NULL) { + if (errno != 0) { + PyErr_SetFromErrnoWithFilenameObject(PyExc_OSError, filepath); +@@ -4550,7 +4536,6 @@ _ssl__SSLContext_set_default_verify_paths_impl(PySSLContext *self) + Py_BEGIN_ALLOW_THREADS + rc = SSL_CTX_set_default_verify_paths(self->ctx); + Py_END_ALLOW_THREADS +- _PySSL_FIX_ERRNO; + if (!rc) { + _setSSLError(get_state_ctx(self), NULL, 0, __FILE__, __LINE__); + return NULL; +diff --git b/Modules/_ssl/debughelpers.c a/Modules/_ssl/debughelpers.c +index fb8ae7c4e0b..5fc69a07184 100644 +--- b/Modules/_ssl/debughelpers.c ++++ a/Modules/_ssl/debughelpers.c +@@ -135,15 +135,13 @@ _PySSL_keylog_callback(const SSL *ssl, const char *line) + * critical debug helper. + */ + +- assert(PyMutex_IsLocked(&ssl_obj->tstate_mutex)); +- Py_BEGIN_ALLOW_THREADS ++ PySSL_BEGIN_ALLOW_THREADS + PyThread_acquire_lock(lock, 1); + res = BIO_printf(ssl_obj->ctx->keylog_bio, "%s\n", line); + e = errno; + (void)BIO_flush(ssl_obj->ctx->keylog_bio); + PyThread_release_lock(lock); +- Py_END_ALLOW_THREADS +- _PySSL_FIX_ERRNO; ++ PySSL_END_ALLOW_THREADS + + if (res == -1) { + errno = e; +@@ -179,10 +177,9 @@ _PySSLContext_set_keylog_filename(PySSLContext *self, PyObject *arg, void *c) { + if (self->keylog_bio != NULL) { + BIO *bio = self->keylog_bio; + self->keylog_bio = NULL; +- Py_BEGIN_ALLOW_THREADS ++ PySSL_BEGIN_ALLOW_THREADS + BIO_free_all(bio); +- Py_END_ALLOW_THREADS +- _PySSL_FIX_ERRNO; ++ PySSL_END_ALLOW_THREADS + } + + if (arg == Py_None) { +@@ -204,13 +201,13 @@ _PySSLContext_set_keylog_filename(PySSLContext *self, PyObject *arg, void *c) { + self->keylog_filename = Py_NewRef(arg); + + /* Write a header for seekable, empty files (this excludes pipes). */ +- PySSL_BEGIN_ALLOW_THREADS(self) ++ PySSL_BEGIN_ALLOW_THREADS + if (BIO_tell(self->keylog_bio) == 0) { + BIO_puts(self->keylog_bio, + "# TLS secrets log file, generated by OpenSSL / Python\n"); + (void)BIO_flush(self->keylog_bio); + } +- PySSL_END_ALLOW_THREADS(self) ++ PySSL_END_ALLOW_THREADS + SSL_CTX_set_keylog_callback(self->ctx, _PySSL_keylog_callback); + return 0; + } diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 2d85ee51d3fb6..3e1d6cc63ff19 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -12,17 +12,23 @@ pkg-config, python-setup-hook, + # high level switches + withMinimalDeps ? false, + # runtime dependencies bzip2, - withExpat ? true, + withExpat ? !withMinimalDeps, expat, libffi, libuuid, + withLibxcrypt ? !withMinimalDeps, libxcrypt, - withMpdecimal ? true, + withMpdecimal ? !withMinimalDeps, mpdecimal, ncurses, + withOpenssl ? !withMinimalDeps, openssl, + withSqlite ? !withMinimalDeps, sqlite, xz, zlib, @@ -35,12 +41,12 @@ # optional dependencies bluezSupport ? false, bluez, - mimetypesSupport ? true, + mimetypesSupport ? !withMinimalDeps, mailcap, tzdata, - withGdbm ? !stdenv.hostPlatform.isWindows, + withGdbm ? !withMinimalDeps && !stdenv.hostPlatform.isWindows, gdbm, - withReadline ? !stdenv.hostPlatform.isWindows, + withReadline ? !withMinimalDeps && !stdenv.hostPlatform.isWindows, readline, x11Support ? false, tcl, @@ -63,13 +69,13 @@ sourceVersion, hash, passthruFun, - stripConfig ? false, - stripIdlelib ? false, - stripTests ? false, - stripTkinter ? false, - rebuildBytecode ? true, + stripConfig ? withMinimalDeps, + stripIdlelib ? withMinimalDeps, + stripTests ? withMinimalDeps, + stripTkinter ? withMinimalDeps, + rebuildBytecode ? !withMinimalDeps, stripBytecode ? true, - includeSiteCustomize ? true, + includeSiteCustomize ? !withMinimalDeps, static ? stdenv.hostPlatform.isStatic, enableFramework ? false, noldconfigPatch ? ./. + "/${sourceVersion.major}.${sourceVersion.minor}/no-ldconfig.patch", @@ -85,7 +91,8 @@ # enabling LTO on 32bit arch causes downstream packages to fail when linking enableLTO ? - stdenv.hostPlatform.isDarwin || (stdenv.hostPlatform.is64bit && stdenv.hostPlatform.isLinux), + !withMinimalDeps + && (stdenv.hostPlatform.isDarwin || (stdenv.hostPlatform.is64bit && stdenv.hostPlatform.isLinux)), # enable asserts to ensure the build remains reproducible reproducibleBuild ? false, @@ -97,7 +104,9 @@ testers, # allow pythonMinimal to prevent accidental dependencies it doesn't want - allowedReferenceNames ? [ ], + # Having this as an option is useful to allow overriding, eg. adding things to + # python3Minimal + allowedReferenceNames ? if withMinimalDeps then [ "bashNonInteractive" ] else [ ], }@inputs: @@ -140,12 +149,12 @@ let ; # mixes libc and libxcrypt headers and libs and causes segfaults on importing crypt - libxcrypt = if stdenv.hostPlatform.isFreeBSD then null else inputs.libxcrypt; + libxcrypt = if stdenv.hostPlatform.isFreeBSD && withMinimalDeps then null else inputs.libxcrypt; buildPackages = pkgsBuildHost; inherit (passthru) pythonOnBuildForHost; - tzdataSupport = tzdata != null && passthru.pythonAtLeast "3.9"; + tzdataSupport = !withMinimalDeps && tzdata != null && passthru.pythonAtLeast "3.9"; passthru = let @@ -200,13 +209,15 @@ let nativeBuildInputs = [ nukeReferences ] - ++ optionals (!stdenv.hostPlatform.isDarwin) [ + ++ optionals (!stdenv.hostPlatform.isDarwin && !withMinimalDeps) [ autoconf-archive # needed for AX_CHECK_COMPILE_FLAG autoreconfHook ] - ++ optionals (!stdenv.hostPlatform.isDarwin || passthru.pythonAtLeast "3.14") [ - pkg-config - ] + ++ + optionals ((!stdenv.hostPlatform.isDarwin || passthru.pythonAtLeast "3.14") && !withMinimalDeps) + [ + pkg-config + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.stdenv.cc pythonOnBuildForHost @@ -223,19 +234,22 @@ let ]; buildInputs = lib.filter (p: p != null) ( - [ + optionals (!withMinimalDeps) [ bzip2 libffi libuuid - libxcrypt ncurses - openssl - sqlite xz zlib ] - ++ optionals (passthru.pythonAtLeast "3.14") [ - zstd + ++ optionals withLibxcrypt [ + libxcrypt + ] + ++ optionals withOpenssl [ + openssl + ] + ++ optionals withSqlite [ + sqlite ] ++ optionals withMpdecimal [ mpdecimal @@ -243,6 +257,9 @@ let ++ optionals withExpat [ expat ] + ++ optionals (passthru.pythonAtLeast "3.14") [ + zstd + ] ++ optionals bluezSupport [ bluez ] @@ -348,6 +365,10 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals (pythonAtLeast "3.13") [ ./3.13/virtualenv-permissions.patch ] + ++ optionals isPy313 [ + # https://github.com/python/cpython/issues/137583 + ./3.13/revert-gh134724.patch + ] ++ optionals mimetypesSupport [ # Make the mimetypes module refer to the right file ./mimetypes.patch @@ -435,7 +456,7 @@ stdenv.mkDerivation (finalAttrs: { env = { CPPFLAGS = concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs); LDFLAGS = concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs); - LIBS = "${optionalString (!stdenv.hostPlatform.isDarwin && libxcrypt != null) "-lcrypt"}"; + LIBS = "${optionalString (!stdenv.hostPlatform.isDarwin && withLibxcrypt) "-lcrypt"}"; NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && !stdenv.hostPlatform.isStatic) ( { "glibc" = "-lgcc_s"; @@ -457,7 +478,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withMpdecimal [ "--with-system-libmpdec" ] - ++ optionals (openssl != null) [ + ++ optionals withOpenssl [ "--with-openssl=${openssl.dev}" ] ++ optionals tzdataSupport [ @@ -484,10 +505,10 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals enableDebug [ "--with-pydebug" ] - ++ optionals (sqlite != null) [ + ++ optionals withSqlite [ "--enable-loadable-sqlite-extensions" ] - ++ optionals (libxcrypt != null) [ + ++ optionals withLibxcrypt [ "CFLAGS=-I${libxcrypt}/include" "LIBS=-L${libxcrypt}/lib" ] @@ -592,7 +613,7 @@ stdenv.mkDerivation (finalAttrs: { [ (placeholder "out") ] - ++ lib.optional (libxcrypt != null) libxcrypt + ++ lib.optional withLibxcrypt libxcrypt ++ lib.optional tzdataSupport tzdata ); in @@ -635,7 +656,7 @@ stdenv.mkDerivation (finalAttrs: { # Get rid of retained dependencies on -dev packages, and remove # some $TMPDIR references to improve binary reproducibility. # Note that the .pyc file of _sysconfigdata.py should be regenerated! - for i in $out/lib/${libPrefix}/_sysconfigdata*.py $out/lib/${libPrefix}/config-${sourceVersion.major}${sourceVersion.minor}*/Makefile; do + for i in $out/lib/${libPrefix}/_sysconfigdata*.py $out/lib/${libPrefix}/config-${sourceVersion.major}.${sourceVersion.minor}*/Makefile; do sed -i $i -e "s|$TMPDIR|/no-such-path|g" done @@ -758,7 +779,7 @@ stdenv.mkDerivation (finalAttrs: { # Enforce that we don't have references to the OpenSSL -dev package, which we # explicitly specify in our configure flags above. disallowedReferences = - lib.optionals (openssl != null && !static && !enableFramework) [ + lib.optionals (withOpenssl && !static && !enableFramework) [ openssl.dev ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index d7d9660057e04..e7989d1777b4c 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -20,10 +20,10 @@ sourceVersion = { major = "3"; minor = "13"; - patch = "5"; + patch = "6"; suffix = ""; }; - hash = "sha256-k+WD8kNFTm6eRYjKLCZiIGrZYWWYYyd6/NuWgBZH1kA="; + hash = "sha256-F7pVCIGdhzahT7/EfTbhhJRqh3hRsunEtsQ6y0SjsQQ="; }; }; @@ -105,37 +105,7 @@ inherit passthruFun; pythonAttr = "python3Minimal"; # strip down that python version as much as possible - openssl = null; - readline = null; - ncurses = null; - gdbm = null; - sqlite = null; - tzdata = null; - libuuid = null; - bzip2 = null; - libxcrypt = null; - xz = null; - zlib = null; - libffi = null; - stripConfig = true; - stripIdlelib = true; - stripTests = true; - stripTkinter = true; - rebuildBytecode = false; - stripBytecode = true; - includeSiteCustomize = false; - enableOptimizations = false; - enableLTO = false; - mimetypesSupport = false; - withExpat = false; - withMpdecimal = false; - /* - The actual 'allowedReferences' attribute is set inside the cpython derivation. - This is necessary in order to survive overrides of dependencies. - */ - allowedReferenceNames = [ - "bashNonInteractive" - ]; + withMinimalDeps = true; } // sources.python313 )).overrideAttrs diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix index 5e0fd0a00f911..58295fb55547f 100644 --- a/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "rubygems"; - version = "3.6.9"; + version = "3.7.1"; src = fetchurl { url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; - hash = "sha256-/91Gxq2+y52sVhzAA2ZkBu/S7ZPKIbX8xHBiAlAHIJ0="; + hash = "sha256-dQyMdxGA1B7SNYNE5UYe3ugxWMCoG3eZaaEzmWG8EWM="; }; patches = [ diff --git a/pkgs/development/interpreters/tcl/8.6.nix b/pkgs/development/interpreters/tcl/8.6.nix index 1c6217e79d527..2c3a57df6b818 100644 --- a/pkgs/development/interpreters/tcl/8.6.nix +++ b/pkgs/development/interpreters/tcl/8.6.nix @@ -4,13 +4,13 @@ callPackage ./generic.nix ( args // rec { release = "8.6"; - version = "${release}.15"; + version = "${release}.16"; # Note: when updating, the hash in pkgs/development/libraries/tk/8.6.nix must also be updated! src = fetchurl { url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz"; - sha256 = "sha256-hh4Vl1Py4vvW7BSEEDcVsL5WvjNXUiuFjTy7X4k//vE="; + hash = "sha256-kcuPphdxxjwmLvtVMFm3x61nV6+lhXr2Jl5LC9wqFKU="; }; } ) diff --git a/pkgs/development/libraries/agda/1lab/default.nix b/pkgs/development/libraries/agda/1lab/default.nix index 624d585960b84..4d5254a682245 100644 --- a/pkgs/development/libraries/agda/1lab/default.nix +++ b/pkgs/development/libraries/agda/1lab/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "1lab"; - version = "unstable-2024-08-05"; + version = "unstable-2025-07-01"; src = fetchFromGitHub { owner = "the1lab"; repo = pname; - rev = "7cc9bf7bbe90be5491e0d64da90a36afa29a540b"; - hash = "sha256-hOyf6ZzejDAFDRj6liFZsBc9bKdxV5bzTPP4kGXIhW0="; + rev = "e9c2ad2b3ba9cefad36e72cb9d732117c68ac862"; + hash = "sha256-wKh77+xCdfMtnq9jMlpdnEptGO+/WVNlQFa1TDbdUGs="; }; postPatch = '' @@ -23,19 +23,8 @@ mkDerivation rec { shopt -s globstar extglob files=(src/**/*.@(agda|lagda.md)) sed -Ei '/OPTIONS/s/ -v ?[^ #]+//g' "''${files[@]}" - - # Generate all-pages manually instead of building the build script. - mkdir -p _build - for f in "''${files[@]}"; do - f=''${f#src/} f=''${f%%.*} f=''${f//\//.} - echo "open import $f" - done > _build/all-pages.agda ''; - libraryName = "1lab"; - libraryFile = "1lab.agda-lib"; - everythingFile = "_build/all-pages.agda"; - meta = with lib; { description = "Formalised, cross-linked reference resource for mathematics done in Homotopy Type Theory "; homepage = src.meta.homepage; diff --git a/pkgs/development/libraries/agda/agda-categories/default.nix b/pkgs/development/libraries/agda/agda-categories/default.nix index 60a74c353f3ea..b59255e887f88 100644 --- a/pkgs/development/libraries/agda/agda-categories/default.nix +++ b/pkgs/development/libraries/agda/agda-categories/default.nix @@ -24,11 +24,6 @@ mkDerivation rec { # version update of the stdlib, so we get rid of the version constraint # altogether. sed -Ei 's/standard-library-[0-9.]+/standard-library/' agda-categories.agda-lib - - # The Makefile of agda-categories uses git(1) instead of find(1) to - # determine the list of source files. We cannot use git, as $PWD will not - # be a valid Git working directory. - find src -name '*.agda' | sed -e 's|^src/[/]*|import |' -e 's|/|.|g' -e 's/.agda//' -e '/import Everything/d' | LC_COLLATE='C' sort > Everything.agda ''; buildInputs = [ standard-library ]; diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix index 15f27998bec20..8cc002793456b 100644 --- a/pkgs/development/libraries/agda/agda-prelude/default.nix +++ b/pkgs/development/libraries/agda/agda-prelude/default.nix @@ -15,13 +15,6 @@ mkDerivation { hash = "sha256-ab+KojzRbkUTAFNH5OA78s0F5SUuXTbliai6badveg4="; }; - preConfigure = '' - cd test - make everything - mv Everything.agda .. - cd .. - ''; - meta = with lib; { homepage = "https://github.com/UlfNorell/agda-prelude"; description = "Programming library for Agda"; diff --git a/pkgs/development/libraries/agda/agdarsec/default.nix b/pkgs/development/libraries/agda/agdarsec/default.nix index 257172ad31782..876b3b271695c 100644 --- a/pkgs/development/libraries/agda/agdarsec/default.nix +++ b/pkgs/development/libraries/agda/agdarsec/default.nix @@ -16,13 +16,6 @@ mkDerivation rec { sha256 = "02fqkycvicw6m2xsz8p01aq8n3gj2d2gyx8sgj15l46f8434fy0x"; }; - everythingFile = "./index.agda"; - - includePaths = [ - "src" - "examples" - ]; - buildInputs = [ standard-library ]; meta = with lib; { diff --git a/pkgs/development/libraries/agda/cubical-mini/default.nix b/pkgs/development/libraries/agda/cubical-mini/default.nix index 8a04c7cefaa92..9e6d2475ca104 100644 --- a/pkgs/development/libraries/agda/cubical-mini/default.nix +++ b/pkgs/development/libraries/agda/cubical-mini/default.nix @@ -8,13 +8,13 @@ mkDerivation rec { pname = "cubical-mini"; - version = "nightly-20241214"; + version = "0.5-unstable-2025-06-13"; src = fetchFromGitHub { repo = pname; owner = "cmcmA20"; - rev = "ab18320018ddc0055db60d4bb5560d31909c5b78"; - hash = "sha256-32qXY9KbProdPwqHxSkwO74Oqx65rTzoXtH2SpRB3OM="; + rev = "1776874d13d0b811e6eeb70d0e5a52b4d2a978d2"; + hash = "sha256-UxWOS+uzP9aAaMdSueA2CAuzWkImGAoKxroarcgpk+w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/agda/cubical/default.nix b/pkgs/development/libraries/agda/cubical/default.nix index 5f2fd99a0b891..f328da072883c 100644 --- a/pkgs/development/libraries/agda/cubical/default.nix +++ b/pkgs/development/libraries/agda/cubical/default.nix @@ -2,29 +2,19 @@ lib, mkDerivation, fetchFromGitHub, - ghc, }: mkDerivation rec { pname = "cubical"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { repo = pname; owner = "agda"; rev = "v${version}"; - hash = "sha256-KwwN2g2naEo4/rKTz2L/0Guh5LxymEYP53XQzJ6eMjM="; + hash = "sha256-Lmzofq2rKFmfsAoH3zIFB2QLeUhFmIO44JsF+dDrubw="; }; - # The cubical library has several `Everything.agda` files, which are - # compiled through the make file they provide. - nativeBuildInputs = [ ghc ]; - buildPhase = '' - runHook preBuild - make - runHook postBuild - ''; - meta = with lib; { description = "Cubical type theory library for use with the Agda compiler"; homepage = src.meta.homepage; diff --git a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix index 40ec014ca1296..a2d5cae4f6f56 100644 --- a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix +++ b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix @@ -18,10 +18,6 @@ mkDerivation rec { sha256 = "sha256-3nme/eH4pY6bD0DkhL4Dj/Vp/WnZqkQtZTNk+n1oAyY="; }; - preConfigure = '' - sh generate-everything.sh - ''; - meta = with lib; { homepage = "https://github.com/ryanorendorff/functional-linear-algebra"; description = '' diff --git a/pkgs/development/libraries/agda/generics/default.nix b/pkgs/development/libraries/agda/generics/default.nix index 71219e334612c..e2eefb445e9d6 100644 --- a/pkgs/development/libraries/agda/generics/default.nix +++ b/pkgs/development/libraries/agda/generics/default.nix @@ -20,7 +20,10 @@ mkDerivation rec { standard-library ]; - # everythingFile = "./README.agda"; + # Agda expects a single .agda-lib file. + preBuild = '' + rm tests.agda-lib + ''; meta = with lib; { description = "Library for datatype-generic programming in Agda"; diff --git a/pkgs/development/libraries/agda/standard-library/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix index f05158d56a1cb..811f5a63c765e 100644 --- a/pkgs/development/libraries/agda/standard-library/default.nix +++ b/pkgs/development/libraries/agda/standard-library/default.nix @@ -2,29 +2,20 @@ lib, mkDerivation, fetchFromGitHub, - ghcWithPackages, nixosTests, }: mkDerivation rec { pname = "standard-library"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - hash = "sha256-/Fy5EOSbVNXt6Jq0yKSnlNPW4SYfn+eCTAYFnMZrbR0="; + hash = "sha256-JOeoek6OfyIk9vwTj5QUJU6LnRzwfiG0e0ysW6zbhZ8="; }; - nativeBuildInputs = [ (ghcWithPackages (self: [ self.filemanip ])) ]; - preConfigure = '' - runhaskell GenerateEverything.hs --include-deprecated - # We will only build/consider Everything.agda, in particular we don't want Everything*.agda - # do be copied to the store. - rm EverythingSafe.agda - ''; - passthru.tests = { inherit (nixosTests) agda; }; meta = with lib; { homepage = "https://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary"; diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 9d09f79243fa6..8eef520049e2b 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -10,7 +10,6 @@ fixDarwinDylibNames, libiconv, libxcrypt, - sanitiseHeaderPathsHook, makePkgconfigItem, copyPkgconfigItems, boost-build, @@ -348,7 +347,6 @@ stdenv.mkDerivation { which boost-build copyPkgconfigItems - sanitiseHeaderPathsHook ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ @@ -396,12 +394,6 @@ stdenv.mkDerivation { runHook postInstall ''; - preFixup = '' - # Strip UTF‐8 BOMs for `sanitiseHeaderPathsHook`. - cd "$dev" && find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \ - -exec sed '1s/^\xef\xbb\xbf//' -i '{}' \; - ''; - postFixup = lib.optionalString stdenv.hostPlatform.isMinGW '' $RANLIB "$out/lib/"*.a ''; diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 76bd9e39a938a..55b9915483095 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -134,7 +134,7 @@ withSrt ? withHeadlessDeps, # Secure Reliable Transport (SRT) protocol withSsh ? withHeadlessDeps, # SFTP protocol withSvg ? withFullDeps, # SVG protocol - withSvtav1 ? withHeadlessDeps && !stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isMinGW, # AV1 encoder/decoder (focused on speed and correctness) + withSvtav1 ? withHeadlessDeps && !stdenv.hostPlatform.isMinGW, # AV1 encoder/decoder (focused on speed and correctness) withTensorflow ? false, # Tensorflow dnn backend support (Increases closure size by ~390 MiB) withTheora ? withHeadlessDeps, # Theora encoder withTwolame ? withFullDeps, # MP2 encoding @@ -144,7 +144,7 @@ withVaapi ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD), # Vaapi hardware acceleration withVdpau ? withSmallDeps && !stdenv.hostPlatform.isMinGW, # Vdpau hardware acceleration withVidStab ? withHeadlessDeps && withGPL, # Video stabilization - withVmaf ? withFullDeps && !stdenv.hostPlatform.isAarch64 && lib.versionAtLeast version "5", # Netflix's VMAF (Video Multi-Method Assessment Fusion) + withVmaf ? withFullDeps && lib.versionAtLeast version "5", # Netflix's VMAF (Video Multi-Method Assessment Fusion) withVoAmrwbenc ? withFullDeps && withVersion3, # AMR-WB encoder withVorbis ? withHeadlessDeps, # Vorbis de/encoding, native encoder exists withVpl ? withFullDeps && stdenv.hostPlatform.isLinux, # Hardware acceleration via intel libvpl diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index e4d6aaf99037b..b789956dfe56f 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -87,14 +87,7 @@ in }; fmt_11 = generic { - version = "11.0.2"; - hash = "sha256-IKNt4xUoVi750zBti5iJJcCk3zivTt7nU12RIf8pM+0="; - patches = [ - (fetchpatch { - name = "get-rid-of-std-copy-fix-clang.patch"; - url = "https://github.com/fmtlib/fmt/commit/6e462b89aa22fd5f737ed162d0150e145ccb1914.patch"; - hash = "sha256-tRU1y1VCxtQ5J2yvFmwUx+YNcQs8izzLImD37KBiCFk="; - }) - ]; + version = "11.2.0"; + hash = "sha256-sAlU5L/olxQUYcv8euVYWTTB8TrVeQgXLHtXy8IMEnU="; }; } diff --git a/pkgs/development/libraries/glibc/2.40-master.patch b/pkgs/development/libraries/glibc/2.40-master.patch index c7885ead7b7f8..3384de16dc3b4 100644 --- a/pkgs/development/libraries/glibc/2.40-master.patch +++ b/pkgs/development/libraries/glibc/2.40-master.patch @@ -26216,3 +26216,17095 @@ index f9e3425e04..089c47b04b 100644 struct abort_msg_s *buf = __mmap (NULL, total, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0); + +commit aef8f8d6a947b290162393e1d717c7aee96fef8e +Author: H.J. Lu +Date: Tue Dec 17 18:41:45 2024 +0800 + + Hide all malloc functions from compiler [BZ #32366] + + Since -1 isn't a power of two, compiler may reject it, hide memalign from + Clang 19 which issues an error: + + tst-memalign.c:86:31: error: requested alignment is not a power of 2 [-Werror,-Wnon-power-of-two-alignment] + 86 | p = memalign (-1, pagesize); + | ^~ + tst-memalign.c:86:31: error: requested alignment must be 4294967296 bytes or smaller; maximum alignment assumed [-Werror,-Wbuiltin-assume-aligned-alignment] + 86 | p = memalign (-1, pagesize); + | ^~ + + Update tst-malloc-aux.h to hide all malloc functions and include it in + all malloc tests to prevent compiler from optimizing out any malloc + functions. + + Tested with Clang 19.1.5 and GCC 15 20241206 for BZ #32366. + + Signed-off-by: H.J. Lu + Reviewed-by: Sam James + (cherry picked from commit f9493a15ea9cfb63a815c00c23142369ec09d8ce) + +diff --git a/malloc/tst-mallinfo2.c b/malloc/tst-mallinfo2.c +index 2c02f5f700..f072b9f24b 100644 +--- a/malloc/tst-mallinfo2.c ++++ b/malloc/tst-mallinfo2.c +@@ -23,6 +23,8 @@ + #include + #include + ++#include "tst-malloc-aux.h" ++ + /* This is not specifically needed for the test, but (1) does + something to the data so gcc doesn't optimize it away, and (2) may + help when developing future tests. */ +diff --git a/malloc/tst-malloc-aux.h b/malloc/tst-malloc-aux.h +index 54908b4a24..3e1b61ce34 100644 +--- a/malloc/tst-malloc-aux.h ++++ b/malloc/tst-malloc-aux.h +@@ -22,20 +22,35 @@ + + #include + #include +- +-static void *(*volatile aligned_alloc_indirect)(size_t, size_t) = aligned_alloc; +-static void *(*volatile calloc_indirect)(size_t, size_t) = calloc; +-static void *(*volatile malloc_indirect)(size_t) = malloc; +-static void *(*volatile realloc_indirect)(void*, size_t) = realloc; ++#include ++ ++static __typeof (aligned_alloc) * volatile aligned_alloc_indirect ++ = aligned_alloc; ++static __typeof (calloc) * volatile calloc_indirect = calloc; ++static __typeof (malloc) * volatile malloc_indirect = malloc; ++static __typeof (memalign) * volatile memalign_indirect = memalign; ++static __typeof (posix_memalign) * volatile posix_memalign_indirect ++ = posix_memalign; ++static __typeof (pvalloc) * volatile pvalloc_indirect = pvalloc; ++static __typeof (realloc) * volatile realloc_indirect = realloc; ++static __typeof (valloc) * volatile valloc_indirect = valloc; + + #undef aligned_alloc + #undef calloc + #undef malloc ++#undef memalign ++#undef posix_memalign ++#undef pvalloc + #undef realloc ++#undef valloc + + #define aligned_alloc aligned_alloc_indirect + #define calloc calloc_indirect + #define malloc malloc_indirect ++#define memalign memalign_indirect ++#define posix_memalign posix_memalign_indirect ++#define pvalloc pvalloc_indirect + #define realloc realloc_indirect ++#define valloc valloc_indirect + + #endif /* TST_MALLOC_AUX_H */ +diff --git a/malloc/tst-malloc-backtrace.c b/malloc/tst-malloc-backtrace.c +index c7b1d65e5c..65fa91f6fd 100644 +--- a/malloc/tst-malloc-backtrace.c ++++ b/malloc/tst-malloc-backtrace.c +@@ -22,6 +22,8 @@ + #include + #include + ++#include "tst-malloc-aux.h" ++ + #define SIZE 4096 + + /* Wrap free with a function to prevent gcc from optimizing it out. */ +diff --git a/malloc/tst-memalign.c b/malloc/tst-memalign.c +index 563f6413d2..ac9770d3f9 100644 +--- a/malloc/tst-memalign.c ++++ b/malloc/tst-memalign.c +@@ -23,6 +23,8 @@ + #include + #include + ++#include "tst-malloc-aux.h" ++ + static int errors = 0; + + static void +diff --git a/malloc/tst-safe-linking.c b/malloc/tst-safe-linking.c +index 01dd07004d..63a7e2bc8e 100644 +--- a/malloc/tst-safe-linking.c ++++ b/malloc/tst-safe-linking.c +@@ -26,6 +26,8 @@ + #include + #include + ++#include "tst-malloc-aux.h" ++ + /* Run CALLBACK and check that the data on standard error equals + EXPECTED. */ + static void +diff --git a/malloc/tst-valloc.c b/malloc/tst-valloc.c +index 9bab8c6470..0243d3dfd4 100644 +--- a/malloc/tst-valloc.c ++++ b/malloc/tst-valloc.c +@@ -23,6 +23,8 @@ + #include + #include + ++#include "tst-malloc-aux.h" ++ + static int errors = 0; + + static void + +commit be48b8f6ad0ec6d0d6b1d2f45eb59bf8e8c67dd7 +Author: Sam James +Date: Fri Jan 10 03:03:47 2025 +0000 + + malloc: obscure calloc use in tst-calloc + + Similar to a9944a52c967ce76a5894c30d0274b824df43c7a and + f9493a15ea9cfb63a815c00c23142369ec09d8ce, we need to hide calloc use from + the compiler to accommodate GCC's r15-6566-g804e9d55d9e54c change. + + First, include tst-malloc-aux.h, but then use `volatile` variables + for size. + + The test passes without the tst-malloc-aux.h change but IMO we want + it there for consistency and to avoid future problems (possibly silent). + + Reviewed-by: H.J. Lu + (cherry picked from commit c3d1dac96bdd10250aa37bb367d5ef8334a093a1) + +diff --git a/malloc/tst-calloc.c b/malloc/tst-calloc.c +index 01f17f9e65..5a8c7ab121 100644 +--- a/malloc/tst-calloc.c ++++ b/malloc/tst-calloc.c +@@ -23,6 +23,7 @@ + #include + #include + ++#include "tst-malloc-aux.h" + + /* Number of samples per size. */ + #define N 50000 +@@ -94,16 +95,19 @@ random_test (void) + static void + null_test (void) + { ++ /* Obscure allocation size from the compiler. */ ++ volatile size_t max_size = UINT_MAX; ++ volatile size_t zero_size = 0; + /* If the size is 0 the result is implementation defined. Just make + sure the program doesn't crash. The result of calloc is + deliberately ignored, so do not warn about that. */ + DIAG_PUSH_NEEDS_COMMENT; + DIAG_IGNORE_NEEDS_COMMENT (10, "-Wunused-result"); + calloc (0, 0); +- calloc (0, UINT_MAX); +- calloc (UINT_MAX, 0); +- calloc (0, ~((size_t) 0)); +- calloc (~((size_t) 0), 0); ++ calloc (0, max_size); ++ calloc (max_size, 0); ++ calloc (0, ~((size_t) zero_size)); ++ calloc (~((size_t) zero_size), 0); + DIAG_POP_NEEDS_COMMENT; + } + + +commit 85668221974db44459527e04d04f77ca8f8e3115 +Author: H.J. Lu +Date: Fri Jan 24 18:53:13 2025 +0800 + + stdlib: Test using setenv with updated environ [BZ #32588] + + Add a test for setenv with updated environ. Verify that BZ #32588 is + fixed. + + Signed-off-by: H.J. Lu + Reviewed-by: Florian Weimer + (cherry picked from commit 8ab34497de14e35aff09b607222fe1309ef156da) + +diff --git a/stdlib/Makefile b/stdlib/Makefile +index 8213fa83ef..d3a84fa641 100644 +--- a/stdlib/Makefile ++++ b/stdlib/Makefile +@@ -307,6 +307,7 @@ tests := \ + tst-setcontext9 \ + tst-setcontext10 \ + tst-setcontext11 \ ++ tst-setenv-environ \ + tst-stdbit-Wconversion \ + tst-stdbit-builtins \ + tst-stdc_bit_ceil \ +diff --git a/stdlib/tst-setenv-environ.c b/stdlib/tst-setenv-environ.c +new file mode 100644 +index 0000000000..02fcef96d0 +--- /dev/null ++++ b/stdlib/tst-setenv-environ.c +@@ -0,0 +1,36 @@ ++/* Test using setenv with updated environ. ++ Copyright (C) 2025 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++ ++extern char **environ; ++ ++int ++do_test (void) ++{ ++ char *valp; ++ static char *dummy_environ[] = { NULL }; ++ environ = dummy_environ; ++ setenv ("A", "1", 0); ++ valp = getenv ("A"); ++ TEST_VERIFY_EXIT (valp[0] == '1' && valp[1] == '\0'); ++ return 0; ++} ++ ++#include + +commit e899ca3651f8c5e01bf3420cfb34aad97d093f74 +Author: John David Anglin +Date: Wed Jan 29 16:51:16 2025 -0500 + + nptl: Correct stack size attribute when stack grows up [BZ #32574] + + Set stack size attribute to the size of the mmap'd region only + when the size of the remaining stack space is less than the size + of the mmap'd region. + + This was reversed. As a result, the initial stack size was only + 135168 bytes. On architectures where the stack grows down, the + initial stack size is approximately 8384512 bytes with the default + rlimit settings. The small main stack size on hppa broke + applications like ruby that check for stack overflows. + + Signed-off-by: John David Anglin + +diff --git a/nptl/pthread_getattr_np.c b/nptl/pthread_getattr_np.c +index 1e91874767..3ce34437bc 100644 +--- a/nptl/pthread_getattr_np.c ++++ b/nptl/pthread_getattr_np.c +@@ -145,9 +145,9 @@ __pthread_getattr_np (pthread_t thread_id, pthread_attr_t *attr) + > (size_t) iattr->stackaddr - last_to) + iattr->stacksize = (size_t) iattr->stackaddr - last_to; + #else +- /* The limit might be too high. */ ++ /* The limit might be too low. */ + if ((size_t) iattr->stacksize +- > to - (size_t) iattr->stackaddr) ++ < to - (size_t) iattr->stackaddr) + iattr->stacksize = to - (size_t) iattr->stackaddr; + #endif + /* We succeed and no need to look further. */ + +commit d6c156c326999f144cb5b73d29982108d549ad8a +Author: Siddhesh Poyarekar +Date: Fri Jan 31 12:16:30 2025 -0500 + + assert: Add test for CVE-2025-0395 + + Use the __progname symbol to override the program name to induce the + failure that CVE-2025-0395 describes. + + This is related to BZ #32582 + + Signed-off-by: Siddhesh Poyarekar + Reviewed-by: Adhemerval Zanella + (cherry picked from commit cdb9ba84191ce72e86346fb8b1d906e7cd930ea2) + +diff --git a/assert/Makefile b/assert/Makefile +index 35dc908ddb..c0fe660bd6 100644 +--- a/assert/Makefile ++++ b/assert/Makefile +@@ -38,6 +38,7 @@ tests := \ + test-assert-perr \ + tst-assert-c++ \ + tst-assert-g++ \ ++ tst-assert-sa-2025-0001 \ + # tests + + ifeq ($(have-cxx-thread_local),yes) +diff --git a/assert/tst-assert-sa-2025-0001.c b/assert/tst-assert-sa-2025-0001.c +new file mode 100644 +index 0000000000..102cb0078d +--- /dev/null ++++ b/assert/tst-assert-sa-2025-0001.c +@@ -0,0 +1,92 @@ ++/* Test for CVE-2025-0395. ++ Copyright The GNU Toolchain Authors. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++/* Test that a large enough __progname does not result in a buffer overflow ++ when printing an assertion failure. This was CVE-2025-0395. */ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++extern const char *__progname; ++ ++int ++do_test (int argc, char **argv) ++{ ++ ++ support_need_proc ("Reads /proc/self/maps to add guards to writable maps."); ++ ignore_stderr (); ++ ++ /* XXX assumes that the assert is on a 2 digit line number. */ ++ const char *prompt = ": %s:99: do_test: Assertion `argc < 1' failed.\n"; ++ ++ int ret = fprintf (stderr, prompt, __FILE__); ++ if (ret < 0) ++ FAIL_EXIT1 ("fprintf failed: %m\n"); ++ ++ size_t pagesize = getpagesize (); ++ size_t namesize = pagesize - 1 - ret; ++ ++ /* Alter the progname so that the assert message fills the entire page. */ ++ char progname[namesize]; ++ memset (progname, 'A', namesize - 1); ++ progname[namesize - 1] = '\0'; ++ __progname = progname; ++ ++ FILE *f = xfopen ("/proc/self/maps", "r"); ++ char *line = NULL; ++ size_t len = 0; ++ uintptr_t prev_to = 0; ++ ++ /* Pad the beginning of every writable mapping with a PROT_NONE map. This ++ ensures that the mmap in the assert_fail path never ends up below a ++ writable map and will terminate immediately in case of a buffer ++ overflow. */ ++ while (xgetline (&line, &len, f)) ++ { ++ uintptr_t from, to; ++ char perm[4]; ++ ++ sscanf (line, "%" SCNxPTR "-%" SCNxPTR " %c%c%c%c ", ++ &from, &to, ++ &perm[0], &perm[1], &perm[2], &perm[3]); ++ ++ bool writable = (memchr (perm, 'w', 4) != NULL); ++ ++ if (prev_to != 0 && from - prev_to > pagesize && writable) ++ xmmap ((void *) from - pagesize, pagesize, PROT_NONE, ++ MAP_ANONYMOUS | MAP_PRIVATE, 0); ++ ++ prev_to = to; ++ } ++ ++ xfclose (f); ++ ++ assert (argc < 1); ++ return 0; ++} ++ ++#define EXPECTED_SIGNAL SIGABRT ++#define TEST_FUNCTION_ARGV do_test ++#include + +commit 523f85558152a1b9cced6d669f758c27677775ba +Author: John David Anglin +Date: Tue Feb 25 15:57:53 2025 -0500 + + math: Add optimization barrier to ensure a1 + u.d is not reused [BZ #30664] + + A number of fma tests started to fail on hppa when gcc was changed to + use Ranger rather than EVRP. Eventually I found that the value of + a1 + u.d in this is block of code was being computed in FE_TOWARDZERO + mode and not the original rounding mode: + + if (TININESS_AFTER_ROUNDING) + { + w.d = a1 + u.d; + if (w.ieee.exponent == 109) + return w.d * 0x1p-108; + } + + This caused the exponent value to be wrong and the wrong return path + to be used. + + Here we add an optimization barrier after the rounding mode is reset + to ensure that the previous value of a1 + u.d is not reused. + + Signed-off-by: John David Anglin + +diff --git a/sysdeps/ieee754/dbl-64/s_fma.c b/sysdeps/ieee754/dbl-64/s_fma.c +index c5f5abdc68..79a3cd721d 100644 +--- a/sysdeps/ieee754/dbl-64/s_fma.c ++++ b/sysdeps/ieee754/dbl-64/s_fma.c +@@ -244,6 +244,9 @@ __fma (double x, double y, double z) + /* Reset rounding mode and test for inexact simultaneously. */ + int j = libc_feupdateenv_test (&env, FE_INEXACT) != 0; + ++ /* Ensure value of a1 + u.d is not reused. */ ++ a1 = math_opt_barrier (a1); ++ + if (__glibc_likely (adjust == 0)) + { + if ((u.ieee.mantissa1 & 1) == 0 && u.ieee.exponent != 0x7ff) + +commit ff10623706ea0096f3af7b38a3330ffb7fb15ae7 +Author: Joe Ramsay +Date: Mon Sep 9 13:00:01 2024 +0100 + + aarch64: Avoid redundant MOVs in AdvSIMD F32 logs + + Since the last operation is destructive, the first argument to the FMA + also has to be the first argument to the special-case in order to + avoid unnecessary MOVs. Reorder arguments and adjust special-case + bounds to facilitate this. + + Reviewed-by: Wilco Dijkstra + (cherry picked from commit 8b09af572b208bfde4d31c6abbae047dcc217675) + +diff --git a/sysdeps/aarch64/fpu/log10f_advsimd.c b/sysdeps/aarch64/fpu/log10f_advsimd.c +index 9347422a77..82228b599a 100644 +--- a/sysdeps/aarch64/fpu/log10f_advsimd.c ++++ b/sysdeps/aarch64/fpu/log10f_advsimd.c +@@ -22,11 +22,11 @@ + + static const struct data + { +- uint32x4_t min_norm; ++ uint32x4_t off, offset_lower_bound; + uint16x8_t special_bound; ++ uint32x4_t mantissa_mask; + float32x4_t poly[8]; + float32x4_t inv_ln10, ln2; +- uint32x4_t off, mantissa_mask; + } data = { + /* Use order 9 for log10(1+x), i.e. order 8 for log10(1+x)/x, with x in + [-1/3, 1/3] (offset=2/3). Max. relative error: 0x1.068ee468p-25. */ +@@ -35,18 +35,22 @@ static const struct data + V4 (-0x1.0fc92cp-4f), V4 (0x1.f5f76ap-5f) }, + .ln2 = V4 (0x1.62e43p-1f), + .inv_ln10 = V4 (0x1.bcb7b2p-2f), +- .min_norm = V4 (0x00800000), +- .special_bound = V8 (0x7f00), /* asuint32(inf) - min_norm. */ ++ /* Lower bound is the smallest positive normal float 0x00800000. For ++ optimised register use subnormals are detected after offset has been ++ subtracted, so lower bound is 0x0080000 - offset (which wraps around). */ ++ .offset_lower_bound = V4 (0x00800000 - 0x3f2aaaab), ++ .special_bound = V8 (0x7f00), /* top16(asuint32(inf) - 0x00800000). */ + .off = V4 (0x3f2aaaab), /* 0.666667. */ + .mantissa_mask = V4 (0x007fffff), + }; + + static float32x4_t VPCS_ATTR NOINLINE +-special_case (float32x4_t x, float32x4_t y, float32x4_t p, float32x4_t r2, +- uint16x4_t cmp) ++special_case (float32x4_t y, uint32x4_t u_off, float32x4_t p, float32x4_t r2, ++ uint16x4_t cmp, const struct data *d) + { + /* Fall back to scalar code. */ +- return v_call_f32 (log10f, x, vfmaq_f32 (y, p, r2), vmovl_u16 (cmp)); ++ return v_call_f32 (log10f, vreinterpretq_f32_u32 (vaddq_u32 (u_off, d->off)), ++ vfmaq_f32 (y, p, r2), vmovl_u16 (cmp)); + } + + /* Fast implementation of AdvSIMD log10f, +@@ -58,15 +62,21 @@ special_case (float32x4_t x, float32x4_t y, float32x4_t p, float32x4_t r2, + float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (log10) (float32x4_t x) + { + const struct data *d = ptr_barrier (&data); +- uint32x4_t u = vreinterpretq_u32_f32 (x); +- uint16x4_t special = vcge_u16 (vsubhn_u32 (u, d->min_norm), +- vget_low_u16 (d->special_bound)); ++ ++ /* To avoid having to mov x out of the way, keep u after offset has been ++ applied, and recover x by adding the offset back in the special-case ++ handler. */ ++ uint32x4_t u_off = vreinterpretq_u32_f32 (x); + + /* x = 2^n * (1+r), where 2/3 < 1+r < 4/3. */ +- u = vsubq_u32 (u, d->off); ++ u_off = vsubq_u32 (u_off, d->off); + float32x4_t n = vcvtq_f32_s32 ( +- vshrq_n_s32 (vreinterpretq_s32_u32 (u), 23)); /* signextend. */ +- u = vaddq_u32 (vandq_u32 (u, d->mantissa_mask), d->off); ++ vshrq_n_s32 (vreinterpretq_s32_u32 (u_off), 23)); /* signextend. */ ++ ++ uint16x4_t special = vcge_u16 (vsubhn_u32 (u_off, d->offset_lower_bound), ++ vget_low_u16 (d->special_bound)); ++ ++ uint32x4_t u = vaddq_u32 (vandq_u32 (u_off, d->mantissa_mask), d->off); + float32x4_t r = vsubq_f32 (vreinterpretq_f32_u32 (u), v_f32 (1.0f)); + + /* y = log10(1+r) + n * log10(2). */ +@@ -77,7 +87,7 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (log10) (float32x4_t x) + y = vmulq_f32 (y, d->inv_ln10); + + if (__glibc_unlikely (v_any_u16h (special))) +- return special_case (x, y, poly, r2, special); ++ return special_case (y, u_off, poly, r2, special, d); + return vfmaq_f32 (y, poly, r2); + } + libmvec_hidden_def (V_NAME_F1 (log10)) +diff --git a/sysdeps/aarch64/fpu/log2f_advsimd.c b/sysdeps/aarch64/fpu/log2f_advsimd.c +index db21836749..84effe4fe9 100644 +--- a/sysdeps/aarch64/fpu/log2f_advsimd.c ++++ b/sysdeps/aarch64/fpu/log2f_advsimd.c +@@ -22,9 +22,9 @@ + + static const struct data + { +- uint32x4_t min_norm; ++ uint32x4_t off, offset_lower_bound; + uint16x8_t special_bound; +- uint32x4_t off, mantissa_mask; ++ uint32x4_t mantissa_mask; + float32x4_t poly[9]; + } data = { + /* Coefficients generated using Remez algorithm approximate +@@ -34,18 +34,22 @@ static const struct data + V4 (-0x1.715458p-1f), V4 (0x1.ec701cp-2f), V4 (-0x1.7171a4p-2f), + V4 (0x1.27a0b8p-2f), V4 (-0x1.e5143ep-3f), V4 (0x1.9d8ecap-3f), + V4 (-0x1.c675bp-3f), V4 (0x1.9e495p-3f) }, +- .min_norm = V4 (0x00800000), +- .special_bound = V8 (0x7f00), /* asuint32(inf) - min_norm. */ ++ /* Lower bound is the smallest positive normal float 0x00800000. For ++ optimised register use subnormals are detected after offset has been ++ subtracted, so lower bound is 0x0080000 - offset (which wraps around). */ ++ .offset_lower_bound = V4 (0x00800000 - 0x3f2aaaab), ++ .special_bound = V8 (0x7f00), /* top16(asuint32(inf) - 0x00800000). */ + .off = V4 (0x3f2aaaab), /* 0.666667. */ + .mantissa_mask = V4 (0x007fffff), + }; + + static float32x4_t VPCS_ATTR NOINLINE +-special_case (float32x4_t x, float32x4_t n, float32x4_t p, float32x4_t r, +- uint16x4_t cmp) ++special_case (float32x4_t n, uint32x4_t u_off, float32x4_t p, float32x4_t r, ++ uint16x4_t cmp, const struct data *d) + { + /* Fall back to scalar code. */ +- return v_call_f32 (log2f, x, vfmaq_f32 (n, p, r), vmovl_u16 (cmp)); ++ return v_call_f32 (log2f, vreinterpretq_f32_u32 (vaddq_u32 (u_off, d->off)), ++ vfmaq_f32 (n, p, r), vmovl_u16 (cmp)); + } + + /* Fast implementation for single precision AdvSIMD log2, +@@ -56,15 +60,21 @@ special_case (float32x4_t x, float32x4_t n, float32x4_t p, float32x4_t r, + float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (log2) (float32x4_t x) + { + const struct data *d = ptr_barrier (&data); +- uint32x4_t u = vreinterpretq_u32_f32 (x); +- uint16x4_t special = vcge_u16 (vsubhn_u32 (u, d->min_norm), +- vget_low_u16 (d->special_bound)); ++ ++ /* To avoid having to mov x out of the way, keep u after offset has been ++ applied, and recover x by adding the offset back in the special-case ++ handler. */ ++ uint32x4_t u_off = vreinterpretq_u32_f32 (x); + + /* x = 2^n * (1+r), where 2/3 < 1+r < 4/3. */ +- u = vsubq_u32 (u, d->off); ++ u_off = vsubq_u32 (u_off, d->off); + float32x4_t n = vcvtq_f32_s32 ( +- vshrq_n_s32 (vreinterpretq_s32_u32 (u), 23)); /* signextend. */ +- u = vaddq_u32 (vandq_u32 (u, d->mantissa_mask), d->off); ++ vshrq_n_s32 (vreinterpretq_s32_u32 (u_off), 23)); /* signextend. */ ++ ++ uint16x4_t special = vcge_u16 (vsubhn_u32 (u_off, d->offset_lower_bound), ++ vget_low_u16 (d->special_bound)); ++ ++ uint32x4_t u = vaddq_u32 (vandq_u32 (u_off, d->mantissa_mask), d->off); + float32x4_t r = vsubq_f32 (vreinterpretq_f32_u32 (u), v_f32 (1.0f)); + + /* y = log2(1+r) + n. */ +@@ -72,7 +82,7 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (log2) (float32x4_t x) + float32x4_t p = v_pw_horner_8_f32 (r, r2, d->poly); + + if (__glibc_unlikely (v_any_u16h (special))) +- return special_case (x, n, p, r, special); ++ return special_case (n, u_off, p, r, special, d); + return vfmaq_f32 (n, p, r); + } + libmvec_hidden_def (V_NAME_F1 (log2)) +diff --git a/sysdeps/aarch64/fpu/logf_advsimd.c b/sysdeps/aarch64/fpu/logf_advsimd.c +index 3c0d0fcdc7..c20dbfd6c0 100644 +--- a/sysdeps/aarch64/fpu/logf_advsimd.c ++++ b/sysdeps/aarch64/fpu/logf_advsimd.c +@@ -21,20 +21,22 @@ + + static const struct data + { +- uint32x4_t min_norm; ++ uint32x4_t off, offset_lower_bound; + uint16x8_t special_bound; ++ uint32x4_t mantissa_mask; + float32x4_t poly[7]; +- float32x4_t ln2, tiny_bound; +- uint32x4_t off, mantissa_mask; ++ float32x4_t ln2; + } data = { + /* 3.34 ulp error. */ + .poly = { V4 (-0x1.3e737cp-3f), V4 (0x1.5a9aa2p-3f), V4 (-0x1.4f9934p-3f), + V4 (0x1.961348p-3f), V4 (-0x1.00187cp-2f), V4 (0x1.555d7cp-2f), + V4 (-0x1.ffffc8p-2f) }, + .ln2 = V4 (0x1.62e43p-1f), +- .tiny_bound = V4 (0x1p-126), +- .min_norm = V4 (0x00800000), +- .special_bound = V8 (0x7f00), /* asuint32(inf) - min_norm. */ ++ /* Lower bound is the smallest positive normal float 0x00800000. For ++ optimised register use subnormals are detected after offset has been ++ subtracted, so lower bound is 0x0080000 - offset (which wraps around). */ ++ .offset_lower_bound = V4 (0x00800000 - 0x3f2aaaab), ++ .special_bound = V8 (0x7f00), /* top16(asuint32(inf) - 0x00800000). */ + .off = V4 (0x3f2aaaab), /* 0.666667. */ + .mantissa_mask = V4 (0x007fffff) + }; +@@ -42,32 +44,37 @@ static const struct data + #define P(i) d->poly[7 - i] + + static float32x4_t VPCS_ATTR NOINLINE +-special_case (float32x4_t x, float32x4_t y, float32x4_t r2, float32x4_t p, +- uint16x4_t cmp) ++special_case (float32x4_t p, uint32x4_t u_off, float32x4_t y, float32x4_t r2, ++ uint16x4_t cmp, const struct data *d) + { + /* Fall back to scalar code. */ +- return v_call_f32 (logf, x, vfmaq_f32 (p, y, r2), vmovl_u16 (cmp)); ++ return v_call_f32 (logf, vreinterpretq_f32_u32 (vaddq_u32 (u_off, d->off)), ++ vfmaq_f32 (p, y, r2), vmovl_u16 (cmp)); + } + + float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (log) (float32x4_t x) + { + const struct data *d = ptr_barrier (&data); + float32x4_t n, p, q, r, r2, y; +- uint32x4_t u; ++ uint32x4_t u, u_off; + uint16x4_t cmp; + +- u = vreinterpretq_u32_f32 (x); +- cmp = vcge_u16 (vsubhn_u32 (u, d->min_norm), +- vget_low_u16 (d->special_bound)); ++ /* To avoid having to mov x out of the way, keep u after offset has been ++ applied, and recover x by adding the offset back in the special-case ++ handler. */ ++ u_off = vreinterpretq_u32_f32 (x); + + /* x = 2^n * (1+r), where 2/3 < 1+r < 4/3. */ +- u = vsubq_u32 (u, d->off); ++ u_off = vsubq_u32 (u_off, d->off); + n = vcvtq_f32_s32 ( +- vshrq_n_s32 (vreinterpretq_s32_u32 (u), 23)); /* signextend. */ +- u = vandq_u32 (u, d->mantissa_mask); ++ vshrq_n_s32 (vreinterpretq_s32_u32 (u_off), 23)); /* signextend. */ ++ u = vandq_u32 (u_off, d->mantissa_mask); + u = vaddq_u32 (u, d->off); + r = vsubq_f32 (vreinterpretq_f32_u32 (u), v_f32 (1.0f)); + ++ cmp = vcge_u16 (vsubhn_u32 (u_off, d->offset_lower_bound), ++ vget_low_u16 (d->special_bound)); ++ + /* y = log(1+r) + n*ln2. */ + r2 = vmulq_f32 (r, r); + /* n*ln2 + r + r2*(P1 + r*P2 + r2*(P3 + r*P4 + r2*(P5 + r*P6 + r2*P7))). */ +@@ -80,7 +87,7 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (log) (float32x4_t x) + p = vfmaq_f32 (r, d->ln2, n); + + if (__glibc_unlikely (v_any_u16h (cmp))) +- return special_case (x, y, r2, p, cmp); ++ return special_case (p, u_off, y, r2, cmp, d); + return vfmaq_f32 (p, y, r2); + } + libmvec_hidden_def (V_NAME_F1 (log)) + +commit a991a0fc7c051d7ef2ea7778e0a699f22d4e53d7 +Author: Joe Ramsay +Date: Thu Sep 19 17:34:02 2024 +0100 + + AArch64: Add vector logp1 alias for log1p + + This enables vectorisation of C23 logp1, which is an alias for log1p. + There are no new tests or ulp entries because the new symbols are simply + aliases. + + Reviewed-by: Wilco Dijkstra + (cherry picked from commit 751a5502bea1d13551c62c47bb9bd25bff870cda) + +diff --git a/bits/libm-simd-decl-stubs.h b/bits/libm-simd-decl-stubs.h +index 08a41c46ad..5019e8e25c 100644 +--- a/bits/libm-simd-decl-stubs.h ++++ b/bits/libm-simd-decl-stubs.h +@@ -253,6 +253,17 @@ + #define __DECL_SIMD_log1pf64x + #define __DECL_SIMD_log1pf128x + ++#define __DECL_SIMD_logp1 ++#define __DECL_SIMD_logp1f ++#define __DECL_SIMD_logp1l ++#define __DECL_SIMD_logp1f16 ++#define __DECL_SIMD_logp1f32 ++#define __DECL_SIMD_logp1f64 ++#define __DECL_SIMD_logp1f128 ++#define __DECL_SIMD_logp1f32x ++#define __DECL_SIMD_logp1f64x ++#define __DECL_SIMD_logp1f128x ++ + #define __DECL_SIMD_atanh + #define __DECL_SIMD_atanhf + #define __DECL_SIMD_atanhl +diff --git a/math/bits/mathcalls.h b/math/bits/mathcalls.h +index 6cb594b6ff..92856becc4 100644 +--- a/math/bits/mathcalls.h ++++ b/math/bits/mathcalls.h +@@ -126,7 +126,7 @@ __MATHCALL (log2p1,, (_Mdouble_ __x)); + __MATHCALL (log10p1,, (_Mdouble_ __x)); + + /* Return log(1 + X). */ +-__MATHCALL (logp1,, (_Mdouble_ __x)); ++__MATHCALL_VEC (logp1,, (_Mdouble_ __x)); + #endif + + #if defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99 +diff --git a/sysdeps/aarch64/fpu/Versions b/sysdeps/aarch64/fpu/Versions +index cc15ce2d1e..015211f5f4 100644 +--- a/sysdeps/aarch64/fpu/Versions ++++ b/sysdeps/aarch64/fpu/Versions +@@ -135,4 +135,11 @@ libmvec { + _ZGVsMxv_tanh; + _ZGVsMxv_tanhf; + } ++ GLIBC_2.41 { ++ _ZGVnN2v_logp1; ++ _ZGVnN2v_logp1f; ++ _ZGVnN4v_logp1f; ++ _ZGVsMxv_logp1; ++ _ZGVsMxv_logp1f; ++ } + } +diff --git a/sysdeps/aarch64/fpu/advsimd_f32_protos.h b/sysdeps/aarch64/fpu/advsimd_f32_protos.h +index 097d403ffe..5909bb4ce9 100644 +--- a/sysdeps/aarch64/fpu/advsimd_f32_protos.h ++++ b/sysdeps/aarch64/fpu/advsimd_f32_protos.h +@@ -36,6 +36,7 @@ libmvec_hidden_proto (V_NAME_F2(hypot)); + libmvec_hidden_proto (V_NAME_F1(log10)); + libmvec_hidden_proto (V_NAME_F1(log1p)); + libmvec_hidden_proto (V_NAME_F1(log2)); ++libmvec_hidden_proto (V_NAME_F1(logp1)); + libmvec_hidden_proto (V_NAME_F1(log)); + libmvec_hidden_proto (V_NAME_F2(pow)); + libmvec_hidden_proto (V_NAME_F1(sin)); +diff --git a/sysdeps/aarch64/fpu/bits/math-vector.h b/sysdeps/aarch64/fpu/bits/math-vector.h +index 7484150131..f295fe185d 100644 +--- a/sysdeps/aarch64/fpu/bits/math-vector.h ++++ b/sysdeps/aarch64/fpu/bits/math-vector.h +@@ -113,6 +113,10 @@ + # define __DECL_SIMD_log2 __DECL_SIMD_aarch64 + # undef __DECL_SIMD_log2f + # define __DECL_SIMD_log2f __DECL_SIMD_aarch64 ++# undef __DECL_SIMD_logp1 ++# define __DECL_SIMD_logp1 __DECL_SIMD_aarch64 ++# undef __DECL_SIMD_logp1f ++# define __DECL_SIMD_logp1f __DECL_SIMD_aarch64 + # undef __DECL_SIMD_pow + # define __DECL_SIMD_pow __DECL_SIMD_aarch64 + # undef __DECL_SIMD_powf +@@ -180,6 +184,7 @@ __vpcs __f32x4_t _ZGVnN4v_logf (__f32x4_t); + __vpcs __f32x4_t _ZGVnN4v_log10f (__f32x4_t); + __vpcs __f32x4_t _ZGVnN4v_log1pf (__f32x4_t); + __vpcs __f32x4_t _ZGVnN4v_log2f (__f32x4_t); ++__vpcs __f32x4_t _ZGVnN4v_logp1f (__f32x4_t); + __vpcs __f32x4_t _ZGVnN4vv_powf (__f32x4_t, __f32x4_t); + __vpcs __f32x4_t _ZGVnN4v_sinf (__f32x4_t); + __vpcs __f32x4_t _ZGVnN4v_sinhf (__f32x4_t); +@@ -207,6 +212,7 @@ __vpcs __f64x2_t _ZGVnN2v_log (__f64x2_t); + __vpcs __f64x2_t _ZGVnN2v_log10 (__f64x2_t); + __vpcs __f64x2_t _ZGVnN2v_log1p (__f64x2_t); + __vpcs __f64x2_t _ZGVnN2v_log2 (__f64x2_t); ++__vpcs __f64x2_t _ZGVnN2v_logp1 (__f64x2_t); + __vpcs __f64x2_t _ZGVnN2vv_pow (__f64x2_t, __f64x2_t); + __vpcs __f64x2_t _ZGVnN2v_sin (__f64x2_t); + __vpcs __f64x2_t _ZGVnN2v_sinh (__f64x2_t); +@@ -239,6 +245,7 @@ __sv_f32_t _ZGVsMxv_logf (__sv_f32_t, __sv_bool_t); + __sv_f32_t _ZGVsMxv_log10f (__sv_f32_t, __sv_bool_t); + __sv_f32_t _ZGVsMxv_log1pf (__sv_f32_t, __sv_bool_t); + __sv_f32_t _ZGVsMxv_log2f (__sv_f32_t, __sv_bool_t); ++__sv_f32_t _ZGVsMxv_logp1f (__sv_f32_t, __sv_bool_t); + __sv_f32_t _ZGVsMxvv_powf (__sv_f32_t, __sv_f32_t, __sv_bool_t); + __sv_f32_t _ZGVsMxv_sinf (__sv_f32_t, __sv_bool_t); + __sv_f32_t _ZGVsMxv_sinhf (__sv_f32_t, __sv_bool_t); +@@ -266,6 +273,7 @@ __sv_f64_t _ZGVsMxv_log (__sv_f64_t, __sv_bool_t); + __sv_f64_t _ZGVsMxv_log10 (__sv_f64_t, __sv_bool_t); + __sv_f64_t _ZGVsMxv_log1p (__sv_f64_t, __sv_bool_t); + __sv_f64_t _ZGVsMxv_log2 (__sv_f64_t, __sv_bool_t); ++__sv_f64_t _ZGVsMxv_logp1 (__sv_f64_t, __sv_bool_t); + __sv_f64_t _ZGVsMxvv_pow (__sv_f64_t, __sv_f64_t, __sv_bool_t); + __sv_f64_t _ZGVsMxv_sin (__sv_f64_t, __sv_bool_t); + __sv_f64_t _ZGVsMxv_sinh (__sv_f64_t, __sv_bool_t); +diff --git a/sysdeps/aarch64/fpu/log1p_advsimd.c b/sysdeps/aarch64/fpu/log1p_advsimd.c +index ffc418fc9c..114064c696 100644 +--- a/sysdeps/aarch64/fpu/log1p_advsimd.c ++++ b/sysdeps/aarch64/fpu/log1p_advsimd.c +@@ -127,3 +127,5 @@ VPCS_ATTR float64x2_t V_NAME_D1 (log1p) (float64x2_t x) + + return vfmaq_f64 (y, f2, p); + } ++ ++strong_alias (V_NAME_D1 (log1p), V_NAME_D1 (logp1)) +diff --git a/sysdeps/aarch64/fpu/log1p_sve.c b/sysdeps/aarch64/fpu/log1p_sve.c +index 04f7e5720e..b21cfb2c90 100644 +--- a/sysdeps/aarch64/fpu/log1p_sve.c ++++ b/sysdeps/aarch64/fpu/log1p_sve.c +@@ -116,3 +116,5 @@ svfloat64_t SV_NAME_D1 (log1p) (svfloat64_t x, svbool_t pg) + + return y; + } ++ ++strong_alias (SV_NAME_D1 (log1p), SV_NAME_D1 (logp1)) +diff --git a/sysdeps/aarch64/fpu/log1pf_advsimd.c b/sysdeps/aarch64/fpu/log1pf_advsimd.c +index dc15334a85..8cfa28fb8a 100644 +--- a/sysdeps/aarch64/fpu/log1pf_advsimd.c ++++ b/sysdeps/aarch64/fpu/log1pf_advsimd.c +@@ -128,3 +128,6 @@ VPCS_ATTR float32x4_t V_NAME_F1 (log1p) (float32x4_t x) + } + libmvec_hidden_def (V_NAME_F1 (log1p)) + HALF_WIDTH_ALIAS_F1 (log1p) ++strong_alias (V_NAME_F1 (log1p), V_NAME_F1 (logp1)) ++libmvec_hidden_def (V_NAME_F1 (logp1)) ++HALF_WIDTH_ALIAS_F1 (logp1) +diff --git a/sysdeps/aarch64/fpu/log1pf_sve.c b/sysdeps/aarch64/fpu/log1pf_sve.c +index f645cc997e..5256d5e94c 100644 +--- a/sysdeps/aarch64/fpu/log1pf_sve.c ++++ b/sysdeps/aarch64/fpu/log1pf_sve.c +@@ -98,3 +98,5 @@ svfloat32_t SV_NAME_F1 (log1p) (svfloat32_t x, svbool_t pg) + + return y; + } ++ ++strong_alias (SV_NAME_F1 (log1p), SV_NAME_F1 (logp1)) +diff --git a/sysdeps/unix/sysv/linux/aarch64/libmvec.abilist b/sysdeps/unix/sysv/linux/aarch64/libmvec.abilist +index b685106954..98687cae0d 100644 +--- a/sysdeps/unix/sysv/linux/aarch64/libmvec.abilist ++++ b/sysdeps/unix/sysv/linux/aarch64/libmvec.abilist +@@ -128,3 +128,8 @@ GLIBC_2.40 _ZGVsMxvv_hypot F + GLIBC_2.40 _ZGVsMxvv_hypotf F + GLIBC_2.40 _ZGVsMxvv_pow F + GLIBC_2.40 _ZGVsMxvv_powf F ++GLIBC_2.41 _ZGVnN2v_logp1 F ++GLIBC_2.41 _ZGVnN2v_logp1f F ++GLIBC_2.41 _ZGVnN4v_logp1f F ++GLIBC_2.41 _ZGVsMxv_logp1 F ++GLIBC_2.41 _ZGVsMxv_logp1f F + +commit 354aeaf2130c1484007025563fe87c997f07324a +Author: Joe Ramsay +Date: Mon Sep 23 15:26:12 2024 +0100 + + AArch64: Improve codegen in SVE expf & related routines + + Reduce MOV and MOVPRFX by improving special-case handling. Use inline + helper to duplicate the entire computation between the special- and + non-special case branches, removing the contention for z0 between x + and the return value. + + Also rearrange some MLAs and MLSs - by making the multiplicand the + destination we can avoid a MOVPRFX in several cases. Also change which + constants go in the vector used for lanewise ops - the last lane is no + longer wasted. + + Spotted that shift was incorrect in exp2f and exp10f, w.r.t. to the + comment that explains it. Fixed - worst-case ULP for exp2f moves + around but it doesn't change significantly for either routine. + + Worst-case error for coshf increases due to passing x to exp rather + than abs(x) - updated the comment, but does not require regen-ulps. + + Reviewed-by: Wilco Dijkstra + (cherry picked from commit 7b8c134b5460ed933d610fa92ed1227372b68fdc) + +diff --git a/sysdeps/aarch64/fpu/coshf_sve.c b/sysdeps/aarch64/fpu/coshf_sve.c +index e5d8a299c6..7ad6efa0fc 100644 +--- a/sysdeps/aarch64/fpu/coshf_sve.c ++++ b/sysdeps/aarch64/fpu/coshf_sve.c +@@ -23,37 +23,42 @@ + static const struct data + { + struct sv_expf_data expf_consts; +- uint32_t special_bound; ++ float special_bound; + } data = { + .expf_consts = SV_EXPF_DATA, + /* 0x1.5a92d8p+6: expf overflows above this, so have to use special case. */ +- .special_bound = 0x42ad496c, ++ .special_bound = 0x1.5a92d8p+6, + }; + + static svfloat32_t NOINLINE +-special_case (svfloat32_t x, svfloat32_t y, svbool_t pg) ++special_case (svfloat32_t x, svfloat32_t half_e, svfloat32_t half_over_e, ++ svbool_t pg) + { +- return sv_call_f32 (coshf, x, y, pg); ++ return sv_call_f32 (coshf, x, svadd_x (svptrue_b32 (), half_e, half_over_e), ++ pg); + } + + /* Single-precision vector cosh, using vector expf. +- Maximum error is 1.89 ULP: +- _ZGVsMxv_coshf (-0x1.65898cp+6) got 0x1.f00aep+127 +- want 0x1.f00adcp+127. */ ++ Maximum error is 2.77 ULP: ++ _ZGVsMxv_coshf(-0x1.5b38f4p+1) got 0x1.e45946p+2 ++ want 0x1.e4594cp+2. */ + svfloat32_t SV_NAME_F1 (cosh) (svfloat32_t x, svbool_t pg) + { + const struct data *d = ptr_barrier (&data); + +- svfloat32_t ax = svabs_x (pg, x); +- svbool_t special = svcmpge (pg, svreinterpret_u32 (ax), d->special_bound); ++ svbool_t special = svacge (pg, x, d->special_bound); + +- /* Calculate cosh by exp(x) / 2 + exp(-x) / 2. */ +- svfloat32_t t = expf_inline (ax, pg, &d->expf_consts); +- svfloat32_t half_t = svmul_x (pg, t, 0.5); +- svfloat32_t half_over_t = svdivr_x (pg, t, 0.5); ++ /* Calculate cosh by exp(x) / 2 + exp(-x) / 2. ++ Note that x is passed to exp here, rather than |x|. This is to avoid using ++ destructive unary ABS for better register usage. However it means the ++ routine is not exactly symmetrical, as the exp helper is slightly less ++ accurate in the negative range. */ ++ svfloat32_t e = expf_inline (x, pg, &d->expf_consts); ++ svfloat32_t half_e = svmul_x (svptrue_b32 (), e, 0.5); ++ svfloat32_t half_over_e = svdivr_x (pg, e, 0.5); + + if (__glibc_unlikely (svptest_any (pg, special))) +- return special_case (x, svadd_x (pg, half_t, half_over_t), special); ++ return special_case (x, half_e, half_over_e, special); + +- return svadd_x (pg, half_t, half_over_t); ++ return svadd_x (svptrue_b32 (), half_e, half_over_e); + } +diff --git a/sysdeps/aarch64/fpu/exp10f_sve.c b/sysdeps/aarch64/fpu/exp10f_sve.c +index e09b2f3b27..8aa3fa9c43 100644 +--- a/sysdeps/aarch64/fpu/exp10f_sve.c ++++ b/sysdeps/aarch64/fpu/exp10f_sve.c +@@ -18,74 +18,83 @@ + . */ + + #include "sv_math.h" +-#include "poly_sve_f32.h" + +-/* For x < -SpecialBound, the result is subnormal and not handled correctly by ++/* For x < -Thres, the result is subnormal and not handled correctly by + FEXPA. */ +-#define SpecialBound 37.9 ++#define Thres 37.9 + + static const struct data + { +- float poly[5]; +- float shift, log10_2, log2_10_hi, log2_10_lo, special_bound; ++ float log2_10_lo, c0, c2, c4; ++ float c1, c3, log10_2; ++ float shift, log2_10_hi, thres; + } data = { + /* Coefficients generated using Remez algorithm with minimisation of relative + error. + rel error: 0x1.89dafa3p-24 + abs error: 0x1.167d55p-23 in [-log10(2)/2, log10(2)/2] + maxerr: 0.52 +0.5 ulp. */ +- .poly = { 0x1.26bb16p+1f, 0x1.5350d2p+1f, 0x1.04744ap+1f, 0x1.2d8176p+0f, +- 0x1.12b41ap-1f }, ++ .c0 = 0x1.26bb16p+1f, ++ .c1 = 0x1.5350d2p+1f, ++ .c2 = 0x1.04744ap+1f, ++ .c3 = 0x1.2d8176p+0f, ++ .c4 = 0x1.12b41ap-1f, + /* 1.5*2^17 + 127, a shift value suitable for FEXPA. */ +- .shift = 0x1.903f8p17f, ++ .shift = 0x1.803f8p17f, + .log10_2 = 0x1.a934fp+1, + .log2_10_hi = 0x1.344136p-2, + .log2_10_lo = -0x1.ec10cp-27, +- .special_bound = SpecialBound, ++ .thres = Thres, + }; + +-static svfloat32_t NOINLINE +-special_case (svfloat32_t x, svfloat32_t y, svbool_t special) ++static inline svfloat32_t ++sv_exp10f_inline (svfloat32_t x, const svbool_t pg, const struct data *d) + { +- return sv_call_f32 (exp10f, x, y, special); +-} +- +-/* Single-precision SVE exp10f routine. Implements the same algorithm +- as AdvSIMD exp10f. +- Worst case error is 1.02 ULPs. +- _ZGVsMxv_exp10f(-0x1.040488p-4) got 0x1.ba5f9ep-1 +- want 0x1.ba5f9cp-1. */ +-svfloat32_t SV_NAME_F1 (exp10) (svfloat32_t x, const svbool_t pg) +-{ +- const struct data *d = ptr_barrier (&data); + /* exp10(x) = 2^(n/N) * 10^r = 2^n * (1 + poly (r)), + with poly(r) in [1/sqrt(2), sqrt(2)] and + x = r + n * log10(2) / N, with r in [-log10(2)/2N, log10(2)/2N]. */ + +- /* Load some constants in quad-word chunks to minimise memory access (last +- lane is wasted). */ +- svfloat32_t log10_2_and_inv = svld1rq (svptrue_b32 (), &d->log10_2); ++ svfloat32_t lane_consts = svld1rq (svptrue_b32 (), &d->log2_10_lo); + + /* n = round(x/(log10(2)/N)). */ + svfloat32_t shift = sv_f32 (d->shift); +- svfloat32_t z = svmla_lane (shift, x, log10_2_and_inv, 0); +- svfloat32_t n = svsub_x (pg, z, shift); ++ svfloat32_t z = svmad_x (pg, sv_f32 (d->log10_2), x, shift); ++ svfloat32_t n = svsub_x (svptrue_b32 (), z, shift); + + /* r = x - n*log10(2)/N. */ +- svfloat32_t r = svmls_lane (x, n, log10_2_and_inv, 1); +- r = svmls_lane (r, n, log10_2_and_inv, 2); ++ svfloat32_t r = svmsb_x (pg, sv_f32 (d->log2_10_hi), n, x); ++ r = svmls_lane (r, n, lane_consts, 0); + +- svbool_t special = svacgt (pg, x, d->special_bound); + svfloat32_t scale = svexpa (svreinterpret_u32 (z)); + + /* Polynomial evaluation: poly(r) ~ exp10(r)-1. */ +- svfloat32_t r2 = svmul_x (pg, r, r); +- svfloat32_t poly +- = svmla_x (pg, svmul_x (pg, r, d->poly[0]), +- sv_pairwise_poly_3_f32_x (pg, r, r2, d->poly + 1), r2); +- +- if (__glibc_unlikely (svptest_any (pg, special))) +- return special_case (x, svmla_x (pg, scale, scale, poly), special); ++ svfloat32_t p12 = svmla_lane (sv_f32 (d->c1), r, lane_consts, 2); ++ svfloat32_t p34 = svmla_lane (sv_f32 (d->c3), r, lane_consts, 3); ++ svfloat32_t r2 = svmul_x (svptrue_b32 (), r, r); ++ svfloat32_t p14 = svmla_x (pg, p12, p34, r2); ++ svfloat32_t p0 = svmul_lane (r, lane_consts, 1); ++ svfloat32_t poly = svmla_x (pg, p0, r2, p14); + + return svmla_x (pg, scale, scale, poly); + } ++ ++static svfloat32_t NOINLINE ++special_case (svfloat32_t x, svbool_t special, const struct data *d) ++{ ++ return sv_call_f32 (exp10f, x, sv_exp10f_inline (x, svptrue_b32 (), d), ++ special); ++} ++ ++/* Single-precision SVE exp10f routine. Implements the same algorithm ++ as AdvSIMD exp10f. ++ Worst case error is 1.02 ULPs. ++ _ZGVsMxv_exp10f(-0x1.040488p-4) got 0x1.ba5f9ep-1 ++ want 0x1.ba5f9cp-1. */ ++svfloat32_t SV_NAME_F1 (exp10) (svfloat32_t x, const svbool_t pg) ++{ ++ const struct data *d = ptr_barrier (&data); ++ svbool_t special = svacgt (pg, x, d->thres); ++ if (__glibc_unlikely (svptest_any (special, special))) ++ return special_case (x, special, d); ++ return sv_exp10f_inline (x, pg, d); ++} +diff --git a/sysdeps/aarch64/fpu/exp2f_sve.c b/sysdeps/aarch64/fpu/exp2f_sve.c +index 8a686e3e05..c6216bed9e 100644 +--- a/sysdeps/aarch64/fpu/exp2f_sve.c ++++ b/sysdeps/aarch64/fpu/exp2f_sve.c +@@ -24,54 +24,64 @@ + + static const struct data + { +- float poly[5]; ++ float c0, c2, c4, c1, c3; + float shift, thres; + } data = { +- /* Coefficients copied from the polynomial in AdvSIMD variant, reversed for +- compatibility with polynomial helpers. */ +- .poly = { 0x1.62e422p-1f, 0x1.ebf9bcp-3f, 0x1.c6bd32p-5f, 0x1.3ce9e4p-7f, +- 0x1.59977ap-10f }, ++ /* Coefficients copied from the polynomial in AdvSIMD variant. */ ++ .c0 = 0x1.62e422p-1f, ++ .c1 = 0x1.ebf9bcp-3f, ++ .c2 = 0x1.c6bd32p-5f, ++ .c3 = 0x1.3ce9e4p-7f, ++ .c4 = 0x1.59977ap-10f, + /* 1.5*2^17 + 127. */ +- .shift = 0x1.903f8p17f, ++ .shift = 0x1.803f8p17f, + /* Roughly 87.3. For x < -Thres, the result is subnormal and not handled + correctly by FEXPA. */ + .thres = Thres, + }; + +-static svfloat32_t NOINLINE +-special_case (svfloat32_t x, svfloat32_t y, svbool_t special) +-{ +- return sv_call_f32 (exp2f, x, y, special); +-} +- +-/* Single-precision SVE exp2f routine. Implements the same algorithm +- as AdvSIMD exp2f. +- Worst case error is 1.04 ULPs. +- SV_NAME_F1 (exp2)(0x1.943b9p-1) got 0x1.ba7eb2p+0 +- want 0x1.ba7ebp+0. */ +-svfloat32_t SV_NAME_F1 (exp2) (svfloat32_t x, const svbool_t pg) ++static inline svfloat32_t ++sv_exp2f_inline (svfloat32_t x, const svbool_t pg, const struct data *d) + { +- const struct data *d = ptr_barrier (&data); + /* exp2(x) = 2^n (1 + poly(r)), with 1 + poly(r) in [1/sqrt(2),sqrt(2)] + x = n + r, with r in [-1/2, 1/2]. */ +- svfloat32_t shift = sv_f32 (d->shift); +- svfloat32_t z = svadd_x (pg, x, shift); +- svfloat32_t n = svsub_x (pg, z, shift); +- svfloat32_t r = svsub_x (pg, x, n); ++ svfloat32_t z = svadd_x (svptrue_b32 (), x, d->shift); ++ svfloat32_t n = svsub_x (svptrue_b32 (), z, d->shift); ++ svfloat32_t r = svsub_x (svptrue_b32 (), x, n); + +- svbool_t special = svacgt (pg, x, d->thres); + svfloat32_t scale = svexpa (svreinterpret_u32 (z)); + + /* Polynomial evaluation: poly(r) ~ exp2(r)-1. + Evaluate polynomial use hybrid scheme - offset ESTRIN by 1 for + coefficients 1 to 4, and apply most significant coefficient directly. */ +- svfloat32_t r2 = svmul_x (pg, r, r); +- svfloat32_t p14 = sv_pairwise_poly_3_f32_x (pg, r, r2, d->poly + 1); +- svfloat32_t p0 = svmul_x (pg, r, d->poly[0]); ++ svfloat32_t even_coeffs = svld1rq (svptrue_b32 (), &d->c0); ++ svfloat32_t r2 = svmul_x (svptrue_b32 (), r, r); ++ svfloat32_t p12 = svmla_lane (sv_f32 (d->c1), r, even_coeffs, 1); ++ svfloat32_t p34 = svmla_lane (sv_f32 (d->c3), r, even_coeffs, 2); ++ svfloat32_t p14 = svmla_x (pg, p12, r2, p34); ++ svfloat32_t p0 = svmul_lane (r, even_coeffs, 0); + svfloat32_t poly = svmla_x (pg, p0, r2, p14); + +- if (__glibc_unlikely (svptest_any (pg, special))) +- return special_case (x, svmla_x (pg, scale, scale, poly), special); +- + return svmla_x (pg, scale, scale, poly); + } ++ ++static svfloat32_t NOINLINE ++special_case (svfloat32_t x, svbool_t special, const struct data *d) ++{ ++ return sv_call_f32 (exp2f, x, sv_exp2f_inline (x, svptrue_b32 (), d), ++ special); ++} ++ ++/* Single-precision SVE exp2f routine. Implements the same algorithm ++ as AdvSIMD exp2f. ++ Worst case error is 1.04 ULPs. ++ _ZGVsMxv_exp2f(-0x1.af994ap-3) got 0x1.ba6a66p-1 ++ want 0x1.ba6a64p-1. */ ++svfloat32_t SV_NAME_F1 (exp2) (svfloat32_t x, const svbool_t pg) ++{ ++ const struct data *d = ptr_barrier (&data); ++ svbool_t special = svacgt (pg, x, d->thres); ++ if (__glibc_unlikely (svptest_any (special, special))) ++ return special_case (x, special, d); ++ return sv_exp2f_inline (x, pg, d); ++} +diff --git a/sysdeps/aarch64/fpu/expf_sve.c b/sysdeps/aarch64/fpu/expf_sve.c +index 3ba79bc4f1..da93e01b87 100644 +--- a/sysdeps/aarch64/fpu/expf_sve.c ++++ b/sysdeps/aarch64/fpu/expf_sve.c +@@ -18,33 +18,25 @@ + . */ + + #include "sv_math.h" ++#include "sv_expf_inline.h" ++ ++/* Roughly 87.3. For x < -Thres, the result is subnormal and not handled ++ correctly by FEXPA. */ ++#define Thres 0x1.5d5e2ap+6f + + static const struct data + { +- float poly[5]; +- float inv_ln2, ln2_hi, ln2_lo, shift, thres; ++ struct sv_expf_data d; ++ float thres; + } data = { +- /* Coefficients copied from the polynomial in AdvSIMD variant, reversed for +- compatibility with polynomial helpers. */ +- .poly = { 0x1.ffffecp-1f, 0x1.fffdb6p-2f, 0x1.555e66p-3f, 0x1.573e2ep-5f, +- 0x1.0e4020p-7f }, +- .inv_ln2 = 0x1.715476p+0f, +- .ln2_hi = 0x1.62e4p-1f, +- .ln2_lo = 0x1.7f7d1cp-20f, +- /* 1.5*2^17 + 127. */ +- .shift = 0x1.903f8p17f, +- /* Roughly 87.3. For x < -Thres, the result is subnormal and not handled +- correctly by FEXPA. */ +- .thres = 0x1.5d5e2ap+6f, ++ .d = SV_EXPF_DATA, ++ .thres = Thres, + }; + +-#define C(i) sv_f32 (d->poly[i]) +-#define ExponentBias 0x3f800000 +- + static svfloat32_t NOINLINE +-special_case (svfloat32_t x, svfloat32_t y, svbool_t special) ++special_case (svfloat32_t x, svbool_t special, const struct sv_expf_data *d) + { +- return sv_call_f32 (expf, x, y, special); ++ return sv_call_f32 (expf, x, expf_inline (x, svptrue_b32 (), d), special); + } + + /* Optimised single-precision SVE exp function. +@@ -54,36 +46,8 @@ special_case (svfloat32_t x, svfloat32_t y, svbool_t special) + svfloat32_t SV_NAME_F1 (exp) (svfloat32_t x, const svbool_t pg) + { + const struct data *d = ptr_barrier (&data); +- +- /* exp(x) = 2^n (1 + poly(r)), with 1 + poly(r) in [1/sqrt(2),sqrt(2)] +- x = ln2*n + r, with r in [-ln2/2, ln2/2]. */ +- +- /* Load some constants in quad-word chunks to minimise memory access (last +- lane is wasted). */ +- svfloat32_t invln2_and_ln2 = svld1rq (svptrue_b32 (), &d->inv_ln2); +- +- /* n = round(x/(ln2/N)). */ +- svfloat32_t z = svmla_lane (sv_f32 (d->shift), x, invln2_and_ln2, 0); +- svfloat32_t n = svsub_x (pg, z, d->shift); +- +- /* r = x - n*ln2/N. */ +- svfloat32_t r = svmls_lane (x, n, invln2_and_ln2, 1); +- r = svmls_lane (r, n, invln2_and_ln2, 2); +- +- /* scale = 2^(n/N). */ + svbool_t is_special_case = svacgt (pg, x, d->thres); +- svfloat32_t scale = svexpa (svreinterpret_u32 (z)); +- +- /* y = exp(r) - 1 ~= r + C0 r^2 + C1 r^3 + C2 r^4 + C3 r^5 + C4 r^6. */ +- svfloat32_t p12 = svmla_x (pg, C (1), C (2), r); +- svfloat32_t p34 = svmla_x (pg, C (3), C (4), r); +- svfloat32_t r2 = svmul_x (pg, r, r); +- svfloat32_t p14 = svmla_x (pg, p12, p34, r2); +- svfloat32_t p0 = svmul_x (pg, r, C (0)); +- svfloat32_t poly = svmla_x (pg, p0, r2, p14); +- + if (__glibc_unlikely (svptest_any (pg, is_special_case))) +- return special_case (x, svmla_x (pg, scale, scale, poly), is_special_case); +- +- return svmla_x (pg, scale, scale, poly); ++ return special_case (x, is_special_case, &d->d); ++ return expf_inline (x, pg, &d->d); + } +diff --git a/sysdeps/aarch64/fpu/sv_expf_inline.h b/sysdeps/aarch64/fpu/sv_expf_inline.h +index 23963b5f8e..6166df6553 100644 +--- a/sysdeps/aarch64/fpu/sv_expf_inline.h ++++ b/sysdeps/aarch64/fpu/sv_expf_inline.h +@@ -24,19 +24,20 @@ + + struct sv_expf_data + { +- float poly[5]; +- float inv_ln2, ln2_hi, ln2_lo, shift; ++ float c1, c3, inv_ln2; ++ float ln2_lo, c0, c2, c4; ++ float ln2_hi, shift; + }; + + /* Coefficients copied from the polynomial in AdvSIMD variant, reversed for + compatibility with polynomial helpers. Shift is 1.5*2^17 + 127. */ + #define SV_EXPF_DATA \ + { \ +- .poly = { 0x1.ffffecp-1f, 0x1.fffdb6p-2f, 0x1.555e66p-3f, 0x1.573e2ep-5f, \ +- 0x1.0e4020p-7f }, \ +- \ +- .inv_ln2 = 0x1.715476p+0f, .ln2_hi = 0x1.62e4p-1f, \ +- .ln2_lo = 0x1.7f7d1cp-20f, .shift = 0x1.803f8p17f, \ ++ /* Coefficients copied from the polynomial in AdvSIMD variant. */ \ ++ .c0 = 0x1.ffffecp-1f, .c1 = 0x1.fffdb6p-2f, .c2 = 0x1.555e66p-3f, \ ++ .c3 = 0x1.573e2ep-5f, .c4 = 0x1.0e4020p-7f, .inv_ln2 = 0x1.715476p+0f, \ ++ .ln2_hi = 0x1.62e4p-1f, .ln2_lo = 0x1.7f7d1cp-20f, \ ++ .shift = 0x1.803f8p17f, \ + } + + #define C(i) sv_f32 (d->poly[i]) +@@ -47,26 +48,25 @@ expf_inline (svfloat32_t x, const svbool_t pg, const struct sv_expf_data *d) + /* exp(x) = 2^n (1 + poly(r)), with 1 + poly(r) in [1/sqrt(2),sqrt(2)] + x = ln2*n + r, with r in [-ln2/2, ln2/2]. */ + +- /* Load some constants in quad-word chunks to minimise memory access. */ +- svfloat32_t c4_invln2_and_ln2 = svld1rq (svptrue_b32 (), &d->poly[4]); ++ svfloat32_t lane_consts = svld1rq (svptrue_b32 (), &d->ln2_lo); + + /* n = round(x/(ln2/N)). */ +- svfloat32_t z = svmla_lane (sv_f32 (d->shift), x, c4_invln2_and_ln2, 1); ++ svfloat32_t z = svmad_x (pg, sv_f32 (d->inv_ln2), x, d->shift); + svfloat32_t n = svsub_x (pg, z, d->shift); + + /* r = x - n*ln2/N. */ +- svfloat32_t r = svmls_lane (x, n, c4_invln2_and_ln2, 2); +- r = svmls_lane (r, n, c4_invln2_and_ln2, 3); ++ svfloat32_t r = svmsb_x (pg, sv_f32 (d->ln2_hi), n, x); ++ r = svmls_lane (r, n, lane_consts, 0); + + /* scale = 2^(n/N). */ +- svfloat32_t scale = svexpa (svreinterpret_u32_f32 (z)); ++ svfloat32_t scale = svexpa (svreinterpret_u32 (z)); + + /* y = exp(r) - 1 ~= r + C0 r^2 + C1 r^3 + C2 r^4 + C3 r^5 + C4 r^6. */ +- svfloat32_t p12 = svmla_x (pg, C (1), C (2), r); +- svfloat32_t p34 = svmla_lane (C (3), r, c4_invln2_and_ln2, 0); +- svfloat32_t r2 = svmul_f32_x (pg, r, r); ++ svfloat32_t p12 = svmla_lane (sv_f32 (d->c1), r, lane_consts, 2); ++ svfloat32_t p34 = svmla_lane (sv_f32 (d->c3), r, lane_consts, 3); ++ svfloat32_t r2 = svmul_x (svptrue_b32 (), r, r); + svfloat32_t p14 = svmla_x (pg, p12, p34, r2); +- svfloat32_t p0 = svmul_f32_x (pg, r, C (0)); ++ svfloat32_t p0 = svmul_lane (r, lane_consts, 1); + svfloat32_t poly = svmla_x (pg, p0, r2, p14); + + return svmla_x (pg, scale, scale, poly); + +commit c4373426e3a85ec483a0f412c2a7c6cdfa32ccdb +Author: Joe Ramsay +Date: Mon Sep 23 15:30:20 2024 +0100 + + AArch64: Improve codegen in SVE F32 logs + + Reduce MOVPRFXs by using unpredicated (non-destructive) instructions + where possible. Similar to the recent change to AdvSIMD F32 logs, + adjust special-case arguments and bounds to allow for more optimal + register usage. For all 3 routines one MOVPRFX remains in the + reduction, which cannot be avoided as immediate AND and ASR are both + destructive. + + Reviewed-by: Wilco Dijkstra + (cherry picked from commit a15b1394b5eba98ffe28a02a392b587e4fe13c0d) + +diff --git a/sysdeps/aarch64/fpu/log10f_sve.c b/sysdeps/aarch64/fpu/log10f_sve.c +index bdbb49cd32..7913679f67 100644 +--- a/sysdeps/aarch64/fpu/log10f_sve.c ++++ b/sysdeps/aarch64/fpu/log10f_sve.c +@@ -24,6 +24,7 @@ static const struct data + float poly_0246[4]; + float poly_1357[4]; + float ln2, inv_ln10; ++ uint32_t off, lower; + } data = { + .poly_1357 = { + /* Coefficients copied from the AdvSIMD routine, then rearranged so that coeffs +@@ -35,18 +36,23 @@ static const struct data + -0x1.0fc92cp-4f }, + .ln2 = 0x1.62e43p-1f, + .inv_ln10 = 0x1.bcb7b2p-2f, ++ .off = 0x3f2aaaab, ++ /* Lower bound is the smallest positive normal float 0x00800000. For ++ optimised register use subnormals are detected after offset has been ++ subtracted, so lower bound is 0x0080000 - offset (which wraps around). */ ++ .lower = 0x00800000 - 0x3f2aaaab + }; + +-#define Min 0x00800000 +-#define Max 0x7f800000 +-#define Thres 0x7f000000 /* Max - Min. */ +-#define Offset 0x3f2aaaab /* 0.666667. */ ++#define Thres 0x7f000000 /* asuint32(inf) - 0x00800000. */ + #define MantissaMask 0x007fffff + + static svfloat32_t NOINLINE +-special_case (svfloat32_t x, svfloat32_t y, svbool_t special) ++special_case (svuint32_t u_off, svfloat32_t p, svfloat32_t r2, svfloat32_t y, ++ svbool_t cmp) + { +- return sv_call_f32 (log10f, x, y, special); ++ return sv_call_f32 ( ++ log10f, svreinterpret_f32 (svadd_x (svptrue_b32 (), u_off, data.off)), ++ svmla_x (svptrue_b32 (), p, r2, y), cmp); + } + + /* Optimised implementation of SVE log10f using the same algorithm and +@@ -57,23 +63,25 @@ special_case (svfloat32_t x, svfloat32_t y, svbool_t special) + svfloat32_t SV_NAME_F1 (log10) (svfloat32_t x, const svbool_t pg) + { + const struct data *d = ptr_barrier (&data); +- svuint32_t ix = svreinterpret_u32 (x); +- svbool_t special = svcmpge (pg, svsub_x (pg, ix, Min), Thres); ++ ++ svuint32_t u_off = svreinterpret_u32 (x); ++ ++ u_off = svsub_x (pg, u_off, d->off); ++ svbool_t special = svcmpge (pg, svsub_x (pg, u_off, d->lower), Thres); + + /* x = 2^n * (1+r), where 2/3 < 1+r < 4/3. */ +- ix = svsub_x (pg, ix, Offset); + svfloat32_t n = svcvt_f32_x ( +- pg, svasr_x (pg, svreinterpret_s32 (ix), 23)); /* signextend. */ +- ix = svand_x (pg, ix, MantissaMask); +- ix = svadd_x (pg, ix, Offset); ++ pg, svasr_x (pg, svreinterpret_s32 (u_off), 23)); /* signextend. */ ++ svuint32_t ix = svand_x (pg, u_off, MantissaMask); ++ ix = svadd_x (pg, ix, d->off); + svfloat32_t r = svsub_x (pg, svreinterpret_f32 (ix), 1.0f); + + /* y = log10(1+r) + n*log10(2) + log10(1+r) ~ r * InvLn(10) + P(r) + where P(r) is a polynomial. Use order 9 for log10(1+x), i.e. order 8 for + log10(1+x)/x, with x in [-1/3, 1/3] (offset=2/3). */ +- svfloat32_t r2 = svmul_x (pg, r, r); +- svfloat32_t r4 = svmul_x (pg, r2, r2); ++ svfloat32_t r2 = svmul_x (svptrue_b32 (), r, r); ++ svfloat32_t r4 = svmul_x (svptrue_b32 (), r2, r2); + svfloat32_t p_1357 = svld1rq (svptrue_b32 (), &d->poly_1357[0]); + svfloat32_t q_01 = svmla_lane (sv_f32 (d->poly_0246[0]), r, p_1357, 0); + svfloat32_t q_23 = svmla_lane (sv_f32 (d->poly_0246[1]), r, p_1357, 1); +@@ -88,7 +96,6 @@ svfloat32_t SV_NAME_F1 (log10) (svfloat32_t x, const svbool_t pg) + hi = svmul_x (pg, hi, d->inv_ln10); + + if (__glibc_unlikely (svptest_any (pg, special))) +- return special_case (x, svmla_x (svnot_z (pg, special), hi, r2, y), +- special); +- return svmla_x (pg, hi, r2, y); ++ return special_case (u_off, hi, r2, y, special); ++ return svmla_x (svptrue_b32 (), hi, r2, y); + } +diff --git a/sysdeps/aarch64/fpu/log2f_sve.c b/sysdeps/aarch64/fpu/log2f_sve.c +index 5031c42483..939d89bfb9 100644 +--- a/sysdeps/aarch64/fpu/log2f_sve.c ++++ b/sysdeps/aarch64/fpu/log2f_sve.c +@@ -23,6 +23,7 @@ static const struct data + { + float poly_02468[5]; + float poly_1357[4]; ++ uint32_t off, lower; + } data = { + .poly_1357 = { + /* Coefficients copied from the AdvSIMD routine, then rearranged so that coeffs +@@ -32,18 +33,23 @@ static const struct data + }, + .poly_02468 = { 0x1.715476p0f, 0x1.ec701cp-2f, 0x1.27a0b8p-2f, + 0x1.9d8ecap-3f, 0x1.9e495p-3f }, ++ .off = 0x3f2aaaab, ++ /* Lower bound is the smallest positive normal float 0x00800000. For ++ optimised register use subnormals are detected after offset has been ++ subtracted, so lower bound is 0x0080000 - offset (which wraps around). */ ++ .lower = 0x00800000 - 0x3f2aaaab + }; + +-#define Min (0x00800000) +-#define Max (0x7f800000) +-#define Thres (0x7f000000) /* Max - Min. */ ++#define Thresh (0x7f000000) /* asuint32(inf) - 0x00800000. */ + #define MantissaMask (0x007fffff) +-#define Off (0x3f2aaaab) /* 0.666667. */ + + static svfloat32_t NOINLINE +-special_case (svfloat32_t x, svfloat32_t y, svbool_t cmp) ++special_case (svuint32_t u_off, svfloat32_t p, svfloat32_t r2, svfloat32_t y, ++ svbool_t cmp) + { +- return sv_call_f32 (log2f, x, y, cmp); ++ return sv_call_f32 ( ++ log2f, svreinterpret_f32 (svadd_x (svptrue_b32 (), u_off, data.off)), ++ svmla_x (svptrue_b32 (), p, r2, y), cmp); + } + + /* Optimised implementation of SVE log2f, using the same algorithm +@@ -55,19 +61,20 @@ svfloat32_t SV_NAME_F1 (log2) (svfloat32_t x, const svbool_t pg) + { + const struct data *d = ptr_barrier (&data); + +- svuint32_t u = svreinterpret_u32 (x); +- svbool_t special = svcmpge (pg, svsub_x (pg, u, Min), Thres); ++ svuint32_t u_off = svreinterpret_u32 (x); ++ ++ u_off = svsub_x (pg, u_off, d->off); ++ svbool_t special = svcmpge (pg, svsub_x (pg, u_off, d->lower), Thresh); + + /* x = 2^n * (1+r), where 2/3 < 1+r < 4/3. */ +- u = svsub_x (pg, u, Off); + svfloat32_t n = svcvt_f32_x ( +- pg, svasr_x (pg, svreinterpret_s32 (u), 23)); /* Sign-extend. */ +- u = svand_x (pg, u, MantissaMask); +- u = svadd_x (pg, u, Off); ++ pg, svasr_x (pg, svreinterpret_s32 (u_off), 23)); /* Sign-extend. */ ++ svuint32_t u = svand_x (pg, u_off, MantissaMask); ++ u = svadd_x (pg, u, d->off); + svfloat32_t r = svsub_x (pg, svreinterpret_f32 (u), 1.0f); + + /* y = log2(1+r) + n. */ +- svfloat32_t r2 = svmul_x (pg, r, r); ++ svfloat32_t r2 = svmul_x (svptrue_b32 (), r, r); + + /* Evaluate polynomial using pairwise Horner scheme. */ + svfloat32_t p_1357 = svld1rq (svptrue_b32 (), &d->poly_1357[0]); +@@ -81,6 +88,6 @@ svfloat32_t SV_NAME_F1 (log2) (svfloat32_t x, const svbool_t pg) + y = svmla_x (pg, q_01, r2, y); + + if (__glibc_unlikely (svptest_any (pg, special))) +- return special_case (x, svmla_x (svnot_z (pg, special), n, r, y), special); +- return svmla_x (pg, n, r, y); ++ return special_case (u_off, n, r, y, special); ++ return svmla_x (svptrue_b32 (), n, r, y); + } +diff --git a/sysdeps/aarch64/fpu/logf_sve.c b/sysdeps/aarch64/fpu/logf_sve.c +index d64e810cfe..5b9324678d 100644 +--- a/sysdeps/aarch64/fpu/logf_sve.c ++++ b/sysdeps/aarch64/fpu/logf_sve.c +@@ -24,6 +24,7 @@ static const struct data + float poly_0135[4]; + float poly_246[3]; + float ln2; ++ uint32_t off, lower; + } data = { + .poly_0135 = { + /* Coefficients copied from the AdvSIMD routine in math/, then rearranged so +@@ -32,19 +33,24 @@ static const struct data + -0x1.3e737cp-3f, 0x1.5a9aa2p-3f, 0x1.961348p-3f, 0x1.555d7cp-2f + }, + .poly_246 = { -0x1.4f9934p-3f, -0x1.00187cp-2f, -0x1.ffffc8p-2f }, +- .ln2 = 0x1.62e43p-1f ++ .ln2 = 0x1.62e43p-1f, ++ .off = 0x3f2aaaab, ++ /* Lower bound is the smallest positive normal float 0x00800000. For ++ optimised register use subnormals are detected after offset has been ++ subtracted, so lower bound is 0x0080000 - offset (which wraps around). */ ++ .lower = 0x00800000 - 0x3f2aaaab + }; + +-#define Min (0x00800000) +-#define Max (0x7f800000) +-#define Thresh (0x7f000000) /* Max - Min. */ ++#define Thresh (0x7f000000) /* asuint32(inf) - 0x00800000. */ + #define Mask (0x007fffff) +-#define Off (0x3f2aaaab) /* 0.666667. */ + + static svfloat32_t NOINLINE +-special_case (svfloat32_t x, svfloat32_t y, svbool_t cmp) ++special_case (svuint32_t u_off, svfloat32_t p, svfloat32_t r2, svfloat32_t y, ++ svbool_t cmp) + { +- return sv_call_f32 (logf, x, y, cmp); ++ return sv_call_f32 ( ++ logf, svreinterpret_f32 (svadd_x (svptrue_b32 (), u_off, data.off)), ++ svmla_x (svptrue_b32 (), p, r2, y), cmp); + } + + /* Optimised implementation of SVE logf, using the same algorithm and +@@ -55,19 +61,21 @@ svfloat32_t SV_NAME_F1 (log) (svfloat32_t x, const svbool_t pg) + { + const struct data *d = ptr_barrier (&data); + +- svuint32_t u = svreinterpret_u32 (x); +- svbool_t cmp = svcmpge (pg, svsub_x (pg, u, Min), Thresh); ++ svuint32_t u_off = svreinterpret_u32 (x); ++ ++ u_off = svsub_x (pg, u_off, d->off); ++ svbool_t cmp = svcmpge (pg, svsub_x (pg, u_off, d->lower), Thresh); + + /* x = 2^n * (1+r), where 2/3 < 1+r < 4/3. */ +- u = svsub_x (pg, u, Off); + svfloat32_t n = svcvt_f32_x ( +- pg, svasr_x (pg, svreinterpret_s32 (u), 23)); /* Sign-extend. */ +- u = svand_x (pg, u, Mask); +- u = svadd_x (pg, u, Off); ++ pg, svasr_x (pg, svreinterpret_s32 (u_off), 23)); /* Sign-extend. */ ++ ++ svuint32_t u = svand_x (pg, u_off, Mask); ++ u = svadd_x (pg, u, d->off); + svfloat32_t r = svsub_x (pg, svreinterpret_f32 (u), 1.0f); + + /* y = log(1+r) + n*ln2. */ +- svfloat32_t r2 = svmul_x (pg, r, r); ++ svfloat32_t r2 = svmul_x (svptrue_b32 (), r, r); + /* n*ln2 + r + r2*(P6 + r*P5 + r2*(P4 + r*P3 + r2*(P2 + r*P1 + r2*P0))). */ + svfloat32_t p_0135 = svld1rq (svptrue_b32 (), &d->poly_0135[0]); + svfloat32_t p = svmla_lane (sv_f32 (d->poly_246[0]), r, p_0135, 1); +@@ -80,6 +88,6 @@ svfloat32_t SV_NAME_F1 (log) (svfloat32_t x, const svbool_t pg) + p = svmla_x (pg, r, n, d->ln2); + + if (__glibc_unlikely (svptest_any (pg, cmp))) +- return special_case (x, svmla_x (svnot_z (pg, cmp), p, r2, y), cmp); ++ return special_case (u_off, p, r2, y, cmp); + return svmla_x (pg, p, r2, y); + } + +commit 520240173029fd03388ec01db9a5359291cbbd27 +Author: Joe Ramsay +Date: Mon Sep 23 15:32:14 2024 +0100 + + AArch64: Improve codegen in users of AdvSIMD log1pf helper + + log1pf is quite register-intensive - use fewer registers for the + polynomial, and make various changes to shorten dependency chains in + parent routines. There is now no spilling with GCC 14. Accuracy moves + around a little - comments adjusted accordingly but does not require + regen-ulps. + + Use the helper in log1pf as well, instead of having separate + implementations. The more accurate polynomial means special-casing can + be simplified, and the shorter dependency chain avoids the usual dance + around v0, which is otherwise difficult. + + There is a small duplication of vectors containing 1.0f (or 0x3f800000) - + GCC is not currently able to efficiently handle values which fit in FMOV + but not MOVI, and are reinterpreted to integer. There may be potential + for more optimisation if this is fixed. + + Reviewed-by: Wilco Dijkstra + (cherry picked from commit 5bc100bd4b7e00db3009ae93d25d303341545d23) + +diff --git a/sysdeps/aarch64/fpu/acoshf_advsimd.c b/sysdeps/aarch64/fpu/acoshf_advsimd.c +index 8916dcbf40..004474acf9 100644 +--- a/sysdeps/aarch64/fpu/acoshf_advsimd.c ++++ b/sysdeps/aarch64/fpu/acoshf_advsimd.c +@@ -25,35 +25,32 @@ const static struct data + { + struct v_log1pf_data log1pf_consts; + uint32x4_t one; +- uint16x4_t thresh; +-} data = { +- .log1pf_consts = V_LOG1PF_CONSTANTS_TABLE, +- .one = V4 (0x3f800000), +- .thresh = V4 (0x2000) /* top(asuint(SquareLim) - asuint(1)). */ +-}; ++} data = { .log1pf_consts = V_LOG1PF_CONSTANTS_TABLE, .one = V4 (0x3f800000) }; ++ ++#define Thresh vdup_n_u16 (0x2000) /* top(asuint(SquareLim) - asuint(1)). */ + + static float32x4_t NOINLINE VPCS_ATTR + special_case (float32x4_t x, float32x4_t y, uint16x4_t special, +- const struct v_log1pf_data d) ++ const struct v_log1pf_data *d) + { + return v_call_f32 (acoshf, x, log1pf_inline (y, d), vmovl_u16 (special)); + } + + /* Vector approximation for single-precision acosh, based on log1p. Maximum + error depends on WANT_SIMD_EXCEPT. With SIMD fp exceptions enabled, it +- is 2.78 ULP: +- __v_acoshf(0x1.07887p+0) got 0x1.ef9e9cp-3 +- want 0x1.ef9ea2p-3. ++ is 3.00 ULP: ++ _ZGVnN4v_acoshf(0x1.01df3ap+0) got 0x1.ef0a82p-4 ++ want 0x1.ef0a7cp-4. + With exceptions disabled, we can compute u with a shorter dependency chain, +- which gives maximum error of 3.07 ULP: +- __v_acoshf(0x1.01f83ep+0) got 0x1.fbc7fap-4 +- want 0x1.fbc7f4p-4. */ ++ which gives maximum error of 3.22 ULP: ++ _ZGVnN4v_acoshf(0x1.007ef2p+0) got 0x1.fdcdccp-5 ++ want 0x1.fdcdd2p-5. */ + + VPCS_ATTR float32x4_t NOINLINE V_NAME_F1 (acosh) (float32x4_t x) + { + const struct data *d = ptr_barrier (&data); + uint32x4_t ix = vreinterpretq_u32_f32 (x); +- uint16x4_t special = vcge_u16 (vsubhn_u32 (ix, d->one), d->thresh); ++ uint16x4_t special = vcge_u16 (vsubhn_u32 (ix, d->one), Thresh); + + #if WANT_SIMD_EXCEPT + /* Mask special lanes with 1 to side-step spurious invalid or overflow. Use +@@ -64,15 +61,16 @@ VPCS_ATTR float32x4_t NOINLINE V_NAME_F1 (acosh) (float32x4_t x) + float32x4_t xm1 = v_zerofy_f32 (vsubq_f32 (x, v_f32 (1)), p); + float32x4_t u = vfmaq_f32 (vaddq_f32 (xm1, xm1), xm1, xm1); + #else +- float32x4_t xm1 = vsubq_f32 (x, v_f32 (1)); +- float32x4_t u = vmulq_f32 (xm1, vaddq_f32 (x, v_f32 (1.0f))); ++ float32x4_t xm1 = vsubq_f32 (x, vreinterpretq_f32_u32 (d->one)); ++ float32x4_t u ++ = vmulq_f32 (xm1, vaddq_f32 (x, vreinterpretq_f32_u32 (d->one))); + #endif + + float32x4_t y = vaddq_f32 (xm1, vsqrtq_f32 (u)); + + if (__glibc_unlikely (v_any_u16h (special))) +- return special_case (x, y, special, d->log1pf_consts); +- return log1pf_inline (y, d->log1pf_consts); ++ return special_case (x, y, special, &d->log1pf_consts); ++ return log1pf_inline (y, &d->log1pf_consts); + } + libmvec_hidden_def (V_NAME_F1 (acosh)) + HALF_WIDTH_ALIAS_F1 (acosh) +diff --git a/sysdeps/aarch64/fpu/asinhf_advsimd.c b/sysdeps/aarch64/fpu/asinhf_advsimd.c +index 09fd8a6143..eb789b91b6 100644 +--- a/sysdeps/aarch64/fpu/asinhf_advsimd.c ++++ b/sysdeps/aarch64/fpu/asinhf_advsimd.c +@@ -20,16 +20,16 @@ + #include "v_math.h" + #include "v_log1pf_inline.h" + +-#define SignMask v_u32 (0x80000000) +- + const static struct data + { + struct v_log1pf_data log1pf_consts; ++ float32x4_t one; + uint32x4_t big_bound; + #if WANT_SIMD_EXCEPT + uint32x4_t tiny_bound; + #endif + } data = { ++ .one = V4 (1), + .log1pf_consts = V_LOG1PF_CONSTANTS_TABLE, + .big_bound = V4 (0x5f800000), /* asuint(0x1p64). */ + #if WANT_SIMD_EXCEPT +@@ -38,20 +38,27 @@ const static struct data + }; + + static float32x4_t NOINLINE VPCS_ATTR +-special_case (float32x4_t x, float32x4_t y, uint32x4_t special) ++special_case (float32x4_t x, uint32x4_t sign, float32x4_t y, ++ uint32x4_t special, const struct data *d) + { +- return v_call_f32 (asinhf, x, y, special); ++ return v_call_f32 ( ++ asinhf, x, ++ vreinterpretq_f32_u32 (veorq_u32 ( ++ sign, vreinterpretq_u32_f32 (log1pf_inline (y, &d->log1pf_consts)))), ++ special); + } + + /* Single-precision implementation of vector asinh(x), using vector log1p. +- Worst-case error is 2.66 ULP, at roughly +/-0.25: +- __v_asinhf(0x1.01b04p-2) got 0x1.fe163ep-3 want 0x1.fe1638p-3. */ ++ Worst-case error is 2.59 ULP: ++ _ZGVnN4v_asinhf(0x1.d86124p-3) got 0x1.d449bep-3 ++ want 0x1.d449c4p-3. */ + VPCS_ATTR float32x4_t NOINLINE V_NAME_F1 (asinh) (float32x4_t x) + { + const struct data *dat = ptr_barrier (&data); +- uint32x4_t iax = vbicq_u32 (vreinterpretq_u32_f32 (x), SignMask); +- float32x4_t ax = vreinterpretq_f32_u32 (iax); ++ float32x4_t ax = vabsq_f32 (x); ++ uint32x4_t iax = vreinterpretq_u32_f32 (ax); + uint32x4_t special = vcgeq_u32 (iax, dat->big_bound); ++ uint32x4_t sign = veorq_u32 (vreinterpretq_u32_f32 (x), iax); + float32x4_t special_arg = x; + + #if WANT_SIMD_EXCEPT +@@ -68,13 +75,13 @@ VPCS_ATTR float32x4_t NOINLINE V_NAME_F1 (asinh) (float32x4_t x) + /* asinh(x) = log(x + sqrt(x * x + 1)). + For positive x, asinh(x) = log1p(x + x * x / (1 + sqrt(x * x + 1))). */ + float32x4_t d +- = vaddq_f32 (v_f32 (1), vsqrtq_f32 (vfmaq_f32 (v_f32 (1), x, x))); +- float32x4_t y = log1pf_inline ( +- vaddq_f32 (ax, vdivq_f32 (vmulq_f32 (ax, ax), d)), dat->log1pf_consts); ++ = vaddq_f32 (v_f32 (1), vsqrtq_f32 (vfmaq_f32 (dat->one, ax, ax))); ++ float32x4_t y = vaddq_f32 (ax, vdivq_f32 (vmulq_f32 (ax, ax), d)); + + if (__glibc_unlikely (v_any_u32 (special))) +- return special_case (special_arg, vbslq_f32 (SignMask, x, y), special); +- return vbslq_f32 (SignMask, x, y); ++ return special_case (special_arg, sign, y, special, dat); ++ return vreinterpretq_f32_u32 (veorq_u32 ( ++ sign, vreinterpretq_u32_f32 (log1pf_inline (y, &dat->log1pf_consts)))); + } + libmvec_hidden_def (V_NAME_F1 (asinh)) + HALF_WIDTH_ALIAS_F1 (asinh) +diff --git a/sysdeps/aarch64/fpu/atanhf_advsimd.c b/sysdeps/aarch64/fpu/atanhf_advsimd.c +index ae488f7b54..818b6c92ad 100644 +--- a/sysdeps/aarch64/fpu/atanhf_advsimd.c ++++ b/sysdeps/aarch64/fpu/atanhf_advsimd.c +@@ -40,15 +40,17 @@ const static struct data + #define Half v_u32 (0x3f000000) + + static float32x4_t NOINLINE VPCS_ATTR +-special_case (float32x4_t x, float32x4_t y, uint32x4_t special) ++special_case (float32x4_t x, float32x4_t halfsign, float32x4_t y, ++ uint32x4_t special) + { +- return v_call_f32 (atanhf, x, y, special); ++ return v_call_f32 (atanhf, vbslq_f32 (AbsMask, x, halfsign), ++ vmulq_f32 (halfsign, y), special); + } + + /* Approximation for vector single-precision atanh(x) using modified log1p. +- The maximum error is 3.08 ULP: +- __v_atanhf(0x1.ff215p-5) got 0x1.ffcb7cp-5 +- want 0x1.ffcb82p-5. */ ++ The maximum error is 2.93 ULP: ++ _ZGVnN4v_atanhf(0x1.f43d7p-5) got 0x1.f4dcfep-5 ++ want 0x1.f4dcf8p-5. */ + VPCS_ATTR float32x4_t NOINLINE V_NAME_F1 (atanh) (float32x4_t x) + { + const struct data *d = ptr_barrier (&data); +@@ -68,11 +70,19 @@ VPCS_ATTR float32x4_t NOINLINE V_NAME_F1 (atanh) (float32x4_t x) + uint32x4_t special = vcgeq_u32 (iax, d->one); + #endif + +- float32x4_t y = vdivq_f32 (vaddq_f32 (ax, ax), vsubq_f32 (v_f32 (1), ax)); +- y = log1pf_inline (y, d->log1pf_consts); ++ float32x4_t y = vdivq_f32 (vaddq_f32 (ax, ax), ++ vsubq_f32 (vreinterpretq_f32_u32 (d->one), ax)); ++ y = log1pf_inline (y, &d->log1pf_consts); + ++ /* If exceptions not required, pass ax to special-case for shorter dependency ++ chain. If exceptions are required ax will have been zerofied, so have to ++ pass x. */ + if (__glibc_unlikely (v_any_u32 (special))) +- return special_case (x, vmulq_f32 (halfsign, y), special); ++#if WANT_SIMD_EXCEPT ++ return special_case (x, halfsign, y, special); ++#else ++ return special_case (ax, halfsign, y, special); ++#endif + return vmulq_f32 (halfsign, y); + } + libmvec_hidden_def (V_NAME_F1 (atanh)) +diff --git a/sysdeps/aarch64/fpu/log1pf_advsimd.c b/sysdeps/aarch64/fpu/log1pf_advsimd.c +index 8cfa28fb8a..00006fc703 100644 +--- a/sysdeps/aarch64/fpu/log1pf_advsimd.c ++++ b/sysdeps/aarch64/fpu/log1pf_advsimd.c +@@ -18,114 +18,79 @@ + . */ + + #include "v_math.h" +-#include "poly_advsimd_f32.h" ++#include "v_log1pf_inline.h" ++ ++#if WANT_SIMD_EXCEPT + + const static struct data + { +- float32x4_t poly[8], ln2; +- uint32x4_t tiny_bound, minus_one, four, thresh; +- int32x4_t three_quarters; ++ uint32x4_t minus_one, thresh; ++ struct v_log1pf_data d; + } data = { +- .poly = { /* Generated using FPMinimax in [-0.25, 0.5]. First two coefficients +- (1, -0.5) are not stored as they can be generated more +- efficiently. */ +- V4 (0x1.5555aap-2f), V4 (-0x1.000038p-2f), V4 (0x1.99675cp-3f), +- V4 (-0x1.54ef78p-3f), V4 (0x1.28a1f4p-3f), V4 (-0x1.0da91p-3f), +- V4 (0x1.abcb6p-4f), V4 (-0x1.6f0d5ep-5f) }, +- .ln2 = V4 (0x1.62e43p-1f), +- .tiny_bound = V4 (0x34000000), /* asuint32(0x1p-23). ulp=0.5 at 0x1p-23. */ +- .thresh = V4 (0x4b800000), /* asuint32(INFINITY) - tiny_bound. */ ++ .d = V_LOG1PF_CONSTANTS_TABLE, ++ .thresh = V4 (0x4b800000), /* asuint32(INFINITY) - TinyBound. */ + .minus_one = V4 (0xbf800000), +- .four = V4 (0x40800000), +- .three_quarters = V4 (0x3f400000) + }; + +-static inline float32x4_t +-eval_poly (float32x4_t m, const float32x4_t *p) +-{ +- /* Approximate log(1+m) on [-0.25, 0.5] using split Estrin scheme. */ +- float32x4_t p_12 = vfmaq_f32 (v_f32 (-0.5), m, p[0]); +- float32x4_t p_34 = vfmaq_f32 (p[1], m, p[2]); +- float32x4_t p_56 = vfmaq_f32 (p[3], m, p[4]); +- float32x4_t p_78 = vfmaq_f32 (p[5], m, p[6]); +- +- float32x4_t m2 = vmulq_f32 (m, m); +- float32x4_t p_02 = vfmaq_f32 (m, m2, p_12); +- float32x4_t p_36 = vfmaq_f32 (p_34, m2, p_56); +- float32x4_t p_79 = vfmaq_f32 (p_78, m2, p[7]); +- +- float32x4_t m4 = vmulq_f32 (m2, m2); +- float32x4_t p_06 = vfmaq_f32 (p_02, m4, p_36); +- return vfmaq_f32 (p_06, m4, vmulq_f32 (m4, p_79)); +-} ++/* asuint32(0x1p-23). ulp=0.5 at 0x1p-23. */ ++# define TinyBound v_u32 (0x34000000) + + static float32x4_t NOINLINE VPCS_ATTR +-special_case (float32x4_t x, float32x4_t y, uint32x4_t special) ++special_case (float32x4_t x, uint32x4_t cmp, const struct data *d) + { +- return v_call_f32 (log1pf, x, y, special); ++ /* Side-step special lanes so fenv exceptions are not triggered ++ inadvertently. */ ++ float32x4_t x_nospecial = v_zerofy_f32 (x, cmp); ++ return v_call_f32 (log1pf, x, log1pf_inline (x_nospecial, &d->d), cmp); + } + +-/* Vector log1pf approximation using polynomial on reduced interval. Accuracy +- is roughly 2.02 ULP: +- log1pf(0x1.21e13ap-2) got 0x1.fe8028p-3 want 0x1.fe802cp-3. */ ++/* Vector log1pf approximation using polynomial on reduced interval. Worst-case ++ error is 1.69 ULP: ++ _ZGVnN4v_log1pf(0x1.04418ap-2) got 0x1.cfcbd8p-3 ++ want 0x1.cfcbdcp-3. */ + VPCS_ATTR float32x4_t V_NAME_F1 (log1p) (float32x4_t x) + { + const struct data *d = ptr_barrier (&data); +- + uint32x4_t ix = vreinterpretq_u32_f32 (x); + uint32x4_t ia = vreinterpretq_u32_f32 (vabsq_f32 (x)); ++ + uint32x4_t special_cases +- = vorrq_u32 (vcgeq_u32 (vsubq_u32 (ia, d->tiny_bound), d->thresh), ++ = vorrq_u32 (vcgeq_u32 (vsubq_u32 (ia, TinyBound), d->thresh), + vcgeq_u32 (ix, d->minus_one)); +- float32x4_t special_arg = x; + +-#if WANT_SIMD_EXCEPT + if (__glibc_unlikely (v_any_u32 (special_cases))) +- /* Side-step special lanes so fenv exceptions are not triggered +- inadvertently. */ +- x = v_zerofy_f32 (x, special_cases); +-#endif ++ return special_case (x, special_cases, d); + +- /* With x + 1 = t * 2^k (where t = m + 1 and k is chosen such that m +- is in [-0.25, 0.5]): +- log1p(x) = log(t) + log(2^k) = log1p(m) + k*log(2). +- +- We approximate log1p(m) with a polynomial, then scale by +- k*log(2). Instead of doing this directly, we use an intermediate +- scale factor s = 4*k*log(2) to ensure the scale is representable +- as a normalised fp32 number. */ ++ return log1pf_inline (x, &d->d); ++} + +- float32x4_t m = vaddq_f32 (x, v_f32 (1.0f)); ++#else + +- /* Choose k to scale x to the range [-1/4, 1/2]. */ +- int32x4_t k +- = vandq_s32 (vsubq_s32 (vreinterpretq_s32_f32 (m), d->three_quarters), +- v_s32 (0xff800000)); +- uint32x4_t ku = vreinterpretq_u32_s32 (k); ++const static struct v_log1pf_data data = V_LOG1PF_CONSTANTS_TABLE; + +- /* Scale x by exponent manipulation. */ +- float32x4_t m_scale +- = vreinterpretq_f32_u32 (vsubq_u32 (vreinterpretq_u32_f32 (x), ku)); ++static float32x4_t NOINLINE VPCS_ATTR ++special_case (float32x4_t x, uint32x4_t cmp) ++{ ++ return v_call_f32 (log1pf, x, log1pf_inline (x, ptr_barrier (&data)), cmp); ++} + +- /* Scale up to ensure that the scale factor is representable as normalised +- fp32 number, and scale m down accordingly. */ +- float32x4_t s = vreinterpretq_f32_u32 (vsubq_u32 (d->four, ku)); +- m_scale = vaddq_f32 (m_scale, vfmaq_f32 (v_f32 (-1.0f), v_f32 (0.25f), s)); ++/* Vector log1pf approximation using polynomial on reduced interval. Worst-case ++ error is 1.63 ULP: ++ _ZGVnN4v_log1pf(0x1.216d12p-2) got 0x1.fdcb12p-3 ++ want 0x1.fdcb16p-3. */ ++VPCS_ATTR float32x4_t V_NAME_F1 (log1p) (float32x4_t x) ++{ ++ uint32x4_t special_cases = vornq_u32 (vcleq_f32 (x, v_f32 (-1)), ++ vcaleq_f32 (x, v_f32 (0x1p127f))); + +- /* Evaluate polynomial on the reduced interval. */ +- float32x4_t p = eval_poly (m_scale, d->poly); ++ if (__glibc_unlikely (v_any_u32 (special_cases))) ++ return special_case (x, special_cases); + +- /* The scale factor to be applied back at the end - by multiplying float(k) +- by 2^-23 we get the unbiased exponent of k. */ +- float32x4_t scale_back = vcvtq_f32_s32 (vshrq_n_s32 (k, 23)); ++ return log1pf_inline (x, ptr_barrier (&data)); ++} + +- /* Apply the scaling back. */ +- float32x4_t y = vfmaq_f32 (p, scale_back, d->ln2); ++#endif + +- if (__glibc_unlikely (v_any_u32 (special_cases))) +- return special_case (special_arg, y, special_cases); +- return y; +-} + libmvec_hidden_def (V_NAME_F1 (log1p)) + HALF_WIDTH_ALIAS_F1 (log1p) + strong_alias (V_NAME_F1 (log1p), V_NAME_F1 (logp1)) +diff --git a/sysdeps/aarch64/fpu/v_log1pf_inline.h b/sysdeps/aarch64/fpu/v_log1pf_inline.h +index 643a6cdcfc..73e45a942e 100644 +--- a/sysdeps/aarch64/fpu/v_log1pf_inline.h ++++ b/sysdeps/aarch64/fpu/v_log1pf_inline.h +@@ -25,54 +25,81 @@ + + struct v_log1pf_data + { +- float32x4_t poly[8], ln2; + uint32x4_t four; + int32x4_t three_quarters; ++ float c0, c3, c5, c7; ++ float32x4_t c4, c6, c1, c2, ln2; + }; + + /* Polynomial generated using FPMinimax in [-0.25, 0.5]. First two coefficients + (1, -0.5) are not stored as they can be generated more efficiently. */ + #define V_LOG1PF_CONSTANTS_TABLE \ + { \ +- .poly \ +- = { V4 (0x1.5555aap-2f), V4 (-0x1.000038p-2f), V4 (0x1.99675cp-3f), \ +- V4 (-0x1.54ef78p-3f), V4 (0x1.28a1f4p-3f), V4 (-0x1.0da91p-3f), \ +- V4 (0x1.abcb6p-4f), V4 (-0x1.6f0d5ep-5f) }, \ +- .ln2 = V4 (0x1.62e43p-1f), .four = V4 (0x40800000), \ +- .three_quarters = V4 (0x3f400000) \ ++ .c0 = 0x1.5555aap-2f, .c1 = V4 (-0x1.000038p-2f), \ ++ .c2 = V4 (0x1.99675cp-3f), .c3 = -0x1.54ef78p-3f, \ ++ .c4 = V4 (0x1.28a1f4p-3f), .c5 = -0x1.0da91p-3f, \ ++ .c6 = V4 (0x1.abcb6p-4f), .c7 = -0x1.6f0d5ep-5f, \ ++ .ln2 = V4 (0x1.62e43p-1f), .four = V4 (0x40800000), \ ++ .three_quarters = V4 (0x3f400000) \ + } + + static inline float32x4_t +-eval_poly (float32x4_t m, const float32x4_t *c) ++eval_poly (float32x4_t m, const struct v_log1pf_data *d) + { +- /* Approximate log(1+m) on [-0.25, 0.5] using pairwise Horner (main routine +- uses split Estrin, but this way reduces register pressure in the calling +- routine). */ +- float32x4_t q = vfmaq_f32 (v_f32 (-0.5), m, c[0]); ++ /* Approximate log(1+m) on [-0.25, 0.5] using pairwise Horner. */ ++ float32x4_t c0357 = vld1q_f32 (&d->c0); ++ float32x4_t q = vfmaq_laneq_f32 (v_f32 (-0.5), m, c0357, 0); + float32x4_t m2 = vmulq_f32 (m, m); +- q = vfmaq_f32 (m, m2, q); +- float32x4_t p = v_pw_horner_6_f32 (m, m2, c + 1); ++ float32x4_t p67 = vfmaq_laneq_f32 (d->c6, m, c0357, 3); ++ float32x4_t p45 = vfmaq_laneq_f32 (d->c4, m, c0357, 2); ++ float32x4_t p23 = vfmaq_laneq_f32 (d->c2, m, c0357, 1); ++ float32x4_t p = vfmaq_f32 (p45, m2, p67); ++ p = vfmaq_f32 (p23, m2, p); ++ p = vfmaq_f32 (d->c1, m, p); + p = vmulq_f32 (m2, p); +- return vfmaq_f32 (q, m2, p); ++ p = vfmaq_f32 (m, m2, p); ++ return vfmaq_f32 (p, m2, q); + } + + static inline float32x4_t +-log1pf_inline (float32x4_t x, const struct v_log1pf_data d) ++log1pf_inline (float32x4_t x, const struct v_log1pf_data *d) + { +- /* Helper for calculating log(x + 1). Copied from log1pf_2u1.c, with no +- special-case handling. See that file for details of the algorithm. */ ++ /* Helper for calculating log(x + 1). */ ++ ++ /* With x + 1 = t * 2^k (where t = m + 1 and k is chosen such that m ++ is in [-0.25, 0.5]): ++ log1p(x) = log(t) + log(2^k) = log1p(m) + k*log(2). ++ ++ We approximate log1p(m) with a polynomial, then scale by ++ k*log(2). Instead of doing this directly, we use an intermediate ++ scale factor s = 4*k*log(2) to ensure the scale is representable ++ as a normalised fp32 number. */ + float32x4_t m = vaddq_f32 (x, v_f32 (1.0f)); ++ ++ /* Choose k to scale x to the range [-1/4, 1/2]. */ + int32x4_t k +- = vandq_s32 (vsubq_s32 (vreinterpretq_s32_f32 (m), d.three_quarters), ++ = vandq_s32 (vsubq_s32 (vreinterpretq_s32_f32 (m), d->three_quarters), + v_s32 (0xff800000)); + uint32x4_t ku = vreinterpretq_u32_s32 (k); +- float32x4_t s = vreinterpretq_f32_u32 (vsubq_u32 (d.four, ku)); ++ ++ /* Scale up to ensure that the scale factor is representable as normalised ++ fp32 number, and scale m down accordingly. */ ++ float32x4_t s = vreinterpretq_f32_u32 (vsubq_u32 (d->four, ku)); ++ ++ /* Scale x by exponent manipulation. */ + float32x4_t m_scale + = vreinterpretq_f32_u32 (vsubq_u32 (vreinterpretq_u32_f32 (x), ku)); + m_scale = vaddq_f32 (m_scale, vfmaq_f32 (v_f32 (-1.0f), v_f32 (0.25f), s)); +- float32x4_t p = eval_poly (m_scale, d.poly); ++ ++ /* Evaluate polynomial on the reduced interval. */ ++ float32x4_t p = eval_poly (m_scale, d); ++ ++ /* The scale factor to be applied back at the end - by multiplying float(k) ++ by 2^-23 we get the unbiased exponent of k. */ + float32x4_t scale_back = vmulq_f32 (vcvtq_f32_s32 (k), v_f32 (0x1.0p-23f)); +- return vfmaq_f32 (p, scale_back, d.ln2); ++ ++ /* Apply the scaling back. */ ++ return vfmaq_f32 (p, scale_back, d->ln2); + } + + #endif + +commit a947a43b95bbea53ec50df058b42392fd5ea52b6 +Author: Joe Ramsay +Date: Mon Sep 23 15:32:53 2024 +0100 + + AArch64: Improve codegen in users of ADVSIMD expm1f helper + + Rearrange operations so MOV is not necessary in reduction or around + the special-case handler. Reduce memory access by using more indexed + MLAs in polynomial. + + Reviewed-by: Wilco Dijkstra + (cherry picked from commit 7900ac490db32f6bccff812733f00280dde34e27) + +diff --git a/sysdeps/aarch64/fpu/expm1f_advsimd.c b/sysdeps/aarch64/fpu/expm1f_advsimd.c +index a0616ec754..8303ca296e 100644 +--- a/sysdeps/aarch64/fpu/expm1f_advsimd.c ++++ b/sysdeps/aarch64/fpu/expm1f_advsimd.c +@@ -18,27 +18,18 @@ + . */ + + #include "v_math.h" +-#include "poly_advsimd_f32.h" ++#include "v_expm1f_inline.h" + + static const struct data + { +- float32x4_t poly[5]; +- float invln2_and_ln2[4]; +- float32x4_t shift; +- int32x4_t exponent_bias; ++ struct v_expm1f_data d; + #if WANT_SIMD_EXCEPT + uint32x4_t thresh; + #else + float32x4_t oflow_bound; + #endif + } data = { +- /* Generated using fpminimax with degree=5 in [-log(2)/2, log(2)/2]. */ +- .poly = { V4 (0x1.fffffep-2), V4 (0x1.5554aep-3), V4 (0x1.555736p-5), +- V4 (0x1.12287cp-7), V4 (0x1.6b55a2p-10) }, +- /* Stores constants: invln2, ln2_hi, ln2_lo, 0. */ +- .invln2_and_ln2 = { 0x1.715476p+0f, 0x1.62e4p-1f, 0x1.7f7d1cp-20f, 0 }, +- .shift = V4 (0x1.8p23f), +- .exponent_bias = V4 (0x3f800000), ++ .d = V_EXPM1F_DATA, + #if !WANT_SIMD_EXCEPT + /* Value above which expm1f(x) should overflow. Absolute value of the + underflow bound is greater than this, so it catches both cases - there is +@@ -55,67 +46,38 @@ static const struct data + #define TinyBound v_u32 (0x34000000 << 1) + + static float32x4_t VPCS_ATTR NOINLINE +-special_case (float32x4_t x, float32x4_t y, uint32x4_t special) ++special_case (float32x4_t x, uint32x4_t special, const struct data *d) + { +- return v_call_f32 (expm1f, x, y, special); ++ return v_call_f32 ( ++ expm1f, x, expm1f_inline (v_zerofy_f32 (x, special), &d->d), special); + } + + /* Single-precision vector exp(x) - 1 function. +- The maximum error is 1.51 ULP: +- _ZGVnN4v_expm1f (0x1.8baa96p-2) got 0x1.e2fb9p-2 +- want 0x1.e2fb94p-2. */ ++ The maximum error is 1.62 ULP: ++ _ZGVnN4v_expm1f(0x1.85f83p-2) got 0x1.da9f4p-2 ++ want 0x1.da9f44p-2. */ + float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (expm1) (float32x4_t x) + { + const struct data *d = ptr_barrier (&data); +- uint32x4_t ix = vreinterpretq_u32_f32 (x); + + #if WANT_SIMD_EXCEPT ++ uint32x4_t ix = vreinterpretq_u32_f32 (x); + /* If fp exceptions are to be triggered correctly, fall back to scalar for + |x| < 2^-23, |x| > oflow_bound, Inf & NaN. Add ix to itself for + shift-left by 1, and compare with thresh which was left-shifted offline - + this is effectively an absolute compare. */ + uint32x4_t special + = vcgeq_u32 (vsubq_u32 (vaddq_u32 (ix, ix), TinyBound), d->thresh); +- if (__glibc_unlikely (v_any_u32 (special))) +- x = v_zerofy_f32 (x, special); + #else + /* Handles very large values (+ve and -ve), +/-NaN, +/-Inf. */ + uint32x4_t special = vcagtq_f32 (x, d->oflow_bound); + #endif + +- /* Reduce argument to smaller range: +- Let i = round(x / ln2) +- and f = x - i * ln2, then f is in [-ln2/2, ln2/2]. +- exp(x) - 1 = 2^i * (expm1(f) + 1) - 1 +- where 2^i is exact because i is an integer. */ +- float32x4_t invln2_and_ln2 = vld1q_f32 (d->invln2_and_ln2); +- float32x4_t j +- = vsubq_f32 (vfmaq_laneq_f32 (d->shift, x, invln2_and_ln2, 0), d->shift); +- int32x4_t i = vcvtq_s32_f32 (j); +- float32x4_t f = vfmsq_laneq_f32 (x, j, invln2_and_ln2, 1); +- f = vfmsq_laneq_f32 (f, j, invln2_and_ln2, 2); +- +- /* Approximate expm1(f) using polynomial. +- Taylor expansion for expm1(x) has the form: +- x + ax^2 + bx^3 + cx^4 .... +- So we calculate the polynomial P(f) = a + bf + cf^2 + ... +- and assemble the approximation expm1(f) ~= f + f^2 * P(f). */ +- float32x4_t p = v_horner_4_f32 (f, d->poly); +- p = vfmaq_f32 (f, vmulq_f32 (f, f), p); +- +- /* Assemble the result. +- expm1(x) ~= 2^i * (p + 1) - 1 +- Let t = 2^i. */ +- int32x4_t u = vaddq_s32 (vshlq_n_s32 (i, 23), d->exponent_bias); +- float32x4_t t = vreinterpretq_f32_s32 (u); +- + if (__glibc_unlikely (v_any_u32 (special))) +- return special_case (vreinterpretq_f32_u32 (ix), +- vfmaq_f32 (vsubq_f32 (t, v_f32 (1.0f)), p, t), +- special); ++ return special_case (x, special, d); + + /* expm1(x) ~= p * t + (t - 1). */ +- return vfmaq_f32 (vsubq_f32 (t, v_f32 (1.0f)), p, t); ++ return expm1f_inline (x, &d->d); + } + libmvec_hidden_def (V_NAME_F1 (expm1)) + HALF_WIDTH_ALIAS_F1 (expm1) +diff --git a/sysdeps/aarch64/fpu/sinhf_advsimd.c b/sysdeps/aarch64/fpu/sinhf_advsimd.c +index 6bb7482dc2..c6ed7598e7 100644 +--- a/sysdeps/aarch64/fpu/sinhf_advsimd.c ++++ b/sysdeps/aarch64/fpu/sinhf_advsimd.c +@@ -23,15 +23,13 @@ + static const struct data + { + struct v_expm1f_data expm1f_consts; +- uint32x4_t halff; + #if WANT_SIMD_EXCEPT + uint32x4_t tiny_bound, thresh; + #else +- uint32x4_t oflow_bound; ++ float32x4_t oflow_bound; + #endif + } data = { + .expm1f_consts = V_EXPM1F_DATA, +- .halff = V4 (0x3f000000), + #if WANT_SIMD_EXCEPT + /* 0x1.6a09e8p-32, below which expm1f underflows. */ + .tiny_bound = V4 (0x2fb504f4), +@@ -39,14 +37,15 @@ static const struct data + .thresh = V4 (0x12fbbbb3), + #else + /* 0x1.61814ep+6, above which expm1f helper overflows. */ +- .oflow_bound = V4 (0x42b0c0a7), ++ .oflow_bound = V4 (0x1.61814ep+6), + #endif + }; + + static float32x4_t NOINLINE VPCS_ATTR +-special_case (float32x4_t x, float32x4_t y, uint32x4_t special) ++special_case (float32x4_t x, float32x4_t t, float32x4_t halfsign, ++ uint32x4_t special) + { +- return v_call_f32 (sinhf, x, y, special); ++ return v_call_f32 (sinhf, x, vmulq_f32 (t, halfsign), special); + } + + /* Approximation for vector single-precision sinh(x) using expm1. +@@ -60,15 +59,15 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (sinh) (float32x4_t x) + + uint32x4_t ix = vreinterpretq_u32_f32 (x); + float32x4_t ax = vabsq_f32 (x); +- uint32x4_t iax = vreinterpretq_u32_f32 (ax); +- uint32x4_t sign = veorq_u32 (ix, iax); +- float32x4_t halfsign = vreinterpretq_f32_u32 (vorrq_u32 (sign, d->halff)); ++ float32x4_t halfsign = vreinterpretq_f32_u32 ( ++ vbslq_u32 (v_u32 (0x80000000), ix, vreinterpretq_u32_f32 (v_f32 (0.5)))); + + #if WANT_SIMD_EXCEPT +- uint32x4_t special = vcgeq_u32 (vsubq_u32 (iax, d->tiny_bound), d->thresh); ++ uint32x4_t special = vcgeq_u32 ( ++ vsubq_u32 (vreinterpretq_u32_f32 (ax), d->tiny_bound), d->thresh); + ax = v_zerofy_f32 (ax, special); + #else +- uint32x4_t special = vcgeq_u32 (iax, d->oflow_bound); ++ uint32x4_t special = vcageq_f32 (x, d->oflow_bound); + #endif + + /* Up to the point that expm1f overflows, we can use it to calculate sinhf +@@ -80,7 +79,7 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (sinh) (float32x4_t x) + /* Fall back to the scalar variant for any lanes that should trigger an + exception. */ + if (__glibc_unlikely (v_any_u32 (special))) +- return special_case (x, vmulq_f32 (t, halfsign), special); ++ return special_case (x, t, halfsign, special); + + return vmulq_f32 (t, halfsign); + } +diff --git a/sysdeps/aarch64/fpu/tanhf_advsimd.c b/sysdeps/aarch64/fpu/tanhf_advsimd.c +index 50defd6ef0..3ced9b7a41 100644 +--- a/sysdeps/aarch64/fpu/tanhf_advsimd.c ++++ b/sysdeps/aarch64/fpu/tanhf_advsimd.c +@@ -28,13 +28,16 @@ static const struct data + /* 0x1.205966p+3, above which tanhf rounds to 1 (or -1 for negative). */ + .boring_bound = V4 (0x41102cb3), + .large_bound = V4 (0x7f800000), +- .onef = V4 (0x3f800000), + }; + + static float32x4_t NOINLINE VPCS_ATTR +-special_case (float32x4_t x, float32x4_t y, uint32x4_t special) ++special_case (float32x4_t x, uint32x4_t is_boring, float32x4_t boring, ++ float32x4_t q, uint32x4_t special) + { +- return v_call_f32 (tanhf, x, y, special); ++ return v_call_f32 ( ++ tanhf, x, ++ vbslq_f32 (is_boring, boring, vdivq_f32 (q, vaddq_f32 (q, v_f32 (2.0)))), ++ special); + } + + /* Approximation for single-precision vector tanh(x), using a simplified +@@ -50,7 +53,9 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (tanh) (float32x4_t x) + uint32x4_t iax = vreinterpretq_u32_f32 (ax); + uint32x4_t sign = veorq_u32 (ix, iax); + uint32x4_t is_boring = vcgtq_u32 (iax, d->boring_bound); +- float32x4_t boring = vreinterpretq_f32_u32 (vorrq_u32 (sign, d->onef)); ++ /* expm1 exponent bias is 1.0f reinterpreted to int. */ ++ float32x4_t boring = vreinterpretq_f32_u32 (vorrq_u32 ( ++ sign, vreinterpretq_u32_s32 (d->expm1f_consts.exponent_bias))); + + #if WANT_SIMD_EXCEPT + /* If fp exceptions are to be triggered properly, set all special and boring +@@ -66,10 +71,12 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (tanh) (float32x4_t x) + + /* tanh(x) = (e^2x - 1) / (e^2x + 1). */ + float32x4_t q = expm1f_inline (vmulq_n_f32 (x, 2), &d->expm1f_consts); +- float32x4_t y = vdivq_f32 (q, vaddq_f32 (q, v_f32 (2.0))); ++ + if (__glibc_unlikely (v_any_u32 (special))) +- return special_case (vreinterpretq_f32_u32 (ix), +- vbslq_f32 (is_boring, boring, y), special); ++ return special_case (vreinterpretq_f32_u32 (ix), is_boring, boring, q, ++ special); ++ ++ float32x4_t y = vdivq_f32 (q, vaddq_f32 (q, v_f32 (2.0))); + return vbslq_f32 (is_boring, boring, y); + } + libmvec_hidden_def (V_NAME_F1 (tanh)) +diff --git a/sysdeps/aarch64/fpu/v_expm1f_inline.h b/sysdeps/aarch64/fpu/v_expm1f_inline.h +index 59b552da6b..1daedfdd51 100644 +--- a/sysdeps/aarch64/fpu/v_expm1f_inline.h ++++ b/sysdeps/aarch64/fpu/v_expm1f_inline.h +@@ -21,48 +21,47 @@ + #define AARCH64_FPU_V_EXPM1F_INLINE_H + + #include "v_math.h" +-#include "poly_advsimd_f32.h" ++#include "math_config.h" + + struct v_expm1f_data + { +- float32x4_t poly[5]; +- float invln2_and_ln2[4]; +- float32x4_t shift; ++ float32x4_t c0, c2; + int32x4_t exponent_bias; ++ float c1, c3, inv_ln2, c4; ++ float ln2_hi, ln2_lo; + }; + + /* Coefficients generated using fpminimax with degree=5 in [-log(2)/2, +- log(2)/2]. Exponent bias is asuint(1.0f). +- invln2_and_ln2 Stores constants: invln2, ln2_lo, ln2_hi, 0. */ ++ log(2)/2]. Exponent bias is asuint(1.0f). */ + #define V_EXPM1F_DATA \ + { \ +- .poly = { V4 (0x1.fffffep-2), V4 (0x1.5554aep-3), V4 (0x1.555736p-5), \ +- V4 (0x1.12287cp-7), V4 (0x1.6b55a2p-10) }, \ +- .shift = V4 (0x1.8p23f), .exponent_bias = V4 (0x3f800000), \ +- .invln2_and_ln2 = { 0x1.715476p+0f, 0x1.62e4p-1f, 0x1.7f7d1cp-20f, 0 }, \ ++ .c0 = V4 (0x1.fffffep-2), .c1 = 0x1.5554aep-3, .c2 = V4 (0x1.555736p-5), \ ++ .c3 = 0x1.12287cp-7, .c4 = 0x1.6b55a2p-10, \ ++ .exponent_bias = V4 (0x3f800000), .inv_ln2 = 0x1.715476p+0f, \ ++ .ln2_hi = 0x1.62e4p-1f, .ln2_lo = 0x1.7f7d1cp-20f, \ + } + + static inline float32x4_t + expm1f_inline (float32x4_t x, const struct v_expm1f_data *d) + { +- /* Helper routine for calculating exp(x) - 1. +- Copied from v_expm1f_1u6.c, with all special-case handling removed - the +- calling routine should handle special values if required. */ ++ /* Helper routine for calculating exp(x) - 1. */ ++ ++ float32x2_t ln2 = vld1_f32 (&d->ln2_hi); ++ float32x4_t lane_consts = vld1q_f32 (&d->c1); + + /* Reduce argument: f in [-ln2/2, ln2/2], i is exact. */ +- float32x4_t invln2_and_ln2 = vld1q_f32 (d->invln2_and_ln2); +- float32x4_t j +- = vsubq_f32 (vfmaq_laneq_f32 (d->shift, x, invln2_and_ln2, 0), d->shift); ++ float32x4_t j = vrndaq_f32 (vmulq_laneq_f32 (x, lane_consts, 2)); + int32x4_t i = vcvtq_s32_f32 (j); +- float32x4_t f = vfmsq_laneq_f32 (x, j, invln2_and_ln2, 1); +- f = vfmsq_laneq_f32 (f, j, invln2_and_ln2, 2); ++ float32x4_t f = vfmsq_lane_f32 (x, j, ln2, 0); ++ f = vfmsq_lane_f32 (f, j, ln2, 1); + +- /* Approximate expm1(f) with polynomial P, expm1(f) ~= f + f^2 * P(f). +- Uses Estrin scheme, where the main _ZGVnN4v_expm1f routine uses +- Horner. */ ++ /* Approximate expm1(f) with polynomial P, expm1(f) ~= f + f^2 * P(f). */ + float32x4_t f2 = vmulq_f32 (f, f); + float32x4_t f4 = vmulq_f32 (f2, f2); +- float32x4_t p = v_estrin_4_f32 (f, f2, f4, d->poly); ++ float32x4_t p01 = vfmaq_laneq_f32 (d->c0, f, lane_consts, 0); ++ float32x4_t p23 = vfmaq_laneq_f32 (d->c2, f, lane_consts, 1); ++ float32x4_t p = vfmaq_f32 (p01, f2, p23); ++ p = vfmaq_laneq_f32 (p, f4, lane_consts, 3); + p = vfmaq_f32 (f, f2, p); + + /* t = 2^i. */ + +commit 68f2eb20de698675ddc74068c2cd03fee29207df +Author: Joe Ramsay +Date: Mon Sep 23 15:33:31 2024 +0100 + + AArch64: Simplify rounding-multiply pattern in several AdvSIMD routines + + This operation can be simplified to use simpler multiply-round-convert + sequence, which uses fewer instructions and constants. + + Reviewed-by: Wilco Dijkstra + (cherry picked from commit 16a59571e4e9fd019d3fc23a2e7d73c1df8bb5cb) + +diff --git a/sysdeps/aarch64/fpu/cos_advsimd.c b/sysdeps/aarch64/fpu/cos_advsimd.c +index 3924c9ce44..11a89b1530 100644 +--- a/sysdeps/aarch64/fpu/cos_advsimd.c ++++ b/sysdeps/aarch64/fpu/cos_advsimd.c +@@ -22,7 +22,7 @@ + static const struct data + { + float64x2_t poly[7]; +- float64x2_t range_val, shift, inv_pi, half_pi, pi_1, pi_2, pi_3; ++ float64x2_t range_val, inv_pi, pi_1, pi_2, pi_3; + } data = { + /* Worst-case error is 3.3 ulp in [-pi/2, pi/2]. */ + .poly = { V2 (-0x1.555555555547bp-3), V2 (0x1.1111111108a4dp-7), +@@ -30,11 +30,9 @@ static const struct data + V2 (-0x1.ae633919987c6p-26), V2 (0x1.60e277ae07cecp-33), + V2 (-0x1.9e9540300a1p-41) }, + .inv_pi = V2 (0x1.45f306dc9c883p-2), +- .half_pi = V2 (0x1.921fb54442d18p+0), + .pi_1 = V2 (0x1.921fb54442d18p+1), + .pi_2 = V2 (0x1.1a62633145c06p-53), + .pi_3 = V2 (0x1.c1cd129024e09p-106), +- .shift = V2 (0x1.8p52), + .range_val = V2 (0x1p23) + }; + +@@ -68,10 +66,9 @@ float64x2_t VPCS_ATTR V_NAME_D1 (cos) (float64x2_t x) + #endif + + /* n = rint((|x|+pi/2)/pi) - 0.5. */ +- n = vfmaq_f64 (d->shift, d->inv_pi, vaddq_f64 (r, d->half_pi)); +- odd = vshlq_n_u64 (vreinterpretq_u64_f64 (n), 63); +- n = vsubq_f64 (n, d->shift); +- n = vsubq_f64 (n, v_f64 (0.5)); ++ n = vrndaq_f64 (vfmaq_f64 (v_f64 (0.5), r, d->inv_pi)); ++ odd = vshlq_n_u64 (vreinterpretq_u64_s64 (vcvtq_s64_f64 (n)), 63); ++ n = vsubq_f64 (n, v_f64 (0.5f)); + + /* r = |x| - n*pi (range reduction into -pi/2 .. pi/2). */ + r = vfmsq_f64 (r, d->pi_1, n); +diff --git a/sysdeps/aarch64/fpu/cosf_advsimd.c b/sysdeps/aarch64/fpu/cosf_advsimd.c +index d0c285b03a..85a1b37373 100644 +--- a/sysdeps/aarch64/fpu/cosf_advsimd.c ++++ b/sysdeps/aarch64/fpu/cosf_advsimd.c +@@ -22,7 +22,7 @@ + static const struct data + { + float32x4_t poly[4]; +- float32x4_t range_val, inv_pi, half_pi, shift, pi_1, pi_2, pi_3; ++ float32x4_t range_val, inv_pi, pi_1, pi_2, pi_3; + } data = { + /* 1.886 ulp error. */ + .poly = { V4 (-0x1.555548p-3f), V4 (0x1.110df4p-7f), V4 (-0x1.9f42eap-13f), +@@ -33,8 +33,6 @@ static const struct data + .pi_3 = V4 (-0x1.ee59dap-49f), + + .inv_pi = V4 (0x1.45f306p-2f), +- .shift = V4 (0x1.8p+23f), +- .half_pi = V4 (0x1.921fb6p0f), + .range_val = V4 (0x1p20f) + }; + +@@ -69,9 +67,8 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (cos) (float32x4_t x) + #endif + + /* n = rint((|x|+pi/2)/pi) - 0.5. */ +- n = vfmaq_f32 (d->shift, d->inv_pi, vaddq_f32 (r, d->half_pi)); +- odd = vshlq_n_u32 (vreinterpretq_u32_f32 (n), 31); +- n = vsubq_f32 (n, d->shift); ++ n = vrndaq_f32 (vfmaq_f32 (v_f32 (0.5), r, d->inv_pi)); ++ odd = vshlq_n_u32 (vreinterpretq_u32_s32 (vcvtq_s32_f32 (n)), 31); + n = vsubq_f32 (n, v_f32 (0.5f)); + + /* r = |x| - n*pi (range reduction into -pi/2 .. pi/2). */ +diff --git a/sysdeps/aarch64/fpu/expf_advsimd.c b/sysdeps/aarch64/fpu/expf_advsimd.c +index 99d2e647aa..5c9cb72620 100644 +--- a/sysdeps/aarch64/fpu/expf_advsimd.c ++++ b/sysdeps/aarch64/fpu/expf_advsimd.c +@@ -22,7 +22,7 @@ + static const struct data + { + float32x4_t poly[5]; +- float32x4_t shift, inv_ln2, ln2_hi, ln2_lo; ++ float32x4_t inv_ln2, ln2_hi, ln2_lo; + uint32x4_t exponent_bias; + #if !WANT_SIMD_EXCEPT + float32x4_t special_bound, scale_thresh; +@@ -31,7 +31,6 @@ static const struct data + /* maxerr: 1.45358 +0.5 ulp. */ + .poly = { V4 (0x1.0e4020p-7f), V4 (0x1.573e2ep-5f), V4 (0x1.555e66p-3f), + V4 (0x1.fffdb6p-2f), V4 (0x1.ffffecp-1f) }, +- .shift = V4 (0x1.8p23f), + .inv_ln2 = V4 (0x1.715476p+0f), + .ln2_hi = V4 (0x1.62e4p-1f), + .ln2_lo = V4 (0x1.7f7d1cp-20f), +@@ -85,7 +84,7 @@ special_case (float32x4_t poly, float32x4_t n, uint32x4_t e, uint32x4_t cmp1, + float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (exp) (float32x4_t x) + { + const struct data *d = ptr_barrier (&data); +- float32x4_t n, r, r2, scale, p, q, poly, z; ++ float32x4_t n, r, r2, scale, p, q, poly; + uint32x4_t cmp, e; + + #if WANT_SIMD_EXCEPT +@@ -104,11 +103,10 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (exp) (float32x4_t x) + + /* exp(x) = 2^n (1 + poly(r)), with 1 + poly(r) in [1/sqrt(2),sqrt(2)] + x = ln2*n + r, with r in [-ln2/2, ln2/2]. */ +- z = vfmaq_f32 (d->shift, x, d->inv_ln2); +- n = vsubq_f32 (z, d->shift); ++ n = vrndaq_f32 (vmulq_f32 (x, d->inv_ln2)); + r = vfmsq_f32 (x, n, d->ln2_hi); + r = vfmsq_f32 (r, n, d->ln2_lo); +- e = vshlq_n_u32 (vreinterpretq_u32_f32 (z), 23); ++ e = vshlq_n_u32 (vreinterpretq_u32_s32 (vcvtq_s32_f32 (n)), 23); + scale = vreinterpretq_f32_u32 (vaddq_u32 (e, d->exponent_bias)); + + #if !WANT_SIMD_EXCEPT +diff --git a/sysdeps/aarch64/fpu/sin_advsimd.c b/sysdeps/aarch64/fpu/sin_advsimd.c +index a0d9d3b819..718125cbad 100644 +--- a/sysdeps/aarch64/fpu/sin_advsimd.c ++++ b/sysdeps/aarch64/fpu/sin_advsimd.c +@@ -22,7 +22,7 @@ + static const struct data + { + float64x2_t poly[7]; +- float64x2_t range_val, inv_pi, shift, pi_1, pi_2, pi_3; ++ float64x2_t range_val, inv_pi, pi_1, pi_2, pi_3; + } data = { + .poly = { V2 (-0x1.555555555547bp-3), V2 (0x1.1111111108a4dp-7), + V2 (-0x1.a01a019936f27p-13), V2 (0x1.71de37a97d93ep-19), +@@ -34,12 +34,13 @@ static const struct data + .pi_1 = V2 (0x1.921fb54442d18p+1), + .pi_2 = V2 (0x1.1a62633145c06p-53), + .pi_3 = V2 (0x1.c1cd129024e09p-106), +- .shift = V2 (0x1.8p52), + }; + + #if WANT_SIMD_EXCEPT +-# define TinyBound v_u64 (0x3000000000000000) /* asuint64 (0x1p-255). */ +-# define Thresh v_u64 (0x1160000000000000) /* RangeVal - TinyBound. */ ++/* asuint64(0x1p-253)), below which multiply by inv_pi underflows. */ ++# define TinyBound v_u64 (0x3020000000000000) ++/* RangeVal - TinyBound. */ ++# define Thresh v_u64 (0x1160000000000000) + #endif + + #define C(i) d->poly[i] +@@ -72,16 +73,15 @@ float64x2_t VPCS_ATTR V_NAME_D1 (sin) (float64x2_t x) + fenv). These lanes will be fixed by special-case handler later. */ + uint64x2_t ir = vreinterpretq_u64_f64 (vabsq_f64 (x)); + cmp = vcgeq_u64 (vsubq_u64 (ir, TinyBound), Thresh); +- r = vbslq_f64 (cmp, vreinterpretq_f64_u64 (cmp), x); ++ r = vreinterpretq_f64_u64 (vbicq_u64 (vreinterpretq_u64_f64 (x), cmp)); + #else + r = x; + cmp = vcageq_f64 (x, d->range_val); + #endif + + /* n = rint(|x|/pi). */ +- n = vfmaq_f64 (d->shift, d->inv_pi, r); +- odd = vshlq_n_u64 (vreinterpretq_u64_f64 (n), 63); +- n = vsubq_f64 (n, d->shift); ++ n = vrndaq_f64 (vmulq_f64 (r, d->inv_pi)); ++ odd = vshlq_n_u64 (vreinterpretq_u64_s64 (vcvtq_s64_f64 (n)), 63); + + /* r = |x| - n*pi (range reduction into -pi/2 .. pi/2). */ + r = vfmsq_f64 (r, d->pi_1, n); +diff --git a/sysdeps/aarch64/fpu/sinf_advsimd.c b/sysdeps/aarch64/fpu/sinf_advsimd.c +index 375dfc3331..6ee9a23d5b 100644 +--- a/sysdeps/aarch64/fpu/sinf_advsimd.c ++++ b/sysdeps/aarch64/fpu/sinf_advsimd.c +@@ -22,7 +22,7 @@ + static const struct data + { + float32x4_t poly[4]; +- float32x4_t range_val, inv_pi, shift, pi_1, pi_2, pi_3; ++ float32x4_t range_val, inv_pi, pi_1, pi_2, pi_3; + } data = { + /* 1.886 ulp error. */ + .poly = { V4 (-0x1.555548p-3f), V4 (0x1.110df4p-7f), V4 (-0x1.9f42eap-13f), +@@ -33,13 +33,14 @@ static const struct data + .pi_3 = V4 (-0x1.ee59dap-49f), + + .inv_pi = V4 (0x1.45f306p-2f), +- .shift = V4 (0x1.8p+23f), + .range_val = V4 (0x1p20f) + }; + + #if WANT_SIMD_EXCEPT +-# define TinyBound v_u32 (0x21000000) /* asuint32(0x1p-61f). */ +-# define Thresh v_u32 (0x28800000) /* RangeVal - TinyBound. */ ++/* asuint32(0x1p-59f), below which multiply by inv_pi underflows. */ ++# define TinyBound v_u32 (0x22000000) ++/* RangeVal - TinyBound. */ ++# define Thresh v_u32 (0x27800000) + #endif + + #define C(i) d->poly[i] +@@ -64,23 +65,22 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (sin) (float32x4_t x) + /* If fenv exceptions are to be triggered correctly, set any special lanes + to 1 (which is neutral w.r.t. fenv). These lanes will be fixed by + special-case handler later. */ +- r = vbslq_f32 (cmp, vreinterpretq_f32_u32 (cmp), x); ++ r = vreinterpretq_f32_u32 (vbicq_u32 (vreinterpretq_u32_f32 (x), cmp)); + #else + r = x; + cmp = vcageq_f32 (x, d->range_val); + #endif + +- /* n = rint(|x|/pi) */ +- n = vfmaq_f32 (d->shift, d->inv_pi, r); +- odd = vshlq_n_u32 (vreinterpretq_u32_f32 (n), 31); +- n = vsubq_f32 (n, d->shift); ++ /* n = rint(|x|/pi). */ ++ n = vrndaq_f32 (vmulq_f32 (r, d->inv_pi)); ++ odd = vshlq_n_u32 (vreinterpretq_u32_s32 (vcvtq_s32_f32 (n)), 31); + +- /* r = |x| - n*pi (range reduction into -pi/2 .. pi/2) */ ++ /* r = |x| - n*pi (range reduction into -pi/2 .. pi/2). */ + r = vfmsq_f32 (r, d->pi_1, n); + r = vfmsq_f32 (r, d->pi_2, n); + r = vfmsq_f32 (r, d->pi_3, n); + +- /* y = sin(r) */ ++ /* y = sin(r). */ + r2 = vmulq_f32 (r, r); + y = vfmaq_f32 (C (2), C (3), r2); + y = vfmaq_f32 (C (1), y, r2); + +commit 9ff7559b274eb0dbce2cbcf87284c1d30d47a2d6 +Author: Joe Ramsay +Date: Mon Oct 28 14:58:35 2024 +0000 + + AArch64: Small optimisation in AdvSIMD erf and erfc + + In both routines, reduce register pressure such that GCC 14 emits no + spills for erf and fewer spills for erfc. Also use more efficient + comparison for the special-case in erf. + + Benchtests show erf improves by 6.4%, erfc by 1.0%. + + (cherry picked from commit 1cf29fbc5be23db775d1dfa6b332ded6e6554252) + +diff --git a/sysdeps/aarch64/fpu/erf_advsimd.c b/sysdeps/aarch64/fpu/erf_advsimd.c +index 19cbb7d0f4..c0116735e4 100644 +--- a/sysdeps/aarch64/fpu/erf_advsimd.c ++++ b/sysdeps/aarch64/fpu/erf_advsimd.c +@@ -22,19 +22,21 @@ + static const struct data + { + float64x2_t third; +- float64x2_t tenth, two_over_five, two_over_fifteen; +- float64x2_t two_over_nine, two_over_fortyfive; ++ float64x2_t tenth, two_over_five, two_over_nine; ++ double two_over_fifteen, two_over_fortyfive; + float64x2_t max, shift; ++ uint64x2_t max_idx; + #if WANT_SIMD_EXCEPT + float64x2_t tiny_bound, huge_bound, scale_minus_one; + #endif + } data = { ++ .max_idx = V2 (768), + .third = V2 (0x1.5555555555556p-2), /* used to compute 2/3 and 1/6 too. */ +- .two_over_fifteen = V2 (0x1.1111111111111p-3), ++ .two_over_fifteen = 0x1.1111111111111p-3, + .tenth = V2 (-0x1.999999999999ap-4), + .two_over_five = V2 (-0x1.999999999999ap-2), + .two_over_nine = V2 (-0x1.c71c71c71c71cp-3), +- .two_over_fortyfive = V2 (0x1.6c16c16c16c17p-5), ++ .two_over_fortyfive = 0x1.6c16c16c16c17p-5, + .max = V2 (5.9921875), /* 6 - 1/128. */ + .shift = V2 (0x1p45), + #if WANT_SIMD_EXCEPT +@@ -87,8 +89,8 @@ float64x2_t VPCS_ATTR V_NAME_D1 (erf) (float64x2_t x) + float64x2_t a = vabsq_f64 (x); + /* Reciprocal conditions that do not catch NaNs so they can be used in BSLs + to return expected results. */ +- uint64x2_t a_le_max = vcleq_f64 (a, dat->max); +- uint64x2_t a_gt_max = vcgtq_f64 (a, dat->max); ++ uint64x2_t a_le_max = vcaleq_f64 (x, dat->max); ++ uint64x2_t a_gt_max = vcagtq_f64 (x, dat->max); + + #if WANT_SIMD_EXCEPT + /* |x| huge or tiny. */ +@@ -115,7 +117,7 @@ float64x2_t VPCS_ATTR V_NAME_D1 (erf) (float64x2_t x) + segfault. */ + uint64x2_t i + = vsubq_u64 (vreinterpretq_u64_f64 (z), vreinterpretq_u64_f64 (shift)); +- i = vbslq_u64 (a_le_max, i, v_u64 (768)); ++ i = vbslq_u64 (a_le_max, i, dat->max_idx); + struct entry e = lookup (i); + + float64x2_t r = vsubq_f64 (z, shift); +@@ -125,14 +127,19 @@ float64x2_t VPCS_ATTR V_NAME_D1 (erf) (float64x2_t x) + float64x2_t d2 = vmulq_f64 (d, d); + float64x2_t r2 = vmulq_f64 (r, r); + ++ float64x2_t two_over_fifteen_and_fortyfive ++ = vld1q_f64 (&dat->two_over_fifteen); ++ + /* poly (d, r) = 1 + p1(r) * d + p2(r) * d^2 + ... + p5(r) * d^5. */ + float64x2_t p1 = r; + float64x2_t p2 + = vfmsq_f64 (dat->third, r2, vaddq_f64 (dat->third, dat->third)); + float64x2_t p3 = vmulq_f64 (r, vfmaq_f64 (v_f64 (-0.5), r2, dat->third)); +- float64x2_t p4 = vfmaq_f64 (dat->two_over_five, r2, dat->two_over_fifteen); ++ float64x2_t p4 = vfmaq_laneq_f64 (dat->two_over_five, r2, ++ two_over_fifteen_and_fortyfive, 0); + p4 = vfmsq_f64 (dat->tenth, r2, p4); +- float64x2_t p5 = vfmaq_f64 (dat->two_over_nine, r2, dat->two_over_fortyfive); ++ float64x2_t p5 = vfmaq_laneq_f64 (dat->two_over_nine, r2, ++ two_over_fifteen_and_fortyfive, 1); + p5 = vmulq_f64 (r, vfmaq_f64 (vmulq_f64 (v_f64 (0.5), dat->third), r2, p5)); + + float64x2_t p34 = vfmaq_f64 (p3, d, p4); +diff --git a/sysdeps/aarch64/fpu/erfc_advsimd.c b/sysdeps/aarch64/fpu/erfc_advsimd.c +index f1b3bfe830..2f2f755c46 100644 +--- a/sysdeps/aarch64/fpu/erfc_advsimd.c ++++ b/sysdeps/aarch64/fpu/erfc_advsimd.c +@@ -24,8 +24,8 @@ static const struct data + { + uint64x2_t offset, table_scale; + float64x2_t max, shift; +- float64x2_t p20, p40, p41, p42; +- float64x2_t p51, p52; ++ float64x2_t p20, p40, p41, p51; ++ double p42, p52; + double qr5[2], qr6[2], qr7[2], qr8[2], qr9[2]; + #if WANT_SIMD_EXCEPT + float64x2_t uflow_bound; +@@ -41,9 +41,9 @@ static const struct data + .p20 = V2 (0x1.5555555555555p-2), /* 1/3, used to compute 2/3 and 1/6. */ + .p40 = V2 (-0x1.999999999999ap-4), /* 1/10. */ + .p41 = V2 (-0x1.999999999999ap-2), /* 2/5. */ +- .p42 = V2 (0x1.1111111111111p-3), /* 2/15. */ ++ .p42 = 0x1.1111111111111p-3, /* 2/15. */ + .p51 = V2 (-0x1.c71c71c71c71cp-3), /* 2/9. */ +- .p52 = V2 (0x1.6c16c16c16c17p-5), /* 2/45. */ ++ .p52 = 0x1.6c16c16c16c17p-5, /* 2/45. */ + /* Qi = (i+1) / i, Ri = -2 * i / ((i+1)*(i+2)), for i = 5, ..., 9. */ + .qr5 = { 0x1.3333333333333p0, -0x1.e79e79e79e79ep-3 }, + .qr6 = { 0x1.2aaaaaaaaaaabp0, -0x1.b6db6db6db6dbp-3 }, +@@ -157,9 +157,10 @@ float64x2_t V_NAME_D1 (erfc) (float64x2_t x) + float64x2_t p1 = r; + float64x2_t p2 = vfmsq_f64 (dat->p20, r2, vaddq_f64 (dat->p20, dat->p20)); + float64x2_t p3 = vmulq_f64 (r, vfmaq_f64 (v_f64 (-0.5), r2, dat->p20)); +- float64x2_t p4 = vfmaq_f64 (dat->p41, r2, dat->p42); ++ float64x2_t p42_p52 = vld1q_f64 (&dat->p42); ++ float64x2_t p4 = vfmaq_laneq_f64 (dat->p41, r2, p42_p52, 0); + p4 = vfmsq_f64 (dat->p40, r2, p4); +- float64x2_t p5 = vfmaq_f64 (dat->p51, r2, dat->p52); ++ float64x2_t p5 = vfmaq_laneq_f64 (dat->p51, r2, p42_p52, 1); + p5 = vmulq_f64 (r, vfmaq_f64 (vmulq_f64 (v_f64 (0.5), dat->p20), r2, p5)); + /* Compute p_i using recurrence relation: + p_{i+2} = (p_i + r * Q_{i+1} * p_{i+1}) * R_{i+1}. */ + +commit 76c923fe9d09befc8131205659d99cb9ac97460a +Author: Joe Ramsay +Date: Fri Nov 1 15:48:54 2024 +0000 + + AArch64: Remove SVE erf and erfc tables + + By using a combination of mask-and-add instead of the shift-based + index calculation the routines can share the same table as other + variants with no performance degradation. + + The tables change name because of other changes in downstream AOR. + + Reviewed-by: Wilco Dijkstra + (cherry picked from commit 2d82d781a539ce8e82178fc1fa2c99ae1884e7fe) + +diff --git a/sysdeps/aarch64/fpu/Makefile b/sysdeps/aarch64/fpu/Makefile +index 234a6c457c..be8541f649 100644 +--- a/sysdeps/aarch64/fpu/Makefile ++++ b/sysdeps/aarch64/fpu/Makefile +@@ -41,8 +41,6 @@ libmvec-support = $(addsuffix f_advsimd,$(float-advsimd-funcs)) \ + v_log10_data \ + erf_data \ + erff_data \ +- sv_erf_data \ +- sv_erff_data \ + v_exp_tail_data \ + erfc_data \ + erfcf_data \ +diff --git a/sysdeps/aarch64/fpu/erf_advsimd.c b/sysdeps/aarch64/fpu/erf_advsimd.c +index c0116735e4..a48092e838 100644 +--- a/sysdeps/aarch64/fpu/erf_advsimd.c ++++ b/sysdeps/aarch64/fpu/erf_advsimd.c +@@ -58,8 +58,8 @@ static inline struct entry + lookup (uint64x2_t i) + { + struct entry e; +- float64x2_t e1 = vld1q_f64 (&__erf_data.tab[vgetq_lane_u64 (i, 0)].erf), +- e2 = vld1q_f64 (&__erf_data.tab[vgetq_lane_u64 (i, 1)].erf); ++ float64x2_t e1 = vld1q_f64 (&__v_erf_data.tab[vgetq_lane_u64 (i, 0)].erf), ++ e2 = vld1q_f64 (&__v_erf_data.tab[vgetq_lane_u64 (i, 1)].erf); + e.erf = vuzp1q_f64 (e1, e2); + e.scale = vuzp2q_f64 (e1, e2); + return e; +diff --git a/sysdeps/aarch64/fpu/erf_data.c b/sysdeps/aarch64/fpu/erf_data.c +index 6d2dcd235c..ea01fad7ca 100644 +--- a/sysdeps/aarch64/fpu/erf_data.c ++++ b/sysdeps/aarch64/fpu/erf_data.c +@@ -19,14 +19,14 @@ + + #include "vecmath_config.h" + +-/* Lookup table used in erf. ++/* Lookup table used in vector erf. + For each possible rounded input r (multiples of 1/128), between + r = 0.0 and r = 6.0 (769 values): +- - the first entry __erff_data.tab.erf contains the values of erf(r), +- - the second entry __erff_data.tab.scale contains the values of ++ - the first entry __v_erff_data.tab.erf contains the values of erf(r), ++ - the second entry __v_erff_data.tab.scale contains the values of + 2/sqrt(pi)*exp(-r^2). Note that indices 0 and 1 are never hit by the + algorithm, since lookup is performed only for x >= 1/64-1/512. */ +-const struct erf_data __erf_data = { ++const struct v_erf_data __v_erf_data = { + .tab = { { 0x0.0000000000000p+0, 0x1.20dd750429b6dp+0 }, + { 0x1.20dbf3deb1340p-7, 0x1.20d8f1975c85dp+0 }, + { 0x1.20d77083f17a0p-6, 0x1.20cb67bd452c7p+0 }, +diff --git a/sysdeps/aarch64/fpu/erf_sve.c b/sysdeps/aarch64/fpu/erf_sve.c +index 7d51417406..671d55a02b 100644 +--- a/sysdeps/aarch64/fpu/erf_sve.c ++++ b/sysdeps/aarch64/fpu/erf_sve.c +@@ -67,14 +67,16 @@ svfloat64_t SV_NAME_D1 (erf) (svfloat64_t x, const svbool_t pg) + svfloat64_t a = svabs_x (pg, x); + svfloat64_t shift = sv_f64 (dat->shift); + svfloat64_t z = svadd_x (pg, a, shift); +- svuint64_t i +- = svsub_x (pg, svreinterpret_u64 (z), svreinterpret_u64 (shift)); ++ svuint64_t i = svand_x (pg, svreinterpret_u64 (z), 0xfff); ++ i = svadd_x (pg, i, i); + + /* Lookup without shortcut for small values but with predicate to avoid + segfault for large values and NaNs. */ + svfloat64_t r = svsub_x (pg, z, shift); +- svfloat64_t erfr = svld1_gather_index (a_lt_max, __sv_erf_data.erf, i); +- svfloat64_t scale = svld1_gather_index (a_lt_max, __sv_erf_data.scale, i); ++ svfloat64_t erfr ++ = svld1_gather_index (a_lt_max, &__v_erf_data.tab[0].erf, i); ++ svfloat64_t scale ++ = svld1_gather_index (a_lt_max, &__v_erf_data.tab[0].scale, i); + + /* erf(x) ~ erf(r) + scale * d * poly (r, d). */ + svfloat64_t d = svsub_x (pg, a, r); +diff --git a/sysdeps/aarch64/fpu/erfc_advsimd.c b/sysdeps/aarch64/fpu/erfc_advsimd.c +index 2f2f755c46..d05eac61a2 100644 +--- a/sysdeps/aarch64/fpu/erfc_advsimd.c ++++ b/sysdeps/aarch64/fpu/erfc_advsimd.c +@@ -69,9 +69,9 @@ lookup (uint64x2_t i) + { + struct entry e; + float64x2_t e1 +- = vld1q_f64 (&__erfc_data.tab[vgetq_lane_u64 (i, 0) - Off].erfc); ++ = vld1q_f64 (&__v_erfc_data.tab[vgetq_lane_u64 (i, 0) - Off].erfc); + float64x2_t e2 +- = vld1q_f64 (&__erfc_data.tab[vgetq_lane_u64 (i, 1) - Off].erfc); ++ = vld1q_f64 (&__v_erfc_data.tab[vgetq_lane_u64 (i, 1) - Off].erfc); + e.erfc = vuzp1q_f64 (e1, e2); + e.scale = vuzp2q_f64 (e1, e2); + return e; +diff --git a/sysdeps/aarch64/fpu/erfc_data.c b/sysdeps/aarch64/fpu/erfc_data.c +index 76a94e4681..8dc6a8c42c 100644 +--- a/sysdeps/aarch64/fpu/erfc_data.c ++++ b/sysdeps/aarch64/fpu/erfc_data.c +@@ -19,14 +19,14 @@ + + #include "vecmath_config.h" + +-/* Lookup table used in erfc. ++/* Lookup table used in vector erfc. + For each possible rounded input r (multiples of 1/128), between + r = 0.0 and r = ~27.0 (3488 values): +- - the first entry __erfc_data.tab.erfc contains the values of erfc(r), +- - the second entry __erfc_data.tab.scale contains the values of ++ - the first entry __v_erfc_data.tab.erfc contains the values of erfc(r), ++ - the second entry __v_erfc_data.tab.scale contains the values of + 2/sqrt(pi)*exp(-r^2). Both values may go into subnormal range, therefore + they are scaled by a large enough value 2^128 (fits in 8bit). */ +-const struct erfc_data __erfc_data = { ++const struct v_erfc_data __v_erfc_data = { + .tab = { { 0x1p128, 0x1.20dd750429b6dp128 }, + { 0x1.fb7c9030853b3p127, 0x1.20d8f1975c85dp128 }, + { 0x1.f6f9447be0743p127, 0x1.20cb67bd452c7p128 }, +diff --git a/sysdeps/aarch64/fpu/erfc_sve.c b/sysdeps/aarch64/fpu/erfc_sve.c +index c17d3e4484..703926ee41 100644 +--- a/sysdeps/aarch64/fpu/erfc_sve.c ++++ b/sysdeps/aarch64/fpu/erfc_sve.c +@@ -104,7 +104,7 @@ svfloat64_t SV_NAME_D1 (erfc) (svfloat64_t x, const svbool_t pg) + + /* Lookup erfc(r) and 2/sqrt(pi)*exp(-r^2) in tables. */ + i = svadd_x (pg, i, i); +- const float64_t *p = &__erfc_data.tab[0].erfc - 2 * dat->off_arr; ++ const float64_t *p = &__v_erfc_data.tab[0].erfc - 2 * dat->off_arr; + svfloat64_t erfcr = svld1_gather_index (pg, p, i); + svfloat64_t scale = svld1_gather_index (pg, p + 1, i); + +diff --git a/sysdeps/aarch64/fpu/erfcf_advsimd.c b/sysdeps/aarch64/fpu/erfcf_advsimd.c +index ca5bc3ab33..59b0b0d64b 100644 +--- a/sysdeps/aarch64/fpu/erfcf_advsimd.c ++++ b/sysdeps/aarch64/fpu/erfcf_advsimd.c +@@ -62,13 +62,13 @@ lookup (uint32x4_t i) + { + struct entry e; + float32x2_t t0 +- = vld1_f32 (&__erfcf_data.tab[vgetq_lane_u32 (i, 0) - Off].erfc); ++ = vld1_f32 (&__v_erfcf_data.tab[vgetq_lane_u32 (i, 0) - Off].erfc); + float32x2_t t1 +- = vld1_f32 (&__erfcf_data.tab[vgetq_lane_u32 (i, 1) - Off].erfc); ++ = vld1_f32 (&__v_erfcf_data.tab[vgetq_lane_u32 (i, 1) - Off].erfc); + float32x2_t t2 +- = vld1_f32 (&__erfcf_data.tab[vgetq_lane_u32 (i, 2) - Off].erfc); ++ = vld1_f32 (&__v_erfcf_data.tab[vgetq_lane_u32 (i, 2) - Off].erfc); + float32x2_t t3 +- = vld1_f32 (&__erfcf_data.tab[vgetq_lane_u32 (i, 3) - Off].erfc); ++ = vld1_f32 (&__v_erfcf_data.tab[vgetq_lane_u32 (i, 3) - Off].erfc); + float32x4_t e1 = vcombine_f32 (t0, t1); + float32x4_t e2 = vcombine_f32 (t2, t3); + e.erfc = vuzp1q_f32 (e1, e2); +diff --git a/sysdeps/aarch64/fpu/erfcf_data.c b/sysdeps/aarch64/fpu/erfcf_data.c +index 77fb889a78..d45087bbb9 100644 +--- a/sysdeps/aarch64/fpu/erfcf_data.c ++++ b/sysdeps/aarch64/fpu/erfcf_data.c +@@ -19,14 +19,14 @@ + + #include "vecmath_config.h" + +-/* Lookup table used in erfcf. ++/* Lookup table used in vector erfcf. + For each possible rounded input r (multiples of 1/64), between + r = 0.0 and r = 10.0625 (645 values): +- - the first entry __erfcf_data.tab.erfc contains the values of erfc(r), +- - the second entry __erfcf_data.tab.scale contains the values of ++ - the first entry __v_erfcf_data.tab.erfc contains the values of erfc(r), ++ - the second entry __v_erfcf_data.tab.scale contains the values of + 2/sqrt(pi)*exp(-r^2). Both values may go into subnormal range, therefore + they are scaled by a large enough value 2^47 (fits in 8 bits). */ +-const struct erfcf_data __erfcf_data = { ++const struct v_erfcf_data __v_erfcf_data = { + .tab = { { 0x1p47, 0x1.20dd76p47 }, + { 0x1.f6f944p46, 0x1.20cb68p47 }, + { 0x1.edf3aap46, 0x1.209546p47 }, +diff --git a/sysdeps/aarch64/fpu/erfcf_sve.c b/sysdeps/aarch64/fpu/erfcf_sve.c +index 48d1677eb4..ecacb933ac 100644 +--- a/sysdeps/aarch64/fpu/erfcf_sve.c ++++ b/sysdeps/aarch64/fpu/erfcf_sve.c +@@ -77,7 +77,7 @@ svfloat32_t SV_NAME_F1 (erfc) (svfloat32_t x, const svbool_t pg) + + /* Lookup erfc(r) and 2/sqrt(pi)*exp(-r^2) in tables. */ + i = svmul_x (pg, i, 2); +- const float32_t *p = &__erfcf_data.tab[0].erfc - 2 * dat->off_arr; ++ const float32_t *p = &__v_erfcf_data.tab[0].erfc - 2 * dat->off_arr; + svfloat32_t erfcr = svld1_gather_index (pg, p, i); + svfloat32_t scale = svld1_gather_index (pg, p + 1, i); + +diff --git a/sysdeps/aarch64/fpu/erff_advsimd.c b/sysdeps/aarch64/fpu/erff_advsimd.c +index f2fe6ff236..db39e789b6 100644 +--- a/sysdeps/aarch64/fpu/erff_advsimd.c ++++ b/sysdeps/aarch64/fpu/erff_advsimd.c +@@ -47,10 +47,10 @@ static inline struct entry + lookup (uint32x4_t i) + { + struct entry e; +- float32x2_t t0 = vld1_f32 (&__erff_data.tab[vgetq_lane_u32 (i, 0)].erf); +- float32x2_t t1 = vld1_f32 (&__erff_data.tab[vgetq_lane_u32 (i, 1)].erf); +- float32x2_t t2 = vld1_f32 (&__erff_data.tab[vgetq_lane_u32 (i, 2)].erf); +- float32x2_t t3 = vld1_f32 (&__erff_data.tab[vgetq_lane_u32 (i, 3)].erf); ++ float32x2_t t0 = vld1_f32 (&__v_erff_data.tab[vgetq_lane_u32 (i, 0)].erf); ++ float32x2_t t1 = vld1_f32 (&__v_erff_data.tab[vgetq_lane_u32 (i, 1)].erf); ++ float32x2_t t2 = vld1_f32 (&__v_erff_data.tab[vgetq_lane_u32 (i, 2)].erf); ++ float32x2_t t3 = vld1_f32 (&__v_erff_data.tab[vgetq_lane_u32 (i, 3)].erf); + float32x4_t e1 = vcombine_f32 (t0, t1); + float32x4_t e2 = vcombine_f32 (t2, t3); + e.erf = vuzp1q_f32 (e1, e2); +diff --git a/sysdeps/aarch64/fpu/erff_data.c b/sysdeps/aarch64/fpu/erff_data.c +index 9a32940915..da38aed205 100644 +--- a/sysdeps/aarch64/fpu/erff_data.c ++++ b/sysdeps/aarch64/fpu/erff_data.c +@@ -19,14 +19,14 @@ + + #include "vecmath_config.h" + +-/* Lookup table used in erff. ++/* Lookup table used in vector erff. + For each possible rounded input r (multiples of 1/128), between + r = 0.0 and r = 4.0 (513 values): +- - the first entry __erff_data.tab.erf contains the values of erf(r), +- - the second entry __erff_data.tab.scale contains the values of ++ - the first entry __v_erff_data.tab.erf contains the values of erf(r), ++ - the second entry __v_erff_data.tab.scale contains the values of + 2/sqrt(pi)*exp(-r^2). Note that indices 0 and 1 are never hit by the + algorithm, since lookup is performed only for x >= 1/64-1/512. */ +-const struct erff_data __erff_data = { ++const struct v_erff_data __v_erff_data = { + .tab = { { 0x0.000000p+0, 0x1.20dd76p+0 }, + { 0x1.20dbf4p-7, 0x1.20d8f2p+0 }, + { 0x1.20d770p-6, 0x1.20cb68p+0 }, +diff --git a/sysdeps/aarch64/fpu/erff_sve.c b/sysdeps/aarch64/fpu/erff_sve.c +index 38f00db9be..0e382eb09a 100644 +--- a/sysdeps/aarch64/fpu/erff_sve.c ++++ b/sysdeps/aarch64/fpu/erff_sve.c +@@ -62,18 +62,17 @@ svfloat32_t SV_NAME_F1 (erf) (svfloat32_t x, const svbool_t pg) + + svfloat32_t shift = sv_f32 (dat->shift); + svfloat32_t z = svadd_x (pg, a, shift); +- svuint32_t i +- = svsub_x (pg, svreinterpret_u32 (z), svreinterpret_u32 (shift)); +- +- /* Saturate lookup index. */ +- i = svsel (a_ge_max, sv_u32 (512), i); ++ svuint32_t i = svand_x (pg, svreinterpret_u32 (z), 0xfff); ++ i = svadd_x (pg, i, i); + + /* r and erf(r) set to 0 for |x| below min. */ + svfloat32_t r = svsub_z (a_gt_min, z, shift); +- svfloat32_t erfr = svld1_gather_index (a_gt_min, __sv_erff_data.erf, i); ++ svfloat32_t erfr ++ = svld1_gather_index (a_gt_min, &__v_erff_data.tab[0].erf, i); + + /* scale set to 2/sqrt(pi) for |x| below min. */ +- svfloat32_t scale = svld1_gather_index (a_gt_min, __sv_erff_data.scale, i); ++ svfloat32_t scale ++ = svld1_gather_index (a_gt_min, &__v_erff_data.tab[0].scale, i); + scale = svsel (a_gt_min, scale, sv_f32 (dat->scale)); + + /* erf(x) ~ erf(r) + scale * d * (1 - r * d + 1/3 * d^2). */ +diff --git a/sysdeps/aarch64/fpu/sv_erf_data.c b/sysdeps/aarch64/fpu/sv_erf_data.c +deleted file mode 100644 +index a53878f893..0000000000 +--- a/sysdeps/aarch64/fpu/sv_erf_data.c ++++ /dev/null +@@ -1,1570 +0,0 @@ +-/* Table for SVE erf approximation +- +- Copyright (C) 2024 Free Software Foundation, Inc. +- This file is part of the GNU C Library. +- +- The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Lesser General Public +- License as published by the Free Software Foundation; either +- version 2.1 of the License, or (at your option) any later version. +- +- The GNU C Library is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Lesser General Public License for more details. +- +- You should have received a copy of the GNU Lesser General Public +- License along with the GNU C Library; if not, see +- . */ +- +-#include "vecmath_config.h" +- +-/* Lookup table used in vector erf. +- For each possible rounded input r (multiples of 1/128), between +- r = 0.0 and r = 6.0 (769 values): +- - the first entry __erf_data.tab.erf contains the values of erf(r), +- - the second entry __erf_data.tab.scale contains the values of +- 2/sqrt(pi)*exp(-r^2). Note that indices 0 and 1 are never hit by the +- algorithm, since lookup is performed only for x >= 1/64-1/512. */ +-const struct sv_erf_data __sv_erf_data = { +- .erf = { 0x0.0000000000000p+0, +- 0x1.20dbf3deb1340p-7, +- 0x1.20d77083f17a0p-6, +- 0x1.b137e0cf584dcp-6, +- 0x1.20c5645dd2538p-5, +- 0x1.68e5d3bbc9526p-5, +- 0x1.b0fafef135745p-5, +- 0x1.f902a77bd3821p-5, +- 0x1.207d480e90658p-4, +- 0x1.44703e87e8593p-4, +- 0x1.68591a1e83b5dp-4, +- 0x1.8c36beb8a8d23p-4, +- 0x1.b0081148a873ap-4, +- 0x1.d3cbf7e70a4b3p-4, +- 0x1.f78159ec8bb50p-4, +- 0x1.0d939005f65e5p-3, +- 0x1.1f5e1a35c3b89p-3, +- 0x1.311fc15f56d14p-3, +- 0x1.42d7fc2f64959p-3, +- 0x1.548642321d7c6p-3, +- 0x1.662a0bdf7a89fp-3, +- 0x1.77c2d2a765f9ep-3, +- 0x1.895010fdbdbfdp-3, +- 0x1.9ad142662e14dp-3, +- 0x1.ac45e37fe2526p-3, +- 0x1.bdad72110a648p-3, +- 0x1.cf076d1233237p-3, +- 0x1.e05354b96ff36p-3, +- 0x1.f190aa85540e2p-3, +- 0x1.015f78a3dcf3dp-2, +- 0x1.09eed6982b948p-2, +- 0x1.127631eb8de32p-2, +- 0x1.1af54e232d609p-2, +- 0x1.236bef825d9a2p-2, +- 0x1.2bd9db0f7827fp-2, +- 0x1.343ed6989b7d9p-2, +- 0x1.3c9aa8b84bedap-2, +- 0x1.44ed18d9f6462p-2, +- 0x1.4d35ef3e5372ep-2, +- 0x1.5574f4ffac98ep-2, +- 0x1.5da9f415ff23fp-2, +- 0x1.65d4b75b00471p-2, +- 0x1.6df50a8dff772p-2, +- 0x1.760aba57a76bfp-2, +- 0x1.7e15944d9d3e4p-2, +- 0x1.861566f5fd3c0p-2, +- 0x1.8e0a01cab516bp-2, +- 0x1.95f3353cbb146p-2, +- 0x1.9dd0d2b721f39p-2, +- 0x1.a5a2aca209394p-2, +- 0x1.ad68966569a87p-2, +- 0x1.b522646bbda68p-2, +- 0x1.bccfec24855b8p-2, +- 0x1.c4710406a65fcp-2, +- 0x1.cc058392a6d2dp-2, +- 0x1.d38d4354c3bd0p-2, +- 0x1.db081ce6e2a48p-2, +- 0x1.e275eaf25e458p-2, +- 0x1.e9d68931ae650p-2, +- 0x1.f129d471eabb1p-2, +- 0x1.f86faa9428f9dp-2, +- 0x1.ffa7ea8eb5fd0p-2, +- 0x1.03693a371519cp-1, +- 0x1.06f794ab2cae7p-1, +- 0x1.0a7ef5c18edd2p-1, +- 0x1.0dff4f247f6c6p-1, +- 0x1.1178930ada115p-1, +- 0x1.14eab43841b55p-1, +- 0x1.1855a5fd3dd50p-1, +- 0x1.1bb95c3746199p-1, +- 0x1.1f15cb50bc4dep-1, +- 0x1.226ae840d4d70p-1, +- 0x1.25b8a88b6dd7fp-1, +- 0x1.28ff0240d52cdp-1, +- 0x1.2c3debfd7d6c1p-1, +- 0x1.2f755ce9a21f4p-1, +- 0x1.32a54cb8db67bp-1, +- 0x1.35cdb3a9a144dp-1, +- 0x1.38ee8a84beb71p-1, +- 0x1.3c07ca9cb4f9ep-1, +- 0x1.3f196dcd0f135p-1, +- 0x1.42236e79a5fa6p-1, +- 0x1.4525c78dd5966p-1, +- 0x1.4820747ba2dc2p-1, +- 0x1.4b13713ad3513p-1, +- 0x1.4dfeba47f63ccp-1, +- 0x1.50e24ca35fd2cp-1, +- 0x1.53be25d016a4fp-1, +- 0x1.569243d2b3a9bp-1, +- 0x1.595ea53035283p-1, +- 0x1.5c2348ecc4dc3p-1, +- 0x1.5ee02e8a71a53p-1, +- 0x1.61955607dd15dp-1, +- 0x1.6442bfdedd397p-1, +- 0x1.66e86d0312e82p-1, +- 0x1.69865ee075011p-1, +- 0x1.6c1c9759d0e5fp-1, +- 0x1.6eab18c74091bp-1, +- 0x1.7131e5f496a5ap-1, +- 0x1.73b1021fc0cb8p-1, +- 0x1.762870f720c6fp-1, +- 0x1.78983697dc96fp-1, +- 0x1.7b00578c26037p-1, +- 0x1.7d60d8c979f7bp-1, +- 0x1.7fb9bfaed8078p-1, +- 0x1.820b1202f27fbp-1, +- 0x1.8454d5f25760dp-1, +- 0x1.8697120d92a4ap-1, +- 0x1.88d1cd474a2e0p-1, +- 0x1.8b050ef253c37p-1, +- 0x1.8d30debfc572ep-1, +- 0x1.8f5544bd00c04p-1, +- 0x1.91724951b8fc6p-1, +- 0x1.9387f53df5238p-1, +- 0x1.959651980da31p-1, +- 0x1.979d67caa6631p-1, +- 0x1.999d4192a5715p-1, +- 0x1.9b95e8fd26abap-1, +- 0x1.9d8768656cc42p-1, +- 0x1.9f71ca72cffb6p-1, +- 0x1.a1551a16aaeafp-1, +- 0x1.a331628a45b92p-1, +- 0x1.a506af4cc00f4p-1, +- 0x1.a6d50c20fa293p-1, +- 0x1.a89c850b7d54dp-1, +- 0x1.aa5d265064366p-1, +- 0x1.ac16fc7143263p-1, +- 0x1.adca142b10f98p-1, +- 0x1.af767a741088bp-1, +- 0x1.b11c3c79bb424p-1, +- 0x1.b2bb679ead19cp-1, +- 0x1.b4540978921eep-1, +- 0x1.b5e62fce16095p-1, +- 0x1.b771e894d602ep-1, +- 0x1.b8f741ef54f83p-1, +- 0x1.ba764a2af2b78p-1, +- 0x1.bbef0fbde6221p-1, +- 0x1.bd61a1453ab44p-1, +- 0x1.bece0d82d1a5cp-1, +- 0x1.c034635b66e23p-1, +- 0x1.c194b1d49a184p-1, +- 0x1.c2ef0812fc1bdp-1, +- 0x1.c443755820d64p-1, +- 0x1.c5920900b5fd1p-1, +- 0x1.c6dad2829ec62p-1, +- 0x1.c81de16b14cefp-1, +- 0x1.c95b455cce69dp-1, +- 0x1.ca930e0e2a825p-1, +- 0x1.cbc54b476248dp-1, +- 0x1.ccf20ce0c0d27p-1, +- 0x1.ce1962c0e0d8bp-1, +- 0x1.cf3b5cdaf0c39p-1, +- 0x1.d0580b2cfd249p-1, +- 0x1.d16f7dbe41ca0p-1, +- 0x1.d281c49d818d0p-1, +- 0x1.d38eefdf64fddp-1, +- 0x1.d4970f9ce00d9p-1, +- 0x1.d59a33f19ed42p-1, +- 0x1.d6986cfa798e7p-1, +- 0x1.d791cad3eff01p-1, +- 0x1.d8865d98abe01p-1, +- 0x1.d97635600bb89p-1, +- 0x1.da61623cb41e0p-1, +- 0x1.db47f43b2980dp-1, +- 0x1.dc29fb60715afp-1, +- 0x1.dd0787a8bb39dp-1, +- 0x1.dde0a90611a0dp-1, +- 0x1.deb56f5f12d28p-1, +- 0x1.df85ea8db188ep-1, +- 0x1.e0522a5dfda73p-1, +- 0x1.e11a3e8cf4eb8p-1, +- 0x1.e1de36c75ba58p-1, +- 0x1.e29e22a89d766p-1, +- 0x1.e35a11b9b61cep-1, +- 0x1.e4121370224ccp-1, +- 0x1.e4c6372cd8927p-1, +- 0x1.e5768c3b4a3fcp-1, +- 0x1.e62321d06c5e0p-1, +- 0x1.e6cc0709c8a0dp-1, +- 0x1.e7714aec96534p-1, +- 0x1.e812fc64db369p-1, +- 0x1.e8b12a44944a8p-1, +- 0x1.e94be342e6743p-1, +- 0x1.e9e335fb56f87p-1, +- 0x1.ea7730ed0bbb9p-1, +- 0x1.eb07e27a133aap-1, +- 0x1.eb9558e6b42cep-1, +- 0x1.ec1fa258c4beap-1, +- 0x1.eca6ccd709544p-1, +- 0x1.ed2ae6489ac1ep-1, +- 0x1.edabfc7453e63p-1, +- 0x1.ee2a1d004692cp-1, +- 0x1.eea5557137ae0p-1, +- 0x1.ef1db32a2277cp-1, +- 0x1.ef93436bc2daap-1, +- 0x1.f006135426b26p-1, +- 0x1.f0762fde45ee6p-1, +- 0x1.f0e3a5e1a1788p-1, +- 0x1.f14e8211e8c55p-1, +- 0x1.f1b6d0fea5f4dp-1, +- 0x1.f21c9f12f0677p-1, +- 0x1.f27ff89525acfp-1, +- 0x1.f2e0e9a6a8b09p-1, +- 0x1.f33f7e43a706bp-1, +- 0x1.f39bc242e43e6p-1, +- 0x1.f3f5c1558b19ep-1, +- 0x1.f44d870704911p-1, +- 0x1.f4a31ebcd47dfp-1, +- 0x1.f4f693b67bd77p-1, +- 0x1.f547f10d60597p-1, +- 0x1.f59741b4b97cfp-1, +- 0x1.f5e4907982a07p-1, +- 0x1.f62fe80272419p-1, +- 0x1.f67952cff6282p-1, +- 0x1.f6c0db3c34641p-1, +- 0x1.f7068b7b10fd9p-1, +- 0x1.f74a6d9a38383p-1, +- 0x1.f78c8b812d498p-1, +- 0x1.f7cceef15d631p-1, +- 0x1.f80ba18636f07p-1, +- 0x1.f848acb544e95p-1, +- 0x1.f88419ce4e184p-1, +- 0x1.f8bdf1fb78370p-1, +- 0x1.f8f63e416ebffp-1, +- 0x1.f92d077f8d56dp-1, +- 0x1.f96256700da8ep-1, +- 0x1.f99633a838a57p-1, +- 0x1.f9c8a7989af0dp-1, +- 0x1.f9f9ba8d3c733p-1, +- 0x1.fa2974addae45p-1, +- 0x1.fa57ddfe27376p-1, +- 0x1.fa84fe5e05c8dp-1, +- 0x1.fab0dd89d1309p-1, +- 0x1.fadb831a9f9c3p-1, +- 0x1.fb04f6868a944p-1, +- 0x1.fb2d3f20f9101p-1, +- 0x1.fb54641aebbc9p-1, +- 0x1.fb7a6c834b5a2p-1, +- 0x1.fb9f5f4739170p-1, +- 0x1.fbc3433260ca5p-1, +- 0x1.fbe61eef4cf6ap-1, +- 0x1.fc07f907bc794p-1, +- 0x1.fc28d7e4f9cd0p-1, +- 0x1.fc48c1d033c7ap-1, +- 0x1.fc67bcf2d7b8fp-1, +- 0x1.fc85cf56ecd38p-1, +- 0x1.fca2fee770c79p-1, +- 0x1.fcbf5170b578bp-1, +- 0x1.fcdacca0bfb73p-1, +- 0x1.fcf57607a6e7cp-1, +- 0x1.fd0f5317f582fp-1, +- 0x1.fd2869270a56fp-1, +- 0x1.fd40bd6d7a785p-1, +- 0x1.fd58550773cb5p-1, +- 0x1.fd6f34f52013ap-1, +- 0x1.fd85621b0876dp-1, +- 0x1.fd9ae142795e3p-1, +- 0x1.fdafb719e6a69p-1, +- 0x1.fdc3e835500b3p-1, +- 0x1.fdd7790ea5bc0p-1, +- 0x1.fdea6e062d0c9p-1, +- 0x1.fdfccb62e52d3p-1, +- 0x1.fe0e9552ebdd6p-1, +- 0x1.fe1fcfebe2083p-1, +- 0x1.fe307f2b503d0p-1, +- 0x1.fe40a6f70af4bp-1, +- 0x1.fe504b1d9696cp-1, +- 0x1.fe5f6f568b301p-1, +- 0x1.fe6e1742f7cf6p-1, +- 0x1.fe7c466dc57a1p-1, +- 0x1.fe8a004c19ae6p-1, +- 0x1.fe97483db8670p-1, +- 0x1.fea4218d6594ap-1, +- 0x1.feb08f7146046p-1, +- 0x1.febc950b3fa75p-1, +- 0x1.fec835695932ep-1, +- 0x1.fed37386190fbp-1, +- 0x1.fede5248e38f4p-1, +- 0x1.fee8d486585eep-1, +- 0x1.fef2fd00af31ap-1, +- 0x1.fefcce6813974p-1, +- 0x1.ff064b5afffbep-1, +- 0x1.ff0f766697c76p-1, +- 0x1.ff18520700971p-1, +- 0x1.ff20e0a7ba8c2p-1, +- 0x1.ff2924a3f7a83p-1, +- 0x1.ff312046f2339p-1, +- 0x1.ff38d5cc4227fp-1, +- 0x1.ff404760319b4p-1, +- 0x1.ff47772010262p-1, +- 0x1.ff4e671a85425p-1, +- 0x1.ff55194fe19dfp-1, +- 0x1.ff5b8fb26f5f6p-1, +- 0x1.ff61cc26c1578p-1, +- 0x1.ff67d08401202p-1, +- 0x1.ff6d9e943c231p-1, +- 0x1.ff733814af88cp-1, +- 0x1.ff789eb6130c9p-1, +- 0x1.ff7dd41ce2b4dp-1, +- 0x1.ff82d9e1a76d8p-1, +- 0x1.ff87b1913e853p-1, +- 0x1.ff8c5cad200a5p-1, +- 0x1.ff90dcaba4096p-1, +- 0x1.ff9532f846ab0p-1, +- 0x1.ff9960f3eb327p-1, +- 0x1.ff9d67f51ddbap-1, +- 0x1.ffa14948549a7p-1, +- 0x1.ffa506302ebaep-1, +- 0x1.ffa89fe5b3625p-1, +- 0x1.ffac17988ef4bp-1, +- 0x1.ffaf6e6f4f5c0p-1, +- 0x1.ffb2a5879f35ep-1, +- 0x1.ffb5bdf67fe6fp-1, +- 0x1.ffb8b8c88295fp-1, +- 0x1.ffbb970200110p-1, +- 0x1.ffbe599f4f9d9p-1, +- 0x1.ffc10194fcb64p-1, +- 0x1.ffc38fcffbb7cp-1, +- 0x1.ffc60535dd7f5p-1, +- 0x1.ffc862a501fd7p-1, +- 0x1.ffcaa8f4c9beap-1, +- 0x1.ffccd8f5c66d1p-1, +- 0x1.ffcef371ea4d7p-1, +- 0x1.ffd0f92cb6ba7p-1, +- 0x1.ffd2eae369a07p-1, +- 0x1.ffd4c94d29fdbp-1, +- 0x1.ffd6951b33686p-1, +- 0x1.ffd84ef9009eep-1, +- 0x1.ffd9f78c7524ap-1, +- 0x1.ffdb8f7605ee7p-1, +- 0x1.ffdd1750e1220p-1, +- 0x1.ffde8fb314ebfp-1, +- 0x1.ffdff92db56e5p-1, +- 0x1.ffe1544d01ccbp-1, +- 0x1.ffe2a1988857cp-1, +- 0x1.ffe3e19349dc7p-1, +- 0x1.ffe514bbdc197p-1, +- 0x1.ffe63b8c8b5f7p-1, +- 0x1.ffe7567b7b5e1p-1, +- 0x1.ffe865fac722bp-1, +- 0x1.ffe96a78a04a9p-1, +- 0x1.ffea645f6d6dap-1, +- 0x1.ffeb5415e7c44p-1, +- 0x1.ffec39ff380b9p-1, +- 0x1.ffed167b12ac2p-1, +- 0x1.ffede9e5d3262p-1, +- 0x1.ffeeb49896c6dp-1, +- 0x1.ffef76e956a9fp-1, +- 0x1.fff0312b010b5p-1, +- 0x1.fff0e3ad91ec2p-1, +- 0x1.fff18ebe2b0e1p-1, +- 0x1.fff232a72b48ep-1, +- 0x1.fff2cfb0453d9p-1, +- 0x1.fff3661e9569dp-1, +- 0x1.fff3f634b79f9p-1, +- 0x1.fff48032dbe40p-1, +- 0x1.fff50456dab8cp-1, +- 0x1.fff582dc48d30p-1, +- 0x1.fff5fbfc8a439p-1, +- 0x1.fff66feee5129p-1, +- 0x1.fff6dee89352ep-1, +- 0x1.fff7491cd4af6p-1, +- 0x1.fff7aebcff755p-1, +- 0x1.fff80ff8911fdp-1, +- 0x1.fff86cfd3e657p-1, +- 0x1.fff8c5f702ccfp-1, +- 0x1.fff91b102fca8p-1, +- 0x1.fff96c717b695p-1, +- 0x1.fff9ba420e834p-1, +- 0x1.fffa04a7928b1p-1, +- 0x1.fffa4bc63ee9ap-1, +- 0x1.fffa8fc0e5f33p-1, +- 0x1.fffad0b901755p-1, +- 0x1.fffb0ecebee1bp-1, +- 0x1.fffb4a210b172p-1, +- 0x1.fffb82cd9dcbfp-1, +- 0x1.fffbb8f1049c6p-1, +- 0x1.fffbeca6adbe9p-1, +- 0x1.fffc1e08f25f5p-1, +- 0x1.fffc4d3120aa1p-1, +- 0x1.fffc7a37857d2p-1, +- 0x1.fffca53375ce3p-1, +- 0x1.fffcce3b57bffp-1, +- 0x1.fffcf564ab6b7p-1, +- 0x1.fffd1ac4135f9p-1, +- 0x1.fffd3e6d5cd87p-1, +- 0x1.fffd607387b07p-1, +- 0x1.fffd80e8ce0dap-1, +- 0x1.fffd9fdeabccep-1, +- 0x1.fffdbd65e5ad0p-1, +- 0x1.fffdd98e903b2p-1, +- 0x1.fffdf46816833p-1, +- 0x1.fffe0e0140857p-1, +- 0x1.fffe26683972ap-1, +- 0x1.fffe3daa95b18p-1, +- 0x1.fffe53d558ae9p-1, +- 0x1.fffe68f4fa777p-1, +- 0x1.fffe7d156d244p-1, +- 0x1.fffe904222101p-1, +- 0x1.fffea2860ee1ep-1, +- 0x1.fffeb3ebb267bp-1, +- 0x1.fffec47d19457p-1, +- 0x1.fffed443e2787p-1, +- 0x1.fffee34943b15p-1, +- 0x1.fffef1960d85dp-1, +- 0x1.fffeff32af7afp-1, +- 0x1.ffff0c273bea2p-1, +- 0x1.ffff187b6bc0ep-1, +- 0x1.ffff2436a21dcp-1, +- 0x1.ffff2f5fefcaap-1, +- 0x1.ffff39fe16963p-1, +- 0x1.ffff44178c8d2p-1, +- 0x1.ffff4db27f146p-1, +- 0x1.ffff56d4d5e5ep-1, +- 0x1.ffff5f8435efcp-1, +- 0x1.ffff67c604180p-1, +- 0x1.ffff6f9f67e55p-1, +- 0x1.ffff77154e0d6p-1, +- 0x1.ffff7e2c6aea2p-1, +- 0x1.ffff84e93cd75p-1, +- 0x1.ffff8b500e77cp-1, +- 0x1.ffff9164f8e46p-1, +- 0x1.ffff972be5c59p-1, +- 0x1.ffff9ca891572p-1, +- 0x1.ffffa1de8c582p-1, +- 0x1.ffffa6d13de73p-1, +- 0x1.ffffab83e54b8p-1, +- 0x1.ffffaff99bac4p-1, +- 0x1.ffffb43555b5fp-1, +- 0x1.ffffb839e52f3p-1, +- 0x1.ffffbc09fa7cdp-1, +- 0x1.ffffbfa82616bp-1, +- 0x1.ffffc316d9ed0p-1, +- 0x1.ffffc6586abf6p-1, +- 0x1.ffffc96f1165ep-1, +- 0x1.ffffcc5cec0c1p-1, +- 0x1.ffffcf23ff5fcp-1, +- 0x1.ffffd1c637b2bp-1, +- 0x1.ffffd4456a10dp-1, +- 0x1.ffffd6a3554a1p-1, +- 0x1.ffffd8e1a2f22p-1, +- 0x1.ffffdb01e8546p-1, +- 0x1.ffffdd05a75eap-1, +- 0x1.ffffdeee4f810p-1, +- 0x1.ffffe0bd3e852p-1, +- 0x1.ffffe273c15b7p-1, +- 0x1.ffffe41314e06p-1, +- 0x1.ffffe59c6698bp-1, +- 0x1.ffffe710d565ep-1, +- 0x1.ffffe8717232dp-1, +- 0x1.ffffe9bf4098cp-1, +- 0x1.ffffeafb377d5p-1, +- 0x1.ffffec2641a9ep-1, +- 0x1.ffffed413e5b7p-1, +- 0x1.ffffee4d01cd6p-1, +- 0x1.ffffef4a55bd4p-1, +- 0x1.fffff039f9e8fp-1, +- 0x1.fffff11ca4876p-1, +- 0x1.fffff1f302bc1p-1, +- 0x1.fffff2bdb904dp-1, +- 0x1.fffff37d63a36p-1, +- 0x1.fffff43297019p-1, +- 0x1.fffff4dde0118p-1, +- 0x1.fffff57fc4a95p-1, +- 0x1.fffff618c3da6p-1, +- 0x1.fffff6a956450p-1, +- 0x1.fffff731ee681p-1, +- 0x1.fffff7b2f8ed6p-1, +- 0x1.fffff82cdcf1bp-1, +- 0x1.fffff89ffc4aap-1, +- 0x1.fffff90cb3c81p-1, +- 0x1.fffff9735b73bp-1, +- 0x1.fffff9d446cccp-1, +- 0x1.fffffa2fc5015p-1, +- 0x1.fffffa8621251p-1, +- 0x1.fffffad7a2652p-1, +- 0x1.fffffb248c39dp-1, +- 0x1.fffffb6d1e95dp-1, +- 0x1.fffffbb196132p-1, +- 0x1.fffffbf22c1e2p-1, +- 0x1.fffffc2f171e3p-1, +- 0x1.fffffc688a9cfp-1, +- 0x1.fffffc9eb76acp-1, +- 0x1.fffffcd1cbc28p-1, +- 0x1.fffffd01f36afp-1, +- 0x1.fffffd2f57d68p-1, +- 0x1.fffffd5a2041fp-1, +- 0x1.fffffd8271d12p-1, +- 0x1.fffffda86faa9p-1, +- 0x1.fffffdcc3b117p-1, +- 0x1.fffffdedf37edp-1, +- 0x1.fffffe0db6b91p-1, +- 0x1.fffffe2ba0ea5p-1, +- 0x1.fffffe47ccb60p-1, +- 0x1.fffffe62534d4p-1, +- 0x1.fffffe7b4c81ep-1, +- 0x1.fffffe92ced93p-1, +- 0x1.fffffea8ef9cfp-1, +- 0x1.fffffebdc2ec6p-1, +- 0x1.fffffed15bcbap-1, +- 0x1.fffffee3cc32cp-1, +- 0x1.fffffef5251c2p-1, +- 0x1.ffffff0576917p-1, +- 0x1.ffffff14cfb92p-1, +- 0x1.ffffff233ee1dp-1, +- 0x1.ffffff30d18e8p-1, +- 0x1.ffffff3d9480fp-1, +- 0x1.ffffff4993c46p-1, +- 0x1.ffffff54dab72p-1, +- 0x1.ffffff5f74141p-1, +- 0x1.ffffff6969fb8p-1, +- 0x1.ffffff72c5fb6p-1, +- 0x1.ffffff7b91176p-1, +- 0x1.ffffff83d3d07p-1, +- 0x1.ffffff8b962bep-1, +- 0x1.ffffff92dfba2p-1, +- 0x1.ffffff99b79d2p-1, +- 0x1.ffffffa0248e8p-1, +- 0x1.ffffffa62ce54p-1, +- 0x1.ffffffabd69b4p-1, +- 0x1.ffffffb127525p-1, +- 0x1.ffffffb624592p-1, +- 0x1.ffffffbad2affp-1, +- 0x1.ffffffbf370cdp-1, +- 0x1.ffffffc355dfdp-1, +- 0x1.ffffffc733572p-1, +- 0x1.ffffffcad3626p-1, +- 0x1.ffffffce39b67p-1, +- 0x1.ffffffd169d0cp-1, +- 0x1.ffffffd466fa5p-1, +- 0x1.ffffffd7344aap-1, +- 0x1.ffffffd9d4aabp-1, +- 0x1.ffffffdc4ad7ap-1, +- 0x1.ffffffde9964ep-1, +- 0x1.ffffffe0c2bf0p-1, +- 0x1.ffffffe2c92dbp-1, +- 0x1.ffffffe4aed5ep-1, +- 0x1.ffffffe675bbdp-1, +- 0x1.ffffffe81fc4ep-1, +- 0x1.ffffffe9aeb97p-1, +- 0x1.ffffffeb24467p-1, +- 0x1.ffffffec81ff2p-1, +- 0x1.ffffffedc95e7p-1, +- 0x1.ffffffeefbc85p-1, +- 0x1.fffffff01a8b6p-1, +- 0x1.fffffff126e1ep-1, +- 0x1.fffffff221f30p-1, +- 0x1.fffffff30cd3fp-1, +- 0x1.fffffff3e8892p-1, +- 0x1.fffffff4b606fp-1, +- 0x1.fffffff57632dp-1, +- 0x1.fffffff629e44p-1, +- 0x1.fffffff6d1e56p-1, +- 0x1.fffffff76ef3fp-1, +- 0x1.fffffff801c1fp-1, +- 0x1.fffffff88af67p-1, +- 0x1.fffffff90b2e3p-1, +- 0x1.fffffff982fc1p-1, +- 0x1.fffffff9f2e9fp-1, +- 0x1.fffffffa5b790p-1, +- 0x1.fffffffabd229p-1, +- 0x1.fffffffb18582p-1, +- 0x1.fffffffb6d844p-1, +- 0x1.fffffffbbd0aap-1, +- 0x1.fffffffc0748fp-1, +- 0x1.fffffffc4c96cp-1, +- 0x1.fffffffc8d462p-1, +- 0x1.fffffffcc9a41p-1, +- 0x1.fffffffd01f89p-1, +- 0x1.fffffffd36871p-1, +- 0x1.fffffffd678edp-1, +- 0x1.fffffffd954aep-1, +- 0x1.fffffffdbff2ap-1, +- 0x1.fffffffde7ba0p-1, +- 0x1.fffffffe0cd16p-1, +- 0x1.fffffffe2f664p-1, +- 0x1.fffffffe4fa30p-1, +- 0x1.fffffffe6daf7p-1, +- 0x1.fffffffe89b0cp-1, +- 0x1.fffffffea3c9ap-1, +- 0x1.fffffffebc1a9p-1, +- 0x1.fffffffed2c21p-1, +- 0x1.fffffffee7dc8p-1, +- 0x1.fffffffefb847p-1, +- 0x1.ffffffff0dd2bp-1, +- 0x1.ffffffff1ede9p-1, +- 0x1.ffffffff2ebdap-1, +- 0x1.ffffffff3d843p-1, +- 0x1.ffffffff4b453p-1, +- 0x1.ffffffff58126p-1, +- 0x1.ffffffff63fc3p-1, +- 0x1.ffffffff6f121p-1, +- 0x1.ffffffff79626p-1, +- 0x1.ffffffff82fabp-1, +- 0x1.ffffffff8be77p-1, +- 0x1.ffffffff94346p-1, +- 0x1.ffffffff9bec8p-1, +- 0x1.ffffffffa319fp-1, +- 0x1.ffffffffa9c63p-1, +- 0x1.ffffffffaffa4p-1, +- 0x1.ffffffffb5be5p-1, +- 0x1.ffffffffbb1a2p-1, +- 0x1.ffffffffc014ep-1, +- 0x1.ffffffffc4b56p-1, +- 0x1.ffffffffc901cp-1, +- 0x1.ffffffffccfffp-1, +- 0x1.ffffffffd0b56p-1, +- 0x1.ffffffffd4271p-1, +- 0x1.ffffffffd759dp-1, +- 0x1.ffffffffda520p-1, +- 0x1.ffffffffdd13cp-1, +- 0x1.ffffffffdfa2dp-1, +- 0x1.ffffffffe202dp-1, +- 0x1.ffffffffe4371p-1, +- 0x1.ffffffffe642ap-1, +- 0x1.ffffffffe8286p-1, +- 0x1.ffffffffe9eb0p-1, +- 0x1.ffffffffeb8d0p-1, +- 0x1.ffffffffed10ap-1, +- 0x1.ffffffffee782p-1, +- 0x1.ffffffffefc57p-1, +- 0x1.fffffffff0fa7p-1, +- 0x1.fffffffff218fp-1, +- 0x1.fffffffff3227p-1, +- 0x1.fffffffff4188p-1, +- 0x1.fffffffff4fc9p-1, +- 0x1.fffffffff5cfdp-1, +- 0x1.fffffffff6939p-1, +- 0x1.fffffffff748ep-1, +- 0x1.fffffffff7f0dp-1, +- 0x1.fffffffff88c5p-1, +- 0x1.fffffffff91c6p-1, +- 0x1.fffffffff9a1bp-1, +- 0x1.fffffffffa1d2p-1, +- 0x1.fffffffffa8f6p-1, +- 0x1.fffffffffaf92p-1, +- 0x1.fffffffffb5b0p-1, +- 0x1.fffffffffbb58p-1, +- 0x1.fffffffffc095p-1, +- 0x1.fffffffffc56dp-1, +- 0x1.fffffffffc9e8p-1, +- 0x1.fffffffffce0dp-1, +- 0x1.fffffffffd1e1p-1, +- 0x1.fffffffffd56cp-1, +- 0x1.fffffffffd8b3p-1, +- 0x1.fffffffffdbbap-1, +- 0x1.fffffffffde86p-1, +- 0x1.fffffffffe11dp-1, +- 0x1.fffffffffe380p-1, +- 0x1.fffffffffe5b6p-1, +- 0x1.fffffffffe7c0p-1, +- 0x1.fffffffffe9a2p-1, +- 0x1.fffffffffeb60p-1, +- 0x1.fffffffffecfbp-1, +- 0x1.fffffffffee77p-1, +- 0x1.fffffffffefd6p-1, +- 0x1.ffffffffff11ap-1, +- 0x1.ffffffffff245p-1, +- 0x1.ffffffffff359p-1, +- 0x1.ffffffffff457p-1, +- 0x1.ffffffffff542p-1, +- 0x1.ffffffffff61bp-1, +- 0x1.ffffffffff6e3p-1, +- 0x1.ffffffffff79bp-1, +- 0x1.ffffffffff845p-1, +- 0x1.ffffffffff8e2p-1, +- 0x1.ffffffffff973p-1, +- 0x1.ffffffffff9f8p-1, +- 0x1.ffffffffffa73p-1, +- 0x1.ffffffffffae4p-1, +- 0x1.ffffffffffb4cp-1, +- 0x1.ffffffffffbadp-1, +- 0x1.ffffffffffc05p-1, +- 0x1.ffffffffffc57p-1, +- 0x1.ffffffffffca2p-1, +- 0x1.ffffffffffce7p-1, +- 0x1.ffffffffffd27p-1, +- 0x1.ffffffffffd62p-1, +- 0x1.ffffffffffd98p-1, +- 0x1.ffffffffffdcap-1, +- 0x1.ffffffffffdf8p-1, +- 0x1.ffffffffffe22p-1, +- 0x1.ffffffffffe49p-1, +- 0x1.ffffffffffe6cp-1, +- 0x1.ffffffffffe8dp-1, +- 0x1.ffffffffffeabp-1, +- 0x1.ffffffffffec7p-1, +- 0x1.ffffffffffee1p-1, +- 0x1.ffffffffffef8p-1, +- 0x1.fffffffffff0ep-1, +- 0x1.fffffffffff22p-1, +- 0x1.fffffffffff34p-1, +- 0x1.fffffffffff45p-1, +- 0x1.fffffffffff54p-1, +- 0x1.fffffffffff62p-1, +- 0x1.fffffffffff6fp-1, +- 0x1.fffffffffff7bp-1, +- 0x1.fffffffffff86p-1, +- 0x1.fffffffffff90p-1, +- 0x1.fffffffffff9ap-1, +- 0x1.fffffffffffa2p-1, +- 0x1.fffffffffffaap-1, +- 0x1.fffffffffffb1p-1, +- 0x1.fffffffffffb8p-1, +- 0x1.fffffffffffbep-1, +- 0x1.fffffffffffc3p-1, +- 0x1.fffffffffffc8p-1, +- 0x1.fffffffffffcdp-1, +- 0x1.fffffffffffd1p-1, +- 0x1.fffffffffffd5p-1, +- 0x1.fffffffffffd9p-1, +- 0x1.fffffffffffdcp-1, +- 0x1.fffffffffffdfp-1, +- 0x1.fffffffffffe2p-1, +- 0x1.fffffffffffe4p-1, +- 0x1.fffffffffffe7p-1, +- 0x1.fffffffffffe9p-1, +- 0x1.fffffffffffebp-1, +- 0x1.fffffffffffedp-1, +- 0x1.fffffffffffeep-1, +- 0x1.ffffffffffff0p-1, +- 0x1.ffffffffffff1p-1, +- 0x1.ffffffffffff3p-1, +- 0x1.ffffffffffff4p-1, +- 0x1.ffffffffffff5p-1, +- 0x1.ffffffffffff6p-1, +- 0x1.ffffffffffff7p-1, +- 0x1.ffffffffffff7p-1, +- 0x1.ffffffffffff8p-1, +- 0x1.ffffffffffff9p-1, +- 0x1.ffffffffffff9p-1, +- 0x1.ffffffffffffap-1, +- 0x1.ffffffffffffbp-1, +- 0x1.ffffffffffffbp-1, +- 0x1.ffffffffffffbp-1, +- 0x1.ffffffffffffcp-1, +- 0x1.ffffffffffffcp-1, +- 0x1.ffffffffffffdp-1, +- 0x1.ffffffffffffdp-1, +- 0x1.ffffffffffffdp-1, +- 0x1.ffffffffffffdp-1, +- 0x1.ffffffffffffep-1, +- 0x1.ffffffffffffep-1, +- 0x1.ffffffffffffep-1, +- 0x1.ffffffffffffep-1, +- 0x1.ffffffffffffep-1, +- 0x1.ffffffffffffep-1, +- 0x1.fffffffffffffp-1, +- 0x1.fffffffffffffp-1, +- 0x1.fffffffffffffp-1, +- 0x1.fffffffffffffp-1, +- 0x1.fffffffffffffp-1, +- 0x1.fffffffffffffp-1, +- 0x1.fffffffffffffp-1, +- 0x1.fffffffffffffp-1, +- 0x1.fffffffffffffp-1, +- 0x1.fffffffffffffp-1, +- 0x1.fffffffffffffp-1, +- 0x1.0000000000000p+0, +- 0x1.0000000000000p+0, +- 0x1.0000000000000p+0, +- 0x1.0000000000000p+0, +- 0x1.0000000000000p+0, +- 0x1.0000000000000p+0, +- 0x1.0000000000000p+0, +- 0x1.0000000000000p+0, +- 0x1.0000000000000p+0, +- 0x1.0000000000000p+0, +- 0x1.0000000000000p+0, +- }, +- .scale = { 0x1.20dd750429b6dp+0, +- 0x1.20d8f1975c85dp+0, +- 0x1.20cb67bd452c7p+0, +- 0x1.20b4d8bac36c1p+0, +- 0x1.209546ad13ccfp+0, +- 0x1.206cb4897b148p+0, +- 0x1.203b261cd0052p+0, +- 0x1.2000a00ae3804p+0, +- 0x1.1fbd27cdc72d3p+0, +- 0x1.1f70c3b4f2cc7p+0, +- 0x1.1f1b7ae44867fp+0, +- 0x1.1ebd5552f795bp+0, +- 0x1.1e565bca400d4p+0, +- 0x1.1de697e413d28p+0, +- 0x1.1d6e14099944ap+0, +- 0x1.1cecdb718d61cp+0, +- 0x1.1c62fa1e869b6p+0, +- 0x1.1bd07cdd189acp+0, +- 0x1.1b357141d95d5p+0, +- 0x1.1a91e5a748165p+0, +- 0x1.19e5e92b964abp+0, +- 0x1.19318bae53a04p+0, +- 0x1.1874ddcdfce24p+0, +- 0x1.17aff0e56ec10p+0, +- 0x1.16e2d7093cd8cp+0, +- 0x1.160da304ed92fp+0, +- 0x1.153068581b781p+0, +- 0x1.144b3b337c90cp+0, +- 0x1.135e3075d076bp+0, +- 0x1.12695da8b5bdep+0, +- 0x1.116cd8fd67618p+0, +- 0x1.1068b94962e5ep+0, +- 0x1.0f5d1602f7e41p+0, +- 0x1.0e4a073dc1b91p+0, +- 0x1.0d2fa5a70c168p+0, +- 0x1.0c0e0a8223359p+0, +- 0x1.0ae54fa490722p+0, +- 0x1.09b58f724416bp+0, +- 0x1.087ee4d9ad247p+0, +- 0x1.07416b4fbfe7cp+0, +- 0x1.05fd3ecbec297p+0, +- 0x1.04b27bc403d30p+0, +- 0x1.03613f2812dafp+0, +- 0x1.0209a65e29545p+0, +- 0x1.00abcf3e187a9p+0, +- 0x1.fe8fb01a47307p-1, +- 0x1.fbbbbef34b4b2p-1, +- 0x1.f8dc092d58ff8p-1, +- 0x1.f5f0cdaf15313p-1, +- 0x1.f2fa4c16c0019p-1, +- 0x1.eff8c4b1375dbp-1, +- 0x1.ecec7870ebca7p-1, +- 0x1.e9d5a8e4c934ep-1, +- 0x1.e6b4982f158b9p-1, +- 0x1.e38988fc46e72p-1, +- 0x1.e054be79d3042p-1, +- 0x1.dd167c4cf9d2ap-1, +- 0x1.d9cf06898cdafp-1, +- 0x1.d67ea1a8b5368p-1, +- 0x1.d325927fb9d89p-1, +- 0x1.cfc41e36c7df9p-1, +- 0x1.cc5a8a3fbea40p-1, +- 0x1.c8e91c4d01368p-1, +- 0x1.c5701a484ef9dp-1, +- 0x1.c1efca49a5011p-1, +- 0x1.be68728e29d5dp-1, +- 0x1.bada596f25436p-1, +- 0x1.b745c55905bf8p-1, +- 0x1.b3aafcc27502ep-1, +- 0x1.b00a46237d5bep-1, +- 0x1.ac63e7ecc1411p-1, +- 0x1.a8b8287ec6a09p-1, +- 0x1.a5074e2157620p-1, +- 0x1.a1519efaf889ep-1, +- 0x1.9d97610879642p-1, +- 0x1.99d8da149c13fp-1, +- 0x1.96164fafd8de3p-1, +- 0x1.925007283d7aap-1, +- 0x1.8e86458169af8p-1, +- 0x1.8ab94f6caa71dp-1, +- 0x1.86e9694134b9ep-1, +- 0x1.8316d6f48133dp-1, +- 0x1.7f41dc12c9e89p-1, +- 0x1.7b6abbb7aaf19p-1, +- 0x1.7791b886e7403p-1, +- 0x1.73b714a552763p-1, +- 0x1.6fdb11b1e0c34p-1, +- 0x1.6bfdf0beddaf5p-1, +- 0x1.681ff24b4ab04p-1, +- 0x1.6441563c665d4p-1, +- 0x1.60625bd75d07bp-1, +- 0x1.5c8341bb23767p-1, +- 0x1.58a445da7c74cp-1, +- 0x1.54c5a57629db0p-1, +- 0x1.50e79d1749ac9p-1, +- 0x1.4d0a6889dfd9fp-1, +- 0x1.492e42d78d2c5p-1, +- 0x1.4553664273d24p-1, +- 0x1.417a0c4049fd0p-1, +- 0x1.3da26d759aef5p-1, +- 0x1.39ccc1b136d5ap-1, +- 0x1.35f93fe7d1b3dp-1, +- 0x1.32281e2fd1a92p-1, +- 0x1.2e5991bd4cbfcp-1, +- 0x1.2a8dcede3673bp-1, +- 0x1.26c508f6bd0ffp-1, +- 0x1.22ff727dd6f7bp-1, +- 0x1.1f3d3cf9ffe5ap-1, +- 0x1.1b7e98fe26217p-1, +- 0x1.17c3b626c7a11p-1, +- 0x1.140cc3173f007p-1, +- 0x1.1059ed7740313p-1, +- 0x1.0cab61f084b93p-1, +- 0x1.09014c2ca74dap-1, +- 0x1.055bd6d32e8d7p-1, +- 0x1.01bb2b87c6968p-1, +- 0x1.fc3ee5d1524b0p-2, +- 0x1.f511a91a67d2ap-2, +- 0x1.edeeee0959518p-2, +- 0x1.e6d6ffaa65a25p-2, +- 0x1.dfca26f5bbf88p-2, +- 0x1.d8c8aace11e63p-2, +- 0x1.d1d2cfff91594p-2, +- 0x1.cae8d93f1d7b6p-2, +- 0x1.c40b0729ed547p-2, +- 0x1.bd3998457afdap-2, +- 0x1.b674c8ffc6283p-2, +- 0x1.afbcd3afe8ab6p-2, +- 0x1.a911f096fbc26p-2, +- 0x1.a27455e14c93cp-2, +- 0x1.9be437a7de946p-2, +- 0x1.9561c7f23a47bp-2, +- 0x1.8eed36b886d93p-2, +- 0x1.8886b1e5ecfd1p-2, +- 0x1.822e655b417e6p-2, +- 0x1.7be47af1f5d89p-2, +- 0x1.75a91a7f4d2edp-2, +- 0x1.6f7c69d7d3ef8p-2, +- 0x1.695e8cd31867ep-2, +- 0x1.634fa54fa285fp-2, +- 0x1.5d4fd33729015p-2, +- 0x1.575f3483021c3p-2, +- 0x1.517de540ce2a3p-2, +- 0x1.4babff975a04cp-2, +- 0x1.45e99bcbb7915p-2, +- 0x1.4036d0468a7a2p-2, +- 0x1.3a93b1998736cp-2, +- 0x1.35005285227f1p-2, +- 0x1.2f7cc3fe6f423p-2, +- 0x1.2a09153529381p-2, +- 0x1.24a55399ea239p-2, +- 0x1.1f518ae487dc8p-2, +- 0x1.1a0dc51a9934dp-2, +- 0x1.14da0a961fd14p-2, +- 0x1.0fb6620c550afp-2, +- 0x1.0aa2d09497f2bp-2, +- 0x1.059f59af7a906p-2, +- 0x1.00abff4dec7a3p-2, +- 0x1.f79183b101c5bp-3, +- 0x1.edeb406d9c824p-3, +- 0x1.e4652fadcb6b2p-3, +- 0x1.daff4969c0b04p-3, +- 0x1.d1b982c501370p-3, +- 0x1.c893ce1dcbef7p-3, +- 0x1.bf8e1b1ca2279p-3, +- 0x1.b6a856c3ed54fp-3, +- 0x1.ade26b7fbed95p-3, +- 0x1.a53c4135a6526p-3, +- 0x1.9cb5bd549b111p-3, +- 0x1.944ec2e4f5630p-3, +- 0x1.8c07329874652p-3, +- 0x1.83deeada4d25ap-3, +- 0x1.7bd5c7df3fe9cp-3, +- 0x1.73eba3b5b07b7p-3, +- 0x1.6c205655be71fp-3, +- 0x1.6473b5b15a7a1p-3, +- 0x1.5ce595c455b0ap-3, +- 0x1.5575c8a468361p-3, +- 0x1.4e241e912c305p-3, +- 0x1.46f066040a832p-3, +- 0x1.3fda6bc016994p-3, +- 0x1.38e1fae1d6a9dp-3, +- 0x1.3206dceef5f87p-3, +- 0x1.2b48d9e5dea1cp-3, +- 0x1.24a7b84d38971p-3, +- 0x1.1e233d434b813p-3, +- 0x1.17bb2c8d41535p-3, +- 0x1.116f48a6476ccp-3, +- 0x1.0b3f52ce8c383p-3, +- 0x1.052b0b1a174eap-3, +- 0x1.fe6460fef4680p-4, +- 0x1.f2a901ccafb37p-4, +- 0x1.e723726b824a9p-4, +- 0x1.dbd32ac4c99b0p-4, +- 0x1.d0b7a0f921e7cp-4, +- 0x1.c5d0497c09e74p-4, +- 0x1.bb1c972f23e50p-4, +- 0x1.b09bfb7d11a83p-4, +- 0x1.a64de673e8837p-4, +- 0x1.9c31c6df3b1b8p-4, +- 0x1.92470a61b6965p-4, +- 0x1.888d1d8e510a3p-4, +- 0x1.7f036c0107294p-4, +- 0x1.75a96077274bap-4, +- 0x1.6c7e64e7281cbp-4, +- 0x1.6381e2980956bp-4, +- 0x1.5ab342383d177p-4, +- 0x1.5211ebf41880bp-4, +- 0x1.499d478bca735p-4, +- 0x1.4154bc68d75c3p-4, +- 0x1.3937b1b319259p-4, +- 0x1.31458e6542847p-4, +- 0x1.297db960e4f63p-4, +- 0x1.21df9981f8e53p-4, +- 0x1.1a6a95b1e786fp-4, +- 0x1.131e14fa1625dp-4, +- 0x1.0bf97e95f2a64p-4, +- 0x1.04fc3a0481321p-4, +- 0x1.fc4b5e32d6259p-5, +- 0x1.eeea8c1b1db93p-5, +- 0x1.e1d4cf1e2450ap-5, +- 0x1.d508f9a1ea64ep-5, +- 0x1.c885df3451a07p-5, +- 0x1.bc4a54a84e834p-5, +- 0x1.b055303221015p-5, +- 0x1.a4a549829587ep-5, +- 0x1.993979e14fffdp-5, +- 0x1.8e109c4622913p-5, +- 0x1.83298d717210ep-5, +- 0x1.78832c03aa2b1p-5, +- 0x1.6e1c5893c380bp-5, +- 0x1.63f3f5c4de13bp-5, +- 0x1.5a08e85af27e0p-5, +- 0x1.505a174e9c929p-5, +- 0x1.46e66be002240p-5, +- 0x1.3dacd1a8d8ccdp-5, +- 0x1.34ac36ad8dafep-5, +- 0x1.2be38b6d92415p-5, +- 0x1.2351c2f2d1449p-5, +- 0x1.1af5d2e04f3f6p-5, +- 0x1.12ceb37ff9bc3p-5, +- 0x1.0adb5fcfa8c75p-5, +- 0x1.031ad58d56279p-5, +- 0x1.f7182a851bca2p-6, +- 0x1.e85c449e377f2p-6, +- 0x1.da0005e5f28dfp-6, +- 0x1.cc0180af00a8bp-6, +- 0x1.be5ecd2fcb5f9p-6, +- 0x1.b1160991ff737p-6, +- 0x1.a4255a00b9f03p-6, +- 0x1.978ae8b55ce1bp-6, +- 0x1.8b44e6031383ep-6, +- 0x1.7f5188610ddc8p-6, +- 0x1.73af0c737bb45p-6, +- 0x1.685bb5134ef13p-6, +- 0x1.5d55cb54cd53ap-6, +- 0x1.529b9e8cf9a1ep-6, +- 0x1.482b8455dc491p-6, +- 0x1.3e03d891b37dep-6, +- 0x1.3422fd6d12e2bp-6, +- 0x1.2a875b5ffab56p-6, +- 0x1.212f612dee7fbp-6, +- 0x1.181983e5133ddp-6, +- 0x1.0f443edc5ce49p-6, +- 0x1.06ae13b0d3255p-6, +- 0x1.fcab1483ea7fcp-7, +- 0x1.ec72615a894c4p-7, +- 0x1.dcaf3691fc448p-7, +- 0x1.cd5ec93c12431p-7, +- 0x1.be7e5ac24963bp-7, +- 0x1.b00b38d6b3575p-7, +- 0x1.a202bd6372dcep-7, +- 0x1.94624e78e0fafp-7, +- 0x1.87275e3a6869dp-7, +- 0x1.7a4f6aca256cbp-7, +- 0x1.6dd7fe3358230p-7, +- 0x1.61beae53b72b7p-7, +- 0x1.56011cc3b036dp-7, +- 0x1.4a9cf6bda3f4cp-7, +- 0x1.3f8ff5042a88ep-7, +- 0x1.34d7dbc76d7e5p-7, +- 0x1.2a727a89a3f14p-7, +- 0x1.205dac02bd6b9p-7, +- 0x1.1697560347b25p-7, +- 0x1.0d1d69569b82dp-7, +- 0x1.03ede1a45bfeep-7, +- 0x1.f60d8aa2a88f2p-8, +- 0x1.e4cc4abf7d065p-8, +- 0x1.d4143a9dfe965p-8, +- 0x1.c3e1a5f5c077cp-8, +- 0x1.b430ecf4a83a8p-8, +- 0x1.a4fe83fb9db25p-8, +- 0x1.9646f35a76623p-8, +- 0x1.8806d70b2fc36p-8, +- 0x1.7a3ade6c8b3e4p-8, +- 0x1.6cdfcbfc1e263p-8, +- 0x1.5ff2750fe7820p-8, +- 0x1.536fc18f7ce5cp-8, +- 0x1.4754abacdf1dcp-8, +- 0x1.3b9e3f9d06e3fp-8, +- 0x1.30499b503957fp-8, +- 0x1.2553ee2a336bfp-8, +- 0x1.1aba78ba3af89p-8, +- 0x1.107a8c7323a6ep-8, +- 0x1.06918b6355624p-8, +- 0x1.f9f9cfd9c3035p-9, +- 0x1.e77448fb66bb9p-9, +- 0x1.d58da68fd1170p-9, +- 0x1.c4412bf4b8f0bp-9, +- 0x1.b38a3af2e55b4p-9, +- 0x1.a3645330550ffp-9, +- 0x1.93cb11a30d765p-9, +- 0x1.84ba3004a50d0p-9, +- 0x1.762d84469c18fp-9, +- 0x1.6821000795a03p-9, +- 0x1.5a90b00981d93p-9, +- 0x1.4d78bba8ca5fdp-9, +- 0x1.40d564548fad7p-9, +- 0x1.34a305080681fp-9, +- 0x1.28de11c5031ebp-9, +- 0x1.1d83170fbf6fbp-9, +- 0x1.128eb96be8798p-9, +- 0x1.07fdb4dafea5fp-9, +- 0x1.fb99b8b8279e1p-10, +- 0x1.e7f232d9e2630p-10, +- 0x1.d4fed7195d7e8p-10, +- 0x1.c2b9cf7f893bfp-10, +- 0x1.b11d702b3deb1p-10, +- 0x1.a024365f771bdp-10, +- 0x1.8fc8c794b03b5p-10, +- 0x1.8005f08d6f1efp-10, +- 0x1.70d6a46e07ddap-10, +- 0x1.6235fbd7a4345p-10, +- 0x1.541f340697987p-10, +- 0x1.468dadf4080abp-10, +- 0x1.397ced7af2b15p-10, +- 0x1.2ce898809244ep-10, +- 0x1.20cc76202c5fap-10, +- 0x1.15246dda49d47p-10, +- 0x1.09ec86c75d497p-10, +- 0x1.fe41cd9bb4eeep-11, +- 0x1.e97ba3b77f306p-11, +- 0x1.d57f524723822p-11, +- 0x1.c245d4b998479p-11, +- 0x1.afc85e0f82e12p-11, +- 0x1.9e005769dbc1dp-11, +- 0x1.8ce75e9f6f8a0p-11, +- 0x1.7c7744d9378f7p-11, +- 0x1.6caa0d3582fe9p-11, +- 0x1.5d79eb71e893bp-11, +- 0x1.4ee1429bf7cc0p-11, +- 0x1.40daa3c89f5b6p-11, +- 0x1.3360ccd23db3ap-11, +- 0x1.266ea71d4f71ap-11, +- 0x1.19ff4663ae9dfp-11, +- 0x1.0e0de78654d1ep-11, +- 0x1.0295ef6591848p-11, +- 0x1.ef25d37f49fe1p-12, +- 0x1.da01102b5f851p-12, +- 0x1.c5b5412dcafadp-12, +- 0x1.b23a5a23e4210p-12, +- 0x1.9f8893d8fd1c1p-12, +- 0x1.8d986a4187285p-12, +- 0x1.7c629a822bc9ep-12, +- 0x1.6be02102b3520p-12, +- 0x1.5c0a378c90bcap-12, +- 0x1.4cda5374ea275p-12, +- 0x1.3e4a23d1f4702p-12, +- 0x1.30538fbb77ecdp-12, +- 0x1.22f0b496539bdp-12, +- 0x1.161be46ad3b50p-12, +- 0x1.09cfa445b00ffp-12, +- 0x1.fc0d55470cf51p-13, +- 0x1.e577bbcd49935p-13, +- 0x1.cfd4a5adec5bfp-13, +- 0x1.bb1a9657ce465p-13, +- 0x1.a740684026555p-13, +- 0x1.943d4a1d1ed39p-13, +- 0x1.8208bc334a6a5p-13, +- 0x1.709a8db59f25cp-13, +- 0x1.5feada379d8b7p-13, +- 0x1.4ff207314a102p-13, +- 0x1.40a8c1949f75ep-13, +- 0x1.3207fb7420eb9p-13, +- 0x1.2408e9ba3327fp-13, +- 0x1.16a501f0e42cap-13, +- 0x1.09d5f819c9e29p-13, +- 0x1.fb2b792b40a22p-14, +- 0x1.e3bcf436a1a95p-14, +- 0x1.cd55277c18d05p-14, +- 0x1.b7e94604479dcp-14, +- 0x1.a36eec00926ddp-14, +- 0x1.8fdc1b2dcf7b9p-14, +- 0x1.7d2737527c3f9p-14, +- 0x1.6b4702d7d5849p-14, +- 0x1.5a329b7d30748p-14, +- 0x1.49e17724f4d41p-14, +- 0x1.3a4b60ba9aa4dp-14, +- 0x1.2b6875310f785p-14, +- 0x1.1d312098e9dbap-14, +- 0x1.0f9e1b4dd36dfp-14, +- 0x1.02a8673a94691p-14, +- 0x1.ec929a665b449p-15, +- 0x1.d4f4b4c8e09edp-15, +- 0x1.be6abbb10a5aap-15, +- 0x1.a8e8cc1fadef6p-15, +- 0x1.94637d5bacfdbp-15, +- 0x1.80cfdc72220cfp-15, +- 0x1.6e2367dc27f95p-15, +- 0x1.5c540b4936fd2p-15, +- 0x1.4b581b8d170fcp-15, +- 0x1.3b2652b06c2b2p-15, +- 0x1.2bb5cc22e5db6p-15, +- 0x1.1cfe010e2052dp-15, +- 0x1.0ef6c4c84a0fep-15, +- 0x1.01984165a5f36p-15, +- 0x1.e9b5e8d00ce76p-16, +- 0x1.d16f5716c6c1ap-16, +- 0x1.ba4f035d60e02p-16, +- 0x1.a447b7b03f045p-16, +- 0x1.8f4ccca7fc90dp-16, +- 0x1.7b5223dac7336p-16, +- 0x1.684c227fcacefp-16, +- 0x1.562fac4329b48p-16, +- 0x1.44f21e49054f2p-16, +- 0x1.34894a5e24657p-16, +- 0x1.24eb7254ccf83p-16, +- 0x1.160f438c70913p-16, +- 0x1.07ebd2a2d2844p-16, +- 0x1.f4f12e9ab070ap-17, +- 0x1.db5ad0b27805cp-17, +- 0x1.c304efa2c6f4ep-17, +- 0x1.abe09e9144b5ep-17, +- 0x1.95df988e76644p-17, +- 0x1.80f439b4ee04bp-17, +- 0x1.6d11788a69c64p-17, +- 0x1.5a2adfa0b4bc4p-17, +- 0x1.4834877429b8fp-17, +- 0x1.37231085c7d9ap-17, +- 0x1.26eb9daed6f7ep-17, +- 0x1.1783ceac28910p-17, +- 0x1.08e1badf0fcedp-17, +- 0x1.f5f7d88472604p-18, +- 0x1.db92b5212fb8dp-18, +- 0x1.c282cd3957edap-18, +- 0x1.aab7abace48dcp-18, +- 0x1.94219bfcb4928p-18, +- 0x1.7eb1a2075864dp-18, +- 0x1.6a597219a93d9p-18, +- 0x1.570b69502f313p-18, +- 0x1.44ba864670882p-18, +- 0x1.335a62115bce2p-18, +- 0x1.22df298214423p-18, +- 0x1.133d96ae7e0ddp-18, +- 0x1.046aeabcfcdecp-18, +- 0x1.ecb9cfe1d8642p-19, +- 0x1.d21397ead99cbp-19, +- 0x1.b8d094c86d374p-19, +- 0x1.a0df0f0c626dcp-19, +- 0x1.8a2e269750a39p-19, +- 0x1.74adc8f4064d3p-19, +- 0x1.604ea819f007cp-19, +- 0x1.4d0231928c6f9p-19, +- 0x1.3aba85fe22e1fp-19, +- 0x1.296a70f414053p-19, +- 0x1.1905613b3abf2p-19, +- 0x1.097f6156f32c5p-19, +- 0x1.f59a20caf6695p-20, +- 0x1.d9c73698fb1dcp-20, +- 0x1.bf716c6168baep-20, +- 0x1.a6852c6b58392p-20, +- 0x1.8eefd70594a88p-20, +- 0x1.789fb715aae95p-20, +- 0x1.6383f726a8e04p-20, +- 0x1.4f8c96f26a26ap-20, +- 0x1.3caa61607f920p-20, +- 0x1.2acee2f5ecdb8p-20, +- 0x1.19ec60b1242edp-20, +- 0x1.09f5cf4dd2877p-20, +- 0x1.f5bd95d8730d8p-21, +- 0x1.d9371e2ff7c35p-21, +- 0x1.be41de54d155ap-21, +- 0x1.a4c89e08ef4f3p-21, +- 0x1.8cb738399b12cp-21, +- 0x1.75fa8dbc84becp-21, +- 0x1.608078a70dcbcp-21, +- 0x1.4c37c0394d094p-21, +- 0x1.39100d5687bfep-21, +- 0x1.26f9df8519bd6p-21, +- 0x1.15e6827001f18p-21, +- 0x1.05c803e4831c1p-21, +- 0x1.ed22548cffd35p-22, +- 0x1.d06ad6ecdf971p-22, +- 0x1.b551c847fbc96p-22, +- 0x1.9bc09f112b494p-22, +- 0x1.83a1ff0aa239dp-22, +- 0x1.6ce1aa3fd7bddp-22, +- 0x1.576c72b514859p-22, +- 0x1.43302cc4a0da8p-22, +- 0x1.301ba221dc9bbp-22, +- 0x1.1e1e857adc568p-22, +- 0x1.0d2966b1746f7p-22, +- 0x1.fa5b4f49cc6b2p-23, +- 0x1.dc3ae30b55c16p-23, +- 0x1.bfd7555a3bd68p-23, +- 0x1.a517d9e61628ap-23, +- 0x1.8be4f8f6c951fp-23, +- 0x1.74287ded49339p-23, +- 0x1.5dcd669f2cd34p-23, +- 0x1.48bfd38302870p-23, +- 0x1.34ecf8a3c124ap-23, +- 0x1.22430f521cbcfp-23, +- 0x1.10b1488aeb235p-23, +- 0x1.0027c00a263a6p-23, +- 0x1.e12ee004efc37p-24, +- 0x1.c3e44ae32b16bp-24, +- 0x1.a854ea14102a8p-24, +- 0x1.8e6761569f45dp-24, +- 0x1.7603bac345f65p-24, +- 0x1.5f1353cdad001p-24, +- 0x1.4980cb3c80949p-24, +- 0x1.3537f00b6ad4dp-24, +- 0x1.2225b12bffc68p-24, +- 0x1.10380e1adb7e9p-24, +- 0x1.febc107d5efaap-25, +- 0x1.df0f2a0ee6946p-25, +- 0x1.c14b2188bcee4p-25, +- 0x1.a553644f7f07dp-25, +- 0x1.8b0cfce0579dfp-25, +- 0x1.725e7c5dd20f7p-25, +- 0x1.5b2fe547a1340p-25, +- 0x1.456a974e92e93p-25, +- 0x1.30f93c3699078p-25, +- 0x1.1dc7b5b978cf8p-25, +- 0x1.0bc30c5d52f15p-25, +- 0x1.f5b2be65a0c7fp-26, +- 0x1.d5f3a8dea7357p-26, +- 0x1.b82915b03515bp-26, +- 0x1.9c3517e789488p-26, +- 0x1.81fb7df06136ep-26, +- 0x1.6961b8d641d06p-26, +- 0x1.524ec4d916caep-26, +- 0x1.3cab1343d18d1p-26, +- 0x1.2860757487a01p-26, +- 0x1.155a09065d4f7p-26, +- 0x1.0384250e4c9fcp-26, +- 0x1.e59890b926c78p-27, +- 0x1.c642116a8a9e3p-27, +- 0x1.a8e405e651ab6p-27, +- 0x1.8d5f98114f872p-27, +- 0x1.7397c5a66e307p-27, +- 0x1.5b71456c5a4c4p-27, +- 0x1.44d26de513197p-27, +- 0x1.2fa31d6371537p-27, +- 0x1.1bcca373b7b43p-27, +- 0x1.0939ab853339fp-27, +- 0x1.efac5187b2863p-28, +- 0x1.cf1e86235d0e6p-28, +- 0x1.b0a68a2128babp-28, +- 0x1.9423165bc4444p-28, +- 0x1.7974e743dea3cp-28, +- 0x1.607e9eacd1050p-28, +- 0x1.4924a74dec728p-28, +- 0x1.334d19e0c2160p-28, +- 0x1.1edfa3c5f5ccap-28, +- 0x1.0bc56f1b54701p-28, +- 0x1.f3d2185e047d9p-29, +- 0x1.d26cb87945e87p-29, +- 0x1.b334fac4b9f99p-29, +- 0x1.96076f7918d1cp-29, +- 0x1.7ac2d72fc2c63p-29, +- 0x1.614801550319ep-29, +- 0x1.4979ac8b28926p-29, +- 0x1.333c68e2d0548p-29, +- 0x1.1e767bce37dd7p-29, +- 0x1.0b0fc5b6d05a0p-29, +- 0x1.f1e3523b41d7dp-30, +- 0x1.d00de6608effep-30, +- 0x1.b0778b7b3301ap-30, +- 0x1.92fb04ec0f6cfp-30, +- 0x1.77756ec9f78fap-30, +- 0x1.5dc61922d5a06p-30, +- 0x1.45ce65699ff6dp-30, +- 0x1.2f71a5f159970p-30, +- 0x1.1a94ff571654fp-30, +- 0x1.071f4bbea09ecp-30, +- 0x1.e9f1ff8ddd774p-31, +- 0x1.c818223a202c7p-31, +- 0x1.a887bd2b4404dp-31, +- 0x1.8b1a336c5eb6bp-31, +- 0x1.6fab63324088ap-31, +- 0x1.56197e30205bap-31, +- 0x1.3e44e45301b92p-31, +- 0x1.281000bfe4c3fp-31, +- 0x1.135f28f2d50b4p-31, +- 0x1.00187dded5975p-31, +- 0x1.dc479de0ef001p-32, +- 0x1.bad4fdad3caa1p-32, +- 0x1.9baed3ed27ab8p-32, +- 0x1.7ead9ce4285bbp-32, +- 0x1.63ac6b4edc88ep-32, +- 0x1.4a88be2a6390cp-32, +- 0x1.332259185f1a0p-32, +- 0x1.1d5b1f3793044p-32, +- 0x1.0916f04b6e18bp-32, +- 0x1.ec77101de6926p-33, +- 0x1.c960bf23153e0p-33, +- 0x1.a8bd20fc65ef7p-33, +- 0x1.8a61745ec7d1dp-33, +- 0x1.6e25d0e756261p-33, +- 0x1.53e4f7d1666cbp-33, +- 0x1.3b7c27a7ddb0ep-33, +- 0x1.24caf2c32af14p-33, +- 0x1.0fb3186804d0fp-33, +- 0x1.f830c0bb41fd7p-34, +- 0x1.d3c0f1a91c846p-34, +- 0x1.b1e5acf351d87p-34, +- 0x1.92712d259ce66p-34, +- 0x1.7538c60a04476p-34, +- 0x1.5a14b04b47879p-34, +- 0x1.40dfd87456f4cp-34, +- 0x1.2977b1172b9d5p-34, +- 0x1.13bc07e891491p-34, +- 0x1.ff1dbb4300811p-35, +- 0x1.d9a880f306bd8p-35, +- 0x1.b6e45220b55e0p-35, +- 0x1.96a0b33f2c4dap-35, +- 0x1.78b07e9e924acp-35, +- 0x1.5ce9ab1670dd2p-35, +- 0x1.4325167006bb0p-35, +- 0x1.2b3e53538ff3fp-35, +- 0x1.15137a7f44864p-35, +- 0x1.0084ff125639dp-35, +- 0x1.daeb0b7311ec7p-36, +- 0x1.b7937d1c40c52p-36, +- 0x1.96d082f59ab06p-36, +- 0x1.7872d9fa10aadp-36, +- 0x1.5c4e8e37bc7d0p-36, +- 0x1.423ac0df49a40p-36, +- 0x1.2a117230ad284p-36, +- 0x1.13af4f04f9998p-36, +- 0x1.fde703724e560p-37, +- 0x1.d77f0c82e7641p-37, +- 0x1.b3ee02611d7ddp-37, +- 0x1.92ff33023d5bdp-37, +- 0x1.7481a9e69f53fp-37, +- 0x1.5847eda620959p-37, +- 0x1.3e27c1fcc74bdp-37, +- 0x1.25f9ee0b923dcp-37, +- 0x1.0f9a0686531ffp-37, +- 0x1.f5cc7718082afp-38, +- 0x1.cf7e53d6a2ca5p-38, +- 0x1.ac0f5f3229372p-38, +- 0x1.8b498644847eap-38, +- 0x1.6cfa9bcca59dcp-38, +- 0x1.50f411d4fd2cdp-38, +- 0x1.370ab8327af5ep-38, +- 0x1.1f167f88c6b6ep-38, +- 0x1.08f24085d4597p-38, +- 0x1.e8f70e181d619p-39, +- 0x1.c324c20e337dcp-39, +- 0x1.a03261574b54ep-39, +- 0x1.7fe903cdf5855p-39, +- 0x1.6215c58da3450p-39, +- 0x1.46897d4b69fc6p-39, +- 0x1.2d1877d731b7bp-39, +- 0x1.159a386b11517p-39, +- 0x1.ffd27ae9393cep-40, +- 0x1.d7c593130dd0bp-40, +- 0x1.b2cd607c79bcfp-40, +- 0x1.90ae4d3405651p-40, +- 0x1.71312dd1759e2p-40, +- 0x1.5422ef5d8949dp-40, +- 0x1.39544b0ecc957p-40, +- 0x1.20997f73e73ddp-40, +- 0x1.09ca0eaacd277p-40, +- 0x1.e9810295890ecp-41, +- 0x1.c2b45b5aa4a1dp-41, +- 0x1.9eee068fa7596p-41, +- 0x1.7df2b399c10a8p-41, +- 0x1.5f8b87a31bd85p-41, +- 0x1.4385c96e9a2d9p-41, +- 0x1.29b2933ef4cbcp-41, +- 0x1.11e68a6378f8ap-41, +- 0x1.f7f338086a86bp-42, +- 0x1.cf8d7d9ce040ap-42, +- 0x1.aa577251ae484p-42, +- 0x1.8811d739efb5ep-42, +- 0x1.68823e52970bep-42, +- 0x1.4b72ae68e8b4cp-42, +- 0x1.30b14dbe876bcp-42, +- 0x1.181012ef86610p-42, +- 0x1.01647ba798744p-42, +- 0x1.d90e917701675p-43, +- 0x1.b2a87e86d0c8ap-43, +- 0x1.8f53dcb377293p-43, +- 0x1.6ed2f2515e933p-43, +- 0x1.50ecc9ed47f19p-43, +- 0x1.356cd5ce7799ep-43, +- 0x1.1c229a587ab78p-43, +- 0x1.04e15ecc7f3f6p-43, +- 0x1.deffc7e6a6017p-44, +- 0x1.b7b040832f310p-44, +- 0x1.938e021f36d76p-44, +- 0x1.7258610b3b233p-44, +- 0x1.53d3bfc82a909p-44, +- 0x1.37c92babdc2fdp-44, +- 0x1.1e06010120f6ap-44, +- 0x1.065b9616170d4p-44, +- 0x1.e13dd96b3753ap-45, +- 0x1.b950d32467392p-45, +- 0x1.94a72263259a5p-45, +- 0x1.72fd93e036cdcp-45, +- 0x1.54164576929abp-45, +- 0x1.37b83c521fe96p-45, +- 0x1.1daf033182e96p-45, +- 0x1.05ca50205d26ap-45, +- 0x1.dfbb6235639fap-46, +- 0x1.b7807e294781fp-46, +- 0x1.9298add70a734p-46, +- 0x1.70beaf9c7ffb6p-46, +- 0x1.51b2cd6709222p-46, +- 0x1.353a6cf7f7fffp-46, +- 0x1.1b1fa8cbe84a7p-46, +- 0x1.0330f0fd69921p-46, +- 0x1.da81670f96f9bp-47, +- 0x1.b24a16b4d09aap-47, +- 0x1.8d6eeb6efdbd6p-47, +- 0x1.6ba91ac734785p-47, +- 0x1.4cb7966770ab5p-47, +- 0x1.305e9721d0981p-47, +- 0x1.1667311fff70ap-47, +- 0x1.fd3de10d62855p-48, +- 0x1.d1aefbcd48d0cp-48, +- 0x1.a9cc93c25aca9p-48, +- 0x1.85487ee3ea735p-48, +- 0x1.63daf8b4b1e0cp-48, +- 0x1.45421e69a6ca1p-48, +- 0x1.294175802d99ap-48, +- 0x1.0fa17bf41068fp-48, +- 0x1.f05e82aae2bb9p-49, +- 0x1.c578101b29058p-49, +- 0x1.9e39dc5dd2f7cp-49, +- 0x1.7a553a728bbf2p-49, +- 0x1.5982008db1304p-49, +- 0x1.3b7e00422e51bp-49, +- 0x1.200c898d9ee3ep-49, +- 0x1.06f5f7eb65a56p-49, +- 0x1.e00e9148a1d25p-50, +- 0x1.b623734024e92p-50, +- 0x1.8fd4e01891bf8p-50, +- 0x1.6cd44c7470d89p-50, +- 0x1.4cd9c04158cd7p-50, +- 0x1.2fa34bf5c8344p-50, +- 0x1.14f4890ff2461p-50, +- 0x1.f92c49dfa4df5p-51, +- 0x1.ccaaea71ab0dfp-51, +- 0x1.a40829f001197p-51, +- 0x1.7eef13b59e96cp-51, +- 0x1.5d11e1a252bf5p-51, +- 0x1.3e296303b2297p-51, +- 0x1.21f47009f43cep-51, +- 0x1.083768c5e4541p-51, +- 0x1.e1777d831265ep-52, +- 0x1.b69f10b0191b5p-52, +- 0x1.8f8a3a05b5b52p-52, +- 0x1.6be573c40c8e7p-52, +- 0x1.4b645ba991fdbp-52, +- 0x1.2dc119095729fp-52, +- }, +-}; +diff --git a/sysdeps/aarch64/fpu/sv_erff_data.c b/sysdeps/aarch64/fpu/sv_erff_data.c +deleted file mode 100644 +index 6dcd72af69..0000000000 +--- a/sysdeps/aarch64/fpu/sv_erff_data.c ++++ /dev/null +@@ -1,1058 +0,0 @@ +-/* Table for SVE erff approximation +- +- Copyright (C) 2024 Free Software Foundation, Inc. +- This file is part of the GNU C Library. +- +- The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Lesser General Public +- License as published by the Free Software Foundation; either +- version 2.1 of the License, or (at your option) any later version. +- +- The GNU C Library is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Lesser General Public License for more details. +- +- You should have received a copy of the GNU Lesser General Public +- License along with the GNU C Library; if not, see +- . */ +- +-#include "vecmath_config.h" +- +-/* Lookup table used in SVE erff. +- For each possible rounded input r (multiples of 1/128), between +- r = 0.0 and r = 4.0 (513 values): +- - __erff_data.erf contains the values of erf(r), +- - __erff_data.scale contains the values of 2/sqrt(pi)*exp(-r^2). +- Note that indices 0 and 1 are never hit by the algorithm, since lookup is +- performed only for x >= 1/64-1/512. */ +-const struct sv_erff_data __sv_erff_data = { +- .erf = { 0x0.000000p+0, +- 0x1.20dbf4p-7, +- 0x1.20d770p-6, +- 0x1.b137e0p-6, +- 0x1.20c564p-5, +- 0x1.68e5d4p-5, +- 0x1.b0fafep-5, +- 0x1.f902a8p-5, +- 0x1.207d48p-4, +- 0x1.44703ep-4, +- 0x1.68591ap-4, +- 0x1.8c36bep-4, +- 0x1.b00812p-4, +- 0x1.d3cbf8p-4, +- 0x1.f7815ap-4, +- 0x1.0d9390p-3, +- 0x1.1f5e1ap-3, +- 0x1.311fc2p-3, +- 0x1.42d7fcp-3, +- 0x1.548642p-3, +- 0x1.662a0cp-3, +- 0x1.77c2d2p-3, +- 0x1.895010p-3, +- 0x1.9ad142p-3, +- 0x1.ac45e4p-3, +- 0x1.bdad72p-3, +- 0x1.cf076ep-3, +- 0x1.e05354p-3, +- 0x1.f190aap-3, +- 0x1.015f78p-2, +- 0x1.09eed6p-2, +- 0x1.127632p-2, +- 0x1.1af54ep-2, +- 0x1.236bf0p-2, +- 0x1.2bd9dcp-2, +- 0x1.343ed6p-2, +- 0x1.3c9aa8p-2, +- 0x1.44ed18p-2, +- 0x1.4d35f0p-2, +- 0x1.5574f4p-2, +- 0x1.5da9f4p-2, +- 0x1.65d4b8p-2, +- 0x1.6df50ap-2, +- 0x1.760abap-2, +- 0x1.7e1594p-2, +- 0x1.861566p-2, +- 0x1.8e0a02p-2, +- 0x1.95f336p-2, +- 0x1.9dd0d2p-2, +- 0x1.a5a2acp-2, +- 0x1.ad6896p-2, +- 0x1.b52264p-2, +- 0x1.bccfecp-2, +- 0x1.c47104p-2, +- 0x1.cc0584p-2, +- 0x1.d38d44p-2, +- 0x1.db081cp-2, +- 0x1.e275eap-2, +- 0x1.e9d68ap-2, +- 0x1.f129d4p-2, +- 0x1.f86faap-2, +- 0x1.ffa7eap-2, +- 0x1.03693ap-1, +- 0x1.06f794p-1, +- 0x1.0a7ef6p-1, +- 0x1.0dff50p-1, +- 0x1.117894p-1, +- 0x1.14eab4p-1, +- 0x1.1855a6p-1, +- 0x1.1bb95cp-1, +- 0x1.1f15ccp-1, +- 0x1.226ae8p-1, +- 0x1.25b8a8p-1, +- 0x1.28ff02p-1, +- 0x1.2c3decp-1, +- 0x1.2f755cp-1, +- 0x1.32a54cp-1, +- 0x1.35cdb4p-1, +- 0x1.38ee8ap-1, +- 0x1.3c07cap-1, +- 0x1.3f196ep-1, +- 0x1.42236ep-1, +- 0x1.4525c8p-1, +- 0x1.482074p-1, +- 0x1.4b1372p-1, +- 0x1.4dfebap-1, +- 0x1.50e24cp-1, +- 0x1.53be26p-1, +- 0x1.569244p-1, +- 0x1.595ea6p-1, +- 0x1.5c2348p-1, +- 0x1.5ee02ep-1, +- 0x1.619556p-1, +- 0x1.6442c0p-1, +- 0x1.66e86ep-1, +- 0x1.69865ep-1, +- 0x1.6c1c98p-1, +- 0x1.6eab18p-1, +- 0x1.7131e6p-1, +- 0x1.73b102p-1, +- 0x1.762870p-1, +- 0x1.789836p-1, +- 0x1.7b0058p-1, +- 0x1.7d60d8p-1, +- 0x1.7fb9c0p-1, +- 0x1.820b12p-1, +- 0x1.8454d6p-1, +- 0x1.869712p-1, +- 0x1.88d1cep-1, +- 0x1.8b050ep-1, +- 0x1.8d30dep-1, +- 0x1.8f5544p-1, +- 0x1.91724ap-1, +- 0x1.9387f6p-1, +- 0x1.959652p-1, +- 0x1.979d68p-1, +- 0x1.999d42p-1, +- 0x1.9b95e8p-1, +- 0x1.9d8768p-1, +- 0x1.9f71cap-1, +- 0x1.a1551ap-1, +- 0x1.a33162p-1, +- 0x1.a506b0p-1, +- 0x1.a6d50cp-1, +- 0x1.a89c86p-1, +- 0x1.aa5d26p-1, +- 0x1.ac16fcp-1, +- 0x1.adca14p-1, +- 0x1.af767ap-1, +- 0x1.b11c3cp-1, +- 0x1.b2bb68p-1, +- 0x1.b4540ap-1, +- 0x1.b5e630p-1, +- 0x1.b771e8p-1, +- 0x1.b8f742p-1, +- 0x1.ba764ap-1, +- 0x1.bbef10p-1, +- 0x1.bd61a2p-1, +- 0x1.bece0ep-1, +- 0x1.c03464p-1, +- 0x1.c194b2p-1, +- 0x1.c2ef08p-1, +- 0x1.c44376p-1, +- 0x1.c5920ap-1, +- 0x1.c6dad2p-1, +- 0x1.c81de2p-1, +- 0x1.c95b46p-1, +- 0x1.ca930ep-1, +- 0x1.cbc54cp-1, +- 0x1.ccf20cp-1, +- 0x1.ce1962p-1, +- 0x1.cf3b5cp-1, +- 0x1.d0580cp-1, +- 0x1.d16f7ep-1, +- 0x1.d281c4p-1, +- 0x1.d38ef0p-1, +- 0x1.d49710p-1, +- 0x1.d59a34p-1, +- 0x1.d6986cp-1, +- 0x1.d791cap-1, +- 0x1.d8865ep-1, +- 0x1.d97636p-1, +- 0x1.da6162p-1, +- 0x1.db47f4p-1, +- 0x1.dc29fcp-1, +- 0x1.dd0788p-1, +- 0x1.dde0aap-1, +- 0x1.deb570p-1, +- 0x1.df85eap-1, +- 0x1.e0522ap-1, +- 0x1.e11a3ep-1, +- 0x1.e1de36p-1, +- 0x1.e29e22p-1, +- 0x1.e35a12p-1, +- 0x1.e41214p-1, +- 0x1.e4c638p-1, +- 0x1.e5768cp-1, +- 0x1.e62322p-1, +- 0x1.e6cc08p-1, +- 0x1.e7714ap-1, +- 0x1.e812fcp-1, +- 0x1.e8b12ap-1, +- 0x1.e94be4p-1, +- 0x1.e9e336p-1, +- 0x1.ea7730p-1, +- 0x1.eb07e2p-1, +- 0x1.eb9558p-1, +- 0x1.ec1fa2p-1, +- 0x1.eca6ccp-1, +- 0x1.ed2ae6p-1, +- 0x1.edabfcp-1, +- 0x1.ee2a1ep-1, +- 0x1.eea556p-1, +- 0x1.ef1db4p-1, +- 0x1.ef9344p-1, +- 0x1.f00614p-1, +- 0x1.f07630p-1, +- 0x1.f0e3a6p-1, +- 0x1.f14e82p-1, +- 0x1.f1b6d0p-1, +- 0x1.f21ca0p-1, +- 0x1.f27ff8p-1, +- 0x1.f2e0eap-1, +- 0x1.f33f7ep-1, +- 0x1.f39bc2p-1, +- 0x1.f3f5c2p-1, +- 0x1.f44d88p-1, +- 0x1.f4a31ep-1, +- 0x1.f4f694p-1, +- 0x1.f547f2p-1, +- 0x1.f59742p-1, +- 0x1.f5e490p-1, +- 0x1.f62fe8p-1, +- 0x1.f67952p-1, +- 0x1.f6c0dcp-1, +- 0x1.f7068cp-1, +- 0x1.f74a6ep-1, +- 0x1.f78c8cp-1, +- 0x1.f7cceep-1, +- 0x1.f80ba2p-1, +- 0x1.f848acp-1, +- 0x1.f8841ap-1, +- 0x1.f8bdf2p-1, +- 0x1.f8f63ep-1, +- 0x1.f92d08p-1, +- 0x1.f96256p-1, +- 0x1.f99634p-1, +- 0x1.f9c8a8p-1, +- 0x1.f9f9bap-1, +- 0x1.fa2974p-1, +- 0x1.fa57dep-1, +- 0x1.fa84fep-1, +- 0x1.fab0dep-1, +- 0x1.fadb84p-1, +- 0x1.fb04f6p-1, +- 0x1.fb2d40p-1, +- 0x1.fb5464p-1, +- 0x1.fb7a6cp-1, +- 0x1.fb9f60p-1, +- 0x1.fbc344p-1, +- 0x1.fbe61ep-1, +- 0x1.fc07fap-1, +- 0x1.fc28d8p-1, +- 0x1.fc48c2p-1, +- 0x1.fc67bcp-1, +- 0x1.fc85d0p-1, +- 0x1.fca2fep-1, +- 0x1.fcbf52p-1, +- 0x1.fcdaccp-1, +- 0x1.fcf576p-1, +- 0x1.fd0f54p-1, +- 0x1.fd286ap-1, +- 0x1.fd40bep-1, +- 0x1.fd5856p-1, +- 0x1.fd6f34p-1, +- 0x1.fd8562p-1, +- 0x1.fd9ae2p-1, +- 0x1.fdafb8p-1, +- 0x1.fdc3e8p-1, +- 0x1.fdd77ap-1, +- 0x1.fdea6ep-1, +- 0x1.fdfcccp-1, +- 0x1.fe0e96p-1, +- 0x1.fe1fd0p-1, +- 0x1.fe3080p-1, +- 0x1.fe40a6p-1, +- 0x1.fe504cp-1, +- 0x1.fe5f70p-1, +- 0x1.fe6e18p-1, +- 0x1.fe7c46p-1, +- 0x1.fe8a00p-1, +- 0x1.fe9748p-1, +- 0x1.fea422p-1, +- 0x1.feb090p-1, +- 0x1.febc96p-1, +- 0x1.fec836p-1, +- 0x1.fed374p-1, +- 0x1.fede52p-1, +- 0x1.fee8d4p-1, +- 0x1.fef2fep-1, +- 0x1.fefccep-1, +- 0x1.ff064cp-1, +- 0x1.ff0f76p-1, +- 0x1.ff1852p-1, +- 0x1.ff20e0p-1, +- 0x1.ff2924p-1, +- 0x1.ff3120p-1, +- 0x1.ff38d6p-1, +- 0x1.ff4048p-1, +- 0x1.ff4778p-1, +- 0x1.ff4e68p-1, +- 0x1.ff551ap-1, +- 0x1.ff5b90p-1, +- 0x1.ff61ccp-1, +- 0x1.ff67d0p-1, +- 0x1.ff6d9ep-1, +- 0x1.ff7338p-1, +- 0x1.ff789ep-1, +- 0x1.ff7dd4p-1, +- 0x1.ff82dap-1, +- 0x1.ff87b2p-1, +- 0x1.ff8c5cp-1, +- 0x1.ff90dcp-1, +- 0x1.ff9532p-1, +- 0x1.ff9960p-1, +- 0x1.ff9d68p-1, +- 0x1.ffa14ap-1, +- 0x1.ffa506p-1, +- 0x1.ffa8a0p-1, +- 0x1.ffac18p-1, +- 0x1.ffaf6ep-1, +- 0x1.ffb2a6p-1, +- 0x1.ffb5bep-1, +- 0x1.ffb8b8p-1, +- 0x1.ffbb98p-1, +- 0x1.ffbe5ap-1, +- 0x1.ffc102p-1, +- 0x1.ffc390p-1, +- 0x1.ffc606p-1, +- 0x1.ffc862p-1, +- 0x1.ffcaa8p-1, +- 0x1.ffccd8p-1, +- 0x1.ffcef4p-1, +- 0x1.ffd0fap-1, +- 0x1.ffd2eap-1, +- 0x1.ffd4cap-1, +- 0x1.ffd696p-1, +- 0x1.ffd84ep-1, +- 0x1.ffd9f8p-1, +- 0x1.ffdb90p-1, +- 0x1.ffdd18p-1, +- 0x1.ffde90p-1, +- 0x1.ffdffap-1, +- 0x1.ffe154p-1, +- 0x1.ffe2a2p-1, +- 0x1.ffe3e2p-1, +- 0x1.ffe514p-1, +- 0x1.ffe63cp-1, +- 0x1.ffe756p-1, +- 0x1.ffe866p-1, +- 0x1.ffe96ap-1, +- 0x1.ffea64p-1, +- 0x1.ffeb54p-1, +- 0x1.ffec3ap-1, +- 0x1.ffed16p-1, +- 0x1.ffedeap-1, +- 0x1.ffeeb4p-1, +- 0x1.ffef76p-1, +- 0x1.fff032p-1, +- 0x1.fff0e4p-1, +- 0x1.fff18ep-1, +- 0x1.fff232p-1, +- 0x1.fff2d0p-1, +- 0x1.fff366p-1, +- 0x1.fff3f6p-1, +- 0x1.fff480p-1, +- 0x1.fff504p-1, +- 0x1.fff582p-1, +- 0x1.fff5fcp-1, +- 0x1.fff670p-1, +- 0x1.fff6dep-1, +- 0x1.fff74ap-1, +- 0x1.fff7aep-1, +- 0x1.fff810p-1, +- 0x1.fff86cp-1, +- 0x1.fff8c6p-1, +- 0x1.fff91cp-1, +- 0x1.fff96cp-1, +- 0x1.fff9bap-1, +- 0x1.fffa04p-1, +- 0x1.fffa4cp-1, +- 0x1.fffa90p-1, +- 0x1.fffad0p-1, +- 0x1.fffb0ep-1, +- 0x1.fffb4ap-1, +- 0x1.fffb82p-1, +- 0x1.fffbb8p-1, +- 0x1.fffbecp-1, +- 0x1.fffc1ep-1, +- 0x1.fffc4ep-1, +- 0x1.fffc7ap-1, +- 0x1.fffca6p-1, +- 0x1.fffccep-1, +- 0x1.fffcf6p-1, +- 0x1.fffd1ap-1, +- 0x1.fffd3ep-1, +- 0x1.fffd60p-1, +- 0x1.fffd80p-1, +- 0x1.fffda0p-1, +- 0x1.fffdbep-1, +- 0x1.fffddap-1, +- 0x1.fffdf4p-1, +- 0x1.fffe0ep-1, +- 0x1.fffe26p-1, +- 0x1.fffe3ep-1, +- 0x1.fffe54p-1, +- 0x1.fffe68p-1, +- 0x1.fffe7ep-1, +- 0x1.fffe90p-1, +- 0x1.fffea2p-1, +- 0x1.fffeb4p-1, +- 0x1.fffec4p-1, +- 0x1.fffed4p-1, +- 0x1.fffee4p-1, +- 0x1.fffef2p-1, +- 0x1.ffff00p-1, +- 0x1.ffff0cp-1, +- 0x1.ffff18p-1, +- 0x1.ffff24p-1, +- 0x1.ffff30p-1, +- 0x1.ffff3ap-1, +- 0x1.ffff44p-1, +- 0x1.ffff4ep-1, +- 0x1.ffff56p-1, +- 0x1.ffff60p-1, +- 0x1.ffff68p-1, +- 0x1.ffff70p-1, +- 0x1.ffff78p-1, +- 0x1.ffff7ep-1, +- 0x1.ffff84p-1, +- 0x1.ffff8cp-1, +- 0x1.ffff92p-1, +- 0x1.ffff98p-1, +- 0x1.ffff9cp-1, +- 0x1.ffffa2p-1, +- 0x1.ffffa6p-1, +- 0x1.ffffacp-1, +- 0x1.ffffb0p-1, +- 0x1.ffffb4p-1, +- 0x1.ffffb8p-1, +- 0x1.ffffbcp-1, +- 0x1.ffffc0p-1, +- 0x1.ffffc4p-1, +- 0x1.ffffc6p-1, +- 0x1.ffffcap-1, +- 0x1.ffffccp-1, +- 0x1.ffffd0p-1, +- 0x1.ffffd2p-1, +- 0x1.ffffd4p-1, +- 0x1.ffffd6p-1, +- 0x1.ffffd8p-1, +- 0x1.ffffdcp-1, +- 0x1.ffffdep-1, +- 0x1.ffffdep-1, +- 0x1.ffffe0p-1, +- 0x1.ffffe2p-1, +- 0x1.ffffe4p-1, +- 0x1.ffffe6p-1, +- 0x1.ffffe8p-1, +- 0x1.ffffe8p-1, +- 0x1.ffffeap-1, +- 0x1.ffffeap-1, +- 0x1.ffffecp-1, +- 0x1.ffffeep-1, +- 0x1.ffffeep-1, +- 0x1.fffff0p-1, +- 0x1.fffff0p-1, +- 0x1.fffff2p-1, +- 0x1.fffff2p-1, +- 0x1.fffff2p-1, +- 0x1.fffff4p-1, +- 0x1.fffff4p-1, +- 0x1.fffff4p-1, +- 0x1.fffff6p-1, +- 0x1.fffff6p-1, +- 0x1.fffff6p-1, +- 0x1.fffff8p-1, +- 0x1.fffff8p-1, +- 0x1.fffff8p-1, +- 0x1.fffff8p-1, +- 0x1.fffffap-1, +- 0x1.fffffap-1, +- 0x1.fffffap-1, +- 0x1.fffffap-1, +- 0x1.fffffap-1, +- 0x1.fffffap-1, +- 0x1.fffffcp-1, +- 0x1.fffffcp-1, +- 0x1.fffffcp-1, +- 0x1.fffffcp-1, +- 0x1.fffffcp-1, +- 0x1.fffffcp-1, +- 0x1.fffffcp-1, +- 0x1.fffffcp-1, +- 0x1.fffffep-1, +- 0x1.fffffep-1, +- 0x1.fffffep-1, +- 0x1.fffffep-1, +- 0x1.fffffep-1, +- 0x1.fffffep-1, +- 0x1.fffffep-1, +- 0x1.fffffep-1, +- 0x1.fffffep-1, +- 0x1.fffffep-1, +- 0x1.fffffep-1, +- 0x1.fffffep-1, +- 0x1.fffffep-1, +- 0x1.fffffep-1, +- 0x1.fffffep-1, +- 0x1.fffffep-1, +- 0x1.fffffep-1, +- 0x1.fffffep-1, +- 0x1.000000p+0, +- 0x1.000000p+0, +- 0x1.000000p+0, +- 0x1.000000p+0, +- 0x1.000000p+0, +- 0x1.000000p+0, +- 0x1.000000p+0, +- 0x1.000000p+0, +- 0x1.000000p+0, +- 0x1.000000p+0, +- 0x1.000000p+0, +- }, +- .scale = { 0x1.20dd76p+0, +- 0x1.20d8f2p+0, +- 0x1.20cb68p+0, +- 0x1.20b4d8p+0, +- 0x1.209546p+0, +- 0x1.206cb4p+0, +- 0x1.203b26p+0, +- 0x1.2000a0p+0, +- 0x1.1fbd28p+0, +- 0x1.1f70c4p+0, +- 0x1.1f1b7ap+0, +- 0x1.1ebd56p+0, +- 0x1.1e565cp+0, +- 0x1.1de698p+0, +- 0x1.1d6e14p+0, +- 0x1.1cecdcp+0, +- 0x1.1c62fap+0, +- 0x1.1bd07cp+0, +- 0x1.1b3572p+0, +- 0x1.1a91e6p+0, +- 0x1.19e5eap+0, +- 0x1.19318cp+0, +- 0x1.1874dep+0, +- 0x1.17aff0p+0, +- 0x1.16e2d8p+0, +- 0x1.160da4p+0, +- 0x1.153068p+0, +- 0x1.144b3cp+0, +- 0x1.135e30p+0, +- 0x1.12695ep+0, +- 0x1.116cd8p+0, +- 0x1.1068bap+0, +- 0x1.0f5d16p+0, +- 0x1.0e4a08p+0, +- 0x1.0d2fa6p+0, +- 0x1.0c0e0ap+0, +- 0x1.0ae550p+0, +- 0x1.09b590p+0, +- 0x1.087ee4p+0, +- 0x1.07416cp+0, +- 0x1.05fd3ep+0, +- 0x1.04b27cp+0, +- 0x1.036140p+0, +- 0x1.0209a6p+0, +- 0x1.00abd0p+0, +- 0x1.fe8fb0p-1, +- 0x1.fbbbbep-1, +- 0x1.f8dc0ap-1, +- 0x1.f5f0cep-1, +- 0x1.f2fa4cp-1, +- 0x1.eff8c4p-1, +- 0x1.ecec78p-1, +- 0x1.e9d5a8p-1, +- 0x1.e6b498p-1, +- 0x1.e38988p-1, +- 0x1.e054bep-1, +- 0x1.dd167cp-1, +- 0x1.d9cf06p-1, +- 0x1.d67ea2p-1, +- 0x1.d32592p-1, +- 0x1.cfc41ep-1, +- 0x1.cc5a8ap-1, +- 0x1.c8e91cp-1, +- 0x1.c5701ap-1, +- 0x1.c1efcap-1, +- 0x1.be6872p-1, +- 0x1.bada5ap-1, +- 0x1.b745c6p-1, +- 0x1.b3aafcp-1, +- 0x1.b00a46p-1, +- 0x1.ac63e8p-1, +- 0x1.a8b828p-1, +- 0x1.a5074ep-1, +- 0x1.a1519ep-1, +- 0x1.9d9762p-1, +- 0x1.99d8dap-1, +- 0x1.961650p-1, +- 0x1.925008p-1, +- 0x1.8e8646p-1, +- 0x1.8ab950p-1, +- 0x1.86e96ap-1, +- 0x1.8316d6p-1, +- 0x1.7f41dcp-1, +- 0x1.7b6abcp-1, +- 0x1.7791b8p-1, +- 0x1.73b714p-1, +- 0x1.6fdb12p-1, +- 0x1.6bfdf0p-1, +- 0x1.681ff2p-1, +- 0x1.644156p-1, +- 0x1.60625cp-1, +- 0x1.5c8342p-1, +- 0x1.58a446p-1, +- 0x1.54c5a6p-1, +- 0x1.50e79ep-1, +- 0x1.4d0a68p-1, +- 0x1.492e42p-1, +- 0x1.455366p-1, +- 0x1.417a0cp-1, +- 0x1.3da26ep-1, +- 0x1.39ccc2p-1, +- 0x1.35f940p-1, +- 0x1.32281ep-1, +- 0x1.2e5992p-1, +- 0x1.2a8dcep-1, +- 0x1.26c508p-1, +- 0x1.22ff72p-1, +- 0x1.1f3d3cp-1, +- 0x1.1b7e98p-1, +- 0x1.17c3b6p-1, +- 0x1.140cc4p-1, +- 0x1.1059eep-1, +- 0x1.0cab62p-1, +- 0x1.09014cp-1, +- 0x1.055bd6p-1, +- 0x1.01bb2cp-1, +- 0x1.fc3ee6p-2, +- 0x1.f511aap-2, +- 0x1.edeeeep-2, +- 0x1.e6d700p-2, +- 0x1.dfca26p-2, +- 0x1.d8c8aap-2, +- 0x1.d1d2d0p-2, +- 0x1.cae8dap-2, +- 0x1.c40b08p-2, +- 0x1.bd3998p-2, +- 0x1.b674c8p-2, +- 0x1.afbcd4p-2, +- 0x1.a911f0p-2, +- 0x1.a27456p-2, +- 0x1.9be438p-2, +- 0x1.9561c8p-2, +- 0x1.8eed36p-2, +- 0x1.8886b2p-2, +- 0x1.822e66p-2, +- 0x1.7be47ap-2, +- 0x1.75a91ap-2, +- 0x1.6f7c6ap-2, +- 0x1.695e8cp-2, +- 0x1.634fa6p-2, +- 0x1.5d4fd4p-2, +- 0x1.575f34p-2, +- 0x1.517de6p-2, +- 0x1.4bac00p-2, +- 0x1.45e99cp-2, +- 0x1.4036d0p-2, +- 0x1.3a93b2p-2, +- 0x1.350052p-2, +- 0x1.2f7cc4p-2, +- 0x1.2a0916p-2, +- 0x1.24a554p-2, +- 0x1.1f518ap-2, +- 0x1.1a0dc6p-2, +- 0x1.14da0ap-2, +- 0x1.0fb662p-2, +- 0x1.0aa2d0p-2, +- 0x1.059f5ap-2, +- 0x1.00ac00p-2, +- 0x1.f79184p-3, +- 0x1.edeb40p-3, +- 0x1.e46530p-3, +- 0x1.daff4ap-3, +- 0x1.d1b982p-3, +- 0x1.c893cep-3, +- 0x1.bf8e1cp-3, +- 0x1.b6a856p-3, +- 0x1.ade26cp-3, +- 0x1.a53c42p-3, +- 0x1.9cb5bep-3, +- 0x1.944ec2p-3, +- 0x1.8c0732p-3, +- 0x1.83deeap-3, +- 0x1.7bd5c8p-3, +- 0x1.73eba4p-3, +- 0x1.6c2056p-3, +- 0x1.6473b6p-3, +- 0x1.5ce596p-3, +- 0x1.5575c8p-3, +- 0x1.4e241ep-3, +- 0x1.46f066p-3, +- 0x1.3fda6cp-3, +- 0x1.38e1fap-3, +- 0x1.3206dcp-3, +- 0x1.2b48dap-3, +- 0x1.24a7b8p-3, +- 0x1.1e233ep-3, +- 0x1.17bb2cp-3, +- 0x1.116f48p-3, +- 0x1.0b3f52p-3, +- 0x1.052b0cp-3, +- 0x1.fe6460p-4, +- 0x1.f2a902p-4, +- 0x1.e72372p-4, +- 0x1.dbd32ap-4, +- 0x1.d0b7a0p-4, +- 0x1.c5d04ap-4, +- 0x1.bb1c98p-4, +- 0x1.b09bfcp-4, +- 0x1.a64de6p-4, +- 0x1.9c31c6p-4, +- 0x1.92470ap-4, +- 0x1.888d1ep-4, +- 0x1.7f036cp-4, +- 0x1.75a960p-4, +- 0x1.6c7e64p-4, +- 0x1.6381e2p-4, +- 0x1.5ab342p-4, +- 0x1.5211ecp-4, +- 0x1.499d48p-4, +- 0x1.4154bcp-4, +- 0x1.3937b2p-4, +- 0x1.31458ep-4, +- 0x1.297dbap-4, +- 0x1.21df9ap-4, +- 0x1.1a6a96p-4, +- 0x1.131e14p-4, +- 0x1.0bf97ep-4, +- 0x1.04fc3ap-4, +- 0x1.fc4b5ep-5, +- 0x1.eeea8cp-5, +- 0x1.e1d4d0p-5, +- 0x1.d508fap-5, +- 0x1.c885e0p-5, +- 0x1.bc4a54p-5, +- 0x1.b05530p-5, +- 0x1.a4a54ap-5, +- 0x1.99397ap-5, +- 0x1.8e109cp-5, +- 0x1.83298ep-5, +- 0x1.78832cp-5, +- 0x1.6e1c58p-5, +- 0x1.63f3f6p-5, +- 0x1.5a08e8p-5, +- 0x1.505a18p-5, +- 0x1.46e66cp-5, +- 0x1.3dacd2p-5, +- 0x1.34ac36p-5, +- 0x1.2be38cp-5, +- 0x1.2351c2p-5, +- 0x1.1af5d2p-5, +- 0x1.12ceb4p-5, +- 0x1.0adb60p-5, +- 0x1.031ad6p-5, +- 0x1.f7182ap-6, +- 0x1.e85c44p-6, +- 0x1.da0006p-6, +- 0x1.cc0180p-6, +- 0x1.be5ecep-6, +- 0x1.b1160ap-6, +- 0x1.a4255ap-6, +- 0x1.978ae8p-6, +- 0x1.8b44e6p-6, +- 0x1.7f5188p-6, +- 0x1.73af0cp-6, +- 0x1.685bb6p-6, +- 0x1.5d55ccp-6, +- 0x1.529b9ep-6, +- 0x1.482b84p-6, +- 0x1.3e03d8p-6, +- 0x1.3422fep-6, +- 0x1.2a875cp-6, +- 0x1.212f62p-6, +- 0x1.181984p-6, +- 0x1.0f443ep-6, +- 0x1.06ae14p-6, +- 0x1.fcab14p-7, +- 0x1.ec7262p-7, +- 0x1.dcaf36p-7, +- 0x1.cd5ecap-7, +- 0x1.be7e5ap-7, +- 0x1.b00b38p-7, +- 0x1.a202bep-7, +- 0x1.94624ep-7, +- 0x1.87275ep-7, +- 0x1.7a4f6ap-7, +- 0x1.6dd7fep-7, +- 0x1.61beaep-7, +- 0x1.56011cp-7, +- 0x1.4a9cf6p-7, +- 0x1.3f8ff6p-7, +- 0x1.34d7dcp-7, +- 0x1.2a727ap-7, +- 0x1.205dacp-7, +- 0x1.169756p-7, +- 0x1.0d1d6ap-7, +- 0x1.03ede2p-7, +- 0x1.f60d8ap-8, +- 0x1.e4cc4ap-8, +- 0x1.d4143ap-8, +- 0x1.c3e1a6p-8, +- 0x1.b430ecp-8, +- 0x1.a4fe84p-8, +- 0x1.9646f4p-8, +- 0x1.8806d8p-8, +- 0x1.7a3adep-8, +- 0x1.6cdfccp-8, +- 0x1.5ff276p-8, +- 0x1.536fc2p-8, +- 0x1.4754acp-8, +- 0x1.3b9e40p-8, +- 0x1.30499cp-8, +- 0x1.2553eep-8, +- 0x1.1aba78p-8, +- 0x1.107a8cp-8, +- 0x1.06918cp-8, +- 0x1.f9f9d0p-9, +- 0x1.e77448p-9, +- 0x1.d58da6p-9, +- 0x1.c4412cp-9, +- 0x1.b38a3ap-9, +- 0x1.a36454p-9, +- 0x1.93cb12p-9, +- 0x1.84ba30p-9, +- 0x1.762d84p-9, +- 0x1.682100p-9, +- 0x1.5a90b0p-9, +- 0x1.4d78bcp-9, +- 0x1.40d564p-9, +- 0x1.34a306p-9, +- 0x1.28de12p-9, +- 0x1.1d8318p-9, +- 0x1.128ebap-9, +- 0x1.07fdb4p-9, +- 0x1.fb99b8p-10, +- 0x1.e7f232p-10, +- 0x1.d4fed8p-10, +- 0x1.c2b9d0p-10, +- 0x1.b11d70p-10, +- 0x1.a02436p-10, +- 0x1.8fc8c8p-10, +- 0x1.8005f0p-10, +- 0x1.70d6a4p-10, +- 0x1.6235fcp-10, +- 0x1.541f34p-10, +- 0x1.468daep-10, +- 0x1.397ceep-10, +- 0x1.2ce898p-10, +- 0x1.20cc76p-10, +- 0x1.15246ep-10, +- 0x1.09ec86p-10, +- 0x1.fe41cep-11, +- 0x1.e97ba4p-11, +- 0x1.d57f52p-11, +- 0x1.c245d4p-11, +- 0x1.afc85ep-11, +- 0x1.9e0058p-11, +- 0x1.8ce75ep-11, +- 0x1.7c7744p-11, +- 0x1.6caa0ep-11, +- 0x1.5d79ecp-11, +- 0x1.4ee142p-11, +- 0x1.40daa4p-11, +- 0x1.3360ccp-11, +- 0x1.266ea8p-11, +- 0x1.19ff46p-11, +- 0x1.0e0de8p-11, +- 0x1.0295f0p-11, +- 0x1.ef25d4p-12, +- 0x1.da0110p-12, +- 0x1.c5b542p-12, +- 0x1.b23a5ap-12, +- 0x1.9f8894p-12, +- 0x1.8d986ap-12, +- 0x1.7c629ap-12, +- 0x1.6be022p-12, +- 0x1.5c0a38p-12, +- 0x1.4cda54p-12, +- 0x1.3e4a24p-12, +- 0x1.305390p-12, +- 0x1.22f0b4p-12, +- 0x1.161be4p-12, +- 0x1.09cfa4p-12, +- 0x1.fc0d56p-13, +- 0x1.e577bcp-13, +- 0x1.cfd4a6p-13, +- 0x1.bb1a96p-13, +- 0x1.a74068p-13, +- 0x1.943d4ap-13, +- 0x1.8208bcp-13, +- 0x1.709a8ep-13, +- 0x1.5feadap-13, +- 0x1.4ff208p-13, +- 0x1.40a8c2p-13, +- 0x1.3207fcp-13, +- 0x1.2408eap-13, +- 0x1.16a502p-13, +- 0x1.09d5f8p-13, +- 0x1.fb2b7ap-14, +- 0x1.e3bcf4p-14, +- 0x1.cd5528p-14, +- 0x1.b7e946p-14, +- 0x1.a36eecp-14, +- 0x1.8fdc1cp-14, +- 0x1.7d2738p-14, +- 0x1.6b4702p-14, +- 0x1.5a329cp-14, +- 0x1.49e178p-14, +- 0x1.3a4b60p-14, +- 0x1.2b6876p-14, +- 0x1.1d3120p-14, +- 0x1.0f9e1cp-14, +- 0x1.02a868p-14, +- 0x1.ec929ap-15, +- 0x1.d4f4b4p-15, +- 0x1.be6abcp-15, +- 0x1.a8e8ccp-15, +- 0x1.94637ep-15, +- 0x1.80cfdcp-15, +- 0x1.6e2368p-15, +- 0x1.5c540cp-15, +- 0x1.4b581cp-15, +- 0x1.3b2652p-15, +- 0x1.2bb5ccp-15, +- 0x1.1cfe02p-15, +- 0x1.0ef6c4p-15, +- 0x1.019842p-15, +- 0x1.e9b5e8p-16, +- 0x1.d16f58p-16, +- 0x1.ba4f04p-16, +- 0x1.a447b8p-16, +- 0x1.8f4cccp-16, +- 0x1.7b5224p-16, +- 0x1.684c22p-16, +- 0x1.562facp-16, +- 0x1.44f21ep-16, +- 0x1.34894ap-16, +- 0x1.24eb72p-16, +- 0x1.160f44p-16, +- 0x1.07ebd2p-16, +- 0x1.f4f12ep-17, +- 0x1.db5ad0p-17, +- 0x1.c304f0p-17, +- 0x1.abe09ep-17, +- 0x1.95df98p-17, +- 0x1.80f43ap-17, +- 0x1.6d1178p-17, +- 0x1.5a2ae0p-17, +- 0x1.483488p-17, +- 0x1.372310p-17, +- 0x1.26eb9ep-17, +- 0x1.1783cep-17, +- 0x1.08e1bap-17, +- 0x1.f5f7d8p-18, +- 0x1.db92b6p-18, +- 0x1.c282cep-18, +- 0x1.aab7acp-18, +- 0x1.94219cp-18, +- 0x1.7eb1a2p-18, +- 0x1.6a5972p-18, +- 0x1.570b6ap-18, +- 0x1.44ba86p-18, +- 0x1.335a62p-18, +- 0x1.22df2ap-18, +- 0x1.133d96p-18, +- 0x1.046aeap-18, +- 0x1.ecb9d0p-19, +- 0x1.d21398p-19, +- 0x1.b8d094p-19, +- 0x1.a0df10p-19, +- 0x1.8a2e26p-19, +- 0x1.74adc8p-19, +- 0x1.604ea8p-19, +- 0x1.4d0232p-19, +- 0x1.3aba86p-19, +- 0x1.296a70p-19, +- 0x1.190562p-19, +- 0x1.097f62p-19, +- 0x1.f59a20p-20, +- 0x1.d9c736p-20, +- 0x1.bf716cp-20, +- 0x1.a6852cp-20, +- 0x1.8eefd8p-20, +- 0x1.789fb8p-20, +- 0x1.6383f8p-20, +- 0x1.4f8c96p-20, +- 0x1.3caa62p-20, +- 0x1.2acee2p-20, +- 0x1.19ec60p-20, +- 0x1.09f5d0p-20, +- 0x1.f5bd96p-21, +- 0x1.d9371ep-21, +- 0x1.be41dep-21, +- 0x1.a4c89ep-21, +- 0x1.8cb738p-21, +- 0x1.75fa8ep-21, +- 0x1.608078p-21, +- 0x1.4c37c0p-21, +- 0x1.39100ep-21, +- 0x1.26f9e0p-21, +- 0x1.15e682p-21, +- 0x1.05c804p-21, +- 0x1.ed2254p-22, +- 0x1.d06ad6p-22, +- 0x1.b551c8p-22, +- 0x1.9bc0a0p-22, +- 0x1.83a200p-22, +- 0x1.6ce1aap-22, +- 0x1.576c72p-22, +- 0x1.43302cp-22, +- 0x1.301ba2p-22, +- 0x1.1e1e86p-22, +- 0x1.0d2966p-22, +- 0x1.fa5b50p-23, +- 0x1.dc3ae4p-23, +- 0x1.bfd756p-23, +- 0x1.a517dap-23, +- 0x1.8be4f8p-23, +- 0x1.74287ep-23, +- 0x1.5dcd66p-23, +- 0x1.48bfd4p-23, +- 0x1.34ecf8p-23, +- 0x1.224310p-23, +- 0x1.10b148p-23, +- }, +-}; +diff --git a/sysdeps/aarch64/fpu/vecmath_config.h b/sysdeps/aarch64/fpu/vecmath_config.h +index 7f0a8aa5f2..862eefaf8f 100644 +--- a/sysdeps/aarch64/fpu/vecmath_config.h ++++ b/sysdeps/aarch64/fpu/vecmath_config.h +@@ -75,49 +75,37 @@ extern const struct v_log10_data + } table[1 << V_LOG10_TABLE_BITS]; + } __v_log10_data attribute_hidden; + +-extern const struct erff_data ++extern const struct v_erff_data + { + struct + { + float erf, scale; + } tab[513]; +-} __erff_data attribute_hidden; ++} __v_erff_data attribute_hidden; + +-extern const struct sv_erff_data +-{ +- float erf[513]; +- float scale[513]; +-} __sv_erff_data attribute_hidden; +- +-extern const struct erf_data ++extern const struct v_erf_data + { + struct + { + double erf, scale; + } tab[769]; +-} __erf_data attribute_hidden; +- +-extern const struct sv_erf_data +-{ +- double erf[769]; +- double scale[769]; +-} __sv_erf_data attribute_hidden; ++} __v_erf_data attribute_hidden; + +-extern const struct erfc_data ++extern const struct v_erfc_data + { + struct + { + double erfc, scale; + } tab[3488]; +-} __erfc_data attribute_hidden; ++} __v_erfc_data attribute_hidden; + +-extern const struct erfcf_data ++extern const struct v_erfcf_data + { + struct + { + float erfc, scale; + } tab[645]; +-} __erfcf_data attribute_hidden; ++} __v_erfcf_data attribute_hidden; + + /* Some data for AdvSIMD and SVE pow's internal exp and log. */ + #define V_POW_EXP_TABLE_BITS 8 + +commit 4148940836eee07d1138da6f1805280eeb8217e3 +Author: Pierre Blanchard +Date: Mon Dec 9 15:53:04 2024 +0000 + + AArch64: Improve codegen in AdvSIMD pow + + Remove spurious ADRP. Improve memory access by shuffling constants and + using more indexed MLAs. + + A few more optimisation with no impact on accuracy + - force fmas contraction + - switch from shift-aided rint to rint instruction + + Between 1 and 5% throughput improvement on Neoverse + V1 depending on benchmark. + + (cherry picked from commit 569cfaaf4984ae70b23c61ee28a609b5aef93fea) + +diff --git a/sysdeps/aarch64/fpu/pow_advsimd.c b/sysdeps/aarch64/fpu/pow_advsimd.c +index 3c91e3e183..81e134ac2f 100644 +--- a/sysdeps/aarch64/fpu/pow_advsimd.c ++++ b/sysdeps/aarch64/fpu/pow_advsimd.c +@@ -22,9 +22,6 @@ + /* Defines parameters of the approximation and scalar fallback. */ + #include "finite_pow.h" + +-#define VecSmallExp v_u64 (SmallExp) +-#define VecThresExp v_u64 (ThresExp) +- + #define VecSmallPowX v_u64 (SmallPowX) + #define VecThresPowX v_u64 (ThresPowX) + #define VecSmallPowY v_u64 (SmallPowY) +@@ -32,36 +29,48 @@ + + static const struct data + { +- float64x2_t log_poly[6]; +- float64x2_t exp_poly[3]; +- float64x2_t ln2_hi, ln2_lo; +- float64x2_t shift, inv_ln2_n, ln2_hi_n, ln2_lo_n, small_powx; + uint64x2_t inf; ++ float64x2_t small_powx; ++ uint64x2_t offset, mask; ++ uint64x2_t mask_sub_0, mask_sub_1; ++ float64x2_t log_c0, log_c2, log_c4, log_c5; ++ double log_c1, log_c3; ++ double ln2_lo, ln2_hi; ++ uint64x2_t small_exp, thres_exp; ++ double ln2_lo_n, ln2_hi_n; ++ double inv_ln2_n, exp_c2; ++ float64x2_t exp_c0, exp_c1; + } data = { ++ /* Power threshold. */ ++ .inf = V2 (0x7ff0000000000000), ++ .small_powx = V2 (0x1p-126), ++ .offset = V2 (Off), ++ .mask = V2 (0xfffULL << 52), ++ .mask_sub_0 = V2 (1ULL << 52), ++ .mask_sub_1 = V2 (52ULL << 52), + /* Coefficients copied from v_pow_log_data.c + relative error: 0x1.11922ap-70 in [-0x1.6bp-8, 0x1.6bp-8] + Coefficients are scaled to match the scaling during evaluation. */ +- .log_poly +- = { V2 (0x1.555555555556p-2 * -2), V2 (-0x1.0000000000006p-2 * -2), +- V2 (0x1.999999959554ep-3 * 4), V2 (-0x1.555555529a47ap-3 * 4), +- V2 (0x1.2495b9b4845e9p-3 * -8), V2 (-0x1.0002b8b263fc3p-3 * -8) }, +- .ln2_hi = V2 (0x1.62e42fefa3800p-1), +- .ln2_lo = V2 (0x1.ef35793c76730p-45), ++ .log_c0 = V2 (0x1.555555555556p-2 * -2), ++ .log_c1 = -0x1.0000000000006p-2 * -2, ++ .log_c2 = V2 (0x1.999999959554ep-3 * 4), ++ .log_c3 = -0x1.555555529a47ap-3 * 4, ++ .log_c4 = V2 (0x1.2495b9b4845e9p-3 * -8), ++ .log_c5 = V2 (-0x1.0002b8b263fc3p-3 * -8), ++ .ln2_hi = 0x1.62e42fefa3800p-1, ++ .ln2_lo = 0x1.ef35793c76730p-45, + /* Polynomial coefficients: abs error: 1.43*2^-58, ulp error: 0.549 + (0.550 without fma) if |x| < ln2/512. */ +- .exp_poly = { V2 (0x1.fffffffffffd4p-2), V2 (0x1.5555571d6ef9p-3), +- V2 (0x1.5555576a5adcep-5) }, +- .shift = V2 (0x1.8p52), /* round to nearest int. without intrinsics. */ +- .inv_ln2_n = V2 (0x1.71547652b82fep8), /* N/ln2. */ +- .ln2_hi_n = V2 (0x1.62e42fefc0000p-9), /* ln2/N. */ +- .ln2_lo_n = V2 (-0x1.c610ca86c3899p-45), +- .small_powx = V2 (0x1p-126), +- .inf = V2 (0x7ff0000000000000) ++ .exp_c0 = V2 (0x1.fffffffffffd4p-2), ++ .exp_c1 = V2 (0x1.5555571d6ef9p-3), ++ .exp_c2 = 0x1.5555576a5adcep-5, ++ .small_exp = V2 (0x3c90000000000000), ++ .thres_exp = V2 (0x03f0000000000000), ++ .inv_ln2_n = 0x1.71547652b82fep8, /* N/ln2. */ ++ .ln2_hi_n = 0x1.62e42fefc0000p-9, /* ln2/N. */ ++ .ln2_lo_n = -0x1.c610ca86c3899p-45, + }; + +-#define A(i) data.log_poly[i] +-#define C(i) data.exp_poly[i] +- + /* This version implements an algorithm close to scalar pow but + - does not implement the trick in the exp's specialcase subroutine to avoid + double-rounding, +@@ -91,10 +100,9 @@ v_log_inline (uint64x2_t ix, float64x2_t *tail, const struct data *d) + /* x = 2^k z; where z is in range [OFF,2*OFF) and exact. + The range is split into N subintervals. + The ith subinterval contains z and c is near its center. */ +- uint64x2_t tmp = vsubq_u64 (ix, v_u64 (Off)); +- int64x2_t k +- = vshrq_n_s64 (vreinterpretq_s64_u64 (tmp), 52); /* arithmetic shift. */ +- uint64x2_t iz = vsubq_u64 (ix, vandq_u64 (tmp, v_u64 (0xfffULL << 52))); ++ uint64x2_t tmp = vsubq_u64 (ix, d->offset); ++ int64x2_t k = vshrq_n_s64 (vreinterpretq_s64_u64 (tmp), 52); ++ uint64x2_t iz = vsubq_u64 (ix, vandq_u64 (tmp, d->mask)); + float64x2_t z = vreinterpretq_f64_u64 (iz); + float64x2_t kd = vcvtq_f64_s64 (k); + /* log(x) = k*Ln2 + log(c) + log1p(z/c-1). */ +@@ -105,9 +113,10 @@ v_log_inline (uint64x2_t ix, float64x2_t *tail, const struct data *d) + |z/c - 1| < 1/N, so r = z/c - 1 is exactly representible. */ + float64x2_t r = vfmaq_f64 (v_f64 (-1.0), z, invc); + /* k*Ln2 + log(c) + r. */ +- float64x2_t t1 = vfmaq_f64 (logc, kd, d->ln2_hi); ++ float64x2_t ln2 = vld1q_f64 (&d->ln2_lo); ++ float64x2_t t1 = vfmaq_laneq_f64 (logc, kd, ln2, 1); + float64x2_t t2 = vaddq_f64 (t1, r); +- float64x2_t lo1 = vfmaq_f64 (logctail, kd, d->ln2_lo); ++ float64x2_t lo1 = vfmaq_laneq_f64 (logctail, kd, ln2, 0); + float64x2_t lo2 = vaddq_f64 (vsubq_f64 (t1, t2), r); + /* Evaluation is optimized assuming superscalar pipelined execution. */ + float64x2_t ar = vmulq_f64 (v_f64 (-0.5), r); +@@ -118,9 +127,10 @@ v_log_inline (uint64x2_t ix, float64x2_t *tail, const struct data *d) + float64x2_t lo3 = vfmaq_f64 (vnegq_f64 (ar2), ar, r); + float64x2_t lo4 = vaddq_f64 (vsubq_f64 (t2, hi), ar2); + /* p = log1p(r) - r - A[0]*r*r. */ +- float64x2_t a56 = vfmaq_f64 (A (4), r, A (5)); +- float64x2_t a34 = vfmaq_f64 (A (2), r, A (3)); +- float64x2_t a12 = vfmaq_f64 (A (0), r, A (1)); ++ float64x2_t odd_coeffs = vld1q_f64 (&d->log_c1); ++ float64x2_t a56 = vfmaq_f64 (d->log_c4, r, d->log_c5); ++ float64x2_t a34 = vfmaq_laneq_f64 (d->log_c2, r, odd_coeffs, 1); ++ float64x2_t a12 = vfmaq_laneq_f64 (d->log_c0, r, odd_coeffs, 0); + float64x2_t p = vfmaq_f64 (a34, ar2, a56); + p = vfmaq_f64 (a12, ar2, p); + p = vmulq_f64 (ar3, p); +@@ -140,28 +150,28 @@ exp_special_case (float64x2_t x, float64x2_t xtail) + + /* Computes sign*exp(x+xtail) where |xtail| < 2^-8/N and |xtail| <= |x|. */ + static inline float64x2_t +-v_exp_inline (float64x2_t x, float64x2_t xtail, const struct data *d) ++v_exp_inline (float64x2_t x, float64x2_t neg_xtail, const struct data *d) + { + /* Fallback to scalar exp_inline for all lanes if any lane + contains value of x s.t. |x| <= 2^-54 or >= 512. */ +- uint64x2_t abstop +- = vshrq_n_u64 (vandq_u64 (vreinterpretq_u64_f64 (x), d->inf), 52); +- uint64x2_t uoflowx +- = vcgeq_u64 (vsubq_u64 (abstop, VecSmallExp), VecThresExp); ++ uint64x2_t uoflowx = vcgeq_u64 ( ++ vsubq_u64 (vreinterpretq_u64_f64 (vabsq_f64 (x)), d->small_exp), ++ d->thres_exp); + if (__glibc_unlikely (v_any_u64 (uoflowx))) +- return exp_special_case (x, xtail); ++ return exp_special_case (x, vnegq_f64 (neg_xtail)); + + /* exp(x) = 2^(k/N) * exp(r), with exp(r) in [2^(-1/2N),2^(1/2N)]. */ + /* x = ln2/N*k + r, with k integer and r in [-ln2/2N, ln2/2N]. */ +- float64x2_t z = vmulq_f64 (d->inv_ln2_n, x); + /* z - kd is in [-1, 1] in non-nearest rounding modes. */ +- float64x2_t kd = vaddq_f64 (z, d->shift); +- uint64x2_t ki = vreinterpretq_u64_f64 (kd); +- kd = vsubq_f64 (kd, d->shift); +- float64x2_t r = vfmsq_f64 (x, kd, d->ln2_hi_n); +- r = vfmsq_f64 (r, kd, d->ln2_lo_n); ++ float64x2_t exp_consts = vld1q_f64 (&d->inv_ln2_n); ++ float64x2_t z = vmulq_laneq_f64 (x, exp_consts, 0); ++ float64x2_t kd = vrndnq_f64 (z); ++ uint64x2_t ki = vreinterpretq_u64_s64 (vcvtaq_s64_f64 (z)); ++ float64x2_t ln2_n = vld1q_f64 (&d->ln2_lo_n); ++ float64x2_t r = vfmsq_laneq_f64 (x, kd, ln2_n, 1); ++ r = vfmsq_laneq_f64 (r, kd, ln2_n, 0); + /* The code assumes 2^-200 < |xtail| < 2^-8/N. */ +- r = vaddq_f64 (r, xtail); ++ r = vsubq_f64 (r, neg_xtail); + /* 2^(k/N) ~= scale. */ + uint64x2_t idx = vandq_u64 (ki, v_u64 (N_EXP - 1)); + uint64x2_t top = vshlq_n_u64 (ki, 52 - V_POW_EXP_TABLE_BITS); +@@ -170,8 +180,8 @@ v_exp_inline (float64x2_t x, float64x2_t xtail, const struct data *d) + sbits = vaddq_u64 (sbits, top); + /* exp(x) = 2^(k/N) * exp(r) ~= scale + scale * (exp(r) - 1). */ + float64x2_t r2 = vmulq_f64 (r, r); +- float64x2_t tmp = vfmaq_f64 (C (1), r, C (2)); +- tmp = vfmaq_f64 (C (0), r, tmp); ++ float64x2_t tmp = vfmaq_laneq_f64 (d->exp_c1, r, exp_consts, 1); ++ tmp = vfmaq_f64 (d->exp_c0, r, tmp); + tmp = vfmaq_f64 (r, r2, tmp); + float64x2_t scale = vreinterpretq_f64_u64 (sbits); + /* Note: tmp == 0 or |tmp| > 2^-200 and scale > 2^-739, so there +@@ -230,8 +240,8 @@ float64x2_t VPCS_ATTR V_NAME_D2 (pow) (float64x2_t x, float64x2_t y) + { + /* Normalize subnormal x so exponent becomes negative. */ + uint64x2_t vix_norm = vreinterpretq_u64_f64 ( +- vabsq_f64 (vmulq_f64 (x, vcvtq_f64_u64 (v_u64 (1ULL << 52))))); +- vix_norm = vsubq_u64 (vix_norm, v_u64 (52ULL << 52)); ++ vabsq_f64 (vmulq_f64 (x, vcvtq_f64_u64 (d->mask_sub_0)))); ++ vix_norm = vsubq_u64 (vix_norm, d->mask_sub_1); + vix = vbslq_u64 (sub_x, vix_norm, vix); + } + } +@@ -242,8 +252,7 @@ float64x2_t VPCS_ATTR V_NAME_D2 (pow) (float64x2_t x, float64x2_t y) + + /* Vector Exp(y_loghi, y_loglo). */ + float64x2_t vehi = vmulq_f64 (y, vhi); +- float64x2_t velo = vmulq_f64 (y, vlo); + float64x2_t vemi = vfmsq_f64 (vehi, y, vhi); +- velo = vsubq_f64 (velo, vemi); +- return v_exp_inline (vehi, velo, d); ++ float64x2_t neg_velo = vfmsq_f64 (vemi, y, vlo); ++ return v_exp_inline (vehi, neg_velo, d); + } + +commit ae04f63087415eba9060143608b03db693854bb7 +Author: Pierre Blanchard +Date: Mon Dec 9 15:54:34 2024 +0000 + + AArch64: Improve codegen in AdvSIMD logs + + Remove spurious ADRP and a few MOVs. + Reduce memory access by using more indexed MLAs in polynomial. + Align notation so that algorithms are easier to compare. + Speedup on Neoverse V1 for log10 (8%), log (8.5%), and log2 (10%). + Update error threshold in AdvSIMD log (now matches SVE log). + + (cherry picked from commit 8eb5ad2ebc94cc5bedbac57c226c02ec254479c7) + +diff --git a/sysdeps/aarch64/fpu/log10_advsimd.c b/sysdeps/aarch64/fpu/log10_advsimd.c +index c065aaebae..f69ed21c39 100644 +--- a/sysdeps/aarch64/fpu/log10_advsimd.c ++++ b/sysdeps/aarch64/fpu/log10_advsimd.c +@@ -18,36 +18,36 @@ + . */ + + #include "v_math.h" +-#include "poly_advsimd_f64.h" +- +-#define N (1 << V_LOG10_TABLE_BITS) + + static const struct data + { +- uint64x2_t min_norm; ++ uint64x2_t off, sign_exp_mask, offset_lower_bound; + uint32x4_t special_bound; +- float64x2_t poly[5]; +- float64x2_t invln10, log10_2, ln2; +- uint64x2_t sign_exp_mask; ++ double invln10, log10_2; ++ double c1, c3; ++ float64x2_t c0, c2, c4; + } data = { + /* Computed from log coefficients divided by log(10) then rounded to double + precision. */ +- .poly = { V2 (-0x1.bcb7b1526e506p-3), V2 (0x1.287a7636be1d1p-3), +- V2 (-0x1.bcb7b158af938p-4), V2 (0x1.63c78734e6d07p-4), +- V2 (-0x1.287461742fee4p-4) }, +- .ln2 = V2 (0x1.62e42fefa39efp-1), +- .invln10 = V2 (0x1.bcb7b1526e50ep-2), +- .log10_2 = V2 (0x1.34413509f79ffp-2), +- .min_norm = V2 (0x0010000000000000), /* asuint64(0x1p-1022). */ +- .special_bound = V4 (0x7fe00000), /* asuint64(inf) - min_norm. */ ++ .c0 = V2 (-0x1.bcb7b1526e506p-3), ++ .c1 = 0x1.287a7636be1d1p-3, ++ .c2 = V2 (-0x1.bcb7b158af938p-4), ++ .c3 = 0x1.63c78734e6d07p-4, ++ .c4 = V2 (-0x1.287461742fee4p-4), ++ .invln10 = 0x1.bcb7b1526e50ep-2, ++ .log10_2 = 0x1.34413509f79ffp-2, ++ .off = V2 (0x3fe6900900000000), + .sign_exp_mask = V2 (0xfff0000000000000), ++ /* Lower bound is 0x0010000000000000. For ++ optimised register use subnormals are detected after offset has been ++ subtracted, so lower bound - offset (which wraps around). */ ++ .offset_lower_bound = V2 (0x0010000000000000 - 0x3fe6900900000000), ++ .special_bound = V4 (0x7fe00000), /* asuint64(inf) - 0x0010000000000000. */ + }; + +-#define Off v_u64 (0x3fe6900900000000) ++#define N (1 << V_LOG10_TABLE_BITS) + #define IndexMask (N - 1) + +-#define T(s, i) __v_log10_data.s[i] +- + struct entry + { + float64x2_t invc; +@@ -70,10 +70,11 @@ lookup (uint64x2_t i) + } + + static float64x2_t VPCS_ATTR NOINLINE +-special_case (float64x2_t x, float64x2_t y, float64x2_t hi, float64x2_t r2, +- uint32x2_t special) ++special_case (float64x2_t hi, uint64x2_t u_off, float64x2_t y, float64x2_t r2, ++ uint32x2_t special, const struct data *d) + { +- return v_call_f64 (log10, x, vfmaq_f64 (hi, r2, y), vmovl_u32 (special)); ++ float64x2_t x = vreinterpretq_f64_u64 (vaddq_u64 (u_off, d->off)); ++ return v_call_f64 (log10, x, vfmaq_f64 (hi, y, r2), vmovl_u32 (special)); + } + + /* Fast implementation of double-precision vector log10 +@@ -85,19 +86,24 @@ special_case (float64x2_t x, float64x2_t y, float64x2_t hi, float64x2_t r2, + float64x2_t VPCS_ATTR V_NAME_D1 (log10) (float64x2_t x) + { + const struct data *d = ptr_barrier (&data); +- uint64x2_t ix = vreinterpretq_u64_f64 (x); +- uint32x2_t special = vcge_u32 (vsubhn_u64 (ix, d->min_norm), +- vget_low_u32 (d->special_bound)); ++ ++ /* To avoid having to mov x out of the way, keep u after offset has been ++ applied, and recover x by adding the offset back in the special-case ++ handler. */ ++ uint64x2_t u = vreinterpretq_u64_f64 (x); ++ uint64x2_t u_off = vsubq_u64 (u, d->off); + + /* x = 2^k z; where z is in range [OFF,2*OFF) and exact. + The range is split into N subintervals. + The ith subinterval contains z and c is near its center. */ +- uint64x2_t tmp = vsubq_u64 (ix, Off); +- int64x2_t k = vshrq_n_s64 (vreinterpretq_s64_u64 (tmp), 52); +- uint64x2_t iz = vsubq_u64 (ix, vandq_u64 (tmp, d->sign_exp_mask)); ++ int64x2_t k = vshrq_n_s64 (vreinterpretq_s64_u64 (u_off), 52); ++ uint64x2_t iz = vsubq_u64 (u, vandq_u64 (u_off, d->sign_exp_mask)); + float64x2_t z = vreinterpretq_f64_u64 (iz); + +- struct entry e = lookup (tmp); ++ struct entry e = lookup (u_off); ++ ++ uint32x2_t special = vcge_u32 (vsubhn_u64 (u_off, d->offset_lower_bound), ++ vget_low_u32 (d->special_bound)); + + /* log10(x) = log1p(z/c-1)/log(10) + log10(c) + k*log10(2). */ + float64x2_t r = vfmaq_f64 (v_f64 (-1.0), z, e.invc); +@@ -105,17 +111,22 @@ float64x2_t VPCS_ATTR V_NAME_D1 (log10) (float64x2_t x) + + /* hi = r / log(10) + log10(c) + k*log10(2). + Constants in v_log10_data.c are computed (in extended precision) as +- e.log10c := e.logc * ivln10. */ +- float64x2_t w = vfmaq_f64 (e.log10c, r, d->invln10); ++ e.log10c := e.logc * invln10. */ ++ float64x2_t cte = vld1q_f64 (&d->invln10); ++ float64x2_t hi = vfmaq_laneq_f64 (e.log10c, r, cte, 0); + + /* y = log10(1+r) + n * log10(2). */ +- float64x2_t hi = vfmaq_f64 (w, kd, d->log10_2); ++ hi = vfmaq_laneq_f64 (hi, kd, cte, 1); + + /* y = r2*(A0 + r*A1 + r2*(A2 + r*A3 + r2*A4)) + hi. */ + float64x2_t r2 = vmulq_f64 (r, r); +- float64x2_t y = v_pw_horner_4_f64 (r, r2, d->poly); ++ float64x2_t odd_coeffs = vld1q_f64 (&d->c1); ++ float64x2_t y = vfmaq_laneq_f64 (d->c2, r, odd_coeffs, 1); ++ float64x2_t p = vfmaq_laneq_f64 (d->c0, r, odd_coeffs, 0); ++ y = vfmaq_f64 (y, d->c4, r2); ++ y = vfmaq_f64 (p, y, r2); + + if (__glibc_unlikely (v_any_u32h (special))) +- return special_case (x, y, hi, r2, special); +- return vfmaq_f64 (hi, r2, y); ++ return special_case (hi, u_off, y, r2, special, d); ++ return vfmaq_f64 (hi, y, r2); + } +diff --git a/sysdeps/aarch64/fpu/log2_advsimd.c b/sysdeps/aarch64/fpu/log2_advsimd.c +index 4057c552d8..1eea1f86eb 100644 +--- a/sysdeps/aarch64/fpu/log2_advsimd.c ++++ b/sysdeps/aarch64/fpu/log2_advsimd.c +@@ -18,31 +18,33 @@ + . */ + + #include "v_math.h" +-#include "poly_advsimd_f64.h" +- +-#define N (1 << V_LOG2_TABLE_BITS) + + static const struct data + { +- uint64x2_t min_norm; ++ uint64x2_t off, sign_exp_mask, offset_lower_bound; + uint32x4_t special_bound; +- float64x2_t poly[5]; +- float64x2_t invln2; +- uint64x2_t sign_exp_mask; ++ float64x2_t c0, c2; ++ double c1, c3, invln2, c4; + } data = { + /* Each coefficient was generated to approximate log(r) for |r| < 0x1.fp-9 + and N = 128, then scaled by log2(e) in extended precision and rounded back + to double precision. */ +- .poly = { V2 (-0x1.71547652b83p-1), V2 (0x1.ec709dc340953p-2), +- V2 (-0x1.71547651c8f35p-2), V2 (0x1.2777ebe12dda5p-2), +- V2 (-0x1.ec738d616fe26p-3) }, +- .invln2 = V2 (0x1.71547652b82fep0), +- .min_norm = V2 (0x0010000000000000), /* asuint64(0x1p-1022). */ +- .special_bound = V4 (0x7fe00000), /* asuint64(inf) - min_norm. */ ++ .c0 = V2 (-0x1.71547652b8300p-1), ++ .c1 = 0x1.ec709dc340953p-2, ++ .c2 = V2 (-0x1.71547651c8f35p-2), ++ .c3 = 0x1.2777ebe12dda5p-2, ++ .c4 = -0x1.ec738d616fe26p-3, ++ .invln2 = 0x1.71547652b82fep0, ++ .off = V2 (0x3fe6900900000000), + .sign_exp_mask = V2 (0xfff0000000000000), ++ /* Lower bound is 0x0010000000000000. For ++ optimised register use subnormals are detected after offset has been ++ subtracted, so lower bound - offset (which wraps around). */ ++ .offset_lower_bound = V2 (0x0010000000000000 - 0x3fe6900900000000), ++ .special_bound = V4 (0x7fe00000), /* asuint64(inf) - asuint64(0x1p-1022). */ + }; + +-#define Off v_u64 (0x3fe6900900000000) ++#define N (1 << V_LOG2_TABLE_BITS) + #define IndexMask (N - 1) + + struct entry +@@ -67,10 +69,11 @@ lookup (uint64x2_t i) + } + + static float64x2_t VPCS_ATTR NOINLINE +-special_case (float64x2_t x, float64x2_t y, float64x2_t w, float64x2_t r2, +- uint32x2_t special) ++special_case (float64x2_t hi, uint64x2_t u_off, float64x2_t y, float64x2_t r2, ++ uint32x2_t special, const struct data *d) + { +- return v_call_f64 (log2, x, vfmaq_f64 (w, r2, y), vmovl_u32 (special)); ++ float64x2_t x = vreinterpretq_f64_u64 (vaddq_u64 (u_off, d->off)); ++ return v_call_f64 (log2, x, vfmaq_f64 (hi, y, r2), vmovl_u32 (special)); + } + + /* Double-precision vector log2 routine. Implements the same algorithm as +@@ -81,31 +84,41 @@ special_case (float64x2_t x, float64x2_t y, float64x2_t w, float64x2_t r2, + float64x2_t VPCS_ATTR V_NAME_D1 (log2) (float64x2_t x) + { + const struct data *d = ptr_barrier (&data); +- uint64x2_t ix = vreinterpretq_u64_f64 (x); +- uint32x2_t special = vcge_u32 (vsubhn_u64 (ix, d->min_norm), +- vget_low_u32 (d->special_bound)); ++ ++ /* To avoid having to mov x out of the way, keep u after offset has been ++ applied, and recover x by adding the offset back in the special-case ++ handler. */ ++ uint64x2_t u = vreinterpretq_u64_f64 (x); ++ uint64x2_t u_off = vsubq_u64 (u, d->off); + + /* x = 2^k z; where z is in range [Off,2*Off) and exact. + The range is split into N subintervals. + The ith subinterval contains z and c is near its center. */ +- uint64x2_t tmp = vsubq_u64 (ix, Off); +- int64x2_t k = vshrq_n_s64 (vreinterpretq_s64_u64 (tmp), 52); +- uint64x2_t iz = vsubq_u64 (ix, vandq_u64 (tmp, d->sign_exp_mask)); ++ int64x2_t k = vshrq_n_s64 (vreinterpretq_s64_u64 (u_off), 52); ++ uint64x2_t iz = vsubq_u64 (u, vandq_u64 (u_off, d->sign_exp_mask)); + float64x2_t z = vreinterpretq_f64_u64 (iz); + +- struct entry e = lookup (tmp); ++ struct entry e = lookup (u_off); + +- /* log2(x) = log1p(z/c-1)/log(2) + log2(c) + k. */ ++ uint32x2_t special = vcge_u32 (vsubhn_u64 (u_off, d->offset_lower_bound), ++ vget_low_u32 (d->special_bound)); + ++ /* log2(x) = log1p(z/c-1)/log(2) + log2(c) + k. */ + float64x2_t r = vfmaq_f64 (v_f64 (-1.0), z, e.invc); + float64x2_t kd = vcvtq_f64_s64 (k); +- float64x2_t w = vfmaq_f64 (e.log2c, r, d->invln2); ++ ++ float64x2_t invln2_and_c4 = vld1q_f64 (&d->invln2); ++ float64x2_t hi ++ = vfmaq_laneq_f64 (vaddq_f64 (e.log2c, kd), r, invln2_and_c4, 0); + + float64x2_t r2 = vmulq_f64 (r, r); +- float64x2_t y = v_pw_horner_4_f64 (r, r2, d->poly); +- w = vaddq_f64 (kd, w); ++ float64x2_t odd_coeffs = vld1q_f64 (&d->c1); ++ float64x2_t y = vfmaq_laneq_f64 (d->c2, r, odd_coeffs, 1); ++ float64x2_t p = vfmaq_laneq_f64 (d->c0, r, odd_coeffs, 0); ++ y = vfmaq_laneq_f64 (y, r2, invln2_and_c4, 1); ++ y = vfmaq_f64 (p, r2, y); + + if (__glibc_unlikely (v_any_u32h (special))) +- return special_case (x, y, w, r2, special); +- return vfmaq_f64 (w, r2, y); ++ return special_case (hi, u_off, y, r2, special, d); ++ return vfmaq_f64 (hi, y, r2); + } +diff --git a/sysdeps/aarch64/fpu/log_advsimd.c b/sysdeps/aarch64/fpu/log_advsimd.c +index 015a6da7d7..b1a27fbc29 100644 +--- a/sysdeps/aarch64/fpu/log_advsimd.c ++++ b/sysdeps/aarch64/fpu/log_advsimd.c +@@ -21,27 +21,29 @@ + + static const struct data + { +- uint64x2_t min_norm; ++ uint64x2_t off, sign_exp_mask, offset_lower_bound; + uint32x4_t special_bound; +- float64x2_t poly[5]; +- float64x2_t ln2; +- uint64x2_t sign_exp_mask; ++ float64x2_t c0, c2; ++ double c1, c3, ln2, c4; + } data = { +- /* Worst-case error: 1.17 + 0.5 ulp. +- Rel error: 0x1.6272e588p-56 in [ -0x1.fc1p-9 0x1.009p-8 ]. */ +- .poly = { V2 (-0x1.ffffffffffff7p-2), V2 (0x1.55555555170d4p-2), +- V2 (-0x1.0000000399c27p-2), V2 (0x1.999b2e90e94cap-3), +- V2 (-0x1.554e550bd501ep-3) }, +- .ln2 = V2 (0x1.62e42fefa39efp-1), +- .min_norm = V2 (0x0010000000000000), +- .special_bound = V4 (0x7fe00000), /* asuint64(inf) - min_norm. */ +- .sign_exp_mask = V2 (0xfff0000000000000) ++ /* Rel error: 0x1.6272e588p-56 in [ -0x1.fc1p-9 0x1.009p-8 ]. */ ++ .c0 = V2 (-0x1.ffffffffffff7p-2), ++ .c1 = 0x1.55555555170d4p-2, ++ .c2 = V2 (-0x1.0000000399c27p-2), ++ .c3 = 0x1.999b2e90e94cap-3, ++ .c4 = -0x1.554e550bd501ep-3, ++ .ln2 = 0x1.62e42fefa39efp-1, ++ .sign_exp_mask = V2 (0xfff0000000000000), ++ .off = V2 (0x3fe6900900000000), ++ /* Lower bound is 0x0010000000000000. For ++ optimised register use subnormals are detected after offset has been ++ subtracted, so lower bound - offset (which wraps around). */ ++ .offset_lower_bound = V2 (0x0010000000000000 - 0x3fe6900900000000), ++ .special_bound = V4 (0x7fe00000), /* asuint64(inf) - asuint64(0x1p-126). */ + }; + +-#define A(i) d->poly[i] + #define N (1 << V_LOG_TABLE_BITS) + #define IndexMask (N - 1) +-#define Off v_u64 (0x3fe6900900000000) + + struct entry + { +@@ -64,48 +66,56 @@ lookup (uint64x2_t i) + } + + static float64x2_t VPCS_ATTR NOINLINE +-special_case (float64x2_t x, float64x2_t y, float64x2_t hi, float64x2_t r2, +- uint32x2_t cmp) ++special_case (float64x2_t hi, uint64x2_t u_off, float64x2_t y, float64x2_t r2, ++ uint32x2_t special, const struct data *d) + { +- return v_call_f64 (log, x, vfmaq_f64 (hi, y, r2), vmovl_u32 (cmp)); ++ float64x2_t x = vreinterpretq_f64_u64 (vaddq_u64 (u_off, d->off)); ++ return v_call_f64 (log, x, vfmaq_f64 (hi, y, r2), vmovl_u32 (special)); + } + ++/* Double-precision vector log routine. ++ The maximum observed error is 2.17 ULP: ++ _ZGVnN2v_log(0x1.a6129884398a3p+0) got 0x1.ffffff1cca043p-2 ++ want 0x1.ffffff1cca045p-2. */ + float64x2_t VPCS_ATTR V_NAME_D1 (log) (float64x2_t x) + { + const struct data *d = ptr_barrier (&data); +- float64x2_t z, r, r2, p, y, kd, hi; +- uint64x2_t ix, iz, tmp; +- uint32x2_t cmp; +- int64x2_t k; +- struct entry e; + +- ix = vreinterpretq_u64_f64 (x); +- cmp = vcge_u32 (vsubhn_u64 (ix, d->min_norm), +- vget_low_u32 (d->special_bound)); ++ /* To avoid having to mov x out of the way, keep u after offset has been ++ applied, and recover x by adding the offset back in the special-case ++ handler. */ ++ uint64x2_t u = vreinterpretq_u64_f64 (x); ++ uint64x2_t u_off = vsubq_u64 (u, d->off); + + /* x = 2^k z; where z is in range [Off,2*Off) and exact. + The range is split into N subintervals. + The ith subinterval contains z and c is near its center. */ +- tmp = vsubq_u64 (ix, Off); +- k = vshrq_n_s64 (vreinterpretq_s64_u64 (tmp), 52); /* arithmetic shift. */ +- iz = vsubq_u64 (ix, vandq_u64 (tmp, d->sign_exp_mask)); +- z = vreinterpretq_f64_u64 (iz); +- e = lookup (tmp); ++ int64x2_t k = vshrq_n_s64 (vreinterpretq_s64_u64 (u_off), 52); ++ uint64x2_t iz = vsubq_u64 (u, vandq_u64 (u_off, d->sign_exp_mask)); ++ float64x2_t z = vreinterpretq_f64_u64 (iz); ++ ++ struct entry e = lookup (u_off); ++ ++ uint32x2_t special = vcge_u32 (vsubhn_u64 (u_off, d->offset_lower_bound), ++ vget_low_u32 (d->special_bound)); + + /* log(x) = log1p(z/c-1) + log(c) + k*Ln2. */ +- r = vfmaq_f64 (v_f64 (-1.0), z, e.invc); +- kd = vcvtq_f64_s64 (k); ++ float64x2_t r = vfmaq_f64 (v_f64 (-1.0), z, e.invc); ++ float64x2_t kd = vcvtq_f64_s64 (k); + + /* hi = r + log(c) + k*Ln2. */ +- hi = vfmaq_f64 (vaddq_f64 (e.logc, r), kd, d->ln2); ++ float64x2_t ln2_and_c4 = vld1q_f64 (&d->ln2); ++ float64x2_t hi = vfmaq_laneq_f64 (vaddq_f64 (e.logc, r), kd, ln2_and_c4, 0); ++ + /* y = r2*(A0 + r*A1 + r2*(A2 + r*A3 + r2*A4)) + hi. */ +- r2 = vmulq_f64 (r, r); +- y = vfmaq_f64 (A (2), A (3), r); +- p = vfmaq_f64 (A (0), A (1), r); +- y = vfmaq_f64 (y, A (4), r2); +- y = vfmaq_f64 (p, y, r2); +- +- if (__glibc_unlikely (v_any_u32h (cmp))) +- return special_case (x, y, hi, r2, cmp); ++ float64x2_t odd_coeffs = vld1q_f64 (&d->c1); ++ float64x2_t r2 = vmulq_f64 (r, r); ++ float64x2_t y = vfmaq_laneq_f64 (d->c2, r, odd_coeffs, 1); ++ float64x2_t p = vfmaq_laneq_f64 (d->c0, r, odd_coeffs, 0); ++ y = vfmaq_laneq_f64 (y, r2, ln2_and_c4, 1); ++ y = vfmaq_f64 (p, r2, y); ++ ++ if (__glibc_unlikely (v_any_u32h (special))) ++ return special_case (hi, u_off, y, r2, special, d); + return vfmaq_f64 (hi, y, r2); + } + +commit 2aed9796bfb17b257e63b12cefdb7ff60be09626 +Author: Pierre Blanchard +Date: Mon Dec 9 15:55:39 2024 +0000 + + AArch64: Improve codegen in users of ADVSIMD log1p helper + + Add inline helper for log1p and rearrange operations so MOV + is not necessary in reduction or around the special-case handler. + Reduce memory access by using more indexed MLAs in polynomial. + Speedup on Neoverse V1 for log1p (3.5%), acosh (7.5%) and atanh (10%). + + (cherry picked from commit ca0c0d0f26fbf75b9cacc65122b457e8fdec40b8) + +diff --git a/sysdeps/aarch64/fpu/acosh_advsimd.c b/sysdeps/aarch64/fpu/acosh_advsimd.c +index c88283cf11..a98f4a2e4d 100644 +--- a/sysdeps/aarch64/fpu/acosh_advsimd.c ++++ b/sysdeps/aarch64/fpu/acosh_advsimd.c +@@ -54,9 +54,8 @@ VPCS_ATTR float64x2_t V_NAME_D1 (acosh) (float64x2_t x) + x = vbslq_f64 (special, vreinterpretq_f64_u64 (d->one), x); + #endif + +- float64x2_t xm1 = vsubq_f64 (x, v_f64 (1)); +- float64x2_t y; +- y = vaddq_f64 (x, v_f64 (1)); ++ float64x2_t xm1 = vsubq_f64 (x, v_f64 (1.0)); ++ float64x2_t y = vaddq_f64 (x, v_f64 (1.0)); + y = vmulq_f64 (y, xm1); + y = vsqrtq_f64 (y); + y = vaddq_f64 (xm1, y); +diff --git a/sysdeps/aarch64/fpu/atanh_advsimd.c b/sysdeps/aarch64/fpu/atanh_advsimd.c +index 3c3d0bd6ad..eb9769aeac 100644 +--- a/sysdeps/aarch64/fpu/atanh_advsimd.c ++++ b/sysdeps/aarch64/fpu/atanh_advsimd.c +@@ -23,15 +23,19 @@ + const static struct data + { + struct v_log1p_data log1p_consts; +- uint64x2_t one, half; ++ uint64x2_t one; ++ uint64x2_t sign_mask; + } data = { .log1p_consts = V_LOG1P_CONSTANTS_TABLE, + .one = V2 (0x3ff0000000000000), +- .half = V2 (0x3fe0000000000000) }; ++ .sign_mask = V2 (0x8000000000000000) }; + + static float64x2_t VPCS_ATTR NOINLINE +-special_case (float64x2_t x, float64x2_t y, uint64x2_t special) ++special_case (float64x2_t x, float64x2_t halfsign, float64x2_t y, ++ uint64x2_t special, const struct data *d) + { +- return v_call_f64 (atanh, x, y, special); ++ y = log1p_inline (y, &d->log1p_consts); ++ return v_call_f64 (atanh, vbslq_f64 (d->sign_mask, halfsign, x), ++ vmulq_f64 (halfsign, y), special); + } + + /* Approximation for vector double-precision atanh(x) using modified log1p. +@@ -43,11 +47,10 @@ float64x2_t V_NAME_D1 (atanh) (float64x2_t x) + { + const struct data *d = ptr_barrier (&data); + ++ float64x2_t halfsign = vbslq_f64 (d->sign_mask, x, v_f64 (0.5)); + float64x2_t ax = vabsq_f64 (x); + uint64x2_t ia = vreinterpretq_u64_f64 (ax); +- uint64x2_t sign = veorq_u64 (vreinterpretq_u64_f64 (x), ia); + uint64x2_t special = vcgeq_u64 (ia, d->one); +- float64x2_t halfsign = vreinterpretq_f64_u64 (vorrq_u64 (sign, d->half)); + + #if WANT_SIMD_EXCEPT + ax = v_zerofy_f64 (ax, special); +@@ -55,10 +58,15 @@ float64x2_t V_NAME_D1 (atanh) (float64x2_t x) + + float64x2_t y; + y = vaddq_f64 (ax, ax); +- y = vdivq_f64 (y, vsubq_f64 (v_f64 (1), ax)); +- y = log1p_inline (y, &d->log1p_consts); ++ y = vdivq_f64 (y, vsubq_f64 (vreinterpretq_f64_u64 (d->one), ax)); + + if (__glibc_unlikely (v_any_u64 (special))) +- return special_case (x, vmulq_f64 (y, halfsign), special); ++#if WANT_SIMD_EXCEPT ++ return special_case (x, halfsign, y, special, d); ++#else ++ return special_case (ax, halfsign, y, special, d); ++#endif ++ ++ y = log1p_inline (y, &d->log1p_consts); + return vmulq_f64 (y, halfsign); + } +diff --git a/sysdeps/aarch64/fpu/log1p_advsimd.c b/sysdeps/aarch64/fpu/log1p_advsimd.c +index 114064c696..1263587201 100644 +--- a/sysdeps/aarch64/fpu/log1p_advsimd.c ++++ b/sysdeps/aarch64/fpu/log1p_advsimd.c +@@ -17,43 +17,26 @@ + License along with the GNU C Library; if not, see + . */ + +-#include "v_math.h" +-#include "poly_advsimd_f64.h" ++#define WANT_V_LOG1P_K0_SHORTCUT 0 ++#include "v_log1p_inline.h" + + const static struct data + { +- float64x2_t poly[19], ln2[2]; +- uint64x2_t hf_rt2_top, one_m_hf_rt2_top, umask, inf, minus_one; +- int64x2_t one_top; +-} data = { +- /* Generated using Remez, deg=20, in [sqrt(2)/2-1, sqrt(2)-1]. */ +- .poly = { V2 (-0x1.ffffffffffffbp-2), V2 (0x1.55555555551a9p-2), +- V2 (-0x1.00000000008e3p-2), V2 (0x1.9999999a32797p-3), +- V2 (-0x1.555555552fecfp-3), V2 (0x1.249248e071e5ap-3), +- V2 (-0x1.ffffff8bf8482p-4), V2 (0x1.c71c8f07da57ap-4), +- V2 (-0x1.9999ca4ccb617p-4), V2 (0x1.7459ad2e1dfa3p-4), +- V2 (-0x1.554d2680a3ff2p-4), V2 (0x1.3b4c54d487455p-4), +- V2 (-0x1.2548a9ffe80e6p-4), V2 (0x1.0f389a24b2e07p-4), +- V2 (-0x1.eee4db15db335p-5), V2 (0x1.e95b494d4a5ddp-5), +- V2 (-0x1.15fdf07cb7c73p-4), V2 (0x1.0310b70800fcfp-4), +- V2 (-0x1.cfa7385bdb37ep-6) }, +- .ln2 = { V2 (0x1.62e42fefa3800p-1), V2 (0x1.ef35793c76730p-45) }, +- /* top32(asuint64(sqrt(2)/2)) << 32. */ +- .hf_rt2_top = V2 (0x3fe6a09e00000000), +- /* (top32(asuint64(1)) - top32(asuint64(sqrt(2)/2))) << 32. */ +- .one_m_hf_rt2_top = V2 (0x00095f6200000000), +- .umask = V2 (0x000fffff00000000), +- .one_top = V2 (0x3ff), +- .inf = V2 (0x7ff0000000000000), +- .minus_one = V2 (0xbff0000000000000) +-}; ++ struct v_log1p_data d; ++ uint64x2_t inf, minus_one; ++} data = { .d = V_LOG1P_CONSTANTS_TABLE, ++ .inf = V2 (0x7ff0000000000000), ++ .minus_one = V2 (0xbff0000000000000) }; + + #define BottomMask v_u64 (0xffffffff) + +-static float64x2_t VPCS_ATTR NOINLINE +-special_case (float64x2_t x, float64x2_t y, uint64x2_t special) ++static float64x2_t NOINLINE VPCS_ATTR ++special_case (float64x2_t x, uint64x2_t cmp, const struct data *d) + { +- return v_call_f64 (log1p, x, y, special); ++ /* Side-step special lanes so fenv exceptions are not triggered ++ inadvertently. */ ++ float64x2_t x_nospecial = v_zerofy_f64 (x, cmp); ++ return v_call_f64 (log1p, x, log1p_inline (x_nospecial, &d->d), cmp); + } + + /* Vector log1p approximation using polynomial on reduced interval. Routine is +@@ -66,66 +49,14 @@ VPCS_ATTR float64x2_t V_NAME_D1 (log1p) (float64x2_t x) + const struct data *d = ptr_barrier (&data); + uint64x2_t ix = vreinterpretq_u64_f64 (x); + uint64x2_t ia = vreinterpretq_u64_f64 (vabsq_f64 (x)); +- uint64x2_t special = vcgeq_u64 (ia, d->inf); + +-#if WANT_SIMD_EXCEPT +- special = vorrq_u64 (special, +- vcgeq_u64 (ix, vreinterpretq_u64_f64 (v_f64 (-1)))); +- if (__glibc_unlikely (v_any_u64 (special))) +- x = v_zerofy_f64 (x, special); +-#else +- special = vorrq_u64 (special, vcleq_f64 (x, v_f64 (-1))); +-#endif ++ uint64x2_t special_cases ++ = vorrq_u64 (vcgeq_u64 (ia, d->inf), vcgeq_u64 (ix, d->minus_one)); + +- /* With x + 1 = t * 2^k (where t = f + 1 and k is chosen such that f +- is in [sqrt(2)/2, sqrt(2)]): +- log1p(x) = k*log(2) + log1p(f). ++ if (__glibc_unlikely (v_any_u64 (special_cases))) ++ return special_case (x, special_cases, d); + +- f may not be representable exactly, so we need a correction term: +- let m = round(1 + x), c = (1 + x) - m. +- c << m: at very small x, log1p(x) ~ x, hence: +- log(1+x) - log(m) ~ c/m. +- +- We therefore calculate log1p(x) by k*log2 + log1p(f) + c/m. */ +- +- /* Obtain correctly scaled k by manipulation in the exponent. +- The scalar algorithm casts down to 32-bit at this point to calculate k and +- u_red. We stay in double-width to obtain f and k, using the same constants +- as the scalar algorithm but shifted left by 32. */ +- float64x2_t m = vaddq_f64 (x, v_f64 (1)); +- uint64x2_t mi = vreinterpretq_u64_f64 (m); +- uint64x2_t u = vaddq_u64 (mi, d->one_m_hf_rt2_top); +- +- int64x2_t ki +- = vsubq_s64 (vreinterpretq_s64_u64 (vshrq_n_u64 (u, 52)), d->one_top); +- float64x2_t k = vcvtq_f64_s64 (ki); +- +- /* Reduce x to f in [sqrt(2)/2, sqrt(2)]. */ +- uint64x2_t utop = vaddq_u64 (vandq_u64 (u, d->umask), d->hf_rt2_top); +- uint64x2_t u_red = vorrq_u64 (utop, vandq_u64 (mi, BottomMask)); +- float64x2_t f = vsubq_f64 (vreinterpretq_f64_u64 (u_red), v_f64 (1)); +- +- /* Correction term c/m. */ +- float64x2_t cm = vdivq_f64 (vsubq_f64 (x, vsubq_f64 (m, v_f64 (1))), m); +- +- /* Approximate log1p(x) on the reduced input using a polynomial. Because +- log1p(0)=0 we choose an approximation of the form: +- x + C0*x^2 + C1*x^3 + C2x^4 + ... +- Hence approximation has the form f + f^2 * P(f) +- where P(x) = C0 + C1*x + C2x^2 + ... +- Assembling this all correctly is dealt with at the final step. */ +- float64x2_t f2 = vmulq_f64 (f, f); +- float64x2_t p = v_pw_horner_18_f64 (f, f2, d->poly); +- +- float64x2_t ylo = vfmaq_f64 (cm, k, d->ln2[1]); +- float64x2_t yhi = vfmaq_f64 (f, k, d->ln2[0]); +- float64x2_t y = vaddq_f64 (ylo, yhi); +- +- if (__glibc_unlikely (v_any_u64 (special))) +- return special_case (vreinterpretq_f64_u64 (ix), vfmaq_f64 (y, f2, p), +- special); +- +- return vfmaq_f64 (y, f2, p); ++ return log1p_inline (x, &d->d); + } + + strong_alias (V_NAME_D1 (log1p), V_NAME_D1 (logp1)) +diff --git a/sysdeps/aarch64/fpu/v_log1p_inline.h b/sysdeps/aarch64/fpu/v_log1p_inline.h +index 242e43b6ee..834ff65adf 100644 +--- a/sysdeps/aarch64/fpu/v_log1p_inline.h ++++ b/sysdeps/aarch64/fpu/v_log1p_inline.h +@@ -21,29 +21,30 @@ + #define AARCH64_FPU_V_LOG1P_INLINE_H + + #include "v_math.h" +-#include "poly_advsimd_f64.h" + + struct v_log1p_data + { +- float64x2_t poly[19], ln2[2]; ++ float64x2_t c0, c2, c4, c6, c8, c10, c12, c14, c16; + uint64x2_t hf_rt2_top, one_m_hf_rt2_top, umask; + int64x2_t one_top; ++ double c1, c3, c5, c7, c9, c11, c13, c15, c17, c18; ++ double ln2[2]; + }; + + /* Coefficients generated using Remez, deg=20, in [sqrt(2)/2-1, sqrt(2)-1]. */ + #define V_LOG1P_CONSTANTS_TABLE \ + { \ +- .poly = { V2 (-0x1.ffffffffffffbp-2), V2 (0x1.55555555551a9p-2), \ +- V2 (-0x1.00000000008e3p-2), V2 (0x1.9999999a32797p-3), \ +- V2 (-0x1.555555552fecfp-3), V2 (0x1.249248e071e5ap-3), \ +- V2 (-0x1.ffffff8bf8482p-4), V2 (0x1.c71c8f07da57ap-4), \ +- V2 (-0x1.9999ca4ccb617p-4), V2 (0x1.7459ad2e1dfa3p-4), \ +- V2 (-0x1.554d2680a3ff2p-4), V2 (0x1.3b4c54d487455p-4), \ +- V2 (-0x1.2548a9ffe80e6p-4), V2 (0x1.0f389a24b2e07p-4), \ +- V2 (-0x1.eee4db15db335p-5), V2 (0x1.e95b494d4a5ddp-5), \ +- V2 (-0x1.15fdf07cb7c73p-4), V2 (0x1.0310b70800fcfp-4), \ +- V2 (-0x1.cfa7385bdb37ep-6) }, \ +- .ln2 = { V2 (0x1.62e42fefa3800p-1), V2 (0x1.ef35793c76730p-45) }, \ ++ .c0 = V2 (-0x1.ffffffffffffbp-2), .c1 = 0x1.55555555551a9p-2, \ ++ .c2 = V2 (-0x1.00000000008e3p-2), .c3 = 0x1.9999999a32797p-3, \ ++ .c4 = V2 (-0x1.555555552fecfp-3), .c5 = 0x1.249248e071e5ap-3, \ ++ .c6 = V2 (-0x1.ffffff8bf8482p-4), .c7 = 0x1.c71c8f07da57ap-4, \ ++ .c8 = V2 (-0x1.9999ca4ccb617p-4), .c9 = 0x1.7459ad2e1dfa3p-4, \ ++ .c10 = V2 (-0x1.554d2680a3ff2p-4), .c11 = 0x1.3b4c54d487455p-4, \ ++ .c12 = V2 (-0x1.2548a9ffe80e6p-4), .c13 = 0x1.0f389a24b2e07p-4, \ ++ .c14 = V2 (-0x1.eee4db15db335p-5), .c15 = 0x1.e95b494d4a5ddp-5, \ ++ .c16 = V2 (-0x1.15fdf07cb7c73p-4), .c17 = 0x1.0310b70800fcfp-4, \ ++ .c18 = -0x1.cfa7385bdb37ep-6, \ ++ .ln2 = { 0x1.62e42fefa3800p-1, 0x1.ef35793c76730p-45 }, \ + .hf_rt2_top = V2 (0x3fe6a09e00000000), \ + .one_m_hf_rt2_top = V2 (0x00095f6200000000), \ + .umask = V2 (0x000fffff00000000), .one_top = V2 (0x3ff) \ +@@ -51,19 +52,45 @@ struct v_log1p_data + + #define BottomMask v_u64 (0xffffffff) + ++static inline float64x2_t ++eval_poly (float64x2_t m, float64x2_t m2, const struct v_log1p_data *d) ++{ ++ /* Approximate log(1+m) on [-0.25, 0.5] using pairwise Horner. */ ++ float64x2_t c13 = vld1q_f64 (&d->c1); ++ float64x2_t c57 = vld1q_f64 (&d->c5); ++ float64x2_t c911 = vld1q_f64 (&d->c9); ++ float64x2_t c1315 = vld1q_f64 (&d->c13); ++ float64x2_t c1718 = vld1q_f64 (&d->c17); ++ float64x2_t p1617 = vfmaq_laneq_f64 (d->c16, m, c1718, 0); ++ float64x2_t p1415 = vfmaq_laneq_f64 (d->c14, m, c1315, 1); ++ float64x2_t p1213 = vfmaq_laneq_f64 (d->c12, m, c1315, 0); ++ float64x2_t p1011 = vfmaq_laneq_f64 (d->c10, m, c911, 1); ++ float64x2_t p89 = vfmaq_laneq_f64 (d->c8, m, c911, 0); ++ float64x2_t p67 = vfmaq_laneq_f64 (d->c6, m, c57, 1); ++ float64x2_t p45 = vfmaq_laneq_f64 (d->c4, m, c57, 0); ++ float64x2_t p23 = vfmaq_laneq_f64 (d->c2, m, c13, 1); ++ float64x2_t p01 = vfmaq_laneq_f64 (d->c0, m, c13, 0); ++ float64x2_t p = vfmaq_laneq_f64 (p1617, m2, c1718, 1); ++ p = vfmaq_f64 (p1415, m2, p); ++ p = vfmaq_f64 (p1213, m2, p); ++ p = vfmaq_f64 (p1011, m2, p); ++ p = vfmaq_f64 (p89, m2, p); ++ p = vfmaq_f64 (p67, m2, p); ++ p = vfmaq_f64 (p45, m2, p); ++ p = vfmaq_f64 (p23, m2, p); ++ return vfmaq_f64 (p01, m2, p); ++} ++ + static inline float64x2_t + log1p_inline (float64x2_t x, const struct v_log1p_data *d) + { +- /* Helper for calculating log(x + 1). Copied from v_log1p_2u5.c, with several +- modifications: ++ /* Helper for calculating log(x + 1): + - No special-case handling - this should be dealt with by the caller. +- - Pairwise Horner polynomial evaluation for improved accuracy. + - Optionally simulate the shortcut for k=0, used in the scalar routine, +- using v_sel, for improved accuracy when the argument to log1p is close to +- 0. This feature is enabled by defining WANT_V_LOG1P_K0_SHORTCUT as 1 in +- the source of the caller before including this file. +- See v_log1pf_2u1.c for details of the algorithm. */ +- float64x2_t m = vaddq_f64 (x, v_f64 (1)); ++ using v_sel, for improved accuracy when the argument to log1p is close ++ to 0. This feature is enabled by defining WANT_V_LOG1P_K0_SHORTCUT as 1 ++ in the source of the caller before including this file. */ ++ float64x2_t m = vaddq_f64 (x, v_f64 (1.0)); + uint64x2_t mi = vreinterpretq_u64_f64 (m); + uint64x2_t u = vaddq_u64 (mi, d->one_m_hf_rt2_top); + +@@ -74,14 +101,14 @@ log1p_inline (float64x2_t x, const struct v_log1p_data *d) + /* Reduce x to f in [sqrt(2)/2, sqrt(2)]. */ + uint64x2_t utop = vaddq_u64 (vandq_u64 (u, d->umask), d->hf_rt2_top); + uint64x2_t u_red = vorrq_u64 (utop, vandq_u64 (mi, BottomMask)); +- float64x2_t f = vsubq_f64 (vreinterpretq_f64_u64 (u_red), v_f64 (1)); ++ float64x2_t f = vsubq_f64 (vreinterpretq_f64_u64 (u_red), v_f64 (1.0)); + + /* Correction term c/m. */ +- float64x2_t cm = vdivq_f64 (vsubq_f64 (x, vsubq_f64 (m, v_f64 (1))), m); ++ float64x2_t cm = vdivq_f64 (vsubq_f64 (x, vsubq_f64 (m, v_f64 (1.0))), m); + + #ifndef WANT_V_LOG1P_K0_SHORTCUT +-#error \ +- "Cannot use v_log1p_inline.h without specifying whether you need the k0 shortcut for greater accuracy close to 0" ++# error \ ++ "Cannot use v_log1p_inline.h without specifying whether you need the k0 shortcut for greater accuracy close to 0" + #elif WANT_V_LOG1P_K0_SHORTCUT + /* Shortcut if k is 0 - set correction term to 0 and f to x. The result is + that the approximation is solely the polynomial. */ +@@ -92,11 +119,12 @@ log1p_inline (float64x2_t x, const struct v_log1p_data *d) + + /* Approximate log1p(f) on the reduced input using a polynomial. */ + float64x2_t f2 = vmulq_f64 (f, f); +- float64x2_t p = v_pw_horner_18_f64 (f, f2, d->poly); ++ float64x2_t p = eval_poly (f, f2, d); + + /* Assemble log1p(x) = k * log2 + log1p(f) + c/m. */ +- float64x2_t ylo = vfmaq_f64 (cm, k, d->ln2[1]); +- float64x2_t yhi = vfmaq_f64 (f, k, d->ln2[0]); ++ float64x2_t ln2 = vld1q_f64 (&d->ln2[0]); ++ float64x2_t ylo = vfmaq_laneq_f64 (cm, k, ln2, 1); ++ float64x2_t yhi = vfmaq_laneq_f64 (f, k, ln2, 0); + return vfmaq_f64 (vaddq_f64 (ylo, yhi), f2, p); + } + + +commit 9170b921fa49d2ef37141506837baaae92c7d3f8 +Author: Joana Cruz +Date: Tue Dec 17 14:47:31 2024 +0000 + + AArch64: Improve codegen of AdvSIMD logf function family + + Load the polynomial evaluation coefficients into 2 vectors and use lanewise MLAs. + 8% improvement in throughput microbenchmark on Neoverse V1 for log2 and log, + and 2% for log10. + + Reviewed-by: Wilco Dijkstra + (cherry picked from commit d6e034f5b222a9ed1aeb5de0c0c7d0dda8b63da3) + +diff --git a/sysdeps/aarch64/fpu/log10f_advsimd.c b/sysdeps/aarch64/fpu/log10f_advsimd.c +index 82228b599a..0d792c3df9 100644 +--- a/sysdeps/aarch64/fpu/log10f_advsimd.c ++++ b/sysdeps/aarch64/fpu/log10f_advsimd.c +@@ -18,21 +18,25 @@ + . */ + + #include "v_math.h" +-#include "poly_advsimd_f32.h" + + static const struct data + { ++ float32x4_t c0, c2, c4, c6, inv_ln10, ln2; + uint32x4_t off, offset_lower_bound; + uint16x8_t special_bound; + uint32x4_t mantissa_mask; +- float32x4_t poly[8]; +- float32x4_t inv_ln10, ln2; ++ float c1, c3, c5, c7; + } data = { + /* Use order 9 for log10(1+x), i.e. order 8 for log10(1+x)/x, with x in + [-1/3, 1/3] (offset=2/3). Max. relative error: 0x1.068ee468p-25. */ +- .poly = { V4 (-0x1.bcb79cp-3f), V4 (0x1.2879c8p-3f), V4 (-0x1.bcd472p-4f), +- V4 (0x1.6408f8p-4f), V4 (-0x1.246f8p-4f), V4 (0x1.f0e514p-5f), +- V4 (-0x1.0fc92cp-4f), V4 (0x1.f5f76ap-5f) }, ++ .c0 = V4 (-0x1.bcb79cp-3f), ++ .c1 = 0x1.2879c8p-3f, ++ .c2 = V4 (-0x1.bcd472p-4f), ++ .c3 = 0x1.6408f8p-4f, ++ .c4 = V4 (-0x1.246f8p-4f), ++ .c5 = 0x1.f0e514p-5f, ++ .c6 = V4 (-0x1.0fc92cp-4f), ++ .c7 = 0x1.f5f76ap-5f, + .ln2 = V4 (0x1.62e43p-1f), + .inv_ln10 = V4 (0x1.bcb7b2p-2f), + /* Lower bound is the smallest positive normal float 0x00800000. For +@@ -62,7 +66,7 @@ special_case (float32x4_t y, uint32x4_t u_off, float32x4_t p, float32x4_t r2, + float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (log10) (float32x4_t x) + { + const struct data *d = ptr_barrier (&data); +- ++ float32x4_t c1357 = vld1q_f32 (&d->c1); + /* To avoid having to mov x out of the way, keep u after offset has been + applied, and recover x by adding the offset back in the special-case + handler. */ +@@ -81,7 +85,16 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (log10) (float32x4_t x) + + /* y = log10(1+r) + n * log10(2). */ + float32x4_t r2 = vmulq_f32 (r, r); +- float32x4_t poly = v_pw_horner_7_f32 (r, r2, d->poly); ++ ++ float32x4_t c01 = vfmaq_laneq_f32 (d->c0, r, c1357, 0); ++ float32x4_t c23 = vfmaq_laneq_f32 (d->c2, r, c1357, 1); ++ float32x4_t c45 = vfmaq_laneq_f32 (d->c4, r, c1357, 2); ++ float32x4_t c67 = vfmaq_laneq_f32 (d->c6, r, c1357, 3); ++ ++ float32x4_t p47 = vfmaq_f32 (c45, r2, c67); ++ float32x4_t p27 = vfmaq_f32 (c23, r2, p47); ++ float32x4_t poly = vfmaq_f32 (c01, r2, p27); ++ + /* y = Log10(2) * n + poly * InvLn(10). */ + float32x4_t y = vfmaq_f32 (r, d->ln2, n); + y = vmulq_f32 (y, d->inv_ln10); +diff --git a/sysdeps/aarch64/fpu/log2f_advsimd.c b/sysdeps/aarch64/fpu/log2f_advsimd.c +index 84effe4fe9..116c36c8e2 100644 +--- a/sysdeps/aarch64/fpu/log2f_advsimd.c ++++ b/sysdeps/aarch64/fpu/log2f_advsimd.c +@@ -18,22 +18,27 @@ + . */ + + #include "v_math.h" +-#include "poly_advsimd_f32.h" + + static const struct data + { ++ float32x4_t c0, c2, c4, c6, c8; + uint32x4_t off, offset_lower_bound; + uint16x8_t special_bound; + uint32x4_t mantissa_mask; +- float32x4_t poly[9]; ++ float c1, c3, c5, c7; + } data = { + /* Coefficients generated using Remez algorithm approximate + log2(1+r)/r for r in [ -1/3, 1/3 ]. + rel error: 0x1.c4c4b0cp-26. */ +- .poly = { V4 (0x1.715476p0f), /* (float)(1 / ln(2)). */ +- V4 (-0x1.715458p-1f), V4 (0x1.ec701cp-2f), V4 (-0x1.7171a4p-2f), +- V4 (0x1.27a0b8p-2f), V4 (-0x1.e5143ep-3f), V4 (0x1.9d8ecap-3f), +- V4 (-0x1.c675bp-3f), V4 (0x1.9e495p-3f) }, ++ .c0 = V4 (0x1.715476p0f), /* (float)(1 / ln(2)). */ ++ .c1 = -0x1.715458p-1f, ++ .c2 = V4 (0x1.ec701cp-2f), ++ .c3 = -0x1.7171a4p-2f, ++ .c4 = V4 (0x1.27a0b8p-2f), ++ .c5 = -0x1.e5143ep-3f, ++ .c6 = V4 (0x1.9d8ecap-3f), ++ .c7 = -0x1.c675bp-3f, ++ .c8 = V4 (0x1.9e495p-3f), + /* Lower bound is the smallest positive normal float 0x00800000. For + optimised register use subnormals are detected after offset has been + subtracted, so lower bound is 0x0080000 - offset (which wraps around). */ +@@ -79,11 +84,21 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (log2) (float32x4_t x) + + /* y = log2(1+r) + n. */ + float32x4_t r2 = vmulq_f32 (r, r); +- float32x4_t p = v_pw_horner_8_f32 (r, r2, d->poly); ++ ++ float32x4_t c1357 = vld1q_f32 (&d->c1); ++ float32x4_t c01 = vfmaq_laneq_f32 (d->c0, r, c1357, 0); ++ float32x4_t c23 = vfmaq_laneq_f32 (d->c2, r, c1357, 1); ++ float32x4_t c45 = vfmaq_laneq_f32 (d->c4, r, c1357, 2); ++ float32x4_t c67 = vfmaq_laneq_f32 (d->c6, r, c1357, 3); ++ float32x4_t p68 = vfmaq_f32 (c67, r2, d->c8); ++ float32x4_t p48 = vfmaq_f32 (c45, r2, p68); ++ float32x4_t p28 = vfmaq_f32 (c23, r2, p48); ++ float32x4_t p = vfmaq_f32 (c01, r2, p28); + + if (__glibc_unlikely (v_any_u16h (special))) + return special_case (n, u_off, p, r, special, d); + return vfmaq_f32 (n, p, r); + } ++ + libmvec_hidden_def (V_NAME_F1 (log2)) + HALF_WIDTH_ALIAS_F1 (log2) +diff --git a/sysdeps/aarch64/fpu/logf_advsimd.c b/sysdeps/aarch64/fpu/logf_advsimd.c +index c20dbfd6c0..d9e64c732d 100644 +--- a/sysdeps/aarch64/fpu/logf_advsimd.c ++++ b/sysdeps/aarch64/fpu/logf_advsimd.c +@@ -21,16 +21,19 @@ + + static const struct data + { +- uint32x4_t off, offset_lower_bound; ++ float32x4_t c2, c4, c6, ln2; ++ uint32x4_t off, offset_lower_bound, mantissa_mask; + uint16x8_t special_bound; +- uint32x4_t mantissa_mask; +- float32x4_t poly[7]; +- float32x4_t ln2; ++ float c1, c3, c5, c0; + } data = { + /* 3.34 ulp error. */ +- .poly = { V4 (-0x1.3e737cp-3f), V4 (0x1.5a9aa2p-3f), V4 (-0x1.4f9934p-3f), +- V4 (0x1.961348p-3f), V4 (-0x1.00187cp-2f), V4 (0x1.555d7cp-2f), +- V4 (-0x1.ffffc8p-2f) }, ++ .c0 = -0x1.3e737cp-3f, ++ .c1 = 0x1.5a9aa2p-3f, ++ .c2 = V4 (-0x1.4f9934p-3f), ++ .c3 = 0x1.961348p-3f, ++ .c4 = V4 (-0x1.00187cp-2f), ++ .c5 = 0x1.555d7cp-2f, ++ .c6 = V4 (-0x1.ffffc8p-2f), + .ln2 = V4 (0x1.62e43p-1f), + /* Lower bound is the smallest positive normal float 0x00800000. For + optimised register use subnormals are detected after offset has been +@@ -41,8 +44,6 @@ static const struct data + .mantissa_mask = V4 (0x007fffff) + }; + +-#define P(i) d->poly[7 - i] +- + static float32x4_t VPCS_ATTR NOINLINE + special_case (float32x4_t p, uint32x4_t u_off, float32x4_t y, float32x4_t r2, + uint16x4_t cmp, const struct data *d) +@@ -55,33 +56,30 @@ special_case (float32x4_t p, uint32x4_t u_off, float32x4_t y, float32x4_t r2, + float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (log) (float32x4_t x) + { + const struct data *d = ptr_barrier (&data); +- float32x4_t n, p, q, r, r2, y; +- uint32x4_t u, u_off; +- uint16x4_t cmp; ++ float32x4_t c1350 = vld1q_f32 (&d->c1); + + /* To avoid having to mov x out of the way, keep u after offset has been + applied, and recover x by adding the offset back in the special-case + handler. */ +- u_off = vreinterpretq_u32_f32 (x); ++ uint32x4_t u_off = vsubq_u32 (vreinterpretq_u32_f32 (x), d->off); + + /* x = 2^n * (1+r), where 2/3 < 1+r < 4/3. */ +- u_off = vsubq_u32 (u_off, d->off); +- n = vcvtq_f32_s32 ( ++ float32x4_t n = vcvtq_f32_s32 ( + vshrq_n_s32 (vreinterpretq_s32_u32 (u_off), 23)); /* signextend. */ +- u = vandq_u32 (u_off, d->mantissa_mask); +- u = vaddq_u32 (u, d->off); +- r = vsubq_f32 (vreinterpretq_f32_u32 (u), v_f32 (1.0f)); ++ uint16x4_t cmp = vcge_u16 (vsubhn_u32 (u_off, d->offset_lower_bound), ++ vget_low_u16 (d->special_bound)); + +- cmp = vcge_u16 (vsubhn_u32 (u_off, d->offset_lower_bound), +- vget_low_u16 (d->special_bound)); ++ uint32x4_t u = vaddq_u32 (vandq_u32 (u_off, d->mantissa_mask), d->off); ++ float32x4_t r = vsubq_f32 (vreinterpretq_f32_u32 (u), v_f32 (1.0f)); + + /* y = log(1+r) + n*ln2. */ +- r2 = vmulq_f32 (r, r); ++ float32x4_t r2 = vmulq_f32 (r, r); + /* n*ln2 + r + r2*(P1 + r*P2 + r2*(P3 + r*P4 + r2*(P5 + r*P6 + r2*P7))). */ +- p = vfmaq_f32 (P (5), P (6), r); +- q = vfmaq_f32 (P (3), P (4), r); +- y = vfmaq_f32 (P (1), P (2), r); +- p = vfmaq_f32 (p, P (7), r2); ++ float32x4_t p = vfmaq_laneq_f32 (d->c2, r, c1350, 0); ++ float32x4_t q = vfmaq_laneq_f32 (d->c4, r, c1350, 1); ++ float32x4_t y = vfmaq_laneq_f32 (d->c6, r, c1350, 2); ++ p = vfmaq_laneq_f32 (p, r2, c1350, 3); ++ + q = vfmaq_f32 (q, p, r2); + y = vfmaq_f32 (y, q, r2); + p = vfmaq_f32 (r, d->ln2, n); + +commit 41dc9e7c2d80bc5e886950b8a7bd21f77c9793b3 +Author: Joana Cruz +Date: Tue Dec 17 14:49:30 2024 +0000 + + AArch64: Improve codegen of AdvSIMD atan(2)(f) + + Load the polynomial evaluation coefficients into 2 vectors and use lanewise MLAs. + 8% improvement in throughput microbenchmark on Neoverse V1. + + Reviewed-by: Wilco Dijkstra + (cherry picked from commit 6914774b9d3460876d9ad4482782213ec01a752e) + +diff --git a/sysdeps/aarch64/fpu/atan2_advsimd.c b/sysdeps/aarch64/fpu/atan2_advsimd.c +index b1e7a9b8fc..1a8f02109f 100644 +--- a/sysdeps/aarch64/fpu/atan2_advsimd.c ++++ b/sysdeps/aarch64/fpu/atan2_advsimd.c +@@ -23,40 +23,57 @@ + + static const struct data + { ++ float64x2_t c0, c2, c4, c6, c8, c10, c12, c14, c16, c18; + float64x2_t pi_over_2; +- float64x2_t poly[20]; ++ double c1, c3, c5, c7, c9, c11, c13, c15, c17, c19; ++ uint64x2_t zeroinfnan, minustwo; + } data = { + /* Coefficients of polynomial P such that atan(x)~x+x*P(x^2) on +- the interval [2**-1022, 1.0]. */ +- .poly = { V2 (-0x1.5555555555555p-2), V2 (0x1.99999999996c1p-3), +- V2 (-0x1.2492492478f88p-3), V2 (0x1.c71c71bc3951cp-4), +- V2 (-0x1.745d160a7e368p-4), V2 (0x1.3b139b6a88ba1p-4), +- V2 (-0x1.11100ee084227p-4), V2 (0x1.e1d0f9696f63bp-5), +- V2 (-0x1.aebfe7b418581p-5), V2 (0x1.842dbe9b0d916p-5), +- V2 (-0x1.5d30140ae5e99p-5), V2 (0x1.338e31eb2fbbcp-5), +- V2 (-0x1.00e6eece7de8p-5), V2 (0x1.860897b29e5efp-6), +- V2 (-0x1.0051381722a59p-6), V2 (0x1.14e9dc19a4a4ep-7), +- V2 (-0x1.d0062b42fe3bfp-9), V2 (0x1.17739e210171ap-10), +- V2 (-0x1.ab24da7be7402p-13), V2 (0x1.358851160a528p-16), }, ++ [2**-1022, 1.0]. */ ++ .c0 = V2 (-0x1.5555555555555p-2), ++ .c1 = 0x1.99999999996c1p-3, ++ .c2 = V2 (-0x1.2492492478f88p-3), ++ .c3 = 0x1.c71c71bc3951cp-4, ++ .c4 = V2 (-0x1.745d160a7e368p-4), ++ .c5 = 0x1.3b139b6a88ba1p-4, ++ .c6 = V2 (-0x1.11100ee084227p-4), ++ .c7 = 0x1.e1d0f9696f63bp-5, ++ .c8 = V2 (-0x1.aebfe7b418581p-5), ++ .c9 = 0x1.842dbe9b0d916p-5, ++ .c10 = V2 (-0x1.5d30140ae5e99p-5), ++ .c11 = 0x1.338e31eb2fbbcp-5, ++ .c12 = V2 (-0x1.00e6eece7de8p-5), ++ .c13 = 0x1.860897b29e5efp-6, ++ .c14 = V2 (-0x1.0051381722a59p-6), ++ .c15 = 0x1.14e9dc19a4a4ep-7, ++ .c16 = V2 (-0x1.d0062b42fe3bfp-9), ++ .c17 = 0x1.17739e210171ap-10, ++ .c18 = V2 (-0x1.ab24da7be7402p-13), ++ .c19 = 0x1.358851160a528p-16, + .pi_over_2 = V2 (0x1.921fb54442d18p+0), ++ .zeroinfnan = V2 (2 * 0x7ff0000000000000ul - 1), ++ .minustwo = V2 (0xc000000000000000), + }; + + #define SignMask v_u64 (0x8000000000000000) + + /* Special cases i.e. 0, infinity, NaN (fall back to scalar calls). */ + static float64x2_t VPCS_ATTR NOINLINE +-special_case (float64x2_t y, float64x2_t x, float64x2_t ret, uint64x2_t cmp) ++special_case (float64x2_t y, float64x2_t x, float64x2_t ret, ++ uint64x2_t sign_xy, uint64x2_t cmp) + { ++ /* Account for the sign of x and y. */ ++ ret = vreinterpretq_f64_u64 ( ++ veorq_u64 (vreinterpretq_u64_f64 (ret), sign_xy)); + return v_call2_f64 (atan2, y, x, ret, cmp); + } + + /* Returns 1 if input is the bit representation of 0, infinity or nan. */ + static inline uint64x2_t +-zeroinfnan (uint64x2_t i) ++zeroinfnan (uint64x2_t i, const struct data *d) + { + /* (2 * i - 1) >= (2 * asuint64 (INFINITY) - 1). */ +- return vcgeq_u64 (vsubq_u64 (vaddq_u64 (i, i), v_u64 (1)), +- v_u64 (2 * asuint64 (INFINITY) - 1)); ++ return vcgeq_u64 (vsubq_u64 (vaddq_u64 (i, i), v_u64 (1)), d->zeroinfnan); + } + + /* Fast implementation of vector atan2. +@@ -66,12 +83,13 @@ zeroinfnan (uint64x2_t i) + want 0x1.92d628ab678cfp-1. */ + float64x2_t VPCS_ATTR V_NAME_D2 (atan2) (float64x2_t y, float64x2_t x) + { +- const struct data *data_ptr = ptr_barrier (&data); ++ const struct data *d = ptr_barrier (&data); + + uint64x2_t ix = vreinterpretq_u64_f64 (x); + uint64x2_t iy = vreinterpretq_u64_f64 (y); + +- uint64x2_t special_cases = vorrq_u64 (zeroinfnan (ix), zeroinfnan (iy)); ++ uint64x2_t special_cases ++ = vorrq_u64 (zeroinfnan (ix, d), zeroinfnan (iy, d)); + + uint64x2_t sign_x = vandq_u64 (ix, SignMask); + uint64x2_t sign_y = vandq_u64 (iy, SignMask); +@@ -81,18 +99,18 @@ float64x2_t VPCS_ATTR V_NAME_D2 (atan2) (float64x2_t y, float64x2_t x) + float64x2_t ay = vabsq_f64 (y); + + uint64x2_t pred_xlt0 = vcltzq_f64 (x); +- uint64x2_t pred_aygtax = vcgtq_f64 (ay, ax); ++ uint64x2_t pred_aygtax = vcagtq_f64 (y, x); + + /* Set up z for call to atan. */ + float64x2_t n = vbslq_f64 (pred_aygtax, vnegq_f64 (ax), ay); +- float64x2_t d = vbslq_f64 (pred_aygtax, ay, ax); +- float64x2_t z = vdivq_f64 (n, d); ++ float64x2_t q = vbslq_f64 (pred_aygtax, ay, ax); ++ float64x2_t z = vdivq_f64 (n, q); + + /* Work out the correct shift. */ +- float64x2_t shift = vreinterpretq_f64_u64 ( +- vandq_u64 (pred_xlt0, vreinterpretq_u64_f64 (v_f64 (-2.0)))); ++ float64x2_t shift ++ = vreinterpretq_f64_u64 (vandq_u64 (pred_xlt0, d->minustwo)); + shift = vbslq_f64 (pred_aygtax, vaddq_f64 (shift, v_f64 (1.0)), shift); +- shift = vmulq_f64 (shift, data_ptr->pi_over_2); ++ shift = vmulq_f64 (shift, d->pi_over_2); + + /* Calculate the polynomial approximation. + Use split Estrin scheme for P(z^2) with deg(P)=19. Use split instead of +@@ -103,20 +121,52 @@ float64x2_t VPCS_ATTR V_NAME_D2 (atan2) (float64x2_t y, float64x2_t x) + float64x2_t x2 = vmulq_f64 (z2, z2); + float64x2_t x4 = vmulq_f64 (x2, x2); + float64x2_t x8 = vmulq_f64 (x4, x4); +- float64x2_t ret +- = vfmaq_f64 (v_estrin_7_f64 (z2, x2, x4, data_ptr->poly), +- v_estrin_11_f64 (z2, x2, x4, x8, data_ptr->poly + 8), x8); ++ ++ float64x2_t c13 = vld1q_f64 (&d->c1); ++ float64x2_t c57 = vld1q_f64 (&d->c5); ++ float64x2_t c911 = vld1q_f64 (&d->c9); ++ float64x2_t c1315 = vld1q_f64 (&d->c13); ++ float64x2_t c1719 = vld1q_f64 (&d->c17); ++ ++ /* estrin_7. */ ++ float64x2_t p01 = vfmaq_laneq_f64 (d->c0, z2, c13, 0); ++ float64x2_t p23 = vfmaq_laneq_f64 (d->c2, z2, c13, 1); ++ float64x2_t p03 = vfmaq_f64 (p01, x2, p23); ++ ++ float64x2_t p45 = vfmaq_laneq_f64 (d->c4, z2, c57, 0); ++ float64x2_t p67 = vfmaq_laneq_f64 (d->c6, z2, c57, 1); ++ float64x2_t p47 = vfmaq_f64 (p45, x2, p67); ++ ++ float64x2_t p07 = vfmaq_f64 (p03, x4, p47); ++ ++ /* estrin_11. */ ++ float64x2_t p89 = vfmaq_laneq_f64 (d->c8, z2, c911, 0); ++ float64x2_t p1011 = vfmaq_laneq_f64 (d->c10, z2, c911, 1); ++ float64x2_t p811 = vfmaq_f64 (p89, x2, p1011); ++ ++ float64x2_t p1213 = vfmaq_laneq_f64 (d->c12, z2, c1315, 0); ++ float64x2_t p1415 = vfmaq_laneq_f64 (d->c14, z2, c1315, 1); ++ float64x2_t p1215 = vfmaq_f64 (p1213, x2, p1415); ++ ++ float64x2_t p1617 = vfmaq_laneq_f64 (d->c16, z2, c1719, 0); ++ float64x2_t p1819 = vfmaq_laneq_f64 (d->c18, z2, c1719, 1); ++ float64x2_t p1619 = vfmaq_f64 (p1617, x2, p1819); ++ ++ float64x2_t p815 = vfmaq_f64 (p811, x4, p1215); ++ float64x2_t p819 = vfmaq_f64 (p815, x8, p1619); ++ ++ float64x2_t ret = vfmaq_f64 (p07, p819, x8); + + /* Finalize. y = shift + z + z^3 * P(z^2). */ + ret = vfmaq_f64 (z, ret, vmulq_f64 (z2, z)); + ret = vaddq_f64 (ret, shift); + ++ if (__glibc_unlikely (v_any_u64 (special_cases))) ++ return special_case (y, x, ret, sign_xy, special_cases); ++ + /* Account for the sign of x and y. */ + ret = vreinterpretq_f64_u64 ( + veorq_u64 (vreinterpretq_u64_f64 (ret), sign_xy)); + +- if (__glibc_unlikely (v_any_u64 (special_cases))) +- return special_case (y, x, ret, special_cases); +- + return ret; + } +diff --git a/sysdeps/aarch64/fpu/atan2f_advsimd.c b/sysdeps/aarch64/fpu/atan2f_advsimd.c +index 56e610caf1..88daacd76c 100644 +--- a/sysdeps/aarch64/fpu/atan2f_advsimd.c ++++ b/sysdeps/aarch64/fpu/atan2f_advsimd.c +@@ -22,34 +22,39 @@ + + static const struct data + { +- float32x4_t poly[8]; +- float32x4_t pi_over_2; ++ float32x4_t c0, pi_over_2, c4, c6, c2; ++ float c1, c3, c5, c7; ++ uint32x4_t comp_const; + } data = { + /* Coefficients of polynomial P such that atan(x)~x+x*P(x^2) on + [2**-128, 1.0]. + Generated using fpminimax between FLT_MIN and 1. */ +- .poly = { V4 (-0x1.55555p-2f), V4 (0x1.99935ep-3f), V4 (-0x1.24051ep-3f), +- V4 (0x1.bd7368p-4f), V4 (-0x1.491f0ep-4f), V4 (0x1.93a2c0p-5f), +- V4 (-0x1.4c3c60p-6f), V4 (0x1.01fd88p-8f) }, +- .pi_over_2 = V4 (0x1.921fb6p+0f), ++ .c0 = V4 (-0x1.55555p-2f), .c1 = 0x1.99935ep-3f, ++ .c2 = V4 (-0x1.24051ep-3f), .c3 = 0x1.bd7368p-4f, ++ .c4 = V4 (-0x1.491f0ep-4f), .c5 = 0x1.93a2c0p-5f, ++ .c6 = V4 (-0x1.4c3c60p-6f), .c7 = 0x1.01fd88p-8f, ++ .pi_over_2 = V4 (0x1.921fb6p+0f), .comp_const = V4 (2 * 0x7f800000lu - 1), + }; + + #define SignMask v_u32 (0x80000000) + + /* Special cases i.e. 0, infinity and nan (fall back to scalar calls). */ + static float32x4_t VPCS_ATTR NOINLINE +-special_case (float32x4_t y, float32x4_t x, float32x4_t ret, uint32x4_t cmp) ++special_case (float32x4_t y, float32x4_t x, float32x4_t ret, ++ uint32x4_t sign_xy, uint32x4_t cmp) + { ++ /* Account for the sign of y. */ ++ ret = vreinterpretq_f32_u32 ( ++ veorq_u32 (vreinterpretq_u32_f32 (ret), sign_xy)); + return v_call2_f32 (atan2f, y, x, ret, cmp); + } + + /* Returns 1 if input is the bit representation of 0, infinity or nan. */ + static inline uint32x4_t +-zeroinfnan (uint32x4_t i) ++zeroinfnan (uint32x4_t i, const struct data *d) + { + /* 2 * i - 1 >= 2 * 0x7f800000lu - 1. */ +- return vcgeq_u32 (vsubq_u32 (vmulq_n_u32 (i, 2), v_u32 (1)), +- v_u32 (2 * 0x7f800000lu - 1)); ++ return vcgeq_u32 (vsubq_u32 (vmulq_n_u32 (i, 2), v_u32 (1)), d->comp_const); + } + + /* Fast implementation of vector atan2f. Maximum observed error is +@@ -58,12 +63,13 @@ zeroinfnan (uint32x4_t i) + want 0x1.967f00p-1. */ + float32x4_t VPCS_ATTR NOINLINE V_NAME_F2 (atan2) (float32x4_t y, float32x4_t x) + { +- const struct data *data_ptr = ptr_barrier (&data); ++ const struct data *d = ptr_barrier (&data); + + uint32x4_t ix = vreinterpretq_u32_f32 (x); + uint32x4_t iy = vreinterpretq_u32_f32 (y); + +- uint32x4_t special_cases = vorrq_u32 (zeroinfnan (ix), zeroinfnan (iy)); ++ uint32x4_t special_cases ++ = vorrq_u32 (zeroinfnan (ix, d), zeroinfnan (iy, d)); + + uint32x4_t sign_x = vandq_u32 (ix, SignMask); + uint32x4_t sign_y = vandq_u32 (iy, SignMask); +@@ -77,14 +83,14 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F2 (atan2) (float32x4_t y, float32x4_t x) + + /* Set up z for call to atanf. */ + float32x4_t n = vbslq_f32 (pred_aygtax, vnegq_f32 (ax), ay); +- float32x4_t d = vbslq_f32 (pred_aygtax, ay, ax); +- float32x4_t z = vdivq_f32 (n, d); ++ float32x4_t q = vbslq_f32 (pred_aygtax, ay, ax); ++ float32x4_t z = vdivq_f32 (n, q); + + /* Work out the correct shift. */ + float32x4_t shift = vreinterpretq_f32_u32 ( + vandq_u32 (pred_xlt0, vreinterpretq_u32_f32 (v_f32 (-2.0f)))); + shift = vbslq_f32 (pred_aygtax, vaddq_f32 (shift, v_f32 (1.0f)), shift); +- shift = vmulq_f32 (shift, data_ptr->pi_over_2); ++ shift = vmulq_f32 (shift, d->pi_over_2); + + /* Calculate the polynomial approximation. + Use 2-level Estrin scheme for P(z^2) with deg(P)=7. However, +@@ -96,23 +102,27 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F2 (atan2) (float32x4_t y, float32x4_t x) + float32x4_t z2 = vmulq_f32 (z, z); + float32x4_t z4 = vmulq_f32 (z2, z2); + +- float32x4_t ret = vfmaq_f32 ( +- v_pairwise_poly_3_f32 (z2, z4, data_ptr->poly), z4, +- vmulq_f32 (z4, v_pairwise_poly_3_f32 (z2, z4, data_ptr->poly + 4))); ++ float32x4_t c1357 = vld1q_f32 (&d->c1); ++ float32x4_t p01 = vfmaq_laneq_f32 (d->c0, z2, c1357, 0); ++ float32x4_t p23 = vfmaq_laneq_f32 (d->c2, z2, c1357, 1); ++ float32x4_t p45 = vfmaq_laneq_f32 (d->c4, z2, c1357, 2); ++ float32x4_t p67 = vfmaq_laneq_f32 (d->c6, z2, c1357, 3); ++ float32x4_t p03 = vfmaq_f32 (p01, z4, p23); ++ float32x4_t p47 = vfmaq_f32 (p45, z4, p67); ++ ++ float32x4_t ret = vfmaq_f32 (p03, z4, vmulq_f32 (z4, p47)); + + /* y = shift + z * P(z^2). */ + ret = vaddq_f32 (vfmaq_f32 (z, ret, vmulq_f32 (z2, z)), shift); + +- /* Account for the sign of y. */ +- ret = vreinterpretq_f32_u32 ( +- veorq_u32 (vreinterpretq_u32_f32 (ret), sign_xy)); +- + if (__glibc_unlikely (v_any_u32 (special_cases))) + { +- return special_case (y, x, ret, special_cases); ++ return special_case (y, x, ret, sign_xy, special_cases); + } + +- return ret; ++ /* Account for the sign of y. */ ++ return vreinterpretq_f32_u32 ( ++ veorq_u32 (vreinterpretq_u32_f32 (ret), sign_xy)); + } + libmvec_hidden_def (V_NAME_F2 (atan2)) + HALF_WIDTH_ALIAS_F2(atan2) +diff --git a/sysdeps/aarch64/fpu/atan_advsimd.c b/sysdeps/aarch64/fpu/atan_advsimd.c +index a962be0f78..14f1809796 100644 +--- a/sysdeps/aarch64/fpu/atan_advsimd.c ++++ b/sysdeps/aarch64/fpu/atan_advsimd.c +@@ -22,21 +22,22 @@ + + static const struct data + { ++ float64x2_t c0, c2, c4, c6, c8, c10, c12, c14, c16, c18; + float64x2_t pi_over_2; +- float64x2_t poly[20]; ++ double c1, c3, c5, c7, c9, c11, c13, c15, c17, c19; + } data = { + /* Coefficients of polynomial P such that atan(x)~x+x*P(x^2) on + [2**-1022, 1.0]. */ +- .poly = { V2 (-0x1.5555555555555p-2), V2 (0x1.99999999996c1p-3), +- V2 (-0x1.2492492478f88p-3), V2 (0x1.c71c71bc3951cp-4), +- V2 (-0x1.745d160a7e368p-4), V2 (0x1.3b139b6a88ba1p-4), +- V2 (-0x1.11100ee084227p-4), V2 (0x1.e1d0f9696f63bp-5), +- V2 (-0x1.aebfe7b418581p-5), V2 (0x1.842dbe9b0d916p-5), +- V2 (-0x1.5d30140ae5e99p-5), V2 (0x1.338e31eb2fbbcp-5), +- V2 (-0x1.00e6eece7de8p-5), V2 (0x1.860897b29e5efp-6), +- V2 (-0x1.0051381722a59p-6), V2 (0x1.14e9dc19a4a4ep-7), +- V2 (-0x1.d0062b42fe3bfp-9), V2 (0x1.17739e210171ap-10), +- V2 (-0x1.ab24da7be7402p-13), V2 (0x1.358851160a528p-16), }, ++ .c0 = V2 (-0x1.5555555555555p-2), .c1 = 0x1.99999999996c1p-3, ++ .c2 = V2 (-0x1.2492492478f88p-3), .c3 = 0x1.c71c71bc3951cp-4, ++ .c4 = V2 (-0x1.745d160a7e368p-4), .c5 = 0x1.3b139b6a88ba1p-4, ++ .c6 = V2 (-0x1.11100ee084227p-4), .c7 = 0x1.e1d0f9696f63bp-5, ++ .c8 = V2 (-0x1.aebfe7b418581p-5), .c9 = 0x1.842dbe9b0d916p-5, ++ .c10 = V2 (-0x1.5d30140ae5e99p-5), .c11 = 0x1.338e31eb2fbbcp-5, ++ .c12 = V2 (-0x1.00e6eece7de8p-5), .c13 = 0x1.860897b29e5efp-6, ++ .c14 = V2 (-0x1.0051381722a59p-6), .c15 = 0x1.14e9dc19a4a4ep-7, ++ .c16 = V2 (-0x1.d0062b42fe3bfp-9), .c17 = 0x1.17739e210171ap-10, ++ .c18 = V2 (-0x1.ab24da7be7402p-13), .c19 = 0x1.358851160a528p-16, + .pi_over_2 = V2 (0x1.921fb54442d18p+0), + }; + +@@ -52,6 +53,11 @@ static const struct data + float64x2_t VPCS_ATTR V_NAME_D1 (atan) (float64x2_t x) + { + const struct data *d = ptr_barrier (&data); ++ float64x2_t c13 = vld1q_f64 (&d->c1); ++ float64x2_t c57 = vld1q_f64 (&d->c5); ++ float64x2_t c911 = vld1q_f64 (&d->c9); ++ float64x2_t c1315 = vld1q_f64 (&d->c13); ++ float64x2_t c1719 = vld1q_f64 (&d->c17); + + /* Small cases, infs and nans are supported by our approximation technique, + but do not set fenv flags correctly. Only trigger special case if we need +@@ -90,9 +96,35 @@ float64x2_t VPCS_ATTR V_NAME_D1 (atan) (float64x2_t x) + float64x2_t x2 = vmulq_f64 (z2, z2); + float64x2_t x4 = vmulq_f64 (x2, x2); + float64x2_t x8 = vmulq_f64 (x4, x4); +- float64x2_t y +- = vfmaq_f64 (v_estrin_7_f64 (z2, x2, x4, d->poly), +- v_estrin_11_f64 (z2, x2, x4, x8, d->poly + 8), x8); ++ ++ /* estrin_7. */ ++ float64x2_t p01 = vfmaq_laneq_f64 (d->c0, z2, c13, 0); ++ float64x2_t p23 = vfmaq_laneq_f64 (d->c2, z2, c13, 1); ++ float64x2_t p03 = vfmaq_f64 (p01, x2, p23); ++ ++ float64x2_t p45 = vfmaq_laneq_f64 (d->c4, z2, c57, 0); ++ float64x2_t p67 = vfmaq_laneq_f64 (d->c6, z2, c57, 1); ++ float64x2_t p47 = vfmaq_f64 (p45, x2, p67); ++ ++ float64x2_t p07 = vfmaq_f64 (p03, x4, p47); ++ ++ /* estrin_11. */ ++ float64x2_t p89 = vfmaq_laneq_f64 (d->c8, z2, c911, 0); ++ float64x2_t p1011 = vfmaq_laneq_f64 (d->c10, z2, c911, 1); ++ float64x2_t p811 = vfmaq_f64 (p89, x2, p1011); ++ ++ float64x2_t p1213 = vfmaq_laneq_f64 (d->c12, z2, c1315, 0); ++ float64x2_t p1415 = vfmaq_laneq_f64 (d->c14, z2, c1315, 1); ++ float64x2_t p1215 = vfmaq_f64 (p1213, x2, p1415); ++ ++ float64x2_t p1617 = vfmaq_laneq_f64 (d->c16, z2, c1719, 0); ++ float64x2_t p1819 = vfmaq_laneq_f64 (d->c18, z2, c1719, 1); ++ float64x2_t p1619 = vfmaq_f64 (p1617, x2, p1819); ++ ++ float64x2_t p815 = vfmaq_f64 (p811, x4, p1215); ++ float64x2_t p819 = vfmaq_f64 (p815, x8, p1619); ++ ++ float64x2_t y = vfmaq_f64 (p07, p819, x8); + + /* Finalize. y = shift + z + z^3 * P(z^2). */ + y = vfmaq_f64 (az, y, vmulq_f64 (z2, az)); + +commit bf2b60a56036c951a798845223a2e04cc48507e4 +Author: Joana Cruz +Date: Tue Dec 17 14:50:33 2024 +0000 + + AArch64: Improve codegen of AdvSIMD expf family + + Load the polynomial evaluation coefficients into 2 vectors and use lanewise MLAs. + Also use intrinsics instead of native operations. + expf: 3% improvement in throughput microbenchmark on Neoverse V1, exp2f: 5%, + exp10f: 13%, coshf: 14%. + + Reviewed-by: Wilco Dijkstra + (cherry picked from commit cff9648d0b50d19cdaf685f6767add040d4e1a8e) + +diff --git a/sysdeps/aarch64/fpu/coshf_advsimd.c b/sysdeps/aarch64/fpu/coshf_advsimd.c +index c1ab4923b8..cd5c866521 100644 +--- a/sysdeps/aarch64/fpu/coshf_advsimd.c ++++ b/sysdeps/aarch64/fpu/coshf_advsimd.c +@@ -23,19 +23,27 @@ + static const struct data + { + struct v_expf_data expf_consts; +- uint32x4_t tiny_bound, special_bound; ++ uint32x4_t tiny_bound; ++ float32x4_t bound; ++#if WANT_SIMD_EXCEPT ++ uint32x4_t special_bound; ++#endif + } data = { + .expf_consts = V_EXPF_DATA, + .tiny_bound = V4 (0x20000000), /* 0x1p-63: Round to 1 below this. */ + /* 0x1.5a92d8p+6: expf overflows above this, so have to use special case. */ ++ .bound = V4 (0x1.5a92d8p+6), ++#if WANT_SIMD_EXCEPT + .special_bound = V4 (0x42ad496c), ++#endif + }; + + #if !WANT_SIMD_EXCEPT + static float32x4_t NOINLINE VPCS_ATTR +-special_case (float32x4_t x, float32x4_t y, uint32x4_t special) ++special_case (float32x4_t x, float32x4_t half_t, float32x4_t half_over_t, ++ uint32x4_t special) + { +- return v_call_f32 (coshf, x, y, special); ++ return v_call_f32 (coshf, x, vaddq_f32 (half_t, half_over_t), special); + } + #endif + +@@ -47,14 +55,13 @@ float32x4_t VPCS_ATTR V_NAME_F1 (cosh) (float32x4_t x) + { + const struct data *d = ptr_barrier (&data); + +- float32x4_t ax = vabsq_f32 (x); +- uint32x4_t iax = vreinterpretq_u32_f32 (ax); +- uint32x4_t special = vcgeq_u32 (iax, d->special_bound); +- + #if WANT_SIMD_EXCEPT + /* If fp exceptions are to be triggered correctly, fall back to the scalar + variant for all inputs if any input is a special value or above the bound + at which expf overflows. */ ++ float32x4_t ax = vabsq_f32 (x); ++ uint32x4_t iax = vreinterpretq_u32_f32 (ax); ++ uint32x4_t special = vcgeq_u32 (iax, d->special_bound); + if (__glibc_unlikely (v_any_u32 (special))) + return v_call_f32 (coshf, x, x, v_u32 (-1)); + +@@ -63,10 +70,13 @@ float32x4_t VPCS_ATTR V_NAME_F1 (cosh) (float32x4_t x) + input to 0, which will generate no exceptions. */ + if (__glibc_unlikely (v_any_u32 (tiny))) + ax = v_zerofy_f32 (ax, tiny); ++ float32x4_t t = v_expf_inline (ax, &d->expf_consts); ++#else ++ uint32x4_t special = vcageq_f32 (x, d->bound); ++ float32x4_t t = v_expf_inline (x, &d->expf_consts); + #endif + + /* Calculate cosh by exp(x) / 2 + exp(-x) / 2. */ +- float32x4_t t = v_expf_inline (ax, &d->expf_consts); + float32x4_t half_t = vmulq_n_f32 (t, 0.5); + float32x4_t half_over_t = vdivq_f32 (v_f32 (0.5), t); + +@@ -75,7 +85,7 @@ float32x4_t VPCS_ATTR V_NAME_F1 (cosh) (float32x4_t x) + return vbslq_f32 (tiny, v_f32 (1), vaddq_f32 (half_t, half_over_t)); + #else + if (__glibc_unlikely (v_any_u32 (special))) +- return special_case (x, vaddq_f32 (half_t, half_over_t), special); ++ return special_case (x, half_t, half_over_t, special); + #endif + + return vaddq_f32 (half_t, half_over_t); +diff --git a/sysdeps/aarch64/fpu/exp10f_advsimd.c b/sysdeps/aarch64/fpu/exp10f_advsimd.c +index cf53e73290..55d9cd83f2 100644 +--- a/sysdeps/aarch64/fpu/exp10f_advsimd.c ++++ b/sysdeps/aarch64/fpu/exp10f_advsimd.c +@@ -18,16 +18,15 @@ + . */ + + #include "v_math.h" +-#include "poly_advsimd_f32.h" + + #define ScaleBound 192.0f + + static const struct data + { +- float32x4_t poly[5]; +- float log10_2_and_inv[4]; +- float32x4_t shift; +- ++ float32x4_t c0, c1, c3; ++ float log10_2_high, log10_2_low, c2, c4; ++ float32x4_t inv_log10_2, special_bound; ++ uint32x4_t exponent_bias, special_offset, special_bias; + #if !WANT_SIMD_EXCEPT + float32x4_t scale_thresh; + #endif +@@ -37,19 +36,24 @@ static const struct data + rel error: 0x1.89dafa3p-24 + abs error: 0x1.167d55p-23 in [-log10(2)/2, log10(2)/2] + maxerr: 1.85943 +0.5 ulp. */ +- .poly = { V4 (0x1.26bb16p+1f), V4 (0x1.5350d2p+1f), V4 (0x1.04744ap+1f), +- V4 (0x1.2d8176p+0f), V4 (0x1.12b41ap-1f) }, +- .shift = V4 (0x1.8p23f), +- +- /* Stores constants 1/log10(2), log10(2)_high, log10(2)_low, 0. */ +- .log10_2_and_inv = { 0x1.a934fp+1, 0x1.344136p-2, -0x1.ec10cp-27, 0 }, ++ .c0 = V4 (0x1.26bb16p+1f), ++ .c1 = V4 (0x1.5350d2p+1f), ++ .c2 = 0x1.04744ap+1f, ++ .c3 = V4 (0x1.2d8176p+0f), ++ .c4 = 0x1.12b41ap-1f, ++ .inv_log10_2 = V4 (0x1.a934fp+1), ++ .log10_2_high = 0x1.344136p-2, ++ .log10_2_low = 0x1.ec10cp-27, ++ /* rint (log2 (2^127 / (1 + sqrt (2)))). */ ++ .special_bound = V4 (126.0f), ++ .exponent_bias = V4 (0x3f800000), ++ .special_offset = V4 (0x82000000), ++ .special_bias = V4 (0x7f000000), + #if !WANT_SIMD_EXCEPT + .scale_thresh = V4 (ScaleBound) + #endif + }; + +-#define ExponentBias v_u32 (0x3f800000) +- + #if WANT_SIMD_EXCEPT + + # define SpecialBound 38.0f /* rint(log10(2^127)). */ +@@ -67,17 +71,15 @@ special_case (float32x4_t x, float32x4_t y, uint32x4_t cmp) + + #else + +-# define SpecialBound 126.0f /* rint (log2 (2^127 / (1 + sqrt (2)))). */ +-# define SpecialOffset v_u32 (0x82000000) +-# define SpecialBias v_u32 (0x7f000000) ++# define SpecialBound 126.0f + + static float32x4_t VPCS_ATTR NOINLINE + special_case (float32x4_t poly, float32x4_t n, uint32x4_t e, uint32x4_t cmp1, + float32x4_t scale, const struct data *d) + { + /* 2^n may overflow, break it up into s1*s2. */ +- uint32x4_t b = vandq_u32 (vclezq_f32 (n), SpecialOffset); +- float32x4_t s1 = vreinterpretq_f32_u32 (vaddq_u32 (b, SpecialBias)); ++ uint32x4_t b = vandq_u32 (vclezq_f32 (n), d->special_offset); ++ float32x4_t s1 = vreinterpretq_f32_u32 (vaddq_u32 (b, d->special_bias)); + float32x4_t s2 = vreinterpretq_f32_u32 (vsubq_u32 (e, b)); + uint32x4_t cmp2 = vcagtq_f32 (n, d->scale_thresh); + float32x4_t r2 = vmulq_f32 (s1, s1); +@@ -112,23 +114,23 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (exp10) (float32x4_t x) + /* exp10(x) = 2^n * 10^r = 2^n * (1 + poly (r)), + with poly(r) in [1/sqrt(2), sqrt(2)] and + x = r + n * log10 (2), with r in [-log10(2)/2, log10(2)/2]. */ +- float32x4_t log10_2_and_inv = vld1q_f32 (d->log10_2_and_inv); +- float32x4_t z = vfmaq_laneq_f32 (d->shift, x, log10_2_and_inv, 0); +- float32x4_t n = vsubq_f32 (z, d->shift); +- float32x4_t r = vfmsq_laneq_f32 (x, n, log10_2_and_inv, 1); +- r = vfmsq_laneq_f32 (r, n, log10_2_and_inv, 2); +- uint32x4_t e = vshlq_n_u32 (vreinterpretq_u32_f32 (z), 23); ++ float32x4_t log10_2_c24 = vld1q_f32 (&d->log10_2_high); ++ float32x4_t n = vrndaq_f32 (vmulq_f32 (x, d->inv_log10_2)); ++ float32x4_t r = vfmsq_laneq_f32 (x, n, log10_2_c24, 0); ++ r = vfmaq_laneq_f32 (r, n, log10_2_c24, 1); ++ uint32x4_t e = vshlq_n_u32 (vreinterpretq_u32_s32 (vcvtaq_s32_f32 (n)), 23); + +- float32x4_t scale = vreinterpretq_f32_u32 (vaddq_u32 (e, ExponentBias)); ++ float32x4_t scale = vreinterpretq_f32_u32 (vaddq_u32 (e, d->exponent_bias)); + + #if !WANT_SIMD_EXCEPT +- uint32x4_t cmp = vcagtq_f32 (n, v_f32 (SpecialBound)); ++ uint32x4_t cmp = vcagtq_f32 (n, d->special_bound); + #endif + + float32x4_t r2 = vmulq_f32 (r, r); +- float32x4_t poly +- = vfmaq_f32 (vmulq_f32 (r, d->poly[0]), +- v_pairwise_poly_3_f32 (r, r2, d->poly + 1), r2); ++ float32x4_t p12 = vfmaq_laneq_f32 (d->c1, r, log10_2_c24, 2); ++ float32x4_t p34 = vfmaq_laneq_f32 (d->c3, r, log10_2_c24, 3); ++ float32x4_t p14 = vfmaq_f32 (p12, r2, p34); ++ float32x4_t poly = vfmaq_f32 (vmulq_f32 (r, d->c0), p14, r2); + + if (__glibc_unlikely (v_any_u32 (cmp))) + #if WANT_SIMD_EXCEPT +diff --git a/sysdeps/aarch64/fpu/exp2f_advsimd.c b/sysdeps/aarch64/fpu/exp2f_advsimd.c +index 69e0b193a1..a4220da63c 100644 +--- a/sysdeps/aarch64/fpu/exp2f_advsimd.c ++++ b/sysdeps/aarch64/fpu/exp2f_advsimd.c +@@ -21,24 +21,28 @@ + + static const struct data + { +- float32x4_t poly[5]; +- uint32x4_t exponent_bias; ++ float32x4_t c1, c3; ++ uint32x4_t exponent_bias, special_offset, special_bias; + #if !WANT_SIMD_EXCEPT +- float32x4_t special_bound, scale_thresh; ++ float32x4_t scale_thresh, special_bound; + #endif ++ float c0, c2, c4, zero; + } data = { + /* maxerr: 1.962 ulp. */ +- .poly = { V4 (0x1.59977ap-10f), V4 (0x1.3ce9e4p-7f), V4 (0x1.c6bd32p-5f), +- V4 (0x1.ebf9bcp-3f), V4 (0x1.62e422p-1f) }, ++ .c0 = 0x1.59977ap-10f, ++ .c1 = V4 (0x1.3ce9e4p-7f), ++ .c2 = 0x1.c6bd32p-5f, ++ .c3 = V4 (0x1.ebf9bcp-3f), ++ .c4 = 0x1.62e422p-1f, + .exponent_bias = V4 (0x3f800000), ++ .special_offset = V4 (0x82000000), ++ .special_bias = V4 (0x7f000000), + #if !WANT_SIMD_EXCEPT + .special_bound = V4 (126.0f), + .scale_thresh = V4 (192.0f), + #endif + }; + +-#define C(i) d->poly[i] +- + #if WANT_SIMD_EXCEPT + + # define TinyBound v_u32 (0x20000000) /* asuint (0x1p-63). */ +@@ -55,16 +59,13 @@ special_case (float32x4_t x, float32x4_t y, uint32x4_t cmp) + + #else + +-# define SpecialOffset v_u32 (0x82000000) +-# define SpecialBias v_u32 (0x7f000000) +- + static float32x4_t VPCS_ATTR NOINLINE + special_case (float32x4_t poly, float32x4_t n, uint32x4_t e, uint32x4_t cmp1, + float32x4_t scale, const struct data *d) + { + /* 2^n may overflow, break it up into s1*s2. */ +- uint32x4_t b = vandq_u32 (vclezq_f32 (n), SpecialOffset); +- float32x4_t s1 = vreinterpretq_f32_u32 (vaddq_u32 (b, SpecialBias)); ++ uint32x4_t b = vandq_u32 (vclezq_f32 (n), d->special_offset); ++ float32x4_t s1 = vreinterpretq_f32_u32 (vaddq_u32 (b, d->special_bias)); + float32x4_t s2 = vreinterpretq_f32_u32 (vsubq_u32 (e, b)); + uint32x4_t cmp2 = vcagtq_f32 (n, d->scale_thresh); + float32x4_t r2 = vmulq_f32 (s1, s1); +@@ -80,13 +81,11 @@ special_case (float32x4_t poly, float32x4_t n, uint32x4_t e, uint32x4_t cmp1, + float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (exp2) (float32x4_t x) + { + const struct data *d = ptr_barrier (&data); +- float32x4_t n, r, r2, scale, p, q, poly; +- uint32x4_t cmp, e; + + #if WANT_SIMD_EXCEPT + /* asuint(|x|) - TinyBound >= BigBound - TinyBound. */ + uint32x4_t ia = vreinterpretq_u32_f32 (vabsq_f32 (x)); +- cmp = vcgeq_u32 (vsubq_u32 (ia, TinyBound), SpecialBound); ++ uint32x4_t cmp = vcgeq_u32 (vsubq_u32 (ia, TinyBound), SpecialBound); + float32x4_t xm = x; + /* If any lanes are special, mask them with 1 and retain a copy of x to allow + special_case to fix special lanes later. This is only necessary if fenv +@@ -95,23 +94,24 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (exp2) (float32x4_t x) + x = vbslq_f32 (cmp, v_f32 (1), x); + #endif + +- /* exp2(x) = 2^n (1 + poly(r)), with 1 + poly(r) in [1/sqrt(2),sqrt(2)] +- x = n + r, with r in [-1/2, 1/2]. */ +- n = vrndaq_f32 (x); +- r = vsubq_f32 (x, n); +- e = vshlq_n_u32 (vreinterpretq_u32_s32 (vcvtaq_s32_f32 (x)), 23); +- scale = vreinterpretq_f32_u32 (vaddq_u32 (e, d->exponent_bias)); ++ /* exp2(x) = 2^n (1 + poly(r)), with 1 + poly(r) in [1/sqrt(2),sqrt(2)] ++ x = n + r, with r in [-1/2, 1/2]. */ ++ float32x4_t n = vrndaq_f32 (x); ++ float32x4_t r = vsubq_f32 (x, n); ++ uint32x4_t e = vshlq_n_u32 (vreinterpretq_u32_s32 (vcvtaq_s32_f32 (x)), 23); ++ float32x4_t scale = vreinterpretq_f32_u32 (vaddq_u32 (e, d->exponent_bias)); + + #if !WANT_SIMD_EXCEPT +- cmp = vcagtq_f32 (n, d->special_bound); ++ uint32x4_t cmp = vcagtq_f32 (n, d->special_bound); + #endif + +- r2 = vmulq_f32 (r, r); +- p = vfmaq_f32 (C (1), C (0), r); +- q = vfmaq_f32 (C (3), C (2), r); ++ float32x4_t c024 = vld1q_f32 (&d->c0); ++ float32x4_t r2 = vmulq_f32 (r, r); ++ float32x4_t p = vfmaq_laneq_f32 (d->c1, r, c024, 0); ++ float32x4_t q = vfmaq_laneq_f32 (d->c3, r, c024, 1); + q = vfmaq_f32 (q, p, r2); +- p = vmulq_f32 (C (4), r); +- poly = vfmaq_f32 (p, q, r2); ++ p = vmulq_laneq_f32 (r, c024, 2); ++ float32x4_t poly = vfmaq_f32 (p, q, r2); + + if (__glibc_unlikely (v_any_u32 (cmp))) + #if WANT_SIMD_EXCEPT +diff --git a/sysdeps/aarch64/fpu/expf_advsimd.c b/sysdeps/aarch64/fpu/expf_advsimd.c +index 5c9cb72620..70f137e2e5 100644 +--- a/sysdeps/aarch64/fpu/expf_advsimd.c ++++ b/sysdeps/aarch64/fpu/expf_advsimd.c +@@ -21,20 +21,25 @@ + + static const struct data + { +- float32x4_t poly[5]; +- float32x4_t inv_ln2, ln2_hi, ln2_lo; +- uint32x4_t exponent_bias; ++ float32x4_t c1, c3, c4, inv_ln2; ++ float ln2_hi, ln2_lo, c0, c2; ++ uint32x4_t exponent_bias, special_offset, special_bias; + #if !WANT_SIMD_EXCEPT + float32x4_t special_bound, scale_thresh; + #endif + } data = { + /* maxerr: 1.45358 +0.5 ulp. */ +- .poly = { V4 (0x1.0e4020p-7f), V4 (0x1.573e2ep-5f), V4 (0x1.555e66p-3f), +- V4 (0x1.fffdb6p-2f), V4 (0x1.ffffecp-1f) }, ++ .c0 = 0x1.0e4020p-7f, ++ .c1 = V4 (0x1.573e2ep-5f), ++ .c2 = 0x1.555e66p-3f, ++ .c3 = V4 (0x1.fffdb6p-2f), ++ .c4 = V4 (0x1.ffffecp-1f), + .inv_ln2 = V4 (0x1.715476p+0f), +- .ln2_hi = V4 (0x1.62e4p-1f), +- .ln2_lo = V4 (0x1.7f7d1cp-20f), ++ .ln2_hi = 0x1.62e4p-1f, ++ .ln2_lo = 0x1.7f7d1cp-20f, + .exponent_bias = V4 (0x3f800000), ++ .special_offset = V4 (0x82000000), ++ .special_bias = V4 (0x7f000000), + #if !WANT_SIMD_EXCEPT + .special_bound = V4 (126.0f), + .scale_thresh = V4 (192.0f), +@@ -59,19 +64,17 @@ special_case (float32x4_t x, float32x4_t y, uint32x4_t cmp) + + #else + +-# define SpecialOffset v_u32 (0x82000000) +-# define SpecialBias v_u32 (0x7f000000) +- + static float32x4_t VPCS_ATTR NOINLINE + special_case (float32x4_t poly, float32x4_t n, uint32x4_t e, uint32x4_t cmp1, + float32x4_t scale, const struct data *d) + { + /* 2^n may overflow, break it up into s1*s2. */ +- uint32x4_t b = vandq_u32 (vclezq_f32 (n), SpecialOffset); +- float32x4_t s1 = vreinterpretq_f32_u32 (vaddq_u32 (b, SpecialBias)); ++ uint32x4_t b = vandq_u32 (vclezq_f32 (n), d->special_offset); ++ float32x4_t s1 = vreinterpretq_f32_u32 (vaddq_u32 (b, d->special_bias)); + float32x4_t s2 = vreinterpretq_f32_u32 (vsubq_u32 (e, b)); + uint32x4_t cmp2 = vcagtq_f32 (n, d->scale_thresh); + float32x4_t r2 = vmulq_f32 (s1, s1); ++ // (s2 + p*s2)*s1 = s2(p+1)s1 + float32x4_t r1 = vmulq_f32 (vfmaq_f32 (s2, poly, s2), s1); + /* Similar to r1 but avoids double rounding in the subnormal range. */ + float32x4_t r0 = vfmaq_f32 (scale, poly, scale); +@@ -84,12 +87,11 @@ special_case (float32x4_t poly, float32x4_t n, uint32x4_t e, uint32x4_t cmp1, + float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (exp) (float32x4_t x) + { + const struct data *d = ptr_barrier (&data); +- float32x4_t n, r, r2, scale, p, q, poly; +- uint32x4_t cmp, e; ++ float32x4_t ln2_c02 = vld1q_f32 (&d->ln2_hi); + + #if WANT_SIMD_EXCEPT + /* asuint(x) - TinyBound >= BigBound - TinyBound. */ +- cmp = vcgeq_u32 ( ++ uint32x4_t cmp = vcgeq_u32 ( + vsubq_u32 (vandq_u32 (vreinterpretq_u32_f32 (x), v_u32 (0x7fffffff)), + TinyBound), + SpecialBound); +@@ -103,22 +105,22 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (exp) (float32x4_t x) + + /* exp(x) = 2^n (1 + poly(r)), with 1 + poly(r) in [1/sqrt(2),sqrt(2)] + x = ln2*n + r, with r in [-ln2/2, ln2/2]. */ +- n = vrndaq_f32 (vmulq_f32 (x, d->inv_ln2)); +- r = vfmsq_f32 (x, n, d->ln2_hi); +- r = vfmsq_f32 (r, n, d->ln2_lo); +- e = vshlq_n_u32 (vreinterpretq_u32_s32 (vcvtq_s32_f32 (n)), 23); +- scale = vreinterpretq_f32_u32 (vaddq_u32 (e, d->exponent_bias)); ++ float32x4_t n = vrndaq_f32 (vmulq_f32 (x, d->inv_ln2)); ++ float32x4_t r = vfmsq_laneq_f32 (x, n, ln2_c02, 0); ++ r = vfmsq_laneq_f32 (r, n, ln2_c02, 1); ++ uint32x4_t e = vshlq_n_u32 (vreinterpretq_u32_s32 (vcvtq_s32_f32 (n)), 23); ++ float32x4_t scale = vreinterpretq_f32_u32 (vaddq_u32 (e, d->exponent_bias)); + + #if !WANT_SIMD_EXCEPT +- cmp = vcagtq_f32 (n, d->special_bound); ++ uint32x4_t cmp = vcagtq_f32 (n, d->special_bound); + #endif + +- r2 = vmulq_f32 (r, r); +- p = vfmaq_f32 (C (1), C (0), r); +- q = vfmaq_f32 (C (3), C (2), r); ++ float32x4_t r2 = vmulq_f32 (r, r); ++ float32x4_t p = vfmaq_laneq_f32 (d->c1, r, ln2_c02, 2); ++ float32x4_t q = vfmaq_laneq_f32 (d->c3, r, ln2_c02, 3); + q = vfmaq_f32 (q, p, r2); +- p = vmulq_f32 (C (4), r); +- poly = vfmaq_f32 (p, q, r2); ++ p = vmulq_f32 (d->c4, r); ++ float32x4_t poly = vfmaq_f32 (p, q, r2); + + if (__glibc_unlikely (v_any_u32 (cmp))) + #if WANT_SIMD_EXCEPT +diff --git a/sysdeps/aarch64/fpu/v_expf_inline.h b/sysdeps/aarch64/fpu/v_expf_inline.h +index 08b06e0a6b..eacd2af241 100644 +--- a/sysdeps/aarch64/fpu/v_expf_inline.h ++++ b/sysdeps/aarch64/fpu/v_expf_inline.h +@@ -24,50 +24,45 @@ + + struct v_expf_data + { +- float32x4_t poly[5]; +- float32x4_t shift; +- float invln2_and_ln2[4]; ++ float ln2_hi, ln2_lo, c0, c2; ++ float32x4_t inv_ln2, c1, c3, c4; ++ /* asuint(1.0f). */ ++ uint32x4_t exponent_bias; + }; + + /* maxerr: 1.45358 +0.5 ulp. */ + #define V_EXPF_DATA \ + { \ +- .poly = { V4 (0x1.0e4020p-7f), V4 (0x1.573e2ep-5f), V4 (0x1.555e66p-3f), \ +- V4 (0x1.fffdb6p-2f), V4 (0x1.ffffecp-1f) }, \ +- .shift = V4 (0x1.8p23f), \ +- .invln2_and_ln2 = { 0x1.715476p+0f, 0x1.62e4p-1f, 0x1.7f7d1cp-20f, 0 }, \ ++ .c0 = 0x1.0e4020p-7f, .c1 = V4 (0x1.573e2ep-5f), .c2 = 0x1.555e66p-3f, \ ++ .c3 = V4 (0x1.fffdb6p-2f), .c4 = V4 (0x1.ffffecp-1f), \ ++ .ln2_hi = 0x1.62e4p-1f, .ln2_lo = 0x1.7f7d1cp-20f, \ ++ .inv_ln2 = V4 (0x1.715476p+0f), .exponent_bias = V4 (0x3f800000), \ + } + +-#define ExponentBias v_u32 (0x3f800000) /* asuint(1.0f). */ +-#define C(i) d->poly[i] +- + static inline float32x4_t + v_expf_inline (float32x4_t x, const struct v_expf_data *d) + { +- /* Helper routine for calculating exp(x). ++ /* Helper routine for calculating exp(ax). + Copied from v_expf.c, with all special-case handling removed - the + calling routine should handle special values if required. */ + +- /* exp(x) = 2^n (1 + poly(r)), with 1 + poly(r) in [1/sqrt(2),sqrt(2)] +- x = ln2*n + r, with r in [-ln2/2, ln2/2]. */ +- float32x4_t n, r, z; +- float32x4_t invln2_and_ln2 = vld1q_f32 (d->invln2_and_ln2); +- z = vfmaq_laneq_f32 (d->shift, x, invln2_and_ln2, 0); +- n = vsubq_f32 (z, d->shift); +- r = vfmsq_laneq_f32 (x, n, invln2_and_ln2, 1); +- r = vfmsq_laneq_f32 (r, n, invln2_and_ln2, 2); +- uint32x4_t e = vshlq_n_u32 (vreinterpretq_u32_f32 (z), 23); +- float32x4_t scale = vreinterpretq_f32_u32 (vaddq_u32 (e, ExponentBias)); ++ /* exp(ax) = 2^n (1 + poly(r)), with 1 + poly(r) in [1/sqrt(2),sqrt(2)] ++ ax = ln2*n + r, with r in [-ln2/2, ln2/2]. */ ++ float32x4_t ax = vabsq_f32 (x); ++ float32x4_t ln2_c02 = vld1q_f32 (&d->ln2_hi); ++ float32x4_t n = vrndaq_f32 (vmulq_f32 (ax, d->inv_ln2)); ++ float32x4_t r = vfmsq_laneq_f32 (ax, n, ln2_c02, 0); ++ r = vfmsq_laneq_f32 (r, n, ln2_c02, 1); ++ uint32x4_t e = vshlq_n_u32 (vreinterpretq_u32_s32 (vcvtq_s32_f32 (n)), 23); ++ float32x4_t scale = vreinterpretq_f32_u32 (vaddq_u32 (e, d->exponent_bias)); + + /* Custom order-4 Estrin avoids building high order monomial. */ + float32x4_t r2 = vmulq_f32 (r, r); +- float32x4_t p, q, poly; +- p = vfmaq_f32 (C (1), C (0), r); +- q = vfmaq_f32 (C (3), C (2), r); ++ float32x4_t p = vfmaq_laneq_f32 (d->c1, r, ln2_c02, 2); ++ float32x4_t q = vfmaq_laneq_f32 (d->c3, r, ln2_c02, 3); + q = vfmaq_f32 (q, p, r2); +- p = vmulq_f32 (C (4), r); +- poly = vfmaq_f32 (p, q, r2); ++ p = vmulq_f32 (d->c4, r); ++ float32x4_t poly = vfmaq_f32 (p, q, r2); + return vfmaq_f32 (scale, poly, scale); + } +- + #endif + +commit abfd20ebbd2883f2c6e5f16709f7b9781c3c8068 +Author: Luna Lamb +Date: Fri Jan 3 19:00:12 2025 +0000 + + AArch64: Improve codegen in AdvSIMD asinh + + Improves memory access and removes spills. + Load the polynomial evaluation coefficients into 2 vectors and use lanewise + MLAs. Reduces MOVs 6->3 , LDR 11->5, STR/STP 2->0, ADRP 3->2. + + (cherry picked from commit 140b985e5a2071000122b3cb63ebfe88cf21dd29) + +diff --git a/sysdeps/aarch64/fpu/asinh_advsimd.c b/sysdeps/aarch64/fpu/asinh_advsimd.c +index 6207e7da95..2739f98b39 100644 +--- a/sysdeps/aarch64/fpu/asinh_advsimd.c ++++ b/sysdeps/aarch64/fpu/asinh_advsimd.c +@@ -20,41 +20,71 @@ + #include "v_math.h" + #include "poly_advsimd_f64.h" + +-#define A(i) v_f64 (__v_log_data.poly[i]) +-#define N (1 << V_LOG_TABLE_BITS) +-#define IndexMask (N - 1) +- + const static struct data + { +- float64x2_t poly[18]; +- uint64x2_t off, huge_bound, abs_mask; +- float64x2_t ln2, tiny_bound; ++ uint64x2_t huge_bound, abs_mask, off, mask; ++#if WANT_SIMD_EXCEPT ++ float64x2_t tiny_bound; ++#endif ++ float64x2_t lc0, lc2; ++ double lc1, lc3, ln2, lc4; ++ ++ float64x2_t c0, c2, c4, c6, c8, c10, c12, c14, c16, c17; ++ double c1, c3, c5, c7, c9, c11, c13, c15; ++ + } data = { +- .off = V2 (0x3fe6900900000000), +- .ln2 = V2 (0x1.62e42fefa39efp-1), +- .huge_bound = V2 (0x5fe0000000000000), ++ ++#if WANT_SIMD_EXCEPT + .tiny_bound = V2 (0x1p-26), +- .abs_mask = V2 (0x7fffffffffffffff), ++#endif + /* Even terms of polynomial s.t. asinh(x) is approximated by + asinh(x) ~= x + x^3 * (C0 + C1 * x + C2 * x^2 + C3 * x^3 + ...). + Generated using Remez, f = (asinh(sqrt(x)) - sqrt(x))/x^(3/2). */ +- .poly = { V2 (-0x1.55555555554a7p-3), V2 (0x1.3333333326c7p-4), +- V2 (-0x1.6db6db68332e6p-5), V2 (0x1.f1c71b26fb40dp-6), +- V2 (-0x1.6e8b8b654a621p-6), V2 (0x1.1c4daa9e67871p-6), +- V2 (-0x1.c9871d10885afp-7), V2 (0x1.7a16e8d9d2ecfp-7), +- V2 (-0x1.3ddca533e9f54p-7), V2 (0x1.0becef748dafcp-7), +- V2 (-0x1.b90c7099dd397p-8), V2 (0x1.541f2bb1ffe51p-8), +- V2 (-0x1.d217026a669ecp-9), V2 (0x1.0b5c7977aaf7p-9), +- V2 (-0x1.e0f37daef9127p-11), V2 (0x1.388b5fe542a6p-12), +- V2 (-0x1.021a48685e287p-14), V2 (0x1.93d4ba83d34dap-18) }, ++ ++ .c0 = V2 (-0x1.55555555554a7p-3), ++ .c1 = 0x1.3333333326c7p-4, ++ .c2 = V2 (-0x1.6db6db68332e6p-5), ++ .c3 = 0x1.f1c71b26fb40dp-6, ++ .c4 = V2 (-0x1.6e8b8b654a621p-6), ++ .c5 = 0x1.1c4daa9e67871p-6, ++ .c6 = V2 (-0x1.c9871d10885afp-7), ++ .c7 = 0x1.7a16e8d9d2ecfp-7, ++ .c8 = V2 (-0x1.3ddca533e9f54p-7), ++ .c9 = 0x1.0becef748dafcp-7, ++ .c10 = V2 (-0x1.b90c7099dd397p-8), ++ .c11 = 0x1.541f2bb1ffe51p-8, ++ .c12 = V2 (-0x1.d217026a669ecp-9), ++ .c13 = 0x1.0b5c7977aaf7p-9, ++ .c14 = V2 (-0x1.e0f37daef9127p-11), ++ .c15 = 0x1.388b5fe542a6p-12, ++ .c16 = V2 (-0x1.021a48685e287p-14), ++ .c17 = V2 (0x1.93d4ba83d34dap-18), ++ ++ .lc0 = V2 (-0x1.ffffffffffff7p-2), ++ .lc1 = 0x1.55555555170d4p-2, ++ .lc2 = V2 (-0x1.0000000399c27p-2), ++ .lc3 = 0x1.999b2e90e94cap-3, ++ .lc4 = -0x1.554e550bd501ep-3, ++ .ln2 = 0x1.62e42fefa39efp-1, ++ ++ .off = V2 (0x3fe6900900000000), ++ .huge_bound = V2 (0x5fe0000000000000), ++ .abs_mask = V2 (0x7fffffffffffffff), ++ .mask = V2 (0xfffULL << 52), + }; + + static float64x2_t NOINLINE VPCS_ATTR +-special_case (float64x2_t x, float64x2_t y, uint64x2_t special) ++special_case (float64x2_t x, float64x2_t y, uint64x2_t abs_mask, ++ uint64x2_t special) + { ++ /* Copy sign. */ ++ y = vbslq_f64 (abs_mask, y, x); + return v_call_f64 (asinh, x, y, special); + } + ++#define N (1 << V_LOG_TABLE_BITS) ++#define IndexMask (N - 1) ++ + struct entry + { + float64x2_t invc; +@@ -76,27 +106,34 @@ lookup (uint64x2_t i) + } + + static inline float64x2_t +-log_inline (float64x2_t x, const struct data *d) ++log_inline (float64x2_t xm, const struct data *d) + { +- /* Double-precision vector log, copied from ordinary vector log with some +- cosmetic modification and special-cases removed. */ +- uint64x2_t ix = vreinterpretq_u64_f64 (x); +- uint64x2_t tmp = vsubq_u64 (ix, d->off); +- int64x2_t k = vshrq_n_s64 (vreinterpretq_s64_u64 (tmp), 52); +- uint64x2_t iz +- = vsubq_u64 (ix, vandq_u64 (tmp, vdupq_n_u64 (0xfffULL << 52))); ++ ++ uint64x2_t u = vreinterpretq_u64_f64 (xm); ++ uint64x2_t u_off = vsubq_u64 (u, d->off); ++ ++ int64x2_t k = vshrq_n_s64 (vreinterpretq_s64_u64 (u_off), 52); ++ uint64x2_t iz = vsubq_u64 (u, vandq_u64 (u_off, d->mask)); + float64x2_t z = vreinterpretq_f64_u64 (iz); +- struct entry e = lookup (tmp); ++ ++ struct entry e = lookup (u_off); ++ ++ /* log(x) = log1p(z/c-1) + log(c) + k*Ln2. */ + float64x2_t r = vfmaq_f64 (v_f64 (-1.0), z, e.invc); + float64x2_t kd = vcvtq_f64_s64 (k); +- float64x2_t hi = vfmaq_f64 (vaddq_f64 (e.logc, r), kd, d->ln2); ++ ++ /* hi = r + log(c) + k*Ln2. */ ++ float64x2_t ln2_and_lc4 = vld1q_f64 (&d->ln2); ++ float64x2_t hi = vfmaq_laneq_f64 (vaddq_f64 (e.logc, r), kd, ln2_and_lc4, 0); ++ ++ /* y = r2*(A0 + r*A1 + r2*(A2 + r*A3 + r2*A4)) + hi. */ ++ float64x2_t odd_coeffs = vld1q_f64 (&d->lc1); + float64x2_t r2 = vmulq_f64 (r, r); +- float64x2_t y = vfmaq_f64 (A (2), A (3), r); +- float64x2_t p = vfmaq_f64 (A (0), A (1), r); +- y = vfmaq_f64 (y, A (4), r2); +- y = vfmaq_f64 (p, y, r2); +- y = vfmaq_f64 (hi, y, r2); +- return y; ++ float64x2_t y = vfmaq_laneq_f64 (d->lc2, r, odd_coeffs, 1); ++ float64x2_t p = vfmaq_laneq_f64 (d->lc0, r, odd_coeffs, 0); ++ y = vfmaq_laneq_f64 (y, r2, ln2_and_lc4, 1); ++ y = vfmaq_f64 (p, r2, y); ++ return vfmaq_f64 (hi, y, r2); + } + + /* Double-precision implementation of vector asinh(x). +@@ -106,23 +143,24 @@ log_inline (float64x2_t x, const struct data *d) + asinh(x) = sign(x) * log(|x| + sqrt(x^2 + 1) if |x| >= 1 + = sign(x) * (|x| + |x|^3 * P(x^2)) otherwise + where log(x) is an optimized log approximation, and P(x) is a polynomial +- shared with the scalar routine. The greatest observed error 3.29 ULP, in ++ shared with the scalar routine. The greatest observed error 2.79 ULP, in + |x| >= 1: +- __v_asinh(0x1.2cd9d717e2c9bp+0) got 0x1.ffffcfd0e234fp-1 +- want 0x1.ffffcfd0e2352p-1. */ ++ _ZGVnN2v_asinh(0x1.2cd9d73ea76a6p+0) got 0x1.ffffd003219dap-1 ++ want 0x1.ffffd003219ddp-1. */ + VPCS_ATTR float64x2_t V_NAME_D1 (asinh) (float64x2_t x) + { + const struct data *d = ptr_barrier (&data); +- + float64x2_t ax = vabsq_f64 (x); +- uint64x2_t iax = vreinterpretq_u64_f64 (ax); + + uint64x2_t gt1 = vcgeq_f64 (ax, v_f64 (1)); +- uint64x2_t special = vcgeq_u64 (iax, d->huge_bound); + + #if WANT_SIMD_EXCEPT ++ uint64x2_t iax = vreinterpretq_u64_f64 (ax); ++ uint64x2_t special = vcgeq_u64 (iax, (d->huge_bound)); + uint64x2_t tiny = vcltq_f64 (ax, d->tiny_bound); + special = vorrq_u64 (special, tiny); ++#else ++ uint64x2_t special = vcgeq_f64 (ax, vreinterpretq_f64_u64 (d->huge_bound)); + #endif + + /* Option 1: |x| >= 1. +@@ -147,19 +185,45 @@ VPCS_ATTR float64x2_t V_NAME_D1 (asinh) (float64x2_t x) + overflow, and tiny lanes, which will underflow, by setting them to 0. They + will be fixed later, either by selecting x or falling back to the scalar + special-case. The largest observed error in this region is 1.47 ULPs: +- __v_asinh(0x1.fdfcd00cc1e6ap-1) got 0x1.c1d6bf874019bp-1 +- want 0x1.c1d6bf874019cp-1. */ ++ _ZGVnN2v_asinh(0x1.fdfcd00cc1e6ap-1) got 0x1.c1d6bf874019bp-1 ++ want 0x1.c1d6bf874019cp-1. */ + float64x2_t option_2 = v_f64 (0); ++ + if (__glibc_likely (v_any_u64 (vceqzq_u64 (gt1)))) + { ++ + #if WANT_SIMD_EXCEPT + ax = v_zerofy_f64 (ax, vorrq_u64 (tiny, gt1)); + #endif +- float64x2_t x2 = vmulq_f64 (ax, ax), x3 = vmulq_f64 (ax, x2), +- z2 = vmulq_f64 (x2, x2), z4 = vmulq_f64 (z2, z2), +- z8 = vmulq_f64 (z4, z4), z16 = vmulq_f64 (z8, z8); +- float64x2_t p = v_estrin_17_f64 (x2, z2, z4, z8, z16, d->poly); +- option_2 = vfmaq_f64 (ax, p, x3); ++ float64x2_t x2 = vmulq_f64 (ax, ax), z2 = vmulq_f64 (x2, x2); ++ /* Order-17 Pairwise Horner scheme. */ ++ float64x2_t c13 = vld1q_f64 (&d->c1); ++ float64x2_t c57 = vld1q_f64 (&d->c5); ++ float64x2_t c911 = vld1q_f64 (&d->c9); ++ float64x2_t c1315 = vld1q_f64 (&d->c13); ++ ++ float64x2_t p01 = vfmaq_laneq_f64 (d->c0, x2, c13, 0); ++ float64x2_t p23 = vfmaq_laneq_f64 (d->c2, x2, c13, 1); ++ float64x2_t p45 = vfmaq_laneq_f64 (d->c4, x2, c57, 0); ++ float64x2_t p67 = vfmaq_laneq_f64 (d->c6, x2, c57, 1); ++ float64x2_t p89 = vfmaq_laneq_f64 (d->c8, x2, c911, 0); ++ float64x2_t p1011 = vfmaq_laneq_f64 (d->c10, x2, c911, 1); ++ float64x2_t p1213 = vfmaq_laneq_f64 (d->c12, x2, c1315, 0); ++ float64x2_t p1415 = vfmaq_laneq_f64 (d->c14, x2, c1315, 1); ++ float64x2_t p1617 = vfmaq_f64 (d->c16, x2, d->c17); ++ ++ float64x2_t p = vfmaq_f64 (p1415, z2, p1617); ++ p = vfmaq_f64 (p1213, z2, p); ++ p = vfmaq_f64 (p1011, z2, p); ++ p = vfmaq_f64 (p89, z2, p); ++ ++ p = vfmaq_f64 (p67, z2, p); ++ p = vfmaq_f64 (p45, z2, p); ++ ++ p = vfmaq_f64 (p23, z2, p); ++ ++ p = vfmaq_f64 (p01, z2, p); ++ option_2 = vfmaq_f64 (ax, p, vmulq_f64 (ax, x2)); + #if WANT_SIMD_EXCEPT + option_2 = vbslq_f64 (tiny, x, option_2); + #endif +@@ -167,10 +231,10 @@ VPCS_ATTR float64x2_t V_NAME_D1 (asinh) (float64x2_t x) + + /* Choose the right option for each lane. */ + float64x2_t y = vbslq_f64 (gt1, option_1, option_2); +- /* Copy sign. */ +- y = vbslq_f64 (d->abs_mask, y, x); +- + if (__glibc_unlikely (v_any_u64 (special))) +- return special_case (x, y, special); +- return y; ++ { ++ return special_case (x, y, d->abs_mask, special); ++ } ++ /* Copy sign. */ ++ return vbslq_f64 (d->abs_mask, y, x); + } + +commit 5f45c0f91eae99b7d49f5c63b900441eb3491213 +Author: Luna Lamb +Date: Fri Jan 3 19:02:52 2025 +0000 + + AArch64: Improve codegen in SVE tans + + Improves memory access. + Tan: MOVPRFX 7 -> 2, LD1RD 12 -> 5, move MOV away from return. + Tanf: MOV 2 -> 1, MOVPRFX 6 -> 3, LD1RW 5 -> 4, move mov away from return. + + (cherry picked from commit aa6609feb20ebf8653db639dabe2a6afc77b02cc) + +diff --git a/sysdeps/aarch64/fpu/tan_sve.c b/sysdeps/aarch64/fpu/tan_sve.c +index b2e4447316..a7318fd417 100644 +--- a/sysdeps/aarch64/fpu/tan_sve.c ++++ b/sysdeps/aarch64/fpu/tan_sve.c +@@ -22,24 +22,38 @@ + + static const struct data + { +- double poly[9]; +- double half_pi_hi, half_pi_lo, inv_half_pi, range_val, shift; ++ double c2, c4, c6, c8; ++ double poly_1357[4]; ++ double c0, inv_half_pi; ++ double half_pi_hi, half_pi_lo, range_val; + } data = { + /* Polynomial generated with FPMinimax. */ +- .poly = { 0x1.5555555555556p-2, 0x1.1111111110a63p-3, 0x1.ba1ba1bb46414p-5, +- 0x1.664f47e5b5445p-6, 0x1.226e5e5ecdfa3p-7, 0x1.d6c7ddbf87047p-9, +- 0x1.7ea75d05b583ep-10, 0x1.289f22964a03cp-11, +- 0x1.4e4fd14147622p-12, }, ++ .c2 = 0x1.ba1ba1bb46414p-5, ++ .c4 = 0x1.226e5e5ecdfa3p-7, ++ .c6 = 0x1.7ea75d05b583ep-10, ++ .c8 = 0x1.4e4fd14147622p-12, ++ .poly_1357 = { 0x1.1111111110a63p-3, 0x1.664f47e5b5445p-6, ++ 0x1.d6c7ddbf87047p-9, 0x1.289f22964a03cp-11 }, ++ .c0 = 0x1.5555555555556p-2, ++ .inv_half_pi = 0x1.45f306dc9c883p-1, + .half_pi_hi = 0x1.921fb54442d18p0, + .half_pi_lo = 0x1.1a62633145c07p-54, +- .inv_half_pi = 0x1.45f306dc9c883p-1, + .range_val = 0x1p23, +- .shift = 0x1.8p52, + }; + + static svfloat64_t NOINLINE +-special_case (svfloat64_t x, svfloat64_t y, svbool_t special) ++special_case (svfloat64_t x, svfloat64_t p, svfloat64_t q, svbool_t pg, ++ svbool_t special) + { ++ svbool_t use_recip = svcmpeq ( ++ pg, svand_x (pg, svreinterpret_u64 (svcvt_s64_x (pg, q)), 1), 0); ++ ++ svfloat64_t n = svmad_x (pg, p, p, -1); ++ svfloat64_t d = svmul_x (svptrue_b64 (), p, 2); ++ svfloat64_t swap = n; ++ n = svneg_m (n, use_recip, d); ++ d = svsel (use_recip, swap, d); ++ svfloat64_t y = svdiv_x (svnot_z (pg, special), n, d); + return sv_call_f64 (tan, x, y, special); + } + +@@ -50,15 +64,10 @@ special_case (svfloat64_t x, svfloat64_t y, svbool_t special) + svfloat64_t SV_NAME_D1 (tan) (svfloat64_t x, svbool_t pg) + { + const struct data *dat = ptr_barrier (&data); +- +- /* Invert condition to catch NaNs and Infs as well as large values. */ +- svbool_t special = svnot_z (pg, svaclt (pg, x, dat->range_val)); +- ++ svfloat64_t half_pi_c0 = svld1rq (svptrue_b64 (), &dat->c0); + /* q = nearest integer to 2 * x / pi. */ +- svfloat64_t shift = sv_f64 (dat->shift); +- svfloat64_t q = svmla_x (pg, shift, x, dat->inv_half_pi); +- q = svsub_x (pg, q, shift); +- svint64_t qi = svcvt_s64_x (pg, q); ++ svfloat64_t q = svmul_lane (x, half_pi_c0, 1); ++ q = svrinta_x (pg, q); + + /* Use q to reduce x to r in [-pi/4, pi/4], by: + r = x - q * pi/2, in extended precision. */ +@@ -68,7 +77,7 @@ svfloat64_t SV_NAME_D1 (tan) (svfloat64_t x, svbool_t pg) + r = svmls_lane (r, q, half_pi, 1); + /* Further reduce r to [-pi/8, pi/8], to be reconstructed using double angle + formula. */ +- r = svmul_x (pg, r, 0.5); ++ r = svmul_x (svptrue_b64 (), r, 0.5); + + /* Approximate tan(r) using order 8 polynomial. + tan(x) is odd, so polynomial has the form: +@@ -76,29 +85,51 @@ svfloat64_t SV_NAME_D1 (tan) (svfloat64_t x, svbool_t pg) + Hence we first approximate P(r) = C1 + C2 * r^2 + C3 * r^4 + ... + Then compute the approximation by: + tan(r) ~= r + r^3 * (C0 + r^2 * P(r)). */ +- svfloat64_t r2 = svmul_x (pg, r, r); +- svfloat64_t r4 = svmul_x (pg, r2, r2); +- svfloat64_t r8 = svmul_x (pg, r4, r4); ++ ++ svfloat64_t r2 = svmul_x (svptrue_b64 (), r, r); ++ svfloat64_t r4 = svmul_x (svptrue_b64 (), r2, r2); ++ svfloat64_t r8 = svmul_x (svptrue_b64 (), r4, r4); + /* Use offset version coeff array by 1 to evaluate from C1 onwards. */ +- svfloat64_t p = sv_estrin_7_f64_x (pg, r2, r4, r8, dat->poly + 1); +- p = svmad_x (pg, p, r2, dat->poly[0]); +- p = svmla_x (pg, r, r2, svmul_x (pg, p, r)); ++ svfloat64_t C_24 = svld1rq (svptrue_b64 (), &dat->c2); ++ svfloat64_t C_68 = svld1rq (svptrue_b64 (), &dat->c6); ++ ++ /* Use offset version coeff array by 1 to evaluate from C1 onwards. */ ++ svfloat64_t p01 = svmla_lane (sv_f64 (dat->poly_1357[0]), r2, C_24, 0); ++ svfloat64_t p23 = svmla_lane_f64 (sv_f64 (dat->poly_1357[1]), r2, C_24, 1); ++ svfloat64_t p03 = svmla_x (pg, p01, p23, r4); ++ ++ svfloat64_t p45 = svmla_lane (sv_f64 (dat->poly_1357[2]), r2, C_68, 0); ++ svfloat64_t p67 = svmla_lane (sv_f64 (dat->poly_1357[3]), r2, C_68, 1); ++ svfloat64_t p47 = svmla_x (pg, p45, p67, r4); ++ ++ svfloat64_t p = svmla_x (pg, p03, p47, r8); ++ ++ svfloat64_t z = svmul_x (svptrue_b64 (), p, r); ++ z = svmul_x (svptrue_b64 (), r2, z); ++ z = svmla_lane (z, r, half_pi_c0, 0); ++ p = svmla_x (pg, r, r2, z); + + /* Recombination uses double-angle formula: + tan(2x) = 2 * tan(x) / (1 - (tan(x))^2) + and reciprocity around pi/2: + tan(x) = 1 / (tan(pi/2 - x)) + to assemble result using change-of-sign and conditional selection of +- numerator/denominator dependent on odd/even-ness of q (hence quadrant). */ +- svbool_t use_recip +- = svcmpeq (pg, svand_x (pg, svreinterpret_u64 (qi), 1), 0); ++ numerator/denominator dependent on odd/even-ness of q (quadrant). */ ++ ++ /* Invert condition to catch NaNs and Infs as well as large values. */ ++ svbool_t special = svnot_z (pg, svaclt (pg, x, dat->range_val)); ++ ++ if (__glibc_unlikely (svptest_any (pg, special))) ++ { ++ return special_case (x, p, q, pg, special); ++ } ++ svbool_t use_recip = svcmpeq ( ++ pg, svand_x (pg, svreinterpret_u64 (svcvt_s64_x (pg, q)), 1), 0); + + svfloat64_t n = svmad_x (pg, p, p, -1); +- svfloat64_t d = svmul_x (pg, p, 2); ++ svfloat64_t d = svmul_x (svptrue_b64 (), p, 2); + svfloat64_t swap = n; + n = svneg_m (n, use_recip, d); + d = svsel (use_recip, swap, d); +- if (__glibc_unlikely (svptest_any (pg, special))) +- return special_case (x, svdiv_x (svnot_z (pg, special), n, d), special); + return svdiv_x (pg, n, d); + } +diff --git a/sysdeps/aarch64/fpu/tanf_sve.c b/sysdeps/aarch64/fpu/tanf_sve.c +index f342583241..e850fb4882 100644 +--- a/sysdeps/aarch64/fpu/tanf_sve.c ++++ b/sysdeps/aarch64/fpu/tanf_sve.c +@@ -60,21 +60,16 @@ svfloat32_t SV_NAME_F1 (tan) (svfloat32_t x, const svbool_t pg) + { + const struct data *d = ptr_barrier (&data); + +- /* Determine whether input is too large to perform fast regression. */ +- svbool_t cmp = svacge (pg, x, d->range_val); +- + svfloat32_t odd_coeffs = svld1rq (svptrue_b32 (), &d->c1); + svfloat32_t pi_vals = svld1rq (svptrue_b32 (), &d->pio2_1); + + /* n = rint(x/(pi/2)). */ +- svfloat32_t q = svmla_lane (sv_f32 (d->shift), x, pi_vals, 3); +- svfloat32_t n = svsub_x (pg, q, d->shift); ++ svfloat32_t n = svrintn_x (pg, svmul_lane (x, pi_vals, 3)); + /* n is already a signed integer, simply convert it. */ + svint32_t in = svcvt_s32_x (pg, n); + /* Determine if x lives in an interval, where |tan(x)| grows to infinity. */ + svint32_t alt = svand_x (pg, in, 1); + svbool_t pred_alt = svcmpne (pg, alt, 0); +- + /* r = x - n * (pi/2) (range reduction into 0 .. pi/4). */ + svfloat32_t r; + r = svmls_lane (x, n, pi_vals, 0); +@@ -93,7 +88,7 @@ svfloat32_t SV_NAME_F1 (tan) (svfloat32_t x, const svbool_t pg) + + /* Evaluate polynomial approximation of tangent on [-pi/4, pi/4], + using Estrin on z^2. */ +- svfloat32_t z2 = svmul_x (pg, z, z); ++ svfloat32_t z2 = svmul_x (svptrue_b32 (), r, r); + svfloat32_t p01 = svmla_lane (sv_f32 (d->c0), z2, odd_coeffs, 0); + svfloat32_t p23 = svmla_lane (sv_f32 (d->c2), z2, odd_coeffs, 1); + svfloat32_t p45 = svmla_lane (sv_f32 (d->c4), z2, odd_coeffs, 2); +@@ -106,13 +101,14 @@ svfloat32_t SV_NAME_F1 (tan) (svfloat32_t x, const svbool_t pg) + + svfloat32_t y = svmla_x (pg, z, p, svmul_x (pg, z, z2)); + +- /* Transform result back, if necessary. */ +- svfloat32_t inv_y = svdivr_x (pg, y, 1.0f); +- + /* No need to pass pg to specialcase here since cmp is a strict subset, + guaranteed by the cmpge above. */ ++ ++ /* Determine whether input is too large to perform fast regression. */ ++ svbool_t cmp = svacge (pg, x, d->range_val); + if (__glibc_unlikely (svptest_any (pg, cmp))) +- return special_case (x, svsel (pred_alt, inv_y, y), cmp); ++ return special_case (x, svdivr_x (pg, y, 1.0f), cmp); + ++ svfloat32_t inv_y = svdivr_x (pg, y, 1.0f); + return svsel (pred_alt, inv_y, y); + } + +commit ab5ba6c188159bb5e12be95cd90458924c2fe592 +Author: Yat Long Poon +Date: Fri Jan 3 19:07:30 2025 +0000 + + AArch64: Improve codegen for SVE logs + + Reduce memory access by using lanewise MLA and moving constants to struct + and reduce number of MOVPRFXs. + Update maximum ULP error for double log_sve from 1 to 2. + Speedup on Neoverse V1 for log (3%), log2 (5%), and log10 (4%). + + (cherry picked from commit 32d193a372feb28f9da247bb7283d404b84429c6) + +diff --git a/sysdeps/aarch64/fpu/log10_sve.c b/sysdeps/aarch64/fpu/log10_sve.c +index ab7362128d..f1cad2759a 100644 +--- a/sysdeps/aarch64/fpu/log10_sve.c ++++ b/sysdeps/aarch64/fpu/log10_sve.c +@@ -23,28 +23,49 @@ + #define Min 0x0010000000000000 + #define Max 0x7ff0000000000000 + #define Thres 0x7fe0000000000000 /* Max - Min. */ +-#define Off 0x3fe6900900000000 + #define N (1 << V_LOG10_TABLE_BITS) + ++static const struct data ++{ ++ double c0, c2; ++ double c1, c3; ++ double invln10, log10_2; ++ double c4; ++ uint64_t off; ++} data = { ++ .c0 = -0x1.bcb7b1526e506p-3, ++ .c1 = 0x1.287a7636be1d1p-3, ++ .c2 = -0x1.bcb7b158af938p-4, ++ .c3 = 0x1.63c78734e6d07p-4, ++ .c4 = -0x1.287461742fee4p-4, ++ .invln10 = 0x1.bcb7b1526e50ep-2, ++ .log10_2 = 0x1.34413509f79ffp-2, ++ .off = 0x3fe6900900000000, ++}; ++ + static svfloat64_t NOINLINE +-special_case (svfloat64_t x, svfloat64_t y, svbool_t special) ++special_case (svfloat64_t hi, svuint64_t tmp, svfloat64_t y, svfloat64_t r2, ++ svbool_t special, const struct data *d) + { +- return sv_call_f64 (log10, x, y, special); ++ svfloat64_t x = svreinterpret_f64 (svadd_x (svptrue_b64 (), tmp, d->off)); ++ return sv_call_f64 (log10, x, svmla_x (svptrue_b64 (), hi, r2, y), special); + } + +-/* SVE log10 algorithm. ++/* Double-precision SVE log10 routine. + Maximum measured error is 2.46 ulps. + SV_NAME_D1 (log10)(0x1.131956cd4b627p+0) got 0x1.fffbdf6eaa669p-6 + want 0x1.fffbdf6eaa667p-6. */ + svfloat64_t SV_NAME_D1 (log10) (svfloat64_t x, const svbool_t pg) + { ++ const struct data *d = ptr_barrier (&data); ++ + svuint64_t ix = svreinterpret_u64 (x); + svbool_t special = svcmpge (pg, svsub_x (pg, ix, Min), Thres); + + /* x = 2^k z; where z is in range [Off,2*Off) and exact. + The range is split into N subintervals. + The ith subinterval contains z and c is near its center. */ +- svuint64_t tmp = svsub_x (pg, ix, Off); ++ svuint64_t tmp = svsub_x (pg, ix, d->off); + svuint64_t i = svlsr_x (pg, tmp, 51 - V_LOG10_TABLE_BITS); + i = svand_x (pg, i, (N - 1) << 1); + svfloat64_t k = svcvt_f64_x (pg, svasr_x (pg, svreinterpret_s64 (tmp), 52)); +@@ -62,15 +83,19 @@ svfloat64_t SV_NAME_D1 (log10) (svfloat64_t x, const svbool_t pg) + svfloat64_t r = svmad_x (pg, invc, z, -1.0); + + /* hi = log(c) + k*log(2). */ +- svfloat64_t w = svmla_x (pg, logc, r, __v_log10_data.invln10); +- svfloat64_t hi = svmla_x (pg, w, k, __v_log10_data.log10_2); ++ svfloat64_t invln10_log10_2 = svld1rq_f64 (svptrue_b64 (), &d->invln10); ++ svfloat64_t w = svmla_lane_f64 (logc, r, invln10_log10_2, 0); ++ svfloat64_t hi = svmla_lane_f64 (w, k, invln10_log10_2, 1); + + /* y = r2*(A0 + r*A1 + r2*(A2 + r*A3 + r2*A4)) + hi. */ +- svfloat64_t r2 = svmul_x (pg, r, r); +- svfloat64_t y = sv_pw_horner_4_f64_x (pg, r, r2, __v_log10_data.poly); ++ svfloat64_t odd_coeffs = svld1rq_f64 (svptrue_b64 (), &d->c1); ++ svfloat64_t r2 = svmul_x (svptrue_b64 (), r, r); ++ svfloat64_t y = svmla_lane_f64 (sv_f64 (d->c2), r, odd_coeffs, 1); ++ svfloat64_t p = svmla_lane_f64 (sv_f64 (d->c0), r, odd_coeffs, 0); ++ y = svmla_x (pg, y, r2, d->c4); ++ y = svmla_x (pg, p, r2, y); + + if (__glibc_unlikely (svptest_any (pg, special))) +- return special_case (x, svmla_x (svnot_z (pg, special), hi, r2, y), +- special); ++ return special_case (hi, tmp, y, r2, special, d); + return svmla_x (pg, hi, r2, y); + } +diff --git a/sysdeps/aarch64/fpu/log2_sve.c b/sysdeps/aarch64/fpu/log2_sve.c +index 743fa2a913..908e638246 100644 +--- a/sysdeps/aarch64/fpu/log2_sve.c ++++ b/sysdeps/aarch64/fpu/log2_sve.c +@@ -21,15 +21,32 @@ + #include "poly_sve_f64.h" + + #define N (1 << V_LOG2_TABLE_BITS) +-#define Off 0x3fe6900900000000 + #define Max (0x7ff0000000000000) + #define Min (0x0010000000000000) + #define Thresh (0x7fe0000000000000) /* Max - Min. */ + ++static const struct data ++{ ++ double c0, c2; ++ double c1, c3; ++ double invln2, c4; ++ uint64_t off; ++} data = { ++ .c0 = -0x1.71547652b83p-1, ++ .c1 = 0x1.ec709dc340953p-2, ++ .c2 = -0x1.71547651c8f35p-2, ++ .c3 = 0x1.2777ebe12dda5p-2, ++ .c4 = -0x1.ec738d616fe26p-3, ++ .invln2 = 0x1.71547652b82fep0, ++ .off = 0x3fe6900900000000, ++}; ++ + static svfloat64_t NOINLINE +-special_case (svfloat64_t x, svfloat64_t y, svbool_t cmp) ++special_case (svfloat64_t w, svuint64_t tmp, svfloat64_t y, svfloat64_t r2, ++ svbool_t special, const struct data *d) + { +- return sv_call_f64 (log2, x, y, cmp); ++ svfloat64_t x = svreinterpret_f64 (svadd_x (svptrue_b64 (), tmp, d->off)); ++ return sv_call_f64 (log2, x, svmla_x (svptrue_b64 (), w, r2, y), special); + } + + /* Double-precision SVE log2 routine. +@@ -40,13 +57,15 @@ special_case (svfloat64_t x, svfloat64_t y, svbool_t cmp) + want 0x1.fffb34198d9ddp-5. */ + svfloat64_t SV_NAME_D1 (log2) (svfloat64_t x, const svbool_t pg) + { ++ const struct data *d = ptr_barrier (&data); ++ + svuint64_t ix = svreinterpret_u64 (x); + svbool_t special = svcmpge (pg, svsub_x (pg, ix, Min), Thresh); + + /* x = 2^k z; where z is in range [Off,2*Off) and exact. + The range is split into N subintervals. + The ith subinterval contains z and c is near its center. */ +- svuint64_t tmp = svsub_x (pg, ix, Off); ++ svuint64_t tmp = svsub_x (pg, ix, d->off); + svuint64_t i = svlsr_x (pg, tmp, 51 - V_LOG2_TABLE_BITS); + i = svand_x (pg, i, (N - 1) << 1); + svfloat64_t k = svcvt_f64_x (pg, svasr_x (pg, svreinterpret_s64 (tmp), 52)); +@@ -59,15 +78,19 @@ svfloat64_t SV_NAME_D1 (log2) (svfloat64_t x, const svbool_t pg) + + /* log2(x) = log1p(z/c-1)/log(2) + log2(c) + k. */ + ++ svfloat64_t invln2_and_c4 = svld1rq_f64 (svptrue_b64 (), &d->invln2); + svfloat64_t r = svmad_x (pg, invc, z, -1.0); +- svfloat64_t w = svmla_x (pg, log2c, r, __v_log2_data.invln2); +- +- svfloat64_t r2 = svmul_x (pg, r, r); +- svfloat64_t y = sv_pw_horner_4_f64_x (pg, r, r2, __v_log2_data.poly); ++ svfloat64_t w = svmla_lane_f64 (log2c, r, invln2_and_c4, 0); + w = svadd_x (pg, k, w); + ++ svfloat64_t odd_coeffs = svld1rq_f64 (svptrue_b64 (), &d->c1); ++ svfloat64_t r2 = svmul_x (svptrue_b64 (), r, r); ++ svfloat64_t y = svmla_lane_f64 (sv_f64 (d->c2), r, odd_coeffs, 1); ++ svfloat64_t p = svmla_lane_f64 (sv_f64 (d->c0), r, odd_coeffs, 0); ++ y = svmla_lane_f64 (y, r2, invln2_and_c4, 1); ++ y = svmla_x (pg, p, r2, y); ++ + if (__glibc_unlikely (svptest_any (pg, special))) +- return special_case (x, svmla_x (svnot_z (pg, special), w, r2, y), +- special); ++ return special_case (w, tmp, y, r2, special, d); + return svmla_x (pg, w, r2, y); + } +diff --git a/sysdeps/aarch64/fpu/log_sve.c b/sysdeps/aarch64/fpu/log_sve.c +index 9b689f2ec7..044223400b 100644 +--- a/sysdeps/aarch64/fpu/log_sve.c ++++ b/sysdeps/aarch64/fpu/log_sve.c +@@ -19,39 +19,54 @@ + + #include "sv_math.h" + +-#define P(i) sv_f64 (__v_log_data.poly[i]) + #define N (1 << V_LOG_TABLE_BITS) +-#define Off (0x3fe6900900000000) +-#define MaxTop (0x7ff) +-#define MinTop (0x001) +-#define ThreshTop (0x7fe) /* MaxTop - MinTop. */ ++#define Max (0x7ff0000000000000) ++#define Min (0x0010000000000000) ++#define Thresh (0x7fe0000000000000) /* Max - Min. */ ++ ++static const struct data ++{ ++ double c0, c2; ++ double c1, c3; ++ double ln2, c4; ++ uint64_t off; ++} data = { ++ .c0 = -0x1.ffffffffffff7p-2, ++ .c1 = 0x1.55555555170d4p-2, ++ .c2 = -0x1.0000000399c27p-2, ++ .c3 = 0x1.999b2e90e94cap-3, ++ .c4 = -0x1.554e550bd501ep-3, ++ .ln2 = 0x1.62e42fefa39efp-1, ++ .off = 0x3fe6900900000000, ++}; + + static svfloat64_t NOINLINE +-special_case (svfloat64_t x, svfloat64_t y, svbool_t cmp) ++special_case (svfloat64_t hi, svuint64_t tmp, svfloat64_t y, svfloat64_t r2, ++ svbool_t special, const struct data *d) + { +- return sv_call_f64 (log, x, y, cmp); ++ svfloat64_t x = svreinterpret_f64 (svadd_x (svptrue_b64 (), tmp, d->off)); ++ return sv_call_f64 (log, x, svmla_x (svptrue_b64 (), hi, r2, y), special); + } + +-/* SVE port of AdvSIMD log algorithm. +- Maximum measured error is 2.17 ulp: +- SV_NAME_D1 (log)(0x1.a6129884398a3p+0) got 0x1.ffffff1cca043p-2 +- want 0x1.ffffff1cca045p-2. */ ++/* Double-precision SVE log routine. ++ Maximum measured error is 2.64 ulp: ++ SV_NAME_D1 (log)(0x1.95e54bc91a5e2p+184) got 0x1.fffffffe88cacp+6 ++ want 0x1.fffffffe88cafp+6. */ + svfloat64_t SV_NAME_D1 (log) (svfloat64_t x, const svbool_t pg) + { ++ const struct data *d = ptr_barrier (&data); ++ + svuint64_t ix = svreinterpret_u64 (x); +- svuint64_t top = svlsr_x (pg, ix, 52); +- svbool_t cmp = svcmpge (pg, svsub_x (pg, top, MinTop), sv_u64 (ThreshTop)); ++ svbool_t special = svcmpge (pg, svsub_x (pg, ix, Min), Thresh); + + /* x = 2^k z; where z is in range [Off,2*Off) and exact. + The range is split into N subintervals. + The ith subinterval contains z and c is near its center. */ +- svuint64_t tmp = svsub_x (pg, ix, Off); ++ svuint64_t tmp = svsub_x (pg, ix, d->off); + /* Calculate table index = (tmp >> (52 - V_LOG_TABLE_BITS)) % N. + The actual value of i is double this due to table layout. */ + svuint64_t i + = svand_x (pg, svlsr_x (pg, tmp, (51 - V_LOG_TABLE_BITS)), (N - 1) << 1); +- svint64_t k +- = svasr_x (pg, svreinterpret_s64 (tmp), 52); /* Arithmetic shift. */ + svuint64_t iz = svsub_x (pg, ix, svand_x (pg, tmp, 0xfffULL << 52)); + svfloat64_t z = svreinterpret_f64 (iz); + /* Lookup in 2 global lists (length N). */ +@@ -59,18 +74,22 @@ svfloat64_t SV_NAME_D1 (log) (svfloat64_t x, const svbool_t pg) + svfloat64_t logc = svld1_gather_index (pg, &__v_log_data.table[0].logc, i); + + /* log(x) = log1p(z/c-1) + log(c) + k*Ln2. */ +- svfloat64_t r = svmad_x (pg, invc, z, -1); +- svfloat64_t kd = svcvt_f64_x (pg, k); ++ svfloat64_t kd = svcvt_f64_x (pg, svasr_x (pg, svreinterpret_s64 (tmp), 52)); + /* hi = r + log(c) + k*Ln2. */ +- svfloat64_t hi = svmla_x (pg, svadd_x (pg, logc, r), kd, __v_log_data.ln2); ++ svfloat64_t ln2_and_c4 = svld1rq_f64 (svptrue_b64 (), &d->ln2); ++ svfloat64_t r = svmad_x (pg, invc, z, -1); ++ svfloat64_t hi = svmla_lane_f64 (logc, kd, ln2_and_c4, 0); ++ hi = svadd_x (pg, r, hi); ++ + /* y = r2*(A0 + r*A1 + r2*(A2 + r*A3 + r2*A4)) + hi. */ +- svfloat64_t r2 = svmul_x (pg, r, r); +- svfloat64_t y = svmla_x (pg, P (2), r, P (3)); +- svfloat64_t p = svmla_x (pg, P (0), r, P (1)); +- y = svmla_x (pg, y, r2, P (4)); ++ svfloat64_t odd_coeffs = svld1rq_f64 (svptrue_b64 (), &d->c1); ++ svfloat64_t r2 = svmul_x (svptrue_b64 (), r, r); ++ svfloat64_t y = svmla_lane_f64 (sv_f64 (d->c2), r, odd_coeffs, 1); ++ svfloat64_t p = svmla_lane_f64 (sv_f64 (d->c0), r, odd_coeffs, 0); ++ y = svmla_lane_f64 (y, r2, ln2_and_c4, 1); + y = svmla_x (pg, p, r2, y); + +- if (__glibc_unlikely (svptest_any (pg, cmp))) +- return special_case (x, svmla_x (svnot_z (pg, cmp), hi, r2, y), cmp); ++ if (__glibc_unlikely (svptest_any (pg, special))) ++ return special_case (hi, tmp, y, r2, special, d); + return svmla_x (pg, hi, r2, y); + } +diff --git a/sysdeps/aarch64/libm-test-ulps b/sysdeps/aarch64/libm-test-ulps +index 6c96304611..b76c38dac2 100644 +--- a/sysdeps/aarch64/libm-test-ulps ++++ b/sysdeps/aarch64/libm-test-ulps +@@ -1460,7 +1460,7 @@ float: 2 + ldouble: 1 + + Function: "log_sve": +-double: 1 ++double: 2 + float: 3 + + Function: "log_towardzero": + +commit aa7c61ea15e27ae14717e065a5d4c50baa472851 +Author: Yat Long Poon +Date: Fri Jan 3 19:09:05 2025 +0000 + + AArch64: Improve codegen for SVE log1pf users + + Reduce memory access by using lanewise MLA and reduce number of MOVPRFXs. + Move log1pf implementation to inline helper function. + Speedup on Neoverse V1 for log1pf (10%), acoshf (-1%), atanhf (2%), asinhf (2%). + + (cherry picked from commit 91c1fadba338752bf514cd4cca057b27b1b10eed) + +diff --git a/sysdeps/aarch64/fpu/acoshf_sve.c b/sysdeps/aarch64/fpu/acoshf_sve.c +index 2110894e62..491365e24d 100644 +--- a/sysdeps/aarch64/fpu/acoshf_sve.c ++++ b/sysdeps/aarch64/fpu/acoshf_sve.c +@@ -17,23 +17,26 @@ + License along with the GNU C Library; if not, see + . */ + ++#include "sv_math.h" ++#include "sv_log1pf_inline.h" ++ + #define One 0x3f800000 + #define Thres 0x20000000 /* asuint(0x1p64) - One. */ + +-#include "sv_log1pf_inline.h" +- + static svfloat32_t NOINLINE +-special_case (svfloat32_t x, svfloat32_t y, svbool_t special) ++special_case (svfloat32_t xm1, svfloat32_t tmp, svbool_t special) + { ++ svfloat32_t x = svadd_x (svptrue_b32 (), xm1, 1.0f); ++ svfloat32_t y = sv_log1pf_inline (tmp, svptrue_b32 ()); + return sv_call_f32 (acoshf, x, y, special); + } + + /* Single-precision SVE acosh(x) routine. Implements the same algorithm as + vector acoshf and log1p. + +- Maximum error is 2.78 ULPs: +- SV_NAME_F1 (acosh) (0x1.01e996p+0) got 0x1.f45b42p-4 +- want 0x1.f45b3cp-4. */ ++ Maximum error is 2.47 ULPs: ++ SV_NAME_F1 (acosh) (0x1.01ca76p+0) got 0x1.e435a6p-4 ++ want 0x1.e435a2p-4. */ + svfloat32_t SV_NAME_F1 (acosh) (svfloat32_t x, const svbool_t pg) + { + svuint32_t ix = svreinterpret_u32 (x); +@@ -41,9 +44,9 @@ svfloat32_t SV_NAME_F1 (acosh) (svfloat32_t x, const svbool_t pg) + + svfloat32_t xm1 = svsub_x (pg, x, 1.0f); + svfloat32_t u = svmul_x (pg, xm1, svadd_x (pg, x, 1.0f)); +- svfloat32_t y = sv_log1pf_inline (svadd_x (pg, xm1, svsqrt_x (pg, u)), pg); ++ svfloat32_t tmp = svadd_x (pg, xm1, svsqrt_x (pg, u)); + + if (__glibc_unlikely (svptest_any (pg, special))) +- return special_case (x, y, special); +- return y; ++ return special_case (xm1, tmp, special); ++ return sv_log1pf_inline (tmp, pg); + } +diff --git a/sysdeps/aarch64/fpu/asinhf_sve.c b/sysdeps/aarch64/fpu/asinhf_sve.c +index d85c3a685c..b7f253bf32 100644 +--- a/sysdeps/aarch64/fpu/asinhf_sve.c ++++ b/sysdeps/aarch64/fpu/asinhf_sve.c +@@ -20,20 +20,23 @@ + #include "sv_math.h" + #include "sv_log1pf_inline.h" + +-#define BigBound (0x5f800000) /* asuint(0x1p64). */ ++#define BigBound 0x5f800000 /* asuint(0x1p64). */ + + static svfloat32_t NOINLINE +-special_case (svfloat32_t x, svfloat32_t y, svbool_t special) ++special_case (svuint32_t iax, svuint32_t sign, svfloat32_t y, svbool_t special) + { ++ svfloat32_t x = svreinterpret_f32 (sveor_x (svptrue_b32 (), iax, sign)); ++ y = svreinterpret_f32 ( ++ svorr_x (svptrue_b32 (), sign, svreinterpret_u32 (y))); + return sv_call_f32 (asinhf, x, y, special); + } + + /* Single-precision SVE asinh(x) routine. Implements the same algorithm as + vector asinhf and log1p. + +- Maximum error is 2.48 ULPs: +- SV_NAME_F1 (asinh) (0x1.008864p-3) got 0x1.ffbbbcp-4 +- want 0x1.ffbbb8p-4. */ ++ Maximum error is 1.92 ULPs: ++ SV_NAME_F1 (asinh) (-0x1.0922ecp-1) got -0x1.fd0bccp-2 ++ want -0x1.fd0bc8p-2. */ + svfloat32_t SV_NAME_F1 (asinh) (svfloat32_t x, const svbool_t pg) + { + svfloat32_t ax = svabs_x (pg, x); +@@ -49,8 +52,6 @@ svfloat32_t SV_NAME_F1 (asinh) (svfloat32_t x, const svbool_t pg) + = sv_log1pf_inline (svadd_x (pg, ax, svdiv_x (pg, ax2, d)), pg); + + if (__glibc_unlikely (svptest_any (pg, special))) +- return special_case ( +- x, svreinterpret_f32 (svorr_x (pg, sign, svreinterpret_u32 (y))), +- special); ++ return special_case (iax, sign, y, special); + return svreinterpret_f32 (svorr_x (pg, sign, svreinterpret_u32 (y))); + } +diff --git a/sysdeps/aarch64/fpu/atanhf_sve.c b/sysdeps/aarch64/fpu/atanhf_sve.c +index dae83041ef..2d3005bbc8 100644 +--- a/sysdeps/aarch64/fpu/atanhf_sve.c ++++ b/sysdeps/aarch64/fpu/atanhf_sve.c +@@ -17,21 +17,25 @@ + License along with the GNU C Library; if not, see + . */ + ++#include "sv_math.h" + #include "sv_log1pf_inline.h" + + #define One (0x3f800000) + #define Half (0x3f000000) + + static svfloat32_t NOINLINE +-special_case (svfloat32_t x, svfloat32_t y, svbool_t special) ++special_case (svuint32_t iax, svuint32_t sign, svfloat32_t halfsign, ++ svfloat32_t y, svbool_t special) + { ++ svfloat32_t x = svreinterpret_f32 (sveor_x (svptrue_b32 (), iax, sign)); ++ y = svmul_x (svptrue_b32 (), halfsign, y); + return sv_call_f32 (atanhf, x, y, special); + } + + /* Approximation for vector single-precision atanh(x) using modified log1p. +- The maximum error is 2.28 ULP: +- _ZGVsMxv_atanhf(0x1.ff1194p-5) got 0x1.ffbbbcp-5 +- want 0x1.ffbbb6p-5. */ ++ The maximum error is 1.99 ULP: ++ _ZGVsMxv_atanhf(0x1.f1583p-5) got 0x1.f1f4fap-5 ++ want 0x1.f1f4f6p-5. */ + svfloat32_t SV_NAME_F1 (atanh) (svfloat32_t x, const svbool_t pg) + { + svfloat32_t ax = svabs_x (pg, x); +@@ -48,7 +52,7 @@ svfloat32_t SV_NAME_F1 (atanh) (svfloat32_t x, const svbool_t pg) + y = sv_log1pf_inline (y, pg); + + if (__glibc_unlikely (svptest_any (pg, special))) +- return special_case (x, svmul_x (pg, halfsign, y), special); ++ return special_case (iax, sign, halfsign, y, special); + + return svmul_x (pg, halfsign, y); + } +diff --git a/sysdeps/aarch64/fpu/log1pf_sve.c b/sysdeps/aarch64/fpu/log1pf_sve.c +index 5256d5e94c..18a185c838 100644 +--- a/sysdeps/aarch64/fpu/log1pf_sve.c ++++ b/sysdeps/aarch64/fpu/log1pf_sve.c +@@ -18,30 +18,13 @@ + . */ + + #include "sv_math.h" +-#include "poly_sve_f32.h" +- +-static const struct data +-{ +- float poly[8]; +- float ln2, exp_bias; +- uint32_t four, three_quarters; +-} data = {.poly = {/* Do not store first term of polynomial, which is -0.5, as +- this can be fmov-ed directly instead of including it in +- the main load-and-mla polynomial schedule. */ +- 0x1.5555aap-2f, -0x1.000038p-2f, 0x1.99675cp-3f, +- -0x1.54ef78p-3f, 0x1.28a1f4p-3f, -0x1.0da91p-3f, +- 0x1.abcb6p-4f, -0x1.6f0d5ep-5f}, +- .ln2 = 0x1.62e43p-1f, +- .exp_bias = 0x1p-23f, +- .four = 0x40800000, +- .three_quarters = 0x3f400000}; +- +-#define SignExponentMask 0xff800000 ++#include "sv_log1pf_inline.h" + + static svfloat32_t NOINLINE +-special_case (svfloat32_t x, svfloat32_t y, svbool_t special) ++special_case (svfloat32_t x, svbool_t special) + { +- return sv_call_f32 (log1pf, x, y, special); ++ return sv_call_f32 (log1pf, x, sv_log1pf_inline (x, svptrue_b32 ()), ++ special); + } + + /* Vector log1pf approximation using polynomial on reduced interval. Worst-case +@@ -50,53 +33,14 @@ special_case (svfloat32_t x, svfloat32_t y, svbool_t special) + want 0x1.9f323ep-2. */ + svfloat32_t SV_NAME_F1 (log1p) (svfloat32_t x, svbool_t pg) + { +- const struct data *d = ptr_barrier (&data); + /* x < -1, Inf/Nan. */ + svbool_t special = svcmpeq (pg, svreinterpret_u32 (x), 0x7f800000); + special = svorn_z (pg, special, svcmpge (pg, x, -1)); + +- /* With x + 1 = t * 2^k (where t = m + 1 and k is chosen such that m +- is in [-0.25, 0.5]): +- log1p(x) = log(t) + log(2^k) = log1p(m) + k*log(2). +- +- We approximate log1p(m) with a polynomial, then scale by +- k*log(2). Instead of doing this directly, we use an intermediate +- scale factor s = 4*k*log(2) to ensure the scale is representable +- as a normalised fp32 number. */ +- svfloat32_t m = svadd_x (pg, x, 1); +- +- /* Choose k to scale x to the range [-1/4, 1/2]. */ +- svint32_t k +- = svand_x (pg, svsub_x (pg, svreinterpret_s32 (m), d->three_quarters), +- sv_s32 (SignExponentMask)); +- +- /* Scale x by exponent manipulation. */ +- svfloat32_t m_scale = svreinterpret_f32 ( +- svsub_x (pg, svreinterpret_u32 (x), svreinterpret_u32 (k))); +- +- /* Scale up to ensure that the scale factor is representable as normalised +- fp32 number, and scale m down accordingly. */ +- svfloat32_t s = svreinterpret_f32 (svsubr_x (pg, k, d->four)); +- m_scale = svadd_x (pg, m_scale, svmla_x (pg, sv_f32 (-1), s, 0.25)); +- +- /* Evaluate polynomial on reduced interval. */ +- svfloat32_t ms2 = svmul_x (pg, m_scale, m_scale), +- ms4 = svmul_x (pg, ms2, ms2); +- svfloat32_t p = sv_estrin_7_f32_x (pg, m_scale, ms2, ms4, d->poly); +- p = svmad_x (pg, m_scale, p, -0.5); +- p = svmla_x (pg, m_scale, m_scale, svmul_x (pg, m_scale, p)); +- +- /* The scale factor to be applied back at the end - by multiplying float(k) +- by 2^-23 we get the unbiased exponent of k. */ +- svfloat32_t scale_back = svmul_x (pg, svcvt_f32_x (pg, k), d->exp_bias); +- +- /* Apply the scaling back. */ +- svfloat32_t y = svmla_x (pg, p, scale_back, d->ln2); +- + if (__glibc_unlikely (svptest_any (pg, special))) +- return special_case (x, y, special); ++ return special_case (x, special); + +- return y; ++ return sv_log1pf_inline (x, pg); + } + + strong_alias (SV_NAME_F1 (log1p), SV_NAME_F1 (logp1)) +diff --git a/sysdeps/aarch64/fpu/sv_log1pf_inline.h b/sysdeps/aarch64/fpu/sv_log1pf_inline.h +index b94b2da055..850297d615 100644 +--- a/sysdeps/aarch64/fpu/sv_log1pf_inline.h ++++ b/sysdeps/aarch64/fpu/sv_log1pf_inline.h +@@ -22,55 +22,76 @@ + + #include "sv_math.h" + #include "vecmath_config.h" +-#include "poly_sve_f32.h" ++ ++#define SignExponentMask 0xff800000 + + static const struct sv_log1pf_data + { +- float32_t poly[9]; +- float32_t ln2; +- float32_t scale_back; ++ float c0, c2, c4, c6; ++ float c1, c3, c5, c7; ++ float ln2, exp_bias, quarter; ++ uint32_t four, three_quarters; + } sv_log1pf_data = { +- /* Polynomial generated using FPMinimax in [-0.25, 0.5]. */ +- .poly = { -0x1p-1f, 0x1.5555aap-2f, -0x1.000038p-2f, 0x1.99675cp-3f, +- -0x1.54ef78p-3f, 0x1.28a1f4p-3f, -0x1.0da91p-3f, 0x1.abcb6p-4f, +- -0x1.6f0d5ep-5f }, +- .scale_back = 0x1.0p-23f, +- .ln2 = 0x1.62e43p-1f, ++ /* Do not store first term of polynomial, which is -0.5, as ++ this can be fmov-ed directly instead of including it in ++ the main load-and-mla polynomial schedule. */ ++ .c0 = 0x1.5555aap-2f, .c1 = -0x1.000038p-2f, .c2 = 0x1.99675cp-3f, ++ .c3 = -0x1.54ef78p-3f, .c4 = 0x1.28a1f4p-3f, .c5 = -0x1.0da91p-3f, ++ .c6 = 0x1.abcb6p-4f, .c7 = -0x1.6f0d5ep-5f, .ln2 = 0x1.62e43p-1f, ++ .exp_bias = 0x1p-23f, .quarter = 0x1p-2f, .four = 0x40800000, ++ .three_quarters = 0x3f400000, + }; + +-static inline svfloat32_t +-eval_poly (svfloat32_t m, const float32_t *c, svbool_t pg) +-{ +- svfloat32_t p_12 = svmla_x (pg, sv_f32 (c[0]), m, sv_f32 (c[1])); +- svfloat32_t m2 = svmul_x (pg, m, m); +- svfloat32_t q = svmla_x (pg, m, m2, p_12); +- svfloat32_t p = sv_pw_horner_6_f32_x (pg, m, m2, c + 2); +- p = svmul_x (pg, m2, p); +- +- return svmla_x (pg, q, m2, p); +-} +- + static inline svfloat32_t + sv_log1pf_inline (svfloat32_t x, svbool_t pg) + { + const struct sv_log1pf_data *d = ptr_barrier (&sv_log1pf_data); + +- svfloat32_t m = svadd_x (pg, x, 1.0f); +- +- svint32_t ks = svsub_x (pg, svreinterpret_s32 (m), +- svreinterpret_s32 (svdup_f32 (0.75f))); +- ks = svand_x (pg, ks, 0xff800000); +- svuint32_t k = svreinterpret_u32 (ks); +- svfloat32_t s = svreinterpret_f32 ( +- svsub_x (pg, svreinterpret_u32 (svdup_f32 (4.0f)), k)); +- +- svfloat32_t m_scale +- = svreinterpret_f32 (svsub_x (pg, svreinterpret_u32 (x), k)); +- m_scale +- = svadd_x (pg, m_scale, svmla_x (pg, sv_f32 (-1.0f), sv_f32 (0.25f), s)); +- svfloat32_t p = eval_poly (m_scale, d->poly, pg); +- svfloat32_t scale_back = svmul_x (pg, svcvt_f32_x (pg, k), d->scale_back); +- return svmla_x (pg, p, scale_back, d->ln2); ++ /* With x + 1 = t * 2^k (where t = m + 1 and k is chosen such that m ++ is in [-0.25, 0.5]): ++ log1p(x) = log(t) + log(2^k) = log1p(m) + k*log(2). ++ ++ We approximate log1p(m) with a polynomial, then scale by ++ k*log(2). Instead of doing this directly, we use an intermediate ++ scale factor s = 4*k*log(2) to ensure the scale is representable ++ as a normalised fp32 number. */ ++ svfloat32_t m = svadd_x (pg, x, 1); ++ ++ /* Choose k to scale x to the range [-1/4, 1/2]. */ ++ svint32_t k ++ = svand_x (pg, svsub_x (pg, svreinterpret_s32 (m), d->three_quarters), ++ sv_s32 (SignExponentMask)); ++ ++ /* Scale x by exponent manipulation. */ ++ svfloat32_t m_scale = svreinterpret_f32 ( ++ svsub_x (pg, svreinterpret_u32 (x), svreinterpret_u32 (k))); ++ ++ /* Scale up to ensure that the scale factor is representable as normalised ++ fp32 number, and scale m down accordingly. */ ++ svfloat32_t s = svreinterpret_f32 (svsubr_x (pg, k, d->four)); ++ svfloat32_t fconst = svld1rq_f32 (svptrue_b32 (), &d->ln2); ++ m_scale = svadd_x (pg, m_scale, svmla_lane_f32 (sv_f32 (-1), s, fconst, 2)); ++ ++ /* Evaluate polynomial on reduced interval. */ ++ svfloat32_t ms2 = svmul_x (svptrue_b32 (), m_scale, m_scale); ++ ++ svfloat32_t c1357 = svld1rq_f32 (svptrue_b32 (), &d->c1); ++ svfloat32_t p01 = svmla_lane_f32 (sv_f32 (d->c0), m_scale, c1357, 0); ++ svfloat32_t p23 = svmla_lane_f32 (sv_f32 (d->c2), m_scale, c1357, 1); ++ svfloat32_t p45 = svmla_lane_f32 (sv_f32 (d->c4), m_scale, c1357, 2); ++ svfloat32_t p67 = svmla_lane_f32 (sv_f32 (d->c6), m_scale, c1357, 3); ++ ++ svfloat32_t p = svmla_x (pg, p45, p67, ms2); ++ p = svmla_x (pg, p23, p, ms2); ++ p = svmla_x (pg, p01, p, ms2); ++ ++ p = svmad_x (pg, m_scale, p, -0.5); ++ p = svmla_x (pg, m_scale, m_scale, svmul_x (pg, m_scale, p)); ++ ++ /* The scale factor to be applied back at the end - by multiplying float(k) ++ by 2^-23 we get the unbiased exponent of k. */ ++ svfloat32_t scale_back = svmul_lane_f32 (svcvt_f32_x (pg, k), fconst, 1); ++ return svmla_lane_f32 (p, scale_back, fconst, 0); + } + + #endif + +commit d983f14c304df2d880c7b01e904e4a889064b9b3 +Author: Luna Lamb +Date: Fri Jan 3 20:15:17 2025 +0000 + + AArch64: Improve codegen in SVE expm1f and users + + Use unpredicated muls, use absolute compare and improve memory access. + Expm1f, sinhf and tanhf show 7%, 5% and 1% improvement in throughput + microbenchmark on Neoverse V1. + + (cherry picked from commit f86b4cf87581cf1e45702b07880679ffa0b1f47a) + +diff --git a/sysdeps/aarch64/fpu/expm1f_sve.c b/sysdeps/aarch64/fpu/expm1f_sve.c +index 7c852125cd..05a66400d4 100644 +--- a/sysdeps/aarch64/fpu/expm1f_sve.c ++++ b/sysdeps/aarch64/fpu/expm1f_sve.c +@@ -18,7 +18,6 @@ + . */ + + #include "sv_math.h" +-#include "poly_sve_f32.h" + + /* Largest value of x for which expm1(x) should round to -1. */ + #define SpecialBound 0x1.5ebc4p+6f +@@ -28,20 +27,17 @@ static const struct data + /* These 4 are grouped together so they can be loaded as one quadword, then + used with _lane forms of svmla/svmls. */ + float c2, c4, ln2_hi, ln2_lo; +- float c0, c1, c3, inv_ln2, special_bound, shift; ++ float c0, inv_ln2, c1, c3, special_bound; + } data = { + /* Generated using fpminimax. */ + .c0 = 0x1.fffffep-2, .c1 = 0x1.5554aep-3, + .c2 = 0x1.555736p-5, .c3 = 0x1.12287cp-7, +- .c4 = 0x1.6b55a2p-10, ++ .c4 = 0x1.6b55a2p-10, .inv_ln2 = 0x1.715476p+0f, ++ .special_bound = SpecialBound, .ln2_lo = 0x1.7f7d1cp-20f, ++ .ln2_hi = 0x1.62e4p-1f, + +- .special_bound = SpecialBound, .shift = 0x1.8p23f, +- .inv_ln2 = 0x1.715476p+0f, .ln2_hi = 0x1.62e4p-1f, +- .ln2_lo = 0x1.7f7d1cp-20f, + }; + +-#define C(i) sv_f32 (d->c##i) +- + static svfloat32_t NOINLINE + special_case (svfloat32_t x, svbool_t pg) + { +@@ -71,9 +67,8 @@ svfloat32_t SV_NAME_F1 (expm1) (svfloat32_t x, svbool_t pg) + and f = x - i * ln2, then f is in [-ln2/2, ln2/2]. + exp(x) - 1 = 2^i * (expm1(f) + 1) - 1 + where 2^i is exact because i is an integer. */ +- svfloat32_t j = svmla_x (pg, sv_f32 (d->shift), x, d->inv_ln2); +- j = svsub_x (pg, j, d->shift); +- svint32_t i = svcvt_s32_x (pg, j); ++ svfloat32_t j = svmul_x (svptrue_b32 (), x, d->inv_ln2); ++ j = svrinta_x (pg, j); + + svfloat32_t f = svmls_lane (x, j, lane_constants, 2); + f = svmls_lane (f, j, lane_constants, 3); +@@ -83,17 +78,17 @@ svfloat32_t SV_NAME_F1 (expm1) (svfloat32_t x, svbool_t pg) + x + ax^2 + bx^3 + cx^4 .... + So we calculate the polynomial P(f) = a + bf + cf^2 + ... + and assemble the approximation expm1(f) ~= f + f^2 * P(f). */ +- svfloat32_t p12 = svmla_lane (C (1), f, lane_constants, 0); +- svfloat32_t p34 = svmla_lane (C (3), f, lane_constants, 1); +- svfloat32_t f2 = svmul_x (pg, f, f); ++ svfloat32_t p12 = svmla_lane (sv_f32 (d->c1), f, lane_constants, 0); ++ svfloat32_t p34 = svmla_lane (sv_f32 (d->c3), f, lane_constants, 1); ++ svfloat32_t f2 = svmul_x (svptrue_b32 (), f, f); + svfloat32_t p = svmla_x (pg, p12, f2, p34); +- p = svmla_x (pg, C (0), f, p); ++ ++ p = svmla_x (pg, sv_f32 (d->c0), f, p); + p = svmla_x (pg, f, f2, p); + + /* Assemble the result. + expm1(x) ~= 2^i * (p + 1) - 1 + Let t = 2^i. */ +- svfloat32_t t = svreinterpret_f32 ( +- svadd_x (pg, svreinterpret_u32 (svlsl_x (pg, i, 23)), 0x3f800000)); +- return svmla_x (pg, svsub_x (pg, t, 1), p, t); ++ svfloat32_t t = svscale_x (pg, sv_f32 (1.0f), svcvt_s32_x (pg, j)); ++ return svmla_x (pg, svsub_x (pg, t, 1.0f), p, t); + } +diff --git a/sysdeps/aarch64/fpu/sinhf_sve.c b/sysdeps/aarch64/fpu/sinhf_sve.c +index 6c204b57a2..50dd386774 100644 +--- a/sysdeps/aarch64/fpu/sinhf_sve.c ++++ b/sysdeps/aarch64/fpu/sinhf_sve.c +@@ -63,5 +63,5 @@ svfloat32_t SV_NAME_F1 (sinh) (svfloat32_t x, const svbool_t pg) + if (__glibc_unlikely (svptest_any (pg, special))) + return special_case (x, svmul_x (pg, t, halfsign), special); + +- return svmul_x (pg, t, halfsign); ++ return svmul_x (svptrue_b32 (), t, halfsign); + } +diff --git a/sysdeps/aarch64/fpu/sv_expm1f_inline.h b/sysdeps/aarch64/fpu/sv_expm1f_inline.h +index 5b72451222..e46ddda543 100644 +--- a/sysdeps/aarch64/fpu/sv_expm1f_inline.h ++++ b/sysdeps/aarch64/fpu/sv_expm1f_inline.h +@@ -27,21 +27,18 @@ struct sv_expm1f_data + /* These 4 are grouped together so they can be loaded as one quadword, then + used with _lane forms of svmla/svmls. */ + float32_t c2, c4, ln2_hi, ln2_lo; +- float32_t c0, c1, c3, inv_ln2, shift; ++ float c0, inv_ln2, c1, c3, special_bound; + }; + + /* Coefficients generated using fpminimax. */ + #define SV_EXPM1F_DATA \ + { \ +- .c0 = 0x1.fffffep-2, .c1 = 0x1.5554aep-3, .c2 = 0x1.555736p-5, \ +- .c3 = 0x1.12287cp-7, .c4 = 0x1.6b55a2p-10, \ ++ .c0 = 0x1.fffffep-2, .c1 = 0x1.5554aep-3, .inv_ln2 = 0x1.715476p+0f, \ ++ .c2 = 0x1.555736p-5, .c3 = 0x1.12287cp-7, \ + \ +- .shift = 0x1.8p23f, .inv_ln2 = 0x1.715476p+0f, .ln2_hi = 0x1.62e4p-1f, \ +- .ln2_lo = 0x1.7f7d1cp-20f, \ ++ .c4 = 0x1.6b55a2p-10, .ln2_lo = 0x1.7f7d1cp-20f, .ln2_hi = 0x1.62e4p-1f, \ + } + +-#define C(i) sv_f32 (d->c##i) +- + static inline svfloat32_t + expm1f_inline (svfloat32_t x, svbool_t pg, const struct sv_expm1f_data *d) + { +@@ -55,9 +52,8 @@ expm1f_inline (svfloat32_t x, svbool_t pg, const struct sv_expm1f_data *d) + and f = x - i * ln2, then f is in [-ln2/2, ln2/2]. + exp(x) - 1 = 2^i * (expm1(f) + 1) - 1 + where 2^i is exact because i is an integer. */ +- svfloat32_t j = svmla_x (pg, sv_f32 (d->shift), x, d->inv_ln2); +- j = svsub_x (pg, j, d->shift); +- svint32_t i = svcvt_s32_x (pg, j); ++ svfloat32_t j = svmul_x (svptrue_b32 (), x, d->inv_ln2); ++ j = svrinta_x (pg, j); + + svfloat32_t f = svmls_lane (x, j, lane_constants, 2); + f = svmls_lane (f, j, lane_constants, 3); +@@ -67,18 +63,18 @@ expm1f_inline (svfloat32_t x, svbool_t pg, const struct sv_expm1f_data *d) + x + ax^2 + bx^3 + cx^4 .... + So we calculate the polynomial P(f) = a + bf + cf^2 + ... + and assemble the approximation expm1(f) ~= f + f^2 * P(f). */ +- svfloat32_t p12 = svmla_lane (C (1), f, lane_constants, 0); +- svfloat32_t p34 = svmla_lane (C (3), f, lane_constants, 1); +- svfloat32_t f2 = svmul_x (pg, f, f); ++ svfloat32_t p12 = svmla_lane (sv_f32 (d->c1), f, lane_constants, 0); ++ svfloat32_t p34 = svmla_lane (sv_f32 (d->c3), f, lane_constants, 1); ++ svfloat32_t f2 = svmul_x (svptrue_b32 (), f, f); + svfloat32_t p = svmla_x (pg, p12, f2, p34); +- p = svmla_x (pg, C (0), f, p); ++ p = svmla_x (pg, sv_f32 (d->c0), f, p); + p = svmla_x (pg, f, f2, p); + + /* Assemble the result. + expm1(x) ~= 2^i * (p + 1) - 1 + Let t = 2^i. */ +- svfloat32_t t = svscale_x (pg, sv_f32 (1), i); +- return svmla_x (pg, svsub_x (pg, t, 1), p, t); ++ svfloat32_t t = svscale_x (pg, sv_f32 (1.0f), svcvt_s32_x (pg, j)); ++ return svmla_x (pg, svsub_x (pg, t, 1.0f), p, t); + } + + #endif +diff --git a/sysdeps/aarch64/fpu/tanhf_sve.c b/sysdeps/aarch64/fpu/tanhf_sve.c +index 0b94523cf5..80dd679346 100644 +--- a/sysdeps/aarch64/fpu/tanhf_sve.c ++++ b/sysdeps/aarch64/fpu/tanhf_sve.c +@@ -19,20 +19,27 @@ + + #include "sv_expm1f_inline.h" + ++/* Largest value of x for which tanhf(x) rounds to 1 (or -1 for negative). */ ++#define BoringBound 0x1.205966p+3f ++ + static const struct data + { + struct sv_expm1f_data expm1f_consts; +- uint32_t boring_bound, onef; ++ uint32_t onef, special_bound; ++ float boring_bound; + } data = { + .expm1f_consts = SV_EXPM1F_DATA, +- /* 0x1.205966p+3, above which tanhf rounds to 1 (or -1 for negative). */ +- .boring_bound = 0x41102cb3, + .onef = 0x3f800000, ++ .special_bound = 0x7f800000, ++ .boring_bound = BoringBound, + }; + + static svfloat32_t NOINLINE +-special_case (svfloat32_t x, svfloat32_t y, svbool_t special) ++special_case (svfloat32_t x, svbool_t pg, svbool_t is_boring, ++ svfloat32_t boring, svfloat32_t q, svbool_t special) + { ++ svfloat32_t y ++ = svsel_f32 (is_boring, boring, svdiv_x (pg, q, svadd_x (pg, q, 2.0))); + return sv_call_f32 (tanhf, x, y, special); + } + +@@ -47,15 +54,16 @@ svfloat32_t SV_NAME_F1 (tanh) (svfloat32_t x, const svbool_t pg) + svfloat32_t ax = svabs_x (pg, x); + svuint32_t iax = svreinterpret_u32 (ax); + svuint32_t sign = sveor_x (pg, svreinterpret_u32 (x), iax); +- svbool_t is_boring = svcmpgt (pg, iax, d->boring_bound); + svfloat32_t boring = svreinterpret_f32 (svorr_x (pg, sign, d->onef)); +- +- svbool_t special = svcmpgt (pg, iax, 0x7f800000); ++ svbool_t special = svcmpgt (pg, iax, d->special_bound); ++ svbool_t is_boring = svacgt (pg, x, d->boring_bound); + + /* tanh(x) = (e^2x - 1) / (e^2x + 1). */ +- svfloat32_t q = expm1f_inline (svmul_x (pg, x, 2.0), pg, &d->expm1f_consts); +- svfloat32_t y = svdiv_x (pg, q, svadd_x (pg, q, 2.0)); ++ svfloat32_t q = expm1f_inline (svmul_x (svptrue_b32 (), x, 2.0), pg, ++ &d->expm1f_consts); ++ + if (__glibc_unlikely (svptest_any (pg, special))) +- return special_case (x, svsel_f32 (is_boring, boring, y), special); ++ return special_case (x, pg, is_boring, boring, q, special); ++ svfloat32_t y = svdiv_x (pg, q, svadd_x (pg, q, 2.0)); + return svsel_f32 (is_boring, boring, y); + } + +commit 0ff6a9ff79bca9384ce4ba20e8942d39cc377a14 +Author: Luna Lamb +Date: Thu Feb 13 17:52:09 2025 +0000 + + Aarch64: Improve codegen in SVE asinh + + Use unpredicated muls, use lanewise mla's and improve memory access. + 1% regression in throughput microbenchmark on Neoverse V1. + + Reviewed-by: Wilco Dijkstra + (cherry picked from commit 8f0e7fe61e0a2ad5ed777933703ce09053810ec4) + +diff --git a/sysdeps/aarch64/fpu/asinh_sve.c b/sysdeps/aarch64/fpu/asinh_sve.c +index 28dc5c4587..fe8715e06c 100644 +--- a/sysdeps/aarch64/fpu/asinh_sve.c ++++ b/sysdeps/aarch64/fpu/asinh_sve.c +@@ -18,36 +18,49 @@ + . */ + + #include "sv_math.h" +-#include "poly_sve_f64.h" + + #define SignMask (0x8000000000000000) + #define One (0x3ff0000000000000) + #define Thres (0x5fe0000000000000) /* asuint64 (0x1p511). */ ++#define IndexMask (((1 << V_LOG_TABLE_BITS) - 1) << 1) + + static const struct data + { +- double poly[18]; +- double ln2, p3, p1, p4, p0, p2; +- uint64_t n; +- uint64_t off; ++ double even_coeffs[9]; ++ double ln2, p3, p1, p4, p0, p2, c1, c3, c5, c7, c9, c11, c13, c15, c17; ++ uint64_t off, mask; + + } data = { +- /* Polynomial generated using Remez on [2^-26, 1]. */ +- .poly +- = { -0x1.55555555554a7p-3, 0x1.3333333326c7p-4, -0x1.6db6db68332e6p-5, +- 0x1.f1c71b26fb40dp-6, -0x1.6e8b8b654a621p-6, 0x1.1c4daa9e67871p-6, +- -0x1.c9871d10885afp-7, 0x1.7a16e8d9d2ecfp-7, -0x1.3ddca533e9f54p-7, +- 0x1.0becef748dafcp-7, -0x1.b90c7099dd397p-8, 0x1.541f2bb1ffe51p-8, +- -0x1.d217026a669ecp-9, 0x1.0b5c7977aaf7p-9, -0x1.e0f37daef9127p-11, +- 0x1.388b5fe542a6p-12, -0x1.021a48685e287p-14, 0x1.93d4ba83d34dap-18 }, ++ /* Polynomial generated using Remez on [2^-26, 1]. */ ++ .even_coeffs ={ ++ -0x1.55555555554a7p-3, ++ -0x1.6db6db68332e6p-5, ++ -0x1.6e8b8b654a621p-6, ++ -0x1.c9871d10885afp-7, ++ -0x1.3ddca533e9f54p-7, ++ -0x1.b90c7099dd397p-8, ++ -0x1.d217026a669ecp-9, ++ -0x1.e0f37daef9127p-11, ++ -0x1.021a48685e287p-14, }, ++ ++ .c1 = 0x1.3333333326c7p-4, ++ .c3 = 0x1.f1c71b26fb40dp-6, ++ .c5 = 0x1.1c4daa9e67871p-6, ++ .c7 = 0x1.7a16e8d9d2ecfp-7, ++ .c9 = 0x1.0becef748dafcp-7, ++ .c11 = 0x1.541f2bb1ffe51p-8, ++ .c13 = 0x1.0b5c7977aaf7p-9, ++ .c15 = 0x1.388b5fe542a6p-12, ++ .c17 = 0x1.93d4ba83d34dap-18, ++ + .ln2 = 0x1.62e42fefa39efp-1, + .p0 = -0x1.ffffffffffff7p-2, + .p1 = 0x1.55555555170d4p-2, + .p2 = -0x1.0000000399c27p-2, + .p3 = 0x1.999b2e90e94cap-3, + .p4 = -0x1.554e550bd501ep-3, +- .n = 1 << V_LOG_TABLE_BITS, +- .off = 0x3fe6900900000000 ++ .off = 0x3fe6900900000000, ++ .mask = 0xfffULL << 52, + }; + + static svfloat64_t NOINLINE +@@ -64,11 +77,10 @@ __sv_log_inline (svfloat64_t x, const struct data *d, const svbool_t pg) + of the algorithm used. */ + + svuint64_t ix = svreinterpret_u64 (x); +- svuint64_t tmp = svsub_x (pg, ix, d->off); +- svuint64_t i = svand_x (pg, svlsr_x (pg, tmp, (51 - V_LOG_TABLE_BITS)), +- (d->n - 1) << 1); +- svint64_t k = svasr_x (pg, svreinterpret_s64 (tmp), 52); +- svuint64_t iz = svsub_x (pg, ix, svand_x (pg, tmp, 0xfffULL << 52)); ++ svuint64_t i_off = svsub_x (pg, ix, d->off); ++ svuint64_t i ++ = svand_x (pg, svlsr_x (pg, i_off, (51 - V_LOG_TABLE_BITS)), IndexMask); ++ svuint64_t iz = svsub_x (pg, ix, svand_x (pg, i_off, d->mask)); + svfloat64_t z = svreinterpret_f64 (iz); + + svfloat64_t invc = svld1_gather_index (pg, &__v_log_data.table[0].invc, i); +@@ -78,14 +90,14 @@ __sv_log_inline (svfloat64_t x, const struct data *d, const svbool_t pg) + svfloat64_t p1_p4 = svld1rq (svptrue_b64 (), &d->p1); + + svfloat64_t r = svmla_x (pg, sv_f64 (-1.0), invc, z); +- svfloat64_t kd = svcvt_f64_x (pg, k); ++ svfloat64_t kd ++ = svcvt_f64_x (pg, svasr_x (pg, svreinterpret_s64 (i_off), 52)); + + svfloat64_t hi = svmla_lane (svadd_x (pg, logc, r), kd, ln2_p3, 0); +- svfloat64_t r2 = svmul_x (pg, r, r); +- ++ svfloat64_t r2 = svmul_x (svptrue_b64 (), r, r); + svfloat64_t y = svmla_lane (sv_f64 (d->p2), r, ln2_p3, 1); +- + svfloat64_t p = svmla_lane (sv_f64 (d->p0), r, p1_p4, 0); ++ + y = svmla_lane (y, r2, p1_p4, 1); + y = svmla_x (pg, p, r2, y); + y = svmla_x (pg, hi, r2, y); +@@ -111,7 +123,6 @@ svfloat64_t SV_NAME_D1 (asinh) (svfloat64_t x, const svbool_t pg) + svuint64_t iax = svbic_x (pg, ix, SignMask); + svuint64_t sign = svand_x (pg, ix, SignMask); + svfloat64_t ax = svreinterpret_f64 (iax); +- + svbool_t ge1 = svcmpge (pg, iax, One); + svbool_t special = svcmpge (pg, iax, Thres); + +@@ -120,7 +131,7 @@ svfloat64_t SV_NAME_D1 (asinh) (svfloat64_t x, const svbool_t pg) + svfloat64_t option_1 = sv_f64 (0); + if (__glibc_likely (svptest_any (pg, ge1))) + { +- svfloat64_t x2 = svmul_x (pg, ax, ax); ++ svfloat64_t x2 = svmul_x (svptrue_b64 (), ax, ax); + option_1 = __sv_log_inline ( + svadd_x (pg, ax, svsqrt_x (pg, svadd_x (pg, x2, 1))), d, pg); + } +@@ -130,21 +141,53 @@ svfloat64_t SV_NAME_D1 (asinh) (svfloat64_t x, const svbool_t pg) + The largest observed error in this region is 1.51 ULPs: + _ZGVsMxv_asinh(0x1.fe12bf8c616a2p-1) got 0x1.c1e649ee2681bp-1 + want 0x1.c1e649ee2681dp-1. */ ++ + svfloat64_t option_2 = sv_f64 (0); + if (__glibc_likely (svptest_any (pg, svnot_z (pg, ge1)))) + { +- svfloat64_t x2 = svmul_x (pg, ax, ax); +- svfloat64_t x4 = svmul_x (pg, x2, x2); +- svfloat64_t p = sv_pw_horner_17_f64_x (pg, x2, x4, d->poly); +- option_2 = svmla_x (pg, ax, p, svmul_x (pg, x2, ax)); ++ svfloat64_t x2 = svmul_x (svptrue_b64 (), ax, ax); ++ svfloat64_t x4 = svmul_x (svptrue_b64 (), x2, x2); ++ /* Order-17 Pairwise Horner scheme. */ ++ svfloat64_t c13 = svld1rq (svptrue_b64 (), &d->c1); ++ svfloat64_t c57 = svld1rq (svptrue_b64 (), &d->c5); ++ svfloat64_t c911 = svld1rq (svptrue_b64 (), &d->c9); ++ svfloat64_t c1315 = svld1rq (svptrue_b64 (), &d->c13); ++ ++ svfloat64_t p01 = svmla_lane (sv_f64 (d->even_coeffs[0]), x2, c13, 0); ++ svfloat64_t p23 = svmla_lane (sv_f64 (d->even_coeffs[1]), x2, c13, 1); ++ svfloat64_t p45 = svmla_lane (sv_f64 (d->even_coeffs[2]), x2, c57, 0); ++ svfloat64_t p67 = svmla_lane (sv_f64 (d->even_coeffs[3]), x2, c57, 1); ++ svfloat64_t p89 = svmla_lane (sv_f64 (d->even_coeffs[4]), x2, c911, 0); ++ svfloat64_t p1011 = svmla_lane (sv_f64 (d->even_coeffs[5]), x2, c911, 1); ++ svfloat64_t p1213 ++ = svmla_lane (sv_f64 (d->even_coeffs[6]), x2, c1315, 0); ++ svfloat64_t p1415 ++ = svmla_lane (sv_f64 (d->even_coeffs[7]), x2, c1315, 1); ++ svfloat64_t p1617 = svmla_x (pg, sv_f64 (d->even_coeffs[8]), x2, d->c17); ++ ++ svfloat64_t p = svmla_x (pg, p1415, x4, p1617); ++ p = svmla_x (pg, p1213, x4, p); ++ p = svmla_x (pg, p1011, x4, p); ++ p = svmla_x (pg, p89, x4, p); ++ ++ p = svmla_x (pg, p67, x4, p); ++ p = svmla_x (pg, p45, x4, p); ++ ++ p = svmla_x (pg, p23, x4, p); ++ ++ p = svmla_x (pg, p01, x4, p); ++ ++ option_2 = svmla_x (pg, ax, p, svmul_x (svptrue_b64 (), x2, ax)); + } + +- /* Choose the right option for each lane. */ +- svfloat64_t y = svsel (ge1, option_1, option_2); +- + if (__glibc_unlikely (svptest_any (pg, special))) + return special_case ( +- x, svreinterpret_f64 (sveor_x (pg, svreinterpret_u64 (y), sign)), ++ x, ++ svreinterpret_f64 (sveor_x ( ++ pg, svreinterpret_u64 (svsel (ge1, option_1, option_2)), sign)), + special); ++ ++ /* Choose the right option for each lane. */ ++ svfloat64_t y = svsel (ge1, option_1, option_2); + return svreinterpret_f64 (sveor_x (pg, svreinterpret_u64 (y), sign)); + } + +commit 4b0bb84eb7e52a135c873fd9d0fc6c30599aedf4 +Author: Luna Lamb +Date: Thu Feb 13 17:54:46 2025 +0000 + + Aarch64: Improve codegen in SVE exp and users, and update expf_inline + + Use unpredicted muls, and improve memory access. + 7%, 3% and 1% improvement in throughput microbenchmark on Neoverse V1, + for exp, exp2 and cosh respectively. + + Reviewed-by: Wilco Dijkstra + (cherry picked from commit c0ff447edf19bd4630fe79adf5e8b896405b059f) + +diff --git a/sysdeps/aarch64/fpu/cosh_sve.c b/sysdeps/aarch64/fpu/cosh_sve.c +index 919f34604a..e375dd8a34 100644 +--- a/sysdeps/aarch64/fpu/cosh_sve.c ++++ b/sysdeps/aarch64/fpu/cosh_sve.c +@@ -23,7 +23,7 @@ static const struct data + { + float64_t poly[3]; + float64_t inv_ln2, ln2_hi, ln2_lo, shift, thres; +- uint64_t index_mask, special_bound; ++ uint64_t special_bound; + } data = { + .poly = { 0x1.fffffffffffd4p-2, 0x1.5555571d6b68cp-3, + 0x1.5555576a59599p-5, }, +@@ -35,14 +35,16 @@ static const struct data + .shift = 0x1.8p+52, + .thres = 704.0, + +- .index_mask = 0xff, + /* 0x1.6p9, above which exp overflows. */ + .special_bound = 0x4086000000000000, + }; + + static svfloat64_t NOINLINE +-special_case (svfloat64_t x, svfloat64_t y, svbool_t special) ++special_case (svfloat64_t x, svbool_t pg, svfloat64_t t, svbool_t special) + { ++ svfloat64_t half_t = svmul_x (svptrue_b64 (), t, 0.5); ++ svfloat64_t half_over_t = svdivr_x (pg, t, 0.5); ++ svfloat64_t y = svadd_x (pg, half_t, half_over_t); + return sv_call_f64 (cosh, x, y, special); + } + +@@ -60,12 +62,12 @@ exp_inline (svfloat64_t x, const svbool_t pg, const struct data *d) + + svuint64_t u = svreinterpret_u64 (z); + svuint64_t e = svlsl_x (pg, u, 52 - V_EXP_TAIL_TABLE_BITS); +- svuint64_t i = svand_x (pg, u, d->index_mask); ++ svuint64_t i = svand_x (svptrue_b64 (), u, 0xff); + + svfloat64_t y = svmla_x (pg, sv_f64 (d->poly[1]), r, d->poly[2]); + y = svmla_x (pg, sv_f64 (d->poly[0]), r, y); + y = svmla_x (pg, sv_f64 (1.0), r, y); +- y = svmul_x (pg, r, y); ++ y = svmul_x (svptrue_b64 (), r, y); + + /* s = 2^(n/N). */ + u = svld1_gather_index (pg, __v_exp_tail_data, i); +@@ -94,12 +96,12 @@ svfloat64_t SV_NAME_D1 (cosh) (svfloat64_t x, const svbool_t pg) + /* Up to the point that exp overflows, we can use it to calculate cosh by + exp(|x|) / 2 + 1 / (2 * exp(|x|)). */ + svfloat64_t t = exp_inline (ax, pg, d); +- svfloat64_t half_t = svmul_x (pg, t, 0.5); +- svfloat64_t half_over_t = svdivr_x (pg, t, 0.5); + + /* Fall back to scalar for any special cases. */ + if (__glibc_unlikely (svptest_any (pg, special))) +- return special_case (x, svadd_x (pg, half_t, half_over_t), special); ++ return special_case (x, pg, t, special); + ++ svfloat64_t half_t = svmul_x (svptrue_b64 (), t, 0.5); ++ svfloat64_t half_over_t = svdivr_x (pg, t, 0.5); + return svadd_x (pg, half_t, half_over_t); + } +diff --git a/sysdeps/aarch64/fpu/exp10_sve.c b/sysdeps/aarch64/fpu/exp10_sve.c +index ddf64708cb..bfd3fb9e19 100644 +--- a/sysdeps/aarch64/fpu/exp10_sve.c ++++ b/sysdeps/aarch64/fpu/exp10_sve.c +@@ -18,21 +18,23 @@ + . */ + + #include "sv_math.h" +-#include "poly_sve_f64.h" + + #define SpecialBound 307.0 /* floor (log10 (2^1023)). */ + + static const struct data + { +- double poly[5]; ++ double c1, c3, c2, c4, c0; + double shift, log10_2, log2_10_hi, log2_10_lo, scale_thres, special_bound; + } data = { + /* Coefficients generated using Remez algorithm. + rel error: 0x1.9fcb9b3p-60 + abs error: 0x1.a20d9598p-60 in [ -log10(2)/128, log10(2)/128 ] + max ulp err 0.52 +0.5. */ +- .poly = { 0x1.26bb1bbb55516p1, 0x1.53524c73cd32ap1, 0x1.0470591daeafbp1, +- 0x1.2bd77b1361ef6p0, 0x1.142b5d54e9621p-1 }, ++ .c0 = 0x1.26bb1bbb55516p1, ++ .c1 = 0x1.53524c73cd32ap1, ++ .c2 = 0x1.0470591daeafbp1, ++ .c3 = 0x1.2bd77b1361ef6p0, ++ .c4 = 0x1.142b5d54e9621p-1, + /* 1.5*2^46+1023. This value is further explained below. */ + .shift = 0x1.800000000ffc0p+46, + .log10_2 = 0x1.a934f0979a371p1, /* 1/log2(10). */ +@@ -70,9 +72,9 @@ special_case (svbool_t pg, svfloat64_t s, svfloat64_t y, svfloat64_t n, + /* |n| > 1280 => 2^(n) overflows. */ + svbool_t p_cmp = svacgt (pg, n, d->scale_thres); + +- svfloat64_t r1 = svmul_x (pg, s1, s1); ++ svfloat64_t r1 = svmul_x (svptrue_b64 (), s1, s1); + svfloat64_t r2 = svmla_x (pg, s2, s2, y); +- svfloat64_t r0 = svmul_x (pg, r2, s1); ++ svfloat64_t r0 = svmul_x (svptrue_b64 (), r2, s1); + + return svsel (p_cmp, r1, r0); + } +@@ -103,11 +105,14 @@ svfloat64_t SV_NAME_D1 (exp10) (svfloat64_t x, svbool_t pg) + comes at significant performance cost. */ + svuint64_t u = svreinterpret_u64 (z); + svfloat64_t scale = svexpa (u); +- ++ svfloat64_t c24 = svld1rq (svptrue_b64 (), &d->c2); + /* Approximate exp10(r) using polynomial. */ +- svfloat64_t r2 = svmul_x (pg, r, r); +- svfloat64_t y = svmla_x (pg, svmul_x (pg, r, d->poly[0]), r2, +- sv_pairwise_poly_3_f64_x (pg, r, r2, d->poly + 1)); ++ svfloat64_t r2 = svmul_x (svptrue_b64 (), r, r); ++ svfloat64_t p12 = svmla_lane (sv_f64 (d->c1), r, c24, 0); ++ svfloat64_t p34 = svmla_lane (sv_f64 (d->c3), r, c24, 1); ++ svfloat64_t p14 = svmla_x (pg, p12, p34, r2); ++ ++ svfloat64_t y = svmla_x (pg, svmul_x (svptrue_b64 (), r, d->c0), r2, p14); + + /* Assemble result as exp10(x) = 2^n * exp10(r). If |x| > SpecialBound + multiplication may overflow, so use special case routine. */ +diff --git a/sysdeps/aarch64/fpu/exp2_sve.c b/sysdeps/aarch64/fpu/exp2_sve.c +index 22848ebfa5..5dfb77cdbc 100644 +--- a/sysdeps/aarch64/fpu/exp2_sve.c ++++ b/sysdeps/aarch64/fpu/exp2_sve.c +@@ -18,7 +18,6 @@ + . */ + + #include "sv_math.h" +-#include "poly_sve_f64.h" + + #define N (1 << V_EXP_TABLE_BITS) + +@@ -27,15 +26,15 @@ + + static const struct data + { +- double poly[4]; ++ double c0, c2; ++ double c1, c3; + double shift, big_bound, uoflow_bound; + } data = { + /* Coefficients are computed using Remez algorithm with + minimisation of the absolute error. */ +- .poly = { 0x1.62e42fefa3686p-1, 0x1.ebfbdff82c241p-3, 0x1.c6b09b16de99ap-5, +- 0x1.3b2abf5571ad8p-7 }, +- .shift = 0x1.8p52 / N, +- .uoflow_bound = UOFlowBound, ++ .c0 = 0x1.62e42fefa3686p-1, .c1 = 0x1.ebfbdff82c241p-3, ++ .c2 = 0x1.c6b09b16de99ap-5, .c3 = 0x1.3b2abf5571ad8p-7, ++ .shift = 0x1.8p52 / N, .uoflow_bound = UOFlowBound, + .big_bound = BigBound, + }; + +@@ -67,9 +66,9 @@ special_case (svbool_t pg, svfloat64_t s, svfloat64_t y, svfloat64_t n, + /* |n| > 1280 => 2^(n) overflows. */ + svbool_t p_cmp = svacgt (pg, n, d->uoflow_bound); + +- svfloat64_t r1 = svmul_x (pg, s1, s1); ++ svfloat64_t r1 = svmul_x (svptrue_b64 (), s1, s1); + svfloat64_t r2 = svmla_x (pg, s2, s2, y); +- svfloat64_t r0 = svmul_x (pg, r2, s1); ++ svfloat64_t r0 = svmul_x (svptrue_b64 (), r2, s1); + + return svsel (p_cmp, r1, r0); + } +@@ -99,11 +98,14 @@ svfloat64_t SV_NAME_D1 (exp2) (svfloat64_t x, svbool_t pg) + svuint64_t top = svlsl_x (pg, ki, 52 - V_EXP_TABLE_BITS); + svfloat64_t scale = svreinterpret_f64 (svadd_x (pg, sbits, top)); + ++ svfloat64_t c13 = svld1rq (svptrue_b64 (), &d->c1); + /* Approximate exp2(r) using polynomial. */ +- svfloat64_t r2 = svmul_x (pg, r, r); +- svfloat64_t p = sv_pairwise_poly_3_f64_x (pg, r, r2, d->poly); +- svfloat64_t y = svmul_x (pg, r, p); +- ++ /* y = exp2(r) - 1 ~= C0 r + C1 r^2 + C2 r^3 + C3 r^4. */ ++ svfloat64_t r2 = svmul_x (svptrue_b64 (), r, r); ++ svfloat64_t p01 = svmla_lane (sv_f64 (d->c0), r, c13, 0); ++ svfloat64_t p23 = svmla_lane (sv_f64 (d->c2), r, c13, 1); ++ svfloat64_t p = svmla_x (pg, p01, p23, r2); ++ svfloat64_t y = svmul_x (svptrue_b64 (), r, p); + /* Assemble exp2(x) = exp2(r) * scale. */ + if (__glibc_unlikely (svptest_any (pg, special))) + return special_case (pg, scale, y, kd, d); +diff --git a/sysdeps/aarch64/fpu/exp_sve.c b/sysdeps/aarch64/fpu/exp_sve.c +index aabaaa1d61..b2421d493f 100644 +--- a/sysdeps/aarch64/fpu/exp_sve.c ++++ b/sysdeps/aarch64/fpu/exp_sve.c +@@ -21,12 +21,15 @@ + + static const struct data + { +- double poly[4]; ++ double c0, c2; ++ double c1, c3; + double ln2_hi, ln2_lo, inv_ln2, shift, thres; ++ + } data = { +- .poly = { /* ulp error: 0.53. */ +- 0x1.fffffffffdbcdp-2, 0x1.555555555444cp-3, 0x1.555573c6a9f7dp-5, +- 0x1.1111266d28935p-7 }, ++ .c0 = 0x1.fffffffffdbcdp-2, ++ .c1 = 0x1.555555555444cp-3, ++ .c2 = 0x1.555573c6a9f7dp-5, ++ .c3 = 0x1.1111266d28935p-7, + .ln2_hi = 0x1.62e42fefa3800p-1, + .ln2_lo = 0x1.ef35793c76730p-45, + /* 1/ln2. */ +@@ -36,7 +39,6 @@ static const struct data + .thres = 704.0, + }; + +-#define C(i) sv_f64 (d->poly[i]) + #define SpecialOffset 0x6000000000000000 /* 0x1p513. */ + /* SpecialBias1 + SpecialBias1 = asuint(1.0). */ + #define SpecialBias1 0x7000000000000000 /* 0x1p769. */ +@@ -56,20 +58,20 @@ special_case (svbool_t pg, svfloat64_t s, svfloat64_t y, svfloat64_t n) + svuint64_t b + = svdup_u64_z (p_sign, SpecialOffset); /* Inactive lanes set to 0. */ + +- /* Set s1 to generate overflow depending on sign of exponent n. */ +- svfloat64_t s1 = svreinterpret_f64 ( +- svsubr_x (pg, b, SpecialBias1)); /* 0x70...0 - b. */ +- /* Offset s to avoid overflow in final result if n is below threshold. */ ++ /* Set s1 to generate overflow depending on sign of exponent n, ++ ie. s1 = 0x70...0 - b. */ ++ svfloat64_t s1 = svreinterpret_f64 (svsubr_x (pg, b, SpecialBias1)); ++ /* Offset s to avoid overflow in final result if n is below threshold. ++ ie. s2 = as_u64 (s) - 0x3010...0 + b. */ + svfloat64_t s2 = svreinterpret_f64 ( +- svadd_x (pg, svsub_x (pg, svreinterpret_u64 (s), SpecialBias2), +- b)); /* as_u64 (s) - 0x3010...0 + b. */ ++ svadd_x (pg, svsub_x (pg, svreinterpret_u64 (s), SpecialBias2), b)); + + /* |n| > 1280 => 2^(n) overflows. */ + svbool_t p_cmp = svacgt (pg, n, 1280.0); + +- svfloat64_t r1 = svmul_x (pg, s1, s1); ++ svfloat64_t r1 = svmul_x (svptrue_b64 (), s1, s1); + svfloat64_t r2 = svmla_x (pg, s2, s2, y); +- svfloat64_t r0 = svmul_x (pg, r2, s1); ++ svfloat64_t r0 = svmul_x (svptrue_b64 (), r2, s1); + + return svsel (p_cmp, r1, r0); + } +@@ -103,16 +105,16 @@ svfloat64_t SV_NAME_D1 (exp) (svfloat64_t x, const svbool_t pg) + svfloat64_t z = svmla_x (pg, sv_f64 (d->shift), x, d->inv_ln2); + svuint64_t u = svreinterpret_u64 (z); + svfloat64_t n = svsub_x (pg, z, d->shift); +- ++ svfloat64_t c13 = svld1rq (svptrue_b64 (), &d->c1); + /* r = x - n * ln2, r is in [-ln2/(2N), ln2/(2N)]. */ + svfloat64_t ln2 = svld1rq (svptrue_b64 (), &d->ln2_hi); + svfloat64_t r = svmls_lane (x, n, ln2, 0); + r = svmls_lane (r, n, ln2, 1); + + /* y = exp(r) - 1 ~= r + C0 r^2 + C1 r^3 + C2 r^4 + C3 r^5. */ +- svfloat64_t r2 = svmul_x (pg, r, r); +- svfloat64_t p01 = svmla_x (pg, C (0), C (1), r); +- svfloat64_t p23 = svmla_x (pg, C (2), C (3), r); ++ svfloat64_t r2 = svmul_x (svptrue_b64 (), r, r); ++ svfloat64_t p01 = svmla_lane (sv_f64 (d->c0), r, c13, 0); ++ svfloat64_t p23 = svmla_lane (sv_f64 (d->c2), r, c13, 1); + svfloat64_t p04 = svmla_x (pg, p01, p23, r2); + svfloat64_t y = svmla_x (pg, r, p04, r2); + +diff --git a/sysdeps/aarch64/fpu/sv_expf_inline.h b/sysdeps/aarch64/fpu/sv_expf_inline.h +index 6166df6553..75781fb4dd 100644 +--- a/sysdeps/aarch64/fpu/sv_expf_inline.h ++++ b/sysdeps/aarch64/fpu/sv_expf_inline.h +@@ -61,7 +61,7 @@ expf_inline (svfloat32_t x, const svbool_t pg, const struct sv_expf_data *d) + /* scale = 2^(n/N). */ + svfloat32_t scale = svexpa (svreinterpret_u32 (z)); + +- /* y = exp(r) - 1 ~= r + C0 r^2 + C1 r^3 + C2 r^4 + C3 r^5 + C4 r^6. */ ++ /* poly(r) = exp(r) - 1 ~= C0 r + C1 r^2 + C2 r^3 + C3 r^4 + C4 r^5. */ + svfloat32_t p12 = svmla_lane (sv_f32 (d->c1), r, lane_consts, 2); + svfloat32_t p34 = svmla_lane (sv_f32 (d->c3), r, lane_consts, 3); + svfloat32_t r2 = svmul_x (svptrue_b32 (), r, r); +@@ -71,5 +71,4 @@ expf_inline (svfloat32_t x, const svbool_t pg, const struct sv_expf_data *d) + + return svmla_x (pg, scale, scale, poly); + } +- + #endif + +commit 194185c28954dfa11a6ded8b32f34fee680d3218 +Author: Yat Long Poon +Date: Thu Feb 13 18:00:50 2025 +0000 + + AArch64: Improve codegen for SVE erfcf + + Reduce number of MOV/MOVPRFXs and use unpredicated FMUL. + Replace MUL with LSL. Speedup on Neoverse V1: 6%. + + Reviewed-by: Wilco Dijkstra + (cherry picked from commit f5ff34cb3c75ec1061c75bb9188b3c1176426947) + +diff --git a/sysdeps/aarch64/fpu/erfcf_sve.c b/sysdeps/aarch64/fpu/erfcf_sve.c +index ecacb933ac..e4869263e3 100644 +--- a/sysdeps/aarch64/fpu/erfcf_sve.c ++++ b/sysdeps/aarch64/fpu/erfcf_sve.c +@@ -76,7 +76,7 @@ svfloat32_t SV_NAME_F1 (erfc) (svfloat32_t x, const svbool_t pg) + svuint32_t i = svqadd (svreinterpret_u32 (z), dat->off_idx); + + /* Lookup erfc(r) and 2/sqrt(pi)*exp(-r^2) in tables. */ +- i = svmul_x (pg, i, 2); ++ i = svlsl_x (svptrue_b32 (), i, 1); + const float32_t *p = &__v_erfcf_data.tab[0].erfc - 2 * dat->off_arr; + svfloat32_t erfcr = svld1_gather_index (pg, p, i); + svfloat32_t scale = svld1_gather_index (pg, p + 1, i); +@@ -84,15 +84,15 @@ svfloat32_t SV_NAME_F1 (erfc) (svfloat32_t x, const svbool_t pg) + /* erfc(x) ~ erfc(r) - scale * d * poly(r, d). */ + svfloat32_t r = svsub_x (pg, z, shift); + svfloat32_t d = svsub_x (pg, a, r); +- svfloat32_t d2 = svmul_x (pg, d, d); +- svfloat32_t r2 = svmul_x (pg, r, r); ++ svfloat32_t d2 = svmul_x (svptrue_b32 (), d, d); ++ svfloat32_t r2 = svmul_x (svptrue_b32 (), r, r); + + svfloat32_t coeffs = svld1rq (svptrue_b32 (), &dat->third); +- svfloat32_t third = svdup_lane (coeffs, 0); + + svfloat32_t p1 = r; +- svfloat32_t p2 = svmls_lane (third, r2, coeffs, 1); +- svfloat32_t p3 = svmul_x (pg, r, svmla_lane (sv_f32 (-0.5), r2, coeffs, 0)); ++ svfloat32_t p2 = svmls_lane (sv_f32 (dat->third), r2, coeffs, 1); ++ svfloat32_t p3 ++ = svmul_x (svptrue_b32 (), r, svmla_lane (sv_f32 (-0.5), r2, coeffs, 0)); + svfloat32_t p4 = svmla_lane (sv_f32 (dat->two_over_five), r2, coeffs, 2); + p4 = svmls_x (pg, sv_f32 (dat->tenth), r2, p4); + + +commit 7dc549c5a4af3c32689147550144397116404d22 +Author: Yat Long Poon +Date: Thu Feb 13 18:02:01 2025 +0000 + + AArch64: Improve codegen for SVE pow + + Move constants to struct. Improve memory access with indexed/unpredicated + instructions. Eliminate register spills. Speedup on Neoverse V1: 24%. + + Reviewed-by: Wilco Dijkstra + (cherry picked from commit 0b195651db3ae793187c7dd6d78b5a7a8da9d5e6) + +diff --git a/sysdeps/aarch64/fpu/pow_sve.c b/sysdeps/aarch64/fpu/pow_sve.c +index 4c0bf8956c..4242d22a49 100644 +--- a/sysdeps/aarch64/fpu/pow_sve.c ++++ b/sysdeps/aarch64/fpu/pow_sve.c +@@ -44,19 +44,18 @@ + + /* Data is defined in v_pow_log_data.c. */ + #define N_LOG (1 << V_POW_LOG_TABLE_BITS) +-#define A __v_pow_log_data.poly + #define Off 0x3fe6955500000000 + + /* Data is defined in v_pow_exp_data.c. */ + #define N_EXP (1 << V_POW_EXP_TABLE_BITS) + #define SignBias (0x800 << V_POW_EXP_TABLE_BITS) +-#define C __v_pow_exp_data.poly + #define SmallExp 0x3c9 /* top12(0x1p-54). */ + #define BigExp 0x408 /* top12(512.). */ + #define ThresExp 0x03f /* BigExp - SmallExp. */ + #define HugeExp 0x409 /* top12(1024.). */ + + /* Constants associated with pow. */ ++#define SmallBoundX 0x1p-126 + #define SmallPowX 0x001 /* top12(0x1p-126). */ + #define BigPowX 0x7ff /* top12(INFINITY). */ + #define ThresPowX 0x7fe /* BigPowX - SmallPowX. */ +@@ -64,6 +63,31 @@ + #define BigPowY 0x43e /* top12(0x1.749p62). */ + #define ThresPowY 0x080 /* BigPowY - SmallPowY. */ + ++static const struct data ++{ ++ double log_c0, log_c2, log_c4, log_c6, ln2_hi, ln2_lo; ++ double log_c1, log_c3, log_c5, off; ++ double n_over_ln2, exp_c2, ln2_over_n_hi, ln2_over_n_lo; ++ double exp_c0, exp_c1; ++} data = { ++ .log_c0 = -0x1p-1, ++ .log_c1 = -0x1.555555555556p-1, ++ .log_c2 = 0x1.0000000000006p-1, ++ .log_c3 = 0x1.999999959554ep-1, ++ .log_c4 = -0x1.555555529a47ap-1, ++ .log_c5 = -0x1.2495b9b4845e9p0, ++ .log_c6 = 0x1.0002b8b263fc3p0, ++ .off = Off, ++ .exp_c0 = 0x1.fffffffffffd4p-2, ++ .exp_c1 = 0x1.5555571d6ef9p-3, ++ .exp_c2 = 0x1.5555576a5adcep-5, ++ .ln2_hi = 0x1.62e42fefa3800p-1, ++ .ln2_lo = 0x1.ef35793c76730p-45, ++ .n_over_ln2 = 0x1.71547652b82fep0 * N_EXP, ++ .ln2_over_n_hi = 0x1.62e42fefc0000p-9, ++ .ln2_over_n_lo = -0x1.c610ca86c3899p-45, ++}; ++ + /* Check if x is an integer. */ + static inline svbool_t + sv_isint (svbool_t pg, svfloat64_t x) +@@ -82,7 +106,7 @@ sv_isnotint (svbool_t pg, svfloat64_t x) + static inline svbool_t + sv_isodd (svbool_t pg, svfloat64_t x) + { +- svfloat64_t y = svmul_x (pg, x, 0.5); ++ svfloat64_t y = svmul_x (svptrue_b64 (), x, 0.5); + return sv_isnotint (pg, y); + } + +@@ -121,7 +145,7 @@ zeroinfnan (uint64_t i) + static inline svbool_t + sv_zeroinfnan (svbool_t pg, svuint64_t i) + { +- return svcmpge (pg, svsub_x (pg, svmul_x (pg, i, 2), 1), ++ return svcmpge (pg, svsub_x (pg, svadd_x (pg, i, i), 1), + 2 * asuint64 (INFINITY) - 1); + } + +@@ -174,16 +198,17 @@ sv_call_specialcase (svfloat64_t x1, svuint64_t u1, svuint64_t u2, + additional 15 bits precision. IX is the bit representation of x, but + normalized in the subnormal range using the sign bit for the exponent. */ + static inline svfloat64_t +-sv_log_inline (svbool_t pg, svuint64_t ix, svfloat64_t *tail) ++sv_log_inline (svbool_t pg, svuint64_t ix, svfloat64_t *tail, ++ const struct data *d) + { + /* x = 2^k z; where z is in range [Off,2*Off) and exact. + The range is split into N subintervals. + The ith subinterval contains z and c is near its center. */ +- svuint64_t tmp = svsub_x (pg, ix, Off); ++ svuint64_t tmp = svsub_x (pg, ix, d->off); + svuint64_t i = svand_x (pg, svlsr_x (pg, tmp, 52 - V_POW_LOG_TABLE_BITS), + sv_u64 (N_LOG - 1)); + svint64_t k = svasr_x (pg, svreinterpret_s64 (tmp), 52); +- svuint64_t iz = svsub_x (pg, ix, svand_x (pg, tmp, sv_u64 (0xfffULL << 52))); ++ svuint64_t iz = svsub_x (pg, ix, svlsl_x (pg, svreinterpret_u64 (k), 52)); + svfloat64_t z = svreinterpret_f64 (iz); + svfloat64_t kd = svcvt_f64_x (pg, k); + +@@ -199,40 +224,85 @@ sv_log_inline (svbool_t pg, svuint64_t ix, svfloat64_t *tail) + |z/c - 1| < 1/N, so r = z/c - 1 is exactly representible. */ + svfloat64_t r = svmad_x (pg, z, invc, -1.0); + /* k*Ln2 + log(c) + r. */ +- svfloat64_t t1 = svmla_x (pg, logc, kd, __v_pow_log_data.ln2_hi); ++ ++ svfloat64_t ln2_hilo = svld1rq_f64 (svptrue_b64 (), &d->ln2_hi); ++ svfloat64_t t1 = svmla_lane_f64 (logc, kd, ln2_hilo, 0); + svfloat64_t t2 = svadd_x (pg, t1, r); +- svfloat64_t lo1 = svmla_x (pg, logctail, kd, __v_pow_log_data.ln2_lo); ++ svfloat64_t lo1 = svmla_lane_f64 (logctail, kd, ln2_hilo, 1); + svfloat64_t lo2 = svadd_x (pg, svsub_x (pg, t1, t2), r); + + /* Evaluation is optimized assuming superscalar pipelined execution. */ +- svfloat64_t ar = svmul_x (pg, r, -0.5); /* A[0] = -0.5. */ +- svfloat64_t ar2 = svmul_x (pg, r, ar); +- svfloat64_t ar3 = svmul_x (pg, r, ar2); ++ ++ svfloat64_t log_c02 = svld1rq_f64 (svptrue_b64 (), &d->log_c0); ++ svfloat64_t ar = svmul_lane_f64 (r, log_c02, 0); ++ svfloat64_t ar2 = svmul_x (svptrue_b64 (), r, ar); ++ svfloat64_t ar3 = svmul_x (svptrue_b64 (), r, ar2); + /* k*Ln2 + log(c) + r + A[0]*r*r. */ + svfloat64_t hi = svadd_x (pg, t2, ar2); +- svfloat64_t lo3 = svmla_x (pg, svneg_x (pg, ar2), ar, r); ++ svfloat64_t lo3 = svmls_x (pg, ar2, ar, r); + svfloat64_t lo4 = svadd_x (pg, svsub_x (pg, t2, hi), ar2); + /* p = log1p(r) - r - A[0]*r*r. */ + /* p = (ar3 * (A[1] + r * A[2] + ar2 * (A[3] + r * A[4] + ar2 * (A[5] + r * + A[6])))). */ +- svfloat64_t a56 = svmla_x (pg, sv_f64 (A[5]), r, A[6]); +- svfloat64_t a34 = svmla_x (pg, sv_f64 (A[3]), r, A[4]); +- svfloat64_t a12 = svmla_x (pg, sv_f64 (A[1]), r, A[2]); ++ ++ svfloat64_t log_c46 = svld1rq_f64 (svptrue_b64 (), &d->log_c4); ++ svfloat64_t a56 = svmla_lane_f64 (sv_f64 (d->log_c5), r, log_c46, 1); ++ svfloat64_t a34 = svmla_lane_f64 (sv_f64 (d->log_c3), r, log_c46, 0); ++ svfloat64_t a12 = svmla_lane_f64 (sv_f64 (d->log_c1), r, log_c02, 1); + svfloat64_t p = svmla_x (pg, a34, ar2, a56); + p = svmla_x (pg, a12, ar2, p); +- p = svmul_x (pg, ar3, p); ++ p = svmul_x (svptrue_b64 (), ar3, p); + svfloat64_t lo = svadd_x ( +- pg, svadd_x (pg, svadd_x (pg, svadd_x (pg, lo1, lo2), lo3), lo4), p); ++ pg, svadd_x (pg, svsub_x (pg, svadd_x (pg, lo1, lo2), lo3), lo4), p); + svfloat64_t y = svadd_x (pg, hi, lo); + *tail = svadd_x (pg, svsub_x (pg, hi, y), lo); + return y; + } + ++static inline svfloat64_t ++sv_exp_core (svbool_t pg, svfloat64_t x, svfloat64_t xtail, ++ svuint64_t sign_bias, svfloat64_t *tmp, svuint64_t *sbits, ++ svuint64_t *ki, const struct data *d) ++{ ++ /* exp(x) = 2^(k/N) * exp(r), with exp(r) in [2^(-1/2N),2^(1/2N)]. */ ++ /* x = ln2/N*k + r, with int k and r in [-ln2/2N, ln2/2N]. */ ++ svfloat64_t n_over_ln2_and_c2 = svld1rq_f64 (svptrue_b64 (), &d->n_over_ln2); ++ svfloat64_t z = svmul_lane_f64 (x, n_over_ln2_and_c2, 0); ++ /* z - kd is in [-1, 1] in non-nearest rounding modes. */ ++ svfloat64_t kd = svrinta_x (pg, z); ++ *ki = svreinterpret_u64 (svcvt_s64_x (pg, kd)); ++ ++ svfloat64_t ln2_over_n_hilo ++ = svld1rq_f64 (svptrue_b64 (), &d->ln2_over_n_hi); ++ svfloat64_t r = x; ++ r = svmls_lane_f64 (r, kd, ln2_over_n_hilo, 0); ++ r = svmls_lane_f64 (r, kd, ln2_over_n_hilo, 1); ++ /* The code assumes 2^-200 < |xtail| < 2^-8/N. */ ++ r = svadd_x (pg, r, xtail); ++ /* 2^(k/N) ~= scale. */ ++ svuint64_t idx = svand_x (pg, *ki, N_EXP - 1); ++ svuint64_t top ++ = svlsl_x (pg, svadd_x (pg, *ki, sign_bias), 52 - V_POW_EXP_TABLE_BITS); ++ /* This is only a valid scale when -1023*N < k < 1024*N. */ ++ *sbits = svld1_gather_index (pg, __v_pow_exp_data.sbits, idx); ++ *sbits = svadd_x (pg, *sbits, top); ++ /* exp(x) = 2^(k/N) * exp(r) ~= scale + scale * (exp(r) - 1). */ ++ svfloat64_t r2 = svmul_x (svptrue_b64 (), r, r); ++ *tmp = svmla_lane_f64 (sv_f64 (d->exp_c1), r, n_over_ln2_and_c2, 1); ++ *tmp = svmla_x (pg, sv_f64 (d->exp_c0), r, *tmp); ++ *tmp = svmla_x (pg, r, r2, *tmp); ++ svfloat64_t scale = svreinterpret_f64 (*sbits); ++ /* Note: tmp == 0 or |tmp| > 2^-200 and scale > 2^-739, so there ++ is no spurious underflow here even without fma. */ ++ z = svmla_x (pg, scale, scale, *tmp); ++ return z; ++} ++ + /* Computes sign*exp(x+xtail) where |xtail| < 2^-8/N and |xtail| <= |x|. + The sign_bias argument is SignBias or 0 and sets the sign to -1 or 1. */ + static inline svfloat64_t + sv_exp_inline (svbool_t pg, svfloat64_t x, svfloat64_t xtail, +- svuint64_t sign_bias) ++ svuint64_t sign_bias, const struct data *d) + { + /* 3 types of special cases: tiny (uflow and spurious uflow), huge (oflow) + and other cases of large values of x (scale * (1 + TMP) oflow). */ +@@ -240,73 +310,46 @@ sv_exp_inline (svbool_t pg, svfloat64_t x, svfloat64_t xtail, + /* |x| is large (|x| >= 512) or tiny (|x| <= 0x1p-54). */ + svbool_t uoflow = svcmpge (pg, svsub_x (pg, abstop, SmallExp), ThresExp); + +- /* Conditions special, uflow and oflow are all expressed as uoflow && +- something, hence do not bother computing anything if no lane in uoflow is +- true. */ +- svbool_t special = svpfalse_b (); +- svbool_t uflow = svpfalse_b (); +- svbool_t oflow = svpfalse_b (); ++ svfloat64_t tmp; ++ svuint64_t sbits, ki; + if (__glibc_unlikely (svptest_any (pg, uoflow))) + { ++ svfloat64_t z ++ = sv_exp_core (pg, x, xtail, sign_bias, &tmp, &sbits, &ki, d); ++ + /* |x| is tiny (|x| <= 0x1p-54). */ +- uflow = svcmpge (pg, svsub_x (pg, abstop, SmallExp), 0x80000000); ++ svbool_t uflow ++ = svcmpge (pg, svsub_x (pg, abstop, SmallExp), 0x80000000); + uflow = svand_z (pg, uoflow, uflow); + /* |x| is huge (|x| >= 1024). */ +- oflow = svcmpge (pg, abstop, HugeExp); ++ svbool_t oflow = svcmpge (pg, abstop, HugeExp); + oflow = svand_z (pg, uoflow, svbic_z (pg, oflow, uflow)); ++ + /* For large |x| values (512 < |x| < 1024) scale * (1 + TMP) can overflow +- or underflow. */ +- special = svbic_z (pg, uoflow, svorr_z (pg, uflow, oflow)); ++ or underflow. */ ++ svbool_t special = svbic_z (pg, uoflow, svorr_z (pg, uflow, oflow)); ++ ++ /* Update result with special and large cases. */ ++ z = sv_call_specialcase (tmp, sbits, ki, z, special); ++ ++ /* Handle underflow and overflow. */ ++ svbool_t x_is_neg = svcmplt (pg, x, 0); ++ svuint64_t sign_mask ++ = svlsl_x (pg, sign_bias, 52 - V_POW_EXP_TABLE_BITS); ++ svfloat64_t res_uoflow ++ = svsel (x_is_neg, sv_f64 (0.0), sv_f64 (INFINITY)); ++ res_uoflow = svreinterpret_f64 ( ++ svorr_x (pg, svreinterpret_u64 (res_uoflow), sign_mask)); ++ /* Avoid spurious underflow for tiny x. */ ++ svfloat64_t res_spurious_uflow ++ = svreinterpret_f64 (svorr_x (pg, sign_mask, 0x3ff0000000000000)); ++ ++ z = svsel (oflow, res_uoflow, z); ++ z = svsel (uflow, res_spurious_uflow, z); ++ return z; + } + +- /* exp(x) = 2^(k/N) * exp(r), with exp(r) in [2^(-1/2N),2^(1/2N)]. */ +- /* x = ln2/N*k + r, with int k and r in [-ln2/2N, ln2/2N]. */ +- svfloat64_t z = svmul_x (pg, x, __v_pow_exp_data.n_over_ln2); +- /* z - kd is in [-1, 1] in non-nearest rounding modes. */ +- svfloat64_t shift = sv_f64 (__v_pow_exp_data.shift); +- svfloat64_t kd = svadd_x (pg, z, shift); +- svuint64_t ki = svreinterpret_u64 (kd); +- kd = svsub_x (pg, kd, shift); +- svfloat64_t r = x; +- r = svmls_x (pg, r, kd, __v_pow_exp_data.ln2_over_n_hi); +- r = svmls_x (pg, r, kd, __v_pow_exp_data.ln2_over_n_lo); +- /* The code assumes 2^-200 < |xtail| < 2^-8/N. */ +- r = svadd_x (pg, r, xtail); +- /* 2^(k/N) ~= scale. */ +- svuint64_t idx = svand_x (pg, ki, N_EXP - 1); +- svuint64_t top +- = svlsl_x (pg, svadd_x (pg, ki, sign_bias), 52 - V_POW_EXP_TABLE_BITS); +- /* This is only a valid scale when -1023*N < k < 1024*N. */ +- svuint64_t sbits = svld1_gather_index (pg, __v_pow_exp_data.sbits, idx); +- sbits = svadd_x (pg, sbits, top); +- /* exp(x) = 2^(k/N) * exp(r) ~= scale + scale * (exp(r) - 1). */ +- svfloat64_t r2 = svmul_x (pg, r, r); +- svfloat64_t tmp = svmla_x (pg, sv_f64 (C[1]), r, C[2]); +- tmp = svmla_x (pg, sv_f64 (C[0]), r, tmp); +- tmp = svmla_x (pg, r, r2, tmp); +- svfloat64_t scale = svreinterpret_f64 (sbits); +- /* Note: tmp == 0 or |tmp| > 2^-200 and scale > 2^-739, so there +- is no spurious underflow here even without fma. */ +- z = svmla_x (pg, scale, scale, tmp); +- +- /* Update result with special and large cases. */ +- if (__glibc_unlikely (svptest_any (pg, special))) +- z = sv_call_specialcase (tmp, sbits, ki, z, special); +- +- /* Handle underflow and overflow. */ +- svuint64_t sign_bit = svlsr_x (pg, svreinterpret_u64 (x), 63); +- svbool_t x_is_neg = svcmpne (pg, sign_bit, 0); +- svuint64_t sign_mask = svlsl_x (pg, sign_bias, 52 - V_POW_EXP_TABLE_BITS); +- svfloat64_t res_uoflow = svsel (x_is_neg, sv_f64 (0.0), sv_f64 (INFINITY)); +- res_uoflow = svreinterpret_f64 ( +- svorr_x (pg, svreinterpret_u64 (res_uoflow), sign_mask)); +- z = svsel (oflow, res_uoflow, z); +- /* Avoid spurious underflow for tiny x. */ +- svfloat64_t res_spurious_uflow +- = svreinterpret_f64 (svorr_x (pg, sign_mask, 0x3ff0000000000000)); +- z = svsel (uflow, res_spurious_uflow, z); +- +- return z; ++ return sv_exp_core (pg, x, xtail, sign_bias, &tmp, &sbits, &ki, d); + } + + static inline double +@@ -341,47 +384,39 @@ pow_sc (double x, double y) + + svfloat64_t SV_NAME_D2 (pow) (svfloat64_t x, svfloat64_t y, const svbool_t pg) + { ++ const struct data *d = ptr_barrier (&data); ++ + /* This preamble handles special case conditions used in the final scalar + fallbacks. It also updates ix and sign_bias, that are used in the core + computation too, i.e., exp( y * log (x) ). */ + svuint64_t vix0 = svreinterpret_u64 (x); + svuint64_t viy0 = svreinterpret_u64 (y); +- svuint64_t vtopx0 = svlsr_x (svptrue_b64 (), vix0, 52); + + /* Negative x cases. */ +- svuint64_t sign_bit = svlsr_m (pg, vix0, 63); +- svbool_t xisneg = svcmpeq (pg, sign_bit, 1); ++ svbool_t xisneg = svcmplt (pg, x, 0); + + /* Set sign_bias and ix depending on sign of x and nature of y. */ +- svbool_t yisnotint_xisneg = svpfalse_b (); ++ svbool_t yint_or_xpos = pg; + svuint64_t sign_bias = sv_u64 (0); + svuint64_t vix = vix0; +- svuint64_t vtopx1 = vtopx0; + if (__glibc_unlikely (svptest_any (pg, xisneg))) + { + /* Determine nature of y. */ +- yisnotint_xisneg = sv_isnotint (xisneg, y); +- svbool_t yisint_xisneg = sv_isint (xisneg, y); ++ yint_or_xpos = sv_isint (xisneg, y); + svbool_t yisodd_xisneg = sv_isodd (xisneg, y); + /* ix set to abs(ix) if y is integer. */ +- vix = svand_m (yisint_xisneg, vix0, 0x7fffffffffffffff); +- vtopx1 = svand_m (yisint_xisneg, vtopx0, 0x7ff); ++ vix = svand_m (yint_or_xpos, vix0, 0x7fffffffffffffff); + /* Set to SignBias if x is negative and y is odd. */ + sign_bias = svsel (yisodd_xisneg, sv_u64 (SignBias), sv_u64 (0)); + } + +- /* Special cases of x or y: zero, inf and nan. */ +- svbool_t xspecial = sv_zeroinfnan (pg, vix0); +- svbool_t yspecial = sv_zeroinfnan (pg, viy0); +- svbool_t special = svorr_z (pg, xspecial, yspecial); +- + /* Small cases of x: |x| < 0x1p-126. */ +- svuint64_t vabstopx0 = svand_x (pg, vtopx0, 0x7ff); +- svbool_t xsmall = svcmplt (pg, vabstopx0, SmallPowX); +- if (__glibc_unlikely (svptest_any (pg, xsmall))) ++ svbool_t xsmall = svaclt (yint_or_xpos, x, SmallBoundX); ++ if (__glibc_unlikely (svptest_any (yint_or_xpos, xsmall))) + { + /* Normalize subnormal x so exponent becomes negative. */ +- svbool_t topx_is_null = svcmpeq (xsmall, vtopx1, 0); ++ svuint64_t vtopx = svlsr_x (svptrue_b64 (), vix, 52); ++ svbool_t topx_is_null = svcmpeq (xsmall, vtopx, 0); + + svuint64_t vix_norm = svreinterpret_u64 (svmul_m (xsmall, x, 0x1p52)); + vix_norm = svand_m (xsmall, vix_norm, 0x7fffffffffffffff); +@@ -391,20 +426,24 @@ svfloat64_t SV_NAME_D2 (pow) (svfloat64_t x, svfloat64_t y, const svbool_t pg) + + /* y_hi = log(ix, &y_lo). */ + svfloat64_t vlo; +- svfloat64_t vhi = sv_log_inline (pg, vix, &vlo); ++ svfloat64_t vhi = sv_log_inline (yint_or_xpos, vix, &vlo, d); + + /* z = exp(y_hi, y_lo, sign_bias). */ +- svfloat64_t vehi = svmul_x (pg, y, vhi); +- svfloat64_t velo = svmul_x (pg, y, vlo); +- svfloat64_t vemi = svmls_x (pg, vehi, y, vhi); +- velo = svsub_x (pg, velo, vemi); +- svfloat64_t vz = sv_exp_inline (pg, vehi, velo, sign_bias); ++ svfloat64_t vehi = svmul_x (svptrue_b64 (), y, vhi); ++ svfloat64_t vemi = svmls_x (yint_or_xpos, vehi, y, vhi); ++ svfloat64_t velo = svnmls_x (yint_or_xpos, vemi, y, vlo); ++ svfloat64_t vz = sv_exp_inline (yint_or_xpos, vehi, velo, sign_bias, d); + + /* Cases of finite y and finite negative x. */ +- vz = svsel (yisnotint_xisneg, sv_f64 (__builtin_nan ("")), vz); ++ vz = svsel (yint_or_xpos, vz, sv_f64 (__builtin_nan (""))); ++ ++ /* Special cases of x or y: zero, inf and nan. */ ++ svbool_t xspecial = sv_zeroinfnan (svptrue_b64 (), vix0); ++ svbool_t yspecial = sv_zeroinfnan (svptrue_b64 (), viy0); ++ svbool_t special = svorr_z (svptrue_b64 (), xspecial, yspecial); + + /* Cases of zero/inf/nan x or y. */ +- if (__glibc_unlikely (svptest_any (pg, special))) ++ if (__glibc_unlikely (svptest_any (svptrue_b64 (), special))) + vz = sv_call2_f64 (pow_sc, x, y, vz, special); + + return vz; + +commit 06fd8ad78f35a6cc65dc7c6c08ce55faf6ad079d +Author: Yat Long Poon +Date: Thu Feb 13 18:03:04 2025 +0000 + + AArch64: Improve codegen for SVE powf + + Improve memory access with indexed/unpredicated instructions. + Eliminate register spills. Speedup on Neoverse V1: 3%. + + Reviewed-by: Wilco Dijkstra + (cherry picked from commit 95e807209b680257a9afe81a507754f1565dbb4d) + +diff --git a/sysdeps/aarch64/fpu/powf_sve.c b/sysdeps/aarch64/fpu/powf_sve.c +index 4f6a142325..08d7019a18 100644 +--- a/sysdeps/aarch64/fpu/powf_sve.c ++++ b/sysdeps/aarch64/fpu/powf_sve.c +@@ -26,7 +26,6 @@ + #define Tlogc __v_powf_data.logc + #define Texp __v_powf_data.scale + #define SignBias (1 << (V_POWF_EXP2_TABLE_BITS + 11)) +-#define Shift 0x1.8p52 + #define Norm 0x1p23f /* 0x4b000000. */ + + /* Overall ULP error bound for pow is 2.6 ulp +@@ -36,7 +35,7 @@ static const struct data + double log_poly[4]; + double exp_poly[3]; + float uflow_bound, oflow_bound, small_bound; +- uint32_t sign_bias, sign_mask, subnormal_bias, off; ++ uint32_t sign_bias, subnormal_bias, off; + } data = { + /* rel err: 1.5 * 2^-30. Each coefficients is multiplied the value of + V_POWF_EXP2_N. */ +@@ -53,7 +52,6 @@ static const struct data + .small_bound = 0x1p-126f, + .off = 0x3f35d000, + .sign_bias = SignBias, +- .sign_mask = 0x80000000, + .subnormal_bias = 0x0b800000, /* 23 << 23. */ + }; + +@@ -86,7 +84,7 @@ svisodd (svbool_t pg, svfloat32_t x) + static inline svbool_t + sv_zeroinfnan (svbool_t pg, svuint32_t i) + { +- return svcmpge (pg, svsub_x (pg, svmul_x (pg, i, 2u), 1), ++ return svcmpge (pg, svsub_x (pg, svadd_x (pg, i, i), 1), + 2u * 0x7f800000 - 1); + } + +@@ -150,9 +148,14 @@ powf_specialcase (float x, float y, float z) + } + + /* Scalar fallback for special case routines with custom signature. */ +-static inline svfloat32_t +-sv_call_powf_sc (svfloat32_t x1, svfloat32_t x2, svfloat32_t y, svbool_t cmp) ++static svfloat32_t NOINLINE ++sv_call_powf_sc (svfloat32_t x1, svfloat32_t x2, svfloat32_t y) + { ++ /* Special cases of x or y: zero, inf and nan. */ ++ svbool_t xspecial = sv_zeroinfnan (svptrue_b32 (), svreinterpret_u32 (x1)); ++ svbool_t yspecial = sv_zeroinfnan (svptrue_b32 (), svreinterpret_u32 (x2)); ++ svbool_t cmp = svorr_z (svptrue_b32 (), xspecial, yspecial); ++ + svbool_t p = svpfirst (cmp, svpfalse ()); + while (svptest_any (cmp, p)) + { +@@ -182,30 +185,30 @@ sv_powf_core_ext (const svbool_t pg, svuint64_t i, svfloat64_t z, svint64_t k, + + /* Polynomial to approximate log1p(r)/ln2. */ + svfloat64_t logx = A (0); +- logx = svmla_x (pg, A (1), r, logx); +- logx = svmla_x (pg, A (2), r, logx); +- logx = svmla_x (pg, A (3), r, logx); +- logx = svmla_x (pg, y0, r, logx); ++ logx = svmad_x (pg, r, logx, A (1)); ++ logx = svmad_x (pg, r, logx, A (2)); ++ logx = svmad_x (pg, r, logx, A (3)); ++ logx = svmad_x (pg, r, logx, y0); + *pylogx = svmul_x (pg, y, logx); + + /* z - kd is in [-1, 1] in non-nearest rounding modes. */ +- svfloat64_t kd = svadd_x (pg, *pylogx, Shift); +- svuint64_t ki = svreinterpret_u64 (kd); +- kd = svsub_x (pg, kd, Shift); ++ svfloat64_t kd = svrinta_x (svptrue_b64 (), *pylogx); ++ svuint64_t ki = svreinterpret_u64 (svcvt_s64_x (svptrue_b64 (), kd)); + + r = svsub_x (pg, *pylogx, kd); + + /* exp2(x) = 2^(k/N) * 2^r ~= s * (C0*r^3 + C1*r^2 + C2*r + 1). */ +- svuint64_t t +- = svld1_gather_index (pg, Texp, svand_x (pg, ki, V_POWF_EXP2_N - 1)); +- svuint64_t ski = svadd_x (pg, ki, sign_bias); +- t = svadd_x (pg, t, svlsl_x (pg, ski, 52 - V_POWF_EXP2_TABLE_BITS)); ++ svuint64_t t = svld1_gather_index ( ++ svptrue_b64 (), Texp, svand_x (svptrue_b64 (), ki, V_POWF_EXP2_N - 1)); ++ svuint64_t ski = svadd_x (svptrue_b64 (), ki, sign_bias); ++ t = svadd_x (svptrue_b64 (), t, ++ svlsl_x (svptrue_b64 (), ski, 52 - V_POWF_EXP2_TABLE_BITS)); + svfloat64_t s = svreinterpret_f64 (t); + + svfloat64_t p = C (0); + p = svmla_x (pg, C (1), p, r); + p = svmla_x (pg, C (2), p, r); +- p = svmla_x (pg, s, p, svmul_x (pg, s, r)); ++ p = svmla_x (pg, s, p, svmul_x (svptrue_b64 (), s, r)); + + return p; + } +@@ -219,19 +222,16 @@ sv_powf_core (const svbool_t pg, svuint32_t i, svuint32_t iz, svint32_t k, + { + const svbool_t ptrue = svptrue_b64 (); + +- /* Unpack and promote input vectors (pg, y, z, i, k and sign_bias) into two in +- order to perform core computation in double precision. */ ++ /* Unpack and promote input vectors (pg, y, z, i, k and sign_bias) into two ++ * in order to perform core computation in double precision. */ + const svbool_t pg_lo = svunpklo (pg); + const svbool_t pg_hi = svunpkhi (pg); +- svfloat64_t y_lo = svcvt_f64_x ( +- ptrue, svreinterpret_f32 (svunpklo (svreinterpret_u32 (y)))); +- svfloat64_t y_hi = svcvt_f64_x ( +- ptrue, svreinterpret_f32 (svunpkhi (svreinterpret_u32 (y)))); +- svfloat32_t z = svreinterpret_f32 (iz); +- svfloat64_t z_lo = svcvt_f64_x ( +- ptrue, svreinterpret_f32 (svunpklo (svreinterpret_u32 (z)))); +- svfloat64_t z_hi = svcvt_f64_x ( +- ptrue, svreinterpret_f32 (svunpkhi (svreinterpret_u32 (z)))); ++ svfloat64_t y_lo ++ = svcvt_f64_x (pg, svreinterpret_f32 (svunpklo (svreinterpret_u32 (y)))); ++ svfloat64_t y_hi ++ = svcvt_f64_x (pg, svreinterpret_f32 (svunpkhi (svreinterpret_u32 (y)))); ++ svfloat64_t z_lo = svcvt_f64_x (pg, svreinterpret_f32 (svunpklo (iz))); ++ svfloat64_t z_hi = svcvt_f64_x (pg, svreinterpret_f32 (svunpkhi (iz))); + svuint64_t i_lo = svunpklo (i); + svuint64_t i_hi = svunpkhi (i); + svint64_t k_lo = svunpklo (k); +@@ -258,9 +258,9 @@ sv_powf_core (const svbool_t pg, svuint32_t i, svuint32_t iz, svint32_t k, + /* Implementation of SVE powf. + Provides the same accuracy as AdvSIMD powf, since it relies on the same + algorithm. The theoretical maximum error is under 2.60 ULPs. +- Maximum measured error is 2.56 ULPs: +- SV_NAME_F2 (pow) (0x1.004118p+0, 0x1.5d14a4p+16) got 0x1.fd4bp+127 +- want 0x1.fd4b06p+127. */ ++ Maximum measured error is 2.57 ULPs: ++ SV_NAME_F2 (pow) (0x1.031706p+0, 0x1.ce2ec2p+12) got 0x1.fff868p+127 ++ want 0x1.fff862p+127. */ + svfloat32_t SV_NAME_F2 (pow) (svfloat32_t x, svfloat32_t y, const svbool_t pg) + { + const struct data *d = ptr_barrier (&data); +@@ -269,21 +269,19 @@ svfloat32_t SV_NAME_F2 (pow) (svfloat32_t x, svfloat32_t y, const svbool_t pg) + svuint32_t viy0 = svreinterpret_u32 (y); + + /* Negative x cases. */ +- svuint32_t sign_bit = svand_m (pg, vix0, d->sign_mask); +- svbool_t xisneg = svcmpeq (pg, sign_bit, d->sign_mask); ++ svbool_t xisneg = svcmplt (pg, x, sv_f32 (0)); + + /* Set sign_bias and ix depending on sign of x and nature of y. */ +- svbool_t yisnotint_xisneg = svpfalse_b (); ++ svbool_t yint_or_xpos = pg; + svuint32_t sign_bias = sv_u32 (0); + svuint32_t vix = vix0; + if (__glibc_unlikely (svptest_any (pg, xisneg))) + { + /* Determine nature of y. */ +- yisnotint_xisneg = svisnotint (xisneg, y); +- svbool_t yisint_xisneg = svisint (xisneg, y); ++ yint_or_xpos = svisint (xisneg, y); + svbool_t yisodd_xisneg = svisodd (xisneg, y); + /* ix set to abs(ix) if y is integer. */ +- vix = svand_m (yisint_xisneg, vix0, 0x7fffffff); ++ vix = svand_m (yint_or_xpos, vix0, 0x7fffffff); + /* Set to SignBias if x is negative and y is odd. */ + sign_bias = svsel (yisodd_xisneg, sv_u32 (d->sign_bias), sv_u32 (0)); + } +@@ -294,8 +292,8 @@ svfloat32_t SV_NAME_F2 (pow) (svfloat32_t x, svfloat32_t y, const svbool_t pg) + svbool_t cmp = svorr_z (pg, xspecial, yspecial); + + /* Small cases of x: |x| < 0x1p-126. */ +- svbool_t xsmall = svaclt (pg, x, d->small_bound); +- if (__glibc_unlikely (svptest_any (pg, xsmall))) ++ svbool_t xsmall = svaclt (yint_or_xpos, x, d->small_bound); ++ if (__glibc_unlikely (svptest_any (yint_or_xpos, xsmall))) + { + /* Normalize subnormal x so exponent becomes negative. */ + svuint32_t vix_norm = svreinterpret_u32 (svmul_x (xsmall, x, Norm)); +@@ -304,32 +302,35 @@ svfloat32_t SV_NAME_F2 (pow) (svfloat32_t x, svfloat32_t y, const svbool_t pg) + vix = svsel (xsmall, vix_norm, vix); + } + /* Part of core computation carried in working precision. */ +- svuint32_t tmp = svsub_x (pg, vix, d->off); +- svuint32_t i = svand_x (pg, svlsr_x (pg, tmp, (23 - V_POWF_LOG2_TABLE_BITS)), +- V_POWF_LOG2_N - 1); +- svuint32_t top = svand_x (pg, tmp, 0xff800000); +- svuint32_t iz = svsub_x (pg, vix, top); +- svint32_t k +- = svasr_x (pg, svreinterpret_s32 (top), (23 - V_POWF_EXP2_TABLE_BITS)); +- +- /* Compute core in extended precision and return intermediate ylogx results to +- handle cases of underflow and underflow in exp. */ ++ svuint32_t tmp = svsub_x (yint_or_xpos, vix, d->off); ++ svuint32_t i = svand_x ( ++ yint_or_xpos, svlsr_x (yint_or_xpos, tmp, (23 - V_POWF_LOG2_TABLE_BITS)), ++ V_POWF_LOG2_N - 1); ++ svuint32_t top = svand_x (yint_or_xpos, tmp, 0xff800000); ++ svuint32_t iz = svsub_x (yint_or_xpos, vix, top); ++ svint32_t k = svasr_x (yint_or_xpos, svreinterpret_s32 (top), ++ (23 - V_POWF_EXP2_TABLE_BITS)); ++ ++ /* Compute core in extended precision and return intermediate ylogx results ++ * to handle cases of underflow and underflow in exp. */ + svfloat32_t ylogx; +- svfloat32_t ret = sv_powf_core (pg, i, iz, k, y, sign_bias, &ylogx, d); ++ svfloat32_t ret ++ = sv_powf_core (yint_or_xpos, i, iz, k, y, sign_bias, &ylogx, d); + + /* Handle exp special cases of underflow and overflow. */ +- svuint32_t sign = svlsl_x (pg, sign_bias, 20 - V_POWF_EXP2_TABLE_BITS); ++ svuint32_t sign ++ = svlsl_x (yint_or_xpos, sign_bias, 20 - V_POWF_EXP2_TABLE_BITS); + svfloat32_t ret_oflow +- = svreinterpret_f32 (svorr_x (pg, sign, asuint (INFINITY))); ++ = svreinterpret_f32 (svorr_x (yint_or_xpos, sign, asuint (INFINITY))); + svfloat32_t ret_uflow = svreinterpret_f32 (sign); +- ret = svsel (svcmple (pg, ylogx, d->uflow_bound), ret_uflow, ret); +- ret = svsel (svcmpgt (pg, ylogx, d->oflow_bound), ret_oflow, ret); ++ ret = svsel (svcmple (yint_or_xpos, ylogx, d->uflow_bound), ret_uflow, ret); ++ ret = svsel (svcmpgt (yint_or_xpos, ylogx, d->oflow_bound), ret_oflow, ret); + + /* Cases of finite y and finite negative x. */ +- ret = svsel (yisnotint_xisneg, sv_f32 (__builtin_nanf ("")), ret); ++ ret = svsel (yint_or_xpos, ret, sv_f32 (__builtin_nanf (""))); + +- if (__glibc_unlikely (svptest_any (pg, cmp))) +- return sv_call_powf_sc (x, y, ret, cmp); ++ if (__glibc_unlikely (svptest_any (cmp, cmp))) ++ return sv_call_powf_sc (x, y, ret); + + return ret; + } + +commit fd9a3a36fdcf14d1678c469e8b9033a46aa6c6fb +Author: Wilco Dijkstra +Date: Thu Feb 27 20:34:34 2025 +0000 + + Revert "AArch64: Add vector logp1 alias for log1p" + + This reverts commit a991a0fc7c051d7ef2ea7778e0a699f22d4e53d7. + +diff --git a/bits/libm-simd-decl-stubs.h b/bits/libm-simd-decl-stubs.h +index 5019e8e25c..08a41c46ad 100644 +--- a/bits/libm-simd-decl-stubs.h ++++ b/bits/libm-simd-decl-stubs.h +@@ -253,17 +253,6 @@ + #define __DECL_SIMD_log1pf64x + #define __DECL_SIMD_log1pf128x + +-#define __DECL_SIMD_logp1 +-#define __DECL_SIMD_logp1f +-#define __DECL_SIMD_logp1l +-#define __DECL_SIMD_logp1f16 +-#define __DECL_SIMD_logp1f32 +-#define __DECL_SIMD_logp1f64 +-#define __DECL_SIMD_logp1f128 +-#define __DECL_SIMD_logp1f32x +-#define __DECL_SIMD_logp1f64x +-#define __DECL_SIMD_logp1f128x +- + #define __DECL_SIMD_atanh + #define __DECL_SIMD_atanhf + #define __DECL_SIMD_atanhl +diff --git a/math/bits/mathcalls.h b/math/bits/mathcalls.h +index 92856becc4..6cb594b6ff 100644 +--- a/math/bits/mathcalls.h ++++ b/math/bits/mathcalls.h +@@ -126,7 +126,7 @@ __MATHCALL (log2p1,, (_Mdouble_ __x)); + __MATHCALL (log10p1,, (_Mdouble_ __x)); + + /* Return log(1 + X). */ +-__MATHCALL_VEC (logp1,, (_Mdouble_ __x)); ++__MATHCALL (logp1,, (_Mdouble_ __x)); + #endif + + #if defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99 +diff --git a/sysdeps/aarch64/fpu/Versions b/sysdeps/aarch64/fpu/Versions +index 015211f5f4..cc15ce2d1e 100644 +--- a/sysdeps/aarch64/fpu/Versions ++++ b/sysdeps/aarch64/fpu/Versions +@@ -135,11 +135,4 @@ libmvec { + _ZGVsMxv_tanh; + _ZGVsMxv_tanhf; + } +- GLIBC_2.41 { +- _ZGVnN2v_logp1; +- _ZGVnN2v_logp1f; +- _ZGVnN4v_logp1f; +- _ZGVsMxv_logp1; +- _ZGVsMxv_logp1f; +- } + } +diff --git a/sysdeps/aarch64/fpu/advsimd_f32_protos.h b/sysdeps/aarch64/fpu/advsimd_f32_protos.h +index 5909bb4ce9..097d403ffe 100644 +--- a/sysdeps/aarch64/fpu/advsimd_f32_protos.h ++++ b/sysdeps/aarch64/fpu/advsimd_f32_protos.h +@@ -36,7 +36,6 @@ libmvec_hidden_proto (V_NAME_F2(hypot)); + libmvec_hidden_proto (V_NAME_F1(log10)); + libmvec_hidden_proto (V_NAME_F1(log1p)); + libmvec_hidden_proto (V_NAME_F1(log2)); +-libmvec_hidden_proto (V_NAME_F1(logp1)); + libmvec_hidden_proto (V_NAME_F1(log)); + libmvec_hidden_proto (V_NAME_F2(pow)); + libmvec_hidden_proto (V_NAME_F1(sin)); +diff --git a/sysdeps/aarch64/fpu/bits/math-vector.h b/sysdeps/aarch64/fpu/bits/math-vector.h +index f295fe185d..7484150131 100644 +--- a/sysdeps/aarch64/fpu/bits/math-vector.h ++++ b/sysdeps/aarch64/fpu/bits/math-vector.h +@@ -113,10 +113,6 @@ + # define __DECL_SIMD_log2 __DECL_SIMD_aarch64 + # undef __DECL_SIMD_log2f + # define __DECL_SIMD_log2f __DECL_SIMD_aarch64 +-# undef __DECL_SIMD_logp1 +-# define __DECL_SIMD_logp1 __DECL_SIMD_aarch64 +-# undef __DECL_SIMD_logp1f +-# define __DECL_SIMD_logp1f __DECL_SIMD_aarch64 + # undef __DECL_SIMD_pow + # define __DECL_SIMD_pow __DECL_SIMD_aarch64 + # undef __DECL_SIMD_powf +@@ -184,7 +180,6 @@ __vpcs __f32x4_t _ZGVnN4v_logf (__f32x4_t); + __vpcs __f32x4_t _ZGVnN4v_log10f (__f32x4_t); + __vpcs __f32x4_t _ZGVnN4v_log1pf (__f32x4_t); + __vpcs __f32x4_t _ZGVnN4v_log2f (__f32x4_t); +-__vpcs __f32x4_t _ZGVnN4v_logp1f (__f32x4_t); + __vpcs __f32x4_t _ZGVnN4vv_powf (__f32x4_t, __f32x4_t); + __vpcs __f32x4_t _ZGVnN4v_sinf (__f32x4_t); + __vpcs __f32x4_t _ZGVnN4v_sinhf (__f32x4_t); +@@ -212,7 +207,6 @@ __vpcs __f64x2_t _ZGVnN2v_log (__f64x2_t); + __vpcs __f64x2_t _ZGVnN2v_log10 (__f64x2_t); + __vpcs __f64x2_t _ZGVnN2v_log1p (__f64x2_t); + __vpcs __f64x2_t _ZGVnN2v_log2 (__f64x2_t); +-__vpcs __f64x2_t _ZGVnN2v_logp1 (__f64x2_t); + __vpcs __f64x2_t _ZGVnN2vv_pow (__f64x2_t, __f64x2_t); + __vpcs __f64x2_t _ZGVnN2v_sin (__f64x2_t); + __vpcs __f64x2_t _ZGVnN2v_sinh (__f64x2_t); +@@ -245,7 +239,6 @@ __sv_f32_t _ZGVsMxv_logf (__sv_f32_t, __sv_bool_t); + __sv_f32_t _ZGVsMxv_log10f (__sv_f32_t, __sv_bool_t); + __sv_f32_t _ZGVsMxv_log1pf (__sv_f32_t, __sv_bool_t); + __sv_f32_t _ZGVsMxv_log2f (__sv_f32_t, __sv_bool_t); +-__sv_f32_t _ZGVsMxv_logp1f (__sv_f32_t, __sv_bool_t); + __sv_f32_t _ZGVsMxvv_powf (__sv_f32_t, __sv_f32_t, __sv_bool_t); + __sv_f32_t _ZGVsMxv_sinf (__sv_f32_t, __sv_bool_t); + __sv_f32_t _ZGVsMxv_sinhf (__sv_f32_t, __sv_bool_t); +@@ -273,7 +266,6 @@ __sv_f64_t _ZGVsMxv_log (__sv_f64_t, __sv_bool_t); + __sv_f64_t _ZGVsMxv_log10 (__sv_f64_t, __sv_bool_t); + __sv_f64_t _ZGVsMxv_log1p (__sv_f64_t, __sv_bool_t); + __sv_f64_t _ZGVsMxv_log2 (__sv_f64_t, __sv_bool_t); +-__sv_f64_t _ZGVsMxv_logp1 (__sv_f64_t, __sv_bool_t); + __sv_f64_t _ZGVsMxvv_pow (__sv_f64_t, __sv_f64_t, __sv_bool_t); + __sv_f64_t _ZGVsMxv_sin (__sv_f64_t, __sv_bool_t); + __sv_f64_t _ZGVsMxv_sinh (__sv_f64_t, __sv_bool_t); +diff --git a/sysdeps/aarch64/fpu/log1p_advsimd.c b/sysdeps/aarch64/fpu/log1p_advsimd.c +index 1263587201..9d18578ce6 100644 +--- a/sysdeps/aarch64/fpu/log1p_advsimd.c ++++ b/sysdeps/aarch64/fpu/log1p_advsimd.c +@@ -58,5 +58,3 @@ VPCS_ATTR float64x2_t V_NAME_D1 (log1p) (float64x2_t x) + + return log1p_inline (x, &d->d); + } +- +-strong_alias (V_NAME_D1 (log1p), V_NAME_D1 (logp1)) +diff --git a/sysdeps/aarch64/fpu/log1p_sve.c b/sysdeps/aarch64/fpu/log1p_sve.c +index b21cfb2c90..04f7e5720e 100644 +--- a/sysdeps/aarch64/fpu/log1p_sve.c ++++ b/sysdeps/aarch64/fpu/log1p_sve.c +@@ -116,5 +116,3 @@ svfloat64_t SV_NAME_D1 (log1p) (svfloat64_t x, svbool_t pg) + + return y; + } +- +-strong_alias (SV_NAME_D1 (log1p), SV_NAME_D1 (logp1)) +diff --git a/sysdeps/aarch64/fpu/log1pf_advsimd.c b/sysdeps/aarch64/fpu/log1pf_advsimd.c +index 00006fc703..f2d47962fe 100644 +--- a/sysdeps/aarch64/fpu/log1pf_advsimd.c ++++ b/sysdeps/aarch64/fpu/log1pf_advsimd.c +@@ -93,6 +93,3 @@ VPCS_ATTR float32x4_t V_NAME_F1 (log1p) (float32x4_t x) + + libmvec_hidden_def (V_NAME_F1 (log1p)) + HALF_WIDTH_ALIAS_F1 (log1p) +-strong_alias (V_NAME_F1 (log1p), V_NAME_F1 (logp1)) +-libmvec_hidden_def (V_NAME_F1 (logp1)) +-HALF_WIDTH_ALIAS_F1 (logp1) +diff --git a/sysdeps/aarch64/fpu/log1pf_sve.c b/sysdeps/aarch64/fpu/log1pf_sve.c +index 18a185c838..4f17c44e2d 100644 +--- a/sysdeps/aarch64/fpu/log1pf_sve.c ++++ b/sysdeps/aarch64/fpu/log1pf_sve.c +@@ -42,5 +42,3 @@ svfloat32_t SV_NAME_F1 (log1p) (svfloat32_t x, svbool_t pg) + + return sv_log1pf_inline (x, pg); + } +- +-strong_alias (SV_NAME_F1 (log1p), SV_NAME_F1 (logp1)) +diff --git a/sysdeps/unix/sysv/linux/aarch64/libmvec.abilist b/sysdeps/unix/sysv/linux/aarch64/libmvec.abilist +index 98687cae0d..b685106954 100644 +--- a/sysdeps/unix/sysv/linux/aarch64/libmvec.abilist ++++ b/sysdeps/unix/sysv/linux/aarch64/libmvec.abilist +@@ -128,8 +128,3 @@ GLIBC_2.40 _ZGVsMxvv_hypot F + GLIBC_2.40 _ZGVsMxvv_hypotf F + GLIBC_2.40 _ZGVsMxvv_pow F + GLIBC_2.40 _ZGVsMxvv_powf F +-GLIBC_2.41 _ZGVnN2v_logp1 F +-GLIBC_2.41 _ZGVnN2v_logp1f F +-GLIBC_2.41 _ZGVnN4v_logp1f F +-GLIBC_2.41 _ZGVsMxv_logp1 F +-GLIBC_2.41 _ZGVsMxv_logp1f F + +commit 64896b7d329809127035fde42768a6f7eeffed75 +Author: Wilco Dijkstra +Date: Wed Aug 7 14:43:47 2024 +0100 + + AArch64: Improve generic strlen + + Improve performance by handling another 16 bytes before entering the loop. + Use ADDHN in the loop to avoid SHRN+FMOV when it terminates. Change final + size computation to avoid increasing latency. On Neoverse V1 performance + of the random strlen benchmark improves by 4.6%. + + Reviewed-by: Adhemerval Zanella + (cherry picked from commit 3dc426b642dcafdbc11a99f2767e081d086f5fc7) + +diff --git a/sysdeps/aarch64/strlen.S b/sysdeps/aarch64/strlen.S +index ab2a576cdb..352fb40d3a 100644 +--- a/sysdeps/aarch64/strlen.S ++++ b/sysdeps/aarch64/strlen.S +@@ -1,4 +1,5 @@ +-/* Copyright (C) 2012-2024 Free Software Foundation, Inc. ++/* Generic optimized strlen using SIMD. ++ Copyright (C) 2012-2024 Free Software Foundation, Inc. + + This file is part of the GNU C Library. + +@@ -56,36 +57,50 @@ ENTRY (STRLEN) + shrn vend.8b, vhas_nul.8h, 4 /* 128->64 */ + fmov synd, dend + lsr synd, synd, shift +- cbz synd, L(loop) ++ cbz synd, L(next16) + + rbit synd, synd + clz result, synd + lsr result, result, 2 + ret + ++L(next16): ++ ldr data, [src, 16] ++ cmeq vhas_nul.16b, vdata.16b, 0 ++ shrn vend.8b, vhas_nul.8h, 4 /* 128->64 */ ++ fmov synd, dend ++ cbz synd, L(loop) ++ add src, src, 16 ++#ifndef __AARCH64EB__ ++ rbit synd, synd ++#endif ++ sub result, src, srcin ++ clz tmp, synd ++ add result, result, tmp, lsr 2 ++ ret ++ + .p2align 5 + L(loop): +- ldr data, [src, 16] ++ ldr data, [src, 32]! + cmeq vhas_nul.16b, vdata.16b, 0 +- umaxp vend.16b, vhas_nul.16b, vhas_nul.16b ++ addhn vend.8b, vhas_nul.8h, vhas_nul.8h + fmov synd, dend + cbnz synd, L(loop_end) +- ldr data, [src, 32]! ++ ldr data, [src, 16] + cmeq vhas_nul.16b, vdata.16b, 0 +- umaxp vend.16b, vhas_nul.16b, vhas_nul.16b ++ addhn vend.8b, vhas_nul.8h, vhas_nul.8h + fmov synd, dend + cbz synd, L(loop) +- sub src, src, 16 ++ add src, src, 16 + L(loop_end): +- shrn vend.8b, vhas_nul.8h, 4 /* 128->64 */ +- sub result, src, srcin +- fmov synd, dend ++ sub result, shift, src, lsl 2 /* (srcin - src) << 2. */ + #ifndef __AARCH64EB__ + rbit synd, synd ++ sub result, result, 3 + #endif +- add result, result, 16 + clz tmp, synd +- add result, result, tmp, lsr 2 ++ sub result, tmp, result ++ lsr result, result, 2 + ret + + END (STRLEN) + +commit 544fb349d35efd5f86ed7e482759ff21496a32fd +Author: Wilco Dijkstra +Date: Mon Sep 9 15:26:47 2024 +0100 + + AArch64: Optimize memset + + Improve small memsets by avoiding branches and use overlapping stores. + Use DC ZVA for copies over 128 bytes. Remove unnecessary code for ZVA sizes + other than 64 and 128. Performance of random memset benchmark improves by 24% + on Neoverse N1. + + Reviewed-by: Adhemerval Zanella + (cherry picked from commit cec3aef32412779e207f825db0d057ebb4628ae8) + +diff --git a/sysdeps/aarch64/memset.S b/sysdeps/aarch64/memset.S +index 7ef77ee8c9..caafb019e2 100644 +--- a/sysdeps/aarch64/memset.S ++++ b/sysdeps/aarch64/memset.S +@@ -1,4 +1,5 @@ +-/* Copyright (C) 2012-2024 Free Software Foundation, Inc. ++/* Generic optimized memset using SIMD. ++ Copyright (C) 2012-2024 Free Software Foundation, Inc. + + This file is part of the GNU C Library. + +@@ -17,7 +18,6 @@ + . */ + + #include +-#include "memset-reg.h" + + #ifndef MEMSET + # define MEMSET memset +@@ -25,130 +25,132 @@ + + /* Assumptions: + * +- * ARMv8-a, AArch64, unaligned accesses ++ * ARMv8-a, AArch64, Advanced SIMD, unaligned accesses. + * + */ + +-ENTRY (MEMSET) ++#define dstin x0 ++#define val x1 ++#define valw w1 ++#define count x2 ++#define dst x3 ++#define dstend x4 ++#define zva_val x5 ++#define off x3 ++#define dstend2 x5 + ++ENTRY (MEMSET) + PTR_ARG (0) + SIZE_ARG (2) + + dup v0.16B, valw ++ cmp count, 16 ++ b.lo L(set_small) ++ + add dstend, dstin, count ++ cmp count, 64 ++ b.hs L(set_128) + +- cmp count, 96 +- b.hi L(set_long) +- cmp count, 16 +- b.hs L(set_medium) +- mov val, v0.D[0] ++ /* Set 16..63 bytes. */ ++ mov off, 16 ++ and off, off, count, lsr 1 ++ sub dstend2, dstend, off ++ str q0, [dstin] ++ str q0, [dstin, off] ++ str q0, [dstend2, -16] ++ str q0, [dstend, -16] ++ ret + ++ .p2align 4 + /* Set 0..15 bytes. */ +- tbz count, 3, 1f +- str val, [dstin] +- str val, [dstend, -8] +- ret +- nop +-1: tbz count, 2, 2f +- str valw, [dstin] +- str valw, [dstend, -4] ++L(set_small): ++ add dstend, dstin, count ++ cmp count, 4 ++ b.lo 2f ++ lsr off, count, 3 ++ sub dstend2, dstend, off, lsl 2 ++ str s0, [dstin] ++ str s0, [dstin, off, lsl 2] ++ str s0, [dstend2, -4] ++ str s0, [dstend, -4] + ret ++ ++ /* Set 0..3 bytes. */ + 2: cbz count, 3f ++ lsr off, count, 1 + strb valw, [dstin] +- tbz count, 1, 3f +- strh valw, [dstend, -2] ++ strb valw, [dstin, off] ++ strb valw, [dstend, -1] + 3: ret + +- /* Set 17..96 bytes. */ +-L(set_medium): +- str q0, [dstin] +- tbnz count, 6, L(set96) +- str q0, [dstend, -16] +- tbz count, 5, 1f +- str q0, [dstin, 16] +- str q0, [dstend, -32] +-1: ret +- + .p2align 4 +- /* Set 64..96 bytes. Write 64 bytes from the start and +- 32 bytes from the end. */ +-L(set96): +- str q0, [dstin, 16] ++L(set_128): ++ bic dst, dstin, 15 ++ cmp count, 128 ++ b.hi L(set_long) ++ stp q0, q0, [dstin] + stp q0, q0, [dstin, 32] ++ stp q0, q0, [dstend, -64] + stp q0, q0, [dstend, -32] + ret + +- .p2align 3 +- nop ++ .p2align 4 + L(set_long): +- and valw, valw, 255 +- bic dst, dstin, 15 + str q0, [dstin] +- cmp count, 256 +- ccmp valw, 0, 0, cs +- b.eq L(try_zva) +-L(no_zva): +- sub count, dstend, dst /* Count is 16 too large. */ +- sub dst, dst, 16 /* Dst is biased by -32. */ +- sub count, count, 64 + 16 /* Adjust count and bias for loop. */ +-1: stp q0, q0, [dst, 32] +- stp q0, q0, [dst, 64]! +-L(tail64): +- subs count, count, 64 +- b.hi 1b +-2: stp q0, q0, [dstend, -64] ++ str q0, [dst, 16] ++ tst valw, 255 ++ b.ne L(no_zva) ++#ifndef ZVA64_ONLY ++ mrs zva_val, dczid_el0 ++ and zva_val, zva_val, 31 ++ cmp zva_val, 4 /* ZVA size is 64 bytes. */ ++ b.ne L(zva_128) ++#endif ++ stp q0, q0, [dst, 32] ++ bic dst, dstin, 63 ++ sub count, dstend, dst /* Count is now 64 too large. */ ++ sub count, count, 64 + 64 /* Adjust count and bias for loop. */ ++ ++ /* Write last bytes before ZVA loop. */ ++ stp q0, q0, [dstend, -64] + stp q0, q0, [dstend, -32] ++ ++ .p2align 4 ++L(zva64_loop): ++ add dst, dst, 64 ++ dc zva, dst ++ subs count, count, 64 ++ b.hi L(zva64_loop) + ret + +-L(try_zva): +-#ifndef ZVA64_ONLY + .p2align 3 +- mrs tmp1, dczid_el0 +- tbnz tmp1w, 4, L(no_zva) +- and tmp1w, tmp1w, 15 +- cmp tmp1w, 4 /* ZVA size is 64 bytes. */ +- b.ne L(zva_128) +- nop +-#endif +- /* Write the first and last 64 byte aligned block using stp rather +- than using DC ZVA. This is faster on some cores. +- */ +- .p2align 4 +-L(zva_64): +- str q0, [dst, 16] ++L(no_zva): ++ sub count, dstend, dst /* Count is 32 too large. */ ++ sub count, count, 64 + 32 /* Adjust count and bias for loop. */ ++L(no_zva_loop): + stp q0, q0, [dst, 32] +- bic dst, dst, 63 + stp q0, q0, [dst, 64] +- stp q0, q0, [dst, 96] +- sub count, dstend, dst /* Count is now 128 too large. */ +- sub count, count, 128+64+64 /* Adjust count and bias for loop. */ +- add dst, dst, 128 +-1: dc zva, dst + add dst, dst, 64 + subs count, count, 64 +- b.hi 1b +- stp q0, q0, [dst, 0] +- stp q0, q0, [dst, 32] ++ b.hi L(no_zva_loop) + stp q0, q0, [dstend, -64] + stp q0, q0, [dstend, -32] + ret + + #ifndef ZVA64_ONLY +- .p2align 3 ++ .p2align 4 + L(zva_128): +- cmp tmp1w, 5 /* ZVA size is 128 bytes. */ +- b.ne L(zva_other) ++ cmp zva_val, 5 /* ZVA size is 128 bytes. */ ++ b.ne L(no_zva) + +- str q0, [dst, 16] + stp q0, q0, [dst, 32] + stp q0, q0, [dst, 64] + stp q0, q0, [dst, 96] + bic dst, dst, 127 + sub count, dstend, dst /* Count is now 128 too large. */ +- sub count, count, 128+128 /* Adjust count and bias for loop. */ +- add dst, dst, 128 +-1: dc zva, dst +- add dst, dst, 128 ++ sub count, count, 128 + 128 /* Adjust count and bias for loop. */ ++1: add dst, dst, 128 ++ dc zva, dst + subs count, count, 128 + b.hi 1b + stp q0, q0, [dstend, -128] +@@ -156,35 +158,6 @@ L(zva_128): + stp q0, q0, [dstend, -64] + stp q0, q0, [dstend, -32] + ret +- +-L(zva_other): +- mov tmp2w, 4 +- lsl zva_lenw, tmp2w, tmp1w +- add tmp1, zva_len, 64 /* Max alignment bytes written. */ +- cmp count, tmp1 +- blo L(no_zva) +- +- sub tmp2, zva_len, 1 +- add tmp1, dst, zva_len +- add dst, dst, 16 +- subs count, tmp1, dst /* Actual alignment bytes to write. */ +- bic tmp1, tmp1, tmp2 /* Aligned dc zva start address. */ +- beq 2f +-1: stp q0, q0, [dst], 64 +- stp q0, q0, [dst, -32] +- subs count, count, 64 +- b.hi 1b +-2: mov dst, tmp1 +- sub count, dstend, tmp1 /* Remaining bytes to write. */ +- subs count, count, zva_len +- b.lo 4f +-3: dc zva, dst +- add dst, dst, zva_len +- subs count, count, zva_len +- b.hs 3b +-4: add count, count, zva_len +- sub dst, dst, 32 /* Bias dst for tail loop. */ +- b L(tail64) + #endif + + END (MEMSET) + +commit 41eb2f8b5847079caca90a74659456adbb80ec29 +Author: Wilco Dijkstra +Date: Mon Nov 25 18:43:08 2024 +0000 + + AArch64: Remove zva_128 from memset + + Remove ZVA 128 support from memset - the new memset no longer + guarantees count >= 256, which can result in underflow and a + crash if ZVA size is 128 ([1]). Since only one CPU uses a ZVA + size of 128 and its memcpy implementation was removed in commit + e162ab2bf1b82c40f29e1925986582fa07568ce8, remove this special + case too. + + [1] https://sourceware.org/pipermail/libc-alpha/2024-November/161626.html + + Reviewed-by: Andrew Pinski + (cherry picked from commit a08d9a52f967531a77e1824c23b5368c6434a72d) + +diff --git a/sysdeps/aarch64/memset.S b/sysdeps/aarch64/memset.S +index caafb019e2..71814d0b2f 100644 +--- a/sysdeps/aarch64/memset.S ++++ b/sysdeps/aarch64/memset.S +@@ -104,7 +104,7 @@ L(set_long): + mrs zva_val, dczid_el0 + and zva_val, zva_val, 31 + cmp zva_val, 4 /* ZVA size is 64 bytes. */ +- b.ne L(zva_128) ++ b.ne L(no_zva) + #endif + stp q0, q0, [dst, 32] + bic dst, dstin, 63 +@@ -137,28 +137,5 @@ L(no_zva_loop): + stp q0, q0, [dstend, -32] + ret + +-#ifndef ZVA64_ONLY +- .p2align 4 +-L(zva_128): +- cmp zva_val, 5 /* ZVA size is 128 bytes. */ +- b.ne L(no_zva) +- +- stp q0, q0, [dst, 32] +- stp q0, q0, [dst, 64] +- stp q0, q0, [dst, 96] +- bic dst, dst, 127 +- sub count, dstend, dst /* Count is now 128 too large. */ +- sub count, count, 128 + 128 /* Adjust count and bias for loop. */ +-1: add dst, dst, 128 +- dc zva, dst +- subs count, count, 128 +- b.hi 1b +- stp q0, q0, [dstend, -128] +- stp q0, q0, [dstend, -96] +- stp q0, q0, [dstend, -64] +- stp q0, q0, [dstend, -32] +- ret +-#endif +- + END (MEMSET) + libc_hidden_builtin_def (MEMSET) + +commit 27fa0268ead054810a5e2669d0b5bb88ceb05b05 +Author: Wilco Dijkstra +Date: Wed Jul 24 15:17:47 2024 +0100 + + math: Improve layout of expf data + + GCC aligns global data to 16 bytes if their size is >= 16 bytes. This patch + changes the exp2f_data struct slightly so that the fields are better aligned. + As a result on targets that support them, load-pair instructions accessing + poly_scaled and invln2_scaled are now 16-byte aligned. + + Reviewed-by: Adhemerval Zanella + (cherry picked from commit 44fa9c1080fe6a9539f0d2345b9d2ae37b8ee57a) + +diff --git a/sysdeps/ieee754/flt-32/math_config.h b/sysdeps/ieee754/flt-32/math_config.h +index 729f22cd4f..dc07ebd459 100644 +--- a/sysdeps/ieee754/flt-32/math_config.h ++++ b/sysdeps/ieee754/flt-32/math_config.h +@@ -166,9 +166,9 @@ extern const struct exp2f_data + uint64_t tab[1 << EXP2F_TABLE_BITS]; + double shift_scaled; + double poly[EXP2F_POLY_ORDER]; +- double shift; + double invln2_scaled; + double poly_scaled[EXP2F_POLY_ORDER]; ++ double shift; + } __exp2f_data attribute_hidden; + + #define LOGF_TABLE_BITS 4 + +commit 7038970f1f485fb660606f0c596f432fdef250f6 +Author: Wilco Dijkstra +Date: Tue Dec 24 18:01:59 2024 +0000 + + AArch64: Add SVE memset + + Add SVE memset based on the generic memset with predicated load for sizes < 16. + Unaligned memsets of 128-1024 are improved by ~20% on average by using aligned + stores for the last 64 bytes. Performance of random memset benchmark improves + by ~2% on Neoverse V1. + + Reviewed-by: Yury Khrustalev + (cherry picked from commit 163b1bbb76caba4d9673c07940c5930a1afa7548) + +diff --git a/sysdeps/aarch64/multiarch/Makefile b/sysdeps/aarch64/multiarch/Makefile +index 3e251cc234..6880ebc035 100644 +--- a/sysdeps/aarch64/multiarch/Makefile ++++ b/sysdeps/aarch64/multiarch/Makefile +@@ -16,6 +16,7 @@ sysdep_routines += \ + memset_kunpeng \ + memset_mops \ + memset_oryon1 \ ++ memset_sve_zva64 \ + memset_zva64 \ + strlen_asimd \ + strlen_generic \ +diff --git a/sysdeps/aarch64/multiarch/ifunc-impl-list.c b/sysdeps/aarch64/multiarch/ifunc-impl-list.c +index b2fda541f9..1f101a719b 100644 +--- a/sysdeps/aarch64/multiarch/ifunc-impl-list.c ++++ b/sysdeps/aarch64/multiarch/ifunc-impl-list.c +@@ -61,6 +61,7 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, + IFUNC_IMPL_ADD (array, i, memset, 1, __memset_kunpeng) + #if HAVE_AARCH64_SVE_ASM + IFUNC_IMPL_ADD (array, i, memset, sve && !bti && zva_size == 256, __memset_a64fx) ++ IFUNC_IMPL_ADD (array, i, memset, sve && zva_size == 64, __memset_sve_zva64) + #endif + IFUNC_IMPL_ADD (array, i, memset, mops, __memset_mops) + IFUNC_IMPL_ADD (array, i, memset, 1, __memset_generic)) +diff --git a/sysdeps/aarch64/multiarch/memset.c b/sysdeps/aarch64/multiarch/memset.c +index bd063c16c9..4f65295e77 100644 +--- a/sysdeps/aarch64/multiarch/memset.c ++++ b/sysdeps/aarch64/multiarch/memset.c +@@ -36,6 +36,7 @@ extern __typeof (__redirect_memset) __memset_a64fx attribute_hidden; + extern __typeof (__redirect_memset) __memset_generic attribute_hidden; + extern __typeof (__redirect_memset) __memset_mops attribute_hidden; + extern __typeof (__redirect_memset) __memset_oryon1 attribute_hidden; ++extern __typeof (__redirect_memset) __memset_sve_zva64 attribute_hidden; + + static inline __typeof (__redirect_memset) * + select_memset_ifunc (void) +@@ -49,6 +50,9 @@ select_memset_ifunc (void) + { + if (IS_A64FX (midr) && zva_size == 256) + return __memset_a64fx; ++ ++ if (zva_size == 64) ++ return __memset_sve_zva64; + } + + if (IS_ORYON1 (midr) && zva_size == 64) +diff --git a/sysdeps/aarch64/multiarch/memset_sve_zva64.S b/sysdeps/aarch64/multiarch/memset_sve_zva64.S +new file mode 100644 +index 0000000000..7fb40fdd9e +--- /dev/null ++++ b/sysdeps/aarch64/multiarch/memset_sve_zva64.S +@@ -0,0 +1,123 @@ ++/* Optimized memset for SVE. ++ Copyright (C) 2025 Free Software Foundation, Inc. ++ ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library. If not, see ++ . */ ++ ++#include ++ ++/* Assumptions: ++ * ++ * ARMv8-a, AArch64, Advanced SIMD, SVE, unaligned accesses. ++ * ZVA size is 64. ++ */ ++ ++#if HAVE_AARCH64_SVE_ASM ++ ++.arch armv8.2-a+sve ++ ++#define dstin x0 ++#define val x1 ++#define valw w1 ++#define count x2 ++#define dst x3 ++#define dstend x4 ++#define zva_val x5 ++#define vlen x5 ++#define off x3 ++#define dstend2 x5 ++ ++ENTRY (__memset_sve_zva64) ++ dup v0.16B, valw ++ cmp count, 16 ++ b.lo L(set_16) ++ ++ add dstend, dstin, count ++ cmp count, 64 ++ b.hs L(set_128) ++ ++ /* Set 16..63 bytes. */ ++ mov off, 16 ++ and off, off, count, lsr 1 ++ sub dstend2, dstend, off ++ str q0, [dstin] ++ str q0, [dstin, off] ++ str q0, [dstend2, -16] ++ str q0, [dstend, -16] ++ ret ++ ++ .p2align 4 ++L(set_16): ++ whilelo p0.b, xzr, count ++ st1b z0.b, p0, [dstin] ++ ret ++ ++ .p2align 4 ++L(set_128): ++ bic dst, dstin, 15 ++ cmp count, 128 ++ b.hi L(set_long) ++ stp q0, q0, [dstin] ++ stp q0, q0, [dstin, 32] ++ stp q0, q0, [dstend, -64] ++ stp q0, q0, [dstend, -32] ++ ret ++ ++ .p2align 4 ++L(set_long): ++ cmp count, 256 ++ b.lo L(no_zva) ++ tst valw, 255 ++ b.ne L(no_zva) ++ ++ str q0, [dstin] ++ str q0, [dst, 16] ++ bic dst, dstin, 31 ++ stp q0, q0, [dst, 32] ++ bic dst, dstin, 63 ++ sub count, dstend, dst /* Count is now 64 too large. */ ++ sub count, count, 128 /* Adjust count and bias for loop. */ ++ ++ sub x8, dstend, 1 /* Write last bytes before ZVA loop. */ ++ bic x8, x8, 15 ++ stp q0, q0, [x8, -48] ++ str q0, [x8, -16] ++ str q0, [dstend, -16] ++ ++ .p2align 4 ++L(zva64_loop): ++ add dst, dst, 64 ++ dc zva, dst ++ subs count, count, 64 ++ b.hi L(zva64_loop) ++ ret ++ ++L(no_zva): ++ str q0, [dstin] ++ sub count, dstend, dst /* Count is 16 too large. */ ++ sub count, count, 64 + 16 /* Adjust count and bias for loop. */ ++L(no_zva_loop): ++ stp q0, q0, [dst, 16] ++ stp q0, q0, [dst, 48] ++ add dst, dst, 64 ++ subs count, count, 64 ++ b.hi L(no_zva_loop) ++ stp q0, q0, [dstend, -64] ++ stp q0, q0, [dstend, -32] ++ ret ++ ++END (__memset_sve_zva64) ++#endif + +commit d6175a44e95fe443d0fbfed37a9ff7424f1e2661 +Author: Wilco Dijkstra +Date: Thu Feb 27 16:28:52 2025 +0000 + + AArch64: Use prefer_sve_ifuncs for SVE memset + + Use prefer_sve_ifuncs for SVE memset just like memcpy. + + Reviewed-by: Yury Khrustalev + (cherry picked from commit 0f044be1dae5169d0e57f8d487b427863aeadab4) + +diff --git a/sysdeps/aarch64/multiarch/memset.c b/sysdeps/aarch64/multiarch/memset.c +index 4f65295e77..bb1e865c97 100644 +--- a/sysdeps/aarch64/multiarch/memset.c ++++ b/sysdeps/aarch64/multiarch/memset.c +@@ -51,7 +51,7 @@ select_memset_ifunc (void) + if (IS_A64FX (midr) && zva_size == 256) + return __memset_a64fx; + +- if (zva_size == 64) ++ if (prefer_sve_ifuncs && zva_size == 64) + return __memset_sve_zva64; + } + + +commit d8e8342369831808b00324790c8809ba33408ee7 +Author: Wilco Dijkstra +Date: Fri Dec 13 15:43:07 2024 +0000 + + math: Improve layout of exp/exp10 data + + GCC aligns global data to 16 bytes if their size is >= 16 bytes. This patch + changes the exp_data struct slightly so that the fields are better aligned + and without gaps. As a result on targets that support them, more load-pair + instructions are used in exp. Exp10 is improved by moving invlog10_2N later + so that neglog10_2hiN and neglog10_2loN can be loaded using load-pair. + + The exp benchmark improves 2.5%, "144bits" by 7.2%, "768bits" by 12.7% on + Neoverse V2. Exp10 improves by 1.5%. + + Reviewed-by: Adhemerval Zanella + (cherry picked from commit 5afaf99edb326fd9f36eb306a828d129a3a1d7f7) + +diff --git a/sysdeps/ieee754/dbl-64/math_config.h b/sysdeps/ieee754/dbl-64/math_config.h +index ef87cfa6be..05515fd95a 100644 +--- a/sysdeps/ieee754/dbl-64/math_config.h ++++ b/sysdeps/ieee754/dbl-64/math_config.h +@@ -195,16 +195,18 @@ check_uflow (double x) + extern const struct exp_data + { + double invln2N; +- double shift; + double negln2hiN; + double negln2loN; + double poly[4]; /* Last four coefficients. */ ++ double shift; ++ + double exp2_shift; + double exp2_poly[EXP2_POLY_ORDER]; +- double invlog10_2N; ++ + double neglog10_2hiN; + double neglog10_2loN; + double exp10_poly[5]; ++ double invlog10_2N; + uint64_t tab[2*(1 << EXP_TABLE_BITS)]; + } __exp_data attribute_hidden; + + +commit 3e820e17a8cef84645d83b67abcbc3f88c7fd268 +Author: Michael Jeanson +Date: Fri Feb 14 13:54:22 2025 -0500 + + nptl: clear the whole rseq area before registration + + Due to the extensible nature of the rseq area we can't explictly + initialize fields that are not part of the ABI yet. It was agreed with + upstream that all new fields will be documented as zero initialized by + userspace. Future kernels configured with CONFIG_DEBUG_RSEQ will + validate the content of all fields during registration. + + Replace the explicit field initialization with a memset of the whole + rseq area which will cover fields as they are added to future kernels. + + Signed-off-by: Michael Jeanson + Reviewed-by: Florian Weimer + (cherry picked from commit 689a62a4217fae78b9ce0db781dc2a421f2b1ab4) + +diff --git a/sysdeps/nptl/dl-tls_init_tp.c b/sysdeps/nptl/dl-tls_init_tp.c +index 7803e19fd1..ed10185e37 100644 +--- a/sysdeps/nptl/dl-tls_init_tp.c ++++ b/sysdeps/nptl/dl-tls_init_tp.c +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + #define TUNABLE_NAMESPACE pthread + #include +diff --git a/sysdeps/unix/sysv/linux/rseq-internal.h b/sysdeps/unix/sysv/linux/rseq-internal.h +index ef3eab1fef..76de2b7ff0 100644 +--- a/sysdeps/unix/sysv/linux/rseq-internal.h ++++ b/sysdeps/unix/sysv/linux/rseq-internal.h +@@ -52,13 +52,12 @@ rseq_register_current_thread (struct pthread *self, bool do_rseq) + but still expected size 32. */ + size = RSEQ_AREA_SIZE_INITIAL; + +- /* Initialize the rseq fields that are read by the kernel on +- registration, there is no guarantee that struct pthread is +- cleared on all architectures. */ ++ /* Initialize the whole rseq area to zero prior to registration. */ ++ memset (&self->rseq_area, 0, size); ++ ++ /* Set the cpu_id field to RSEQ_CPU_ID_UNINITIALIZED, this is checked by ++ the kernel at registration when CONFIG_DEBUG_RSEQ is enabled. */ + THREAD_SETMEM (self, rseq_area.cpu_id, RSEQ_CPU_ID_UNINITIALIZED); +- THREAD_SETMEM (self, rseq_area.cpu_id_start, 0); +- THREAD_SETMEM (self, rseq_area.rseq_cs, 0); +- THREAD_SETMEM (self, rseq_area.flags, 0); + + int ret = INTERNAL_SYSCALL_CALL (rseq, &self->rseq_area, + size, 0, RSEQ_SIG); + +commit ee1ab9302363066b49cf8862b96664ed35eda81c +Author: Sunil K Pandey +Date: Mon Mar 10 10:24:07 2025 -0700 + + x86_64: Add tanh with FMA + + On Skylake, it improves tanh bench performance by: + + Before After Improvement + max 110.89 95.826 14% + min 20.966 20.157 4% + mean 30.9601 29.8431 4% + + Reviewed-by: H.J. Lu + (cherry picked from commit c6352111c72a20b3588ae304dd99b63e25dd6d85) + +diff --git a/sysdeps/ieee754/dbl-64/s_tanh.c b/sysdeps/ieee754/dbl-64/s_tanh.c +index 673a97102d..13063db04e 100644 +--- a/sysdeps/ieee754/dbl-64/s_tanh.c ++++ b/sysdeps/ieee754/dbl-64/s_tanh.c +@@ -46,6 +46,11 @@ static char rcsid[] = "$NetBSD: s_tanh.c,v 1.7 1995/05/10 20:48:22 jtc Exp $"; + + static const double one = 1.0, two = 2.0, tiny = 1.0e-300; + ++#ifndef SECTION ++# define SECTION ++#endif ++ ++SECTION + double + __tanh (double x) + { +diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/multiarch/Makefile +index cbe09d49f4..0f69f7089c 100644 +--- a/sysdeps/x86_64/fpu/multiarch/Makefile ++++ b/sysdeps/x86_64/fpu/multiarch/Makefile +@@ -10,6 +10,7 @@ CFLAGS-s_expm1-fma.c = -mfma -mavx2 + CFLAGS-s_log1p-fma.c = -mfma -mavx2 + CFLAGS-s_sin-fma.c = -mfma -mavx2 + CFLAGS-s_tan-fma.c = -mfma -mavx2 ++CFLAGS-s_tanh-fma.c = -mfma -mavx2 + CFLAGS-s_sincos-fma.c = -mfma -mavx2 + + CFLAGS-e_exp2f-fma.c = -mfma -mavx2 +@@ -92,6 +93,7 @@ libm-sysdep_routines += \ + s_sinf-sse2 \ + s_tan-avx \ + s_tan-fma \ ++ s_tanh-fma \ + s_trunc-sse4_1 \ + s_truncf-sse4_1 \ + # libm-sysdep_routines +diff --git a/sysdeps/x86_64/fpu/multiarch/s_tanh-fma.c b/sysdeps/x86_64/fpu/multiarch/s_tanh-fma.c +new file mode 100644 +index 0000000000..1b808b1227 +--- /dev/null ++++ b/sysdeps/x86_64/fpu/multiarch/s_tanh-fma.c +@@ -0,0 +1,11 @@ ++#define __tanh __tanh_fma ++#define __expm1 __expm1_fma ++ ++/* NB: __expm1 may be expanded to __expm1_fma in the following ++ prototypes. */ ++extern long double __expm1l (long double); ++extern long double __expm1f128 (long double); ++ ++#define SECTION __attribute__ ((section (".text.fma"))) ++ ++#include +diff --git a/sysdeps/x86_64/fpu/multiarch/s_tanh.c b/sysdeps/x86_64/fpu/multiarch/s_tanh.c +new file mode 100644 +index 0000000000..5539b6c61c +--- /dev/null ++++ b/sysdeps/x86_64/fpu/multiarch/s_tanh.c +@@ -0,0 +1,31 @@ ++/* Multiple versions of tanh. ++ Copyright (C) 2025 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL ++ ++extern double __redirect_tanh (double); ++ ++# define SYMBOL_NAME tanh ++# include "ifunc-fma.h" ++ ++libc_ifunc_redirected (__redirect_tanh, __tanh, IFUNC_SELECTOR ()); ++ ++# define __tanh __tanh_sse2 ++#endif ++#include + +commit e854f6d37cbeabb9130fed74b587befad8b4ba08 +Author: Sunil K Pandey +Date: Sat Mar 8 08:51:10 2025 -0800 + + x86_64: Add sinh with FMA + + On SPR, it improves sinh bench performance by: + + Before After Improvement + reciprocal-throughput 14.2017 11.815 17% + latency 36.4917 35.2114 4% + + Reviewed-by: H.J. Lu + (cherry picked from commit dded0d20f67ba1925ccbcb9cf28f0c75febe0dbe) + +diff --git a/benchtests/sinh-inputs b/benchtests/sinh-inputs +index 7b1ac46a39..2fcb2fabf8 100644 +--- a/benchtests/sinh-inputs ++++ b/benchtests/sinh-inputs +@@ -1,6 +1,7 @@ + ## args: double + ## ret: double + ## includes: math.h ++## name: workload-random + 0x1.bcb6129b5ff2bp8 + -0x1.63057386325ebp9 + 0x1.62f1d7dc4e8bfp9 +diff --git a/sysdeps/ieee754/dbl-64/e_sinh.c b/sysdeps/ieee754/dbl-64/e_sinh.c +index b4b5857ddd..3f787967f9 100644 +--- a/sysdeps/ieee754/dbl-64/e_sinh.c ++++ b/sysdeps/ieee754/dbl-64/e_sinh.c +@@ -41,6 +41,11 @@ static char rcsid[] = "$NetBSD: e_sinh.c,v 1.7 1995/05/10 20:46:13 jtc Exp $"; + + static const double one = 1.0, shuge = 1.0e307; + ++#ifndef SECTION ++# define SECTION ++#endif ++ ++SECTION + double + __ieee754_sinh (double x) + { +@@ -90,4 +95,7 @@ __ieee754_sinh (double x) + /* |x| > overflowthresold, sinh(x) overflow */ + return math_narrow_eval (x * shuge); + } ++ ++#ifndef __ieee754_sinh + libm_alias_finite (__ieee754_sinh, __sinh) ++#endif +diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/multiarch/Makefile +index 0f69f7089c..b527cab8d1 100644 +--- a/sysdeps/x86_64/fpu/multiarch/Makefile ++++ b/sysdeps/x86_64/fpu/multiarch/Makefile +@@ -5,6 +5,7 @@ CFLAGS-e_exp-fma.c = -mfma -mavx2 + CFLAGS-e_log-fma.c = -mfma -mavx2 + CFLAGS-e_log2-fma.c = -mfma -mavx2 + CFLAGS-e_pow-fma.c = -mfma -mavx2 ++CFLAGS-e_sinh-fma.c = -mfma -mavx2 + CFLAGS-s_atan-fma.c = -mfma -mavx2 + CFLAGS-s_expm1-fma.c = -mfma -mavx2 + CFLAGS-s_log1p-fma.c = -mfma -mavx2 +@@ -67,6 +68,7 @@ libm-sysdep_routines += \ + e_logf-fma \ + e_pow-fma \ + e_powf-fma \ ++ e_sinh-fma \ + s_atan-avx \ + s_atan-fma \ + s_ceil-sse4_1 \ +diff --git a/sysdeps/x86_64/fpu/multiarch/e_sinh-fma.c b/sysdeps/x86_64/fpu/multiarch/e_sinh-fma.c +new file mode 100644 +index 0000000000..e0e1e39a7a +--- /dev/null ++++ b/sysdeps/x86_64/fpu/multiarch/e_sinh-fma.c +@@ -0,0 +1,12 @@ ++#define __ieee754_sinh __ieee754_sinh_fma ++#define __ieee754_exp __ieee754_exp_fma ++#define __expm1 __expm1_fma ++ ++/* NB: __expm1 may be expanded to __expm1_fma in the following ++ prototypes. */ ++extern long double __expm1l (long double); ++extern long double __expm1f128 (long double); ++ ++#define SECTION __attribute__ ((section (".text.fma"))) ++ ++#include +diff --git a/sysdeps/x86_64/fpu/multiarch/e_sinh.c b/sysdeps/x86_64/fpu/multiarch/e_sinh.c +new file mode 100644 +index 0000000000..3d3c18ccdf +--- /dev/null ++++ b/sysdeps/x86_64/fpu/multiarch/e_sinh.c +@@ -0,0 +1,35 @@ ++/* Multiple versions of sinh. ++ Copyright (C) 2025 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL ++# include ++ ++extern double __redirect_ieee754_sinh (double); ++ ++# define SYMBOL_NAME ieee754_sinh ++# include "ifunc-fma.h" ++ ++libc_ifunc_redirected (__redirect_ieee754_sinh, __ieee754_sinh, ++ IFUNC_SELECTOR ()); ++ ++libm_alias_finite (__ieee754_sinh, __sinh) ++ ++# define __ieee754_sinh __ieee754_sinh_sse2 ++#endif ++#include + +commit e5f5dfdda28def8362896bdb1748bb27dfc8be73 +Author: Sunil K Pandey +Date: Wed Mar 5 16:13:38 2025 -0800 + + x86_64: Add atanh with FMA + + On SPR, it improves atanh bench performance by: + + Before After Improvement + reciprocal-throughput 15.1715 14.8628 2% + latency 57.1941 56.1883 2% + + Reviewed-by: H.J. Lu + (cherry picked from commit c7c4a5906f326f1290b1c2413a83c530564ec4b8) + +diff --git a/benchtests/atanh-inputs b/benchtests/atanh-inputs +index 455aa65b65..4985293254 100644 +--- a/benchtests/atanh-inputs ++++ b/benchtests/atanh-inputs +@@ -1,6 +1,7 @@ + ## args: double + ## ret: double + ## includes: math.h ++## name: workload-random + 0x1.5a2730bacd94ap-1 + -0x1.b57eb40fc048ep-21 + -0x1.c0b185fb450e2p-17 +diff --git a/sysdeps/ieee754/dbl-64/e_atanh.c b/sysdeps/ieee754/dbl-64/e_atanh.c +index 11a2a45799..05ac0a1b30 100644 +--- a/sysdeps/ieee754/dbl-64/e_atanh.c ++++ b/sysdeps/ieee754/dbl-64/e_atanh.c +@@ -44,6 +44,11 @@ + + static const double huge = 1e300; + ++#ifndef SECTION ++# define SECTION ++#endif ++ ++SECTION + double + __ieee754_atanh (double x) + { +@@ -73,4 +78,7 @@ __ieee754_atanh (double x) + + return copysign (t, x); + } ++ ++#ifndef __ieee754_atanh + libm_alias_finite (__ieee754_atanh, __atanh) ++#endif +diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/multiarch/Makefile +index b527cab8d1..bc479b42d2 100644 +--- a/sysdeps/x86_64/fpu/multiarch/Makefile ++++ b/sysdeps/x86_64/fpu/multiarch/Makefile +@@ -1,6 +1,7 @@ + ifeq ($(subdir),math) + CFLAGS-e_asin-fma.c = -mfma -mavx2 + CFLAGS-e_atan2-fma.c = -mfma -mavx2 ++CFLAGS-e_atanh-fma.c = -mfma -mavx2 + CFLAGS-e_exp-fma.c = -mfma -mavx2 + CFLAGS-e_log-fma.c = -mfma -mavx2 + CFLAGS-e_log2-fma.c = -mfma -mavx2 +@@ -57,6 +58,7 @@ libm-sysdep_routines += \ + e_asin-fma \ + e_atan2-avx \ + e_atan2-fma \ ++ e_atanh-fma \ + e_exp-avx \ + e_exp-fma \ + e_exp2f-fma \ +diff --git a/sysdeps/x86_64/fpu/multiarch/e_atanh-fma.c b/sysdeps/x86_64/fpu/multiarch/e_atanh-fma.c +new file mode 100644 +index 0000000000..c3f2f9e550 +--- /dev/null ++++ b/sysdeps/x86_64/fpu/multiarch/e_atanh-fma.c +@@ -0,0 +1,6 @@ ++#define __ieee754_atanh __ieee754_atanh_fma ++#define __log1p __log1p_fma ++ ++#define SECTION __attribute__ ((section (".text.fma"))) ++ ++#include +diff --git a/sysdeps/x86_64/fpu/multiarch/e_atanh.c b/sysdeps/x86_64/fpu/multiarch/e_atanh.c +new file mode 100644 +index 0000000000..d2b785dfc0 +--- /dev/null ++++ b/sysdeps/x86_64/fpu/multiarch/e_atanh.c +@@ -0,0 +1,34 @@ ++/* Multiple versions of atanh. ++ Copyright (C) 2025 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL ++# include ++ ++extern double __redirect_ieee754_atanh (double); ++ ++# define SYMBOL_NAME ieee754_atanh ++# include "ifunc-fma.h" ++ ++libc_ifunc_redirected (__redirect_ieee754_atanh, __ieee754_atanh, IFUNC_SELECTOR ()); ++ ++libm_alias_finite (__ieee754_atanh, __atanh) ++ ++# define __ieee754_atanh __ieee754_atanh_sse2 ++#endif ++#include + +commit 8fc492bb4234edc1a5e8c3b7f76ba345ea7109ec +Author: Florian Weimer +Date: Fri Mar 28 09:26:06 2025 +0100 + + x86: Skip XSAVE state size reset if ISA level requires XSAVE + + If we have to use XSAVE or XSAVEC trampolines, do not adjust the size + information they need. Technically, it is an operator error to try to + run with -XSAVE,-XSAVEC on such builds, but this change here disables + some unnecessary code with higher ISA levels and simplifies testing. + + Related to commit befe2d3c4dec8be2cdd01a47132e47bdb7020922 + ("x86-64: Don't use SSE resolvers for ISA level 3 or above"). + + Reviewed-by: H.J. Lu + (cherry picked from commit 59585ddaa2d44f22af04bb4b8bd4ad1e302c4c02) + +diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c +index c096dd390a..b5b264db7f 100644 +--- a/sysdeps/x86/cpu-features.c ++++ b/sysdeps/x86/cpu-features.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + extern void TUNABLE_CALLBACK (set_hwcaps) (tunable_val_t *) + attribute_hidden; +@@ -1119,6 +1120,9 @@ no_cpuid: + TUNABLE_CALLBACK (set_prefer_map_32bit_exec)); + #endif + ++ /* Do not add the logic to disable XSAVE/XSAVEC if this glibc build ++ requires AVX and therefore XSAVE or XSAVEC support. */ ++#ifndef GCCMACRO__AVX__ + bool disable_xsave_features = false; + + if (!CPU_FEATURE_USABLE_P (cpu_features, OSXSAVE)) +@@ -1172,6 +1176,7 @@ no_cpuid: + + CPU_FEATURE_UNSET (cpu_features, FMA4); + } ++#endif + + #ifdef __x86_64__ + GLRO(dl_hwcap) = HWCAP_X86_64; + +commit df22af58f66e6815c054b1c56249356c2994935a +Author: Florian Weimer +Date: Fri Mar 28 09:26:59 2025 +0100 + + x86: Use separate variable for TLSDESC XSAVE/XSAVEC state size (bug 32810) + + Previously, the initialization code reused the xsave_state_full_size + member of struct cpu_features for the TLSDESC state size. However, + the tunable processing code assumes that this member has the + original XSAVE (non-compact) state size, so that it can use its + value if XSAVEC is disabled via tunable. + + This change uses a separate variable and not a struct member because + the value is only needed in ld.so and the static libc, but not in + libc.so. As a result, struct cpu_features layout does not change, + helping a future backport of this change. + + Fixes commit 9b7091415af47082664717210ac49d51551456ab ("x86-64: + Update _dl_tlsdesc_dynamic to preserve AMX registers"). + + Reviewed-by: H.J. Lu + (cherry picked from commit 145097dff170507fe73190e8e41194f5b5f7e6bf) + +diff --git a/NEWS b/NEWS +index 57feba81cd..7a6985f5dd 100644 +--- a/NEWS ++++ b/NEWS +@@ -22,6 +22,7 @@ The following bugs are resolved with this release: + [32231] elf: Change ldconfig auxcache magic number + [32245] glibc -Wstringop-overflow= build failure on hppa + [32470] x86: Avoid integer truncation with large cache sizes ++ [32810] Crash on x86-64 if XSAVEC disable via tunable + + Version 2.40 + +diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile +index 5311b594af..8819fba1b7 100644 +--- a/sysdeps/x86/Makefile ++++ b/sysdeps/x86/Makefile +@@ -21,6 +21,9 @@ tests += \ + tst-cpu-features-supports-static \ + tst-get-cpu-features \ + tst-get-cpu-features-static \ ++ tst-gnu2-tls2-x86-noxsave \ ++ tst-gnu2-tls2-x86-noxsavec \ ++ tst-gnu2-tls2-x86-noxsavexsavec \ + tst-hwcap-tunables \ + # tests + tests-static += \ +@@ -91,6 +94,22 @@ CFLAGS-tst-gnu2-tls2.c += -msse + CFLAGS-tst-gnu2-tls2mod0.c += -msse2 -mtune=haswell + CFLAGS-tst-gnu2-tls2mod1.c += -msse2 -mtune=haswell + CFLAGS-tst-gnu2-tls2mod2.c += -msse2 -mtune=haswell ++ ++LDFLAGS-tst-gnu2-tls2-x86-noxsave += -Wl,-z,lazy ++LDFLAGS-tst-gnu2-tls2-x86-noxsavec += -Wl,-z,lazy ++LDFLAGS-tst-gnu2-tls2-x86-noxsavexsavec += -Wl,-z,lazy ++ ++# Test for bug 32810: incorrect XSAVE state size if XSAVEC is disabled ++# via tunable. ++tst-gnu2-tls2-x86-noxsave-ENV = GLIBC_TUNABLES=glibc.cpu.hwcaps=-XSAVE ++tst-gnu2-tls2-x86-noxsavec-ENV = GLIBC_TUNABLES=glibc.cpu.hwcaps=-XSAVEC ++tst-gnu2-tls2-x86-noxsavexsavec-ENV = GLIBC_TUNABLES=glibc.cpu.hwcaps=-XSAVE,-XSAVEC ++$(objpfx)tst-gnu2-tls2-x86-noxsave.out \ ++$(objpfx)tst-gnu2-tls2-x86-noxsavec.out \ ++$(objpfx)tst-gnu2-tls2-x86-noxsavexsavec.out: \ ++ $(objpfx)tst-gnu2-tls2mod0.so \ ++ $(objpfx)tst-gnu2-tls2mod1.so \ ++ $(objpfx)tst-gnu2-tls2mod2.so + endif + + ifeq ($(subdir),math) +diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c +index b5b264db7f..ec27337337 100644 +--- a/sysdeps/x86/cpu-features.c ++++ b/sysdeps/x86/cpu-features.c +@@ -84,6 +84,8 @@ extern void TUNABLE_CALLBACK (set_x86_shstk) (tunable_val_t *) + # include + #endif + ++unsigned long int _dl_x86_features_tlsdesc_state_size; ++ + static void + update_active (struct cpu_features *cpu_features) + { +@@ -318,6 +320,7 @@ update_active (struct cpu_features *cpu_features) + = xsave_state_full_size; + cpu_features->xsave_state_full_size + = xsave_state_full_size; ++ _dl_x86_features_tlsdesc_state_size = xsave_state_full_size; + + /* Check if XSAVEC is available. */ + if (CPU_FEATURES_CPU_P (cpu_features, XSAVEC)) +@@ -406,11 +409,9 @@ update_active (struct cpu_features *cpu_features) + = ALIGN_UP ((amx_size + + TLSDESC_CALL_REGISTER_SAVE_AREA), + 64); +- /* Set xsave_state_full_size to the compact AMX +- state size for XSAVEC. NB: xsave_state_full_size +- is only used in _dl_tlsdesc_dynamic_xsave and +- _dl_tlsdesc_dynamic_xsavec. */ +- cpu_features->xsave_state_full_size = amx_size; ++ /* Set TLSDESC state size to the compact AMX ++ state size for XSAVEC. */ ++ _dl_x86_features_tlsdesc_state_size = amx_size; + #endif + cpu_features->xsave_state_size + = ALIGN_UP (size + TLSDESC_CALL_REGISTER_SAVE_AREA, +diff --git a/sysdeps/x86/cpu-tunables.c b/sysdeps/x86/cpu-tunables.c +index ccc6b64dc2..a0b31d80f6 100644 +--- a/sysdeps/x86/cpu-tunables.c ++++ b/sysdeps/x86/cpu-tunables.c +@@ -164,6 +164,8 @@ TUNABLE_CALLBACK (set_hwcaps) (tunable_val_t *valp) + /* Update xsave_state_size to XSAVE state size. */ + cpu_features->xsave_state_size + = cpu_features->xsave_state_full_size; ++ _dl_x86_features_tlsdesc_state_size ++ = cpu_features->xsave_state_full_size; + CPU_FEATURE_UNSET (cpu_features, XSAVEC); + } + } +diff --git a/sysdeps/x86/dl-diagnostics-cpu.c b/sysdeps/x86/dl-diagnostics-cpu.c +index 49eeb5f70a..41100a908a 100644 +--- a/sysdeps/x86/dl-diagnostics-cpu.c ++++ b/sysdeps/x86/dl-diagnostics-cpu.c +@@ -89,6 +89,8 @@ _dl_diagnostics_cpu (void) + cpu_features->xsave_state_size); + print_cpu_features_value ("xsave_state_full_size", + cpu_features->xsave_state_full_size); ++ print_cpu_features_value ("tlsdesc_state_full_size", ++ _dl_x86_features_tlsdesc_state_size); + print_cpu_features_value ("data_cache_size", cpu_features->data_cache_size); + print_cpu_features_value ("shared_cache_size", + cpu_features->shared_cache_size); +diff --git a/sysdeps/x86/include/cpu-features.h b/sysdeps/x86/include/cpu-features.h +index aaae44f0e1..03c71387dd 100644 +--- a/sysdeps/x86/include/cpu-features.h ++++ b/sysdeps/x86/include/cpu-features.h +@@ -934,8 +934,6 @@ struct cpu_features + /* The full state size for XSAVE when XSAVEC is disabled by + + GLIBC_TUNABLES=glibc.cpu.hwcaps=-XSAVEC +- +- and the AMX state size when XSAVEC is available. + */ + unsigned int xsave_state_full_size; + /* Data cache size for use in memory and string routines, typically +@@ -989,6 +987,13 @@ extern const struct cpu_features *_dl_x86_get_cpu_features (void) + + #define __get_cpu_features() _dl_x86_get_cpu_features() + ++#if IS_IN (rtld) || IS_IN (libc) ++/* XSAVE/XSAVEC state size used by TLS descriptors. Compared to ++ xsave_state_size from struct cpu_features, this includes additional ++ registers. */ ++extern unsigned long int _dl_x86_features_tlsdesc_state_size attribute_hidden; ++#endif ++ + #if defined (_LIBC) && !IS_IN (nonlib) + /* Unused for x86. */ + # define INIT_ARCH() +diff --git a/sysdeps/x86/tst-gnu2-tls2-x86-noxsave.c b/sysdeps/x86/tst-gnu2-tls2-x86-noxsave.c +new file mode 100644 +index 0000000000..f0024c143d +--- /dev/null ++++ b/sysdeps/x86/tst-gnu2-tls2-x86-noxsave.c +@@ -0,0 +1 @@ ++#include +diff --git a/sysdeps/x86/tst-gnu2-tls2-x86-noxsavec.c b/sysdeps/x86/tst-gnu2-tls2-x86-noxsavec.c +new file mode 100644 +index 0000000000..f0024c143d +--- /dev/null ++++ b/sysdeps/x86/tst-gnu2-tls2-x86-noxsavec.c +@@ -0,0 +1 @@ ++#include +diff --git a/sysdeps/x86/tst-gnu2-tls2-x86-noxsavexsavec.c b/sysdeps/x86/tst-gnu2-tls2-x86-noxsavexsavec.c +new file mode 100644 +index 0000000000..f0024c143d +--- /dev/null ++++ b/sysdeps/x86/tst-gnu2-tls2-x86-noxsavexsavec.c +@@ -0,0 +1 @@ ++#include +diff --git a/sysdeps/x86_64/dl-tlsdesc-dynamic.h b/sysdeps/x86_64/dl-tlsdesc-dynamic.h +index 9f02cfc3eb..44d948696f 100644 +--- a/sysdeps/x86_64/dl-tlsdesc-dynamic.h ++++ b/sysdeps/x86_64/dl-tlsdesc-dynamic.h +@@ -99,7 +99,7 @@ _dl_tlsdesc_dynamic: + # endif + #else + /* Allocate stack space of the required size to save the state. */ +- sub _rtld_local_ro+RTLD_GLOBAL_RO_DL_X86_CPU_FEATURES_OFFSET+XSAVE_STATE_FULL_SIZE_OFFSET(%rip), %RSP_LP ++ sub _dl_x86_features_tlsdesc_state_size(%rip), %RSP_LP + #endif + /* Besides rdi and rsi, saved above, save rcx, rdx, r8, r9, + r10 and r11. */ + +commit a87d9a2c2cc17a3b22fd3be8d106336f4dcf2042 +Author: Florian Weimer +Date: Mon Mar 31 21:33:18 2025 +0200 + + x86: Link tst-gnu2-tls2-x86-noxsave{,c,xsavec} with libpthread + + This fixes a test build failure on Hurd. + + Fixes commit 145097dff170507fe73190e8e41194f5b5f7e6bf ("x86: Use separate + variable for TLSDESC XSAVE/XSAVEC state size (bug 32810)"). + + Reviewed-by: Adhemerval Zanella + (cherry picked from commit c6e2895695118ab59c7b17feb0fcb75a53e3478c) + +diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile +index 8819fba1b7..01b0192ddf 100644 +--- a/sysdeps/x86/Makefile ++++ b/sysdeps/x86/Makefile +@@ -104,6 +104,9 @@ LDFLAGS-tst-gnu2-tls2-x86-noxsavexsavec += -Wl,-z,lazy + tst-gnu2-tls2-x86-noxsave-ENV = GLIBC_TUNABLES=glibc.cpu.hwcaps=-XSAVE + tst-gnu2-tls2-x86-noxsavec-ENV = GLIBC_TUNABLES=glibc.cpu.hwcaps=-XSAVEC + tst-gnu2-tls2-x86-noxsavexsavec-ENV = GLIBC_TUNABLES=glibc.cpu.hwcaps=-XSAVE,-XSAVEC ++$(objpfx)tst-gnu2-tls2-x86-noxsave: $(shared-thread-library) ++$(objpfx)tst-gnu2-tls2-x86-noxsavec: $(shared-thread-library) ++$(objpfx)tst-gnu2-tls2-x86-noxsavexsavec: $(shared-thread-library) + $(objpfx)tst-gnu2-tls2-x86-noxsave.out \ + $(objpfx)tst-gnu2-tls2-x86-noxsavec.out \ + $(objpfx)tst-gnu2-tls2-x86-noxsavexsavec.out: \ + +commit 8fe27af20c8b25b84e12bcd52353862a95044aa2 +Author: Noah Goldstein +Date: Wed Aug 14 14:37:30 2024 +0800 + + x86: Use `Avoid_Non_Temporal_Memset` to control non-temporal path + + This is just a refactor and there should be no behavioral change from + this commit. + + The goal is to make `Avoid_Non_Temporal_Memset` a more universal knob + for controlling whether we use non-temporal memset rather than having + extra logic based on vendor. + Reviewed-by: H.J. Lu + + (cherry picked from commit b93dddfaf440aa12f45d7c356f6ffe9f27d35577) + +diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c +index ec27337337..8841020b36 100644 +--- a/sysdeps/x86/cpu-features.c ++++ b/sysdeps/x86/cpu-features.c +@@ -758,6 +758,12 @@ init_cpu_features (struct cpu_features *cpu_features) + unsigned int stepping = 0; + enum cpu_features_kind kind; + ++ /* Default is avoid non-temporal memset for non Intel/AMD hardware. This is, ++ as of writing this, we only have benchmarks indicatings it profitability ++ on Intel/AMD. */ ++ cpu_features->preferred[index_arch_Avoid_Non_Temporal_Memset] ++ |= bit_arch_Avoid_Non_Temporal_Memset; ++ + cpu_features->cachesize_non_temporal_divisor = 4; + #if !HAS_CPUID + if (__get_cpuid_max (0, 0) == 0) +@@ -783,6 +789,11 @@ init_cpu_features (struct cpu_features *cpu_features) + + update_active (cpu_features); + ++ /* Benchmarks indicate non-temporal memset can be profitable on Intel ++ hardware. */ ++ cpu_features->preferred[index_arch_Avoid_Non_Temporal_Memset] ++ &= ~bit_arch_Avoid_Non_Temporal_Memset; ++ + if (family == 0x06) + { + model += extended_model; +@@ -993,6 +1004,11 @@ https://www.intel.com/content/www/us/en/support/articles/000059422/processors.ht + + ecx = cpu_features->features[CPUID_INDEX_1].cpuid.ecx; + ++ /* Benchmarks indicate non-temporal memset can be profitable on AMD ++ hardware. */ ++ cpu_features->preferred[index_arch_Avoid_Non_Temporal_Memset] ++ &= ~bit_arch_Avoid_Non_Temporal_Memset; ++ + if (CPU_FEATURE_USABLE_P (cpu_features, AVX)) + { + /* Since the FMA4 bit is in CPUID_INDEX_80000001 and +diff --git a/sysdeps/x86/dl-cacheinfo.h b/sysdeps/x86/dl-cacheinfo.h +index ac97414b5b..7b1b61c096 100644 +--- a/sysdeps/x86/dl-cacheinfo.h ++++ b/sysdeps/x86/dl-cacheinfo.h +@@ -988,14 +988,6 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) + if (CPU_FEATURE_USABLE_P (cpu_features, FSRM)) + rep_movsb_threshold = 2112; + +- /* Non-temporal stores are more performant on Intel and AMD hardware above +- non_temporal_threshold. Enable this for both Intel and AMD hardware. */ +- unsigned long int memset_non_temporal_threshold = SIZE_MAX; +- if (!CPU_FEATURES_ARCH_P (cpu_features, Avoid_Non_Temporal_Memset) +- && (cpu_features->basic.kind == arch_kind_intel +- || cpu_features->basic.kind == arch_kind_amd)) +- memset_non_temporal_threshold = non_temporal_threshold; +- + /* For AMD CPUs that support ERMS (Zen3+), REP MOVSB is in a lot of + cases slower than the vectorized path (and for some alignments, + it is really slow, check BZ #30994). */ +@@ -1017,6 +1009,13 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) + if (tunable_size != 0) + shared = tunable_size; + ++ /* Non-temporal stores are more performant on some hardware above ++ non_temporal_threshold. Currently Prefer_Non_Temporal is set for for both ++ Intel and AMD hardware. */ ++ unsigned long int memset_non_temporal_threshold = SIZE_MAX; ++ if (!CPU_FEATURES_ARCH_P (cpu_features, Avoid_Non_Temporal_Memset)) ++ memset_non_temporal_threshold = non_temporal_threshold; ++ + tunable_size = TUNABLE_GET (x86_non_temporal_threshold, long int, NULL); + if (tunable_size > minimum_non_temporal_threshold + && tunable_size <= maximum_non_temporal_threshold) + +commit 7c6bd71b4dbdadab34e4fd21ec09b86b32daf443 +Author: Sunil K Pandey +Date: Thu Apr 3 13:00:45 2025 -0700 + + x86: Optimize xstate size calculation + + Scan xstate IDs up to the maximum supported xstate ID. Remove the + separate AMX xstate calculation. Instead, exclude the AMX space from + the start of TILECFG to the end of TILEDATA in xsave_state_size. + + Completed validation on SKL/SKX/SPR/SDE and compared xsave state size + with "ld.so --list-diagnostics" option, no regression. + + Co-Authored-By: H.J. Lu + Reviewed-by: Sunil K Pandey + (cherry picked from commit 70b648855185e967e54668b101d24704c3fb869d) + +diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c +index 8841020b36..1d5e2a0072 100644 +--- a/sysdeps/x86/cpu-features.c ++++ b/sysdeps/x86/cpu-features.c +@@ -325,13 +325,8 @@ update_active (struct cpu_features *cpu_features) + /* Check if XSAVEC is available. */ + if (CPU_FEATURES_CPU_P (cpu_features, XSAVEC)) + { +- unsigned int xstate_comp_offsets[32]; +- unsigned int xstate_comp_sizes[32]; +-#ifdef __x86_64__ +- unsigned int xstate_amx_comp_offsets[32]; +- unsigned int xstate_amx_comp_sizes[32]; +- unsigned int amx_ecx; +-#endif ++ unsigned int xstate_comp_offsets[X86_XSTATE_MAX_ID + 1]; ++ unsigned int xstate_comp_sizes[X86_XSTATE_MAX_ID + 1]; + unsigned int i; + + xstate_comp_offsets[0] = 0; +@@ -339,39 +334,16 @@ update_active (struct cpu_features *cpu_features) + xstate_comp_offsets[2] = 576; + xstate_comp_sizes[0] = 160; + xstate_comp_sizes[1] = 256; +-#ifdef __x86_64__ +- xstate_amx_comp_offsets[0] = 0; +- xstate_amx_comp_offsets[1] = 160; +- xstate_amx_comp_offsets[2] = 576; +- xstate_amx_comp_sizes[0] = 160; +- xstate_amx_comp_sizes[1] = 256; +-#endif + +- for (i = 2; i < 32; i++) ++ for (i = 2; i <= X86_XSTATE_MAX_ID; i++) + { + if ((FULL_STATE_SAVE_MASK & (1 << i)) != 0) + { + __cpuid_count (0xd, i, eax, ebx, ecx, edx); +-#ifdef __x86_64__ +- /* Include this in xsave_state_full_size. */ +- amx_ecx = ecx; +- xstate_amx_comp_sizes[i] = eax; +- if ((AMX_STATE_SAVE_MASK & (1 << i)) != 0) +- { +- /* Exclude this from xsave_state_size. */ +- ecx = 0; +- xstate_comp_sizes[i] = 0; +- } +- else +-#endif +- xstate_comp_sizes[i] = eax; ++ xstate_comp_sizes[i] = eax; + } + else + { +-#ifdef __x86_64__ +- amx_ecx = 0; +- xstate_amx_comp_sizes[i] = 0; +-#endif + ecx = 0; + xstate_comp_sizes[i] = 0; + } +@@ -380,42 +352,32 @@ update_active (struct cpu_features *cpu_features) + { + xstate_comp_offsets[i] + = (xstate_comp_offsets[i - 1] +- + xstate_comp_sizes[i -1]); ++ + xstate_comp_sizes[i - 1]); + if ((ecx & (1 << 1)) != 0) + xstate_comp_offsets[i] + = ALIGN_UP (xstate_comp_offsets[i], 64); +-#ifdef __x86_64__ +- xstate_amx_comp_offsets[i] +- = (xstate_amx_comp_offsets[i - 1] +- + xstate_amx_comp_sizes[i - 1]); +- if ((amx_ecx & (1 << 1)) != 0) +- xstate_amx_comp_offsets[i] +- = ALIGN_UP (xstate_amx_comp_offsets[i], +- 64); +-#endif + } + } + + /* Use XSAVEC. */ + unsigned int size +- = xstate_comp_offsets[31] + xstate_comp_sizes[31]; ++ = (xstate_comp_offsets[X86_XSTATE_MAX_ID] ++ + xstate_comp_sizes[X86_XSTATE_MAX_ID]); + if (size) + { ++ size = ALIGN_UP (size + TLSDESC_CALL_REGISTER_SAVE_AREA, ++ 64); + #ifdef __x86_64__ +- unsigned int amx_size +- = (xstate_amx_comp_offsets[31] +- + xstate_amx_comp_sizes[31]); +- amx_size +- = ALIGN_UP ((amx_size +- + TLSDESC_CALL_REGISTER_SAVE_AREA), +- 64); +- /* Set TLSDESC state size to the compact AMX +- state size for XSAVEC. */ +- _dl_x86_features_tlsdesc_state_size = amx_size; ++ _dl_x86_features_tlsdesc_state_size = size; ++ /* Exclude the AMX space from the start of TILECFG ++ space to the end of TILEDATA space. If CPU ++ doesn't support AMX, TILECFG offset is the same ++ as TILEDATA + 1 offset. Otherwise, they are ++ multiples of 64. */ ++ size -= (xstate_comp_offsets[X86_XSTATE_TILEDATA_ID + 1] ++ - xstate_comp_offsets[X86_XSTATE_TILECFG_ID]); + #endif +- cpu_features->xsave_state_size +- = ALIGN_UP (size + TLSDESC_CALL_REGISTER_SAVE_AREA, +- 64); ++ cpu_features->xsave_state_size = size; + CPU_FEATURE_SET (cpu_features, XSAVEC); + } + } +diff --git a/sysdeps/x86/sysdep.h b/sysdeps/x86/sysdep.h +index 7359149e17..1d6cabd816 100644 +--- a/sysdeps/x86/sysdep.h ++++ b/sysdeps/x86/sysdep.h +@@ -102,6 +102,9 @@ + | (1 << X86_XSTATE_ZMM_ID) \ + | (1 << X86_XSTATE_APX_F_ID)) + ++/* The maximum supported xstate ID. */ ++# define X86_XSTATE_MAX_ID X86_XSTATE_APX_F_ID ++ + /* AMX state mask. */ + # define AMX_STATE_SAVE_MASK \ + ((1 << X86_XSTATE_TILECFG_ID) | (1 << X86_XSTATE_TILEDATA_ID)) +@@ -123,6 +126,9 @@ + | (1 << X86_XSTATE_K_ID) \ + | (1 << X86_XSTATE_ZMM_H_ID)) + ++/* The maximum supported xstate ID. */ ++# define X86_XSTATE_MAX_ID X86_XSTATE_ZMM_H_ID ++ + /* States to be included in xsave_state_size. */ + # define FULL_STATE_SAVE_MASK STATE_SAVE_MASK + #endif + +commit 44f92df8007d57f82b1518e219a0dbb60389ef2c +Author: Sunil K Pandey +Date: Thu Apr 3 18:14:20 2025 -0700 + + x86: Add ARL/PTL/CWF model detection support + + - Add ARROWLAKE model detection. + - Add PANTHERLAKE model detection. + - Add CLEARWATERFOREST model detection. + + Intel® Architecture Instruction Set Extensions Programming Reference + https://cdrdv2.intel.com/v1/dl/getContent/671368 Section 1.2. + + No regression, validated model detection on SDE. + + Reviewed-by: H.J. Lu + (cherry picked from commit e53eb952b970ac94c97d74fb447418fb327ca096) + +diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c +index 1d5e2a0072..7f21a8227e 100644 +--- a/sysdeps/x86/cpu-features.c ++++ b/sysdeps/x86/cpu-features.c +@@ -512,6 +512,7 @@ enum + INTEL_ATOM_GOLDMONT, + INTEL_ATOM_GOLDMONT_PLUS, + INTEL_ATOM_SIERRAFOREST, ++ INTEL_ATOM_CLEARWATERFOREST, + INTEL_ATOM_GRANDRIDGE, + INTEL_ATOM_TREMONT, + +@@ -539,6 +540,7 @@ enum + INTEL_BIGCORE_METEORLAKE, + INTEL_BIGCORE_LUNARLAKE, + INTEL_BIGCORE_ARROWLAKE, ++ INTEL_BIGCORE_PANTHERLAKE, + INTEL_BIGCORE_GRANITERAPIDS, + + /* Mixed (bigcore + atom SOC). */ +@@ -584,6 +586,8 @@ intel_get_fam6_microarch (unsigned int model, + return INTEL_ATOM_GOLDMONT_PLUS; + case 0xAF: + return INTEL_ATOM_SIERRAFOREST; ++ case 0xDD: ++ return INTEL_ATOM_CLEARWATERFOREST; + case 0xB6: + return INTEL_ATOM_GRANDRIDGE; + case 0x86: +@@ -691,8 +695,12 @@ intel_get_fam6_microarch (unsigned int model, + return INTEL_BIGCORE_METEORLAKE; + case 0xbd: + return INTEL_BIGCORE_LUNARLAKE; ++ case 0xb5: ++ case 0xc5: + case 0xc6: + return INTEL_BIGCORE_ARROWLAKE; ++ case 0xCC: ++ return INTEL_BIGCORE_PANTHERLAKE; + case 0xAD: + case 0xAE: + return INTEL_BIGCORE_GRANITERAPIDS; +@@ -808,6 +816,7 @@ init_cpu_features (struct cpu_features *cpu_features) + Default tuned atom microarch. + case INTEL_ATOM_SIERRAFOREST: + case INTEL_ATOM_GRANDRIDGE: ++ case INTEL_ATOM_CLEARWATERFOREST: + */ + + /* Bigcore/Default Tuning. */ +@@ -864,6 +873,7 @@ init_cpu_features (struct cpu_features *cpu_features) + case INTEL_BIGCORE_METEORLAKE: + case INTEL_BIGCORE_LUNARLAKE: + case INTEL_BIGCORE_ARROWLAKE: ++ case INTEL_BIGCORE_PANTHERLAKE: + case INTEL_BIGCORE_SAPPHIRERAPIDS: + case INTEL_BIGCORE_EMERALDRAPIDS: + case INTEL_BIGCORE_GRANITERAPIDS: + +commit 9ee8083c4edbe5e92af7aabb23261309f03ef05c +Author: Sunil K Pandey +Date: Fri Apr 11 08:52:52 2025 -0700 + + x86: Handle unknown Intel processor with default tuning + + Enable default tuning for unknown Intel processor. + + Tested on x86, no regression. + + Co-Authored-By: H.J. Lu + Reviewed-by: H.J. Lu + (cherry picked from commit 9f0deff558d1d6b08c425c157f50de85013ada9c) + +diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c +index 7f21a8227e..1a6e694abf 100644 +--- a/sysdeps/x86/cpu-features.c ++++ b/sysdeps/x86/cpu-features.c +@@ -502,8 +502,8 @@ _Static_assert (((index_arch_Fast_Unaligned_Load + "Incorrect index_arch_Fast_Unaligned_Load"); + + +-/* Intel Family-6 microarch list. */ +-enum ++/* Intel microarch list. */ ++enum intel_microarch + { + /* Atom processors. */ + INTEL_ATOM_BONNELL, +@@ -555,7 +555,7 @@ enum + INTEL_UNKNOWN, + }; + +-static unsigned int ++static enum intel_microarch + intel_get_fam6_microarch (unsigned int model, + __attribute__ ((unused)) unsigned int stepping) + { +@@ -764,134 +764,20 @@ init_cpu_features (struct cpu_features *cpu_features) + cpu_features->preferred[index_arch_Avoid_Non_Temporal_Memset] + &= ~bit_arch_Avoid_Non_Temporal_Memset; + ++ enum intel_microarch microarch = INTEL_UNKNOWN; + if (family == 0x06) + { + model += extended_model; +- unsigned int microarch +- = intel_get_fam6_microarch (model, stepping); ++ microarch = intel_get_fam6_microarch (model, stepping); + ++ /* Disable TSX on some processors to avoid TSX on kernels that ++ weren't updated with the latest microcode package (which ++ disables broken feature by default). */ + switch (microarch) + { +- /* Atom / KNL tuning. */ +- case INTEL_ATOM_BONNELL: +- /* BSF is slow on Bonnell. */ +- cpu_features->preferred[index_arch_Slow_BSF] +- |= bit_arch_Slow_BSF; +- break; +- +- /* Unaligned load versions are faster than SSSE3 +- on Airmont, Silvermont, Goldmont, and Goldmont Plus. */ +- case INTEL_ATOM_AIRMONT: +- case INTEL_ATOM_SILVERMONT: +- case INTEL_ATOM_GOLDMONT: +- case INTEL_ATOM_GOLDMONT_PLUS: +- +- /* Knights Landing. Enable Silvermont optimizations. */ +- case INTEL_KNIGHTS_LANDING: +- +- cpu_features->preferred[index_arch_Fast_Unaligned_Load] +- |= (bit_arch_Fast_Unaligned_Load +- | bit_arch_Fast_Unaligned_Copy +- | bit_arch_Prefer_PMINUB_for_stringop +- | bit_arch_Slow_SSE4_2); +- break; +- +- case INTEL_ATOM_TREMONT: +- /* Enable rep string instructions, unaligned load, unaligned +- copy, pminub and avoid SSE 4.2 on Tremont. */ +- cpu_features->preferred[index_arch_Fast_Rep_String] +- |= (bit_arch_Fast_Rep_String +- | bit_arch_Fast_Unaligned_Load +- | bit_arch_Fast_Unaligned_Copy +- | bit_arch_Prefer_PMINUB_for_stringop +- | bit_arch_Slow_SSE4_2); +- break; +- +- /* +- Default tuned Knights microarch. +- case INTEL_KNIGHTS_MILL: +- */ +- +- /* +- Default tuned atom microarch. +- case INTEL_ATOM_SIERRAFOREST: +- case INTEL_ATOM_GRANDRIDGE: +- case INTEL_ATOM_CLEARWATERFOREST: +- */ +- +- /* Bigcore/Default Tuning. */ + default: +- default_tuning: +- /* Unknown family 0x06 processors. Assuming this is one +- of Core i3/i5/i7 processors if AVX is available. */ +- if (!CPU_FEATURES_CPU_P (cpu_features, AVX)) +- break; +- +- enable_modern_features: +- /* Rep string instructions, unaligned load, unaligned copy, +- and pminub are fast on Intel Core i3, i5 and i7. */ +- cpu_features->preferred[index_arch_Fast_Rep_String] +- |= (bit_arch_Fast_Rep_String +- | bit_arch_Fast_Unaligned_Load +- | bit_arch_Fast_Unaligned_Copy +- | bit_arch_Prefer_PMINUB_for_stringop); + break; + +- case INTEL_BIGCORE_NEHALEM: +- case INTEL_BIGCORE_WESTMERE: +- /* Older CPUs prefer non-temporal stores at lower threshold. */ +- cpu_features->cachesize_non_temporal_divisor = 8; +- goto enable_modern_features; +- +- /* Older Bigcore microarch (smaller non-temporal store +- threshold). */ +- case INTEL_BIGCORE_SANDYBRIDGE: +- case INTEL_BIGCORE_IVYBRIDGE: +- case INTEL_BIGCORE_HASWELL: +- case INTEL_BIGCORE_BROADWELL: +- cpu_features->cachesize_non_temporal_divisor = 8; +- goto default_tuning; +- +- /* Newer Bigcore microarch (larger non-temporal store +- threshold). */ +- case INTEL_BIGCORE_SKYLAKE_AVX512: +- case INTEL_BIGCORE_CANNONLAKE: +- /* Benchmarks indicate non-temporal memset is not +- necessarily profitable on SKX (and in some cases much +- worse). This is likely unique to SKX due its it unique +- mesh interconnect (not present on ICX or BWD). Disable +- non-temporal on all Skylake servers. */ +- cpu_features->preferred[index_arch_Avoid_Non_Temporal_Memset] +- |= bit_arch_Avoid_Non_Temporal_Memset; +- case INTEL_BIGCORE_COMETLAKE: +- case INTEL_BIGCORE_SKYLAKE: +- case INTEL_BIGCORE_KABYLAKE: +- case INTEL_BIGCORE_ICELAKE: +- case INTEL_BIGCORE_TIGERLAKE: +- case INTEL_BIGCORE_ROCKETLAKE: +- case INTEL_BIGCORE_RAPTORLAKE: +- case INTEL_BIGCORE_METEORLAKE: +- case INTEL_BIGCORE_LUNARLAKE: +- case INTEL_BIGCORE_ARROWLAKE: +- case INTEL_BIGCORE_PANTHERLAKE: +- case INTEL_BIGCORE_SAPPHIRERAPIDS: +- case INTEL_BIGCORE_EMERALDRAPIDS: +- case INTEL_BIGCORE_GRANITERAPIDS: +- cpu_features->cachesize_non_temporal_divisor = 2; +- goto default_tuning; +- +- /* Default tuned Mixed (bigcore + atom SOC). */ +- case INTEL_MIXED_LAKEFIELD: +- case INTEL_MIXED_ALDERLAKE: +- cpu_features->cachesize_non_temporal_divisor = 2; +- goto default_tuning; +- } +- +- /* Disable TSX on some processors to avoid TSX on kernels that +- weren't updated with the latest microcode package (which +- disables broken feature by default). */ +- switch (microarch) +- { + case INTEL_BIGCORE_SKYLAKE_AVX512: + /* 0x55 (Skylake-avx512) && stepping <= 5 disable TSX. */ + if (stepping <= 5) +@@ -900,38 +786,152 @@ init_cpu_features (struct cpu_features *cpu_features) + + case INTEL_BIGCORE_KABYLAKE: + /* NB: Although the errata documents that for model == 0x8e +- (kabylake skylake client), only 0xb stepping or lower are +- impacted, the intention of the errata was to disable TSX on +- all client processors on all steppings. Include 0xc +- stepping which is an Intel Core i7-8665U, a client mobile +- processor. */ ++ (kabylake skylake client), only 0xb stepping or lower are ++ impacted, the intention of the errata was to disable TSX on ++ all client processors on all steppings. Include 0xc ++ stepping which is an Intel Core i7-8665U, a client mobile ++ processor. */ + if (stepping > 0xc) + break; + /* Fall through. */ + case INTEL_BIGCORE_SKYLAKE: +- /* Disable Intel TSX and enable RTM_ALWAYS_ABORT for +- processors listed in: +- +-https://www.intel.com/content/www/us/en/support/articles/000059422/processors.html +- */ +- disable_tsx: +- CPU_FEATURE_UNSET (cpu_features, HLE); +- CPU_FEATURE_UNSET (cpu_features, RTM); +- CPU_FEATURE_SET (cpu_features, RTM_ALWAYS_ABORT); +- break; ++ /* Disable Intel TSX and enable RTM_ALWAYS_ABORT for ++ processors listed in: ++ ++ https://www.intel.com/content/www/us/en/support/articles/000059422/processors.html ++ */ ++disable_tsx: ++ CPU_FEATURE_UNSET (cpu_features, HLE); ++ CPU_FEATURE_UNSET (cpu_features, RTM); ++ CPU_FEATURE_SET (cpu_features, RTM_ALWAYS_ABORT); ++ break; + + case INTEL_BIGCORE_HASWELL: +- /* Xeon E7 v3 (model == 0x3f) with stepping >= 4 has working +- TSX. Haswell also include other model numbers that have +- working TSX. */ +- if (model == 0x3f && stepping >= 4) ++ /* Xeon E7 v3 (model == 0x3f) with stepping >= 4 has working ++ TSX. Haswell also includes other model numbers that have ++ working TSX. */ ++ if (model == 0x3f && stepping >= 4) + break; + +- CPU_FEATURE_UNSET (cpu_features, RTM); +- break; ++ CPU_FEATURE_UNSET (cpu_features, RTM); ++ break; + } + } + ++ switch (microarch) ++ { ++ /* Atom / KNL tuning. */ ++ case INTEL_ATOM_BONNELL: ++ /* BSF is slow on Bonnell. */ ++ cpu_features->preferred[index_arch_Slow_BSF] ++ |= bit_arch_Slow_BSF; ++ break; ++ ++ /* Unaligned load versions are faster than SSSE3 ++ on Airmont, Silvermont, Goldmont, and Goldmont Plus. */ ++ case INTEL_ATOM_AIRMONT: ++ case INTEL_ATOM_SILVERMONT: ++ case INTEL_ATOM_GOLDMONT: ++ case INTEL_ATOM_GOLDMONT_PLUS: ++ ++ /* Knights Landing. Enable Silvermont optimizations. */ ++ case INTEL_KNIGHTS_LANDING: ++ ++ cpu_features->preferred[index_arch_Fast_Unaligned_Load] ++ |= (bit_arch_Fast_Unaligned_Load ++ | bit_arch_Fast_Unaligned_Copy ++ | bit_arch_Prefer_PMINUB_for_stringop ++ | bit_arch_Slow_SSE4_2); ++ break; ++ ++ case INTEL_ATOM_TREMONT: ++ /* Enable rep string instructions, unaligned load, unaligned ++ copy, pminub and avoid SSE 4.2 on Tremont. */ ++ cpu_features->preferred[index_arch_Fast_Rep_String] ++ |= (bit_arch_Fast_Rep_String ++ | bit_arch_Fast_Unaligned_Load ++ | bit_arch_Fast_Unaligned_Copy ++ | bit_arch_Prefer_PMINUB_for_stringop ++ | bit_arch_Slow_SSE4_2); ++ break; ++ ++ /* ++ Default tuned Knights microarch. ++ case INTEL_KNIGHTS_MILL: ++ */ ++ ++ /* ++ Default tuned atom microarch. ++ case INTEL_ATOM_SIERRAFOREST: ++ case INTEL_ATOM_GRANDRIDGE: ++ case INTEL_ATOM_CLEARWATERFOREST: ++ */ ++ ++ /* Bigcore/Default Tuning. */ ++ default: ++ default_tuning: ++ /* Unknown Intel processors. Assuming this is one of Core ++ i3/i5/i7 processors if AVX is available. */ ++ if (!CPU_FEATURES_CPU_P (cpu_features, AVX)) ++ break; ++ ++ enable_modern_features: ++ /* Rep string instructions, unaligned load, unaligned copy, ++ and pminub are fast on Intel Core i3, i5 and i7. */ ++ cpu_features->preferred[index_arch_Fast_Rep_String] ++ |= (bit_arch_Fast_Rep_String ++ | bit_arch_Fast_Unaligned_Load ++ | bit_arch_Fast_Unaligned_Copy ++ | bit_arch_Prefer_PMINUB_for_stringop); ++ break; ++ ++ case INTEL_BIGCORE_NEHALEM: ++ case INTEL_BIGCORE_WESTMERE: ++ /* Older CPUs prefer non-temporal stores at lower threshold. */ ++ cpu_features->cachesize_non_temporal_divisor = 8; ++ goto enable_modern_features; ++ ++ /* Older Bigcore microarch (smaller non-temporal store ++ threshold). */ ++ case INTEL_BIGCORE_SANDYBRIDGE: ++ case INTEL_BIGCORE_IVYBRIDGE: ++ case INTEL_BIGCORE_HASWELL: ++ case INTEL_BIGCORE_BROADWELL: ++ cpu_features->cachesize_non_temporal_divisor = 8; ++ goto default_tuning; ++ ++ /* Newer Bigcore microarch (larger non-temporal store ++ threshold). */ ++ case INTEL_BIGCORE_SKYLAKE_AVX512: ++ case INTEL_BIGCORE_CANNONLAKE: ++ /* Benchmarks indicate non-temporal memset is not ++ necessarily profitable on SKX (and in some cases much ++ worse). This is likely unique to SKX due to its unique ++ mesh interconnect (not present on ICX or BWD). Disable ++ non-temporal on all Skylake servers. */ ++ cpu_features->preferred[index_arch_Avoid_Non_Temporal_Memset] ++ |= bit_arch_Avoid_Non_Temporal_Memset; ++ /* fallthrough */ ++ case INTEL_BIGCORE_COMETLAKE: ++ case INTEL_BIGCORE_SKYLAKE: ++ case INTEL_BIGCORE_KABYLAKE: ++ case INTEL_BIGCORE_ICELAKE: ++ case INTEL_BIGCORE_TIGERLAKE: ++ case INTEL_BIGCORE_ROCKETLAKE: ++ case INTEL_BIGCORE_RAPTORLAKE: ++ case INTEL_BIGCORE_METEORLAKE: ++ case INTEL_BIGCORE_LUNARLAKE: ++ case INTEL_BIGCORE_ARROWLAKE: ++ case INTEL_BIGCORE_PANTHERLAKE: ++ case INTEL_BIGCORE_SAPPHIRERAPIDS: ++ case INTEL_BIGCORE_EMERALDRAPIDS: ++ case INTEL_BIGCORE_GRANITERAPIDS: ++ /* Default tuned Mixed (bigcore + atom SOC). */ ++ case INTEL_MIXED_LAKEFIELD: ++ case INTEL_MIXED_ALDERLAKE: ++ cpu_features->cachesize_non_temporal_divisor = 2; ++ goto default_tuning; ++ } + + /* Since AVX512ER is unique to Xeon Phi, set Prefer_No_VZEROUPPER + if AVX512ER is available. Don't use AVX512 to avoid lower CPU + +commit d8a1a1aef7a58b991505b9a1349a40736dec3abf +Author: H.J. Lu +Date: Sat Apr 12 08:37:29 2025 -0700 + + x86: Detect Intel Diamond Rapids + + Detect Intel Diamond Rapids and tune it similar to Intel Granite Rapids. + + Signed-off-by: H.J. Lu + Reviewed-by: Sunil K Pandey + (cherry picked from commit de14f1959ee5f9b845a7cae43bee03068b8136f0) + +diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c +index 1a6e694abf..52a2f03bdd 100644 +--- a/sysdeps/x86/cpu-features.c ++++ b/sysdeps/x86/cpu-features.c +@@ -542,6 +542,7 @@ enum intel_microarch + INTEL_BIGCORE_ARROWLAKE, + INTEL_BIGCORE_PANTHERLAKE, + INTEL_BIGCORE_GRANITERAPIDS, ++ INTEL_BIGCORE_DIAMONDRAPIDS, + + /* Mixed (bigcore + atom SOC). */ + INTEL_MIXED_LAKEFIELD, +@@ -817,6 +818,16 @@ disable_tsx: + break; + } + } ++ else if (family == 19) ++ switch (model) ++ { ++ case 0x01: ++ microarch = INTEL_BIGCORE_DIAMONDRAPIDS; ++ break; ++ ++ default: ++ break; ++ } + + switch (microarch) + { +@@ -926,6 +937,7 @@ disable_tsx: + case INTEL_BIGCORE_SAPPHIRERAPIDS: + case INTEL_BIGCORE_EMERALDRAPIDS: + case INTEL_BIGCORE_GRANITERAPIDS: ++ case INTEL_BIGCORE_DIAMONDRAPIDS: + /* Default tuned Mixed (bigcore + atom SOC). */ + case INTEL_MIXED_LAKEFIELD: + case INTEL_MIXED_ALDERLAKE: + +commit 736e6735053f12181d3d287898dd5fdb9e8baf59 +Author: Frank Barrus +Date: Wed Dec 4 07:55:02 2024 -0500 + + pthreads NPTL: lost wakeup fix 2 + + This fixes the lost wakeup (from a bug in signal stealing) with a change + in the usage of g_signals[] in the condition variable internal state. + It also completely eliminates the concept and handling of signal stealing, + as well as the need for signalers to block to wait for waiters to wake + up every time there is a G1/G2 switch. This greatly reduces the average + and maximum latency for pthread_cond_signal. + + The g_signals[] field now contains a signal count that is relative to + the current g1_start value. Since it is a 32-bit field, and the LSB is + still reserved (though not currently used anymore), it has a 31-bit value + that corresponds to the low 31 bits of the sequence number in g1_start. + (since g1_start also has an LSB flag, this means bits 31:1 in g_signals + correspond to bits 31:1 in g1_start, plus the current signal count) + + By making the signal count relative to g1_start, there is no longer + any ambiguity or A/B/A issue, and thus any checks before blocking, + including the futex call itself, are guaranteed not to block if the G1/G2 + switch occurs, even if the signal count remains the same. This allows + initially safely blocking in G2 until the switch to G1 occurs, and + then transitioning from G1 to a new G1 or G2, and always being able to + distinguish the state change. This removes the race condition and A/B/A + problems that otherwise ocurred if a late (pre-empted) waiter were to + resume just as the futex call attempted to block on g_signal since + otherwise there was no last opportunity to re-check things like whether + the current G1 group was already closed. + + By fixing these issues, the signal stealing code can be eliminated, + since there is no concept of signal stealing anymore. The code to block + for all waiters to exit g_refs can also be removed, since any waiters + that are still in the g_refs region can be guaranteed to safely wake + up and exit. If there are still any left at this time, they are all + sent one final futex wakeup to ensure that they are not blocked any + longer, but there is no need for the signaller to block and wait for + them to wake up and exit the g_refs region. + + The signal count is then effectively "zeroed" but since it is now + relative to g1_start, this is done by advancing it to a new value that + can be observed by any pending blocking waiters. Any late waiters can + always tell the difference, and can thus just cleanly exit if they are + in a stale G1 or G2. They can never steal a signal from the current + G1 if they are not in the current G1, since the signal value that has + to match in the cmpxchg has the low 31 bits of the g1_start value + contained in it, and that's first checked, and then it won't match if + there's a G1/G2 change. + + Note: the 31-bit sequence number used in g_signals is designed to + handle wrap-around when checking the signal count, but if the entire + 31-bit wraparound (2 billion signals) occurs while there is still a + late waiter that has not yet resumed, and it happens to then match + the current g1_start low bits, and the pre-emption occurs after the + normal "closed group" checks (which are 64-bit) but then hits the + futex syscall and signal consuming code, then an A/B/A issue could + still result and cause an incorrect assumption about whether it + should block. This particular scenario seems unlikely in practice. + Note that once awake from the futex, the waiter would notice the + closed group before consuming the signal (since that's still a 64-bit + check that would not be aliased in the wrap-around in g_signals), + so the biggest impact would be blocking on the futex until the next + full wakeup from a G1/G2 switch. + + Signed-off-by: Frank Barrus + Reviewed-by: Carlos O'Donell + (cherry picked from commit 1db84775f831a1494993ce9c118deaf9537cc50a) + +diff --git a/nptl/pthread_cond_common.c b/nptl/pthread_cond_common.c +index 3487557bb8..4855b8899f 100644 +--- a/nptl/pthread_cond_common.c ++++ b/nptl/pthread_cond_common.c +@@ -201,7 +201,6 @@ static bool __attribute__ ((unused)) + __condvar_quiesce_and_switch_g1 (pthread_cond_t *cond, uint64_t wseq, + unsigned int *g1index, int private) + { +- const unsigned int maxspin = 0; + unsigned int g1 = *g1index; + + /* If there is no waiter in G2, we don't do anything. The expression may +@@ -222,84 +221,46 @@ __condvar_quiesce_and_switch_g1 (pthread_cond_t *cond, uint64_t wseq, + * New waiters arriving concurrently with the group switching will all go + into G2 until we atomically make the switch. Waiters existing in G2 + are not affected. +- * Waiters in G1 will be closed out immediately by setting a flag in +- __g_signals, which will prevent waiters from blocking using a futex on +- __g_signals and also notifies them that the group is closed. As a +- result, they will eventually remove their group reference, allowing us +- to close switch group roles. */ +- +- /* First, set the closed flag on __g_signals. This tells waiters that are +- about to wait that they shouldn't do that anymore. This basically +- serves as an advance notification of the upcoming change to __g1_start; +- waiters interpret it as if __g1_start was larger than their waiter +- sequence position. This allows us to change __g1_start after waiting +- for all existing waiters with group references to leave, which in turn +- makes recovery after stealing a signal simpler because it then can be +- skipped if __g1_start indicates that the group is closed (otherwise, +- we would have to recover always because waiters don't know how big their +- groups are). Relaxed MO is fine. */ +- atomic_fetch_or_relaxed (cond->__data.__g_signals + g1, 1); +- +- /* Wait until there are no group references anymore. The fetch-or operation +- injects us into the modification order of __g_refs; release MO ensures +- that waiters incrementing __g_refs after our fetch-or see the previous +- changes to __g_signals and to __g1_start that had to happen before we can +- switch this G1 and alias with an older group (we have two groups, so +- aliasing requires switching group roles twice). Note that nobody else +- can have set the wake-request flag, so we do not have to act upon it. +- +- Also note that it is harmless if older waiters or waiters from this G1 +- get a group reference after we have quiesced the group because it will +- remain closed for them either because of the closed flag in __g_signals +- or the later update to __g1_start. New waiters will never arrive here +- but instead continue to go into the still current G2. */ +- unsigned r = atomic_fetch_or_release (cond->__data.__g_refs + g1, 0); +- while ((r >> 1) > 0) +- { +- for (unsigned int spin = maxspin; ((r >> 1) > 0) && (spin > 0); spin--) +- { +- /* TODO Back off. */ +- r = atomic_load_relaxed (cond->__data.__g_refs + g1); +- } +- if ((r >> 1) > 0) +- { +- /* There is still a waiter after spinning. Set the wake-request +- flag and block. Relaxed MO is fine because this is just about +- this futex word. +- +- Update r to include the set wake-request flag so that the upcoming +- futex_wait only blocks if the flag is still set (otherwise, we'd +- violate the basic client-side futex protocol). */ +- r = atomic_fetch_or_relaxed (cond->__data.__g_refs + g1, 1) | 1; +- +- if ((r >> 1) > 0) +- futex_wait_simple (cond->__data.__g_refs + g1, r, private); +- /* Reload here so we eventually see the most recent value even if we +- do not spin. */ +- r = atomic_load_relaxed (cond->__data.__g_refs + g1); +- } +- } +- /* Acquire MO so that we synchronize with the release operation that waiters +- use to decrement __g_refs and thus happen after the waiters we waited +- for. */ +- atomic_thread_fence_acquire (); ++ * Waiters in G1 will be closed out immediately by the advancing of ++ __g_signals to the next "lowseq" (low 31 bits of the new g1_start), ++ which will prevent waiters from blocking using a futex on ++ __g_signals since it provides enough signals for all possible ++ remaining waiters. As a result, they can each consume a signal ++ and they will eventually remove their group reference. */ + + /* Update __g1_start, which finishes closing this group. The value we add + will never be negative because old_orig_size can only be zero when we + switch groups the first time after a condvar was initialized, in which +- case G1 will be at index 1 and we will add a value of 1. See above for +- why this takes place after waiting for quiescence of the group. ++ case G1 will be at index 1 and we will add a value of 1. + Relaxed MO is fine because the change comes with no additional + constraints that others would have to observe. */ + __condvar_add_g1_start_relaxed (cond, + (old_orig_size << 1) + (g1 == 1 ? 1 : - 1)); + +- /* Now reopen the group, thus enabling waiters to again block using the +- futex controlled by __g_signals. Release MO so that observers that see +- no signals (and thus can block) also see the write __g1_start and thus +- that this is now a new group (see __pthread_cond_wait_common for the +- matching acquire MO loads). */ +- atomic_store_release (cond->__data.__g_signals + g1, 0); ++ unsigned int lowseq = ((old_g1_start + old_orig_size) << 1) & ~1U; ++ ++ /* If any waiters still hold group references (and thus could be blocked), ++ then wake them all up now and prevent any running ones from blocking. ++ This is effectively a catch-all for any possible current or future ++ bugs that can allow the group size to reach 0 before all G1 waiters ++ have been awakened or at least given signals to consume, or any ++ other case that can leave blocked (or about to block) older waiters.. */ ++ if ((atomic_fetch_or_release (cond->__data.__g_refs + g1, 0) >> 1) > 0) ++ { ++ /* First advance signals to the end of the group (i.e. enough signals ++ for the entire G1 group) to ensure that waiters which have not ++ yet blocked in the futex will not block. ++ Note that in the vast majority of cases, this should never ++ actually be necessary, since __g_signals will have enough ++ signals for the remaining g_refs waiters. As an optimization, ++ we could check this first before proceeding, although that ++ could still leave the potential for futex lost wakeup bugs ++ if the signal count was non-zero but the futex wakeup ++ was somehow lost. */ ++ atomic_store_release (cond->__data.__g_signals + g1, lowseq); ++ ++ futex_wake (cond->__data.__g_signals + g1, INT_MAX, private); ++ } + + /* At this point, the old G1 is now a valid new G2 (but not in use yet). + No old waiter can neither grab a signal nor acquire a reference without +@@ -311,6 +272,10 @@ __condvar_quiesce_and_switch_g1 (pthread_cond_t *cond, uint64_t wseq, + g1 ^= 1; + *g1index ^= 1; + ++ /* Now advance the new G1 g_signals to the new lowseq, giving it ++ an effective signal count of 0 to start. */ ++ atomic_store_release (cond->__data.__g_signals + g1, lowseq); ++ + /* These values are just observed by signalers, and thus protected by the + lock. */ + unsigned int orig_size = wseq - (old_g1_start + old_orig_size); +diff --git a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c +index 66786c7b90..3d290e39c8 100644 +--- a/nptl/pthread_cond_wait.c ++++ b/nptl/pthread_cond_wait.c +@@ -238,9 +238,7 @@ __condvar_cleanup_waiting (void *arg) + signaled), and a reference count. + + The group reference count is used to maintain the number of waiters that +- are using the group's futex. Before a group can change its role, the +- reference count must show that no waiters are using the futex anymore; this +- prevents ABA issues on the futex word. ++ are using the group's futex. + + To represent which intervals in the waiter sequence the groups cover (and + thus also which group slot contains G1 or G2), we use a 64b counter to +@@ -300,11 +298,12 @@ __condvar_cleanup_waiting (void *arg) + last reference. + * Reference count used by waiters concurrently with signalers that have + acquired the condvar-internal lock. +- __g_signals: The number of signals that can still be consumed. ++ __g_signals: The number of signals that can still be consumed, relative to ++ the current g1_start. (i.e. bits 31 to 1 of __g_signals are bits ++ 31 to 1 of g1_start with the signal count added) + * Used as a futex word by waiters. Used concurrently by waiters and + signalers. +- * LSB is true iff this group has been completely signaled (i.e., it is +- closed). ++ * LSB is currently reserved and 0. + __g_size: Waiters remaining in this group (i.e., which have not been + signaled yet. + * Accessed by signalers and waiters that cancel waiting (both do so only +@@ -328,18 +327,6 @@ __condvar_cleanup_waiting (void *arg) + sufficient because if a waiter can see a sufficiently large value, it could + have also consume a signal in the waiters group. + +- Waiters try to grab a signal from __g_signals without holding a reference +- count, which can lead to stealing a signal from a more recent group after +- their own group was already closed. They cannot always detect whether they +- in fact did because they do not know when they stole, but they can +- conservatively add a signal back to the group they stole from; if they +- did so unnecessarily, all that happens is a spurious wake-up. To make this +- even less likely, __g1_start contains the index of the current g2 too, +- which allows waiters to check if there aliasing on the group slots; if +- there wasn't, they didn't steal from the current G1, which means that the +- G1 they stole from must have been already closed and they do not need to +- fix anything. +- + It is essential that the last field in pthread_cond_t is __g_signals[1]: + The previous condvar used a pointer-sized field in pthread_cond_t, so a + PTHREAD_COND_INITIALIZER from that condvar implementation might only +@@ -435,6 +422,9 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex, + { + while (1) + { ++ uint64_t g1_start = __condvar_load_g1_start_relaxed (cond); ++ unsigned int lowseq = (g1_start & 1) == g ? signals : g1_start & ~1U; ++ + /* Spin-wait first. + Note that spinning first without checking whether a timeout + passed might lead to what looks like a spurious wake-up even +@@ -446,35 +436,45 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex, + having to compare against the current time seems to be the right + choice from a performance perspective for most use cases. */ + unsigned int spin = maxspin; +- while (signals == 0 && spin > 0) ++ while (spin > 0 && ((int)(signals - lowseq) < 2)) + { + /* Check that we are not spinning on a group that's already + closed. */ +- if (seq < (__condvar_load_g1_start_relaxed (cond) >> 1)) +- goto done; ++ if (seq < (g1_start >> 1)) ++ break; + + /* TODO Back off. */ + + /* Reload signals. See above for MO. */ + signals = atomic_load_acquire (cond->__data.__g_signals + g); ++ g1_start = __condvar_load_g1_start_relaxed (cond); ++ lowseq = (g1_start & 1) == g ? signals : g1_start & ~1U; + spin--; + } + +- /* If our group will be closed as indicated by the flag on signals, +- don't bother grabbing a signal. */ +- if (signals & 1) +- goto done; +- +- /* If there is an available signal, don't block. */ +- if (signals != 0) ++ if (seq < (g1_start >> 1)) ++ { ++ /* If the group is closed already, ++ then this waiter originally had enough extra signals to ++ consume, up until the time its group was closed. */ ++ goto done; ++ } ++ ++ /* If there is an available signal, don't block. ++ If __g1_start has advanced at all, then we must be in G1 ++ by now, perhaps in the process of switching back to an older ++ G2, but in either case we're allowed to consume the available ++ signal and should not block anymore. */ ++ if ((int)(signals - lowseq) >= 2) + break; + + /* No signals available after spinning, so prepare to block. + We first acquire a group reference and use acquire MO for that so + that we synchronize with the dummy read-modify-write in + __condvar_quiesce_and_switch_g1 if we read from that. In turn, +- in this case this will make us see the closed flag on __g_signals +- that designates a concurrent attempt to reuse the group's slot. ++ in this case this will make us see the advancement of __g_signals ++ to the upcoming new g1_start that occurs with a concurrent ++ attempt to reuse the group's slot. + We use acquire MO for the __g_signals check to make the + __g1_start check work (see spinning above). + Note that the group reference acquisition will not mask the +@@ -482,15 +482,24 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex, + an atomic read-modify-write operation and thus extend the release + sequence. */ + atomic_fetch_add_acquire (cond->__data.__g_refs + g, 2); +- if (((atomic_load_acquire (cond->__data.__g_signals + g) & 1) != 0) +- || (seq < (__condvar_load_g1_start_relaxed (cond) >> 1))) ++ signals = atomic_load_acquire (cond->__data.__g_signals + g); ++ g1_start = __condvar_load_g1_start_relaxed (cond); ++ lowseq = (g1_start & 1) == g ? signals : g1_start & ~1U; ++ ++ if (seq < (g1_start >> 1)) + { +- /* Our group is closed. Wake up any signalers that might be +- waiting. */ ++ /* group is closed already, so don't block */ + __condvar_dec_grefs (cond, g, private); + goto done; + } + ++ if ((int)(signals - lowseq) >= 2) ++ { ++ /* a signal showed up or G1/G2 switched after we grabbed the refcount */ ++ __condvar_dec_grefs (cond, g, private); ++ break; ++ } ++ + // Now block. + struct _pthread_cleanup_buffer buffer; + struct _condvar_cleanup_buffer cbuffer; +@@ -501,7 +510,7 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex, + __pthread_cleanup_push (&buffer, __condvar_cleanup_waiting, &cbuffer); + + err = __futex_abstimed_wait_cancelable64 ( +- cond->__data.__g_signals + g, 0, clockid, abstime, private); ++ cond->__data.__g_signals + g, signals, clockid, abstime, private); + + __pthread_cleanup_pop (&buffer, 0); + +@@ -524,6 +533,8 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex, + signals = atomic_load_acquire (cond->__data.__g_signals + g); + } + ++ if (seq < (__condvar_load_g1_start_relaxed (cond) >> 1)) ++ goto done; + } + /* Try to grab a signal. Use acquire MO so that we see an up-to-date value + of __g1_start below (see spinning above for a similar case). In +@@ -532,69 +543,6 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex, + while (!atomic_compare_exchange_weak_acquire (cond->__data.__g_signals + g, + &signals, signals - 2)); + +- /* We consumed a signal but we could have consumed from a more recent group +- that aliased with ours due to being in the same group slot. If this +- might be the case our group must be closed as visible through +- __g1_start. */ +- uint64_t g1_start = __condvar_load_g1_start_relaxed (cond); +- if (seq < (g1_start >> 1)) +- { +- /* We potentially stole a signal from a more recent group but we do not +- know which group we really consumed from. +- We do not care about groups older than current G1 because they are +- closed; we could have stolen from these, but then we just add a +- spurious wake-up for the current groups. +- We will never steal a signal from current G2 that was really intended +- for G2 because G2 never receives signals (until it becomes G1). We +- could have stolen a signal from G2 that was conservatively added by a +- previous waiter that also thought it stole a signal -- but given that +- that signal was added unnecessarily, it's not a problem if we steal +- it. +- Thus, the remaining case is that we could have stolen from the current +- G1, where "current" means the __g1_start value we observed. However, +- if the current G1 does not have the same slot index as we do, we did +- not steal from it and do not need to undo that. This is the reason +- for putting a bit with G2's index into__g1_start as well. */ +- if (((g1_start & 1) ^ 1) == g) +- { +- /* We have to conservatively undo our potential mistake of stealing +- a signal. We can stop trying to do that when the current G1 +- changes because other spinning waiters will notice this too and +- __condvar_quiesce_and_switch_g1 has checked that there are no +- futex waiters anymore before switching G1. +- Relaxed MO is fine for the __g1_start load because we need to +- merely be able to observe this fact and not have to observe +- something else as well. +- ??? Would it help to spin for a little while to see whether the +- current G1 gets closed? This might be worthwhile if the group is +- small or close to being closed. */ +- unsigned int s = atomic_load_relaxed (cond->__data.__g_signals + g); +- while (__condvar_load_g1_start_relaxed (cond) == g1_start) +- { +- /* Try to add a signal. We don't need to acquire the lock +- because at worst we can cause a spurious wake-up. If the +- group is in the process of being closed (LSB is true), this +- has an effect similar to us adding a signal. */ +- if (((s & 1) != 0) +- || atomic_compare_exchange_weak_relaxed +- (cond->__data.__g_signals + g, &s, s + 2)) +- { +- /* If we added a signal, we also need to add a wake-up on +- the futex. We also need to do that if we skipped adding +- a signal because the group is being closed because +- while __condvar_quiesce_and_switch_g1 could have closed +- the group, it might still be waiting for futex waiters to +- leave (and one of those waiters might be the one we stole +- the signal from, which cause it to block using the +- futex). */ +- futex_wake (cond->__data.__g_signals + g, 1, private); +- break; +- } +- /* TODO Back off. */ +- } +- } +- } +- + done: + + /* Confirm that we have been woken. We do that before acquiring the mutex + +commit 88d999d840e77c9917f08870094a23ce42294848 +Author: Malte Skarupke +Date: Wed Dec 4 07:55:22 2024 -0500 + + nptl: Update comments and indentation for new condvar implementation + + Some comments were wrong after the most recent commit. This fixes that. + + Also fixing indentation where it was using spaces instead of tabs. + + Signed-off-by: Malte Skarupke + Reviewed-by: Carlos O'Donell + (cherry picked from commit 0cc973160c23bb67f895bc887dd6942d29f8fee3) + +diff --git a/nptl/pthread_cond_common.c b/nptl/pthread_cond_common.c +index 4855b8899f..3475d15123 100644 +--- a/nptl/pthread_cond_common.c ++++ b/nptl/pthread_cond_common.c +@@ -221,8 +221,9 @@ __condvar_quiesce_and_switch_g1 (pthread_cond_t *cond, uint64_t wseq, + * New waiters arriving concurrently with the group switching will all go + into G2 until we atomically make the switch. Waiters existing in G2 + are not affected. +- * Waiters in G1 will be closed out immediately by the advancing of +- __g_signals to the next "lowseq" (low 31 bits of the new g1_start), ++ * Waiters in G1 have already received a signal and been woken. If they ++ haven't woken yet, they will be closed out immediately by the advancing ++ of __g_signals to the next "lowseq" (low 31 bits of the new g1_start), + which will prevent waiters from blocking using a futex on + __g_signals since it provides enough signals for all possible + remaining waiters. As a result, they can each consume a signal +diff --git a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c +index 3d290e39c8..ad2cee7d59 100644 +--- a/nptl/pthread_cond_wait.c ++++ b/nptl/pthread_cond_wait.c +@@ -249,7 +249,7 @@ __condvar_cleanup_waiting (void *arg) + figure out whether they are in a group that has already been completely + signaled (i.e., if the current G1 starts at a later position that the + waiter's position). Waiters cannot determine whether they are currently +- in G2 or G1 -- but they do not have too because all they are interested in ++ in G2 or G1 -- but they do not have to because all they are interested in + is whether there are available signals, and they always start in G2 (whose + group slot they know because of the bit in the waiter sequence. Signalers + will simply fill the right group until it is completely signaled and can +@@ -412,7 +412,7 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex, + } + + /* Now wait until a signal is available in our group or it is closed. +- Acquire MO so that if we observe a value of zero written after group ++ Acquire MO so that if we observe (signals == lowseq) after group + switching in __condvar_quiesce_and_switch_g1, we synchronize with that + store and will see the prior update of __g1_start done while switching + groups too. */ +@@ -422,8 +422,8 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex, + { + while (1) + { +- uint64_t g1_start = __condvar_load_g1_start_relaxed (cond); +- unsigned int lowseq = (g1_start & 1) == g ? signals : g1_start & ~1U; ++ uint64_t g1_start = __condvar_load_g1_start_relaxed (cond); ++ unsigned int lowseq = (g1_start & 1) == g ? signals : g1_start & ~1U; + + /* Spin-wait first. + Note that spinning first without checking whether a timeout +@@ -447,21 +447,21 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex, + + /* Reload signals. See above for MO. */ + signals = atomic_load_acquire (cond->__data.__g_signals + g); +- g1_start = __condvar_load_g1_start_relaxed (cond); +- lowseq = (g1_start & 1) == g ? signals : g1_start & ~1U; ++ g1_start = __condvar_load_g1_start_relaxed (cond); ++ lowseq = (g1_start & 1) == g ? signals : g1_start & ~1U; + spin--; + } + +- if (seq < (g1_start >> 1)) ++ if (seq < (g1_start >> 1)) + { +- /* If the group is closed already, ++ /* If the group is closed already, + then this waiter originally had enough extra signals to + consume, up until the time its group was closed. */ + goto done; +- } ++ } + + /* If there is an available signal, don't block. +- If __g1_start has advanced at all, then we must be in G1 ++ If __g1_start has advanced at all, then we must be in G1 + by now, perhaps in the process of switching back to an older + G2, but in either case we're allowed to consume the available + signal and should not block anymore. */ +@@ -483,22 +483,23 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex, + sequence. */ + atomic_fetch_add_acquire (cond->__data.__g_refs + g, 2); + signals = atomic_load_acquire (cond->__data.__g_signals + g); +- g1_start = __condvar_load_g1_start_relaxed (cond); +- lowseq = (g1_start & 1) == g ? signals : g1_start & ~1U; ++ g1_start = __condvar_load_g1_start_relaxed (cond); ++ lowseq = (g1_start & 1) == g ? signals : g1_start & ~1U; + +- if (seq < (g1_start >> 1)) ++ if (seq < (g1_start >> 1)) + { +- /* group is closed already, so don't block */ ++ /* group is closed already, so don't block */ + __condvar_dec_grefs (cond, g, private); + goto done; + } + + if ((int)(signals - lowseq) >= 2) + { +- /* a signal showed up or G1/G2 switched after we grabbed the refcount */ ++ /* a signal showed up or G1/G2 switched after we grabbed the ++ refcount */ + __condvar_dec_grefs (cond, g, private); + break; +- } ++ } + + // Now block. + struct _pthread_cleanup_buffer buffer; +@@ -536,10 +537,8 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex, + if (seq < (__condvar_load_g1_start_relaxed (cond) >> 1)) + goto done; + } +- /* Try to grab a signal. Use acquire MO so that we see an up-to-date value +- of __g1_start below (see spinning above for a similar case). In +- particular, if we steal from a more recent group, we will also see a +- more recent __g1_start below. */ ++ /* Try to grab a signal. See above for MO. (if we do another loop ++ iteration we need to see the correct value of g1_start) */ + while (!atomic_compare_exchange_weak_acquire (cond->__data.__g_signals + g, + &signals, signals - 2)); + + +commit 136a29f9d0a3924828d5a16be82d054637517c95 +Author: Malte Skarupke +Date: Wed Dec 4 07:55:50 2024 -0500 + + nptl: Remove unnecessary catch-all-wake in condvar group switch + + This wake is unnecessary. We only switch groups after every sleeper in a group + has been woken. Sure, they may take a while to actually wake up and may still + hold a reference, but waking them a second time doesn't speed that up. Instead + this just makes the code more complicated and may hide problems. + + In particular this safety wake wouldn't even have helped with the bug that was + fixed by Barrus' patch: The bug there was that pthread_cond_signal would not + switch g1 when it should, so we wouldn't even have entered this code path. + + Signed-off-by: Malte Skarupke + Reviewed-by: Carlos O'Donell + (cherry picked from commit b42cc6af11062c260c7dfa91f1c89891366fed3e) + +diff --git a/nptl/pthread_cond_common.c b/nptl/pthread_cond_common.c +index 3475d15123..30b8eee149 100644 +--- a/nptl/pthread_cond_common.c ++++ b/nptl/pthread_cond_common.c +@@ -221,13 +221,7 @@ __condvar_quiesce_and_switch_g1 (pthread_cond_t *cond, uint64_t wseq, + * New waiters arriving concurrently with the group switching will all go + into G2 until we atomically make the switch. Waiters existing in G2 + are not affected. +- * Waiters in G1 have already received a signal and been woken. If they +- haven't woken yet, they will be closed out immediately by the advancing +- of __g_signals to the next "lowseq" (low 31 bits of the new g1_start), +- which will prevent waiters from blocking using a futex on +- __g_signals since it provides enough signals for all possible +- remaining waiters. As a result, they can each consume a signal +- and they will eventually remove their group reference. */ ++ * Waiters in G1 have already received a signal and been woken. */ + + /* Update __g1_start, which finishes closing this group. The value we add + will never be negative because old_orig_size can only be zero when we +@@ -240,29 +234,6 @@ __condvar_quiesce_and_switch_g1 (pthread_cond_t *cond, uint64_t wseq, + + unsigned int lowseq = ((old_g1_start + old_orig_size) << 1) & ~1U; + +- /* If any waiters still hold group references (and thus could be blocked), +- then wake them all up now and prevent any running ones from blocking. +- This is effectively a catch-all for any possible current or future +- bugs that can allow the group size to reach 0 before all G1 waiters +- have been awakened or at least given signals to consume, or any +- other case that can leave blocked (or about to block) older waiters.. */ +- if ((atomic_fetch_or_release (cond->__data.__g_refs + g1, 0) >> 1) > 0) +- { +- /* First advance signals to the end of the group (i.e. enough signals +- for the entire G1 group) to ensure that waiters which have not +- yet blocked in the futex will not block. +- Note that in the vast majority of cases, this should never +- actually be necessary, since __g_signals will have enough +- signals for the remaining g_refs waiters. As an optimization, +- we could check this first before proceeding, although that +- could still leave the potential for futex lost wakeup bugs +- if the signal count was non-zero but the futex wakeup +- was somehow lost. */ +- atomic_store_release (cond->__data.__g_signals + g1, lowseq); +- +- futex_wake (cond->__data.__g_signals + g1, INT_MAX, private); +- } +- + /* At this point, the old G1 is now a valid new G2 (but not in use yet). + No old waiter can neither grab a signal nor acquire a reference without + noticing that __g1_start is larger. + +commit 2a259b6d77dc5bdab5c8f4ee0e69572d5699d4bf +Author: Malte Skarupke +Date: Wed Dec 4 07:56:13 2024 -0500 + + nptl: Remove unnecessary quadruple check in pthread_cond_wait + + pthread_cond_wait was checking whether it was in a closed group no less than + four times. Checking once is enough. Here are the four checks: + + 1. While spin-waiting. This was dead code: maxspin is set to 0 and has been + for years. + 2. Before deciding to go to sleep, and before incrementing grefs: I kept this + 3. After incrementing grefs. There is no reason to think that the group would + close while we do an atomic increment. Obviously it could close at any + point, but that doesn't mean we have to recheck after every step. This + check was equally good as check 2, except it has to do more work. + 4. When we find ourselves in a group that has a signal. We only get here after + we check that we're not in a closed group. There is no need to check again. + The check would only have helped in cases where the compare_exchange in the + next line would also have failed. Relying on the compare_exchange is fine. + + Removing the duplicate checks clarifies the code. + + Signed-off-by: Malte Skarupke + Reviewed-by: Carlos O'Donell + (cherry picked from commit 4f7b051f8ee3feff1b53b27a906f245afaa9cee1) + +diff --git a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c +index ad2cee7d59..cfdd13bb87 100644 +--- a/nptl/pthread_cond_wait.c ++++ b/nptl/pthread_cond_wait.c +@@ -366,7 +366,6 @@ static __always_inline int + __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex, + clockid_t clockid, const struct __timespec64 *abstime) + { +- const int maxspin = 0; + int err; + int result = 0; + +@@ -425,33 +424,6 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex, + uint64_t g1_start = __condvar_load_g1_start_relaxed (cond); + unsigned int lowseq = (g1_start & 1) == g ? signals : g1_start & ~1U; + +- /* Spin-wait first. +- Note that spinning first without checking whether a timeout +- passed might lead to what looks like a spurious wake-up even +- though we should return ETIMEDOUT (e.g., if the caller provides +- an absolute timeout that is clearly in the past). However, +- (1) spurious wake-ups are allowed, (2) it seems unlikely that a +- user will (ab)use pthread_cond_wait as a check for whether a +- point in time is in the past, and (3) spinning first without +- having to compare against the current time seems to be the right +- choice from a performance perspective for most use cases. */ +- unsigned int spin = maxspin; +- while (spin > 0 && ((int)(signals - lowseq) < 2)) +- { +- /* Check that we are not spinning on a group that's already +- closed. */ +- if (seq < (g1_start >> 1)) +- break; +- +- /* TODO Back off. */ +- +- /* Reload signals. See above for MO. */ +- signals = atomic_load_acquire (cond->__data.__g_signals + g); +- g1_start = __condvar_load_g1_start_relaxed (cond); +- lowseq = (g1_start & 1) == g ? signals : g1_start & ~1U; +- spin--; +- } +- + if (seq < (g1_start >> 1)) + { + /* If the group is closed already, +@@ -482,24 +454,6 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex, + an atomic read-modify-write operation and thus extend the release + sequence. */ + atomic_fetch_add_acquire (cond->__data.__g_refs + g, 2); +- signals = atomic_load_acquire (cond->__data.__g_signals + g); +- g1_start = __condvar_load_g1_start_relaxed (cond); +- lowseq = (g1_start & 1) == g ? signals : g1_start & ~1U; +- +- if (seq < (g1_start >> 1)) +- { +- /* group is closed already, so don't block */ +- __condvar_dec_grefs (cond, g, private); +- goto done; +- } +- +- if ((int)(signals - lowseq) >= 2) +- { +- /* a signal showed up or G1/G2 switched after we grabbed the +- refcount */ +- __condvar_dec_grefs (cond, g, private); +- break; +- } + + // Now block. + struct _pthread_cleanup_buffer buffer; +@@ -533,9 +487,6 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex, + /* Reload signals. See above for MO. */ + signals = atomic_load_acquire (cond->__data.__g_signals + g); + } +- +- if (seq < (__condvar_load_g1_start_relaxed (cond) >> 1)) +- goto done; + } + /* Try to grab a signal. See above for MO. (if we do another loop + iteration we need to see the correct value of g1_start) */ + +commit a2465f4293ecc37ac4650fbd02e517bc6fd801c6 +Author: Malte Skarupke +Date: Wed Dec 4 07:56:38 2024 -0500 + + nptl: Remove g_refs from condition variables + + This variable used to be needed to wait in group switching until all sleepers + have confirmed that they have woken. This is no longer needed. Nothing waits + on this variable so there is no need to track how many threads are currently + asleep in each group. + + Signed-off-by: Malte Skarupke + Reviewed-by: Carlos O'Donell + (cherry picked from commit c36fc50781995e6758cae2b6927839d0157f213c) + +diff --git a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c +index cfdd13bb87..411fc0380b 100644 +--- a/nptl/pthread_cond_wait.c ++++ b/nptl/pthread_cond_wait.c +@@ -143,23 +143,6 @@ __condvar_cancel_waiting (pthread_cond_t *cond, uint64_t seq, unsigned int g, + } + } + +-/* Wake up any signalers that might be waiting. */ +-static void +-__condvar_dec_grefs (pthread_cond_t *cond, unsigned int g, int private) +-{ +- /* Release MO to synchronize-with the acquire load in +- __condvar_quiesce_and_switch_g1. */ +- if (atomic_fetch_add_release (cond->__data.__g_refs + g, -2) == 3) +- { +- /* Clear the wake-up request flag before waking up. We do not need more +- than relaxed MO and it doesn't matter if we apply this for an aliased +- group because we wake all futex waiters right after clearing the +- flag. */ +- atomic_fetch_and_relaxed (cond->__data.__g_refs + g, ~(unsigned int) 1); +- futex_wake (cond->__data.__g_refs + g, INT_MAX, private); +- } +-} +- + /* Clean-up for cancellation of waiters waiting for normal signals. We cancel + our registration as a waiter, confirm we have woken up, and re-acquire the + mutex. */ +@@ -171,8 +154,6 @@ __condvar_cleanup_waiting (void *arg) + pthread_cond_t *cond = cbuffer->cond; + unsigned g = cbuffer->wseq & 1; + +- __condvar_dec_grefs (cond, g, cbuffer->private); +- + __condvar_cancel_waiting (cond, cbuffer->wseq >> 1, g, cbuffer->private); + /* FIXME With the current cancellation implementation, it is possible that + a thread is cancelled after it has returned from a syscall. This could +@@ -327,15 +308,6 @@ __condvar_cleanup_waiting (void *arg) + sufficient because if a waiter can see a sufficiently large value, it could + have also consume a signal in the waiters group. + +- It is essential that the last field in pthread_cond_t is __g_signals[1]: +- The previous condvar used a pointer-sized field in pthread_cond_t, so a +- PTHREAD_COND_INITIALIZER from that condvar implementation might only +- initialize 4 bytes to zero instead of the 8 bytes we need (i.e., 44 bytes +- in total instead of the 48 we need). __g_signals[1] is not accessed before +- the first group switch (G2 starts at index 0), which will set its value to +- zero after a harmless fetch-or whose return value is ignored. This +- effectively completes initialization. +- + + Limitations: + * This condvar isn't designed to allow for more than +@@ -440,21 +412,6 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex, + if ((int)(signals - lowseq) >= 2) + break; + +- /* No signals available after spinning, so prepare to block. +- We first acquire a group reference and use acquire MO for that so +- that we synchronize with the dummy read-modify-write in +- __condvar_quiesce_and_switch_g1 if we read from that. In turn, +- in this case this will make us see the advancement of __g_signals +- to the upcoming new g1_start that occurs with a concurrent +- attempt to reuse the group's slot. +- We use acquire MO for the __g_signals check to make the +- __g1_start check work (see spinning above). +- Note that the group reference acquisition will not mask the +- release MO when decrementing the reference count because we use +- an atomic read-modify-write operation and thus extend the release +- sequence. */ +- atomic_fetch_add_acquire (cond->__data.__g_refs + g, 2); +- + // Now block. + struct _pthread_cleanup_buffer buffer; + struct _condvar_cleanup_buffer cbuffer; +@@ -471,18 +428,11 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex, + + if (__glibc_unlikely (err == ETIMEDOUT || err == EOVERFLOW)) + { +- __condvar_dec_grefs (cond, g, private); +- /* If we timed out, we effectively cancel waiting. Note that +- we have decremented __g_refs before cancellation, so that a +- deadlock between waiting for quiescence of our group in +- __condvar_quiesce_and_switch_g1 and us trying to acquire +- the lock during cancellation is not possible. */ ++ /* If we timed out, we effectively cancel waiting. */ + __condvar_cancel_waiting (cond, seq, g, private); + result = err; + goto done; + } +- else +- __condvar_dec_grefs (cond, g, private); + + /* Reload signals. See above for MO. */ + signals = atomic_load_acquire (cond->__data.__g_signals + g); +diff --git a/nptl/tst-cond22.c b/nptl/tst-cond22.c +index 1336e9c79d..bdcb45c536 100644 +--- a/nptl/tst-cond22.c ++++ b/nptl/tst-cond22.c +@@ -106,13 +106,13 @@ do_test (void) + status = 1; + } + +- printf ("cond = { 0x%x:%x, 0x%x:%x, %u/%u/%u, %u/%u/%u, %u, %u }\n", ++ printf ("cond = { 0x%x:%x, 0x%x:%x, %u/%u, %u/%u, %u, %u }\n", + c.__data.__wseq.__value32.__high, + c.__data.__wseq.__value32.__low, + c.__data.__g1_start.__value32.__high, + c.__data.__g1_start.__value32.__low, +- c.__data.__g_signals[0], c.__data.__g_refs[0], c.__data.__g_size[0], +- c.__data.__g_signals[1], c.__data.__g_refs[1], c.__data.__g_size[1], ++ c.__data.__g_signals[0], c.__data.__g_size[0], ++ c.__data.__g_signals[1], c.__data.__g_size[1], + c.__data.__g1_orig_size, c.__data.__wrefs); + + if (pthread_create (&th, NULL, tf, (void *) 1l) != 0) +@@ -152,13 +152,13 @@ do_test (void) + status = 1; + } + +- printf ("cond = { 0x%x:%x, 0x%x:%x, %u/%u/%u, %u/%u/%u, %u, %u }\n", ++ printf ("cond = { 0x%x:%x, 0x%x:%x, %u/%u, %u/%u, %u, %u }\n", + c.__data.__wseq.__value32.__high, + c.__data.__wseq.__value32.__low, + c.__data.__g1_start.__value32.__high, + c.__data.__g1_start.__value32.__low, +- c.__data.__g_signals[0], c.__data.__g_refs[0], c.__data.__g_size[0], +- c.__data.__g_signals[1], c.__data.__g_refs[1], c.__data.__g_size[1], ++ c.__data.__g_signals[0], c.__data.__g_size[0], ++ c.__data.__g_signals[1], c.__data.__g_size[1], + c.__data.__g1_orig_size, c.__data.__wrefs); + + return status; +diff --git a/sysdeps/nptl/bits/thread-shared-types.h b/sysdeps/nptl/bits/thread-shared-types.h +index df54eef6f7..a3d482f80f 100644 +--- a/sysdeps/nptl/bits/thread-shared-types.h ++++ b/sysdeps/nptl/bits/thread-shared-types.h +@@ -95,8 +95,7 @@ struct __pthread_cond_s + { + __atomic_wide_counter __wseq; + __atomic_wide_counter __g1_start; +- unsigned int __g_refs[2] __LOCK_ALIGNMENT; +- unsigned int __g_size[2]; ++ unsigned int __g_size[2] __LOCK_ALIGNMENT; + unsigned int __g1_orig_size; + unsigned int __wrefs; + unsigned int __g_signals[2]; +diff --git a/sysdeps/nptl/pthread.h b/sysdeps/nptl/pthread.h +index 3d4f4a756c..9af75d6eae 100644 +--- a/sysdeps/nptl/pthread.h ++++ b/sysdeps/nptl/pthread.h +@@ -152,7 +152,7 @@ enum + + + /* Conditional variable handling. */ +-#define PTHREAD_COND_INITIALIZER { { {0}, {0}, {0, 0}, {0, 0}, 0, 0, {0, 0} } } ++#define PTHREAD_COND_INITIALIZER { { {0}, {0}, {0, 0}, 0, 0, {0, 0} } } + + + /* Cleanup buffers */ + +commit fa110993a6390ae5c97dff613ef02b59ec78c5da +Author: Malte Skarupke +Date: Wed Dec 4 08:03:44 2024 -0500 + + nptl: Use a single loop in pthread_cond_wait instaed of a nested loop + + The loop was a little more complicated than necessary. There was only one + break statement out of the inner loop, and the outer loop was nearly empty. + So just remove the outer loop, moving its code to the one break statement in + the inner loop. This allows us to replace all gotos with break statements. + + Signed-off-by: Malte Skarupke + Reviewed-by: Carlos O'Donell + (cherry picked from commit 929a4764ac90382616b6a21f099192b2475da674) + +diff --git a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c +index 411fc0380b..683cb2b133 100644 +--- a/nptl/pthread_cond_wait.c ++++ b/nptl/pthread_cond_wait.c +@@ -382,17 +382,15 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex, + return err; + } + +- /* Now wait until a signal is available in our group or it is closed. +- Acquire MO so that if we observe (signals == lowseq) after group +- switching in __condvar_quiesce_and_switch_g1, we synchronize with that +- store and will see the prior update of __g1_start done while switching +- groups too. */ +- unsigned int signals = atomic_load_acquire (cond->__data.__g_signals + g); +- +- do +- { ++ + while (1) + { ++ /* Now wait until a signal is available in our group or it is closed. ++ Acquire MO so that if we observe (signals == lowseq) after group ++ switching in __condvar_quiesce_and_switch_g1, we synchronize with that ++ store and will see the prior update of __g1_start done while switching ++ groups too. */ ++ unsigned int signals = atomic_load_acquire (cond->__data.__g_signals + g); + uint64_t g1_start = __condvar_load_g1_start_relaxed (cond); + unsigned int lowseq = (g1_start & 1) == g ? signals : g1_start & ~1U; + +@@ -401,7 +399,7 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex, + /* If the group is closed already, + then this waiter originally had enough extra signals to + consume, up until the time its group was closed. */ +- goto done; ++ break; + } + + /* If there is an available signal, don't block. +@@ -410,7 +408,16 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex, + G2, but in either case we're allowed to consume the available + signal and should not block anymore. */ + if ((int)(signals - lowseq) >= 2) +- break; ++ { ++ /* Try to grab a signal. See above for MO. (if we do another loop ++ iteration we need to see the correct value of g1_start) */ ++ if (atomic_compare_exchange_weak_acquire ( ++ cond->__data.__g_signals + g, ++ &signals, signals - 2)) ++ break; ++ else ++ continue; ++ } + + // Now block. + struct _pthread_cleanup_buffer buffer; +@@ -431,19 +438,9 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex, + /* If we timed out, we effectively cancel waiting. */ + __condvar_cancel_waiting (cond, seq, g, private); + result = err; +- goto done; ++ break; + } +- +- /* Reload signals. See above for MO. */ +- signals = atomic_load_acquire (cond->__data.__g_signals + g); + } +- } +- /* Try to grab a signal. See above for MO. (if we do another loop +- iteration we need to see the correct value of g1_start) */ +- while (!atomic_compare_exchange_weak_acquire (cond->__data.__g_signals + g, +- &signals, signals - 2)); +- +- done: + + /* Confirm that we have been woken. We do that before acquiring the mutex + to allow for execution of pthread_cond_destroy while having acquired the + +commit afbf0d46850dcd1b626d892ad8fde2162067ddc7 +Author: Malte Skarupke +Date: Wed Dec 4 08:04:10 2024 -0500 + + nptl: Fix indentation + + In my previous change I turned a nested loop into a simple loop. I'm doing + the resulting indentation changes in a separate commit to make the diff on + the previous commit easier to review. + + Signed-off-by: Malte Skarupke + Reviewed-by: Carlos O'Donell + (cherry picked from commit ee6c14ed59d480720721aaacc5fb03213dc153da) + +diff --git a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c +index 683cb2b133..7fc9dadf15 100644 +--- a/nptl/pthread_cond_wait.c ++++ b/nptl/pthread_cond_wait.c +@@ -383,65 +383,65 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex, + } + + +- while (1) +- { +- /* Now wait until a signal is available in our group or it is closed. +- Acquire MO so that if we observe (signals == lowseq) after group +- switching in __condvar_quiesce_and_switch_g1, we synchronize with that +- store and will see the prior update of __g1_start done while switching +- groups too. */ +- unsigned int signals = atomic_load_acquire (cond->__data.__g_signals + g); +- uint64_t g1_start = __condvar_load_g1_start_relaxed (cond); +- unsigned int lowseq = (g1_start & 1) == g ? signals : g1_start & ~1U; +- +- if (seq < (g1_start >> 1)) +- { +- /* If the group is closed already, +- then this waiter originally had enough extra signals to +- consume, up until the time its group was closed. */ +- break; +- } +- +- /* If there is an available signal, don't block. +- If __g1_start has advanced at all, then we must be in G1 +- by now, perhaps in the process of switching back to an older +- G2, but in either case we're allowed to consume the available +- signal and should not block anymore. */ +- if ((int)(signals - lowseq) >= 2) +- { +- /* Try to grab a signal. See above for MO. (if we do another loop +- iteration we need to see the correct value of g1_start) */ +- if (atomic_compare_exchange_weak_acquire ( +- cond->__data.__g_signals + g, ++ while (1) ++ { ++ /* Now wait until a signal is available in our group or it is closed. ++ Acquire MO so that if we observe (signals == lowseq) after group ++ switching in __condvar_quiesce_and_switch_g1, we synchronize with that ++ store and will see the prior update of __g1_start done while switching ++ groups too. */ ++ unsigned int signals = atomic_load_acquire (cond->__data.__g_signals + g); ++ uint64_t g1_start = __condvar_load_g1_start_relaxed (cond); ++ unsigned int lowseq = (g1_start & 1) == g ? signals : g1_start & ~1U; ++ ++ if (seq < (g1_start >> 1)) ++ { ++ /* If the group is closed already, ++ then this waiter originally had enough extra signals to ++ consume, up until the time its group was closed. */ ++ break; ++ } ++ ++ /* If there is an available signal, don't block. ++ If __g1_start has advanced at all, then we must be in G1 ++ by now, perhaps in the process of switching back to an older ++ G2, but in either case we're allowed to consume the available ++ signal and should not block anymore. */ ++ if ((int)(signals - lowseq) >= 2) ++ { ++ /* Try to grab a signal. See above for MO. (if we do another loop ++ iteration we need to see the correct value of g1_start) */ ++ if (atomic_compare_exchange_weak_acquire ( ++ cond->__data.__g_signals + g, + &signals, signals - 2)) +- break; +- else +- continue; +- } +- +- // Now block. +- struct _pthread_cleanup_buffer buffer; +- struct _condvar_cleanup_buffer cbuffer; +- cbuffer.wseq = wseq; +- cbuffer.cond = cond; +- cbuffer.mutex = mutex; +- cbuffer.private = private; +- __pthread_cleanup_push (&buffer, __condvar_cleanup_waiting, &cbuffer); +- +- err = __futex_abstimed_wait_cancelable64 ( +- cond->__data.__g_signals + g, signals, clockid, abstime, private); +- +- __pthread_cleanup_pop (&buffer, 0); +- +- if (__glibc_unlikely (err == ETIMEDOUT || err == EOVERFLOW)) +- { +- /* If we timed out, we effectively cancel waiting. */ +- __condvar_cancel_waiting (cond, seq, g, private); +- result = err; + break; +- } ++ else ++ continue; + } + ++ // Now block. ++ struct _pthread_cleanup_buffer buffer; ++ struct _condvar_cleanup_buffer cbuffer; ++ cbuffer.wseq = wseq; ++ cbuffer.cond = cond; ++ cbuffer.mutex = mutex; ++ cbuffer.private = private; ++ __pthread_cleanup_push (&buffer, __condvar_cleanup_waiting, &cbuffer); ++ ++ err = __futex_abstimed_wait_cancelable64 ( ++ cond->__data.__g_signals + g, signals, clockid, abstime, private); ++ ++ __pthread_cleanup_pop (&buffer, 0); ++ ++ if (__glibc_unlikely (err == ETIMEDOUT || err == EOVERFLOW)) ++ { ++ /* If we timed out, we effectively cancel waiting. */ ++ __condvar_cancel_waiting (cond, seq, g, private); ++ result = err; ++ break; ++ } ++ } ++ + /* Confirm that we have been woken. We do that before acquiring the mutex + to allow for execution of pthread_cond_destroy while having acquired the + mutex. */ + +commit 2ad69497346cc20ef4d568108f1de49b2f451c55 +Author: Malte Skarupke +Date: Wed Dec 4 08:04:54 2024 -0500 + + nptl: rename __condvar_quiesce_and_switch_g1 + + This function no longer waits for threads to leave g1, so rename it to + __condvar_switch_g1 + + Signed-off-by: Malte Skarupke + Reviewed-by: Carlos O'Donell + (cherry picked from commit 4b79e27a5073c02f6bff9aa8f4791230a0ab1867) + +diff --git a/nptl/pthread_cond_broadcast.c b/nptl/pthread_cond_broadcast.c +index aada91639a..38bba17bfc 100644 +--- a/nptl/pthread_cond_broadcast.c ++++ b/nptl/pthread_cond_broadcast.c +@@ -60,7 +60,7 @@ ___pthread_cond_broadcast (pthread_cond_t *cond) + cond->__data.__g_size[g1] << 1); + cond->__data.__g_size[g1] = 0; + +- /* We need to wake G1 waiters before we quiesce G1 below. */ ++ /* We need to wake G1 waiters before we switch G1 below. */ + /* TODO Only set it if there are indeed futex waiters. We could + also try to move this out of the critical section in cases when + G2 is empty (and we don't need to quiesce). */ +@@ -69,7 +69,7 @@ ___pthread_cond_broadcast (pthread_cond_t *cond) + + /* G1 is complete. Step (2) is next unless there are no waiters in G2, in + which case we can stop. */ +- if (__condvar_quiesce_and_switch_g1 (cond, wseq, &g1, private)) ++ if (__condvar_switch_g1 (cond, wseq, &g1, private)) + { + /* Step (3): Send signals to all waiters in the old G2 / new G1. */ + atomic_fetch_add_relaxed (cond->__data.__g_signals + g1, +diff --git a/nptl/pthread_cond_common.c b/nptl/pthread_cond_common.c +index 30b8eee149..5044273cc2 100644 +--- a/nptl/pthread_cond_common.c ++++ b/nptl/pthread_cond_common.c +@@ -189,16 +189,15 @@ __condvar_get_private (int flags) + return FUTEX_SHARED; + } + +-/* This closes G1 (whose index is in G1INDEX), waits for all futex waiters to +- leave G1, converts G1 into a fresh G2, and then switches group roles so that +- the former G2 becomes the new G1 ending at the current __wseq value when we +- eventually make the switch (WSEQ is just an observation of __wseq by the +- signaler). ++/* This closes G1 (whose index is in G1INDEX), converts G1 into a fresh G2, ++ and then switches group roles so that the former G2 becomes the new G1 ++ ending at the current __wseq value when we eventually make the switch ++ (WSEQ is just an observation of __wseq by the signaler). + If G2 is empty, it will not switch groups because then it would create an + empty G1 which would require switching groups again on the next signal. + Returns false iff groups were not switched because G2 was empty. */ + static bool __attribute__ ((unused)) +-__condvar_quiesce_and_switch_g1 (pthread_cond_t *cond, uint64_t wseq, ++__condvar_switch_g1 (pthread_cond_t *cond, uint64_t wseq, + unsigned int *g1index, int private) + { + unsigned int g1 = *g1index; +@@ -214,8 +213,7 @@ __condvar_quiesce_and_switch_g1 (pthread_cond_t *cond, uint64_t wseq, + + cond->__data.__g_size[g1 ^ 1]) == 0) + return false; + +- /* Now try to close and quiesce G1. We have to consider the following kinds +- of waiters: ++ /* We have to consider the following kinds of waiters: + * Waiters from less recent groups than G1 are not affected because + nothing will change for them apart from __g1_start getting larger. + * New waiters arriving concurrently with the group switching will all go +@@ -223,12 +221,12 @@ __condvar_quiesce_and_switch_g1 (pthread_cond_t *cond, uint64_t wseq, + are not affected. + * Waiters in G1 have already received a signal and been woken. */ + +- /* Update __g1_start, which finishes closing this group. The value we add +- will never be negative because old_orig_size can only be zero when we +- switch groups the first time after a condvar was initialized, in which +- case G1 will be at index 1 and we will add a value of 1. +- Relaxed MO is fine because the change comes with no additional +- constraints that others would have to observe. */ ++ /* Update __g1_start, which closes this group. The value we add will never ++ be negative because old_orig_size can only be zero when we switch groups ++ the first time after a condvar was initialized, in which case G1 will be ++ at index 1 and we will add a value of 1. Relaxed MO is fine because the ++ change comes with no additional constraints that others would have to ++ observe. */ + __condvar_add_g1_start_relaxed (cond, + (old_orig_size << 1) + (g1 == 1 ? 1 : - 1)); + +diff --git a/nptl/pthread_cond_signal.c b/nptl/pthread_cond_signal.c +index 43d6286ecd..f095497142 100644 +--- a/nptl/pthread_cond_signal.c ++++ b/nptl/pthread_cond_signal.c +@@ -69,18 +69,17 @@ ___pthread_cond_signal (pthread_cond_t *cond) + bool do_futex_wake = false; + + /* If G1 is still receiving signals, we put the signal there. If not, we +- check if G2 has waiters, and if so, quiesce and switch G1 to the former +- G2; if this results in a new G1 with waiters (G2 might have cancellations +- already, see __condvar_quiesce_and_switch_g1), we put the signal in the +- new G1. */ ++ check if G2 has waiters, and if so, switch G1 to the former G2; if this ++ results in a new G1 with waiters (G2 might have cancellations already, ++ see __condvar_switch_g1), we put the signal in the new G1. */ + if ((cond->__data.__g_size[g1] != 0) +- || __condvar_quiesce_and_switch_g1 (cond, wseq, &g1, private)) ++ || __condvar_switch_g1 (cond, wseq, &g1, private)) + { + /* Add a signal. Relaxed MO is fine because signaling does not need to +- establish a happens-before relation (see above). We do not mask the +- release-MO store when initializing a group in +- __condvar_quiesce_and_switch_g1 because we use an atomic +- read-modify-write and thus extend that store's release sequence. */ ++ establish a happens-before relation (see above). We do not mask the ++ release-MO store when initializing a group in __condvar_switch_g1 ++ because we use an atomic read-modify-write and thus extend that ++ store's release sequence. */ + atomic_fetch_add_relaxed (cond->__data.__g_signals + g1, 2); + cond->__data.__g_size[g1]--; + /* TODO Only set it if there are indeed futex waiters. */ +diff --git a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c +index 7fc9dadf15..80bb728211 100644 +--- a/nptl/pthread_cond_wait.c ++++ b/nptl/pthread_cond_wait.c +@@ -354,8 +354,7 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex, + because we do not need to establish any happens-before relation with + signalers (see __pthread_cond_signal); modification order alone + establishes a total order of waiters/signals. We do need acquire MO +- to synchronize with group reinitialization in +- __condvar_quiesce_and_switch_g1. */ ++ to synchronize with group reinitialization in __condvar_switch_g1. */ + uint64_t wseq = __condvar_fetch_add_wseq_acquire (cond, 2); + /* Find our group's index. We always go into what was G2 when we acquired + our position. */ +@@ -387,9 +386,9 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex, + { + /* Now wait until a signal is available in our group or it is closed. + Acquire MO so that if we observe (signals == lowseq) after group +- switching in __condvar_quiesce_and_switch_g1, we synchronize with that +- store and will see the prior update of __g1_start done while switching +- groups too. */ ++ switching in __condvar_switch_g1, we synchronize with that store and ++ will see the prior update of __g1_start done while switching groups ++ too. */ + unsigned int signals = atomic_load_acquire (cond->__data.__g_signals + g); + uint64_t g1_start = __condvar_load_g1_start_relaxed (cond); + unsigned int lowseq = (g1_start & 1) == g ? signals : g1_start & ~1U; + +commit 7f71824b8039b8afc150dd5c881b61faf10675ef +Author: Malte Skarupke +Date: Wed Dec 4 08:05:40 2024 -0500 + + nptl: Use all of g1_start and g_signals + + The LSB of g_signals was unused. The LSB of g1_start was used to indicate + which group is G2. This was used to always go to sleep in pthread_cond_wait + if a waiter is in G2. A comment earlier in the file says that this is not + correct to do: + + "Waiters cannot determine whether they are currently in G2 or G1 -- but they + do not have to because all they are interested in is whether there are + available signals" + + I either would have had to update the comment, or get rid of the check. I + chose to get rid of the check. In fact I don't quite know why it was there. + There will never be available signals for group G2, so we didn't need the + special case. Even if there were, this would just be a spurious wake. This + might have caught some cases where the count has wrapped around, but it + wouldn't reliably do that, (and even if it did, why would you want to force a + sleep in that case?) and we don't support that many concurrent waiters + anyway. Getting rid of it allows us to use one more bit, making us more + robust to wraparound. + + Signed-off-by: Malte Skarupke + Reviewed-by: Carlos O'Donell + (cherry picked from commit 91bb902f58264a2fd50fbce8f39a9a290dd23706) + +diff --git a/nptl/pthread_cond_broadcast.c b/nptl/pthread_cond_broadcast.c +index 38bba17bfc..51afa62adf 100644 +--- a/nptl/pthread_cond_broadcast.c ++++ b/nptl/pthread_cond_broadcast.c +@@ -57,7 +57,7 @@ ___pthread_cond_broadcast (pthread_cond_t *cond) + { + /* Add as many signals as the remaining size of the group. */ + atomic_fetch_add_relaxed (cond->__data.__g_signals + g1, +- cond->__data.__g_size[g1] << 1); ++ cond->__data.__g_size[g1]); + cond->__data.__g_size[g1] = 0; + + /* We need to wake G1 waiters before we switch G1 below. */ +@@ -73,7 +73,7 @@ ___pthread_cond_broadcast (pthread_cond_t *cond) + { + /* Step (3): Send signals to all waiters in the old G2 / new G1. */ + atomic_fetch_add_relaxed (cond->__data.__g_signals + g1, +- cond->__data.__g_size[g1] << 1); ++ cond->__data.__g_size[g1]); + cond->__data.__g_size[g1] = 0; + /* TODO Only set it if there are indeed futex waiters. */ + do_futex_wake = true; +diff --git a/nptl/pthread_cond_common.c b/nptl/pthread_cond_common.c +index 5044273cc2..389402913c 100644 +--- a/nptl/pthread_cond_common.c ++++ b/nptl/pthread_cond_common.c +@@ -208,9 +208,9 @@ __condvar_switch_g1 (pthread_cond_t *cond, uint64_t wseq, + behavior. + Note that this works correctly for a zero-initialized condvar too. */ + unsigned int old_orig_size = __condvar_get_orig_size (cond); +- uint64_t old_g1_start = __condvar_load_g1_start_relaxed (cond) >> 1; +- if (((unsigned) (wseq - old_g1_start - old_orig_size) +- + cond->__data.__g_size[g1 ^ 1]) == 0) ++ uint64_t old_g1_start = __condvar_load_g1_start_relaxed (cond); ++ uint64_t new_g1_start = old_g1_start + old_orig_size; ++ if (((unsigned) (wseq - new_g1_start) + cond->__data.__g_size[g1 ^ 1]) == 0) + return false; + + /* We have to consider the following kinds of waiters: +@@ -221,16 +221,10 @@ __condvar_switch_g1 (pthread_cond_t *cond, uint64_t wseq, + are not affected. + * Waiters in G1 have already received a signal and been woken. */ + +- /* Update __g1_start, which closes this group. The value we add will never +- be negative because old_orig_size can only be zero when we switch groups +- the first time after a condvar was initialized, in which case G1 will be +- at index 1 and we will add a value of 1. Relaxed MO is fine because the +- change comes with no additional constraints that others would have to +- observe. */ +- __condvar_add_g1_start_relaxed (cond, +- (old_orig_size << 1) + (g1 == 1 ? 1 : - 1)); +- +- unsigned int lowseq = ((old_g1_start + old_orig_size) << 1) & ~1U; ++ /* Update __g1_start, which closes this group. Relaxed MO is fine because ++ the change comes with no additional constraints that others would have ++ to observe. */ ++ __condvar_add_g1_start_relaxed (cond, old_orig_size); + + /* At this point, the old G1 is now a valid new G2 (but not in use yet). + No old waiter can neither grab a signal nor acquire a reference without +@@ -242,13 +236,13 @@ __condvar_switch_g1 (pthread_cond_t *cond, uint64_t wseq, + g1 ^= 1; + *g1index ^= 1; + +- /* Now advance the new G1 g_signals to the new lowseq, giving it ++ /* Now advance the new G1 g_signals to the new g1_start, giving it + an effective signal count of 0 to start. */ +- atomic_store_release (cond->__data.__g_signals + g1, lowseq); ++ atomic_store_release (cond->__data.__g_signals + g1, (unsigned)new_g1_start); + + /* These values are just observed by signalers, and thus protected by the + lock. */ +- unsigned int orig_size = wseq - (old_g1_start + old_orig_size); ++ unsigned int orig_size = wseq - new_g1_start; + __condvar_set_orig_size (cond, orig_size); + /* Use and addition to not loose track of cancellations in what was + previously G2. */ +diff --git a/nptl/pthread_cond_signal.c b/nptl/pthread_cond_signal.c +index f095497142..fa3a5c3d8f 100644 +--- a/nptl/pthread_cond_signal.c ++++ b/nptl/pthread_cond_signal.c +@@ -80,7 +80,7 @@ ___pthread_cond_signal (pthread_cond_t *cond) + release-MO store when initializing a group in __condvar_switch_g1 + because we use an atomic read-modify-write and thus extend that + store's release sequence. */ +- atomic_fetch_add_relaxed (cond->__data.__g_signals + g1, 2); ++ atomic_fetch_add_relaxed (cond->__data.__g_signals + g1, 1); + cond->__data.__g_size[g1]--; + /* TODO Only set it if there are indeed futex waiters. */ + do_futex_wake = true; +diff --git a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c +index 80bb728211..0f1dfcb595 100644 +--- a/nptl/pthread_cond_wait.c ++++ b/nptl/pthread_cond_wait.c +@@ -84,7 +84,7 @@ __condvar_cancel_waiting (pthread_cond_t *cond, uint64_t seq, unsigned int g, + not hold a reference on the group. */ + __condvar_acquire_lock (cond, private); + +- uint64_t g1_start = __condvar_load_g1_start_relaxed (cond) >> 1; ++ uint64_t g1_start = __condvar_load_g1_start_relaxed (cond); + if (g1_start > seq) + { + /* Our group is closed, so someone provided enough signals for it. +@@ -259,7 +259,6 @@ __condvar_cleanup_waiting (void *arg) + * Waiters fetch-add while having acquire the mutex associated with the + condvar. Signalers load it and fetch-xor it concurrently. + __g1_start: Starting position of G1 (inclusive) +- * LSB is index of current G2. + * Modified by signalers while having acquired the condvar-internal lock + and observed concurrently by waiters. + __g1_orig_size: Initial size of G1 +@@ -280,11 +279,9 @@ __condvar_cleanup_waiting (void *arg) + * Reference count used by waiters concurrently with signalers that have + acquired the condvar-internal lock. + __g_signals: The number of signals that can still be consumed, relative to +- the current g1_start. (i.e. bits 31 to 1 of __g_signals are bits +- 31 to 1 of g1_start with the signal count added) ++ the current g1_start. (i.e. g1_start with the signal count added) + * Used as a futex word by waiters. Used concurrently by waiters and + signalers. +- * LSB is currently reserved and 0. + __g_size: Waiters remaining in this group (i.e., which have not been + signaled yet. + * Accessed by signalers and waiters that cancel waiting (both do so only +@@ -391,9 +388,8 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex, + too. */ + unsigned int signals = atomic_load_acquire (cond->__data.__g_signals + g); + uint64_t g1_start = __condvar_load_g1_start_relaxed (cond); +- unsigned int lowseq = (g1_start & 1) == g ? signals : g1_start & ~1U; + +- if (seq < (g1_start >> 1)) ++ if (seq < g1_start) + { + /* If the group is closed already, + then this waiter originally had enough extra signals to +@@ -406,13 +402,13 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex, + by now, perhaps in the process of switching back to an older + G2, but in either case we're allowed to consume the available + signal and should not block anymore. */ +- if ((int)(signals - lowseq) >= 2) ++ if ((int)(signals - (unsigned int)g1_start) > 0) + { + /* Try to grab a signal. See above for MO. (if we do another loop + iteration we need to see the correct value of g1_start) */ + if (atomic_compare_exchange_weak_acquire ( + cond->__data.__g_signals + g, +- &signals, signals - 2)) ++ &signals, signals - 1)) + break; + else + continue; + +commit 8d3dd23e3de8b4c6e4b94f8bbfab971c3b8a55be +Author: Florian Weimer +Date: Thu Mar 13 06:07:07 2025 +0100 + + nptl: PTHREAD_COND_INITIALIZER compatibility with pre-2.41 versions (bug 32786) + + The new initializer and struct layout does not initialize the + __g_signals field in the old struct layout before the change in + commit c36fc50781995e6758cae2b6927839d0157f213c ("nptl: Remove + g_refs from condition variables"). Bring back fields at the end + of struct __pthread_cond_s, so that they are again zero-initialized. + + Reviewed-by: Sam James + +diff --git a/sysdeps/nptl/bits/thread-shared-types.h b/sysdeps/nptl/bits/thread-shared-types.h +index a3d482f80f..bccc2003ec 100644 +--- a/sysdeps/nptl/bits/thread-shared-types.h ++++ b/sysdeps/nptl/bits/thread-shared-types.h +@@ -99,6 +99,8 @@ struct __pthread_cond_s + unsigned int __g1_orig_size; + unsigned int __wrefs; + unsigned int __g_signals[2]; ++ unsigned int __unused_initialized_1; ++ unsigned int __unused_initialized_2; + }; + + typedef unsigned int __tss_t; +diff --git a/sysdeps/nptl/pthread.h b/sysdeps/nptl/pthread.h +index 9af75d6eae..e0f24418fe 100644 +--- a/sysdeps/nptl/pthread.h ++++ b/sysdeps/nptl/pthread.h +@@ -152,7 +152,7 @@ enum + + + /* Conditional variable handling. */ +-#define PTHREAD_COND_INITIALIZER { { {0}, {0}, {0, 0}, 0, 0, {0, 0} } } ++#define PTHREAD_COND_INITIALIZER { { {0}, {0}, {0, 0}, 0, 0, {0, 0}, 0, 0 } } + + + /* Cleanup buffers */ + +commit 33b33e9dd0ff26158b1b83cc4347a39c073e490e +Author: Arjun Shankar +Date: Fri Oct 18 16:03:25 2024 +0200 + + libio: Fix a deadlock after fork in popen + + popen modifies its file handler book-keeping under a lock that wasn't + being taken during fork. This meant that a concurrent popen and fork + could end up copying the lock in a "locked" state into the fork child, + where subsequently calling popen would lead to a deadlock due to the + already (spuriously) held lock. + + This commit fixes the deadlock by appropriately taking the lock before + fork, and releasing/resetting it in the parent/child after the fork. + + A new test for concurrent popen and fork is also added. It consistently + hangs (and therefore fails via timeout) without the fix applied. + Reviewed-by: Florian Weimer + + (cherry picked from commit 9f0d2c0ee6c728643fcf9a4879e9f20f5e45ce5f) + +diff --git a/libio/Makefile b/libio/Makefile +index 5292baa4e0..7faba230ac 100644 +--- a/libio/Makefile ++++ b/libio/Makefile +@@ -117,6 +117,7 @@ tests = \ + tst-mmap-offend \ + tst-mmap-setvbuf \ + tst-mmap2-eofsync \ ++ tst-popen-fork \ + tst-popen1 \ + tst-setvbuf1 \ + tst-sprintf-chk-ub \ +diff --git a/libio/iopopen.c b/libio/iopopen.c +index d01cb0648e..352513a291 100644 +--- a/libio/iopopen.c ++++ b/libio/iopopen.c +@@ -57,6 +57,26 @@ unlock (void *not_used) + } + #endif + ++/* These lock/unlock/resetlock functions are used during fork. */ ++ ++void ++_IO_proc_file_chain_lock (void) ++{ ++ _IO_lock_lock (proc_file_chain_lock); ++} ++ ++void ++_IO_proc_file_chain_unlock (void) ++{ ++ _IO_lock_unlock (proc_file_chain_lock); ++} ++ ++void ++_IO_proc_file_chain_resetlock (void) ++{ ++ _IO_lock_init (proc_file_chain_lock); ++} ++ + /* POSIX states popen shall ensure that any streams from previous popen() + calls that remain open in the parent process should be closed in the new + child process. +diff --git a/libio/libioP.h b/libio/libioP.h +index 616253fcd0..a83a411fdf 100644 +--- a/libio/libioP.h ++++ b/libio/libioP.h +@@ -429,6 +429,12 @@ libc_hidden_proto (_IO_list_resetlock) + extern void _IO_enable_locks (void) __THROW; + libc_hidden_proto (_IO_enable_locks) + ++/* Functions for operating popen's proc_file_chain_lock during fork. */ ++ ++extern void _IO_proc_file_chain_lock (void) __THROW attribute_hidden; ++extern void _IO_proc_file_chain_unlock (void) __THROW attribute_hidden; ++extern void _IO_proc_file_chain_resetlock (void) __THROW attribute_hidden; ++ + /* Default jumptable functions. */ + + extern int _IO_default_underflow (FILE *) __THROW; +diff --git a/libio/tst-popen-fork.c b/libio/tst-popen-fork.c +new file mode 100644 +index 0000000000..1df30fc6c0 +--- /dev/null ++++ b/libio/tst-popen-fork.c +@@ -0,0 +1,80 @@ ++/* Test concurrent popen and fork. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++ ++static void ++popen_and_pclose (void) ++{ ++ FILE *f = popen ("true", "r"); ++ TEST_VERIFY_EXIT (f != NULL); ++ pclose (f); ++ return; ++} ++ ++static atomic_bool done = ATOMIC_VAR_INIT (0); ++ ++static void * ++popen_and_pclose_forever (__attribute__ ((unused)) ++ void *arg) ++{ ++ while (!atomic_load_explicit (&done, memory_order_acquire)) ++ popen_and_pclose (); ++ return NULL; ++} ++ ++static int ++do_test (void) ++{ ++ ++ /* Repeatedly call popen in a loop during the entire test. */ ++ pthread_t t = xpthread_create (NULL, popen_and_pclose_forever, NULL); ++ ++ /* Repeatedly fork off and reap child processes one-by-one. ++ Each child calls popen once, then exits, leading to the possibility ++ that a child forks *during* our own popen call, thus inheriting any ++ intermediate popen state, possibly including lock state(s). */ ++ for (int i = 0; i < 100; i++) ++ { ++ int cpid = xfork (); ++ ++ if (cpid == 0) ++ { ++ popen_and_pclose (); ++ _exit (0); ++ } ++ else ++ xwaitpid (cpid, NULL, 0); ++ } ++ ++ /* Stop calling popen. */ ++ atomic_store_explicit (&done, 1, memory_order_release); ++ xpthread_join (t); ++ ++ return 0; ++} ++ ++#include +diff --git a/posix/fork.c b/posix/fork.c +index 298765a1ff..cf9b80e7c0 100644 +--- a/posix/fork.c ++++ b/posix/fork.c +@@ -62,6 +62,7 @@ __libc_fork (void) + call_function_static_weak (__nss_database_fork_prepare_parent, + &nss_database_data); + ++ _IO_proc_file_chain_lock (); + _IO_list_lock (); + + /* Acquire malloc locks. This needs to come last because fork +@@ -92,6 +93,7 @@ __libc_fork (void) + + /* Reset locks in the I/O code. */ + _IO_list_resetlock (); ++ _IO_proc_file_chain_resetlock (); + + call_function_static_weak (__nss_database_fork_subprocess, + &nss_database_data); +@@ -121,6 +123,7 @@ __libc_fork (void) + + /* We execute this even if the 'fork' call failed. */ + _IO_list_unlock (); ++ _IO_proc_file_chain_unlock (); + } + + /* Run the handlers registered for the parent. */ + +commit 7c3c9ae28685a9142a8cfa3521bbca74c1007d0b +Author: Arjun Shankar +Date: Fri Oct 25 09:33:45 2024 +0200 + + libio: Correctly link tst-popen-fork against libpthread + + tst-popen-fork failed to build for Hurd due to not being linked with + libpthread. This commit fixes that. + + Tested with build-many-glibcs.py for i686-gnu. + + Reviewed-by: Florian Weimer + (cherry picked from commit 6a290b2895b77be839fcb7c44a6a9879560097ad) + +diff --git a/libio/Makefile b/libio/Makefile +index 7faba230ac..f2e98f96eb 100644 +--- a/libio/Makefile ++++ b/libio/Makefile +@@ -142,6 +142,8 @@ tests = \ + tst_wscanf \ + # tests + ++$(objpfx)tst-popen-fork: $(shared-thread-library) ++ + tests-internal = tst-vtables tst-vtables-interposed + + ifeq (yes,$(build-shared)) + +commit 8667345b83c8ca528a093d4db53f57a1bb1688e4 +Author: Florian Weimer +Date: Thu Feb 13 21:56:52 2025 +0100 + + elf: Keep using minimal malloc after early DTV resize (bug 32412) + + If an auditor loads many TLS-using modules during startup, it is + possible to trigger DTV resizing. Previously, the DTV was marked + as allocated by the main malloc afterwards, even if the minimal + malloc was still in use. With this change, _dl_resize_dtv marks + the resized DTV as allocated with the minimal malloc. + + The new test reuses TLS-using modules from other auditing tests. + + Reviewed-by: DJ Delorie + (cherry picked from commit aa3d7bd5299b33bffc118aa618b59bfa66059bcb) + +diff --git a/elf/Makefile b/elf/Makefile +index dc686c3bff..be64c59887 100644 +--- a/elf/Makefile ++++ b/elf/Makefile +@@ -378,6 +378,7 @@ tests += \ + tst-align3 \ + tst-audit-tlsdesc \ + tst-audit-tlsdesc-dlopen \ ++ tst-audit-tlsdesc-dlopen2 \ + tst-audit1 \ + tst-audit2 \ + tst-audit8 \ +@@ -817,6 +818,7 @@ modules-names += \ + tst-auditmanymod8 \ + tst-auditmanymod9 \ + tst-auditmod-tlsdesc \ ++ tst-auditmod-tlsdesc2 \ + tst-auditmod1 \ + tst-auditmod11 \ + tst-auditmod12 \ +@@ -3040,6 +3042,9 @@ $(objpfx)tst-audit-tlsdesc.out: $(objpfx)tst-auditmod-tlsdesc.so + tst-audit-tlsdesc-ENV = LD_AUDIT=$(objpfx)tst-auditmod-tlsdesc.so + $(objpfx)tst-audit-tlsdesc-dlopen.out: $(objpfx)tst-auditmod-tlsdesc.so + tst-audit-tlsdesc-dlopen-ENV = LD_AUDIT=$(objpfx)tst-auditmod-tlsdesc.so ++$(objpfx)tst-audit-tlsdesc-dlopen2.out: $(objpfx)tst-auditmod-tlsdesc2.so \ ++ $(patsubst %, $(objpfx)%.so, $(tlsmod17a-modules)) ++tst-audit-tlsdesc-dlopen2-ENV = LD_AUDIT=$(objpfx)tst-auditmod-tlsdesc2.so + + $(objpfx)tst-dlmopen-twice.out: \ + $(objpfx)tst-dlmopen-twice-mod1.so \ +diff --git a/elf/dl-tls.c b/elf/dl-tls.c +index 3d529b722c..b13e752358 100644 +--- a/elf/dl-tls.c ++++ b/elf/dl-tls.c +@@ -528,6 +528,13 @@ _dl_resize_dtv (dtv_t *dtv, size_t max_modid) + if (newp == NULL) + oom (); + memcpy (newp, &dtv[-1], (2 + oldsize) * sizeof (dtv_t)); ++#ifdef SHARED ++ /* Auditors can trigger a DTV resize event while the full malloc ++ is not yet in use. Mark the new DTV allocation as the ++ initial allocation. */ ++ if (!__rtld_malloc_is_complete ()) ++ GL(dl_initial_dtv) = &newp[1]; ++#endif + } + else + { +diff --git a/elf/tst-audit-tlsdesc-dlopen2.c b/elf/tst-audit-tlsdesc-dlopen2.c +new file mode 100644 +index 0000000000..7ba2c4129a +--- /dev/null ++++ b/elf/tst-audit-tlsdesc-dlopen2.c +@@ -0,0 +1,46 @@ ++/* Loading TLS-using modules from auditors (bug 32412). Main program. ++ Copyright (C) 2021-2025 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++ ++static int ++do_test (void) ++{ ++ puts ("info: start of main program"); ++ ++ /* Load TLS-using modules, to trigger DTV resizing. The dynamic ++ linker will load them again (requiring their own TLS) because the ++ dlopen calls from the auditor were in the auditing namespace. */ ++ for (int i = 1; i <= 19; ++i) ++ { ++ char dso[30]; ++ snprintf (dso, sizeof (dso), "tst-tlsmod17a%d.so", i); ++ char sym[30]; ++ snprintf (sym, sizeof(sym), "tlsmod17a%d", i); ++ ++ void *handle = xdlopen (dso, RTLD_LAZY); ++ int (*func) (void) = xdlsym (handle, sym); ++ /* Trigger TLS allocation. */ ++ func (); ++ } ++ ++ return 0; ++} ++ ++#include +diff --git a/elf/tst-auditmod-tlsdesc2.c b/elf/tst-auditmod-tlsdesc2.c +new file mode 100644 +index 0000000000..50275cd34d +--- /dev/null ++++ b/elf/tst-auditmod-tlsdesc2.c +@@ -0,0 +1,59 @@ ++/* Loading TLS-using modules from auditors (bug 32412). Audit module. ++ Copyright (C) 2021-2025 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++unsigned int ++la_version (unsigned int version) ++{ ++ /* Open some modules, to trigger DTV resizing before the switch to ++ the main malloc. */ ++ for (int i = 1; i <= 19; ++i) ++ { ++ char dso[30]; ++ snprintf (dso, sizeof (dso), "tst-tlsmod17a%d.so", i); ++ char sym[30]; ++ snprintf (sym, sizeof(sym), "tlsmod17a%d", i); ++ ++ void *handle = dlopen (dso, RTLD_LAZY); ++ if (handle == NULL) ++ { ++ printf ("error: dlmopen from auditor: %s\n", dlerror ()); ++ fflush (stdout); ++ _exit (1); ++ } ++ int (*func) (void) = dlsym (handle, sym); ++ if (func == NULL) ++ { ++ printf ("error: dlsym from auditor: %s\n", dlerror ()); ++ fflush (stdout); ++ _exit (1); ++ } ++ /* Trigger TLS allocation. */ ++ func (); ++ } ++ ++ puts ("info: TLS-using modules loaded from auditor"); ++ fflush (stdout); ++ ++ return LAV_CURRENT; ++} + +commit b3002f303cedb8262cbc1ec22999ea36482efa0e +Author: Florian Weimer +Date: Tue May 20 19:36:02 2025 +0200 + + support: Use const char * argument in support_capture_subprogram_self_sgid + + The function does not modify the passed-in string, so make this clear + via the prototype. + + Reviewed-by: Carlos O'Donell + (cherry picked from commit f0c09fe61678df6f7f18fe1ebff074e62fa5ca7a) + +diff --git a/support/capture_subprocess.h b/support/capture_subprocess.h +index 93b7245d2a..5406d9f6c0 100644 +--- a/support/capture_subprocess.h ++++ b/support/capture_subprocess.h +@@ -45,8 +45,7 @@ struct support_capture_subprocess support_capture_subprogram + /* Copy the running program into a setgid binary and run it with CHILD_ID + argument. If execution is successful, return the exit status of the child + program, otherwise return a non-zero failure exit code. */ +-int support_capture_subprogram_self_sgid +- (char *child_id); ++int support_capture_subprogram_self_sgid (const char *child_id); + + /* Deallocate the subprocess data captured by + support_capture_subprocess. */ +diff --git a/support/support_capture_subprocess.c b/support/support_capture_subprocess.c +index 53847194cb..2383481911 100644 +--- a/support/support_capture_subprocess.c ++++ b/support/support_capture_subprocess.c +@@ -110,7 +110,7 @@ support_capture_subprogram (const char *file, char *const argv[], + safely make it SGID with the TARGET group ID. Then runs the + executable. */ + static int +-copy_and_spawn_sgid (char *child_id, gid_t gid) ++copy_and_spawn_sgid (const char *child_id, gid_t gid) + { + char *dirname = xasprintf ("%s/tst-tunables-setuid.%jd", + test_dir, (intmax_t) getpid ()); +@@ -182,7 +182,7 @@ copy_and_spawn_sgid (char *child_id, gid_t gid) + ret = 0; + infd = outfd = -1; + +- char * const args[] = {execname, child_id, NULL}; ++ char * const args[] = {execname, (char *) child_id, NULL}; + + status = support_subprogram_wait (args[0], args); + +@@ -211,7 +211,7 @@ err: + } + + int +-support_capture_subprogram_self_sgid (char *child_id) ++support_capture_subprogram_self_sgid (const char *child_id) + { + gid_t target = 0; + const int count = 64; + +commit 61dcce21e06834f7248a8d516c9ec20788fc728c +Author: Florian Weimer +Date: Mon Dec 23 13:57:55 2024 +0100 + + support: Add support_record_failure_barrier + + This can be used to stop execution after a TEST_COMPARE_BLOB + failure, for example. + + (cherry picked from commit d0b8aa6de4529231fadfe604ac2c434e559c2d9e) + +diff --git a/support/check.h b/support/check.h +index 7ea22c7a2c..8f41e5b99f 100644 +--- a/support/check.h ++++ b/support/check.h +@@ -207,6 +207,9 @@ void support_record_failure_reset (void); + failures or not. */ + int support_record_failure_is_failed (void); + ++/* Terminate the process if any failures have been encountered so far. */ ++void support_record_failure_barrier (void); ++ + __END_DECLS + + #endif /* SUPPORT_CHECK_H */ +diff --git a/support/support_record_failure.c b/support/support_record_failure.c +index 978123701d..72ee2b232f 100644 +--- a/support/support_record_failure.c ++++ b/support/support_record_failure.c +@@ -112,3 +112,13 @@ support_record_failure_is_failed (void) + synchronization for reliable test error reporting anyway. */ + return __atomic_load_n (&state->failed, __ATOMIC_RELAXED); + } ++ ++void ++support_record_failure_barrier (void) ++{ ++ if (__atomic_load_n (&state->failed, __ATOMIC_RELAXED)) ++ { ++ puts ("error: exiting due to previous errors"); ++ exit (1); ++ } ++} + +commit 079ac4a172a8f6ba37acf1e80e57f5042d2c7561 +Author: Florian Weimer +Date: Tue May 20 19:45:06 2025 +0200 + + elf: Test case for bug 32976 (CVE-2025-4802) + + Check that LD_LIBRARY_PATH is ignored for AT_SECURE statically + linked binaries, using support_capture_subprogram_self_sgid. + + Reviewed-by: Carlos O'Donell + (cherry picked from commit d8f7a79335b0d861c12c42aec94c04cd5bb181e2) + +diff --git a/elf/Makefile b/elf/Makefile +index be64c59887..afd4eb6fdd 100644 +--- a/elf/Makefile ++++ b/elf/Makefile +@@ -266,6 +266,7 @@ tests-static-normal := \ + tst-array1-static \ + tst-array5-static \ + tst-dl-iter-static \ ++ tst-dlopen-sgid \ + tst-dst-static \ + tst-env-setuid-static \ + tst-getauxval-static \ +@@ -859,6 +860,7 @@ modules-names += \ + tst-dlmopen-twice-mod1 \ + tst-dlmopen-twice-mod2 \ + tst-dlmopen1mod \ ++ tst-dlopen-sgid-mod \ + tst-dlopen-tlsreinitmod1 \ + tst-dlopen-tlsreinitmod2 \ + tst-dlopen-tlsreinitmod3 \ +@@ -3153,3 +3155,5 @@ $(objpfx)tst-dlopen-tlsreinit3.out: $(objpfx)tst-auditmod1.so + tst-dlopen-tlsreinit3-ENV = LD_AUDIT=$(objpfx)tst-auditmod1.so + $(objpfx)tst-dlopen-tlsreinit4.out: $(objpfx)tst-auditmod1.so + tst-dlopen-tlsreinit4-ENV = LD_AUDIT=$(objpfx)tst-auditmod1.so ++ ++$(objpfx)tst-dlopen-sgid.out: $(objpfx)tst-dlopen-sgid-mod.so +diff --git a/elf/tst-dlopen-sgid-mod.c b/elf/tst-dlopen-sgid-mod.c +new file mode 100644 +index 0000000000..5eb79eef48 +--- /dev/null ++++ b/elf/tst-dlopen-sgid-mod.c +@@ -0,0 +1 @@ ++/* Opening this object should not succeed. */ +diff --git a/elf/tst-dlopen-sgid.c b/elf/tst-dlopen-sgid.c +new file mode 100644 +index 0000000000..47829a405e +--- /dev/null ++++ b/elf/tst-dlopen-sgid.c +@@ -0,0 +1,104 @@ ++/* Test case for ignored LD_LIBRARY_PATH in static startug (bug 32976). ++ Copyright (C) 2025 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++/* This is the name of our test object. Use a custom module for ++ testing, so that this object does not get picked up from the system ++ path. */ ++static const char dso_name[] = "tst-dlopen-sgid-mod.so"; ++ ++/* Used to mark the recursive invocation. */ ++static const char magic_argument[] = "run-actual-test"; ++ ++static int ++do_test (void) ++{ ++/* Pathname of the directory that receives the shared objects this ++ test attempts to load. */ ++ char *libdir = support_create_temp_directory ("tst-dlopen-sgid-"); ++ ++ /* This is supposed to be ignored and stripped. */ ++ TEST_COMPARE (setenv ("LD_LIBRARY_PATH", libdir, 1), 0); ++ ++ /* Copy of libc.so.6. */ ++ { ++ char *from = xasprintf ("%s/%s", support_objdir_root, LIBC_SO); ++ char *to = xasprintf ("%s/%s", libdir, LIBC_SO); ++ add_temp_file (to); ++ support_copy_file (from, to); ++ free (to); ++ free (from); ++ } ++ ++ /* Copy of the test object. */ ++ { ++ char *from = xasprintf ("%s/elf/%s", support_objdir_root, dso_name); ++ char *to = xasprintf ("%s/%s", libdir, dso_name); ++ add_temp_file (to); ++ support_copy_file (from, to); ++ free (to); ++ free (from); ++ } ++ ++ TEST_COMPARE (support_capture_subprogram_self_sgid (magic_argument), 0); ++ ++ free (libdir); ++ ++ return 0; ++} ++ ++static void ++alternative_main (int argc, char **argv) ++{ ++ if (argc == 2 && strcmp (argv[1], magic_argument) == 0) ++ { ++ if (getgid () == getegid ()) ++ /* This can happen if the file system is mounted nosuid. */ ++ FAIL_UNSUPPORTED ("SGID failed: GID and EGID match (%jd)\n", ++ (intmax_t) getgid ()); ++ ++ /* Should be removed due to SGID. */ ++ TEST_COMPARE_STRING (getenv ("LD_LIBRARY_PATH"), NULL); ++ ++ TEST_VERIFY (dlopen (dso_name, RTLD_NOW) == NULL); ++ { ++ const char *message = dlerror (); ++ TEST_COMPARE_STRING (message, ++ "tst-dlopen-sgid-mod.so:" ++ " cannot open shared object file:" ++ " No such file or directory"); ++ } ++ ++ support_record_failure_barrier (); ++ exit (EXIT_SUCCESS); ++ } ++} ++ ++#define PREPARE alternative_main ++#include + +commit 56e75b810ac39b0e390be5b66397dca0cdfa4d80 +Author: Sunil K Pandey +Date: Tue May 20 10:07:27 2025 -0700 + + x86_64: Fix typo in ifunc-impl-list.c. + + Fix wcsncpy and wcpncpy typo in ifunc-impl-list.c. + + Reviewed-by: H.J. Lu + (cherry picked from commit f2aeb6ff941dccc4c777b5621e77addea6cc076c) + +diff --git a/sysdeps/x86_64/multiarch/ifunc-impl-list.c b/sysdeps/x86_64/multiarch/ifunc-impl-list.c +index 0bbb71bbbf..3db45db39b 100644 +--- a/sysdeps/x86_64/multiarch/ifunc-impl-list.c ++++ b/sysdeps/x86_64/multiarch/ifunc-impl-list.c +@@ -922,7 +922,7 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, + (CPU_FEATURE_USABLE (AVX2) + && CPU_FEATURE_USABLE (BMI2)), + __wcsncpy_avx2) +- X86_IFUNC_IMPL_ADD_V2 (array, i, wcpncpy, ++ X86_IFUNC_IMPL_ADD_V2 (array, i, wcsncpy, + 1, + __wcsncpy_generic)) + +@@ -952,7 +952,7 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, + (CPU_FEATURE_USABLE (AVX2) + && CPU_FEATURE_USABLE (BMI2)), + __wcpncpy_avx2) +- X86_IFUNC_IMPL_ADD_V2 (array, i, wcsncpy, ++ X86_IFUNC_IMPL_ADD_V2 (array, i, wcpncpy, + 1, + __wcpncpy_generic)) + + +commit c8e10f14328518954072df64aafd574e67cfdde5 +Author: Florian Weimer +Date: Wed May 21 08:43:32 2025 +0200 + + elf: Fix subprocess status handling for tst-dlopen-sgid (bug 32987) + + This should really move into support_capture_subprogram_self_sgid. + + Reviewed-by: Sam James + (cherry picked from commit 35fc356fa3b4f485bd3ba3114c9f774e5df7d3c2) + +diff --git a/NEWS b/NEWS +index 7a6985f5dd..4b290ad4bf 100644 +--- a/NEWS ++++ b/NEWS +@@ -23,6 +23,7 @@ The following bugs are resolved with this release: + [32245] glibc -Wstringop-overflow= build failure on hppa + [32470] x86: Avoid integer truncation with large cache sizes + [32810] Crash on x86-64 if XSAVEC disable via tunable ++ [32987] elf: Fix subprocess status handling for tst-dlopen-sgid + + Version 2.40 + +diff --git a/elf/tst-dlopen-sgid.c b/elf/tst-dlopen-sgid.c +index 47829a405e..5688b79f2e 100644 +--- a/elf/tst-dlopen-sgid.c ++++ b/elf/tst-dlopen-sgid.c +@@ -26,6 +26,8 @@ + #include + #include + #include ++#include ++#include + #include + + /* This is the name of our test object. Use a custom module for +@@ -66,10 +68,16 @@ do_test (void) + free (from); + } + +- TEST_COMPARE (support_capture_subprogram_self_sgid (magic_argument), 0); +- + free (libdir); + ++ int status = support_capture_subprogram_self_sgid (magic_argument); ++ ++ if (WEXITSTATUS (status) == EXIT_UNSUPPORTED) ++ return EXIT_UNSUPPORTED; ++ ++ if (!WIFEXITED (status)) ++ FAIL_EXIT1 ("Unexpected exit status %d from child process\n", status); ++ + return 0; + } + + +commit 42a5a940c974d02540c8da26d6374c744d148cb9 +Author: Carlos O'Donell +Date: Wed Jun 11 09:19:17 2025 -0400 + + ppc64le: Revert "powerpc: Optimized strncmp for power10" (CVE-2025-5745) + + This reverts commit 23f0d81608d0ca6379894ef81670cf30af7fd081 + + Reason for revert: Power10 strncmp clobbers non-volatile vector + registers (Bug 33060) + + Tested on ppc64le with no regressions. + + (cherry picked from commit 63c60101ce7c5eac42be90f698ba02099b41b965) + +diff --git a/sysdeps/powerpc/powerpc64/le/power10/strncmp.S b/sysdeps/powerpc/powerpc64/le/power10/strncmp.S +deleted file mode 100644 +index d4ba76acae..0000000000 +--- a/sysdeps/powerpc/powerpc64/le/power10/strncmp.S ++++ /dev/null +@@ -1,271 +0,0 @@ +-/* Optimized strncmp implementation for PowerPC64/POWER10. +- Copyright (C) 2024 Free Software Foundation, Inc. +- This file is part of the GNU C Library. +- +- The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Lesser General Public +- License as published by the Free Software Foundation; either +- version 2.1 of the License, or (at your option) any later version. +- +- The GNU C Library is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Lesser General Public License for more details. +- +- You should have received a copy of the GNU Lesser General Public +- License along with the GNU C Library; if not, see +- . */ +- +-#include +- +-/* Implements the function +- +- int [r3] strncmp (const char *s1 [r3], const char *s2 [r4], size_t [r5] n) +- +- The implementation uses unaligned doubleword access to avoid specialized +- code paths depending of data alignment for first 32 bytes and uses +- vectorised loops after that. */ +- +-#ifndef STRNCMP +-# define STRNCMP strncmp +-#endif +- +-/* TODO: Change this to actual instructions when minimum binutils is upgraded +- to 2.27. Macros are defined below for these newer instructions in order +- to maintain compatibility. */ +- +-#define LXVP(xtp,dq,ra) \ +- .long(((6)<<(32-6)) \ +- | ((((xtp)-32)>>1)<<(32-10)) \ +- | ((1)<<(32-11)) \ +- | ((ra)<<(32-16)) \ +- | dq) +- +-#define COMPARE_16(vreg1,vreg2,offset) \ +- lxv vreg1+32,offset(r3); \ +- lxv vreg2+32,offset(r4); \ +- vcmpnezb. v7,vreg1,vreg2; \ +- bne cr6,L(different); \ +- cmpldi cr7,r5,16; \ +- ble cr7,L(ret0); \ +- addi r5,r5,-16; +- +-#define COMPARE_32(vreg1,vreg2,offset,label1,label2) \ +- LXVP(vreg1+32,offset,r3); \ +- LXVP(vreg2+32,offset,r4); \ +- vcmpnezb. v7,vreg1+1,vreg2+1; \ +- bne cr6,L(label1); \ +- vcmpnezb. v7,vreg1,vreg2; \ +- bne cr6,L(label2); \ +- cmpldi cr7,r5,32; \ +- ble cr7,L(ret0); \ +- addi r5,r5,-32; +- +-#define TAIL_FIRST_16B(vreg1,vreg2) \ +- vctzlsbb r6,v7; \ +- cmpld cr7,r5,r6; \ +- ble cr7,L(ret0); \ +- vextubrx r5,r6,vreg1; \ +- vextubrx r4,r6,vreg2; \ +- subf r3,r4,r5; \ +- blr; +- +-#define TAIL_SECOND_16B(vreg1,vreg2) \ +- vctzlsbb r6,v7; \ +- addi r0,r6,16; \ +- cmpld cr7,r5,r0; \ +- ble cr7,L(ret0); \ +- vextubrx r5,r6,vreg1; \ +- vextubrx r4,r6,vreg2; \ +- subf r3,r4,r5; \ +- blr; +- +-#define CHECK_N_BYTES(reg1,reg2,len_reg) \ +- sldi r6,len_reg,56; \ +- lxvl 32+v4,reg1,r6; \ +- lxvl 32+v5,reg2,r6; \ +- add reg1,reg1,len_reg; \ +- add reg2,reg2,len_reg; \ +- vcmpnezb v7,v4,v5; \ +- vctzlsbb r6,v7; \ +- cmpld cr7,r6,len_reg; \ +- blt cr7,L(different); \ +- cmpld cr7,r5,len_reg; \ +- ble cr7,L(ret0); \ +- sub r5,r5,len_reg; \ +- +- /* TODO: change this to .machine power10 when the minimum required +- binutils allows it. */ +- .machine power9 +-ENTRY_TOCLESS (STRNCMP, 4) +- /* Check if size is 0. */ +- cmpdi cr0,r5,0 +- beq cr0,L(ret0) +- andi. r7,r3,4095 +- andi. r8,r4,4095 +- cmpldi cr0,r7,4096-16 +- cmpldi cr1,r8,4096-16 +- bgt cr0,L(crosses) +- bgt cr1,L(crosses) +- COMPARE_16(v4,v5,0) +- addi r3,r3,16 +- addi r4,r4,16 +- +-L(crosses): +- andi. r7,r3,15 +- subfic r7,r7,16 /* r7(nalign1) = 16 - (str1 & 15). */ +- andi. r9,r4,15 +- subfic r8,r9,16 /* r8(nalign2) = 16 - (str2 & 15). */ +- cmpld cr7,r7,r8 +- beq cr7,L(same_aligned) +- blt cr7,L(nalign1_min) +- +- /* nalign2 is minimum and s2 pointer is aligned. */ +- CHECK_N_BYTES(r3,r4,r8) +- /* Are we on the 64B hunk which crosses a page? */ +- andi. r10,r3,63 /* Determine offset into 64B hunk. */ +- andi. r8,r3,15 /* The offset into the 16B hunk. */ +- neg r7,r3 +- andi. r9,r7,15 /* Number of bytes after a 16B cross. */ +- rlwinm. r7,r7,26,0x3F /* ((r4-4096))>>6&63. */ +- beq L(compare_64_pagecross) +- mtctr r7 +- b L(compare_64B_unaligned) +- +- /* nalign1 is minimum and s1 pointer is aligned. */ +-L(nalign1_min): +- CHECK_N_BYTES(r3,r4,r7) +- /* Are we on the 64B hunk which crosses a page? */ +- andi. r10,r4,63 /* Determine offset into 64B hunk. */ +- andi. r8,r4,15 /* The offset into the 16B hunk. */ +- neg r7,r4 +- andi. r9,r7,15 /* Number of bytes after a 16B cross. */ +- rlwinm. r7,r7,26,0x3F /* ((r4-4096))>>6&63. */ +- beq L(compare_64_pagecross) +- mtctr r7 +- +- .p2align 5 +-L(compare_64B_unaligned): +- COMPARE_16(v4,v5,0) +- COMPARE_16(v4,v5,16) +- COMPARE_16(v4,v5,32) +- COMPARE_16(v4,v5,48) +- addi r3,r3,64 +- addi r4,r4,64 +- bdnz L(compare_64B_unaligned) +- +- /* Cross the page boundary of s2, carefully. Only for first +- iteration we have to get the count of 64B blocks to be checked. +- From second iteration and beyond, loop counter is always 63. */ +-L(compare_64_pagecross): +- li r11, 63 +- mtctr r11 +- cmpldi r10,16 +- ble L(cross_4) +- cmpldi r10,32 +- ble L(cross_3) +- cmpldi r10,48 +- ble L(cross_2) +-L(cross_1): +- CHECK_N_BYTES(r3,r4,r9) +- CHECK_N_BYTES(r3,r4,r8) +- COMPARE_16(v4,v5,0) +- COMPARE_16(v4,v5,16) +- COMPARE_16(v4,v5,32) +- addi r3,r3,48 +- addi r4,r4,48 +- b L(compare_64B_unaligned) +-L(cross_2): +- COMPARE_16(v4,v5,0) +- addi r3,r3,16 +- addi r4,r4,16 +- CHECK_N_BYTES(r3,r4,r9) +- CHECK_N_BYTES(r3,r4,r8) +- COMPARE_16(v4,v5,0) +- COMPARE_16(v4,v5,16) +- addi r3,r3,32 +- addi r4,r4,32 +- b L(compare_64B_unaligned) +-L(cross_3): +- COMPARE_16(v4,v5,0) +- COMPARE_16(v4,v5,16) +- addi r3,r3,32 +- addi r4,r4,32 +- CHECK_N_BYTES(r3,r4,r9) +- CHECK_N_BYTES(r3,r4,r8) +- COMPARE_16(v4,v5,0) +- addi r3,r3,16 +- addi r4,r4,16 +- b L(compare_64B_unaligned) +-L(cross_4): +- COMPARE_16(v4,v5,0) +- COMPARE_16(v4,v5,16) +- COMPARE_16(v4,v5,32) +- addi r3,r3,48 +- addi r4,r4,48 +- CHECK_N_BYTES(r3,r4,r9) +- CHECK_N_BYTES(r3,r4,r8) +- b L(compare_64B_unaligned) +- +-L(same_aligned): +- CHECK_N_BYTES(r3,r4,r7) +- /* Align s1 to 32B and adjust s2 address. +- Use lxvp only if both s1 and s2 are 32B aligned. */ +- COMPARE_16(v4,v5,0) +- COMPARE_16(v4,v5,16) +- COMPARE_16(v4,v5,32) +- COMPARE_16(v4,v5,48) +- addi r3,r3,64 +- addi r4,r4,64 +- COMPARE_16(v4,v5,0) +- COMPARE_16(v4,v5,16) +- addi r5,r5,32 +- +- clrldi r6,r3,59 +- subfic r7,r6,32 +- add r3,r3,r7 +- add r4,r4,r7 +- subf r5,r7,r5 +- andi. r7,r4,0x1F +- beq cr0,L(32B_aligned_loop) +- +- .p2align 5 +-L(16B_aligned_loop): +- COMPARE_16(v4,v5,0) +- COMPARE_16(v4,v5,16) +- COMPARE_16(v4,v5,32) +- COMPARE_16(v4,v5,48) +- addi r3,r3,64 +- addi r4,r4,64 +- b L(16B_aligned_loop) +- +- /* Calculate and return the difference. */ +-L(different): +- TAIL_FIRST_16B(v4,v5) +- +- .p2align 5 +-L(32B_aligned_loop): +- COMPARE_32(v14,v16,0,tail1,tail2) +- COMPARE_32(v18,v20,32,tail3,tail4) +- COMPARE_32(v22,v24,64,tail5,tail6) +- COMPARE_32(v26,v28,96,tail7,tail8) +- addi r3,r3,128 +- addi r4,r4,128 +- b L(32B_aligned_loop) +- +-L(tail1): TAIL_FIRST_16B(v15,v17) +-L(tail2): TAIL_SECOND_16B(v14,v16) +-L(tail3): TAIL_FIRST_16B(v19,v21) +-L(tail4): TAIL_SECOND_16B(v18,v20) +-L(tail5): TAIL_FIRST_16B(v23,v25) +-L(tail6): TAIL_SECOND_16B(v22,v24) +-L(tail7): TAIL_FIRST_16B(v27,v29) +-L(tail8): TAIL_SECOND_16B(v26,v28) +- +- .p2align 5 +-L(ret0): +- li r3,0 +- blr +- +-END(STRNCMP) +-libc_hidden_builtin_def(strncmp) +diff --git a/sysdeps/powerpc/powerpc64/multiarch/Makefile b/sysdeps/powerpc/powerpc64/multiarch/Makefile +index b847c19049..a38ff46448 100644 +--- a/sysdeps/powerpc/powerpc64/multiarch/Makefile ++++ b/sysdeps/powerpc/powerpc64/multiarch/Makefile +@@ -34,7 +34,7 @@ ifneq (,$(filter %le,$(config-machine))) + sysdep_routines += memchr-power10 memcmp-power10 memcpy-power10 \ + memmove-power10 memset-power10 rawmemchr-power9 \ + rawmemchr-power10 strcmp-power9 strcmp-power10 \ +- strncmp-power9 strncmp-power10 strcpy-power9 stpcpy-power9 \ ++ strncmp-power9 strcpy-power9 stpcpy-power9 \ + strlen-power9 strncpy-power9 stpncpy-power9 strlen-power10 + endif + CFLAGS-strncase-power7.c += -mcpu=power7 -funroll-loops +diff --git a/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c b/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c +index 2bb47d3527..30fd89e109 100644 +--- a/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c ++++ b/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c +@@ -164,9 +164,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, + /* Support sysdeps/powerpc/powerpc64/multiarch/strncmp.c. */ + IFUNC_IMPL (i, name, strncmp, + #ifdef __LITTLE_ENDIAN__ +- IFUNC_IMPL_ADD (array, i, strncmp, hwcap2 & PPC_FEATURE2_ARCH_3_1 +- && hwcap & PPC_FEATURE_HAS_VSX, +- __strncmp_power10) + IFUNC_IMPL_ADD (array, i, strncmp, hwcap2 & PPC_FEATURE2_ARCH_3_00 + && hwcap & PPC_FEATURE_HAS_ALTIVEC, + __strncmp_power9) +diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncmp-power10.S b/sysdeps/powerpc/powerpc64/multiarch/strncmp-power10.S +deleted file mode 100644 +index d7026c12e2..0000000000 +--- a/sysdeps/powerpc/powerpc64/multiarch/strncmp-power10.S ++++ /dev/null +@@ -1,25 +0,0 @@ +-/* Copyright (C) 2024 Free Software Foundation, Inc. +- This file is part of the GNU C Library. +- +- The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Lesser General Public +- License as published by the Free Software Foundation; either +- version 2.1 of the License, or (at your option) any later version. +- +- The GNU C Library is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Lesser General Public License for more details. +- +- You should have received a copy of the GNU Lesser General Public +- License along with the GNU C Library; if not, see +- . */ +- +-#if defined __LITTLE_ENDIAN__ && IS_IN (libc) +-#define STRNCMP __strncmp_power10 +- +-#undef libc_hidden_builtin_def +-#define libc_hidden_builtin_def(name) +- +-#include +-#endif +diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncmp.c b/sysdeps/powerpc/powerpc64/multiarch/strncmp.c +index a5ed67f766..6178f4a432 100644 +--- a/sysdeps/powerpc/powerpc64/multiarch/strncmp.c ++++ b/sysdeps/powerpc/powerpc64/multiarch/strncmp.c +@@ -29,7 +29,6 @@ extern __typeof (strncmp) __strncmp_ppc attribute_hidden; + extern __typeof (strncmp) __strncmp_power8 attribute_hidden; + # ifdef __LITTLE_ENDIAN__ + extern __typeof (strncmp) __strncmp_power9 attribute_hidden; +-extern __typeof (strncmp) __strncmp_power10 attribute_hidden; + # endif + # undef strncmp + +@@ -37,9 +36,6 @@ extern __typeof (strncmp) __strncmp_power10 attribute_hidden; + ifunc symbol properly. */ + libc_ifunc_redirected (__redirect_strncmp, strncmp, + # ifdef __LITTLE_ENDIAN__ +- (hwcap2 & PPC_FEATURE2_ARCH_3_1 +- && hwcap & PPC_FEATURE_HAS_VSX) +- ? __strncmp_power10 : + (hwcap2 & PPC_FEATURE2_ARCH_3_00 + && hwcap & PPC_FEATURE_HAS_ALTIVEC) + ? __strncmp_power9 : + +commit 2ad6e55ea5cb23af5af7af35d5f80cd93032f96a +Author: Carlos O'Donell +Date: Wed Jun 11 09:43:50 2025 -0400 + + ppc64le: Revert "powerpc: Fix performance issues of strcmp power10" (CVE-2025-5702) + + This reverts commit 90bcc8721ef82b7378d2b080141228660e862d56 + + This change is in the chain of the final revert that fixes the CVE + i.e. 3367d8e180848030d1646f088759f02b8dfe0d6f + + Reason for revert: Power10 strcmp clobbers non-volatile vector + registers (Bug 33056) + + Tested on ppc64le with no regressions. + + (cherry picked from commit c22de63588df7a8a0edceea9bb02534064c9d201) + +diff --git a/sysdeps/powerpc/powerpc64/le/power10/strcmp.S b/sysdeps/powerpc/powerpc64/le/power10/strcmp.S +index f0d6732a25..00f1e9c170 100644 +--- a/sysdeps/powerpc/powerpc64/le/power10/strcmp.S ++++ b/sysdeps/powerpc/powerpc64/le/power10/strcmp.S +@@ -62,7 +62,7 @@ + lxvl 32+v5,reg2,r0; \ + add reg1,reg1,len_reg; \ + add reg2,reg2,len_reg; \ +- vcmpnezb v7,v4,v5; \ ++ vcmpnezb. v7,v4,v5; \ + vctzlsbb r6,v7; \ + cmpld cr7,r6,len_reg; \ + blt cr7,L(different); \ +@@ -72,110 +72,70 @@ + + .machine power9 + ENTRY_TOCLESS (STRCMP, 4) +- andi. r7,r3,4095 +- andi. r8,r4,4095 +- cmpldi cr0,r7,4096-16 +- cmpldi cr1,r8,4096-16 +- bgt cr0,L(crosses) +- bgt cr1,L(crosses) +- COMPARE_16(v4,v5,0) +- +-L(crosses): +- andi. r7,r3,15 +- subfic r7,r7,16 /* r7(nalign1) = 16 - (str1 & 15). */ +- andi. r9,r4,15 +- subfic r5,r9,16 /* r5(nalign2) = 16 - (str2 & 15). */ +- cmpld cr7,r7,r5 +- beq cr7,L(same_aligned) +- blt cr7,L(nalign1_min) ++ li r11,16 ++ /* eq bit of cr1 used as swap status flag to indicate if ++ source pointers were swapped. */ ++ crclr 4*cr1+eq ++ vspltisb v19,-1 ++ andi. r7,r3,15 ++ sub r7,r11,r7 /* r7(nalign1) = 16 - (str1 & 15). */ ++ andi. r9,r4,15 ++ sub r5,r11,r9 /* r5(nalign2) = 16 - (str2 & 15). */ ++ cmpld cr7,r7,r5 ++ beq cr7,L(same_aligned) ++ blt cr7,L(nalign1_min) ++ /* Swap r3 and r4, and r7 and r5 such that r3 and r7 hold the ++ pointer which is closer to the next 16B boundary so that only ++ one CHECK_N_BYTES is needed before entering the loop below. */ ++ mr r8,r4 ++ mr r4,r3 ++ mr r3,r8 ++ mr r12,r7 ++ mr r7,r5 ++ mr r5,r12 ++ crset 4*cr1+eq /* Set bit on swapping source pointers. */ + +- /* nalign2 is minimum and s2 pointer is aligned. */ +- CHECK_N_BYTES(r3,r4,r5) +- /* Are we on the 64B hunk which crosses a page? */ +- andi. r10,r3,63 /* Determine offset into 64B hunk. */ +- andi. r8,r3,15 /* The offset into the 16B hunk. */ +- neg r7,r3 +- andi. r9,r7,15 /* Number of bytes after a 16B cross. */ +- rlwinm. r7,r7,26,0x3F /* ((r3-4096))>>6&63. */ +- beq L(compare_64_pagecross) +- mtctr r7 +- b L(compare_64B_unaligned) +- +- /* nalign1 is minimum and s1 pointer is aligned. */ ++ .p2align 5 + L(nalign1_min): + CHECK_N_BYTES(r3,r4,r7) +- /* Are we on the 64B hunk which crosses a page? */ +- andi. r10,r4,63 /* Determine offset into 64B hunk. */ +- andi. r8,r4,15 /* The offset into the 16B hunk. */ +- neg r7,r4 +- andi. r9,r7,15 /* Number of bytes after a 16B cross. */ +- rlwinm. r7,r7,26,0x3F /* ((r4-4096))>>6&63. */ +- beq L(compare_64_pagecross) +- mtctr r7 + + .p2align 5 +-L(compare_64B_unaligned): +- COMPARE_16(v4,v5,0) +- COMPARE_16(v4,v5,16) +- COMPARE_16(v4,v5,32) +- COMPARE_16(v4,v5,48) +- addi r3,r3,64 +- addi r4,r4,64 +- bdnz L(compare_64B_unaligned) ++L(s1_aligned): ++ /* r9 and r5 is number of bytes to be read after and before ++ page boundary correspondingly. */ ++ sub r5,r5,r7 ++ subfic r9,r5,16 ++ /* Now let r7 hold the count of quadwords which can be ++ checked without crossing a page boundary. quadword offset is ++ (str2>>4)&0xFF. */ ++ rlwinm r7,r4,28,0xFF ++ /* Below check is required only for first iteration. For second ++ iteration and beyond, the new loop counter is always 255. */ ++ cmpldi r7,255 ++ beq L(L3) ++ /* Get the initial loop count by 255-((str2>>4)&0xFF). */ ++ subfic r11,r7,255 + +- /* Cross the page boundary of s2, carefully. Only for first +- iteration we have to get the count of 64B blocks to be checked. +- From second iteration and beyond, loop counter is always 63. */ +-L(compare_64_pagecross): +- li r11, 63 ++ .p2align 5 ++L(L1): + mtctr r11 +- cmpldi r10,16 +- ble L(cross_4) +- cmpldi r10,32 +- ble L(cross_3) +- cmpldi r10,48 +- ble L(cross_2) +-L(cross_1): +- CHECK_N_BYTES(r3,r4,r9) +- CHECK_N_BYTES(r3,r4,r8) +- COMPARE_16(v4,v5,0) +- COMPARE_16(v4,v5,16) +- COMPARE_16(v4,v5,32) +- addi r3,r3,48 +- addi r4,r4,48 +- b L(compare_64B_unaligned) +-L(cross_2): +- COMPARE_16(v4,v5,0) +- addi r3,r3,16 +- addi r4,r4,16 +- CHECK_N_BYTES(r3,r4,r9) +- CHECK_N_BYTES(r3,r4,r8) +- COMPARE_16(v4,v5,0) +- COMPARE_16(v4,v5,16) +- addi r3,r3,32 +- addi r4,r4,32 +- b L(compare_64B_unaligned) +-L(cross_3): +- COMPARE_16(v4,v5,0) +- COMPARE_16(v4,v5,16) +- addi r3,r3,32 +- addi r4,r4,32 +- CHECK_N_BYTES(r3,r4,r9) +- CHECK_N_BYTES(r3,r4,r8) +- COMPARE_16(v4,v5,0) ++ ++ .p2align 5 ++L(L2): ++ COMPARE_16(v4,v5,0) /* Load 16B blocks using lxv. */ + addi r3,r3,16 + addi r4,r4,16 +- b L(compare_64B_unaligned) +-L(cross_4): +- COMPARE_16(v4,v5,0) +- COMPARE_16(v4,v5,16) +- COMPARE_16(v4,v5,32) +- addi r3,r3,48 +- addi r4,r4,48 ++ bdnz L(L2) ++ /* Cross the page boundary of s2, carefully. */ ++ ++ .p2align 5 ++L(L3): ++ CHECK_N_BYTES(r3,r4,r5) + CHECK_N_BYTES(r3,r4,r9) +- CHECK_N_BYTES(r3,r4,r8) +- b L(compare_64B_unaligned) ++ li r11,255 /* Load the new loop counter. */ ++ b L(L1) + ++ .p2align 5 + L(same_aligned): + CHECK_N_BYTES(r3,r4,r7) + /* Align s1 to 32B and adjust s2 address. +@@ -208,7 +168,18 @@ L(16B_aligned_loop): + + /* Calculate and return the difference. */ + L(different): +- TAIL(v4,v5) ++ vctzlsbb r6,v7 ++ vextubrx r5,r6,v4 ++ vextubrx r4,r6,v5 ++ bt 4*cr1+eq,L(swapped) ++ subf r3,r4,r5 ++ blr ++ ++ /* If src pointers were swapped, then swap the ++ indices and calculate the return value. */ ++L(swapped): ++ subf r3,r5,r4 ++ blr + + .p2align 5 + L(32B_aligned_loop): + +commit 672f31b90e501b4ba10ba12ab4c6051f77589912 +Author: Carlos O'Donell +Date: Wed Jun 11 09:33:45 2025 -0400 + + ppc64le: Revert "powerpc : Add optimized memchr for POWER10" (Bug 33059) + + This reverts commit b9182c793caa05df5d697427c0538936e6396d4b + + Reason for revert: Power10 memchr clobbers v20 vector register + (Bug 33059) + + This is not a security issue, unlike CVE-2025-5745 and + CVE-2025-5702. + + Tested on ppc64le without regression. + + (cherry picked from commit a7877bb6685300f159fa095c9f50b22b112cddb8) + +diff --git a/sysdeps/powerpc/powerpc64/le/power10/memchr.S b/sysdeps/powerpc/powerpc64/le/power10/memchr.S +deleted file mode 100644 +index 53e5716d72..0000000000 +--- a/sysdeps/powerpc/powerpc64/le/power10/memchr.S ++++ /dev/null +@@ -1,315 +0,0 @@ +-/* Optimized memchr implementation for POWER10 LE. +- Copyright (C) 2021-2024 Free Software Foundation, Inc. +- This file is part of the GNU C Library. +- +- The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Lesser General Public +- License as published by the Free Software Foundation; either +- version 2.1 of the License, or (at your option) any later version. +- +- The GNU C Library is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Lesser General Public License for more details. +- +- You should have received a copy of the GNU Lesser General Public +- License along with the GNU C Library; if not, see +- . */ +- +-#include +- +-# ifndef MEMCHR +-# define MEMCHR __memchr +-# endif +-# define M_VREG_ZERO v20 +-# define M_OFF_START_LOOP 256 +-# define MEMCHR_SUBTRACT_VECTORS \ +- vsububm v4,v4,v18; \ +- vsububm v5,v5,v18; \ +- vsububm v6,v6,v18; \ +- vsububm v7,v7,v18; +-# define M_TAIL(vreg,increment) \ +- vctzlsbb r4,vreg; \ +- cmpld r5,r4; \ +- ble L(null); \ +- addi r4,r4,increment; \ +- add r3,r6,r4; \ +- blr +- +-/* TODO: Replace macros by the actual instructions when minimum binutils becomes +- >= 2.35. This is used to keep compatibility with older versions. */ +-#define M_VEXTRACTBM(rt,vrb) \ +- .long(((4)<<(32-6)) \ +- | ((rt)<<(32-11)) \ +- | ((8)<<(32-16)) \ +- | ((vrb)<<(32-21)) \ +- | 1602) +- +-#define M_LXVP(xtp,dq,ra) \ +- .long(((6)<<(32-6)) \ +- | ((((xtp)-32)>>1)<<(32-10)) \ +- | ((1)<<(32-11)) \ +- | ((ra)<<(32-16)) \ +- | dq) +- +-#define CHECK16B(vreg,offset,addr,label) \ +- lxv vreg+32,offset(addr); \ +- vcmpequb. vreg,vreg,v18; \ +- bne cr6,L(label); \ +- cmpldi r5,16; \ +- ble L(null); \ +- addi r5,r5,-16; +- +-/* Load 4 quadwords, merge into one VR for speed and check for NULLs. r6 has # +- of bytes already checked. */ +-#define CHECK64B(offset,addr,label) \ +- M_LXVP(v4+32,offset,addr); \ +- M_LXVP(v6+32,offset+32,addr); \ +- MEMCHR_SUBTRACT_VECTORS; \ +- vminub v14,v4,v5; \ +- vminub v15,v6,v7; \ +- vminub v16,v14,v15; \ +- vcmpequb. v0,v16,M_VREG_ZERO; \ +- beq cr6,$+12; \ +- li r7,offset; \ +- b L(label); \ +- cmpldi r5,64; \ +- ble L(null); \ +- addi r5,r5,-64 +- +-/* Implements the function +- void *[r3] memchr (const void *s [r3], int c [r4], size_t n [r5]). */ +- +- .machine power9 +- +-ENTRY_TOCLESS (MEMCHR) +- CALL_MCOUNT 3 +- +- cmpldi r5,0 +- beq L(null) +- mr r0,r5 +- xori r6,r4,0xff +- +- mtvsrd v18+32,r4 /* matching char in v18 */ +- mtvsrd v19+32,r6 /* non matching char in v19 */ +- +- vspltb v18,v18,7 /* replicate */ +- vspltb v19,v19,7 /* replicate */ +- vspltisb M_VREG_ZERO,0 +- +- /* Next 16B-aligned address. Prepare address for L(aligned). */ +- addi r6,r3,16 +- clrrdi r6,r6,4 +- +- /* Align data and fill bytes not loaded with non matching char. */ +- lvx v0,0,r3 +- lvsr v1,0,r3 +- vperm v0,v19,v0,v1 +- +- vcmpequb. v6,v0,v18 +- bne cr6,L(found) +- sub r4,r6,r3 +- cmpld r5,r4 +- ble L(null) +- sub r5,r5,r4 +- +- /* Test up to OFF_START_LOOP-16 bytes in 16B chunks. The main loop is +- optimized for longer strings, so checking the first bytes in 16B +- chunks benefits a lot small strings. */ +- .p2align 5 +-L(aligned): +- cmpldi r5,0 +- beq L(null) +- +- CHECK16B(v0,0,r6,tail1) +- CHECK16B(v1,16,r6,tail2) +- CHECK16B(v2,32,r6,tail3) +- CHECK16B(v3,48,r6,tail4) +- CHECK16B(v4,64,r6,tail5) +- CHECK16B(v5,80,r6,tail6) +- CHECK16B(v6,96,r6,tail7) +- CHECK16B(v7,112,r6,tail8) +- CHECK16B(v8,128,r6,tail9) +- CHECK16B(v9,144,r6,tail10) +- CHECK16B(v10,160,r6,tail11) +- CHECK16B(v0,176,r6,tail12) +- CHECK16B(v1,192,r6,tail13) +- CHECK16B(v2,208,r6,tail14) +- CHECK16B(v3,224,r6,tail15) +- +- cmpdi cr5,r4,0 /* Check if c == 0. This will be useful to +- choose how we will perform the main loop. */ +- +- /* Prepare address for the loop. */ +- addi r4,r3,M_OFF_START_LOOP +- clrrdi r4,r4,6 +- sub r6,r4,r3 +- sub r5,r0,r6 +- addi r6,r4,128 +- +- /* If c == 0, use the loop without the vsububm. */ +- beq cr5,L(loop) +- +- /* This is very similar to the block after L(loop), the difference is +- that here MEMCHR_SUBTRACT_VECTORS is not empty, and we subtract +- each byte loaded by the char we are looking for, this way we can keep +- using vminub to merge the results and checking for nulls. */ +- .p2align 5 +-L(memchr_loop): +- CHECK64B(0,r4,pre_tail_64b) +- CHECK64B(64,r4,pre_tail_64b) +- addi r4,r4,256 +- +- CHECK64B(0,r6,tail_64b) +- CHECK64B(64,r6,tail_64b) +- addi r6,r6,256 +- +- CHECK64B(0,r4,pre_tail_64b) +- CHECK64B(64,r4,pre_tail_64b) +- addi r4,r4,256 +- +- CHECK64B(0,r6,tail_64b) +- CHECK64B(64,r6,tail_64b) +- addi r6,r6,256 +- +- b L(memchr_loop) +- /* Switch to a more aggressive approach checking 64B each time. Use 2 +- pointers 128B apart and unroll the loop once to make the pointer +- updates and usages separated enough to avoid stalls waiting for +- address calculation. */ +- .p2align 5 +-L(loop): +-#undef MEMCHR_SUBTRACT_VECTORS +-#define MEMCHR_SUBTRACT_VECTORS /* nothing */ +- CHECK64B(0,r4,pre_tail_64b) +- CHECK64B(64,r4,pre_tail_64b) +- addi r4,r4,256 +- +- CHECK64B(0,r6,tail_64b) +- CHECK64B(64,r6,tail_64b) +- addi r6,r6,256 +- +- CHECK64B(0,r4,pre_tail_64b) +- CHECK64B(64,r4,pre_tail_64b) +- addi r4,r4,256 +- +- CHECK64B(0,r6,tail_64b) +- CHECK64B(64,r6,tail_64b) +- addi r6,r6,256 +- +- b L(loop) +- +- .p2align 5 +-L(pre_tail_64b): +- mr r6,r4 +-L(tail_64b): +- /* OK, we found a null byte. Let's look for it in the current 64-byte +- block and mark it in its corresponding VR. lxvp vx,0(ry) puts the +- low 16B bytes into vx+1, and the high into vx, so the order here is +- v5, v4, v7, v6. */ +- vcmpequb v1,v5,M_VREG_ZERO +- vcmpequb v2,v4,M_VREG_ZERO +- vcmpequb v3,v7,M_VREG_ZERO +- vcmpequb v4,v6,M_VREG_ZERO +- +- /* Take into account the other 64B blocks we had already checked. */ +- add r6,r6,r7 +- /* Extract first bit of each byte. */ +- M_VEXTRACTBM(r8,v1) +- M_VEXTRACTBM(r9,v2) +- M_VEXTRACTBM(r10,v3) +- M_VEXTRACTBM(r11,v4) +- +- /* Shift each value into their corresponding position. */ +- sldi r9,r9,16 +- sldi r10,r10,32 +- sldi r11,r11,48 +- +- /* Merge the results. */ +- or r8,r8,r9 +- or r9,r10,r11 +- or r11,r9,r8 +- +- cnttzd r0,r11 /* Count trailing zeros before the match. */ +- cmpld r5,r0 +- ble L(null) +- add r3,r6,r0 /* Compute final address. */ +- blr +- +- .p2align 5 +-L(tail1): +- M_TAIL(v0,0) +- +- .p2align 5 +-L(tail2): +- M_TAIL(v1,16) +- +- .p2align 5 +-L(tail3): +- M_TAIL(v2,32) +- +- .p2align 5 +-L(tail4): +- M_TAIL(v3,48) +- +- .p2align 5 +-L(tail5): +- M_TAIL(v4,64) +- +- .p2align 5 +-L(tail6): +- M_TAIL(v5,80) +- +- .p2align 5 +-L(tail7): +- M_TAIL(v6,96) +- +- .p2align 5 +-L(tail8): +- M_TAIL(v7,112) +- +- .p2align 5 +-L(tail9): +- M_TAIL(v8,128) +- +- .p2align 5 +-L(tail10): +- M_TAIL(v9,144) +- +- .p2align 5 +-L(tail11): +- M_TAIL(v10,160) +- +- .p2align 5 +-L(tail12): +- M_TAIL(v0,176) +- +- .p2align 5 +-L(tail13): +- M_TAIL(v1,192) +- +- .p2align 5 +-L(tail14): +- M_TAIL(v2,208) +- +- .p2align 5 +-L(tail15): +- M_TAIL(v3,224) +- +- .p2align 5 +-L(found): +- vctzlsbb r7,v6 +- cmpld r5,r7 +- ble L(null) +- add r3,r3,r7 +- blr +- +- .p2align 5 +-L(null): +- li r3,0 +- blr +- +-END (MEMCHR) +- +-weak_alias (__memchr, memchr) +-libc_hidden_builtin_def (memchr) +diff --git a/sysdeps/powerpc/powerpc64/multiarch/Makefile b/sysdeps/powerpc/powerpc64/multiarch/Makefile +index a38ff46448..fa1107dfd9 100644 +--- a/sysdeps/powerpc/powerpc64/multiarch/Makefile ++++ b/sysdeps/powerpc/powerpc64/multiarch/Makefile +@@ -31,10 +31,10 @@ sysdep_routines += memcpy-power8-cached memcpy-power7 memcpy-a2 memcpy-power6 \ + strncase-power8 + + ifneq (,$(filter %le,$(config-machine))) +-sysdep_routines += memchr-power10 memcmp-power10 memcpy-power10 \ +- memmove-power10 memset-power10 rawmemchr-power9 \ +- rawmemchr-power10 strcmp-power9 strcmp-power10 \ +- strncmp-power9 strcpy-power9 stpcpy-power9 \ ++sysdep_routines += memcmp-power10 memcpy-power10 memmove-power10 memset-power10 \ ++ rawmemchr-power9 rawmemchr-power10 \ ++ strcmp-power9 strcmp-power10 strncmp-power9 \ ++ strcpy-power9 stpcpy-power9 \ + strlen-power9 strncpy-power9 stpncpy-power9 strlen-power10 + endif + CFLAGS-strncase-power7.c += -mcpu=power7 -funroll-loops +diff --git a/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c b/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c +index 30fd89e109..9b3e617306 100644 +--- a/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c ++++ b/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c +@@ -226,12 +226,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, + + /* Support sysdeps/powerpc/powerpc64/multiarch/memchr.c. */ + IFUNC_IMPL (i, name, memchr, +-#ifdef __LITTLE_ENDIAN__ +- IFUNC_IMPL_ADD (array, i, memchr, +- hwcap2 & PPC_FEATURE2_ARCH_3_1 +- && hwcap & PPC_FEATURE_HAS_VSX, +- __memchr_power10) +-#endif + IFUNC_IMPL_ADD (array, i, memchr, + hwcap2 & PPC_FEATURE2_ARCH_2_07 + && hwcap & PPC_FEATURE_HAS_ALTIVEC, +diff --git a/sysdeps/powerpc/powerpc64/multiarch/memchr-power10.S b/sysdeps/powerpc/powerpc64/multiarch/memchr-power10.S +deleted file mode 100644 +index 7d35ef28a9..0000000000 +--- a/sysdeps/powerpc/powerpc64/multiarch/memchr-power10.S ++++ /dev/null +@@ -1,28 +0,0 @@ +-/* Optimized memchr implementation for POWER10/PPC64. +- Copyright (C) 2016-2024 Free Software Foundation, Inc. +- This file is part of the GNU C Library. +- +- The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Lesser General Public +- License as published by the Free Software Foundation; either +- version 2.1 of the License, or (at your option) any later version. +- +- The GNU C Library is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Lesser General Public License for more details. +- +- You should have received a copy of the GNU Lesser General Public +- License along with the GNU C Library; if not, see +- . */ +- +-#if defined __LITTLE_ENDIAN__ && IS_IN (libc) +-#define MEMCHR __memchr_power10 +- +-#undef libc_hidden_builtin_def +-#define libc_hidden_builtin_def(name) +-#undef weak_alias +-#define weak_alias(name,alias) +- +-#include +-#endif +diff --git a/sysdeps/powerpc/powerpc64/multiarch/memchr.c b/sysdeps/powerpc/powerpc64/multiarch/memchr.c +index 57d23e7b18..b4655dfcaa 100644 +--- a/sysdeps/powerpc/powerpc64/multiarch/memchr.c ++++ b/sysdeps/powerpc/powerpc64/multiarch/memchr.c +@@ -25,23 +25,15 @@ extern __typeof (__memchr) __memchr_ppc attribute_hidden; + extern __typeof (__memchr) __memchr_power7 attribute_hidden; + extern __typeof (__memchr) __memchr_power8 attribute_hidden; + +-# ifdef __LITTLE_ENDIAN__ +-extern __typeof (__memchr) __memchr_power10 attribute_hidden; +-# endif + /* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle + ifunc symbol properly. */ + libc_ifunc (__memchr, +-# ifdef __LITTLE_ENDIAN__ +- (hwcap2 & PPC_FEATURE2_ARCH_3_1 +- && hwcap & PPC_FEATURE_HAS_VSX) +- ? __memchr_power10 : +-# endif +- (hwcap2 & PPC_FEATURE2_ARCH_2_07 +- && hwcap & PPC_FEATURE_HAS_ALTIVEC) +- ? __memchr_power8 : +- (hwcap & PPC_FEATURE_ARCH_2_06) +- ? __memchr_power7 +- : __memchr_ppc); ++ (hwcap2 & PPC_FEATURE2_ARCH_2_07 ++ && hwcap & PPC_FEATURE_HAS_ALTIVEC) ++ ? __memchr_power8 : ++ (hwcap & PPC_FEATURE_ARCH_2_06) ++ ? __memchr_power7 ++ : __memchr_ppc); + + weak_alias (__memchr, memchr) + libc_hidden_builtin_def (memchr) + +commit 7e12550b8e3a11764a4a9090ce6bd3fc23fc8a8e +Author: Carlos O'Donell +Date: Mon Jun 16 13:09:57 2025 -0400 + + ppc64le: Revert "powerpc: Optimized strcmp for power10" (CVE-2025-5702) + + This reverts commit 3367d8e180848030d1646f088759f02b8dfe0d6f + + Reason for revert: Power10 strcmp clobbers non-volatile vector + registers (Bug 33056) + + Tested on ppc64le without regression. + + (cherry picked from commit 15808c77b35319e67ee0dc8f984a9a1a434701bc) + +diff --git a/sysdeps/powerpc/powerpc64/le/power10/strcmp.S b/sysdeps/powerpc/powerpc64/le/power10/strcmp.S +deleted file mode 100644 +index 00f1e9c170..0000000000 +--- a/sysdeps/powerpc/powerpc64/le/power10/strcmp.S ++++ /dev/null +@@ -1,204 +0,0 @@ +-/* Optimized strcmp implementation for PowerPC64/POWER10. +- Copyright (C) 2021-2024 Free Software Foundation, Inc. +- This file is part of the GNU C Library. +- +- The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Lesser General Public +- License as published by the Free Software Foundation; either +- version 2.1 of the License, or (at your option) any later version. +- +- The GNU C Library is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Lesser General Public License for more details. +- +- You should have received a copy of the GNU Lesser General Public +- License along with the GNU C Library; if not, see +- . */ +-#include +- +-#ifndef STRCMP +-# define STRCMP strcmp +-#endif +- +-/* Implements the function +- int [r3] strcmp (const char *s1 [r3], const char *s2 [r4]). */ +- +-/* TODO: Change this to actual instructions when minimum binutils is upgraded +- to 2.27. Macros are defined below for these newer instructions in order +- to maintain compatibility. */ +- +-#define LXVP(xtp,dq,ra) \ +- .long(((6)<<(32-6)) \ +- | ((((xtp)-32)>>1)<<(32-10)) \ +- | ((1)<<(32-11)) \ +- | ((ra)<<(32-16)) \ +- | dq) +- +-#define COMPARE_16(vreg1,vreg2,offset) \ +- lxv vreg1+32,offset(r3); \ +- lxv vreg2+32,offset(r4); \ +- vcmpnezb. v7,vreg1,vreg2; \ +- bne cr6,L(different); \ +- +-#define COMPARE_32(vreg1,vreg2,offset,label1,label2) \ +- LXVP(vreg1+32,offset,r3); \ +- LXVP(vreg2+32,offset,r4); \ +- vcmpnezb. v7,vreg1+1,vreg2+1; \ +- bne cr6,L(label1); \ +- vcmpnezb. v7,vreg1,vreg2; \ +- bne cr6,L(label2); \ +- +-#define TAIL(vreg1,vreg2) \ +- vctzlsbb r6,v7; \ +- vextubrx r5,r6,vreg1; \ +- vextubrx r4,r6,vreg2; \ +- subf r3,r4,r5; \ +- blr; \ +- +-#define CHECK_N_BYTES(reg1,reg2,len_reg) \ +- sldi r0,len_reg,56; \ +- lxvl 32+v4,reg1,r0; \ +- lxvl 32+v5,reg2,r0; \ +- add reg1,reg1,len_reg; \ +- add reg2,reg2,len_reg; \ +- vcmpnezb. v7,v4,v5; \ +- vctzlsbb r6,v7; \ +- cmpld cr7,r6,len_reg; \ +- blt cr7,L(different); \ +- +- /* TODO: change this to .machine power10 when the minimum required +- binutils allows it. */ +- +- .machine power9 +-ENTRY_TOCLESS (STRCMP, 4) +- li r11,16 +- /* eq bit of cr1 used as swap status flag to indicate if +- source pointers were swapped. */ +- crclr 4*cr1+eq +- vspltisb v19,-1 +- andi. r7,r3,15 +- sub r7,r11,r7 /* r7(nalign1) = 16 - (str1 & 15). */ +- andi. r9,r4,15 +- sub r5,r11,r9 /* r5(nalign2) = 16 - (str2 & 15). */ +- cmpld cr7,r7,r5 +- beq cr7,L(same_aligned) +- blt cr7,L(nalign1_min) +- /* Swap r3 and r4, and r7 and r5 such that r3 and r7 hold the +- pointer which is closer to the next 16B boundary so that only +- one CHECK_N_BYTES is needed before entering the loop below. */ +- mr r8,r4 +- mr r4,r3 +- mr r3,r8 +- mr r12,r7 +- mr r7,r5 +- mr r5,r12 +- crset 4*cr1+eq /* Set bit on swapping source pointers. */ +- +- .p2align 5 +-L(nalign1_min): +- CHECK_N_BYTES(r3,r4,r7) +- +- .p2align 5 +-L(s1_aligned): +- /* r9 and r5 is number of bytes to be read after and before +- page boundary correspondingly. */ +- sub r5,r5,r7 +- subfic r9,r5,16 +- /* Now let r7 hold the count of quadwords which can be +- checked without crossing a page boundary. quadword offset is +- (str2>>4)&0xFF. */ +- rlwinm r7,r4,28,0xFF +- /* Below check is required only for first iteration. For second +- iteration and beyond, the new loop counter is always 255. */ +- cmpldi r7,255 +- beq L(L3) +- /* Get the initial loop count by 255-((str2>>4)&0xFF). */ +- subfic r11,r7,255 +- +- .p2align 5 +-L(L1): +- mtctr r11 +- +- .p2align 5 +-L(L2): +- COMPARE_16(v4,v5,0) /* Load 16B blocks using lxv. */ +- addi r3,r3,16 +- addi r4,r4,16 +- bdnz L(L2) +- /* Cross the page boundary of s2, carefully. */ +- +- .p2align 5 +-L(L3): +- CHECK_N_BYTES(r3,r4,r5) +- CHECK_N_BYTES(r3,r4,r9) +- li r11,255 /* Load the new loop counter. */ +- b L(L1) +- +- .p2align 5 +-L(same_aligned): +- CHECK_N_BYTES(r3,r4,r7) +- /* Align s1 to 32B and adjust s2 address. +- Use lxvp only if both s1 and s2 are 32B aligned. */ +- COMPARE_16(v4,v5,0) +- COMPARE_16(v4,v5,16) +- COMPARE_16(v4,v5,32) +- COMPARE_16(v4,v5,48) +- addi r3,r3,64 +- addi r4,r4,64 +- COMPARE_16(v4,v5,0) +- COMPARE_16(v4,v5,16) +- +- clrldi r6,r3,59 +- subfic r5,r6,32 +- add r3,r3,r5 +- add r4,r4,r5 +- andi. r5,r4,0x1F +- beq cr0,L(32B_aligned_loop) +- +- .p2align 5 +-L(16B_aligned_loop): +- COMPARE_16(v4,v5,0) +- COMPARE_16(v4,v5,16) +- COMPARE_16(v4,v5,32) +- COMPARE_16(v4,v5,48) +- addi r3,r3,64 +- addi r4,r4,64 +- b L(16B_aligned_loop) +- +- /* Calculate and return the difference. */ +-L(different): +- vctzlsbb r6,v7 +- vextubrx r5,r6,v4 +- vextubrx r4,r6,v5 +- bt 4*cr1+eq,L(swapped) +- subf r3,r4,r5 +- blr +- +- /* If src pointers were swapped, then swap the +- indices and calculate the return value. */ +-L(swapped): +- subf r3,r5,r4 +- blr +- +- .p2align 5 +-L(32B_aligned_loop): +- COMPARE_32(v14,v16,0,tail1,tail2) +- COMPARE_32(v18,v20,32,tail3,tail4) +- COMPARE_32(v22,v24,64,tail5,tail6) +- COMPARE_32(v26,v28,96,tail7,tail8) +- addi r3,r3,128 +- addi r4,r4,128 +- b L(32B_aligned_loop) +- +-L(tail1): TAIL(v15,v17) +-L(tail2): TAIL(v14,v16) +-L(tail3): TAIL(v19,v21) +-L(tail4): TAIL(v18,v20) +-L(tail5): TAIL(v23,v25) +-L(tail6): TAIL(v22,v24) +-L(tail7): TAIL(v27,v29) +-L(tail8): TAIL(v26,v28) +- +-END (STRCMP) +-libc_hidden_builtin_def (strcmp) +diff --git a/sysdeps/powerpc/powerpc64/multiarch/Makefile b/sysdeps/powerpc/powerpc64/multiarch/Makefile +index fa1107dfd9..9f15f3207f 100644 +--- a/sysdeps/powerpc/powerpc64/multiarch/Makefile ++++ b/sysdeps/powerpc/powerpc64/multiarch/Makefile +@@ -33,8 +33,7 @@ sysdep_routines += memcpy-power8-cached memcpy-power7 memcpy-a2 memcpy-power6 \ + ifneq (,$(filter %le,$(config-machine))) + sysdep_routines += memcmp-power10 memcpy-power10 memmove-power10 memset-power10 \ + rawmemchr-power9 rawmemchr-power10 \ +- strcmp-power9 strcmp-power10 strncmp-power9 \ +- strcpy-power9 stpcpy-power9 \ ++ strcmp-power9 strncmp-power9 strcpy-power9 stpcpy-power9 \ + strlen-power9 strncpy-power9 stpncpy-power9 strlen-power10 + endif + CFLAGS-strncase-power7.c += -mcpu=power7 -funroll-loops +diff --git a/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c b/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c +index 9b3e617306..78443b7f34 100644 +--- a/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c ++++ b/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c +@@ -377,10 +377,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, + /* Support sysdeps/powerpc/powerpc64/multiarch/strcmp.c. */ + IFUNC_IMPL (i, name, strcmp, + #ifdef __LITTLE_ENDIAN__ +- IFUNC_IMPL_ADD (array, i, strcmp, +- (hwcap2 & PPC_FEATURE2_ARCH_3_1) +- && (hwcap & PPC_FEATURE_HAS_VSX), +- __strcmp_power10) + IFUNC_IMPL_ADD (array, i, strcmp, + hwcap2 & PPC_FEATURE2_ARCH_3_00 + && hwcap & PPC_FEATURE_HAS_ALTIVEC, +diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcmp-power10.S b/sysdeps/powerpc/powerpc64/multiarch/strcmp-power10.S +deleted file mode 100644 +index 1a9f6069f5..0000000000 +--- a/sysdeps/powerpc/powerpc64/multiarch/strcmp-power10.S ++++ /dev/null +@@ -1,26 +0,0 @@ +-/* Optimized strcmp implementation for POWER10/PPC64. +- Copyright (C) 2021-2024 Free Software Foundation, Inc. +- This file is part of the GNU C Library. +- +- The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Lesser General Public +- License as published by the Free Software Foundation; either +- version 2.1 of the License, or (at your option) any later version. +- +- The GNU C Library is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Lesser General Public License for more details. +- +- You should have received a copy of the GNU Lesser General Public +- License along with the GNU C Library; if not, see +- . */ +- +-#if defined __LITTLE_ENDIAN__ && IS_IN (libc) +-#define STRCMP __strcmp_power10 +- +-#undef libc_hidden_builtin_def +-#define libc_hidden_builtin_def(name) +- +-#include +-#endif /* __LITTLE_ENDIAN__ && IS_IN (libc) */ +diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcmp.c b/sysdeps/powerpc/powerpc64/multiarch/strcmp.c +index ff32496fab..06b9b4090f 100644 +--- a/sysdeps/powerpc/powerpc64/multiarch/strcmp.c ++++ b/sysdeps/powerpc/powerpc64/multiarch/strcmp.c +@@ -29,16 +29,12 @@ extern __typeof (strcmp) __strcmp_power7 attribute_hidden; + extern __typeof (strcmp) __strcmp_power8 attribute_hidden; + # ifdef __LITTLE_ENDIAN__ + extern __typeof (strcmp) __strcmp_power9 attribute_hidden; +-extern __typeof (strcmp) __strcmp_power10 attribute_hidden; + # endif + + # undef strcmp + + libc_ifunc_redirected (__redirect_strcmp, strcmp, + # ifdef __LITTLE_ENDIAN__ +- (hwcap2 & PPC_FEATURE2_ARCH_3_1 +- && hwcap & PPC_FEATURE_HAS_VSX) +- ? __strcmp_power10 : + (hwcap2 & PPC_FEATURE2_ARCH_3_00 + && hwcap & PPC_FEATURE_HAS_ALTIVEC) + ? __strcmp_power9 : + +commit 23a02e382c8ffebfed00a082d8898f1aa468b5da +Author: Florian Weimer +Date: Wed May 21 16:47:34 2025 +0200 + + support: Pick group in support_capture_subprogram_self_sgid if UID == 0 + + When running as root, it is likely that we can run under any group. + Pick a harmless group from /etc/group in this case. + + Reviewed-by: Carlos O'Donell + (cherry picked from commit 2f769cec448d84a62b7dd0d4ff56978fe22c0cd6) + +diff --git a/support/support_capture_subprocess.c b/support/support_capture_subprocess.c +index 2383481911..1cb344eb04 100644 +--- a/support/support_capture_subprocess.c ++++ b/support/support_capture_subprocess.c +@@ -21,7 +21,11 @@ + + #include + #include ++#include ++#include ++#include + #include ++#include + #include + #include + #include +@@ -210,10 +214,48 @@ err: + return status; + } + ++/* Returns true if a group with NAME has been found, and writes its ++ GID to *TARGET. */ ++static bool ++find_sgid_group (gid_t *target, const char *name) ++{ ++ /* Do not use getgrname_r because it does not work in statically ++ linked binaries if the system libc is different. */ ++ FILE *fp = fopen ("/etc/group", "rce"); ++ if (fp == NULL) ++ return false; ++ __fsetlocking (fp, FSETLOCKING_BYCALLER); ++ ++ bool ok = false; ++ struct scratch_buffer buf; ++ scratch_buffer_init (&buf); ++ while (true) ++ { ++ struct group grp; ++ struct group *result = NULL; ++ int status = fgetgrent_r (fp, &grp, buf.data, buf.length, &result); ++ if (status == 0 && result != NULL) ++ { ++ if (strcmp (result->gr_name, name) == 0) ++ { ++ *target = result->gr_gid; ++ ok = true; ++ break; ++ } ++ } ++ else if (errno != ERANGE) ++ break; ++ else if (!scratch_buffer_grow (&buf)) ++ break; ++ } ++ scratch_buffer_free (&buf); ++ fclose (fp); ++ return ok; ++} ++ + int + support_capture_subprogram_self_sgid (const char *child_id) + { +- gid_t target = 0; + const int count = 64; + gid_t groups[count]; + +@@ -225,6 +267,7 @@ support_capture_subprogram_self_sgid (const char *child_id) + (intmax_t) getuid ()); + + gid_t current = getgid (); ++ gid_t target = current; + for (int i = 0; i < ret; ++i) + { + if (groups[i] != current) +@@ -234,9 +277,16 @@ support_capture_subprogram_self_sgid (const char *child_id) + } + } + +- if (target == 0) +- FAIL_UNSUPPORTED("Could not find a suitable GID for user %jd\n", +- (intmax_t) getuid ()); ++ if (target == current) ++ { ++ /* If running as root, try to find a harmless group for SGID. */ ++ if (getuid () != 0 ++ || (!find_sgid_group (&target, "nogroup") ++ && !find_sgid_group (&target, "bin") ++ && !find_sgid_group (&target, "daemon"))) ++ FAIL_UNSUPPORTED("Could not find a suitable GID for user %jd\n", ++ (intmax_t) getuid ()); ++ } + + return copy_and_spawn_sgid (child_id, target); + } + +commit dbc83657e290bdad3245259be80fb84cbe10304c +Author: Florian Weimer +Date: Thu May 22 14:36:37 2025 +0200 + + Fix error reporting (false negatives) in SGID tests + + And simplify the interface of support_capture_subprogram_self_sgid. + + Use the existing framework for temporary directories (now with + mode 0700) and directory/file deletion. Handle all execution + errors within support_capture_subprogram_self_sgid. In particular, + this includes test failures because the invoked program did not + exit with exit status zero. Existing tests that expect exit + status 42 are adjusted to use zero instead. + + In addition, fix callers not to call exit (0) with test failures + pending (which may mask them, especially when running with --direct). + + Fixes commit 35fc356fa3b4f485bd3ba3114c9f774e5df7d3c2 + ("elf: Fix subprocess status handling for tst-dlopen-sgid (bug 32987)"). + + Reviewed-by: Carlos O'Donell + (cherry picked from commit 3a3fb2ed83f79100c116c824454095ecfb335ad7) + +diff --git a/elf/tst-dlopen-sgid.c b/elf/tst-dlopen-sgid.c +index 5688b79f2e..8aec52e19f 100644 +--- a/elf/tst-dlopen-sgid.c ++++ b/elf/tst-dlopen-sgid.c +@@ -70,13 +70,7 @@ do_test (void) + + free (libdir); + +- int status = support_capture_subprogram_self_sgid (magic_argument); +- +- if (WEXITSTATUS (status) == EXIT_UNSUPPORTED) +- return EXIT_UNSUPPORTED; +- +- if (!WIFEXITED (status)) +- FAIL_EXIT1 ("Unexpected exit status %d from child process\n", status); ++ support_capture_subprogram_self_sgid (magic_argument); + + return 0; + } +diff --git a/elf/tst-env-setuid-tunables.c b/elf/tst-env-setuid-tunables.c +index a47219047f..233eec7631 100644 +--- a/elf/tst-env-setuid-tunables.c ++++ b/elf/tst-env-setuid-tunables.c +@@ -105,10 +105,7 @@ do_test (int argc, char **argv) + + if (ret != 0) + exit (1); +- +- /* Special return code to make sure that the child executed all the way +- through. */ +- exit (42); ++ return 0; + } + else + { +@@ -127,18 +124,7 @@ do_test (int argc, char **argv) + continue; + } + +- int status = support_capture_subprogram_self_sgid (buf); +- +- /* Bail out early if unsupported. */ +- if (WEXITSTATUS (status) == EXIT_UNSUPPORTED) +- return EXIT_UNSUPPORTED; +- +- if (WEXITSTATUS (status) != 42) +- { +- printf (" [%d] child failed with status %d\n", i, +- WEXITSTATUS (status)); +- support_record_failure (); +- } ++ support_capture_subprogram_self_sgid (buf); + } + return 0; + } +diff --git a/elf/tst-env-setuid.c b/elf/tst-env-setuid.c +index 59f2ffeb88..ee3f058468 100644 +--- a/elf/tst-env-setuid.c ++++ b/elf/tst-env-setuid.c +@@ -147,10 +147,7 @@ do_test (int argc, char **argv) + + if (ret != 0) + exit (1); +- +- /* Special return code to make sure that the child executed all the way +- through. */ +- exit (42); ++ return 0; + } + else + { +@@ -174,17 +171,7 @@ do_test (int argc, char **argv) + free (profilepath); + } + +- int status = support_capture_subprogram_self_sgid (SETGID_CHILD); +- +- if (WEXITSTATUS (status) == EXIT_UNSUPPORTED) +- exit (EXIT_UNSUPPORTED); +- +- if (WEXITSTATUS (status) != 42) +- { +- printf (" child failed with status %d\n", +- WEXITSTATUS (status)); +- support_record_failure (); +- } ++ support_capture_subprogram_self_sgid (SETGID_CHILD); + + return 0; + } +diff --git a/stdlib/tst-secure-getenv.c b/stdlib/tst-secure-getenv.c +index cc26ed6d15..cefee58d46 100644 +--- a/stdlib/tst-secure-getenv.c ++++ b/stdlib/tst-secure-getenv.c +@@ -57,13 +57,7 @@ do_test (void) + exit (1); + } + +- int status = support_capture_subprogram_self_sgid (MAGIC_ARGUMENT); +- +- if (WEXITSTATUS (status) == EXIT_UNSUPPORTED) +- return EXIT_UNSUPPORTED; +- +- if (!WIFEXITED (status)) +- FAIL_EXIT1 ("Unexpected exit status %d from child process\n", status); ++ support_capture_subprogram_self_sgid (MAGIC_ARGUMENT); + + return 0; + } +@@ -82,6 +76,7 @@ alternative_main (int argc, char **argv) + if (secure_getenv ("PATH") != NULL) + FAIL_EXIT (4, "PATH variable not filtered out\n"); + ++ support_record_failure_barrier (); + exit (EXIT_SUCCESS); + } + } +diff --git a/support/capture_subprocess.h b/support/capture_subprocess.h +index 5406d9f6c0..57bb941e7d 100644 +--- a/support/capture_subprocess.h ++++ b/support/capture_subprocess.h +@@ -42,10 +42,12 @@ struct support_capture_subprocess support_capture_subprocess + struct support_capture_subprocess support_capture_subprogram + (const char *file, char *const argv[], char *const envp[]); + +-/* Copy the running program into a setgid binary and run it with CHILD_ID +- argument. If execution is successful, return the exit status of the child +- program, otherwise return a non-zero failure exit code. */ +-int support_capture_subprogram_self_sgid (const char *child_id); ++/* Copy the running program into a setgid binary and run it with ++ CHILD_ID argument. If the program exits with a non-zero status, ++ exit with that exit status (or status 1 if the program did not exit ++ normally). If the test cannot be performed, exit with ++ EXIT_UNSUPPORTED. */ ++void support_capture_subprogram_self_sgid (const char *child_id); + + /* Deallocate the subprocess data captured by + support_capture_subprocess. */ +diff --git a/support/support_capture_subprocess.c b/support/support_capture_subprocess.c +index 1cb344eb04..cbc6951064 100644 +--- a/support/support_capture_subprocess.c ++++ b/support/support_capture_subprocess.c +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + #include + + static void +@@ -113,105 +114,44 @@ support_capture_subprogram (const char *file, char *const argv[], + /* Copies the executable into a restricted directory, so that we can + safely make it SGID with the TARGET group ID. Then runs the + executable. */ +-static int ++static void + copy_and_spawn_sgid (const char *child_id, gid_t gid) + { +- char *dirname = xasprintf ("%s/tst-tunables-setuid.%jd", +- test_dir, (intmax_t) getpid ()); ++ char *dirname = support_create_temp_directory ("tst-glibc-sgid-"); + char *execname = xasprintf ("%s/bin", dirname); +- int infd = -1; +- int outfd = -1; +- int ret = 1, status = 1; +- +- TEST_VERIFY (mkdir (dirname, 0700) == 0); +- if (support_record_failure_is_failed ()) +- goto err; ++ add_temp_file (execname); + +- infd = open ("/proc/self/exe", O_RDONLY); +- if (infd < 0) ++ if (access ("/proc/self/exe", R_OK) != 0) + FAIL_UNSUPPORTED ("unsupported: Cannot read binary from procfs\n"); + +- outfd = open (execname, O_WRONLY | O_CREAT | O_EXCL, 0700); +- TEST_VERIFY (outfd >= 0); +- if (support_record_failure_is_failed ()) +- goto err; +- +- char buf[4096]; +- for (;;) +- { +- ssize_t rdcount = read (infd, buf, sizeof (buf)); +- TEST_VERIFY (rdcount >= 0); +- if (support_record_failure_is_failed ()) +- goto err; +- if (rdcount == 0) +- break; +- char *p = buf; +- char *end = buf + rdcount; +- while (p != end) +- { +- ssize_t wrcount = write (outfd, buf, end - p); +- if (wrcount == 0) +- errno = ENOSPC; +- TEST_VERIFY (wrcount > 0); +- if (support_record_failure_is_failed ()) +- goto err; +- p += wrcount; +- } +- } ++ support_copy_file ("/proc/self/exe", execname); + +- bool chowned = false; +- TEST_VERIFY ((chowned = fchown (outfd, getuid (), gid) == 0) +- || errno == EPERM); +- if (support_record_failure_is_failed ()) +- goto err; +- else if (!chowned) +- { +- ret = 77; +- goto err; +- } ++ if (chown (execname, getuid (), gid) != 0) ++ FAIL_UNSUPPORTED ("cannot change group of \"%s\" to %jd: %m", ++ execname, (intmax_t) gid); + +- TEST_VERIFY (fchmod (outfd, 02750) == 0); +- if (support_record_failure_is_failed ()) +- goto err; +- TEST_VERIFY (close (outfd) == 0); +- if (support_record_failure_is_failed ()) +- goto err; +- TEST_VERIFY (close (infd) == 0); +- if (support_record_failure_is_failed ()) +- goto err; ++ if (chmod (execname, 02750) != 0) ++ FAIL_UNSUPPORTED ("cannot make \"%s\" SGID: %m ", execname); + + /* We have the binary, now spawn the subprocess. Avoid using + support_subprogram because we only want the program exit status, not the + contents. */ +- ret = 0; +- infd = outfd = -1; + + char * const args[] = {execname, (char *) child_id, NULL}; ++ int status = support_subprogram_wait (args[0], args); + +- status = support_subprogram_wait (args[0], args); ++ free (execname); ++ free (dirname); + +-err: +- if (outfd >= 0) +- close (outfd); +- if (infd >= 0) +- close (infd); +- if (execname != NULL) +- { +- unlink (execname); +- free (execname); +- } +- if (dirname != NULL) ++ if (WIFEXITED (status)) + { +- rmdir (dirname); +- free (dirname); ++ if (WEXITSTATUS (status) == 0) ++ return; ++ else ++ exit (WEXITSTATUS (status)); + } +- +- if (ret == 77) +- FAIL_UNSUPPORTED ("Failed to make sgid executable for test\n"); +- if (ret != 0) +- FAIL_EXIT1 ("Failed to make sgid executable for test\n"); +- +- return status; ++ else ++ FAIL_EXIT1 ("subprogram failed with status %d", status); + } + + /* Returns true if a group with NAME has been found, and writes its +@@ -253,7 +193,7 @@ find_sgid_group (gid_t *target, const char *name) + return ok; + } + +-int ++void + support_capture_subprogram_self_sgid (const char *child_id) + { + const int count = 64; +@@ -288,7 +228,7 @@ support_capture_subprogram_self_sgid (const char *child_id) + (intmax_t) getuid ()); + } + +- return copy_and_spawn_sgid (child_id, target); ++ copy_and_spawn_sgid (child_id, target); + } + + void + +commit 2eb180377b96771b8368b0915669c8c7b267e739 +Author: Florian Weimer +Date: Mon Jul 21 21:43:49 2025 +0200 + + posix: Fix double-free after allocation failure in regcomp (bug 33185) + + If a memory allocation failure occurs during bracket expression + parsing in regcomp, a double-free error may result. + + Reported-by: Anastasia Belova + Co-authored-by: Paul Eggert + Reviewed-by: Andreas K. Huettel + (cherry picked from commit 7ea06e994093fa0bcca0d0ee2c1db271d8d7885d) + +diff --git a/NEWS b/NEWS +index 4b290ad4bf..253b07ae99 100644 +--- a/NEWS ++++ b/NEWS +@@ -24,6 +24,7 @@ The following bugs are resolved with this release: + [32470] x86: Avoid integer truncation with large cache sizes + [32810] Crash on x86-64 if XSAVEC disable via tunable + [32987] elf: Fix subprocess status handling for tst-dlopen-sgid ++ [33185] Fix double-free after allocation failure in regcomp + + Version 2.40 + +diff --git a/posix/Makefile b/posix/Makefile +index 2c598cd20a..830278a423 100644 +--- a/posix/Makefile ++++ b/posix/Makefile +@@ -303,6 +303,7 @@ tests := \ + tst-posix_spawn-setsid \ + tst-preadwrite \ + tst-preadwrite64 \ ++ tst-regcomp-bracket-free \ + tst-regcomp-truncated \ + tst-regex \ + tst-regex2 \ +diff --git a/posix/regcomp.c b/posix/regcomp.c +index 5380d3c7b9..6595bb3c0d 100644 +--- a/posix/regcomp.c ++++ b/posix/regcomp.c +@@ -3384,6 +3384,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token, + { + #ifdef RE_ENABLE_I18N + free_charset (mbcset); ++ mbcset = NULL; + #endif + /* Build a tree for simple bracket. */ + br_token.type = SIMPLE_BRACKET; +@@ -3399,7 +3400,8 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token, + parse_bracket_exp_free_return: + re_free (sbcset); + #ifdef RE_ENABLE_I18N +- free_charset (mbcset); ++ if (__glibc_likely (mbcset != NULL)) ++ free_charset (mbcset); + #endif /* RE_ENABLE_I18N */ + return NULL; + } +diff --git a/posix/tst-regcomp-bracket-free.c b/posix/tst-regcomp-bracket-free.c +new file mode 100644 +index 0000000000..3c091d8c44 +--- /dev/null ++++ b/posix/tst-regcomp-bracket-free.c +@@ -0,0 +1,176 @@ ++/* Test regcomp bracket parsing with injected allocation failures (bug 33185). ++ Copyright (C) 2025 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++/* This test invokes regcomp multiple times, failing one memory ++ allocation in each call. The function call should fail with ++ REG_ESPACE (or succeed if it can recover from the allocation ++ failure). Previously, there was double-free bug. */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++/* Data structure allocated via MAP_SHARED, so that writes from the ++ subprocess are visible. */ ++struct shared_data ++{ ++ /* Number of tracked allocations performed so far. */ ++ volatile unsigned int allocation_count; ++ ++ /* If this number is reached, one allocation fails. */ ++ volatile unsigned int failing_allocation; ++ ++ /* The subprocess stores the expected name here. */ ++ char name[100]; ++}; ++ ++/* Allocation count in shared mapping. */ ++static struct shared_data *shared; ++ ++/* Returns true if a failure should be injected for this allocation. */ ++static bool ++fail_this_allocation (void) ++{ ++ if (shared != NULL) ++ { ++ unsigned int count = shared->allocation_count; ++ shared->allocation_count = count + 1; ++ return count == shared->failing_allocation; ++ } ++ else ++ return false; ++} ++ ++/* Failure-injecting wrappers for allocation functions used by glibc. */ ++ ++void * ++malloc (size_t size) ++{ ++ if (fail_this_allocation ()) ++ { ++ errno = ENOMEM; ++ return NULL; ++ } ++ extern __typeof (malloc) __libc_malloc; ++ return __libc_malloc (size); ++} ++ ++void * ++calloc (size_t a, size_t b) ++{ ++ if (fail_this_allocation ()) ++ { ++ errno = ENOMEM; ++ return NULL; ++ } ++ extern __typeof (calloc) __libc_calloc; ++ return __libc_calloc (a, b); ++} ++ ++void * ++realloc (void *ptr, size_t size) ++{ ++ if (fail_this_allocation ()) ++ { ++ errno = ENOMEM; ++ return NULL; ++ } ++ extern __typeof (realloc) __libc_realloc; ++ return __libc_realloc (ptr, size); ++} ++ ++/* No-op subprocess to verify that support_isolate_in_subprocess does ++ not perform any heap allocations. */ ++static void ++no_op (void *ignored) ++{ ++} ++ ++/* Perform a regcomp call in a subprocess. Used to count its ++ allocations. */ ++static void ++initialize (void *regexp1) ++{ ++ const char *regexp = regexp1; ++ ++ shared->allocation_count = 0; ++ ++ regex_t reg; ++ TEST_COMPARE (regcomp (®, regexp, 0), 0); ++} ++ ++/* Perform regcomp in a subprocess with fault injection. */ ++static void ++test_in_subprocess (void *regexp1) ++{ ++ const char *regexp = regexp1; ++ unsigned int inject_at = shared->failing_allocation; ++ ++ regex_t reg; ++ int ret = regcomp (®, regexp, 0); ++ ++ if (ret != 0) ++ { ++ TEST_COMPARE (ret, REG_ESPACE); ++ printf ("info: allocation %u failure results in return value %d," ++ " error %s (%d)\n", ++ inject_at, ret, strerrorname_np (errno), errno); ++ } ++} ++ ++static int ++do_test (void) ++{ ++ char regexp[] = "[:alpha:]"; ++ ++ shared = support_shared_allocate (sizeof (*shared)); ++ ++ /* Disable fault injection. */ ++ shared->failing_allocation = ~0U; ++ ++ support_isolate_in_subprocess (no_op, NULL); ++ TEST_COMPARE (shared->allocation_count, 0); ++ ++ support_isolate_in_subprocess (initialize, regexp); ++ ++ /* The number of allocations in the successful case, plus some ++ slack. Once the number of expected allocations is exceeded, ++ injecting further failures does not make a difference. */ ++ unsigned int maximum_allocation_count = shared->allocation_count; ++ printf ("info: successful call performs %u allocations\n", ++ maximum_allocation_count); ++ maximum_allocation_count += 10; ++ ++ for (unsigned int inject_at = 0; inject_at <= maximum_allocation_count; ++ ++inject_at) ++ { ++ shared->allocation_count = 0; ++ shared->failing_allocation = inject_at; ++ support_isolate_in_subprocess (test_in_subprocess, regexp); ++ } ++ ++ support_shared_free (shared); ++ ++ return 0; ++} ++ ++#include diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 13dc59fd2a7a3..a35e5085f87c9 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation ( /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. $ git fetch --all -p && git checkout origin/release/2.40/master && git describe - glibc-2.40-66-g7d4b6bcae9 + glibc-2.40-142-g2eb180377b $ git show --minimal --reverse glibc-2.40.. ':!ADVISORIES' > 2.40-master.patch To compare the archive contents zdiff can be used. @@ -160,6 +160,15 @@ stdenv.mkDerivation ( -#define LIBIDN2_SONAME "libidn2.so.0" +#define LIBIDN2_SONAME "${lib.getLib libidn2}/lib/libidn2.so.0" EOF + '' + # For some reason, with gcc-15 build fails with the following error: + # + # zic.c:3767:1: note: did you mean to specify it after ')' following function parameters? + # zic.c:3781:1: error: standard 'reproducible' attribute can only be applied to function declarators or type specifiers with function type [] + + '' + for path in timezone/zic.c timezone/zdump.c ; do + substituteInPlace $path --replace-fail "ATTRIBUTE_REPRODUCIBLE" "" + done ''; configureFlags = [ diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index ee787dc45ef04..c5bcf1a4e5692 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -47,6 +47,12 @@ let configureFlags = [ "--with-pic" + # gcc-15 have c23 standard by default, where "void foo()" now means "void foo(void)". + # + # The "configure" script relies on c17 and below semantics for "long long + # reliability test 1" (defined in aclocal.m4) + "CFLAGS=-std=c99" + (lib.enableFeature cxx "cxx") # Build a "fat binary", with routines for several sub-architectures # (x86), except on Solaris where some tests crash with "Memory fault". diff --git a/pkgs/development/libraries/gssdp/1.6.nix b/pkgs/development/libraries/gssdp/1.6.nix index aef4e6ff3666d..995f6c5a449dc 100644 --- a/pkgs/development/libraries/gssdp/1.6.nix +++ b/pkgs/development/libraries/gssdp/1.6.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gssdp"; - version = "1.6.3"; + version = "1.6.4"; outputs = [ "out" @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor finalAttrs.version}/gssdp-${finalAttrs.version}.tar.xz"; - sha256 = "L+21r9sizxTVSYo5p3PKiXiKJQ/PcBGHg9+CHh8/NEY="; + hash = "sha256-/5f9+39WHT5oE7T2ohRSWefC7/Q8wOY/P9Ax0LYmYDI="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 8c63958a4f423..567ae3ab2648b 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gst-plugins-bad"; - version = "1.26.0"; + version = "1.26.3"; outputs = [ "out" @@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${finalAttrs.version}.tar.xz"; - hash = "sha256-+Ch6hMX2Y2ilpQ2l+WmZSgLEfyAiD/4coxVBk+Za8hY="; + hash = "sha256-lcSNrK8UJ29OWV9MvKlLPP6/wiKF52XiqlbQpydddWE="; }; patches = [ @@ -132,14 +132,6 @@ stdenv.mkDerivation (finalAttrs: { (replaceVars ./fix-paths.patch { inherit (addDriverRunpath) driverLink; }) - - # Fix Requires in gstreamer-analytics-1.0.pc - # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8661 - (fetchpatch { - url = "https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/bc93bbf5c87ec994ea136bb40accc09dfa35ae98.patch"; - stripLen = 2; - hash = "sha256-QQDpHe363iPxTuthITRbLUKaAXS2F9s5zfCn/ps14WE="; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 86e772e239b43..e226443bc0b6b 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gst-plugins-base"; - version = "1.26.0"; + version = "1.26.3"; outputs = [ "out" @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${finalAttrs.version}.tar.xz"; - hash = "sha256-4jGJ++0uxIZpA4LRBVwZ7q9arj6V4ldvxMiE2WqQ5p4="; + hash = "sha256-Tvn57wkCUwjOIg4t0iqJ5MmS2MpxuWjjxwrwY07CeTM="; }; strictDeps = true; diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 3f3778fd7cc0e..e7b3829d5146e 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -40,7 +40,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gstreamer"; - version = "1.26.0"; + version = "1.26.3"; outputs = [ "bin" @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${finalAttrs.version}.tar.xz"; - hash = "sha256-Gy7kAoAQwlt3bv+nw5bH4+GGG2C5QX5Bb0kUq83/J58="; + hash = "sha256-3GYWAyISk9zMdAhiQl61T7vtYPsp0IyAHUQKaj/4JoA="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix index b298491bb1efe..376a5afca3dae 100644 --- a/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gst-devtools"; - version = "1.26.0"; + version = "1.26.3"; outputs = [ "out" @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${finalAttrs.version}.tar.xz"; - hash = "sha256-7/M9fcKSuwdKJ4jqiHtigzmP/e+vpJ+30I7+ZlimVkg="; + hash = "sha256-T94Zw8FEg0+MsFwso/FLOlDTlbrSA9F/mKbnDBZy8ro="; }; cargoDeps = rustPlatform.fetchCargoVendor { @@ -47,17 +47,10 @@ stdenv.mkDerivation (finalAttrs: { cargoRoot ; name = "gst-devtools-${finalAttrs.version}"; - hash = "sha256-GLxevEwoTgS7kmDlul0AA2wIFRY7js8Ij4UIu1ZQf8I="; + hash = "sha256-AgxvFMq37a8NuOHY1QIUGOAo8aSBt4HVeSCHNUYa1tQ="; }; patches = [ - # Fix Requires in gstreamer-validate-1.0.pc - # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8661 - (fetchpatch { - url = "https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/13c0f44dd546cd058c39f32101a361b3a7746f73.patch"; - stripLen = 2; - hash = "sha256-CpBFTmdn+VO6ZeNe6NZR6ELvakZqQdaF3o3G5TSDuUU="; - }) # dots-viewer: sort static files # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/9208 (fetchpatch { diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index a03b18bb059ff..73b11e941ac8c 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gst-editing-services"; - version = "1.26.0"; + version = "1.26.3"; outputs = [ "out" @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/gst-editing-services/gst-editing-services-${finalAttrs.version}.tar.xz"; - hash = "sha256-r1sn9ck2MCc3IQDKwLrxkFUoBynfHMWN1ORU72mOsf8="; + hash = "sha256-3SCpPSw0aLahAk/wySeIayGTe9E7jLjxdfhjc2DRb9I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 29c3bc5e71b0d..5e91e4a1b9df3 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -74,7 +74,7 @@ assert raspiCameraSupport -> hostSupportsRaspiCamera; stdenv.mkDerivation (finalAttrs: { pname = "gst-plugins-good"; - version = "1.26.0"; + version = "1.26.3"; outputs = [ "out" @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${finalAttrs.version}.tar.xz"; - hash = "sha256-nhjxOe9prQhnwt+7j+HRc2123xGqyD9g6NOtseLq8Ds="; + hash = "sha256-/k7JZw7f5rseXycWmuFFtawt0hismL2CUcj7pBrTPFM="; }; patches = [ @@ -91,13 +91,6 @@ stdenv.mkDerivation (finalAttrs: { (replaceVars ./souploader.diff { nixLibSoup3Path = "${lib.getLib libsoup_3}/lib"; }) - - (fetchpatch { - name = "musl.patch"; - url = "https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/dd1fc2b7931f5789815e17dda2ef7c31b9fba563.patch"; - stripLen = 2; - hash = "sha256-m2h1F6M2hzw3HxizmCyEEqkUQe0ccLWFBvgT2f+GjNE="; - }) ]; strictDeps = true; diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index c1bb742b616d8..21cc1d71efa07 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gst-libav"; - version = "1.26.0"; + version = "1.26.3"; outputs = [ "out" @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${finalAttrs.version}.tar.xz"; - hash = "sha256-cHqLaH/1/dzuWwJBXi7JtxtKxE0Leuw7R3Nkzuy/Hs8="; + hash = "sha256-Otp+UKO5uLo+QFsUxAIeJfuxA3n3fSzkkKoWUj7Sck0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix index 11903735d124c..d1f33e7951d89 100644 --- a/pkgs/development/libraries/gstreamer/rs/default.nix +++ b/pkgs/development/libraries/gstreamer/rs/default.nix @@ -133,9 +133,8 @@ let patches = (oldAttrs.patches or [ ]) ++ [ (fetchpatch { name = "cargo-c-test-rlib-fix.patch"; - url = "https://github.com/lu-zero/cargo-c/commit/8421f2da07cd066d2ae8afbb027760f76dc9ee6c.diff"; - hash = "sha256-eZSR4DKSbS5HPpb9Kw8mM2ZWg7Y92gZQcaXUEu1WNj0="; - revert = true; + url = "https://github.com/lu-zero/cargo-c/commit/dd02009d965cbd664785149a90d702251de747b3.diff"; + hash = "sha256-Az0WFF9fc5+igcV8C/QFhq5GE4PAyGEO84D9ECxx3v0="; }) ]; }); @@ -147,7 +146,7 @@ assert lib.assertMsg (invalidPlugins == [ ]) stdenv.mkDerivation (finalAttrs: { pname = "gst-plugins-rs"; - version = "0.13.5"; + version = "0.14.1"; outputs = [ "out" @@ -159,7 +158,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "gstreamer"; repo = "gst-plugins-rs"; rev = finalAttrs.version; - hash = "sha256-5jR/YLCBeFnB0+O2OOCLBEKwikiQ5e+SbOeQCijnd8Q="; + hash = "sha256-gCT/ZcXR9VePXYtEENXxgBNvA84KT1OYUR8kSyLBzrI="; # TODO: temporary workaround for case-insensitivity problems with color-name crate - https://github.com/annymosse/color-name/pull/2 postFetch = '' sedSearch="$(cat <<\EOF | sed -ze 's/\n/\\n/g' @@ -184,7 +183,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src patches; name = "gst-plugins-rs-${finalAttrs.version}"; - hash = "sha256-ErQ5Um0e7bWhzDErEN9vmSsKTpTAm4MA5PZ7lworVKU="; + hash = "sha256-sX3P5qrG0M/vJkvzvJGzv4fcMn6FvrLPOUh++vKJ/gY="; }; patches = [ @@ -193,12 +192,6 @@ stdenv.mkDerivation (finalAttrs: { # TODO: Remove in 0.14, it has been replaced by a different fix: # https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/2140 ./ignore-network-tests.patch - - # Fix reqwest tests failing due to broken TLS lookup in native-tls dependency. - # https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/675 - # Cannot be upstreamed due to MSRV bump in native-tls: - # https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/2142 - ./reqwest-init-tls.patch ]; strictDeps = true; diff --git a/pkgs/development/libraries/gstreamer/rs/reqwest-init-tls.patch b/pkgs/development/libraries/gstreamer/rs/reqwest-init-tls.patch deleted file mode 100644 index 24764673bec0e..0000000000000 --- a/pkgs/development/libraries/gstreamer/rs/reqwest-init-tls.patch +++ /dev/null @@ -1,85 +0,0 @@ -The reqwest tests fail due to reqwest Client initialization. -Bisected the issue to https://github.com/sfackler/rust-native-tls/compare/v0.2.12...v0.2.13 bump -in https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/commit/6d5d9753f4a28be350dc657c08a9ecc7f13b922a -the upcoming version of native-tls fixes that so let’s bump to that. -https://github.com/sfackler/rust-native-tls/compare/v0.2.13...v0.2.14 - -diff --git a/Cargo.lock b/Cargo.lock -index 244256cd..24f0c607 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1700,7 +1700,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" - dependencies = [ - "libc", -- "windows-sys 0.59.0", -+ "windows-sys 0.52.0", - ] - - [[package]] -@@ -2149,7 +2149,7 @@ dependencies = [ - "gobject-sys", - "libc", - "system-deps 7.0.3", -- "windows-sys 0.59.0", -+ "windows-sys 0.52.0", - ] - - [[package]] -@@ -4407,7 +4407,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" - dependencies = [ - "cfg-if", -- "windows-targets 0.52.6", -+ "windows-targets 0.48.5", - ] - - [[package]] -@@ -4791,9 +4791,9 @@ dependencies = [ - - [[package]] - name = "native-tls" --version = "0.2.13" -+version = "0.2.14" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0dab59f8e050d5df8e4dd87d9206fb6f65a483e20ac9fda365ade4fab353196c" -+checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e" - dependencies = [ - "libc", - "log", -@@ -5572,7 +5572,7 @@ dependencies = [ - "once_cell", - "socket2", - "tracing", -- "windows-sys 0.59.0", -+ "windows-sys 0.52.0", - ] - - [[package]] -@@ -6017,7 +6017,7 @@ dependencies = [ - "errno", - "libc", - "linux-raw-sys", -- "windows-sys 0.59.0", -+ "windows-sys 0.52.0", - ] - - [[package]] -@@ -6702,7 +6702,7 @@ dependencies = [ - "getrandom 0.3.1", - "once_cell", - "rustix", -- "windows-sys 0.59.0", -+ "windows-sys 0.52.0", - ] - - [[package]] -@@ -7523,7 +7523,7 @@ version = "0.1.9" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" - dependencies = [ -- "windows-sys 0.59.0", -+ "windows-sys 0.48.0", - ] - - [[package]] diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index befafdb2329c2..ab01ff0315b10 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gst-rtsp-server"; - version = "1.26.0"; + version = "1.26.3"; outputs = [ "out" @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-${finalAttrs.version}.tar.xz"; - hash = "sha256-6YPAOUluP3XjlpZVTOdNtBIOJGXeF6ocw3FgVo6bQLw="; + hash = "sha256-QV6KU6mER4l3DdTxFqwuOkoz3kJnPFeswlxboPRAb8U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 2e86309a51c53..9a3879867d83a 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gst-plugins-ugly"; - version = "1.26.0"; + version = "1.26.3"; outputs = [ "out" @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${finalAttrs.version}.tar.xz"; - hash = "sha256-qGtRyEVKgTEghIyANCHzJ9jAeqvK5GHgWXzEk5jA/N4="; + hash = "sha256-QX9e6JX3NKwDQbNxnBdf/xa0yOrogG4p4XCzvLPZ26U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index 0fd9fb113c29a..00978658919bf 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gstreamer-vaapi"; - version = "1.26.0"; + version = "1.26.3"; outputs = [ "out" @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-${finalAttrs.version}.tar.xz"; - hash = "sha256-Vzkx1FX1qW9j23yNNdUTIrjSh4FujGp32Ez7ufoTUfE="; + hash = "sha256-LWQ/vRQgKX2lpNaUXRHwpbT4L+6lTqauyTaNQpldiwM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gupnp/1.6.nix b/pkgs/development/libraries/gupnp/1.6.nix index 408305542cf5a..0aeca4241ccc6 100644 --- a/pkgs/development/libraries/gupnp/1.6.nix +++ b/pkgs/development/libraries/gupnp/1.6.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gupnp"; - version = "1.6.8"; + version = "1.6.9"; outputs = [ "out" @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor finalAttrs.version}/gupnp-${finalAttrs.version}.tar.xz"; - hash = "sha256-cKADzr1oV3KT+z5q9J/5AiA7+HaLL8XWUd3B8PoeEek="; + hash = "sha256-Lttu42E1WOYvU4c1NoruJxUbfgnU4uLFFgaDPagBhps="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/libmicrohttpd/1.0.nix b/pkgs/development/libraries/libmicrohttpd/1.0.nix index 16a4f2ed884e4..944749f281c0e 100644 --- a/pkgs/development/libraries/libmicrohttpd/1.0.nix +++ b/pkgs/development/libraries/libmicrohttpd/1.0.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl }: callPackage ./generic.nix (rec { - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz"; - hash = "sha256-qJ4J/JtN403eGfT8tPqqHOECmbmQjbETK7+h3keIK5Q="; + hash = "sha256-3zJPzQg0F12rB0gxM5Atl3SmBb+imAJfaYgyiP0gqMc="; }; }) diff --git a/pkgs/development/libraries/libmicrohttpd/generic.nix b/pkgs/development/libraries/libmicrohttpd/generic.nix index 4ceb9afe9265f..ea56e38c4fbf5 100644 --- a/pkgs/development/libraries/libmicrohttpd/generic.nix +++ b/pkgs/development/libraries/libmicrohttpd/generic.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation (finalAttrs: { libintl ]; + enableParallelBuilding = true; + preCheck = '' # Since `localhost' can't be resolved in a chroot, work around it. sed -i -e 's/localhost/127.0.0.1/g' src/test*/*.[ch] diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 3448fa03fa81b..d6a03867000be 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -10,21 +10,21 @@ assert zlib != null; let - patchVersion = "1.6.47"; + patchVersion = "1.6.49"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz"; - hash = "sha256-Wwhvr+fhJ4SyhpPhmlvPaGd6jFKUcRVxKlbD0SOUT28="; + hash = "sha256-Zmdtgn4y7hc0ezmjU+kbW4sFR7RArrE/AjzU+irXjTI="; }; whenPatched = lib.optionalString apngSupport; in stdenv.mkDerivation (finalAttrs: { pname = "libpng" + whenPatched "-apng"; - version = "1.6.47"; + version = "1.6.49"; src = fetchurl { url = "mirror://sourceforge/libpng/libpng-${finalAttrs.version}.tar.xz"; - hash = "sha256-shPLOB+7EXUye9cIp3qrcIoFrd57RxvCZ70VrJmJNjE="; + hash = "sha256-QxgqpI451ksatOxrcas+kQtn7tOg//N3fPjPQNbvcCQ="; }; postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1" diff --git a/pkgs/development/libraries/libxml2/CVE-2025-6021.patch b/pkgs/development/libraries/libxml2/CVE-2025-6021.patch new file mode 100644 index 0000000000000..7d20a17c70381 --- /dev/null +++ b/pkgs/development/libraries/libxml2/CVE-2025-6021.patch @@ -0,0 +1,40 @@ +diff --git a/tree.c b/tree.c +index f097cf87..4d966ec9 100644 +--- a/tree.c ++++ b/tree.c +@@ -47,6 +47,10 @@ + #include "private/error.h" + #include "private/tree.h" + ++#ifndef SIZE_MAX ++ #define SIZE_MAX ((size_t) -1) ++#endif ++ + int __xmlRegisterCallbacks = 0; + + /************************************************************************ +@@ -167,10 +168,10 @@ xmlGetParameterEntityFromDtd(const xmlDtd *dtd, const xmlChar *name) { + xmlChar * + xmlBuildQName(const xmlChar *ncname, const xmlChar *prefix, + xmlChar *memory, int len) { +- int lenn, lenp; ++ size_t lenn, lenp; + xmlChar *ret; + +- if (ncname == NULL) return(NULL); ++ if ((ncname == NULL) || (len < 0)) return(NULL); + if (prefix == NULL) return((xmlChar *) ncname); + + #ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION +@@ -181,8 +182,10 @@ xmlBuildQName(const xmlChar *ncname, const xmlChar *prefix, + + lenn = strlen((char *) ncname); + lenp = strlen((char *) prefix); ++ if (lenn >= SIZE_MAX - lenp - 1) ++ return(NULL); + +- if ((memory == NULL) || (len < lenn + lenp + 2)) { ++ if ((memory == NULL) || ((size_t) len < lenn + lenp + 2)) { + ret = (xmlChar *) xmlMallocAtomic(lenn + lenp + 2); + if (ret == NULL) + return(NULL); diff --git a/pkgs/development/libraries/libxml2/CVE-2025-6170.patch b/pkgs/development/libraries/libxml2/CVE-2025-6170.patch new file mode 100644 index 0000000000000..b66f24e305e0d --- /dev/null +++ b/pkgs/development/libraries/libxml2/CVE-2025-6170.patch @@ -0,0 +1,112 @@ +diff --git a/result/scripts/long_command b/result/scripts/long_command +new file mode 100644 +index 000000000..e6f00708b +--- /dev/null ++++ b/result/scripts/long_command +@@ -0,0 +1,8 @@ ++/ > b > b > Object is a Node Set : ++Set contains 1 nodes: ++1 ELEMENT a:c ++b > Unknown command This_is_a_really_long_command_string_designed_to_test_the_limits_of_the_memory_that_stores_the_comm ++b > b > Unknown command ess_currents_of_time_and_existence ++b > ++Navigating_the_labyrinthine_corridors_of_human_cognition_one_often_encounters_the_perplexing_paradox_that_the_more_we_delve_into_the_intricate_dance_of_neural_pathways_and_synaptic_firings_the_further_we_seem_to_stray_from_a_truly_holistic_understanding_of_consciousness_a_phenomenon_that_remains_as_elusive_as_a_moonbeam_caught_in_a_spiderweb_yet_undeniably_shapes_every_fleeting_thought_every_prof ++b > +\ No newline at end of file +diff --git a/debugXML.c b/debugXML.c +index ed56b0f8..aeeea3c0 100644 +--- a/debugXML.c ++++ b/debugXML.c +@@ -2780,6 +2780,10 @@ xmlShellPwd(xmlShellCtxtPtr ctxt ATTRIBUTE_UNUSED, char *buffer, + return (0); + } + ++#define MAX_PROMPT_SIZE 500 ++#define MAX_ARG_SIZE 400 ++#define MAX_COMMAND_SIZE 100 ++ + /** + * xmlShell: + * @doc: the initial document +@@ -2795,10 +2795,10 @@ void + xmlShell(xmlDocPtr doc, const char *filename, xmlShellReadlineFunc input, + FILE * output) + { +- char prompt[500] = "/ > "; ++ char prompt[MAX_PROMPT_SIZE] = "/ > "; + char *cmdline = NULL, *cur; +- char command[100]; +- char arg[400]; ++ char command[MAX_COMMAND_SIZE]; ++ char arg[MAX_ARG_SIZE]; + int i; + xmlShellCtxtPtr ctxt; + xmlXPathObjectPtr list; +@@ -2856,7 +2856,8 @@ xmlShell(xmlDocPtr doc, const char *filename, xmlShellReadlineFunc input, + cur++; + i = 0; + while ((*cur != ' ') && (*cur != '\t') && +- (*cur != '\n') && (*cur != '\r')) { ++ (*cur != '\n') && (*cur != '\r') && ++ (i < (MAX_COMMAND_SIZE - 1))) { + if (*cur == 0) + break; + command[i++] = *cur++; +@@ -2871,7 +2872,7 @@ xmlShell(xmlDocPtr doc, const char *filename, xmlShellReadlineFunc input, + while ((*cur == ' ') || (*cur == '\t')) + cur++; + i = 0; +- while ((*cur != '\n') && (*cur != '\r') && (*cur != 0)) { ++ while ((*cur != '\n') && (*cur != '\r') && (*cur != 0) && (i < (MAX_ARG_SIZE-1))) { + if (*cur == 0) + break; + arg[i++] = *cur++; +diff --git a/xmllint.c b/xmllint.c +index c6273477..3d90272c 100644 +--- a/xmllint.c ++++ b/xmllint.c +@@ -724,6 +724,9 @@ xmlHTMLValidityWarning(void *ctx, const char *msg, ...) + ************************************************************************/ + #ifdef LIBXML_DEBUG_ENABLED + #ifdef LIBXML_XPATH_ENABLED ++ ++#define MAX_PROMPT_SIZE 500 ++ + /** + * xmlShellReadline: + * @prompt: the prompt value +@@ -754,9 +754,9 @@ xmlShellReadline(char *prompt) { + if (prompt != NULL) + fprintf(stdout, "%s", prompt); + fflush(stdout); +- if (!fgets(line_read, 500, stdin)) ++ if (!fgets(line_read, MAX_PROMPT_SIZE, stdin)) + return(NULL); +- line_read[500] = 0; ++ line_read[MAX_PROMPT_SIZE] = 0; + len = strlen(line_read); + ret = (char *) malloc(len + 1); + if (ret != NULL) { +-- +diff --git a/test/scripts/long_command.script b/test/scripts/long_command.script +new file mode 100644 +index 000000000..00f6df09f +--- /dev/null ++++ b/test/scripts/long_command.script +@@ -0,0 +1,6 @@ ++cd a/b ++set ++xpath //*[namespace-uri()="foo"] ++This_is_a_really_long_command_string_designed_to_test_the_limits_of_the_memory_that_stores_the_command_please_dont_crash foo ++set Navigating_the_labyrinthine_corridors_of_human_cognition_one_often_encounters_the_perplexing_paradox_that_the_more_we_delve_into_the_intricate_dance_of_neural_pathways_and_synaptic_firings_the_further_we_seem_to_stray_from_a_truly_holistic_understanding_of_consciousness_a_phenomenon_that_remains_as_elusive_as_a_moonbeam_caught_in_a_spiderweb_yet_undeniably_shapes_every_fleeting_thought_every_profound_emotion_and_every_grand_aspiration_that_propels_our_species_ever_onward_through_the_relentless_currents_of_time_and_existence ++save - +diff --git a/test/scripts/long_command.xml b/test/scripts/long_command.xml +new file mode 100644 +index 000000000..1ba44016e +--- /dev/null ++++ b/test/scripts/long_command.xml +@@ -0,0 +1 @@ ++ +-- +GitLab + diff --git a/pkgs/development/libraries/libxml2/common.nix b/pkgs/development/libraries/libxml2/common.nix new file mode 100644 index 0000000000000..eb16734eede45 --- /dev/null +++ b/pkgs/development/libraries/libxml2/common.nix @@ -0,0 +1,164 @@ +{ + stdenv, + darwin, + lib, + pkg-config, + autoreconfHook, + python3, + ncurses, + findXMLCatalogs, + libiconv, + # Python limits cross-compilation to an allowlist of host OSes. + # https://github.com/python/cpython/blob/dfad678d7024ab86d265d84ed45999e031a03691/configure.ac#L534-L562 + pythonSupport ? + enableShared + && ( + stdenv.hostPlatform == stdenv.buildPlatform + || stdenv.hostPlatform.isCygwin + || stdenv.hostPlatform.isLinux + || stdenv.hostPlatform.isWasi + ), + icuSupport ? false, + icu, + zlibSupport ? false, + zlib, + enableShared ? !stdenv.hostPlatform.isMinGW && !stdenv.hostPlatform.isStatic, + enableStatic ? !enableShared, + gnome, + testers, + enableHttp ? false, + + version, + extraPatches ? [ ], + src, + extraMeta ? { }, + freezeUpdateScript ? false, +}: + +let + # libxml2 is a dependency of xcbuild. Avoid an infinite recursion by using a bootstrap stdenv + # that does not propagate xcrun. + stdenv' = if stdenv.hostPlatform.isDarwin then darwin.bootstrapStdenv else stdenv; +in +stdenv'.mkDerivation (finalAttrs: { + inherit + version + src + ; + + pname = "libxml2"; + + outputs = [ + "bin" + "dev" + "out" + "devdoc" + ] + ++ lib.optional pythonSupport "py" + ++ lib.optional (enableStatic && enableShared) "static"; + outputMan = "bin"; + + patches = [ + # Unmerged ABI-breaking patch required to fix the following security issues: + # - https://gitlab.gnome.org/GNOME/libxslt/-/issues/139 + # - https://gitlab.gnome.org/GNOME/libxslt/-/issues/140 + # See also https://gitlab.gnome.org/GNOME/libxml2/-/issues/906 + # Source: https://github.com/chromium/chromium/blob/4fb4ae8ce3daa399c3d8ca67f2dfb9deffcc7007/third_party/libxml/chromium/xml-attr-extra.patch + ./xml-attr-extra.patch + ] + ++ extraPatches; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + autoreconfHook + ]; + + buildInputs = + lib.optionals pythonSupport [ + ncurses + python3 + ] + ++ lib.optionals zlibSupport [ + zlib + ]; + + propagatedBuildInputs = [ + findXMLCatalogs + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isMinGW) [ + libiconv + ] + ++ lib.optionals icuSupport [ + icu + ]; + + configureFlags = [ + "--exec-prefix=${placeholder "dev"}" + (lib.enableFeature enableStatic "static") + (lib.enableFeature enableShared "shared") + (lib.withFeature icuSupport "icu") + (lib.withFeature pythonSupport "python") + (lib.optionalString pythonSupport "PYTHON=${python3.pythonOnBuildForHost.interpreter}") + ] + # avoid rebuilds, can be merged into list in version bumps + ++ lib.optional enableHttp "--with-http" + ++ lib.optional zlibSupport "--with-zlib"; + + installFlags = lib.optionals pythonSupport [ + "pythondir=\"${placeholder "py"}/${python3.sitePackages}\"" + "pyexecdir=\"${placeholder "py"}/${python3.sitePackages}\"" + ]; + + enableParallelBuilding = true; + + doCheck = (stdenv.hostPlatform == stdenv.buildPlatform) && stdenv.hostPlatform.libc != "musl"; + preCheck = lib.optional stdenv.hostPlatform.isDarwin '' + export DYLD_LIBRARY_PATH="$PWD/.libs:$DYLD_LIBRARY_PATH" + ''; + + preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' + MACOSX_DEPLOYMENT_TARGET=10.16 + ''; + + preInstall = lib.optionalString pythonSupport '' + substituteInPlace python/libxml2mod.la --replace-fail "$dev/${python3.sitePackages}" "$py/${python3.sitePackages}" + ''; + + postFixup = '' + moveToOutput bin/xml2-config "$dev" + moveToOutput lib/xml2Conf.sh "$dev" + '' + + lib.optionalString (enableStatic && enableShared) '' + moveToOutput lib/libxml2.a "$static" + ''; + + passthru = { + inherit pythonSupport; + + updateScript = gnome.updateScript { + packageName = "libxml2"; + versionPolicy = "none"; + freeze = freezeUpdateScript; + }; + tests = { + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + cmake-config = testers.hasCmakeConfigModules { + moduleNames = [ "LibXml2" ]; + package = finalAttrs.finalPackage; + }; + }; + }; + + meta = { + homepage = "https://gitlab.gnome.org/GNOME/libxml2"; + description = "XML parsing library for C"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + pkgConfigModules = [ "libxml-2.0" ]; + } + // extraMeta; +}) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index f85c37e1b940d..52889102febc9 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,165 +1,62 @@ { - stdenv, lib, + callPackage, fetchFromGitLab, - pkg-config, - autoreconfHook, - libintl, - python, - gettext, - ncurses, - findXMLCatalogs, - libiconv, - # Python limits cross-compilation to an allowlist of host OSes. - # https://github.com/python/cpython/blob/dfad678d7024ab86d265d84ed45999e031a03691/configure.ac#L534-L562 - pythonSupport ? - enableShared - && ( - stdenv.hostPlatform == stdenv.buildPlatform - || stdenv.hostPlatform.isCygwin - || stdenv.hostPlatform.isLinux - || stdenv.hostPlatform.isWasi - ), - icuSupport ? false, - icu, - zlibSupport ? false, - zlib, - enableShared ? !stdenv.hostPlatform.isMinGW && !stdenv.hostPlatform.isStatic, - enableStatic ? !enableShared, - gnome, - testers, - enableHttp ? false, + fetchpatch2, }: -stdenv.mkDerivation (finalAttrs: { - pname = "libxml2"; - version = "2.14.4-unstable-2025-06-20"; - - outputs = [ - "bin" - "dev" - "out" - "devdoc" - ] - ++ lib.optional pythonSupport "py" - ++ lib.optional (enableStatic && enableShared) "static"; - outputMan = "bin"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = "libxml2"; - rev = "356542324fa439de544b5e419b91ae68d42c306c"; # some bugfixes right behind 2.14.4 - hash = "sha256-0jo08ECX+oP7Ekjgw3ZgOh+fSiNjlbjoZc4p3PqomJA="; - }; - - patches = [ - # Unmerged ABI-breaking patch required to fix the following security issues: - # - https://gitlab.gnome.org/GNOME/libxslt/-/issues/139 - # - https://gitlab.gnome.org/GNOME/libxslt/-/issues/140 - # See also https://gitlab.gnome.org/GNOME/libxml2/-/issues/906 - # Source: https://github.com/chromium/chromium/blob/4fb4ae8ce3daa399c3d8ca67f2dfb9deffcc7007/third_party/libxml/chromium/xml-attr-extra.patch - ./xml-attr-extra.patch - ]; - - strictDeps = true; - - nativeBuildInputs = [ - pkg-config - autoreconfHook - ]; - - buildInputs = - lib.optionals pythonSupport [ - python - ] - ++ lib.optionals (pythonSupport && python ? isPy2 && python.isPy2) [ - gettext - ] - ++ lib.optionals (pythonSupport && python ? isPy3 && python.isPy3) [ - ncurses - ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && pythonSupport && python ? isPy2 && python.isPy2) [ - libintl - ] - ++ lib.optionals zlibSupport [ - zlib - ]; - - propagatedBuildInputs = [ - findXMLCatalogs - ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isMinGW) [ - libiconv - ] - ++ lib.optionals icuSupport [ - icu - ]; - - configureFlags = [ - "--exec-prefix=${placeholder "dev"}" - (lib.enableFeature enableStatic "static") - (lib.enableFeature enableShared "shared") - (lib.withFeature icuSupport "icu") - (lib.withFeature pythonSupport "python") - (lib.optionalString pythonSupport "PYTHON=${python.pythonOnBuildForHost.interpreter}") - ] - # avoid rebuilds, can be merged into list in version bumps - ++ lib.optional enableHttp "--with-http" - ++ lib.optional zlibSupport "--with-zlib"; - - installFlags = lib.optionals pythonSupport [ - "pythondir=\"${placeholder "py"}/${python.sitePackages}\"" - "pyexecdir=\"${placeholder "py"}/${python.sitePackages}\"" - ]; - - enableParallelBuilding = true; - - doCheck = (stdenv.hostPlatform == stdenv.buildPlatform) && stdenv.hostPlatform.libc != "musl"; - preCheck = lib.optional stdenv.hostPlatform.isDarwin '' - export DYLD_LIBRARY_PATH="$PWD/.libs:$DYLD_LIBRARY_PATH" - ''; - - preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' - MACOSX_DEPLOYMENT_TARGET=10.16 - ''; - - preInstall = lib.optionalString pythonSupport '' - substituteInPlace python/libxml2mod.la --replace-fail "$dev/${python.sitePackages}" "$py/${python.sitePackages}" - ''; - - postFixup = '' - moveToOutput bin/xml2-config "$dev" - moveToOutput lib/xml2Conf.sh "$dev" - '' - + lib.optionalString (enableStatic && enableShared) '' - moveToOutput lib/libxml2.a "$static" - ''; - - passthru = { - inherit pythonSupport; - - updateScript = gnome.updateScript { - packageName = "libxml2"; - versionPolicy = "none"; +let + packages = { + libxml2_13 = callPackage ./common.nix { + version = "2.13.8"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "libxml2"; + tag = "v${packages.libxml2_13.version}"; + hash = "sha256-acemyYs1yRSTSLH7YCGxnQzrEDm8YPTK4HtisC36LsY="; + }; + extraPatches = [ + # same as upstream patch but fixed conflict and added required import: + # https://gitlab.gnome.org/GNOME/libxml2/-/commit/acbbeef9f5dcdcc901c5f3fa14d583ef8cfd22f0.diff + ./CVE-2025-6021.patch + (fetchpatch2 { + name = "CVE-2025-49794-49796.patch"; + url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/f7ebc65f05bffded58d1e1b2138eb124c2e44f21.patch"; + hash = "sha256-k+IGq6pbv9EA7o+uDocEAUqIammEjLj27Z+2RF5EMrs="; + }) + (fetchpatch2 { + name = "CVE-2025-49795.patch"; + url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/c24909ba2601848825b49a60f988222da3019667.patch"; + hash = "sha256-r7PYKr5cDDNNMtM3ogNLsucPFTwP/uoC7McijyLl4kU="; + excludes = [ "runtest.c" ]; # tests were rewritten in C and are on schematron for 2.13.x, meaning this does not apply + }) + # same as upstream, fixed conflicts + # https://gitlab.gnome.org/GNOME/libxml2/-/commit/c340e419505cf4bf1d9ed7019a87cc00ec200434 + ./CVE-2025-6170.patch + ]; + freezeUpdateScript = true; + extraMeta = { + maintainers = with lib.maintainers; [ + gepbird + ]; + }; }; - tests = { - pkg-config = testers.hasPkgConfigModules { - package = finalAttrs.finalPackage; + libxml2 = callPackage ./common.nix { + version = "2.14.5"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "libxml2"; + tag = "v${packages.libxml2.version}"; + hash = "sha256-vxKlw8Kz+fgUP6bhWG2+4346WJVzqG0QvPG/BT7RftQ="; }; - cmake-config = testers.hasCmakeConfigModules { - moduleNames = [ "LibXml2" ]; - package = finalAttrs.finalPackage; + extraMeta = { + maintainers = with lib.maintainers; [ + jtojnar + ]; }; }; }; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/GNOME/libxml2"; - description = "XML parsing library for C"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ jtojnar ]; - pkgConfigModules = [ "libxml-2.0" ]; - }; -}) +in +packages diff --git a/pkgs/development/libraries/mbedtls/3.nix b/pkgs/development/libraries/mbedtls/3.nix index e8c3908174ac3..05793b55d0703 100644 --- a/pkgs/development/libraries/mbedtls/3.nix +++ b/pkgs/development/libraries/mbedtls/3.nix @@ -1,10 +1,11 @@ { callPackage, fetchurl }: callPackage ./generic.nix { - version = "3.6.3"; - hash = "sha256-FJuezgVTxzLRz0Jzk2XnSnpO5sTc8q6QgzkCwlqQ+EU="; + version = "3.6.4"; + hash = "sha256-y5YqKtjW4IXyIZkoJvwCGC4scx0qdeV40rynHza4NUE="; + patches = [ - # Fixes the build with GCC 14. + # Fixes the build with GCC 14 on aarch64. # # See: # * diff --git a/pkgs/development/libraries/mypaint-brushes/1.0.nix b/pkgs/development/libraries/mypaint-brushes/1.0.nix index 885dd5e5137db..3a2a41f1eb85f 100644 --- a/pkgs/development/libraries/mypaint-brushes/1.0.nix +++ b/pkgs/development/libraries/mypaint-brushes/1.0.nix @@ -24,7 +24,15 @@ stdenv.mkDerivation rec { pkg-config ]; - preConfigure = "./autogen.sh"; + # don't rely on rigid autotools versions, instead preload whatever is in $PATH in the build environment. + # mypaint-brushes1 1.3.1 only officially supports autotools up to 1.16, + # unstable git versions support up to autotools 1.17. + # However, we are now on autotools 1.18, so this would break. + preConfigure = '' + export AUTOMAKE=automake + export ACLOCAL=aclocal + ./autogen.sh + ''; meta = with lib; { homepage = "http://mypaint.org/"; diff --git a/pkgs/development/libraries/ncurses/1001-ncurses-Support-gnuabielfv1-2.patch b/pkgs/development/libraries/ncurses/1001-ncurses-Support-gnuabielfv1-2.patch new file mode 100644 index 0000000000000..6ce69e6846cb3 --- /dev/null +++ b/pkgs/development/libraries/ncurses/1001-ncurses-Support-gnuabielfv1-2.patch @@ -0,0 +1,72 @@ +diff '--color=auto' -ruN a/aclocal.m4 b/aclocal.m4 +--- a/aclocal.m4 2025-07-19 18:19:51.000000000 +0200 ++++ b/aclocal.m4 2025-07-25 14:11:19.900876172 +0200 +@@ -10290,7 +10290,7 @@ + cf_xopen_source="-D_SGI_SOURCE" + cf_XOPEN_SOURCE= + ;; +-(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) ++(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnuabielfv*|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) + CF_GNU_SOURCE($cf_XOPEN_SOURCE) + ;; + linux*musl) +diff '--color=auto' -ruN a/Ada95/aclocal.m4 b/Ada95/aclocal.m4 +--- a/Ada95/aclocal.m4 2025-07-19 18:38:31.000000000 +0200 ++++ b/Ada95/aclocal.m4 2025-07-25 14:11:57.495783459 +0200 +@@ -5430,7 +5430,7 @@ + cf_xopen_source="-D_SGI_SOURCE" + cf_XOPEN_SOURCE= + ;; +-(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) ++(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnuabielfv*|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) + CF_GNU_SOURCE($cf_XOPEN_SOURCE) + ;; + linux*musl) +diff '--color=auto' -ruN a/Ada95/configure b/Ada95/configure +--- a/Ada95/configure 2025-07-19 18:40:05.000000000 +0200 ++++ b/Ada95/configure 2025-07-25 14:11:49.981449762 +0200 +@@ -13955,7 +13955,7 @@ + cf_xopen_source="-D_SGI_SOURCE" + cf_XOPEN_SOURCE= + ;; +-(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) ++(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnuabielfv*|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) + + cf_gnu_xopen_source=$cf_XOPEN_SOURCE + +diff '--color=auto' -ruN a/configure b/configure +--- a/configure 2025-07-19 19:00:40.000000000 +0200 ++++ b/configure 2025-07-25 14:11:02.884551699 +0200 +@@ -10737,7 +10737,7 @@ + cf_xopen_source="-D_SGI_SOURCE" + cf_XOPEN_SOURCE= + ;; +-(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) ++(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnuabielfv*|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) + + cf_gnu_xopen_source=$cf_XOPEN_SOURCE + +diff '--color=auto' -ruN a/test/aclocal.m4 b/test/aclocal.m4 +--- a/test/aclocal.m4 2025-07-19 18:42:37.000000000 +0200 ++++ b/test/aclocal.m4 2025-07-25 14:11:41.551475534 +0200 +@@ -4658,7 +4658,7 @@ + cf_xopen_source="-D_SGI_SOURCE" + cf_XOPEN_SOURCE= + ;; +-(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) ++(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnuabielfv*|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) + CF_GNU_SOURCE($cf_XOPEN_SOURCE) + ;; + linux*musl) +diff '--color=auto' -ruN a/test/configure b/test/configure +--- a/test/configure 2025-06-14 15:40:22.000000000 +0200 ++++ b/test/configure 2025-07-25 14:11:34.529155110 +0200 +@@ -4183,7 +4183,7 @@ + cf_xopen_source="-D_SGI_SOURCE" + cf_XOPEN_SOURCE= + ;; +-(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) ++(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnuabielfv*|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) + + cf_gnu_xopen_source=$cf_XOPEN_SOURCE + diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 8769ef6c09854..bcd3314b515f9 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -33,6 +33,18 @@ stdenv.mkDerivation (finalAttrs: { ]; setOutputFlags = false; # some aren't supported + patches = [ + # linux-gnuabielfv{1,2} is not in ncurses' list of GNU-ish targets (or smth like that?). + # Causes some defines (_XOPEN_SOURCE=600, _DEFAULT_SOURCE) to not get set, so wcwidth is not exposed by system headers, which causes a FTBFS. + # Reported and fix submitted to upstream in https://lists.gnu.org/archive/html/bug-ncurses/2025-07/msg00040.html + # Backported to the 6.5 release (dropped some hunks for code that isn't in this release yet) + ./1001-ncurses-Support-gnuabielfv1-2.patch + ]; + + postPatch = '' + sed -i '1i #include ' include/curses.h.in + ''; + # see other isOpenBSD clause below configurePlatforms = if stdenv.hostPlatform.isOpenBSD then @@ -94,6 +106,22 @@ stdenv.mkDerivation (finalAttrs: { # which assumes that your openbsd is from the 90s, leading to a truly awful compiler/linker configuration. # No, autoreconfHook doesn't work. "--host=${stdenv.hostPlatform.config}${stdenv.cc.libc.version}" + ] + # Without this override, the upstream configure system results in + # + # typedef unsigned char NCURSES_BOOL; + # #define bool NCURSES_BOOL; + # + # Which breaks C++ bindings: + # + # > /nix/store/[...]-gcc-15.1.0/include/c++/15.1.0/cstddef:81:21: error: redefinition of 'struct std::__byte_operand' + # > 81 | template<> struct __byte_operand { using __type = byte; }; + # > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + # > /nix/store/[...]-gcc-15.1.0/include/c++/15.1.0/cstddef:78:21: note: previous definition of 'struct std::__byte_operand' + # > 78 | template<> struct __byte_operand { using __type = byte; }; + # + ++ [ + "cf_cv_type_of_bool=bool" ]; # Only the C compiler, and explicitly not C++ compiler needs this flag on solaris: diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index aeaa1919872f4..cc8d42201d32d 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.1"; + version = "3.10.2"; src = fetchurl { url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; - hash = "sha256-sPzdf8DN6m6A3PHdhbp5SvDVtKV+Jjl+7jvBkyctkTI="; + hash = "sha256-/p/1HLHyq7XmWmuMEKktoKtaturybn/CtnXEXx+1GbU="; }; } diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 148c7350b931a..f976f94edc018 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -13,7 +13,7 @@ glib, glog, gflags, - protobuf_21, + protobuf, config, ocl-icd, qimgv, @@ -332,7 +332,7 @@ effectiveStdenv.mkDerivation { glib glog pcre2 - protobuf_21 + protobuf zlib ] ++ optionals enablePython [ @@ -463,6 +463,7 @@ effectiveStdenv.mkDerivation { (cmakeBool "OPENCV_GENERATE_PKGCONFIG" true) (cmakeBool "WITH_OPENMP" true) (cmakeBool "BUILD_PROTOBUF" false) + (cmakeFeature "CMAKE_CXX_STANDARD" "17") # required to enable protobuf (cmakeBool "WITH_PROTOBUF" true) (cmakeBool "PROTOBUF_UPDATE_FILES" true) (cmakeBool "OPENCV_ENABLE_NONFREE" enableUnfree) diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 86ec0c68f9a5f..2ef768cb010eb 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -77,7 +77,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "pipewire"; - version = "1.4.6"; + version = "1.4.7"; outputs = [ "out" @@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "pipewire"; repo = "pipewire"; rev = finalAttrs.version; - sha256 = "sha256-Hk43rKrKCJA6njQ9ap/Pje9AQKygrDc+GTlimaMh/pg="; + sha256 = "sha256-U9J7f6nDO4tp6OCBtBcZ9HP9KDKLfuuRWDEbgLL9Avs="; }; patches = [ diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 75c8eb7d19b98..c1b6b5a16fcc9 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -9,7 +9,6 @@ bison, flex, - git, gperf, ninja, pkg-config, @@ -95,7 +94,6 @@ qtModule ( nativeBuildInputs = [ bison flex - git gperf ninja pkg-config diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix index df8286ee8f461..62b18f42dcb58 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix @@ -80,6 +80,7 @@ libinput, # options qttranslations ? null, + fetchpatch, }: let @@ -217,6 +218,13 @@ 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 + + # Backport patch recommended by KDE to fix HTTP2 stream corruption issues + # FIXME: remove in 6.9.2 + (fetchpatch { + url = "https://invent.kde.org/qt/qt/qtbase/-/commit/904aec2f372e2981af19bf762583a0ef42ec6bb9.diff"; + hash = "sha256-bSf4TgYUk7Ariu37NHGQKv6wFArVpQLlnHCTbCFzAfI="; + }) ]; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix index 85c3b1270bfd2..c3e5a058e2b99 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix @@ -9,7 +9,6 @@ coreutils, fetchpatch2, flex, - git, gperf, ninja, pkg-config, @@ -74,7 +73,6 @@ qtModule { bison coreutils flex - git gperf ninja pkg-config diff --git a/pkgs/development/libraries/spandsp/3.nix b/pkgs/development/libraries/spandsp/3.nix index eedc5c38b527a..77126a7c4ceef 100644 --- a/pkgs/development/libraries/spandsp/3.nix +++ b/pkgs/development/libraries/spandsp/3.nix @@ -1,6 +1,7 @@ { fetchFromGitHub, callPackage, + libjpeg, }: (callPackage ./common.nix { }).overrideAttrs (previousAttrs: { @@ -11,4 +12,8 @@ rev = "6ec23e5a7e411a22d59e5678d12c4d2942c4a4b6"; # upstream does not seem to believe in tags sha256 = "03w0s99y3zibi5fnvn8lk92dggfgrr0mz5255745jfbz28b2d5y7"; }; + + propagatedBuildInputs = previousAttrs.propagatedBuildInputs or [ ] ++ [ + libjpeg + ]; }) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index b059e8138cd3b..382dbf37d9416 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -109,19 +109,6 @@ stdenv.mkDerivation rec { # Test for features which may not be available at compile time preBuild = '' - # Use pread(), pread64(), pwrite(), pwrite64() functions for better performance if they are available. - if cc -Werror=implicit-function-declaration -x c - -o "$TMPDIR/pread_pwrite_test" <<< \ - ''$'#include \nint main()\n{\n pread(0, NULL, 0, 0);\n pwrite(0, NULL, 0, 0);\n return 0;\n}'; then - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DUSE_PREAD" - fi - if cc -Werror=implicit-function-declaration -x c - -o "$TMPDIR/pread64_pwrite64_test" <<< \ - ''$'#include \nint main()\n{\n pread64(0, NULL, 0, 0);\n pwrite64(0, NULL, 0, 0);\n return 0;\n}'; then - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DUSE_PREAD64" - elif cc -D_LARGEFILE64_SOURCE -Werror=implicit-function-declaration -x c - -o "$TMPDIR/pread64_pwrite64_test" <<< \ - ''$'#include \nint main()\n{\n pread64(0, NULL, 0, 0);\n pwrite64(0, NULL, 0, 0);\n return 0;\n}'; then - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DUSE_PREAD64 -D_LARGEFILE64_SOURCE" - fi - # Necessary for FTS5 on Linux export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -lm" diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix index bb5f3e97da647..ca655c01ae44f 100644 --- a/pkgs/development/libraries/tk/8.6.nix +++ b/pkgs/development/libraries/tk/8.6.nix @@ -11,7 +11,7 @@ callPackage ./generic.nix ( src = fetchurl { url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz"; - sha256 = "sha256-VQlp81N5+VKzAg86t7ndW/0Rwe98m3xqdfXEmsp5P+w="; + hash = "sha256-vp+U01ddSzCZ2EvDwQ3omU3y16pAUggXPHCcxASn5f4="; }; patches = [ diff --git a/pkgs/development/lisp-modules/import/main.lisp b/pkgs/development/lisp-modules/import/main.lisp index 2ab754d05a4c6..6671b8f22b4ff 100644 --- a/pkgs/development/lisp-modules/import/main.lisp +++ b/pkgs/development/lisp-modules/import/main.lisp @@ -48,8 +48,12 @@ (format t "Dumped nix file to ~a~%" (truename "imported.nix"))) +(defun run-nix-formatter () + (uiop:run-program '("nixfmt" "imported.nix"))) + (defun main () (format t "~%") (init-quicklisp) (run-importers) - (gen-nix-file)) + (gen-nix-file) + (run-nix-formatter)) diff --git a/pkgs/development/lisp-modules/import/repository/quicklisp.lisp b/pkgs/development/lisp-modules/import/repository/quicklisp.lisp index 634795ab17a4b..04f29b476ba0c 100644 --- a/pkgs/development/lisp-modules/import/repository/quicklisp.lisp +++ b/pkgs/development/lisp-modules/import/repository/quicklisp.lisp @@ -112,13 +112,17 @@ (sqlite:with-transaction db (dolist (line releases-lines) - (destructuring-bind (project url size md5 sha1 prefix &rest asds) + (destructuring-bind (project http-url size md5 sha1 prefix &rest asds) (str:words line) - (sql-query - "insert or ignore into quicklisp_release values(?,?,?,?,?,?,?)" - project url size md5 sha1 prefix (json:stringify (coerce - asds - 'vector)))))) + ;; quicklisp does not support TLS + ;; https://github.com/quicklisp/quicklisp-client/issues/167 + ;; but since we fetch systems using nix we can adapt the url. + (let ((url (str:replace-first "http://" "https://" http-url))) + (sql-query + "insert or ignore into quicklisp_release values(?,?,?,?,?,?,?)" + project url size md5 sha1 prefix (json:stringify (coerce + asds + 'vector))))))) ;; Weed out circular dependencies from the package graph. (sqlite:with-transaction db diff --git a/pkgs/development/lisp-modules/imported.nix b/pkgs/development/lisp-modules/imported.nix index 00b6e35b5f2c3..0b87b344e36c1 100644 --- a/pkgs/development/lisp-modules/imported.nix +++ b/pkgs/development/lisp-modules/imported.nix @@ -6,7 +6,6 @@ lib, fetchzip, build-asdf-system, - stdenv, ... }: @@ -48,7 +47,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "1am" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/1am/2014-11-06/1am-20141106-git.tgz"; + url = "https://beta.quicklisp.org/archive/1am/2014-11-06/1am-20141106-git.tgz"; sha256 = "05ss4nz1jb9kb796295482b62w5cj29msfj8zis33sp2rw2vmv2g"; system = "1am"; asd = "1am"; @@ -68,7 +67,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "2d-array" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; + url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; system = "2d-array"; asd = "2d-array"; @@ -88,7 +87,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "2d-array-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; + url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; system = "2d-array-test"; asd = "2d-array-test"; @@ -111,7 +110,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "3b-bmfont" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/3b-bmfont/2024-10-12/3b-bmfont-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/3b-bmfont/2024-10-12/3b-bmfont-20241012-git.tgz"; sha256 = "1zmkmhw8ma2j8p6crw0x6am6fx95rxkb1n3fqlgvs2rxdk273dan"; system = "3b-bmfont"; asd = "3b-bmfont"; @@ -135,7 +134,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "3b-hdr" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/3b-hdr/2020-09-25/3b-hdr-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/3b-hdr/2020-09-25/3b-hdr-20200925-git.tgz"; sha256 = "0bvpdzz88xjwvqapjnkdr44ds3gh5xl3r6r1c2y7x9d6lnvc38jq"; system = "3b-hdr"; asd = "3b-hdr"; @@ -160,7 +159,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "3b-swf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/3b-swf/2012-01-07/3b-swf-20120107-git.tgz"; + url = "https://beta.quicklisp.org/archive/3b-swf/2012-01-07/3b-swf-20120107-git.tgz"; sha256 = "1d74045b6zfxjf0as8n5ji14j5cxsdi3qkqkzcdy3i83whbxkcbm"; system = "3b-swf"; asd = "3b-swf"; @@ -190,7 +189,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "3b-swf-swc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/3b-swf/2012-01-07/3b-swf-20120107-git.tgz"; + url = "https://beta.quicklisp.org/archive/3b-swf/2012-01-07/3b-swf-20120107-git.tgz"; sha256 = "1d74045b6zfxjf0as8n5ji14j5cxsdi3qkqkzcdy3i83whbxkcbm"; system = "3b-swf-swc"; asd = "3b-swf-swc"; @@ -210,12 +209,12 @@ lib.makeScope pkgs.newScope (self: { _3bgl-shader = ( build-asdf-system { pname = "3bgl-shader"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "3bgl-shader" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/3bgl-shader/2024-10-12/3bgl-shader-20241012-git.tgz"; - sha256 = "06v9a3m0cwhj2m5nz20shzgz3362sd7bv011rlknm4nz6i4q5bzz"; + url = "https://beta.quicklisp.org/archive/3bgl-shader/2025-06-22/3bgl-shader-20250622-git.tgz"; + sha256 = "0v29qppa0g7hnjj84jbxrvqyi8apvnzgbn0f6ng033qg3vics2gx"; system = "3bgl-shader"; asd = "3bgl-shader"; } @@ -234,12 +233,12 @@ lib.makeScope pkgs.newScope (self: { _3bgl-shader-example = ( build-asdf-system { pname = "3bgl-shader-example"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "3bgl-shader-example" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/3bgl-shader/2024-10-12/3bgl-shader-20241012-git.tgz"; - sha256 = "06v9a3m0cwhj2m5nz20shzgz3362sd7bv011rlknm4nz6i4q5bzz"; + url = "https://beta.quicklisp.org/archive/3bgl-shader/2025-06-22/3bgl-shader-20250622-git.tgz"; + sha256 = "0v29qppa0g7hnjj84jbxrvqyi8apvnzgbn0f6ng033qg3vics2gx"; system = "3bgl-shader-example"; asd = "3bgl-shader-example"; } @@ -259,12 +258,12 @@ lib.makeScope pkgs.newScope (self: { _3bmd = ( build-asdf-system { pname = "3bmd"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "3bmd" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/3bmd/2024-10-12/3bmd-20241012-git.tgz"; - sha256 = "166pn6qr8n3513673afmln2ayy7kgbgfx45hfmvhmk71xjvq19zv"; + url = "https://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz"; + sha256 = "148if19cjb08l6k347jzhwnymj5a8hmr4fm9r5hr17ddcbbq8sbv"; system = "3bmd"; asd = "3bmd"; } @@ -283,12 +282,12 @@ lib.makeScope pkgs.newScope (self: { _3bmd-ext-code-blocks = ( build-asdf-system { pname = "3bmd-ext-code-blocks"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "3bmd-ext-code-blocks" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/3bmd/2024-10-12/3bmd-20241012-git.tgz"; - sha256 = "166pn6qr8n3513673afmln2ayy7kgbgfx45hfmvhmk71xjvq19zv"; + url = "https://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz"; + sha256 = "148if19cjb08l6k347jzhwnymj5a8hmr4fm9r5hr17ddcbbq8sbv"; system = "3bmd-ext-code-blocks"; asd = "3bmd-ext-code-blocks"; } @@ -308,12 +307,12 @@ lib.makeScope pkgs.newScope (self: { _3bmd-ext-definition-lists = ( build-asdf-system { pname = "3bmd-ext-definition-lists"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "3bmd-ext-definition-lists" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/3bmd/2024-10-12/3bmd-20241012-git.tgz"; - sha256 = "166pn6qr8n3513673afmln2ayy7kgbgfx45hfmvhmk71xjvq19zv"; + url = "https://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz"; + sha256 = "148if19cjb08l6k347jzhwnymj5a8hmr4fm9r5hr17ddcbbq8sbv"; system = "3bmd-ext-definition-lists"; asd = "3bmd-ext-definition-lists"; } @@ -332,12 +331,12 @@ lib.makeScope pkgs.newScope (self: { _3bmd-ext-math = ( build-asdf-system { pname = "3bmd-ext-math"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "3bmd-ext-math" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/3bmd/2024-10-12/3bmd-20241012-git.tgz"; - sha256 = "166pn6qr8n3513673afmln2ayy7kgbgfx45hfmvhmk71xjvq19zv"; + url = "https://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz"; + sha256 = "148if19cjb08l6k347jzhwnymj5a8hmr4fm9r5hr17ddcbbq8sbv"; system = "3bmd-ext-math"; asd = "3bmd-ext-math"; } @@ -355,12 +354,12 @@ lib.makeScope pkgs.newScope (self: { _3bmd-ext-tables = ( build-asdf-system { pname = "3bmd-ext-tables"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "3bmd-ext-tables" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/3bmd/2024-10-12/3bmd-20241012-git.tgz"; - sha256 = "166pn6qr8n3513673afmln2ayy7kgbgfx45hfmvhmk71xjvq19zv"; + url = "https://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz"; + sha256 = "148if19cjb08l6k347jzhwnymj5a8hmr4fm9r5hr17ddcbbq8sbv"; system = "3bmd-ext-tables"; asd = "3bmd-ext-tables"; } @@ -375,12 +374,12 @@ lib.makeScope pkgs.newScope (self: { _3bmd-ext-wiki-links = ( build-asdf-system { pname = "3bmd-ext-wiki-links"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "3bmd-ext-wiki-links" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/3bmd/2024-10-12/3bmd-20241012-git.tgz"; - sha256 = "166pn6qr8n3513673afmln2ayy7kgbgfx45hfmvhmk71xjvq19zv"; + url = "https://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz"; + sha256 = "148if19cjb08l6k347jzhwnymj5a8hmr4fm9r5hr17ddcbbq8sbv"; system = "3bmd-ext-wiki-links"; asd = "3bmd-ext-wiki-links"; } @@ -395,12 +394,12 @@ lib.makeScope pkgs.newScope (self: { _3bmd-tests = ( build-asdf-system { pname = "3bmd-tests"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "3bmd-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/3bmd/2024-10-12/3bmd-20241012-git.tgz"; - sha256 = "166pn6qr8n3513673afmln2ayy7kgbgfx45hfmvhmk71xjvq19zv"; + url = "https://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz"; + sha256 = "148if19cjb08l6k347jzhwnymj5a8hmr4fm9r5hr17ddcbbq8sbv"; system = "3bmd-tests"; asd = "3bmd-tests"; } @@ -419,12 +418,12 @@ lib.makeScope pkgs.newScope (self: { _3bmd-youtube = ( build-asdf-system { pname = "3bmd-youtube"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "3bmd-youtube" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/3bmd/2024-10-12/3bmd-20241012-git.tgz"; - sha256 = "166pn6qr8n3513673afmln2ayy7kgbgfx45hfmvhmk71xjvq19zv"; + url = "https://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz"; + sha256 = "148if19cjb08l6k347jzhwnymj5a8hmr4fm9r5hr17ddcbbq8sbv"; system = "3bmd-youtube"; asd = "3bmd-youtube"; } @@ -442,12 +441,12 @@ lib.makeScope pkgs.newScope (self: { _3bmd-youtube-tests = ( build-asdf-system { pname = "3bmd-youtube-tests"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "3bmd-youtube-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/3bmd/2024-10-12/3bmd-20241012-git.tgz"; - sha256 = "166pn6qr8n3513673afmln2ayy7kgbgfx45hfmvhmk71xjvq19zv"; + url = "https://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz"; + sha256 = "148if19cjb08l6k347jzhwnymj5a8hmr4fm9r5hr17ddcbbq8sbv"; system = "3bmd-youtube-tests"; asd = "3bmd-youtube-tests"; } @@ -469,7 +468,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "3bz" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/3bz/2023-06-18/3bz-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/3bz/2023-06-18/3bz-20230618-git.tgz"; sha256 = "0qdnxj2sn185l0jnp4zjlh5la14pxkgp1hmcyw4d2zwx30sc37p7"; system = "3bz"; asd = "3bz"; @@ -492,12 +491,12 @@ lib.makeScope pkgs.newScope (self: { _3d-math = ( build-asdf-system { pname = "3d-math"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "3d-math" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/3d-math/2024-10-12/3d-math-20241012-git.tgz"; - sha256 = "01xnzizy76ypypzpqrg9fwnxfl5mlldc554b0791rsckkhh35xvd"; + url = "https://beta.quicklisp.org/archive/3d-math/2025-06-22/3d-math-20250622-git.tgz"; + sha256 = "14jmmv1vsri0qil6hksax7xcakfmxjndj90gkszin67c8sazqzzb"; system = "3d-math"; asd = "3d-math"; } @@ -515,12 +514,12 @@ lib.makeScope pkgs.newScope (self: { _3d-math-test = ( build-asdf-system { pname = "3d-math-test"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "3d-math-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/3d-math/2024-10-12/3d-math-20241012-git.tgz"; - sha256 = "01xnzizy76ypypzpqrg9fwnxfl5mlldc554b0791rsckkhh35xvd"; + url = "https://beta.quicklisp.org/archive/3d-math/2025-06-22/3d-math-20250622-git.tgz"; + sha256 = "14jmmv1vsri0qil6hksax7xcakfmxjndj90gkszin67c8sazqzzb"; system = "3d-math-test"; asd = "3d-math-test"; } @@ -542,7 +541,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "3d-matrices" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/3d-matrices/2023-10-21/3d-matrices-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/3d-matrices/2023-10-21/3d-matrices-20231021-git.tgz"; sha256 = "0kn68awww0h8gwiqih8a65d2p34q3qh4z5ji2g5ja99vgpr1498q"; system = "3d-matrices"; asd = "3d-matrices"; @@ -565,7 +564,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "3d-matrices-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/3d-matrices/2023-10-21/3d-matrices-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/3d-matrices/2023-10-21/3d-matrices-20231021-git.tgz"; sha256 = "0kn68awww0h8gwiqih8a65d2p34q3qh4z5ji2g5ja99vgpr1498q"; system = "3d-matrices-test"; asd = "3d-matrices-test"; @@ -588,7 +587,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "3d-quaternions" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/3d-quaternions/2023-10-21/3d-quaternions-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/3d-quaternions/2023-10-21/3d-quaternions-20231021-git.tgz"; sha256 = "1m72g2rn1n5xsqaa50qbj6hcp8b4gk7xsld4qaly788bwscparl8"; system = "3d-quaternions"; asd = "3d-quaternions"; @@ -612,7 +611,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "3d-quaternions-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/3d-quaternions/2023-10-21/3d-quaternions-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/3d-quaternions/2023-10-21/3d-quaternions-20231021-git.tgz"; sha256 = "1m72g2rn1n5xsqaa50qbj6hcp8b4gk7xsld4qaly788bwscparl8"; system = "3d-quaternions-test"; asd = "3d-quaternions-test"; @@ -631,12 +630,12 @@ lib.makeScope pkgs.newScope (self: { _3d-spaces = ( build-asdf-system { pname = "3d-spaces"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "3d-spaces" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/3d-spaces/2024-10-12/3d-spaces-20241012-git.tgz"; - sha256 = "170f2hyvrf3mvkfg9mj7rg2zafcnqbm9h9c29y716ppq1vk1pxhc"; + url = "https://beta.quicklisp.org/archive/3d-spaces/2025-06-22/3d-spaces-20250622-git.tgz"; + sha256 = "16m87s9mpynxgjxcp3yn70s6l7mh9sgx3yxwkzdp20y5x5nkknlb"; system = "3d-spaces"; asd = "3d-spaces"; } @@ -644,8 +643,11 @@ lib.makeScope pkgs.newScope (self: { systems = [ "3d-spaces" ]; lispLibs = [ (getAttr "_3d-math" self) + (getAttr "babel" self) (getAttr "documentation-utils" self) (getAttr "for" self) + (getAttr "nibbles" self) + (getAttr "text-draw" self) (getAttr "trivial-extensible-sequences" self) ]; meta = { @@ -653,29 +655,6 @@ lib.makeScope pkgs.newScope (self: { }; } ); - _3d-spaces-test = ( - build-asdf-system { - pname = "3d-spaces-test"; - version = "20241012-git"; - asds = [ "3d-spaces-test" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/3d-spaces/2024-10-12/3d-spaces-20241012-git.tgz"; - sha256 = "170f2hyvrf3mvkfg9mj7rg2zafcnqbm9h9c29y716ppq1vk1pxhc"; - system = "3d-spaces-test"; - asd = "3d-spaces-test"; - } - ); - systems = [ "3d-spaces-test" ]; - lispLibs = [ - (getAttr "_3d-spaces" self) - (getAttr "parachute" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); _3d-transforms = ( build-asdf-system { pname = "3d-transforms"; @@ -683,7 +662,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "3d-transforms" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/3d-transforms/2023-10-21/3d-transforms-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/3d-transforms/2023-10-21/3d-transforms-20231021-git.tgz"; sha256 = "0876pih289fgn8maclihiz9xl66zbi4nbznpdq2xpfbsr1k4sihy"; system = "3d-transforms"; asd = "3d-transforms"; @@ -708,7 +687,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "3d-transforms-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/3d-transforms/2023-10-21/3d-transforms-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/3d-transforms/2023-10-21/3d-transforms-20231021-git.tgz"; sha256 = "0876pih289fgn8maclihiz9xl66zbi4nbznpdq2xpfbsr1k4sihy"; system = "3d-transforms-test"; asd = "3d-transforms-test"; @@ -727,12 +706,12 @@ lib.makeScope pkgs.newScope (self: { _3d-vectors = ( build-asdf-system { pname = "3d-vectors"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "3d-vectors" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/3d-vectors/2023-10-21/3d-vectors-20231021-git.tgz"; - sha256 = "0y3iwb0bvxf8ixgsbg3idlx91k3lim9na53fasb4scnhlmpsbk28"; + url = "https://beta.quicklisp.org/archive/3d-vectors/2025-06-22/3d-vectors-20250622-git.tgz"; + sha256 = "1zmk47ggghajq5b493z2ikjm28ddmva244fsg4dlyp02shan221a"; system = "3d-vectors"; asd = "3d-vectors"; } @@ -747,12 +726,12 @@ lib.makeScope pkgs.newScope (self: { _3d-vectors-test = ( build-asdf-system { pname = "3d-vectors-test"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "3d-vectors-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/3d-vectors/2023-10-21/3d-vectors-20231021-git.tgz"; - sha256 = "0y3iwb0bvxf8ixgsbg3idlx91k3lim9na53fasb4scnhlmpsbk28"; + url = "https://beta.quicklisp.org/archive/3d-vectors/2025-06-22/3d-vectors-20250622-git.tgz"; + sha256 = "1zmk47ggghajq5b493z2ikjm28ddmva244fsg4dlyp02shan221a"; system = "3d-vectors-test"; asd = "3d-vectors-test"; } @@ -770,12 +749,12 @@ lib.makeScope pkgs.newScope (self: { _40ants-asdf-system = ( build-asdf-system { pname = "40ants-asdf-system"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "40ants-asdf-system" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/40ants-asdf-system/2024-10-12/40ants-asdf-system-20241012-git.tgz"; - sha256 = "0wi575m0s0a9fvp1wy5ga760f71la16z1633qk6s2f87rwcjs8kw"; + url = "https://beta.quicklisp.org/archive/40ants-asdf-system/2025-06-22/40ants-asdf-system-20250622-git.tgz"; + sha256 = "151zfyz7c4xrd4mnyzd5nsla1p70q4iixgm9mlnbm799mr1aprwp"; system = "40ants-asdf-system"; asd = "40ants-asdf-system"; } @@ -790,12 +769,12 @@ lib.makeScope pkgs.newScope (self: { _40ants-asdf-system-ci = ( build-asdf-system { pname = "40ants-asdf-system-ci"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "40ants-asdf-system-ci" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/40ants-asdf-system/2024-10-12/40ants-asdf-system-20241012-git.tgz"; - sha256 = "0wi575m0s0a9fvp1wy5ga760f71la16z1633qk6s2f87rwcjs8kw"; + url = "https://beta.quicklisp.org/archive/40ants-asdf-system/2025-06-22/40ants-asdf-system-20250622-git.tgz"; + sha256 = "151zfyz7c4xrd4mnyzd5nsla1p70q4iixgm9mlnbm799mr1aprwp"; system = "40ants-asdf-system-ci"; asd = "40ants-asdf-system-ci"; } @@ -810,12 +789,12 @@ lib.makeScope pkgs.newScope (self: { _40ants-asdf-system-tests = ( build-asdf-system { pname = "40ants-asdf-system-tests"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "40ants-asdf-system-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/40ants-asdf-system/2024-10-12/40ants-asdf-system-20241012-git.tgz"; - sha256 = "0wi575m0s0a9fvp1wy5ga760f71la16z1633qk6s2f87rwcjs8kw"; + url = "https://beta.quicklisp.org/archive/40ants-asdf-system/2025-06-22/40ants-asdf-system-20250622-git.tgz"; + sha256 = "151zfyz7c4xrd4mnyzd5nsla1p70q4iixgm9mlnbm799mr1aprwp"; system = "40ants-asdf-system-tests"; asd = "40ants-asdf-system-tests"; } @@ -833,12 +812,12 @@ lib.makeScope pkgs.newScope (self: { _40ants-ci = ( build-asdf-system { pname = "40ants-ci"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "40ants-ci" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ci/2024-10-12/ci-20241012-git.tgz"; - sha256 = "0fmy1302c89qbhn4zc58cydcv8qc3qrl6cjbf2fy53sphnmj0wgm"; + url = "https://beta.quicklisp.org/archive/ci/2025-06-22/ci-20250622-git.tgz"; + sha256 = "17pmmvwl7a2ixck2jqa47sx6k4v976h0566niy56h1b0fiwzp73a"; system = "40ants-ci"; asd = "40ants-ci"; } @@ -859,12 +838,12 @@ lib.makeScope pkgs.newScope (self: { _40ants-ci-docs = ( build-asdf-system { pname = "40ants-ci-docs"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "40ants-ci-docs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ci/2024-10-12/ci-20241012-git.tgz"; - sha256 = "0fmy1302c89qbhn4zc58cydcv8qc3qrl6cjbf2fy53sphnmj0wgm"; + url = "https://beta.quicklisp.org/archive/ci/2025-06-22/ci-20250622-git.tgz"; + sha256 = "17pmmvwl7a2ixck2jqa47sx6k4v976h0566niy56h1b0fiwzp73a"; system = "40ants-ci-docs"; asd = "40ants-ci-docs"; } @@ -873,7 +852,6 @@ lib.makeScope pkgs.newScope (self: { lispLibs = [ (getAttr "_40ants-ci" self) (getAttr "_40ants-doc" self) - (getAttr "_40ants-logging-docs" self) (getAttr "docs-config" self) ]; meta = { @@ -884,12 +862,12 @@ lib.makeScope pkgs.newScope (self: { _40ants-ci-tests = ( build-asdf-system { pname = "40ants-ci-tests"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "40ants-ci-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ci/2024-10-12/ci-20241012-git.tgz"; - sha256 = "0fmy1302c89qbhn4zc58cydcv8qc3qrl6cjbf2fy53sphnmj0wgm"; + url = "https://beta.quicklisp.org/archive/ci/2025-06-22/ci-20250622-git.tgz"; + sha256 = "17pmmvwl7a2ixck2jqa47sx6k4v976h0566niy56h1b0fiwzp73a"; system = "40ants-ci-tests"; asd = "40ants-ci-tests"; } @@ -904,12 +882,12 @@ lib.makeScope pkgs.newScope (self: { _40ants-doc = ( build-asdf-system { pname = "40ants-doc"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "40ants-doc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/doc/2024-10-12/doc-20241012-git.tgz"; - sha256 = "1vkczfcdgg1dmzb5jzxvc50kywbz7il130qrj0smlg1grwgw10a2"; + url = "https://beta.quicklisp.org/archive/doc/2025-06-22/doc-20250622-git.tgz"; + sha256 = "0343172ci1hff6q83fbrpck5j02p0983qdrzsrvbq6kdyfm48l7q"; system = "40ants-doc"; asd = "40ants-doc"; } @@ -918,6 +896,7 @@ lib.makeScope pkgs.newScope (self: { lispLibs = [ (getAttr "named-readtables" self) (getAttr "pythonic-string-reader" self) + (getAttr "serapeum" self) ]; meta = { hydraPlatforms = [ ]; @@ -927,12 +906,12 @@ lib.makeScope pkgs.newScope (self: { _40ants-doc-full = ( build-asdf-system { pname = "40ants-doc-full"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "40ants-doc-full" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/doc/2024-10-12/doc-20241012-git.tgz"; - sha256 = "1vkczfcdgg1dmzb5jzxvc50kywbz7il130qrj0smlg1grwgw10a2"; + url = "https://beta.quicklisp.org/archive/doc/2025-06-22/doc-20250622-git.tgz"; + sha256 = "0343172ci1hff6q83fbrpck5j02p0983qdrzsrvbq6kdyfm48l7q"; system = "40ants-doc-full"; asd = "40ants-doc-full"; } @@ -957,6 +936,7 @@ lib.makeScope pkgs.newScope (self: { (getAttr "log4cl" self) (getAttr "named-readtables" self) (getAttr "pythonic-string-reader" self) + (getAttr "serapeum" self) (getAttr "slynk" self) (getAttr "spinneret" self) (getAttr "stem" self) @@ -971,15 +951,110 @@ lib.makeScope pkgs.newScope (self: { }; } ); + _40ants-doc-plantuml = ( + build-asdf-system { + pname = "40ants-doc-plantuml"; + version = "20250622-git"; + asds = [ "40ants-doc-plantuml" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/doc-plantuml/2025-06-22/doc-plantuml-20250622-git.tgz"; + sha256 = "04d4ff2rar3y5c6n20ccb7p295iakf93wmc0yrg9fvpjczbh18bk"; + system = "40ants-doc-plantuml"; + asd = "40ants-doc-plantuml"; + } + ); + systems = [ "40ants-doc-plantuml" ]; + lispLibs = [ + (getAttr "_40ants-asdf-system" self) + (getAttr "_40ants-doc" self) + (getAttr "_40ants-doc-full" self) + (getAttr "_40ants-plantuml" self) + (getAttr "common-doc" self) + (getAttr "serapeum" self) + (getAttr "str" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + _40ants-doc-plantuml-ci = ( + build-asdf-system { + pname = "40ants-doc-plantuml-ci"; + version = "20250622-git"; + asds = [ "40ants-doc-plantuml-ci" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/doc-plantuml/2025-06-22/doc-plantuml-20250622-git.tgz"; + sha256 = "04d4ff2rar3y5c6n20ccb7p295iakf93wmc0yrg9fvpjczbh18bk"; + system = "40ants-doc-plantuml-ci"; + asd = "40ants-doc-plantuml-ci"; + } + ); + systems = [ "40ants-doc-plantuml-ci" ]; + lispLibs = [ (getAttr "_40ants-ci" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + _40ants-doc-plantuml-docs = ( + build-asdf-system { + pname = "40ants-doc-plantuml-docs"; + version = "20250622-git"; + asds = [ "40ants-doc-plantuml-docs" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/doc-plantuml/2025-06-22/doc-plantuml-20250622-git.tgz"; + sha256 = "04d4ff2rar3y5c6n20ccb7p295iakf93wmc0yrg9fvpjczbh18bk"; + system = "40ants-doc-plantuml-docs"; + asd = "40ants-doc-plantuml-docs"; + } + ); + systems = [ "40ants-doc-plantuml-docs" ]; + lispLibs = [ + (getAttr "_40ants-doc" self) + (getAttr "_40ants-doc-plantuml" self) + (getAttr "docs-config" self) + (getAttr "named-readtables" self) + (getAttr "pythonic-string-reader" self) + (getAttr "serapeum" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + _40ants-doc-plantuml-tests = ( + build-asdf-system { + pname = "40ants-doc-plantuml-tests"; + version = "20250622-git"; + asds = [ "40ants-doc-plantuml-tests" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/doc-plantuml/2025-06-22/doc-plantuml-20250622-git.tgz"; + sha256 = "04d4ff2rar3y5c6n20ccb7p295iakf93wmc0yrg9fvpjczbh18bk"; + system = "40ants-doc-plantuml-tests"; + asd = "40ants-doc-plantuml-tests"; + } + ); + systems = [ "40ants-doc-plantuml-tests" ]; + lispLibs = [ (getAttr "rove" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); _40ants-doc-test = ( build-asdf-system { pname = "40ants-doc-test"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "40ants-doc-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/doc/2024-10-12/doc-20241012-git.tgz"; - sha256 = "1vkczfcdgg1dmzb5jzxvc50kywbz7il130qrj0smlg1grwgw10a2"; + url = "https://beta.quicklisp.org/archive/doc/2025-06-22/doc-20250622-git.tgz"; + sha256 = "0343172ci1hff6q83fbrpck5j02p0983qdrzsrvbq6kdyfm48l7q"; system = "40ants-doc-test"; asd = "40ants-doc-test"; } @@ -1001,12 +1076,12 @@ lib.makeScope pkgs.newScope (self: { _40ants-logging = ( build-asdf-system { pname = "40ants-logging"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "40ants-logging" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/logging/2024-10-12/logging-20241012-git.tgz"; - sha256 = "1rkh0ls12qkwxs7szvnr5fz2bi1wwxsz7z72ywnin13hisvgkkwz"; + url = "https://beta.quicklisp.org/archive/logging/2025-06-22/logging-20250622-git.tgz"; + sha256 = "1q9zfq50jprhiij87pvhw4wjzzf2yfaxaqbyjj4k5r5lihgk785d"; system = "40ants-logging"; asd = "40ants-logging"; } @@ -1025,12 +1100,12 @@ lib.makeScope pkgs.newScope (self: { _40ants-logging-ci = ( build-asdf-system { pname = "40ants-logging-ci"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "40ants-logging-ci" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/logging/2024-10-12/logging-20241012-git.tgz"; - sha256 = "1rkh0ls12qkwxs7szvnr5fz2bi1wwxsz7z72ywnin13hisvgkkwz"; + url = "https://beta.quicklisp.org/archive/logging/2025-06-22/logging-20250622-git.tgz"; + sha256 = "1q9zfq50jprhiij87pvhw4wjzzf2yfaxaqbyjj4k5r5lihgk785d"; system = "40ants-logging-ci"; asd = "40ants-logging-ci"; } @@ -1045,12 +1120,12 @@ lib.makeScope pkgs.newScope (self: { _40ants-logging-docs = ( build-asdf-system { pname = "40ants-logging-docs"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "40ants-logging-docs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/logging/2024-10-12/logging-20241012-git.tgz"; - sha256 = "1rkh0ls12qkwxs7szvnr5fz2bi1wwxsz7z72ywnin13hisvgkkwz"; + url = "https://beta.quicklisp.org/archive/logging/2025-06-22/logging-20250622-git.tgz"; + sha256 = "1q9zfq50jprhiij87pvhw4wjzzf2yfaxaqbyjj4k5r5lihgk785d"; system = "40ants-logging-docs"; asd = "40ants-logging-docs"; } @@ -1071,12 +1146,12 @@ lib.makeScope pkgs.newScope (self: { _40ants-logging-example = ( build-asdf-system { pname = "40ants-logging-example"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "40ants-logging-example" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/logging/2024-10-12/logging-20241012-git.tgz"; - sha256 = "1rkh0ls12qkwxs7szvnr5fz2bi1wwxsz7z72ywnin13hisvgkkwz"; + url = "https://beta.quicklisp.org/archive/logging/2025-06-22/logging-20250622-git.tgz"; + sha256 = "1q9zfq50jprhiij87pvhw4wjzzf2yfaxaqbyjj4k5r5lihgk785d"; system = "40ants-logging-example"; asd = "40ants-logging-example"; } @@ -1097,12 +1172,12 @@ lib.makeScope pkgs.newScope (self: { _40ants-logging-tests = ( build-asdf-system { pname = "40ants-logging-tests"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "40ants-logging-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/logging/2024-10-12/logging-20241012-git.tgz"; - sha256 = "1rkh0ls12qkwxs7szvnr5fz2bi1wwxsz7z72ywnin13hisvgkkwz"; + url = "https://beta.quicklisp.org/archive/logging/2025-06-22/logging-20250622-git.tgz"; + sha256 = "1q9zfq50jprhiij87pvhw4wjzzf2yfaxaqbyjj4k5r5lihgk785d"; system = "40ants-logging-tests"; asd = "40ants-logging-tests"; } @@ -1114,6 +1189,194 @@ lib.makeScope pkgs.newScope (self: { }; } ); + _40ants-plantuml = ( + build-asdf-system { + pname = "40ants-plantuml"; + version = "20250622-git"; + asds = [ "40ants-plantuml" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/plantuml/2025-06-22/plantuml-20250622-git.tgz"; + sha256 = "0bi3i0cw16aa38xp04xwirdfvwjz862q5yzghpprddi1q5mvxpbf"; + system = "40ants-plantuml"; + asd = "40ants-plantuml"; + } + ); + systems = [ "40ants-plantuml" ]; + lispLibs = [ + (getAttr "_40ants-asdf-system" self) + (getAttr "alexandria" self) + (getAttr "serapeum" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + _40ants-plantuml-ci = ( + build-asdf-system { + pname = "40ants-plantuml-ci"; + version = "20250622-git"; + asds = [ "40ants-plantuml-ci" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/plantuml/2025-06-22/plantuml-20250622-git.tgz"; + sha256 = "0bi3i0cw16aa38xp04xwirdfvwjz862q5yzghpprddi1q5mvxpbf"; + system = "40ants-plantuml-ci"; + asd = "40ants-plantuml-ci"; + } + ); + systems = [ "40ants-plantuml-ci" ]; + lispLibs = [ (getAttr "_40ants-ci" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + _40ants-plantuml-docs = ( + build-asdf-system { + pname = "40ants-plantuml-docs"; + version = "20250622-git"; + asds = [ "40ants-plantuml-docs" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/plantuml/2025-06-22/plantuml-20250622-git.tgz"; + sha256 = "0bi3i0cw16aa38xp04xwirdfvwjz862q5yzghpprddi1q5mvxpbf"; + system = "40ants-plantuml-docs"; + asd = "40ants-plantuml-docs"; + } + ); + systems = [ "40ants-plantuml-docs" ]; + lispLibs = [ + (getAttr "_40ants-doc" self) + (getAttr "_40ants-plantuml" self) + (getAttr "docs-config" self) + (getAttr "named-readtables" self) + (getAttr "pythonic-string-reader" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + _40ants-plantuml-tests = ( + build-asdf-system { + pname = "40ants-plantuml-tests"; + version = "20250622-git"; + asds = [ "40ants-plantuml-tests" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/plantuml/2025-06-22/plantuml-20250622-git.tgz"; + sha256 = "0bi3i0cw16aa38xp04xwirdfvwjz862q5yzghpprddi1q5mvxpbf"; + system = "40ants-plantuml-tests"; + asd = "40ants-plantuml-tests"; + } + ); + systems = [ "40ants-plantuml-tests" ]; + lispLibs = [ (getAttr "rove" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + _40ants-routes = ( + build-asdf-system { + pname = "40ants-routes"; + version = "20250622-git"; + asds = [ "40ants-routes" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/routes/2025-06-22/routes-20250622-git.tgz"; + sha256 = "0dc613f8605a88s7ggvkg2vkj5zfhdk9ijcqnh3kvz6258qqhcgr"; + system = "40ants-routes"; + asd = "40ants-routes"; + } + ); + systems = [ "40ants-routes" ]; + lispLibs = [ + (getAttr "_40ants-asdf-system" self) + (getAttr "alexandria" self) + (getAttr "cl-ppcre" self) + (getAttr "serapeum" self) + (getAttr "split-sequence" self) + (getAttr "str" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + _40ants-routes-ci = ( + build-asdf-system { + pname = "40ants-routes-ci"; + version = "20250622-git"; + asds = [ "40ants-routes-ci" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/routes/2025-06-22/routes-20250622-git.tgz"; + sha256 = "0dc613f8605a88s7ggvkg2vkj5zfhdk9ijcqnh3kvz6258qqhcgr"; + system = "40ants-routes-ci"; + asd = "40ants-routes-ci"; + } + ); + systems = [ "40ants-routes-ci" ]; + lispLibs = [ (getAttr "_40ants-ci" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + _40ants-routes-docs = ( + build-asdf-system { + pname = "40ants-routes-docs"; + version = "20250622-git"; + asds = [ "40ants-routes-docs" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/routes/2025-06-22/routes-20250622-git.tgz"; + sha256 = "0dc613f8605a88s7ggvkg2vkj5zfhdk9ijcqnh3kvz6258qqhcgr"; + system = "40ants-routes-docs"; + asd = "40ants-routes-docs"; + } + ); + systems = [ "40ants-routes-docs" ]; + lispLibs = [ + (getAttr "_40ants-doc" self) + (getAttr "_40ants-routes" self) + (getAttr "docs-config" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + _40ants-routes-tests = ( + build-asdf-system { + pname = "40ants-routes-tests"; + version = "20250622-git"; + asds = [ "40ants-routes-tests" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/routes/2025-06-22/routes-20250622-git.tgz"; + sha256 = "0dc613f8605a88s7ggvkg2vkj5zfhdk9ijcqnh3kvz6258qqhcgr"; + system = "40ants-routes-tests"; + asd = "40ants-routes-tests"; + } + ); + systems = [ "40ants-routes-tests" ]; + lispLibs = [ + (getAttr "_40ants-routes" self) + (getAttr "alexandria" self) + (getAttr "cl-ppcre" self) + (getAttr "rove" self) + (getAttr "serapeum" self) + (getAttr "split-sequence" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); _40ants-slynk = ( build-asdf-system { pname = "40ants-slynk"; @@ -1121,7 +1384,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "40ants-slynk" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/40ants-slynk/2024-10-12/40ants-slynk-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/40ants-slynk/2024-10-12/40ants-slynk-20241012-git.tgz"; sha256 = "0rz32aaya177s8c4lsasyfff91b2ancjlw8bi50xz150kwqqqmmx"; system = "40ants-slynk"; asd = "40ants-slynk"; @@ -1149,7 +1412,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "40ants-slynk-ci" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/40ants-slynk/2024-10-12/40ants-slynk-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/40ants-slynk/2024-10-12/40ants-slynk-20241012-git.tgz"; sha256 = "0rz32aaya177s8c4lsasyfff91b2ancjlw8bi50xz150kwqqqmmx"; system = "40ants-slynk-ci"; asd = "40ants-slynk-ci"; @@ -1169,7 +1432,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "40ants-slynk-docs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/40ants-slynk/2024-10-12/40ants-slynk-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/40ants-slynk/2024-10-12/40ants-slynk-20241012-git.tgz"; sha256 = "0rz32aaya177s8c4lsasyfff91b2ancjlw8bi50xz150kwqqqmmx"; system = "40ants-slynk-docs"; asd = "40ants-slynk-docs"; @@ -1195,7 +1458,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "40ants-slynk-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/40ants-slynk/2024-10-12/40ants-slynk-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/40ants-slynk/2024-10-12/40ants-slynk-20241012-git.tgz"; sha256 = "0rz32aaya177s8c4lsasyfff91b2ancjlw8bi50xz150kwqqqmmx"; system = "40ants-slynk-tests"; asd = "40ants-slynk-tests"; @@ -1215,7 +1478,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "a-cl-cairo2-loader" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cairo2/2021-10-20/cl-cairo2-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cairo2/2021-10-20/cl-cairo2-20211020-git.tgz"; sha256 = "0cpfgyxw6pz7y033dlya8c4vjmkpw127zdq3a9xclp9q8jbdlb7q"; system = "a-cl-cairo2-loader"; asd = "a-cl-cairo2-loader"; @@ -1235,7 +1498,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "a-cl-logger" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/a-cl-logger/2022-03-31/a-cl-logger-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/a-cl-logger/2022-03-31/a-cl-logger-20220331-git.tgz"; sha256 = "0vhhbnh4akxh0ivqh8r0f2djv2nbf3l9hbbi0b5fdk9bdpziqkb4"; system = "a-cl-logger"; asd = "a-cl-logger"; @@ -1265,7 +1528,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "a-cl-logger-logstash" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/a-cl-logger/2022-03-31/a-cl-logger-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/a-cl-logger/2022-03-31/a-cl-logger-20220331-git.tgz"; sha256 = "0vhhbnh4akxh0ivqh8r0f2djv2nbf3l9hbbi0b5fdk9bdpziqkb4"; system = "a-cl-logger-logstash"; asd = "a-cl-logger-logstash"; @@ -1289,7 +1552,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "a-cl-logger-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/a-cl-logger/2022-03-31/a-cl-logger-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/a-cl-logger/2022-03-31/a-cl-logger-20220331-git.tgz"; sha256 = "0vhhbnh4akxh0ivqh8r0f2djv2nbf3l9hbbi0b5fdk9bdpziqkb4"; system = "a-cl-logger-tests"; asd = "a-cl-logger"; @@ -1312,7 +1575,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "aabbcc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; system = "aabbcc"; asd = "aabbcc"; @@ -1335,7 +1598,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "able" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/able/2017-12-27/able-20171227-git.tgz"; + url = "https://beta.quicklisp.org/archive/able/2017-12-27/able-20171227-git.tgz"; sha256 = "1fbcmr6hy7bwlnsnrml3j4b2jkkj8ddxw27l8hr2z6l3fi3qw4hh"; system = "able"; asd = "able"; @@ -1359,7 +1622,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "abnf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-abnf/2020-03-25/cl-abnf-20200325-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-abnf/2020-03-25/cl-abnf-20200325-git.tgz"; sha256 = "0f09nsndxa90acm71zd4qdnp40v705a4sqm04mnv9x76h6dlggmz"; system = "abnf"; asd = "abnf"; @@ -1375,6 +1638,31 @@ lib.makeScope pkgs.newScope (self: { }; } ); + abstract-arrays = ( + build-asdf-system { + pname = "abstract-arrays"; + version = "20250622-git"; + asds = [ "abstract-arrays" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/abstract-arrays/2025-06-22/abstract-arrays-20250622-git.tgz"; + sha256 = "0d26ig4czff69ws942rwg8126mxxzifb2490pscgk7056m71drkr"; + system = "abstract-arrays"; + asd = "abstract-arrays"; + } + ); + systems = [ "abstract-arrays" ]; + lispLibs = [ + (getAttr "alexandria" self) + (getAttr "closer-mop" self) + (getAttr "peltadot" self) + (getAttr "peltadot-traits-library" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); abstract-classes = ( build-asdf-system { pname = "abstract-classes"; @@ -1382,7 +1670,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "abstract-classes" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-abstract-classes/2019-03-07/cl-abstract-classes-20190307-hg.tgz"; + url = "https://beta.quicklisp.org/archive/cl-abstract-classes/2019-03-07/cl-abstract-classes-20190307-hg.tgz"; sha256 = "0q03j3ksgn56j9xvs3d3hhasplj3hvg488f4cx1z97nlyqxr5w1d"; system = "abstract-classes"; asd = "abstract-classes"; @@ -1398,12 +1686,12 @@ lib.makeScope pkgs.newScope (self: { access = ( build-asdf-system { pname = "access"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "access" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/access/2024-10-12/access-20241012-git.tgz"; - sha256 = "0zdjqhb9rvnlq6nzmsp7372gi91k1rq9bz510m6hcki7g3r01iv5"; + url = "https://beta.quicklisp.org/archive/access/2025-06-22/access-20250622-git.tgz"; + sha256 = "1m9m97qnih57z7zn470myxs3vpraa0v40b84p2wd1i8qjp9ysbrx"; system = "access"; asd = "access"; } @@ -1425,7 +1713,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "acclimation" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/acclimation/2024-10-12/acclimation-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/acclimation/2024-10-12/acclimation-20241012-git.tgz"; sha256 = "1rp4794czi01hlv67mgykxym1hqsyn04ldgwiqjwf4lj5d3p7aj4"; system = "acclimation"; asd = "acclimation"; @@ -1443,7 +1731,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "acclimation-temperature" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/acclimation/2024-10-12/acclimation-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/acclimation/2024-10-12/acclimation-20241012-git.tgz"; sha256 = "1rp4794czi01hlv67mgykxym1hqsyn04ldgwiqjwf4lj5d3p7aj4"; system = "acclimation-temperature"; asd = "acclimation-temperature"; @@ -1463,7 +1751,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "acl-compat" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/portableaserve/2019-08-13/portableaserve-20190813-git.tgz"; + url = "https://beta.quicklisp.org/archive/portableaserve/2019-08-13/portableaserve-20190813-git.tgz"; sha256 = "0ak6mqp84sjr0a7h5svr16vra4bf4fcx6wpir0n88dc1vjwy5xqa"; system = "acl-compat"; asd = "acl-compat"; @@ -1488,7 +1776,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "acm-random" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/random/2019-10-07/random-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/random/2019-10-07/random-20191007-git.tgz"; sha256 = "1fb4mnp85jm9s667y4dgz07klhkr9pvi5xbxws28lbb8iip75y2p"; system = "acm-random"; asd = "acm-random"; @@ -1511,7 +1799,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "acm-random-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/random/2019-10-07/random-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/random/2019-10-07/random-20191007-git.tgz"; sha256 = "1fb4mnp85jm9s667y4dgz07klhkr9pvi5xbxws28lbb8iip75y2p"; system = "acm-random-test"; asd = "acm-random-test"; @@ -1530,12 +1818,12 @@ lib.makeScope pkgs.newScope (self: { action-list = ( build-asdf-system { pname = "action-list"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "action-list" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/action-list/2024-10-12/action-list-20241012-git.tgz"; - sha256 = "0ky38svlm0xhgsmh5maqj314q4wl3apg7532q8apy37axg1y3xvh"; + url = "https://beta.quicklisp.org/archive/action-list/2025-06-22/action-list-20250622-git.tgz"; + sha256 = "10x90idgrzhc7blg85mgbr6yrh23rhwavcm4p0kbjmgnnfvvibq9"; system = "action-list"; asd = "action-list"; } @@ -1553,12 +1841,12 @@ lib.makeScope pkgs.newScope (self: { add-two = ( build-asdf-system { pname = "add-two"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "add-two" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/whereiseveryone.command-line-args/2024-10-12/whereiseveryone.command-line-args-20241012-git.tgz"; - sha256 = "140xnz2v0v3hfg3dp2fhidw8ns6lxd3a5knm07wqdp48ksg119wy"; + url = "https://beta.quicklisp.org/archive/command-line-args/2025-06-22/command-line-args-20250622-git.tgz"; + sha256 = "14x68ww8323vkvql3ryn9wkxf4fbj1brdn4f6mynr7wqygink2bd"; system = "add-two"; asd = "add-two"; } @@ -1580,7 +1868,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "adhoc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/adhoc/2024-10-12/adhoc-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/adhoc/2024-10-12/adhoc-20241012-git.tgz"; sha256 = "1h7mnwybapxzpv0zlwr1mr91lsd7wiv722ifa21gczllvrg5qai6"; system = "adhoc"; asd = "adhoc"; @@ -1600,7 +1888,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "adhoc-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/adhoc/2024-10-12/adhoc-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/adhoc/2024-10-12/adhoc-20241012-git.tgz"; sha256 = "1h7mnwybapxzpv0zlwr1mr91lsd7wiv722ifa21gczllvrg5qai6"; system = "adhoc-tests"; asd = "adhoc-tests"; @@ -1623,7 +1911,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "adjuvant" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; + url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; system = "adjuvant"; asd = "adjuvant"; @@ -1643,7 +1931,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "adjuvant-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; + url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; system = "adjuvant-test"; asd = "adjuvant-test"; @@ -1666,7 +1954,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "adopt" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/adopt/2024-10-12/adopt-20241012-hg.tgz"; + url = "https://beta.quicklisp.org/archive/adopt/2024-10-12/adopt-20241012-hg.tgz"; sha256 = "1q36b9bp76daprnhd97h00x56kccmii8pc9w2ra6yihkfbcas41q"; system = "adopt"; asd = "adopt"; @@ -1689,7 +1977,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "adopt-subcommands" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/adopt-subcommands/2021-05-31/adopt-subcommands-v0.2.2.tgz"; + url = "https://beta.quicklisp.org/archive/adopt-subcommands/2021-05-31/adopt-subcommands-v0.2.2.tgz"; sha256 = "0q35s3ihhlshakjalq5pgf14x502qnj8jimim8yf7bp1p9sn83h8"; system = "adopt-subcommands"; asd = "adopt-subcommands"; @@ -1713,7 +2001,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "adopt-subcommands-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/adopt-subcommands/2021-05-31/adopt-subcommands-v0.2.2.tgz"; + url = "https://beta.quicklisp.org/archive/adopt-subcommands/2021-05-31/adopt-subcommands-v0.2.2.tgz"; sha256 = "0q35s3ihhlshakjalq5pgf14x502qnj8jimim8yf7bp1p9sn83h8"; system = "adopt-subcommands-test"; asd = "adopt-subcommands-test"; @@ -1732,12 +2020,12 @@ lib.makeScope pkgs.newScope (self: { adp = ( build-asdf-system { pname = "adp"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "adp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/adp/2024-10-12/adp-20241012-git.tgz"; - sha256 = "04h91m2x1vcn8iidhx1y2cwb8j55siiifhx1ksy7hyn9hf39b2kv"; + url = "https://beta.quicklisp.org/archive/adp/2025-06-22/adp-20250622-git.tgz"; + sha256 = "0qa0l0k39xf36f09axwmzyv4fbjys87jaalr5szpdv7h64qp2x1j"; system = "adp"; asd = "adp"; } @@ -1756,12 +2044,12 @@ lib.makeScope pkgs.newScope (self: { adp-github = ( build-asdf-system { pname = "adp-github"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "adp-github" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/adp-github/2024-10-12/adp-github-20241012-git.tgz"; - sha256 = "1g33l2k6pc5m8d0d3dl4rf8p364563jpyk22rywrh5188m9nayjc"; + url = "https://beta.quicklisp.org/archive/adp-github/2025-06-22/adp-github-20250622-git.tgz"; + sha256 = "0qja8zh1sibnffnjhl914gzifmxhxfkqylh972mak0i62y6njjqa"; system = "adp-github"; asd = "adp-github"; } @@ -1770,7 +2058,9 @@ lib.makeScope pkgs.newScope (self: { lispLibs = [ (getAttr "adp" self) (getAttr "alexandria" self) + (getAttr "cl-ppcre" self) (getAttr "closer-mop" self) + (getAttr "hyperspec" self) (getAttr "trivial-arguments" self) ]; meta = { @@ -1778,26 +2068,6 @@ lib.makeScope pkgs.newScope (self: { }; } ); - adp-plain = ( - build-asdf-system { - pname = "adp-plain"; - version = "20241012-git"; - asds = [ "adp-plain" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/adp-plain/2024-10-12/adp-plain-20241012-git.tgz"; - sha256 = "0dnfx7hhdibkg0qphs3wsfll2kmpkfpg4hxfjv2paxnsmqdhspnz"; - system = "adp-plain"; - asd = "adp-plain"; - } - ); - systems = [ "adp-plain" ]; - lispLibs = [ (getAttr "adp" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); advanced-readtable = ( build-asdf-system { pname = "advanced-readtable"; @@ -1805,7 +2075,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "advanced-readtable" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/advanced-readtable/2013-07-20/advanced-readtable-20130720-git.tgz"; + url = "https://beta.quicklisp.org/archive/advanced-readtable/2013-07-20/advanced-readtable-20130720-git.tgz"; sha256 = "0dgm3lp9s6792g22swcb085f67q68jsyqj71vicb1wdr9qslvgwm"; system = "advanced-readtable"; asd = "advanced-readtable"; @@ -1821,12 +2091,12 @@ lib.makeScope pkgs.newScope (self: { aether = ( build-asdf-system { pname = "aether"; - version = "v1.1.0"; + version = "v1.2.0"; asds = [ "aether" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/aether/2021-12-09/aether-v1.1.0.tgz"; - sha256 = "0q60gc4lsxpvv4g572mnhpzkziq1412k1q0xm4y2d1zigryg30bb"; + url = "https://beta.quicklisp.org/archive/aether/2025-06-22/aether-v1.2.0.tgz"; + sha256 = "0c5ab4lkjxr7yyqjzc6lmkmz6ynqzn0yf7bcjg2kg1qzarphjj3n"; system = "aether"; asd = "aether"; } @@ -1846,12 +2116,12 @@ lib.makeScope pkgs.newScope (self: { aether-tests = ( build-asdf-system { pname = "aether-tests"; - version = "v1.1.0"; + version = "v1.2.0"; asds = [ "aether-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/aether/2021-12-09/aether-v1.1.0.tgz"; - sha256 = "0q60gc4lsxpvv4g572mnhpzkziq1412k1q0xm4y2d1zigryg30bb"; + url = "https://beta.quicklisp.org/archive/aether/2025-06-22/aether-v1.2.0.tgz"; + sha256 = "0c5ab4lkjxr7yyqjzc6lmkmz6ynqzn0yf7bcjg2kg1qzarphjj3n"; system = "aether-tests"; asd = "aether-tests"; } @@ -1866,6 +2136,33 @@ lib.makeScope pkgs.newScope (self: { }; } ); + affinity = ( + build-asdf-system { + pname = "affinity"; + version = "20250622-git"; + asds = [ "affinity" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/more-cffi/2025-06-22/more-cffi-20250622-git.tgz"; + sha256 = "0z9l5pk6ckbipxdsfwadjl6hp4134w3m3nk7klmzbvd0930cygw3"; + system = "affinity"; + asd = "affinity"; + } + ); + systems = [ "affinity" ]; + lispLibs = [ + (getAttr "alexandria" self) + (getAttr "allioli" self) + (getAttr "cffi" self) + (getAttr "clith" self) + (getAttr "expanders" self) + (getAttr "named-readtables" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); agnostic-lizard = ( build-asdf-system { pname = "agnostic-lizard"; @@ -1873,7 +2170,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "agnostic-lizard" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/agnostic-lizard/2024-10-12/agnostic-lizard-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/agnostic-lizard/2024-10-12/agnostic-lizard-20241012-git.tgz"; sha256 = "0amzshh6v3mp24j0h2cinv4zvdlg4kih04md5biakwhnmcw4j4pr"; system = "agnostic-lizard"; asd = "agnostic-lizard"; @@ -1893,7 +2190,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "agnostic-lizard-debugger-prototype" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/agnostic-lizard/2024-10-12/agnostic-lizard-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/agnostic-lizard/2024-10-12/agnostic-lizard-20241012-git.tgz"; sha256 = "0amzshh6v3mp24j0h2cinv4zvdlg4kih04md5biakwhnmcw4j4pr"; system = "agnostic-lizard-debugger-prototype"; asd = "agnostic-lizard-debugger-prototype"; @@ -1916,7 +2213,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "agutil" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/agutil/2021-05-31/agutil-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/agutil/2021-05-31/agutil-20210531-git.tgz"; sha256 = "10lccrqkaqq0h1p79gjqsqk1nqa6c25n0w7pj39y2gs14s5qr5q9"; system = "agutil"; asd = "agutil"; @@ -1937,7 +2234,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "alexa" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/alexa/2018-08-31/alexa-20180831-git.tgz"; + url = "https://beta.quicklisp.org/archive/alexa/2018-08-31/alexa-20180831-git.tgz"; sha256 = "1y9jyz9gfmd02h492kf7v3mmpbhc0yfh4ka2rzd1vczq6fl8qgqv"; system = "alexa"; asd = "alexa"; @@ -1960,7 +2257,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "alexa-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/alexa/2018-08-31/alexa-20180831-git.tgz"; + url = "https://beta.quicklisp.org/archive/alexa/2018-08-31/alexa-20180831-git.tgz"; sha256 = "1y9jyz9gfmd02h492kf7v3mmpbhc0yfh4ka2rzd1vczq6fl8qgqv"; system = "alexa-tests"; asd = "alexa-tests"; @@ -1983,7 +2280,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "alexandria" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/alexandria/2024-10-12/alexandria-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/alexandria/2024-10-12/alexandria-20241012-git.tgz"; sha256 = "0jq0n59s0r9yl374f0zpdnaflb5g853yqvax7ka8rnypspyykwdw"; system = "alexandria"; asd = "alexandria"; @@ -1997,12 +2294,12 @@ lib.makeScope pkgs.newScope (self: { alexandria_plus = ( build-asdf-system { pname = "alexandria+"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "alexandria+" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/alexandria-plus/2024-10-12/alexandria-plus-20241012-git.tgz"; - sha256 = "05j88i289nx2dgc8r3n3h8x3ma31gk8xk2bpvxc5y9yzfl2mp0hk"; + url = "https://beta.quicklisp.org/archive/alexandria-plus/2025-06-22/alexandria-plus-20250622-git.tgz"; + sha256 = "09r51sck0andgq6nybsw35583zvyb6prp9jb2rk1ryi1w3grqh9i"; system = "alexandria+"; asd = "alexandria+"; } @@ -2021,7 +2318,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "algebraic-data-library" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/algebraic-data-library/2018-08-31/algebraic-data-library-20180831-git.tgz"; + url = "https://beta.quicklisp.org/archive/algebraic-data-library/2018-08-31/algebraic-data-library-20180831-git.tgz"; sha256 = "0mmakfdwgfjl812ydzbbl81lkv41zfnqhw9ydjk1w63lq8c11cmn"; system = "algebraic-data-library"; asd = "algebraic-data-library"; @@ -2041,7 +2338,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "allioli" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/allioli/2024-10-12/allioli-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/allioli/2024-10-12/allioli-20241012-git.tgz"; sha256 = "00504wf4rxrwpc171czlk56zzbf798c39jzhbipm7ba3iz28qkai"; system = "allioli"; asd = "allioli"; @@ -2060,12 +2357,12 @@ lib.makeScope pkgs.newScope (self: { also-alsa = ( build-asdf-system { pname = "also-alsa"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "also-alsa" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/also-alsa/2023-10-21/also-alsa-20231021-git.tgz"; - sha256 = "17xvq04nnw2kmxvahj56ja5k21d3wg3fzclbfm36fn641lr6l7dx"; + url = "https://beta.quicklisp.org/archive/also-alsa/2025-06-22/also-alsa-20250622-git.tgz"; + sha256 = "1aqi9pf1pr68hbncxqwsymsvv21cmwgqyczp2rszy843r9ffrwrl"; system = "also-alsa"; asd = "also-alsa"; } @@ -2084,7 +2381,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "alternate-asdf-system-connections" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/alternate-asdf-system-connections/2024-10-12/alternate-asdf-system-connections-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/alternate-asdf-system-connections/2024-10-12/alternate-asdf-system-connections-20241012-git.tgz"; sha256 = "0wlmr29a8azs5kjvwdaqmfn2iwqid0f659cmj34ywchgxahdr6p6"; system = "alternate-asdf-system-connections"; asd = "alternate-asdf-system-connections"; @@ -2104,7 +2401,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "amazon-ecs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/amazon-ecs/2011-04-18/amazon-ecs-20110418-git.tgz"; + url = "https://beta.quicklisp.org/archive/amazon-ecs/2011-04-18/amazon-ecs-20110418-git.tgz"; sha256 = "1gi3ybfkdfqvgmwgf0l77xpp5xgmkbycdpz6kn79vm0iga3kd2mz"; system = "amazon-ecs"; asd = "amazon-ecs"; @@ -2135,7 +2432,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "amb" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/amb/2023-02-14/amb-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/amb/2023-02-14/amb-20230214-git.tgz"; sha256 = "014vpsqxjnsr0x2zql6xpz0kh448p3lqw521amsf6700jqa2s1wp"; system = "amb"; asd = "amb"; @@ -2155,7 +2452,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "anaphora" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/anaphora/2022-02-20/anaphora-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/anaphora/2022-02-20/anaphora-20220220-git.tgz"; sha256 = "1ds5ab0rzkrhfl29xpvmvyxmkdyj9mi19p330pz603lx95njjc0b"; system = "anaphora"; asd = "anaphora"; @@ -2173,7 +2470,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "anaphoric-variants" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/anaphoric-variants/2012-10-13/anaphoric-variants-1.0.1.tgz"; + url = "https://beta.quicklisp.org/archive/anaphoric-variants/2012-10-13/anaphoric-variants-1.0.1.tgz"; sha256 = "02ms01w09b9bzsdsr0icd3ggyl86kyxk164kf0759k2k9y6kjsp5"; system = "anaphoric-variants"; asd = "anaphoric-variants"; @@ -2189,12 +2486,12 @@ lib.makeScope pkgs.newScope (self: { anatevka = ( build-asdf-system { pname = "anatevka"; - version = "v1.0.1"; + version = "v1.1.0"; asds = [ "anatevka" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/anatevka/2024-10-12/anatevka-v1.0.1.tgz"; - sha256 = "1cxrbbb947pccy6532cxqrdlkfpm0m6z135mnyaiplfsd77jy772"; + url = "https://beta.quicklisp.org/archive/anatevka/2025-06-22/anatevka-v1.1.0.tgz"; + sha256 = "0cxx28fzs2bmq2mwvw86sh7rrqvnp5ifddsckg4fp8g6ajrb6zjr"; system = "anatevka"; asd = "anatevka"; } @@ -2209,31 +2506,53 @@ lib.makeScope pkgs.newScope (self: { }; } ); - anatevka-tests = ( + anathema = ( build-asdf-system { - pname = "anatevka-tests"; - version = "v1.0.1"; - asds = [ "anatevka-tests" ]; + pname = "anathema"; + version = "production-0ae10e2a-git"; + asds = [ "anathema" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/anatevka/2024-10-12/anatevka-v1.0.1.tgz"; - sha256 = "1cxrbbb947pccy6532cxqrdlkfpm0m6z135mnyaiplfsd77jy772"; - system = "anatevka-tests"; - asd = "anatevka-tests"; + url = "https://beta.quicklisp.org/archive/anathema/2025-06-22/anathema-production-0ae10e2a-git.tgz"; + sha256 = "0cqi5f4x5yqhn6rh8kmax2fqshqfcpf68glz8fvwyw7v35plsn5x"; + system = "anathema"; + asd = "anathema"; } ); - systems = [ "anatevka-tests" ]; + systems = [ "anathema" ]; lispLibs = [ - (getAttr "anatevka" self) + (getAttr "alexandria" self) + (getAttr "cl-colors2" self) + (getAttr "clim" self) (getAttr "closer-mop" self) - (getAttr "fiasco" self) - (getAttr "trivial-garbage" self) + (getAttr "serapeum" self) + (getAttr "split-sequence" self) ]; meta = { hydraPlatforms = [ ]; }; } ); + anathema-doom = ( + build-asdf-system { + pname = "anathema-doom"; + version = "production-0ae10e2a-git"; + asds = [ "anathema-doom" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/anathema/2025-06-22/anathema-production-0ae10e2a-git.tgz"; + sha256 = "0cqi5f4x5yqhn6rh8kmax2fqshqfcpf68glz8fvwyw7v35plsn5x"; + system = "anathema-doom"; + asd = "anathema-doom"; + } + ); + systems = [ "anathema-doom" ]; + lispLibs = [ (getAttr "anathema" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); ansi-escape = ( build-asdf-system { pname = "ansi-escape"; @@ -2241,7 +2560,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ansi-escape" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/croatoan/2024-10-12/croatoan-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/croatoan/2024-10-12/croatoan-20241012-git.tgz"; sha256 = "04776x4i8inxs8n4mgy9xf0q39bzv4mfz4cl880sxwk6mnhwnn4c"; system = "ansi-escape"; asd = "ansi-escape"; @@ -2261,7 +2580,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ansi-escape-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/croatoan/2024-10-12/croatoan-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/croatoan/2024-10-12/croatoan-20241012-git.tgz"; sha256 = "04776x4i8inxs8n4mgy9xf0q39bzv4mfz4cl880sxwk6mnhwnn4c"; system = "ansi-escape-test"; asd = "ansi-escape-test"; @@ -2281,7 +2600,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ansi-test-harness" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ansi-test-harness/2023-10-21/ansi-test-harness-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/ansi-test-harness/2023-10-21/ansi-test-harness-20231021-git.tgz"; sha256 = "168q2358ag5lf7k8378462279q0izllbwqr1axljm0nsn6d4g0yl"; system = "ansi-test-harness"; asd = "ansi-test-harness"; @@ -2301,7 +2620,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "antik" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/antik/2024-10-12/antik-master-df14cb8c-git.tgz"; + url = "https://beta.quicklisp.org/archive/antik/2024-10-12/antik-master-df14cb8c-git.tgz"; sha256 = "1n08cx4n51z8v4bxyak166lp495xda3x7llfxcdpxndxqxcammr0"; system = "antik"; asd = "antik"; @@ -2324,7 +2643,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "antik-base" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/antik/2024-10-12/antik-master-df14cb8c-git.tgz"; + url = "https://beta.quicklisp.org/archive/antik/2024-10-12/antik-master-df14cb8c-git.tgz"; sha256 = "1n08cx4n51z8v4bxyak166lp495xda3x7llfxcdpxndxqxcammr0"; system = "antik-base"; asd = "antik-base"; @@ -2352,7 +2671,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "anypool" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/anypool/2024-10-12/anypool-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/anypool/2024-10-12/anypool-20241012-git.tgz"; sha256 = "1ffssc5fzh7gj0z94xxfb3mk5cwja65lrhxyfgib15a6yxqf1kk1"; system = "anypool"; asd = "anypool"; @@ -2371,12 +2690,12 @@ lib.makeScope pkgs.newScope (self: { aplesque = ( build-asdf-system { pname = "aplesque"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "aplesque" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz"; - sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn"; + url = "https://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz"; + sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf"; system = "aplesque"; asd = "aplesque"; } @@ -2402,7 +2721,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "application" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; system = "application"; asd = "application"; @@ -2426,12 +2745,12 @@ lib.makeScope pkgs.newScope (self: { apply-argv = ( build-asdf-system { pname = "apply-argv"; - version = "20150608-git"; + version = "20250622-git"; asds = [ "apply-argv" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/apply-argv/2015-06-08/apply-argv-20150608-git.tgz"; - sha256 = "19qj847vyawjgm5iwk96469c0plnxj37948ac1bcd86hgpbm75w0"; + url = "https://beta.quicklisp.org/archive/apply-argv/2025-06-22/apply-argv-20250622-git.tgz"; + sha256 = "1g15210azg5275zh9p3m9mbvwzlxasgkxl5c3m4bhq8v0pjws2m0"; system = "apply-argv"; asd = "apply-argv"; } @@ -2443,38 +2762,15 @@ lib.makeScope pkgs.newScope (self: { }; } ); - apply-argv-tests = ( - build-asdf-system { - pname = "apply-argv-tests"; - version = "20150608-git"; - asds = [ "apply-argv-tests" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/apply-argv/2015-06-08/apply-argv-20150608-git.tgz"; - sha256 = "19qj847vyawjgm5iwk96469c0plnxj37948ac1bcd86hgpbm75w0"; - system = "apply-argv-tests"; - asd = "apply-argv"; - } - ); - systems = [ "apply-argv-tests" ]; - lispLibs = [ - (getAttr "apply-argv" self) - (getAttr "fiveam" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); april = ( build-asdf-system { pname = "april"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "april" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz"; - sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn"; + url = "https://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz"; + sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf"; system = "april"; asd = "april"; } @@ -2504,12 +2800,12 @@ lib.makeScope pkgs.newScope (self: { april-demo_dot_cnn = ( build-asdf-system { pname = "april-demo.cnn"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "april-demo.cnn" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz"; - sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn"; + url = "https://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz"; + sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf"; system = "april-demo.cnn"; asd = "april-demo.cnn"; } @@ -2527,12 +2823,12 @@ lib.makeScope pkgs.newScope (self: { april-demo_dot_fnn = ( build-asdf-system { pname = "april-demo.fnn"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "april-demo.fnn" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz"; - sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn"; + url = "https://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz"; + sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf"; system = "april-demo.fnn"; asd = "april-demo.fnn"; } @@ -2548,15 +2844,39 @@ lib.makeScope pkgs.newScope (self: { }; } ); + april-demo_dot_ncurses = ( + build-asdf-system { + pname = "april-demo.ncurses"; + version = "20250622-git"; + asds = [ "april-demo.ncurses" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz"; + sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf"; + system = "april-demo.ncurses"; + asd = "april-demo.ncurses"; + } + ); + systems = [ "april-demo.ncurses" ]; + lispLibs = [ + (getAttr "april" self) + (getAttr "croatoan" self) + (getAttr "lparallel" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); april-lib_dot_dfns_dot_array = ( build-asdf-system { pname = "april-lib.dfns.array"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "april-lib.dfns.array" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz"; - sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn"; + url = "https://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz"; + sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf"; system = "april-lib.dfns.array"; asd = "april-lib.dfns.array"; } @@ -2571,12 +2891,12 @@ lib.makeScope pkgs.newScope (self: { april-lib_dot_dfns_dot_graph = ( build-asdf-system { pname = "april-lib.dfns.graph"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "april-lib.dfns.graph" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz"; - sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn"; + url = "https://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz"; + sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf"; system = "april-lib.dfns.graph"; asd = "april-lib.dfns.graph"; } @@ -2594,12 +2914,12 @@ lib.makeScope pkgs.newScope (self: { april-lib_dot_dfns_dot_numeric = ( build-asdf-system { pname = "april-lib.dfns.numeric"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "april-lib.dfns.numeric" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz"; - sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn"; + url = "https://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz"; + sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf"; system = "april-lib.dfns.numeric"; asd = "april-lib.dfns.numeric"; } @@ -2617,12 +2937,12 @@ lib.makeScope pkgs.newScope (self: { april-lib_dot_dfns_dot_power = ( build-asdf-system { pname = "april-lib.dfns.power"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "april-lib.dfns.power" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz"; - sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn"; + url = "https://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz"; + sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf"; system = "april-lib.dfns.power"; asd = "april-lib.dfns.power"; } @@ -2640,12 +2960,12 @@ lib.makeScope pkgs.newScope (self: { april-lib_dot_dfns_dot_string = ( build-asdf-system { pname = "april-lib.dfns.string"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "april-lib.dfns.string" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz"; - sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn"; + url = "https://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz"; + sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf"; system = "april-lib.dfns.string"; asd = "april-lib.dfns.string"; } @@ -2663,12 +2983,12 @@ lib.makeScope pkgs.newScope (self: { april-lib_dot_dfns_dot_tree = ( build-asdf-system { pname = "april-lib.dfns.tree"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "april-lib.dfns.tree" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz"; - sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn"; + url = "https://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz"; + sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf"; system = "april-lib.dfns.tree"; asd = "april-lib.dfns.tree"; } @@ -2687,12 +3007,12 @@ lib.makeScope pkgs.newScope (self: { april-xt_dot_uzuki = ( build-asdf-system { pname = "april-xt.uzuki"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "april-xt.uzuki" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz"; - sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn"; + url = "https://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz"; + sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf"; system = "april-xt.uzuki"; asd = "april-xt.uzuki"; } @@ -2711,7 +3031,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "arc-compat" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/arc-compat/2024-10-12/arc-compat-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/arc-compat/2024-10-12/arc-compat-20241012-git.tgz"; sha256 = "1wmq5mvlkvdbl4562p3n7x8bhv3swjj0yqbly07y8mv0snasns8d"; system = "arc-compat"; asd = "arc-compat"; @@ -2738,7 +3058,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "architecture.builder-protocol" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2024-10-12/architecture.builder-protocol-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/architecture.builder-protocol/2024-10-12/architecture.builder-protocol-20241012-git.tgz"; sha256 = "1ckrv0ca57xvsvd9rwjcq0yljiv76wj22p1pjpjbjfr5clb9gl0q"; system = "architecture.builder-protocol"; asd = "architecture.builder-protocol"; @@ -2758,7 +3078,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "architecture.builder-protocol.inspection" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2024-10-12/architecture.builder-protocol-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/architecture.builder-protocol/2024-10-12/architecture.builder-protocol-20241012-git.tgz"; sha256 = "1ckrv0ca57xvsvd9rwjcq0yljiv76wj22p1pjpjbjfr5clb9gl0q"; system = "architecture.builder-protocol.inspection"; asd = "architecture.builder-protocol.inspection"; @@ -2781,7 +3101,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "architecture.builder-protocol.json" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2024-10-12/architecture.builder-protocol-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/architecture.builder-protocol/2024-10-12/architecture.builder-protocol-20241012-git.tgz"; sha256 = "1ckrv0ca57xvsvd9rwjcq0yljiv76wj22p1pjpjbjfr5clb9gl0q"; system = "architecture.builder-protocol.json"; asd = "architecture.builder-protocol.json"; @@ -2805,7 +3125,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "architecture.builder-protocol.print-tree" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2024-10-12/architecture.builder-protocol-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/architecture.builder-protocol/2024-10-12/architecture.builder-protocol-20241012-git.tgz"; sha256 = "1ckrv0ca57xvsvd9rwjcq0yljiv76wj22p1pjpjbjfr5clb9gl0q"; system = "architecture.builder-protocol.print-tree"; asd = "architecture.builder-protocol.print-tree"; @@ -2829,7 +3149,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "architecture.builder-protocol.universal-builder" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2024-10-12/architecture.builder-protocol-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/architecture.builder-protocol/2024-10-12/architecture.builder-protocol-20241012-git.tgz"; sha256 = "1ckrv0ca57xvsvd9rwjcq0yljiv76wj22p1pjpjbjfr5clb9gl0q"; system = "architecture.builder-protocol.universal-builder"; asd = "architecture.builder-protocol.universal-builder"; @@ -2853,7 +3173,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "architecture.builder-protocol.xpath" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2024-10-12/architecture.builder-protocol-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/architecture.builder-protocol/2024-10-12/architecture.builder-protocol-20241012-git.tgz"; sha256 = "1ckrv0ca57xvsvd9rwjcq0yljiv76wj22p1pjpjbjfr5clb9gl0q"; system = "architecture.builder-protocol.xpath"; asd = "architecture.builder-protocol.xpath"; @@ -2877,7 +3197,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "architecture.service-provider" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/architecture.service-provider/2019-10-07/architecture.service-provider-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/architecture.service-provider/2019-10-07/architecture.service-provider-20191007-git.tgz"; sha256 = "0n4a299md5z0wvk6j3my4ii6cs198fqgizz1swic89p1qz5n2fjm"; system = "architecture.service-provider"; asd = "architecture.service-provider"; @@ -2902,7 +3222,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "architecture.service-provider-and-hooks" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/architecture.service-provider/2019-10-07/architecture.service-provider-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/architecture.service-provider/2019-10-07/architecture.service-provider-20191007-git.tgz"; sha256 = "0n4a299md5z0wvk6j3my4ii6cs198fqgizz1swic89p1qz5n2fjm"; system = "architecture.service-provider-and-hooks"; asd = "architecture.service-provider-and-hooks"; @@ -2925,7 +3245,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "archive" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/archive/2016-03-18/archive-20160318-git.tgz"; + url = "https://beta.quicklisp.org/archive/archive/2016-03-18/archive-20160318-git.tgz"; sha256 = "0pvsc9fmybx7rxd0kmzq4shi6hszdpwdc1sfy7jwyfxf8n3hnv4p"; system = "archive"; asd = "archive"; @@ -2948,7 +3268,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "arith" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/paren-test/2017-08-30/paren-test-20170830-git.tgz"; + url = "https://beta.quicklisp.org/archive/paren-test/2017-08-30/paren-test-20170830-git.tgz"; sha256 = "0b2d3kcv3n4b0dm67pzhxx8wxjsgnb32bw2dsprblc7149gaczdr"; system = "arith"; asd = "arith"; @@ -2972,7 +3292,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "arithmetic-operators-as-words" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/arithmetic-operators-as-words/2020-06-10/arithmetic-operators-as-words-20200610-git.tgz"; + url = "https://beta.quicklisp.org/archive/arithmetic-operators-as-words/2020-06-10/arithmetic-operators-as-words-20200610-git.tgz"; sha256 = "1bcfkbq3kqns2ng0cdmj81c72j63641pqlskg4xrzkgkh25bhkks"; system = "arithmetic-operators-as-words"; asd = "arithmetic-operators-as-words"; @@ -2988,12 +3308,12 @@ lib.makeScope pkgs.newScope (self: { arnesi = ( build-asdf-system { pname = "arnesi"; - version = "20170403-git"; + version = "20250622-git"; asds = [ "arnesi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/arnesi/2017-04-03/arnesi-20170403-git.tgz"; - sha256 = "0jgj2xgd1gq6rf8ia43lkmbrbxnp8rgs053br9azfa25ygk3ikbh"; + url = "https://beta.quicklisp.org/archive/arnesi/2025-06-22/arnesi-20250622-git.tgz"; + sha256 = "1z99bmvlb2rhklad6dbvc4wnvp2b2ixdjvm9s1bsa9qryz360p99"; system = "arnesi"; asd = "arnesi"; } @@ -3010,7 +3330,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "array-operations" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/array-operations/2023-10-21/array-operations-1.2.1.tgz"; + url = "https://beta.quicklisp.org/archive/array-operations/2023-10-21/array-operations-1.2.1.tgz"; sha256 = "06zg7ds7c1vi59zxzrd52a9zfpw8x0jsf1hqcdgaz8s3dcfma3mn"; system = "array-operations"; asd = "array-operations"; @@ -3031,7 +3351,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "array-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/array-utils/2024-10-12/array-utils-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/array-utils/2024-10-12/array-utils-20241012-git.tgz"; sha256 = "0rya7k9sfpyrn5vrn12wywpgsr2f0pmcywv51ixzb0sv8ska0mhs"; system = "array-utils"; asd = "array-utils"; @@ -3049,7 +3369,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "array-utils-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/array-utils/2024-10-12/array-utils-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/array-utils/2024-10-12/array-utils-20241012-git.tgz"; sha256 = "0rya7k9sfpyrn5vrn12wywpgsr2f0pmcywv51ixzb0sv8ska0mhs"; system = "array-utils-test"; asd = "array-utils-test"; @@ -3072,7 +3392,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "arrival" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/arrival/2021-12-09/arrival-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/arrival/2021-12-09/arrival-20211209-git.tgz"; sha256 = "1iwdk5fdismw91ln5wdnn8c8xv06fbgiwbvdj2gy2hpp8f3qk00b"; system = "arrival"; asd = "arrival"; @@ -3098,7 +3418,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "arrow-macros" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/arrow-macros/2024-10-12/arrow-macros-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/arrow-macros/2024-10-12/arrow-macros-20241012-git.tgz"; sha256 = "0q4vpysk4h9ghs5zmnzzilky9jyz7i8n0x0p98nq528crbrkh6c4"; system = "arrow-macros"; asd = "arrow-macros"; @@ -3118,7 +3438,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "arrow-macros-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/arrow-macros/2024-10-12/arrow-macros-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/arrow-macros/2024-10-12/arrow-macros-20241012-git.tgz"; sha256 = "0q4vpysk4h9ghs5zmnzzilky9jyz7i8n0x0p98nq528crbrkh6c4"; system = "arrow-macros-test"; asd = "arrow-macros-test"; @@ -3141,7 +3461,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "arrows" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/arrows/2018-10-18/arrows-20181018-git.tgz"; + url = "https://beta.quicklisp.org/archive/arrows/2018-10-18/arrows-20181018-git.tgz"; sha256 = "042k9vkssrqx9nhp14wdzm942zgdxvp35mba0p2syz98i75im2yy"; system = "arrows"; asd = "arrows"; @@ -3159,7 +3479,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ascii-strings" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-string-match/2021-12-09/cl-string-match-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-string-match/2021-12-09/cl-string-match-20211209-git.tgz"; sha256 = "0zndlkw3qy3vw4px4qv884z6232w8zfaliyc88irjwizdv35wcq9"; system = "ascii-strings"; asd = "ascii-strings"; @@ -3182,7 +3502,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "asd-generator" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/asd-generator/2019-01-07/asd-generator-20190107-git.tgz"; + url = "https://beta.quicklisp.org/archive/asd-generator/2019-01-07/asd-generator-20190107-git.tgz"; sha256 = "0yiybl7b9x1f85v0drj0yw9821y3yfhya4n6gycnv5vvx6jp9by4"; system = "asd-generator"; asd = "asd-generator"; @@ -3207,7 +3527,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "asd-generator-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/asd-generator/2019-01-07/asd-generator-20190107-git.tgz"; + url = "https://beta.quicklisp.org/archive/asd-generator/2019-01-07/asd-generator-20190107-git.tgz"; sha256 = "0yiybl7b9x1f85v0drj0yw9821y3yfhya4n6gycnv5vvx6jp9by4"; system = "asd-generator-test"; asd = "asd-generator-test"; @@ -3231,7 +3551,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "asdf-dependency-graph" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/asdf-dependency-graph/2023-06-18/asdf-dependency-graph-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/asdf-dependency-graph/2023-06-18/asdf-dependency-graph-20230618-git.tgz"; sha256 = "1m3cgjmr5fzyas33gjnahcbjiiksr02h2lwdxxl35y2dbip8pygp"; system = "asdf-dependency-graph"; asd = "asdf-dependency-graph"; @@ -3251,7 +3571,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "asdf-dependency-grovel" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/asdf-dependency-grovel/2017-04-03/asdf-dependency-grovel-20170403-git.tgz"; + url = "https://beta.quicklisp.org/archive/asdf-dependency-grovel/2017-04-03/asdf-dependency-grovel-20170403-git.tgz"; sha256 = "1y4kdqsda4ira4r9dws6kxzzv6mg45q3lkmb2c9mg9q7ksc5glif"; system = "asdf-dependency-grovel"; asd = "asdf-dependency-grovel"; @@ -3271,7 +3591,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "asdf-driver" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/uiop/2024-10-12/uiop-3.3.7.tgz"; + url = "https://beta.quicklisp.org/archive/uiop/2024-10-12/uiop-3.3.7.tgz"; sha256 = "0xvzxglkf9hlly7if0l307k31kwglk2ay4k393545c1l5l1ac584"; system = "asdf-driver"; asd = "asdf-driver"; @@ -3291,7 +3611,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "asdf-encodings" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/asdf-encodings/2019-10-07/asdf-encodings-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/asdf-encodings/2019-10-07/asdf-encodings-20191007-git.tgz"; sha256 = "1yn77nhrz5w2s7nlafxjnk9j8fsrz7ivrm7nbj4r726bwc5knky6"; system = "asdf-encodings"; asd = "asdf-encodings"; @@ -3311,7 +3631,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "asdf-finalizers" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/asdf-finalizers/2022-11-06/asdf-finalizers-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/asdf-finalizers/2022-11-06/asdf-finalizers-20221106-git.tgz"; sha256 = "1w56c9yjjydjshsgqxz57qlp2v3r4ilbisnsgiqphvxnhvd41y0v"; system = "asdf-finalizers"; asd = "asdf-finalizers"; @@ -3331,7 +3651,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "asdf-linguist" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/asdf-linguist/2015-09-23/asdf-linguist-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/asdf-linguist/2015-09-23/asdf-linguist-20150923-git.tgz"; sha256 = "14jaqmxxh70f1jf58mxb117951iql2sjxymmbjyqniqwazznbd9a"; system = "asdf-linguist"; asd = "asdf-linguist"; @@ -3354,7 +3674,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "asdf-manager" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/asdf-manager/2016-02-08/asdf-manager-20160208-git.tgz"; + url = "https://beta.quicklisp.org/archive/asdf-manager/2016-02-08/asdf-manager-20160208-git.tgz"; sha256 = "0jw7d0vg13v1l1fwwhsw04n6w3c49vsbmq6vrlrkh95aayc5413w"; system = "asdf-manager"; asd = "asdf-manager"; @@ -3377,7 +3697,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "asdf-manager-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/asdf-manager/2016-02-08/asdf-manager-20160208-git.tgz"; + url = "https://beta.quicklisp.org/archive/asdf-manager/2016-02-08/asdf-manager-20160208-git.tgz"; sha256 = "0jw7d0vg13v1l1fwwhsw04n6w3c49vsbmq6vrlrkh95aayc5413w"; system = "asdf-manager-test"; asd = "asdf-manager-test"; @@ -3400,7 +3720,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "asdf-nst" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz"; sha256 = "1hf3r6pqbnd9vsd1i24qmz928kia72hdgmiafiwb6jw1hmj3r6ga"; system = "asdf-nst"; asd = "asdf-nst"; @@ -3420,7 +3740,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "asdf-package-system" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/asdf-package-system/2015-06-08/asdf-package-system-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/asdf-package-system/2015-06-08/asdf-package-system-20150608-git.tgz"; sha256 = "1q4qgvbl64c4zdbq91by1la8licdgam7ybnhvg2bixdhq4v693sj"; system = "asdf-package-system"; asd = "asdf-package-system"; @@ -3438,7 +3758,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "asdf-system-connections" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/asdf-system-connections/2017-01-24/asdf-system-connections-20170124-git.tgz"; + url = "https://beta.quicklisp.org/archive/asdf-system-connections/2017-01-24/asdf-system-connections-20170124-git.tgz"; sha256 = "06kg0m8bv383qq3r34x0f8hz6p6zxcw02qn7kj960vcnrp5a5b3y"; system = "asdf-system-connections"; asd = "asdf-system-connections"; @@ -3456,7 +3776,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "asdf-viz" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/asdf-viz/2020-06-10/asdf-viz-20200610-git.tgz"; + url = "https://beta.quicklisp.org/archive/asdf-viz/2020-06-10/asdf-viz-20200610-git.tgz"; sha256 = "1hj9ac1m2kz8x65n62gd1s2k2x9pip9a85pnmib53qsks3a9sc4z"; system = "asdf-viz"; asd = "asdf-viz"; @@ -3482,7 +3802,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "aserve" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/portableaserve/2019-08-13/portableaserve-20190813-git.tgz"; + url = "https://beta.quicklisp.org/archive/portableaserve/2019-08-13/portableaserve-20190813-git.tgz"; sha256 = "0ak6mqp84sjr0a7h5svr16vra4bf4fcx6wpir0n88dc1vjwy5xqa"; system = "aserve"; asd = "aserve"; @@ -3505,7 +3825,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "asn1" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/asn1/2022-03-31/asn1-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/asn1/2022-03-31/asn1-20220331-git.tgz"; sha256 = "16gs4xznmg19ii0cg7g2yxrk9ls5vah8ynjj80s99rv8wi3789z1"; system = "asn1"; asd = "asn1"; @@ -3529,7 +3849,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "assert-p" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/assert-p/2020-06-10/assert-p-20200610-git.tgz"; + url = "https://beta.quicklisp.org/archive/assert-p/2020-06-10/assert-p-20200610-git.tgz"; sha256 = "1x24rkqkqiw8zd26swi9rmhfplkmr5scz3bhjwccah9d2s36b1xs"; system = "assert-p"; asd = "assert-p"; @@ -3552,7 +3872,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "assertion-error" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/assertion-error/2019-12-27/assertion-error-20191227-git.tgz"; + url = "https://beta.quicklisp.org/archive/assertion-error/2019-12-27/assertion-error-20191227-git.tgz"; sha256 = "0ix23kkakmf4nwx852zsssb831jvajr3qyppqfyks7y1ls617svn"; system = "assertion-error"; asd = "assertion-error"; @@ -3572,7 +3892,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "assoc-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/assoc-utils/2024-10-12/assoc-utils-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/assoc-utils/2024-10-12/assoc-utils-20241012-git.tgz"; sha256 = "0rgfv9qni9dnmm3qnaf1x67h0z38vw2zbmbsdk3a4x5s8ckxln6r"; system = "assoc-utils"; asd = "assoc-utils"; @@ -3592,7 +3912,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "assoc-utils-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/assoc-utils/2024-10-12/assoc-utils-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/assoc-utils/2024-10-12/assoc-utils-20241012-git.tgz"; sha256 = "0rgfv9qni9dnmm3qnaf1x67h0z38vw2zbmbsdk3a4x5s8ckxln6r"; system = "assoc-utils-test"; asd = "assoc-utils-test"; @@ -3615,7 +3935,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "asteroids" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/asteroids/2019-10-07/asteroids-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/asteroids/2019-10-07/asteroids-20191007-git.tgz"; sha256 = "1wdzwpizgy477ny6pxjshj3q25phdxsjfq8cvrbx0x7k5w8fkg50"; system = "asteroids"; asd = "asteroids"; @@ -3639,7 +3959,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "astonish" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/astonish/2021-01-24/astonish-20210124-git.tgz"; + url = "https://beta.quicklisp.org/archive/astonish/2021-01-24/astonish-20210124-git.tgz"; sha256 = "14qphx97q4gqcc71figc6r3cgy89rn9c43sh35fzxkln9ydk2pr6"; system = "astonish"; asd = "astonish"; @@ -3655,12 +3975,12 @@ lib.makeScope pkgs.newScope (self: { async-process = ( build-asdf-system { pname = "async-process"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "async-process" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/async-process/2024-10-12/async-process-20241012-git.tgz"; - sha256 = "0691z0vs5c65m24p1yi12iy27j59layzvzyy1yl19704x05442qh"; + url = "https://beta.quicklisp.org/archive/async-process/2025-06-22/async-process-20250622-git.tgz"; + sha256 = "0ykbkmcf46rgiphsb8c03xf9l4l23xn1rppm51mviz7brs0zx7g4"; system = "async-process"; asd = "async-process"; } @@ -3679,7 +3999,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "atdoc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/atdoc/2012-03-05/atdoc-20120305-git.tgz"; + url = "https://beta.quicklisp.org/archive/atdoc/2012-03-05/atdoc-20120305-git.tgz"; sha256 = "1w54phadjj00sy5qz5n0hmhzyjrx26h9hw06756zdpfbzk4f5il6"; system = "atdoc"; asd = "atdoc"; @@ -3702,12 +4022,12 @@ lib.makeScope pkgs.newScope (self: { atomics = ( build-asdf-system { pname = "atomics"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "atomics" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/atomics/2024-10-12/atomics-20241012-git.tgz"; - sha256 = "1ah6fgvfva0axnhj4sp1qy6gjyw41fkhpnv998di0wbp6hls8j39"; + url = "https://beta.quicklisp.org/archive/atomics/2025-06-22/atomics-20250622-git.tgz"; + sha256 = "14x6mahmwxjm91zvg59z189l081ww6wlia7gbamj8ydx214014cl"; system = "atomics"; asd = "atomics"; } @@ -3722,12 +4042,12 @@ lib.makeScope pkgs.newScope (self: { atomics-test = ( build-asdf-system { pname = "atomics-test"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "atomics-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/atomics/2024-10-12/atomics-20241012-git.tgz"; - sha256 = "1ah6fgvfva0axnhj4sp1qy6gjyw41fkhpnv998di0wbp6hls8j39"; + url = "https://beta.quicklisp.org/archive/atomics/2025-06-22/atomics-20250622-git.tgz"; + sha256 = "14x6mahmwxjm91zvg59z189l081ww6wlia7gbamj8ydx214014cl"; system = "atomics-test"; asd = "atomics-test"; } @@ -3749,7 +4069,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "audio-tag" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/audio-tag/2021-05-31/audio-tag-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/audio-tag/2021-05-31/audio-tag-20210531-git.tgz"; sha256 = "1k9152wakazr34q4q5x8zzv3mjjkf0n9xdg7c2qqwigwws0ysgzh"; system = "audio-tag"; asd = "audio-tag"; @@ -3772,7 +4092,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "authenticated-encryption" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/authenticated-encryption/2018-10-18/authenticated-encryption-20181018-git.tgz"; + url = "https://beta.quicklisp.org/archive/authenticated-encryption/2018-10-18/authenticated-encryption-20181018-git.tgz"; sha256 = "0cvl4g0g59z5dicg7q3f9hhqshz2m0a6l2fzic75c3yv28q8m2vr"; system = "authenticated-encryption"; asd = "authenticated-encryption"; @@ -3792,7 +4112,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "authenticated-encryption-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/authenticated-encryption/2018-10-18/authenticated-encryption-20181018-git.tgz"; + url = "https://beta.quicklisp.org/archive/authenticated-encryption/2018-10-18/authenticated-encryption-20181018-git.tgz"; sha256 = "0cvl4g0g59z5dicg7q3f9hhqshz2m0a6l2fzic75c3yv28q8m2vr"; system = "authenticated-encryption-test"; asd = "authenticated-encryption-test"; @@ -3811,12 +4131,12 @@ lib.makeScope pkgs.newScope (self: { auto-restart = ( build-asdf-system { pname = "auto-restart"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "auto-restart" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/auto-restart/2024-10-12/auto-restart-20241012-git.tgz"; - sha256 = "1kz50w4x7glin8fyrfysazz07r4rrk90daml35yrwnz08vi3dfw7"; + url = "https://beta.quicklisp.org/archive/auto-restart/2025-06-22/auto-restart-20250622-git.tgz"; + sha256 = "0dmdxq04m70b0cl2vag31f5c3gsyv46w335igzrvxy45irjb4h7v"; system = "auto-restart"; asd = "auto-restart"; } @@ -3835,7 +4155,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "autoexport" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/autoexport/2021-10-20/autoexport-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/autoexport/2021-10-20/autoexport-20211020-git.tgz"; sha256 = "15kzq4hfsracxapxik3i6sxqqnwl7cb9lisgk9krrsk13d97l844"; system = "autoexport"; asd = "autoexport"; @@ -3851,15 +4171,35 @@ lib.makeScope pkgs.newScope (self: { }; } ); + autoload = ( + build-asdf-system { + pname = "autoload"; + version = "20250622-git"; + asds = [ "autoload" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz"; + sha256 = "09wcwil8jyxm34cs7x1i3vclj84n6gxzxp21k0d23129c9adhi66"; + system = "autoload"; + asd = "autoload"; + } + ); + systems = [ "autoload" ]; + lispLibs = [ (getAttr "mgl-pax_dot_asdf" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); automaton = ( build-asdf-system { pname = "automaton"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "automaton" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "automaton"; asd = "automaton"; } @@ -3878,7 +4218,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "avatar-api" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/avatar-api/2015-06-08/avatar-api-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/avatar-api/2015-06-08/avatar-api-20150608-git.tgz"; sha256 = "026s8m0bl13iqyakfxc6zwacvpj2bxxipms1kl3k9ql99yn8imvr"; system = "avatar-api"; asd = "avatar-api"; @@ -3902,7 +4242,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "avatar-api-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/avatar-api/2015-06-08/avatar-api-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/avatar-api/2015-06-08/avatar-api-20150608-git.tgz"; sha256 = "026s8m0bl13iqyakfxc6zwacvpj2bxxipms1kl3k9ql99yn8imvr"; system = "avatar-api-test"; asd = "avatar-api-test"; @@ -3925,7 +4265,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "avl-tree" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/avl-tree/2022-07-07/avl-tree-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/avl-tree/2022-07-07/avl-tree-20220707-git.tgz"; sha256 = "1xvh5rpz0kwzx42jrnh3kgqa87z5kmgd7f3fkkydiqj04hknsj7k"; system = "avl-tree"; asd = "avl-tree"; @@ -3945,7 +4285,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "aws-foundation" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/aws-foundation/2018-07-11/aws-foundation-20180711-git.tgz"; + url = "https://beta.quicklisp.org/archive/aws-foundation/2018-07-11/aws-foundation-20180711-git.tgz"; sha256 = "1f5af22qw583frqjhnkf9wcccdkkpjiv0bbnlqqk7fxzm9pqpvhb"; system = "aws-foundation"; asd = "aws-foundation"; @@ -3968,12 +4308,12 @@ lib.makeScope pkgs.newScope (self: { aws-sdk = ( build-asdf-system { pname = "aws-sdk"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "aws-sdk" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/aws-sdk-lisp/2024-10-12/aws-sdk-lisp-20241012-git.tgz"; - sha256 = "0iqm441fr1qx5py7cvrv4jl9zgfsm813igwvq3rj90606g6lyxjc"; + url = "https://beta.quicklisp.org/archive/aws-sdk-lisp/2025-06-22/aws-sdk-lisp-20250622-git.tgz"; + sha256 = "023isx4p9laia3yq39g3zdak1zl3mc7gnkjhsx386akwdjha5j95"; system = "aws-sdk"; asd = "aws-sdk"; } @@ -3986,6 +4326,7 @@ lib.makeScope pkgs.newScope (self: { (getAttr "babel" self) (getAttr "cl-base64" self) (getAttr "cl-ppcre" self) + (getAttr "closer-mop" self) (getAttr "dexador" self) (getAttr "ironclad" self) (getAttr "kebab" self) @@ -4009,7 +4350,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "aws-sign4" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/aws-sign4/2020-12-20/aws-sign4-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/aws-sign4/2020-12-20/aws-sign4-20201220-git.tgz"; sha256 = "1bwqmy9vlq0ilwhp48y05cdfav9inwv4kai8mjj1a95776xjmjnk"; system = "aws-sign4"; asd = "aws-sign4"; @@ -4036,7 +4377,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "aws-sign4-example" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/aws-sign4/2020-12-20/aws-sign4-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/aws-sign4/2020-12-20/aws-sign4-20201220-git.tgz"; sha256 = "1bwqmy9vlq0ilwhp48y05cdfav9inwv4kai8mjj1a95776xjmjnk"; system = "aws-sign4-example"; asd = "aws-sign4"; @@ -4059,7 +4400,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "aws-sign4-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/aws-sign4/2020-12-20/aws-sign4-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/aws-sign4/2020-12-20/aws-sign4-20201220-git.tgz"; sha256 = "1bwqmy9vlq0ilwhp48y05cdfav9inwv4kai8mjj1a95776xjmjnk"; system = "aws-sign4-tests"; asd = "aws-sign4"; @@ -4079,7 +4420,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ayah-captcha" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ayah-captcha/2018-02-28/ayah-captcha-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/ayah-captcha/2018-02-28/ayah-captcha-20180228-git.tgz"; sha256 = "1l9zg0hj5cd1yda1nnab7byrgkakh5vn3qcd4lmfidbijk6kiamw"; system = "ayah-captcha"; asd = "ayah-captcha"; @@ -4102,7 +4443,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ayah-captcha-demo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ayah-captcha/2018-02-28/ayah-captcha-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/ayah-captcha/2018-02-28/ayah-captcha-20180228-git.tgz"; sha256 = "1l9zg0hj5cd1yda1nnab7byrgkakh5vn3qcd4lmfidbijk6kiamw"; system = "ayah-captcha-demo"; asd = "ayah-captcha-demo"; @@ -4126,7 +4467,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "babel" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/babel/2024-10-12/babel-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/babel/2024-10-12/babel-20241012-git.tgz"; sha256 = "0359bj3yr6frybcmg8qr5vi4q8hzbsb7hmvxdc0jgkfz3c33q667"; system = "babel"; asd = "babel"; @@ -4147,7 +4488,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "babel-streams" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/babel/2024-10-12/babel-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/babel/2024-10-12/babel-20241012-git.tgz"; sha256 = "0359bj3yr6frybcmg8qr5vi4q8hzbsb7hmvxdc0jgkfz3c33q667"; system = "babel-streams"; asd = "babel-streams"; @@ -4171,7 +4512,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "babel-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/babel/2024-10-12/babel-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/babel/2024-10-12/babel-20241012-git.tgz"; sha256 = "0359bj3yr6frybcmg8qr5vi4q8hzbsb7hmvxdc0jgkfz3c33q667"; system = "babel-tests"; asd = "babel-tests"; @@ -4194,7 +4535,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "babylon" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/babylon/2023-10-21/babylon-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/babylon/2023-10-21/babylon-20231021-git.tgz"; sha256 = "14k9kvcfyfpn74l5ij5mdc7zlj9vnlnig8piqw0wm5gq9pxmhydg"; system = "babylon"; asd = "babylon"; @@ -4213,12 +4554,12 @@ lib.makeScope pkgs.newScope (self: { base = ( build-asdf-system { pname = "base"; - version = "master-fe503896-git"; + version = "master-5a621564-git"; asds = [ "base" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz"; - sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10"; + url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; + sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; system = "base"; asd = "base"; } @@ -4237,7 +4578,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "base-blobs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/base-blobs/2020-10-16/base-blobs-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/base-blobs/2020-10-16/base-blobs-stable-git.tgz"; sha256 = "06m8rvczj309wq8by697gvrklhff5mnn5n5sky7i11bnszrxysys"; system = "base-blobs"; asd = "base-blobs"; @@ -4260,7 +4601,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "base64" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/base64/2018-10-18/base64-20181018-git.tgz"; + url = "https://beta.quicklisp.org/archive/base64/2018-10-18/base64-20181018-git.tgz"; sha256 = "0qkqcrgmcqshcsnzn4pcyk8d1j9c7pks2qf51p1hfybz5shxkqkh"; system = "base64"; asd = "base64"; @@ -4280,7 +4621,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "basic-binary-ipc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/basic-binary-ipc/2021-12-09/basic-binary-ipc-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/basic-binary-ipc/2021-12-09/basic-binary-ipc-20211209-git.tgz"; sha256 = "0bsxy27mnmzr6vys96cs2is57zvk0n9hlif9llnp4q9m2wzycbwm"; system = "basic-binary-ipc"; asd = "basic-binary-ipc"; @@ -4300,7 +4641,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "basic-binary-ipc-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/basic-binary-ipc/2021-12-09/basic-binary-ipc-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/basic-binary-ipc/2021-12-09/basic-binary-ipc-20211209-git.tgz"; sha256 = "0bsxy27mnmzr6vys96cs2is57zvk0n9hlif9llnp4q9m2wzycbwm"; system = "basic-binary-ipc-tests"; asd = "basic-binary-ipc-tests"; @@ -4317,15 +4658,64 @@ lib.makeScope pkgs.newScope (self: { }; } ); + batis = ( + build-asdf-system { + pname = "batis"; + version = "20250622-git"; + asds = [ "batis" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-batis/2025-06-22/cl-batis-20250622-git.tgz"; + sha256 = "1hmgvp32ivs34xj6a5nnrmj16kphdckz1ygfkrb5f0iwr305qbjf"; + system = "batis"; + asd = "batis"; + } + ); + systems = [ "batis" ]; + lispLibs = [ + (getAttr "cl-dbi" self) + (getAttr "cl-dbi-connection-pool" self) + (getAttr "cl-ppcre" self) + (getAttr "cl-syntax" self) + (getAttr "cl-syntax-annot" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + batis-test = ( + build-asdf-system { + pname = "batis-test"; + version = "20250622-git"; + asds = [ "batis-test" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-batis/2025-06-22/cl-batis-20250622-git.tgz"; + sha256 = "1hmgvp32ivs34xj6a5nnrmj16kphdckz1ygfkrb5f0iwr305qbjf"; + system = "batis-test"; + asd = "batis-test"; + } + ); + systems = [ "batis-test" ]; + lispLibs = [ + (getAttr "batis" self) + (getAttr "rove" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); bdef = ( build-asdf-system { pname = "bdef"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "bdef" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bdef/2024-10-12/bdef-20241012-git.tgz"; - sha256 = "16jz9fxxjcpnmhx0yagv8xs7l0b7qh8yx7i7p8fnlxz3pn7726y6"; + url = "https://beta.quicklisp.org/archive/bdef/2025-06-22/bdef-20250622-git.tgz"; + sha256 = "0cq89xn527ryq140j2i08zpyz4lsyb90zz3hrh2qx841k73168i5"; system = "bdef"; asd = "bdef"; } @@ -4333,6 +4723,7 @@ lib.makeScope pkgs.newScope (self: { systems = [ "bdef" ]; lispLibs = [ (getAttr "alexandria" self) + (getAttr "closer-mop" self) (getAttr "eager-future2" self) (getAttr "jsown" self) (getAttr "mutility" self) @@ -4350,7 +4741,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "beast" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/beast/2021-10-20/beast-20211020-hg.tgz"; + url = "https://beta.quicklisp.org/archive/beast/2021-10-20/beast-20211020-hg.tgz"; sha256 = "0rb7yxr4clsdbgyjz9d8inxgj7zs0knrngl7gb6b8ky1vyrv12k4"; system = "beast"; asd = "beast"; @@ -4370,7 +4761,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "beirc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/beirc/2015-05-05/beirc-20150505-git.tgz"; + url = "https://beta.quicklisp.org/archive/beirc/2015-05-05/beirc-20150505-git.tgz"; sha256 = "1jmxihxln51vxy85r3zx0gfrzs9ng8nmj87j5ws1fg8bwv8b2zc4"; system = "beirc"; asd = "beirc"; @@ -4396,7 +4787,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bencode" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-bencode/2018-02-28/cl-bencode-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-bencode/2018-02-28/cl-bencode-20180228-git.tgz"; sha256 = "02n9cv5jbgzjwmw11c1a557r62m4i4gmmx38csscbq0cv6vzys1j"; system = "bencode"; asd = "bencode"; @@ -4416,7 +4807,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bencode-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-bencode/2018-02-28/cl-bencode-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-bencode/2018-02-28/cl-bencode-20180228-git.tgz"; sha256 = "02n9cv5jbgzjwmw11c1a557r62m4i4gmmx38csscbq0cv6vzys1j"; system = "bencode-test"; asd = "bencode"; @@ -4440,7 +4831,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bermuda" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pal/2015-06-08/pal-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/pal/2015-06-08/pal-20150608-git.tgz"; sha256 = "0kn6jxirrn7wzqymzsi0kx2ivl0nrrcgbl4dm1714s48qw0jwhcw"; system = "bermuda"; asd = "bermuda"; @@ -4460,7 +4851,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bert" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-bert/2014-11-06/cl-bert-20141106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-bert/2014-11-06/cl-bert-20141106-git.tgz"; sha256 = "18cyk63dmcqqwsld4h65mzscgjsc085ws69z097naqm1r70kkygr"; system = "bert"; asd = "bert"; @@ -4483,7 +4874,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bibtex" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-bibtex/2018-12-10/cl-bibtex-20181210-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-bibtex/2018-12-10/cl-bibtex-20181210-git.tgz"; sha256 = "1rb4yf1z0vvl6z4kyj0s81kq1pvxwpvbgiaraqllgj1wpf51m78h"; system = "bibtex"; asd = "bibtex"; @@ -4503,7 +4894,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "big-string" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/big-string/2023-06-18/big-string-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/big-string/2023-06-18/big-string-20230618-git.tgz"; sha256 = "03w0y3x9sm0fv0dclmrnh55i83nviz7pw7mdg6di05gw03bnslrc"; system = "big-string"; asd = "big-string"; @@ -4516,15 +4907,48 @@ lib.makeScope pkgs.newScope (self: { }; } ); + bike = ( + build-asdf-system { + pname = "bike"; + version = "20250622-git"; + asds = [ "bike" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/bike/2025-06-22/bike-20250622-git.tgz"; + sha256 = "1d7jcmhqvyc7g4hw76sybc40xla32abpdxjlma677shvvfv9qv5c"; + system = "bike"; + asd = "bike"; + } + ); + systems = [ "bike" ]; + lispLibs = [ + (getAttr "alexandria" self) + (getAttr "bike-internals" self) + (getAttr "bordeaux-threads" self) + (getAttr "cffi" self) + (getAttr "cl-ppcre" self) + (getAttr "closer-mop" self) + (getAttr "flexi-streams" self) + (getAttr "global-vars" self) + (getAttr "named-readtables" self) + (getAttr "split-sequence" self) + (getAttr "trivial-features" self) + (getAttr "trivial-garbage" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); bike-internals = ( build-asdf-system { pname = "bike-internals"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "bike-internals" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bike/2024-10-12/bike-20241012-git.tgz"; - sha256 = "0ssv4n39wl3i0r8gy2sg6rxfz571jcfsd6db9ndy13drqnhyda6s"; + url = "https://beta.quicklisp.org/archive/bike/2025-06-22/bike-20250622-git.tgz"; + sha256 = "1d7jcmhqvyc7g4hw76sybc40xla32abpdxjlma677shvvfv9qv5c"; system = "bike-internals"; asd = "bike-internals"; } @@ -4550,12 +4974,12 @@ lib.makeScope pkgs.newScope (self: { binary-io = ( build-asdf-system { pname = "binary-io"; - version = "20201016-git"; + version = "20250622-git"; asds = [ "binary-io" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/binary-io/2020-10-16/binary-io-20201016-git.tgz"; - sha256 = "0gxnl12nydh8aslw78jc4cmq8licj342y2f04jalqb4d9m9jbri2"; + url = "https://beta.quicklisp.org/archive/binary-io/2025-06-22/binary-io-20250622-git.tgz"; + sha256 = "1pwvmbnzs15dfvb67b5wchch2b24h6lfs30676y4h4m84jqjr0vg"; system = "binary-io"; asd = "binary-io"; } @@ -4573,12 +4997,12 @@ lib.makeScope pkgs.newScope (self: { binary-lass = ( build-asdf-system { pname = "binary-lass"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "binary-lass" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lass/2024-10-12/lass-20241012-git.tgz"; - sha256 = "1b6a3v763i5fcdxczffd59kh4m73p4ilz6az85apd22apc8lr80z"; + url = "https://beta.quicklisp.org/archive/lass/2025-06-22/lass-20250622-git.tgz"; + sha256 = "0pj9p7asqaqjakjjn8i7k6lb9piakjxd8xa732c88q5qijbmvkb2"; system = "binary-lass"; asd = "binary-lass"; } @@ -4597,7 +5021,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "binary-parser" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/binary-parser/2023-02-14/binary-parser-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/binary-parser/2023-02-14/binary-parser-20230214-git.tgz"; sha256 = "06lq5iv0ap6qnsrc73rmnr9qirllyz4yxsvimj6ny5wl2hn8i9jl"; system = "binary-parser"; asd = "binary-parser"; @@ -4622,7 +5046,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "binary-search-tree" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/binary-search-tree/2022-07-07/binary-search-tree-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/binary-search-tree/2022-07-07/binary-search-tree-20220707-git.tgz"; sha256 = "1k7p5dgziwni5yma7q3sbnr23kk2730vzb7ap6knnazpp0smgclf"; system = "binary-search-tree"; asd = "binary-search-tree"; @@ -4638,12 +5062,12 @@ lib.makeScope pkgs.newScope (self: { binary-structures = ( build-asdf-system { pname = "binary-structures"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "binary-structures" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/binary-structures/2024-10-12/binary-structures-20241012-git.tgz"; - sha256 = "1ygfa4xgd0wliggmmxlqqh9nd7hfsgjwl168l8s9r595vx6fnzmb"; + url = "https://beta.quicklisp.org/archive/binary-structures/2025-06-22/binary-structures-20250622-git.tgz"; + sha256 = "15i2s639pc1s6jw1zzlh114bgkzv61ykdi51g1dah206fwp4lbn7"; system = "binary-structures"; asd = "binary-structures"; } @@ -4669,7 +5093,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "binary-types" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/binary-types/2013-06-15/binary-types-20130615-git.tgz"; + url = "https://beta.quicklisp.org/archive/binary-types/2013-06-15/binary-types-20130615-git.tgz"; sha256 = "1bh65p9vg2kgh4m8q1a4jiyncnp5prdzh0d0l4pzh3jvfhgbm0gh"; system = "binary-types"; asd = "binary-types"; @@ -4689,7 +5113,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "binascii" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/binascii/2015-07-09/binascii-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/binascii/2015-07-09/binascii-20150709-git.tgz"; sha256 = "000rcdl8qshr7n48zq9bzrc4lkjx4ylb3r3w9x9syhiwfla9j4b7"; system = "binascii"; asd = "binascii"; @@ -4709,7 +5133,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "binascii-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/binascii/2015-07-09/binascii-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/binascii/2015-07-09/binascii-20150709-git.tgz"; sha256 = "000rcdl8qshr7n48zq9bzrc4lkjx4ylb3r3w9x9syhiwfla9j4b7"; system = "binascii-tests"; asd = "binascii"; @@ -4729,7 +5153,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "binding-arrows" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/binding-arrows/2024-10-12/binding-arrows-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/binding-arrows/2024-10-12/binding-arrows-20241012-git.tgz"; sha256 = "0kzybw5qlb49czh9v2lnxniz9jzqx306a6lnarfv59x48a7cch22"; system = "binding-arrows"; asd = "binding-arrows"; @@ -4745,12 +5169,12 @@ lib.makeScope pkgs.newScope (self: { binding-knx = ( build-asdf-system { pname = "binding-knx"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "binding-knx" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/chipi/2024-10-12/chipi-20241012-git.tgz"; - sha256 = "0xpfclvl5v031cjnjvr3bcfc87rayw624m9yrw35f5r31p8m283g"; + url = "https://beta.quicklisp.org/archive/chipi/2025-06-22/chipi-20250622-git.tgz"; + sha256 = "00wqwgdzfnwxkm1bd42axp69bpl0gs99i7a3mq2x6q1dvn1rczac"; system = "binding-knx"; asd = "binding-knx"; } @@ -4772,7 +5196,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "binfix" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/binfix/2019-08-13/binfix-20190813-git.tgz"; + url = "https://beta.quicklisp.org/archive/binfix/2019-08-13/binfix-20190813-git.tgz"; sha256 = "07925kj32y7ppwmz62c08gd0s6yp12s6nz1wh0pzh0ccq9nwgzhz"; system = "binfix"; asd = "binfix"; @@ -4792,7 +5216,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "binomial-heap" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/binomial-heap/2013-04-20/binomial-heap-20130420-git.tgz"; + url = "https://beta.quicklisp.org/archive/binomial-heap/2013-04-20/binomial-heap-20130420-git.tgz"; sha256 = "1d4jrlkdjdppnvqpqkr7i7djpgmrvrbky4pc1pxvqci5jx7xlkk6"; system = "binomial-heap"; asd = "binomial-heap"; @@ -4810,7 +5234,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "binpack" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/binpack/2023-02-14/binpack-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/binpack/2023-02-14/binpack-20230214-git.tgz"; sha256 = "0cfflx7aqmkzsljjaw0dwk49ii0vxm7d07s4gyrszb7zbpmz0jri"; system = "binpack"; asd = "binpack"; @@ -4828,7 +5252,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "binpack-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/binpack/2023-02-14/binpack-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/binpack/2023-02-14/binpack-20230214-git.tgz"; sha256 = "0cfflx7aqmkzsljjaw0dwk49ii0vxm7d07s4gyrszb7zbpmz0jri"; system = "binpack-test"; asd = "binpack-test"; @@ -4851,7 +5275,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "birch" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/birch/2024-10-12/birch-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/birch/2024-10-12/birch-20241012-git.tgz"; sha256 = "1b24xng92ra7420s3zy44pybk4h7xg4kjwdk35arl46badgi28r1"; system = "birch"; asd = "birch"; @@ -4877,7 +5301,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "birch.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/birch/2024-10-12/birch-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/birch/2024-10-12/birch-20241012-git.tgz"; sha256 = "1b24xng92ra7420s3zy44pybk4h7xg4kjwdk35arl46badgi28r1"; system = "birch.test"; asd = "birch.test"; @@ -4901,7 +5325,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bit-ops" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bit-ops/2018-02-28/bit-ops-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/bit-ops/2018-02-28/bit-ops-20180228-git.tgz"; sha256 = "0rwmm438bgxfl5ab1vnrsxgimxnr3d5kjv9a0yzmlnbg9i2hyhz7"; system = "bit-ops"; asd = "bit-ops"; @@ -4927,7 +5351,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bit-ops.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bit-ops/2018-02-28/bit-ops-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/bit-ops/2018-02-28/bit-ops-20180228-git.tgz"; sha256 = "0rwmm438bgxfl5ab1vnrsxgimxnr3d5kjv9a0yzmlnbg9i2hyhz7"; system = "bit-ops.test"; asd = "bit-ops.test"; @@ -4950,7 +5374,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bit-smasher" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bit-smasher/2022-11-06/bit-smasher-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/bit-smasher/2022-11-06/bit-smasher-20221106-git.tgz"; sha256 = "1dad4x9sjq45zz8rys6rflsklmw77631r3k4g248ynmaqkdaqjyd"; system = "bit-smasher"; asd = "bit-smasher"; @@ -4973,7 +5397,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bit-smasher-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bit-smasher/2022-11-06/bit-smasher-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/bit-smasher/2022-11-06/bit-smasher-20221106-git.tgz"; sha256 = "1dad4x9sjq45zz8rys6rflsklmw77631r3k4g248ynmaqkdaqjyd"; system = "bit-smasher-test"; asd = "bit-smasher-test"; @@ -4997,7 +5421,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bitfield" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bitfield/2021-12-30/bitfield-20211230-git.tgz"; + url = "https://beta.quicklisp.org/archive/bitfield/2021-12-30/bitfield-20211230-git.tgz"; sha256 = "1137kdj5imc5gj9g6hj4w6ksqnqppgm3knzv7j2f8r5qpfl8rfl2"; system = "bitfield"; asd = "bitfield"; @@ -5017,7 +5441,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bitfield-schema" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bitfield-schema/2012-01-07/bitfield-schema-20120107-git.tgz"; + url = "https://beta.quicklisp.org/archive/bitfield-schema/2012-01-07/bitfield-schema-20120107-git.tgz"; sha256 = "08xkl7rbfhrx8vj98zj1lmhv6pfg2f5gk14xj7qys7mkj2iv4li6"; system = "bitfield-schema"; asd = "bitfield-schema"; @@ -5037,7 +5461,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bitio" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bitio/2022-02-20/bitio-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/bitio/2022-02-20/bitio-20220220-git.tgz"; sha256 = "0z2yn19nxg46j274nxzry255z86p0y3p68s1f2sg7rx9y2nx3rjg"; system = "bitio"; asd = "bitio"; @@ -5062,7 +5486,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bk-tree" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bk-tree/2013-04-20/bk-tree-20130420-git.tgz"; + url = "https://beta.quicklisp.org/archive/bk-tree/2013-04-20/bk-tree-20130420-git.tgz"; sha256 = "1nrz6fwzvkzvs6ipc5rgas77p5hv5bnaw2in5760v240gg7lxqzz"; system = "bk-tree"; asd = "bk-tree"; @@ -5078,12 +5502,12 @@ lib.makeScope pkgs.newScope (self: { bknr_dot_data_dot_impex = ( build-asdf-system { pname = "bknr.data.impex"; - version = "20220220-git"; + version = "20250622-git"; asds = [ "bknr.data.impex" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bknr-datastore/2022-02-20/bknr-datastore-20220220-git.tgz"; - sha256 = "1vi3w65fnczqvswkm381n6liqfrzjrg40y698qvj7skj28dm5vrm"; + url = "https://beta.quicklisp.org/archive/bknr-datastore/2025-06-22/bknr-datastore-20250622-git.tgz"; + sha256 = "12pxq21g9fwcwqyx463gbdw6596gm4v31hqwxnkssf1rgzm55ngj"; system = "bknr.data.impex"; asd = "bknr.data.impex"; } @@ -5105,12 +5529,12 @@ lib.makeScope pkgs.newScope (self: { bknr_dot_datastore = ( build-asdf-system { pname = "bknr.datastore"; - version = "20220220-git"; + version = "20250622-git"; asds = [ "bknr.datastore" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bknr-datastore/2022-02-20/bknr-datastore-20220220-git.tgz"; - sha256 = "1vi3w65fnczqvswkm381n6liqfrzjrg40y698qvj7skj28dm5vrm"; + url = "https://beta.quicklisp.org/archive/bknr-datastore/2025-06-22/bknr-datastore-20250622-git.tgz"; + sha256 = "12pxq21g9fwcwqyx463gbdw6596gm4v31hqwxnkssf1rgzm55ngj"; system = "bknr.datastore"; asd = "bknr.datastore"; } @@ -5134,12 +5558,12 @@ lib.makeScope pkgs.newScope (self: { bknr_dot_impex = ( build-asdf-system { pname = "bknr.impex"; - version = "20220220-git"; + version = "20250622-git"; asds = [ "bknr.impex" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bknr-datastore/2022-02-20/bknr-datastore-20220220-git.tgz"; - sha256 = "1vi3w65fnczqvswkm381n6liqfrzjrg40y698qvj7skj28dm5vrm"; + url = "https://beta.quicklisp.org/archive/bknr-datastore/2025-06-22/bknr-datastore-20250622-git.tgz"; + sha256 = "12pxq21g9fwcwqyx463gbdw6596gm4v31hqwxnkssf1rgzm55ngj"; system = "bknr.impex"; asd = "bknr.impex"; } @@ -5161,12 +5585,12 @@ lib.makeScope pkgs.newScope (self: { bknr_dot_indices = ( build-asdf-system { pname = "bknr.indices"; - version = "20220220-git"; + version = "20250622-git"; asds = [ "bknr.indices" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bknr-datastore/2022-02-20/bknr-datastore-20220220-git.tgz"; - sha256 = "1vi3w65fnczqvswkm381n6liqfrzjrg40y698qvj7skj28dm5vrm"; + url = "https://beta.quicklisp.org/archive/bknr-datastore/2025-06-22/bknr-datastore-20250622-git.tgz"; + sha256 = "12pxq21g9fwcwqyx463gbdw6596gm4v31hqwxnkssf1rgzm55ngj"; system = "bknr.indices"; asd = "bknr.indices"; } @@ -5190,7 +5614,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bknr.modules" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bknr-web/2014-07-13/bknr-web-20140713-git.tgz"; + url = "https://beta.quicklisp.org/archive/bknr-web/2014-07-13/bknr-web-20140713-git.tgz"; sha256 = "1m73z0hv7qsc9yddrg8zs7n3zmn9h64v4d62239wrvfnmzqk75x2"; system = "bknr.modules"; asd = "bknr.modules"; @@ -5220,12 +5644,12 @@ lib.makeScope pkgs.newScope (self: { bknr_dot_skip-list = ( build-asdf-system { pname = "bknr.skip-list"; - version = "20220220-git"; + version = "20250622-git"; asds = [ "bknr.skip-list" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bknr-datastore/2022-02-20/bknr-datastore-20220220-git.tgz"; - sha256 = "1vi3w65fnczqvswkm381n6liqfrzjrg40y698qvj7skj28dm5vrm"; + url = "https://beta.quicklisp.org/archive/bknr-datastore/2025-06-22/bknr-datastore-20250622-git.tgz"; + sha256 = "12pxq21g9fwcwqyx463gbdw6596gm4v31hqwxnkssf1rgzm55ngj"; system = "bknr.skip-list"; asd = "bknr.skip-list"; } @@ -5237,38 +5661,15 @@ lib.makeScope pkgs.newScope (self: { }; } ); - bknr_dot_skip-list_dot_test = ( - build-asdf-system { - pname = "bknr.skip-list.test"; - version = "20220220-git"; - asds = [ "bknr.skip-list.test" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/bknr-datastore/2022-02-20/bknr-datastore-20220220-git.tgz"; - sha256 = "1vi3w65fnczqvswkm381n6liqfrzjrg40y698qvj7skj28dm5vrm"; - system = "bknr.skip-list.test"; - asd = "bknr.skip-list"; - } - ); - systems = [ "bknr.skip-list.test" ]; - lispLibs = [ - (getAttr "bknr_dot_skip-list" self) - (getAttr "unit-test" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); bknr_dot_utils = ( build-asdf-system { pname = "bknr.utils"; - version = "20220220-git"; + version = "20250622-git"; asds = [ "bknr.utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bknr-datastore/2022-02-20/bknr-datastore-20220220-git.tgz"; - sha256 = "1vi3w65fnczqvswkm381n6liqfrzjrg40y698qvj7skj28dm5vrm"; + url = "https://beta.quicklisp.org/archive/bknr-datastore/2025-06-22/bknr-datastore-20250622-git.tgz"; + sha256 = "12pxq21g9fwcwqyx463gbdw6596gm4v31hqwxnkssf1rgzm55ngj"; system = "bknr.utils"; asd = "bknr.utils"; } @@ -5294,7 +5695,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bknr.web" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bknr-web/2014-07-13/bknr-web-20140713-git.tgz"; + url = "https://beta.quicklisp.org/archive/bknr-web/2014-07-13/bknr-web-20140713-git.tgz"; sha256 = "1m73z0hv7qsc9yddrg8zs7n3zmn9h64v4d62239wrvfnmzqk75x2"; system = "bknr.web"; asd = "bknr.web"; @@ -5329,12 +5730,12 @@ lib.makeScope pkgs.newScope (self: { bknr_dot_xml = ( build-asdf-system { pname = "bknr.xml"; - version = "20220220-git"; + version = "20250622-git"; asds = [ "bknr.xml" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bknr-datastore/2022-02-20/bknr-datastore-20220220-git.tgz"; - sha256 = "1vi3w65fnczqvswkm381n6liqfrzjrg40y698qvj7skj28dm5vrm"; + url = "https://beta.quicklisp.org/archive/bknr-datastore/2025-06-22/bknr-datastore-20250622-git.tgz"; + sha256 = "12pxq21g9fwcwqyx463gbdw6596gm4v31hqwxnkssf1rgzm55ngj"; system = "bknr.xml"; asd = "bknr.xml"; } @@ -5356,7 +5757,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "black-tie" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/black-tie/2022-07-07/black-tie-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/black-tie/2022-07-07/black-tie-20220707-git.tgz"; sha256 = "0a1zczxp4wkqs4cmwc4rnsgwwc2h4zqmg58cjykfzz4jh31fa43a"; system = "black-tie"; asd = "black-tie"; @@ -5376,7 +5777,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "blackbird" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/blackbird/2024-10-12/blackbird-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/blackbird/2024-10-12/blackbird-20241012-git.tgz"; sha256 = "0bqg8sn816qfar410w2c2k07vqh9sig8zbkvlmwj1bk33snvmam8"; system = "blackbird"; asd = "blackbird"; @@ -5394,7 +5795,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "blackbird-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/blackbird/2024-10-12/blackbird-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/blackbird/2024-10-12/blackbird-20241012-git.tgz"; sha256 = "0bqg8sn816qfar410w2c2k07vqh9sig8zbkvlmwj1bk33snvmam8"; system = "blackbird-test"; asd = "blackbird-test"; @@ -5418,7 +5819,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "blas" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; system = "blas"; asd = "blas"; @@ -5442,7 +5843,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "blas-complex" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; system = "blas-complex"; asd = "blas-complex"; @@ -5465,7 +5866,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "blas-hompack" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; system = "blas-hompack"; asd = "blas-hompack"; @@ -5488,7 +5889,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "blas-package" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; system = "blas-package"; asd = "blas-package"; @@ -5508,7 +5909,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "blas-real" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; system = "blas-real"; asd = "blas-real"; @@ -5531,7 +5932,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "blocks-world" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/atdoc/2012-03-05/atdoc-20120305-git.tgz"; + url = "https://beta.quicklisp.org/archive/atdoc/2012-03-05/atdoc-20120305-git.tgz"; sha256 = "1w54phadjj00sy5qz5n0hmhzyjrx26h9hw06756zdpfbzk4f5il6"; system = "blocks-world"; asd = "blocks-world"; @@ -5551,7 +5952,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bmas" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-bmas/2024-10-12/cl-bmas-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-bmas/2024-10-12/cl-bmas-20241012-git.tgz"; sha256 = "1j4wniwcxz4kqzw7q3ac8rpz2xhd0qfdgl5dylswh02ifdgq9z4m"; system = "bmas"; asd = "bmas"; @@ -5574,7 +5975,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bmp-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-png/2021-10-20/cl-png-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-png/2021-10-20/cl-png-20211020-git.tgz"; sha256 = "17xcb9ps5vf3if61blmx7cpfrz3gsw7jk8d5zv3f4cq8jrriqdx4"; system = "bmp-test"; asd = "bmp-test"; @@ -5594,7 +5995,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bnf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bnf/2022-02-20/bnf-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/bnf/2022-02-20/bnf-20220220-git.tgz"; sha256 = "1kr6k9qs9bbza591hi1c2mlxqd5yz3nrvyd3cw7139iz1z2m7dbg"; system = "bnf"; asd = "bnf"; @@ -5614,7 +6015,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bnf.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bnf/2022-02-20/bnf-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/bnf/2022-02-20/bnf-20220220-git.tgz"; sha256 = "1kr6k9qs9bbza591hi1c2mlxqd5yz3nrvyd3cw7139iz1z2m7dbg"; system = "bnf.test"; asd = "bnf.test"; @@ -5637,7 +6038,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bobbin" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bobbin/2020-10-16/bobbin-20201016-hg.tgz"; + url = "https://beta.quicklisp.org/archive/bobbin/2020-10-16/bobbin-20201016-hg.tgz"; sha256 = "1yvx7d0cx5b119r4aays2rck33088bp7spaydnvkc329hfq1ahc2"; system = "bobbin"; asd = "bobbin"; @@ -5657,7 +6058,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bodge-blobs-support" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bodge-blobs-support/2020-10-16/bodge-blobs-support-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/bodge-blobs-support/2020-10-16/bodge-blobs-support-stable-git.tgz"; sha256 = "02nd1x6y1akp1ymv1y4z9ympwbnpd1drwi4f86xbjszxqff6jyj8"; system = "bodge-blobs-support"; asd = "bodge-blobs-support"; @@ -5681,7 +6082,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bodge-chipmunk" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bodge-chipmunk/2020-10-16/bodge-chipmunk-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/bodge-chipmunk/2020-10-16/bodge-chipmunk-stable-git.tgz"; sha256 = "06zkia7rrhn1961jmayyvdbbbnf2rnr84lbd1x6gq8psfb2rif2f"; system = "bodge-chipmunk"; asd = "bodge-chipmunk"; @@ -5707,7 +6108,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bodge-concurrency" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bodge-concurrency/2020-10-16/bodge-concurrency-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/bodge-concurrency/2020-10-16/bodge-concurrency-stable-git.tgz"; sha256 = "06v2h7vassp5v50qsqxkmshcrlrzlhqaga4z7lnidfniw7f8d5vd"; system = "bodge-concurrency"; asd = "bodge-concurrency"; @@ -5736,7 +6137,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bodge-glad" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bodge-glad/2020-10-16/bodge-glad-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/bodge-glad/2020-10-16/bodge-glad-stable-git.tgz"; sha256 = "0ghrg0z5pj36igp5wpvp1iwnvjbca3wfb60kvirhv3l9ww51jg9g"; system = "bodge-glad"; asd = "bodge-glad"; @@ -5759,7 +6160,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bodge-glfw" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bodge-glfw/2020-10-16/bodge-glfw-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/bodge-glfw/2020-10-16/bodge-glfw-stable-git.tgz"; sha256 = "1xjg75grndl2mbfql1g2qgx810kg6wxrnhxb406m9lisd112i0m8"; system = "bodge-glfw"; asd = "bodge-glfw"; @@ -5785,7 +6186,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bodge-heap" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bodge-heap/2020-10-16/bodge-heap-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/bodge-heap/2020-10-16/bodge-heap-stable-git.tgz"; sha256 = "1ngi9ccr9iz93mm3b4hgh2fj39vqpjrpkcfza5vly16z3r7gxca4"; system = "bodge-heap"; asd = "bodge-heap"; @@ -5805,7 +6206,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bodge-host" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bodge-host/2021-12-09/bodge-host-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/bodge-host/2021-12-09/bodge-host-stable-git.tgz"; sha256 = "0piayirpbh91klrk3pg0g1vxhlk8yxvbr2wv923awdalwy0fn73n"; system = "bodge-host"; asd = "bodge-host"; @@ -5834,7 +6235,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bodge-libc-essentials" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bodge-libc-essentials/2020-10-16/bodge-libc-essentials-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/bodge-libc-essentials/2020-10-16/bodge-libc-essentials-stable-git.tgz"; sha256 = "1nkjhkaap78xk9rkvnnnkchphiz0qwrsfp4jsvcl6mvv3rb4gp2k"; system = "bodge-libc-essentials"; asd = "bodge-libc-essentials"; @@ -5854,7 +6255,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bodge-math" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bodge-math/2020-10-16/bodge-math-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/bodge-math/2020-10-16/bodge-math-stable-git.tgz"; sha256 = "0r3vnl9lywn4ksy34apcv6j825qp7l1naddawr14v4lwacndb80v"; system = "bodge-math"; asd = "bodge-math"; @@ -5877,7 +6278,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bodge-memory" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bodge-memory/2020-10-16/bodge-memory-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/bodge-memory/2020-10-16/bodge-memory-stable-git.tgz"; sha256 = "19fn3dw5z6f2kpar0jx7ysy5zvqjv7yv0ca7njgaam3p891yy2j9"; system = "bodge-memory"; asd = "bodge-memory"; @@ -5900,7 +6301,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bodge-nanovg" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bodge-nanovg/2020-10-16/bodge-nanovg-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/bodge-nanovg/2020-10-16/bodge-nanovg-stable-git.tgz"; sha256 = "0cg4rlsddjrn0ps891n29xnd14xiis20ka5gafbz9npbj6nrc4v1"; system = "bodge-nanovg"; asd = "bodge-nanovg"; @@ -5926,7 +6327,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bodge-nuklear" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bodge-nuklear/2020-10-16/bodge-nuklear-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/bodge-nuklear/2020-10-16/bodge-nuklear-stable-git.tgz"; sha256 = "15q89dz2zi99yyxhb90wyydy24y2lj5xm2mzh1mrw4v8rz9aqhc2"; system = "bodge-nuklear"; asd = "bodge-nuklear"; @@ -5952,7 +6353,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bodge-ode" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bodge-ode/2020-10-16/bodge-ode-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/bodge-ode/2020-10-16/bodge-ode-stable-git.tgz"; sha256 = "1c051ljn5x7ssysia7lil0ykjdnbx8dfkr45ck77plv39acgicbs"; system = "bodge-ode"; asd = "bodge-ode"; @@ -5979,7 +6380,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bodge-openal" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bodge-openal/2020-10-16/bodge-openal-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/bodge-openal/2020-10-16/bodge-openal-stable-git.tgz"; sha256 = "0051pwifygj1ijv5b39ldmfrka2yrj8rpap04bw3w9cckbkp6bnw"; system = "bodge-openal"; asd = "bodge-openal"; @@ -6004,7 +6405,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bodge-queue" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bodge-queue/2020-10-16/bodge-queue-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/bodge-queue/2020-10-16/bodge-queue-stable-git.tgz"; sha256 = "0f4252i8pfy5s4v7w1bpjawysn4cw7di405mqsx2h7skv27hvpz6"; system = "bodge-queue"; asd = "bodge-queue"; @@ -6024,7 +6425,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bodge-sndfile" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bodge-sndfile/2020-10-16/bodge-sndfile-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/bodge-sndfile/2020-10-16/bodge-sndfile-stable-git.tgz"; sha256 = "0chdasp4zvr5n34x037lhymh90wg5xwbpr5flwj8aw0cw2nlg485"; system = "bodge-sndfile"; asd = "bodge-sndfile"; @@ -6052,7 +6453,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bodge-utilities" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bodge-utilities/2022-07-07/bodge-utilities-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/bodge-utilities/2022-07-07/bodge-utilities-stable-git.tgz"; sha256 = "0jmz7zb5ahg2kfd5nrh9nb7dda5szamjv7iv9skgcvf7rwn8qf0g"; system = "bodge-utilities"; asd = "bodge-utilities"; @@ -6082,7 +6483,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bordeaux-fft" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bordeaux-fft/2015-06-08/bordeaux-fft-20150608-http.tgz"; + url = "https://beta.quicklisp.org/archive/bordeaux-fft/2015-06-08/bordeaux-fft-20150608-http.tgz"; sha256 = "0kmz0wv34p8wixph5i6vj6p60xa48fflh9aq6kismlb0q4a1amp3"; system = "bordeaux-fft"; asd = "bordeaux-fft"; @@ -6102,7 +6503,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bordeaux-threads" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bordeaux-threads/2024-10-12/bordeaux-threads-v0.9.4.tgz"; + url = "https://beta.quicklisp.org/archive/bordeaux-threads/2024-10-12/bordeaux-threads-v0.9.4.tgz"; sha256 = "1ds1aa3rd38hq5i1nwd9qi8icxmdag0shcwwsf7km91v9214385d"; system = "bordeaux-threads"; asd = "bordeaux-threads"; @@ -6125,7 +6526,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bourbaki" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bourbaki/2011-01-10/bourbaki-20110110-http.tgz"; + url = "https://beta.quicklisp.org/archive/bourbaki/2011-01-10/bourbaki-20110110-http.tgz"; sha256 = "0d222kjk1h60467bkjpxglds3gykily5pyrnb45yvx86shkiv4lp"; system = "bourbaki"; asd = "bourbaki"; @@ -6141,12 +6542,12 @@ lib.makeScope pkgs.newScope (self: { bp = ( build-asdf-system { pname = "bp"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "bp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bp/2023-10-21/bp-20231021-git.tgz"; - sha256 = "1l58bf2fq0807id4cs39sajsfw0z7zz4gxb2vpcvfa9nxcbyziqx"; + url = "https://beta.quicklisp.org/archive/bp/2025-06-22/bp-20250622-git.tgz"; + sha256 = "06g7xrkll4qqkqhlwqsw695yann8fpvz5ln5lzigqljzyg09wxk8"; system = "bp"; asd = "bp"; } @@ -6171,7 +6572,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bst" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bst/2022-11-06/bst-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/bst/2022-11-06/bst-20221106-git.tgz"; sha256 = "0y052jf3gkqhb7rfx72961kg42dnqhmizk7cxlv87d1jr2906d1d"; system = "bst"; asd = "bst"; @@ -6191,7 +6592,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bt-semaphore" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bt-semaphore/2018-07-11/bt-semaphore-20180711-git.tgz"; + url = "https://beta.quicklisp.org/archive/bt-semaphore/2018-07-11/bt-semaphore-20180711-git.tgz"; sha256 = "0rl7yp36225z975hg069pywwlpchwn4086cgxwsi2db5mhghpr7l"; system = "bt-semaphore"; asd = "bt-semaphore"; @@ -6211,7 +6612,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bt-semaphore-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bt-semaphore/2018-07-11/bt-semaphore-20180711-git.tgz"; + url = "https://beta.quicklisp.org/archive/bt-semaphore/2018-07-11/bt-semaphore-20180711-git.tgz"; sha256 = "0rl7yp36225z975hg069pywwlpchwn4086cgxwsi2db5mhghpr7l"; system = "bt-semaphore-test"; asd = "bt-semaphore-test"; @@ -6234,7 +6635,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "btrie" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/btrie/2014-07-13/btrie-20140713-git.tgz"; + url = "https://beta.quicklisp.org/archive/btrie/2014-07-13/btrie-20140713-git.tgz"; sha256 = "0f1rs2zlpi2bcyba951h3cnyz2mfsxr2i6icmqbam5acqjdrmp30"; system = "btrie"; asd = "btrie"; @@ -6258,7 +6659,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "btrie-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/btrie/2014-07-13/btrie-20140713-git.tgz"; + url = "https://beta.quicklisp.org/archive/btrie/2014-07-13/btrie-20140713-git.tgz"; sha256 = "0f1rs2zlpi2bcyba951h3cnyz2mfsxr2i6icmqbam5acqjdrmp30"; system = "btrie-tests"; asd = "btrie"; @@ -6282,7 +6683,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bubble-operator-upwards" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bubble-operator-upwards/2023-10-21/bubble-operator-upwards_1.1.tgz"; + url = "https://beta.quicklisp.org/archive/bubble-operator-upwards/2023-10-21/bubble-operator-upwards_1.1.tgz"; sha256 = "1k6rvhlx4z0xb460dyg6blvqkwxakvqxslky69ld8p2yni1qar5p"; system = "bubble-operator-upwards"; asd = "bubble-operator-upwards"; @@ -6302,7 +6703,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bubble-operator-upwards_tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bubble-operator-upwards/2023-10-21/bubble-operator-upwards_1.1.tgz"; + url = "https://beta.quicklisp.org/archive/bubble-operator-upwards/2023-10-21/bubble-operator-upwards_1.1.tgz"; sha256 = "1k6rvhlx4z0xb460dyg6blvqkwxakvqxslky69ld8p2yni1qar5p"; system = "bubble-operator-upwards_tests"; asd = "bubble-operator-upwards_tests"; @@ -6325,7 +6726,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "buildapp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/buildapp/2015-12-18/buildapp-1.5.6.tgz"; + url = "https://beta.quicklisp.org/archive/buildapp/2015-12-18/buildapp-1.5.6.tgz"; sha256 = "020ipjfqa3l8skd97cj5kq837wgpj28ygfxnkv64cnjrlbnzh161"; system = "buildapp"; asd = "buildapp"; @@ -6345,7 +6746,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "buildnode" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz"; + url = "https://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz"; sha256 = "09pd3mkjd278dl1hq30mxh6m2iyyfha4byadyb9drw4n7ncnjggs"; system = "buildnode"; asd = "buildnode"; @@ -6375,7 +6776,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "buildnode-excel" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz"; + url = "https://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz"; sha256 = "09pd3mkjd278dl1hq30mxh6m2iyyfha4byadyb9drw4n7ncnjggs"; system = "buildnode-excel"; asd = "buildnode-excel"; @@ -6395,7 +6796,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "buildnode-html5" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz"; + url = "https://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz"; sha256 = "09pd3mkjd278dl1hq30mxh6m2iyyfha4byadyb9drw4n7ncnjggs"; system = "buildnode-html5"; asd = "buildnode-html5"; @@ -6415,7 +6816,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "buildnode-kml" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz"; + url = "https://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz"; sha256 = "09pd3mkjd278dl1hq30mxh6m2iyyfha4byadyb9drw4n7ncnjggs"; system = "buildnode-kml"; asd = "buildnode-kml"; @@ -6435,7 +6836,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "buildnode-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz"; + url = "https://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz"; sha256 = "09pd3mkjd278dl1hq30mxh6m2iyyfha4byadyb9drw4n7ncnjggs"; system = "buildnode-test"; asd = "buildnode"; @@ -6459,7 +6860,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "buildnode-xhtml" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz"; + url = "https://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz"; sha256 = "09pd3mkjd278dl1hq30mxh6m2iyyfha4byadyb9drw4n7ncnjggs"; system = "buildnode-xhtml"; asd = "buildnode-xhtml"; @@ -6477,7 +6878,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "buildnode-xul" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz"; + url = "https://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz"; sha256 = "09pd3mkjd278dl1hq30mxh6m2iyyfha4byadyb9drw4n7ncnjggs"; system = "buildnode-xul"; asd = "buildnode-xul"; @@ -6497,7 +6898,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "burgled-batteries" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/burgled-batteries/2016-08-25/burgled-batteries-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/burgled-batteries/2016-08-25/burgled-batteries-20160825-git.tgz"; sha256 = "080ff1yrmfb87pqq1jqr35djjkh3fh8i6cbhv3d1md5qy7hhgdaj"; system = "burgled-batteries"; asd = "burgled-batteries"; @@ -6524,7 +6925,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "burgled-batteries-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/burgled-batteries/2016-08-25/burgled-batteries-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/burgled-batteries/2016-08-25/burgled-batteries-20160825-git.tgz"; sha256 = "080ff1yrmfb87pqq1jqr35djjkh3fh8i6cbhv3d1md5qy7hhgdaj"; system = "burgled-batteries-tests"; asd = "burgled-batteries-tests"; @@ -6548,7 +6949,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "burgled-batteries.syntax" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/burgled-batteries.syntax/2021-05-31/burgled-batteries.syntax-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/burgled-batteries.syntax/2021-05-31/burgled-batteries.syntax-20210531-git.tgz"; sha256 = "1hx8w74cgx1qbk6r2p7lzygjqxs5mzxh7w73zrmdibny64akir9a"; system = "burgled-batteries.syntax"; asd = "burgled-batteries.syntax"; @@ -6572,7 +6973,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "burgled-batteries.syntax-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/burgled-batteries.syntax/2021-05-31/burgled-batteries.syntax-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/burgled-batteries.syntax/2021-05-31/burgled-batteries.syntax-20210531-git.tgz"; sha256 = "1hx8w74cgx1qbk6r2p7lzygjqxs5mzxh7w73zrmdibny64akir9a"; system = "burgled-batteries.syntax-test"; asd = "burgled-batteries.syntax-test"; @@ -6591,12 +6992,12 @@ lib.makeScope pkgs.newScope (self: { bus = ( build-asdf-system { pname = "bus"; - version = "master-fe503896-git"; + version = "master-5a621564-git"; asds = [ "bus" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz"; - sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10"; + url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; + sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; system = "bus"; asd = "bus"; } @@ -6615,7 +7016,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bytecurry.asdf-ext" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bytecurry.asdf-ext/2015-05-05/bytecurry.asdf-ext-20150505-git.tgz"; + url = "https://beta.quicklisp.org/archive/bytecurry.asdf-ext/2015-05-05/bytecurry.asdf-ext-20150505-git.tgz"; sha256 = "07w2lz9mq35sgzzvmz9084l1sia40zkhlvfblkpzxfwyzr6cxrxa"; system = "bytecurry.asdf-ext"; asd = "bytecurry.asdf-ext"; @@ -6635,7 +7036,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "bytecurry.mocks" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bytecurry.mocks/2020-03-25/bytecurry.mocks-20200325-git.tgz"; + url = "https://beta.quicklisp.org/archive/bytecurry.mocks/2020-03-25/bytecurry.mocks-20200325-git.tgz"; sha256 = "0md2j6iggmfm1v7nzcmz7f0xy2jxrsg77iszpisdzmwnijfy8ks0"; system = "bytecurry.mocks"; asd = "bytecurry.mocks"; @@ -6658,7 +7059,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "c2ffi-blob" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/c2ffi-blob/2020-10-16/c2ffi-blob-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/c2ffi-blob/2020-10-16/c2ffi-blob-stable-git.tgz"; sha256 = "1rk89nycdvcb4a50zm3wdmrbz8w5xk4jgvjg2wib1dnslwnwdivc"; system = "c2ffi-blob"; asd = "c2ffi-blob"; @@ -6681,7 +7082,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cacau" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cacau/2020-06-10/cacau-20200610-git.tgz"; + url = "https://beta.quicklisp.org/archive/cacau/2020-06-10/cacau-20200610-git.tgz"; sha256 = "0m8v1xw68cr5ldv045rxgvnhigr4iahh7v6v32z6xlq2sj6r55x0"; system = "cacau"; asd = "cacau"; @@ -6704,7 +7105,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cacau-asdf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cacau/2020-06-10/cacau-20200610-git.tgz"; + url = "https://beta.quicklisp.org/archive/cacau/2020-06-10/cacau-20200610-git.tgz"; sha256 = "0m8v1xw68cr5ldv045rxgvnhigr4iahh7v6v32z6xlq2sj6r55x0"; system = "cacau-asdf"; asd = "cacau-asdf"; @@ -6724,7 +7125,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cacau-examples-asdf-integration" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cacau/2020-06-10/cacau-20200610-git.tgz"; + url = "https://beta.quicklisp.org/archive/cacau/2020-06-10/cacau-20200610-git.tgz"; sha256 = "0m8v1xw68cr5ldv045rxgvnhigr4iahh7v6v32z6xlq2sj6r55x0"; system = "cacau-examples-asdf-integration"; asd = "cacau-examples-asdf-integration"; @@ -6744,7 +7145,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cacau-examples-asdf-integration-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cacau/2020-06-10/cacau-20200610-git.tgz"; + url = "https://beta.quicklisp.org/archive/cacau/2020-06-10/cacau-20200610-git.tgz"; sha256 = "0m8v1xw68cr5ldv045rxgvnhigr4iahh7v6v32z6xlq2sj6r55x0"; system = "cacau-examples-asdf-integration-test"; asd = "cacau-examples-asdf-integration-test"; @@ -6769,7 +7170,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cacau-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cacau/2020-06-10/cacau-20200610-git.tgz"; + url = "https://beta.quicklisp.org/archive/cacau/2020-06-10/cacau-20200610-git.tgz"; sha256 = "0m8v1xw68cr5ldv045rxgvnhigr4iahh7v6v32z6xlq2sj6r55x0"; system = "cacau-test"; asd = "cacau-test"; @@ -6793,7 +7194,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cache-while" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cache-while/2021-08-07/cache-while-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/cache-while/2021-08-07/cache-while-20210807-git.tgz"; sha256 = "1qil68rfn5irmkb0jk1f6g1zy80wgc3skl8cr4rfgh7ywgm5izx3"; system = "cache-while"; asd = "cache-while"; @@ -6813,7 +7214,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cacle" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cacle/2019-05-21/cacle-20190521-git.tgz"; + url = "https://beta.quicklisp.org/archive/cacle/2019-05-21/cacle-20190521-git.tgz"; sha256 = "0h0dk0sfkfl8g0sbrs76ydb9l4znssqhx8nc5k1sg7zxpni5a4qy"; system = "cacle"; asd = "cacle"; @@ -6833,7 +7234,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "calispel" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/calispel/2017-08-30/calispel-20170830-git.tgz"; + url = "https://beta.quicklisp.org/archive/calispel/2017-08-30/calispel-20170830-git.tgz"; sha256 = "08bmf3pi7n5hadpmqqkg65cxcj6kbvm997wcs1f53ml1nb79d9z8"; system = "calispel"; asd = "calispel"; @@ -6855,7 +7256,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "calispel-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/calispel/2017-08-30/calispel-20170830-git.tgz"; + url = "https://beta.quicklisp.org/archive/calispel/2017-08-30/calispel-20170830-git.tgz"; sha256 = "08bmf3pi7n5hadpmqqkg65cxcj6kbvm997wcs1f53ml1nb79d9z8"; system = "calispel-test"; asd = "calispel"; @@ -6878,7 +7279,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "calm" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/calm/2024-10-12/calm-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/calm/2024-10-12/calm-20241012-git.tgz"; sha256 = "0c8d7aagx02cqk42pyj62hpqz3yarncigsw0g2ccc64sk74v67js"; system = "calm"; asd = "calm"; @@ -6907,7 +7308,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cambl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cambl/2018-12-10/cambl-20181210-git.tgz"; + url = "https://beta.quicklisp.org/archive/cambl/2018-12-10/cambl-20181210-git.tgz"; sha256 = "103mry04j2k9vznsxm7wcvccgxkil92cdrv52miwcmxl8daa4jiz"; system = "cambl"; asd = "cambl"; @@ -6933,7 +7334,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cambl-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cambl/2018-12-10/cambl-20181210-git.tgz"; + url = "https://beta.quicklisp.org/archive/cambl/2018-12-10/cambl-20181210-git.tgz"; sha256 = "103mry04j2k9vznsxm7wcvccgxkil92cdrv52miwcmxl8daa4jiz"; system = "cambl-test"; asd = "cambl-test"; @@ -6956,7 +7357,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "camera-matrix" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; system = "camera-matrix"; asd = "camera-matrix"; @@ -6979,7 +7380,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "can" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/can/2018-03-28/can-20180328-git.tgz"; + url = "https://beta.quicklisp.org/archive/can/2018-03-28/can-20180328-git.tgz"; sha256 = "0m3lqc56aw46cj2z379a19fh7f1h0vaxn78xpvbxq3bwar46jzqh"; system = "can"; asd = "can"; @@ -6999,7 +7400,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "can-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/can/2018-03-28/can-20180328-git.tgz"; + url = "https://beta.quicklisp.org/archive/can/2018-03-28/can-20180328-git.tgz"; sha256 = "0m3lqc56aw46cj2z379a19fh7f1h0vaxn78xpvbxq3bwar46jzqh"; system = "can-test"; asd = "can-test"; @@ -7025,7 +7426,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "canonicalized-initargs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/canonicalized-initargs/2021-04-11/canonicalized-initargs_2.0.tgz"; + url = "https://beta.quicklisp.org/archive/canonicalized-initargs/2021-04-11/canonicalized-initargs_2.0.tgz"; sha256 = "0jmmjw86x9mmlfla4kdmdqf1fjrj0p2fmv1lc4k555mcf67mj2fq"; system = "canonicalized-initargs"; asd = "canonicalized-initargs"; @@ -7052,7 +7453,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "canonicalized-initargs_tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/canonicalized-initargs/2021-04-11/canonicalized-initargs_2.0.tgz"; + url = "https://beta.quicklisp.org/archive/canonicalized-initargs/2021-04-11/canonicalized-initargs_2.0.tgz"; sha256 = "0jmmjw86x9mmlfla4kdmdqf1fjrj0p2fmv1lc4k555mcf67mj2fq"; system = "canonicalized-initargs_tests"; asd = "canonicalized-initargs_tests"; @@ -7077,7 +7478,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "capstone" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-capstone/2022-03-31/cl-capstone-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-capstone/2022-03-31/cl-capstone-20220331-git.tgz"; sha256 = "1jbhp1sf7mr6yrqkdyjl93m1dl901ka6gkgdj20nv2bgp400ycmp"; system = "capstone"; asd = "capstone"; @@ -7103,7 +7504,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "caramel" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/caramel/2013-04-20/caramel-20130420-git.tgz"; + url = "https://beta.quicklisp.org/archive/caramel/2013-04-20/caramel-20130420-git.tgz"; sha256 = "08kyjxd8hyk5xnnq0p0w4aqpvisv278h38pqjkz04a032dn5b87a"; system = "caramel"; asd = "caramel"; @@ -7124,49 +7525,6 @@ lib.makeScope pkgs.newScope (self: { }; } ); - cardioex = ( - build-asdf-system { - pname = "cardioex"; - version = "20211020-git"; - asds = [ "cardioex" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/cardiogram/2021-10-20/cardiogram-20211020-git.tgz"; - sha256 = "08kqcj3c4vkx5s6ba9m67xh7w7paaavp2ds072crp1x7pjkh4n5i"; - system = "cardioex"; - asd = "cardioex"; - } - ); - systems = [ "cardioex" ]; - lispLibs = [ (getAttr "cardiogram" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - cardiogram = ( - build-asdf-system { - pname = "cardiogram"; - version = "20211020-git"; - asds = [ "cardiogram" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/cardiogram/2021-10-20/cardiogram-20211020-git.tgz"; - sha256 = "08kqcj3c4vkx5s6ba9m67xh7w7paaavp2ds072crp1x7pjkh4n5i"; - system = "cardiogram"; - asd = "cardiogram"; - } - ); - systems = [ "cardiogram" ]; - lispLibs = [ - (getAttr "cl-annot" self) - (getAttr "closer-mop" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); cari3s = ( build-asdf-system { pname = "cari3s"; @@ -7174,7 +7532,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cari3s" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cari3s/2023-10-21/cari3s-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cari3s/2023-10-21/cari3s-20231021-git.tgz"; sha256 = "1q977ykj4fb095ilr1x4g0nrhqmipcgmdxbxn4gmlksg457sb4lm"; system = "cari3s"; asd = "cari3s"; @@ -7202,7 +7560,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "carrier" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/carrier/2024-10-12/carrier-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/carrier/2024-10-12/carrier-20241012-git.tgz"; sha256 = "04w6hzqqbcvi8niqj35xz098gjfg4pdv6fbihfbna3c5v7q59gr1"; system = "carrier"; asd = "carrier"; @@ -7232,7 +7590,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cartesian-product-switch" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cartesian-product-switch/2012-09-09/cartesian-product-switch-2.0.tgz"; + url = "https://beta.quicklisp.org/archive/cartesian-product-switch/2012-09-09/cartesian-product-switch-2.0.tgz"; sha256 = "18cxslj2753k6h666j0mmzg0h0z9l6ddi24gqls6h5d5svd7l3xk"; system = "cartesian-product-switch"; asd = "cartesian-product-switch"; @@ -7252,7 +7610,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "caveman-middleware-dbimanager" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/caveman/2024-10-12/caveman-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/caveman/2024-10-12/caveman-20241012-git.tgz"; sha256 = "1q07mmm41zymh464j4mldf3lv1sb9amzdcwinkywqhwnjmnx6axi"; system = "caveman-middleware-dbimanager"; asd = "caveman-middleware-dbimanager"; @@ -7272,7 +7630,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "caveman2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/caveman/2024-10-12/caveman-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/caveman/2024-10-12/caveman-20241012-git.tgz"; sha256 = "1q07mmm41zymh464j4mldf3lv1sb9amzdcwinkywqhwnjmnx6axi"; system = "caveman2"; asd = "caveman2"; @@ -7301,7 +7659,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "caveman2-db" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/caveman/2024-10-12/caveman-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/caveman/2024-10-12/caveman-20241012-git.tgz"; sha256 = "1q07mmm41zymh464j4mldf3lv1sb9amzdcwinkywqhwnjmnx6axi"; system = "caveman2-db"; asd = "caveman2-db"; @@ -7325,7 +7683,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "caveman2-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/caveman/2024-10-12/caveman-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/caveman/2024-10-12/caveman-20241012-git.tgz"; sha256 = "1q07mmm41zymh464j4mldf3lv1sb9amzdcwinkywqhwnjmnx6axi"; system = "caveman2-test"; asd = "caveman2-test"; @@ -7353,7 +7711,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "caveman2-widgets" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/caveman2-widgets/2018-02-28/caveman2-widgets-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/caveman2-widgets/2018-02-28/caveman2-widgets-20180228-git.tgz"; sha256 = "1rzb868m3f28z1hcr3nzlprgqqq1kwg3qyh24p36fv76b4g96wkq"; system = "caveman2-widgets"; asd = "caveman2-widgets"; @@ -7377,7 +7735,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "caveman2-widgets-bootstrap" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/caveman2-widgets-bootstrap/2018-02-28/caveman2-widgets-bootstrap-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/caveman2-widgets-bootstrap/2018-02-28/caveman2-widgets-bootstrap-20180228-git.tgz"; sha256 = "1xh3x7r7givxxyrkh4ngx098s35qz98gcz7yjyf4dp0psfkk65xj"; system = "caveman2-widgets-bootstrap"; asd = "caveman2-widgets-bootstrap"; @@ -7400,7 +7758,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "caveman2-widgets-bootstrap-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/caveman2-widgets-bootstrap/2018-02-28/caveman2-widgets-bootstrap-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/caveman2-widgets-bootstrap/2018-02-28/caveman2-widgets-bootstrap-20180228-git.tgz"; sha256 = "1xh3x7r7givxxyrkh4ngx098s35qz98gcz7yjyf4dp0psfkk65xj"; system = "caveman2-widgets-bootstrap-test"; asd = "caveman2-widgets-bootstrap-test"; @@ -7424,7 +7782,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "caveman2-widgets-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/caveman2-widgets/2018-02-28/caveman2-widgets-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/caveman2-widgets/2018-02-28/caveman2-widgets-20180228-git.tgz"; sha256 = "1rzb868m3f28z1hcr3nzlprgqqq1kwg3qyh24p36fv76b4g96wkq"; system = "caveman2-widgets-test"; asd = "caveman2-widgets-test"; @@ -7448,7 +7806,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cblas" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cblas/2022-11-06/cl-cblas-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cblas/2022-11-06/cl-cblas-20221106-git.tgz"; sha256 = "1bd2w51r71pgm6sc6m2fms4j1bbnli023j4w3rbxw9cln0g7badp"; system = "cblas"; asd = "cblas"; @@ -7467,12 +7825,12 @@ lib.makeScope pkgs.newScope (self: { cbor = ( build-asdf-system { pname = "cbor"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cbor" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cbor/2024-10-12/cbor-20241012-git.tgz"; - sha256 = "0bkjfi449m651hbsm39dc9863mcry3ynz1j59wb2kl8zwxm1qg2r"; + url = "https://beta.quicklisp.org/archive/cbor/2025-06-22/cbor-20250622-git.tgz"; + sha256 = "1ln6n4faw3a89qksdla983ah3q8dd0hb0c0didx253vyncrgqxvg"; system = "cbor"; asd = "cbor"; } @@ -7489,6 +7847,33 @@ lib.makeScope pkgs.newScope (self: { }; } ); + cbor-tests = ( + build-asdf-system { + pname = "cbor-tests"; + version = "20250622-git"; + asds = [ "cbor-tests" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cbor/2025-06-22/cbor-20250622-git.tgz"; + sha256 = "1ln6n4faw3a89qksdla983ah3q8dd0hb0c0didx253vyncrgqxvg"; + system = "cbor-tests"; + asd = "cbor-tests"; + } + ); + systems = [ "cbor-tests" ]; + lispLibs = [ + (getAttr "alexandria" self) + (getAttr "cbor" self) + (getAttr "equals" self) + (getAttr "local-time" self) + (getAttr "parachute" self) + (getAttr "yason" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); ccl-compat = ( build-asdf-system { pname = "ccl-compat"; @@ -7496,7 +7881,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ccl-compat" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ccl-compat/2017-11-30/ccl-compat-20171130-git.tgz"; + url = "https://beta.quicklisp.org/archive/ccl-compat/2017-11-30/ccl-compat-20171130-git.tgz"; sha256 = "15402373wprmyx4l7zgpv64vj3c11xvxnnpzqbmq4j6rljpb40da"; system = "ccl-compat"; asd = "ccl-compat"; @@ -7520,7 +7905,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ccldoc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ccldoc/2024-10-12/ccldoc-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/ccldoc/2024-10-12/ccldoc-20241012-git.tgz"; sha256 = "15pc25pwnlg2lhzxniln53fr2i2cqa6fpr60nv4i1743x9ahp35l"; system = "ccldoc"; asd = "ccldoc"; @@ -7540,7 +7925,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ccldoc-docbook" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ccldoc/2024-10-12/ccldoc-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/ccldoc/2024-10-12/ccldoc-20241012-git.tgz"; sha256 = "15pc25pwnlg2lhzxniln53fr2i2cqa6fpr60nv4i1743x9ahp35l"; system = "ccldoc-docbook"; asd = "ccldoc-docbook"; @@ -7563,7 +7948,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ccldoc-libraries" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ccldoc/2024-10-12/ccldoc-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/ccldoc/2024-10-12/ccldoc-20241012-git.tgz"; sha256 = "15pc25pwnlg2lhzxniln53fr2i2cqa6fpr60nv4i1743x9ahp35l"; system = "ccldoc-libraries"; asd = "ccldoc-libraries"; @@ -7587,7 +7972,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ceigen-lite" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ceigen-lite/2024-10-12/cl-ceigen-lite-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ceigen-lite/2024-10-12/cl-ceigen-lite-20241012-git.tgz"; sha256 = "0k2b6x913mnv1f5712xvvv7d6j3lrja4isjg6cyad694py59d09q"; system = "ceigen-lite"; asd = "ceigen-lite"; @@ -7610,7 +7995,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cells" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cells/2023-06-18/cells-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/cells/2023-06-18/cells-20230618-git.tgz"; sha256 = "1mh14g8x2mpb8qdngqxgnkawqbv4xxxr3bgn01jm5d6c8jn6ph3f"; system = "cells"; asd = "cells"; @@ -7630,7 +8015,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cells-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cells/2023-06-18/cells-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/cells/2023-06-18/cells-20230618-git.tgz"; sha256 = "1mh14g8x2mpb8qdngqxgnkawqbv4xxxr3bgn01jm5d6c8jn6ph3f"; system = "cells-test"; asd = "cells-test"; @@ -7650,7 +8035,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cephes" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cephes.cl/2024-10-12/cephes.cl-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cephes.cl/2024-10-12/cephes.cl-20241012-git.tgz"; sha256 = "1p0npidiy9zjb90gyihdmx0nmm87a5akph1jhs6y7z50fx8470hb"; system = "cephes"; asd = "cephes"; @@ -7670,7 +8055,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cepl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cepl/2024-10-12/cepl-release-quicklisp-543c9fc1-git.tgz"; + url = "https://beta.quicklisp.org/archive/cepl/2024-10-12/cepl-release-quicklisp-543c9fc1-git.tgz"; sha256 = "0g5frci6ljmy6pyyrjhh2kw894l3fl3wsz27k75xw49cd8xm24mh"; system = "cepl"; asd = "cepl"; @@ -7702,7 +8087,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cepl.build" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cepl/2024-10-12/cepl-release-quicklisp-543c9fc1-git.tgz"; + url = "https://beta.quicklisp.org/archive/cepl/2024-10-12/cepl-release-quicklisp-543c9fc1-git.tgz"; sha256 = "0g5frci6ljmy6pyyrjhh2kw894l3fl3wsz27k75xw49cd8xm24mh"; system = "cepl.build"; asd = "cepl.build"; @@ -7722,7 +8107,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cepl.camera" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cepl.camera/2018-02-28/cepl.camera-release-quicklisp-1292212a-git.tgz"; + url = "https://beta.quicklisp.org/archive/cepl.camera/2018-02-28/cepl.camera-release-quicklisp-1292212a-git.tgz"; sha256 = "0z73f95bxr2vn47g8qrvf9gzy1my25mkg7hl7kpib21yahfpzzvb"; system = "cepl.camera"; asd = "cepl.camera"; @@ -7746,7 +8131,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cepl.devil" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cepl.devil/2018-02-28/cepl.devil-release-quicklisp-ea5f8514-git.tgz"; + url = "https://beta.quicklisp.org/archive/cepl.devil/2018-02-28/cepl.devil-release-quicklisp-ea5f8514-git.tgz"; sha256 = "1b64vfjchkwppcp3j4krwx2x9nj29llisqy1yc9ncbnmi9xs38a0"; system = "cepl.devil"; asd = "cepl.devil"; @@ -7769,7 +8154,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cepl.drm-gbm" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cepl.drm-gbm/2019-05-21/cepl.drm-gbm-20190521-git.tgz"; + url = "https://beta.quicklisp.org/archive/cepl.drm-gbm/2019-05-21/cepl.drm-gbm-20190521-git.tgz"; sha256 = "00csd2f6z13rjqipaf02w87phn2xynmzf1jcrrshbibs204m4nmy"; system = "cepl.drm-gbm"; asd = "cepl.drm-gbm"; @@ -7795,7 +8180,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cepl.glop" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cepl.glop/2018-02-28/cepl.glop-release-quicklisp-8ec09801-git.tgz"; + url = "https://beta.quicklisp.org/archive/cepl.glop/2018-02-28/cepl.glop-release-quicklisp-8ec09801-git.tgz"; sha256 = "1dq727v2s22yna6ycxxs79pg13b0cyh1lfrk6hsb6vizgiks20jw"; system = "cepl.glop"; asd = "cepl.glop"; @@ -7818,7 +8203,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cepl.sdl2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cepl.sdl2/2018-02-28/cepl.sdl2-release-quicklisp-6da5a030-git.tgz"; + url = "https://beta.quicklisp.org/archive/cepl.sdl2/2018-02-28/cepl.sdl2-release-quicklisp-6da5a030-git.tgz"; sha256 = "0lz8yxm1g2ch0w779lhrs2xkfciy3iz6viz7cdgyd2824isvinjf"; system = "cepl.sdl2"; asd = "cepl.sdl2"; @@ -7841,7 +8226,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cepl.sdl2-image" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cepl.sdl2-image/2018-02-28/cepl.sdl2-image-release-quicklisp-94a77649-git.tgz"; + url = "https://beta.quicklisp.org/archive/cepl.sdl2-image/2018-02-28/cepl.sdl2-image-release-quicklisp-94a77649-git.tgz"; sha256 = "16dzjk2q658xr1v9rk2iny70rjhxbgi4lcp59s5mkdfs2k3a2637"; system = "cepl.sdl2-image"; asd = "cepl.sdl2-image"; @@ -7865,7 +8250,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cepl.sdl2-ttf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cepl.sdl2-ttf/2018-01-31/cepl.sdl2-ttf-release-quicklisp-11b498a3-git.tgz"; + url = "https://beta.quicklisp.org/archive/cepl.sdl2-ttf/2018-01-31/cepl.sdl2-ttf-release-quicklisp-11b498a3-git.tgz"; sha256 = "1fxj3rdv2rlyks00h18dpd42xywgnydgyvb1s4d67hjk7fl19a5p"; system = "cepl.sdl2-ttf"; asd = "cepl.sdl2-ttf"; @@ -7889,7 +8274,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cepl.skitter.glop" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cepl.skitter/2018-02-28/cepl.skitter-release-quicklisp-f52b9240-git.tgz"; + url = "https://beta.quicklisp.org/archive/cepl.skitter/2018-02-28/cepl.skitter-release-quicklisp-f52b9240-git.tgz"; sha256 = "1xz53q8klzrd7cr586jd16pypxgpy68vlvfirqhlv6jc7k99sjvs"; system = "cepl.skitter.glop"; asd = "cepl.skitter.glop"; @@ -7912,7 +8297,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cepl.skitter.sdl2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cepl.skitter/2018-02-28/cepl.skitter-release-quicklisp-f52b9240-git.tgz"; + url = "https://beta.quicklisp.org/archive/cepl.skitter/2018-02-28/cepl.skitter-release-quicklisp-f52b9240-git.tgz"; sha256 = "1xz53q8klzrd7cr586jd16pypxgpy68vlvfirqhlv6jc7k99sjvs"; system = "cepl.skitter.sdl2"; asd = "cepl.skitter.sdl2"; @@ -7935,7 +8320,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cepl.spaces" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cepl.spaces/2018-03-28/cepl.spaces-release-quicklisp-c7f83f26-git.tgz"; + url = "https://beta.quicklisp.org/archive/cepl.spaces/2018-03-28/cepl.spaces-release-quicklisp-c7f83f26-git.tgz"; sha256 = "0z74ipd4j2spjwl6h625azdczpds3v44iin77q685ldx9rwx3k8y"; system = "cepl.spaces"; asd = "cepl.spaces"; @@ -7962,7 +8347,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ceramic" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ceramic/2021-08-07/ceramic-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/ceramic/2021-08-07/ceramic-20210807-git.tgz"; sha256 = "0hd553gj4cwmli45pfwhqpz7sg6kzn31iv8akaxr5ba3hssa1aap"; system = "ceramic"; asd = "ceramic"; @@ -7995,7 +8380,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ceramic-test-app" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ceramic/2021-08-07/ceramic-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/ceramic/2021-08-07/ceramic-20210807-git.tgz"; sha256 = "0hd553gj4cwmli45pfwhqpz7sg6kzn31iv8akaxr5ba3hssa1aap"; system = "ceramic-test-app"; asd = "ceramic-test-app"; @@ -8014,12 +8399,12 @@ lib.makeScope pkgs.newScope (self: { cerberus = ( build-asdf-system { pname = "cerberus"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cerberus" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cerberus/2024-10-12/cerberus-20241012-git.tgz"; - sha256 = "131x0raccj5majd72hmmlp67dsj2zdizm2xzdhw6s0jbxjbhdgfs"; + url = "https://beta.quicklisp.org/archive/cerberus/2025-06-22/cerberus-20250622-git.tgz"; + sha256 = "1pky9xdh1189ld5qjnm6mh6457vs0gx2q7jn1mxmn4fl4zkvk3q7"; system = "cerberus"; asd = "cerberus"; } @@ -8042,14 +8427,14 @@ lib.makeScope pkgs.newScope (self: { cerberus-kdc = ( build-asdf-system { pname = "cerberus-kdc"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cerberus-kdc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cerberus/2024-10-12/cerberus-20241012-git.tgz"; - sha256 = "131x0raccj5majd72hmmlp67dsj2zdizm2xzdhw6s0jbxjbhdgfs"; + url = "https://beta.quicklisp.org/archive/cerberus/2025-06-22/cerberus-20250622-git.tgz"; + sha256 = "1pky9xdh1189ld5qjnm6mh6457vs0gx2q7jn1mxmn4fl4zkvk3q7"; system = "cerberus-kdc"; - asd = "cerberus"; + asd = "cerberus-kdc"; } ); systems = [ "cerberus-kdc" ]; @@ -8070,7 +8455,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cesdi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cesdi/2020-07-15/cesdi_1.0.1.tgz"; + url = "https://beta.quicklisp.org/archive/cesdi/2020-07-15/cesdi_1.0.1.tgz"; sha256 = "02f2pz5rw79ljkkx1ywh8nkpjj4g3z3s1lyvzqb8krbnx11wl0q9"; system = "cesdi"; asd = "cesdi"; @@ -8090,7 +8475,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cesdi_tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cesdi/2020-07-15/cesdi_1.0.1.tgz"; + url = "https://beta.quicklisp.org/archive/cesdi/2020-07-15/cesdi_1.0.1.tgz"; sha256 = "02f2pz5rw79ljkkx1ywh8nkpjj4g3z3s1lyvzqb8krbnx11wl0q9"; system = "cesdi_tests"; asd = "cesdi_tests"; @@ -8109,12 +8494,12 @@ lib.makeScope pkgs.newScope (self: { cf = ( build-asdf-system { pname = "cf"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cf/2024-10-12/cl-cf-20241012-git.tgz"; - sha256 = "1w4asb8v81q2rf8fhhq88c2ib4ax5fbm0655kvdpfvkz1457yi25"; + url = "https://beta.quicklisp.org/archive/cl-cf/2025-06-22/cl-cf-20250622-git.tgz"; + sha256 = "0bacgspfqvkdr430yax9dk61pavcajz9kv9lb12rg5qcrqd1vpmb"; system = "cf"; asd = "cf"; } @@ -8129,12 +8514,12 @@ lib.makeScope pkgs.newScope (self: { cf-tests = ( build-asdf-system { pname = "cf-tests"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cf-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cf/2024-10-12/cl-cf-20241012-git.tgz"; - sha256 = "1w4asb8v81q2rf8fhhq88c2ib4ax5fbm0655kvdpfvkz1457yi25"; + url = "https://beta.quicklisp.org/archive/cl-cf/2025-06-22/cl-cf-20250622-git.tgz"; + sha256 = "0bacgspfqvkdr430yax9dk61pavcajz9kv9lb12rg5qcrqd1vpmb"; system = "cf-tests"; asd = "cf-tests"; } @@ -8152,12 +8537,12 @@ lib.makeScope pkgs.newScope (self: { cffi = ( build-asdf-system { pname = "cffi"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cffi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cffi/2024-10-12/cffi-20241012-git.tgz"; - sha256 = "1b2j32rapgw8rn7m9sm2k8r8x9jds7vshkm90i5lw9v4xnp8x4m7"; + url = "https://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz"; + sha256 = "1s7b5zrgbf5pz52hcncvvmd22nppwpgvh7s0hg8lnk74k42vpms1"; system = "cffi"; asd = "cffi"; } @@ -8178,7 +8563,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cffi-c-ref" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cffi-c-ref/2020-10-16/cffi-c-ref-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/cffi-c-ref/2020-10-16/cffi-c-ref-stable-git.tgz"; sha256 = "1a3pp6xcisabqir3rp1gvvjfdxcvpm8yr35p38nri9azsinmmc7z"; system = "cffi-c-ref"; asd = "cffi-c-ref"; @@ -8197,12 +8582,12 @@ lib.makeScope pkgs.newScope (self: { cffi-examples = ( build-asdf-system { pname = "cffi-examples"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cffi-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cffi/2024-10-12/cffi-20241012-git.tgz"; - sha256 = "1b2j32rapgw8rn7m9sm2k8r8x9jds7vshkm90i5lw9v4xnp8x4m7"; + url = "https://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz"; + sha256 = "1s7b5zrgbf5pz52hcncvvmd22nppwpgvh7s0hg8lnk74k42vpms1"; system = "cffi-examples"; asd = "cffi-examples"; } @@ -8217,12 +8602,12 @@ lib.makeScope pkgs.newScope (self: { cffi-grovel = ( build-asdf-system { pname = "cffi-grovel"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cffi-grovel" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cffi/2024-10-12/cffi-20241012-git.tgz"; - sha256 = "1b2j32rapgw8rn7m9sm2k8r8x9jds7vshkm90i5lw9v4xnp8x4m7"; + url = "https://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz"; + sha256 = "1s7b5zrgbf5pz52hcncvvmd22nppwpgvh7s0hg8lnk74k42vpms1"; system = "cffi-grovel"; asd = "cffi-grovel"; } @@ -8239,12 +8624,12 @@ lib.makeScope pkgs.newScope (self: { cffi-libffi = ( build-asdf-system { pname = "cffi-libffi"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cffi-libffi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cffi/2024-10-12/cffi-20241012-git.tgz"; - sha256 = "1b2j32rapgw8rn7m9sm2k8r8x9jds7vshkm90i5lw9v4xnp8x4m7"; + url = "https://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz"; + sha256 = "1s7b5zrgbf5pz52hcncvvmd22nppwpgvh7s0hg8lnk74k42vpms1"; system = "cffi-libffi"; asd = "cffi-libffi"; } @@ -8263,12 +8648,12 @@ lib.makeScope pkgs.newScope (self: { cffi-object = ( build-asdf-system { pname = "cffi-object"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cffi-object" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cffi-object/2024-10-12/cffi-object-20241012-git.tgz"; - sha256 = "0hdxy2lqf0q04j57y6plnlh2v6w7y7prsypxk9f4vdlnp2ah3lln"; + url = "https://beta.quicklisp.org/archive/cffi-object/2025-06-22/cffi-object-20250622-git.tgz"; + sha256 = "1v5yaf2y366mbpqbvqnqg1za5k3vsa6d4px56ldis996vb2kv84h"; system = "cffi-object"; asd = "cffi-object"; } @@ -8287,12 +8672,12 @@ lib.makeScope pkgs.newScope (self: { cffi-object_dot_ops = ( build-asdf-system { pname = "cffi-object.ops"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cffi-object.ops" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cffi-object/2024-10-12/cffi-object-20241012-git.tgz"; - sha256 = "0hdxy2lqf0q04j57y6plnlh2v6w7y7prsypxk9f4vdlnp2ah3lln"; + url = "https://beta.quicklisp.org/archive/cffi-object/2025-06-22/cffi-object-20250622-git.tgz"; + sha256 = "1v5yaf2y366mbpqbvqnqg1za5k3vsa6d4px56ldis996vb2kv84h"; system = "cffi-object.ops"; asd = "cffi-object.ops"; } @@ -8310,12 +8695,12 @@ lib.makeScope pkgs.newScope (self: { cffi-ops = ( build-asdf-system { pname = "cffi-ops"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cffi-ops" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cffi-ops/2024-10-12/cffi-ops-20241012-git.tgz"; - sha256 = "0hi3svwfb7m1wq892wlrsgj52jkh3x6msnimax28221baj6g64gg"; + url = "https://beta.quicklisp.org/archive/cffi-ops/2025-06-22/cffi-ops-20250622-git.tgz"; + sha256 = "1si71czfs923p2fjimj3jyjy5gliylxji3dgsfb6w4qaczsmyd33"; system = "cffi-ops"; asd = "cffi-ops"; } @@ -8335,12 +8720,12 @@ lib.makeScope pkgs.newScope (self: { cffi-tests = ( build-asdf-system { pname = "cffi-tests"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cffi-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cffi/2024-10-12/cffi-20241012-git.tgz"; - sha256 = "1b2j32rapgw8rn7m9sm2k8r8x9jds7vshkm90i5lw9v4xnp8x4m7"; + url = "https://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz"; + sha256 = "1s7b5zrgbf5pz52hcncvvmd22nppwpgvh7s0hg8lnk74k42vpms1"; system = "cffi-tests"; asd = "cffi-tests"; } @@ -8361,12 +8746,12 @@ lib.makeScope pkgs.newScope (self: { cffi-toolchain = ( build-asdf-system { pname = "cffi-toolchain"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cffi-toolchain" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cffi/2024-10-12/cffi-20241012-git.tgz"; - sha256 = "1b2j32rapgw8rn7m9sm2k8r8x9jds7vshkm90i5lw9v4xnp8x4m7"; + url = "https://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz"; + sha256 = "1s7b5zrgbf5pz52hcncvvmd22nppwpgvh7s0hg8lnk74k42vpms1"; system = "cffi-toolchain"; asd = "cffi-toolchain"; } @@ -8379,12 +8764,12 @@ lib.makeScope pkgs.newScope (self: { cffi-uffi-compat = ( build-asdf-system { pname = "cffi-uffi-compat"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cffi-uffi-compat" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cffi/2024-10-12/cffi-20241012-git.tgz"; - sha256 = "1b2j32rapgw8rn7m9sm2k8r8x9jds7vshkm90i5lw9v4xnp8x4m7"; + url = "https://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz"; + sha256 = "1s7b5zrgbf5pz52hcncvvmd22nppwpgvh7s0hg8lnk74k42vpms1"; system = "cffi-uffi-compat"; asd = "cffi-uffi-compat"; } @@ -8397,18 +8782,21 @@ lib.makeScope pkgs.newScope (self: { chain = ( build-asdf-system { pname = "chain"; - version = "20211209-git"; + version = "20250622-git"; asds = [ "chain" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/chain/2021-12-09/chain-20211209-git.tgz"; - sha256 = "0x8b2cbp1xq61fpbk0mqwbksnfynlgai3782rafsywka8rgfhmjh"; + url = "https://beta.quicklisp.org/archive/chain/2025-06-22/chain-20250622-git.tgz"; + sha256 = "10kq8dlwbib6chc9m5wn7v7narjpdksf000vycaj1nqqqdy348mp"; system = "chain"; asd = "chain"; } ); systems = [ "chain" ]; - lispLibs = [ (getAttr "metabang-bind" self) ]; + lispLibs = [ + (getAttr "metabang-bind" self) + (getAttr "mgl-pax" self) + ]; meta = { hydraPlatforms = [ ]; }; @@ -8421,7 +8809,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "chameleon" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/chameleon/2022-02-20/chameleon-v2.1.1.tgz"; + url = "https://beta.quicklisp.org/archive/chameleon/2022-02-20/chameleon-v2.1.1.tgz"; sha256 = "1bqminvhx3hlqzxvy2a105gm9d2dxl5cy6ls5rm9wmkvw7gyza6c"; system = "chameleon"; asd = "chameleon"; @@ -8441,7 +8829,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "chancery" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/chancery/2020-10-16/chancery-20201016-hg.tgz"; + url = "https://beta.quicklisp.org/archive/chancery/2020-10-16/chancery-20201016-hg.tgz"; sha256 = "1g0jgrih7q14gizy481j9z2s15pmv6iwymnpddbyqfja9miv61lw"; system = "chancery"; asd = "chancery"; @@ -8461,7 +8849,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "chancery.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/chancery/2020-10-16/chancery-20201016-hg.tgz"; + url = "https://beta.quicklisp.org/archive/chancery/2020-10-16/chancery-20201016-hg.tgz"; sha256 = "1g0jgrih7q14gizy481j9z2s15pmv6iwymnpddbyqfja9miv61lw"; system = "chancery.test"; asd = "chancery.test"; @@ -8484,7 +8872,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "changed-stream" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/changed-stream/2013-01-28/changed-stream-20130128-git.tgz"; + url = "https://beta.quicklisp.org/archive/changed-stream/2013-01-28/changed-stream-20130128-git.tgz"; sha256 = "1cll7xclg9jr55swhi3g6z567bxvb9kmljh67091xazcfacz732i"; system = "changed-stream"; asd = "changed-stream"; @@ -8504,7 +8892,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "changed-stream.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/changed-stream/2013-01-28/changed-stream-20130128-git.tgz"; + url = "https://beta.quicklisp.org/archive/changed-stream/2013-01-28/changed-stream-20130128-git.tgz"; sha256 = "1cll7xclg9jr55swhi3g6z567bxvb9kmljh67091xazcfacz732i"; system = "changed-stream.test"; asd = "changed-stream.test"; @@ -8520,12 +8908,12 @@ lib.makeScope pkgs.newScope (self: { chanl = ( build-asdf-system { pname = "chanl"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "chanl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/chanl/2024-10-12/chanl-20241012-git.tgz"; - sha256 = "1gyvsajvqjzfmcbccnysw7qyvhyqdlfcwl57lhsfwz9gif50y1fw"; + url = "https://beta.quicklisp.org/archive/chanl/2025-06-22/chanl-20250622-git.tgz"; + sha256 = "1znps9654lap7yl6y370ji0sjwl9bg9g6bazsjy37yw8kwdjflzh"; system = "chanl"; asd = "chanl"; } @@ -8542,7 +8930,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "character-modifier-bits" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; system = "character-modifier-bits"; asd = "character-modifier-bits"; @@ -8562,7 +8950,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "charje.documentation" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/charje.documentation/2024-10-12/charje.documentation-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/charje.documentation/2024-10-12/charje.documentation-20241012-git.tgz"; sha256 = "0rdfi4sj5ad6krwypmsr934ic6y5xlj6iixdwwxrxj9fihfq47zb"; system = "charje.documentation"; asd = "charje.documentation"; @@ -8582,7 +8970,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cheat-js" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cheat-js/2012-10-13/cheat-js-20121013-git.tgz"; + url = "https://beta.quicklisp.org/archive/cheat-js/2012-10-13/cheat-js-20121013-git.tgz"; sha256 = "1h73kx0iii4y4gslz6f8kvf980bnypsras6xj38apm0fcwm93w03"; system = "cheat-js"; asd = "cheat-js"; @@ -8605,7 +8993,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "check-bnf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/check-bnf/2022-07-07/check-bnf-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/check-bnf/2022-07-07/check-bnf-20220707-git.tgz"; sha256 = "1dpp0xzj51a7fg9yw0xsipnsa54xj1axvkk55n0yxq9yv9ih3rb0"; system = "check-bnf"; asd = "check-bnf"; @@ -8631,7 +9019,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "check-bnf.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/check-bnf/2022-07-07/check-bnf-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/check-bnf/2022-07-07/check-bnf-20220707-git.tgz"; sha256 = "1dpp0xzj51a7fg9yw0xsipnsa54xj1axvkk55n0yxq9yv9ih3rb0"; system = "check-bnf.test"; asd = "check-bnf.test"; @@ -8654,7 +9042,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "check-it" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/check-it/2015-07-09/check-it-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/check-it/2015-07-09/check-it-20150709-git.tgz"; sha256 = "1kbjwpniffdpv003igmlz5r0vy65m7wpfnhg54fhwirp1227hgg7"; system = "check-it"; asd = "check-it"; @@ -8676,7 +9064,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "check-it-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/check-it/2015-07-09/check-it-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/check-it/2015-07-09/check-it-20150709-git.tgz"; sha256 = "1kbjwpniffdpv003igmlz5r0vy65m7wpfnhg54fhwirp1227hgg7"; system = "check-it-test"; asd = "check-it"; @@ -8699,7 +9087,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "checkl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/checkl/2018-03-28/checkl-20180328-git.tgz"; + url = "https://beta.quicklisp.org/archive/checkl/2018-03-28/checkl-20180328-git.tgz"; sha256 = "0bpisihx1gay44xmyr1dmhlwh00j0zzi04rp9fy35i95l2r4xdlx"; system = "checkl"; asd = "checkl"; @@ -8719,7 +9107,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "checkl-docs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/checkl/2018-03-28/checkl-20180328-git.tgz"; + url = "https://beta.quicklisp.org/archive/checkl/2018-03-28/checkl-20180328-git.tgz"; sha256 = "0bpisihx1gay44xmyr1dmhlwh00j0zzi04rp9fy35i95l2r4xdlx"; system = "checkl-docs"; asd = "checkl-docs"; @@ -8742,7 +9130,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "checkl-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/checkl/2018-03-28/checkl-20180328-git.tgz"; + url = "https://beta.quicklisp.org/archive/checkl/2018-03-28/checkl-20180328-git.tgz"; sha256 = "0bpisihx1gay44xmyr1dmhlwh00j0zzi04rp9fy35i95l2r4xdlx"; system = "checkl-test"; asd = "checkl-test"; @@ -8765,7 +9153,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "chemical-compounds" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/chemical-compounds/2011-10-01/chemical-compounds-1.0.2.tgz"; + url = "https://beta.quicklisp.org/archive/chemical-compounds/2011-10-01/chemical-compounds-1.0.2.tgz"; sha256 = "047z1lab08y4nsb32rnzqfpb6akyhibzjgmmr1bnwrh9pmhv3s2k"; system = "chemical-compounds"; asd = "chemical-compounds"; @@ -8785,7 +9173,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "chillax" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/chillax/2015-03-02/chillax-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/chillax/2015-03-02/chillax-20150302-git.tgz"; sha256 = "1is3qm68wyfi3rmpn8mw0x9861951a2w60snsdippikygm3smzr1"; system = "chillax"; asd = "chillax"; @@ -8808,7 +9196,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "chillax.core" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/chillax/2015-03-02/chillax-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/chillax/2015-03-02/chillax-20150302-git.tgz"; sha256 = "1is3qm68wyfi3rmpn8mw0x9861951a2w60snsdippikygm3smzr1"; system = "chillax.core"; asd = "chillax.core"; @@ -8832,7 +9220,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "chillax.jsown" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/chillax/2015-03-02/chillax-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/chillax/2015-03-02/chillax-20150302-git.tgz"; sha256 = "1is3qm68wyfi3rmpn8mw0x9861951a2w60snsdippikygm3smzr1"; system = "chillax.jsown"; asd = "chillax.jsown"; @@ -8855,7 +9243,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "chillax.view-server" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/chillax/2015-03-02/chillax-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/chillax/2015-03-02/chillax-20150302-git.tgz"; sha256 = "1is3qm68wyfi3rmpn8mw0x9861951a2w60snsdippikygm3smzr1"; system = "chillax.view-server"; asd = "chillax.view-server"; @@ -8878,7 +9266,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "chillax.yason" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/chillax/2015-03-02/chillax-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/chillax/2015-03-02/chillax-20150302-git.tgz"; sha256 = "1is3qm68wyfi3rmpn8mw0x9861951a2w60snsdippikygm3smzr1"; system = "chillax.yason"; asd = "chillax.yason"; @@ -8897,12 +9285,12 @@ lib.makeScope pkgs.newScope (self: { chipi = ( build-asdf-system { pname = "chipi"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "chipi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/chipi/2024-10-12/chipi-20241012-git.tgz"; - sha256 = "0xpfclvl5v031cjnjvr3bcfc87rayw624m9yrw35f5r31p8m283g"; + url = "https://beta.quicklisp.org/archive/chipi/2025-06-22/chipi-20250622-git.tgz"; + sha256 = "00wqwgdzfnwxkm1bd42axp69bpl0gs99i7a3mq2x6q1dvn1rczac"; system = "chipi"; asd = "chipi"; } @@ -8912,12 +9300,12 @@ lib.makeScope pkgs.newScope (self: { (getAttr "alexandria" self) (getAttr "binding-arrows" self) (getAttr "cl-cron" self) + (getAttr "com_dot_inuoe_dot_jzon" self) (getAttr "drakma" self) (getAttr "local-time" self) (getAttr "parse-float" self) (getAttr "sento" self) (getAttr "timer-wheel" self) - (getAttr "yason" self) ]; meta = { hydraPlatforms = [ ]; @@ -8927,12 +9315,12 @@ lib.makeScope pkgs.newScope (self: { chipi-web = ( build-asdf-system { pname = "chipi-web"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "chipi-web" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/chipi/2024-10-12/chipi-20241012-git.tgz"; - sha256 = "0xpfclvl5v031cjnjvr3bcfc87rayw624m9yrw35f5r31p8m283g"; + url = "https://beta.quicklisp.org/archive/chipi/2025-06-22/chipi-20250622-git.tgz"; + sha256 = "00wqwgdzfnwxkm1bd42axp69bpl0gs99i7a3mq2x6q1dvn1rczac"; system = "chipi-web"; asd = "chipi-web"; } @@ -8942,7 +9330,6 @@ lib.makeScope pkgs.newScope (self: { (getAttr "chipi" self) (getAttr "cl-base64" self) (getAttr "cl-ppcre" self) - (getAttr "com_dot_inuoe_dot_jzon" self) (getAttr "drakma" self) (getAttr "hunchentoot" self) (getAttr "ironclad" self) @@ -8961,7 +9348,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "chipmunk-blob" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/chipmunk-blob/2020-10-16/chipmunk-blob-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/chipmunk-blob/2020-10-16/chipmunk-blob-stable-git.tgz"; sha256 = "0kdi1al1cn90hzjfnjhkxp3k5ibp6l73k3m04mkpzkzpjy7jc80d"; system = "chipmunk-blob"; asd = "chipmunk-blob"; @@ -8984,7 +9371,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "chipz" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/chipz/2023-06-18/chipz-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/chipz/2023-06-18/chipz-20230618-git.tgz"; sha256 = "04ysl1lz47dd8p1cbm637kpyf84hl74xvcdpqhdyxwh4n97csm5h"; system = "chipz"; asd = "chipz"; @@ -8998,12 +9385,12 @@ lib.makeScope pkgs.newScope (self: { chirp = ( build-asdf-system { pname = "chirp"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "chirp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/chirp/2023-10-21/chirp-20231021-git.tgz"; - sha256 = "00vin2svx54wpk2yv9645y3gfy5pg78pfpr79srqk7jklr1wwa1m"; + url = "https://beta.quicklisp.org/archive/chirp/2025-06-22/chirp-20250622-git.tgz"; + sha256 = "00q82i0jkz61a15q658w3l82c8blz7s8197zgh72zwypgis8aw0q"; system = "chirp"; asd = "chirp"; } @@ -9018,12 +9405,12 @@ lib.makeScope pkgs.newScope (self: { chirp-core = ( build-asdf-system { pname = "chirp-core"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "chirp-core" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/chirp/2023-10-21/chirp-20231021-git.tgz"; - sha256 = "00vin2svx54wpk2yv9645y3gfy5pg78pfpr79srqk7jklr1wwa1m"; + url = "https://beta.quicklisp.org/archive/chirp/2025-06-22/chirp-20250622-git.tgz"; + sha256 = "00q82i0jkz61a15q658w3l82c8blz7s8197zgh72zwypgis8aw0q"; system = "chirp-core"; asd = "chirp-core"; } @@ -9049,12 +9436,12 @@ lib.makeScope pkgs.newScope (self: { chirp-dexador = ( build-asdf-system { pname = "chirp-dexador"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "chirp-dexador" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/chirp/2023-10-21/chirp-20231021-git.tgz"; - sha256 = "00vin2svx54wpk2yv9645y3gfy5pg78pfpr79srqk7jklr1wwa1m"; + url = "https://beta.quicklisp.org/archive/chirp/2025-06-22/chirp-20250622-git.tgz"; + sha256 = "00q82i0jkz61a15q658w3l82c8blz7s8197zgh72zwypgis8aw0q"; system = "chirp-dexador"; asd = "chirp-dexador"; } @@ -9072,12 +9459,12 @@ lib.makeScope pkgs.newScope (self: { chirp-drakma = ( build-asdf-system { pname = "chirp-drakma"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "chirp-drakma" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/chirp/2023-10-21/chirp-20231021-git.tgz"; - sha256 = "00vin2svx54wpk2yv9645y3gfy5pg78pfpr79srqk7jklr1wwa1m"; + url = "https://beta.quicklisp.org/archive/chirp/2025-06-22/chirp-20250622-git.tgz"; + sha256 = "00q82i0jkz61a15q658w3l82c8blz7s8197zgh72zwypgis8aw0q"; system = "chirp-drakma"; asd = "chirp-drakma"; } @@ -9099,7 +9486,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "chlorophyll" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/chlorophyll/2023-10-21/chlorophyll-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/chlorophyll/2023-10-21/chlorophyll-20231021-git.tgz"; sha256 = "0q681pbcx4vcshrlligd5h07kakbjprb0kpf48z4glswy59vg8mg"; system = "chlorophyll"; asd = "chlorophyll"; @@ -9119,7 +9506,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "chlorophyll-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/chlorophyll/2023-10-21/chlorophyll-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/chlorophyll/2023-10-21/chlorophyll-20231021-git.tgz"; sha256 = "0q681pbcx4vcshrlligd5h07kakbjprb0kpf48z4glswy59vg8mg"; system = "chlorophyll-test"; asd = "chlorophyll-test"; @@ -9143,7 +9530,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "chrome-native-messaging" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/chrome-native-messaging/2015-03-02/chrome-native-messaging-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/chrome-native-messaging/2015-03-02/chrome-native-messaging-20150302-git.tgz"; sha256 = "1fw02w5brpwa0kl7sx5b13fbcfv1ny8rwcj11ayj2q528i2xmpx5"; system = "chrome-native-messaging"; asd = "chrome-native-messaging"; @@ -9163,7 +9550,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "chronicity" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/chronicity/2019-02-02/chronicity-20190202-git.tgz"; + url = "https://beta.quicklisp.org/archive/chronicity/2019-02-02/chronicity-20190202-git.tgz"; sha256 = "1h5dlgvccffd8sqszqwilscysklzfcp374zl48rq14ywgv3rnwhl"; system = "chronicity"; asd = "chronicity"; @@ -9187,7 +9574,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "chronicity-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/chronicity/2019-02-02/chronicity-20190202-git.tgz"; + url = "https://beta.quicklisp.org/archive/chronicity/2019-02-02/chronicity-20190202-git.tgz"; sha256 = "1h5dlgvccffd8sqszqwilscysklzfcp374zl48rq14ywgv3rnwhl"; system = "chronicity-test"; asd = "chronicity-test"; @@ -9210,7 +9597,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "chtml-matcher" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/chtml-matcher/2011-10-01/chtml-matcher-20111001-git.tgz"; + url = "https://beta.quicklisp.org/archive/chtml-matcher/2011-10-01/chtml-matcher-20111001-git.tgz"; sha256 = "1q1ksy2w0c4dcmq8543scl11x4crh1m5w29p1wjpqhxk826jx7fd"; system = "chtml-matcher"; asd = "chtml-matcher"; @@ -9235,7 +9622,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "chunga" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/chunga/2024-10-12/chunga-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/chunga/2024-10-12/chunga-20241012-git.tgz"; sha256 = "17jswsp31dh1jpg2n60nn34wxf4z6vvxjq1avy50z9fnzywvikyi"; system = "chunga"; asd = "chunga"; @@ -9253,7 +9640,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ci-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ci-utils/2024-10-12/ci-utils-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/ci-utils/2024-10-12/ci-utils-20241012-git.tgz"; sha256 = "1wrr1v2r7kd668hyz54x28xh153l2qkl1gra3bk4wmqi3x7xyxdg"; system = "ci-utils"; asd = "ci-utils"; @@ -9273,7 +9660,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ci-utils-features" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ci-utils/2024-10-12/ci-utils-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/ci-utils/2024-10-12/ci-utils-20241012-git.tgz"; sha256 = "1wrr1v2r7kd668hyz54x28xh153l2qkl1gra3bk4wmqi3x7xyxdg"; system = "ci-utils-features"; asd = "ci-utils-features"; @@ -9293,7 +9680,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ciao" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ciao/2024-10-12/ciao-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/ciao/2024-10-12/ciao-20241012-git.tgz"; sha256 = "1x443k02kl5iyq6awv2vqm08d9x9f92hjivqv2c5xdamki7y513s"; system = "ciao"; asd = "ciao"; @@ -9318,7 +9705,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "circular-streams" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz"; + url = "https://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz"; sha256 = "1wpw6d5cciyqcf92f7mvihak52pd5s47kk4qq6f0r2z2as68p5rs"; system = "circular-streams"; asd = "circular-streams"; @@ -9339,7 +9726,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "circular-streams-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz"; + url = "https://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz"; sha256 = "1wpw6d5cciyqcf92f7mvihak52pd5s47kk4qq6f0r2z2as68p5rs"; system = "circular-streams-test"; asd = "circular-streams-test"; @@ -9363,7 +9750,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "city-hash" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/city-hash/2020-09-25/city-hash-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/city-hash/2020-09-25/city-hash-20200925-git.tgz"; sha256 = "10ksl402aa37sn78hnvlvpqibr66qzpjvf2x4a789gnl411cf44a"; system = "city-hash"; asd = "city-hash"; @@ -9387,7 +9774,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "city-hash-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/city-hash/2020-09-25/city-hash-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/city-hash/2020-09-25/city-hash-20200925-git.tgz"; sha256 = "10ksl402aa37sn78hnvlvpqibr66qzpjvf2x4a789gnl411cf44a"; system = "city-hash-test"; asd = "city-hash-test"; @@ -9410,7 +9797,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ckr-tables" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lisp-critic/2024-10-12/lisp-critic-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/lisp-critic/2024-10-12/lisp-critic-20241012-git.tgz"; sha256 = "19czs2m8h3kgwjd10pdk9r5kazbgly8g82a5q3bs7pqkja42i7x7"; system = "ckr-tables"; asd = "ckr-tables"; @@ -9426,12 +9813,12 @@ lib.makeScope pkgs.newScope (self: { cl_plus_ssl = ( build-asdf-system { pname = "cl+ssl"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "cl+ssl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl+ssl/2023-10-21/cl+ssl-20231021-git.tgz"; - sha256 = "0v0kx2m5355jkdshmj0z923c5rlvdl2n11rb3hjbv3kssdfsbs0s"; + url = "https://beta.quicklisp.org/archive/cl+ssl/2025-06-22/cl+ssl-20250622-git.tgz"; + sha256 = "0ns7if8f6i3ag0xrxkxy9k25ybypb2y3h4bq75cf7a0y82j3wlax"; system = "cl+ssl"; asd = "cl+ssl"; } @@ -9453,12 +9840,12 @@ lib.makeScope pkgs.newScope (self: { cl_plus_ssl_dot_test = ( build-asdf-system { pname = "cl+ssl.test"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "cl+ssl.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl+ssl/2023-10-21/cl+ssl-20231021-git.tgz"; - sha256 = "0v0kx2m5355jkdshmj0z923c5rlvdl2n11rb3hjbv3kssdfsbs0s"; + url = "https://beta.quicklisp.org/archive/cl+ssl/2025-06-22/cl+ssl-20250622-git.tgz"; + sha256 = "0ns7if8f6i3ag0xrxkxy9k25ybypb2y3h4bq75cf7a0y82j3wlax"; system = "cl+ssl.test"; asd = "cl+ssl.test"; } @@ -9484,7 +9871,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-6502" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-6502/2024-10-12/cl-6502-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-6502/2024-10-12/cl-6502-20241012-git.tgz"; sha256 = "1cj38bi12i7ji3m8dd8gxb17dlna2v8s3b3h6b0a9pvmv6wchpmz"; system = "cl-6502"; asd = "cl-6502"; @@ -9507,7 +9894,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-aa" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-vectors/2024-10-12/cl-vectors-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-vectors/2024-10-12/cl-vectors-20241012-git.tgz"; sha256 = "1nkmmn38y6af10ysff3g2qkf5lb2601dcjp5rffsjh6bv2ik2jd5"; system = "cl-aa"; asd = "cl-aa"; @@ -9525,7 +9912,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-aa-misc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-vectors/2024-10-12/cl-vectors-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-vectors/2024-10-12/cl-vectors-20241012-git.tgz"; sha256 = "1nkmmn38y6af10ysff3g2qkf5lb2601dcjp5rffsjh6bv2ik2jd5"; system = "cl-aa-misc"; asd = "cl-aa-misc"; @@ -9545,7 +9932,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-acronyms" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-acronyms/2015-03-02/cl-acronyms-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-acronyms/2015-03-02/cl-acronyms-20150302-git.tgz"; sha256 = "1b827g6n87i81wbqzvmlq0yn41kfa502v5ssbh2wh1b4xznhn8cc"; system = "cl-acronyms"; asd = "cl-acronyms"; @@ -9568,7 +9955,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-actors" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/common-lisp-actors/2019-11-30/common-lisp-actors-20191130-git.tgz"; + url = "https://beta.quicklisp.org/archive/common-lisp-actors/2019-11-30/common-lisp-actors-20191130-git.tgz"; sha256 = "0snf91yivxq6jcbvm3l6b05lcka7jrzciqd4m841amghfw32clfn"; system = "cl-actors"; asd = "cl-actors"; @@ -9588,7 +9975,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-advice" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-advice/2023-02-14/cl-advice-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-advice/2023-02-14/cl-advice-20230214-git.tgz"; sha256 = "038fhy7chgn9racrcikqncyiq5yqngs6d5ahxz7jkypixcdz48jx"; system = "cl-advice"; asd = "cl-advice"; @@ -9608,7 +9995,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-advice-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-advice/2023-02-14/cl-advice-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-advice/2023-02-14/cl-advice-20230214-git.tgz"; sha256 = "038fhy7chgn9racrcikqncyiq5yqngs6d5ahxz7jkypixcdz48jx"; system = "cl-advice-tests"; asd = "cl-advice-tests"; @@ -9631,7 +10018,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-alc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-openal/2022-11-06/cl-openal-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-openal/2022-11-06/cl-openal-20221106-git.tgz"; sha256 = "0jmp81mf23ckcm4knnh0q7zpmyls5220imaqbmnl0xvvra10b1zy"; system = "cl-alc"; asd = "cl-alc"; @@ -9654,7 +10041,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-algebraic-data-type" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-algebraic-data-type/2024-10-12/cl-algebraic-data-type-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-algebraic-data-type/2024-10-12/cl-algebraic-data-type-20241012-git.tgz"; sha256 = "02bfx9g4267f7f85banmfy15adyvlzaz3flia8zmhlzhpx7j4bj6"; system = "cl-algebraic-data-type"; asd = "cl-algebraic-data-type"; @@ -9677,7 +10064,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-all" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-all/2024-10-12/cl-all-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-all/2024-10-12/cl-all-20241012-git.tgz"; sha256 = "02n30b3yp949fxwnb9wr3m9hd5h1kcmxcbjc8c5fj4ihphf8sd7d"; system = "cl-all"; asd = "cl-all"; @@ -9697,7 +10084,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-alut" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-openal/2022-11-06/cl-openal-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-openal/2022-11-06/cl-openal-20221106-git.tgz"; sha256 = "0jmp81mf23ckcm4knnh0q7zpmyls5220imaqbmnl0xvvra10b1zy"; system = "cl-alut"; asd = "cl-alut"; @@ -9720,7 +10107,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-amqp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-amqp/2019-10-08/cl-amqp-v0.4.1.tgz"; + url = "https://beta.quicklisp.org/archive/cl-amqp/2019-10-08/cl-amqp-v0.4.1.tgz"; sha256 = "1ggd77ckfr54z7z5yi8d04k310x2dhf53qija8dzjhk1r9py20vz"; system = "cl-amqp"; asd = "cl-amqp"; @@ -9750,7 +10137,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-amqp.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-amqp/2019-10-08/cl-amqp-v0.4.1.tgz"; + url = "https://beta.quicklisp.org/archive/cl-amqp/2019-10-08/cl-amqp-v0.4.1.tgz"; sha256 = "1ggd77ckfr54z7z5yi8d04k310x2dhf53qija8dzjhk1r9py20vz"; system = "cl-amqp.test"; asd = "cl-amqp.test"; @@ -9777,7 +10164,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana"; asd = "cl-ana"; @@ -9837,7 +10224,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.array-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.array-utils"; asd = "cl-ana.array-utils"; @@ -9857,7 +10244,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.binary-tree" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.binary-tree"; asd = "cl-ana.binary-tree"; @@ -9881,7 +10268,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.calculus" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.calculus"; asd = "cl-ana.calculus"; @@ -9904,7 +10291,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.clos-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.clos-utils"; asd = "cl-ana.clos-utils"; @@ -9929,7 +10316,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.columnar-table" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.columnar-table"; asd = "cl-ana.columnar-table"; @@ -9952,7 +10339,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.csv-table" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.csv-table"; asd = "cl-ana.csv-table"; @@ -9979,7 +10366,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.error-propogation" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.error-propogation"; asd = "cl-ana.error-propogation"; @@ -10002,7 +10389,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.file-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.file-utils"; asd = "cl-ana.file-utils"; @@ -10025,7 +10412,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.fitting" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.fitting"; asd = "cl-ana.fitting"; @@ -10052,7 +10439,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.functional-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.functional-utils"; asd = "cl-ana.functional-utils"; @@ -10072,7 +10459,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.generic-math" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.generic-math"; asd = "cl-ana.generic-math"; @@ -10095,7 +10482,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.gnuplot-interface" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.gnuplot-interface"; asd = "cl-ana.gnuplot-interface"; @@ -10115,7 +10502,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.gsl-cffi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.gsl-cffi"; asd = "cl-ana.gsl-cffi"; @@ -10135,7 +10522,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.hash-table-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.hash-table-utils"; asd = "cl-ana.hash-table-utils"; @@ -10155,7 +10542,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.hdf-cffi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.hdf-cffi"; asd = "cl-ana.hdf-cffi"; @@ -10178,7 +10565,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.hdf-table" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.hdf-table"; asd = "cl-ana.hdf-table"; @@ -10208,7 +10595,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.hdf-typespec" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.hdf-typespec"; asd = "cl-ana.hdf-typespec"; @@ -10237,7 +10624,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.hdf-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.hdf-utils"; asd = "cl-ana.hdf-utils"; @@ -10267,7 +10654,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.histogram" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.histogram"; asd = "cl-ana.histogram"; @@ -10301,7 +10688,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.int-char" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.int-char"; asd = "cl-ana.int-char"; @@ -10321,7 +10708,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.linear-algebra" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.linear-algebra"; asd = "cl-ana.linear-algebra"; @@ -10347,7 +10734,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.list-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.list-utils"; asd = "cl-ana.list-utils"; @@ -10371,7 +10758,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.lorentz" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.lorentz"; asd = "cl-ana.lorentz"; @@ -10396,7 +10783,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.macro-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.macro-utils"; asd = "cl-ana.macro-utils"; @@ -10422,7 +10809,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.makeres" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.makeres"; asd = "cl-ana.makeres"; @@ -10464,7 +10851,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.makeres-block" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.makeres-block"; asd = "cl-ana.makeres-block"; @@ -10489,7 +10876,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.makeres-branch" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.makeres-branch"; asd = "cl-ana.makeres-branch"; @@ -10516,7 +10903,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.makeres-graphviz" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.makeres-graphviz"; asd = "cl-ana.makeres-graphviz"; @@ -10539,7 +10926,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.makeres-macro" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.makeres-macro"; asd = "cl-ana.makeres-macro"; @@ -10562,7 +10949,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.makeres-progress" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.makeres-progress"; asd = "cl-ana.makeres-progress"; @@ -10586,7 +10973,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.makeres-table" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.makeres-table"; asd = "cl-ana.makeres-table"; @@ -10620,7 +11007,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.makeres-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.makeres-utils"; asd = "cl-ana.makeres-utils"; @@ -10657,7 +11044,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.map" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.map"; asd = "cl-ana.map"; @@ -10677,7 +11064,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.math-functions" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.math-functions"; asd = "cl-ana.math-functions"; @@ -10700,7 +11087,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.memoization" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.memoization"; asd = "cl-ana.memoization"; @@ -10720,7 +11107,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.ntuple-table" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.ntuple-table"; asd = "cl-ana.ntuple-table"; @@ -10749,7 +11136,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.package-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.package-utils"; asd = "cl-ana.package-utils"; @@ -10769,7 +11156,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.pathname-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.pathname-utils"; asd = "cl-ana.pathname-utils"; @@ -10789,7 +11176,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.plotting" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.plotting"; asd = "cl-ana.plotting"; @@ -10825,7 +11212,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.quantity" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.quantity"; asd = "cl-ana.quantity"; @@ -10853,7 +11240,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.reusable-table" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.reusable-table"; asd = "cl-ana.reusable-table"; @@ -10876,7 +11263,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.serialization" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.serialization"; asd = "cl-ana.serialization"; @@ -10904,7 +11291,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.spline" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.spline"; asd = "cl-ana.spline"; @@ -10933,7 +11320,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.statistical-learning" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.statistical-learning"; asd = "cl-ana.statistical-learning"; @@ -10963,7 +11350,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.statistics" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.statistics"; asd = "cl-ana.statistics"; @@ -10990,7 +11377,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.string-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.string-utils"; asd = "cl-ana.string-utils"; @@ -11010,7 +11397,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.symbol-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.symbol-utils"; asd = "cl-ana.symbol-utils"; @@ -11030,7 +11417,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.table" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.table"; asd = "cl-ana.table"; @@ -11057,7 +11444,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.table-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.table-utils"; asd = "cl-ana.table-utils"; @@ -11084,7 +11471,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.table-viewing" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.table-viewing"; asd = "cl-ana.table-viewing"; @@ -11112,7 +11499,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.tensor" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.tensor"; asd = "cl-ana.tensor"; @@ -11138,7 +11525,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.typed-table" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.typed-table"; asd = "cl-ana.typed-table"; @@ -11165,7 +11552,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ana.typespec" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.typespec"; asd = "cl-ana.typespec"; @@ -11194,7 +11581,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-android" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sl4a/2015-08-04/cl-sl4a-20150804-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sl4a/2015-08-04/cl-sl4a-20150804-git.tgz"; sha256 = "0lqla60apkc8xfiyi43w18dldf0m8z5q290wv3d89qf0n9gwk3cr"; system = "cl-android"; asd = "cl-android"; @@ -11217,7 +11604,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-annot" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz"; sha256 = "1wq1gs9jjd5m6iwrv06c2d7i5dvqsfjcljgbspfbc93cg5xahk4n"; system = "cl-annot"; asd = "cl-annot"; @@ -11235,7 +11622,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-annot-prove" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-annot-prove/2015-09-23/cl-annot-prove-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-annot-prove/2015-09-23/cl-annot-prove-20150923-git.tgz"; sha256 = "000nlxxs1id1pccp3y5s9xnm76fc5r87q0bxmjrpklxwwf5y8wwy"; system = "cl-annot-prove"; asd = "cl-annot-prove"; @@ -11262,7 +11649,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-annot-prove-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-annot-prove/2015-09-23/cl-annot-prove-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-annot-prove/2015-09-23/cl-annot-prove-20150923-git.tgz"; sha256 = "000nlxxs1id1pccp3y5s9xnm76fc5r87q0bxmjrpklxwwf5y8wwy"; system = "cl-annot-prove-test"; asd = "cl-annot-prove-test"; @@ -11286,7 +11673,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-annot-revisit" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-annot-revisit/2022-11-06/cl-annot-revisit-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-annot-revisit/2022-11-06/cl-annot-revisit-20221106-git.tgz"; sha256 = "0jlllgq14bi1rddzlmq9wfs4vb24apgqz17wfd79kjjcmnzzjp4m"; system = "cl-annot-revisit"; asd = "cl-annot-revisit"; @@ -11309,7 +11696,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-annot-revisit-compat" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-annot-revisit/2022-11-06/cl-annot-revisit-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-annot-revisit/2022-11-06/cl-annot-revisit-20221106-git.tgz"; sha256 = "0jlllgq14bi1rddzlmq9wfs4vb24apgqz17wfd79kjjcmnzzjp4m"; system = "cl-annot-revisit-compat"; asd = "cl-annot-revisit-compat"; @@ -11329,7 +11716,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-annot-revisit-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-annot-revisit/2022-11-06/cl-annot-revisit-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-annot-revisit/2022-11-06/cl-annot-revisit-20221106-git.tgz"; sha256 = "0jlllgq14bi1rddzlmq9wfs4vb24apgqz17wfd79kjjcmnzzjp4m"; system = "cl-annot-revisit-test"; asd = "cl-annot-revisit-test"; @@ -11354,7 +11741,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-anonfun" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-anonfun/2011-12-03/cl-anonfun-20111203-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-anonfun/2011-12-03/cl-anonfun-20111203-git.tgz"; sha256 = "086x2vjvasdy9bhikvdzx34nrq008c0sfkq3ncv0i9mhfk5xwp2j"; system = "cl-anonfun"; asd = "cl-anonfun"; @@ -11368,12 +11755,12 @@ lib.makeScope pkgs.newScope (self: { cl-ansi-term = ( build-asdf-system { pname = "cl-ansi-term"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-ansi-term" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ansi-term/2024-10-12/cl-ansi-term-20241012-git.tgz"; - sha256 = "01nrlyb8lqca9z16ndlyy22wqy83ixcr02yibfypj255x6xbql1x"; + url = "https://beta.quicklisp.org/archive/cl-ansi-term/2025-06-22/cl-ansi-term-20250622-git.tgz"; + sha256 = "0hrg17bijyhldmc5j8j50q9njqapm5yj7m3sb8azlffam9bpsbza"; system = "cl-ansi-term"; asd = "cl-ansi-term"; } @@ -11382,6 +11769,7 @@ lib.makeScope pkgs.newScope (self: { lispLibs = [ (getAttr "alexandria" self) (getAttr "anaphora" self) + (getAttr "serapeum" self) (getAttr "str" self) ]; meta = { @@ -11396,7 +11784,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ansi-text" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ansi-text/2021-10-20/cl-ansi-text-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ansi-text/2021-10-20/cl-ansi-text-20211020-git.tgz"; sha256 = "0nk7ajqfa937w1iy3zy86jjbw8yffm05cqs4wxkgl97v6kmmya14"; system = "cl-ansi-text"; asd = "cl-ansi-text"; @@ -11417,7 +11805,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ansi-text.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ansi-text/2021-10-20/cl-ansi-text-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ansi-text/2021-10-20/cl-ansi-text-20211020-git.tgz"; sha256 = "0nk7ajqfa937w1iy3zy86jjbw8yffm05cqs4wxkgl97v6kmmya14"; system = "cl-ansi-text.test"; asd = "cl-ansi-text.test"; @@ -11442,7 +11830,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-apertium-stream" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-apertium-stream-parser/2023-06-18/cl-apertium-stream-parser-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-apertium-stream-parser/2023-06-18/cl-apertium-stream-parser-20230618-git.tgz"; sha256 = "1f3v5pgar83iw443haa4nlzy1qvr55xxqggq9klvsji1a3jdypqy"; system = "cl-apertium-stream"; asd = "cl-apertium-stream"; @@ -11465,7 +11853,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-apple-plist" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-apple-plist/2011-11-05/cl-apple-plist-20111105-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-apple-plist/2011-11-05/cl-apple-plist-20111105-git.tgz"; sha256 = "104j5lvvp7apdx59kbwc6kpa8b82y20w03627ml91lpbqk9bq63f"; system = "cl-apple-plist"; asd = "cl-apple-plist"; @@ -11485,7 +11873,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-arff-parser" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-arff-parser/2013-04-21/cl-arff-parser-20130421-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-arff-parser/2013-04-21/cl-arff-parser-20130421-git.tgz"; sha256 = "0rn76r48b2y2richfy3si4r8kbwkvm7q15g34sxi0fkfmx15z4jx"; system = "cl-arff-parser"; asd = "cl-arff-parser"; @@ -11505,7 +11893,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-argparse" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-argparse/2021-05-31/cl-argparse-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-argparse/2021-05-31/cl-argparse-20210531-git.tgz"; sha256 = "05vy2iaqr7yiaw0ykzwm0ml0mil5qagy87b8hqx4vvb3lq1qpn14"; system = "cl-argparse"; asd = "cl-argparse"; @@ -11525,7 +11913,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-aristid" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-aristid/2020-09-25/cl-aristid-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-aristid/2020-09-25/cl-aristid-20200925-git.tgz"; sha256 = "0k573k3wydy6dd5pmvqdxmlwk0n5kq2wsk86syddhqyjgx2jmw98"; system = "cl-aristid"; asd = "cl-aristid"; @@ -11548,7 +11936,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-arxiv-api" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-arxiv-api/2017-04-03/cl-arxiv-api-20170403-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-arxiv-api/2017-04-03/cl-arxiv-api-20170403-git.tgz"; sha256 = "1id95gszqxmmjydv1vjv2vyxz0svqvnx74bmgy63xnajb4kfnpq3"; system = "cl-arxiv-api"; asd = "cl-arxiv-api"; @@ -11574,7 +11962,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ascii-art" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ascii-art/2017-10-19/cl-ascii-art-20171019-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ascii-art/2017-10-19/cl-ascii-art-20171019-git.tgz"; sha256 = "03d3bd8m7dd2l4170vky8y8ini3giqhjpd06rlswz287mkvzq8aa"; system = "cl-ascii-art"; asd = "cl-ascii-art"; @@ -11601,7 +11989,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ascii-table" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ascii-table/2020-06-10/cl-ascii-table-20200610-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ascii-table/2020-06-10/cl-ascii-table-20200610-git.tgz"; sha256 = "1nclyypd2p06hyfydcv16m9lbj1xmrpmf00wp8mfyhwimv021zlp"; system = "cl-ascii-table"; asd = "cl-ascii-table"; @@ -11621,7 +12009,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-aseprite" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-aseprite/2024-10-12/cl-aseprite-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-aseprite/2024-10-12/cl-aseprite-20241012-git.tgz"; sha256 = "0xjrfi232d0my4ncafp1l2yfas8nj0k8nsbppkq70anic5ihbhch"; system = "cl-aseprite"; asd = "cl-aseprite"; @@ -11647,7 +12035,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-association-rules" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-association-rules/2017-04-03/cl-association-rules-20170403-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-association-rules/2017-04-03/cl-association-rules-20170403-git.tgz"; sha256 = "1d4sg9j30ydk1m17byacww8l2x9ggb82iay507g08ij0jxdky86z"; system = "cl-association-rules"; asd = "cl-association-rules"; @@ -11667,7 +12055,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-association-rules-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-association-rules/2017-04-03/cl-association-rules-20170403-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-association-rules/2017-04-03/cl-association-rules-20170403-git.tgz"; sha256 = "1d4sg9j30ydk1m17byacww8l2x9ggb82iay507g08ij0jxdky86z"; system = "cl-association-rules-tests"; asd = "cl-association-rules"; @@ -11686,12 +12074,12 @@ lib.makeScope pkgs.newScope (self: { cl-astar = ( build-asdf-system { pname = "cl-astar"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-astar" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-astar/2024-10-12/cl-astar-20241012-git.tgz"; - sha256 = "0fdwyg3xnj5sxn4cqycydg0cp1l3ii0brk7ad1sh28m703zmndxv"; + url = "https://beta.quicklisp.org/archive/cl-astar/2025-06-22/cl-astar-20250622-git.tgz"; + sha256 = "1hx68wk2r290v1l5g4gp02rj33kc1zf7xbn5c5kmys83f9dq8j9f"; system = "cl-astar"; asd = "cl-astar"; } @@ -11711,12 +12099,12 @@ lib.makeScope pkgs.newScope (self: { cl-async = ( build-asdf-system { pname = "cl-async"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-async" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-async/2024-10-12/cl-async-20241012-git.tgz"; - sha256 = "0z0gnwfb0flrxpbjmvzap0kmyz8r898x5jriyna365plc50hlcdr"; + url = "https://beta.quicklisp.org/archive/cl-async/2025-06-22/cl-async-20250622-git.tgz"; + sha256 = "0z1zb8dvi0p5kx2fv1wi092l50jb88xwsbxzmkmny9647jfcq9kv"; system = "cl-async"; asd = "cl-async"; } @@ -11743,7 +12131,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-async-await" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-async-await/2020-10-16/cl-async-await-20201016-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-async-await/2020-10-16/cl-async-await-20201016-git.tgz"; sha256 = "1slhn9z4hljvad3hd8jmvw4q4m6310s04yh3212wvbfar8q0yasj"; system = "cl-async-await"; asd = "cl-async-await"; @@ -11763,12 +12151,12 @@ lib.makeScope pkgs.newScope (self: { cl-async-base = ( build-asdf-system { pname = "cl-async-base"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-async-base" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-async/2024-10-12/cl-async-20241012-git.tgz"; - sha256 = "0z0gnwfb0flrxpbjmvzap0kmyz8r898x5jriyna365plc50hlcdr"; + url = "https://beta.quicklisp.org/archive/cl-async/2025-06-22/cl-async-20250622-git.tgz"; + sha256 = "0z1zb8dvi0p5kx2fv1wi092l50jb88xwsbxzmkmny9647jfcq9kv"; system = "cl-async-base"; asd = "cl-async"; } @@ -11789,7 +12177,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-async-future" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-async-future/2015-01-13/cl-async-future-20150113-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-async-future/2015-01-13/cl-async-future-20150113-git.tgz"; sha256 = "0z0sc7qlzzxk99f4l26zp6rai9kv0kj0f599sxai5s44p17zbbvh"; system = "cl-async-future"; asd = "cl-async-future"; @@ -11805,12 +12193,12 @@ lib.makeScope pkgs.newScope (self: { cl-async-repl = ( build-asdf-system { pname = "cl-async-repl"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-async-repl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-async/2024-10-12/cl-async-20241012-git.tgz"; - sha256 = "0z0gnwfb0flrxpbjmvzap0kmyz8r898x5jriyna365plc50hlcdr"; + url = "https://beta.quicklisp.org/archive/cl-async/2025-06-22/cl-async-20250622-git.tgz"; + sha256 = "0z1zb8dvi0p5kx2fv1wi092l50jb88xwsbxzmkmny9647jfcq9kv"; system = "cl-async-repl"; asd = "cl-async-repl"; } @@ -11826,12 +12214,12 @@ lib.makeScope pkgs.newScope (self: { cl-async-ssl = ( build-asdf-system { pname = "cl-async-ssl"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-async-ssl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-async/2024-10-12/cl-async-20241012-git.tgz"; - sha256 = "0z0gnwfb0flrxpbjmvzap0kmyz8r898x5jriyna365plc50hlcdr"; + url = "https://beta.quicklisp.org/archive/cl-async/2025-06-22/cl-async-20250622-git.tgz"; + sha256 = "0z1zb8dvi0p5kx2fv1wi092l50jb88xwsbxzmkmny9647jfcq9kv"; system = "cl-async-ssl"; asd = "cl-async-ssl"; } @@ -11848,12 +12236,12 @@ lib.makeScope pkgs.newScope (self: { cl-async-test = ( build-asdf-system { pname = "cl-async-test"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-async-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-async/2024-10-12/cl-async-20241012-git.tgz"; - sha256 = "0z0gnwfb0flrxpbjmvzap0kmyz8r898x5jriyna365plc50hlcdr"; + url = "https://beta.quicklisp.org/archive/cl-async/2025-06-22/cl-async-20250622-git.tgz"; + sha256 = "0z1zb8dvi0p5kx2fv1wi092l50jb88xwsbxzmkmny9647jfcq9kv"; system = "cl-async-test"; asd = "cl-async-test"; } @@ -11877,12 +12265,12 @@ lib.makeScope pkgs.newScope (self: { cl-async-util = ( build-asdf-system { pname = "cl-async-util"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-async-util" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-async/2024-10-12/cl-async-20241012-git.tgz"; - sha256 = "0z0gnwfb0flrxpbjmvzap0kmyz8r898x5jriyna365plc50hlcdr"; + url = "https://beta.quicklisp.org/archive/cl-async/2025-06-22/cl-async-20250622-git.tgz"; + sha256 = "0z1zb8dvi0p5kx2fv1wi092l50jb88xwsbxzmkmny9647jfcq9kv"; system = "cl-async-util"; asd = "cl-async"; } @@ -11902,11 +12290,11 @@ lib.makeScope pkgs.newScope (self: { cl-aubio = ( build-asdf-system { pname = "cl-aubio"; - version = "20200427-git"; + version = "20250622-git"; asds = [ "cl-aubio" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-aubio/2020-04-27/cl-aubio-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-aubio/2025-06-22/cl-aubio-20250622-git.tgz"; sha256 = "1xyflxy46z4487dbnizhv058y2mdka9iyikl097m60w42blidpn3"; system = "cl-aubio"; asd = "cl-aubio"; @@ -11917,6 +12305,7 @@ lib.makeScope pkgs.newScope (self: { (getAttr "cffi" self) (getAttr "cffi-libffi" self) (getAttr "closer-mop" self) + (getAttr "trivial-features" self) ]; meta = { hydraPlatforms = [ ]; @@ -11930,7 +12319,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-authorize-net" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-creditcard/2015-01-13/cl-creditcard-20150113-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-creditcard/2015-01-13/cl-creditcard-20150113-git.tgz"; sha256 = "1qq9r7q50k7jw6sv65aqi9xalaw8m6aqsbb0cgpjxv8wdhy934cr"; system = "cl-authorize-net"; asd = "cl-authorize-net"; @@ -11956,7 +12345,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-authorize-net-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-creditcard/2015-01-13/cl-creditcard-20150113-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-creditcard/2015-01-13/cl-creditcard-20150113-git.tgz"; sha256 = "1qq9r7q50k7jw6sv65aqi9xalaw8m6aqsbb0cgpjxv8wdhy934cr"; system = "cl-authorize-net-tests"; asd = "cl-authorize-net"; @@ -11980,7 +12369,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-autorepo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-autorepo/2018-07-11/cl-autorepo-20180711-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-autorepo/2018-07-11/cl-autorepo-20180711-git.tgz"; sha256 = "01hpg3r3493mri44kxp8sjy8i5kfvjklmnksvm0727i6bhpf8cz9"; system = "cl-autorepo"; asd = "cl-autorepo"; @@ -12000,7 +12389,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-autowrap" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-autowrap/2024-10-12/cl-autowrap-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-autowrap/2024-10-12/cl-autowrap-20241012-git.tgz"; sha256 = "1sfvhyrwm9dhxi0y42xp7mx8mvs6lmq3bzxdx34frxni5srcgly0"; system = "cl-autowrap"; asd = "cl-autowrap"; @@ -12027,7 +12416,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-autowrap-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-autowrap/2024-10-12/cl-autowrap-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-autowrap/2024-10-12/cl-autowrap-20241012-git.tgz"; sha256 = "1sfvhyrwm9dhxi0y42xp7mx8mvs6lmq3bzxdx34frxni5srcgly0"; system = "cl-autowrap-test"; asd = "cl-autowrap-test"; @@ -12047,7 +12436,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-azure" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-azure/2016-08-25/cl-azure-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-azure/2016-08-25/cl-azure-20160825-git.tgz"; sha256 = "19sgzbvgs1f1h3qhx11xhpia2x3n8x729h9fsqkc7fap0ak1h31d"; system = "cl-azure"; asd = "cl-azure"; @@ -12077,7 +12466,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-base16" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-base16/2020-09-25/cl-base16-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-base16/2020-09-25/cl-base16-20200925-git.tgz"; sha256 = "0m7ndmk4xhizn3q3ywjvw8sg4pfgp6lrd0wac5d1bf7wbw6afh5q"; system = "cl-base16"; asd = "cl-base16"; @@ -12102,7 +12491,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-base32" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-base32/2024-10-12/cl-base32-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-base32/2024-10-12/cl-base32-20241012-git.tgz"; sha256 = "0kc0rxwx2ak5kvrzl8y8x3csm0d6appi5k0as2jgm3ig5vgcs5cn"; system = "cl-base32"; asd = "cl-base32"; @@ -12122,7 +12511,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-base58" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-base58/2015-01-13/cl-base58-20150113-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-base58/2015-01-13/cl-base58-20150113-git.tgz"; sha256 = "01wiiyz1jzxx3zhxi2hpq5n8hv28g1mn0adk793vwjzh4v5bi5zz"; system = "cl-base58"; asd = "cl-base58"; @@ -12142,7 +12531,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-base58-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-base58/2015-01-13/cl-base58-20150113-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-base58/2015-01-13/cl-base58-20150113-git.tgz"; sha256 = "01wiiyz1jzxx3zhxi2hpq5n8hv28g1mn0adk793vwjzh4v5bi5zz"; system = "cl-base58-test"; asd = "cl-base58-test"; @@ -12165,7 +12554,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-base64" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-base64/2020-10-16/cl-base64-20201016-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-base64/2020-10-16/cl-base64-20201016-git.tgz"; sha256 = "12jj54h0fs6n237cvnp8v6hn0imfksammq22ys6pi0gwz2w47rbj"; system = "cl-base64"; asd = "cl-base64"; @@ -12176,6 +12565,26 @@ lib.makeScope pkgs.newScope (self: { meta = { }; } ); + cl-batis = ( + build-asdf-system { + pname = "cl-batis"; + version = "20250622-git"; + asds = [ "cl-batis" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-batis/2025-06-22/cl-batis-20250622-git.tgz"; + sha256 = "1hmgvp32ivs34xj6a5nnrmj16kphdckz1ygfkrb5f0iwr305qbjf"; + system = "cl-batis"; + asd = "cl-batis"; + } + ); + systems = [ "cl-batis" ]; + lispLibs = [ (getAttr "batis" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); cl-bayesnet = ( build-asdf-system { pname = "cl-bayesnet"; @@ -12183,7 +12592,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-bayesnet" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-bayesnet/2013-04-20/cl-bayesnet-20130420-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-bayesnet/2013-04-20/cl-bayesnet-20130420-git.tgz"; sha256 = "02as2isvgm89qpyj49ccs1cg4fl9iswxi26w4j0svsha0q1dh5m8"; system = "cl-bayesnet"; asd = "cl-bayesnet"; @@ -12207,7 +12616,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-bcrypt" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-bcrypt/2023-10-21/cl-bcrypt-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-bcrypt/2023-10-21/cl-bcrypt-20231021-git.tgz"; sha256 = "0mfs1jwf1xi6za61hfc7dgf1g5lqqsqdclnnspncvdg6l137013n"; system = "cl-bcrypt"; asd = "cl-bcrypt"; @@ -12231,7 +12640,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-bcrypt.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-bcrypt/2023-10-21/cl-bcrypt-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-bcrypt/2023-10-21/cl-bcrypt-20231021-git.tgz"; sha256 = "0mfs1jwf1xi6za61hfc7dgf1g5lqqsqdclnnspncvdg6l137013n"; system = "cl-bcrypt.test"; asd = "cl-bcrypt.test"; @@ -12254,7 +12663,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-beanstalk" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-beanstalk/2022-07-07/cl-beanstalk-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-beanstalk/2022-07-07/cl-beanstalk-20220707-git.tgz"; sha256 = "0vca8dw2l765m7g7xcpzi80m8f3145hhshh8ym602336fhiz61q1"; system = "cl-beanstalk"; asd = "cl-beanstalk"; @@ -12271,6 +12680,31 @@ lib.makeScope pkgs.newScope (self: { }; } ); + cl-binary-store = ( + build-asdf-system { + pname = "cl-binary-store"; + version = "stable-9d8b7e7f-git"; + asds = [ "cl-binary-store" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-binary-store/2025-06-22/cl-binary-store-stable-9d8b7e7f-git.tgz"; + sha256 = "1x8g65ij6bbfkd9hcy4wm3frjnb83ip05mvdbpm8hwzgkx1ydf94"; + system = "cl-binary-store"; + asd = "cl-binary-store"; + } + ); + systems = [ "cl-binary-store" ]; + lispLibs = [ + (getAttr "alexandria" self) + (getAttr "babel" self) + (getAttr "flexi-streams" self) + (getAttr "static-vectors" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); cl-bip39 = ( build-asdf-system { pname = "cl-bip39"; @@ -12278,7 +12712,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-bip39" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-bip39/2018-07-11/cl-bip39-20180711-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-bip39/2018-07-11/cl-bip39-20180711-git.tgz"; sha256 = "04h4lhppvavvqknp11gaj4ka2wpn9i883w1w27llblkg2vnn0816"; system = "cl-bip39"; asd = "cl-bip39"; @@ -12303,7 +12737,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-bloggy" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-bloggy/2021-10-20/cl-bloggy-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-bloggy/2021-10-20/cl-bloggy-20211020-git.tgz"; sha256 = "1clz2a0s3g3jbsrpypb4byb432l0yb4658riqs6ckin57c4bzxc8"; system = "cl-bloggy"; asd = "cl-bloggy"; @@ -12334,7 +12768,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-bloom" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-bloom/2018-02-28/cl-bloom-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-bloom/2018-02-28/cl-bloom-20180228-git.tgz"; sha256 = "1ircc5sa0a2xlx0fca0is6inwrk311hbj8jx6r4sas5pfv78k4am"; system = "cl-bloom"; asd = "cl-bloom"; @@ -12357,7 +12791,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-bloom-filter" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-bloom-filter/2022-11-06/cl-bloom-filter-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-bloom-filter/2022-11-06/cl-bloom-filter-20221106-git.tgz"; sha256 = "1s9m617fh3krh2klc2nx7jf89nk43cvvrnvqrhvw9jprw7gqanvq"; system = "cl-bloom-filter"; asd = "cl-bloom-filter"; @@ -12373,12 +12807,12 @@ lib.makeScope pkgs.newScope (self: { cl-bmp = ( build-asdf-system { pname = "cl-bmp"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-bmp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-bmp/2024-10-12/cl-bmp-20241012-git.tgz"; - sha256 = "1mcayxjppka40q9xx1qwdvrjjblclnggnicg70i95xqnv5sdwdhz"; + url = "https://beta.quicklisp.org/archive/cl-bmp/2025-06-22/cl-bmp-20250622-git.tgz"; + sha256 = "0zv91gad3bvd3sd4ah91d3i1fp0sn23rz6vi3nj28mw9r90sf6z1"; system = "cl-bmp"; asd = "cl-bmp"; } @@ -12400,7 +12834,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-bnf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-bnf/2024-10-12/cl-bnf-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-bnf/2024-10-12/cl-bnf-20241012-git.tgz"; sha256 = "0aa7hnkj71f37lxzlhsppwcmk3yv42hclq08c4jrdnv8jmdb8r0l"; system = "cl-bnf"; asd = "cl-bnf"; @@ -12423,7 +12857,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-bnf-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-bnf/2024-10-12/cl-bnf-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-bnf/2024-10-12/cl-bnf-20241012-git.tgz"; sha256 = "0aa7hnkj71f37lxzlhsppwcmk3yv42hclq08c4jrdnv8jmdb8r0l"; system = "cl-bnf-examples"; asd = "cl-bnf-examples"; @@ -12443,7 +12877,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-bnf-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-bnf/2024-10-12/cl-bnf-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-bnf/2024-10-12/cl-bnf-20241012-git.tgz"; sha256 = "0aa7hnkj71f37lxzlhsppwcmk3yv42hclq08c4jrdnv8jmdb8r0l"; system = "cl-bnf-tests"; asd = "cl-bnf-tests"; @@ -12466,7 +12900,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-bootstrap" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-bootstrap/2018-08-31/cl-bootstrap-20180831-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-bootstrap/2018-08-31/cl-bootstrap-20180831-git.tgz"; sha256 = "0pk7wx4arsljxlnbx1hzcgxwsvhdp3gn22wv43xls2jv1rdi2xry"; system = "cl-bootstrap"; asd = "cl-bootstrap"; @@ -12489,7 +12923,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-bootstrap-demo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-bootstrap/2018-08-31/cl-bootstrap-20180831-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-bootstrap/2018-08-31/cl-bootstrap-20180831-git.tgz"; sha256 = "0pk7wx4arsljxlnbx1hzcgxwsvhdp3gn22wv43xls2jv1rdi2xry"; system = "cl-bootstrap-demo"; asd = "cl-bootstrap-demo"; @@ -12514,7 +12948,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-bootstrap-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-bootstrap/2018-08-31/cl-bootstrap-20180831-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-bootstrap/2018-08-31/cl-bootstrap-20180831-git.tgz"; sha256 = "0pk7wx4arsljxlnbx1hzcgxwsvhdp3gn22wv43xls2jv1rdi2xry"; system = "cl-bootstrap-test"; asd = "cl-bootstrap-test"; @@ -12537,7 +12971,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-bplustree" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-bplustree/2018-03-28/cl-bplustree-20180328-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-bplustree/2018-03-28/cl-bplustree-20180328-git.tgz"; sha256 = "1d9pm9fi9bhh73bhcgig0wq5i4fvc4551kxvny3di6x6yr7j2kbl"; system = "cl-bplustree"; asd = "cl-bplustree"; @@ -12557,7 +12991,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-bplustree-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-bplustree/2018-03-28/cl-bplustree-20180328-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-bplustree/2018-03-28/cl-bplustree-20180328-git.tgz"; sha256 = "1d9pm9fi9bhh73bhcgig0wq5i4fvc4551kxvny3di6x6yr7j2kbl"; system = "cl-bplustree-test"; asd = "cl-bplustree"; @@ -12577,7 +13011,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-brewer-ci" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-brewer/2024-10-12/cl-brewer-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-brewer/2024-10-12/cl-brewer-20241012-git.tgz"; sha256 = "0izf6v4qx82jhk7ln28jhdmnr3lb0r5iqjj0by9igq5sk3y1my4x"; system = "cl-brewer-ci"; asd = "cl-brewer-ci"; @@ -12597,7 +13031,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-brewer-deploy-hooks" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-brewer/2024-10-12/cl-brewer-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-brewer/2024-10-12/cl-brewer-20241012-git.tgz"; sha256 = "0izf6v4qx82jhk7ln28jhdmnr3lb0r5iqjj0by9igq5sk3y1my4x"; system = "cl-brewer-deploy-hooks"; asd = "cl-brewer-deploy-hooks"; @@ -12617,7 +13051,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-brewer-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-brewer/2024-10-12/cl-brewer-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-brewer/2024-10-12/cl-brewer-20241012-git.tgz"; sha256 = "0izf6v4qx82jhk7ln28jhdmnr3lb0r5iqjj0by9igq5sk3y1my4x"; system = "cl-brewer-tests"; asd = "cl-brewer-tests"; @@ -12637,7 +13071,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-buchberger" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-buchberger/2024-10-12/cl-buchberger-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-buchberger/2024-10-12/cl-buchberger-20241012-git.tgz"; sha256 = "0hn340y52xfgj788zh449jrh7blfv6yqfnkmqg2vghy92s8jcr1i"; system = "cl-buchberger"; asd = "cl-buchberger"; @@ -12657,7 +13091,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-bus" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-bus/2021-12-09/cl-bus-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-bus/2021-12-09/cl-bus-20211209-git.tgz"; sha256 = "1galzqm1qv2slibn3awfyxnmlslxmzw09a8fidmbdy1r0ppp5r7z"; system = "cl-bus"; asd = "cl-bus"; @@ -12677,7 +13111,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ca" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ca/2016-12-04/cl-ca-20161204-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ca/2016-12-04/cl-ca-20161204-git.tgz"; sha256 = "0kpwpxw3c8q7b2ajyj9rzhs1r1h6kipdm9qjkgsn0sqrmx9acfnz"; system = "cl-ca"; asd = "cl-ca"; @@ -12697,7 +13131,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-cache-tables" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cache-tables/2017-10-19/cl-cache-tables-20171019-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cache-tables/2017-10-19/cl-cache-tables-20171019-git.tgz"; sha256 = "008m7v39mq2475y1f4if5iazb15rm02g22id4q4qgig1zx2vfpg1"; system = "cl-cache-tables"; asd = "cl-cache-tables"; @@ -12717,7 +13151,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-cache-tables-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cache-tables/2017-10-19/cl-cache-tables-20171019-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cache-tables/2017-10-19/cl-cache-tables-20171019-git.tgz"; sha256 = "008m7v39mq2475y1f4if5iazb15rm02g22id4q4qgig1zx2vfpg1"; system = "cl-cache-tables-tests"; asd = "cl-cache-tables"; @@ -12740,7 +13174,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-cairo2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cairo2/2021-10-20/cl-cairo2-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cairo2/2021-10-20/cl-cairo2-20211020-git.tgz"; sha256 = "0cpfgyxw6pz7y033dlya8c4vjmkpw127zdq3a9xclp9q8jbdlb7q"; system = "cl-cairo2"; asd = "cl-cairo2"; @@ -12765,7 +13199,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-cairo2-demos" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cairo2/2021-10-20/cl-cairo2-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cairo2/2021-10-20/cl-cairo2-20211020-git.tgz"; sha256 = "0cpfgyxw6pz7y033dlya8c4vjmkpw127zdq3a9xclp9q8jbdlb7q"; system = "cl-cairo2-demos"; asd = "cl-cairo2-demos"; @@ -12785,7 +13219,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-cairo2-xlib" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cairo2/2021-10-20/cl-cairo2-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cairo2/2021-10-20/cl-cairo2-20211020-git.tgz"; sha256 = "0cpfgyxw6pz7y033dlya8c4vjmkpw127zdq3a9xclp9q8jbdlb7q"; system = "cl-cairo2-xlib"; asd = "cl-cairo2-xlib"; @@ -12806,7 +13240,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-case-control" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-case-control/2014-11-06/cl-case-control-20141106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-case-control/2014-11-06/cl-case-control-20141106-git.tgz"; sha256 = "0510m1dfz4abw3s7w0axr1b1nsmi72avr850r0sn6p2pq091pc71"; system = "cl-case-control"; asd = "cl-case-control"; @@ -12826,7 +13260,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-catmull-rom-spline" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-catmull-rom-spline/2022-02-20/cl-catmull-rom-spline-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-catmull-rom-spline/2022-02-20/cl-catmull-rom-spline-20220220-git.tgz"; sha256 = "0702swja11zpfdx04l0901ipvi0acg17mk9ryvhibnbzq70npyjs"; system = "cl-catmull-rom-spline"; asd = "cl-catmull-rom-spline"; @@ -12846,7 +13280,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-cerf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cerf/2021-05-31/cl-cerf-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cerf/2021-05-31/cl-cerf-20210531-git.tgz"; sha256 = "0n1b6ig1d0dqkjn06iqsk0m4y7j7msi2gcq7niivcwc4s0ry0ljn"; system = "cl-cerf"; asd = "cl-cerf"; @@ -12869,7 +13303,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-cffi-gtk" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz"; sha256 = "1cn2f6b62axjzdzfv971218ably32dvqfdy499li25vjd8nb2qm3"; system = "cl-cffi-gtk"; asd = "cl-cffi-gtk"; @@ -12895,7 +13329,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-cffi-gtk-cairo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz"; sha256 = "1cn2f6b62axjzdzfv971218ably32dvqfdy499li25vjd8nb2qm3"; system = "cl-cffi-gtk-cairo"; asd = "cl-cffi-gtk-cairo"; @@ -12913,7 +13347,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-cffi-gtk-demo-cairo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz"; sha256 = "1cn2f6b62axjzdzfv971218ably32dvqfdy499li25vjd8nb2qm3"; system = "cl-cffi-gtk-demo-cairo"; asd = "cl-cffi-gtk-demo-cairo"; @@ -12933,7 +13367,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-cffi-gtk-demo-glib" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz"; sha256 = "1cn2f6b62axjzdzfv971218ably32dvqfdy499li25vjd8nb2qm3"; system = "cl-cffi-gtk-demo-glib"; asd = "cl-cffi-gtk-demo-glib"; @@ -12953,7 +13387,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-cffi-gtk-demo-gobject" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz"; sha256 = "1cn2f6b62axjzdzfv971218ably32dvqfdy499li25vjd8nb2qm3"; system = "cl-cffi-gtk-demo-gobject"; asd = "cl-cffi-gtk-demo-gobject"; @@ -12973,7 +13407,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-cffi-gtk-example-gtk" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz"; sha256 = "1cn2f6b62axjzdzfv971218ably32dvqfdy499li25vjd8nb2qm3"; system = "cl-cffi-gtk-example-gtk"; asd = "cl-cffi-gtk-example-gtk"; @@ -12993,7 +13427,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-cffi-gtk-gdk" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz"; sha256 = "1cn2f6b62axjzdzfv971218ably32dvqfdy499li25vjd8nb2qm3"; system = "cl-cffi-gtk-gdk"; asd = "cl-cffi-gtk-gdk"; @@ -13018,7 +13452,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-cffi-gtk-gdk-pixbuf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz"; sha256 = "1cn2f6b62axjzdzfv971218ably32dvqfdy499li25vjd8nb2qm3"; system = "cl-cffi-gtk-gdk-pixbuf"; asd = "cl-cffi-gtk-gdk-pixbuf"; @@ -13039,7 +13473,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-cffi-gtk-gio" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz"; sha256 = "1cn2f6b62axjzdzfv971218ably32dvqfdy499li25vjd8nb2qm3"; system = "cl-cffi-gtk-gio"; asd = "cl-cffi-gtk-gio"; @@ -13060,7 +13494,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-cffi-gtk-glib" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz"; sha256 = "1cn2f6b62axjzdzfv971218ably32dvqfdy499li25vjd8nb2qm3"; system = "cl-cffi-gtk-glib"; asd = "cl-cffi-gtk-glib"; @@ -13084,7 +13518,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-cffi-gtk-gobject" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz"; sha256 = "1cn2f6b62axjzdzfv971218ably32dvqfdy499li25vjd8nb2qm3"; system = "cl-cffi-gtk-gobject"; asd = "cl-cffi-gtk-gobject"; @@ -13106,7 +13540,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-cffi-gtk-opengl-demo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz"; sha256 = "1cn2f6b62axjzdzfv971218ably32dvqfdy499li25vjd8nb2qm3"; system = "cl-cffi-gtk-opengl-demo"; asd = "cl-cffi-gtk-opengl-demo"; @@ -13129,7 +13563,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-cffi-gtk-pango" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz"; sha256 = "1cn2f6b62axjzdzfv971218ably32dvqfdy499li25vjd8nb2qm3"; system = "cl-cffi-gtk-pango"; asd = "cl-cffi-gtk-pango"; @@ -13147,12 +13581,12 @@ lib.makeScope pkgs.newScope (self: { cl-change-case = ( build-asdf-system { pname = "cl-change-case"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "cl-change-case" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-change-case/2023-10-21/cl-change-case-20231021-git.tgz"; - sha256 = "0g17n80jmaiyqsx8r35v6p0axb03s6j9wywlf8qkvw8rm848pp7s"; + url = "https://beta.quicklisp.org/archive/cl-change-case/2025-06-22/cl-change-case-20250622-git.tgz"; + sha256 = "0snwq2zmvkay173hhg43njy9iqapisazri1y6ws89m1c4dhs47x8"; system = "cl-change-case"; asd = "cl-change-case"; } @@ -13168,12 +13602,12 @@ lib.makeScope pkgs.newScope (self: { cl-charms = ( build-asdf-system { pname = "cl-charms"; - version = "20230618-git"; + version = "20250622-git"; asds = [ "cl-charms" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-charms/2023-06-18/cl-charms-20230618-git.tgz"; - sha256 = "0g6kw0b3b8wjb89rv6slyjl55pymadkcf35ig4d22z8igac7kj8b"; + url = "https://beta.quicklisp.org/archive/cl-charms/2025-06-22/cl-charms-20250622-git.tgz"; + sha256 = "102jiq0y8ckf14s1i8b42r44yjlb761q8jinqf2q4c2ki0vgflw9"; system = "cl-charms"; asd = "cl-charms"; } @@ -13192,12 +13626,12 @@ lib.makeScope pkgs.newScope (self: { cl-charms-marquee = ( build-asdf-system { pname = "cl-charms-marquee"; - version = "20230618-git"; + version = "20250622-git"; asds = [ "cl-charms-marquee" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-charms/2023-06-18/cl-charms-20230618-git.tgz"; - sha256 = "0g6kw0b3b8wjb89rv6slyjl55pymadkcf35ig4d22z8igac7kj8b"; + url = "https://beta.quicklisp.org/archive/cl-charms/2025-06-22/cl-charms-20250622-git.tgz"; + sha256 = "102jiq0y8ckf14s1i8b42r44yjlb761q8jinqf2q4c2ki0vgflw9"; system = "cl-charms-marquee"; asd = "cl-charms-marquee"; } @@ -13212,12 +13646,12 @@ lib.makeScope pkgs.newScope (self: { cl-charms-paint = ( build-asdf-system { pname = "cl-charms-paint"; - version = "20230618-git"; + version = "20250622-git"; asds = [ "cl-charms-paint" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-charms/2023-06-18/cl-charms-20230618-git.tgz"; - sha256 = "0g6kw0b3b8wjb89rv6slyjl55pymadkcf35ig4d22z8igac7kj8b"; + url = "https://beta.quicklisp.org/archive/cl-charms/2025-06-22/cl-charms-20250622-git.tgz"; + sha256 = "102jiq0y8ckf14s1i8b42r44yjlb761q8jinqf2q4c2ki0vgflw9"; system = "cl-charms-paint"; asd = "cl-charms-paint"; } @@ -13232,12 +13666,12 @@ lib.makeScope pkgs.newScope (self: { cl-charms-timer = ( build-asdf-system { pname = "cl-charms-timer"; - version = "20230618-git"; + version = "20250622-git"; asds = [ "cl-charms-timer" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-charms/2023-06-18/cl-charms-20230618-git.tgz"; - sha256 = "0g6kw0b3b8wjb89rv6slyjl55pymadkcf35ig4d22z8igac7kj8b"; + url = "https://beta.quicklisp.org/archive/cl-charms/2025-06-22/cl-charms-20250622-git.tgz"; + sha256 = "102jiq0y8ckf14s1i8b42r44yjlb761q8jinqf2q4c2ki0vgflw9"; system = "cl-charms-timer"; asd = "cl-charms-timer"; } @@ -13256,7 +13690,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-clblas" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-clblas/2018-10-18/cl-clblas-20181018-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-clblas/2018-10-18/cl-clblas-20181018-git.tgz"; sha256 = "0cn4hvywaw97ccnj2wxjf20lh7h7n5fs6rq6kgjyfs9cxcixmvrj"; system = "cl-clblas"; asd = "cl-clblas"; @@ -13276,7 +13710,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-clblas-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-clblas/2018-10-18/cl-clblas-20181018-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-clblas/2018-10-18/cl-clblas-20181018-git.tgz"; sha256 = "0cn4hvywaw97ccnj2wxjf20lh7h7n5fs6rq6kgjyfs9cxcixmvrj"; system = "cl-clblas-test"; asd = "cl-clblas-test"; @@ -13302,7 +13736,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-cli" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cli/2015-12-18/cl-cli-20151218-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cli/2015-12-18/cl-cli-20151218-git.tgz"; sha256 = "0zlifq55r78vfdlqf8jy6rkny73438f1i9cp9a8vybmila5dij3q"; system = "cl-cli"; asd = "cl-cli"; @@ -13320,7 +13754,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-clsparse" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-clsparse/2019-08-13/cl-clsparse-20190813-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-clsparse/2019-08-13/cl-clsparse-20190813-git.tgz"; sha256 = "0cmmwx2ka1jp5711x21knw3zi6kcpkpcs39dm62w82s97bv794gz"; system = "cl-clsparse"; asd = "cl-clsparse"; @@ -13343,7 +13777,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-cognito" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cognito/2018-12-10/cl-cognito-20181210-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cognito/2018-12-10/cl-cognito-20181210-git.tgz"; sha256 = "0zy4yg4zggvxwbvkjkd89d2ps236kz6pvz90zn6gzq812wnidsd3"; system = "cl-cognito"; asd = "cl-cognito"; @@ -13369,7 +13803,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-coinpayments" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-coinpayments/2021-08-07/cl-coinpayments-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-coinpayments/2021-08-07/cl-coinpayments-20210807-git.tgz"; sha256 = "1vgsh95vjqqg0a6lqg1ivs36yjx6ck8cqhsmlr5l3ldfd8yr65q7"; system = "cl-coinpayments"; asd = "cl-coinpayments"; @@ -13392,12 +13826,12 @@ lib.makeScope pkgs.newScope (self: { cl-collider = ( build-asdf-system { pname = "cl-collider"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-collider" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-collider/2024-10-12/cl-collider-20241012-git.tgz"; - sha256 = "0h0fyx7glxnzwyam2aflma6003h8fcvcf5nj5f7svarw9brcc2xa"; + url = "https://beta.quicklisp.org/archive/cl-collider/2025-06-22/cl-collider-20250622-git.tgz"; + sha256 = "01yiwwi9zhh1vksk26m170i6x9lsbygbznaxggf8h9psiyqg5991"; system = "cl-collider"; asd = "cl-collider"; } @@ -13412,8 +13846,6 @@ lib.makeScope pkgs.newScope (self: { (getAttr "named-readtables" self) (getAttr "pileup" self) (getAttr "sc-osc" self) - (getAttr "simple-inferiors" self) - (getAttr "split-sequence" self) ]; meta = { hydraPlatforms = [ ]; @@ -13427,7 +13859,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-colors" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-colors/2018-03-28/cl-colors-20180328-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-colors/2018-03-28/cl-colors-20180328-git.tgz"; sha256 = "0l446lday4hybsm9bq3jli97fvv8jb1d33abg79vbylpwjmf3y9a"; system = "cl-colors"; asd = "cl-colors"; @@ -13448,7 +13880,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-colors-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-colors/2018-03-28/cl-colors-20180328-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-colors/2018-03-28/cl-colors-20180328-git.tgz"; sha256 = "0l446lday4hybsm9bq3jli97fvv8jb1d33abg79vbylpwjmf3y9a"; system = "cl-colors-tests"; asd = "cl-colors"; @@ -13467,12 +13899,12 @@ lib.makeScope pkgs.newScope (self: { cl-colors2 = ( build-asdf-system { pname = "cl-colors2"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-colors2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-colors2/2024-10-12/cl-colors2-20241012-git.tgz"; - sha256 = "053bidgbqziv5visdq09gy8zf30cvqh1w06l23yygn1yrg7m7302"; + url = "https://beta.quicklisp.org/archive/cl-colors2/2025-06-22/cl-colors2-20250622-git.tgz"; + sha256 = "0wisj59fq38cnk1m8lxxpjbwk0j8q3sp3n1jp99da7bi7vq04491"; system = "cl-colors2"; asd = "cl-colors2"; } @@ -13489,18 +13921,23 @@ lib.makeScope pkgs.newScope (self: { cl-concord = ( build-asdf-system { pname = "cl-concord"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-concord" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-concord/2024-10-12/cl-concord-20241012-git.tgz"; - sha256 = "01i13lp3z2v2w165h0xh72r1vyfbjr6k1gwk4hff1rf2yx2yg9k1"; + url = "https://beta.quicklisp.org/archive/cl-concord/2025-06-22/cl-concord-20250622-git.tgz"; + sha256 = "1kyz9wjcr5xq4fvzvs8cib4a52vwnv08cv5kzf3hyaipxd7fq37y"; system = "cl-concord"; asd = "cl-concord"; } ); systems = [ "cl-concord" ]; - lispLibs = [ (getAttr "cl-redis" self) ]; + lispLibs = [ + (getAttr "cl-ipfs-api2" self) + (getAttr "cl-json" self) + (getAttr "cl-redis" self) + (getAttr "trivial-utf-8" self) + ]; meta = { hydraPlatforms = [ ]; }; @@ -13513,7 +13950,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-conllu" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-conllu/2021-12-09/cl-conllu-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-conllu/2021-12-09/cl-conllu-20211209-git.tgz"; sha256 = "0n69k0apifnirs2g3rfdsxiwy6dimd9qqxaqywaingvbd7yn42jn"; system = "cl-conllu"; asd = "cl-conllu"; @@ -13545,7 +13982,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-conspack" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-conspack/2023-02-14/cl-conspack-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-conspack/2023-02-14/cl-conspack-20230214-git.tgz"; sha256 = "0y5wp5c89ph44k2xjppy1c1jf2ac3q9yrk22da2rkwnbxn0h1a8d"; system = "cl-conspack"; asd = "cl-conspack"; @@ -13572,7 +14009,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-conspack-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-conspack/2023-02-14/cl-conspack-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-conspack/2023-02-14/cl-conspack-20230214-git.tgz"; sha256 = "0y5wp5c89ph44k2xjppy1c1jf2ac3q9yrk22da2rkwnbxn0h1a8d"; system = "cl-conspack-test"; asd = "cl-conspack-test"; @@ -13595,7 +14032,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-cont" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cont/2011-02-19/cl-cont-20110219-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cont/2011-02-19/cl-cont-20110219-darcs.tgz"; sha256 = "1zf8zvb0i6jm3hhfks4w74hibm6avgc6f9s1qwgjrn2bcik8lrvz"; system = "cl-cont"; asd = "cl-cont"; @@ -13618,7 +14055,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-cont-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cont/2011-02-19/cl-cont-20110219-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cont/2011-02-19/cl-cont-20110219-darcs.tgz"; sha256 = "1zf8zvb0i6jm3hhfks4w74hibm6avgc6f9s1qwgjrn2bcik8lrvz"; system = "cl-cont-test"; asd = "cl-cont-test"; @@ -13641,7 +14078,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-containers" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-containers/2024-10-12/cl-containers-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-containers/2024-10-12/cl-containers-20241012-git.tgz"; sha256 = "0xpa5yhsndh33cs4q6vgjc8jxwlmv8lxkg4bamfi0f3ad4smi7zl"; system = "cl-containers"; asd = "cl-containers"; @@ -13662,7 +14099,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-containers-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-containers/2024-10-12/cl-containers-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-containers/2024-10-12/cl-containers-20241012-git.tgz"; sha256 = "0xpa5yhsndh33cs4q6vgjc8jxwlmv8lxkg4bamfi0f3ad4smi7zl"; system = "cl-containers-test"; asd = "cl-containers-test"; @@ -13685,7 +14122,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-cookie" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cookie/2024-10-12/cl-cookie-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cookie/2024-10-12/cl-cookie-20241012-git.tgz"; sha256 = "172lw0sm6i9nvlx0iv0851rsm5pc28xqqf6a75pwv1fvr6srq8qh"; system = "cl-cookie"; asd = "cl-cookie"; @@ -13709,7 +14146,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-cookie-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cookie/2024-10-12/cl-cookie-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cookie/2024-10-12/cl-cookie-20241012-git.tgz"; sha256 = "172lw0sm6i9nvlx0iv0851rsm5pc28xqqf6a75pwv1fvr6srq8qh"; system = "cl-cookie-test"; asd = "cl-cookie-test"; @@ -13732,7 +14169,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-coroutine" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-coroutine/2016-09-29/cl-coroutine-20160929-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-coroutine/2016-09-29/cl-coroutine-20160929-git.tgz"; sha256 = "1cqdhdjxffgfs116l1swjlsmcbly0xgcgrckvaajd566idj9yj4l"; system = "cl-coroutine"; asd = "cl-coroutine"; @@ -13755,7 +14192,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-coroutine-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-coroutine/2016-09-29/cl-coroutine-20160929-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-coroutine/2016-09-29/cl-coroutine-20160929-git.tgz"; sha256 = "1cqdhdjxffgfs116l1swjlsmcbly0xgcgrckvaajd566idj9yj4l"; system = "cl-coroutine-test"; asd = "cl-coroutine-test"; @@ -13774,12 +14211,12 @@ lib.makeScope pkgs.newScope (self: { cl-coveralls = ( build-asdf-system { pname = "cl-coveralls"; - version = "20210411-git"; + version = "20250622-git"; asds = [ "cl-coveralls" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-coveralls/2021-04-11/cl-coveralls-20210411-git.tgz"; - sha256 = "1n4jks92827xbi2zzy6gsx3r2gl97difl04da9wz94n9rjj3bcz0"; + url = "https://beta.quicklisp.org/archive/cl-coveralls/2025-06-22/cl-coveralls-20250622-git.tgz"; + sha256 = "0wl7245v0wp7sbp64a4n7r490r21pnac1lfadl8vdp5ccrxh4nb5"; system = "cl-coveralls"; asd = "cl-coveralls"; } @@ -13787,11 +14224,11 @@ lib.makeScope pkgs.newScope (self: { systems = [ "cl-coveralls" ]; lispLibs = [ (getAttr "alexandria" self) + (getAttr "cl-json" self) (getAttr "cl-ppcre" self) (getAttr "dexador" self) (getAttr "flexi-streams" self) (getAttr "ironclad" self) - (getAttr "jonathan" self) (getAttr "lquery" self) (getAttr "split-sequence" self) ]; @@ -13803,12 +14240,12 @@ lib.makeScope pkgs.newScope (self: { cl-coveralls-test = ( build-asdf-system { pname = "cl-coveralls-test"; - version = "20210411-git"; + version = "20250622-git"; asds = [ "cl-coveralls-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-coveralls/2021-04-11/cl-coveralls-20210411-git.tgz"; - sha256 = "1n4jks92827xbi2zzy6gsx3r2gl97difl04da9wz94n9rjj3bcz0"; + url = "https://beta.quicklisp.org/archive/cl-coveralls/2025-06-22/cl-coveralls-20250622-git.tgz"; + sha256 = "0wl7245v0wp7sbp64a4n7r490r21pnac1lfadl8vdp5ccrxh4nb5"; system = "cl-coveralls-test"; asd = "cl-coveralls-test"; } @@ -13831,7 +14268,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-covid19" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-covid19/2022-03-31/cl-covid19-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-covid19/2022-03-31/cl-covid19-20220331-git.tgz"; sha256 = "0nxdharz29nrdylrwnhgdayfsfwm0vd5g487mi4i5lly8q0i9vl0"; system = "cl-covid19"; asd = "cl-covid19"; @@ -13859,12 +14296,12 @@ lib.makeScope pkgs.newScope (self: { cl-cpu-affinity = ( build-asdf-system { pname = "cl-cpu-affinity"; - version = "20210411-git"; + version = "20250622-git"; asds = [ "cl-cpu-affinity" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/femlisp/2021-04-11/femlisp-20210411-git.tgz"; - sha256 = "08l2x1jq3vfhh8m14wijd8c78n589cy5hd2py2jfj3yfiqyipasa"; + url = "https://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz"; + sha256 = "1rg1hhy3nlb85229ninnsdr8dhjjs0wgqv612g8i59v82n07yip8"; system = "cl-cpu-affinity"; asd = "cl-cpu-affinity"; } @@ -13883,7 +14320,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-cpus" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cpus/2023-06-18/cl-cpus-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cpus/2023-06-18/cl-cpus-20230618-git.tgz"; sha256 = "1gxyb85hpjmhz7vhny9cscrzldx06f7c5q93pl1qs0s3b7avh5vd"; system = "cl-cpus"; asd = "cl-cpus"; @@ -13903,7 +14340,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-cram" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cram/2023-06-18/cl-cram-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cram/2023-06-18/cl-cram-20230618-git.tgz"; sha256 = "139p4hbb6ac57ay5vgr969d3rki9ypk9ninaqm5vkax2hcx7mq3i"; system = "cl-cram"; asd = "cl-cram"; @@ -13923,7 +14360,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-crc64" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-crc64/2014-07-13/cl-crc64-20140713-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-crc64/2014-07-13/cl-crc64-20140713-git.tgz"; sha256 = "1cqky5ps28r49z6ib4vjwfjpq3ml81p2ayf0nqppf2lc4vf3kb20"; system = "cl-crc64"; asd = "cl-crc64"; @@ -13943,7 +14380,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-creditcard" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-creditcard/2015-01-13/cl-creditcard-20150113-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-creditcard/2015-01-13/cl-creditcard-20150113-git.tgz"; sha256 = "1qq9r7q50k7jw6sv65aqi9xalaw8m6aqsbb0cgpjxv8wdhy934cr"; system = "cl-creditcard"; asd = "cl-creditcard"; @@ -13963,7 +14400,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-cron" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cron/2023-10-21/cl-cron-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cron/2023-10-21/cl-cron-20231021-git.tgz"; sha256 = "0l1jg2sqdqniaqsaywy0ar49m10gzls8i31gpxmd7c4yzazy4fib"; system = "cl-cron"; asd = "cl-cron"; @@ -13983,7 +14420,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-css" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-css/2014-09-14/cl-css-20140914-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-css/2014-09-14/cl-css-20140914-git.tgz"; sha256 = "1lc42zi2sw11fl2589sc19nr5sd2p0wy7wgvgwaggxa5f3ajhsmd"; system = "cl-css"; asd = "cl-css"; @@ -14001,7 +14438,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-csv" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-csv/2024-10-12/cl-csv-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-csv/2024-10-12/cl-csv-20241012-git.tgz"; sha256 = "0pb89l3bi2cnk7sav2w0dmlvjxij1wpy3w6n9c4b6imjs0pznrxi"; system = "cl-csv"; asd = "cl-csv"; @@ -14023,7 +14460,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-csv-clsql" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-csv/2024-10-12/cl-csv-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-csv/2024-10-12/cl-csv-20241012-git.tgz"; sha256 = "0pb89l3bi2cnk7sav2w0dmlvjxij1wpy3w6n9c4b6imjs0pznrxi"; system = "cl-csv-clsql"; asd = "cl-csv-clsql"; @@ -14047,7 +14484,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-csv-data-table" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-csv/2024-10-12/cl-csv-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-csv/2024-10-12/cl-csv-20241012-git.tgz"; sha256 = "0pb89l3bi2cnk7sav2w0dmlvjxij1wpy3w6n9c4b6imjs0pznrxi"; system = "cl-csv-data-table"; asd = "cl-csv-data-table"; @@ -14070,7 +14507,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-cuda" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cuda/2021-08-07/cl-cuda-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cuda/2021-08-07/cl-cuda-20210807-git.tgz"; sha256 = "019m2khbiadm0yxfhbbfsidnmxq9spn3hn8r6vx4cw3i22jin0hg"; system = "cl-cuda"; asd = "cl-cuda"; @@ -14098,7 +14535,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-cuda-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cuda/2021-08-07/cl-cuda-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cuda/2021-08-07/cl-cuda-20210807-git.tgz"; sha256 = "019m2khbiadm0yxfhbbfsidnmxq9spn3hn8r6vx4cw3i22jin0hg"; system = "cl-cuda-examples"; asd = "cl-cuda-examples"; @@ -14121,7 +14558,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-cuda-interop" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cuda/2021-08-07/cl-cuda-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cuda/2021-08-07/cl-cuda-20210807-git.tgz"; sha256 = "019m2khbiadm0yxfhbbfsidnmxq9spn3hn8r6vx4cw3i22jin0hg"; system = "cl-cuda-interop"; asd = "cl-cuda-interop"; @@ -14146,7 +14583,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-cuda-interop-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cuda/2021-08-07/cl-cuda-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cuda/2021-08-07/cl-cuda-20210807-git.tgz"; sha256 = "019m2khbiadm0yxfhbbfsidnmxq9spn3hn8r6vx4cw3i22jin0hg"; system = "cl-cuda-interop-examples"; asd = "cl-cuda-interop-examples"; @@ -14166,7 +14603,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-cuda-misc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cuda/2021-08-07/cl-cuda-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cuda/2021-08-07/cl-cuda-20210807-git.tgz"; sha256 = "019m2khbiadm0yxfhbbfsidnmxq9spn3hn8r6vx4cw3i22jin0hg"; system = "cl-cuda-misc"; asd = "cl-cuda-misc"; @@ -14189,7 +14626,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-custom-hash-table" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-custom-hash-table/2024-10-12/cl-custom-hash-table-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-custom-hash-table/2024-10-12/cl-custom-hash-table-20241012-git.tgz"; sha256 = "1sb5anv9kh7wv165nra95v0qkk1gvp3mn461zi7m0fla1290g598"; system = "cl-custom-hash-table"; asd = "cl-custom-hash-table"; @@ -14207,7 +14644,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-custom-hash-table-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-custom-hash-table/2024-10-12/cl-custom-hash-table-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-custom-hash-table/2024-10-12/cl-custom-hash-table-20241012-git.tgz"; sha256 = "1sb5anv9kh7wv165nra95v0qkk1gvp3mn461zi7m0fla1290g598"; system = "cl-custom-hash-table-test"; asd = "cl-custom-hash-table-test"; @@ -14226,12 +14663,12 @@ lib.makeScope pkgs.newScope (self: { cl-data-structures = ( build-asdf-system { pname = "cl-data-structures"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-data-structures" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-data-structures/2024-10-12/cl-data-structures-20241012-git.tgz"; - sha256 = "0h49h1x9dgr53imj0r4lgx0zvdsv3mnh7lyayzy9hlysy2ixp425"; + url = "https://beta.quicklisp.org/archive/cl-data-structures/2025-06-22/cl-data-structures-20250622-git.tgz"; + sha256 = "1sxp8gh2737v5qm6hb9j4wqqcairmlr14xylhdizrmgkza9dqp0d"; system = "cl-data-structures"; asd = "cl-data-structures"; } @@ -14259,12 +14696,12 @@ lib.makeScope pkgs.newScope (self: { cl-data-structures-tests = ( build-asdf-system { pname = "cl-data-structures-tests"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-data-structures-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-data-structures/2024-10-12/cl-data-structures-20241012-git.tgz"; - sha256 = "0h49h1x9dgr53imj0r4lgx0zvdsv3mnh7lyayzy9hlysy2ixp425"; + url = "https://beta.quicklisp.org/archive/cl-data-structures/2025-06-22/cl-data-structures-20250622-git.tgz"; + sha256 = "1sxp8gh2737v5qm6hb9j4wqqcairmlr14xylhdizrmgkza9dqp0d"; system = "cl-data-structures-tests"; asd = "cl-data-structures-tests"; } @@ -14287,7 +14724,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-date-time-parser" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-date-time-parser/2014-07-13/cl-date-time-parser-20140713-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-date-time-parser/2014-07-13/cl-date-time-parser-20140713-git.tgz"; sha256 = "0dswpbbb57jm609xxfah25dxxhjzc7qh5lr1a1ffkpms84l0r7m5"; system = "cl-date-time-parser"; asd = "cl-date-time-parser"; @@ -14314,7 +14751,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-dbi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz"; sha256 = "17szd6sz1hlwl5fm4qjgyd8ax01wkbhv8hxcyy8qscx39sc0cnpy"; system = "cl-dbi"; asd = "cl-dbi"; @@ -14325,6 +14762,26 @@ lib.makeScope pkgs.newScope (self: { meta = { }; } ); + cl-dbi-connection-pool = ( + build-asdf-system { + pname = "cl-dbi-connection-pool"; + version = "20250622-git"; + asds = [ "cl-dbi-connection-pool" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-dbi-connection-pool/2025-06-22/cl-dbi-connection-pool-20250622-git.tgz"; + sha256 = "0q1kgcn822ifc8zcss4yihhwcl0asdxl8xxpbbnyjzxasqa47ifv"; + system = "cl-dbi-connection-pool"; + asd = "cl-dbi-connection-pool"; + } + ); + systems = [ "cl-dbi-connection-pool" ]; + lispLibs = [ (getAttr "dbi-cp" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); cl-debug-print = ( build-asdf-system { pname = "cl-debug-print"; @@ -14332,7 +14789,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-debug-print" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-debug-print/2021-08-07/cl-debug-print-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-debug-print/2021-08-07/cl-debug-print-20210807-git.tgz"; sha256 = "1cm5nybmv0pq9s4lrwhd01rjj1wlcj1sjcrcakabi7w7b5zw4cyh"; system = "cl-debug-print"; asd = "cl-debug-print"; @@ -14352,7 +14809,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-debug-print-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-debug-print/2021-08-07/cl-debug-print-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-debug-print/2021-08-07/cl-debug-print-20210807-git.tgz"; sha256 = "1cm5nybmv0pq9s4lrwhd01rjj1wlcj1sjcrcakabi7w7b5zw4cyh"; system = "cl-debug-print-test"; asd = "cl-debug-print-test"; @@ -14376,7 +14833,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-dejavu" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-dejavu/2021-01-24/cl-dejavu-20210124-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-dejavu/2021-01-24/cl-dejavu-20210124-git.tgz"; sha256 = "1lbxiq21bxj8r11c58cqskgn8gnl2p8q1ydkhdsv7i7xnhv2y7r0"; system = "cl-dejavu"; asd = "cl-dejavu"; @@ -14396,7 +14853,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-devil" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-devil/2015-03-02/cl-devil-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-devil/2015-03-02/cl-devil-20150302-git.tgz"; sha256 = "1qdjb7xwzjkv99s8q0834lfdq4ch5j2ymrmqsvwzhg47ys17pvvf"; system = "cl-devil"; asd = "cl-devil"; @@ -14419,7 +14876,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-diceware" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-diceware/2015-09-23/cl-diceware-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-diceware/2015-09-23/cl-diceware-20150923-git.tgz"; sha256 = "0560ji51ksp8kngn2pyi41vw9zlnwiqj64ici43lzjx0qgv5v84l"; system = "cl-diceware"; asd = "cl-diceware"; @@ -14439,7 +14896,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-difflib" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-difflib/2013-01-28/cl-difflib-20130128-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-difflib/2013-01-28/cl-difflib-20130128-git.tgz"; sha256 = "08if0abhqg191xcz9s7xv8faqq51nswzp8hw423fkqjzr24pmq48"; system = "cl-difflib"; asd = "cl-difflib"; @@ -14457,7 +14914,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-difflib-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-difflib/2013-01-28/cl-difflib-20130128-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-difflib/2013-01-28/cl-difflib-20130128-git.tgz"; sha256 = "08if0abhqg191xcz9s7xv8faqq51nswzp8hw423fkqjzr24pmq48"; system = "cl-difflib-tests"; asd = "cl-difflib-tests"; @@ -14477,7 +14934,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-digraph" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-digraph/2024-10-12/cl-digraph-20241012-hg.tgz"; + url = "https://beta.quicklisp.org/archive/cl-digraph/2024-10-12/cl-digraph-20241012-hg.tgz"; sha256 = "18avbb608rv5radbczilfzb2857wz7pad49hwhr5za5qycjam8ss"; system = "cl-digraph"; asd = "cl-digraph"; @@ -14495,7 +14952,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-digraph.dot" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-digraph/2024-10-12/cl-digraph-20241012-hg.tgz"; + url = "https://beta.quicklisp.org/archive/cl-digraph/2024-10-12/cl-digraph-20241012-hg.tgz"; sha256 = "18avbb608rv5radbczilfzb2857wz7pad49hwhr5za5qycjam8ss"; system = "cl-digraph.dot"; asd = "cl-digraph.dot"; @@ -14518,7 +14975,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-digraph.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-digraph/2024-10-12/cl-digraph-20241012-hg.tgz"; + url = "https://beta.quicklisp.org/archive/cl-digraph/2024-10-12/cl-digraph-20241012-hg.tgz"; sha256 = "18avbb608rv5radbczilfzb2857wz7pad49hwhr5za5qycjam8ss"; system = "cl-digraph.test"; asd = "cl-digraph.test"; @@ -14542,7 +14999,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-diskspace" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-diskspace/2022-03-31/cl-diskspace-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-diskspace/2022-03-31/cl-diskspace-20220331-git.tgz"; sha256 = "0l19hxqw6b8i5i1jdbr45k1xib9axcwdagsp3y8wkb35g6wwc0s7"; system = "cl-diskspace"; asd = "cl-diskspace"; @@ -14566,7 +15023,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-disque" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-disque/2017-12-27/cl-disque-20171227-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-disque/2017-12-27/cl-disque-20171227-git.tgz"; sha256 = "0z26ls9vzlq43fwn307nb7xvqck5h3l9yygf93b0filki83krg3s"; system = "cl-disque"; asd = "cl-disque"; @@ -14592,7 +15049,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-disque-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-disque/2017-12-27/cl-disque-20171227-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-disque/2017-12-27/cl-disque-20171227-git.tgz"; sha256 = "0z26ls9vzlq43fwn307nb7xvqck5h3l9yygf93b0filki83krg3s"; system = "cl-disque-test"; asd = "cl-disque-test"; @@ -14616,7 +15073,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-djula-svg" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-djula-svg/2022-11-06/cl-djula-svg-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-djula-svg/2022-11-06/cl-djula-svg-20221106-git.tgz"; sha256 = "1jxgngr51ars234by4vnczfqmkwi2iy94sdxnj3pkjrdximy5any"; system = "cl-djula-svg"; asd = "cl-djula-svg"; @@ -14639,7 +15096,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-djula-tailwind" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-djula-tailwind/2022-11-06/cl-djula-tailwind-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-djula-tailwind/2022-11-06/cl-djula-tailwind-20221106-git.tgz"; sha256 = "059mfgh53gpj74rgr7b61fnm24bwx8hdrw15mjk687y9sna3avda"; system = "cl-djula-tailwind"; asd = "cl-djula-tailwind"; @@ -14664,7 +15121,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-dot" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-dot/2024-10-12/cl-dot-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-dot/2024-10-12/cl-dot-20241012-git.tgz"; sha256 = "1874jsc51pkyh6rz27qdhhsdyzx1mr7zx7v65m849wp49qlxs1ya"; system = "cl-dot"; asd = "cl-dot"; @@ -14682,7 +15139,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-dotenv" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-dotenv/2018-10-18/cl-dotenv-20181018-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-dotenv/2018-10-18/cl-dotenv-20181018-git.tgz"; sha256 = "0cdbk886aizsnqqs3z4jfn8nyrnxj4yb3y00av49xc4h83h6xn53"; system = "cl-dotenv"; asd = "cl-dotenv"; @@ -14705,7 +15162,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-dotenv-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-dotenv/2018-10-18/cl-dotenv-20181018-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-dotenv/2018-10-18/cl-dotenv-20181018-git.tgz"; sha256 = "0cdbk886aizsnqqs3z4jfn8nyrnxj4yb3y00av49xc4h83h6xn53"; system = "cl-dotenv-test"; asd = "cl-dotenv-test"; @@ -14729,7 +15186,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-drawille" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-drawille/2021-08-07/cl-drawille-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-drawille/2021-08-07/cl-drawille-20210807-git.tgz"; sha256 = "0wmiz0c7h2zsfj7inzzn8jivnfsc94rq8pczfi44h36n2jg6hdys"; system = "cl-drawille"; asd = "cl-drawille"; @@ -14753,7 +15210,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-drm" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-drm/2016-12-04/cl-drm-20161204-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-drm/2016-12-04/cl-drm-20161204-git.tgz"; sha256 = "018jsdi9hs71x14mq18k08hwrgdvvbc2yqbqww6gara0bg9cl3l6"; system = "cl-drm"; asd = "cl-drm"; @@ -14773,7 +15230,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-dropbox" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-dropbox/2015-06-08/cl-dropbox-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-dropbox/2015-06-08/cl-dropbox-20150608-git.tgz"; sha256 = "09giwr1wlz42flrpy71gv60p53nixjk9jaj4lirgf59dkh718f9x"; system = "cl-dropbox"; asd = "cl-dropbox"; @@ -14798,7 +15255,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-dsl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-dsl/2013-07-20/cl-dsl-20130720-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-dsl/2013-07-20/cl-dsl-20130720-git.tgz"; sha256 = "1bj5yp20r8z6gi6rpf88kpy4i06c8i2d3cg5sjlq7d1ninkb4gg4"; system = "cl-dsl"; asd = "cl-dsl"; @@ -14818,7 +15275,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-dsl-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-dsl/2013-07-20/cl-dsl-20130720-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-dsl/2013-07-20/cl-dsl-20130720-git.tgz"; sha256 = "1bj5yp20r8z6gi6rpf88kpy4i06c8i2d3cg5sjlq7d1ninkb4gg4"; system = "cl-dsl-tests"; asd = "cl-dsl"; @@ -14841,7 +15298,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-durian" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-durian/2015-06-08/cl-durian-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-durian/2015-06-08/cl-durian-20150608-git.tgz"; sha256 = "0s89gr5gwwkyirrv7l5fzk9ws7fhy087c3myksblsh00z1xcrvng"; system = "cl-durian"; asd = "cl-durian"; @@ -14861,7 +15318,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-earley-parser" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-earley-parser/2021-10-20/cl-earley-parser-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-earley-parser/2021-10-20/cl-earley-parser-20211020-git.tgz"; sha256 = "1pkry3ynxn2y3nf13lc3zjqgf4hx43d9zb0w0m34s51xd4xp2h1x"; system = "cl-earley-parser"; asd = "cl-earley-parser"; @@ -14881,7 +15338,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ecma-48" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ecma-48/2020-02-18/cl-ecma-48-20200218-http.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ecma-48/2020-02-18/cl-ecma-48-20200218-http.tgz"; sha256 = "1y3srzahci25qp959b87m82d1i1i8jmq039yp9nf0hifxyhw6dgy"; system = "cl-ecma-48"; asd = "cl-ecma-48"; @@ -14901,7 +15358,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-egl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-egl/2019-05-21/cl-egl-20190521-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-egl/2019-05-21/cl-egl-20190521-git.tgz"; sha256 = "19shhzmdc9f1128slc9m4ns6zraka99awqgb4dkrwzgv7w3miqfl"; system = "cl-egl"; asd = "cl-egl"; @@ -14921,7 +15378,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-elastic" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-elastic/2020-02-18/cl-elastic-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-elastic/2020-02-18/cl-elastic-20200218-git.tgz"; sha256 = "107ha226n3mxzvm0cp8kvgybcv4rr0b4lwik4f4j7lrhz6xvnncq"; system = "cl-elastic"; asd = "cl-elastic"; @@ -14945,7 +15402,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-elastic-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-elastic/2020-02-18/cl-elastic-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-elastic/2020-02-18/cl-elastic-20200218-git.tgz"; sha256 = "107ha226n3mxzvm0cp8kvgybcv4rr0b4lwik4f4j7lrhz6xvnncq"; system = "cl-elastic-test"; asd = "cl-elastic-test"; @@ -14969,7 +15426,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-emacs-if" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-emacs-if/2012-03-05/cl-emacs-if-20120305-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-emacs-if/2012-03-05/cl-emacs-if-20120305-git.tgz"; sha256 = "0br3jvihq24ymqjn2r2qnl3l099r329bsqh18nmkk3yw3kclrcfv"; system = "cl-emacs-if"; asd = "cl-emacs-if"; @@ -14989,7 +15446,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-emb" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-emb/2019-05-21/cl-emb-20190521-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-emb/2019-05-21/cl-emb-20190521-git.tgz"; sha256 = "1xcm31n7afh5316lwz8iqbjx7kn5lw0l11arg8mhdmkx42aj4gkk"; system = "cl-emb"; asd = "cl-emb"; @@ -15007,7 +15464,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-emoji" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-emoji/2020-02-18/cl-emoji-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-emoji/2020-02-18/cl-emoji-20200218-git.tgz"; sha256 = "1v91kzx42qyjm936frvfsr0cgnj9g197x78xlda6x7x6xri2r9gm"; system = "cl-emoji"; asd = "cl-emoji"; @@ -15027,7 +15484,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-emoji-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-emoji/2020-02-18/cl-emoji-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-emoji/2020-02-18/cl-emoji-20200218-git.tgz"; sha256 = "1v91kzx42qyjm936frvfsr0cgnj9g197x78xlda6x7x6xri2r9gm"; system = "cl-emoji-test"; asd = "cl-emoji-test"; @@ -15051,7 +15508,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-env" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-env/2018-04-30/cl-env-20180430-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-env/2018-04-30/cl-env-20180430-git.tgz"; sha256 = "1r0d004gr1za9ib53jhxkx315wd4av0ar2063dcvs9g4nahk2d07"; system = "cl-env"; asd = "cl-env"; @@ -15067,12 +15524,12 @@ lib.makeScope pkgs.newScope (self: { cl-environments = ( build-asdf-system { pname = "cl-environments"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-environments" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-environments/2024-10-12/cl-environments-20241012-git.tgz"; - sha256 = "0pafk4c0qdzqp0l23fi1pgrqycbcrwm51wq0x0jvr7975yfx2lim"; + url = "https://beta.quicklisp.org/archive/cl-environments/2025-06-22/cl-environments-20250622-git.tgz"; + sha256 = "0aas5139qy4hfrkqgbx2iird7mma95pvk6xarlwzi28v9r8qpzy3"; system = "cl-environments"; asd = "cl-environments"; } @@ -15095,7 +15552,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-etcd" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-etcd/2023-02-14/cl-etcd-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-etcd/2023-02-14/cl-etcd-20230214-git.tgz"; sha256 = "0bals10r07prxvjxd744vz02ri72isf168lkhrx9qkc96hd214ah"; system = "cl-etcd"; asd = "cl-etcd"; @@ -15126,7 +15583,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-events" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-events/2016-03-18/cl-events-20160318-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-events/2016-03-18/cl-events-20160318-git.tgz"; sha256 = "1r847q1bwblnb2395dsydylr9nxgjx7gdwc9dx1051zhvi9in36g"; system = "cl-events"; asd = "cl-events"; @@ -15152,7 +15609,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-events.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-events/2016-03-18/cl-events-20160318-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-events/2016-03-18/cl-events-20160318-git.tgz"; sha256 = "1r847q1bwblnb2395dsydylr9nxgjx7gdwc9dx1051zhvi9in36g"; system = "cl-events.test"; asd = "cl-events.test"; @@ -15178,7 +15635,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ewkb" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ewkb/2011-06-19/cl-ewkb-20110619-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ewkb/2011-06-19/cl-ewkb-20110619-git.tgz"; sha256 = "1mk5j34m9gkwl7c4d464l42gclxlrcpifp2nq41z3fsfl8badn6w"; system = "cl-ewkb"; asd = "cl-ewkb"; @@ -15201,7 +15658,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ewkb-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ewkb/2011-06-19/cl-ewkb-20110619-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ewkb/2011-06-19/cl-ewkb-20110619-git.tgz"; sha256 = "1mk5j34m9gkwl7c4d464l42gclxlrcpifp2nq41z3fsfl8badn6w"; system = "cl-ewkb-tests"; asd = "cl-ewkb"; @@ -15224,7 +15681,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-factoring" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-factoring/2022-11-06/cl-factoring-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-factoring/2022-11-06/cl-factoring-20221106-git.tgz"; sha256 = "0vn3kb8mmi93pr76lx1mbwp7qc2krzb0ayzcrffwq2aw2q201fhd"; system = "cl-factoring"; asd = "cl-factoring"; @@ -15247,7 +15704,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-fad" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-fad/2022-02-20/cl-fad-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-fad/2022-02-20/cl-fad-20220220-git.tgz"; sha256 = "0a1xqldrq170lflnns3xp6swpnvsvllf5vq0h7sz8jqh4riqlny6"; system = "cl-fad"; asd = "cl-fad"; @@ -15268,7 +15725,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-fam" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-fam/2012-11-25/cl-fam-20121125-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-fam/2012-11-25/cl-fam-20121125-git.tgz"; sha256 = "1imv87imhxvigghx3l28kbsldz6hpqd32280wjwffqwvadhx0gng"; system = "cl-fam"; asd = "cl-fam"; @@ -15288,12 +15745,12 @@ lib.makeScope pkgs.newScope (self: { cl-fast-ecs = ( build-asdf-system { pname = "cl-fast-ecs"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-fast-ecs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-fast-ecs/2024-10-12/cl-fast-ecs-20241012-git.tgz"; - sha256 = "0hwprzq6dnbfh4y08db615gzpdpr8vphy27whgsjhyg980503hxv"; + url = "https://beta.quicklisp.org/archive/cl-fast-ecs/2025-06-22/cl-fast-ecs-20250622-git.tgz"; + sha256 = "067nfx7cp0qbzva54ym01rvvdiq9f6gnl92w026132p7bzdls2i5"; system = "cl-fast-ecs"; asd = "cl-fast-ecs"; } @@ -15301,7 +15758,9 @@ lib.makeScope pkgs.newScope (self: { systems = [ "cl-fast-ecs" ]; lispLibs = [ (getAttr "alexandria" self) - (getAttr "trivial-garbage" self) + (getAttr "closer-mop" self) + (getAttr "global-vars" self) + (getAttr "trivial-adjust-simple-array" self) ]; meta = { hydraPlatforms = [ ]; @@ -15315,7 +15774,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-fastcgi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-fastcgi/2024-10-12/cl-fastcgi-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-fastcgi/2024-10-12/cl-fastcgi-20241012-git.tgz"; sha256 = "0hf6a8jrz8dx91px8q4201k3y919ls7cgn4qjmkqxqhjk2gxy5k7"; system = "cl-fastcgi"; asd = "cl-fastcgi"; @@ -15338,7 +15797,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-fbclient" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-fbclient/2014-01-13/cl-fbclient-20140113-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-fbclient/2014-01-13/cl-fbclient-20140113-git.tgz"; sha256 = "1q2dwizrjnal3fdcdgim4kdq0dma71p3s8w6i8bjkg4fs49k5p9j"; system = "cl-fbclient"; asd = "cl-fbclient"; @@ -15358,7 +15817,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-fbx" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-fbx/2024-10-12/cl-fbx-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-fbx/2024-10-12/cl-fbx-20241012-git.tgz"; sha256 = "1g6s3ili3fcxy37g34ykmf2zc6nm70sh5q0diqbikikaly8kfi50"; system = "cl-fbx"; asd = "cl-fbx"; @@ -15386,7 +15845,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-feedparser" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-feedparser/2023-06-18/cl-feedparser-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-feedparser/2023-06-18/cl-feedparser-20230618-git.tgz"; sha256 = "18cl4318g8szhdsqvg68ajry91m1hn0znmsqd0r2ikq6l5wpixmb"; system = "cl-feedparser"; asd = "cl-feedparser"; @@ -15419,7 +15878,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-feedparser-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-feedparser/2023-06-18/cl-feedparser-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-feedparser/2023-06-18/cl-feedparser-20230618-git.tgz"; sha256 = "18cl4318g8szhdsqvg68ajry91m1hn0znmsqd0r2ikq6l5wpixmb"; system = "cl-feedparser-tests"; asd = "cl-feedparser-tests"; @@ -15444,7 +15903,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-fix" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-fix/2023-02-14/cl-fix-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-fix/2023-02-14/cl-fix-20230214-git.tgz"; sha256 = "0hw9sms558vn964sw5bav74wmfahf066nqj1xyd6b3f1lz3jarbb"; system = "cl-fix"; asd = "cl-fix"; @@ -15473,7 +15932,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-fixtures" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-fixtures/2020-03-25/cl-fixtures-20200325-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-fixtures/2020-03-25/cl-fixtures-20200325-git.tgz"; sha256 = "01z8brw32lv8lqn6r9srwrna5gkd4cyncpbpg6pc0khgdxzpzaag"; system = "cl-fixtures"; asd = "cl-fixtures"; @@ -15493,7 +15952,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-fixtures-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-fixtures/2020-03-25/cl-fixtures-20200325-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-fixtures/2020-03-25/cl-fixtures-20200325-git.tgz"; sha256 = "01z8brw32lv8lqn6r9srwrna5gkd4cyncpbpg6pc0khgdxzpzaag"; system = "cl-fixtures-test"; asd = "cl-fixtures-test"; @@ -15515,12 +15974,12 @@ lib.makeScope pkgs.newScope (self: { cl-flac = ( build-asdf-system { pname = "cl-flac"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "cl-flac" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-flac/2023-10-21/cl-flac-20231021-git.tgz"; - sha256 = "1p6hrg9j58yyml78l82zd6p33apbbnbw24slxw876n2j30qiyc84"; + url = "https://beta.quicklisp.org/archive/cl-flac/2025-06-22/cl-flac-20250622-git.tgz"; + sha256 = "018kllg8zjdwzm3l3fcxyy47sv1h67mlib7585hvg2hnvqljffh8"; system = "cl-flac"; asd = "cl-flac"; } @@ -15529,6 +15988,7 @@ lib.makeScope pkgs.newScope (self: { lispLibs = [ (getAttr "cffi" self) (getAttr "documentation-utils" self) + (getAttr "pathname-utils" self) (getAttr "trivial-features" self) (getAttr "trivial-garbage" self) ]; @@ -15544,7 +16004,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-flow" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-flow/2022-07-07/cl-flow-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-flow/2022-07-07/cl-flow-stable-git.tgz"; sha256 = "0mh9g0zj2kwnsq31zg4af5k9jvfbwp28zx02f0r1jlg2rha87vlg"; system = "cl-flow"; asd = "cl-flow"; @@ -15567,7 +16027,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-flowd" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-flowd/2014-07-13/cl-flowd-20140713-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-flowd/2014-07-13/cl-flowd-20140713-git.tgz"; sha256 = "0qppiqgy4fgvkm519bqjrw1mfp90q8fs1spvawf24d1nzslf51pj"; system = "cl-flowd"; asd = "cl-flowd"; @@ -15583,12 +16043,12 @@ lib.makeScope pkgs.newScope (self: { cl-fluent-logger = ( build-asdf-system { pname = "cl-fluent-logger"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-fluent-logger" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-fluent-logger/2024-10-12/cl-fluent-logger-20241012-git.tgz"; - sha256 = "0dqmx28d49fraqymrvaxq19d1x5nd6sb30bza7s9vgcyz404hzg4"; + url = "https://beta.quicklisp.org/archive/cl-fluent-logger/2025-06-22/cl-fluent-logger-20250622-git.tgz"; + sha256 = "1p9sjqlxr0mazzzq9lg7dapyyh854pz7z6cdy9y0hdijlm4h2m6r"; system = "cl-fluent-logger"; asd = "cl-fluent-logger"; } @@ -15598,8 +16058,8 @@ lib.makeScope pkgs.newScope (self: { (getAttr "alexandria" self) (getAttr "bordeaux-threads" self) (getAttr "chanl" self) + (getAttr "cl-json" self) (getAttr "cl-messagepack" self) - (getAttr "jonathan" self) (getAttr "local-time" self) (getAttr "pack" self) (getAttr "usocket" self) @@ -15616,7 +16076,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-fluiddb" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-fluidinfo/2013-03-12/cl-fluidinfo-20130312-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-fluidinfo/2013-03-12/cl-fluidinfo-20130312-git.tgz"; sha256 = "0npkkp2w88f6vb9pckjp4q4d4idx9p2s4s4imljs2vfym2j3w0wb"; system = "cl-fluiddb"; asd = "cl-fluiddb"; @@ -15642,7 +16102,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-fluiddb-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-fluidinfo/2013-03-12/cl-fluidinfo-20130312-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-fluidinfo/2013-03-12/cl-fluidinfo-20130312-git.tgz"; sha256 = "0npkkp2w88f6vb9pckjp4q4d4idx9p2s4s4imljs2vfym2j3w0wb"; system = "cl-fluiddb-test"; asd = "cl-fluiddb-test"; @@ -15665,7 +16125,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-fluidinfo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-fluidinfo/2013-03-12/cl-fluidinfo-20130312-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-fluidinfo/2013-03-12/cl-fluidinfo-20130312-git.tgz"; sha256 = "0npkkp2w88f6vb9pckjp4q4d4idx9p2s4s4imljs2vfym2j3w0wb"; system = "cl-fluidinfo"; asd = "cl-fluidinfo"; @@ -15685,7 +16145,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-fond" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-fond/2019-11-30/cl-fond-20191130-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-fond/2019-11-30/cl-fond-20191130-git.tgz"; sha256 = "03ygcw1azb44bhdsqcq99xi4ci0by76ap5jf5l2d1vfxq04v8grq"; system = "cl-fond"; asd = "cl-fond"; @@ -15712,7 +16172,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-form-types" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-form-types/2024-10-12/cl-form-types-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-form-types/2024-10-12/cl-form-types-20241012-git.tgz"; sha256 = "1qc9dy9ji14nz5k2i17idbfks3ddwrwy9bf60rq95pnngkzqs3d1"; system = "cl-form-types"; asd = "cl-form-types"; @@ -15734,23 +16194,46 @@ lib.makeScope pkgs.newScope (self: { cl-forms = ( build-asdf-system { pname = "cl-forms"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-forms" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-forms/2024-10-12/cl-forms-20241012-git.tgz"; - sha256 = "19ldfrsa0nvbr0mlzy4cm9fmvxfmh6x9cn0nawaypbsrwpybfslc"; + url = "https://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz"; + sha256 = "19bmcvg89ydgkz1rjds0q0ydrpj4dxcvgnqgjjkbsi1h8yw18fsj"; system = "cl-forms"; asd = "cl-forms"; } ); systems = [ "cl-forms" ]; + lispLibs = [ + (getAttr "cl-forms_dot_core" self) + (getAttr "hunchentoot" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + cl-forms_dot_core = ( + build-asdf-system { + pname = "cl-forms.core"; + version = "20250622-git"; + asds = [ "cl-forms.core" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz"; + sha256 = "19bmcvg89ydgkz1rjds0q0ydrpj4dxcvgnqgjjkbsi1h8yw18fsj"; + system = "cl-forms.core"; + asd = "cl-forms.core"; + } + ); + systems = [ "cl-forms.core" ]; lispLibs = [ (getAttr "alexandria" self) + (getAttr "cl-base64" self) (getAttr "cl-ppcre" self) (getAttr "clavier" self) (getAttr "fmt" self) - (getAttr "hunchentoot" self) (getAttr "ironclad" self) (getAttr "str" self) (getAttr "uuid" self) @@ -15763,12 +16246,12 @@ lib.makeScope pkgs.newScope (self: { cl-forms_dot_demo = ( build-asdf-system { pname = "cl-forms.demo"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-forms.demo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-forms/2024-10-12/cl-forms-20241012-git.tgz"; - sha256 = "19ldfrsa0nvbr0mlzy4cm9fmvxfmh6x9cn0nawaypbsrwpybfslc"; + url = "https://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz"; + sha256 = "19bmcvg89ydgkz1rjds0q0ydrpj4dxcvgnqgjjkbsi1h8yw18fsj"; system = "cl-forms.demo"; asd = "cl-forms.demo"; } @@ -15794,19 +16277,19 @@ lib.makeScope pkgs.newScope (self: { cl-forms_dot_djula = ( build-asdf-system { pname = "cl-forms.djula"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-forms.djula" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-forms/2024-10-12/cl-forms-20241012-git.tgz"; - sha256 = "19ldfrsa0nvbr0mlzy4cm9fmvxfmh6x9cn0nawaypbsrwpybfslc"; + url = "https://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz"; + sha256 = "19bmcvg89ydgkz1rjds0q0ydrpj4dxcvgnqgjjkbsi1h8yw18fsj"; system = "cl-forms.djula"; asd = "cl-forms.djula"; } ); systems = [ "cl-forms.djula" ]; lispLibs = [ - (getAttr "cl-forms" self) + (getAttr "cl-forms_dot_core" self) (getAttr "cl-forms_dot_who" self) (getAttr "djula" self) ]; @@ -15815,22 +16298,46 @@ lib.makeScope pkgs.newScope (self: { }; } ); + cl-forms_dot_ningle = ( + build-asdf-system { + pname = "cl-forms.ningle"; + version = "20250622-git"; + asds = [ "cl-forms.ningle" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz"; + sha256 = "19bmcvg89ydgkz1rjds0q0ydrpj4dxcvgnqgjjkbsi1h8yw18fsj"; + system = "cl-forms.ningle"; + asd = "cl-forms.ningle"; + } + ); + systems = [ "cl-forms.ningle" ]; + lispLibs = [ + (getAttr "cl-forms_dot_core" self) + (getAttr "lack" self) + (getAttr "ningle" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); cl-forms_dot_peppol = ( build-asdf-system { pname = "cl-forms.peppol"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-forms.peppol" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-forms/2024-10-12/cl-forms-20241012-git.tgz"; - sha256 = "19ldfrsa0nvbr0mlzy4cm9fmvxfmh6x9cn0nawaypbsrwpybfslc"; + url = "https://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz"; + sha256 = "19bmcvg89ydgkz1rjds0q0ydrpj4dxcvgnqgjjkbsi1h8yw18fsj"; system = "cl-forms.peppol"; asd = "cl-forms.peppol"; } ); systems = [ "cl-forms.peppol" ]; lispLibs = [ - (getAttr "cl-forms" self) + (getAttr "cl-forms_dot_core" self) (getAttr "peppol" self) ]; meta = { @@ -15841,12 +16348,12 @@ lib.makeScope pkgs.newScope (self: { cl-forms_dot_test = ( build-asdf-system { pname = "cl-forms.test"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-forms.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-forms/2024-10-12/cl-forms-20241012-git.tgz"; - sha256 = "19ldfrsa0nvbr0mlzy4cm9fmvxfmh6x9cn0nawaypbsrwpybfslc"; + url = "https://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz"; + sha256 = "19bmcvg89ydgkz1rjds0q0ydrpj4dxcvgnqgjjkbsi1h8yw18fsj"; system = "cl-forms.test"; asd = "cl-forms.test"; } @@ -15864,19 +16371,19 @@ lib.makeScope pkgs.newScope (self: { cl-forms_dot_who = ( build-asdf-system { pname = "cl-forms.who"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-forms.who" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-forms/2024-10-12/cl-forms-20241012-git.tgz"; - sha256 = "19ldfrsa0nvbr0mlzy4cm9fmvxfmh6x9cn0nawaypbsrwpybfslc"; + url = "https://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz"; + sha256 = "19bmcvg89ydgkz1rjds0q0ydrpj4dxcvgnqgjjkbsi1h8yw18fsj"; system = "cl-forms.who"; asd = "cl-forms.who"; } ); systems = [ "cl-forms.who" ]; lispLibs = [ - (getAttr "cl-forms" self) + (getAttr "cl-forms_dot_core" self) (getAttr "cl-who" self) ]; meta = { @@ -15887,12 +16394,12 @@ lib.makeScope pkgs.newScope (self: { cl-forms_dot_who_dot_bootstrap = ( build-asdf-system { pname = "cl-forms.who.bootstrap"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-forms.who.bootstrap" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-forms/2024-10-12/cl-forms-20241012-git.tgz"; - sha256 = "19ldfrsa0nvbr0mlzy4cm9fmvxfmh6x9cn0nawaypbsrwpybfslc"; + url = "https://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz"; + sha256 = "19bmcvg89ydgkz1rjds0q0ydrpj4dxcvgnqgjjkbsi1h8yw18fsj"; system = "cl-forms.who.bootstrap"; asd = "cl-forms.who.bootstrap"; } @@ -15911,7 +16418,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-freeimage" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-freeimage/2017-04-03/cl-freeimage-20170403-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-freeimage/2017-04-03/cl-freeimage-20170403-git.tgz"; sha256 = "1333i8sh670nkb0c35xp511xjlafn5zh8a6gk3wnh19gffvj63hq"; system = "cl-freeimage"; asd = "cl-freeimage"; @@ -15921,8 +16428,6 @@ lib.makeScope pkgs.newScope (self: { lispLibs = [ (getAttr "cffi" self) ]; meta = { hydraPlatforms = [ ]; - # darwin cannot find libpango.dylib - broken = stdenv.hostPlatform.isDarwin; }; } ); @@ -15933,7 +16438,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-freetype2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-freetype2/2024-10-12/cl-freetype2-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-freetype2/2024-10-12/cl-freetype2-20241012-git.tgz"; sha256 = "00lkmawhjgqzfrsaaqmnffm7mmn3b31gzwz8g51kdjm9s16vwpjs"; system = "cl-freetype2"; asd = "cl-freetype2"; @@ -15956,7 +16461,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-freetype2-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-freetype2/2024-10-12/cl-freetype2-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-freetype2/2024-10-12/cl-freetype2-20241012-git.tgz"; sha256 = "00lkmawhjgqzfrsaaqmnffm7mmn3b31gzwz8g51kdjm9s16vwpjs"; system = "cl-freetype2-tests"; asd = "cl-freetype2-tests"; @@ -15979,7 +16484,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-fsnotify" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-fsnotify/2015-03-02/cl-fsnotify-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-fsnotify/2015-03-02/cl-fsnotify-20150302-git.tgz"; sha256 = "0693ga1xqcvi89j3aw0lmyi3a1yl3hrfwli2jiwxv0mgpcaxz0yr"; system = "cl-fsnotify"; asd = "cl-fsnotify"; @@ -16002,7 +16507,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ftp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ftp/2015-06-08/cl-ftp-20150608-http.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ftp/2015-06-08/cl-ftp-20150608-http.tgz"; sha256 = "1m955rjpaynybzmb9q631mll764hm06lydvhra50mfjj75ynwsvw"; system = "cl-ftp"; asd = "cl-ftp"; @@ -16025,7 +16530,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-fuse" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-fuse/2020-09-25/cl-fuse-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-fuse/2020-09-25/cl-fuse-20200925-git.tgz"; sha256 = "1qxvf8ybn0v1hiaz11k1h47y0dksj8ah9v8jdfrjp9ad1rrrnxqs"; system = "cl-fuse"; asd = "cl-fuse"; @@ -16051,7 +16556,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-fuse-meta-fs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2019-07-10/cl-fuse-meta-fs-20190710-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-fuse-meta-fs/2019-07-10/cl-fuse-meta-fs-20190710-git.tgz"; sha256 = "1wbi7lvczfn09qb72rg1bps9w51mz42dwa7lyjl2hp8lbwc2a5a9"; system = "cl-fuse-meta-fs"; asd = "cl-fuse-meta-fs"; @@ -16074,7 +16579,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-fuzz" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-fuzz/2018-10-18/cl-fuzz-20181018-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-fuzz/2018-10-18/cl-fuzz-20181018-git.tgz"; sha256 = "1zvlh0nh4iip75p6dblx5kajqaa3hhv6mdjbx9cids8491r388rz"; system = "cl-fuzz"; asd = "cl-fuzz"; @@ -16092,7 +16597,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-fxml" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-fxml/2022-03-31/cl-fxml-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-fxml/2022-03-31/cl-fxml-20220331-git.tgz"; sha256 = "0i5w3z0rgyi42rlhvf92k95w6bajf3m1x9g4zprwf602kp7abr3c"; system = "cl-fxml"; asd = "cl-fxml"; @@ -16112,12 +16617,12 @@ lib.makeScope pkgs.newScope (self: { cl-gamepad = ( build-asdf-system { pname = "cl-gamepad"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-gamepad" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-gamepad/2024-10-12/cl-gamepad-20241012-git.tgz"; - sha256 = "015qx89rnkkqaa6qsl78zvb3sb1m4xdgjpgzn5ip5i27gw94770g"; + url = "https://beta.quicklisp.org/archive/cl-gamepad/2025-06-22/cl-gamepad-20250622-git.tgz"; + sha256 = "1flnsqa33hm3ab4vbab0r62xbjjrwi5g6a9asjr77mp2vhdwycsr"; system = "cl-gamepad"; asd = "cl-gamepad"; } @@ -16125,6 +16630,7 @@ lib.makeScope pkgs.newScope (self: { systems = [ "cl-gamepad" ]; lispLibs = [ (getAttr "cffi" self) + (getAttr "deploy" self) (getAttr "documentation-utils" self) (getAttr "trivial-features" self) ]; @@ -16140,7 +16646,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-gap-buffer" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-gap-buffer/2023-06-18/cl-gap-buffer-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-gap-buffer/2023-06-18/cl-gap-buffer-20230618-git.tgz"; sha256 = "0dzwhzv139z9pspnh1krnldnk4nfrj8f5khh08085xkc5bgg1jfv"; system = "cl-gap-buffer"; asd = "cl-gap-buffer"; @@ -16160,7 +16666,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-gbm" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-gbm/2018-04-30/cl-gbm-20180430-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-gbm/2018-04-30/cl-gbm-20180430-git.tgz"; sha256 = "14bshi7q1hhyag8va9javjjn5cnhmwyjlw8vvvb4fyzfspz3kpdx"; system = "cl-gbm"; asd = "cl-gbm"; @@ -16180,7 +16686,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-gcrypt" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-gcrypt/2021-12-09/cl-gcrypt-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-gcrypt/2021-12-09/cl-gcrypt-20211209-git.tgz"; sha256 = "1f4gx5ssirr4f3n68i2da6ad7hbhgsk18zv0gfqy3q635zai0z3w"; system = "cl-gcrypt"; asd = "cl-gcrypt"; @@ -16200,7 +16706,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-gcrypt-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-gcrypt/2021-12-09/cl-gcrypt-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-gcrypt/2021-12-09/cl-gcrypt-20211209-git.tgz"; sha256 = "1f4gx5ssirr4f3n68i2da6ad7hbhgsk18zv0gfqy3q635zai0z3w"; system = "cl-gcrypt-test"; asd = "cl-gcrypt-test"; @@ -16226,7 +16732,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-gd" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-gd/2020-12-20/cl-gd-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-gd/2020-12-20/cl-gd-20201220-git.tgz"; sha256 = "1wa6nv5bdf0v38hzr6cfadkk6mhvvnj9lpl9igcxygdjbnn2a3y6"; system = "cl-gd"; asd = "cl-gd"; @@ -16246,7 +16752,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-gd-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-gd/2020-12-20/cl-gd-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-gd/2020-12-20/cl-gd-20201220-git.tgz"; sha256 = "1wa6nv5bdf0v38hzr6cfadkk6mhvvnj9lpl9igcxygdjbnn2a3y6"; system = "cl-gd-test"; asd = "cl-gd-test"; @@ -16266,7 +16772,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-gdata" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-gdata/2017-11-30/cl-gdata-20171130-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-gdata/2017-11-30/cl-gdata-20171130-git.tgz"; sha256 = "0x2sq03nacjbq7p9baxlhr7bb0xg7v1ljq7qj1b3xrd4rbcibxi9"; system = "cl-gdata"; asd = "cl-gdata"; @@ -16303,7 +16809,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-gearman" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-gearman/2021-10-20/cl-gearman-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-gearman/2021-10-20/cl-gearman-20211020-git.tgz"; sha256 = "0cnkpqn43p55xlhdi8bws2ssa1ahvzbgggh3pam0zbqma2m525j6"; system = "cl-gearman"; asd = "cl-gearman"; @@ -16328,7 +16834,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-gearman-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-gearman/2021-10-20/cl-gearman-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-gearman/2021-10-20/cl-gearman-20211020-git.tgz"; sha256 = "0cnkpqn43p55xlhdi8bws2ssa1ahvzbgggh3pam0zbqma2m525j6"; system = "cl-gearman-test"; asd = "cl-gearman-test"; @@ -16351,7 +16857,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-gendoc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-gendoc/2018-08-31/cl-gendoc-20180831-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-gendoc/2018-08-31/cl-gendoc-20180831-git.tgz"; sha256 = "19f8fmz2hj332kh3y3fbil2dchpckdsqci6ljhadymd8p2h6w4ws"; system = "cl-gendoc"; asd = "cl-gendoc"; @@ -16375,7 +16881,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-gendoc-docs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-gendoc/2018-08-31/cl-gendoc-20180831-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-gendoc/2018-08-31/cl-gendoc-20180831-git.tgz"; sha256 = "19f8fmz2hj332kh3y3fbil2dchpckdsqci6ljhadymd8p2h6w4ws"; system = "cl-gendoc-docs"; asd = "cl-gendoc"; @@ -16395,7 +16901,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-gene-searcher" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-gene-searcher/2011-10-01/cl-gene-searcher-20111001-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-gene-searcher/2011-10-01/cl-gene-searcher-20111001-git.tgz"; sha256 = "0n8p6yk600h7m050bjxazmcxdrcfrkcklrcj8ncflyshm72qv1yk"; system = "cl-gene-searcher"; asd = "cl-gene-searcher"; @@ -16415,7 +16921,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-generator" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-generator/2022-11-06/cl-generator-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-generator/2022-11-06/cl-generator-20221106-git.tgz"; sha256 = "0aa5prw6f4fqw9j8m6kvdb3h3lqyvi15dd1l6437p9408mmyxk30"; system = "cl-generator"; asd = "cl-generator"; @@ -16435,7 +16941,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-generator-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-generator/2022-11-06/cl-generator-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-generator/2022-11-06/cl-generator-20221106-git.tgz"; sha256 = "0aa5prw6f4fqw9j8m6kvdb3h3lqyvi15dd1l6437p9408mmyxk30"; system = "cl-generator-test"; asd = "cl-generator-test"; @@ -16458,7 +16964,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-geocode" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-geocode/2019-08-13/cl-geocode-20190813-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-geocode/2019-08-13/cl-geocode-20190813-git.tgz"; sha256 = "17z0v29rrhsfjikg4sn9ynxckh5i3ahjn7c8qs381n1p9fbd668l"; system = "cl-geocode"; asd = "cl-geocode"; @@ -16482,7 +16988,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-geoip" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-geoip/2013-06-15/cl-geoip-20130615-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-geoip/2013-06-15/cl-geoip-20130615-git.tgz"; sha256 = "0ys8wysppx06j3s0dc9lc9zjizr1fmj388fiigyn1wrdyyka41y2"; system = "cl-geoip"; asd = "cl-geoip"; @@ -16502,7 +17008,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-geometry" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-geometry/2016-05-31/cl-geometry-20160531-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-geometry/2016-05-31/cl-geometry-20160531-git.tgz"; sha256 = "188xrd8plvc34gz7q01zmkdrzxbpwzln103l5dl78pa4a6vzz34h"; system = "cl-geometry"; asd = "cl-geometry"; @@ -16523,7 +17029,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-geometry-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-geometry/2016-05-31/cl-geometry-20160531-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-geometry/2016-05-31/cl-geometry-20160531-git.tgz"; sha256 = "188xrd8plvc34gz7q01zmkdrzxbpwzln103l5dl78pa4a6vzz34h"; system = "cl-geometry-tests"; asd = "cl-geometry-tests"; @@ -16547,7 +17053,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-geos" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-geos/2018-07-11/cl-geos-20180711-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-geos/2018-07-11/cl-geos-20180711-git.tgz"; sha256 = "0igq2c1p82pbkyc7zg90fm3lbsmhwnfmb3q8jc8baklb958555ck"; system = "cl-geos"; asd = "cl-geos"; @@ -16571,7 +17077,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-getopt" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-getopt/2021-12-09/cl-getopt-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-getopt/2021-12-09/cl-getopt-20211209-git.tgz"; sha256 = "16qkpg2qln7q9j5614py00zwsnmxcy3xcmhb4m8f0w0zbnpvkjxl"; system = "cl-getopt"; asd = "cl-getopt"; @@ -16594,7 +17100,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-getx" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-getx/2020-09-25/cl-getx-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-getx/2020-09-25/cl-getx-20200925-git.tgz"; sha256 = "07gi346vqrhnbkdk4l6g06z4shhnx7f4l44jgayzfdd0xkv02brv"; system = "cl-getx"; asd = "cl-getx"; @@ -16614,7 +17120,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-gimei" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-gimei/2021-10-20/cl-gimei-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-gimei/2021-10-20/cl-gimei-20211020-git.tgz"; sha256 = "1405qbqrrrmanmg2dl7yfdj8z4vcsj1silpsa7i1y00pd18xgk8q"; system = "cl-gimei"; asd = "cl-gimei"; @@ -16637,7 +17143,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-gio" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glib/2023-10-21/cl-glib-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glib/2023-10-21/cl-glib-20231021-git.tgz"; sha256 = "07y8hpvdl490p8j4k8y47raqqwnpym9scz7jlg2f1jx897dkssjb"; system = "cl-gio"; asd = "cl-gio"; @@ -16657,7 +17163,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-gists" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-gists/2023-10-21/cl-gists-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-gists/2023-10-21/cl-gists-20231021-git.tgz"; sha256 = "0kza5y6jckvydaw9bw8va5kli5d3ybyvil6w2bhf411crd2z15vc"; system = "cl-gists"; asd = "cl-gists"; @@ -16685,7 +17191,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-git" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-git/2023-06-18/cl-git-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-git/2023-06-18/cl-git-20230618-git.tgz"; sha256 = "13h7n3nbpf2qq0vq0dz33r0468baskw83pjfxb3hik4rllrv04h6"; system = "cl-git"; asd = "cl-git"; @@ -16715,7 +17221,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-github-v3" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-github-v3/2024-10-12/cl-github-v3-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-github-v3/2024-10-12/cl-github-v3-20241012-git.tgz"; sha256 = "0ayhnildyjjmnyk0a1sx7qxg6vq9kcggaprqf37s5qi4kadvcsr2"; system = "cl-github-v3"; asd = "cl-github-v3"; @@ -16740,7 +17246,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw"; asd = "cl-glfw"; @@ -16763,7 +17269,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-ftgl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-ftgl"; asd = "cl-glfw-ftgl"; @@ -16783,7 +17289,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-glu" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-glu"; asd = "cl-glfw-glu"; @@ -16806,7 +17312,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-3dfx_multisample" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-3dfx_multisample"; asd = "cl-glfw-opengl-3dfx_multisample"; @@ -16826,7 +17332,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-3dfx_tbuffer" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-3dfx_tbuffer"; asd = "cl-glfw-opengl-3dfx_tbuffer"; @@ -16846,7 +17352,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-3dfx_texture_compression_fxt1" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-3dfx_texture_compression_fxt1"; asd = "cl-glfw-opengl-3dfx_texture_compression_fxt1"; @@ -16866,7 +17372,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-amd_blend_minmax_factor" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-amd_blend_minmax_factor"; asd = "cl-glfw-opengl-amd_blend_minmax_factor"; @@ -16886,7 +17392,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-amd_depth_clamp_separate" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-amd_depth_clamp_separate"; asd = "cl-glfw-opengl-amd_depth_clamp_separate"; @@ -16906,7 +17412,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-amd_draw_buffers_blend" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-amd_draw_buffers_blend"; asd = "cl-glfw-opengl-amd_draw_buffers_blend"; @@ -16926,7 +17432,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-amd_multi_draw_indirect" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-amd_multi_draw_indirect"; asd = "cl-glfw-opengl-amd_multi_draw_indirect"; @@ -16946,7 +17452,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-amd_name_gen_delete" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-amd_name_gen_delete"; asd = "cl-glfw-opengl-amd_name_gen_delete"; @@ -16966,7 +17472,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-amd_performance_monitor" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-amd_performance_monitor"; asd = "cl-glfw-opengl-amd_performance_monitor"; @@ -16986,7 +17492,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-amd_sample_positions" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-amd_sample_positions"; asd = "cl-glfw-opengl-amd_sample_positions"; @@ -17006,7 +17512,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-amd_seamless_cubemap_per_texture" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-amd_seamless_cubemap_per_texture"; asd = "cl-glfw-opengl-amd_seamless_cubemap_per_texture"; @@ -17026,7 +17532,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-amd_vertex_shader_tesselator" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-amd_vertex_shader_tesselator"; asd = "cl-glfw-opengl-amd_vertex_shader_tesselator"; @@ -17046,7 +17552,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-apple_aux_depth_stencil" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-apple_aux_depth_stencil"; asd = "cl-glfw-opengl-apple_aux_depth_stencil"; @@ -17066,7 +17572,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-apple_client_storage" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-apple_client_storage"; asd = "cl-glfw-opengl-apple_client_storage"; @@ -17086,7 +17592,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-apple_element_array" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-apple_element_array"; asd = "cl-glfw-opengl-apple_element_array"; @@ -17106,7 +17612,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-apple_fence" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-apple_fence"; asd = "cl-glfw-opengl-apple_fence"; @@ -17126,7 +17632,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-apple_float_pixels" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-apple_float_pixels"; asd = "cl-glfw-opengl-apple_float_pixels"; @@ -17146,7 +17652,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-apple_flush_buffer_range" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-apple_flush_buffer_range"; asd = "cl-glfw-opengl-apple_flush_buffer_range"; @@ -17166,7 +17672,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-apple_object_purgeable" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-apple_object_purgeable"; asd = "cl-glfw-opengl-apple_object_purgeable"; @@ -17186,7 +17692,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-apple_rgb_422" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-apple_rgb_422"; asd = "cl-glfw-opengl-apple_rgb_422"; @@ -17206,7 +17712,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-apple_row_bytes" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-apple_row_bytes"; asd = "cl-glfw-opengl-apple_row_bytes"; @@ -17226,7 +17732,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-apple_specular_vector" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-apple_specular_vector"; asd = "cl-glfw-opengl-apple_specular_vector"; @@ -17246,7 +17752,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-apple_texture_range" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-apple_texture_range"; asd = "cl-glfw-opengl-apple_texture_range"; @@ -17266,7 +17772,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-apple_transform_hint" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-apple_transform_hint"; asd = "cl-glfw-opengl-apple_transform_hint"; @@ -17286,7 +17792,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-apple_vertex_array_object" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-apple_vertex_array_object"; asd = "cl-glfw-opengl-apple_vertex_array_object"; @@ -17306,7 +17812,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-apple_vertex_array_range" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-apple_vertex_array_range"; asd = "cl-glfw-opengl-apple_vertex_array_range"; @@ -17326,7 +17832,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-apple_vertex_program_evaluators" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-apple_vertex_program_evaluators"; asd = "cl-glfw-opengl-apple_vertex_program_evaluators"; @@ -17346,7 +17852,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-apple_ycbcr_422" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-apple_ycbcr_422"; asd = "cl-glfw-opengl-apple_ycbcr_422"; @@ -17366,7 +17872,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_blend_func_extended" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_blend_func_extended"; asd = "cl-glfw-opengl-arb_blend_func_extended"; @@ -17386,7 +17892,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_color_buffer_float" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_color_buffer_float"; asd = "cl-glfw-opengl-arb_color_buffer_float"; @@ -17406,7 +17912,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_copy_buffer" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_copy_buffer"; asd = "cl-glfw-opengl-arb_copy_buffer"; @@ -17426,7 +17932,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_depth_buffer_float" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_depth_buffer_float"; asd = "cl-glfw-opengl-arb_depth_buffer_float"; @@ -17446,7 +17952,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_depth_clamp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_depth_clamp"; asd = "cl-glfw-opengl-arb_depth_clamp"; @@ -17466,7 +17972,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_depth_texture" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_depth_texture"; asd = "cl-glfw-opengl-arb_depth_texture"; @@ -17486,7 +17992,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_draw_buffers" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_draw_buffers"; asd = "cl-glfw-opengl-arb_draw_buffers"; @@ -17506,7 +18012,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_draw_buffers_blend" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_draw_buffers_blend"; asd = "cl-glfw-opengl-arb_draw_buffers_blend"; @@ -17526,7 +18032,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_draw_elements_base_vertex" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_draw_elements_base_vertex"; asd = "cl-glfw-opengl-arb_draw_elements_base_vertex"; @@ -17546,7 +18052,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_draw_indirect" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_draw_indirect"; asd = "cl-glfw-opengl-arb_draw_indirect"; @@ -17566,7 +18072,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_draw_instanced" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_draw_instanced"; asd = "cl-glfw-opengl-arb_draw_instanced"; @@ -17586,7 +18092,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_es2_compatibility" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_es2_compatibility"; asd = "cl-glfw-opengl-arb_es2_compatibility"; @@ -17606,7 +18112,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_fragment_program" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_fragment_program"; asd = "cl-glfw-opengl-arb_fragment_program"; @@ -17626,7 +18132,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_fragment_shader" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_fragment_shader"; asd = "cl-glfw-opengl-arb_fragment_shader"; @@ -17646,7 +18152,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_framebuffer_object" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_framebuffer_object"; asd = "cl-glfw-opengl-arb_framebuffer_object"; @@ -17666,7 +18172,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_framebuffer_object_deprecated" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_framebuffer_object_deprecated"; asd = "cl-glfw-opengl-arb_framebuffer_object_deprecated"; @@ -17686,7 +18192,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_framebuffer_srgb" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_framebuffer_srgb"; asd = "cl-glfw-opengl-arb_framebuffer_srgb"; @@ -17706,7 +18212,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_geometry_shader4" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_geometry_shader4"; asd = "cl-glfw-opengl-arb_geometry_shader4"; @@ -17726,7 +18232,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_get_program_binary" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_get_program_binary"; asd = "cl-glfw-opengl-arb_get_program_binary"; @@ -17746,7 +18252,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_gpu_shader5" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_gpu_shader5"; asd = "cl-glfw-opengl-arb_gpu_shader5"; @@ -17766,7 +18272,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_gpu_shader_fp64" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_gpu_shader_fp64"; asd = "cl-glfw-opengl-arb_gpu_shader_fp64"; @@ -17786,7 +18292,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_half_float_pixel" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_half_float_pixel"; asd = "cl-glfw-opengl-arb_half_float_pixel"; @@ -17806,7 +18312,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_half_float_vertex" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_half_float_vertex"; asd = "cl-glfw-opengl-arb_half_float_vertex"; @@ -17826,7 +18332,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_imaging" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_imaging"; asd = "cl-glfw-opengl-arb_imaging"; @@ -17846,7 +18352,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_imaging_deprecated" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_imaging_deprecated"; asd = "cl-glfw-opengl-arb_imaging_deprecated"; @@ -17866,7 +18372,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_instanced_arrays" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_instanced_arrays"; asd = "cl-glfw-opengl-arb_instanced_arrays"; @@ -17886,7 +18392,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_map_buffer_range" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_map_buffer_range"; asd = "cl-glfw-opengl-arb_map_buffer_range"; @@ -17906,7 +18412,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_matrix_palette" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_matrix_palette"; asd = "cl-glfw-opengl-arb_matrix_palette"; @@ -17926,7 +18432,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_multisample" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_multisample"; asd = "cl-glfw-opengl-arb_multisample"; @@ -17946,7 +18452,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_multitexture" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_multitexture"; asd = "cl-glfw-opengl-arb_multitexture"; @@ -17966,7 +18472,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_occlusion_query" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_occlusion_query"; asd = "cl-glfw-opengl-arb_occlusion_query"; @@ -17986,7 +18492,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_occlusion_query2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_occlusion_query2"; asd = "cl-glfw-opengl-arb_occlusion_query2"; @@ -18006,7 +18512,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_pixel_buffer_object" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_pixel_buffer_object"; asd = "cl-glfw-opengl-arb_pixel_buffer_object"; @@ -18026,7 +18532,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_point_parameters" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_point_parameters"; asd = "cl-glfw-opengl-arb_point_parameters"; @@ -18046,7 +18552,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_point_sprite" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_point_sprite"; asd = "cl-glfw-opengl-arb_point_sprite"; @@ -18066,7 +18572,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_provoking_vertex" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_provoking_vertex"; asd = "cl-glfw-opengl-arb_provoking_vertex"; @@ -18086,7 +18592,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_robustness" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_robustness"; asd = "cl-glfw-opengl-arb_robustness"; @@ -18106,7 +18612,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_sample_shading" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_sample_shading"; asd = "cl-glfw-opengl-arb_sample_shading"; @@ -18126,7 +18632,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_sampler_objects" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_sampler_objects"; asd = "cl-glfw-opengl-arb_sampler_objects"; @@ -18146,7 +18652,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_seamless_cube_map" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_seamless_cube_map"; asd = "cl-glfw-opengl-arb_seamless_cube_map"; @@ -18166,7 +18672,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_separate_shader_objects" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_separate_shader_objects"; asd = "cl-glfw-opengl-arb_separate_shader_objects"; @@ -18186,7 +18692,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_shader_objects" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_shader_objects"; asd = "cl-glfw-opengl-arb_shader_objects"; @@ -18206,7 +18712,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_shader_subroutine" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_shader_subroutine"; asd = "cl-glfw-opengl-arb_shader_subroutine"; @@ -18226,7 +18732,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_shading_language_100" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_shading_language_100"; asd = "cl-glfw-opengl-arb_shading_language_100"; @@ -18246,7 +18752,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_shading_language_include" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_shading_language_include"; asd = "cl-glfw-opengl-arb_shading_language_include"; @@ -18266,7 +18772,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_shadow" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_shadow"; asd = "cl-glfw-opengl-arb_shadow"; @@ -18286,7 +18792,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_shadow_ambient" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_shadow_ambient"; asd = "cl-glfw-opengl-arb_shadow_ambient"; @@ -18306,7 +18812,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_tessellation_shader" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_tessellation_shader"; asd = "cl-glfw-opengl-arb_tessellation_shader"; @@ -18326,7 +18832,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_texture_border_clamp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_texture_border_clamp"; asd = "cl-glfw-opengl-arb_texture_border_clamp"; @@ -18346,7 +18852,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_texture_buffer_object" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_texture_buffer_object"; asd = "cl-glfw-opengl-arb_texture_buffer_object"; @@ -18366,7 +18872,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_texture_buffer_object_rgb32" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_texture_buffer_object_rgb32"; asd = "cl-glfw-opengl-arb_texture_buffer_object_rgb32"; @@ -18386,7 +18892,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_texture_compression" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_texture_compression"; asd = "cl-glfw-opengl-arb_texture_compression"; @@ -18406,7 +18912,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_texture_compression_bptc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_texture_compression_bptc"; asd = "cl-glfw-opengl-arb_texture_compression_bptc"; @@ -18426,7 +18932,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_texture_compression_rgtc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_texture_compression_rgtc"; asd = "cl-glfw-opengl-arb_texture_compression_rgtc"; @@ -18446,7 +18952,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_texture_cube_map" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_texture_cube_map"; asd = "cl-glfw-opengl-arb_texture_cube_map"; @@ -18466,7 +18972,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_texture_cube_map_array" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_texture_cube_map_array"; asd = "cl-glfw-opengl-arb_texture_cube_map_array"; @@ -18486,7 +18992,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_texture_env_combine" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_texture_env_combine"; asd = "cl-glfw-opengl-arb_texture_env_combine"; @@ -18506,7 +19012,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_texture_env_dot3" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_texture_env_dot3"; asd = "cl-glfw-opengl-arb_texture_env_dot3"; @@ -18526,7 +19032,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_texture_float" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_texture_float"; asd = "cl-glfw-opengl-arb_texture_float"; @@ -18546,7 +19052,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_texture_gather" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_texture_gather"; asd = "cl-glfw-opengl-arb_texture_gather"; @@ -18566,7 +19072,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_texture_mirrored_repeat" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_texture_mirrored_repeat"; asd = "cl-glfw-opengl-arb_texture_mirrored_repeat"; @@ -18586,7 +19092,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_texture_multisample" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_texture_multisample"; asd = "cl-glfw-opengl-arb_texture_multisample"; @@ -18606,7 +19112,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_texture_rectangle" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_texture_rectangle"; asd = "cl-glfw-opengl-arb_texture_rectangle"; @@ -18626,7 +19132,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_texture_rg" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_texture_rg"; asd = "cl-glfw-opengl-arb_texture_rg"; @@ -18646,7 +19152,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_texture_rgb10_a2ui" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_texture_rgb10_a2ui"; asd = "cl-glfw-opengl-arb_texture_rgb10_a2ui"; @@ -18666,7 +19172,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_texture_swizzle" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_texture_swizzle"; asd = "cl-glfw-opengl-arb_texture_swizzle"; @@ -18686,7 +19192,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_timer_query" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_timer_query"; asd = "cl-glfw-opengl-arb_timer_query"; @@ -18706,7 +19212,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_transform_feedback2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_transform_feedback2"; asd = "cl-glfw-opengl-arb_transform_feedback2"; @@ -18726,7 +19232,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_transpose_matrix" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_transpose_matrix"; asd = "cl-glfw-opengl-arb_transpose_matrix"; @@ -18746,7 +19252,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_uniform_buffer_object" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_uniform_buffer_object"; asd = "cl-glfw-opengl-arb_uniform_buffer_object"; @@ -18766,7 +19272,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_vertex_array_bgra" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_vertex_array_bgra"; asd = "cl-glfw-opengl-arb_vertex_array_bgra"; @@ -18786,7 +19292,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_vertex_array_object" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_vertex_array_object"; asd = "cl-glfw-opengl-arb_vertex_array_object"; @@ -18806,7 +19312,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_vertex_attrib_64bit" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_vertex_attrib_64bit"; asd = "cl-glfw-opengl-arb_vertex_attrib_64bit"; @@ -18826,7 +19332,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_vertex_blend" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_vertex_blend"; asd = "cl-glfw-opengl-arb_vertex_blend"; @@ -18846,7 +19352,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_vertex_buffer_object" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_vertex_buffer_object"; asd = "cl-glfw-opengl-arb_vertex_buffer_object"; @@ -18866,7 +19372,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_vertex_program" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_vertex_program"; asd = "cl-glfw-opengl-arb_vertex_program"; @@ -18886,7 +19392,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_vertex_shader" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_vertex_shader"; asd = "cl-glfw-opengl-arb_vertex_shader"; @@ -18906,7 +19412,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_vertex_type_2_10_10_10_rev" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_vertex_type_2_10_10_10_rev"; asd = "cl-glfw-opengl-arb_vertex_type_2_10_10_10_rev"; @@ -18926,7 +19432,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_viewport_array" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_viewport_array"; asd = "cl-glfw-opengl-arb_viewport_array"; @@ -18946,7 +19452,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-arb_window_pos" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-arb_window_pos"; asd = "cl-glfw-opengl-arb_window_pos"; @@ -18966,7 +19472,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ati_draw_buffers" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ati_draw_buffers"; asd = "cl-glfw-opengl-ati_draw_buffers"; @@ -18986,7 +19492,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ati_element_array" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ati_element_array"; asd = "cl-glfw-opengl-ati_element_array"; @@ -19006,7 +19512,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ati_envmap_bumpmap" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ati_envmap_bumpmap"; asd = "cl-glfw-opengl-ati_envmap_bumpmap"; @@ -19026,7 +19532,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ati_fragment_shader" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ati_fragment_shader"; asd = "cl-glfw-opengl-ati_fragment_shader"; @@ -19046,7 +19552,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ati_map_object_buffer" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ati_map_object_buffer"; asd = "cl-glfw-opengl-ati_map_object_buffer"; @@ -19066,7 +19572,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ati_meminfo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ati_meminfo"; asd = "cl-glfw-opengl-ati_meminfo"; @@ -19086,7 +19592,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ati_pixel_format_float" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ati_pixel_format_float"; asd = "cl-glfw-opengl-ati_pixel_format_float"; @@ -19106,7 +19612,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ati_pn_triangles" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ati_pn_triangles"; asd = "cl-glfw-opengl-ati_pn_triangles"; @@ -19126,7 +19632,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ati_separate_stencil" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ati_separate_stencil"; asd = "cl-glfw-opengl-ati_separate_stencil"; @@ -19146,7 +19652,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ati_text_fragment_shader" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ati_text_fragment_shader"; asd = "cl-glfw-opengl-ati_text_fragment_shader"; @@ -19166,7 +19672,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ati_texture_env_combine3" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ati_texture_env_combine3"; asd = "cl-glfw-opengl-ati_texture_env_combine3"; @@ -19186,7 +19692,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ati_texture_float" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ati_texture_float"; asd = "cl-glfw-opengl-ati_texture_float"; @@ -19206,7 +19712,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ati_texture_mirror_once" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ati_texture_mirror_once"; asd = "cl-glfw-opengl-ati_texture_mirror_once"; @@ -19226,7 +19732,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ati_vertex_array_object" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ati_vertex_array_object"; asd = "cl-glfw-opengl-ati_vertex_array_object"; @@ -19246,7 +19752,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ati_vertex_attrib_array_object" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ati_vertex_attrib_array_object"; asd = "cl-glfw-opengl-ati_vertex_attrib_array_object"; @@ -19266,7 +19772,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ati_vertex_streams" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ati_vertex_streams"; asd = "cl-glfw-opengl-ati_vertex_streams"; @@ -19286,7 +19792,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-core" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-core"; asd = "cl-glfw-opengl-core"; @@ -19309,7 +19815,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_422_pixels" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_422_pixels"; asd = "cl-glfw-opengl-ext_422_pixels"; @@ -19329,7 +19835,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_abgr" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_abgr"; asd = "cl-glfw-opengl-ext_abgr"; @@ -19349,7 +19855,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_bgra" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_bgra"; asd = "cl-glfw-opengl-ext_bgra"; @@ -19369,7 +19875,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_bindable_uniform" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_bindable_uniform"; asd = "cl-glfw-opengl-ext_bindable_uniform"; @@ -19389,7 +19895,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_blend_color" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_blend_color"; asd = "cl-glfw-opengl-ext_blend_color"; @@ -19409,7 +19915,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_blend_equation_separate" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_blend_equation_separate"; asd = "cl-glfw-opengl-ext_blend_equation_separate"; @@ -19429,7 +19935,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_blend_func_separate" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_blend_func_separate"; asd = "cl-glfw-opengl-ext_blend_func_separate"; @@ -19449,7 +19955,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_blend_minmax" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_blend_minmax"; asd = "cl-glfw-opengl-ext_blend_minmax"; @@ -19469,7 +19975,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_blend_subtract" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_blend_subtract"; asd = "cl-glfw-opengl-ext_blend_subtract"; @@ -19489,7 +19995,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_clip_volume_hint" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_clip_volume_hint"; asd = "cl-glfw-opengl-ext_clip_volume_hint"; @@ -19509,7 +20015,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_cmyka" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_cmyka"; asd = "cl-glfw-opengl-ext_cmyka"; @@ -19529,7 +20035,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_color_subtable" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_color_subtable"; asd = "cl-glfw-opengl-ext_color_subtable"; @@ -19549,7 +20055,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_compiled_vertex_array" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_compiled_vertex_array"; asd = "cl-glfw-opengl-ext_compiled_vertex_array"; @@ -19569,7 +20075,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_convolution" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_convolution"; asd = "cl-glfw-opengl-ext_convolution"; @@ -19589,7 +20095,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_coordinate_frame" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_coordinate_frame"; asd = "cl-glfw-opengl-ext_coordinate_frame"; @@ -19609,7 +20115,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_copy_texture" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_copy_texture"; asd = "cl-glfw-opengl-ext_copy_texture"; @@ -19629,7 +20135,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_cull_vertex" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_cull_vertex"; asd = "cl-glfw-opengl-ext_cull_vertex"; @@ -19649,7 +20155,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_depth_bounds_test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_depth_bounds_test"; asd = "cl-glfw-opengl-ext_depth_bounds_test"; @@ -19669,7 +20175,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_direct_state_access" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_direct_state_access"; asd = "cl-glfw-opengl-ext_direct_state_access"; @@ -19689,7 +20195,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_draw_buffers2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_draw_buffers2"; asd = "cl-glfw-opengl-ext_draw_buffers2"; @@ -19709,7 +20215,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_draw_instanced" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_draw_instanced"; asd = "cl-glfw-opengl-ext_draw_instanced"; @@ -19729,7 +20235,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_draw_range_elements" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_draw_range_elements"; asd = "cl-glfw-opengl-ext_draw_range_elements"; @@ -19749,7 +20255,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_fog_coord" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_fog_coord"; asd = "cl-glfw-opengl-ext_fog_coord"; @@ -19769,7 +20275,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_framebuffer_blit" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_framebuffer_blit"; asd = "cl-glfw-opengl-ext_framebuffer_blit"; @@ -19789,7 +20295,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_framebuffer_multisample" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_framebuffer_multisample"; asd = "cl-glfw-opengl-ext_framebuffer_multisample"; @@ -19809,7 +20315,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_framebuffer_object" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_framebuffer_object"; asd = "cl-glfw-opengl-ext_framebuffer_object"; @@ -19829,7 +20335,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_framebuffer_srgb" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_framebuffer_srgb"; asd = "cl-glfw-opengl-ext_framebuffer_srgb"; @@ -19849,7 +20355,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_geometry_shader4" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_geometry_shader4"; asd = "cl-glfw-opengl-ext_geometry_shader4"; @@ -19869,7 +20375,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_gpu_program_parameters" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_gpu_program_parameters"; asd = "cl-glfw-opengl-ext_gpu_program_parameters"; @@ -19889,7 +20395,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_gpu_shader4" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_gpu_shader4"; asd = "cl-glfw-opengl-ext_gpu_shader4"; @@ -19909,7 +20415,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_histogram" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_histogram"; asd = "cl-glfw-opengl-ext_histogram"; @@ -19929,7 +20435,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_index_array_formats" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_index_array_formats"; asd = "cl-glfw-opengl-ext_index_array_formats"; @@ -19949,7 +20455,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_index_func" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_index_func"; asd = "cl-glfw-opengl-ext_index_func"; @@ -19969,7 +20475,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_index_material" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_index_material"; asd = "cl-glfw-opengl-ext_index_material"; @@ -19989,7 +20495,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_light_texture" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_light_texture"; asd = "cl-glfw-opengl-ext_light_texture"; @@ -20009,7 +20515,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_multi_draw_arrays" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_multi_draw_arrays"; asd = "cl-glfw-opengl-ext_multi_draw_arrays"; @@ -20029,7 +20535,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_multisample" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_multisample"; asd = "cl-glfw-opengl-ext_multisample"; @@ -20049,7 +20555,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_packed_depth_stencil" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_packed_depth_stencil"; asd = "cl-glfw-opengl-ext_packed_depth_stencil"; @@ -20069,7 +20575,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_packed_float" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_packed_float"; asd = "cl-glfw-opengl-ext_packed_float"; @@ -20089,7 +20595,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_packed_pixels" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_packed_pixels"; asd = "cl-glfw-opengl-ext_packed_pixels"; @@ -20109,7 +20615,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_paletted_texture" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_paletted_texture"; asd = "cl-glfw-opengl-ext_paletted_texture"; @@ -20129,7 +20635,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_pixel_buffer_object" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_pixel_buffer_object"; asd = "cl-glfw-opengl-ext_pixel_buffer_object"; @@ -20149,7 +20655,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_pixel_transform" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_pixel_transform"; asd = "cl-glfw-opengl-ext_pixel_transform"; @@ -20169,7 +20675,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_point_parameters" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_point_parameters"; asd = "cl-glfw-opengl-ext_point_parameters"; @@ -20189,7 +20695,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_polygon_offset" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_polygon_offset"; asd = "cl-glfw-opengl-ext_polygon_offset"; @@ -20209,7 +20715,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_provoking_vertex" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_provoking_vertex"; asd = "cl-glfw-opengl-ext_provoking_vertex"; @@ -20229,7 +20735,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_secondary_color" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_secondary_color"; asd = "cl-glfw-opengl-ext_secondary_color"; @@ -20249,7 +20755,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_separate_shader_objects" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_separate_shader_objects"; asd = "cl-glfw-opengl-ext_separate_shader_objects"; @@ -20269,7 +20775,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_separate_specular_color" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_separate_specular_color"; asd = "cl-glfw-opengl-ext_separate_specular_color"; @@ -20289,7 +20795,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_shader_image_load_store" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_shader_image_load_store"; asd = "cl-glfw-opengl-ext_shader_image_load_store"; @@ -20309,7 +20815,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_stencil_clear_tag" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_stencil_clear_tag"; asd = "cl-glfw-opengl-ext_stencil_clear_tag"; @@ -20329,7 +20835,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_stencil_two_side" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_stencil_two_side"; asd = "cl-glfw-opengl-ext_stencil_two_side"; @@ -20349,7 +20855,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_stencil_wrap" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_stencil_wrap"; asd = "cl-glfw-opengl-ext_stencil_wrap"; @@ -20369,7 +20875,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_subtexture" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_subtexture"; asd = "cl-glfw-opengl-ext_subtexture"; @@ -20389,7 +20895,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_texture" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_texture"; asd = "cl-glfw-opengl-ext_texture"; @@ -20409,7 +20915,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_texture3d" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_texture3d"; asd = "cl-glfw-opengl-ext_texture3d"; @@ -20429,7 +20935,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_texture_array" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_texture_array"; asd = "cl-glfw-opengl-ext_texture_array"; @@ -20449,7 +20955,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_texture_buffer_object" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_texture_buffer_object"; asd = "cl-glfw-opengl-ext_texture_buffer_object"; @@ -20469,7 +20975,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_texture_compression_latc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_texture_compression_latc"; asd = "cl-glfw-opengl-ext_texture_compression_latc"; @@ -20489,7 +20995,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_texture_compression_rgtc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_texture_compression_rgtc"; asd = "cl-glfw-opengl-ext_texture_compression_rgtc"; @@ -20509,7 +21015,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_texture_compression_s3tc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_texture_compression_s3tc"; asd = "cl-glfw-opengl-ext_texture_compression_s3tc"; @@ -20529,7 +21035,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_texture_cube_map" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_texture_cube_map"; asd = "cl-glfw-opengl-ext_texture_cube_map"; @@ -20549,7 +21055,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_texture_env_combine" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_texture_env_combine"; asd = "cl-glfw-opengl-ext_texture_env_combine"; @@ -20569,7 +21075,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_texture_env_dot3" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_texture_env_dot3"; asd = "cl-glfw-opengl-ext_texture_env_dot3"; @@ -20589,7 +21095,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_texture_filter_anisotropic" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_texture_filter_anisotropic"; asd = "cl-glfw-opengl-ext_texture_filter_anisotropic"; @@ -20609,7 +21115,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_texture_integer" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_texture_integer"; asd = "cl-glfw-opengl-ext_texture_integer"; @@ -20629,7 +21135,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_texture_lod_bias" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_texture_lod_bias"; asd = "cl-glfw-opengl-ext_texture_lod_bias"; @@ -20649,7 +21155,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_texture_mirror_clamp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_texture_mirror_clamp"; asd = "cl-glfw-opengl-ext_texture_mirror_clamp"; @@ -20669,7 +21175,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_texture_object" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_texture_object"; asd = "cl-glfw-opengl-ext_texture_object"; @@ -20689,7 +21195,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_texture_perturb_normal" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_texture_perturb_normal"; asd = "cl-glfw-opengl-ext_texture_perturb_normal"; @@ -20709,7 +21215,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_texture_shared_exponent" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_texture_shared_exponent"; asd = "cl-glfw-opengl-ext_texture_shared_exponent"; @@ -20729,7 +21235,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_texture_snorm" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_texture_snorm"; asd = "cl-glfw-opengl-ext_texture_snorm"; @@ -20749,7 +21255,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_texture_srgb" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_texture_srgb"; asd = "cl-glfw-opengl-ext_texture_srgb"; @@ -20769,7 +21275,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_texture_srgb_decode" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_texture_srgb_decode"; asd = "cl-glfw-opengl-ext_texture_srgb_decode"; @@ -20789,7 +21295,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_texture_swizzle" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_texture_swizzle"; asd = "cl-glfw-opengl-ext_texture_swizzle"; @@ -20809,7 +21315,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_timer_query" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_timer_query"; asd = "cl-glfw-opengl-ext_timer_query"; @@ -20829,7 +21335,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_transform_feedback" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_transform_feedback"; asd = "cl-glfw-opengl-ext_transform_feedback"; @@ -20849,7 +21355,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_vertex_array" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_vertex_array"; asd = "cl-glfw-opengl-ext_vertex_array"; @@ -20869,7 +21375,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_vertex_array_bgra" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_vertex_array_bgra"; asd = "cl-glfw-opengl-ext_vertex_array_bgra"; @@ -20889,7 +21395,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_vertex_attrib_64bit" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_vertex_attrib_64bit"; asd = "cl-glfw-opengl-ext_vertex_attrib_64bit"; @@ -20909,7 +21415,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_vertex_shader" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_vertex_shader"; asd = "cl-glfw-opengl-ext_vertex_shader"; @@ -20929,7 +21435,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ext_vertex_weighting" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ext_vertex_weighting"; asd = "cl-glfw-opengl-ext_vertex_weighting"; @@ -20949,7 +21455,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-gremedy_frame_terminator" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-gremedy_frame_terminator"; asd = "cl-glfw-opengl-gremedy_frame_terminator"; @@ -20969,7 +21475,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-gremedy_string_marker" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-gremedy_string_marker"; asd = "cl-glfw-opengl-gremedy_string_marker"; @@ -20989,7 +21495,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-hp_convolution_border_modes" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-hp_convolution_border_modes"; asd = "cl-glfw-opengl-hp_convolution_border_modes"; @@ -21009,7 +21515,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-hp_image_transform" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-hp_image_transform"; asd = "cl-glfw-opengl-hp_image_transform"; @@ -21029,7 +21535,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-hp_occlusion_test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-hp_occlusion_test"; asd = "cl-glfw-opengl-hp_occlusion_test"; @@ -21049,7 +21555,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-hp_texture_lighting" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-hp_texture_lighting"; asd = "cl-glfw-opengl-hp_texture_lighting"; @@ -21069,7 +21575,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ibm_cull_vertex" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ibm_cull_vertex"; asd = "cl-glfw-opengl-ibm_cull_vertex"; @@ -21089,7 +21595,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ibm_multimode_draw_arrays" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ibm_multimode_draw_arrays"; asd = "cl-glfw-opengl-ibm_multimode_draw_arrays"; @@ -21109,7 +21615,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ibm_rasterpos_clip" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ibm_rasterpos_clip"; asd = "cl-glfw-opengl-ibm_rasterpos_clip"; @@ -21129,7 +21635,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ibm_texture_mirrored_repeat" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ibm_texture_mirrored_repeat"; asd = "cl-glfw-opengl-ibm_texture_mirrored_repeat"; @@ -21149,7 +21655,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ibm_vertex_array_lists" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ibm_vertex_array_lists"; asd = "cl-glfw-opengl-ibm_vertex_array_lists"; @@ -21169,7 +21675,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ingr_blend_func_separate" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ingr_blend_func_separate"; asd = "cl-glfw-opengl-ingr_blend_func_separate"; @@ -21189,7 +21695,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ingr_color_clamp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ingr_color_clamp"; asd = "cl-glfw-opengl-ingr_color_clamp"; @@ -21209,7 +21715,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-ingr_interlace_read" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-ingr_interlace_read"; asd = "cl-glfw-opengl-ingr_interlace_read"; @@ -21229,7 +21735,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-intel_parallel_arrays" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-intel_parallel_arrays"; asd = "cl-glfw-opengl-intel_parallel_arrays"; @@ -21249,7 +21755,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-mesa_pack_invert" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-mesa_pack_invert"; asd = "cl-glfw-opengl-mesa_pack_invert"; @@ -21269,7 +21775,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-mesa_packed_depth_stencil" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-mesa_packed_depth_stencil"; asd = "cl-glfw-opengl-mesa_packed_depth_stencil"; @@ -21289,7 +21795,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-mesa_program_debug" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-mesa_program_debug"; asd = "cl-glfw-opengl-mesa_program_debug"; @@ -21309,7 +21815,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-mesa_resize_buffers" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-mesa_resize_buffers"; asd = "cl-glfw-opengl-mesa_resize_buffers"; @@ -21329,7 +21835,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-mesa_shader_debug" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-mesa_shader_debug"; asd = "cl-glfw-opengl-mesa_shader_debug"; @@ -21349,7 +21855,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-mesa_trace" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-mesa_trace"; asd = "cl-glfw-opengl-mesa_trace"; @@ -21369,7 +21875,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-mesa_window_pos" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-mesa_window_pos"; asd = "cl-glfw-opengl-mesa_window_pos"; @@ -21389,7 +21895,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-mesa_ycbcr_texture" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-mesa_ycbcr_texture"; asd = "cl-glfw-opengl-mesa_ycbcr_texture"; @@ -21409,7 +21915,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-mesax_texture_stack" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-mesax_texture_stack"; asd = "cl-glfw-opengl-mesax_texture_stack"; @@ -21429,7 +21935,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_conditional_render" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_conditional_render"; asd = "cl-glfw-opengl-nv_conditional_render"; @@ -21449,7 +21955,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_copy_depth_to_color" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_copy_depth_to_color"; asd = "cl-glfw-opengl-nv_copy_depth_to_color"; @@ -21469,7 +21975,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_copy_image" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_copy_image"; asd = "cl-glfw-opengl-nv_copy_image"; @@ -21489,7 +21995,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_depth_buffer_float" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_depth_buffer_float"; asd = "cl-glfw-opengl-nv_depth_buffer_float"; @@ -21509,7 +22015,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_depth_clamp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_depth_clamp"; asd = "cl-glfw-opengl-nv_depth_clamp"; @@ -21529,7 +22035,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_evaluators" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_evaluators"; asd = "cl-glfw-opengl-nv_evaluators"; @@ -21549,7 +22055,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_explicit_multisample" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_explicit_multisample"; asd = "cl-glfw-opengl-nv_explicit_multisample"; @@ -21569,7 +22075,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_fence" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_fence"; asd = "cl-glfw-opengl-nv_fence"; @@ -21589,7 +22095,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_float_buffer" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_float_buffer"; asd = "cl-glfw-opengl-nv_float_buffer"; @@ -21609,7 +22115,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_fog_distance" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_fog_distance"; asd = "cl-glfw-opengl-nv_fog_distance"; @@ -21629,7 +22135,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_fragment_program" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_fragment_program"; asd = "cl-glfw-opengl-nv_fragment_program"; @@ -21649,7 +22155,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_fragment_program2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_fragment_program2"; asd = "cl-glfw-opengl-nv_fragment_program2"; @@ -21669,7 +22175,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_framebuffer_multisample_coverage" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_framebuffer_multisample_coverage"; asd = "cl-glfw-opengl-nv_framebuffer_multisample_coverage"; @@ -21689,7 +22195,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_geometry_program4" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_geometry_program4"; asd = "cl-glfw-opengl-nv_geometry_program4"; @@ -21709,7 +22215,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_gpu_program4" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_gpu_program4"; asd = "cl-glfw-opengl-nv_gpu_program4"; @@ -21729,7 +22235,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_gpu_program5" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_gpu_program5"; asd = "cl-glfw-opengl-nv_gpu_program5"; @@ -21749,7 +22255,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_gpu_shader5" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_gpu_shader5"; asd = "cl-glfw-opengl-nv_gpu_shader5"; @@ -21769,7 +22275,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_half_float" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_half_float"; asd = "cl-glfw-opengl-nv_half_float"; @@ -21789,7 +22295,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_light_max_exponent" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_light_max_exponent"; asd = "cl-glfw-opengl-nv_light_max_exponent"; @@ -21809,7 +22315,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_multisample_coverage" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_multisample_coverage"; asd = "cl-glfw-opengl-nv_multisample_coverage"; @@ -21829,7 +22335,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_multisample_filter_hint" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_multisample_filter_hint"; asd = "cl-glfw-opengl-nv_multisample_filter_hint"; @@ -21849,7 +22355,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_occlusion_query" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_occlusion_query"; asd = "cl-glfw-opengl-nv_occlusion_query"; @@ -21869,7 +22375,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_packed_depth_stencil" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_packed_depth_stencil"; asd = "cl-glfw-opengl-nv_packed_depth_stencil"; @@ -21889,7 +22395,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_parameter_buffer_object" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_parameter_buffer_object"; asd = "cl-glfw-opengl-nv_parameter_buffer_object"; @@ -21909,7 +22415,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_pixel_data_range" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_pixel_data_range"; asd = "cl-glfw-opengl-nv_pixel_data_range"; @@ -21929,7 +22435,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_point_sprite" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_point_sprite"; asd = "cl-glfw-opengl-nv_point_sprite"; @@ -21949,7 +22455,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_present_video" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_present_video"; asd = "cl-glfw-opengl-nv_present_video"; @@ -21969,7 +22475,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_primitive_restart" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_primitive_restart"; asd = "cl-glfw-opengl-nv_primitive_restart"; @@ -21989,7 +22495,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_register_combiners" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_register_combiners"; asd = "cl-glfw-opengl-nv_register_combiners"; @@ -22009,7 +22515,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_register_combiners2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_register_combiners2"; asd = "cl-glfw-opengl-nv_register_combiners2"; @@ -22029,7 +22535,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_shader_buffer_load" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_shader_buffer_load"; asd = "cl-glfw-opengl-nv_shader_buffer_load"; @@ -22049,7 +22555,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_shader_buffer_store" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_shader_buffer_store"; asd = "cl-glfw-opengl-nv_shader_buffer_store"; @@ -22069,7 +22575,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_tessellation_program5" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_tessellation_program5"; asd = "cl-glfw-opengl-nv_tessellation_program5"; @@ -22089,7 +22595,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_texgen_emboss" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_texgen_emboss"; asd = "cl-glfw-opengl-nv_texgen_emboss"; @@ -22109,7 +22615,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_texgen_reflection" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_texgen_reflection"; asd = "cl-glfw-opengl-nv_texgen_reflection"; @@ -22129,7 +22635,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_texture_barrier" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_texture_barrier"; asd = "cl-glfw-opengl-nv_texture_barrier"; @@ -22149,7 +22655,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_texture_env_combine4" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_texture_env_combine4"; asd = "cl-glfw-opengl-nv_texture_env_combine4"; @@ -22169,7 +22675,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_texture_expand_normal" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_texture_expand_normal"; asd = "cl-glfw-opengl-nv_texture_expand_normal"; @@ -22189,7 +22695,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_texture_multisample" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_texture_multisample"; asd = "cl-glfw-opengl-nv_texture_multisample"; @@ -22209,7 +22715,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_texture_rectangle" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_texture_rectangle"; asd = "cl-glfw-opengl-nv_texture_rectangle"; @@ -22229,7 +22735,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_texture_shader" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_texture_shader"; asd = "cl-glfw-opengl-nv_texture_shader"; @@ -22249,7 +22755,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_texture_shader2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_texture_shader2"; asd = "cl-glfw-opengl-nv_texture_shader2"; @@ -22269,7 +22775,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_texture_shader3" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_texture_shader3"; asd = "cl-glfw-opengl-nv_texture_shader3"; @@ -22289,7 +22795,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_transform_feedback" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_transform_feedback"; asd = "cl-glfw-opengl-nv_transform_feedback"; @@ -22309,7 +22815,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_transform_feedback2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_transform_feedback2"; asd = "cl-glfw-opengl-nv_transform_feedback2"; @@ -22329,7 +22835,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_vertex_array_range" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_vertex_array_range"; asd = "cl-glfw-opengl-nv_vertex_array_range"; @@ -22349,7 +22855,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_vertex_array_range2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_vertex_array_range2"; asd = "cl-glfw-opengl-nv_vertex_array_range2"; @@ -22369,7 +22875,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_vertex_attrib_integer_64bit" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_vertex_attrib_integer_64bit"; asd = "cl-glfw-opengl-nv_vertex_attrib_integer_64bit"; @@ -22389,7 +22895,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_vertex_buffer_unified_memory" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_vertex_buffer_unified_memory"; asd = "cl-glfw-opengl-nv_vertex_buffer_unified_memory"; @@ -22409,7 +22915,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_vertex_program" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_vertex_program"; asd = "cl-glfw-opengl-nv_vertex_program"; @@ -22429,7 +22935,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_vertex_program2_option" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_vertex_program2_option"; asd = "cl-glfw-opengl-nv_vertex_program2_option"; @@ -22449,7 +22955,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_vertex_program3" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_vertex_program3"; asd = "cl-glfw-opengl-nv_vertex_program3"; @@ -22469,7 +22975,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-nv_vertex_program4" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-nv_vertex_program4"; asd = "cl-glfw-opengl-nv_vertex_program4"; @@ -22489,7 +22995,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-oes_read_format" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-oes_read_format"; asd = "cl-glfw-opengl-oes_read_format"; @@ -22509,7 +23015,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-oml_interlace" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-oml_interlace"; asd = "cl-glfw-opengl-oml_interlace"; @@ -22529,7 +23035,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-oml_resample" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-oml_resample"; asd = "cl-glfw-opengl-oml_resample"; @@ -22549,7 +23055,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-oml_subsample" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-oml_subsample"; asd = "cl-glfw-opengl-oml_subsample"; @@ -22569,7 +23075,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-pgi_misc_hints" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-pgi_misc_hints"; asd = "cl-glfw-opengl-pgi_misc_hints"; @@ -22589,7 +23095,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-pgi_vertex_hints" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-pgi_vertex_hints"; asd = "cl-glfw-opengl-pgi_vertex_hints"; @@ -22609,7 +23115,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-rend_screen_coordinates" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-rend_screen_coordinates"; asd = "cl-glfw-opengl-rend_screen_coordinates"; @@ -22629,7 +23135,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-s3_s3tc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-s3_s3tc"; asd = "cl-glfw-opengl-s3_s3tc"; @@ -22649,7 +23155,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgi_color_table" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgi_color_table"; asd = "cl-glfw-opengl-sgi_color_table"; @@ -22669,7 +23175,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgi_depth_pass_instrument" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgi_depth_pass_instrument"; asd = "cl-glfw-opengl-sgi_depth_pass_instrument"; @@ -22689,7 +23195,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgis_detail_texture" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgis_detail_texture"; asd = "cl-glfw-opengl-sgis_detail_texture"; @@ -22709,7 +23215,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgis_fog_function" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgis_fog_function"; asd = "cl-glfw-opengl-sgis_fog_function"; @@ -22729,7 +23235,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgis_multisample" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgis_multisample"; asd = "cl-glfw-opengl-sgis_multisample"; @@ -22749,7 +23255,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgis_pixel_texture" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgis_pixel_texture"; asd = "cl-glfw-opengl-sgis_pixel_texture"; @@ -22769,7 +23275,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgis_point_parameters" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgis_point_parameters"; asd = "cl-glfw-opengl-sgis_point_parameters"; @@ -22789,7 +23295,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgis_sharpen_texture" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgis_sharpen_texture"; asd = "cl-glfw-opengl-sgis_sharpen_texture"; @@ -22809,7 +23315,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgis_texture4d" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgis_texture4d"; asd = "cl-glfw-opengl-sgis_texture4d"; @@ -22829,7 +23335,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgis_texture_color_mask" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgis_texture_color_mask"; asd = "cl-glfw-opengl-sgis_texture_color_mask"; @@ -22849,7 +23355,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgis_texture_filter4" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgis_texture_filter4"; asd = "cl-glfw-opengl-sgis_texture_filter4"; @@ -22869,7 +23375,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgis_texture_select" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgis_texture_select"; asd = "cl-glfw-opengl-sgis_texture_select"; @@ -22889,7 +23395,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgix_async" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgix_async"; asd = "cl-glfw-opengl-sgix_async"; @@ -22909,7 +23415,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgix_depth_texture" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgix_depth_texture"; asd = "cl-glfw-opengl-sgix_depth_texture"; @@ -22929,7 +23435,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgix_flush_raster" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgix_flush_raster"; asd = "cl-glfw-opengl-sgix_flush_raster"; @@ -22949,7 +23455,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgix_fog_scale" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgix_fog_scale"; asd = "cl-glfw-opengl-sgix_fog_scale"; @@ -22969,7 +23475,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgix_fragment_lighting" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgix_fragment_lighting"; asd = "cl-glfw-opengl-sgix_fragment_lighting"; @@ -22989,7 +23495,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgix_framezoom" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgix_framezoom"; asd = "cl-glfw-opengl-sgix_framezoom"; @@ -23009,7 +23515,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgix_igloo_interface" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgix_igloo_interface"; asd = "cl-glfw-opengl-sgix_igloo_interface"; @@ -23029,7 +23535,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgix_instruments" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgix_instruments"; asd = "cl-glfw-opengl-sgix_instruments"; @@ -23049,7 +23555,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgix_line_quality_hint" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgix_line_quality_hint"; asd = "cl-glfw-opengl-sgix_line_quality_hint"; @@ -23069,7 +23575,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgix_list_priority" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgix_list_priority"; asd = "cl-glfw-opengl-sgix_list_priority"; @@ -23089,7 +23595,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgix_pixel_texture" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgix_pixel_texture"; asd = "cl-glfw-opengl-sgix_pixel_texture"; @@ -23109,7 +23615,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgix_polynomial_ffd" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgix_polynomial_ffd"; asd = "cl-glfw-opengl-sgix_polynomial_ffd"; @@ -23129,7 +23635,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgix_reference_plane" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgix_reference_plane"; asd = "cl-glfw-opengl-sgix_reference_plane"; @@ -23149,7 +23655,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgix_resample" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgix_resample"; asd = "cl-glfw-opengl-sgix_resample"; @@ -23169,7 +23675,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgix_scalebias_hint" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgix_scalebias_hint"; asd = "cl-glfw-opengl-sgix_scalebias_hint"; @@ -23189,7 +23695,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgix_shadow" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgix_shadow"; asd = "cl-glfw-opengl-sgix_shadow"; @@ -23209,7 +23715,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgix_shadow_ambient" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgix_shadow_ambient"; asd = "cl-glfw-opengl-sgix_shadow_ambient"; @@ -23229,7 +23735,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgix_slim" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgix_slim"; asd = "cl-glfw-opengl-sgix_slim"; @@ -23249,7 +23755,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgix_sprite" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgix_sprite"; asd = "cl-glfw-opengl-sgix_sprite"; @@ -23269,7 +23775,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgix_tag_sample_buffer" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgix_tag_sample_buffer"; asd = "cl-glfw-opengl-sgix_tag_sample_buffer"; @@ -23289,7 +23795,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgix_texture_coordinate_clamp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgix_texture_coordinate_clamp"; asd = "cl-glfw-opengl-sgix_texture_coordinate_clamp"; @@ -23309,7 +23815,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgix_texture_lod_bias" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgix_texture_lod_bias"; asd = "cl-glfw-opengl-sgix_texture_lod_bias"; @@ -23329,7 +23835,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgix_texture_multi_buffer" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgix_texture_multi_buffer"; asd = "cl-glfw-opengl-sgix_texture_multi_buffer"; @@ -23349,7 +23855,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sgix_ycrcba" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sgix_ycrcba"; asd = "cl-glfw-opengl-sgix_ycrcba"; @@ -23369,7 +23875,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sun_convolution_border_modes" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sun_convolution_border_modes"; asd = "cl-glfw-opengl-sun_convolution_border_modes"; @@ -23389,7 +23895,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sun_global_alpha" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sun_global_alpha"; asd = "cl-glfw-opengl-sun_global_alpha"; @@ -23409,7 +23915,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sun_mesh_array" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sun_mesh_array"; asd = "cl-glfw-opengl-sun_mesh_array"; @@ -23429,7 +23935,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sun_slice_accum" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sun_slice_accum"; asd = "cl-glfw-opengl-sun_slice_accum"; @@ -23449,7 +23955,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sun_triangle_list" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sun_triangle_list"; asd = "cl-glfw-opengl-sun_triangle_list"; @@ -23469,7 +23975,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sun_vertex" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sun_vertex"; asd = "cl-glfw-opengl-sun_vertex"; @@ -23489,7 +23995,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-sunx_constant_data" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-sunx_constant_data"; asd = "cl-glfw-opengl-sunx_constant_data"; @@ -23509,7 +24015,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-version_1_0" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-version_1_0"; asd = "cl-glfw-opengl-version_1_0"; @@ -23529,7 +24035,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-version_1_1" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-version_1_1"; asd = "cl-glfw-opengl-version_1_1"; @@ -23549,7 +24055,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-version_1_2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-version_1_2"; asd = "cl-glfw-opengl-version_1_2"; @@ -23569,7 +24075,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-version_1_3" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-version_1_3"; asd = "cl-glfw-opengl-version_1_3"; @@ -23589,7 +24095,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-version_1_4" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-version_1_4"; asd = "cl-glfw-opengl-version_1_4"; @@ -23609,7 +24115,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-version_1_5" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-version_1_5"; asd = "cl-glfw-opengl-version_1_5"; @@ -23629,7 +24135,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-version_2_0" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-version_2_0"; asd = "cl-glfw-opengl-version_2_0"; @@ -23649,7 +24155,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-version_2_1" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-version_2_1"; asd = "cl-glfw-opengl-version_2_1"; @@ -23669,7 +24175,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-win_phong_shading" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-win_phong_shading"; asd = "cl-glfw-opengl-win_phong_shading"; @@ -23689,7 +24195,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-opengl-win_specular_fog" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-opengl-win_specular_fog"; asd = "cl-glfw-opengl-win_specular_fog"; @@ -23709,7 +24215,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw-types" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; system = "cl-glfw-types"; asd = "cl-glfw-types"; @@ -23729,7 +24235,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw3" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw3/2021-05-31/cl-glfw3-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw3/2021-05-31/cl-glfw3-20210531-git.tgz"; sha256 = "1wzr43nckdx4rlgxzhm1r4kfc264q969mc43y0js9ramh7l8gba5"; system = "cl-glfw3"; asd = "cl-glfw3"; @@ -23752,7 +24258,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glfw3-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw3/2021-05-31/cl-glfw3-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glfw3/2021-05-31/cl-glfw3-20210531-git.tgz"; sha256 = "1wzr43nckdx4rlgxzhm1r4kfc264q969mc43y0js9ramh7l8gba5"; system = "cl-glfw3-examples"; asd = "cl-glfw3-examples"; @@ -23776,7 +24282,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-glib" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glib/2023-10-21/cl-glib-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glib/2023-10-21/cl-glib-20231021-git.tgz"; sha256 = "07y8hpvdl490p8j4k8y47raqqwnpym9scz7jlg2f1jx897dkssjb"; system = "cl-glib"; asd = "cl-glib"; @@ -23795,12 +24301,12 @@ lib.makeScope pkgs.newScope (self: { cl-gltf = ( build-asdf-system { pname = "cl-gltf"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-gltf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-gltf/2024-10-12/cl-gltf-20241012-git.tgz"; - sha256 = "0s7q6zsy85wryy3wb2hn3nprh1m4vmjzsai1mdcqlhzqyh5rm6jq"; + url = "https://beta.quicklisp.org/archive/cl-gltf/2025-06-22/cl-gltf-20250622-git.tgz"; + sha256 = "0ais6p3mw22zmhcfkab34sfb717si3a1wjx1xq8lig6fr75fw6k1"; system = "cl-gltf"; asd = "cl-gltf"; } @@ -23812,6 +24318,7 @@ lib.makeScope pkgs.newScope (self: { (getAttr "documentation-utils" self) (getAttr "mmap" self) (getAttr "nibbles" self) + (getAttr "pathname-utils" self) (getAttr "qbase64" self) (getAttr "static-vectors" self) (getAttr "trivial-extensible-sequences" self) @@ -23824,12 +24331,12 @@ lib.makeScope pkgs.newScope (self: { cl-glu = ( build-asdf-system { pname = "cl-glu"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-glu" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-opengl/2024-10-12/cl-opengl-20241012-git.tgz"; - sha256 = "1xpa3x9fx7wxrs5xmkj13yzh2wjfnlb0ihirfr9clngpv1y4gcm6"; + url = "https://beta.quicklisp.org/archive/cl-opengl/2025-06-22/cl-opengl-20250622-git.tgz"; + sha256 = "1ksm330gsw20ajcl1jri3s7ydmrkyqbmajmk4gp452nsgqm62axm"; system = "cl-glu"; asd = "cl-glu"; } @@ -23847,12 +24354,12 @@ lib.makeScope pkgs.newScope (self: { cl-glut = ( build-asdf-system { pname = "cl-glut"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-glut" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-opengl/2024-10-12/cl-opengl-20241012-git.tgz"; - sha256 = "1xpa3x9fx7wxrs5xmkj13yzh2wjfnlb0ihirfr9clngpv1y4gcm6"; + url = "https://beta.quicklisp.org/archive/cl-opengl/2025-06-22/cl-opengl-20250622-git.tgz"; + sha256 = "1ksm330gsw20ajcl1jri3s7ydmrkyqbmajmk4gp452nsgqm62axm"; system = "cl-glut"; asd = "cl-glut"; } @@ -23871,12 +24378,12 @@ lib.makeScope pkgs.newScope (self: { cl-glut-examples = ( build-asdf-system { pname = "cl-glut-examples"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-glut-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-opengl/2024-10-12/cl-opengl-20241012-git.tgz"; - sha256 = "1xpa3x9fx7wxrs5xmkj13yzh2wjfnlb0ihirfr9clngpv1y4gcm6"; + url = "https://beta.quicklisp.org/archive/cl-opengl/2025-06-22/cl-opengl-20250622-git.tgz"; + sha256 = "1ksm330gsw20ajcl1jri3s7ydmrkyqbmajmk4gp452nsgqm62axm"; system = "cl-glut-examples"; asd = "cl-glut-examples"; } @@ -23900,7 +24407,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-gobject" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-glib/2023-10-21/cl-glib-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-glib/2023-10-21/cl-glib-20231021-git.tgz"; sha256 = "07y8hpvdl490p8j4k8y47raqqwnpym9scz7jlg2f1jx897dkssjb"; system = "cl-gobject"; asd = "cl-gobject"; @@ -23920,7 +24427,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-gobject-introspection" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-gobject-introspection/2024-10-12/cl-gobject-introspection-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-gobject-introspection/2024-10-12/cl-gobject-introspection-20241012-git.tgz"; sha256 = "0iw8fciydh9bi2svq30hi029df16arpspk0mjzh0cm1c6kjm9dcj"; system = "cl-gobject-introspection"; asd = "cl-gobject-introspection"; @@ -23943,7 +24450,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-gobject-introspection-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-gobject-introspection/2024-10-12/cl-gobject-introspection-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-gobject-introspection/2024-10-12/cl-gobject-introspection-20241012-git.tgz"; sha256 = "0iw8fciydh9bi2svq30hi029df16arpspk0mjzh0cm1c6kjm9dcj"; system = "cl-gobject-introspection-test"; asd = "cl-gobject-introspection-test"; @@ -23967,7 +24474,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-gobject-introspection-wrapper" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-gobject-introspection-wrapper/2023-10-21/cl-gobject-introspection-wrapper-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-gobject-introspection-wrapper/2023-10-21/cl-gobject-introspection-wrapper-20231021-git.tgz"; sha256 = "0x1nryxkv6i0bzn2zmlsgbq0impni4drzawy3wc7zy5nr2qnd1x5"; system = "cl-gobject-introspection-wrapper"; asd = "cl-gobject-introspection-wrapper"; @@ -23987,12 +24494,12 @@ lib.makeScope pkgs.newScope (self: { cl-gog-galaxy = ( build-asdf-system { pname = "cl-gog-galaxy"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-gog-galaxy" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-gog-galaxy/2024-10-12/cl-gog-galaxy-20241012-git.tgz"; - sha256 = "0pb8q4q1gj4n8ll5cglip4rl9gqy8y0g9kpqn2xkc3lssvxkkh63"; + url = "https://beta.quicklisp.org/archive/cl-gog-galaxy/2025-06-22/cl-gog-galaxy-20250622-git.tgz"; + sha256 = "0y8qp74njyidl93l3spbrizdfmmxdd0vs36hw4ihn5gr62y8yf18"; system = "cl-gog-galaxy"; asd = "cl-gog-galaxy"; } @@ -24001,6 +24508,7 @@ lib.makeScope pkgs.newScope (self: { lispLibs = [ (getAttr "cffi" self) (getAttr "documentation-utils" self) + (getAttr "pathname-utils" self) (getAttr "trivial-features" self) (getAttr "trivial-indent" self) ]; @@ -24016,7 +24524,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-gopher" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-gopher/2023-10-21/cl-gopher-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-gopher/2023-10-21/cl-gopher-20231021-git.tgz"; sha256 = "0x8rj4icrx04rfh9qlh7hp2c0zyk4ii6s4wqwhqjxh5580mwblgb"; system = "cl-gopher"; asd = "cl-gopher"; @@ -24038,12 +24546,12 @@ lib.makeScope pkgs.newScope (self: { cl-gpio = ( build-asdf-system { pname = "cl-gpio"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "cl-gpio" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-gpio/2023-10-21/cl-gpio-20231021-git.tgz"; - sha256 = "0sh40fg9gcz72xsfi17zh1b1wckw4fsyx75kkm2w3757lx69wkmh"; + url = "https://beta.quicklisp.org/archive/cl-gpio/2025-06-22/cl-gpio-20250622-git.tgz"; + sha256 = "0z5w2p87plmgqnn8r6kc040303c7wynngr0fq3m25p29n776fibw"; system = "cl-gpio"; asd = "cl-gpio"; } @@ -24065,7 +24573,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-graph" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-graph/2024-10-12/cl-graph-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-graph/2024-10-12/cl-graph-20241012-git.tgz"; sha256 = "1adwlkj2qp73irsswfi50ayjvz3di8fh1sqavsdl7l2d6k7yipdg"; system = "cl-graph"; asd = "cl-graph"; @@ -24090,7 +24598,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-graph+hu.dwim.graphviz" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-graph/2024-10-12/cl-graph-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-graph/2024-10-12/cl-graph-20241012-git.tgz"; sha256 = "1adwlkj2qp73irsswfi50ayjvz3di8fh1sqavsdl7l2d6k7yipdg"; system = "cl-graph+hu.dwim.graphviz"; asd = "cl-graph+hu.dwim.graphviz"; @@ -24113,7 +24621,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-grip" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-grip/2024-10-12/cl-grip-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-grip/2024-10-12/cl-grip-20241012-git.tgz"; sha256 = "0k9qg6pdj4xs5rshf78jmiasyqj4sy5r5hhrccskfsajw6wfmbc9"; system = "cl-grip"; asd = "cl-grip"; @@ -24137,7 +24645,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-grnm" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-grnm/2018-01-31/cl-grnm-20180131-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-grnm/2018-01-31/cl-grnm-20180131-git.tgz"; sha256 = "1hb5n37n3x2ylrghcqsia2g9a6f5wg24l659jiz4ncpi5bsv4m3s"; system = "cl-grnm"; asd = "cl-grnm"; @@ -24157,7 +24665,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-growl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-growl/2016-12-08/cl-growl-20161208-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-growl/2016-12-08/cl-growl-20161208-git.tgz"; sha256 = "1qgj3sq22dznwxj1b3rw0099fsf6wgfbc63r376pab74kdnji3n6"; system = "cl-growl"; asd = "cl-growl"; @@ -24182,7 +24690,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-gss" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-gss/2018-02-28/cl-gss-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-gss/2018-02-28/cl-gss-20180228-git.tgz"; sha256 = "0zhxxn3zarird255s9i56bz0fm6dkv00mn8bbsjrhskg3wpcg4pb"; system = "cl-gss"; asd = "cl-gss"; @@ -24207,7 +24715,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-gtk2-gdk" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-gtk2/2021-10-20/cl-gtk2-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-gtk2/2021-10-20/cl-gtk2-20211020-git.tgz"; sha256 = "1lnrwd7s47cmksllim56mcg9l5m6jrwv6f0q1hq5lr8xpi5ix9vx"; system = "cl-gtk2-gdk"; asd = "cl-gtk2-gdk"; @@ -24229,7 +24737,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-gtk2-glib" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-gtk2/2021-10-20/cl-gtk2-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-gtk2/2021-10-20/cl-gtk2-20211020-git.tgz"; sha256 = "1lnrwd7s47cmksllim56mcg9l5m6jrwv6f0q1hq5lr8xpi5ix9vx"; system = "cl-gtk2-glib"; asd = "cl-gtk2-glib"; @@ -24253,7 +24761,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-gtk2-pango" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-gtk2/2021-10-20/cl-gtk2-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-gtk2/2021-10-20/cl-gtk2-20211020-git.tgz"; sha256 = "1lnrwd7s47cmksllim56mcg9l5m6jrwv6f0q1hq5lr8xpi5ix9vx"; system = "cl-gtk2-pango"; asd = "cl-gtk2-pango"; @@ -24274,7 +24782,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-haml" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-haml/2018-02-28/cl-haml-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-haml/2018-02-28/cl-haml-20180228-git.tgz"; sha256 = "017qr3509ha2680h3c8ip5rqyfaz7v9hfjmx0pg1wrjqw8vyjyb5"; system = "cl-haml"; asd = "cl-haml"; @@ -24294,7 +24802,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-haml-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-haml/2018-02-28/cl-haml-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-haml/2018-02-28/cl-haml-20180228-git.tgz"; sha256 = "017qr3509ha2680h3c8ip5rqyfaz7v9hfjmx0pg1wrjqw8vyjyb5"; system = "cl-haml-test"; asd = "cl-haml"; @@ -24317,7 +24825,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-hamt" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-hamt/2020-03-25/cl-hamt-20200325-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-hamt/2020-03-25/cl-hamt-20200325-git.tgz"; sha256 = "1ycbd73ykfj5j9sdhlzamyv18qbjj6xqf7fhm4fa0nsyr6sr3rf5"; system = "cl-hamt"; asd = "cl-hamt"; @@ -24337,7 +24845,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-hamt-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-hamt/2020-03-25/cl-hamt-20200325-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-hamt/2020-03-25/cl-hamt-20200325-git.tgz"; sha256 = "1ycbd73ykfj5j9sdhlzamyv18qbjj6xqf7fhm4fa0nsyr6sr3rf5"; system = "cl-hamt-examples"; asd = "cl-hamt-examples"; @@ -24361,7 +24869,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-hamt-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-hamt/2020-03-25/cl-hamt-20200325-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-hamt/2020-03-25/cl-hamt-20200325-git.tgz"; sha256 = "1ycbd73ykfj5j9sdhlzamyv18qbjj6xqf7fhm4fa0nsyr6sr3rf5"; system = "cl-hamt-test"; asd = "cl-hamt-test"; @@ -24384,7 +24892,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-hash-table-destructuring" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-hash-table-destructuring/2016-05-31/cl-hash-table-destructuring-20160531-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-hash-table-destructuring/2016-05-31/cl-hash-table-destructuring-20160531-git.tgz"; sha256 = "0za8jlqfvsilmnidk429509vbdd18w7ykcycni411pjpz0lxrh1v"; system = "cl-hash-table-destructuring"; asd = "cl-hash-table-destructuring"; @@ -24404,7 +24912,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-hash-table-destructuring-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-hash-table-destructuring/2016-05-31/cl-hash-table-destructuring-20160531-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-hash-table-destructuring/2016-05-31/cl-hash-table-destructuring-20160531-git.tgz"; sha256 = "0za8jlqfvsilmnidk429509vbdd18w7ykcycni411pjpz0lxrh1v"; system = "cl-hash-table-destructuring-test"; asd = "cl-hash-table-destructuring"; @@ -24428,7 +24936,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-hash-util" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-hash-util/2024-10-12/cl-hash-util-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-hash-util/2024-10-12/cl-hash-util-20241012-git.tgz"; sha256 = "1xab7v2mav241rs8w68qmg485g4f75nrac3hjcnm0cb19ickbs1m"; system = "cl-hash-util"; asd = "cl-hash-util"; @@ -24448,7 +24956,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-hash-util-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-hash-util/2024-10-12/cl-hash-util-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-hash-util/2024-10-12/cl-hash-util-20241012-git.tgz"; sha256 = "1xab7v2mav241rs8w68qmg485g4f75nrac3hjcnm0cb19ickbs1m"; system = "cl-hash-util-test"; asd = "cl-hash-util-test"; @@ -24471,7 +24979,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-heap" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-heap/2013-03-12/cl-heap-0.1.6.tgz"; + url = "https://beta.quicklisp.org/archive/cl-heap/2013-03-12/cl-heap-0.1.6.tgz"; sha256 = "01bss182x9i167lfv0lr8ylavk2m42s84vz6629kspgjhczm52w7"; system = "cl-heap"; asd = "cl-heap"; @@ -24489,7 +24997,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-heap-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-heap/2013-03-12/cl-heap-0.1.6.tgz"; + url = "https://beta.quicklisp.org/archive/cl-heap/2013-03-12/cl-heap-0.1.6.tgz"; sha256 = "01bss182x9i167lfv0lr8ylavk2m42s84vz6629kspgjhczm52w7"; system = "cl-heap-tests"; asd = "cl-heap-tests"; @@ -24512,7 +25020,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-heredoc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-heredoc/2022-07-07/cl-heredoc-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-heredoc/2022-07-07/cl-heredoc-20220707-git.tgz"; sha256 = "0hj9y6drd93nwcbmwwhnc30flm48ppw4rhfgfyqfc02fq2wnc83z"; system = "cl-heredoc"; asd = "cl-heredoc"; @@ -24532,7 +25040,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-heredoc-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-heredoc/2022-07-07/cl-heredoc-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-heredoc/2022-07-07/cl-heredoc-20220707-git.tgz"; sha256 = "0hj9y6drd93nwcbmwwhnc30flm48ppw4rhfgfyqfc02fq2wnc83z"; system = "cl-heredoc-test"; asd = "cl-heredoc-test"; @@ -24555,7 +25063,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-hooks" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/architecture.hooks/2018-12-10/architecture.hooks-20181210-git.tgz"; + url = "https://beta.quicklisp.org/archive/architecture.hooks/2018-12-10/architecture.hooks-20181210-git.tgz"; sha256 = "0bg3l0a28lw5gqqjp6p6b5nhwqk46sgkb7184w5qbfngw1hk8x9y"; system = "cl-hooks"; asd = "cl-hooks"; @@ -24578,7 +25086,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-html-diff" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-html-diff/2013-01-28/cl-html-diff-20130128-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-html-diff/2013-01-28/cl-html-diff-20130128-git.tgz"; sha256 = "1varnijivzd4jpimn1cz8p5ks713zzha5cgl4vmb0xr8ahravwzb"; system = "cl-html-diff"; asd = "cl-html-diff"; @@ -24596,7 +25104,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-html-parse" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-html-parse/2023-10-21/cl-html-parse-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-html-parse/2023-10-21/cl-html-parse-20231021-git.tgz"; sha256 = "1qgjaq45lvqrsw4rrnyy4d5bwlmb7vd45ibdzgbxx5az02x3ahmy"; system = "cl-html-parse"; asd = "cl-html-parse"; @@ -24614,7 +25122,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-html-readme" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-html-readme/2024-10-12/cl-html-readme-quicklisp-current-release-f8aed591-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-html-readme/2024-10-12/cl-html-readme-quicklisp-current-release-f8aed591-git.tgz"; sha256 = "1q23fdbhmra7hl12vd70m7q350wych6f739l8xmz6f84dwm9i8c7"; system = "cl-html-readme"; asd = "cl-html-readme"; @@ -24634,7 +25142,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-html5-parser" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz"; sha256 = "04if61wigylsmn996rbfl8ylsd0d9hzdmg7p2wiglncibjzcl5k9"; system = "cl-html5-parser"; asd = "cl-html5-parser"; @@ -24656,7 +25164,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-html5-parser-cxml" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz"; sha256 = "04if61wigylsmn996rbfl8ylsd0d9hzdmg7p2wiglncibjzcl5k9"; system = "cl-html5-parser-cxml"; asd = "cl-html5-parser-cxml"; @@ -24679,7 +25187,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-html5-parser-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz"; sha256 = "04if61wigylsmn996rbfl8ylsd0d9hzdmg7p2wiglncibjzcl5k9"; system = "cl-html5-parser-tests"; asd = "cl-html5-parser-tests"; @@ -24704,7 +25212,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-htmlprag" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-htmlprag/2016-06-28/cl-htmlprag-20160628-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-htmlprag/2016-06-28/cl-htmlprag-20160628-git.tgz"; sha256 = "1akfy9rldx5a2h34vf7y02pj2j7b5anbxja53m41ism4vklgqg1c"; system = "cl-htmlprag"; asd = "cl-htmlprag"; @@ -24728,7 +25236,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-httpsqs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-httpsqs/2018-02-28/cl-httpsqs-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-httpsqs/2018-02-28/cl-httpsqs-20180228-git.tgz"; sha256 = "14nhr03lm8012crczjpgsmf0ydipqf3kggayshm7w72vkyf0haj7"; system = "cl-httpsqs"; asd = "cl-httpsqs"; @@ -24748,7 +25256,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-hue" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-hue/2015-01-13/cl-hue-20150113-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-hue/2015-01-13/cl-hue-20150113-git.tgz"; sha256 = "0d2qv60pih1xmk0zzbdwcsyk8k9abjzilcmhz3jdicinl8jinfr4"; system = "cl-hue"; asd = "cl-hue"; @@ -24768,12 +25276,12 @@ lib.makeScope pkgs.newScope (self: { cl-i18n = ( build-asdf-system { pname = "cl-i18n"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-i18n" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-i18n/2024-10-12/cl-i18n-20241012-git.tgz"; - sha256 = "1gp4ncf7ywyyh2f0zdkqibvn0wxm4hvsj672ni2vfqvhcivqfdza"; + url = "https://beta.quicklisp.org/archive/cl-i18n/2025-06-22/cl-i18n-20250622-git.tgz"; + sha256 = "1vz0ynfx557c9nydnq5c32ha7qv8viypvmqg36s1l6mbp16b76ws"; system = "cl-i18n"; asd = "cl-i18n"; } @@ -24796,7 +25304,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-id3" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-id3/2023-06-18/cl-id3-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-id3/2023-06-18/cl-id3-20230618-git.tgz"; sha256 = "0p5rcxy6zy8jq673yphbq5dq0g28vx9g7kfklfhicg2blpzy2yf5"; system = "cl-id3"; asd = "cl-id3"; @@ -24816,7 +25324,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ilu" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-devil/2015-03-02/cl-devil-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-devil/2015-03-02/cl-devil-20150302-git.tgz"; sha256 = "1qdjb7xwzjkv99s8q0834lfdq4ch5j2ymrmqsvwzhg47ys17pvvf"; system = "cl-ilu"; asd = "cl-ilu"; @@ -24840,7 +25348,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ilut" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-devil/2015-03-02/cl-devil-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-devil/2015-03-02/cl-devil-20150302-git.tgz"; sha256 = "1qdjb7xwzjkv99s8q0834lfdq4ch5j2ymrmqsvwzhg47ys17pvvf"; system = "cl-ilut"; asd = "cl-ilut"; @@ -24864,7 +25372,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-incognia" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-incognia/2021-12-30/cl-incognia-20211230-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-incognia/2021-12-30/cl-incognia-20211230-git.tgz"; sha256 = "0c5v7vqh26vg4mzzz7rkq3r29ygj2q4fw6v56pi79bbszyklfs21"; system = "cl-incognia"; asd = "cl-incognia"; @@ -24883,12 +25391,12 @@ lib.makeScope pkgs.newScope (self: { cl-indentify = ( build-asdf-system { pname = "cl-indentify"; - version = "20230214-git"; + version = "20250622-git"; asds = [ "cl-indentify" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-indentify/2023-02-14/cl-indentify-20230214-git.tgz"; - sha256 = "1np7b3mh3wd5dv7nvwmjl5rgy7m0qf0fx61s04yazlh46k3d0nxd"; + url = "https://beta.quicklisp.org/archive/cl-indentify/2025-06-22/cl-indentify-20250622-git.tgz"; + sha256 = "1fyrlrrncvpzgp209010kjs3rvx845n6vk160995w464gsrpf56m"; system = "cl-indentify"; asd = "cl-indentify"; } @@ -24910,7 +25418,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-inflector" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-inflector/2015-01-13/cl-inflector-20150113-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-inflector/2015-01-13/cl-inflector-20150113-git.tgz"; sha256 = "1xwwlhik1la4fp984qnx2dqq24v012qv4x0y49sngfpwg7n0ya7y"; system = "cl-inflector"; asd = "cl-inflector"; @@ -24933,7 +25441,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-inflector-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-inflector/2015-01-13/cl-inflector-20150113-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-inflector/2015-01-13/cl-inflector-20150113-git.tgz"; sha256 = "1xwwlhik1la4fp984qnx2dqq24v012qv4x0y49sngfpwg7n0ya7y"; system = "cl-inflector-test"; asd = "cl-inflector"; @@ -24956,7 +25464,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-influxdb" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-influxdb/2018-01-31/cl-influxdb-20180131-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-influxdb/2018-01-31/cl-influxdb-20180131-git.tgz"; sha256 = "0fqnsdw6x79qsvw7l6xp1gxgzcj6jwpa4mn0z2gbbipff4g7k527"; system = "cl-influxdb"; asd = "cl-influxdb"; @@ -24979,40 +25487,83 @@ lib.makeScope pkgs.newScope (self: { cl-info = ( build-asdf-system { pname = "cl-info"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-info" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-info/2024-10-12/cl-info-20241012-git.tgz"; - sha256 = "0vrrlcwdqnw8v34zd7wkjxh02zysam5c5s5n4l5q6s2jy0gmai0y"; + url = "https://beta.quicklisp.org/archive/cl-info/2025-06-22/cl-info-20250622-git.tgz"; + sha256 = "0j3yd13g8pyx2fj1fxvbizhz7wc016cykx3csknnw72cms890vli"; system = "cl-info"; asd = "cl-info"; } ); systems = [ "cl-info" ]; + lispLibs = [ (getAttr "_40ants-asdf-system" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + cl-info-ci = ( + build-asdf-system { + pname = "cl-info-ci"; + version = "20250622-git"; + asds = [ "cl-info-ci" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-info/2025-06-22/cl-info-20250622-git.tgz"; + sha256 = "0j3yd13g8pyx2fj1fxvbizhz7wc016cykx3csknnw72cms890vli"; + system = "cl-info-ci"; + asd = "cl-info-ci"; + } + ); + systems = [ "cl-info-ci" ]; + lispLibs = [ (getAttr "_40ants-ci" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + cl-info-docs = ( + build-asdf-system { + pname = "cl-info-docs"; + version = "20250622-git"; + asds = [ "cl-info-docs" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-info/2025-06-22/cl-info-20250622-git.tgz"; + sha256 = "0j3yd13g8pyx2fj1fxvbizhz7wc016cykx3csknnw72cms890vli"; + system = "cl-info-docs"; + asd = "cl-info-docs"; + } + ); + systems = [ "cl-info-docs" ]; lispLibs = [ (getAttr "_40ants-doc" self) + (getAttr "cl-info" self) (getAttr "docs-config" self) + (getAttr "named-readtables" self) + (getAttr "pythonic-string-reader" self) ]; meta = { hydraPlatforms = [ ]; }; } ); - cl-info-test = ( + cl-info-tests = ( build-asdf-system { - pname = "cl-info-test"; - version = "20241012-git"; - asds = [ "cl-info-test" ]; + pname = "cl-info-tests"; + version = "20250622-git"; + asds = [ "cl-info-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-info/2024-10-12/cl-info-20241012-git.tgz"; - sha256 = "0vrrlcwdqnw8v34zd7wkjxh02zysam5c5s5n4l5q6s2jy0gmai0y"; - system = "cl-info-test"; - asd = "cl-info-test"; + url = "https://beta.quicklisp.org/archive/cl-info/2025-06-22/cl-info-20250622-git.tgz"; + sha256 = "0j3yd13g8pyx2fj1fxvbizhz7wc016cykx3csknnw72cms890vli"; + system = "cl-info-tests"; + asd = "cl-info-tests"; } ); - systems = [ "cl-info-test" ]; + systems = [ "cl-info-tests" ]; lispLibs = [ (getAttr "cl-info" self) (getAttr "hamcrest" self) @@ -25030,7 +25581,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ini" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ini/2024-10-12/cl-ini-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ini/2024-10-12/cl-ini-20241012-git.tgz"; sha256 = "1dj2w1fs1j52wxy91qy2jrn88aqggrvsg4fngl90ssvfh3awk4wm"; system = "cl-ini"; asd = "cl-ini"; @@ -25050,7 +25601,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ini-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ini/2024-10-12/cl-ini-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ini/2024-10-12/cl-ini-20241012-git.tgz"; sha256 = "1dj2w1fs1j52wxy91qy2jrn88aqggrvsg4fngl90ssvfh3awk4wm"; system = "cl-ini-test"; asd = "cl-ini-test"; @@ -25073,7 +25624,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-inotify" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-inotify/2022-07-07/cl-inotify-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-inotify/2022-07-07/cl-inotify-20220707-git.tgz"; sha256 = "0d3bvp5lqnddzhk1w9yyli03njbkhc8d129a058g0j49kgd47c7v"; system = "cl-inotify"; asd = "cl-inotify"; @@ -25103,7 +25654,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-inotify-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-inotify/2022-07-07/cl-inotify-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-inotify/2022-07-07/cl-inotify-20220707-git.tgz"; sha256 = "0d3bvp5lqnddzhk1w9yyli03njbkhc8d129a058g0j49kgd47c7v"; system = "cl-inotify-tests"; asd = "cl-inotify-tests"; @@ -25126,7 +25677,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-intbytes" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-intbytes/2015-09-23/cl-intbytes-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-intbytes/2015-09-23/cl-intbytes-20150923-git.tgz"; sha256 = "0chwfda7pi8mrgwj31li7f0x0hr5yrp4csiq8hwkgd4c1ag1z9fx"; system = "cl-intbytes"; asd = "cl-intbytes"; @@ -25146,7 +25697,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-intbytes-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-intbytes/2015-09-23/cl-intbytes-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-intbytes/2015-09-23/cl-intbytes-20150923-git.tgz"; sha256 = "0chwfda7pi8mrgwj31li7f0x0hr5yrp4csiq8hwkgd4c1ag1z9fx"; system = "cl-intbytes-test"; asd = "cl-intbytes-test"; @@ -25170,7 +25721,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-interpol" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-interpol/2022-11-06/cl-interpol-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-interpol/2022-11-06/cl-interpol-20221106-git.tgz"; sha256 = "1nkjn8byyfdxhi84rbpqs87bb5m478lvphfgxqqv0q37rn75c946"; system = "cl-interpol"; asd = "cl-interpol"; @@ -25191,7 +25742,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-interval" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-interval/2020-07-15/cl-interval-20200715-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-interval/2020-07-15/cl-interval-20200715-git.tgz"; sha256 = "1425l6xmrqadjqgqb5qasisf14pbr6zpj30bpxfv8hhnxs5njq4p"; system = "cl-interval"; asd = "cl-interval"; @@ -25211,7 +25762,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-interval-docs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-interval/2020-07-15/cl-interval-20200715-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-interval/2020-07-15/cl-interval-20200715-git.tgz"; sha256 = "1425l6xmrqadjqgqb5qasisf14pbr6zpj30bpxfv8hhnxs5njq4p"; system = "cl-interval-docs"; asd = "cl-interval-docs"; @@ -25234,7 +25785,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ipfs-api2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ipfs-api2/2024-10-12/cl-ipfs-api2-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ipfs-api2/2024-10-12/cl-ipfs-api2-20241012-git.tgz"; sha256 = "0lz19ayvcdhakckxp6z6gzlglhvnaj0qqyx1jmp211fms7dzyl0x"; system = "cl-ipfs-api2"; asd = "cl-ipfs-api2"; @@ -25258,7 +25809,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-irc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-irc/2015-09-23/cl-irc-0.9.2.tgz"; + url = "https://beta.quicklisp.org/archive/cl-irc/2015-09-23/cl-irc-0.9.2.tgz"; sha256 = "15h3ram8b6vyg4718ad2m92xgilda2x3zmkzbjnijk69kkqsq01r"; system = "cl-irc"; asd = "cl-irc"; @@ -25282,7 +25833,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-irc-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-irc/2015-09-23/cl-irc-0.9.2.tgz"; + url = "https://beta.quicklisp.org/archive/cl-irc/2015-09-23/cl-irc-0.9.2.tgz"; sha256 = "15h3ram8b6vyg4718ad2m92xgilda2x3zmkzbjnijk69kkqsq01r"; system = "cl-irc-test"; asd = "cl-irc-test"; @@ -25306,7 +25857,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-irregsexp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-irregsexp/2016-08-25/cl-irregsexp-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-irregsexp/2016-08-25/cl-irregsexp-20160825-git.tgz"; sha256 = "09pf3jlqskcs32shbj9q3m0zww5pxyrizbvk2nxiwwnbl1rdb406"; system = "cl-irregsexp"; asd = "cl-irregsexp"; @@ -25326,7 +25877,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-isaac" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-isaac/2023-10-21/cl-isaac-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-isaac/2023-10-21/cl-isaac-20231021-git.tgz"; sha256 = "07gjfynhqwwsa839i24h08xd9w7kn5g02rm35x96hq1qrfv1v0fn"; system = "cl-isaac"; asd = "cl-isaac"; @@ -25346,7 +25897,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-iterative" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-iterative/2016-03-18/cl-iterative-20160318-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-iterative/2016-03-18/cl-iterative-20160318-git.tgz"; sha256 = "01h2fs7nq2wivjwh9swsmfdvsdmd7j9dvzgrq0ijbq456zm8vilq"; system = "cl-iterative"; asd = "cl-iterative"; @@ -25369,7 +25920,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-iterative-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-iterative/2016-03-18/cl-iterative-20160318-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-iterative/2016-03-18/cl-iterative-20160318-git.tgz"; sha256 = "01h2fs7nq2wivjwh9swsmfdvsdmd7j9dvzgrq0ijbq456zm8vilq"; system = "cl-iterative-tests"; asd = "cl-iterative-tests"; @@ -25392,7 +25943,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-itertools" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-itertools/2016-04-21/cl-itertools-20160421-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-itertools/2016-04-21/cl-itertools-20160421-git.tgz"; sha256 = "0m1g7nxqnz03bcj46skcr2d50pi3lb4hwizna5d4mvl5hk4zwbxr"; system = "cl-itertools"; asd = "cl-itertools"; @@ -25416,7 +25967,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-itertools-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-itertools/2016-04-21/cl-itertools-20160421-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-itertools/2016-04-21/cl-itertools-20160421-git.tgz"; sha256 = "0m1g7nxqnz03bcj46skcr2d50pi3lb4hwizna5d4mvl5hk4zwbxr"; system = "cl-itertools-tests"; asd = "cl-itertools"; @@ -25440,7 +25991,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-jpeg" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-jpeg/2023-02-14/cl-jpeg-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-jpeg/2023-02-14/cl-jpeg-20230214-git.tgz"; sha256 = "1xl1id4k1bdw6hf24ndkzr6nxi30yw7xlr1fhfmxnwjqwy5hcq14"; system = "cl-jpeg"; asd = "cl-jpeg"; @@ -25458,7 +26009,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-js" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/js/2024-10-12/js-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/js/2024-10-12/js-20241012-git.tgz"; sha256 = "084rfqxbhrwqb3xfcx3kzmnyzacr2wb8bkxzl0srdgn17pl7hkx3"; system = "cl-js"; asd = "cl-js"; @@ -25482,7 +26033,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-jschema" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-jschema/2023-06-18/cl-jschema-v1.1.1.tgz"; + url = "https://beta.quicklisp.org/archive/cl-jschema/2023-06-18/cl-jschema-v1.1.1.tgz"; sha256 = "0awc7hy07sg4h8k58xxxy578a5qklpkj3slslp7ghfzfdbi7nz11"; system = "cl-jschema"; asd = "cl-jschema"; @@ -25507,7 +26058,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-json" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-json/2022-07-07/cl-json-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-json/2022-07-07/cl-json-20220707-git.tgz"; sha256 = "12vakz47d1i7pywgb9cm2364fzykidc9m7l7b6n9lx0gn2qx9ar5"; system = "cl-json"; asd = "cl-json"; @@ -25525,7 +26076,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-json-helper" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-json-helper/2018-12-10/cl-json-helper-20181210-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-json-helper/2018-12-10/cl-json-helper-20181210-git.tgz"; sha256 = "1dhv5lh514m7bvl77xjhb4ky7nf4bskgpld7rqg3rq24k4y0c79a"; system = "cl-json-helper"; asd = "cl-json-helper"; @@ -25545,7 +26096,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-json-pointer" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-json-pointer/2022-11-06/cl-json-pointer-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-json-pointer/2022-11-06/cl-json-pointer-20221106-git.tgz"; sha256 = "0b7a755wc2ghsd1pv7d32877b21h4nssp41xs017anbmj55czb2h"; system = "cl-json-pointer"; asd = "cl-json-pointer"; @@ -25569,7 +26120,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-json-schema" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-json-schema/2021-02-28/cl-json-schema-20210228-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-json-schema/2021-02-28/cl-json-schema-20210228-git.tgz"; sha256 = "1c90c9j6d2b02zyyqd07200waqa4saq0svps7vfy5a3lxp9vag9i"; system = "cl-json-schema"; asd = "cl-json-schema"; @@ -25594,7 +26145,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-json-schema-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-json-schema/2021-02-28/cl-json-schema-20210228-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-json-schema/2021-02-28/cl-json-schema-20210228-git.tgz"; sha256 = "1c90c9j6d2b02zyyqd07200waqa4saq0svps7vfy5a3lxp9vag9i"; system = "cl-json-schema-tests"; asd = "cl-json-schema-tests"; @@ -25618,7 +26169,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-jsonl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-jsonl/2023-10-21/cl-jsonl-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-jsonl/2023-10-21/cl-jsonl-20231021-git.tgz"; sha256 = "0mwszi9r88p21rl6x7gh0cjgmfmzvgs34257h88m6zr7q7h7djw4"; system = "cl-jsonl"; asd = "cl-jsonl"; @@ -25641,7 +26192,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-jsx" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-jsx/2016-02-08/cl-jsx-20160208-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-jsx/2016-02-08/cl-jsx-20160208-git.tgz"; sha256 = "1vkqs65sqnfkfka2p93ibfrgg3wps3qhlcgcd8j40h0bv3phcjp7"; system = "cl-jsx"; asd = "cl-jsx"; @@ -25665,7 +26216,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-jsx-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-jsx/2016-02-08/cl-jsx-20160208-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-jsx/2016-02-08/cl-jsx-20160208-git.tgz"; sha256 = "1vkqs65sqnfkfka2p93ibfrgg3wps3qhlcgcd8j40h0bv3phcjp7"; system = "cl-jsx-test"; asd = "cl-jsx-test"; @@ -25689,7 +26240,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-junit-xml" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-junit-xml/2015-01-13/cl-junit-xml-20150113-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-junit-xml/2015-01-13/cl-junit-xml-20150113-git.tgz"; sha256 = "1ssrcgw5bhfsb5lk7jb8jyz77mj6sg23wc3gmnw747iqvpikwakr"; system = "cl-junit-xml"; asd = "cl-junit-xml"; @@ -25713,7 +26264,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-junit-xml.lisp-unit" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-junit-xml/2015-01-13/cl-junit-xml-20150113-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-junit-xml/2015-01-13/cl-junit-xml-20150113-git.tgz"; sha256 = "1ssrcgw5bhfsb5lk7jb8jyz77mj6sg23wc3gmnw747iqvpikwakr"; system = "cl-junit-xml.lisp-unit"; asd = "cl-junit-xml.lisp-unit"; @@ -25739,7 +26290,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-junit-xml.lisp-unit2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-junit-xml/2015-01-13/cl-junit-xml-20150113-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-junit-xml/2015-01-13/cl-junit-xml-20150113-git.tgz"; sha256 = "1ssrcgw5bhfsb5lk7jb8jyz77mj6sg23wc3gmnw747iqvpikwakr"; system = "cl-junit-xml.lisp-unit2"; asd = "cl-junit-xml.lisp-unit2"; @@ -25765,7 +26316,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-junit-xml.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-junit-xml/2015-01-13/cl-junit-xml-20150113-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-junit-xml/2015-01-13/cl-junit-xml-20150113-git.tgz"; sha256 = "1ssrcgw5bhfsb5lk7jb8jyz77mj6sg23wc3gmnw747iqvpikwakr"; system = "cl-junit-xml.test"; asd = "cl-junit-xml"; @@ -25788,7 +26339,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-jwk" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-jwk/2023-10-21/cl-jwk-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-jwk/2023-10-21/cl-jwk-20231021-git.tgz"; sha256 = "07hphgx40583hpvzj2xnk73lypfp1iq40nfpv3gf3hba4x54c17a"; system = "cl-jwk"; asd = "cl-jwk"; @@ -25816,7 +26367,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-jwk.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-jwk/2023-10-21/cl-jwk-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-jwk/2023-10-21/cl-jwk-20231021-git.tgz"; sha256 = "07hphgx40583hpvzj2xnk73lypfp1iq40nfpv3gf3hba4x54c17a"; system = "cl-jwk.test"; asd = "cl-jwk.test"; @@ -25835,12 +26386,12 @@ lib.makeScope pkgs.newScope (self: { cl-k8055 = ( build-asdf-system { pname = "cl-k8055"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "cl-k8055" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-k8055/2023-10-21/cl-k8055-20231021-git.tgz"; - sha256 = "1qap7pf90l89lqb8asnnnc0qfaabd6p179vmdq1z7n5wxdwsw2b3"; + url = "https://beta.quicklisp.org/archive/cl-k8055/2025-06-22/cl-k8055-20250622-git.tgz"; + sha256 = "0ml2i5zkidc01dmjqxrk2y4a24wnh6wz4amc979rilj6nwrxzj1f"; system = "cl-k8055"; asd = "cl-k8055"; } @@ -25864,7 +26415,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-kanren" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-kanren/2024-10-12/cl-kanren-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-kanren/2024-10-12/cl-kanren-20241012-git.tgz"; sha256 = "136jdgh23vb7imihk9dqwpk8wzjmpvkqfhah3qrxpsw0xpir29sh"; system = "cl-kanren"; asd = "cl-kanren"; @@ -25884,7 +26435,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-kanren-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-kanren/2024-10-12/cl-kanren-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-kanren/2024-10-12/cl-kanren-20241012-git.tgz"; sha256 = "136jdgh23vb7imihk9dqwpk8wzjmpvkqfhah3qrxpsw0xpir29sh"; system = "cl-kanren-test"; asd = "cl-kanren-test"; @@ -25908,7 +26459,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-keycloak" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-keycloak/2019-07-10/cl-keycloak-20190710-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-keycloak/2019-07-10/cl-keycloak-20190710-git.tgz"; sha256 = "052x10xj951061xa80kp1ziwrr8hskjsr7q2ni1d1ab26rkmhb9q"; system = "cl-keycloak"; asd = "cl-keycloak"; @@ -25932,7 +26483,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-kraken" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-kraken/2022-03-31/cl-kraken-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-kraken/2022-03-31/cl-kraken-20220331-git.tgz"; sha256 = "07a9a7yqii0gsiaf4r6jfz2nb2m8766rv4acqcdjm8zmsllwx7jz"; system = "cl-kraken"; asd = "cl-kraken"; @@ -25958,7 +26509,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ksuid" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ksuid/2017-08-30/cl-ksuid-20170830-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ksuid/2017-08-30/cl-ksuid-20170830-git.tgz"; sha256 = "142fr8l6aa6wxnjxv04f61hy9504cx9x1r10byhmj475s5pfr6gl"; system = "cl-ksuid"; asd = "cl-ksuid"; @@ -25983,7 +26534,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ksuid-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ksuid/2017-08-30/cl-ksuid-20170830-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ksuid/2017-08-30/cl-ksuid-20170830-git.tgz"; sha256 = "142fr8l6aa6wxnjxv04f61hy9504cx9x1r10byhmj475s5pfr6gl"; system = "cl-ksuid-test"; asd = "cl-ksuid"; @@ -26007,7 +26558,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ktx" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ktx/2023-10-21/cl-ktx-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ktx/2023-10-21/cl-ktx-20231021-git.tgz"; sha256 = "1nggg3qixnmv9gisj0aqd369z1rm2qqdf17xnsxcpzz1d9lvxqhq"; system = "cl-ktx"; asd = "cl-ktx"; @@ -26032,7 +26583,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-kyoto-cabinet" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-kyoto-cabinet/2019-11-30/cl-kyoto-cabinet-20191130-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-kyoto-cabinet/2019-11-30/cl-kyoto-cabinet-20191130-git.tgz"; sha256 = "0ayp87ggayaf8d1dblpv90a87fmgh9vhhcah3ch6jvcw6zzb9lcr"; system = "cl-kyoto-cabinet"; asd = "cl-kyoto-cabinet"; @@ -26052,7 +26603,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-l10n" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-l10n/2021-12-09/cl-l10n-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-l10n/2021-12-09/cl-l10n-20211209-git.tgz"; sha256 = "10yknvjcbgc82a6k6yzj2diki2z2s04q5kg642f2gfj2rl3bjyz7"; system = "cl-l10n"; asd = "cl-l10n"; @@ -26081,7 +26632,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-l10n-cldr" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-l10n-cldr/2012-09-09/cl-l10n-cldr-20120909-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/cl-l10n-cldr/2012-09-09/cl-l10n-cldr-20120909-darcs.tgz"; sha256 = "1mwkjdc51158v9rpdpsc1qzqqs0x8hb9k1k7b0pm8q7dp9rrb53v"; system = "cl-l10n-cldr"; asd = "cl-l10n-cldr"; @@ -26099,7 +26650,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-lambdacalc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-lambdacalc/2023-02-14/cl-lambdacalc-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-lambdacalc/2023-02-14/cl-lambdacalc-20230214-git.tgz"; sha256 = "0ja08d6p1dnbpf8yl8n59vis5lzr3x32in3iin72zmhj5n60axbd"; system = "cl-lambdacalc"; asd = "cl-lambdacalc"; @@ -26119,7 +26670,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-lambdacalc-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-lambdacalc/2023-02-14/cl-lambdacalc-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-lambdacalc/2023-02-14/cl-lambdacalc-20230214-git.tgz"; sha256 = "0ja08d6p1dnbpf8yl8n59vis5lzr3x32in3iin72zmhj5n60axbd"; system = "cl-lambdacalc-test"; asd = "cl-lambdacalc-test"; @@ -26138,12 +26689,12 @@ lib.makeScope pkgs.newScope (self: { cl-las = ( build-asdf-system { pname = "cl-las"; - version = "20221106-git"; + version = "20250622-git"; asds = [ "cl-las" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-las/2022-11-06/cl-las-20221106-git.tgz"; - sha256 = "119v5mrvxhz8b3alqj9gzfbzhigdm1n1hmwyylncn5w5dkq3jc9k"; + url = "https://beta.quicklisp.org/archive/cl-las/2025-06-22/cl-las-20250622-git.tgz"; + sha256 = "0gmygdn36lwfi2v9k6izk2l2gj7f02vcnlkrxlmgyqc0x6plf3n8"; system = "cl-las"; asd = "cl-las"; } @@ -26162,7 +26713,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-lastfm" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-lastfm/2014-07-13/cl-lastfm-0.2.1.tgz"; + url = "https://beta.quicklisp.org/archive/cl-lastfm/2014-07-13/cl-lastfm-0.2.1.tgz"; sha256 = "0f37b8swgfz57bffcypjhcgzj5dhanssiraahkianj65a6zbindl"; system = "cl-lastfm"; asd = "cl-lastfm"; @@ -26187,7 +26738,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-lastfm-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-lastfm/2014-07-13/cl-lastfm-0.2.1.tgz"; + url = "https://beta.quicklisp.org/archive/cl-lastfm/2014-07-13/cl-lastfm-0.2.1.tgz"; sha256 = "0f37b8swgfz57bffcypjhcgzj5dhanssiraahkianj65a6zbindl"; system = "cl-lastfm-test"; asd = "cl-lastfm-test"; @@ -26210,7 +26761,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-launch" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-launch/2015-10-31/cl-launch-4.1.4.1.tgz"; + url = "https://beta.quicklisp.org/archive/cl-launch/2015-10-31/cl-launch-4.1.4.1.tgz"; sha256 = "041nh1sh9rqdk9c1kr63n3g2pn11i68x9plzyfq36wmyhz2aypnr"; system = "cl-launch"; asd = "cl-launch"; @@ -26230,7 +26781,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-lc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-lc/2024-10-12/cl-lc-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-lc/2024-10-12/cl-lc-20241012-git.tgz"; sha256 = "07wpbwgjybhp6vdr2rbd93jwakqixr9dyymp3yz1h684ln7wvfkb"; system = "cl-lc"; asd = "cl-lc"; @@ -26254,7 +26805,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ledger" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ledger/2020-02-18/cl-ledger-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ledger/2020-02-18/cl-ledger-20200218-git.tgz"; sha256 = "1dpxna9s0rgshqbc58h698ihwyk34a3napb8zrm8vbq8aigjrrzs"; system = "cl-ledger"; asd = "cl-ledger"; @@ -26279,7 +26830,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-lex" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-lex/2016-09-29/cl-lex-20160929-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-lex/2016-09-29/cl-lex-20160929-git.tgz"; sha256 = "1kg50f76bfpfxcv4dfivq1n9a0xlsra2ajb0vd68lxwgbidgyc2y"; system = "cl-lex"; asd = "cl-lex"; @@ -26299,7 +26850,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-lexer" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-lexer/2019-10-07/cl-lexer-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-lexer/2019-10-07/cl-lexer-20191007-git.tgz"; sha256 = "182fnmazfmc3zdp14lvpxlaxrwwsjp8mbjn8sdzywjxcnvlpkdmk"; system = "cl-lexer"; asd = "cl-lexer"; @@ -26315,12 +26866,12 @@ lib.makeScope pkgs.newScope (self: { cl-liballegro = ( build-asdf-system { pname = "cl-liballegro"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-liballegro" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-liballegro/2024-10-12/cl-liballegro-20241012-git.tgz"; - sha256 = "1q263wzm25rynyhcym216l3swhrz6fhiwhdbh4iz212hw9w0kn71"; + url = "https://beta.quicklisp.org/archive/cl-liballegro/2025-06-22/cl-liballegro-20250622-git.tgz"; + sha256 = "1kqywmc4zp45kh1b6hix1dsm1n01zpmz8qkwfbwjrpq4a07rx30l"; system = "cl-liballegro"; asd = "cl-liballegro"; } @@ -26342,12 +26893,12 @@ lib.makeScope pkgs.newScope (self: { cl-liballegro-nuklear = ( build-asdf-system { pname = "cl-liballegro-nuklear"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-liballegro-nuklear" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-liballegro-nuklear/2024-10-12/cl-liballegro-nuklear-20241012-git.tgz"; - sha256 = "15wbs1jfl60dnyzgzdibw2hkl64cx3n3v90i5jp0vd123kix217j"; + url = "https://beta.quicklisp.org/archive/cl-liballegro-nuklear/2025-06-22/cl-liballegro-nuklear-20250622-git.tgz"; + sha256 = "1nfayk1as4ss9fmi04rz5gb5l9v7zs98zj1ddx15h4lml811n322"; system = "cl-liballegro-nuklear"; asd = "cl-liballegro-nuklear"; } @@ -26371,7 +26922,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-libevent2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-libevent2/2019-01-07/cl-libevent2-20190107-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-libevent2/2019-01-07/cl-libevent2-20190107-git.tgz"; sha256 = "18c8cxlh0vmyca7ihj8dz3f1j31h7y0kcis6qr6mpkzyi0k2cf0g"; system = "cl-libevent2"; asd = "cl-libevent2"; @@ -26391,7 +26942,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-libevent2-ssl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-libevent2/2019-01-07/cl-libevent2-20190107-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-libevent2/2019-01-07/cl-libevent2-20190107-git.tgz"; sha256 = "18c8cxlh0vmyca7ihj8dz3f1j31h7y0kcis6qr6mpkzyi0k2cf0g"; system = "cl-libevent2-ssl"; asd = "cl-libevent2-ssl"; @@ -26414,7 +26965,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-libiio" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-libiio/2019-11-30/cl-libiio-20191130-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-libiio/2019-11-30/cl-libiio-20191130-git.tgz"; sha256 = "1z1jslm303c22imhshr92j1mq7g3j81xa5rk5psj3x00papncwmr"; system = "cl-libiio"; asd = "cl-libiio"; @@ -26434,7 +26985,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-libinput" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-libinput/2022-07-07/cl-libinput-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-libinput/2022-07-07/cl-libinput-20220707-git.tgz"; sha256 = "18c3rl3d2bizbp3607gnn9j50x84f2mkypj9rqbry56i5gcw8zkh"; system = "cl-libinput"; asd = "cl-libinput"; @@ -26457,7 +27008,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-liblinear" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-libsvm/2021-10-20/cl-libsvm-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-libsvm/2021-10-20/cl-libsvm-20211020-git.tgz"; sha256 = "0fpcw82hz6bp2hicjhvhxwcj4azprcl911n8q941lk8xcld3pmi0"; system = "cl-liblinear"; asd = "cl-liblinear"; @@ -26480,7 +27031,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-libpuzzle" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-libpuzzle/2015-06-08/cl-libpuzzle-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-libpuzzle/2015-06-08/cl-libpuzzle-20150608-git.tgz"; sha256 = "0qgpdg4lni4sq6jp23qcd1jldsnrsn4h5b14ddmc8mb7va4qshlp"; system = "cl-libpuzzle"; asd = "cl-libpuzzle"; @@ -26500,7 +27051,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-libpuzzle-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-libpuzzle/2015-06-08/cl-libpuzzle-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-libpuzzle/2015-06-08/cl-libpuzzle-20150608-git.tgz"; sha256 = "0qgpdg4lni4sq6jp23qcd1jldsnrsn4h5b14ddmc8mb7va4qshlp"; system = "cl-libpuzzle-test"; asd = "cl-libpuzzle-test"; @@ -26516,6 +27067,55 @@ lib.makeScope pkgs.newScope (self: { }; } ); + cl-libre-translate = ( + build-asdf-system { + pname = "cl-libre-translate"; + version = "20250622-git"; + asds = [ "cl-libre-translate" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-libre-translate/2025-06-22/cl-libre-translate-20250622-git.tgz"; + sha256 = "1wgspc50z6bnald5drbr2qr913s2r10qvm1281h44cyx294kl6gg"; + system = "cl-libre-translate"; + asd = "cl-libre-translate"; + } + ); + systems = [ "cl-libre-translate" ]; + lispLibs = [ + (getAttr "alexandria" self) + (getAttr "dexador" self) + (getAttr "st-json" self) + (getAttr "trivial-clipboard" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + cl-libre-translate_dot_test = ( + build-asdf-system { + pname = "cl-libre-translate.test"; + version = "20250622-git"; + asds = [ "cl-libre-translate.test" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-libre-translate/2025-06-22/cl-libre-translate-20250622-git.tgz"; + sha256 = "1wgspc50z6bnald5drbr2qr913s2r10qvm1281h44cyx294kl6gg"; + system = "cl-libre-translate.test"; + asd = "cl-libre-translate.test"; + } + ); + systems = [ "cl-libre-translate.test" ]; + lispLibs = [ + (getAttr "cl-libre-translate" self) + (getAttr "fiveam" self) + (getAttr "st-json" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); cl-libsvm = ( build-asdf-system { pname = "cl-libsvm"; @@ -26523,7 +27123,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-libsvm" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-libsvm/2021-10-20/cl-libsvm-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-libsvm/2021-10-20/cl-libsvm-20211020-git.tgz"; sha256 = "0fpcw82hz6bp2hicjhvhxwcj4azprcl911n8q941lk8xcld3pmi0"; system = "cl-libsvm"; asd = "cl-libsvm"; @@ -26546,7 +27146,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-libsvm-format" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-libsvm-format/2018-07-11/cl-libsvm-format-20180711-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-libsvm-format/2018-07-11/cl-libsvm-format-20180711-git.tgz"; sha256 = "0284aj84xszhkhlivaigf9qj855fxad3mzmv3zfr0qzb5k0nzwrg"; system = "cl-libsvm-format"; asd = "cl-libsvm-format"; @@ -26566,7 +27166,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-libsvm-format-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-libsvm-format/2018-07-11/cl-libsvm-format-20180711-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-libsvm-format/2018-07-11/cl-libsvm-format-20180711-git.tgz"; sha256 = "0284aj84xszhkhlivaigf9qj855fxad3mzmv3zfr0qzb5k0nzwrg"; system = "cl-libsvm-format-test"; asd = "cl-libsvm-format-test"; @@ -26590,7 +27190,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-libusb" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-libusb/2021-02-28/cl-libusb-20210228-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-libusb/2021-02-28/cl-libusb-20210228-git.tgz"; sha256 = "0kyzgcflwb85q58fgn82sp0bipnq5bprg5i4h0h3jxafqqyagbnk"; system = "cl-libusb"; asd = "cl-libusb"; @@ -26613,7 +27213,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-libuv" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-libuv/2023-06-18/cl-libuv-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-libuv/2023-06-18/cl-libuv-20230618-git.tgz"; sha256 = "13kymryibhlq7jc8q3yar0c676srx82axfmz0x2r5kq7k94cknl9"; system = "cl-libuv"; asd = "cl-libuv"; @@ -26635,7 +27235,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-libuv-config" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-libuv/2023-06-18/cl-libuv-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-libuv/2023-06-18/cl-libuv-20230618-git.tgz"; sha256 = "13kymryibhlq7jc8q3yar0c676srx82axfmz0x2r5kq7k94cknl9"; system = "cl-libuv-config"; asd = "cl-libuv-config"; @@ -26655,7 +27255,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-libxml2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-libxml2/2013-06-15/cl-libxml2-20130615-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-libxml2/2013-06-15/cl-libxml2-20130615-git.tgz"; sha256 = "09049c13cfp5sc6x9lrw762jd7a9qkfq5jgngqgrzn4kn9qscarw"; system = "cl-libxml2"; asd = "cl-libxml2"; @@ -26681,7 +27281,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-libxml2-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-libxml2/2013-06-15/cl-libxml2-20130615-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-libxml2/2013-06-15/cl-libxml2-20130615-git.tgz"; sha256 = "09049c13cfp5sc6x9lrw762jd7a9qkfq5jgngqgrzn4kn9qscarw"; system = "cl-libxml2-test"; asd = "cl-libxml2"; @@ -26704,7 +27304,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-libyaml" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-libyaml/2020-12-20/cl-libyaml-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-libyaml/2020-12-20/cl-libyaml-20201220-git.tgz"; sha256 = "06pvmackyhq03rjmihpx6w63m6cy8wx78ll5xpwwvd85bgrqq817"; system = "cl-libyaml"; asd = "cl-libyaml"; @@ -26722,7 +27322,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-libyaml-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-libyaml/2020-12-20/cl-libyaml-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-libyaml/2020-12-20/cl-libyaml-20201220-git.tgz"; sha256 = "06pvmackyhq03rjmihpx6w63m6cy8wx78ll5xpwwvd85bgrqq817"; system = "cl-libyaml-test"; asd = "cl-libyaml-test"; @@ -26741,12 +27341,12 @@ lib.makeScope pkgs.newScope (self: { cl-lite = ( build-asdf-system { pname = "cl-lite"; - version = "master-fe503896-git"; + version = "master-5a621564-git"; asds = [ "cl-lite" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz"; - sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10"; + url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; + sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; system = "cl-lite"; asd = "cl-lite"; } @@ -26765,7 +27365,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-locale" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-locale/2015-10-31/cl-locale-20151031-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-locale/2015-10-31/cl-locale-20151031-git.tgz"; sha256 = "1rhannhpsw1yg1fpflam483a3w9qb1izgyvmnmiddv3dn4qsmn9p"; system = "cl-locale"; asd = "cl-locale"; @@ -26789,7 +27389,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-locale-syntax" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-locale/2015-10-31/cl-locale-20151031-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-locale/2015-10-31/cl-locale-20151031-git.tgz"; sha256 = "1rhannhpsw1yg1fpflam483a3w9qb1izgyvmnmiddv3dn4qsmn9p"; system = "cl-locale-syntax"; asd = "cl-locale-syntax"; @@ -26812,7 +27412,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-locale-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-locale/2015-10-31/cl-locale-20151031-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-locale/2015-10-31/cl-locale-20151031-git.tgz"; sha256 = "1rhannhpsw1yg1fpflam483a3w9qb1izgyvmnmiddv3dn4qsmn9p"; system = "cl-locale-test"; asd = "cl-locale-test"; @@ -26838,7 +27438,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-locatives" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-locatives/2023-06-18/cl-locatives-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-locatives/2023-06-18/cl-locatives-20230618-git.tgz"; sha256 = "05avna8fj3bicdhbcvnjmv9dnqq10g26m9pwgmrh6a4hyxz9zdaq"; system = "cl-locatives"; asd = "cl-locatives"; @@ -26858,7 +27458,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-log" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-log/2024-10-12/cl-log-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-log/2024-10-12/cl-log-20241012-git.tgz"; sha256 = "1r3z9swy1b59swvaa5b97is9ysrfmjvjjhhw56p7p5hqg93b92ak"; system = "cl-log"; asd = "cl-log"; @@ -26878,7 +27478,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-logic" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-logic/2014-12-17/cl-logic-20141217-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-logic/2014-12-17/cl-logic-20141217-git.tgz"; sha256 = "17n2wzqali3j6b7pqbydipwlxgwdrj4mdnsgwjdyz32n8jvfyjwh"; system = "cl-logic"; asd = "cl-logic"; @@ -26901,7 +27501,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ltsv" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ltsv/2014-07-13/cl-ltsv-20140713-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ltsv/2014-07-13/cl-ltsv-20140713-git.tgz"; sha256 = "1bjvnwxyaaw3yrq5hws2fr4qmk5938hdh2np2bqpm4m3b2c94n22"; system = "cl-ltsv"; asd = "cl-ltsv"; @@ -26921,7 +27521,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ltsv-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ltsv/2014-07-13/cl-ltsv-20140713-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ltsv/2014-07-13/cl-ltsv-20140713-git.tgz"; sha256 = "1bjvnwxyaaw3yrq5hws2fr4qmk5938hdh2np2bqpm4m3b2c94n22"; system = "cl-ltsv-test"; asd = "cl-ltsv-test"; @@ -26944,7 +27544,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-lzma" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-lzma/2019-11-30/cl-lzma-20191130-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-lzma/2019-11-30/cl-lzma-20191130-git.tgz"; sha256 = "17fdinmi2ffdga17slv86van0sp9gkvlmjprfdwak2jzziz6fxx6"; system = "cl-lzma"; asd = "cl-lzma"; @@ -26969,7 +27569,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-m4" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-m4/2013-03-12/cl-m4-20130312-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-m4/2013-03-12/cl-m4-20130312-git.tgz"; sha256 = "1dqdhxb45j4vqmx38xkq32gsckldca8rxpf2idg4b61wd21c0ci6"; system = "cl-m4"; asd = "cl-m4"; @@ -26997,7 +27597,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-m4-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-m4/2013-03-12/cl-m4-20130312-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-m4/2013-03-12/cl-m4-20130312-git.tgz"; sha256 = "1dqdhxb45j4vqmx38xkq32gsckldca8rxpf2idg4b61wd21c0ci6"; system = "cl-m4-test"; asd = "cl-m4-test"; @@ -27021,7 +27621,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mango" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mango/2020-09-25/cl-mango-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mango/2020-09-25/cl-mango-20200925-git.tgz"; sha256 = "0ipa1azakzqigq103m1j2z597bp2i34kx4z1418kp2jn8zwbdz5s"; system = "cl-mango"; asd = "cl-mango"; @@ -27045,7 +27645,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-markdown" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-markdown/2019-12-27/cl-markdown-20191227-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-markdown/2019-12-27/cl-markdown-20191227-git.tgz"; sha256 = "1wksi765nk8kf5qm2chh7dcn6k562kvc108dzdb9y5iwp97lqqvg"; system = "cl-markdown"; asd = "cl-markdown"; @@ -27072,7 +27672,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-markdown-comparisons" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-markdown/2019-12-27/cl-markdown-20191227-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-markdown/2019-12-27/cl-markdown-20191227-git.tgz"; sha256 = "1wksi765nk8kf5qm2chh7dcn6k562kvc108dzdb9y5iwp97lqqvg"; system = "cl-markdown-comparisons"; asd = "cl-markdown-comparisons"; @@ -27099,7 +27699,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-markdown-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-markdown/2019-12-27/cl-markdown-20191227-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-markdown/2019-12-27/cl-markdown-20191227-git.tgz"; sha256 = "1wksi765nk8kf5qm2chh7dcn6k562kvc108dzdb9y5iwp97lqqvg"; system = "cl-markdown-test"; asd = "cl-markdown-test"; @@ -27119,12 +27719,12 @@ lib.makeScope pkgs.newScope (self: { cl-markless = ( build-asdf-system { pname = "cl-markless"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-markless" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-markless/2024-10-12/cl-markless-20241012-git.tgz"; - sha256 = "0csbqglj5ccjw7j95a6cb8pj195lrdk1pn0y3f37w3pjy4pg782g"; + url = "https://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz"; + sha256 = "1vqjbhwqnx1i97r36sqr0alyqb39aszil6dswzdvx4s54h5dpphy"; system = "cl-markless"; asd = "cl-markless"; } @@ -27142,12 +27742,12 @@ lib.makeScope pkgs.newScope (self: { cl-markless-epub = ( build-asdf-system { pname = "cl-markless-epub"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-markless-epub" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-markless/2024-10-12/cl-markless-20241012-git.tgz"; - sha256 = "0csbqglj5ccjw7j95a6cb8pj195lrdk1pn0y3f37w3pjy4pg782g"; + url = "https://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz"; + sha256 = "1vqjbhwqnx1i97r36sqr0alyqb39aszil6dswzdvx4s54h5dpphy"; system = "cl-markless-epub"; asd = "cl-markless-epub"; } @@ -27169,12 +27769,12 @@ lib.makeScope pkgs.newScope (self: { cl-markless-latex = ( build-asdf-system { pname = "cl-markless-latex"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-markless-latex" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-markless/2024-10-12/cl-markless-20241012-git.tgz"; - sha256 = "0csbqglj5ccjw7j95a6cb8pj195lrdk1pn0y3f37w3pjy4pg782g"; + url = "https://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz"; + sha256 = "1vqjbhwqnx1i97r36sqr0alyqb39aszil6dswzdvx4s54h5dpphy"; system = "cl-markless-latex"; asd = "cl-markless-latex"; } @@ -27189,12 +27789,12 @@ lib.makeScope pkgs.newScope (self: { cl-markless-markdown = ( build-asdf-system { pname = "cl-markless-markdown"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-markless-markdown" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-markless/2024-10-12/cl-markless-20241012-git.tgz"; - sha256 = "0csbqglj5ccjw7j95a6cb8pj195lrdk1pn0y3f37w3pjy4pg782g"; + url = "https://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz"; + sha256 = "1vqjbhwqnx1i97r36sqr0alyqb39aszil6dswzdvx4s54h5dpphy"; system = "cl-markless-markdown"; asd = "cl-markless-markdown"; } @@ -27213,12 +27813,12 @@ lib.makeScope pkgs.newScope (self: { cl-markless-plump = ( build-asdf-system { pname = "cl-markless-plump"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-markless-plump" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-markless/2024-10-12/cl-markless-20241012-git.tgz"; - sha256 = "0csbqglj5ccjw7j95a6cb8pj195lrdk1pn0y3f37w3pjy4pg782g"; + url = "https://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz"; + sha256 = "1vqjbhwqnx1i97r36sqr0alyqb39aszil6dswzdvx4s54h5dpphy"; system = "cl-markless-plump"; asd = "cl-markless-plump"; } @@ -27236,12 +27836,12 @@ lib.makeScope pkgs.newScope (self: { cl-markless-standalone = ( build-asdf-system { pname = "cl-markless-standalone"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-markless-standalone" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-markless/2024-10-12/cl-markless-20241012-git.tgz"; - sha256 = "0csbqglj5ccjw7j95a6cb8pj195lrdk1pn0y3f37w3pjy4pg782g"; + url = "https://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz"; + sha256 = "1vqjbhwqnx1i97r36sqr0alyqb39aszil6dswzdvx4s54h5dpphy"; system = "cl-markless-standalone"; asd = "cl-markless-standalone"; } @@ -27264,12 +27864,12 @@ lib.makeScope pkgs.newScope (self: { cl-markless-test = ( build-asdf-system { pname = "cl-markless-test"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-markless-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-markless/2024-10-12/cl-markless-20241012-git.tgz"; - sha256 = "0csbqglj5ccjw7j95a6cb8pj195lrdk1pn0y3f37w3pjy4pg782g"; + url = "https://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz"; + sha256 = "1vqjbhwqnx1i97r36sqr0alyqb39aszil6dswzdvx4s54h5dpphy"; system = "cl-markless-test"; asd = "cl-markless-test"; } @@ -27291,7 +27891,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-marklogic" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-marklogic/2021-01-24/cl-marklogic-20210124-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-marklogic/2021-01-24/cl-marklogic-20210124-git.tgz"; sha256 = "0baq2ccb88zyr2dqdvpm32lsin4zalv11w48x4xm80cr4kw45fk5"; system = "cl-marklogic"; asd = "cl-marklogic"; @@ -27316,7 +27916,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-markup" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz"; sha256 = "10l6k45971dl13fkdmva7zc6i453lmq9j4xax2ci6pjzlc6xjhp7"; system = "cl-markup"; asd = "cl-markup"; @@ -27334,7 +27934,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-markup-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz"; sha256 = "10l6k45971dl13fkdmva7zc6i453lmq9j4xax2ci6pjzlc6xjhp7"; system = "cl-markup-test"; asd = "cl-markup-test"; @@ -27357,7 +27957,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-match" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-match/2012-11-25/cl-match-20121125-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-match/2012-11-25/cl-match-20121125-git.tgz"; sha256 = "1qc8gzp7f4phgyi5whkxacrqzdqs0y1hvkf71m8n7l303jly9wjf"; system = "cl-match"; asd = "cl-match"; @@ -27377,7 +27977,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-match-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-match/2012-11-25/cl-match-20121125-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-match/2012-11-25/cl-match-20121125-git.tgz"; sha256 = "1qc8gzp7f4phgyi5whkxacrqzdqs0y1hvkf71m8n7l303jly9wjf"; system = "cl-match-test"; asd = "cl-match-test"; @@ -27400,7 +28000,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mathstats" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mathstats/2023-02-14/cl-mathstats-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mathstats/2023-02-14/cl-mathstats-20230214-git.tgz"; sha256 = "17ic625bdsvgfjndl4zzxkjy7dcl54alg2pdr0jjn4cpysffga6z"; system = "cl-mathstats"; asd = "cl-mathstats"; @@ -27423,7 +28023,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mathstats-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mathstats/2023-02-14/cl-mathstats-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mathstats/2023-02-14/cl-mathstats-20230214-git.tgz"; sha256 = "17ic625bdsvgfjndl4zzxkjy7dcl54alg2pdr0jjn4cpysffga6z"; system = "cl-mathstats-test"; asd = "cl-mathstats-test"; @@ -27446,7 +28046,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-maxminddb" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-maxminddb/2021-06-30/cl-maxminddb-20210630-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-maxminddb/2021-06-30/cl-maxminddb-20210630-git.tgz"; sha256 = "1mm7cpiygcka39pj4a0rvhayfl4wh0zfjkda60yshq24xmml84pw"; system = "cl-maxminddb"; asd = "cl-maxminddb"; @@ -27474,7 +28074,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-maxsat" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-maxsat/2020-02-18/cl-maxsat-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-maxsat/2020-02-18/cl-maxsat-20200218-git.tgz"; sha256 = "0qy4hhi8y3wv88x3s88g2hl2cz25cjp26xapd3z4h7lrx7cy786i"; system = "cl-maxsat"; asd = "cl-maxsat"; @@ -27499,7 +28099,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-maxsat.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-maxsat/2020-02-18/cl-maxsat-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-maxsat/2020-02-18/cl-maxsat-20200218-git.tgz"; sha256 = "0qy4hhi8y3wv88x3s88g2hl2cz25cjp26xapd3z4h7lrx7cy786i"; system = "cl-maxsat.test"; asd = "cl-maxsat.test"; @@ -27522,7 +28122,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mdb" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mdb/2022-07-07/cl-mdb-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mdb/2022-07-07/cl-mdb-20220707-git.tgz"; sha256 = "1xkhk39485yv3j9bshnnv74c95asf9704g80wb8vwvwsvqi7ym2a"; system = "cl-mdb"; asd = "cl-mdb"; @@ -27542,7 +28142,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mecab" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mecab/2018-10-18/cl-mecab-20181018-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mecab/2018-10-18/cl-mecab-20181018-git.tgz"; sha256 = "0lfan9p8dsniyp60g6n8awfjvv8lyickc40qdxiry6kmp65636ps"; system = "cl-mecab"; asd = "cl-mecab"; @@ -27565,7 +28165,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mecab-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mecab/2018-10-18/cl-mecab-20181018-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mecab/2018-10-18/cl-mecab-20181018-git.tgz"; sha256 = "0lfan9p8dsniyp60g6n8awfjvv8lyickc40qdxiry6kmp65636ps"; system = "cl-mecab-test"; asd = "cl-mecab-test"; @@ -27589,7 +28189,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mechanize" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mechanize/2018-07-11/cl-mechanize-20180711-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mechanize/2018-07-11/cl-mechanize-20180711-git.tgz"; sha256 = "0y86sdi2nl3jv6n535cd62jax0mpc0cckrhffaqacbgbdjc875sn"; system = "cl-mechanize"; asd = "cl-mechanize"; @@ -27615,7 +28215,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mediawiki" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mediawiki/2016-12-04/cl-mediawiki-20161204-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mediawiki/2016-12-04/cl-mediawiki-20161204-git.tgz"; sha256 = "1wrysj9l64k3xx152yw1arvn1glnx60j730qvj8prm65iid95xgm"; system = "cl-mediawiki"; asd = "cl-mediawiki"; @@ -27639,7 +28239,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mediawiki-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mediawiki/2016-12-04/cl-mediawiki-20161204-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mediawiki/2016-12-04/cl-mediawiki-20161204-git.tgz"; sha256 = "1wrysj9l64k3xx152yw1arvn1glnx60j730qvj8prm65iid95xgm"; system = "cl-mediawiki-test"; asd = "cl-mediawiki-test"; @@ -27662,7 +28262,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-megolm" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-megolm/2023-02-14/cl-megolm-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-megolm/2023-02-14/cl-megolm-20230214-git.tgz"; sha256 = "1n80v63pw2ck419fglgdhhqnc06jmams6mnxb8sqdg966qxhql2k"; system = "cl-megolm"; asd = "cl-megolm"; @@ -27691,7 +28291,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-memcached" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-memcached/2015-06-08/cl-memcached-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-memcached/2015-06-08/cl-memcached-20150608-git.tgz"; sha256 = "0g66m0yiazzh0447qbmgxjn4kxjcx9bk2l8cimyzmriz5d0j2q3i"; system = "cl-memcached"; asd = "cl-memcached"; @@ -27716,7 +28316,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-messagepack" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-messagepack/2023-10-21/cl-messagepack-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-messagepack/2023-10-21/cl-messagepack-20231021-git.tgz"; sha256 = "1hjd1q18lz46k46afz94ljflp76mfr30d6z4jrsgd26y2lc4gchc"; system = "cl-messagepack"; asd = "cl-messagepack"; @@ -27740,7 +28340,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-messagepack-rpc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-messagepack-rpc/2017-12-27/cl-messagepack-rpc-20171227-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-messagepack-rpc/2017-12-27/cl-messagepack-rpc-20171227-git.tgz"; sha256 = "02nrnhav28v5vwig9mmmmax59nl0sbjkmdzwakzpj6y1gafiqgy9"; system = "cl-messagepack-rpc"; asd = "cl-messagepack-rpc"; @@ -27768,7 +28368,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-messagepack-rpc-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-messagepack-rpc/2017-12-27/cl-messagepack-rpc-20171227-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-messagepack-rpc/2017-12-27/cl-messagepack-rpc-20171227-git.tgz"; sha256 = "02nrnhav28v5vwig9mmmmax59nl0sbjkmdzwakzpj6y1gafiqgy9"; system = "cl-messagepack-rpc-tests"; asd = "cl-messagepack-rpc-tests"; @@ -27791,7 +28391,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-messagepack-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-messagepack/2023-10-21/cl-messagepack-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-messagepack/2023-10-21/cl-messagepack-20231021-git.tgz"; sha256 = "1hjd1q18lz46k46afz94ljflp76mfr30d6z4jrsgd26y2lc4gchc"; system = "cl-messagepack-tests"; asd = "cl-messagepack-tests"; @@ -27815,7 +28415,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-migrations" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-migrations/2011-01-10/cl-migrations-20110110-http.tgz"; + url = "https://beta.quicklisp.org/archive/cl-migrations/2011-01-10/cl-migrations-20110110-http.tgz"; sha256 = "0mq3ir1kffw921q5a878964ghnrhcrh79p6yxsrb25bzkwpnfx02"; system = "cl-migrations"; asd = "cl-migrations"; @@ -27835,7 +28435,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-migratum" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz"; sha256 = "0bkzbvv3s2j5gs032nj82b0p3x6j3in54kqyg74x54b25q75ymvw"; system = "cl-migratum"; asd = "cl-migratum"; @@ -27860,7 +28460,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-migratum.cli" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz"; sha256 = "0bkzbvv3s2j5gs032nj82b0p3x6j3in54kqyg74x54b25q75ymvw"; system = "cl-migratum.cli"; asd = "cl-migratum.cli"; @@ -27886,7 +28486,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-migratum.driver.dbi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz"; sha256 = "0bkzbvv3s2j5gs032nj82b0p3x6j3in54kqyg74x54b25q75ymvw"; system = "cl-migratum.driver.dbi"; asd = "cl-migratum.driver.dbi"; @@ -27912,7 +28512,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-migratum.driver.mixins" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz"; sha256 = "0bkzbvv3s2j5gs032nj82b0p3x6j3in54kqyg74x54b25q75ymvw"; system = "cl-migratum.driver.mixins"; asd = "cl-migratum.driver.mixins"; @@ -27932,7 +28532,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-migratum.driver.postmodern-postgresql" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz"; sha256 = "0bkzbvv3s2j5gs032nj82b0p3x6j3in54kqyg74x54b25q75ymvw"; system = "cl-migratum.driver.postmodern-postgresql"; asd = "cl-migratum.driver.postmodern-postgresql"; @@ -27959,7 +28559,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-migratum.driver.rdbms-postgresql" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz"; sha256 = "0bkzbvv3s2j5gs032nj82b0p3x6j3in54kqyg74x54b25q75ymvw"; system = "cl-migratum.driver.rdbms-postgresql"; asd = "cl-migratum.driver.rdbms-postgresql"; @@ -27986,7 +28586,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-migratum.provider.local-path" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz"; sha256 = "0bkzbvv3s2j5gs032nj82b0p3x6j3in54kqyg74x54b25q75ymvw"; system = "cl-migratum.provider.local-path"; asd = "cl-migratum.provider.local-path"; @@ -28010,7 +28610,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-migratum.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz"; sha256 = "0bkzbvv3s2j5gs032nj82b0p3x6j3in54kqyg74x54b25q75ymvw"; system = "cl-migratum.test"; asd = "cl-migratum.test"; @@ -28039,7 +28639,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mime" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mime/2020-12-20/cl-mime-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mime/2020-12-20/cl-mime-20201220-git.tgz"; sha256 = "0i2vyc1d4qp36f3c3qfpx9rkp3d2ka80r40wc9lsvhqn1hjxa2gv"; system = "cl-mime"; asd = "cl-mime"; @@ -28063,7 +28663,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mime-from-string" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mime-from-string/2020-04-27/cl-mime-from-string-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mime-from-string/2020-04-27/cl-mime-from-string-20200427-git.tgz"; sha256 = "1pzhfbv6j3b0vvf4rxxd56v54lh6v7cs16nq2d64cawn6qzmk4bp"; system = "cl-mime-from-string"; asd = "cl-mime-from-string"; @@ -28083,7 +28683,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mime-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mime/2020-12-20/cl-mime-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mime/2020-12-20/cl-mime-20201220-git.tgz"; sha256 = "0i2vyc1d4qp36f3c3qfpx9rkp3d2ka80r40wc9lsvhqn1hjxa2gv"; system = "cl-mime-test"; asd = "cl-mime-test"; @@ -28106,7 +28706,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mimeparse" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mimeparse/2021-05-31/cl-mimeparse-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mimeparse/2021-05-31/cl-mimeparse-20210531-git.tgz"; sha256 = "0gdkpi3620va0a3q56svcn1q9f5w0pqfhx30lnldg8fjnrdfiwkk"; system = "cl-mimeparse"; asd = "cl-mimeparse"; @@ -28129,7 +28729,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mimeparse-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mimeparse/2021-05-31/cl-mimeparse-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mimeparse/2021-05-31/cl-mimeparse-20210531-git.tgz"; sha256 = "0gdkpi3620va0a3q56svcn1q9f5w0pqfhx30lnldg8fjnrdfiwkk"; system = "cl-mimeparse-tests"; asd = "cl-mimeparse-tests"; @@ -28152,7 +28752,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-minify-css" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-minify-css/2020-09-25/cl-minify-css-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-minify-css/2020-09-25/cl-minify-css-20200925-git.tgz"; sha256 = "1wj1mh7qzr8ybqyx7kxnpsmj3d9lylnzmq1qmycdyf2llqkcdxgd"; system = "cl-minify-css"; asd = "cl-minify-css"; @@ -28172,7 +28772,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-minify-css-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-minify-css/2020-09-25/cl-minify-css-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-minify-css/2020-09-25/cl-minify-css-20200925-git.tgz"; sha256 = "1wj1mh7qzr8ybqyx7kxnpsmj3d9lylnzmq1qmycdyf2llqkcdxgd"; system = "cl-minify-css-test"; asd = "cl-minify-css-test"; @@ -28193,12 +28793,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed = ( build-asdf-system { pname = "cl-mixed"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-mixed" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; - sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; + sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; system = "cl-mixed"; asd = "cl-mixed"; } @@ -28219,12 +28819,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-aaudio = ( build-asdf-system { pname = "cl-mixed-aaudio"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-mixed-aaudio" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; - sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; + sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; system = "cl-mixed-aaudio"; asd = "cl-mixed-aaudio"; } @@ -28242,12 +28842,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-alsa = ( build-asdf-system { pname = "cl-mixed-alsa"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-mixed-alsa" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; - sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; + sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; system = "cl-mixed-alsa"; asd = "cl-mixed-alsa"; } @@ -28265,12 +28865,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-coreaudio = ( build-asdf-system { pname = "cl-mixed-coreaudio"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-mixed-coreaudio" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; - sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; + sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; system = "cl-mixed-coreaudio"; asd = "cl-mixed-coreaudio"; } @@ -28290,12 +28890,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-examples = ( build-asdf-system { pname = "cl-mixed-examples"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-mixed-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; - sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; + sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; system = "cl-mixed-examples"; asd = "cl-mixed-examples"; } @@ -28316,12 +28916,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-flac = ( build-asdf-system { pname = "cl-mixed-flac"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-mixed-flac" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; - sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; + sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; system = "cl-mixed-flac"; asd = "cl-mixed-flac"; } @@ -28339,12 +28939,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-jack = ( build-asdf-system { pname = "cl-mixed-jack"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-mixed-jack" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; - sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; + sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; system = "cl-mixed-jack"; asd = "cl-mixed-jack"; } @@ -28362,12 +28962,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-mpg123 = ( build-asdf-system { pname = "cl-mixed-mpg123"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-mixed-mpg123" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; - sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; + sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; system = "cl-mixed-mpg123"; asd = "cl-mixed-mpg123"; } @@ -28385,12 +28985,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-mpt = ( build-asdf-system { pname = "cl-mixed-mpt"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-mixed-mpt" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; - sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; + sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; system = "cl-mixed-mpt"; asd = "cl-mixed-mpt"; } @@ -28408,12 +29008,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-nxau = ( build-asdf-system { pname = "cl-mixed-nxau"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-mixed-nxau" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; - sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; + sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; system = "cl-mixed-nxau"; asd = "cl-mixed-nxau"; } @@ -28431,12 +29031,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-opus = ( build-asdf-system { pname = "cl-mixed-opus"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-mixed-opus" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; - sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; + sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; system = "cl-mixed-opus"; asd = "cl-mixed-opus"; } @@ -28454,12 +29054,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-oss = ( build-asdf-system { pname = "cl-mixed-oss"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-mixed-oss" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; - sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; + sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; system = "cl-mixed-oss"; asd = "cl-mixed-oss"; } @@ -28477,12 +29077,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-out123 = ( build-asdf-system { pname = "cl-mixed-out123"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-mixed-out123" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; - sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; + sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; system = "cl-mixed-out123"; asd = "cl-mixed-out123"; } @@ -28497,15 +29097,39 @@ lib.makeScope pkgs.newScope (self: { }; } ); + cl-mixed-pipewire = ( + build-asdf-system { + pname = "cl-mixed-pipewire"; + version = "20250622-git"; + asds = [ "cl-mixed-pipewire" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; + sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; + system = "cl-mixed-pipewire"; + asd = "cl-mixed-pipewire"; + } + ); + systems = [ "cl-mixed-pipewire" ]; + lispLibs = [ + (getAttr "bordeaux-threads" self) + (getAttr "cffi" self) + (getAttr "cl-mixed" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); cl-mixed-pulse = ( build-asdf-system { pname = "cl-mixed-pulse"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-mixed-pulse" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; - sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; + sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; system = "cl-mixed-pulse"; asd = "cl-mixed-pulse"; } @@ -28523,12 +29147,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-qoa = ( build-asdf-system { pname = "cl-mixed-qoa"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-mixed-qoa" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; - sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; + sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; system = "cl-mixed-qoa"; asd = "cl-mixed-qoa"; } @@ -28546,12 +29170,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-sdl2 = ( build-asdf-system { pname = "cl-mixed-sdl2"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-mixed-sdl2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; - sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; + sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; system = "cl-mixed-sdl2"; asd = "cl-mixed-sdl2"; } @@ -28566,15 +29190,35 @@ lib.makeScope pkgs.newScope (self: { }; } ); + cl-mixed-sf3 = ( + build-asdf-system { + pname = "cl-mixed-sf3"; + version = "20250622-git"; + asds = [ "cl-mixed-sf3" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; + sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; + system = "cl-mixed-sf3"; + asd = "cl-mixed-sf3"; + } + ); + systems = [ "cl-mixed-sf3" ]; + lispLibs = [ (getAttr "cl-mixed" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); cl-mixed-vorbis = ( build-asdf-system { pname = "cl-mixed-vorbis"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-mixed-vorbis" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; - sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; + sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; system = "cl-mixed-vorbis"; asd = "cl-mixed-vorbis"; } @@ -28592,12 +29236,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-wasapi = ( build-asdf-system { pname = "cl-mixed-wasapi"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-mixed-wasapi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; - sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; + sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; system = "cl-mixed-wasapi"; asd = "cl-mixed-wasapi"; } @@ -28616,12 +29260,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-wav = ( build-asdf-system { pname = "cl-mixed-wav"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-mixed-wav" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; - sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; + sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; system = "cl-mixed-wav"; asd = "cl-mixed-wav"; } @@ -28636,12 +29280,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-winmm = ( build-asdf-system { pname = "cl-mixed-winmm"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-mixed-winmm" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; - sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; + sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; system = "cl-mixed-winmm"; asd = "cl-mixed-winmm"; } @@ -28659,18 +29303,19 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-xaudio2 = ( build-asdf-system { pname = "cl-mixed-xaudio2"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-mixed-xaudio2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; - sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; + sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; system = "cl-mixed-xaudio2"; asd = "cl-mixed-xaudio2"; } ); systems = [ "cl-mixed-xaudio2" ]; lispLibs = [ + (getAttr "bordeaux-threads" self) (getAttr "cffi" self) (getAttr "cl-mixed" self) (getAttr "com-on" self) @@ -28680,6 +29325,29 @@ lib.makeScope pkgs.newScope (self: { }; } ); + cl-mixed-xmp = ( + build-asdf-system { + pname = "cl-mixed-xmp"; + version = "20250622-git"; + asds = [ "cl-mixed-xmp" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; + sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; + system = "cl-mixed-xmp"; + asd = "cl-mixed-xmp"; + } + ); + systems = [ "cl-mixed-xmp" ]; + lispLibs = [ + (getAttr "cl-mixed" self) + (getAttr "pathname-utils" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); cl-mock = ( build-asdf-system { pname = "cl-mock"; @@ -28687,7 +29355,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mock" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mock/2022-11-06/cl-mock-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mock/2022-11-06/cl-mock-20221106-git.tgz"; sha256 = "19641sm3klx9yfk8lr376rfkd26vy72yp1hkpkqcw3q3m1xrf9xp"; system = "cl-mock"; asd = "cl-mock"; @@ -28710,7 +29378,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mock-basic" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mock/2022-11-06/cl-mock-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mock/2022-11-06/cl-mock-20221106-git.tgz"; sha256 = "19641sm3klx9yfk8lr376rfkd26vy72yp1hkpkqcw3q3m1xrf9xp"; system = "cl-mock-basic"; asd = "cl-mock-basic"; @@ -28734,7 +29402,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mock-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mock/2022-11-06/cl-mock-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mock/2022-11-06/cl-mock-20221106-git.tgz"; sha256 = "19641sm3klx9yfk8lr376rfkd26vy72yp1hkpkqcw3q3m1xrf9xp"; system = "cl-mock-tests"; asd = "cl-mock-tests"; @@ -28757,7 +29425,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mock-tests-basic" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mock/2022-11-06/cl-mock-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mock/2022-11-06/cl-mock-20221106-git.tgz"; sha256 = "19641sm3klx9yfk8lr376rfkd26vy72yp1hkpkqcw3q3m1xrf9xp"; system = "cl-mock-tests-basic"; asd = "cl-mock-tests-basic"; @@ -28776,12 +29444,12 @@ lib.makeScope pkgs.newScope (self: { cl-modio = ( build-asdf-system { pname = "cl-modio"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-modio" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-modio/2024-10-12/cl-modio-20241012-git.tgz"; - sha256 = "1f755xqpibdrxiqclnsiba36bl8xgw958h0lb0rw6hjsvrx9z8dg"; + url = "https://beta.quicklisp.org/archive/cl-modio/2025-06-22/cl-modio-20250622-git.tgz"; + sha256 = "1f591m3g9a6y434wypfzw1vqwslxm1llzarz99qgp0bf930cwfgb"; system = "cl-modio"; asd = "cl-modio"; } @@ -28808,7 +29476,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-monad-macros" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-monad-macros/2011-06-19/cl-monad-macros-20110619-svn.tgz"; + url = "https://beta.quicklisp.org/archive/cl-monad-macros/2011-06-19/cl-monad-macros-20110619-svn.tgz"; sha256 = "184p018xb07yd04bpscrwrnwv1cdxh9hxggmrnj95lhlr6r97l1z"; system = "cl-monad-macros"; asd = "cl-monad-macros"; @@ -28828,7 +29496,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-moneris" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-moneris/2023-10-21/cl-moneris-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-moneris/2023-10-21/cl-moneris-20231021-git.tgz"; sha256 = "1ajxqdgqy7cnkq6qz18xayw5z1idz3slzj7nc7pcv4ha7h3ak63k"; system = "cl-moneris"; asd = "cl-moneris"; @@ -28851,7 +29519,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-moneris-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-moneris/2023-10-21/cl-moneris-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-moneris/2023-10-21/cl-moneris-20231021-git.tgz"; sha256 = "1ajxqdgqy7cnkq6qz18xayw5z1idz3slzj7nc7pcv4ha7h3ak63k"; system = "cl-moneris-test"; asd = "cl-moneris-test"; @@ -28874,7 +29542,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mongo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mongo/2016-05-31/cl-mongo-20160531-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mongo/2016-05-31/cl-mongo-20160531-git.tgz"; sha256 = "1l3kydbxbxhs1z76v6qpwjnabv8wf0mff1pfjkrpjfz6bia1svx6"; system = "cl-mongo"; asd = "cl-mongo"; @@ -28903,7 +29571,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mongo-id" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mongo-id/2020-12-20/cl-mongo-id-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mongo-id/2020-12-20/cl-mongo-id-20201220-git.tgz"; sha256 = "1bpwmh5970rpr6ayygcgdg96hq2dlrksgpa1vdmy5l6vdbw9xrys"; system = "cl-mongo-id"; asd = "cl-mongo-id"; @@ -28928,7 +29596,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-monitors" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-monitors/2023-10-21/cl-monitors-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-monitors/2023-10-21/cl-monitors-20231021-git.tgz"; sha256 = "09ddgs7sbqjx91bajpk5qf6716vnx63mfg9yw0biw16mnfjhrg4i"; system = "cl-monitors"; asd = "cl-monitors"; @@ -28953,7 +29621,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mop" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mop/2015-01-13/cl-mop-20150113-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mop/2015-01-13/cl-mop-20150113-git.tgz"; sha256 = "0wqjbp6jr868a89hklf1ppxkdfbznafrdpriakqiraicvr9kvksg"; system = "cl-mop"; asd = "cl-mop"; @@ -28973,7 +29641,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-morse" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-morse/2022-07-07/cl-morse-v1.0.0.tgz"; + url = "https://beta.quicklisp.org/archive/cl-morse/2022-07-07/cl-morse-v1.0.0.tgz"; sha256 = "01sh34nhbsx2dsrb2r1vkd4j8lzm9gjd5jfi8a4cs4m3djjwhh5i"; system = "cl-morse"; asd = "cl-morse"; @@ -28993,7 +29661,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-moss" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-moss/2017-10-19/cl-moss-20171019-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-moss/2017-10-19/cl-moss-20171019-git.tgz"; sha256 = "1qxzppnyxc8lkhfbbp5m3dbhp4rfkyc2lfrry2448i5w5icrigzd"; system = "cl-moss"; asd = "cl-moss"; @@ -29013,7 +29681,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mount-info" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mount-info/2024-10-12/cl-mount-info-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mount-info/2024-10-12/cl-mount-info-20241012-git.tgz"; sha256 = "0i5vpr0s27gqrskl5qkbw23ba00abbmsskgvg2zhpdljg5qiwlcw"; system = "cl-mount-info"; asd = "cl-mount-info"; @@ -29033,12 +29701,12 @@ lib.makeScope pkgs.newScope (self: { cl-mpg123 = ( build-asdf-system { pname = "cl-mpg123"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-mpg123" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mpg123/2024-10-12/cl-mpg123-20241012-git.tgz"; - sha256 = "03ysv3psfj4agf62gn1skc26qzd9g9zx6yjxxs9lrjz7g9kwf1xk"; + url = "https://beta.quicklisp.org/archive/cl-mpg123/2025-06-22/cl-mpg123-20250622-git.tgz"; + sha256 = "0hlzx72ga43vhh1wfi7g9imf5jmqyga2sn135yf99s38bpznh4p7"; system = "cl-mpg123"; asd = "cl-mpg123"; } @@ -29047,6 +29715,7 @@ lib.makeScope pkgs.newScope (self: { lispLibs = [ (getAttr "cffi" self) (getAttr "documentation-utils" self) + (getAttr "pathname-utils" self) (getAttr "trivial-features" self) (getAttr "trivial-garbage" self) ]; @@ -29058,12 +29727,12 @@ lib.makeScope pkgs.newScope (self: { cl-mpg123-example = ( build-asdf-system { pname = "cl-mpg123-example"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-mpg123-example" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mpg123/2024-10-12/cl-mpg123-20241012-git.tgz"; - sha256 = "03ysv3psfj4agf62gn1skc26qzd9g9zx6yjxxs9lrjz7g9kwf1xk"; + url = "https://beta.quicklisp.org/archive/cl-mpg123/2025-06-22/cl-mpg123-20250622-git.tgz"; + sha256 = "0hlzx72ga43vhh1wfi7g9imf5jmqyga2sn135yf99s38bpznh4p7"; system = "cl-mpg123-example"; asd = "cl-mpg123-example"; } @@ -29086,7 +29755,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mpi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mpi/2019-07-10/cl-mpi-20190710-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mpi/2019-07-10/cl-mpi-20190710-git.tgz"; sha256 = "1ykwk7acjhzpsjgm2b5svdpyw2qgrh860gkx3n2ckyrgd9l9q6jb"; system = "cl-mpi"; asd = "cl-mpi"; @@ -29111,7 +29780,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mpi-asdf-integration" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mpi/2019-07-10/cl-mpi-20190710-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mpi/2019-07-10/cl-mpi-20190710-git.tgz"; sha256 = "1ykwk7acjhzpsjgm2b5svdpyw2qgrh860gkx3n2ckyrgd9l9q6jb"; system = "cl-mpi-asdf-integration"; asd = "cl-mpi-asdf-integration"; @@ -29134,7 +29803,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mpi-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mpi/2019-07-10/cl-mpi-20190710-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mpi/2019-07-10/cl-mpi-20190710-git.tgz"; sha256 = "1ykwk7acjhzpsjgm2b5svdpyw2qgrh860gkx3n2ckyrgd9l9q6jb"; system = "cl-mpi-examples"; asd = "cl-mpi-examples"; @@ -29157,7 +29826,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mpi-extensions" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mpi/2019-07-10/cl-mpi-20190710-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mpi/2019-07-10/cl-mpi-20190710-git.tgz"; sha256 = "1ykwk7acjhzpsjgm2b5svdpyw2qgrh860gkx3n2ckyrgd9l9q6jb"; system = "cl-mpi-extensions"; asd = "cl-mpi-extensions"; @@ -29181,7 +29850,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mpi-test-suite" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mpi/2019-07-10/cl-mpi-20190710-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mpi/2019-07-10/cl-mpi-20190710-git.tgz"; sha256 = "1ykwk7acjhzpsjgm2b5svdpyw2qgrh860gkx3n2ckyrgd9l9q6jb"; system = "cl-mpi-test-suite"; asd = "cl-mpi-test-suite"; @@ -29205,7 +29874,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mtgnet" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mtgnet/2018-07-11/cl-mtgnet-20180711-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mtgnet/2018-07-11/cl-mtgnet-20180711-git.tgz"; sha256 = "08mwkfa9s51is6npn7al4rn5a65ip2bq0psb1pdvh111h5zqxdrb"; system = "cl-mtgnet"; asd = "cl-mtgnet"; @@ -29230,7 +29899,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mtgnet-async" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mtgnet/2018-07-11/cl-mtgnet-20180711-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mtgnet/2018-07-11/cl-mtgnet-20180711-git.tgz"; sha256 = "08mwkfa9s51is6npn7al4rn5a65ip2bq0psb1pdvh111h5zqxdrb"; system = "cl-mtgnet-async"; asd = "cl-mtgnet-async"; @@ -29253,7 +29922,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mtgnet-sync" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mtgnet/2018-07-11/cl-mtgnet-20180711-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mtgnet/2018-07-11/cl-mtgnet-20180711-git.tgz"; sha256 = "08mwkfa9s51is6npn7al4rn5a65ip2bq0psb1pdvh111h5zqxdrb"; system = "cl-mtgnet-sync"; asd = "cl-mtgnet-sync"; @@ -29276,7 +29945,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-murmurhash" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-murmurhash/2021-06-30/cl-murmurhash-20210630-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-murmurhash/2021-06-30/cl-murmurhash-20210630-git.tgz"; sha256 = "0251r0mpjm0y3qsm4lm7ncvrkxvgwc53spdm1p2mpayhvkkqqsws"; system = "cl-murmurhash"; asd = "cl-murmurhash"; @@ -29296,7 +29965,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mustache" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mustache/2024-10-12/cl-mustache-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mustache/2024-10-12/cl-mustache-20241012-git.tgz"; sha256 = "0isdrz1dgjvmfqvsgs2pmrran41w9n6f44r9fpdhdkjxa5zvy46b"; system = "cl-mustache"; asd = "cl-mustache"; @@ -29314,7 +29983,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mustache-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mustache/2024-10-12/cl-mustache-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mustache/2024-10-12/cl-mustache-20241012-git.tgz"; sha256 = "0isdrz1dgjvmfqvsgs2pmrran41w9n6f44r9fpdhdkjxa5zvy46b"; system = "cl-mustache-test"; asd = "cl-mustache-test"; @@ -29338,7 +30007,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-muth" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-muth/2022-07-07/cl-muth-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-muth/2022-07-07/cl-muth-stable-git.tgz"; sha256 = "0409arzy51chgi9anj9s2zn0qkx9wnphlbwcdvpamr4b51b60xjz"; system = "cl-muth"; asd = "cl-muth"; @@ -29364,7 +30033,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mw" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz"; sha256 = "1bpkpb86hpp7sz9mk19rbdlfcis2npc3a7w6jlph7s8brxl1h1jn"; system = "cl-mw"; asd = "cl-mw"; @@ -29390,7 +30059,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mw.examples.argument-processing" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz"; sha256 = "1bpkpb86hpp7sz9mk19rbdlfcis2npc3a7w6jlph7s8brxl1h1jn"; system = "cl-mw.examples.argument-processing"; asd = "cl-mw.examples.argument-processing"; @@ -29410,7 +30079,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mw.examples.hello-world" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz"; sha256 = "1bpkpb86hpp7sz9mk19rbdlfcis2npc3a7w6jlph7s8brxl1h1jn"; system = "cl-mw.examples.hello-world"; asd = "cl-mw.examples.hello-world"; @@ -29430,7 +30099,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mw.examples.higher-order" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz"; sha256 = "1bpkpb86hpp7sz9mk19rbdlfcis2npc3a7w6jlph7s8brxl1h1jn"; system = "cl-mw.examples.higher-order"; asd = "cl-mw.examples.higher-order"; @@ -29450,7 +30119,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mw.examples.monte-carlo-pi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz"; sha256 = "1bpkpb86hpp7sz9mk19rbdlfcis2npc3a7w6jlph7s8brxl1h1jn"; system = "cl-mw.examples.monte-carlo-pi"; asd = "cl-mw.examples.monte-carlo-pi"; @@ -29470,7 +30139,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mw.examples.ping" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz"; sha256 = "1bpkpb86hpp7sz9mk19rbdlfcis2npc3a7w6jlph7s8brxl1h1jn"; system = "cl-mw.examples.ping"; asd = "cl-mw.examples.ping"; @@ -29490,7 +30159,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mw.examples.with-task-policy" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz"; sha256 = "1bpkpb86hpp7sz9mk19rbdlfcis2npc3a7w6jlph7s8brxl1h1jn"; system = "cl-mw.examples.with-task-policy"; asd = "cl-mw.examples.with-task-policy"; @@ -29510,7 +30179,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-myriam" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-myriam/2022-03-31/cl-myriam-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-myriam/2022-03-31/cl-myriam-20220331-git.tgz"; sha256 = "0vyyyy6yj62id5m1a98rbq3pz7hm74znnawxh4apqhrff37xcs1l"; system = "cl-myriam"; asd = "cl-myriam"; @@ -29542,7 +30211,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mysql" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mysql/2024-10-12/cl-mysql-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mysql/2024-10-12/cl-mysql-20241012-git.tgz"; sha256 = "0ibxfjnvcgpibsfqjx2d3dcjcabiw6dj43vmr76b55fc4qlkjvz5"; system = "cl-mysql"; asd = "cl-mysql"; @@ -29560,7 +30229,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-mysql-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mysql/2024-10-12/cl-mysql-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mysql/2024-10-12/cl-mysql-20241012-git.tgz"; sha256 = "0ibxfjnvcgpibsfqjx2d3dcjcabiw6dj43vmr76b55fc4qlkjvz5"; system = "cl-mysql-test"; asd = "cl-mysql-test"; @@ -29583,7 +30252,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-naive-deprecation" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-naive-deprecation/2024-10-12/cl-naive-deprecation-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-naive-deprecation/2024-10-12/cl-naive-deprecation-20241012-git.tgz"; sha256 = "17x6b5sr34qjfzbn2r6f5n4xa4p1qi438k792b48qiqnalkfp29m"; system = "cl-naive-deprecation"; asd = "cl-naive-deprecation"; @@ -29596,49 +30265,6 @@ lib.makeScope pkgs.newScope (self: { }; } ); - cl-naive-ptrees = ( - build-asdf-system { - pname = "cl-naive-ptrees"; - version = "20241012-git"; - asds = [ "cl-naive-ptrees" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/cl-naive-ptrees/2024-10-12/cl-naive-ptrees-20241012-git.tgz"; - sha256 = "10548wm3mpjxmjibidv1dd8wzcn3nn12pzwlpdd1li362v8l9n6y"; - system = "cl-naive-ptrees"; - asd = "cl-naive-ptrees"; - } - ); - systems = [ "cl-naive-ptrees" ]; - lispLibs = [ ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - cl-naive-ptrees_dot_tests = ( - build-asdf-system { - pname = "cl-naive-ptrees.tests"; - version = "20241012-git"; - asds = [ "cl-naive-ptrees.tests" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/cl-naive-ptrees/2024-10-12/cl-naive-ptrees-20241012-git.tgz"; - sha256 = "10548wm3mpjxmjibidv1dd8wzcn3nn12pzwlpdd1li362v8l9n6y"; - system = "cl-naive-ptrees.tests"; - asd = "cl-naive-ptrees.tests"; - } - ); - systems = [ "cl-naive-ptrees.tests" ]; - lispLibs = [ - (getAttr "cl-naive-ptrees" self) - (getAttr "cl-naive-tests" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); cl-naive-tests = ( build-asdf-system { pname = "cl-naive-tests"; @@ -29646,7 +30272,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-naive-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-naive-tests/2024-10-12/cl-naive-tests-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-naive-tests/2024-10-12/cl-naive-tests-20241012-git.tgz"; sha256 = "1b7vvl5myybx92k778p3ca5367g4m6rh5k3rpr6qp9p4amd0yy2f"; system = "cl-naive-tests"; asd = "cl-naive-tests"; @@ -29666,7 +30292,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-naive-tests.tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-naive-tests/2024-10-12/cl-naive-tests-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-naive-tests/2024-10-12/cl-naive-tests-20241012-git.tgz"; sha256 = "1b7vvl5myybx92k778p3ca5367g4m6rh5k3rpr6qp9p4amd0yy2f"; system = "cl-naive-tests.tests"; asd = "cl-naive-tests.tests"; @@ -29686,7 +30312,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ncurses" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ncurses/2010-10-06/cl-ncurses_0.1.4.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ncurses/2010-10-06/cl-ncurses_0.1.4.tgz"; sha256 = "1frcap93i4ni3d648rrbnjjpz7p4cxlv57mmzlpxpzchzbcga026"; system = "cl-ncurses"; asd = "cl-ncurses"; @@ -29706,7 +30332,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-neo4j" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-neo4j/2013-01-28/cl-neo4j-release-b8ad637a-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-neo4j/2013-01-28/cl-neo4j-release-b8ad637a-git.tgz"; sha256 = "061xqjn08aqynfqygk48pwjp1d1mnhcb6fnl4lcfyw261dxsp871"; system = "cl-neo4j"; asd = "cl-neo4j"; @@ -29734,7 +30360,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-neo4j.tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-neo4j/2013-01-28/cl-neo4j-release-b8ad637a-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-neo4j/2013-01-28/cl-neo4j-release-b8ad637a-git.tgz"; sha256 = "061xqjn08aqynfqygk48pwjp1d1mnhcb6fnl4lcfyw261dxsp871"; system = "cl-neo4j.tests"; asd = "cl-neo4j"; @@ -29757,7 +30383,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-neovim" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-neovim/2024-10-12/cl-neovim-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-neovim/2024-10-12/cl-neovim-20241012-git.tgz"; sha256 = "1c72qy10kmccpfl90q4c0yinmy9z9mdqniqx24269h91xd3jyagc"; system = "cl-neovim"; asd = "cl-neovim"; @@ -29783,7 +30409,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-netpbm" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-netpbm/2024-10-12/cl-netpbm-20241012-hg.tgz"; + url = "https://beta.quicklisp.org/archive/cl-netpbm/2024-10-12/cl-netpbm-20241012-hg.tgz"; sha256 = "16dv3d6x62vvc9wdvm2dc9mrm29ypzjzn2fvy46kl0h0wg7hjz92"; system = "cl-netpbm"; asd = "cl-netpbm"; @@ -29803,7 +30429,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-netstring+" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-netstring-plus/2015-07-09/cl-netstring-plus-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-netstring-plus/2015-07-09/cl-netstring-plus-20150709-git.tgz"; sha256 = "03nxhgkab8lsx8mvavd4yny1894yxl5bllvqb12hyjdgg1v8whrr"; system = "cl-netstring+"; asd = "cl-netstring+"; @@ -29826,7 +30452,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-netstrings" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-netstrings/2012-10-13/cl-netstrings-20121013-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-netstrings/2012-10-13/cl-netstrings-20121013-git.tgz"; sha256 = "1mprrb8i3fjpmw7w461ib8zrcjwx77sqwaxyqq7i8yqkbhk7p1ql"; system = "cl-netstrings"; asd = "cl-netstrings"; @@ -29849,7 +30475,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-notebook" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-notebook/2020-12-20/cl-notebook-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-notebook/2020-12-20/cl-notebook-20201220-git.tgz"; sha256 = "0kg5wdclz9i64gcx27z5bs739hsvjrfl9kf1awi31x4142yxrva8"; system = "cl-notebook"; asd = "cl-notebook"; @@ -29882,7 +30508,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ntp-client" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ntp-client/2021-06-30/cl-ntp-client-20210630-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ntp-client/2021-06-30/cl-ntp-client-20210630-git.tgz"; sha256 = "1mc16bvs0l8srnxjcjg4m192rw5waq291zks2jslxmxij0pa28cm"; system = "cl-ntp-client"; asd = "cl-ntp-client"; @@ -29905,7 +30531,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ntriples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ntriples/2019-03-07/cl-ntriples-20190307-hg.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ntriples/2019-03-07/cl-ntriples-20190307-hg.tgz"; sha256 = "0k8q2r2nxkgxp91398gb0iwfy9kd2mn519nxxa3zq831c433l2mq"; system = "cl-ntriples"; asd = "cl-ntriples"; @@ -29925,7 +30551,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-oauth" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-oauth/2015-08-04/cl-oauth-20150804-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-oauth/2015-08-04/cl-oauth-20150804-git.tgz"; sha256 = "1q4r5i3099684q5x9wqddrm9g88qm16nnra9glvxngywfjc5zzkk"; system = "cl-oauth"; asd = "cl-oauth"; @@ -29958,7 +30584,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-oauth.tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-oauth/2015-08-04/cl-oauth-20150804-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-oauth/2015-08-04/cl-oauth-20150804-git.tgz"; sha256 = "1q4r5i3099684q5x9wqddrm9g88qm16nnra9glvxngywfjc5zzkk"; system = "cl-oauth.tests"; asd = "cl-oauth"; @@ -29981,7 +30607,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-oclapi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-oclapi/2018-08-31/cl-oclapi-20180831-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-oclapi/2018-08-31/cl-oclapi-20180831-git.tgz"; sha256 = "0aix5ipw98fsnvg1w7qmrjbwgn70gn7vf5av21xsgblp2sd7w2aw"; system = "cl-oclapi"; asd = "cl-oclapi"; @@ -30006,7 +30632,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-oclapi-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-oclapi/2018-08-31/cl-oclapi-20180831-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-oclapi/2018-08-31/cl-oclapi-20180831-git.tgz"; sha256 = "0aix5ipw98fsnvg1w7qmrjbwgn70gn7vf5av21xsgblp2sd7w2aw"; system = "cl-oclapi-test"; asd = "cl-oclapi-test"; @@ -30031,7 +30657,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-octet-streams" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-octet-streams/2020-12-20/cl-octet-streams-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-octet-streams/2020-12-20/cl-octet-streams-20201220-git.tgz"; sha256 = "1hffh98bv4w5yrchagzwqrc43d2p473pvw7ka4kyyvhrr52dk2f8"; system = "cl-octet-streams"; asd = "cl-octet-streams"; @@ -30051,7 +30677,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ode" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ode/2016-06-28/cl-ode-20160628-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ode/2016-06-28/cl-ode-20160628-git.tgz"; sha256 = "1pxm2pq0br0rhdfnvs5jqfkxfs8bc9wdqrzwyv83l8n7pax941b0"; system = "cl-ode"; asd = "cl-ode"; @@ -30071,7 +30697,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ohm" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ohm/2018-02-28/cl-ohm-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ohm/2018-02-28/cl-ohm-20180228-git.tgz"; sha256 = "00gdfsiba761gk7xw91wfnr9yv84maagf9idh55bk5bs4ws1ymyp"; system = "cl-ohm"; asd = "cl-ohm"; @@ -30091,12 +30717,12 @@ lib.makeScope pkgs.newScope (self: { cl-oju = ( build-asdf-system { pname = "cl-oju"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-oju" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-oju/2024-10-12/cl-oju-20241012-git.tgz"; - sha256 = "0gwzxl4pj45jq7vx6vssgzsp4xxc99bzfi6fbklc5nnlfkqq0v62"; + url = "https://beta.quicklisp.org/archive/cl-oju/2025-06-22/cl-oju-20250622-git.tgz"; + sha256 = "1gsi43fk1brh0is5k9ahwp3vshb63i8mizf2zshk231zd9rvp1ai"; system = "cl-oju"; asd = "cl-oju"; } @@ -30115,7 +30741,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-olefs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-olefs/2015-07-09/cl-olefs-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-olefs/2015-07-09/cl-olefs-20150709-git.tgz"; sha256 = "0cqna6zzfrjmsq17yc4wg204kr77riczqjpm1w5cj1mba43zcac7"; system = "cl-olefs"; asd = "cl-olefs"; @@ -30135,7 +30761,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-one-time-passwords" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-one-time-passwords/2017-10-19/cl-one-time-passwords-20171019-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-one-time-passwords/2017-10-19/cl-one-time-passwords-20171019-git.tgz"; sha256 = "1nhq2jij257cfaadh9k421qaisicxpmx3wsc4kivf1psgbrc56lg"; system = "cl-one-time-passwords"; asd = "cl-one-time-passwords"; @@ -30155,7 +30781,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-one-time-passwords-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-one-time-passwords/2017-10-19/cl-one-time-passwords-20171019-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-one-time-passwords/2017-10-19/cl-one-time-passwords-20171019-git.tgz"; sha256 = "1nhq2jij257cfaadh9k421qaisicxpmx3wsc4kivf1psgbrc56lg"; system = "cl-one-time-passwords-test"; asd = "cl-one-time-passwords-test"; @@ -30178,7 +30804,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-oneliner" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/oneliner/2013-10-03/oneliner-20131003-git.tgz"; + url = "https://beta.quicklisp.org/archive/oneliner/2013-10-03/oneliner-20131003-git.tgz"; sha256 = "0q9350s0r9yjmfc2360g35qi04b3867gd7hw5ada4176whinmjxb"; system = "cl-oneliner"; asd = "cl-oneliner"; @@ -30202,7 +30828,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-online-learning" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-online-learning/2022-03-31/cl-online-learning-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-online-learning/2022-03-31/cl-online-learning-20220331-git.tgz"; sha256 = "136v9kxcy53qar2j4y38awnw2idnf0lwxqwx7wgak664w3hxs6k8"; system = "cl-online-learning"; asd = "cl-online-learning"; @@ -30225,7 +30851,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-online-learning-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-online-learning/2022-03-31/cl-online-learning-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-online-learning/2022-03-31/cl-online-learning-20220331-git.tgz"; sha256 = "136v9kxcy53qar2j4y38awnw2idnf0lwxqwx7wgak664w3hxs6k8"; system = "cl-online-learning-test"; asd = "cl-online-learning-test"; @@ -30249,7 +30875,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-openal" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-openal/2022-11-06/cl-openal-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-openal/2022-11-06/cl-openal-20221106-git.tgz"; sha256 = "0jmp81mf23ckcm4knnh0q7zpmyls5220imaqbmnl0xvvra10b1zy"; system = "cl-openal"; asd = "cl-openal"; @@ -30272,7 +30898,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-openal-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-openal/2022-11-06/cl-openal-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-openal/2022-11-06/cl-openal-20221106-git.tgz"; sha256 = "0jmp81mf23ckcm4knnh0q7zpmyls5220imaqbmnl0xvvra10b1zy"; system = "cl-openal-examples"; asd = "cl-openal-examples"; @@ -30297,7 +30923,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-opencl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-opencl/2021-12-09/cl-opencl-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-opencl/2021-12-09/cl-opencl-20211209-git.tgz"; sha256 = "1agg6rg7lsbq2jgarx25bwm1nw22jpl20bzhyn4ivygcgzp2mv29"; system = "cl-opencl"; asd = "cl-opencl"; @@ -30320,7 +30946,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-opencl-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-opencl-utils/2023-02-14/cl-opencl-utils-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-opencl-utils/2023-02-14/cl-opencl-utils-20230214-git.tgz"; sha256 = "17l4wsvhjj3zvhl5nsigh9fwnv7s7xiqfk2998gh86j32a02r95y"; system = "cl-opencl-utils"; asd = "cl-opencl-utils"; @@ -30336,12 +30962,12 @@ lib.makeScope pkgs.newScope (self: { cl-opengl = ( build-asdf-system { pname = "cl-opengl"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-opengl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-opengl/2024-10-12/cl-opengl-20241012-git.tgz"; - sha256 = "1xpa3x9fx7wxrs5xmkj13yzh2wjfnlb0ihirfr9clngpv1y4gcm6"; + url = "https://beta.quicklisp.org/archive/cl-opengl/2025-06-22/cl-opengl-20250622-git.tgz"; + sha256 = "1ksm330gsw20ajcl1jri3s7ydmrkyqbmajmk4gp452nsgqm62axm"; system = "cl-opengl"; asd = "cl-opengl"; } @@ -30364,7 +30990,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-opensearch-query-builder" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-opensearch-query-builder/2024-10-12/cl-opensearch-query-builder-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-opensearch-query-builder/2024-10-12/cl-opensearch-query-builder-20241012-git.tgz"; sha256 = "1pxlafahhgwyfhila0ikbpljcxgi59cqd2m6dvlib6ii90yq5dqx"; system = "cl-opensearch-query-builder"; asd = "cl-opensearch-query-builder"; @@ -30384,7 +31010,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-openstack-client" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-openstack-client/2019-10-07/cl-openstack-client-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-openstack-client/2019-10-07/cl-openstack-client-20191007-git.tgz"; sha256 = "1sak75i82vn3acg7bxx8vjbw2y35wbq1vkh1yqhs68ksnph6d097"; system = "cl-openstack-client"; asd = "cl-openstack-client"; @@ -30410,7 +31036,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-openstack-client-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-openstack-client/2019-10-07/cl-openstack-client-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-openstack-client/2019-10-07/cl-openstack-client-20191007-git.tgz"; sha256 = "1sak75i82vn3acg7bxx8vjbw2y35wbq1vkh1yqhs68ksnph6d097"; system = "cl-openstack-client-test"; asd = "cl-openstack-client-test"; @@ -30439,7 +31065,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-opsresearch" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-opsresearch/2017-04-03/cl-opsresearch-20170403-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-opsresearch/2017-04-03/cl-opsresearch-20170403-git.tgz"; sha256 = "1fipw6qjggswzcg8ifwx5qnhnc7mmi53s6h14l0vzj6afa5rdpm7"; system = "cl-opsresearch"; asd = "cl-opsresearch"; @@ -30459,7 +31085,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-opus" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-opus/2024-10-12/cl-opus-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-opus/2024-10-12/cl-opus-20241012-git.tgz"; sha256 = "183xjlqjwildm1fb8piiic1f6l9fx4mxf9gcagpav8r60d1wmbpm"; system = "cl-opus"; asd = "cl-opus"; @@ -30485,7 +31111,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-org-mode" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-org-mode/2010-12-07/cl-org-mode-20101207-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-org-mode/2010-12-07/cl-org-mode-20101207-git.tgz"; sha256 = "1fvwl9jlbpd352b5zn2d45mabsim5xvzabwyz1h10hwv4gviymzf"; system = "cl-org-mode"; asd = "cl-org-mode"; @@ -30504,12 +31130,12 @@ lib.makeScope pkgs.newScope (self: { cl-out123 = ( build-asdf-system { pname = "cl-out123"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "cl-out123" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-out123/2023-10-21/cl-out123-20231021-git.tgz"; - sha256 = "1h48hfd956799wx9kmkmb9azg01jmjbnj16b6z9ciw9y9k5jlzsh"; + url = "https://beta.quicklisp.org/archive/cl-out123/2025-06-22/cl-out123-20250622-git.tgz"; + sha256 = "1qsdp2pk1b4b3vfy0n7k70q1xa5kjkddsvf4lqw0lawh1m88mb9i"; system = "cl-out123"; asd = "cl-out123"; } @@ -30534,7 +31160,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-pack" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-pack/2020-04-27/cl-pack-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-pack/2020-04-27/cl-pack-20200427-git.tgz"; sha256 = "0q7gawy0cwy49m1mxgj0jqnzzckk2ps74ncfaw1pqiqilfyx7np6"; system = "cl-pack"; asd = "cl-pack"; @@ -30554,7 +31180,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-pack-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-pack/2020-04-27/cl-pack-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-pack/2020-04-27/cl-pack-20200427-git.tgz"; sha256 = "0q7gawy0cwy49m1mxgj0jqnzzckk2ps74ncfaw1pqiqilfyx7np6"; system = "cl-pack-test"; asd = "cl-pack"; @@ -30574,7 +31200,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-package-locks" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-package-locks/2011-12-03/cl-package-locks-20111203-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-package-locks/2011-12-03/cl-package-locks-20111203-git.tgz"; sha256 = "0g3gfljnvpgd66ccd2sqawlkwqx4a0wsdrg5180va61w869cgxqq"; system = "cl-package-locks"; asd = "cl-package-locks"; @@ -30594,7 +31220,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-pango" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-pango/2017-04-03/cl-pango-20170403-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-pango/2017-04-03/cl-pango-20170403-git.tgz"; sha256 = "0zkn4yn8nkkjr0x1vcy856cvbmnyhdidqz0in8xvd2i93jvw5w0i"; system = "cl-pango"; asd = "cl-pango"; @@ -30616,7 +31242,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-parallel" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-parallel/2013-03-12/cl-parallel-20130312-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-parallel/2013-03-12/cl-parallel-20130312-git.tgz"; sha256 = "1hmkcbwkj7rx8zg5wf2w06nvbabldpr7hbbg1ycj0fss86s2cx2c"; system = "cl-parallel"; asd = "cl-parallel"; @@ -30636,7 +31262,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-pass" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-pass/2020-12-20/cl-pass-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-pass/2020-12-20/cl-pass-20201220-git.tgz"; sha256 = "05qx4jrkxqbqi72cxgswbpnifbdvp9mh7apc7566v522899bh0hb"; system = "cl-pass"; asd = "cl-pass"; @@ -30660,7 +31286,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-pass-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-pass/2020-12-20/cl-pass-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-pass/2020-12-20/cl-pass-20201220-git.tgz"; sha256 = "05qx4jrkxqbqi72cxgswbpnifbdvp9mh7apc7566v522899bh0hb"; system = "cl-pass-test"; asd = "cl-pass-test"; @@ -30683,7 +31309,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-paths" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-vectors/2024-10-12/cl-vectors-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-vectors/2024-10-12/cl-vectors-20241012-git.tgz"; sha256 = "1nkmmn38y6af10ysff3g2qkf5lb2601dcjp5rffsjh6bv2ik2jd5"; system = "cl-paths"; asd = "cl-paths"; @@ -30701,7 +31327,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-paths-ttf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-vectors/2024-10-12/cl-vectors-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-vectors/2024-10-12/cl-vectors-20241012-git.tgz"; sha256 = "1nkmmn38y6af10ysff3g2qkf5lb2601dcjp5rffsjh6bv2ik2jd5"; system = "cl-paths-ttf"; asd = "cl-paths-ttf"; @@ -30722,7 +31348,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-pattern" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-pattern/2014-07-13/cl-pattern-20140713-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-pattern/2014-07-13/cl-pattern-20140713-git.tgz"; sha256 = "0kc1yynn1ysa7bcaazhi1pq8l3hj3jq6p835kh5di7g1imrfkrny"; system = "cl-pattern"; asd = "cl-pattern"; @@ -30745,7 +31371,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-pattern-benchmark" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-pattern/2014-07-13/cl-pattern-20140713-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-pattern/2014-07-13/cl-pattern-20140713-git.tgz"; sha256 = "0kc1yynn1ysa7bcaazhi1pq8l3hj3jq6p835kh5di7g1imrfkrny"; system = "cl-pattern-benchmark"; asd = "cl-pattern-benchmark"; @@ -30761,12 +31387,12 @@ lib.makeScope pkgs.newScope (self: { cl-patterns = ( build-asdf-system { pname = "cl-patterns"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-patterns" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-patterns/2024-10-12/cl-patterns-20241012-git.tgz"; - sha256 = "0g0q514fn1hxq518358yy2va4cb9xxqwds9cglw133qxy0wsjllh"; + url = "https://beta.quicklisp.org/archive/cl-patterns/2025-06-22/cl-patterns-20250622-git.tgz"; + sha256 = "0lp01gp0dnbryc35kkh33s6ifninw1w41n38mq9idgwk806ylr4j"; system = "cl-patterns"; asd = "cl-patterns"; } @@ -30792,7 +31418,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-paymill" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-paymill/2013-11-11/cl-paymill-20131111-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-paymill/2013-11-11/cl-paymill-20131111-git.tgz"; sha256 = "1dhddmw7gxfxbv1vfqi6nzyh8m5n3b160ch6ianf5sn6apmi92nw"; system = "cl-paymill"; asd = "cl-paymill"; @@ -30816,7 +31442,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-paypal" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-paypal/2010-10-06/cl-paypal-20101006-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-paypal/2010-10-06/cl-paypal-20101006-git.tgz"; sha256 = "0cc6zv17klgiyj1mbbrkbvajkr6dwsjv3iilh57vhdqd01lrhnb2"; system = "cl-paypal"; asd = "cl-paypal"; @@ -30840,7 +31466,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-pcg" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-pcg/2020-10-16/cl-pcg-20201016-hg.tgz"; + url = "https://beta.quicklisp.org/archive/cl-pcg/2020-10-16/cl-pcg-20201016-hg.tgz"; sha256 = "1w2b2y5fgjc6z8akvlmwasj90dnjv55nvb8pghq4xpv43hfy73mp"; system = "cl-pcg"; asd = "cl-pcg"; @@ -30860,7 +31486,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-pcg.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-pcg/2020-10-16/cl-pcg-20201016-hg.tgz"; + url = "https://beta.quicklisp.org/archive/cl-pcg/2020-10-16/cl-pcg-20201016-hg.tgz"; sha256 = "1w2b2y5fgjc6z8akvlmwasj90dnjv55nvb8pghq4xpv43hfy73mp"; system = "cl-pcg.test"; asd = "cl-pcg.test"; @@ -30883,7 +31509,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-pdf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-pdf/2023-10-21/cl-pdf-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-pdf/2023-10-21/cl-pdf-20231021-git.tgz"; sha256 = "1x88fvk3kxi3k6a84iajb6myw67z8n3plfidq8d4c26ymiz0kvfm"; system = "cl-pdf"; asd = "cl-pdf"; @@ -30904,7 +31530,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-pdf-doc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-typesetting/2021-05-31/cl-typesetting-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-typesetting/2021-05-31/cl-typesetting-20210531-git.tgz"; sha256 = "0fcs5mq0gxfczbrg7ay8r4bf5r4g6blvpdbjkhcl8dapcikyn35h"; system = "cl-pdf-doc"; asd = "cl-pdf-doc"; @@ -30927,7 +31553,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-pdf-parser" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-pdf/2023-10-21/cl-pdf-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-pdf/2023-10-21/cl-pdf-20231021-git.tgz"; sha256 = "1x88fvk3kxi3k6a84iajb6myw67z8n3plfidq8d4c26ymiz0kvfm"; system = "cl-pdf-parser"; asd = "cl-pdf-parser"; @@ -30947,7 +31573,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-performance-tuning-helper" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-performance-tuning-helper/2013-06-15/cl-performance-tuning-helper-20130615-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-performance-tuning-helper/2013-06-15/cl-performance-tuning-helper-20130615-git.tgz"; sha256 = "1j0k319il271grm6hjqq2bazp5l105lazayqsmpsy8lsy4lmy0c3"; system = "cl-performance-tuning-helper"; asd = "cl-performance-tuning-helper"; @@ -30967,7 +31593,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-performance-tuning-helper-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-performance-tuning-helper/2013-06-15/cl-performance-tuning-helper-20130615-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-performance-tuning-helper/2013-06-15/cl-performance-tuning-helper-20130615-git.tgz"; sha256 = "1j0k319il271grm6hjqq2bazp5l105lazayqsmpsy8lsy4lmy0c3"; system = "cl-performance-tuning-helper-test"; asd = "cl-performance-tuning-helper-test"; @@ -30990,7 +31616,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-permutation" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-permutation/2023-10-21/cl-permutation-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-permutation/2023-10-21/cl-permutation-20231021-git.tgz"; sha256 = "1zq7hjfn854jr1sglagvdpn749ihxki0l1wcbg9nd2i7ds1g5h4y"; system = "cl-permutation"; asd = "cl-permutation"; @@ -31018,7 +31644,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-permutation-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-permutation/2023-10-21/cl-permutation-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-permutation/2023-10-21/cl-permutation-20231021-git.tgz"; sha256 = "1zq7hjfn854jr1sglagvdpn749ihxki0l1wcbg9nd2i7ds1g5h4y"; system = "cl-permutation-examples"; asd = "cl-permutation-examples"; @@ -31041,7 +31667,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-permutation-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-permutation/2023-10-21/cl-permutation-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-permutation/2023-10-21/cl-permutation-20231021-git.tgz"; sha256 = "1zq7hjfn854jr1sglagvdpn749ihxki0l1wcbg9nd2i7ds1g5h4y"; system = "cl-permutation-tests"; asd = "cl-permutation-tests"; @@ -31065,7 +31691,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-photo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-photo/2015-09-23/cl-photo-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-photo/2015-09-23/cl-photo-20150923-git.tgz"; sha256 = "03rzsi1rqvlnw43z7kh5sy1h8gjxc5n0cfryfkkqnhym9q9186mj"; system = "cl-photo"; asd = "cl-photo"; @@ -31085,7 +31711,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-photo-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-photo/2015-09-23/cl-photo-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-photo/2015-09-23/cl-photo-20150923-git.tgz"; sha256 = "03rzsi1rqvlnw43z7kh5sy1h8gjxc5n0cfryfkkqnhym9q9186mj"; system = "cl-photo-tests"; asd = "cl-photo-tests"; @@ -31108,7 +31734,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-plplot" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-plplot/2018-02-28/cl-plplot-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-plplot/2018-02-28/cl-plplot-20180228-git.tgz"; sha256 = "0hfgq47ga2r764jfc3ywaz5ynnvp701fjhbw0s4j1mrw4gaf6y6w"; system = "cl-plplot"; asd = "cl-plplot"; @@ -31128,7 +31754,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-plumbing" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-plumbing/2018-10-18/cl-plumbing-20181018-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-plumbing/2018-10-18/cl-plumbing-20181018-git.tgz"; sha256 = "0bc4qqj0c4hghwx8jm3vg422c3i8livv3vvzfzi0gw79khaqdiyr"; system = "cl-plumbing"; asd = "cl-plumbing"; @@ -31152,7 +31778,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-plumbing-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-plumbing/2018-10-18/cl-plumbing-20181018-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-plumbing/2018-10-18/cl-plumbing-20181018-git.tgz"; sha256 = "0bc4qqj0c4hghwx8jm3vg422c3i8livv3vvzfzi0gw79khaqdiyr"; system = "cl-plumbing-test"; asd = "cl-plumbing-test"; @@ -31176,7 +31802,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-plus-c" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-autowrap/2024-10-12/cl-autowrap-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-autowrap/2024-10-12/cl-autowrap-20241012-git.tgz"; sha256 = "1sfvhyrwm9dhxi0y42xp7mx8mvs6lmq3bzxdx34frxni5srcgly0"; system = "cl-plus-c"; asd = "cl-plus-c"; @@ -31192,12 +31818,12 @@ lib.makeScope pkgs.newScope (self: { cl-plus-ssl-osx-fix = ( build-asdf-system { pname = "cl-plus-ssl-osx-fix"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-plus-ssl-osx-fix" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-plus-ssl-osx-fix/2024-10-12/cl-plus-ssl-osx-fix-20241012-git.tgz"; - sha256 = "0rkrazia05zzwzd9vx2kl1azwgjy0d4pvfmwp5mjmqsvpklgacwv"; + url = "https://beta.quicklisp.org/archive/cl-plus-ssl-osx-fix/2025-06-22/cl-plus-ssl-osx-fix-20250622-git.tgz"; + sha256 = "00ian3xkchag5c3acwjrn42g2vp19rwfvcfhslri4fdns769myp1"; system = "cl-plus-ssl-osx-fix"; asd = "cl-plus-ssl-osx-fix"; } @@ -31215,12 +31841,12 @@ lib.makeScope pkgs.newScope (self: { cl-plus-ssl-osx-fix-ci = ( build-asdf-system { pname = "cl-plus-ssl-osx-fix-ci"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-plus-ssl-osx-fix-ci" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-plus-ssl-osx-fix/2024-10-12/cl-plus-ssl-osx-fix-20241012-git.tgz"; - sha256 = "0rkrazia05zzwzd9vx2kl1azwgjy0d4pvfmwp5mjmqsvpklgacwv"; + url = "https://beta.quicklisp.org/archive/cl-plus-ssl-osx-fix/2025-06-22/cl-plus-ssl-osx-fix-20250622-git.tgz"; + sha256 = "00ian3xkchag5c3acwjrn42g2vp19rwfvcfhslri4fdns769myp1"; system = "cl-plus-ssl-osx-fix-ci"; asd = "cl-plus-ssl-osx-fix-ci"; } @@ -31235,12 +31861,12 @@ lib.makeScope pkgs.newScope (self: { cl-plus-ssl-osx-fix-docs = ( build-asdf-system { pname = "cl-plus-ssl-osx-fix-docs"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-plus-ssl-osx-fix-docs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-plus-ssl-osx-fix/2024-10-12/cl-plus-ssl-osx-fix-20241012-git.tgz"; - sha256 = "0rkrazia05zzwzd9vx2kl1azwgjy0d4pvfmwp5mjmqsvpklgacwv"; + url = "https://beta.quicklisp.org/archive/cl-plus-ssl-osx-fix/2025-06-22/cl-plus-ssl-osx-fix-20250622-git.tgz"; + sha256 = "00ian3xkchag5c3acwjrn42g2vp19rwfvcfhslri4fdns769myp1"; system = "cl-plus-ssl-osx-fix-docs"; asd = "cl-plus-ssl-osx-fix-docs"; } @@ -31261,12 +31887,12 @@ lib.makeScope pkgs.newScope (self: { cl-plus-ssl-osx-fix-tests = ( build-asdf-system { pname = "cl-plus-ssl-osx-fix-tests"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-plus-ssl-osx-fix-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-plus-ssl-osx-fix/2024-10-12/cl-plus-ssl-osx-fix-20241012-git.tgz"; - sha256 = "0rkrazia05zzwzd9vx2kl1azwgjy0d4pvfmwp5mjmqsvpklgacwv"; + url = "https://beta.quicklisp.org/archive/cl-plus-ssl-osx-fix/2025-06-22/cl-plus-ssl-osx-fix-20250622-git.tgz"; + sha256 = "00ian3xkchag5c3acwjrn42g2vp19rwfvcfhslri4fdns769myp1"; system = "cl-plus-ssl-osx-fix-tests"; asd = "cl-plus-ssl-osx-fix-tests"; } @@ -31285,7 +31911,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ply" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ply/2015-05-05/cl-ply-20150505-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ply/2015-05-05/cl-ply-20150505-git.tgz"; sha256 = "1va3il5ahvziwm6i3f2zy3vchv0qkh1l7jci7gnfam43gf88fl12"; system = "cl-ply"; asd = "cl-ply"; @@ -31308,7 +31934,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ply-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ply/2015-05-05/cl-ply-20150505-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ply/2015-05-05/cl-ply-20150505-git.tgz"; sha256 = "1va3il5ahvziwm6i3f2zy3vchv0qkh1l7jci7gnfam43gf88fl12"; system = "cl-ply-test"; asd = "cl-ply-test"; @@ -31332,7 +31958,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-poker-eval" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-poker-eval/2015-08-04/cl-poker-eval-20150804-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-poker-eval/2015-08-04/cl-poker-eval-20150804-git.tgz"; sha256 = "1w4dsr4j7r3n7p0jbp8ccwwk83wcjjiz1rhhfrqpsd9v263v7kw8"; system = "cl-poker-eval"; asd = "cl-poker-eval"; @@ -31352,7 +31978,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-pop" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-pop/2011-04-18/cl-pop-20110418-http.tgz"; + url = "https://beta.quicklisp.org/archive/cl-pop/2011-04-18/cl-pop-20110418-http.tgz"; sha256 = "1g47p9w2pzf7glx92cz859di9pz454xpaq97p76lcvyilxk6q819"; system = "cl-pop"; asd = "cl-pop"; @@ -31375,7 +32001,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-portaudio" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-portaudio/2020-12-20/cl-portaudio-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-portaudio/2020-12-20/cl-portaudio-20201220-git.tgz"; sha256 = "177c6bgf30caj5qpzfnzhbamax7c5zm2p4911mw7fay94vjs7zyb"; system = "cl-portaudio"; asd = "cl-portaudio"; @@ -31398,7 +32024,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-postgres" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/postmodern/2024-10-12/postmodern-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/postmodern/2024-10-12/postmodern-20241012-git.tgz"; sha256 = "1hj0dpclzihy1rcnwhiv16abmaa54wygxyib3j2h9q4qs26w7pzb"; system = "cl-postgres"; asd = "cl-postgres"; @@ -31418,12 +32044,12 @@ lib.makeScope pkgs.newScope (self: { cl-postgres_plus_local-time = ( build-asdf-system { pname = "cl-postgres+local-time"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-postgres+local-time" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/local-time/2024-10-12/local-time-20241012-git.tgz"; - sha256 = "0jb1mb5zs4ryiah8zjzhpln1z686mfmpmvg1phgpr2mh9vvlgjk2"; + url = "https://beta.quicklisp.org/archive/local-time/2025-06-22/local-time-20250622-git.tgz"; + sha256 = "1xdxm1js8n1b3k0g013s810hzf7jr6yhapyvj9agfyl7b6knj0kg"; system = "cl-postgres+local-time"; asd = "cl-postgres+local-time"; } @@ -31443,7 +32069,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-postgres+local-time-duration" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/local-time-duration/2018-04-30/local-time-duration-20180430-git.tgz"; + url = "https://beta.quicklisp.org/archive/local-time-duration/2018-04-30/local-time-duration-20180430-git.tgz"; sha256 = "0f13mg18lv31lclz9jvqyj8d85p1jj1366nlld8m3dxnnwsbbkd6"; system = "cl-postgres+local-time-duration"; asd = "cl-postgres+local-time-duration"; @@ -31466,7 +32092,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-postgres-datetime" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-postgres-datetime/2019-05-21/cl-postgres-datetime-20190521-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-postgres-datetime/2019-05-21/cl-postgres-datetime-20190521-git.tgz"; sha256 = "1vwv5j1i968927j070bagqx9i114a8phmx7k9ankj9j5zg5dj0l3"; system = "cl-postgres-datetime"; asd = "cl-postgres-datetime"; @@ -31490,7 +32116,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-postgres-plus-uuid" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-postgres-plus-uuid/2018-10-18/cl-postgres-plus-uuid-20181018-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-postgres-plus-uuid/2018-10-18/cl-postgres-plus-uuid-20181018-git.tgz"; sha256 = "1iw11v67gpwgpa5dw3d7chjmkc4d7sdwrqvnx0vg0m2qf4j7azmi"; system = "cl-postgres-plus-uuid"; asd = "cl-postgres-plus-uuid"; @@ -31509,12 +32135,12 @@ lib.makeScope pkgs.newScope (self: { cl-ppcre = ( build-asdf-system { pname = "cl-ppcre"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-ppcre" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ppcre/2024-10-12/cl-ppcre-20241012-git.tgz"; - sha256 = "0aw7lh79wgn18c75v29md2x8irl8v7f96lj1mfkp7x0mkqsb0cs8"; + url = "https://beta.quicklisp.org/archive/cl-ppcre/2025-06-22/cl-ppcre-20250622-git.tgz"; + sha256 = "0f7sh2pr81pkfx0d348shqjp21qj7px1k310dfmyjb4y40kq2kxn"; system = "cl-ppcre"; asd = "cl-ppcre"; } @@ -31527,12 +32153,12 @@ lib.makeScope pkgs.newScope (self: { cl-ppcre-template = ( build-asdf-system { pname = "cl-ppcre-template"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-ppcre-template" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-unification/2024-10-12/cl-unification-20241012-git.tgz"; - sha256 = "1q7bjj9dzazhgj32291rqy4lld1ilrpck374c21864qn3pmz31ag"; + url = "https://beta.quicklisp.org/archive/cl-unification/2025-06-22/cl-unification-20250622-git.tgz"; + sha256 = "0s9lhh6nzbbsds967aixadwzfqbdiy5f19xp2a5181gd970w187r"; system = "cl-ppcre-template"; asd = "cl-ppcre-template"; } @@ -31548,12 +32174,12 @@ lib.makeScope pkgs.newScope (self: { cl-ppcre-unicode = ( build-asdf-system { pname = "cl-ppcre-unicode"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-ppcre-unicode" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ppcre/2024-10-12/cl-ppcre-20241012-git.tgz"; - sha256 = "0aw7lh79wgn18c75v29md2x8irl8v7f96lj1mfkp7x0mkqsb0cs8"; + url = "https://beta.quicklisp.org/archive/cl-ppcre/2025-06-22/cl-ppcre-20250622-git.tgz"; + sha256 = "0f7sh2pr81pkfx0d348shqjp21qj7px1k310dfmyjb4y40kq2kxn"; system = "cl-ppcre-unicode"; asd = "cl-ppcre-unicode"; } @@ -31569,12 +32195,12 @@ lib.makeScope pkgs.newScope (self: { cl-prevalence = ( build-asdf-system { pname = "cl-prevalence"; - version = "20230214-git"; + version = "20250622-git"; asds = [ "cl-prevalence" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-prevalence/2023-02-14/cl-prevalence-20230214-git.tgz"; - sha256 = "1lb957ivshgp56phqhvhsmnc4r55x5shvi3mpsan2xsm4hvqspp0"; + url = "https://beta.quicklisp.org/archive/cl-prevalence/2025-06-22/cl-prevalence-20250622-git.tgz"; + sha256 = "0j5rplbx1lcm52y3jl86ji4kpc4jz6zznk25dc2m30ac16cqiavs"; system = "cl-prevalence"; asd = "cl-prevalence"; } @@ -31588,15 +32214,35 @@ lib.makeScope pkgs.newScope (self: { meta = { }; } ); + cl-prevalence-ci = ( + build-asdf-system { + pname = "cl-prevalence-ci"; + version = "20250622-git"; + asds = [ "cl-prevalence-ci" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-prevalence/2025-06-22/cl-prevalence-20250622-git.tgz"; + sha256 = "0j5rplbx1lcm52y3jl86ji4kpc4jz6zznk25dc2m30ac16cqiavs"; + system = "cl-prevalence-ci"; + asd = "cl-prevalence-ci"; + } + ); + systems = [ "cl-prevalence-ci" ]; + lispLibs = [ (getAttr "_40ants-ci" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); cl-prevalence-test = ( build-asdf-system { pname = "cl-prevalence-test"; - version = "20230214-git"; + version = "20250622-git"; asds = [ "cl-prevalence-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-prevalence/2023-02-14/cl-prevalence-20230214-git.tgz"; - sha256 = "1lb957ivshgp56phqhvhsmnc4r55x5shvi3mpsan2xsm4hvqspp0"; + url = "https://beta.quicklisp.org/archive/cl-prevalence/2025-06-22/cl-prevalence-20250622-git.tgz"; + sha256 = "0j5rplbx1lcm52y3jl86ji4kpc4jz6zznk25dc2m30ac16cqiavs"; system = "cl-prevalence-test"; asd = "cl-prevalence-test"; } @@ -31619,7 +32265,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-primality" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-primality/2015-06-08/cl-primality-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-primality/2015-06-08/cl-primality-20150608-git.tgz"; sha256 = "1hvbsd5x7yrrrh7jjq0p8ign3ppzzpacmmz7nps60wgk38q1b618"; system = "cl-primality"; asd = "cl-primality"; @@ -31639,7 +32285,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-primality-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-primality/2015-06-08/cl-primality-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-primality/2015-06-08/cl-primality-20150608-git.tgz"; sha256 = "1hvbsd5x7yrrrh7jjq0p8ign3ppzzpacmmz7nps60wgk38q1b618"; system = "cl-primality-test"; asd = "cl-primality-test"; @@ -31663,7 +32309,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-prime-maker" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-prime-maker/2015-03-02/cl-prime-maker-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-prime-maker/2015-03-02/cl-prime-maker-20150302-git.tgz"; sha256 = "0hs95zs990aiwspss2dzmjvl18ipvlkx3p9cgmcncqxhgkizds9s"; system = "cl-prime-maker"; asd = "cl-prime-maker"; @@ -31683,7 +32329,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-progress-bar" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-progress-bar/2021-12-09/cl-progress-bar-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-progress-bar/2021-12-09/cl-progress-bar-20211209-git.tgz"; sha256 = "1y4kg4qb4bxkqnc84mczx5fhqlr6qbagxwsn93xrilv8lqg8ymiv"; system = "cl-progress-bar"; asd = "cl-progress-bar"; @@ -31706,7 +32352,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-project" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-project/2024-10-12/cl-project-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-project/2024-10-12/cl-project-20241012-git.tgz"; sha256 = "12bvhs1ll6wxwgarvyxbrm978jxpvgj9vyqcbnwqmf5kqxjlrh0j"; system = "cl-project"; asd = "cl-project"; @@ -31731,7 +32377,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-project-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-project/2024-10-12/cl-project-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-project/2024-10-12/cl-project-20241012-git.tgz"; sha256 = "12bvhs1ll6wxwgarvyxbrm978jxpvgj9vyqcbnwqmf5kqxjlrh0j"; system = "cl-project-test"; asd = "cl-project-test"; @@ -31756,7 +32402,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-prolog2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg"; system = "cl-prolog2"; asd = "cl-prolog2"; @@ -31782,7 +32428,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-prolog2.bprolog" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg"; system = "cl-prolog2.bprolog"; asd = "cl-prolog2.bprolog"; @@ -31802,7 +32448,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-prolog2.bprolog.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg"; system = "cl-prolog2.bprolog.test"; asd = "cl-prolog2.bprolog.test"; @@ -31825,7 +32471,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-prolog2.gprolog" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg"; system = "cl-prolog2.gprolog"; asd = "cl-prolog2.gprolog"; @@ -31845,7 +32491,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-prolog2.gprolog.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg"; system = "cl-prolog2.gprolog.test"; asd = "cl-prolog2.gprolog.test"; @@ -31868,7 +32514,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-prolog2.swi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg"; system = "cl-prolog2.swi"; asd = "cl-prolog2.swi"; @@ -31888,7 +32534,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-prolog2.swi.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg"; system = "cl-prolog2.swi.test"; asd = "cl-prolog2.swi.test"; @@ -31911,7 +32557,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-prolog2.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg"; system = "cl-prolog2.test"; asd = "cl-prolog2.test"; @@ -31935,7 +32581,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-prolog2.xsb" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg"; system = "cl-prolog2.xsb"; asd = "cl-prolog2.xsb"; @@ -31955,7 +32601,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-prolog2.xsb.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg"; system = "cl-prolog2.xsb.test"; asd = "cl-prolog2.xsb.test"; @@ -31978,7 +32624,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-prolog2.yap" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg"; system = "cl-prolog2.yap"; asd = "cl-prolog2.yap"; @@ -31998,7 +32644,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-prolog2.yap.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg"; system = "cl-prolog2.yap.test"; asd = "cl-prolog2.yap.test"; @@ -32017,12 +32663,12 @@ lib.makeScope pkgs.newScope (self: { cl-protobufs_dot_asdf = ( build-asdf-system { pname = "cl-protobufs.asdf"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-protobufs.asdf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-protobufs/2024-10-12/cl-protobufs-20241012-git.tgz"; - sha256 = "08digcsyxs46pl7r5d945db5r2hbrxydqqcmzbgziq61ca4p0ifn"; + url = "https://beta.quicklisp.org/archive/cl-protobufs/2025-06-22/cl-protobufs-20250622-git.tgz"; + sha256 = "0kxryqk283qm7shrx7swiqkmv7kj1lawjlrz9pdqbci2fcs763kj"; system = "cl-protobufs.asdf"; asd = "cl-protobufs.asdf"; } @@ -32041,7 +32687,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-pslib" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-pslib/2024-10-12/cl-pslib-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-pslib/2024-10-12/cl-pslib-20241012-git.tgz"; sha256 = "12lg64nbjkxmaf212qr4i0msnsixc2cbqmxkdgqjii9rsyqdvrn6"; system = "cl-pslib"; asd = "cl-pslib"; @@ -32066,7 +32712,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-pslib-barcode" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-pslib-barcode/2024-10-12/cl-pslib-barcode-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-pslib-barcode/2024-10-12/cl-pslib-barcode-20241012-git.tgz"; sha256 = "1n17yv7qr6i6dhbjrcc1binlxxkc1p5blj9nwn6g26fyvakgwrsb"; system = "cl-pslib-barcode"; asd = "cl-pslib-barcode"; @@ -32092,7 +32738,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-punch" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-punch/2019-01-07/cl-punch-20190107-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-punch/2019-01-07/cl-punch-20190107-git.tgz"; sha256 = "1sjgwn6c77n8pgs0rrw70xfl18rps6a0dlf2chfsbgk8shz6qyl2"; system = "cl-punch"; asd = "cl-punch"; @@ -32112,7 +32758,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-punch-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-punch/2019-01-07/cl-punch-20190107-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-punch/2019-01-07/cl-punch-20190107-git.tgz"; sha256 = "1sjgwn6c77n8pgs0rrw70xfl18rps6a0dlf2chfsbgk8shz6qyl2"; system = "cl-punch-test"; asd = "cl-punch-test"; @@ -32136,7 +32782,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-qoa" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-qoa/2024-10-12/cl-qoa-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-qoa/2024-10-12/cl-qoa-20241012-git.tgz"; sha256 = "0gxrra0mvvkyvhvg7cc4bvi3nwdsnx0dbjszp41ch6dsdhd3pcpy"; system = "cl-qoa"; asd = "cl-qoa"; @@ -32159,7 +32805,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-qprint" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-qprint/2015-08-04/cl-qprint-20150804-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-qprint/2015-08-04/cl-qprint-20150804-git.tgz"; sha256 = "099h0rrdzxnlmn8avi72mg2dl0kccp7w01b2p9nwyy4b8yr32cir"; system = "cl-qprint"; asd = "cl-qprint"; @@ -32177,7 +32823,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-qrencode" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-qrencode/2019-10-07/cl-qrencode-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-qrencode/2019-10-07/cl-qrencode-20191007-git.tgz"; sha256 = "1l5k131dchbf6cj8a8xqa731790p01p3qa1kdy2wa9dawy3ymkxr"; system = "cl-qrencode"; asd = "cl-qrencode"; @@ -32195,7 +32841,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-qrencode-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-qrencode/2019-10-07/cl-qrencode-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-qrencode/2019-10-07/cl-qrencode-20191007-git.tgz"; sha256 = "1l5k131dchbf6cj8a8xqa731790p01p3qa1kdy2wa9dawy3ymkxr"; system = "cl-qrencode-test"; asd = "cl-qrencode-test"; @@ -32218,7 +32864,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-quickcheck" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-quickcheck/2020-06-10/cl-quickcheck-20200610-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-quickcheck/2020-06-10/cl-quickcheck-20200610-git.tgz"; sha256 = "0cfyxbdhklvdk3qdzyxxaq9q6cxnsvqjfi86nay1vc7h6ziysb60"; system = "cl-quickcheck"; asd = "cl-quickcheck"; @@ -32238,7 +32884,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-rabbit" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-rabbit/2021-04-11/cl-rabbit-20210411-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-rabbit/2021-04-11/cl-rabbit-20210411-git.tgz"; sha256 = "1q1mhqxqvxbr6ak7j0ym6mjhhq6r0pqk1l7az9hfajmqmw3xfija"; system = "cl-rabbit"; asd = "cl-rabbit"; @@ -32265,7 +32911,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-rabbit-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-rabbit/2021-04-11/cl-rabbit-20210411-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-rabbit/2021-04-11/cl-rabbit-20210411-git.tgz"; sha256 = "1q1mhqxqvxbr6ak7j0ym6mjhhq6r0pqk1l7az9hfajmqmw3xfija"; system = "cl-rabbit-tests"; asd = "cl-rabbit-tests"; @@ -32288,7 +32934,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-randist" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-randist/2022-11-06/cl-randist-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-randist/2022-11-06/cl-randist-20221106-git.tgz"; sha256 = "1r0d76n5zjqg5fb2ypqx5i1wg4hsg5g0c126ylqb28wdaf2yjz5a"; system = "cl-randist"; asd = "cl-randist"; @@ -32308,7 +32954,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-random-forest" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-random-forest/2022-11-06/cl-random-forest-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-random-forest/2022-11-06/cl-random-forest-20221106-git.tgz"; sha256 = "0jn5f3s1zvjql35c4m67lqc0vjr7sm7kzf8w4jfbfabcnxf3y6jx"; system = "cl-random-forest"; asd = "cl-random-forest"; @@ -32333,7 +32979,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-random-forest-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-random-forest/2022-11-06/cl-random-forest-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-random-forest/2022-11-06/cl-random-forest-20221106-git.tgz"; sha256 = "0jn5f3s1zvjql35c4m67lqc0vjr7sm7kzf8w4jfbfabcnxf3y6jx"; system = "cl-random-forest-test"; asd = "cl-random-forest-test"; @@ -32358,7 +33004,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-rdfxml" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-rdfxml/2014-07-13/cl-rdfxml-20140713-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-rdfxml/2014-07-13/cl-rdfxml-20140713-git.tgz"; sha256 = "09v76qg6l3y1llapnkfqrfgib67h7lpkzrdmfimwk49bi80iii8v"; system = "cl-rdfxml"; asd = "cl-rdfxml"; @@ -32377,12 +33023,12 @@ lib.makeScope pkgs.newScope (self: { cl-rdkafka = ( build-asdf-system { pname = "cl-rdkafka"; - version = "20230214-git"; + version = "20250622-git"; asds = [ "cl-rdkafka" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-rdkafka/2023-02-14/cl-rdkafka-20230214-git.tgz"; - sha256 = "10y56avak66k2la9bmfzrni01wybi86avxjh64hz57b351bf2s55"; + url = "https://beta.quicklisp.org/archive/cl-rdkafka/2025-06-22/cl-rdkafka-20250622-git.tgz"; + sha256 = "1pjpbpl0biyiv63zxm4x3zb3wc7gzag4axnv5rwgg5pa8vqhkdhl"; system = "cl-rdkafka"; asd = "cl-rdkafka"; } @@ -32392,6 +33038,7 @@ lib.makeScope pkgs.newScope (self: { (getAttr "bordeaux-threads" self) (getAttr "cffi" self) (getAttr "cffi-grovel" self) + (getAttr "log4cl" self) (getAttr "lparallel" self) (getAttr "trivial-garbage" self) ]; @@ -32403,12 +33050,12 @@ lib.makeScope pkgs.newScope (self: { cl-readline = ( build-asdf-system { pname = "cl-readline"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-readline" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-readline/2024-10-12/cl-readline-20241012-git.tgz"; - sha256 = "0law12vnj1d5174kk9l949mgkkxm1x6kpcw5wixxjavmxxwqwric"; + url = "https://beta.quicklisp.org/archive/cl-readline/2025-06-22/cl-readline-20250622-git.tgz"; + sha256 = "0kimc1blxlza438125qipqaa1ia0r7jwz5jsahmxqc17cmlkby4k"; system = "cl-readline"; asd = "cl-readline"; } @@ -32428,7 +33075,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-recaptcha" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-recaptcha/2015-06-08/cl-recaptcha-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-recaptcha/2015-06-08/cl-recaptcha-20150608-git.tgz"; sha256 = "09qdmzbhc5hikay31mbsfd7dps72rm4gcdbbi0b6gkb6qbia6m71"; system = "cl-recaptcha"; asd = "cl-recaptcha"; @@ -32453,7 +33100,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-reddit" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-reddit/2024-10-12/cl-reddit-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-reddit/2024-10-12/cl-reddit-20241012-git.tgz"; sha256 = "0jnc88mdz7hsmsncqrqmc8m8f1yd3n9087750kqpnn1sp1cwskk1"; system = "cl-reddit"; asd = "cl-reddit"; @@ -32472,12 +33119,12 @@ lib.makeScope pkgs.newScope (self: { cl-redis = ( build-asdf-system { pname = "cl-redis"; - version = "20200925-git"; + version = "20250622-git"; asds = [ "cl-redis" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-redis/2020-09-25/cl-redis-20200925-git.tgz"; - sha256 = "0x5ahxb5cx37biyn3cjycshhm1rr9p5cf1a9l5hd1n1xjxm2f8vi"; + url = "https://beta.quicklisp.org/archive/cl-redis/2025-06-22/cl-redis-20250622-git.tgz"; + sha256 = "1jb82zpiwx7ri86z0xqdynr3m40jnlzinyc0b47lvpbqs7cydrrg"; system = "cl-redis"; asd = "cl-redis"; } @@ -32485,9 +33132,11 @@ lib.makeScope pkgs.newScope (self: { systems = [ "cl-redis" ]; lispLibs = [ (getAttr "babel" self) + (getAttr "cl_plus_ssl" self) (getAttr "cl-ppcre" self) (getAttr "flexi-streams" self) (getAttr "rutils" self) + (getAttr "trivial-gray-streams" self) (getAttr "usocket" self) ]; meta = { @@ -32498,12 +33147,12 @@ lib.makeScope pkgs.newScope (self: { cl-redis-test = ( build-asdf-system { pname = "cl-redis-test"; - version = "20200925-git"; + version = "20250622-git"; asds = [ "cl-redis-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-redis/2020-09-25/cl-redis-20200925-git.tgz"; - sha256 = "0x5ahxb5cx37biyn3cjycshhm1rr9p5cf1a9l5hd1n1xjxm2f8vi"; + url = "https://beta.quicklisp.org/archive/cl-redis/2025-06-22/cl-redis-20250622-git.tgz"; + sha256 = "1jb82zpiwx7ri86z0xqdynr3m40jnlzinyc0b47lvpbqs7cydrrg"; system = "cl-redis-test"; asd = "cl-redis"; } @@ -32527,7 +33176,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-reexport" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-reexport/2021-02-28/cl-reexport-20210228-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-reexport/2021-02-28/cl-reexport-20210228-git.tgz"; sha256 = "02la6z3ickhmh2m87ymm2ijh9nkn7l6slskj99l8a1rhps394qqc"; system = "cl-reexport"; asd = "cl-reexport"; @@ -32545,7 +33194,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-reexport-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-reexport/2021-02-28/cl-reexport-20210228-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-reexport/2021-02-28/cl-reexport-20210228-git.tgz"; sha256 = "02la6z3ickhmh2m87ymm2ijh9nkn7l6slskj99l8a1rhps394qqc"; system = "cl-reexport-test"; asd = "cl-reexport-test"; @@ -32568,7 +33217,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-renderdoc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-renderdoc/2020-09-25/cl-renderdoc-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-renderdoc/2020-09-25/cl-renderdoc-20200925-git.tgz"; sha256 = "0rrcp4y1f07x8h0ikvf5ncc3pbqj6vaciblab9qghmgdglnn7akx"; system = "cl-renderdoc"; asd = "cl-renderdoc"; @@ -32588,7 +33237,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-replica" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-replica/2023-06-18/cl-replica-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-replica/2023-06-18/cl-replica-20230618-git.tgz"; sha256 = "06nywqz7il4dk79s3ga8115s5cr9bpz1fh8b7jms5wxlc1h5p0mn"; system = "cl-replica"; asd = "cl-replica"; @@ -32604,12 +33253,12 @@ lib.makeScope pkgs.newScope (self: { cl-resvg = ( build-asdf-system { pname = "cl-resvg"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-resvg" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-resvg/2024-10-12/cl-resvg-20241012-git.tgz"; - sha256 = "0263na51qs0wrc9r2dqigj4a1h70pjf0mqsgbnd6hfshvx0kq1cl"; + url = "https://beta.quicklisp.org/archive/cl-resvg/2025-06-22/cl-resvg-20250622-git.tgz"; + sha256 = "0i0ji3zylcpy25sa8an1s14rpqc7xl0058xm0gr9fmwgiglx3jvi"; system = "cl-resvg"; asd = "cl-resvg"; } @@ -32619,6 +33268,7 @@ lib.makeScope pkgs.newScope (self: { (getAttr "cffi" self) (getAttr "documentation-utils" self) (getAttr "float-features" self) + (getAttr "pathname-utils" self) ]; meta = { hydraPlatforms = [ ]; @@ -32632,7 +33282,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-rethinkdb" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-rethinkdb/2016-08-25/cl-rethinkdb-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-rethinkdb/2016-08-25/cl-rethinkdb-20160825-git.tgz"; sha256 = "0sps1p203gn7i123w96pj5ggpncmkngkfdb6zfnm5yjq544sjjf7"; system = "cl-rethinkdb"; asd = "cl-rethinkdb"; @@ -32663,7 +33313,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-rethinkdb-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-rethinkdb/2016-08-25/cl-rethinkdb-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-rethinkdb/2016-08-25/cl-rethinkdb-20160825-git.tgz"; sha256 = "0sps1p203gn7i123w96pj5ggpncmkngkfdb6zfnm5yjq544sjjf7"; system = "cl-rethinkdb-test"; asd = "cl-rethinkdb-test"; @@ -32689,7 +33339,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-rfc2047" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-rfc2047/2015-08-04/cl-rfc2047-20150804-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-rfc2047/2015-08-04/cl-rfc2047-20150804-git.tgz"; sha256 = "1kh48p5i7lmv1hcdsddlcjavhai9gi54jndnbpm9r55a6ladi8gv"; system = "cl-rfc2047"; asd = "cl-rfc2047"; @@ -32712,7 +33362,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-rfc2047-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-rfc2047/2015-08-04/cl-rfc2047-20150804-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-rfc2047/2015-08-04/cl-rfc2047-20150804-git.tgz"; sha256 = "1kh48p5i7lmv1hcdsddlcjavhai9gi54jndnbpm9r55a6ladi8gv"; system = "cl-rfc2047-test"; asd = "cl-rfc2047-test"; @@ -32736,7 +33386,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-rfc4251" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-rfc4251/2023-10-21/cl-rfc4251-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-rfc4251/2023-10-21/cl-rfc4251-20231021-git.tgz"; sha256 = "11xz6w1gvyj5a01yjfy52byfrq6v8k1mzkp3wajhzhg60nkhn4jh"; system = "cl-rfc4251"; asd = "cl-rfc4251"; @@ -32756,7 +33406,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-rfc4251.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-rfc4251/2023-10-21/cl-rfc4251-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-rfc4251/2023-10-21/cl-rfc4251-20231021-git.tgz"; sha256 = "11xz6w1gvyj5a01yjfy52byfrq6v8k1mzkp3wajhzhg60nkhn4jh"; system = "cl-rfc4251.test"; asd = "cl-rfc4251.test"; @@ -32779,7 +33429,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-riff" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-riff/2022-07-07/cl-riff-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-riff/2022-07-07/cl-riff-20220707-git.tgz"; sha256 = "0b2j6yw3xkv6611snn7cy56vmnjfgi58wyvfr9lx82xkakd9rw3z"; system = "cl-riff"; asd = "cl-riff"; @@ -32799,7 +33449,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-rlimit" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-rlimit/2015-06-08/cl-rlimit-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-rlimit/2015-06-08/cl-rlimit-20150608-git.tgz"; sha256 = "19p02r380qhs76qlcb3jp4lm4nsnpy7zch01fdiwn7l7xgxkzxh0"; system = "cl-rlimit"; asd = "cl-rlimit"; @@ -32822,7 +33472,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-rmath" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-rmath/2018-03-28/cl-rmath-20180328-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-rmath/2018-03-28/cl-rmath-20180328-git.tgz"; sha256 = "1ld8vbpy10paymx2hn0mcgd21i7cjhdrayln1jx0kayqxm12mmk4"; system = "cl-rmath"; asd = "cl-rmath"; @@ -32842,7 +33492,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-robdd" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; + url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; system = "cl-robdd"; asd = "cl-robdd"; @@ -32862,7 +33512,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-robdd-analysis" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; + url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; system = "cl-robdd-analysis"; asd = "cl-robdd-analysis"; @@ -32886,7 +33536,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-robdd-analysis-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; + url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; system = "cl-robdd-analysis-test"; asd = "cl-robdd-analysis-test"; @@ -32910,7 +33560,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-robdd-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; + url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; system = "cl-robdd-test"; asd = "cl-robdd-test"; @@ -32935,7 +33585,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-rrd" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-rrd/2013-01-28/cl-rrd-20130128-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-rrd/2013-01-28/cl-rrd-20130128-git.tgz"; sha256 = "0a7fs46q41qzi6k8q9lvxryn2m90vamcsw7vl9kcjivyckjqrsm2"; system = "cl-rrd"; asd = "cl-rrd"; @@ -32955,7 +33605,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-rrt" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-rrt/2020-09-25/cl-rrt-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-rrt/2020-09-25/cl-rrt-20200925-git.tgz"; sha256 = "0lf1dvw5j9awy7ic1i4j5wd7657a170ywxihinmsdn4bwd4fynv0"; system = "cl-rrt"; asd = "cl-rrt"; @@ -32980,7 +33630,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-rrt.benchmark" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-rrt/2020-09-25/cl-rrt-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-rrt/2020-09-25/cl-rrt-20200925-git.tgz"; sha256 = "0lf1dvw5j9awy7ic1i4j5wd7657a170ywxihinmsdn4bwd4fynv0"; system = "cl-rrt.benchmark"; asd = "cl-rrt.benchmark"; @@ -33006,7 +33656,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-rrt.rtree" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-rrt/2020-09-25/cl-rrt-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-rrt/2020-09-25/cl-rrt-20200925-git.tgz"; sha256 = "0lf1dvw5j9awy7ic1i4j5wd7657a170ywxihinmsdn4bwd4fynv0"; system = "cl-rrt.rtree"; asd = "cl-rrt.rtree"; @@ -33035,7 +33685,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-rrt.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-rrt/2020-09-25/cl-rrt-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-rrt/2020-09-25/cl-rrt-20200925-git.tgz"; sha256 = "0lf1dvw5j9awy7ic1i4j5wd7657a170ywxihinmsdn4bwd4fynv0"; system = "cl-rrt.test"; asd = "cl-rrt.test"; @@ -33060,7 +33710,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-rsvg2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-rsvg2/2020-09-25/cl-rsvg2-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-rsvg2/2020-09-25/cl-rsvg2-20200925-git.tgz"; sha256 = "1amq4q27lj0nzffvwmqrkg8v9pdcf0281zzrvxl9w6vdm9qy1v3n"; system = "cl-rsvg2"; asd = "cl-rsvg2"; @@ -33083,7 +33733,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-rsvg2-pixbuf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-rsvg2/2020-09-25/cl-rsvg2-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-rsvg2/2020-09-25/cl-rsvg2-20200925-git.tgz"; sha256 = "1amq4q27lj0nzffvwmqrkg8v9pdcf0281zzrvxl9w6vdm9qy1v3n"; system = "cl-rsvg2-pixbuf"; asd = "cl-rsvg2-pixbuf"; @@ -33106,7 +33756,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-rsvg2-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-rsvg2/2020-09-25/cl-rsvg2-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-rsvg2/2020-09-25/cl-rsvg2-20200925-git.tgz"; sha256 = "1amq4q27lj0nzffvwmqrkg8v9pdcf0281zzrvxl9w6vdm9qy1v3n"; system = "cl-rsvg2-test"; asd = "cl-rsvg2-test"; @@ -33130,7 +33780,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-rules" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-rules/2019-07-10/cl-rules-20190710-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-rules/2019-07-10/cl-rules-20190710-git.tgz"; sha256 = "0jidck62n0jkfqwrpqjn43zmjb3jlfaxxhn2lsyfwy2740i8ppr1"; system = "cl-rules"; asd = "cl-rules"; @@ -33153,7 +33803,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-rules-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-rules/2019-07-10/cl-rules-20190710-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-rules/2019-07-10/cl-rules-20190710-git.tgz"; sha256 = "0jidck62n0jkfqwrpqjn43zmjb3jlfaxxhn2lsyfwy2740i8ppr1"; system = "cl-rules-test"; asd = "cl-rules-test"; @@ -33177,7 +33827,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-s3" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-s3/2013-01-28/cl-s3-20130128-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-s3/2013-01-28/cl-s3-20130128-git.tgz"; sha256 = "1lbvf7phkm5vjk013p484rh4vh33i58jlqq3z4cv2yxqcw6r639d"; system = "cl-s3"; asd = "cl-s3"; @@ -33203,7 +33853,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-sam" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sam/2015-06-08/cl-sam-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sam/2015-06-08/cl-sam-20150608-git.tgz"; sha256 = "0frrxz70jin4sa5n087zm4ikckf1zdjqqpjq3llrv46753c62fc6"; system = "cl-sam"; asd = "cl-sam"; @@ -33227,7 +33877,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-sam-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sam/2015-06-08/cl-sam-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sam/2015-06-08/cl-sam-20150608-git.tgz"; sha256 = "0frrxz70jin4sa5n087zm4ikckf1zdjqqpjq3llrv46753c62fc6"; system = "cl-sam-test"; asd = "cl-sam-test"; @@ -33251,7 +33901,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-sandbox" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sandbox/2018-01-31/cl-sandbox-20180131-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sandbox/2018-01-31/cl-sandbox-20180131-git.tgz"; sha256 = "053zxy3zi5jvlbg8zxlf922sxb32mq34zvwfhgpj4rcmgvgmqnxv"; system = "cl-sandbox"; asd = "cl-sandbox"; @@ -33271,7 +33921,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-sasl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sasl/2019-05-21/cl-sasl-v0.3.2.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sasl/2019-05-21/cl-sasl-v0.3.2.tgz"; sha256 = "0a05q8rls2hn46rbbk6w5km9kqvhsj365zlw6hp32724xy2nd98w"; system = "cl-sasl"; asd = "cl-sasl"; @@ -33291,7 +33941,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-sat" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sat/2022-07-07/cl-sat-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sat/2022-07-07/cl-sat-20220707-git.tgz"; sha256 = "1fcvxpmja757vyyhcpb00g150dyx90jsg9z8s596vy1nb0z81f49"; system = "cl-sat"; asd = "cl-sat"; @@ -33314,7 +33964,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-sat.glucose" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sat.glucose/2022-03-31/cl-sat.glucose-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sat.glucose/2022-03-31/cl-sat.glucose-20220331-git.tgz"; sha256 = "11hbhsjzw3xzz6i6niisk5h271kg52y3y77sl6ljnszfgp9xjfxy"; system = "cl-sat.glucose"; asd = "cl-sat.glucose"; @@ -33338,7 +33988,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-sat.glucose.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sat.glucose/2022-03-31/cl-sat.glucose-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sat.glucose/2022-03-31/cl-sat.glucose-20220331-git.tgz"; sha256 = "11hbhsjzw3xzz6i6niisk5h271kg52y3y77sl6ljnszfgp9xjfxy"; system = "cl-sat.glucose.test"; asd = "cl-sat.glucose.test"; @@ -33361,7 +34011,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-sat.minisat" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sat.minisat/2024-10-12/cl-sat.minisat-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sat.minisat/2024-10-12/cl-sat.minisat-20241012-git.tgz"; sha256 = "00h5smjs60r1abq27w2ayg55ypsw32769pkk72mrikyn29r6z9ni"; system = "cl-sat.minisat"; asd = "cl-sat.minisat"; @@ -33385,7 +34035,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-sat.minisat.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sat.minisat/2024-10-12/cl-sat.minisat-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sat.minisat/2024-10-12/cl-sat.minisat-20241012-git.tgz"; sha256 = "00h5smjs60r1abq27w2ayg55ypsw32769pkk72mrikyn29r6z9ni"; system = "cl-sat.minisat.test"; asd = "cl-sat.minisat.test"; @@ -33408,7 +34058,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-sat.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sat/2022-07-07/cl-sat-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sat/2022-07-07/cl-sat-20220707-git.tgz"; sha256 = "1fcvxpmja757vyyhcpb00g150dyx90jsg9z8s596vy1nb0z81f49"; system = "cl-sat.test"; asd = "cl-sat.test"; @@ -33431,7 +34081,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-scram" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-scram/2015-09-23/cl-scram-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-scram/2015-09-23/cl-scram-20150923-git.tgz"; sha256 = "1absr9h9z79f1fbs4g33y2rc9jsqjs7vd2l5sl8dvqq4fyx8v6g0"; system = "cl-scram"; asd = "cl-scram"; @@ -33457,7 +34107,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-scribd" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-scribd/2013-03-12/cl-scribd-20130312-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-scribd/2013-03-12/cl-scribd-20130312-git.tgz"; sha256 = "0r4ah3f1ndi66bm1mir3ldl31sfbmav0kdfpb16f1n9931452mry"; system = "cl-scribd"; asd = "cl-scribd"; @@ -33481,7 +34131,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-scripting" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-scripting/2021-10-20/cl-scripting-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-scripting/2021-10-20/cl-scripting-20211020-git.tgz"; sha256 = "1xi8klkn4fhmcrnhxzxvl0rj68dc7az6l2hc10560g9jvblcmmpp"; system = "cl-scripting"; asd = "cl-scripting"; @@ -33504,7 +34154,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-scrobbler" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-scrobbler/2011-11-05/cl-scrobbler-20111105-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-scrobbler/2011-11-05/cl-scrobbler-20111105-git.tgz"; sha256 = "0cd0zfmhxf5chcg7hncavfjr8m06cjbiyqylk76z8mprdsv1n062"; system = "cl-scrobbler"; asd = "cl-scrobbler"; @@ -33531,7 +34181,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-scrobbler-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-scrobbler/2011-11-05/cl-scrobbler-20111105-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-scrobbler/2011-11-05/cl-scrobbler-20111105-git.tgz"; sha256 = "0cd0zfmhxf5chcg7hncavfjr8m06cjbiyqylk76z8mprdsv1n062"; system = "cl-scrobbler-tests"; asd = "cl-scrobbler"; @@ -33554,7 +34204,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-scsu" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-scsu/2022-11-06/cl-scsu-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-scsu/2022-11-06/cl-scsu-20221106-git.tgz"; sha256 = "0jiqyayflyyrdks4yl894vzw2bkxkd87w4sy4n6ikjz450xk3yxf"; system = "cl-scsu"; asd = "cl-scsu"; @@ -33574,7 +34224,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-scsu-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-scsu/2022-11-06/cl-scsu-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-scsu/2022-11-06/cl-scsu-20221106-git.tgz"; sha256 = "0jiqyayflyyrdks4yl894vzw2bkxkd87w4sy4n6ikjz450xk3yxf"; system = "cl-scsu-test"; asd = "cl-scsu-test"; @@ -33598,7 +34248,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-selenium" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-selenium-webdriver/2018-03-28/cl-selenium-webdriver-20180328-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-selenium-webdriver/2018-03-28/cl-selenium-webdriver-20180328-git.tgz"; sha256 = "0216vqg1ax5gcqahclii7ifqpc92rbi86rfcf1qn8bdahmfjccbb"; system = "cl-selenium"; asd = "cl-selenium"; @@ -33624,7 +34274,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-selenium-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-selenium-webdriver/2018-03-28/cl-selenium-webdriver-20180328-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-selenium-webdriver/2018-03-28/cl-selenium-webdriver-20180328-git.tgz"; sha256 = "0216vqg1ax5gcqahclii7ifqpc92rbi86rfcf1qn8bdahmfjccbb"; system = "cl-selenium-test"; asd = "cl-selenium-test"; @@ -33648,7 +34298,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-semver" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-semver/2023-06-18/cl-semver-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-semver/2023-06-18/cl-semver-20230618-git.tgz"; sha256 = "1zlcn7lrpvjiixgqm4yxnqqwak1hxfmxmchkpvrly41yhl586ril"; system = "cl-semver"; asd = "cl-semver"; @@ -33672,7 +34322,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-semver-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-semver/2023-06-18/cl-semver-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-semver/2023-06-18/cl-semver-20230618-git.tgz"; sha256 = "1zlcn7lrpvjiixgqm4yxnqqwak1hxfmxmchkpvrly41yhl586ril"; system = "cl-semver-test"; asd = "cl-semver-test"; @@ -33695,7 +34345,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-sentiment" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sentiment/2013-01-28/cl-sentiment-20130128-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sentiment/2013-01-28/cl-sentiment-20130128-git.tgz"; sha256 = "18jx6ivbzcg9bsmp1pmlqvzr4kfxzll75b4viz1hrkq78nsnpp5v"; system = "cl-sentiment"; asd = "cl-sentiment"; @@ -33718,7 +34368,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-server-manager" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-server-manager/2023-10-21/cl-server-manager-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-server-manager/2023-10-21/cl-server-manager-20231021-git.tgz"; sha256 = "0vrdn9iiwmx2zg7lrw56dqjaxbb9fvn4107qxgp3n3z8zxhiw03s"; system = "cl-server-manager"; asd = "cl-server-manager"; @@ -33743,7 +34393,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ses4" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ses4/2022-11-06/cl-ses4-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ses4/2022-11-06/cl-ses4-20221106-git.tgz"; sha256 = "1n31k81i19hx26h9wcz39fsciq92hbblnbd15krblx9g877a1598"; system = "cl-ses4"; asd = "cl-ses4"; @@ -33772,7 +34422,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-setlocale" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-setlocale/2020-12-20/cl-setlocale-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-setlocale/2020-12-20/cl-setlocale-20201220-git.tgz"; sha256 = "0g1b89yj6n42ayf2074krk3h9yvglqxn54a6i3sxgpsqww2ll2a1"; system = "cl-setlocale"; asd = "cl-setlocale"; @@ -33788,6 +34438,33 @@ lib.makeScope pkgs.newScope (self: { }; } ); + cl-sf3 = ( + build-asdf-system { + pname = "cl-sf3"; + version = "20250622-git"; + asds = [ "cl-sf3" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-sf3/2025-06-22/cl-sf3-20250622-git.tgz"; + sha256 = "0rp435whhcb8i46kp9g8fsnbr4w7jkimsngs7v6pga99j5rngfgn"; + system = "cl-sf3"; + asd = "cl-sf3"; + } + ); + systems = [ "cl-sf3" ]; + lispLibs = [ + (getAttr "binary-structures" self) + (getAttr "documentation-utils" self) + (getAttr "file-attributes" self) + (getAttr "filesystem-utils" self) + (getAttr "pathname-utils" self) + (getAttr "precise-time" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); cl-sha1 = ( build-asdf-system { pname = "cl-sha1"; @@ -33795,7 +34472,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-sha1" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sha1/2021-08-07/cl-sha1-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sha1/2021-08-07/cl-sha1-20210807-git.tgz"; sha256 = "16hczcr7ghah0p9fi29ddrw5c4zbb2d4765iigfx7yrgk5z5jb8p"; system = "cl-sha1"; asd = "cl-sha1"; @@ -33815,7 +34492,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-shellwords" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-shellwords/2015-09-23/cl-shellwords-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-shellwords/2015-09-23/cl-shellwords-20150923-git.tgz"; sha256 = "0im8cni1ig5zaha9gbmma7zk1xxa4xajvzfgalvl2f0fhvksl4pn"; system = "cl-shellwords"; asd = "cl-shellwords"; @@ -33833,7 +34510,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-shellwords-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-shellwords/2015-09-23/cl-shellwords-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-shellwords/2015-09-23/cl-shellwords-20150923-git.tgz"; sha256 = "0im8cni1ig5zaha9gbmma7zk1xxa4xajvzfgalvl2f0fhvksl4pn"; system = "cl-shellwords-test"; asd = "cl-shellwords-test"; @@ -33856,7 +34533,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-simple-concurrent-jobs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-simple-concurrent-jobs/2015-05-05/cl-simple-concurrent-jobs-20150505-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-simple-concurrent-jobs/2015-05-05/cl-simple-concurrent-jobs-20150505-git.tgz"; sha256 = "0mv7svsil58h8v8kq9965bpbradmhfpyrmi61dbzp5mbw8c5mrwj"; system = "cl-simple-concurrent-jobs"; asd = "cl-simple-concurrent-jobs"; @@ -33879,7 +34556,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-simple-table" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-simple-table/2013-03-12/cl-simple-table-20130312-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-simple-table/2013-03-12/cl-simple-table-20130312-git.tgz"; sha256 = "1pnczi5hbqlyxxvzlpy6vc58qc9hh9mdm5rgq304bp3v2qajh0b7"; system = "cl-simple-table"; asd = "cl-simple-table"; @@ -33899,7 +34576,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-singleton-mixin" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-singleton-mixin/2015-05-05/cl-singleton-mixin-20150505-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-singleton-mixin/2015-05-05/cl-singleton-mixin-20150505-git.tgz"; sha256 = "10dvwzx1kw9ac163i6sc8yfg3hpkn0dlq4hf6qipb46b4mcib01s"; system = "cl-singleton-mixin"; asd = "cl-singleton-mixin"; @@ -33922,7 +34599,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-singleton-mixin-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-singleton-mixin/2015-05-05/cl-singleton-mixin-20150505-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-singleton-mixin/2015-05-05/cl-singleton-mixin-20150505-git.tgz"; sha256 = "10dvwzx1kw9ac163i6sc8yfg3hpkn0dlq4hf6qipb46b4mcib01s"; system = "cl-singleton-mixin-test"; asd = "cl-singleton-mixin-test"; @@ -33945,7 +34622,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-skip-list" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-skip-list/2022-07-07/cl-skip-list-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-skip-list/2022-07-07/cl-skip-list-20220707-git.tgz"; sha256 = "1k3hbi9n1yzky3hjcg48jkkkp2jx5vm7bsywhnyyb1z6hz5phakd"; system = "cl-skip-list"; asd = "cl-skip-list"; @@ -33961,12 +34638,12 @@ lib.makeScope pkgs.newScope (self: { cl-skkserv = ( build-asdf-system { pname = "cl-skkserv"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-skkserv" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-skkserv/2024-10-12/cl-skkserv-20241012-git.tgz"; - sha256 = "1fnar6iw6hr5w37sc96zk9kdcgam8bm71l26l7c6f5daxk57labi"; + url = "https://beta.quicklisp.org/archive/cl-skkserv/2025-06-22/cl-skkserv-20250622-git.tgz"; + sha256 = "1vxpmg9fc12w73ymh6xyin4mw2cyjkd115ssvlzm7g9zb1dzswf3"; system = "cl-skkserv"; asd = "cl-skkserv"; } @@ -33996,7 +34673,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-slice" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-slice/2021-05-31/cl-slice-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-slice/2021-05-31/cl-slice-20210531-git.tgz"; sha256 = "1ybznf4y5lda6bn163jcvj281qzhm24dfcwhbgxmm5n6f27gdccl"; system = "cl-slice"; asd = "cl-slice"; @@ -34018,7 +34695,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-slice-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-slice/2021-05-31/cl-slice-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-slice/2021-05-31/cl-slice-20210531-git.tgz"; sha256 = "1ybznf4y5lda6bn163jcvj281qzhm24dfcwhbgxmm5n6f27gdccl"; system = "cl-slice-tests"; asd = "cl-slice"; @@ -34041,7 +34718,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-slp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-slp/2014-08-26/cl-slp-20140826-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-slp/2014-08-26/cl-slp-20140826-git.tgz"; sha256 = "10wfrw6r6w646lzx0nasnfvjpy63icxl8qm4888dpcjc57y1cd1w"; system = "cl-slp"; asd = "cl-slp"; @@ -34061,7 +34738,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-slug" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-slug/2018-02-28/cl-slug-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-slug/2018-02-28/cl-slug-20180228-git.tgz"; sha256 = "1asdq6xllmsvfw5fky9wblqcx9isac9jrrlkfl7vyxcq1wxrnflx"; system = "cl-slug"; asd = "cl-slug"; @@ -34081,7 +34758,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-slug-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-slug/2018-02-28/cl-slug-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-slug/2018-02-28/cl-slug-20180228-git.tgz"; sha256 = "1asdq6xllmsvfw5fky9wblqcx9isac9jrrlkfl7vyxcq1wxrnflx"; system = "cl-slug-test"; asd = "cl-slug-test"; @@ -34105,7 +34782,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-slugify" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-slugify/2023-06-18/cl-slugify-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-slugify/2023-06-18/cl-slugify-20230618-git.tgz"; sha256 = "18vjz9xb8q73j2bd609if2r6svljsnivl3sniz2p7j7w0qppps72"; system = "cl-slugify"; asd = "cl-slugify"; @@ -34125,7 +34802,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-slugify.tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-slugify/2023-06-18/cl-slugify-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-slugify/2023-06-18/cl-slugify-20230618-git.tgz"; sha256 = "18vjz9xb8q73j2bd609if2r6svljsnivl3sniz2p7j7w0qppps72"; system = "cl-slugify.tests"; asd = "cl-slugify.tests"; @@ -34148,7 +34825,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-smt-lib" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-smt-lib/2022-03-31/cl-smt-lib-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-smt-lib/2022-03-31/cl-smt-lib-20220331-git.tgz"; sha256 = "09xqpmzd8rmp4dkj6mzwlwnhqk266abqvskz9dm6mr3cnf2r774z"; system = "cl-smt-lib"; asd = "cl-smt-lib"; @@ -34170,7 +34847,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-smtp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-smtp/2024-10-12/cl-smtp-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-smtp/2024-10-12/cl-smtp-20241012-git.tgz"; sha256 = "1r4gsklf4p163hn4ylabx7lp5zkz27v6gq3rkyrvwb7qz6sv8ws4"; system = "cl-smtp"; asd = "cl-smtp"; @@ -34195,7 +34872,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-smtp-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-smtp/2024-10-12/cl-smtp-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-smtp/2024-10-12/cl-smtp-20241012-git.tgz"; sha256 = "1r4gsklf4p163hn4ylabx7lp5zkz27v6gq3rkyrvwb7qz6sv8ws4"; system = "cl-smtp-tests"; asd = "cl-smtp-tests"; @@ -34215,7 +34892,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-soil" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-soil/2018-08-31/cl-soil-release-quicklisp-f27087ce-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-soil/2018-08-31/cl-soil-release-quicklisp-f27087ce-git.tgz"; sha256 = "0mnz5yaw3kc14ja9g4j7dxh96kd82ifj25gy0dil7kqjd08lwcq9"; system = "cl-soil"; asd = "cl-soil"; @@ -34235,12 +34912,12 @@ lib.makeScope pkgs.newScope (self: { cl-soloud = ( build-asdf-system { pname = "cl-soloud"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "cl-soloud" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-soloud/2023-10-21/cl-soloud-20231021-git.tgz"; - sha256 = "0r0z365gcgf93vy8g2nbjwgh5r04gv0l645l2knvip420jxqqp1c"; + url = "https://beta.quicklisp.org/archive/cl-soloud/2025-06-22/cl-soloud-20250622-git.tgz"; + sha256 = "0rkvy4pf2hn82bm0vmjp6b0is3zrjm2r2lrcgvxhh6dxcx71zs7i"; system = "cl-soloud"; asd = "cl-soloud"; } @@ -34267,7 +34944,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-sophia" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sophia/2015-06-08/cl-sophia-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sophia/2015-06-08/cl-sophia-20150608-git.tgz"; sha256 = "1x027mr7lg5fs0d82n5mshnd19kan76y3zb9yxbcnq222l4j8j00"; system = "cl-sophia"; asd = "cl-sophia"; @@ -34291,7 +34968,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-sophia-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sophia/2015-06-08/cl-sophia-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sophia/2015-06-08/cl-sophia-20150608-git.tgz"; sha256 = "1x027mr7lg5fs0d82n5mshnd19kan76y3zb9yxbcnq222l4j8j00"; system = "cl-sophia-test"; asd = "cl-sophia"; @@ -34316,7 +34993,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-spark" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-spark/2015-07-09/cl-spark-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-spark/2015-07-09/cl-spark-20150709-git.tgz"; sha256 = "0my1fsgi2rjaqkpk934f2bjy63pmnj7faza3fzvnk6k3l66y19nk"; system = "cl-spark"; asd = "cl-spark"; @@ -34336,7 +35013,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-spark-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-spark/2015-07-09/cl-spark-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-spark/2015-07-09/cl-spark-20150709-git.tgz"; sha256 = "0my1fsgi2rjaqkpk934f2bjy63pmnj7faza3fzvnk6k3l66y19nk"; system = "cl-spark-test"; asd = "cl-spark-test"; @@ -34359,7 +35036,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-sparql" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sparql/2022-03-31/cl-sparql-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sparql/2022-03-31/cl-sparql-20220331-git.tgz"; sha256 = "1fjp5a25yly3l3pg07gzhz8q830fcaz0dwspigw8v90sx4insz0p"; system = "cl-sparql"; asd = "cl-sparql"; @@ -34384,7 +35061,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-sparql-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sparql/2022-03-31/cl-sparql-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sparql/2022-03-31/cl-sparql-20220331-git.tgz"; sha256 = "1fjp5a25yly3l3pg07gzhz8q830fcaz0dwspigw8v90sx4insz0p"; system = "cl-sparql-tests"; asd = "cl-sparql-tests"; @@ -34407,7 +35084,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-speedy-queue" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-speedy-queue/2015-03-02/cl-speedy-queue-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-speedy-queue/2015-03-02/cl-speedy-queue-20150302-git.tgz"; sha256 = "0czhnvxn9lvbjz9h1lb7y18nqrsq3drq5icd3lqdaa07362alriq"; system = "cl-speedy-queue"; asd = "cl-speedy-queue"; @@ -34421,12 +35098,12 @@ lib.makeScope pkgs.newScope (self: { cl-spidev = ( build-asdf-system { pname = "cl-spidev"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "cl-spidev" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-spidev/2023-10-21/cl-spidev-20231021-git.tgz"; - sha256 = "1dhh6hb2myw8p04psdhdjmikl02r66szpg70yapgyqpycb9yg0l3"; + url = "https://beta.quicklisp.org/archive/cl-spidev/2025-06-22/cl-spidev-20250622-git.tgz"; + sha256 = "1wyg67mr3wawdrvv6flxkxbi3saaddxajr0lfzzyvswpy3s117bm"; system = "cl-spidev"; asd = "cl-spidev"; } @@ -34449,7 +35126,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ssdb" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ssdb/2021-01-24/cl-ssdb-20210124-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ssdb/2021-01-24/cl-ssdb-20210124-git.tgz"; sha256 = "05l0wg4a1kxgggmg1nalq811by76lja0gpa2c4i999h74bf4n3dc"; system = "cl-ssdb"; asd = "cl-ssdb"; @@ -34476,7 +35153,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ssdb-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ssdb/2021-01-24/cl-ssdb-20210124-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ssdb/2021-01-24/cl-ssdb-20210124-git.tgz"; sha256 = "05l0wg4a1kxgggmg1nalq811by76lja0gpa2c4i999h74bf4n3dc"; system = "cl-ssdb-test"; asd = "cl-ssdb-test"; @@ -34500,7 +35177,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ssh-keys" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ssh-keys/2024-10-12/cl-ssh-keys-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ssh-keys/2024-10-12/cl-ssh-keys-20241012-git.tgz"; sha256 = "037j89fjjrld46m9j71x6zfixdm7irwd58c08j0gq6w09qjlk5l2"; system = "cl-ssh-keys"; asd = "cl-ssh-keys"; @@ -34525,7 +35202,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-ssh-keys.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ssh-keys/2024-10-12/cl-ssh-keys-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ssh-keys/2024-10-12/cl-ssh-keys-20241012-git.tgz"; sha256 = "037j89fjjrld46m9j71x6zfixdm7irwd58c08j0gq6w09qjlk5l2"; system = "cl-ssh-keys.test"; asd = "cl-ssh-keys.test"; @@ -34549,7 +35226,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-statsd" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-statsd/2017-01-24/cl-statsd-20170124-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-statsd/2017-01-24/cl-statsd-20170124-git.tgz"; sha256 = "1l2sxbzhp7wwalxn8k0k1gis9c9w462fygfw4ps0s1bnhgbvr6qb"; system = "cl-statsd"; asd = "cl-statsd"; @@ -34578,7 +35255,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-statsd.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-statsd/2017-01-24/cl-statsd-20170124-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-statsd/2017-01-24/cl-statsd-20170124-git.tgz"; sha256 = "1l2sxbzhp7wwalxn8k0k1gis9c9w462fygfw4ps0s1bnhgbvr6qb"; system = "cl-statsd.test"; asd = "cl-statsd.test"; @@ -34599,12 +35276,12 @@ lib.makeScope pkgs.newScope (self: { cl-steamworks = ( build-asdf-system { pname = "cl-steamworks"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-steamworks" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-steamworks/2024-10-12/cl-steamworks-20241012-git.tgz"; - sha256 = "0401gfmzcc29pm15yyl0p36id0yza2i02wixma2zl8ah3cxb39w5"; + url = "https://beta.quicklisp.org/archive/cl-steamworks/2025-06-22/cl-steamworks-20250622-git.tgz"; + sha256 = "0s10n0qnlbj1cwmkv1zhwwnhv79gp04070z0743qyjjvba24l650"; system = "cl-steamworks"; asd = "cl-steamworks"; } @@ -34616,6 +35293,7 @@ lib.makeScope pkgs.newScope (self: { (getAttr "cffi" self) (getAttr "documentation-utils" self) (getAttr "float-features" self) + (getAttr "pathname-utils" self) (getAttr "trivial-features" self) (getAttr "trivial-garbage" self) (getAttr "trivial-gray-streams" self) @@ -34628,12 +35306,12 @@ lib.makeScope pkgs.newScope (self: { cl-steamworks-generator = ( build-asdf-system { pname = "cl-steamworks-generator"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-steamworks-generator" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-steamworks/2024-10-12/cl-steamworks-20241012-git.tgz"; - sha256 = "0401gfmzcc29pm15yyl0p36id0yza2i02wixma2zl8ah3cxb39w5"; + url = "https://beta.quicklisp.org/archive/cl-steamworks/2025-06-22/cl-steamworks-20250622-git.tgz"; + sha256 = "0s10n0qnlbj1cwmkv1zhwwnhv79gp04070z0743qyjjvba24l650"; system = "cl-steamworks-generator"; asd = "cl-steamworks-generator"; } @@ -34659,7 +35337,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-stomp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-stomp/2020-09-25/cl-stomp-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-stomp/2020-09-25/cl-stomp-20200925-git.tgz"; sha256 = "180y0x53ghsvz6n0bz67aw69p962bsslarikk89rf41kcv998xvw"; system = "cl-stomp"; asd = "cl-stomp"; @@ -34683,7 +35361,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-stopwatch" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-stopwatch/2023-06-18/cl-stopwatch-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-stopwatch/2023-06-18/cl-stopwatch-20230618-git.tgz"; sha256 = "14jmylqk1kijbhhn897r76ii4xg32k22p4v7h29jbcs9y2mn2day"; system = "cl-stopwatch"; asd = "cl-stopwatch"; @@ -34703,7 +35381,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-store" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-store/2023-02-14/cl-store-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-store/2023-02-14/cl-store-20230214-git.tgz"; sha256 = "1kw39lmbiaksrxsq8pf5np8vjarymcvlc451z83275194av3imix"; system = "cl-store"; asd = "cl-store"; @@ -34721,7 +35399,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-store-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-store/2023-02-14/cl-store-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-store/2023-02-14/cl-store-20230214-git.tgz"; sha256 = "1kw39lmbiaksrxsq8pf5np8vjarymcvlc451z83275194av3imix"; system = "cl-store-tests"; asd = "cl-store"; @@ -34744,7 +35422,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-stream" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-stream/2019-05-21/cl-stream-20190521-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-stream/2019-05-21/cl-stream-20190521-git.tgz"; sha256 = "1r2spbcx3ifz51yq2pxkdb1n2k5fvyg3pz3w42mnw99pq78cbasv"; system = "cl-stream"; asd = "cl-stream"; @@ -34764,7 +35442,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-strftime" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-strftime/2016-03-18/cl-strftime-20160318-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-strftime/2016-03-18/cl-strftime-20160318-git.tgz"; sha256 = "00c8hq7vzgb89ab3q7mrp60x743kiqmsk1g51ynhxlqhph2bnslf"; system = "cl-strftime"; asd = "cl-strftime"; @@ -34789,7 +35467,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-string-complete" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-string-complete/2023-06-18/cl-string-complete-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-string-complete/2023-06-18/cl-string-complete-20230618-git.tgz"; sha256 = "14l1yyz5fakz5xn31yjfn4mz7j9rcbijw1sp4mdfizfvjbbwcixl"; system = "cl-string-complete"; asd = "cl-string-complete"; @@ -34809,7 +35487,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-string-generator" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-string-generator/2021-06-30/cl-string-generator-20210630-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-string-generator/2021-06-30/cl-string-generator-20210630-git.tgz"; sha256 = "0zm6lyzd205lw30fdvnhrrlv9fylpfqksqxl32zvj9vzcn8qc1vi"; system = "cl-string-generator"; asd = "cl-string-generator"; @@ -34832,7 +35510,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-string-match" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-string-match/2021-12-09/cl-string-match-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-string-match/2021-12-09/cl-string-match-20211209-git.tgz"; sha256 = "0zndlkw3qy3vw4px4qv884z6232w8zfaliyc88irjwizdv35wcq9"; system = "cl-string-match"; asd = "cl-string-match"; @@ -34859,7 +35537,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-string-match-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-string-match/2021-12-09/cl-string-match-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-string-match/2021-12-09/cl-string-match-20211209-git.tgz"; sha256 = "0zndlkw3qy3vw4px4qv884z6232w8zfaliyc88irjwizdv35wcq9"; system = "cl-string-match-test"; asd = "cl-string-match-test"; @@ -34884,7 +35562,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-strings" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-strings/2021-04-11/cl-strings-20210411-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-strings/2021-04-11/cl-strings-20210411-git.tgz"; sha256 = "1j8hs54fn0wsf5zfzhhgiva47n9hsmfa74iinahz6nmcs8iy75aj"; system = "cl-strings"; asd = "cl-strings"; @@ -34904,7 +35582,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-strings-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-strings/2021-04-11/cl-strings-20210411-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-strings/2021-04-11/cl-strings-20210411-git.tgz"; sha256 = "1j8hs54fn0wsf5zfzhhgiva47n9hsmfa74iinahz6nmcs8iy75aj"; system = "cl-strings-tests"; asd = "cl-strings"; @@ -34927,7 +35605,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-svg" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-svg/2024-10-12/cl-svg-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-svg/2024-10-12/cl-svg-20241012-git.tgz"; sha256 = "05zrg6sxi01xn940c7lygfgxwjkq0zmlkihbhm7lhfaszg2xj8bh"; system = "cl-svg"; asd = "cl-svg"; @@ -34945,7 +35623,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-svm" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-svm/2011-04-18/cl-svm-20110418-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-svm/2011-04-18/cl-svm-20110418-git.tgz"; sha256 = "03d070k3bl5c0b2f6bzig5gkhlj074v74f7kg8hh3znrbmwji2wv"; system = "cl-svm"; asd = "cl-svm"; @@ -34965,7 +35643,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-swagger" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-swagger-codegen/2018-08-31/cl-swagger-codegen-20180831-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-swagger-codegen/2018-08-31/cl-swagger-codegen-20180831-git.tgz"; sha256 = "1lkp69n7wscyf2az3h2bmxmvzzppdfxcq5s0m607b1f7nfmxzjsq"; system = "cl-swagger"; asd = "cl-swagger"; @@ -34990,7 +35668,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-sxml" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sxml/2020-03-25/cl-sxml-20200325-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sxml/2020-03-25/cl-sxml-20200325-git.tgz"; sha256 = "1105s9whidq1lf0lli2wdhcfcs5gwzxa0h1x3izx4mp2p7psvciz"; system = "cl-sxml"; asd = "cl-sxml"; @@ -35010,7 +35688,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-sxml-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sxml/2020-03-25/cl-sxml-20200325-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sxml/2020-03-25/cl-sxml-20200325-git.tgz"; sha256 = "1105s9whidq1lf0lli2wdhcfcs5gwzxa0h1x3izx4mp2p7psvciz"; system = "cl-sxml-test"; asd = "cl-sxml"; @@ -35034,7 +35712,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-syntax" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; sha256 = "17ran8xp77asagl31xv8w819wafh6whwfc9p6dgx22ca537gyl4y"; system = "cl-syntax"; asd = "cl-syntax"; @@ -35055,7 +35733,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-syntax-annot" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; sha256 = "17ran8xp77asagl31xv8w819wafh6whwfc9p6dgx22ca537gyl4y"; system = "cl-syntax-annot"; asd = "cl-syntax-annot"; @@ -35076,7 +35754,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-syntax-anonfun" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; sha256 = "17ran8xp77asagl31xv8w819wafh6whwfc9p6dgx22ca537gyl4y"; system = "cl-syntax-anonfun"; asd = "cl-syntax-anonfun"; @@ -35097,7 +35775,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-syntax-clsql" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; sha256 = "17ran8xp77asagl31xv8w819wafh6whwfc9p6dgx22ca537gyl4y"; system = "cl-syntax-clsql"; asd = "cl-syntax-clsql"; @@ -35120,7 +35798,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-syntax-debug-print" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-debug-print/2021-08-07/cl-debug-print-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-debug-print/2021-08-07/cl-debug-print-20210807-git.tgz"; sha256 = "1cm5nybmv0pq9s4lrwhd01rjj1wlcj1sjcrcakabi7w7b5zw4cyh"; system = "cl-syntax-debug-print"; asd = "cl-syntax-debug-print"; @@ -35143,7 +35821,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-syntax-fare-quasiquote" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; sha256 = "17ran8xp77asagl31xv8w819wafh6whwfc9p6dgx22ca537gyl4y"; system = "cl-syntax-fare-quasiquote"; asd = "cl-syntax-fare-quasiquote"; @@ -35166,7 +35844,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-syntax-interpol" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; sha256 = "17ran8xp77asagl31xv8w819wafh6whwfc9p6dgx22ca537gyl4y"; system = "cl-syntax-interpol"; asd = "cl-syntax-interpol"; @@ -35189,7 +35867,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-syntax-lsx" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lsx/2022-02-20/lsx-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/lsx/2022-02-20/lsx-20220220-git.tgz"; sha256 = "1pdq6csr8pkzcq2zkhhm6wkp9zxx2aypjd16rcw4q43mff09y041"; system = "cl-syntax-lsx"; asd = "cl-syntax-lsx"; @@ -35212,7 +35890,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-syntax-markup" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; sha256 = "17ran8xp77asagl31xv8w819wafh6whwfc9p6dgx22ca537gyl4y"; system = "cl-syntax-markup"; asd = "cl-syntax-markup"; @@ -35233,7 +35911,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-syslog" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-syslog/2019-02-02/cl-syslog-20190202-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-syslog/2019-02-02/cl-syslog-20190202-git.tgz"; sha256 = "1qcz55jiqwk91b01hsahxnha884f6zf2883j2m51sqph0mvj69mh"; system = "cl-syslog"; asd = "cl-syslog"; @@ -35259,7 +35937,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-table" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-table/2013-01-28/cl-table-20130128-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-table/2013-01-28/cl-table-20130128-git.tgz"; sha256 = "0c7bdnpi473grayycdcdh4q8fi137i3c80k05k87pvjdrl1qnkpn"; system = "cl-table"; asd = "cl-table"; @@ -35279,7 +35957,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-tasukete" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-tasukete/2018-02-28/cl-tasukete-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-tasukete/2018-02-28/cl-tasukete-20180228-git.tgz"; sha256 = "0i8ibg2a33mb32vr2b70psb5dvh47r52lfhkh84rxzmcsk6ww230"; system = "cl-tasukete"; asd = "cl-tasukete"; @@ -35305,7 +35983,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-tasukete-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-tasukete/2018-02-28/cl-tasukete-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-tasukete/2018-02-28/cl-tasukete-20180228-git.tgz"; sha256 = "0i8ibg2a33mb32vr2b70psb5dvh47r52lfhkh84rxzmcsk6ww230"; system = "cl-tasukete-test"; asd = "cl-tasukete-test"; @@ -35330,7 +36008,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-telebot" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-telebot/2021-10-20/cl-telebot-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-telebot/2021-10-20/cl-telebot-20211020-git.tgz"; sha256 = "0nl002l4f3x6843s6h5w2iz2hganxb369k8c2hbbgqq7plb4mdf1"; system = "cl-telebot"; asd = "cl-telebot"; @@ -35350,12 +36028,12 @@ lib.makeScope pkgs.newScope (self: { cl-telegram-bot = ( build-asdf-system { pname = "cl-telegram-bot"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-telegram-bot" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-telegram-bot/2024-10-12/cl-telegram-bot-20241012-git.tgz"; - sha256 = "1i1g9ax46b5jyx2nckp2q00asb46wwlin0hj5wlqlp7cb27r3dqj"; + url = "https://beta.quicklisp.org/archive/cl-telegram-bot/2025-06-22/cl-telegram-bot-20250622-git.tgz"; + sha256 = "14y99vc0k9xv81xcfk7aaia3npwg1b0lmsx3fn03vgl3ws37fz9m"; system = "cl-telegram-bot"; asd = "cl-telegram-bot"; } @@ -35364,6 +36042,7 @@ lib.makeScope pkgs.newScope (self: { lispLibs = [ (getAttr "_40ants-asdf-system" self) (getAttr "alexandria" self) + (getAttr "anaphora" self) (getAttr "arrows" self) (getAttr "bordeaux-threads" self) (getAttr "cl-ppcre" self) @@ -35376,6 +36055,7 @@ lib.makeScope pkgs.newScope (self: { (getAttr "serapeum" self) (getAttr "str" self) (getAttr "trivial-backtrace" self) + (getAttr "yason" self) ]; meta = { hydraPlatforms = [ ]; @@ -35385,12 +36065,12 @@ lib.makeScope pkgs.newScope (self: { cl-telegram-bot-ci = ( build-asdf-system { pname = "cl-telegram-bot-ci"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-telegram-bot-ci" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-telegram-bot/2024-10-12/cl-telegram-bot-20241012-git.tgz"; - sha256 = "1i1g9ax46b5jyx2nckp2q00asb46wwlin0hj5wlqlp7cb27r3dqj"; + url = "https://beta.quicklisp.org/archive/cl-telegram-bot/2025-06-22/cl-telegram-bot-20250622-git.tgz"; + sha256 = "14y99vc0k9xv81xcfk7aaia3npwg1b0lmsx3fn03vgl3ws37fz9m"; system = "cl-telegram-bot-ci"; asd = "cl-telegram-bot-ci"; } @@ -35405,12 +36085,12 @@ lib.makeScope pkgs.newScope (self: { cl-telegram-bot-docs = ( build-asdf-system { pname = "cl-telegram-bot-docs"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-telegram-bot-docs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-telegram-bot/2024-10-12/cl-telegram-bot-20241012-git.tgz"; - sha256 = "1i1g9ax46b5jyx2nckp2q00asb46wwlin0hj5wlqlp7cb27r3dqj"; + url = "https://beta.quicklisp.org/archive/cl-telegram-bot/2025-06-22/cl-telegram-bot-20250622-git.tgz"; + sha256 = "14y99vc0k9xv81xcfk7aaia3npwg1b0lmsx3fn03vgl3ws37fz9m"; system = "cl-telegram-bot-docs"; asd = "cl-telegram-bot-docs"; } @@ -35419,6 +36099,8 @@ lib.makeScope pkgs.newScope (self: { lispLibs = [ (getAttr "_40ants-doc" self) (getAttr "cl-telegram-bot" self) + (getAttr "cl-telegram-bot-media" self) + (getAttr "cl-telegram-bot2" self) (getAttr "docs-config" self) (getAttr "named-readtables" self) (getAttr "pythonic-string-reader" self) @@ -35428,15 +36110,35 @@ lib.makeScope pkgs.newScope (self: { }; } ); + cl-telegram-bot-media = ( + build-asdf-system { + pname = "cl-telegram-bot-media"; + version = "20250622-git"; + asds = [ "cl-telegram-bot-media" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-telegram-bot-media/2025-06-22/cl-telegram-bot-media-20250622-git.tgz"; + sha256 = "0w8vj1szb2i00r5ll7wjjz45ny1w6ygplidpmd6xm6qf8izr69gy"; + system = "cl-telegram-bot-media"; + asd = "cl-telegram-bot-media"; + } + ); + systems = [ "cl-telegram-bot-media" ]; + lispLibs = [ (getAttr "_40ants-asdf-system" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); cl-telegram-bot-tests = ( build-asdf-system { pname = "cl-telegram-bot-tests"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-telegram-bot-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-telegram-bot/2024-10-12/cl-telegram-bot-20241012-git.tgz"; - sha256 = "1i1g9ax46b5jyx2nckp2q00asb46wwlin0hj5wlqlp7cb27r3dqj"; + url = "https://beta.quicklisp.org/archive/cl-telegram-bot/2025-06-22/cl-telegram-bot-20250622-git.tgz"; + sha256 = "14y99vc0k9xv81xcfk7aaia3npwg1b0lmsx3fn03vgl3ws37fz9m"; system = "cl-telegram-bot-tests"; asd = "cl-telegram-bot-tests"; } @@ -35448,6 +36150,75 @@ lib.makeScope pkgs.newScope (self: { }; } ); + cl-telegram-bot2 = ( + build-asdf-system { + pname = "cl-telegram-bot2"; + version = "20250622-git"; + asds = [ "cl-telegram-bot2" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-telegram-bot/2025-06-22/cl-telegram-bot-20250622-git.tgz"; + sha256 = "14y99vc0k9xv81xcfk7aaia3npwg1b0lmsx3fn03vgl3ws37fz9m"; + system = "cl-telegram-bot2"; + asd = "cl-telegram-bot2"; + } + ); + systems = [ "cl-telegram-bot2" ]; + lispLibs = [ + (getAttr "_40ants-asdf-system" self) + (getAttr "alexandria" self) + (getAttr "bordeaux-threads" self) + (getAttr "cl-json" self) + (getAttr "closer-mop" self) + (getAttr "dexador" self) + (getAttr "lambda-fiddle" self) + (getAttr "log4cl" self) + (getAttr "njson" self) + (getAttr "quri" self) + (getAttr "sento" self) + (getAttr "serapeum" self) + (getAttr "str" self) + (getAttr "trivial-arguments" self) + (getAttr "trivial-backtrace" self) + (getAttr "utilities_dot_print-items" self) + (getAttr "yason" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + cl-telegram-bot2-examples = ( + build-asdf-system { + pname = "cl-telegram-bot2-examples"; + version = "20250622-git"; + asds = [ "cl-telegram-bot2-examples" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-telegram-bot/2025-06-22/cl-telegram-bot-20250622-git.tgz"; + sha256 = "14y99vc0k9xv81xcfk7aaia3npwg1b0lmsx3fn03vgl3ws37fz9m"; + system = "cl-telegram-bot2-examples"; + asd = "cl-telegram-bot2-examples"; + } + ); + systems = [ "cl-telegram-bot2-examples" ]; + lispLibs = [ + (getAttr "_40ants-asdf-system" self) + (getAttr "_40ants-logging" self) + (getAttr "alexandria" self) + (getAttr "clack" self) + (getAttr "clack-handler-hunchentoot" self) + (getAttr "ningle" self) + (getAttr "serapeum" self) + (getAttr "spinneret" self) + (getAttr "str" self) + (getAttr "yason" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); cl-template = ( build-asdf-system { pname = "cl-template"; @@ -35455,7 +36226,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-template" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-template/2013-06-15/cl-template-20130615-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-template/2013-06-15/cl-template-20130615-git.tgz"; sha256 = "1rhg023a2nxsk5x6abd6i0a8sh36aj0bgsh80w60m3b7xlsva2x2"; system = "cl-template"; asd = "cl-template"; @@ -35475,7 +36246,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-template-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-template/2013-06-15/cl-template-20130615-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-template/2013-06-15/cl-template-20130615-git.tgz"; sha256 = "1rhg023a2nxsk5x6abd6i0a8sh36aj0bgsh80w60m3b7xlsva2x2"; system = "cl-template-tests"; asd = "cl-template"; @@ -35498,7 +36269,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-termbox" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-termbox/2021-10-20/cl-termbox-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-termbox/2021-10-20/cl-termbox-20211020-git.tgz"; sha256 = "1igmq64zndkgchmzggp34jrmxa81dqlhz2il8qizrpfw5a39cpld"; system = "cl-termbox"; asd = "cl-termbox"; @@ -35514,12 +36285,12 @@ lib.makeScope pkgs.newScope (self: { cl-tesseract = ( build-asdf-system { pname = "cl-tesseract"; - version = "20171130-git"; + version = "20250622-git"; asds = [ "cl-tesseract" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-tesseract/2017-11-30/cl-tesseract-20171130-git.tgz"; - sha256 = "086627k8whbj60bpw9r3jrdifr4bigqpnp9hxsi7r6702gixz50x"; + url = "https://beta.quicklisp.org/archive/cl-tesseract/2025-06-22/cl-tesseract-20250622-git.tgz"; + sha256 = "1v2f8hiwjj501bwq5nh3q09w994d54jf87kllz1xzqknfb835c48"; system = "cl-tesseract"; asd = "cl-tesseract"; } @@ -35538,7 +36309,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-test-more" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz"; sha256 = "0ca6ha3zhmckq3ad9lxm6sbg4i0hg3m81xhan4dkxd3x9898jzpc"; system = "cl-test-more"; asd = "cl-test-more"; @@ -35556,7 +36327,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-tetris3d" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-tetris3d/2018-12-10/cl-tetris3d-20181210-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-tetris3d/2018-12-10/cl-tetris3d-20181210-git.tgz"; sha256 = "09n7344is2vfbp32cd22ynk14h4vqs4xw3plbhga8q25ghhx5y9p"; system = "cl-tetris3d"; asd = "cl-tetris3d"; @@ -35581,7 +36352,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-textmagic" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-textmagic/2015-12-18/cl-textmagic-20151218-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-textmagic/2015-12-18/cl-textmagic-20151218-git.tgz"; sha256 = "0xw6g1r5vxmnbz3kxf2q6s9dr9l2aacyri1wchzw4jx5wlcnkshw"; system = "cl-textmagic"; asd = "cl-textmagic"; @@ -35604,7 +36375,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-textmagic-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-textmagic/2015-12-18/cl-textmagic-20151218-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-textmagic/2015-12-18/cl-textmagic-20151218-git.tgz"; sha256 = "0xw6g1r5vxmnbz3kxf2q6s9dr9l2aacyri1wchzw4jx5wlcnkshw"; system = "cl-textmagic-test"; asd = "cl-textmagic-test"; @@ -35628,7 +36399,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-tga" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-tga/2016-03-18/cl-tga-20160318-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-tga/2016-03-18/cl-tga-20160318-git.tgz"; sha256 = "03k3npmn0xd3fd2m7vwxph82av2xrfb150imqrinlzqmzvz1v1br"; system = "cl-tga"; asd = "cl-tga"; @@ -35648,7 +36419,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-threadpool" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-threadpool/2024-10-12/cl-threadpool-quickload-current-release-feda6ff9-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-threadpool/2024-10-12/cl-threadpool-quickload-current-release-feda6ff9-git.tgz"; sha256 = "0y2kai8ijz0y6j54svvdrl2f2v96pz0pl652x86lz7pl4yyg99vr"; system = "cl-threadpool"; asd = "cl-threadpool"; @@ -35671,7 +36442,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-tidy" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-tidy/2017-08-30/cl-tidy-20170830-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-tidy/2017-08-30/cl-tidy-20170830-git.tgz"; sha256 = "13j0jgf6czb24148w2wxfwlji6vnc49qvyr5wzq5ps55b27ddlz6"; system = "cl-tidy"; asd = "cl-tidy"; @@ -35687,12 +36458,12 @@ lib.makeScope pkgs.newScope (self: { cl-tiled = ( build-asdf-system { pname = "cl-tiled"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-tiled" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-tiled/2024-10-12/cl-tiled-20241012-git.tgz"; - sha256 = "0ni61iahr58i44psk4z3q1w9nsxbc49m5wbb8w0icm4f7x0ijn07"; + url = "https://beta.quicklisp.org/archive/cl-tiled/2025-06-22/cl-tiled-20250622-git.tgz"; + sha256 = "1wmh9df35sl4wd4n4nd050p9489zk4vwg32a5hsj2qqyrh2qvi8b"; system = "cl-tiled"; asd = "cl-tiled"; } @@ -35716,18 +36487,21 @@ lib.makeScope pkgs.newScope (self: { cl-tk = ( build-asdf-system { pname = "cl-tk"; - version = "20150608-git"; + version = "20250622-git"; asds = [ "cl-tk" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-tk/2015-06-08/cl-tk-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-tk/2025-06-22/cl-tk-20250622-git.tgz"; sha256 = "0fm4q4pkzbyxr6227vavvy4lm7rfw214lp2dylgzjzcp6f5r4n7w"; system = "cl-tk"; asd = "cl-tk"; } ); systems = [ "cl-tk" ]; - lispLibs = [ (getAttr "cffi" self) ]; + lispLibs = [ + (getAttr "cffi" self) + (getAttr "trivial-features" self) + ]; meta = { hydraPlatforms = [ ]; }; @@ -35736,12 +36510,12 @@ lib.makeScope pkgs.newScope (self: { cl-tld = ( build-asdf-system { pname = "cl-tld"; - version = "20220220-git"; + version = "20250622-git"; asds = [ "cl-tld" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-tld/2022-02-20/cl-tld-20220220-git.tgz"; - sha256 = "1xm471p92in5g4fcxgqshwgr2d7937jw7jv6j473slwkxjvx8dp6"; + url = "https://beta.quicklisp.org/archive/cl-tld/2025-06-22/cl-tld-20250622-git.tgz"; + sha256 = "1zxns30gj4hkbm8vm00yi4yvyyvchndq9vi84s5ssymja722j2dc"; system = "cl-tld"; asd = "cl-tld"; } @@ -35760,7 +36534,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-tls" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-tls/2023-10-21/cl-tls-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-tls/2023-10-21/cl-tls-20231021-git.tgz"; sha256 = "1gq7m5wmsrjmyhrk9xljxz9ickahwzl1anz2fcns5q2nj0j6d9bx"; system = "cl-tls"; asd = "cl-tls"; @@ -35786,7 +36560,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-tokyo-cabinet" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-tokyo-cabinet/2016-08-25/cl-tokyo-cabinet-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-tokyo-cabinet/2016-08-25/cl-tokyo-cabinet-20160825-git.tgz"; sha256 = "07961in8fa09bjnpwkdn0w6dj37nppzmgg50kf8khspnjh1sjsr2"; system = "cl-tokyo-cabinet"; asd = "cl-tokyo-cabinet"; @@ -35809,7 +36583,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-tokyo-cabinet-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-tokyo-cabinet/2016-08-25/cl-tokyo-cabinet-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-tokyo-cabinet/2016-08-25/cl-tokyo-cabinet-20160825-git.tgz"; sha256 = "07961in8fa09bjnpwkdn0w6dj37nppzmgg50kf8khspnjh1sjsr2"; system = "cl-tokyo-cabinet-test"; asd = "cl-tokyo-cabinet-test"; @@ -35834,7 +36608,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-toml" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-toml/2019-11-30/cl-toml-20191130-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-toml/2019-11-30/cl-toml-20191130-git.tgz"; sha256 = "1g5i60i78s0ms608fyc6sgaaqr6jdsln75n26lmfbcaqw2g1q9dk"; system = "cl-toml"; asd = "cl-toml"; @@ -35859,7 +36633,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-toml-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-toml/2019-11-30/cl-toml-20191130-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-toml/2019-11-30/cl-toml-20191130-git.tgz"; sha256 = "1g5i60i78s0ms608fyc6sgaaqr6jdsln75n26lmfbcaqw2g1q9dk"; system = "cl-toml-test"; asd = "cl-toml-test"; @@ -35882,7 +36656,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-tqdm" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-tqdm/2024-10-12/cl-tqdm-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-tqdm/2024-10-12/cl-tqdm-20241012-git.tgz"; sha256 = "0wlbgs7wfiy149d7zq5bpkm8g3785b1crcf2m802f9qhin2r0nzg"; system = "cl-tqdm"; asd = "cl-tqdm"; @@ -35902,7 +36676,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-transmission" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-transmission/2020-03-25/cl-transmission-20200325-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-transmission/2020-03-25/cl-transmission-20200325-git.tgz"; sha256 = "0sg3f2jqs2z3mvscjhc43hkd34vlcc4c8hq8rhh5w1gjg19z57hb"; system = "cl-transmission"; asd = "cl-transmission"; @@ -35928,7 +36702,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-transmission-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-transmission/2020-03-25/cl-transmission-20200325-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-transmission/2020-03-25/cl-transmission-20200325-git.tgz"; sha256 = "0sg3f2jqs2z3mvscjhc43hkd34vlcc4c8hq8rhh5w1gjg19z57hb"; system = "cl-transmission-test"; asd = "cl-transmission-test"; @@ -35952,7 +36726,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-trie" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-trie/2023-02-14/cl-trie-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-trie/2023-02-14/cl-trie-20230214-git.tgz"; sha256 = "0d0mnac9rbqvwr45650yimfw4fyldbgasj139g7y1wzrranrcldf"; system = "cl-trie"; asd = "cl-trie"; @@ -35972,7 +36746,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-trie-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-trie/2023-02-14/cl-trie-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-trie/2023-02-14/cl-trie-20230214-git.tgz"; sha256 = "0d0mnac9rbqvwr45650yimfw4fyldbgasj139g7y1wzrranrcldf"; system = "cl-trie-examples"; asd = "cl-trie-examples"; @@ -35995,7 +36769,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-tui" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-tui/2020-04-27/cl-tui-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-tui/2020-04-27/cl-tui-20200427-git.tgz"; sha256 = "1s0z7sjb3p1fxypc2x9fl0y094qa1a2iqjbn5him4hs8z7xm5kz8"; system = "cl-tui"; asd = "cl-tui"; @@ -36023,7 +36797,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-tulip-graph" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-tulip-graph/2013-06-15/cl-tulip-graph-20130615-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-tulip-graph/2013-06-15/cl-tulip-graph-20130615-git.tgz"; sha256 = "0zmmwqabbyzdikn8x0xqrj192wr5w87l828nwandqg59af2isxav"; system = "cl-tulip-graph"; asd = "cl-tulip-graph"; @@ -36043,7 +36817,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-tuples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-tuples/2014-07-13/cl-tuples-20140713-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-tuples/2014-07-13/cl-tuples-20140713-git.tgz"; sha256 = "060xmr03y8n0mnf4x4fnrirljcjk1jcir7jsjq4w9d5vzq3aqm9m"; system = "cl-tuples"; asd = "cl-tuples"; @@ -36066,7 +36840,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-twit-repl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-twitter/2018-02-28/cl-twitter-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-twitter/2018-02-28/cl-twitter-20180228-git.tgz"; sha256 = "07l86c63ssahpz3s9f7d99mbzmh60askkpdrhjrdbzd1vxlwkhcr"; system = "cl-twit-repl"; asd = "cl-twit-repl"; @@ -36086,7 +36860,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-twitter" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-twitter/2018-02-28/cl-twitter-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-twitter/2018-02-28/cl-twitter-20180228-git.tgz"; sha256 = "07l86c63ssahpz3s9f7d99mbzmh60askkpdrhjrdbzd1vxlwkhcr"; system = "cl-twitter"; asd = "cl-twitter"; @@ -36115,7 +36889,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-typesetting" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-typesetting/2021-05-31/cl-typesetting-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-typesetting/2021-05-31/cl-typesetting-20210531-git.tgz"; sha256 = "0fcs5mq0gxfczbrg7ay8r4bf5r4g6blvpdbjkhcl8dapcikyn35h"; system = "cl-typesetting"; asd = "cl-typesetting"; @@ -36133,7 +36907,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-uglify-js" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-uglify-js/2015-07-09/cl-uglify-js-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-uglify-js/2015-07-09/cl-uglify-js-20150709-git.tgz"; sha256 = "0k39y3c93jgxpr7gwz7w0d8yknn1fdnxrjhd03057lvk5w8js27a"; system = "cl-uglify-js"; asd = "cl-uglify-js"; @@ -36159,7 +36933,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-unac" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-unac/2023-06-18/cl-unac-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-unac/2023-06-18/cl-unac-20230618-git.tgz"; sha256 = "16i4lwg70k05dw3vynyyz09ldgr4zzd1ar68g4jcxk7q4ijfdw9m"; system = "cl-unac"; asd = "cl-unac"; @@ -36182,7 +36956,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-unac.config" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-unac/2023-06-18/cl-unac-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-unac/2023-06-18/cl-unac-20230618-git.tgz"; sha256 = "16i4lwg70k05dw3vynyyz09ldgr4zzd1ar68g4jcxk7q4ijfdw9m"; system = "cl-unac.config"; asd = "cl-unac.config"; @@ -36202,7 +36976,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-unac.tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-unac/2023-06-18/cl-unac-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-unac/2023-06-18/cl-unac-20230618-git.tgz"; sha256 = "16i4lwg70k05dw3vynyyz09ldgr4zzd1ar68g4jcxk7q4ijfdw9m"; system = "cl-unac.tests"; asd = "cl-unac.tests"; @@ -36225,7 +36999,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-unicode" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-unicode/2024-10-12/cl-unicode-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-unicode/2024-10-12/cl-unicode-20241012-git.tgz"; sha256 = "14ydcjkj94mmx40vs27w8137lgmw16jjhpr5m46mm6gqv46yvr6l"; system = "cl-unicode"; asd = "cl-unicode"; @@ -36239,12 +37013,12 @@ lib.makeScope pkgs.newScope (self: { cl-unification = ( build-asdf-system { pname = "cl-unification"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-unification" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-unification/2024-10-12/cl-unification-20241012-git.tgz"; - sha256 = "1q7bjj9dzazhgj32291rqy4lld1ilrpck374c21864qn3pmz31ag"; + url = "https://beta.quicklisp.org/archive/cl-unification/2025-06-22/cl-unification-20250622-git.tgz"; + sha256 = "0s9lhh6nzbbsds967aixadwzfqbdiy5f19xp2a5181gd970w187r"; system = "cl-unification"; asd = "cl-unification"; } @@ -36257,12 +37031,12 @@ lib.makeScope pkgs.newScope (self: { cl-unification-lib = ( build-asdf-system { pname = "cl-unification-lib"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-unification-lib" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-unification/2024-10-12/cl-unification-20241012-git.tgz"; - sha256 = "1q7bjj9dzazhgj32291rqy4lld1ilrpck374c21864qn3pmz31ag"; + url = "https://beta.quicklisp.org/archive/cl-unification/2025-06-22/cl-unification-20250622-git.tgz"; + sha256 = "0s9lhh6nzbbsds967aixadwzfqbdiy5f19xp2a5181gd970w187r"; system = "cl-unification-lib"; asd = "cl-unification-lib"; } @@ -36280,12 +37054,12 @@ lib.makeScope pkgs.newScope (self: { cl-unification-test = ( build-asdf-system { pname = "cl-unification-test"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-unification-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-unification/2024-10-12/cl-unification-20241012-git.tgz"; - sha256 = "1q7bjj9dzazhgj32291rqy4lld1ilrpck374c21864qn3pmz31ag"; + url = "https://beta.quicklisp.org/archive/cl-unification/2025-06-22/cl-unification-20250622-git.tgz"; + sha256 = "0s9lhh6nzbbsds967aixadwzfqbdiy5f19xp2a5181gd970w187r"; system = "cl-unification-test"; asd = "cl-unification-test"; } @@ -36307,7 +37081,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-union-find" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-union-find/2022-11-06/cl-union-find-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-union-find/2022-11-06/cl-union-find-20221106-git.tgz"; sha256 = "14xciva5v3c4zi4vzp1vfhs82a2654yhkfyllr3b0cr7x36jdm7y"; system = "cl-union-find"; asd = "cl-union-find"; @@ -36327,7 +37101,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-utilities" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz"; + url = "https://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz"; sha256 = "1dmbkdr8xm2jw5yx1makqbf1ypqbm0hpkd7zyknxv3cblvz0a87w"; system = "cl-utilities"; asd = "cl-utilities"; @@ -36345,7 +37119,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-variates" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-variates/2018-01-31/cl-variates-20180131-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/cl-variates/2018-01-31/cl-variates-20180131-darcs.tgz"; sha256 = "02pd02isfxrn3h8h5kh369rwy17hfjkmd7j24pcihfskamgcqgfx"; system = "cl-variates"; asd = "cl-variates"; @@ -36365,7 +37139,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-vectors" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-vectors/2024-10-12/cl-vectors-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-vectors/2024-10-12/cl-vectors-20241012-git.tgz"; sha256 = "1nkmmn38y6af10ysff3g2qkf5lb2601dcjp5rffsjh6bv2ik2jd5"; system = "cl-vectors"; asd = "cl-vectors"; @@ -36386,7 +37160,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-vhdl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-vhdl/2016-04-21/cl-vhdl-20160421-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-vhdl/2016-04-21/cl-vhdl-20160421-git.tgz"; sha256 = "0i2780ljak8kcqa2zm24dk2fk771m2mvmnbq4xd4vvx9z87lbnvi"; system = "cl-vhdl"; asd = "cl-vhdl"; @@ -36413,7 +37187,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-vhdl-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-vhdl/2016-04-21/cl-vhdl-20160421-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-vhdl/2016-04-21/cl-vhdl-20160421-git.tgz"; sha256 = "0i2780ljak8kcqa2zm24dk2fk771m2mvmnbq4xd4vvx9z87lbnvi"; system = "cl-vhdl-tests"; asd = "cl-vhdl"; @@ -36439,7 +37213,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-video" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-video/2018-02-28/cl-video-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-video/2018-02-28/cl-video-20180228-git.tgz"; sha256 = "1azldcp6r0j1kw6rczicmnv4m0d7rq4m5axz48ny6r2qybha80lr"; system = "cl-video"; asd = "cl-video"; @@ -36459,7 +37233,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-video-avi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-video/2018-02-28/cl-video-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-video/2018-02-28/cl-video-20180228-git.tgz"; sha256 = "1azldcp6r0j1kw6rczicmnv4m0d7rq4m5axz48ny6r2qybha80lr"; system = "cl-video-avi"; asd = "cl-video-avi"; @@ -36485,7 +37259,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-video-gif" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-video/2018-02-28/cl-video-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-video/2018-02-28/cl-video-20180228-git.tgz"; sha256 = "1azldcp6r0j1kw6rczicmnv4m0d7rq4m5axz48ny6r2qybha80lr"; system = "cl-video-gif"; asd = "cl-video-gif"; @@ -36509,7 +37283,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-video-player" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-video/2018-02-28/cl-video-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-video/2018-02-28/cl-video-20180228-git.tgz"; sha256 = "1azldcp6r0j1kw6rczicmnv4m0d7rq4m5axz48ny6r2qybha80lr"; system = "cl-video-player"; asd = "cl-video-player"; @@ -36536,7 +37310,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-video-wav" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-video/2018-02-28/cl-video-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-video/2018-02-28/cl-video-20180228-git.tgz"; sha256 = "1azldcp6r0j1kw6rczicmnv4m0d7rq4m5axz48ny6r2qybha80lr"; system = "cl-video-wav"; asd = "cl-video-wav"; @@ -36561,7 +37335,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-virtualbox" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-virtualbox/2018-08-31/cl-virtualbox-20180831-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-virtualbox/2018-08-31/cl-virtualbox-20180831-git.tgz"; sha256 = "1jzn8jjn9yn9vgnn1r6h0iyxb6j17wm8lmf9j5hk4yqwdzb2nidv"; system = "cl-virtualbox"; asd = "cl-virtualbox"; @@ -36581,12 +37355,12 @@ lib.makeScope pkgs.newScope (self: { cl-vorbis = ( build-asdf-system { pname = "cl-vorbis"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-vorbis" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-vorbis/2024-10-12/cl-vorbis-20241012-git.tgz"; - sha256 = "04p0ix2mxa8iv2dab19mlix6m3inwyb0rs5wsrf8r9l1n41dyp2p"; + url = "https://beta.quicklisp.org/archive/cl-vorbis/2025-06-22/cl-vorbis-20250622-git.tgz"; + sha256 = "0xigqkh4lqz734nniyifbymgxyxcr6if4358598md0y4mnv709sx"; system = "cl-vorbis"; asd = "cl-vorbis"; } @@ -36611,7 +37385,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-voxelize" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-voxelize/2015-07-09/cl-voxelize-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-voxelize/2015-07-09/cl-voxelize-20150709-git.tgz"; sha256 = "1sim8n175dgy0i0dxi1vsqzgjx07lgsnrgn3bizzka58ni5y8xdm"; system = "cl-voxelize"; asd = "cl-voxelize"; @@ -36631,7 +37405,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-voxelize-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-voxelize/2015-07-09/cl-voxelize-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-voxelize/2015-07-09/cl-voxelize-20150709-git.tgz"; sha256 = "1sim8n175dgy0i0dxi1vsqzgjx07lgsnrgn3bizzka58ni5y8xdm"; system = "cl-voxelize-examples"; asd = "cl-voxelize-examples"; @@ -36654,7 +37428,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-voxelize-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-voxelize/2015-07-09/cl-voxelize-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-voxelize/2015-07-09/cl-voxelize-20150709-git.tgz"; sha256 = "1sim8n175dgy0i0dxi1vsqzgjx07lgsnrgn3bizzka58ni5y8xdm"; system = "cl-voxelize-test"; asd = "cl-voxelize-test"; @@ -36678,7 +37452,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-wadler-pprint" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-wadler-pprint/2019-10-07/cl-wadler-pprint-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-wadler-pprint/2019-10-07/cl-wadler-pprint-20191007-git.tgz"; sha256 = "0y5jxk7yiw8wng7hg91cwibh6d2hf1sv2mzqhkds6l4myhzxb4jr"; system = "cl-wadler-pprint"; asd = "cl-wadler-pprint"; @@ -36698,7 +37472,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-wav" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-wav/2022-11-06/cl-wav-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-wav/2022-11-06/cl-wav-20221106-git.tgz"; sha256 = "1nf4zw72v0c9fl8mr4si5cr2xz753ydzv19mfzy5dqqx0k1g7wyl"; system = "cl-wav"; asd = "cl-wav"; @@ -36721,7 +37495,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-wave-file-writer" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-wave-file-writer/2021-10-20/cl-wave-file-writer-quickload-current-release-42cde6cf-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-wave-file-writer/2021-10-20/cl-wave-file-writer-quickload-current-release-42cde6cf-git.tgz"; sha256 = "0mxzp6rm7ah86vp1xj67q43al71k62x407m5vmbldvyb6pmx37fp"; system = "cl-wave-file-writer"; asd = "cl-wave-file-writer"; @@ -36737,12 +37511,12 @@ lib.makeScope pkgs.newScope (self: { cl-wavefront = ( build-asdf-system { pname = "cl-wavefront"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-wavefront" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-wavefront/2024-10-12/cl-wavefront-20241012-git.tgz"; - sha256 = "1il5i04x2ff3pnjm2pgvq0hryd9rnjdbczvinj3l3w30lj553g83"; + url = "https://beta.quicklisp.org/archive/cl-wavefront/2025-06-22/cl-wavefront-20250622-git.tgz"; + sha256 = "0yc6850v8hvfll34fz30yxbazzjs31ylf1rdwi62dzfmmqyxk2cs"; system = "cl-wavefront"; asd = "cl-wavefront"; } @@ -36765,7 +37539,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-wavelets" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-wavelets/2022-07-07/cl-wavelets-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-wavelets/2022-07-07/cl-wavelets-20220707-git.tgz"; sha256 = "0z4r01d5mv4rachz5rr5zvnv94q7ka17138vcpsb05sz00vv03ba"; system = "cl-wavelets"; asd = "cl-wavelets"; @@ -36788,7 +37562,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-wayland" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-wayland/2019-03-07/cl-wayland-20190307-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-wayland/2019-03-07/cl-wayland-20190307-git.tgz"; sha256 = "1axdkdm5d2bvj674jq6ylwhfwbzzs7yjj6f04c519qbdq9sknbcn"; system = "cl-wayland"; asd = "cl-wayland"; @@ -36811,7 +37585,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-weather-jp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-weather-jp/2016-02-08/cl-weather-jp-20160208-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-weather-jp/2016-02-08/cl-weather-jp-20160208-git.tgz"; sha256 = "15bp7gdk7ck9xs9lx2rrzqw6awlk6nz03cqy14wv2lvy3j84dc01"; system = "cl-weather-jp"; asd = "cl-weather-jp"; @@ -36837,7 +37611,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-weather-jp-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-weather-jp/2016-02-08/cl-weather-jp-20160208-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-weather-jp/2016-02-08/cl-weather-jp-20160208-git.tgz"; sha256 = "15bp7gdk7ck9xs9lx2rrzqw6awlk6nz03cqy14wv2lvy3j84dc01"; system = "cl-weather-jp-test"; asd = "cl-weather-jp-test"; @@ -36861,7 +37635,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-webdav" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-webdav/2017-08-30/cl-webdav-20170830-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-webdav/2017-08-30/cl-webdav-20170830-git.tgz"; sha256 = "1cmzv763k4s5blfhx2p8s7q9gk20p8mj9p34dngydc14d2acrxmg"; system = "cl-webdav"; asd = "cl-webdav"; @@ -36885,7 +37659,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-webdriver-client" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-webdriver-client/2024-10-12/cl-webdriver-client-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-webdriver-client/2024-10-12/cl-webdriver-client-20241012-git.tgz"; sha256 = "1975yyvvdxg11vgpyx93nkqr5x6i1xy47230vc40yd0c9bn6lpbr"; system = "cl-webdriver-client"; asd = "cl-webdriver-client"; @@ -36912,7 +37686,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-webdriver-client-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-webdriver-client/2024-10-12/cl-webdriver-client-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-webdriver-client/2024-10-12/cl-webdriver-client-20241012-git.tgz"; sha256 = "1975yyvvdxg11vgpyx93nkqr5x6i1xy47230vc40yd0c9bn6lpbr"; system = "cl-webdriver-client-test"; asd = "cl-webdriver-client-test"; @@ -36936,7 +37710,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-webkit2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-webkit/2024-10-12/cl-webkit-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-webkit/2024-10-12/cl-webkit-20241012-git.tgz"; sha256 = "1ppx4pdnx3c41hp1j8msvpyw22ck2lll2f4ap5hyfvhadp07g3m5"; system = "cl-webkit2"; asd = "cl-webkit2"; @@ -36954,12 +37728,12 @@ lib.makeScope pkgs.newScope (self: { cl-who = ( build-asdf-system { pname = "cl-who"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cl-who" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-who/2024-10-12/cl-who-20241012-git.tgz"; - sha256 = "1kfpy69dw0g7w7k0akimncpkxfqq85r08i2da8nw1dhk2hp6l8jc"; + url = "https://beta.quicklisp.org/archive/cl-who/2025-06-22/cl-who-20250622-git.tgz"; + sha256 = "1x65mwkj40ii1rpnm7qaf9hhj23l2hcadkfc6s22mpd422ljd3kd"; system = "cl-who"; asd = "cl-who"; } @@ -36969,29 +37743,6 @@ lib.makeScope pkgs.newScope (self: { meta = { }; } ); - cl-who-test = ( - build-asdf-system { - pname = "cl-who-test"; - version = "20241012-git"; - asds = [ "cl-who-test" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/cl-who/2024-10-12/cl-who-20241012-git.tgz"; - sha256 = "1kfpy69dw0g7w7k0akimncpkxfqq85r08i2da8nw1dhk2hp6l8jc"; - system = "cl-who-test"; - asd = "cl-who"; - } - ); - systems = [ "cl-who-test" ]; - lispLibs = [ - (getAttr "cl-who" self) - (getAttr "flexi-streams" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); cl-why = ( build-asdf-system { pname = "cl-why"; @@ -36999,7 +37750,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-why" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-why/2018-02-28/cl-why-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-why/2018-02-28/cl-why-20180228-git.tgz"; sha256 = "01xm7gj1wwd7i3r49jfdm96gwl7nvrn0h6q22kpzrb8zs48wj947"; system = "cl-why"; asd = "cl-why"; @@ -37019,7 +37770,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-why-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-why/2018-02-28/cl-why-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-why/2018-02-28/cl-why-20180228-git.tgz"; sha256 = "01xm7gj1wwd7i3r49jfdm96gwl7nvrn0h6q22kpzrb8zs48wj947"; system = "cl-why-test"; asd = "cl-why"; @@ -37042,7 +37793,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-with" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-with/2021-10-20/cl-with-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-with/2021-10-20/cl-with-20211020-git.tgz"; sha256 = "1x4laq7zi12xb28rfrh8hcy92pkfvjxsp2nn6jkmrhfynky5180w"; system = "cl-with"; asd = "cl-with"; @@ -37065,7 +37816,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-wol.cli" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-wol/2023-10-21/cl-wol-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-wol/2023-10-21/cl-wol-20231021-git.tgz"; sha256 = "1gfrih0899i7280169cjp6bg3zmrx6znrr3i9qjgda0jk4dn5rp4"; system = "cl-wol.cli"; asd = "cl-wol.cli"; @@ -37092,7 +37843,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-wol.core" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-wol/2023-10-21/cl-wol-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-wol/2023-10-21/cl-wol-20231021-git.tgz"; sha256 = "1gfrih0899i7280169cjp6bg3zmrx6znrr3i9qjgda0jk4dn5rp4"; system = "cl-wol.core"; asd = "cl-wol.core"; @@ -37115,7 +37866,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-wol.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-wol/2023-10-21/cl-wol-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-wol/2023-10-21/cl-wol-20231021-git.tgz"; sha256 = "1gfrih0899i7280169cjp6bg3zmrx6znrr3i9qjgda0jk4dn5rp4"; system = "cl-wol.test"; asd = "cl-wol.test"; @@ -37138,7 +37889,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-wordcut" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-wordcut/2016-04-21/cl-wordcut-20160421-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-wordcut/2016-04-21/cl-wordcut-20160421-git.tgz"; sha256 = "1b8b3b1rgk0y87l54325ilcly8rq9qxalcsmw6rk8q6dq13lgv78"; system = "cl-wordcut"; asd = "cl-wordcut"; @@ -37158,7 +37909,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-xdg" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-xdg/2017-01-24/cl-xdg-20170124-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-xdg/2017-01-24/cl-xdg-20170124-git.tgz"; sha256 = "078hgsab0gl6s96wq09ibq5alzyyqh6wwc3yjs44fv18561p5jgc"; system = "cl-xdg"; asd = "cl-xdg"; @@ -37184,7 +37935,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-xdg-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-xdg/2017-01-24/cl-xdg-20170124-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-xdg/2017-01-24/cl-xdg-20170124-git.tgz"; sha256 = "078hgsab0gl6s96wq09ibq5alzyyqh6wwc3yjs44fv18561p5jgc"; system = "cl-xdg-test"; asd = "cl-xdg"; @@ -37207,7 +37958,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-xkb" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-xkb/2023-02-14/cl-xkb-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-xkb/2023-02-14/cl-xkb-20230214-git.tgz"; sha256 = "002bskv0dvq2hahz7dah2zwwkp2zrkf98w7lm96jmqfn8vyp4k75"; system = "cl-xkb"; asd = "cl-xkb"; @@ -37227,7 +37978,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-xkeysym" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-xkeysym/2014-09-14/cl-xkeysym-20140914-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-xkeysym/2014-09-14/cl-xkeysym-20140914-git.tgz"; sha256 = "0yxijl6xb5apb6v6qm8g3kfdr90slgg6vsnx4d1ps9z4zhrjlc6c"; system = "cl-xkeysym"; asd = "cl-xkeysym"; @@ -37247,7 +37998,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-xmlspam" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-xmlspam/2010-10-06/cl-xmlspam-20101006-http.tgz"; + url = "https://beta.quicklisp.org/archive/cl-xmlspam/2010-10-06/cl-xmlspam-20101006-http.tgz"; sha256 = "03jw57889b60nsqgb13vrf5q1g2fasah7qv7knjlx2w4mc1ci7ks"; system = "cl-xmlspam"; asd = "cl-xmlspam"; @@ -37268,7 +38019,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-xmpp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-xmpp/2010-10-06/cl-xmpp-0.8.1.tgz"; + url = "https://beta.quicklisp.org/archive/cl-xmpp/2010-10-06/cl-xmpp-0.8.1.tgz"; sha256 = "1kzzq1y0625zlg83ppcpb0aqzvqbga9x3gm826grmy4rf5jrhz5f"; system = "cl-xmpp"; asd = "cl-xmpp"; @@ -37292,7 +38043,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-xmpp-sasl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-xmpp/2010-10-06/cl-xmpp-0.8.1.tgz"; + url = "https://beta.quicklisp.org/archive/cl-xmpp/2010-10-06/cl-xmpp-0.8.1.tgz"; sha256 = "1kzzq1y0625zlg83ppcpb0aqzvqbga9x3gm826grmy4rf5jrhz5f"; system = "cl-xmpp-sasl"; asd = "cl-xmpp-sasl"; @@ -37316,7 +38067,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-xmpp-tls" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-xmpp/2010-10-06/cl-xmpp-0.8.1.tgz"; + url = "https://beta.quicklisp.org/archive/cl-xmpp/2010-10-06/cl-xmpp-0.8.1.tgz"; sha256 = "1kzzq1y0625zlg83ppcpb0aqzvqbga9x3gm826grmy4rf5jrhz5f"; system = "cl-xmpp-tls"; asd = "cl-xmpp-tls"; @@ -37339,7 +38090,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-xul" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-xul/2016-03-18/cl-xul-20160318-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-xul/2016-03-18/cl-xul-20160318-git.tgz"; sha256 = "0ldny4bjfndrkyqcq6klqxvqkpb0lhcqlj52y89ybl9w7dkl2d9p"; system = "cl-xul"; asd = "cl-xul"; @@ -37369,7 +38120,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-xul-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-xul/2016-03-18/cl-xul-20160318-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-xul/2016-03-18/cl-xul-20160318-git.tgz"; sha256 = "0ldny4bjfndrkyqcq6klqxvqkpb0lhcqlj52y89ybl9w7dkl2d9p"; system = "cl-xul-test"; asd = "cl-xul-test"; @@ -37392,7 +38143,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-yaclyaml" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-yaclyaml/2016-08-25/cl-yaclyaml-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-yaclyaml/2016-08-25/cl-yaclyaml-20160825-git.tgz"; sha256 = "1clfhz4ii2p11yc3bm23ib4rx0rfxsh18ddc2br82i7mbwks3pll"; system = "cl-yaclyaml"; asd = "cl-yaclyaml"; @@ -37421,7 +38172,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-yaclyaml-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-yaclyaml/2016-08-25/cl-yaclyaml-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-yaclyaml/2016-08-25/cl-yaclyaml-20160825-git.tgz"; sha256 = "1clfhz4ii2p11yc3bm23ib4rx0rfxsh18ddc2br82i7mbwks3pll"; system = "cl-yaclyaml-tests"; asd = "cl-yaclyaml"; @@ -37445,7 +38196,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-yahoo-finance" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-yahoo-finance/2013-03-12/cl-yahoo-finance-20130312-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-yahoo-finance/2013-03-12/cl-yahoo-finance-20130312-git.tgz"; sha256 = "1qhs4j00iw1w81lx0vmyiayzqyvixaxc5j2rc89qlr1gx12mqadl"; system = "cl-yahoo-finance"; asd = "cl-yahoo-finance"; @@ -37471,7 +38222,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-yaml" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-yaml/2022-11-06/cl-yaml-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-yaml/2022-11-06/cl-yaml-20221106-git.tgz"; sha256 = "053fvrrd0p2xx4zxbz4kg9469895ypwsbjfd3nwpi7lwcll2bir5"; system = "cl-yaml"; asd = "cl-yaml"; @@ -37496,7 +38247,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-yaml-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-yaml/2022-11-06/cl-yaml-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-yaml/2022-11-06/cl-yaml-20221106-git.tgz"; sha256 = "053fvrrd0p2xx4zxbz4kg9469895ypwsbjfd3nwpi7lwcll2bir5"; system = "cl-yaml-test"; asd = "cl-yaml-test"; @@ -37524,7 +38275,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-yesql" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-yesql/2021-10-20/cl-yesql-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-yesql/2021-10-20/cl-yesql-20211020-git.tgz"; sha256 = "0bg133kprbssv0z4ir2hkhf72fbmnz9v9861ncs1isqaby2d4xlj"; system = "cl-yesql"; asd = "cl-yesql"; @@ -37551,7 +38302,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-zipper" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-zipper/2020-06-10/cl-zipper-20200610-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-zipper/2020-06-10/cl-zipper-20200610-git.tgz"; sha256 = "1zcfy97l40ynbldxpx8nad81jlrfp0k2vic10wbkrqdfkr696xkg"; system = "cl-zipper"; asd = "cl-zipper"; @@ -37571,7 +38322,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl-zipper-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-zipper/2020-06-10/cl-zipper-20200610-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-zipper/2020-06-10/cl-zipper-20200610-git.tgz"; sha256 = "1zcfy97l40ynbldxpx8nad81jlrfp0k2vic10wbkrqdfkr696xkg"; system = "cl-zipper-test"; asd = "cl-zipper"; @@ -37595,7 +38346,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cl4store" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl4store/2020-03-25/cl4store-20200325-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl4store/2020-03-25/cl4store-20200325-git.tgz"; sha256 = "0qajxwlvmb5vd9qynnl0n62bcl1xhin49xk0p44v6pig8q2jzc26"; system = "cl4store"; asd = "cl4store"; @@ -37620,7 +38371,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clache" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clache/2017-11-30/clache-20171130-git.tgz"; + url = "https://beta.quicklisp.org/archive/clache/2017-11-30/clache-20171130-git.tgz"; sha256 = "0wxg004bsay58vr6xr6mlk7wj415qmvisqxvpnjsg6glfwca86ys"; system = "clache"; asd = "clache"; @@ -37650,7 +38401,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clache-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clache/2017-11-30/clache-20171130-git.tgz"; + url = "https://beta.quicklisp.org/archive/clache/2017-11-30/clache-20171130-git.tgz"; sha256 = "0wxg004bsay58vr6xr6mlk7wj415qmvisqxvpnjsg6glfwca86ys"; system = "clache-test"; asd = "clache-test"; @@ -37669,12 +38420,12 @@ lib.makeScope pkgs.newScope (self: { clack = ( build-asdf-system { pname = "clack"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clack" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clack/2024-10-12/clack-20241012-git.tgz"; - sha256 = "0dljkfxdypn50d6jlssl79ag072r7lcdhfy771hna0ihxii8vsm3"; + url = "https://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz"; + sha256 = "1b6b1cna3r0gi6lq3jphy08012p700ngwas5rqkhlk61791yd944"; system = "clack"; asd = "clack"; } @@ -37695,12 +38446,12 @@ lib.makeScope pkgs.newScope (self: { clack-cors = ( build-asdf-system { pname = "clack-cors"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clack-cors" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clack-cors/2024-10-12/clack-cors-20241012-git.tgz"; - sha256 = "0bndzkrqmdq5cz7wfzr7kw2gy5vk8h1hmf3vplc6mqk7vr3zm6m2"; + url = "https://beta.quicklisp.org/archive/clack-cors/2025-06-22/clack-cors-20250622-git.tgz"; + sha256 = "1a2nfzbshc8y04my5fjlka666jd093nr0wz6mn8qfi70d688vkjh"; system = "clack-cors"; asd = "clack-cors"; } @@ -37720,12 +38471,12 @@ lib.makeScope pkgs.newScope (self: { clack-cors-ci = ( build-asdf-system { pname = "clack-cors-ci"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clack-cors-ci" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clack-cors/2024-10-12/clack-cors-20241012-git.tgz"; - sha256 = "0bndzkrqmdq5cz7wfzr7kw2gy5vk8h1hmf3vplc6mqk7vr3zm6m2"; + url = "https://beta.quicklisp.org/archive/clack-cors/2025-06-22/clack-cors-20250622-git.tgz"; + sha256 = "1a2nfzbshc8y04my5fjlka666jd093nr0wz6mn8qfi70d688vkjh"; system = "clack-cors-ci"; asd = "clack-cors-ci"; } @@ -37740,12 +38491,12 @@ lib.makeScope pkgs.newScope (self: { clack-cors-docs = ( build-asdf-system { pname = "clack-cors-docs"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clack-cors-docs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clack-cors/2024-10-12/clack-cors-20241012-git.tgz"; - sha256 = "0bndzkrqmdq5cz7wfzr7kw2gy5vk8h1hmf3vplc6mqk7vr3zm6m2"; + url = "https://beta.quicklisp.org/archive/clack-cors/2025-06-22/clack-cors-20250622-git.tgz"; + sha256 = "1a2nfzbshc8y04my5fjlka666jd093nr0wz6mn8qfi70d688vkjh"; system = "clack-cors-docs"; asd = "clack-cors-docs"; } @@ -37766,12 +38517,12 @@ lib.makeScope pkgs.newScope (self: { clack-cors-tests = ( build-asdf-system { pname = "clack-cors-tests"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clack-cors-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clack-cors/2024-10-12/clack-cors-20241012-git.tgz"; - sha256 = "0bndzkrqmdq5cz7wfzr7kw2gy5vk8h1hmf3vplc6mqk7vr3zm6m2"; + url = "https://beta.quicklisp.org/archive/clack-cors/2025-06-22/clack-cors-20250622-git.tgz"; + sha256 = "1a2nfzbshc8y04my5fjlka666jd093nr0wz6mn8qfi70d688vkjh"; system = "clack-cors-tests"; asd = "clack-cors-tests"; } @@ -37793,7 +38544,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clack-errors" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clack-errors/2019-08-13/clack-errors-20190813-git.tgz"; + url = "https://beta.quicklisp.org/archive/clack-errors/2019-08-13/clack-errors-20190813-git.tgz"; sha256 = "0z6jyn37phnpq02l5wml8z0593g8ps95c0c2lzkhi3is2wcj9cpf"; system = "clack-errors"; asd = "clack-errors"; @@ -37820,7 +38571,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clack-errors-demo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clack-errors/2019-08-13/clack-errors-20190813-git.tgz"; + url = "https://beta.quicklisp.org/archive/clack-errors/2019-08-13/clack-errors-20190813-git.tgz"; sha256 = "0z6jyn37phnpq02l5wml8z0593g8ps95c0c2lzkhi3is2wcj9cpf"; system = "clack-errors-demo"; asd = "clack-errors-demo"; @@ -37843,7 +38594,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clack-errors-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clack-errors/2019-08-13/clack-errors-20190813-git.tgz"; + url = "https://beta.quicklisp.org/archive/clack-errors/2019-08-13/clack-errors-20190813-git.tgz"; sha256 = "0z6jyn37phnpq02l5wml8z0593g8ps95c0c2lzkhi3is2wcj9cpf"; system = "clack-errors-test"; asd = "clack-errors-test"; @@ -37865,12 +38616,12 @@ lib.makeScope pkgs.newScope (self: { clack-handler-hunchentoot = ( build-asdf-system { pname = "clack-handler-hunchentoot"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clack-handler-hunchentoot" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clack/2024-10-12/clack-20241012-git.tgz"; - sha256 = "0dljkfxdypn50d6jlssl79ag072r7lcdhfy771hna0ihxii8vsm3"; + url = "https://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz"; + sha256 = "1b6b1cna3r0gi6lq3jphy08012p700ngwas5rqkhlk61791yd944"; system = "clack-handler-hunchentoot"; asd = "clack-handler-hunchentoot"; } @@ -37892,12 +38643,12 @@ lib.makeScope pkgs.newScope (self: { clack-handler-toot = ( build-asdf-system { pname = "clack-handler-toot"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clack-handler-toot" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clack/2024-10-12/clack-20241012-git.tgz"; - sha256 = "0dljkfxdypn50d6jlssl79ag072r7lcdhfy771hna0ihxii8vsm3"; + url = "https://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz"; + sha256 = "1b6b1cna3r0gi6lq3jphy08012p700ngwas5rqkhlk61791yd944"; system = "clack-handler-toot"; asd = "clack-handler-toot"; } @@ -37923,7 +38674,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clack-handler-woo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/woo/2024-10-12/woo-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/woo/2024-10-12/woo-20241012-git.tgz"; sha256 = "0nhxlb1qhkl20vknm44gx0cq5cks33rcljczfhgbnmpkzrdpdrrl"; system = "clack-handler-woo"; asd = "clack-handler-woo"; @@ -37939,12 +38690,12 @@ lib.makeScope pkgs.newScope (self: { clack-handler-wookie = ( build-asdf-system { pname = "clack-handler-wookie"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clack-handler-wookie" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clack/2024-10-12/clack-20241012-git.tgz"; - sha256 = "0dljkfxdypn50d6jlssl79ag072r7lcdhfy771hna0ihxii8vsm3"; + url = "https://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz"; + sha256 = "1b6b1cna3r0gi6lq3jphy08012p700ngwas5rqkhlk61791yd944"; system = "clack-handler-wookie"; asd = "clack-handler-wookie"; } @@ -37974,7 +38725,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clack-pretend" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clack-pretend/2024-10-12/clack-pretend-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/clack-pretend/2024-10-12/clack-pretend-20241012-git.tgz"; sha256 = "0f9y264bdxspd3sfzf9hq7v0myvq5va0drw8kji1b4gyprmg995k"; system = "clack-pretend"; asd = "clack-pretend"; @@ -37996,12 +38747,12 @@ lib.makeScope pkgs.newScope (self: { clack-prometheus = ( build-asdf-system { pname = "clack-prometheus"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clack-prometheus" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clack-prometheus/2024-10-12/clack-prometheus-20241012-git.tgz"; - sha256 = "1zkflszvxyhxn7m9c2f1k2snqwdzasbvscw5vpsglb50pczs9g0d"; + url = "https://beta.quicklisp.org/archive/clack-prometheus/2025-06-22/clack-prometheus-20250622-git.tgz"; + sha256 = "00j4wzsjzlqq6fa6p5vv59z4v72qq8n78j3cz128icc73dgv3pzq"; system = "clack-prometheus"; asd = "clack-prometheus"; } @@ -38025,12 +38776,12 @@ lib.makeScope pkgs.newScope (self: { clack-prometheus-ci = ( build-asdf-system { pname = "clack-prometheus-ci"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clack-prometheus-ci" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clack-prometheus/2024-10-12/clack-prometheus-20241012-git.tgz"; - sha256 = "1zkflszvxyhxn7m9c2f1k2snqwdzasbvscw5vpsglb50pczs9g0d"; + url = "https://beta.quicklisp.org/archive/clack-prometheus/2025-06-22/clack-prometheus-20250622-git.tgz"; + sha256 = "00j4wzsjzlqq6fa6p5vv59z4v72qq8n78j3cz128icc73dgv3pzq"; system = "clack-prometheus-ci"; asd = "clack-prometheus-ci"; } @@ -38045,12 +38796,12 @@ lib.makeScope pkgs.newScope (self: { clack-prometheus-docs = ( build-asdf-system { pname = "clack-prometheus-docs"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clack-prometheus-docs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clack-prometheus/2024-10-12/clack-prometheus-20241012-git.tgz"; - sha256 = "1zkflszvxyhxn7m9c2f1k2snqwdzasbvscw5vpsglb50pczs9g0d"; + url = "https://beta.quicklisp.org/archive/clack-prometheus/2025-06-22/clack-prometheus-20250622-git.tgz"; + sha256 = "00j4wzsjzlqq6fa6p5vv59z4v72qq8n78j3cz128icc73dgv3pzq"; system = "clack-prometheus-docs"; asd = "clack-prometheus-docs"; } @@ -38071,12 +38822,12 @@ lib.makeScope pkgs.newScope (self: { clack-prometheus-tests = ( build-asdf-system { pname = "clack-prometheus-tests"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clack-prometheus-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clack-prometheus/2024-10-12/clack-prometheus-20241012-git.tgz"; - sha256 = "1zkflszvxyhxn7m9c2f1k2snqwdzasbvscw5vpsglb50pczs9g0d"; + url = "https://beta.quicklisp.org/archive/clack-prometheus/2025-06-22/clack-prometheus-20250622-git.tgz"; + sha256 = "00j4wzsjzlqq6fa6p5vv59z4v72qq8n78j3cz128icc73dgv3pzq"; system = "clack-prometheus-tests"; asd = "clack-prometheus-tests"; } @@ -38091,12 +38842,12 @@ lib.makeScope pkgs.newScope (self: { clack-socket = ( build-asdf-system { pname = "clack-socket"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clack-socket" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clack/2024-10-12/clack-20241012-git.tgz"; - sha256 = "0dljkfxdypn50d6jlssl79ag072r7lcdhfy771hna0ihxii8vsm3"; + url = "https://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz"; + sha256 = "1b6b1cna3r0gi6lq3jphy08012p700ngwas5rqkhlk61791yd944"; system = "clack-socket"; asd = "clack-socket"; } @@ -38113,7 +38864,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clack-static-asset-djula-helpers" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clack-static-asset-middleware/2021-12-09/clack-static-asset-middleware-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/clack-static-asset-middleware/2021-12-09/clack-static-asset-middleware-20211209-git.tgz"; sha256 = "0fk288812sdm012knqx4qqdhggdqbfgd0zfb6mc06xig20wj02hc"; system = "clack-static-asset-djula-helpers"; asd = "clack-static-asset-djula-helpers"; @@ -38136,7 +38887,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clack-static-asset-middleware" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clack-static-asset-middleware/2021-12-09/clack-static-asset-middleware-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/clack-static-asset-middleware/2021-12-09/clack-static-asset-middleware-20211209-git.tgz"; sha256 = "0fk288812sdm012knqx4qqdhggdqbfgd0zfb6mc06xig20wj02hc"; system = "clack-static-asset-middleware"; asd = "clack-static-asset-middleware"; @@ -38162,7 +38913,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clack-static-asset-middleware-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clack-static-asset-middleware/2021-12-09/clack-static-asset-middleware-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/clack-static-asset-middleware/2021-12-09/clack-static-asset-middleware-20211209-git.tgz"; sha256 = "0fk288812sdm012knqx4qqdhggdqbfgd0zfb6mc06xig20wj02hc"; system = "clack-static-asset-middleware-test"; asd = "clack-static-asset-middleware-test"; @@ -38184,12 +38935,12 @@ lib.makeScope pkgs.newScope (self: { clack-test = ( build-asdf-system { pname = "clack-test"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clack-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clack/2024-10-12/clack-20241012-git.tgz"; - sha256 = "0dljkfxdypn50d6jlssl79ag072r7lcdhfy771hna0ihxii8vsm3"; + url = "https://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz"; + sha256 = "1b6b1cna3r0gi6lq3jphy08012p700ngwas5rqkhlk61791yd944"; system = "clack-test"; asd = "clack-test"; } @@ -38214,12 +38965,12 @@ lib.makeScope pkgs.newScope (self: { clad = ( build-asdf-system { pname = "clad"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clad" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clad/2024-10-12/clad-20241012-git.tgz"; - sha256 = "1ah8d4wyd7yqchcnyjcnd27gx2m410cgybyp194ng1ipdpa4mm6n"; + url = "https://beta.quicklisp.org/archive/clad/2025-06-22/clad-20250622-git.tgz"; + sha256 = "0qr59j0d2df08vaijw3il5hh4j6vgrmwgm9nm1dc4nipqci1wadc"; system = "clad"; asd = "clad"; } @@ -38238,7 +38989,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "class-options" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/class-options/2020-10-16/class-options_1.0.1.tgz"; + url = "https://beta.quicklisp.org/archive/class-options/2020-10-16/class-options_1.0.1.tgz"; sha256 = "1dkgr1vbrsra44jznzz2bvdf8nlpdrrkjcqrfs8aa7axksda3bqk"; system = "class-options"; asd = "class-options"; @@ -38258,7 +39009,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "class-options_tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/class-options/2020-10-16/class-options_1.0.1.tgz"; + url = "https://beta.quicklisp.org/archive/class-options/2020-10-16/class-options_1.0.1.tgz"; sha256 = "1dkgr1vbrsra44jznzz2bvdf8nlpdrrkjcqrfs8aa7axksda3bqk"; system = "class-options_tests"; asd = "class-options_tests"; @@ -38279,12 +39030,12 @@ lib.makeScope pkgs.newScope (self: { classimp = ( build-asdf-system { pname = "classimp"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "classimp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/classimp/2024-10-12/classimp-20241012-git.tgz"; - sha256 = "1sq34s5yrljh7fffllsscay7xi11lg03alrkyrh6xfwa2w7cnqmx"; + url = "https://beta.quicklisp.org/archive/classimp/2025-06-22/classimp-20250622-git.tgz"; + sha256 = "0grily13njibm60fw81vlycn3131qi2dgp9yys5xj65cacjfyky0"; system = "classimp"; asd = "classimp"; } @@ -38302,12 +39053,12 @@ lib.makeScope pkgs.newScope (self: { classimp-samples = ( build-asdf-system { pname = "classimp-samples"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "classimp-samples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/classimp/2024-10-12/classimp-20241012-git.tgz"; - sha256 = "1sq34s5yrljh7fffllsscay7xi11lg03alrkyrh6xfwa2w7cnqmx"; + url = "https://beta.quicklisp.org/archive/classimp/2025-06-22/classimp-20250622-git.tgz"; + sha256 = "0grily13njibm60fw81vlycn3131qi2dgp9yys5xj65cacjfyky0"; system = "classimp-samples"; asd = "classimp-samples"; } @@ -38332,7 +39083,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "classowary" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/classowary/2023-10-21/classowary-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/classowary/2023-10-21/classowary-20231021-git.tgz"; sha256 = "099zhf41d4frlrm99ldzypqjh03ijrvfn29f2pb0j6664h65bcsm"; system = "classowary"; asd = "classowary"; @@ -38350,7 +39101,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "classowary-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/classowary/2023-10-21/classowary-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/classowary/2023-10-21/classowary-20231021-git.tgz"; sha256 = "099zhf41d4frlrm99ldzypqjh03ijrvfn29f2pb0j6664h65bcsm"; system = "classowary-test"; asd = "classowary-test"; @@ -38369,12 +39120,12 @@ lib.makeScope pkgs.newScope (self: { clast = ( build-asdf-system { pname = "clast"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clast" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clast/2024-10-12/clast-20241012-git.tgz"; - sha256 = "0509hrpd049s62s03wwb2mp24dfw8f0l8cg0vgq3s8wrsch7af2m"; + url = "https://beta.quicklisp.org/archive/clast/2025-06-22/clast-20250622-git.tgz"; + sha256 = "0ipybqc928ncdpq3rkxgk9c4y9mis4k139w284nn4g4yzh28vq1i"; system = "clast"; asd = "clast"; } @@ -38389,12 +39140,12 @@ lib.makeScope pkgs.newScope (self: { clath = ( build-asdf-system { pname = "clath"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clath" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clath/2024-10-12/clath-20241012-git.tgz"; - sha256 = "0519jzm8r55am6f5w11pfbyq0bvn8jxkcz33kbrznwrf43xz5fcv"; + url = "https://beta.quicklisp.org/archive/clath/2025-06-22/clath-20250622-git.tgz"; + sha256 = "136zf18g734mhvh3ghk9ag4y2ginzvirn1v51kchn7nxzsm8ay97"; system = "clath"; asd = "clath"; } @@ -38426,7 +39177,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clavatar" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clavatar/2012-10-13/clavatar-20121013-git.tgz"; + url = "https://beta.quicklisp.org/archive/clavatar/2012-10-13/clavatar-20121013-git.tgz"; sha256 = "07r58d4dk5nr3aimrryzbf3jw6580b5gkkbpw74ax4nmm8hz6v5y"; system = "clavatar"; asd = "clavatar"; @@ -38447,12 +39198,12 @@ lib.makeScope pkgs.newScope (self: { clavier = ( build-asdf-system { pname = "clavier"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clavier" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clavier/2024-10-12/clavier-20241012-git.tgz"; - sha256 = "0v81ql9bbnsqaxcrv0ynm82xwifxvc6ysmfrn1lgphn4szx1p230"; + url = "https://beta.quicklisp.org/archive/clavier/2025-06-22/clavier-20250622-git.tgz"; + sha256 = "19hmrzp2sgycmm1qq24nv89ss24d8vs6izjzxn9zp24zcdr64crs"; system = "clavier"; asd = "clavier"; } @@ -38473,12 +39224,12 @@ lib.makeScope pkgs.newScope (self: { clavier_dot_test = ( build-asdf-system { pname = "clavier.test"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clavier.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clavier/2024-10-12/clavier-20241012-git.tgz"; - sha256 = "0v81ql9bbnsqaxcrv0ynm82xwifxvc6ysmfrn1lgphn4szx1p230"; + url = "https://beta.quicklisp.org/archive/clavier/2025-06-22/clavier-20250622-git.tgz"; + sha256 = "19hmrzp2sgycmm1qq24nv89ss24d8vs6izjzxn9zp24zcdr64crs"; system = "clavier.test"; asd = "clavier.test"; } @@ -38500,7 +39251,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "claw" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/claw/2020-10-16/claw-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/claw/2020-10-16/claw-stable-git.tgz"; sha256 = "146yv0hc4hmk72562ssj2d41143pp84dcbd1h7f4nx1c7hf2bb0d"; system = "claw"; asd = "claw"; @@ -38528,7 +39279,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "claw-olm" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/claw-olm/2021-05-31/claw-olm-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/claw-olm/2021-05-31/claw-olm-20210531-git.tgz"; sha256 = "04r6d8infhcc7vz95asrvlpc0wzkzq1blaza74nd62alakr6mmrr"; system = "claw-olm"; asd = "claw-olm"; @@ -38548,7 +39299,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "claw-olm-bindings" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/claw-olm/2021-05-31/claw-olm-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/claw-olm/2021-05-31/claw-olm-20210531-git.tgz"; sha256 = "04r6d8infhcc7vz95asrvlpc0wzkzq1blaza74nd62alakr6mmrr"; system = "claw-olm-bindings"; asd = "claw-olm-bindings"; @@ -38571,7 +39322,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "claw-support" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/claw-support/2020-10-16/claw-support-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/claw-support/2020-10-16/claw-support-stable-git.tgz"; sha256 = "1my2ka7h72ipx5n3b465g6kjkasrhsvhqlijwcg6dhlzs5yygl23"; system = "claw-support"; asd = "claw-support"; @@ -38591,7 +39342,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "claw-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/claw-utils/2020-10-16/claw-utils-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/claw-utils/2020-10-16/claw-utils-stable-git.tgz"; sha256 = "01df3kyf2qs3czi332dnz2s35x2j0fq46vgmsw7wjrrvnqc22mk5"; system = "claw-utils"; asd = "claw-utils"; @@ -38615,7 +39366,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clawk" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clawk/2020-09-25/clawk-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/clawk/2020-09-25/clawk-20200925-git.tgz"; sha256 = "1ph3xjqilvinvgr9q3w47zxqyz1sqnq030nlx7kgkkv8j3bnqk7a"; system = "clawk"; asd = "clawk"; @@ -38635,7 +39386,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "claxy" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/claxy/2022-02-20/claxy-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/claxy/2022-02-20/claxy-20220220-git.tgz"; sha256 = "1n6zbsfp0zkndw7r3nar8srjj1wmfgngia3p7z756mmsvp1l68va"; system = "claxy"; asd = "claxy"; @@ -38654,12 +39405,12 @@ lib.makeScope pkgs.newScope (self: { clazy = ( build-asdf-system { pname = "clazy"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clazy" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clazy/2024-10-12/clazy-20241012-git.tgz"; - sha256 = "0z9iy89p4grj2a803nlrnvj335c6knmnlbicpf0b4br41j6q74xj"; + url = "https://beta.quicklisp.org/archive/clazy/2025-06-22/clazy-20250622-git.tgz"; + sha256 = "023wx26gcswgkx0b7i2bjhpaqrphnniv5vrljhbhx1v1w9cf47yh"; system = "clazy"; asd = "clazy"; } @@ -38678,7 +39429,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clem" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clem/2021-08-07/clem-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/clem/2021-08-07/clem-20210807-git.tgz"; sha256 = "0vmsgxdpxrqkx3xp9n8b0fwkzk1r2dwcwjlc8yy5w2m2sighh2rk"; system = "clem"; asd = "clem"; @@ -38698,7 +39449,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clem-benchmark" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clem/2021-08-07/clem-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/clem/2021-08-07/clem-20210807-git.tgz"; sha256 = "0vmsgxdpxrqkx3xp9n8b0fwkzk1r2dwcwjlc8yy5w2m2sighh2rk"; system = "clem-benchmark"; asd = "clem-benchmark"; @@ -38718,7 +39469,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clem-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clem/2021-08-07/clem-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/clem/2021-08-07/clem-20210807-git.tgz"; sha256 = "0vmsgxdpxrqkx3xp9n8b0fwkzk1r2dwcwjlc8yy5w2m2sighh2rk"; system = "clem-test"; asd = "clem-test"; @@ -38738,7 +39489,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cleric" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cleric/2022-02-20/cleric-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/cleric/2022-02-20/cleric-20220220-git.tgz"; sha256 = "0a0xqr0bpp0v62f8d13yflz3vz6j4fa9icgc134ajaqxcfa7k0vp"; system = "cleric"; asd = "cleric"; @@ -38765,7 +39516,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cleric-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cleric/2022-02-20/cleric-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/cleric/2022-02-20/cleric-20220220-git.tgz"; sha256 = "0a0xqr0bpp0v62f8d13yflz3vz6j4fa9icgc134ajaqxcfa7k0vp"; system = "cleric-test"; asd = "cleric-test"; @@ -38790,7 +39541,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clerk" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clerk/2024-10-12/clerk-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/clerk/2024-10-12/clerk-20241012-git.tgz"; sha256 = "0p81ha537bfs8421y74vrvhi1h61f38djr3iwgab30f6sdfj4k8j"; system = "clerk"; asd = "clerk"; @@ -38814,7 +39565,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clerk-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clerk/2024-10-12/clerk-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/clerk/2024-10-12/clerk-20241012-git.tgz"; sha256 = "0p81ha537bfs8421y74vrvhi1h61f38djr3iwgab30f6sdfj4k8j"; system = "clerk-test"; asd = "clerk"; @@ -38837,7 +39588,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clesh" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clesh/2020-12-20/clesh-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clesh/2020-12-20/clesh-20201220-git.tgz"; sha256 = "012ry02djnqyvvs61wbbqj3saz621w2l9gczrywdxhi5p4ycx318"; system = "clesh"; asd = "clesh"; @@ -38860,7 +39611,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clesh-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clesh/2020-12-20/clesh-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clesh/2020-12-20/clesh-20201220-git.tgz"; sha256 = "012ry02djnqyvvs61wbbqj3saz621w2l9gczrywdxhi5p4ycx318"; system = "clesh-tests"; asd = "clesh-tests"; @@ -38883,7 +39634,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cletris" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cletris/2021-10-20/cletris-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/cletris/2021-10-20/cletris-20211020-git.tgz"; sha256 = "0k7j0jg4dc6q7p7h3vin3hs0f7q8d7yarg2mw0c3hng19r4q9p8v"; system = "cletris"; asd = "cletris"; @@ -38906,7 +39657,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cletris-network" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cletris/2021-10-20/cletris-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/cletris/2021-10-20/cletris-20211020-git.tgz"; sha256 = "0k7j0jg4dc6q7p7h3vin3hs0f7q8d7yarg2mw0c3hng19r4q9p8v"; system = "cletris-network"; asd = "cletris-network"; @@ -38931,7 +39682,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cletris-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cletris/2021-10-20/cletris-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/cletris/2021-10-20/cletris-20211020-git.tgz"; sha256 = "0k7j0jg4dc6q7p7h3vin3hs0f7q8d7yarg2mw0c3hng19r4q9p8v"; system = "cletris-test"; asd = "cletris-test"; @@ -38955,7 +39706,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clfswm" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clfswm/2016-12-04/clfswm-20161204-git.tgz"; + url = "https://beta.quicklisp.org/archive/clfswm/2016-12-04/clfswm-20161204-git.tgz"; sha256 = "1r84cpcs74avkjw18ckz3r3836xhky2fcf5ypbfmajpjzxwn5dzc"; system = "clfswm"; asd = "clfswm"; @@ -38973,7 +39724,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clgplot" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clgplot/2024-10-12/clgplot-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/clgplot/2024-10-12/clgplot-20241012-git.tgz"; sha256 = "0sl5g33v1lpkjimmcs22f32hgnlfhz0ydd5rgy0ykwb7jf7x3pv7"; system = "clgplot"; asd = "clgplot"; @@ -38993,7 +39744,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clgplot-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clgplot/2024-10-12/clgplot-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/clgplot/2024-10-12/clgplot-20241012-git.tgz"; sha256 = "0sl5g33v1lpkjimmcs22f32hgnlfhz0ydd5rgy0ykwb7jf7x3pv7"; system = "clgplot-test"; asd = "clgplot-test"; @@ -39017,7 +39768,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clhs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clhs/2015-04-07/clhs-0.6.3.tgz"; + url = "https://beta.quicklisp.org/archive/clhs/2015-04-07/clhs-0.6.3.tgz"; sha256 = "1jffq2w9yql4cvxy2g5c2v402014306qklp4xhddjjlfvs30sfjd"; system = "clhs"; asd = "clhs"; @@ -39037,7 +39788,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cli-parser" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cli-parser/2015-06-08/cl-cli-parser-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cli-parser/2015-06-08/cl-cli-parser-20150608-git.tgz"; sha256 = "0gnpakzakkb2j67v2wh4q87k6mmrv0c0fg56m4vx88kgpxp7f90f"; system = "cli-parser"; asd = "cli-parser"; @@ -39057,7 +39808,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clickr" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clickr/2014-07-13/clickr-20140713-git.tgz"; + url = "https://beta.quicklisp.org/archive/clickr/2014-07-13/clickr-20140713-git.tgz"; sha256 = "0sykp4aaxjf8xcyiqyqs6967f0fna8ahjqi7ij5z79fd530sxz2s"; system = "clickr"; asd = "clickr"; @@ -39079,12 +39830,12 @@ lib.makeScope pkgs.newScope (self: { clim = ( build-asdf-system { pname = "clim"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clim" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "clim"; asd = "clim"; } @@ -39102,12 +39853,12 @@ lib.makeScope pkgs.newScope (self: { clim-core = ( build-asdf-system { pname = "clim-core"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clim-core" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "clim-core"; asd = "clim-core"; } @@ -39130,12 +39881,12 @@ lib.makeScope pkgs.newScope (self: { clim-debugger = ( build-asdf-system { pname = "clim-debugger"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clim-debugger" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "clim-debugger"; asd = "clim-debugger"; } @@ -39155,12 +39906,12 @@ lib.makeScope pkgs.newScope (self: { clim-examples = ( build-asdf-system { pname = "clim-examples"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clim-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "clim-examples"; asd = "clim-examples"; } @@ -39183,12 +39934,12 @@ lib.makeScope pkgs.newScope (self: { clim-lisp = ( build-asdf-system { pname = "clim-lisp"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clim-lisp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "clim-lisp"; asd = "clim-lisp"; } @@ -39209,12 +39960,12 @@ lib.makeScope pkgs.newScope (self: { clim-listener = ( build-asdf-system { pname = "clim-listener"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clim-listener" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "clim-listener"; asd = "clim-listener"; } @@ -39233,12 +39984,12 @@ lib.makeScope pkgs.newScope (self: { clim-pdf = ( build-asdf-system { pname = "clim-pdf"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clim-pdf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "clim-pdf"; asd = "clim-pdf"; } @@ -39260,12 +40011,12 @@ lib.makeScope pkgs.newScope (self: { clim-postscript = ( build-asdf-system { pname = "clim-postscript"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clim-postscript" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "clim-postscript"; asd = "clim-postscript"; } @@ -39283,12 +40034,12 @@ lib.makeScope pkgs.newScope (self: { clim-postscript-font = ( build-asdf-system { pname = "clim-postscript-font"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clim-postscript-font" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "clim-postscript-font"; asd = "clim-postscript-font"; } @@ -39307,7 +40058,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clim-widgets" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clim-widgets/2020-07-15/clim-widgets-20200715-git.tgz"; + url = "https://beta.quicklisp.org/archive/clim-widgets/2020-07-15/clim-widgets-20200715-git.tgz"; sha256 = "0cpr8xn5a33sy75d06b95cfd3b1h9m5iixgg5h4isavpx3aglmy2"; system = "clim-widgets"; asd = "clim-widgets"; @@ -39336,7 +40087,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "climacs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/climacs/2024-10-12/climacs-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/climacs/2024-10-12/climacs-20241012-git.tgz"; sha256 = "0swbnsnavwaxpdcdsdag6iadc6v436pawbrzz6p8lkkbmbmc7yf8"; system = "climacs"; asd = "climacs"; @@ -39359,7 +40110,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "climc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/climc/2023-02-14/climc-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/climc/2023-02-14/climc-20230214-git.tgz"; sha256 = "0wnsyxkff5i4n36rwb5z54j4gi0j9n8459wcm6cj3lg77njmpasb"; system = "climc"; asd = "climc"; @@ -39383,7 +40134,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "climc-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/climc/2023-02-14/climc-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/climc/2023-02-14/climc-20230214-git.tgz"; sha256 = "0wnsyxkff5i4n36rwb5z54j4gi0j9n8459wcm6cj3lg77njmpasb"; system = "climc-test"; asd = "climc-test"; @@ -39406,7 +40157,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "climon" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/climon/2022-02-20/climon-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/climon/2022-02-20/climon-20220220-git.tgz"; sha256 = "00bdxpzgvmf5yg785xc9454nv7x5n314kywjd0f12mbvrgklb818"; system = "climon"; asd = "climon"; @@ -39426,7 +40177,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "climon-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/climon/2022-02-20/climon-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/climon/2022-02-20/climon-20220220-git.tgz"; sha256 = "00bdxpzgvmf5yg785xc9454nv7x5n314kywjd0f12mbvrgklb818"; system = "climon-test"; asd = "climon-test"; @@ -39450,7 +40201,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clinch" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clinch/2018-02-28/clinch-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/clinch/2018-02-28/clinch-20180228-git.tgz"; sha256 = "0hrj3kdxnazffrax3jmr6pgfahpj94lg43lczha6xpayhl49bqik"; system = "clinch"; asd = "clinch"; @@ -39478,7 +40229,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clinch-cairo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clinch/2018-02-28/clinch-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/clinch/2018-02-28/clinch-20180228-git.tgz"; sha256 = "0hrj3kdxnazffrax3jmr6pgfahpj94lg43lczha6xpayhl49bqik"; system = "clinch-cairo"; asd = "clinch-cairo"; @@ -39502,7 +40253,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clinch-classimp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clinch/2018-02-28/clinch-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/clinch/2018-02-28/clinch-20180228-git.tgz"; sha256 = "0hrj3kdxnazffrax3jmr6pgfahpj94lg43lczha6xpayhl49bqik"; system = "clinch-classimp"; asd = "clinch-classimp"; @@ -39526,7 +40277,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clinch-freeimage" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clinch/2018-02-28/clinch-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/clinch/2018-02-28/clinch-20180228-git.tgz"; sha256 = "0hrj3kdxnazffrax3jmr6pgfahpj94lg43lczha6xpayhl49bqik"; system = "clinch-freeimage"; asd = "clinch-freeimage"; @@ -39540,8 +40291,6 @@ lib.makeScope pkgs.newScope (self: { ]; meta = { hydraPlatforms = [ ]; - # darwin cannot find libpango.dylib - broken = stdenv.hostPlatform.isDarwin; }; } ); @@ -39552,7 +40301,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clinch-pango" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clinch/2018-02-28/clinch-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/clinch/2018-02-28/clinch-20180228-git.tgz"; sha256 = "0hrj3kdxnazffrax3jmr6pgfahpj94lg43lczha6xpayhl49bqik"; system = "clinch-pango"; asd = "clinch-pango"; @@ -39579,7 +40328,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clinenoise" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clinenoise/2020-04-27/clinenoise-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/clinenoise/2020-04-27/clinenoise-20200427-git.tgz"; sha256 = "0ydlirfk4dbpqqjwwph99v5swcrhd8v9g8q24fvs35wn2vm08lh1"; system = "clinenoise"; asd = "clinenoise"; @@ -39604,7 +40353,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clingon" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clingon/2024-10-12/clingon-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/clingon/2024-10-12/clingon-20241012-git.tgz"; sha256 = "0p8i9bkzzy4v0pg15dldrl73xri4kxyxa7si82bawh1dnnm53jgc"; system = "clingon"; asd = "clingon"; @@ -39629,7 +40378,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clingon.demo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clingon/2024-10-12/clingon-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/clingon/2024-10-12/clingon-20241012-git.tgz"; sha256 = "0p8i9bkzzy4v0pg15dldrl73xri4kxyxa7si82bawh1dnnm53jgc"; system = "clingon.demo"; asd = "clingon.demo"; @@ -39649,7 +40398,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clingon.intro" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clingon/2024-10-12/clingon-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/clingon/2024-10-12/clingon-20241012-git.tgz"; sha256 = "0p8i9bkzzy4v0pg15dldrl73xri4kxyxa7si82bawh1dnnm53jgc"; system = "clingon.intro"; asd = "clingon.intro"; @@ -39669,7 +40418,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clingon.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clingon/2024-10-12/clingon-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/clingon/2024-10-12/clingon-20241012-git.tgz"; sha256 = "0p8i9bkzzy4v0pg15dldrl73xri4kxyxa7si82bawh1dnnm53jgc"; system = "clingon.test"; asd = "clingon.test"; @@ -39688,12 +40437,12 @@ lib.makeScope pkgs.newScope (self: { clip = ( build-asdf-system { pname = "clip"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clip" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clip/2024-10-12/clip-20241012-git.tgz"; - sha256 = "1ikzfza4s5xl67bz4vi05hmqmkvs5qr2ycy1f6vi1ihsdvjfify0"; + url = "https://beta.quicklisp.org/archive/clip/2025-06-22/clip-20250622-git.tgz"; + sha256 = "1ikyf0340clllafjb7jg2bvwxfnb0vv8bjnd8ngn4qlpsx75m1nl"; system = "clip"; asd = "clip"; } @@ -39715,7 +40464,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clipper" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clipper/2015-09-23/clipper-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/clipper/2015-09-23/clipper-20150923-git.tgz"; sha256 = "0xx1z7xjy2qkb6hx4bjjxcpv180lynpxrmx0741zk0qcxf32y56n"; system = "clipper"; asd = "clipper"; @@ -39746,7 +40495,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clipper-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clipper/2015-09-23/clipper-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/clipper/2015-09-23/clipper-20150923-git.tgz"; sha256 = "0xx1z7xjy2qkb6hx4bjjxcpv180lynpxrmx0741zk0qcxf32y56n"; system = "clipper-test"; asd = "clipper-test"; @@ -39771,7 +40520,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clite" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clite/2013-06-15/clite-20130615-git.tgz"; + url = "https://beta.quicklisp.org/archive/clite/2013-06-15/clite-20130615-git.tgz"; sha256 = "0q73vzm55i7m6in9i3fwwaqxvwm3pr7mm7gh7qsvfya61248ynrz"; system = "clite"; asd = "clite"; @@ -39787,18 +40536,21 @@ lib.makeScope pkgs.newScope (self: { clith = ( build-asdf-system { pname = "clith"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clith" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clith/2024-10-12/clith-20241012-git.tgz"; - sha256 = "02qfyrnihx9x6nwxgzlh2x6ymz90i524jg8gc5zsy9rcfqj2sfa7"; + url = "https://beta.quicklisp.org/archive/clith/2025-06-22/clith-20250622-git.tgz"; + sha256 = "0n973pf696bi8mv6nazjwdwgp1i2p8jfp3ab068y0cvnrww693x6"; system = "clith"; asd = "clith"; } ); systems = [ "clith" ]; - lispLibs = [ (getAttr "alexandria" self) ]; + lispLibs = [ + (getAttr "alexandria" self) + (getAttr "expanders" self) + ]; meta = { hydraPlatforms = [ ]; }; @@ -39811,7 +40563,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clj" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clj/2020-12-20/clj-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clj/2020-12-20/clj-20201220-git.tgz"; sha256 = "0yic6w2n09w3v2r1dlg9a7z59j9rapj4hpz8whcxlw6zs4wrwib2"; system = "clj"; asd = "clj"; @@ -39840,7 +40592,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clj-arrows" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clj-arrows/2024-10-12/clj-arrows-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/clj-arrows/2024-10-12/clj-arrows-20241012-git.tgz"; sha256 = "0b0dpjbyk41h32laqa4hwlgximafkjgrgdahabyc3blkg5v7lill"; system = "clj-arrows"; asd = "clj-arrows"; @@ -39860,7 +40612,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clj-arrows-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clj-arrows/2024-10-12/clj-arrows-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/clj-arrows/2024-10-12/clj-arrows-20241012-git.tgz"; sha256 = "0b0dpjbyk41h32laqa4hwlgximafkjgrgdahabyc3blkg5v7lill"; system = "clj-arrows-test"; asd = "clj-arrows-test"; @@ -39883,7 +40635,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clj-con" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clj-con/2024-10-12/clj-con-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/clj-con/2024-10-12/clj-con-20241012-git.tgz"; sha256 = "05zjw4ncwwpmckxqv61zhv1lcyfm7w4ic59ypcw5bypxwgkapa7c"; system = "clj-con"; asd = "clj-con"; @@ -39906,7 +40658,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clj-con-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clj-con/2024-10-12/clj-con-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/clj-con/2024-10-12/clj-con-20241012-git.tgz"; sha256 = "05zjw4ncwwpmckxqv61zhv1lcyfm7w4ic59ypcw5bypxwgkapa7c"; system = "clj-con-test"; asd = "clj-con-test"; @@ -39929,7 +40681,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clj-re" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clj-re/2024-10-12/clj-re-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/clj-re/2024-10-12/clj-re-20241012-git.tgz"; sha256 = "05d0xqnhd50hmvicaq3a08m52c12j7cmxz99mpmk10mp0cv572bl"; system = "clj-re"; asd = "clj-re"; @@ -39952,7 +40704,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clj-re-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clj-re/2024-10-12/clj-re-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/clj-re/2024-10-12/clj-re-20241012-git.tgz"; sha256 = "05d0xqnhd50hmvicaq3a08m52c12j7cmxz99mpmk10mp0cv572bl"; system = "clj-re-test"; asd = "clj-re-test"; @@ -39975,7 +40727,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clml" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; system = "clml"; asd = "clml"; @@ -40015,7 +40767,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clml.association-rule" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; system = "clml.association-rule"; asd = "clml.association-rule"; @@ -40035,7 +40787,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clml.blas" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; system = "clml.blas"; asd = "clml.blas"; @@ -40059,7 +40811,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clml.blas.complex" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; system = "clml.blas.complex"; asd = "clml.blas"; @@ -40079,7 +40831,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clml.blas.hompack" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; system = "clml.blas.hompack"; asd = "clml.blas"; @@ -40100,7 +40852,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clml.blas.real" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; system = "clml.blas.real"; asd = "clml.blas"; @@ -40120,7 +40872,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clml.classifiers" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; system = "clml.classifiers"; asd = "clml.classifiers"; @@ -40144,7 +40896,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clml.clustering" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; system = "clml.clustering"; asd = "clml.clustering"; @@ -40169,7 +40921,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clml.data" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; system = "clml.data"; asd = "clml.data"; @@ -40189,7 +40941,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clml.data.r-datasets" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; system = "clml.data.r-datasets"; asd = "clml.data.r-datasets"; @@ -40214,7 +40966,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clml.decision-tree" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; system = "clml.decision-tree"; asd = "clml.decision-tree"; @@ -40237,7 +40989,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clml.docs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; system = "clml.docs"; asd = "clml.docs"; @@ -40262,7 +41014,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clml.graph" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; system = "clml.graph"; asd = "clml.graph"; @@ -40288,7 +41040,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clml.hjs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; system = "clml.hjs"; asd = "clml.hjs"; @@ -40317,7 +41069,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clml.lapack" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; system = "clml.lapack"; asd = "clml.lapack"; @@ -40341,7 +41093,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clml.lapack-real" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; system = "clml.lapack-real"; asd = "clml.lapack"; @@ -40364,7 +41116,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clml.nearest-search" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; system = "clml.nearest-search"; asd = "clml.nearest-search"; @@ -40388,7 +41140,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clml.nonparametric" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; system = "clml.nonparametric"; asd = "clml.nonparametric"; @@ -40408,7 +41160,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clml.numeric" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; system = "clml.numeric"; asd = "clml.numeric"; @@ -40428,7 +41180,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clml.pca" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; system = "clml.pca"; asd = "clml.pca"; @@ -40451,7 +41203,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clml.pca.examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; system = "clml.pca.examples"; asd = "clml.pca"; @@ -40474,7 +41226,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clml.som" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; system = "clml.som"; asd = "clml.som"; @@ -40498,7 +41250,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clml.som.example" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; system = "clml.som.example"; asd = "clml.som"; @@ -40522,7 +41274,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clml.statistics" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; system = "clml.statistics"; asd = "clml.statistics"; @@ -40542,7 +41294,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clml.statistics.rand" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; system = "clml.statistics.rand"; asd = "clml.statistics.rand"; @@ -40562,7 +41314,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clml.svm" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; system = "clml.svm"; asd = "clml.svm"; @@ -40587,7 +41339,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clml.svm.examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; system = "clml.svm.examples"; asd = "clml.svm"; @@ -40610,7 +41362,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clml.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; system = "clml.test"; asd = "clml.test"; @@ -40633,7 +41385,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clml.text" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; system = "clml.text"; asd = "clml.text"; @@ -40657,7 +41409,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clml.time-series" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; system = "clml.time-series"; asd = "clml.time-series"; @@ -40682,7 +41434,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clml.utility" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; system = "clml.utility"; asd = "clml.utility"; @@ -40710,7 +41462,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clnuplot" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clnuplot/2013-01-28/clnuplot-20130128-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/clnuplot/2013-01-28/clnuplot-20130128-darcs.tgz"; sha256 = "0yfaay5idv9lq4ilafj305sg349c960n3q400kdayr0gda6pqlqr"; system = "clnuplot"; asd = "clnuplot"; @@ -40735,7 +41487,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clobber" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clobber/2024-10-12/clobber-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/clobber/2024-10-12/clobber-20241012-git.tgz"; sha256 = "1n6j9q0czrzigw7vfahlylm1g8hmk7b1wm84jm94cgl8r5r3s8ra"; system = "clobber"; asd = "clobber"; @@ -40755,7 +41507,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clobber-base" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clobber/2024-10-12/clobber-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/clobber/2024-10-12/clobber-20241012-git.tgz"; sha256 = "1n6j9q0czrzigw7vfahlylm1g8hmk7b1wm84jm94cgl8r5r3s8ra"; system = "clobber-base"; asd = "clobber-base"; @@ -40775,7 +41527,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clobber-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clobber/2024-10-12/clobber-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/clobber/2024-10-12/clobber-20241012-git.tgz"; sha256 = "1n6j9q0czrzigw7vfahlylm1g8hmk7b1wm84jm94cgl8r5r3s8ra"; system = "clobber-test"; asd = "clobber-test"; @@ -40795,7 +41547,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clod" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clod/2019-03-07/clod-20190307-hg.tgz"; + url = "https://beta.quicklisp.org/archive/clod/2019-03-07/clod-20190307-hg.tgz"; sha256 = "0sdlr6jlqnbiyf06648zhq8dpni3zy0n5rwjcrvm4hw7vcy8vhy1"; system = "clod"; asd = "clod"; @@ -40819,7 +41571,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clods-export" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clods-export/2021-04-11/clods-export-20210411-git.tgz"; + url = "https://beta.quicklisp.org/archive/clods-export/2021-04-11/clods-export-20210411-git.tgz"; sha256 = "1bbzrl855qjs88ni548filghb2y8fvklkik22amwzi6dbzvq48qx"; system = "clods-export"; asd = "clods-export"; @@ -40842,12 +41594,12 @@ lib.makeScope pkgs.newScope (self: { clog = ( build-asdf-system { pname = "clog"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clog" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clog/2024-10-12/clog-20241012-git.tgz"; - sha256 = "0hqpj9ji7kfqgcxdfnc7x202qzmb7zdkmjwcyhdllqs6b0ssw5lx"; + url = "https://beta.quicklisp.org/archive/clog/2025-06-22/clog-20250622-git.tgz"; + sha256 = "1sf2xan0fh2qqr8xgmsbmq9qcj5nkzrp3nq7gd69ssbkz9ab6qpw"; system = "clog"; asd = "clog"; } @@ -40887,7 +41639,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clog-ace" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clog-ace/2024-10-12/clog-ace-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/clog-ace/2024-10-12/clog-ace-20241012-git.tgz"; sha256 = "01hwaiccy5i81w22kya00jscgpjw6iib2hnklqwky88i35kbb4sj"; system = "clog-ace"; asd = "clog-ace"; @@ -40907,7 +41659,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clog-collection" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clog-collection/2024-10-12/clog-collection-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/clog-collection/2024-10-12/clog-collection-20241012-git.tgz"; sha256 = "0f6rw9sla5f7jglbisving0c97vz3a5bbn59li0jzngqp8rqwsqx"; system = "clog-collection"; asd = "clog-collection"; @@ -40934,7 +41686,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clog-plotly" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clog-plotly/2024-10-12/clog-plotly-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/clog-plotly/2024-10-12/clog-plotly-20241012-git.tgz"; sha256 = "064fhfhh5nr1g9f4pn9x2ydmxdnxmvyxhwgbl3dgqm416scjzzs1"; system = "clog-plotly"; asd = "clog-plotly"; @@ -40954,7 +41706,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clog-terminal" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clog-terminal/2024-10-12/clog-terminal-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/clog-terminal/2024-10-12/clog-terminal-20241012-git.tgz"; sha256 = "1pvrja8fvdzqmiqzl23lb7665vcpx9lhwxahns81wlykkyx7cjd5"; system = "clog-terminal"; asd = "clog-terminal"; @@ -40974,7 +41726,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clohost" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clohost/2024-10-12/clohost-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/clohost/2024-10-12/clohost-20241012-git.tgz"; sha256 = "1qph7nrjb62qxwkv5wbzqkycdavsjvi39b97qvs5g8jsrvbl50lh"; system = "clohost"; asd = "clohost"; @@ -41000,7 +41752,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clonsigna" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clonsigna/2012-09-09/clonsigna-20120909-git.tgz"; + url = "https://beta.quicklisp.org/archive/clonsigna/2012-09-09/clonsigna-20120909-git.tgz"; sha256 = "052vdch0q07sx3j615qgw8z536fmqz8fm3qv7f298ql3wcskrj7j"; system = "clonsigna"; asd = "clonsigna"; @@ -41028,7 +41780,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clop" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clop/2022-02-20/clop-v1.0.1.tgz"; + url = "https://beta.quicklisp.org/archive/clop/2022-02-20/clop-v1.0.1.tgz"; sha256 = "1q7rlizr8gcbfz4a9660gdbw7d2zbld18akjpibg54j7jh5kb8gc"; system = "clop"; asd = "clop"; @@ -41054,7 +41806,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clop-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clop/2022-02-20/clop-v1.0.1.tgz"; + url = "https://beta.quicklisp.org/archive/clop/2022-02-20/clop-v1.0.1.tgz"; sha256 = "1q7rlizr8gcbfz4a9660gdbw7d2zbld18akjpibg54j7jh5kb8gc"; system = "clop-tests"; asd = "clop"; @@ -41077,7 +41829,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clos-diff" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clos-diff/2015-06-08/clos-diff-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/clos-diff/2015-06-08/clos-diff-20150608-git.tgz"; sha256 = "0y6chxzqwwwkrrmxxb74wwci6i4ck6i3fq36w9gl03qbrksfyjkz"; system = "clos-diff"; asd = "clos-diff"; @@ -41097,7 +41849,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clos-encounters" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clos-encounters/2024-10-12/clos-encounters-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/clos-encounters/2024-10-12/clos-encounters-20241012-git.tgz"; sha256 = "021ygh6s5qb7l155bcp9qv1w2dhq9csscasp77vjlms1ahpq9ixf"; system = "clos-encounters"; asd = "clos-encounters"; @@ -41117,7 +41869,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clos-fixtures" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clos-fixtures/2016-08-25/clos-fixtures-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/clos-fixtures/2016-08-25/clos-fixtures-20160825-git.tgz"; sha256 = "1a3yvqszdwnsnk5hr4zrdpaqxb8vlxpl2nhxjl0j97fnmfaiqjhk"; system = "clos-fixtures"; asd = "clos-fixtures"; @@ -41137,7 +41889,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clos-fixtures-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clos-fixtures/2016-08-25/clos-fixtures-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/clos-fixtures/2016-08-25/clos-fixtures-20160825-git.tgz"; sha256 = "1a3yvqszdwnsnk5hr4zrdpaqxb8vlxpl2nhxjl0j97fnmfaiqjhk"; system = "clos-fixtures-test"; asd = "clos-fixtures-test"; @@ -41156,12 +41908,12 @@ lib.makeScope pkgs.newScope (self: { closer-mop = ( build-asdf-system { pname = "closer-mop"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "closer-mop" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/closer-mop/2024-10-12/closer-mop-20241012-git.tgz"; - sha256 = "1affaqh0sm1phs6qa12vbhf69abssjcpy55cwf4fi4nd6hgcrfqr"; + url = "https://beta.quicklisp.org/archive/closer-mop/2025-06-22/closer-mop-20250622-git.tgz"; + sha256 = "11mzk34j9mq1sq99im1n6y798kfrxgavskwx9mrywmvs316pssly"; system = "closer-mop"; asd = "closer-mop"; } @@ -41178,7 +41930,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "closure-common" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/closure-common/2018-10-18/closure-common-20181018-git.tgz"; + url = "https://beta.quicklisp.org/archive/closure-common/2018-10-18/closure-common-20181018-git.tgz"; sha256 = "0k5r2qxn122pxi301ijir3nayi9sg4d7yiy276l36qmzwhp4mg5n"; system = "closure-common"; asd = "closure-common"; @@ -41199,7 +41951,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "closure-html" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/closure-html/2018-07-11/closure-html-20180711-git.tgz"; + url = "https://beta.quicklisp.org/archive/closure-html/2018-07-11/closure-html-20180711-git.tgz"; sha256 = "105vm29qnxh6zj3rh4jwpm8dyp3b9bsva64c8a78cr270p28d032"; system = "closure-html"; asd = "closure-html"; @@ -41220,7 +41972,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "closure-template" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-closure-template/2015-08-04/cl-closure-template-20150804-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-closure-template/2015-08-04/cl-closure-template-20150804-git.tgz"; sha256 = "16h0fs6bjjd4n9pbkwcprpgyj26vsw2akk3q08m7xmsmqi05dppv"; system = "closure-template"; asd = "closure-template"; @@ -41248,7 +42000,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "closure-template-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-closure-template/2015-08-04/cl-closure-template-20150804-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-closure-template/2015-08-04/cl-closure-template-20150804-git.tgz"; sha256 = "16h0fs6bjjd4n9pbkwcprpgyj26vsw2akk3q08m7xmsmqi05dppv"; system = "closure-template-test"; asd = "closure-template"; @@ -41271,7 +42023,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clouchdb" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clouchdb/2012-04-07/clouchdb_0.0.16.tgz"; + url = "https://beta.quicklisp.org/archive/clouchdb/2012-04-07/clouchdb_0.0.16.tgz"; sha256 = "1zfk4wkz0k5gbfznnbds0gcpc2y08p47rq7mhchf27v6rqg4kd7d"; system = "clouchdb"; asd = "clouchdb"; @@ -41297,7 +42049,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clouchdb-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clouchdb/2012-04-07/clouchdb_0.0.16.tgz"; + url = "https://beta.quicklisp.org/archive/clouchdb/2012-04-07/clouchdb_0.0.16.tgz"; sha256 = "1zfk4wkz0k5gbfznnbds0gcpc2y08p47rq7mhchf27v6rqg4kd7d"; system = "clouchdb-examples"; asd = "clouchdb-examples"; @@ -41316,12 +42068,12 @@ lib.makeScope pkgs.newScope (self: { clouseau = ( build-asdf-system { pname = "clouseau"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clouseau" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "clouseau"; asd = "clouseau"; } @@ -41343,7 +42095,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clpython" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-python/2022-03-31/cl-python-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-python/2022-03-31/cl-python-20220331-git.tgz"; sha256 = "1liskpyfd8rbqn45xbymwvh4vic05pyvvf3hnq2ybyixwnkan9i9"; system = "clpython"; asd = "clpython"; @@ -41367,7 +42119,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clsql" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0"; system = "clsql"; asd = "clsql"; @@ -41385,7 +42137,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clsql-aodbc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0"; system = "clsql-aodbc"; asd = "clsql-aodbc"; @@ -41405,7 +42157,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clsql-cffi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0"; system = "clsql-cffi"; asd = "clsql-cffi"; @@ -41425,7 +42177,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clsql-fluid" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clsql-fluid/2017-08-30/clsql-fluid-20170830-git.tgz"; + url = "https://beta.quicklisp.org/archive/clsql-fluid/2017-08-30/clsql-fluid-20170830-git.tgz"; sha256 = "0i7x1xbh83wfr3k4ddsdy57yf0nqfhdxcbwv1na1ina6m5javg11"; system = "clsql-fluid"; asd = "clsql-fluid"; @@ -41449,7 +42201,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clsql-helper" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clsql-helper/2018-01-31/clsql-helper-20180131-git.tgz"; + url = "https://beta.quicklisp.org/archive/clsql-helper/2018-01-31/clsql-helper-20180131-git.tgz"; sha256 = "0yc6m8yh0gcark98wvjjwdq3xxy308x15pb7fzha6svxa06hf27g"; system = "clsql-helper"; asd = "clsql-helper"; @@ -41480,7 +42232,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clsql-helper-slot-coercer" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clsql-helper/2018-01-31/clsql-helper-20180131-git.tgz"; + url = "https://beta.quicklisp.org/archive/clsql-helper/2018-01-31/clsql-helper-20180131-git.tgz"; sha256 = "0yc6m8yh0gcark98wvjjwdq3xxy308x15pb7fzha6svxa06hf27g"; system = "clsql-helper-slot-coercer"; asd = "clsql-helper-slot-coercer"; @@ -41503,7 +42255,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clsql-helper-slot-coercer-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clsql-helper/2018-01-31/clsql-helper-20180131-git.tgz"; + url = "https://beta.quicklisp.org/archive/clsql-helper/2018-01-31/clsql-helper-20180131-git.tgz"; sha256 = "0yc6m8yh0gcark98wvjjwdq3xxy308x15pb7fzha6svxa06hf27g"; system = "clsql-helper-slot-coercer-test"; asd = "clsql-helper-slot-coercer"; @@ -41526,7 +42278,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clsql-helper-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clsql-helper/2018-01-31/clsql-helper-20180131-git.tgz"; + url = "https://beta.quicklisp.org/archive/clsql-helper/2018-01-31/clsql-helper-20180131-git.tgz"; sha256 = "0yc6m8yh0gcark98wvjjwdq3xxy308x15pb7fzha6svxa06hf27g"; system = "clsql-helper-test"; asd = "clsql-helper"; @@ -41550,7 +42302,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clsql-local-time" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clsql-local-time/2020-10-16/clsql-local-time-20201016-git.tgz"; + url = "https://beta.quicklisp.org/archive/clsql-local-time/2020-10-16/clsql-local-time-20201016-git.tgz"; sha256 = "1ipv6ij1md5mw44cbif31hiccrric3302rhssj8f7kg3s8n6mphv"; system = "clsql-local-time"; asd = "clsql-local-time"; @@ -41573,7 +42325,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clsql-mysql" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0"; system = "clsql-mysql"; asd = "clsql-mysql"; @@ -41597,7 +42349,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clsql-odbc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0"; system = "clsql-odbc"; asd = "clsql-odbc"; @@ -41620,7 +42372,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clsql-orm" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clsql-orm/2016-02-08/clsql-orm-20160208-git.tgz"; + url = "https://beta.quicklisp.org/archive/clsql-orm/2016-02-08/clsql-orm-20160208-git.tgz"; sha256 = "1y9604k0mj8h03p85l5nrjkihr3yfj5fp910db9f4ksd1ln2qkka"; system = "clsql-orm"; asd = "clsql-orm"; @@ -41647,7 +42399,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clsql-postgresql" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0"; system = "clsql-postgresql"; asd = "clsql-postgresql"; @@ -41668,7 +42420,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clsql-postgresql-socket" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0"; system = "clsql-postgresql-socket"; asd = "clsql-postgresql-socket"; @@ -41690,7 +42442,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clsql-postgresql-socket3" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0"; system = "clsql-postgresql-socket3"; asd = "clsql-postgresql-socket3"; @@ -41714,7 +42466,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clsql-sqlite" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0"; system = "clsql-sqlite"; asd = "clsql-sqlite"; @@ -41737,7 +42489,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clsql-sqlite3" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0"; system = "clsql-sqlite3"; asd = "clsql-sqlite3"; @@ -41758,7 +42510,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clsql-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0"; system = "clsql-tests"; asd = "clsql-tests"; @@ -41782,7 +42534,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clsql-uffi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0"; system = "clsql-uffi"; asd = "clsql-uffi"; @@ -41799,12 +42551,12 @@ lib.makeScope pkgs.newScope (self: { clss = ( build-asdf-system { pname = "clss"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clss" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clss/2024-10-12/clss-20241012-git.tgz"; - sha256 = "1l2yq6wi8wmb7l8fy6w4xb3mb2yd9d14ijgqdsbnwb5k2hbmndbf"; + url = "https://beta.quicklisp.org/archive/clss/2025-06-22/clss-20250622-git.tgz"; + sha256 = "08ivm4x6j9lvvl55df71h2azwf4l47nyvi0yrb4rs5paqjd4afq3"; system = "clss"; asd = "clss"; } @@ -41824,7 +42576,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cltcl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cltcl/2016-12-04/cltcl-20161204-git.tgz"; + url = "https://beta.quicklisp.org/archive/cltcl/2016-12-04/cltcl-20161204-git.tgz"; sha256 = "18b7fa7m9h9xfhnkxa6r3xzj86p1fvq0mh5q8vdrdv3vxfyc2l68"; system = "cltcl"; asd = "cltcl"; @@ -41844,7 +42596,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cluffer" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz"; sha256 = "1q5232v9vkjmiks2ciqj1fa1h3gh53rfhl301wp46jwra3r7qqyg"; system = "cluffer"; asd = "cluffer"; @@ -41868,7 +42620,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cluffer-base" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz"; sha256 = "1q5232v9vkjmiks2ciqj1fa1h3gh53rfhl301wp46jwra3r7qqyg"; system = "cluffer-base"; asd = "cluffer-base"; @@ -41888,7 +42640,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cluffer-simple-buffer" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz"; sha256 = "1q5232v9vkjmiks2ciqj1fa1h3gh53rfhl301wp46jwra3r7qqyg"; system = "cluffer-simple-buffer"; asd = "cluffer-simple-buffer"; @@ -41908,7 +42660,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cluffer-simple-line" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz"; sha256 = "1q5232v9vkjmiks2ciqj1fa1h3gh53rfhl301wp46jwra3r7qqyg"; system = "cluffer-simple-line"; asd = "cluffer-simple-line"; @@ -41928,7 +42680,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cluffer-standard-buffer" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz"; sha256 = "1q5232v9vkjmiks2ciqj1fa1h3gh53rfhl301wp46jwra3r7qqyg"; system = "cluffer-standard-buffer"; asd = "cluffer-standard-buffer"; @@ -41951,7 +42703,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cluffer-standard-line" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz"; sha256 = "1q5232v9vkjmiks2ciqj1fa1h3gh53rfhl301wp46jwra3r7qqyg"; system = "cluffer-standard-line"; asd = "cluffer-standard-line"; @@ -41971,7 +42723,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cluffer-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz"; sha256 = "1q5232v9vkjmiks2ciqj1fa1h3gh53rfhl301wp46jwra3r7qqyg"; system = "cluffer-test"; asd = "cluffer-test"; @@ -41991,7 +42743,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clump" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz"; sha256 = "1639msyagsswj85gc0wd90jgh8588j3qg5q70by9s2brf2q6w4lh"; system = "clump"; asd = "clump"; @@ -42012,7 +42764,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clump-2-3-tree" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz"; sha256 = "1639msyagsswj85gc0wd90jgh8588j3qg5q70by9s2brf2q6w4lh"; system = "clump-2-3-tree"; asd = "clump-2-3-tree"; @@ -42030,7 +42782,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clump-binary-tree" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz"; sha256 = "1639msyagsswj85gc0wd90jgh8588j3qg5q70by9s2brf2q6w4lh"; system = "clump-binary-tree"; asd = "clump-binary-tree"; @@ -42048,7 +42800,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clump-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz"; sha256 = "1639msyagsswj85gc0wd90jgh8588j3qg5q70by9s2brf2q6w4lh"; system = "clump-test"; asd = "clump-test"; @@ -42068,7 +42820,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clunit" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clunit/2017-10-19/clunit-20171019-git.tgz"; + url = "https://beta.quicklisp.org/archive/clunit/2017-10-19/clunit-20171019-git.tgz"; sha256 = "1idf2xnqzlhi8rbrqmzpmb3i1l6pbdzhhajkmhwbp6qjkmxa4h85"; system = "clunit"; asd = "clunit"; @@ -42082,12 +42834,12 @@ lib.makeScope pkgs.newScope (self: { clunit2 = ( build-asdf-system { pname = "clunit2"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "clunit2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clunit2/2024-10-12/clunit2-20241012-git.tgz"; - sha256 = "03k4wc2zz31wcqcxy8fhq095i8xzcaxrzgrlrn2va10lcjs4v51b"; + url = "https://beta.quicklisp.org/archive/clunit2/2025-06-22/clunit2-20250622-git.tgz"; + sha256 = "0xm9jsy2wsvbbf8cgln6601a1rbyiz8hk17vh0lm747sqhg2vxc5"; system = "clunit2"; asd = "clunit2"; } @@ -42104,7 +42856,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clustered-intset" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clustered-intset/2022-07-07/clustered-intset-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/clustered-intset/2022-07-07/clustered-intset-20220707-git.tgz"; sha256 = "035s2gn59l8389b0ypnb4qna7zplz9rxk05aw88qf8g4b7wyba1h"; system = "clustered-intset"; asd = "clustered-intset"; @@ -42124,7 +42876,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clustered-intset-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clustered-intset/2022-07-07/clustered-intset-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/clustered-intset/2022-07-07/clustered-intset-20220707-git.tgz"; sha256 = "035s2gn59l8389b0ypnb4qna7zplz9rxk05aw88qf8g4b7wyba1h"; system = "clustered-intset-test"; asd = "clustered-intset-test"; @@ -42148,7 +42900,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clusters" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clusters/2022-03-31/clusters-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/clusters/2022-03-31/clusters-20220331-git.tgz"; sha256 = "1x78ihrrah0rrb2ddxmxqcqpkswdvb3f0via56bkf1f3f5kqmsb8"; system = "clusters"; asd = "clusters"; @@ -42177,7 +42929,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clusters-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clusters/2022-03-31/clusters-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/clusters/2022-03-31/clusters-20220331-git.tgz"; sha256 = "1x78ihrrah0rrb2ddxmxqcqpkswdvb3f0via56bkf1f3f5kqmsb8"; system = "clusters-tests"; asd = "clusters-tests"; @@ -42201,7 +42953,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clutter" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clutter/2021-10-20/clutter-v1.0.0.tgz"; + url = "https://beta.quicklisp.org/archive/clutter/2021-10-20/clutter-v1.0.0.tgz"; sha256 = "1q9mg4d0nja9ypm13i24wymhjwziw6n7r7p1dzw6xc5zhavqsni7"; system = "clutter"; asd = "clutter"; @@ -42224,7 +42976,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clweb" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clweb/2020-12-20/clweb-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clweb/2020-12-20/clweb-20201220-git.tgz"; sha256 = "0hqyrglgsgal5s8f0n247hg0hqlw6l6w1r5i8lzf0a0xvcz49f48"; system = "clweb"; asd = "clweb"; @@ -42244,7 +42996,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clws" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clws/2013-08-13/clws-20130813-git.tgz"; + url = "https://beta.quicklisp.org/archive/clws/2013-08-13/clws-20130813-git.tgz"; sha256 = "1svj025zwsbkb0hrbz1nj0x306hkhy9xinq0x1qdflc9vg169dh6"; system = "clws"; asd = "clws"; @@ -42271,7 +43023,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "clx" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clx/2024-10-12/clx-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/clx/2024-10-12/clx-20241012-git.tgz"; sha256 = "16l0badm7dxwi7x5ynk1scrbrilnxi1nzz79h1v15xi6b41pf65w"; system = "clx"; asd = "clx"; @@ -42289,7 +43041,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cmake-parser" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cmake-parser/2018-08-31/cmake-parser-20180831-git.tgz"; + url = "https://beta.quicklisp.org/archive/cmake-parser/2018-08-31/cmake-parser-20180831-git.tgz"; sha256 = "1sb5pwxhg7k41202kvxj1b60c5pxnl0mfbqdz53xayddngn2brgl"; system = "cmake-parser"; asd = "cmake-parser"; @@ -42312,7 +43064,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cmark" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cmark/2024-10-12/cl-cmark-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cmark/2024-10-12/cl-cmark-20241012-git.tgz"; sha256 = "1l4i530161ppfz0wn1da7g7dwf644ppp1afrq2p7qfkajm7dcfg5"; system = "cmark"; asd = "cmark"; @@ -42332,12 +43084,12 @@ lib.makeScope pkgs.newScope (self: { cmd = ( build-asdf-system { pname = "cmd"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cmd" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cmd/2024-10-12/cmd-20241012-git.tgz"; - sha256 = "0rs2priccm34yx8cj29214i4bwa908gqs1ss23gyjb7v5qcq1sj7"; + url = "https://beta.quicklisp.org/archive/cmd/2025-06-22/cmd-20250622-git.tgz"; + sha256 = "1wm06jvb24pcrfy5h8xm5l6jh13dsrir789bz1c50pjm17wlbk3k"; system = "cmd"; asd = "cmd"; } @@ -42362,7 +43114,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cmu-infix" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cmu-infix/2018-02-28/cmu-infix-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/cmu-infix/2018-02-28/cmu-infix-20180228-git.tgz"; sha256 = "0macs398088cfif1dkjrpmidk515sjl7ld96f9ys5cpzx8sc5gib"; system = "cmu-infix"; asd = "cmu-infix"; @@ -42382,7 +43134,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cmu-infix-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cmu-infix/2018-02-28/cmu-infix-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/cmu-infix/2018-02-28/cmu-infix-20180228-git.tgz"; sha256 = "0macs398088cfif1dkjrpmidk515sjl7ld96f9ys5cpzx8sc5gib"; system = "cmu-infix-tests"; asd = "cmu-infix-tests"; @@ -42401,12 +43153,12 @@ lib.makeScope pkgs.newScope (self: { coalton = ( build-asdf-system { pname = "coalton"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "coalton" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/coalton/2024-10-12/coalton-20241012-git.tgz"; - sha256 = "19flzjxf3y6pxm09bmr8bmiqbgh4f7d5jjbgx2cb3dckmgvvg1d7"; + url = "https://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz"; + sha256 = "0g6gfp3y9smzssi3dbddwxvx7g4hq6wz98h253gs4i15pd2pf3qp"; system = "coalton"; asd = "coalton"; } @@ -42426,12 +43178,12 @@ lib.makeScope pkgs.newScope (self: { coalton-asdf = ( build-asdf-system { pname = "coalton-asdf"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "coalton-asdf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/coalton/2024-10-12/coalton-20241012-git.tgz"; - sha256 = "19flzjxf3y6pxm09bmr8bmiqbgh4f7d5jjbgx2cb3dckmgvvg1d7"; + url = "https://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz"; + sha256 = "0g6gfp3y9smzssi3dbddwxvx7g4hq6wz98h253gs4i15pd2pf3qp"; system = "coalton-asdf"; asd = "coalton-asdf"; } @@ -42446,12 +43198,12 @@ lib.makeScope pkgs.newScope (self: { coalton-compiler = ( build-asdf-system { pname = "coalton-compiler"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "coalton-compiler" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/coalton/2024-10-12/coalton-20241012-git.tgz"; - sha256 = "19flzjxf3y6pxm09bmr8bmiqbgh4f7d5jjbgx2cb3dckmgvvg1d7"; + url = "https://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz"; + sha256 = "0g6gfp3y9smzssi3dbddwxvx7g4hq6wz98h253gs4i15pd2pf3qp"; system = "coalton-compiler"; asd = "coalton-compiler"; } @@ -42476,12 +43228,12 @@ lib.makeScope pkgs.newScope (self: { coalton-testing-example-project = ( build-asdf-system { pname = "coalton-testing-example-project"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "coalton-testing-example-project" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/coalton/2024-10-12/coalton-20241012-git.tgz"; - sha256 = "19flzjxf3y6pxm09bmr8bmiqbgh4f7d5jjbgx2cb3dckmgvvg1d7"; + url = "https://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz"; + sha256 = "0g6gfp3y9smzssi3dbddwxvx7g4hq6wz98h253gs4i15pd2pf3qp"; system = "coalton-testing-example-project"; asd = "coalton-testing-example-project"; } @@ -42496,38 +43248,15 @@ lib.makeScope pkgs.newScope (self: { }; } ); - cocoahelper = ( - build-asdf-system { - pname = "cocoahelper"; - version = "20210807-git"; - asds = [ "cocoahelper" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "cocoahelper"; - asd = "cocoahelper"; - } - ); - systems = [ "cocoahelper" ]; - lispLibs = [ - (getAttr "cffi" self) - (getAttr "lispbuilder-sdl-binaries" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); cocoas = ( build-asdf-system { pname = "cocoas"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "cocoas" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cocoas/2024-10-12/cocoas-20241012-git.tgz"; - sha256 = "0a3jpni8hnzd6103qj3nywy61c3jq6j9yzmg35wy4b8j94pgyvj5"; + url = "https://beta.quicklisp.org/archive/cocoas/2025-06-22/cocoas-20250622-git.tgz"; + sha256 = "1mw20p5apf75vf26hqbvsbmr46kw6nab36mg11wff1p22l4xmlqx"; system = "cocoas"; asd = "cocoas"; } @@ -42546,12 +43275,12 @@ lib.makeScope pkgs.newScope (self: { codata-recommended-values = ( build-asdf-system { pname = "codata-recommended-values"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "codata-recommended-values" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/codata-recommended-values/2024-10-12/codata-recommended-values-20241012-git.tgz"; - sha256 = "0mks9hzw5wkdjkqkcfbafm9rvbfgkn2na4bajfrhs4mn7bg4bv74"; + url = "https://beta.quicklisp.org/archive/codata-recommended-values/2025-06-22/codata-recommended-values-20250622-git.tgz"; + sha256 = "0s3bc8znh3jrm5n4lw87qa6lm2w2bkv96bh8li7kskfdvd3fzgfi"; system = "codata-recommended-values"; asd = "codata-recommended-values"; } @@ -42570,7 +43299,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "codex" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/codex/2024-10-12/codex-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/codex/2024-10-12/codex-20241012-git.tgz"; sha256 = "06d1qscqnkd24fhpvsm0206a4cj3wsxma7amazhvzqy1y4girgc3"; system = "codex"; asd = "codex"; @@ -42599,7 +43328,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "codex-templates" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/codex/2024-10-12/codex-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/codex/2024-10-12/codex-20241012-git.tgz"; sha256 = "06d1qscqnkd24fhpvsm0206a4cj3wsxma7amazhvzqy1y4girgc3"; system = "codex-templates"; asd = "codex-templates"; @@ -42620,12 +43349,12 @@ lib.makeScope pkgs.newScope (self: { coleslaw = ( build-asdf-system { pname = "coleslaw"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "coleslaw" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/coleslaw/2024-10-12/coleslaw-20241012-git.tgz"; - sha256 = "1p9hg5qnymxzx2bzcvkzjarwxw383misq0cmqgggpzyhignx80av"; + url = "https://beta.quicklisp.org/archive/coleslaw/2025-06-22/coleslaw-20250622-git.tgz"; + sha256 = "126dl1m6zh7m6gmq2xnam0bfg6nv7gdkvcr4x1i3407s3wpmirw5"; system = "coleslaw"; asd = "coleslaw"; } @@ -42651,12 +43380,12 @@ lib.makeScope pkgs.newScope (self: { coleslaw-cli = ( build-asdf-system { pname = "coleslaw-cli"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "coleslaw-cli" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/coleslaw/2024-10-12/coleslaw-20241012-git.tgz"; - sha256 = "1p9hg5qnymxzx2bzcvkzjarwxw383misq0cmqgggpzyhignx80av"; + url = "https://beta.quicklisp.org/archive/coleslaw/2025-06-22/coleslaw-20250622-git.tgz"; + sha256 = "126dl1m6zh7m6gmq2xnam0bfg6nv7gdkvcr4x1i3407s3wpmirw5"; system = "coleslaw-cli"; asd = "coleslaw-cli"; } @@ -42675,12 +43404,12 @@ lib.makeScope pkgs.newScope (self: { coleslaw-test = ( build-asdf-system { pname = "coleslaw-test"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "coleslaw-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/coleslaw/2024-10-12/coleslaw-20241012-git.tgz"; - sha256 = "1p9hg5qnymxzx2bzcvkzjarwxw383misq0cmqgggpzyhignx80av"; + url = "https://beta.quicklisp.org/archive/coleslaw/2025-06-22/coleslaw-20250622-git.tgz"; + sha256 = "126dl1m6zh7m6gmq2xnam0bfg6nv7gdkvcr4x1i3407s3wpmirw5"; system = "coleslaw-test"; asd = "coleslaw-test"; } @@ -42704,7 +43433,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "collectors" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/collectors/2024-10-12/collectors-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/collectors/2024-10-12/collectors-20241012-git.tgz"; sha256 = "1kc9q05wyp8yjz5wqc73nar7l49vcnfhj4924li81v76hlb03665"; system = "collectors"; asd = "collectors"; @@ -42726,7 +43455,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "colliflower" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/colliflower/2021-10-20/colliflower-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/colliflower/2021-10-20/colliflower-20211020-git.tgz"; sha256 = "1fzn9s7wm7wmffrdm21lpvry9jb320456cmmprn976a533lp704r"; system = "colliflower"; asd = "colliflower"; @@ -42751,7 +43480,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "colliflower-fset" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/colliflower/2021-10-20/colliflower-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/colliflower/2021-10-20/colliflower-20211020-git.tgz"; sha256 = "1fzn9s7wm7wmffrdm21lpvry9jb320456cmmprn976a533lp704r"; system = "colliflower-fset"; asd = "colliflower-fset"; @@ -42774,7 +43503,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "colliflower-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/colliflower/2021-10-20/colliflower-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/colliflower/2021-10-20/colliflower-20211020-git.tgz"; sha256 = "1fzn9s7wm7wmffrdm21lpvry9jb320456cmmprn976a533lp704r"; system = "colliflower-test"; asd = "colliflower-test"; @@ -42798,7 +43527,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "colnew" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; system = "colnew"; asd = "colnew"; @@ -42814,12 +43543,12 @@ lib.makeScope pkgs.newScope (self: { colored = ( build-asdf-system { pname = "colored"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "colored" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/colored/2024-10-12/colored-20241012-git.tgz"; - sha256 = "0msw83gs5m887n1ha54jhflqjxb2mc7yv1hifspv9g16fn6h355c"; + url = "https://beta.quicklisp.org/archive/colored/2025-06-22/colored-20250622-git.tgz"; + sha256 = "1wsj4449165h8diclk74a80x847yzsqnx9s02l314nm1wa37y3c7"; system = "colored"; asd = "colored"; } @@ -42834,12 +43563,12 @@ lib.makeScope pkgs.newScope (self: { colored-test = ( build-asdf-system { pname = "colored-test"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "colored-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/colored/2024-10-12/colored-20241012-git.tgz"; - sha256 = "0msw83gs5m887n1ha54jhflqjxb2mc7yv1hifspv9g16fn6h355c"; + url = "https://beta.quicklisp.org/archive/colored/2025-06-22/colored-20250622-git.tgz"; + sha256 = "1wsj4449165h8diclk74a80x847yzsqnx9s02l314nm1wa37y3c7"; system = "colored-test"; asd = "colored-test"; } @@ -42857,12 +43586,12 @@ lib.makeScope pkgs.newScope (self: { colorize = ( build-asdf-system { pname = "colorize"; - version = "20230214-git"; + version = "20250622-git"; asds = [ "colorize" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/colorize/2023-02-14/colorize-20230214-git.tgz"; - sha256 = "1gbg11ghs4iak3n4c66qn6yvrcsg71xcbnjjf8qks0y4c8573fyf"; + url = "https://beta.quicklisp.org/archive/colorize/2025-06-22/colorize-20250622-git.tgz"; + sha256 = "0wgnmpfn9z6xcvf87inlgpr3xhc2xbly5k9aifgvjwpmw9994m65"; system = "colorize"; asd = "colorize"; } @@ -42879,12 +43608,12 @@ lib.makeScope pkgs.newScope (self: { com-on = ( build-asdf-system { pname = "com-on"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "com-on" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/com-on/2024-10-12/com-on-20241012-git.tgz"; - sha256 = "1a3by2kx3iq0zl4304zhs89dfkp8xdjmdlnfmgywdg3wjdkxakci"; + url = "https://beta.quicklisp.org/archive/com-on/2025-06-22/com-on-20250622-git.tgz"; + sha256 = "0ycg3iijaj5p2xmd0lzpgqpdkxi6q9kx9gijyv0ww18xzqd8s3z1"; system = "com-on"; asd = "com-on"; } @@ -42902,12 +43631,12 @@ lib.makeScope pkgs.newScope (self: { com-on-test = ( build-asdf-system { pname = "com-on-test"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "com-on-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/com-on/2024-10-12/com-on-20241012-git.tgz"; - sha256 = "1a3by2kx3iq0zl4304zhs89dfkp8xdjmdlnfmgywdg3wjdkxakci"; + url = "https://beta.quicklisp.org/archive/com-on/2025-06-22/com-on-20250622-git.tgz"; + sha256 = "0ycg3iijaj5p2xmd0lzpgqpdkxi6q9kx9gijyv0ww18xzqd8s3z1"; system = "com-on-test"; asd = "com-on-test"; } @@ -42929,7 +43658,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "com.clearly-useful.generic-collection-interface" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/com.clearly-useful.generic-collection-interface/2019-07-10/com.clearly-useful.generic-collection-interface-20190710-git.tgz"; + url = "https://beta.quicklisp.org/archive/com.clearly-useful.generic-collection-interface/2019-07-10/com.clearly-useful.generic-collection-interface-20190710-git.tgz"; sha256 = "1yfxwqgvrb1nwryymsl4s3h1lr8yskb9c76lxqy3mw5l0vwvl5zl"; system = "com.clearly-useful.generic-collection-interface"; asd = "com.clearly-useful.generic-collection-interface"; @@ -42953,14 +43682,16 @@ lib.makeScope pkgs.newScope (self: { asds = [ "com.clearly-useful.generic-collection-interface.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/com.clearly-useful.generic-collection-interface/2019-07-10/com.clearly-useful.generic-collection-interface-20190710-git.tgz"; + url = "https://beta.quicklisp.org/archive/com.clearly-useful.generic-collection-interface/2019-07-10/com.clearly-useful.generic-collection-interface-20190710-git.tgz"; sha256 = "1yfxwqgvrb1nwryymsl4s3h1lr8yskb9c76lxqy3mw5l0vwvl5zl"; system = "com.clearly-useful.generic-collection-interface.test"; asd = "com.clearly-useful.generic-collection-interface.test"; } ); systems = [ "com.clearly-useful.generic-collection-interface.test" ]; - lispLibs = [ (getAttr "com_dot_clearly-useful_dot_generic-collection-interface" self) ]; + lispLibs = [ + (getAttr "com_dot_clearly-useful_dot_generic-collection-interface" self) + ]; meta = { hydraPlatforms = [ ]; }; @@ -42973,7 +43704,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "com.clearly-useful.iterate+" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/com.clearly-useful.iterate-plus/2012-10-13/com.clearly-useful.iterate-plus-20121013-git.tgz"; + url = "https://beta.quicklisp.org/archive/com.clearly-useful.iterate-plus/2012-10-13/com.clearly-useful.iterate-plus-20121013-git.tgz"; sha256 = "0fpymg6p9zglkclfn035agcs5k83fakad7dj2612v5p1snzzcika"; system = "com.clearly-useful.iterate+"; asd = "com.clearly-useful.iterate+"; @@ -42998,7 +43729,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "com.clearly-useful.iterator-protocol" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/com.clearly-useful.iterator-protocol/2013-03-12/com.clearly-useful.iterator-protocol-20130312-git.tgz"; + url = "https://beta.quicklisp.org/archive/com.clearly-useful.iterator-protocol/2013-03-12/com.clearly-useful.iterator-protocol-20130312-git.tgz"; sha256 = "1wgksgpck6na1ygdnln5n1y8rj2kylg3lpbkyrhdka2cgsqiqs4a"; system = "com.clearly-useful.iterator-protocol"; asd = "com.clearly-useful.iterator-protocol"; @@ -43021,7 +43752,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "com.clearly-useful.protocols" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/com.clearly-useful.protocols/2013-03-12/com.clearly-useful.protocols-20130312-git.tgz"; + url = "https://beta.quicklisp.org/archive/com.clearly-useful.protocols/2013-03-12/com.clearly-useful.protocols-20130312-git.tgz"; sha256 = "0az9rs98chjj2fdmpapqkv4sgfs84n9s7vvngcl05hcbsldm0xvn"; system = "com.clearly-useful.protocols"; asd = "com.clearly-useful.protocols"; @@ -43041,7 +43772,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "com.danielkeogh.graph" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/com.danielkeogh.graph/2024-10-12/com.danielkeogh.graph-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/com.danielkeogh.graph/2024-10-12/com.danielkeogh.graph-20241012-git.tgz"; sha256 = "1hy9g49aqi1li0cdxzjmzgiskh00vlxbp1kjwiyk8a8kqzg69hj2"; system = "com.danielkeogh.graph"; asd = "com.danielkeogh.graph"; @@ -43065,7 +43796,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "com.danielkeogh.graph-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/com.danielkeogh.graph/2024-10-12/com.danielkeogh.graph-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/com.danielkeogh.graph/2024-10-12/com.danielkeogh.graph-20241012-git.tgz"; sha256 = "1hy9g49aqi1li0cdxzjmzgiskh00vlxbp1kjwiyk8a8kqzg69hj2"; system = "com.danielkeogh.graph-tests"; asd = "com.danielkeogh.graph-tests"; @@ -43088,7 +43819,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "com.dvlsoft.rcfiles" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-rcfiles/2011-12-03/cl-rcfiles-20111203-http.tgz"; + url = "https://beta.quicklisp.org/archive/cl-rcfiles/2011-12-03/cl-rcfiles-20111203-http.tgz"; sha256 = "06ahp9jaim216k7vbya1kp8iy5yb1i7axwrsjx7gwhl2b2q63r0a"; system = "com.dvlsoft.rcfiles"; asd = "com.dvlsoft.rcfiles"; @@ -43108,7 +43839,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "com.elbeno.curve" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/curve/2013-01-28/curve-20130128-git.tgz"; + url = "https://beta.quicklisp.org/archive/curve/2013-01-28/curve-20130128-git.tgz"; sha256 = "0223sxrdixjg0bmy76a9kiv7g4zjkqxs92x6kys5dnaywx7mjb6j"; system = "com.elbeno.curve"; asd = "com.elbeno.curve"; @@ -43131,7 +43862,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "com.elbeno.vector" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vector/2013-01-28/vector-20130128-git.tgz"; + url = "https://beta.quicklisp.org/archive/vector/2013-01-28/vector-20130128-git.tgz"; sha256 = "04czvqycn9j2hzbjmrp9fgqlgns5l7vbb73dgv3zqmiwzdb66qr5"; system = "com.elbeno.vector"; asd = "com.elbeno.vector"; @@ -43151,7 +43882,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "com.gigamonkeys.binary-data" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/monkeylib-binary-data/2011-12-03/monkeylib-binary-data-20111203-git.tgz"; + url = "https://beta.quicklisp.org/archive/monkeylib-binary-data/2011-12-03/monkeylib-binary-data-20111203-git.tgz"; sha256 = "072v417vmcnvmyh8ddq9vmwwrizm7zwz9dpzi14qy9nsw8q649zw"; system = "com.gigamonkeys.binary-data"; asd = "com.gigamonkeys.binary-data"; @@ -43171,7 +43902,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "com.gigamonkeys.json" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/monkeylib-json/2018-02-28/monkeylib-json-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/monkeylib-json/2018-02-28/monkeylib-json-20180228-git.tgz"; sha256 = "188717pmyhpgwg9ncc1fbqvbvw5fikbfhvchsy9gg4haxhdgpzsn"; system = "com.gigamonkeys.json"; asd = "com.gigamonkeys.json"; @@ -43194,7 +43925,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "com.gigamonkeys.macro-utilities" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/monkeylib-macro-utilities/2011-12-03/monkeylib-macro-utilities-20111203-git.tgz"; + url = "https://beta.quicklisp.org/archive/monkeylib-macro-utilities/2011-12-03/monkeylib-macro-utilities-20111203-git.tgz"; sha256 = "0l3m44zlzrvyn6fyvxslga8cppp4mh8dkgqzy297nnm0vnij5r8w"; system = "com.gigamonkeys.macro-utilities"; asd = "com.gigamonkeys.macro-utilities"; @@ -43214,7 +43945,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "com.gigamonkeys.markup" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/monkeylib-markup/2012-09-09/monkeylib-markup-20120909-git.tgz"; + url = "https://beta.quicklisp.org/archive/monkeylib-markup/2012-09-09/monkeylib-markup-20120909-git.tgz"; sha256 = "049zqgnprvddn2zp1a8g862m3ikll3a3lpi1k2vimjmx1bkc0vs0"; system = "com.gigamonkeys.markup"; asd = "com.gigamonkeys.markup"; @@ -43238,7 +43969,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "com.gigamonkeys.parser" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/monkeylib-parser/2012-02-08/monkeylib-parser-20120208-git.tgz"; + url = "https://beta.quicklisp.org/archive/monkeylib-parser/2012-02-08/monkeylib-parser-20120208-git.tgz"; sha256 = "1xvzrih813311p48bzlm0z0592lx6iss3m36vz55qsw4sr397ncd"; system = "com.gigamonkeys.parser"; asd = "com.gigamonkeys.parser"; @@ -43261,7 +43992,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "com.gigamonkeys.pathnames" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/monkeylib-pathnames/2012-02-08/monkeylib-pathnames-20120208-git.tgz"; + url = "https://beta.quicklisp.org/archive/monkeylib-pathnames/2012-02-08/monkeylib-pathnames-20120208-git.tgz"; sha256 = "108cc39g7razng316df4d47zzpj2zr576wzwwrpggdkm4q599gvk"; system = "com.gigamonkeys.pathnames"; asd = "com.gigamonkeys.pathnames"; @@ -43281,7 +44012,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "com.gigamonkeys.prose-diff" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/monkeylib-prose-diff/2014-07-13/monkeylib-prose-diff-20140713-git.tgz"; + url = "https://beta.quicklisp.org/archive/monkeylib-prose-diff/2014-07-13/monkeylib-prose-diff-20140713-git.tgz"; sha256 = "1zwaa8qmpbdpdg8zzk3as73i55c54k9m694gx4bla1xxli5f8ijc"; system = "com.gigamonkeys.prose-diff"; asd = "com.gigamonkeys.prose-diff"; @@ -43308,7 +44039,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "com.gigamonkeys.test-framework" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/monkeylib-test-framework/2010-12-07/monkeylib-test-framework-20101207-git.tgz"; + url = "https://beta.quicklisp.org/archive/monkeylib-test-framework/2010-12-07/monkeylib-test-framework-20101207-git.tgz"; sha256 = "1d6b8zg0vnbqxxsbbjr3b4r46d8whj84h9yqnqw3ii0bwr8hn82v"; system = "com.gigamonkeys.test-framework"; asd = "com.gigamonkeys.test-framework"; @@ -43328,7 +44059,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "com.gigamonkeys.utilities" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/monkeylib-utilities/2017-04-03/monkeylib-utilities-20170403-git.tgz"; + url = "https://beta.quicklisp.org/archive/monkeylib-utilities/2017-04-03/monkeylib-utilities-20170403-git.tgz"; sha256 = "0d0h1y43mn6r8s4g9gbr02d09565p0gig21jfnk7zf1dl6rnvkvm"; system = "com.gigamonkeys.utilities"; asd = "com.gigamonkeys.utilities"; @@ -43351,7 +44082,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "com.google.base" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/com.google.base/2020-09-25/com.google.base-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/com.google.base/2020-09-25/com.google.base-20200925-git.tgz"; sha256 = "1drc341sqmrmyvdgqpdy066f0z0ia0kl3ppq0rlxznlxhn17x3xj"; system = "com.google.base"; asd = "com.google.base"; @@ -43371,7 +44102,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "com.google.flag" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lisp-gflags/2020-12-20/lisp-gflags-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/lisp-gflags/2020-12-20/lisp-gflags-20201220-git.tgz"; sha256 = "06p70v1wv0ynr6ng6vr6krc5773xphvkv2nfxvnschc1bzqhds5k"; system = "com.google.flag"; asd = "com.google.flag"; @@ -43391,7 +44122,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "com.inuoe.jzon" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/jzon/2024-10-12/jzon-v1.1.4.tgz"; + url = "https://beta.quicklisp.org/archive/jzon/2024-10-12/jzon-v1.1.4.tgz"; sha256 = "0z7xpylyk8rakz449rxqpz4hazn91ap2dnf0689iigdvvl3yqz3g"; system = "com.inuoe.jzon"; asd = "com.inuoe.jzon"; @@ -43414,7 +44145,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "com.inuoe.jzon-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/jzon/2024-10-12/jzon-v1.1.4.tgz"; + url = "https://beta.quicklisp.org/archive/jzon/2024-10-12/jzon-v1.1.4.tgz"; sha256 = "0z7xpylyk8rakz449rxqpz4hazn91ap2dnf0689iigdvvl3yqz3g"; system = "com.inuoe.jzon-tests"; asd = "com.inuoe.jzon-tests"; @@ -43440,7 +44171,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "command-line-arguments" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/command-line-arguments/2021-08-07/command-line-arguments-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/command-line-arguments/2021-08-07/command-line-arguments-20210807-git.tgz"; sha256 = "1wbb83b559nfv65rsxz3jrixic9gndk2whj40hhwb0s13rf5a62y"; system = "command-line-arguments"; asd = "command-line-arguments"; @@ -43458,7 +44189,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "common-doc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz"; sha256 = "0bzc4w37cq5mbkd15vxziks6nq58yad04mki4nwy5w6pza7z0faa"; system = "common-doc"; asd = "common-doc"; @@ -43485,7 +44216,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "common-doc-contrib" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz"; sha256 = "0bzc4w37cq5mbkd15vxziks6nq58yad04mki4nwy5w6pza7z0faa"; system = "common-doc-contrib"; asd = "common-doc-contrib"; @@ -43512,7 +44243,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "common-doc-gnuplot" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz"; sha256 = "0bzc4w37cq5mbkd15vxziks6nq58yad04mki4nwy5w6pza7z0faa"; system = "common-doc-gnuplot"; asd = "common-doc-gnuplot"; @@ -43535,7 +44266,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "common-doc-graphviz" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz"; sha256 = "0bzc4w37cq5mbkd15vxziks6nq58yad04mki4nwy5w6pza7z0faa"; system = "common-doc-graphviz"; asd = "common-doc-graphviz"; @@ -43558,7 +44289,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "common-doc-include" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz"; sha256 = "0bzc4w37cq5mbkd15vxziks6nq58yad04mki4nwy5w6pza7z0faa"; system = "common-doc-include"; asd = "common-doc-include"; @@ -43581,7 +44312,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "common-doc-plantuml" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz"; sha256 = "0bzc4w37cq5mbkd15vxziks6nq58yad04mki4nwy5w6pza7z0faa"; system = "common-doc-plantuml"; asd = "common-doc-plantuml"; @@ -43604,7 +44335,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "common-doc-plump" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/common-doc-plump/2016-04-21/common-doc-plump-20160421-git.tgz"; + url = "https://beta.quicklisp.org/archive/common-doc-plump/2016-04-21/common-doc-plump-20160421-git.tgz"; sha256 = "08h7m4c599rf2kz4wkpbj05441ax0vb3bd88a7dw5x57djf765r6"; system = "common-doc-plump"; asd = "common-doc-plump"; @@ -43630,7 +44361,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "common-doc-plump-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/common-doc-plump/2016-04-21/common-doc-plump-20160421-git.tgz"; + url = "https://beta.quicklisp.org/archive/common-doc-plump/2016-04-21/common-doc-plump-20160421-git.tgz"; sha256 = "08h7m4c599rf2kz4wkpbj05441ax0vb3bd88a7dw5x57djf765r6"; system = "common-doc-plump-test"; asd = "common-doc-plump-test"; @@ -43653,7 +44384,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "common-doc-split-paragraphs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz"; sha256 = "0bzc4w37cq5mbkd15vxziks6nq58yad04mki4nwy5w6pza7z0faa"; system = "common-doc-split-paragraphs"; asd = "common-doc-split-paragraphs"; @@ -43676,7 +44407,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "common-doc-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz"; sha256 = "0bzc4w37cq5mbkd15vxziks6nq58yad04mki4nwy5w6pza7z0faa"; system = "common-doc-test"; asd = "common-doc-test"; @@ -43700,7 +44431,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "common-doc-tex" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz"; sha256 = "0bzc4w37cq5mbkd15vxziks6nq58yad04mki4nwy5w6pza7z0faa"; system = "common-doc-tex"; asd = "common-doc-tex"; @@ -43720,7 +44451,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "common-html" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/common-html/2021-08-07/common-html-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/common-html/2021-08-07/common-html-20210807-git.tgz"; sha256 = "1i11w4l95nybz5ibnaxrnrkfhch2s9wynqrg6kx6sl6y47khq1xz"; system = "common-html"; asd = "common-html"; @@ -43745,7 +44476,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "common-html-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/common-html/2021-08-07/common-html-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/common-html/2021-08-07/common-html-20210807-git.tgz"; sha256 = "1i11w4l95nybz5ibnaxrnrkfhch2s9wynqrg6kx6sl6y47khq1xz"; system = "common-html-test"; asd = "common-html-test"; @@ -43764,12 +44495,12 @@ lib.makeScope pkgs.newScope (self: { common-lisp-jupyter = ( build-asdf-system { pname = "common-lisp-jupyter"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "common-lisp-jupyter" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/common-lisp-jupyter/2024-10-12/common-lisp-jupyter-20241012-git.tgz"; - sha256 = "1qbrzv0myxfxq7rzm2y9cm2xymkl982982h2kbsl7d1yd5hrjvl6"; + url = "https://beta.quicklisp.org/archive/common-lisp-jupyter/2025-06-22/common-lisp-jupyter-20250622-git.tgz"; + sha256 = "0xm3a68dn3mlq4gyiqfndf61agh1bj5fp1cqhsscz53zjcnrb2yb"; system = "common-lisp-jupyter"; asd = "common-lisp-jupyter"; } @@ -43791,10 +44522,8 @@ lib.makeScope pkgs.newScope (self: { (getAttr "puri" self) (getAttr "pzmq" self) (getAttr "shasht" self) - (getAttr "static-vectors" self) (getAttr "trivial-do" self) (getAttr "trivial-features" self) - (getAttr "trivial-garbage" self) (getAttr "trivial-mimes" self) ]; meta = { @@ -43805,12 +44534,12 @@ lib.makeScope pkgs.newScope (self: { commondoc-markdown = ( build-asdf-system { pname = "commondoc-markdown"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "commondoc-markdown" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/commondoc-markdown/2024-10-12/commondoc-markdown-20241012-git.tgz"; - sha256 = "12n8yx8jhz8713r63gmrymplm1mfczm7q7a343d13wl6gng1gjs1"; + url = "https://beta.quicklisp.org/archive/commondoc-markdown/2025-06-22/commondoc-markdown-20250622-git.tgz"; + sha256 = "0r9np8lv1p1fkfxapz12x5r5bak555kaf9dkwclv9xq8jbpvqyam"; system = "commondoc-markdown"; asd = "commondoc-markdown"; } @@ -43838,12 +44567,12 @@ lib.makeScope pkgs.newScope (self: { commondoc-markdown-docs = ( build-asdf-system { pname = "commondoc-markdown-docs"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "commondoc-markdown-docs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/commondoc-markdown/2024-10-12/commondoc-markdown-20241012-git.tgz"; - sha256 = "12n8yx8jhz8713r63gmrymplm1mfczm7q7a343d13wl6gng1gjs1"; + url = "https://beta.quicklisp.org/archive/commondoc-markdown/2025-06-22/commondoc-markdown-20250622-git.tgz"; + sha256 = "0r9np8lv1p1fkfxapz12x5r5bak555kaf9dkwclv9xq8jbpvqyam"; system = "commondoc-markdown-docs"; asd = "commondoc-markdown-docs"; } @@ -43860,31 +44589,6 @@ lib.makeScope pkgs.newScope (self: { }; } ); - commondoc-markdown-test = ( - build-asdf-system { - pname = "commondoc-markdown-test"; - version = "20241012-git"; - asds = [ "commondoc-markdown-test" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/commondoc-markdown/2024-10-12/commondoc-markdown-20241012-git.tgz"; - sha256 = "12n8yx8jhz8713r63gmrymplm1mfczm7q7a343d13wl6gng1gjs1"; - system = "commondoc-markdown-test"; - asd = "commondoc-markdown-test"; - } - ); - systems = [ "commondoc-markdown-test" ]; - lispLibs = [ - (getAttr "common-doc" self) - (getAttr "commondoc-markdown" self) - (getAttr "hamcrest" self) - (getAttr "rove" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); commonqt = ( build-asdf-system { pname = "commonqt"; @@ -43892,7 +44596,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "commonqt" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; system = "commonqt"; asd = "commonqt"; @@ -43916,7 +44620,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "comp-set" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz"; sha256 = "1hf3r6pqbnd9vsd1i24qmz928kia72hdgmiafiwb6jw1hmj3r6ga"; system = "comp-set"; asd = "comp-set"; @@ -43936,7 +44640,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "compatible-metaclasses" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/compatible-metaclasses/2020-09-25/compatible-metaclasses_1.0.tgz"; + url = "https://beta.quicklisp.org/archive/compatible-metaclasses/2020-09-25/compatible-metaclasses_1.0.tgz"; sha256 = "17cf74j400cl6sjslfhkv13lir85k705v63mx3dd4y6dl5hvsdh6"; system = "compatible-metaclasses"; asd = "compatible-metaclasses"; @@ -43960,7 +44664,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "compatible-metaclasses_tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/compatible-metaclasses/2020-09-25/compatible-metaclasses_1.0.tgz"; + url = "https://beta.quicklisp.org/archive/compatible-metaclasses/2020-09-25/compatible-metaclasses_1.0.tgz"; sha256 = "17cf74j400cl6sjslfhkv13lir85k705v63mx3dd4y6dl5hvsdh6"; system = "compatible-metaclasses_tests"; asd = "compatible-metaclasses_tests"; @@ -43983,7 +44687,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "compiler-macro-notes" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/compiler-macro-notes/2024-10-12/compiler-macro-notes-v0.3.1.tgz"; + url = "https://beta.quicklisp.org/archive/compiler-macro-notes/2024-10-12/compiler-macro-notes-v0.3.1.tgz"; sha256 = "0pchhvk14fx54p7qq92dnf0g4jnapqr6p2a4za6bhzd8im1d9gad"; system = "compiler-macro-notes"; asd = "compiler-macro-notes"; @@ -44006,7 +44710,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "computable-reals" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/computable-reals/2023-10-21/computable-reals-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/computable-reals/2023-10-21/computable-reals-20231021-git.tgz"; sha256 = "1x8kkdyjil0zzg8fq9b76z12kmfrqwhsxnr6qqnlrg0c8c5bzz9c"; system = "computable-reals"; asd = "computable-reals"; @@ -44022,40 +44726,17 @@ lib.makeScope pkgs.newScope (self: { concrete-syntax-tree = ( build-asdf-system { pname = "concrete-syntax-tree"; - version = "20230618-git"; + version = "20250622-git"; asds = [ "concrete-syntax-tree" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/concrete-syntax-tree/2023-06-18/concrete-syntax-tree-20230618-git.tgz"; - sha256 = "15q9jyqsh2z921li9my8c840cj2ci7k217x5frfiyk0kymkx4rgv"; + url = "https://beta.quicklisp.org/archive/concrete-syntax-tree/2025-06-22/concrete-syntax-tree-20250622-git.tgz"; + sha256 = "1g5iyfn6hly08rngza4bc21yamv9vq699c2zb5ndqahns1r7q5fl"; system = "concrete-syntax-tree"; asd = "concrete-syntax-tree"; } ); systems = [ "concrete-syntax-tree" ]; - lispLibs = [ - (getAttr "concrete-syntax-tree-base" self) - (getAttr "concrete-syntax-tree-lambda-list" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - concrete-syntax-tree-base = ( - build-asdf-system { - pname = "concrete-syntax-tree-base"; - version = "20230618-git"; - asds = [ "concrete-syntax-tree-base" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/concrete-syntax-tree/2023-06-18/concrete-syntax-tree-20230618-git.tgz"; - sha256 = "15q9jyqsh2z921li9my8c840cj2ci7k217x5frfiyk0kymkx4rgv"; - system = "concrete-syntax-tree-base"; - asd = "concrete-syntax-tree-base"; - } - ); - systems = [ "concrete-syntax-tree-base" ]; lispLibs = [ (getAttr "acclimation" self) ]; meta = { hydraPlatforms = [ ]; @@ -44065,12 +44746,12 @@ lib.makeScope pkgs.newScope (self: { concrete-syntax-tree-destructuring = ( build-asdf-system { pname = "concrete-syntax-tree-destructuring"; - version = "20230618-git"; + version = "20250622-git"; asds = [ "concrete-syntax-tree-destructuring" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/concrete-syntax-tree/2023-06-18/concrete-syntax-tree-20230618-git.tgz"; - sha256 = "15q9jyqsh2z921li9my8c840cj2ci7k217x5frfiyk0kymkx4rgv"; + url = "https://beta.quicklisp.org/archive/concrete-syntax-tree/2025-06-22/concrete-syntax-tree-20250622-git.tgz"; + sha256 = "1g5iyfn6hly08rngza4bc21yamv9vq699c2zb5ndqahns1r7q5fl"; system = "concrete-syntax-tree-destructuring"; asd = "concrete-syntax-tree-destructuring"; } @@ -44085,38 +44766,18 @@ lib.makeScope pkgs.newScope (self: { concrete-syntax-tree-lambda-list = ( build-asdf-system { pname = "concrete-syntax-tree-lambda-list"; - version = "20230618-git"; + version = "20250622-git"; asds = [ "concrete-syntax-tree-lambda-list" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/concrete-syntax-tree/2023-06-18/concrete-syntax-tree-20230618-git.tgz"; - sha256 = "15q9jyqsh2z921li9my8c840cj2ci7k217x5frfiyk0kymkx4rgv"; + url = "https://beta.quicklisp.org/archive/concrete-syntax-tree/2025-06-22/concrete-syntax-tree-20250622-git.tgz"; + sha256 = "1g5iyfn6hly08rngza4bc21yamv9vq699c2zb5ndqahns1r7q5fl"; system = "concrete-syntax-tree-lambda-list"; asd = "concrete-syntax-tree-lambda-list"; } ); systems = [ "concrete-syntax-tree-lambda-list" ]; - lispLibs = [ (getAttr "concrete-syntax-tree-base" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - concrete-syntax-tree-lambda-list-test = ( - build-asdf-system { - pname = "concrete-syntax-tree-lambda-list-test"; - version = "20230618-git"; - asds = [ "concrete-syntax-tree-lambda-list-test" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/concrete-syntax-tree/2023-06-18/concrete-syntax-tree-20230618-git.tgz"; - sha256 = "15q9jyqsh2z921li9my8c840cj2ci7k217x5frfiyk0kymkx4rgv"; - system = "concrete-syntax-tree-lambda-list-test"; - asd = "concrete-syntax-tree-lambda-list-test"; - } - ); - systems = [ "concrete-syntax-tree-lambda-list-test" ]; - lispLibs = [ (getAttr "concrete-syntax-tree-lambda-list" self) ]; + lispLibs = [ (getAttr "concrete-syntax-tree" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -44125,12 +44786,12 @@ lib.makeScope pkgs.newScope (self: { concrete-syntax-tree-source-info = ( build-asdf-system { pname = "concrete-syntax-tree-source-info"; - version = "20230618-git"; + version = "20250622-git"; asds = [ "concrete-syntax-tree-source-info" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/concrete-syntax-tree/2023-06-18/concrete-syntax-tree-20230618-git.tgz"; - sha256 = "15q9jyqsh2z921li9my8c840cj2ci7k217x5frfiyk0kymkx4rgv"; + url = "https://beta.quicklisp.org/archive/concrete-syntax-tree/2025-06-22/concrete-syntax-tree-20250622-git.tgz"; + sha256 = "1g5iyfn6hly08rngza4bc21yamv9vq699c2zb5ndqahns1r7q5fl"; system = "concrete-syntax-tree-source-info"; asd = "concrete-syntax-tree-source-info"; } @@ -44145,12 +44806,12 @@ lib.makeScope pkgs.newScope (self: { conditional-commands = ( build-asdf-system { pname = "conditional-commands"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "conditional-commands" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "conditional-commands"; asd = "conditional-commands"; } @@ -44169,7 +44830,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "conf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/conf/2019-12-27/conf-20191227-git.tgz"; + url = "https://beta.quicklisp.org/archive/conf/2019-12-27/conf-20191227-git.tgz"; sha256 = "0mif91gb6yqg2qrzd2p6n83w9injikm5gggzv2mgxkiyzmr5gnay"; system = "conf"; asd = "conf"; @@ -44189,7 +44850,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "configuration.options" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz"; sha256 = "1wh07llx4k66wwabxajdc6cy0sdxbrydxi51gs7hrsyrp9gvym9g"; system = "configuration.options"; asd = "configuration.options"; @@ -44220,7 +44881,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "configuration.options-and-mop" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz"; sha256 = "1wh07llx4k66wwabxajdc6cy0sdxbrydxi51gs7hrsyrp9gvym9g"; system = "configuration.options-and-mop"; asd = "configuration.options-and-mop"; @@ -44245,7 +44906,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "configuration.options-and-puri" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz"; sha256 = "1wh07llx4k66wwabxajdc6cy0sdxbrydxi51gs7hrsyrp9gvym9g"; system = "configuration.options-and-puri"; asd = "configuration.options-and-puri"; @@ -44270,7 +44931,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "configuration.options-and-quri" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz"; sha256 = "1wh07llx4k66wwabxajdc6cy0sdxbrydxi51gs7hrsyrp9gvym9g"; system = "configuration.options-and-quri"; asd = "configuration.options-and-quri"; @@ -44295,7 +44956,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "configuration.options-and-service-provider" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz"; sha256 = "1wh07llx4k66wwabxajdc6cy0sdxbrydxi51gs7hrsyrp9gvym9g"; system = "configuration.options-and-service-provider"; asd = "configuration.options-and-service-provider"; @@ -44323,7 +44984,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "configuration.options-syntax-ini" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz"; sha256 = "1wh07llx4k66wwabxajdc6cy0sdxbrydxi51gs7hrsyrp9gvym9g"; system = "configuration.options-syntax-ini"; asd = "configuration.options-syntax-ini"; @@ -44348,7 +45009,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "configuration.options-syntax-xml" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz"; sha256 = "1wh07llx4k66wwabxajdc6cy0sdxbrydxi51gs7hrsyrp9gvym9g"; system = "configuration.options-syntax-xml"; asd = "configuration.options-syntax-xml"; @@ -44373,7 +45034,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "conium" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/conium/2021-06-30/conium-20210630-git.tgz"; + url = "https://beta.quicklisp.org/archive/conium/2021-06-30/conium-20210630-git.tgz"; sha256 = "0y31za8xr8734p2pf8mrw1jd1fksh2d4y1p12wwjyn8hxxsvsx1w"; system = "conium"; asd = "conium"; @@ -44389,12 +45050,12 @@ lib.makeScope pkgs.newScope (self: { consfigurator = ( build-asdf-system { pname = "consfigurator"; - version = "v1.4.4"; + version = "v1.5.2"; asds = [ "consfigurator" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/consfigurator/2024-10-12/consfigurator-v1.4.4.tgz"; - sha256 = "1f4q5w58phj5a6i2fj712ggz2p8b5m4v77qzsvbb3xmy2vhppvv0"; + url = "https://beta.quicklisp.org/archive/consfigurator/2025-06-22/consfigurator-v1.5.2.tgz"; + sha256 = "18v87zky9rlrp0xhg1q3ydd5v18c4zx37kaxiw4swlxpf2br6gfa"; system = "consfigurator"; asd = "consfigurator"; } @@ -44430,7 +45091,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "consix" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/consix/2020-12-20/consix-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/consix/2020-12-20/consix-20201220-git.tgz"; sha256 = "0zpcaxgq9jx0baj5sid8rnzq8ygsmd8yzb0x37nkaiwa67x5jjck"; system = "consix"; asd = "consix"; @@ -44455,7 +45116,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "constantfold" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/constantfold/2019-12-27/constantfold-20191227-git.tgz"; + url = "https://beta.quicklisp.org/archive/constantfold/2019-12-27/constantfold-20191227-git.tgz"; sha256 = "153h0569z6bff1qbad0bdssplwwny75l7ilqwcfqfdvzsxf9jh06"; system = "constantfold"; asd = "constantfold"; @@ -44480,7 +45141,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "constantfold.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/constantfold/2019-12-27/constantfold-20191227-git.tgz"; + url = "https://beta.quicklisp.org/archive/constantfold/2019-12-27/constantfold-20191227-git.tgz"; sha256 = "153h0569z6bff1qbad0bdssplwwny75l7ilqwcfqfdvzsxf9jh06"; system = "constantfold.test"; asd = "constantfold.test"; @@ -44503,7 +45164,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "context-lite" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/context-lite/2022-03-31/context-lite-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/context-lite/2022-03-31/context-lite-20220331-git.tgz"; sha256 = "16hmid3adimn10c0y4p6hg7n42al2qgsy7wxlpargk0xbn4h3km4"; system = "context-lite"; asd = "context-lite"; @@ -44523,7 +45184,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "contextl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/contextl/2024-10-12/contextl-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/contextl/2024-10-12/contextl-20241012-git.tgz"; sha256 = "1jsa5wyjzzfw9pii3d6x20mh8ijnpb291g3i0y2ccj0x8z3xfyyk"; system = "contextl"; asd = "contextl"; @@ -44546,7 +45207,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "control" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; system = "control"; asd = "control"; @@ -44566,12 +45227,12 @@ lib.makeScope pkgs.newScope (self: { copy-directory = ( build-asdf-system { pname = "copy-directory"; - version = "20160628-git"; + version = "20250622-git"; asds = [ "copy-directory" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/copy-directory/2016-06-28/copy-directory-20160628-git.tgz"; - sha256 = "19wvzb046lcyifhx26ydzf7ngfa52n64nyx76k3lh02x7ahhpc93"; + url = "https://beta.quicklisp.org/archive/copy-directory/2025-06-22/copy-directory-20250622-git.tgz"; + sha256 = "0f4sidgj71ksibjzsrl33348dhgg4vnmm5pj6kr92acmvsdhhhap"; system = "copy-directory"; asd = "copy-directory"; } @@ -44589,12 +45250,12 @@ lib.makeScope pkgs.newScope (self: { copy-directory-test = ( build-asdf-system { pname = "copy-directory-test"; - version = "20160628-git"; + version = "20250622-git"; asds = [ "copy-directory-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/copy-directory/2016-06-28/copy-directory-20160628-git.tgz"; - sha256 = "19wvzb046lcyifhx26ydzf7ngfa52n64nyx76k3lh02x7ahhpc93"; + url = "https://beta.quicklisp.org/archive/copy-directory/2025-06-22/copy-directory-20250622-git.tgz"; + sha256 = "0f4sidgj71ksibjzsrl33348dhgg4vnmm5pj6kr92acmvsdhhhap"; system = "copy-directory-test"; asd = "copy-directory-test"; } @@ -44616,7 +45277,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "core-reader" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/core-reader/2022-07-07/core-reader-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/core-reader/2022-07-07/core-reader-20220707-git.tgz"; sha256 = "1f2cm44r3pnahgx1b3c3psf6myaliwsrvfcgz8c9ydqi5qlx49gb"; system = "core-reader"; asd = "core-reader"; @@ -44636,7 +45297,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "core-reader.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/core-reader/2022-07-07/core-reader-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/core-reader/2022-07-07/core-reader-20220707-git.tgz"; sha256 = "1f2cm44r3pnahgx1b3c3psf6myaliwsrvfcgz8c9ydqi5qlx49gb"; system = "core-reader.test"; asd = "core-reader.test"; @@ -44652,6 +45313,30 @@ lib.makeScope pkgs.newScope (self: { }; } ); + cosmo-pagination = ( + build-asdf-system { + pname = "cosmo-pagination"; + version = "20250622-git"; + asds = [ "cosmo-pagination" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cosmo-pagination/2025-06-22/cosmo-pagination-20250622-git.tgz"; + sha256 = "13n9p62n26d637jz5cp4w0x9g3h1baar584f98sx22hw42n50x3d"; + system = "cosmo-pagination"; + asd = "cosmo-pagination"; + } + ); + systems = [ "cosmo-pagination" ]; + lispLibs = [ + (getAttr "log4cl" self) + (getAttr "serapeum" self) + (getAttr "str" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); cover = ( build-asdf-system { pname = "cover"; @@ -44659,7 +45344,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cover" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cover/2023-06-18/cover-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/cover/2023-06-18/cover-20230618-git.tgz"; sha256 = "0152zzdszhiblzm3a80x8bnalip7gnzyvvwnlswsnnlb509nby89"; system = "cover"; asd = "cover"; @@ -44679,7 +45364,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cqlcl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cqlcl/2014-11-06/cqlcl-20141106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cqlcl/2014-11-06/cqlcl-20141106-git.tgz"; sha256 = "0ppdsrrf2hz0s4y02a2p5mgms92znrj7hz7x9j6azppfkal25zid"; system = "cqlcl"; asd = "cqlcl"; @@ -44709,7 +45394,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cqlcl-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cqlcl/2014-11-06/cqlcl-20141106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cqlcl/2014-11-06/cqlcl-20141106-git.tgz"; sha256 = "0ppdsrrf2hz0s4y02a2p5mgms92znrj7hz7x9j6azppfkal25zid"; system = "cqlcl-test"; asd = "cqlcl"; @@ -44735,7 +45420,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "crane" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/crane/2016-02-08/crane-20160208-git.tgz"; + url = "https://beta.quicklisp.org/archive/crane/2016-02-08/crane-20160208-git.tgz"; sha256 = "1wai4h7vz5i0ld1fnnbcmpz5d67dmykyxx0ay0fkclkwvpj7gh5n"; system = "crane"; asd = "crane"; @@ -44764,7 +45449,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "crane-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/crane/2016-02-08/crane-20160208-git.tgz"; + url = "https://beta.quicklisp.org/archive/crane/2016-02-08/crane-20160208-git.tgz"; sha256 = "1wai4h7vz5i0ld1fnnbcmpz5d67dmykyxx0ay0fkclkwvpj7gh5n"; system = "crane-test"; asd = "crane-test"; @@ -44787,7 +45472,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cricket" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cricket/2022-07-07/cricket-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cricket/2022-07-07/cricket-20220707-git.tgz"; sha256 = "0wdpzdmalbnfjmd9s7yalris4i1vvc2klnhfl8g0h2ahq0mqv9p9"; system = "cricket"; asd = "cricket"; @@ -44814,7 +45499,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cricket.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cricket/2022-07-07/cricket-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cricket/2022-07-07/cricket-20220707-git.tgz"; sha256 = "0wdpzdmalbnfjmd9s7yalris4i1vvc2klnhfl8g0h2ahq0mqv9p9"; system = "cricket.test"; asd = "cricket.test"; @@ -44840,7 +45525,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "croatoan" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/croatoan/2024-10-12/croatoan-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/croatoan/2024-10-12/croatoan-20241012-git.tgz"; sha256 = "04776x4i8inxs8n4mgy9xf0q39bzv4mfz4cl880sxwk6mnhwnn4c"; system = "croatoan"; asd = "croatoan"; @@ -44864,7 +45549,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "croatoan-ncurses" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/croatoan/2024-10-12/croatoan-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/croatoan/2024-10-12/croatoan-20241012-git.tgz"; sha256 = "04776x4i8inxs8n4mgy9xf0q39bzv4mfz4cl880sxwk6mnhwnn4c"; system = "croatoan-ncurses"; asd = "croatoan-ncurses"; @@ -44884,7 +45569,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "croatoan-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/croatoan/2024-10-12/croatoan-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/croatoan/2024-10-12/croatoan-20241012-git.tgz"; sha256 = "04776x4i8inxs8n4mgy9xf0q39bzv4mfz4cl880sxwk6mnhwnn4c"; system = "croatoan-test"; asd = "croatoan-test"; @@ -44904,7 +45589,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "crud" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; system = "crud"; asd = "crud"; @@ -44930,7 +45615,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "crypt" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-crypt/2012-05-20/cl-crypt-20120520-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-crypt/2012-05-20/cl-crypt-20120520-git.tgz"; sha256 = "02fc3aqfbbwjpz79a4mwffv33pnmmknpkmd1r8v9mkn9a6c1ssmh"; system = "crypt"; asd = "crypt"; @@ -44946,12 +45631,12 @@ lib.makeScope pkgs.newScope (self: { crypto-shortcuts = ( build-asdf-system { pname = "crypto-shortcuts"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "crypto-shortcuts" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/crypto-shortcuts/2023-10-21/crypto-shortcuts-20231021-git.tgz"; - sha256 = "0ghih34xlf9vgbh8arsqjbgf8iymvs5s0ys0n2bm73b1z0632ygr"; + url = "https://beta.quicklisp.org/archive/crypto-shortcuts/2025-06-22/crypto-shortcuts-20250622-git.tgz"; + sha256 = "1ah1jw2vf3sz2ns835rbv8jm2sc821icmdj9qjw06h2x5lspw7xs"; system = "crypto-shortcuts"; asd = "crypto-shortcuts"; } @@ -44975,7 +45660,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cserial-port" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cserial-port/2023-02-14/cserial-port-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cserial-port/2023-02-14/cserial-port-20230214-git.tgz"; sha256 = "0l38qh66g2iba7kjw6fml3q55ax6vkk0khbwrsvkglwhpan79fsm"; system = "cserial-port"; asd = "cserial-port"; @@ -45001,7 +45686,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "css-lite" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/css-lite/2023-06-18/css-lite-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/css-lite/2023-06-18/css-lite-20230618-git.tgz"; sha256 = "1pvvwd6ysdc7m5945vkwdbq4jjmcszmkxp9jhgi0lba23si07dp5"; system = "css-lite"; asd = "css-lite"; @@ -45019,7 +45704,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "css-selectors" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz"; + url = "https://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz"; sha256 = "0x0a5jq4kdw8zrkljmhijcbvjj09iyrwwgryc6kvzl5g7wzg2xr6"; system = "css-selectors"; asd = "css-selectors"; @@ -45046,7 +45731,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "css-selectors-simple-tree" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz"; + url = "https://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz"; sha256 = "0x0a5jq4kdw8zrkljmhijcbvjj09iyrwwgryc6kvzl5g7wzg2xr6"; system = "css-selectors-simple-tree"; asd = "css-selectors-simple-tree"; @@ -45067,7 +45752,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "css-selectors-stp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz"; + url = "https://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz"; sha256 = "0x0a5jq4kdw8zrkljmhijcbvjj09iyrwwgryc6kvzl5g7wzg2xr6"; system = "css-selectors-stp"; asd = "css-selectors-stp"; @@ -45088,7 +45773,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "css-selectors-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz"; + url = "https://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz"; sha256 = "0x0a5jq4kdw8zrkljmhijcbvjj09iyrwwgryc6kvzl5g7wzg2xr6"; system = "css-selectors-test"; asd = "css-selectors"; @@ -45112,7 +45797,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "csv" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/csv/2019-07-10/csv-20190710-git.tgz"; + url = "https://beta.quicklisp.org/archive/csv/2019-07-10/csv-20190710-git.tgz"; sha256 = "0jykv91w7anisac2aip38vnj7ywi567rcp4n8nv3lz5qb7g1dpy4"; system = "csv"; asd = "csv"; @@ -45132,7 +45817,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "csv-parser" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/csv-parser/2014-07-13/csv-parser-20140713-git.tgz"; + url = "https://beta.quicklisp.org/archive/csv-parser/2014-07-13/csv-parser-20140713-git.tgz"; sha256 = "0pcp709dwxi3p2vrmx5qiy571pybfs1hpv9z8g4i1ig2l4mc3djh"; system = "csv-parser"; asd = "csv-parser"; @@ -45152,7 +45837,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "csv-validator" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/csv-validator/2023-06-18/csv-validator-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/csv-validator/2023-06-18/csv-validator-20230618-git.tgz"; sha256 = "14cwjc43q05a1gdl0m79sps59605dfrhd4mjhcxh7gxyj8x7x1k2"; system = "csv-validator"; asd = "csv-validator"; @@ -45176,7 +45861,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "csv-validator-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/csv-validator/2023-06-18/csv-validator-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/csv-validator/2023-06-18/csv-validator-20230618-git.tgz"; sha256 = "14cwjc43q05a1gdl0m79sps59605dfrhd4mjhcxh7gxyj8x7x1k2"; system = "csv-validator-tests"; asd = "csv-validator-tests"; @@ -45195,12 +45880,12 @@ lib.makeScope pkgs.newScope (self: { ctype = ( build-asdf-system { pname = "ctype"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "ctype" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ctype/2024-10-12/ctype-20241012-git.tgz"; - sha256 = "0qnssrjssb7258i3a1s1bv3z6plx4pzrkg65i8an25bvwrjwpvqv"; + url = "https://beta.quicklisp.org/archive/ctype/2025-06-22/ctype-20250622-git.tgz"; + sha256 = "1l1qz49584l8kss3l1lp5k2brw4xs4xqxhnjzq9fnnwbmy8253nq"; system = "ctype"; asd = "ctype"; } @@ -45219,7 +45904,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cubic-bezier" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cubic-bezier/2022-07-07/cubic-bezier-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cubic-bezier/2022-07-07/cubic-bezier-20220707-git.tgz"; sha256 = "08byf1pw2s5sz97bk0sp2a6gdx5dkankbbg14azafd1k0vfh7vcr"; system = "cubic-bezier"; asd = "cubic-bezier"; @@ -45242,7 +45927,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cue-parser" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cue-parser/2018-02-28/cue-parser-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/cue-parser/2018-02-28/cue-parser-20180228-git.tgz"; sha256 = "1zl3a02b68yywchd1aldls07b4qgrf08xpb4xiaaw8njk2qa0lz1"; system = "cue-parser"; asd = "cue-parser"; @@ -45265,7 +45950,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "curly" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/curly/2012-04-07/curly-20120407-git.tgz"; + url = "https://beta.quicklisp.org/archive/curly/2012-04-07/curly-20120407-git.tgz"; sha256 = "04gpkq6hd7wvvny0p3lgn87bfalswqc67sbg4p35j52w51mqd8vf"; system = "curly"; asd = "curly"; @@ -45285,7 +45970,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "curly.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/curly/2012-04-07/curly-20120407-git.tgz"; + url = "https://beta.quicklisp.org/archive/curly/2012-04-07/curly-20120407-git.tgz"; sha256 = "04gpkq6hd7wvvny0p3lgn87bfalswqc67sbg4p35j52w51mqd8vf"; system = "curly.test"; asd = "curly"; @@ -45308,7 +45993,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "curry-compose-reader-macros" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/curry-compose-reader-macros/2020-12-20/curry-compose-reader-macros-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/curry-compose-reader-macros/2020-12-20/curry-compose-reader-macros-20201220-git.tgz"; sha256 = "0j4qfwpw4ykf5npiln54w7jcnj46p7xf9d4p3jpx4a67fdkrlxd1"; system = "curry-compose-reader-macros"; asd = "curry-compose-reader-macros"; @@ -45327,12 +46012,12 @@ lib.makeScope pkgs.newScope (self: { cxml = ( build-asdf-system { pname = "cxml"; - version = "20200610-git"; + version = "20250622-git"; asds = [ "cxml" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cxml/2020-06-10/cxml-20200610-git.tgz"; - sha256 = "18fls3bx7vmnxfa6qara8fxp316d8kb3izar0kysvqg6l0a45a51"; + url = "https://beta.quicklisp.org/archive/cxml/2025-06-22/cxml-20250622-git.tgz"; + sha256 = "1w1yhiabcycf614dhrgz3kz2zgawhc1p7m09gqppc1wsaznwc2bx"; system = "cxml"; asd = "cxml"; } @@ -45349,12 +46034,12 @@ lib.makeScope pkgs.newScope (self: { cxml-dom = ( build-asdf-system { pname = "cxml-dom"; - version = "20200610-git"; + version = "20250622-git"; asds = [ "cxml-dom" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cxml/2020-06-10/cxml-20200610-git.tgz"; - sha256 = "18fls3bx7vmnxfa6qara8fxp316d8kb3izar0kysvqg6l0a45a51"; + url = "https://beta.quicklisp.org/archive/cxml/2025-06-22/cxml-20250622-git.tgz"; + sha256 = "1w1yhiabcycf614dhrgz3kz2zgawhc1p7m09gqppc1wsaznwc2bx"; system = "cxml-dom"; asd = "cxml-dom"; } @@ -45373,12 +46058,12 @@ lib.makeScope pkgs.newScope (self: { cxml-klacks = ( build-asdf-system { pname = "cxml-klacks"; - version = "20200610-git"; + version = "20250622-git"; asds = [ "cxml-klacks" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cxml/2020-06-10/cxml-20200610-git.tgz"; - sha256 = "18fls3bx7vmnxfa6qara8fxp316d8kb3izar0kysvqg6l0a45a51"; + url = "https://beta.quicklisp.org/archive/cxml/2025-06-22/cxml-20250622-git.tgz"; + sha256 = "1w1yhiabcycf614dhrgz3kz2zgawhc1p7m09gqppc1wsaznwc2bx"; system = "cxml-klacks"; asd = "cxml-klacks"; } @@ -45401,7 +46086,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cxml-rng" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cxml-rng/2019-07-10/cxml-rng-20190710-git.tgz"; + url = "https://beta.quicklisp.org/archive/cxml-rng/2019-07-10/cxml-rng-20190710-git.tgz"; sha256 = "0pjb5268spiwq6b0cly8nfajr6rsh2wf6si646bzzjrxbgs51sxa"; system = "cxml-rng"; asd = "cxml-rng"; @@ -45427,7 +46112,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cxml-rpc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cxml-rpc/2012-10-13/cxml-rpc-20121013-git.tgz"; + url = "https://beta.quicklisp.org/archive/cxml-rpc/2012-10-13/cxml-rpc-20121013-git.tgz"; sha256 = "1ihd8rg0shy7nykqcbvvx5px7sw8wr1nwz70jdrh6ibq74yr8flh"; system = "cxml-rpc"; asd = "cxml-rpc"; @@ -45453,7 +46138,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cxml-stp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cxml-stp/2020-03-25/cxml-stp-20200325-git.tgz"; + url = "https://beta.quicklisp.org/archive/cxml-stp/2020-03-25/cxml-stp-20200325-git.tgz"; sha256 = "01yfxxvb144i2mlp06fxx410mf3phxz5qaqvk90pp4dzdl883knv"; system = "cxml-stp"; asd = "cxml-stp"; @@ -45471,12 +46156,12 @@ lib.makeScope pkgs.newScope (self: { cxml-test = ( build-asdf-system { pname = "cxml-test"; - version = "20200610-git"; + version = "20250622-git"; asds = [ "cxml-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cxml/2020-06-10/cxml-20200610-git.tgz"; - sha256 = "18fls3bx7vmnxfa6qara8fxp316d8kb3izar0kysvqg6l0a45a51"; + url = "https://beta.quicklisp.org/archive/cxml/2025-06-22/cxml-20250622-git.tgz"; + sha256 = "1w1yhiabcycf614dhrgz3kz2zgawhc1p7m09gqppc1wsaznwc2bx"; system = "cxml-test"; asd = "cxml-test"; } @@ -45499,7 +46184,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cxx" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cxx/2023-02-14/cl-cxx-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cxx/2023-02-14/cl-cxx-20230214-git.tgz"; sha256 = "08jh7ajgfdr3cqla02c4d2y06y0imkky5d4mwnlph01nczzf85cy"; system = "cxx"; asd = "cxx"; @@ -45522,7 +46207,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cxx-jit" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cxx-jit/2024-10-12/cl-cxx-jit-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cxx-jit/2024-10-12/cl-cxx-jit-20241012-git.tgz"; sha256 = "1xnhkhynikqs61s488jjzklbvwb46yxqx3zi98ifszj4r8ndi3ym"; system = "cxx-jit"; asd = "cxx-jit"; @@ -45545,7 +46230,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cxx-jit-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cxx-jit/2024-10-12/cl-cxx-jit-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cxx-jit/2024-10-12/cl-cxx-jit-20241012-git.tgz"; sha256 = "1xnhkhynikqs61s488jjzklbvwb46yxqx3zi98ifszj4r8ndi3ym"; system = "cxx-jit-test"; asd = "cxx-jit-test"; @@ -45568,7 +46253,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cxx-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cxx/2023-02-14/cl-cxx-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cxx/2023-02-14/cl-cxx-20230214-git.tgz"; sha256 = "08jh7ajgfdr3cqla02c4d2y06y0imkky5d4mwnlph01nczzf85cy"; system = "cxx-test"; asd = "cxx-test"; @@ -45592,7 +46277,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "cytoscape-clj" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cytoscape-clj/2024-10-12/cytoscape-clj-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cytoscape-clj/2024-10-12/cytoscape-clj-20241012-git.tgz"; sha256 = "0kyjgffm8nlvz75dbyz4fp1v8sr7j2bd7axxyn226s30gwzhihck"; system = "cytoscape-clj"; asd = "cytoscape-clj"; @@ -45615,7 +46300,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "daemon" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/daemon/2017-04-03/daemon-20170403-git.tgz"; + url = "https://beta.quicklisp.org/archive/daemon/2017-04-03/daemon-20170403-git.tgz"; sha256 = "1kdxfnhh9fz34j8qs7pn7mwjz3v33q4v9nh0hqkyzraq5xs2j3f4"; system = "daemon"; asd = "daemon"; @@ -45635,7 +46320,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "damn-fast-priority-queue" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/damn-fast-priority-queue/2024-10-12/damn-fast-priority-queue-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/damn-fast-priority-queue/2024-10-12/damn-fast-priority-queue-20241012-git.tgz"; sha256 = "1mbigpgi7qbqvpj59l1f7p2qcg00ybvqzdca1j1b9hx62h224ndw"; system = "damn-fast-priority-queue"; asd = "damn-fast-priority-queue"; @@ -45655,7 +46340,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "damn-fast-stable-priority-queue" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/damn-fast-priority-queue/2024-10-12/damn-fast-priority-queue-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/damn-fast-priority-queue/2024-10-12/damn-fast-priority-queue-20241012-git.tgz"; sha256 = "1mbigpgi7qbqvpj59l1f7p2qcg00ybvqzdca1j1b9hx62h224ndw"; system = "damn-fast-stable-priority-queue"; asd = "damn-fast-stable-priority-queue"; @@ -45675,7 +46360,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "darts.lib.email-address" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dartsclemailaddress/2016-04-21/dartsclemailaddress-quicklisp-release-48464635-git.tgz"; + url = "https://beta.quicklisp.org/archive/dartsclemailaddress/2016-04-21/dartsclemailaddress-quicklisp-release-48464635-git.tgz"; sha256 = "15155nqi9q7ilaf14p4yi4iga8203rl7fn9v2iaxcfm18gsvqcjd"; system = "darts.lib.email-address"; asd = "darts.lib.email-address"; @@ -45695,7 +46380,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "darts.lib.email-address-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dartsclemailaddress/2016-04-21/dartsclemailaddress-quicklisp-release-48464635-git.tgz"; + url = "https://beta.quicklisp.org/archive/dartsclemailaddress/2016-04-21/dartsclemailaddress-quicklisp-release-48464635-git.tgz"; sha256 = "15155nqi9q7ilaf14p4yi4iga8203rl7fn9v2iaxcfm18gsvqcjd"; system = "darts.lib.email-address-test"; asd = "darts.lib.email-address-test"; @@ -45718,7 +46403,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "darts.lib.hashtree-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dartsclhashtree/2023-10-21/dartsclhashtree-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/dartsclhashtree/2023-10-21/dartsclhashtree-20231021-git.tgz"; sha256 = "1kbxk7vnpv9zy6pm004cyyp9mbb4n845pfdv4wxngaj96ndi5v6j"; system = "darts.lib.hashtree-test"; asd = "darts.lib.hashtree-test"; @@ -45742,7 +46427,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "darts.lib.hashtrie" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dartsclhashtree/2023-10-21/dartsclhashtree-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/dartsclhashtree/2023-10-21/dartsclhashtree-20231021-git.tgz"; sha256 = "1kbxk7vnpv9zy6pm004cyyp9mbb4n845pfdv4wxngaj96ndi5v6j"; system = "darts.lib.hashtrie"; asd = "darts.lib.hashtrie"; @@ -45762,7 +46447,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "darts.lib.message-pack" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dartsclmessagepack/2020-03-25/dartsclmessagepack-20200325-git.tgz"; + url = "https://beta.quicklisp.org/archive/dartsclmessagepack/2020-03-25/dartsclmessagepack-20200325-git.tgz"; sha256 = "0i9jnvq6dp5zya1ijj3z7s10803jk8rb4nrjrzcgcfhkczd5si6y"; system = "darts.lib.message-pack"; asd = "darts.lib.message-pack"; @@ -45785,7 +46470,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "darts.lib.message-pack-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dartsclmessagepack/2020-03-25/dartsclmessagepack-20200325-git.tgz"; + url = "https://beta.quicklisp.org/archive/dartsclmessagepack/2020-03-25/dartsclmessagepack-20200325-git.tgz"; sha256 = "0i9jnvq6dp5zya1ijj3z7s10803jk8rb4nrjrzcgcfhkczd5si6y"; system = "darts.lib.message-pack-test"; asd = "darts.lib.message-pack-test"; @@ -45809,7 +46494,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "darts.lib.sequence-metrics" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dartsclsequencemetrics/2013-03-12/dartsclsequencemetrics-20130312-git.tgz"; + url = "https://beta.quicklisp.org/archive/dartsclsequencemetrics/2013-03-12/dartsclsequencemetrics-20130312-git.tgz"; sha256 = "1x99gj5dfgiaraawx1nd157g5ajygfxz47cz8jgi1fh52fp1p969"; system = "darts.lib.sequence-metrics"; asd = "darts.lib.sequence-metrics"; @@ -45829,7 +46514,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "darts.lib.tools" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dartscltools/2020-12-20/dartscltools-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/dartscltools/2020-12-20/dartscltools-20201220-git.tgz"; sha256 = "0mbz7ak03qsw41fgybdw4mbibr656y9xl9bfgr2rmkdkgxbicys9"; system = "darts.lib.tools"; asd = "darts.lib.tools"; @@ -45849,7 +46534,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "darts.lib.tools.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dartscltools/2020-12-20/dartscltools-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/dartscltools/2020-12-20/dartscltools-20201220-git.tgz"; sha256 = "0mbz7ak03qsw41fgybdw4mbibr656y9xl9bfgr2rmkdkgxbicys9"; system = "darts.lib.tools.test"; asd = "darts.lib.tools.test"; @@ -45873,7 +46558,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "darts.lib.uuid" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dartscluuid/2024-10-12/dartscluuid-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/dartscluuid/2024-10-12/dartscluuid-20241012-git.tgz"; sha256 = "17i2icz6k6vb5mp95rsjr8ldzhjjlcn7dyylvxjrccbxbrblnnsl"; system = "darts.lib.uuid"; asd = "darts.lib.uuid"; @@ -45897,7 +46582,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "darts.lib.uuid-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dartscluuid/2024-10-12/dartscluuid-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/dartscluuid/2024-10-12/dartscluuid-20241012-git.tgz"; sha256 = "17i2icz6k6vb5mp95rsjr8ldzhjjlcn7dyylvxjrccbxbrblnnsl"; system = "darts.lib.uuid-test"; asd = "darts.lib.uuid-test"; @@ -45920,7 +46605,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "darts.lib.wbtree" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dartsclhashtree/2023-10-21/dartsclhashtree-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/dartsclhashtree/2023-10-21/dartsclhashtree-20231021-git.tgz"; sha256 = "1kbxk7vnpv9zy6pm004cyyp9mbb4n845pfdv4wxngaj96ndi5v6j"; system = "darts.lib.wbtree"; asd = "darts.lib.wbtree"; @@ -45940,7 +46625,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "data-format-validation" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-data-format-validation/2014-07-13/cl-data-format-validation-20140713-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-data-format-validation/2014-07-13/cl-data-format-validation-20140713-git.tgz"; sha256 = "0zmk47xmicyqvp1impn8kgh5373ysmx3gfpqcvbi9r31qsir2nqa"; system = "data-format-validation"; asd = "data-format-validation"; @@ -45956,12 +46641,12 @@ lib.makeScope pkgs.newScope (self: { data-frame = ( build-asdf-system { pname = "data-frame"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "data-frame" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/data-frame/2024-10-12/data-frame-20241012-git.tgz"; - sha256 = "1sqyvb6hscz070d5ap5v5yvql4nx69c7jkp29za5dj84rsvbckcp"; + url = "https://beta.quicklisp.org/archive/data-frame/2025-06-22/data-frame-20250622-git.tgz"; + sha256 = "1xbh1bicwlqn5kfj6my869ngx1f5x4xrb91hc7rgbz3bmsg19qpr"; system = "data-frame"; asd = "data-frame"; } @@ -45990,7 +46675,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "data-lens" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/data-lens/2024-10-12/data-lens-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/data-lens/2024-10-12/data-lens-20241012-git.tgz"; sha256 = "1bark9r3br5ndcbkiagq891gn82xdiy8hrgzp72656yyadsrid5i"; system = "data-lens"; asd = "data-lens"; @@ -46013,7 +46698,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "data-lens+fset" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/data-lens/2024-10-12/data-lens-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/data-lens/2024-10-12/data-lens-20241012-git.tgz"; sha256 = "1bark9r3br5ndcbkiagq891gn82xdiy8hrgzp72656yyadsrid5i"; system = "data-lens+fset"; asd = "data-lens+fset"; @@ -46037,7 +46722,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "data-sift" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/data-sift/2013-01-28/data-sift-20130128-git.tgz"; + url = "https://beta.quicklisp.org/archive/data-sift/2013-01-28/data-sift-20130128-git.tgz"; sha256 = "1v7gf0x4ibjzp0c56n9m77hxdgwcm9356zlk5n4l3fx4i0hj6146"; system = "data-sift"; asd = "data-sift"; @@ -46062,7 +46747,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "data-sift-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/data-sift/2013-01-28/data-sift-20130128-git.tgz"; + url = "https://beta.quicklisp.org/archive/data-sift/2013-01-28/data-sift-20130128-git.tgz"; sha256 = "1v7gf0x4ibjzp0c56n9m77hxdgwcm9356zlk5n4l3fx4i0hj6146"; system = "data-sift-test"; asd = "data-sift"; @@ -46085,7 +46770,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "data-table" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/data-table/2023-10-21/data-table-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/data-table/2023-10-21/data-table-20231021-git.tgz"; sha256 = "1x64s3r2p28wgx7ffm205i90am2azfqkl6zlkrnjhppp82xan8yd"; system = "data-table"; asd = "data-table"; @@ -46108,7 +46793,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "data-table-clsql" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/data-table/2023-10-21/data-table-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/data-table/2023-10-21/data-table-20231021-git.tgz"; sha256 = "1x64s3r2p28wgx7ffm205i90am2azfqkl6zlkrnjhppp82xan8yd"; system = "data-table-clsql"; asd = "data-table-clsql"; @@ -46134,7 +46819,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "data-table-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/data-table/2023-10-21/data-table-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/data-table/2023-10-21/data-table-20231021-git.tgz"; sha256 = "1x64s3r2p28wgx7ffm205i90am2azfqkl6zlkrnjhppp82xan8yd"; system = "data-table-test"; asd = "data-table"; @@ -46157,7 +46842,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "database-migrations" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/database-migrations/2023-02-14/database-migrations-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/database-migrations/2023-02-14/database-migrations-20230214-git.tgz"; sha256 = "1mm5adjhqy0djr8fxpdsamc2ry2x5krc9w0s5nnfvyc4yqs0bwaa"; system = "database-migrations"; asd = "database-migrations"; @@ -46177,7 +46862,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "datafly" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/datafly/2024-10-12/datafly-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/datafly/2024-10-12/datafly-20241012-git.tgz"; sha256 = "103zp5s778lys4lsn7hvyis65757338n0l9gzl595qfim4apx8g0"; system = "datafly"; asd = "datafly"; @@ -46212,7 +46897,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "datafly-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/datafly/2024-10-12/datafly-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/datafly/2024-10-12/datafly-20241012-git.tgz"; sha256 = "103zp5s778lys4lsn7hvyis65757338n0l9gzl595qfim4apx8g0"; system = "datafly-test"; asd = "datafly-test"; @@ -46237,7 +46922,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dataloader" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dataloader/2021-05-31/dataloader-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/dataloader/2021-05-31/dataloader-20210531-git.tgz"; sha256 = "1a7nap2yp0jjd9r3xpkj0a6z0m3gshz73abm8kfza4kf31ipzyik"; system = "dataloader"; asd = "dataloader"; @@ -46269,7 +46954,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dataloader.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dataloader/2021-05-31/dataloader-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/dataloader/2021-05-31/dataloader-20210531-git.tgz"; sha256 = "1a7nap2yp0jjd9r3xpkj0a6z0m3gshz73abm8kfza4kf31ipzyik"; system = "dataloader.test"; asd = "dataloader.test"; @@ -46292,7 +46977,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "datamuse" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/datamuse/2023-10-21/datamuse-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/datamuse/2023-10-21/datamuse-20231021-git.tgz"; sha256 = "18mminvwv6wql6qh9kxxkhjfbxfz37gr125wy9h6za83vn1rkpwc"; system = "datamuse"; asd = "datamuse"; @@ -46316,7 +47001,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "date-calc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/date-calc/2019-12-27/date-calc-20191227-git.tgz"; + url = "https://beta.quicklisp.org/archive/date-calc/2019-12-27/date-calc-20191227-git.tgz"; sha256 = "09wmjp3ypxigcmx4mvc0yjnj56wkjjchhssdmklbaswy5mi7xc9s"; system = "date-calc"; asd = "date-calc"; @@ -46336,7 +47021,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "datum-comments" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/datum-comments/2021-02-28/datum-comments-20210228-git.tgz"; + url = "https://beta.quicklisp.org/archive/datum-comments/2021-02-28/datum-comments-20210228-git.tgz"; sha256 = "07zzlhphcmwimp4pjckhnbjbn127lcpafi7j0l74137dz9pimjik"; system = "datum-comments"; asd = "datum-comments"; @@ -46356,7 +47041,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "db3" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-db3/2020-02-18/cl-db3-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-db3/2020-02-18/cl-db3-20200218-git.tgz"; sha256 = "1i7j0mlri6kbklcx1lsm464s8kmyhhij5c4xh4aybrw8m4ixn1s5"; system = "db3"; asd = "db3"; @@ -46376,7 +47061,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dbd-mysql" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz"; sha256 = "17szd6sz1hlwl5fm4qjgyd8ax01wkbhv8hxcyy8qscx39sc0cnpy"; system = "dbd-mysql"; asd = "dbd-mysql"; @@ -46397,7 +47082,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dbd-postgres" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz"; sha256 = "17szd6sz1hlwl5fm4qjgyd8ax01wkbhv8hxcyy8qscx39sc0cnpy"; system = "dbd-postgres"; asd = "dbd-postgres"; @@ -46419,7 +47104,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dbd-sqlite3" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz"; sha256 = "17szd6sz1hlwl5fm4qjgyd8ax01wkbhv8hxcyy8qscx39sc0cnpy"; system = "dbd-sqlite3"; asd = "dbd-sqlite3"; @@ -46441,7 +47126,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dbi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz"; sha256 = "17szd6sz1hlwl5fm4qjgyd8ax01wkbhv8hxcyy8qscx39sc0cnpy"; system = "dbi"; asd = "dbi"; @@ -46457,6 +47142,54 @@ lib.makeScope pkgs.newScope (self: { meta = { }; } ); + dbi-cp = ( + build-asdf-system { + pname = "dbi-cp"; + version = "20250622-git"; + asds = [ "dbi-cp" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-dbi-connection-pool/2025-06-22/cl-dbi-connection-pool-20250622-git.tgz"; + sha256 = "0q1kgcn822ifc8zcss4yihhwcl0asdxl8xxpbbnyjzxasqa47ifv"; + system = "dbi-cp"; + asd = "dbi-cp"; + } + ); + systems = [ "dbi-cp" ]; + lispLibs = [ + (getAttr "bt-semaphore" self) + (getAttr "cl-dbi" self) + (getAttr "cl-syntax" self) + (getAttr "cl-syntax-annot" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + dbi-cp-test = ( + build-asdf-system { + pname = "dbi-cp-test"; + version = "20250622-git"; + asds = [ "dbi-cp-test" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-dbi-connection-pool/2025-06-22/cl-dbi-connection-pool-20250622-git.tgz"; + sha256 = "0q1kgcn822ifc8zcss4yihhwcl0asdxl8xxpbbnyjzxasqa47ifv"; + system = "dbi-cp-test"; + asd = "dbi-cp-test"; + } + ); + systems = [ "dbi-cp-test" ]; + lispLibs = [ + (getAttr "dbi-cp" self) + (getAttr "rove" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); dbi-test = ( build-asdf-system { pname = "dbi-test"; @@ -46464,7 +47197,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dbi-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz"; sha256 = "17szd6sz1hlwl5fm4qjgyd8ax01wkbhv8hxcyy8qscx39sc0cnpy"; system = "dbi-test"; asd = "dbi-test"; @@ -46487,7 +47220,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dbus" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dbus/2024-10-12/dbus-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/dbus/2024-10-12/dbus-20241012-git.tgz"; sha256 = "1y880074m9g0swxrzpbplmkdxc6r62gzyigglf4x2i0zyss3gf65"; system = "dbus"; asd = "dbus"; @@ -46517,7 +47250,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dct" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-dct/2022-03-31/cl-dct-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-dct/2022-03-31/cl-dct-20220331-git.tgz"; sha256 = "1rzq4vdhvr454668a3xf56mha061d27ymsgawmxikgk86wi8biin"; system = "dct"; asd = "dct"; @@ -46537,7 +47270,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dct-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-dct/2022-03-31/cl-dct-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-dct/2022-03-31/cl-dct-20220331-git.tgz"; sha256 = "1rzq4vdhvr454668a3xf56mha061d27ymsgawmxikgk86wi8biin"; system = "dct-test"; asd = "dct-test"; @@ -46559,12 +47292,12 @@ lib.makeScope pkgs.newScope (self: { ddo = ( build-asdf-system { pname = "ddo"; - version = "20210411-git"; + version = "20250622-git"; asds = [ "ddo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/femlisp/2021-04-11/femlisp-20210411-git.tgz"; - sha256 = "08l2x1jq3vfhh8m14wijd8c78n589cy5hd2py2jfj3yfiqyipasa"; + url = "https://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz"; + sha256 = "1rg1hhy3nlb85229ninnsdr8dhjjs0wgqv612g8i59v82n07yip8"; system = "ddo"; asd = "ddo"; } @@ -46594,7 +47327,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "de-mock-racy" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/de-mock-racy/2022-11-06/de-mock-racy-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/de-mock-racy/2022-11-06/de-mock-racy-20221106-git.tgz"; sha256 = "02rkg1i5r8fgyhaipb0mkz543c8r81kqmwmmvywnnw8hpyvav2xb"; system = "de-mock-racy"; asd = "de-mock-racy"; @@ -46610,12 +47343,12 @@ lib.makeScope pkgs.newScope (self: { dealii-tutorial = ( build-asdf-system { pname = "dealii-tutorial"; - version = "20210411-git"; + version = "20250622-git"; asds = [ "dealii-tutorial" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/femlisp/2021-04-11/femlisp-20210411-git.tgz"; - sha256 = "08l2x1jq3vfhh8m14wijd8c78n589cy5hd2py2jfj3yfiqyipasa"; + url = "https://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz"; + sha256 = "1rg1hhy3nlb85229ninnsdr8dhjjs0wgqv612g8i59v82n07yip8"; system = "dealii-tutorial"; asd = "dealii-tutorial"; } @@ -46634,7 +47367,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "decimals" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-decimals/2021-12-09/cl-decimals-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-decimals/2021-12-09/cl-decimals-20211209-git.tgz"; sha256 = "0wn5hq1pwd3wpjqqhpjzarcdk1q6416g8y447iaf55j5nbhlmbn6"; system = "decimals"; asd = "decimals"; @@ -46650,12 +47383,12 @@ lib.makeScope pkgs.newScope (self: { deeds = ( build-asdf-system { pname = "deeds"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "deeds" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/deeds/2023-10-21/deeds-20231021-git.tgz"; - sha256 = "0pd178wydg2zld8pvfm7ss5qvbjh4g8klqbhx2k7h68hn2q1xnn8"; + url = "https://beta.quicklisp.org/archive/deeds/2025-06-22/deeds-20250622-git.tgz"; + sha256 = "0qhb95msyl0fv3swczdjfp413q8dckpf2kx7xrlryjdw3628wisq"; system = "deeds"; asd = "deeds"; } @@ -46679,7 +47412,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "def-properties" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-def-properties/2023-06-18/cl-def-properties-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-def-properties/2023-06-18/cl-def-properties-20230618-git.tgz"; sha256 = "0yvii6llhmjv1k7hli6waj1bprj8fqhncgnk8mdlg08wwa27a2j8"; system = "def-properties"; asd = "def-properties"; @@ -46703,7 +47436,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "defclass-std" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/defclass-std/2020-12-20/defclass-std-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/defclass-std/2020-12-20/defclass-std-20201220-git.tgz"; sha256 = "1c0ymb49wd205lzxmnmsrpqyv0pn61snn2xvsbk5iis135r4fr18"; system = "defclass-std"; asd = "defclass-std"; @@ -46724,7 +47457,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "defclass-std-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/defclass-std/2020-12-20/defclass-std-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/defclass-std/2020-12-20/defclass-std-20201220-git.tgz"; sha256 = "1c0ymb49wd205lzxmnmsrpqyv0pn61snn2xvsbk5iis135r4fr18"; system = "defclass-std-test"; asd = "defclass-std-test"; @@ -46748,7 +47481,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "defconfig" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/defconfig/2021-12-09/defconfig-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/defconfig/2021-12-09/defconfig-20211209-git.tgz"; sha256 = "1gvgni43fxknj800k2k7jhgayzqqqp3s321sw4qmsjxpv479hcqy"; system = "defconfig"; asd = "defconfig"; @@ -46767,12 +47500,12 @@ lib.makeScope pkgs.newScope (self: { defenum = ( build-asdf-system { pname = "defenum"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "defenum" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/defenum/2024-10-12/defenum-20241012-git.tgz"; - sha256 = "1856w0vsjj9fcyqrry5k4b2iv87xms5wlw8xbqawjax6w5hdsrhk"; + url = "https://beta.quicklisp.org/archive/defenum/2025-06-22/defenum-20250622-git.tgz"; + sha256 = "1rrm5gvb9l1ynvq2mnpvmv1mdgmbm48169r05zmpmvbfyyd2ngs9"; system = "defenum"; asd = "defenum"; } @@ -46787,12 +47520,12 @@ lib.makeScope pkgs.newScope (self: { deferred = ( build-asdf-system { pname = "deferred"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "deferred" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/deferred/2023-10-21/deferred-20231021-git.tgz"; - sha256 = "0npsxxapah8c3sxmfmi0djvw5kw5pj03dk5ia4yh3q2v7mwzpqy2"; + url = "https://beta.quicklisp.org/archive/deferred/2025-06-22/deferred-20250622-git.tgz"; + sha256 = "1f7rv7vz5jld1wd9b087af6a62wjd5a1hwwmk47wklwmhvk32pk9"; system = "deferred"; asd = "deferred"; } @@ -46811,7 +47544,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "define-json-expander" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/define-json-expander/2014-07-13/define-json-expander-20140713-git.tgz"; + url = "https://beta.quicklisp.org/archive/define-json-expander/2014-07-13/define-json-expander-20140713-git.tgz"; sha256 = "193mhjcy1qnfd7r7zia3qs8p7gllvq6s0b2wcqmkh0y17aw8brkh"; system = "define-json-expander"; asd = "define-json-expander"; @@ -46827,12 +47560,12 @@ lib.makeScope pkgs.newScope (self: { definer = ( build-asdf-system { pname = "definer"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "definer" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/definer/2024-10-12/definer-20241012-git.tgz"; - sha256 = "0vd7gcj55pdzgxq2309pxshplg3rjx95xikkc2ylqrcm9nf3d2zb"; + url = "https://beta.quicklisp.org/archive/definer/2025-06-22/definer-20250622-git.tgz"; + sha256 = "1dndgm78bylick7yh46rna40z0rq5l84lsyzlfpr6bfv51skpckc"; system = "definer"; asd = "definer"; } @@ -46851,7 +47584,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "definitions" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/definitions/2024-10-12/definitions-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/definitions/2024-10-12/definitions-20241012-git.tgz"; sha256 = "16wg9rzxc193qvhzay69czr19wzy16b53vm1gy6p25gqvz90zryd"; system = "definitions"; asd = "definitions"; @@ -46871,7 +47604,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "definitions-systems" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/definitions-systems/2023-06-18/definitions-systems_3.0.tgz"; + url = "https://beta.quicklisp.org/archive/definitions-systems/2023-06-18/definitions-systems_3.0.tgz"; sha256 = "0wly8hr9gfxhdz4l46xsh4vj99q9aq7p3cfsglbgv19kdsvv217r"; system = "definitions-systems"; asd = "definitions-systems"; @@ -46897,7 +47630,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "definitions-systems_tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/definitions-systems/2023-06-18/definitions-systems_3.0.tgz"; + url = "https://beta.quicklisp.org/archive/definitions-systems/2023-06-18/definitions-systems_3.0.tgz"; sha256 = "0wly8hr9gfxhdz4l46xsh4vj99q9aq7p3cfsglbgv19kdsvv217r"; system = "definitions-systems_tests"; asd = "definitions-systems_tests"; @@ -46920,7 +47653,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "deflate" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/deflate/2024-10-12/deflate-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/deflate/2024-10-12/deflate-20241012-git.tgz"; sha256 = "1b225rgc3b2b2k941aj8mz4fkyysi0my368r042wzykq28lwwwij"; system = "deflate"; asd = "deflate"; @@ -46940,7 +47673,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "deflazy" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; system = "deflazy"; asd = "deflazy"; @@ -46964,7 +47697,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "defmain" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/defmain/2024-10-12/defmain-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/defmain/2024-10-12/defmain-20241012-git.tgz"; sha256 = "0lb45xmpan188vcysc7d579gg1mc7qi3xyyqc6mqr49571zshzb1"; system = "defmain"; asd = "defmain"; @@ -46993,7 +47726,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "defmain-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/defmain/2024-10-12/defmain-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/defmain/2024-10-12/defmain-20241012-git.tgz"; sha256 = "0lb45xmpan188vcysc7d579gg1mc7qi3xyyqc6mqr49571zshzb1"; system = "defmain-test"; asd = "defmain-test"; @@ -47017,7 +47750,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "defmemo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/defmemo/2012-04-07/defmemo-20120407-git.tgz"; + url = "https://beta.quicklisp.org/archive/defmemo/2012-04-07/defmemo-20120407-git.tgz"; sha256 = "0rkvnjfb6fajzfzislz6z372bqpkj6wfbf0sxmzhhigni4wnil27"; system = "defmemo"; asd = "defmemo"; @@ -47040,7 +47773,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "defmemo-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/defmemo/2012-04-07/defmemo-20120407-git.tgz"; + url = "https://beta.quicklisp.org/archive/defmemo/2012-04-07/defmemo-20120407-git.tgz"; sha256 = "0rkvnjfb6fajzfzislz6z372bqpkj6wfbf0sxmzhhigni4wnil27"; system = "defmemo-test"; asd = "defmemo"; @@ -47060,7 +47793,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "defpackage-plus" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/defpackage-plus/2018-01-31/defpackage-plus-20180131-git.tgz"; + url = "https://beta.quicklisp.org/archive/defpackage-plus/2018-01-31/defpackage-plus-20180131-git.tgz"; sha256 = "0lzljvf343xb6mlh6lni2i27hpm5qd376522mk6hr2pa20vd6rdq"; system = "defpackage-plus"; asd = "defpackage-plus"; @@ -47080,7 +47813,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "defrec" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/defrec/2023-06-18/defrec-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/defrec/2023-06-18/defrec-20230618-git.tgz"; sha256 = "04wd43z2k5cv4a55x532y3aqc7gf1ksndvndvy0y6bslxqqgv63m"; system = "defrec"; asd = "defrec"; @@ -47100,7 +47833,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "defrest" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/defrest/2021-05-31/defrest-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/defrest/2021-05-31/defrest-20210531-git.tgz"; sha256 = "14pap344a0549mb7p79jf87ibfxmymk0hf9i7galcfi4s8nqq45g"; system = "defrest"; asd = "defrest"; @@ -47125,7 +47858,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "defrest.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/defrest/2021-05-31/defrest-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/defrest/2021-05-31/defrest-20210531-git.tgz"; sha256 = "14pap344a0549mb7p79jf87ibfxmymk0hf9i7galcfi4s8nqq45g"; system = "defrest.test"; asd = "defrest"; @@ -47149,7 +47882,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "defstar" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/defstar/2014-07-13/defstar-20140713-git.tgz"; + url = "https://beta.quicklisp.org/archive/defstar/2014-07-13/defstar-20140713-git.tgz"; sha256 = "0n6m3aqvdfnsrhlhqjcy72d1i55lbkjg13ij5c7vw003p1n78wxi"; system = "defstar"; asd = "defstar"; @@ -47169,7 +47902,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "defsystem-compatibility" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/defsystem-compatibility/2010-10-06/defsystem-compatibility-20101006-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/defsystem-compatibility/2010-10-06/defsystem-compatibility-20101006-darcs.tgz"; sha256 = "0bw0c69zyika19rvzl8xplwrqsgznhnlbj40fcszfw0vxh2czj0f"; system = "defsystem-compatibility"; asd = "defsystem-compatibility"; @@ -47189,7 +47922,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "defsystem-compatibility-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/defsystem-compatibility/2010-10-06/defsystem-compatibility-20101006-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/defsystem-compatibility/2010-10-06/defsystem-compatibility-20101006-darcs.tgz"; sha256 = "0bw0c69zyika19rvzl8xplwrqsgznhnlbj40fcszfw0vxh2czj0f"; system = "defsystem-compatibility-test"; asd = "defsystem-compatibility-test"; @@ -47212,7 +47945,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "defvariant" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/defvariant/2014-07-13/defvariant-20140713-git.tgz"; + url = "https://beta.quicklisp.org/archive/defvariant/2014-07-13/defvariant-20140713-git.tgz"; sha256 = "0rma557l2irjyzrswcd7329iic2pjxw0jgk3m2inag39l6wyqsr1"; system = "defvariant"; asd = "defvariant"; @@ -47232,7 +47965,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "delorean" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/delorean/2013-06-15/delorean-20130615-git.tgz"; + url = "https://beta.quicklisp.org/archive/delorean/2013-06-15/delorean-20130615-git.tgz"; sha256 = "0q11wqdlvis91i996mar72icw07yf7mwmsnlmsbsya9kaqj7n3cd"; system = "delorean"; asd = "delorean"; @@ -47252,7 +47985,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "delorean-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/delorean/2013-06-15/delorean-20130615-git.tgz"; + url = "https://beta.quicklisp.org/archive/delorean/2013-06-15/delorean-20130615-git.tgz"; sha256 = "0q11wqdlvis91i996mar72icw07yf7mwmsnlmsbsya9kaqj7n3cd"; system = "delorean-test"; asd = "delorean"; @@ -47275,7 +48008,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "delta-debug" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/delta-debug/2018-08-31/delta-debug-20180831-git.tgz"; + url = "https://beta.quicklisp.org/archive/delta-debug/2018-08-31/delta-debug-20180831-git.tgz"; sha256 = "0dm33v8ipkpr23mjb9s6z2c7gmxwjbd5khc7c1vangba18nzm7ir"; system = "delta-debug"; asd = "delta-debug"; @@ -47299,7 +48032,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dendrite" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dendrite/2017-10-23/dendrite-release-quicklisp-409b1061-git.tgz"; + url = "https://beta.quicklisp.org/archive/dendrite/2017-10-23/dendrite-release-quicklisp-409b1061-git.tgz"; sha256 = "1fsi77w2yamis2707f1hx09pmyjaxqpzl8s0h182vpz159lkxdy5"; system = "dendrite"; asd = "dendrite"; @@ -47322,7 +48055,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dendrite.micro-l-system" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dendrite/2017-10-23/dendrite-release-quicklisp-409b1061-git.tgz"; + url = "https://beta.quicklisp.org/archive/dendrite/2017-10-23/dendrite-release-quicklisp-409b1061-git.tgz"; sha256 = "1fsi77w2yamis2707f1hx09pmyjaxqpzl8s0h182vpz159lkxdy5"; system = "dendrite.micro-l-system"; asd = "dendrite.micro-l-system"; @@ -47342,7 +48075,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dendrite.primitives" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dendrite/2017-10-23/dendrite-release-quicklisp-409b1061-git.tgz"; + url = "https://beta.quicklisp.org/archive/dendrite/2017-10-23/dendrite-release-quicklisp-409b1061-git.tgz"; sha256 = "1fsi77w2yamis2707f1hx09pmyjaxqpzl8s0h182vpz159lkxdy5"; system = "dendrite.primitives"; asd = "dendrite.primitives"; @@ -47361,12 +48094,12 @@ lib.makeScope pkgs.newScope (self: { deoxybyte-gzip = ( build-asdf-system { pname = "deoxybyte-gzip"; - version = "20140113-git"; + version = "20250622-git"; asds = [ "deoxybyte-gzip" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/deoxybyte-gzip/2014-01-13/deoxybyte-gzip-20140113-git.tgz"; - sha256 = "0ccci902nxqhdlskw3pghcjg0vgl10xlh16cb5b631j3n2ajfa16"; + url = "https://beta.quicklisp.org/archive/deoxybyte-gzip/2025-06-22/deoxybyte-gzip-20250622-git.tgz"; + sha256 = "0zy9536ggz2wpgzkgby4hgn38f3s2wq21f2j9gbb9xm431p4w3kx"; system = "deoxybyte-gzip"; asd = "deoxybyte-gzip"; } @@ -47385,12 +48118,12 @@ lib.makeScope pkgs.newScope (self: { deoxybyte-gzip-test = ( build-asdf-system { pname = "deoxybyte-gzip-test"; - version = "20140113-git"; + version = "20250622-git"; asds = [ "deoxybyte-gzip-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/deoxybyte-gzip/2014-01-13/deoxybyte-gzip-20140113-git.tgz"; - sha256 = "0ccci902nxqhdlskw3pghcjg0vgl10xlh16cb5b631j3n2ajfa16"; + url = "https://beta.quicklisp.org/archive/deoxybyte-gzip/2025-06-22/deoxybyte-gzip-20250622-git.tgz"; + sha256 = "0zy9536ggz2wpgzkgby4hgn38f3s2wq21f2j9gbb9xm431p4w3kx"; system = "deoxybyte-gzip-test"; asd = "deoxybyte-gzip-test"; } @@ -47412,7 +48145,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "deoxybyte-io" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/deoxybyte-io/2014-01-13/deoxybyte-io-20140113-git.tgz"; + url = "https://beta.quicklisp.org/archive/deoxybyte-io/2014-01-13/deoxybyte-io-20140113-git.tgz"; sha256 = "0pjx96g50yqhdk0l1y970hc22fc1bl8ppyklhp62l41b4fb7hbbv"; system = "deoxybyte-io"; asd = "deoxybyte-io"; @@ -47437,7 +48170,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "deoxybyte-io-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/deoxybyte-io/2014-01-13/deoxybyte-io-20140113-git.tgz"; + url = "https://beta.quicklisp.org/archive/deoxybyte-io/2014-01-13/deoxybyte-io-20140113-git.tgz"; sha256 = "0pjx96g50yqhdk0l1y970hc22fc1bl8ppyklhp62l41b4fb7hbbv"; system = "deoxybyte-io-test"; asd = "deoxybyte-io-test"; @@ -47460,7 +48193,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "deoxybyte-systems" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/deoxybyte-systems/2014-01-13/deoxybyte-systems-20140113-git.tgz"; + url = "https://beta.quicklisp.org/archive/deoxybyte-systems/2014-01-13/deoxybyte-systems-20140113-git.tgz"; sha256 = "0sbzl0ngz85mvkghcy8y94hk34v5hvi41b111mb76f2jvdq9jjr8"; system = "deoxybyte-systems"; asd = "deoxybyte-systems"; @@ -47480,7 +48213,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "deoxybyte-unix" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/deoxybyte-unix/2014-01-13/deoxybyte-unix-20140113-git.tgz"; + url = "https://beta.quicklisp.org/archive/deoxybyte-unix/2014-01-13/deoxybyte-unix-20140113-git.tgz"; sha256 = "016lgb8vcnn7qwhndan1d61wbb10xmsczqp7h2kkfnhlvkr484qf"; system = "deoxybyte-unix"; asd = "deoxybyte-unix"; @@ -47504,7 +48237,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "deoxybyte-unix-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/deoxybyte-unix/2014-01-13/deoxybyte-unix-20140113-git.tgz"; + url = "https://beta.quicklisp.org/archive/deoxybyte-unix/2014-01-13/deoxybyte-unix-20140113-git.tgz"; sha256 = "016lgb8vcnn7qwhndan1d61wbb10xmsczqp7h2kkfnhlvkr484qf"; system = "deoxybyte-unix-test"; asd = "deoxybyte-unix-test"; @@ -47527,7 +48260,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "deoxybyte-utilities" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/deoxybyte-utilities/2014-01-13/deoxybyte-utilities-20140113-git.tgz"; + url = "https://beta.quicklisp.org/archive/deoxybyte-utilities/2014-01-13/deoxybyte-utilities-20140113-git.tgz"; sha256 = "054mvn27d9xdsal87avyxzphgv6pk96a0c1icpkldqczlmzl9j0g"; system = "deoxybyte-utilities"; asd = "deoxybyte-utilities"; @@ -47547,7 +48280,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "deoxybyte-utilities-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/deoxybyte-utilities/2014-01-13/deoxybyte-utilities-20140113-git.tgz"; + url = "https://beta.quicklisp.org/archive/deoxybyte-utilities/2014-01-13/deoxybyte-utilities-20140113-git.tgz"; sha256 = "054mvn27d9xdsal87avyxzphgv6pk96a0c1icpkldqczlmzl9j0g"; system = "deoxybyte-utilities-test"; asd = "deoxybyte-utilities-test"; @@ -47566,12 +48299,12 @@ lib.makeScope pkgs.newScope (self: { deploy = ( build-asdf-system { pname = "deploy"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "deploy" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/deploy/2024-10-12/deploy-20241012-git.tgz"; - sha256 = "1ysi8fjgb7kq3cycb6ms44j0m70xbd140fh4qgcpj7fm26p2a59p"; + url = "https://beta.quicklisp.org/archive/deploy/2025-06-22/deploy-20250622-git.tgz"; + sha256 = "0lhc0ca4y29wpcv8j78613y5rmq0q8fmh7hq6kxi3b9ykfgr5n31"; system = "deploy"; asd = "deploy"; } @@ -47580,6 +48313,7 @@ lib.makeScope pkgs.newScope (self: { lispLibs = [ (getAttr "cffi" self) (getAttr "documentation-utils" self) + (getAttr "pathname-utils" self) (getAttr "sha3" self) (getAttr "trivial-features" self) ]; @@ -47591,12 +48325,12 @@ lib.makeScope pkgs.newScope (self: { deploy-test = ( build-asdf-system { pname = "deploy-test"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "deploy-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/deploy/2024-10-12/deploy-20241012-git.tgz"; - sha256 = "1ysi8fjgb7kq3cycb6ms44j0m70xbd140fh4qgcpj7fm26p2a59p"; + url = "https://beta.quicklisp.org/archive/deploy/2025-06-22/deploy-20250622-git.tgz"; + sha256 = "0lhc0ca4y29wpcv8j78613y5rmq0q8fmh7hq6kxi3b9ykfgr5n31"; system = "deploy-test"; asd = "deploy-test"; } @@ -47615,12 +48349,12 @@ lib.makeScope pkgs.newScope (self: { depot = ( build-asdf-system { pname = "depot"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "depot" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/depot/2024-10-12/depot-20241012-git.tgz"; - sha256 = "1k9p4jqylh7i53sngi0yn2hww6y6lxqc7c0hd3j3p8jc4q3h4zn4"; + url = "https://beta.quicklisp.org/archive/depot/2025-06-22/depot-20250622-git.tgz"; + sha256 = "1hmd7pi3zharalqv2zl6aicw4ir3gd0gnawd6w55qvia8c5y9bm8"; system = "depot"; asd = "depot"; } @@ -47639,12 +48373,12 @@ lib.makeScope pkgs.newScope (self: { depot-in-memory = ( build-asdf-system { pname = "depot-in-memory"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "depot-in-memory" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/depot/2024-10-12/depot-20241012-git.tgz"; - sha256 = "1k9p4jqylh7i53sngi0yn2hww6y6lxqc7c0hd3j3p8jc4q3h4zn4"; + url = "https://beta.quicklisp.org/archive/depot/2025-06-22/depot-20250622-git.tgz"; + sha256 = "1hmd7pi3zharalqv2zl6aicw4ir3gd0gnawd6w55qvia8c5y9bm8"; system = "depot-in-memory"; asd = "depot-in-memory"; } @@ -47662,12 +48396,12 @@ lib.makeScope pkgs.newScope (self: { depot-test = ( build-asdf-system { pname = "depot-test"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "depot-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/depot/2024-10-12/depot-20241012-git.tgz"; - sha256 = "1k9p4jqylh7i53sngi0yn2hww6y6lxqc7c0hd3j3p8jc4q3h4zn4"; + url = "https://beta.quicklisp.org/archive/depot/2025-06-22/depot-20250622-git.tgz"; + sha256 = "1hmd7pi3zharalqv2zl6aicw4ir3gd0gnawd6w55qvia8c5y9bm8"; system = "depot-test"; asd = "depot-test"; } @@ -47687,12 +48421,12 @@ lib.makeScope pkgs.newScope (self: { depot-virtual = ( build-asdf-system { pname = "depot-virtual"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "depot-virtual" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/depot/2024-10-12/depot-20241012-git.tgz"; - sha256 = "1k9p4jqylh7i53sngi0yn2hww6y6lxqc7c0hd3j3p8jc4q3h4zn4"; + url = "https://beta.quicklisp.org/archive/depot/2025-06-22/depot-20250622-git.tgz"; + sha256 = "1hmd7pi3zharalqv2zl6aicw4ir3gd0gnawd6w55qvia8c5y9bm8"; system = "depot-virtual"; asd = "depot-virtual"; } @@ -47707,12 +48441,12 @@ lib.makeScope pkgs.newScope (self: { depot-zip = ( build-asdf-system { pname = "depot-zip"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "depot-zip" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/depot/2024-10-12/depot-20241012-git.tgz"; - sha256 = "1k9p4jqylh7i53sngi0yn2hww6y6lxqc7c0hd3j3p8jc4q3h4zn4"; + url = "https://beta.quicklisp.org/archive/depot/2025-06-22/depot-20250622-git.tgz"; + sha256 = "1hmd7pi3zharalqv2zl6aicw4ir3gd0gnawd6w55qvia8c5y9bm8"; system = "depot-zip"; asd = "depot-zip"; } @@ -47735,7 +48469,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "deptree" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/deptree/2024-10-12/deptree-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/deptree/2024-10-12/deptree-20241012-git.tgz"; sha256 = "10ybmw28c52ahbm7xjn795367lssp6088v6705fmqbl0fgjpvxnw"; system = "deptree"; asd = "deptree"; @@ -47755,7 +48489,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "descriptions" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/descriptions/2015-03-02/descriptions-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/descriptions/2015-03-02/descriptions-20150302-git.tgz"; sha256 = "0h44gxilwmzk8cbxb81047cjndksvf8vw2s3pcy2diw9aqiacg7f"; system = "descriptions"; asd = "descriptions"; @@ -47780,7 +48514,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "descriptions-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/descriptions/2015-03-02/descriptions-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/descriptions/2015-03-02/descriptions-20150302-git.tgz"; sha256 = "0h44gxilwmzk8cbxb81047cjndksvf8vw2s3pcy2diw9aqiacg7f"; system = "descriptions-test"; asd = "descriptions-test"; @@ -47805,7 +48539,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "descriptions.serialization" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/descriptions/2015-03-02/descriptions-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/descriptions/2015-03-02/descriptions-20150302-git.tgz"; sha256 = "0h44gxilwmzk8cbxb81047cjndksvf8vw2s3pcy2diw9aqiacg7f"; system = "descriptions.serialization"; asd = "descriptions.serialization"; @@ -47828,7 +48562,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "descriptions.validation" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/descriptions/2015-03-02/descriptions-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/descriptions/2015-03-02/descriptions-20150302-git.tgz"; sha256 = "0h44gxilwmzk8cbxb81047cjndksvf8vw2s3pcy2diw9aqiacg7f"; system = "descriptions.validation"; asd = "descriptions.validation"; @@ -47851,7 +48585,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "destructuring-bind-star" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/destructuring-bind-star/2020-06-10/destructuring-bind-star-20200610-git.tgz"; + url = "https://beta.quicklisp.org/archive/destructuring-bind-star/2020-06-10/destructuring-bind-star-20200610-git.tgz"; sha256 = "1j1xnhvb6pm9q291aawbrcwp8bgbmiij9a53gifxhr4kp934ciz2"; system = "destructuring-bind-star"; asd = "destructuring-bind-star"; @@ -47871,7 +48605,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dexador" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dexador/2024-10-12/dexador-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/dexador/2024-10-12/dexador-20241012-git.tgz"; sha256 = "19y95k821665vcy7gbxhh4rqwk7fh4brv1sgkaykncpw2l2lll5r"; system = "dexador"; asd = "dexador"; @@ -47907,7 +48641,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dexador-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dexador/2024-10-12/dexador-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/dexador/2024-10-12/dexador-20241012-git.tgz"; sha256 = "19y95k821665vcy7gbxhh4rqwk7fh4brv1sgkaykncpw2l2lll5r"; system = "dexador-test"; asd = "dexador-test"; @@ -47934,7 +48668,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dexador-usocket" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dexador/2024-10-12/dexador-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/dexador/2024-10-12/dexador-20241012-git.tgz"; sha256 = "19y95k821665vcy7gbxhh4rqwk7fh4brv1sgkaykncpw2l2lll5r"; system = "dexador-usocket"; asd = "dexador-usocket"; @@ -47957,7 +48691,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dfio" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dfio/2022-11-06/dfio-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/dfio/2022-11-06/dfio-20221106-git.tgz"; sha256 = "1p53r7773939jnap518xp4b4wfvc1kbrz9jp6yd40xq0jpf9pbqg"; system = "dfio"; asd = "dfio"; @@ -47984,7 +48718,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "diff" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/diff/2013-08-13/diff-20130813-git.tgz"; + url = "https://beta.quicklisp.org/archive/diff/2013-08-13/diff-20130813-git.tgz"; sha256 = "1giafck8qfvb688kx5bn9g32rfc12jjywg8vdav36aqbd6lxf5z5"; system = "diff"; asd = "diff"; @@ -48007,7 +48741,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "diff-match-patch" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/diff-match-patch/2021-05-31/diff-match-patch-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/diff-match-patch/2021-05-31/diff-match-patch-20210531-git.tgz"; sha256 = "0wxz2q9sd2v8fg521f7bzv6wi3za7saz2j2snsnw2p1kcsj6zqa4"; system = "diff-match-patch"; asd = "diff-match-patch"; @@ -48030,7 +48764,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dirt" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dirt/2017-10-19/dirt-release-quicklisp-0d13ebc2-git.tgz"; + url = "https://beta.quicklisp.org/archive/dirt/2017-10-19/dirt-release-quicklisp-0d13ebc2-git.tgz"; sha256 = "1lqxfdzn9rh7rzsq97d4hp6fl4g9fs6s0n2pvf460d6ri6p40xna"; system = "dirt"; asd = "dirt"; @@ -48053,7 +48787,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dispatch" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; + url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; system = "dispatch"; asd = "dispatch"; @@ -48076,7 +48810,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dispatch-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; + url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; system = "dispatch-test"; asd = "dispatch-test"; @@ -48099,7 +48833,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "disposable" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/disposable/2016-02-08/disposable-20160208-git.tgz"; + url = "https://beta.quicklisp.org/archive/disposable/2016-02-08/disposable-20160208-git.tgz"; sha256 = "18synnlg4b8203rgww644dj7ghb4m1j33lb4zm64850vqy5b3pz7"; system = "disposable"; asd = "disposable"; @@ -48119,7 +48853,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dissect" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dissect/2024-10-12/dissect-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/dissect/2024-10-12/dissect-20241012-git.tgz"; sha256 = "1ym1zggwrj15l7y2mcz5l2gfk68prqxhdswffd9s5014pa6zyysr"; system = "dissect"; asd = "dissect"; @@ -48137,7 +48871,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "distributions" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/distributions/2022-11-06/distributions-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/distributions/2022-11-06/distributions-20221106-git.tgz"; sha256 = "1fkzigd0s0s0mvszgmv04yc8jp9gm4812445hfh6kpz6cjy5zpsk"; system = "distributions"; asd = "distributions"; @@ -48162,12 +48896,12 @@ lib.makeScope pkgs.newScope (self: { djula = ( build-asdf-system { pname = "djula"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "djula" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/djula/2024-10-12/djula-20241012-git.tgz"; - sha256 = "1m4k0ywkpvbpljd8r9vfmsw2zkphwcfwgbdp911zkiv5rcnmgykw"; + url = "https://beta.quicklisp.org/archive/djula/2025-06-22/djula-20250622-git.tgz"; + sha256 = "07pwb5cg3a978xzsvsqrsd9r1w0spfx3379wim4bn7fb1d417s9a"; system = "djula"; asd = "djula"; } @@ -48194,12 +48928,12 @@ lib.makeScope pkgs.newScope (self: { djula-demo = ( build-asdf-system { pname = "djula-demo"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "djula-demo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/djula/2024-10-12/djula-20241012-git.tgz"; - sha256 = "1m4k0ywkpvbpljd8r9vfmsw2zkphwcfwgbdp911zkiv5rcnmgykw"; + url = "https://beta.quicklisp.org/archive/djula/2025-06-22/djula-20250622-git.tgz"; + sha256 = "07pwb5cg3a978xzsvsqrsd9r1w0spfx3379wim4bn7fb1d417s9a"; system = "djula-demo"; asd = "djula-demo"; } @@ -48218,12 +48952,12 @@ lib.makeScope pkgs.newScope (self: { djula-gettext = ( build-asdf-system { pname = "djula-gettext"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "djula-gettext" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/djula/2024-10-12/djula-20241012-git.tgz"; - sha256 = "1m4k0ywkpvbpljd8r9vfmsw2zkphwcfwgbdp911zkiv5rcnmgykw"; + url = "https://beta.quicklisp.org/archive/djula/2025-06-22/djula-20250622-git.tgz"; + sha256 = "07pwb5cg3a978xzsvsqrsd9r1w0spfx3379wim4bn7fb1d417s9a"; system = "djula-gettext"; asd = "djula-gettext"; } @@ -48241,12 +48975,12 @@ lib.makeScope pkgs.newScope (self: { djula-locale = ( build-asdf-system { pname = "djula-locale"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "djula-locale" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/djula/2024-10-12/djula-20241012-git.tgz"; - sha256 = "1m4k0ywkpvbpljd8r9vfmsw2zkphwcfwgbdp911zkiv5rcnmgykw"; + url = "https://beta.quicklisp.org/archive/djula/2025-06-22/djula-20250622-git.tgz"; + sha256 = "07pwb5cg3a978xzsvsqrsd9r1w0spfx3379wim4bn7fb1d417s9a"; system = "djula-locale"; asd = "djula-locale"; } @@ -48264,12 +48998,12 @@ lib.makeScope pkgs.newScope (self: { djula-test = ( build-asdf-system { pname = "djula-test"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "djula-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/djula/2024-10-12/djula-20241012-git.tgz"; - sha256 = "1m4k0ywkpvbpljd8r9vfmsw2zkphwcfwgbdp911zkiv5rcnmgykw"; + url = "https://beta.quicklisp.org/archive/djula/2025-06-22/djula-20250622-git.tgz"; + sha256 = "07pwb5cg3a978xzsvsqrsd9r1w0spfx3379wim4bn7fb1d417s9a"; system = "djula-test"; asd = "djula-test"; } @@ -48287,12 +49021,12 @@ lib.makeScope pkgs.newScope (self: { djula-translate = ( build-asdf-system { pname = "djula-translate"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "djula-translate" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/djula/2024-10-12/djula-20241012-git.tgz"; - sha256 = "1m4k0ywkpvbpljd8r9vfmsw2zkphwcfwgbdp911zkiv5rcnmgykw"; + url = "https://beta.quicklisp.org/archive/djula/2025-06-22/djula-20250622-git.tgz"; + sha256 = "07pwb5cg3a978xzsvsqrsd9r1w0spfx3379wim4bn7fb1d417s9a"; system = "djula-translate"; asd = "djula-translate"; } @@ -48314,7 +49048,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dlist" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dlist/2012-11-25/dlist-20121125-git.tgz"; + url = "https://beta.quicklisp.org/archive/dlist/2012-11-25/dlist-20121125-git.tgz"; sha256 = "1ycgjmbxpj0bj95xg0x7m30yz8y73s7mnqs0dzam00rkf8g00h89"; system = "dlist"; asd = "dlist"; @@ -48334,7 +49068,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dlist-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dlist/2012-11-25/dlist-20121125-git.tgz"; + url = "https://beta.quicklisp.org/archive/dlist/2012-11-25/dlist-20121125-git.tgz"; sha256 = "1ycgjmbxpj0bj95xg0x7m30yz8y73s7mnqs0dzam00rkf8g00h89"; system = "dlist-test"; asd = "dlist"; @@ -48357,7 +49091,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dml" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dml/2023-10-21/dml-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/dml/2023-10-21/dml-20231021-git.tgz"; sha256 = "15yxfgmzxpn3hr3kfmw7iid652v1v1v0fw7ngvs1ig6693kci72h"; system = "dml"; asd = "dml"; @@ -48378,12 +49112,12 @@ lib.makeScope pkgs.newScope (self: { dns-client = ( build-asdf-system { pname = "dns-client"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "dns-client" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dns-client/2024-10-12/dns-client-20241012-git.tgz"; - sha256 = "1lbxryi0hx1i0ib3rz3ci89pfdyzikhv4dg0lk5piggrkdji2fx3"; + url = "https://beta.quicklisp.org/archive/dns-client/2025-06-22/dns-client-20250622-git.tgz"; + sha256 = "1ylnhnpcs25nzax2bxrnxl1kjghmnl5yy2vsi6ps3fafw6b2ras3"; system = "dns-client"; asd = "dns-client"; } @@ -48406,7 +49140,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "do-urlencode" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/do-urlencode/2018-10-18/do-urlencode-20181018-git.tgz"; + url = "https://beta.quicklisp.org/archive/do-urlencode/2018-10-18/do-urlencode-20181018-git.tgz"; sha256 = "0k2i3d4k9cpci235mwfm0c5a4yqfkijr716bjv7cdlpzx88lazm9"; system = "do-urlencode"; asd = "do-urlencode"; @@ -48423,12 +49157,12 @@ lib.makeScope pkgs.newScope (self: { docbrowser = ( build-asdf-system { pname = "docbrowser"; - version = "20200610-git"; + version = "20250622-git"; asds = [ "docbrowser" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/docbrowser/2020-06-10/docbrowser-20200610-git.tgz"; - sha256 = "0k7gkyciqfbwdmvip2s8h4k21a63h45bj3qydq3jbvkhaq4gj9x1"; + url = "https://beta.quicklisp.org/archive/docbrowser/2025-06-22/docbrowser-20250622-git.tgz"; + sha256 = "1c48wh6mgw0n8g6cq758nzcsrbkgsq56183ydg76yqhj4ciri0jn"; system = "docbrowser"; asd = "docbrowser"; } @@ -48461,7 +49195,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "docparser" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/docparser/2023-02-14/docparser-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/docparser/2023-02-14/docparser-20230214-git.tgz"; sha256 = "1ix8n6albgl34kwvk2f3vfz9afi6y4m9dd6k3axlm9g16zhmhma1"; system = "docparser"; asd = "docparser"; @@ -48486,7 +49220,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "docparser-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/docparser/2023-02-14/docparser-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/docparser/2023-02-14/docparser-20230214-git.tgz"; sha256 = "1ix8n6albgl34kwvk2f3vfz9afi6y4m9dd6k3axlm9g16zhmhma1"; system = "docparser-test"; asd = "docparser-test"; @@ -48510,7 +49244,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "docparser-test-system" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/docparser/2023-02-14/docparser-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/docparser/2023-02-14/docparser-20230214-git.tgz"; sha256 = "1ix8n6albgl34kwvk2f3vfz9afi6y4m9dd6k3axlm9g16zhmhma1"; system = "docparser-test-system"; asd = "docparser-test-system"; @@ -48526,12 +49260,12 @@ lib.makeScope pkgs.newScope (self: { docs-builder = ( build-asdf-system { pname = "docs-builder"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "docs-builder" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/docs-builder/2024-10-12/docs-builder-20241012-git.tgz"; - sha256 = "09pg4frik728g7njrpkb8jmzw6q9f47ng4c123lmqlmjha9bs03c"; + url = "https://beta.quicklisp.org/archive/docs-builder/2025-06-22/docs-builder-20250622-git.tgz"; + sha256 = "1w1fx5b193s5zifnp22sha8s4vqa15p3kg8fwl60yv90gk4wvwwm"; system = "docs-builder"; asd = "docs-builder"; } @@ -48551,12 +49285,12 @@ lib.makeScope pkgs.newScope (self: { docs-config = ( build-asdf-system { pname = "docs-config"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "docs-config" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/docs-builder/2024-10-12/docs-builder-20241012-git.tgz"; - sha256 = "09pg4frik728g7njrpkb8jmzw6q9f47ng4c123lmqlmjha9bs03c"; + url = "https://beta.quicklisp.org/archive/docs-builder/2025-06-22/docs-builder-20250622-git.tgz"; + sha256 = "1w1fx5b193s5zifnp22sha8s4vqa15p3kg8fwl60yv90gk4wvwwm"; system = "docs-config"; asd = "docs-config"; } @@ -48575,7 +49309,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "documentation-template" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/documentation-template/2014-12-17/documentation-template-0.4.4.tgz"; + url = "https://beta.quicklisp.org/archive/documentation-template/2014-12-17/documentation-template-0.4.4.tgz"; sha256 = "0pfcg38ws0syhg2l15nwslfyj175dq1dvjip64nx02knw26zj56y"; system = "documentation-template"; asd = "documentation-template"; @@ -48591,12 +49325,12 @@ lib.makeScope pkgs.newScope (self: { documentation-utils = ( build-asdf-system { pname = "documentation-utils"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "documentation-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/documentation-utils/2023-10-21/documentation-utils-20231021-git.tgz"; - sha256 = "0nzkjzvcqi1l2ywiz17h1f54vgvbkywv95in4yww6lyzqjqsqqhy"; + url = "https://beta.quicklisp.org/archive/documentation-utils/2025-06-22/documentation-utils-20250622-git.tgz"; + sha256 = "1rmb9m3rilj5c4cr7bn5gnx1wrksi85zizp4hr7409qzg345mg7l"; system = "documentation-utils"; asd = "documentation-utils"; } @@ -48613,7 +49347,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "documentation-utils-extensions" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/documentation-utils-extensions/2022-07-07/documentation-utils-extensions-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/documentation-utils-extensions/2022-07-07/documentation-utils-extensions-20220707-git.tgz"; sha256 = "1bv8y1hbn6fivvsanaci19k47vfdchj3argz92az3izmar9ybp4f"; system = "documentation-utils-extensions"; asd = "documentation-utils-extensions"; @@ -48633,7 +49367,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "docutils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-docutils/2013-01-28/cl-docutils-20130128-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-docutils/2013-01-28/cl-docutils-20130128-git.tgz"; sha256 = "132bxlj0jlhiabi29mygmkcbbgyb5s1yz1xdfhm3pgrf9f8605gg"; system = "docutils"; asd = "docutils"; @@ -48653,12 +49387,12 @@ lib.makeScope pkgs.newScope (self: { dom = ( build-asdf-system { pname = "dom"; - version = "master-fe503896-git"; + version = "master-5a621564-git"; asds = [ "dom" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz"; - sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10"; + url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; + sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; system = "dom"; asd = "dom"; } @@ -48680,7 +49414,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "donuts" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/donuts/2012-07-03/donuts-20120703-git.tgz"; + url = "https://beta.quicklisp.org/archive/donuts/2012-07-03/donuts-20120703-git.tgz"; sha256 = "1arjlwic0gk28ja1ql5k1r3v0pqzg42ds8vzq9266hq5lp06q3ii"; system = "donuts"; asd = "donuts"; @@ -48703,7 +49437,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "doplus" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/doplus/2021-10-20/doplus-v1.1.0.tgz"; + url = "https://beta.quicklisp.org/archive/doplus/2021-10-20/doplus-v1.1.0.tgz"; sha256 = "1yvda9psw9m08d3bzdb8a2drvhrnr07a0rhza5ibk30v1dkwfw7c"; system = "doplus"; asd = "doplus"; @@ -48723,7 +49457,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "doplus-fset" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/doplus/2021-10-20/doplus-v1.1.0.tgz"; + url = "https://beta.quicklisp.org/archive/doplus/2021-10-20/doplus-v1.1.0.tgz"; sha256 = "1yvda9psw9m08d3bzdb8a2drvhrnr07a0rhza5ibk30v1dkwfw7c"; system = "doplus-fset"; asd = "doplus-fset"; @@ -48746,7 +49480,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dotenv" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dotenv/2021-12-09/dotenv-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/dotenv/2021-12-09/dotenv-20211209-git.tgz"; sha256 = "0g19svpxy2169rym532gjwsg1zybinpc99mjsy6im4n6zdd57hzh"; system = "dotenv"; asd = "dotenv"; @@ -48769,7 +49503,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dotenv-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dotenv/2021-12-09/dotenv-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/dotenv/2021-12-09/dotenv-20211209-git.tgz"; sha256 = "0g19svpxy2169rym532gjwsg1zybinpc99mjsy6im4n6zdd57hzh"; system = "dotenv-test"; asd = "dotenv"; @@ -48793,7 +49527,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "doubly-linked-list" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/doubly-linked-list/2022-07-07/doubly-linked-list-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/doubly-linked-list/2022-07-07/doubly-linked-list-20220707-git.tgz"; sha256 = "073r1zyp0slzzvcyj7ibjs85bss1iqh42zn5dvkjd6ls78v2bn9f"; system = "doubly-linked-list"; asd = "doubly-linked-list"; @@ -48813,7 +49547,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "drakma" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/drakma/2023-10-21/drakma-v2.0.10.tgz"; + url = "https://beta.quicklisp.org/archive/drakma/2023-10-21/drakma-v2.0.10.tgz"; sha256 = "0clj7c1hysisdvkidvx7m0702alsksna6iiqlk499hn3hjpafmln"; system = "drakma"; asd = "drakma"; @@ -48840,7 +49574,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "drakma-async" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/drakma-async/2021-08-07/drakma-async-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/drakma-async/2021-08-07/drakma-async-20210807-git.tgz"; sha256 = "19cd4xrcx3mz86sl0326x5lcrh9jizrwzi6p7pd856nrmx7ynf4w"; system = "drakma-async"; asd = "drakma-async"; @@ -48868,7 +49602,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "drakma-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/drakma/2023-10-21/drakma-v2.0.10.tgz"; + url = "https://beta.quicklisp.org/archive/drakma/2023-10-21/drakma-v2.0.10.tgz"; sha256 = "0clj7c1hysisdvkidvx7m0702alsksna6iiqlk499hn3hjpafmln"; system = "drakma-test"; asd = "drakma-test"; @@ -48893,7 +49627,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "draw-cons-tree" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/draw-cons-tree/2023-06-18/draw-cons-tree-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/draw-cons-tree/2023-06-18/draw-cons-tree-20230618-git.tgz"; sha256 = "1523bdkq8a5qn0qp9q7r16w47y6jb0hkfj7hbjfj6mg3xv001s3x"; system = "draw-cons-tree"; asd = "draw-cons-tree"; @@ -48909,18 +49643,19 @@ lib.makeScope pkgs.newScope (self: { dref = ( build-asdf-system { pname = "dref"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "dref" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mgl-pax/2024-10-12/mgl-pax-20241012-git.tgz"; - sha256 = "17szk2ijccssa9n7zg8qh6hc706hahvzcrzlx716hmgq2hfwvvy0"; + url = "https://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz"; + sha256 = "09wcwil8jyxm34cs7x1i3vclj84n6gxzxp21k0d23129c9adhi66"; system = "dref"; asd = "dref"; } ); systems = [ "dref" ]; lispLibs = [ + (getAttr "autoload" self) (getAttr "mgl-pax-bootstrap" self) (getAttr "mgl-pax_dot_asdf" self) (getAttr "named-readtables" self) @@ -48934,12 +49669,12 @@ lib.makeScope pkgs.newScope (self: { dref-test = ( build-asdf-system { pname = "dref-test"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "dref-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mgl-pax/2024-10-12/mgl-pax-20241012-git.tgz"; - sha256 = "17szk2ijccssa9n7zg8qh6hc706hahvzcrzlx716hmgq2hfwvvy0"; + url = "https://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz"; + sha256 = "09wcwil8jyxm34cs7x1i3vclj84n6gxzxp21k0d23129c9adhi66"; system = "dref-test"; asd = "dref-test"; } @@ -48958,15 +49693,35 @@ lib.makeScope pkgs.newScope (self: { }; } ); + dref-test-package-inferred = ( + build-asdf-system { + pname = "dref-test-package-inferred"; + version = "20250622-git"; + asds = [ "dref-test-package-inferred" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz"; + sha256 = "09wcwil8jyxm34cs7x1i3vclj84n6gxzxp21k0d23129c9adhi66"; + system = "dref-test-package-inferred"; + asd = "dref-test-package-inferred"; + } + ); + systems = [ "dref-test-package-inferred" ]; + lispLibs = [ ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); drei-mcclim = ( build-asdf-system { pname = "drei-mcclim"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "drei-mcclim" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "drei-mcclim"; asd = "drei-mcclim"; } @@ -48992,7 +49747,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dso-lex" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dso-lex/2011-01-10/dso-lex-0.3.2.tgz"; + url = "https://beta.quicklisp.org/archive/dso-lex/2011-01-10/dso-lex-0.3.2.tgz"; sha256 = "09vx0dsfaj1c5ivfkx9zl9s2yxmqpdc2v41fhpq75anq9ffr6qyr"; system = "dso-lex"; asd = "dso-lex"; @@ -49015,7 +49770,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dso-util" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dso-util/2011-01-10/dso-util-0.1.2.tgz"; + url = "https://beta.quicklisp.org/archive/dso-util/2011-01-10/dso-util-0.1.2.tgz"; sha256 = "12w1rxxk2hi6k7ng9kqf2yb1kff78bshdfl7bwv6fz8im8vq13b3"; system = "dso-util"; asd = "dso-util"; @@ -49031,12 +49786,12 @@ lib.makeScope pkgs.newScope (self: { duckdb = ( build-asdf-system { pname = "duckdb"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "duckdb" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-duckdb/2024-10-12/cl-duckdb-20241012-git.tgz"; - sha256 = "144c8c4m8vwmdg1ny5hjsvxmm8k6jijmrabyf2hmcnvk7hdy5sq0"; + url = "https://beta.quicklisp.org/archive/cl-duckdb/2025-06-22/cl-duckdb-20250622-git.tgz"; + sha256 = "13l74slzsd6vdn1ankphbrrqd4021g2d28am677xrmlm1p7nlw52"; system = "duckdb"; asd = "duckdb"; } @@ -49068,7 +49823,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dufy" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dufy/2024-10-12/dufy-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/dufy/2024-10-12/dufy-20241012-git.tgz"; sha256 = "1fj1ad7jh8i72jvdc5ypdk1j1mlkr7dc9xs4khii9adj3jl1nb0v"; system = "dufy"; asd = "dufy"; @@ -49091,7 +49846,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dungen" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dungen/2022-07-07/dungen-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/dungen/2022-07-07/dungen-20220707-git.tgz"; sha256 = "1yvkch227g0yawv2682ysdv9q2g5yyyxjvfpx3hijl0mm0awgxv5"; system = "dungen"; asd = "dungen"; @@ -49115,7 +49870,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "duologue" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/duologue/2023-02-14/duologue-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/duologue/2023-02-14/duologue-20230214-git.tgz"; sha256 = "1yg7f27im9h0m6jihcay1p7alfhzm9hafwm5dw5hsyacy8f2cwk2"; system = "duologue"; asd = "duologue"; @@ -49142,7 +49897,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "duologue-readline" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/duologue/2023-02-14/duologue-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/duologue/2023-02-14/duologue-20230214-git.tgz"; sha256 = "1yg7f27im9h0m6jihcay1p7alfhzm9hafwm5dw5hsyacy8f2cwk2"; system = "duologue-readline"; asd = "duologue-readline"; @@ -49171,7 +49926,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "duologue-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/duologue/2023-02-14/duologue-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/duologue/2023-02-14/duologue-20230214-git.tgz"; sha256 = "1yg7f27im9h0m6jihcay1p7alfhzm9hafwm5dw5hsyacy8f2cwk2"; system = "duologue-test"; asd = "duologue-test"; @@ -49194,7 +49949,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dweet" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dweet/2014-12-17/dweet-20141217-git.tgz"; + url = "https://beta.quicklisp.org/archive/dweet/2014-12-17/dweet-20141217-git.tgz"; sha256 = "1i3ab3igvdy6fhq3zlx1vaswhvm9dlp6fagzxbrqhqj6jsbhiwv7"; system = "dweet"; asd = "dweet"; @@ -49218,7 +49973,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dynamic-array" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dynamic-array/2022-07-07/dynamic-array-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/dynamic-array/2022-07-07/dynamic-array-20220707-git.tgz"; sha256 = "02kg1m5xscg521074nasx3f04784jbm0x61a7skixbdprpg6hhnh"; system = "dynamic-array"; asd = "dynamic-array"; @@ -49238,7 +49993,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dynamic-classes" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dynamic-classes/2023-10-21/dynamic-classes-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/dynamic-classes/2023-10-21/dynamic-classes-20231021-git.tgz"; sha256 = "1k9lkchwyi2xhygp2v8ifq3kg1l3wcnihhzgr06jrivjxgdqpc1a"; system = "dynamic-classes"; asd = "dynamic-classes"; @@ -49258,7 +50013,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dynamic-classes-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dynamic-classes/2023-10-21/dynamic-classes-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/dynamic-classes/2023-10-21/dynamic-classes-20231021-git.tgz"; sha256 = "1k9lkchwyi2xhygp2v8ifq3kg1l3wcnihhzgr06jrivjxgdqpc1a"; system = "dynamic-classes-test"; asd = "dynamic-classes-test"; @@ -49281,7 +50036,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dynamic-collect" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dynamic-collect/2023-06-18/dynamic-collect-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/dynamic-collect/2023-06-18/dynamic-collect-20230618-git.tgz"; sha256 = "0p1ylba1myby21jg8x9lgwxfv958za32qsz426yd2vc485j887iw"; system = "dynamic-collect"; asd = "dynamic-collect"; @@ -49301,7 +50056,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dynamic-mixins" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dynamic-mixins/2018-10-18/dynamic-mixins-20181018-git.tgz"; + url = "https://beta.quicklisp.org/archive/dynamic-mixins/2018-10-18/dynamic-mixins-20181018-git.tgz"; sha256 = "00g3s509ysh2jp1qwsgb5bwl6qvhzcljwjz3z4mspbcak51484zj"; system = "dynamic-mixins"; asd = "dynamic-mixins"; @@ -49320,12 +50075,12 @@ lib.makeScope pkgs.newScope (self: { dynamic-mixins-swm = ( build-asdf-system { pname = "dynamic-mixins-swm"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "dynamic-mixins-swm" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/stumpwm/2023-10-21/stumpwm-20231021-git.tgz"; - sha256 = "114kicsziqvm15x15yhc39j8qzv6gxz4wxc40xp968pprzr4a4d1"; + url = "https://beta.quicklisp.org/archive/stumpwm/2025-06-22/stumpwm-20250622-git.tgz"; + sha256 = "1l4rxcva947ijxsfnzyy35ql7a8pjsxaag51pq2bib3qfy7wg5ld"; system = "dynamic-mixins-swm"; asd = "dynamic-mixins-swm"; } @@ -49344,7 +50099,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "dynamic-wind" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/contextl/2024-10-12/contextl-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/contextl/2024-10-12/contextl-20241012-git.tgz"; sha256 = "1jsa5wyjzzfw9pii3d6x20mh8ijnpb291g3i0y2ccj0x8z3xfyyk"; system = "dynamic-wind"; asd = "dynamic-wind"; @@ -49364,7 +50119,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "eager-future" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/eager-future/2010-10-06/eager-future-20101006-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/eager-future/2010-10-06/eager-future-20101006-darcs.tgz"; sha256 = "0l7khqfqfchk7j24fk7rwagwanjargxsrzr6g1h4ainqjajd91jl"; system = "eager-future"; asd = "eager-future"; @@ -49384,7 +50139,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "eager-future.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/eager-future/2010-10-06/eager-future-20101006-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/eager-future/2010-10-06/eager-future-20101006-darcs.tgz"; sha256 = "0l7khqfqfchk7j24fk7rwagwanjargxsrzr6g1h4ainqjajd91jl"; system = "eager-future.test"; asd = "eager-future"; @@ -49407,7 +50162,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "eager-future2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/eager-future2/2019-11-30/eager-future2-20191130-git.tgz"; + url = "https://beta.quicklisp.org/archive/eager-future2/2019-11-30/eager-future2-20191130-git.tgz"; sha256 = "1qs1bv3m0ki8l5czhsflxcryh22r9d9g9a3a3b0cr0pl954q5rld"; system = "eager-future2"; asd = "eager-future2"; @@ -49428,7 +50183,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "easing" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/easing/2018-02-28/easing-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/easing/2018-02-28/easing-20180228-git.tgz"; sha256 = "0750cs5kij8hi53960lzih57xrf92fj23i3hxzhqzcyla4wi4jv5"; system = "easing"; asd = "easing"; @@ -49448,7 +50203,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "easing-demo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/easing/2018-02-28/easing-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/easing/2018-02-28/easing-20180228-git.tgz"; sha256 = "0750cs5kij8hi53960lzih57xrf92fj23i3hxzhqzcyla4wi4jv5"; system = "easing-demo"; asd = "easing-demo"; @@ -49471,7 +50226,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "easing-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/easing/2018-02-28/easing-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/easing/2018-02-28/easing-20180228-git.tgz"; sha256 = "0750cs5kij8hi53960lzih57xrf92fj23i3hxzhqzcyla4wi4jv5"; system = "easing-test"; asd = "easing-test"; @@ -49494,7 +50249,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "easter-gauss" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/easter-gauss/2024-10-12/easter-gauss-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/easter-gauss/2024-10-12/easter-gauss-20241012-git.tgz"; sha256 = "1wgr7j8b32yq0ajy4a3g08yr7z4p987gfjsrd6gai5i9zqxkbyih"; system = "easter-gauss"; asd = "easter-gauss"; @@ -49510,12 +50265,12 @@ lib.makeScope pkgs.newScope (self: { easy-audio = ( build-asdf-system { pname = "easy-audio"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "easy-audio" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/easy-audio/2024-10-12/easy-audio-20241012-git.tgz"; - sha256 = "1vlk2lzipz7sspizv4fiv6nmxhgq9piangc6gfxz6m5k3r74mwrg"; + url = "https://beta.quicklisp.org/archive/easy-audio/2025-06-22/easy-audio-20250622-git.tgz"; + sha256 = "1g8yrzrc6bv2487581hbfx1wjhf3gwvzznrfbmchqrfpx16vbmf1"; system = "easy-audio"; asd = "easy-audio"; } @@ -49526,6 +50281,7 @@ lib.makeScope pkgs.newScope (self: { (getAttr "flexi-streams" self) (getAttr "nibbles-streams" self) (getAttr "serapeum" self) + (getAttr "stateless-iterators" self) ]; meta = { hydraPlatforms = [ ]; @@ -49539,7 +50295,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "easy-bind" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/easy-bind/2019-02-02/easy-bind-20190202-git.tgz"; + url = "https://beta.quicklisp.org/archive/easy-bind/2019-02-02/easy-bind-20190202-git.tgz"; sha256 = "0z7mqm7vnk8jcsmawlyhzg81v2bmgdbxmx3jkf2m74170q78jhkl"; system = "easy-bind"; asd = "easy-bind"; @@ -49559,7 +50315,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "easy-macros" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/easy-macros/2024-10-12/easy-macros-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/easy-macros/2024-10-12/easy-macros-20241012-git.tgz"; sha256 = "12ixfmxbxszhdcv2fnd9q8m573bn6q2nvn656bpwnzvka9si6vrq"; system = "easy-macros"; asd = "easy-macros"; @@ -49575,12 +50331,12 @@ lib.makeScope pkgs.newScope (self: { easy-routes = ( build-asdf-system { pname = "easy-routes"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "easy-routes" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/easy-routes/2024-10-12/easy-routes-20241012-git.tgz"; - sha256 = "0bz91g0vd1nn9b23npmrjw2ig6fahjs3b6iiw7ncajc2w5x9w1y4"; + url = "https://beta.quicklisp.org/archive/easy-routes/2025-06-22/easy-routes-20250622-git.tgz"; + sha256 = "0mw5w1gcss15b3wz1n9g7pd30a6d2w2xssfiznx3a61n7h7prb93"; system = "easy-routes"; asd = "easy-routes"; } @@ -49598,12 +50354,12 @@ lib.makeScope pkgs.newScope (self: { easy-routes_plus_djula = ( build-asdf-system { pname = "easy-routes+djula"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "easy-routes+djula" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/easy-routes/2024-10-12/easy-routes-20241012-git.tgz"; - sha256 = "0bz91g0vd1nn9b23npmrjw2ig6fahjs3b6iiw7ncajc2w5x9w1y4"; + url = "https://beta.quicklisp.org/archive/easy-routes/2025-06-22/easy-routes-20250622-git.tgz"; + sha256 = "0mw5w1gcss15b3wz1n9g7pd30a6d2w2xssfiznx3a61n7h7prb93"; system = "easy-routes+djula"; asd = "easy-routes+djula"; } @@ -49621,12 +50377,12 @@ lib.makeScope pkgs.newScope (self: { easy-routes_plus_errors = ( build-asdf-system { pname = "easy-routes+errors"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "easy-routes+errors" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/easy-routes/2024-10-12/easy-routes-20241012-git.tgz"; - sha256 = "0bz91g0vd1nn9b23npmrjw2ig6fahjs3b6iiw7ncajc2w5x9w1y4"; + url = "https://beta.quicklisp.org/archive/easy-routes/2025-06-22/easy-routes-20250622-git.tgz"; + sha256 = "0mw5w1gcss15b3wz1n9g7pd30a6d2w2xssfiznx3a61n7h7prb93"; system = "easy-routes+errors"; asd = "easy-routes+errors"; } @@ -49648,7 +50404,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "eazy-documentation" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/eazy-documentation/2021-04-11/eazy-documentation-20210411-git.tgz"; + url = "https://beta.quicklisp.org/archive/eazy-documentation/2021-04-11/eazy-documentation-20210411-git.tgz"; sha256 = "0wqd6jih98ab8qpajmcmbj0cwa3g6jjbr7v0wp5gqn1wllwn70ix"; system = "eazy-documentation"; asd = "eazy-documentation"; @@ -49678,7 +50434,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "eazy-gnuplot" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/eazy-gnuplot/2022-03-31/eazy-gnuplot-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/eazy-gnuplot/2022-03-31/eazy-gnuplot-20220331-git.tgz"; sha256 = "0mpkx1z52riahydzvqv7kk15p0pv2k7k5a7j65fg571kcxmssx8s"; system = "eazy-gnuplot"; asd = "eazy-gnuplot"; @@ -49702,7 +50458,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "eazy-gnuplot.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/eazy-gnuplot/2022-03-31/eazy-gnuplot-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/eazy-gnuplot/2022-03-31/eazy-gnuplot-20220331-git.tgz"; sha256 = "0mpkx1z52riahydzvqv7kk15p0pv2k7k5a7j65fg571kcxmssx8s"; system = "eazy-gnuplot.test"; asd = "eazy-gnuplot.test"; @@ -49725,7 +50481,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "eazy-process" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/eazy-process/2020-09-25/eazy-process-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/eazy-process/2020-09-25/eazy-process-20200925-git.tgz"; sha256 = "1fvc613jg3b0kra664lbyyzvig7sm1xzaawack28c5m61yiwakiw"; system = "eazy-process"; asd = "eazy-process"; @@ -49755,7 +50511,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "eazy-process.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/eazy-process/2020-09-25/eazy-process-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/eazy-process/2020-09-25/eazy-process-20200925-git.tgz"; sha256 = "1fvc613jg3b0kra664lbyyzvig7sm1xzaawack28c5m61yiwakiw"; system = "eazy-process.test"; asd = "eazy-process.test"; @@ -49778,7 +50534,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "eazy-project" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/eazy-project/2019-07-10/eazy-project-20190710-git.tgz"; + url = "https://beta.quicklisp.org/archive/eazy-project/2019-07-10/eazy-project-20190710-git.tgz"; sha256 = "1dfzvsvzdwcfvynvik9kwhgil9m08jx8r0vwqj7l1m2d9zm4db3b"; system = "eazy-project"; asd = "eazy-project"; @@ -49809,7 +50565,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "eazy-project.autoload" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/eazy-project/2019-07-10/eazy-project-20190710-git.tgz"; + url = "https://beta.quicklisp.org/archive/eazy-project/2019-07-10/eazy-project-20190710-git.tgz"; sha256 = "1dfzvsvzdwcfvynvik9kwhgil9m08jx8r0vwqj7l1m2d9zm4db3b"; system = "eazy-project.autoload"; asd = "eazy-project.autoload"; @@ -49829,7 +50585,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "eazy-project.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/eazy-project/2019-07-10/eazy-project-20190710-git.tgz"; + url = "https://beta.quicklisp.org/archive/eazy-project/2019-07-10/eazy-project-20190710-git.tgz"; sha256 = "1dfzvsvzdwcfvynvik9kwhgil9m08jx8r0vwqj7l1m2d9zm4db3b"; system = "eazy-project.test"; asd = "eazy-project.test"; @@ -49852,7 +50608,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ec2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ec2/2012-09-09/ec2-20120909-git.tgz"; + url = "https://beta.quicklisp.org/archive/ec2/2012-09-09/ec2-20120909-git.tgz"; sha256 = "1z9yv1b8ckyvla80rha7amfhhy57kylkscf504rpfx8994fnfbsy"; system = "ec2"; asd = "ec2"; @@ -49877,7 +50633,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ec2-price-finder" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ec2-price-finder/2021-05-31/ec2-price-finder-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/ec2-price-finder/2021-05-31/ec2-price-finder-20210531-git.tgz"; sha256 = "1511py79fj0xpzzjlfk6fchp6lmikvhy42s3p6s85fbq4dyj4mpj"; system = "ec2-price-finder"; asd = "ec2-price-finder"; @@ -49902,12 +50658,12 @@ lib.makeScope pkgs.newScope (self: { ecclesia = ( build-asdf-system { pname = "ecclesia"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "ecclesia" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ecclesia/2023-10-21/ecclesia-20231021-git.tgz"; - sha256 = "0hamxgkqq833m02wjnghnjq9ny9k8xk3qx1wffm809qsm9ivwah8"; + url = "https://beta.quicklisp.org/archive/ecclesia/2025-06-22/ecclesia-20250622-git.tgz"; + sha256 = "1435124psvgbsvzbvx0bm14715hbx8id0c4ixsdgc74sb5034idy"; system = "ecclesia"; asd = "ecclesia"; } @@ -49926,7 +50682,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "eclecticse.iso-8601-date" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/iso-8601-date/2019-01-07/iso-8601-date-20190107-git.tgz"; + url = "https://beta.quicklisp.org/archive/iso-8601-date/2019-01-07/iso-8601-date-20190107-git.tgz"; sha256 = "12d6jyznglm13sb04xh5l0d0bwi4y449wdyifvfy7r03qy8wypdx"; system = "eclecticse.iso-8601-date"; asd = "eclecticse.iso-8601-date"; @@ -49946,7 +50702,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "eclecticse.omer" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/omer-count/2021-04-11/omer-count-20210411-git.tgz"; + url = "https://beta.quicklisp.org/archive/omer-count/2021-04-11/omer-count-20210411-git.tgz"; sha256 = "1rvg7rfalvi28x3jkknfdyf4y7zjrqdx073iqi2gin4amin6n7jv"; system = "eclecticse.omer"; asd = "eclecticse.omer"; @@ -49966,7 +50722,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "eclecticse.slk-581" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/slk-581/2019-01-07/slk-581-20190107-git.tgz"; + url = "https://beta.quicklisp.org/archive/slk-581/2019-01-07/slk-581-20190107-git.tgz"; sha256 = "1pxyr1gi4ppnfld399wiypqqkgm3bqd9kpizpwgll2fd10yh2qmf"; system = "eclecticse.slk-581"; asd = "eclecticse.slk-581"; @@ -49982,12 +50738,12 @@ lib.makeScope pkgs.newScope (self: { eclector = ( build-asdf-system { pname = "eclector"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "eclector" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/eclector/2024-10-12/eclector-20241012-git.tgz"; - sha256 = "06qhll5k0hq652gdzvvhcv4amqg9z7qillnn3z9cm8z9sv1n912v"; + url = "https://beta.quicklisp.org/archive/eclector/2025-06-22/eclector-20250622-git.tgz"; + sha256 = "16yhh2zb9616zk1dsw2qbngq8pz2hhgq82habz8x3rg0sxwwnw8v"; system = "eclector"; asd = "eclector"; } @@ -50006,12 +50762,12 @@ lib.makeScope pkgs.newScope (self: { eclector-concrete-syntax-tree = ( build-asdf-system { pname = "eclector-concrete-syntax-tree"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "eclector-concrete-syntax-tree" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/eclector/2024-10-12/eclector-20241012-git.tgz"; - sha256 = "06qhll5k0hq652gdzvvhcv4amqg9z7qillnn3z9cm8z9sv1n912v"; + url = "https://beta.quicklisp.org/archive/eclector/2025-06-22/eclector-20250622-git.tgz"; + sha256 = "16yhh2zb9616zk1dsw2qbngq8pz2hhgq82habz8x3rg0sxwwnw8v"; system = "eclector-concrete-syntax-tree"; asd = "eclector-concrete-syntax-tree"; } @@ -50030,12 +50786,12 @@ lib.makeScope pkgs.newScope (self: { eclector_dot_syntax-extensions = ( build-asdf-system { pname = "eclector.syntax-extensions"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "eclector.syntax-extensions" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/eclector/2024-10-12/eclector-20241012-git.tgz"; - sha256 = "06qhll5k0hq652gdzvvhcv4amqg9z7qillnn3z9cm8z9sv1n912v"; + url = "https://beta.quicklisp.org/archive/eclector/2025-06-22/eclector-20250622-git.tgz"; + sha256 = "16yhh2zb9616zk1dsw2qbngq8pz2hhgq82habz8x3rg0sxwwnw8v"; system = "eclector.syntax-extensions"; asd = "eclector.syntax-extensions"; } @@ -50054,7 +50810,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "eco" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/eco/2019-08-13/eco-20190813-git.tgz"; + url = "https://beta.quicklisp.org/archive/eco/2019-08-13/eco-20190813-git.tgz"; sha256 = "13fsv9v7fhf05p7j1hrfy2sg813wmgsp9aw4ng4cpzdss24zvf7q"; system = "eco"; asd = "eco"; @@ -50079,7 +50835,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "eco-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/eco/2019-08-13/eco-20190813-git.tgz"; + url = "https://beta.quicklisp.org/archive/eco/2019-08-13/eco-20190813-git.tgz"; sha256 = "13fsv9v7fhf05p7j1hrfy2sg813wmgsp9aw4ng4cpzdss24zvf7q"; system = "eco-test"; asd = "eco-test"; @@ -50102,7 +50858,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "edit-distance" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-editdistance/2022-03-31/cl-editdistance-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-editdistance/2022-03-31/cl-editdistance-20220331-git.tgz"; sha256 = "0nzbgq69wak18vwpk0fp68x8shdxq5vy70213dc2r0hwfzzc10v9"; system = "edit-distance"; asd = "edit-distance"; @@ -50122,7 +50878,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "edit-distance-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-editdistance/2022-03-31/cl-editdistance-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-editdistance/2022-03-31/cl-editdistance-20220331-git.tgz"; sha256 = "0nzbgq69wak18vwpk0fp68x8shdxq5vy70213dc2r0hwfzzc10v9"; system = "edit-distance-test"; asd = "edit-distance-test"; @@ -50148,7 +50904,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "elb-log" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/elb-log/2015-09-23/elb-log-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/elb-log/2015-09-23/elb-log-20150923-git.tgz"; sha256 = "1d0vkmkjr6d96j7cggw5frj50jf14brbm63is41zwfkfl9r4i6bp"; system = "elb-log"; asd = "elb-log"; @@ -50176,7 +50932,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "elb-log-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/elb-log/2015-09-23/elb-log-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/elb-log/2015-09-23/elb-log-20150923-git.tgz"; sha256 = "1d0vkmkjr6d96j7cggw5frj50jf14brbm63is41zwfkfl9r4i6bp"; system = "elb-log-test"; asd = "elb-log-test"; @@ -50200,7 +50956,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "electron-tools" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/electron-tools/2016-04-21/electron-tools-20160421-git.tgz"; + url = "https://beta.quicklisp.org/archive/electron-tools/2016-04-21/electron-tools-20160421-git.tgz"; sha256 = "0fr16gsbn87vyyjpn2gndhpjg7yzsn4j7skyn0py252cvdk5ygf7"; system = "electron-tools"; asd = "electron-tools"; @@ -50225,7 +50981,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "electron-tools-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/electron-tools/2016-04-21/electron-tools-20160421-git.tgz"; + url = "https://beta.quicklisp.org/archive/electron-tools/2016-04-21/electron-tools-20160421-git.tgz"; sha256 = "0fr16gsbn87vyyjpn2gndhpjg7yzsn4j7skyn0py252cvdk5ygf7"; system = "electron-tools-test"; asd = "electron-tools-test"; @@ -50249,7 +51005,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "elf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/elf/2019-07-10/elf-20190710-git.tgz"; + url = "https://beta.quicklisp.org/archive/elf/2019-07-10/elf-20190710-git.tgz"; sha256 = "0rd1qcczr2gx76fmxia0kix0p5b49myc9fndibkvwc94cxg085gk"; system = "elf"; asd = "elf"; @@ -50277,7 +51033,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "enchant" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-enchant/2024-10-12/cl-enchant-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-enchant/2024-10-12/cl-enchant-20241012-git.tgz"; sha256 = "1fcxyb9b8g0v2il2q4xj7z19y1qfxvgd34zax8sdjvl4rp66b08v"; system = "enchant"; asd = "enchant"; @@ -50295,7 +51051,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "enhanced-boolean" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/enhanced-boolean/2020-03-25/enhanced-boolean_1.0.tgz"; + url = "https://beta.quicklisp.org/archive/enhanced-boolean/2020-03-25/enhanced-boolean_1.0.tgz"; sha256 = "17l18lz07fk2kg835vs6c3189d230n1rm9vghk3ls4i356gbq0gy"; system = "enhanced-boolean"; asd = "enhanced-boolean"; @@ -50315,7 +51071,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "enhanced-boolean_tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/enhanced-boolean/2020-03-25/enhanced-boolean_1.0.tgz"; + url = "https://beta.quicklisp.org/archive/enhanced-boolean/2020-03-25/enhanced-boolean_1.0.tgz"; sha256 = "17l18lz07fk2kg835vs6c3189d230n1rm9vghk3ls4i356gbq0gy"; system = "enhanced-boolean_tests"; asd = "enhanced-boolean_tests"; @@ -50338,7 +51094,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "enhanced-defclass" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/enhanced-defclass/2021-04-11/enhanced-defclass_2.1.tgz"; + url = "https://beta.quicklisp.org/archive/enhanced-defclass/2021-04-11/enhanced-defclass_2.1.tgz"; sha256 = "142s5c3pl3x7xdawzsj8pdxiqp4wh6fcajf4la5msvnxgf66d8wg"; system = "enhanced-defclass"; asd = "enhanced-defclass"; @@ -50366,7 +51122,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "enhanced-defclass_tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/enhanced-defclass/2021-04-11/enhanced-defclass_2.1.tgz"; + url = "https://beta.quicklisp.org/archive/enhanced-defclass/2021-04-11/enhanced-defclass_2.1.tgz"; sha256 = "142s5c3pl3x7xdawzsj8pdxiqp4wh6fcajf4la5msvnxgf66d8wg"; system = "enhanced-defclass_tests"; asd = "enhanced-defclass_tests"; @@ -50389,7 +51145,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "enhanced-eval-when" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/enhanced-eval-when/2023-10-21/enhanced-eval-when_2.0.tgz"; + url = "https://beta.quicklisp.org/archive/enhanced-eval-when/2023-10-21/enhanced-eval-when_2.0.tgz"; sha256 = "1l7n04pzcwsxvw6m4pcksmlx525ijbgh5n28h56clpvpwlwnzjs3"; system = "enhanced-eval-when"; asd = "enhanced-eval-when"; @@ -50409,7 +51165,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "enhanced-eval-when_tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/enhanced-eval-when/2023-10-21/enhanced-eval-when_2.0.tgz"; + url = "https://beta.quicklisp.org/archive/enhanced-eval-when/2023-10-21/enhanced-eval-when_2.0.tgz"; sha256 = "1l7n04pzcwsxvw6m4pcksmlx525ijbgh5n28h56clpvpwlwnzjs3"; system = "enhanced-eval-when_tests"; asd = "enhanced-eval-when_tests"; @@ -50432,7 +51188,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "enhanced-find-class" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/enhanced-find-class/2020-09-25/enhanced-find-class_1.0.tgz"; + url = "https://beta.quicklisp.org/archive/enhanced-find-class/2020-09-25/enhanced-find-class_1.0.tgz"; sha256 = "1pf1mxb238zrmvgm9s0456s1x0m317ls23ls1d987riw69y3w9vx"; system = "enhanced-find-class"; asd = "enhanced-find-class"; @@ -50452,7 +51208,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "enhanced-find-class_tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/enhanced-find-class/2020-09-25/enhanced-find-class_1.0.tgz"; + url = "https://beta.quicklisp.org/archive/enhanced-find-class/2020-09-25/enhanced-find-class_1.0.tgz"; sha256 = "1pf1mxb238zrmvgm9s0456s1x0m317ls23ls1d987riw69y3w9vx"; system = "enhanced-find-class_tests"; asd = "enhanced-find-class_tests"; @@ -50475,7 +51231,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "enhanced-multiple-value-bind" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/enhanced-multiple-value-bind/2023-10-21/enhanced-multiple-value-bind_2.0.tgz"; + url = "https://beta.quicklisp.org/archive/enhanced-multiple-value-bind/2023-10-21/enhanced-multiple-value-bind_2.0.tgz"; sha256 = "191h0rd3fs5vqc15kvblvvwmvcqddmvj3s8x6xfp78gm69wk9bdq"; system = "enhanced-multiple-value-bind"; asd = "enhanced-multiple-value-bind"; @@ -50495,7 +51251,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "enhanced-multiple-value-bind_tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/enhanced-multiple-value-bind/2023-10-21/enhanced-multiple-value-bind_2.0.tgz"; + url = "https://beta.quicklisp.org/archive/enhanced-multiple-value-bind/2023-10-21/enhanced-multiple-value-bind_2.0.tgz"; sha256 = "191h0rd3fs5vqc15kvblvvwmvcqddmvj3s8x6xfp78gm69wk9bdq"; system = "enhanced-multiple-value-bind_tests"; asd = "enhanced-multiple-value-bind_tests"; @@ -50519,7 +51275,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "enhanced-typep" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/enhanced-typep/2020-10-16/enhanced-typep_1.0.tgz"; + url = "https://beta.quicklisp.org/archive/enhanced-typep/2020-10-16/enhanced-typep_1.0.tgz"; sha256 = "0b22gddkbxnhmi71wa2h51495737lrvsqxnri7g1qdsl1hraml21"; system = "enhanced-typep"; asd = "enhanced-typep"; @@ -50539,7 +51295,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "enhanced-typep_tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/enhanced-typep/2020-10-16/enhanced-typep_1.0.tgz"; + url = "https://beta.quicklisp.org/archive/enhanced-typep/2020-10-16/enhanced-typep_1.0.tgz"; sha256 = "0b22gddkbxnhmi71wa2h51495737lrvsqxnri7g1qdsl1hraml21"; system = "enhanced-typep_tests"; asd = "enhanced-typep_tests"; @@ -50563,7 +51319,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "enhanced-unwind-protect" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/enhanced-unwind-protect/2023-10-21/enhanced-unwind-protect_1.0.tgz"; + url = "https://beta.quicklisp.org/archive/enhanced-unwind-protect/2023-10-21/enhanced-unwind-protect_1.0.tgz"; sha256 = "00yak6ga0rsz58r96clmzvqbcmnfxcdxvn3h3ysirrsfr8rayy5m"; system = "enhanced-unwind-protect"; asd = "enhanced-unwind-protect"; @@ -50583,7 +51339,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "enhanced-unwind-protect_tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/enhanced-unwind-protect/2023-10-21/enhanced-unwind-protect_1.0.tgz"; + url = "https://beta.quicklisp.org/archive/enhanced-unwind-protect/2023-10-21/enhanced-unwind-protect_1.0.tgz"; sha256 = "00yak6ga0rsz58r96clmzvqbcmnfxcdxvn3h3ysirrsfr8rayy5m"; system = "enhanced-unwind-protect_tests"; asd = "enhanced-unwind-protect_tests"; @@ -50602,12 +51358,12 @@ lib.makeScope pkgs.newScope (self: { enumerations = ( build-asdf-system { pname = "enumerations"; - version = "20230214-git"; + version = "20250622-git"; asds = [ "enumerations" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-enumeration/2023-02-14/cl-enumeration-20230214-git.tgz"; - sha256 = "08jp5sf1230d4yyr7jyjqv235hdjjbmabh8r5lsqjh4kgqbwrvqr"; + url = "https://beta.quicklisp.org/archive/cl-enumeration/2025-06-22/cl-enumeration-20250622-git.tgz"; + sha256 = "1ldidii8a9qrl5l43cxx23x2nm9nqhrc259nq623qfxzakxdwlwz"; system = "enumerations"; asd = "enumerations"; } @@ -50626,7 +51382,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "envy" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/envy/2022-03-31/envy-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/envy/2022-03-31/envy-20220331-git.tgz"; sha256 = "1r0wgimd7z57x8cv69sw76w3y5l70hq50882a9nq5l4v64lg55fq"; system = "envy"; asd = "envy"; @@ -50646,7 +51402,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "envy-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/envy/2022-03-31/envy-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/envy/2022-03-31/envy-20220331-git.tgz"; sha256 = "1r0wgimd7z57x8cv69sw76w3y5l70hq50882a9nq5l4v64lg55fq"; system = "envy-test"; asd = "envy-test"; @@ -50670,7 +51426,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "eos" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/eos/2020-09-25/eos-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/eos/2020-09-25/eos-20200925-git.tgz"; sha256 = "1afllvmlnx97yzz404gycl3pa3kwx427k3hrbf37rpmjlv47knhk"; system = "eos"; asd = "eos"; @@ -50690,7 +51446,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "eos-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/eos/2020-09-25/eos-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/eos/2020-09-25/eos-20200925-git.tgz"; sha256 = "1afllvmlnx97yzz404gycl3pa3kwx427k3hrbf37rpmjlv47knhk"; system = "eos-tests"; asd = "eos"; @@ -50710,7 +51466,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "epigraph" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/epigraph/2020-03-25/epigraph-20200325-git.tgz"; + url = "https://beta.quicklisp.org/archive/epigraph/2020-03-25/epigraph-20200325-git.tgz"; sha256 = "0gqiv23grdiz6pfly7mqyfmq4c6nwcamlvgsnixn8qi9md7b9d64"; system = "epigraph"; asd = "epigraph"; @@ -50730,7 +51486,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "epigraph-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/epigraph/2020-03-25/epigraph-20200325-git.tgz"; + url = "https://beta.quicklisp.org/archive/epigraph/2020-03-25/epigraph-20200325-git.tgz"; sha256 = "0gqiv23grdiz6pfly7mqyfmq4c6nwcamlvgsnixn8qi9md7b9d64"; system = "epigraph-test"; asd = "epigraph"; @@ -50753,7 +51509,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "epmd" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-epmd/2014-02-11/cl-epmd-20140211-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-epmd/2014-02-11/cl-epmd-20140211-git.tgz"; sha256 = "1334856x7jqhv52wlab6wxmfqslj21pmryx3lwmlsn7c3ypwz4rw"; system = "epmd"; asd = "epmd"; @@ -50776,7 +51532,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "epmd-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-epmd/2014-02-11/cl-epmd-20140211-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-epmd/2014-02-11/cl-epmd-20140211-git.tgz"; sha256 = "1334856x7jqhv52wlab6wxmfqslj21pmryx3lwmlsn7c3ypwz4rw"; system = "epmd-test"; asd = "epmd-test"; @@ -50800,7 +51556,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "equals" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/equals/2024-10-12/equals-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/equals/2024-10-12/equals-20241012-git.tgz"; sha256 = "1pzhj748dgjcw6qffkykxx156y78wy3bsbqmq5ijkybfjpnfsg27"; system = "equals"; asd = "equals"; @@ -50820,7 +51576,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "erjoalgo-webutil" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/erjoalgo-webutil/2024-10-12/erjoalgo-webutil-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/erjoalgo-webutil/2024-10-12/erjoalgo-webutil-20241012-git.tgz"; sha256 = "1mf9f23p6pagdi97k306a6122a5djx06nfwsxnx61gbyir2cpl2c"; system = "erjoalgo-webutil"; asd = "erjoalgo-webutil"; @@ -50848,7 +51604,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "erlang-term" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-erlang-term/2022-02-20/cl-erlang-term-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-erlang-term/2022-02-20/cl-erlang-term-20220220-git.tgz"; sha256 = "1rmnbirbvwmik3j0xkkn90kzx90klrwx7hmscl0ywcbaprm71wkv"; system = "erlang-term"; asd = "erlang-term"; @@ -50873,7 +51629,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "erlang-term-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-erlang-term/2022-02-20/cl-erlang-term-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-erlang-term/2022-02-20/cl-erlang-term-20220220-git.tgz"; sha256 = "1rmnbirbvwmik3j0xkkn90kzx90klrwx7hmscl0ywcbaprm71wkv"; system = "erlang-term-test"; asd = "erlang-term-test"; @@ -50897,7 +51653,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ernestine" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ernestine/2022-02-20/ernestine-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/ernestine/2022-02-20/ernestine-20220220-git.tgz"; sha256 = "1gl8pjp44j01nfw9dzk1qdl6njnqcaccp5czcr5rq47l1aicrymn"; system = "ernestine"; asd = "ernestine"; @@ -50922,7 +51678,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ernestine-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ernestine/2022-02-20/ernestine-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/ernestine/2022-02-20/ernestine-20220220-git.tgz"; sha256 = "1gl8pjp44j01nfw9dzk1qdl6njnqcaccp5czcr5rq47l1aicrymn"; system = "ernestine-tests"; asd = "ernestine-tests"; @@ -50945,7 +51701,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "erudite" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/erudite/2024-10-12/erudite-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/erudite/2024-10-12/erudite-20241012-git.tgz"; sha256 = "159fmpm770rnixdpzpmzvqzd2kpns5mglpdxykvv2lqlnac24jn5"; system = "erudite"; asd = "erudite"; @@ -50973,7 +51729,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "erudite-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/erudite/2024-10-12/erudite-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/erudite/2024-10-12/erudite-20241012-git.tgz"; sha256 = "159fmpm770rnixdpzpmzvqzd2kpns5mglpdxykvv2lqlnac24jn5"; system = "erudite-test"; asd = "erudite-test"; @@ -50992,12 +51748,12 @@ lib.makeScope pkgs.newScope (self: { esa-mcclim = ( build-asdf-system { pname = "esa-mcclim"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "esa-mcclim" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "esa-mcclim"; asd = "esa-mcclim"; } @@ -51019,7 +51775,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "escalator" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/escalator/2020-04-27/escalator-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/escalator/2020-04-27/escalator-20200427-git.tgz"; sha256 = "136n4k983f90cqj6na17ff2fvk9rv4ma8l5y66q7lkbb69idipla"; system = "escalator"; asd = "escalator"; @@ -51039,7 +51795,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "escalator-bench" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/escalator/2020-04-27/escalator-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/escalator/2020-04-27/escalator-20200427-git.tgz"; sha256 = "136n4k983f90cqj6na17ff2fvk9rv4ma8l5y66q7lkbb69idipla"; system = "escalator-bench"; asd = "escalator-bench"; @@ -51058,12 +51814,12 @@ lib.makeScope pkgs.newScope (self: { esrap = ( build-asdf-system { pname = "esrap"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "esrap" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/esrap/2024-10-12/esrap-20241012-git.tgz"; - sha256 = "0pvid1hld03vz2zyszvsxckcpjb2lfl2vjfig6dlrmw3dx8grdj0"; + url = "https://beta.quicklisp.org/archive/esrap/2025-06-22/esrap-20250622-git.tgz"; + sha256 = "0c5w5sbd43apcxj57w88v7pmyf9cavynham4jz5asbx9g72clfv4"; system = "esrap"; asd = "esrap"; } @@ -51083,7 +51839,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "esrap-liquid" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/esrap-liquid/2016-10-31/esrap-liquid-20161031-git.tgz"; + url = "https://beta.quicklisp.org/archive/esrap-liquid/2016-10-31/esrap-liquid-20161031-git.tgz"; sha256 = "0agsi8qx6v3c7r6ri5rp78vdb570pdgkvw80va3045crl61mkjzs"; system = "esrap-liquid"; asd = "esrap-liquid"; @@ -51108,7 +51864,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "esrap-liquid-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/esrap-liquid/2016-10-31/esrap-liquid-20161031-git.tgz"; + url = "https://beta.quicklisp.org/archive/esrap-liquid/2016-10-31/esrap-liquid-20161031-git.tgz"; sha256 = "0agsi8qx6v3c7r6ri5rp78vdb570pdgkvw80va3045crl61mkjzs"; system = "esrap-liquid-tests"; asd = "esrap-liquid"; @@ -51132,7 +51888,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "esrap-peg" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/esrap-peg/2019-10-07/esrap-peg-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/esrap-peg/2019-10-07/esrap-peg-20191007-git.tgz"; sha256 = "0540i7whx1w0n9fdakwk8rnn511xga9xfvczq9y1jcgz1hh42w53"; system = "esrap-peg"; asd = "esrap-peg"; @@ -51155,7 +51911,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "etcd-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-etcd/2023-02-14/cl-etcd-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-etcd/2023-02-14/cl-etcd-20230214-git.tgz"; sha256 = "0bals10r07prxvjxd744vz02ri72isf168lkhrx9qkc96hd214ah"; system = "etcd-test"; asd = "etcd-test"; @@ -51178,7 +51934,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ev" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ev/2015-09-23/cl-ev-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ev/2015-09-23/cl-ev-20150923-git.tgz"; sha256 = "0qnkzkw9mn4w6b0q9y207z8ddnd5a2gn42q55yycp2qrvvv47lhp"; system = "ev"; asd = "ev"; @@ -51201,7 +51957,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "evaled-when" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/evaled-when/2020-09-25/evaled-when_1.0.tgz"; + url = "https://beta.quicklisp.org/archive/evaled-when/2020-09-25/evaled-when_1.0.tgz"; sha256 = "0482s89nb5jyyg5wmb010p914pgq6ls8z5s12hdw7wrpy675kdkh"; system = "evaled-when"; asd = "evaled-when"; @@ -51221,7 +51977,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "evaled-when_tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/evaled-when/2020-09-25/evaled-when_1.0.tgz"; + url = "https://beta.quicklisp.org/archive/evaled-when/2020-09-25/evaled-when_1.0.tgz"; sha256 = "0482s89nb5jyyg5wmb010p914pgq6ls8z5s12hdw7wrpy675kdkh"; system = "evaled-when_tests"; asd = "evaled-when_tests"; @@ -51245,7 +52001,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "event-emitter" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/event-emitter/2024-10-12/event-emitter-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/event-emitter/2024-10-12/event-emitter-20241012-git.tgz"; sha256 = "0kj77r09wbsiq6n62vvgk9fh37p3n3ycmhln1mhswz24rhirnpyn"; system = "event-emitter"; asd = "event-emitter"; @@ -51265,7 +52021,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "event-emitter-benchmark" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/event-emitter/2024-10-12/event-emitter-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/event-emitter/2024-10-12/event-emitter-20241012-git.tgz"; sha256 = "0kj77r09wbsiq6n62vvgk9fh37p3n3ycmhln1mhswz24rhirnpyn"; system = "event-emitter-benchmark"; asd = "event-emitter-benchmark"; @@ -51285,7 +52041,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "event-emitter-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/event-emitter/2024-10-12/event-emitter-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/event-emitter/2024-10-12/event-emitter-20241012-git.tgz"; sha256 = "0kj77r09wbsiq6n62vvgk9fh37p3n3ycmhln1mhswz24rhirnpyn"; system = "event-emitter-test"; asd = "event-emitter-test"; @@ -51308,7 +52064,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "event-glue" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/event-glue/2015-06-08/event-glue-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/event-glue/2015-06-08/event-glue-20150608-git.tgz"; sha256 = "1cmxdx5nawzqafz9b6nswp20d3zlaks44ln4n6bf5jxji9n3vany"; system = "event-glue"; asd = "event-glue"; @@ -51328,7 +52084,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "event-glue-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/event-glue/2015-06-08/event-glue-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/event-glue/2015-06-08/event-glue-20150608-git.tgz"; sha256 = "1cmxdx5nawzqafz9b6nswp20d3zlaks44ln4n6bf5jxji9n3vany"; system = "event-glue-test"; asd = "event-glue-test"; @@ -51351,7 +52107,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "eventbus" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/eventbus/2019-12-27/eventbus-20191227-git.tgz"; + url = "https://beta.quicklisp.org/archive/eventbus/2019-12-27/eventbus-20191227-git.tgz"; sha256 = "0slqx3zq6sbz3rg4g79j8y25sx4405y6ff3x6l5v8v4v42m1s0p2"; system = "eventbus"; asd = "eventbus"; @@ -51371,7 +52127,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "eventfd" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/eventfd/2017-11-30/eventfd-20171130-git.tgz"; + url = "https://beta.quicklisp.org/archive/eventfd/2017-11-30/eventfd-20171130-git.tgz"; sha256 = "1zwg043vqzk665k9dxgxhik20wgkl204anjna94zg6037m33vdiw"; system = "eventfd"; asd = "eventfd"; @@ -51395,7 +52151,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "everblocking-stream" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/everblocking-stream/2018-10-18/everblocking-stream-20181018-git.tgz"; + url = "https://beta.quicklisp.org/archive/everblocking-stream/2018-10-18/everblocking-stream-20181018-git.tgz"; sha256 = "1xvfsx2ldwcprlynikn1rikxh3lfdyzl2p72glzvgh20sm93p1rz"; system = "everblocking-stream"; asd = "everblocking-stream"; @@ -51415,7 +52171,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "evol" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/evol/2010-10-06/evol-20101006-git.tgz"; + url = "https://beta.quicklisp.org/archive/evol/2010-10-06/evol-20101006-git.tgz"; sha256 = "1hp6wygj44llkscqq721xg4a7j5faqjcfc646lvkia5xg81zbf65"; system = "evol"; asd = "evol"; @@ -51443,7 +52199,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "evol-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/evol/2010-10-06/evol-20101006-git.tgz"; + url = "https://beta.quicklisp.org/archive/evol/2010-10-06/evol-20101006-git.tgz"; sha256 = "1hp6wygj44llkscqq721xg4a7j5faqjcfc646lvkia5xg81zbf65"; system = "evol-test"; asd = "evol-test"; @@ -51466,7 +52222,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "example-bot" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispcord/2024-10-12/lispcord-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/lispcord/2024-10-12/lispcord-20241012-git.tgz"; sha256 = "11xwrrvvqdm1wdnxrxqgizgw25plsn28n2k0lm5kakax9n221brn"; system = "example-bot"; asd = "example-bot"; @@ -51479,6 +52235,26 @@ lib.makeScope pkgs.newScope (self: { }; } ); + example-extension = ( + build-asdf-system { + pname = "example-extension"; + version = "stable-9d8b7e7f-git"; + asds = [ "example-extension" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-binary-store/2025-06-22/cl-binary-store-stable-9d8b7e7f-git.tgz"; + sha256 = "1x8g65ij6bbfkd9hcy4wm3frjnb83ip05mvdbpm8hwzgkx1ydf94"; + system = "example-extension"; + asd = "example-extension"; + } + ); + systems = [ "example-extension" ]; + lispLibs = [ (getAttr "cl-binary-store" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); exit-hooks = ( build-asdf-system { pname = "exit-hooks"; @@ -51486,7 +52262,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "exit-hooks" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/exit-hooks/2017-04-03/exit-hooks-20170403-git.tgz"; + url = "https://beta.quicklisp.org/archive/exit-hooks/2017-04-03/exit-hooks-20170403-git.tgz"; sha256 = "00rk0pr2cy3hy6giblh166b7yrg06d5lanipjcqv508gkfb0vi47"; system = "exit-hooks"; asd = "exit-hooks"; @@ -51499,6 +52275,26 @@ lib.makeScope pkgs.newScope (self: { }; } ); + expanders = ( + build-asdf-system { + pname = "expanders"; + version = "20250622-git"; + asds = [ "expanders" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/expanders/2025-06-22/expanders-20250622-git.tgz"; + sha256 = "0lgx5r82l4mxw616xz3s02awq5miga9mb86s7yz8amfx20601qld"; + system = "expanders"; + asd = "expanders"; + } + ); + systems = [ "expanders" ]; + lispLibs = [ (getAttr "alexandria" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); exponential-backoff = ( build-asdf-system { pname = "exponential-backoff"; @@ -51506,7 +52302,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "exponential-backoff" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/exponential-backoff/2015-01-13/exponential-backoff-20150113-git.tgz"; + url = "https://beta.quicklisp.org/archive/exponential-backoff/2015-01-13/exponential-backoff-20150113-git.tgz"; sha256 = "1389hm9hxv85s0125ja4js1bvh8ay4dsy9q1gaynjv27ynik6gmv"; system = "exponential-backoff"; asd = "exponential-backoff"; @@ -51526,7 +52322,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "exscribe" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/exscribe/2020-09-25/exscribe-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/exscribe/2020-09-25/exscribe-20200925-git.tgz"; sha256 = "02vsavasr5nbhrk86b7d8xpr6sm8cyrg3vs2pbpkls2iypffyd2h"; system = "exscribe"; asd = "exscribe"; @@ -51554,7 +52350,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ext-blog" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ext-blog/2016-08-25/ext-blog-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/ext-blog/2016-08-25/ext-blog-20160825-git.tgz"; sha256 = "10qnl3p994wg12c0cn6xgkgmwfip0fk0sjyqyy0j5bdrp32gr5wg"; system = "ext-blog"; asd = "ext-blog"; @@ -51584,7 +52380,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "extended-reals" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/extended-reals/2018-03-28/extended-reals-20180328-git.tgz"; + url = "https://beta.quicklisp.org/archive/extended-reals/2018-03-28/extended-reals-20180328-git.tgz"; sha256 = "0vq191win5sq37mrwjhvi463jqh1mkwbsa0hja69syq789pgaxmb"; system = "extended-reals"; asd = "extended-reals"; @@ -51604,7 +52400,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "extensible-sequences" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sequence-iterators/2013-08-13/sequence-iterators-20130813-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/sequence-iterators/2013-08-13/sequence-iterators-20130813-darcs.tgz"; sha256 = "12flvy6hysqw0fa2jfkxrgphlk6b25hg2w2dxm1ylax0gw9fh1l5"; system = "extensible-sequences"; asd = "extensible-sequences"; @@ -51624,7 +52420,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "external-program" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/external-program/2024-10-12/external-program-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/external-program/2024-10-12/external-program-20241012-git.tgz"; sha256 = "1g7hawsbbfspzljj2spxxv26a5079xsa0kd7dqdclm5n71fypwx6"; system = "external-program"; asd = "external-program"; @@ -51642,7 +52438,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "external-program-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/external-program/2024-10-12/external-program-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/external-program/2024-10-12/external-program-20241012-git.tgz"; sha256 = "1g7hawsbbfspzljj2spxxv26a5079xsa0kd7dqdclm5n71fypwx6"; system = "external-program-test"; asd = "external-program"; @@ -51665,7 +52461,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "external-symbol-not-found" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/external-symbol-not-found/2024-10-12/external-symbol-not-found-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/external-symbol-not-found/2024-10-12/external-symbol-not-found-20241012-git.tgz"; sha256 = "1ic982jbcy71wlni60wnb8hqg3cqw488h4jj5pd2sqmjwv1960v7"; system = "external-symbol-not-found"; asd = "external-symbol-not-found"; @@ -51685,7 +52481,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "f-underscore" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/f-underscore/2010-10-06/f-underscore-20101006-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/f-underscore/2010-10-06/f-underscore-20101006-darcs.tgz"; sha256 = "0mqvb2rxa08y07lj6smp8gf1ig32802fxq7mw5a283f2nkrinnb5"; system = "f-underscore"; asd = "f-underscore"; @@ -51705,7 +52501,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "f2cl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; system = "f2cl"; asd = "f2cl"; @@ -51725,7 +52521,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "f2cl-asdf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; system = "f2cl-asdf"; asd = "f2cl-asdf"; @@ -51745,7 +52541,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "f2cl-lib" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; system = "f2cl-lib"; asd = "f2cl-lib"; @@ -51765,7 +52561,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fact-base" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fact-base/2018-03-28/fact-base-20180328-git.tgz"; + url = "https://beta.quicklisp.org/archive/fact-base/2018-03-28/fact-base-20180328-git.tgz"; sha256 = "14i0vqqxszabhas0z9dfxhvnbsxl4iic77m4i76w7iznmrcma2ar"; system = "fact-base"; asd = "fact-base"; @@ -51790,7 +52586,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "factory-alien" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/factory-alien/2023-06-18/factory-alien-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/factory-alien/2023-06-18/factory-alien-20230618-git.tgz"; sha256 = "0n1fwxapl9vr0cm66gkhihws6zhvg2f4acx017lavn0g42b5fc4a"; system = "factory-alien"; asd = "factory-alien"; @@ -51813,7 +52609,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fakenil" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fakenil/2020-03-25/fakenil_1.0.tgz"; + url = "https://beta.quicklisp.org/archive/fakenil/2020-03-25/fakenil_1.0.tgz"; sha256 = "0ipqax3sgcs1dsgxz8d2pmfg324k6l35pn0nz89w5jl02fia61l3"; system = "fakenil"; asd = "fakenil"; @@ -51833,7 +52629,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fakenil_tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fakenil/2020-03-25/fakenil_1.0.tgz"; + url = "https://beta.quicklisp.org/archive/fakenil/2020-03-25/fakenil_1.0.tgz"; sha256 = "0ipqax3sgcs1dsgxz8d2pmfg324k6l35pn0nz89w5jl02fia61l3"; system = "fakenil_tests"; asd = "fakenil_tests"; @@ -51856,7 +52652,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fare-csv" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fare-csv/2024-10-12/fare-csv-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/fare-csv/2024-10-12/fare-csv-20241012-git.tgz"; sha256 = "153sxb0vyd1cnhfw15j3183kqhcnma0ygaf5svzibknclm16n767"; system = "fare-csv"; asd = "fare-csv"; @@ -51874,7 +52670,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fare-memoization" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fare-memoization/2018-04-30/fare-memoization-20180430-git.tgz"; + url = "https://beta.quicklisp.org/archive/fare-memoization/2018-04-30/fare-memoization-20180430-git.tgz"; sha256 = "1blmrb4c9gsxj87scz74z1s8w9d1w2r48fyxj0y1sw3vr6bsbb8f"; system = "fare-memoization"; asd = "fare-memoization"; @@ -51894,7 +52690,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fare-mop" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fare-mop/2015-12-18/fare-mop-20151218-git.tgz"; + url = "https://beta.quicklisp.org/archive/fare-mop/2015-12-18/fare-mop-20151218-git.tgz"; sha256 = "0maxs8392953fhnaa6zwnm2mdbhxjxipp4g4rvypm06ixr6pyv1c"; system = "fare-mop"; asd = "fare-mop"; @@ -51915,7 +52711,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fare-quasiquote" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz"; sha256 = "034mw3x0jv6q5nxqq8sz77c44dc115x6y52bnzk31qclib88zl7n"; system = "fare-quasiquote"; asd = "fare-quasiquote"; @@ -51933,7 +52729,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fare-quasiquote-extras" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz"; sha256 = "034mw3x0jv6q5nxqq8sz77c44dc115x6y52bnzk31qclib88zl7n"; system = "fare-quasiquote-extras"; asd = "fare-quasiquote-extras"; @@ -51954,7 +52750,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fare-quasiquote-optima" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz"; sha256 = "034mw3x0jv6q5nxqq8sz77c44dc115x6y52bnzk31qclib88zl7n"; system = "fare-quasiquote-optima"; asd = "fare-quasiquote-optima"; @@ -51972,7 +52768,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fare-quasiquote-readtable" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz"; sha256 = "034mw3x0jv6q5nxqq8sz77c44dc115x6y52bnzk31qclib88zl7n"; system = "fare-quasiquote-readtable"; asd = "fare-quasiquote-readtable"; @@ -51993,7 +52789,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fare-scripts" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fare-scripts/2024-10-12/fare-scripts-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/fare-scripts/2024-10-12/fare-scripts-20241012-git.tgz"; sha256 = "08fq1ry4prlww4gr7zris7vywqs3vm1253mqfgx8vg0awrccmf98"; system = "fare-scripts"; asd = "fare-scripts"; @@ -52027,7 +52823,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fare-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fare-utils/2023-02-14/fare-utils-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/fare-utils/2023-02-14/fare-utils-20230214-git.tgz"; sha256 = "0kw6xzavzvpzac3xa6x4681q6w6v6bjk1g71flr2x9xixxg61sak"; system = "fare-utils"; asd = "fare-utils"; @@ -52045,7 +52841,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fare-utils-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fare-utils/2023-02-14/fare-utils-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/fare-utils/2023-02-14/fare-utils-20230214-git.tgz"; sha256 = "0kw6xzavzvpzac3xa6x4681q6w6v6bjk1g71flr2x9xixxg61sak"; system = "fare-utils-test"; asd = "fare-utils-test"; @@ -52061,6 +52857,30 @@ lib.makeScope pkgs.newScope (self: { }; } ); + fast-generic-functions = ( + build-asdf-system { + pname = "fast-generic-functions"; + version = "20250622-git"; + asds = [ "fast-generic-functions" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/fast-generic-functions/2025-06-22/fast-generic-functions-20250622-git.tgz"; + sha256 = "1v2pwmhnyfvhx8hrl1zk2lm4k1a3kqglf696hnfx7zrpz9kwk15m"; + system = "fast-generic-functions"; + asd = "fast-generic-functions"; + } + ); + systems = [ "fast-generic-functions" ]; + lispLibs = [ + (getAttr "closer-mop" self) + (getAttr "sealable-metaobjects" self) + (getAttr "trivial-macroexpand-all" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); fast-http = ( build-asdf-system { pname = "fast-http"; @@ -52068,7 +52888,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fast-http" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fast-http/2024-10-12/fast-http-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/fast-http/2024-10-12/fast-http-20241012-git.tgz"; sha256 = "04cxh2241l9hyzarrxs528v2jjdfm5g3prc2374m4xkrb0wiygh0"; system = "fast-http"; asd = "fast-http"; @@ -52093,7 +52913,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fast-http-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fast-http/2024-10-12/fast-http-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/fast-http/2024-10-12/fast-http-20241012-git.tgz"; sha256 = "04cxh2241l9hyzarrxs528v2jjdfm5g3prc2374m4xkrb0wiygh0"; system = "fast-http-test"; asd = "fast-http-test"; @@ -52120,7 +52940,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fast-io" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fast-io/2022-11-06/fast-io-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/fast-io/2022-11-06/fast-io-20221106-git.tgz"; sha256 = "0wh02yagbqahy9z6787jz5ggpagvr18qd0z13wvwq1vjf8xd2530"; system = "fast-io"; asd = "fast-io"; @@ -52142,7 +52962,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fast-io-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fast-io/2022-11-06/fast-io-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/fast-io/2022-11-06/fast-io-20221106-git.tgz"; sha256 = "0wh02yagbqahy9z6787jz5ggpagvr18qd0z13wvwq1vjf8xd2530"; system = "fast-io-test"; asd = "fast-io-test"; @@ -52166,7 +52986,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fast-mpsc-queue" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fast-mpsc-queue/2024-10-12/fast-mpsc-queue-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/fast-mpsc-queue/2024-10-12/fast-mpsc-queue-20241012-git.tgz"; sha256 = "1ggiaryjv3lmzrk6m22y7vvbqn3z0n7ahmkyfjq6iyrd64d77ck7"; system = "fast-mpsc-queue"; asd = "fast-mpsc-queue"; @@ -52186,7 +53006,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fast-websocket" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fast-websocket/2024-10-12/fast-websocket-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/fast-websocket/2024-10-12/fast-websocket-20241012-git.tgz"; sha256 = "102z58d27966lpx08kc6apgaainbsdfhygb67ibyw6lxnaasy3jz"; system = "fast-websocket"; asd = "fast-websocket"; @@ -52210,7 +53030,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fast-websocket-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fast-websocket/2024-10-12/fast-websocket-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/fast-websocket/2024-10-12/fast-websocket-20241012-git.tgz"; sha256 = "102z58d27966lpx08kc6apgaainbsdfhygb67ibyw6lxnaasy3jz"; system = "fast-websocket-test"; asd = "fast-websocket-test"; @@ -52236,7 +53056,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "feeder" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/feeder/2023-10-21/feeder-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/feeder/2023-10-21/feeder-20231021-git.tgz"; sha256 = "00j3s98lbh6h2p007s7x48rw0ckd3c1apfwb28y89jxnwqk7sng7"; system = "feeder"; asd = "feeder"; @@ -52256,12 +53076,12 @@ lib.makeScope pkgs.newScope (self: { femlisp = ( build-asdf-system { pname = "femlisp"; - version = "20210411-git"; + version = "20250622-git"; asds = [ "femlisp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/femlisp/2021-04-11/femlisp-20210411-git.tgz"; - sha256 = "08l2x1jq3vfhh8m14wijd8c78n589cy5hd2py2jfj3yfiqyipasa"; + url = "https://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz"; + sha256 = "1rg1hhy3nlb85229ninnsdr8dhjjs0wgqv612g8i59v82n07yip8"; system = "femlisp"; asd = "femlisp"; } @@ -52284,12 +53104,12 @@ lib.makeScope pkgs.newScope (self: { femlisp-basic = ( build-asdf-system { pname = "femlisp-basic"; - version = "20210411-git"; + version = "20250622-git"; asds = [ "femlisp-basic" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/femlisp/2021-04-11/femlisp-20210411-git.tgz"; - sha256 = "08l2x1jq3vfhh8m14wijd8c78n589cy5hd2py2jfj3yfiqyipasa"; + url = "https://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz"; + sha256 = "1rg1hhy3nlb85229ninnsdr8dhjjs0wgqv612g8i59v82n07yip8"; system = "femlisp-basic"; asd = "femlisp-basic"; } @@ -52307,12 +53127,12 @@ lib.makeScope pkgs.newScope (self: { femlisp-dictionary = ( build-asdf-system { pname = "femlisp-dictionary"; - version = "20210411-git"; + version = "20250622-git"; asds = [ "femlisp-dictionary" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/femlisp/2021-04-11/femlisp-20210411-git.tgz"; - sha256 = "08l2x1jq3vfhh8m14wijd8c78n589cy5hd2py2jfj3yfiqyipasa"; + url = "https://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz"; + sha256 = "1rg1hhy3nlb85229ninnsdr8dhjjs0wgqv612g8i59v82n07yip8"; system = "femlisp-dictionary"; asd = "femlisp-dictionary"; } @@ -52331,12 +53151,12 @@ lib.makeScope pkgs.newScope (self: { femlisp-matlisp = ( build-asdf-system { pname = "femlisp-matlisp"; - version = "20210411-git"; + version = "20250622-git"; asds = [ "femlisp-matlisp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/femlisp/2021-04-11/femlisp-20210411-git.tgz"; - sha256 = "08l2x1jq3vfhh8m14wijd8c78n589cy5hd2py2jfj3yfiqyipasa"; + url = "https://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz"; + sha256 = "1rg1hhy3nlb85229ninnsdr8dhjjs0wgqv612g8i59v82n07yip8"; system = "femlisp-matlisp"; asd = "femlisp-matlisp"; } @@ -52355,12 +53175,12 @@ lib.makeScope pkgs.newScope (self: { femlisp-parallel = ( build-asdf-system { pname = "femlisp-parallel"; - version = "20210411-git"; + version = "20250622-git"; asds = [ "femlisp-parallel" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/femlisp/2021-04-11/femlisp-20210411-git.tgz"; - sha256 = "08l2x1jq3vfhh8m14wijd8c78n589cy5hd2py2jfj3yfiqyipasa"; + url = "https://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz"; + sha256 = "1rg1hhy3nlb85229ninnsdr8dhjjs0wgqv612g8i59v82n07yip8"; system = "femlisp-parallel"; asd = "femlisp-parallel"; } @@ -52381,12 +53201,12 @@ lib.makeScope pkgs.newScope (self: { femlisp-picture = ( build-asdf-system { pname = "femlisp-picture"; - version = "20210411-git"; + version = "20250622-git"; asds = [ "femlisp-picture" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/femlisp/2021-04-11/femlisp-20210411-git.tgz"; - sha256 = "08l2x1jq3vfhh8m14wijd8c78n589cy5hd2py2jfj3yfiqyipasa"; + url = "https://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz"; + sha256 = "1rg1hhy3nlb85229ninnsdr8dhjjs0wgqv612g8i59v82n07yip8"; system = "femlisp-picture"; asd = "femlisp-picture"; } @@ -52408,7 +53228,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ffa" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ffa/2010-10-06/ffa-20101006-git.tgz"; + url = "https://beta.quicklisp.org/archive/ffa/2010-10-06/ffa-20101006-git.tgz"; sha256 = "0l7kqcjp3sn1129hpwq6zhjqc0ydx9gc53z7k13i38x3z1asap7a"; system = "ffa"; asd = "ffa"; @@ -52433,7 +53253,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fft" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fft/2018-07-11/fft-20180711-git.tgz"; + url = "https://beta.quicklisp.org/archive/fft/2018-07-11/fft-20180711-git.tgz"; sha256 = "0ymnfplap2cncw49mhq7crapgxphfwsvqdgrcckpgsvw6qsymasd"; system = "fft"; asd = "fft"; @@ -52453,7 +53273,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fftpack5" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; system = "fftpack5"; asd = "fftpack5"; @@ -52473,7 +53293,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fftpack5-double" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; system = "fftpack5-double"; asd = "fftpack5-double"; @@ -52493,7 +53313,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fiasco" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fiasco/2020-06-10/fiasco-20200610-git.tgz"; + url = "https://beta.quicklisp.org/archive/fiasco/2020-06-10/fiasco-20200610-git.tgz"; sha256 = "1k8i2kq57201bvy3zfpsxld530hd104dgbglxigqb6i408c1a7aw"; system = "fiasco"; asd = "fiasco"; @@ -52514,7 +53334,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fiasco-self-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fiasco/2020-06-10/fiasco-20200610-git.tgz"; + url = "https://beta.quicklisp.org/archive/fiasco/2020-06-10/fiasco-20200610-git.tgz"; sha256 = "1k8i2kq57201bvy3zfpsxld530hd104dgbglxigqb6i408c1a7aw"; system = "fiasco-self-tests"; asd = "fiasco"; @@ -52534,7 +53354,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "file-attributes" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/file-attributes/2024-10-12/file-attributes-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/file-attributes/2024-10-12/file-attributes-20241012-git.tgz"; sha256 = "14jimsmwcp8bygm2f0fjmjv0ncc5yxl7pvh04x0kw6gs1mc7rc9x"; system = "file-attributes"; asd = "file-attributes"; @@ -52552,12 +53372,12 @@ lib.makeScope pkgs.newScope (self: { file-finder = ( build-asdf-system { pname = "file-finder"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "file-finder" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/file-finder/2024-10-12/file-finder-20241012-git.tgz"; - sha256 = "11cjyyngvydcq2sbgsqkxd9060a0cb3ndqrqr318djndf30ckmqx"; + url = "https://beta.quicklisp.org/archive/file-finder/2025-06-22/file-finder-20250622-git.tgz"; + sha256 = "05mbr6a2wy67swkpsmmyxw9vzlmj5117zjmmhqxls42kx4bsyl88"; system = "file-finder"; asd = "file-finder"; } @@ -52583,7 +53403,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "file-local-variable" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/file-local-variable/2016-03-18/file-local-variable-20160318-git.tgz"; + url = "https://beta.quicklisp.org/archive/file-local-variable/2016-03-18/file-local-variable-20160318-git.tgz"; sha256 = "1jsjd0g41mg76wlqjxliyrfz8fk7ihi06nq2zizmk9np0pmwsxl9"; system = "file-local-variable"; asd = "file-local-variable"; @@ -52607,7 +53427,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "file-local-variable.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/file-local-variable/2016-03-18/file-local-variable-20160318-git.tgz"; + url = "https://beta.quicklisp.org/archive/file-local-variable/2016-03-18/file-local-variable-20160318-git.tgz"; sha256 = "1jsjd0g41mg76wlqjxliyrfz8fk7ihi06nq2zizmk9np0pmwsxl9"; system = "file-local-variable.test"; asd = "file-local-variable.test"; @@ -52630,7 +53450,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "file-lock" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/file-lock/2023-10-21/file-lock-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/file-lock/2023-10-21/file-lock-20231021-git.tgz"; sha256 = "0n2mn931h83dh2diifsghc78agsz4savlfv5dr9pfmpk16vkwi5b"; system = "file-lock"; asd = "file-lock"; @@ -52650,12 +53470,12 @@ lib.makeScope pkgs.newScope (self: { file-notify = ( build-asdf-system { pname = "file-notify"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "file-notify" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/file-notify/2024-10-12/file-notify-20241012-git.tgz"; - sha256 = "1zxn0smgahbxvy8v2bwmff3262msqhqqc5qpmh4ffinx6azln1hq"; + url = "https://beta.quicklisp.org/archive/file-notify/2025-06-22/file-notify-20250622-git.tgz"; + sha256 = "1crwybqih0x43z12irbaz338k2y709igq69vghqi1rqw953i1l44"; system = "file-notify"; asd = "file-notify"; } @@ -52674,12 +53494,12 @@ lib.makeScope pkgs.newScope (self: { file-select = ( build-asdf-system { pname = "file-select"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "file-select" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/file-select/2024-10-12/file-select-20241012-git.tgz"; - sha256 = "0vp7qfqymlw21yrlfack799xjwyh23dyxnbc5ix4fnylpi1lxjbn"; + url = "https://beta.quicklisp.org/archive/file-select/2025-06-22/file-select-20250622-git.tgz"; + sha256 = "17afb2p707l9nqmnl83zshayi4vvv9nvyfmxiippal3izz5k9mqq"; system = "file-select"; asd = "file-select"; } @@ -52689,6 +53509,7 @@ lib.makeScope pkgs.newScope (self: { (getAttr "cffi" self) (getAttr "documentation-utils" self) (getAttr "float-features" self) + (getAttr "pathname-utils" self) (getAttr "trivial-features" self) ]; meta = { @@ -52703,7 +53524,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "file-types" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/file-types/2016-09-29/file-types-20160929-git.tgz"; + url = "https://beta.quicklisp.org/archive/file-types/2016-09-29/file-types-20160929-git.tgz"; sha256 = "09l67gzjwx7kx237grm709dsj9rkmmm8s3ya6irmcw8nh587inbs"; system = "file-types"; asd = "file-types"; @@ -52719,12 +53540,12 @@ lib.makeScope pkgs.newScope (self: { filesystem-utils = ( build-asdf-system { pname = "filesystem-utils"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "filesystem-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/filesystem-utils/2024-10-12/filesystem-utils-20241012-git.tgz"; - sha256 = "0h1xqpc11iachb9yg1d2xrzp1df1qadr1call904cjf45xadn62r"; + url = "https://beta.quicklisp.org/archive/filesystem-utils/2025-06-22/filesystem-utils-20250622-git.tgz"; + sha256 = "0ylf7csp7v2i1br654j945ns6capxb75p078vxiga5gkhhlxql5h"; system = "filesystem-utils"; asd = "filesystem-utils"; } @@ -52744,12 +53565,12 @@ lib.makeScope pkgs.newScope (self: { filesystem-utils-test = ( build-asdf-system { pname = "filesystem-utils-test"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "filesystem-utils-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/filesystem-utils/2024-10-12/filesystem-utils-20241012-git.tgz"; - sha256 = "0h1xqpc11iachb9yg1d2xrzp1df1qadr1call904cjf45xadn62r"; + url = "https://beta.quicklisp.org/archive/filesystem-utils/2025-06-22/filesystem-utils-20250622-git.tgz"; + sha256 = "0ylf7csp7v2i1br654j945ns6capxb75p078vxiga5gkhhlxql5h"; system = "filesystem-utils-test"; asd = "filesystem-utils-test"; } @@ -52771,7 +53592,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "filter-maker" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/filter-maker/2022-11-06/filter-maker-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/filter-maker/2022-11-06/filter-maker-20221106-git.tgz"; sha256 = "00algyghniqsvjy5vwx39fd98nd7x4w944ahy981jlh33lzc2qmn"; system = "filter-maker"; asd = "filter-maker"; @@ -52791,7 +53612,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "filtered-functions" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/filtered-functions/2016-03-18/filtered-functions-20160318-git.tgz"; + url = "https://beta.quicklisp.org/archive/filtered-functions/2016-03-18/filtered-functions-20160318-git.tgz"; sha256 = "0m13k8pl0gfll8ss83c0z3gax7zrrw2i4s26451jfbka1xr4fgy9"; system = "filtered-functions"; asd = "filtered-functions"; @@ -52811,7 +53632,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "find-port" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/find-port/2023-02-14/find-port-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/find-port/2023-02-14/find-port-20230214-git.tgz"; sha256 = "1hmbkqazk6m7075gmbrwzxkysp9779xm9qxrzj7p85bwlbk5m5i7"; system = "find-port"; asd = "find-port"; @@ -52831,7 +53652,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "find-port-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/find-port/2023-02-14/find-port-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/find-port/2023-02-14/find-port-20230214-git.tgz"; sha256 = "1hmbkqazk6m7075gmbrwzxkysp9779xm9qxrzj7p85bwlbk5m5i7"; system = "find-port-test"; asd = "find-port-test"; @@ -52854,7 +53675,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "finite-state-machine" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-simple-fsm/2020-02-18/cl-simple-fsm-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-simple-fsm/2020-02-18/cl-simple-fsm-20200218-git.tgz"; sha256 = "1w07df7kakjq3r1v5c4gnavp08ngpn2ni85cggnnsqzc27hly07b"; system = "finite-state-machine"; asd = "finite-state-machine"; @@ -52874,7 +53695,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "firephp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/firephp/2016-05-31/firephp-20160531-git.tgz"; + url = "https://beta.quicklisp.org/archive/firephp/2016-05-31/firephp-20160531-git.tgz"; sha256 = "1j98z73c21xcjp4f8qvmv37y9zlsnwxx88nnxc3r1ngvxv23dlgh"; system = "firephp"; asd = "firephp"; @@ -52897,7 +53718,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "firephp-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/firephp/2016-05-31/firephp-20160531-git.tgz"; + url = "https://beta.quicklisp.org/archive/firephp/2016-05-31/firephp-20160531-git.tgz"; sha256 = "1j98z73c21xcjp4f8qvmv37y9zlsnwxx88nnxc3r1ngvxv23dlgh"; system = "firephp-tests"; asd = "firephp-tests"; @@ -52922,7 +53743,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "first-time-value" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/first-time-value/2018-12-10/first-time-value-1.0.1.tgz"; + url = "https://beta.quicklisp.org/archive/first-time-value/2018-12-10/first-time-value-1.0.1.tgz"; sha256 = "155mqhnw1307b18a8bv8jhqp20qv83b409mlr61m45nq3sivxxp2"; system = "first-time-value"; asd = "first-time-value"; @@ -52942,7 +53763,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "first-time-value_tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/first-time-value/2018-12-10/first-time-value-1.0.1.tgz"; + url = "https://beta.quicklisp.org/archive/first-time-value/2018-12-10/first-time-value-1.0.1.tgz"; sha256 = "155mqhnw1307b18a8bv8jhqp20qv83b409mlr61m45nq3sivxxp2"; system = "first-time-value_tests"; asd = "first-time-value_tests"; @@ -52965,7 +53786,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fishpack" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; system = "fishpack"; asd = "fishpack"; @@ -52985,7 +53806,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fiveam" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fiveam/2024-10-12/fiveam-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/fiveam/2024-10-12/fiveam-20241012-git.tgz"; sha256 = "066amfjqhagzhb602y911wbw7jh9cv1fb7bfn2ppjzm5kf7hqbnh"; system = "fiveam"; asd = "fiveam"; @@ -53007,7 +53828,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fiveam-asdf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fiveam-asdf/2022-11-06/fiveam-asdf-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/fiveam-asdf/2022-11-06/fiveam-asdf-20221106-git.tgz"; sha256 = "18dhyznwl56lpp289dwg9xm9qwwv5062yawfaj6h1b2jwybqfrq7"; system = "fiveam-asdf"; asd = "fiveam-asdf"; @@ -53023,12 +53844,12 @@ lib.makeScope pkgs.newScope (self: { fiveam-matchers = ( build-asdf-system { pname = "fiveam-matchers"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "fiveam-matchers" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fiveam-matchers/2024-10-12/fiveam-matchers-20241012-git.tgz"; - sha256 = "1kwichcxjmqdi8whx4daggp4fdp53w17jj1rqlph9ixgr4s9kvqv"; + url = "https://beta.quicklisp.org/archive/fiveam-matchers/2025-06-22/fiveam-matchers-20250622-git.tgz"; + sha256 = "1ydxfbjc2aq4ffw9cxn6yx4m5rw08dagws9mjl7i71x5h3znb7mw"; system = "fiveam-matchers"; asd = "fiveam-matchers"; } @@ -53051,7 +53872,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fixed" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fixed/2017-01-24/fixed-20170124-git.tgz"; + url = "https://beta.quicklisp.org/archive/fixed/2017-01-24/fixed-20170124-git.tgz"; sha256 = "0bx8802fmlml5k5xhcm4g5r6c7ambij4gb0b37xljjn3wxgs83dc"; system = "fixed"; asd = "fixed"; @@ -53067,12 +53888,12 @@ lib.makeScope pkgs.newScope (self: { flac = ( build-asdf-system { pname = "flac"; - version = "20151218-git"; + version = "20250622-git"; asds = [ "flac" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mixalot/2015-12-18/mixalot-20151218-git.tgz"; - sha256 = "0kqx933k8kly4yhzvspizzki556s1lfd4zafap42jcsqqhr4i5q9"; + url = "https://beta.quicklisp.org/archive/mixalot/2025-06-22/mixalot-20250622-git.tgz"; + sha256 = "0w17m06rf8masgslnzva6c9dnbim8g99w2c4m93dhfc0bm2m98wb"; system = "flac"; asd = "flac"; } @@ -53090,12 +53911,12 @@ lib.makeScope pkgs.newScope (self: { flare = ( build-asdf-system { pname = "flare"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "flare" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/flare/2023-10-21/flare-20231021-git.tgz"; - sha256 = "1ws357819rr9lzh5b2hmqid6vrq8zj46a5dzwqa0fdmxxbam75zm"; + url = "https://beta.quicklisp.org/archive/flare/2025-06-22/flare-20250622-git.tgz"; + sha256 = "11cdianshkq9mh0g83zb44b8iikp6qslgf8rqpny81m4x2x3mpjr"; system = "flare"; asd = "flare"; } @@ -53114,34 +53935,6 @@ lib.makeScope pkgs.newScope (self: { }; } ); - flare-viewer = ( - build-asdf-system { - pname = "flare-viewer"; - version = "20231021-git"; - asds = [ "flare-viewer" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/flare/2023-10-21/flare-20231021-git.tgz"; - sha256 = "1ws357819rr9lzh5b2hmqid6vrq8zj46a5dzwqa0fdmxxbam75zm"; - system = "flare-viewer"; - asd = "flare-viewer"; - } - ); - systems = [ "flare-viewer" ]; - lispLibs = [ - (getAttr "cl-opengl" self) - (getAttr "flare" self) - (getAttr "qtcore" self) - (getAttr "qtgui" self) - (getAttr "qtools" self) - (getAttr "qtopengl" self) - (getAttr "verbose" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); flat-tree = ( build-asdf-system { pname = "flat-tree"; @@ -53149,7 +53942,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "flat-tree" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-flat-tree/2019-08-13/cl-flat-tree-20190813-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-flat-tree/2019-08-13/cl-flat-tree-20190813-git.tgz"; sha256 = "05nw1j0rr0vgz6shkjv87yn2mp0b4s7v5gxxcqcn1qi7fgbn55z7"; system = "flat-tree"; asd = "flat-tree"; @@ -53169,7 +53962,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "flexi-streams" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/flexi-streams/2024-10-12/flexi-streams-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/flexi-streams/2024-10-12/flexi-streams-20241012-git.tgz"; sha256 = "1bk224ryfiwsmnmq2gdfv9gld85z2rvnlx7fxcl2k122vc344akh"; system = "flexi-streams"; asd = "flexi-streams"; @@ -53187,7 +53980,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "flexi-streams-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/flexi-streams/2024-10-12/flexi-streams-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/flexi-streams/2024-10-12/flexi-streams-20241012-git.tgz"; sha256 = "1bk224ryfiwsmnmq2gdfv9gld85z2rvnlx7fxcl2k122vc344akh"; system = "flexi-streams-test"; asd = "flexi-streams-test"; @@ -53207,7 +54000,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "flexichain" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/flexichain/2020-12-20/flexichain-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/flexichain/2020-12-20/flexichain-20201220-git.tgz"; sha256 = "1ivkffnkc1iqmpl1p1rgyfbbgjmjcid4iszvdql1jjz324lq94g6"; system = "flexichain"; asd = "flexichain"; @@ -53227,7 +54020,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "flexichain-doc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/flexichain/2020-12-20/flexichain-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/flexichain/2020-12-20/flexichain-20201220-git.tgz"; sha256 = "1ivkffnkc1iqmpl1p1rgyfbbgjmjcid4iszvdql1jjz324lq94g6"; system = "flexichain-doc"; asd = "flexichain-doc"; @@ -53243,12 +54036,12 @@ lib.makeScope pkgs.newScope (self: { float-features = ( build-asdf-system { pname = "float-features"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "float-features" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/float-features/2024-10-12/float-features-20241012-git.tgz"; - sha256 = "1vxnvaprki5rk3phj20m35pva9dpgsixm8d9rnsixq1qgrv3djjf"; + url = "https://beta.quicklisp.org/archive/float-features/2025-06-22/float-features-20250622-git.tgz"; + sha256 = "1i6apsg595hzyymvn0gz04xg58qxw8rx1fyc093arbakywjfcqas"; system = "float-features"; asd = "float-features"; } @@ -53264,12 +54057,12 @@ lib.makeScope pkgs.newScope (self: { float-features-tests = ( build-asdf-system { pname = "float-features-tests"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "float-features-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/float-features/2024-10-12/float-features-20241012-git.tgz"; - sha256 = "1vxnvaprki5rk3phj20m35pva9dpgsixm8d9rnsixq1qgrv3djjf"; + url = "https://beta.quicklisp.org/archive/float-features/2025-06-22/float-features-20250622-git.tgz"; + sha256 = "1i6apsg595hzyymvn0gz04xg58qxw8rx1fyc093arbakywjfcqas"; system = "float-features-tests"; asd = "float-features-tests"; } @@ -53291,7 +54084,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "floating-point" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/floating-point/2014-11-06/floating-point-20141106-git.tgz"; + url = "https://beta.quicklisp.org/archive/floating-point/2014-11-06/floating-point-20141106-git.tgz"; sha256 = "1bqslmykg04innaqlp369pyjh61isj8xgv2h6pm95gsrxnf6wf7s"; system = "floating-point"; asd = "floating-point"; @@ -53311,7 +54104,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "floating-point-contractions" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/floating-point-contractions/2020-12-20/floating-point-contractions-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/floating-point-contractions/2020-12-20/floating-point-contractions-20201220-git.tgz"; sha256 = "0mr8bnc7hn0ii0cmlfnlwc14zkgbgdf099x5crrf9cp9wda4p082"; system = "floating-point-contractions"; asd = "floating-point-contractions"; @@ -53331,7 +54124,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "floating-point-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/floating-point/2014-11-06/floating-point-20141106-git.tgz"; + url = "https://beta.quicklisp.org/archive/floating-point/2014-11-06/floating-point-20141106-git.tgz"; sha256 = "1bqslmykg04innaqlp369pyjh61isj8xgv2h6pm95gsrxnf6wf7s"; system = "floating-point-test"; asd = "floating-point-test"; @@ -53350,12 +54143,12 @@ lib.makeScope pkgs.newScope (self: { flow = ( build-asdf-system { pname = "flow"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "flow" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/flow/2024-10-12/flow-20241012-git.tgz"; - sha256 = "1623kkyygwkqpgrbvv1zqj13mjkycqyh88nwcjsxd0clrlhlyfz3"; + url = "https://beta.quicklisp.org/archive/flow/2025-06-22/flow-20250622-git.tgz"; + sha256 = "1x4mvqw8236pipdbbkbmj5szm725qwvbwlq8vzi8qmaks7l20q5i"; system = "flow"; asd = "flow"; } @@ -53364,35 +54157,11 @@ lib.makeScope pkgs.newScope (self: { lispLibs = [ (getAttr "closer-mop" self) (getAttr "documentation-utils" self) + (getAttr "text-draw" self) ]; meta = { }; } ); - flow-visualizer = ( - build-asdf-system { - pname = "flow-visualizer"; - version = "20241012-git"; - asds = [ "flow-visualizer" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/flow/2024-10-12/flow-20241012-git.tgz"; - sha256 = "1623kkyygwkqpgrbvv1zqj13mjkycqyh88nwcjsxd0clrlhlyfz3"; - system = "flow-visualizer"; - asd = "flow-visualizer"; - } - ); - systems = [ "flow-visualizer" ]; - lispLibs = [ - (getAttr "flow" self) - (getAttr "qtcore" self) - (getAttr "qtgui" self) - (getAttr "qtools" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); flute = ( build-asdf-system { pname = "flute"; @@ -53400,7 +54169,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "flute" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/flute/2018-08-31/flute-20180831-git.tgz"; + url = "https://beta.quicklisp.org/archive/flute/2018-08-31/flute-20180831-git.tgz"; sha256 = "0q8jhp040cvpppyn820mm6a550yfxyr1lar298x13c42mm807f4f"; system = "flute"; asd = "flute"; @@ -53423,7 +54192,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "flute-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/flute/2018-08-31/flute-20180831-git.tgz"; + url = "https://beta.quicklisp.org/archive/flute/2018-08-31/flute-20180831-git.tgz"; sha256 = "0q8jhp040cvpppyn820mm6a550yfxyr1lar298x13c42mm807f4f"; system = "flute-test"; asd = "flute-test"; @@ -53442,12 +54211,12 @@ lib.makeScope pkgs.newScope (self: { flx = ( build-asdf-system { pname = "flx"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "flx" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-flx/2024-10-12/cl-flx-20241012-git.tgz"; - sha256 = "02p8qmc6wy3kf6w3rpgjvyg3jb699i5x9zk2f1p2y9h3m86d7hsw"; + url = "https://beta.quicklisp.org/archive/cl-flx/2025-06-22/cl-flx-20250622-git.tgz"; + sha256 = "0s7cmsjzsnvq1h4q4p7v8hkyavhrmv1mam2v9nrihzsgzx0yddb3"; system = "flx"; asd = "flx"; } @@ -53466,7 +54235,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fmarshal" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/marshal/2013-07-20/marshal-20130720-git.tgz"; + url = "https://beta.quicklisp.org/archive/marshal/2013-07-20/marshal-20130720-git.tgz"; sha256 = "1c0hcf7i9kzgbmayhmcjg0kv5966yqlimvj67gl4mzvwhbdkc2nf"; system = "fmarshal"; asd = "fmarshal"; @@ -53486,7 +54255,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fmarshal-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/marshal/2013-07-20/marshal-20130720-git.tgz"; + url = "https://beta.quicklisp.org/archive/marshal/2013-07-20/marshal-20130720-git.tgz"; sha256 = "1c0hcf7i9kzgbmayhmcjg0kv5966yqlimvj67gl4mzvwhbdkc2nf"; system = "fmarshal-test"; asd = "fmarshal-test"; @@ -53509,7 +54278,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fmcs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fmcs/2023-10-21/fmcs-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/fmcs/2023-10-21/fmcs-20231021-git.tgz"; sha256 = "1zp73i68f5sl93z10l2f94nylbkaj601ani6yg3bg7iqhs543651"; system = "fmcs"; asd = "fmcs"; @@ -53529,7 +54298,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fmt" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fmt/2022-03-31/fmt-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/fmt/2022-03-31/fmt-20220331-git.tgz"; sha256 = "078y5yig5fw0jcsjjabaq7dlyxsd10w5k80ywx6gbm0j88al3fzp"; system = "fmt"; asd = "fmt"; @@ -53549,7 +54318,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fmt-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fmt/2022-03-31/fmt-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/fmt/2022-03-31/fmt-20220331-git.tgz"; sha256 = "078y5yig5fw0jcsjjabaq7dlyxsd10w5k80ywx6gbm0j88al3fzp"; system = "fmt-test"; asd = "fmt-test"; @@ -53572,7 +54341,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fmt-time" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fmt/2022-03-31/fmt-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/fmt/2022-03-31/fmt-20220331-git.tgz"; sha256 = "078y5yig5fw0jcsjjabaq7dlyxsd10w5k80ywx6gbm0j88al3fzp"; system = "fmt-time"; asd = "fmt-time"; @@ -53595,7 +54364,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fn" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fn/2024-10-12/fn-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/fn/2024-10-12/fn-20241012-git.tgz"; sha256 = "08ydmfly5jaisfj8pkksq6npz992zlz4ni1yqlrq5yigwx41xaz0"; system = "fn"; asd = "fn"; @@ -53613,7 +54382,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fof" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fof/2021-12-30/fof-20211230-git.tgz"; + url = "https://beta.quicklisp.org/archive/fof/2021-12-30/fof-20211230-git.tgz"; sha256 = "0ipy51q2fw03xk9rqcyzbq2b9c32npc1gl3c53rdjywpak7zwwg6"; system = "fof"; asd = "fof"; @@ -53644,7 +54413,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "folio" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/folio/2013-01-28/folio-20130128-git.tgz"; + url = "https://beta.quicklisp.org/archive/folio/2013-01-28/folio-20130128-git.tgz"; sha256 = "061kryjclnkp60r8vhcpzy9q0k755p1jc1vp4vj13k7piwr1bj64"; system = "folio"; asd = "folio"; @@ -53669,7 +54438,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "folio.as" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/folio/2013-01-28/folio-20130128-git.tgz"; + url = "https://beta.quicklisp.org/archive/folio/2013-01-28/folio-20130128-git.tgz"; sha256 = "061kryjclnkp60r8vhcpzy9q0k755p1jc1vp4vj13k7piwr1bj64"; system = "folio.as"; asd = "folio.as"; @@ -53689,7 +54458,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "folio.boxes" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/folio/2013-01-28/folio-20130128-git.tgz"; + url = "https://beta.quicklisp.org/archive/folio/2013-01-28/folio-20130128-git.tgz"; sha256 = "061kryjclnkp60r8vhcpzy9q0k755p1jc1vp4vj13k7piwr1bj64"; system = "folio.boxes"; asd = "folio.boxes"; @@ -53709,7 +54478,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "folio.collections" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/folio/2013-01-28/folio-20130128-git.tgz"; + url = "https://beta.quicklisp.org/archive/folio/2013-01-28/folio-20130128-git.tgz"; sha256 = "061kryjclnkp60r8vhcpzy9q0k755p1jc1vp4vj13k7piwr1bj64"; system = "folio.collections"; asd = "folio.collections"; @@ -53733,7 +54502,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "folio.functions" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/folio/2013-01-28/folio-20130128-git.tgz"; + url = "https://beta.quicklisp.org/archive/folio/2013-01-28/folio-20130128-git.tgz"; sha256 = "061kryjclnkp60r8vhcpzy9q0k755p1jc1vp4vj13k7piwr1bj64"; system = "folio.functions"; asd = "folio.functions"; @@ -53753,7 +54522,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "folio2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; system = "folio2"; asd = "folio2"; @@ -53790,7 +54559,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "folio2-as" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; system = "folio2-as"; asd = "folio2-as"; @@ -53810,7 +54579,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "folio2-as-syntax" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; system = "folio2-as-syntax"; asd = "folio2-as-syntax"; @@ -53830,7 +54599,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "folio2-as-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; system = "folio2-as-tests"; asd = "folio2-as-tests"; @@ -53854,7 +54623,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "folio2-boxes" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; system = "folio2-boxes"; asd = "folio2-boxes"; @@ -53877,7 +54646,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "folio2-boxes-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; system = "folio2-boxes-tests"; asd = "folio2-boxes-tests"; @@ -53900,7 +54669,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "folio2-functions" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; system = "folio2-functions"; asd = "folio2-functions"; @@ -53924,7 +54693,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "folio2-functions-syntax" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; system = "folio2-functions-syntax"; asd = "folio2-functions-syntax"; @@ -53947,7 +54716,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "folio2-functions-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; system = "folio2-functions-tests"; asd = "folio2-functions-tests"; @@ -53971,7 +54740,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "folio2-make" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; system = "folio2-make"; asd = "folio2-make"; @@ -53991,7 +54760,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "folio2-make-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; system = "folio2-make-tests"; asd = "folio2-make-tests"; @@ -54014,7 +54783,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "folio2-maps" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; system = "folio2-maps"; asd = "folio2-maps"; @@ -54038,7 +54807,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "folio2-maps-syntax" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; system = "folio2-maps-syntax"; asd = "folio2-maps-syntax"; @@ -54058,7 +54827,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "folio2-maps-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; system = "folio2-maps-tests"; asd = "folio2-maps-tests"; @@ -54082,7 +54851,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "folio2-pairs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; system = "folio2-pairs"; asd = "folio2-pairs"; @@ -54105,7 +54874,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "folio2-pairs-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; system = "folio2-pairs-tests"; asd = "folio2-pairs-tests"; @@ -54128,7 +54897,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "folio2-sequences" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; system = "folio2-sequences"; asd = "folio2-sequences"; @@ -54154,7 +54923,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "folio2-sequences-syntax" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; system = "folio2-sequences-syntax"; asd = "folio2-sequences-syntax"; @@ -54174,7 +54943,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "folio2-sequences-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; system = "folio2-sequences-tests"; asd = "folio2-sequences-tests"; @@ -54198,7 +54967,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "folio2-series" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; system = "folio2-series"; asd = "folio2-series"; @@ -54225,7 +54994,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "folio2-series-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; system = "folio2-series-tests"; asd = "folio2-series-tests"; @@ -54248,7 +55017,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "folio2-taps" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; system = "folio2-taps"; asd = "folio2-taps"; @@ -54277,7 +55046,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "folio2-taps-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; system = "folio2-taps-tests"; asd = "folio2-taps-tests"; @@ -54300,7 +55069,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "folio2-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; system = "folio2-tests"; asd = "folio2-tests"; @@ -54316,12 +55085,12 @@ lib.makeScope pkgs.newScope (self: { font-discovery = ( build-asdf-system { pname = "font-discovery"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "font-discovery" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/font-discovery/2023-10-21/font-discovery-20231021-git.tgz"; - sha256 = "1kx83564p1w2wka3l6g4rj7zvzi85prvs6yag2qv2a9xh80yv9rz"; + url = "https://beta.quicklisp.org/archive/font-discovery/2025-06-22/font-discovery-20250622-git.tgz"; + sha256 = "0bfhd417kz73y1q38xn3j1k9j49lzng0j11x03jwlmjm6k8331vj"; system = "font-discovery"; asd = "font-discovery"; } @@ -54330,8 +55099,10 @@ lib.makeScope pkgs.newScope (self: { lispLibs = [ (getAttr "cffi" self) (getAttr "documentation-utils" self) + (getAttr "pathname-utils" self) (getAttr "trivial-features" self) (getAttr "trivial-indent" self) + (getAttr "zpb-ttf" self) ]; meta = { hydraPlatforms = [ ]; @@ -54345,7 +55116,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "foo-wild" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/wild-package-inferred-system/2021-05-31/wild-package-inferred-system-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/wild-package-inferred-system/2021-05-31/wild-package-inferred-system-20210531-git.tgz"; sha256 = "0sp3j3i83aqyq9bl3djs490nilryi9sh1wjbcqd9z94d9wfbfz80"; system = "foo-wild"; asd = "foo-wild"; @@ -54361,12 +55132,12 @@ lib.makeScope pkgs.newScope (self: { for = ( build-asdf-system { pname = "for"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "for" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/for/2023-10-21/for-20231021-git.tgz"; - sha256 = "07jdwqkyb3qd65mng60cs723z7p0bv2769hhalz4c0mfzn8qrn99"; + url = "https://beta.quicklisp.org/archive/for/2025-06-22/for-20250622-git.tgz"; + sha256 = "01n60r7wsdkbdr2prrxacjyx4klijgj5363rsdh0lfq32j0r078z"; system = "for"; asd = "for"; } @@ -54389,7 +55160,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "foreign-array" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/antik/2024-10-12/antik-master-df14cb8c-git.tgz"; + url = "https://beta.quicklisp.org/archive/antik/2024-10-12/antik-master-df14cb8c-git.tgz"; sha256 = "1n08cx4n51z8v4bxyak166lp495xda3x7llfxcdpxndxqxcammr0"; system = "foreign-array"; asd = "foreign-array"; @@ -54414,7 +55185,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fork-future" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; system = "fork-future"; asd = "fork-future"; @@ -54433,12 +55204,12 @@ lib.makeScope pkgs.newScope (self: { form-fiddle = ( build-asdf-system { pname = "form-fiddle"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "form-fiddle" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/form-fiddle/2023-10-21/form-fiddle-20231021-git.tgz"; - sha256 = "0vl28q8xa42i9gr1bch22jdha9jh8sr2hcv6d9kykj4jsqi9kwbg"; + url = "https://beta.quicklisp.org/archive/form-fiddle/2025-06-22/form-fiddle-20250622-git.tgz"; + sha256 = "0hg58xq2dbcdk31rfnwqc6h7krm6fmww103yzfbkg7cg7f3w7p51"; system = "form-fiddle"; asd = "form-fiddle"; } @@ -54448,6 +55219,29 @@ lib.makeScope pkgs.newScope (self: { meta = { }; } ); + format-seconds-tests = ( + build-asdf-system { + pname = "format-seconds-tests"; + version = "production-e6b26811-git"; + asds = [ "format-seconds-tests" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/format-seconds/2025-06-22/format-seconds-production-e6b26811-git.tgz"; + sha256 = "106ykx2n8vmw7k9rkr8iclh0pf6n4va7qfs7xvgqzcjsgpyi0ynz"; + system = "format-seconds-tests"; + asd = "format-seconds-tests"; + } + ); + systems = [ "format-seconds-tests" ]; + lispLibs = [ + (getAttr "fiveam" self) + (getAttr "literate-lisp" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); format-string-builder = ( build-asdf-system { pname = "format-string-builder"; @@ -54455,7 +55249,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "format-string-builder" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/format-string-builder/2017-01-24/format-string-builder-20170124-git.tgz"; + url = "https://beta.quicklisp.org/archive/format-string-builder/2017-01-24/format-string-builder-20170124-git.tgz"; sha256 = "1266w5wynfhamxdf8ms2236m202f6982fd9ph8fs98nqccq2pcac"; system = "format-string-builder"; asd = "format-string-builder"; @@ -54478,7 +55272,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "formlets" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/formlets/2016-12-04/formlets-20161204-git.tgz"; + url = "https://beta.quicklisp.org/archive/formlets/2016-12-04/formlets-20161204-git.tgz"; sha256 = "0r2afi5lwzxfb8xylx9cs44wqhla4b50k21nzg2dxn7z8m6yspfn"; system = "formlets"; asd = "formlets"; @@ -54503,7 +55297,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "formlets-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/formlets/2016-12-04/formlets-20161204-git.tgz"; + url = "https://beta.quicklisp.org/archive/formlets/2016-12-04/formlets-20161204-git.tgz"; sha256 = "0r2afi5lwzxfb8xylx9cs44wqhla4b50k21nzg2dxn7z8m6yspfn"; system = "formlets-test"; asd = "formlets-test"; @@ -54529,7 +55323,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fprog" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cambl/2018-12-10/cambl-20181210-git.tgz"; + url = "https://beta.quicklisp.org/archive/cambl/2018-12-10/cambl-20181210-git.tgz"; sha256 = "103mry04j2k9vznsxm7wcvccgxkil92cdrv52miwcmxl8daa4jiz"; system = "fprog"; asd = "fprog"; @@ -54549,7 +55343,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fps-independent-timestep" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; system = "fps-independent-timestep"; asd = "fps-independent-timestep"; @@ -54572,7 +55366,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fred" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fred/2015-09-23/fred-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/fred/2015-09-23/fred-20150923-git.tgz"; sha256 = "0qn2rd67haz4pvvv4yp2yvbvjhficv8xjm7ijg0r34gxllm6i373"; system = "fred"; asd = "fred"; @@ -54595,7 +55389,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "freebsd-sysctl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/freebsd-sysctl/2021-02-28/freebsd-sysctl-20210228-git.tgz"; + url = "https://beta.quicklisp.org/archive/freebsd-sysctl/2021-02-28/freebsd-sysctl-20210228-git.tgz"; sha256 = "1gzqiqz0pi273ia2q61bhr908ymbl8cll5v2h8lkicr9pff37g91"; system = "freebsd-sysctl"; asd = "freebsd-sysctl"; @@ -54618,7 +55412,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "freesound" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/freesound/2021-04-11/freesound-20210411-git.tgz"; + url = "https://beta.quicklisp.org/archive/freesound/2021-04-11/freesound-20210411-git.tgz"; sha256 = "1nsmbz7qx9wn86860zlnw75sdgpr8qfzgqfbwxggc3zr7p83kric"; system = "freesound"; asd = "freesound"; @@ -54644,7 +55438,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fresnel" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fresnel/2023-06-18/fresnel-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/fresnel/2023-06-18/fresnel-20230618-git.tgz"; sha256 = "0rzi3pz1cjf8m0fmj7dg7wxbbcmxnbx75hfp9hbmrm9yqsjc4khv"; system = "fresnel"; asd = "fresnel"; @@ -54668,7 +55462,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "froute" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/froute/2018-07-11/froute-20180711-git.tgz"; + url = "https://beta.quicklisp.org/archive/froute/2018-07-11/froute-20180711-git.tgz"; sha256 = "1q7xzgn7g5ky1d8m121r8hskcg4gqpripr791k03y7dz5vkfj14x"; system = "froute"; asd = "froute"; @@ -54691,7 +55485,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "frpc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/frpc/2015-10-31/frpc-20151031-git.tgz"; + url = "https://beta.quicklisp.org/archive/frpc/2015-10-31/frpc-20151031-git.tgz"; sha256 = "0yac1q79kw1w1qd7zjgg912n780v318n2drzdimlv5n3bwd6pm2r"; system = "frpc"; asd = "frpc"; @@ -54720,7 +55514,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "frpc-des" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/frpc/2015-10-31/frpc-20151031-git.tgz"; + url = "https://beta.quicklisp.org/archive/frpc/2015-10-31/frpc-20151031-git.tgz"; sha256 = "0yac1q79kw1w1qd7zjgg912n780v318n2drzdimlv5n3bwd6pm2r"; system = "frpc-des"; asd = "frpc"; @@ -54743,7 +55537,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "frpc-gss" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/frpc/2015-10-31/frpc-20151031-git.tgz"; + url = "https://beta.quicklisp.org/archive/frpc/2015-10-31/frpc-20151031-git.tgz"; sha256 = "0yac1q79kw1w1qd7zjgg912n780v318n2drzdimlv5n3bwd6pm2r"; system = "frpc-gss"; asd = "frpc"; @@ -54766,7 +55560,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "frpcgen" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/frpc/2015-10-31/frpc-20151031-git.tgz"; + url = "https://beta.quicklisp.org/archive/frpc/2015-10-31/frpc-20151031-git.tgz"; sha256 = "0yac1q79kw1w1qd7zjgg912n780v318n2drzdimlv5n3bwd6pm2r"; system = "frpcgen"; asd = "frpcgen"; @@ -54786,12 +55580,12 @@ lib.makeScope pkgs.newScope (self: { frugal-uuid = ( build-asdf-system { pname = "frugal-uuid"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "frugal-uuid" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-frugal-uuid/2024-10-12/cl-frugal-uuid-20241012-git.tgz"; - sha256 = "01hli6gh0rr6mizqp1iqfch7rd0jw6ygrskjdr5hf3r8wwwvr9hh"; + url = "https://beta.quicklisp.org/archive/cl-frugal-uuid/2025-06-22/cl-frugal-uuid-20250622-git.tgz"; + sha256 = "1naviw6qksf2zh2wsr9lqpdjfy10nfrc1pc0liz1hrq14f15lsrm"; system = "frugal-uuid"; asd = "frugal-uuid"; } @@ -54810,7 +55604,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fs-watcher" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fs-watcher/2017-11-30/fs-watcher-20171130-git.tgz"; + url = "https://beta.quicklisp.org/archive/fs-watcher/2017-11-30/fs-watcher-20171130-git.tgz"; sha256 = "0fr2wb39609z4afk4w21vwnwi4g050x4gag2ykdx6hn9m65cp9db"; system = "fs-watcher"; asd = "fs-watcher"; @@ -54829,12 +55623,12 @@ lib.makeScope pkgs.newScope (self: { fset = ( build-asdf-system { pname = "fset"; - version = "20241012-git"; + version = "v1.4.6"; asds = [ "fset" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fset/2024-10-12/fset-20241012-git.tgz"; - sha256 = "0h9j5a7vlr8g0hq99y4wgw1l1wialzs6k16nrpmd4pwiyiypzkm6"; + url = "https://beta.quicklisp.org/archive/fset/2025-06-22/fset-v1.4.6.tgz"; + sha256 = "1hgxs534w7x46y6pm6mjljyy4gvawfkyk2dg0qbiisgv7zj271ka"; system = "fset"; asd = "fset"; } @@ -54842,8 +55636,8 @@ lib.makeScope pkgs.newScope (self: { systems = [ "fset" ]; lispLibs = [ (getAttr "misc-extensions" self) + (getAttr "mt19937" self) (getAttr "named-readtables" self) - (getAttr "random-state" self) ]; meta = { }; } @@ -54855,7 +55649,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fsocket" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fsocket/2021-12-30/fsocket-20211230-git.tgz"; + url = "https://beta.quicklisp.org/archive/fsocket/2021-12-30/fsocket-20211230-git.tgz"; sha256 = "18h3s4bv3243xbp0qdywn9kmqvx8zh9cscc9f6sfyxrz6xhymw6p"; system = "fsocket"; asd = "fsocket"; @@ -54878,7 +55672,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fsvd" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fsvd/2013-12-11/fsvd-20131211-git.tgz"; + url = "https://beta.quicklisp.org/archive/fsvd/2013-12-11/fsvd-20131211-git.tgz"; sha256 = "1m22g9x18ixjh5nylm56l5p67ryx9dbd3g6lyzvwk9nayjmqn7x5"; system = "fsvd"; asd = "fsvd"; @@ -54898,7 +55692,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ftp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ftp/2015-06-08/cl-ftp-20150608-http.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ftp/2015-06-08/cl-ftp-20150608-http.tgz"; sha256 = "1m955rjpaynybzmb9q631mll764hm06lydvhra50mfjj75ynwsvw"; system = "ftp"; asd = "ftp"; @@ -54918,7 +55712,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fucc-generator" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fucc/2020-04-27/fucc-v0.2.2.tgz"; + url = "https://beta.quicklisp.org/archive/fucc/2020-04-27/fucc-v0.2.2.tgz"; sha256 = "10wznxw6yhkyh943xnm694innj13xdlmkx13pr8xwc6zdbdyb32k"; system = "fucc-generator"; asd = "fucc-generator"; @@ -54938,7 +55732,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fucc-parser" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fucc/2020-04-27/fucc-v0.2.2.tgz"; + url = "https://beta.quicklisp.org/archive/fucc/2020-04-27/fucc-v0.2.2.tgz"; sha256 = "10wznxw6yhkyh943xnm694innj13xdlmkx13pr8xwc6zdbdyb32k"; system = "fucc-parser"; asd = "fucc-parser"; @@ -54958,7 +55752,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "function-cache" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/function-cache/2023-10-21/function-cache-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/function-cache/2023-10-21/function-cache-20231021-git.tgz"; sha256 = "1sk35fd7zw6kx9zpv18wmzmkksbn0ac4ycjzi6hqdgkbyn3l136w"; system = "function-cache"; asd = "function-cache"; @@ -54984,7 +55778,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "function-cache-clsql" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/function-cache/2023-10-21/function-cache-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/function-cache/2023-10-21/function-cache-20231021-git.tgz"; sha256 = "1sk35fd7zw6kx9zpv18wmzmkksbn0ac4ycjzi6hqdgkbyn3l136w"; system = "function-cache-clsql"; asd = "function-cache-clsql"; @@ -55004,12 +55798,12 @@ lib.makeScope pkgs.newScope (self: { functional-geometry = ( build-asdf-system { pname = "functional-geometry"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "functional-geometry" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "functional-geometry"; asd = "functional-geometry"; } @@ -55024,12 +55818,12 @@ lib.makeScope pkgs.newScope (self: { functional-trees = ( build-asdf-system { pname = "functional-trees"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "functional-trees" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/functional-trees/2024-10-12/functional-trees-20241012-git.tgz"; - sha256 = "02jhc2c6d7zd75cpjmwck62b3iyzsf5q2yqqpp5ymwjmnx4bnysd"; + url = "https://beta.quicklisp.org/archive/functional-trees/2025-06-22/functional-trees-20250622-git.tgz"; + sha256 = "1z0z0g49jv6nvvqd5g0nyfac4h3l53n2lrszzvs3favp98z37byx"; system = "functional-trees"; asd = "functional-trees"; } @@ -55058,7 +55852,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "funds" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/funds/2021-10-20/funds-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/funds/2021-10-20/funds-20211020-git.tgz"; sha256 = "13y1jhvnpzrs9daz6f3z67w6h2y21ggb10j3j4vnc5p3m8i7ps4p"; system = "funds"; asd = "funds"; @@ -55078,7 +55872,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "future" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; system = "future"; asd = "future"; @@ -55094,12 +55888,12 @@ lib.makeScope pkgs.newScope (self: { fuzzy-dates = ( build-asdf-system { pname = "fuzzy-dates"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "fuzzy-dates" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fuzzy-dates/2024-10-12/fuzzy-dates-20241012-git.tgz"; - sha256 = "1nnwb7dl772zax0ysc9v4z29kq639f3za7k34hdk9fyyqbln9dgl"; + url = "https://beta.quicklisp.org/archive/fuzzy-dates/2025-06-22/fuzzy-dates-20250622-git.tgz"; + sha256 = "0qaig90b91nrwgxs55c8zaah5iq72rgxw1clmjqw0iilfg5wgllr"; system = "fuzzy-dates"; asd = "fuzzy-dates"; } @@ -55121,7 +55915,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fuzzy-match" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fuzzy-match/2021-01-24/fuzzy-match-20210124-git.tgz"; + url = "https://beta.quicklisp.org/archive/fuzzy-match/2021-01-24/fuzzy-match-20210124-git.tgz"; sha256 = "1lawndmzkl6f9sviy7ngn2s3xkc4akp8l505kvpslaz6qq0ayyqv"; system = "fuzzy-match"; asd = "fuzzy-match"; @@ -55144,7 +55938,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "fxml" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fxml/2021-02-28/fxml-20210228-git.tgz"; + url = "https://beta.quicklisp.org/archive/fxml/2021-02-28/fxml-20210228-git.tgz"; sha256 = "1vxdb1cjjqi986f72bggnw1s4yzv12g4li7vn4y49b6lphshr8lm"; system = "fxml"; asd = "fxml"; @@ -55169,12 +55963,12 @@ lib.makeScope pkgs.newScope (self: { gadgets = ( build-asdf-system { pname = "gadgets"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "gadgets" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gadgets/2024-10-12/gadgets-20241012-git.tgz"; - sha256 = "1ba4gj8lh3ihbb66xiz7hc8cdg3gvi3q20w32nmsqdch956is34k"; + url = "https://beta.quicklisp.org/archive/gadgets/2025-06-22/gadgets-20250622-git.tgz"; + sha256 = "0dbia2679dj4kr2ndh15ib26l9kw6zxx0qjn4l0jkcdx7shrkll6"; system = "gadgets"; asd = "gadgets"; } @@ -55198,7 +55992,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "garbage-pools" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/garbage-pools/2021-01-24/garbage-pools-20210124-git.tgz"; + url = "https://beta.quicklisp.org/archive/garbage-pools/2021-01-24/garbage-pools-20210124-git.tgz"; sha256 = "04jqwr6j138him6wc4nrwjzm4lvyj5j31xqab02nkf8h9hmsf5v1"; system = "garbage-pools"; asd = "garbage-pools"; @@ -55218,7 +56012,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "garbage-pools-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/garbage-pools/2021-01-24/garbage-pools-20210124-git.tgz"; + url = "https://beta.quicklisp.org/archive/garbage-pools/2021-01-24/garbage-pools-20210124-git.tgz"; sha256 = "04jqwr6j138him6wc4nrwjzm4lvyj5j31xqab02nkf8h9hmsf5v1"; system = "garbage-pools-test"; asd = "garbage-pools-test"; @@ -55241,7 +56035,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "garten" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/colliflower/2021-10-20/colliflower-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/colliflower/2021-10-20/colliflower-20211020-git.tgz"; sha256 = "1fzn9s7wm7wmffrdm21lpvry9jb320456cmmprn976a533lp704r"; system = "garten"; asd = "garten"; @@ -55265,7 +56059,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "gcm" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gcm/2014-12-17/gcm-20141217-git.tgz"; + url = "https://beta.quicklisp.org/archive/gcm/2014-12-17/gcm-20141217-git.tgz"; sha256 = "1xnm1cj417d9syb634zi9w90c2191gxjrixa724s4h3hvj70y0ff"; system = "gcm"; asd = "gcm"; @@ -55289,7 +56083,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "geco" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/geco/2021-02-28/geco-20210228-git.tgz"; + url = "https://beta.quicklisp.org/archive/geco/2021-02-28/geco-20210228-git.tgz"; sha256 = "1ncaf9ab7jz59zmga0p97blsjjb1m6db0qih57wipfhqdb5ylz17"; system = "geco"; asd = "geco"; @@ -55305,12 +56099,12 @@ lib.makeScope pkgs.newScope (self: { gendl = ( build-asdf-system { pname = "gendl"; - version = "master-fe503896-git"; + version = "master-5a621564-git"; asds = [ "gendl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz"; - sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10"; + url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; + sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; system = "gendl"; asd = "gendl"; } @@ -55331,12 +56125,12 @@ lib.makeScope pkgs.newScope (self: { gendl-asdf = ( build-asdf-system { pname = "gendl-asdf"; - version = "master-fe503896-git"; + version = "master-5a621564-git"; asds = [ "gendl-asdf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz"; - sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10"; + url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; + sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; system = "gendl-asdf"; asd = "gendl-asdf"; } @@ -55355,7 +56149,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "general-accumulator" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-general-accumulator/2021-12-09/cl-general-accumulator-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-general-accumulator/2021-12-09/cl-general-accumulator-20211209-git.tgz"; sha256 = "14ybsk1ahgya67clspacqij1lvs5bzv07rdq60nhgqsbc6s56j9g"; system = "general-accumulator"; asd = "general-accumulator"; @@ -55375,7 +56169,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "generalized-reference" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/generalized-reference/2022-07-07/generalized-reference-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/generalized-reference/2022-07-07/generalized-reference-20220707-git.tgz"; sha256 = "0q1cm52lijn4p6bjzx2yr2kwy729lcj3f6lsanbnbjw56xgp4cpb"; system = "generalized-reference"; asd = "generalized-reference"; @@ -55402,7 +56196,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "generators" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/generators/2013-06-15/generators-20130615-git.tgz"; + url = "https://beta.quicklisp.org/archive/generators/2013-06-15/generators-20130615-git.tgz"; sha256 = "1y8jlvv5c3av2ww33rwm2kh9sxmhfykhz235b33fbjpdxpx1r9bs"; system = "generators"; asd = "generators"; @@ -55422,12 +56216,12 @@ lib.makeScope pkgs.newScope (self: { generic-cl = ( build-asdf-system { pname = "generic-cl"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "generic-cl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz"; - sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4"; + url = "https://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz"; + sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s"; system = "generic-cl"; asd = "generic-cl"; } @@ -55453,12 +56247,12 @@ lib.makeScope pkgs.newScope (self: { generic-cl_dot_arithmetic = ( build-asdf-system { pname = "generic-cl.arithmetic"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "generic-cl.arithmetic" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz"; - sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4"; + url = "https://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz"; + sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s"; system = "generic-cl.arithmetic"; asd = "generic-cl.arithmetic"; } @@ -55478,12 +56272,12 @@ lib.makeScope pkgs.newScope (self: { generic-cl_dot_collector = ( build-asdf-system { pname = "generic-cl.collector"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "generic-cl.collector" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz"; - sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4"; + url = "https://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz"; + sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s"; system = "generic-cl.collector"; asd = "generic-cl.collector"; } @@ -55505,12 +56299,12 @@ lib.makeScope pkgs.newScope (self: { generic-cl_dot_comparison = ( build-asdf-system { pname = "generic-cl.comparison"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "generic-cl.comparison" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz"; - sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4"; + url = "https://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz"; + sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s"; system = "generic-cl.comparison"; asd = "generic-cl.comparison"; } @@ -55529,12 +56323,12 @@ lib.makeScope pkgs.newScope (self: { generic-cl_dot_container = ( build-asdf-system { pname = "generic-cl.container"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "generic-cl.container" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz"; - sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4"; + url = "https://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz"; + sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s"; system = "generic-cl.container"; asd = "generic-cl.container"; } @@ -55552,12 +56346,12 @@ lib.makeScope pkgs.newScope (self: { generic-cl_dot_internal = ( build-asdf-system { pname = "generic-cl.internal"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "generic-cl.internal" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz"; - sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4"; + url = "https://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz"; + sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s"; system = "generic-cl.internal"; asd = "generic-cl.internal"; } @@ -55577,12 +56371,12 @@ lib.makeScope pkgs.newScope (self: { generic-cl_dot_iterator = ( build-asdf-system { pname = "generic-cl.iterator"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "generic-cl.iterator" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz"; - sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4"; + url = "https://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz"; + sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s"; system = "generic-cl.iterator"; asd = "generic-cl.iterator"; } @@ -55609,12 +56403,12 @@ lib.makeScope pkgs.newScope (self: { generic-cl_dot_lazy-seq = ( build-asdf-system { pname = "generic-cl.lazy-seq"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "generic-cl.lazy-seq" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz"; - sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4"; + url = "https://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz"; + sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s"; system = "generic-cl.lazy-seq"; asd = "generic-cl.lazy-seq"; } @@ -55642,12 +56436,12 @@ lib.makeScope pkgs.newScope (self: { generic-cl_dot_map = ( build-asdf-system { pname = "generic-cl.map"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "generic-cl.map" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz"; - sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4"; + url = "https://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz"; + sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s"; system = "generic-cl.map"; asd = "generic-cl.map"; } @@ -55676,12 +56470,12 @@ lib.makeScope pkgs.newScope (self: { generic-cl_dot_math = ( build-asdf-system { pname = "generic-cl.math"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "generic-cl.math" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz"; - sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4"; + url = "https://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz"; + sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s"; system = "generic-cl.math"; asd = "generic-cl.math"; } @@ -55704,12 +56498,12 @@ lib.makeScope pkgs.newScope (self: { generic-cl_dot_object = ( build-asdf-system { pname = "generic-cl.object"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "generic-cl.object" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz"; - sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4"; + url = "https://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz"; + sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s"; system = "generic-cl.object"; asd = "generic-cl.object"; } @@ -55729,12 +56523,12 @@ lib.makeScope pkgs.newScope (self: { generic-cl_dot_sequence = ( build-asdf-system { pname = "generic-cl.sequence"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "generic-cl.sequence" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz"; - sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4"; + url = "https://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz"; + sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s"; system = "generic-cl.sequence"; asd = "generic-cl.sequence"; } @@ -55763,12 +56557,12 @@ lib.makeScope pkgs.newScope (self: { generic-cl_dot_set = ( build-asdf-system { pname = "generic-cl.set"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "generic-cl.set" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz"; - sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4"; + url = "https://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz"; + sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s"; system = "generic-cl.set"; asd = "generic-cl.set"; } @@ -55794,12 +56588,12 @@ lib.makeScope pkgs.newScope (self: { generic-cl_dot_util = ( build-asdf-system { pname = "generic-cl.util"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "generic-cl.util" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz"; - sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4"; + url = "https://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz"; + sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s"; system = "generic-cl.util"; asd = "generic-cl.util"; } @@ -55818,7 +56612,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "generic-comparability" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/generic-comparability/2018-01-31/generic-comparability-20180131-git.tgz"; + url = "https://beta.quicklisp.org/archive/generic-comparability/2018-01-31/generic-comparability-20180131-git.tgz"; sha256 = "01ma0cwirxarwwmdwflnh8kmysmr2smh5kyvzhb2074ljxg8yq2p"; system = "generic-comparability"; asd = "generic-comparability"; @@ -55838,7 +56632,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "generic-comparability-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/generic-comparability/2018-01-31/generic-comparability-20180131-git.tgz"; + url = "https://beta.quicklisp.org/archive/generic-comparability/2018-01-31/generic-comparability-20180131-git.tgz"; sha256 = "01ma0cwirxarwwmdwflnh8kmysmr2smh5kyvzhb2074ljxg8yq2p"; system = "generic-comparability-test"; asd = "generic-comparability"; @@ -55862,7 +56656,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "generic-sequences" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/generic-sequences/2015-07-09/generic-sequences-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/generic-sequences/2015-07-09/generic-sequences-20150709-git.tgz"; sha256 = "09kr0x4kx634rhslal6z2isnbs7v8rn5ic3pvxa3w1mm37lxx7h3"; system = "generic-sequences"; asd = "generic-sequences"; @@ -55882,7 +56676,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "generic-sequences-cont" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/generic-sequences/2015-07-09/generic-sequences-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/generic-sequences/2015-07-09/generic-sequences-20150709-git.tgz"; sha256 = "09kr0x4kx634rhslal6z2isnbs7v8rn5ic3pvxa3w1mm37lxx7h3"; system = "generic-sequences-cont"; asd = "generic-sequences-cont"; @@ -55905,7 +56699,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "generic-sequences-iterate" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/generic-sequences/2015-07-09/generic-sequences-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/generic-sequences/2015-07-09/generic-sequences-20150709-git.tgz"; sha256 = "09kr0x4kx634rhslal6z2isnbs7v8rn5ic3pvxa3w1mm37lxx7h3"; system = "generic-sequences-iterate"; asd = "generic-sequences-iterate"; @@ -55928,7 +56722,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "generic-sequences-stream" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/generic-sequences/2015-07-09/generic-sequences-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/generic-sequences/2015-07-09/generic-sequences-20150709-git.tgz"; sha256 = "09kr0x4kx634rhslal6z2isnbs7v8rn5ic3pvxa3w1mm37lxx7h3"; system = "generic-sequences-stream"; asd = "generic-sequences-stream"; @@ -55951,7 +56745,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "generic-sequences-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/generic-sequences/2015-07-09/generic-sequences-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/generic-sequences/2015-07-09/generic-sequences-20150709-git.tgz"; sha256 = "09kr0x4kx634rhslal6z2isnbs7v8rn5ic3pvxa3w1mm37lxx7h3"; system = "generic-sequences-test"; asd = "generic-sequences-test"; @@ -55976,7 +56770,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "geneva" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz"; + url = "https://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz"; sha256 = "1pw18xkbndqssx6iix8a8zcw8bgjh88jxxxrklkgkghk04bmqxw3"; system = "geneva"; asd = "geneva"; @@ -55999,7 +56793,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "geneva-cl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz"; + url = "https://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz"; sha256 = "1pw18xkbndqssx6iix8a8zcw8bgjh88jxxxrklkgkghk04bmqxw3"; system = "geneva-cl"; asd = "geneva-cl"; @@ -56025,7 +56819,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "geneva-html" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz"; + url = "https://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz"; sha256 = "1pw18xkbndqssx6iix8a8zcw8bgjh88jxxxrklkgkghk04bmqxw3"; system = "geneva-html"; asd = "geneva-html"; @@ -56049,7 +56843,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "geneva-latex" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz"; + url = "https://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz"; sha256 = "1pw18xkbndqssx6iix8a8zcw8bgjh88jxxxrklkgkghk04bmqxw3"; system = "geneva-latex"; asd = "geneva-latex"; @@ -56074,7 +56868,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "geneva-mk2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz"; + url = "https://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz"; sha256 = "1pw18xkbndqssx6iix8a8zcw8bgjh88jxxxrklkgkghk04bmqxw3"; system = "geneva-mk2"; asd = "geneva-mk2"; @@ -56098,7 +56892,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "geneva-plain-text" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz"; + url = "https://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz"; sha256 = "1pw18xkbndqssx6iix8a8zcw8bgjh88jxxxrklkgkghk04bmqxw3"; system = "geneva-plain-text"; asd = "geneva-plain-text"; @@ -56121,7 +56915,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "geneva-tex" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz"; + url = "https://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz"; sha256 = "1pw18xkbndqssx6iix8a8zcw8bgjh88jxxxrklkgkghk04bmqxw3"; system = "geneva-tex"; asd = "geneva-tex"; @@ -56146,7 +56940,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "genhash" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/genhash/2018-12-10/genhash-20181210-git.tgz"; + url = "https://beta.quicklisp.org/archive/genhash/2018-12-10/genhash-20181210-git.tgz"; sha256 = "1jnk1fix1zydhy0kn3cvlp6dy0241x7v8ahq001nlr6v152z1cwk"; system = "genhash"; asd = "genhash"; @@ -56166,7 +56960,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "geodesic" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/geodesic/2023-06-18/geodesic-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/geodesic/2023-06-18/geodesic-20230618-git.tgz"; sha256 = "13hvkf6r1y1yx0zqgkl8yg1fskfp7vpa9p34ar00s4ly432vbpxq"; system = "geodesic"; asd = "geodesic"; @@ -56182,18 +56976,19 @@ lib.makeScope pkgs.newScope (self: { geom-base = ( build-asdf-system { pname = "geom-base"; - version = "master-fe503896-git"; + version = "master-5a621564-git"; asds = [ "geom-base" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz"; - sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10"; + url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; + sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; system = "geom-base"; asd = "geom-base"; } ); systems = [ "geom-base" ]; lispLibs = [ + (getAttr "alexandria" self) (getAttr "base" self) (getAttr "cl-pdf" self) (getAttr "cl-typesetting" self) @@ -56207,12 +57002,12 @@ lib.makeScope pkgs.newScope (self: { geowkt = ( build-asdf-system { pname = "geowkt"; - version = "20200610-git"; + version = "20250622-git"; asds = [ "geowkt" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/geowkt/2020-06-10/geowkt-20200610-git.tgz"; - sha256 = "02l8cb2k10j7k6fvhk9dpqmkxs6vb5w5nh3159w7drprvjqhfrjw"; + url = "https://beta.quicklisp.org/archive/geowkt/2025-06-22/geowkt-20250622-git.tgz"; + sha256 = "1x71m22vgqycm46bqymy5pr4k0l2xn3myjbxaf9ps1s36nvd3d1g"; system = "geowkt"; asd = "geowkt"; } @@ -56227,18 +57022,19 @@ lib.makeScope pkgs.newScope (self: { geowkt-update = ( build-asdf-system { pname = "geowkt-update"; - version = "20200610-git"; + version = "20250622-git"; asds = [ "geowkt-update" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/geowkt/2020-06-10/geowkt-20200610-git.tgz"; - sha256 = "02l8cb2k10j7k6fvhk9dpqmkxs6vb5w5nh3159w7drprvjqhfrjw"; + url = "https://beta.quicklisp.org/archive/geowkt/2025-06-22/geowkt-20250622-git.tgz"; + sha256 = "1x71m22vgqycm46bqymy5pr4k0l2xn3myjbxaf9ps1s36nvd3d1g"; system = "geowkt-update"; asd = "geowkt-update"; } ); systems = [ "geowkt-update" ]; lispLibs = [ + (getAttr "cl-json" self) (getAttr "cl-ppcre" self) (getAttr "drakma" self) (getAttr "parse-number" self) @@ -56255,7 +57051,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "getopt" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/getopt/2015-09-23/getopt-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/getopt/2015-09-23/getopt-20150923-git.tgz"; sha256 = "1liwzghx2swws84xlxnq756gbass0s916a9sq5mjfnlg3scbwcs3"; system = "getopt"; asd = "getopt"; @@ -56275,7 +57071,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "getopt-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/getopt/2015-09-23/getopt-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/getopt/2015-09-23/getopt-20150923-git.tgz"; sha256 = "1liwzghx2swws84xlxnq756gbass0s916a9sq5mjfnlg3scbwcs3"; system = "getopt-tests"; asd = "getopt"; @@ -56298,7 +57094,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "gettext" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gettext/2017-11-30/gettext-20171130-git.tgz"; + url = "https://beta.quicklisp.org/archive/gettext/2017-11-30/gettext-20171130-git.tgz"; sha256 = "1pzhamgni6k5hi6bbvlb3dm659pcllrrr3vhhn3rpjn238zxg5ar"; system = "gettext"; asd = "gettext"; @@ -56320,7 +57116,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "gettext-example" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gettext/2017-11-30/gettext-20171130-git.tgz"; + url = "https://beta.quicklisp.org/archive/gettext/2017-11-30/gettext-20171130-git.tgz"; sha256 = "1pzhamgni6k5hi6bbvlb3dm659pcllrrr3vhhn3rpjn238zxg5ar"; system = "gettext-example"; asd = "gettext-example"; @@ -56340,7 +57136,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "gettext-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gettext/2017-11-30/gettext-20171130-git.tgz"; + url = "https://beta.quicklisp.org/archive/gettext/2017-11-30/gettext-20171130-git.tgz"; sha256 = "1pzhamgni6k5hi6bbvlb3dm659pcllrrr3vhhn3rpjn238zxg5ar"; system = "gettext-tests"; asd = "gettext-tests"; @@ -56359,12 +57155,12 @@ lib.makeScope pkgs.newScope (self: { geysr = ( build-asdf-system { pname = "geysr"; - version = "master-fe503896-git"; + version = "master-5a621564-git"; asds = [ "geysr" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz"; - sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10"; + url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; + sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; system = "geysr"; asd = "geysr"; } @@ -56386,7 +57182,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "git-file-history" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/git-file-history/2016-08-25/git-file-history-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/git-file-history/2016-08-25/git-file-history-20160825-git.tgz"; sha256 = "00kdawcy3mhljv04xpx5n7l2s21qdpbm8i9avjdqbxvfc5j05bq8"; system = "git-file-history"; asd = "git-file-history"; @@ -56410,7 +57206,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "git-file-history-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/git-file-history/2016-08-25/git-file-history-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/git-file-history/2016-08-25/git-file-history-20160825-git.tgz"; sha256 = "00kdawcy3mhljv04xpx5n7l2s21qdpbm8i9avjdqbxvfc5j05bq8"; system = "git-file-history-test"; asd = "git-file-history-test"; @@ -56433,7 +57229,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "github-api-cl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/github-api-cl/2024-10-12/github-api-cl-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/github-api-cl/2024-10-12/github-api-cl-20241012-git.tgz"; sha256 = "04kvhap041v26axg4pzzymnibzh430yvja8c6dhic27g2639kswh"; system = "github-api-cl"; asd = "github-api-cl"; @@ -56463,7 +57259,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "github-gist-api-cl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/github-api-cl/2024-10-12/github-api-cl-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/github-api-cl/2024-10-12/github-api-cl-20241012-git.tgz"; sha256 = "04kvhap041v26axg4pzzymnibzh430yvja8c6dhic27g2639kswh"; system = "github-gist-api-cl"; asd = "github-gist-api-cl"; @@ -56487,36 +57283,6 @@ lib.makeScope pkgs.newScope (self: { }; } ); - glacier = ( - build-asdf-system { - pname = "glacier"; - version = "20230214-git"; - asds = [ "glacier" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/glacier/2023-02-14/glacier-20230214-git.tgz"; - sha256 = "1h66cd3bn3n8yjd922xsvv0r668cm82106nm2k3fnll67apazlwi"; - system = "glacier"; - asd = "glacier"; - } - ); - systems = [ "glacier" ]; - lispLibs = [ - (getAttr "alexandria" self) - (getAttr "bordeaux-threads" self) - (getAttr "cl-json" self) - (getAttr "cl-ppcre" self) - (getAttr "dexador" self) - (getAttr "simple-config" self) - (getAttr "str" self) - (getAttr "tooter" self) - (getAttr "websocket-driver" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); glad-blob = ( build-asdf-system { pname = "glad-blob"; @@ -56524,7 +57290,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "glad-blob" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/glad-blob/2020-10-16/glad-blob-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/glad-blob/2020-10-16/glad-blob-stable-git.tgz"; sha256 = "19vp7nyf4kxhczi8i2w47lvipk1i4psrxlpk4nvbdh97vc12k5a7"; system = "glad-blob"; asd = "glad-blob"; @@ -56547,7 +57313,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "glass" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/glass/2015-07-09/glass-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/glass/2015-07-09/glass-20150709-git.tgz"; sha256 = "1xwr6mj25m0z1qhp30hafbbhrfj34dfidy320x5m3lij13vbyb1p"; system = "glass"; asd = "glass"; @@ -56567,7 +57333,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "glaw" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/glaw/2018-02-28/glaw-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/glaw/2018-02-28/glaw-20180228-git.tgz"; sha256 = "06i9g80hkqgwk5h306wkdpcpv7n229n1ig1hy6697l35v8c4mzmp"; system = "glaw"; asd = "glaw"; @@ -56591,7 +57357,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "glaw-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/glaw/2018-02-28/glaw-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/glaw/2018-02-28/glaw-20180228-git.tgz"; sha256 = "06i9g80hkqgwk5h306wkdpcpv7n229n1ig1hy6697l35v8c4mzmp"; system = "glaw-examples"; asd = "glaw-examples"; @@ -56615,7 +57381,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "glaw-imago" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/glaw/2018-02-28/glaw-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/glaw/2018-02-28/glaw-20180228-git.tgz"; sha256 = "06i9g80hkqgwk5h306wkdpcpv7n229n1ig1hy6697l35v8c4mzmp"; system = "glaw-imago"; asd = "glaw-imago"; @@ -56638,7 +57404,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "glaw-sdl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/glaw/2018-02-28/glaw-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/glaw/2018-02-28/glaw-20180228-git.tgz"; sha256 = "06i9g80hkqgwk5h306wkdpcpv7n229n1ig1hy6697l35v8c4mzmp"; system = "glaw-sdl"; asd = "glaw-sdl"; @@ -56658,12 +57424,12 @@ lib.makeScope pkgs.newScope (self: { glfw = ( build-asdf-system { pname = "glfw"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "glfw" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/glfw/2024-10-12/glfw-20241012-git.tgz"; - sha256 = "1n421gvrzs76v57icy0c4zhz84ymin91vbv5gkkj4i00cnggwdxv"; + url = "https://beta.quicklisp.org/archive/glfw/2025-06-22/glfw-20250622-git.tgz"; + sha256 = "0a9s6mz92h1lhayja683gfraacpq7w1fg3y7b9brkfzdkg1nk5ik"; system = "glfw"; asd = "glfw"; } @@ -56687,7 +57453,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "glfw-blob" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/glfw-blob/2020-10-16/glfw-blob-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/glfw-blob/2020-10-16/glfw-blob-stable-git.tgz"; sha256 = "0j953vqsyswipgyhc39swsgwgaqb53wvs80izraknlsp379hzabs"; system = "glfw-blob"; asd = "glfw-blob"; @@ -56710,7 +57476,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "glhelp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; system = "glhelp"; asd = "glhelp"; @@ -56732,12 +57498,12 @@ lib.makeScope pkgs.newScope (self: { glisp = ( build-asdf-system { pname = "glisp"; - version = "master-fe503896-git"; + version = "master-5a621564-git"; asds = [ "glisp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz"; - sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10"; + url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; + sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; system = "glisp"; asd = "glisp"; } @@ -56762,7 +57528,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "glisph" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/glisph/2017-04-03/glisph-20170403-git.tgz"; + url = "https://beta.quicklisp.org/archive/glisph/2017-04-03/glisph-20170403-git.tgz"; sha256 = "097d6kjk4rndpqn181k9nyr2bps4gf3shq5x2fy1swvks3pvys91"; system = "glisph"; asd = "glisph"; @@ -56788,7 +57554,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "glisph-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/glisph/2017-04-03/glisph-20170403-git.tgz"; + url = "https://beta.quicklisp.org/archive/glisph/2017-04-03/glisph-20170403-git.tgz"; sha256 = "097d6kjk4rndpqn181k9nyr2bps4gf3shq5x2fy1swvks3pvys91"; system = "glisph-test"; asd = "glisph-test"; @@ -56813,7 +57579,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "glkit" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/glkit/2020-10-16/glkit-20201016-git.tgz"; + url = "https://beta.quicklisp.org/archive/glkit/2020-10-16/glkit-20201016-git.tgz"; sha256 = "1x3y5jcr1f0v9sgn3y5b7b8fhgd6vv37nz73016gdwh511idi8jn"; system = "glkit"; asd = "glkit"; @@ -56839,7 +57605,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "glkit-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/glkit/2020-10-16/glkit-20201016-git.tgz"; + url = "https://beta.quicklisp.org/archive/glkit/2020-10-16/glkit-20201016-git.tgz"; sha256 = "1x3y5jcr1f0v9sgn3y5b7b8fhgd6vv37nz73016gdwh511idi8jn"; system = "glkit-examples"; asd = "glkit-examples"; @@ -56862,7 +57628,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "global-vars" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/global-vars/2014-11-06/global-vars-20141106-git.tgz"; + url = "https://beta.quicklisp.org/archive/global-vars/2014-11-06/global-vars-20141106-git.tgz"; sha256 = "06m3xc8l3pgsapl8fvsi9wf6y46zs75cp9zn7zh6dc65v4s5wz3d"; system = "global-vars"; asd = "global-vars"; @@ -56880,7 +57646,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "global-vars-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/global-vars/2014-11-06/global-vars-20141106-git.tgz"; + url = "https://beta.quicklisp.org/archive/global-vars/2014-11-06/global-vars-20141106-git.tgz"; sha256 = "06m3xc8l3pgsapl8fvsi9wf6y46zs75cp9zn7zh6dc65v4s5wz3d"; system = "global-vars-test"; asd = "global-vars-test"; @@ -56900,7 +57666,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "glop" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/glop/2017-10-19/glop-20171019-git.tgz"; + url = "https://beta.quicklisp.org/archive/glop/2017-10-19/glop-20171019-git.tgz"; sha256 = "1nm35kvigflfjlmsa8zwdajc61f02fh4sq08jv0wnqylhx8yg2bv"; system = "glop"; asd = "glop"; @@ -56924,7 +57690,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "glop-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/glop/2017-10-19/glop-20171019-git.tgz"; + url = "https://beta.quicklisp.org/archive/glop/2017-10-19/glop-20171019-git.tgz"; sha256 = "1nm35kvigflfjlmsa8zwdajc61f02fh4sq08jv0wnqylhx8yg2bv"; system = "glop-test"; asd = "glop-test"; @@ -56948,7 +57714,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "glsl-docs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz"; + url = "https://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz"; sha256 = "01ipspr22fgfj3w8wq2y81lzrjc4vpfiwnr3dqhjlpzzra46am8c"; system = "glsl-docs"; asd = "glsl-docs"; @@ -56966,7 +57732,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "glsl-packing" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/glsl-packing/2018-01-31/glsl-packing-20180131-git.tgz"; + url = "https://beta.quicklisp.org/archive/glsl-packing/2018-01-31/glsl-packing-20180131-git.tgz"; sha256 = "0k2f1771wd9kdrcasldy1r00k5bdgi9fd07in52zmjggc0i7dd80"; system = "glsl-packing"; asd = "glsl-packing"; @@ -56986,7 +57752,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "glsl-spec" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz"; + url = "https://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz"; sha256 = "01ipspr22fgfj3w8wq2y81lzrjc4vpfiwnr3dqhjlpzzra46am8c"; system = "glsl-spec"; asd = "glsl-spec"; @@ -57004,7 +57770,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "glsl-symbols" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz"; + url = "https://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz"; sha256 = "01ipspr22fgfj3w8wq2y81lzrjc4vpfiwnr3dqhjlpzzra46am8c"; system = "glsl-symbols"; asd = "glsl-symbols"; @@ -57018,12 +57784,12 @@ lib.makeScope pkgs.newScope (self: { glsl-toolkit = ( build-asdf-system { pname = "glsl-toolkit"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "glsl-toolkit" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/glsl-toolkit/2024-10-12/glsl-toolkit-20241012-git.tgz"; - sha256 = "0yh6y2k2v5ivzwfnvnprlcih8jn7fv3pzz2wn85fpvbfw4mg120x"; + url = "https://beta.quicklisp.org/archive/glsl-toolkit/2025-06-22/glsl-toolkit-20250622-git.tgz"; + sha256 = "18vkhww1h6pdwarr3smzdzj96va6c6j7a33sf05rjkifa0bm8f4m"; system = "glsl-toolkit"; asd = "glsl-toolkit"; } @@ -57047,7 +57813,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "glu-tessellate" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/glu-tessellate/2015-06-08/glu-tessellate-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/glu-tessellate/2015-06-08/glu-tessellate-20150608-git.tgz"; sha256 = "1iwnvk341pidxdsjb2c730k6a7nr1knd5ir0v83y6jhsf78r9krh"; system = "glu-tessellate"; asd = "glu-tessellate"; @@ -57067,7 +57833,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "glyphs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/glyphs/2018-07-11/glyphs-20180711-git.tgz"; + url = "https://beta.quicklisp.org/archive/glyphs/2018-07-11/glyphs-20180711-git.tgz"; sha256 = "17kai1anbkk5dj5sbrsin2fc019cmcbglb900db60v38myj0y0wf"; system = "glyphs"; asd = "glyphs"; @@ -57091,7 +57857,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "glyphs-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/glyphs/2018-07-11/glyphs-20180711-git.tgz"; + url = "https://beta.quicklisp.org/archive/glyphs/2018-07-11/glyphs-20180711-git.tgz"; sha256 = "17kai1anbkk5dj5sbrsin2fc019cmcbglb900db60v38myj0y0wf"; system = "glyphs-test"; asd = "glyphs-test"; @@ -57114,7 +57880,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "golden-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/golden-utils/2024-10-12/golden-utils-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/golden-utils/2024-10-12/golden-utils-20241012-git.tgz"; sha256 = "09vq29wjr3x7h3fshwxg8h1psy4p73yl61cjljarpqjhsgz7lmbp"; system = "golden-utils"; asd = "golden-utils"; @@ -57134,7 +57900,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "gooptest" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gooptest/2020-09-25/gooptest-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/gooptest/2020-09-25/gooptest-20200925-git.tgz"; sha256 = "1g9q4frlc79xkmz74ybs954rc5kmfwjsn4xi64aig1fh5wjni5xs"; system = "gooptest"; asd = "gooptest"; @@ -57160,7 +57926,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "graph" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/graph/2022-03-31/graph-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/graph/2022-03-31/graph-20220331-git.tgz"; sha256 = "0m76vb0mk7rlbv9xhnix001gxik9f7vy9lspradcvzbk1rfxyyf7"; system = "graph"; asd = "graph"; @@ -57183,12 +57949,12 @@ lib.makeScope pkgs.newScope (self: { graphs = ( build-asdf-system { pname = "graphs"; - version = "master-fe503896-git"; + version = "master-5a621564-git"; asds = [ "graphs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz"; - sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10"; + url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; + sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; system = "graphs"; asd = "graphs"; } @@ -57207,7 +57973,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "gravatar" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-gravatar/2011-03-20/cl-gravatar-20110320-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-gravatar/2011-03-20/cl-gravatar-20110320-git.tgz"; sha256 = "1r9fq1zaywlhpxr3s3wgajhxf1kgwsgsql0a7ccfgsbwkgy2qzfs"; system = "gravatar"; asd = "gravatar"; @@ -57233,7 +57999,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "graylex" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/graylex/2011-05-22/graylex-20110522-git.tgz"; + url = "https://beta.quicklisp.org/archive/graylex/2011-05-22/graylex-20110522-git.tgz"; sha256 = "0s1mpz6cpx3fywznxc8kzkhbb4fpmzyjpfgc85lnxqmri8wy6xqy"; system = "graylex"; asd = "graylex"; @@ -57257,7 +58023,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "graylex-m4-example" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/graylex/2011-05-22/graylex-20110522-git.tgz"; + url = "https://beta.quicklisp.org/archive/graylex/2011-05-22/graylex-20110522-git.tgz"; sha256 = "0s1mpz6cpx3fywznxc8kzkhbb4fpmzyjpfgc85lnxqmri8wy6xqy"; system = "graylex-m4-example"; asd = "graylex-m4-example"; @@ -57280,7 +58046,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "graylog" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-graylog/2018-04-30/cl-graylog-20180430-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-graylog/2018-04-30/cl-graylog-20180430-git.tgz"; sha256 = "1bj1v6vwz8w78h0bkjv5614gq50jdpjix88rbn3nvh81cfjvsqdg"; system = "graylog"; asd = "graylog"; @@ -57307,7 +58073,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "graylog-log5" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-graylog/2018-04-30/cl-graylog-20180430-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-graylog/2018-04-30/cl-graylog-20180430-git.tgz"; sha256 = "1bj1v6vwz8w78h0bkjv5614gq50jdpjix88rbn3nvh81cfjvsqdg"; system = "graylog-log5"; asd = "graylog-log5"; @@ -57330,7 +58096,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "green-threads" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/green-threads/2014-12-17/green-threads-20141217-git.tgz"; + url = "https://beta.quicklisp.org/archive/green-threads/2014-12-17/green-threads-20141217-git.tgz"; sha256 = "1czw7nr0dwfps76h8hjvglk1wdh53yqbfbvv30whwbgqx33iippz"; system = "green-threads"; asd = "green-threads"; @@ -57353,7 +58119,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "grid-formation" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/grid-formation/2022-07-07/grid-formation-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/grid-formation/2022-07-07/grid-formation-20220707-git.tgz"; sha256 = "0s5picmkn7gn98k23axadbc0mlzlrbadi1ln85gpqp17k3cmd54m"; system = "grid-formation"; asd = "grid-formation"; @@ -57376,7 +58142,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "group-by" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/group-by/2014-02-11/group-by-20140211-git.tgz"; + url = "https://beta.quicklisp.org/archive/group-by/2014-02-11/group-by-20140211-git.tgz"; sha256 = "1p1qprb57fjd6sj8ws6c7y40ab38mym65wni8xivdy89i3d63dz4"; system = "group-by"; asd = "group-by"; @@ -57399,7 +58165,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "group-by-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/group-by/2014-02-11/group-by-20140211-git.tgz"; + url = "https://beta.quicklisp.org/archive/group-by/2014-02-11/group-by-20140211-git.tgz"; sha256 = "1p1qprb57fjd6sj8ws6c7y40ab38mym65wni8xivdy89i3d63dz4"; system = "group-by-test"; asd = "group-by"; @@ -57422,7 +58188,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "groupby" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-groupby/2017-08-30/cl-groupby-20170830-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-groupby/2017-08-30/cl-groupby-20170830-git.tgz"; sha256 = "1ra4zi9ifrhxxsj4svg1iqqzzsv9aqqa76pswygp7g084x6kn5km"; system = "groupby"; asd = "groupby"; @@ -57435,6 +58201,26 @@ lib.makeScope pkgs.newScope (self: { }; } ); + grouping-stack = ( + build-asdf-system { + pname = "grouping-stack"; + version = "20250622-git"; + asds = [ "grouping-stack" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/lisa/2025-06-22/lisa-20250622-git.tgz"; + sha256 = "0m1ww61vbaxrj1jiln8f6x393i27sd604hv511bd67y6xj23qqai"; + system = "grouping-stack"; + asd = "grouping-stack"; + } + ); + systems = [ "grouping-stack" ]; + lispLibs = [ ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); grovel-locally = ( build-asdf-system { pname = "grovel-locally"; @@ -57442,7 +58228,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "grovel-locally" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/grovel-locally/2018-02-28/grovel-locally-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/grovel-locally/2018-02-28/grovel-locally-20180228-git.tgz"; sha256 = "07q7zjgv3d1f35zwxpzcz020z0gcqi6m2l2szw99bsqk5hn93szl"; system = "grovel-locally"; asd = "grovel-locally"; @@ -57468,7 +58254,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "gsll" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gsll/2018-08-31/gsll-quicklisp-eeeda841-git.tgz"; + url = "https://beta.quicklisp.org/archive/gsll/2018-08-31/gsll-quicklisp-eeeda841-git.tgz"; sha256 = "0zsjvi1f62hjgfjk4wqg13d4r53bli9nglkwnd31qrygn8pmzlhi"; system = "gsll"; asd = "gsll"; @@ -57495,7 +58281,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "gt" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-utils/2024-10-12/cl-utils-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-utils/2024-10-12/cl-utils-20241012-git.tgz"; sha256 = "133alv8368k9pjkvh3vsfsk50whw7si4i2i7b8z256knpb2d35gh"; system = "gt"; asd = "gt"; @@ -57531,7 +58317,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "gtirb" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gtirb/2021-10-20/gtirb-quicklisp-dd18337d-git.tgz"; + url = "https://beta.quicklisp.org/archive/gtirb/2021-10-20/gtirb-quicklisp-dd18337d-git.tgz"; sha256 = "0dpchsshnlh3jb9rg1zdf63mr5l33vhjdxgxx2vqg0nh1sh41zn1"; system = "gtirb"; asd = "gtirb"; @@ -57564,7 +58350,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "gtirb-capstone" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gtirb-capstone/2023-10-21/gtirb-capstone-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/gtirb-capstone/2023-10-21/gtirb-capstone-20231021-git.tgz"; sha256 = "1i65iay3pkc0q00inqyykjpv38jj0abz7j7dbsm6bamjvrh8n1v8"; system = "gtirb-capstone"; asd = "gtirb-capstone"; @@ -57592,7 +58378,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "gtirb-functions" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gtirb-functions/2023-06-18/gtirb-functions-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/gtirb-functions/2023-06-18/gtirb-functions-20230618-git.tgz"; sha256 = "19w18vfqrkjrsn4i4i3ppw5q80557pj0844r4zr3pbr0l8ypjcnp"; system = "gtirb-functions"; asd = "gtirb-functions"; @@ -57618,7 +58404,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "gtk-tagged-streams" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gtk-tagged-streams/2018-02-28/gtk-tagged-streams-quicklisp-d1c2b827-git.tgz"; + url = "https://beta.quicklisp.org/archive/gtk-tagged-streams/2018-02-28/gtk-tagged-streams-quicklisp-d1c2b827-git.tgz"; sha256 = "0ciw4ydcb8clsqb338hxpzncj2m59i6scnqlgbwkznm5i9dxvkyd"; system = "gtk-tagged-streams"; asd = "gtk-tagged-streams"; @@ -57642,7 +58428,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "gtwiwtg" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gtwiwtg/2023-10-21/gtwiwtg-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/gtwiwtg/2023-10-21/gtwiwtg-20231021-git.tgz"; sha256 = "0pp28s2bydqcd850kyk4jjvjky692lqgld9lc9v64lb96ibxzplk"; system = "gtwiwtg"; asd = "gtwiwtg"; @@ -57662,7 +58448,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "gtype" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gtype/2020-06-10/gtype-20200610-git.tgz"; + url = "https://beta.quicklisp.org/archive/gtype/2020-06-10/gtype-20200610-git.tgz"; sha256 = "0hbkfdw00v7bsa6zbric34p5w6hfwxycccg8wc2faq0cxhsvpv9h"; system = "gtype"; asd = "gtype"; @@ -57689,7 +58475,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "gtype.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gtype/2020-06-10/gtype-20200610-git.tgz"; + url = "https://beta.quicklisp.org/archive/gtype/2020-06-10/gtype-20200610-git.tgz"; sha256 = "0hbkfdw00v7bsa6zbric34p5w6hfwxycccg8wc2faq0cxhsvpv9h"; system = "gtype.test"; asd = "gtype.test"; @@ -57712,7 +58498,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "gute" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gute/2022-11-06/gute-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/gute/2022-11-06/gute-20221106-git.tgz"; sha256 = "1d1m4qaygvmkglwdqlnhkvwq0wrig13h97w8ansfkyig359vpzy0"; system = "gute"; asd = "gute"; @@ -57735,12 +58521,12 @@ lib.makeScope pkgs.newScope (self: { gwl = ( build-asdf-system { pname = "gwl"; - version = "master-fe503896-git"; + version = "master-5a621564-git"; asds = [ "gwl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz"; - sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10"; + url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; + sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; system = "gwl"; asd = "gwl"; } @@ -57748,6 +58534,7 @@ lib.makeScope pkgs.newScope (self: { systems = [ "gwl" ]; lispLibs = [ (getAttr "cl-html-parse" self) + (getAttr "cl-json" self) (getAttr "cl-markdown" self) (getAttr "cl-who" self) (getAttr "glisp" self) @@ -57762,12 +58549,12 @@ lib.makeScope pkgs.newScope (self: { gwl-graphics = ( build-asdf-system { pname = "gwl-graphics"; - version = "master-fe503896-git"; + version = "master-5a621564-git"; asds = [ "gwl-graphics" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz"; - sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10"; + url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; + sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; system = "gwl-graphics"; asd = "gwl-graphics"; } @@ -57789,7 +58576,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "gzip-stream" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gzip-stream/2010-10-06/gzip-stream_0.2.8.tgz"; + url = "https://beta.quicklisp.org/archive/gzip-stream/2010-10-06/gzip-stream_0.2.8.tgz"; sha256 = "1m2x685mk9zp8vq45r4gf6mlbzmzr79mvdxibw1fqzv7r1bqrwrs"; system = "gzip-stream"; asd = "gzip-stream"; @@ -57809,12 +58596,12 @@ lib.makeScope pkgs.newScope (self: { hamcrest = ( build-asdf-system { pname = "hamcrest"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "hamcrest" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-hamcrest/2024-10-12/cl-hamcrest-20241012-git.tgz"; - sha256 = "05l5i5cmm1yqg8x9ayffaf3a9xf742k02wkxwpkc125ih5x0ggws"; + url = "https://beta.quicklisp.org/archive/cl-hamcrest/2025-06-22/cl-hamcrest-20250622-git.tgz"; + sha256 = "0d97v9rmf681vmxzdg8vrp4c9dphyrw89qwxpjwzncd34xrppjfn"; system = "hamcrest"; asd = "hamcrest"; } @@ -57835,12 +58622,12 @@ lib.makeScope pkgs.newScope (self: { hamcrest-ci = ( build-asdf-system { pname = "hamcrest-ci"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "hamcrest-ci" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-hamcrest/2024-10-12/cl-hamcrest-20241012-git.tgz"; - sha256 = "05l5i5cmm1yqg8x9ayffaf3a9xf742k02wkxwpkc125ih5x0ggws"; + url = "https://beta.quicklisp.org/archive/cl-hamcrest/2025-06-22/cl-hamcrest-20250622-git.tgz"; + sha256 = "0d97v9rmf681vmxzdg8vrp4c9dphyrw89qwxpjwzncd34xrppjfn"; system = "hamcrest-ci"; asd = "hamcrest-ci"; } @@ -57855,12 +58642,12 @@ lib.makeScope pkgs.newScope (self: { hamcrest-tests = ( build-asdf-system { pname = "hamcrest-tests"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "hamcrest-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-hamcrest/2024-10-12/cl-hamcrest-20241012-git.tgz"; - sha256 = "05l5i5cmm1yqg8x9ayffaf3a9xf742k02wkxwpkc125ih5x0ggws"; + url = "https://beta.quicklisp.org/archive/cl-hamcrest/2025-06-22/cl-hamcrest-20250622-git.tgz"; + sha256 = "0d97v9rmf681vmxzdg8vrp4c9dphyrw89qwxpjwzncd34xrppjfn"; system = "hamcrest-tests"; asd = "hamcrest-tests"; } @@ -57880,12 +58667,12 @@ lib.makeScope pkgs.newScope (self: { harmony = ( build-asdf-system { pname = "harmony"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "harmony" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/harmony/2024-10-12/harmony-20241012-git.tgz"; - sha256 = "0bzqwcbnpb529bdp35c4s3p4p6rsrjnsvll2bkkrwpxlwzdd3fim"; + url = "https://beta.quicklisp.org/archive/harmony/2025-06-22/harmony-20250622-git.tgz"; + sha256 = "1dfwwp0850qh6a0pqnia99kapcpli38k5ywx9rq9c1jj5xb5byc1"; system = "harmony"; asd = "harmony"; } @@ -57896,8 +58683,10 @@ lib.makeScope pkgs.newScope (self: { (getAttr "bordeaux-threads" self) (getAttr "cl-mixed" self) (getAttr "cl-mixed-alsa" self) + (getAttr "cl-mixed-pipewire" self) (getAttr "cl-mixed-pulse" self) (getAttr "stealth-mixin" self) + (getAttr "text-draw" self) (getAttr "trivial-features" self) ]; meta = { @@ -57908,12 +58697,12 @@ lib.makeScope pkgs.newScope (self: { hash-set = ( build-asdf-system { pname = "hash-set"; - version = "20211230-git"; + version = "20250622-git"; asds = [ "hash-set" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hash-set/2021-12-30/hash-set-20211230-git.tgz"; - sha256 = "0a966y9yfarhmki4wwzg371ziaygnp13yc6r13w9zz327fkhz8na"; + url = "https://beta.quicklisp.org/archive/hash-set/2025-06-22/hash-set-20250622-git.tgz"; + sha256 = "0q7bg8ww60smsw3jk6d6js4j09ggm7pd31xc0jpp0cjldylam2pz"; system = "hash-set"; asd = "hash-set"; } @@ -57928,12 +58717,12 @@ lib.makeScope pkgs.newScope (self: { hash-set-tests = ( build-asdf-system { pname = "hash-set-tests"; - version = "20211230-git"; + version = "20250622-git"; asds = [ "hash-set-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hash-set/2021-12-30/hash-set-20211230-git.tgz"; - sha256 = "0a966y9yfarhmki4wwzg371ziaygnp13yc6r13w9zz327fkhz8na"; + url = "https://beta.quicklisp.org/archive/hash-set/2025-06-22/hash-set-20250622-git.tgz"; + sha256 = "0q7bg8ww60smsw3jk6d6js4j09ggm7pd31xc0jpp0cjldylam2pz"; system = "hash-set-tests"; asd = "hash-set-tests"; } @@ -57955,7 +58744,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hash-table-ext" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hash-table-ext/2021-10-20/hash-table-ext-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/hash-table-ext/2021-10-20/hash-table-ext-20211020-git.tgz"; sha256 = "00pafnjy5w9yhbzzdvgg4wwb8yicjjshgzxnn0by3d9qknxc7539"; system = "hash-table-ext"; asd = "hash-table-ext"; @@ -57978,7 +58767,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hash-table-ext.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hash-table-ext/2021-10-20/hash-table-ext-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/hash-table-ext/2021-10-20/hash-table-ext-20211020-git.tgz"; sha256 = "00pafnjy5w9yhbzzdvgg4wwb8yicjjshgzxnn0by3d9qknxc7539"; system = "hash-table-ext.test"; asd = "hash-table-ext.test"; @@ -57997,12 +58786,12 @@ lib.makeScope pkgs.newScope (self: { hashtrie = ( build-asdf-system { pname = "hashtrie"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "hashtrie" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hashtrie/2024-10-12/hashtrie-20241012-git.tgz"; - sha256 = "1qn7azbl2p3hjvrb87bb06d3njsi5ksmdcv4mk80iadq06w0rn0n"; + url = "https://beta.quicklisp.org/archive/hashtrie/2025-06-22/hashtrie-20250622-git.tgz"; + sha256 = "04k38sya7nypqmbwrzwv18wxsky8ycc1jlxv3vlhn52jngizxc1n"; system = "hashtrie"; asd = "hashtrie"; } @@ -58017,12 +58806,12 @@ lib.makeScope pkgs.newScope (self: { hashtrie-tests = ( build-asdf-system { pname = "hashtrie-tests"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "hashtrie-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hashtrie/2024-10-12/hashtrie-20241012-git.tgz"; - sha256 = "1qn7azbl2p3hjvrb87bb06d3njsi5ksmdcv4mk80iadq06w0rn0n"; + url = "https://beta.quicklisp.org/archive/hashtrie/2025-06-22/hashtrie-20250622-git.tgz"; + sha256 = "04k38sya7nypqmbwrzwv18wxsky8ycc1jlxv3vlhn52jngizxc1n"; system = "hashtrie-tests"; asd = "hashtrie-tests"; } @@ -58044,7 +58833,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hdf5-cffi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hdf5-cffi/2018-02-28/hdf5-cffi-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/hdf5-cffi/2018-02-28/hdf5-cffi-20180228-git.tgz"; sha256 = "0vda3075423xz83qky998lpac5b04dwfv7bwgh9jq8cs5v0zrxjf"; system = "hdf5-cffi"; asd = "hdf5-cffi"; @@ -58067,7 +58856,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hdf5-cffi.examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hdf5-cffi/2018-02-28/hdf5-cffi-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/hdf5-cffi/2018-02-28/hdf5-cffi-20180228-git.tgz"; sha256 = "0vda3075423xz83qky998lpac5b04dwfv7bwgh9jq8cs5v0zrxjf"; system = "hdf5-cffi.examples"; asd = "hdf5-cffi.examples"; @@ -58087,7 +58876,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hdf5-cffi.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hdf5-cffi/2018-02-28/hdf5-cffi-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/hdf5-cffi/2018-02-28/hdf5-cffi-20180228-git.tgz"; sha256 = "0vda3075423xz83qky998lpac5b04dwfv7bwgh9jq8cs5v0zrxjf"; system = "hdf5-cffi.test"; asd = "hdf5-cffi.test"; @@ -58113,7 +58902,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "heap" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/heap/2018-10-18/heap-20181018-git.tgz"; + url = "https://beta.quicklisp.org/archive/heap/2018-10-18/heap-20181018-git.tgz"; sha256 = "0jkgazjnjip7y41zd8rpy89ymh75yimk1q24qbddcisq5rzdl52k"; system = "heap"; asd = "heap"; @@ -58127,12 +58916,12 @@ lib.makeScope pkgs.newScope (self: { helambdap = ( build-asdf-system { pname = "helambdap"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "helambdap" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/helambdap/2024-10-12/helambdap-20241012-git.tgz"; - sha256 = "0z7hnphjxfr5z5h9gp5940pbbh163w3nnis2fan2wrrh0l88scn3"; + url = "https://beta.quicklisp.org/archive/helambdap/2025-06-22/helambdap-20250622-git.tgz"; + sha256 = "0kvrajgglwf3zsfw7kafdkjwqv9y9pblmygcv1a2zvrnrgxmak1g"; system = "helambdap"; asd = "helambdap"; } @@ -58152,12 +58941,12 @@ lib.makeScope pkgs.newScope (self: { hello-builder = ( build-asdf-system { pname = "hello-builder"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "hello-builder" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clog/2024-10-12/clog-20241012-git.tgz"; - sha256 = "0hqpj9ji7kfqgcxdfnc7x202qzmb7zdkmjwcyhdllqs6b0ssw5lx"; + url = "https://beta.quicklisp.org/archive/clog/2025-06-22/clog-20250622-git.tgz"; + sha256 = "1sf2xan0fh2qqr8xgmsbmq9qcj5nkzrp3nq7gd69ssbkz9ab6qpw"; system = "hello-builder"; asd = "hello-builder"; } @@ -58172,12 +58961,12 @@ lib.makeScope pkgs.newScope (self: { hello-clog = ( build-asdf-system { pname = "hello-clog"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "hello-clog" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clog/2024-10-12/clog-20241012-git.tgz"; - sha256 = "0hqpj9ji7kfqgcxdfnc7x202qzmb7zdkmjwcyhdllqs6b0ssw5lx"; + url = "https://beta.quicklisp.org/archive/clog/2025-06-22/clog-20250622-git.tgz"; + sha256 = "1sf2xan0fh2qqr8xgmsbmq9qcj5nkzrp3nq7gd69ssbkz9ab6qpw"; system = "hello-clog"; asd = "hello-clog"; } @@ -58196,7 +58985,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hemlock.base" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hemlock/2023-10-21/hemlock-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/hemlock/2023-10-21/hemlock-20231021-git.tgz"; sha256 = "0c1lmznz1md7r9jbyg2n22h1svw8pvqjxyp7mvxgvqp34mmbf5ad"; system = "hemlock.base"; asd = "hemlock.base"; @@ -58227,7 +59016,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hemlock.clx" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hemlock/2023-10-21/hemlock-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/hemlock/2023-10-21/hemlock-20231021-git.tgz"; sha256 = "0c1lmznz1md7r9jbyg2n22h1svw8pvqjxyp7mvxgvqp34mmbf5ad"; system = "hemlock.clx"; asd = "hemlock.clx"; @@ -58250,7 +59039,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hemlock.tty" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hemlock/2023-10-21/hemlock-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/hemlock/2023-10-21/hemlock-20231021-git.tgz"; sha256 = "0c1lmznz1md7r9jbyg2n22h1svw8pvqjxyp7mvxgvqp34mmbf5ad"; system = "hemlock.tty"; asd = "hemlock.tty"; @@ -58270,7 +59059,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hermetic" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hermetic/2019-10-07/hermetic-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/hermetic/2019-10-07/hermetic-20191007-git.tgz"; sha256 = "1sndxkkj45sqr13xw9kvnhj25an96q4la70ni3w468yrcbf782pi"; system = "hermetic"; asd = "hermetic"; @@ -58293,7 +59082,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "herodotus" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/herodotus/2022-03-31/herodotus-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/herodotus/2022-03-31/herodotus-20220331-git.tgz"; sha256 = "085r6b8fydac2a939r80vlavs1ij5ij5li5xnl5q8qvn9dl4rr5k"; system = "herodotus"; asd = "herodotus"; @@ -58317,7 +59106,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hh-aws" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hh-aws/2015-08-04/hh-aws-20150804-git.tgz"; + url = "https://beta.quicklisp.org/archive/hh-aws/2015-08-04/hh-aws-20150804-git.tgz"; sha256 = "02kfq7krn8788iphzcxnf0da88sy30gxpj1acgy9fl2n8qc03qdp"; system = "hh-aws"; asd = "hh-aws"; @@ -58343,7 +59132,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hh-aws-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hh-aws/2015-08-04/hh-aws-20150804-git.tgz"; + url = "https://beta.quicklisp.org/archive/hh-aws/2015-08-04/hh-aws-20150804-git.tgz"; sha256 = "02kfq7krn8788iphzcxnf0da88sy30gxpj1acgy9fl2n8qc03qdp"; system = "hh-aws-tests"; asd = "hh-aws"; @@ -58367,7 +59156,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hh-redblack" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hh-redblack/2015-10-31/hh-redblack-20151031-git.tgz"; + url = "https://beta.quicklisp.org/archive/hh-redblack/2015-10-31/hh-redblack-20151031-git.tgz"; sha256 = "1klr78m4g60c82dnxksb7710jjj35rnfl4gl3dx3nrx0nb04bam6"; system = "hh-redblack"; asd = "hh-redblack"; @@ -58387,7 +59176,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hh-redblack-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hh-redblack/2015-10-31/hh-redblack-20151031-git.tgz"; + url = "https://beta.quicklisp.org/archive/hh-redblack/2015-10-31/hh-redblack-20151031-git.tgz"; sha256 = "1klr78m4g60c82dnxksb7710jjj35rnfl4gl3dx3nrx0nb04bam6"; system = "hh-redblack-tests"; asd = "hh-redblack"; @@ -58410,7 +59199,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hh-web" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hh-web/2014-11-06/hh-web-20141106-git.tgz"; + url = "https://beta.quicklisp.org/archive/hh-web/2014-11-06/hh-web-20141106-git.tgz"; sha256 = "1i3jyifayczm9b7rvw3fafiisxvjq87xd9z0hdf957qc2albsq87"; system = "hh-web"; asd = "hh-web"; @@ -58444,7 +59233,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hiccl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hiccl/2024-10-12/hiccl-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/hiccl/2024-10-12/hiccl-20241012-git.tgz"; sha256 = "0d92q8kb8xn6c9gsm822339f9qmpf9lpzy6s6abvxbhhyfk136yp"; system = "hiccl"; asd = "hiccl"; @@ -58468,7 +59257,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hiccl-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hiccl/2024-10-12/hiccl-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/hiccl/2024-10-12/hiccl-20241012-git.tgz"; sha256 = "0d92q8kb8xn6c9gsm822339f9qmpf9lpzy6s6abvxbhhyfk136yp"; system = "hiccl-test"; asd = "hiccl-test"; @@ -58494,7 +59283,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hl7-client" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hl7-client/2015-04-07/hl7-client-20150407-git.tgz"; + url = "https://beta.quicklisp.org/archive/hl7-client/2015-04-07/hl7-client-20150407-git.tgz"; sha256 = "0hq5ip6f1hbdiydml5f1z7qsjaq1v3a3g4y5a87jaif027pwhd89"; system = "hl7-client"; asd = "hl7-client"; @@ -58514,7 +59303,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hl7-parser" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hl7-parser/2016-05-31/hl7-parser-20160531-git.tgz"; + url = "https://beta.quicklisp.org/archive/hl7-parser/2016-05-31/hl7-parser-20160531-git.tgz"; sha256 = "1lcyvk3vap73d23s6pk8p1ficqhl2gs84nan6d0yy0hx8c4gip0x"; system = "hl7-parser"; asd = "hl7-parser"; @@ -58534,7 +59323,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hompack" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; system = "hompack"; asd = "hompack"; @@ -58557,7 +59346,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "horner" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/horner/2019-11-30/horner-20191130-git.tgz"; + url = "https://beta.quicklisp.org/archive/horner/2019-11-30/horner-20191130-git.tgz"; sha256 = "05afvf7sxn1db7xxw7qmys1dwbgsx53iw4w556r277da6bpyacr9"; system = "horner"; asd = "horner"; @@ -58581,7 +59370,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "horse-html" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/horse-html/2019-10-07/horse-html-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/horse-html/2019-10-07/horse-html-20191007-git.tgz"; sha256 = "0g6cs38123ajf1hvv056df9d8gy5ajarg0f5gywzhmmf0rhr9br5"; system = "horse-html"; asd = "horse-html"; @@ -58601,7 +59390,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "house" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/house/2021-01-24/house-20210124-git.tgz"; + url = "https://beta.quicklisp.org/archive/house/2021-01-24/house-20210124-git.tgz"; sha256 = "1x3dprg5j5rhbf8r1nr6py6g8wgfb9zysbqbjdcyh91szg7w80mb"; system = "house"; asd = "house"; @@ -58633,12 +59422,12 @@ lib.makeScope pkgs.newScope (self: { hsx = ( build-asdf-system { pname = "hsx"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "hsx" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hsx/2024-10-12/hsx-20241012-git.tgz"; - sha256 = "0aldv9cjzl9n4p1arlmvbjdy3zwhxcmx1ajp5lwdz5vq4mivw3zy"; + url = "https://beta.quicklisp.org/archive/hsx/2025-06-22/hsx-20250622-git.tgz"; + sha256 = "16sb2vc0z51riaa4hm5537ns17jfbw45adj0ykifklkc36zahil2"; system = "hsx"; asd = "hsx"; } @@ -58656,12 +59445,12 @@ lib.makeScope pkgs.newScope (self: { hsx-test = ( build-asdf-system { pname = "hsx-test"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "hsx-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hsx/2024-10-12/hsx-20241012-git.tgz"; - sha256 = "0aldv9cjzl9n4p1arlmvbjdy3zwhxcmx1ajp5lwdz5vq4mivw3zy"; + url = "https://beta.quicklisp.org/archive/hsx/2025-06-22/hsx-20250622-git.tgz"; + sha256 = "16sb2vc0z51riaa4hm5537ns17jfbw45adj0ykifklkc36zahil2"; system = "hsx-test"; asd = "hsx-test"; } @@ -58684,7 +59473,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ht-simple-ajax" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ht-simple-ajax/2013-04-21/ht-simple-ajax-20130421-git.tgz"; + url = "https://beta.quicklisp.org/archive/ht-simple-ajax/2013-04-21/ht-simple-ajax-20130421-git.tgz"; sha256 = "1l87c0arjzyrp3g6ay189fjkqmy81b7i35rfrcs9b269n7d4iis4"; system = "ht-simple-ajax"; asd = "ht-simple-ajax"; @@ -58704,7 +59493,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "html-encode" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/html-encode/2010-10-06/html-encode-1.2.tgz"; + url = "https://beta.quicklisp.org/archive/html-encode/2010-10-06/html-encode-1.2.tgz"; sha256 = "1ydgb5xnbj1qbvzn7x32dm38gpqg5h0pjxc31f8df3j8sar843db"; system = "html-encode"; asd = "html-encode"; @@ -58722,7 +59511,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "html-entities" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/html-entities/2017-10-19/html-entities-20171019-git.tgz"; + url = "https://beta.quicklisp.org/archive/html-entities/2017-10-19/html-entities-20171019-git.tgz"; sha256 = "1b2yl6lf6vis17y4n5s505p7ica96bdafcl6vydy1hg50fy33nfr"; system = "html-entities"; asd = "html-entities"; @@ -58742,7 +59531,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "html-entities-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/html-entities/2017-10-19/html-entities-20171019-git.tgz"; + url = "https://beta.quicklisp.org/archive/html-entities/2017-10-19/html-entities-20171019-git.tgz"; sha256 = "1b2yl6lf6vis17y4n5s505p7ica96bdafcl6vydy1hg50fy33nfr"; system = "html-entities-tests"; asd = "html-entities"; @@ -58765,7 +59554,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "html-match" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bknr-web/2014-07-13/bknr-web-20140713-git.tgz"; + url = "https://beta.quicklisp.org/archive/bknr-web/2014-07-13/bknr-web-20140713-git.tgz"; sha256 = "1m73z0hv7qsc9yddrg8zs7n3zmn9h64v4d62239wrvfnmzqk75x2"; system = "html-match"; asd = "html-match"; @@ -58788,7 +59577,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "html-match.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bknr-web/2014-07-13/bknr-web-20140713-git.tgz"; + url = "https://beta.quicklisp.org/archive/bknr-web/2014-07-13/bknr-web-20140713-git.tgz"; sha256 = "1m73z0hv7qsc9yddrg8zs7n3zmn9h64v4d62239wrvfnmzqk75x2"; system = "html-match.test"; asd = "html-match"; @@ -58811,7 +59600,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "html-template" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/html-template/2017-12-27/html-template-20171227-git.tgz"; + url = "https://beta.quicklisp.org/archive/html-template/2017-12-27/html-template-20171227-git.tgz"; sha256 = "0g700zlyjjba17nbmw1adspw7r9s0321xhayfiqh0drg20zixaf7"; system = "html-template"; asd = "html-template"; @@ -58831,7 +59620,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "htmlgen" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/portableaserve/2019-08-13/portableaserve-20190813-git.tgz"; + url = "https://beta.quicklisp.org/archive/portableaserve/2019-08-13/portableaserve-20190813-git.tgz"; sha256 = "0ak6mqp84sjr0a7h5svr16vra4bf4fcx6wpir0n88dc1vjwy5xqa"; system = "htmlgen"; asd = "htmlgen"; @@ -58847,12 +59636,12 @@ lib.makeScope pkgs.newScope (self: { http-body = ( build-asdf-system { pname = "http-body"; - version = "20190813-git"; + version = "20250622-git"; asds = [ "http-body" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/http-body/2019-08-13/http-body-20190813-git.tgz"; - sha256 = "0kcg43l5674drzid9cj938q0ki5z25glx296rl239dm7yfmxlzz2"; + url = "https://beta.quicklisp.org/archive/http-body/2025-06-22/http-body-20250622-git.tgz"; + sha256 = "0p54ai77igyhppi4r74izdykbnip67570fbvxkg90nvxvas3ybz4"; system = "http-body"; asd = "http-body"; } @@ -58864,9 +59653,9 @@ lib.makeScope pkgs.newScope (self: { (getAttr "cl-utilities" self) (getAttr "fast-http" self) (getAttr "flexi-streams" self) - (getAttr "jonathan" self) (getAttr "quri" self) (getAttr "trivial-gray-streams" self) + (getAttr "yason" self) ]; meta = { }; } @@ -58874,12 +59663,12 @@ lib.makeScope pkgs.newScope (self: { http-body-test = ( build-asdf-system { pname = "http-body-test"; - version = "20190813-git"; + version = "20250622-git"; asds = [ "http-body-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/http-body/2019-08-13/http-body-20190813-git.tgz"; - sha256 = "0kcg43l5674drzid9cj938q0ki5z25glx296rl239dm7yfmxlzz2"; + url = "https://beta.quicklisp.org/archive/http-body/2025-06-22/http-body-20250622-git.tgz"; + sha256 = "0p54ai77igyhppi4r74izdykbnip67570fbvxkg90nvxvas3ybz4"; system = "http-body-test"; asd = "http-body-test"; } @@ -58906,7 +59695,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "http-get-cache" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/http-get-cache/2018-02-28/http-get-cache-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/http-get-cache/2018-02-28/http-get-cache-20180228-git.tgz"; sha256 = "03bw4zf4hlxyrqm5mq53z0qksb9jbrcc5nv90y7qry83kxic2cgv"; system = "http-get-cache"; asd = "http-get-cache"; @@ -58926,7 +59715,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "http-parse" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/http-parse/2015-06-08/http-parse-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/http-parse/2015-06-08/http-parse-20150608-git.tgz"; sha256 = "1plycsx2kch2l143s56hvi5dqx51n5bvp7vazmphqj5skmnw4576"; system = "http-parse"; asd = "http-parse"; @@ -58949,7 +59738,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "http-parse-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/http-parse/2015-06-08/http-parse-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/http-parse/2015-06-08/http-parse-20150608-git.tgz"; sha256 = "1plycsx2kch2l143s56hvi5dqx51n5bvp7vazmphqj5skmnw4576"; system = "http-parse-test"; asd = "http-parse-test"; @@ -58969,12 +59758,12 @@ lib.makeScope pkgs.newScope (self: { http2 = ( build-asdf-system { pname = "http2"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "http2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/http2/2024-10-12/http2-20241012-git.tgz"; - sha256 = "1zb21np8rksz7b0vkfr3hg8y1a4m20vgkks3v39cc1yclnrfavii"; + url = "https://beta.quicklisp.org/archive/http2/2025-06-22/http2-20250622-git.tgz"; + sha256 = "0ypjgdic1a19gr0v77dh1gd8a51h2jf8gx8zm7f0rs42m09bbb7n"; system = "http2"; asd = "http2"; } @@ -58983,9 +59772,17 @@ lib.makeScope pkgs.newScope (self: { lispLibs = [ (getAttr "alexandria" self) (getAttr "anaphora" self) + (getAttr "bordeaux-threads" self) + (getAttr "cffi" self) + (getAttr "cffi-grovel" self) + (getAttr "chipz" self) + (getAttr "cl_plus_ssl" self) (getAttr "flexi-streams" self) (getAttr "gzip-stream" self) + (getAttr "mgl-pax" self) + (getAttr "puri" self) (getAttr "trivial-gray-streams" self) + (getAttr "trivial-utf-8" self) ]; meta = { hydraPlatforms = [ ]; @@ -58999,7 +59796,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.asdf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.asdf/2021-12-30/hu.dwim.asdf-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.asdf/2021-12-30/hu.dwim.asdf-stable-git.tgz"; sha256 = "0zfwdsvcywvwzkn0a80ghi5kn1hs4iwinvi17ld58gyskf15frx9"; system = "hu.dwim.asdf"; asd = "hu.dwim.asdf"; @@ -59017,7 +59814,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.asdf.documentation" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.asdf/2021-12-30/hu.dwim.asdf-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.asdf/2021-12-30/hu.dwim.asdf-stable-git.tgz"; sha256 = "0zfwdsvcywvwzkn0a80ghi5kn1hs4iwinvi17ld58gyskf15frx9"; system = "hu.dwim.asdf.documentation"; asd = "hu.dwim.asdf.documentation"; @@ -59040,7 +59837,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.bluez" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.bluez/2021-02-28/hu.dwim.bluez-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.bluez/2025-06-22/hu.dwim.bluez-stable-git.tgz"; sha256 = "0gjh3bgmdz4aabdavbd5m27r273hna47vs388r4m7l2xnd3b3j55"; system = "hu.dwim.bluez"; asd = "hu.dwim.bluez"; @@ -59052,6 +59849,7 @@ lib.makeScope pkgs.newScope (self: { (getAttr "cffi" self) (getAttr "cffi-libffi" self) (getAttr "hu_dot_dwim_dot_asdf" self) + (getAttr "trivial-features" self) ]; meta = { hydraPlatforms = [ ]; @@ -59065,7 +59863,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.common" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.common/2015-07-09/hu.dwim.common-20150709-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.common/2015-07-09/hu.dwim.common-20150709-darcs.tgz"; sha256 = "0mkhq6bqysdy09gswgxm1s50xrq7gimdyqiq84xk8vpyp2hv6hqq"; system = "hu.dwim.common"; asd = "hu.dwim.common"; @@ -59091,7 +59889,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.common-lisp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.common-lisp/2021-02-28/hu.dwim.common-lisp-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.common-lisp/2021-02-28/hu.dwim.common-lisp-stable-git.tgz"; sha256 = "06zkdw3scnaw0d4nmsgkv7pi7sw00dikdgfgsqmbqfbz2yrsdabk"; system = "hu.dwim.common-lisp"; asd = "hu.dwim.common-lisp"; @@ -59109,7 +59907,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.common-lisp.documentation" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.common-lisp/2021-02-28/hu.dwim.common-lisp-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.common-lisp/2021-02-28/hu.dwim.common-lisp-stable-git.tgz"; sha256 = "06zkdw3scnaw0d4nmsgkv7pi7sw00dikdgfgsqmbqfbz2yrsdabk"; system = "hu.dwim.common-lisp.documentation"; asd = "hu.dwim.common-lisp.documentation"; @@ -59133,7 +59931,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.common.documentation" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.common/2015-07-09/hu.dwim.common-20150709-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.common/2015-07-09/hu.dwim.common-20150709-darcs.tgz"; sha256 = "0mkhq6bqysdy09gswgxm1s50xrq7gimdyqiq84xk8vpyp2hv6hqq"; system = "hu.dwim.common.documentation"; asd = "hu.dwim.common.documentation"; @@ -59157,7 +59955,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.computed-class" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.computed-class/2020-04-27/hu.dwim.computed-class-20200427-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.computed-class/2020-04-27/hu.dwim.computed-class-20200427-darcs.tgz"; sha256 = "1frr37g79x08pm7vkpyhnmzbbcgzxvz3vldm8skknpi790vxbpr1"; system = "hu.dwim.computed-class"; asd = "hu.dwim.computed-class"; @@ -59183,7 +59981,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.computed-class+hu.dwim.logger" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.computed-class/2020-04-27/hu.dwim.computed-class-20200427-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.computed-class/2020-04-27/hu.dwim.computed-class-20200427-darcs.tgz"; sha256 = "1frr37g79x08pm7vkpyhnmzbbcgzxvz3vldm8skknpi790vxbpr1"; system = "hu.dwim.computed-class+hu.dwim.logger"; asd = "hu.dwim.computed-class+hu.dwim.logger"; @@ -59207,7 +60005,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.computed-class+swank" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.computed-class/2020-04-27/hu.dwim.computed-class-20200427-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.computed-class/2020-04-27/hu.dwim.computed-class-20200427-darcs.tgz"; sha256 = "1frr37g79x08pm7vkpyhnmzbbcgzxvz3vldm8skknpi790vxbpr1"; system = "hu.dwim.computed-class+swank"; asd = "hu.dwim.computed-class+swank"; @@ -59231,7 +60029,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.computed-class.documentation" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.computed-class/2020-04-27/hu.dwim.computed-class-20200427-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.computed-class/2020-04-27/hu.dwim.computed-class-20200427-darcs.tgz"; sha256 = "1frr37g79x08pm7vkpyhnmzbbcgzxvz3vldm8skknpi790vxbpr1"; system = "hu.dwim.computed-class.documentation"; asd = "hu.dwim.computed-class.documentation"; @@ -59255,7 +60053,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.computed-class.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.computed-class/2020-04-27/hu.dwim.computed-class-20200427-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.computed-class/2020-04-27/hu.dwim.computed-class-20200427-darcs.tgz"; sha256 = "1frr37g79x08pm7vkpyhnmzbbcgzxvz3vldm8skknpi790vxbpr1"; system = "hu.dwim.computed-class.test"; asd = "hu.dwim.computed-class.test"; @@ -59279,7 +60077,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.debug" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.debug/2019-01-07/hu.dwim.debug-20190107-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.debug/2019-01-07/hu.dwim.debug-20190107-darcs.tgz"; sha256 = "0ad606bmrif82fyikb2hgwzh3y6nlrlsprb5yi86qwa2a2fvak4b"; system = "hu.dwim.debug"; asd = "hu.dwim.debug"; @@ -59307,7 +60105,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.debug.documentation" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.debug/2019-01-07/hu.dwim.debug-20190107-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.debug/2019-01-07/hu.dwim.debug-20190107-darcs.tgz"; sha256 = "0ad606bmrif82fyikb2hgwzh3y6nlrlsprb5yi86qwa2a2fvak4b"; system = "hu.dwim.debug.documentation"; asd = "hu.dwim.debug.documentation"; @@ -59331,7 +60129,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.debug.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.debug/2019-01-07/hu.dwim.debug-20190107-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.debug/2019-01-07/hu.dwim.debug-20190107-darcs.tgz"; sha256 = "0ad606bmrif82fyikb2hgwzh3y6nlrlsprb5yi86qwa2a2fvak4b"; system = "hu.dwim.debug.test"; asd = "hu.dwim.debug.test"; @@ -59355,7 +60153,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.def" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.def/2021-12-30/hu.dwim.def-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.def/2021-12-30/hu.dwim.def-stable-git.tgz"; sha256 = "1scjj9g2bn58l8i1g1brdqzrajy4bb63dqkwlcydcvk36iskpyab"; system = "hu.dwim.def"; asd = "hu.dwim.def"; @@ -59379,7 +60177,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.def+cl-l10n" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.def/2021-12-30/hu.dwim.def-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.def/2021-12-30/hu.dwim.def-stable-git.tgz"; sha256 = "1scjj9g2bn58l8i1g1brdqzrajy4bb63dqkwlcydcvk36iskpyab"; system = "hu.dwim.def+cl-l10n"; asd = "hu.dwim.def+cl-l10n"; @@ -59403,7 +60201,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.def+contextl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.def/2021-12-30/hu.dwim.def-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.def/2021-12-30/hu.dwim.def-stable-git.tgz"; sha256 = "1scjj9g2bn58l8i1g1brdqzrajy4bb63dqkwlcydcvk36iskpyab"; system = "hu.dwim.def+contextl"; asd = "hu.dwim.def+contextl"; @@ -59427,7 +60225,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.def+hu.dwim.common" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.def/2021-12-30/hu.dwim.def-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.def/2021-12-30/hu.dwim.def-stable-git.tgz"; sha256 = "1scjj9g2bn58l8i1g1brdqzrajy4bb63dqkwlcydcvk36iskpyab"; system = "hu.dwim.def+hu.dwim.common"; asd = "hu.dwim.def+hu.dwim.common"; @@ -59451,7 +60249,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.def+hu.dwim.delico" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.def/2021-12-30/hu.dwim.def-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.def/2021-12-30/hu.dwim.def-stable-git.tgz"; sha256 = "1scjj9g2bn58l8i1g1brdqzrajy4bb63dqkwlcydcvk36iskpyab"; system = "hu.dwim.def+hu.dwim.delico"; asd = "hu.dwim.def+hu.dwim.delico"; @@ -59475,7 +60273,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.def+swank" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.def/2021-12-30/hu.dwim.def-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.def/2021-12-30/hu.dwim.def-stable-git.tgz"; sha256 = "1scjj9g2bn58l8i1g1brdqzrajy4bb63dqkwlcydcvk36iskpyab"; system = "hu.dwim.def+swank"; asd = "hu.dwim.def+swank"; @@ -59497,7 +60295,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.defclass-star" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2021-12-30/hu.dwim.defclass-star-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.defclass-star/2021-12-30/hu.dwim.defclass-star-stable-git.tgz"; sha256 = "1lbmsn9s7v88w934r8rp4d59vsj1jg8p2cz9g5kl1n9vff5sxxw2"; system = "hu.dwim.defclass-star"; asd = "hu.dwim.defclass-star"; @@ -59515,7 +60313,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.defclass-star+contextl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2021-12-30/hu.dwim.defclass-star-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.defclass-star/2021-12-30/hu.dwim.defclass-star-stable-git.tgz"; sha256 = "1lbmsn9s7v88w934r8rp4d59vsj1jg8p2cz9g5kl1n9vff5sxxw2"; system = "hu.dwim.defclass-star+contextl"; asd = "hu.dwim.defclass-star+contextl"; @@ -59539,7 +60337,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.defclass-star+hu.dwim.def" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2021-12-30/hu.dwim.defclass-star-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.defclass-star/2021-12-30/hu.dwim.defclass-star-stable-git.tgz"; sha256 = "1lbmsn9s7v88w934r8rp4d59vsj1jg8p2cz9g5kl1n9vff5sxxw2"; system = "hu.dwim.defclass-star+hu.dwim.def"; asd = "hu.dwim.defclass-star+hu.dwim.def"; @@ -59563,7 +60361,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.defclass-star+hu.dwim.def+contextl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2021-12-30/hu.dwim.defclass-star-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.defclass-star/2021-12-30/hu.dwim.defclass-star-stable-git.tgz"; sha256 = "1lbmsn9s7v88w934r8rp4d59vsj1jg8p2cz9g5kl1n9vff5sxxw2"; system = "hu.dwim.defclass-star+hu.dwim.def+contextl"; asd = "hu.dwim.defclass-star+hu.dwim.def+contextl"; @@ -59587,7 +60385,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.defclass-star+swank" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2021-12-30/hu.dwim.defclass-star-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.defclass-star/2021-12-30/hu.dwim.defclass-star-stable-git.tgz"; sha256 = "1lbmsn9s7v88w934r8rp4d59vsj1jg8p2cz9g5kl1n9vff5sxxw2"; system = "hu.dwim.defclass-star+swank"; asd = "hu.dwim.defclass-star+swank"; @@ -59611,7 +60409,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.delico" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.delico/2020-09-25/hu.dwim.delico-20200925-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.delico/2020-09-25/hu.dwim.delico-20200925-darcs.tgz"; sha256 = "12n5cddg7vd3y4dqjcf4wayxwj905ja8jh90ixvrhgnvs559lbnl"; system = "hu.dwim.delico"; asd = "hu.dwim.delico"; @@ -59636,7 +60434,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.graphviz" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.graphviz/2021-12-30/hu.dwim.graphviz-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.graphviz/2021-12-30/hu.dwim.graphviz-stable-git.tgz"; sha256 = "0cz5g7d6817ajypp876k9m65sxxlf42x4bg04ya73aqci5s1vjwy"; system = "hu.dwim.graphviz"; asd = "hu.dwim.graphviz"; @@ -59660,7 +60458,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.graphviz.documentation" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.graphviz/2021-12-30/hu.dwim.graphviz-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.graphviz/2021-12-30/hu.dwim.graphviz-stable-git.tgz"; sha256 = "0cz5g7d6817ajypp876k9m65sxxlf42x4bg04ya73aqci5s1vjwy"; system = "hu.dwim.graphviz.documentation"; asd = "hu.dwim.graphviz.documentation"; @@ -59684,7 +60482,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.graphviz.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.graphviz/2021-12-30/hu.dwim.graphviz-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.graphviz/2021-12-30/hu.dwim.graphviz-stable-git.tgz"; sha256 = "0cz5g7d6817ajypp876k9m65sxxlf42x4bg04ya73aqci5s1vjwy"; system = "hu.dwim.graphviz.test"; asd = "hu.dwim.graphviz.test"; @@ -59709,7 +60507,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.logger" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.logger/2021-12-30/hu.dwim.logger-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.logger/2021-12-30/hu.dwim.logger-stable-git.tgz"; sha256 = "17b7m86pggg85lczww7nvswz0nj9qg1fxwv1l9wn31jfcf061h74"; system = "hu.dwim.logger"; asd = "hu.dwim.logger"; @@ -59738,7 +60536,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.logger+iolib" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.logger/2021-12-30/hu.dwim.logger-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.logger/2021-12-30/hu.dwim.logger-stable-git.tgz"; sha256 = "17b7m86pggg85lczww7nvswz0nj9qg1fxwv1l9wn31jfcf061h74"; system = "hu.dwim.logger+iolib"; asd = "hu.dwim.logger+iolib"; @@ -59762,7 +60560,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.logger+swank" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.logger/2021-12-30/hu.dwim.logger-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.logger/2021-12-30/hu.dwim.logger-stable-git.tgz"; sha256 = "17b7m86pggg85lczww7nvswz0nj9qg1fxwv1l9wn31jfcf061h74"; system = "hu.dwim.logger+swank"; asd = "hu.dwim.logger+swank"; @@ -59786,7 +60584,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.logger.documentation" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.logger/2021-12-30/hu.dwim.logger-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.logger/2021-12-30/hu.dwim.logger-stable-git.tgz"; sha256 = "17b7m86pggg85lczww7nvswz0nj9qg1fxwv1l9wn31jfcf061h74"; system = "hu.dwim.logger.documentation"; asd = "hu.dwim.logger.documentation"; @@ -59810,7 +60608,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.logger.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.logger/2021-12-30/hu.dwim.logger-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.logger/2021-12-30/hu.dwim.logger-stable-git.tgz"; sha256 = "17b7m86pggg85lczww7nvswz0nj9qg1fxwv1l9wn31jfcf061h74"; system = "hu.dwim.logger.test"; asd = "hu.dwim.logger.test"; @@ -59834,7 +60632,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.partial-eval" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.partial-eval/2024-10-12/hu.dwim.partial-eval-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.partial-eval/2024-10-12/hu.dwim.partial-eval-stable-git.tgz"; sha256 = "1zsh1rk9rcxkrqavhx2slpczii23y51fn66n68vsw5d97g9k6gzz"; system = "hu.dwim.partial-eval"; asd = "hu.dwim.partial-eval"; @@ -59864,7 +60662,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.perec" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; system = "hu.dwim.perec"; asd = "hu.dwim.perec"; @@ -59906,7 +60704,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.perec+hu.dwim.quasi-quote.xml" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; system = "hu.dwim.perec+hu.dwim.quasi-quote.xml"; asd = "hu.dwim.perec+hu.dwim.quasi-quote.xml"; @@ -59930,7 +60728,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.perec+iolib" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; system = "hu.dwim.perec+iolib"; asd = "hu.dwim.perec+iolib"; @@ -59954,7 +60752,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.perec+swank" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; system = "hu.dwim.perec+swank"; asd = "hu.dwim.perec+swank"; @@ -59978,7 +60776,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.perec.all" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; system = "hu.dwim.perec.all"; asd = "hu.dwim.perec.all"; @@ -60003,7 +60801,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.perec.all.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; system = "hu.dwim.perec.all.test"; asd = "hu.dwim.perec.all.test"; @@ -60028,7 +60826,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.perec.documentation" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; system = "hu.dwim.perec.documentation"; asd = "hu.dwim.perec.documentation"; @@ -60052,7 +60850,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.perec.oracle" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; system = "hu.dwim.perec.oracle"; asd = "hu.dwim.perec.oracle"; @@ -60076,7 +60874,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.perec.oracle.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; system = "hu.dwim.perec.oracle.test"; asd = "hu.dwim.perec.oracle.test"; @@ -60100,7 +60898,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.perec.postgresql" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; system = "hu.dwim.perec.postgresql"; asd = "hu.dwim.perec.postgresql"; @@ -60124,7 +60922,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.perec.postgresql.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; system = "hu.dwim.perec.postgresql.test"; asd = "hu.dwim.perec.postgresql.test"; @@ -60148,7 +60946,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.perec.sqlite" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; system = "hu.dwim.perec.sqlite"; asd = "hu.dwim.perec.sqlite"; @@ -60172,7 +60970,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.perec.sqlite.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; system = "hu.dwim.perec.sqlite.test"; asd = "hu.dwim.perec.sqlite.test"; @@ -60196,7 +60994,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.perec.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; system = "hu.dwim.perec.test"; asd = "hu.dwim.perec.test"; @@ -60222,7 +61020,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.presentation" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.presentation/2021-12-30/hu.dwim.presentation-20211230-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.presentation/2021-12-30/hu.dwim.presentation-20211230-darcs.tgz"; sha256 = "06y08z2pa3ra8hwn46n4kygf6vhq68nh73x4gzh4skx379hb4fgp"; system = "hu.dwim.presentation"; asd = "hu.dwim.presentation"; @@ -60253,7 +61051,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.presentation+cl-graph+cl-typesetting" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.presentation/2021-12-30/hu.dwim.presentation-20211230-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.presentation/2021-12-30/hu.dwim.presentation-20211230-darcs.tgz"; sha256 = "06y08z2pa3ra8hwn46n4kygf6vhq68nh73x4gzh4skx379hb4fgp"; system = "hu.dwim.presentation+cl-graph+cl-typesetting"; asd = "hu.dwim.presentation+cl-graph+cl-typesetting"; @@ -60277,7 +61075,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.presentation+cl-typesetting" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.presentation/2021-12-30/hu.dwim.presentation-20211230-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.presentation/2021-12-30/hu.dwim.presentation-20211230-darcs.tgz"; sha256 = "06y08z2pa3ra8hwn46n4kygf6vhq68nh73x4gzh4skx379hb4fgp"; system = "hu.dwim.presentation+cl-typesetting"; asd = "hu.dwim.presentation+cl-typesetting"; @@ -60301,7 +61099,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.presentation+hu.dwim.stefil" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.presentation/2021-12-30/hu.dwim.presentation-20211230-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.presentation/2021-12-30/hu.dwim.presentation-20211230-darcs.tgz"; sha256 = "06y08z2pa3ra8hwn46n4kygf6vhq68nh73x4gzh4skx379hb4fgp"; system = "hu.dwim.presentation+hu.dwim.stefil"; asd = "hu.dwim.presentation+hu.dwim.stefil"; @@ -60325,7 +61123,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.presentation+hu.dwim.web-server" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.presentation/2021-12-30/hu.dwim.presentation-20211230-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.presentation/2021-12-30/hu.dwim.presentation-20211230-darcs.tgz"; sha256 = "06y08z2pa3ra8hwn46n4kygf6vhq68nh73x4gzh4skx379hb4fgp"; system = "hu.dwim.presentation+hu.dwim.web-server"; asd = "hu.dwim.presentation+hu.dwim.web-server"; @@ -60349,7 +61147,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.quasi-quote" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz"; sha256 = "1bawkv7ppn6yay1dd6vvmf9bz2400jvks1w8bqmslv8facfhbprm"; system = "hu.dwim.quasi-quote"; asd = "hu.dwim.quasi-quote"; @@ -60379,7 +61177,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.quasi-quote.css" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz"; sha256 = "1bawkv7ppn6yay1dd6vvmf9bz2400jvks1w8bqmslv8facfhbprm"; system = "hu.dwim.quasi-quote.css"; asd = "hu.dwim.quasi-quote.css"; @@ -60402,7 +61200,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.quasi-quote.js" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz"; sha256 = "1bawkv7ppn6yay1dd6vvmf9bz2400jvks1w8bqmslv8facfhbprm"; system = "hu.dwim.quasi-quote.js"; asd = "hu.dwim.quasi-quote.js"; @@ -60428,7 +61226,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.quasi-quote.pdf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz"; sha256 = "1bawkv7ppn6yay1dd6vvmf9bz2400jvks1w8bqmslv8facfhbprm"; system = "hu.dwim.quasi-quote.pdf"; asd = "hu.dwim.quasi-quote.pdf"; @@ -60452,7 +61250,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.quasi-quote.xml" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz"; sha256 = "1bawkv7ppn6yay1dd6vvmf9bz2400jvks1w8bqmslv8facfhbprm"; system = "hu.dwim.quasi-quote.xml"; asd = "hu.dwim.quasi-quote.xml"; @@ -60475,7 +61273,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.quasi-quote.xml+cxml" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz"; sha256 = "1bawkv7ppn6yay1dd6vvmf9bz2400jvks1w8bqmslv8facfhbprm"; system = "hu.dwim.quasi-quote.xml+cxml"; asd = "hu.dwim.quasi-quote.xml+cxml"; @@ -60499,7 +61297,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.quasi-quote.xml+hu.dwim.quasi-quote.js" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz"; sha256 = "1bawkv7ppn6yay1dd6vvmf9bz2400jvks1w8bqmslv8facfhbprm"; system = "hu.dwim.quasi-quote.xml+hu.dwim.quasi-quote.js"; asd = "hu.dwim.quasi-quote.xml+hu.dwim.quasi-quote.js"; @@ -60523,7 +61321,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.rdbms" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz"; sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av"; system = "hu.dwim.rdbms"; asd = "hu.dwim.rdbms"; @@ -60553,7 +61351,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.rdbms.all" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz"; sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av"; system = "hu.dwim.rdbms.all"; asd = "hu.dwim.rdbms.all"; @@ -60578,7 +61376,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.rdbms.all.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz"; sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av"; system = "hu.dwim.rdbms.all.test"; asd = "hu.dwim.rdbms.all.test"; @@ -60603,7 +61401,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.rdbms.documentation" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz"; sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av"; system = "hu.dwim.rdbms.documentation"; asd = "hu.dwim.rdbms.documentation"; @@ -60627,7 +61425,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.rdbms.oracle" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz"; sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av"; system = "hu.dwim.rdbms.oracle"; asd = "hu.dwim.rdbms.oracle"; @@ -60651,7 +61449,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.rdbms.oracle.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz"; sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av"; system = "hu.dwim.rdbms.oracle.test"; asd = "hu.dwim.rdbms.oracle.test"; @@ -60675,7 +61473,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.rdbms.postgresql" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz"; sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av"; system = "hu.dwim.rdbms.postgresql"; asd = "hu.dwim.rdbms.postgresql"; @@ -60699,7 +61497,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.rdbms.postgresql.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz"; sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av"; system = "hu.dwim.rdbms.postgresql.test"; asd = "hu.dwim.rdbms.postgresql.test"; @@ -60723,7 +61521,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.rdbms.sqlite" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz"; sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av"; system = "hu.dwim.rdbms.sqlite"; asd = "hu.dwim.rdbms.sqlite"; @@ -60747,7 +61545,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.rdbms.sqlite.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz"; sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av"; system = "hu.dwim.rdbms.sqlite.test"; asd = "hu.dwim.rdbms.sqlite.test"; @@ -60771,7 +61569,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.rdbms.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz"; sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av"; system = "hu.dwim.rdbms.test"; asd = "hu.dwim.rdbms.test"; @@ -60795,8 +61593,8 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.reiterate" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.reiterate/2021-12-30/hu.dwim.reiterate-stable-git.tgz"; - sha256 = "0h6cgg385ivgc6942xal09c7n9vmy6gn4y3zz4zafc1qyl5jwyv9"; + url = "https://beta.quicklisp.org/archive/hu.dwim.reiterate/2025-06-22/hu.dwim.reiterate-stable-git.tgz"; + sha256 = "1qy83h4q10as7r8ynci0iqmdwazzs92wkl2jd92wh4ai3zaf72al"; system = "hu.dwim.reiterate"; asd = "hu.dwim.reiterate"; } @@ -60811,6 +61609,7 @@ lib.makeScope pkgs.newScope (self: { (getAttr "hu_dot_dwim_dot_defclass-star" self) (getAttr "hu_dot_dwim_dot_syntax-sugar" self) (getAttr "hu_dot_dwim_dot_util" self) + (getAttr "hu_dot_dwim_dot_walker" self) (getAttr "metabang-bind" self) ]; meta = { @@ -60825,8 +61624,8 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.reiterate+hu.dwim.logger" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.reiterate/2021-12-30/hu.dwim.reiterate-stable-git.tgz"; - sha256 = "0h6cgg385ivgc6942xal09c7n9vmy6gn4y3zz4zafc1qyl5jwyv9"; + url = "https://beta.quicklisp.org/archive/hu.dwim.reiterate/2025-06-22/hu.dwim.reiterate-stable-git.tgz"; + sha256 = "1qy83h4q10as7r8ynci0iqmdwazzs92wkl2jd92wh4ai3zaf72al"; system = "hu.dwim.reiterate+hu.dwim.logger"; asd = "hu.dwim.reiterate+hu.dwim.logger"; } @@ -60849,7 +61648,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.sdl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.sdl/2022-07-07/hu.dwim.sdl-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.sdl/2025-06-22/hu.dwim.sdl-stable-git.tgz"; sha256 = "175kha5f7kvis2nlxbzrybswbr62lgmjh691ajwl5i9y7andqhq2"; system = "hu.dwim.sdl"; asd = "hu.dwim.sdl"; @@ -60861,6 +61660,7 @@ lib.makeScope pkgs.newScope (self: { (getAttr "cffi" self) (getAttr "cffi-libffi" self) (getAttr "hu_dot_dwim_dot_asdf" self) + (getAttr "trivial-features" self) ]; meta = { hydraPlatforms = [ ]; @@ -60874,7 +61674,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.serializer" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.serializer/2016-12-04/hu.dwim.serializer-20161204-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.serializer/2016-12-04/hu.dwim.serializer-20161204-darcs.tgz"; sha256 = "1c4zl2ql4w7nw8vrcrhhq45c5yhbcp4z5qpp1yxjpd3002q2lbh2"; system = "hu.dwim.serializer"; asd = "hu.dwim.serializer"; @@ -60902,7 +61702,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.serializer.documentation" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.serializer/2016-12-04/hu.dwim.serializer-20161204-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.serializer/2016-12-04/hu.dwim.serializer-20161204-darcs.tgz"; sha256 = "1c4zl2ql4w7nw8vrcrhhq45c5yhbcp4z5qpp1yxjpd3002q2lbh2"; system = "hu.dwim.serializer.documentation"; asd = "hu.dwim.serializer.documentation"; @@ -60926,7 +61726,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.serializer.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.serializer/2016-12-04/hu.dwim.serializer-20161204-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.serializer/2016-12-04/hu.dwim.serializer-20161204-darcs.tgz"; sha256 = "1c4zl2ql4w7nw8vrcrhhq45c5yhbcp4z5qpp1yxjpd3002q2lbh2"; system = "hu.dwim.serializer.test"; asd = "hu.dwim.serializer.test"; @@ -60950,7 +61750,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.stefil" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.stefil/2021-12-30/hu.dwim.stefil-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.stefil/2021-12-30/hu.dwim.stefil-stable-git.tgz"; sha256 = "0sra6psvrlpx9w7xjikm6ph2qlmgi9lr1kagpsiafxq4dnqlxjsx"; system = "hu.dwim.stefil"; asd = "hu.dwim.stefil"; @@ -60968,7 +61768,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.stefil+hu.dwim.def" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.stefil/2021-12-30/hu.dwim.stefil-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.stefil/2021-12-30/hu.dwim.stefil-stable-git.tgz"; sha256 = "0sra6psvrlpx9w7xjikm6ph2qlmgi9lr1kagpsiafxq4dnqlxjsx"; system = "hu.dwim.stefil+hu.dwim.def"; asd = "hu.dwim.stefil+hu.dwim.def"; @@ -60990,7 +61790,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.stefil+hu.dwim.def+swank" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.stefil/2021-12-30/hu.dwim.stefil-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.stefil/2021-12-30/hu.dwim.stefil-stable-git.tgz"; sha256 = "0sra6psvrlpx9w7xjikm6ph2qlmgi9lr1kagpsiafxq4dnqlxjsx"; system = "hu.dwim.stefil+hu.dwim.def+swank"; asd = "hu.dwim.stefil+hu.dwim.def+swank"; @@ -61013,7 +61813,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.stefil+swank" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.stefil/2021-12-30/hu.dwim.stefil-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.stefil/2021-12-30/hu.dwim.stefil-stable-git.tgz"; sha256 = "0sra6psvrlpx9w7xjikm6ph2qlmgi9lr1kagpsiafxq4dnqlxjsx"; system = "hu.dwim.stefil+swank"; asd = "hu.dwim.stefil+swank"; @@ -61035,7 +61835,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.syntax-sugar" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.syntax-sugar/2023-02-14/hu.dwim.syntax-sugar-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.syntax-sugar/2023-02-14/hu.dwim.syntax-sugar-stable-git.tgz"; sha256 = "1cy474di8njy4s39n7kn2w9jw39n4rssrk0fghrj0gabfxiz4wv9"; system = "hu.dwim.syntax-sugar"; asd = "hu.dwim.syntax-sugar"; @@ -61058,7 +61858,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.syntax-sugar.documentation" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.syntax-sugar/2023-02-14/hu.dwim.syntax-sugar-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.syntax-sugar/2023-02-14/hu.dwim.syntax-sugar-stable-git.tgz"; sha256 = "1cy474di8njy4s39n7kn2w9jw39n4rssrk0fghrj0gabfxiz4wv9"; system = "hu.dwim.syntax-sugar.documentation"; asd = "hu.dwim.syntax-sugar.documentation"; @@ -61082,7 +61882,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.syntax-sugar.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.syntax-sugar/2023-02-14/hu.dwim.syntax-sugar-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.syntax-sugar/2023-02-14/hu.dwim.syntax-sugar-stable-git.tgz"; sha256 = "1cy474di8njy4s39n7kn2w9jw39n4rssrk0fghrj0gabfxiz4wv9"; system = "hu.dwim.syntax-sugar.test"; asd = "hu.dwim.syntax-sugar.test"; @@ -61107,7 +61907,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.uri" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.uri/2018-02-28/hu.dwim.uri-20180228-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.uri/2018-02-28/hu.dwim.uri-20180228-darcs.tgz"; sha256 = "0wvai7djmbry0b0j8vhzw3s8m30ghs2sml29gw6snh1pynh3c2ir"; system = "hu.dwim.uri"; asd = "hu.dwim.uri"; @@ -61133,7 +61933,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.uri.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.uri/2018-02-28/hu.dwim.uri-20180228-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.uri/2018-02-28/hu.dwim.uri-20180228-darcs.tgz"; sha256 = "0wvai7djmbry0b0j8vhzw3s8m30ghs2sml29gw6snh1pynh3c2ir"; system = "hu.dwim.uri.test"; asd = "hu.dwim.uri.test"; @@ -61158,7 +61958,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.util" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz"; sha256 = "01f0kvvaa94zkz5zzfaf8cbiihlp0l6627q3hmc0k154j3mdarmi"; system = "hu.dwim.util"; asd = "hu.dwim.util"; @@ -61183,7 +61983,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.util+iolib" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz"; sha256 = "01f0kvvaa94zkz5zzfaf8cbiihlp0l6627q3hmc0k154j3mdarmi"; system = "hu.dwim.util+iolib"; asd = "hu.dwim.util+iolib"; @@ -61207,7 +62007,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.util.documentation" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz"; sha256 = "01f0kvvaa94zkz5zzfaf8cbiihlp0l6627q3hmc0k154j3mdarmi"; system = "hu.dwim.util.documentation"; asd = "hu.dwim.util.documentation"; @@ -61231,7 +62031,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.util.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz"; sha256 = "01f0kvvaa94zkz5zzfaf8cbiihlp0l6627q3hmc0k154j3mdarmi"; system = "hu.dwim.util.test"; asd = "hu.dwim.util.test"; @@ -61276,7 +62076,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.walker" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.walker/2022-07-07/hu.dwim.walker-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.walker/2022-07-07/hu.dwim.walker-stable-git.tgz"; sha256 = "0sw7z5iml82sklxjy1wr42mbp2qqml49ci36d6xsckar0sqsc8vr"; system = "hu.dwim.walker"; asd = "hu.dwim.walker"; @@ -61306,7 +62106,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.web-server" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz"; sha256 = "0kz8v5qlyj96rjvqic031f6c405zrpsyqnlkh2mvlsmc7rqg2zjf"; system = "hu.dwim.web-server"; asd = "hu.dwim.web-server"; @@ -61351,7 +62151,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.web-server+swank" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz"; sha256 = "0kz8v5qlyj96rjvqic031f6c405zrpsyqnlkh2mvlsmc7rqg2zjf"; system = "hu.dwim.web-server+swank"; asd = "hu.dwim.web-server+swank"; @@ -61375,7 +62175,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.web-server.application" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz"; sha256 = "0kz8v5qlyj96rjvqic031f6c405zrpsyqnlkh2mvlsmc7rqg2zjf"; system = "hu.dwim.web-server.application"; asd = "hu.dwim.web-server.application"; @@ -61398,7 +62198,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.web-server.application+hu.dwim.perec" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz"; sha256 = "0kz8v5qlyj96rjvqic031f6c405zrpsyqnlkh2mvlsmc7rqg2zjf"; system = "hu.dwim.web-server.application+hu.dwim.perec"; asd = "hu.dwim.web-server.application+hu.dwim.perec"; @@ -61422,7 +62222,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.web-server.application.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz"; sha256 = "0kz8v5qlyj96rjvqic031f6c405zrpsyqnlkh2mvlsmc7rqg2zjf"; system = "hu.dwim.web-server.application.test"; asd = "hu.dwim.web-server.application.test"; @@ -61446,7 +62246,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.web-server.documentation" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz"; sha256 = "0kz8v5qlyj96rjvqic031f6c405zrpsyqnlkh2mvlsmc7rqg2zjf"; system = "hu.dwim.web-server.documentation"; asd = "hu.dwim.web-server.documentation"; @@ -61470,7 +62270,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.web-server.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz"; sha256 = "0kz8v5qlyj96rjvqic031f6c405zrpsyqnlkh2mvlsmc7rqg2zjf"; system = "hu.dwim.web-server.test"; asd = "hu.dwim.web-server.test"; @@ -61497,7 +62297,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.web-server.websocket" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz"; sha256 = "0kz8v5qlyj96rjvqic031f6c405zrpsyqnlkh2mvlsmc7rqg2zjf"; system = "hu.dwim.web-server.websocket"; asd = "hu.dwim.web-server.websocket"; @@ -61522,7 +62322,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.zlib" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.zlib/2022-07-07/hu.dwim.zlib-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/hu.dwim.zlib/2025-06-22/hu.dwim.zlib-stable-git.tgz"; sha256 = "1yrsbl6rmsp6sdaj9yzwx1bpbs529akndxnpplafw31195khnxm1"; system = "hu.dwim.zlib"; asd = "hu.dwim.zlib"; @@ -61534,6 +62334,7 @@ lib.makeScope pkgs.newScope (self: { (getAttr "cffi" self) (getAttr "cffi-libffi" self) (getAttr "hu_dot_dwim_dot_asdf" self) + (getAttr "trivial-features" self) ]; meta = { broken = true; @@ -61548,7 +62349,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "huffman" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/huffman/2018-10-18/huffman-20181018-git.tgz"; + url = "https://beta.quicklisp.org/archive/huffman/2018-10-18/huffman-20181018-git.tgz"; sha256 = "05b3ql5szzi4vsry76i76483mxf9m5i9620hdshykh5rbfiarvcx"; system = "huffman"; asd = "huffman"; @@ -61564,12 +62365,12 @@ lib.makeScope pkgs.newScope (self: { humbler = ( build-asdf-system { pname = "humbler"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "humbler" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/humbler/2023-10-21/humbler-20231021-git.tgz"; - sha256 = "15fdvlrhdvr58i2rwa87i4is2rgh9xzjag0sqhga8ri7a8i63fgf"; + url = "https://beta.quicklisp.org/archive/humbler/2025-06-22/humbler-20250622-git.tgz"; + sha256 = "0vca31p9ngzxzpmy5rshyywc7zy12d413a8rw0y5xd6l1jv9qpjh"; system = "humbler"; asd = "humbler"; } @@ -61591,12 +62392,12 @@ lib.makeScope pkgs.newScope (self: { hunchensocket = ( build-asdf-system { pname = "hunchensocket"; - version = "20221106-git"; + version = "20250622-git"; asds = [ "hunchensocket" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hunchensocket/2022-11-06/hunchensocket-20221106-git.tgz"; - sha256 = "1vhd009lwl62l1czmhsalblxmyz4x9v3nspjflpajwm1db5rnd7h"; + url = "https://beta.quicklisp.org/archive/hunchensocket/2025-06-22/hunchensocket-20250622-git.tgz"; + sha256 = "0f8g54gjcmnf6yjz9d0x619p99sf39wzxxb328hdbwfj21ww74nf"; system = "hunchensocket"; asd = "hunchensocket"; } @@ -61620,14 +62421,14 @@ lib.makeScope pkgs.newScope (self: { hunchensocket-tests = ( build-asdf-system { pname = "hunchensocket-tests"; - version = "20221106-git"; + version = "20250622-git"; asds = [ "hunchensocket-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hunchensocket/2022-11-06/hunchensocket-20221106-git.tgz"; - sha256 = "1vhd009lwl62l1czmhsalblxmyz4x9v3nspjflpajwm1db5rnd7h"; + url = "https://beta.quicklisp.org/archive/hunchensocket/2025-06-22/hunchensocket-20250622-git.tgz"; + sha256 = "0f8g54gjcmnf6yjz9d0x619p99sf39wzxxb328hdbwfj21ww74nf"; system = "hunchensocket-tests"; - asd = "hunchensocket"; + asd = "hunchensocket-tests"; } ); systems = [ "hunchensocket-tests" ]; @@ -61647,7 +62448,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hunchentools" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hunchentools/2016-12-04/hunchentools-20161204-git.tgz"; + url = "https://beta.quicklisp.org/archive/hunchentools/2016-12-04/hunchentools-20161204-git.tgz"; sha256 = "12r1ml1xxhyz646nnxqzixfisljjaracwp9jhwl3wb285qbmai4b"; system = "hunchentools"; asd = "hunchentools"; @@ -61672,7 +62473,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hunchentoot" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hunchentoot/2024-10-12/hunchentoot-v1.3.1.tgz"; + url = "https://beta.quicklisp.org/archive/hunchentoot/2024-10-12/hunchentoot-v1.3.1.tgz"; sha256 = "0g4lh26l2vd10ilk1hrfmpj6hpjb986jp191ha2j6p2q1pil3kgc"; system = "hunchentoot"; asd = "hunchentoot"; @@ -61703,7 +62504,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hunchentoot-auth" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hunchentoot-auth/2014-01-13/hunchentoot-auth-20140113-git.tgz"; + url = "https://beta.quicklisp.org/archive/hunchentoot-auth/2014-01-13/hunchentoot-auth-20140113-git.tgz"; sha256 = "1bc70lh2jvk6gqmhczgv0indxk6j5whxbh7gylrlbv16041sdkbj"; system = "hunchentoot-auth"; asd = "hunchentoot-auth"; @@ -61728,7 +62529,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hunchentoot-cgi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hunchentoot-cgi/2014-02-11/hunchentoot-cgi-20140211-git.tgz"; + url = "https://beta.quicklisp.org/archive/hunchentoot-cgi/2014-02-11/hunchentoot-cgi-20140211-git.tgz"; sha256 = "0al6qfs6661avhywsqxh3nwyhl1d1gip3yx57b8siczjarpgpawc"; system = "hunchentoot-cgi"; asd = "hunchentoot-cgi"; @@ -61751,7 +62552,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hunchentoot-errors" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hunchentoot-errors/2023-10-21/hunchentoot-errors-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/hunchentoot-errors/2023-10-21/hunchentoot-errors-20231021-git.tgz"; sha256 = "0fab7s8qhhs713cw014qqvzm5z61wmxm2fcbkarhg41cz3li9k1j"; system = "hunchentoot-errors"; asd = "hunchentoot-errors"; @@ -61776,7 +62577,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hunchentoot-multi-acceptor" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hunchentoot-multi-acceptor/2022-03-31/hunchentoot-multi-acceptor-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/hunchentoot-multi-acceptor/2022-03-31/hunchentoot-multi-acceptor-20220331-git.tgz"; sha256 = "0m42dw8x0bp03n4hx4ppf45gjg14igf69z4rn7dslch6km58mrha"; system = "hunchentoot-multi-acceptor"; asd = "hunchentoot-multi-acceptor"; @@ -61801,7 +62602,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hunchentoot-single-signon" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hunchentoot-single-signon/2013-11-11/hunchentoot-single-signon-20131111-git.tgz"; + url = "https://beta.quicklisp.org/archive/hunchentoot-single-signon/2013-11-11/hunchentoot-single-signon-20131111-git.tgz"; sha256 = "0dh16k4105isqwnkl52m55m6cbl7g8wmcrym8175r2zr6qcbghq8"; system = "hunchentoot-single-signon"; asd = "hunchentoot-single-signon"; @@ -61826,7 +62627,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hunchentoot-stuck-connection-monitor" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hunchentoot-stuck-connection-monitor/2024-10-12/hunchentoot-stuck-connection-monitor-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/hunchentoot-stuck-connection-monitor/2024-10-12/hunchentoot-stuck-connection-monitor-20241012-git.tgz"; sha256 = "1zbpxcym8pi9bf3m7f8f5aa2xhq048kx54sj1ka1vnz7rgccghc6"; system = "hunchentoot-stuck-connection-monitor"; asd = "hunchentoot-stuck-connection-monitor"; @@ -61850,7 +62651,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hyperlattices" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hyperlattices/2023-10-21/hyperlattices-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/hyperlattices/2023-10-21/hyperlattices-20231021-git.tgz"; sha256 = "1d0jhy7yv5917bgx1b8r8ch5b94zbg933kx8ak2sbpgsf16pqf2h"; system = "hyperlattices"; asd = "hyperlattices"; @@ -61875,7 +62676,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hyperluminal-mem" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hyperluminal-mem/2021-06-30/hyperluminal-mem-20210630-git.tgz"; + url = "https://beta.quicklisp.org/archive/hyperluminal-mem/2021-06-30/hyperluminal-mem-20210630-git.tgz"; sha256 = "0qp00g43v518j0wccqnpglkrpikagnn9naphb29wbil6k7y9y7r9"; system = "hyperluminal-mem"; asd = "hyperluminal-mem"; @@ -61901,7 +62702,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hyperluminal-mem-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hyperluminal-mem/2021-06-30/hyperluminal-mem-20210630-git.tgz"; + url = "https://beta.quicklisp.org/archive/hyperluminal-mem/2021-06-30/hyperluminal-mem-20210630-git.tgz"; sha256 = "0qp00g43v518j0wccqnpglkrpikagnn9naphb29wbil6k7y9y7r9"; system = "hyperluminal-mem-test"; asd = "hyperluminal-mem-test"; @@ -61925,7 +62726,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hyperobject" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hyperobject/2020-10-16/hyperobject-20201016-git.tgz"; + url = "https://beta.quicklisp.org/archive/hyperobject/2020-10-16/hyperobject-20201016-git.tgz"; sha256 = "1ggqlvwcd52c2d4k8csy7qciaq7lyldi0rpk3b9x4rw4gllcch8n"; system = "hyperobject"; asd = "hyperobject"; @@ -61948,7 +62749,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hyperspec" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hyperspec/2018-12-10/hyperspec-20181210-git.tgz"; + url = "https://beta.quicklisp.org/archive/hyperspec/2018-12-10/hyperspec-20181210-git.tgz"; sha256 = "0zh1dq2451xw7yiycdr2mrcjx6rgnqnm8c8l9zhhn7hnf51b4x5l"; system = "hyperspec"; asd = "hyperspec"; @@ -61968,7 +62769,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ia-hash-table" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ia-hash-table/2016-03-18/ia-hash-table-20160318-git.tgz"; + url = "https://beta.quicklisp.org/archive/ia-hash-table/2016-03-18/ia-hash-table-20160318-git.tgz"; sha256 = "11wnwjxa528yyjnfsvw315hyvq3lc996dwx83isdg4hlirj3amy4"; system = "ia-hash-table"; asd = "ia-hash-table"; @@ -61991,7 +62792,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ia-hash-table.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ia-hash-table/2016-03-18/ia-hash-table-20160318-git.tgz"; + url = "https://beta.quicklisp.org/archive/ia-hash-table/2016-03-18/ia-hash-table-20160318-git.tgz"; sha256 = "11wnwjxa528yyjnfsvw315hyvq3lc996dwx83isdg4hlirj3amy4"; system = "ia-hash-table.test"; asd = "ia-hash-table.test"; @@ -62018,7 +62819,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "iclendar" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/iclendar/2023-10-21/iclendar-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/iclendar/2023-10-21/iclendar-20231021-git.tgz"; sha256 = "13ic0zlwrlf6k08x7c8v96kjpbh1dmap15q4cv4in7rkx6rn2rsa"; system = "iclendar"; asd = "iclendar"; @@ -62043,7 +62844,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "iconv" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-iconv/2017-12-27/cl-iconv-20171227-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-iconv/2017-12-27/cl-iconv-20171227-git.tgz"; sha256 = "1lpw95c02inifhdh9kkab9q92i5w9zd788dww1wly2p0a6kyx9wg"; system = "iconv"; asd = "iconv"; @@ -62066,7 +62867,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "id3v2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/id3v2/2016-02-08/id3v2-20160208-git.tgz"; + url = "https://beta.quicklisp.org/archive/id3v2/2016-02-08/id3v2-20160208-git.tgz"; sha256 = "0x017dfh9m80b8ml2vsgdcfs4kv7p06yzmwdilf1k8nfsilwpfra"; system = "id3v2"; asd = "id3v2"; @@ -62089,7 +62890,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "id3v2-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/id3v2/2016-02-08/id3v2-20160208-git.tgz"; + url = "https://beta.quicklisp.org/archive/id3v2/2016-02-08/id3v2-20160208-git.tgz"; sha256 = "0x017dfh9m80b8ml2vsgdcfs4kv7p06yzmwdilf1k8nfsilwpfra"; system = "id3v2-test"; asd = "id3v2-test"; @@ -62114,7 +62915,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "identifier-pool" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/identifier-pool/2022-07-07/identifier-pool-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/identifier-pool/2022-07-07/identifier-pool-20220707-git.tgz"; sha256 = "01fs960s02nf8m3a5v95r12magq9rvgcc3awcppqa7c8yg7qdc55"; system = "identifier-pool"; asd = "identifier-pool"; @@ -62137,7 +62938,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "idna" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz"; + url = "https://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz"; sha256 = "00nbr3mffxhlq14gg9d16pa6691s4qh35inyw76v906s77khm5a2"; system = "idna"; asd = "idna"; @@ -62155,7 +62956,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ieee-floats" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ieee-floats/2022-02-20/ieee-floats-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/ieee-floats/2022-02-20/ieee-floats-20220220-git.tgz"; sha256 = "0qp2dxq9jzndjfmc8nh0fvcwrrxjm7f012biczipifjckp9gxw7d"; system = "ieee-floats"; asd = "ieee-floats"; @@ -62173,7 +62974,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "illogical-pathnames" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/illogical-pathnames/2016-08-25/illogical-pathnames-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/illogical-pathnames/2016-08-25/illogical-pathnames-20160825-git.tgz"; sha256 = "1yjs1lzgak1d3hz2q6sbac98vqgdxp0dz72fskpz73vrbp6h6da5"; system = "illogical-pathnames"; asd = "illogical-pathnames"; @@ -62193,7 +62994,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "illusion" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/illusion/2018-08-31/illusion-20180831-git.tgz"; + url = "https://beta.quicklisp.org/archive/illusion/2018-08-31/illusion-20180831-git.tgz"; sha256 = "05wik6q8hlhm7szzymkljfigcp7z35j6rz2ihsmng1y6zq9crk7z"; system = "illusion"; asd = "illusion"; @@ -62217,7 +63018,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "illusion-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/illusion/2018-08-31/illusion-20180831-git.tgz"; + url = "https://beta.quicklisp.org/archive/illusion/2018-08-31/illusion-20180831-git.tgz"; sha256 = "05wik6q8hlhm7szzymkljfigcp7z35j6rz2ihsmng1y6zq9crk7z"; system = "illusion-test"; asd = "illusion-test"; @@ -62241,7 +63042,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "image" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/image/2012-01-07/image-20120107-git.tgz"; + url = "https://beta.quicklisp.org/archive/image/2012-01-07/image-20120107-git.tgz"; sha256 = "04by1snzw2kpw208fdi2azxbq5y2q2r6x8zkdh7jk43amkr18f5k"; system = "image"; asd = "image"; @@ -62266,7 +63067,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "image-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-png/2021-10-20/cl-png-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-png/2021-10-20/cl-png-20211020-git.tgz"; sha256 = "17xcb9ps5vf3if61blmx7cpfrz3gsw7jk8d5zv3f4cq8jrriqdx4"; system = "image-test"; asd = "image-test"; @@ -62286,7 +63087,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "image-utility" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; system = "image-utility"; asd = "image-utility"; @@ -62302,12 +63103,12 @@ lib.makeScope pkgs.newScope (self: { imago = ( build-asdf-system { pname = "imago"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "imago" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/imago/2024-10-12/imago-20241012-git.tgz"; - sha256 = "1jhhlqbzdd68n8scl98dxfr92s1rgd43isgd317l3ynfjwz63wq1"; + url = "https://beta.quicklisp.org/archive/imago/2025-06-22/imago-20250622-git.tgz"; + sha256 = "17bfxp9z9hyi6sh382371fb822lqkgw1lrc1vvspsayax126yhpl"; system = "imago"; asd = "imago"; } @@ -62334,7 +63135,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "immutable-struct" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/immutable-struct/2015-07-09/immutable-struct-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/immutable-struct/2015-07-09/immutable-struct-20150709-git.tgz"; sha256 = "02868d21hcc0kc3jw8afx23kj6iy1vyf2pddn8yqfrkpldhd0rv9"; system = "immutable-struct"; asd = "immutable-struct"; @@ -62358,7 +63159,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "in-nomine" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/in-nomine/2024-10-12/in-nomine-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/in-nomine/2024-10-12/in-nomine-20241012-git.tgz"; sha256 = "1wcfxqj5dfmkg94rnz2nsmyw8iwicncxmklnirlngqqvlcrd0rv4"; system = "in-nomine"; asd = "in-nomine"; @@ -62381,7 +63182,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "incf-cl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/incf-cl/2019-07-10/incf-cl-20190710-git.tgz"; + url = "https://beta.quicklisp.org/archive/incf-cl/2019-07-10/incf-cl-20190710-git.tgz"; sha256 = "1yvwb57dzccvd2lw2h3mwxgbi8ml3cgkyy8kl8hwhd4s8c016ibb"; system = "incf-cl"; asd = "incf-cl"; @@ -62401,7 +63202,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "incless" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/incless/2024-10-12/incless-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/incless/2024-10-12/incless-20241012-git.tgz"; sha256 = "1ypxhsx3fqwfng3b425bsgxbra7asny9261amdbfd6p59r51cyiy"; system = "incless"; asd = "incless"; @@ -62421,7 +63222,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "incless-extrinsic" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/incless/2024-10-12/incless-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/incless/2024-10-12/incless-20241012-git.tgz"; sha256 = "1ypxhsx3fqwfng3b425bsgxbra7asny9261amdbfd6p59r51cyiy"; system = "incless-extrinsic"; asd = "incless-extrinsic"; @@ -62444,7 +63245,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "incless-native" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/incless/2024-10-12/incless-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/incless/2024-10-12/incless-20241012-git.tgz"; sha256 = "1ypxhsx3fqwfng3b425bsgxbra7asny9261amdbfd6p59r51cyiy"; system = "incless-native"; asd = "incless-native"; @@ -62464,7 +63265,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "incognito-keywords" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/incognito-keywords/2013-01-28/incognito-keywords-1.1.tgz"; + url = "https://beta.quicklisp.org/archive/incognito-keywords/2013-01-28/incognito-keywords-1.1.tgz"; sha256 = "1ignvz8v7bq8z9x22skzp1xsna2bxqcw22zh5sp9v2ndbjhqri5c"; system = "incognito-keywords"; asd = "incognito-keywords"; @@ -62487,7 +63288,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "incongruent-methods" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/incongruent-methods/2013-03-12/incongruent-methods-20130312-git.tgz"; + url = "https://beta.quicklisp.org/archive/incongruent-methods/2013-03-12/incongruent-methods-20130312-git.tgz"; sha256 = "15xfbpnqymbkk92vbirvccxcphyvjmxcw02yv1zs6c78aaf4ms9z"; system = "incongruent-methods"; asd = "incongruent-methods"; @@ -62507,7 +63308,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "inferior-shell" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/inferior-shell/2024-10-12/inferior-shell-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/inferior-shell/2024-10-12/inferior-shell-20241012-git.tgz"; sha256 = "1bmw0jjcpssahymqidz159pqbz5ficz56w7b97hfy1xnwkd2fwg5"; system = "inferior-shell"; asd = "inferior-shell"; @@ -62528,12 +63329,12 @@ lib.makeScope pkgs.newScope (self: { infix = ( build-asdf-system { pname = "infix"; - version = "20210411-git"; + version = "20250622-git"; asds = [ "infix" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/femlisp/2021-04-11/femlisp-20210411-git.tgz"; - sha256 = "08l2x1jq3vfhh8m14wijd8c78n589cy5hd2py2jfj3yfiqyipasa"; + url = "https://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz"; + sha256 = "1rg1hhy3nlb85229ninnsdr8dhjjs0wgqv612g8i59v82n07yip8"; system = "infix"; asd = "infix"; } @@ -62552,7 +63353,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "infix-dollar-reader" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/infix-dollar-reader/2012-10-13/infix-dollar-reader-20121013-git.tgz"; + url = "https://beta.quicklisp.org/archive/infix-dollar-reader/2012-10-13/infix-dollar-reader-20121013-git.tgz"; sha256 = "11sf4kqcw8s0zcjz1qpbhkn33rizvq5ijl6xp59q9wadvkd0wx0w"; system = "infix-dollar-reader"; asd = "infix-dollar-reader"; @@ -62572,7 +63373,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "infix-dollar-reader-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/infix-dollar-reader/2012-10-13/infix-dollar-reader-20121013-git.tgz"; + url = "https://beta.quicklisp.org/archive/infix-dollar-reader/2012-10-13/infix-dollar-reader-20121013-git.tgz"; sha256 = "11sf4kqcw8s0zcjz1qpbhkn33rizvq5ijl6xp59q9wadvkd0wx0w"; system = "infix-dollar-reader-test"; asd = "infix-dollar-reader-test"; @@ -62595,7 +63396,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "infix-math" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/infix-math/2021-10-20/infix-math-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/infix-math/2021-10-20/infix-math-20211020-git.tgz"; sha256 = "1h6p254xl793wfq3qla5y95k6zimy477f8brblx6ran3rg3bydbg"; system = "infix-math"; asd = "infix-math"; @@ -62621,7 +63422,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "infix-reader" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/infix-reader/2022-11-06/infix-reader-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/infix-reader/2022-11-06/infix-reader-20221106-git.tgz"; sha256 = "16b6cw4w80p3yxsv0pqaiq0ay1v3jswlav2mlfsmhawpvhxsmb7z"; system = "infix-reader"; asd = "infix-reader"; @@ -62641,7 +63442,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "inheriting-readers" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/inheriting-readers/2021-01-24/inheriting-readers_1.0.1.tgz"; + url = "https://beta.quicklisp.org/archive/inheriting-readers/2021-01-24/inheriting-readers_1.0.1.tgz"; sha256 = "0km3mq6vx1q9qv6j3r4sqqcsdbnb5jar66bl0mzzpaacfvzbx68p"; system = "inheriting-readers"; asd = "inheriting-readers"; @@ -62665,7 +63466,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "inheriting-readers_tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/inheriting-readers/2021-01-24/inheriting-readers_1.0.1.tgz"; + url = "https://beta.quicklisp.org/archive/inheriting-readers/2021-01-24/inheriting-readers_1.0.1.tgz"; sha256 = "0km3mq6vx1q9qv6j3r4sqqcsdbnb5jar66bl0mzzpaacfvzbx68p"; system = "inheriting-readers_tests"; asd = "inheriting-readers_tests"; @@ -62689,7 +63490,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "injection" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/injection/2016-05-31/injection-20160531-git.tgz"; + url = "https://beta.quicklisp.org/archive/injection/2016-05-31/injection-20160531-git.tgz"; sha256 = "12f838ikgyl7gzh2dnqh54hfa8rncbkk266bsibmbbqxz0cn2da7"; system = "injection"; asd = "injection"; @@ -62709,7 +63510,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "injection-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/injection/2016-05-31/injection-20160531-git.tgz"; + url = "https://beta.quicklisp.org/archive/injection/2016-05-31/injection-20160531-git.tgz"; sha256 = "12f838ikgyl7gzh2dnqh54hfa8rncbkk266bsibmbbqxz0cn2da7"; system = "injection-test"; asd = "injection-test"; @@ -62732,7 +63533,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "inkwell" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/inkwell/2023-10-21/inkwell-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/inkwell/2023-10-21/inkwell-20231021-git.tgz"; sha256 = "07yxgs2zfnyr158v8q2s4npvzjzmpifx61hg7fc17dsmqgw296yc"; system = "inkwell"; asd = "inkwell"; @@ -62758,7 +63559,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "inlined-generic-function" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/inlined-generic-function/2019-05-21/inlined-generic-function-20190521-git.tgz"; + url = "https://beta.quicklisp.org/archive/inlined-generic-function/2019-05-21/inlined-generic-function-20190521-git.tgz"; sha256 = "0kj9p99m9hwx4lx95npfln5dc5ip884f8agjc6h4y0rhnpj7r8gk"; system = "inlined-generic-function"; asd = "inlined-generic-function"; @@ -62784,7 +63585,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "inlined-generic-function.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/inlined-generic-function/2019-05-21/inlined-generic-function-20190521-git.tgz"; + url = "https://beta.quicklisp.org/archive/inlined-generic-function/2019-05-21/inlined-generic-function-20190521-git.tgz"; sha256 = "0kj9p99m9hwx4lx95npfln5dc5ip884f8agjc6h4y0rhnpj7r8gk"; system = "inlined-generic-function.test"; asd = "inlined-generic-function.test"; @@ -62807,7 +63608,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "inner-conditional" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/inner-conditional/2020-09-25/inner-conditional-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/inner-conditional/2020-09-25/inner-conditional-20200925-git.tgz"; sha256 = "08vaq29l2bhv4n1c6zb3syddwpad66rghfy71fqidjvbag0ji71k"; system = "inner-conditional"; asd = "inner-conditional"; @@ -62832,7 +63633,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "inner-conditional-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/inner-conditional/2020-09-25/inner-conditional-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/inner-conditional/2020-09-25/inner-conditional-20200925-git.tgz"; sha256 = "08vaq29l2bhv4n1c6zb3syddwpad66rghfy71fqidjvbag0ji71k"; system = "inner-conditional-test"; asd = "inner-conditional-test"; @@ -62855,7 +63656,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "inotify" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/inotify/2015-06-08/inotify-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/inotify/2015-06-08/inotify-20150608-git.tgz"; sha256 = "0jill05wsa7xbnkycc1ik1a05slv2h34fpyap2rxbnxvfjvyzw98"; system = "inotify"; asd = "inotify"; @@ -62879,7 +63680,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "input-event-codes" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/input-event-codes/2022-11-06/input-event-codes-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/input-event-codes/2022-11-06/input-event-codes-20221106-git.tgz"; sha256 = "1m96m9ia4frcn2xqaw4mfspjjzwl8gyj4k4rv0lq28va4s6mkgii"; system = "input-event-codes"; asd = "input-event-codes"; @@ -62899,7 +63700,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "inquisitor" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/inquisitor/2019-05-21/inquisitor-20190521-git.tgz"; + url = "https://beta.quicklisp.org/archive/inquisitor/2019-05-21/inquisitor-20190521-git.tgz"; sha256 = "08rkmqnwlq6v84wcz9yp31j5lxrsy33kv3dh7n3ccsg4kc54slzw"; system = "inquisitor"; asd = "inquisitor"; @@ -62922,7 +63723,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "inquisitor-flexi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/inquisitor/2019-05-21/inquisitor-20190521-git.tgz"; + url = "https://beta.quicklisp.org/archive/inquisitor/2019-05-21/inquisitor-20190521-git.tgz"; sha256 = "08rkmqnwlq6v84wcz9yp31j5lxrsy33kv3dh7n3ccsg4kc54slzw"; system = "inquisitor-flexi"; asd = "inquisitor-flexi"; @@ -62945,7 +63746,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "inquisitor-flexi-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/inquisitor/2019-05-21/inquisitor-20190521-git.tgz"; + url = "https://beta.quicklisp.org/archive/inquisitor/2019-05-21/inquisitor-20190521-git.tgz"; sha256 = "08rkmqnwlq6v84wcz9yp31j5lxrsy33kv3dh7n3ccsg4kc54slzw"; system = "inquisitor-flexi-test"; asd = "inquisitor-flexi-test"; @@ -62969,7 +63770,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "inquisitor-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/inquisitor/2019-05-21/inquisitor-20190521-git.tgz"; + url = "https://beta.quicklisp.org/archive/inquisitor/2019-05-21/inquisitor-20190521-git.tgz"; sha256 = "08rkmqnwlq6v84wcz9yp31j5lxrsy33kv3dh7n3ccsg4kc54slzw"; system = "inquisitor-test"; asd = "inquisitor-test"; @@ -62995,7 +63796,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "inravina" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/inravina/2024-10-12/inravina-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/inravina/2024-10-12/inravina-20241012-git.tgz"; sha256 = "16kbxzsbb4vdhbf1dzgsgwj9n3cizk3sjixjgrfa8fal4nys7sa3"; system = "inravina"; asd = "inravina"; @@ -63018,7 +63819,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "inravina-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/inravina/2024-10-12/inravina-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/inravina/2024-10-12/inravina-20241012-git.tgz"; sha256 = "16kbxzsbb4vdhbf1dzgsgwj9n3cizk3sjixjgrfa8fal4nys7sa3"; system = "inravina-examples"; asd = "inravina-examples"; @@ -63041,7 +63842,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "inravina-extrinsic" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/inravina/2024-10-12/inravina-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/inravina/2024-10-12/inravina-20241012-git.tgz"; sha256 = "16kbxzsbb4vdhbf1dzgsgwj9n3cizk3sjixjgrfa8fal4nys7sa3"; system = "inravina-extrinsic"; asd = "inravina-extrinsic"; @@ -63064,7 +63865,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "inravina-native" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/inravina/2024-10-12/inravina-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/inravina/2024-10-12/inravina-20241012-git.tgz"; sha256 = "16kbxzsbb4vdhbf1dzgsgwj9n3cizk3sjixjgrfa8fal4nys7sa3"; system = "inravina-native"; asd = "inravina-native"; @@ -63084,7 +63885,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "inravina-shim" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/inravina/2024-10-12/inravina-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/inravina/2024-10-12/inravina-20241012-git.tgz"; sha256 = "16kbxzsbb4vdhbf1dzgsgwj9n3cizk3sjixjgrfa8fal4nys7sa3"; system = "inravina-shim"; asd = "inravina-shim"; @@ -63108,7 +63909,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "instance-tracking" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/instance-tracking/2022-11-06/instance-tracking-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/instance-tracking/2022-11-06/instance-tracking-20221106-git.tgz"; sha256 = "0bbxvl14ahws30x5dgjhilhybjgn1jfcbxwr8ji1ls31zf88fphr"; system = "instance-tracking"; asd = "instance-tracking"; @@ -63128,7 +63929,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "integral" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/integral/2020-03-25/integral-20200325-git.tgz"; + url = "https://beta.quicklisp.org/archive/integral/2020-03-25/integral-20200325-git.tgz"; sha256 = "17a9wg7n3f81fsi5mlsdxain1fw7ggfniipfrb9sr1ajff6lx9gs"; system = "integral"; asd = "integral"; @@ -63160,7 +63961,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "integral-rest" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/integral-rest/2015-09-23/integral-rest-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/integral-rest/2015-09-23/integral-rest-20150923-git.tgz"; sha256 = "0187d9i7acw2v1hhy7wcz0vk90ji7cdgpaikb7admvzq0nnbzrmm"; system = "integral-rest"; asd = "integral-rest"; @@ -63188,7 +63989,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "integral-rest-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/integral-rest/2015-09-23/integral-rest-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/integral-rest/2015-09-23/integral-rest-20150923-git.tgz"; sha256 = "0187d9i7acw2v1hhy7wcz0vk90ji7cdgpaikb7admvzq0nnbzrmm"; system = "integral-rest-test"; asd = "integral-rest-test"; @@ -63213,7 +64014,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "integral-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/integral/2020-03-25/integral-20200325-git.tgz"; + url = "https://beta.quicklisp.org/archive/integral/2020-03-25/integral-20200325-git.tgz"; sha256 = "17a9wg7n3f81fsi5mlsdxain1fw7ggfniipfrb9sr1ajff6lx9gs"; system = "integral-test"; asd = "integral-test"; @@ -63239,7 +64040,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "intel-hex" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/intel-hex/2016-03-18/intel-hex-20160318-git.tgz"; + url = "https://beta.quicklisp.org/archive/intel-hex/2016-03-18/intel-hex-20160318-git.tgz"; sha256 = "0sz51qw262nh6ziwpy1kgv257nj56rp42s0g6g2rx3xv1ijdy395"; system = "intel-hex"; asd = "intel-hex"; @@ -63259,7 +64060,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "intel-hex-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/intel-hex/2016-03-18/intel-hex-20160318-git.tgz"; + url = "https://beta.quicklisp.org/archive/intel-hex/2016-03-18/intel-hex-20160318-git.tgz"; sha256 = "0sz51qw262nh6ziwpy1kgv257nj56rp42s0g6g2rx3xv1ijdy395"; system = "intel-hex-test"; asd = "intel-hex-test"; @@ -63276,6 +64077,30 @@ lib.makeScope pkgs.newScope (self: { }; } ); + interact = ( + build-asdf-system { + pname = "interact"; + version = "production-86dd9553-git"; + asds = [ "interact" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/interact/2025-06-22/interact-production-86dd9553-git.tgz"; + sha256 = "10076p3vlb3a7106gdl44sil8b63ama7svbf9smgbbs40c1657ba"; + system = "interact"; + asd = "interact"; + } + ); + systems = [ "interact" ]; + lispLibs = [ + (getAttr "clim" self) + (getAttr "fn" self) + (getAttr "serapeum" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); intercom = ( build-asdf-system { pname = "intercom"; @@ -63283,7 +64108,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "intercom" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/intercom/2013-06-15/intercom-20130615-git.tgz"; + url = "https://beta.quicklisp.org/archive/intercom/2013-06-15/intercom-20130615-git.tgz"; sha256 = "017klgjsza4cxdxms4hxgrfrwjshkcr2yyxnhg14zs9w0vjwkikl"; system = "intercom"; asd = "intercom"; @@ -63309,7 +64134,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "intercom-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/intercom/2013-06-15/intercom-20130615-git.tgz"; + url = "https://beta.quicklisp.org/archive/intercom/2013-06-15/intercom-20130615-git.tgz"; sha256 = "017klgjsza4cxdxms4hxgrfrwjshkcr2yyxnhg14zs9w0vjwkikl"; system = "intercom-examples"; asd = "intercom-examples"; @@ -63332,7 +64157,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "interface" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/interface/2023-06-18/interface-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/interface/2023-06-18/interface-20230618-git.tgz"; sha256 = "0h1bckhyig2znl6nrd3agjzz7knrm2kyh2vfyk7j60kzki9rpzxy"; system = "interface"; asd = "interface"; @@ -63355,7 +64180,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "interfaces-test-implementation" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/modularize-interfaces/2023-10-21/modularize-interfaces-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/modularize-interfaces/2023-10-21/modularize-interfaces-20231021-git.tgz"; sha256 = "0lmq2jbkbr5wrrjl2qb1x64fcvl0lmii0h9301b9bq4d47s4w8sh"; system = "interfaces-test-implementation"; asd = "interfaces-test-implementation"; @@ -63378,7 +64203,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "introspect-environment" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/introspect-environment/2024-10-12/introspect-environment-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/introspect-environment/2024-10-12/introspect-environment-20241012-git.tgz"; sha256 = "1jll8h1fmf9i8nk3j3hrh62s858fzmly22zb690a2hnb685w3zlf"; system = "introspect-environment"; asd = "introspect-environment"; @@ -63396,7 +64221,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "introspect-environment-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/introspect-environment/2024-10-12/introspect-environment-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/introspect-environment/2024-10-12/introspect-environment-20241012-git.tgz"; sha256 = "1jll8h1fmf9i8nk3j3hrh62s858fzmly22zb690a2hnb685w3zlf"; system = "introspect-environment-test"; asd = "introspect-environment-test"; @@ -63415,12 +64240,12 @@ lib.makeScope pkgs.newScope (self: { invistra = ( build-asdf-system { pname = "invistra"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "invistra" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/invistra/2024-10-12/invistra-20241012-git.tgz"; - sha256 = "14ja35zqa85hjl9wxkwrff2wnlfflxi6lnkw0ic7jp7b59f80qas"; + url = "https://beta.quicklisp.org/archive/invistra/2025-06-22/invistra-20250622-git.tgz"; + sha256 = "1wkf5hi8939bxd39psbzc11w7xvqdfl1z6192spk7s73i3ql9s9x"; system = "invistra"; asd = "invistra"; } @@ -63440,12 +64265,12 @@ lib.makeScope pkgs.newScope (self: { invistra-extrinsic = ( build-asdf-system { pname = "invistra-extrinsic"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "invistra-extrinsic" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/invistra/2024-10-12/invistra-20241012-git.tgz"; - sha256 = "14ja35zqa85hjl9wxkwrff2wnlfflxi6lnkw0ic7jp7b59f80qas"; + url = "https://beta.quicklisp.org/archive/invistra/2025-06-22/invistra-20250622-git.tgz"; + sha256 = "1wkf5hi8939bxd39psbzc11w7xvqdfl1z6192spk7s73i3ql9s9x"; system = "invistra-extrinsic"; asd = "invistra-extrinsic"; } @@ -63463,12 +64288,12 @@ lib.makeScope pkgs.newScope (self: { invistra-numeral = ( build-asdf-system { pname = "invistra-numeral"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "invistra-numeral" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/invistra/2024-10-12/invistra-20241012-git.tgz"; - sha256 = "14ja35zqa85hjl9wxkwrff2wnlfflxi6lnkw0ic7jp7b59f80qas"; + url = "https://beta.quicklisp.org/archive/invistra/2025-06-22/invistra-20250622-git.tgz"; + sha256 = "1wkf5hi8939bxd39psbzc11w7xvqdfl1z6192spk7s73i3ql9s9x"; system = "invistra-numeral"; asd = "invistra-numeral"; } @@ -63487,7 +64312,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "iolib" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz"; + url = "https://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz"; sha256 = "1f43jqqqwp9n7xksqxw91myapsdbc2dxck6nd6flakbnp9haylyq"; system = "iolib"; asd = "iolib"; @@ -63516,7 +64341,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "iolib.asdf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz"; + url = "https://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz"; sha256 = "1f43jqqqwp9n7xksqxw91myapsdbc2dxck6nd6flakbnp9haylyq"; system = "iolib.asdf"; asd = "iolib.asdf"; @@ -63534,7 +64359,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "iolib.base" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz"; + url = "https://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz"; sha256 = "1f43jqqqwp9n7xksqxw91myapsdbc2dxck6nd6flakbnp9haylyq"; system = "iolib.base"; asd = "iolib.base"; @@ -63558,7 +64383,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "iolib.common-lisp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz"; + url = "https://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz"; sha256 = "1f43jqqqwp9n7xksqxw91myapsdbc2dxck6nd6flakbnp9haylyq"; system = "iolib.common-lisp"; asd = "iolib.common-lisp"; @@ -63580,7 +64405,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "iolib.conf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz"; + url = "https://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz"; sha256 = "1f43jqqqwp9n7xksqxw91myapsdbc2dxck6nd6flakbnp9haylyq"; system = "iolib.conf"; asd = "iolib.conf"; @@ -63598,7 +64423,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "iolib.examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz"; + url = "https://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz"; sha256 = "1f43jqqqwp9n7xksqxw91myapsdbc2dxck6nd6flakbnp9haylyq"; system = "iolib.examples"; asd = "iolib.examples"; @@ -63624,7 +64449,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ip-interfaces" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ip-interfaces/2018-12-10/ip-interfaces-0.2.1.tgz"; + url = "https://beta.quicklisp.org/archive/ip-interfaces/2018-12-10/ip-interfaces-0.2.1.tgz"; sha256 = "035sc4li0qz4lzjn555h8r2qkhc8a65zglk30f1b3pi9p44g91mw"; system = "ip-interfaces"; asd = "ip-interfaces"; @@ -63644,7 +64469,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ip-interfaces-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ip-interfaces/2018-12-10/ip-interfaces-0.2.1.tgz"; + url = "https://beta.quicklisp.org/archive/ip-interfaces/2018-12-10/ip-interfaces-0.2.1.tgz"; sha256 = "035sc4li0qz4lzjn555h8r2qkhc8a65zglk30f1b3pi9p44g91mw"; system = "ip-interfaces-test"; asd = "ip-interfaces-test"; @@ -63668,7 +64493,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "irc-logger" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/irc-logger/2015-09-23/irc-logger-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/irc-logger/2015-09-23/irc-logger-20150923-git.tgz"; sha256 = "1ylq8qnf29dij7133p19cmmmw3i7w6azncsdvpd4j0k1fqp14bq7"; system = "irc-logger"; asd = "irc-logger"; @@ -63691,7 +64516,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ironclad" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2024-10-12/ironclad-v0.61.tgz"; + url = "https://beta.quicklisp.org/archive/ironclad/2024-10-12/ironclad-v0.61.tgz"; sha256 = "1yszjy6a0q1jvdgd7fpmnvi9851s8ivp4plscw27lbnl7jlj1pmk"; system = "ironclad"; asd = "ironclad"; @@ -63709,7 +64534,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ironclad-text" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2024-10-12/ironclad-v0.61.tgz"; + url = "https://beta.quicklisp.org/archive/ironclad/2024-10-12/ironclad-v0.61.tgz"; sha256 = "1yszjy6a0q1jvdgd7fpmnvi9851s8ivp4plscw27lbnl7jlj1pmk"; system = "ironclad-text"; asd = "ironclad-text"; @@ -63732,7 +64557,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "isolated" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-isolated/2020-02-18/cl-isolated-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-isolated/2020-02-18/cl-isolated-20200218-git.tgz"; sha256 = "01wbis4dw2cy7d2yh30rwvmlx3dr5s9dx8hs19xhjpznjbqfyksi"; system = "isolated"; asd = "isolated"; @@ -63752,7 +64577,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "issr" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/hunchenissr/2021-10-20/hunchenissr-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/hunchenissr/2021-10-20/hunchenissr-20211020-git.tgz"; sha256 = "1dfm7zdvyj14my8giznq1vsy20nj7my71y7a657slhf6v2cap5vs"; system = "issr"; asd = "issr"; @@ -63785,7 +64610,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "issr-core" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/core/2021-02-28/core-20210228-git.tgz"; + url = "https://beta.quicklisp.org/archive/core/2021-02-28/core-20210228-git.tgz"; sha256 = "1bajb09crzadkirdpd6jrpcc55irjd4sxzavygr25l85pafyhniw"; system = "issr-core"; asd = "issr-core"; @@ -63810,7 +64635,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "iterate" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/iterate/2021-05-31/iterate-release-b0f9a9c6-git.tgz"; + url = "https://beta.quicklisp.org/archive/iterate/2021-05-31/iterate-release-b0f9a9c6-git.tgz"; sha256 = "09xq2mdr97hagjrjpc47mp8l9wfp697aa9qaqmsy0yskayzg6xsc"; system = "iterate"; asd = "iterate"; @@ -63828,7 +64653,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "iterate-clsql" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/iterate-clsql/2013-03-12/iterate-clsql-20130312-http.tgz"; + url = "https://beta.quicklisp.org/archive/iterate-clsql/2013-03-12/iterate-clsql-20130312-http.tgz"; sha256 = "0adfs31zin5kkg9z5kyzykf8gmcgr600vvi4mjx7nixybh326h3h"; system = "iterate-clsql"; asd = "iterate-clsql"; @@ -63851,7 +64676,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ixf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-ixf/2018-02-28/cl-ixf-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ixf/2018-02-28/cl-ixf-20180228-git.tgz"; sha256 = "1wjdnf4vr9z7lcfc49kl43g6l2i23q9n81siy494k17d766cdvqa"; system = "ixf"; asd = "ixf"; @@ -63879,7 +64704,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "jenkins.api" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/jenkins/2013-03-12/jenkins-20130312-git.tgz"; + url = "https://beta.quicklisp.org/archive/jenkins/2013-03-12/jenkins-20130312-git.tgz"; sha256 = "1kis95k3fwlaq2jbpia0wps4gq461w6p57dxlbvb0c6a5dgh4dwf"; system = "jenkins.api"; asd = "jenkins.api"; @@ -63907,12 +64732,12 @@ lib.makeScope pkgs.newScope (self: { jingle = ( build-asdf-system { pname = "jingle"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "jingle" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-jingle/2023-10-21/cl-jingle-20231021-git.tgz"; - sha256 = "0g64y9nzkdrb2yjp0lvhfc0qm3595n6w76hk9hd1v0ril78vzybc"; + url = "https://beta.quicklisp.org/archive/cl-jingle/2025-06-22/cl-jingle-20250622-git.tgz"; + sha256 = "1rvv7a3qwm0wliszinkv7acscyqf099h6xl81c40is67zw42azd4"; system = "jingle"; asd = "jingle"; } @@ -63941,12 +64766,12 @@ lib.makeScope pkgs.newScope (self: { jingle_dot_demo = ( build-asdf-system { pname = "jingle.demo"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "jingle.demo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-jingle/2023-10-21/cl-jingle-20231021-git.tgz"; - sha256 = "0g64y9nzkdrb2yjp0lvhfc0qm3595n6w76hk9hd1v0ril78vzybc"; + url = "https://beta.quicklisp.org/archive/cl-jingle/2025-06-22/cl-jingle-20250622-git.tgz"; + sha256 = "1rvv7a3qwm0wliszinkv7acscyqf099h6xl81c40is67zw42azd4"; system = "jingle.demo"; asd = "jingle.demo"; } @@ -63972,12 +64797,12 @@ lib.makeScope pkgs.newScope (self: { jingle_dot_demo_dot_test = ( build-asdf-system { pname = "jingle.demo.test"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "jingle.demo.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-jingle/2023-10-21/cl-jingle-20231021-git.tgz"; - sha256 = "0g64y9nzkdrb2yjp0lvhfc0qm3595n6w76hk9hd1v0ril78vzybc"; + url = "https://beta.quicklisp.org/archive/cl-jingle/2025-06-22/cl-jingle-20250622-git.tgz"; + sha256 = "1rvv7a3qwm0wliszinkv7acscyqf099h6xl81c40is67zw42azd4"; system = "jingle.demo.test"; asd = "jingle.demo.test"; } @@ -63995,12 +64820,12 @@ lib.makeScope pkgs.newScope (self: { jingle_dot_test = ( build-asdf-system { pname = "jingle.test"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "jingle.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-jingle/2023-10-21/cl-jingle-20231021-git.tgz"; - sha256 = "0g64y9nzkdrb2yjp0lvhfc0qm3595n6w76hk9hd1v0ril78vzybc"; + url = "https://beta.quicklisp.org/archive/cl-jingle/2025-06-22/cl-jingle-20250622-git.tgz"; + sha256 = "1rvv7a3qwm0wliszinkv7acscyqf099h6xl81c40is67zw42azd4"; system = "jingle.test"; asd = "jingle.test"; } @@ -64022,7 +64847,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "jingoh" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r"; system = "jingoh"; asd = "jingoh"; @@ -64048,7 +64873,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "jingoh.documentizer" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r"; system = "jingoh.documentizer"; asd = "jingoh.documentizer"; @@ -64074,7 +64899,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "jingoh.documentizer.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r"; system = "jingoh.documentizer.test"; asd = "jingoh.documentizer.test"; @@ -64097,7 +64922,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "jingoh.examiner" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r"; system = "jingoh.examiner"; asd = "jingoh.examiner"; @@ -64122,7 +64947,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "jingoh.examiner.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r"; system = "jingoh.examiner.test"; asd = "jingoh.examiner.test"; @@ -64146,7 +64971,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "jingoh.generator" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r"; system = "jingoh.generator"; asd = "jingoh.generator"; @@ -64176,7 +65001,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "jingoh.generator.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r"; system = "jingoh.generator.test"; asd = "jingoh.generator.test"; @@ -64199,7 +65024,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "jingoh.org" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r"; system = "jingoh.org"; asd = "jingoh.org"; @@ -64223,7 +65048,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "jingoh.org.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r"; system = "jingoh.org.test"; asd = "jingoh.org.test"; @@ -64246,7 +65071,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "jingoh.parallel" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r"; system = "jingoh.parallel"; asd = "jingoh.parallel"; @@ -64271,7 +65096,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "jingoh.parallel.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r"; system = "jingoh.parallel.test"; asd = "jingoh.parallel.test"; @@ -64294,7 +65119,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "jingoh.reader" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r"; system = "jingoh.reader"; asd = "jingoh.reader"; @@ -64319,7 +65144,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "jingoh.reader.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r"; system = "jingoh.reader.test"; asd = "jingoh.reader.test"; @@ -64342,7 +65167,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "jingoh.tester" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r"; system = "jingoh.tester"; asd = "jingoh.tester"; @@ -64375,7 +65200,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "jingoh.tester.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r"; system = "jingoh.tester.test"; asd = "jingoh.tester.test"; @@ -64398,7 +65223,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "jonathan" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/jonathan/2020-09-25/jonathan-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/jonathan/2020-09-25/jonathan-20200925-git.tgz"; sha256 = "1l4sfxfmijibsvkbszikzslw1yy8z52ml9may1w2s0ay7lg7rsng"; system = "jonathan"; asd = "jonathan"; @@ -64425,7 +65250,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "jonathan-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/jonathan/2020-09-25/jonathan-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/jonathan/2020-09-25/jonathan-20200925-git.tgz"; sha256 = "1l4sfxfmijibsvkbszikzslw1yy8z52ml9may1w2s0ay7lg7rsng"; system = "jonathan-test"; asd = "jonathan-test"; @@ -64446,12 +65271,12 @@ lib.makeScope pkgs.newScope (self: { jose = ( build-asdf-system { pname = "jose"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "jose" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/jose/2024-10-12/jose-20241012-git.tgz"; - sha256 = "1z7xjy4ihxa8ay5vznhnxkjflfx6xmfpgwxdakk9wmkw30p2yn4h"; + url = "https://beta.quicklisp.org/archive/jose/2025-06-22/jose-20250622-git.tgz"; + sha256 = "18xy51sqkdcyxd7my1nd9jdhzxc9g77x8bh8ycr0y5fmkvpzmmkv"; system = "jose"; asd = "jose"; } @@ -64461,8 +65286,8 @@ lib.makeScope pkgs.newScope (self: { (getAttr "alexandria" self) (getAttr "assoc-utils" self) (getAttr "cl-base64" self) + (getAttr "cl-json" self) (getAttr "ironclad" self) - (getAttr "jonathan" self) (getAttr "split-sequence" self) (getAttr "trivial-utf-8" self) ]; @@ -64474,12 +65299,12 @@ lib.makeScope pkgs.newScope (self: { journal = ( build-asdf-system { pname = "journal"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "journal" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/journal/2023-10-21/journal-20231021-git.tgz"; - sha256 = "0h55mi3n0cwsl3gb9v7xsl9jzq0x5fbv2s8a0haby7g9995jr98v"; + url = "https://beta.quicklisp.org/archive/journal/2025-06-22/journal-20250622-git.tgz"; + sha256 = "0flv7rikhgsm8074wmhi0wa16n9j5dcaif3xjm65ljmzj48m8qp1"; system = "journal"; asd = "journal"; } @@ -64505,7 +65330,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "jp-numeral" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/jp-numeral/2022-11-06/jp-numeral-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/jp-numeral/2022-11-06/jp-numeral-20221106-git.tgz"; sha256 = "1xqvah6mjd8lb2n19wzsn29q6az9kx1c48js3yj0ij73kjncby30"; system = "jp-numeral"; asd = "jp-numeral"; @@ -64528,7 +65353,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "jp-numeral-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/jp-numeral/2022-11-06/jp-numeral-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/jp-numeral/2022-11-06/jp-numeral-20221106-git.tgz"; sha256 = "1xqvah6mjd8lb2n19wzsn29q6az9kx1c48js3yj0ij73kjncby30"; system = "jp-numeral-test"; asd = "jp-numeral-test"; @@ -64552,7 +65377,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "jpeg-turbo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/jpeg-turbo/2020-12-20/jpeg-turbo-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/jpeg-turbo/2020-12-20/jpeg-turbo-20201220-git.tgz"; sha256 = "1andd1ibbk3224idnpsnrn96flr5d1wm9ja3di57fs04wn577sag"; system = "jpeg-turbo"; asd = "jpeg-turbo"; @@ -64575,7 +65400,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "jpl-queues" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/jpl-queues/2010-10-06/jpl-queues-0.1.tgz"; + url = "https://beta.quicklisp.org/archive/jpl-queues/2010-10-06/jpl-queues-0.1.tgz"; sha256 = "1xgddsfa1gr0cjmdlc304j3msxi8w2fyk9i497x56kmkif7pkj88"; system = "jpl-queues"; asd = "jpl-queues"; @@ -64596,7 +65421,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "jpl-util" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-jpl-util/2015-10-31/cl-jpl-util-20151031-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-jpl-util/2015-10-31/cl-jpl-util-20151031-git.tgz"; sha256 = "0nc0rk9n8grkg3045xsw34whmcmddn2sfrxki4268g7kpgz0d2yz"; system = "jpl-util"; asd = "jpl-util"; @@ -64614,7 +65439,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "js-parser" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/js-parser/2015-04-07/js-parser-20150407-git.tgz"; + url = "https://beta.quicklisp.org/archive/js-parser/2015-04-07/js-parser-20150407-git.tgz"; sha256 = "0hqw515vyhrv1as5sfn3l792ddjps85zbzpblr2cjyq9dmdrg89a"; system = "js-parser"; asd = "js-parser"; @@ -64634,7 +65459,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "js-parser-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/js-parser/2015-04-07/js-parser-20150407-git.tgz"; + url = "https://beta.quicklisp.org/archive/js-parser/2015-04-07/js-parser-20150407-git.tgz"; sha256 = "0hqw515vyhrv1as5sfn3l792ddjps85zbzpblr2cjyq9dmdrg89a"; system = "js-parser-tests"; asd = "js-parser-tests"; @@ -64654,7 +65479,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "json-lib" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/json-lib/2023-06-18/json-lib-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/json-lib/2023-06-18/json-lib-20230618-git.tgz"; sha256 = "08cbnj6h53ifwm6kk5pvpxmy2a11kiph9zjccd2ml3fj6257krpv"; system = "json-lib"; asd = "json-lib"; @@ -64680,7 +65505,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "json-mop" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/json-mop/2024-10-12/json-mop-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/json-mop/2024-10-12/json-mop-20241012-git.tgz"; sha256 = "1q6mmq64hf4v448bnzfh8nxsxg5h18a9snh785r1fnvv1aij3fi1"; system = "json-mop"; asd = "json-mop"; @@ -64704,7 +65529,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "json-mop-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/json-mop/2024-10-12/json-mop-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/json-mop/2024-10-12/json-mop-20241012-git.tgz"; sha256 = "1q6mmq64hf4v448bnzfh8nxsxg5h18a9snh785r1fnvv1aij3fi1"; system = "json-mop-tests"; asd = "json-mop-tests"; @@ -64727,7 +65552,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "json-responses" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/json-responses/2019-03-07/json-responses-20190307-hg.tgz"; + url = "https://beta.quicklisp.org/archive/json-responses/2019-03-07/json-responses-20190307-hg.tgz"; sha256 = "0f1hrs3rhi6qn0r8qd3fbsknn417b8v8b4s4989yfwfvnf922g05"; system = "json-responses"; asd = "json-responses"; @@ -64750,7 +65575,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "json-responses-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/json-responses/2019-03-07/json-responses-20190307-hg.tgz"; + url = "https://beta.quicklisp.org/archive/json-responses/2019-03-07/json-responses-20190307-hg.tgz"; sha256 = "0f1hrs3rhi6qn0r8qd3fbsknn417b8v8b4s4989yfwfvnf922g05"; system = "json-responses-test"; asd = "json-responses"; @@ -64773,7 +65598,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "json-schema" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/json-schema/2022-11-06/json-schema-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/json-schema/2022-11-06/json-schema-20221106-git.tgz"; sha256 = "11rgnj14p8x059zx8hs02jji1p69v8kix783vf557zpcbydrw2mn"; system = "json-schema"; asd = "json-schema"; @@ -64806,7 +65631,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "json-streams" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/json-streams/2017-10-19/json-streams-20171019-git.tgz"; + url = "https://beta.quicklisp.org/archive/json-streams/2017-10-19/json-streams-20171019-git.tgz"; sha256 = "0cia3721im04q73dfkd688d8splgpz03qa4h8s3r39kar4w3xll2"; system = "json-streams"; asd = "json-streams"; @@ -64826,7 +65651,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "json-streams-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/json-streams/2017-10-19/json-streams-20171019-git.tgz"; + url = "https://beta.quicklisp.org/archive/json-streams/2017-10-19/json-streams-20171019-git.tgz"; sha256 = "0cia3721im04q73dfkd688d8splgpz03qa4h8s3r39kar4w3xll2"; system = "json-streams-tests"; asd = "json-streams-tests"; @@ -64850,7 +65675,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "json-test-suite" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rs-json/2023-06-18/rs-json-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/rs-json/2023-06-18/rs-json-20230618-git.tgz"; sha256 = "0y71as0sg5vfijpzdhv6pj6yv064ldn2shx0y4da8kvaqv949dnq"; system = "json-test-suite"; asd = "json-test-suite"; @@ -64866,12 +65691,12 @@ lib.makeScope pkgs.newScope (self: { jsonrpc = ( build-asdf-system { pname = "jsonrpc"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "jsonrpc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/jsonrpc/2024-10-12/jsonrpc-20241012-git.tgz"; - sha256 = "1wsc6bv8xpzad0lgrlldzrpb9r4aksnw7ss2ifwa7ykbzfxcr8gi"; + url = "https://beta.quicklisp.org/archive/jsonrpc/2025-06-22/jsonrpc-20250622-git.tgz"; + sha256 = "0kd550fsklsc4h0fj8jl6g4z5ldb8ba9dn68s7ykv3myaiwgsy1p"; system = "jsonrpc"; asd = "jsonrpc"; } @@ -64899,7 +65724,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "jsown" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/jsown/2020-02-18/jsown-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/jsown/2020-02-18/jsown-20200218-git.tgz"; sha256 = "0gadvmf1d9bq35s61z76psrsnzwwk12svi66jigf491hv48wigw7"; system = "jsown"; asd = "jsown"; @@ -64917,7 +65742,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "jsown-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/jsown/2020-02-18/jsown-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/jsown/2020-02-18/jsown-20200218-git.tgz"; sha256 = "0gadvmf1d9bq35s61z76psrsnzwwk12svi66jigf491hv48wigw7"; system = "jsown-tests"; asd = "jsown-tests"; @@ -64940,7 +65765,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "jsown-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/jsown-utils/2022-07-07/jsown-utils-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/jsown-utils/2022-07-07/jsown-utils-20220707-git.tgz"; sha256 = "046a18fywkim0jbnpls5zqdv65j1kwl268p4dbdd2dxgx050fwak"; system = "jsown-utils"; asd = "jsown-utils"; @@ -64959,12 +65784,12 @@ lib.makeScope pkgs.newScope (self: { jupyter-lab-extension = ( build-asdf-system { pname = "jupyter-lab-extension"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "jupyter-lab-extension" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/common-lisp-jupyter/2024-10-12/common-lisp-jupyter-20241012-git.tgz"; - sha256 = "1qbrzv0myxfxq7rzm2y9cm2xymkl982982h2kbsl7d1yd5hrjvl6"; + url = "https://beta.quicklisp.org/archive/common-lisp-jupyter/2025-06-22/common-lisp-jupyter-20250622-git.tgz"; + sha256 = "0xm3a68dn3mlq4gyiqfndf61agh1bj5fp1cqhsscz53zjcnrb2yb"; system = "jupyter-lab-extension"; asd = "jupyter-lab-extension"; } @@ -64983,7 +65808,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "just-getopt-parser" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-just-getopt-parser/2021-12-09/cl-just-getopt-parser-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-just-getopt-parser/2021-12-09/cl-just-getopt-parser-20211209-git.tgz"; sha256 = "0ngh8b51ngh3bqacl40j6wwiinhwxswsy02d9k7qlzv9sbjxay4s"; system = "just-getopt-parser"; asd = "just-getopt-parser"; @@ -65003,7 +65828,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "jwacs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/jwacs/2018-02-28/jwacs-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/jwacs/2018-02-28/jwacs-20180228-git.tgz"; sha256 = "1wzln3bjjmdv040i339dsm48a1sc2cnwhh4z066x2wkl5ka7j5b2"; system = "jwacs"; asd = "jwacs"; @@ -65023,7 +65848,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "jwacs-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/jwacs/2018-02-28/jwacs-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/jwacs/2018-02-28/jwacs-20180228-git.tgz"; sha256 = "1wzln3bjjmdv040i339dsm48a1sc2cnwhh4z066x2wkl5ka7j5b2"; system = "jwacs-tests"; asd = "jwacs-tests"; @@ -65043,7 +65868,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "kanren-trs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-kanren-trs/2012-03-05/cl-kanren-trs-20120305-svn.tgz"; + url = "https://beta.quicklisp.org/archive/cl-kanren-trs/2012-03-05/cl-kanren-trs-20120305-svn.tgz"; sha256 = "1r9xyickdkkqcaa7abvks4hqwjb7s95lcrym026c1w6ciibiypr7"; system = "kanren-trs"; asd = "kanren-trs"; @@ -65063,7 +65888,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "kanren-trs-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-kanren-trs/2012-03-05/cl-kanren-trs-20120305-svn.tgz"; + url = "https://beta.quicklisp.org/archive/cl-kanren-trs/2012-03-05/cl-kanren-trs-20120305-svn.tgz"; sha256 = "1r9xyickdkkqcaa7abvks4hqwjb7s95lcrym026c1w6ciibiypr7"; system = "kanren-trs-test"; asd = "kanren-trs-test"; @@ -65083,7 +65908,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "kaputt" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-kaputt/2022-11-06/cl-kaputt-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-kaputt/2022-11-06/cl-kaputt-20221106-git.tgz"; sha256 = "1jd9lmdzkjm6mawsxczg6czyv7zbmaplq0ikmda0ysh4aq3apnnj"; system = "kaputt"; asd = "kaputt"; @@ -65103,7 +65928,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "kdl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/kdlcl/2023-06-18/kdlcl-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/kdlcl/2023-06-18/kdlcl-20230618-git.tgz"; sha256 = "0bqqxkd6s420ld2hmhvbbvpzss0m2kimmxaqhz7j1ksmq86bvvmj"; system = "kdl"; asd = "kdl"; @@ -65126,7 +65951,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "kdtree-jk" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/kdtree-jk/2023-06-18/kdtree-jk-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/kdtree-jk/2023-06-18/kdtree-jk-20230618-git.tgz"; sha256 = "0l311lmwp4sminl0k534s1kvfwmlk56bfnj7367zd7jl0hvs06ck"; system = "kdtree-jk"; asd = "kdtree-jk"; @@ -65146,7 +65971,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "kebab" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/kebab/2015-06-08/kebab-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/kebab/2015-06-08/kebab-20150608-git.tgz"; sha256 = "0j5haabnvj0vz0rx9mwyfsb3qzpga9nickbjw8xs6vypkdzlqv1b"; system = "kebab"; asd = "kebab"; @@ -65171,7 +65996,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "kebab-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/kebab/2015-06-08/kebab-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/kebab/2015-06-08/kebab-20150608-git.tgz"; sha256 = "0j5haabnvj0vz0rx9mwyfsb3qzpga9nickbjw8xs6vypkdzlqv1b"; system = "kebab-test"; asd = "kebab-test"; @@ -65195,7 +66020,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "kekule-clj" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/kekule-clj/2023-10-21/kekule-clj-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/kekule-clj/2023-10-21/kekule-clj-20231021-git.tgz"; sha256 = "1901b11ilknd4gy7r5b00yq6syb6qsh0xalkdw4g0dqzvqqxnfj5"; system = "kekule-clj"; asd = "kekule-clj"; @@ -65214,12 +66039,12 @@ lib.makeScope pkgs.newScope (self: { kenzo = ( build-asdf-system { pname = "kenzo"; - version = "20200325-git"; + version = "20250622-git"; asds = [ "kenzo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/kenzo/2020-03-25/kenzo-20200325-git.tgz"; - sha256 = "0dg70p5pxvx2ksr66z3p2nkxxwkjd852pkckr15j6cwfaji9fr8r"; + url = "https://beta.quicklisp.org/archive/kenzo/2025-06-22/kenzo-20250622-git.tgz"; + sha256 = "10wpjg76vb0rxkid6v5s6dnwamipd5lsjf3nxk40g1n6isf4jf0l"; system = "kenzo"; asd = "kenzo"; } @@ -65234,12 +66059,12 @@ lib.makeScope pkgs.newScope (self: { kenzo-test = ( build-asdf-system { pname = "kenzo-test"; - version = "20200325-git"; + version = "20250622-git"; asds = [ "kenzo-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/kenzo/2020-03-25/kenzo-20200325-git.tgz"; - sha256 = "0dg70p5pxvx2ksr66z3p2nkxxwkjd852pkckr15j6cwfaji9fr8r"; + url = "https://beta.quicklisp.org/archive/kenzo/2025-06-22/kenzo-20250622-git.tgz"; + sha256 = "10wpjg76vb0rxkid6v5s6dnwamipd5lsjf3nxk40g1n6isf4jf0l"; system = "kenzo-test"; asd = "kenzo-test"; } @@ -65261,7 +66086,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "keystone" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/keystone/2020-04-27/keystone-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/keystone/2020-04-27/keystone-20200427-git.tgz"; sha256 = "04fczbkihf87qyp9f1sv45h69xrvdmcmxkv4m868q8zqw6z48hlj"; system = "keystone"; asd = "keystone"; @@ -65283,129 +66108,129 @@ lib.makeScope pkgs.newScope (self: { khazern = ( build-asdf-system { pname = "khazern"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "khazern" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/khazern/2024-10-12/khazern-20241012-git.tgz"; - sha256 = "1kc15gc0kahp8w9qfyb4yr1gnwqhk8dcvi5gm678bsnbqipaj30h"; + url = "https://beta.quicklisp.org/archive/khazern/2025-06-22/khazern-20250622-git.tgz"; + sha256 = "1z13bds8hdgwncmhl1pbsp341wch6yks8mfgmy3nw9agwfnkpa0d"; system = "khazern"; asd = "khazern"; } ); systems = [ "khazern" ]; - lispLibs = [ (getAttr "acclimation" self) ]; + lispLibs = [ + (getAttr "acclimation" self) + (getAttr "trivial-with-current-source-form" self) + ]; meta = { hydraPlatforms = [ ]; }; } ); - khazern-extrinsic = ( + khazern-extension = ( build-asdf-system { - pname = "khazern-extrinsic"; - version = "20241012-git"; - asds = [ "khazern-extrinsic" ]; + pname = "khazern-extension"; + version = "20250622-git"; + asds = [ "khazern-extension" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/khazern/2024-10-12/khazern-20241012-git.tgz"; - sha256 = "1kc15gc0kahp8w9qfyb4yr1gnwqhk8dcvi5gm678bsnbqipaj30h"; - system = "khazern-extrinsic"; - asd = "khazern-extrinsic"; + url = "https://beta.quicklisp.org/archive/khazern/2025-06-22/khazern-20250622-git.tgz"; + sha256 = "1z13bds8hdgwncmhl1pbsp341wch6yks8mfgmy3nw9agwfnkpa0d"; + system = "khazern-extension"; + asd = "khazern-extension"; } ); - systems = [ "khazern-extrinsic" ]; + systems = [ "khazern-extension" ]; lispLibs = [ (getAttr "khazern" self) ]; meta = { hydraPlatforms = [ ]; }; } ); - khazern-intrinsic = ( + khazern-extension-extrinsic = ( build-asdf-system { - pname = "khazern-intrinsic"; - version = "20241012-git"; - asds = [ "khazern-intrinsic" ]; + pname = "khazern-extension-extrinsic"; + version = "20250622-git"; + asds = [ "khazern-extension-extrinsic" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/khazern/2024-10-12/khazern-20241012-git.tgz"; - sha256 = "1kc15gc0kahp8w9qfyb4yr1gnwqhk8dcvi5gm678bsnbqipaj30h"; - system = "khazern-intrinsic"; - asd = "khazern-intrinsic"; + url = "https://beta.quicklisp.org/archive/khazern/2025-06-22/khazern-20250622-git.tgz"; + sha256 = "1z13bds8hdgwncmhl1pbsp341wch6yks8mfgmy3nw9agwfnkpa0d"; + system = "khazern-extension-extrinsic"; + asd = "khazern-extension-extrinsic"; } ); - systems = [ "khazern-intrinsic" ]; + systems = [ "khazern-extension-extrinsic" ]; lispLibs = [ - (getAttr "khazern" self) - (getAttr "trivial-package-locks" self) + (getAttr "khazern-extension" self) + (getAttr "khazern-extrinsic" self) ]; meta = { hydraPlatforms = [ ]; }; } ); - khazern-sequence = ( + khazern-extension-intrinsic = ( build-asdf-system { - pname = "khazern-sequence"; - version = "20241012-git"; - asds = [ "khazern-sequence" ]; + pname = "khazern-extension-intrinsic"; + version = "20250622-git"; + asds = [ "khazern-extension-intrinsic" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/khazern/2024-10-12/khazern-20241012-git.tgz"; - sha256 = "1kc15gc0kahp8w9qfyb4yr1gnwqhk8dcvi5gm678bsnbqipaj30h"; - system = "khazern-sequence"; - asd = "khazern-sequence"; + url = "https://beta.quicklisp.org/archive/khazern/2025-06-22/khazern-20250622-git.tgz"; + sha256 = "1z13bds8hdgwncmhl1pbsp341wch6yks8mfgmy3nw9agwfnkpa0d"; + system = "khazern-extension-intrinsic"; + asd = "khazern-extension-intrinsic"; } ); - systems = [ "khazern-sequence" ]; + systems = [ "khazern-extension-intrinsic" ]; lispLibs = [ - (getAttr "khazern" self) - (getAttr "trivial-extensible-sequences" self) + (getAttr "khazern-extension" self) + (getAttr "khazern-intrinsic" self) ]; meta = { hydraPlatforms = [ ]; }; } ); - khazern-sequence-extrinsic = ( + khazern-extrinsic = ( build-asdf-system { - pname = "khazern-sequence-extrinsic"; - version = "20241012-git"; - asds = [ "khazern-sequence-extrinsic" ]; + pname = "khazern-extrinsic"; + version = "20250622-git"; + asds = [ "khazern-extrinsic" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/khazern/2024-10-12/khazern-20241012-git.tgz"; - sha256 = "1kc15gc0kahp8w9qfyb4yr1gnwqhk8dcvi5gm678bsnbqipaj30h"; - system = "khazern-sequence-extrinsic"; - asd = "khazern-sequence-extrinsic"; + url = "https://beta.quicklisp.org/archive/khazern/2025-06-22/khazern-20250622-git.tgz"; + sha256 = "1z13bds8hdgwncmhl1pbsp341wch6yks8mfgmy3nw9agwfnkpa0d"; + system = "khazern-extrinsic"; + asd = "khazern-extrinsic"; } ); - systems = [ "khazern-sequence-extrinsic" ]; - lispLibs = [ - (getAttr "khazern-extrinsic" self) - (getAttr "khazern-sequence" self) - ]; + systems = [ "khazern-extrinsic" ]; + lispLibs = [ (getAttr "khazern" self) ]; meta = { hydraPlatforms = [ ]; }; } ); - khazern-sequence-intrinsic = ( + khazern-intrinsic = ( build-asdf-system { - pname = "khazern-sequence-intrinsic"; - version = "20241012-git"; - asds = [ "khazern-sequence-intrinsic" ]; + pname = "khazern-intrinsic"; + version = "20250622-git"; + asds = [ "khazern-intrinsic" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/khazern/2024-10-12/khazern-20241012-git.tgz"; - sha256 = "1kc15gc0kahp8w9qfyb4yr1gnwqhk8dcvi5gm678bsnbqipaj30h"; - system = "khazern-sequence-intrinsic"; - asd = "khazern-sequence-intrinsic"; + url = "https://beta.quicklisp.org/archive/khazern/2025-06-22/khazern-20250622-git.tgz"; + sha256 = "1z13bds8hdgwncmhl1pbsp341wch6yks8mfgmy3nw9agwfnkpa0d"; + system = "khazern-intrinsic"; + asd = "khazern-intrinsic"; } ); - systems = [ "khazern-sequence-intrinsic" ]; + systems = [ "khazern-intrinsic" ]; lispLibs = [ - (getAttr "khazern-intrinsic" self) - (getAttr "khazern-sequence" self) + (getAttr "khazern" self) + (getAttr "trivial-package-locks" self) ]; meta = { hydraPlatforms = [ ]; @@ -65419,7 +66244,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "kl-verify" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/kl-verify/2012-09-09/kl-verify-20120909-git.tgz"; + url = "https://beta.quicklisp.org/archive/kl-verify/2012-09-09/kl-verify-20120909-git.tgz"; sha256 = "1m5jyvvfb24idw0xzi92diyrygmq638dwxg0sl247yyvmwsqb8yj"; system = "kl-verify"; asd = "kl-verify"; @@ -65439,7 +66264,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "km" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/km/2011-05-22/km-2-5-33.tgz"; + url = "https://beta.quicklisp.org/archive/km/2011-05-22/km-2-5-33.tgz"; sha256 = "0vl4g7vg20l14xc1b5g1d0scak6ck5028q5s5c75pr8fp15m7wyb"; system = "km"; asd = "km"; @@ -65459,7 +66284,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "kmrcl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/kmrcl/2020-10-16/kmrcl-20201016-git.tgz"; + url = "https://beta.quicklisp.org/archive/kmrcl/2020-10-16/kmrcl-20201016-git.tgz"; sha256 = "06gx04mah5nc8w78s0j8628divbf1s5w7af8w7pvzb2d5mgvrbd2"; system = "kmrcl"; asd = "kmrcl"; @@ -65473,12 +66298,12 @@ lib.makeScope pkgs.newScope (self: { knx-conn = ( build-asdf-system { pname = "knx-conn"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "knx-conn" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/knx-conn/2024-10-12/knx-conn-20241012-git.tgz"; - sha256 = "1zq716fr1mq096hbpndfawyi1a7pr6gsyxnv2g1b00vpgyf37c4r"; + url = "https://beta.quicklisp.org/archive/knx-conn/2025-06-22/knx-conn-20250622-git.tgz"; + sha256 = "0vs31sipx6drd0hs0n9lggaz282br6d3yya5rnvssmv471wqrbsf"; system = "knx-conn"; asd = "knx-conn"; } @@ -65505,7 +66330,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "l-math" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/l-math/2019-03-07/l-math-20190307-git.tgz"; + url = "https://beta.quicklisp.org/archive/l-math/2019-03-07/l-math-20190307-git.tgz"; sha256 = "12nhj1hrvgvmichrjf46fi0f1lzrjajw7k9i1f6qycnnqw45qan1"; system = "l-math"; asd = "l-math"; @@ -65525,7 +66350,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "l-system" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/l-system/2018-02-28/l-system-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/l-system/2018-02-28/l-system-20180228-git.tgz"; sha256 = "1zvd90s7y936bx7sirc38vs8r2rs62064ndj06ahrc38vagv4qwd"; system = "l-system"; asd = "l-system"; @@ -65545,7 +66370,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "l-system-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/l-system/2018-02-28/l-system-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/l-system/2018-02-28/l-system-20180228-git.tgz"; sha256 = "1zvd90s7y936bx7sirc38vs8r2rs62064ndj06ahrc38vagv4qwd"; system = "l-system-examples"; asd = "l-system-examples"; @@ -65565,7 +66390,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "laap" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/laap/2017-08-30/laap-20170830-git.tgz"; + url = "https://beta.quicklisp.org/archive/laap/2017-08-30/laap-20170830-git.tgz"; sha256 = "0rzjdi4qcv2l99mk4bk94xlpfx1mav0kvd7crpax7dx4dfwkq8k5"; system = "laap"; asd = "laap"; @@ -65586,12 +66411,12 @@ lib.makeScope pkgs.newScope (self: { lack = ( build-asdf-system { pname = "lack"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "lack" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; - sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; + url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; + sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; system = "lack"; asd = "lack"; } @@ -65607,12 +66432,12 @@ lib.makeScope pkgs.newScope (self: { lack-app-directory = ( build-asdf-system { pname = "lack-app-directory"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "lack-app-directory" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; - sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; + url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; + sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; system = "lack-app-directory"; asd = "lack-app-directory"; } @@ -65633,12 +66458,12 @@ lib.makeScope pkgs.newScope (self: { lack-app-file = ( build-asdf-system { pname = "lack-app-file"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "lack-app-file" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; - sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; + url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; + sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; system = "lack-app-file"; asd = "lack-app-file"; } @@ -65658,12 +66483,12 @@ lib.makeScope pkgs.newScope (self: { lack-component = ( build-asdf-system { pname = "lack-component"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "lack-component" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; - sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; + url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; + sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; system = "lack-component"; asd = "lack-component"; } @@ -65676,12 +66501,12 @@ lib.makeScope pkgs.newScope (self: { lack-middleware-accesslog = ( build-asdf-system { pname = "lack-middleware-accesslog"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "lack-middleware-accesslog" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; - sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; + url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; + sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; system = "lack-middleware-accesslog"; asd = "lack-middleware-accesslog"; } @@ -65703,7 +66528,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lack-middleware-anypool" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/anypool/2024-10-12/anypool-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/anypool/2024-10-12/anypool-20241012-git.tgz"; sha256 = "1ffssc5fzh7gj0z94xxfb3mk5cwja65lrhxyfgib15a6yxqf1kk1"; system = "lack-middleware-anypool"; asd = "lack-middleware-anypool"; @@ -65719,12 +66544,12 @@ lib.makeScope pkgs.newScope (self: { lack-middleware-auth-basic = ( build-asdf-system { pname = "lack-middleware-auth-basic"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "lack-middleware-auth-basic" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; - sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; + url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; + sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; system = "lack-middleware-auth-basic"; asd = "lack-middleware-auth-basic"; } @@ -65742,12 +66567,12 @@ lib.makeScope pkgs.newScope (self: { lack-middleware-backtrace = ( build-asdf-system { pname = "lack-middleware-backtrace"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "lack-middleware-backtrace" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; - sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; + url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; + sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; system = "lack-middleware-backtrace"; asd = "lack-middleware-backtrace"; } @@ -65764,7 +66589,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lack-middleware-clack-errors" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clack-errors/2019-08-13/clack-errors-20190813-git.tgz"; + url = "https://beta.quicklisp.org/archive/clack-errors/2019-08-13/clack-errors-20190813-git.tgz"; sha256 = "0z6jyn37phnpq02l5wml8z0593g8ps95c0c2lzkhi3is2wcj9cpf"; system = "lack-middleware-clack-errors"; asd = "lack-middleware-clack-errors"; @@ -65780,12 +66605,12 @@ lib.makeScope pkgs.newScope (self: { lack-middleware-csrf = ( build-asdf-system { pname = "lack-middleware-csrf"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "lack-middleware-csrf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; - sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; + url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; + sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; system = "lack-middleware-csrf"; asd = "lack-middleware-csrf"; } @@ -65803,12 +66628,12 @@ lib.makeScope pkgs.newScope (self: { lack-middleware-dbpool = ( build-asdf-system { pname = "lack-middleware-dbpool"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "lack-middleware-dbpool" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; - sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; + url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; + sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; system = "lack-middleware-dbpool"; asd = "lack-middleware-dbpool"; } @@ -65826,12 +66651,12 @@ lib.makeScope pkgs.newScope (self: { lack-middleware-mito = ( build-asdf-system { pname = "lack-middleware-mito"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "lack-middleware-mito" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mito/2024-10-12/mito-20241012-git.tgz"; - sha256 = "0nz72qss2jji0narxffpnpfgz74grvhmwqqlydpw6wv3ji1rrrq3"; + url = "https://beta.quicklisp.org/archive/mito/2025-06-22/mito-20250622-git.tgz"; + sha256 = "17s00avmyy3ghzxb43hvjx2250w5b24vbcg2daf811qirl05s096"; system = "lack-middleware-mito"; asd = "lack-middleware-mito"; } @@ -65849,12 +66674,12 @@ lib.makeScope pkgs.newScope (self: { lack-middleware-mount = ( build-asdf-system { pname = "lack-middleware-mount"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "lack-middleware-mount" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; - sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; + url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; + sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; system = "lack-middleware-mount"; asd = "lack-middleware-mount"; } @@ -65869,12 +66694,12 @@ lib.makeScope pkgs.newScope (self: { lack-middleware-session = ( build-asdf-system { pname = "lack-middleware-session"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "lack-middleware-session" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; - sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; + url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; + sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; system = "lack-middleware-session"; asd = "lack-middleware-session"; } @@ -65895,12 +66720,12 @@ lib.makeScope pkgs.newScope (self: { lack-middleware-static = ( build-asdf-system { pname = "lack-middleware-static"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "lack-middleware-static" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; - sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; + url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; + sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; system = "lack-middleware-static"; asd = "lack-middleware-static"; } @@ -65919,12 +66744,12 @@ lib.makeScope pkgs.newScope (self: { lack-request = ( build-asdf-system { pname = "lack-request"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "lack-request" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; - sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; + url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; + sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; system = "lack-request"; asd = "lack-request"; } @@ -65944,12 +66769,12 @@ lib.makeScope pkgs.newScope (self: { lack-response = ( build-asdf-system { pname = "lack-response"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "lack-response" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; - sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; + url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; + sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; system = "lack-response"; asd = "lack-response"; } @@ -65967,12 +66792,12 @@ lib.makeScope pkgs.newScope (self: { lack-session-store-dbi = ( build-asdf-system { pname = "lack-session-store-dbi"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "lack-session-store-dbi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; - sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; + url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; + sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; system = "lack-session-store-dbi"; asd = "lack-session-store-dbi"; } @@ -65993,12 +66818,12 @@ lib.makeScope pkgs.newScope (self: { lack-session-store-redis = ( build-asdf-system { pname = "lack-session-store-redis"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "lack-session-store-redis" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; - sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; + url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; + sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; system = "lack-session-store-redis"; asd = "lack-session-store-redis"; } @@ -66019,12 +66844,12 @@ lib.makeScope pkgs.newScope (self: { lack-test = ( build-asdf-system { pname = "lack-test"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "lack-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; - sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; + url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; + sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; system = "lack-test"; asd = "lack-test"; } @@ -66044,12 +66869,12 @@ lib.makeScope pkgs.newScope (self: { lack-util = ( build-asdf-system { pname = "lack-util"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "lack-util" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; - sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; + url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; + sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; system = "lack-util"; asd = "lack-util"; } @@ -66065,12 +66890,12 @@ lib.makeScope pkgs.newScope (self: { lack-util-writer-stream = ( build-asdf-system { pname = "lack-util-writer-stream"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "lack-util-writer-stream" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; - sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; + url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; + sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; system = "lack-util-writer-stream"; asd = "lack-util-writer-stream"; } @@ -66092,7 +66917,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lake" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lake/2022-02-20/lake-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/lake/2022-02-20/lake-20220220-git.tgz"; sha256 = "1g6rr4d5vjx487ym5qjlnw5sd6rwx6l4zx1l9mj0j30lpm1k4il0"; system = "lake"; asd = "lake"; @@ -66118,7 +66943,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lake-cli" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lake/2022-02-20/lake-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/lake/2022-02-20/lake-20220220-git.tgz"; sha256 = "1g6rr4d5vjx487ym5qjlnw5sd6rwx6l4zx1l9mj0j30lpm1k4il0"; system = "lake-cli"; asd = "lake-cli"; @@ -66141,7 +66966,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lake-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lake/2022-02-20/lake-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/lake/2022-02-20/lake-20220220-git.tgz"; sha256 = "1g6rr4d5vjx487ym5qjlnw5sd6rwx6l4zx1l9mj0j30lpm1k4il0"; system = "lake-test"; asd = "lake-test"; @@ -66161,12 +66986,12 @@ lib.makeScope pkgs.newScope (self: { lambda-fiddle = ( build-asdf-system { pname = "lambda-fiddle"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "lambda-fiddle" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lambda-fiddle/2023-10-21/lambda-fiddle-20231021-git.tgz"; - sha256 = "1hh0192qvymn3zwy9a0rsg98wgb8mnb9z2jzl2a2n1ssvpx61gpj"; + url = "https://beta.quicklisp.org/archive/lambda-fiddle/2025-06-22/lambda-fiddle-20250622-git.tgz"; + sha256 = "0ka9av9806qlj2blnf4k55fma3xvc8zksnqwc60g5hv20y858c1p"; system = "lambda-fiddle"; asd = "lambda-fiddle"; } @@ -66183,7 +67008,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lambda-reader" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lambda-reader/2017-01-24/lambda-reader-20170124-git.tgz"; + url = "https://beta.quicklisp.org/archive/lambda-reader/2017-01-24/lambda-reader-20170124-git.tgz"; sha256 = "0s73nrnvr0d2ql1gabcasmfnckzq0f2qs9317hv2mrrh0q1giq1w"; system = "lambda-reader"; asd = "lambda-reader"; @@ -66203,7 +67028,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lambda-reader-8bit" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lambda-reader/2017-01-24/lambda-reader-20170124-git.tgz"; + url = "https://beta.quicklisp.org/archive/lambda-reader/2017-01-24/lambda-reader-20170124-git.tgz"; sha256 = "0s73nrnvr0d2ql1gabcasmfnckzq0f2qs9317hv2mrrh0q1giq1w"; system = "lambda-reader-8bit"; asd = "lambda-reader-8bit"; @@ -66226,7 +67051,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lambdalite" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lambdalite/2014-12-17/lambdalite-20141217-git.tgz"; + url = "https://beta.quicklisp.org/archive/lambdalite/2014-12-17/lambdalite-20141217-git.tgz"; sha256 = "0bvhix74afak5bpaa4x3p1b7gskpvzvw78aqkml9d40gpd1ky8lh"; system = "lambdalite"; asd = "lambdalite"; @@ -66245,12 +67070,12 @@ lib.makeScope pkgs.newScope (self: { language-codes = ( build-asdf-system { pname = "language-codes"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "language-codes" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/language-codes/2023-10-21/language-codes-20231021-git.tgz"; - sha256 = "0qbv0x0w415m48c6gjaw7ncnb1446q9sswr2p3svx7ijiwd19kja"; + url = "https://beta.quicklisp.org/archive/language-codes/2025-06-22/language-codes-20250622-git.tgz"; + sha256 = "00wlfnazvfl3kl7wls4vig1v6dg45z5k1ax0v512i3x63kvxr7bb"; system = "language-codes"; asd = "language-codes"; } @@ -66262,29 +67087,6 @@ lib.makeScope pkgs.newScope (self: { }; } ); - langutils = ( - build-asdf-system { - pname = "langutils"; - version = "20121125-git"; - asds = [ "langutils" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/cl-langutils/2012-11-25/cl-langutils-20121125-git.tgz"; - sha256 = "15y9x5wkg3fqndc04w2sc650fnwimxp4gjgpv9xvvdm9x4v433x6"; - system = "langutils"; - asd = "langutils"; - } - ); - systems = [ "langutils" ]; - lispLibs = [ - (getAttr "s-xml-rpc" self) - (getAttr "stdutils" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); lapack = ( build-asdf-system { pname = "lapack"; @@ -66292,7 +67094,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lapack" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; system = "lapack"; asd = "lapack"; @@ -66313,12 +67115,12 @@ lib.makeScope pkgs.newScope (self: { lass = ( build-asdf-system { pname = "lass"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "lass" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lass/2024-10-12/lass-20241012-git.tgz"; - sha256 = "1b6a3v763i5fcdxczffd59kh4m73p4ilz6az85apd22apc8lr80z"; + url = "https://beta.quicklisp.org/archive/lass/2025-06-22/lass-20250622-git.tgz"; + sha256 = "0pj9p7asqaqjakjjn8i7k6lb9piakjxd8xa732c88q5qijbmvkb2"; system = "lass"; asd = "lass"; } @@ -66341,7 +67143,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lass-flexbox" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lass-flexbox/2016-02-08/lass-flexbox-20160208-git.tgz"; + url = "https://beta.quicklisp.org/archive/lass-flexbox/2016-02-08/lass-flexbox-20160208-git.tgz"; sha256 = "143rkff1ybi3b07qyzndxxndp7j4nw1biyp51rkl0yvsk85kj1jp"; system = "lass-flexbox"; asd = "lass-flexbox"; @@ -66361,7 +67163,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lass-flexbox-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lass-flexbox/2016-02-08/lass-flexbox-20160208-git.tgz"; + url = "https://beta.quicklisp.org/archive/lass-flexbox/2016-02-08/lass-flexbox-20160208-git.tgz"; sha256 = "143rkff1ybi3b07qyzndxxndp7j4nw1biyp51rkl0yvsk85kj1jp"; system = "lass-flexbox-test"; asd = "lass-flexbox-test"; @@ -66384,7 +67186,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lassie" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lassie/2014-07-13/lassie-20140713-git.tgz"; + url = "https://beta.quicklisp.org/archive/lassie/2014-07-13/lassie-20140713-git.tgz"; sha256 = "06ps25422ymp9n35745xhg3qsclfli52b7mxhw58wwz9q1v1n0rn"; system = "lassie"; asd = "lassie"; @@ -66404,7 +67206,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lastfm" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lastfm/2019-10-07/lastfm-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/lastfm/2019-10-07/lastfm-20191007-git.tgz"; sha256 = "1crg82fyzkm9a0czsf5vq6nwndg6gy7zqb2glbp3yaw6p2hrwkp4"; system = "lastfm"; asd = "lastfm"; @@ -66433,7 +67235,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "latex-table" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/latex-table/2018-03-28/latex-table-20180328-git.tgz"; + url = "https://beta.quicklisp.org/archive/latex-table/2018-03-28/latex-table-20180328-git.tgz"; sha256 = "04qqr62pdi7qs9p74a4a014l6sl6bk6hrlb7b7pknxx5c15xvcgv"; system = "latex-table"; asd = "latex-table"; @@ -66458,7 +67260,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "latter-day-paypal" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/latter-day-paypal/2022-11-06/latter-day-paypal-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/latter-day-paypal/2022-11-06/latter-day-paypal-20221106-git.tgz"; sha256 = "0a4xji2ymmr7s4gq0gc3bhbf62gwfs93ymmpvgsmb0afcsi5099q"; system = "latter-day-paypal"; asd = "latter-day-paypal"; @@ -66491,7 +67293,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lazy" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lazy/2020-09-25/lazy-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/lazy/2020-09-25/lazy-20200925-git.tgz"; sha256 = "0m099rwr7k17v984n4jnq4hadf19vza5qilxdyrr43scxbbrmw1n"; system = "lazy"; asd = "lazy"; @@ -66507,12 +67309,12 @@ lib.makeScope pkgs.newScope (self: { ledger = ( build-asdf-system { pname = "ledger"; - version = "master-fe503896-git"; + version = "master-5a621564-git"; asds = [ "ledger" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz"; - sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10"; + url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; + sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; system = "ledger"; asd = "ledger"; } @@ -66531,7 +67333,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "leech" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/bknr-web/2014-07-13/bknr-web-20140713-git.tgz"; + url = "https://beta.quicklisp.org/archive/bknr-web/2014-07-13/bknr-web-20140713-git.tgz"; sha256 = "1m73z0hv7qsc9yddrg8zs7n3zmn9h64v4d62239wrvfnmzqk75x2"; system = "leech"; asd = "leech"; @@ -66554,7 +67356,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "legion" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/legion/2023-10-21/legion-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/legion/2023-10-21/legion-20231021-git.tgz"; sha256 = "0mf29w6s45dwkjvvirqk7b87swb5wvaffgb836s6sx74wwdgyyk8"; system = "legion"; asd = "legion"; @@ -66578,7 +67380,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "legion-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/legion/2023-10-21/legion-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/legion/2023-10-21/legion-20231021-git.tgz"; sha256 = "0mf29w6s45dwkjvvirqk7b87swb5wvaffgb836s6sx74wwdgyyk8"; system = "legion-test"; asd = "legion-test"; @@ -66599,12 +67401,12 @@ lib.makeScope pkgs.newScope (self: { legit = ( build-asdf-system { pname = "legit"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "legit" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/legit/2023-10-21/legit-20231021-git.tgz"; - sha256 = "0jy021ywrbnkgbgb63ip6j7kr40m4wz2pz1v5ybn6xkkn6dyprsz"; + url = "https://beta.quicklisp.org/archive/legit/2025-06-22/legit-20250622-git.tgz"; + sha256 = "0k9jjng50d22i37vv3ag7f1j71yspr74n4akd4sw8mpyk7r66kh3"; system = "legit"; asd = "legit"; } @@ -66626,7 +67428,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lem-opengl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; system = "lem-opengl"; asd = "lem-opengl"; @@ -66652,18 +67454,19 @@ lib.makeScope pkgs.newScope (self: { lemmy-api = ( build-asdf-system { pname = "lemmy-api"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "lemmy-api" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lemmy-api/2024-10-12/lemmy-api-20241012-git.tgz"; - sha256 = "0krlf3zw4snpkgqb564xk82b1d0q2scqs05s1kalr773a5d801s7"; + url = "https://beta.quicklisp.org/archive/lemmy-api/2025-06-22/lemmy-api-20250622-git.tgz"; + sha256 = "1mbry0jv7zizvc23rz3h7428z65miccl1sanqa23d1xnlgjqvpbh"; system = "lemmy-api"; asd = "lemmy-api"; } ); systems = [ "lemmy-api" ]; lispLibs = [ + (getAttr "alexandria" self) (getAttr "closer-mop" self) (getAttr "dexador" self) ]; @@ -66672,26 +67475,6 @@ lib.makeScope pkgs.newScope (self: { }; } ); - lemmy-api-bindings-generator = ( - build-asdf-system { - pname = "lemmy-api-bindings-generator"; - version = "20241012-git"; - asds = [ "lemmy-api-bindings-generator" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/lemmy-api/2024-10-12/lemmy-api-20241012-git.tgz"; - sha256 = "0krlf3zw4snpkgqb564xk82b1d0q2scqs05s1kalr773a5d801s7"; - system = "lemmy-api-bindings-generator"; - asd = "lemmy-api-bindings-generator"; - } - ); - systems = [ "lemmy-api-bindings-generator" ]; - lispLibs = [ ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); lense = ( build-asdf-system { pname = "lense"; @@ -66699,7 +67482,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lense" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lense/2020-12-20/lense-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/lense/2020-12-20/lense-20201220-git.tgz"; sha256 = "0j11m93an38d1cl6b1kaaj5azhkn64wpiiprlj2c4cjfzrc32ffv"; system = "lense"; asd = "lense"; @@ -66723,7 +67506,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "let-over-lambda" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/let-over-lambda/2023-10-21/let-over-lambda-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/let-over-lambda/2023-10-21/let-over-lambda-20231021-git.tgz"; sha256 = "0inzbmxlx5cvvx1isv827c2zr4qixcb47n6l6qjvc11gnwihdfjf"; system = "let-over-lambda"; asd = "let-over-lambda"; @@ -66748,7 +67531,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "let-over-lambda-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/let-over-lambda/2023-10-21/let-over-lambda-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/let-over-lambda/2023-10-21/let-over-lambda-20231021-git.tgz"; sha256 = "0inzbmxlx5cvvx1isv827c2zr4qixcb47n6l6qjvc11gnwihdfjf"; system = "let-over-lambda-test"; asd = "let-over-lambda-test"; @@ -66773,7 +67556,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "let-plus" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/let-plus/2019-11-30/let-plus-20191130-git.tgz"; + url = "https://beta.quicklisp.org/archive/let-plus/2019-11-30/let-plus-20191130-git.tgz"; sha256 = "00c0nq6l4zb692rzsc9aliqzj3avrssfyz4bhxzl7f1jsz3m29jb"; system = "let-plus"; asd = "let-plus"; @@ -66794,7 +67577,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "letrec" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/letrec/2023-06-18/letrec-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/letrec/2023-06-18/letrec-20230618-git.tgz"; sha256 = "1iwpqrpjbapdxq37g2w65r966f5nhj5466wwvd7lb1jgb03kaghn"; system = "letrec"; asd = "letrec"; @@ -66810,12 +67593,12 @@ lib.makeScope pkgs.newScope (self: { letv = ( build-asdf-system { pname = "letv"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "letv" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/letv/2024-10-12/letv-20241012-git.tgz"; - sha256 = "000alkhqb2n47y6849pswp7dg9pd0wwgswfrcm0sm4bz3r7dyjx1"; + url = "https://beta.quicklisp.org/archive/letv/2025-06-22/letv-20250622-git.tgz"; + sha256 = "1hpqhrgrnf9rgy3dnvyl1q5wfa6xbb4x98qfymzgp8yfi1c9ic9w"; system = "letv"; asd = "letv"; } @@ -66834,7 +67617,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lev" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lev/2023-10-21/lev-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/lev/2023-10-21/lev-20231021-git.tgz"; sha256 = "1lr3lzghvl5mbg9cp66carmawbzg64yd8vyivf1df10vllc7ngd6"; system = "lev"; asd = "lev"; @@ -66855,7 +67638,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lev-config" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lev/2023-10-21/lev-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/lev/2023-10-21/lev-20231021-git.tgz"; sha256 = "1lr3lzghvl5mbg9cp66carmawbzg64yd8vyivf1df10vllc7ngd6"; system = "lev-config"; asd = "lev-config"; @@ -66875,7 +67658,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "leveldb" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/leveldb/2016-05-31/leveldb-20160531-git.tgz"; + url = "https://beta.quicklisp.org/archive/leveldb/2016-05-31/leveldb-20160531-git.tgz"; sha256 = "03i4qr3g8ga2vpc8qbnipan3i7y4809i036wppkkixcsbckslckv"; system = "leveldb"; asd = "leveldb"; @@ -66900,7 +67683,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "levenshtein" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/levenshtein/2010-10-06/levenshtein-1.0.tgz"; + url = "https://beta.quicklisp.org/archive/levenshtein/2010-10-06/levenshtein-1.0.tgz"; sha256 = "0b4hdv55qcjlh3ixy3fglvb90ggmm79nl02nxkly2ls6cd7rbf5i"; system = "levenshtein"; asd = "levenshtein"; @@ -66920,7 +67703,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lfarm-admin" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; sha256 = "10kfhfx26wmaa3hk3vc7hc2fzk0rl2xdjwk8ld36x6ivvd48jlkv"; system = "lfarm-admin"; asd = "lfarm-admin"; @@ -66943,7 +67726,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lfarm-client" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; sha256 = "10kfhfx26wmaa3hk3vc7hc2fzk0rl2xdjwk8ld36x6ivvd48jlkv"; system = "lfarm-client"; asd = "lfarm-client"; @@ -66965,7 +67748,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lfarm-common" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; sha256 = "10kfhfx26wmaa3hk3vc7hc2fzk0rl2xdjwk8ld36x6ivvd48jlkv"; system = "lfarm-common"; asd = "lfarm-common"; @@ -66989,7 +67772,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lfarm-gss" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; sha256 = "10kfhfx26wmaa3hk3vc7hc2fzk0rl2xdjwk8ld36x6ivvd48jlkv"; system = "lfarm-gss"; asd = "lfarm-gss"; @@ -67013,7 +67796,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lfarm-launcher" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; sha256 = "10kfhfx26wmaa3hk3vc7hc2fzk0rl2xdjwk8ld36x6ivvd48jlkv"; system = "lfarm-launcher"; asd = "lfarm-launcher"; @@ -67037,7 +67820,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lfarm-server" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; sha256 = "10kfhfx26wmaa3hk3vc7hc2fzk0rl2xdjwk8ld36x6ivvd48jlkv"; system = "lfarm-server"; asd = "lfarm-server"; @@ -67058,7 +67841,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lfarm-ssl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; sha256 = "10kfhfx26wmaa3hk3vc7hc2fzk0rl2xdjwk8ld36x6ivvd48jlkv"; system = "lfarm-ssl"; asd = "lfarm-ssl"; @@ -67079,7 +67862,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lfarm-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; sha256 = "10kfhfx26wmaa3hk3vc7hc2fzk0rl2xdjwk8ld36x6ivvd48jlkv"; system = "lfarm-test"; asd = "lfarm-test"; @@ -67097,6 +67880,32 @@ lib.makeScope pkgs.newScope (self: { }; } ); + lftp-wrapper = ( + build-asdf-system { + pname = "lftp-wrapper"; + version = "20250622-git"; + asds = [ "lftp-wrapper" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/lftp-wrapper/2025-06-22/lftp-wrapper-20250622-git.tgz"; + sha256 = "1k87nxiv74p7xnwgqzvqdz3va7rnvcbqccrs5sddzhyi9syhfwhv"; + system = "lftp-wrapper"; + asd = "lftp-wrapper"; + } + ); + systems = [ "lftp-wrapper" ]; + lispLibs = [ + (getAttr "log4cl" self) + (getAttr "secret-values" self) + (getAttr "str" self) + (getAttr "termp" self) + (getAttr "trivial-types" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); lhstats = ( build-asdf-system { pname = "lhstats"; @@ -67104,7 +67913,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lhstats" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lhstats/2012-01-07/lhstats-20120107-git.tgz"; + url = "https://beta.quicklisp.org/archive/lhstats/2012-01-07/lhstats-20120107-git.tgz"; sha256 = "1x8h37vm9yd0a2g7qzili673n1c3a9rzawq27rxyzjrggv9wdnlz"; system = "lhstats"; asd = "lhstats"; @@ -67124,7 +67933,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lib-helper" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-lib-helper/2024-10-12/cl-lib-helper-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-lib-helper/2024-10-12/cl-lib-helper-20241012-git.tgz"; sha256 = "11aq60cs510kx9gj709q3kkgddk8aqb32pdzyikr9jylig050wyk"; system = "lib-helper"; asd = "lib-helper"; @@ -67150,7 +67959,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lib-helper-test-system" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-lib-helper/2024-10-12/cl-lib-helper-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-lib-helper/2024-10-12/cl-lib-helper-20241012-git.tgz"; sha256 = "11aq60cs510kx9gj709q3kkgddk8aqb32pdzyikr9jylig050wyk"; system = "lib-helper-test-system"; asd = "lib-helper-test-system"; @@ -67170,7 +67979,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "libcmark" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-cmark/2024-10-12/cl-cmark-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-cmark/2024-10-12/cl-cmark-20241012-git.tgz"; sha256 = "1l4i530161ppfz0wn1da7g7dwf644ppp1afrq2p7qfkajm7dcfg5"; system = "libcmark"; asd = "libcmark"; @@ -67190,7 +67999,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "liblmdb" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/liblmdb/2017-08-30/liblmdb-20170830-git.tgz"; + url = "https://beta.quicklisp.org/archive/liblmdb/2017-08-30/liblmdb-20170830-git.tgz"; sha256 = "0484245fcbqza40n377qhsr2v838cih6pziav5vlnml1y0cgv62b"; system = "liblmdb"; asd = "liblmdb"; @@ -67210,7 +68019,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "libssh2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-libssh2/2016-05-31/cl-libssh2-20160531-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-libssh2/2016-05-31/cl-libssh2-20160531-git.tgz"; sha256 = "1f2zq30zli0gnawclpasxsajpn20cpyy9d3q9zpqyw1sfrsn0hmk"; system = "libssh2"; asd = "libssh2"; @@ -67239,7 +68048,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "libssh2.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-libssh2/2016-05-31/cl-libssh2-20160531-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-libssh2/2016-05-31/cl-libssh2-20160531-git.tgz"; sha256 = "1f2zq30zli0gnawclpasxsajpn20cpyy9d3q9zpqyw1sfrsn0hmk"; system = "libssh2.test"; asd = "libssh2.test"; @@ -67262,7 +68071,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "libusb-ffi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-libusb/2021-02-28/cl-libusb-20210228-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-libusb/2021-02-28/cl-libusb-20210228-git.tgz"; sha256 = "0kyzgcflwb85q58fgn82sp0bipnq5bprg5i4h0h3jxafqqyagbnk"; system = "libusb-ffi"; asd = "libusb-ffi"; @@ -67286,7 +68095,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lichat-ldap" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lichat-ldap/2023-10-21/lichat-ldap-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/lichat-ldap/2023-10-21/lichat-ldap-20231021-git.tgz"; sha256 = "1jgj5c0sgr4rw9vsjhz71k3ld7hp8fbbmzrn3g11fq8jl4c4iai1"; system = "lichat-ldap"; asd = "lichat-ldap"; @@ -67310,7 +68119,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lichat-protocol" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lichat-protocol/2024-10-12/lichat-protocol-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/lichat-protocol/2024-10-12/lichat-protocol-20241012-git.tgz"; sha256 = "0y8546aaf539jnl29r4a8sa975jak1ld4d62w2n1kp8s9nb80z11"; system = "lichat-protocol"; asd = "lichat-protocol"; @@ -67330,12 +68139,12 @@ lib.makeScope pkgs.newScope (self: { lichat-serverlib = ( build-asdf-system { pname = "lichat-serverlib"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "lichat-serverlib" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lichat-serverlib/2023-10-21/lichat-serverlib-20231021-git.tgz"; - sha256 = "04830z49lczgdf8gval4j3s0fp5p6pfgvy783mrkcdfal2dcwacq"; + url = "https://beta.quicklisp.org/archive/lichat-serverlib/2025-06-22/lichat-serverlib-20250622-git.tgz"; + sha256 = "1rai2r4ysrcj0wj3jwqc8yqn26nlm1vjm21imc1rvbqd5lprrc3b"; system = "lichat-serverlib"; asd = "lichat-serverlib"; } @@ -67355,12 +68164,12 @@ lib.makeScope pkgs.newScope (self: { lichat-tcp-client = ( build-asdf-system { pname = "lichat-tcp-client"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "lichat-tcp-client" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lichat-tcp-client/2024-10-12/lichat-tcp-client-20241012-git.tgz"; - sha256 = "1wwh396z7185nylrsz47b6l45hyfq6mjrm620fk5bsxr3jrzxs25"; + url = "https://beta.quicklisp.org/archive/lichat-tcp-client/2025-06-22/lichat-tcp-client-20250622-git.tgz"; + sha256 = "1d9zpcny7lqsmz5z1ssk09r3ncrf82mqlmxxcds03ijaaga117qv"; system = "lichat-tcp-client"; asd = "lichat-tcp-client"; } @@ -67383,12 +68192,12 @@ lib.makeScope pkgs.newScope (self: { lichat-tcp-server = ( build-asdf-system { pname = "lichat-tcp-server"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "lichat-tcp-server" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lichat-tcp-server/2023-10-21/lichat-tcp-server-20231021-git.tgz"; - sha256 = "18dys957iw678y6bqfq9x85m2bnb0ck8gr6l4b61vv3g2yl2w53y"; + url = "https://beta.quicklisp.org/archive/lichat-tcp-server/2025-06-22/lichat-tcp-server-20250622-git.tgz"; + sha256 = "00cvikcv560cgm4rzr1k9gm3i752i991g0z5ppsvbm79ay976gsf"; system = "lichat-tcp-server"; asd = "lichat-tcp-server"; } @@ -67410,12 +68219,12 @@ lib.makeScope pkgs.newScope (self: { lichat-ws-server = ( build-asdf-system { pname = "lichat-ws-server"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "lichat-ws-server" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lichat-ws-server/2023-10-21/lichat-ws-server-20231021-git.tgz"; - sha256 = "05vmc9b8b5igifm6lb5p3fssmny6ils7aimsizql3gay4nycvxgp"; + url = "https://beta.quicklisp.org/archive/lichat-ws-server/2025-06-22/lichat-ws-server-20250622-git.tgz"; + sha256 = "0cilzklkr24704s8g7m1i5bm2qwqpi7g63cqfkx1swrilzx77hg0"; system = "lichat-ws-server"; asd = "lichat-ws-server"; } @@ -67441,7 +68250,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lift" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lift/2023-10-21/lift-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/lift/2023-10-21/lift-20231021-git.tgz"; sha256 = "1513n46fkqw8rnvz69s7xnwj476qm8ibdlwsr63qj9yh0mib0q6x"; system = "lift"; asd = "lift"; @@ -67459,7 +68268,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lift-documentation" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lift/2023-10-21/lift-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/lift/2023-10-21/lift-20231021-git.tgz"; sha256 = "1513n46fkqw8rnvz69s7xnwj476qm8ibdlwsr63qj9yh0mib0q6x"; system = "lift-documentation"; asd = "lift-documentation"; @@ -67479,7 +68288,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lift-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lift/2023-10-21/lift-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/lift/2023-10-21/lift-20231021-git.tgz"; sha256 = "1513n46fkqw8rnvz69s7xnwj476qm8ibdlwsr63qj9yh0mib0q6x"; system = "lift-test"; asd = "lift-test"; @@ -67499,7 +68308,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lil" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lisp-interface-library/2023-10-21/lisp-interface-library-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/lisp-interface-library/2023-10-21/lisp-interface-library-20231021-git.tgz"; sha256 = "0krh8z696a0p894vmqdw9clzhpqfqff4c4rd7s8d8hd5jwjm40aq"; system = "lil"; asd = "lil"; @@ -67524,7 +68333,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lila" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lila/2019-10-07/lila-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/lila/2019-10-07/lila-20191007-git.tgz"; sha256 = "0n29ipbcxh4fm8f1vpaywv02iaayqqk61zsfk051ksjfl5kyqypq"; system = "lila"; asd = "lila"; @@ -67544,7 +68353,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lime" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lime/2023-06-18/lime-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/lime/2023-06-18/lime-20230618-git.tgz"; sha256 = "1af1m3nxxqpaw85s1cc4qf0fkv3z061xk5k17ygfmchmv8sj1agp"; system = "lime"; asd = "lime"; @@ -67568,7 +68377,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lime-example" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lime/2023-06-18/lime-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/lime/2023-06-18/lime-20230618-git.tgz"; sha256 = "1af1m3nxxqpaw85s1cc4qf0fkv3z061xk5k17ygfmchmv8sj1agp"; system = "lime-example"; asd = "lime-example"; @@ -67591,7 +68400,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lime-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lime/2023-06-18/lime-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/lime/2023-06-18/lime-20230618-git.tgz"; sha256 = "1af1m3nxxqpaw85s1cc4qf0fkv3z061xk5k17ygfmchmv8sj1agp"; system = "lime-test"; asd = "lime-test"; @@ -67612,12 +68421,12 @@ lib.makeScope pkgs.newScope (self: { linear-programming = ( build-asdf-system { pname = "linear-programming"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "linear-programming" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/linear-programming/2024-10-12/linear-programming-20241012-git.tgz"; - sha256 = "01dy54ycmalqlk4wrkw1y6vixr0mk0nxmfy3p1w5kpdwp3642h9g"; + url = "https://beta.quicklisp.org/archive/linear-programming/2025-06-22/linear-programming-20250622-git.tgz"; + sha256 = "1sk2a02qcadndmzmkpbzcvwqz1sgx9i9xsj5901z7lmwpz9wzx0j"; system = "linear-programming"; asd = "linear-programming"; } @@ -67639,7 +68448,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "linear-programming-glpk" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/linear-programming-glpk/2022-11-06/linear-programming-glpk-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/linear-programming-glpk/2022-11-06/linear-programming-glpk-20221106-git.tgz"; sha256 = "0vm4qgjvw5k3v62h78j6802dm075aif06hbjw600m3hybn84rs3l"; system = "linear-programming-glpk"; asd = "linear-programming-glpk"; @@ -67658,12 +68467,12 @@ lib.makeScope pkgs.newScope (self: { linear-programming-test = ( build-asdf-system { pname = "linear-programming-test"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "linear-programming-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/linear-programming/2024-10-12/linear-programming-20241012-git.tgz"; - sha256 = "01dy54ycmalqlk4wrkw1y6vixr0mk0nxmfy3p1w5kpdwp3642h9g"; + url = "https://beta.quicklisp.org/archive/linear-programming/2025-06-22/linear-programming-20250622-git.tgz"; + sha256 = "1sk2a02qcadndmzmkpbzcvwqz1sgx9i9xsj5901z7lmwpz9wzx0j"; system = "linear-programming-test"; asd = "linear-programming-test"; } @@ -67686,7 +68495,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "linedit" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/linedit/2018-04-30/linedit-20180430-git.tgz"; + url = "https://beta.quicklisp.org/archive/linedit/2018-04-30/linedit-20180430-git.tgz"; sha256 = "0hhh7xn6q12rviayfihg1ym6x6csa0pdjgb88ykqbrz2rs3pgpz5"; system = "linedit"; asd = "linedit"; @@ -67711,7 +68520,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lineva" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lineva/2022-11-06/lineva-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/lineva/2022-11-06/lineva-20221106-git.tgz"; sha256 = "193v40llsi51b4zk93fyrg5ll2309waw7ibl4z75bbw73kc4f2wx"; system = "lineva"; asd = "lineva"; @@ -67731,7 +68540,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "linewise-template" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/linewise-template/2023-06-18/linewise-template-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/linewise-template/2023-06-18/linewise-template-20230618-git.tgz"; sha256 = "08i2426lkcfcydmm9ca71whvyairrd0lklr6w7w17zbg0bsxsaaa"; system = "linewise-template"; asd = "linewise-template"; @@ -67754,7 +68563,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "linux-packaging" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/linux-packaging/2021-10-20/linux-packaging-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/linux-packaging/2021-10-20/linux-packaging-20211020-git.tgz"; sha256 = "0hmahs2slfs1bznn6zdljc5yjlg16ml795rcxnmafq7941lgqjs5"; system = "linux-packaging"; asd = "linux-packaging"; @@ -67780,7 +68589,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "linux-packaging-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/linux-packaging/2021-10-20/linux-packaging-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/linux-packaging/2021-10-20/linux-packaging-20211020-git.tgz"; sha256 = "0hmahs2slfs1bznn6zdljc5yjlg16ml795rcxnmafq7941lgqjs5"; system = "linux-packaging-tests"; asd = "linux-packaging-tests"; @@ -67801,18 +68610,18 @@ lib.makeScope pkgs.newScope (self: { lisa = ( build-asdf-system { pname = "lisa"; - version = "20120407-git"; + version = "20250622-git"; asds = [ "lisa" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lisa/2012-04-07/lisa-20120407-git.tgz"; - sha256 = "12mpwxpczfq2hridjspbg51121hngbcnji37fhlr0vv4dqrg1z15"; + url = "https://beta.quicklisp.org/archive/lisa/2025-06-22/lisa-20250622-git.tgz"; + sha256 = "0m1ww61vbaxrj1jiln8f6x393i27sd604hv511bd67y6xj23qqai"; system = "lisa"; asd = "lisa"; } ); systems = [ "lisa" ]; - lispLibs = [ ]; + lispLibs = [ (getAttr "log4cl" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -67821,12 +68630,12 @@ lib.makeScope pkgs.newScope (self: { lisp-binary = ( build-asdf-system { pname = "lisp-binary"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "lisp-binary" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lisp-binary/2024-10-12/lisp-binary-20241012-git.tgz"; - sha256 = "1zgk6pbhjj4agazffv6mc3hjzyg4xh256sla83iqy5mwm172d810"; + url = "https://beta.quicklisp.org/archive/lisp-binary/2025-06-22/lisp-binary-20250622-git.tgz"; + sha256 = "0m798xnk0q1hf1l16jqv60bwp49y0hhljn79qvjixrpwr2ridgag"; system = "lisp-binary"; asd = "lisp-binary"; } @@ -67846,12 +68655,12 @@ lib.makeScope pkgs.newScope (self: { lisp-binary-test = ( build-asdf-system { pname = "lisp-binary-test"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "lisp-binary-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lisp-binary/2024-10-12/lisp-binary-20241012-git.tgz"; - sha256 = "1zgk6pbhjj4agazffv6mc3hjzyg4xh256sla83iqy5mwm172d810"; + url = "https://beta.quicklisp.org/archive/lisp-binary/2025-06-22/lisp-binary-20250622-git.tgz"; + sha256 = "0m798xnk0q1hf1l16jqv60bwp49y0hhljn79qvjixrpwr2ridgag"; system = "lisp-binary-test"; asd = "lisp-binary-test"; } @@ -67870,7 +68679,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lisp-chat" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lisp-chat/2024-10-12/lisp-chat-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/lisp-chat/2024-10-12/lisp-chat-20241012-git.tgz"; sha256 = "16ckgxg0c3rx6qvwj5cn6rmfgxbj7587r9g342bw3nfxab0sqlzd"; system = "lisp-chat"; asd = "lisp-chat"; @@ -67894,7 +68703,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lisp-critic" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lisp-critic/2024-10-12/lisp-critic-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/lisp-critic/2024-10-12/lisp-critic-20241012-git.tgz"; sha256 = "19czs2m8h3kgwjd10pdk9r5kazbgly8g82a5q3bs7pqkja42i7x7"; system = "lisp-critic"; asd = "lisp-critic"; @@ -67914,7 +68723,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lisp-executable" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lisp-executable/2018-08-31/lisp-executable-20180831-git.tgz"; + url = "https://beta.quicklisp.org/archive/lisp-executable/2018-08-31/lisp-executable-20180831-git.tgz"; sha256 = "1309f7w0hks3agkhcn8nwm83yssdfrr9b5bjqkjg3rrhxs86c0z7"; system = "lisp-executable"; asd = "lisp-executable"; @@ -67934,7 +68743,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lisp-executable-example" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lisp-executable/2018-08-31/lisp-executable-20180831-git.tgz"; + url = "https://beta.quicklisp.org/archive/lisp-executable/2018-08-31/lisp-executable-20180831-git.tgz"; sha256 = "1309f7w0hks3agkhcn8nwm83yssdfrr9b5bjqkjg3rrhxs86c0z7"; system = "lisp-executable-example"; asd = "lisp-executable-example"; @@ -67954,7 +68763,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lisp-executable-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lisp-executable/2018-08-31/lisp-executable-20180831-git.tgz"; + url = "https://beta.quicklisp.org/archive/lisp-executable/2018-08-31/lisp-executable-20180831-git.tgz"; sha256 = "1309f7w0hks3agkhcn8nwm83yssdfrr9b5bjqkjg3rrhxs86c0z7"; system = "lisp-executable-tests"; asd = "lisp-executable-tests"; @@ -67977,7 +68786,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lisp-interface-library" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lisp-interface-library/2023-10-21/lisp-interface-library-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/lisp-interface-library/2023-10-21/lisp-interface-library-20231021-git.tgz"; sha256 = "0krh8z696a0p894vmqdw9clzhpqfqff4c4rd7s8d8hd5jwjm40aq"; system = "lisp-interface-library"; asd = "lisp-interface-library"; @@ -67997,7 +68806,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lisp-invocation" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lisp-invocation/2018-02-28/lisp-invocation-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/lisp-invocation/2018-02-28/lisp-invocation-20180228-git.tgz"; sha256 = "1qwvczjd5w6mrkz7ip3gl46f72dnxgngdc5bla35l2g7br96kzsl"; system = "lisp-invocation"; asd = "lisp-invocation"; @@ -68017,7 +68826,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lisp-namespace" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lisp-namespace/2022-11-06/lisp-namespace-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/lisp-namespace/2022-11-06/lisp-namespace-20221106-git.tgz"; sha256 = "1p5db9mab4whapy1pl38ajw5fkrrdw266n05mnhf4xx2fb9sbx6p"; system = "lisp-namespace"; asd = "lisp-namespace"; @@ -68035,7 +68844,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lisp-namespace.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lisp-namespace/2022-11-06/lisp-namespace-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/lisp-namespace/2022-11-06/lisp-namespace-20221106-git.tgz"; sha256 = "1p5db9mab4whapy1pl38ajw5fkrrdw266n05mnhf4xx2fb9sbx6p"; system = "lisp-namespace.test"; asd = "lisp-namespace.test"; @@ -68058,7 +68867,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lisp-pay" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lisp-pay/2024-10-12/lisp-pay-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/lisp-pay/2024-10-12/lisp-pay-20241012-git.tgz"; sha256 = "1rbkzngas67ras5cf90y3dk99md05jmnjgsh45khj4b6kzw5a4v5"; system = "lisp-pay"; asd = "lisp-pay"; @@ -68093,7 +68902,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lisp-preprocessor" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lisp-preprocessor/2020-07-15/lisp-preprocessor-20200715-git.tgz"; + url = "https://beta.quicklisp.org/archive/lisp-preprocessor/2020-07-15/lisp-preprocessor-20200715-git.tgz"; sha256 = "0v0qhawcvgbxk06nfwyvcqwmqvzn2svq80l2rb12myr0znschhpi"; system = "lisp-preprocessor"; asd = "lisp-preprocessor"; @@ -68119,7 +68928,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lisp-preprocessor-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lisp-preprocessor/2020-07-15/lisp-preprocessor-20200715-git.tgz"; + url = "https://beta.quicklisp.org/archive/lisp-preprocessor/2020-07-15/lisp-preprocessor-20200715-git.tgz"; sha256 = "0v0qhawcvgbxk06nfwyvcqwmqvzn2svq80l2rb12myr0znschhpi"; system = "lisp-preprocessor-tests"; asd = "lisp-preprocessor"; @@ -68138,12 +68947,12 @@ lib.makeScope pkgs.newScope (self: { lisp-stat = ( build-asdf-system { pname = "lisp-stat"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "lisp-stat" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lisp-stat/2024-10-12/lisp-stat-20241012-git.tgz"; - sha256 = "0igrrwlfvdqxdqwqij819zlkma6b815d10v3kzh1r6hp9fhn0r3p"; + url = "https://beta.quicklisp.org/archive/lisp-stat/2025-06-22/lisp-stat-20250622-git.tgz"; + sha256 = "1n98bp3jdk724zr7h3z496z754j0fbj4ilgqxf1f3kzmw34sb14n"; system = "lisp-stat"; asd = "lisp-stat"; } @@ -68174,7 +68983,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lisp-types" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; + url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; system = "lisp-types"; asd = "lisp-types"; @@ -68198,7 +69007,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lisp-types-analysis" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; + url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; system = "lisp-types-analysis"; asd = "lisp-types-analysis"; @@ -68225,7 +69034,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lisp-types-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; + url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; system = "lisp-types-test"; asd = "lisp-types-test"; @@ -68252,7 +69061,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lisp-unit" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lisp-unit/2017-01-24/lisp-unit-20170124-git.tgz"; + url = "https://beta.quicklisp.org/archive/lisp-unit/2017-01-24/lisp-unit-20170124-git.tgz"; sha256 = "0p6gdmgr7p383nvd66c9y9fp2bjk4jx1lpa5p09g43hr9y9pp9ry"; system = "lisp-unit"; asd = "lisp-unit"; @@ -68270,7 +69079,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lisp-unit2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lisp-unit2/2023-02-14/lisp-unit2-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/lisp-unit2/2023-02-14/lisp-unit2-20230214-git.tgz"; sha256 = "140nn22n1xv3qaash3x6h2h7xmys44s3f42b7bakfhpc4qlx0b69"; system = "lisp-unit2"; asd = "lisp-unit2"; @@ -68289,12 +69098,12 @@ lib.makeScope pkgs.newScope (self: { lispbuilder-lexer = ( build-asdf-system { pname = "lispbuilder-lexer"; - version = "20210807-git"; + version = "20250622-git"; asds = [ "lispbuilder-lexer" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; + url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz"; + sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n"; system = "lispbuilder-lexer"; asd = "lispbuilder-lexer"; } @@ -68309,12 +69118,12 @@ lib.makeScope pkgs.newScope (self: { lispbuilder-net = ( build-asdf-system { pname = "lispbuilder-net"; - version = "20210807-git"; + version = "20250622-git"; asds = [ "lispbuilder-net" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; + url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz"; + sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n"; system = "lispbuilder-net"; asd = "lispbuilder-net"; } @@ -68332,12 +69141,12 @@ lib.makeScope pkgs.newScope (self: { lispbuilder-net-cffi = ( build-asdf-system { pname = "lispbuilder-net-cffi"; - version = "20210807-git"; + version = "20250622-git"; asds = [ "lispbuilder-net-cffi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; + url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz"; + sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n"; system = "lispbuilder-net-cffi"; asd = "lispbuilder-net-cffi"; } @@ -68352,12 +69161,12 @@ lib.makeScope pkgs.newScope (self: { lispbuilder-opengl-1-1 = ( build-asdf-system { pname = "lispbuilder-opengl-1-1"; - version = "20210807-git"; + version = "20250622-git"; asds = [ "lispbuilder-opengl-1-1" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; + url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz"; + sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n"; system = "lispbuilder-opengl-1-1"; asd = "lispbuilder-opengl-1-1"; } @@ -68372,12 +69181,12 @@ lib.makeScope pkgs.newScope (self: { lispbuilder-opengl-examples = ( build-asdf-system { pname = "lispbuilder-opengl-examples"; - version = "20210807-git"; + version = "20250622-git"; asds = [ "lispbuilder-opengl-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; + url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz"; + sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n"; system = "lispbuilder-opengl-examples"; asd = "lispbuilder-opengl-examples"; } @@ -68396,12 +69205,12 @@ lib.makeScope pkgs.newScope (self: { lispbuilder-regex = ( build-asdf-system { pname = "lispbuilder-regex"; - version = "20210807-git"; + version = "20250622-git"; asds = [ "lispbuilder-regex" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; + url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz"; + sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n"; system = "lispbuilder-regex"; asd = "lispbuilder-regex"; } @@ -68416,12 +69225,12 @@ lib.makeScope pkgs.newScope (self: { lispbuilder-sdl = ( build-asdf-system { pname = "lispbuilder-sdl"; - version = "20210807-git"; + version = "20250622-git"; asds = [ "lispbuilder-sdl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; + url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz"; + sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n"; system = "lispbuilder-sdl"; asd = "lispbuilder-sdl"; } @@ -68441,12 +69250,12 @@ lib.makeScope pkgs.newScope (self: { lispbuilder-sdl-assets = ( build-asdf-system { pname = "lispbuilder-sdl-assets"; - version = "20210807-git"; + version = "20250622-git"; asds = [ "lispbuilder-sdl-assets" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; + url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz"; + sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n"; system = "lispbuilder-sdl-assets"; asd = "lispbuilder-sdl-assets"; } @@ -68461,12 +69270,12 @@ lib.makeScope pkgs.newScope (self: { lispbuilder-sdl-base = ( build-asdf-system { pname = "lispbuilder-sdl-base"; - version = "20210807-git"; + version = "20250622-git"; asds = [ "lispbuilder-sdl-base" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; + url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz"; + sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n"; system = "lispbuilder-sdl-base"; asd = "lispbuilder-sdl-base"; } @@ -68484,12 +69293,12 @@ lib.makeScope pkgs.newScope (self: { lispbuilder-sdl-binaries = ( build-asdf-system { pname = "lispbuilder-sdl-binaries"; - version = "20210807-git"; + version = "20250622-git"; asds = [ "lispbuilder-sdl-binaries" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; + url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz"; + sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n"; system = "lispbuilder-sdl-binaries"; asd = "lispbuilder-sdl-binaries"; } @@ -68504,12 +69313,12 @@ lib.makeScope pkgs.newScope (self: { lispbuilder-sdl-cffi = ( build-asdf-system { pname = "lispbuilder-sdl-cffi"; - version = "20210807-git"; + version = "20250622-git"; asds = [ "lispbuilder-sdl-cffi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; + url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz"; + sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n"; system = "lispbuilder-sdl-cffi"; asd = "lispbuilder-sdl-cffi"; } @@ -68527,12 +69336,12 @@ lib.makeScope pkgs.newScope (self: { lispbuilder-sdl-cl-vectors = ( build-asdf-system { pname = "lispbuilder-sdl-cl-vectors"; - version = "20210807-git"; + version = "20250622-git"; asds = [ "lispbuilder-sdl-cl-vectors" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; + url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz"; + sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n"; system = "lispbuilder-sdl-cl-vectors"; asd = "lispbuilder-sdl-cl-vectors"; } @@ -68553,12 +69362,12 @@ lib.makeScope pkgs.newScope (self: { lispbuilder-sdl-cl-vectors-examples = ( build-asdf-system { pname = "lispbuilder-sdl-cl-vectors-examples"; - version = "20210807-git"; + version = "20250622-git"; asds = [ "lispbuilder-sdl-cl-vectors-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; + url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz"; + sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n"; system = "lispbuilder-sdl-cl-vectors-examples"; asd = "lispbuilder-sdl-cl-vectors-examples"; } @@ -68573,12 +69382,12 @@ lib.makeScope pkgs.newScope (self: { lispbuilder-sdl-examples = ( build-asdf-system { pname = "lispbuilder-sdl-examples"; - version = "20210807-git"; + version = "20250622-git"; asds = [ "lispbuilder-sdl-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; + url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz"; + sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n"; system = "lispbuilder-sdl-examples"; asd = "lispbuilder-sdl-examples"; } @@ -68593,12 +69402,12 @@ lib.makeScope pkgs.newScope (self: { lispbuilder-sdl-gfx = ( build-asdf-system { pname = "lispbuilder-sdl-gfx"; - version = "20210807-git"; + version = "20250622-git"; asds = [ "lispbuilder-sdl-gfx" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; + url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz"; + sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n"; system = "lispbuilder-sdl-gfx"; asd = "lispbuilder-sdl-gfx"; } @@ -68617,12 +69426,12 @@ lib.makeScope pkgs.newScope (self: { lispbuilder-sdl-gfx-binaries = ( build-asdf-system { pname = "lispbuilder-sdl-gfx-binaries"; - version = "20210807-git"; + version = "20250622-git"; asds = [ "lispbuilder-sdl-gfx-binaries" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; + url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz"; + sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n"; system = "lispbuilder-sdl-gfx-binaries"; asd = "lispbuilder-sdl-gfx-binaries"; } @@ -68637,12 +69446,12 @@ lib.makeScope pkgs.newScope (self: { lispbuilder-sdl-gfx-cffi = ( build-asdf-system { pname = "lispbuilder-sdl-gfx-cffi"; - version = "20210807-git"; + version = "20250622-git"; asds = [ "lispbuilder-sdl-gfx-cffi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; + url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz"; + sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n"; system = "lispbuilder-sdl-gfx-cffi"; asd = "lispbuilder-sdl-gfx-cffi"; } @@ -68660,12 +69469,12 @@ lib.makeScope pkgs.newScope (self: { lispbuilder-sdl-gfx-examples = ( build-asdf-system { pname = "lispbuilder-sdl-gfx-examples"; - version = "20210807-git"; + version = "20250622-git"; asds = [ "lispbuilder-sdl-gfx-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; + url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz"; + sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n"; system = "lispbuilder-sdl-gfx-examples"; asd = "lispbuilder-sdl-gfx-examples"; } @@ -68680,12 +69489,12 @@ lib.makeScope pkgs.newScope (self: { lispbuilder-sdl-image = ( build-asdf-system { pname = "lispbuilder-sdl-image"; - version = "20210807-git"; + version = "20250622-git"; asds = [ "lispbuilder-sdl-image" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; + url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz"; + sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n"; system = "lispbuilder-sdl-image"; asd = "lispbuilder-sdl-image"; } @@ -68704,12 +69513,12 @@ lib.makeScope pkgs.newScope (self: { lispbuilder-sdl-image-binaries = ( build-asdf-system { pname = "lispbuilder-sdl-image-binaries"; - version = "20210807-git"; + version = "20250622-git"; asds = [ "lispbuilder-sdl-image-binaries" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; + url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz"; + sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n"; system = "lispbuilder-sdl-image-binaries"; asd = "lispbuilder-sdl-image-binaries"; } @@ -68724,12 +69533,12 @@ lib.makeScope pkgs.newScope (self: { lispbuilder-sdl-image-cffi = ( build-asdf-system { pname = "lispbuilder-sdl-image-cffi"; - version = "20210807-git"; + version = "20250622-git"; asds = [ "lispbuilder-sdl-image-cffi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; + url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz"; + sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n"; system = "lispbuilder-sdl-image-cffi"; asd = "lispbuilder-sdl-image-cffi"; } @@ -68748,12 +69557,12 @@ lib.makeScope pkgs.newScope (self: { lispbuilder-sdl-image-examples = ( build-asdf-system { pname = "lispbuilder-sdl-image-examples"; - version = "20210807-git"; + version = "20250622-git"; asds = [ "lispbuilder-sdl-image-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; + url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz"; + sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n"; system = "lispbuilder-sdl-image-examples"; asd = "lispbuilder-sdl-image-examples"; } @@ -68772,12 +69581,12 @@ lib.makeScope pkgs.newScope (self: { lispbuilder-sdl-mixer = ( build-asdf-system { pname = "lispbuilder-sdl-mixer"; - version = "20210807-git"; + version = "20250622-git"; asds = [ "lispbuilder-sdl-mixer" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; + url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz"; + sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n"; system = "lispbuilder-sdl-mixer"; asd = "lispbuilder-sdl-mixer"; } @@ -68796,12 +69605,12 @@ lib.makeScope pkgs.newScope (self: { lispbuilder-sdl-mixer-binaries = ( build-asdf-system { pname = "lispbuilder-sdl-mixer-binaries"; - version = "20210807-git"; + version = "20250622-git"; asds = [ "lispbuilder-sdl-mixer-binaries" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; + url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz"; + sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n"; system = "lispbuilder-sdl-mixer-binaries"; asd = "lispbuilder-sdl-mixer-binaries"; } @@ -68816,12 +69625,12 @@ lib.makeScope pkgs.newScope (self: { lispbuilder-sdl-mixer-cffi = ( build-asdf-system { pname = "lispbuilder-sdl-mixer-cffi"; - version = "20210807-git"; + version = "20250622-git"; asds = [ "lispbuilder-sdl-mixer-cffi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; + url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz"; + sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n"; system = "lispbuilder-sdl-mixer-cffi"; asd = "lispbuilder-sdl-mixer-cffi"; } @@ -68840,12 +69649,12 @@ lib.makeScope pkgs.newScope (self: { lispbuilder-sdl-mixer-examples = ( build-asdf-system { pname = "lispbuilder-sdl-mixer-examples"; - version = "20210807-git"; + version = "20250622-git"; asds = [ "lispbuilder-sdl-mixer-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; + url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz"; + sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n"; system = "lispbuilder-sdl-mixer-examples"; asd = "lispbuilder-sdl-mixer-examples"; } @@ -68864,12 +69673,12 @@ lib.makeScope pkgs.newScope (self: { lispbuilder-sdl-ttf = ( build-asdf-system { pname = "lispbuilder-sdl-ttf"; - version = "20210807-git"; + version = "20250622-git"; asds = [ "lispbuilder-sdl-ttf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; + url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz"; + sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n"; system = "lispbuilder-sdl-ttf"; asd = "lispbuilder-sdl-ttf"; } @@ -68888,12 +69697,12 @@ lib.makeScope pkgs.newScope (self: { lispbuilder-sdl-ttf-binaries = ( build-asdf-system { pname = "lispbuilder-sdl-ttf-binaries"; - version = "20210807-git"; + version = "20250622-git"; asds = [ "lispbuilder-sdl-ttf-binaries" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; + url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz"; + sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n"; system = "lispbuilder-sdl-ttf-binaries"; asd = "lispbuilder-sdl-ttf-binaries"; } @@ -68908,12 +69717,12 @@ lib.makeScope pkgs.newScope (self: { lispbuilder-sdl-ttf-cffi = ( build-asdf-system { pname = "lispbuilder-sdl-ttf-cffi"; - version = "20210807-git"; + version = "20250622-git"; asds = [ "lispbuilder-sdl-ttf-cffi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; + url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz"; + sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n"; system = "lispbuilder-sdl-ttf-cffi"; asd = "lispbuilder-sdl-ttf-cffi"; } @@ -68932,12 +69741,12 @@ lib.makeScope pkgs.newScope (self: { lispbuilder-sdl-ttf-examples = ( build-asdf-system { pname = "lispbuilder-sdl-ttf-examples"; - version = "20210807-git"; + version = "20250622-git"; asds = [ "lispbuilder-sdl-ttf-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; + url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz"; + sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n"; system = "lispbuilder-sdl-ttf-examples"; asd = "lispbuilder-sdl-ttf-examples"; } @@ -68956,12 +69765,12 @@ lib.makeScope pkgs.newScope (self: { lispbuilder-sdl-vecto = ( build-asdf-system { pname = "lispbuilder-sdl-vecto"; - version = "20210807-git"; + version = "20250622-git"; asds = [ "lispbuilder-sdl-vecto" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; + url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz"; + sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n"; system = "lispbuilder-sdl-vecto"; asd = "lispbuilder-sdl-vecto"; } @@ -68980,12 +69789,12 @@ lib.makeScope pkgs.newScope (self: { lispbuilder-sdl-vecto-examples = ( build-asdf-system { pname = "lispbuilder-sdl-vecto-examples"; - version = "20210807-git"; + version = "20250622-git"; asds = [ "lispbuilder-sdl-vecto-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; + url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz"; + sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n"; system = "lispbuilder-sdl-vecto-examples"; asd = "lispbuilder-sdl-vecto-examples"; } @@ -69000,12 +69809,12 @@ lib.makeScope pkgs.newScope (self: { lispbuilder-windows = ( build-asdf-system { pname = "lispbuilder-windows"; - version = "20210807-git"; + version = "20250622-git"; asds = [ "lispbuilder-windows" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; + url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz"; + sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n"; system = "lispbuilder-windows"; asd = "lispbuilder-windows"; } @@ -69020,12 +69829,12 @@ lib.makeScope pkgs.newScope (self: { lispbuilder-yacc = ( build-asdf-system { pname = "lispbuilder-yacc"; - version = "20210807-git"; + version = "20250622-git"; asds = [ "lispbuilder-yacc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; + url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz"; + sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n"; system = "lispbuilder-yacc"; asd = "lispbuilder-yacc"; } @@ -69044,7 +69853,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lispcord" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispcord/2024-10-12/lispcord-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/lispcord/2024-10-12/lispcord-20241012-git.tgz"; sha256 = "11xwrrvvqdm1wdnxrxqgizgw25plsn28n2k0lm5kakax9n221brn"; system = "lispcord"; asd = "lispcord"; @@ -69073,7 +69882,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lispqr" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lispqr/2021-06-30/lispqr-20210630-git.tgz"; + url = "https://beta.quicklisp.org/archive/lispqr/2021-06-30/lispqr-20210630-git.tgz"; sha256 = "06v1xpw5r4nxll286frhkc3ysvr50m904d33marnjmiax41y8qkc"; system = "lispqr"; asd = "lispqr"; @@ -69093,7 +69902,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "list-named-class" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/list-named-class/2020-03-25/list-named-class-20200325-git.tgz"; + url = "https://beta.quicklisp.org/archive/list-named-class/2020-03-25/list-named-class-20200325-git.tgz"; sha256 = "1bdi9q9wvfj66jji3n9hpjrj9271ial2awsb0xw80bmy6wqbg8kq"; system = "list-named-class"; asd = "list-named-class"; @@ -69116,7 +69925,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "list-of" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/asdf-finalizers/2022-11-06/asdf-finalizers-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/asdf-finalizers/2022-11-06/asdf-finalizers-20221106-git.tgz"; sha256 = "1w56c9yjjydjshsgqxz57qlp2v3r4ilbisnsgiqphvxnhvd41y0v"; system = "list-of"; asd = "list-of"; @@ -69136,7 +69945,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "listopia" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/listopia/2021-04-11/listopia-20210411-git.tgz"; + url = "https://beta.quicklisp.org/archive/listopia/2021-04-11/listopia-20210411-git.tgz"; sha256 = "0jd3mdv0ia8mfgdbpndzm3rdgc6nn9d9xpjzqjx582qhbnc0yji0"; system = "listopia"; asd = "listopia"; @@ -69156,7 +69965,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "listopia-bench" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/listopia/2021-04-11/listopia-20210411-git.tgz"; + url = "https://beta.quicklisp.org/archive/listopia/2021-04-11/listopia-20210411-git.tgz"; sha256 = "0jd3mdv0ia8mfgdbpndzm3rdgc6nn9d9xpjzqjx582qhbnc0yji0"; system = "listopia-bench"; asd = "listopia-bench"; @@ -69181,7 +69990,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "liter" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/colliflower/2021-10-20/colliflower-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/colliflower/2021-10-20/colliflower-20211020-git.tgz"; sha256 = "1fzn9s7wm7wmffrdm21lpvry9jb320456cmmprn976a533lp704r"; system = "liter"; asd = "liter"; @@ -69205,7 +70014,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "literate-demo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/literate-lisp/2023-06-18/literate-lisp-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/literate-lisp/2023-06-18/literate-lisp-20230618-git.tgz"; sha256 = "0smxf0a62dnwcfxsbsdkx4n5nqx9dlxdz6c2vfivxpqld6d6ap02"; system = "literate-demo"; asd = "literate-demo"; @@ -69228,7 +70037,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "literate-lisp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/literate-lisp/2023-06-18/literate-lisp-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/literate-lisp/2023-06-18/literate-lisp-20230618-git.tgz"; sha256 = "0smxf0a62dnwcfxsbsdkx4n5nqx9dlxdz6c2vfivxpqld6d6ap02"; system = "literate-lisp"; asd = "literate-lisp"; @@ -69252,7 +70061,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "litterae" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/litterae/2020-07-15/litterae-20200715-git.tgz"; + url = "https://beta.quicklisp.org/archive/litterae/2020-07-15/litterae-20200715-git.tgz"; sha256 = "05q6apkcxacis4llq8xjp468yg5v6za0ispcy5wqsb44ic0vhmsl"; system = "litterae"; asd = "litterae"; @@ -69279,7 +70088,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "litterae-test-system" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/litterae/2020-07-15/litterae-20200715-git.tgz"; + url = "https://beta.quicklisp.org/archive/litterae/2020-07-15/litterae-20200715-git.tgz"; sha256 = "05q6apkcxacis4llq8xjp468yg5v6za0ispcy5wqsb44ic0vhmsl"; system = "litterae-test-system"; asd = "litterae-test-system"; @@ -69299,7 +70108,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "livesupport" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/livesupport/2019-05-21/livesupport-release-quicklisp-71e6e412-git.tgz"; + url = "https://beta.quicklisp.org/archive/livesupport/2019-05-21/livesupport-release-quicklisp-71e6e412-git.tgz"; sha256 = "1rvnl0mncylbx63608pz5llss7y92j7z3ydambk9mcnjg2mjaapg"; system = "livesupport"; asd = "livesupport"; @@ -69319,7 +70128,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lla" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lla/2024-10-12/lla-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/lla/2024-10-12/lla-20241012-git.tgz"; sha256 = "19j11z8m00ry2bfn3ahai155b6qz995qqg7ipzvjdr05sj4gfb58"; system = "lla"; asd = "lla"; @@ -69340,12 +70149,12 @@ lib.makeScope pkgs.newScope (self: { lmdb = ( build-asdf-system { pname = "lmdb"; - version = "20230214-git"; + version = "20250622-git"; asds = [ "lmdb" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lmdb/2023-02-14/lmdb-20230214-git.tgz"; - sha256 = "1mccswfdgg7pxvnq3rds2zh0257853zqf81q4igfpjh5lhg3czgh"; + url = "https://beta.quicklisp.org/archive/lmdb/2025-06-22/lmdb-20250622-git.tgz"; + sha256 = "1k2pr6jqa9rnqxm94wvsl6cx7fra0bw3dp75z6d6x1mcjjla43bj"; system = "lmdb"; asd = "lmdb"; } @@ -69373,7 +70182,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lml" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lml/2015-09-23/lml-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/lml/2015-09-23/lml-20150923-git.tgz"; sha256 = "1s8v9p08vwl08y6ssxn4l088zz57d6fr13lzdz93i9jb8w8884wk"; system = "lml"; asd = "lml"; @@ -69393,7 +70202,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lml-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lml/2015-09-23/lml-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/lml/2015-09-23/lml-20150923-git.tgz"; sha256 = "1s8v9p08vwl08y6ssxn4l088zz57d6fr13lzdz93i9jb8w8884wk"; system = "lml-tests"; asd = "lml-tests"; @@ -69416,7 +70225,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lml2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lml2/2015-09-23/lml2-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/lml2/2015-09-23/lml2-20150923-git.tgz"; sha256 = "0v4d30x5zq1asp4r91nrzljpk2pm1plr0jns7a5wrf1n9fay57a6"; system = "lml2"; asd = "lml2"; @@ -69436,7 +70245,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lml2-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lml2/2015-09-23/lml2-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/lml2/2015-09-23/lml2-20150923-git.tgz"; sha256 = "0v4d30x5zq1asp4r91nrzljpk2pm1plr0jns7a5wrf1n9fay57a6"; system = "lml2-tests"; asd = "lml2-tests"; @@ -69459,7 +70268,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "local-package-aliases" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/local-package-aliases/2020-12-20/local-package-aliases-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/local-package-aliases/2020-12-20/local-package-aliases-20201220-git.tgz"; sha256 = "01knnxnximj2qyg8lhv0ijw69hfwqbfbmgvfjwnm7jbdgcp9wxnr"; system = "local-package-aliases"; asd = "local-package-aliases"; @@ -69475,12 +70284,12 @@ lib.makeScope pkgs.newScope (self: { local-time = ( build-asdf-system { pname = "local-time"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "local-time" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/local-time/2024-10-12/local-time-20241012-git.tgz"; - sha256 = "0jb1mb5zs4ryiah8zjzhpln1z686mfmpmvg1phgpr2mh9vvlgjk2"; + url = "https://beta.quicklisp.org/archive/local-time/2025-06-22/local-time-20250622-git.tgz"; + sha256 = "1xdxm1js8n1b3k0g013s810hzf7jr6yhapyvj9agfyl7b6knj0kg"; system = "local-time"; asd = "local-time"; } @@ -69497,7 +70306,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "local-time-duration" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/local-time-duration/2018-04-30/local-time-duration-20180430-git.tgz"; + url = "https://beta.quicklisp.org/archive/local-time-duration/2018-04-30/local-time-duration-20180430-git.tgz"; sha256 = "0f13mg18lv31lclz9jvqyj8d85p1jj1366nlld8m3dxnnwsbbkd6"; system = "local-time-duration"; asd = "local-time-duration"; @@ -69521,7 +70330,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "log4cl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/log4cl/2023-06-18/log4cl-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/log4cl/2023-06-18/log4cl-20230618-git.tgz"; sha256 = "0n119sy35k9yl4n18az1sw9a7saa5jh3v44863b305by1p5xdy7k"; system = "log4cl"; asd = "log4cl"; @@ -69539,7 +70348,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "log4cl-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/log4cl/2023-06-18/log4cl-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/log4cl/2023-06-18/log4cl-20230618-git.tgz"; sha256 = "0n119sy35k9yl4n18az1sw9a7saa5jh3v44863b305by1p5xdy7k"; system = "log4cl-examples"; asd = "log4cl-examples"; @@ -69562,7 +70371,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "log4cl-extras" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/log4cl-extras/2024-10-12/log4cl-extras-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/log4cl-extras/2024-10-12/log4cl-extras-20241012-git.tgz"; sha256 = "17p8y884163j0gab0idra297kivzdgagl2im0gkmdhgrh0dw3b53"; system = "log4cl-extras"; asd = "log4cl-extras"; @@ -69595,7 +70404,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "log4cl-extras-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/log4cl-extras/2024-10-12/log4cl-extras-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/log4cl-extras/2024-10-12/log4cl-extras-20241012-git.tgz"; sha256 = "17p8y884163j0gab0idra297kivzdgagl2im0gkmdhgrh0dw3b53"; system = "log4cl-extras-test"; asd = "log4cl-extras-test"; @@ -69620,7 +70429,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "log4cl.log4slime" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/log4cl/2023-06-18/log4cl-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/log4cl/2023-06-18/log4cl-20230618-git.tgz"; sha256 = "0n119sy35k9yl4n18az1sw9a7saa5jh3v44863b305by1p5xdy7k"; system = "log4cl.log4slime"; asd = "log4cl.log4slime"; @@ -69643,7 +70452,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "log4cl.log4sly" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/log4cl/2023-06-18/log4cl-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/log4cl/2023-06-18/log4cl-20230618-git.tgz"; sha256 = "0n119sy35k9yl4n18az1sw9a7saa5jh3v44863b305by1p5xdy7k"; system = "log4cl.log4sly"; asd = "log4cl.log4sly"; @@ -69666,7 +70475,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "log5" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/log5/2011-06-19/log5-20110619-git.tgz"; + url = "https://beta.quicklisp.org/archive/log5/2011-06-19/log5-20110619-git.tgz"; sha256 = "0f7qhhphijwk6a4hq18gpgifld7hwwpma6md845hgjmpvyqvrw2g"; system = "log5"; asd = "log5"; @@ -69686,7 +70495,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lorem-ipsum" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lorem-ipsum/2018-10-18/lorem-ipsum-20181018-git.tgz"; + url = "https://beta.quicklisp.org/archive/lorem-ipsum/2018-10-18/lorem-ipsum-20181018-git.tgz"; sha256 = "1530qq0bk3xr25m77q96pbi1idnxdkax8cwmvq4ch03rfjy34j7n"; system = "lorem-ipsum"; asd = "lorem-ipsum"; @@ -69706,7 +70515,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lowlight" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lowlight/2013-12-11/lowlight-20131211-git.tgz"; + url = "https://beta.quicklisp.org/archive/lowlight/2013-12-11/lowlight-20131211-git.tgz"; sha256 = "1i27hdac7aqb27rn5cslpf5lwvkrfz52b6rf7zqq0fi42zmvgb4p"; system = "lowlight"; asd = "lowlight"; @@ -69733,7 +70542,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lowlight.doc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lowlight/2013-12-11/lowlight-20131211-git.tgz"; + url = "https://beta.quicklisp.org/archive/lowlight/2013-12-11/lowlight-20131211-git.tgz"; sha256 = "1i27hdac7aqb27rn5cslpf5lwvkrfz52b6rf7zqq0fi42zmvgb4p"; system = "lowlight.doc"; asd = "lowlight.doc"; @@ -69757,7 +70566,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lowlight.old" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lowlight/2013-12-11/lowlight-20131211-git.tgz"; + url = "https://beta.quicklisp.org/archive/lowlight/2013-12-11/lowlight-20131211-git.tgz"; sha256 = "1i27hdac7aqb27rn5cslpf5lwvkrfz52b6rf7zqq0fi42zmvgb4p"; system = "lowlight.old"; asd = "lowlight.old"; @@ -69782,7 +70591,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lowlight.tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lowlight/2013-12-11/lowlight-20131211-git.tgz"; + url = "https://beta.quicklisp.org/archive/lowlight/2013-12-11/lowlight-20131211-git.tgz"; sha256 = "1i27hdac7aqb27rn5cslpf5lwvkrfz52b6rf7zqq0fi42zmvgb4p"; system = "lowlight.tests"; asd = "lowlight.tests"; @@ -69805,7 +70614,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lparallel" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz"; sha256 = "0g0aylrbbrqsz0ahmwhvnk4cmc2931fllbpcfgzsprwnqqd7vwq9"; system = "lparallel"; asd = "lparallel"; @@ -69826,7 +70635,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lparallel-bench" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz"; sha256 = "0g0aylrbbrqsz0ahmwhvnk4cmc2931fllbpcfgzsprwnqqd7vwq9"; system = "lparallel-bench"; asd = "lparallel-bench"; @@ -69849,7 +70658,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lparallel-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz"; sha256 = "0g0aylrbbrqsz0ahmwhvnk4cmc2931fllbpcfgzsprwnqqd7vwq9"; system = "lparallel-test"; asd = "lparallel-test"; @@ -69869,7 +70678,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lquery" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lquery/2023-10-21/lquery-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/lquery/2023-10-21/lquery-20231021-git.tgz"; sha256 = "124cjp4a99cicdk18rwz2slcyzvm982saddrvqcr97fi4i2nhnsg"; system = "lquery"; asd = "lquery"; @@ -69892,7 +70701,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lquery-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lquery/2023-10-21/lquery-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/lquery/2023-10-21/lquery-20231021-git.tgz"; sha256 = "124cjp4a99cicdk18rwz2slcyzvm982saddrvqcr97fi4i2nhnsg"; system = "lquery-test"; asd = "lquery-test"; @@ -69915,7 +70724,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lracer" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/racer/2024-10-12/racer-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/racer/2024-10-12/racer-20241012-git.tgz"; sha256 = "120x046c6vcrj70vb6ryf04mwbr8c6a15llb68x7h1siij8vwgvk"; system = "lracer"; asd = "lracer"; @@ -69935,7 +70744,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lredis" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lredis/2014-11-06/lredis-20141106-git.tgz"; + url = "https://beta.quicklisp.org/archive/lredis/2014-11-06/lredis-20141106-git.tgz"; sha256 = "08srvlys0fyslfpmhc740cana7fkxm2kc7mxds4083wgxw3prhf2"; system = "lredis"; asd = "lredis"; @@ -69955,12 +70764,12 @@ lib.makeScope pkgs.newScope (self: { lru-cache = ( build-asdf-system { pname = "lru-cache"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "lru-cache" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lru-cache/2024-10-12/lru-cache-20241012-git.tgz"; - sha256 = "035pl11j1l129akgf33w5c0b8c6gxw1xpj54r0fzxz3dw7cs8pg1"; + url = "https://beta.quicklisp.org/archive/lru-cache/2025-06-22/lru-cache-20250622-git.tgz"; + sha256 = "0nscrgkhzj1br9xgcxzrsr5pg4xcsv2l3736gxbba3wxlj4v2v3d"; system = "lru-cache"; asd = "lru-cache"; } @@ -69975,12 +70784,12 @@ lib.makeScope pkgs.newScope (self: { lru-cache-test = ( build-asdf-system { pname = "lru-cache-test"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "lru-cache-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lru-cache/2024-10-12/lru-cache-20241012-git.tgz"; - sha256 = "035pl11j1l129akgf33w5c0b8c6gxw1xpj54r0fzxz3dw7cs8pg1"; + url = "https://beta.quicklisp.org/archive/lru-cache/2025-06-22/lru-cache-20250622-git.tgz"; + sha256 = "0nscrgkhzj1br9xgcxzrsr5pg4xcsv2l3736gxbba3wxlj4v2v3d"; system = "lru-cache-test"; asd = "lru-cache-test"; } @@ -70002,7 +70811,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lsx" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lsx/2022-02-20/lsx-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/lsx/2022-02-20/lsx-20220220-git.tgz"; sha256 = "1pdq6csr8pkzcq2zkhhm6wkp9zxx2aypjd16rcw4q43mff09y041"; system = "lsx"; asd = "lsx"; @@ -70025,7 +70834,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ltk" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ltk/2022-11-06/ltk-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/ltk/2022-11-06/ltk-20221106-git.tgz"; sha256 = "0vqmdq3k235hd8d9cg0ipv0kw28aiydvr9j1igfnrs1ns9sm79va"; system = "ltk"; asd = "ltk"; @@ -70043,7 +70852,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ltk-mw" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ltk/2022-11-06/ltk-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/ltk/2022-11-06/ltk-20221106-git.tgz"; sha256 = "0vqmdq3k235hd8d9cg0ipv0kw28aiydvr9j1igfnrs1ns9sm79va"; system = "ltk-mw"; asd = "ltk-mw"; @@ -70063,7 +70872,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ltk-remote" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ltk/2022-11-06/ltk-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/ltk/2022-11-06/ltk-20221106-git.tgz"; sha256 = "0vqmdq3k235hd8d9cg0ipv0kw28aiydvr9j1igfnrs1ns9sm79va"; system = "ltk-remote"; asd = "ltk-remote"; @@ -70083,7 +70892,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lucene-in-action-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/montezuma/2018-02-28/montezuma-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/montezuma/2018-02-28/montezuma-20180228-git.tgz"; sha256 = "0svmvsbsirydk3c1spzfvj8qmkzcs9i69anpfvk1843i62wb7x2c"; system = "lucene-in-action-tests"; asd = "lucene-in-action-tests"; @@ -70099,15 +70908,63 @@ lib.makeScope pkgs.newScope (self: { }; } ); + luckless = ( + build-asdf-system { + pname = "luckless"; + version = "20250622-git"; + asds = [ "luckless" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/luckless/2025-06-22/luckless-20250622-git.tgz"; + sha256 = "1ajd6kzvdknl1wl2019aqajzr5v26b45fdgldky74m93piibznbn"; + system = "luckless"; + asd = "luckless"; + } + ); + systems = [ "luckless" ]; + lispLibs = [ + (getAttr "atomics" self) + (getAttr "documentation-utils" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + luckless-test = ( + build-asdf-system { + pname = "luckless-test"; + version = "20250622-git"; + asds = [ "luckless-test" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/luckless/2025-06-22/luckless-20250622-git.tgz"; + sha256 = "1ajd6kzvdknl1wl2019aqajzr5v26b45fdgldky74m93piibznbn"; + system = "luckless-test"; + asd = "luckless-test"; + } + ); + systems = [ "luckless-test" ]; + lispLibs = [ + (getAttr "alexandria" self) + (getAttr "bordeaux-threads" self) + (getAttr "luckless" self) + (getAttr "parachute" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); lunamech-matrix-api = ( build-asdf-system { pname = "lunamech-matrix-api"; - version = "20230214-git"; + version = "20250622-git"; asds = [ "lunamech-matrix-api" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lunamech-matrix-api/2023-02-14/lunamech-matrix-api-20230214-git.tgz"; - sha256 = "0a664qq4m5gk4iv5ck63gmsl3218jhjsalawklj56wn2pw0cf8a0"; + url = "https://beta.quicklisp.org/archive/lunamech-matrix-api/2025-06-22/lunamech-matrix-api-20250622-git.tgz"; + sha256 = "1ygdnwk1irnlfr6c3d07sqxwj2q74vpkd4hjjfvghr8v7kq4arpv"; system = "lunamech-matrix-api"; asd = "lunamech-matrix-api"; } @@ -70131,6 +70988,29 @@ lib.makeScope pkgs.newScope (self: { }; } ); + lunar-phases = ( + build-asdf-system { + pname = "lunar-phases"; + version = "20250622-git"; + asds = [ "lunar-phases" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/lunar-phases/2025-06-22/lunar-phases-20250622-git.tgz"; + sha256 = "02apr8ddrg7lq2vps49pn3jdy6kqhncz0qgfk53bl7ffjfxc0aw8"; + system = "lunar-phases"; + asd = "lunar-phases"; + } + ); + systems = [ "lunar-phases" ]; + lispLibs = [ + (getAttr "alexandria" self) + (getAttr "local-time" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); lw-compat = ( build-asdf-system { pname = "lw-compat"; @@ -70138,7 +71018,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lw-compat" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lw-compat/2016-03-18/lw-compat-20160318-git.tgz"; + url = "https://beta.quicklisp.org/archive/lw-compat/2016-03-18/lw-compat-20160318-git.tgz"; sha256 = "131rq5k2mlv9bfhmafiv6nfsivl4cxx13d9wr06v5jrqnckh4aav"; system = "lw-compat"; asd = "lw-compat"; @@ -70158,7 +71038,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lyrics" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lyrics/2021-08-07/lyrics-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/lyrics/2021-08-07/lyrics-20210807-git.tgz"; sha256 = "1xdhl53i9pim2mbviwqahlkgfsja7ihyvvrwz8q22ljv6bnb6011"; system = "lyrics"; asd = "lyrics"; @@ -70187,7 +71067,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lzlib" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-lzlib/2023-06-18/cl-lzlib-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-lzlib/2023-06-18/cl-lzlib-20230618-git.tgz"; sha256 = "1nb2g6a7l1qzm1bwv8b15nflgv8rv478x0n7viv6rlwzgqs5q3b8"; system = "lzlib"; asd = "lzlib"; @@ -70212,7 +71092,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "lzlib-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-lzlib/2023-06-18/cl-lzlib-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-lzlib/2023-06-18/cl-lzlib-20230618-git.tgz"; sha256 = "1nb2g6a7l1qzm1bwv8b15nflgv8rv478x0n7viv6rlwzgqs5q3b8"; system = "lzlib-tests"; asd = "lzlib-tests"; @@ -70229,15 +71109,39 @@ lib.makeScope pkgs.newScope (self: { }; } ); + machine-measurements = ( + build-asdf-system { + pname = "machine-measurements"; + version = "20250622-git"; + asds = [ "machine-measurements" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/machine-measurements/2025-06-22/machine-measurements-20250622-git.tgz"; + sha256 = "0d2lhippyhyyzgp67vp8g30xx3r30vrbs1jpcl8wrmxzszyp4qg2"; + system = "machine-measurements"; + asd = "machine-measurements"; + } + ); + systems = [ "machine-measurements" ]; + lispLibs = [ + (getAttr "documentation-utils" self) + (getAttr "machine-state" self) + (getAttr "precise-time" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); machine-state = ( build-asdf-system { pname = "machine-state"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "machine-state" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/machine-state/2024-10-12/machine-state-20241012-git.tgz"; - sha256 = "1zmag6j9zfpnv9xfdjzb6dfg3jzvhandm1plyv50i619p0w0nagk"; + url = "https://beta.quicklisp.org/archive/machine-state/2025-06-22/machine-state-20250622-git.tgz"; + sha256 = "01hdfzlw9zp0r3vrsdapg7djvld3g5sdh6r33kap7qa2zmicbivf"; system = "machine-state"; asd = "machine-state"; } @@ -70262,7 +71166,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "macro-html" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/macro-html/2015-12-18/macro-html-20151218-git.tgz"; + url = "https://beta.quicklisp.org/archive/macro-html/2015-12-18/macro-html-20151218-git.tgz"; sha256 = "05gzgijz8r3dw3ilz7d5i0g0mbcyv9k8w2dgvw7n478njp1gfj4b"; system = "macro-html"; asd = "macro-html"; @@ -70282,7 +71186,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "macro-level" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/macro-level/2023-10-21/macro-level_1.1.tgz"; + url = "https://beta.quicklisp.org/archive/macro-level/2023-10-21/macro-level_1.1.tgz"; sha256 = "1jcidyf4kfzzj5vj4i3l1vw0sbj9njaminb6j1bcq70y9w15qm68"; system = "macro-level"; asd = "macro-level"; @@ -70302,7 +71206,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "macro-level_tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/macro-level/2023-10-21/macro-level_1.1.tgz"; + url = "https://beta.quicklisp.org/archive/macro-level/2023-10-21/macro-level_1.1.tgz"; sha256 = "1jcidyf4kfzzj5vj4i3l1vw0sbj9njaminb6j1bcq70y9w15qm68"; system = "macro-level_tests"; asd = "macro-level_tests"; @@ -70325,7 +71229,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "macrodynamics" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/macrodynamics/2018-02-28/macrodynamics-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/macrodynamics/2018-02-28/macrodynamics-20180228-git.tgz"; sha256 = "1ysgin8lzd4fdl5c63v3ga9v6lzk3gyl1h8jhl0ar6wyhd3023l4"; system = "macrodynamics"; asd = "macrodynamics"; @@ -70345,7 +71249,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "macroexpand-dammit" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/macroexpand-dammit/2013-11-11/macroexpand-dammit-20131111-http.tgz"; + url = "https://beta.quicklisp.org/archive/macroexpand-dammit/2013-11-11/macroexpand-dammit-20131111-http.tgz"; sha256 = "10avpq3qffrc51hrfjwp3vi5vv9b1aip1dnwncnlc3yd498b3pfl"; system = "macroexpand-dammit"; asd = "macroexpand-dammit"; @@ -70365,7 +71269,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "madeira-port" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/madeira-port/2015-07-09/madeira-port-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/madeira-port/2015-07-09/madeira-port-20150709-git.tgz"; sha256 = "0zl6i11vm1akr0382zh582v3vkxjwmabsnfjcfgrp2wbkq4mvdgq"; system = "madeira-port"; asd = "madeira-port"; @@ -70385,7 +71289,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "madeira-port-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/madeira-port/2015-07-09/madeira-port-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/madeira-port/2015-07-09/madeira-port-20150709-git.tgz"; sha256 = "0zl6i11vm1akr0382zh582v3vkxjwmabsnfjcfgrp2wbkq4mvdgq"; system = "madeira-port-tests"; asd = "madeira-port"; @@ -70408,7 +71312,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "magic-ed" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/magic-ed/2020-03-25/magic-ed-20200325-git.tgz"; + url = "https://beta.quicklisp.org/archive/magic-ed/2020-03-25/magic-ed-20200325-git.tgz"; sha256 = "1j6il4lif0dy6hqiz6n91yl8dvii9pk1i9vz0faq5mnr42mr7i5f"; system = "magic-ed"; asd = "magic-ed"; @@ -70428,7 +71332,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "magicffi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/magicffi/2021-05-31/magicffi-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/magicffi/2021-05-31/magicffi-20210531-git.tgz"; sha256 = "0l2b2irpb19b9pyxbmkxi4i5y6crx8nk7qrbihsdqahlkrwsk1il"; system = "magicffi"; asd = "magicffi"; @@ -70452,7 +71356,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "magicl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/magicl/2024-10-12/magicl-v0.11.0.tgz"; + url = "https://beta.quicklisp.org/archive/magicl/2024-10-12/magicl-v0.11.0.tgz"; sha256 = "10scw5qhrgjhfrlia5iqn2yy2zj1d57m45g479vg56lw849whscw"; system = "magicl"; asd = "magicl"; @@ -70482,7 +71386,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "magicl-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/magicl/2024-10-12/magicl-v0.11.0.tgz"; + url = "https://beta.quicklisp.org/archive/magicl/2024-10-12/magicl-v0.11.0.tgz"; sha256 = "10scw5qhrgjhfrlia5iqn2yy2zj1d57m45g479vg56lw849whscw"; system = "magicl-examples"; asd = "magicl-examples"; @@ -70502,7 +71406,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "magicl-gen" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/magicl/2024-10-12/magicl-v0.11.0.tgz"; + url = "https://beta.quicklisp.org/archive/magicl/2024-10-12/magicl-v0.11.0.tgz"; sha256 = "10scw5qhrgjhfrlia5iqn2yy2zj1d57m45g479vg56lw849whscw"; system = "magicl-gen"; asd = "magicl-gen"; @@ -70531,7 +71435,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "magicl-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/magicl/2024-10-12/magicl-v0.11.0.tgz"; + url = "https://beta.quicklisp.org/archive/magicl/2024-10-12/magicl-v0.11.0.tgz"; sha256 = "10scw5qhrgjhfrlia5iqn2yy2zj1d57m45g479vg56lw849whscw"; system = "magicl-tests"; asd = "magicl-tests"; @@ -70557,7 +71461,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "magicl-transcendental" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/magicl/2024-10-12/magicl-v0.11.0.tgz"; + url = "https://beta.quicklisp.org/archive/magicl/2024-10-12/magicl-v0.11.0.tgz"; sha256 = "10scw5qhrgjhfrlia5iqn2yy2zj1d57m45g479vg56lw849whscw"; system = "magicl-transcendental"; asd = "magicl-transcendental"; @@ -70582,12 +71486,12 @@ lib.makeScope pkgs.newScope (self: { maiden = ( build-asdf-system { pname = "maiden"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden"; asd = "maiden"; } @@ -70613,12 +71517,12 @@ lib.makeScope pkgs.newScope (self: { maiden-accounts = ( build-asdf-system { pname = "maiden-accounts"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-accounts" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-accounts"; asd = "maiden-accounts"; } @@ -70637,12 +71541,12 @@ lib.makeScope pkgs.newScope (self: { maiden-activatable = ( build-asdf-system { pname = "maiden-activatable"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-activatable" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-activatable"; asd = "maiden-activatable"; } @@ -70661,12 +71565,12 @@ lib.makeScope pkgs.newScope (self: { maiden-api-access = ( build-asdf-system { pname = "maiden-api-access"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-api-access" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-api-access"; asd = "maiden-api-access"; } @@ -70686,12 +71590,12 @@ lib.makeScope pkgs.newScope (self: { maiden-blocker = ( build-asdf-system { pname = "maiden-blocker"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-blocker" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-blocker"; asd = "maiden-blocker"; } @@ -70711,12 +71615,12 @@ lib.makeScope pkgs.newScope (self: { maiden-channel-relay = ( build-asdf-system { pname = "maiden-channel-relay"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-channel-relay" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-channel-relay"; asd = "maiden-channel-relay"; } @@ -70735,12 +71639,12 @@ lib.makeScope pkgs.newScope (self: { maiden-chatlog = ( build-asdf-system { pname = "maiden-chatlog"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-chatlog" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-chatlog"; asd = "maiden-chatlog"; } @@ -70762,12 +71666,12 @@ lib.makeScope pkgs.newScope (self: { maiden-client-entities = ( build-asdf-system { pname = "maiden-client-entities"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-client-entities" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-client-entities"; asd = "maiden-client-entities"; } @@ -70785,12 +71689,12 @@ lib.makeScope pkgs.newScope (self: { maiden-commands = ( build-asdf-system { pname = "maiden-commands"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-commands" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-commands"; asd = "maiden-commands"; } @@ -70809,12 +71713,12 @@ lib.makeScope pkgs.newScope (self: { maiden-core-manager = ( build-asdf-system { pname = "maiden-core-manager"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-core-manager" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-core-manager"; asd = "maiden-core-manager"; } @@ -70833,12 +71737,12 @@ lib.makeScope pkgs.newScope (self: { maiden-counter = ( build-asdf-system { pname = "maiden-counter"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-counter" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-counter"; asd = "maiden-counter"; } @@ -70859,12 +71763,12 @@ lib.makeScope pkgs.newScope (self: { maiden-crimes = ( build-asdf-system { pname = "maiden-crimes"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-crimes" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-crimes"; asd = "maiden-crimes"; } @@ -70886,12 +71790,12 @@ lib.makeScope pkgs.newScope (self: { maiden-dictionary = ( build-asdf-system { pname = "maiden-dictionary"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-dictionary" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-dictionary"; asd = "maiden-dictionary"; } @@ -70911,12 +71815,12 @@ lib.makeScope pkgs.newScope (self: { maiden-emoticon = ( build-asdf-system { pname = "maiden-emoticon"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-emoticon" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-emoticon"; asd = "maiden-emoticon"; } @@ -70937,12 +71841,12 @@ lib.makeScope pkgs.newScope (self: { maiden-help = ( build-asdf-system { pname = "maiden-help"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-help" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-help"; asd = "maiden-help"; } @@ -70961,12 +71865,12 @@ lib.makeScope pkgs.newScope (self: { maiden-irc = ( build-asdf-system { pname = "maiden-irc"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-irc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-irc"; asd = "maiden-irc"; } @@ -70989,12 +71893,12 @@ lib.makeScope pkgs.newScope (self: { maiden-lastfm = ( build-asdf-system { pname = "maiden-lastfm"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-lastfm" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-lastfm"; asd = "maiden-lastfm"; } @@ -71015,12 +71919,12 @@ lib.makeScope pkgs.newScope (self: { maiden-lichat = ( build-asdf-system { pname = "maiden-lichat"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-lichat" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-lichat"; asd = "maiden-lichat"; } @@ -71039,12 +71943,12 @@ lib.makeScope pkgs.newScope (self: { maiden-location = ( build-asdf-system { pname = "maiden-location"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-location" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-location"; asd = "maiden-location"; } @@ -71064,12 +71968,12 @@ lib.makeScope pkgs.newScope (self: { maiden-lookup = ( build-asdf-system { pname = "maiden-lookup"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-lookup" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-lookup"; asd = "maiden-lookup"; } @@ -71091,12 +71995,12 @@ lib.makeScope pkgs.newScope (self: { maiden-markov = ( build-asdf-system { pname = "maiden-markov"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-markov" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-markov"; asd = "maiden-markov"; } @@ -71121,12 +72025,12 @@ lib.makeScope pkgs.newScope (self: { maiden-medals = ( build-asdf-system { pname = "maiden-medals"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-medals" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-medals"; asd = "maiden-medals"; } @@ -71147,12 +72051,12 @@ lib.makeScope pkgs.newScope (self: { maiden-networking = ( build-asdf-system { pname = "maiden-networking"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-networking" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-networking"; asd = "maiden-networking"; } @@ -71171,12 +72075,12 @@ lib.makeScope pkgs.newScope (self: { maiden-notify = ( build-asdf-system { pname = "maiden-notify"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-notify" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-notify"; asd = "maiden-notify"; } @@ -71196,12 +72100,12 @@ lib.makeScope pkgs.newScope (self: { maiden-permissions = ( build-asdf-system { pname = "maiden-permissions"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-permissions" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-permissions"; asd = "maiden-permissions"; } @@ -71222,12 +72126,12 @@ lib.makeScope pkgs.newScope (self: { maiden-relay = ( build-asdf-system { pname = "maiden-relay"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-relay" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-relay"; asd = "maiden-relay"; } @@ -71245,12 +72149,12 @@ lib.makeScope pkgs.newScope (self: { maiden-serialize = ( build-asdf-system { pname = "maiden-serialize"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-serialize" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-serialize"; asd = "maiden-serialize"; } @@ -71269,12 +72173,12 @@ lib.makeScope pkgs.newScope (self: { maiden-silly = ( build-asdf-system { pname = "maiden-silly"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-silly" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-silly"; asd = "maiden-silly"; } @@ -71297,12 +72201,12 @@ lib.makeScope pkgs.newScope (self: { maiden-storage = ( build-asdf-system { pname = "maiden-storage"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-storage" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-storage"; asd = "maiden-storage"; } @@ -71321,12 +72225,12 @@ lib.makeScope pkgs.newScope (self: { maiden-talk = ( build-asdf-system { pname = "maiden-talk"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-talk" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-talk"; asd = "maiden-talk"; } @@ -71348,12 +72252,12 @@ lib.makeScope pkgs.newScope (self: { maiden-throttle = ( build-asdf-system { pname = "maiden-throttle"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-throttle" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-throttle"; asd = "maiden-throttle"; } @@ -71372,12 +72276,12 @@ lib.makeScope pkgs.newScope (self: { maiden-time = ( build-asdf-system { pname = "maiden-time"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-time" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-time"; asd = "maiden-time"; } @@ -71397,12 +72301,12 @@ lib.makeScope pkgs.newScope (self: { maiden-trivia = ( build-asdf-system { pname = "maiden-trivia"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-trivia" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-trivia"; asd = "maiden-trivia"; } @@ -71422,12 +72326,12 @@ lib.makeScope pkgs.newScope (self: { maiden-twitter = ( build-asdf-system { pname = "maiden-twitter"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-twitter" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-twitter"; asd = "maiden-twitter"; } @@ -71445,12 +72349,12 @@ lib.makeScope pkgs.newScope (self: { maiden-urlinfo = ( build-asdf-system { pname = "maiden-urlinfo"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-urlinfo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-urlinfo"; asd = "maiden-urlinfo"; } @@ -71472,12 +72376,12 @@ lib.makeScope pkgs.newScope (self: { maiden-vote = ( build-asdf-system { pname = "maiden-vote"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-vote" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-vote"; asd = "maiden-vote"; } @@ -71496,12 +72400,12 @@ lib.makeScope pkgs.newScope (self: { maiden-weather = ( build-asdf-system { pname = "maiden-weather"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maiden-weather" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; - sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; + sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; system = "maiden-weather"; asd = "maiden-weather"; } @@ -71527,7 +72431,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "maidenhead" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maidenhead/2024-10-12/maidenhead-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/maidenhead/2024-10-12/maidenhead-20241012-git.tgz"; sha256 = "10pcx2ngyj6lkfbg1b58lzcm02xl1a3smnad5lvvw30pbalwcq46"; system = "maidenhead"; asd = "maidenhead"; @@ -71547,7 +72451,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mailbox" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mailbox/2013-10-03/mailbox-20131003-git.tgz"; + url = "https://beta.quicklisp.org/archive/mailbox/2013-10-03/mailbox-20131003-git.tgz"; sha256 = "1qgkcss8m2q29kr9d040dnjmzl17vb7zzvlz5ry3z3zgbdwgj1sy"; system = "mailbox"; asd = "mailbox"; @@ -71567,7 +72471,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mailgun" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mailgun/2022-07-07/mailgun-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/mailgun/2022-07-07/mailgun-20220707-git.tgz"; sha256 = "1wadkm5r2hmyz40m4kwg5rv4g4dwn3h2d8l2mn9dncg5qy37x2vl"; system = "mailgun"; asd = "mailgun"; @@ -71592,7 +72496,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "make-hash" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/make-hash/2013-06-15/make-hash-20130615-git.tgz"; + url = "https://beta.quicklisp.org/archive/make-hash/2013-06-15/make-hash-20130615-git.tgz"; sha256 = "1qa4mcmb3pv44py0j129dd8hjx09c2akpnds53b69151mgwv5qz8"; system = "make-hash"; asd = "make-hash"; @@ -71612,7 +72516,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "make-hash-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/make-hash/2013-06-15/make-hash-20130615-git.tgz"; + url = "https://beta.quicklisp.org/archive/make-hash/2013-06-15/make-hash-20130615-git.tgz"; sha256 = "1qa4mcmb3pv44py0j129dd8hjx09c2akpnds53b69151mgwv5qz8"; system = "make-hash-tests"; asd = "make-hash-tests"; @@ -71635,7 +72539,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "manifest" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/manifest/2012-02-08/manifest-20120208-git.tgz"; + url = "https://beta.quicklisp.org/archive/manifest/2012-02-08/manifest-20120208-git.tgz"; sha256 = "0dswslnskskdbsln6vi7w8cbypw001d81xaxkfn4g7m15m9pzkgf"; system = "manifest"; asd = "manifest"; @@ -71658,12 +72562,12 @@ lib.makeScope pkgs.newScope (self: { manifolds = ( build-asdf-system { pname = "manifolds"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "manifolds" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/manifolds/2024-10-12/manifolds-20241012-git.tgz"; - sha256 = "1q9hy2k1xabf8whnyxjiaqypbnbq84q94z1gmqgicxyzn7h3ybw4"; + url = "https://beta.quicklisp.org/archive/manifolds/2025-06-22/manifolds-20250622-git.tgz"; + sha256 = "0gygnblkd8x134lanj535mi14r5xgdp4kzv7g8a1l8p2drqqwrhw"; system = "manifolds"; asd = "manifolds"; } @@ -71679,30 +72583,6 @@ lib.makeScope pkgs.newScope (self: { }; } ); - manifolds-test = ( - build-asdf-system { - pname = "manifolds-test"; - version = "20241012-git"; - asds = [ "manifolds-test" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/manifolds/2024-10-12/manifolds-20241012-git.tgz"; - sha256 = "1q9hy2k1xabf8whnyxjiaqypbnbq84q94z1gmqgicxyzn7h3ybw4"; - system = "manifolds-test"; - asd = "manifolds-test"; - } - ); - systems = [ "manifolds-test" ]; - lispLibs = [ - (getAttr "cl-wavefront" self) - (getAttr "manifolds" self) - (getAttr "parachute" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); map-bind = ( build-asdf-system { pname = "map-bind"; @@ -71710,7 +72590,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "map-bind" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/map-bind/2012-08-11/map-bind-20120811-git.tgz"; + url = "https://beta.quicklisp.org/archive/map-bind/2012-08-11/map-bind-20120811-git.tgz"; sha256 = "06z02c0ypfrd789glbidnhf95839hardd7nr3i95l1adm8pas30f"; system = "map-bind"; asd = "map-bind"; @@ -71730,7 +72610,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "map-set" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/map-set/2023-06-18/map-set-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/map-set/2023-06-18/map-set-20230618-git.tgz"; sha256 = "1jlvgyvw9v49x65xvcc6vyy5nfgih43yysqj5v2555rm75p5ipgg"; system = "map-set"; asd = "map-set"; @@ -71750,7 +72630,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "marching-cubes" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/marching-cubes/2015-07-09/marching-cubes-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/marching-cubes/2015-07-09/marching-cubes-20150709-git.tgz"; sha256 = "013wyr4g82b2gk0j5jbkkshg9lal2m34px37blyclf6kr5sk6azh"; system = "marching-cubes"; asd = "marching-cubes"; @@ -71770,7 +72650,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "marching-cubes-example" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/marching-cubes/2015-07-09/marching-cubes-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/marching-cubes/2015-07-09/marching-cubes-20150709-git.tgz"; sha256 = "013wyr4g82b2gk0j5jbkkshg9lal2m34px37blyclf6kr5sk6azh"; system = "marching-cubes-example"; asd = "marching-cubes-example"; @@ -71790,7 +72670,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "marching-cubes-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/marching-cubes/2015-07-09/marching-cubes-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/marching-cubes/2015-07-09/marching-cubes-20150709-git.tgz"; sha256 = "013wyr4g82b2gk0j5jbkkshg9lal2m34px37blyclf6kr5sk6azh"; system = "marching-cubes-test"; asd = "marching-cubes-test"; @@ -71813,7 +72693,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "markdown.cl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/markdown.cl/2021-02-28/markdown.cl-20210228-git.tgz"; + url = "https://beta.quicklisp.org/archive/markdown.cl/2021-02-28/markdown.cl-20210228-git.tgz"; sha256 = "00yxg67skx3navq7fdsjy0wds16n9n12bhdzv08f43bgbwali7v8"; system = "markdown.cl"; asd = "markdown.cl"; @@ -71837,7 +72717,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "markdown.cl-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/markdown.cl/2021-02-28/markdown.cl-20210228-git.tgz"; + url = "https://beta.quicklisp.org/archive/markdown.cl/2021-02-28/markdown.cl-20210228-git.tgz"; sha256 = "00yxg67skx3navq7fdsjy0wds16n9n12bhdzv08f43bgbwali7v8"; system = "markdown.cl-test"; asd = "markdown.cl-test"; @@ -71857,12 +72737,12 @@ lib.makeScope pkgs.newScope (self: { markup = ( build-asdf-system { pname = "markup"; - version = "20230618-git"; + version = "20250622-git"; asds = [ "markup" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/markup/2023-06-18/markup-20230618-git.tgz"; - sha256 = "1paj76r1bfq4pr6m6j1mgik8b97sl2zgzy7rvvwwfrs2j1mf8byd"; + url = "https://beta.quicklisp.org/archive/markup/2025-06-22/markup-20250622-git.tgz"; + sha256 = "0hdi195jxv103zq7iwmhwka3whv33slvkzzzh17csan6d071qlf9"; system = "markup"; asd = "markup"; } @@ -71879,29 +72759,6 @@ lib.makeScope pkgs.newScope (self: { }; } ); - markup_dot_test = ( - build-asdf-system { - pname = "markup.test"; - version = "20230618-git"; - asds = [ "markup.test" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/markup/2023-06-18/markup-20230618-git.tgz"; - sha256 = "1paj76r1bfq4pr6m6j1mgik8b97sl2zgzy7rvvwwfrs2j1mf8byd"; - system = "markup.test"; - asd = "markup.test"; - } - ); - systems = [ "markup.test" ]; - lispLibs = [ - (getAttr "fiveam" self) - (getAttr "markup" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); marshal = ( build-asdf-system { pname = "marshal"; @@ -71909,7 +72766,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "marshal" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-marshal/2024-10-12/cl-marshal-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-marshal/2024-10-12/cl-marshal-20241012-git.tgz"; sha256 = "081j2gfjdg05xzcq0jzqxjb874wkjdbxk9vah7hmlw9d767mzs5b"; system = "marshal"; asd = "marshal"; @@ -71927,7 +72784,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "marshal-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-marshal/2024-10-12/cl-marshal-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-marshal/2024-10-12/cl-marshal-20241012-git.tgz"; sha256 = "081j2gfjdg05xzcq0jzqxjb874wkjdbxk9vah7hmlw9d767mzs5b"; system = "marshal-tests"; asd = "marshal-tests"; @@ -71946,12 +72803,12 @@ lib.makeScope pkgs.newScope (self: { math = ( build-asdf-system { pname = "math"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "math" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/math/2024-10-12/math-20241012-git.tgz"; - sha256 = "104rga7fqq3xvdxryhmgdq8zygd00zk5xb05glwqw01ygl3bc0r3"; + url = "https://beta.quicklisp.org/archive/math/2025-06-22/math-20250622-git.tgz"; + sha256 = "1rgx28m2cjp7bmrnmdhl4f74sdwvs6f4n15699hqhds3p11yk4r8"; system = "math"; asd = "math"; } @@ -71976,7 +72833,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mathkit" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mathkit/2016-02-08/mathkit-20160208-git.tgz"; + url = "https://beta.quicklisp.org/archive/mathkit/2016-02-08/mathkit-20160208-git.tgz"; sha256 = "174y6ndmf52h8sml87qjfl48llmynvdizzk2h0mr85zbaysx73i3"; system = "mathkit"; asd = "mathkit"; @@ -71996,7 +72853,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "matrix-case" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/matrix-case/2021-10-20/matrix-case-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/matrix-case/2021-10-20/matrix-case-20211020-git.tgz"; sha256 = "17k7x7wcl78xw4ajd38gva2dw7snsm9jppbnnl4by2s0grsqg50a"; system = "matrix-case"; asd = "matrix-case"; @@ -72016,7 +72873,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "matrix-case.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/matrix-case/2021-10-20/matrix-case-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/matrix-case/2021-10-20/matrix-case-20211020-git.tgz"; sha256 = "17k7x7wcl78xw4ajd38gva2dw7snsm9jppbnnl4by2s0grsqg50a"; system = "matrix-case.test"; asd = "matrix-case.test"; @@ -72039,7 +72896,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "maxpc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maxpc/2020-04-27/maxpc-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/maxpc/2020-04-27/maxpc-20200427-git.tgz"; sha256 = "15wrjbr2js6j67c1dd4p2qxj49q9iqv1lhb7cwdcwpn79crr39gf"; system = "maxpc"; asd = "maxpc"; @@ -72055,12 +72912,12 @@ lib.makeScope pkgs.newScope (self: { maxpc-apache = ( build-asdf-system { pname = "maxpc-apache"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maxpc-apache" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz"; - sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn"; + url = "https://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz"; + sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf"; system = "maxpc-apache"; asd = "maxpc-apache"; } @@ -72075,12 +72932,12 @@ lib.makeScope pkgs.newScope (self: { maxpc-apache-test = ( build-asdf-system { pname = "maxpc-apache-test"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "maxpc-apache-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz"; - sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn"; + url = "https://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz"; + sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf"; system = "maxpc-apache-test"; asd = "maxpc-apache-test"; } @@ -72099,7 +72956,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "maxpc-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/maxpc/2020-04-27/maxpc-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/maxpc/2020-04-27/maxpc-20200427-git.tgz"; sha256 = "15wrjbr2js6j67c1dd4p2qxj49q9iqv1lhb7cwdcwpn79crr39gf"; system = "maxpc-test"; asd = "maxpc-test"; @@ -72119,7 +72976,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mbe" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mbe/2020-02-18/mbe-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/mbe/2020-02-18/mbe-20200218-git.tgz"; sha256 = "1wlhlddfv0jbqliqlvhxkmmj9pfym0f9qlvjjmlrkvx6fxpv0450"; system = "mbe"; asd = "mbe"; @@ -72139,7 +72996,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mcase" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcase/2021-10-20/mcase-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/mcase/2021-10-20/mcase-20211020-git.tgz"; sha256 = "1k0agm57xbzlskdi8cgsg2z9lsamm4jl6fw7687z3bw1s2dbsm59"; system = "mcase"; asd = "mcase"; @@ -72162,7 +73019,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mcase.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcase/2021-10-20/mcase-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/mcase/2021-10-20/mcase-20211020-git.tgz"; sha256 = "1k0agm57xbzlskdi8cgsg2z9lsamm4jl6fw7687z3bw1s2dbsm59"; system = "mcase.test"; asd = "mcase.test"; @@ -72181,12 +73038,12 @@ lib.makeScope pkgs.newScope (self: { mcclim = ( build-asdf-system { pname = "mcclim"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "mcclim" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "mcclim"; asd = "mcclim"; } @@ -72212,12 +73069,12 @@ lib.makeScope pkgs.newScope (self: { mcclim-bezier = ( build-asdf-system { pname = "mcclim-bezier"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "mcclim-bezier" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "mcclim-bezier"; asd = "mcclim-bezier"; } @@ -72240,12 +73097,12 @@ lib.makeScope pkgs.newScope (self: { mcclim-bitmaps = ( build-asdf-system { pname = "mcclim-bitmaps"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "mcclim-bitmaps" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "mcclim-bitmaps"; asd = "mcclim-bitmaps"; } @@ -72263,12 +73120,12 @@ lib.makeScope pkgs.newScope (self: { mcclim-clx = ( build-asdf-system { pname = "mcclim-clx"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "mcclim-clx" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "mcclim-clx"; asd = "mcclim-clx"; } @@ -72296,12 +73153,12 @@ lib.makeScope pkgs.newScope (self: { mcclim-clx-fb = ( build-asdf-system { pname = "mcclim-clx-fb"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "mcclim-clx-fb" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "mcclim-clx-fb"; asd = "mcclim-clx-fb"; } @@ -72319,12 +73176,12 @@ lib.makeScope pkgs.newScope (self: { mcclim-dot = ( build-asdf-system { pname = "mcclim-dot"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "mcclim-dot" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "mcclim-dot"; asd = "mcclim-dot"; } @@ -72347,12 +73204,12 @@ lib.makeScope pkgs.newScope (self: { mcclim-fontconfig = ( build-asdf-system { pname = "mcclim-fontconfig"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "mcclim-fontconfig" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "mcclim-fontconfig"; asd = "mcclim-fontconfig"; } @@ -72371,12 +73228,12 @@ lib.makeScope pkgs.newScope (self: { mcclim-fonts = ( build-asdf-system { pname = "mcclim-fonts"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "mcclim-fonts" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "mcclim-fonts"; asd = "mcclim-fonts"; } @@ -72391,12 +73248,12 @@ lib.makeScope pkgs.newScope (self: { mcclim-franz = ( build-asdf-system { pname = "mcclim-franz"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "mcclim-franz" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "mcclim-franz"; asd = "mcclim-franz"; } @@ -72411,12 +73268,12 @@ lib.makeScope pkgs.newScope (self: { mcclim-harfbuzz = ( build-asdf-system { pname = "mcclim-harfbuzz"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "mcclim-harfbuzz" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "mcclim-harfbuzz"; asd = "mcclim-harfbuzz"; } @@ -72436,12 +73293,12 @@ lib.makeScope pkgs.newScope (self: { mcclim-layouts = ( build-asdf-system { pname = "mcclim-layouts"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "mcclim-layouts" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "mcclim-layouts"; asd = "mcclim-layouts"; } @@ -72456,12 +73313,12 @@ lib.makeScope pkgs.newScope (self: { mcclim-null = ( build-asdf-system { pname = "mcclim-null"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "mcclim-null" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "mcclim-null"; asd = "mcclim-null"; } @@ -72476,12 +73333,12 @@ lib.makeScope pkgs.newScope (self: { mcclim-raster-image = ( build-asdf-system { pname = "mcclim-raster-image"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "mcclim-raster-image" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "mcclim-raster-image"; asd = "mcclim-raster-image"; } @@ -72499,12 +73356,12 @@ lib.makeScope pkgs.newScope (self: { mcclim-render = ( build-asdf-system { pname = "mcclim-render"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "mcclim-render" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "mcclim-render"; asd = "mcclim-render"; } @@ -72528,12 +73385,12 @@ lib.makeScope pkgs.newScope (self: { mcclim-svg = ( build-asdf-system { pname = "mcclim-svg"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "mcclim-svg" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "mcclim-svg"; asd = "mcclim-svg"; } @@ -72561,12 +73418,12 @@ lib.makeScope pkgs.newScope (self: { mcclim-tooltips = ( build-asdf-system { pname = "mcclim-tooltips"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "mcclim-tooltips" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "mcclim-tooltips"; asd = "mcclim-tooltips"; } @@ -72581,12 +73438,12 @@ lib.makeScope pkgs.newScope (self: { mcclim-tree-with-cross-edges = ( build-asdf-system { pname = "mcclim-tree-with-cross-edges"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "mcclim-tree-with-cross-edges" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "mcclim-tree-with-cross-edges"; asd = "mcclim-tree-with-cross-edges"; } @@ -72605,7 +73462,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "md5" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/md5/2021-06-30/md5-20210630-git.tgz"; + url = "https://beta.quicklisp.org/archive/md5/2021-06-30/md5-20210630-git.tgz"; sha256 = "1g20np6rhn3y08z8mlmlk721mw2207s52v2pwp4smm3lz25sx3q5"; system = "md5"; asd = "md5"; @@ -72623,7 +73480,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "media-types" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/media-types/2022-03-31/media-types-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/media-types/2022-03-31/media-types-20220331-git.tgz"; sha256 = "07ly7jr0ff2ks4gyjpq2jyj9gm47frllal5is3iqhc4xrmpyzrqc"; system = "media-types"; asd = "media-types"; @@ -72647,7 +73504,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mel-base" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mel-base/2018-02-28/mel-base-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/mel-base/2018-02-28/mel-base-20180228-git.tgz"; sha256 = "1dvhmlkxasww3kb7xnwqlmdvi31w2awjrbkgk5d0hsfzqmyhhjh0"; system = "mel-base"; asd = "mel-base"; @@ -72671,7 +73528,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "memoize" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/memoize/2014-08-26/memoize-20140826-http.tgz"; + url = "https://beta.quicklisp.org/archive/memoize/2014-08-26/memoize-20140826-http.tgz"; sha256 = "1f1plqy9xdv40235b7kkm63gsgssk8l81azhfniy8j9yww39gihf"; system = "memoize"; asd = "memoize"; @@ -72687,12 +73544,12 @@ lib.makeScope pkgs.newScope (self: { memory-regions = ( build-asdf-system { pname = "memory-regions"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "memory-regions" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/memory-regions/2024-10-12/memory-regions-20241012-git.tgz"; - sha256 = "0j2qfbh2kwl8k6v0h0pbh5hml8aia888kaq4kgb12nfslim81iyd"; + url = "https://beta.quicklisp.org/archive/memory-regions/2025-06-22/memory-regions-20250622-git.tgz"; + sha256 = "1a4w7h4bciszdk9m3yc1n20kawnxbplrxh3qy2l53x8qp20ydsp5"; system = "memory-regions"; asd = "memory-regions"; } @@ -72719,7 +73576,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "message-oo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/message-oo/2013-06-15/message-oo-20130615-git.tgz"; + url = "https://beta.quicklisp.org/archive/message-oo/2013-06-15/message-oo-20130615-git.tgz"; sha256 = "164yypzhr6pxb84x47s9vjl97imbq5r8sxan22101q0y1jn3dznp"; system = "message-oo"; asd = "message-oo"; @@ -72735,12 +73592,12 @@ lib.makeScope pkgs.newScope (self: { messagebox = ( build-asdf-system { pname = "messagebox"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "messagebox" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/messagebox/2024-10-12/messagebox-20241012-git.tgz"; - sha256 = "0wf25rfx7vg0l1mnzjjzwjqcjaa96a95k9diijppn7y9v2knr1qq"; + url = "https://beta.quicklisp.org/archive/messagebox/2025-06-22/messagebox-20250622-git.tgz"; + sha256 = "197bfxh4w7m967chsbv76qf65r9z7m7fi16b76g8l5vdpf9v6aaw"; system = "messagebox"; asd = "messagebox"; } @@ -72762,7 +73619,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "meta" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/meta/2015-06-08/meta-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/meta/2015-06-08/meta-20150608-git.tgz"; sha256 = "08s53zj3mcx82kszp1bg2vsb4kydvkc70kj4hpq9h1l5a1wh44cy"; system = "meta"; asd = "meta"; @@ -72782,7 +73639,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "meta-sexp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/meta-sexp/2020-10-16/meta-sexp-20201016-git.tgz"; + url = "https://beta.quicklisp.org/archive/meta-sexp/2020-10-16/meta-sexp-20201016-git.tgz"; sha256 = "14z4xglybsj4pdaifhjvnki0vm0wg985x00n94djc0fdcclczv1c"; system = "meta-sexp"; asd = "meta-sexp"; @@ -72802,7 +73659,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "metabang-bind" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/metabang-bind/2023-06-18/metabang-bind-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/metabang-bind/2023-06-18/metabang-bind-20230618-git.tgz"; sha256 = "14g7k3zhm8cd6bssc5mm5h6iq1dv5lfhiq33aimcmj5a6vbiq47d"; system = "metabang-bind"; asd = "metabang-bind"; @@ -72820,7 +73677,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "metabang-bind-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/metabang-bind/2023-06-18/metabang-bind-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/metabang-bind/2023-06-18/metabang-bind-20230618-git.tgz"; sha256 = "14g7k3zhm8cd6bssc5mm5h6iq1dv5lfhiq33aimcmj5a6vbiq47d"; system = "metabang-bind-test"; asd = "metabang-bind-test"; @@ -72843,7 +73700,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "metacopy" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/metacopy/2017-04-03/metacopy-20170403-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/metacopy/2017-04-03/metacopy-20170403-darcs.tgz"; sha256 = "1xwvc18l5fc33ffqa6jz5g0qz6mpabia81bcmqf3sz24apkpr49x"; system = "metacopy"; asd = "metacopy"; @@ -72863,7 +73720,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "metacopy-with-contextl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/metacopy/2017-04-03/metacopy-20170403-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/metacopy/2017-04-03/metacopy-20170403-darcs.tgz"; sha256 = "1xwvc18l5fc33ffqa6jz5g0qz6mpabia81bcmqf3sz24apkpr49x"; system = "metacopy-with-contextl"; asd = "metacopy-with-contextl"; @@ -72886,7 +73743,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "metalock" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/metalock/2020-09-25/metalock-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/metalock/2020-09-25/metalock-20200925-git.tgz"; sha256 = "0z2vk0s694zhnkai593q42vln5a6ykm8pilyikc4qp9aw9r43lc5"; system = "metalock"; asd = "metalock"; @@ -72909,7 +73766,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "metap" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/metap/2015-05-05/metap-20150505-git.tgz"; + url = "https://beta.quicklisp.org/archive/metap/2015-05-05/metap-20150505-git.tgz"; sha256 = "0drqyjscl0lmhgplld6annmlqma83q76xkxnahcq4ksnhpbsz9wx"; system = "metap"; asd = "metap"; @@ -72929,7 +73786,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "metap-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/metap/2015-05-05/metap-20150505-git.tgz"; + url = "https://beta.quicklisp.org/archive/metap/2015-05-05/metap-20150505-git.tgz"; sha256 = "0drqyjscl0lmhgplld6annmlqma83q76xkxnahcq4ksnhpbsz9wx"; system = "metap-test"; asd = "metap-test"; @@ -72952,7 +73809,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "metatilities" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/metatilities/2018-02-28/metatilities-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/metatilities/2018-02-28/metatilities-20180228-git.tgz"; sha256 = "0vqhndnhrv40ixkj5lslr0h2fy79609gi0wgbqzcz82vkyx9d6vd"; system = "metatilities"; asd = "metatilities"; @@ -72978,7 +73835,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "metatilities-base" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/metatilities-base/2019-12-27/metatilities-base-20191227-git.tgz"; + url = "https://beta.quicklisp.org/archive/metatilities-base/2019-12-27/metatilities-base-20191227-git.tgz"; sha256 = "069rk5ncwvjnnzvvky6xiriynl72yzvjpnzl6jw9jf3b8na14zrk"; system = "metatilities-base"; asd = "metatilities-base"; @@ -72996,7 +73853,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "metatilities-base-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/metatilities-base/2019-12-27/metatilities-base-20191227-git.tgz"; + url = "https://beta.quicklisp.org/archive/metatilities-base/2019-12-27/metatilities-base-20191227-git.tgz"; sha256 = "069rk5ncwvjnnzvvky6xiriynl72yzvjpnzl6jw9jf3b8na14zrk"; system = "metatilities-base-test"; asd = "metatilities-base-test"; @@ -73019,7 +73876,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "metatilities-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/metatilities/2018-02-28/metatilities-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/metatilities/2018-02-28/metatilities-20180228-git.tgz"; sha256 = "0vqhndnhrv40ixkj5lslr0h2fy79609gi0wgbqzcz82vkyx9d6vd"; system = "metatilities-test"; asd = "metatilities-test"; @@ -73042,7 +73899,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "metering" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/metering/2020-02-18/metering-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/metering/2020-02-18/metering-20200218-git.tgz"; sha256 = "0jx3ypk8m815yp7208xkcxkvila847mvna25a2p22ihnj0ms9rn1"; system = "metering"; asd = "metering"; @@ -73062,7 +73919,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "method-combination-utilities" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/method-combination-utilities/2024-10-12/method-combination-utilities-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/method-combination-utilities/2024-10-12/method-combination-utilities-20241012-git.tgz"; sha256 = "15wjzf6r9kkfw89rgzhrr60p5b4i15b90nr3wz6idkv3n4j7fsjl"; system = "method-combination-utilities"; asd = "method-combination-utilities"; @@ -73082,7 +73939,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "method-combination-utilities.tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/method-combination-utilities/2024-10-12/method-combination-utilities-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/method-combination-utilities/2024-10-12/method-combination-utilities-20241012-git.tgz"; sha256 = "15wjzf6r9kkfw89rgzhrr60p5b4i15b90nr3wz6idkv3n4j7fsjl"; system = "method-combination-utilities.tests"; asd = "method-combination-utilities"; @@ -73105,7 +73962,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "method-hooks" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/method-hooks/2020-09-25/method-hooks-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/method-hooks/2020-09-25/method-hooks-20200925-git.tgz"; sha256 = "0kzijk02wjzms3hihmn6n6p9r6awkrsqlkghf6ixzf6400fiy212"; system = "method-hooks"; asd = "method-hooks"; @@ -73125,7 +73982,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "method-hooks-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/method-hooks/2020-09-25/method-hooks-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/method-hooks/2020-09-25/method-hooks-20200925-git.tgz"; sha256 = "0kzijk02wjzms3hihmn6n6p9r6awkrsqlkghf6ixzf6400fiy212"; system = "method-hooks-test"; asd = "method-hooks-test"; @@ -73148,7 +74005,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "method-versions" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/method-versions/2011-05-22/method-versions_0.1.2011.05.18.tgz"; + url = "https://beta.quicklisp.org/archive/method-versions/2011-05-22/method-versions_0.1.2011.05.18.tgz"; sha256 = "119x3dbjry25issq2m8xcacknd1y9mcnla5rhqzcsrj58zsmwmwf"; system = "method-versions"; asd = "method-versions"; @@ -73168,7 +74025,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mexpr" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mexpr/2015-07-09/mexpr-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/mexpr/2015-07-09/mexpr-20150709-git.tgz"; sha256 = "0ri9cp7vhnn9sah1lhvxn523c342n0q4v0xzi6fzlfvpj84jfzqk"; system = "mexpr"; asd = "mexpr"; @@ -73191,7 +74048,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mexpr-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mexpr/2015-07-09/mexpr-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/mexpr/2015-07-09/mexpr-20150709-git.tgz"; sha256 = "0ri9cp7vhnn9sah1lhvxn523c342n0q4v0xzi6fzlfvpj84jfzqk"; system = "mexpr-tests"; asd = "mexpr-tests"; @@ -73215,7 +74072,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mfiano-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mfiano-utils/2023-02-14/mfiano-utils-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/mfiano-utils/2023-02-14/mfiano-utils-20230214-git.tgz"; sha256 = "06nrrwwlrwi4w87y6888759b5vpa5264lli5m4crl9r9lr9bnay9"; system = "mfiano-utils"; asd = "mfiano-utils"; @@ -73234,12 +74091,12 @@ lib.makeScope pkgs.newScope (self: { mgl = ( build-asdf-system { pname = "mgl"; - version = "20230618-git"; + version = "20250622-git"; asds = [ "mgl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mgl/2023-06-18/mgl-20230618-git.tgz"; - sha256 = "1jr2jill9b1rq0msy0bzzl0q2w0bm3gpd0dwrmkyazzjym2rdsjx"; + url = "https://beta.quicklisp.org/archive/mgl/2025-06-22/mgl-20250622-git.tgz"; + sha256 = "04c7cy77a7h6chj7f8y3bnk0hm832pfki9yf2rm4vni6jm7qmcrf"; system = "mgl"; asd = "mgl"; } @@ -73265,12 +74122,12 @@ lib.makeScope pkgs.newScope (self: { mgl-example = ( build-asdf-system { pname = "mgl-example"; - version = "20230618-git"; + version = "20250622-git"; asds = [ "mgl-example" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mgl/2023-06-18/mgl-20230618-git.tgz"; - sha256 = "1jr2jill9b1rq0msy0bzzl0q2w0bm3gpd0dwrmkyazzjym2rdsjx"; + url = "https://beta.quicklisp.org/archive/mgl/2025-06-22/mgl-20250622-git.tgz"; + sha256 = "04c7cy77a7h6chj7f8y3bnk0hm832pfki9yf2rm4vni6jm7qmcrf"; system = "mgl-example"; asd = "mgl-example"; } @@ -73285,12 +74142,12 @@ lib.makeScope pkgs.newScope (self: { mgl-gnuplot = ( build-asdf-system { pname = "mgl-gnuplot"; - version = "20230618-git"; + version = "20250622-git"; asds = [ "mgl-gnuplot" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mgl/2023-06-18/mgl-20230618-git.tgz"; - sha256 = "1jr2jill9b1rq0msy0bzzl0q2w0bm3gpd0dwrmkyazzjym2rdsjx"; + url = "https://beta.quicklisp.org/archive/mgl/2025-06-22/mgl-20250622-git.tgz"; + sha256 = "04c7cy77a7h6chj7f8y3bnk0hm832pfki9yf2rm4vni6jm7qmcrf"; system = "mgl-gnuplot"; asd = "mgl-gnuplot"; } @@ -73305,15 +74162,38 @@ lib.makeScope pkgs.newScope (self: { }; } ); + mgl-gpr = ( + build-asdf-system { + pname = "mgl-gpr"; + version = "20250622-git"; + asds = [ "mgl-gpr" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/mgl-gpr/2025-06-22/mgl-gpr-20250622-git.tgz"; + sha256 = "1y505j39b1gp6zfsmhz56aqnrif16h42wwrwl8778ailamq15zsv"; + system = "mgl-gpr"; + asd = "mgl-gpr"; + } + ); + systems = [ "mgl-gpr" ]; + lispLibs = [ + (getAttr "alexandria" self) + (getAttr "mgl-pax" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); mgl-mat = ( build-asdf-system { pname = "mgl-mat"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "mgl-mat" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mgl-mat/2023-10-21/mgl-mat-20231021-git.tgz"; - sha256 = "0pl9ksdjr57sg2w85ql6y9pgbzrxcsz6irb7i0s1q3d08f87il1i"; + url = "https://beta.quicklisp.org/archive/mgl-mat/2025-06-22/mgl-mat-20250622-git.tgz"; + sha256 = "0bd0dcapmg22w8l37gdc3l5pglbhka5qnla4yd91gc4k01jh6pkd"; system = "mgl-mat"; asd = "mgl-mat"; } @@ -73339,12 +74219,12 @@ lib.makeScope pkgs.newScope (self: { mgl-pax = ( build-asdf-system { pname = "mgl-pax"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "mgl-pax" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mgl-pax/2024-10-12/mgl-pax-20241012-git.tgz"; - sha256 = "17szk2ijccssa9n7zg8qh6hc706hahvzcrzlx716hmgq2hfwvvy0"; + url = "https://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz"; + sha256 = "09wcwil8jyxm34cs7x1i3vclj84n6gxzxp21k0d23129c9adhi66"; system = "mgl-pax"; asd = "mgl-pax"; } @@ -73363,18 +74243,21 @@ lib.makeScope pkgs.newScope (self: { mgl-pax-bootstrap = ( build-asdf-system { pname = "mgl-pax-bootstrap"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "mgl-pax-bootstrap" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mgl-pax/2024-10-12/mgl-pax-20241012-git.tgz"; - sha256 = "17szk2ijccssa9n7zg8qh6hc706hahvzcrzlx716hmgq2hfwvvy0"; + url = "https://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz"; + sha256 = "09wcwil8jyxm34cs7x1i3vclj84n6gxzxp21k0d23129c9adhi66"; system = "mgl-pax-bootstrap"; asd = "mgl-pax-bootstrap"; } ); systems = [ "mgl-pax-bootstrap" ]; - lispLibs = [ (getAttr "mgl-pax_dot_asdf" self) ]; + lispLibs = [ + (getAttr "autoload" self) + (getAttr "mgl-pax_dot_asdf" self) + ]; meta = { hydraPlatforms = [ ]; }; @@ -73383,12 +74266,12 @@ lib.makeScope pkgs.newScope (self: { mgl-pax-test = ( build-asdf-system { pname = "mgl-pax-test"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "mgl-pax-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mgl-pax/2024-10-12/mgl-pax-20241012-git.tgz"; - sha256 = "17szk2ijccssa9n7zg8qh6hc706hahvzcrzlx716hmgq2hfwvvy0"; + url = "https://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz"; + sha256 = "09wcwil8jyxm34cs7x1i3vclj84n6gxzxp21k0d23129c9adhi66"; system = "mgl-pax-test"; asd = "mgl-pax-test"; } @@ -73397,10 +74280,12 @@ lib.makeScope pkgs.newScope (self: { lispLibs = [ (getAttr "_3bmd" self) (getAttr "_3bmd-ext-code-blocks" self) + (getAttr "_3bmd-ext-math" self) (getAttr "alexandria" self) (getAttr "colorize" self) (getAttr "dref" self) (getAttr "dref-test" self) + (getAttr "hunchentoot" self) (getAttr "md5" self) (getAttr "mgl-pax" self) (getAttr "mgl-pax_dot_asdf" self) @@ -73416,12 +74301,12 @@ lib.makeScope pkgs.newScope (self: { mgl-pax_dot_asdf = ( build-asdf-system { pname = "mgl-pax.asdf"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "mgl-pax.asdf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mgl-pax/2024-10-12/mgl-pax-20241012-git.tgz"; - sha256 = "17szk2ijccssa9n7zg8qh6hc706hahvzcrzlx716hmgq2hfwvvy0"; + url = "https://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz"; + sha256 = "09wcwil8jyxm34cs7x1i3vclj84n6gxzxp21k0d23129c9adhi66"; system = "mgl-pax.asdf"; asd = "mgl-pax.asdf"; } @@ -73440,7 +74325,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mgrs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mgrs/2022-03-31/mgrs-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/mgrs/2022-03-31/mgrs-20220331-git.tgz"; sha256 = "1n4kd734qjj7mrcg0q28hml3npam1rm067iwljwc87zshnxh5gmn"; system = "mgrs"; asd = "mgrs"; @@ -73456,12 +74341,12 @@ lib.makeScope pkgs.newScope (self: { micmac = ( build-asdf-system { pname = "micmac"; - version = "20230618-git"; + version = "20250622-git"; asds = [ "micmac" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/micmac/2023-06-18/micmac-20230618-git.tgz"; - sha256 = "10zjxqc7y5spr3y5yrnfqmv881ia168scbhiq8i98rvizabgxf6x"; + url = "https://beta.quicklisp.org/archive/micmac/2025-06-22/micmac-20250622-git.tgz"; + sha256 = "1xm0smgbsmlkyp3zc48s1zziv6irbf3ahvq3j1dchdrkfwrwbqhi"; system = "micmac"; asd = "micmac"; } @@ -73483,7 +74368,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "midi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/midi/2010-10-06/midi-20070618.tgz"; + url = "https://beta.quicklisp.org/archive/midi/2010-10-06/midi-20070618.tgz"; sha256 = "06hb6vm4dckhr1ln5jn3b31x1yampkl5fl0lfbg9zyazli7fgl87"; system = "midi"; asd = "midi"; @@ -73503,7 +74388,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "millet" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/millet/2021-12-09/millet-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/millet/2021-12-09/millet-20211209-git.tgz"; sha256 = "1jdqyr1f9a6083k7n88rwc6mjmgccj6za50ybl1dlnxqvqj2pw80"; system = "millet"; asd = "millet"; @@ -73523,7 +74408,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "millet.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/millet/2021-12-09/millet-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/millet/2021-12-09/millet-20211209-git.tgz"; sha256 = "1jdqyr1f9a6083k7n88rwc6mjmgccj6za50ybl1dlnxqvqj2pw80"; system = "millet.test"; asd = "millet.test"; @@ -73547,7 +74432,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "minheap" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/minheap/2016-06-28/minheap-20160628-git.tgz"; + url = "https://beta.quicklisp.org/archive/minheap/2016-06-28/minheap-20160628-git.tgz"; sha256 = "03v0dqxg4kmwvfrlrkq8bmfcv70k9n9f48p9p3z8kmfbc4p3f1vd"; system = "minheap"; asd = "minheap"; @@ -73565,7 +74450,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "minheap-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/minheap/2016-06-28/minheap-20160628-git.tgz"; + url = "https://beta.quicklisp.org/archive/minheap/2016-06-28/minheap-20160628-git.tgz"; sha256 = "03v0dqxg4kmwvfrlrkq8bmfcv70k9n9f48p9p3z8kmfbc4p3f1vd"; system = "minheap-tests"; asd = "minheap-tests"; @@ -73588,7 +74473,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mini-cas" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mini-cas/2015-09-23/mini-cas-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/mini-cas/2015-09-23/mini-cas-20150923-git.tgz"; sha256 = "1y9a111877lkpssi651q684mj052vp6qr9pz5gl47s6swiqvqp24"; system = "mini-cas"; asd = "mini-cas"; @@ -73608,7 +74493,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "minilem" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/minilem/2020-02-18/minilem-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/minilem/2020-02-18/minilem-20200218-git.tgz"; sha256 = "1hpcgj8k5m11nk1pfd479hrbh15dcas7z1s8w877rqmlf69ga4cp"; system = "minilem"; asd = "minilem"; @@ -73644,7 +74529,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "minpack" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; system = "minpack"; asd = "minpack"; @@ -73660,12 +74545,12 @@ lib.makeScope pkgs.newScope (self: { misc-extensions = ( build-asdf-system { pname = "misc-extensions"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "misc-extensions" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/misc-extensions/2024-10-12/misc-extensions-20241012-git.tgz"; - sha256 = "0pvgg376vkydp2831bnnvwrv27m4ivc78c0nhvb4848c3ik1hn5j"; + url = "https://beta.quicklisp.org/archive/misc-extensions/2025-06-22/misc-extensions-20250622-git.tgz"; + sha256 = "168gi0d77rqh2nl1v8h3sj2ajjc9dk2imgbbir4y5v10915mzb6l"; system = "misc-extensions"; asd = "misc-extensions"; } @@ -73678,12 +74563,12 @@ lib.makeScope pkgs.newScope (self: { mito = ( build-asdf-system { pname = "mito"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "mito" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mito/2024-10-12/mito-20241012-git.tgz"; - sha256 = "0nz72qss2jji0narxffpnpfgz74grvhmwqqlydpw6wv3ji1rrrq3"; + url = "https://beta.quicklisp.org/archive/mito/2025-06-22/mito-20250622-git.tgz"; + sha256 = "17s00avmyy3ghzxb43hvjx2250w5b24vbcg2daf811qirl05s096"; system = "mito"; asd = "mito"; } @@ -73707,7 +74592,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mito-attachment" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mito-attachment/2023-02-14/mito-attachment-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/mito-attachment/2023-02-14/mito-attachment-20230214-git.tgz"; sha256 = "0an744m6wmnbb5zrxqxcf719r7im1n7p63z632p3m5sqv8d86fm1"; system = "mito-attachment"; asd = "mito-attachment"; @@ -73732,12 +74617,12 @@ lib.makeScope pkgs.newScope (self: { mito-auth = ( build-asdf-system { pname = "mito-auth"; - version = "20171019-git"; + version = "20250622-git"; asds = [ "mito-auth" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mito-auth/2017-10-19/mito-auth-20171019-git.tgz"; - sha256 = "1q1yxjpnshzmia34a68dlscjadzynzyzz14sr4mkkkjyg5dhkazi"; + url = "https://beta.quicklisp.org/archive/mito-auth/2025-06-22/mito-auth-20250622-git.tgz"; + sha256 = "1xffrhlihkn1mckyxrxz5kjy44y85vbyrhdzg7iaixy5qf742b45"; system = "mito-auth"; asd = "mito-auth"; } @@ -73756,12 +74641,12 @@ lib.makeScope pkgs.newScope (self: { mito-core = ( build-asdf-system { pname = "mito-core"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "mito-core" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mito/2024-10-12/mito-20241012-git.tgz"; - sha256 = "0nz72qss2jji0narxffpnpfgz74grvhmwqqlydpw6wv3ji1rrrq3"; + url = "https://beta.quicklisp.org/archive/mito/2025-06-22/mito-20250622-git.tgz"; + sha256 = "17s00avmyy3ghzxb43hvjx2250w5b24vbcg2daf811qirl05s096"; system = "mito-core"; asd = "mito-core"; } @@ -73786,12 +74671,12 @@ lib.makeScope pkgs.newScope (self: { mito-migration = ( build-asdf-system { pname = "mito-migration"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "mito-migration" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mito/2024-10-12/mito-20241012-git.tgz"; - sha256 = "0nz72qss2jji0narxffpnpfgz74grvhmwqqlydpw6wv3ji1rrrq3"; + url = "https://beta.quicklisp.org/archive/mito/2025-06-22/mito-20250622-git.tgz"; + sha256 = "17s00avmyy3ghzxb43hvjx2250w5b24vbcg2daf811qirl05s096"; system = "mito-migration"; asd = "mito-migration"; } @@ -73814,12 +74699,12 @@ lib.makeScope pkgs.newScope (self: { mito-test = ( build-asdf-system { pname = "mito-test"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "mito-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mito/2024-10-12/mito-20241012-git.tgz"; - sha256 = "0nz72qss2jji0narxffpnpfgz74grvhmwqqlydpw6wv3ji1rrrq3"; + url = "https://beta.quicklisp.org/archive/mito/2025-06-22/mito-20250622-git.tgz"; + sha256 = "17s00avmyy3ghzxb43hvjx2250w5b24vbcg2daf811qirl05s096"; system = "mito-test"; asd = "mito-test"; } @@ -73840,12 +74725,12 @@ lib.makeScope pkgs.newScope (self: { mixalot = ( build-asdf-system { pname = "mixalot"; - version = "20151218-git"; + version = "20250622-git"; asds = [ "mixalot" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mixalot/2015-12-18/mixalot-20151218-git.tgz"; - sha256 = "0kqx933k8kly4yhzvspizzki556s1lfd4zafap42jcsqqhr4i5q9"; + url = "https://beta.quicklisp.org/archive/mixalot/2025-06-22/mixalot-20250622-git.tgz"; + sha256 = "0w17m06rf8masgslnzva6c9dnbim8g99w2c4m93dhfc0bm2m98wb"; system = "mixalot"; asd = "mixalot"; } @@ -73864,12 +74749,12 @@ lib.makeScope pkgs.newScope (self: { mixalot-flac = ( build-asdf-system { pname = "mixalot-flac"; - version = "20151218-git"; + version = "20250622-git"; asds = [ "mixalot-flac" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mixalot/2015-12-18/mixalot-20151218-git.tgz"; - sha256 = "0kqx933k8kly4yhzvspizzki556s1lfd4zafap42jcsqqhr4i5q9"; + url = "https://beta.quicklisp.org/archive/mixalot/2025-06-22/mixalot-20250622-git.tgz"; + sha256 = "0w17m06rf8masgslnzva6c9dnbim8g99w2c4m93dhfc0bm2m98wb"; system = "mixalot-flac"; asd = "mixalot-flac"; } @@ -73888,12 +74773,12 @@ lib.makeScope pkgs.newScope (self: { mixalot-mp3 = ( build-asdf-system { pname = "mixalot-mp3"; - version = "20151218-git"; + version = "20250622-git"; asds = [ "mixalot-mp3" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mixalot/2015-12-18/mixalot-20151218-git.tgz"; - sha256 = "0kqx933k8kly4yhzvspizzki556s1lfd4zafap42jcsqqhr4i5q9"; + url = "https://beta.quicklisp.org/archive/mixalot/2025-06-22/mixalot-20250622-git.tgz"; + sha256 = "0w17m06rf8masgslnzva6c9dnbim8g99w2c4m93dhfc0bm2m98wb"; system = "mixalot-mp3"; asd = "mixalot-mp3"; } @@ -73912,12 +74797,12 @@ lib.makeScope pkgs.newScope (self: { mixalot-vorbis = ( build-asdf-system { pname = "mixalot-vorbis"; - version = "20151218-git"; + version = "20250622-git"; asds = [ "mixalot-vorbis" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mixalot/2015-12-18/mixalot-20151218-git.tgz"; - sha256 = "0kqx933k8kly4yhzvspizzki556s1lfd4zafap42jcsqqhr4i5q9"; + url = "https://beta.quicklisp.org/archive/mixalot/2025-06-22/mixalot-20250622-git.tgz"; + sha256 = "0w17m06rf8masgslnzva6c9dnbim8g99w2c4m93dhfc0bm2m98wb"; system = "mixalot-vorbis"; asd = "mixalot-vorbis"; } @@ -73936,12 +74821,12 @@ lib.makeScope pkgs.newScope (self: { mk-defsystem = ( build-asdf-system { pname = "mk-defsystem"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "mk-defsystem" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mk-defsystem/2024-10-12/mk-defsystem-20241012-git.tgz"; - sha256 = "0zrr11szr50bqaxybm66ggj5bmchwljjafhxcwsyzgpqbnf06740"; + url = "https://beta.quicklisp.org/archive/mk-defsystem/2025-06-22/mk-defsystem-20250622-git.tgz"; + sha256 = "08dkr53ganqikg33a3b30zn8267bphx8mzmdl4302ri29srr0a1r"; system = "mk-defsystem"; asd = "mk-defsystem"; } @@ -73960,7 +74845,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mk-string-metrics" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mk-string-metrics/2018-01-31/mk-string-metrics-20180131-git.tgz"; + url = "https://beta.quicklisp.org/archive/mk-string-metrics/2018-01-31/mk-string-metrics-20180131-git.tgz"; sha256 = "0c50hjpylhkh5phcxxcwqdzpa94vk5pq1j7c6x0d3wfpb2yx0wkd"; system = "mk-string-metrics"; asd = "mk-string-metrics"; @@ -73978,7 +74863,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mk-string-metrics-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mk-string-metrics/2018-01-31/mk-string-metrics-20180131-git.tgz"; + url = "https://beta.quicklisp.org/archive/mk-string-metrics/2018-01-31/mk-string-metrics-20180131-git.tgz"; sha256 = "0c50hjpylhkh5phcxxcwqdzpa94vk5pq1j7c6x0d3wfpb2yx0wkd"; system = "mk-string-metrics-tests"; asd = "mk-string-metrics-tests"; @@ -73998,7 +74883,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ml-dsl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-marklogic/2021-01-24/cl-marklogic-20210124-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-marklogic/2021-01-24/cl-marklogic-20210124-git.tgz"; sha256 = "0baq2ccb88zyr2dqdvpm32lsin4zalv11w48x4xm80cr4kw45fk5"; system = "ml-dsl"; asd = "ml-dsl"; @@ -74018,7 +74903,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ml-optimizer" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-marklogic/2021-01-24/cl-marklogic-20210124-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-marklogic/2021-01-24/cl-marklogic-20210124-git.tgz"; sha256 = "0baq2ccb88zyr2dqdvpm32lsin4zalv11w48x4xm80cr4kw45fk5"; system = "ml-optimizer"; asd = "ml-optimizer"; @@ -74043,7 +74928,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ml-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-marklogic/2021-01-24/cl-marklogic-20210124-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-marklogic/2021-01-24/cl-marklogic-20210124-git.tgz"; sha256 = "0baq2ccb88zyr2dqdvpm32lsin4zalv11w48x4xm80cr4kw45fk5"; system = "ml-test"; asd = "ml-test"; @@ -74067,7 +74952,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mlep" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mlep/2023-10-21/cl-mlep-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mlep/2023-10-21/cl-mlep-20231021-git.tgz"; sha256 = "0na6hjjp1a3bril14v878h9198zrbymnfw7nybgcll0kwv90815g"; system = "mlep"; asd = "mlep"; @@ -74087,7 +74972,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mlep-add" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mlep/2023-10-21/cl-mlep-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mlep/2023-10-21/cl-mlep-20231021-git.tgz"; sha256 = "0na6hjjp1a3bril14v878h9198zrbymnfw7nybgcll0kwv90815g"; system = "mlep-add"; asd = "mlep-add"; @@ -74108,12 +74993,12 @@ lib.makeScope pkgs.newScope (self: { mmap = ( build-asdf-system { pname = "mmap"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "mmap" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mmap/2024-10-12/mmap-20241012-git.tgz"; - sha256 = "1wlxymkkbjyyp6fikxi94q26pjfz656y4d8kgm22xxvw70hppgc3"; + url = "https://beta.quicklisp.org/archive/mmap/2025-06-22/mmap-20250622-git.tgz"; + sha256 = "1s233i80ja9xfk820x4yjccbbqh6llc90n4lmkjglrk4jjk28x1h"; system = "mmap"; asd = "mmap"; } @@ -74122,6 +75007,7 @@ lib.makeScope pkgs.newScope (self: { lispLibs = [ (getAttr "cffi" self) (getAttr "documentation-utils" self) + (getAttr "pathname-utils" self) (getAttr "trivial-features" self) ]; meta = { }; @@ -74130,12 +75016,12 @@ lib.makeScope pkgs.newScope (self: { mmap-test = ( build-asdf-system { pname = "mmap-test"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "mmap-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mmap/2024-10-12/mmap-20241012-git.tgz"; - sha256 = "1wlxymkkbjyyp6fikxi94q26pjfz656y4d8kgm22xxvw70hppgc3"; + url = "https://beta.quicklisp.org/archive/mmap/2025-06-22/mmap-20250622-git.tgz"; + sha256 = "1s233i80ja9xfk820x4yjccbbqh6llc90n4lmkjglrk4jjk28x1h"; system = "mmap-test"; asd = "mmap-test"; } @@ -74159,7 +75045,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mnas-graph" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mnas-graph/2023-06-18/mnas-graph-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/mnas-graph/2023-06-18/mnas-graph-20230618-git.tgz"; sha256 = "1psz8vh8s8zv9hh5pr0753r0baavfb1v6v9nc9kw50hkjvkchc1q"; system = "mnas-graph"; asd = "mnas-graph"; @@ -74182,7 +75068,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mnas-hash-table" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mnas-hash-table/2023-06-18/mnas-hash-table-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/mnas-hash-table/2023-06-18/mnas-hash-table-20230618-git.tgz"; sha256 = "107fqc2wipvs2ifj12sqizv3gc7j3yqww529vkp92xhkmrnkp833"; system = "mnas-hash-table"; asd = "mnas-hash-table"; @@ -74198,12 +75084,12 @@ lib.makeScope pkgs.newScope (self: { mnas-package = ( build-asdf-system { pname = "mnas-package"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "mnas-package" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mnas-package/2024-10-12/mnas-package-20241012-git.tgz"; - sha256 = "05wkh2rzlp3csnk3p50rp3jv4jycdqa5hylqf93b2q8vjxvv67wm"; + url = "https://beta.quicklisp.org/archive/mnas-package/2025-06-22/mnas-package-20250622-git.tgz"; + sha256 = "0l3c7kabql49jnf213vgp9kh62k68ph62lm7l55a5s3w5xdlx0l9"; system = "mnas-package"; asd = "mnas-package"; } @@ -74225,12 +75111,12 @@ lib.makeScope pkgs.newScope (self: { mnas-path = ( build-asdf-system { pname = "mnas-path"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "mnas-path" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mnas-path/2023-10-21/mnas-path-20231021-git.tgz"; - sha256 = "10hijr71nlnl9wf15ahzjgynvq1n1y8446fxk7pkfwcw832x874z"; + url = "https://beta.quicklisp.org/archive/mnas-path/2025-06-22/mnas-path-20250622-git.tgz"; + sha256 = "0lkgxk7kacy6c7x6sy1ykfpjqr945721fvjgjvlxndf4xhja6vl8"; system = "mnas-path"; asd = "mnas-path"; } @@ -74248,12 +75134,12 @@ lib.makeScope pkgs.newScope (self: { mnas-string = ( build-asdf-system { pname = "mnas-string"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "mnas-string" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mnas-string/2024-10-12/mnas-string-20241012-git.tgz"; - sha256 = "1pk0fyi3pjq7h9x40hixapsa06s0dah6xd4d63jpyhp7y6fa8w6f"; + url = "https://beta.quicklisp.org/archive/mnas-string/2025-06-22/mnas-string-20250622-git.tgz"; + sha256 = "02j1ix03bgijd0x9jiibkadx3dmb3sr76q2b00hl8ffl7gk2hk8n"; system = "mnas-string"; asd = "mnas-string"; } @@ -74275,7 +75161,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mnst-relay" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz"; sha256 = "1hf3r6pqbnd9vsd1i24qmz928kia72hdgmiafiwb6jw1hmj3r6ga"; system = "mnst-relay"; asd = "mnst-relay"; @@ -74299,7 +75185,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mockingbird" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mockingbird/2021-10-20/mockingbird-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/mockingbird/2021-10-20/mockingbird-20211020-git.tgz"; sha256 = "1n1mxl2qk7g63z92d943ysn12axw0bx5dvw0cmm3cs1hjpx5rdly"; system = "mockingbird"; asd = "mockingbird"; @@ -74324,7 +75210,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mockingbird-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mockingbird/2021-10-20/mockingbird-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/mockingbird/2021-10-20/mockingbird-20211020-git.tgz"; sha256 = "1n1mxl2qk7g63z92d943ysn12axw0bx5dvw0cmm3cs1hjpx5rdly"; system = "mockingbird-test"; asd = "mockingbird-test"; @@ -74348,7 +75234,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "modest-config" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/modest-config/2018-02-28/modest-config-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/modest-config/2018-02-28/modest-config-20180228-git.tgz"; sha256 = "0ali9lvg7ngzmpgaxmbc4adp4djznavbywiig8x94c2xwicvjh83"; system = "modest-config"; asd = "modest-config"; @@ -74368,7 +75254,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "modest-config-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/modest-config/2018-02-28/modest-config-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/modest-config/2018-02-28/modest-config-20180228-git.tgz"; sha256 = "0ali9lvg7ngzmpgaxmbc4adp4djznavbywiig8x94c2xwicvjh83"; system = "modest-config-test"; asd = "modest-config-test"; @@ -74392,7 +75278,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "modf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/modf/2020-09-25/modf-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/modf/2020-09-25/modf-20200925-git.tgz"; sha256 = "1aap7ldy7lv942khp026pgndgdzfkkqa9xcq1ykinrmflrgdazay"; system = "modf"; asd = "modf"; @@ -74416,7 +75302,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "modf-fset" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/modf-fset/2015-06-08/modf-fset-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/modf-fset/2015-06-08/modf-fset-20150608-git.tgz"; sha256 = "0xdlwsw3b31l9c6db7rgvikn42ncqk98s45zcq116f51ph3dr95y"; system = "modf-fset"; asd = "modf-fset"; @@ -74439,7 +75325,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "modf-fset-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/modf-fset/2015-06-08/modf-fset-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/modf-fset/2015-06-08/modf-fset-20150608-git.tgz"; sha256 = "0xdlwsw3b31l9c6db7rgvikn42ncqk98s45zcq116f51ph3dr95y"; system = "modf-fset-test"; asd = "modf-fset-test"; @@ -74463,7 +75349,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "modf-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/modf/2020-09-25/modf-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/modf/2020-09-25/modf-20200925-git.tgz"; sha256 = "1aap7ldy7lv942khp026pgndgdzfkkqa9xcq1ykinrmflrgdazay"; system = "modf-test"; asd = "modf-test"; @@ -74487,7 +75373,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "modlisp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-modlisp/2015-09-23/cl-modlisp-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-modlisp/2015-09-23/cl-modlisp-20150923-git.tgz"; sha256 = "14gfhhy8blyrhpb1jk17bq4vazgwmzgcx3misw48ja77x17bl1zf"; system = "modlisp"; asd = "modlisp"; @@ -74503,12 +75389,12 @@ lib.makeScope pkgs.newScope (self: { modularize = ( build-asdf-system { pname = "modularize"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "modularize" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/modularize/2023-10-21/modularize-20231021-git.tgz"; - sha256 = "1i660gpljl97j51sj4mx8pk91v96zddww24rbwz0p20cl9hfp0xj"; + url = "https://beta.quicklisp.org/archive/modularize/2025-06-22/modularize-20250622-git.tgz"; + sha256 = "01ybc1mizn9xaxb2dbvvw8qvwwcz47kx0hma2nlq3kw8v7par58y"; system = "modularize"; asd = "modularize"; } @@ -74526,12 +75412,12 @@ lib.makeScope pkgs.newScope (self: { modularize-hooks = ( build-asdf-system { pname = "modularize-hooks"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "modularize-hooks" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/modularize-hooks/2023-10-21/modularize-hooks-20231021-git.tgz"; - sha256 = "0f60rk9753vil56wyi54db35ffanjw5fmkyn79jc5hnlab78ffhy"; + url = "https://beta.quicklisp.org/archive/modularize-hooks/2025-06-22/modularize-hooks-20250622-git.tgz"; + sha256 = "0gqb217j7hgdsqzq9dbqb9wf2wp3vf1iijivixdkmbvl27d5jxmp"; system = "modularize-hooks"; asd = "modularize-hooks"; } @@ -74555,7 +75441,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "modularize-interfaces" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/modularize-interfaces/2023-10-21/modularize-interfaces-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/modularize-interfaces/2023-10-21/modularize-interfaces-20231021-git.tgz"; sha256 = "0lmq2jbkbr5wrrjl2qb1x64fcvl0lmii0h9301b9bq4d47s4w8sh"; system = "modularize-interfaces"; asd = "modularize-interfaces"; @@ -74576,12 +75462,12 @@ lib.makeScope pkgs.newScope (self: { modularize-test-module = ( build-asdf-system { pname = "modularize-test-module"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "modularize-test-module" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/modularize/2023-10-21/modularize-20231021-git.tgz"; - sha256 = "1i660gpljl97j51sj4mx8pk91v96zddww24rbwz0p20cl9hfp0xj"; + url = "https://beta.quicklisp.org/archive/modularize/2025-06-22/modularize-20250622-git.tgz"; + sha256 = "01ybc1mizn9xaxb2dbvvw8qvwwcz47kx0hma2nlq3kw8v7par58y"; system = "modularize-test-module"; asd = "modularize-test-module"; } @@ -74600,7 +75486,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "moira" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/moira/2024-10-12/moira-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/moira/2024-10-12/moira-20241012-git.tgz"; sha256 = "01wxjg122flla4pgys57hya3fwrkyjkpp26j5ypl5885zz1ip5b7"; system = "moira"; asd = "moira"; @@ -74627,7 +75513,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "monkeylib-html" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/monkeylib-html/2018-02-28/monkeylib-html-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/monkeylib-html/2018-02-28/monkeylib-html-20180228-git.tgz"; sha256 = "11a778ynyb8mhiy9fkpyg2x1p53hi1i9mry9gfin2r28mjgwj096"; system = "monkeylib-html"; asd = "monkeylib-html"; @@ -74654,7 +75540,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "monkeylib-markup-html" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/monkeylib-markup-html/2012-02-08/monkeylib-markup-html-20120208-git.tgz"; + url = "https://beta.quicklisp.org/archive/monkeylib-markup-html/2012-02-08/monkeylib-markup-html-20120208-git.tgz"; sha256 = "1kwnlb7dka9bqyc8a06lbsap8j83kdayk4m9a1m3mazjgaxlpv2a"; system = "monkeylib-markup-html"; asd = "monkeylib-markup-html"; @@ -74680,7 +75566,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "monkeylib-text-languages" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/monkeylib-text-languages/2011-12-03/monkeylib-text-languages-20111203-git.tgz"; + url = "https://beta.quicklisp.org/archive/monkeylib-text-languages/2011-12-03/monkeylib-text-languages-20111203-git.tgz"; sha256 = "1f6hb3r2s5phz5z4rv3llyfi30vbxlq9qpipsq9vppmw51fvdsdk"; system = "monkeylib-text-languages"; asd = "monkeylib-text-languages"; @@ -74703,7 +75589,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "monkeylib-text-output" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/monkeylib-text-output/2011-12-03/monkeylib-text-output-20111203-git.tgz"; + url = "https://beta.quicklisp.org/archive/monkeylib-text-output/2011-12-03/monkeylib-text-output-20111203-git.tgz"; sha256 = "0lygfxap2ppxxi0sbz8lig1h878ad84jwbp3c895r7h9svjh1ffm"; system = "monkeylib-text-output"; asd = "monkeylib-text-output"; @@ -74728,7 +75614,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "montezuma" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/montezuma/2018-02-28/montezuma-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/montezuma/2018-02-28/montezuma-20180228-git.tgz"; sha256 = "0svmvsbsirydk3c1spzfvj8qmkzcs9i69anpfvk1843i62wb7x2c"; system = "montezuma"; asd = "montezuma"; @@ -74752,7 +75638,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "montezuma-indexfiles" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/montezuma/2018-02-28/montezuma-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/montezuma/2018-02-28/montezuma-20180228-git.tgz"; sha256 = "0svmvsbsirydk3c1spzfvj8qmkzcs9i69anpfvk1843i62wb7x2c"; system = "montezuma-indexfiles"; asd = "montezuma-indexfiles"; @@ -74775,7 +75661,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "montezuma-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/montezuma/2018-02-28/montezuma-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/montezuma/2018-02-28/montezuma-20180228-git.tgz"; sha256 = "0svmvsbsirydk3c1spzfvj8qmkzcs9i69anpfvk1843i62wb7x2c"; system = "montezuma-tests"; asd = "montezuma"; @@ -74798,7 +75684,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "moptilities" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/moptilities/2017-04-03/moptilities-20170403-git.tgz"; + url = "https://beta.quicklisp.org/archive/moptilities/2017-04-03/moptilities-20170403-git.tgz"; sha256 = "1q12bqjbj47lx98yim1kfnnhgfhkl80102fkgp9pdqxg0fp6g5fc"; system = "moptilities"; asd = "moptilities"; @@ -74816,7 +75702,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "moptilities-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/moptilities/2017-04-03/moptilities-20170403-git.tgz"; + url = "https://beta.quicklisp.org/archive/moptilities/2017-04-03/moptilities-20170403-git.tgz"; sha256 = "1q12bqjbj47lx98yim1kfnnhgfhkl80102fkgp9pdqxg0fp6g5fc"; system = "moptilities-test"; asd = "moptilities-test"; @@ -74835,12 +75721,12 @@ lib.makeScope pkgs.newScope (self: { more-conditions = ( build-asdf-system { pname = "more-conditions"; - version = "20180831-git"; + version = "20250622-git"; asds = [ "more-conditions" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/more-conditions/2018-08-31/more-conditions-20180831-git.tgz"; - sha256 = "1n0xbz0yiqn9dxf0ycm57wqvsr4gh2q4hs5fskjbv87c47d7l7zr"; + url = "https://beta.quicklisp.org/archive/more-conditions/2025-06-22/more-conditions-20250622-git.tgz"; + sha256 = "12fahmb84g3dabjg0rqxxnv23f4kzfyink1mn9bdvr8m41mr04nm"; system = "more-conditions"; asd = "more-conditions"; } @@ -74860,7 +75746,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mp3-duration" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mp3-duration/2016-02-08/mp3-duration-20160208-git.tgz"; + url = "https://beta.quicklisp.org/archive/mp3-duration/2016-02-08/mp3-duration-20160208-git.tgz"; sha256 = "1mhn9g1kz2yan178m2adg0pz3dx2nmg7hq4gfmfz7lrlsxm08bs7"; system = "mp3-duration"; asd = "mp3-duration"; @@ -74880,7 +75766,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mp3-duration-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mp3-duration/2016-02-08/mp3-duration-20160208-git.tgz"; + url = "https://beta.quicklisp.org/archive/mp3-duration/2016-02-08/mp3-duration-20160208-git.tgz"; sha256 = "1mhn9g1kz2yan178m2adg0pz3dx2nmg7hq4gfmfz7lrlsxm08bs7"; system = "mp3-duration-test"; asd = "mp3-duration-test"; @@ -74904,7 +75790,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mpc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mpc/2016-09-29/mpc-20160929-git.tgz"; + url = "https://beta.quicklisp.org/archive/mpc/2016-09-29/mpc-20160929-git.tgz"; sha256 = "1nig0v91m4ybcr19s50xijwv488qlma0b36zy6cric2y8wgclmsx"; system = "mpc"; asd = "mpc"; @@ -74920,12 +75806,12 @@ lib.makeScope pkgs.newScope (self: { mpg123-ffi = ( build-asdf-system { pname = "mpg123-ffi"; - version = "20151218-git"; + version = "20250622-git"; asds = [ "mpg123-ffi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mixalot/2015-12-18/mixalot-20151218-git.tgz"; - sha256 = "0kqx933k8kly4yhzvspizzki556s1lfd4zafap42jcsqqhr4i5q9"; + url = "https://beta.quicklisp.org/archive/mixalot/2025-06-22/mixalot-20250622-git.tgz"; + sha256 = "0w17m06rf8masgslnzva6c9dnbim8g99w2c4m93dhfc0bm2m98wb"; system = "mpg123-ffi"; asd = "mpg123-ffi"; } @@ -74944,7 +75830,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mra-wavelet-plot" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mra-wavelet-plot/2018-12-10/mra-wavelet-plot-20181210-git.tgz"; + url = "https://beta.quicklisp.org/archive/mra-wavelet-plot/2018-12-10/mra-wavelet-plot-20181210-git.tgz"; sha256 = "0d6sdgj1zvkliga9drsqnj4l748vbcwwz744ayq5nnvp5fvhnc29"; system = "mra-wavelet-plot"; asd = "mra-wavelet-plot"; @@ -74964,7 +75850,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mssql" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-mssql/2024-10-12/cl-mssql-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-mssql/2024-10-12/cl-mssql-20241012-git.tgz"; sha256 = "15hnlkx6d2vw46v7h01wljzag33j5is679amv74kzk4qq91wfkx2"; system = "mssql"; asd = "mssql"; @@ -74989,7 +75875,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mstrings" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mstrings/2022-07-07/mstrings-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/mstrings/2022-07-07/mstrings-20220707-git.tgz"; sha256 = "0s1zqwnv9agvlp79gh7y06rmly56v8nm1l594rry9gzwvvx1jj1k"; system = "mstrings"; asd = "mstrings"; @@ -75009,7 +75895,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mt19937" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mt19937/2011-02-19/mt19937-1.1.1.tgz"; + url = "https://beta.quicklisp.org/archive/mt19937/2011-02-19/mt19937-1.1.1.tgz"; sha256 = "0h02ssnncc760b68ipm0sbrzrbnllp6fqabvw98w43af08s36xlg"; system = "mt19937"; asd = "mt19937"; @@ -75027,7 +75913,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mtif" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mtif/2017-11-30/mtif-20171130-git.tgz"; + url = "https://beta.quicklisp.org/archive/mtif/2017-11-30/mtif-20171130-git.tgz"; sha256 = "0fzlf0xawv579i4jp5l994d7m220py5j169klaj0l43frgxb4n7y"; system = "mtif"; asd = "mtif"; @@ -75047,7 +75933,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mtlisp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mtlisp/2013-06-15/mtlisp-20130615-git.tgz"; + url = "https://beta.quicklisp.org/archive/mtlisp/2013-06-15/mtlisp-20130615-git.tgz"; sha256 = "0qpbhiy2z2q7mf4lf2lpj66a13xj7bj0c584d1i7zi156s2hcnvs"; system = "mtlisp"; asd = "mtlisp"; @@ -75063,12 +75949,12 @@ lib.makeScope pkgs.newScope (self: { multilang-documentation = ( build-asdf-system { pname = "multilang-documentation"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "multilang-documentation" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/multilang-documentation/2023-10-21/multilang-documentation-20231021-git.tgz"; - sha256 = "1v9sv81lx0ms9djz0hqhwdswg0rmzqv47g57k5jmzkx6lbjsya7z"; + url = "https://beta.quicklisp.org/archive/multilang-documentation/2025-06-22/multilang-documentation-20250622-git.tgz"; + sha256 = "1bhb1vqgahj5nw5rb4y8c22ksh10h12zn5y8qkpz772j3dnnxhhn"; system = "multilang-documentation"; asd = "multilang-documentation"; } @@ -75087,12 +75973,12 @@ lib.makeScope pkgs.newScope (self: { multilang-documentation-utils = ( build-asdf-system { pname = "multilang-documentation-utils"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "multilang-documentation-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/documentation-utils/2023-10-21/documentation-utils-20231021-git.tgz"; - sha256 = "0nzkjzvcqi1l2ywiz17h1f54vgvbkywv95in4yww6lyzqjqsqqhy"; + url = "https://beta.quicklisp.org/archive/documentation-utils/2025-06-22/documentation-utils-20250622-git.tgz"; + sha256 = "1rmb9m3rilj5c4cr7bn5gnx1wrksi85zizp4hr7409qzg345mg7l"; system = "multilang-documentation-utils"; asd = "multilang-documentation-utils"; } @@ -75114,7 +76000,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "multiple-value-variants" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/multiple-value-variants/2014-08-26/multiple-value-variants-1.0.1.tgz"; + url = "https://beta.quicklisp.org/archive/multiple-value-variants/2014-08-26/multiple-value-variants-1.0.1.tgz"; sha256 = "0kb7bkgg2iri89ph2lcgfk57pf8h4r6471sn2jcyp5sz13g4f6yw"; system = "multiple-value-variants"; asd = "multiple-value-variants"; @@ -75138,7 +76024,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "multiposter" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/multiposter/2024-10-12/multiposter-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/multiposter/2024-10-12/multiposter-20241012-git.tgz"; sha256 = "1q1zinv4csnb0yjlndym5dlf7apax3f5qdiids3dlai09jb4hbjg"; system = "multiposter"; asd = "multiposter"; @@ -75175,7 +76061,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "multival-plist" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/multival-plist/2012-03-05/multival-plist-20120305-git.tgz"; + url = "https://beta.quicklisp.org/archive/multival-plist/2012-03-05/multival-plist-20120305-git.tgz"; sha256 = "0cfca0qvngbvs9v4z8qpzr6wsjvf01jzaszagmasa4zkvmjycx1b"; system = "multival-plist"; asd = "multival-plist"; @@ -75200,7 +76086,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "multival-plist-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/multival-plist/2012-03-05/multival-plist-20120305-git.tgz"; + url = "https://beta.quicklisp.org/archive/multival-plist/2012-03-05/multival-plist-20120305-git.tgz"; sha256 = "0cfca0qvngbvs9v4z8qpzr6wsjvf01jzaszagmasa4zkvmjycx1b"; system = "multival-plist-test"; asd = "multival-plist-test"; @@ -75219,18 +76105,22 @@ lib.makeScope pkgs.newScope (self: { music-spelling = ( build-asdf-system { pname = "music-spelling"; - version = "20230214-git"; + version = "20250622-git"; asds = [ "music-spelling" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/music-spelling/2023-02-14/music-spelling-20230214-git.tgz"; - sha256 = "0fgahb0jjr4sp2739d55gylmx8alsghnx3spyaqfqci4cxfrys52"; + url = "https://beta.quicklisp.org/archive/music-spelling/2025-06-22/music-spelling-20250622-git.tgz"; + sha256 = "0f2ygh46mq7wh1wvnyqfb7lc8i36rs1d63siajqv3mpfja6h7z7p"; system = "music-spelling"; asd = "music-spelling"; } ); systems = [ "music-spelling" ]; - lispLibs = [ (getAttr "alexandria" self) ]; + lispLibs = [ + (getAttr "alexandria" self) + (getAttr "cl-ppcre" self) + (getAttr "parse-float" self) + ]; meta = { hydraPlatforms = [ ]; }; @@ -75239,12 +76129,12 @@ lib.makeScope pkgs.newScope (self: { mutility = ( build-asdf-system { pname = "mutility"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "mutility" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mutility/2024-10-12/mutility-20241012-git.tgz"; - sha256 = "17ip4rkvval66k9r3a2hvpr4pqa087b3rqjdayl115fi6bfzncr4"; + url = "https://beta.quicklisp.org/archive/mutility/2025-06-22/mutility-20250622-git.tgz"; + sha256 = "1vzcns6wsddd3jmy7kxs6gv27nhqncmpxc68xpikdznsm20qn9kb"; system = "mutility"; asd = "mutility"; } @@ -75263,12 +76153,12 @@ lib.makeScope pkgs.newScope (self: { mutils = ( build-asdf-system { pname = "mutils"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "mutils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mutils/2024-10-12/mutils-20241012-git.tgz"; - sha256 = "1xmqms002bafrdrpzgqq5dr0qfiywg3p7mhvb6xny1jrk3qdqz75"; + url = "https://beta.quicklisp.org/archive/mutils/2025-06-22/mutils-20250622-git.tgz"; + sha256 = "03inzkq60rbn0bskviqkx7n6akg7fjyvv1cnxnd85wjan3qssw0b"; system = "mutils"; asd = "mutils"; } @@ -75290,7 +76180,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mw-equiv" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mw-equiv/2010-10-06/mw-equiv-0.1.3.tgz"; + url = "https://beta.quicklisp.org/archive/mw-equiv/2010-10-06/mw-equiv-0.1.3.tgz"; sha256 = "1fl90wp0jp7l90mps53fq0kzb28f10qfr739527h03xwqccyylad"; system = "mw-equiv"; asd = "mw-equiv"; @@ -75310,7 +76200,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "my-cool-system" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/super-loader/2023-10-21/super-loader-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/super-loader/2023-10-21/super-loader-20231021-git.tgz"; sha256 = "0jicqg3w1yhwkmjfag0lvlhw83w2hpanwav1gzyf4s58sng6cxf4"; system = "my-cool-system"; asd = "my-cool-system"; @@ -75330,7 +76220,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "my-secret-system" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/super-loader/2023-10-21/super-loader-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/super-loader/2023-10-21/super-loader-20231021-git.tgz"; sha256 = "0jicqg3w1yhwkmjfag0lvlhw83w2hpanwav1gzyf4s58sng6cxf4"; system = "my-secret-system"; asd = "my-secret-system"; @@ -75350,7 +76240,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mystic" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mystic/2023-06-18/mystic-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/mystic/2023-06-18/mystic-20230618-git.tgz"; sha256 = "0fa7mb326vz7ygiwzk0x2y8gna0xnq19cics5vxc6smw6a8mhxi5"; system = "mystic"; asd = "mystic"; @@ -75377,7 +76267,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mystic-file-mixin" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mystic/2023-06-18/mystic-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/mystic/2023-06-18/mystic-20230618-git.tgz"; sha256 = "0fa7mb326vz7ygiwzk0x2y8gna0xnq19cics5vxc6smw6a8mhxi5"; system = "mystic-file-mixin"; asd = "mystic-file-mixin"; @@ -75397,7 +76287,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mystic-fiveam-mixin" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mystic/2023-06-18/mystic-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/mystic/2023-06-18/mystic-20230618-git.tgz"; sha256 = "0fa7mb326vz7ygiwzk0x2y8gna0xnq19cics5vxc6smw6a8mhxi5"; system = "mystic-fiveam-mixin"; asd = "mystic-fiveam-mixin"; @@ -75420,7 +76310,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mystic-gitignore-mixin" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mystic/2023-06-18/mystic-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/mystic/2023-06-18/mystic-20230618-git.tgz"; sha256 = "0fa7mb326vz7ygiwzk0x2y8gna0xnq19cics5vxc6smw6a8mhxi5"; system = "mystic-gitignore-mixin"; asd = "mystic-gitignore-mixin"; @@ -75443,7 +76333,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mystic-library-template" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mystic/2023-06-18/mystic-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/mystic/2023-06-18/mystic-20230618-git.tgz"; sha256 = "0fa7mb326vz7ygiwzk0x2y8gna0xnq19cics5vxc6smw6a8mhxi5"; system = "mystic-library-template"; asd = "mystic-library-template"; @@ -75469,7 +76359,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mystic-readme-mixin" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mystic/2023-06-18/mystic-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/mystic/2023-06-18/mystic-20230618-git.tgz"; sha256 = "0fa7mb326vz7ygiwzk0x2y8gna0xnq19cics5vxc6smw6a8mhxi5"; system = "mystic-readme-mixin"; asd = "mystic-readme-mixin"; @@ -75492,7 +76382,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mystic-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mystic/2023-06-18/mystic-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/mystic/2023-06-18/mystic-20230618-git.tgz"; sha256 = "0fa7mb326vz7ygiwzk0x2y8gna0xnq19cics5vxc6smw6a8mhxi5"; system = "mystic-test"; asd = "mystic-test"; @@ -75516,7 +76406,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "mystic-travis-mixin" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mystic/2023-06-18/mystic-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/mystic/2023-06-18/mystic-20230618-git.tgz"; sha256 = "0fa7mb326vz7ygiwzk0x2y8gna0xnq19cics5vxc6smw6a8mhxi5"; system = "mystic-travis-mixin"; asd = "mystic-travis-mixin"; @@ -75539,7 +76429,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "myway" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/myway/2022-11-06/myway-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/myway/2022-11-06/myway-20221106-git.tgz"; sha256 = "0xac8xpbcvq457f2jzzkf46mh5ganf1k2ix8sg61hqqmld5z4dag"; system = "myway"; asd = "myway"; @@ -75565,7 +76455,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "myway-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/myway/2022-11-06/myway-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/myway/2022-11-06/myway-20221106-git.tgz"; sha256 = "0xac8xpbcvq457f2jzzkf46mh5ganf1k2ix8sg61hqqmld5z4dag"; system = "myway-test"; asd = "myway-test"; @@ -75589,7 +76479,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "myweb" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/myweb/2024-10-12/myweb-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/myweb/2024-10-12/myweb-20241012-git.tgz"; sha256 = "10r67w3cgrq0r7qmqdnv4c3pjz7kkhz9q3jj0amlknr0nsr4y2zp"; system = "myweb"; asd = "myweb"; @@ -75615,7 +76505,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "nail" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/nail/2023-02-14/nail-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/nail/2023-02-14/nail-20230214-git.tgz"; sha256 = "0m5a1zx9s033mz3ypx27c26z5bvc8mcpnpzslypzdp6xah1nv0g3"; system = "nail"; asd = "nail"; @@ -75635,12 +76525,12 @@ lib.makeScope pkgs.newScope (self: { named-closure = ( build-asdf-system { pname = "named-closure"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "named-closure" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/named-closure/2024-10-12/named-closure-20241012-git.tgz"; - sha256 = "1ja7lvid589n3r25vh7j21wji60dm2qika2jn51jvfbbii853x09"; + url = "https://beta.quicklisp.org/archive/named-closure/2025-06-22/named-closure-20250622-git.tgz"; + sha256 = "17lpslk7amh9pghjpjdnd1aj50r1kdc4iyai2h2xas7wampg5xf5"; system = "named-closure"; asd = "named-closure"; } @@ -75649,8 +76539,9 @@ lib.makeScope pkgs.newScope (self: { lispLibs = [ (getAttr "alexandria" self) (getAttr "closer-mop" self) - (getAttr "hu_dot_dwim_dot_util" self) - (getAttr "hu_dot_dwim_dot_walker" self) + (getAttr "iterate" self) + (getAttr "serapeum" self) + (getAttr "trivial-cltl2" self) ]; meta = { hydraPlatforms = [ ]; @@ -75664,7 +76555,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "named-read-macros" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/named-read-macros/2021-02-28/named-read-macros-20210228-git.tgz"; + url = "https://beta.quicklisp.org/archive/named-read-macros/2021-02-28/named-read-macros-20210228-git.tgz"; sha256 = "0bgqy43h06nq2p9avqix2k15ab306sghrz2pkr17pli87q0qkxhi"; system = "named-read-macros"; asd = "named-read-macros"; @@ -75684,7 +76575,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "named-read-macros-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/named-read-macros/2021-02-28/named-read-macros-20210228-git.tgz"; + url = "https://beta.quicklisp.org/archive/named-read-macros/2021-02-28/named-read-macros-20210228-git.tgz"; sha256 = "0bgqy43h06nq2p9avqix2k15ab306sghrz2pkr17pli87q0qkxhi"; system = "named-read-macros-test"; asd = "named-read-macros-test"; @@ -75703,12 +76594,12 @@ lib.makeScope pkgs.newScope (self: { named-readtables = ( build-asdf-system { pname = "named-readtables"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "named-readtables" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/named-readtables/2023-10-21/named-readtables-20231021-git.tgz"; - sha256 = "0cnxs13qf0y1r05mhhf54jihvv7pqk1a2p3x5jzs4y8ld1in6xzp"; + url = "https://beta.quicklisp.org/archive/named-readtables/2025-06-22/named-readtables-20250622-git.tgz"; + sha256 = "0wm7k1xq6c8rji121wfnv396l59bw87010c7mqhdj9vg7amyr9af"; system = "named-readtables"; asd = "named-readtables"; } @@ -75721,12 +76612,12 @@ lib.makeScope pkgs.newScope (self: { named-readtables-test = ( build-asdf-system { pname = "named-readtables-test"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "named-readtables-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/named-readtables/2023-10-21/named-readtables-20231021-git.tgz"; - sha256 = "0cnxs13qf0y1r05mhhf54jihvv7pqk1a2p3x5jzs4y8ld1in6xzp"; + url = "https://beta.quicklisp.org/archive/named-readtables/2025-06-22/named-readtables-20250622-git.tgz"; + sha256 = "0wm7k1xq6c8rji121wfnv396l59bw87010c7mqhdj9vg7amyr9af"; system = "named-readtables-test"; asd = "named-readtables-test"; } @@ -75748,7 +76639,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "nanovg-blob" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/nanovg-blob/2020-10-16/nanovg-blob-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/nanovg-blob/2020-10-16/nanovg-blob-stable-git.tgz"; sha256 = "1q80inrlfcqqqc912jcskfn667jgq6lcw0jvhk270x5qpj8z2pfj"; system = "nanovg-blob"; asd = "nanovg-blob"; @@ -75772,7 +76663,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "napa-fft3" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/napa-fft3/2015-12-18/napa-fft3-20151218-git.tgz"; + url = "https://beta.quicklisp.org/archive/napa-fft3/2015-12-18/napa-fft3-20151218-git.tgz"; sha256 = "1hxjf599xgwm28gbryy7q96j9ys6hfszmv0qxpr5698hxnhknscp"; system = "napa-fft3"; asd = "napa-fft3"; @@ -75792,7 +76683,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "narrowed-types" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/narrowed-types/2018-02-28/narrowed-types-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/narrowed-types/2018-02-28/narrowed-types-20180228-git.tgz"; sha256 = "03v4jgdysapj3ndg2qij7liqc6n9zb07r5j4k1jhmhpml86jxg4g"; system = "narrowed-types"; asd = "narrowed-types"; @@ -75812,7 +76703,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "narrowed-types-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/narrowed-types/2018-02-28/narrowed-types-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/narrowed-types/2018-02-28/narrowed-types-20180228-git.tgz"; sha256 = "03v4jgdysapj3ndg2qij7liqc6n9zb07r5j4k1jhmhpml86jxg4g"; system = "narrowed-types-test"; asd = "narrowed-types-test"; @@ -75835,7 +76726,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "native-lazy-seq" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/native-lazy-seq/2023-06-18/native-lazy-seq-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/native-lazy-seq/2023-06-18/native-lazy-seq-20230618-git.tgz"; sha256 = "1p5zja0qg61girf67ic8j6wv9s1faxki0mazxmydbm92ckrns2rp"; system = "native-lazy-seq"; asd = "native-lazy-seq"; @@ -75860,7 +76751,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "nbd" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/nbd/2021-10-20/nbd-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/nbd/2021-10-20/nbd-20211020-git.tgz"; sha256 = "1p9dpyvlpjm32a2ymhps782dp5pjya5bnky6sb20gf4zyw6r826n"; system = "nbd"; asd = "nbd"; @@ -75876,6 +76767,26 @@ lib.makeScope pkgs.newScope (self: { meta = { }; } ); + nclasses = ( + build-asdf-system { + pname = "nclasses"; + version = "20250622-git"; + asds = [ "nclasses" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/nclasses/2025-06-22/nclasses-20250622-git.tgz"; + sha256 = "1yq0l7alqw5v3g46y3pvkx0qlprsvji6rlkb63vnqq5z82dqf7sn"; + system = "nclasses"; + asd = "nclasses"; + } + ); + systems = [ "nclasses" ]; + lispLibs = [ (getAttr "moptilities" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); ncurses-clone-for-lem = ( build-asdf-system { pname = "ncurses-clone-for-lem"; @@ -75883,7 +76794,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ncurses-clone-for-lem" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; system = "ncurses-clone-for-lem"; asd = "ncurses-clone-for-lem"; @@ -75907,12 +76818,12 @@ lib.makeScope pkgs.newScope (self: { ndebug = ( build-asdf-system { pname = "ndebug"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "ndebug" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ndebug/2024-10-12/ndebug-20241012-git.tgz"; - sha256 = "168khn4190p55fjhbpnbq130lbaafq7cw0131x7n650d9f4h2hyq"; + url = "https://beta.quicklisp.org/archive/ndebug/2025-06-22/ndebug-20250622-git.tgz"; + sha256 = "1z98kzgnvqrd0dbanyr91j9hv28qb32g51vvmbmagcwqprswdcqk"; system = "ndebug"; asd = "ndebug"; } @@ -75936,7 +76847,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ndfa" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; + url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; system = "ndfa"; asd = "ndfa"; @@ -75956,7 +76867,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ndfa-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; + url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; system = "ndfa-test"; asd = "ndfa-test"; @@ -75980,7 +76891,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "net-telent-date" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/net-telent-date/2010-10-06/net-telent-date_0.42.tgz"; + url = "https://beta.quicklisp.org/archive/net-telent-date/2010-10-06/net-telent-date_0.42.tgz"; sha256 = "0vgibf76hy3zy39pix367xnvpwxiqsxvv6w0gqdxprd5ljpb7g2j"; system = "net-telent-date"; asd = "net-telent-date"; @@ -75998,7 +76909,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "net.didierverna.asdf-flv" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/asdf-flv/2023-10-21/asdf-flv-version-2.2.tgz"; + url = "https://beta.quicklisp.org/archive/asdf-flv/2023-10-21/asdf-flv-version-2.2.tgz"; sha256 = "1svcjhdlsdayr07qa38kj8n5m40qplklspmlrkmvc5wdhk9jz8sw"; system = "net.didierverna.asdf-flv"; asd = "net.didierverna.asdf-flv"; @@ -76016,7 +76927,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "net.didierverna.clon" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-clon/2023-10-21/cl-clon-version-1.0b27.tgz"; + url = "https://beta.quicklisp.org/archive/cl-clon/2023-10-21/cl-clon-version-1.0b27.tgz"; sha256 = "0cyh5z78r7qhv2rzghkhksgg848d6iy1xv7y87p3aivd23c916b1"; system = "net.didierverna.clon"; asd = "net.didierverna.clon"; @@ -76039,7 +76950,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "net.didierverna.clon.core" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-clon/2023-10-21/cl-clon-version-1.0b27.tgz"; + url = "https://beta.quicklisp.org/archive/cl-clon/2023-10-21/cl-clon-version-1.0b27.tgz"; sha256 = "0cyh5z78r7qhv2rzghkhksgg848d6iy1xv7y87p3aivd23c916b1"; system = "net.didierverna.clon.core"; asd = "net.didierverna.clon.core"; @@ -76059,7 +76970,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "net.didierverna.clon.demo.advanced" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-clon/2023-10-21/cl-clon-version-1.0b27.tgz"; + url = "https://beta.quicklisp.org/archive/cl-clon/2023-10-21/cl-clon-version-1.0b27.tgz"; sha256 = "0cyh5z78r7qhv2rzghkhksgg848d6iy1xv7y87p3aivd23c916b1"; system = "net.didierverna.clon.demo.advanced"; asd = "net.didierverna.clon.demo.advanced"; @@ -76079,7 +76990,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "net.didierverna.clon.demo.simple" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-clon/2023-10-21/cl-clon-version-1.0b27.tgz"; + url = "https://beta.quicklisp.org/archive/cl-clon/2023-10-21/cl-clon-version-1.0b27.tgz"; sha256 = "0cyh5z78r7qhv2rzghkhksgg848d6iy1xv7y87p3aivd23c916b1"; system = "net.didierverna.clon.demo.simple"; asd = "net.didierverna.clon.demo.simple"; @@ -76099,7 +77010,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "net.didierverna.clon.setup" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-clon/2023-10-21/cl-clon-version-1.0b27.tgz"; + url = "https://beta.quicklisp.org/archive/cl-clon/2023-10-21/cl-clon-version-1.0b27.tgz"; sha256 = "0cyh5z78r7qhv2rzghkhksgg848d6iy1xv7y87p3aivd23c916b1"; system = "net.didierverna.clon.setup"; asd = "net.didierverna.clon.setup"; @@ -76119,7 +77030,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "net.didierverna.clon.termio" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-clon/2023-10-21/cl-clon-version-1.0b27.tgz"; + url = "https://beta.quicklisp.org/archive/cl-clon/2023-10-21/cl-clon-version-1.0b27.tgz"; sha256 = "0cyh5z78r7qhv2rzghkhksgg848d6iy1xv7y87p3aivd23c916b1"; system = "net.didierverna.clon.termio"; asd = "net.didierverna.clon.termio"; @@ -76142,7 +77053,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "net.didierverna.declt.setup" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/declt/2024-10-12/declt-4.0b2.tgz"; + url = "https://beta.quicklisp.org/archive/declt/2024-10-12/declt-4.0b2.tgz"; sha256 = "1xkbf1xqrkmr8na09b0spmrznsx2ml10i9q026zv9mpbsc7gh0i6"; system = "net.didierverna.declt.setup"; asd = "net.didierverna.declt.setup"; @@ -76162,7 +77073,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "net.didierverna.focus" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/focus/2017-04-03/focus-20170403-git.tgz"; + url = "https://beta.quicklisp.org/archive/focus/2017-04-03/focus-20170403-git.tgz"; sha256 = "0b7nxqlkfi7irdmhsbp15r63c8fcg8q0ahmwmq5cmkf8ffq8dspc"; system = "net.didierverna.focus"; asd = "net.didierverna.focus"; @@ -76186,7 +77097,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "net.didierverna.focus.core" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/focus/2017-04-03/focus-20170403-git.tgz"; + url = "https://beta.quicklisp.org/archive/focus/2017-04-03/focus-20170403-git.tgz"; sha256 = "0b7nxqlkfi7irdmhsbp15r63c8fcg8q0ahmwmq5cmkf8ffq8dspc"; system = "net.didierverna.focus.core"; asd = "net.didierverna.focus.core"; @@ -76206,7 +77117,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "net.didierverna.focus.demos.quotation" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/focus/2017-04-03/focus-20170403-git.tgz"; + url = "https://beta.quicklisp.org/archive/focus/2017-04-03/focus-20170403-git.tgz"; sha256 = "0b7nxqlkfi7irdmhsbp15r63c8fcg8q0ahmwmq5cmkf8ffq8dspc"; system = "net.didierverna.focus.demos.quotation"; asd = "net.didierverna.focus.demos.quotation"; @@ -76226,7 +77137,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "net.didierverna.focus.flv" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/focus/2017-04-03/focus-20170403-git.tgz"; + url = "https://beta.quicklisp.org/archive/focus/2017-04-03/focus-20170403-git.tgz"; sha256 = "0b7nxqlkfi7irdmhsbp15r63c8fcg8q0ahmwmq5cmkf8ffq8dspc"; system = "net.didierverna.focus.flv"; asd = "net.didierverna.focus.flv"; @@ -76250,7 +77161,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "net.didierverna.focus.setup" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/focus/2017-04-03/focus-20170403-git.tgz"; + url = "https://beta.quicklisp.org/archive/focus/2017-04-03/focus-20170403-git.tgz"; sha256 = "0b7nxqlkfi7irdmhsbp15r63c8fcg8q0ahmwmq5cmkf8ffq8dspc"; system = "net.didierverna.focus.setup"; asd = "net.didierverna.focus.setup"; @@ -76266,12 +77177,12 @@ lib.makeScope pkgs.newScope (self: { net_dot_didierverna_dot_tfm = ( build-asdf-system { pname = "net.didierverna.tfm"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "net.didierverna.tfm" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tfm/2024-10-12/tfm-20241012-git.tgz"; - sha256 = "15lnp9w9z5ar64bynb365n4wqh8wa7z4m4dzy320xrxnnc1w2sn2"; + url = "https://beta.quicklisp.org/archive/tfm/2025-06-22/tfm-20250622-git.tgz"; + sha256 = "0mbfclm680wnai9alys1acb78dp83nkpb22b0lx06059pv6ylz6r"; system = "net.didierverna.tfm"; asd = "net.didierverna.tfm"; } @@ -76286,12 +77197,12 @@ lib.makeScope pkgs.newScope (self: { net_dot_didierverna_dot_tfm_dot_core = ( build-asdf-system { pname = "net.didierverna.tfm.core"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "net.didierverna.tfm.core" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tfm/2024-10-12/tfm-20241012-git.tgz"; - sha256 = "15lnp9w9z5ar64bynb365n4wqh8wa7z4m4dzy320xrxnnc1w2sn2"; + url = "https://beta.quicklisp.org/archive/tfm/2025-06-22/tfm-20250622-git.tgz"; + sha256 = "0mbfclm680wnai9alys1acb78dp83nkpb22b0lx06059pv6ylz6r"; system = "net.didierverna.tfm.core"; asd = "net.didierverna.tfm.core"; } @@ -76306,12 +77217,12 @@ lib.makeScope pkgs.newScope (self: { net_dot_didierverna_dot_tfm_dot_setup = ( build-asdf-system { pname = "net.didierverna.tfm.setup"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "net.didierverna.tfm.setup" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tfm/2024-10-12/tfm-20241012-git.tgz"; - sha256 = "15lnp9w9z5ar64bynb365n4wqh8wa7z4m4dzy320xrxnnc1w2sn2"; + url = "https://beta.quicklisp.org/archive/tfm/2025-06-22/tfm-20250622-git.tgz"; + sha256 = "0mbfclm680wnai9alys1acb78dp83nkpb22b0lx06059pv6ylz6r"; system = "net.didierverna.tfm.setup"; asd = "net.didierverna.tfm.setup"; } @@ -76326,12 +77237,12 @@ lib.makeScope pkgs.newScope (self: { net_dot_scipolis_dot_graphs = ( build-asdf-system { pname = "net.scipolis.graphs"; - version = "20210411-git"; + version = "20250622-git"; asds = [ "net.scipolis.graphs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/femlisp/2021-04-11/femlisp-20210411-git.tgz"; - sha256 = "08l2x1jq3vfhh8m14wijd8c78n589cy5hd2py2jfj3yfiqyipasa"; + url = "https://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz"; + sha256 = "1rg1hhy3nlb85229ninnsdr8dhjjs0wgqv612g8i59v82n07yip8"; system = "net.scipolis.graphs"; asd = "net.scipolis.graphs"; } @@ -76350,7 +77261,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "network-addresses" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/network-addresses/2016-06-28/network-addresses-20160628-git.tgz"; + url = "https://beta.quicklisp.org/archive/network-addresses/2016-06-28/network-addresses-20160628-git.tgz"; sha256 = "0zkyfdvfy9pz08vrgz40qpnqx0y7vf92aarp9dq2wipimnwy8df2"; system = "network-addresses"; asd = "network-addresses"; @@ -76370,7 +77281,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "network-addresses-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/network-addresses/2016-06-28/network-addresses-20160628-git.tgz"; + url = "https://beta.quicklisp.org/archive/network-addresses/2016-06-28/network-addresses-20160628-git.tgz"; sha256 = "0zkyfdvfy9pz08vrgz40qpnqx0y7vf92aarp9dq2wipimnwy8df2"; system = "network-addresses-test"; asd = "network-addresses-test"; @@ -76393,7 +77304,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "neural-classifier" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/neural-classifier/2024-10-12/neural-classifier-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/neural-classifier/2024-10-12/neural-classifier-20241012-git.tgz"; sha256 = "0aq7m781c27di7lfs1a7di55f31i7x490yfd2033738biqn0x019"; system = "neural-classifier"; asd = "neural-classifier"; @@ -76414,12 +77325,12 @@ lib.makeScope pkgs.newScope (self: { new-op = ( build-asdf-system { pname = "new-op"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "new-op" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/new-op/2024-10-12/new-op-20241012-git.tgz"; - sha256 = "1jrnn4xbx5gc1202hqpinh0q1gm2wcv28jr8fl6g7wm6170nscxh"; + url = "https://beta.quicklisp.org/archive/new-op/2025-06-22/new-op-20250622-git.tgz"; + sha256 = "1kw7rbrnjq9bk8i6gx17si8kdz58c5bxaf23zvxkprzzd4ydlrv0"; system = "new-op"; asd = "new-op"; } @@ -76431,15 +77342,67 @@ lib.makeScope pkgs.newScope (self: { }; } ); + nfiles = ( + build-asdf-system { + pname = "nfiles"; + version = "20250622-git"; + asds = [ "nfiles" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/nfiles/2025-06-22/nfiles-20250622-git.tgz"; + sha256 = "1lm6p9cncixqybhhy212pnlvx132fjv0xc14wkrvimd7i38dxcdl"; + system = "nfiles"; + asd = "nfiles"; + } + ); + systems = [ "nfiles" ]; + lispLibs = [ + (getAttr "alexandria" self) + (getAttr "nclasses" self) + (getAttr "quri" self) + (getAttr "serapeum" self) + (getAttr "trivial-garbage" self) + (getAttr "trivial-package-local-nicknames" self) + (getAttr "trivial-types" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + nhooks = ( + build-asdf-system { + pname = "nhooks"; + version = "20250622-git"; + asds = [ "nhooks" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/nhooks/2025-06-22/nhooks-20250622-git.tgz"; + sha256 = "1k1lcpaj6zhgq8sxjl12xi1p5l8fhz54akw7kvqk5frpiigdpg47"; + system = "nhooks"; + asd = "nhooks"; + } + ); + systems = [ "nhooks" ]; + lispLibs = [ + (getAttr "bordeaux-threads" self) + (getAttr "closer-mop" self) + (getAttr "serapeum" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); nibbles = ( build-asdf-system { pname = "nibbles"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "nibbles" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/nibbles/2024-10-12/nibbles-20241012-git.tgz"; - sha256 = "00j464l3l1rx2x9gzx45gz7wcpplk1wmfh5liigzlxqq0ybjc7lr"; + url = "https://beta.quicklisp.org/archive/nibbles/2025-06-22/nibbles-20250622-git.tgz"; + sha256 = "034jq9y0p6a7cckzgjqm1jlj4njm3mcd9vwp2jxmqcrgjlf4qavs"; system = "nibbles"; asd = "nibbles"; } @@ -76452,12 +77415,12 @@ lib.makeScope pkgs.newScope (self: { nibbles-streams = ( build-asdf-system { pname = "nibbles-streams"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "nibbles-streams" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/nibbles-streams/2024-10-12/nibbles-streams-20241012-git.tgz"; - sha256 = "1m1i9nivpahk11rzdwy3xxdcdwmkx3xzb4kqcz3gh3prwhyg83a1"; + url = "https://beta.quicklisp.org/archive/nibbles-streams/2025-06-22/nibbles-streams-20250622-git.tgz"; + sha256 = "1q6x71gfrn15xdrb4jdydz838nyl0sqi8gz92rfkbrf7b2771gkz"; system = "nibbles-streams"; asd = "nibbles-streams"; } @@ -76480,7 +77443,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "nineveh" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/nineveh/2019-10-07/nineveh-release-quicklisp-0a10a846-git.tgz"; + url = "https://beta.quicklisp.org/archive/nineveh/2019-10-07/nineveh-release-quicklisp-0a10a846-git.tgz"; sha256 = "0bpdgqc9iz37240ypirpi489pnqpb92i94snyhjbh87i50y4br2l"; system = "nineveh"; asd = "nineveh"; @@ -76509,7 +77472,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ningle" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ningle/2024-10-12/ningle-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/ningle/2024-10-12/ningle-20241012-git.tgz"; sha256 = "1ym6phipbg94q7344ng9yf02ykh0x5ldx8nfrbsh8p15qajsw7hc"; system = "ningle"; asd = "ningle"; @@ -76535,7 +77498,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ningle-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ningle/2024-10-12/ningle-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/ningle/2024-10-12/ningle-20241012-git.tgz"; sha256 = "1ym6phipbg94q7344ng9yf02ykh0x5ldx8nfrbsh8p15qajsw7hc"; system = "ningle-test"; asd = "ningle-test"; @@ -76555,6 +77518,51 @@ lib.makeScope pkgs.newScope (self: { }; } ); + njson = ( + build-asdf-system { + pname = "njson"; + version = "20250622-git"; + asds = [ "njson" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/njson/2025-06-22/njson-20250622-git.tgz"; + sha256 = "0bb1apfc2iidknkf8yxkscwvf4w110f2lxb2hw9rldf5gq4w5h03"; + system = "njson"; + asd = "njson"; + } + ); + systems = [ "njson" ]; + lispLibs = [ ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + nkeymaps = ( + build-asdf-system { + pname = "nkeymaps"; + version = "20250622-git"; + asds = [ "nkeymaps" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/nkeymaps/2025-06-22/nkeymaps-20250622-git.tgz"; + sha256 = "1n8bw5nlagzaldc9fqxfd8sl2bnh04fq1zlz38vb305db0wkz39c"; + system = "nkeymaps"; + asd = "nkeymaps"; + } + ); + systems = [ "nkeymaps" ]; + lispLibs = [ + (getAttr "alexandria" self) + (getAttr "fset" self) + (getAttr "str" self) + (getAttr "trivial-package-local-nicknames" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); nlopt = ( build-asdf-system { pname = "nlopt"; @@ -76562,7 +77570,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "nlopt" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/nlopt/2022-07-07/nlopt-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/nlopt/2022-07-07/nlopt-20220707-git.tgz"; sha256 = "01zw4yx38kc8x3by0m3dw5j87hwb180ggp4njfnzi1qjq1fdczp5"; system = "nlopt"; asd = "nlopt"; @@ -76581,12 +77589,12 @@ lib.makeScope pkgs.newScope (self: { nodgui = ( build-asdf-system { pname = "nodgui"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "nodgui" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/nodgui/2024-10-12/nodgui-20241012-git.tgz"; - sha256 = "088dkpqsxc4dmfsbz24wrgi192xrn8116p4zpklwfqa0fblmfzpb"; + url = "https://beta.quicklisp.org/archive/nodgui/2025-06-22/nodgui-20250622-git.tgz"; + sha256 = "01lkgb2xk2lgq32fflsbf1p0mxxpk3215awhb1f01hgdnr94r7fa"; system = "nodgui"; asd = "nodgui"; } @@ -76619,12 +77627,12 @@ lib.makeScope pkgs.newScope (self: { nodgui-lite = ( build-asdf-system { pname = "nodgui-lite"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "nodgui-lite" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/nodgui/2024-10-12/nodgui-20241012-git.tgz"; - sha256 = "088dkpqsxc4dmfsbz24wrgi192xrn8116p4zpklwfqa0fblmfzpb"; + url = "https://beta.quicklisp.org/archive/nodgui/2025-06-22/nodgui-20250622-git.tgz"; + sha256 = "01lkgb2xk2lgq32fflsbf1p0mxxpk3215awhb1f01hgdnr94r7fa"; system = "nodgui-lite"; asd = "nodgui-lite"; } @@ -76653,12 +77661,12 @@ lib.makeScope pkgs.newScope (self: { noisy = ( build-asdf-system { pname = "noisy"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "noisy" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/noisy/2024-10-12/noisy-20241012-git.tgz"; - sha256 = "0qr29rxbrrlgd3k7hb6c62yzgflaygvxabq2sbhs90r0bi3cs0dj"; + url = "https://beta.quicklisp.org/archive/noisy/2025-06-22/noisy-20250622-git.tgz"; + sha256 = "0djv0gwaikvrl9xkwwfks8nw5iic0mjbbi78gnra0hsklikqfai3"; system = "noisy"; asd = "noisy"; } @@ -76673,12 +77681,12 @@ lib.makeScope pkgs.newScope (self: { nontrivial-gray-streams = ( build-asdf-system { pname = "nontrivial-gray-streams"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "nontrivial-gray-streams" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/nontrivial-gray-streams/2024-10-12/nontrivial-gray-streams-20241012-git.tgz"; - sha256 = "0v49nqsc5jbrg499qhk550zg4v5arjh9nch33n5g4f5bfgw7lzh3"; + url = "https://beta.quicklisp.org/archive/nontrivial-gray-streams/2025-06-22/nontrivial-gray-streams-20250622-git.tgz"; + sha256 = "1x5b2fw3kr1227vr4hab08cls5f7rzz7kf31xinvafbl5hpd2ynf"; system = "nontrivial-gray-streams"; asd = "nontrivial-gray-streams"; } @@ -76693,12 +77701,12 @@ lib.makeScope pkgs.newScope (self: { north = ( build-asdf-system { pname = "north"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "north" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/north/2024-10-12/north-20241012-git.tgz"; - sha256 = "0ml49xixdr1aagj580dr0dzx7dvdqrf45yyh3pzdzbp0pzqbpjz2"; + url = "https://beta.quicklisp.org/archive/north/2025-06-22/north-20250622-git.tgz"; + sha256 = "1vvcg5xd44siap7cfi4lzjdl7djq2vmyhpcdjd7fq86n30xqhnbk"; system = "north"; asd = "north"; } @@ -76713,22 +77721,24 @@ lib.makeScope pkgs.newScope (self: { north-core = ( build-asdf-system { pname = "north-core"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "north-core" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/north/2024-10-12/north-20241012-git.tgz"; - sha256 = "0ml49xixdr1aagj580dr0dzx7dvdqrf45yyh3pzdzbp0pzqbpjz2"; + url = "https://beta.quicklisp.org/archive/north/2025-06-22/north-20250622-git.tgz"; + sha256 = "1vvcg5xd44siap7cfi4lzjdl7djq2vmyhpcdjd7fq86n30xqhnbk"; system = "north-core"; asd = "north-core"; } ); systems = [ "north-core" ]; lispLibs = [ + (getAttr "babel" self) + (getAttr "cl-base64" self) (getAttr "cl-ppcre" self) - (getAttr "crypto-shortcuts" self) (getAttr "documentation-utils" self) - (getAttr "uuid" self) + (getAttr "frugal-uuid" self) + (getAttr "ironclad" self) ]; meta = { hydraPlatforms = [ ]; @@ -76738,12 +77748,12 @@ lib.makeScope pkgs.newScope (self: { north-dexador = ( build-asdf-system { pname = "north-dexador"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "north-dexador" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/north/2024-10-12/north-20241012-git.tgz"; - sha256 = "0ml49xixdr1aagj580dr0dzx7dvdqrf45yyh3pzdzbp0pzqbpjz2"; + url = "https://beta.quicklisp.org/archive/north/2025-06-22/north-20250622-git.tgz"; + sha256 = "1vvcg5xd44siap7cfi4lzjdl7djq2vmyhpcdjd7fq86n30xqhnbk"; system = "north-dexador"; asd = "north-dexador"; } @@ -76761,12 +77771,12 @@ lib.makeScope pkgs.newScope (self: { north-drakma = ( build-asdf-system { pname = "north-drakma"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "north-drakma" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/north/2024-10-12/north-20241012-git.tgz"; - sha256 = "0ml49xixdr1aagj580dr0dzx7dvdqrf45yyh3pzdzbp0pzqbpjz2"; + url = "https://beta.quicklisp.org/archive/north/2025-06-22/north-20250622-git.tgz"; + sha256 = "1vvcg5xd44siap7cfi4lzjdl7djq2vmyhpcdjd7fq86n30xqhnbk"; system = "north-drakma"; asd = "north-drakma"; } @@ -76784,12 +77794,12 @@ lib.makeScope pkgs.newScope (self: { north-example = ( build-asdf-system { pname = "north-example"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "north-example" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/north/2024-10-12/north-20241012-git.tgz"; - sha256 = "0ml49xixdr1aagj580dr0dzx7dvdqrf45yyh3pzdzbp0pzqbpjz2"; + url = "https://beta.quicklisp.org/archive/north/2025-06-22/north-20250622-git.tgz"; + sha256 = "1vvcg5xd44siap7cfi4lzjdl7djq2vmyhpcdjd7fq86n30xqhnbk"; system = "north-example"; asd = "north-example"; } @@ -76813,7 +77823,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "nsb-cga" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; system = "nsb-cga"; asd = "nsb-cga"; @@ -76833,7 +77843,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "nsort" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/nsort/2015-05-05/nsort-20150505-git.tgz"; + url = "https://beta.quicklisp.org/archive/nsort/2015-05-05/nsort-20150505-git.tgz"; sha256 = "1q58slg8pl390av8pv16xb8g9qibgy3pm6vyl1fw75mx37yqkyd3"; system = "nsort"; asd = "nsort"; @@ -76853,7 +77863,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "nst" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz"; sha256 = "1hf3r6pqbnd9vsd1i24qmz928kia72hdgmiafiwb6jw1hmj3r6ga"; system = "nst"; asd = "nst"; @@ -76876,7 +77886,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "nst-manual-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz"; sha256 = "1hf3r6pqbnd9vsd1i24qmz928kia72hdgmiafiwb6jw1hmj3r6ga"; system = "nst-manual-tests"; asd = "nst-manual-tests"; @@ -76900,7 +77910,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "nst-meta-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz"; sha256 = "1hf3r6pqbnd9vsd1i24qmz928kia72hdgmiafiwb6jw1hmj3r6ga"; system = "nst-meta-tests"; asd = "nst-meta-tests"; @@ -76924,7 +77934,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "nst-mop-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz"; sha256 = "1hf3r6pqbnd9vsd1i24qmz928kia72hdgmiafiwb6jw1hmj3r6ga"; system = "nst-mop-utils"; asd = "nst-mop-utils"; @@ -76947,7 +77957,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "nst-selftest-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz"; sha256 = "1hf3r6pqbnd9vsd1i24qmz928kia72hdgmiafiwb6jw1hmj3r6ga"; system = "nst-selftest-utils"; asd = "nst-selftest-utils"; @@ -76967,7 +77977,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "nst-simple-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz"; sha256 = "1hf3r6pqbnd9vsd1i24qmz928kia72hdgmiafiwb6jw1hmj3r6ga"; system = "nst-simple-tests"; asd = "nst-simple-tests"; @@ -76991,7 +78001,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "nst-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz"; sha256 = "1hf3r6pqbnd9vsd1i24qmz928kia72hdgmiafiwb6jw1hmj3r6ga"; system = "nst-test"; asd = "nst-test"; @@ -77016,7 +78026,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "nst-test-jenkins" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz"; sha256 = "1hf3r6pqbnd9vsd1i24qmz928kia72hdgmiafiwb6jw1hmj3r6ga"; system = "nst-test-jenkins"; asd = "nst-test-jenkins"; @@ -77040,7 +78050,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "nuclblog" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/nuclblog/2014-08-26/nuclblog-20140826-git.tgz"; + url = "https://beta.quicklisp.org/archive/nuclblog/2014-08-26/nuclblog-20140826-git.tgz"; sha256 = "03ngrxas65l7h9ykyy100arm0imvnrxxyyf809l8iqqv87b3k1hz"; system = "nuclblog"; asd = "nuclblog"; @@ -77068,7 +78078,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "nuklear-blob" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/nuklear-blob/2020-10-16/nuklear-blob-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/nuklear-blob/2020-10-16/nuklear-blob-stable-git.tgz"; sha256 = "1qqx08sd74ix027p6w35yr0ycp72swy1zzps015hwkiwxsawkncm"; system = "nuklear-blob"; asd = "nuklear-blob"; @@ -77092,7 +78102,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "nuklear-renderer-blob" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/nuklear-renderer-blob/2020-10-16/nuklear-renderer-blob-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/nuklear-renderer-blob/2020-10-16/nuklear-renderer-blob-stable-git.tgz"; sha256 = "0f73ns9dq02v7ixpbnvrfgp52cjdvmbbbhhfwjyv0ywxx30mrdq4"; system = "nuklear-renderer-blob"; asd = "nuklear-renderer-blob"; @@ -77116,7 +78126,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "null-package" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/null-package/2022-07-07/null-package-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/null-package/2022-07-07/null-package-20220707-git.tgz"; sha256 = "1ildain46gw0nfnxdwfvasr5vg1fs93afni3k65sl5imc82g910f"; system = "null-package"; asd = "null-package"; @@ -77141,7 +78151,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "null-package.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/null-package/2022-07-07/null-package-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/null-package/2022-07-07/null-package-20220707-git.tgz"; sha256 = "1ildain46gw0nfnxdwfvasr5vg1fs93afni3k65sl5imc82g910f"; system = "null-package.test"; asd = "null-package.test"; @@ -77165,7 +78175,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "num-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/numerical-utilities/2024-10-12/numerical-utilities-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/numerical-utilities/2024-10-12/numerical-utilities-20241012-git.tgz"; sha256 = "00ck2bj4pqir2aan26xhirk41wzrfaziqmnngabhmwi0hz81bjs6"; system = "num-utils"; asd = "num-utils"; @@ -77192,7 +78202,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "numcl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/numcl/2022-11-06/numcl-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/numcl/2022-11-06/numcl-20221106-git.tgz"; sha256 = "1x0j4vx5w3rn18pssfwys3ghfxr2lkkrv37y47144kr890jrcad9"; system = "numcl"; asd = "numcl"; @@ -77224,7 +78234,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "numcl.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/numcl/2022-11-06/numcl-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/numcl/2022-11-06/numcl-20221106-git.tgz"; sha256 = "1x0j4vx5w3rn18pssfwys3ghfxr2lkkrv37y47144kr890jrcad9"; system = "numcl.test"; asd = "numcl.test"; @@ -77240,6 +78250,61 @@ lib.makeScope pkgs.newScope (self: { }; } ); + numericals = ( + build-asdf-system { + pname = "numericals"; + version = "2024.12.0"; + asds = [ "numericals" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/numericals/2025-06-22/numericals-2024.12.0.tgz"; + sha256 = "1pwfgicyqs5gp37d5fxq7zljs3w7h09y0m9hc70lqc9qfr4c61jp"; + system = "numericals"; + asd = "numericals"; + } + ); + systems = [ "numericals" ]; + lispLibs = [ + (getAttr "alexandria" self) + (getAttr "bmas" self) + (getAttr "ceigen-lite" self) + (getAttr "cffi" self) + (getAttr "iterate" self) + (getAttr "lparallel" self) + (getAttr "peltadot" self) + (getAttr "peltadot-traits-library" self) + (getAttr "policy-cond" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + numericals_dot_common = ( + build-asdf-system { + pname = "numericals.common"; + version = "2024.12.0"; + asds = [ "numericals.common" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/numericals/2025-06-22/numericals-2024.12.0.tgz"; + sha256 = "1pwfgicyqs5gp37d5fxq7zljs3w7h09y0m9hc70lqc9qfr4c61jp"; + system = "numericals.common"; + asd = "numericals.common"; + } + ); + systems = [ "numericals.common" ]; + lispLibs = [ + (getAttr "alexandria" self) + (getAttr "cffi" self) + (getAttr "peltadot" self) + (getAttr "peltadot-traits-library" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); numpy-file-format = ( build-asdf-system { pname = "numpy-file-format"; @@ -77247,7 +78312,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "numpy-file-format" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/numpy-file-format/2023-10-21/numpy-file-format-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/numpy-file-format/2023-10-21/numpy-file-format-20231021-git.tgz"; sha256 = "1n0nixc44z1cymm20wif0l2100ydv0h69l6i6xz5bmwcb2zc4gqr"; system = "numpy-file-format"; asd = "numpy-file-format"; @@ -77270,7 +78335,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "nxt" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-nxt/2015-06-08/cl-nxt-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-nxt/2015-06-08/cl-nxt-20150608-git.tgz"; sha256 = "1r9004ra140i9v2pmxnjv86dix4040jr0rgww2zwk370zxys7h2g"; system = "nxt"; asd = "nxt"; @@ -77294,7 +78359,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "nxt-proxy" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-nxt/2015-06-08/cl-nxt-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-nxt/2015-06-08/cl-nxt-20150608-git.tgz"; sha256 = "1r9004ra140i9v2pmxnjv86dix4040jr0rgww2zwk370zxys7h2g"; system = "nxt-proxy"; asd = "nxt-proxy"; @@ -77313,12 +78378,12 @@ lib.makeScope pkgs.newScope (self: { nyaml = ( build-asdf-system { pname = "nyaml"; - version = "20211230-git"; + version = "20250622-git"; asds = [ "nyaml" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/nyaml/2021-12-30/nyaml-20211230-git.tgz"; - sha256 = "1gdsxhgqx9ynzrxwjidgljlkmz35wx83r6gwslxgg4v0g4vix9da"; + url = "https://beta.quicklisp.org/archive/nyaml/2025-06-22/nyaml-20250622-git.tgz"; + sha256 = "0prd2q70rwm7d6g5xqh224rcrqpdyl3wzaxplj98wkhmjjsdzh2x"; system = "nyaml"; asd = "nyaml"; } @@ -77342,18 +78407,18 @@ lib.makeScope pkgs.newScope (self: { nytpu_dot_lisp-utils = ( build-asdf-system { pname = "nytpu.lisp-utils"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "nytpu.lisp-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/nytpu.lisp-utils/2024-10-12/nytpu.lisp-utils-20241012-git.tgz"; - sha256 = "11mn2xf0nlaqmni0s22n4jbdy8rkqkin1sqni90drd8cs6mccmsd"; + url = "https://beta.quicklisp.org/archive/nytpu.lisp-utils/2025-06-22/nytpu.lisp-utils-20250622-git.tgz"; + sha256 = "1bkjhym38zj5jb97w9mapr6ingwzihfywgb6nlmw7anjb0silam6"; system = "nytpu.lisp-utils"; asd = "nytpu.lisp-utils"; } ); systems = [ "nytpu.lisp-utils" ]; - lispLibs = [ ]; + lispLibs = [ (getAttr "trivial-indent" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -77366,7 +78431,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "object-class" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/object-class/2020-09-25/object-class_1.0.tgz"; + url = "https://beta.quicklisp.org/archive/object-class/2020-09-25/object-class_1.0.tgz"; sha256 = "0qagmd2mxbr8b60l0y3jccj0maxjchds96p935pd3q805ry50683"; system = "object-class"; asd = "object-class"; @@ -77390,7 +78455,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "object-class_tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/object-class/2020-09-25/object-class_1.0.tgz"; + url = "https://beta.quicklisp.org/archive/object-class/2020-09-25/object-class_1.0.tgz"; sha256 = "0qagmd2mxbr8b60l0y3jccj0maxjchds96p935pd3q805ry50683"; system = "object-class_tests"; asd = "object-class_tests"; @@ -77414,7 +78479,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "oclcl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/oclcl/2019-05-21/oclcl-20190521-git.tgz"; + url = "https://beta.quicklisp.org/archive/oclcl/2019-05-21/oclcl-20190521-git.tgz"; sha256 = "1ccyrv4fknpln5askl8cpnwbp28sikrs6i3dwzm86jwhv272zc8q"; system = "oclcl"; asd = "oclcl"; @@ -77444,7 +78509,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "oclcl-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/oclcl/2019-05-21/oclcl-20190521-git.tgz"; + url = "https://beta.quicklisp.org/archive/oclcl/2019-05-21/oclcl-20190521-git.tgz"; sha256 = "1ccyrv4fknpln5askl8cpnwbp28sikrs6i3dwzm86jwhv272zc8q"; system = "oclcl-examples"; asd = "oclcl-examples"; @@ -77468,7 +78533,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "oclcl-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/oclcl/2019-05-21/oclcl-20190521-git.tgz"; + url = "https://beta.quicklisp.org/archive/oclcl/2019-05-21/oclcl-20190521-git.tgz"; sha256 = "1ccyrv4fknpln5askl8cpnwbp28sikrs6i3dwzm86jwhv272zc8q"; system = "oclcl-test"; asd = "oclcl-test"; @@ -77493,7 +78558,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ode-blob" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ode-blob/2020-10-16/ode-blob-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/ode-blob/2020-10-16/ode-blob-stable-git.tgz"; sha256 = "1l2zq27zmivmr6h66kadbh3isnbdmkxvc7wq16wwmsvq23bhpss6"; system = "ode-blob"; asd = "ode-blob"; @@ -77517,7 +78582,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "odepack" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; system = "odepack"; asd = "odepack"; @@ -77537,7 +78602,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "odesk" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-odesk/2015-06-08/cl-odesk-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-odesk/2015-06-08/cl-odesk-20150608-git.tgz"; sha256 = "1j5pjq4aw83m1in0l7ljn7jq4ixckg91p4h0lwf420xks3lhi4ka"; system = "odesk"; asd = "odesk"; @@ -77564,7 +78629,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "oe-encode" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/oe-encode/2015-08-04/oe-encode-20150804-git.tgz"; + url = "https://beta.quicklisp.org/archive/oe-encode/2015-08-04/oe-encode-20150804-git.tgz"; sha256 = "18hd97509vpg04gaf8lzjr2jfyj3w4ql1ydb5202p2r9k4qpvnj9"; system = "oe-encode"; asd = "oe-encode"; @@ -77584,7 +78649,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "oe-encode-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/oe-encode/2015-08-04/oe-encode-20150804-git.tgz"; + url = "https://beta.quicklisp.org/archive/oe-encode/2015-08-04/oe-encode-20150804-git.tgz"; sha256 = "18hd97509vpg04gaf8lzjr2jfyj3w4ql1ydb5202p2r9k4qpvnj9"; system = "oe-encode-test"; asd = "oe-encode"; @@ -77607,7 +78672,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "olc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/olc/2022-03-31/olc-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/olc/2022-03-31/olc-20220331-git.tgz"; sha256 = "02r6w9kfa6v4a12y2azmyjkxbn54r1y18c6a024vq4y6zp20fqnz"; system = "olc"; asd = "olc"; @@ -77623,12 +78688,12 @@ lib.makeScope pkgs.newScope (self: { omg = ( build-asdf-system { pname = "omg"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "omg" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/omglib/2024-10-12/omglib-20241012-git.tgz"; - sha256 = "0jp68w3sw9z8gn3498lrmysf93f22a71hsr9c886wix5zpwgqpx7"; + url = "https://beta.quicklisp.org/archive/omglib/2025-06-22/omglib-20250622-git.tgz"; + sha256 = "0m3hzavsg8la8cjsdd153h1y8v2bjwmf31yl33nb7gnb2vb1nd5n"; system = "omg"; asd = "omg"; } @@ -77636,12 +78701,13 @@ lib.makeScope pkgs.newScope (self: { systems = [ "omg" ]; lispLibs = [ (getAttr "bordeaux-threads" self) + (getAttr "cl-base64" self) (getAttr "cl-jpeg" self) - (getAttr "cl-parallel" self) (getAttr "clack" self) (getAttr "hunchentoot" self) (getAttr "media-types" self) (getAttr "pngload" self) + (getAttr "quri" self) (getAttr "skippy" self) (getAttr "trivial-utf-8" self) (getAttr "websocket-driver-server" self) @@ -77654,12 +78720,12 @@ lib.makeScope pkgs.newScope (self: { omgdaemon = ( build-asdf-system { pname = "omgdaemon"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "omgdaemon" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/omglib/2024-10-12/omglib-20241012-git.tgz"; - sha256 = "0jp68w3sw9z8gn3498lrmysf93f22a71hsr9c886wix5zpwgqpx7"; + url = "https://beta.quicklisp.org/archive/omglib/2025-06-22/omglib-20250622-git.tgz"; + sha256 = "0m3hzavsg8la8cjsdd153h1y8v2bjwmf31yl33nb7gnb2vb1nd5n"; system = "omgdaemon"; asd = "omgdaemon"; } @@ -77683,15 +78749,88 @@ lib.makeScope pkgs.newScope (self: { }; } ); + one-more-re-nightmare = ( + build-asdf-system { + pname = "one-more-re-nightmare"; + version = "20250622-git"; + asds = [ "one-more-re-nightmare" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/one-more-re-nightmare/2025-06-22/one-more-re-nightmare-20250622-git.tgz"; + sha256 = "0d4knmkbh81242l0j284y8h9sdgms22x8ngnpkqr47garrrfnp91"; + system = "one-more-re-nightmare"; + asd = "one-more-re-nightmare"; + } + ); + systems = [ "one-more-re-nightmare" ]; + lispLibs = [ + (getAttr "alexandria" self) + (getAttr "babel" self) + (getAttr "bordeaux-threads" self) + (getAttr "dynamic-mixins" self) + (getAttr "esrap" self) + (getAttr "stealth-mixin" self) + (getAttr "trivia" self) + (getAttr "trivial-indent" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + one-more-re-nightmare-simd = ( + build-asdf-system { + pname = "one-more-re-nightmare-simd"; + version = "20250622-git"; + asds = [ "one-more-re-nightmare-simd" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/one-more-re-nightmare/2025-06-22/one-more-re-nightmare-20250622-git.tgz"; + sha256 = "0d4knmkbh81242l0j284y8h9sdgms22x8ngnpkqr47garrrfnp91"; + system = "one-more-re-nightmare-simd"; + asd = "one-more-re-nightmare-simd"; + } + ); + systems = [ "one-more-re-nightmare-simd" ]; + lispLibs = [ (getAttr "one-more-re-nightmare" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + one-more-re-nightmare-tests = ( + build-asdf-system { + pname = "one-more-re-nightmare-tests"; + version = "20250622-git"; + asds = [ "one-more-re-nightmare-tests" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/one-more-re-nightmare/2025-06-22/one-more-re-nightmare-20250622-git.tgz"; + sha256 = "0d4knmkbh81242l0j284y8h9sdgms22x8ngnpkqr47garrrfnp91"; + system = "one-more-re-nightmare-tests"; + asd = "one-more-re-nightmare-tests"; + } + ); + systems = [ "one-more-re-nightmare-tests" ]; + lispLibs = [ + (getAttr "lparallel" self) + (getAttr "one-more-re-nightmare" self) + (getAttr "parachute" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); ook = ( build-asdf-system { pname = "ook"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "ook" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ook/2024-10-12/ook-20241012-git.tgz"; - sha256 = "0vh6g6a392z77yd4vgj3izajyai7pckr90ij1xns6cf9w505aq8w"; + url = "https://beta.quicklisp.org/archive/ook/2025-06-22/ook-20250622-git.tgz"; + sha256 = "0ibm7zii7nvjbz91ya5f98f1w3daxfpk1q6dcr59c9cimsnv2s3c"; system = "ook"; asd = "ook"; } @@ -77710,7 +78849,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "oook" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/oook/2017-11-30/oook-20171130-git.tgz"; + url = "https://beta.quicklisp.org/archive/oook/2017-11-30/oook-20171130-git.tgz"; sha256 = "0vxw160kbb2b624lc2aqvrx91xnmfhwz8nrzjvmbk5m55q1s4hxr"; system = "oook"; asd = "oook"; @@ -77740,7 +78879,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "open-geneva" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz"; + url = "https://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz"; sha256 = "1pw18xkbndqssx6iix8a8zcw8bgjh88jxxxrklkgkghk04bmqxw3"; system = "open-geneva"; asd = "open-geneva"; @@ -77768,7 +78907,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "open-location-code" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/open-location-code/2024-10-12/open-location-code-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/open-location-code/2024-10-12/open-location-code-20241012-git.tgz"; sha256 = "17ip3xzqr2jk9br39d58grrjbk6gsh2mq1a9irjg9a5fig0jlyb2"; system = "open-location-code"; asd = "open-location-code"; @@ -77791,7 +78930,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "open-vrp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/open-vrp/2014-09-14/open-vrp-20140914-git.tgz"; + url = "https://beta.quicklisp.org/archive/open-vrp/2014-09-14/open-vrp-20140914-git.tgz"; sha256 = "04k0kp18gpr4cfpsck7pjizawwswh372df4pvm5v87brm6xdw1fr"; system = "open-vrp"; asd = "open-vrp"; @@ -77816,7 +78955,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "open-vrp-lib" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/open-vrp/2014-09-14/open-vrp-20140914-git.tgz"; + url = "https://beta.quicklisp.org/archive/open-vrp/2014-09-14/open-vrp-20140914-git.tgz"; sha256 = "04k0kp18gpr4cfpsck7pjizawwswh372df4pvm5v87brm6xdw1fr"; system = "open-vrp-lib"; asd = "open-vrp-lib"; @@ -77837,12 +78976,12 @@ lib.makeScope pkgs.newScope (self: { open-with = ( build-asdf-system { pname = "open-with"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "open-with" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/open-with/2024-10-12/open-with-20241012-git.tgz"; - sha256 = "0bc0p8nigmfq4axx6qmlxdkm4sb0d2mdi1h7bwmnh0irvmrgdy33"; + url = "https://beta.quicklisp.org/archive/open-with/2025-06-22/open-with-20250622-git.tgz"; + sha256 = "0j0qv1389wbr84y3mis4qd2zz9qybnq4frvc01pamidsbryxss0r"; system = "open-with"; asd = "open-with"; } @@ -77864,7 +79003,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "openai-openapi-client" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/openai-openapi-client/2024-10-12/openai-openapi-client-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/openai-openapi-client/2024-10-12/openai-openapi-client-20241012-git.tgz"; sha256 = "0qyd9i0y75gf92kf8v22n6wmh63791115r7gmg9ca9pl0dgbpmg9"; system = "openai-openapi-client"; asd = "openai-openapi-client"; @@ -77890,7 +79029,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "openal-blob" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/openal-blob/2020-10-16/openal-blob-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/openal-blob/2020-10-16/openal-blob-stable-git.tgz"; sha256 = "0bspdqb0xbvwvi6xkn88n4jswpds8fzbgj44ygm7mi6lpwp7lmv2"; system = "openal-blob"; asd = "openal-blob"; @@ -77910,12 +79049,12 @@ lib.makeScope pkgs.newScope (self: { openapi-generator = ( build-asdf-system { pname = "openapi-generator"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "openapi-generator" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/openapi-generator/2024-10-12/openapi-generator-20241012-git.tgz"; - sha256 = "0zc0y8frcnsqj76sqmqsgfv0zhdz5kkpynwan3sigc78fl1nrs3q"; + url = "https://beta.quicklisp.org/archive/openapi-generator/2025-06-22/openapi-generator-20250622-git.tgz"; + sha256 = "0876fgy5k1i0sd53qyaic5idd9arf6q132yv2ilwskp78wp03x30"; system = "openapi-generator"; asd = "openapi-generator"; } @@ -77952,7 +79091,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "openapi-parser" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-openapi-parser/2023-06-18/cl-openapi-parser-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-openapi-parser/2023-06-18/cl-openapi-parser-20230618-git.tgz"; sha256 = "1vjqmxgkd8zvsfa1m6jzp6adwv1hz79z1x662v0f567iar01rzyz"; system = "openapi-parser"; asd = "openapi-parser"; @@ -77982,7 +79121,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "openapi-parser-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-openapi-parser/2023-06-18/cl-openapi-parser-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-openapi-parser/2023-06-18/cl-openapi-parser-20230618-git.tgz"; sha256 = "1vjqmxgkd8zvsfa1m6jzp6adwv1hz79z1x662v0f567iar01rzyz"; system = "openapi-parser-tests"; asd = "openapi-parser"; @@ -78005,7 +79144,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "openid-key" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/openid-key/2018-12-10/openid-key-20181210-git.tgz"; + url = "https://beta.quicklisp.org/archive/openid-key/2018-12-10/openid-key-20181210-git.tgz"; sha256 = "0ja1g4f8nrcn965376j7lnhha9krx4wjqxrg6vc57k7rmkhkzm1z"; system = "openid-key"; asd = "openid-key"; @@ -78033,7 +79172,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "openid-key-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/openid-key/2018-12-10/openid-key-20181210-git.tgz"; + url = "https://beta.quicklisp.org/archive/openid-key/2018-12-10/openid-key-20181210-git.tgz"; sha256 = "0ja1g4f8nrcn965376j7lnhha9krx4wjqxrg6vc57k7rmkhkzm1z"; system = "openid-key-test"; asd = "openid-key-test"; @@ -78052,12 +79191,12 @@ lib.makeScope pkgs.newScope (self: { openrpc-ci = ( build-asdf-system { pname = "openrpc-ci"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "openrpc-ci" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/openrpc/2024-10-12/openrpc-20241012-git.tgz"; - sha256 = "1s3c5yzfdzvv9wdfjl6lmap7dv5wqz6ywnxl1sbahy1k2xm3fg1s"; + url = "https://beta.quicklisp.org/archive/openrpc/2025-06-22/openrpc-20250622-git.tgz"; + sha256 = "0nr9wr69v74861da7ibwjdzi338k39f7cz1acbw53j9d6wv49wb0"; system = "openrpc-ci"; asd = "openrpc-ci"; } @@ -78072,12 +79211,12 @@ lib.makeScope pkgs.newScope (self: { openrpc-client = ( build-asdf-system { pname = "openrpc-client"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "openrpc-client" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/openrpc/2024-10-12/openrpc-20241012-git.tgz"; - sha256 = "1s3c5yzfdzvv9wdfjl6lmap7dv5wqz6ywnxl1sbahy1k2xm3fg1s"; + url = "https://beta.quicklisp.org/archive/openrpc/2025-06-22/openrpc-20250622-git.tgz"; + sha256 = "0nr9wr69v74861da7ibwjdzi338k39f7cz1acbw53j9d6wv49wb0"; system = "openrpc-client"; asd = "openrpc-client"; } @@ -78104,12 +79243,12 @@ lib.makeScope pkgs.newScope (self: { openrpc-deps = ( build-asdf-system { pname = "openrpc-deps"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "openrpc-deps" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/openrpc/2024-10-12/openrpc-20241012-git.tgz"; - sha256 = "1s3c5yzfdzvv9wdfjl6lmap7dv5wqz6ywnxl1sbahy1k2xm3fg1s"; + url = "https://beta.quicklisp.org/archive/openrpc/2025-06-22/openrpc-20250622-git.tgz"; + sha256 = "0nr9wr69v74861da7ibwjdzi338k39f7cz1acbw53j9d6wv49wb0"; system = "openrpc-deps"; asd = "openrpc-deps"; } @@ -78124,12 +79263,12 @@ lib.makeScope pkgs.newScope (self: { openrpc-docs = ( build-asdf-system { pname = "openrpc-docs"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "openrpc-docs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/openrpc/2024-10-12/openrpc-20241012-git.tgz"; - sha256 = "1s3c5yzfdzvv9wdfjl6lmap7dv5wqz6ywnxl1sbahy1k2xm3fg1s"; + url = "https://beta.quicklisp.org/archive/openrpc/2025-06-22/openrpc-20250622-git.tgz"; + sha256 = "0nr9wr69v74861da7ibwjdzi338k39f7cz1acbw53j9d6wv49wb0"; system = "openrpc-docs"; asd = "openrpc-docs"; } @@ -78148,12 +79287,12 @@ lib.makeScope pkgs.newScope (self: { openrpc-example = ( build-asdf-system { pname = "openrpc-example"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "openrpc-example" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/openrpc/2024-10-12/openrpc-20241012-git.tgz"; - sha256 = "1s3c5yzfdzvv9wdfjl6lmap7dv5wqz6ywnxl1sbahy1k2xm3fg1s"; + url = "https://beta.quicklisp.org/archive/openrpc/2025-06-22/openrpc-20250622-git.tgz"; + sha256 = "0nr9wr69v74861da7ibwjdzi338k39f7cz1acbw53j9d6wv49wb0"; system = "openrpc-example"; asd = "openrpc-example"; } @@ -78177,12 +79316,12 @@ lib.makeScope pkgs.newScope (self: { openrpc-server = ( build-asdf-system { pname = "openrpc-server"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "openrpc-server" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/openrpc/2024-10-12/openrpc-20241012-git.tgz"; - sha256 = "1s3c5yzfdzvv9wdfjl6lmap7dv5wqz6ywnxl1sbahy1k2xm3fg1s"; + url = "https://beta.quicklisp.org/archive/openrpc/2025-06-22/openrpc-20250622-git.tgz"; + sha256 = "0nr9wr69v74861da7ibwjdzi338k39f7cz1acbw53j9d6wv49wb0"; system = "openrpc-server"; asd = "openrpc-server"; } @@ -78210,6 +79349,37 @@ lib.makeScope pkgs.newScope (self: { }; } ); + openrpc-tests = ( + build-asdf-system { + pname = "openrpc-tests"; + version = "20250622-git"; + asds = [ "openrpc-tests" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/openrpc/2025-06-22/openrpc-20250622-git.tgz"; + sha256 = "0nr9wr69v74861da7ibwjdzi338k39f7cz1acbw53j9d6wv49wb0"; + system = "openrpc-tests"; + asd = "openrpc-tests"; + } + ); + systems = [ "openrpc-tests" ]; + lispLibs = [ + (getAttr "alexandria" self) + (getAttr "clack-test" self) + (getAttr "diff" self) + (getAttr "hamcrest" self) + (getAttr "jsonrpc" self) + (getAttr "openrpc-client" self) + (getAttr "openrpc-example" self) + (getAttr "openrpc-server" self) + (getAttr "rove" self) + (getAttr "serapeum" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); ops-test = ( build-asdf-system { pname = "ops-test"; @@ -78217,7 +79387,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ops-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-png/2021-10-20/cl-png-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-png/2021-10-20/cl-png-20211020-git.tgz"; sha256 = "17xcb9ps5vf3if61blmx7cpfrz3gsw7jk8d5zv3f4cq8jrriqdx4"; system = "ops-test"; asd = "ops-test"; @@ -78237,7 +79407,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ops5" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ops5/2020-02-18/ops5-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/ops5/2020-02-18/ops5-20200218-git.tgz"; sha256 = "1q2mrza40qvhny06f4ks2dghyk8a7pjjsi3vj83b9if7fmyj152a"; system = "ops5"; asd = "ops5"; @@ -78257,7 +79427,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "opticl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/opticl/2022-02-20/opticl-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/opticl/2022-02-20/opticl-20220220-git.tgz"; sha256 = "1jx9n78d4lf53iz24yid34l92zrpqxfihv6049ixcy0xigf7j4ac"; system = "opticl"; asd = "opticl"; @@ -78286,7 +79456,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "opticl-core" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/opticl-core/2017-10-19/opticl-core-20171019-git.tgz"; + url = "https://beta.quicklisp.org/archive/opticl-core/2017-10-19/opticl-core-20171019-git.tgz"; sha256 = "0458bllabcdjghfrqx6aki49c9qmvfmkk8jl75cfpi7q0i12kh95"; system = "opticl-core"; asd = "opticl-core"; @@ -78306,7 +79476,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "opticl-doc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/opticl/2022-02-20/opticl-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/opticl/2022-02-20/opticl-20220220-git.tgz"; sha256 = "1jx9n78d4lf53iz24yid34l92zrpqxfihv6049ixcy0xigf7j4ac"; system = "opticl-doc"; asd = "opticl-doc"; @@ -78331,7 +79501,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "optima" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz"; sha256 = "1yw4ymq7ms89342kkvb3aqxgv0w38m9kd8ikdqxxzyybnkjhndal"; system = "optima"; asd = "optima"; @@ -78352,7 +79522,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "optima.ppcre" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz"; sha256 = "1yw4ymq7ms89342kkvb3aqxgv0w38m9kd8ikdqxxzyybnkjhndal"; system = "optima.ppcre"; asd = "optima.ppcre"; @@ -78376,7 +79546,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "optima.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz"; sha256 = "1yw4ymq7ms89342kkvb3aqxgv0w38m9kd8ikdqxxzyybnkjhndal"; system = "optima.test"; asd = "optima.test"; @@ -78400,7 +79570,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "or-cluster" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-opsresearch/2017-04-03/cl-opsresearch-20170403-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-opsresearch/2017-04-03/cl-opsresearch-20170403-git.tgz"; sha256 = "1fipw6qjggswzcg8ifwx5qnhnc7mmi53s6h14l0vzj6afa5rdpm7"; system = "or-cluster"; asd = "or-cluster"; @@ -78424,7 +79594,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "or-fann" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-opsresearch/2017-04-03/cl-opsresearch-20170403-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-opsresearch/2017-04-03/cl-opsresearch-20170403-git.tgz"; sha256 = "1fipw6qjggswzcg8ifwx5qnhnc7mmi53s6h14l0vzj6afa5rdpm7"; system = "or-fann"; asd = "or-fann"; @@ -78447,7 +79617,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "or-glpk" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-opsresearch/2017-04-03/cl-opsresearch-20170403-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-opsresearch/2017-04-03/cl-opsresearch-20170403-git.tgz"; sha256 = "1fipw6qjggswzcg8ifwx5qnhnc7mmi53s6h14l0vzj6afa5rdpm7"; system = "or-glpk"; asd = "or-glpk"; @@ -78470,7 +79640,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "or-gsl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-opsresearch/2017-04-03/cl-opsresearch-20170403-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-opsresearch/2017-04-03/cl-opsresearch-20170403-git.tgz"; sha256 = "1fipw6qjggswzcg8ifwx5qnhnc7mmi53s6h14l0vzj6afa5rdpm7"; system = "or-gsl"; asd = "or-gsl"; @@ -78493,7 +79663,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "or-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-opsresearch/2017-04-03/cl-opsresearch-20170403-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-opsresearch/2017-04-03/cl-opsresearch-20170403-git.tgz"; sha256 = "1fipw6qjggswzcg8ifwx5qnhnc7mmi53s6h14l0vzj6afa5rdpm7"; system = "or-test"; asd = "or-test"; @@ -78519,7 +79689,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "org-davep-dict" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/org-davep-dict/2019-05-21/org-davep-dict-20190521-git.tgz"; + url = "https://beta.quicklisp.org/archive/org-davep-dict/2019-05-21/org-davep-dict-20190521-git.tgz"; sha256 = "09dryqlprssrw0jpcg2313cc1hmlsasxvp1rs5z7axhasc16kl31"; system = "org-davep-dict"; asd = "org-davep-dict"; @@ -78543,7 +79713,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "org-davep-dictrepl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/org-davep-dictrepl/2019-05-21/org-davep-dictrepl-20190521-git.tgz"; + url = "https://beta.quicklisp.org/archive/org-davep-dictrepl/2019-05-21/org-davep-dictrepl-20190521-git.tgz"; sha256 = "1s461asil8cxsbcpyxsw3g7phdn5c3mwv6wswp86hsxiga5hi327"; system = "org-davep-dictrepl"; asd = "org-davep-dictrepl"; @@ -78563,7 +79733,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "org-sampler" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/org-sampler/2016-03-18/org-sampler-0.2.0.tgz"; + url = "https://beta.quicklisp.org/archive/org-sampler/2016-03-18/org-sampler-0.2.0.tgz"; sha256 = "1j2i24x9afxp6s5gyqlvy11c0lq9rzhmdj1bf0qpxcaa4znj48c3"; system = "org-sampler"; asd = "org-sampler"; @@ -78579,12 +79749,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_melusina_dot_atelier = ( build-asdf-system { pname = "org.melusina.atelier"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "org.melusina.atelier" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-atelier/2024-10-12/cl-atelier-20241012-git.tgz"; - sha256 = "0n8v4f7xq1szxhipmkvg4x5s41vqllcq6hxzcd7r0rbxi9i57pqz"; + url = "https://beta.quicklisp.org/archive/cl-atelier/2025-06-22/cl-atelier-20250622-git.tgz"; + sha256 = "1q95j1bsriil7b1d2i90h398iz84c743mai16ksl616mn0ydkhk8"; system = "org.melusina.atelier"; asd = "org.melusina.atelier"; } @@ -78609,7 +79779,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "org.melusina.confidence" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-confidence/2024-10-12/cl-confidence-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-confidence/2024-10-12/cl-confidence-20241012-git.tgz"; sha256 = "1azvv54zchw88gpzh4dkflz6y0pvf7wq433yc7m90fs3c70wmsjl"; system = "org.melusina.confidence"; asd = "org.melusina.confidence"; @@ -78629,7 +79799,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "org.melusina.rashell" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-rashell/2024-10-12/cl-rashell-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-rashell/2024-10-12/cl-rashell-20241012-git.tgz"; sha256 = "0fpdyhfc68xy6m0ixfvcnczlmlwasby24k47nc25x73swshlxqwq"; system = "org.melusina.rashell"; asd = "org.melusina.rashell"; @@ -78649,12 +79819,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_melusina_dot_webmachine = ( build-asdf-system { pname = "org.melusina.webmachine"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "org.melusina.webmachine" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-webmachine/2024-10-12/cl-webmachine-20241012-git.tgz"; - sha256 = "0k31fbwsv0zdixzis625dsk9zlz04g4908wzwb8p593dksqa0sr8"; + url = "https://beta.quicklisp.org/archive/cl-webmachine/2025-06-22/cl-webmachine-20250622-git.tgz"; + sha256 = "09nrd8wqwfnqgag1w078pwk0qiy4d32ib8wjhkfqpky7pxccp73h"; system = "org.melusina.webmachine"; asd = "org.melusina.webmachine"; } @@ -78675,12 +79845,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_conduit-packages = ( build-asdf-system { pname = "org.tfeb.conduit-packages"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "org.tfeb.conduit-packages" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/conduit-packages/2024-10-12/conduit-packages-20241012-git.tgz"; - sha256 = "1x89maglc4cw2c87y23zrsvh8mk22ik1anmps462w3a0j3c1ly12"; + url = "https://beta.quicklisp.org/archive/conduit-packages/2025-06-22/conduit-packages-20250622-git.tgz"; + sha256 = "1nb58r52ic3k7dyis1h3pb16hf6nr37hr03drf09xhxir4n6gj77"; system = "org.tfeb.conduit-packages"; asd = "org.tfeb.conduit-packages"; } @@ -78695,12 +79865,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_dsm = ( build-asdf-system { pname = "org.tfeb.dsm"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "org.tfeb.dsm" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/dsm/2024-10-12/dsm-20241012-git.tgz"; - sha256 = "033swj37bgbzn35fjndxqsk89i17bhsim12j8mciiziykx62c4pw"; + url = "https://beta.quicklisp.org/archive/dsm/2025-06-22/dsm-20250622-git.tgz"; + sha256 = "1ahibwfrjdxvxw2rhfq4804lb9bidyzxcxwplc7sdfcsjzbvnzk7"; system = "org.tfeb.dsm"; asd = "org.tfeb.dsm"; } @@ -78721,12 +79891,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax = ( build-asdf-system { pname = "org.tfeb.hax"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "org.tfeb.hax" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; - sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; + sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; system = "org.tfeb.hax"; asd = "org.tfeb.hax"; } @@ -78741,12 +79911,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_abstract-classes = ( build-asdf-system { pname = "org.tfeb.hax.abstract-classes"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "org.tfeb.hax.abstract-classes" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; - sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; + sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; system = "org.tfeb.hax.abstract-classes"; asd = "org.tfeb.hax.abstract-classes"; } @@ -78761,12 +79931,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_binding = ( build-asdf-system { pname = "org.tfeb.hax.binding"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "org.tfeb.hax.binding" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; - sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; + sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; system = "org.tfeb.hax.binding"; asd = "org.tfeb.hax.binding"; } @@ -78784,12 +79954,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_collecting = ( build-asdf-system { pname = "org.tfeb.hax.collecting"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "org.tfeb.hax.collecting" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; - sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; + sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; system = "org.tfeb.hax.collecting"; asd = "org.tfeb.hax.collecting"; } @@ -78804,12 +79974,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_comment-form = ( build-asdf-system { pname = "org.tfeb.hax.comment-form"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "org.tfeb.hax.comment-form" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; - sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; + sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; system = "org.tfeb.hax.comment-form"; asd = "org.tfeb.hax.comment-form"; } @@ -78824,12 +79994,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_cs-forms = ( build-asdf-system { pname = "org.tfeb.hax.cs-forms"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "org.tfeb.hax.cs-forms" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; - sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; + sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; system = "org.tfeb.hax.cs-forms"; asd = "org.tfeb.hax.cs-forms"; } @@ -78844,12 +80014,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_define-functions = ( build-asdf-system { pname = "org.tfeb.hax.define-functions"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "org.tfeb.hax.define-functions" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; - sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; + sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; system = "org.tfeb.hax.define-functions"; asd = "org.tfeb.hax.define-functions"; } @@ -78864,12 +80034,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_dynamic-state = ( build-asdf-system { pname = "org.tfeb.hax.dynamic-state"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "org.tfeb.hax.dynamic-state" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; - sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; + sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; system = "org.tfeb.hax.dynamic-state"; asd = "org.tfeb.hax.dynamic-state"; } @@ -78884,12 +80054,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_iterate = ( build-asdf-system { pname = "org.tfeb.hax.iterate"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "org.tfeb.hax.iterate" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; - sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; + sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; system = "org.tfeb.hax.iterate"; asd = "org.tfeb.hax.iterate"; } @@ -78901,15 +80071,41 @@ lib.makeScope pkgs.newScope (self: { }; } ); + org_dot_tfeb_dot_hax_dot_let-values = ( + build-asdf-system { + pname = "org.tfeb.hax.let-values"; + version = "20250622-git"; + asds = [ "org.tfeb.hax.let-values" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; + sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; + system = "org.tfeb.hax.let-values"; + asd = "org.tfeb.hax.let-values"; + } + ); + systems = [ "org.tfeb.hax.let-values" ]; + lispLibs = [ + (getAttr "org_dot_tfeb_dot_hax_dot_collecting" self) + (getAttr "org_dot_tfeb_dot_hax_dot_iterate" self) + (getAttr "org_dot_tfeb_dot_hax_dot_process-declarations" self) + (getAttr "org_dot_tfeb_dot_hax_dot_spam" self) + (getAttr "org_dot_tfeb_dot_hax_dot_utilities" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); org_dot_tfeb_dot_hax_dot_memoize = ( build-asdf-system { pname = "org.tfeb.hax.memoize"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "org.tfeb.hax.memoize" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; - sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; + sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; system = "org.tfeb.hax.memoize"; asd = "org.tfeb.hax.memoize"; } @@ -78924,12 +80120,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_metatronic = ( build-asdf-system { pname = "org.tfeb.hax.metatronic"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "org.tfeb.hax.metatronic" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; - sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; + sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; system = "org.tfeb.hax.metatronic"; asd = "org.tfeb.hax.metatronic"; } @@ -78944,18 +80140,38 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_object-accessors = ( build-asdf-system { pname = "org.tfeb.hax.object-accessors"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "org.tfeb.hax.object-accessors" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; - sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; + sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; system = "org.tfeb.hax.object-accessors"; asd = "org.tfeb.hax.object-accessors"; } ); systems = [ "org.tfeb.hax.object-accessors" ]; - lispLibs = [ ]; + lispLibs = [ (getAttr "org_dot_tfeb_dot_hax_dot_utilities" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + org_dot_tfeb_dot_hax_dot_process-declarations = ( + build-asdf-system { + pname = "org.tfeb.hax.process-declarations"; + version = "20250622-git"; + asds = [ "org.tfeb.hax.process-declarations" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; + sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; + system = "org.tfeb.hax.process-declarations"; + asd = "org.tfeb.hax.process-declarations"; + } + ); + systems = [ "org.tfeb.hax.process-declarations" ]; + lispLibs = [ (getAttr "org_dot_tfeb_dot_hax_dot_utilities" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -78964,12 +80180,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_read-package = ( build-asdf-system { pname = "org.tfeb.hax.read-package"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "org.tfeb.hax.read-package" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; - sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; + sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; system = "org.tfeb.hax.read-package"; asd = "org.tfeb.hax.read-package"; } @@ -78984,12 +80200,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_simple-loops = ( build-asdf-system { pname = "org.tfeb.hax.simple-loops"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "org.tfeb.hax.simple-loops" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; - sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; + sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; system = "org.tfeb.hax.simple-loops"; asd = "org.tfeb.hax.simple-loops"; } @@ -79008,12 +80224,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_singleton-classes = ( build-asdf-system { pname = "org.tfeb.hax.singleton-classes"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "org.tfeb.hax.singleton-classes" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; - sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; + sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; system = "org.tfeb.hax.singleton-classes"; asd = "org.tfeb.hax.singleton-classes"; } @@ -79028,12 +80244,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_slog = ( build-asdf-system { pname = "org.tfeb.hax.slog"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "org.tfeb.hax.slog" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; - sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; + sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; system = "org.tfeb.hax.slog"; asd = "org.tfeb.hax.slog"; } @@ -79053,12 +80269,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_spam = ( build-asdf-system { pname = "org.tfeb.hax.spam"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "org.tfeb.hax.spam" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; - sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; + sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; system = "org.tfeb.hax.spam"; asd = "org.tfeb.hax.spam"; } @@ -79073,12 +80289,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_stringtable = ( build-asdf-system { pname = "org.tfeb.hax.stringtable"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "org.tfeb.hax.stringtable" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; - sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; + sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; system = "org.tfeb.hax.stringtable"; asd = "org.tfeb.hax.stringtable"; } @@ -79096,12 +80312,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_trace-macroexpand = ( build-asdf-system { pname = "org.tfeb.hax.trace-macroexpand"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "org.tfeb.hax.trace-macroexpand" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; - sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; + sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; system = "org.tfeb.hax.trace-macroexpand"; asd = "org.tfeb.hax.trace-macroexpand"; } @@ -79116,12 +80332,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_utilities = ( build-asdf-system { pname = "org.tfeb.hax.utilities"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "org.tfeb.hax.utilities" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; - sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; + sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; system = "org.tfeb.hax.utilities"; asd = "org.tfeb.hax.utilities"; } @@ -79136,12 +80352,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_wrapping-standard = ( build-asdf-system { pname = "org.tfeb.hax.wrapping-standard"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "org.tfeb.hax.wrapping-standard" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; - sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; + sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; system = "org.tfeb.hax.wrapping-standard"; asd = "org.tfeb.hax.wrapping-standard"; } @@ -79160,7 +80376,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "org.tfeb.tools" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-tools/2023-10-21/tfeb-lisp-tools-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-tools/2023-10-21/tfeb-lisp-tools-20231021-git.tgz"; sha256 = "180zg96ln2fp7fzdmf5yiz0dxy36r2ddq0nxl0dkmhbrn03bd4iq"; system = "org.tfeb.tools"; asd = "org.tfeb.tools"; @@ -79180,7 +80396,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "org.tfeb.tools.asdf-module-sysdcls" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-tools/2023-10-21/tfeb-lisp-tools-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-tools/2023-10-21/tfeb-lisp-tools-20231021-git.tgz"; sha256 = "180zg96ln2fp7fzdmf5yiz0dxy36r2ddq0nxl0dkmhbrn03bd4iq"; system = "org.tfeb.tools.asdf-module-sysdcls"; asd = "org.tfeb.tools.asdf-module-sysdcls"; @@ -79200,7 +80416,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "org.tfeb.tools.build-modules" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-tools/2023-10-21/tfeb-lisp-tools-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-tools/2023-10-21/tfeb-lisp-tools-20231021-git.tgz"; sha256 = "180zg96ln2fp7fzdmf5yiz0dxy36r2ddq0nxl0dkmhbrn03bd4iq"; system = "org.tfeb.tools.build-modules"; asd = "org.tfeb.tools.build-modules"; @@ -79220,7 +80436,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "org.tfeb.tools.deprecations" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-tools/2023-10-21/tfeb-lisp-tools-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-tools/2023-10-21/tfeb-lisp-tools-20231021-git.tgz"; sha256 = "180zg96ln2fp7fzdmf5yiz0dxy36r2ddq0nxl0dkmhbrn03bd4iq"; system = "org.tfeb.tools.deprecations"; asd = "org.tfeb.tools.deprecations"; @@ -79240,7 +80456,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "org.tfeb.tools.feature-expressions" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-tools/2023-10-21/tfeb-lisp-tools-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-tools/2023-10-21/tfeb-lisp-tools-20231021-git.tgz"; sha256 = "180zg96ln2fp7fzdmf5yiz0dxy36r2ddq0nxl0dkmhbrn03bd4iq"; system = "org.tfeb.tools.feature-expressions"; asd = "org.tfeb.tools.feature-expressions"; @@ -79260,7 +80476,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "org.tfeb.tools.install-providers" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-tools/2023-10-21/tfeb-lisp-tools-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-tools/2023-10-21/tfeb-lisp-tools-20231021-git.tgz"; sha256 = "180zg96ln2fp7fzdmf5yiz0dxy36r2ddq0nxl0dkmhbrn03bd4iq"; system = "org.tfeb.tools.install-providers"; asd = "org.tfeb.tools.install-providers"; @@ -79280,7 +80496,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "org.tfeb.tools.require-module" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-tools/2023-10-21/tfeb-lisp-tools-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-tools/2023-10-21/tfeb-lisp-tools-20231021-git.tgz"; sha256 = "180zg96ln2fp7fzdmf5yiz0dxy36r2ddq0nxl0dkmhbrn03bd4iq"; system = "org.tfeb.tools.require-module"; asd = "org.tfeb.tools.require-module"; @@ -79300,7 +80516,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "origin" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/origin/2022-07-07/origin-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/origin/2022-07-07/origin-20220707-git.tgz"; sha256 = "01b5rn83w85fnd92x5jgan2a092y7ir420r55p2b0a98xpvb4a71"; system = "origin"; asd = "origin"; @@ -79320,7 +80536,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "origin.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/origin/2022-07-07/origin-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/origin/2022-07-07/origin-20220707-git.tgz"; sha256 = "01b5rn83w85fnd92x5jgan2a092y7ir420r55p2b0a98xpvb4a71"; system = "origin.test"; asd = "origin.test"; @@ -79343,7 +80559,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "orizuru-orm" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/orizuru-orm/2024-10-12/orizuru-orm-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/orizuru-orm/2024-10-12/orizuru-orm-20241012-git.tgz"; sha256 = "064sr0nxz884vrh550d8v3v9pqgs65d97lrr3828qn6bgaxwm1va"; system = "orizuru-orm"; asd = "orizuru-orm"; @@ -79375,7 +80591,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "osc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/osc/2023-06-18/osc-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/osc/2023-06-18/osc-20230618-git.tgz"; sha256 = "0gh29zcl9pmy3xlmwzpf9www2z06ah6b4jk06sj2cvxbc15nblqa"; system = "osc"; asd = "osc"; @@ -79391,12 +80607,12 @@ lib.makeScope pkgs.newScope (self: { osicat = ( build-asdf-system { pname = "osicat"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "osicat" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/osicat/2023-10-21/osicat-20231021-git.tgz"; - sha256 = "10q1dfkhrvp5ia860q10y4wdm11fmxf7xv8zl4viz2np9xzf5v22"; + url = "https://beta.quicklisp.org/archive/osicat/2025-06-22/osicat-20250622-git.tgz"; + sha256 = "1cwh4dim62ffm0hcrswk543zm3ynrqbkjxcrrc1ndfjl1b5kgars"; system = "osicat"; asd = "osicat"; } @@ -79418,7 +80634,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ospm" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ospm/2023-10-21/ospm-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/ospm/2023-10-21/ospm-20231021-git.tgz"; sha256 = "1z2wz2xg7rn7p1lladdhj789iz2f3wfjgpi2hjr08vkf1pkp15xf"; system = "ospm"; asd = "ospm"; @@ -79443,12 +80659,12 @@ lib.makeScope pkgs.newScope (self: { overlord = ( build-asdf-system { pname = "overlord"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "overlord" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/overlord/2024-10-12/overlord-20241012-git.tgz"; - sha256 = "1afhqx6wdqdah1fpapvr6zxpzkkqmhbrxkqxam523fqjyg4a6941"; + url = "https://beta.quicklisp.org/archive/overlord/2025-06-22/overlord-20250622-git.tgz"; + sha256 = "1fr3nkycqhb2c5f94r9zv9b3viagik0qsx1bsrb4jcrr1r07vl4m"; system = "overlord"; asd = "overlord"; } @@ -79486,7 +80702,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "oxenfurt" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/oxenfurt/2023-10-21/oxenfurt-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/oxenfurt/2023-10-21/oxenfurt-20231021-git.tgz"; sha256 = "1yqw21l19091aghvnfpdp62zs8scspaas4syn2yajm1b55jzxvya"; system = "oxenfurt"; asd = "oxenfurt"; @@ -79506,7 +80722,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "oxenfurt-core" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/oxenfurt/2023-10-21/oxenfurt-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/oxenfurt/2023-10-21/oxenfurt-20231021-git.tgz"; sha256 = "1yqw21l19091aghvnfpdp62zs8scspaas4syn2yajm1b55jzxvya"; system = "oxenfurt-core"; asd = "oxenfurt-core"; @@ -79531,7 +80747,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "oxenfurt-dexador" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/oxenfurt/2023-10-21/oxenfurt-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/oxenfurt/2023-10-21/oxenfurt-20231021-git.tgz"; sha256 = "1yqw21l19091aghvnfpdp62zs8scspaas4syn2yajm1b55jzxvya"; system = "oxenfurt-dexador"; asd = "oxenfurt-dexador"; @@ -79554,7 +80770,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "oxenfurt-drakma" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/oxenfurt/2023-10-21/oxenfurt-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/oxenfurt/2023-10-21/oxenfurt-20231021-git.tgz"; sha256 = "1yqw21l19091aghvnfpdp62zs8scspaas4syn2yajm1b55jzxvya"; system = "oxenfurt-drakma"; asd = "oxenfurt-drakma"; @@ -79577,7 +80793,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pack" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pack/2011-06-19/pack-20110619-git.tgz"; + url = "https://beta.quicklisp.org/archive/pack/2011-06-19/pack-20110619-git.tgz"; sha256 = "1b3qi04v1wj9nig0mx591sl4phqcalwdl0vsnf4kqp4d2qx2czi1"; system = "pack"; asd = "pack"; @@ -79600,7 +80816,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "package-renaming" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/package-renaming/2012-04-07/package-renaming-20120407-git.tgz"; + url = "https://beta.quicklisp.org/archive/package-renaming/2012-04-07/package-renaming-20120407-git.tgz"; sha256 = "15kgd15r9bib8wfnn3hmv42rlifr4ph3rv2mji5i9d5ixhyqqwgq"; system = "package-renaming"; asd = "package-renaming"; @@ -79620,7 +80836,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "package-renaming-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/package-renaming/2012-04-07/package-renaming-20120407-git.tgz"; + url = "https://beta.quicklisp.org/archive/package-renaming/2012-04-07/package-renaming-20120407-git.tgz"; sha256 = "15kgd15r9bib8wfnn3hmv42rlifr4ph3rv2mji5i9d5ixhyqqwgq"; system = "package-renaming-test"; asd = "package-renaming-test"; @@ -79643,7 +80859,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "packet" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/packet/2015-03-02/packet-20150302-git.tgz"; + url = "https://beta.quicklisp.org/archive/packet/2015-03-02/packet-20150302-git.tgz"; sha256 = "1vcmxwrliwczz161nz3ysx9cbfia4cmlqgnjgrx5016lp394pnx1"; system = "packet"; asd = "packet"; @@ -79663,7 +80879,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "packet-crafting" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/packet-crafting/2020-06-10/packet-crafting-20200610-git.tgz"; + url = "https://beta.quicklisp.org/archive/packet-crafting/2020-06-10/packet-crafting-20200610-git.tgz"; sha256 = "1ivnvkbqckqf5hm6khffc2wkbjl64fn03w9i0kypkb0mrazxdpdq"; system = "packet-crafting"; asd = "packet-crafting"; @@ -79683,7 +80899,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "paiprolog" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/paiprolog/2018-02-28/paiprolog-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/paiprolog/2018-02-28/paiprolog-20180228-git.tgz"; sha256 = "1nxz01i6f8s920gm69r2kwjdpq9pli8b2ayqwijhzgjwi0r4jj9r"; system = "paiprolog"; asd = "paiprolog"; @@ -79703,7 +80919,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pal" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pal/2015-06-08/pal-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/pal/2015-06-08/pal-20150608-git.tgz"; sha256 = "0kn6jxirrn7wzqymzsi0kx2ivl0nrrcgbl4dm1714s48qw0jwhcw"; system = "pal"; asd = "pal"; @@ -79723,7 +80939,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pandocl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pandocl/2015-09-23/pandocl-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/pandocl/2015-09-23/pandocl-20150923-git.tgz"; sha256 = "1fmlpx5m7ivdkqss1fa3xqbpcwzqrpyyx2nny12aqxn8f13vpvmg"; system = "pandocl"; asd = "pandocl"; @@ -79751,7 +80967,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pango-markup" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pango-markup/2023-10-21/pango-markup-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/pango-markup/2023-10-21/pango-markup-20231021-git.tgz"; sha256 = "1165z3ycbkgr9g3ni1z59r258c1jd2viyf3mj8a5p72kx6dqb8gf"; system = "pango-markup"; asd = "pango-markup"; @@ -79767,12 +80983,12 @@ lib.makeScope pkgs.newScope (self: { papyrus = ( build-asdf-system { pname = "papyrus"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "papyrus" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/papyrus/2024-10-12/papyrus-20241012-git.tgz"; - sha256 = "0cnhdl2x5vs91srlfjnaznwj5vrg6qlyn2xjbyy40p8yvr5pny88"; + url = "https://beta.quicklisp.org/archive/papyrus/2025-06-22/papyrus-20250622-git.tgz"; + sha256 = "1x5wmqjpxx1m7rvbspbv78h3him37n6klblp192yl0faz5v5p8x5"; system = "papyrus"; asd = "papyrus"; } @@ -79787,12 +81003,12 @@ lib.makeScope pkgs.newScope (self: { parachute = ( build-asdf-system { pname = "parachute"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "parachute" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/parachute/2024-10-12/parachute-20241012-git.tgz"; - sha256 = "1hghjrv5d5w9nz27lhwz8vvbdcjl2skm76r8adpzmi7s1f9ww121"; + url = "https://beta.quicklisp.org/archive/parachute/2025-06-22/parachute-20250622-git.tgz"; + sha256 = "0zsqva66pd0vmxz9wbwccnjmkw8b9gyzkx36w2mdpfxspab3r4vr"; system = "parachute"; asd = "parachute"; } @@ -79809,12 +81025,12 @@ lib.makeScope pkgs.newScope (self: { parachute-fiveam = ( build-asdf-system { pname = "parachute-fiveam"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "parachute-fiveam" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/parachute/2024-10-12/parachute-20241012-git.tgz"; - sha256 = "1hghjrv5d5w9nz27lhwz8vvbdcjl2skm76r8adpzmi7s1f9ww121"; + url = "https://beta.quicklisp.org/archive/parachute/2025-06-22/parachute-20250622-git.tgz"; + sha256 = "0zsqva66pd0vmxz9wbwccnjmkw8b9gyzkx36w2mdpfxspab3r4vr"; system = "parachute-fiveam"; asd = "parachute-fiveam"; } @@ -79829,12 +81045,12 @@ lib.makeScope pkgs.newScope (self: { parachute-lisp-unit = ( build-asdf-system { pname = "parachute-lisp-unit"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "parachute-lisp-unit" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/parachute/2024-10-12/parachute-20241012-git.tgz"; - sha256 = "1hghjrv5d5w9nz27lhwz8vvbdcjl2skm76r8adpzmi7s1f9ww121"; + url = "https://beta.quicklisp.org/archive/parachute/2025-06-22/parachute-20250622-git.tgz"; + sha256 = "0zsqva66pd0vmxz9wbwccnjmkw8b9gyzkx36w2mdpfxspab3r4vr"; system = "parachute-lisp-unit"; asd = "parachute-lisp-unit"; } @@ -79849,12 +81065,12 @@ lib.makeScope pkgs.newScope (self: { parachute-prove = ( build-asdf-system { pname = "parachute-prove"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "parachute-prove" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/parachute/2024-10-12/parachute-20241012-git.tgz"; - sha256 = "1hghjrv5d5w9nz27lhwz8vvbdcjl2skm76r8adpzmi7s1f9ww121"; + url = "https://beta.quicklisp.org/archive/parachute/2025-06-22/parachute-20250622-git.tgz"; + sha256 = "0zsqva66pd0vmxz9wbwccnjmkw8b9gyzkx36w2mdpfxspab3r4vr"; system = "parachute-prove"; asd = "parachute-prove"; } @@ -79876,7 +81092,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "parameterized-function" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/parameterized-function/2023-06-18/parameterized-function-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/parameterized-function/2023-06-18/parameterized-function-20230618-git.tgz"; sha256 = "0pjdk4il83izd4iiavg6z7ighmjfmg39j8gp82qq2kikzlmklxxf"; system = "parameterized-function"; asd = "parameterized-function"; @@ -79896,7 +81112,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "paren-files" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/paren-files/2011-04-18/paren-files-20110418-git.tgz"; + url = "https://beta.quicklisp.org/archive/paren-files/2011-04-18/paren-files-20110418-git.tgz"; sha256 = "19lwzvdn9gpn28x6ismkwzs49vr4cbc6drsivkmll3dxb950wgw9"; system = "paren-files"; asd = "paren-files"; @@ -79916,7 +81132,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "paren-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/paren-test/2017-08-30/paren-test-20170830-git.tgz"; + url = "https://beta.quicklisp.org/archive/paren-test/2017-08-30/paren-test-20170830-git.tgz"; sha256 = "0b2d3kcv3n4b0dm67pzhxx8wxjsgnb32bw2dsprblc7149gaczdr"; system = "paren-test"; asd = "paren-test"; @@ -79940,7 +81156,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "paren-util" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/paren-util/2011-04-18/paren-util-20110418-git.tgz"; + url = "https://beta.quicklisp.org/archive/paren-util/2011-04-18/paren-util-20110418-git.tgz"; sha256 = "0jn7sgndhpn9ndn3xfmsp03alj2qksqz6p1c5h6x8hvi46caqvpy"; system = "paren-util"; asd = "paren-util"; @@ -79959,12 +81175,12 @@ lib.makeScope pkgs.newScope (self: { paren6 = ( build-asdf-system { pname = "paren6"; - version = "20220331-git"; + version = "20250622-git"; asds = [ "paren6" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/paren6/2022-03-31/paren6-20220331-git.tgz"; - sha256 = "0m7z7zkc1vrwmp68f3yx0mdsb0j45dmw3iddnbvf94dpv8aywwpx"; + url = "https://beta.quicklisp.org/archive/paren6/2025-06-22/paren6-20250622-git.tgz"; + sha256 = "1ib57mfq82c62nd0ikic6mjbivwv7x7g5fgjblq7jssms6s7h9wm"; system = "paren6"; asd = "paren6"; } @@ -79986,7 +81202,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "parenml" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/parenml/2015-09-23/parenml-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/parenml/2015-09-23/parenml-20150923-git.tgz"; sha256 = "0g6s5phinpcfhixgsfqniwxd3kd4bwh78s90ixs2fwk3qjhh9zsb"; system = "parenml"; asd = "parenml"; @@ -80010,7 +81226,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "parenml-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/parenml/2015-09-23/parenml-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/parenml/2015-09-23/parenml-20150923-git.tgz"; sha256 = "0g6s5phinpcfhixgsfqniwxd3kd4bwh78s90ixs2fwk3qjhh9zsb"; system = "parenml-test"; asd = "parenml-test"; @@ -80029,12 +81245,12 @@ lib.makeScope pkgs.newScope (self: { parenscript = ( build-asdf-system { pname = "parenscript"; - version = "Parenscript-2.7.1"; + version = "20250622-git"; asds = [ "parenscript" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/parenscript/2018-12-10/Parenscript-2.7.1.tgz"; - sha256 = "0vg9b9j5psil5iba1d9k6vfxl5rn133qvy750dny20qkp9mf3a13"; + url = "https://beta.quicklisp.org/archive/parenscript/2025-06-22/parenscript-20250622-git.tgz"; + sha256 = "1nmn4ww339mhha51d0akppnyc031lap2kzribzlpr9jr89g2j39y"; system = "parenscript"; asd = "parenscript"; } @@ -80055,7 +81271,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "parenscript-classic" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/parenscript-classic/2011-12-03/parenscript-classic-20111203-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/parenscript-classic/2011-12-03/parenscript-classic-20111203-darcs.tgz"; sha256 = "19zsiyjlz938la2dd39cy6lwh95m10j4nx8837xm6qk8rz5f8dgy"; system = "parenscript-classic"; asd = "parenscript-classic"; @@ -80071,12 +81287,12 @@ lib.makeScope pkgs.newScope (self: { parenscript_dot_tests = ( build-asdf-system { pname = "parenscript.tests"; - version = "Parenscript-2.7.1"; + version = "20250622-git"; asds = [ "parenscript.tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/parenscript/2018-12-10/Parenscript-2.7.1.tgz"; - sha256 = "0vg9b9j5psil5iba1d9k6vfxl5rn133qvy750dny20qkp9mf3a13"; + url = "https://beta.quicklisp.org/archive/parenscript/2025-06-22/parenscript-20250622-git.tgz"; + sha256 = "1nmn4ww339mhha51d0akppnyc031lap2kzribzlpr9jr89g2j39y"; system = "parenscript.tests"; asd = "parenscript.tests"; } @@ -80099,7 +81315,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "parse" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/parse/2020-09-25/parse-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/parse/2020-09-25/parse-20200925-git.tgz"; sha256 = "0l18yabyh7jizm5lgvra0jxi8s1cfwghidi6ix1pyixjkdbjlmvy"; system = "parse"; asd = "parse"; @@ -80119,7 +81335,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "parse-declarations-1.0" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/parse-declarations/2010-10-06/parse-declarations-20101006-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/parse-declarations/2010-10-06/parse-declarations-20101006-darcs.tgz"; sha256 = "04l3s180wxq6xyhgd77mbd03a1w1m0j9snag961g2f9dd77w6q1r"; system = "parse-declarations-1.0"; asd = "parse-declarations-1.0"; @@ -80137,7 +81353,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "parse-float" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/parse-float/2020-02-18/parse-float-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/parse-float/2020-02-18/parse-float-20200218-git.tgz"; sha256 = "0jd2spawc3v8vzqf8ky4cngl45jm65fhkrdf20mf6dcbn3mzpkmr"; system = "parse-float"; asd = "parse-float"; @@ -80155,7 +81371,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "parse-float-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/parse-float/2020-02-18/parse-float-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/parse-float/2020-02-18/parse-float-20200218-git.tgz"; sha256 = "0jd2spawc3v8vzqf8ky4cngl45jm65fhkrdf20mf6dcbn3mzpkmr"; system = "parse-float-tests"; asd = "parse-float"; @@ -80178,7 +81394,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "parse-front-matter" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/parse-front-matter/2016-08-25/parse-front-matter-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/parse-front-matter/2016-08-25/parse-front-matter-20160825-git.tgz"; sha256 = "1yzadrjwycvyzlzb0mixxmwi5bjzkjwylnv3aslnr1j14q44vq58"; system = "parse-front-matter"; asd = "parse-front-matter"; @@ -80198,7 +81414,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "parse-front-matter-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/parse-front-matter/2016-08-25/parse-front-matter-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/parse-front-matter/2016-08-25/parse-front-matter-20160825-git.tgz"; sha256 = "1yzadrjwycvyzlzb0mixxmwi5bjzkjwylnv3aslnr1j14q44vq58"; system = "parse-front-matter-test"; asd = "parse-front-matter-test"; @@ -80221,7 +81437,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "parse-js" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/parse-js/2016-04-21/parse-js-20160421-git.tgz"; + url = "https://beta.quicklisp.org/archive/parse-js/2016-04-21/parse-js-20160421-git.tgz"; sha256 = "1wddrnr5kiya5s3gp4cdq6crbfy9fqcz7fr44p81502sj3bvdv39"; system = "parse-js"; asd = "parse-js"; @@ -80241,7 +81457,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "parse-number" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/parse-number/2024-10-12/parse-number-v1.8.tgz"; + url = "https://beta.quicklisp.org/archive/parse-number/2024-10-12/parse-number-v1.8.tgz"; sha256 = "1yh54v02i9b55bmkfkz59qd14irw8llasp48drbilkbz1az1qg2p"; system = "parse-number"; asd = "parse-number"; @@ -80259,7 +81475,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "parse-number-range" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/parse-number-range/2024-10-12/parse-number-range_1.0.1.tgz"; + url = "https://beta.quicklisp.org/archive/parse-number-range/2024-10-12/parse-number-range_1.0.1.tgz"; sha256 = "1kd0l3bcywhwmnjil0zzvq4cjlhpj2g1wiy7h7860nflzfz7qvds"; system = "parse-number-range"; asd = "parse-number-range"; @@ -80282,7 +81498,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "parse-number-range_tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/parse-number-range/2024-10-12/parse-number-range_1.0.1.tgz"; + url = "https://beta.quicklisp.org/archive/parse-number-range/2024-10-12/parse-number-range_1.0.1.tgz"; sha256 = "1kd0l3bcywhwmnjil0zzvq4cjlhpj2g1wiy7h7860nflzfz7qvds"; system = "parse-number-range_tests"; asd = "parse-number-range_tests"; @@ -80301,12 +81517,12 @@ lib.makeScope pkgs.newScope (self: { parse-rgb = ( build-asdf-system { pname = "parse-rgb"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "parse-rgb" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-tcod/2023-10-21/cl-tcod-20231021-git.tgz"; - sha256 = "1r4ip16dlzr56p94b0grw6nmkykbmgb04jsqdvgl1ypcmbpfr3i1"; + url = "https://beta.quicklisp.org/archive/cl-tcod/2025-06-22/cl-tcod-20250622-git.tgz"; + sha256 = "1m3fgfc7nfk8yn4z1c09lixnk0sr3szxqihq3fx4j6is430ywxdd"; system = "parse-rgb"; asd = "parse-rgb"; } @@ -80328,7 +81544,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "parseltongue" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/parseltongue/2013-03-12/parseltongue-20130312-git.tgz"; + url = "https://beta.quicklisp.org/archive/parseltongue/2013-03-12/parseltongue-20130312-git.tgz"; sha256 = "1cjy7p0snms604zp6x0jlm4v9divqc5r38ns737hffj9q6pi1nlx"; system = "parseltongue"; asd = "parseltongue"; @@ -80348,7 +81564,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "parseq" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/parseq/2023-10-21/parseq-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/parseq/2023-10-21/parseq-20231021-git.tgz"; sha256 = "13bdv9slnkf4b3py5dfvdnxvyb7zxwf2apcbr2p3s7ij26qslbbw"; system = "parseq"; asd = "parseq"; @@ -80366,7 +81582,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "parser-combinators" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz"; sha256 = "1k49vha5xm2cklayzpqwg73n4v93xwsbs5in6342pkkiimnidhs8"; system = "parser-combinators"; asd = "parser-combinators"; @@ -80387,7 +81603,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "parser-combinators-cl-ppcre" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz"; sha256 = "1k49vha5xm2cklayzpqwg73n4v93xwsbs5in6342pkkiimnidhs8"; system = "parser-combinators-cl-ppcre"; asd = "parser-combinators-cl-ppcre"; @@ -80412,7 +81628,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "parser-combinators-debug" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz"; sha256 = "1k49vha5xm2cklayzpqwg73n4v93xwsbs5in6342pkkiimnidhs8"; system = "parser-combinators-debug"; asd = "parser-combinators-debug"; @@ -80435,7 +81651,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "parser-combinators-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz"; sha256 = "1k49vha5xm2cklayzpqwg73n4v93xwsbs5in6342pkkiimnidhs8"; system = "parser-combinators-tests"; asd = "parser-combinators-tests"; @@ -80461,7 +81677,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "parser.common-rules" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/parser.common-rules/2020-07-15/parser.common-rules-20200715-git.tgz"; + url = "https://beta.quicklisp.org/archive/parser.common-rules/2020-07-15/parser.common-rules-20200715-git.tgz"; sha256 = "138ygj0qp58jl4h79szg3i2gnwzywwc48qn1gj6dw113wasrnkwa"; system = "parser.common-rules"; asd = "parser.common-rules"; @@ -80484,7 +81700,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "parser.common-rules.operators" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/parser.common-rules/2020-07-15/parser.common-rules-20200715-git.tgz"; + url = "https://beta.quicklisp.org/archive/parser.common-rules/2020-07-15/parser.common-rules-20200715-git.tgz"; sha256 = "138ygj0qp58jl4h79szg3i2gnwzywwc48qn1gj6dw113wasrnkwa"; system = "parser.common-rules.operators"; asd = "parser.common-rules.operators"; @@ -80510,7 +81726,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "parser.ini" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/parser.ini/2018-10-18/parser.ini-20181018-git.tgz"; + url = "https://beta.quicklisp.org/archive/parser.ini/2018-10-18/parser.ini-20181018-git.tgz"; sha256 = "0ri4c7877i9val67z5sm8nfhz04p9l6brajx2fkavs8556l1wm1d"; system = "parser.ini"; asd = "parser.ini"; @@ -80537,7 +81753,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "parsnip" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/parsnip/2022-03-31/parsnip-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/parsnip/2022-03-31/parsnip-20220331-git.tgz"; sha256 = "0gl7z8kn37qiz0vab89wawn78iczii7iqw43jy2ls7nw0l5jv13w"; system = "parsnip"; asd = "parsnip"; @@ -80557,7 +81773,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "patchwork" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/patchwork/2022-07-07/patchwork-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/patchwork/2022-07-07/patchwork-20220707-git.tgz"; sha256 = "08d08hslcs69509wj56mlklv1cz5lq2rz0sl870zcxyn4j1nnf3f"; system = "patchwork"; asd = "patchwork"; @@ -80581,7 +81797,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "path-parse" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/path-parse/2016-04-21/path-parse-20160421-git.tgz"; + url = "https://beta.quicklisp.org/archive/path-parse/2016-04-21/path-parse-20160421-git.tgz"; sha256 = "10mxm6q62cfpv3hw2w8k968ba8a1xglqdkwlkqs4l4nby3b11aaq"; system = "path-parse"; asd = "path-parse"; @@ -80601,7 +81817,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "path-parse-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/path-parse/2016-04-21/path-parse-20160421-git.tgz"; + url = "https://beta.quicklisp.org/archive/path-parse/2016-04-21/path-parse-20160421-git.tgz"; sha256 = "10mxm6q62cfpv3hw2w8k968ba8a1xglqdkwlkqs4l4nby3b11aaq"; system = "path-parse-test"; asd = "path-parse-test"; @@ -80624,7 +81840,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "path-string" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/path-string/2016-08-25/path-string-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/path-string/2016-08-25/path-string-20160825-git.tgz"; sha256 = "0hs36kf4njxafxrngs1m1sh9c7b9wv7sa8n316dq4icx3kf3v6yp"; system = "path-string"; asd = "path-string"; @@ -80647,7 +81863,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "path-string-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/path-string/2016-08-25/path-string-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/path-string/2016-08-25/path-string-20160825-git.tgz"; sha256 = "0hs36kf4njxafxrngs1m1sh9c7b9wv7sa8n316dq4icx3kf3v6yp"; system = "path-string-test"; asd = "path-string-test"; @@ -80667,12 +81883,12 @@ lib.makeScope pkgs.newScope (self: { pathname-utils = ( build-asdf-system { pname = "pathname-utils"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "pathname-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pathname-utils/2024-10-12/pathname-utils-20241012-git.tgz"; - sha256 = "1z1z3dar6g2ybxgk9zgcyb8bh5g6rh12bwl3ik6rdwy3rdd5b1q5"; + url = "https://beta.quicklisp.org/archive/pathname-utils/2025-06-22/pathname-utils-20250622-git.tgz"; + sha256 = "1b89i0n70hr4wbbd9lqp0zf4sz70yvj5dn7x9a7mp1510g2wrii1"; system = "pathname-utils"; asd = "pathname-utils"; } @@ -80687,12 +81903,12 @@ lib.makeScope pkgs.newScope (self: { pathname-utils-test = ( build-asdf-system { pname = "pathname-utils-test"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "pathname-utils-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pathname-utils/2024-10-12/pathname-utils-20241012-git.tgz"; - sha256 = "1z1z3dar6g2ybxgk9zgcyb8bh5g6rh12bwl3ik6rdwy3rdd5b1q5"; + url = "https://beta.quicklisp.org/archive/pathname-utils/2025-06-22/pathname-utils-20250622-git.tgz"; + sha256 = "1b89i0n70hr4wbbd9lqp0zf4sz70yvj5dn7x9a7mp1510g2wrii1"; system = "pathname-utils-test"; asd = "pathname-utils-test"; } @@ -80714,7 +81930,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "patron" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/patron/2013-04-20/patron-20130420-git.tgz"; + url = "https://beta.quicklisp.org/archive/patron/2013-04-20/patron-20130420-git.tgz"; sha256 = "0i2vlwspnssjxdnq7dsrb98q3y8c8drd0a11nxn9808q76sqzsqc"; system = "patron"; asd = "patron"; @@ -80734,7 +81950,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pcall" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz"; + url = "https://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz"; sha256 = "00ix5d9ljymrrpwsri0hhh3d592jqr2lvgbvkhav3k96rwq974ps"; system = "pcall"; asd = "pcall"; @@ -80755,7 +81971,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pcall-queue" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz"; + url = "https://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz"; sha256 = "00ix5d9ljymrrpwsri0hhh3d592jqr2lvgbvkhav3k96rwq974ps"; system = "pcall-queue"; asd = "pcall-queue"; @@ -80773,7 +81989,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pcall-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz"; + url = "https://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz"; sha256 = "00ix5d9ljymrrpwsri0hhh3d592jqr2lvgbvkhav3k96rwq974ps"; system = "pcall-tests"; asd = "pcall"; @@ -80796,7 +82012,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pcl-binary-data" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; + url = "https://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9"; system = "pcl-binary-data"; asd = "pcl-binary-data"; @@ -80816,7 +82032,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pcl-html" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; + url = "https://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9"; system = "pcl-html"; asd = "pcl-html"; @@ -80836,7 +82052,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pcl-id3v2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; + url = "https://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9"; system = "pcl-id3v2"; asd = "pcl-id3v2"; @@ -80859,7 +82075,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pcl-macro-utilities" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; + url = "https://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9"; system = "pcl-macro-utilities"; asd = "pcl-macro-utilities"; @@ -80879,7 +82095,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pcl-mp3-browser" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; + url = "https://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9"; system = "pcl-mp3-browser"; asd = "pcl-mp3-browser"; @@ -80906,7 +82122,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pcl-mp3-database" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; + url = "https://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9"; system = "pcl-mp3-database"; asd = "pcl-mp3-database"; @@ -80930,7 +82146,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pcl-pathnames" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; + url = "https://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9"; system = "pcl-pathnames"; asd = "pcl-pathnames"; @@ -80950,7 +82166,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pcl-shoutcast" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; + url = "https://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9"; system = "pcl-shoutcast"; asd = "pcl-shoutcast"; @@ -80977,7 +82193,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pcl-simple-database" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; + url = "https://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9"; system = "pcl-simple-database"; asd = "pcl-simple-database"; @@ -80997,7 +82213,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pcl-spam" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; + url = "https://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9"; system = "pcl-spam"; asd = "pcl-spam"; @@ -81021,7 +82237,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pcl-test-framework" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; + url = "https://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9"; system = "pcl-test-framework"; asd = "pcl-test-framework"; @@ -81041,7 +82257,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pcl-unit-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-match/2012-11-25/cl-match-20121125-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-match/2012-11-25/cl-match-20121125-git.tgz"; sha256 = "1qc8gzp7f4phgyi5whkxacrqzdqs0y1hvkf71m8n7l303jly9wjf"; system = "pcl-unit-test"; asd = "pcl-unit-test"; @@ -81061,7 +82277,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pcl-url-function" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; + url = "https://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9"; system = "pcl-url-function"; asd = "pcl-url-function"; @@ -81078,6 +82294,61 @@ lib.makeScope pkgs.newScope (self: { }; } ); + peltadot = ( + build-asdf-system { + pname = "peltadot"; + version = "20250622-git"; + asds = [ "peltadot" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/peltadot/2025-06-22/peltadot-20250622-git.tgz"; + sha256 = "1d1f7b864pd16aivf53y6sr5kczlibzlvcjlrllsfbrv4ygx759z"; + system = "peltadot"; + asd = "peltadot"; + } + ); + systems = [ "peltadot" ]; + lispLibs = [ + (getAttr "agutil" self) + (getAttr "alexandria" self) + (getAttr "alternate-asdf-system-connections" self) + (getAttr "arrows" self) + (getAttr "cl-environments" self) + (getAttr "compiler-macro-notes" self) + (getAttr "fiveam" self) + (getAttr "in-nomine" self) + (getAttr "introspect-environment" self) + (getAttr "let-plus" self) + (getAttr "split-sequence" self) + (getAttr "swank" self) + (getAttr "trivial-garbage" self) + (getAttr "trivial-types" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + peltadot-traits-library = ( + build-asdf-system { + pname = "peltadot-traits-library"; + version = "20250622-git"; + asds = [ "peltadot-traits-library" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/peltadot/2025-06-22/peltadot-20250622-git.tgz"; + sha256 = "1d1f7b864pd16aivf53y6sr5kczlibzlvcjlrllsfbrv4ygx759z"; + system = "peltadot-traits-library"; + asd = "peltadot-traits-library"; + } + ); + systems = [ "peltadot-traits-library" ]; + lispLibs = [ (getAttr "peltadot" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); peppol = ( build-asdf-system { pname = "peppol"; @@ -81085,7 +82356,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "peppol" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-peppol/2020-10-16/cl-peppol-20201016-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-peppol/2020-10-16/cl-peppol-20201016-git.tgz"; sha256 = "02wc6h1fiaqzf14py2kwsvx0dmb22wdkd54pl0ixnmivj436ln99"; system = "peppol"; asd = "peppol"; @@ -81108,7 +82379,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "percent-encoding" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/percent-encoding/2012-10-13/percent-encoding-20121013-git.tgz"; + url = "https://beta.quicklisp.org/archive/percent-encoding/2012-10-13/percent-encoding-20121013-git.tgz"; sha256 = "0q1lh3sa6mkjr5gcdkgimkpc29rgf9cjhv90f61h8ridj28grq0h"; system = "percent-encoding"; asd = "percent-encoding"; @@ -81131,7 +82402,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "percent-encoding-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/percent-encoding/2012-10-13/percent-encoding-20121013-git.tgz"; + url = "https://beta.quicklisp.org/archive/percent-encoding/2012-10-13/percent-encoding-20121013-git.tgz"; sha256 = "0q1lh3sa6mkjr5gcdkgimkpc29rgf9cjhv90f61h8ridj28grq0h"; system = "percent-encoding-test"; asd = "percent-encoding"; @@ -81154,7 +82425,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "perceptual-hashes" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/perceptual-hashes/2022-07-07/perceptual-hashes-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/perceptual-hashes/2022-07-07/perceptual-hashes-20220707-git.tgz"; sha256 = "1hg2vxi4avmjwscgab7wqf3c4d60x933lac4d86fmfk0wgl5nzzd"; system = "perceptual-hashes"; asd = "perceptual-hashes"; @@ -81179,7 +82450,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "periodic-table" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/periodic-table/2011-10-01/periodic-table-1.0.tgz"; + url = "https://beta.quicklisp.org/archive/periodic-table/2011-10-01/periodic-table-1.0.tgz"; sha256 = "147j9kn0afsvlz09vdjmvw5si08ix3dyypg21vrc5xvn9nsalrxx"; system = "periodic-table"; asd = "periodic-table"; @@ -81199,7 +82470,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "periods" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/periods/2022-11-06/periods-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/periods/2022-11-06/periods-20221106-git.tgz"; sha256 = "0ynhdmlzb499mlm7c7zy6vgw8vglkkf14zr0v40jcl1sgq3236ry"; system = "periods"; asd = "periods"; @@ -81219,7 +82490,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "periods-series" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/periods/2022-11-06/periods-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/periods/2022-11-06/periods-20221106-git.tgz"; sha256 = "0ynhdmlzb499mlm7c7zy6vgw8vglkkf14zr0v40jcl1sgq3236ry"; system = "periods-series"; asd = "periods-series"; @@ -81242,7 +82513,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "perlre" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/perlre/2020-07-15/perlre-20200715-git.tgz"; + url = "https://beta.quicklisp.org/archive/perlre/2020-07-15/perlre-20200715-git.tgz"; sha256 = "1izhrn1xd0mi2nl0p6930ln3nb4wp3y5ngg81wy5g5s4vqy2h54a"; system = "perlre"; asd = "perlre"; @@ -81269,7 +82540,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pero" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pero/2023-02-14/pero-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/pero/2023-02-14/pero-20230214-git.tgz"; sha256 = "1q513lvnq4m8l332glriid0vxcdcnakcdag3lck1wmrfaxhdpnmc"; system = "pero"; asd = "pero"; @@ -81288,12 +82559,12 @@ lib.makeScope pkgs.newScope (self: { persistent = ( build-asdf-system { pname = "persistent"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "persistent" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "persistent"; asd = "persistent"; } @@ -81312,7 +82583,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "persistent-tables" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/persistent-tables/2012-02-08/persistent-tables-20120208-git.tgz"; + url = "https://beta.quicklisp.org/archive/persistent-tables/2012-02-08/persistent-tables-20120208-git.tgz"; sha256 = "0klfjza85mgj2z42x2lhcqy9q66avac7zw0cpbmwwng3m7679hpa"; system = "persistent-tables"; asd = "persistent-tables"; @@ -81335,7 +82606,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "persistent-variables" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/persistent-variables/2013-03-12/persistent-variables-20130312-git.tgz"; + url = "https://beta.quicklisp.org/archive/persistent-variables/2013-03-12/persistent-variables-20130312-git.tgz"; sha256 = "0r72cbjkb5q4sn109svlcsvrwgvwdsn5c63rv5cpaf3jrfv1z8xn"; system = "persistent-variables"; asd = "persistent-variables"; @@ -81355,7 +82626,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "persistent-variables.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/persistent-variables/2013-03-12/persistent-variables-20130312-git.tgz"; + url = "https://beta.quicklisp.org/archive/persistent-variables/2013-03-12/persistent-variables-20130312-git.tgz"; sha256 = "0r72cbjkb5q4sn109svlcsvrwgvwdsn5c63rv5cpaf3jrfv1z8xn"; system = "persistent-variables.test"; asd = "persistent-variables"; @@ -81371,12 +82642,12 @@ lib.makeScope pkgs.newScope (self: { petalisp = ( build-asdf-system { pname = "petalisp"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "petalisp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/petalisp/2024-10-12/petalisp-20241012-git.tgz"; - sha256 = "06njw0jx48rm52zbpwdw442j6rasqsmfd2zsi71y30aij7c9b0h9"; + url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz"; + sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11"; system = "petalisp"; asd = "petalisp"; } @@ -81394,12 +82665,12 @@ lib.makeScope pkgs.newScope (self: { petalisp_dot_api = ( build-asdf-system { pname = "petalisp.api"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "petalisp.api" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/petalisp/2024-10-12/petalisp-20241012-git.tgz"; - sha256 = "06njw0jx48rm52zbpwdw442j6rasqsmfd2zsi71y30aij7c9b0h9"; + url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz"; + sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11"; system = "petalisp.api"; asd = "petalisp.api"; } @@ -81409,6 +82680,7 @@ lib.makeScope pkgs.newScope (self: { (getAttr "alexandria" self) (getAttr "petalisp_dot_codegen" self) (getAttr "petalisp_dot_core" self) + (getAttr "petalisp_dot_graphviz" self) (getAttr "petalisp_dot_ir" self) (getAttr "petalisp_dot_native-backend" self) (getAttr "petalisp_dot_packages" self) @@ -81422,15 +82694,39 @@ lib.makeScope pkgs.newScope (self: { }; } ); + petalisp_dot_benchmarks = ( + build-asdf-system { + pname = "petalisp.benchmarks"; + version = "20250622-git"; + asds = [ "petalisp.benchmarks" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz"; + sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11"; + system = "petalisp.benchmarks"; + asd = "petalisp.benchmarks"; + } + ); + systems = [ "petalisp.benchmarks" ]; + lispLibs = [ + (getAttr "alexandria" self) + (getAttr "closer-mop" self) + (getAttr "petalisp" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); petalisp_dot_codegen = ( build-asdf-system { pname = "petalisp.codegen"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "petalisp.codegen" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/petalisp/2024-10-12/petalisp-20241012-git.tgz"; - sha256 = "06njw0jx48rm52zbpwdw442j6rasqsmfd2zsi71y30aij7c9b0h9"; + url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz"; + sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11"; system = "petalisp.codegen"; asd = "petalisp.codegen"; } @@ -81454,12 +82750,12 @@ lib.makeScope pkgs.newScope (self: { petalisp_dot_core = ( build-asdf-system { pname = "petalisp.core"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "petalisp.core" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/petalisp/2024-10-12/petalisp-20241012-git.tgz"; - sha256 = "06njw0jx48rm52zbpwdw442j6rasqsmfd2zsi71y30aij7c9b0h9"; + url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz"; + sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11"; system = "petalisp.core"; asd = "petalisp.core"; } @@ -81482,12 +82778,12 @@ lib.makeScope pkgs.newScope (self: { petalisp_dot_examples = ( build-asdf-system { pname = "petalisp.examples"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "petalisp.examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/petalisp/2024-10-12/petalisp-20241012-git.tgz"; - sha256 = "06njw0jx48rm52zbpwdw442j6rasqsmfd2zsi71y30aij7c9b0h9"; + url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz"; + sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11"; system = "petalisp.examples"; asd = "petalisp.examples"; } @@ -81502,15 +82798,45 @@ lib.makeScope pkgs.newScope (self: { }; } ); + petalisp_dot_graphviz = ( + build-asdf-system { + pname = "petalisp.graphviz"; + version = "20250622-git"; + asds = [ "petalisp.graphviz" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz"; + sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11"; + system = "petalisp.graphviz"; + asd = "petalisp.graphviz"; + } + ); + systems = [ "petalisp.graphviz" ]; + lispLibs = [ + (getAttr "alexandria" self) + (getAttr "cl-dot" self) + (getAttr "closer-mop" self) + (getAttr "petalisp_dot_core" self) + (getAttr "petalisp_dot_ir" self) + (getAttr "petalisp_dot_native-backend" self) + (getAttr "petalisp_dot_packages" self) + (getAttr "petalisp_dot_utilities" self) + (getAttr "trivial-features" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); petalisp_dot_ir = ( build-asdf-system { pname = "petalisp.ir"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "petalisp.ir" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/petalisp/2024-10-12/petalisp-20241012-git.tgz"; - sha256 = "06njw0jx48rm52zbpwdw442j6rasqsmfd2zsi71y30aij7c9b0h9"; + url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz"; + sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11"; system = "petalisp.ir"; asd = "petalisp.ir"; } @@ -81532,12 +82858,12 @@ lib.makeScope pkgs.newScope (self: { petalisp_dot_native-backend = ( build-asdf-system { pname = "petalisp.native-backend"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "petalisp.native-backend" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/petalisp/2024-10-12/petalisp-20241012-git.tgz"; - sha256 = "06njw0jx48rm52zbpwdw442j6rasqsmfd2zsi71y30aij7c9b0h9"; + url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz"; + sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11"; system = "petalisp.native-backend"; asd = "petalisp.native-backend"; } @@ -81565,12 +82891,12 @@ lib.makeScope pkgs.newScope (self: { petalisp_dot_packages = ( build-asdf-system { pname = "petalisp.packages"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "petalisp.packages" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/petalisp/2024-10-12/petalisp-20241012-git.tgz"; - sha256 = "06njw0jx48rm52zbpwdw442j6rasqsmfd2zsi71y30aij7c9b0h9"; + url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz"; + sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11"; system = "petalisp.packages"; asd = "petalisp.packages"; } @@ -81585,12 +82911,12 @@ lib.makeScope pkgs.newScope (self: { petalisp_dot_test-suite = ( build-asdf-system { pname = "petalisp.test-suite"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "petalisp.test-suite" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/petalisp/2024-10-12/petalisp-20241012-git.tgz"; - sha256 = "06njw0jx48rm52zbpwdw442j6rasqsmfd2zsi71y30aij7c9b0h9"; + url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz"; + sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11"; system = "petalisp.test-suite"; asd = "petalisp.test-suite"; } @@ -81611,12 +82937,12 @@ lib.makeScope pkgs.newScope (self: { petalisp_dot_utilities = ( build-asdf-system { pname = "petalisp.utilities"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "petalisp.utilities" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/petalisp/2024-10-12/petalisp-20241012-git.tgz"; - sha256 = "06njw0jx48rm52zbpwdw442j6rasqsmfd2zsi71y30aij7c9b0h9"; + url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz"; + sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11"; system = "petalisp.utilities"; asd = "petalisp.utilities"; } @@ -81641,7 +82967,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "petit.package-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/petit.package-utils/2014-08-26/petit.package-utils-20140826-git.tgz"; + url = "https://beta.quicklisp.org/archive/petit.package-utils/2014-08-26/petit.package-utils-20140826-git.tgz"; sha256 = "0jj4c1jpcqfy9mrlxhjmq4ypwlzk84h09i8nr34wjwh6z7idhpyv"; system = "petit.package-utils"; asd = "petit.package-utils"; @@ -81661,7 +82987,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "petit.string-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/petit.string-utils/2014-11-06/petit.string-utils-20141106-git.tgz"; + url = "https://beta.quicklisp.org/archive/petit.string-utils/2014-11-06/petit.string-utils-20141106-git.tgz"; sha256 = "04kqdj69x53wzvpp54zp6767186in24p8yrr82wdg2bwzw4qh4yl"; system = "petit.string-utils"; asd = "petit.string-utils"; @@ -81681,7 +83007,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "petit.string-utils-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/petit.string-utils/2014-11-06/petit.string-utils-20141106-git.tgz"; + url = "https://beta.quicklisp.org/archive/petit.string-utils/2014-11-06/petit.string-utils-20141106-git.tgz"; sha256 = "04kqdj69x53wzvpp54zp6767186in24p8yrr82wdg2bwzw4qh4yl"; system = "petit.string-utils-test"; asd = "petit.string-utils-test"; @@ -81704,7 +83030,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "petri" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/petri/2020-04-27/petri-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/petri/2020-04-27/petri-20200427-git.tgz"; sha256 = "1y78s3jndyxll46zq7s5is9pwv8f6jr2npjkcpd48ik7xkj2269b"; system = "petri"; asd = "petri"; @@ -81730,7 +83056,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pettomato-deque" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pettomato-deque/2012-01-07/pettomato-deque-20120107-git.tgz"; + url = "https://beta.quicklisp.org/archive/pettomato-deque/2012-01-07/pettomato-deque-20120107-git.tgz"; sha256 = "07ai4fa64cg6shfvnx9xk7pscbsz64ys80482zz2fb9q0rba80b7"; system = "pettomato-deque"; asd = "pettomato-deque"; @@ -81750,7 +83076,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pettomato-deque-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pettomato-deque/2012-01-07/pettomato-deque-20120107-git.tgz"; + url = "https://beta.quicklisp.org/archive/pettomato-deque/2012-01-07/pettomato-deque-20120107-git.tgz"; sha256 = "07ai4fa64cg6shfvnx9xk7pscbsz64ys80482zz2fb9q0rba80b7"; system = "pettomato-deque-tests"; asd = "pettomato-deque-tests"; @@ -81773,7 +83099,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pettomato-indexed-priority-queue" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pettomato-indexed-priority-queue/2012-09-09/pettomato-indexed-priority-queue-20120909-git.tgz"; + url = "https://beta.quicklisp.org/archive/pettomato-indexed-priority-queue/2012-09-09/pettomato-indexed-priority-queue-20120909-git.tgz"; sha256 = "14i36qbdnif28xcbxdbr5abzmzxr7vzv64n1aix0f6khxg99pylz"; system = "pettomato-indexed-priority-queue"; asd = "pettomato-indexed-priority-queue"; @@ -81793,7 +83119,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pettomato-indexed-priority-queue-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pettomato-indexed-priority-queue/2012-09-09/pettomato-indexed-priority-queue-20120909-git.tgz"; + url = "https://beta.quicklisp.org/archive/pettomato-indexed-priority-queue/2012-09-09/pettomato-indexed-priority-queue-20120909-git.tgz"; sha256 = "14i36qbdnif28xcbxdbr5abzmzxr7vzv64n1aix0f6khxg99pylz"; system = "pettomato-indexed-priority-queue-tests"; asd = "pettomato-indexed-priority-queue-tests"; @@ -81816,7 +83142,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pfft" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/fft/2018-07-11/fft-20180711-git.tgz"; + url = "https://beta.quicklisp.org/archive/fft/2018-07-11/fft-20180711-git.tgz"; sha256 = "0ymnfplap2cncw49mhq7crapgxphfwsvqdgrcckpgsvw6qsymasd"; system = "pfft"; asd = "pfft"; @@ -81839,7 +83165,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pg" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pg/2015-06-08/pg-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/pg/2015-06-08/pg-20150608-git.tgz"; sha256 = "1c7axd2yxw9lxf7l5djrnfkp197mmr88qpigy2cjgim8vxab4n2l"; system = "pg"; asd = "pg"; @@ -81859,7 +83185,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pgloader" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pgloader/2022-11-06/pgloader-v3.6.9.tgz"; + url = "https://beta.quicklisp.org/archive/pgloader/2022-11-06/pgloader-v3.6.9.tgz"; sha256 = "03kp3ms2sjz4gwb94xs404mi63fnv1bq00hyqxyvc9csmicxzawn"; system = "pgloader"; asd = "pgloader"; @@ -81912,7 +83238,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "phoe-toolbox" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/phoe-toolbox/2021-01-24/phoe-toolbox-20210124-git.tgz"; + url = "https://beta.quicklisp.org/archive/phoe-toolbox/2021-01-24/phoe-toolbox-20210124-git.tgz"; sha256 = "0bzbgs4lkhw93y1cwrs9kp5yiyz8sg4885cnvi83dzzbla9b74kv"; system = "phoe-toolbox"; asd = "phoe-toolbox"; @@ -81936,7 +83262,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "phonon" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; system = "phonon"; asd = "phonon"; @@ -81963,7 +83289,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "phos" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/phos/2024-10-12/phos-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/phos/2024-10-12/phos-20241012-git.tgz"; sha256 = "0lnv54iczidjpskciw7y2faazgxjwpncggdh5kggpjziq03pr7lv"; system = "phos"; asd = "phos"; @@ -81989,7 +83315,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "physical-dimension" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/antik/2024-10-12/antik-master-df14cb8c-git.tgz"; + url = "https://beta.quicklisp.org/archive/antik/2024-10-12/antik-master-df14cb8c-git.tgz"; sha256 = "1n08cx4n51z8v4bxyak166lp495xda3x7llfxcdpxndxqxcammr0"; system = "physical-dimension"; asd = "physical-dimension"; @@ -82013,7 +83339,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "physical-quantities" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/physical-quantities/2021-10-20/physical-quantities-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/physical-quantities/2021-10-20/physical-quantities-20211020-git.tgz"; sha256 = "0mb2s94s6fhw5vfa89naalw7ld11sdsszlqpz0c65dvpfyfmmdmh"; system = "physical-quantities"; asd = "physical-quantities"; @@ -82031,7 +83357,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "picl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/picl/2024-10-12/picl-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/picl/2024-10-12/picl-20241012-git.tgz"; sha256 = "0pdzlmphf1bqk5xdvwf1m1l3s5whwm4ysnpl5kpwq70adx38rysk"; system = "picl"; asd = "picl"; @@ -82054,7 +83380,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "piggyback-parameters" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/piggyback-parameters/2020-06-10/piggyback-parameters-20200610-git.tgz"; + url = "https://beta.quicklisp.org/archive/piggyback-parameters/2020-06-10/piggyback-parameters-20200610-git.tgz"; sha256 = "1187bgnz9pvs8xdxapqhrm4yqzwlp368ijmc5szm8r8q3zrb219n"; system = "piggyback-parameters"; asd = "piggyback-parameters"; @@ -82078,7 +83404,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pileup" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pileup/2015-07-09/pileup-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/pileup/2015-07-09/pileup-20150709-git.tgz"; sha256 = "01gvshpxil0ggjgfmgcymbgmpsfaxy6aggm0bywkn40rck3038vb"; system = "pileup"; asd = "pileup"; @@ -82098,7 +83424,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pileup-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pileup/2015-07-09/pileup-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/pileup/2015-07-09/pileup-20150709-git.tgz"; sha256 = "01gvshpxil0ggjgfmgcymbgmpsfaxy6aggm0bywkn40rck3038vb"; system = "pileup-tests"; asd = "pileup"; @@ -82121,7 +83447,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pipes" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pipes/2015-09-23/pipes-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/pipes/2015-09-23/pipes-20150923-git.tgz"; sha256 = "17qcxalbdip20nkbwiv3kpdjjsy0g1y9s4a0zv38ch47bdl9yxpc"; system = "pipes"; asd = "pipes"; @@ -82137,12 +83463,12 @@ lib.makeScope pkgs.newScope (self: { piping = ( build-asdf-system { pname = "piping"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "piping" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/piping/2023-10-21/piping-20231021-git.tgz"; - sha256 = "0g0k6w7xa0xyzlr3j5j85b91kazbba4rxwplmqcb5ns3shk8745g"; + url = "https://beta.quicklisp.org/archive/piping/2025-06-22/piping-20250622-git.tgz"; + sha256 = "0c5mbgl19krr62gddfhqm7nybqwcdnla4d6gsifqizhyfmqsyl7n"; system = "piping"; asd = "piping"; } @@ -82157,12 +83483,12 @@ lib.makeScope pkgs.newScope (self: { pithy-xml = ( build-asdf-system { pname = "pithy-xml"; - version = "20101006-git"; + version = "20250622-git"; asds = [ "pithy-xml" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pithy-xml/2010-10-06/pithy-xml-20101006-git.tgz"; - sha256 = "05zw5adiw7jgvi9w9c661s4r49fidpcxn6m7azmn0pzc936dg17h"; + url = "https://beta.quicklisp.org/archive/pithy-xml/2025-06-22/pithy-xml-20250622-git.tgz"; + sha256 = "03sjn0n2av6d4kd1xi156izlhiknwwqkkga375kv7mx8c7xvl6zj"; system = "pithy-xml"; asd = "pithy-xml"; } @@ -82181,7 +83507,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pixman" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-pixman/2017-08-30/cl-pixman-20170830-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-pixman/2017-08-30/cl-pixman-20170830-git.tgz"; sha256 = "068hh7cv6f2wqwd8092wqh3rgdix6sa319qpm648mss8jfnjjbgj"; system = "pixman"; asd = "pixman"; @@ -82205,7 +83531,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pjlink" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pjlink/2022-03-31/pjlink-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/pjlink/2022-03-31/pjlink-20220331-git.tgz"; sha256 = "1rsmg0x7fd32na36x9ahj6vji3xs6ckg5pyng8nf33fmdj8dscbc"; system = "pjlink"; asd = "pjlink"; @@ -82233,7 +83559,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pk-serialize" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pk-serialize/2022-11-06/pk-serialize-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/pk-serialize/2022-11-06/pk-serialize-20221106-git.tgz"; sha256 = "1fi9xxdlg2z9dnqb2sc7wg37aqzqjz43h2l1wxa5zvk73qqzapyn"; system = "pk-serialize"; asd = "pk-serialize"; @@ -82253,7 +83579,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pkg-doc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pkg-doc/2020-09-25/pkg-doc-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/pkg-doc/2020-09-25/pkg-doc-20200925-git.tgz"; sha256 = "1y4dcc0q3iizgvavnkl8q4bjxq0dngvqw5dhrf9bxf4d3q3vrbd4"; system = "pkg-doc"; asd = "pkg-doc"; @@ -82280,7 +83606,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "place-modifiers" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/place-modifiers/2012-11-25/place-modifiers-2.1.tgz"; + url = "https://beta.quicklisp.org/archive/place-modifiers/2012-11-25/place-modifiers-2.1.tgz"; sha256 = "13nd911h6i7gks78l30bzdqzygcqh47946jwaf50ak2iraagknvf"; system = "place-modifiers"; asd = "place-modifiers"; @@ -82303,7 +83629,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "place-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/place-utils/2018-10-18/place-utils-0.2.tgz"; + url = "https://beta.quicklisp.org/archive/place-utils/2018-10-18/place-utils-0.2.tgz"; sha256 = "1riaxxafn2xbyy6776yqns1bhz5jnzzpd177wb5xzvwlxiix6yf9"; system = "place-utils"; asd = "place-utils"; @@ -82316,33 +83642,6 @@ lib.makeScope pkgs.newScope (self: { }; } ); - planks = ( - build-asdf-system { - pname = "planks"; - version = "20110522-git"; - asds = [ "planks" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/planks/2011-05-22/planks-20110522-git.tgz"; - sha256 = "1y7cg9xb75j1yslbxsmw0fyg738f4d28lnlm7w7hzgc51fc7875k"; - system = "planks"; - asd = "planks"; - } - ); - systems = [ "planks" ]; - lispLibs = [ - (getAttr "babel" self) - (getAttr "bordeaux-threads" self) - (getAttr "closer-mop" self) - (getAttr "ironclad" self) - (getAttr "rucksack" self) - (getAttr "trivial-garbage" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); plokami = ( build-asdf-system { pname = "plokami"; @@ -82350,7 +83649,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "plokami" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/plokami/2020-02-18/plokami-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/plokami/2020-02-18/plokami-20200218-git.tgz"; sha256 = "1k78lpbaqqa2gnwi9k0y646md4s9xnijm774knl11p05r83w5ycb"; system = "plokami"; asd = "plokami"; @@ -82370,7 +83669,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "plot" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/plot/2024-10-12/plot-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/plot/2024-10-12/plot-20241012-git.tgz"; sha256 = "1x5kc5y0s082y24qgq138331qmfs0xxxj43ss3aw0kgx7wfpxlms"; system = "plot"; asd = "plot"; @@ -82395,7 +83694,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "plplot-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-plplot/2018-02-28/cl-plplot-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-plplot/2018-02-28/cl-plplot-20180228-git.tgz"; sha256 = "0hfgq47ga2r764jfc3ywaz5ynnvp701fjhbw0s4j1mrw4gaf6y6w"; system = "plplot-examples"; asd = "cl-plplot"; @@ -82418,7 +83717,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pludeck" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pludeck/2018-08-31/pludeck-20180831-git.tgz"; + url = "https://beta.quicklisp.org/archive/pludeck/2018-08-31/pludeck-20180831-git.tgz"; sha256 = "0p6v7fxs48fxr76kvkh6z2mjjyz3vf2rp698jq1fl6p3hihbgl0m"; system = "pludeck"; asd = "pludeck"; @@ -82434,12 +83733,12 @@ lib.makeScope pkgs.newScope (self: { plump = ( build-asdf-system { pname = "plump"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "plump" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/plump/2024-10-12/plump-20241012-git.tgz"; - sha256 = "04wy2v69zal186gg0pvcj60184gi7cpkpx3h1w93c9nilmla0dv9"; + url = "https://beta.quicklisp.org/archive/plump/2025-06-22/plump-20250622-git.tgz"; + sha256 = "181skw88n8z9997fcwbkjm5p42rnf1q8sv4m443qjc0a4y8b3pgq"; system = "plump"; asd = "plump"; } @@ -82459,7 +83758,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "plump-bundle" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/plump-bundle/2023-10-21/plump-bundle-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/plump-bundle/2023-10-21/plump-bundle-20231021-git.tgz"; sha256 = "0qknmdryyynjk5g0zda2788p4j0s6w4fj27kdca22z0n8r8yfhhk"; system = "plump-bundle"; asd = "plump-bundle"; @@ -82480,12 +83779,12 @@ lib.makeScope pkgs.newScope (self: { plump-dom = ( build-asdf-system { pname = "plump-dom"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "plump-dom" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/plump/2024-10-12/plump-20241012-git.tgz"; - sha256 = "04wy2v69zal186gg0pvcj60184gi7cpkpx3h1w93c9nilmla0dv9"; + url = "https://beta.quicklisp.org/archive/plump/2025-06-22/plump-20250622-git.tgz"; + sha256 = "181skw88n8z9997fcwbkjm5p42rnf1q8sv4m443qjc0a4y8b3pgq"; system = "plump-dom"; asd = "plump-dom"; } @@ -82500,12 +83799,12 @@ lib.makeScope pkgs.newScope (self: { plump-lexer = ( build-asdf-system { pname = "plump-lexer"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "plump-lexer" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/plump/2024-10-12/plump-20241012-git.tgz"; - sha256 = "04wy2v69zal186gg0pvcj60184gi7cpkpx3h1w93c9nilmla0dv9"; + url = "https://beta.quicklisp.org/archive/plump/2025-06-22/plump-20250622-git.tgz"; + sha256 = "181skw88n8z9997fcwbkjm5p42rnf1q8sv4m443qjc0a4y8b3pgq"; system = "plump-lexer"; asd = "plump-lexer"; } @@ -82520,12 +83819,12 @@ lib.makeScope pkgs.newScope (self: { plump-parser = ( build-asdf-system { pname = "plump-parser"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "plump-parser" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/plump/2024-10-12/plump-20241012-git.tgz"; - sha256 = "04wy2v69zal186gg0pvcj60184gi7cpkpx3h1w93c9nilmla0dv9"; + url = "https://beta.quicklisp.org/archive/plump/2025-06-22/plump-20250622-git.tgz"; + sha256 = "181skw88n8z9997fcwbkjm5p42rnf1q8sv4m443qjc0a4y8b3pgq"; system = "plump-parser"; asd = "plump-parser"; } @@ -82540,12 +83839,12 @@ lib.makeScope pkgs.newScope (self: { plump-sexp = ( build-asdf-system { pname = "plump-sexp"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "plump-sexp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/plump-sexp/2024-10-12/plump-sexp-20241012-git.tgz"; - sha256 = "19gihmsbwv42zwyc4rd1pcvj5yzf1vnhpci7r5kz1dnrmz9gzy3l"; + url = "https://beta.quicklisp.org/archive/plump-sexp/2025-06-22/plump-sexp-20250622-git.tgz"; + sha256 = "0rl7abbaiwggdblcirn3mdcnnghvq9x9sn4pqk9fmkmsn3ladm7a"; system = "plump-sexp"; asd = "plump-sexp"; } @@ -82564,7 +83863,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "plump-tex" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/plump-tex/2023-10-21/plump-tex-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/plump-tex/2023-10-21/plump-tex-20231021-git.tgz"; sha256 = "1k0cmk5sbn042bx7nxiw0rvsjmgmj221zim1hg23r0485jbx0r3h"; system = "plump-tex"; asd = "plump-tex"; @@ -82587,7 +83886,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "plump-tex-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/plump-tex/2023-10-21/plump-tex-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/plump-tex/2023-10-21/plump-tex-20231021-git.tgz"; sha256 = "1k0cmk5sbn042bx7nxiw0rvsjmgmj221zim1hg23r0485jbx0r3h"; system = "plump-tex-test"; asd = "plump-tex-test"; @@ -82610,7 +83909,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "png" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-png/2021-10-20/cl-png-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-png/2021-10-20/cl-png-20211020-git.tgz"; sha256 = "17xcb9ps5vf3if61blmx7cpfrz3gsw7jk8d5zv3f4cq8jrriqdx4"; system = "png"; asd = "png"; @@ -82633,7 +83932,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "png-read" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/png-read/2017-08-30/png-read-20170830-git.tgz"; + url = "https://beta.quicklisp.org/archive/png-read/2017-08-30/png-read-20170830-git.tgz"; sha256 = "0vyczbcwskrygrf1hgrsnk0jil8skmvf1kiaalw5jps4fjrfdkw0"; system = "png-read"; asd = "png-read"; @@ -82657,7 +83956,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "png-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-png/2021-10-20/cl-png-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-png/2021-10-20/cl-png-20211020-git.tgz"; sha256 = "17xcb9ps5vf3if61blmx7cpfrz3gsw7jk8d5zv3f4cq8jrriqdx4"; system = "png-test"; asd = "png-test"; @@ -82677,7 +83976,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pngload" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pngload/2024-10-12/pngload-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/pngload/2024-10-12/pngload-20241012-git.tgz"; sha256 = "1j5j8n8xa8hgc413lfxij3wmkwyal13p0a5q6n74zzr61f1kn6vc"; system = "pngload"; asd = "pngload"; @@ -82706,7 +84005,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pngload.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pngload/2024-10-12/pngload-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/pngload/2024-10-12/pngload-20241012-git.tgz"; sha256 = "1j5j8n8xa8hgc413lfxij3wmkwyal13p0a5q6n74zzr61f1kn6vc"; system = "pngload.test"; asd = "pngload.test"; @@ -82732,7 +84031,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "poler" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/poler/2018-12-10/poler-20181210-git.tgz"; + url = "https://beta.quicklisp.org/archive/poler/2018-12-10/poler-20181210-git.tgz"; sha256 = "1lcyjxmz5vm5is1kgxqjvpkllywvbsj6wqx5v2ac0py5vqws1l8z"; system = "poler"; asd = "poler"; @@ -82752,7 +84051,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "poler-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/poler/2018-12-10/poler-20181210-git.tgz"; + url = "https://beta.quicklisp.org/archive/poler/2018-12-10/poler-20181210-git.tgz"; sha256 = "1lcyjxmz5vm5is1kgxqjvpkllywvbsj6wqx5v2ac0py5vqws1l8z"; system = "poler-test"; asd = "poler-test"; @@ -82776,7 +84075,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "policy-cond" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/policy-cond/2024-10-12/policy-cond-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/policy-cond/2024-10-12/policy-cond-20241012-git.tgz"; sha256 = "17gm4alfb8nf85963ckahipx61xfffj0ra2cnn6yra32krzj7gnk"; system = "policy-cond"; asd = "policy-cond"; @@ -82796,7 +84095,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "polisher" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/polisher/2021-12-30/polisher-20211230-git.tgz"; + url = "https://beta.quicklisp.org/archive/polisher/2021-12-30/polisher-20211230-git.tgz"; sha256 = "1i63kgk4vfisiyrfqdz0wc8ldvfh9jpkivsasgdhc97cad095ln0"; system = "polisher"; asd = "polisher"; @@ -82816,7 +84115,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "polisher.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/polisher/2021-12-30/polisher-20211230-git.tgz"; + url = "https://beta.quicklisp.org/archive/polisher/2021-12-30/polisher-20211230-git.tgz"; sha256 = "1i63kgk4vfisiyrfqdz0wc8ldvfh9jpkivsasgdhc97cad095ln0"; system = "polisher.test"; asd = "polisher.test"; @@ -82835,12 +84134,12 @@ lib.makeScope pkgs.newScope (self: { polymorphic-functions-lite = ( build-asdf-system { pname = "polymorphic-functions-lite"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "polymorphic-functions-lite" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/polymorphic-functions/2024-10-12/polymorphic-functions-20241012-git.tgz"; - sha256 = "1bawhbj5rh1q6qrcjnx48n78841mgri5n63pmicxxyhif2il0zq3"; + url = "https://beta.quicklisp.org/archive/polymorphic-functions/2025-06-22/polymorphic-functions-20250622-git.tgz"; + sha256 = "12rxvwfwpi899dx8nyighax2qd6jl0kch5f0ycg10am5kvprbkyy"; system = "polymorphic-functions-lite"; asd = "polymorphic-functions-lite"; } @@ -82864,7 +84163,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pooler" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pooler/2015-06-08/pooler-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/pooler/2015-06-08/pooler-20150608-git.tgz"; sha256 = "18vdl06cckk07m7r477qzcz24j3sid1agfa69fp91jna5aqi46kb"; system = "pooler"; asd = "pooler"; @@ -82884,7 +84183,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "portable-condition-system" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/portable-condition-system/2021-08-07/portable-condition-system-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/portable-condition-system/2021-08-07/portable-condition-system-20210807-git.tgz"; sha256 = "099lb9f4bavj95wik99wla5rf6fk1gdw9pvn0cqlaf0wf20csd3h"; system = "portable-condition-system"; asd = "portable-condition-system"; @@ -82907,7 +84206,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "portable-condition-system.integration" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/portable-condition-system/2021-08-07/portable-condition-system-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/portable-condition-system/2021-08-07/portable-condition-system-20210807-git.tgz"; sha256 = "099lb9f4bavj95wik99wla5rf6fk1gdw9pvn0cqlaf0wf20csd3h"; system = "portable-condition-system.integration"; asd = "portable-condition-system.integration"; @@ -82930,7 +84229,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "portable-threads" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/portable-threads/2021-05-31/portable-threads-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/portable-threads/2021-05-31/portable-threads-20210531-git.tgz"; sha256 = "05y00mlvwlfas4jj50qas2v2rxa0hyc9834lpnbh61a3g8sz0d1f"; system = "portable-threads"; asd = "portable-threads"; @@ -82950,7 +84249,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "portal" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/portal/2021-12-09/portal-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/portal/2021-12-09/portal-20211209-git.tgz"; sha256 = "1012jc068qdd8df6mmbn8vmmqlniqm5j2jbyrraw3yz8c13c8280"; system = "portal"; asd = "portal"; @@ -82980,7 +84279,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "portmanteau" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-portmanteau/2018-10-18/cl-portmanteau-20181018-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-portmanteau/2018-10-18/cl-portmanteau-20181018-git.tgz"; sha256 = "0430yixy722zkiljc6kh68hx2pyf2pbylgyp7n4qnnky86c0z0ip"; system = "portmanteau"; asd = "portmanteau"; @@ -83000,7 +84299,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "portmanteau-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-portmanteau/2018-10-18/cl-portmanteau-20181018-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-portmanteau/2018-10-18/cl-portmanteau-20181018-git.tgz"; sha256 = "0430yixy722zkiljc6kh68hx2pyf2pbylgyp7n4qnnky86c0z0ip"; system = "portmanteau-tests"; asd = "portmanteau-tests"; @@ -83023,7 +84322,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "positional-lambda" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/positional-lambda/2012-10-13/positional-lambda-2.0.tgz"; + url = "https://beta.quicklisp.org/archive/positional-lambda/2012-10-13/positional-lambda-2.0.tgz"; sha256 = "00jbr42czv7piza5sm5hmmls7xnhq1pnzl09j6c28xrknr61cj8r"; system = "positional-lambda"; asd = "positional-lambda"; @@ -83043,7 +84342,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "posix-shm" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/posix-shm/2023-10-21/posix-shm-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/posix-shm/2023-10-21/posix-shm-20231021-git.tgz"; sha256 = "0ah7xh7dxvdk58slic60gx7k56idjw5x30q5ifg90hxfhd32qz6l"; system = "posix-shm"; asd = "posix-shm"; @@ -83068,7 +84367,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "postmodern" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/postmodern/2024-10-12/postmodern-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/postmodern/2024-10-12/postmodern-20241012-git.tgz"; sha256 = "1hj0dpclzihy1rcnwhiv16abmaa54wygxyib3j2h9q4qs26w7pzb"; system = "postmodern"; asd = "postmodern"; @@ -83094,7 +84393,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "postmodernity" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/postmodernity/2017-01-24/postmodernity-20170124-git.tgz"; + url = "https://beta.quicklisp.org/archive/postmodernity/2017-01-24/postmodernity-20170124-git.tgz"; sha256 = "06mwlp79dgzsgfhgbhvqk4691nm52v3lqm99y72dm7pm4gmc2m9m"; system = "postmodernity"; asd = "postmodernity"; @@ -83117,7 +84416,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "postoffice" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/postoffice/2012-09-09/postoffice-20120909-git.tgz"; + url = "https://beta.quicklisp.org/archive/postoffice/2012-09-09/postoffice-20120909-git.tgz"; sha256 = "041k8nc969xyjdmbn6348pra3v5jb1sw4mrnxmamv0flngyv12fg"; system = "postoffice"; asd = "postoffice"; @@ -83137,7 +84436,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pounds" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pounds/2016-02-08/pounds-20160208-git.tgz"; + url = "https://beta.quicklisp.org/archive/pounds/2016-02-08/pounds-20160208-git.tgz"; sha256 = "17hz0ywzfirmlwkrd9zrbl07ihhm03zhzqrz3rkmh1j9v95sy2kl"; system = "pounds"; asd = "pounds"; @@ -83163,7 +84462,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pp-toml" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pp-toml/2022-11-06/pp-toml-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/pp-toml/2022-11-06/pp-toml-20221106-git.tgz"; sha256 = "136d7jzz7l2ck9wwld0ac46jmpm94lvja6m50sy73s232slka2hg"; system = "pp-toml"; asd = "pp-toml"; @@ -83191,7 +84490,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pp-toml-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pp-toml/2022-11-06/pp-toml-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/pp-toml/2022-11-06/pp-toml-20221106-git.tgz"; sha256 = "136d7jzz7l2ck9wwld0ac46jmpm94lvja6m50sy73s232slka2hg"; system = "pp-toml-tests"; asd = "pp-toml-tests"; @@ -83221,7 +84520,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ppath" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ppath/2024-10-12/ppath-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/ppath/2024-10-12/ppath-20241012-git.tgz"; sha256 = "122h2xlr9435gjim567cyry13ylbsixziy5bi1n4lzpfjnkq68qg"; system = "ppath"; asd = "ppath"; @@ -83248,7 +84547,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ppath-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ppath/2024-10-12/ppath-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/ppath/2024-10-12/ppath-20241012-git.tgz"; sha256 = "122h2xlr9435gjim567cyry13ylbsixziy5bi1n4lzpfjnkq68qg"; system = "ppath-test"; asd = "ppath-test"; @@ -83274,7 +84573,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "practical-cl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; + url = "https://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9"; system = "practical-cl"; asd = "practical-cl"; @@ -83307,7 +84606,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "prbs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/prbs/2018-02-28/prbs-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/prbs/2018-02-28/prbs-20180228-git.tgz"; sha256 = "0qbvbmxa66b367z9px4nyxqb21b9w2hr82rw7hfq5aynmwfk3fzi"; system = "prbs"; asd = "prbs"; @@ -83327,7 +84626,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "prbs-docs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/prbs/2018-02-28/prbs-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/prbs/2018-02-28/prbs-20180228-git.tgz"; sha256 = "0qbvbmxa66b367z9px4nyxqb21b9w2hr82rw7hfq5aynmwfk3fzi"; system = "prbs-docs"; asd = "prbs-docs"; @@ -83346,12 +84645,12 @@ lib.makeScope pkgs.newScope (self: { precise-time = ( build-asdf-system { pname = "precise-time"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "precise-time" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/precise-time/2024-10-12/precise-time-20241012-git.tgz"; - sha256 = "114ix5nldfg301g0af8lsnc129i7hnhgdzmnznda2fv92zf3vn8g"; + url = "https://beta.quicklisp.org/archive/precise-time/2025-06-22/precise-time-20250622-git.tgz"; + sha256 = "1b7ky6m8ih8dz93psrznrxvvchrrhaby3q3fdlhr6nw8zpg63fsh"; system = "precise-time"; asd = "precise-time"; } @@ -83374,7 +84673,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pregexp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pregexp/2024-10-12/pregexp-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/pregexp/2024-10-12/pregexp-20241012-git.tgz"; sha256 = "10l9hj7a812km1hygg6iwwl1bf8jgsfyfr1ixj7bif8k8502h4nz"; system = "pregexp"; asd = "pregexp"; @@ -83390,12 +84689,12 @@ lib.makeScope pkgs.newScope (self: { prepl = ( build-asdf-system { pname = "prepl"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "prepl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/prepl/2023-10-21/prepl-20231021-git.tgz"; - sha256 = "0sbqlqbk9xrl30iklp3vs493zq4bc2nxv6q435cspicwz6igbjdw"; + url = "https://beta.quicklisp.org/archive/prepl/2025-06-22/prepl-20250622-git.tgz"; + sha256 = "0rwh46lbwr7gfcl0cb7k0snkg9z8hpv43ir575zw5kadiqxqwr3g"; system = "prepl"; asd = "prepl"; } @@ -83420,7 +84719,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "prettier-builtins" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/prettier-builtins/2023-10-21/prettier-builtins-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/prettier-builtins/2023-10-21/prettier-builtins-20231021-git.tgz"; sha256 = "15lbf0zi1vxqpxwsfgkq7dlg5c9m1b2a4hvcfm3qlh9ir7ahggck"; system = "prettier-builtins"; asd = "prettier-builtins"; @@ -83440,7 +84739,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pretty-function" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pretty-function/2013-06-15/pretty-function-20130615-git.tgz"; + url = "https://beta.quicklisp.org/archive/pretty-function/2013-06-15/pretty-function-20130615-git.tgz"; sha256 = "1hzfjwsp6r5nki6h8kry8k2bgj19mrp0jbq7jhsz3kz6y4ll0hb5"; system = "pretty-function"; asd = "pretty-function"; @@ -83460,7 +84759,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "primecount" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/primecount/2020-03-25/primecount-20200325-git.tgz"; + url = "https://beta.quicklisp.org/archive/primecount/2020-03-25/primecount-20200325-git.tgz"; sha256 = "1fw855qp82b887azww7z3yhd2zafaxjnzyff1ldf2wa6mb4f0dj8"; system = "primecount"; asd = "primecount"; @@ -83480,7 +84779,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "print-html" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/print-html/2018-10-18/print-html-20181018-git.tgz"; + url = "https://beta.quicklisp.org/archive/print-html/2018-10-18/print-html-20181018-git.tgz"; sha256 = "1ihr2yy6fvli3awrkfn4v8pm41wab5wsj30v84rr75v4p5irqmz8"; system = "print-html"; asd = "print-html"; @@ -83500,7 +84799,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "print-licenses" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/print-licenses/2023-06-18/print-licenses-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/print-licenses/2023-06-18/print-licenses-20230618-git.tgz"; sha256 = "14i6r6mf16dlj1g4xk0alg2912y3wy0qbfpyvvgsgxkkar63cmi5"; system = "print-licenses"; asd = "print-licenses"; @@ -83523,7 +84822,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "printv" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/printv/2021-12-30/printv-20211230-git.tgz"; + url = "https://beta.quicklisp.org/archive/printv/2021-12-30/printv-20211230-git.tgz"; sha256 = "07agyzkwp3w2r4d2anrmr8h00yngpr5dq9mjd3m4kzhn1jcmilfb"; system = "printv"; asd = "printv"; @@ -83543,7 +84842,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "priority-queue" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/priority-queue/2015-07-09/priority-queue-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/priority-queue/2015-07-09/priority-queue-20150709-git.tgz"; sha256 = "0y5a1fid8xzzl58hfdj64n8mrzq0kr06a0lnmdjpgi0czc3x0jcy"; system = "priority-queue"; asd = "priority-queue"; @@ -83563,7 +84862,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "priority-queue-benchmark" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/damn-fast-priority-queue/2024-10-12/damn-fast-priority-queue-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/damn-fast-priority-queue/2024-10-12/damn-fast-priority-queue-20241012-git.tgz"; sha256 = "1mbigpgi7qbqvpj59l1f7p2qcg00ybvqzdca1j1b9hx62h224ndw"; system = "priority-queue-benchmark"; asd = "priority-queue-benchmark"; @@ -83596,7 +84895,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "proc-parse" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/proc-parse/2019-08-13/proc-parse-20190813-git.tgz"; + url = "https://beta.quicklisp.org/archive/proc-parse/2019-08-13/proc-parse-20190813-git.tgz"; sha256 = "07vbj26bfq4ywlcmamsqyac29rsdsa8lamjqx1ycla1bcvgmi4w2"; system = "proc-parse"; asd = "proc-parse"; @@ -83617,7 +84916,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "proc-parse-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/proc-parse/2019-08-13/proc-parse-20190813-git.tgz"; + url = "https://beta.quicklisp.org/archive/proc-parse/2019-08-13/proc-parse-20190813-git.tgz"; sha256 = "07vbj26bfq4ywlcmamsqyac29rsdsa8lamjqx1ycla1bcvgmi4w2"; system = "proc-parse-test"; asd = "proc-parse-test"; @@ -83637,12 +84936,12 @@ lib.makeScope pkgs.newScope (self: { progressons = ( build-asdf-system { pname = "progressons"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "progressons" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/progressons/2024-10-12/progressons-20241012-git.tgz"; - sha256 = "1i93khd0l1aphzh6qb4yy9cpi2nmqac08b90yx95p4zymap03nly"; + url = "https://beta.quicklisp.org/archive/progressons/2025-06-22/progressons-20250622-git.tgz"; + sha256 = "136pnign0rl03c6pr3vbd4ia3yzl63svcv8dshxlmbpjwpma0nr3"; system = "progressons"; asd = "progressons"; } @@ -83664,7 +84963,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "projectured.document" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz"; + url = "https://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz"; sha256 = "1gbsqaw571xgh2glg4386545b5sqjgbaiqa3x4j1gr70kirbzydn"; system = "projectured.document"; asd = "projectured.document"; @@ -83690,7 +84989,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "projectured.editor" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz"; + url = "https://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz"; sha256 = "1gbsqaw571xgh2glg4386545b5sqjgbaiqa3x4j1gr70kirbzydn"; system = "projectured.editor"; asd = "projectured.editor"; @@ -83720,7 +85019,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "projectured.executable" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz"; + url = "https://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz"; sha256 = "1gbsqaw571xgh2glg4386545b5sqjgbaiqa3x4j1gr70kirbzydn"; system = "projectured.executable"; asd = "projectured.executable"; @@ -83744,7 +85043,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "projectured.projection" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz"; + url = "https://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz"; sha256 = "1gbsqaw571xgh2glg4386545b5sqjgbaiqa3x4j1gr70kirbzydn"; system = "projectured.projection"; asd = "projectured.projection"; @@ -83768,7 +85067,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "projectured.sdl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz"; + url = "https://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz"; sha256 = "1gbsqaw571xgh2glg4386545b5sqjgbaiqa3x4j1gr70kirbzydn"; system = "projectured.sdl"; asd = "projectured.sdl"; @@ -83794,7 +85093,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "projectured.sdl.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz"; + url = "https://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz"; sha256 = "1gbsqaw571xgh2glg4386545b5sqjgbaiqa3x4j1gr70kirbzydn"; system = "projectured.sdl.test"; asd = "projectured.sdl.test"; @@ -83818,7 +85117,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "projectured.swank" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz"; + url = "https://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz"; sha256 = "1gbsqaw571xgh2glg4386545b5sqjgbaiqa3x4j1gr70kirbzydn"; system = "projectured.swank"; asd = "projectured.swank"; @@ -83842,7 +85141,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "projectured.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz"; + url = "https://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz"; sha256 = "1gbsqaw571xgh2glg4386545b5sqjgbaiqa3x4j1gr70kirbzydn"; system = "projectured.test"; asd = "projectured.test"; @@ -83870,7 +85169,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "prometheus" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp"; system = "prometheus"; asd = "prometheus"; @@ -83892,12 +85191,12 @@ lib.makeScope pkgs.newScope (self: { prometheus-gc = ( build-asdf-system { pname = "prometheus-gc"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "prometheus-gc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/prometheus-gc/2024-10-12/prometheus-gc-20241012-git.tgz"; - sha256 = "0lfdh7j7jzklhr76fdw1z3a777h5sr5c9h1i6nv1knnm36l44zpj"; + url = "https://beta.quicklisp.org/archive/prometheus-gc/2025-06-22/prometheus-gc-20250622-git.tgz"; + sha256 = "0z9np2226649kllvkb7jyk7bc767z5i68861l1g96hyhbndf8aw6"; system = "prometheus-gc"; asd = "prometheus-gc"; } @@ -83915,12 +85214,12 @@ lib.makeScope pkgs.newScope (self: { prometheus-gc-ci = ( build-asdf-system { pname = "prometheus-gc-ci"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "prometheus-gc-ci" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/prometheus-gc/2024-10-12/prometheus-gc-20241012-git.tgz"; - sha256 = "0lfdh7j7jzklhr76fdw1z3a777h5sr5c9h1i6nv1knnm36l44zpj"; + url = "https://beta.quicklisp.org/archive/prometheus-gc/2025-06-22/prometheus-gc-20250622-git.tgz"; + sha256 = "0z9np2226649kllvkb7jyk7bc767z5i68861l1g96hyhbndf8aw6"; system = "prometheus-gc-ci"; asd = "prometheus-gc-ci"; } @@ -83935,12 +85234,12 @@ lib.makeScope pkgs.newScope (self: { prometheus-gc-tests = ( build-asdf-system { pname = "prometheus-gc-tests"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "prometheus-gc-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/prometheus-gc/2024-10-12/prometheus-gc-20241012-git.tgz"; - sha256 = "0lfdh7j7jzklhr76fdw1z3a777h5sr5c9h1i6nv1knnm36l44zpj"; + url = "https://beta.quicklisp.org/archive/prometheus-gc/2025-06-22/prometheus-gc-20250622-git.tgz"; + sha256 = "0z9np2226649kllvkb7jyk7bc767z5i68861l1g96hyhbndf8aw6"; system = "prometheus-gc-tests"; asd = "prometheus-gc-tests"; } @@ -83959,7 +85258,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "prometheus.collectors.process" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp"; system = "prometheus.collectors.process"; asd = "prometheus.collectors.process"; @@ -83985,7 +85284,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "prometheus.collectors.process.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp"; system = "prometheus.collectors.process.test"; asd = "prometheus.collectors.process.test"; @@ -84013,7 +85312,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "prometheus.collectors.sbcl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp"; system = "prometheus.collectors.sbcl"; asd = "prometheus.collectors.sbcl"; @@ -84033,7 +85332,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "prometheus.collectors.sbcl.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp"; system = "prometheus.collectors.sbcl.test"; asd = "prometheus.collectors.sbcl.test"; @@ -84061,7 +85360,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "prometheus.examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp"; system = "prometheus.examples"; asd = "prometheus.examples"; @@ -84087,7 +85386,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "prometheus.exposers.hunchentoot" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp"; system = "prometheus.exposers.hunchentoot"; asd = "prometheus.exposers.hunchentoot"; @@ -84113,7 +85412,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "prometheus.exposers.hunchentoot.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp"; system = "prometheus.exposers.hunchentoot.test"; asd = "prometheus.exposers.hunchentoot.test"; @@ -84144,7 +85443,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "prometheus.formats.text" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp"; system = "prometheus.formats.text"; asd = "prometheus.formats.text"; @@ -84167,7 +85466,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "prometheus.formats.text.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp"; system = "prometheus.formats.text.test"; asd = "prometheus.formats.text.test"; @@ -84195,7 +85494,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "prometheus.pushgateway" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp"; system = "prometheus.pushgateway"; asd = "prometheus.pushgateway"; @@ -84219,7 +85518,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "prometheus.pushgateway.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp"; system = "prometheus.pushgateway.test"; asd = "prometheus.pushgateway.test"; @@ -84248,7 +85547,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "prometheus.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp"; system = "prometheus.test"; asd = "prometheus.test"; @@ -84276,7 +85575,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "prometheus.test.all" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp"; system = "prometheus.test.all"; asd = "prometheus.test.all"; @@ -84305,7 +85604,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "prometheus.test.support" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp"; system = "prometheus.test.support"; asd = "prometheus.test.support"; @@ -84330,7 +85629,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "promise" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/promise/2023-10-21/promise-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/promise/2023-10-21/promise-20231021-git.tgz"; sha256 = "1xm10s89a2f7ydzayjgg94y9plrz1jnyvi6yzhk5v3vrbnmpggh1"; system = "promise"; asd = "promise"; @@ -84350,7 +85649,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "promise-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/promise/2023-10-21/promise-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/promise/2023-10-21/promise-20231021-git.tgz"; sha256 = "1xm10s89a2f7ydzayjgg94y9plrz1jnyvi6yzhk5v3vrbnmpggh1"; system = "promise-test"; asd = "promise-test"; @@ -84373,7 +85672,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "prompt-for" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/prompt-for/2022-07-07/prompt-for-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/prompt-for/2022-07-07/prompt-for-20220707-git.tgz"; sha256 = "1zjc96ryyzsr5519s7yji40askqyymjrbdwx3r2r7bv146siqs5m"; system = "prompt-for"; asd = "prompt-for"; @@ -84393,7 +85692,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "prompt-for.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/prompt-for/2022-07-07/prompt-for-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/prompt-for/2022-07-07/prompt-for-20220707-git.tgz"; sha256 = "1zjc96ryyzsr5519s7yji40askqyymjrbdwx3r2r7bv146siqs5m"; system = "prompt-for.test"; asd = "prompt-for.test"; @@ -84416,7 +85715,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "protest" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/protest/2020-12-20/protest-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/protest/2020-12-20/protest-20201220-git.tgz"; sha256 = "0q7vk7ji4mjd0xfp18sim5daqzgb3k7mmbm93vvwz18bdwy6cj9h"; system = "protest"; asd = "protest"; @@ -84441,7 +85740,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "proto" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gtirb/2021-10-20/gtirb-quicklisp-dd18337d-git.tgz"; + url = "https://beta.quicklisp.org/archive/gtirb/2021-10-20/gtirb-quicklisp-dd18337d-git.tgz"; sha256 = "0dpchsshnlh3jb9rg1zdf63mr5l33vhjdxgxx2vqg0nh1sh41zn1"; system = "proto"; asd = "gtirb"; @@ -84461,7 +85760,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "proto-v0" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gtirb/2021-10-20/gtirb-quicklisp-dd18337d-git.tgz"; + url = "https://beta.quicklisp.org/archive/gtirb/2021-10-20/gtirb-quicklisp-dd18337d-git.tgz"; sha256 = "0dpchsshnlh3jb9rg1zdf63mr5l33vhjdxgxx2vqg0nh1sh41zn1"; system = "proto-v0"; asd = "gtirb"; @@ -84481,7 +85780,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "protobuf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/protobuf/2023-06-18/protobuf-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/protobuf/2023-06-18/protobuf-20230618-git.tgz"; sha256 = "0pp8i2i72p6cng11sxj83klw45jqv05l5024h7c2rl0pvsg8f6bc"; system = "protobuf"; asd = "protobuf"; @@ -84504,7 +85803,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "protobuf-conformance" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/protobuf/2023-06-18/protobuf-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/protobuf/2023-06-18/protobuf-20230618-git.tgz"; sha256 = "0pp8i2i72p6cng11sxj83klw45jqv05l5024h7c2rl0pvsg8f6bc"; system = "protobuf-conformance"; asd = "protobuf-conformance"; @@ -84528,7 +85827,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "prove" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz"; sha256 = "0ca6ha3zhmckq3ad9lxm6sbg4i0hg3m81xhan4dkxd3x9898jzpc"; system = "prove"; asd = "prove"; @@ -84551,7 +85850,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "prove-asdf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz"; sha256 = "0ca6ha3zhmckq3ad9lxm6sbg4i0hg3m81xhan4dkxd3x9898jzpc"; system = "prove-asdf"; asd = "prove-asdf"; @@ -84569,7 +85868,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "prove-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz"; sha256 = "0ca6ha3zhmckq3ad9lxm6sbg4i0hg3m81xhan4dkxd3x9898jzpc"; system = "prove-test"; asd = "prove-test"; @@ -84594,7 +85893,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pseudonyms" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pseudonyms/2020-03-25/pseudonyms-20200325-git.tgz"; + url = "https://beta.quicklisp.org/archive/pseudonyms/2020-03-25/pseudonyms-20200325-git.tgz"; sha256 = "0ph7l130hr8gz88gw8i15zbsbq96519srfhzgm6zzkw85vab1ysn"; system = "pseudonyms"; asd = "pseudonyms"; @@ -84617,7 +85916,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "psgraph" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/psgraph/2010-10-06/psgraph-1.2.tgz"; + url = "https://beta.quicklisp.org/archive/psgraph/2010-10-06/psgraph-1.2.tgz"; sha256 = "19x1lvzfj2c2h83y5bng6jsp2300qfvd25mmf157qiss15al22vs"; system = "psgraph"; asd = "psgraph"; @@ -84637,7 +85936,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "psychiq" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/psychiq/2024-10-12/psychiq-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/psychiq/2024-10-12/psychiq-20241012-git.tgz"; sha256 = "1036yyrzvyqszn037y4189h12221mkxdyp0nlyj26qjyil3qizbl"; system = "psychiq"; asd = "psychiq"; @@ -84666,7 +85965,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "psychiq-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/psychiq/2024-10-12/psychiq-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/psychiq/2024-10-12/psychiq-20241012-git.tgz"; sha256 = "1036yyrzvyqszn037y4189h12221mkxdyp0nlyj26qjyil3qizbl"; system = "psychiq-test"; asd = "psychiq-test"; @@ -84690,7 +85989,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ptc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ptc/2023-10-21/ptc-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/ptc/2023-10-21/ptc-20231021-git.tgz"; sha256 = "1r4izrc6dhz3pqpcqn3y0sga4f77s2vzd1xpl8fsr41rfpyiff3x"; system = "ptc"; asd = "ptc"; @@ -84710,7 +86009,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ptester" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ptester/2016-09-29/ptester-20160929-git.tgz"; + url = "https://beta.quicklisp.org/archive/ptester/2016-09-29/ptester-20160929-git.tgz"; sha256 = "1l0lfl7cdnr2qf4zh38hi4llxg22c49zkm639bdkmvlkzwj3ndwf"; system = "ptester"; asd = "ptester"; @@ -84728,7 +86027,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "punycode" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/punycode/2023-10-21/punycode-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/punycode/2023-10-21/punycode-20231021-git.tgz"; sha256 = "0779aj2bqsz7qb475x5sacr5q254wjar74sab04zfhrlpkgij9xh"; system = "punycode"; asd = "punycode"; @@ -84748,7 +86047,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "punycode-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/punycode/2023-10-21/punycode-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/punycode/2023-10-21/punycode-20231021-git.tgz"; sha256 = "0779aj2bqsz7qb475x5sacr5q254wjar74sab04zfhrlpkgij9xh"; system = "punycode-test"; asd = "punycode-test"; @@ -84771,7 +86070,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "purgatory" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/purgatory/2024-10-12/purgatory-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/purgatory/2024-10-12/purgatory-20241012-git.tgz"; sha256 = "1srafcpl01a1dv84z3sqc1wl23r8hz1nm3rrmmqiilfh2r4jfw6f"; system = "purgatory"; asd = "purgatory"; @@ -84796,7 +86095,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "purgatory-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/purgatory/2024-10-12/purgatory-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/purgatory/2024-10-12/purgatory-20241012-git.tgz"; sha256 = "1srafcpl01a1dv84z3sqc1wl23r8hz1nm3rrmmqiilfh2r4jfw6f"; system = "purgatory-tests"; asd = "purgatory-tests"; @@ -84824,7 +86123,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "puri" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/puri/2020-10-16/puri-20201016-git.tgz"; + url = "https://beta.quicklisp.org/archive/puri/2020-10-16/puri-20201016-git.tgz"; sha256 = "0gq2rsr0aihs0z20v4zqvmdl4szq53b52rh97pvnmwrlbn4mapmd"; system = "puri"; asd = "puri"; @@ -84842,7 +86141,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "purl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/purl/2016-09-29/purl-20160929-git.tgz"; + url = "https://beta.quicklisp.org/archive/purl/2016-09-29/purl-20160929-git.tgz"; sha256 = "1fw3ip4b7n3q6kimh683apg381p7y4w6s4mb8mmv9n3dw0p0sdww"; system = "purl"; asd = "purl"; @@ -84865,7 +86164,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pvars" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pvars/2021-02-28/pvars-20210228-git.tgz"; + url = "https://beta.quicklisp.org/archive/pvars/2021-02-28/pvars-20210228-git.tgz"; sha256 = "1x9mmz53sj0mgd288pa65x963mrd27sw47a8vbggsc4ykwacqf1d"; system = "pvars"; asd = "pvars"; @@ -84888,7 +86187,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "py-configparser" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/py-configparser/2017-08-30/py-configparser-20170830-svn.tgz"; + url = "https://beta.quicklisp.org/archive/py-configparser/2017-08-30/py-configparser-20170830-svn.tgz"; sha256 = "1mpzhrys1b1mp1kp2xvryl6v01gfqfccb1zdiib49nf4bms4irvw"; system = "py-configparser"; asd = "py-configparser"; @@ -84908,7 +86207,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "py4cl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/py4cl/2024-10-12/py4cl-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/py4cl/2024-10-12/py4cl-20241012-git.tgz"; sha256 = "0i2zg58zgcyw68m846sqwjb77mvps766xlp30i65h18plc8yqmpg"; system = "py4cl"; asd = "py4cl"; @@ -84932,7 +86231,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "py4cl2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/py4cl2/2024-10-12/py4cl2-v2.9.3.tgz"; + url = "https://beta.quicklisp.org/archive/py4cl2/2024-10-12/py4cl2-v2.9.3.tgz"; sha256 = "0g7qhwnyi1la22k90z8993q8knr117f40jk73wjsvixicqc4awqq"; system = "py4cl2"; asd = "py4cl2"; @@ -84957,12 +86256,12 @@ lib.makeScope pkgs.newScope (self: { py4cl2-cffi = ( build-asdf-system { pname = "py4cl2-cffi"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "py4cl2-cffi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/py4cl2-cffi/2024-10-12/py4cl2-cffi-20241012-git.tgz"; - sha256 = "12ggqz8ibbzsmym51yfd19dlw751s7a1i6ra4z8m2ml3zw1k63zr"; + url = "https://beta.quicklisp.org/archive/py4cl2-cffi/2025-06-22/py4cl2-cffi-20250622-git.tgz"; + sha256 = "1niql10rjhm19qh3fsmp434h6j8x38dknwvwdc72r63gkn7lqiaa"; system = "py4cl2-cffi"; asd = "py4cl2-cffi"; } @@ -84992,7 +86291,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pythonic-string-reader" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pythonic-string-reader/2018-07-11/pythonic-string-reader-20180711-git.tgz"; + url = "https://beta.quicklisp.org/archive/pythonic-string-reader/2018-07-11/pythonic-string-reader-20180711-git.tgz"; sha256 = "1b5iryqw8xsh36swckmz8rrngmc39k92si33fgy5pml3n9l5rq3j"; system = "pythonic-string-reader"; asd = "pythonic-string-reader"; @@ -85010,7 +86309,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pzmq" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pzmq/2021-05-31/pzmq-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/pzmq/2021-05-31/pzmq-20210531-git.tgz"; sha256 = "19mdhxhzzghlmff1fic4chg5iz0psglkim09z6dgpijm26biny05"; system = "pzmq"; asd = "pzmq"; @@ -85031,7 +86330,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pzmq-compat" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pzmq/2021-05-31/pzmq-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/pzmq/2021-05-31/pzmq-20210531-git.tgz"; sha256 = "19mdhxhzzghlmff1fic4chg5iz0psglkim09z6dgpijm26biny05"; system = "pzmq-compat"; asd = "pzmq"; @@ -85049,7 +86348,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pzmq-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pzmq/2021-05-31/pzmq-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/pzmq/2021-05-31/pzmq-20210531-git.tgz"; sha256 = "19mdhxhzzghlmff1fic4chg5iz0psglkim09z6dgpijm26biny05"; system = "pzmq-examples"; asd = "pzmq"; @@ -85073,7 +86372,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "pzmq-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/pzmq/2021-05-31/pzmq-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/pzmq/2021-05-31/pzmq-20210531-git.tgz"; sha256 = "19mdhxhzzghlmff1fic4chg5iz0psglkim09z6dgpijm26biny05"; system = "pzmq-test"; asd = "pzmq"; @@ -85090,26 +86389,6 @@ lib.makeScope pkgs.newScope (self: { meta = { }; } ); - q_plus = ( - build-asdf-system { - pname = "q+"; - version = "20230214-git"; - asds = [ "q+" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools/2023-02-14/qtools-20230214-git.tgz"; - sha256 = "1w9v2swdqqalvlc36kbb1fbvqmwlndisp2dnqbkx8s8h67k1m4lx"; - system = "q+"; - asd = "q+"; - } - ); - systems = [ "q+" ]; - lispLibs = [ (getAttr "qtools" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); qbase64 = ( build-asdf-system { pname = "qbase64"; @@ -85117,7 +86396,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "qbase64" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/qbase64/2022-02-20/qbase64-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/qbase64/2022-02-20/qbase64-20220220-git.tgz"; sha256 = "06daqqfdd51wkx0pyxgz7zq4ibzsqsgn3qs04jabx67gyybgnmjm"; system = "qbase64"; asd = "qbase64"; @@ -85140,7 +86419,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "qbook" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/qbook/2013-03-12/qbook-20130312-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/qbook/2013-03-12/qbook-20130312-darcs.tgz"; sha256 = "0l5hc2v73416jpwc2nsnj03z85fisirgm4av2anvlpv5m1291p6g"; system = "qbook"; asd = "qbook"; @@ -85165,7 +86444,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "qimageblitz" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; system = "qimageblitz"; asd = "qimageblitz"; @@ -85190,7 +86469,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ql-checkout" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ql-checkout/2019-05-21/ql-checkout-20190521-git.tgz"; + url = "https://beta.quicklisp.org/archive/ql-checkout/2019-05-21/ql-checkout-20190521-git.tgz"; sha256 = "1zp3wa7g1wn7sypfsla7510ywvldqavlmv90pncanwpwn79klyhw"; system = "ql-checkout"; asd = "ql-checkout"; @@ -85206,12 +86485,12 @@ lib.makeScope pkgs.newScope (self: { qlot = ( build-asdf-system { pname = "qlot"; - version = "1.5.14"; + version = "1.7.2"; asds = [ "qlot" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/qlot/2024-10-12/qlot-1.5.14.tgz"; - sha256 = "15rg8gjwisi2gp7a0pfgdvs9mjs1xxff0a58b14nm8sf11cdggkr"; + url = "https://beta.quicklisp.org/archive/qlot/2025-06-22/qlot-1.7.2.tgz"; + sha256 = "0mnpz4z589wfmc2pjwgjv86v09p0pqwdk10izv7xri9hab1823vq"; system = "qlot"; asd = "qlot"; } @@ -85221,10 +86500,12 @@ lib.makeScope pkgs.newScope (self: { (getAttr "archive" self) (getAttr "bordeaux-threads" self) (getAttr "cl_plus_ssl" self) + (getAttr "cl-ppcre" self) (getAttr "deflate" self) (getAttr "dexador" self) (getAttr "fuzzy-match" self) (getAttr "ironclad" self) + (getAttr "local-time" self) (getAttr "lparallel" self) (getAttr "quri" self) (getAttr "yason" self) @@ -85237,25 +86518,28 @@ lib.makeScope pkgs.newScope (self: { qmynd = ( build-asdf-system { pname = "qmynd"; - version = "20190710-git"; + version = "20250622-git"; asds = [ "qmynd" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/qmynd/2019-07-10/qmynd-20190710-git.tgz"; - sha256 = "06gw5wxcpdclb6a5i5k9lbmdlyqsp182czrm9bm1cpklzbj0ihrl"; + url = "https://beta.quicklisp.org/archive/qmynd/2025-06-22/qmynd-20250622-git.tgz"; + sha256 = "1j04if9zl6z80pj1301pd6dnp82id495wpgys53psgwn4y3z6y6w"; system = "qmynd"; asd = "qmynd"; } ); systems = [ "qmynd" ]; lispLibs = [ + (getAttr "asn1" self) (getAttr "babel" self) (getAttr "chipz" self) (getAttr "cl_plus_ssl" self) + (getAttr "cl-base64" self) (getAttr "flexi-streams" self) (getAttr "ironclad" self) (getAttr "list-of" self) (getAttr "salza2" self) + (getAttr "trivia" self) (getAttr "trivial-gray-streams" self) (getAttr "usocket" self) ]; @@ -85267,12 +86551,12 @@ lib.makeScope pkgs.newScope (self: { qmynd-test = ( build-asdf-system { pname = "qmynd-test"; - version = "20190710-git"; + version = "20250622-git"; asds = [ "qmynd-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/qmynd/2019-07-10/qmynd-20190710-git.tgz"; - sha256 = "06gw5wxcpdclb6a5i5k9lbmdlyqsp182czrm9bm1cpklzbj0ihrl"; + url = "https://beta.quicklisp.org/archive/qmynd/2025-06-22/qmynd-20250622-git.tgz"; + sha256 = "1j04if9zl6z80pj1301pd6dnp82id495wpgys53psgwn4y3z6y6w"; system = "qmynd-test"; asd = "qmynd-test"; } @@ -85295,7 +86579,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "qoi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/qoi/2024-10-12/qoi-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/qoi/2024-10-12/qoi-20241012-git.tgz"; sha256 = "06akq38q7m648c3kpx1pzw21fwqry7fkg6sfgbap0b7bifzg1dsn"; system = "qoi"; asd = "qoi"; @@ -85315,7 +86599,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "qsci" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; system = "qsci"; asd = "qsci"; @@ -85340,7 +86624,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "qt+libs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/commonqt/2023-02-14/commonqt-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/commonqt/2023-02-14/commonqt-20230214-git.tgz"; sha256 = "1s66z48plfwiq4qhf6whpvnjy4n7r9zhipri7lc8k67x817k020q"; system = "qt+libs"; asd = "qt+libs"; @@ -85370,7 +86654,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "qt-lib-generator" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; system = "qt-lib-generator"; asd = "qt-lib-generator"; @@ -85394,7 +86678,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "qt-libs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; system = "qt-libs"; asd = "qt-libs"; @@ -85416,7 +86700,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "qt3support" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; system = "qt3support"; asd = "qt3support"; @@ -85444,7 +86728,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "qtcore" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; system = "qtcore"; asd = "qtcore"; @@ -85468,7 +86752,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "qtdbus" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; system = "qtdbus"; asd = "qtdbus"; @@ -85493,7 +86777,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "qtdeclarative" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; system = "qtdeclarative"; asd = "qtdeclarative"; @@ -85522,7 +86806,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "qtgui" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; system = "qtgui"; asd = "qtgui"; @@ -85546,7 +86830,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "qthelp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; system = "qthelp"; asd = "qthelp"; @@ -85573,7 +86857,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "qtnetwork" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; system = "qtnetwork"; asd = "qtnetwork"; @@ -85590,1003 +86874,6 @@ lib.makeScope pkgs.newScope (self: { }; } ); - qtools = ( - build-asdf-system { - pname = "qtools"; - version = "20230214-git"; - asds = [ "qtools" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools/2023-02-14/qtools-20230214-git.tgz"; - sha256 = "1w9v2swdqqalvlc36kbb1fbvqmwlndisp2dnqbkx8s8h67k1m4lx"; - system = "qtools"; - asd = "qtools"; - } - ); - systems = [ "qtools" ]; - lispLibs = [ - (getAttr "cl-ppcre" self) - (getAttr "closer-mop" self) - (getAttr "deploy" self) - (getAttr "documentation-utils" self) - (getAttr "form-fiddle" self) - (getAttr "named-readtables" self) - (getAttr "qt_plus_libs" self) - (getAttr "trivial-garbage" self) - (getAttr "trivial-indent" self) - (getAttr "trivial-main-thread" self) - ]; - meta = { }; - } - ); - qtools-evaluator = ( - build-asdf-system { - pname = "qtools-evaluator"; - version = "20230214-git"; - asds = [ "qtools-evaluator" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools/2023-02-14/qtools-20230214-git.tgz"; - sha256 = "1w9v2swdqqalvlc36kbb1fbvqmwlndisp2dnqbkx8s8h67k1m4lx"; - system = "qtools-evaluator"; - asd = "qtools-evaluator"; - } - ); - systems = [ "qtools-evaluator" ]; - lispLibs = [ - (getAttr "cl-ppcre" self) - (getAttr "qtcore" self) - (getAttr "qtgui" self) - (getAttr "qtools" self) - (getAttr "trivial-gray-streams" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-game = ( - build-asdf-system { - pname = "qtools-game"; - version = "20230214-git"; - asds = [ "qtools-game" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools/2023-02-14/qtools-20230214-git.tgz"; - sha256 = "1w9v2swdqqalvlc36kbb1fbvqmwlndisp2dnqbkx8s8h67k1m4lx"; - system = "qtools-game"; - asd = "qtools-game"; - } - ); - systems = [ "qtools-game" ]; - lispLibs = [ - (getAttr "closer-mop" self) - (getAttr "qtcore" self) - (getAttr "qtgui" self) - (getAttr "qtools" self) - (getAttr "qtopengl" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-helloworld = ( - build-asdf-system { - pname = "qtools-helloworld"; - version = "20230214-git"; - asds = [ "qtools-helloworld" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools/2023-02-14/qtools-20230214-git.tgz"; - sha256 = "1w9v2swdqqalvlc36kbb1fbvqmwlndisp2dnqbkx8s8h67k1m4lx"; - system = "qtools-helloworld"; - asd = "qtools-helloworld"; - } - ); - systems = [ "qtools-helloworld" ]; - lispLibs = [ - (getAttr "qtcore" self) - (getAttr "qtgui" self) - (getAttr "qtools" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-melody = ( - build-asdf-system { - pname = "qtools-melody"; - version = "20230214-git"; - asds = [ "qtools-melody" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools/2023-02-14/qtools-20230214-git.tgz"; - sha256 = "1w9v2swdqqalvlc36kbb1fbvqmwlndisp2dnqbkx8s8h67k1m4lx"; - system = "qtools-melody"; - asd = "qtools-melody"; - } - ); - systems = [ "qtools-melody" ]; - lispLibs = [ - (getAttr "phonon" self) - (getAttr "qtcore" self) - (getAttr "qtgui" self) - (getAttr "qtools" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-opengl = ( - build-asdf-system { - pname = "qtools-opengl"; - version = "20230214-git"; - asds = [ "qtools-opengl" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools/2023-02-14/qtools-20230214-git.tgz"; - sha256 = "1w9v2swdqqalvlc36kbb1fbvqmwlndisp2dnqbkx8s8h67k1m4lx"; - system = "qtools-opengl"; - asd = "qtools-opengl"; - } - ); - systems = [ "qtools-opengl" ]; - lispLibs = [ - (getAttr "cl-opengl" self) - (getAttr "qtcore" self) - (getAttr "qtgui" self) - (getAttr "qtools" self) - (getAttr "qtopengl" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-titter = ( - build-asdf-system { - pname = "qtools-titter"; - version = "20230214-git"; - asds = [ "qtools-titter" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools/2023-02-14/qtools-20230214-git.tgz"; - sha256 = "1w9v2swdqqalvlc36kbb1fbvqmwlndisp2dnqbkx8s8h67k1m4lx"; - system = "qtools-titter"; - asd = "qtools-titter"; - } - ); - systems = [ "qtools-titter" ]; - lispLibs = [ - (getAttr "chirp" self) - (getAttr "qtcore" self) - (getAttr "qtgui" self) - (getAttr "qtools" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-ui = ( - build-asdf-system { - pname = "qtools-ui"; - version = "20200218-git"; - asds = [ "qtools-ui" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui"; - asd = "qtools-ui"; - } - ); - systems = [ "qtools-ui" ]; - lispLibs = [ - (getAttr "qtools-ui-auto-resizing-textedit" self) - (getAttr "qtools-ui-base" self) - (getAttr "qtools-ui-cell" self) - (getAttr "qtools-ui-color-history" self) - (getAttr "qtools-ui-color-picker" self) - (getAttr "qtools-ui-color-sliders" self) - (getAttr "qtools-ui-color-triangle" self) - (getAttr "qtools-ui-compass" self) - (getAttr "qtools-ui-container" self) - (getAttr "qtools-ui-debugger" self) - (getAttr "qtools-ui-dialog" self) - (getAttr "qtools-ui-dictionary" self) - (getAttr "qtools-ui-drag-and-drop" self) - (getAttr "qtools-ui-fixed-qtextedit" self) - (getAttr "qtools-ui-flow-layout" self) - (getAttr "qtools-ui-helpers" self) - (getAttr "qtools-ui-imagetools" self) - (getAttr "qtools-ui-keychord-editor" self) - (getAttr "qtools-ui-layout" self) - (getAttr "qtools-ui-listing" self) - (getAttr "qtools-ui-notification" self) - (getAttr "qtools-ui-options" self) - (getAttr "qtools-ui-panels" self) - (getAttr "qtools-ui-placeholder-text-edit" self) - (getAttr "qtools-ui-plot" self) - (getAttr "qtools-ui-repl" self) - (getAttr "qtools-ui-slider" self) - (getAttr "qtools-ui-spellchecked-text-edit" self) - (getAttr "qtools-ui-splitter" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-ui-auto-resizing-textedit = ( - build-asdf-system { - pname = "qtools-ui-auto-resizing-textedit"; - version = "20200218-git"; - asds = [ "qtools-ui-auto-resizing-textedit" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-auto-resizing-textedit"; - asd = "qtools-ui-auto-resizing-textedit"; - } - ); - systems = [ "qtools-ui-auto-resizing-textedit" ]; - lispLibs = [ - (getAttr "qtools-ui-base" self) - (getAttr "qtools-ui-fixed-qtextedit" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-ui-base = ( - build-asdf-system { - pname = "qtools-ui-base"; - version = "20200218-git"; - asds = [ "qtools-ui-base" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-base"; - asd = "qtools-ui-base"; - } - ); - systems = [ "qtools-ui-base" ]; - lispLibs = [ - (getAttr "array-utils" self) - (getAttr "documentation-utils" self) - (getAttr "qtcore" self) - (getAttr "qtgui" self) - (getAttr "qtools" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-ui-bytearray = ( - build-asdf-system { - pname = "qtools-ui-bytearray"; - version = "20200218-git"; - asds = [ "qtools-ui-bytearray" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-bytearray"; - asd = "qtools-ui-bytearray"; - } - ); - systems = [ "qtools-ui-bytearray" ]; - lispLibs = [ (getAttr "qtools-ui-base" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-ui-cell = ( - build-asdf-system { - pname = "qtools-ui-cell"; - version = "20200218-git"; - asds = [ "qtools-ui-cell" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-cell"; - asd = "qtools-ui-cell"; - } - ); - systems = [ "qtools-ui-cell" ]; - lispLibs = [ - (getAttr "qtools-ui-base" self) - (getAttr "qtools-ui-helpers" self) - (getAttr "qtools-ui-layout" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-ui-color-history = ( - build-asdf-system { - pname = "qtools-ui-color-history"; - version = "20200218-git"; - asds = [ "qtools-ui-color-history" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-color-history"; - asd = "qtools-ui-color-history"; - } - ); - systems = [ "qtools-ui-color-history" ]; - lispLibs = [ - (getAttr "qtools-ui-base" self) - (getAttr "qtools-ui-flow-layout" self) - (getAttr "qtools-ui-helpers" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-ui-color-picker = ( - build-asdf-system { - pname = "qtools-ui-color-picker"; - version = "20200218-git"; - asds = [ "qtools-ui-color-picker" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-color-picker"; - asd = "qtools-ui-color-picker"; - } - ); - systems = [ "qtools-ui-color-picker" ]; - lispLibs = [ - (getAttr "qtools-ui-base" self) - (getAttr "qtools-ui-color-history" self) - (getAttr "qtools-ui-color-sliders" self) - (getAttr "qtools-ui-color-triangle" self) - (getAttr "qtools-ui-dialog" self) - (getAttr "qtools-ui-helpers" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-ui-color-sliders = ( - build-asdf-system { - pname = "qtools-ui-color-sliders"; - version = "20200218-git"; - asds = [ "qtools-ui-color-sliders" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-color-sliders"; - asd = "qtools-ui-color-sliders"; - } - ); - systems = [ "qtools-ui-color-sliders" ]; - lispLibs = [ - (getAttr "qtools-ui-base" self) - (getAttr "qtools-ui-helpers" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-ui-color-triangle = ( - build-asdf-system { - pname = "qtools-ui-color-triangle"; - version = "20200218-git"; - asds = [ "qtools-ui-color-triangle" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-color-triangle"; - asd = "qtools-ui-color-triangle"; - } - ); - systems = [ "qtools-ui-color-triangle" ]; - lispLibs = [ - (getAttr "cl-opengl" self) - (getAttr "qtools-ui-base" self) - (getAttr "qtools-ui-helpers" self) - (getAttr "qtopengl" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-ui-compass = ( - build-asdf-system { - pname = "qtools-ui-compass"; - version = "20200218-git"; - asds = [ "qtools-ui-compass" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-compass"; - asd = "qtools-ui-compass"; - } - ); - systems = [ "qtools-ui-compass" ]; - lispLibs = [ - (getAttr "qtools-ui-base" self) - (getAttr "qtools-ui-layout" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-ui-container = ( - build-asdf-system { - pname = "qtools-ui-container"; - version = "20200218-git"; - asds = [ "qtools-ui-container" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-container"; - asd = "qtools-ui-container"; - } - ); - systems = [ "qtools-ui-container" ]; - lispLibs = [ - (getAttr "qtools-ui-base" self) - (getAttr "qtools-ui-layout" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-ui-debugger = ( - build-asdf-system { - pname = "qtools-ui-debugger"; - version = "20200218-git"; - asds = [ "qtools-ui-debugger" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-debugger"; - asd = "qtools-ui-debugger"; - } - ); - systems = [ "qtools-ui-debugger" ]; - lispLibs = [ - (getAttr "dissect" self) - (getAttr "qtools-ui-base" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-ui-dialog = ( - build-asdf-system { - pname = "qtools-ui-dialog"; - version = "20200218-git"; - asds = [ "qtools-ui-dialog" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-dialog"; - asd = "qtools-ui-dialog"; - } - ); - systems = [ "qtools-ui-dialog" ]; - lispLibs = [ - (getAttr "qtools-ui-base" self) - (getAttr "qtools-ui-helpers" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-ui-dictionary = ( - build-asdf-system { - pname = "qtools-ui-dictionary"; - version = "20200218-git"; - asds = [ "qtools-ui-dictionary" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-dictionary"; - asd = "qtools-ui-dictionary"; - } - ); - systems = [ "qtools-ui-dictionary" ]; - lispLibs = [ - (getAttr "qtools-ui-base" self) - (getAttr "qtools-ui-fixed-qtextedit" self) - (getAttr "qtools-ui-helpers" self) - (getAttr "wordnet" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-ui-drag-and-drop = ( - build-asdf-system { - pname = "qtools-ui-drag-and-drop"; - version = "20200218-git"; - asds = [ "qtools-ui-drag-and-drop" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-drag-and-drop"; - asd = "qtools-ui-drag-and-drop"; - } - ); - systems = [ "qtools-ui-drag-and-drop" ]; - lispLibs = [ - (getAttr "qtools-ui-base" self) - (getAttr "qtools-ui-helpers" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-ui-executable = ( - build-asdf-system { - pname = "qtools-ui-executable"; - version = "20200218-git"; - asds = [ "qtools-ui-executable" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-executable"; - asd = "qtools-ui-executable"; - } - ); - systems = [ "qtools-ui-executable" ]; - lispLibs = [ - (getAttr "bordeaux-threads" self) - (getAttr "qtools-ui-base" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-ui-fixed-qtextedit = ( - build-asdf-system { - pname = "qtools-ui-fixed-qtextedit"; - version = "20200218-git"; - asds = [ "qtools-ui-fixed-qtextedit" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-fixed-qtextedit"; - asd = "qtools-ui-fixed-qtextedit"; - } - ); - systems = [ "qtools-ui-fixed-qtextedit" ]; - lispLibs = [ (getAttr "qtools-ui-base" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-ui-flow-layout = ( - build-asdf-system { - pname = "qtools-ui-flow-layout"; - version = "20200218-git"; - asds = [ "qtools-ui-flow-layout" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-flow-layout"; - asd = "qtools-ui-flow-layout"; - } - ); - systems = [ "qtools-ui-flow-layout" ]; - lispLibs = [ - (getAttr "qtools-ui-base" self) - (getAttr "qtools-ui-container" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-ui-helpers = ( - build-asdf-system { - pname = "qtools-ui-helpers"; - version = "20200218-git"; - asds = [ "qtools-ui-helpers" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-helpers"; - asd = "qtools-ui-helpers"; - } - ); - systems = [ "qtools-ui-helpers" ]; - lispLibs = [ - (getAttr "qtools-ui-base" self) - (getAttr "qtools-ui-layout" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-ui-imagetools = ( - build-asdf-system { - pname = "qtools-ui-imagetools"; - version = "20200218-git"; - asds = [ "qtools-ui-imagetools" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-imagetools"; - asd = "qtools-ui-imagetools"; - } - ); - systems = [ "qtools-ui-imagetools" ]; - lispLibs = [ - (getAttr "qimageblitz" self) - (getAttr "qtools-ui-base" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-ui-keychord-editor = ( - build-asdf-system { - pname = "qtools-ui-keychord-editor"; - version = "20200218-git"; - asds = [ "qtools-ui-keychord-editor" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-keychord-editor"; - asd = "qtools-ui-keychord-editor"; - } - ); - systems = [ "qtools-ui-keychord-editor" ]; - lispLibs = [ (getAttr "qtools-ui-base" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-ui-layout = ( - build-asdf-system { - pname = "qtools-ui-layout"; - version = "20200218-git"; - asds = [ "qtools-ui-layout" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-layout"; - asd = "qtools-ui-layout"; - } - ); - systems = [ "qtools-ui-layout" ]; - lispLibs = [ (getAttr "qtools-ui-base" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-ui-listing = ( - build-asdf-system { - pname = "qtools-ui-listing"; - version = "20200218-git"; - asds = [ "qtools-ui-listing" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-listing"; - asd = "qtools-ui-listing"; - } - ); - systems = [ "qtools-ui-listing" ]; - lispLibs = [ - (getAttr "qtools-ui-base" self) - (getAttr "qtools-ui-cell" self) - (getAttr "qtools-ui-container" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-ui-notification = ( - build-asdf-system { - pname = "qtools-ui-notification"; - version = "20200218-git"; - asds = [ "qtools-ui-notification" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-notification"; - asd = "qtools-ui-notification"; - } - ); - systems = [ "qtools-ui-notification" ]; - lispLibs = [ (getAttr "qtools-ui-base" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-ui-options = ( - build-asdf-system { - pname = "qtools-ui-options"; - version = "20200218-git"; - asds = [ "qtools-ui-options" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-options"; - asd = "qtools-ui-options"; - } - ); - systems = [ "qtools-ui-options" ]; - lispLibs = [ - (getAttr "closer-mop" self) - (getAttr "qtools-ui-base" self) - (getAttr "qtools-ui-color-picker" self) - (getAttr "qtools-ui-color-triangle" self) - (getAttr "qtools-ui-helpers" self) - (getAttr "qtools-ui-listing" self) - (getAttr "qtools-ui-slider" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-ui-panels = ( - build-asdf-system { - pname = "qtools-ui-panels"; - version = "20200218-git"; - asds = [ "qtools-ui-panels" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-panels"; - asd = "qtools-ui-panels"; - } - ); - systems = [ "qtools-ui-panels" ]; - lispLibs = [ - (getAttr "qtools-ui-base" self) - (getAttr "qtools-ui-compass" self) - (getAttr "qtools-ui-helpers" self) - (getAttr "qtools-ui-splitter" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-ui-placeholder-text-edit = ( - build-asdf-system { - pname = "qtools-ui-placeholder-text-edit"; - version = "20200218-git"; - asds = [ "qtools-ui-placeholder-text-edit" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-placeholder-text-edit"; - asd = "qtools-ui-placeholder-text-edit"; - } - ); - systems = [ "qtools-ui-placeholder-text-edit" ]; - lispLibs = [ - (getAttr "qtools-ui-base" self) - (getAttr "qtools-ui-fixed-qtextedit" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-ui-plot = ( - build-asdf-system { - pname = "qtools-ui-plot"; - version = "20200218-git"; - asds = [ "qtools-ui-plot" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-plot"; - asd = "qtools-ui-plot"; - } - ); - systems = [ "qtools-ui-plot" ]; - lispLibs = [ - (getAttr "qtools-ui-base" self) - (getAttr "qtools-ui-helpers" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-ui-progress-bar = ( - build-asdf-system { - pname = "qtools-ui-progress-bar"; - version = "20200218-git"; - asds = [ "qtools-ui-progress-bar" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-progress-bar"; - asd = "qtools-ui-progress-bar"; - } - ); - systems = [ "qtools-ui-progress-bar" ]; - lispLibs = [ (getAttr "qtools-ui-base" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-ui-repl = ( - build-asdf-system { - pname = "qtools-ui-repl"; - version = "20200218-git"; - asds = [ "qtools-ui-repl" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-repl"; - asd = "qtools-ui-repl"; - } - ); - systems = [ "qtools-ui-repl" ]; - lispLibs = [ - (getAttr "bordeaux-threads" self) - (getAttr "qtools-ui-base" self) - (getAttr "trivial-gray-streams" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-ui-slider = ( - build-asdf-system { - pname = "qtools-ui-slider"; - version = "20200218-git"; - asds = [ "qtools-ui-slider" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-slider"; - asd = "qtools-ui-slider"; - } - ); - systems = [ "qtools-ui-slider" ]; - lispLibs = [ - (getAttr "qtools-ui-base" self) - (getAttr "qtools-ui-helpers" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-ui-spellchecked-text-edit = ( - build-asdf-system { - pname = "qtools-ui-spellchecked-text-edit"; - version = "20200218-git"; - asds = [ "qtools-ui-spellchecked-text-edit" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-spellchecked-text-edit"; - asd = "qtools-ui-spellchecked-text-edit"; - } - ); - systems = [ "qtools-ui-spellchecked-text-edit" ]; - lispLibs = [ - (getAttr "qtools-ui-base" self) - (getAttr "qtools-ui-fixed-qtextedit" self) - (getAttr "qtools-ui-helpers" self) - (getAttr "spell" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-ui-splitter = ( - build-asdf-system { - pname = "qtools-ui-splitter"; - version = "20200218-git"; - asds = [ "qtools-ui-splitter" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-splitter"; - asd = "qtools-ui-splitter"; - } - ); - systems = [ "qtools-ui-splitter" ]; - lispLibs = [ - (getAttr "qtools-ui-base" self) - (getAttr "qtools-ui-container" self) - (getAttr "qtools-ui-helpers" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - qtools-ui-svgtools = ( - build-asdf-system { - pname = "qtools-ui-svgtools"; - version = "20200218-git"; - asds = [ "qtools-ui-svgtools" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-svgtools"; - asd = "qtools-ui-svgtools"; - } - ); - systems = [ "qtools-ui-svgtools" ]; - lispLibs = [ - (getAttr "qtools-ui-base" self) - (getAttr "qtsvg" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); qtopengl = ( build-asdf-system { pname = "qtopengl"; @@ -86594,7 +86881,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "qtopengl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; system = "qtopengl"; asd = "qtopengl"; @@ -86619,7 +86906,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "qtscript" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; system = "qtscript"; asd = "qtscript"; @@ -86643,7 +86930,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "qtsql" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; system = "qtsql"; asd = "qtsql"; @@ -86668,7 +86955,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "qtsvg" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; system = "qtsvg"; asd = "qtsvg"; @@ -86693,7 +86980,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "qttest" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; system = "qttest"; asd = "qttest"; @@ -86718,7 +87005,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "qtuitools" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; system = "qtuitools"; asd = "qtuitools"; @@ -86743,7 +87030,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "qtwebkit" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; system = "qtwebkit"; asd = "qtwebkit"; @@ -86769,7 +87056,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "qtxml" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; system = "qtxml"; asd = "qtxml"; @@ -86793,7 +87080,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "qtxmlpatterns" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; system = "qtxmlpatterns"; asd = "qtxmlpatterns"; @@ -86818,7 +87105,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "quad-tree" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/quad-tree/2022-07-07/quad-tree-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/quad-tree/2022-07-07/quad-tree-20220707-git.tgz"; sha256 = "1pg43zw75dbqxs8vca3fynqfvza59v1fmwh9m4x0jrnw7ysgkl6j"; system = "quad-tree"; asd = "quad-tree"; @@ -86841,7 +87128,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "quadpack" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; system = "quadpack"; asd = "quadpack"; @@ -86861,7 +87148,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "quads" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; system = "quads"; asd = "quads"; @@ -86881,7 +87168,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "quadtree" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/quadtree/2015-07-09/quadtree-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/quadtree/2015-07-09/quadtree-20150709-git.tgz"; sha256 = "0590f0sbv4qg590d2bb7ypncg3wn5xjapi24w78mnzr9bdnhh4vx"; system = "quadtree"; asd = "quadtree"; @@ -86901,7 +87188,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "quadtree-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/quadtree/2015-07-09/quadtree-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/quadtree/2015-07-09/quadtree-20150709-git.tgz"; sha256 = "0590f0sbv4qg590d2bb7ypncg3wn5xjapi24w78mnzr9bdnhh4vx"; system = "quadtree-test"; asd = "quadtree-test"; @@ -86925,7 +87212,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "quantile-estimator" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/quantile-estimator.cl/2016-08-25/quantile-estimator.cl-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/quantile-estimator.cl/2016-08-25/quantile-estimator.cl-20160825-git.tgz"; sha256 = "1rrazbl0gbsymynlxp7ild6wvwp6csmdig4hwrp3wjvqhdl8j3mj"; system = "quantile-estimator"; asd = "quantile-estimator"; @@ -86945,7 +87232,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "quantile-estimator.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/quantile-estimator.cl/2016-08-25/quantile-estimator.cl-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/quantile-estimator.cl/2016-08-25/quantile-estimator.cl-20160825-git.tgz"; sha256 = "1rrazbl0gbsymynlxp7ild6wvwp6csmdig4hwrp3wjvqhdl8j3mj"; system = "quantile-estimator.test"; asd = "quantile-estimator.test"; @@ -86971,7 +87258,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "quasiquote-2.0" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/quasiquote-2.0/2015-05-05/quasiquote-2.0-20150505-git.tgz"; + url = "https://beta.quicklisp.org/archive/quasiquote-2.0/2015-05-05/quasiquote-2.0-20150505-git.tgz"; sha256 = "1g0s3aplrgmdjj8k1wrx3dkqdsl4lka2nmgdng0rcd93xp11q6hn"; system = "quasiquote-2.0"; asd = "quasiquote-2.0"; @@ -86989,7 +87276,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "quasiquote-2.0-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/quasiquote-2.0/2015-05-05/quasiquote-2.0-20150505-git.tgz"; + url = "https://beta.quicklisp.org/archive/quasiquote-2.0/2015-05-05/quasiquote-2.0-20150505-git.tgz"; sha256 = "1g0s3aplrgmdjj8k1wrx3dkqdsl4lka2nmgdng0rcd93xp11q6hn"; system = "quasiquote-2.0-tests"; asd = "quasiquote-2.0"; @@ -87008,12 +87295,12 @@ lib.makeScope pkgs.newScope (self: { quaviver = ( build-asdf-system { pname = "quaviver"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "quaviver" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/quaviver/2024-10-12/quaviver-20241012-git.tgz"; - sha256 = "17kixyznxfwlxkfl2d2ngxas3vi7r21bgfy4g7xlngvakxw3zfzp"; + url = "https://beta.quicklisp.org/archive/quaviver/2025-06-22/quaviver-20250622-git.tgz"; + sha256 = "1cghypzlpiprcw2napzvb4wjdykciqi7v4s70kqf4mk0mkbxymb2"; system = "quaviver"; asd = "quaviver"; } @@ -87035,7 +87322,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "queen" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/queen.lisp/2023-06-18/queen.lisp-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/queen.lisp/2023-06-18/queen.lisp-20230618-git.tgz"; sha256 = "14y4688f9gazdxh03k2jnxnla2bygcsz6wk55yc0id1achak95fa"; system = "queen"; asd = "queen"; @@ -87060,7 +87347,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "query-fs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/query-fs/2024-10-12/query-fs-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/query-fs/2024-10-12/query-fs-20241012-git.tgz"; sha256 = "09gz8xrjg9r5bclphgwjdnif8qx4qnx518jragq3znwvlzfb34fw"; system = "query-fs"; asd = "query-fs"; @@ -87086,7 +87373,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "query-repl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/query-repl/2022-03-31/query-repl-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/query-repl/2022-03-31/query-repl-20220331-git.tgz"; sha256 = "0gzrr1k7071hdmd64i5lqmg62i3yqim7nmcc9r94sry47bkp16v2"; system = "query-repl"; asd = "query-repl"; @@ -87109,7 +87396,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "query-repl.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/query-repl/2022-03-31/query-repl-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/query-repl/2022-03-31/query-repl-20220331-git.tgz"; sha256 = "0gzrr1k7071hdmd64i5lqmg62i3yqim7nmcc9r94sry47bkp16v2"; system = "query-repl.test"; asd = "query-repl.test"; @@ -87132,7 +87419,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "queues" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/queues/2017-01-24/queues-20170124-git.tgz"; + url = "https://beta.quicklisp.org/archive/queues/2017-01-24/queues-20170124-git.tgz"; sha256 = "0wdhfnzi4v6d97pggzj2aw55si94w4327br94jrmyvwf351wqjvv"; system = "queues"; asd = "queues"; @@ -87152,7 +87439,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "queues.priority-cqueue" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/queues/2017-01-24/queues-20170124-git.tgz"; + url = "https://beta.quicklisp.org/archive/queues/2017-01-24/queues-20170124-git.tgz"; sha256 = "0wdhfnzi4v6d97pggzj2aw55si94w4327br94jrmyvwf351wqjvv"; system = "queues.priority-cqueue"; asd = "queues.priority-cqueue"; @@ -87176,7 +87463,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "queues.priority-queue" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/queues/2017-01-24/queues-20170124-git.tgz"; + url = "https://beta.quicklisp.org/archive/queues/2017-01-24/queues-20170124-git.tgz"; sha256 = "0wdhfnzi4v6d97pggzj2aw55si94w4327br94jrmyvwf351wqjvv"; system = "queues.priority-queue"; asd = "queues.priority-queue"; @@ -87196,7 +87483,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "queues.simple-cqueue" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/queues/2017-01-24/queues-20170124-git.tgz"; + url = "https://beta.quicklisp.org/archive/queues/2017-01-24/queues-20170124-git.tgz"; sha256 = "0wdhfnzi4v6d97pggzj2aw55si94w4327br94jrmyvwf351wqjvv"; system = "queues.simple-cqueue"; asd = "queues.simple-cqueue"; @@ -87220,7 +87507,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "queues.simple-queue" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/queues/2017-01-24/queues-20170124-git.tgz"; + url = "https://beta.quicklisp.org/archive/queues/2017-01-24/queues-20170124-git.tgz"; sha256 = "0wdhfnzi4v6d97pggzj2aw55si94w4327br94jrmyvwf351wqjvv"; system = "queues.simple-queue"; asd = "queues.simple-queue"; @@ -87240,7 +87527,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "quick-patch" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/quick-patch/2024-10-12/quick-patch-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/quick-patch/2024-10-12/quick-patch-20241012-git.tgz"; sha256 = "0a2wkqn65kl88yz7a8728x9gjy4w37hjavfqx4hyijhs1ph38wdi"; system = "quick-patch"; asd = "quick-patch"; @@ -87260,7 +87547,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "quickapp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/quickapp/2016-08-25/quickapp-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/quickapp/2016-08-25/quickapp-20160825-git.tgz"; sha256 = "0rhhxwggbh9sf3c4c9fv39c5imy48416mwf0dkhqpnm8x55xbw22"; system = "quickapp"; asd = "quickapp"; @@ -87276,12 +87563,12 @@ lib.makeScope pkgs.newScope (self: { quickhull = ( build-asdf-system { pname = "quickhull"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "quickhull" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/quickhull/2024-10-12/quickhull-20241012-git.tgz"; - sha256 = "1814qq23dg2shnfdkw9w9ap53qzg2igy119bwslvflmcb1jd7bpm"; + url = "https://beta.quicklisp.org/archive/quickhull/2025-06-22/quickhull-20250622-git.tgz"; + sha256 = "1krlyqqsb6jqlx7byby8v0nadkg4aylbiz8jj0w3z9z3nqwp415p"; system = "quickhull"; asd = "quickhull"; } @@ -87303,7 +87590,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "quicklisp-slime-helper" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/quicklisp-slime-helper/2015-07-09/quicklisp-slime-helper-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/quicklisp-slime-helper/2015-07-09/quicklisp-slime-helper-20150709-git.tgz"; sha256 = "14b1zg26h75pnhj3ic0h9i5jbmwf8wjp91scbcg1ra9fyhh73pa6"; system = "quicklisp-slime-helper"; asd = "quicklisp-slime-helper"; @@ -87326,7 +87613,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "quicklisp-starter" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-brewer/2024-10-12/cl-brewer-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-brewer/2024-10-12/cl-brewer-20241012-git.tgz"; sha256 = "0izf6v4qx82jhk7ln28jhdmnr3lb0r5iqjj0by9igq5sk3y1my4x"; system = "quicklisp-starter"; asd = "quicklisp-starter"; @@ -87346,7 +87633,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "quicklisp-stats" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/quicklisp-stats/2021-04-11/quicklisp-stats-20210411-git.tgz"; + url = "https://beta.quicklisp.org/archive/quicklisp-stats/2021-04-11/quicklisp-stats-20210411-git.tgz"; sha256 = "0v8dgmlgd283n1g486q4sj2mghgdvgywg2nqp43nnrfc04mkvgc0"; system = "quicklisp-stats"; asd = "quicklisp-stats"; @@ -87370,7 +87657,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "quickproject" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/quickproject/2019-12-27/quickproject-1.4.1.tgz"; + url = "https://beta.quicklisp.org/archive/quickproject/2019-12-27/quickproject-1.4.1.tgz"; sha256 = "1szs8p2wr1yr9mjmj3h3557l6wxzzga0iszimb68z0hb1jj3lva6"; system = "quickproject"; asd = "quickproject"; @@ -87393,7 +87680,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "quicksearch" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/quicksearch/2017-10-19/quicksearch-20171019-git.tgz"; + url = "https://beta.quicklisp.org/archive/quicksearch/2017-10-19/quicksearch-20171019-git.tgz"; sha256 = "16k19zjkhh7r64vjq371k5jwjs7cdfjz83flh561n4h4v1z89fps"; system = "quicksearch"; asd = "quicksearch"; @@ -87424,7 +87711,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "quickutil" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/quickutil/2021-08-07/quickutil-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/quickutil/2021-08-07/quickutil-20210807-git.tgz"; sha256 = "0d4xrgsh5pj4cgj1mqsdyi4xvq04jyb2m4c3sdx94jsx3r83hldz"; system = "quickutil"; asd = "quickutil"; @@ -87444,7 +87731,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "quickutil-client" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/quickutil/2021-08-07/quickutil-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/quickutil/2021-08-07/quickutil-20210807-git.tgz"; sha256 = "0d4xrgsh5pj4cgj1mqsdyi4xvq04jyb2m4c3sdx94jsx3r83hldz"; system = "quickutil-client"; asd = "quickutil-client"; @@ -87468,7 +87755,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "quickutil-client-management" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/quickutil/2021-08-07/quickutil-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/quickutil/2021-08-07/quickutil-20210807-git.tgz"; sha256 = "0d4xrgsh5pj4cgj1mqsdyi4xvq04jyb2m4c3sdx94jsx3r83hldz"; system = "quickutil-client-management"; asd = "quickutil-client-management"; @@ -87488,7 +87775,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "quickutil-server" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/quickutil/2021-08-07/quickutil-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/quickutil/2021-08-07/quickutil-20210807-git.tgz"; sha256 = "0d4xrgsh5pj4cgj1mqsdyi4xvq04jyb2m4c3sdx94jsx3r83hldz"; system = "quickutil-server"; asd = "quickutil-server"; @@ -87527,7 +87814,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "quickutil-utilities" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/quickutil/2021-08-07/quickutil-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/quickutil/2021-08-07/quickutil-20210807-git.tgz"; sha256 = "0d4xrgsh5pj4cgj1mqsdyi4xvq04jyb2m4c3sdx94jsx3r83hldz"; system = "quickutil-utilities"; asd = "quickutil-utilities"; @@ -87547,7 +87834,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "quickutil-utilities-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/quickutil/2021-08-07/quickutil-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/quickutil/2021-08-07/quickutil-20210807-git.tgz"; sha256 = "0d4xrgsh5pj4cgj1mqsdyi4xvq04jyb2m4c3sdx94jsx3r83hldz"; system = "quickutil-utilities-test"; asd = "quickutil-utilities-test"; @@ -87566,12 +87853,12 @@ lib.makeScope pkgs.newScope (self: { quil-coalton = ( build-asdf-system { pname = "quil-coalton"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "quil-coalton" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/coalton/2024-10-12/coalton-20241012-git.tgz"; - sha256 = "19flzjxf3y6pxm09bmr8bmiqbgh4f7d5jjbgx2cb3dckmgvvg1d7"; + url = "https://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz"; + sha256 = "0g6gfp3y9smzssi3dbddwxvx7g4hq6wz98h253gs4i15pd2pf3qp"; system = "quil-coalton"; asd = "quil-coalton"; } @@ -87590,7 +87877,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "quine-mccluskey" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-logic/2014-12-17/cl-logic-20141217-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-logic/2014-12-17/cl-logic-20141217-git.tgz"; sha256 = "17n2wzqali3j6b7pqbydipwlxgwdrj4mdnsgwjdyz32n8jvfyjwh"; system = "quine-mccluskey"; asd = "cl-logic"; @@ -87610,7 +87897,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "quri" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/quri/2024-10-12/quri-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/quri/2024-10-12/quri-20241012-git.tgz"; sha256 = "0vismgg72xrflzdsrv8ybq3cxf717k5296g9b731974vwlf7ibh0"; system = "quri"; asd = "quri"; @@ -87634,7 +87921,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "quri-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/quri/2024-10-12/quri-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/quri/2024-10-12/quri-20241012-git.tgz"; sha256 = "0vismgg72xrflzdsrv8ybq3cxf717k5296g9b731974vwlf7ibh0"; system = "quri-test"; asd = "quri-test"; @@ -87658,7 +87945,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "quux-hunchentoot" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/quux-hunchentoot/2021-12-30/quux-hunchentoot-20211230-git.tgz"; + url = "https://beta.quicklisp.org/archive/quux-hunchentoot/2021-12-30/quux-hunchentoot-20211230-git.tgz"; sha256 = "0v0x4hzzfm835blqbp00vmj74gaq8wyldrnfj0x5s6zfl64w135y"; system = "quux-hunchentoot"; asd = "quux-hunchentoot"; @@ -87685,7 +87972,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "quux-time" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/quux-time/2015-04-07/quux-time-20150407-git.tgz"; + url = "https://beta.quicklisp.org/archive/quux-time/2015-04-07/quux-time-20150407-git.tgz"; sha256 = "0hsa2n1j0abhw8na9fql47rq1rxpf2vkwg2mbb1c3ax56r8dsh0v"; system = "quux-time"; asd = "quux-time"; @@ -87705,7 +87992,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "qwt" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; system = "qwt"; asd = "qwt"; @@ -87730,7 +88017,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rail" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-rail/2017-12-27/cl-rail-20171227-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-rail/2017-12-27/cl-rail-20171227-git.tgz"; sha256 = "0vxbxyfl5lw7na8iki1cjp0cd31z2bnxcpdv0x25hq0vch1cb5rj"; system = "rail"; asd = "rail"; @@ -87750,7 +88037,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rail-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-rail/2017-12-27/cl-rail-20171227-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-rail/2017-12-27/cl-rail-20171227-git.tgz"; sha256 = "0vxbxyfl5lw7na8iki1cjp0cd31z2bnxcpdv0x25hq0vch1cb5rj"; system = "rail-test"; asd = "rail"; @@ -87773,7 +88060,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "random" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/random/2019-10-07/random-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/random/2019-10-07/random-20191007-git.tgz"; sha256 = "1fb4mnp85jm9s667y4dgz07klhkr9pvi5xbxws28lbb8iip75y2p"; system = "random"; asd = "random"; @@ -87793,7 +88080,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "random-access-lists" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/random-access-lists/2012-02-08/random-access-lists-20120208-git.tgz"; + url = "https://beta.quicklisp.org/archive/random-access-lists/2012-02-08/random-access-lists-20120208-git.tgz"; sha256 = "0wslxxdmmr25hvmcyscph1bjlknm3nzh5g79cif22was1z411m5c"; system = "random-access-lists"; asd = "random-access-lists"; @@ -87813,7 +88100,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "random-sample" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/random-sample/2023-06-18/random-sample-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/random-sample/2023-06-18/random-sample-20230618-git.tgz"; sha256 = "13g5wgq6z3gx07qr3q17mgwfn2rsck5p1b9cfswajagl0m8z3f51"; system = "random-sample"; asd = "random-sample"; @@ -87834,12 +88121,12 @@ lib.makeScope pkgs.newScope (self: { random-sampling = ( build-asdf-system { pname = "random-sampling"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "random-sampling" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/random-sampling/2024-10-12/random-sampling-20241012-git.tgz"; - sha256 = "0c5cf7k37fh8h9dhcj9bfk9zx245i806wh7qkvh1g659kvl2gamj"; + url = "https://beta.quicklisp.org/archive/random-sampling/2025-06-22/random-sampling-20250622-git.tgz"; + sha256 = "1kj7ak0fsmmvayp3yqfnr0j0z7pkyrlnbgabkkckw7gcr0z0kbay"; system = "random-sampling"; asd = "random-sampling"; } @@ -87858,12 +88145,12 @@ lib.makeScope pkgs.newScope (self: { random-state = ( build-asdf-system { pname = "random-state"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "random-state" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/random-state/2024-10-12/random-state-20241012-git.tgz"; - sha256 = "1iwcrn2fqvsw651wk60nm6x5hlmlvj04v8xxfxmzhqmx5f081f1g"; + url = "https://beta.quicklisp.org/archive/random-state/2025-06-22/random-state-20250622-git.tgz"; + sha256 = "0bvb8hldhydmgf0vvjz10vwq8srkm0piglshzm260crvdq1nx4c0"; system = "random-state"; asd = "random-state"; } @@ -87875,53 +88162,6 @@ lib.makeScope pkgs.newScope (self: { }; } ); - random-state-test = ( - build-asdf-system { - pname = "random-state-test"; - version = "20241012-git"; - asds = [ "random-state-test" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/random-state/2024-10-12/random-state-20241012-git.tgz"; - sha256 = "1iwcrn2fqvsw651wk60nm6x5hlmlvj04v8xxfxmzhqmx5f081f1g"; - system = "random-state-test"; - asd = "random-state-test"; - } - ); - systems = [ "random-state-test" ]; - lispLibs = [ - (getAttr "parachute" self) - (getAttr "random-state" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - random-state-viewer = ( - build-asdf-system { - pname = "random-state-viewer"; - version = "20241012-git"; - asds = [ "random-state-viewer" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/random-state/2024-10-12/random-state-20241012-git.tgz"; - sha256 = "1iwcrn2fqvsw651wk60nm6x5hlmlvj04v8xxfxmzhqmx5f081f1g"; - system = "random-state-viewer"; - asd = "random-state-viewer"; - } - ); - systems = [ "random-state-viewer" ]; - lispLibs = [ - (getAttr "random-state" self) - (getAttr "trivial-features" self) - (getAttr "zpng" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); random-test = ( build-asdf-system { pname = "random-test"; @@ -87929,7 +88169,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "random-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/random/2019-10-07/random-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/random/2019-10-07/random-20191007-git.tgz"; sha256 = "1fb4mnp85jm9s667y4dgz07klhkr9pvi5xbxws28lbb8iip75y2p"; system = "random-test"; asd = "random-test"; @@ -87952,7 +88192,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "random-uuid" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/random-uuid/2022-07-07/random-uuid-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/random-uuid/2022-07-07/random-uuid-20220707-git.tgz"; sha256 = "09yfi16gh12qg4pi13gbr5n881q5zvw7acq27a6sbqbkny35a6wj"; system = "random-uuid"; asd = "random-uuid"; @@ -87975,7 +88215,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rate-monotonic" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rate-monotonic/2020-03-25/rate-monotonic-20200325-git.tgz"; + url = "https://beta.quicklisp.org/archive/rate-monotonic/2020-03-25/rate-monotonic-20200325-git.tgz"; sha256 = "0v9m704zy3834whldx2fbs8x92hp7hlrzdlcxm1rd17wqpv7pvrv"; system = "rate-monotonic"; asd = "rate-monotonic"; @@ -87998,7 +88238,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rate-monotonic.examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rate-monotonic/2020-03-25/rate-monotonic-20200325-git.tgz"; + url = "https://beta.quicklisp.org/archive/rate-monotonic/2020-03-25/rate-monotonic-20200325-git.tgz"; sha256 = "0v9m704zy3834whldx2fbs8x92hp7hlrzdlcxm1rd17wqpv7pvrv"; system = "rate-monotonic.examples"; asd = "rate-monotonic.examples"; @@ -88017,12 +88257,12 @@ lib.makeScope pkgs.newScope (self: { ratify = ( build-asdf-system { pname = "ratify"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "ratify" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ratify/2023-10-21/ratify-20231021-git.tgz"; - sha256 = "11fsamjjbc77kjhbsh0w9wkwbdq51paa07sxjb2brvcm0ji4hynf"; + url = "https://beta.quicklisp.org/archive/ratify/2025-06-22/ratify-20250622-git.tgz"; + sha256 = "0ja9rgx1n3zyyps4gxi8ws4r9vbqj5qj9bnmzwykfmsgy9wzi5d0"; system = "ratify"; asd = "ratify"; } @@ -88045,7 +88285,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ratmath" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ratmath/2020-02-18/ratmath-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/ratmath/2020-02-18/ratmath-20200218-git.tgz"; sha256 = "1p5rl1bam8qjsgscn7gwk2w55hdjawfgjikka59lwb6ia13v4rj9"; system = "ratmath"; asd = "ratmath"; @@ -88065,7 +88305,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rcl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rcl/2020-12-20/rcl-20201220-http.tgz"; + url = "https://beta.quicklisp.org/archive/rcl/2020-12-20/rcl-20201220-http.tgz"; sha256 = "1s6cvqs0s7fxh63zwc5zj7ryrffmv780rscm7aq3alzb9njwmg14"; system = "rcl"; asd = "rcl"; @@ -88092,7 +88332,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "re" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/re/2021-06-30/re-20210630-git.tgz"; + url = "https://beta.quicklisp.org/archive/re/2021-06-30/re-20210630-git.tgz"; sha256 = "15q4zvvzkxf1j0wxw0b1kz4d03js9cbgv82ndl8z6riz40kbffdp"; system = "re"; asd = "re"; @@ -88112,7 +88352,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "read-as-string" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/read-as-string/2022-07-07/read-as-string-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/read-as-string/2022-07-07/read-as-string-20220707-git.tgz"; sha256 = "08dnnqmbadsrbsqr4n1x7rf0p46j9al0hw6la0z3jclp604dd0k3"; system = "read-as-string"; asd = "read-as-string"; @@ -88135,7 +88375,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "read-as-string.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/read-as-string/2022-07-07/read-as-string-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/read-as-string/2022-07-07/read-as-string-20220707-git.tgz"; sha256 = "08dnnqmbadsrbsqr4n1x7rf0p46j9al0hw6la0z3jclp604dd0k3"; system = "read-as-string.test"; asd = "read-as-string.test"; @@ -88154,12 +88394,12 @@ lib.makeScope pkgs.newScope (self: { read-csv = ( build-asdf-system { pname = "read-csv"; - version = "20181018-git"; + version = "20250622-git"; asds = [ "read-csv" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/read-csv/2018-10-18/read-csv-20181018-git.tgz"; - sha256 = "1wr6n8z7jm611xf2jwp3pw03qzq76440cmb75495l5p907lmrbcs"; + url = "https://beta.quicklisp.org/archive/read-csv/2025-06-22/read-csv-20250622-git.tgz"; + sha256 = "01hj7wiawb4lyka3a7zka79dj0r44dsc28cbfh863dsjgmn6pkk0"; system = "read-csv"; asd = "read-csv"; } @@ -88171,44 +88411,21 @@ lib.makeScope pkgs.newScope (self: { }; } ); - read-csv_dot_test = ( - build-asdf-system { - pname = "read-csv.test"; - version = "20181018-git"; - asds = [ "read-csv.test" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/read-csv/2018-10-18/read-csv-20181018-git.tgz"; - sha256 = "1wr6n8z7jm611xf2jwp3pw03qzq76440cmb75495l5p907lmrbcs"; - system = "read-csv.test"; - asd = "read-csv"; - } - ); - systems = [ "read-csv.test" ]; - lispLibs = [ (getAttr "read-csv" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); read-number = ( build-asdf-system { pname = "read-number"; - version = "20230214-git"; + version = "20250622-git"; asds = [ "read-number" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/read-number/2023-02-14/read-number-20230214-git.tgz"; - sha256 = "1y2g2vbg9zccm9h8r7dabgb315z7jhr91d81wa2cccibpgccdyac"; + url = "https://beta.quicklisp.org/archive/read-number/2025-06-22/read-number-20250622-git.tgz"; + sha256 = "1k43sdcqzhlfcih7dm6ich0v3g33vrqg14ni2cgn73463m3r13bg"; system = "read-number"; asd = "read-number"; } ); systems = [ "read-number" ]; - lispLibs = [ - (getAttr "alexandria" self) - (getAttr "lisp-unit" self) - ]; + lispLibs = [ (getAttr "alexandria" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -88221,7 +88438,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "reader" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reader/2020-12-20/reader-v0.10.0.tgz"; + url = "https://beta.quicklisp.org/archive/reader/2020-12-20/reader-v0.10.0.tgz"; sha256 = "0pbv6w0d8d4qmfkdsz2rk21bp1las9r7pyvpmd95qjz7kpxrirl7"; system = "reader"; asd = "reader"; @@ -88248,7 +88465,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "reader+swank" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reader/2020-12-20/reader-v0.10.0.tgz"; + url = "https://beta.quicklisp.org/archive/reader/2020-12-20/reader-v0.10.0.tgz"; sha256 = "0pbv6w0d8d4qmfkdsz2rk21bp1las9r7pyvpmd95qjz7kpxrirl7"; system = "reader+swank"; asd = "reader+swank"; @@ -88271,7 +88488,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "reader-interception" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reader-interception/2015-06-08/reader-interception-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/reader-interception/2015-06-08/reader-interception-20150608-git.tgz"; sha256 = "1f6xblayqb9q01qclvqx2gllqxm0qk8rmlp38rz433vgjxbq79y0"; system = "reader-interception"; asd = "reader-interception"; @@ -88291,7 +88508,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "reader-interception-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reader-interception/2015-06-08/reader-interception-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/reader-interception/2015-06-08/reader-interception-20150608-git.tgz"; sha256 = "1f6xblayqb9q01qclvqx2gllqxm0qk8rmlp38rz433vgjxbq79y0"; system = "reader-interception-test"; asd = "reader-interception-test"; @@ -88311,12 +88528,12 @@ lib.makeScope pkgs.newScope (self: { reblocks = ( build-asdf-system { pname = "reblocks"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks/2024-10-12/reblocks-20241012-git.tgz"; - sha256 = "0s8npy7bh013qhm6ngvi7ar117ja2m098nr4krnzlcg2ivxdff3i"; + url = "https://beta.quicklisp.org/archive/reblocks/2025-06-22/reblocks-20250622-git.tgz"; + sha256 = "1c5vr60010jshxf6kq1pvjqhlspky1djm39sz7sl9hyqh9jrvqdh"; system = "reblocks"; asd = "reblocks"; } @@ -88324,6 +88541,7 @@ lib.makeScope pkgs.newScope (self: { systems = [ "reblocks" ]; lispLibs = [ (getAttr "_40ants-doc" self) + (getAttr "_40ants-routes" self) (getAttr "alexandria" self) (getAttr "anaphora" self) (getAttr "babel" self) @@ -88335,14 +88553,12 @@ lib.makeScope pkgs.newScope (self: { (getAttr "clack" self) (getAttr "closer-mop" self) (getAttr "dexador" self) - (getAttr "f-underscore" self) (getAttr "find-port" self) (getAttr "ironclad" self) (getAttr "jonathan" self) (getAttr "lack" self) (getAttr "lack-middleware-session" self) (getAttr "lack-request" self) - (getAttr "lack-response" self) (getAttr "lack-util" self) (getAttr "local-time" self) (getAttr "log4cl" self) @@ -88361,7 +88577,6 @@ lib.makeScope pkgs.newScope (self: { (getAttr "str" self) (getAttr "trivial-garbage" self) (getAttr "trivial-open-browser" self) - (getAttr "trivial-timeout" self) (getAttr "uuid" self) (getAttr "yason" self) ]; @@ -88373,12 +88588,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-auth = ( build-asdf-system { pname = "reblocks-auth"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-auth" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-auth/2024-10-12/reblocks-auth-20241012-git.tgz"; - sha256 = "1qydbk61a5xb2a61gj8mal0bmanhzynky1rh6lzwa10r5ybls4dq"; + url = "https://beta.quicklisp.org/archive/reblocks-auth/2025-06-22/reblocks-auth-20250622-git.tgz"; + sha256 = "11yzl40a542hk5q35ign9f3agjx1g6z8a56s2sgqrymmavin2hvk"; system = "reblocks-auth"; asd = "reblocks-auth"; } @@ -88411,12 +88626,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-auth-ci = ( build-asdf-system { pname = "reblocks-auth-ci"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-auth-ci" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-auth/2024-10-12/reblocks-auth-20241012-git.tgz"; - sha256 = "1qydbk61a5xb2a61gj8mal0bmanhzynky1rh6lzwa10r5ybls4dq"; + url = "https://beta.quicklisp.org/archive/reblocks-auth/2025-06-22/reblocks-auth-20250622-git.tgz"; + sha256 = "11yzl40a542hk5q35ign9f3agjx1g6z8a56s2sgqrymmavin2hvk"; system = "reblocks-auth-ci"; asd = "reblocks-auth-ci"; } @@ -88431,12 +88646,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-auth-example = ( build-asdf-system { pname = "reblocks-auth-example"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-auth-example" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-auth/2024-10-12/reblocks-auth-20241012-git.tgz"; - sha256 = "1qydbk61a5xb2a61gj8mal0bmanhzynky1rh6lzwa10r5ybls4dq"; + url = "https://beta.quicklisp.org/archive/reblocks-auth/2025-06-22/reblocks-auth-20250622-git.tgz"; + sha256 = "11yzl40a542hk5q35ign9f3agjx1g6z8a56s2sgqrymmavin2hvk"; system = "reblocks-auth-example"; asd = "reblocks-auth-example"; } @@ -88467,12 +88682,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-auth-tests = ( build-asdf-system { pname = "reblocks-auth-tests"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-auth-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-auth/2024-10-12/reblocks-auth-20241012-git.tgz"; - sha256 = "1qydbk61a5xb2a61gj8mal0bmanhzynky1rh6lzwa10r5ybls4dq"; + url = "https://beta.quicklisp.org/archive/reblocks-auth/2025-06-22/reblocks-auth-20250622-git.tgz"; + sha256 = "11yzl40a542hk5q35ign9f3agjx1g6z8a56s2sgqrymmavin2hvk"; system = "reblocks-auth-tests"; asd = "reblocks-auth-tests"; } @@ -88487,12 +88702,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-docs = ( build-asdf-system { pname = "reblocks-docs"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-docs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks/2024-10-12/reblocks-20241012-git.tgz"; - sha256 = "0s8npy7bh013qhm6ngvi7ar117ja2m098nr4krnzlcg2ivxdff3i"; + url = "https://beta.quicklisp.org/archive/reblocks/2025-06-22/reblocks-20250622-git.tgz"; + sha256 = "1c5vr60010jshxf6kq1pvjqhlspky1djm39sz7sl9hyqh9jrvqdh"; system = "reblocks-docs"; asd = "reblocks-docs"; } @@ -88507,12 +88722,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-file-server = ( build-asdf-system { pname = "reblocks-file-server"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-file-server" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-file-server/2024-10-12/reblocks-file-server-20241012-git.tgz"; - sha256 = "1v17v0474k845l0s0bgly3zbgq2rjn5fyh8zmjnisszgkdd3bh13"; + url = "https://beta.quicklisp.org/archive/reblocks-file-server/2025-06-22/reblocks-file-server-20250622-git.tgz"; + sha256 = "0lxmqw6hrdx977jjp20yfcnwvlzv1y1lha0h20vd8af19a9gcj35"; system = "reblocks-file-server"; asd = "reblocks-file-server"; } @@ -88520,11 +88735,17 @@ lib.makeScope pkgs.newScope (self: { systems = [ "reblocks-file-server" ]; lispLibs = [ (getAttr "_40ants-asdf-system" self) + (getAttr "_40ants-routes" self) + (getAttr "alexandria" self) (getAttr "cl-fad" self) (getAttr "cl-ppcre" self) + (getAttr "local-time" self) (getAttr "log4cl" self) (getAttr "reblocks" self) + (getAttr "reblocks-ui2" self) (getAttr "routes" self) + (getAttr "serapeum" self) + (getAttr "str" self) (getAttr "trivial-mimes" self) ]; meta = { @@ -88535,12 +88756,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-file-server-ci = ( build-asdf-system { pname = "reblocks-file-server-ci"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-file-server-ci" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-file-server/2024-10-12/reblocks-file-server-20241012-git.tgz"; - sha256 = "1v17v0474k845l0s0bgly3zbgq2rjn5fyh8zmjnisszgkdd3bh13"; + url = "https://beta.quicklisp.org/archive/reblocks-file-server/2025-06-22/reblocks-file-server-20250622-git.tgz"; + sha256 = "0lxmqw6hrdx977jjp20yfcnwvlzv1y1lha0h20vd8af19a9gcj35"; system = "reblocks-file-server-ci"; asd = "reblocks-file-server-ci"; } @@ -88555,12 +88776,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-file-server-docs = ( build-asdf-system { pname = "reblocks-file-server-docs"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-file-server-docs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-file-server/2024-10-12/reblocks-file-server-20241012-git.tgz"; - sha256 = "1v17v0474k845l0s0bgly3zbgq2rjn5fyh8zmjnisszgkdd3bh13"; + url = "https://beta.quicklisp.org/archive/reblocks-file-server/2025-06-22/reblocks-file-server-20250622-git.tgz"; + sha256 = "0lxmqw6hrdx977jjp20yfcnwvlzv1y1lha0h20vd8af19a9gcj35"; system = "reblocks-file-server-docs"; asd = "reblocks-file-server-docs"; } @@ -88581,12 +88802,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-file-server-tests = ( build-asdf-system { pname = "reblocks-file-server-tests"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-file-server-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-file-server/2024-10-12/reblocks-file-server-20241012-git.tgz"; - sha256 = "1v17v0474k845l0s0bgly3zbgq2rjn5fyh8zmjnisszgkdd3bh13"; + url = "https://beta.quicklisp.org/archive/reblocks-file-server/2025-06-22/reblocks-file-server-20250622-git.tgz"; + sha256 = "0lxmqw6hrdx977jjp20yfcnwvlzv1y1lha0h20vd8af19a9gcj35"; system = "reblocks-file-server-tests"; asd = "reblocks-file-server-tests"; } @@ -88601,12 +88822,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-lass = ( build-asdf-system { pname = "reblocks-lass"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-lass" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-lass/2024-10-12/reblocks-lass-20241012-git.tgz"; - sha256 = "0aic2dnsp4hkc26fpnn0p493psz1fip9rfhbacfwaaqyxdgrh9cl"; + url = "https://beta.quicklisp.org/archive/reblocks-lass/2025-06-22/reblocks-lass-20250622-git.tgz"; + sha256 = "0hjqfqfwcgfk77xm3wdynxskd6zirhk6yccdk2ni2gm81yqwdnh1"; system = "reblocks-lass"; asd = "reblocks-lass"; } @@ -88625,12 +88846,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-lass-ci = ( build-asdf-system { pname = "reblocks-lass-ci"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-lass-ci" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-lass/2024-10-12/reblocks-lass-20241012-git.tgz"; - sha256 = "0aic2dnsp4hkc26fpnn0p493psz1fip9rfhbacfwaaqyxdgrh9cl"; + url = "https://beta.quicklisp.org/archive/reblocks-lass/2025-06-22/reblocks-lass-20250622-git.tgz"; + sha256 = "0hjqfqfwcgfk77xm3wdynxskd6zirhk6yccdk2ni2gm81yqwdnh1"; system = "reblocks-lass-ci"; asd = "reblocks-lass-ci"; } @@ -88645,12 +88866,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-lass-docs = ( build-asdf-system { pname = "reblocks-lass-docs"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-lass-docs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-lass/2024-10-12/reblocks-lass-20241012-git.tgz"; - sha256 = "0aic2dnsp4hkc26fpnn0p493psz1fip9rfhbacfwaaqyxdgrh9cl"; + url = "https://beta.quicklisp.org/archive/reblocks-lass/2025-06-22/reblocks-lass-20250622-git.tgz"; + sha256 = "0hjqfqfwcgfk77xm3wdynxskd6zirhk6yccdk2ni2gm81yqwdnh1"; system = "reblocks-lass-docs"; asd = "reblocks-lass-docs"; } @@ -88671,12 +88892,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-lass-tests = ( build-asdf-system { pname = "reblocks-lass-tests"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-lass-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-lass/2024-10-12/reblocks-lass-20241012-git.tgz"; - sha256 = "0aic2dnsp4hkc26fpnn0p493psz1fip9rfhbacfwaaqyxdgrh9cl"; + url = "https://beta.quicklisp.org/archive/reblocks-lass/2025-06-22/reblocks-lass-20250622-git.tgz"; + sha256 = "0hjqfqfwcgfk77xm3wdynxskd6zirhk6yccdk2ni2gm81yqwdnh1"; system = "reblocks-lass-tests"; asd = "reblocks-lass-tests"; } @@ -88691,12 +88912,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-navigation-widget = ( build-asdf-system { pname = "reblocks-navigation-widget"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-navigation-widget" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-navigation-widget/2024-10-12/reblocks-navigation-widget-20241012-git.tgz"; - sha256 = "0gwfzlf8054g3iizbkbbzkxfmr8xlcvgcqycx7crlgzc8qksrqhm"; + url = "https://beta.quicklisp.org/archive/reblocks-navigation-widget/2025-06-22/reblocks-navigation-widget-20250622-git.tgz"; + sha256 = "0lbzm61cxc9j58alv01blqx1zaqzbmknjn6qf4l4ily52rk8aqmh"; system = "reblocks-navigation-widget"; asd = "reblocks-navigation-widget"; } @@ -88704,6 +88925,8 @@ lib.makeScope pkgs.newScope (self: { systems = [ "reblocks-navigation-widget" ]; lispLibs = [ (getAttr "_40ants-asdf-system" self) + (getAttr "alexandria" self) + (getAttr "cl-ppcre" self) (getAttr "log4cl" self) (getAttr "reblocks" self) (getAttr "str" self) @@ -88716,12 +88939,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-navigation-widget-ci = ( build-asdf-system { pname = "reblocks-navigation-widget-ci"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-navigation-widget-ci" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-navigation-widget/2024-10-12/reblocks-navigation-widget-20241012-git.tgz"; - sha256 = "0gwfzlf8054g3iizbkbbzkxfmr8xlcvgcqycx7crlgzc8qksrqhm"; + url = "https://beta.quicklisp.org/archive/reblocks-navigation-widget/2025-06-22/reblocks-navigation-widget-20250622-git.tgz"; + sha256 = "0lbzm61cxc9j58alv01blqx1zaqzbmknjn6qf4l4ily52rk8aqmh"; system = "reblocks-navigation-widget-ci"; asd = "reblocks-navigation-widget-ci"; } @@ -88733,41 +88956,15 @@ lib.makeScope pkgs.newScope (self: { }; } ); - reblocks-navigation-widget-docs = ( - build-asdf-system { - pname = "reblocks-navigation-widget-docs"; - version = "20241012-git"; - asds = [ "reblocks-navigation-widget-docs" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-navigation-widget/2024-10-12/reblocks-navigation-widget-20241012-git.tgz"; - sha256 = "0gwfzlf8054g3iizbkbbzkxfmr8xlcvgcqycx7crlgzc8qksrqhm"; - system = "reblocks-navigation-widget-docs"; - asd = "reblocks-navigation-widget-docs"; - } - ); - systems = [ "reblocks-navigation-widget-docs" ]; - lispLibs = [ - (getAttr "_40ants-doc" self) - (getAttr "docs-config" self) - (getAttr "named-readtables" self) - (getAttr "pythonic-string-reader" self) - (getAttr "reblocks-navigation-widget" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); reblocks-navigation-widget-tests = ( build-asdf-system { pname = "reblocks-navigation-widget-tests"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-navigation-widget-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-navigation-widget/2024-10-12/reblocks-navigation-widget-20241012-git.tgz"; - sha256 = "0gwfzlf8054g3iizbkbbzkxfmr8xlcvgcqycx7crlgzc8qksrqhm"; + url = "https://beta.quicklisp.org/archive/reblocks-navigation-widget/2025-06-22/reblocks-navigation-widget-20250622-git.tgz"; + sha256 = "0lbzm61cxc9j58alv01blqx1zaqzbmknjn6qf4l4ily52rk8aqmh"; system = "reblocks-navigation-widget-tests"; asd = "reblocks-navigation-widget-tests"; } @@ -88782,12 +88979,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-parenscript = ( build-asdf-system { pname = "reblocks-parenscript"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-parenscript" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-parenscript/2024-10-12/reblocks-parenscript-20241012-git.tgz"; - sha256 = "0c29y7k6kczzcz1fgsk0iyf93qsx4nmw3iir807zicya8dkvvpk6"; + url = "https://beta.quicklisp.org/archive/reblocks-parenscript/2025-06-22/reblocks-parenscript-20250622-git.tgz"; + sha256 = "10hxgz63dk02arkl9jvz2svk22iirvrw8v42yb5sf09871d7vph2"; system = "reblocks-parenscript"; asd = "reblocks-parenscript"; } @@ -88808,12 +89005,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-parenscript-ci = ( build-asdf-system { pname = "reblocks-parenscript-ci"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-parenscript-ci" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-parenscript/2024-10-12/reblocks-parenscript-20241012-git.tgz"; - sha256 = "0c29y7k6kczzcz1fgsk0iyf93qsx4nmw3iir807zicya8dkvvpk6"; + url = "https://beta.quicklisp.org/archive/reblocks-parenscript/2025-06-22/reblocks-parenscript-20250622-git.tgz"; + sha256 = "10hxgz63dk02arkl9jvz2svk22iirvrw8v42yb5sf09871d7vph2"; system = "reblocks-parenscript-ci"; asd = "reblocks-parenscript-ci"; } @@ -88828,12 +89025,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-parenscript-docs = ( build-asdf-system { pname = "reblocks-parenscript-docs"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-parenscript-docs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-parenscript/2024-10-12/reblocks-parenscript-20241012-git.tgz"; - sha256 = "0c29y7k6kczzcz1fgsk0iyf93qsx4nmw3iir807zicya8dkvvpk6"; + url = "https://beta.quicklisp.org/archive/reblocks-parenscript/2025-06-22/reblocks-parenscript-20250622-git.tgz"; + sha256 = "10hxgz63dk02arkl9jvz2svk22iirvrw8v42yb5sf09871d7vph2"; system = "reblocks-parenscript-docs"; asd = "reblocks-parenscript-docs"; } @@ -88854,12 +89051,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-parenscript-tests = ( build-asdf-system { pname = "reblocks-parenscript-tests"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-parenscript-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-parenscript/2024-10-12/reblocks-parenscript-20241012-git.tgz"; - sha256 = "0c29y7k6kczzcz1fgsk0iyf93qsx4nmw3iir807zicya8dkvvpk6"; + url = "https://beta.quicklisp.org/archive/reblocks-parenscript/2025-06-22/reblocks-parenscript-20250622-git.tgz"; + sha256 = "10hxgz63dk02arkl9jvz2svk22iirvrw8v42yb5sf09871d7vph2"; system = "reblocks-parenscript-tests"; asd = "reblocks-parenscript-tests"; } @@ -88874,12 +89071,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-prometheus = ( build-asdf-system { pname = "reblocks-prometheus"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-prometheus" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-prometheus/2024-10-12/reblocks-prometheus-20241012-git.tgz"; - sha256 = "0bjzwk28csfdvnic2znil6cxk8fmh5p49n971q5pjs0dmwdzmwra"; + url = "https://beta.quicklisp.org/archive/reblocks-prometheus/2025-06-22/reblocks-prometheus-20250622-git.tgz"; + sha256 = "1jlncbw2krsdiwqmsj2l2cmnpq3qnj38717qnkw5mlwbiwcmjmy8"; system = "reblocks-prometheus"; asd = "reblocks-prometheus"; } @@ -88887,8 +89084,8 @@ lib.makeScope pkgs.newScope (self: { systems = [ "reblocks-prometheus" ]; lispLibs = [ (getAttr "_40ants-asdf-system" self) + (getAttr "_40ants-routes" self) (getAttr "cffi-grovel" self) - (getAttr "log4cl-extras" self) (getAttr "prometheus" self) (getAttr "prometheus-gc" self) (getAttr "prometheus_dot_collectors_dot_process" self) @@ -88904,12 +89101,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-prometheus-ci = ( build-asdf-system { pname = "reblocks-prometheus-ci"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-prometheus-ci" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-prometheus/2024-10-12/reblocks-prometheus-20241012-git.tgz"; - sha256 = "0bjzwk28csfdvnic2znil6cxk8fmh5p49n971q5pjs0dmwdzmwra"; + url = "https://beta.quicklisp.org/archive/reblocks-prometheus/2025-06-22/reblocks-prometheus-20250622-git.tgz"; + sha256 = "1jlncbw2krsdiwqmsj2l2cmnpq3qnj38717qnkw5mlwbiwcmjmy8"; system = "reblocks-prometheus-ci"; asd = "reblocks-prometheus-ci"; } @@ -88924,12 +89121,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-prometheus-docs = ( build-asdf-system { pname = "reblocks-prometheus-docs"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-prometheus-docs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-prometheus/2024-10-12/reblocks-prometheus-20241012-git.tgz"; - sha256 = "0bjzwk28csfdvnic2znil6cxk8fmh5p49n971q5pjs0dmwdzmwra"; + url = "https://beta.quicklisp.org/archive/reblocks-prometheus/2025-06-22/reblocks-prometheus-20250622-git.tgz"; + sha256 = "1jlncbw2krsdiwqmsj2l2cmnpq3qnj38717qnkw5mlwbiwcmjmy8"; system = "reblocks-prometheus-docs"; asd = "reblocks-prometheus-docs"; } @@ -88950,12 +89147,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-prometheus-tests = ( build-asdf-system { pname = "reblocks-prometheus-tests"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-prometheus-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-prometheus/2024-10-12/reblocks-prometheus-20241012-git.tgz"; - sha256 = "0bjzwk28csfdvnic2znil6cxk8fmh5p49n971q5pjs0dmwdzmwra"; + url = "https://beta.quicklisp.org/archive/reblocks-prometheus/2025-06-22/reblocks-prometheus-20250622-git.tgz"; + sha256 = "1jlncbw2krsdiwqmsj2l2cmnpq3qnj38717qnkw5mlwbiwcmjmy8"; system = "reblocks-prometheus-tests"; asd = "reblocks-prometheus-tests"; } @@ -88970,18 +89167,19 @@ lib.makeScope pkgs.newScope (self: { reblocks-tests = ( build-asdf-system { pname = "reblocks-tests"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks/2024-10-12/reblocks-20241012-git.tgz"; - sha256 = "0s8npy7bh013qhm6ngvi7ar117ja2m098nr4krnzlcg2ivxdff3i"; + url = "https://beta.quicklisp.org/archive/reblocks/2025-06-22/reblocks-20250622-git.tgz"; + sha256 = "1c5vr60010jshxf6kq1pvjqhlspky1djm39sz7sl9hyqh9jrvqdh"; system = "reblocks-tests"; asd = "reblocks-tests"; } ); systems = [ "reblocks-tests" ]; lispLibs = [ + (getAttr "_40ants-routes" self) (getAttr "alexandria" self) (getAttr "cl-mock" self) (getAttr "cl-ppcre" self) @@ -89002,12 +89200,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-typeahead = ( build-asdf-system { pname = "reblocks-typeahead"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-typeahead" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-typeahead/2024-10-12/reblocks-typeahead-20241012-git.tgz"; - sha256 = "150msgfsagpcpbgfva3hgnw3jhd3rg13g0ham9ns0lhf1lb3777m"; + url = "https://beta.quicklisp.org/archive/reblocks-typeahead/2025-06-22/reblocks-typeahead-20250622-git.tgz"; + sha256 = "177na6pmq25ksc4ir7mq42k56zphdf52n8ahy4s4cqvnvb34kir3"; system = "reblocks-typeahead"; asd = "reblocks-typeahead"; } @@ -89029,12 +89227,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-typeahead-ci = ( build-asdf-system { pname = "reblocks-typeahead-ci"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-typeahead-ci" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-typeahead/2024-10-12/reblocks-typeahead-20241012-git.tgz"; - sha256 = "150msgfsagpcpbgfva3hgnw3jhd3rg13g0ham9ns0lhf1lb3777m"; + url = "https://beta.quicklisp.org/archive/reblocks-typeahead/2025-06-22/reblocks-typeahead-20250622-git.tgz"; + sha256 = "177na6pmq25ksc4ir7mq42k56zphdf52n8ahy4s4cqvnvb34kir3"; system = "reblocks-typeahead-ci"; asd = "reblocks-typeahead-ci"; } @@ -89049,12 +89247,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-typeahead-docs = ( build-asdf-system { pname = "reblocks-typeahead-docs"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-typeahead-docs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-typeahead/2024-10-12/reblocks-typeahead-20241012-git.tgz"; - sha256 = "150msgfsagpcpbgfva3hgnw3jhd3rg13g0ham9ns0lhf1lb3777m"; + url = "https://beta.quicklisp.org/archive/reblocks-typeahead/2025-06-22/reblocks-typeahead-20250622-git.tgz"; + sha256 = "177na6pmq25ksc4ir7mq42k56zphdf52n8ahy4s4cqvnvb34kir3"; system = "reblocks-typeahead-docs"; asd = "reblocks-typeahead-docs"; } @@ -89075,12 +89273,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-typeahead-example = ( build-asdf-system { pname = "reblocks-typeahead-example"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-typeahead-example" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-typeahead/2024-10-12/reblocks-typeahead-20241012-git.tgz"; - sha256 = "150msgfsagpcpbgfva3hgnw3jhd3rg13g0ham9ns0lhf1lb3777m"; + url = "https://beta.quicklisp.org/archive/reblocks-typeahead/2025-06-22/reblocks-typeahead-20250622-git.tgz"; + sha256 = "177na6pmq25ksc4ir7mq42k56zphdf52n8ahy4s4cqvnvb34kir3"; system = "reblocks-typeahead-example"; asd = "reblocks-typeahead-example"; } @@ -89112,12 +89310,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-typeahead-tests = ( build-asdf-system { pname = "reblocks-typeahead-tests"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-typeahead-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-typeahead/2024-10-12/reblocks-typeahead-20241012-git.tgz"; - sha256 = "150msgfsagpcpbgfva3hgnw3jhd3rg13g0ham9ns0lhf1lb3777m"; + url = "https://beta.quicklisp.org/archive/reblocks-typeahead/2025-06-22/reblocks-typeahead-20250622-git.tgz"; + sha256 = "177na6pmq25ksc4ir7mq42k56zphdf52n8ahy4s4cqvnvb34kir3"; system = "reblocks-typeahead-tests"; asd = "reblocks-typeahead-tests"; } @@ -89132,12 +89330,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-ui = ( build-asdf-system { pname = "reblocks-ui"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-ui" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-ui/2024-10-12/reblocks-ui-20241012-git.tgz"; - sha256 = "1iwq62ba0rsiqw34d681nzg88wzps1f3d1ahl99crrk9xpy1c3y5"; + url = "https://beta.quicklisp.org/archive/reblocks-ui/2025-06-22/reblocks-ui-20250622-git.tgz"; + sha256 = "1540m5w5f0giph9sc4yzv8x5206pp26lai1x3h5z7ai2dadx3zw2"; system = "reblocks-ui"; asd = "reblocks-ui"; } @@ -89162,12 +89360,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-ui-docs = ( build-asdf-system { pname = "reblocks-ui-docs"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-ui-docs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-ui/2024-10-12/reblocks-ui-20241012-git.tgz"; - sha256 = "1iwq62ba0rsiqw34d681nzg88wzps1f3d1ahl99crrk9xpy1c3y5"; + url = "https://beta.quicklisp.org/archive/reblocks-ui/2025-06-22/reblocks-ui-20250622-git.tgz"; + sha256 = "1540m5w5f0giph9sc4yzv8x5206pp26lai1x3h5z7ai2dadx3zw2"; system = "reblocks-ui-docs"; asd = "reblocks-ui-docs"; } @@ -89186,12 +89384,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-ui-examples = ( build-asdf-system { pname = "reblocks-ui-examples"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-ui-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-ui/2024-10-12/reblocks-ui-20241012-git.tgz"; - sha256 = "1iwq62ba0rsiqw34d681nzg88wzps1f3d1ahl99crrk9xpy1c3y5"; + url = "https://beta.quicklisp.org/archive/reblocks-ui/2025-06-22/reblocks-ui-20250622-git.tgz"; + sha256 = "1540m5w5f0giph9sc4yzv8x5206pp26lai1x3h5z7ai2dadx3zw2"; system = "reblocks-ui-examples"; asd = "reblocks-ui-examples"; } @@ -89207,15 +89405,165 @@ lib.makeScope pkgs.newScope (self: { }; } ); + reblocks-ui2 = ( + build-asdf-system { + pname = "reblocks-ui2"; + version = "20250622-git"; + asds = [ "reblocks-ui2" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/reblocks-ui2/2025-06-22/reblocks-ui2-20250622-git.tgz"; + sha256 = "1kf0kravh79b5jibz9q1843cbzwlqh2mdlw9kbcnwxnw5r3dcmh9"; + system = "reblocks-ui2"; + asd = "reblocks-ui2"; + } + ); + systems = [ "reblocks-ui2" ]; + lispLibs = [ + (getAttr "_40ants-asdf-system" self) + (getAttr "alexandria" self) + (getAttr "anaphora" self) + (getAttr "closer-mop" self) + (getAttr "moptilities" self) + (getAttr "named-readtables" self) + (getAttr "parenscript" self) + (getAttr "pythonic-string-reader" self) + (getAttr "reblocks" self) + (getAttr "reblocks-lass" self) + (getAttr "serapeum" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + reblocks-ui2-ci = ( + build-asdf-system { + pname = "reblocks-ui2-ci"; + version = "20250622-git"; + asds = [ "reblocks-ui2-ci" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/reblocks-ui2/2025-06-22/reblocks-ui2-20250622-git.tgz"; + sha256 = "1kf0kravh79b5jibz9q1843cbzwlqh2mdlw9kbcnwxnw5r3dcmh9"; + system = "reblocks-ui2-ci"; + asd = "reblocks-ui2-ci"; + } + ); + systems = [ "reblocks-ui2-ci" ]; + lispLibs = [ (getAttr "_40ants-ci" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + reblocks-ui2-demo = ( + build-asdf-system { + pname = "reblocks-ui2-demo"; + version = "20250622-git"; + asds = [ "reblocks-ui2-demo" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/reblocks-ui2/2025-06-22/reblocks-ui2-20250622-git.tgz"; + sha256 = "1kf0kravh79b5jibz9q1843cbzwlqh2mdlw9kbcnwxnw5r3dcmh9"; + system = "reblocks-ui2-demo"; + asd = "reblocks-ui2-demo"; + } + ); + systems = [ "reblocks-ui2-demo" ]; + lispLibs = [ + (getAttr "_40ants-asdf-system" self) + (getAttr "_40ants-logging" self) + (getAttr "_40ants-routes" self) + (getAttr "_40ants-slynk" self) + (getAttr "alexandria" self) + (getAttr "reblocks" self) + (getAttr "reblocks-file-server" self) + (getAttr "reblocks-prometheus" self) + (getAttr "reblocks-ui2-tailwind" self) + (getAttr "serapeum" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + reblocks-ui2-docs = ( + build-asdf-system { + pname = "reblocks-ui2-docs"; + version = "20250622-git"; + asds = [ "reblocks-ui2-docs" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/reblocks-ui2/2025-06-22/reblocks-ui2-20250622-git.tgz"; + sha256 = "1kf0kravh79b5jibz9q1843cbzwlqh2mdlw9kbcnwxnw5r3dcmh9"; + system = "reblocks-ui2-docs"; + asd = "reblocks-ui2-docs"; + } + ); + systems = [ "reblocks-ui2-docs" ]; + lispLibs = [ + (getAttr "_40ants-doc" self) + (getAttr "docs-config" self) + (getAttr "named-readtables" self) + (getAttr "pythonic-string-reader" self) + (getAttr "reblocks-ui2" self) + (getAttr "reblocks-ui2-tailwind" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + reblocks-ui2-tailwind = ( + build-asdf-system { + pname = "reblocks-ui2-tailwind"; + version = "20250622-git"; + asds = [ "reblocks-ui2-tailwind" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/reblocks-ui2/2025-06-22/reblocks-ui2-20250622-git.tgz"; + sha256 = "1kf0kravh79b5jibz9q1843cbzwlqh2mdlw9kbcnwxnw5r3dcmh9"; + system = "reblocks-ui2-tailwind"; + asd = "reblocks-ui2-tailwind"; + } + ); + systems = [ "reblocks-ui2-tailwind" ]; + lispLibs = [ (getAttr "_40ants-asdf-system" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + reblocks-ui2-tests = ( + build-asdf-system { + pname = "reblocks-ui2-tests"; + version = "20250622-git"; + asds = [ "reblocks-ui2-tests" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/reblocks-ui2/2025-06-22/reblocks-ui2-20250622-git.tgz"; + sha256 = "1kf0kravh79b5jibz9q1843cbzwlqh2mdlw9kbcnwxnw5r3dcmh9"; + system = "reblocks-ui2-tests"; + asd = "reblocks-ui2-tests"; + } + ); + systems = [ "reblocks-ui2-tests" ]; + lispLibs = [ (getAttr "rove" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); reblocks-websocket = ( build-asdf-system { pname = "reblocks-websocket"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-websocket" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-websocket/2024-10-12/reblocks-websocket-20241012-git.tgz"; - sha256 = "0zn14if637cfadz93cgyk79hqrjyzddwc483gl10386rj9nvcf6b"; + url = "https://beta.quicklisp.org/archive/reblocks-websocket/2025-06-22/reblocks-websocket-20250622-git.tgz"; + sha256 = "129mvzm1z6d5ffn21cqrm82yx2i6n5dc2n5sm5a51rf7f24lgcv6"; system = "reblocks-websocket"; asd = "reblocks-websocket"; } @@ -89241,12 +89589,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-websocket-ci = ( build-asdf-system { pname = "reblocks-websocket-ci"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-websocket-ci" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-websocket/2024-10-12/reblocks-websocket-20241012-git.tgz"; - sha256 = "0zn14if637cfadz93cgyk79hqrjyzddwc483gl10386rj9nvcf6b"; + url = "https://beta.quicklisp.org/archive/reblocks-websocket/2025-06-22/reblocks-websocket-20250622-git.tgz"; + sha256 = "129mvzm1z6d5ffn21cqrm82yx2i6n5dc2n5sm5a51rf7f24lgcv6"; system = "reblocks-websocket-ci"; asd = "reblocks-websocket-ci"; } @@ -89261,12 +89609,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-websocket-docs = ( build-asdf-system { pname = "reblocks-websocket-docs"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-websocket-docs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-websocket/2024-10-12/reblocks-websocket-20241012-git.tgz"; - sha256 = "0zn14if637cfadz93cgyk79hqrjyzddwc483gl10386rj9nvcf6b"; + url = "https://beta.quicklisp.org/archive/reblocks-websocket/2025-06-22/reblocks-websocket-20250622-git.tgz"; + sha256 = "129mvzm1z6d5ffn21cqrm82yx2i6n5dc2n5sm5a51rf7f24lgcv6"; system = "reblocks-websocket-docs"; asd = "reblocks-websocket-docs"; } @@ -89287,12 +89635,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-websocket-tests = ( build-asdf-system { pname = "reblocks-websocket-tests"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "reblocks-websocket-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-websocket/2024-10-12/reblocks-websocket-20241012-git.tgz"; - sha256 = "0zn14if637cfadz93cgyk79hqrjyzddwc483gl10386rj9nvcf6b"; + url = "https://beta.quicklisp.org/archive/reblocks-websocket/2025-06-22/reblocks-websocket-20250622-git.tgz"; + sha256 = "129mvzm1z6d5ffn21cqrm82yx2i6n5dc2n5sm5a51rf7f24lgcv6"; system = "reblocks-websocket-tests"; asd = "reblocks-websocket-tests"; } @@ -89311,7 +89659,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rectangle-packing" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rectangle-packing/2013-06-15/rectangle-packing-20130615-git.tgz"; + url = "https://beta.quicklisp.org/archive/rectangle-packing/2013-06-15/rectangle-packing-20130615-git.tgz"; sha256 = "1m31qbgkrgbp753mr012hpzjfddwmfzvazaadp3s6wd34vmbbv01"; system = "rectangle-packing"; asd = "rectangle-packing"; @@ -89331,7 +89679,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "recur" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/recur/2023-06-18/recur-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/recur/2023-06-18/recur-20230618-git.tgz"; sha256 = "1wlw378h3k4ganw49kk5zrhx3w692yfdb4zaiciwqzviwz52c7gc"; system = "recur"; asd = "recur"; @@ -89351,7 +89699,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "recursive-regex" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/recursive-regex/2012-04-07/recursive-regex-20120407-git.tgz"; + url = "https://beta.quicklisp.org/archive/recursive-regex/2012-04-07/recursive-regex-20120407-git.tgz"; sha256 = "1alsfqfa85dwms7i3xrbp6ahlqk9a3sl8d4llxy1ydb0rlb09l4r"; system = "recursive-regex"; asd = "recursive-regex"; @@ -89378,7 +89726,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "recursive-regex-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/recursive-regex/2012-04-07/recursive-regex-20120407-git.tgz"; + url = "https://beta.quicklisp.org/archive/recursive-regex/2012-04-07/recursive-regex-20120407-git.tgz"; sha256 = "1alsfqfa85dwms7i3xrbp6ahlqk9a3sl8d4llxy1ydb0rlb09l4r"; system = "recursive-regex-test"; asd = "recursive-regex"; @@ -89401,7 +89749,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "recursive-restart" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/recursive-restart/2016-10-31/recursive-restart-20161031-git.tgz"; + url = "https://beta.quicklisp.org/archive/recursive-restart/2016-10-31/recursive-restart-20161031-git.tgz"; sha256 = "0lgw95bnzw99avrb7vcg02fbw3y5mazfgnkim8gsazfjliaj21m7"; system = "recursive-restart"; asd = "recursive-restart"; @@ -89421,7 +89769,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "red-black-tree" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/red-black-tree/2022-07-07/red-black-tree-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/red-black-tree/2022-07-07/red-black-tree-20220707-git.tgz"; sha256 = "0dbl6y4l7k30a13d6rfdfby6p27li5b17nvz7xgyajxl9q5zz5kk"; system = "red-black-tree"; asd = "red-black-tree"; @@ -89437,12 +89785,12 @@ lib.makeScope pkgs.newScope (self: { redirect-stream = ( build-asdf-system { pname = "redirect-stream"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "redirect-stream" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/redirect-stream/2023-10-21/redirect-stream-20231021-git.tgz"; - sha256 = "1x8m2jk02dmsc2y8kq5h1bkdl51qz3ldg58hdzj6dpyi6ciykj28"; + url = "https://beta.quicklisp.org/archive/redirect-stream/2025-06-22/redirect-stream-20250622-git.tgz"; + sha256 = "1pg84dvfd0vnrc12zj6r7vpdkbqznsddk2a7qfqcdm8mjb5xf0ak"; system = "redirect-stream"; asd = "redirect-stream"; } @@ -89461,7 +89809,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "regex" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/regex/2012-09-09/regex-20120909-git.tgz"; + url = "https://beta.quicklisp.org/archive/regex/2012-09-09/regex-20120909-git.tgz"; sha256 = "0wq5wlafrxv13wg28hg5b10sc48b88swsvznpy2zg7x37m4nmm6a"; system = "regex"; asd = "regex"; @@ -89481,7 +89829,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "remote-js" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/remote-js/2019-07-10/remote-js-20190710-git.tgz"; + url = "https://beta.quicklisp.org/archive/remote-js/2019-07-10/remote-js-20190710-git.tgz"; sha256 = "1z8apvfng8i7x4dsnz9da4y2l9mr7jykm19lmq3070qra7r3lby6"; system = "remote-js"; asd = "remote-js"; @@ -89505,7 +89853,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "remote-js-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/remote-js/2019-07-10/remote-js-20190710-git.tgz"; + url = "https://beta.quicklisp.org/archive/remote-js/2019-07-10/remote-js-20190710-git.tgz"; sha256 = "1z8apvfng8i7x4dsnz9da4y2l9mr7jykm19lmq3070qra7r3lby6"; system = "remote-js-test"; asd = "remote-js-test"; @@ -89530,7 +89878,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "repl-utilities" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/repl-utilities/2021-02-28/repl-utilities-20210228-git.tgz"; + url = "https://beta.quicklisp.org/archive/repl-utilities/2021-02-28/repl-utilities-20210228-git.tgz"; sha256 = "1hh56pq5nw3l4b83dzlyss69f06r038byj2cnjwvci4hfjhdfcc3"; system = "repl-utilities"; asd = "repl-utilities"; @@ -89550,7 +89898,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "replic" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/replic/2023-02-14/replic-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/replic/2023-02-14/replic-20230214-git.tgz"; sha256 = "1jq0ysgpkcsw2fbxjy0v9kqvfnrdwzvrzc1a7fykihds548z3slf"; system = "replic"; asd = "replic"; @@ -89577,7 +89925,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "replic-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/replic/2023-02-14/replic-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/replic/2023-02-14/replic-20230214-git.tgz"; sha256 = "1jq0ysgpkcsw2fbxjy0v9kqvfnrdwzvrzc1a7fykihds548z3slf"; system = "replic-test"; asd = "replic-test"; @@ -89601,7 +89949,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "research" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; + url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; system = "research"; asd = "research"; @@ -89631,7 +89979,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "resignal-bind" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/resignal-bind/2021-10-20/resignal-bind-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/resignal-bind/2021-10-20/resignal-bind-20211020-git.tgz"; sha256 = "109b5bf2h3yqax87r16dsbnb0xdd9kqi0zdisy0wja1h622yrxhc"; system = "resignal-bind"; asd = "resignal-bind"; @@ -89654,7 +90002,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "resignal-bind.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/resignal-bind/2021-10-20/resignal-bind-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/resignal-bind/2021-10-20/resignal-bind-20211020-git.tgz"; sha256 = "109b5bf2h3yqax87r16dsbnb0xdd9kqi0zdisy0wja1h622yrxhc"; system = "resignal-bind.test"; asd = "resignal-bind.test"; @@ -89677,7 +90025,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "restas" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/restas/2019-10-08/restas-20191008-git.tgz"; + url = "https://beta.quicklisp.org/archive/restas/2019-10-08/restas-20191008-git.tgz"; sha256 = "00ng6jik1lwjw3bbxhijy8s0ml24lgm73liwrr01gcsb0r6wrjjn"; system = "restas"; asd = "restas"; @@ -89704,7 +90052,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "restas-directory-publisher" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/restas-directory-publisher/2013-01-28/restas-directory-publisher-20130128-git.tgz"; + url = "https://beta.quicklisp.org/archive/restas-directory-publisher/2013-01-28/restas-directory-publisher-20130128-git.tgz"; sha256 = "1ra4bxsg9v507zrqjx78ak3797clagl6n62d3bx0aghrnkal1gmp"; system = "restas-directory-publisher"; asd = "restas-directory-publisher"; @@ -89728,7 +90076,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "restas-doc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/restas/2019-10-08/restas-20191008-git.tgz"; + url = "https://beta.quicklisp.org/archive/restas/2019-10-08/restas-20191008-git.tgz"; sha256 = "00ng6jik1lwjw3bbxhijy8s0ml24lgm73liwrr01gcsb0r6wrjjn"; system = "restas-doc"; asd = "restas-doc"; @@ -89752,7 +90100,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "restas.file-publisher" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/restas.file-publisher/2012-01-07/restas.file-publisher-20120107-git.tgz"; + url = "https://beta.quicklisp.org/archive/restas.file-publisher/2012-01-07/restas.file-publisher-20120107-git.tgz"; sha256 = "12h291as21ziqb1l6p2p4hy429z6zznacp1gn0m2vah7f811q75l"; system = "restas.file-publisher"; asd = "restas.file-publisher"; @@ -89775,7 +90123,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "restful" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/restful/2015-06-08/restful-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/restful/2015-06-08/restful-20150608-git.tgz"; sha256 = "1imcpd9zm1dbb1675pf3g3d6w9vyxk07g7r33174qdw470j8ml5n"; system = "restful"; asd = "restful"; @@ -89801,7 +90149,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "restful-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/restful/2015-06-08/restful-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/restful/2015-06-08/restful-20150608-git.tgz"; sha256 = "1imcpd9zm1dbb1675pf3g3d6w9vyxk07g7r33174qdw470j8ml5n"; system = "restful-test"; asd = "restful-test"; @@ -89826,7 +90174,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "restricted-functions" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/restricted-functions/2019-05-21/restricted-functions-20190521-git.tgz"; + url = "https://beta.quicklisp.org/archive/restricted-functions/2019-05-21/restricted-functions-20190521-git.tgz"; sha256 = "092k7bp6n8kppf2wdqf1kf1h8lrww6k1dcxp05dby779b8c6kfz4"; system = "restricted-functions"; asd = "restricted-functions"; @@ -89853,7 +90201,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "retrospectiff" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/retrospectiff/2021-12-09/retrospectiff-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/retrospectiff/2021-12-09/retrospectiff-20211209-git.tgz"; sha256 = "1vfcbfzhkm2wkxnjg7y6gg93wlib9cqpbdbhyqcm5kc7170ci3vz"; system = "retrospectiff"; asd = "retrospectiff"; @@ -89880,7 +90228,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "reversi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/reversi/2020-10-16/reversi-20201016-git.tgz"; + url = "https://beta.quicklisp.org/archive/reversi/2020-10-16/reversi-20201016-git.tgz"; sha256 = "1vwjk207hvn5skazmkrcifkv4ia9nm5312rj0fr3w5423dr56swx"; system = "reversi"; asd = "reversi"; @@ -89900,7 +90248,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rfc2109" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rfc2109/2015-12-18/rfc2109-20151218-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/rfc2109/2015-12-18/rfc2109-20151218-darcs.tgz"; sha256 = "1y767qjv5jxyfqzp0zpw96yz95mb8hhpjj9dn2i6b92r0z2vr42d"; system = "rfc2109"; asd = "rfc2109"; @@ -89920,7 +90268,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rfc2388" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rfc2388/2018-08-31/rfc2388-20180831-git.tgz"; + url = "https://beta.quicklisp.org/archive/rfc2388/2018-08-31/rfc2388-20180831-git.tgz"; sha256 = "0phh5n3clhl9ji8jaxrajidn22d3f0aq87mlbfkkxlnx2pnw694k"; system = "rfc2388"; asd = "rfc2388"; @@ -89938,7 +90286,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rfc2388-binary" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rfc2388-binary/2017-01-24/rfc2388-binary-20170124-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/rfc2388-binary/2017-01-24/rfc2388-binary-20170124-darcs.tgz"; sha256 = "1ddjhd9vqramg93963d4py9a2hqpy1fr1ly517r3bpjx7a5mffwk"; system = "rfc2388-binary"; asd = "rfc2388-binary"; @@ -89958,7 +90306,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rlc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rlc/2015-09-23/rlc-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/rlc/2015-09-23/rlc-20150923-git.tgz"; sha256 = "1c37as5x45yizs76s7115a0w3fgas80bjb8xzq7yylpmxq44s2rk"; system = "rlc"; asd = "rlc"; @@ -89978,7 +90326,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "roan" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/roan/2020-12-20/roan-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/roan/2020-12-20/roan-20201220-git.tgz"; sha256 = "032znprz03x4apzssb5vzs55cfdfyvca56bcrwxwm9dgkh3cnh7z"; system = "roan"; asd = "roan"; @@ -90008,12 +90356,12 @@ lib.makeScope pkgs.newScope (self: { robot = ( build-asdf-system { pname = "robot"; - version = "master-fe503896-git"; + version = "master-5a621564-git"; asds = [ "robot" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz"; - sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10"; + url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; + sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; system = "robot"; asd = "robot"; } @@ -90032,7 +90380,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rock" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rock/2015-06-08/rock-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/rock/2015-06-08/rock-20150608-git.tgz"; sha256 = "1ckvxswinv25vzwmyrr6k7m9cx99kl04b4543mlxad9688np91y8"; system = "rock"; asd = "rock"; @@ -90057,7 +90405,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rock-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rock/2015-06-08/rock-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/rock/2015-06-08/rock-20150608-git.tgz"; sha256 = "1ckvxswinv25vzwmyrr6k7m9cx99kl04b4543mlxad9688np91y8"; system = "rock-test"; asd = "rock-test"; @@ -90080,7 +90428,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rock-web" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rock/2015-06-08/rock-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/rock/2015-06-08/rock-20150608-git.tgz"; sha256 = "1ckvxswinv25vzwmyrr6k7m9cx99kl04b4543mlxad9688np91y8"; system = "rock-web"; asd = "rock-web"; @@ -90107,7 +90455,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "romreader" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/romreader/2014-07-13/romreader-20140713-git.tgz"; + url = "https://beta.quicklisp.org/archive/romreader/2014-07-13/romreader-20140713-git.tgz"; sha256 = "1k3fnh48vy5wdbqif4hmflmxc3xnihyi1222cldcjvxl294yk6xx"; system = "romreader"; asd = "romreader"; @@ -90127,7 +90475,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "routes" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-routes/2017-01-24/cl-routes-20170124-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-routes/2017-01-24/cl-routes-20170124-git.tgz"; sha256 = "1zpk3cp2v8hm50ppjl10yxr437vv4552r8hylvizglzrq2ibsbr1"; system = "routes"; asd = "routes"; @@ -90151,7 +90499,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "routes-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-routes/2017-01-24/cl-routes-20170124-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-routes/2017-01-24/cl-routes-20170124-git.tgz"; sha256 = "1zpk3cp2v8hm50ppjl10yxr437vv4552r8hylvizglzrq2ibsbr1"; system = "routes-test"; asd = "routes"; @@ -90170,12 +90518,12 @@ lib.makeScope pkgs.newScope (self: { rove = ( build-asdf-system { pname = "rove"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "rove" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rove/2024-10-12/rove-20241012-git.tgz"; - sha256 = "1cx55d8frlk8rzdwbf1698rsvy34gx0ws2ix257qsh7gxy2mld05"; + url = "https://beta.quicklisp.org/archive/rove/2025-06-22/rove-20250622-git.tgz"; + sha256 = "082fz6gbifx0m255blxqvfdd5i930618i5ix3g5ar250abfdqabn"; system = "rove"; asd = "rove"; } @@ -90193,12 +90541,12 @@ lib.makeScope pkgs.newScope (self: { rovers-problem-translator = ( build-asdf-system { pname = "rovers-problem-translator"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "rovers-problem-translator" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/shop3/2024-10-12/shop3-20241012-git.tgz"; - sha256 = "1sdyyyd82fqmm9lcqmg7k8yy3l3891m2gjwidibzvk95bp4xf9sd"; + url = "https://beta.quicklisp.org/archive/shop3/2025-06-22/shop3-20250622-git.tgz"; + sha256 = "0vznjrg51bh261bh39d2cj5jifl7mlryksdb7rrcymqq0k6zc0pn"; system = "rovers-problem-translator"; asd = "rovers-problem-translator"; } @@ -90221,7 +90569,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rpcq" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rpcq/2022-07-07/rpcq-v3.10.0.tgz"; + url = "https://beta.quicklisp.org/archive/rpcq/2022-07-07/rpcq-v3.10.0.tgz"; sha256 = "1bvppxlacvp0pfdbpn7ls1zxd127jacl225ds7lph5s8f8cyvf17"; system = "rpcq"; asd = "rpcq"; @@ -90254,7 +90602,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rpcq-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rpcq/2022-07-07/rpcq-v3.10.0.tgz"; + url = "https://beta.quicklisp.org/archive/rpcq/2022-07-07/rpcq-v3.10.0.tgz"; sha256 = "1bvppxlacvp0pfdbpn7ls1zxd127jacl225ds7lph5s8f8cyvf17"; system = "rpcq-tests"; asd = "rpcq-tests"; @@ -90279,7 +90627,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rpm" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rpm/2016-04-21/rpm-20160421-git.tgz"; + url = "https://beta.quicklisp.org/archive/rpm/2016-04-21/rpm-20160421-git.tgz"; sha256 = "0qn4vw3pvjm0maksl57mwikcmv7calzlblp5s01ixrn3nrgxmd9k"; system = "rpm"; asd = "rpm"; @@ -90304,7 +90652,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rs-colors" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz"; sha256 = "06akjly9s4pfix39yca8n3dpazbby09wc8cj0fsfvkg61lvacic5"; system = "rs-colors"; asd = "rs-colors"; @@ -90330,7 +90678,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rs-colors-html" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz"; sha256 = "06akjly9s4pfix39yca8n3dpazbby09wc8cj0fsfvkg61lvacic5"; system = "rs-colors-html"; asd = "rs-colors-html"; @@ -90350,7 +90698,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rs-colors-internal" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz"; sha256 = "06akjly9s4pfix39yca8n3dpazbby09wc8cj0fsfvkg61lvacic5"; system = "rs-colors-internal"; asd = "rs-colors-internal"; @@ -90370,7 +90718,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rs-colors-material-io" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz"; sha256 = "06akjly9s4pfix39yca8n3dpazbby09wc8cj0fsfvkg61lvacic5"; system = "rs-colors-material-io"; asd = "rs-colors-material-io"; @@ -90390,7 +90738,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rs-colors-ral" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz"; sha256 = "06akjly9s4pfix39yca8n3dpazbby09wc8cj0fsfvkg61lvacic5"; system = "rs-colors-ral"; asd = "rs-colors-ral"; @@ -90410,7 +90758,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rs-colors-ral-design" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz"; sha256 = "06akjly9s4pfix39yca8n3dpazbby09wc8cj0fsfvkg61lvacic5"; system = "rs-colors-ral-design"; asd = "rs-colors-ral-design"; @@ -90430,7 +90778,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rs-colors-svg" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz"; sha256 = "06akjly9s4pfix39yca8n3dpazbby09wc8cj0fsfvkg61lvacic5"; system = "rs-colors-svg"; asd = "rs-colors-svg"; @@ -90450,7 +90798,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rs-colors-tango" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz"; sha256 = "06akjly9s4pfix39yca8n3dpazbby09wc8cj0fsfvkg61lvacic5"; system = "rs-colors-tango"; asd = "rs-colors-tango"; @@ -90470,7 +90818,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rs-colors-x11" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz"; sha256 = "06akjly9s4pfix39yca8n3dpazbby09wc8cj0fsfvkg61lvacic5"; system = "rs-colors-x11"; asd = "rs-colors-x11"; @@ -90490,7 +90838,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rs-dlx" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rs-dlx/2024-10-12/rs-dlx-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/rs-dlx/2024-10-12/rs-dlx-20241012-git.tgz"; sha256 = "003ykkh61hg5q9lxjckqp8njhpgg21j9008gcsw60hnxdipmanaf"; system = "rs-dlx"; asd = "rs-dlx"; @@ -90513,7 +90861,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rs-json" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rs-json/2023-06-18/rs-json-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/rs-json/2023-06-18/rs-json-20230618-git.tgz"; sha256 = "0y71as0sg5vfijpzdhv6pj6yv064ldn2shx0y4da8kvaqv949dnq"; system = "rs-json"; asd = "rs-json"; @@ -90537,7 +90885,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rss" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-rss/2020-10-16/cl-rss-20201016-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-rss/2020-10-16/cl-rss-20201016-git.tgz"; sha256 = "0wv3j13fj73gigriw5r9vi920hz05ld7zllsvbxdxvmyfy9k1kly"; system = "rss"; asd = "rss"; @@ -90561,7 +90909,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rt" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rt/2010-10-06/rt-20101006-git.tgz"; + url = "https://beta.quicklisp.org/archive/rt/2010-10-06/rt-20101006-git.tgz"; sha256 = "13si2rrxaagbr0bkvg6sqicxxpyshabx6ad6byc9n2ik5ysna69b"; system = "rt"; asd = "rt"; @@ -90579,7 +90927,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rt-events" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rt-events/2016-03-18/rt-events-20160318-git.tgz"; + url = "https://beta.quicklisp.org/archive/rt-events/2016-03-18/rt-events-20160318-git.tgz"; sha256 = "17wqhczsi4mq00fp5hfc38b9ijdiaqjh7cvxhy714qqz3f5mxzdw"; system = "rt-events"; asd = "rt-events"; @@ -90599,7 +90947,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rt-events.examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rt-events/2016-03-18/rt-events-20160318-git.tgz"; + url = "https://beta.quicklisp.org/archive/rt-events/2016-03-18/rt-events-20160318-git.tgz"; sha256 = "17wqhczsi4mq00fp5hfc38b9ijdiaqjh7cvxhy714qqz3f5mxzdw"; system = "rt-events.examples"; asd = "rt-events.examples"; @@ -90622,7 +90970,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rte" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; + url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; system = "rte"; asd = "rte"; @@ -90646,7 +90994,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rte-regexp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; + url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; system = "rte-regexp"; asd = "rte-regexp"; @@ -90670,7 +91018,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rte-regexp-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; + url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; system = "rte-regexp-test"; asd = "rte-regexp-test"; @@ -90695,7 +91043,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rte-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; + url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; system = "rte-test"; asd = "rte-test"; @@ -90724,7 +91072,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rtg-math" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rtg-math/2019-10-07/rtg-math-release-quicklisp-29fc5b3d-git.tgz"; + url = "https://beta.quicklisp.org/archive/rtg-math/2019-10-07/rtg-math-release-quicklisp-29fc5b3d-git.tgz"; sha256 = "0bhxxnv7ldkkb18zdxyz2rj2a3iawzq2kcp7cn5i91iby7n0082x"; system = "rtg-math"; asd = "rtg-math"; @@ -90748,7 +91096,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rtg-math.vari" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rtg-math/2019-10-07/rtg-math-release-quicklisp-29fc5b3d-git.tgz"; + url = "https://beta.quicklisp.org/archive/rtg-math/2019-10-07/rtg-math-release-quicklisp-29fc5b3d-git.tgz"; sha256 = "0bhxxnv7ldkkb18zdxyz2rj2a3iawzq2kcp7cn5i91iby7n0082x"; system = "rtg-math.vari"; asd = "rtg-math.vari"; @@ -90772,7 +91120,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rucksack" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rucksack/2015-06-08/rucksack-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/rucksack/2015-06-08/rucksack-20150608-git.tgz"; sha256 = "0d6lvhc18i0brh75vp3n974ssx52b42rvwd24llhnphlnhryxh86"; system = "rucksack"; asd = "rucksack"; @@ -90792,7 +91140,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rucksack-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rucksack/2015-06-08/rucksack-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/rucksack/2015-06-08/rucksack-20150608-git.tgz"; sha256 = "0d6lvhc18i0brh75vp3n974ssx52b42rvwd24llhnphlnhryxh86"; system = "rucksack-test"; asd = "rucksack-test"; @@ -90812,7 +91160,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rutils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rutils/2022-11-06/rutils-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/rutils/2022-11-06/rutils-20221106-git.tgz"; sha256 = "108l64k7qhbhmgp0wa4krm23wakyfc41wzyl2fgc9k59gf47axhq"; system = "rutils"; asd = "rutils"; @@ -90835,7 +91183,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rutils-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rutils/2022-11-06/rutils-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/rutils/2022-11-06/rutils-20221106-git.tgz"; sha256 = "108l64k7qhbhmgp0wa4krm23wakyfc41wzyl2fgc9k59gf47axhq"; system = "rutils-test"; asd = "rutils-test"; @@ -90858,7 +91206,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "rutilsx" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/rutils/2022-11-06/rutils-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/rutils/2022-11-06/rutils-20221106-git.tgz"; sha256 = "108l64k7qhbhmgp0wa4krm23wakyfc41wzyl2fgc9k59gf47axhq"; system = "rutilsx"; asd = "rutilsx"; @@ -90882,7 +91230,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ryeboy" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ryeboy/2020-10-16/ryeboy-20201016-git.tgz"; + url = "https://beta.quicklisp.org/archive/ryeboy/2020-10-16/ryeboy-20201016-git.tgz"; sha256 = "0div6m6861damksxdxcycpdyyjn50bjsxfdkksm34w6162zdjcla"; system = "ryeboy"; asd = "ryeboy"; @@ -90908,7 +91256,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "s-base64" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/s-base64/2013-01-28/s-base64-20130128-git.tgz"; + url = "https://beta.quicklisp.org/archive/s-base64/2013-01-28/s-base64-20130128-git.tgz"; sha256 = "0zrr8zhnkdy97c5g54605nhjlf7fly79ylr1yf6wwyssia04cagg"; system = "s-base64"; asd = "s-base64"; @@ -90928,7 +91276,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "s-dot2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/s-dot2/2024-10-12/s-dot2-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/s-dot2/2024-10-12/s-dot2-20241012-git.tgz"; sha256 = "0zc833sc7szwyrrcinl84q3b0y9akh7hd5lhq3vxclk4zgb9n4nf"; system = "s-dot2"; asd = "s-dot2"; @@ -90948,7 +91296,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "s-graphviz" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/s-graphviz/2020-12-20/s-graphviz-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/s-graphviz/2020-12-20/s-graphviz-20201220-git.tgz"; sha256 = "1841xwci6y1gfhg15464wrlnw8xgsh1mwbg4yy2y7di02q4fbma2"; system = "s-graphviz"; asd = "s-graphviz"; @@ -90971,7 +91319,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "s-http-client" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/s-http-client/2020-04-27/s-http-client-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/s-http-client/2020-04-27/s-http-client-20200427-git.tgz"; sha256 = "1fb2901h91rgfxz3cm1lb2dnd84m1fr745nd2kswd1mj2xz94zn8"; system = "s-http-client"; asd = "s-http-client"; @@ -90997,7 +91345,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "s-http-server" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/s-http-server/2020-04-27/s-http-server-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/s-http-server/2020-04-27/s-http-server-20200427-git.tgz"; sha256 = "025mvnqhxx2c092aam3s4fk9v0p65hzdw39y4lamm0bdralda4bk"; system = "s-http-server"; asd = "s-http-server"; @@ -91023,7 +91371,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "s-sql" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/postmodern/2024-10-12/postmodern-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/postmodern/2024-10-12/postmodern-20241012-git.tgz"; sha256 = "1hj0dpclzihy1rcnwhiv16abmaa54wygxyib3j2h9q4qs26w7pzb"; system = "s-sql"; asd = "s-sql"; @@ -91044,7 +91392,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "s-sysdeps" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/s-sysdeps/2021-02-28/s-sysdeps-20210228-git.tgz"; + url = "https://beta.quicklisp.org/archive/s-sysdeps/2021-02-28/s-sysdeps-20210228-git.tgz"; sha256 = "0rp81iq0rgl48qdwbmfy89glga81hmry2lp8adjbr5h5ybr92b4n"; system = "s-sysdeps"; asd = "s-sysdeps"; @@ -91066,7 +91414,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "s-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/s-utils/2020-04-27/s-utils-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/s-utils/2020-04-27/s-utils-20200427-git.tgz"; sha256 = "0xggbcvjmj4sdqcs6vaccryqp2piaqxkc0ygkczrd5m14bwrmlp6"; system = "s-utils"; asd = "s-utils"; @@ -91086,7 +91434,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "s-xml" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/s-xml/2015-06-08/s-xml-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/s-xml/2015-06-08/s-xml-20150608-git.tgz"; sha256 = "1zsf5zrlf47g5cp70kb9b8d4v88315g633q5jcdx22csw7sd7if1"; system = "s-xml"; asd = "s-xml"; @@ -91104,7 +91452,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "s-xml-rpc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/s-xml-rpc/2019-05-21/s-xml-rpc-20190521-git.tgz"; + url = "https://beta.quicklisp.org/archive/s-xml-rpc/2019-05-21/s-xml-rpc-20190521-git.tgz"; sha256 = "0z42awkz124xphkahw0mhg1pk029l2799rhyy51387ndd6gbqscx"; system = "s-xml-rpc"; asd = "s-xml-rpc"; @@ -91124,7 +91472,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "s-xml.examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/s-xml/2015-06-08/s-xml-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/s-xml/2015-06-08/s-xml-20150608-git.tgz"; sha256 = "1zsf5zrlf47g5cp70kb9b8d4v88315g633q5jcdx22csw7sd7if1"; system = "s-xml.examples"; asd = "s-xml"; @@ -91144,7 +91492,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "s-xml.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/s-xml/2015-06-08/s-xml-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/s-xml/2015-06-08/s-xml-20150608-git.tgz"; sha256 = "1zsf5zrlf47g5cp70kb9b8d4v88315g633q5jcdx22csw7sd7if1"; system = "s-xml.test"; asd = "s-xml"; @@ -91164,7 +91512,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "safe-queue" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/safe-queue/2020-03-25/safe-queue-20200325-git.tgz"; + url = "https://beta.quicklisp.org/archive/safe-queue/2020-03-25/safe-queue-20200325-git.tgz"; sha256 = "1agvp8y2k5c6w35kly6d9a7hi1y6csn4k0hqqdv7i87lgjdi7vrq"; system = "safe-queue"; asd = "safe-queue"; @@ -91184,7 +91532,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "safe-read" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/safe-read/2022-02-20/safe-read-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/safe-read/2022-02-20/safe-read-20220220-git.tgz"; sha256 = "1r9k8danfnqgpbn2vb90n6wdc6jd92h1ig565yplrbh6232lhi26"; system = "safe-read"; asd = "safe-read"; @@ -91207,7 +91555,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "safety-params" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/safety-params/2019-02-02/safety-params-20190202-git.tgz"; + url = "https://beta.quicklisp.org/archive/safety-params/2019-02-02/safety-params-20190202-git.tgz"; sha256 = "1y69b9aw3vsnsk0vdjyxw011j0lgc5gdwv6ay6vzfipa9gzi92ki"; system = "safety-params"; asd = "safety-params"; @@ -91230,7 +91578,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "salza2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/salza2/2021-10-20/salza2-2.1.tgz"; + url = "https://beta.quicklisp.org/archive/salza2/2021-10-20/salza2-2.1.tgz"; sha256 = "1p48lxdibnps5rpyh5cmnk0vc77bmmxb32qdzfz93zadr8wwas10"; system = "salza2"; asd = "salza2"; @@ -91248,7 +91596,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sandalphon.lambda-list" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sandalphon.lambda-list/2024-10-12/sandalphon.lambda-list-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/sandalphon.lambda-list/2024-10-12/sandalphon.lambda-list-20241012-git.tgz"; sha256 = "1j4xfcb1n71kh95v0y495snkna5avdp0inbiaia7r5fsxlcf4s45"; system = "sandalphon.lambda-list"; asd = "sandalphon.lambda-list"; @@ -91268,7 +91616,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sanitize" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sanitize/2013-07-20/cl-sanitize-20130720-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sanitize/2013-07-20/cl-sanitize-20130720-git.tgz"; sha256 = "101qqgi53scz3aaca57yg5wk9ana2axpwssmgrcb5c2ip5a2lwi3"; system = "sanitize"; asd = "sanitize"; @@ -91288,7 +91636,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sanitize-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sanitize/2013-07-20/cl-sanitize-20130720-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sanitize/2013-07-20/cl-sanitize-20130720-git.tgz"; sha256 = "101qqgi53scz3aaca57yg5wk9ana2axpwssmgrcb5c2ip5a2lwi3"; system = "sanitize-test"; asd = "sanitize"; @@ -91311,7 +91659,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sanity-clause" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sanity-clause/2021-08-07/sanity-clause-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/sanity-clause/2021-08-07/sanity-clause-20210807-git.tgz"; sha256 = "0dzh00zpaqv48pn0xhbibiy33j8fwd2scsy5i466c9x9mcbhjz4f"; system = "sanity-clause"; asd = "sanity-clause"; @@ -91341,7 +91689,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sapaclisp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sapaclisp/2012-05-20/sapaclisp-1.0a.tgz"; + url = "https://beta.quicklisp.org/archive/sapaclisp/2012-05-20/sapaclisp-1.0a.tgz"; sha256 = "1bgqvwvjq8g5wrmp5r1dn1v99hgin9gihwkihz455n9dn90l3pyq"; system = "sapaclisp"; asd = "sapaclisp"; @@ -91357,12 +91705,12 @@ lib.makeScope pkgs.newScope (self: { sb-cga = ( build-asdf-system { pname = "sb-cga"; - version = "20210531-git"; + version = "20250622-git"; asds = [ "sb-cga" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sb-cga/2021-05-31/sb-cga-20210531-git.tgz"; - sha256 = "1y54qlwfrhch9aghk7nsbdx7x2qsvgsws1g2k631l9dsgdakw4w8"; + url = "https://beta.quicklisp.org/archive/sb-cga/2025-06-22/sb-cga-20250622-git.tgz"; + sha256 = "0yzlaiqhac914q5pqvn9kkg1pkxxdq4w7ndpbs4d5as67wihhpdb"; system = "sb-cga"; asd = "sb-cga"; } @@ -91381,7 +91729,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sb-fastcgi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sb-fastcgi/2024-10-12/sb-fastcgi-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/sb-fastcgi/2024-10-12/sb-fastcgi-20241012-git.tgz"; sha256 = "1jw5bmim4ll3a1bqlw02ksgw58cv1qr5li0gbczj7g9fjfk3r64z"; system = "sb-fastcgi"; asd = "sb-fastcgi"; @@ -91401,7 +91749,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sb-vector-io" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sb-vector-io/2011-08-29/sb-vector-io-20110829-git.tgz"; + url = "https://beta.quicklisp.org/archive/sb-vector-io/2011-08-29/sb-vector-io-20110829-git.tgz"; sha256 = "0pwc0nxhv8ba33i8z2f1y7r7ldik4a4xrqrb69dvvasz838k6r22"; system = "sb-vector-io"; asd = "sb-vector-io"; @@ -91417,12 +91765,12 @@ lib.makeScope pkgs.newScope (self: { sc-extensions = ( build-asdf-system { pname = "sc-extensions"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "sc-extensions" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sc-extensions/2024-10-12/sc-extensions-20241012-git.tgz"; - sha256 = "1va153gr7002j5hshalq13gk6jpij29h613nm47aimj01hjy9p0n"; + url = "https://beta.quicklisp.org/archive/sc-extensions/2025-06-22/sc-extensions-20250622-git.tgz"; + sha256 = "1hxjcax7f6kqcf0a5lbqp407g7r1psy6wc0hsfdn5afrscdw5ak1"; system = "sc-extensions"; asd = "sc-extensions"; } @@ -91441,12 +91789,12 @@ lib.makeScope pkgs.newScope (self: { sc-osc = ( build-asdf-system { pname = "sc-osc"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "sc-osc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-collider/2024-10-12/cl-collider-20241012-git.tgz"; - sha256 = "0h0fyx7glxnzwyam2aflma6003h8fcvcf5nj5f7svarw9brcc2xa"; + url = "https://beta.quicklisp.org/archive/cl-collider/2025-06-22/cl-collider-20250622-git.tgz"; + sha256 = "01yiwwi9zhh1vksk26m170i6x9lsbygbznaxggf8h9psiyqg5991"; system = "sc-osc"; asd = "sc-osc"; } @@ -91471,7 +91819,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "schannel" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/schannel/2021-12-30/schannel-20211230-git.tgz"; + url = "https://beta.quicklisp.org/archive/schannel/2021-12-30/schannel-20211230-git.tgz"; sha256 = "1f7dncrjsswrr8wrm7qzxdvrmzg3n2ap607ad74mnfd806rwldnw"; system = "schannel"; asd = "schannel"; @@ -91494,7 +91842,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "scheduler" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/scheduler/2023-06-18/scheduler-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/scheduler/2023-06-18/scheduler-20230618-git.tgz"; sha256 = "0559hxypgyg9863mb51wil777prspfsjbslj6psm3wndvl6xiprg"; system = "scheduler"; asd = "scheduler"; @@ -91520,7 +91868,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "science-data" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/antik/2024-10-12/antik-master-df14cb8c-git.tgz"; + url = "https://beta.quicklisp.org/archive/antik/2024-10-12/antik-master-df14cb8c-git.tgz"; sha256 = "1n08cx4n51z8v4bxyak166lp495xda3x7llfxcdpxndxqxcammr0"; system = "science-data"; asd = "science-data"; @@ -91539,12 +91887,12 @@ lib.makeScope pkgs.newScope (self: { scigraph = ( build-asdf-system { pname = "scigraph"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "scigraph" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "scigraph"; asd = "scigraph"; } @@ -91559,12 +91907,12 @@ lib.makeScope pkgs.newScope (self: { scrapycl = ( build-asdf-system { pname = "scrapycl"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "scrapycl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/scrapycl/2024-10-12/scrapycl-20241012-git.tgz"; - sha256 = "0qlvsc5qr8vyyrsasp041ydlfx8vgsy191m0nhab487fzmrlbzwp"; + url = "https://beta.quicklisp.org/archive/scrapycl/2025-06-22/scrapycl-20250622-git.tgz"; + sha256 = "15pl1vd8gng1sg2pib63rj2cx60wn7an98gr13j8506ia99anm33"; system = "scrapycl"; asd = "scrapycl"; } @@ -91595,12 +91943,12 @@ lib.makeScope pkgs.newScope (self: { scrapycl-ci = ( build-asdf-system { pname = "scrapycl-ci"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "scrapycl-ci" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/scrapycl/2024-10-12/scrapycl-20241012-git.tgz"; - sha256 = "0qlvsc5qr8vyyrsasp041ydlfx8vgsy191m0nhab487fzmrlbzwp"; + url = "https://beta.quicklisp.org/archive/scrapycl/2025-06-22/scrapycl-20250622-git.tgz"; + sha256 = "15pl1vd8gng1sg2pib63rj2cx60wn7an98gr13j8506ia99anm33"; system = "scrapycl-ci"; asd = "scrapycl-ci"; } @@ -91615,12 +91963,12 @@ lib.makeScope pkgs.newScope (self: { scrapycl-docs = ( build-asdf-system { pname = "scrapycl-docs"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "scrapycl-docs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/scrapycl/2024-10-12/scrapycl-20241012-git.tgz"; - sha256 = "0qlvsc5qr8vyyrsasp041ydlfx8vgsy191m0nhab487fzmrlbzwp"; + url = "https://beta.quicklisp.org/archive/scrapycl/2025-06-22/scrapycl-20250622-git.tgz"; + sha256 = "15pl1vd8gng1sg2pib63rj2cx60wn7an98gr13j8506ia99anm33"; system = "scrapycl-docs"; asd = "scrapycl-docs"; } @@ -91641,12 +91989,12 @@ lib.makeScope pkgs.newScope (self: { scrapycl-tests = ( build-asdf-system { pname = "scrapycl-tests"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "scrapycl-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/scrapycl/2024-10-12/scrapycl-20241012-git.tgz"; - sha256 = "0qlvsc5qr8vyyrsasp041ydlfx8vgsy191m0nhab487fzmrlbzwp"; + url = "https://beta.quicklisp.org/archive/scrapycl/2025-06-22/scrapycl-20250622-git.tgz"; + sha256 = "15pl1vd8gng1sg2pib63rj2cx60wn7an98gr13j8506ia99anm33"; system = "scrapycl-tests"; asd = "scrapycl-tests"; } @@ -91665,7 +92013,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "scratch-buffer" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; system = "scratch-buffer"; asd = "scratch-buffer"; @@ -91681,50 +92029,6 @@ lib.makeScope pkgs.newScope (self: { }; } ); - screamer = ( - build-asdf-system { - pname = "screamer"; - version = "20210807-git"; - asds = [ "screamer" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/screamer/2021-08-07/screamer-20210807-git.tgz"; - sha256 = "0913wmy0fpf6shvbz40ay9gnjhgyjglf661d1p5ld2glkw1ky8hm"; - system = "screamer"; - asd = "screamer"; - } - ); - systems = [ "screamer" ]; - lispLibs = [ ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - screamer-tests = ( - build-asdf-system { - pname = "screamer-tests"; - version = "20210807-git"; - asds = [ "screamer-tests" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/screamer/2021-08-07/screamer-20210807-git.tgz"; - sha256 = "0913wmy0fpf6shvbz40ay9gnjhgyjglf661d1p5ld2glkw1ky8hm"; - system = "screamer-tests"; - asd = "screamer-tests"; - } - ); - systems = [ "screamer-tests" ]; - lispLibs = [ - (getAttr "hu_dot_dwim_dot_stefil" self) - (getAttr "iterate" self) - (getAttr "screamer" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); scriba = ( build-asdf-system { pname = "scriba"; @@ -91732,7 +92036,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "scriba" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/scriba/2022-07-07/scriba-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/scriba/2022-07-07/scriba-20220707-git.tgz"; sha256 = "1n32bxf3b1cgb7y4015y3vahjgnbw59pi6d08by78pnpa2nx43sa"; system = "scriba"; asd = "scriba"; @@ -91756,7 +92060,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "scriba-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/scriba/2022-07-07/scriba-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/scriba/2022-07-07/scriba-20220707-git.tgz"; sha256 = "1n32bxf3b1cgb7y4015y3vahjgnbw59pi6d08by78pnpa2nx43sa"; system = "scriba-test"; asd = "scriba-test"; @@ -91779,7 +92083,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "scribble" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/scribble/2023-10-21/scribble-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/scribble/2023-10-21/scribble-20231021-git.tgz"; sha256 = "1ng56lzfva5231lkjls18mw7gcfc3vzksyh6habk0x5dff92cwvw"; system = "scribble"; asd = "scribble"; @@ -91805,7 +92109,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "scriptl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/scriptl/2018-02-28/scriptl-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/scriptl/2018-02-28/scriptl-20180228-git.tgz"; sha256 = "1q0d64syglfdjrzx2x7hlvznljpfwr9scn7rliigbm5z326lygg4"; system = "scriptl"; asd = "scriptl"; @@ -91835,7 +92139,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "scriptl-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/scriptl/2018-02-28/scriptl-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/scriptl/2018-02-28/scriptl-20180228-git.tgz"; sha256 = "1q0d64syglfdjrzx2x7hlvznljpfwr9scn7rliigbm5z326lygg4"; system = "scriptl-examples"; asd = "scriptl-examples"; @@ -91858,7 +92162,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "scriptl-util" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/scriptl/2018-02-28/scriptl-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/scriptl/2018-02-28/scriptl-20180228-git.tgz"; sha256 = "1q0d64syglfdjrzx2x7hlvznljpfwr9scn7rliigbm5z326lygg4"; system = "scriptl-util"; asd = "scriptl-util"; @@ -91881,7 +92185,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "scrutiny" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; + url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; system = "scrutiny"; asd = "scrutiny"; @@ -91901,7 +92205,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "scrutiny-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; + url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; system = "scrutiny-test"; asd = "scrutiny-test"; @@ -91921,7 +92225,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sdl2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sdl2/2023-10-21/cl-sdl2-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sdl2/2023-10-21/cl-sdl2-20231021-git.tgz"; sha256 = "189awhgxnqdyvypmw9k39542whb1jcpxx4psy6196qdbrgab8lc7"; system = "sdl2"; asd = "sdl2"; @@ -91948,7 +92252,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sdl2-game-controller-db" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sdl2-game-controller-db/2018-02-28/sdl2-game-controller-db-release-quicklisp-335d2b68-git.tgz"; + url = "https://beta.quicklisp.org/archive/sdl2-game-controller-db/2018-02-28/sdl2-game-controller-db-release-quicklisp-335d2b68-git.tgz"; sha256 = "0yf4ygndmacs0pf3ws5197k51c4fdximvxcmvn56bqmsvil56kcd"; system = "sdl2-game-controller-db"; asd = "sdl2-game-controller-db"; @@ -91968,7 +92272,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sdl2-image" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sdl2-image/2024-10-12/cl-sdl2-image-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sdl2-image/2024-10-12/cl-sdl2-image-20241012-git.tgz"; sha256 = "1jzrz3ppr5nbh0w6cvbbpv5x6gdq71a6v2qanvnjvcjs0zwf97iq"; system = "sdl2-image"; asd = "sdl2-image"; @@ -91993,7 +92297,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sdl2-mixer" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sdl2-mixer/2024-10-12/cl-sdl2-mixer-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sdl2-mixer/2024-10-12/cl-sdl2-mixer-20241012-git.tgz"; sha256 = "0d33pmyrcni90qfj0d4hxf97may1bv7i9z4a6rj02dw254n9r9lh"; system = "sdl2-mixer"; asd = "sdl2-mixer"; @@ -92018,7 +92322,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sdl2-ttf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sdl2-ttf/2024-10-12/cl-sdl2-ttf-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sdl2-ttf/2024-10-12/cl-sdl2-ttf-20241012-git.tgz"; sha256 = "1asdymsn65a06qr1c8fknakdvpjwxsvl69py6fsz21nirxyha5nc"; system = "sdl2-ttf"; asd = "sdl2-ttf"; @@ -92045,7 +92349,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sdl2-ttf-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sdl2-ttf/2024-10-12/cl-sdl2-ttf-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sdl2-ttf/2024-10-12/cl-sdl2-ttf-20241012-git.tgz"; sha256 = "1asdymsn65a06qr1c8fknakdvpjwxsvl69py6fsz21nirxyha5nc"; system = "sdl2-ttf-examples"; asd = "sdl2-ttf-examples"; @@ -92071,7 +92375,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sdl2kit" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sdl2kit/2017-11-30/sdl2kit-20171130-git.tgz"; + url = "https://beta.quicklisp.org/archive/sdl2kit/2017-11-30/sdl2kit-20171130-git.tgz"; sha256 = "10ymmxqsvdn7ndda9k2qcixj75l7namgqdxc5y2w3v5r1313fy2d"; system = "sdl2kit"; asd = "sdl2kit"; @@ -92096,7 +92400,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sdl2kit-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sdl2kit/2017-11-30/sdl2kit-20171130-git.tgz"; + url = "https://beta.quicklisp.org/archive/sdl2kit/2017-11-30/sdl2kit-20171130-git.tgz"; sha256 = "10ymmxqsvdn7ndda9k2qcixj75l7namgqdxc5y2w3v5r1313fy2d"; system = "sdl2kit-examples"; asd = "sdl2kit-examples"; @@ -92122,7 +92426,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sealable-metaobjects" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sealable-metaobjects/2020-06-10/sealable-metaobjects-20200610-git.tgz"; + url = "https://beta.quicklisp.org/archive/sealable-metaobjects/2020-06-10/sealable-metaobjects-20200610-git.tgz"; sha256 = "0hz1ivlpfhnk1w2cw4q2i000j2dc7maay06ndzziyywg7li6zf2p"; system = "sealable-metaobjects"; asd = "sealable-metaobjects"; @@ -92142,7 +92446,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "secp256k1" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-secp256k1/2022-07-07/cl-secp256k1-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-secp256k1/2022-07-07/cl-secp256k1-20220707-git.tgz"; sha256 = "0lg84jkwwp95nnk865yfhg16z0d04wk3dzf5yilkfm2yxnmjnv85"; system = "secp256k1"; asd = "secp256k1"; @@ -92162,7 +92466,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "secret-values" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/secret-values/2020-12-20/secret-values-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/secret-values/2020-12-20/secret-values-20201220-git.tgz"; sha256 = "07ph49s27gvjzx60yy094bb9ddwiys34r8cx5l837i34nm2fn3nh"; system = "secret-values"; asd = "secret-values"; @@ -92182,7 +92486,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "secure-random" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/secure-random/2016-02-08/secure-random-20160208-git.tgz"; + url = "https://beta.quicklisp.org/archive/secure-random/2016-02-08/secure-random-20160208-git.tgz"; sha256 = "09cnclnivkc87ja3z12ihcm02vkwp0cflcfa6hpjlbd5m75hvgsd"; system = "secure-random"; asd = "secure-random"; @@ -92202,7 +92506,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "seedable-rng" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/seedable-rng/2022-07-07/seedable-rng-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/seedable-rng/2022-07-07/seedable-rng-20220707-git.tgz"; sha256 = "1pr2flvrj32m055apwn5f2cddki2ws5xldmj2v367iyry3lz2vm1"; system = "seedable-rng"; asd = "seedable-rng"; @@ -92226,7 +92530,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "select" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/select/2024-10-12/select-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/select/2024-10-12/select-20241012-git.tgz"; sha256 = "1js02xgfd488lhv90rgxw0cvfbsarlpakydwrg1jr2hh5bhqyifh"; system = "select"; asd = "select"; @@ -92251,7 +92555,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "select-file" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/select-file/2020-04-27/select-file-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/select-file/2020-04-27/select-file-20200427-git.tgz"; sha256 = "1v89k5vvn1a3gdhlwbb4wxggzzr1ic7iqzvrrxgsh90fr129rmzq"; system = "select-file"; asd = "select-file"; @@ -92274,7 +92578,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "selenium" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-selenium/2016-05-31/cl-selenium-20160531-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-selenium/2016-05-31/cl-selenium-20160531-git.tgz"; sha256 = "1wx3343gkmyb25vbbpv6g5d1m2c5qxrkq7hsz1v2fcchgdgvwgxl"; system = "selenium"; asd = "selenium"; @@ -92300,7 +92604,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "semantic-spinneret" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/semantic-spinneret/2017-08-30/semantic-spinneret-20170830-git.tgz"; + url = "https://beta.quicklisp.org/archive/semantic-spinneret/2017-08-30/semantic-spinneret-20170830-git.tgz"; sha256 = "0ghd4lwwcbcidj70j26hj9vic1nqrj78ksrqlxj29q61bnji05ix"; system = "semantic-spinneret"; asd = "semantic-spinneret"; @@ -92323,7 +92627,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "semz.decompress" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/decompress/2024-10-12/decompress-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/decompress/2024-10-12/decompress-20241012-git.tgz"; sha256 = "0nzz6r57v94kyl5r77yawalnjszw93qjiqqargl3vjrmiga37gjp"; system = "semz.decompress"; asd = "semz.decompress"; @@ -92339,6 +92643,26 @@ lib.makeScope pkgs.newScope (self: { }; } ); + semz_dot_minisign-verify = ( + build-asdf-system { + pname = "semz.minisign-verify"; + version = "20250622-git"; + asds = [ "semz.minisign-verify" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/minisign-verify/2025-06-22/minisign-verify-20250622-git.tgz"; + sha256 = "10v87cm8yxnp7lgqbxcr6bn223391bk9sv9d9p0kff07d1a4dwrp"; + system = "semz.minisign-verify"; + asd = "semz.minisign-verify"; + } + ); + systems = [ "semz.minisign-verify" ]; + lispLibs = [ ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); sendgrid = ( build-asdf-system { pname = "sendgrid"; @@ -92346,7 +92670,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sendgrid" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sendgrid/2024-10-12/cl-sendgrid-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sendgrid/2024-10-12/cl-sendgrid-20241012-git.tgz"; sha256 = "02wwi2fwfd21aisf1y6ngypg7dmfvlf3bgxhqhrp1vpw8b34ha4w"; system = "sendgrid"; asd = "sendgrid"; @@ -92367,12 +92691,12 @@ lib.makeScope pkgs.newScope (self: { sento = ( build-asdf-system { pname = "sento"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "sento" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-gserver/2024-10-12/cl-gserver-20241012-git.tgz"; - sha256 = "1281iir75ccr5ilh2jv9xh1w446492gywvady48xggqyh6idaz9k"; + url = "https://beta.quicklisp.org/archive/cl-gserver/2025-06-22/cl-gserver-20250622-git.tgz"; + sha256 = "1lwa2habxdmjl2y9jl7ds2b1v1ijcdp7kk060b57g8hyx0saxj6x"; system = "sento"; asd = "sento"; } @@ -92402,7 +92726,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sentry-client" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sentry-client/2024-10-12/cl-sentry-client-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sentry-client/2024-10-12/cl-sentry-client-20241012-git.tgz"; sha256 = "0i83kgrjznffj6z5ryxnxlk995937askhilsbfa2nixakwal2c5h"; system = "sentry-client"; asd = "sentry-client"; @@ -92433,7 +92757,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sentry-client.async" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sentry-client/2024-10-12/cl-sentry-client-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sentry-client/2024-10-12/cl-sentry-client-20241012-git.tgz"; sha256 = "0i83kgrjznffj6z5ryxnxlk995937askhilsbfa2nixakwal2c5h"; system = "sentry-client.async"; asd = "sentry-client.async"; @@ -92456,7 +92780,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sentry-client.hunchentoot" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sentry-client/2024-10-12/cl-sentry-client-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sentry-client/2024-10-12/cl-sentry-client-20241012-git.tgz"; sha256 = "0i83kgrjznffj6z5ryxnxlk995937askhilsbfa2nixakwal2c5h"; system = "sentry-client.hunchentoot"; asd = "sentry-client.hunchentoot"; @@ -92479,7 +92803,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sequence-iterators" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sequence-iterators/2013-08-13/sequence-iterators-20130813-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/sequence-iterators/2013-08-13/sequence-iterators-20130813-darcs.tgz"; sha256 = "12flvy6hysqw0fa2jfkxrgphlk6b25hg2w2dxm1ylax0gw9fh1l5"; system = "sequence-iterators"; asd = "sequence-iterators"; @@ -92499,7 +92823,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sequence-iterators-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sequence-iterators/2013-08-13/sequence-iterators-20130813-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/sequence-iterators/2013-08-13/sequence-iterators-20130813-darcs.tgz"; sha256 = "12flvy6hysqw0fa2jfkxrgphlk6b25hg2w2dxm1ylax0gw9fh1l5"; system = "sequence-iterators-test"; asd = "sequence-iterators"; @@ -92515,12 +92839,12 @@ lib.makeScope pkgs.newScope (self: { serapeum = ( build-asdf-system { pname = "serapeum"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "serapeum" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/serapeum/2024-10-12/serapeum-20241012-git.tgz"; - sha256 = "12dc4p3i82p3jhxpp5wd6xiwy2fgdjybgfgj54nv8ya75rl9a64z"; + url = "https://beta.quicklisp.org/archive/serapeum/2025-06-22/serapeum-20250622-git.tgz"; + sha256 = "0vg7pzv9y2qx0zydnkx5klf0vb3ac5q8hy35z919b9037s7nrcl7"; system = "serapeum"; asd = "serapeum"; } @@ -92551,7 +92875,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "serializable-object" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/serializable-object/2019-12-27/serializable-object-20191227-git.tgz"; + url = "https://beta.quicklisp.org/archive/serializable-object/2019-12-27/serializable-object-20191227-git.tgz"; sha256 = "0978ljw998ypryiiqmb1s11ymwg4h5qz9bv7ig1i29wf5s14s2i0"; system = "serializable-object"; asd = "serializable-object"; @@ -92571,7 +92895,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "serializable-object.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/serializable-object/2019-12-27/serializable-object-20191227-git.tgz"; + url = "https://beta.quicklisp.org/archive/serializable-object/2019-12-27/serializable-object-20191227-git.tgz"; sha256 = "0978ljw998ypryiiqmb1s11ymwg4h5qz9bv7ig1i29wf5s14s2i0"; system = "serializable-object.test"; asd = "serializable-object.test"; @@ -92594,7 +92918,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "series" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/series/2013-11-11/series-20131111-git.tgz"; + url = "https://beta.quicklisp.org/archive/series/2013-11-11/series-20131111-git.tgz"; sha256 = "07hk2lhfx42zk018pxqvn4gs77vd4n4g8m4xxbqaxgca76mifwfw"; system = "series"; asd = "series"; @@ -92614,7 +92938,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "series-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/series/2013-11-11/series-20131111-git.tgz"; + url = "https://beta.quicklisp.org/archive/series/2013-11-11/series-20131111-git.tgz"; sha256 = "07hk2lhfx42zk018pxqvn4gs77vd4n4g8m4xxbqaxgca76mifwfw"; system = "series-tests"; asd = "series"; @@ -92634,7 +92958,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "session-token" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/session-token/2014-11-06/session-token-20141106-git.tgz"; + url = "https://beta.quicklisp.org/archive/session-token/2014-11-06/session-token-20141106-git.tgz"; sha256 = "1yb6m8nbh4gaskplrd2bwsnpkq6dl9dkvbjmvhzls6vh4lp6cc2z"; system = "session-token"; asd = "session-token"; @@ -92654,7 +92978,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "setup-cl+ssl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/zacl/2023-06-18/zacl-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/zacl/2023-06-18/zacl-20230618-git.tgz"; sha256 = "1s31d47zx8hczim78zrqzg4bvj4bshj31gmrff065q6racx3q1dk"; system = "setup-cl+ssl"; asd = "setup-cl+ssl"; @@ -92674,7 +92998,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sexml" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sexml/2014-07-13/sexml-20140713-git.tgz"; + url = "https://beta.quicklisp.org/archive/sexml/2014-07-13/sexml-20140713-git.tgz"; sha256 = "1s7isk9v7qh03sf60zw32kaa1rgvdh24bsc37q173r282m8plbk3"; system = "sexml"; asd = "sexml"; @@ -92700,7 +93024,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sexml-objects" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sexml/2014-07-13/sexml-20140713-git.tgz"; + url = "https://beta.quicklisp.org/archive/sexml/2014-07-13/sexml-20140713-git.tgz"; sha256 = "1s7isk9v7qh03sf60zw32kaa1rgvdh24bsc37q173r282m8plbk3"; system = "sexml-objects"; asd = "sexml-objects"; @@ -92720,7 +93044,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sha1" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sha1/2021-10-20/sha1-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/sha1/2021-10-20/sha1-20211020-git.tgz"; sha256 = "1cfn0j5yfwqkwr2dm73wr9hz8dmws3ngxlbk9886ahxkg544qx4z"; system = "sha1"; asd = "sha1"; @@ -92740,7 +93064,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sha3" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sha3/2023-10-21/sha3-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/sha3/2023-10-21/sha3-20231021-git.tgz"; sha256 = "0jl59js4n1gc08j2bcwf0d1gy82lf7g53b639dwh6b0milbqh7gz"; system = "sha3"; asd = "sha3"; @@ -92760,7 +93084,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "shadchen" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/shadchen/2013-10-03/shadchen-20131003-git.tgz"; + url = "https://beta.quicklisp.org/archive/shadchen/2013-10-03/shadchen-20131003-git.tgz"; sha256 = "0731hrpzf9pn1hyvs9wl0w3mnv13mr9ky3jx3dc4baj4nmjyb1k6"; system = "shadchen"; asd = "shadchen"; @@ -92780,7 +93104,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "shadow" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/shadow/2022-07-07/shadow-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/shadow/2022-07-07/shadow-20220707-git.tgz"; sha256 = "1lw98ir9381kmmranaa111f8jh47adsx0v4hzlw3qkf2xjcfah3l"; system = "shadow"; asd = "shadow"; @@ -92807,7 +93131,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "shared-preferences" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/shared-preferences/2021-02-28/shared-preferences_1.1.1.tgz"; + url = "https://beta.quicklisp.org/archive/shared-preferences/2021-02-28/shared-preferences_1.1.1.tgz"; sha256 = "12m4kaba2lxndkjw30a6y2rq16fflh5016lp74l7pf3v0y3j1ydf"; system = "shared-preferences"; asd = "shared-preferences"; @@ -92830,7 +93154,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "shared-preferences_tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/shared-preferences/2021-02-28/shared-preferences_1.1.1.tgz"; + url = "https://beta.quicklisp.org/archive/shared-preferences/2021-02-28/shared-preferences_1.1.1.tgz"; sha256 = "12m4kaba2lxndkjw30a6y2rq16fflh5016lp74l7pf3v0y3j1ydf"; system = "shared-preferences_tests"; asd = "shared-preferences_tests"; @@ -92853,7 +93177,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "shasht" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/shasht/2024-10-12/shasht-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/shasht/2024-10-12/shasht-20241012-git.tgz"; sha256 = "0i4k6w5r74f2a0i3ffian715v057w63psywk89ih0hl9xxpc4pga"; system = "shasht"; asd = "shasht"; @@ -92876,7 +93200,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sheeple" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sheeple/2021-01-24/sheeple-20210124-git.tgz"; + url = "https://beta.quicklisp.org/archive/sheeple/2021-01-24/sheeple-20210124-git.tgz"; sha256 = "13k6xm8a29xxkrwgc5j3bk2wr9skg4bzdnc4krrzgcdmx4gbcca3"; system = "sheeple"; asd = "sheeple"; @@ -92896,7 +93220,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sheeple-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sheeple/2021-01-24/sheeple-20210124-git.tgz"; + url = "https://beta.quicklisp.org/archive/sheeple/2021-01-24/sheeple-20210124-git.tgz"; sha256 = "13k6xm8a29xxkrwgc5j3bk2wr9skg4bzdnc4krrzgcdmx4gbcca3"; system = "sheeple-tests"; asd = "sheeple"; @@ -92915,12 +93239,12 @@ lib.makeScope pkgs.newScope (self: { shellpool = ( build-asdf-system { pname = "shellpool"; - version = "20200925-git"; + version = "20250622-git"; asds = [ "shellpool" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/shellpool/2020-09-25/shellpool-20200925-git.tgz"; - sha256 = "1bpv58i2l2a3ayk3jvi2wwd90gjczp0qk24bj82775qp8miw9vz0"; + url = "https://beta.quicklisp.org/archive/shellpool/2025-06-22/shellpool-20250622-git.tgz"; + sha256 = "1ia1b7kcdrr9r1306my22c8sz4bjn7yki94j196dxrpbpb7s1jpb"; system = "shellpool"; asd = "shellpool"; } @@ -92944,7 +93268,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "shelly" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/shelly/2014-11-06/shelly-20141106-git.tgz"; + url = "https://beta.quicklisp.org/archive/shelly/2014-11-06/shelly-20141106-git.tgz"; sha256 = "07whfcd2ygq07lw73bqby74cqbp2bx0rnyx7c0v7s16y9xfqxw7b"; system = "shelly"; asd = "shelly"; @@ -92971,7 +93295,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "shelly-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/shelly/2014-11-06/shelly-20141106-git.tgz"; + url = "https://beta.quicklisp.org/archive/shelly/2014-11-06/shelly-20141106-git.tgz"; sha256 = "07whfcd2ygq07lw73bqby74cqbp2bx0rnyx7c0v7s16y9xfqxw7b"; system = "shelly-test"; asd = "shelly-test"; @@ -92994,7 +93318,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "shlex" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-shlex/2021-04-11/cl-shlex-20210411-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-shlex/2021-04-11/cl-shlex-20210411-git.tgz"; sha256 = "16ag48sswgimr1fzr582vhym4s03idpd4lkydw5s58lv80ibpim8"; system = "shlex"; asd = "shlex"; @@ -93015,12 +93339,12 @@ lib.makeScope pkgs.newScope (self: { shop3 = ( build-asdf-system { pname = "shop3"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "shop3" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/shop3/2024-10-12/shop3-20241012-git.tgz"; - sha256 = "1sdyyyd82fqmm9lcqmg7k8yy3l3891m2gjwidibzvk95bp4xf9sd"; + url = "https://beta.quicklisp.org/archive/shop3/2025-06-22/shop3-20250622-git.tgz"; + sha256 = "0vznjrg51bh261bh39d2cj5jifl7mlryksdb7rrcymqq0k6zc0pn"; system = "shop3"; asd = "shop3"; } @@ -93041,12 +93365,12 @@ lib.makeScope pkgs.newScope (self: { shop3-thmpr-api = ( build-asdf-system { pname = "shop3-thmpr-api"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "shop3-thmpr-api" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/shop3/2024-10-12/shop3-20241012-git.tgz"; - sha256 = "1sdyyyd82fqmm9lcqmg7k8yy3l3891m2gjwidibzvk95bp4xf9sd"; + url = "https://beta.quicklisp.org/archive/shop3/2025-06-22/shop3-20250622-git.tgz"; + sha256 = "0vznjrg51bh261bh39d2cj5jifl7mlryksdb7rrcymqq0k6zc0pn"; system = "shop3-thmpr-api"; asd = "shop3-thmpr-api"; } @@ -93065,7 +93389,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "should-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/should-test/2019-10-07/should-test-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/should-test/2019-10-07/should-test-20191007-git.tgz"; sha256 = "1fqqa7lhf28qg60ji9libkylkcy747x576qpjn1y7c945j2fxmnm"; system = "should-test"; asd = "should-test"; @@ -93086,12 +93410,12 @@ lib.makeScope pkgs.newScope (self: { shuffletron = ( build-asdf-system { pname = "shuffletron"; - version = "20181018-git"; + version = "20250622-git"; asds = [ "shuffletron" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/shuffletron/2018-10-18/shuffletron-20181018-git.tgz"; - sha256 = "10626wp2xdk0wxj0kl49m9gyb2bp6f0vp67563mw6zrzfs7ynpkb"; + url = "https://beta.quicklisp.org/archive/shuffletron/2025-06-22/shuffletron-20250622-git.tgz"; + sha256 = "108xl69ndnb2wdy93sqgqacmbqhg8l82cn0rsqaqgfwapx6i5gaz"; system = "shuffletron"; asd = "shuffletron"; } @@ -93116,7 +93440,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "si-kanren" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/si-kanren/2024-10-12/si-kanren-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/si-kanren/2024-10-12/si-kanren-20241012-git.tgz"; sha256 = "1m99ryyfjxbjbmswprz8gr9hl3srwz74fwjna35wf8d41ns5ajlj"; system = "si-kanren"; asd = "si-kanren"; @@ -93136,7 +93460,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "silo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/colliflower/2021-10-20/colliflower-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/colliflower/2021-10-20/colliflower-20211020-git.tgz"; sha256 = "1fzn9s7wm7wmffrdm21lpvry9jb320456cmmprn976a533lp704r"; system = "silo"; asd = "silo"; @@ -93149,6 +93473,31 @@ lib.makeScope pkgs.newScope (self: { }; } ); + simpbin = ( + build-asdf-system { + pname = "simpbin"; + version = "20250622-git"; + asds = [ "simpbin" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/simpbin/2025-06-22/simpbin-20250622-git.tgz"; + sha256 = "0dymdi6crlq18x181gkip3vdyv2i3ryjip306vgw9ac2gg23rfdn"; + system = "simpbin"; + asd = "simpbin"; + } + ); + systems = [ "simpbin" ]; + lispLibs = [ + (getAttr "alexandria" self) + (getAttr "fast-io" self) + (getAttr "flexi-streams" self) + (getAttr "nibbles" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); simple-actors = ( build-asdf-system { pname = "simple-actors"; @@ -93156,7 +93505,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "simple-actors" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/simple-actors/2020-09-25/simple-actors-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/simple-actors/2020-09-25/simple-actors-20200925-git.tgz"; sha256 = "1q843l1bh0xipp535gwm7713gpp04cycvq0i8yz54b6ym3dzkql4"; system = "simple-actors"; asd = "simple-actors"; @@ -93176,7 +93525,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "simple-config" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/simple-config/2023-06-18/simple-config-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/simple-config/2023-06-18/simple-config-20230618-git.tgz"; sha256 = "1ihw5yr5jwlpixaa011611q6i4j406rvc42bkm0da1arzd76pfhn"; system = "simple-config"; asd = "simple-config"; @@ -93196,7 +93545,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "simple-config-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/simple-config/2023-06-18/simple-config-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/simple-config/2023-06-18/simple-config-20230618-git.tgz"; sha256 = "1ihw5yr5jwlpixaa011611q6i4j406rvc42bkm0da1arzd76pfhn"; system = "simple-config-test"; asd = "simple-config-test"; @@ -93219,7 +93568,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "simple-currency" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/simple-currency/2017-11-30/simple-currency-20171130-git.tgz"; + url = "https://beta.quicklisp.org/archive/simple-currency/2017-11-30/simple-currency-20171130-git.tgz"; sha256 = "1qrxaj5v25165vyjp2fmasasjri2cn53y6ckv3rlv04skifvnq2s"; system = "simple-currency"; asd = "simple-currency"; @@ -93245,7 +93594,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "simple-date" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/postmodern/2024-10-12/postmodern-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/postmodern/2024-10-12/postmodern-20241012-git.tgz"; sha256 = "1hj0dpclzihy1rcnwhiv16abmaa54wygxyib3j2h9q4qs26w7pzb"; system = "simple-date"; asd = "simple-date"; @@ -93263,7 +93612,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "simple-date-time" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/simple-date-time/2016-04-21/simple-date-time-20160421-git.tgz"; + url = "https://beta.quicklisp.org/archive/simple-date-time/2016-04-21/simple-date-time-20160421-git.tgz"; sha256 = "06iwf13gcdyqhkzfkcsfdl8iqbdl44cx01c3fjsmhl0v1pp8h2m4"; system = "simple-date-time"; asd = "simple-date-time"; @@ -93281,7 +93630,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "simple-finalizer" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/simple-finalizer/2010-10-06/simple-finalizer-20101006-git.tgz"; + url = "https://beta.quicklisp.org/archive/simple-finalizer/2010-10-06/simple-finalizer-20101006-git.tgz"; sha256 = "1qdm48zjlkbygz9ip006xwpas59fhijrswv1k7pzvhdwl04vkq65"; system = "simple-finalizer"; asd = "simple-finalizer"; @@ -93304,7 +93653,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "simple-flow-dispatcher" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/simple-flow-dispatcher/2020-10-16/simple-flow-dispatcher-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/simple-flow-dispatcher/2020-10-16/simple-flow-dispatcher-stable-git.tgz"; sha256 = "11k16svq4mgf0pagrs4drvf57hawffghv9g96b1n071nqyk2ald2"; system = "simple-flow-dispatcher"; asd = "simple-flow-dispatcher"; @@ -93328,7 +93677,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "simple-guess" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/simple-guess/2020-09-25/simple-guess_1.0.tgz"; + url = "https://beta.quicklisp.org/archive/simple-guess/2020-09-25/simple-guess_1.0.tgz"; sha256 = "11v3wxj3k036r0kazn69vi580qm593ir1yf7j5d737j4rb382682"; system = "simple-guess"; asd = "simple-guess"; @@ -93348,7 +93697,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "simple-guess_tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/simple-guess/2020-09-25/simple-guess_1.0.tgz"; + url = "https://beta.quicklisp.org/archive/simple-guess/2020-09-25/simple-guess_1.0.tgz"; sha256 = "11v3wxj3k036r0kazn69vi580qm593ir1yf7j5d737j4rb382682"; system = "simple-guess_tests"; asd = "simple-guess_tests"; @@ -93368,12 +93717,12 @@ lib.makeScope pkgs.newScope (self: { simple-inferiors = ( build-asdf-system { pname = "simple-inferiors"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "simple-inferiors" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/simple-inferiors/2023-10-21/simple-inferiors-20231021-git.tgz"; - sha256 = "1b7y44r2ncpfc5766pw56k07036qjvwqdbycizldfk9rjam2afa6"; + url = "https://beta.quicklisp.org/archive/simple-inferiors/2025-06-22/simple-inferiors-20250622-git.tgz"; + sha256 = "050bwv7m6li41rq9cq2achy9j3zibnwyn2xigngg4knir0hi1f4s"; system = "simple-inferiors"; asd = "simple-inferiors"; } @@ -93389,12 +93738,12 @@ lib.makeScope pkgs.newScope (self: { simple-neural-network = ( build-asdf-system { pname = "simple-neural-network"; - version = "20230214-git"; + version = "20250622-git"; asds = [ "simple-neural-network" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/simple-neural-network/2023-02-14/simple-neural-network-20230214-git.tgz"; - sha256 = "14ix2f560bhvccfzi30ghmmg79785nmg8c3lpq5hg99djgigxyfw"; + url = "https://beta.quicklisp.org/archive/simple-neural-network/2025-06-22/simple-neural-network-20250622-git.tgz"; + sha256 = "15c4851qm1zv76hqa4081z0ni7dnf23130x1rxgsiysjpvz2slyf"; system = "simple-neural-network"; asd = "simple-neural-network"; } @@ -93416,7 +93765,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "simple-parallel-tasks" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/simple-parallel-tasks/2020-12-20/simple-parallel-tasks-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/simple-parallel-tasks/2020-12-20/simple-parallel-tasks-20201220-git.tgz"; sha256 = "0gvbpyff4siifp3cp86cpr9ksmakn66fx21f3h0hpn647zl07nj7"; system = "simple-parallel-tasks"; asd = "simple-parallel-tasks"; @@ -93436,7 +93785,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "simple-parallel-tasks-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/simple-parallel-tasks/2020-12-20/simple-parallel-tasks-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/simple-parallel-tasks/2020-12-20/simple-parallel-tasks-20201220-git.tgz"; sha256 = "0gvbpyff4siifp3cp86cpr9ksmakn66fx21f3h0hpn647zl07nj7"; system = "simple-parallel-tasks-tests"; asd = "simple-parallel-tasks-tests"; @@ -93455,12 +93804,12 @@ lib.makeScope pkgs.newScope (self: { simple-rgb = ( build-asdf-system { pname = "simple-rgb"; - version = "20190521-git"; + version = "20250622-git"; asds = [ "simple-rgb" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/simple-rgb/2019-05-21/simple-rgb-20190521-git.tgz"; - sha256 = "0ggv0h2n4mvwnggjr1b40gw667gnyykzki2zadaczi38ydzyzlp1"; + url = "https://beta.quicklisp.org/archive/simple-rgb/2025-06-22/simple-rgb-20250622-git.tgz"; + sha256 = "1cmbq08kpha7k85mznqn3y6jn49ps8569737x3mr9kmks43raay9"; system = "simple-rgb"; asd = "simple-rgb"; } @@ -93479,7 +93828,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "simple-routes" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/simple-routes/2018-02-28/simple-routes-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/simple-routes/2018-02-28/simple-routes-20180228-git.tgz"; sha256 = "0zkjl69zf1ynmqmvwccdbip3wxfyi7xplivv70qwxzd27mc0kh3k"; system = "simple-routes"; asd = "simple-routes"; @@ -93502,7 +93851,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "simple-scanf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-string-match/2021-12-09/cl-string-match-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-string-match/2021-12-09/cl-string-match-20211209-git.tgz"; sha256 = "0zndlkw3qy3vw4px4qv884z6232w8zfaliyc88irjwizdv35wcq9"; system = "simple-scanf"; asd = "simple-scanf"; @@ -93523,12 +93872,12 @@ lib.makeScope pkgs.newScope (self: { simple-tasks = ( build-asdf-system { pname = "simple-tasks"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "simple-tasks" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/simple-tasks/2023-10-21/simple-tasks-20231021-git.tgz"; - sha256 = "14j0sbi9zv22rrcp3wvjzmrgk6f75zydhs50cbmspr2r0c9s5c6n"; + url = "https://beta.quicklisp.org/archive/simple-tasks/2025-06-22/simple-tasks-20250622-git.tgz"; + sha256 = "101fljqvac2msj5aaqbhk755c3ml3rnhz8675abixhfjzbhv1khi"; system = "simple-tasks"; asd = "simple-tasks"; } @@ -93549,7 +93898,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "simpleroutes-demo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/simple-routes/2018-02-28/simple-routes-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/simple-routes/2018-02-28/simple-routes-20180228-git.tgz"; sha256 = "0zkjl69zf1ynmqmvwccdbip3wxfyi7xplivv70qwxzd27mc0kh3k"; system = "simpleroutes-demo"; asd = "simple-routes"; @@ -93575,7 +93924,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "simpleroutes-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/simple-routes/2018-02-28/simple-routes-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/simple-routes/2018-02-28/simple-routes-20180228-git.tgz"; sha256 = "0zkjl69zf1ynmqmvwccdbip3wxfyi7xplivv70qwxzd27mc0kh3k"; system = "simpleroutes-test"; asd = "simple-routes"; @@ -93595,7 +93944,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "simplet" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/simplet/2019-12-27/simplet-20191227-git.tgz"; + url = "https://beta.quicklisp.org/archive/simplet/2019-12-27/simplet-20191227-git.tgz"; sha256 = "1scsalzbwxk6z48b61zq532c02l36yr3vl2jdy0xjm2diycq6jgs"; system = "simplet"; asd = "simplet"; @@ -93615,7 +93964,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "simplet-asdf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/simplet/2019-12-27/simplet-20191227-git.tgz"; + url = "https://beta.quicklisp.org/archive/simplet/2019-12-27/simplet-20191227-git.tgz"; sha256 = "1scsalzbwxk6z48b61zq532c02l36yr3vl2jdy0xjm2diycq6jgs"; system = "simplet-asdf"; asd = "simplet-asdf"; @@ -93635,7 +93984,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "simplified-types" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/simplified-types/2019-08-13/simplified-types-20190813-git.tgz"; + url = "https://beta.quicklisp.org/archive/simplified-types/2019-08-13/simplified-types-20190813-git.tgz"; sha256 = "1hdwmn5lz717aj6qdqmfmr3cbjl8l3giwn0fb5ca9pj83cx7fg8y"; system = "simplified-types"; asd = "simplified-types"; @@ -93659,7 +94008,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "simplified-types-test-suite" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/simplified-types/2019-08-13/simplified-types-20190813-git.tgz"; + url = "https://beta.quicklisp.org/archive/simplified-types/2019-08-13/simplified-types-20190813-git.tgz"; sha256 = "1hdwmn5lz717aj6qdqmfmr3cbjl8l3giwn0fb5ca9pj83cx7fg8y"; system = "simplified-types-test-suite"; asd = "simplified-types-test-suite"; @@ -93682,7 +94031,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "simpsamp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/simpsamp/2010-10-06/simpsamp-0.1.tgz"; + url = "https://beta.quicklisp.org/archive/simpsamp/2010-10-06/simpsamp-0.1.tgz"; sha256 = "0i85andjaz16lh4wwpdvd5kgg7lsfp206g7kniy16gs78xjy5jlc"; system = "simpsamp"; asd = "simpsamp"; @@ -93702,7 +94051,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "single-threaded-ccl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/single-threaded-ccl/2015-06-08/single-threaded-ccl-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/single-threaded-ccl/2015-06-08/single-threaded-ccl-20150608-git.tgz"; sha256 = "0d8cf8x77b3f7qh2cr3fnkc6i7dm7pwlnldmv9k4q033rmmhnfxb"; system = "single-threaded-ccl"; asd = "single-threaded-ccl"; @@ -93722,7 +94071,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "singleton-classes" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-abstract-classes/2019-03-07/cl-abstract-classes-20190307-hg.tgz"; + url = "https://beta.quicklisp.org/archive/cl-abstract-classes/2019-03-07/cl-abstract-classes-20190307-hg.tgz"; sha256 = "0q03j3ksgn56j9xvs3d3hhasplj3hvg488f4cx1z97nlyqxr5w1d"; system = "singleton-classes"; asd = "singleton-classes"; @@ -93742,7 +94091,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sip-hash" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sip-hash/2020-06-10/sip-hash-20200610-git.tgz"; + url = "https://beta.quicklisp.org/archive/sip-hash/2020-06-10/sip-hash-20200610-git.tgz"; sha256 = "0cd6g37lxd5i5fyg9my4jja27ki5agbpr9d635rcwpf32yhc4sh9"; system = "sip-hash"; asd = "sip-hash"; @@ -93765,7 +94114,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "skeleton-creator" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/skeleton-creator/2019-12-27/skeleton-creator-20191227-git.tgz"; + url = "https://beta.quicklisp.org/archive/skeleton-creator/2019-12-27/skeleton-creator-20191227-git.tgz"; sha256 = "1yj8w9lpb2jzyf02zg65ngmjfsakzc7k1kcw90w52gk14hv1lk6s"; system = "skeleton-creator"; asd = "skeleton-creator"; @@ -93790,7 +94139,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sketch" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sketch/2024-10-12/sketch-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/sketch/2024-10-12/sketch-20241012-git.tgz"; sha256 = "1bq0ljb2awzkk4shsd0w4v2hc2abmkwfv7nz8d88hglrvar8qbnl"; system = "sketch"; asd = "sketch"; @@ -93826,7 +94175,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sketch-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sketch/2024-10-12/sketch-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/sketch/2024-10-12/sketch-20241012-git.tgz"; sha256 = "1bq0ljb2awzkk4shsd0w4v2hc2abmkwfv7nz8d88hglrvar8qbnl"; system = "sketch-examples"; asd = "sketch-examples"; @@ -93849,7 +94198,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "skippy" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/skippy/2015-04-07/skippy-1.3.12.tgz"; + url = "https://beta.quicklisp.org/archive/skippy/2015-04-07/skippy-1.3.12.tgz"; sha256 = "1n8925qz19w00qc67z3hc97fpmfhi0r54dd50fzqm24vhyb7qwc2"; system = "skippy"; asd = "skippy"; @@ -93869,7 +94218,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "skippy-renderer" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/skippy-renderer/2022-11-06/skippy-renderer-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/skippy-renderer/2022-11-06/skippy-renderer-20221106-git.tgz"; sha256 = "0x9zv8zchxn48axl5rwfnywg9kb9m0pz3gwjk7gpg9m574jw8x0c"; system = "skippy-renderer"; asd = "skippy-renderer"; @@ -93889,7 +94238,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "skitter" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/skitter/2018-02-28/skitter-release-quicklisp-620772ae-git.tgz"; + url = "https://beta.quicklisp.org/archive/skitter/2018-02-28/skitter-release-quicklisp-620772ae-git.tgz"; sha256 = "1rixcav388fnal9v139kvagjfc60sbwd8ikbmd48lppq2nq5anwl"; system = "skitter"; asd = "skitter"; @@ -93913,7 +94262,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "skitter.glop" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/skitter/2018-02-28/skitter-release-quicklisp-620772ae-git.tgz"; + url = "https://beta.quicklisp.org/archive/skitter/2018-02-28/skitter-release-quicklisp-620772ae-git.tgz"; sha256 = "1rixcav388fnal9v139kvagjfc60sbwd8ikbmd48lppq2nq5anwl"; system = "skitter.glop"; asd = "skitter.glop"; @@ -93936,7 +94285,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "skitter.sdl2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/skitter/2018-02-28/skitter-release-quicklisp-620772ae-git.tgz"; + url = "https://beta.quicklisp.org/archive/skitter/2018-02-28/skitter-release-quicklisp-620772ae-git.tgz"; sha256 = "1rixcav388fnal9v139kvagjfc60sbwd8ikbmd48lppq2nq5anwl"; system = "skitter.sdl2"; asd = "skitter.sdl2"; @@ -93959,7 +94308,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "slack-client" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/slack-client/2016-08-25/slack-client-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/slack-client/2016-08-25/slack-client-20160825-git.tgz"; sha256 = "1yl2wqhx1h2kw3s5dkkq5c4hk1r7679yzq41j2j2bscbl3xk3jp9"; system = "slack-client"; asd = "slack-client"; @@ -93988,7 +94337,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "slack-client-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/slack-client/2016-08-25/slack-client-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/slack-client/2016-08-25/slack-client-20160825-git.tgz"; sha256 = "1yl2wqhx1h2kw3s5dkkq5c4hk1r7679yzq41j2j2bscbl3xk3jp9"; system = "slack-client-test"; asd = "slack-client-test"; @@ -94008,12 +94357,12 @@ lib.makeScope pkgs.newScope (self: { slim = ( build-asdf-system { pname = "slim"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "slim" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; - sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; + url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; + sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; system = "slim"; asd = "slim"; } @@ -94028,12 +94377,12 @@ lib.makeScope pkgs.newScope (self: { slite = ( build-asdf-system { pname = "slite"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "slite" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/slite/2024-10-12/slite-20241012-git.tgz"; - sha256 = "1ij1qxp20p7zfxm453v42z27ff3z6lk7hly8knk5fj3awj9nvljd"; + url = "https://beta.quicklisp.org/archive/slite/2025-06-22/slite-20250622-git.tgz"; + sha256 = "10gfnppjja41w00cxnlf7qwcq92ssz5xn9gqsvdiwdsy12501qrz"; system = "slite"; asd = "slite"; } @@ -94055,7 +94404,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "slot-extra-options" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/slot-extra-options/2021-04-11/slot-extra-options-20210411-git.tgz"; + url = "https://beta.quicklisp.org/archive/slot-extra-options/2021-04-11/slot-extra-options-20210411-git.tgz"; sha256 = "1b2swhjjs0w1034cy045q8l3ndmci7rjawka39q23vncy6d90497"; system = "slot-extra-options"; asd = "slot-extra-options"; @@ -94080,7 +94429,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "slot-extra-options-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/slot-extra-options/2021-04-11/slot-extra-options-20210411-git.tgz"; + url = "https://beta.quicklisp.org/archive/slot-extra-options/2021-04-11/slot-extra-options-20210411-git.tgz"; sha256 = "1b2swhjjs0w1034cy045q8l3ndmci7rjawka39q23vncy6d90497"; system = "slot-extra-options-tests"; asd = "slot-extra-options-tests"; @@ -94107,7 +94456,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "slot-map" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/slot-map/2022-07-07/slot-map-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/slot-map/2022-07-07/slot-map-20220707-git.tgz"; sha256 = "1z9qprjqj3pwqf469bxj0fvvjni1ncap6g7w5q9gmv5hnf2a4yjb"; system = "slot-map"; asd = "slot-map"; @@ -94126,12 +94475,12 @@ lib.makeScope pkgs.newScope (self: { slynk = ( build-asdf-system { pname = "slynk"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "slynk" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sly/2024-10-12/sly-20241012-git.tgz"; - sha256 = "1mxkcgh7g76mqn148zm2mhsh09whwh89wldlyfhq0d9h96zch451"; + url = "https://beta.quicklisp.org/archive/sly/2025-06-22/sly-20250622-git.tgz"; + sha256 = "1744n32vc00n6fgc4sa8x6z7s1cym0nq6gqnqqyz56kcqc2h2qqb"; system = "slynk"; asd = "slynk"; } @@ -94148,7 +94497,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "slynk-macrostep" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sly-macrostep/2023-06-18/sly-macrostep-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/sly-macrostep/2023-06-18/sly-macrostep-20230618-git.tgz"; sha256 = "1nxf28gn4f3n0wnv7nb5sgl36fz175y470zs9hig4kq8cp0yal0r"; system = "slynk-macrostep"; asd = "slynk-macrostep"; @@ -94168,7 +94517,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "slynk-named-readtables" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sly-named-readtables/2023-06-18/sly-named-readtables-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/sly-named-readtables/2023-06-18/sly-named-readtables-20230618-git.tgz"; sha256 = "16asd119rzqrlclps2q6yrkis8jy5an5xgzzqvb7jdyq39zxg54q"; system = "slynk-named-readtables"; asd = "slynk-named-readtables"; @@ -94188,7 +94537,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "smackjack" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/smackjack/2018-02-28/smackjack-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/smackjack/2018-02-28/smackjack-20180228-git.tgz"; sha256 = "1n2x7qij2ci70axd2xn295qqgqrvbfbpvv2438lhwd8qa92dhk8b"; system = "smackjack"; asd = "smackjack"; @@ -94214,7 +94563,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "smackjack-demo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/smackjack/2018-02-28/smackjack-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/smackjack/2018-02-28/smackjack-20180228-git.tgz"; sha256 = "1n2x7qij2ci70axd2xn295qqgqrvbfbpvv2438lhwd8qa92dhk8b"; system = "smackjack-demo"; asd = "smackjack-demo"; @@ -94235,12 +94584,12 @@ lib.makeScope pkgs.newScope (self: { small-coalton-programs = ( build-asdf-system { pname = "small-coalton-programs"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "small-coalton-programs" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/coalton/2024-10-12/coalton-20241012-git.tgz"; - sha256 = "19flzjxf3y6pxm09bmr8bmiqbgh4f7d5jjbgx2cb3dckmgvvg1d7"; + url = "https://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz"; + sha256 = "0g6gfp3y9smzssi3dbddwxvx7g4hq6wz98h253gs4i15pd2pf3qp"; system = "small-coalton-programs"; asd = "small-coalton-programs"; } @@ -94252,6 +94601,34 @@ lib.makeScope pkgs.newScope (self: { }; } ); + smallnet = ( + build-asdf-system { + pname = "smallnet"; + version = "20250622-git"; + asds = [ "smallnet" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/smallnet/2025-06-22/smallnet-20250622-git.tgz"; + sha256 = "0kmi2jrgi0m295r9kpw6ahxpbpjwpxnjxk3753yxaqwgh814al20"; + system = "smallnet"; + asd = "smallnet"; + } + ); + systems = [ "smallnet" ]; + lispLibs = [ + (getAttr "alexandria" self) + (getAttr "babel" self) + (getAttr "cl_plus_ssl" self) + (getAttr "cl-mimeparse" self) + (getAttr "nytpu_dot_lisp-utils" self) + (getAttr "quri" self) + (getAttr "usocket" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); smart-buffer = ( build-asdf-system { pname = "smart-buffer"; @@ -94259,7 +94636,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "smart-buffer" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/smart-buffer/2021-10-20/smart-buffer-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/smart-buffer/2021-10-20/smart-buffer-20211020-git.tgz"; sha256 = "1r9y61a791m7aqgg2ixs86lc63y78w7n6dwipakcpjzscqmprppr"; system = "smart-buffer"; asd = "smart-buffer"; @@ -94280,7 +94657,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "smart-buffer-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/smart-buffer/2021-10-20/smart-buffer-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/smart-buffer/2021-10-20/smart-buffer-20211020-git.tgz"; sha256 = "1r9y61a791m7aqgg2ixs86lc63y78w7n6dwipakcpjzscqmprppr"; system = "smart-buffer-test"; asd = "smart-buffer-test"; @@ -94305,7 +94682,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "smokebase" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; system = "smokebase"; asd = "smokebase"; @@ -94328,7 +94705,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "smoothers" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/smoothers/2024-10-12/smoothers-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/smoothers/2024-10-12/smoothers-20241012-git.tgz"; sha256 = "0byqn3xni83jkbzc0jllpyfsgjaiifsjr55aaf90pbi71as39xfd"; system = "smoothers"; asd = "smoothers"; @@ -94354,7 +94731,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "smug" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/smug/2021-12-30/smug-20211230-git.tgz"; + url = "https://beta.quicklisp.org/archive/smug/2021-12-30/smug-20211230-git.tgz"; sha256 = "13gzkj9skya2ziwclk041v7sif392ydbvhvikhg2raa3qjcxb3rq"; system = "smug"; asd = "smug"; @@ -94372,7 +94749,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "snakes" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/snakes/2022-11-06/snakes-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/snakes/2022-11-06/snakes-20221106-git.tgz"; sha256 = "17fqkw256c2iacy5g37sv9h0mbrmb3fg2s9sd83gj9clrg5r4wkl"; system = "snakes"; asd = "snakes"; @@ -94399,7 +94776,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "snappy" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/snappy/2021-12-09/snappy-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/snappy/2021-12-09/snappy-20211209-git.tgz"; sha256 = "1g0d8icbqmahywqczb8pimr63970dil6mnlxkv3y9ng31dg0npy6"; system = "snappy"; asd = "snappy"; @@ -94419,12 +94796,12 @@ lib.makeScope pkgs.newScope (self: { snark = ( build-asdf-system { pname = "snark"; - version = "20160421-git"; + version = "20250622-git"; asds = [ "snark" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz"; - sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5"; + url = "https://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz"; + sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0"; system = "snark"; asd = "snark"; } @@ -94439,12 +94816,12 @@ lib.makeScope pkgs.newScope (self: { snark-agenda = ( build-asdf-system { pname = "snark-agenda"; - version = "20160421-git"; + version = "20250622-git"; asds = [ "snark-agenda" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz"; - sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5"; + url = "https://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz"; + sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0"; system = "snark-agenda"; asd = "snark-agenda"; } @@ -94464,12 +94841,12 @@ lib.makeScope pkgs.newScope (self: { snark-auxiliary-packages = ( build-asdf-system { pname = "snark-auxiliary-packages"; - version = "20160421-git"; + version = "20250622-git"; asds = [ "snark-auxiliary-packages" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz"; - sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5"; + url = "https://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz"; + sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0"; system = "snark-auxiliary-packages"; asd = "snark-auxiliary-packages"; } @@ -94484,12 +94861,12 @@ lib.makeScope pkgs.newScope (self: { snark-deque = ( build-asdf-system { pname = "snark-deque"; - version = "20160421-git"; + version = "20250622-git"; asds = [ "snark-deque" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz"; - sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5"; + url = "https://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz"; + sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0"; system = "snark-deque"; asd = "snark-deque"; } @@ -94507,12 +94884,12 @@ lib.makeScope pkgs.newScope (self: { snark-dpll = ( build-asdf-system { pname = "snark-dpll"; - version = "20160421-git"; + version = "20250622-git"; asds = [ "snark-dpll" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz"; - sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5"; + url = "https://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz"; + sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0"; system = "snark-dpll"; asd = "snark-dpll"; } @@ -94530,12 +94907,12 @@ lib.makeScope pkgs.newScope (self: { snark-examples = ( build-asdf-system { pname = "snark-examples"; - version = "20160421-git"; + version = "20250622-git"; asds = [ "snark-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz"; - sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5"; + url = "https://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz"; + sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0"; system = "snark-examples"; asd = "snark-examples"; } @@ -94550,12 +94927,12 @@ lib.makeScope pkgs.newScope (self: { snark-feature = ( build-asdf-system { pname = "snark-feature"; - version = "20160421-git"; + version = "20250622-git"; asds = [ "snark-feature" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz"; - sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5"; + url = "https://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz"; + sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0"; system = "snark-feature"; asd = "snark-feature"; } @@ -94573,12 +94950,12 @@ lib.makeScope pkgs.newScope (self: { snark-implementation = ( build-asdf-system { pname = "snark-implementation"; - version = "20160421-git"; + version = "20250622-git"; asds = [ "snark-implementation" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz"; - sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5"; + url = "https://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz"; + sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0"; system = "snark-implementation"; asd = "snark-implementation"; } @@ -94604,12 +94981,12 @@ lib.makeScope pkgs.newScope (self: { snark-infix-reader = ( build-asdf-system { pname = "snark-infix-reader"; - version = "20160421-git"; + version = "20250622-git"; asds = [ "snark-infix-reader" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz"; - sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5"; + url = "https://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz"; + sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0"; system = "snark-infix-reader"; asd = "snark-infix-reader"; } @@ -94627,12 +95004,12 @@ lib.makeScope pkgs.newScope (self: { snark-lisp = ( build-asdf-system { pname = "snark-lisp"; - version = "20160421-git"; + version = "20250622-git"; asds = [ "snark-lisp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz"; - sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5"; + url = "https://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz"; + sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0"; system = "snark-lisp"; asd = "snark-lisp"; } @@ -94647,12 +95024,12 @@ lib.makeScope pkgs.newScope (self: { snark-loads = ( build-asdf-system { pname = "snark-loads"; - version = "20160421-git"; + version = "20250622-git"; asds = [ "snark-loads" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz"; - sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5"; + url = "https://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz"; + sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0"; system = "snark-loads"; asd = "snark-loads"; } @@ -94667,12 +95044,12 @@ lib.makeScope pkgs.newScope (self: { snark-numbering = ( build-asdf-system { pname = "snark-numbering"; - version = "20160421-git"; + version = "20250622-git"; asds = [ "snark-numbering" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz"; - sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5"; + url = "https://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz"; + sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0"; system = "snark-numbering"; asd = "snark-numbering"; } @@ -94691,12 +95068,12 @@ lib.makeScope pkgs.newScope (self: { snark-pkg = ( build-asdf-system { pname = "snark-pkg"; - version = "20160421-git"; + version = "20250622-git"; asds = [ "snark-pkg" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz"; - sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5"; + url = "https://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz"; + sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0"; system = "snark-pkg"; asd = "snark-pkg"; } @@ -94711,12 +95088,12 @@ lib.makeScope pkgs.newScope (self: { snark-sparse-array = ( build-asdf-system { pname = "snark-sparse-array"; - version = "20160421-git"; + version = "20250622-git"; asds = [ "snark-sparse-array" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz"; - sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5"; + url = "https://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz"; + sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0"; system = "snark-sparse-array"; asd = "snark-sparse-array"; } @@ -94738,7 +95115,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sndfile-blob" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sndfile-blob/2020-10-16/sndfile-blob-stable-git.tgz"; + url = "https://beta.quicklisp.org/archive/sndfile-blob/2020-10-16/sndfile-blob-stable-git.tgz"; sha256 = "1csbm2cgj76smia59044vx8698w9dy223cmwv8l4i8kb95m1i3l0"; system = "sndfile-blob"; asd = "sndfile-blob"; @@ -94761,7 +95138,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "snmp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/snmp/2016-10-31/snmp-6.1.tgz"; + url = "https://beta.quicklisp.org/archive/snmp/2016-10-31/snmp-6.1.tgz"; sha256 = "0qpy6jfp0v9i80gli1gf98sj0h67x9g5a8bqxrsxnqyi3h59di5s"; system = "snmp"; asd = "snmp"; @@ -94787,7 +95164,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "snmp-server" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/snmp/2016-10-31/snmp-6.1.tgz"; + url = "https://beta.quicklisp.org/archive/snmp/2016-10-31/snmp-6.1.tgz"; sha256 = "0qpy6jfp0v9i80gli1gf98sj0h67x9g5a8bqxrsxnqyi3h59di5s"; system = "snmp-server"; asd = "snmp-server"; @@ -94810,7 +95187,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "snmp-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/snmp/2016-10-31/snmp-6.1.tgz"; + url = "https://beta.quicklisp.org/archive/snmp/2016-10-31/snmp-6.1.tgz"; sha256 = "0qpy6jfp0v9i80gli1gf98sj0h67x9g5a8bqxrsxnqyi3h59di5s"; system = "snmp-test"; asd = "snmp-test"; @@ -94833,7 +95210,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "snmp-ui" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/snmp/2016-10-31/snmp-6.1.tgz"; + url = "https://beta.quicklisp.org/archive/snmp/2016-10-31/snmp-6.1.tgz"; sha256 = "0qpy6jfp0v9i80gli1gf98sj0h67x9g5a8bqxrsxnqyi3h59di5s"; system = "snmp-ui"; asd = "snmp-ui"; @@ -94853,7 +95230,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "snooze" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/snooze/2024-10-12/snooze-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/snooze/2024-10-12/snooze-20241012-git.tgz"; sha256 = "0gm9vxi7lcir80snka3qkl6sw8z90jaqf31c72bgyk9j8qkf7xvc"; system = "snooze"; asd = "snooze"; @@ -94880,7 +95257,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "snooze-demo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/snooze/2024-10-12/snooze-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/snooze/2024-10-12/snooze-20241012-git.tgz"; sha256 = "0gm9vxi7lcir80snka3qkl6sw8z90jaqf31c72bgyk9j8qkf7xvc"; system = "snooze-demo"; asd = "snooze"; @@ -94910,7 +95287,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "snooze-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/snooze/2024-10-12/snooze-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/snooze/2024-10-12/snooze-20241012-git.tgz"; sha256 = "0gm9vxi7lcir80snka3qkl6sw8z90jaqf31c72bgyk9j8qkf7xvc"; system = "snooze-tests"; asd = "snooze"; @@ -94929,12 +95306,12 @@ lib.makeScope pkgs.newScope (self: { softdrink = ( build-asdf-system { pname = "softdrink"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "softdrink" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/softdrink/2023-10-21/softdrink-20231021-git.tgz"; - sha256 = "1454mqpwb2s7m1myhibj2mrlm64wng1jgbv94mhs6hpzj2r2mgdi"; + url = "https://beta.quicklisp.org/archive/softdrink/2025-06-22/softdrink-20250622-git.tgz"; + sha256 = "07d3nswpxzb3xskya4n7dmv9lgnag0jv88nab6c4ls7ik1v4b9id"; system = "softdrink"; asd = "softdrink"; } @@ -94952,12 +95329,12 @@ lib.makeScope pkgs.newScope (self: { software-evolution-library = ( build-asdf-system { pname = "software-evolution-library"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "software-evolution-library" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sel/2024-10-12/sel-20241012-git.tgz"; - sha256 = "1j1disr1wcql30hdj3f49ss41843wlmqx486nkna6qbnnsfay66w"; + url = "https://beta.quicklisp.org/archive/sel/2025-06-22/sel-20250622-git.tgz"; + sha256 = "0y8kysbk3r9r3lyfa1dj8yf6nxzbjj2wilf9yfcl8b66yf87a1qs"; system = "software-evolution-library"; asd = "software-evolution-library"; } @@ -94982,7 +95359,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "solid-engine" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/solid-engine/2019-05-21/solid-engine-20190521-git.tgz"; + url = "https://beta.quicklisp.org/archive/solid-engine/2019-05-21/solid-engine-20190521-git.tgz"; sha256 = "1pxrgxfqz8br258jy35qyimsrz544fg9k7lw2jshkj4jr2pswsv0"; system = "solid-engine"; asd = "solid-engine"; @@ -95002,7 +95379,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "soundex" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/soundex/2010-10-06/soundex-1.0.tgz"; + url = "https://beta.quicklisp.org/archive/soundex/2010-10-06/soundex-1.0.tgz"; sha256 = "00ar2x7ja35337v6gwa4h2b8w7gf7dwx5mdfz91dqay43kx1pjsi"; system = "soundex"; asd = "soundex"; @@ -95018,12 +95395,12 @@ lib.makeScope pkgs.newScope (self: { source-error = ( build-asdf-system { pname = "source-error"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "source-error" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/coalton/2024-10-12/coalton-20241012-git.tgz"; - sha256 = "19flzjxf3y6pxm09bmr8bmiqbgh4f7d5jjbgx2cb3dckmgvvg1d7"; + url = "https://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz"; + sha256 = "0g6gfp3y9smzssi3dbddwxvx7g4hq6wz98h253gs4i15pd2pf3qp"; system = "source-error"; asd = "source-error"; } @@ -95042,7 +95419,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "south" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/south/2023-10-21/south-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/south/2023-10-21/south-20231021-git.tgz"; sha256 = "0acvi3nwddwphxm92i8bbv1nbb9zzx7gbcza5cr68rs8wydsr8h3"; system = "south"; asd = "south"; @@ -95067,7 +95444,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sparse-set" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sparse-set/2022-07-07/sparse-set-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/sparse-set/2022-07-07/sparse-set-20220707-git.tgz"; sha256 = "0czms03lrvg20hw3sz7wzzkl1z0vm0ndb3dmbvwsjd7m89fag793"; system = "sparse-set"; asd = "sparse-set"; @@ -95087,7 +95464,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "spatial-trees" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/spatial-trees/2014-08-26/spatial-trees-20140826-git.tgz"; + url = "https://beta.quicklisp.org/archive/spatial-trees/2014-08-26/spatial-trees-20140826-git.tgz"; sha256 = "11rhc6h501dwcik2igkszz7b9n515cr99m5pjh4r2qfwgiri6ysa"; system = "spatial-trees"; asd = "spatial-trees"; @@ -95107,7 +95484,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "spatial-trees.nns" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/spatial-trees/2014-08-26/spatial-trees-20140826-git.tgz"; + url = "https://beta.quicklisp.org/archive/spatial-trees/2014-08-26/spatial-trees-20140826-git.tgz"; sha256 = "11rhc6h501dwcik2igkszz7b9n515cr99m5pjh4r2qfwgiri6ysa"; system = "spatial-trees.nns"; asd = "spatial-trees.nns"; @@ -95132,7 +95509,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "spatial-trees.nns.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/spatial-trees/2014-08-26/spatial-trees-20140826-git.tgz"; + url = "https://beta.quicklisp.org/archive/spatial-trees/2014-08-26/spatial-trees-20140826-git.tgz"; sha256 = "11rhc6h501dwcik2igkszz7b9n515cr99m5pjh4r2qfwgiri6ysa"; system = "spatial-trees.nns.test"; asd = "spatial-trees.nns.test"; @@ -95159,7 +95536,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "spatial-trees.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/spatial-trees/2014-08-26/spatial-trees-20140826-git.tgz"; + url = "https://beta.quicklisp.org/archive/spatial-trees/2014-08-26/spatial-trees-20140826-git.tgz"; sha256 = "11rhc6h501dwcik2igkszz7b9n515cr99m5pjh4r2qfwgiri6ysa"; system = "spatial-trees.test"; asd = "spatial-trees.test"; @@ -95182,7 +95559,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "special-functions" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/special-functions/2022-11-06/special-functions-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/special-functions/2022-11-06/special-functions-20221106-git.tgz"; sha256 = "092szffy7zfxgrvfck11wnj8l0mgcym13yiafj01ad02lbj1fnnv"; system = "special-functions"; asd = "special-functions"; @@ -95207,7 +95584,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "specialization-store" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/specialization-store/2020-06-10/specialization-store-v0.0.5.tgz"; + url = "https://beta.quicklisp.org/archive/specialization-store/2020-06-10/specialization-store-v0.0.5.tgz"; sha256 = "03q0szyz8ygqmg10q4j97dy7gfr9icxay9s8bgs883yncbk42y6c"; system = "specialization-store"; asd = "specialization-store"; @@ -95231,7 +95608,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "specialization-store-features" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/specialization-store/2020-06-10/specialization-store-v0.0.5.tgz"; + url = "https://beta.quicklisp.org/archive/specialization-store/2020-06-10/specialization-store-v0.0.5.tgz"; sha256 = "03q0szyz8ygqmg10q4j97dy7gfr9icxay9s8bgs883yncbk42y6c"; system = "specialization-store-features"; asd = "specialization-store-features"; @@ -95254,7 +95631,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "specialization-store-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/specialization-store/2020-06-10/specialization-store-v0.0.5.tgz"; + url = "https://beta.quicklisp.org/archive/specialization-store/2020-06-10/specialization-store-v0.0.5.tgz"; sha256 = "03q0szyz8ygqmg10q4j97dy7gfr9icxay9s8bgs883yncbk42y6c"; system = "specialization-store-tests"; asd = "specialization-store-tests"; @@ -95277,7 +95654,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "specialized-function" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/specialized-function/2021-05-31/specialized-function-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/specialized-function/2021-05-31/specialized-function-20210531-git.tgz"; sha256 = "19hfgc83b7as630r1w9r8yl0v6xq3dn01vcrl0bd4pza5hgjn4la"; system = "specialized-function"; asd = "specialized-function"; @@ -95304,7 +95681,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "specialized-function.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/specialized-function/2021-05-31/specialized-function-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/specialized-function/2021-05-31/specialized-function-20210531-git.tgz"; sha256 = "19hfgc83b7as630r1w9r8yl0v6xq3dn01vcrl0bd4pza5hgjn4la"; system = "specialized-function.test"; asd = "specialized-function.test"; @@ -95323,12 +95700,12 @@ lib.makeScope pkgs.newScope (self: { speechless = ( build-asdf-system { pname = "speechless"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "speechless" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/speechless/2023-10-21/speechless-20231021-git.tgz"; - sha256 = "0x1v3gf0f0xpyxs8392r4xaqz214zmd1j89l61x9bg2h30k8ls37"; + url = "https://beta.quicklisp.org/archive/speechless/2025-06-22/speechless-20250622-git.tgz"; + sha256 = "1p9sgj0gaylzxv9vslvikzbj6vk2jm6rd6yklcslkfmyws6wyxhr"; system = "speechless"; asd = "speechless"; } @@ -95350,7 +95727,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "spell" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/spell/2019-03-07/spell-20190307-git.tgz"; + url = "https://beta.quicklisp.org/archive/spell/2019-03-07/spell-20190307-git.tgz"; sha256 = "1ifhx5q0iz80i9zwgcpv3w7xpp92ar9grz25008wnqzaayhfl020"; system = "spell"; asd = "spell"; @@ -95370,7 +95747,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "spellcheck" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/spellcheck/2013-10-03/spellcheck-20131003-git.tgz"; + url = "https://beta.quicklisp.org/archive/spellcheck/2013-10-03/spellcheck-20131003-git.tgz"; sha256 = "0a0r1dgh7y06s7j9mzxrryri8fhajzjsrrsh3i6vv65vq5zzxlka"; system = "spellcheck"; asd = "spellcheck"; @@ -95393,7 +95770,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sphinx" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sphinx/2011-06-19/cl-sphinx-20110619-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sphinx/2011-06-19/cl-sphinx-20110619-git.tgz"; sha256 = "0z1ksxz1gh12ly6lbc77l0d5f380s81vx44qakm2dl1398lgb7x1"; system = "sphinx"; asd = "sphinx"; @@ -95414,12 +95791,12 @@ lib.makeScope pkgs.newScope (self: { spinneret = ( build-asdf-system { pname = "spinneret"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "spinneret" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/spinneret/2024-10-12/spinneret-20241012-git.tgz"; - sha256 = "09ak35p487bwlwbv0vcdg9h869n8m7i3j1qj4f53lh1bm5s1zi5n"; + url = "https://beta.quicklisp.org/archive/spinneret/2025-06-22/spinneret-20250622-git.tgz"; + sha256 = "0bvs1055b91b0vdcagcbp3nqx064cjjf4vc8fdv4ym44yk1xzc79"; system = "spinneret"; asd = "spinneret"; } @@ -95445,7 +95822,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "split-sequence" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/split-sequence/2021-05-31/split-sequence-v2.0.1.tgz"; + url = "https://beta.quicklisp.org/archive/split-sequence/2021-05-31/split-sequence-v2.0.1.tgz"; sha256 = "172k7iv775kwism6304p6z7mqpjvipl57nq1bgvmbk445943fmhq"; system = "split-sequence"; asd = "split-sequence"; @@ -95463,7 +95840,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sqlite" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sqlite/2019-08-13/cl-sqlite-20190813-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sqlite/2019-08-13/cl-sqlite-20190813-git.tgz"; sha256 = "08iv7b4m0hh7qx2cvq4f510nrgdld0vicnvmqsh9w0fgrcgmyg4k"; system = "sqlite"; asd = "sqlite"; @@ -95484,7 +95861,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "srfi-1" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/srfi-1/2020-02-18/srfi-1-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/srfi-1/2020-02-18/srfi-1-20200218-git.tgz"; sha256 = "00r2ikf1ck1zz3mx3jgk3plf3ibfhhrr8sc8hzr6ix34sbfvdadg"; system = "srfi-1"; asd = "srfi-1"; @@ -95504,7 +95881,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "srfi-1.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/srfi-1/2020-02-18/srfi-1-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/srfi-1/2020-02-18/srfi-1-20200218-git.tgz"; sha256 = "00r2ikf1ck1zz3mx3jgk3plf3ibfhhrr8sc8hzr6ix34sbfvdadg"; system = "srfi-1.test"; asd = "srfi-1"; @@ -95527,7 +95904,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "srfi-23" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/srfi-23/2020-02-18/srfi-23-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/srfi-23/2020-02-18/srfi-23-20200218-git.tgz"; sha256 = "0hgq2bdpdjp550kk9xlrxh82n45ldb42j2zzhkndmffh4rp9hd13"; system = "srfi-23"; asd = "srfi-23"; @@ -95547,7 +95924,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "srfi-6" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/srfi-6/2020-02-18/srfi-6-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/srfi-6/2020-02-18/srfi-6-20200218-git.tgz"; sha256 = "1m9316r75haig84fhcrfm69gq0zfh5xqwqw8wsccc6z6vpz7pfwm"; system = "srfi-6"; asd = "srfi-6"; @@ -95567,7 +95944,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "srfi-98" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/srfi-98/2020-02-18/srfi-98-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/srfi-98/2020-02-18/srfi-98-20200218-git.tgz"; sha256 = "0qqa7c6nas85n8mdpmk996jh12xm0nf63nhj1chi9qkwgm924fj3"; system = "srfi-98"; asd = "srfi-98"; @@ -95587,7 +95964,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "srfi-98.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/srfi-98/2020-02-18/srfi-98-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/srfi-98/2020-02-18/srfi-98-20200218-git.tgz"; sha256 = "0qqa7c6nas85n8mdpmk996jh12xm0nf63nhj1chi9qkwgm924fj3"; system = "srfi-98.test"; asd = "srfi-98"; @@ -95610,7 +95987,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sse-client" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sse/2021-08-07/cl-sse-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sse/2021-08-07/cl-sse-20210807-git.tgz"; sha256 = "1by7xx397fyplxrydhfjm7nkxb6gmqh0h5f0rp4kh5dx45gk59gl"; system = "sse-client"; asd = "sse-client"; @@ -95630,7 +96007,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sse-client-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sse/2021-08-07/cl-sse-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sse/2021-08-07/cl-sse-20210807-git.tgz"; sha256 = "1by7xx397fyplxrydhfjm7nkxb6gmqh0h5f0rp4kh5dx45gk59gl"; system = "sse-client-test"; asd = "sse-client-test"; @@ -95654,7 +96031,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sse-demo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sse/2021-08-07/cl-sse-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sse/2021-08-07/cl-sse-20210807-git.tgz"; sha256 = "1by7xx397fyplxrydhfjm7nkxb6gmqh0h5f0rp4kh5dx45gk59gl"; system = "sse-demo"; asd = "sse-demo"; @@ -95679,7 +96056,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sse-server" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sse/2021-08-07/cl-sse-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sse/2021-08-07/cl-sse-20210807-git.tgz"; sha256 = "1by7xx397fyplxrydhfjm7nkxb6gmqh0h5f0rp4kh5dx45gk59gl"; system = "sse-server"; asd = "sse-server"; @@ -95702,7 +96079,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sse-server-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sse/2021-08-07/cl-sse-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sse/2021-08-07/cl-sse-20210807-git.tgz"; sha256 = "1by7xx397fyplxrydhfjm7nkxb6gmqh0h5f0rp4kh5dx45gk59gl"; system = "sse-server-test"; asd = "sse-server-test"; @@ -95726,7 +96103,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "st-json" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/st-json/2021-06-30/st-json-20210630-git.tgz"; + url = "https://beta.quicklisp.org/archive/st-json/2021-06-30/st-json-20210630-git.tgz"; sha256 = "06qrhr5iw73k96lai2x9w52l6gnmlxy7fsr0r35gz6nz1f71x7gx"; system = "st-json"; asd = "st-json"; @@ -95746,7 +96123,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "standard-cl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-match/2012-11-25/cl-match-20121125-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-match/2012-11-25/cl-match-20121125-git.tgz"; sha256 = "1qc8gzp7f4phgyi5whkxacrqzdqs0y1hvkf71m8n7l303jly9wjf"; system = "standard-cl"; asd = "standard-cl"; @@ -95762,12 +96139,12 @@ lib.makeScope pkgs.newScope (self: { staple = ( build-asdf-system { pname = "staple"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "staple" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/staple/2024-10-12/staple-20241012-git.tgz"; - sha256 = "147511d57xkv9d9crnqygj8lqkdpmbyq3g8b9cns130d8m46f2vi"; + url = "https://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz"; + sha256 = "0pjrjvkn54wrncf44fnang6mkfll6bdgfs0iiawi7xq5rb2ln7ik"; system = "staple"; asd = "staple"; } @@ -95792,12 +96169,12 @@ lib.makeScope pkgs.newScope (self: { staple-code-parser = ( build-asdf-system { pname = "staple-code-parser"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "staple-code-parser" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/staple/2024-10-12/staple-20241012-git.tgz"; - sha256 = "147511d57xkv9d9crnqygj8lqkdpmbyq3g8b9cns130d8m46f2vi"; + url = "https://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz"; + sha256 = "0pjrjvkn54wrncf44fnang6mkfll6bdgfs0iiawi7xq5rb2ln7ik"; system = "staple-code-parser"; asd = "staple-code-parser"; } @@ -95821,12 +96198,12 @@ lib.makeScope pkgs.newScope (self: { staple-markdown = ( build-asdf-system { pname = "staple-markdown"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "staple-markdown" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/staple/2024-10-12/staple-20241012-git.tgz"; - sha256 = "147511d57xkv9d9crnqygj8lqkdpmbyq3g8b9cns130d8m46f2vi"; + url = "https://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz"; + sha256 = "0pjrjvkn54wrncf44fnang6mkfll6bdgfs0iiawi7xq5rb2ln7ik"; system = "staple-markdown"; asd = "staple-markdown"; } @@ -95845,12 +96222,12 @@ lib.makeScope pkgs.newScope (self: { staple-markless = ( build-asdf-system { pname = "staple-markless"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "staple-markless" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/staple/2024-10-12/staple-20241012-git.tgz"; - sha256 = "147511d57xkv9d9crnqygj8lqkdpmbyq3g8b9cns130d8m46f2vi"; + url = "https://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz"; + sha256 = "0pjrjvkn54wrncf44fnang6mkfll6bdgfs0iiawi7xq5rb2ln7ik"; system = "staple-markless"; asd = "staple-markless"; } @@ -95868,12 +96245,12 @@ lib.makeScope pkgs.newScope (self: { staple-package-recording = ( build-asdf-system { pname = "staple-package-recording"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "staple-package-recording" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/staple/2024-10-12/staple-20241012-git.tgz"; - sha256 = "147511d57xkv9d9crnqygj8lqkdpmbyq3g8b9cns130d8m46f2vi"; + url = "https://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz"; + sha256 = "0pjrjvkn54wrncf44fnang6mkfll6bdgfs0iiawi7xq5rb2ln7ik"; system = "staple-package-recording"; asd = "staple-package-recording"; } @@ -95888,12 +96265,12 @@ lib.makeScope pkgs.newScope (self: { staple-restructured-text = ( build-asdf-system { pname = "staple-restructured-text"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "staple-restructured-text" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/staple/2024-10-12/staple-20241012-git.tgz"; - sha256 = "147511d57xkv9d9crnqygj8lqkdpmbyq3g8b9cns130d8m46f2vi"; + url = "https://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz"; + sha256 = "0pjrjvkn54wrncf44fnang6mkfll6bdgfs0iiawi7xq5rb2ln7ik"; system = "staple-restructured-text"; asd = "staple-restructured-text"; } @@ -95911,12 +96288,12 @@ lib.makeScope pkgs.newScope (self: { staple-server = ( build-asdf-system { pname = "staple-server"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "staple-server" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/staple/2024-10-12/staple-20241012-git.tgz"; - sha256 = "147511d57xkv9d9crnqygj8lqkdpmbyq3g8b9cns130d8m46f2vi"; + url = "https://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz"; + sha256 = "0pjrjvkn54wrncf44fnang6mkfll6bdgfs0iiawi7xq5rb2ln7ik"; system = "staple-server"; asd = "staple-server"; } @@ -95941,7 +96318,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "stars" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sprint-stars/2018-08-31/sprint-stars-20180831-git.tgz"; + url = "https://beta.quicklisp.org/archive/sprint-stars/2018-08-31/sprint-stars-20180831-git.tgz"; sha256 = "1pm6wvywfgy0vlb0b2lbybpvhw9xzyn1nlpy0wpcglxxig6mnrgi"; system = "stars"; asd = "stars"; @@ -95958,6 +96335,29 @@ lib.makeScope pkgs.newScope (self: { }; } ); + stateless-iterators = ( + build-asdf-system { + pname = "stateless-iterators"; + version = "20250622-git"; + asds = [ "stateless-iterators" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/stateless-iterators/2025-06-22/stateless-iterators-20250622-git.tgz"; + sha256 = "1d2jpvns52jfmyizhdkf02ng0qhg5jl3ngnrj9vw3zlqlrd19440"; + system = "stateless-iterators"; + asd = "stateless-iterators"; + } + ); + systems = [ "stateless-iterators" ]; + lispLibs = [ + (getAttr "alexandria" self) + (getAttr "serapeum" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); static-dispatch = ( build-asdf-system { pname = "static-dispatch"; @@ -95965,7 +96365,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "static-dispatch" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/static-dispatch/2021-12-09/static-dispatch-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/static-dispatch/2021-12-09/static-dispatch-20211209-git.tgz"; sha256 = "1cishp7nckda5hav6c907axdfn1zpmzxpsy6hk7kkb69qn81yn2i"; system = "static-dispatch"; asd = "static-dispatch"; @@ -95993,7 +96393,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "static-vectors" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/static-vectors/2024-10-12/static-vectors-v1.9.3.tgz"; + url = "https://beta.quicklisp.org/archive/static-vectors/2024-10-12/static-vectors-v1.9.3.tgz"; sha256 = "1sn37hyf6x56irn2qqc51ncqswa3n94j6cxwcj2ixgxmszcyzx5h"; system = "static-vectors"; asd = "static-vectors"; @@ -96014,7 +96414,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "statistics" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/statistics/2024-10-12/statistics-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/statistics/2024-10-12/statistics-20241012-git.tgz"; sha256 = "00dir3sif9jqc0b48vsk8r41h4zmf95jj4nqrc45mbnr80pmdrsl"; system = "statistics"; asd = "statistics"; @@ -96041,7 +96441,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "statusor" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/statusor/2023-06-18/statusor-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/statusor/2023-06-18/statusor-20230618-git.tgz"; sha256 = "1mxj4q7grvma6q05vj6sw4h4f2s121mnd77271lwnp74kjwh17cq"; system = "statusor"; asd = "statusor"; @@ -96061,7 +96461,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "stdutils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-stdutils/2011-10-01/cl-stdutils-20111001-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-stdutils/2011-10-01/cl-stdutils-20111001-git.tgz"; sha256 = "16vxxphqdq8264x0aanm36x9r6d3ci1gjf4vf46mwl59gcff4wcj"; system = "stdutils"; asd = "stdutils"; @@ -96084,7 +96484,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "stealth-mixin" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/stealth-mixin/2021-10-20/stealth-mixin-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/stealth-mixin/2021-10-20/stealth-mixin-20211020-git.tgz"; sha256 = "0ar9cdmbmdnqz1ywpw34n47hlh0vqmb6pl76f5vbfgip3c81xwyi"; system = "stealth-mixin"; asd = "stealth-mixin"; @@ -96104,7 +96504,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "stefil" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/stefil/2018-12-10/stefil-20181210-git.tgz"; + url = "https://beta.quicklisp.org/archive/stefil/2018-12-10/stefil-20181210-git.tgz"; sha256 = "0bqz64q2szzhf91zyqyssmvrz7da6442rs01808pf3wrdq28bclh"; system = "stefil"; asd = "stefil"; @@ -96127,7 +96527,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "stefil+" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/stefil-/2021-12-09/stefil--20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/stefil-/2021-12-09/stefil--20211209-git.tgz"; sha256 = "039jjhcb3ka6vag39hz5v1bi81x444rqj6rb3np5qbm07dh1aij0"; system = "stefil+"; asd = "stefil+"; @@ -96152,7 +96552,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "stefil-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/stefil/2018-12-10/stefil-20181210-git.tgz"; + url = "https://beta.quicklisp.org/archive/stefil/2018-12-10/stefil-20181210-git.tgz"; sha256 = "0bqz64q2szzhf91zyqyssmvrz7da6442rs01808pf3wrdq28bclh"; system = "stefil-test"; asd = "stefil"; @@ -96172,7 +96572,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "stem" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/stem/2015-06-08/stem-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/stem/2015-06-08/stem-20150608-git.tgz"; sha256 = "0a2kr09c3qcwg16n8rm15qgy5p9l6z4m72jray0846hqbnji77mp"; system = "stem"; asd = "stem"; @@ -96188,12 +96588,12 @@ lib.makeScope pkgs.newScope (self: { stepster = ( build-asdf-system { pname = "stepster"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "stepster" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/stepster/2024-10-12/stepster-20241012-git.tgz"; - sha256 = "027psal692mvpaj8bzp8fkkrsy5pgyrg8sr21xgc4m8ypp0shvw3"; + url = "https://beta.quicklisp.org/archive/stepster/2025-06-22/stepster-20250622-git.tgz"; + sha256 = "003knr53b298s9l5y73il579cnjf90c6zkdh15ddnj4cfq8bfckl"; system = "stepster"; asd = "stepster"; } @@ -96220,7 +96620,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "stl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/stl/2017-10-19/stl-20171019-git.tgz"; + url = "https://beta.quicklisp.org/archive/stl/2017-10-19/stl-20171019-git.tgz"; sha256 = "12v11bsarlnx5k930gx116wbgv41kwm45ysdikq3am4x3lqsjz2n"; system = "stl"; asd = "stl"; @@ -96240,7 +96640,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "stmx" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/stmx/2024-10-12/stmx-stable-95f7dea8-git.tgz"; + url = "https://beta.quicklisp.org/archive/stmx/2024-10-12/stmx-stable-95f7dea8-git.tgz"; sha256 = "1qq25y79casaa56a76gj9hk2f3hjcc5z3f4na4vy3sw99km54hn9"; system = "stmx"; asd = "stmx"; @@ -96266,7 +96666,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "stmx.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/stmx/2024-10-12/stmx-stable-95f7dea8-git.tgz"; + url = "https://beta.quicklisp.org/archive/stmx/2024-10-12/stmx-stable-95f7dea8-git.tgz"; sha256 = "1qq25y79casaa56a76gj9hk2f3hjcc5z3f4na4vy3sw99km54hn9"; system = "stmx.test"; asd = "stmx.test"; @@ -96291,7 +96691,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "stopclock" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/stopclock/2023-10-21/stopclock-v1.0.2.tgz"; + url = "https://beta.quicklisp.org/archive/stopclock/2023-10-21/stopclock-v1.0.2.tgz"; sha256 = "1p5lygznfasad1sw8whd2bg9bwi3z7nbncr3samd55nsi5yr3hfd"; system = "stopclock"; asd = "stopclock"; @@ -96307,12 +96707,12 @@ lib.makeScope pkgs.newScope (self: { str = ( build-asdf-system { pname = "str"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "str" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-str/2024-10-12/cl-str-20241012-git.tgz"; - sha256 = "1c9vcrm4gy3ljwnzjimsxswszfs2im1a4iqalpn1mhv8ddwavb2j"; + url = "https://beta.quicklisp.org/archive/cl-str/2025-06-22/cl-str-20250622-git.tgz"; + sha256 = "04hjv5cbflpsbhiic5ygld3kvzh775vprmn9n0i6q3w4xi2x56g2"; system = "str"; asd = "str"; } @@ -96329,12 +96729,12 @@ lib.makeScope pkgs.newScope (self: { str_dot_test = ( build-asdf-system { pname = "str.test"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "str.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-str/2024-10-12/cl-str-20241012-git.tgz"; - sha256 = "1c9vcrm4gy3ljwnzjimsxswszfs2im1a4iqalpn1mhv8ddwavb2j"; + url = "https://beta.quicklisp.org/archive/cl-str/2025-06-22/cl-str-20250622-git.tgz"; + sha256 = "04hjv5cbflpsbhiic5ygld3kvzh775vprmn9n0i6q3w4xi2x56g2"; system = "str.test"; asd = "str.test"; } @@ -96356,7 +96756,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "strict-function" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/strict-function/2021-10-20/strict-function-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/strict-function/2021-10-20/strict-function-20211020-git.tgz"; sha256 = "176l5024qa72my7wiag0w6mmwys1q4yk6b4n944378qbqr2zpq2a"; system = "strict-function"; asd = "strict-function"; @@ -96379,7 +96779,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "string-case" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/string-case/2018-07-11/string-case-20180711-git.tgz"; + url = "https://beta.quicklisp.org/archive/string-case/2018-07-11/string-case-20180711-git.tgz"; sha256 = "1n5i3yh0h5s636rcnwn7jwqy3rjflikra04lymimhpcshhjsk0md"; system = "string-case"; asd = "string-case"; @@ -96397,7 +96797,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "string-escape" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/string-escape/2015-04-07/string-escape-20150407-http.tgz"; + url = "https://beta.quicklisp.org/archive/string-escape/2015-04-07/string-escape-20150407-http.tgz"; sha256 = "0r7b699332hy3qj17jax9jdhq4jx6rbw5xf0j43bwg79wddk0rq3"; system = "string-escape"; asd = "string-escape"; @@ -96417,7 +96817,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "stripe" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/stripe/2024-10-12/stripe-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/stripe/2024-10-12/stripe-20241012-git.tgz"; sha256 = "1ng1381pg0mj1ba0ndxvhaqmm0w64v0gq0qsxbfm9kr6hq46gsf9"; system = "stripe"; asd = "stripe"; @@ -96442,7 +96842,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "stripe-against-the-modern-world" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/stripe-against-the-modern-world/2022-11-06/stripe-against-the-modern-world-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/stripe-against-the-modern-world/2022-11-06/stripe-against-the-modern-world-20221106-git.tgz"; sha256 = "1qp714y7b7vfdafirlphk02gixa4jffs0xgcy96fncxs6r2zq3q9"; system = "stripe-against-the-modern-world"; asd = "stripe-against-the-modern-world"; @@ -96472,7 +96872,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "structure-ext" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz"; sha256 = "1qhny1m0r2s9bkhr9z7psczykknmb62c32bwav4hgqm96rna1pkq"; system = "structure-ext"; asd = "structure-ext"; @@ -96496,7 +96896,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "structure-ext.as-class" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz"; sha256 = "1qhny1m0r2s9bkhr9z7psczykknmb62c32bwav4hgqm96rna1pkq"; system = "structure-ext.as-class"; asd = "structure-ext.as-class"; @@ -96520,7 +96920,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "structure-ext.as-class.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz"; sha256 = "1qhny1m0r2s9bkhr9z7psczykknmb62c32bwav4hgqm96rna1pkq"; system = "structure-ext.as-class.test"; asd = "structure-ext.as-class.test"; @@ -96543,7 +96943,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "structure-ext.left-arrow-accessors" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz"; sha256 = "1qhny1m0r2s9bkhr9z7psczykknmb62c32bwav4hgqm96rna1pkq"; system = "structure-ext.left-arrow-accessors"; asd = "structure-ext.left-arrow-accessors"; @@ -96563,7 +96963,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "structure-ext.left-arrow-accessors.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz"; sha256 = "1qhny1m0r2s9bkhr9z7psczykknmb62c32bwav4hgqm96rna1pkq"; system = "structure-ext.left-arrow-accessors.test"; asd = "structure-ext.left-arrow-accessors.test"; @@ -96586,7 +96986,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "structure-ext.make-instance" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz"; sha256 = "1qhny1m0r2s9bkhr9z7psczykknmb62c32bwav4hgqm96rna1pkq"; system = "structure-ext.make-instance"; asd = "structure-ext.make-instance"; @@ -96609,7 +97009,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "structure-ext.make-instance.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz"; sha256 = "1qhny1m0r2s9bkhr9z7psczykknmb62c32bwav4hgqm96rna1pkq"; system = "structure-ext.make-instance.test"; asd = "structure-ext.make-instance.test"; @@ -96632,7 +97032,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "structy-defclass" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/structy-defclass/2017-06-30/structy-defclass-20170630-git.tgz"; + url = "https://beta.quicklisp.org/archive/structy-defclass/2017-06-30/structy-defclass-20170630-git.tgz"; sha256 = "0fdlj45xzyghmg65dvs7ww7dxji84iid2y6rh9j77aip7v0l5q63"; system = "structy-defclass"; asd = "structy-defclass"; @@ -96652,7 +97052,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "studio-client" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/studio-client/2023-10-21/studio-client-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/studio-client/2023-10-21/studio-client-20231021-git.tgz"; sha256 = "0wxakd5jd0y6h2ii4690qav7zna6iyamdyksw5zjyz4xmsg4by2l"; system = "studio-client"; asd = "studio-client"; @@ -96673,12 +97073,12 @@ lib.makeScope pkgs.newScope (self: { stumpwm = ( build-asdf-system { pname = "stumpwm"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "stumpwm" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/stumpwm/2023-10-21/stumpwm-20231021-git.tgz"; - sha256 = "114kicsziqvm15x15yhc39j8qzv6gxz4wxc40xp968pprzr4a4d1"; + url = "https://beta.quicklisp.org/archive/stumpwm/2025-06-22/stumpwm-20250622-git.tgz"; + sha256 = "1l4rxcva947ijxsfnzyy35ql7a8pjsxaag51pq2bib3qfy7wg5ld"; system = "stumpwm"; asd = "stumpwm"; } @@ -96693,24 +97093,41 @@ lib.makeScope pkgs.newScope (self: { meta = { }; } ); - stumpwm-tests = ( + stumpwm-dynamic-float = ( build-asdf-system { - pname = "stumpwm-tests"; - version = "20231021-git"; - asds = [ "stumpwm-tests" ]; + pname = "stumpwm-dynamic-float"; + version = "20250622-git"; + asds = [ "stumpwm-dynamic-float" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/stumpwm/2023-10-21/stumpwm-20231021-git.tgz"; - sha256 = "114kicsziqvm15x15yhc39j8qzv6gxz4wxc40xp968pprzr4a4d1"; - system = "stumpwm-tests"; - asd = "stumpwm-tests"; + url = "https://beta.quicklisp.org/archive/stumpwm-dynamic-float/2025-06-22/stumpwm-dynamic-float-20250622-git.tgz"; + sha256 = "13m9864vfj4b5b0hlvp7jrb96368rxr5ydjsdqldky10yad7icxf"; + system = "stumpwm-dynamic-float"; + asd = "stumpwm-dynamic-float"; } ); - systems = [ "stumpwm-tests" ]; - lispLibs = [ - (getAttr "fiasco" self) - (getAttr "stumpwm" self) - ]; + systems = [ "stumpwm-dynamic-float" ]; + lispLibs = [ (getAttr "stumpwm" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + stumpwm-sndioctl = ( + build-asdf-system { + pname = "stumpwm-sndioctl"; + version = "20250622-git"; + asds = [ "stumpwm-sndioctl" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/stumpwm-sndioctl/2025-06-22/stumpwm-sndioctl-20250622-git.tgz"; + sha256 = "1q4w4grim7izvw01k95wh7bbaaq0hz2ljjhn47nyd7pzrk9dabpv"; + system = "stumpwm-sndioctl"; + asd = "stumpwm-sndioctl"; + } + ); + systems = [ "stumpwm-sndioctl" ]; + lispLibs = [ (getAttr "stumpwm" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -96723,7 +97140,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sucle" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; system = "sucle"; asd = "sucle"; @@ -96765,7 +97182,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sucle-multiprocessing" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; system = "sucle-multiprocessing"; asd = "sucle-multiprocessing"; @@ -96791,7 +97208,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sucle-serialize" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; system = "sucle-serialize"; asd = "sucle-serialize"; @@ -96815,7 +97232,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sucle-temp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; system = "sucle-temp"; asd = "sucle-temp"; @@ -96835,7 +97252,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sucle-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; system = "sucle-test"; asd = "sucle-test"; @@ -96872,12 +97289,12 @@ lib.makeScope pkgs.newScope (self: { surf = ( build-asdf-system { pname = "surf"; - version = "master-fe503896-git"; + version = "master-5a621564-git"; asds = [ "surf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz"; - sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10"; + url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; + sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; system = "surf"; asd = "surf"; } @@ -96892,12 +97309,12 @@ lib.makeScope pkgs.newScope (self: { swank = ( build-asdf-system { pname = "swank"; - version = "v2.30"; + version = "v2.31"; asds = [ "swank" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/slime/2024-10-12/slime-v2.30.tgz"; - sha256 = "0qb7m65gq0mbxfrdppkh3k4jn13i14i07ziga4r8b3rmrxhrmlv0"; + url = "https://beta.quicklisp.org/archive/slime/2025-06-22/slime-v2.31.tgz"; + sha256 = "0rqjw2c5hzmrmvbf37l6fdx6pria6d360nvqka47qc74s4pw1hyi"; system = "swank"; asd = "swank"; } @@ -96914,7 +97331,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "swank-client" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/swank-client/2023-06-18/swank-client-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/swank-client/2023-06-18/swank-client-20230618-git.tgz"; sha256 = "0sd0xblaxj8zi03acmfq4pwv84jcl04fvyp1jqlb7d6iq0mbxvan"; system = "swank-client"; asd = "swank-client"; @@ -96939,7 +97356,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "swank-crew" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/swank-crew/2024-10-12/swank-crew-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/swank-crew/2024-10-12/swank-crew-20241012-git.tgz"; sha256 = "0v0gg9d74x28xw3n12nrvkdnnvz0m972l4rymfansfaawiqm7ssz"; system = "swank-crew"; asd = "swank-crew"; @@ -96963,7 +97380,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "swank-protocol" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/swank-protocol/2024-10-12/swank-protocol-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/swank-protocol/2024-10-12/swank-protocol-20241012-git.tgz"; sha256 = "0vqcdxp228fk3snay90ml33r1y03l5k05snq633f95his8ffxknl"; system = "swank-protocol"; asd = "swank-protocol"; @@ -96986,7 +97403,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "swank.live" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/swank.live/2016-02-08/swank.live-20160208-git.tgz"; + url = "https://beta.quicklisp.org/archive/swank.live/2016-02-08/swank.live-20160208-git.tgz"; sha256 = "0p7jyf07symfan6lmbhd3r42kf5vrsbmmh9li0n1kky8rd6fhgls"; system = "swank.live"; asd = "swank.live"; @@ -97006,7 +97423,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "swap-bytes" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/swap-bytes/2019-11-30/swap-bytes-v1.2.tgz"; + url = "https://beta.quicklisp.org/archive/swap-bytes/2019-11-30/swap-bytes-v1.2.tgz"; sha256 = "1hw1v1lw26rifyznpnj1csphha9jgzwpiic16ni3pvs6hcsni9rz"; system = "swap-bytes"; asd = "swap-bytes"; @@ -97020,12 +97437,12 @@ lib.makeScope pkgs.newScope (self: { sxql = ( build-asdf-system { pname = "sxql"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "sxql" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sxql/2024-10-12/sxql-20241012-git.tgz"; - sha256 = "11x4qgdwbddbk0a8avrirp1ksmphfxlimirfwvmiwi0jc4zd5csa"; + url = "https://beta.quicklisp.org/archive/sxql/2025-06-22/sxql-20250622-git.tgz"; + sha256 = "0lm6f35h5cg0a1rrpfkfgifp1i2ws0vy3w98kngv886jj9r6jjdn"; system = "sxql"; asd = "sxql"; } @@ -97053,7 +97470,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sxql-composer" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sxql-composer/2020-03-25/sxql-composer-20200325-git.tgz"; + url = "https://beta.quicklisp.org/archive/sxql-composer/2020-03-25/sxql-composer-20200325-git.tgz"; sha256 = "1agkrj3ymskzc3c7pxbrj123d1kygjqcls145m0ap3i07q96hh1r"; system = "sxql-composer"; asd = "sxql-composer"; @@ -97069,12 +97486,12 @@ lib.makeScope pkgs.newScope (self: { sxql-test = ( build-asdf-system { pname = "sxql-test"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "sxql-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sxql/2024-10-12/sxql-20241012-git.tgz"; - sha256 = "11x4qgdwbddbk0a8avrirp1ksmphfxlimirfwvmiwi0jc4zd5csa"; + url = "https://beta.quicklisp.org/archive/sxql/2025-06-22/sxql-20250622-git.tgz"; + sha256 = "0lm6f35h5cg0a1rrpfkfgifp1i2ws0vy3w98kngv886jj9r6jjdn"; system = "sxql-test"; asd = "sxql-test"; } @@ -97097,7 +97514,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sycamore" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sycamore/2021-10-20/sycamore-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/sycamore/2021-10-20/sycamore-20211020-git.tgz"; sha256 = "0icw7fba1ch51w24f4sinvy4xg3zc7zif0aqcjfrzxj14x108hai"; system = "sycamore"; asd = "sycamore"; @@ -97116,18 +97533,18 @@ lib.makeScope pkgs.newScope (self: { symath = ( build-asdf-system { pname = "symath"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "symath" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/symath/2024-10-12/symath-20241012-git.tgz"; - sha256 = "1bxggf9kn4bhx877hyj4kpr76p47d8cd35lgv224hri5211fqyaz"; + url = "https://beta.quicklisp.org/archive/symath/2025-06-22/symath-20250622-git.tgz"; + sha256 = "01603s8cbifwy7x6jqmxff232pyq99nzjlxn2sjbzx11hwf8092l"; system = "symath"; asd = "symath"; } ); systems = [ "symath" ]; - lispLibs = [ ]; + lispLibs = [ (getAttr "alexandria" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -97140,7 +97557,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "symbol-munger" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/symbol-munger/2022-02-20/symbol-munger-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/symbol-munger/2022-02-20/symbol-munger-20220220-git.tgz"; sha256 = "16fshnxp9212503z1vjlmx5pafv14bzpihn486x1ljakqjigfnfz"; system = "symbol-munger"; asd = "symbol-munger"; @@ -97161,7 +97578,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "symbol-namespaces" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/symbol-namespaces/2013-01-28/symbol-namespaces-1.0.tgz"; + url = "https://beta.quicklisp.org/archive/symbol-namespaces/2013-01-28/symbol-namespaces-1.0.tgz"; sha256 = "0rw4ndhg669rkpjmv5n0zh69bzar60zn3bb4vs5ijgvxyl5f7xp1"; system = "symbol-namespaces"; asd = "symbol-namespaces"; @@ -97181,7 +97598,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "synonyms" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/synonyms/2023-06-18/synonyms-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/synonyms/2023-06-18/synonyms-20230618-git.tgz"; sha256 = "1373m0h765r60lif0jz3frqbq7phrm2jhc30b5dh51spd7732v3x"; system = "synonyms"; asd = "synonyms"; @@ -97201,7 +97618,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "sysexits" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-sysexits/2022-07-07/cl-sysexits-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-sysexits/2022-07-07/cl-sysexits-20220707-git.tgz"; sha256 = "1khkj0qqvmgylnvl32sks8v3iabasbcr9sj9zl89xh3rajc67z73"; system = "sysexits"; asd = "sysexits"; @@ -97217,12 +97634,12 @@ lib.makeScope pkgs.newScope (self: { system-locale = ( build-asdf-system { pname = "system-locale"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "system-locale" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/system-locale/2024-10-12/system-locale-20241012-git.tgz"; - sha256 = "1q91vyvsh787fz3j49lmyw2lx85288cmamb11h99wdmbmf61rdgr"; + url = "https://beta.quicklisp.org/archive/system-locale/2025-06-22/system-locale-20250622-git.tgz"; + sha256 = "1v794i2f652c1qplbb8igr4dl98xxz7ha9c5ckzql50ykdw871jy"; system = "system-locale"; asd = "system-locale"; } @@ -97237,12 +97654,12 @@ lib.makeScope pkgs.newScope (self: { t-clack-handler-hunchentoot = ( build-asdf-system { pname = "t-clack-handler-hunchentoot"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "t-clack-handler-hunchentoot" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clack/2024-10-12/clack-20241012-git.tgz"; - sha256 = "0dljkfxdypn50d6jlssl79ag072r7lcdhfy771hna0ihxii8vsm3"; + url = "https://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz"; + sha256 = "1b6b1cna3r0gi6lq3jphy08012p700ngwas5rqkhlk61791yd944"; system = "t-clack-handler-hunchentoot"; asd = "t-clack-handler-hunchentoot"; } @@ -97260,12 +97677,12 @@ lib.makeScope pkgs.newScope (self: { t-clack-handler-toot = ( build-asdf-system { pname = "t-clack-handler-toot"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "t-clack-handler-toot" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clack/2024-10-12/clack-20241012-git.tgz"; - sha256 = "0dljkfxdypn50d6jlssl79ag072r7lcdhfy771hna0ihxii8vsm3"; + url = "https://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz"; + sha256 = "1b6b1cna3r0gi6lq3jphy08012p700ngwas5rqkhlk61791yd944"; system = "t-clack-handler-toot"; asd = "t-clack-handler-toot"; } @@ -97283,12 +97700,12 @@ lib.makeScope pkgs.newScope (self: { t-clack-handler-wookie = ( build-asdf-system { pname = "t-clack-handler-wookie"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "t-clack-handler-wookie" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clack/2024-10-12/clack-20241012-git.tgz"; - sha256 = "0dljkfxdypn50d6jlssl79ag072r7lcdhfy771hna0ihxii8vsm3"; + url = "https://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz"; + sha256 = "1b6b1cna3r0gi6lq3jphy08012p700ngwas5rqkhlk61791yd944"; system = "t-clack-handler-wookie"; asd = "t-clack-handler-wookie"; } @@ -97303,12 +97720,12 @@ lib.makeScope pkgs.newScope (self: { ta2 = ( build-asdf-system { pname = "ta2"; - version = "master-fe503896-git"; + version = "master-5a621564-git"; asds = [ "ta2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz"; - sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10"; + url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; + sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; system = "ta2"; asd = "ta2"; } @@ -97327,7 +97744,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "tagger" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tagger/2020-07-15/tagger-20200715-git.tgz"; + url = "https://beta.quicklisp.org/archive/tagger/2020-07-15/tagger-20200715-git.tgz"; sha256 = "1mxkr5hx8p4rxc7vajgrpl49zh018wyspvww5fg50164if0n7j2q"; system = "tagger"; asd = "tagger"; @@ -97347,7 +97764,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "taglib" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/taglib/2024-10-12/taglib-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/taglib/2024-10-12/taglib-20241012-git.tgz"; sha256 = "1jhi38g2ngmbsv71chxyavgf4fzb64nr7z648ia01qxii0435csb"; system = "taglib"; asd = "taglib"; @@ -97372,7 +97789,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "taglib-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/taglib/2024-10-12/taglib-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/taglib/2024-10-12/taglib-20241012-git.tgz"; sha256 = "1jhi38g2ngmbsv71chxyavgf4fzb64nr7z648ia01qxii0435csb"; system = "taglib-tests"; asd = "taglib-tests"; @@ -97396,7 +97813,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "tailrec" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tailrec/2021-08-07/tailrec-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/tailrec/2021-08-07/tailrec-20210807-git.tgz"; sha256 = "1h8m2npdzd2cpnl75pvv4yvvfwxa7kl6qvalc9s0y4yws0kaih3i"; system = "tailrec"; asd = "tailrec"; @@ -97420,7 +97837,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "talcl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/talcl/2018-02-28/talcl-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/talcl/2018-02-28/talcl-20180228-git.tgz"; sha256 = "18pm3vz82dwcckhp4lkwjv8431hkdj3ghxb4v5qdjsyw2jm56v1p"; system = "talcl"; asd = "talcl"; @@ -97447,7 +97864,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "talcl-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/talcl/2018-02-28/talcl-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/talcl/2018-02-28/talcl-20180228-git.tgz"; sha256 = "18pm3vz82dwcckhp4lkwjv8431hkdj3ghxb4v5qdjsyw2jm56v1p"; system = "talcl-examples"; asd = "talcl"; @@ -97470,7 +97887,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "talcl-speed-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/talcl/2018-02-28/talcl-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/talcl/2018-02-28/talcl-20180228-git.tgz"; sha256 = "18pm3vz82dwcckhp4lkwjv8431hkdj3ghxb4v5qdjsyw2jm56v1p"; system = "talcl-speed-tests"; asd = "talcl"; @@ -97495,7 +97912,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "talcl-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/talcl/2018-02-28/talcl-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/talcl/2018-02-28/talcl-20180228-git.tgz"; sha256 = "18pm3vz82dwcckhp4lkwjv8431hkdj3ghxb4v5qdjsyw2jm56v1p"; system = "talcl-test"; asd = "talcl"; @@ -97519,7 +97936,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "tap-unit-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tap-unit-test/2017-12-27/tap-unit-test-20171227-git.tgz"; + url = "https://beta.quicklisp.org/archive/tap-unit-test/2017-12-27/tap-unit-test-20171227-git.tgz"; sha256 = "1fzsnpng7y4sghasl29sjicbs4v6m5mgfj8wf2izhhcn1hbhr694"; system = "tap-unit-test"; asd = "tap-unit-test"; @@ -97539,7 +97956,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "tar" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-tar/2023-06-18/cl-tar-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-tar/2023-06-18/cl-tar-20230618-git.tgz"; sha256 = "0wp23cs3i6a89dibifiz6559la5nk58d1n17xvbxq4nrl8cqsllf"; system = "tar"; asd = "tar"; @@ -97566,7 +97983,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "tar-file" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-tar-file/2022-02-20/cl-tar-file-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-tar-file/2022-02-20/cl-tar-file-20220220-git.tgz"; sha256 = "0i8j05fkgdqy4c4pqj0c68sh4s3klpx9kc5wp73qwzrl3xqd2svy"; system = "tar-file"; asd = "tar-file"; @@ -97594,7 +98011,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "targa" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/targa/2018-10-18/targa-20181018-git.tgz"; + url = "https://beta.quicklisp.org/archive/targa/2018-10-18/targa-20181018-git.tgz"; sha256 = "0fslb2alp4pfmp8md2q89xh8n43r8awwf343wfvkywwqdnls2zws"; system = "targa"; asd = "targa"; @@ -97610,12 +98027,12 @@ lib.makeScope pkgs.newScope (self: { tasty = ( build-asdf-system { pname = "tasty"; - version = "master-fe503896-git"; + version = "master-5a621564-git"; asds = [ "tasty" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz"; - sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10"; + url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; + sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; system = "tasty"; asd = "tasty"; } @@ -97630,35 +98047,15 @@ lib.makeScope pkgs.newScope (self: { }; } ); - tclcs-code = ( - build-asdf-system { - pname = "tclcs-code"; - version = "20210124-git"; - asds = [ "tclcs-code" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/tclcs-code/2021-01-24/tclcs-code-20210124-git.tgz"; - sha256 = "0p0g8shy284sj9ncq27zn8yj7xsrdcg2aiy2q783l6sl2ip6nfxa"; - system = "tclcs-code"; - asd = "tclcs-code"; - } - ); - systems = [ "tclcs-code" ]; - lispLibs = [ (getAttr "trivial-custom-debugger" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); tcod = ( build-asdf-system { pname = "tcod"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "tcod" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-tcod/2023-10-21/cl-tcod-20231021-git.tgz"; - sha256 = "1r4ip16dlzr56p94b0grw6nmkykbmgb04jsqdvgl1ypcmbpfr3i1"; + url = "https://beta.quicklisp.org/archive/cl-tcod/2025-06-22/cl-tcod-20250622-git.tgz"; + sha256 = "1m3fgfc7nfk8yn4z1c09lixnk0sr3szxqihq3fx4j6is430ywxdd"; system = "tcod"; asd = "tcod"; } @@ -97681,7 +98078,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "teddy" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/teddy/2024-10-12/teddy-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/teddy/2024-10-12/teddy-20241012-git.tgz"; sha256 = "0qg83khyny5pw9lk3ysid32wl1wds43ja35qx72mxpli3nhj7nhq"; system = "teddy"; asd = "teddy"; @@ -97711,7 +98108,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "teepeedee2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/teepeedee2/2023-02-14/teepeedee2-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/teepeedee2/2023-02-14/teepeedee2-20230214-git.tgz"; sha256 = "16mfc1hcjdjcj1iiihdn9a725xry8hpvxijf5ic6yi4ydcv84pni"; system = "teepeedee2"; asd = "teepeedee2"; @@ -97741,7 +98138,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "teepeedee2-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/teepeedee2/2023-02-14/teepeedee2-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/teepeedee2/2023-02-14/teepeedee2-20230214-git.tgz"; sha256 = "16mfc1hcjdjcj1iiihdn9a725xry8hpvxijf5ic6yi4ydcv84pni"; system = "teepeedee2-test"; asd = "teepeedee2-test"; @@ -97764,7 +98161,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "telnetlib" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/telnetlib/2014-12-17/telnetlib-20141217-git.tgz"; + url = "https://beta.quicklisp.org/archive/telnetlib/2014-12-17/telnetlib-20141217-git.tgz"; sha256 = "1gdf6i352qkmp27nqbv6qfi7sqn5wjzdaffh6ls1y5jznqh3nb0h"; system = "telnetlib"; asd = "telnetlib"; @@ -97784,7 +98181,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "template" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/template/2023-06-18/template-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/template/2023-06-18/template-20230618-git.tgz"; sha256 = "1ccnjawxwjqk8gavqga7waqrxv0pmncbycyfwylyly7a1c7zjadr"; system = "template"; asd = "template"; @@ -97807,7 +98204,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "template-function" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/template-function/2017-11-30/template-function-v0.0.1-git.tgz"; + url = "https://beta.quicklisp.org/archive/template-function/2017-11-30/template-function-v0.0.1-git.tgz"; sha256 = "1nq782cdi9vr3hgqqyzvvng2sbyc09biggwq4zp7k1vmqnm6qdaf"; system = "template-function"; asd = "template-function"; @@ -97831,7 +98228,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "template-function-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/template-function/2017-11-30/template-function-v0.0.1-git.tgz"; + url = "https://beta.quicklisp.org/archive/template-function/2017-11-30/template-function-v0.0.1-git.tgz"; sha256 = "1nq782cdi9vr3hgqqyzvvng2sbyc09biggwq4zp7k1vmqnm6qdaf"; system = "template-function-tests"; asd = "template-function-tests"; @@ -97854,7 +98251,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "temporal-functions" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/temporal-functions/2017-10-19/temporal-functions-20171019-git.tgz"; + url = "https://beta.quicklisp.org/archive/temporal-functions/2017-10-19/temporal-functions-20171019-git.tgz"; sha256 = "03cbgw949g68n72nqp0nmjq9nx0kfz5zs6kpk0pwchy3i8bwf22j"; system = "temporal-functions"; asd = "temporal-functions"; @@ -97874,7 +98271,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "temporary-file" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/temporary-file/2015-06-08/temporary-file-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/temporary-file/2015-06-08/temporary-file-20150608-git.tgz"; sha256 = "0m38lncj6bmj7gwq8vp7l0gwzmk7pfasl4samzgl2fah8hzb064a"; system = "temporary-file"; asd = "temporary-file"; @@ -97900,7 +98297,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ten" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ten/2024-10-12/ten-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/ten/2024-10-12/ten-20241012-git.tgz"; sha256 = "0zrbgyvc21gq8r507jm664zd4r9q206g2ah1yybwi32lgzify6nk"; system = "ten"; asd = "ten"; @@ -97925,7 +98322,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ten.examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ten/2024-10-12/ten-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/ten/2024-10-12/ten-20241012-git.tgz"; sha256 = "0zrbgyvc21gq8r507jm664zd4r9q206g2ah1yybwi32lgzify6nk"; system = "ten.examples"; asd = "ten.examples"; @@ -97945,7 +98342,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ten.i18n.cl-locale" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ten/2024-10-12/ten-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/ten/2024-10-12/ten-20241012-git.tgz"; sha256 = "0zrbgyvc21gq8r507jm664zd4r9q206g2ah1yybwi32lgzify6nk"; system = "ten.i18n.cl-locale"; asd = "ten.i18n.cl-locale"; @@ -97968,7 +98365,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ten.i18n.gettext" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ten/2024-10-12/ten-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/ten/2024-10-12/ten-20241012-git.tgz"; sha256 = "0zrbgyvc21gq8r507jm664zd4r9q206g2ah1yybwi32lgzify6nk"; system = "ten.i18n.gettext"; asd = "ten.i18n.gettext"; @@ -97991,7 +98388,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ten.tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ten/2024-10-12/ten-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/ten/2024-10-12/ten-20241012-git.tgz"; sha256 = "0zrbgyvc21gq8r507jm664zd4r9q206g2ah1yybwi32lgzify6nk"; system = "ten.tests"; asd = "ten.tests"; @@ -98015,7 +98412,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "terminfo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/terminfo/2021-01-24/terminfo-20210124-git.tgz"; + url = "https://beta.quicklisp.org/archive/terminfo/2021-01-24/terminfo-20210124-git.tgz"; sha256 = "1nmin9rr6f75xdhxysba66xa1dh62fh27w9ad1cvmj0062armf6b"; system = "terminfo"; asd = "terminfo"; @@ -98028,6 +98425,26 @@ lib.makeScope pkgs.newScope (self: { }; } ); + termp = ( + build-asdf-system { + pname = "termp"; + version = "20250622-git"; + asds = [ "termp" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/termp/2025-06-22/termp-20250622-git.tgz"; + sha256 = "03r5cv01q4yg0a2dv2ckn2xys53y9isrq3hkp0dqa96q8wrindlh"; + system = "termp"; + asd = "termp"; + } + ); + systems = [ "termp" ]; + lispLibs = [ ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); terrable = ( build-asdf-system { pname = "terrable"; @@ -98035,7 +98452,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "terrable" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/terrable/2023-10-21/terrable-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/terrable/2023-10-21/terrable-20231021-git.tgz"; sha256 = "03fjfdffr5lf12llqbf3d07dd87ykfyw525dxnwm6gpyvg49wlgl"; system = "terrable"; asd = "terrable"; @@ -98061,7 +98478,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "tesseract-capi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tesseract-capi/2020-12-20/tesseract-capi-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/tesseract-capi/2020-12-20/tesseract-capi-20201220-git.tgz"; sha256 = "1g8afgzbvfk80gi05nbwp9cmmrsqm5knhqi04v1cx556vrbp6ks1"; system = "tesseract-capi"; asd = "tesseract-capi"; @@ -98080,12 +98497,12 @@ lib.makeScope pkgs.newScope (self: { test-40ants-system = ( build-asdf-system { pname = "test-40ants-system"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "test-40ants-system" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/40ants-asdf-system/2024-10-12/40ants-asdf-system-20241012-git.tgz"; - sha256 = "0wi575m0s0a9fvp1wy5ga760f71la16z1633qk6s2f87rwcjs8kw"; + url = "https://beta.quicklisp.org/archive/40ants-asdf-system/2025-06-22/40ants-asdf-system-20250622-git.tgz"; + sha256 = "151zfyz7c4xrd4mnyzd5nsla1p70q4iixgm9mlnbm799mr1aprwp"; system = "test-40ants-system"; asd = "test-40ants-system"; } @@ -98100,12 +98517,12 @@ lib.makeScope pkgs.newScope (self: { test-gadgets = ( build-asdf-system { pname = "test-gadgets"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "test-gadgets" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gadgets/2024-10-12/gadgets-20241012-git.tgz"; - sha256 = "1ba4gj8lh3ihbb66xiz7hc8cdg3gvi3q20w32nmsqdch956is34k"; + url = "https://beta.quicklisp.org/archive/gadgets/2025-06-22/gadgets-20250622-git.tgz"; + sha256 = "0dbia2679dj4kr2ndh15ib26l9kw6zxx0qjn4l0jkcdx7shrkll6"; system = "test-gadgets"; asd = "test-gadgets"; } @@ -98123,12 +98540,12 @@ lib.makeScope pkgs.newScope (self: { test-paren6 = ( build-asdf-system { pname = "test-paren6"; - version = "20220331-git"; + version = "20250622-git"; asds = [ "test-paren6" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/paren6/2022-03-31/paren6-20220331-git.tgz"; - sha256 = "0m7z7zkc1vrwmp68f3yx0mdsb0j45dmw3iddnbvf94dpv8aywwpx"; + url = "https://beta.quicklisp.org/archive/paren6/2025-06-22/paren6-20250622-git.tgz"; + sha256 = "1ib57mfq82c62nd0ikic6mjbivwv7x7g5fgjblq7jssms6s7h9wm"; system = "test-paren6"; asd = "test-paren6"; } @@ -98151,7 +98568,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "test-serial-system" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/asdf-dependency-grovel/2017-04-03/asdf-dependency-grovel-20170403-git.tgz"; + url = "https://beta.quicklisp.org/archive/asdf-dependency-grovel/2017-04-03/asdf-dependency-grovel-20170403-git.tgz"; sha256 = "1y4kdqsda4ira4r9dws6kxzzv6mg45q3lkmb2c9mg9q7ksc5glif"; system = "test-serial-system"; asd = "test-serial-system"; @@ -98171,7 +98588,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "test-utils" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/test-utils/2020-06-10/test-utils-20200610-git.tgz"; + url = "https://beta.quicklisp.org/archive/test-utils/2020-06-10/test-utils-20200610-git.tgz"; sha256 = "036a8wvs37lnsf9dy3c810qk54963v7hnxx0zas25b50ikcmiqm5"; system = "test-utils"; asd = "test-utils"; @@ -98196,7 +98613,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "test.eager-future2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/eager-future2/2019-11-30/eager-future2-20191130-git.tgz"; + url = "https://beta.quicklisp.org/archive/eager-future2/2019-11-30/eager-future2-20191130-git.tgz"; sha256 = "1qs1bv3m0ki8l5czhsflxcryh22r9d9g9a3a3b0cr0pl954q5rld"; system = "test.eager-future2"; asd = "test.eager-future2"; @@ -98219,7 +98636,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "test.vas-string-metrics" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vas-string-metrics/2021-12-09/vas-string-metrics-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/vas-string-metrics/2021-12-09/vas-string-metrics-20211209-git.tgz"; sha256 = "1yvkwc939dckv070nlgqfj5ys9ii2rm32m5wfx7qxdjrb4n19sx9"; system = "test.vas-string-metrics"; asd = "test.vas-string-metrics"; @@ -98239,7 +98656,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "testbild" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/testbild/2010-12-07/testbild-20101207-git.tgz"; + url = "https://beta.quicklisp.org/archive/testbild/2010-12-07/testbild-20101207-git.tgz"; sha256 = "024b6rlgljcjazwg302zkdmkpxs2hirjg7g39ypppz81ns2v65sw"; system = "testbild"; asd = "testbild"; @@ -98262,7 +98679,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "testbild-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/testbild/2010-12-07/testbild-20101207-git.tgz"; + url = "https://beta.quicklisp.org/archive/testbild/2010-12-07/testbild-20101207-git.tgz"; sha256 = "024b6rlgljcjazwg302zkdmkpxs2hirjg7g39ypppz81ns2v65sw"; system = "testbild-test"; asd = "testbild-test"; @@ -98283,18 +98700,38 @@ lib.makeScope pkgs.newScope (self: { testiere = ( build-asdf-system { pname = "testiere"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "testiere" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/testiere/2024-10-12/testiere-20241012-git.tgz"; - sha256 = "0sfsk7i5kxk8s1273i9vwz49hak0qdrr9asq70kdiwq0lfd56kgg"; + url = "https://beta.quicklisp.org/archive/testiere/2025-06-22/testiere-20250622-git.tgz"; + sha256 = "0jn07812abpmlb4rig2v4ckgv5afx7jl03fvi06jn2890i527058"; system = "testiere"; asd = "testiere"; } ); systems = [ "testiere" ]; - lispLibs = [ (getAttr "trivia" self) ]; + lispLibs = [ ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + testiere-examples = ( + build-asdf-system { + pname = "testiere-examples"; + version = "20250622-git"; + asds = [ "testiere-examples" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/testiere/2025-06-22/testiere-20250622-git.tgz"; + sha256 = "0jn07812abpmlb4rig2v4ckgv5afx7jl03fvi06jn2890i527058"; + system = "testiere-examples"; + asd = "testiere-examples"; + } + ); + systems = [ "testiere-examples" ]; + lispLibs = [ (getAttr "testiere" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -98307,7 +98744,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "texp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/texp/2015-12-18/texp-20151218-git.tgz"; + url = "https://beta.quicklisp.org/archive/texp/2015-12-18/texp-20151218-git.tgz"; sha256 = "1sbll7jwmzd86hg0zva8r7db2565nnliasv2x6rkrm9xl97q0kg5"; system = "texp"; asd = "texp"; @@ -98320,6 +98757,26 @@ lib.makeScope pkgs.newScope (self: { }; } ); + text-draw = ( + build-asdf-system { + pname = "text-draw"; + version = "20250622-git"; + asds = [ "text-draw" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/text-draw/2025-06-22/text-draw-20250622-git.tgz"; + sha256 = "0iw4bx8ipa2y3in8j6d3gjzm26ppxgl93fmphn5574l0lfr0x5ng"; + system = "text-draw"; + asd = "text-draw"; + } + ); + systems = [ "text-draw" ]; + lispLibs = [ (getAttr "documentation-utils" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); text-query = ( build-asdf-system { pname = "text-query"; @@ -98327,7 +98784,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "text-query" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/text-query/2011-11-05/text-query-1.1.tgz"; + url = "https://beta.quicklisp.org/archive/text-query/2011-11-05/text-query-1.1.tgz"; sha256 = "082xqpfchmg2752m1lw78q6c0z3walzsmqk8gl6qnj6bdwbhf4dm"; system = "text-query"; asd = "text-query"; @@ -98347,7 +98804,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "text-subsystem" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; system = "text-subsystem"; asd = "text-subsystem"; @@ -98375,7 +98832,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "text-subsystem-generate-font" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; system = "text-subsystem-generate-font"; asd = "text-subsystem-generate-font"; @@ -98399,7 +98856,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "textery" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/textery/2020-12-20/textery-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/textery/2020-12-20/textery-20201220-git.tgz"; sha256 = "0v8zk1s18fi462qwvjbci8nikgs5wqjpl97ckfk0spvhybrdgwcc"; system = "textery"; asd = "textery"; @@ -98423,7 +98880,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "the-cost-of-nothing" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/the-cost-of-nothing/2019-11-30/the-cost-of-nothing-20191130-git.tgz"; + url = "https://beta.quicklisp.org/archive/the-cost-of-nothing/2019-11-30/the-cost-of-nothing-20191130-git.tgz"; sha256 = "1ccrglyr1wnnfp218w1qj7yfl4yzlxkki3hqaifi5axgbi5dmmh8"; system = "the-cost-of-nothing"; asd = "the-cost-of-nothing"; @@ -98444,12 +98901,12 @@ lib.makeScope pkgs.newScope (self: { thih-coalton = ( build-asdf-system { pname = "thih-coalton"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "thih-coalton" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/coalton/2024-10-12/coalton-20241012-git.tgz"; - sha256 = "19flzjxf3y6pxm09bmr8bmiqbgh4f7d5jjbgx2cb3dckmgvvg1d7"; + url = "https://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz"; + sha256 = "0g6gfp3y9smzssi3dbddwxvx7g4hq6wz98h253gs4i15pd2pf3qp"; system = "thih-coalton"; asd = "thih-coalton"; } @@ -98461,26 +98918,6 @@ lib.makeScope pkgs.newScope (self: { }; } ); - thnappy = ( - build-asdf-system { - pname = "thnappy"; - version = "20180831-git"; - asds = [ "thnappy" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/thnappy/2018-08-31/thnappy-20180831-git.tgz"; - sha256 = "0p03w2mcc655gm9x3rpgixhap9l56imjyblkwv05rk6mjx7wfnrp"; - system = "thnappy"; - asd = "thnappy"; - } - ); - systems = [ "thnappy" ]; - lispLibs = [ (getAttr "cffi" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); thorn = ( build-asdf-system { pname = "thorn"; @@ -98488,7 +98925,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "thorn" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/thorn/2015-06-08/thorn-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/thorn/2015-06-08/thorn-20150608-git.tgz"; sha256 = "1d4w5358yxgccna91pxz9526w932j5ig17gp19zysjxvca57hqy7"; system = "thorn"; asd = "thorn"; @@ -98508,7 +98945,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "thorn-doc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/thorn/2015-06-08/thorn-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/thorn/2015-06-08/thorn-20150608-git.tgz"; sha256 = "1d4w5358yxgccna91pxz9526w932j5ig17gp19zysjxvca57hqy7"; system = "thorn-doc"; asd = "thorn-doc"; @@ -98528,7 +98965,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "thorn-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/thorn/2015-06-08/thorn-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/thorn/2015-06-08/thorn-20150608-git.tgz"; sha256 = "1d4w5358yxgccna91pxz9526w932j5ig17gp19zysjxvca57hqy7"; system = "thorn-test"; asd = "thorn-test"; @@ -98552,7 +98989,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "thread-pool" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/thread-pool/2012-01-07/thread-pool-20120107-git.tgz"; + url = "https://beta.quicklisp.org/archive/thread-pool/2012-01-07/thread-pool-20120107-git.tgz"; sha256 = "0wi9l0m660332w9pnc3w08m5hlsry9s0cgc3rznb5kyap68iv847"; system = "thread-pool"; asd = "thread-pool"; @@ -98575,7 +99012,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "thread.comm.rendezvous" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/thread.comm.rendezvous/2012-10-13/thread.comm.rendezvous-20121013-git.tgz"; + url = "https://beta.quicklisp.org/archive/thread.comm.rendezvous/2012-10-13/thread.comm.rendezvous-20121013-git.tgz"; sha256 = "16crdy09zm20iclgln1vj0psd8ifz4rqb6g9255p0d2rkjk2rgfx"; system = "thread.comm.rendezvous"; asd = "thread.comm.rendezvous"; @@ -98598,7 +99035,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "thread.comm.rendezvous.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/thread.comm.rendezvous/2012-10-13/thread.comm.rendezvous-20121013-git.tgz"; + url = "https://beta.quicklisp.org/archive/thread.comm.rendezvous/2012-10-13/thread.comm.rendezvous-20121013-git.tgz"; sha256 = "16crdy09zm20iclgln1vj0psd8ifz4rqb6g9255p0d2rkjk2rgfx"; system = "thread.comm.rendezvous.test"; asd = "thread.comm.rendezvous.test"; @@ -98621,7 +99058,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "tile-grid" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tile-grid/2022-07-07/tile-grid-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/tile-grid/2022-07-07/tile-grid-20220707-git.tgz"; sha256 = "10sqiqspiljnk4i1v4w0dkr640cgf9nvkgmkaww3smmhyjsd9270"; system = "tile-grid"; asd = "tile-grid"; @@ -98641,7 +99078,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "time-interval" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/time-interval/2019-02-02/time-interval-20190202-git.tgz"; + url = "https://beta.quicklisp.org/archive/time-interval/2019-02-02/time-interval-20190202-git.tgz"; sha256 = "0dydlg42bwcd7sr57v8hhrd86n80d5cb5r6r2id0zyqbrijabdw5"; system = "time-interval"; asd = "time-interval"; @@ -98664,7 +99101,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "timer-wheel" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/timer-wheel/2018-02-28/timer-wheel-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/timer-wheel/2018-02-28/timer-wheel-20180228-git.tgz"; sha256 = "12pc1dpnkwj43n1sdqhg8n8h0mb16zcx4wxly85b7bqf00s962bc"; system = "timer-wheel"; asd = "timer-wheel"; @@ -98684,7 +99121,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "timer-wheel.examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/timer-wheel/2018-02-28/timer-wheel-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/timer-wheel/2018-02-28/timer-wheel-20180228-git.tgz"; sha256 = "12pc1dpnkwj43n1sdqhg8n8h0mb16zcx4wxly85b7bqf00s962bc"; system = "timer-wheel.examples"; asd = "timer-wheel.examples"; @@ -98707,7 +99144,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "tinaa" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tinaa/2017-12-27/tinaa-20171227-git.tgz"; + url = "https://beta.quicklisp.org/archive/tinaa/2017-12-27/tinaa-20171227-git.tgz"; sha256 = "10r1ypxphs5h7xxkl7v7r9pi2wdz1ik948mp63006hn44j7s1sa1"; system = "tinaa"; asd = "tinaa"; @@ -98737,7 +99174,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "tinaa-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tinaa/2017-12-27/tinaa-20171227-git.tgz"; + url = "https://beta.quicklisp.org/archive/tinaa/2017-12-27/tinaa-20171227-git.tgz"; sha256 = "10r1ypxphs5h7xxkl7v7r9pi2wdz1ik948mp63006hn44j7s1sa1"; system = "tinaa-test"; asd = "tinaa-test"; @@ -98760,7 +99197,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "tiny-routes" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tiny-routes/2024-10-12/tiny-routes-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/tiny-routes/2024-10-12/tiny-routes-20241012-git.tgz"; sha256 = "1wswzz7d26ic9izls7pnkybm8ryf5j0ksv55gr6k5nji9x8r5jqx"; system = "tiny-routes"; asd = "tiny-routes"; @@ -98780,7 +99217,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "tiny-routes-middleware-cookie" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tiny-routes/2024-10-12/tiny-routes-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/tiny-routes/2024-10-12/tiny-routes-20241012-git.tgz"; sha256 = "1wswzz7d26ic9izls7pnkybm8ryf5j0ksv55gr6k5nji9x8r5jqx"; system = "tiny-routes-middleware-cookie"; asd = "tiny-routes-middleware-cookie"; @@ -98803,7 +99240,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "tm" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tm/2018-02-28/tm-v0.8.tgz"; + url = "https://beta.quicklisp.org/archive/tm/2018-02-28/tm-v0.8.tgz"; sha256 = "0lhqg5jpkzni1vzni0nnw7jb8ick1pbp04gfij2iczbi82qsw8x1"; system = "tm"; asd = "tm"; @@ -98826,7 +99263,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "tmpdir" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tmpdir/2020-02-18/tmpdir-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/tmpdir/2020-02-18/tmpdir-20200218-git.tgz"; sha256 = "11yshmg2wyd75ywwfybklm131d5rdw246pg35a6ksndiq3w5n4k8"; system = "tmpdir"; asd = "tmpdir"; @@ -98846,7 +99283,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "tmpdir.tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tmpdir/2020-02-18/tmpdir-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/tmpdir/2020-02-18/tmpdir-20200218-git.tgz"; sha256 = "11yshmg2wyd75ywwfybklm131d5rdw246pg35a6ksndiq3w5n4k8"; system = "tmpdir.tests"; asd = "tmpdir.tests"; @@ -98871,7 +99308,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "toadstool" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/toadstool/2013-06-15/toadstool-20130615-git.tgz"; + url = "https://beta.quicklisp.org/archive/toadstool/2013-06-15/toadstool-20130615-git.tgz"; sha256 = "0njb1mdzk0247h87db90zv7bk40mw54pq8sj35l1dwa30d5yhi6r"; system = "toadstool"; asd = "toadstool"; @@ -98891,7 +99328,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "toadstool-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/toadstool/2013-06-15/toadstool-20130615-git.tgz"; + url = "https://beta.quicklisp.org/archive/toadstool/2013-06-15/toadstool-20130615-git.tgz"; sha256 = "0njb1mdzk0247h87db90zv7bk40mw54pq8sj35l1dwa30d5yhi6r"; system = "toadstool-tests"; asd = "toadstool-tests"; @@ -98914,7 +99351,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "toms419" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; system = "toms419"; asd = "toms419"; @@ -98934,7 +99371,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "toms715" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; system = "toms715"; asd = "toms715"; @@ -98954,7 +99391,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "toms717" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; system = "toms717"; asd = "toms717"; @@ -98974,7 +99411,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "toot" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/toot/2012-11-25/toot-20121125-git.tgz"; + url = "https://beta.quicklisp.org/archive/toot/2012-11-25/toot-20121125-git.tgz"; sha256 = "1235qhkjrg1mmy6kx1vhsqvgjjgc7hk2sjssapv7xr43m71n6ivx"; system = "toot"; asd = "toot"; @@ -99003,12 +99440,12 @@ lib.makeScope pkgs.newScope (self: { tooter = ( build-asdf-system { pname = "tooter"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "tooter" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tooter/2024-10-12/tooter-20241012-git.tgz"; - sha256 = "03ymavph34248lh18jycsky55dg83kjr6k5a9bib5wh2idswrfxp"; + url = "https://beta.quicklisp.org/archive/tooter/2025-06-22/tooter-20250622-git.tgz"; + sha256 = "1hyihg9mr9b69jbf6dr07g8w3k7ismw63a4zynmmzbba6lbbv3p0"; system = "tooter"; asd = "tooter"; } @@ -99029,12 +99466,12 @@ lib.makeScope pkgs.newScope (self: { torrents = ( build-asdf-system { pname = "torrents"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "torrents" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-torrents/2024-10-12/cl-torrents-20241012-git.tgz"; - sha256 = "1xigzskksgn8pg18v2dncfapdn94zv0djr4yi8nmkqbv8ljx93l4"; + url = "https://beta.quicklisp.org/archive/cl-torrents/2025-06-22/cl-torrents-20250622-git.tgz"; + sha256 = "1jfxgb5hr2cr9pp7pkcwkafvdrfpcvpgzvn4qi11q0bygng7qg38"; system = "torrents"; asd = "torrents"; } @@ -99051,7 +99488,6 @@ lib.makeScope pkgs.newScope (self: { (getAttr "log4cl" self) (getAttr "lparallel" self) (getAttr "lquery" self) - (getAttr "mockingbird" self) (getAttr "parse-float" self) (getAttr "plump" self) (getAttr "py-configparser" self) @@ -99068,12 +99504,12 @@ lib.makeScope pkgs.newScope (self: { torrents-test = ( build-asdf-system { pname = "torrents-test"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "torrents-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-torrents/2024-10-12/cl-torrents-20241012-git.tgz"; - sha256 = "1xigzskksgn8pg18v2dncfapdn94zv0djr4yi8nmkqbv8ljx93l4"; + url = "https://beta.quicklisp.org/archive/cl-torrents/2025-06-22/cl-torrents-20250622-git.tgz"; + sha256 = "1jfxgb5hr2cr9pp7pkcwkafvdrfpcvpgzvn4qi11q0bygng7qg38"; system = "torrents-test"; asd = "torrents-test"; } @@ -99097,7 +99533,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "towers" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/towers/2014-12-17/towers-20141217-git.tgz"; + url = "https://beta.quicklisp.org/archive/towers/2014-12-17/towers-20141217-git.tgz"; sha256 = "0r89z1hfb7kmj0a4qm7ih599hlin8rhxk6pb7nnvsdjgn436dkga"; system = "towers"; asd = "towers"; @@ -99122,7 +99558,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trace-db" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trace-db/2023-06-18/trace-db-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/trace-db/2023-06-18/trace-db-20230618-git.tgz"; sha256 = "1n2mj8nzd0c3clz5xjllajfad50i6yhir27i9q41r4sc5z1k0x63"; system = "trace-db"; asd = "trace-db"; @@ -99142,7 +99578,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "track-best" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/track-best/2022-02-20/track-best-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/track-best/2022-02-20/track-best-20220220-git.tgz"; sha256 = "1f59bn57y1mdq18l1ji5q8yazv73g85y1mns2xzwbmx8sgxsa6pq"; system = "track-best"; asd = "track-best"; @@ -99162,7 +99598,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trainable-object" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trainable-object/2019-12-27/trainable-object-20191227-git.tgz"; + url = "https://beta.quicklisp.org/archive/trainable-object/2019-12-27/trainable-object-20191227-git.tgz"; sha256 = "06hfv039xx5vwm3qpm4kwlzlxc4zxlfcpxnbbq8x12a32ngqykwm"; system = "trainable-object"; asd = "trainable-object"; @@ -99185,7 +99621,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trainable-object.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trainable-object/2019-12-27/trainable-object-20191227-git.tgz"; + url = "https://beta.quicklisp.org/archive/trainable-object/2019-12-27/trainable-object-20191227-git.tgz"; sha256 = "06hfv039xx5vwm3qpm4kwlzlxc4zxlfcpxnbbq8x12a32ngqykwm"; system = "trainable-object.test"; asd = "trainable-object.test"; @@ -99204,42 +99640,18 @@ lib.makeScope pkgs.newScope (self: { transducers = ( build-asdf-system { pname = "transducers"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "transducers" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-transducers/2024-10-12/cl-transducers-20241012-git.tgz"; - sha256 = "1n7g2fr5bxyq1axp3a1pw01c5v167njhd7i0gbpq35s1fxvqw6ik"; + url = "https://beta.quicklisp.org/archive/cl-transducers/2025-06-22/cl-transducers-20250622-git.tgz"; + sha256 = "1ldcd4wkyc5ysw891hs4n3s71zfi0q1ji9pshmxvkq05p7gamqlp"; system = "transducers"; asd = "transducers"; } ); systems = [ "transducers" ]; - lispLibs = [ (getAttr "sycamore" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - transducers-jzon = ( - build-asdf-system { - pname = "transducers-jzon"; - version = "20241012-git"; - asds = [ "transducers-jzon" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/cl-transducers/2024-10-12/cl-transducers-20241012-git.tgz"; - sha256 = "1n7g2fr5bxyq1axp3a1pw01c5v167njhd7i0gbpq35s1fxvqw6ik"; - system = "transducers-jzon"; - asd = "transducers"; - } - ); - systems = [ "transducers-jzon" ]; - lispLibs = [ - (getAttr "com_dot_inuoe_dot_jzon" self) - (getAttr "transducers" self) - (getAttr "trivia" self) - ]; + lispLibs = [ ]; meta = { hydraPlatforms = [ ]; }; @@ -99252,7 +99664,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "transit" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-transit/2024-10-12/cl-transit-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-transit/2024-10-12/cl-transit-20241012-git.tgz"; sha256 = "09rlajmcljl43n5866ackbdjkdz19sd12wzdzxnk2l7bjx3khqm4"; system = "transit"; asd = "transit"; @@ -99284,7 +99696,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "transit-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-transit/2024-10-12/cl-transit-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-transit/2024-10-12/cl-transit-20241012-git.tgz"; sha256 = "09rlajmcljl43n5866ackbdjkdz19sd12wzdzxnk2l7bjx3khqm4"; system = "transit-tests"; asd = "transit-tests"; @@ -99309,7 +99721,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "translate" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/translate/2018-02-28/translate-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/translate/2018-02-28/translate-20180228-git.tgz"; sha256 = "07bvdmj8x77k8pw24yhfp1xv9h40n5w717vgj3wmq703159kyjia"; system = "translate"; asd = "translate"; @@ -99329,7 +99741,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "translate-client" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/translate-client/2018-02-28/translate-client-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/translate-client/2018-02-28/translate-client-20180228-git.tgz"; sha256 = "0mjzzahy5wrycik37dirwnvcd5bj5xm20cnw6cmzh0ncvb442mdx"; system = "translate-client"; asd = "translate-client"; @@ -99351,12 +99763,12 @@ lib.makeScope pkgs.newScope (self: { translators = ( build-asdf-system { pname = "translators"; - version = "master-fe503896-git"; + version = "master-5a621564-git"; asds = [ "translators" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz"; - sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10"; + url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; + sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; system = "translators"; asd = "translators"; } @@ -99375,7 +99787,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "transparent-wrap" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/transparent-wrap/2020-09-25/transparent-wrap-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/transparent-wrap/2020-09-25/transparent-wrap-20200925-git.tgz"; sha256 = "0ghva34ksdvczfwpjdaf97bkjxrp35fjqkxamyqf7fbadh4wmfqj"; system = "transparent-wrap"; asd = "transparent-wrap"; @@ -99396,12 +99808,12 @@ lib.makeScope pkgs.newScope (self: { tree = ( build-asdf-system { pname = "tree"; - version = "master-fe503896-git"; + version = "master-5a621564-git"; asds = [ "tree" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz"; - sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10"; + url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; + sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; system = "tree"; asd = "tree"; } @@ -99420,7 +99832,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "tree-search" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tree-search/2020-12-20/tree-search-0.0.1.tgz"; + url = "https://beta.quicklisp.org/archive/tree-search/2020-12-20/tree-search-0.0.1.tgz"; sha256 = "10qgd5yj3n2w4j6wsq1xly0hnpdi1bhhzpia4s1gpkywhglw84zq"; system = "tree-search"; asd = "tree-search"; @@ -99440,7 +99852,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "treedb" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/treedb/2016-08-25/treedb-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/treedb/2016-08-25/treedb-20160825-git.tgz"; sha256 = "02xsm4han0m0vj1j2ly2a6ncjcv7z8p3lcpkyj27xygag2vlchbq"; system = "treedb"; asd = "treedb"; @@ -99460,7 +99872,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "treedb.doc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/treedb/2016-08-25/treedb-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/treedb/2016-08-25/treedb-20160825-git.tgz"; sha256 = "02xsm4han0m0vj1j2ly2a6ncjcv7z8p3lcpkyj27xygag2vlchbq"; system = "treedb.doc"; asd = "treedb.doc"; @@ -99484,7 +99896,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "treedb.tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/treedb/2016-08-25/treedb-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/treedb/2016-08-25/treedb-20160825-git.tgz"; sha256 = "02xsm4han0m0vj1j2ly2a6ncjcv7z8p3lcpkyj27xygag2vlchbq"; system = "treedb.tests"; asd = "treedb.tests"; @@ -99507,7 +99919,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trees" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trees/2018-01-31/trees-20180131-git.tgz"; + url = "https://beta.quicklisp.org/archive/trees/2018-01-31/trees-20180131-git.tgz"; sha256 = "1xvydf3qc17rd7ia8sffxcpclgm3l0iyhx8k72ddk59v3pg5is4k"; system = "trees"; asd = "trees"; @@ -99525,7 +99937,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trees-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trees/2018-01-31/trees-20180131-git.tgz"; + url = "https://beta.quicklisp.org/archive/trees/2018-01-31/trees-20180131-git.tgz"; sha256 = "1xvydf3qc17rd7ia8sffxcpclgm3l0iyhx8k72ddk59v3pg5is4k"; system = "trees-tests"; asd = "trees"; @@ -99545,7 +99957,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trestrul" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trestrul/2021-10-20/trestrul-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/trestrul/2021-10-20/trestrul-20211020-git.tgz"; sha256 = "12bghcfnfxq8l4a1jzh6vx4yna9da1xvp0b7kfdcfylnyga9ivy6"; system = "trestrul"; asd = "trestrul"; @@ -99565,7 +99977,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trestrul.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trestrul/2021-10-20/trestrul-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/trestrul/2021-10-20/trestrul-20211020-git.tgz"; sha256 = "12bghcfnfxq8l4a1jzh6vx4yna9da1xvp0b7kfdcfylnyga9ivy6"; system = "trestrul.test"; asd = "trestrul.test"; @@ -99588,7 +100000,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivia" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia"; asd = "trivia"; @@ -99606,7 +100018,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivia.balland2006" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia.balland2006"; asd = "trivia.balland2006"; @@ -99629,7 +100041,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivia.benchmark" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia.benchmark"; asd = "trivia.benchmark"; @@ -99654,7 +100066,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivia.cffi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia.cffi"; asd = "trivia.cffi"; @@ -99677,7 +100089,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivia.fset" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia.fset"; asd = "trivia.fset"; @@ -99700,7 +100112,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivia.level0" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia.level0"; asd = "trivia.level0"; @@ -99718,7 +100130,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivia.level1" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia.level1"; asd = "trivia.level1"; @@ -99736,7 +100148,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivia.level2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia.level2"; asd = "trivia.level2"; @@ -99759,7 +100171,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivia.ppcre" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia.ppcre"; asd = "trivia.ppcre"; @@ -99782,7 +100194,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivia.quasiquote" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia.quasiquote"; asd = "trivia.quasiquote"; @@ -99803,7 +100215,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivia.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia.test"; asd = "trivia.test"; @@ -99831,7 +100243,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivia.trivial" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia.trivial"; asd = "trivia.trivial"; @@ -99845,12 +100257,12 @@ lib.makeScope pkgs.newScope (self: { trivial-adjust-simple-array = ( build-asdf-system { pname = "trivial-adjust-simple-array"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "trivial-adjust-simple-array" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-adjust-simple-array/2024-10-12/trivial-adjust-simple-array-20241012-git.tgz"; - sha256 = "05yifs4b44whqz4bgv4wys6kvza8y7z5w52kh55ch7krpv61ncy6"; + url = "https://beta.quicklisp.org/archive/trivial-adjust-simple-array/2025-06-22/trivial-adjust-simple-array-20250622-git.tgz"; + sha256 = "1mxsng80x3m4cf65vfd1q5fx9nlzqckfc7axwvf9fh156rdhhr3p"; system = "trivial-adjust-simple-array"; asd = "trivial-adjust-simple-array"; } @@ -99865,12 +100277,12 @@ lib.makeScope pkgs.newScope (self: { trivial-arguments = ( build-asdf-system { pname = "trivial-arguments"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "trivial-arguments" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-arguments/2024-10-12/trivial-arguments-20241012-git.tgz"; - sha256 = "1x1jifrw4ryyqgbln07znrc1drl4gxvzhbhv5gl1kgp2xm0rvr7j"; + url = "https://beta.quicklisp.org/archive/trivial-arguments/2025-06-22/trivial-arguments-20250622-git.tgz"; + sha256 = "1lgg057vp6iwf0k48dipgm5ffpqfakx0kgicf13xscfqzpv5pw6i"; system = "trivial-arguments"; asd = "trivial-arguments"; } @@ -99887,7 +100299,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-backtrace" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-backtrace/2023-02-14/trivial-backtrace-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-backtrace/2023-02-14/trivial-backtrace-20230214-git.tgz"; sha256 = "11j0p3vgmnn5q84xw7sacr5p3cvff2hfhsh2is8xpm2iwxc723kn"; system = "trivial-backtrace"; asd = "trivial-backtrace"; @@ -99905,7 +100317,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-backtrace-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-backtrace/2023-02-14/trivial-backtrace-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-backtrace/2023-02-14/trivial-backtrace-20230214-git.tgz"; sha256 = "11j0p3vgmnn5q84xw7sacr5p3cvff2hfhsh2is8xpm2iwxc723kn"; system = "trivial-backtrace-test"; asd = "trivial-backtrace-test"; @@ -99928,7 +100340,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-battery" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-battery/2021-10-20/trivial-battery-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-battery/2021-10-20/trivial-battery-20211020-git.tgz"; sha256 = "12ni2502v9gjszhjsh0aai08cm64gl8g815xghdjhcf7y34ffl2b"; system = "trivial-battery"; asd = "trivial-battery"; @@ -99948,7 +100360,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-benchmark" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-benchmark/2023-10-21/trivial-benchmark-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-benchmark/2023-10-21/trivial-benchmark-20231021-git.tgz"; sha256 = "1p48wgpady0n8frdcgp7sbg93b0fbvpx1qk5valmanhwr9j3xh88"; system = "trivial-benchmark"; asd = "trivial-benchmark"; @@ -99968,7 +100380,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-bit-streams" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-bit-streams/2019-07-10/trivial-bit-streams-20190710-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-bit-streams/2019-07-10/trivial-bit-streams-20190710-git.tgz"; sha256 = "01xcs069934pzm8gi1xkwgd4lw37ams30i6rcgrlw8gnx4zc4zc9"; system = "trivial-bit-streams"; asd = "trivial-bit-streams"; @@ -99988,7 +100400,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-bit-streams-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-bit-streams/2019-07-10/trivial-bit-streams-20190710-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-bit-streams/2019-07-10/trivial-bit-streams-20190710-git.tgz"; sha256 = "01xcs069934pzm8gi1xkwgd4lw37ams30i6rcgrlw8gnx4zc4zc9"; system = "trivial-bit-streams-tests"; asd = "trivial-bit-streams-tests"; @@ -100012,7 +100424,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-build" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-build/2015-12-18/trivial-build-20151218-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-build/2015-12-18/trivial-build-20151218-git.tgz"; sha256 = "10h1igvryaqz6f72i57ppifysnw8swnss9395sijnk595icja7q0"; system = "trivial-build"; asd = "trivial-build"; @@ -100035,7 +100447,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-build-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-build/2015-12-18/trivial-build-20151218-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-build/2015-12-18/trivial-build-20151218-git.tgz"; sha256 = "10h1igvryaqz6f72i57ppifysnw8swnss9395sijnk595icja7q0"; system = "trivial-build-test"; asd = "trivial-build-test"; @@ -100058,7 +100470,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-channels" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-channels/2016-04-21/trivial-channels-20160421-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-channels/2016-04-21/trivial-channels-20160421-git.tgz"; sha256 = "04wnxcgk40x8p0gxnz9arv1a5wasdqrdxa8c4p5v7r2mycfps6jj"; system = "trivial-channels"; asd = "trivial-channels"; @@ -100081,7 +100493,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-clipboard" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-clipboard/2024-10-12/trivial-clipboard-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-clipboard/2024-10-12/trivial-clipboard-20241012-git.tgz"; sha256 = "1agj4nvw4qq7k4vp64y15gq5h5g22zasys48c2bvzqjr0n9d4lj1"; system = "trivial-clipboard"; asd = "trivial-clipboard"; @@ -100099,7 +100511,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-clipboard-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-clipboard/2024-10-12/trivial-clipboard-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-clipboard/2024-10-12/trivial-clipboard-20241012-git.tgz"; sha256 = "1agj4nvw4qq7k4vp64y15gq5h5g22zasys48c2bvzqjr0n9d4lj1"; system = "trivial-clipboard-test"; asd = "trivial-clipboard-test"; @@ -100118,12 +100530,12 @@ lib.makeScope pkgs.newScope (self: { trivial-clock = ( build-asdf-system { pname = "trivial-clock"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "trivial-clock" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-trivial-clock/2024-10-12/cl-trivial-clock-20241012-git.tgz"; - sha256 = "1m1351j3xvrf6631gmf99xaxb3dhh4ak657p1hac3b9f9a5h85nd"; + url = "https://beta.quicklisp.org/archive/cl-trivial-clock/2025-06-22/cl-trivial-clock-20250622-git.tgz"; + sha256 = "13pfghnar0c55fzha8nfihyjayycz659wp08s5fcip1ksdgkiw05"; system = "trivial-clock"; asd = "trivial-clock"; } @@ -100142,7 +100554,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-cltl2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-cltl2/2021-12-30/trivial-cltl2-20211230-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-cltl2/2021-12-30/trivial-cltl2-20211230-git.tgz"; sha256 = "0xx5vr0dp623m111zbfdk6x7l4jgd4wwyp6iarbj6ijq514wi3a3"; system = "trivial-cltl2"; asd = "trivial-cltl2"; @@ -100160,7 +100572,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-compress" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-compress/2020-12-20/trivial-compress-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-compress/2020-12-20/trivial-compress-20201220-git.tgz"; sha256 = "1pbaz0phvzi27dgnfknscak1h27bsi16gys23kchg8y8zbm0z0g7"; system = "trivial-compress"; asd = "trivial-compress"; @@ -100185,7 +100597,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-compress-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-compress/2020-12-20/trivial-compress-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-compress/2020-12-20/trivial-compress-20201220-git.tgz"; sha256 = "1pbaz0phvzi27dgnfknscak1h27bsi16gys23kchg8y8zbm0z0g7"; system = "trivial-compress-test"; asd = "trivial-compress-test"; @@ -100208,7 +100620,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-continuation" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-continuation/2019-10-07/trivial-continuation-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-continuation/2019-10-07/trivial-continuation-20191007-git.tgz"; sha256 = "1j8d8q86r60qr9pi5p3q7rqn16xpzbzygs0i9b8sn3qyxnnz5037"; system = "trivial-continuation"; asd = "trivial-continuation"; @@ -100231,7 +100643,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-coverage" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-coverage/2020-02-18/trivial-coverage-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-coverage/2020-02-18/trivial-coverage-20200218-git.tgz"; sha256 = "1ak4mjcvzdjsjjh7j89zlnwgaamfrspxmjh2i9kg67kqn36prbsp"; system = "trivial-coverage"; asd = "trivial-coverage"; @@ -100251,7 +100663,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-custom-debugger" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-custom-debugger/2023-10-21/trivial-custom-debugger-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-custom-debugger/2023-10-21/trivial-custom-debugger-20231021-git.tgz"; sha256 = "11x0wpnfllazaqlrgv9xx1mb5q62dx6ny08hpwgkq3jpvqbhxs3b"; system = "trivial-custom-debugger"; asd = "trivial-custom-debugger"; @@ -100271,7 +100683,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-debug-console" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-debug-console/2015-04-07/trivial-debug-console-20150407-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-debug-console/2015-04-07/trivial-debug-console-20150407-git.tgz"; sha256 = "07r42k57vldg01hfwjhkic2hsy84c2s5zj7pl60xjl960i0lqnam"; system = "trivial-debug-console"; asd = "trivial-debug-console"; @@ -100291,7 +100703,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-do" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-do/2022-03-31/trivial-do-20220331-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-do/2022-03-31/trivial-do-20220331-git.tgz"; sha256 = "0vql7am4zyg6zav3l6n6q3qgdxlnchdxpgdxp8lr9sm7jra7sdsf"; system = "trivial-do"; asd = "trivial-do"; @@ -100311,7 +100723,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-documentation" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-documentation/2016-12-04/trivial-documentation-20161204-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-documentation/2016-12-04/trivial-documentation-20161204-git.tgz"; sha256 = "0y90zi6kaw7226xc089dl47677fz594a5ck1ld8yggk9ww7cdaav"; system = "trivial-documentation"; asd = "trivial-documentation"; @@ -100331,7 +100743,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-documentation-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-documentation/2016-12-04/trivial-documentation-20161204-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-documentation/2016-12-04/trivial-documentation-20161204-git.tgz"; sha256 = "0y90zi6kaw7226xc089dl47677fz594a5ck1ld8yggk9ww7cdaav"; system = "trivial-documentation-test"; asd = "trivial-documentation-test"; @@ -100351,7 +100763,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-download" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-download/2023-02-14/trivial-download-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-download/2023-02-14/trivial-download-20230214-git.tgz"; sha256 = "17kag2zi1r766n2mg4knz4ix268bll2acl0150cksibfa4dbq1k7"; system = "trivial-download"; asd = "trivial-download"; @@ -100371,7 +100783,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-dump-core" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-dump-core/2017-02-27/trivial-dump-core-20170227-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-dump-core/2017-02-27/trivial-dump-core-20170227-git.tgz"; sha256 = "08lnp84gbf3yd3gpnbjbl8jm9p42j3m4hf2f355l7lylb8kabxn8"; system = "trivial-dump-core"; asd = "trivial-dump-core"; @@ -100391,7 +100803,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-ed-functions" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-ed-functions/2021-08-07/trivial-ed-functions-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-ed-functions/2021-08-07/trivial-ed-functions-20210807-git.tgz"; sha256 = "05r8n4jjcg2lci5qrjwqz913wivckgk01ivjg1barpnm0nr29qn1"; system = "trivial-ed-functions"; asd = "trivial-ed-functions"; @@ -100411,7 +100823,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-escapes" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-escapes/2018-02-28/trivial-escapes-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-escapes/2018-02-28/trivial-escapes-20180228-git.tgz"; sha256 = "0v6h8lk17iqv1qkxgqjyzn8gi6v0hvq2vmfbb01md3zjvjqxn6lr"; system = "trivial-escapes"; asd = "trivial-escapes"; @@ -100431,7 +100843,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-escapes-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-escapes/2018-02-28/trivial-escapes-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-escapes/2018-02-28/trivial-escapes-20180228-git.tgz"; sha256 = "0v6h8lk17iqv1qkxgqjyzn8gi6v0hvq2vmfbb01md3zjvjqxn6lr"; system = "trivial-escapes-test"; asd = "trivial-escapes-test"; @@ -100454,7 +100866,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-exe" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-exe/2015-12-18/trivial-exe-20151218-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-exe/2015-12-18/trivial-exe-20151218-git.tgz"; sha256 = "1ryn7gh3n057czj3hwq6lx7h25ipfjxsvddywpm2ngfdwywaqzvc"; system = "trivial-exe"; asd = "trivial-exe"; @@ -100474,7 +100886,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-exe-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-exe/2015-12-18/trivial-exe-20151218-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-exe/2015-12-18/trivial-exe-20151218-git.tgz"; sha256 = "1ryn7gh3n057czj3hwq6lx7h25ipfjxsvddywpm2ngfdwywaqzvc"; system = "trivial-exe-test"; asd = "trivial-exe-test"; @@ -100493,12 +100905,12 @@ lib.makeScope pkgs.newScope (self: { trivial-extensible-sequences = ( build-asdf-system { pname = "trivial-extensible-sequences"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "trivial-extensible-sequences" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-extensible-sequences/2023-10-21/trivial-extensible-sequences-20231021-git.tgz"; - sha256 = "1mgfvyvy3dkn8wyjqc49czl990rbbfkz7sfrhz9641dilasmw9s6"; + url = "https://beta.quicklisp.org/archive/trivial-extensible-sequences/2025-06-22/trivial-extensible-sequences-20250622-git.tgz"; + sha256 = "1l3i99gcabh7b0cvkhqlhdfx5mk1n2smfvkxzgx8v55qa5gzsa8w"; system = "trivial-extensible-sequences"; asd = "trivial-extensible-sequences"; } @@ -100517,7 +100929,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-extract" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-extract/2016-04-21/trivial-extract-20160421-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-extract/2016-04-21/trivial-extract-20160421-git.tgz"; sha256 = "0083x71f4x6b64wd8ywgaiqi0ygmdhl5rv101jcv44l3l61839sx"; system = "trivial-extract"; asd = "trivial-extract"; @@ -100544,7 +100956,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-extract-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-extract/2016-04-21/trivial-extract-20160421-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-extract/2016-04-21/trivial-extract-20160421-git.tgz"; sha256 = "0083x71f4x6b64wd8ywgaiqi0ygmdhl5rv101jcv44l3l61839sx"; system = "trivial-extract-test"; asd = "trivial-extract-test"; @@ -100563,12 +100975,12 @@ lib.makeScope pkgs.newScope (self: { trivial-features = ( build-asdf-system { pname = "trivial-features"; - version = "20230618-git"; + version = "20250622-git"; asds = [ "trivial-features" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-features/2023-06-18/trivial-features-20230618-git.tgz"; - sha256 = "0r33ycg1wsmglbsychglzkd6fachnnqfzd0w9mhpwi6cz94hx7c3"; + url = "https://beta.quicklisp.org/archive/trivial-features/2025-06-22/trivial-features-20250622-git.tgz"; + sha256 = "0r3lwy5ssrw6d3v1clyfqc59dxknsnr5zrb0h64zx5b7ddn6vb6q"; system = "trivial-features"; asd = "trivial-features"; } @@ -100581,12 +100993,12 @@ lib.makeScope pkgs.newScope (self: { trivial-features-tests = ( build-asdf-system { pname = "trivial-features-tests"; - version = "20230618-git"; + version = "20250622-git"; asds = [ "trivial-features-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-features/2023-06-18/trivial-features-20230618-git.tgz"; - sha256 = "0r33ycg1wsmglbsychglzkd6fachnnqfzd0w9mhpwi6cz94hx7c3"; + url = "https://beta.quicklisp.org/archive/trivial-features/2025-06-22/trivial-features-20250622-git.tgz"; + sha256 = "0r3lwy5ssrw6d3v1clyfqc59dxknsnr5zrb0h64zx5b7ddn6vb6q"; system = "trivial-features-tests"; asd = "trivial-features-tests"; } @@ -100607,12 +101019,12 @@ lib.makeScope pkgs.newScope (self: { trivial-file-size = ( build-asdf-system { pname = "trivial-file-size"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "trivial-file-size" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-file-size/2024-10-12/trivial-file-size-20241012-git.tgz"; - sha256 = "08dbyrrgvvl459lk3pcq0j7qryb20hdh946y42h4jsp5crhbi71z"; + url = "https://beta.quicklisp.org/archive/trivial-file-size/2025-06-22/trivial-file-size-20250622-git.tgz"; + sha256 = "172xmsmcdq73gxyg77d05mxqcml2rjk2jwh91yl9aph68ls2d1pq"; system = "trivial-file-size"; asd = "trivial-file-size"; } @@ -100629,7 +101041,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-garbage" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-garbage/2023-10-21/trivial-garbage-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-garbage/2023-10-21/trivial-garbage-20231021-git.tgz"; sha256 = "0rfwxvwg0kpcaa0hsi035yrkfdfks4bq8d9azmrww2f0rmv9g6sd"; system = "trivial-garbage"; asd = "trivial-garbage"; @@ -100647,7 +101059,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-gray-streams" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-gray-streams/2024-10-12/trivial-gray-streams-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-gray-streams/2024-10-12/trivial-gray-streams-20241012-git.tgz"; sha256 = "0iw6q5hx7x8sc5s7ikvsjccsksbm0rd13d54mkrg62sc56hjywrm"; system = "trivial-gray-streams"; asd = "trivial-gray-streams"; @@ -100665,7 +101077,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-gray-streams-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-gray-streams/2024-10-12/trivial-gray-streams-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-gray-streams/2024-10-12/trivial-gray-streams-20241012-git.tgz"; sha256 = "0iw6q5hx7x8sc5s7ikvsjccsksbm0rd13d54mkrg62sc56hjywrm"; system = "trivial-gray-streams-test"; asd = "trivial-gray-streams-test"; @@ -100685,7 +101097,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-hashtable-serialize" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-hashtable-serialize/2019-10-07/trivial-hashtable-serialize-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-hashtable-serialize/2019-10-07/trivial-hashtable-serialize-20191007-git.tgz"; sha256 = "06xdci47h6rpfkmrf7p9kd217jbkmkmf90ygqcmkkgf3sv5623bh"; system = "trivial-hashtable-serialize"; asd = "trivial-hashtable-serialize"; @@ -100705,7 +101117,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-http" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-http/2011-02-19/trivial-http-20110219-http.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-http/2011-02-19/trivial-http-20110219-http.tgz"; sha256 = "06mrh2bjzhfdzi48dnq0bhl2cac4v41aqck53rfm4rnsygcjsn78"; system = "trivial-http"; asd = "trivial-http"; @@ -100725,7 +101137,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-http-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-http/2011-02-19/trivial-http-20110219-http.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-http/2011-02-19/trivial-http-20110219-http.tgz"; sha256 = "06mrh2bjzhfdzi48dnq0bhl2cac4v41aqck53rfm4rnsygcjsn78"; system = "trivial-http-test"; asd = "trivial-http-test"; @@ -100744,12 +101156,12 @@ lib.makeScope pkgs.newScope (self: { trivial-indent = ( build-asdf-system { pname = "trivial-indent"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "trivial-indent" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-indent/2023-10-21/trivial-indent-20231021-git.tgz"; - sha256 = "08qgx34zbpafzws96nq68bgpynddf22ibliqni2jnvhwv74lcpiw"; + url = "https://beta.quicklisp.org/archive/trivial-indent/2025-06-22/trivial-indent-20250622-git.tgz"; + sha256 = "17zfm62szbvyn8qq6k88yh04xwa6dnmbla4yqaqqpc971xs562cy"; system = "trivial-indent"; asd = "trivial-indent"; } @@ -100766,7 +101178,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-inspector-hook" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-inspector-hook/2021-08-07/trivial-inspector-hook-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-inspector-hook/2021-08-07/trivial-inspector-hook-20210807-git.tgz"; sha256 = "0h9m1ps5sqgrr171czj6rq84wpy2xvggfzspvy667xsldv4xi0c2"; system = "trivial-inspector-hook"; asd = "trivial-inspector-hook"; @@ -100786,7 +101198,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-irc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-irc/2017-10-19/trivial-irc-20171019-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-irc/2017-10-19/trivial-irc-20171019-git.tgz"; sha256 = "0jjgx6ld2gcr0w0g5k62dr0rl6202ydih6ylmypv6m5jmrarcbza"; system = "trivial-irc"; asd = "trivial-irc"; @@ -100810,7 +101222,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-irc-echobot" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-irc/2017-10-19/trivial-irc-20171019-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-irc/2017-10-19/trivial-irc-20171019-git.tgz"; sha256 = "0jjgx6ld2gcr0w0g5k62dr0rl6202ydih6ylmypv6m5jmrarcbza"; system = "trivial-irc-echobot"; asd = "trivial-irc-echobot"; @@ -100830,7 +101242,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-json-codec" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-json-codec/2022-07-07/trivial-json-codec-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-json-codec/2022-07-07/trivial-json-codec-20220707-git.tgz"; sha256 = "1k0nnsn3nsb83gzmkrf81zqz6ydn21gzfq96r2d5690v5zkrg1kg"; system = "trivial-json-codec"; asd = "trivial-json-codec"; @@ -100856,7 +101268,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-jumptables" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-jumptables/2019-11-30/trivial-jumptables_1.1.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-jumptables/2019-11-30/trivial-jumptables_1.1.tgz"; sha256 = "10ih84hkscj0l4ki3s196d9b85iil8f56ps5r8ng222i0lln1ni9"; system = "trivial-jumptables"; asd = "trivial-jumptables"; @@ -100876,7 +101288,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-jumptables_tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-jumptables/2019-11-30/trivial-jumptables_1.1.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-jumptables/2019-11-30/trivial-jumptables_1.1.tgz"; sha256 = "10ih84hkscj0l4ki3s196d9b85iil8f56ps5r8ng222i0lln1ni9"; system = "trivial-jumptables_tests"; asd = "trivial-jumptables_tests"; @@ -100900,7 +101312,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-lazy" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-lazy/2015-07-09/trivial-lazy-20150709-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-lazy/2015-07-09/trivial-lazy-20150709-git.tgz"; sha256 = "0fnsz2kdb0v5cz4xl5a2c1szcif7jmnkxhbzvk6lrhzjccgyhjc7"; system = "trivial-lazy"; asd = "trivial-lazy"; @@ -100920,7 +101332,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-ldap" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-ldap/2018-07-11/trivial-ldap-20180711-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-ldap/2018-07-11/trivial-ldap-20180711-git.tgz"; sha256 = "1zaa4wnk5y5ff211pkg6dl27j4pjwh56hq0246slxsdxv6kvp1z9"; system = "trivial-ldap"; asd = "trivial-ldap"; @@ -100944,7 +101356,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-left-pad" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-left-pad/2019-08-13/trivial-left-pad-20190813-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-left-pad/2019-08-13/trivial-left-pad-20190813-git.tgz"; sha256 = "0q68j0x0x3z8rl577jsl3y0s3x5xiqv54sla6kds43q7821qfnwk"; system = "trivial-left-pad"; asd = "trivial-left-pad"; @@ -100967,7 +101379,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-left-pad-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-left-pad/2019-08-13/trivial-left-pad-20190813-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-left-pad/2019-08-13/trivial-left-pad-20190813-git.tgz"; sha256 = "0q68j0x0x3z8rl577jsl3y0s3x5xiqv54sla6kds43q7821qfnwk"; system = "trivial-left-pad-test"; asd = "trivial-left-pad"; @@ -100991,7 +101403,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-macroexpand-all" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-macroexpand-all/2017-10-23/trivial-macroexpand-all-20171023-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-macroexpand-all/2017-10-23/trivial-macroexpand-all-20171023-git.tgz"; sha256 = "191hnn4b5j4i3crydmlzbm231kj0h7l8zj6mzj69r1npbzkas4bd"; system = "trivial-macroexpand-all"; asd = "trivial-macroexpand-all"; @@ -101005,12 +101417,12 @@ lib.makeScope pkgs.newScope (self: { trivial-main-thread = ( build-asdf-system { pname = "trivial-main-thread"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "trivial-main-thread" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-main-thread/2024-10-12/trivial-main-thread-20241012-git.tgz"; - sha256 = "0vxr82ald41355hvlg0ngrpzkz9y3nyl24h58306kmg982xk4hnk"; + url = "https://beta.quicklisp.org/archive/trivial-main-thread/2025-06-22/trivial-main-thread-20250622-git.tgz"; + sha256 = "0p7p6bh3rghj3yj2d9ry2jfvpjkky2mwwbbh4w422v6yplv6iwhx"; system = "trivial-main-thread"; asd = "trivial-main-thread"; } @@ -101031,7 +101443,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-method-combinations" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-method-combinations/2019-11-30/trivial-method-combinations-20191130-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-method-combinations/2019-11-30/trivial-method-combinations-20191130-git.tgz"; sha256 = "0w9w8bj835sfp797rdm7b5crpnz0xrz2q5vgbzm2p9n9jskxnxnv"; system = "trivial-method-combinations"; asd = "trivial-method-combinations"; @@ -101047,12 +101459,12 @@ lib.makeScope pkgs.newScope (self: { trivial-mimes = ( build-asdf-system { pname = "trivial-mimes"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "trivial-mimes" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-mimes/2023-10-21/trivial-mimes-20231021-git.tgz"; - sha256 = "05cqbg9bh4r9av675vrzgw4p3s1dxb74r2ygvbfkych79kdik871"; + url = "https://beta.quicklisp.org/archive/trivial-mimes/2025-06-22/trivial-mimes-20250622-git.tgz"; + sha256 = "0ahf8i2ghsg1kqfiaarxhlcsd3icmb2glsbcv2rwzdc06w7x2lms"; system = "trivial-mimes"; asd = "trivial-mimes"; } @@ -101069,7 +101481,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-mmap" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-mmap/2021-01-24/trivial-mmap-20210124-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-mmap/2021-01-24/trivial-mmap-20210124-git.tgz"; sha256 = "1ckhd7b0ll9xcmwdh42g0v38grk2acs3kv66k1gwh539f99kzcps"; system = "trivial-mmap"; asd = "trivial-mmap"; @@ -101092,7 +101504,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-monitored-thread" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-monitored-thread/2022-07-07/trivial-monitored-thread-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-monitored-thread/2022-07-07/trivial-monitored-thread-20220707-git.tgz"; sha256 = "1vmhc5id0qk5yh8az4j1znqc73r18pygmrnfxmwwndh1a9yf98z4"; system = "trivial-monitored-thread"; asd = "trivial-monitored-thread"; @@ -101116,7 +101528,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-msi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-msi/2016-02-08/trivial-msi-20160208-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-msi/2016-02-08/trivial-msi-20160208-git.tgz"; sha256 = "1mbpwnsvv30gf7z8m96kv8933s6csg4q0frx03vazp4ckplwff8w"; system = "trivial-msi"; asd = "trivial-msi"; @@ -101136,7 +101548,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-msi-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-msi/2016-02-08/trivial-msi-20160208-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-msi/2016-02-08/trivial-msi-20160208-git.tgz"; sha256 = "1mbpwnsvv30gf7z8m96kv8933s6csg4q0frx03vazp4ckplwff8w"; system = "trivial-msi-test"; asd = "trivial-msi-test"; @@ -101159,7 +101571,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-nntp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-nntp/2016-12-04/trivial-nntp-20161204-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-nntp/2016-12-04/trivial-nntp-20161204-git.tgz"; sha256 = "0ywwrjx4vaz117zaxqhk2b4xrb75cw1ac5xir9zhvgzkyl6wf867"; system = "trivial-nntp"; asd = "trivial-nntp"; @@ -101182,7 +101594,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-object-lock" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-object-lock/2022-07-07/trivial-object-lock-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-object-lock/2022-07-07/trivial-object-lock-20220707-git.tgz"; sha256 = "18xwwgvshib4l2bs6m16mk0kzdp40482yf7v72nzk13v0bgnw91s"; system = "trivial-object-lock"; asd = "trivial-object-lock"; @@ -101207,7 +101619,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-octet-streams" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-octet-streams/2024-10-12/trivial-octet-streams-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-octet-streams/2024-10-12/trivial-octet-streams-20241012-git.tgz"; sha256 = "0zj7aijn10hflr87774hwi5k1jzq6j5bgh2hm70ixxhcmaq7lqk5"; system = "trivial-octet-streams"; asd = "trivial-octet-streams"; @@ -101227,7 +101639,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-open-browser" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-open-browser/2016-08-25/trivial-open-browser-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-open-browser/2016-08-25/trivial-open-browser-20160825-git.tgz"; sha256 = "0ixay1piq420i6adx642qhw45l6ik7rvgk52lyz27dvx5f8yqsdb"; system = "trivial-open-browser"; asd = "trivial-open-browser"; @@ -101247,7 +101659,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-openstack" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-openstack/2016-06-28/trivial-openstack-20160628-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-openstack/2016-06-28/trivial-openstack-20160628-git.tgz"; sha256 = "0sdc6rhjqv1i7wknn44jg5xxnz70087bhfslh0izggny9d9s015i"; system = "trivial-openstack"; asd = "trivial-openstack"; @@ -101272,7 +101684,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-openstack-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-openstack/2016-06-28/trivial-openstack-20160628-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-openstack/2016-06-28/trivial-openstack-20160628-git.tgz"; sha256 = "0sdc6rhjqv1i7wknn44jg5xxnz70087bhfslh0izggny9d9s015i"; system = "trivial-openstack-test"; asd = "trivial-openstack-test"; @@ -101299,7 +101711,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-package-local-nicknames" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-package-local-nicknames/2022-02-20/trivial-package-local-nicknames-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-package-local-nicknames/2022-02-20/trivial-package-local-nicknames-20220220-git.tgz"; sha256 = "0p80s474czfqh7phd4qq5yjcy8q2160vxmn8pi6qlkqgdd7ix37r"; system = "trivial-package-local-nicknames"; asd = "trivial-package-local-nicknames"; @@ -101317,7 +101729,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-package-locks" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-package-locks/2024-10-12/trivial-package-locks-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-package-locks/2024-10-12/trivial-package-locks-20241012-git.tgz"; sha256 = "09zhirygjmwr4xvwp1zx9b17mkxml7f7rni1xiwxg5vfgn0y1bi3"; system = "trivial-package-locks"; asd = "trivial-package-locks"; @@ -101337,7 +101749,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-package-manager" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-package-manager/2024-10-12/trivial-package-manager-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-package-manager/2024-10-12/trivial-package-manager-20241012-git.tgz"; sha256 = "1q71r9h5xra0bg5c5v2gzjjswfv626gfg9sxn59w645g30xn1sph"; system = "trivial-package-manager"; asd = "trivial-package-manager"; @@ -101359,7 +101771,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-package-manager.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-package-manager/2024-10-12/trivial-package-manager-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-package-manager/2024-10-12/trivial-package-manager-20241012-git.tgz"; sha256 = "1q71r9h5xra0bg5c5v2gzjjswfv626gfg9sxn59w645g30xn1sph"; system = "trivial-package-manager.test"; asd = "trivial-package-manager.test"; @@ -101382,7 +101794,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-pooled-database" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-pooled-database/2020-12-20/trivial-pooled-database-20201220-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-pooled-database/2020-12-20/trivial-pooled-database-20201220-git.tgz"; sha256 = "0a7c8bjl13k37b83lksklcw9sch570wgqv58cgs0dw9jcmsihqmx"; system = "trivial-pooled-database"; asd = "trivial-pooled-database"; @@ -101410,7 +101822,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-project" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-project/2017-08-30/trivial-project-quicklisp-9e3fe231-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-project/2017-08-30/trivial-project-quicklisp-9e3fe231-git.tgz"; sha256 = "1s5h0fgs0rq00j492xln716w9i52v90rnfcr0idjzyimicx7hk22"; system = "trivial-project"; asd = "trivial-project"; @@ -101433,7 +101845,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-raw-io" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-raw-io/2014-12-17/trivial-raw-io-20141217-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-raw-io/2014-12-17/trivial-raw-io-20141217-git.tgz"; sha256 = "19290zw2b64k78wr62gv30pp7cmqg07q85vfwjknaffjdd73xwi1"; system = "trivial-raw-io"; asd = "trivial-raw-io"; @@ -101453,7 +101865,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-renamer" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-renamer/2017-08-30/trivial-renamer-quicklisp-1282597d-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-renamer/2017-08-30/trivial-renamer-quicklisp-1282597d-git.tgz"; sha256 = "1nlgsayx4iw6gskg0d5vc823p0lmh414k9jiccvcsk1r17684mp8"; system = "trivial-renamer"; asd = "trivial-renamer"; @@ -101466,6 +101878,26 @@ lib.makeScope pkgs.newScope (self: { }; } ); + trivial-restarts = ( + build-asdf-system { + pname = "trivial-restarts"; + version = "20250622-git"; + asds = [ "trivial-restarts" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/trivial-restart-accessors/2025-06-22/trivial-restart-accessors-20250622-git.tgz"; + sha256 = "127fhlqds5qyabvl85k50n6wgxkcpcb3bbxazz5hnd0zj3r3901z"; + system = "trivial-restarts"; + asd = "trivial-restarts"; + } + ); + systems = [ "trivial-restarts" ]; + lispLibs = [ ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); trivial-rfc-1123 = ( build-asdf-system { pname = "trivial-rfc-1123"; @@ -101473,7 +101905,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-rfc-1123" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-rfc-1123/2022-07-07/trivial-rfc-1123-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-rfc-1123/2022-07-07/trivial-rfc-1123-20220707-git.tgz"; sha256 = "1w4ywpj10fnp7cya62dzlxlg8nyk4lppn2pnmfixsndwr4ib1h6x"; system = "trivial-rfc-1123"; asd = "trivial-rfc-1123"; @@ -101489,12 +101921,12 @@ lib.makeScope pkgs.newScope (self: { trivial-sanitize = ( build-asdf-system { pname = "trivial-sanitize"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "trivial-sanitize" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-sanitize/2024-10-12/trivial-sanitize-20241012-git.tgz"; - sha256 = "18pc1diq0mfmr3ql79islv2mfm4y791vg9xwz3dwp8wa912dd93h"; + url = "https://beta.quicklisp.org/archive/trivial-sanitize/2025-06-22/trivial-sanitize-20250622-git.tgz"; + sha256 = "1rk34ss0zyap18yf3r0kjyr9pa6jlj3w9q00fb6hjynykp1lvmr2"; system = "trivial-sanitize"; asd = "trivial-sanitize"; } @@ -101513,12 +101945,12 @@ lib.makeScope pkgs.newScope (self: { trivial-sanitize-tests = ( build-asdf-system { pname = "trivial-sanitize-tests"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "trivial-sanitize-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-sanitize/2024-10-12/trivial-sanitize-20241012-git.tgz"; - sha256 = "18pc1diq0mfmr3ql79islv2mfm4y791vg9xwz3dwp8wa912dd93h"; + url = "https://beta.quicklisp.org/archive/trivial-sanitize/2025-06-22/trivial-sanitize-20250622-git.tgz"; + sha256 = "1rk34ss0zyap18yf3r0kjyr9pa6jlj3w9q00fb6hjynykp1lvmr2"; system = "trivial-sanitize-tests"; asd = "trivial-sanitize-tests"; } @@ -101541,7 +101973,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-shell" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-shell/2024-10-12/trivial-shell-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-shell/2024-10-12/trivial-shell-20241012-git.tgz"; sha256 = "0cqfipcywi1ndl43walw7d54rd7layjq3wv2wpz5rlprv7dhpb2p"; system = "trivial-shell"; asd = "trivial-shell"; @@ -101559,7 +101991,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-shell-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-shell/2024-10-12/trivial-shell-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-shell/2024-10-12/trivial-shell-20241012-git.tgz"; sha256 = "0cqfipcywi1ndl43walw7d54rd7layjq3wv2wpz5rlprv7dhpb2p"; system = "trivial-shell-test"; asd = "trivial-shell-test"; @@ -101582,7 +102014,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-signal" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-signal/2019-07-10/trivial-signal-20190710-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-signal/2019-07-10/trivial-signal-20190710-git.tgz"; sha256 = "13rh1jwh786xg235rkgqbdqga4b9jwn99zlxm0wr73rs2a5ga8ad"; system = "trivial-signal"; asd = "trivial-signal"; @@ -101606,7 +102038,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-sockets" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-sockets/2019-01-07/trivial-sockets-20190107-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-sockets/2019-01-07/trivial-sockets-20190107-git.tgz"; sha256 = "0xj9x5z3psxqap9c29qz1xswx5fiqxyzd35kmbw2g6z08cgb7nd0"; system = "trivial-sockets"; asd = "trivial-sockets"; @@ -101626,7 +102058,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-ssh" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-ssh/2019-11-30/trivial-ssh-20191130-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-ssh/2019-11-30/trivial-ssh-20191130-git.tgz"; sha256 = "1hjd8bhbymq4s2jglid5i9m2b19cnf6c793gvkh6mawcjd37vjmb"; system = "trivial-ssh"; asd = "trivial-ssh"; @@ -101646,7 +102078,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-ssh-libssh2" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-ssh/2019-11-30/trivial-ssh-20191130-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-ssh/2019-11-30/trivial-ssh-20191130-git.tgz"; sha256 = "1hjd8bhbymq4s2jglid5i9m2b19cnf6c793gvkh6mawcjd37vjmb"; system = "trivial-ssh-libssh2"; asd = "trivial-ssh-libssh2"; @@ -101674,7 +102106,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-ssh-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-ssh/2019-11-30/trivial-ssh-20191130-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-ssh/2019-11-30/trivial-ssh-20191130-git.tgz"; sha256 = "1hjd8bhbymq4s2jglid5i9m2b19cnf6c793gvkh6mawcjd37vjmb"; system = "trivial-ssh-test"; asd = "trivial-ssh-test"; @@ -101697,7 +102129,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-system-loader" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-system-loader/2024-10-12/trivial-system-loader-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-system-loader/2024-10-12/trivial-system-loader-20241012-git.tgz"; sha256 = "094j50asfgyhqcm86p47azviivap0hni2gjp3khdxcn4f9i9d2b0"; system = "trivial-system-loader"; asd = "trivial-system-loader"; @@ -101717,7 +102149,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-tco" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-tco/2013-10-03/trivial-tco-20131003-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-tco/2013-10-03/trivial-tco-20131003-git.tgz"; sha256 = "0j6mkchrk6bzkpdkrahagip9lxxr8rx3qj4547wg8bdqr7mm2nmi"; system = "trivial-tco"; asd = "trivial-tco"; @@ -101737,7 +102169,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-tco-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-tco/2013-10-03/trivial-tco-20131003-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-tco/2013-10-03/trivial-tco-20131003-git.tgz"; sha256 = "0j6mkchrk6bzkpdkrahagip9lxxr8rx3qj4547wg8bdqr7mm2nmi"; system = "trivial-tco-test"; asd = "trivial-tco-test"; @@ -101756,12 +102188,12 @@ lib.makeScope pkgs.newScope (self: { trivial-thumbnail = ( build-asdf-system { pname = "trivial-thumbnail"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "trivial-thumbnail" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-thumbnail/2023-10-21/trivial-thumbnail-20231021-git.tgz"; - sha256 = "1asa8vg8cyfr0kl86xrpywk0cpqym9lzhkhxb829lqr49vr8zfa7"; + url = "https://beta.quicklisp.org/archive/trivial-thumbnail/2025-06-22/trivial-thumbnail-20250622-git.tgz"; + sha256 = "1451yimch278s4qing3a71kpnhgk3dl4k096prvyiyqyz1qnq2ld"; system = "trivial-thumbnail"; asd = "trivial-thumbnail"; } @@ -101780,7 +102212,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-timeout" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-timeout/2023-10-21/trivial-timeout-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-timeout/2023-10-21/trivial-timeout-20231021-git.tgz"; sha256 = "0s8z9aj6b3kv21yiyk13cjylzf5zlnw9v86vcff477m1gk9yddjs"; system = "trivial-timeout"; asd = "trivial-timeout"; @@ -101800,7 +102232,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-timer" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-timer/2021-05-31/trivial-timer-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-timer/2021-05-31/trivial-timer-20210531-git.tgz"; sha256 = "1b8pnw613h1dngzmv3qglmfrl1jdjbxrsbqnh7rfdj0lnv43h1il"; system = "trivial-timer"; asd = "trivial-timer"; @@ -101822,12 +102254,12 @@ lib.makeScope pkgs.newScope (self: { trivial-toplevel-commands = ( build-asdf-system { pname = "trivial-toplevel-commands"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "trivial-toplevel-commands" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-toplevel-commands/2024-10-12/trivial-toplevel-commands-20241012-git.tgz"; - sha256 = "03n0dpzgdgghc7cxj1s19w2wlx6r8f1s983f5a6cix5rigx9r834"; + url = "https://beta.quicklisp.org/archive/trivial-toplevel-commands/2025-06-22/trivial-toplevel-commands-20250622-git.tgz"; + sha256 = "1izzaihfq5fjwdfz0048lb4a0zr0pyydx9p6nrwr4i8702ighjnw"; system = "trivial-toplevel-commands"; asd = "trivial-toplevel-commands"; } @@ -101842,12 +102274,12 @@ lib.makeScope pkgs.newScope (self: { trivial-toplevel-prompt = ( build-asdf-system { pname = "trivial-toplevel-prompt"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "trivial-toplevel-prompt" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-toplevel-prompt/2024-10-12/trivial-toplevel-prompt-20241012-git.tgz"; - sha256 = "07gvazwqiw37sic9zz8qnl3gz0b8n4qzrwbmg4wy3rlkps98i4s2"; + url = "https://beta.quicklisp.org/archive/trivial-toplevel-prompt/2025-06-22/trivial-toplevel-prompt-20250622-git.tgz"; + sha256 = "0n3apxjdxn8cnhl1w1ampzhc6j37ra4ygv44v6rz3sinw1pwcmf4"; system = "trivial-toplevel-prompt"; asd = "trivial-toplevel-prompt"; } @@ -101866,7 +102298,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-types" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-types/2012-04-07/trivial-types-20120407-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-types/2012-04-07/trivial-types-20120407-git.tgz"; sha256 = "1s4cp9bdlbn8447q7w7f1wkgwrbvfzp20mgs307l5pxvdslin341"; system = "trivial-types"; asd = "trivial-types"; @@ -101884,7 +102316,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-update" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-update/2018-01-31/trivial-update-20180131-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-update/2018-01-31/trivial-update-20180131-git.tgz"; sha256 = "0dpijh9alljk0jmnkp37hfliylscs7xwvlmjkfshizmyh0qjjxir"; system = "trivial-update"; asd = "trivial-update"; @@ -101900,12 +102332,12 @@ lib.makeScope pkgs.newScope (self: { trivial-utf-8 = ( build-asdf-system { pname = "trivial-utf-8"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "trivial-utf-8" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-utf-8/2023-10-21/trivial-utf-8-20231021-git.tgz"; - sha256 = "0paf7ldw6ffl5xilyri3rfygz1v1npagf186i1z8hyxxjkri4q9s"; + url = "https://beta.quicklisp.org/archive/trivial-utf-8/2025-06-22/trivial-utf-8-20250622-git.tgz"; + sha256 = "1szf8xlsz1lhpwikz8lb9fxwkmi8x9ibss5512mw40h97r68rpw2"; system = "trivial-utf-8"; asd = "trivial-utf-8"; } @@ -101922,7 +102354,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-utilities" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-utilities/2022-07-07/trivial-utilities-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-utilities/2022-07-07/trivial-utilities-20220707-git.tgz"; sha256 = "0k1xmn5f5dik7scadw0vyy67mik4ypnfqbhlv2vsg9afxzbpx2dz"; system = "trivial-utilities"; asd = "trivial-utilities"; @@ -101946,7 +102378,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-variable-bindings" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-variable-bindings/2019-10-07/trivial-variable-bindings-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-variable-bindings/2019-10-07/trivial-variable-bindings-20191007-git.tgz"; sha256 = "08lx5m1bspxsnv572zma1hxk3yfyk9fkmi5cvcr5riannyimdqgy"; system = "trivial-variable-bindings"; asd = "trivial-variable-bindings"; @@ -101969,7 +102401,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-wish" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-wish/2017-06-30/trivial-wish-quicklisp-910afeea-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-wish/2017-06-30/trivial-wish-quicklisp-910afeea-git.tgz"; sha256 = "1ydb9vsanrv6slbddhxc38pq5s88k0rzgqnwabw5cgc8cp5gqvyp"; system = "trivial-wish"; asd = "trivial-wish"; @@ -101989,7 +102421,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-with" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-with/2017-08-30/trivial-with-quicklisp-2fd8ca54-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-with/2017-08-30/trivial-with-quicklisp-2fd8ca54-git.tgz"; sha256 = "1h880j9k7piq6y5a6sywn1r43h439dd6vfymqvhgnbx458wy69sq"; system = "trivial-with"; asd = "trivial-with"; @@ -102009,7 +102441,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-with-current-source-form" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-with-current-source-form/2023-06-18/trivial-with-current-source-form-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-with-current-source-form/2023-06-18/trivial-with-current-source-form-20230618-git.tgz"; sha256 = "1856m234mcg8l0p63h0j76isx8n2iji569b4r4zf7qs135xbw930"; system = "trivial-with-current-source-form"; asd = "trivial-with-current-source-form"; @@ -102027,7 +102459,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-ws" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-ws/2018-01-31/trivial-ws-20180131-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-ws/2018-01-31/trivial-ws-20180131-git.tgz"; sha256 = "0qmsf0dhmyhjgqjzdgj2yb1nkrijwp4p1j411613i45xjc2zd6m7"; system = "trivial-ws"; asd = "trivial-ws"; @@ -102047,7 +102479,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-ws-client" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-ws/2018-01-31/trivial-ws-20180131-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-ws/2018-01-31/trivial-ws-20180131-git.tgz"; sha256 = "0qmsf0dhmyhjgqjzdgj2yb1nkrijwp4p1j411613i45xjc2zd6m7"; system = "trivial-ws-client"; asd = "trivial-ws-client"; @@ -102070,7 +102502,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-ws-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-ws/2018-01-31/trivial-ws-20180131-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-ws/2018-01-31/trivial-ws-20180131-git.tgz"; sha256 = "0qmsf0dhmyhjgqjzdgj2yb1nkrijwp4p1j411613i45xjc2zd6m7"; system = "trivial-ws-test"; asd = "trivial-ws-test"; @@ -102096,7 +102528,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivial-yenc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivial-yenc/2016-12-04/trivial-yenc-20161204-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivial-yenc/2016-12-04/trivial-yenc-20161204-git.tgz"; sha256 = "0jsqwixgikdinc1rq22c4dh9kgg6z0kvw9rh9sbssbmxv99sb5bf"; system = "trivial-yenc"; asd = "trivial-yenc"; @@ -102116,7 +102548,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivialib.bdd" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivialib.bdd/2021-12-09/trivialib.bdd-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivialib.bdd/2021-12-09/trivialib.bdd-20211209-git.tgz"; sha256 = "1iqpcihpm6glr0afi35z6qifj0ppl7s4h1k94fn6lqpv2js6lzbr"; system = "trivialib.bdd"; asd = "trivialib.bdd"; @@ -102141,7 +102573,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivialib.bdd.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivialib.bdd/2021-12-09/trivialib.bdd-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivialib.bdd/2021-12-09/trivialib.bdd-20211209-git.tgz"; sha256 = "1iqpcihpm6glr0afi35z6qifj0ppl7s4h1k94fn6lqpv2js6lzbr"; system = "trivialib.bdd.test"; asd = "trivialib.bdd.test"; @@ -102164,7 +102596,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivialib.type-unify" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivialib.type-unify/2020-03-25/trivialib.type-unify-20200325-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivialib.type-unify/2020-03-25/trivialib.type-unify-20200325-git.tgz"; sha256 = "0b5ck9ldn1w3imgpxyh164bypy28kvjzkwlcyyfsc0h1njnm5jmy"; system = "trivialib.type-unify"; asd = "trivialib.type-unify"; @@ -102189,7 +102621,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trivialib.type-unify.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trivialib.type-unify/2020-03-25/trivialib.type-unify-20200325-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivialib.type-unify/2020-03-25/trivialib.type-unify-20200325-git.tgz"; sha256 = "0b5ck9ldn1w3imgpxyh164bypy28kvjzkwlcyyfsc0h1njnm5jmy"; system = "trivialib.type-unify.test"; asd = "trivialib.type-unify.test"; @@ -102212,7 +102644,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trucler" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trucler/2023-10-21/trucler-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/trucler/2023-10-21/trucler-20231021-git.tgz"; sha256 = "16cxx9pgpn3bkrmazc4lqhmaf20c0rhp1vaj78ms8ldwfqqrgznr"; system = "trucler"; asd = "trucler"; @@ -102235,7 +102667,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trucler-base" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trucler/2023-10-21/trucler-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/trucler/2023-10-21/trucler-20231021-git.tgz"; sha256 = "16cxx9pgpn3bkrmazc4lqhmaf20c0rhp1vaj78ms8ldwfqqrgznr"; system = "trucler-base"; asd = "trucler-base"; @@ -102255,7 +102687,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trucler-native" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trucler/2023-10-21/trucler-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/trucler/2023-10-21/trucler-20231021-git.tgz"; sha256 = "16cxx9pgpn3bkrmazc4lqhmaf20c0rhp1vaj78ms8ldwfqqrgznr"; system = "trucler-native"; asd = "trucler-native"; @@ -102275,7 +102707,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trucler-native-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trucler/2023-10-21/trucler-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/trucler/2023-10-21/trucler-20231021-git.tgz"; sha256 = "16cxx9pgpn3bkrmazc4lqhmaf20c0rhp1vaj78ms8ldwfqqrgznr"; system = "trucler-native-test"; asd = "trucler-native-test"; @@ -102298,7 +102730,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "trucler-reference" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/trucler/2023-10-21/trucler-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/trucler/2023-10-21/trucler-20231021-git.tgz"; sha256 = "16cxx9pgpn3bkrmazc4lqhmaf20c0rhp1vaj78ms8ldwfqqrgznr"; system = "trucler-reference"; asd = "trucler-reference"; @@ -102318,7 +102750,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "truetype-clx" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/truetype-clx/2020-02-18/truetype-clx-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/truetype-clx/2020-02-18/truetype-clx-20200218-git.tgz"; sha256 = "1k46xa0nclj0mpd7khnlpam6q5hgnp23jixryhvv96gx47swhddr"; system = "truetype-clx"; asd = "truetype-clx"; @@ -102339,12 +102771,12 @@ lib.makeScope pkgs.newScope (self: { try = ( build-asdf-system { pname = "try"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "try" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/try/2023-10-21/try-20231021-git.tgz"; - sha256 = "166i3fqwxfv9skz6yf95c95nx0jjqy1ak1131bd0sqmd582gi9mg"; + url = "https://beta.quicklisp.org/archive/try/2025-06-22/try-20250622-git.tgz"; + sha256 = "0w3c7s6rma1whlgaxz5sxmr9vkp914yanyh1dy64j9kzxyw9h40h"; system = "try"; asd = "try"; } @@ -102367,12 +102799,12 @@ lib.makeScope pkgs.newScope (self: { try_dot_asdf = ( build-asdf-system { pname = "try.asdf"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "try.asdf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/try/2023-10-21/try-20231021-git.tgz"; - sha256 = "166i3fqwxfv9skz6yf95c95nx0jjqy1ak1131bd0sqmd582gi9mg"; + url = "https://beta.quicklisp.org/archive/try/2025-06-22/try-20250622-git.tgz"; + sha256 = "0w3c7s6rma1whlgaxz5sxmr9vkp914yanyh1dy64j9kzxyw9h40h"; system = "try.asdf"; asd = "try.asdf"; } @@ -102391,7 +102823,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "tsqueue" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/tsqueue/2022-11-06/tsqueue-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/tsqueue/2022-11-06/tsqueue-20221106-git.tgz"; sha256 = "1ifq53b95a1sdpgx1hlz31pjbh0z6izh3wrgsiqvzgkbiyxq513q"; system = "tsqueue"; asd = "tsqueue"; @@ -102411,7 +102843,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ttt" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ttt/2022-07-07/ttt-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/ttt/2022-07-07/ttt-20220707-git.tgz"; sha256 = "0g6p8gpl8hl427mfrrf8824zq6wmkj11v1xq7pyv7v0b5cwp5ccv"; system = "ttt"; asd = "ttt"; @@ -102431,7 +102863,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "twfy" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/twfy/2013-04-20/twfy-20130420-git.tgz"; + url = "https://beta.quicklisp.org/archive/twfy/2013-04-20/twfy-20130420-git.tgz"; sha256 = "1srns5ayg7q8dzviizgm7j767dxbbyzh2ca8a5wdz3bc0qmwrsbs"; system = "twfy"; asd = "twfy"; @@ -102454,7 +102886,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "twitter-mongodb-driver" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-twitter/2018-02-28/cl-twitter-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-twitter/2018-02-28/cl-twitter-20180228-git.tgz"; sha256 = "07l86c63ssahpz3s9f7d99mbzmh60askkpdrhjrdbzd1vxlwkhcr"; system = "twitter-mongodb-driver"; asd = "twitter-mongodb-driver"; @@ -102477,7 +102909,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "type-i" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/type-i/2023-02-14/type-i-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/type-i/2023-02-14/type-i-20230214-git.tgz"; sha256 = "1y9dh1iziv3gwpf5yls0amwjhdqjidfibcla04mz6dqdv3zrg3hs"; system = "type-i"; asd = "type-i"; @@ -102500,7 +102932,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "type-i.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/type-i/2023-02-14/type-i-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/type-i/2023-02-14/type-i-20230214-git.tgz"; sha256 = "1y9dh1iziv3gwpf5yls0amwjhdqjidfibcla04mz6dqdv3zrg3hs"; system = "type-i.test"; asd = "type-i.test"; @@ -102523,7 +102955,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "type-r" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/type-r/2019-12-27/type-r-20191227-git.tgz"; + url = "https://beta.quicklisp.org/archive/type-r/2019-12-27/type-r-20191227-git.tgz"; sha256 = "1arsxc2539rg8vbrdirz4xxj1b06mc6g6rqndz7a02g127qvk2sm"; system = "type-r"; asd = "type-r"; @@ -102546,7 +102978,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "type-r.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/type-r/2019-12-27/type-r-20191227-git.tgz"; + url = "https://beta.quicklisp.org/archive/type-r/2019-12-27/type-r-20191227-git.tgz"; sha256 = "1arsxc2539rg8vbrdirz4xxj1b06mc6g6rqndz7a02g127qvk2sm"; system = "type-r.test"; asd = "type-r.test"; @@ -102565,12 +102997,12 @@ lib.makeScope pkgs.newScope (self: { type-templates = ( build-asdf-system { pname = "type-templates"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "type-templates" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/type-templates/2024-10-12/type-templates-20241012-git.tgz"; - sha256 = "1zmz3bmwg8ncqbnjwimn8n7q9ik9arnhd5ijd22ap1nwhbnmk1rj"; + url = "https://beta.quicklisp.org/archive/type-templates/2025-06-22/type-templates-20250622-git.tgz"; + sha256 = "1kc88zhvh2xvx73sxqq58kip31xa9ial1y1vi8rrw8za3bf31nc3"; system = "type-templates"; asd = "type-templates"; } @@ -102589,12 +103021,12 @@ lib.makeScope pkgs.newScope (self: { typo = ( build-asdf-system { pname = "typo"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "typo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/typo/2024-10-12/typo-20241012-git.tgz"; - sha256 = "1xgrfj1yxay04zf1ppf56b4j5p1wn67zfhiwpfd30dvk53mcrlik"; + url = "https://beta.quicklisp.org/archive/typo/2025-06-22/typo-20250622-git.tgz"; + sha256 = "12r0jwhl41mfgb3wkikisvp5qf35nmajmvqv2gjjph7j2p5qh8h0"; system = "typo"; asd = "typo"; } @@ -102606,6 +103038,7 @@ lib.makeScope pkgs.newScope (self: { (getAttr "introspect-environment" self) (getAttr "trivia" self) (getAttr "trivial-arguments" self) + (getAttr "trivial-cltl2" self) (getAttr "trivial-garbage" self) ]; meta = { @@ -102616,12 +103049,12 @@ lib.makeScope pkgs.newScope (self: { typo_dot_test-suite = ( build-asdf-system { pname = "typo.test-suite"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "typo.test-suite" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/typo/2024-10-12/typo-20241012-git.tgz"; - sha256 = "1xgrfj1yxay04zf1ppf56b4j5p1wn67zfhiwpfd30dvk53mcrlik"; + url = "https://beta.quicklisp.org/archive/typo/2025-06-22/typo-20250622-git.tgz"; + sha256 = "12r0jwhl41mfgb3wkikisvp5qf35nmajmvqv2gjjph7j2p5qh8h0"; system = "typo.test-suite"; asd = "typo.test-suite"; } @@ -102639,12 +103072,12 @@ lib.makeScope pkgs.newScope (self: { uax-14 = ( build-asdf-system { pname = "uax-14"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "uax-14" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/uax-14/2023-10-21/uax-14-20231021-git.tgz"; - sha256 = "1k9cqs9lb5i2y9b3zgrr1kq2w8bcr3h362105ykz0if5yz8m59fq"; + url = "https://beta.quicklisp.org/archive/uax-14/2025-06-22/uax-14-20250622-git.tgz"; + sha256 = "1a1lzmmfqhxyg68fg0q0rpcpx57bv48svwgm5aq3ffi03j2wyy1l"; system = "uax-14"; asd = "uax-14"; } @@ -102659,12 +103092,12 @@ lib.makeScope pkgs.newScope (self: { uax-14-test = ( build-asdf-system { pname = "uax-14-test"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "uax-14-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/uax-14/2023-10-21/uax-14-20231021-git.tgz"; - sha256 = "1k9cqs9lb5i2y9b3zgrr1kq2w8bcr3h362105ykz0if5yz8m59fq"; + url = "https://beta.quicklisp.org/archive/uax-14/2025-06-22/uax-14-20250622-git.tgz"; + sha256 = "1a1lzmmfqhxyg68fg0q0rpcpx57bv48svwgm5aq3ffi03j2wyy1l"; system = "uax-14-test"; asd = "uax-14-test"; } @@ -102687,7 +103120,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "uax-15" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/uax-15/2024-10-12/uax-15-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/uax-15/2024-10-12/uax-15-20241012-git.tgz"; sha256 = "12qkq4r6qv5cn535bwpkq7zfahajlrv8v7661x4wzf4pp0avx7n6"; system = "uax-15"; asd = "uax-15"; @@ -102708,7 +103141,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "uax-9" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/uax-9/2023-10-21/uax-9-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/uax-9/2023-10-21/uax-9-20231021-git.tgz"; sha256 = "1kbq8v45pxhmwqn6is5lfsp51h80kns4s1cqbh9z0xdmxzw63ip1"; system = "uax-9"; asd = "uax-9"; @@ -102728,7 +103161,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "uax-9-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/uax-9/2023-10-21/uax-9-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/uax-9/2023-10-21/uax-9-20231021-git.tgz"; sha256 = "1kbq8v45pxhmwqn6is5lfsp51h80kns4s1cqbh9z0xdmxzw63ip1"; system = "uax-9-test"; asd = "uax-9-test"; @@ -102752,7 +103185,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ubiquitous" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ubiquitous/2023-10-21/ubiquitous-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/ubiquitous/2023-10-21/ubiquitous-20231021-git.tgz"; sha256 = "02q6yz9j374q23avi06lddy6gkzza0xn3855n7dqgy34fv1shw1i"; system = "ubiquitous"; asd = "ubiquitous"; @@ -102773,7 +103206,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ubiquitous-concurrent" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ubiquitous/2023-10-21/ubiquitous-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/ubiquitous/2023-10-21/ubiquitous-20231021-git.tgz"; sha256 = "02q6yz9j374q23avi06lddy6gkzza0xn3855n7dqgy34fv1shw1i"; system = "ubiquitous-concurrent"; asd = "ubiquitous-concurrent"; @@ -102796,7 +103229,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ucons" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ucons/2023-06-18/ucons-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/ucons/2023-06-18/ucons-20230618-git.tgz"; sha256 = "0pisf8sswh1wainabpnczla8c98kr0lv0qvh0zapwkf1lq1drzp1"; system = "ucons"; asd = "ucons"; @@ -102822,7 +103255,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ucw" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ucw/2016-02-08/ucw-20160208-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/ucw/2016-02-08/ucw-20160208-darcs.tgz"; sha256 = "0wd7816zr53bw9z9a48cx1khj15d1jii5wzgqns1c5x70brgy89z"; system = "ucw"; asd = "ucw"; @@ -102846,7 +103279,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ucw-core" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ucw/2016-02-08/ucw-20160208-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/ucw/2016-02-08/ucw-20160208-darcs.tgz"; sha256 = "0wd7816zr53bw9z9a48cx1khj15d1jii5wzgqns1c5x70brgy89z"; system = "ucw-core"; asd = "ucw-core"; @@ -102879,7 +103312,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ucw-core.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ucw/2016-02-08/ucw-20160208-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/ucw/2016-02-08/ucw-20160208-darcs.tgz"; sha256 = "0wd7816zr53bw9z9a48cx1khj15d1jii5wzgqns1c5x70brgy89z"; system = "ucw-core.test"; asd = "ucw-core"; @@ -102906,7 +103339,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ucw.examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ucw/2016-02-08/ucw-20160208-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/ucw/2016-02-08/ucw-20160208-darcs.tgz"; sha256 = "0wd7816zr53bw9z9a48cx1khj15d1jii5wzgqns1c5x70brgy89z"; system = "ucw.examples"; asd = "ucw"; @@ -102926,7 +103359,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ucw.httpd" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ucw/2016-02-08/ucw-20160208-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/ucw/2016-02-08/ucw-20160208-darcs.tgz"; sha256 = "0wd7816zr53bw9z9a48cx1khj15d1jii5wzgqns1c5x70brgy89z"; system = "ucw.httpd"; asd = "ucw-core"; @@ -102951,7 +103384,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ucw.manual-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ucw/2016-02-08/ucw-20160208-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/ucw/2016-02-08/ucw-20160208-darcs.tgz"; sha256 = "0wd7816zr53bw9z9a48cx1khj15d1jii5wzgqns1c5x70brgy89z"; system = "ucw.manual-examples"; asd = "ucw"; @@ -102971,7 +103404,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "uffi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/uffi/2018-02-28/uffi-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/uffi/2018-02-28/uffi-20180228-git.tgz"; sha256 = "0ywly04k8vir39ld7ids80yjn34y3y3mlpky1pr1fh9p8q412a85"; system = "uffi"; asd = "uffi"; @@ -102989,7 +103422,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "uffi-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/uffi/2018-02-28/uffi-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/uffi/2018-02-28/uffi-20180228-git.tgz"; sha256 = "0ywly04k8vir39ld7ids80yjn34y3y3mlpky1pr1fh9p8q412a85"; system = "uffi-tests"; asd = "uffi-tests"; @@ -103009,7 +103442,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ufo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ufo/2021-08-07/ufo-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/ufo/2021-08-07/ufo-20210807-git.tgz"; sha256 = "0bbq4pjnbmf1zpmh11jlriv0qnvrhw1xxnjj2y35gk75rr8rvizy"; system = "ufo"; asd = "ufo"; @@ -103029,7 +103462,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ufo-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ufo/2021-08-07/ufo-20210807-git.tgz"; + url = "https://beta.quicklisp.org/archive/ufo/2021-08-07/ufo-20210807-git.tgz"; sha256 = "0bbq4pjnbmf1zpmh11jlriv0qnvrhw1xxnjj2y35gk75rr8rvizy"; system = "ufo-test"; asd = "ufo-test"; @@ -103054,7 +103487,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ugly-tiny-infix-macro" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ugly-tiny-infix-macro/2016-08-25/ugly-tiny-infix-macro-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/ugly-tiny-infix-macro/2016-08-25/ugly-tiny-infix-macro-20160825-git.tgz"; sha256 = "15bbnr3kzy3p35skm6bkyyl5ck4d264am0zyjsix5k58d9fli3ii"; system = "ugly-tiny-infix-macro"; asd = "ugly-tiny-infix-macro"; @@ -103074,7 +103507,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "umbra" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/umbra/2022-07-07/umbra-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/umbra/2022-07-07/umbra-20220707-git.tgz"; sha256 = "125bsf69gzdy0r6jh6fz8000rqww1rji354x0yrgmkz9x3mvz4k4"; system = "umbra"; asd = "umbra"; @@ -103098,7 +103531,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "umlisp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/umlisp/2021-04-11/umlisp-20210411-git.tgz"; + url = "https://beta.quicklisp.org/archive/umlisp/2021-04-11/umlisp-20210411-git.tgz"; sha256 = "1yyyn1qka4iw3hwii7i8k939dbwvhn543m8qclk2ajggkdky4mqb"; system = "umlisp"; asd = "umlisp"; @@ -103123,7 +103556,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "umlisp-orf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/umlisp-orf/2015-09-23/umlisp-orf-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/umlisp-orf/2015-09-23/umlisp-orf-20150923-git.tgz"; sha256 = "187i9rcj3rymi8hmlvglvig7yqandzzx57x0rzr4yfv8sgnb82qx"; system = "umlisp-orf"; asd = "umlisp-orf"; @@ -103148,7 +103581,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "umlisp-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/umlisp/2021-04-11/umlisp-20210411-git.tgz"; + url = "https://beta.quicklisp.org/archive/umlisp/2021-04-11/umlisp-20210411-git.tgz"; sha256 = "1yyyn1qka4iw3hwii7i8k939dbwvhn543m8qclk2ajggkdky4mqb"; system = "umlisp-tests"; asd = "umlisp-tests"; @@ -103171,7 +103604,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "unboxables" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/unboxables/2023-10-21/unboxables-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/unboxables/2023-10-21/unboxables-20231021-git.tgz"; sha256 = "099qcsc9q9q5cz2qlvkylc2g8g80fqzrxyq4lc072bmw96wy27fs"; system = "unboxables"; asd = "unboxables"; @@ -103195,7 +103628,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "uncommon-lisp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; system = "uncommon-lisp"; asd = "uncommon-lisp"; @@ -103215,7 +103648,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "uncursed" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/uncursed/2022-02-20/uncursed-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/uncursed/2022-02-20/uncursed-20220220-git.tgz"; sha256 = "1hydiwh12851rrm12y0a6pb2jml2cjdk8wxvz4c00d2xwraqc6mr"; system = "uncursed"; asd = "uncursed"; @@ -103241,7 +103674,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "uncursed-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/uncursed/2022-02-20/uncursed-20220220-git.tgz"; + url = "https://beta.quicklisp.org/archive/uncursed/2022-02-20/uncursed-20220220-git.tgz"; sha256 = "1hydiwh12851rrm12y0a6pb2jml2cjdk8wxvz4c00d2xwraqc6mr"; system = "uncursed-examples"; asd = "uncursed-examples"; @@ -103264,7 +103697,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "unifgram" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/paiprolog/2018-02-28/paiprolog-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/paiprolog/2018-02-28/paiprolog-20180228-git.tgz"; sha256 = "1nxz01i6f8s920gm69r2kwjdpq9pli8b2ayqwijhzgjwi0r4jj9r"; system = "unifgram"; asd = "unifgram"; @@ -103284,7 +103717,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "unit-formulas" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/unit-formula/2018-07-11/unit-formula-20180711-git.tgz"; + url = "https://beta.quicklisp.org/archive/unit-formula/2018-07-11/unit-formula-20180711-git.tgz"; sha256 = "1j9zcnyj2ik7f2130pkfwr2bhh5ldlgc83n1024w0dy95ksl1f20"; system = "unit-formulas"; asd = "unit-formulas"; @@ -103307,7 +103740,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "unit-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/unit-test/2012-05-20/unit-test-20120520-git.tgz"; + url = "https://beta.quicklisp.org/archive/unit-test/2012-05-20/unit-test-20120520-git.tgz"; sha256 = "11hpksz56iqkv7jw25p2a8r3n9dj922fyarn16d98589g6hdskj9"; system = "unit-test"; asd = "unit-test"; @@ -103325,7 +103758,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "universal-config" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/universal-config/2018-04-30/universal-config-20180430-git.tgz"; + url = "https://beta.quicklisp.org/archive/universal-config/2018-04-30/universal-config-20180430-git.tgz"; sha256 = "17sjd37jwsi47yhsj9qsnfyhyrlhlxdrxa4szklwjh489hf01hd0"; system = "universal-config"; asd = "universal-config"; @@ -103348,7 +103781,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "unix-options" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/unix-options/2015-10-31/unix-options-20151031-git.tgz"; + url = "https://beta.quicklisp.org/archive/unix-options/2015-10-31/unix-options-20151031-git.tgz"; sha256 = "17q7irrbmaja7gj86h01ali9n9p782jxisgkb1r2q5ajf4lr1rsv"; system = "unix-options"; asd = "unix-options"; @@ -103366,7 +103799,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "unix-opts" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/unix-opts/2021-01-24/unix-opts-20210124-git.tgz"; + url = "https://beta.quicklisp.org/archive/unix-opts/2021-01-24/unix-opts-20210124-git.tgz"; sha256 = "16mcqpzwrz808p9n3wwl99ckg3hg7yihw08y1i4l7c92aldbkasq"; system = "unix-opts"; asd = "unix-opts"; @@ -103384,7 +103817,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "unix-sockets" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-unix-sockets/2024-10-12/cl-unix-sockets-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-unix-sockets/2024-10-12/cl-unix-sockets-20241012-git.tgz"; sha256 = "09l3032p3gavyin1hn45yqv6b3vrg74vzcz85ppqg4nzpmp44845"; system = "unix-sockets"; asd = "unix-sockets"; @@ -103411,7 +103844,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "unix-sockets.tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-unix-sockets/2024-10-12/cl-unix-sockets-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-unix-sockets/2024-10-12/cl-unix-sockets-20241012-git.tgz"; sha256 = "09l3032p3gavyin1hn45yqv6b3vrg74vzcz85ppqg4nzpmp44845"; system = "unix-sockets.tests"; asd = "unix-sockets.tests"; @@ -103437,7 +103870,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "uri-template" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/uri-template/2019-08-13/uri-template-1.3.1.tgz"; + url = "https://beta.quicklisp.org/archive/uri-template/2019-08-13/uri-template-1.3.1.tgz"; sha256 = "06n5kmjax64kv57ng5g2030a67z131i4wm53npg9zq2xlj9sprd8"; system = "uri-template"; asd = "uri-template"; @@ -103461,7 +103894,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "uri-template.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/uri-template/2019-08-13/uri-template-1.3.1.tgz"; + url = "https://beta.quicklisp.org/archive/uri-template/2019-08-13/uri-template-1.3.1.tgz"; sha256 = "06n5kmjax64kv57ng5g2030a67z131i4wm53npg9zq2xlj9sprd8"; system = "uri-template.test"; asd = "uri-template.test"; @@ -103484,7 +103917,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "url-rewrite" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/url-rewrite/2017-12-27/url-rewrite-20171227-git.tgz"; + url = "https://beta.quicklisp.org/archive/url-rewrite/2017-12-27/url-rewrite-20171227-git.tgz"; sha256 = "0d3awcb938ajiylyfnbqsc7nndy6csx0qz1bcyr4f0p862w3xbqf"; system = "url-rewrite"; asd = "url-rewrite"; @@ -103504,7 +103937,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "userial" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/userial/2011-06-19/userial_0.8.2011.06.02.tgz"; + url = "https://beta.quicklisp.org/archive/userial/2011-06-19/userial_0.8.2011.06.02.tgz"; sha256 = "08f8hc1f81gyn4br9p732p8r2gl6cvccd4yzc9ydz4i0ijclpp2m"; system = "userial"; asd = "userial"; @@ -103528,7 +103961,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "userial-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/userial/2011-06-19/userial_0.8.2011.06.02.tgz"; + url = "https://beta.quicklisp.org/archive/userial/2011-06-19/userial_0.8.2011.06.02.tgz"; sha256 = "08f8hc1f81gyn4br9p732p8r2gl6cvccd4yzc9ydz4i0ijclpp2m"; system = "userial-tests"; asd = "userial-tests"; @@ -103551,7 +103984,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "usocket" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/usocket/2024-10-12/usocket-0.8.8.tgz"; + url = "https://beta.quicklisp.org/archive/usocket/2024-10-12/usocket-0.8.8.tgz"; sha256 = "13j2hyl7j06vl8hh3930wd3bi2p0pcg4dcd243al31fgw4m0bvag"; system = "usocket"; asd = "usocket"; @@ -103569,7 +104002,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "usocket-server" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/usocket/2024-10-12/usocket-0.8.8.tgz"; + url = "https://beta.quicklisp.org/archive/usocket/2024-10-12/usocket-0.8.8.tgz"; sha256 = "13j2hyl7j06vl8hh3930wd3bi2p0pcg4dcd243al31fgw4m0bvag"; system = "usocket-server"; asd = "usocket-server"; @@ -103590,7 +104023,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "usocket-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/usocket/2024-10-12/usocket-0.8.8.tgz"; + url = "https://beta.quicklisp.org/archive/usocket/2024-10-12/usocket-0.8.8.tgz"; sha256 = "13j2hyl7j06vl8hh3930wd3bi2p0pcg4dcd243al31fgw4m0bvag"; system = "usocket-test"; asd = "usocket-test"; @@ -103609,12 +104042,12 @@ lib.makeScope pkgs.newScope (self: { utf8-input-stream = ( build-asdf-system { pname = "utf8-input-stream"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "utf8-input-stream" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/utf8-input-stream/2024-10-12/utf8-input-stream-20241012-git.tgz"; - sha256 = "06fk8fsz9nngdfjymg93h1l5m4yhfg4w8as68zlaj698xf9ry3i5"; + url = "https://beta.quicklisp.org/archive/utf8-input-stream/2025-06-22/utf8-input-stream-20250622-git.tgz"; + sha256 = "0in5d1n8smqshkm640h85i5c3pwwyl4i9j5vh1jrpl8mnyblvqrw"; system = "utf8-input-stream"; asd = "utf8-input-stream"; } @@ -103632,12 +104065,12 @@ lib.makeScope pkgs.newScope (self: { utf8-input-stream_dot_tests = ( build-asdf-system { pname = "utf8-input-stream.tests"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "utf8-input-stream.tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/utf8-input-stream/2024-10-12/utf8-input-stream-20241012-git.tgz"; - sha256 = "06fk8fsz9nngdfjymg93h1l5m4yhfg4w8as68zlaj698xf9ry3i5"; + url = "https://beta.quicklisp.org/archive/utf8-input-stream/2025-06-22/utf8-input-stream-20250622-git.tgz"; + sha256 = "0in5d1n8smqshkm640h85i5c3pwwyl4i9j5vh1jrpl8mnyblvqrw"; system = "utf8-input-stream.tests"; asd = "utf8-input-stream.tests"; } @@ -103660,7 +104093,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "utilities.binary-dump" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/utilities.binary-dump/2018-12-10/utilities.binary-dump-20181210-git.tgz"; + url = "https://beta.quicklisp.org/archive/utilities.binary-dump/2018-12-10/utilities.binary-dump-20181210-git.tgz"; sha256 = "1l20r1782bskyy50ca6vsyxrvbxlgfq4nm33wl8as761dcjpj4d4"; system = "utilities.binary-dump"; asd = "utilities.binary-dump"; @@ -103684,7 +104117,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "utilities.print-items" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/utilities.print-items/2022-11-06/utilities.print-items-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/utilities.print-items/2022-11-06/utilities.print-items-20221106-git.tgz"; sha256 = "0qn0w7cyl76c3ssipqsx4ngb1641ajfkaihnb31w374zrzbns8wi"; system = "utilities.print-items"; asd = "utilities.print-items"; @@ -103702,7 +104135,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "utilities.print-tree" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/utilities.print-tree/2022-11-06/utilities.print-tree-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/utilities.print-tree/2022-11-06/utilities.print-tree-20221106-git.tgz"; sha256 = "0i7371qvlnwjcybh3c2ac88xz39vjdynhgxwz4acjbcnsw0jqsls"; system = "utilities.print-tree"; asd = "utilities.print-tree"; @@ -103720,7 +104153,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "utility" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/utility/2019-02-02/utility-20190202-git.tgz"; + url = "https://beta.quicklisp.org/archive/utility/2019-02-02/utility-20190202-git.tgz"; sha256 = "0nc83kxp2c0wy5ai7dm6w4anx5266j99pxzr0c7fxgllc7d0g1qd"; system = "utility"; asd = "utility"; @@ -103740,7 +104173,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "utility-arguments" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/utility-arguments/2016-12-04/utility-arguments-20161204-git.tgz"; + url = "https://beta.quicklisp.org/archive/utility-arguments/2016-12-04/utility-arguments-20161204-git.tgz"; sha256 = "0dzbzzrla9709zl5dqdfw02mxa3rvcpca466qrcprgs3hnxdvgwb"; system = "utility-arguments"; asd = "utility-arguments"; @@ -103760,7 +104193,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "utils-kt" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/utils-kt/2020-02-18/utils-kt-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/utils-kt/2020-02-18/utils-kt-20200218-git.tgz"; sha256 = "016x3w034brz02z9mrsrkhk2djizg3yqsvhl9k62xqcnpy3b87dn"; system = "utils-kt"; asd = "utils-kt"; @@ -103776,12 +104209,12 @@ lib.makeScope pkgs.newScope (self: { utm = ( build-asdf-system { pname = "utm"; - version = "20200218-git"; + version = "20250622-git"; asds = [ "utm" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/utm/2020-02-18/utm-20200218-git.tgz"; - sha256 = "1a5dp5fls26ppc6fnvd941nfvk2qs72grl0a3pycq7vzw6580v01"; + url = "https://beta.quicklisp.org/archive/utm/2025-06-22/utm-20250622-git.tgz"; + sha256 = "1fvbbmc6z1py9zixx3h0mb2zrb6v92km8bf7k8vvk0lj2p0kjjmw"; system = "utm"; asd = "utm"; } @@ -103800,7 +104233,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "utm-ups" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/utm-ups/2023-06-18/utm-ups-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/utm-ups/2023-06-18/utm-ups-20230618-git.tgz"; sha256 = "19nnnqagfg1c1vzwlqpp8mq2d0hrk8r6r07a46nvdyzmwbnmbwyr"; system = "utm-ups"; asd = "utm-ups"; @@ -103816,12 +104249,12 @@ lib.makeScope pkgs.newScope (self: { utm_dot_test = ( build-asdf-system { pname = "utm.test"; - version = "20200218-git"; + version = "20250622-git"; asds = [ "utm.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/utm/2020-02-18/utm-20200218-git.tgz"; - sha256 = "1a5dp5fls26ppc6fnvd941nfvk2qs72grl0a3pycq7vzw6580v01"; + url = "https://beta.quicklisp.org/archive/utm/2025-06-22/utm-20250622-git.tgz"; + sha256 = "1fvbbmc6z1py9zixx3h0mb2zrb6v92km8bf7k8vvk0lj2p0kjjmw"; system = "utm.test"; asd = "utm.test"; } @@ -103843,7 +104276,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "uuid" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/uuid/2020-07-15/uuid-20200715-git.tgz"; + url = "https://beta.quicklisp.org/archive/uuid/2020-07-15/uuid-20200715-git.tgz"; sha256 = "1ncwhyw0zggwpkzjsw7d4pkrlldi34xvb69c0bzxmyz2krg8rpx0"; system = "uuid"; asd = "uuid"; @@ -103864,7 +104297,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "uuidv7" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/uuidv7.lisp/2024-10-12/uuidv7.lisp-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/uuidv7.lisp/2024-10-12/uuidv7.lisp-20241012-git.tgz"; sha256 = "1lirb92a1b3hpf66gndas4yix0smfckg9arzk69lpcvxsidzc66l"; system = "uuidv7"; asd = "uuidv7"; @@ -103884,7 +104317,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "validate-list" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/validate-list/2021-04-11/validate-list-20210411-git.tgz"; + url = "https://beta.quicklisp.org/archive/validate-list/2021-04-11/validate-list-20210411-git.tgz"; sha256 = "1rb7glqvlaz84cfd2wjk49si9jh4ffysmva5007gjhqfhr9z23lj"; system = "validate-list"; asd = "validate-list"; @@ -103908,7 +104341,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "varint" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/protobuf/2023-06-18/protobuf-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/protobuf/2023-06-18/protobuf-20230618-git.tgz"; sha256 = "0pp8i2i72p6cng11sxj83klw45jqv05l5024h7c2rl0pvsg8f6bc"; system = "varint"; asd = "varint"; @@ -103931,7 +104364,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "varjo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/varjo/2021-01-24/varjo-release-quicklisp-92f9c75b-git.tgz"; + url = "https://beta.quicklisp.org/archive/varjo/2021-01-24/varjo-release-quicklisp-92f9c75b-git.tgz"; sha256 = "0gga4wq74qxql4zxh8zq1ab2xnsz8ygdaf8wxy7w15vv4czgamr9"; system = "varjo"; asd = "varjo"; @@ -103960,7 +104393,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "varjo.import" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/varjo/2021-01-24/varjo-release-quicklisp-92f9c75b-git.tgz"; + url = "https://beta.quicklisp.org/archive/varjo/2021-01-24/varjo-release-quicklisp-92f9c75b-git.tgz"; sha256 = "0gga4wq74qxql4zxh8zq1ab2xnsz8ygdaf8wxy7w15vv4czgamr9"; system = "varjo.import"; asd = "varjo.import"; @@ -103986,7 +104419,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "varjo.tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/varjo/2021-01-24/varjo-release-quicklisp-92f9c75b-git.tgz"; + url = "https://beta.quicklisp.org/archive/varjo/2021-01-24/varjo-release-quicklisp-92f9c75b-git.tgz"; sha256 = "0gga4wq74qxql4zxh8zq1ab2xnsz8ygdaf8wxy7w15vv4czgamr9"; system = "varjo.tests"; asd = "varjo.tests"; @@ -104006,12 +104439,12 @@ lib.makeScope pkgs.newScope (self: { varray = ( build-asdf-system { pname = "varray"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "varray" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz"; - sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn"; + url = "https://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz"; + sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf"; system = "varray"; asd = "varray"; } @@ -104035,7 +104468,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "vas-string-metrics" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vas-string-metrics/2021-12-09/vas-string-metrics-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/vas-string-metrics/2021-12-09/vas-string-metrics-20211209-git.tgz"; sha256 = "1yvkwc939dckv070nlgqfj5ys9ii2rm32m5wfx7qxdjrb4n19sx9"; system = "vas-string-metrics"; asd = "vas-string-metrics"; @@ -104053,7 +104486,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "vecto" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vecto/2021-12-30/vecto-1.6.tgz"; + url = "https://beta.quicklisp.org/archive/vecto/2021-12-30/vecto-1.6.tgz"; sha256 = "1s3ii9absili7yiv89byjikxcxlbagsvcxdwkxgsm1rahgggyk5x"; system = "vecto"; asd = "vecto"; @@ -104075,7 +104508,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "vectometry" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vecto/2021-12-30/vecto-1.6.tgz"; + url = "https://beta.quicklisp.org/archive/vecto/2021-12-30/vecto-1.6.tgz"; sha256 = "1s3ii9absili7yiv89byjikxcxlbagsvcxdwkxgsm1rahgggyk5x"; system = "vectometry"; asd = "vectometry"; @@ -104095,7 +104528,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "vectors" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vectors/2017-12-27/vectors-20171227-git.tgz"; + url = "https://beta.quicklisp.org/archive/vectors/2017-12-27/vectors-20171227-git.tgz"; sha256 = "1sflb1wz6fcszdbqrcfh52bp5ch6wbizzp7jx97ni8lrqq2r6cqy"; system = "vectors"; asd = "vectors"; @@ -104111,12 +104544,12 @@ lib.makeScope pkgs.newScope (self: { vellum = ( build-asdf-system { pname = "vellum"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "vellum" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vellum/2024-10-12/vellum-20241012-git.tgz"; - sha256 = "0qy5hsyy3qf5245n5lfnhsfdjmsdjmwa2d3jp8gr6zg71npfx926"; + url = "https://beta.quicklisp.org/archive/vellum/2025-06-22/vellum-20250622-git.tgz"; + sha256 = "0bc8fdyzq01kfilz7zyibq8dghzp1gcvdn4681r5hzpsslprym44"; system = "vellum"; asd = "vellum"; } @@ -104145,7 +104578,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "vellum-binary" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vellum-binary/2024-10-12/vellum-binary-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/vellum-binary/2024-10-12/vellum-binary-20241012-git.tgz"; sha256 = "15kv5vzzrf6c3nvibz3p3d9arxmvwska37p5s13g9d2z1k3wyag1"; system = "vellum-binary"; asd = "vellum-binary"; @@ -104173,7 +104606,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "vellum-clim" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vellum-clim/2021-05-31/vellum-clim-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/vellum-clim/2021-05-31/vellum-clim-20210531-git.tgz"; sha256 = "06g1pw0r60yd13hzbjrbpa1p0pnlwkqfn06ipk1gs0kc76gf2im5"; system = "vellum-clim"; asd = "vellum-clim"; @@ -104193,12 +104626,12 @@ lib.makeScope pkgs.newScope (self: { vellum-csv = ( build-asdf-system { pname = "vellum-csv"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "vellum-csv" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vellum-csv/2024-10-12/vellum-csv-20241012-git.tgz"; - sha256 = "0xk4n6w3hsnn8cl34x8vigzmqnkdn04j6831095yyqk7373hvfql"; + url = "https://beta.quicklisp.org/archive/vellum-csv/2025-06-22/vellum-csv-20250622-git.tgz"; + sha256 = "0kq5qw8dma90j75rmyid4gdz21asdp4x0s8dx3a3yk990xg9g6fc"; system = "vellum-csv"; asd = "vellum-csv"; } @@ -104220,12 +104653,12 @@ lib.makeScope pkgs.newScope (self: { vellum-csv-tests = ( build-asdf-system { pname = "vellum-csv-tests"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "vellum-csv-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vellum-csv/2024-10-12/vellum-csv-20241012-git.tgz"; - sha256 = "0xk4n6w3hsnn8cl34x8vigzmqnkdn04j6831095yyqk7373hvfql"; + url = "https://beta.quicklisp.org/archive/vellum-csv/2025-06-22/vellum-csv-20250622-git.tgz"; + sha256 = "0kq5qw8dma90j75rmyid4gdz21asdp4x0s8dx3a3yk990xg9g6fc"; system = "vellum-csv-tests"; asd = "vellum-csv-tests"; } @@ -104248,7 +104681,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "vellum-postmodern" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vellum-postmodern/2024-10-12/vellum-postmodern-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/vellum-postmodern/2024-10-12/vellum-postmodern-20241012-git.tgz"; sha256 = "1q7s57vfcs01nl03kjkyjk9ya68cnl9p6mf1z864imfd04ssy9gr"; system = "vellum-postmodern"; asd = "vellum-postmodern"; @@ -104273,12 +104706,12 @@ lib.makeScope pkgs.newScope (self: { vellum-tests = ( build-asdf-system { pname = "vellum-tests"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "vellum-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vellum/2024-10-12/vellum-20241012-git.tgz"; - sha256 = "0qy5hsyy3qf5245n5lfnhsfdjmsdjmwa2d3jp8gr6zg71npfx926"; + url = "https://beta.quicklisp.org/archive/vellum/2025-06-22/vellum-20250622-git.tgz"; + sha256 = "0bc8fdyzq01kfilz7zyibq8dghzp1gcvdn4681r5hzpsslprym44"; system = "vellum-tests"; asd = "vellum-tests"; } @@ -104301,7 +104734,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "veq" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-veq/2023-10-21/cl-veq-v4.5.5.tgz"; + url = "https://beta.quicklisp.org/archive/cl-veq/2023-10-21/cl-veq-v4.5.5.tgz"; sha256 = "0sk6rvqck47ym7ryy0smya1vwgpksxzal1xcwmwl106nxi9l7m34"; system = "veq"; asd = "veq"; @@ -104317,22 +104750,22 @@ lib.makeScope pkgs.newScope (self: { verbose = ( build-asdf-system { pname = "verbose"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "verbose" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/verbose/2024-10-12/verbose-20241012-git.tgz"; - sha256 = "1q0knjk1nlnvlg9kydyxzd4sd2v8vm9dx10zqz2bpihd5nyhz3nv"; + url = "https://beta.quicklisp.org/archive/verbose/2025-06-22/verbose-20250622-git.tgz"; + sha256 = "1zpfbnfa4ii093aij4bzay6nm9kgms2smksrdj1d9kkl5qbrviyz"; system = "verbose"; asd = "verbose"; } ); systems = [ "verbose" ]; lispLibs = [ + (getAttr "atomics" self) (getAttr "bordeaux-threads" self) (getAttr "dissect" self) (getAttr "documentation-utils" self) - (getAttr "local-time" self) (getAttr "piping" self) ]; meta = { @@ -104340,32 +104773,6 @@ lib.makeScope pkgs.newScope (self: { }; } ); - verlet = ( - build-asdf-system { - pname = "verlet"; - version = "20211209-git"; - asds = [ "verlet" ]; - src = ( - createAsd { - url = "http://beta.quicklisp.org/archive/verlet/2021-12-09/verlet-20211209-git.tgz"; - sha256 = "0n6wgjwwbrr13ldwa4y59n2ixn47rr0ad7n3jbb58635z6ahfvd4"; - system = "verlet"; - asd = "verlet"; - } - ); - systems = [ "verlet" ]; - lispLibs = [ - (getAttr "chain" self) - (getAttr "fset" self) - (getAttr "metabang-bind" self) - (getAttr "mgl-pax" self) - (getAttr "rtg-math" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); vernacular = ( build-asdf-system { pname = "vernacular"; @@ -104373,7 +104780,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "vernacular" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vernacular/2024-10-12/vernacular-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/vernacular/2024-10-12/vernacular-20241012-git.tgz"; sha256 = "09jz68lms82vxq672pars6hqapvdl4z8z2v1s9kmzvgxm2khw8pw"; system = "vernacular"; asd = "vernacular"; @@ -104402,7 +104809,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "verrazano" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/verrazano/2012-09-09/verrazano-20120909-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/verrazano/2012-09-09/verrazano-20120909-darcs.tgz"; sha256 = "0d7qv5jwv5p1r64g4rfqb844b5fh71p82b5983gjz0a5p391p270"; system = "verrazano"; asd = "verrazano"; @@ -104432,7 +104839,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "verrazano-runtime" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/verrazano/2012-09-09/verrazano-20120909-darcs.tgz"; + url = "https://beta.quicklisp.org/archive/verrazano/2012-09-09/verrazano-20120909-darcs.tgz"; sha256 = "0d7qv5jwv5p1r64g4rfqb844b5fh71p82b5983gjz0a5p391p270"; system = "verrazano-runtime"; asd = "verrazano-runtime"; @@ -104452,7 +104859,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "vertex" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vertex/2015-06-08/vertex-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/vertex/2015-06-08/vertex-20150608-git.tgz"; sha256 = "0g3ck1kvp6x9874ffizjz3fsd35a3m4hcr2x5gq9fdql680ic4k2"; system = "vertex"; asd = "vertex"; @@ -104476,7 +104883,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "vertex-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vertex/2015-06-08/vertex-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/vertex/2015-06-08/vertex-20150608-git.tgz"; sha256 = "0g3ck1kvp6x9874ffizjz3fsd35a3m4hcr2x5gq9fdql680ic4k2"; system = "vertex-test"; asd = "vertex-test"; @@ -104495,12 +104902,12 @@ lib.makeScope pkgs.newScope (self: { vex = ( build-asdf-system { pname = "vex"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "vex" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz"; - sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn"; + url = "https://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz"; + sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf"; system = "vex"; asd = "vex"; } @@ -104526,7 +104933,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "vgplot" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vgplot/2022-07-07/vgplot-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/vgplot/2022-07-07/vgplot-20220707-git.tgz"; sha256 = "1vc5fd787xa8831wjbmwrpg17f9isi5k8dmb85fsysz47plbvi1y"; system = "vgplot"; asd = "vgplot"; @@ -104550,7 +104957,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "vivid-colors" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww"; system = "vivid-colors"; asd = "vivid-colors"; @@ -104579,7 +104986,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "vivid-colors.content" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww"; system = "vivid-colors.content"; asd = "vivid-colors.content"; @@ -104606,7 +105013,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "vivid-colors.content.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww"; system = "vivid-colors.content.test"; asd = "vivid-colors.content.test"; @@ -104629,7 +105036,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "vivid-colors.dispatch" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww"; system = "vivid-colors.dispatch"; asd = "vivid-colors.dispatch"; @@ -104653,7 +105060,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "vivid-colors.dispatch.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww"; system = "vivid-colors.dispatch.test"; asd = "vivid-colors.dispatch.test"; @@ -104676,7 +105083,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "vivid-colors.queue" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww"; system = "vivid-colors.queue"; asd = "vivid-colors.queue"; @@ -104700,7 +105107,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "vivid-colors.queue.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww"; system = "vivid-colors.queue.test"; asd = "vivid-colors.queue.test"; @@ -104723,7 +105130,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "vivid-colors.shared" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww"; system = "vivid-colors.shared"; asd = "vivid-colors.shared"; @@ -104743,7 +105150,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "vivid-colors.shared.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww"; system = "vivid-colors.shared.test"; asd = "vivid-colors.shared.test"; @@ -104766,7 +105173,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "vivid-colors.stream" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww"; system = "vivid-colors.stream"; asd = "vivid-colors.stream"; @@ -104794,7 +105201,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "vivid-colors.stream.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww"; system = "vivid-colors.stream.test"; asd = "vivid-colors.stream.test"; @@ -104817,7 +105224,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "vivid-colors.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww"; system = "vivid-colors.test"; asd = "vivid-colors.test"; @@ -104840,7 +105247,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "vivid-diff" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vivid-diff/2022-07-07/vivid-diff-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/vivid-diff/2022-07-07/vivid-diff-20220707-git.tgz"; sha256 = "195hqx304x4na56qpiblz30ahp1qj55kan50mkr0xyjhcx75nsdk"; system = "vivid-diff"; asd = "vivid-diff"; @@ -104866,7 +105273,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "vivid-diff.test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vivid-diff/2022-07-07/vivid-diff-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/vivid-diff/2022-07-07/vivid-diff-20220707-git.tgz"; sha256 = "195hqx304x4na56qpiblz30ahp1qj55kan50mkr0xyjhcx75nsdk"; system = "vivid-diff.test"; asd = "vivid-diff.test"; @@ -104890,7 +105297,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "vk" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vk/2023-02-14/vk-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/vk/2023-02-14/vk-20230214-git.tgz"; sha256 = "14986kss2rggdjiql3rr34qnfjwb8w73j0ggn6c3w4y9dny3l31j"; system = "vk"; asd = "vk"; @@ -104910,12 +105317,12 @@ lib.makeScope pkgs.newScope (self: { voipms = ( build-asdf-system { pname = "voipms"; - version = "20231021-git"; + version = "20250622-git"; asds = [ "voipms" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-voipms/2023-10-21/cl-voipms-20231021-git.tgz"; - sha256 = "05jrpd9vc95hqxq3nbwv0qpsfj3winwx2n5a5933919gfanxrslk"; + url = "https://beta.quicklisp.org/archive/cl-voipms/2025-06-22/cl-voipms-20250622-git.tgz"; + sha256 = "0rwb9nww6n6xz219c44aaj321lqhm4bhq49cn6ijywqns51ymnj7"; system = "voipms"; asd = "voipms"; } @@ -104925,6 +105332,7 @@ lib.makeScope pkgs.newScope (self: { (getAttr "cl-date-time-parser" self) (getAttr "erjoalgo-webutil" self) (getAttr "local-time" self) + (getAttr "vom" self) ]; meta = { hydraPlatforms = [ ]; @@ -104938,7 +105346,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "vom" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vom/2024-10-12/vom-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/vom/2024-10-12/vom-20241012-git.tgz"; sha256 = "1rnrr69h3j8phm6z3cfagv2bjh71wbzx9acnas9fn33j3q94gr95"; system = "vom"; asd = "vom"; @@ -104956,7 +105364,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "vom-json" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vom-json/2020-06-10/vom-json-20200610-git.tgz"; + url = "https://beta.quicklisp.org/archive/vom-json/2020-06-10/vom-json-20200610-git.tgz"; sha256 = "14b39kqbjpibh545gh9mb6w5g0kz7fhd5zxfmlf9a0fpdbwhw41c"; system = "vom-json"; asd = "vom-json"; @@ -104976,12 +105384,12 @@ lib.makeScope pkgs.newScope (self: { vorbisfile-ffi = ( build-asdf-system { pname = "vorbisfile-ffi"; - version = "20151218-git"; + version = "20250622-git"; asds = [ "vorbisfile-ffi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/mixalot/2015-12-18/mixalot-20151218-git.tgz"; - sha256 = "0kqx933k8kly4yhzvspizzki556s1lfd4zafap42jcsqqhr4i5q9"; + url = "https://beta.quicklisp.org/archive/mixalot/2025-06-22/mixalot-20250622-git.tgz"; + sha256 = "0w17m06rf8masgslnzva6c9dnbim8g99w2c4m93dhfc0bm2m98wb"; system = "vorbisfile-ffi"; asd = "vorbisfile-ffi"; } @@ -105003,7 +105411,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "vp-trees" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/vp-trees/2023-02-14/vp-trees-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/vp-trees/2023-02-14/vp-trees-20230214-git.tgz"; sha256 = "0fk41c97p5ck5g9nsvq6h9hzxz7yssyqz3v4f4qiavdnw6a9va1m"; system = "vp-trees"; asd = "vp-trees"; @@ -105026,7 +105434,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "wallstreetflets" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/wallstreetflets/2021-12-09/wallstreetflets-20211209-git.tgz"; + url = "https://beta.quicklisp.org/archive/wallstreetflets/2021-12-09/wallstreetflets-20211209-git.tgz"; sha256 = "0d9anws4gk16an1kl4kads6lhm8a4mpiwxg74i3235d5874gbdj5"; system = "wallstreetflets"; asd = "wallstreetflets"; @@ -105050,7 +105458,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "wasm-encoder" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/wasm-encoder/2021-06-30/wasm-encoder-20210630-git.tgz"; + url = "https://beta.quicklisp.org/archive/wasm-encoder/2021-06-30/wasm-encoder-20210630-git.tgz"; sha256 = "1h094d8www9ydg96fjj17pi0lb63ikgyp5237cl6n3rmg4jpy9w6"; system = "wasm-encoder"; asd = "wasm-encoder"; @@ -105078,7 +105486,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "water" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/water/2019-01-07/water-20190107-git.tgz"; + url = "https://beta.quicklisp.org/archive/water/2019-01-07/water-20190107-git.tgz"; sha256 = "0w9b6mh10rfv7rg1zq28pivad6435i9h839km6nlbhq9xmx0g27s"; system = "water"; asd = "water"; @@ -105094,11 +105502,11 @@ lib.makeScope pkgs.newScope (self: { wayflan = ( build-asdf-system { pname = "wayflan"; - version = "20230214-git"; + version = "20250622-git"; asds = [ "wayflan" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/wayflan/2023-02-14/wayflan-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/wayflan/2025-06-22/wayflan-20250622-git.tgz"; sha256 = "0y6hzskp1vgaigzj5b3i695sc6dn5mk7nlxs21nh5ybzmf4chhyy"; system = "wayflan"; asd = "wayflan"; @@ -105117,11 +105525,11 @@ lib.makeScope pkgs.newScope (self: { wayflan-client = ( build-asdf-system { pname = "wayflan-client"; - version = "20230214-git"; + version = "20250622-git"; asds = [ "wayflan-client" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/wayflan/2023-02-14/wayflan-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/wayflan/2025-06-22/wayflan-20250622-git.tgz"; sha256 = "0y6hzskp1vgaigzj5b3i695sc6dn5mk7nlxs21nh5ybzmf4chhyy"; system = "wayflan-client"; asd = "wayflan-client"; @@ -105148,7 +105556,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "webactions" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/portableaserve/2019-08-13/portableaserve-20190813-git.tgz"; + url = "https://beta.quicklisp.org/archive/portableaserve/2019-08-13/portableaserve-20190813-git.tgz"; sha256 = "0ak6mqp84sjr0a7h5svr16vra4bf4fcx6wpir0n88dc1vjwy5xqa"; system = "webactions"; asd = "webactions"; @@ -105172,7 +105580,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "webapi" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/webapi/2023-06-18/webapi-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/webapi/2023-06-18/webapi-20230618-git.tgz"; sha256 = "1irp18a0rq61xfr3944ahy2spj0095l15xf7j0245jd0qw7gmg03"; system = "webapi"; asd = "webapi"; @@ -105199,7 +105607,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "weblocks-clsql" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/weblocks-stores/2021-10-20/weblocks-stores-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/weblocks-stores/2021-10-20/weblocks-stores-20211020-git.tgz"; sha256 = "1k44dad18fkp80xjm04fiy6bciirs71ljvm8a2rb33xndrbxiiya"; system = "weblocks-clsql"; asd = "weblocks-clsql"; @@ -105226,7 +105634,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "weblocks-memory" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/weblocks-stores/2021-10-20/weblocks-stores-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/weblocks-stores/2021-10-20/weblocks-stores-20211020-git.tgz"; sha256 = "1k44dad18fkp80xjm04fiy6bciirs71ljvm8a2rb33xndrbxiiya"; system = "weblocks-memory"; asd = "weblocks-memory"; @@ -105250,7 +105658,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "weblocks-montezuma" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/weblocks-stores/2021-10-20/weblocks-stores-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/weblocks-stores/2021-10-20/weblocks-stores-20211020-git.tgz"; sha256 = "1k44dad18fkp80xjm04fiy6bciirs71ljvm8a2rb33xndrbxiiya"; system = "weblocks-montezuma"; asd = "weblocks-montezuma"; @@ -105273,7 +105681,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "weblocks-perec" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/weblocks-stores/2021-10-20/weblocks-stores-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/weblocks-stores/2021-10-20/weblocks-stores-20211020-git.tgz"; sha256 = "1k44dad18fkp80xjm04fiy6bciirs71ljvm8a2rb33xndrbxiiya"; system = "weblocks-perec"; asd = "weblocks-perec"; @@ -105296,7 +105704,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "weblocks-prevalence" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/weblocks-stores/2021-10-20/weblocks-stores-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/weblocks-stores/2021-10-20/weblocks-stores-20211020-git.tgz"; sha256 = "1k44dad18fkp80xjm04fiy6bciirs71ljvm8a2rb33xndrbxiiya"; system = "weblocks-prevalence"; asd = "weblocks-prevalence"; @@ -105323,7 +105731,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "weblocks-scripts" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/weblocks/2021-10-20/weblocks-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/weblocks/2021-10-20/weblocks-20211020-git.tgz"; sha256 = "1hilpzm1p3hrp2hxghjr9y8sy5a9bgk96n8kc8bphvn7dvlbm78j"; system = "weblocks-scripts"; asd = "weblocks-scripts"; @@ -105346,7 +105754,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "weblocks-stores" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/weblocks-stores/2021-10-20/weblocks-stores-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/weblocks-stores/2021-10-20/weblocks-stores-20211020-git.tgz"; sha256 = "1k44dad18fkp80xjm04fiy6bciirs71ljvm8a2rb33xndrbxiiya"; system = "weblocks-stores"; asd = "weblocks-stores"; @@ -105370,7 +105778,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "weblocks-util" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/weblocks/2021-10-20/weblocks-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/weblocks/2021-10-20/weblocks-20211020-git.tgz"; sha256 = "1hilpzm1p3hrp2hxghjr9y8sy5a9bgk96n8kc8bphvn7dvlbm78j"; system = "weblocks-util"; asd = "weblocks-util"; @@ -105408,12 +105816,12 @@ lib.makeScope pkgs.newScope (self: { websocket-driver = ( build-asdf-system { pname = "websocket-driver"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "websocket-driver" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/websocket-driver/2024-10-12/websocket-driver-20241012-git.tgz"; - sha256 = "1lj6xarr62199ladkml7qpgi86w94j4djrp54v9ch0zakni3rhj2"; + url = "https://beta.quicklisp.org/archive/websocket-driver/2025-06-22/websocket-driver-20250622-git.tgz"; + sha256 = "16dgs47215xb2i2mw3w3wn3spsf1hac1dyla9lq87k155vy7zlry"; system = "websocket-driver"; asd = "websocket-driver"; } @@ -105431,12 +105839,12 @@ lib.makeScope pkgs.newScope (self: { websocket-driver-base = ( build-asdf-system { pname = "websocket-driver-base"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "websocket-driver-base" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/websocket-driver/2024-10-12/websocket-driver-20241012-git.tgz"; - sha256 = "1lj6xarr62199ladkml7qpgi86w94j4djrp54v9ch0zakni3rhj2"; + url = "https://beta.quicklisp.org/archive/websocket-driver/2025-06-22/websocket-driver-20250622-git.tgz"; + sha256 = "16dgs47215xb2i2mw3w3wn3spsf1hac1dyla9lq87k155vy7zlry"; system = "websocket-driver-base"; asd = "websocket-driver-base"; } @@ -105459,12 +105867,12 @@ lib.makeScope pkgs.newScope (self: { websocket-driver-client = ( build-asdf-system { pname = "websocket-driver-client"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "websocket-driver-client" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/websocket-driver/2024-10-12/websocket-driver-20241012-git.tgz"; - sha256 = "1lj6xarr62199ladkml7qpgi86w94j4djrp54v9ch0zakni3rhj2"; + url = "https://beta.quicklisp.org/archive/websocket-driver/2025-06-22/websocket-driver-20250622-git.tgz"; + sha256 = "16dgs47215xb2i2mw3w3wn3spsf1hac1dyla9lq87k155vy7zlry"; system = "websocket-driver-client"; asd = "websocket-driver-client"; } @@ -105489,12 +105897,12 @@ lib.makeScope pkgs.newScope (self: { websocket-driver-server = ( build-asdf-system { pname = "websocket-driver-server"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "websocket-driver-server" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/websocket-driver/2024-10-12/websocket-driver-20241012-git.tgz"; - sha256 = "1lj6xarr62199ladkml7qpgi86w94j4djrp54v9ch0zakni3rhj2"; + url = "https://beta.quicklisp.org/archive/websocket-driver/2025-06-22/websocket-driver-20250622-git.tgz"; + sha256 = "16dgs47215xb2i2mw3w3wn3spsf1hac1dyla9lq87k155vy7zlry"; system = "websocket-driver-server"; asd = "websocket-driver-server"; } @@ -105519,7 +105927,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "weft" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/weft/2018-02-28/weft-20180228-git.tgz"; + url = "https://beta.quicklisp.org/archive/weft/2018-02-28/weft-20180228-git.tgz"; sha256 = "1ia38xcpp9g4v6sij99lyl9b8p59ysg2cj9k92nb683f8pzv9pl3"; system = "weft"; asd = "weft"; @@ -105544,7 +105952,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "westbrook" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/westbrook/2018-01-31/westbrook-20180131-git.tgz"; + url = "https://beta.quicklisp.org/archive/westbrook/2018-01-31/westbrook-20180131-git.tgz"; sha256 = "08qs5lpg34d1mn6warrrq1wimyqqrjb8jih62g1pbysgni4ihm2v"; system = "westbrook"; asd = "westbrook"; @@ -105564,7 +105972,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "westbrook-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/westbrook/2018-01-31/westbrook-20180131-git.tgz"; + url = "https://beta.quicklisp.org/archive/westbrook/2018-01-31/westbrook-20180131-git.tgz"; sha256 = "08qs5lpg34d1mn6warrrq1wimyqqrjb8jih62g1pbysgni4ihm2v"; system = "westbrook-tests"; asd = "westbrook-tests"; @@ -105587,7 +105995,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "what3words" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/what3words/2016-12-04/what3words-20161204-git.tgz"; + url = "https://beta.quicklisp.org/archive/what3words/2016-12-04/what3words-20161204-git.tgz"; sha256 = "0nlrpi8phrf2mpgbw9bj9w4vksqb0baj542bhnq39sjalc8bj73r"; system = "what3words"; asd = "what3words"; @@ -105607,12 +106015,12 @@ lib.makeScope pkgs.newScope (self: { whereiseveryone_dot_command-line-args = ( build-asdf-system { pname = "whereiseveryone.command-line-args"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "whereiseveryone.command-line-args" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/whereiseveryone.command-line-args/2024-10-12/whereiseveryone.command-line-args-20241012-git.tgz"; - sha256 = "140xnz2v0v3hfg3dp2fhidw8ns6lxd3a5knm07wqdp48ksg119wy"; + url = "https://beta.quicklisp.org/archive/command-line-args/2025-06-22/command-line-args-20250622-git.tgz"; + sha256 = "14x68ww8323vkvql3ryn9wkxf4fbj1brdn4f6mynr7wqygink2bd"; system = "whereiseveryone.command-line-args"; asd = "whereiseveryone.command-line-args"; } @@ -105637,7 +106045,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "which" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/which/2016-04-21/which-20160421-git.tgz"; + url = "https://beta.quicklisp.org/archive/which/2016-04-21/which-20160421-git.tgz"; sha256 = "127pm9h4rm4w9aadw5yvamnfzhk2rr69kchx10rf9k7sk7izqqfk"; system = "which"; asd = "which"; @@ -105660,7 +106068,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "which-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/which/2016-04-21/which-20160421-git.tgz"; + url = "https://beta.quicklisp.org/archive/which/2016-04-21/which-20160421-git.tgz"; sha256 = "127pm9h4rm4w9aadw5yvamnfzhk2rr69kchx10rf9k7sk7izqqfk"; system = "which-test"; asd = "which-test"; @@ -105683,7 +106091,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "whirlog" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/whirlog/2021-10-20/whirlog-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/whirlog/2021-10-20/whirlog-20211020-git.tgz"; sha256 = "0sf1kc8ln1gszzrz3qh3bx11k42lpccrv6kp2ihlrg3d6lsa6i26"; system = "whirlog"; asd = "whirlog"; @@ -105703,7 +106111,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "whofields" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/whofields/2021-10-20/whofields-20211020-git.tgz"; + url = "https://beta.quicklisp.org/archive/whofields/2021-10-20/whofields-20211020-git.tgz"; sha256 = "1scpzzfdw5g7qsayhznjyzns8lxx4fvv2jxd0vr9vnxad3vm977x"; system = "whofields"; asd = "whofields"; @@ -105726,7 +106134,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "wilbur" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/de.setf.wilbur/2018-12-10/de.setf.wilbur-20181210-git.tgz"; + url = "https://beta.quicklisp.org/archive/de.setf.wilbur/2018-12-10/de.setf.wilbur-20181210-git.tgz"; sha256 = "0w4qssyarim4v64vv7jmspmyba7xghx9bkalyyhvccf6zrf7b2v7"; system = "wilbur"; asd = "wilbur"; @@ -105746,7 +106154,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "wild-package-inferred-system" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/wild-package-inferred-system/2021-05-31/wild-package-inferred-system-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/wild-package-inferred-system/2021-05-31/wild-package-inferred-system-20210531-git.tgz"; sha256 = "0sp3j3i83aqyq9bl3djs490nilryi9sh1wjbcqd9z94d9wfbfz80"; system = "wild-package-inferred-system"; asd = "wild-package-inferred-system"; @@ -105764,7 +106172,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "window" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; + url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; system = "window"; asd = "window"; @@ -105790,7 +106198,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "winhttp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/winhttp/2024-10-12/winhttp-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/winhttp/2024-10-12/winhttp-20241012-git.tgz"; sha256 = "1g4prr0x2cyc58wcpa3kfiwcs9f536bzfmsnlwnh3yn9aqndg67c"; system = "winhttp"; asd = "winhttp"; @@ -105810,7 +106218,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "winlock" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/winlock/2019-11-30/winlock-20191130-git.tgz"; + url = "https://beta.quicklisp.org/archive/winlock/2019-11-30/winlock-20191130-git.tgz"; sha256 = "0sgjq1cjbmshnh2zwyqws7rkr93zkjl0rrzyf04542gb1grj0vd8"; system = "winlock"; asd = "winlock"; @@ -105830,12 +106238,12 @@ lib.makeScope pkgs.newScope (self: { wire-world = ( build-asdf-system { pname = "wire-world"; - version = "master-fe503896-git"; + version = "master-5a621564-git"; asds = [ "wire-world" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz"; - sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10"; + url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; + sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; system = "wire-world"; asd = "wire-world"; } @@ -105854,7 +106262,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "with-branching" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/with-branching/2024-10-12/with-branching-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/with-branching/2024-10-12/with-branching-20241012-git.tgz"; sha256 = "0rhmlg1nbbhaa5jflhnydsqs7aqwg8d7ijxxcqa8lkcq49wvm647"; system = "with-branching"; asd = "with-branching"; @@ -105877,7 +106285,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "with-c-syntax" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/with-c-syntax/2022-11-06/with-c-syntax-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/with-c-syntax/2022-11-06/with-c-syntax-20221106-git.tgz"; sha256 = "12gdwdyxyl9xm8n04qvmvyc1s06dkckb87i6hdysal5lsf1gwc41"; system = "with-c-syntax"; asd = "with-c-syntax"; @@ -105906,7 +106314,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "with-c-syntax-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/with-c-syntax/2022-11-06/with-c-syntax-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/with-c-syntax/2022-11-06/with-c-syntax-20221106-git.tgz"; sha256 = "12gdwdyxyl9xm8n04qvmvyc1s06dkckb87i6hdysal5lsf1gwc41"; system = "with-c-syntax-test"; asd = "with-c-syntax-test"; @@ -105931,7 +106339,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "with-cached-reader-conditionals" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/with-cached-reader-conditionals/2017-06-30/with-cached-reader-conditionals-20170630-git.tgz"; + url = "https://beta.quicklisp.org/archive/with-cached-reader-conditionals/2017-06-30/with-cached-reader-conditionals-20170630-git.tgz"; sha256 = "0n7a089d0wb13l1nsdh3xlgwxwlqynkbjl8fg2x56h52a5i9gkv4"; system = "with-cached-reader-conditionals"; asd = "with-cached-reader-conditionals"; @@ -105947,12 +106355,12 @@ lib.makeScope pkgs.newScope (self: { with-contexts = ( build-asdf-system { pname = "with-contexts"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "with-contexts" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/with-contexts/2024-10-12/with-contexts-20241012-git.tgz"; - sha256 = "1biz33wxg312zsmpyjqfcmq4vnixxz3g4hp9krc61977d5n4fxwj"; + url = "https://beta.quicklisp.org/archive/with-contexts/2025-06-22/with-contexts-20250622-git.tgz"; + sha256 = "16ak29iy4akxfz7la4mb3swfmyxqj0pf08j5wrpcp7djxb3y6wi9"; system = "with-contexts"; asd = "with-contexts"; } @@ -105971,7 +106379,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "with-output-to-stream" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/with-output-to-stream/2019-10-07/with-output-to-stream_1.0.tgz"; + url = "https://beta.quicklisp.org/archive/with-output-to-stream/2019-10-07/with-output-to-stream_1.0.tgz"; sha256 = "0pv9kccjbxkgcv7wbcfpnzas9pq0n2rs2aq9kdnqkx55k12366sm"; system = "with-output-to-stream"; asd = "with-output-to-stream"; @@ -105991,7 +106399,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "with-output-to-stream_tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/with-output-to-stream/2019-10-07/with-output-to-stream_1.0.tgz"; + url = "https://beta.quicklisp.org/archive/with-output-to-stream/2019-10-07/with-output-to-stream_1.0.tgz"; sha256 = "0pv9kccjbxkgcv7wbcfpnzas9pq0n2rs2aq9kdnqkx55k12366sm"; system = "with-output-to-stream_tests"; asd = "with-output-to-stream_tests"; @@ -106014,7 +106422,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "with-setf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/with-setf/2018-02-28/with-setf-release-quicklisp-df3eed9d-git.tgz"; + url = "https://beta.quicklisp.org/archive/with-setf/2018-02-28/with-setf-release-quicklisp-df3eed9d-git.tgz"; sha256 = "090v39kdxk4py3axjrjjac2pn1p0109q14hvl818pik479xr4inz"; system = "with-setf"; asd = "with-setf"; @@ -106034,7 +106442,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "with-shadowed-bindings" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/with-shadowed-bindings/2019-01-07/with-shadowed-bindings-1.0.tgz"; + url = "https://beta.quicklisp.org/archive/with-shadowed-bindings/2019-01-07/with-shadowed-bindings-1.0.tgz"; sha256 = "0kxy86a21v4fm4xwd44c6kpdadgkcj8iv6a68xavhirhjhngcwy5"; system = "with-shadowed-bindings"; asd = "with-shadowed-bindings"; @@ -106054,7 +106462,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "with-shadowed-bindings_tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/with-shadowed-bindings/2019-01-07/with-shadowed-bindings-1.0.tgz"; + url = "https://beta.quicklisp.org/archive/with-shadowed-bindings/2019-01-07/with-shadowed-bindings-1.0.tgz"; sha256 = "0kxy86a21v4fm4xwd44c6kpdadgkcj8iv6a68xavhirhjhngcwy5"; system = "with-shadowed-bindings_tests"; asd = "with-shadowed-bindings_tests"; @@ -106077,7 +106485,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "with-user-abort" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/with-user-abort/2023-02-14/with-user-abort-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/with-user-abort/2023-02-14/with-user-abort-20230214-git.tgz"; sha256 = "0yidlm92dk8kvz137zlm2f0d198kmgqpdswkinr2x4snbgkhd98j"; system = "with-user-abort"; asd = "with-user-abort"; @@ -106097,7 +106505,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "woo" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/woo/2024-10-12/woo-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/woo/2024-10-12/woo-20241012-git.tgz"; sha256 = "0nhxlb1qhkl20vknm44gx0cq5cks33rcljczfhgbnmpkzrdpdrrl"; system = "woo"; asd = "woo"; @@ -106132,7 +106540,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "woo-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/woo/2024-10-12/woo-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/woo/2024-10-12/woo-20241012-git.tgz"; sha256 = "0nhxlb1qhkl20vknm44gx0cq5cks33rcljczfhgbnmpkzrdpdrrl"; system = "woo-test"; asd = "woo-test"; @@ -106156,7 +106564,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "wookie" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/wookie/2023-02-14/wookie-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/wookie/2023-02-14/wookie-20230214-git.tgz"; sha256 = "1i5l9isahww9zwizj6dmdcplck8wr8gxm31i43i8hf3rfxmvfjwn"; system = "wookie"; asd = "wookie"; @@ -106184,12 +106592,12 @@ lib.makeScope pkgs.newScope (self: { wordnet = ( build-asdf-system { pname = "wordnet"; - version = "20220220-git"; + version = "20250622-git"; asds = [ "wordnet" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/wordnet/2022-02-20/wordnet-20220220-git.tgz"; - sha256 = "07p60k295fsfcp0gmkqhrxd68hb38aqva8f4k8xk8bqqxxf42vkq"; + url = "https://beta.quicklisp.org/archive/wordnet/2025-06-22/wordnet-20250622-git.tgz"; + sha256 = "1gdly27dv1x60p504r4xn1aqd8s544mvw55wfk4dz25m93hwv8pj"; system = "wordnet"; asd = "wordnet"; } @@ -106208,7 +106616,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "workout-timer" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/workout-timer/2023-02-14/workout-timer-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/workout-timer/2023-02-14/workout-timer-20230214-git.tgz"; sha256 = "1f8qj6la93k95xqkliv59r6dkyhyhzqp2zgk0s893a3mrar0gfrx"; system = "workout-timer"; asd = "workout-timer"; @@ -106228,6 +106636,30 @@ lib.makeScope pkgs.newScope (self: { }; } ); + wouldwork = ( + build-asdf-system { + pname = "wouldwork"; + version = "20250622-git"; + asds = [ "wouldwork" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/wouldwork/2025-06-22/wouldwork-20250622-git.tgz"; + sha256 = "1g47djrdh2qipihvxph5df4z4l10ziwgd69bvjrb3a58r7nl4sj0"; + system = "wouldwork"; + asd = "wouldwork"; + } + ); + systems = [ "wouldwork" ]; + lispLibs = [ + (getAttr "alexandria" self) + (getAttr "iterate" self) + (getAttr "lparallel" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); wu-decimal = ( build-asdf-system { pname = "wu-decimal"; @@ -106235,7 +106667,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "wu-decimal" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/wu-decimal/2013-01-28/wu-decimal-20130128-git.tgz"; + url = "https://beta.quicklisp.org/archive/wu-decimal/2013-01-28/wu-decimal-20130128-git.tgz"; sha256 = "1p7na4hic7297amwm4idfwkyx664ny8cdssncyra37pmv4wzp8dm"; system = "wu-decimal"; asd = "wu-decimal"; @@ -106255,7 +106687,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "wu-sugar" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/wu-sugar/2016-08-25/wu-sugar-20160825-git.tgz"; + url = "https://beta.quicklisp.org/archive/wu-sugar/2016-08-25/wu-sugar-20160825-git.tgz"; sha256 = "0ypn5195krfd1rva5myla8j7n2ilfs5gxh81flx7v0mr4r70fayl"; system = "wu-sugar"; asd = "wu-sugar"; @@ -106275,7 +106707,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "wuwei" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/wuwei/2022-11-06/wuwei-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/wuwei/2022-11-06/wuwei-20221106-git.tgz"; sha256 = "1k5yhxdqcx250kd56qgbch5z0hvjpjwch38c3949nf790pmrhl8f"; system = "wuwei"; asd = "wuwei"; @@ -106301,7 +106733,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "wuwei-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/wuwei/2022-11-06/wuwei-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/wuwei/2022-11-06/wuwei-20221106-git.tgz"; sha256 = "1k5yhxdqcx250kd56qgbch5z0hvjpjwch38c3949nf790pmrhl8f"; system = "wuwei-examples"; asd = "wuwei"; @@ -106324,7 +106756,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "x.let-star" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/x.let-star/2020-03-25/x.let-star-20200325-git.tgz"; + url = "https://beta.quicklisp.org/archive/x.let-star/2020-03-25/x.let-star-20200325-git.tgz"; sha256 = "0qk0rpqzb7vaivggsqch06nmdjzp6b31a88w40y3864clajpcrnr"; system = "x.let-star"; asd = "x.let-star"; @@ -106344,7 +106776,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "xarray" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/xarray/2014-01-13/xarray-20140113-git.tgz"; + url = "https://beta.quicklisp.org/archive/xarray/2014-01-13/xarray-20140113-git.tgz"; sha256 = "031h1bvy9s6qas2160dgf7gc0y6inrhpzp8j3wrb6fjxkb0524yl"; system = "xarray"; asd = "xarray"; @@ -106369,7 +106801,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "xarray-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/xarray/2014-01-13/xarray-20140113-git.tgz"; + url = "https://beta.quicklisp.org/archive/xarray/2014-01-13/xarray-20140113-git.tgz"; sha256 = "031h1bvy9s6qas2160dgf7gc0y6inrhpzp8j3wrb6fjxkb0524yl"; system = "xarray-test"; asd = "xarray-test"; @@ -106392,7 +106824,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "xcat" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/xcat/2020-09-25/xcat-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/xcat/2020-09-25/xcat-20200925-git.tgz"; sha256 = "1v8mcz8bidcbfl587b5lm07l91xan6z1y3zikjkyzagiigd4byvi"; system = "xcat"; asd = "xcat"; @@ -106420,7 +106852,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "xecto" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/xecto/2015-12-18/xecto-20151218-git.tgz"; + url = "https://beta.quicklisp.org/archive/xecto/2015-12-18/xecto-20151218-git.tgz"; sha256 = "1m81cl02k28v9sgscl8qhig735x5qybhw69szs6bkkqml7hbl12q"; system = "xecto"; asd = "xecto"; @@ -106440,7 +106872,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "xembed" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clx-xembed/2019-11-30/clx-xembed-20191130-git.tgz"; + url = "https://beta.quicklisp.org/archive/clx-xembed/2019-11-30/clx-xembed-20191130-git.tgz"; sha256 = "1abx4v36ycmfjdwpjk4hh8058ya8whwia7ds9vd96q2qsrs57f12"; system = "xembed"; asd = "xembed"; @@ -106458,7 +106890,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "xfactory" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-libxml2/2013-06-15/cl-libxml2-20130615-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-libxml2/2013-06-15/cl-libxml2-20130615-git.tgz"; sha256 = "09049c13cfp5sc6x9lrw762jd7a9qkfq5jgngqgrzn4kn9qscarw"; system = "xfactory"; asd = "xfactory"; @@ -106478,7 +106910,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "xfactory-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-libxml2/2013-06-15/cl-libxml2-20130615-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-libxml2/2013-06-15/cl-libxml2-20130615-git.tgz"; sha256 = "09049c13cfp5sc6x9lrw762jd7a9qkfq5jgngqgrzn4kn9qscarw"; system = "xfactory-test"; asd = "xfactory"; @@ -106497,12 +106929,12 @@ lib.makeScope pkgs.newScope (self: { xhtmlambda = ( build-asdf-system { pname = "xhtmlambda"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "xhtmlambda" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/xhtmlambda/2024-10-12/xhtmlambda-20241012-git.tgz"; - sha256 = "1xqwps5lr66lhqiczvccxrpy8kff15fx6qr9nh1i65wi4p68i1bb"; + url = "https://beta.quicklisp.org/archive/xhtmlambda/2025-06-22/xhtmlambda-20250622-git.tgz"; + sha256 = "1s30s7panpxi59n0rzqls6pq34gx362s2f4xawswc242c922h3pc"; system = "xhtmlambda"; asd = "xhtmlambda"; } @@ -106521,7 +106953,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "xhtmlgen" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/xhtmlgen/2017-01-24/xhtmlgen-20170124-git.tgz"; + url = "https://beta.quicklisp.org/archive/xhtmlgen/2017-01-24/xhtmlgen-20170124-git.tgz"; sha256 = "0br4pqhl7y7rd95l9xx2p96gds3dh4pgk9v038wbshl2dnhjv82k"; system = "xhtmlgen"; asd = "xhtmlgen"; @@ -106541,7 +106973,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "xhtmlgen-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/xhtmlgen/2017-01-24/xhtmlgen-20170124-git.tgz"; + url = "https://beta.quicklisp.org/archive/xhtmlgen/2017-01-24/xhtmlgen-20170124-git.tgz"; sha256 = "0br4pqhl7y7rd95l9xx2p96gds3dh4pgk9v038wbshl2dnhjv82k"; system = "xhtmlgen-test"; asd = "xhtmlgen"; @@ -106564,7 +106996,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "xkeyboard" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clx-xkeyboard/2012-08-11/clx-xkeyboard-20120811-git.tgz"; + url = "https://beta.quicklisp.org/archive/clx-xkeyboard/2012-08-11/clx-xkeyboard-20120811-git.tgz"; sha256 = "1nxky9wsmm7nmwz372jgb4iy0ywlm22jw0vl8yi0k9slsfklvcqi"; system = "xkeyboard"; asd = "xkeyboard"; @@ -106582,7 +107014,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "xkeyboard-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/clx-xkeyboard/2012-08-11/clx-xkeyboard-20120811-git.tgz"; + url = "https://beta.quicklisp.org/archive/clx-xkeyboard/2012-08-11/clx-xkeyboard-20120811-git.tgz"; sha256 = "1nxky9wsmm7nmwz372jgb4iy0ywlm22jw0vl8yi0k9slsfklvcqi"; system = "xkeyboard-test"; asd = "xkeyboard"; @@ -106602,7 +107034,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "xlsx" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/xlsx/2018-07-11/xlsx-20180711-git.tgz"; + url = "https://beta.quicklisp.org/archive/xlsx/2018-07-11/xlsx-20180711-git.tgz"; sha256 = "15vw5zl13jg9b1rla7w2wv6ss93mijrnn9fzsh0fakgvfikqq1n6"; system = "xlsx"; asd = "xlsx"; @@ -106626,7 +107058,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "xlunit" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/xlunit/2015-09-23/xlunit-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/xlunit/2015-09-23/xlunit-20150923-git.tgz"; sha256 = "0argfmp9nghs4sihyj3f8ch9qfib2b7ll07v5m9ziajgzsfl5xw3"; system = "xlunit"; asd = "xlunit"; @@ -106646,7 +107078,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "xlunit-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/xlunit/2015-09-23/xlunit-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/xlunit/2015-09-23/xlunit-20150923-git.tgz"; sha256 = "0argfmp9nghs4sihyj3f8ch9qfib2b7ll07v5m9ziajgzsfl5xw3"; system = "xlunit-tests"; asd = "xlunit"; @@ -106666,7 +107098,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "xml-emitter" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/xml-emitter/2024-10-12/xml-emitter-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/xml-emitter/2024-10-12/xml-emitter-20241012-git.tgz"; sha256 = "1q7iygd1v857a3c72kv4zxm9nhx94kkam4p8z5v10q2r2cwfps1w"; system = "xml-emitter"; asd = "xml-emitter"; @@ -106686,7 +107118,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "xml-mop" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/xml-mop/2011-04-18/xml-mop-20110418-git.tgz"; + url = "https://beta.quicklisp.org/archive/xml-mop/2011-04-18/xml-mop-20110418-git.tgz"; sha256 = "1vfa3h5dghnpc7qbqqm80mm1ri6x7x5r528kvkwzngghrbxyhgjr"; system = "xml-mop"; asd = "xml-mop"; @@ -106709,7 +107141,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "xml-render" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-typesetting/2021-05-31/cl-typesetting-20210531-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-typesetting/2021-05-31/cl-typesetting-20210531-git.tgz"; sha256 = "0fcs5mq0gxfczbrg7ay8r4bf5r4g6blvpdbjkhcl8dapcikyn35h"; system = "xml-render"; asd = "xml-render"; @@ -106732,7 +107164,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "xml.location" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/xml.location/2020-03-25/xml.location-20200325-git.tgz"; + url = "https://beta.quicklisp.org/archive/xml.location/2020-03-25/xml.location-20200325-git.tgz"; sha256 = "0ajl03k7krns6b0z3ykmngq3i77yd2j85z3h76drlc9whxvm2kii"; system = "xml.location"; asd = "xml.location"; @@ -106759,7 +107191,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "xml.location-and-local-time" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/xml.location/2020-03-25/xml.location-20200325-git.tgz"; + url = "https://beta.quicklisp.org/archive/xml.location/2020-03-25/xml.location-20200325-git.tgz"; sha256 = "0ajl03k7krns6b0z3ykmngq3i77yd2j85z3h76drlc9whxvm2kii"; system = "xml.location-and-local-time"; asd = "xml.location-and-local-time"; @@ -106782,7 +107214,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "xmls" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/xmls/2023-10-21/xmls-release-310ba849-git.tgz"; + url = "https://beta.quicklisp.org/archive/xmls/2023-10-21/xmls-release-310ba849-git.tgz"; sha256 = "0s1acd2r77v6x9f2kmd15njkmvvx3ivivlk509ndgmdhnn2jd776"; system = "xmls"; asd = "xmls"; @@ -106800,7 +107232,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "xoverlay" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-libxml2/2013-06-15/cl-libxml2-20130615-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-libxml2/2013-06-15/cl-libxml2-20130615-git.tgz"; sha256 = "09049c13cfp5sc6x9lrw762jd7a9qkfq5jgngqgrzn4kn9qscarw"; system = "xoverlay"; asd = "xoverlay"; @@ -106820,7 +107252,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "xpath" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/plexippus-xpath/2019-05-21/plexippus-xpath-20190521-git.tgz"; + url = "https://beta.quicklisp.org/archive/plexippus-xpath/2019-05-21/plexippus-xpath-20190521-git.tgz"; sha256 = "1fb03fgnzrvh22lw1jdg04pmyja5fib5n42rzwp5mhr829yvxkvp"; system = "xpath"; asd = "xpath"; @@ -106843,7 +107275,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "xptest" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/xptest/2015-09-23/xptest-20150923-git.tgz"; + url = "https://beta.quicklisp.org/archive/xptest/2015-09-23/xptest-20150923-git.tgz"; sha256 = "02jwncq5d60l77gf87ahabzg6k6c878gfc4x1mf6ld97rj5lzp3b"; system = "xptest"; asd = "xptest"; @@ -106863,7 +107295,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "xsubseq" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/xsubseq/2017-08-30/xsubseq-20170830-git.tgz"; + url = "https://beta.quicklisp.org/archive/xsubseq/2017-08-30/xsubseq-20170830-git.tgz"; sha256 = "1xz79q0p2mclf3sqjiwf6izdpb6xrsr350bv4mlmdlm6rg5r99px"; system = "xsubseq"; asd = "xsubseq"; @@ -106881,7 +107313,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "xsubseq-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/xsubseq/2017-08-30/xsubseq-20170830-git.tgz"; + url = "https://beta.quicklisp.org/archive/xsubseq/2017-08-30/xsubseq-20170830-git.tgz"; sha256 = "1xz79q0p2mclf3sqjiwf6izdpb6xrsr350bv4mlmdlm6rg5r99px"; system = "xsubseq-test"; asd = "xsubseq-test"; @@ -106905,7 +107337,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "xuriella" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/xuriella/2012-03-05/xuriella-20120305-git.tgz"; + url = "https://beta.quicklisp.org/archive/xuriella/2012-03-05/xuriella-20120305-git.tgz"; sha256 = "0wz98bfvr7h7g0r7dy815brq5sz3x40281hp0qk801q17aa4qhqh"; system = "xuriella"; asd = "xuriella"; @@ -106931,7 +107363,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "yacc" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-yacc/2023-02-14/cl-yacc-20230214-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-yacc/2023-02-14/cl-yacc-20230214-git.tgz"; sha256 = "1f974ysi7mlrksnqg63iwwxgbypkng4n240q29imkrz6m5pwdig7"; system = "yacc"; asd = "yacc"; @@ -106949,7 +107381,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "yaclml" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/yaclml/2018-01-31/yaclml-20180131-git.tgz"; + url = "https://beta.quicklisp.org/archive/yaclml/2018-01-31/yaclml-20180131-git.tgz"; sha256 = "0wq6clk4qwbdaf0hcfjz4vg27nyf6ng0rrip1ay4rlkb03hdnssq"; system = "yaclml"; asd = "yaclml"; @@ -106968,12 +107400,12 @@ lib.makeScope pkgs.newScope (self: { yadd = ( build-asdf-system { pname = "yadd"; - version = "master-fe503896-git"; + version = "master-5a621564-git"; asds = [ "yadd" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz"; - sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10"; + url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; + sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; system = "yadd"; asd = "yadd"; } @@ -106995,7 +107427,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "yah" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/yah/2023-10-21/yah-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/yah/2023-10-21/yah-20231021-git.tgz"; sha256 = "1sklx9ak2rh9h19805i9wbym889pwd1qh3d4c4fsk9cbj2i9yxx5"; system = "yah"; asd = "yah"; @@ -107011,12 +107443,12 @@ lib.makeScope pkgs.newScope (self: { yason = ( build-asdf-system { pname = "yason"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "yason" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/yason/2024-10-12/yason-20241012-git.tgz"; - sha256 = "00hqii9n6ay5cq1ahbqpnw3l3v0mmz5s1f9kn6l35g8zxj1nlpa7"; + url = "https://beta.quicklisp.org/archive/yason/2025-06-22/yason-20250622-git.tgz"; + sha256 = "1bbkqsd7qfih089zs1fpkq8lb4z6xgjj8qswhwd8kgb5wax78lbn"; system = "yason"; asd = "yason"; } @@ -107032,12 +107464,12 @@ lib.makeScope pkgs.newScope (self: { yason-tests = ( build-asdf-system { pname = "yason-tests"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "yason-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/yason/2024-10-12/yason-20241012-git.tgz"; - sha256 = "00hqii9n6ay5cq1ahbqpnw3l3v0mmz5s1f9kn6l35g8zxj1nlpa7"; + url = "https://beta.quicklisp.org/archive/yason/2025-06-22/yason-20250622-git.tgz"; + sha256 = "1bbkqsd7qfih089zs1fpkq8lb4z6xgjj8qswhwd8kgb5wax78lbn"; system = "yason-tests"; asd = "yason-tests"; } @@ -107059,7 +107491,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "youtube" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/youtube/2019-12-27/youtube-20191227-git.tgz"; + url = "https://beta.quicklisp.org/archive/youtube/2019-12-27/youtube-20191227-git.tgz"; sha256 = "0rqbyxgb9v3m8rwx2agaz7cq83w9k8gy5wl5wbw0rfg7r88ah5z0"; system = "youtube"; asd = "youtube"; @@ -107084,7 +107516,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "yxorp" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-yxorp/2023-10-21/cl-yxorp-20231021-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-yxorp/2023-10-21/cl-yxorp-20231021-git.tgz"; sha256 = "0l84icr1d3z2k6rs92lgkghwqm6w3i87d1sz4c8mpfcyfb5shgzn"; system = "yxorp"; asd = "yxorp"; @@ -107117,7 +107549,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "zacl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/zacl/2023-06-18/zacl-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/zacl/2023-06-18/zacl-20230618-git.tgz"; sha256 = "1s31d47zx8hczim78zrqzg4bvj4bshj31gmrff065q6racx3q1dk"; system = "zacl"; asd = "zacl"; @@ -107155,7 +107587,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "zaserve" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/aserve/2023-06-18/aserve-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/aserve/2023-06-18/aserve-20230618-git.tgz"; sha256 = "1i88264yghlb4brdh58hn9cps695gh63b6w6i8dmsd9rqwhlsibi"; system = "zaserve"; asd = "zaserve"; @@ -107178,7 +107610,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "zaws" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/zaws/2015-04-07/zaws-20150407-git.tgz"; + url = "https://beta.quicklisp.org/archive/zaws/2015-04-07/zaws-20150407-git.tgz"; sha256 = "1iwjyqzm4b44in7i53z5lp8n4gzsi27ch02ql6y2vxbmq3sqffaw"; system = "zaws"; asd = "zaws"; @@ -107203,7 +107635,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "zaws-xml" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/zaws/2015-04-07/zaws-20150407-git.tgz"; + url = "https://beta.quicklisp.org/archive/zaws/2015-04-07/zaws-20150407-git.tgz"; sha256 = "1iwjyqzm4b44in7i53z5lp8n4gzsi27ch02ql6y2vxbmq3sqffaw"; system = "zaws-xml"; asd = "zaws-xml"; @@ -107223,7 +107655,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "zbucium" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/zbucium/2019-07-10/zbucium-20190710-git.tgz"; + url = "https://beta.quicklisp.org/archive/zbucium/2019-07-10/zbucium-20190710-git.tgz"; sha256 = "112qx8lwcsaipnnypv2jr57lwhlgzb5n53wgck3r66b8vjjb91gy"; system = "zbucium"; asd = "zbucium"; @@ -107256,7 +107688,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "zcdb" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/zcdb/2015-04-07/zcdb-1.0.4.tgz"; + url = "https://beta.quicklisp.org/archive/zcdb/2015-04-07/zcdb-1.0.4.tgz"; sha256 = "1g83hqivh40xrpifm9v1vx92h13g5kzn12fjrlk57fyl1qwjqdi7"; system = "zcdb"; asd = "zcdb"; @@ -107276,7 +107708,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "zenekindarl" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/zenekindarl/2017-11-30/zenekindarl-20171130-git.tgz"; + url = "https://beta.quicklisp.org/archive/zenekindarl/2017-11-30/zenekindarl-20171130-git.tgz"; sha256 = "104y98j8fjj4wry55mhgv3g6358h5n1qcbhpn19b27b8cs8gqwib"; system = "zenekindarl"; asd = "zenekindarl"; @@ -107306,7 +107738,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "zenekindarl-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/zenekindarl/2017-11-30/zenekindarl-20171130-git.tgz"; + url = "https://beta.quicklisp.org/archive/zenekindarl/2017-11-30/zenekindarl-20171130-git.tgz"; sha256 = "104y98j8fjj4wry55mhgv3g6358h5n1qcbhpn19b27b8cs8gqwib"; system = "zenekindarl-test"; asd = "zenekindarl-test"; @@ -107330,7 +107762,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "zeromq" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-zmq/2016-03-18/cl-zmq-20160318-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-zmq/2016-03-18/cl-zmq-20160318-git.tgz"; sha256 = "0g19ych3n57qdd42m0bcdcrq8c1p0fqzz07xrxl0s0g8bms3a3ga"; system = "zeromq"; asd = "zeromq"; @@ -107354,7 +107786,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "zeromq.tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-zmq/2016-03-18/cl-zmq-20160318-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-zmq/2016-03-18/cl-zmq-20160318-git.tgz"; sha256 = "0g19ych3n57qdd42m0bcdcrq8c1p0fqzz07xrxl0s0g8bms3a3ga"; system = "zeromq.tests"; asd = "zeromq"; @@ -107378,7 +107810,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "zip" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/zip/2015-06-08/zip-20150608-git.tgz"; + url = "https://beta.quicklisp.org/archive/zip/2015-06-08/zip-20150608-git.tgz"; sha256 = "0s08a6fq182fzsbfyvihqbdllq6gxcwkvphxnrd9wwz65dhg5y66"; system = "zip"; asd = "zip"; @@ -107399,12 +107831,12 @@ lib.makeScope pkgs.newScope (self: { zippy = ( build-asdf-system { pname = "zippy"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "zippy" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/zippy/2024-10-12/zippy-20241012-git.tgz"; - sha256 = "06znhzi4zjg2p2858cwnlslqvx28zlmqr9jqij0rkvnn7ysa7qcg"; + url = "https://beta.quicklisp.org/archive/zippy/2025-06-22/zippy-20250622-git.tgz"; + sha256 = "12bkds03cx7wj91qs9dhg80zchm8vli73rkgwj6dy0fjrwczdws8"; system = "zippy"; asd = "zippy"; } @@ -107429,12 +107861,12 @@ lib.makeScope pkgs.newScope (self: { zippy-dwim = ( build-asdf-system { pname = "zippy-dwim"; - version = "20241012-git"; + version = "20250622-git"; asds = [ "zippy-dwim" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/zippy/2024-10-12/zippy-20241012-git.tgz"; - sha256 = "06znhzi4zjg2p2858cwnlslqvx28zlmqr9jqij0rkvnn7ysa7qcg"; + url = "https://beta.quicklisp.org/archive/zippy/2025-06-22/zippy-20250622-git.tgz"; + sha256 = "12bkds03cx7wj91qs9dhg80zchm8vli73rkgwj6dy0fjrwczdws8"; system = "zippy-dwim"; asd = "zippy-dwim"; } @@ -107456,7 +107888,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "ziz" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/ziz/2019-10-07/ziz-20191007-git.tgz"; + url = "https://beta.quicklisp.org/archive/ziz/2019-10-07/ziz-20191007-git.tgz"; sha256 = "1rh6ixkyyj7y9jkw046m4ilmr8a12ylzm0a7sm8mjybdpkh6bk30"; system = "ziz"; asd = "ziz"; @@ -107481,7 +107913,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "zlib" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/zlib/2017-04-03/zlib-20170403-git.tgz"; + url = "https://beta.quicklisp.org/archive/zlib/2017-04-03/zlib-20170403-git.tgz"; sha256 = "1gz771h2q3xhw1yxpwki5zr9mqysa818vn21501w6fsi8wlmlffa"; system = "zlib"; asd = "zlib"; @@ -107501,7 +107933,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "zmq" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lisp-zmq/2020-02-18/lisp-zmq-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/lisp-zmq/2020-02-18/lisp-zmq-20200218-git.tgz"; sha256 = "01aavmnn2lbsaq957p1qll21hmhvhkrqhq3kazmz88sc40x1n0ld"; system = "zmq"; asd = "zmq"; @@ -107526,7 +107958,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "zmq-examples" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lisp-zmq/2020-02-18/lisp-zmq-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/lisp-zmq/2020-02-18/lisp-zmq-20200218-git.tgz"; sha256 = "01aavmnn2lbsaq957p1qll21hmhvhkrqhq3kazmz88sc40x1n0ld"; system = "zmq-examples"; asd = "zmq-examples"; @@ -107549,7 +107981,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "zmq-test" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/lisp-zmq/2020-02-18/lisp-zmq-20200218-git.tgz"; + url = "https://beta.quicklisp.org/archive/lisp-zmq/2020-02-18/lisp-zmq-20200218-git.tgz"; sha256 = "01aavmnn2lbsaq957p1qll21hmhvhkrqhq3kazmz88sc40x1n0ld"; system = "zmq-test"; asd = "zmq-test"; @@ -107573,7 +108005,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "zpb-exif" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/zpb-exif/2021-01-24/zpb-exif-release-1.2.5.tgz"; + url = "https://beta.quicklisp.org/archive/zpb-exif/2021-01-24/zpb-exif-release-1.2.5.tgz"; sha256 = "0h1n36lfl8xn8rfyl5jxz9m8zlg0if2avmryas79f684yczrvdnd"; system = "zpb-exif"; asd = "zpb-exif"; @@ -107589,12 +108021,12 @@ lib.makeScope pkgs.newScope (self: { zpb-ttf = ( build-asdf-system { pname = "zpb-ttf"; - version = "release-1.0.7"; + version = "20250622-git"; asds = [ "zpb-ttf" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/zpb-ttf/2024-10-12/zpb-ttf-release-1.0.7.tgz"; - sha256 = "04lph7i153zlswvpgg76fxazyswj8j0idqm4ysn8qmflb7xcvd78"; + url = "https://beta.quicklisp.org/archive/zpb-ttf/2025-06-22/zpb-ttf-20250622-git.tgz"; + sha256 = "1mnn85109dl2nvk00jmw42vm55lf5md4p5aknc7pzfs8kmc45bp4"; system = "zpb-ttf"; asd = "zpb-ttf"; } @@ -107611,7 +108043,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "zpng" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/zpng/2015-04-07/zpng-1.2.2.tgz"; + url = "https://beta.quicklisp.org/archive/zpng/2015-04-07/zpng-1.2.2.tgz"; sha256 = "0b3ag3jhl3z7kdls3ahdsdxsfhhw5qrizk769984f4wkxhb69rcm"; system = "zpng"; asd = "zpng"; @@ -107625,12 +108057,12 @@ lib.makeScope pkgs.newScope (self: { zs3 = ( build-asdf-system { pname = "zs3"; - version = "1.3.3"; + version = "release-1.3.4"; asds = [ "zs3" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/zs3/2019-10-07/zs3-1.3.3.tgz"; - sha256 = "186v95wgsj2hkxdw2jl9x1w4fddjclp7arp0rrd9vf5ly8h8sbf3"; + url = "https://beta.quicklisp.org/archive/zs3/2025-06-22/zs3-release-1.3.4.tgz"; + sha256 = "1vr9l0hjjmcs24xfjz1s63jfj2261rlzhjvj5f4vblqi0yc96ir5"; system = "zs3"; asd = "zs3"; } @@ -107656,7 +108088,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "zsort" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/zsort/2012-05-20/zsort-20120520-git.tgz"; + url = "https://beta.quicklisp.org/archive/zsort/2012-05-20/zsort-20120520-git.tgz"; sha256 = "1vyklyh99712zsll4qi0m4mm8yb1nz04403vl8i57bjv5p5max49"; system = "zsort"; asd = "zsort"; @@ -107676,7 +108108,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "zstd" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-zstd/2023-06-18/cl-zstd-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-zstd/2023-06-18/cl-zstd-20230618-git.tgz"; sha256 = "037igr1v849smcs6svjb5s850k5s5yfg74d4gb3ir4b4v9g4k97i"; system = "zstd"; asd = "zstd"; @@ -107700,7 +108132,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "zstd-tests" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-zstd/2023-06-18/cl-zstd-20230618-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-zstd/2023-06-18/cl-zstd-20230618-git.tgz"; sha256 = "037igr1v849smcs6svjb5s850k5s5yfg74d4gb3ir4b4v9g4k97i"; system = "zstd-tests"; asd = "zstd-tests"; @@ -107724,7 +108156,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "zyre" ]; src = ( createAsd { - url = "http://beta.quicklisp.org/archive/cl-zyre/2020-09-25/cl-zyre-20200925-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-zyre/2020-09-25/cl-zyre-20200925-git.tgz"; sha256 = "1pfb176k655hxksyrans5j43ridvpkl8q8h6d37zgi2z4iiz15wv"; system = "zyre"; asd = "zyre"; diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix index c63d9dc7949e8..da535fd8889b7 100644 --- a/pkgs/development/lisp-modules/packages.nix +++ b/pkgs/development/lisp-modules/packages.nix @@ -86,6 +86,25 @@ let jzon = super.com_dot_inuoe_dot_jzon; + _40ants-routes = super._40ants-routes.overrideLispAttrs (o: { + systems = o.systems ++ [ "40ants-routes/handler" ]; + }); + + reblocks-ui2 = super.reblocks-ui2.overrideLispAttrs (o: { + systems = o.systems ++ [ + "reblocks-ui2/themes/color" + "reblocks-ui2/themes/tailwind" + "reblocks-ui2/utils/padding" + "reblocks-ui2/utils/align" + "reblocks-ui2/card" + "reblocks-ui2/card/view" + ]; + }); + + april = super.april.overrideLispAttrs (o: { + systems = o.systems ++ [ "cape" ]; + }); + cl-notify = build-asdf-system { pname = "cl-notify"; version = "20080904-138ca7038"; diff --git a/pkgs/development/lisp-modules/shell.nix b/pkgs/development/lisp-modules/shell.nix index 85b79bcbff6fc..811e8d3c1d28a 100644 --- a/pkgs/development/lisp-modules/shell.nix +++ b/pkgs/development/lisp-modules/shell.nix @@ -1,18 +1,23 @@ let pkgs = import ../../../. { }; + inherit (pkgs) mkShellNoCC sbcl nixfmt-rfc-style; in -pkgs.mkShell { - nativeBuildInputs = [ - (pkgs.sbcl.withPackages ( - ps: with ps; [ - alexandria - str - dexador - cl-ppcre - sqlite - arrow-macros - jzon - ] +mkShellNoCC { + packages = [ + nixfmt-rfc-style + (sbcl.withPackages ( + ps: + builtins.attrValues { + inherit (ps) + alexandria + str + dexador + cl-ppcre + sqlite + arrow-macros + jzon + ; + } )) ]; } diff --git a/pkgs/development/python-modules/a2wsgi/default.nix b/pkgs/development/python-modules/a2wsgi/default.nix index f281c25b38843..e38f47e6bcd8b 100644 --- a/pkgs/development/python-modules/a2wsgi/default.nix +++ b/pkgs/development/python-modules/a2wsgi/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "a2wsgi"; - version = "1.10.8"; + version = "1.10.10"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-/AC6sfx5L4mozhtJGyrRcXsUXYyu+3XQqFhpRu3JfLI="; + hash = "sha256-pbz/tSCBujnfDV6aiE/G+BnZLjpCOJNDunfL+An+H0U="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/abjad/default.nix b/pkgs/development/python-modules/abjad/default.nix index e032123220419..4f89767c1b7ad 100644 --- a/pkgs/development/python-modules/abjad/default.nix +++ b/pkgs/development/python-modules/abjad/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "abjad"; - version = "3.22"; + version = "3.28"; format = "setuptools"; # see issue upstream indicating Python 3.12 support will come @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-cTll4E5qPuacc7K3TFfK4IqtXGUHuiiU5J20poRuWbI="; + hash = "sha256-J4LPOSz34GvDRwpCG8yt4LAqt+dhDrfG/W451bZRpgk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/about-time/default.nix b/pkgs/development/python-modules/about-time/default.nix index 02f1ca4f917da..3271a11755b43 100644 --- a/pkgs/development/python-modules/about-time/default.nix +++ b/pkgs/development/python-modules/about-time/default.nix @@ -1,32 +1,30 @@ { lib, - fetchPypi, + fetchFromGitHub, buildPythonPackage, - python, + setuptools, }: buildPythonPackage rec { pname = "about-time"; - version = "4.2.1"; - format = "setuptools"; + version = "4.2.2"; + pyproject = true; - # PyPi release does not contain test files, but the repo has no release tags, - # so while having no tests is not ideal, follow the PyPi releases for now - # TODO: switch to fetchFromGitHub once this issue is fixed: - # https://github.com/rsalmei/about-time/issues/15 - src = fetchPypi { - inherit pname version; - hash = "sha256-alOIYtM85n2ZdCnRSZgxDh2/2my32bv795nEcJhH/s4="; + src = fetchFromGitHub { + owner = "rsalmei"; + repo = "about-time"; + tag = "v${version}"; + hash = "sha256-a7jFVrxUvdR5UdeNNXSTsXC/Q76unedMLmcu0iTS3Tk="; }; - doCheck = false; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools~=75.3" setuptools + ''; - pythonImportsCheck = [ "about_time" ]; + build-system = [ setuptools ]; - postInstall = '' - mkdir -p $out/share/doc/python${python.pythonVersion}-$pname-$version/ - mv $out/LICENSE $out/share/doc/python${python.pythonVersion}-$pname-$version/ - ''; + pythonImportsCheck = [ "about_time" ]; meta = with lib; { description = "Cool helper for tracking time and throughput of code blocks, with beautiful human friendly renditions"; diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index ca12c857ca097..21552b0761995 100644 --- a/pkgs/development/python-modules/absl-py/default.nix +++ b/pkgs/development/python-modules/absl-py/default.nix @@ -2,22 +2,22 @@ lib, buildPythonPackage, fetchFromGitHub, - setuptools, + hatchling, }: buildPythonPackage rec { pname = "absl-py"; - version = "2.2.2"; + version = "2.3.1"; pyproject = true; src = fetchFromGitHub { owner = "abseil"; repo = "abseil-py"; tag = "v${version}"; - hash = "sha256-KsaFfdq6+Pc8k0gM1y+HJ1v6VrTAK7TBgh92BSFuc+Q="; + hash = "sha256-U8doys7SoOhtUkF0dsCFKnM9ItOoi5a6cK6zGOe/U8s="; }; - build-system = [ setuptools ]; + build-system = [ hatchling ]; # checks use bazel; should be revisited doCheck = false; @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = { description = "Abseil Python Common Libraries"; homepage = "https://github.com/abseil/abseil-py"; - changelog = "https://github.com/abseil/abseil-py/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/abseil/abseil-py/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/adlfs/default.nix b/pkgs/development/python-modules/adlfs/default.nix index 729323af99ff6..d0f3e8b5a3991 100644 --- a/pkgs/development/python-modules/adlfs/default.nix +++ b/pkgs/development/python-modules/adlfs/default.nix @@ -41,6 +41,8 @@ buildPythonPackage rec { fsspec ]; + pythonRelaxDeps = [ "azure-datalake-store" ]; + # Tests require a running Docker instance doCheck = false; diff --git a/pkgs/development/python-modules/afsapi/default.nix b/pkgs/development/python-modules/afsapi/default.nix index d583911800255..40ce655ab559a 100644 --- a/pkgs/development/python-modules/afsapi/default.nix +++ b/pkgs/development/python-modules/afsapi/default.nix @@ -31,6 +31,8 @@ buildPythonPackage rec { lxml ]; + doCheck = false; # Failed: async def functions are not natively supported. + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook diff --git a/pkgs/development/python-modules/aioasuswrt/default.nix b/pkgs/development/python-modules/aioasuswrt/default.nix index ff54fa5530862..2544f86902eea 100644 --- a/pkgs/development/python-modules/aioasuswrt/default.nix +++ b/pkgs/development/python-modules/aioasuswrt/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, fetchFromGitHub, pytest-cov-stub, - pytest-asyncio, + pytest-asyncio_0, pytest-mock, pytestCheckHook, pythonOlder, @@ -30,7 +30,7 @@ buildPythonPackage rec { dependencies = [ asyncssh ]; nativeCheckInputs = [ - pytest-asyncio + pytest-asyncio_0 pytest-cov-stub pytest-mock pytestCheckHook diff --git a/pkgs/development/python-modules/aioboto3/boto3-compat.patch b/pkgs/development/python-modules/aioboto3/boto3-compat.patch new file mode 100644 index 0000000000000..7f4b2272e5091 --- /dev/null +++ b/pkgs/development/python-modules/aioboto3/boto3-compat.patch @@ -0,0 +1,15 @@ +diff --git a/aioboto3/session.py b/aioboto3/session.py +index b6c2129..c97eaaf 100644 +--- a/aioboto3/session.py ++++ b/aioboto3/session.py +@@ -79,7 +79,9 @@ class Session(boto3.session.Session): + + if any(creds): + if self._account_id_set_without_credentials( +- aws_account_id, aws_access_key_id, aws_secret_access_key ++ aws_account_id=aws_account_id, ++ aws_access_key_id=aws_access_key_id, ++ aws_secret_access_key=aws_secret_access_key + ): + raise NoCredentialsError() + diff --git a/pkgs/development/python-modules/aioboto3/default.nix b/pkgs/development/python-modules/aioboto3/default.nix index c36746e5cc714..157aae9026e01 100644 --- a/pkgs/development/python-modules/aioboto3/default.nix +++ b/pkgs/development/python-modules/aioboto3/default.nix @@ -16,16 +16,19 @@ buildPythonPackage rec { pname = "aioboto3"; - version = "14.3.0"; + version = "15.0.0"; pyproject = true; src = fetchFromGitHub { - owner = "terrycain"; + owner = "terricain"; repo = "aioboto3"; tag = "v${version}"; - hash = "sha256-3GdTpbU0uEEzezQPHJTGPB42Qu604eIhcIAP4rZMQiY="; + hash = "sha256-Z4tUwTFaXC3BGUKc1FPY0xoaUViAEiZNeP5REWotw2M="; }; + # https://github.com/terricain/aioboto3/pull/377 + patches = [ ./boto3-compat.patch ]; + pythonRelaxDeps = [ "aiobotocore" ]; @@ -63,8 +66,8 @@ buildPythonPackage rec { meta = { description = "Wrapper to use boto3 resources with the aiobotocore async backend"; - homepage = "https://github.com/terrycain/aioboto3"; - changelog = "https://github.com/terrycain/aioboto3/blob/${src.rev}/CHANGELOG.rst"; + homepage = "https://github.com/terricain/aioboto3"; + changelog = "https://github.com/terricain/aioboto3/blob/${src.rev}/CHANGELOG.rst"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ mbalatsko ]; }; diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index a1dbe65c0123c..d9afb4a006cbe 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -17,20 +17,21 @@ werkzeug, awscli, boto3, + httpx, setuptools, pytestCheckHook, }: buildPythonPackage rec { pname = "aiobotocore"; - version = "2.22.0"; + version = "2.23.2"; pyproject = true; src = fetchFromGitHub { owner = "aio-libs"; repo = "aiobotocore"; tag = version; - hash = "sha256-Zzwj0osXqWSCWsuxlpiqpptzjLhFwlqfXqiWMP7CgXg="; + hash = "sha256-3aqA+zjXgYGqDRF0x2eS458A0N7Dmc0tfOcnukjf0DM="; }; # Relax version constraints: aiobotocore works with newer botocore versions @@ -55,6 +56,7 @@ buildPythonPackage rec { optional-dependencies = { awscli = [ awscli ]; boto3 = [ boto3 ]; + httpx = [ httpx ]; }; nativeCheckInputs = [ @@ -69,11 +71,14 @@ buildPythonPackage rec { pythonImportsCheck = [ "aiobotocore" ]; + disabledTests = [ + # TypeError: sequence item 1: expected str instance, MagicMock found + "test_signers_generate_db_auth_token" + ]; + disabledTestPaths = [ # Test requires network access "tests/test_version.py" - # Test not compatible with latest moto - "tests/python3.8/test_eventstreams.py" "tests/test_basic_s3.py" "tests/test_batch.py" "tests/test_dynamodb.py" @@ -86,6 +91,11 @@ buildPythonPackage rec { "tests/test_waiter.py" ]; + disabledTestMarks = [ + # Exclude localonly tests (incompatible with moto mocks) + "localonly" + ]; + __darwinAllowLocalNetworking = true; meta = { diff --git a/pkgs/development/python-modules/aiodiscover/default.nix b/pkgs/development/python-modules/aiodiscover/default.nix index 8420da3207795..18845fc8c92ab 100644 --- a/pkgs/development/python-modules/aiodiscover/default.nix +++ b/pkgs/development/python-modules/aiodiscover/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to discover hosts via ARP and PTR lookup"; homepage = "https://github.com/bdraco/aiodiscover"; - changelog = "https://github.com/bdraco/aiodiscover/releases/tag/v${version}"; + changelog = "https://github.com/bdraco/aiodiscover/releases/tag/${src.tag}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aioeafm/default.nix b/pkgs/development/python-modules/aioeafm/default.nix index 056e9bd6b8eb9..95b287786cdd9 100644 --- a/pkgs/development/python-modules/aioeafm/default.nix +++ b/pkgs/development/python-modules/aioeafm/default.nix @@ -37,6 +37,8 @@ buildPythonPackage rec { dependencies = [ aiohttp ]; + doCheck = false; # Failed: async def functions are not natively supported. + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook diff --git a/pkgs/development/python-modules/aioecowitt/default.nix b/pkgs/development/python-modules/aioecowitt/default.nix index 15be3f4221926..88f0db5ac7b41 100644 --- a/pkgs/development/python-modules/aioecowitt/default.nix +++ b/pkgs/development/python-modules/aioecowitt/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, fetchFromGitHub, meteocalc, + pytest-asyncio_0, pytest-aiohttp, pytestCheckHook, pythonOlder, @@ -32,7 +33,8 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytest-aiohttp + pytest-asyncio_0 + (pytest-aiohttp.override { pytest-asyncio = pytest-asyncio_0; }) pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aiohappyeyeballs/default.nix b/pkgs/development/python-modules/aiohappyeyeballs/default.nix index f1c32db66e93f..1ed3bcfe9b66f 100644 --- a/pkgs/development/python-modules/aiohappyeyeballs/default.nix +++ b/pkgs/development/python-modules/aiohappyeyeballs/default.nix @@ -14,7 +14,7 @@ sphinxHook, # tests - pytest-asyncio, + pytest-asyncio_0, pytest-cov-stub, pytestCheckHook, }: @@ -50,7 +50,7 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - pytest-asyncio + pytest-asyncio_0 pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index 4bd67403b3ad2..3498ee8f5a6b5 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -13,6 +13,7 @@ fetchFromGitHub, orjson, poetry-core, + pytest-asyncio_0, pytest-aiohttp, pytestCheckHook, pythonOlder, @@ -50,7 +51,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytest-aiohttp + (pytest-aiohttp.override { pytest-asyncio = pytest-asyncio_0; }) pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aiohttp-sse/default.nix b/pkgs/development/python-modules/aiohttp-sse/default.nix index 851f0fef08cbb..ec7f64216c646 100644 --- a/pkgs/development/python-modules/aiohttp-sse/default.nix +++ b/pkgs/development/python-modules/aiohttp-sse/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, lib, pytest-aiohttp, - pytest-asyncio, + pytest-asyncio_0, pytest-cov-stub, pytestCheckHook, setuptools, @@ -31,8 +31,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "aiohttp_sse" ]; nativeCheckInputs = [ - pytest-aiohttp - pytest-asyncio + (pytest-aiohttp.override { pytest-asyncio = pytest-asyncio_0; }) + pytest-asyncio_0 pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index b12fa8da9a9df..d39e8318943e2 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -8,7 +8,7 @@ isPyPy, # build-system - cython_3_1, + cython, pkgconfig, setuptools, @@ -50,14 +50,14 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "3.12.14"; + version = "3.12.15"; pyproject = true; src = fetchFromGitHub { owner = "aio-libs"; repo = "aiohttp"; tag = "v${version}"; - hash = "sha256-KPPxP6x/3sz2mDJNswh/xPatcMtVdYv3aArg//7tSao="; + hash = "sha256-nVDGSbzjCdyJFCsHq8kJigNA4vGs4Pg1Vyyvw+gKg2w="; }; patches = lib.optionals (!lib.meta.availableOn stdenv.hostPlatform isa-l) [ @@ -75,7 +75,7 @@ buildPythonPackage rec { ''; build-system = [ - cython_3_1 + cython pkgconfig setuptools ]; diff --git a/pkgs/development/python-modules/aioimaplib/default.nix b/pkgs/development/python-modules/aioimaplib/default.nix index 2c9502ff289a6..5d6205362fa5a 100644 --- a/pkgs/development/python-modules/aioimaplib/default.nix +++ b/pkgs/development/python-modules/aioimaplib/default.nix @@ -7,7 +7,7 @@ mock, poetry-core, pyopenssl, - pytest-asyncio, + pytest-asyncio_0, pytestCheckHook, pytz, }: @@ -30,7 +30,7 @@ buildPythonPackage rec { imaplib2 mock pyopenssl - pytest-asyncio + pytest-asyncio_0 pytestCheckHook pytz ]; diff --git a/pkgs/development/python-modules/aiolookin/default.nix b/pkgs/development/python-modules/aiolookin/default.nix index 677d9ba7c72e9..fa1d100cb9141 100644 --- a/pkgs/development/python-modules/aiolookin/default.nix +++ b/pkgs/development/python-modules/aiolookin/default.nix @@ -26,6 +26,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp ]; + doCheck = false; # all tests are async and no async plugin is configured + nativeCheckInputs = [ faker pytest-aiohttp @@ -33,11 +35,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # Not all tests are ready yet - "test_successful" - ]; - pythonImportsCheck = [ "aiolookin" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/aiomisc-pytest/default.nix b/pkgs/development/python-modules/aiomisc-pytest/default.nix index 0e0add78bf19f..1db59e19c44b6 100644 --- a/pkgs/development/python-modules/aiomisc-pytest/default.nix +++ b/pkgs/development/python-modules/aiomisc-pytest/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiomisc-pytest"; - version = "1.2.1"; + version = "1.3.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "aiomisc_pytest"; inherit version; - hash = "sha256-4mWP77R3CoX+XhoT6BbxQtxpINpdmeozjYUsegNfMyU="; + hash = "sha256-9Of1pSUcMiIhkz7OW5erF4oDlf/ABkaamDBPg7+WbBE="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix index f92816215373f..b61f558e7146a 100644 --- a/pkgs/development/python-modules/aiomisc/default.nix +++ b/pkgs/development/python-modules/aiomisc/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "aiomisc"; - version = "17.7.8"; + version = "17.9.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Wfum+9M0Kx9GA9F2/fzhvETsQodNKnoRXSADFZl6Sf4="; + hash = "sha256-oSwMhomcPIN2JYterJuBUcmJtUx3rayADH1ugah+pI8="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/aionotion/default.nix b/pkgs/development/python-modules/aionotion/default.nix index fb7ab4d6bad1a..048ef8c0518fc 100644 --- a/pkgs/development/python-modules/aionotion/default.nix +++ b/pkgs/development/python-modules/aionotion/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "aionotion"; - version = "2024.03.0"; + version = "2025.02.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,9 +29,14 @@ buildPythonPackage rec { owner = "bachya"; repo = "aionotion"; tag = version; - hash = "sha256-BsbfLb5wCVxR8v2U2Zzt7LMl7XJcZWfVjZN47VDkhFc="; + hash = "sha256-MqH3CPp+dAX5DXtnHio95KGQ+Ok2TXrX6rn/AMx5OsY="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "poetry-core==" "poetry-core>=" + ''; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ @@ -44,6 +49,12 @@ buildPythonPackage rec { yarl ]; + pythonRelaxDeps = [ + "ciso8601" + "frozenlist" + "mashumaro" + ]; + __darwinAllowLocalNetworking = true; nativeCheckInputs = [ @@ -61,7 +72,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for Notion Home Monitoring"; homepage = "https://github.com/bachya/aionotion"; - changelog = "https://github.com/bachya/aionotion/releases/tag/${version}"; + changelog = "https://github.com/bachya/aionotion/releases/tag/${src.tag}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aiorpcx/default.nix b/pkgs/development/python-modules/aiorpcx/default.nix index 9ed371bb9d86f..c217cdfe6f3bd 100644 --- a/pkgs/development/python-modules/aiorpcx/default.nix +++ b/pkgs/development/python-modules/aiorpcx/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, setuptools, websockets, - pytest-asyncio, + pytest-asyncio_0, pytestCheckHook, }: @@ -25,7 +25,7 @@ buildPythonPackage rec { optional-dependencies.ws = [ websockets ]; nativeCheckInputs = [ - pytest-asyncio + pytest-asyncio_0 pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); diff --git a/pkgs/development/python-modules/aiortm/default.nix b/pkgs/development/python-modules/aiortm/default.nix index 4bc009caa27c1..a55633c9f2291 100644 --- a/pkgs/development/python-modules/aiortm/default.nix +++ b/pkgs/development/python-modules/aiortm/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "aiortm"; - version = "0.10.0"; + version = "0.11.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiortm"; tag = "v${version}"; - hash = "sha256-YclrU24eyk88eOc/nlgeWJ/Fo9SveCzRqQCKYAA9Y9s="; + hash = "sha256-KghKxaa1MhNH13NdUpDiT5h8ZEj5aWLUVhvQKvLC+oM="; }; pythonRelaxDeps = [ "typer" ]; @@ -57,7 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for the Remember the Milk API"; homepage = "https://github.com/MartinHjelmare/aiortm"; - changelog = "https://github.com/MartinHjelmare/aiortm/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/MartinHjelmare/aiortm/blob/${src.tag}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; mainProgram = "aiortm"; diff --git a/pkgs/development/python-modules/aiosonic/default.nix b/pkgs/development/python-modules/aiosonic/default.nix index 4a7872e14464f..e1586de94bfb7 100644 --- a/pkgs/development/python-modules/aiosonic/default.nix +++ b/pkgs/development/python-modules/aiosonic/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "aiosonic"; - version = "0.22.0"; + version = "0.24.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "sonic182"; repo = "aiosonic"; tag = version; - hash = "sha256-wBYGiSTSRhi11uqTyGgF1YpnBVoDraCr2GKC8VkQEWc="; + hash = "sha256-Yh1AD/tBHQBpwAA86XuP9UuXnCAFcMw/XSv6z46XP0k="; }; postPatch = '' @@ -113,7 +113,7 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/sonic182/aiosonic/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/sonic182/aiosonic/blob/${src.tag}/CHANGELOG.md"; description = "Very fast Python asyncio http client"; license = lib.licenses.mit; homepage = "https://github.com/sonic182/aiosonic"; diff --git a/pkgs/development/python-modules/aiosql/default.nix b/pkgs/development/python-modules/aiosql/default.nix index d7123809edef4..1c233d8f9f2c5 100644 --- a/pkgs/development/python-modules/aiosql/default.nix +++ b/pkgs/development/python-modules/aiosql/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple SQL in Python"; homepage = "https://nackjicholson.github.io/aiosql/"; - changelog = "https://github.com/nackjicholson/aiosql/releases/tag/${version}"; + changelog = "https://github.com/nackjicholson/aiosql/releases/tag/${src.tag}"; license = with licenses; [ bsd2 ]; maintainers = with maintainers; [ kaction ]; }; diff --git a/pkgs/development/python-modules/aiostream/default.nix b/pkgs/development/python-modules/aiostream/default.nix index 3d4bbd2dc63bb..de2b2fec0067c 100644 --- a/pkgs/development/python-modules/aiostream/default.nix +++ b/pkgs/development/python-modules/aiostream/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiostream"; - version = "0.6.4"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "vxgmichel"; repo = "aiostream"; tag = "v${version}"; - hash = "sha256-hRbPK1JsB/JQuSjj81YMUAI8eDUyXCOFhdW22ZJ47xU="; + hash = "sha256-oOx1LG3UyMJRm/HvmrHT00jTp3+XzmvS2XRH4BJNyPE="; }; build-system = [ setuptools ]; @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Generator-based operators for asynchronous iteration"; homepage = "https://aiostream.readthedocs.io"; - changelog = "https://github.com/vxgmichel/aiostream/releases/tag/v${version}"; + changelog = "https://github.com/vxgmichel/aiostream/releases/tag/${src.tag}"; license = licenses.gpl3Only; maintainers = with maintainers; [ rmcgibbo ]; }; diff --git a/pkgs/development/python-modules/aiowebostv/default.nix b/pkgs/development/python-modules/aiowebostv/default.nix index 35c15d85f2fbf..06b05806047a5 100644 --- a/pkgs/development/python-modules/aiowebostv/default.nix +++ b/pkgs/development/python-modules/aiowebostv/default.nix @@ -21,6 +21,11 @@ buildPythonPackage rec { hash = "sha256-3O1NiFNzlWIR/9JR2Y7t9tL4t7tJ6haNwsS5r4m7lMM="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'version = "0.0.0"' 'version = "${version}"' + ''; + build-system = [ setuptools ]; dependencies = [ aiohttp ]; diff --git a/pkgs/development/python-modules/albucore/default.nix b/pkgs/development/python-modules/albucore/default.nix index 4ca66b2604014..6a44918408582 100644 --- a/pkgs/development/python-modules/albucore/default.nix +++ b/pkgs/development/python-modules/albucore/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "albucore"; - version = "0.0.24"; + version = "0.0.33"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "albumentations-team"; repo = "albucore"; tag = version; - hash = "sha256-frVMPW3au/6vPRY89GIt7chCPkUMl13DpPqCPqIjz/o="; + hash = "sha256-OQYIvJM3pLna5rr1H7pVDhUR9sLmx032AZ9SWXQqMjc="; }; pythonRelaxDeps = [ "opencv-python" ]; @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = { description = "High-performance image processing library to optimize and extend Albumentations with specialized functions for image transformations"; homepage = "https://github.com/albumentations-team/albucore"; - changelog = "https://github.com/albumentations-team/albucore/releases/tag/${version}"; + changelog = "https://github.com/albumentations-team/albucore/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 3ea57cab5ceac..1962325dc3737 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -2,34 +2,30 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, # build-system setuptools, # dependencies - importlib-metadata, - importlib-resources, mako, sqlalchemy, typing-extensions, # tests - pytest7CheckHook, + black, + pytestCheckHook, pytest-xdist, python-dateutil, }: buildPythonPackage rec { pname = "alembic"; - version = "1.15.2"; + version = "1.16.4"; pyproject = true; - disabled = pythonOlder "3.6"; - src = fetchPypi { inherit pname version; - hash = "sha256-HHI5G73v/M/jF+77pobLmjwHgAVHiIVBO5XDsmxXqKc="; + hash = "sha256-76tq2g3Q+uLJIGCADgv1wdwmrxWhDgL7S6v/FktHJeI="; }; build-system = [ setuptools ]; @@ -38,16 +34,13 @@ buildPythonPackage rec { mako sqlalchemy typing-extensions - ] - ++ lib.optionals (pythonOlder "3.9") [ - importlib-resources - importlib-metadata ]; pythonImportsCheck = [ "alembic" ]; nativeCheckInputs = [ - pytest7CheckHook + black + pytestCheckHook pytest-xdist python-dateutil ]; diff --git a/pkgs/development/python-modules/alive-progress/default.nix b/pkgs/development/python-modules/alive-progress/default.nix index f981c8d1ae92e..c795aed0f14d4 100644 --- a/pkgs/development/python-modules/alive-progress/default.nix +++ b/pkgs/development/python-modules/alive-progress/default.nix @@ -37,6 +37,8 @@ buildPythonPackage rec { grapheme ]; + pythonRelaxDeps = [ "about_time" ]; + nativeCheckInputs = [ click pytestCheckHook diff --git a/pkgs/development/python-modules/allure-behave/default.nix b/pkgs/development/python-modules/allure-behave/default.nix index 4b80c97c8777d..a4a8069039c4e 100644 --- a/pkgs/development/python-modules/allure-behave/default.nix +++ b/pkgs/development/python-modules/allure-behave/default.nix @@ -1,8 +1,7 @@ { lib, - fetchPypi, + fetchFromGitHub, buildPythonPackage, - pythonOlder, behave, allure-python-commons, setuptools-scm, @@ -10,25 +9,29 @@ buildPythonPackage rec { pname = "allure-behave"; - version = "2.13.5"; - format = "setuptools"; + version = "2.15.0"; + pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-M4yizHOV0e491y9dfZLYkg8a3g4H3evGN7OOYeBtyNw="; + src = fetchFromGitHub { + owner = "allure-framework"; + repo = "allure-python"; + tag = version; + hash = "sha256-I3Zh9frOplcPqLd8b4peNM9WtbNmQjHX6ocVJJwPzyc="; }; - nativeBuildInputs = [ setuptools-scm ]; + sourceRoot = "${src.name}/allure-behave"; - pythonImportsCheck = [ "allure_behave" ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ allure-python-commons behave ]; + doCheck = false; # no tests + + pythonImportsCheck = [ "allure_behave" ]; + meta = with lib; { description = "Allure behave integration"; homepage = "https://github.com/allure-framework/allure-python"; diff --git a/pkgs/development/python-modules/allure-pytest/default.nix b/pkgs/development/python-modules/allure-pytest/default.nix index 88fc7054f1e61..4d6173f56c2ca 100644 --- a/pkgs/development/python-modules/allure-pytest/default.nix +++ b/pkgs/development/python-modules/allure-pytest/default.nix @@ -2,29 +2,30 @@ lib, allure-python-commons, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pytest, - pythonOlder, setuptools-scm, }: buildPythonPackage rec { pname = "allure-pytest"; - version = "2.13.5"; + version = "2.15.0"; pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-DvjheQxEqYjba4PE1PXpFFHixMjqEGAd+ohSjSOvz24="; + src = fetchFromGitHub { + owner = "allure-framework"; + repo = "allure-python"; + tag = version; + hash = "sha256-I3Zh9frOplcPqLd8b4peNM9WtbNmQjHX6ocVJJwPzyc="; }; - nativeBuildInputs = [ setuptools-scm ]; + sourceRoot = "${src.name}/allure-pytest"; + + build-system = [ setuptools-scm ]; buildInputs = [ pytest ]; - propagatedBuildInputs = [ allure-python-commons ]; + dependencies = [ allure-python-commons ]; # Tests were moved to the meta package doCheck = false; diff --git a/pkgs/development/python-modules/allure-python-commons-test/default.nix b/pkgs/development/python-modules/allure-python-commons-test/default.nix index 5a4f5049d9cc9..764641b7c6bb4 100644 --- a/pkgs/development/python-modules/allure-python-commons-test/default.nix +++ b/pkgs/development/python-modules/allure-python-commons-test/default.nix @@ -12,12 +12,13 @@ buildPythonPackage rec { pname = "allure-python-commons-test"; - version = "2.13.5"; + version = "2.15.0"; format = "setuptools"; src = fetchPypi { - inherit pname version; - hash = "sha256-pWkLVfBrLEhdhuTE95K3aqrhEY2wEyo5uRzuJC3ngjE="; + pname = "allure_python_commons_test"; + inherit version; + hash = "sha256-5l/9K6ToYEGaYXOmVxB188wu9gQ+2cMHxfVNlX8Rz9g="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/allure-python-commons/default.nix b/pkgs/development/python-modules/allure-python-commons/default.nix index 30881b90f3fdb..57571c89095ca 100644 --- a/pkgs/development/python-modules/allure-python-commons/default.nix +++ b/pkgs/development/python-modules/allure-python-commons/default.nix @@ -13,30 +13,22 @@ buildPythonPackage rec { pname = "allure-python-commons"; - version = "2.13.5"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "2.15.0"; + pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-ojLnlVgR+Yjkmkwd1sFszn6bgdDqBCKx5WVNMlTiyvM="; + pname = "allure_python_commons"; + inherit version; + hash = "sha256-T2Oci7S3nfDZTxuqiHgsk5m+P0X9g5rlg6MUpdRRuXg="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ attrs pluggy - six - allure-python-commons-test ]; - checkPhase = '' - ${python.interpreter} -m doctest ./src/utils.py - ${python.interpreter} -m doctest ./src/mapping.py - ''; - pythonImportsCheck = [ "allure" "allure_commons" diff --git a/pkgs/development/python-modules/amazon-kclpy/default.nix b/pkgs/development/python-modules/amazon-kclpy/default.nix index 591ee5568390d..3c039de4dbabf 100644 --- a/pkgs/development/python-modules/amazon-kclpy/default.nix +++ b/pkgs/development/python-modules/amazon-kclpy/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "amazon-kclpy"; - version = "3.0.1"; + version = "3.1.0"; pyproject = true; src = fetchFromGitHub { owner = "awslabs"; repo = "amazon-kinesis-client-python"; tag = "v${version}"; - hash = "sha256-P/kYRFDmWcqvnAaKYx22PwtC51JlYB0qopO3+QuRHAk="; + hash = "sha256-nboEZwRlhbr176H4b6ESm3LfVZCoKz3yKrQptERsLgg="; }; patches = [ diff --git a/pkgs/development/python-modules/amcrest/default.nix b/pkgs/development/python-modules/amcrest/default.nix index b3fd5616ea923..2d48513f3fd3a 100644 --- a/pkgs/development/python-modules/amcrest/default.nix +++ b/pkgs/development/python-modules/amcrest/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for Amcrest and Dahua Cameras"; homepage = "https://github.com/tchellomello/python-amcrest"; - changelog = "https://github.com/tchellomello/python-amcrest/releases/tag/${version}"; + changelog = "https://github.com/tchellomello/python-amcrest/releases/tag/${src.tag}"; license = licenses.gpl2Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/annotatedyaml/default.nix b/pkgs/development/python-modules/annotatedyaml/default.nix index dc790ed0902b0..16d589e587e0d 100644 --- a/pkgs/development/python-modules/annotatedyaml/default.nix +++ b/pkgs/development/python-modules/annotatedyaml/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "annotatedyaml"; - version = "0.4.5"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "annotatedyaml"; tag = "v${version}"; - hash = "sha256-AmgM5KF8O8/rkR/9PmTzcyQaSlEDcYBDDRq5ujwANR0="; + hash = "sha256-bVXhKm69A5FIXYY2yq7jXPIK7lSCQD20a3oX1GdqOLY="; }; build-system = [ @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = { description = "Annotated YAML that supports secrets for Python"; homepage = "https://github.com/home-assistant-libs/annotatedyaml"; - changelog = "https://github.com/home-assistant-libs/annotatedyaml/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/home-assistant-libs/annotatedyaml/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/anova-wifi/default.nix b/pkgs/development/python-modules/anova-wifi/default.nix index 07f9bcf2dfe5c..b7374b5caa864 100644 --- a/pkgs/development/python-modules/anova-wifi/default.nix +++ b/pkgs/development/python-modules/anova-wifi/default.nix @@ -41,6 +41,8 @@ buildPythonPackage rec { disabledTests = [ # Makes network calls "test_async_data_1" + # async def functions are not natively supported. + "test_can_create" ]; pythonImportsCheck = [ "anova_wifi" ]; diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 2b635f5160b09..12a897f95e984 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -47,9 +47,6 @@ buildPythonPackage rec { # the python interpreter again, as it would break execution of # connection plugins. postPatch = '' - substituteInPlace lib/ansible/executor/task_executor.py \ - --replace "[python," "[" - patchShebangs --build packaging/cli-doc/build.py SETUPTOOLS_PATTERN='"setuptools[0-9 <>=.,]+"' @@ -60,6 +57,9 @@ buildPythonPackage rec { else exit 2 fi + + substituteInPlace pyproject.toml \ + --replace-fail "wheel == 0.45.1" wheel ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index afe573ab3feb6..99fd7ff5dcabd 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "anyio"; - version = "4.9.0"; + version = "4.10.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "agronholm"; repo = "anyio"; tag = version; - hash = "sha256-kISaBHDkMOYYU9sdiQAXiq3jp1ehWOYFpvFbuceBWB0="; + hash = "sha256-9nOGQTqdO3VzA9c97BpZqqwpll5O5+3gRvF/l2Y2ars="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/anywidget/default.nix b/pkgs/development/python-modules/anywidget/default.nix index e79ac1a6e939a..1420201e97077 100644 --- a/pkgs/development/python-modules/anywidget/default.nix +++ b/pkgs/development/python-modules/anywidget/default.nix @@ -59,6 +59,16 @@ buildPythonPackage rec { disabledTests = [ # requires package.json "test_version" + + # AssertionError: assert not {140737277121872: } + "test_descriptor_with_psygnal" + "test_descriptor_with_pydantic" + "test_descriptor_with_msgspec" + "test_descriptor_with_traitlets" + "test_infer_file_contents" + + # assert not {._disconnect at 0x7ffff3617e... + "test_descriptor_with_psygnal" ]; pythonImportsCheck = [ "anywidget" ]; diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index 73c85297671da..f13ce79961f73 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -62,14 +62,14 @@ buildPythonPackage rec { pname = "apache-beam"; - version = "2.65.0"; + version = "2.66.0"; pyproject = true; src = fetchFromGitHub { owner = "apache"; repo = "beam"; tag = "v${version}"; - hash = "sha256-vDW0PVNep+egIZBe4t8IPwLgsQDmoO4rrA4wUoAHzfg="; + hash = "sha256-nRofy9pvhO5SUvkIk73ViFm1gPWxEhj1rAUeCVYIpYs="; }; pythonRelaxDeps = [ @@ -372,7 +372,7 @@ buildPythonPackage rec { meta = { description = "Unified model for defining both batch and streaming data-parallel processing pipelines"; homepage = "https://beam.apache.org/"; - changelog = "https://github.com/apache/beam/blob/release-${version}/CHANGES.md"; + changelog = "https://github.com/apache/beam/blob/release-${src.tag}/CHANGES.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ ndl ]; }; diff --git a/pkgs/development/python-modules/apischema/default.nix b/pkgs/development/python-modules/apischema/default.nix index e30e9de5c916d..b470b3454d8c2 100644 --- a/pkgs/development/python-modules/apischema/default.nix +++ b/pkgs/development/python-modules/apischema/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, graphql-core, pytest-asyncio, - pytestCheckHook, + pytest8_3CheckHook, pythonOlder, setuptools, }: @@ -37,7 +37,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio - pytestCheckHook + pytest8_3CheckHook ] ++ lib.flatten (builtins.attrValues optional-dependencies); diff --git a/pkgs/development/python-modules/apscheduler/default.nix b/pkgs/development/python-modules/apscheduler/default.nix index ade71286799d2..028df647f83ae 100644 --- a/pkgs/development/python-modules/apscheduler/default.nix +++ b/pkgs/development/python-modules/apscheduler/default.nix @@ -7,7 +7,7 @@ pytest-asyncio, pytest-cov-stub, pytest-tornado, - pytestCheckHook, + pytest8_3CheckHook, pythonOlder, pytz, setuptools, @@ -31,6 +31,10 @@ buildPythonPackage rec { hash = "sha256-tFEm9yXf8CqcipSYtM7JM6WQ5Qm0YtgWhZvZOBAzy+w="; }; + postPatch = '' + sed -i "/addopts/d" pyproject.toml + ''; + build-system = [ setuptools setuptools-scm @@ -45,7 +49,7 @@ buildPythonPackage rec { pytest-asyncio pytest-cov-stub pytest-tornado - pytestCheckHook + pytest8_3CheckHook pytz tornado twisted diff --git a/pkgs/development/python-modules/apycula/default.nix b/pkgs/development/python-modules/apycula/default.nix index d3029efed1bdf..2d882dc92005b 100644 --- a/pkgs/development/python-modules/apycula/default.nix +++ b/pkgs/development/python-modules/apycula/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "apycula"; - version = "0.18"; + version = "0.21"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "Apycula"; - hash = "sha256-nUaXnx4xFNH5wKZRaFXt0uLAgLm5/dTSKhiZQoSL8pg="; + hash = "sha256-rh+1U1bqyrX3Mv1HUl22ykUHx5Zaq59suc7ZVAOi0mo="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/arcam-fmj/default.nix b/pkgs/development/python-modules/arcam-fmj/default.nix index b626683a11886..94ce7ed66adad 100644 --- a/pkgs/development/python-modules/arcam-fmj/default.nix +++ b/pkgs/development/python-modules/arcam-fmj/default.nix @@ -8,6 +8,7 @@ aiohttp, attrs, defusedxml, + pytest-asyncio_0, pytest-aiohttp, pytest-mock, pytestCheckHook, @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "arcam-fmj"; - version = "1.8.2"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "elupus"; repo = "arcam_fmj"; tag = version; - hash = "sha256-iks3ENcv7OtU30kZyG6Z7bG/WrYQQLbfXP55IkltmaE="; + hash = "sha256-OiBTlAcSLhaMWbp5k+0yU1amSpLKnJA+3Q56lyiSDUA="; }; build-system = [ setuptools ]; @@ -36,6 +37,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytest-asyncio_0 pytest-aiohttp pytest-mock pytestCheckHook @@ -65,7 +67,7 @@ buildPythonPackage rec { description = "Python library for speaking to Arcam receivers"; mainProgram = "arcam-fmj"; homepage = "https://github.com/elupus/arcam_fmj"; - changelog = "https://github.com/elupus/arcam_fmj/releases/tag/${version}"; + changelog = "https://github.com/elupus/arcam_fmj/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/aresponses/default.nix b/pkgs/development/python-modules/aresponses/default.nix index 5c8c98177b694..d3557ea7278ee 100644 --- a/pkgs/development/python-modules/aresponses/default.nix +++ b/pkgs/development/python-modules/aresponses/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - pytest-asyncio, + pytest-asyncio_0, pytestCheckHook, setuptools, }: @@ -27,7 +27,7 @@ buildPythonPackage rec { dependencies = [ aiohttp - pytest-asyncio + pytest-asyncio_0 ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/argon2-cffi-bindings/default.nix b/pkgs/development/python-modules/argon2-cffi-bindings/default.nix index 0df49f5835884..2f9c1b7f70b7a 100644 --- a/pkgs/development/python-modules/argon2-cffi-bindings/default.nix +++ b/pkgs/development/python-modules/argon2-cffi-bindings/default.nix @@ -1,38 +1,42 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, libargon2, cffi, setuptools-scm, + pytestCheckHook, }: buildPythonPackage rec { pname = "argon2-cffi-bindings"; - version = "21.2.0"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "bb89ceffa6c791807d1305ceb77dbfacc5aa499891d2c55661c6459651fc39e3"; + version = "25.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "hynek"; + repo = "argon2-cffi-bindings"; + tag = version; + hash = "sha256-UDPxwqEpsmByAPM7lz3cxZz8jWwCEdghPlKXt8zQrfc="; }; buildInputs = [ libargon2 ]; - nativeBuildInputs = [ + build-system = [ setuptools-scm cffi ]; - propagatedBuildInputs = [ cffi ]; + dependencies = [ cffi ]; env.ARGON2_CFFI_USE_SYSTEM = 1; - # tarball doesn't include tests, but the upstream tests are minimal - doCheck = false; + nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "_argon2_cffi_bindings" ]; meta = with lib; { + changelog = "https://github.com/hynek/argon2-cffi-bindings/releases/tag/${src.tag}"; description = "Low-level CFFI bindings for Argon2"; homepage = "https://github.com/hynek/argon2-cffi-bindings"; license = licenses.mit; diff --git a/pkgs/development/python-modules/argon2-cffi/default.nix b/pkgs/development/python-modules/argon2-cffi/default.nix index 2ab26082ad16c..ec4b5a4f9c37a 100644 --- a/pkgs/development/python-modules/argon2-cffi/default.nix +++ b/pkgs/development/python-modules/argon2-cffi/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "argon2-cffi"; - version = "23.1.0"; + version = "25.1.0"; format = "pyproject"; src = fetchPypi { pname = "argon2_cffi"; inherit version; - hash = "sha256-h5w+eaJynOdo67fTbUYJ46eKTKLsOp8SKGygV+PQ2wg="; + hash = "sha256-aUrlzIpC9MTivyyg5k5R4joEDGpReoUHRoPTlZ4TRsE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/argos-translate-files/default.nix b/pkgs/development/python-modules/argos-translate-files/default.nix index be863989ac976..933238b68cbad 100644 --- a/pkgs/development/python-modules/argos-translate-files/default.nix +++ b/pkgs/development/python-modules/argos-translate-files/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "argos-translate-files"; - version = "1.2.0"; + version = "1.4.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-vIwZ2jdrBXtz6gG+Zfgqq6HVfdzmQf7nLqCDaQZT4js="; + hash = "sha256-vKnPL0xgyJ1vYtB2AgnKv4BqigSiFYmIm5HBq4hQ7nI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/array-api-compat/default.nix b/pkgs/development/python-modules/array-api-compat/default.nix index e38443513a144..778fb21a861ad 100644 --- a/pkgs/development/python-modules/array-api-compat/default.nix +++ b/pkgs/development/python-modules/array-api-compat/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, pytestCheckHook, setuptools, + setuptools-scm, numpy, jaxlib, jax, @@ -18,17 +19,20 @@ buildPythonPackage rec { pname = "array-api-compat"; - version = "1.11.2"; + version = "1.12"; pyproject = true; src = fetchFromGitHub { owner = "data-apis"; repo = "array-api-compat"; tag = version; - hash = "sha256-qGf1XDhRx9hJJP0LcZF7lA8tl+LKYNCw0xTqGjsZYj8="; + hash = "sha256-Hb0bFjVMl4CBI3gN3abTO2QUPAOvUaFE0GdPjdops5E="; }; - build-system = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix index 847b9eca0a382..d0dc783b78209 100644 --- a/pkgs/development/python-modules/asdf/default.nix +++ b/pkgs/development/python-modules/asdf/default.nix @@ -1,5 +1,6 @@ { lib, + aiohttp, asdf-standard, asdf-transform-schemas, attrs, @@ -16,6 +17,7 @@ pytestCheckHook, pythonOlder, pyyaml, + requests, semantic-version, setuptools, setuptools-scm, @@ -23,7 +25,7 @@ buildPythonPackage rec { pname = "asdf"; - version = "4.1.0"; + version = "4.3.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +34,7 @@ buildPythonPackage rec { owner = "asdf-format"; repo = "asdf"; tag = version; - hash = "sha256-h7OkLq9+sW507Va22cF0eez6xrI7iIaLV5D7EZFWxJQ="; + hash = "sha256-sCjDZ/6KiFH9LbdDpco8z1xRgJe0dm0HVhpRbO51RDI="; }; build-system = [ @@ -53,11 +55,13 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + aiohttp fsspec lz4 psutil pytest-remotedata pytestCheckHook + requests ]; disabledTests = [ diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 2e82ff76ea46b..645fa378aea73 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.10"; # Check whether the version is compatible with pylint + version = "3.3.11"; # 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-q4ZPXz2xaKJ39q6g1c9agktKSCfbRp+3INDfXg/wP8k="; + hash = "sha256-lv+BQDYP7N4UGMf7XhB6HVDORPU0kZQPYveQWOcAqfQ="; }; nativeBuildInputs = [ setuptools ]; @@ -33,6 +33,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # UserWarning: pkg_resources is deprecated as an API. See https://setuptools.pypa.io/en/latest/pkg_resources.html. + "test_identify_old_namespace_package_protocol" + ]; + disabledTestPaths = [ # requires mypy "tests/test_raw_building.py" diff --git a/pkgs/development/python-modules/astropy-iers-data/default.nix b/pkgs/development/python-modules/astropy-iers-data/default.nix index f9a3e1f5783d1..e7fd9b9ec84f6 100644 --- a/pkgs/development/python-modules/astropy-iers-data/default.nix +++ b/pkgs/development/python-modules/astropy-iers-data/default.nix @@ -2,28 +2,25 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, - setuptools, - setuptools-scm, + hatchling, + hatch-vcs, }: buildPythonPackage rec { pname = "astropy-iers-data"; - version = "0.2025.3.31.0.36.18"; + version = "0.2025.8.4.0.42.59"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "astropy"; repo = "astropy-iers-data"; tag = "v${version}"; - hash = "sha256-51U5QStpzTGwg1MC1NJPMnothjF3Aa7j3dxiRUfnqDE="; + hash = "sha256-Izqm626PZzjnMNUzPW2x15ER7fn5f9+m2X434vXV/yo="; }; build-system = [ - setuptools - setuptools-scm + hatchling + hatch-vcs ]; pythonImportsCheck = [ "astropy_iers_data" ]; diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index bb643c6742ead..d8751b9e6c7dc 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -52,20 +52,16 @@ buildPythonPackage rec { pname = "astropy"; - version = "7.0.1"; + version = "7.1.0"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-OS/utEOyQ3zUwuBkGmXg8VunkeFI6bHl7X3n38s45GA="; + hash = "sha256-yPJUMiKVsbjPJDA9bxVb9+/bbBKCiCuWbOMEDv+MU8U="; }; - patches = [ - ./test_z_at_value_numpyvectorize.patch - ]; - env = lib.optionalAttrs stdenv.cc.isClang { NIX_CFLAGS_COMPILE = "-Wno-error=unused-command-line-argument"; }; diff --git a/pkgs/development/python-modules/astropy/test_z_at_value_numpyvectorize.patch b/pkgs/development/python-modules/astropy/test_z_at_value_numpyvectorize.patch deleted file mode 100644 index 5ffa586d06d57..0000000000000 --- a/pkgs/development/python-modules/astropy/test_z_at_value_numpyvectorize.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 9a7f821351f0870608b2fa3e1be31bda70707913 Mon Sep 17 00:00:00 2001 -From: "P. L. Lim" <2090236+pllim@users.noreply.github.com> -Date: Fri, 2 May 2025 13:49:06 -0400 -Subject: [PATCH] TST: xfail test_z_at_value_numpyvectorize for numpy 2.3.dev - and later until we can fix the underlying issue - -Originally this is -https://github.com/astropy/astropy/commit/9fce0d46c5e1807d7e1030c3cb0b1a9c0a359dd9 -but the path to the file has changed since the release currently in nixpkgs. ---- - astropy/cosmology/_src/tests/funcs/test_funcs.py | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/astropy/cosmology/funcs/tests/test_funcs.py -+++ b/astropy/cosmology/funcs/tests/test_funcs.py -@@ -31,6 +31,7 @@ - ) - from astropy.cosmology._src.funcs.optimize import _z_at_scalar_value - from astropy.units import allclose -+from astropy.utils.compat import NUMPY_LT_2_3 - from astropy.utils.compat.optional_deps import HAS_SCIPY - from astropy.utils.exceptions import AstropyUserWarning - -@@ -173,6 +174,9 @@ def test_scalar_input_to_output(self): - - - @pytest.mark.skipif(not HAS_SCIPY, reason="test requires scipy") -+@pytest.mark.xfail( -+ not NUMPY_LT_2_3, reason="TODO fix: https://github.com/astropy/astropy/issues/18045" -+) - def test_z_at_value_numpyvectorize(): - """Test that numpy vectorize fails on Quantities. - diff --git a/pkgs/development/python-modules/async-modbus/default.nix b/pkgs/development/python-modules/async-modbus/default.nix index 83efbef9a9cb8..dcc5a4247a6ff 100644 --- a/pkgs/development/python-modules/async-modbus/default.nix +++ b/pkgs/development/python-modules/async-modbus/default.nix @@ -4,6 +4,7 @@ connio, fetchFromGitHub, fetchpatch, + pytest-asyncio, pytest-cov-stub, pytestCheckHook, pythonOlder, @@ -46,6 +47,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytest-asyncio pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index 71cc83302b185..76216913df50a 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -81,6 +81,8 @@ buildPythonPackage rec { "test_connect_timeout_exceeded" # Fails in the sandbox "test_forward_remote" + # (2.21.0) SFTP copy ends up with an empty file + "test_copy_max_requests" ]; pythonImportsCheck = [ "asyncssh" ]; diff --git a/pkgs/development/python-modules/asyncua/default.nix b/pkgs/development/python-modules/asyncua/default.nix index 4102aa6bd30f6..6e77e4b1d1b28 100644 --- a/pkgs/development/python-modules/asyncua/default.nix +++ b/pkgs/development/python-modules/asyncua/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "asyncua"; - version = "1.1.5"; + version = "1.1.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "FreeOpcUa"; repo = "opcua-asyncio"; tag = "v${version}"; - hash = "sha256-XXjzYDOEBdA4uk0VCzscHrPCY2Lgin0JBAVDdxmSOio="; + hash = "sha256-GxjEbzPvley0EL7xuZWr1jzR9Lpui1fVL2FOWnRL34Q="; fetchSubmodules = true; }; @@ -83,7 +83,7 @@ buildPythonPackage rec { meta = with lib; { description = "OPC UA / IEC 62541 Client and Server for Python"; homepage = "https://github.com/FreeOpcUa/opcua-asyncio"; - changelog = "https://github.com/FreeOpcUa/opcua-asyncio/releases/tag/v${version}"; + changelog = "https://github.com/FreeOpcUa/opcua-asyncio/releases/tag/${src.tag}"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ harvidsen ]; }; diff --git a/pkgs/development/python-modules/atopile/default.nix b/pkgs/development/python-modules/atopile/default.nix index 87a79f26dbd4c..bd56c72be50cf 100644 --- a/pkgs/development/python-modules/atopile/default.nix +++ b/pkgs/development/python-modules/atopile/default.nix @@ -217,7 +217,7 @@ buildPythonPackage rec { description = "Design circuit boards with code"; homepage = "https://atopile.io"; downloadPage = "https://github.com/atopile/atopile"; - changelog = "https://github.com/atopile/atopile/releases/tag/${src.rev}"; + changelog = "https://github.com/atopile/atopile/releases/tag/${src.tag}"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ sigmanificient ]; mainProgram = "ato"; diff --git a/pkgs/development/python-modules/audioop-lts/default.nix b/pkgs/development/python-modules/audioop-lts/default.nix index 63db1dbfc60b1..726ceca435c06 100644 --- a/pkgs/development/python-modules/audioop-lts/default.nix +++ b/pkgs/development/python-modules/audioop-lts/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "audioop-lts"; - version = "0.2.1"; + version = "0.2.2"; pyproject = true; disabled = pythonOlder "3.13"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "AbstractUmbra"; repo = "audioop"; tag = version; - hash = "sha256-tx5/dcyEfHlYRohfYW/t0UkLiZ9LJHmI8g3sC3+DGAE="; + hash = "sha256-C1z24kH5t0RSVqjT8SBdrilMtVs7pTI1vd+iwMk3RXE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index 18a6d7c98494d..403bf76705e1b 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -18,7 +18,7 @@ pygobject3, pyopenssl, qrcode, - pytest-asyncio, + pytest-asyncio_0, python-snappy, pytestCheckHook, pythonOlder, @@ -35,8 +35,6 @@ buildPythonPackage rec { version = "24.4.2"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "crossbario"; repo = "autobahn-python"; @@ -63,7 +61,7 @@ buildPythonPackage rec { nativeCheckInputs = [ mock - pytest-asyncio + pytest-asyncio_0 pytestCheckHook ] ++ optional-dependencies.scram diff --git a/pkgs/development/python-modules/automat/default.nix b/pkgs/development/python-modules/automat/default.nix index 76bfc2a42dd43..878c37ee03982 100644 --- a/pkgs/development/python-modules/automat/default.nix +++ b/pkgs/development/python-modules/automat/default.nix @@ -2,29 +2,26 @@ lib, buildPythonPackage, fetchPypi, - attrs, + hatch-vcs, pytest-benchmark, pytestCheckHook, - setuptools-scm, - six, + setuptools, }: let automat = buildPythonPackage rec { - version = "24.8.1"; + version = "25.4.16"; format = "pyproject"; pname = "automat"; src = fetchPypi { inherit pname version; - hash = "sha256-s0Inz2P2MluK0jme3ngGdQg+Q5sgwyPTdjc9juYwbYg="; + hash = "sha256-ABdZGlR3Bm6Q0msOaW3cFDuq/Ye1iM+sgQC8a+ljTeA="; }; - nativeBuildInputs = [ setuptools-scm ]; - - propagatedBuildInputs = [ - six - attrs + build-system = [ + setuptools + hatch-vcs ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/avidtools/default.nix b/pkgs/development/python-modules/avidtools/default.nix index 3b58583c4fd25..0326b2add22d3 100644 --- a/pkgs/development/python-modules/avidtools/default.nix +++ b/pkgs/development/python-modules/avidtools/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "avidtools"; - version = "0.1.2"; + version = "0.2.1"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-2YtX+kUryTwaQ4QvExw5OJ4Rx8JoTzBeC8VSyNEL7OY="; + hash = "sha256-rYkA/+YfFhrS/WSx+jUWCsXDjp03aMoMiGdXeK3Kf4M="; }; postPatch = '' diff --git a/pkgs/development/python-modules/awesomeversion/default.nix b/pkgs/development/python-modules/awesomeversion/default.nix index 001ddf58a9a1e..70e9f56b430e6 100644 --- a/pkgs/development/python-modules/awesomeversion/default.nix +++ b/pkgs/development/python-modules/awesomeversion/default.nix @@ -3,14 +3,15 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - poetry-core, + hatchling, + pytest-codspeed, pytest-snapshot, pytestCheckHook, }: buildPythonPackage rec { pname = "awesomeversion"; - version = "24.6.0"; + version = "25.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +20,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = "awesomeversion"; tag = version; - hash = "sha256-lpG42Be0MVinWX5MyDvBPdoZFx66l6tpUxpAJRqEf88="; + hash = "sha256-2CEuJagUkYwtjzpQLYLlz+V5e2feEU6di3wI0+uWuy4="; }; postPatch = '' @@ -28,11 +29,12 @@ buildPythonPackage rec { --replace-fail 'version = "0"' 'version = "${version}"' ''; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ hatchling ]; pythonImportsCheck = [ "awesomeversion" ]; nativeCheckInputs = [ + pytest-codspeed pytest-snapshot pytestCheckHook ]; @@ -40,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to deal with versions"; homepage = "https://github.com/ludeeus/awesomeversion"; - changelog = "https://github.com/ludeeus/awesomeversion/releases/tag/${version}"; + changelog = "https://github.com/ludeeus/awesomeversion/releases/tag/${src.tag}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index ea09c20e51c04..810714b0eba18 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aws-adfs"; - version = "2.11.2"; + version = "2.12.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "venth"; repo = "aws-adfs"; tag = "v${version}"; - hash = "sha256-ZzQ92VBa8CApd0WkfPrUZsEZICK2fhwmt45P2sx2mK0="; + hash = "sha256-TYfKeLe1zp6d5/JPURAcCAfjtaiWHkkmP1+zE+PiiR4="; }; build-system = [ @@ -66,7 +66,7 @@ buildPythonPackage rec { meta = with lib; { description = "Command line tool to ease AWS CLI authentication against ADFS"; homepage = "https://github.com/venth/aws-adfs"; - changelog = "https://github.com/venth/aws-adfs/releases/tag/v${version}"; + changelog = "https://github.com/venth/aws-adfs/releases/tag/${src.tag}"; license = licenses.psfl; maintainers = with maintainers; [ bhipple ]; mainProgram = "aws-adfs"; diff --git a/pkgs/development/python-modules/aws-encryption-sdk/default.nix b/pkgs/development/python-modules/aws-encryption-sdk/default.nix index 178aa2a7d50e4..022132fb579ce 100644 --- a/pkgs/development/python-modules/aws-encryption-sdk/default.nix +++ b/pkgs/development/python-modules/aws-encryption-sdk/default.nix @@ -4,7 +4,7 @@ boto3, buildPythonPackage, cryptography, - fetchPypi, + fetchFromGitHub, mock, pytest-mock, pytestCheckHook, @@ -15,14 +15,16 @@ buildPythonPackage rec { pname = "aws-encryption-sdk"; - version = "4.0.1"; + version = "4.0.2"; pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-cyDcTPjY1am0yIo0O+k4NdoYdW4FMI01NlVL4MooiaU="; + src = fetchFromGitHub { + owner = "aws"; + repo = "aws-encryption-sdk-python"; + tag = "v${version}"; + hash = "sha256-yuehAxVEqnlNMMIqA0imAJaIjV5nzYbQk84l8STtBVo="; }; build-system = [ setuptools ]; @@ -40,6 +42,8 @@ buildPythonPackage rec { pytestCheckHook ]; + enabledTestPaths = [ "test" ]; + disabledTestPaths = [ # Tests require networking "examples" diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index 3f49679b12ae5..8f28fc43296b5 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.53.0"; + version = "1.56.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "awslabs"; repo = "aws-lambda-builders"; tag = "v${version}"; - hash = "sha256-4OiXri1u4co1cuDm7bLyw8XfMg2S3sKrkPWF2tD8zg8="; + hash = "sha256-7fXuDR5AYAtnJapTTJ1QE45aP2l80ao/8RFwM7bgA4w="; }; postPatch = '' @@ -76,7 +76,7 @@ buildPythonPackage rec { description = "Tool to compile, build and package AWS Lambda functions"; mainProgram = "lambda-builders"; homepage = "https://github.com/awslabs/aws-lambda-builders"; - changelog = "https://github.com/aws/aws-lambda-builders/releases/tag/v${version}"; + changelog = "https://github.com/aws/aws-lambda-builders/releases/tag/${src.tag}"; longDescription = '' Lambda Builders is a Python library to compile, build and package AWS Lambda functions for several runtimes & frameworks. diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index e9e46a05b4f00..c9ba2878ef130 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.98.0"; + version = "1.99.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "aws"; repo = "serverless-application-model"; tag = "v${version}"; - hash = "sha256-OfWH1V+F90ukVgan+eZKo00hrOMf/6x6HqxARzFiKHI="; + hash = "sha256-Y82qN2bmzE5Xqz2wSw9lWItsPbsRevLL7FlLN0FGKs0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix index 4b509361fb925..ee6ad97f72074 100644 --- a/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -10,7 +10,7 @@ importlib-metadata, jsonpickle, pymysql, - pytest-asyncio, + pytest-asyncio_0, pynamodb, pytestCheckHook, pythonOlder, @@ -52,7 +52,7 @@ buildPythonPackage rec { httpx pymysql pynamodb - pytest-asyncio + pytest-asyncio_0 pytestCheckHook sqlalchemy webtest @@ -64,6 +64,8 @@ buildPythonPackage rec { # We don't care about benchmarks "tests/test_local_sampling_benchmark.py" "tests/test_patcher.py" + # async def functions are not natively supported. + "tests/test_async_recorder.py" ]; pythonImportsCheck = [ "aws_xray_sdk" ]; diff --git a/pkgs/development/python-modules/awsiotpythonsdk/default.nix b/pkgs/development/python-modules/awsiotpythonsdk/default.nix index 486cfcc86d228..151dabb399cdc 100644 --- a/pkgs/development/python-modules/awsiotpythonsdk/default.nix +++ b/pkgs/development/python-modules/awsiotpythonsdk/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "awsiotpythonsdk"; - version = "1.5.4"; + version = "1.5.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-iot-device-sdk-python"; tag = "v${version}"; - hash = "sha256-TUNIWGal7NQy2qmHVTiw6eX4t/Yt3NnM3HHztBwMfoM="; + hash = "sha256-mgf2hb7dWOGzaHnOQDz7GJeQV3Pa0X56X8nC15Tq0dY="; }; nativeBuildInputs = [ setuptools ]; @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python SDK for connecting to AWS IoT"; homepage = "https://github.com/aws/aws-iot-device-sdk-python"; - changelog = "https://github.com/aws/aws-iot-device-sdk-python/releases/tag/v${version}"; + changelog = "https://github.com/aws/aws-iot-device-sdk-python/releases/tag/${src.tag}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/awswrangler/default.nix b/pkgs/development/python-modules/awswrangler/default.nix index 260bf04247f78..ef33e99adc91c 100644 --- a/pkgs/development/python-modules/awswrangler/default.nix +++ b/pkgs/development/python-modules/awswrangler/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "awswrangler"; - version = "3.12.0"; + version = "3.12.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-sdk-pandas"; tag = version; - hash = "sha256-BudK7pP7b8YJRyDCQAZv8FtxF5paA+AR/ZBt9UO3XjM="; + hash = "sha256-N4IqeAfW4PqgQcBFaFK/Ugbcsz8pLiFzkBr9SRm7AOs="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/azure-ai-vision-imageanalysis/default.nix b/pkgs/development/python-modules/azure-ai-vision-imageanalysis/default.nix index fe71a257941b0..fd508eb915fad 100644 --- a/pkgs/development/python-modules/azure-ai-vision-imageanalysis/default.nix +++ b/pkgs/development/python-modules/azure-ai-vision-imageanalysis/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-ai-vision-imageanalysis"; - version = "1.0.0b3"; + version = "39.0.0"; pyproject = true; src = fetchFromGitHub { owner = "Azure"; repo = "azure-sdk-for-python"; - tag = "azure-ai-vision-imageanalysis_${version}"; - hash = "sha256-Hkj9mrjCc8Li8z6e1BjpzANRVx6+DjN0MhTLANMT78E="; + tag = "azure-mgmt-containerservice_${version}"; + hash = "sha256-zufXc8LR4STHi/jjV0bcLsifcHIif2m+3Q/KZlsSkRw="; }; sourceRoot = "${src.name}/sdk/vision/azure-ai-vision-imageanalysis"; diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index 6bcdd65876ef3..4f4e81311ed05 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -8,6 +8,10 @@ aiohttp, flask, mock, + opentelemetry-api, + opentelemetry-instrumentation, + opentelemetry-instrumentation-requests, + opentelemetry-sdk, pytest, pytest-asyncio, pytest-trio, @@ -20,7 +24,7 @@ }: buildPythonPackage rec { - version = "1.32.0"; + version = "1.35.0"; pname = "azure-core"; pyproject = true; @@ -31,12 +35,12 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_core"; inherit version; - hash = "sha256-IrPDXWstrhSZD2wb4pEr8j/+ULIg5wiiirG7krHHMOU="; + hash = "sha256-wL5ShIlIXp7eWbaXHrY8HqrPg+9TABv+OQTkdelyvlw="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ requests six typing-extensions @@ -44,12 +48,16 @@ buildPythonPackage rec { optional-dependencies = { aio = [ aiohttp ]; + tracing = [ opentelemetry-api ]; }; nativeCheckInputs = [ aiodns flask mock + opentelemetry-instrumentation + opentelemetry-instrumentation-requests + opentelemetry-sdk pytest pytest-trio pytest-asyncio @@ -95,6 +103,10 @@ buildPythonPackage rec { "tests/test_polling.py" "tests/async_tests/test_base_polling_async.py" "tests/async_tests/test_polling_async.py" + # infinite recursion with azure-storage-blob + "tests/async_tests/test_tracing_live_async.py" + "tests/test_serialization.py" + "tests/test_tracing_live.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/azure-datalake-store/default.nix b/pkgs/development/python-modules/azure-datalake-store/default.nix index 1552f1c4b75df..2491d213be6ae 100644 --- a/pkgs/development/python-modules/azure-datalake-store/default.nix +++ b/pkgs/development/python-modules/azure-datalake-store/default.nix @@ -11,14 +11,15 @@ buildPythonPackage rec { pname = "azure-datalake-store"; - version = "0.0.53"; + version = "1.0.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-BbbeYu4/KgpuaUHmkzt5K4AMPn9v/OL8MkvBmHV1c5M="; + pname = "azure_datalake_store"; + inherit version; + hash = "sha256-U2TURFqrFUocfLECFWKcPORs5ceqrxYHGJDAP65ToDU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-eventhub/default.nix b/pkgs/development/python-modules/azure-eventhub/default.nix index 1cfda2439a9e3..814fc18681a12 100644 --- a/pkgs/development/python-modules/azure-eventhub/default.nix +++ b/pkgs/development/python-modules/azure-eventhub/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-eventhub"; - version = "5.15.0"; + version = "39.0.0"; pyproject = true; src = fetchFromGitHub { owner = "Azure"; repo = "azure-sdk-for-python"; - tag = "azure-eventhub_${version}"; - hash = "sha256-zpj1DUeFCXgVw44LcBCYtuFcQtA9BnrDKAxKSYzu4ts="; + tag = "azure-mgmt-containerservice_${version}"; + hash = "sha256-zufXc8LR4STHi/jjV0bcLsifcHIif2m+3Q/KZlsSkRw="; }; sourceRoot = "${src.name}/sdk/eventhub/azure-eventhub"; diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/pkgs/development/python-modules/azure-identity/default.nix index 0844690094f96..ef5a195b1356e 100644 --- a/pkgs/development/python-modules/azure-identity/default.nix +++ b/pkgs/development/python-modules/azure-identity/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "azure-identity"; - version = "1.21.0"; + version = "1.23.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_identity"; inherit version; - hash = "sha256-6iLObmsPQpvBuNkhLVufmHe9TILxckv6kQdgYSwHqaY="; + hash = "sha256-Imwe+YKp+NXc9uD57TXq7ypNlx592GMX6bnVLnCgNeQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-keyvault-keys/default.nix b/pkgs/development/python-modules/azure-keyvault-keys/default.nix index 3e53dd4ce7df0..21cb1fa32c4dd 100644 --- a/pkgs/development/python-modules/azure-keyvault-keys/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-keys/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "azure-keyvault-keys"; - version = "4.10.0"; + version = "4.11.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_keyvault_keys"; inherit version; - hash = "sha256-URIGrpCuwXJqTW/1qS11S9DA8eh1GJE2jTD7cLYpVfE="; + hash = "sha256-8lexkXosOoiYPj9WdaZBlEnrJiMYiI1bUeHLO+15d5o="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-kusto-data/default.nix b/pkgs/development/python-modules/azure-kusto-data/default.nix index 9ef5b0b7d97cd..5fa85ce9827d2 100644 --- a/pkgs/development/python-modules/azure-kusto-data/default.nix +++ b/pkgs/development/python-modules/azure-kusto-data/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "azure-kusto-data"; - version = "4.6.3"; + version = "5.0.5"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "Azure"; repo = "azure-kusto-python"; tag = "v${version}"; - hash = "sha256-VndOEvSi4OMf/yAjNl34X9IFF0T+wNfjlPW8NfdrwUo="; + hash = "sha256-DEHTxSvc6AeBMEJuAiDavFj2xVfPmWKpZBaZcpHWHak="; }; sourceRoot = "${src.name}/${pname}"; diff --git a/pkgs/development/python-modules/azure-kusto-ingest/default.nix b/pkgs/development/python-modules/azure-kusto-ingest/default.nix index b9aa9fac7f944..c59e9a57eb394 100644 --- a/pkgs/development/python-modules/azure-kusto-ingest/default.nix +++ b/pkgs/development/python-modules/azure-kusto-ingest/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "azure-kusto-ingest"; - version = "4.6.3"; + version = "5.0.5"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Azure"; repo = "azure-kusto-python"; tag = "v${version}"; - hash = "sha256-VndOEvSi4OMf/yAjNl34X9IFF0T+wNfjlPW8NfdrwUo="; + hash = "sha256-DEHTxSvc6AeBMEJuAiDavFj2xVfPmWKpZBaZcpHWHak="; }; sourceRoot = "${src.name}/${pname}"; @@ -40,6 +40,11 @@ buildPythonPackage rec { tenacity ]; + pythonRelaxDeps = [ + "azure-storage-blob" + "azure-storage-queue" + ]; + optional-dependencies = { pandas = [ pandas ]; }; diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index cab199d3eaa47..a9466082adce5 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "37.0.0"; + version = "39.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_mgmt_containerservice"; inherit version; - hash = "sha256-F02cVmGhYuxDoK95BbzxHNIJpugARaj0I31TcB0qkTs="; + hash = "sha256-qgAWke3WPQc3S1gggcC7IMi+b/uIWlkqFXfSH0EYqDc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-mgmt-core/default.nix b/pkgs/development/python-modules/azure-mgmt-core/default.nix index d69683337d22c..e9e2eb34c9c22 100644 --- a/pkgs/development/python-modules/azure-mgmt-core/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-core/default.nix @@ -7,7 +7,7 @@ }: buildPythonPackage rec { - version = "1.5.0"; + version = "1.6.0"; format = "setuptools"; pname = "azure-mgmt-core"; @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "azure_mgmt_core"; inherit version; extension = "tar.gz"; - hash = "sha256-OArj36Njn0pcJGp9t+0tCDdOiCMP0No+uJn3wR5cRBo="; + hash = "sha256-smIyr4V7Ah5h2BPZ9K5TBGUlXLELPd6UWtN0P3pY55w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix index eeaeb6fb85b3f..e26a0010caf73 100644 --- a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-mgmt-keyvault"; - version = "11.0.0"; + version = "12.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_mgmt_keyvault"; inherit version; - hash = "sha256-/PsTZoUpJvKjEeG8bmp4brioof1G5gJdTBFO3iy0ZC4="; + hash = "sha256-4s8Y6KSSi10cqxJ75C6prQJG1ofKEvwnoq1mSHzhyGs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix index 6ce2643655de0..575ccb77b5878 100644 --- a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix @@ -5,28 +5,27 @@ buildPythonPackage, fetchPypi, isodate, - pythonOlder, - typing-extensions, + setuptools, }: buildPythonPackage rec { pname = "azure-mgmt-monitor"; - version = "6.0.2"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "7.0.0"; + pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-X/v1AOSZq3kSsbptJs7yZIDZrkEVMgGbt41yViGW4Hs="; + pname = "azure_mgmt_monitor"; + inherit version; + hash = "sha256-t19TZEHUMPaf+HOhZG5fXbyzCAoQdopZ0K3AFUFiOBY="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ isodate azure-common azure-mgmt-core - ] - ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ]; pythonNamespaces = [ "azure.mgmt" ]; diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index d865e6ecf0c80..17e7eb95c2c70 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "azure-mgmt-resource"; - version = "23.4.0"; + version = "24.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_mgmt_resource"; inherit version; - hash = "sha256-fMCQkYS9AUOeJF9fLiCUWjZo1FpndOHwCCJ7szpzPRY="; + hash = "sha256-z2uJlfzdQHrJ/x3UdAhxKUKaHZDbsax3+XwZuWI3smU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-monitor-ingestion/default.nix b/pkgs/development/python-modules/azure-monitor-ingestion/default.nix index c0061f0223013..28a6662641a91 100644 --- a/pkgs/development/python-modules/azure-monitor-ingestion/default.nix +++ b/pkgs/development/python-modules/azure-monitor-ingestion/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + pythonOlder, fetchPypi, setuptools, azure-core, @@ -13,6 +14,8 @@ buildPythonPackage rec { version = "1.1.0"; pyproject = true; + disabled = pythonOlder "3.7"; + src = fetchPypi { pname = "azure_monitor_ingestion"; inherit version; diff --git a/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/pkgs/development/python-modules/azure-multiapi-storage/default.nix index 57ddf17de1ab9..5482d0817956e 100644 --- a/pkgs/development/python-modules/azure-multiapi-storage/default.nix +++ b/pkgs/development/python-modules/azure-multiapi-storage/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "azure-multiapi-storage"; - version = "1.4.1"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_multiapi_storage"; inherit version; - hash = "sha256-INTvVn+1ysQHKRyI0Q4p43Ynyyj2BiBPVMcfaAEDCyg="; + hash = "sha256-g/5BOsU3OzvpxMnySPVNoaXLrmwjb8aq3hetC/jsEWY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix index abe4710cf0c92..491f35a9c797a 100644 --- a/pkgs/development/python-modules/azure-storage-blob/default.nix +++ b/pkgs/development/python-modules/azure-storage-blob/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "azure-storage-blob"; - version = "12.25.1"; + version = "12.26.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_storage_blob"; inherit version; - hash = "sha256-TylN3JvEeQmsZriTS9JrUNIAAnixCtgswQl2T9xuDjs="; + hash = "sha256-XdfXgkIk994Av+sDJ1NgHJgmVRcwYeJC8Tvm4m141x8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-storage-queue/default.nix b/pkgs/development/python-modules/azure-storage-queue/default.nix index dbeb4286bbfea..8e0814f06fa54 100644 --- a/pkgs/development/python-modules/azure-storage-queue/default.nix +++ b/pkgs/development/python-modules/azure-storage-queue/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "azure-storage-queue"; - version = "12.12.0"; + version = "12.13.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_storage_queue"; inherit version; - hash = "sha256-uvLxvIK31PUpGSLD6k8jziJD6ULb50lPyheCKQs38eQ="; + hash = "sha256-JWkeeVjSSXA5JFETTfpUdjf9Lfz95bNHai4VLlaXP4w="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/backoff/default.nix b/pkgs/development/python-modules/backoff/default.nix index a068a640914b9..1d7cb898d2447 100644 --- a/pkgs/development/python-modules/backoff/default.nix +++ b/pkgs/development/python-modules/backoff/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, poetry-core, pytestCheckHook, - pytest-asyncio, + pytest-asyncio_0, responses, }: @@ -23,7 +23,7 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core ]; nativeCheckInputs = [ - pytest-asyncio + pytest-asyncio_0 pytestCheckHook responses ]; diff --git a/pkgs/development/python-modules/backrefs/default.nix b/pkgs/development/python-modules/backrefs/default.nix index ebdd250be81f1..50a8892698e6d 100644 --- a/pkgs/development/python-modules/backrefs/default.nix +++ b/pkgs/development/python-modules/backrefs/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "backrefs"; - version = "5.9"; + version = "6.0.1"; pyproject = true; src = fetchFromGitHub { owner = "facelessuser"; repo = "backrefs"; tag = version; - hash = "sha256-W75JLoBn990PoO3Ej3nb3BjOGm0c71o8hDDBUFWr8i4="; + hash = "sha256-7kB8z8pNU6eLuz4eSYXkSDL5npowlYsm0hjjh8zcAK0="; }; build-system = [ @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = { description = "Wrapper around re or regex that adds additional back references"; homepage = "https://github.com/facelessuser/backrefs"; - changelog = "https://github.com/facelessuser/backrefs/releases/tag/${version}"; + changelog = "https://github.com/facelessuser/backrefs/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/backtesting/default.nix b/pkgs/development/python-modules/backtesting/default.nix index 30465758ac296..3a14296d4fd29 100644 --- a/pkgs/development/python-modules/backtesting/default.nix +++ b/pkgs/development/python-modules/backtesting/default.nix @@ -4,7 +4,6 @@ fetchPypi, setuptools, setuptools-scm, - setuptools-git, numpy, pandas, bokeh, @@ -20,10 +19,14 @@ buildPythonPackage rec { hash = "sha256-c4od7ij8U98u2jXqLy0aHDfdugHfFCI/yeh9gKHvvC4="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "'setuptools_git'," "" + ''; + build-system = [ setuptools setuptools-scm - setuptools-git ]; dependencies = [ diff --git a/pkgs/development/python-modules/badsecrets/default.nix b/pkgs/development/python-modules/badsecrets/default.nix index ce8ce21b8b32d..9acc27351cc51 100644 --- a/pkgs/development/python-modules/badsecrets/default.nix +++ b/pkgs/development/python-modules/badsecrets/default.nix @@ -40,6 +40,8 @@ buildPythonPackage rec { viewstate ]; + pythonRelaxDeps = [ "viewstate" ]; + pythonImportsCheck = [ "badsecrets" ]; meta = { diff --git a/pkgs/development/python-modules/basemap/default.nix b/pkgs/development/python-modules/basemap/default.nix index 0551f450c4e73..415b6addd73b1 100644 --- a/pkgs/development/python-modules/basemap/default.nix +++ b/pkgs/development/python-modules/basemap/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "basemap"; - version = "1.4.1"; + version = "2.0.0"; format = "setuptools"; src = fetchFromGitHub { owner = "matplotlib"; repo = "basemap"; tag = "v${version}"; - hash = "sha256-0rTGsphwLy2yGvhO7bcmFqdgysIXXkDBmURwRVw3ZHY="; + hash = "sha256-1T1FTcR99KbpqiYzrd2r5h1wTcygBEU7BLZXZ8uMthU="; }; sourceRoot = "${src.name}/packages/basemap"; diff --git a/pkgs/development/python-modules/basswood-av/default.nix b/pkgs/development/python-modules/basswood-av/default.nix index 2d9f44b5b5be5..e6588b8962cdf 100644 --- a/pkgs/development/python-modules/basswood-av/default.nix +++ b/pkgs/development/python-modules/basswood-av/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, setuptools, pkg-config, - cython_3_1, + cython, ffmpeg, }: @@ -22,7 +22,7 @@ buildPythonPackage rec { build-system = [ setuptools - cython_3_1 + cython ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/bayesian-optimization/default.nix b/pkgs/development/python-modules/bayesian-optimization/default.nix index 22fc9d78767c2..0de71843bf96e 100644 --- a/pkgs/development/python-modules/bayesian-optimization/default.nix +++ b/pkgs/development/python-modules/bayesian-optimization/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "bayesian-optimization"; - version = "3.0.1"; + version = "3.1.0"; pyproject = true; src = fetchFromGitHub { owner = "bayesian-optimization"; repo = "BayesianOptimization"; tag = "v${version}"; - hash = "sha256-dq5R0/gqjSzQPAmYvtByJ6gT8pOiXcezfYlKpFLnryk="; + hash = "sha256-CYkFobGLlh5cPLwChRWXCow0d5uz8eN5hcRanNMfW8s="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/bc-python-hcl2/default.nix b/pkgs/development/python-modules/bc-python-hcl2/default.nix index 506352b25d322..51e9aa3d8da42 100644 --- a/pkgs/development/python-modules/bc-python-hcl2/default.nix +++ b/pkgs/development/python-modules/bc-python-hcl2/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, lark, pythonOlder, setuptools, @@ -9,14 +9,16 @@ buildPythonPackage rec { pname = "bc-python-hcl2"; - version = "0.4.2"; + version = "0.4.3"; pyproject = true; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - hash = "sha256-rI/1n7m9Q36im4mn18UH/QoelXhFuumurGnyiSuNaB4="; + src = fetchFromGitHub { + owner = "bridgecrewio"; + repo = "python-hcl2"; + tag = version; + hash = "sha256-Auk5xDLw2UhMzWa7YMKzwUSjhD9s6xHt8RcXMzzL8M0="; }; build-system = [ setuptools ]; @@ -34,9 +36,7 @@ buildPythonPackage rec { This parser only supports HCL2 and isn't backwards compatible with HCL v1. It can be used to parse any HCL2 config file such as Terraform. ''; - # Although this is the main homepage from PyPi but it is also a homepage - # of another PyPi package (python-hcl2). But these two are different. - homepage = "https://github.com/amplify-education/python-hcl2"; + homepage = "https://github.com/bridgecrewio/python-hcl2"; license = licenses.mit; maintainers = with maintainers; [ anhdle14 ]; mainProgram = "hcl2tojson"; diff --git a/pkgs/development/python-modules/beanhub-cli/default.nix b/pkgs/development/python-modules/beanhub-cli/default.nix index c9a1f7abe3c81..178476f284b93 100644 --- a/pkgs/development/python-modules/beanhub-cli/default.nix +++ b/pkgs/development/python-modules/beanhub-cli/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pname = "beanhub-cli"; - version = "2.1.1"; + version = "3.0.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -48,7 +48,7 @@ buildPythonPackage rec { owner = "LaunchPlatform"; repo = "beanhub-cli"; tag = version; - hash = "sha256-mGLg6Kgur2LAcujFzO/rkSPAC2t3wR5CO2AeOO0+bFI="; + hash = "sha256-hreVGsptCGW6L3rj6Ec8+lefZWpQ4tZtUEJI+NxTO7w="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/beanhub-extract/default.nix b/pkgs/development/python-modules/beanhub-extract/default.nix index bf21ebb68d4a4..6030be8ee2255 100644 --- a/pkgs/development/python-modules/beanhub-extract/default.nix +++ b/pkgs/development/python-modules/beanhub-extract/default.nix @@ -3,16 +3,16 @@ fetchFromGitHub, buildPythonPackage, pythonOlder, + hatchling, pytestCheckHook, iso8601, - poetry-core, pytest-lazy-fixture, pytz, }: buildPythonPackage rec { pname = "beanhub-extract"; - version = "0.1.5"; + version = "0.1.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,10 +21,10 @@ buildPythonPackage rec { owner = "LaunchPlatform"; repo = "beanhub-extract"; tag = version; - hash = "sha256-L3TM3scBJGlOXXxeJAkiqMkpBmhJZB6b+IQT2DGIfO0="; + hash = "sha256-N4LCMZRPbIzVUPDCW3mAVw6WwpuvxiJmMIoyk8VwXS0="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; pythonRelaxDeps = [ "pytz" ]; @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = { description = "Simple library for extracting all kind of bank account transaction export files, mostly for beanhub-import to ingest and generate transactions"; homepage = "https://github.com/LaunchPlatform/beanhub-extract/"; - changelog = "https://github.com/LaunchPlatform/beanhub-extract/releases/tag/${version}"; + changelog = "https://github.com/LaunchPlatform/beanhub-extract/releases/tag/${src.tag}"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fangpen ]; }; diff --git a/pkgs/development/python-modules/beartype/default.nix b/pkgs/development/python-modules/beartype/default.nix index 2873b74ba566b..1458225ed605c 100644 --- a/pkgs/development/python-modules/beartype/default.nix +++ b/pkgs/development/python-modules/beartype/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "beartype"; - version = "0.19.0"; + version = "0.21.0"; pyproject = true; src = fetchFromGitHub { owner = "beartype"; repo = "beartype"; tag = "v${version}"; - hash = "sha256-uUwqgK7K8x61J7A6S/DGLJljSKABxsbOCsFBDtsameU="; + hash = "sha256-oD7LS+c+mZ8W4YnAaAYxQkbUlmO8E2TPxy0PBI7Jr7A="; }; build-system = [ hatchling ]; @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = { description = "Fast runtime type checking for Python"; homepage = "https://github.com/beartype/beartype"; - changelog = "https://github.com/beartype/beartype/releases/tag/v${version}"; + changelog = "https://github.com/beartype/beartype/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/bentoml/default.nix b/pkgs/development/python-modules/bentoml/default.nix index 57bbfbf1e6c1c..12f5cf61a0c09 100644 --- a/pkgs/development/python-modules/bentoml/default.nix +++ b/pkgs/development/python-modules/bentoml/default.nix @@ -74,7 +74,7 @@ }: let - version = "1.3.20"; + version = "1.4.19"; aws = [ fs-s3fs ]; grpc = [ grpcio @@ -124,7 +124,7 @@ let owner = "bentoml"; repo = "BentoML"; tag = "v${version}"; - hash = "sha256-zc/JvnEEoV21EbBHhLBWvilidXHx1pxYsBYISFg16Us="; + hash = "sha256-sRQfjB3K5F6lYeW92O7BV2slQ+DRCuMTVqRG8vT+9wc="; }; in buildPythonPackage { diff --git a/pkgs/development/python-modules/binsync/default.nix b/pkgs/development/python-modules/binsync/default.nix index 2e396eeb365ee..7883e9b5ed427 100644 --- a/pkgs/development/python-modules/binsync/default.nix +++ b/pkgs/development/python-modules/binsync/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "binsync"; - version = "5.3.0"; + version = "5.5.1"; pyproject = true; src = fetchFromGitHub { owner = "binsync"; repo = "binsync"; tag = "v${version}"; - hash = "sha256-f0pPuNTrZ5+iuJgtxLXJF89C9hKXwplhBA/olyhfsQ4="; + hash = "sha256-C9yIb//h1pAJnlWT4+VgeVzeSjd0sfn8o4yfePNF/YM="; }; build-system = [ setuptools ]; @@ -61,7 +61,7 @@ buildPythonPackage rec { meta = { description = "Reversing plugin for cross-decompiler collaboration, built on git"; homepage = "https://github.com/binsync/binsync"; - changelog = "https://github.com/binsync/binsync/releases/tag/v${version}"; + changelog = "https://github.com/binsync/binsync/releases/tag/${src.tag}"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ scoder12 ]; }; diff --git a/pkgs/development/python-modules/biosppy/default.nix b/pkgs/development/python-modules/biosppy/default.nix index b47e9efba4b23..29d1968731ff7 100644 --- a/pkgs/development/python-modules/biosppy/default.nix +++ b/pkgs/development/python-modules/biosppy/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "biosppy"; - version = "2.2.2"; + version = "2.2.3"; pyproject = true; src = fetchFromGitHub { owner = "scientisst"; repo = "BioSPPy"; tag = "v${version}"; - hash = "sha256-U0ZftAlRlazSO66raH74o/6eP1RpmuFoA6HJ+xmgKR8="; + hash = "sha256-R+3K8r+nzrCiZegxur/rf3/gDGhN9bVNMhlK94SHer0="; }; build-system = [ @@ -64,7 +64,7 @@ buildPythonPackage rec { meta = { description = "Biosignal Processing in Python"; homepage = "https://biosppy.readthedocs.io/"; - changelog = "https://github.com/scientisst/BioSPPy/releases/tag/v${version}"; + changelog = "https://github.com/scientisst/BioSPPy/releases/tag/${src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ genga898 ]; }; diff --git a/pkgs/development/python-modules/bitbox02/default.nix b/pkgs/development/python-modules/bitbox02/default.nix index 69b2b258e1f22..62c9ca5edcc1a 100644 --- a/pkgs/development/python-modules/bitbox02/default.nix +++ b/pkgs/development/python-modules/bitbox02/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "bitbox02"; - version = "6.3.0"; + version = "7.0.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0D+yIovlYw8dfDUeW+vcualbvmLs+IySkTpmHwk2meM="; + hash = "sha256-J9UQXrFaVTcZ+p0+aJIchksAyGGzpkQETZrGhCbxhEc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/bitsandbytes/default.nix b/pkgs/development/python-modules/bitsandbytes/default.nix index 14299f664c4b7..6dd1b0bd30a52 100644 --- a/pkgs/development/python-modules/bitsandbytes/default.nix +++ b/pkgs/development/python-modules/bitsandbytes/default.nix @@ -11,7 +11,7 @@ let pname = "bitsandbytes"; - version = "0.46.0"; + version = "0.46.1"; inherit (torch) cudaPackages cudaSupport; inherit (cudaPackages) cudaMajorMinorVersion; @@ -57,7 +57,7 @@ buildPythonPackage { owner = "bitsandbytes-foundation"; repo = "bitsandbytes"; tag = version; - hash = "sha256-q1ltNYO5Ex6F2bfCcsekdsWjzXoal7g4n/LIHVGuj+k="; + hash = "sha256-CAGKp8aFp1GjJ1uR+O1Ptxr8wfz1zECCEWhWMYs3zEQ="; }; # By default, which library is loaded depends on the result of `torch.cuda.is_available()`. diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index 2dbdeb9906afd..70fac527e59e0 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -3,6 +3,7 @@ lib, buildPythonPackage, fetchPypi, + fetchpatch, pythonOlder, pytestCheckHook, aiohttp, @@ -35,6 +36,24 @@ buildPythonPackage rec { hash = "sha256-M0ltXNEiKtczkTUrSujaFSU8Xeibk6gLPiyNmhnsJmY="; }; + patches = [ + (fetchpatch { + name = "click-8.2-compat-1.patch"; + url = "https://github.com/psf/black/commit/14e1de805a5d66744a08742cad32d1660bf7617a.patch"; + hash = "sha256-fHRlMetE6+09MKkuFNQQr39nIKeNrqwQuBNqfIlP4hc="; + }) + (fetchpatch { + name = "click-8.2-compat-2.patch"; + url = "https://github.com/psf/black/commit/ed64d89faa7c738c4ba0006710f7e387174478af.patch"; + hash = "sha256-df/J6wiRqtnHk3mAY3ETiRR2G4hWY1rmZMfm2rjP2ZQ="; + }) + (fetchpatch { + name = "click-8.2-compat-3.patch"; + url = "https://github.com/psf/black/commit/b0f36f5b4233ef4cf613daca0adc3896d5424159.patch"; + hash = "sha256-SGLCxbgrWnAi79IjQOb2H8mD/JDbr2SGfnKyzQsJrOA="; + }) + ]; + nativeBuildInputs = [ hatch-fancy-pypi-readme hatch-vcs diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index 6a558e4aa620b..6ec575619579d 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Bluetooth Low Energy platform agnostic client"; homepage = "https://github.com/hbldh/bleak"; - changelog = "https://github.com/hbldh/bleak/blob/v${version}/CHANGELOG.rst"; + changelog = "https://github.com/hbldh/bleak/blob/${src.tag}/CHANGELOG.rst"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ oxzi ]; diff --git a/pkgs/development/python-modules/blessed/default.nix b/pkgs/development/python-modules/blessed/default.nix index 6bb56aaab30e4..2e416b2403eb8 100644 --- a/pkgs/development/python-modules/blessed/default.nix +++ b/pkgs/development/python-modules/blessed/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "blessed"; - version = "1.20.0"; + version = "1.21.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-LN1n+HRuBI8A30eiiA9NasvNs5kDG2BONLqPcdV4doA="; + hash = "sha256-7Oi7xHWKuRdkUvTjpxnXAIjrVzl5jNVYLJ4F8qKDN+w="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index 0aabdaea5196f..c77191f806f3e 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -67,6 +67,11 @@ buildPythonPackage rec { rm -rf ./blis ''; + disabledTestPaths = [ + # ImportError: cannot import name 'NO_CONJUGATE' from 'blis.cy' + "tests/test_dotv.py" + ]; + passthru = { tests = { numpy_1 = blis.overridePythonAttrs (old: { diff --git a/pkgs/development/python-modules/blockbuster/default.nix b/pkgs/development/python-modules/blockbuster/default.nix index 0560a02915a63..821764d5dcf05 100644 --- a/pkgs/development/python-modules/blockbuster/default.nix +++ b/pkgs/development/python-modules/blockbuster/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "blockbuster"; - version = "1.5.23"; + version = "1.5.25"; pyproject = true; src = fetchFromGitHub { owner = "cbornet"; repo = "blockbuster"; tag = "v${version}"; - hash = "sha256-AxRnP8/fIae5ovWQVpfs3ZLIIkxXqVZmuhGjPTX5B/g="; + hash = "sha256-1+Q1IdJXqLAy7kIcVU38TC3dtMeWAn7YOLyGrjCkxD0="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/boost-histogram/default.nix b/pkgs/development/python-modules/boost-histogram/default.nix index 11e569659ab84..667d5e177ebd3 100644 --- a/pkgs/development/python-modules/boost-histogram/default.nix +++ b/pkgs/development/python-modules/boost-histogram/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "boost-histogram"; - version = "1.5.1"; + version = "1.5.2"; pyproject = true; src = fetchFromGitHub { owner = "scikit-hep"; repo = "boost-histogram"; tag = "v${version}"; - hash = "sha256-7E4y3P3RzVmIHb5mEoEYWZSwWnmL3LbGqYjGbnszM98="; + hash = "sha256-fWbvv9MiBZZiTZLu78tMR5Cx0/7xSuVIya3dkuahPE4="; }; nativeBuildInputs = [ cmake ]; @@ -69,7 +69,7 @@ buildPythonPackage rec { meta = { description = "Python bindings for the C++14 Boost::Histogram library"; homepage = "https://github.com/scikit-hep/boost-histogram"; - changelog = "https://github.com/scikit-hep/boost-histogram/releases/tag/v${version}"; + changelog = "https://github.com/scikit-hep/boost-histogram/releases/tag/${src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ veprbl ]; }; diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 39b5dd0c3cadd..05ba5ae02f3b8 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "boto"; repo = "boto3"; tag = version; - hash = "sha256-3NK9xp58w+Wrhs/i7eXLF/P9Dwadptrr4LlpV6MRbGM="; + hash = "sha256-+3UcnKgDIA9PPELnB70La+Lo03SMouVLzvLQ9zyFGsE="; }; build-system = [ diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 742b4bc893d86..49a89d8e3253f 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.38.32"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.40.4"; # N.B: if you change this, change boto3 and awscli to a matching version pyproject = true; src = fetchFromGitHub { owner = "boto"; repo = "botocore"; tag = version; - hash = "sha256-KW9EAeunL3+pccGsrFitonc5EHdm2Cd+7dM3kdvdkvM="; + hash = "sha256-VJAd9aCJkwSyurAWF/YAVRcSTR+9ZbkH7H6LZGvcXYY="; }; build-system = [ diff --git a/pkgs/development/python-modules/bottle/default.nix b/pkgs/development/python-modules/bottle/default.nix index 5d7a8d100f24f..72df474668ac2 100644 --- a/pkgs/development/python-modules/bottle/default.nix +++ b/pkgs/development/python-modules/bottle/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "bottle"; - version = "0.13.3"; + version = "0.13.4"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-HCOuswqooT85xgwNpJRTDd1d49ojW8QxuBilDZmd5J8="; + hash = "sha256-eH54Mn4SsieTjeAiSDM9eIz+RZh+3Kc1+PiOA0csP0c="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/brevo-python/default.nix b/pkgs/development/python-modules/brevo-python/default.nix index 965fcdfee708c..746776e97ca96 100644 --- a/pkgs/development/python-modules/brevo-python/default.nix +++ b/pkgs/development/python-modules/brevo-python/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "brevo-python"; - version = "1.1.2"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "getbrevo"; repo = "brevo-python"; tag = "v${version}"; - hash = "sha256-XOUFyUrqVlI7Qr4uzeXr6GJuQ+QTVhsueT1xxVQMm14="; + hash = "sha256-VYj1r69pgKgNCXzxRqvwlj5w+y3IIu21bsZJAe/7zf8="; }; build-system = [ setuptools ]; @@ -35,6 +35,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTestPaths = [ + # broken import; https://github.com/getbrevo/brevo-python/issues/2 + "test/test_configuration.py" + ]; + pythonImportsCheck = [ "brevo_python" ]; meta = { diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index 5d9294e1b658d..665094952cc10 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "3.13.1"; + version = "3.14.0"; pyproject = true; src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = "bthome-ble"; tag = "v${version}"; - hash = "sha256-oGFjWe9e386EPAJGKL8Qk55iXoyW3rXuyG7ElyQYurg="; + hash = "sha256-1jgrE7EwYJPb/F5gIXmRFU3xBG00tIXRA8BsE20Tw6Y="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix index ae2fe86d38f60..61a426b2cf28b 100644 --- a/pkgs/development/python-modules/build/default.nix +++ b/pkgs/development/python-modules/build/default.nix @@ -21,26 +21,21 @@ buildPythonPackage rec { pname = "build"; - version = "1.2.2.post1"; - format = "pyproject"; - - disabled = pythonOlder "3.7"; + version = "1.3.0"; + pyproject = true; src = fetchFromGitHub { owner = "pypa"; repo = "build"; - rev = "refs/tags/${version}"; - hash = "sha256-PHS7CjdKo5u4VTpbo409zLQAOmslV9bX0j0S83Gdv1U="; + tag = version; + hash = "sha256-w2YKQzni8e6rpnQJH2J0bHzRigjWOlWiI8Po5d3ZqS8="; }; - postPatch = '' - # not strictly required, causes circular dependency cycle - sed -i '/importlib-metadata >= 4.6/d' pyproject.toml - ''; + build-system = [ flit-core ]; - nativeBuildInputs = [ flit-core ]; + pythonRemoveDeps = [ "importlib-metadata" ]; - propagatedBuildInputs = [ + dependencies = [ packaging pyproject-hooks ] @@ -107,7 +102,7 @@ buildPythonPackage rec { is a simple build tool and does not perform any dependency management. ''; homepage = "https://github.com/pypa/build"; - changelog = "https://github.com/pypa/build/blob/${version}/CHANGELOG.rst"; + changelog = "https://github.com/pypa/build/blob/${src.tag}/CHANGELOG.rst"; license = licenses.mit; maintainers = [ maintainers.fab ]; teams = [ teams.python ]; diff --git a/pkgs/development/python-modules/buildcatrust/default.nix b/pkgs/development/python-modules/buildcatrust/default.nix index cc2b5b5a29469..c8d57ce480329 100644 --- a/pkgs/development/python-modules/buildcatrust/default.nix +++ b/pkgs/development/python-modules/buildcatrust/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "buildcatrust"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Ac10CZdihFBmr5LE6xFKx4+zr2n5nyR23px6N4vN05M="; + hash = "sha256-GYw/RN1OK5fqo3em8hia2l/IwN76hnPnFuYprqeX144="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix index 0070effd7a0a1..c9ffdad6bb8f0 100644 --- a/pkgs/development/python-modules/bumps/default.nix +++ b/pkgs/development/python-modules/bumps/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "bumps"; - version = "0.9.3"; + version = "1.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MpUpj3/hsjkrsv+Ix6Cuadd6dpivWAqBVwBSygW6Uw8="; + hash = "sha256-YfnBA1rCD05B4XOS611qgi4ab3xKoYs108mwhj/I+sg="; }; # Module has no tests diff --git a/pkgs/development/python-modules/busylight-for-humans/default.nix b/pkgs/development/python-modules/busylight-for-humans/default.nix index f60436f64846d..1cbb1d14136c9 100644 --- a/pkgs/development/python-modules/busylight-for-humans/default.nix +++ b/pkgs/development/python-modules/busylight-for-humans/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "busylight-for-humans"; - version = "0.35.2"; + version = "0.37.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "JnyJny"; repo = "busylight"; tag = "v${version}"; - hash = "sha256-0jmaVMN4wwqoO5wGMaV4kJefNUPOuJpWbsqHcZZ0Nh4="; + hash = "sha256-uKuQy4ce6WTTpprAbQ6QE7WlotMlVacaDZ+dsvY1N58="; }; build-system = [ poetry-core ]; @@ -58,7 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Control USB connected presence lights from multiple vendors via the command-line or web API"; homepage = "https://github.com/JnyJny/busylight"; - changelog = "https://github.com/JnyJny/busylight/releases/tag/${version}"; + changelog = "https://github.com/JnyJny/busylight/releases/tag/${src.tag}"; license = licenses.asl20; teams = [ teams.helsinki-systems ]; mainProgram = "busylight"; diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index 4411b9c91bf19..39923013689a0 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "cachetools"; - version = "5.5.2"; + version = "6.1.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "tkem"; repo = "cachetools"; tag = "v${version}"; - hash = "sha256-CWgl2UW7+rBXRQ6N/QY3vJiLsrPfmplmQbxPp2vcdU0="; + hash = "sha256-o3Ice6w7Ovot+nsmTpsl/toosZuVbi9RvRGs07W4H0Y="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/cachier/default.nix b/pkgs/development/python-modules/cachier/default.nix index dc6371f50c5c8..60f46103311d3 100644 --- a/pkgs/development/python-modules/cachier/default.nix +++ b/pkgs/development/python-modules/cachier/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "cachier"; - version = "3.1.2"; + version = "4.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "python-cachier"; repo = "cachier"; tag = "v${version}"; - hash = "sha256-siighT6hMicN+F/LIXfUAPQ2kkRiyk7CtjqmyC/qCFg="; + hash = "sha256-FmrwH5Ksmgt0HA5eUN5LU36P5sY4PymRKsUWVkQlvBo="; }; pythonRemoveDeps = [ "setuptools" ]; @@ -80,7 +80,7 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/python-cachier/cachier"; - changelog = "https://github.com/python-cachier/cachier/releases/tag/v${version}"; + changelog = "https://github.com/python-cachier/cachier/releases/tag/${src.tag}"; description = "Persistent, stale-free, local and cross-machine caching for functions"; mainProgram = "cachier"; maintainers = with lib.maintainers; [ pbsds ]; diff --git a/pkgs/development/python-modules/caio/default.nix b/pkgs/development/python-modules/caio/default.nix index ae4a109528680..be7dbc35ee8a1 100644 --- a/pkgs/development/python-modules/caio/default.nix +++ b/pkgs/development/python-modules/caio/default.nix @@ -5,7 +5,8 @@ buildPythonPackage, fetchFromGitHub, pytest-aiohttp, - pytestCheckHook, + pytest-asyncio_0, + pytest8_3CheckHook, pythonOlder, setuptools, }: @@ -28,8 +29,8 @@ buildPythonPackage rec { nativeCheckInputs = [ aiomisc - pytest-aiohttp - pytestCheckHook + (pytest-aiohttp.override { pytest-asyncio = pytest-asyncio_0; }) + pytest8_3CheckHook ]; env.NIX_CFLAGS_COMPILE = toString ( diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix index 99a18e14a4986..bbff613096a2b 100644 --- a/pkgs/development/python-modules/caldav/default.nix +++ b/pkgs/development/python-modules/caldav/default.nix @@ -5,33 +5,35 @@ icalendar, lxml, pytestCheckHook, - pythonOlder, python, recurring-ical-events, requests, - setuptools, - setuptools-scm, + hatchling, + hatch-vcs, + proxy-py, + pyfakefs, toPythonModule, tzlocal, vobject, xandikos, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "caldav"; - version = "1.6.0"; + version = "2.0.1"; pyproject = true; src = fetchFromGitHub { owner = "python-caldav"; repo = "caldav"; tag = "v${version}"; - hash = "sha256-SWecaXiXp8DSOLVWzgPsbL7UGCtTBfNXYmuDQGdyqbQ="; + hash = "sha256-n7ZKTBXg66firbS34J41NrTM/PL/OrKMnS4iguRz4Ho="; }; build-system = [ - setuptools - setuptools-scm + hatchling + hatch-vcs ]; dependencies = [ @@ -43,9 +45,17 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + proxy-py + pyfakefs pytestCheckHook tzlocal (toPythonModule (xandikos.override { python3Packages = python.pkgs; })) + writableTmpDirAsHomeHook + ]; + + disabledTestPaths = [ + "tests/test_docs.py" + "tests/test_examples.py" ]; pythonImportsCheck = [ "caldav" ]; @@ -53,7 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "CalDAV (RFC4791) client library"; homepage = "https://github.com/python-caldav/caldav"; - changelog = "https://github.com/python-caldav/caldav/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/python-caldav/caldav/blob/${src.tag}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ marenz diff --git a/pkgs/development/python-modules/canonical-sphinx-extensions/default.nix b/pkgs/development/python-modules/canonical-sphinx-extensions/default.nix index d87c3c5dd876c..c4c8d9dab4084 100644 --- a/pkgs/development/python-modules/canonical-sphinx-extensions/default.nix +++ b/pkgs/development/python-modules/canonical-sphinx-extensions/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "canonical-sphinx-extensions"; - version = "0.0.27"; + version = "0.0.33"; pyproject = true; src = fetchPypi { pname = "canonical_sphinx_extensions"; inherit version; - hash = "sha256-ZorSmn+PAVS8xO7X3zk6u3W7pn3JB9w0PhFAXzv6l78="; + hash = "sha256-Rb4FK1e0pb+fub58Fq61i3kMhRm/nekHNr91zft8iJY="; }; build-system = [ diff --git a/pkgs/development/python-modules/cantools/default.nix b/pkgs/development/python-modules/cantools/default.nix index 2710187e569d7..2fd9f9b31bab2 100644 --- a/pkgs/development/python-modules/cantools/default.nix +++ b/pkgs/development/python-modules/cantools/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "cantools"; - version = "40.2.3"; + version = "40.3.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-PFXL19fVJ6VluYEj+7uPXfCRMvdM63Iv9UH9gLWZFCQ="; + hash = "sha256-xucuPUaMi3ECi+vPR3MFcE74F95eTWlGS/CNIoi+gSU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cattrs/default.nix b/pkgs/development/python-modules/cattrs/default.nix index ee3d8559806f1..9d635cd1c9bb6 100644 --- a/pkgs/development/python-modules/cattrs/default.nix +++ b/pkgs/development/python-modules/cattrs/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, cbor2, fetchFromGitHub, - fetchpatch2, exceptiongroup, hatchling, hatch-vcs, @@ -26,34 +25,16 @@ buildPythonPackage rec { pname = "cattrs"; - version = "24.1.3"; + version = "25.1.1"; pyproject = true; src = fetchFromGitHub { owner = "python-attrs"; repo = "cattrs"; tag = "v${version}"; - hash = "sha256-yrrb2Lvq7zMzeOLr8wwxVsKmPYEZxzDKR2mnCMNuHdE="; + hash = "sha256-kaB/UJcd4E4PUkz6mD53lXtmj4Z4P+Tuu7bSljYVOO4="; }; - patches = [ - # https://github.com/python-attrs/cattrs/pull/576 - (fetchpatch2 { - name = "attrs-24_2-compatibility1.patch"; - url = "https://github.com/python-attrs/cattrs/commit/2d37226ff19506e23bbc291125a29ce514575819.patch"; - excludes = [ - "pyproject.toml" - "pdm.lock" - ]; - hash = "sha256-nbk7rmOFk42DXYdOgw4Oe3gl3HbxNEtaJ7ZiVSBb3YA="; - }) - (fetchpatch2 { - name = "attrs-24_2-compatibility2.patch"; - url = "https://github.com/python-attrs/cattrs/commit/4bd6dde556042241c6381e1993cedd6514921f58.patch"; - hash = "sha256-H1xSAYjvVUI8/jON3LWg2F2TlSxejf6TU1jpCeqly6I="; - }) - ]; - build-system = [ hatchling hatch-vcs @@ -61,10 +42,10 @@ buildPythonPackage rec { dependencies = [ attrs + typing-extensions ] ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup - typing-extensions ]; nativeCheckInputs = [ @@ -79,7 +60,6 @@ buildPythonPackage rec { pytestCheckHook pyyaml tomlkit - typing-extensions ujson ]; @@ -117,7 +97,7 @@ buildPythonPackage rec { meta = { description = "Python custom class converters for attrs"; homepage = "https://github.com/python-attrs/cattrs"; - changelog = "https://github.com/python-attrs/cattrs/blob/${src.rev}/HISTORY.md"; + changelog = "https://github.com/python-attrs/cattrs/blob/${src.tag}/HISTORY.md"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/causal-conv1d/default.nix b/pkgs/development/python-modules/causal-conv1d/default.nix index 924cc8b07df3f..ffc494ce6ff30 100644 --- a/pkgs/development/python-modules/causal-conv1d/default.nix +++ b/pkgs/development/python-modules/causal-conv1d/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "causal-conv1d"; - version = "1.5.0.post8"; + version = "1.5.2"; pyproject = true; src = fetchFromGitHub { owner = "Dao-AILab"; repo = "causal-conv1d"; tag = "v${version}"; - hash = "sha256-CuDAEjRG6NGCoYx5r8pFVnec+3Pqh8ZldzTVx09N6E0="; + hash = "sha256-B2I5QiJl0p5d1BeQcMbJBAYUb10HzqFd88QMM8Rerm0="; }; build-system = [ diff --git a/pkgs/development/python-modules/celery-redbeat/default.nix b/pkgs/development/python-modules/celery-redbeat/default.nix index f79f5e94b4bfc..c8d04153df738 100644 --- a/pkgs/development/python-modules/celery-redbeat/default.nix +++ b/pkgs/development/python-modules/celery-redbeat/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "celery-redbeat"; - version = "2.3.2"; + version = "2.3.3"; format = "setuptools"; src = fetchFromGitHub { owner = "sibson"; repo = "redbeat"; tag = "v${version}"; - hash = "sha256-nUVioETVIAjLPOmhBSf+bOUsYuV1C1VGwHz5KjbIjHc="; + hash = "sha256-bptEAOVxuwj9Y7LyBhtMU22Z1uCiJ4O4BZT2ytqQI80="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index 08cb1c05d5e5f..0bb466a705b50 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "certbot"; - version = "4.0.0"; + version = "4.1.1"; pyproject = true; src = fetchFromGitHub { owner = "certbot"; repo = "certbot"; tag = "v${version}"; - hash = "sha256-GS4JLLXrX4+BQ4S6ySbOHUaUthCFYTCHWnOaMpfnIj8="; + hash = "sha256-nlNjBbXd4ujzVx10+UwqbXliuLVVf+UHR8Dl5CQzsZo="; }; postPatch = "cd certbot"; # using sourceRoot would interfere with patches @@ -66,6 +66,11 @@ buildPythonPackage rec { "-Wignore::DeprecationWarning" ]; + disabledTests = [ + # network access + "test_lock_order" + ]; + makeWrapperArgs = [ "--prefix PATH : ${dialog}/bin" ]; # certbot.withPlugins has a similar calling convention as python*.withPackages diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix index 7d4704c7917a4..30ffb8552e6c4 100644 --- a/pkgs/development/python-modules/certifi/default.nix +++ b/pkgs/development/python-modules/certifi/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "certifi"; - version = "2025.06.15"; + version = "2025.07.14"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "certifi"; repo = "python-certifi"; rev = version; - hash = "sha256-ah2a+Qspll3jZ8M7CRL7zhTIt2kuRIiWeI6vTgwb3vs="; + hash = "sha256-TSqBca42i7i59ERTrnPN0fLdLWToYMCq5cfFFsgZm5U="; }; patches = [ diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index b13885318ae27..1f3434430a7c5 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "1.32.1"; + version = "1.38.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "aws-cloudformation"; repo = "cfn-lint"; tag = "v${version}"; - hash = "sha256-s0CYQ6r3rA1PEiZ9LLFL3RC2PdfCgZHTqQ9nZUi1m+Q="; + hash = "sha256-oHbTB4XOyYSazyhO6No2+Z9QRR8tnuB3E4kGzG1HwTk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/cgen/default.nix b/pkgs/development/python-modules/cgen/default.nix index 186422a49c34c..0821e5fc84adf 100644 --- a/pkgs/development/python-modules/cgen/default.nix +++ b/pkgs/development/python-modules/cgen/default.nix @@ -2,30 +2,32 @@ lib, buildPythonPackage, fetchPypi, + hatchling, pytools, numpy, - pytest, + typing-extensions, + pytestCheckHook, }: buildPythonPackage rec { pname = "cgen"; - version = "2020.1"; - format = "setuptools"; + version = "2025.1"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "4ec99d0c832d9f95f5e51dd18a629ad50df0b5464ce557ef42c6e0cd9478bfcf"; + hash = "sha256-efAeAQ1JwT5YtMqPLUmWprcXiWj18tkGJiczSArnotQ="; }; - nativeCheckInputs = [ pytest ]; - propagatedBuildInputs = [ + build-system = [ hatchling ]; + + dependencies = [ pytools numpy + typing-extensions ]; - checkPhase = '' - pytest - ''; + nativeCheckInputs = [ pytestCheckHook ]; meta = { description = "C/C++ source generation from an AST"; diff --git a/pkgs/development/python-modules/checkdmarc/default.nix b/pkgs/development/python-modules/checkdmarc/default.nix index 2f7c6473fc940..fcf750f683956 100644 --- a/pkgs/development/python-modules/checkdmarc/default.nix +++ b/pkgs/development/python-modules/checkdmarc/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "checkdmarc"; - version = "5.8.1"; + version = "5.8.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "domainaware"; repo = "checkdmarc"; tag = version; - hash = "sha256-mdEfVfqK277A8QUc8rpLxS2pfdyg4Z5XqWpWkh9mFLk="; + hash = "sha256-MlHRBedBbcFbVga5q0havdD6M/YOlFW8SX0k1tRngmc="; }; pythonRelaxDeps = [ "xmltodict" ]; diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index ee502767a1174..31ee288bbc22a 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -68,6 +68,7 @@ buildPythonPackage rec { pytestFlags = [ "-Wignore::DeprecationWarning" + "-Wignore::pytest.PytestUnraisableExceptionWarning" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/cirq-core/default.nix b/pkgs/development/python-modules/cirq-core/default.nix index 7391d45631454..f0962e14788a6 100644 --- a/pkgs/development/python-modules/cirq-core/default.nix +++ b/pkgs/development/python-modules/cirq-core/default.nix @@ -37,14 +37,14 @@ buildPythonPackage rec { pname = "cirq-core"; - version = "1.5.0"; + version = "1.6.0"; pyproject = true; src = fetchFromGitHub { owner = "quantumlib"; repo = "cirq"; tag = "v${version}"; - hash = "sha256-4FgXX4ox7BkjmLecxsvg0/JpcrHPn6hlFw5rk4bn9Cc="; + hash = "sha256-LlWv4wWQWZsTB9JXS21O1WkIYhKkJwY5SM70hnzfnDQ="; }; sourceRoot = "${src.name}/${pname}"; @@ -105,7 +105,7 @@ buildPythonPackage rec { meta = { description = "Framework for creating, editing, and invoking Noisy Intermediate Scale Quantum (NISQ) circuits"; homepage = "https://github.com/quantumlib/cirq"; - changelog = "https://github.com/quantumlib/Cirq/releases/tag/v${version}"; + changelog = "https://github.com/quantumlib/Cirq/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ drewrisinger diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix index 632a7d39c118c..84a99d7ff11dd 100644 --- a/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "11.5.5"; + version = "11.6.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python-grpc"; tag = version; - hash = "sha256-ijfuZh35HpmR3p7n2S+cCpcO4ld52StQOpxgPJtRqM4="; + hash = "sha256-/LCTiGJOdvMp+I/Gl0iySMg5MTPjBi3FatnkfifFkG0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix index 433df5084cb54..f0cd9a2468f2c 100644 --- a/pkgs/development/python-modules/clarifai/default.nix +++ b/pkgs/development/python-modules/clarifai/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "clarifai"; - version = "11.0.5"; + version = "11.6.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python"; tag = version; - hash = "sha256-JLZGVVrvGVUWr7WCTu2alVl+4GuYqLWP2dodgxYbmgc="; + hash = "sha256-1ftwsIKJ494F8q45x0LtvOZhM72AAhJWe0LligNNpkQ="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix index 9655cd1907584..fdd1962b5c873 100644 --- a/pkgs/development/python-modules/cli-helpers/default.nix +++ b/pkgs/development/python-modules/cli-helpers/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "cli-helpers"; - version = "2.4.0"; + version = "2.7.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "cli_helpers"; inherit version; - hash = "sha256-VZA7cFohKkc3Mdsg+ib1hlXjVAeLmcsTyZ7AaUAoek0="; + hash = "sha256-YtEXENvrwvxGAAPeEhVogyXYY2hZBW1oizhBm9QEi8A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/click-plugins/default.nix b/pkgs/development/python-modules/click-plugins/default.nix index bf4a347b92d71..2a5d4ccd334f9 100644 --- a/pkgs/development/python-modules/click-plugins/default.nix +++ b/pkgs/development/python-modules/click-plugins/default.nix @@ -4,19 +4,23 @@ fetchPypi, click, pytest, + setuptools, }: buildPythonPackage rec { pname = "click-plugins"; - version = "1.1.1"; - format = "setuptools"; + version = "1.1.1.2"; + pyproject = true; src = fetchPypi { - inherit pname version; - sha256 = "46ab999744a9d831159c3411bb0c79346d94a444df9a3a3742e9ed63645f264b"; + pname = "click_plugins"; + inherit version; + sha256 = "sha256-1685hKmdJDwTGqGoKDMedjD0qIqXQf0FySeyBLz5ImE="; }; - propagatedBuildInputs = [ click ]; + build-system = [ setuptools ]; + + dependencies = [ click ]; nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/click-shell/default.nix b/pkgs/development/python-modules/click-shell/default.nix index 5f4536439d3eb..fa95216a32672 100644 --- a/pkgs/development/python-modules/click-shell/default.nix +++ b/pkgs/development/python-modules/click-shell/default.nix @@ -5,15 +5,14 @@ click, pytestCheckHook, pytest-click, - setuptools, - writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "click-shell"; version = "2.1"; - pyproject = true; + format = "setuptools"; + # PyPi release is missing tests src = fetchFromGitHub { owner = "clarkperkins"; repo = "click-shell"; @@ -21,18 +20,17 @@ buildPythonPackage rec { hash = "sha256-4QpQzg0yFuOFymGiTI+A8o6LyX78iTJMqr0ernYbilI="; }; - build-system = [ setuptools ]; - - dependencies = [ click ]; + propagatedBuildInputs = [ click ]; nativeCheckInputs = [ pytest-click pytestCheckHook - writableTmpDirAsHomeHook ]; pythonImportsCheck = [ "click_shell" ]; + preCheck = "export HOME=$(mktemp -d)"; + meta = with lib; { description = "Extension to click that easily turns your click app into a shell utility"; longDescription = '' @@ -42,7 +40,6 @@ buildPythonPackage rec { with command completion to any click app. ''; homepage = "https://github.com/clarkperkins/click-shell"; - changelog = "https://github.com/clarkperkins/click-shell/releases/tag/${src.tag}"; license = licenses.bsd3; maintainers = with maintainers; [ binsky ]; }; diff --git a/pkgs/development/python-modules/clickhouse-connect/default.nix b/pkgs/development/python-modules/clickhouse-connect/default.nix index 3600ddedd7fe0..020ecd26d6dff 100644 --- a/pkgs/development/python-modules/clickhouse-connect/default.nix +++ b/pkgs/development/python-modules/clickhouse-connect/default.nix @@ -24,7 +24,7 @@ }: buildPythonPackage rec { pname = "clickhouse-connect"; - version = "0.8.17"; + version = "0.8.18"; format = "setuptools"; @@ -34,7 +34,7 @@ buildPythonPackage rec { repo = "clickhouse-connect"; owner = "ClickHouse"; tag = "v${version}"; - hash = "sha256-UFsAKROnzaaAyUDHHARZIO8zZP3knUYoBdGSf9ZGjXo="; + hash = "sha256-lU35s8hldexyH8YC942r+sYm5gZCWqO2GXW0qtTTWWY="; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/cma/default.nix b/pkgs/development/python-modules/cma/default.nix index 88d0a858d3872..82b689d06dddc 100644 --- a/pkgs/development/python-modules/cma/default.nix +++ b/pkgs/development/python-modules/cma/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "cma"; - version = "4.0.0"; + version = "4.3.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "CMA-ES"; repo = "pycma"; tag = "r${version}"; - hash = "sha256-W4KDtX/Ho/XUrZr2cmS66Q0q90FEHRJN0VF4sMgonRw="; + hash = "sha256-2uCn5CZma9RLK8zaaPhiQCqnK+2dWgLNr5+Ck2cV6vI="; }; build-system = [ setuptools ]; @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Covariance Matrix Adaptation Evolution Strategy for non-linear numerical optimization"; homepage = "https://github.com/CMA-ES/pycma"; - changelog = "https://github.com/CMA-ES/pycma/releases/tag/r${version}"; + changelog = "https://github.com/CMA-ES/pycma/releases/tag/r${src.tag}"; license = licenses.bsd3; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 2a49262b1662b..4f3a9c1330f76 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -1,9 +1,7 @@ { lib, stdenv, - attrs, buildPythonPackage, - colorama, fetchPypi, glibcLocales, gnureadline, @@ -12,28 +10,28 @@ pytest-mock, pytestCheckHook, pythonOlder, + rich-argparse, setuptools-scm, wcwidth, }: buildPythonPackage rec { pname = "cmd2"; - version = "2.6.1"; + version = "2.7.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-ZQpYkr8psjPT1ndbXjzIE2SM/w15E09weYH2a6rtn0I="; + hash = "sha256-gdgTW0YhDh0DpagQuvhZBppiIUeIzu7DWI9E7thvvus="; }; build-system = [ setuptools-scm ]; dependencies = [ - attrs - colorama pyperclip + rich-argparse wcwidth ] ++ lib.optional stdenv.hostPlatform.isDarwin gnureadline; diff --git a/pkgs/development/python-modules/codepy/default.nix b/pkgs/development/python-modules/codepy/default.nix index cf0410cc592ce..2214fbe4dca8a 100644 --- a/pkgs/development/python-modules/codepy/default.nix +++ b/pkgs/development/python-modules/codepy/default.nix @@ -2,35 +2,42 @@ lib, buildPythonPackage, fetchFromGitHub, - pytools, - appdirs, - six, + hatchling, cgen, + numpy, + platformdirs, + pytools, + typing-extensions, + boost, + pytestCheckHook, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "codepy"; - version = "2019.1"; - format = "setuptools"; + version = "2025.1"; + pyproject = true; src = fetchFromGitHub { owner = "inducer"; repo = "codepy"; - rev = "v${version}"; - hash = "sha256-viMfB/nDrvDA/IGRZEX+yXylxbbmqbh/fgdYXBzK0zM="; + tag = "v${version}"; + hash = "sha256-PHIC3q9jQlRRoUoemVtyrl5hcZXMX28gRkI5Xpk9yBY="; }; - buildInputs = [ - pytools - six + build-system = [ hatchling ]; + + dependencies = [ cgen + numpy + platformdirs + pytools + typing-extensions ]; - propagatedBuildInputs = [ appdirs ]; pythonImportsCheck = [ "codepy" ]; - # Tests are broken - doCheck = false; + doCheck = false; # tests require boost setup for ad hoc module compilation meta = with lib; { homepage = "https://github.com/inducer/codepy"; diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix index b860838120bda..c52d74cb73af1 100644 --- a/pkgs/development/python-modules/cohere/default.nix +++ b/pkgs/development/python-modules/cohere/default.nix @@ -30,8 +30,6 @@ buildPythonPackage rec { hash = "sha256-spnkDzkPAjf/4vG7bB4d9RBc3tES+Va4wzmFJFA2/NI="; }; - pythonRelaxDeps = [ "httpx-sse" ]; - build-system = [ poetry-core ]; dependencies = [ @@ -46,6 +44,8 @@ buildPythonPackage rec { typing-extensions ]; + pythonRelaxDeps = [ "httpx-sse" ]; + # tests require CO_API_KEY doCheck = false; diff --git a/pkgs/development/python-modules/coincurve/default.nix b/pkgs/development/python-modules/coincurve/default.nix index 01d8b292cbef5..d70b8a020255b 100644 --- a/pkgs/development/python-modules/coincurve/default.nix +++ b/pkgs/development/python-modules/coincurve/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "coincurve"; - version = "20.0.0"; + version = "21.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "ofek"; repo = "coincurve"; tag = "v${version}"; - hash = "sha256-NKx/iLuzFEu1UBuwa14x55Ab3laVAKEtX6dtoWi0dOg="; + hash = "sha256-+8/CsV2BTKZ5O2LIh5/kOKMfFrkt2Jsjuj37oiOgO6Y="; }; build-system = [ diff --git a/pkgs/development/python-modules/colormath/default.nix b/pkgs/development/python-modules/colormath/default.nix index d13d9a37efe1f..b423ea754c56d 100644 --- a/pkgs/development/python-modules/colormath/default.nix +++ b/pkgs/development/python-modules/colormath/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, networkx, numpy, - pytestCheckHook, + pytest8_3CheckHook, pythonOlder, setuptools, }: @@ -33,7 +33,7 @@ buildPythonPackage rec { numpy ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytest8_3CheckHook ]; pythonImportsCheck = [ "colormath" ]; diff --git a/pkgs/development/python-modules/comicon/default.nix b/pkgs/development/python-modules/comicon/default.nix index 068452ae4ef5b..7177c27f8854a 100644 --- a/pkgs/development/python-modules/comicon/default.nix +++ b/pkgs/development/python-modules/comicon/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { ]; pythonRelaxDeps = [ + "ebooklib" "lxml" "pillow" "pypdf" diff --git a/pkgs/development/python-modules/comm/default.nix b/pkgs/development/python-modules/comm/default.nix index 228381305e7a9..9ef330e6be2ab 100644 --- a/pkgs/development/python-modules/comm/default.nix +++ b/pkgs/development/python-modules/comm/default.nix @@ -9,7 +9,7 @@ let pname = "comm"; - version = "0.2.2"; + version = "0.2.3"; in buildPythonPackage { inherit pname version; @@ -19,7 +19,7 @@ buildPythonPackage { owner = "ipython"; repo = "comm"; tag = "v${version}"; - hash = "sha256-51HSSULhbKb1NdLJ//b3Vh6sOLWp0B4KW469htpduqM="; + hash = "sha256-gDggPu2h43lGyovTND9a3o9F2hWppV5uvAJa78JxJCo="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/compressed-tensors/default.nix b/pkgs/development/python-modules/compressed-tensors/default.nix index dd9b49ac57f75..4c5eea81b0b60 100644 --- a/pkgs/development/python-modules/compressed-tensors/default.nix +++ b/pkgs/development/python-modules/compressed-tensors/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "compressed-tensors"; - version = "0.9.2"; + version = "0.10.2"; pyproject = true; # Release on PyPI is missing the `utils` directory, which `setup.py` wants to import @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "neuralmagic"; repo = "compressed-tensors"; tag = version; - hash = "sha256-PxW8zseDUF0EOh7E/N8swwgFTfvkoTpp+d3ngAUpFNU="; + hash = "sha256-BJsMyCs+rupt5+i5JlO7oY08Udc8hI3ZnMiN+8ja0mc="; }; build-system = [ setuptools ]; @@ -61,7 +61,7 @@ buildPythonPackage rec { meta = { description = "Safetensors extension to efficiently store sparse quantized tensors on disk"; homepage = "https://github.com/neuralmagic/compressed-tensors"; - changelog = "https://github.com/neuralmagic/compressed-tensors/releases/tag/${version}"; + changelog = "https://github.com/neuralmagic/compressed-tensors/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/concurrent-log-handler/default.nix b/pkgs/development/python-modules/concurrent-log-handler/default.nix index 777a232ce1dd2..752a59b9222bc 100644 --- a/pkgs/development/python-modules/concurrent-log-handler/default.nix +++ b/pkgs/development/python-modules/concurrent-log-handler/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "concurrent-log-handler"; - version = "0.9.26"; + version = "0.9.28"; pyproject = true; src = fetchPypi { pname = "concurrent_log_handler"; inherit version; - hash = "sha256-jyK/eXJKAVK56X2cLc9OyzOWB8gL8xL2gGYHAkMAa0k="; + hash = "sha256-TMJ5abNCAjm9FTd5Jm9A2XE+zoFOMSt6p1POYsbqzbg="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/conda/default.nix b/pkgs/development/python-modules/conda/default.nix index 06e04c0b04ed3..cc9512bd9bbc1 100644 --- a/pkgs/development/python-modules/conda/default.nix +++ b/pkgs/development/python-modules/conda/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { __structuredAttrs = true; pname = "conda"; - version = "25.5.1"; + version = "25.7.0"; pyproject = true; src = fetchFromGitHub { @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "conda"; repo = "conda"; tag = version; - hash = "sha256-BHy0t+5jz1WdSElCQBgFh5VJC3iIYelS01iQeQByr+0="; + hash = "sha256-lvqR1ksYE23enSf4pxFpb/Z8yPoU9bVb4Hi2ZrhI0XA="; }; build-system = [ diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix index df563510d24fc..aa6531fdb91ec 100644 --- a/pkgs/development/python-modules/configargparse/default.nix +++ b/pkgs/development/python-modules/configargparse/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "configargparse"; - version = "1.7"; + version = "1.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,14 +20,9 @@ buildPythonPackage rec { owner = "bw2"; repo = "ConfigArgParse"; tag = version; - hash = "sha256-m77MY0IZ1AJkd4/Y7ltApvdF9y17Lgn92WZPYTCU9tA="; + hash = "sha256-wrWfQzr0smM83helOEJPbayrEpAtXJYYXIw4JnGLNho="; }; - patches = [ - # https://github.com/bw2/ConfigArgParse/pull/295 - ./python3.13-compat.patch - ]; - optional-dependencies = { yaml = [ pyyaml ]; }; @@ -48,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Drop-in replacement for argparse"; homepage = "https://github.com/bw2/ConfigArgParse"; - changelog = "https://github.com/bw2/ConfigArgParse/releases/tag/${version}"; + changelog = "https://github.com/bw2/ConfigArgParse/releases/tag/${src.tag}"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/configargparse/python3.13-compat.patch b/pkgs/development/python-modules/configargparse/python3.13-compat.patch deleted file mode 100644 index a079f37a18e6b..0000000000000 --- a/pkgs/development/python-modules/configargparse/python3.13-compat.patch +++ /dev/null @@ -1,112 +0,0 @@ -From c6a974211f1a13d492bb807ff6d07cefcc948a87 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Fri, 12 Jul 2024 08:15:40 +0200 -Subject: [PATCH 1/2] update test expectations for Python 3.13 - -Python 3.13 no longer repeats the placeholder for options with multiple -aliases in the help message. For example, rather than: - - -c CONFIG_FILE, --config CONFIG_FILE - -it now outputs: - - -c, --config CONFIG_FILE - -Update the regular expressions to account for both possibilities. - -Fixes #294 ---- - tests/test_configargparse.py | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/tests/test_configargparse.py b/tests/test_configargparse.py -index 288e082..e325afd 100644 ---- a/tests/test_configargparse.py -+++ b/tests/test_configargparse.py -@@ -271,9 +271,9 @@ def testBasicCase2(self, use_groups=False): - ' -h, --help \\s+ show this help message and exit\n' - ' --genome GENOME \\s+ Path to genome file\n' - ' -v\n' -- ' -g MY_CFG_FILE, --my-cfg-file MY_CFG_FILE\n' -- ' -d DBSNP, --dbsnp DBSNP\\s+\\[env var: DBSNP_PATH\\]\n' -- ' -f FRMT, --format FRMT\\s+\\[env var: OUTPUT_FORMAT\\]\n\n'%OPTIONAL_ARGS_STRING + -+ ' -g( MY_CFG_FILE)?, --my-cfg-file MY_CFG_FILE\n' -+ ' -d( DBSNP)?, --dbsnp DBSNP\\s+\\[env var: DBSNP_PATH\\]\n' -+ ' -f( FRMT)?, --format FRMT\\s+\\[env var: OUTPUT_FORMAT\\]\n\n'%OPTIONAL_ARGS_STRING + - 7*r'(.+\s*)') - else: - self.assertRegex(self.format_help(), -@@ -286,10 +286,10 @@ def testBasicCase2(self, use_groups=False): - 'g1:\n' - ' --genome GENOME \\s+ Path to genome file\n' - ' -v\n' -- ' -g MY_CFG_FILE, --my-cfg-file MY_CFG_FILE\n\n' -+ ' -g( MY_CFG_FILE)?, --my-cfg-file MY_CFG_FILE\n\n' - 'g2:\n' -- ' -d DBSNP, --dbsnp DBSNP\\s+\\[env var: DBSNP_PATH\\]\n' -- ' -f FRMT, --format FRMT\\s+\\[env var: OUTPUT_FORMAT\\]\n\n'%OPTIONAL_ARGS_STRING + -+ ' -d( DBSNP)?, --dbsnp DBSNP\\s+\\[env var: DBSNP_PATH\\]\n' -+ ' -f( FRMT)?, --format FRMT\\s+\\[env var: OUTPUT_FORMAT\\]\n\n'%OPTIONAL_ARGS_STRING + - 7*r'(.+\s*)') - - self.assertParseArgsRaises("invalid choice: 'ZZZ'", -@@ -387,9 +387,9 @@ def testMutuallyExclusiveArgs(self): - ' \\s*-f2 TYPE2_CFG_FILE\\)\\s+\\(-f FRMT \\| -b\\)\n\n' - '%s:\n' - ' -h, --help show this help message and exit\n' -- ' -f1 TYPE1_CFG_FILE, --type1-cfg-file TYPE1_CFG_FILE\n' -- ' -f2 TYPE2_CFG_FILE, --type2-cfg-file TYPE2_CFG_FILE\n' -- ' -f FRMT, --format FRMT\\s+\\[env var: OUTPUT_FORMAT\\]\n' -+ ' -f1( TYPE1_CFG_FILE)?, --type1-cfg-file TYPE1_CFG_FILE\n' -+ ' -f2( TYPE2_CFG_FILE)?, --type2-cfg-file TYPE2_CFG_FILE\n' -+ ' -f( FRMT)?, --format FRMT\\s+\\[env var: OUTPUT_FORMAT\\]\n' - ' -b, --bam\\s+\\[env var: BAM_FORMAT\\]\n\n' - 'group1:\n' - ' --genome GENOME Path to genome file\n' -@@ -875,7 +875,7 @@ def testConstructor_ConfigFileArgs(self): - 'usage: .* \\[-h\\] -c CONFIG_FILE --genome GENOME\n\n' - '%s:\n' - ' -h, --help\\s+ show this help message and exit\n' -- ' -c CONFIG_FILE, --config CONFIG_FILE\\s+ my config file\n' -+ ' -c( CONFIG_FILE)?, --config CONFIG_FILE\\s+ my config file\n' - ' --genome GENOME\\s+ Path to genome file\n\n'%OPTIONAL_ARGS_STRING + - 5*r'(.+\s*)') - -@@ -935,8 +935,8 @@ def test_FormatHelp(self): - r'\[-w CONFIG_OUTPUT_PATH\]\s* --arg1\s+ARG1\s*\[--flag\]\s*' - '%s:\\s*' - '-h, --help \\s* show this help message and exit ' -- r'-c CONFIG_FILE, --config CONFIG_FILE\s+my config file ' -- r'-w CONFIG_OUTPUT_PATH, --write-config CONFIG_OUTPUT_PATH takes ' -+ r'-c( CONFIG_FILE)?, --config CONFIG_FILE\s+my config file ' -+ r'-w( CONFIG_OUTPUT_PATH)?, --write-config CONFIG_OUTPUT_PATH takes ' - r'the current command line args and writes them ' - r'out to a config file at the given path, then exits ' - r'--arg1 ARG1 Arg1 help text ' - -From 5e9f442374bc6d9707a43df13aaff684dff6b535 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Fri, 12 Jul 2024 08:25:30 +0200 -Subject: [PATCH 2/2] skip exit_on_error* tests to fix 3.13 test failures - -Skip `exit_on_error*` tests from `test.test_argparse` to avoid test -failures on Python 3.13. The `exit_on_error=False` semantics -is not supported by ConfigArgParse at the moment. ---- - tests/test_configargparse.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tests/test_configargparse.py b/tests/test_configargparse.py -index e325afd..9718d86 100644 ---- a/tests/test_configargparse.py -+++ b/tests/test_configargparse.py -@@ -1533,7 +1533,8 @@ def testYAMLConfigFileParser_w_ArgumentParser_parsed_values(self): - test_argparse_source_code = test_argparse_source_code.replace( - 'argparse.ArgumentParser', 'configargparse.ArgumentParser').replace( - 'TestHelpFormattingMetaclass', '_TestHelpFormattingMetaclass').replace( -- 'test_main', '_test_main') -+ 'test_main', '_test_main').replace( -+ 'test_exit_on_error', '_test_exit_on_error') - - # pytest tries to collect tests from TestHelpFormattingMetaclass, and - # test_main, and raises a warning when it finds it's not a test class diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index e4f6805921f5b..7b19da5033d53 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "confluent-kafka"; - version = "2.10.0"; + version = "2.11.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "confluentinc"; repo = "confluent-kafka-python"; tag = "v${version}"; - hash = "sha256-JJSGYGM/ukEABgzlHbw8xJr1HKVm/EW6EXEIJQBSCt8="; + hash = "sha256-s4UeuFXieyUcFJsYHTaJBKfUssYZ7mt4YoHgXN7bZKI="; }; buildInputs = [ rdkafka ]; @@ -101,12 +101,15 @@ buildPythonPackage rec { "tests/integration/" "tests/test_Admin.py" "tests/test_misc.py" + # Failed: async def functions are not natively supported. + "tests/schema_registry/_async" # missing cel-python dependency - "tests/schema_registry/test_avro_serdes.py" - "tests/schema_registry/test_json_serdes.py" - "tests/schema_registry/test_proto_serdes.py" + "tests/schema_registry/_sync/test_avro_serdes.py" + "tests/schema_registry/_sync/test_json_serdes.py" + "tests/schema_registry/_sync/test_proto_serdes.py" # missing tink dependency - "tests/schema_registry/test_config.py" + "tests/schema_registry/_async/test_config.py" + "tests/schema_registry/_sync/test_config.py" # crashes the test runner on shutdown "tests/test_KafkaError.py" ]; diff --git a/pkgs/development/python-modules/cons/default.nix b/pkgs/development/python-modules/cons/default.nix index 2bf66255fd27d..14c4c08d0b134 100644 --- a/pkgs/development/python-modules/cons/default.nix +++ b/pkgs/development/python-modules/cons/default.nix @@ -6,24 +6,28 @@ py, pytestCheckHook, pytest-html, - pythonOlder, + setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "cons"; - version = "0.4.6"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "0.4.7"; + pyproject = true; src = fetchFromGitHub { owner = "pythological"; repo = "python-cons"; tag = "v${version}"; - hash = "sha256-XssERKiv4A8x7dZhLeFSciN6RCEfGs0or3PAQiYSPII="; + hash = "sha256-BS7lThnv+dxtztvw2aRhQa8yx2cRfrZLiXjcwvZ8QR0="; }; - propagatedBuildInputs = [ logical-unification ]; + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ logical-unification ]; nativeCheckInputs = [ py @@ -41,7 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Implementation of Lisp/Scheme-like cons in Python"; homepage = "https://github.com/pythological/python-cons"; - changelog = "https://github.com/pythological/python-cons/releases/tag/v${version}"; + changelog = "https://github.com/pythological/python-cons/releases/tag/${src.tag}"; license = licenses.gpl3Only; maintainers = with maintainers; [ Etjean ]; }; diff --git a/pkgs/development/python-modules/contourpy/default.nix b/pkgs/development/python-modules/contourpy/default.nix index 3215238120ff3..d85e5f8dfbdf1 100644 --- a/pkgs/development/python-modules/contourpy/default.nix +++ b/pkgs/development/python-modules/contourpy/default.nix @@ -31,7 +31,7 @@ let contourpy = buildPythonPackage rec { pname = "contourpy"; - version = "1.3.2"; + version = "1.3.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ let owner = "contourpy"; repo = "contourpy"; tag = "v${version}"; - hash = "sha256-mtD54KfCm1vNBjcGuAKqRpKF+FLy3WmTYo7FLoE01QY="; + hash = "sha256-/tE+F1wH7YkqfgenXwtcfkjxUR5FwfgoS4NYC6n+/2M="; }; # prevent unnecessary references to the build python when cross compiling @@ -92,7 +92,7 @@ let ''; meta = with lib; { - changelog = "https://github.com/contourpy/contourpy/releases/tag/v${version}"; + changelog = "https://github.com/contourpy/contourpy/releases/tag/${src.tag}"; description = "Python library for calculating contours in 2D quadrilateral grids"; homepage = "https://github.com/contourpy/contourpy"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/control/default.nix b/pkgs/development/python-modules/control/default.nix index e7f449273b62f..16bb10a94ea01 100644 --- a/pkgs/development/python-modules/control/default.nix +++ b/pkgs/development/python-modules/control/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "control"; - version = "0.10.1"; + version = "0.10.2"; pyproject = true; src = fetchFromGitHub { owner = "python-control"; repo = "python-control"; tag = version; - hash = "sha256-wLDYPuLnsZ2+cXf7j3BxUbn4IjHPt09LE9cjQGXWrO0="; + hash = "sha256-E9RZDUK01hzjutq83XdLr3d97NwjmQzt65hqVg2TBGE="; }; build-system = [ diff --git a/pkgs/development/python-modules/copier/default.nix b/pkgs/development/python-modules/copier/default.nix index 0ec4b14716092..74fe3d9699344 100644 --- a/pkgs/development/python-modules/copier/default.nix +++ b/pkgs/development/python-modules/copier/default.nix @@ -6,6 +6,8 @@ fetchFromGitHub, funcy, git, + hatchling, + hatch-vcs, iteration-utilities, jinja2, jinja2-ansible-filters, @@ -17,8 +19,6 @@ packaging, pathspec, plumbum, - poetry-core, - poetry-dynamic-versioning, pydantic, pygments, pyyaml, @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "copier"; - version = "9.6.0"; + version = "9.9.0"; pyproject = true; src = fetchFromGitHub { @@ -39,14 +39,14 @@ buildPythonPackage rec { postFetch = '' rm $out/tests/demo/doc/ma*ana.txt ''; - hash = "sha256-mezmXrOvfqbZGZadNZklQZt/OEKqRYnwugNkZc88t6o="; + hash = "sha256-J+8MSlVKJb6Dr48pgy2OCBZpctGsVm23BcV4B9nk7o4="; }; POETRY_DYNAMIC_VERSIONING_BYPASS = version; build-system = [ - poetry-core - poetry-dynamic-versioning + hatchling + hatch-vcs ]; dependencies = [ @@ -77,7 +77,7 @@ buildPythonPackage rec { meta = { description = "Library and command-line utility for rendering projects templates"; homepage = "https://copier.readthedocs.io"; - changelog = "https://github.com/copier-org/copier/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/copier-org/copier/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ greg ]; mainProgram = "copier"; diff --git a/pkgs/development/python-modules/coredis/default.nix b/pkgs/development/python-modules/coredis/default.nix index 1ed84d1ceb431..c3bd2b0f1859d 100644 --- a/pkgs/development/python-modules/coredis/default.nix +++ b/pkgs/development/python-modules/coredis/default.nix @@ -1,6 +1,7 @@ { lib, async-timeout, + beartype, buildPythonPackage, setuptools, versioneer, @@ -18,14 +19,14 @@ buildPythonPackage rec { pname = "coredis"; - version = "4.24.0"; + version = "5.0.1"; pyproject = true; src = fetchFromGitHub { owner = "alisaifee"; repo = "coredis"; tag = version; - hash = "sha256-vqgxj366x+TphGxUBXUHJpEM0zAdr6Ia4pDPKGWUx14="; + hash = "sha256-LDK/tVGBsuhf0WzGjdCJznUVh9vrtRrjtU0wKpsr/Ag="; }; postPatch = '' @@ -44,6 +45,7 @@ buildPythonPackage rec { dependencies = [ async-timeout + beartype deprecated packaging pympler diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index f9b863a8cc0bb..06eb295484f3b 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -15,22 +15,16 @@ buildPythonPackage rec { pname = "coverage"; - version = "7.8.2"; + version = "7.10.2"; pyproject = true; src = fetchFromGitHub { owner = "nedbat"; repo = "coveragepy"; tag = version; - hash = "sha256-PCMGxyG5zIc8iigi9BsuhyuyQindZnewqTgxErT/jHw="; + hash = "sha256-OXi5FCLcfhseNDerwHdsVHF31Jy+ZSz2RU05vqPxQis="; }; - postPatch = '' - # don't write to Nix store - substituteInPlace tests/conftest.py \ - --replace-fail 'if WORKER == "none":' "if False:" - ''; - build-system = [ setuptools ]; optional-dependencies = { diff --git a/pkgs/development/python-modules/cppy/default.nix b/pkgs/development/python-modules/cppy/default.nix index b0f48f69927d3..14fc793caabaf 100644 --- a/pkgs/development/python-modules/cppy/default.nix +++ b/pkgs/development/python-modules/cppy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "cppy"; - version = "1.3.0"; + version = "1.3.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "nucleic"; repo = "cppy"; tag = version; - hash = "sha256-RwwXwdjpq4ZjUyHkWoh3eaJDzIV3MargeoBJ+nTHsyg="; + hash = "sha256-/u9JQ2ivjSlBPodfAjeDmJ+HUu1rFZ58p3V5L2dy4Jk="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/craft-parts/default.nix b/pkgs/development/python-modules/craft-parts/default.nix index cc5769fa57bd4..c675d3d4834f4 100644 --- a/pkgs/development/python-modules/craft-parts/default.nix +++ b/pkgs/development/python-modules/craft-parts/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "craft-parts"; - version = "2.19.0"; + version = "2.20.0"; pyproject = true; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-parts"; tag = version; - hash = "sha256-qzaQW+bKq+sDjRsDDY5oYQWMX50rEskgxyKwhLpFpt4="; + hash = "sha256-apuAV17IlxbkaQvCzyqEhQwTYvqHibwvWHUEPYUiCJQ="; }; patches = [ ./bash-path.patch ]; diff --git a/pkgs/development/python-modules/crccheck/default.nix b/pkgs/development/python-modules/crccheck/default.nix index 0964aa45f5c58..b822ef875f06a 100644 --- a/pkgs/development/python-modules/crccheck/default.nix +++ b/pkgs/development/python-modules/crccheck/default.nix @@ -2,27 +2,31 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy3k, unittestCheckHook, + setuptools, + setuptools-scm, }: let pname = "crccheck"; - version = "1.3.0"; + version = "1.3.1"; in buildPythonPackage { inherit pname version; - format = "setuptools"; - - disabled = !isPy3k; + pyproject = true; src = fetchFromGitHub { owner = "MartinScharrer"; repo = "crccheck"; tag = "v${version}"; - hash = "sha256-nujt3RWupvCtk7gORejtSwqqVjW9VwztOVGXBHW9T+k="; + hash = "sha256-hT+8+moni7turn5MK719b4Xy336htyWWmoMnhgxKkYo="; }; + build-system = [ + setuptools + setuptools-scm + ]; + nativeCheckInputs = [ unittestCheckHook ]; meta = with lib; { diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index a8f0cde1f0caf..719a230373256 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -58,7 +58,7 @@ let in buildPythonPackage rec { pname = "cupy"; - version = "13.3.0"; + version = "13.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -69,7 +69,7 @@ buildPythonPackage rec { owner = "cupy"; repo = "cupy"; tag = "v${version}"; - hash = "sha256-eQZwOGCaWZ4b0JCHZlrPHVQVXQwSkibHb02j0czAMt8="; + hash = "sha256-8RgyvsU3lnt6nO0J1tiLBOdYsX0jJkjPH/SpKQz4o7s="; fetchSubmodules = true; }; @@ -126,7 +126,7 @@ buildPythonPackage rec { meta = with lib; { description = "NumPy-compatible matrix library accelerated by CUDA"; homepage = "https://cupy.chainer.org/"; - changelog = "https://github.com/cupy/cupy/releases/tag/v${version}"; + changelog = "https://github.com/cupy/cupy/releases/tag/${src.tag}"; license = licenses.mit; platforms = [ "aarch64-linux" diff --git a/pkgs/development/python-modules/curio/default.nix b/pkgs/development/python-modules/curio/default.nix index 1806677f2483a..8e30e56018dd6 100644 --- a/pkgs/development/python-modules/curio/default.nix +++ b/pkgs/development/python-modules/curio/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { "test_ssl_outgoing" # touches network "test_unix_echo" # socket bind error on hydra when built with other packages "test_unix_ssl_server" # socket bind error on hydra when built with other packages + "test_task_group_thread" # stuck ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # connects to python.org:1, expects an OsError, hangs in the darwin sandbox diff --git a/pkgs/development/python-modules/curl-cffi/default.nix b/pkgs/development/python-modules/curl-cffi/default.nix index 6294177d069e3..79db35a65e95f 100644 --- a/pkgs/development/python-modules/curl-cffi/default.nix +++ b/pkgs/development/python-modules/curl-cffi/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "curl-cffi"; - version = "0.11.1"; + version = "0.12.0"; pyproject = true; src = fetchFromGitHub { owner = "lexiforest"; repo = "curl_cffi"; tag = "v${version}"; - hash = "sha256-hpsAga5741oTBT87Rt7XTyxxu7SQ5Usw+2VVr54oA8k="; + hash = "sha256-VE/b1Cs/wpZlu7lOURT/QfP7DuNudD441zG603LT4LM="; }; patches = [ ./use-system-libs.patch ]; diff --git a/pkgs/development/python-modules/cvss/default.nix b/pkgs/development/python-modules/cvss/default.nix index 791bd43df9fe0..c348337e0cca2 100644 --- a/pkgs/development/python-modules/cvss/default.nix +++ b/pkgs/development/python-modules/cvss/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "cvss"; - version = "3.4"; + version = "3.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "RedHatProductSecurity"; repo = "cvss"; tag = "v${version}"; - hash = "sha256-g6+ccoIgqs7gZPrTuKm3em+PzLvpupb9JXOGMqf2Uv0="; + hash = "sha256-udUs76wfvC9LfjlKyWmuPV0RT2P/COTwYw3hgDt3tPs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/cwlformat/default.nix b/pkgs/development/python-modules/cwlformat/default.nix index f9a56ad498702..1144d815b03b8 100644 --- a/pkgs/development/python-modules/cwlformat/default.nix +++ b/pkgs/development/python-modules/cwlformat/default.nix @@ -6,12 +6,13 @@ pytestCheckHook, pythonOlder, ruamel-yaml, + setuptools, }: buildPythonPackage rec { pname = "cwlformat"; version = "2022.02.18"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -31,12 +32,19 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ ruamel-yaml ]; + build-system = [ setuptools ]; + + dependencies = [ ruamel-yaml ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "cwlformat" ]; + disabledTests = [ + # Test compares output + "test_formatting_battery" + ]; + meta = with lib; { description = "Code formatter for CWL"; homepage = "https://github.com/rabix/cwl-format"; diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 140adeda4e8d3..2b3b5c5c27b82 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "8.8.0"; + version = "11.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = "cyclonedx-python-lib"; tag = "v${version}"; - hash = "sha256-igT1QroP260cqSAiaJv4Zrji691WIjyDLZ1p5dtPF5Y="; + hash = "sha256-TS/3O/ojabMUUW8RVd1ymo67rjNoRCtrIqZcUygpW+Y="; }; pythonRelaxDeps = [ "py-serializable" ]; diff --git a/pkgs/development/python-modules/cymruwhois/default.nix b/pkgs/development/python-modules/cymruwhois/default.nix index 070dc04cb0d4f..5bca7d20f9239 100644 --- a/pkgs/development/python-modules/cymruwhois/default.nix +++ b/pkgs/development/python-modules/cymruwhois/default.nix @@ -33,12 +33,15 @@ buildPythonPackage rec { pythonImportsCheck = [ "cymruwhois" ]; disabledTests = [ - # Tests require network access - "test_asn" # AssertionError "test_doctest" ]; + disabledTestPaths = [ + # £Failed: 'yield' keyword is allowed in fixtures, but not in tests (test_common) + "tests/test_common_lookups.py" + ]; + meta = { description = "Python client for the whois.cymru.com service"; homepage = "https://github.com/JustinAzoff/python-cymruwhois"; diff --git a/pkgs/development/python-modules/cynthion/default.nix b/pkgs/development/python-modules/cynthion/default.nix index 1d265c8da52d3..f0d8d55b6c943 100644 --- a/pkgs/development/python-modules/cynthion/default.nix +++ b/pkgs/development/python-modules/cynthion/default.nix @@ -26,14 +26,14 @@ }: buildPythonPackage rec { pname = "cynthion"; - version = "0.2.2"; + version = "0.2.3"; pyproject = true; src = fetchFromGitHub { owner = "greatscottgadgets"; repo = "cynthion"; tag = version; - hash = "sha256-xL1/ckX+xKUQpugQkLB3SlZeNcBEaTMascTgoQ4C+hA="; + hash = "sha256-NAsELeOnWgMa6iWCJ0+hpbHIO3BsZBv0N/nK1XP+IpU="; }; sourceRoot = "${src.name}/cynthion/python"; diff --git a/pkgs/development/python-modules/cython/default.nix b/pkgs/development/python-modules/cython/default.nix index 45fc174577aec..f62acbab3b90c 100644 --- a/pkgs/development/python-modules/cython/default.nix +++ b/pkgs/development/python-modules/cython/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "cython"; - version = "3.0.12"; + version = "3.1.2"; pyproject = true; src = fetchFromGitHub { owner = "cython"; repo = "cython"; tag = version; - hash = "sha256-clJXjQb6rVECirKRUGX0vD5a6LILzPwNo7+6KKYs2pI="; + hash = "sha256-lP8ILCzAZuoPzFhCqGXwIpifN8XoWz93SJ7c3XVe69Y="; }; build-system = [ diff --git a/pkgs/development/python-modules/daltonlens/default.nix b/pkgs/development/python-modules/daltonlens/default.nix index c27c69f3f8daa..6a91288eef4cf 100644 --- a/pkgs/development/python-modules/daltonlens/default.nix +++ b/pkgs/development/python-modules/daltonlens/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, setuptools, - setuptools-git, numpy, pillow, pytestCheckHook, @@ -18,9 +17,13 @@ buildPythonPackage rec { hash = "sha256-T7fXlRdFtcVw5WURPqZhCmulUi1ZnCfCXgcLtTHeNas="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace-fail "setup_requires = setuptools_git" "" + ''; + build-system = [ setuptools - setuptools-git ]; dependencies = [ diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 3f185c962a251..953eb9064a744 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -36,14 +36,14 @@ buildPythonPackage rec { pname = "dash"; - version = "3.0.4"; + version = "3.2.0"; pyproject = true; src = fetchFromGitHub { owner = "plotly"; repo = "dash"; tag = "v${version}"; - hash = "sha256-KCGVdD1L+U2KbktU2GU19BQ6wRcmEeYtC/v8UrFTyto="; + hash = "sha256-7wSUPAcPvY5Q5Ws2mLjiY599oZlo5SA6Pa8QnS7pgvg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 9322d3c03abaf..fd60adb945d13 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -38,14 +38,14 @@ buildPythonPackage rec { pname = "dask"; - version = "2025.3.0"; + version = "2025.7.0"; pyproject = true; src = fetchFromGitHub { owner = "dask"; repo = "dask"; tag = version; - hash = "sha256-j25+DfWReonXKqxkX9OVHjKo+Indh13rlBE5PyGe69c="; + hash = "sha256-bwM4Q95YTEp9pDz6LmBLOeYjmi8nH8Cc/srZlXfEIlg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/databricks-sql-connector/default.nix b/pkgs/development/python-modules/databricks-sql-connector/default.nix index 9d4689b5f1476..f351e8d0b03b6 100644 --- a/pkgs/development/python-modules/databricks-sql-connector/default.nix +++ b/pkgs/development/python-modules/databricks-sql-connector/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "databricks-sql-connector"; - version = "4.0.3"; + version = "4.0.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,10 +29,11 @@ buildPythonPackage rec { owner = "databricks"; repo = "databricks-sql-python"; tag = "v${version}"; - hash = "sha256-9+U5XOlvPQF6fLkT6/bgjSqSlGj0995mNVH0PCGQEYE="; + hash = "sha256-CzS6aVOFkBSJ9+0KJOaJLxK2ZiRY4OybNkCX5VdybqY="; }; pythonRelaxDeps = [ + "pandas" "pyarrow" "thrift" ]; diff --git a/pkgs/development/python-modules/datamodel-code-generator/default.nix b/pkgs/development/python-modules/datamodel-code-generator/default.nix index f4a8c43776661..114c02db162a6 100644 --- a/pkgs/development/python-modules/datamodel-code-generator/default.nix +++ b/pkgs/development/python-modules/datamodel-code-generator/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "datamodel-code-generator"; - version = "0.26.5"; + version = "0.32.0"; pyproject = true; src = fetchFromGitHub { owner = "koxudaxi"; repo = "datamodel-code-generator"; tag = version; - hash = "sha256-CYNEpQFIWR7i7I7YJ5q/34KNhtQ7cjya97Z0fyeO5g8="; + hash = "sha256-sFMNs8wHRTxK1TU4IWfbKf/qUCb11bh2Td1/FngFavo="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/datasalad/default.nix b/pkgs/development/python-modules/datasalad/default.nix index 0e0eaacbea2ff..9ea994007bed0 100644 --- a/pkgs/development/python-modules/datasalad/default.nix +++ b/pkgs/development/python-modules/datasalad/default.nix @@ -4,6 +4,7 @@ hatchling, hatch-vcs, lib, + gitMinimal, more-itertools, psutil, pytestCheckHook, @@ -12,14 +13,14 @@ buildPythonPackage rec { pname = "datasalad"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; src = fetchFromGitHub { owner = "datalad"; repo = "datasalad"; tag = "v${version}"; - hash = "sha256-UIrbvFz674+HarFbv1eF++flj1hOR0cZyqKQSl+G7xY="; + hash = "sha256-v0qq9uzO2nD2RZ9LlmBzs3OOAriylrq9mcmgpDga4gw="; }; build-system = [ @@ -28,6 +29,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + gitMinimal pytestCheckHook more-itertools psutil diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix index 49e474a53b492..7986fe8ff6bba 100644 --- a/pkgs/development/python-modules/datasets/default.nix +++ b/pkgs/development/python-modules/datasets/default.nix @@ -19,14 +19,14 @@ }: buildPythonPackage rec { pname = "datasets"; - version = "3.6.0"; + version = "4.0.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "datasets"; tag = version; - hash = "sha256-/xhu0cDKfCEwrp9IzKd0+AeQky1198f9sba/pdutvAk="; + hash = "sha256-Cr25PgLNGX/KcFZE5h1oiaDW9J50ccMqA5z3q4sITus="; }; build-system = [ diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index 5fd9a6d5f6d34..a874c2575860f 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -8,7 +8,7 @@ pytz, regex, tzlocal, - hijri-converter, + hijridate, convertdate, fasttext, langdetect, @@ -46,7 +46,7 @@ buildPythonPackage rec { optional-dependencies = { calendars = [ - hijri-converter + hijridate convertdate ]; fasttext = [ fasttext ]; diff --git a/pkgs/development/python-modules/dazl/default.nix b/pkgs/development/python-modules/dazl/default.nix index ee74e5e21878b..be4ac05588ffe 100644 --- a/pkgs/development/python-modules/dazl/default.nix +++ b/pkgs/development/python-modules/dazl/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "dazl"; - version = "8.3.0"; + version = "8.4.2"; pyproject = true; src = fetchFromGitHub { owner = "digital-asset"; repo = "dazl-client"; tag = "v${version}"; - hash = "sha256-w0jWhOOjOVLKUcfY2zR8dgckp7r/Gko+p3cuO8IIrM4="; + hash = "sha256-NJHcjzdtKTUnFideUm4fHof4A16nEFeYIXehR9/Bn1s="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/db-dtypes/default.nix b/pkgs/development/python-modules/db-dtypes/default.nix index 5c17b49c2b03b..23713484c397b 100644 --- a/pkgs/development/python-modules/db-dtypes/default.nix +++ b/pkgs/development/python-modules/db-dtypes/default.nix @@ -6,14 +6,14 @@ packaging, pandas, pyarrow, - pytestCheckHook, + pytest8_3CheckHook, pythonOlder, setuptools, }: buildPythonPackage rec { pname = "db-dtypes"; - version = "1.4.2"; + version = "1.4.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "googleapis"; repo = "python-db-dtypes-pandas"; tag = "v${version}"; - hash = "sha256-CW8BgUZu6EGOXEwapwXadjySbzlo8j9I8ft7OuSMVqs="; + hash = "sha256-AyO/GwtExMWi4mB3OMtYPFvAVS/ylcBXGiGXgaScyCA="; }; build-system = [ setuptools ]; @@ -34,7 +34,14 @@ buildPythonPackage rec { pyarrow ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytest8_3CheckHook ]; + + disabledTests = [ + # ValueError: Unable to avoid copy while creating an array as requested. + "test_array_interface_copy" + # Failed: DID NOT RAISE + "test_reduce_series_numeric" + ]; pythonImportsCheck = [ "db_dtypes" ]; diff --git a/pkgs/development/python-modules/dbt-adapters/default.nix b/pkgs/development/python-modules/dbt-adapters/default.nix index a142a26f00262..ca491b9afbbe6 100644 --- a/pkgs/development/python-modules/dbt-adapters/default.nix +++ b/pkgs/development/python-modules/dbt-adapters/default.nix @@ -3,6 +3,7 @@ agate, buildPythonPackage, dbt-common, + dbt-protos, fetchPypi, hatchling, mashumaro, @@ -14,14 +15,14 @@ buildPythonPackage rec { pname = "dbt-adapters"; - version = "1.14.8"; + version = "1.16.3"; pyproject = true; # missing tags on GitHub src = fetchPypi { pname = "dbt_adapters"; inherit version; - hash = "sha256-lowoP5Ny5kObKMuscecSUuqQXG7GxEDlbp8HQkLifBc="; + hash = "sha256-1J0+V776ujbt8Anm/gAdld0MkC5apmeN8IEtzZBSWf8="; }; build-system = [ hatchling ]; @@ -34,6 +35,7 @@ buildPythonPackage rec { dependencies = [ agate dbt-common + dbt-protos mashumaro protobuf pytz diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix index 2f6937cda7f2c..4fd76d96d9190 100644 --- a/pkgs/development/python-modules/dbt-core/default.nix +++ b/pkgs/development/python-modules/dbt-core/default.nix @@ -13,6 +13,7 @@ dbt-adapters, dbt-common, dbt-extractor, + dbt-protos, dbt-semantic-interfaces, jinja2, logbook, @@ -36,23 +37,16 @@ buildPythonPackage rec { pname = "dbt-core"; - version = "1.10.0b2"; + version = "1.10.6"; pyproject = true; src = fetchFromGitHub { owner = "dbt-labs"; repo = "dbt-core"; tag = "v${version}"; - hash = "sha256-MTrdpbPqdakFDmLKRFJ23u9hLgGhZ5T+r4om9HPBjkw="; + hash = "sha256-tMrtn5NYkRpok6mv4/CBXGPQuHWpL/raejPXyagj7Bs="; }; - postPatch = '' - substituteInPlace dbt/utils/artifact_upload.py \ - --replace-fail \ - "from pydantic import BaseSettings" \ - "from pydantic_settings import BaseSettings" - ''; - sourceRoot = "${src.name}/core"; pythonRelaxDeps = [ @@ -80,6 +74,7 @@ buildPythonPackage rec { dbt-adapters dbt-common dbt-extractor + dbt-protos dbt-semantic-interfaces jinja2 logbook diff --git a/pkgs/development/python-modules/dbt-protos/default.nix b/pkgs/development/python-modules/dbt-protos/default.nix new file mode 100644 index 0000000000000..c3601a48b7d6e --- /dev/null +++ b/pkgs/development/python-modules/dbt-protos/default.nix @@ -0,0 +1,39 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + protobuf, +}: + +buildPythonPackage rec { + pname = "dbt-protos"; + version = "1.0.351"; + pyproject = true; + + src = fetchFromGitHub { + owner = "dbt-labs"; + repo = "proto-python-public"; + tag = "v${version}"; + hash = "sha256-GZwSJAElE/aUS4cCqMlmUJVtm+OACjKakXUxkrpVUyE="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + protobuf + ]; + + pythonImportsCheck = [ + "dbtlabs.proto.public.v1" + ]; + + meta = { + description = "dbt public protos"; + homepage = "https://github.com/dbt-labs/proto-python-public"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/dbus-deviation/default.nix b/pkgs/development/python-modules/dbus-deviation/default.nix index 3f455b68a9612..158bf7f5d11b9 100644 --- a/pkgs/development/python-modules/dbus-deviation/default.nix +++ b/pkgs/development/python-modules/dbus-deviation/default.nix @@ -4,7 +4,6 @@ fetchPypi, lxml, setuptools, - setuptools-git, }: buildPythonPackage rec { @@ -18,15 +17,13 @@ buildPythonPackage rec { }; postPatch = '' - sed -i "/'sphinx',/d" setup.py + substituteInPlace setup.py \ + --replace-fail "'setuptools_git >= 0.3'," "" \ + --replace-fail "'sphinx'," "" ''; - nativeBuildInputs = [ - setuptools - setuptools-git - ]; - - propagatedBuildInputs = [ lxml ]; + build-system = [ setuptools ]; + dependencies = [ lxml ]; pythonImportsCheck = [ "dbusdeviation" ]; diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index 6a1d1b2b10f09..2a2a171502c7f 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -29,6 +29,11 @@ buildPythonPackage rec { hash = "sha256-ZpTQjAmrLoenDWzd/0NpD7fqTd6Dv1J0Ks0db4twwYk="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "Cython>=3,<3.1.0" Cython + ''; + # The project can build both an optimized cython version and an unoptimized # python version. This ensures we fail if we build the wrong one. env.REQUIRE_CYTHON = 1; diff --git a/pkgs/development/python-modules/dbutils/default.nix b/pkgs/development/python-modules/dbutils/default.nix index 2995db09d4a67..55b5aa1f93626 100644 --- a/pkgs/development/python-modules/dbutils/default.nix +++ b/pkgs/development/python-modules/dbutils/default.nix @@ -1,26 +1,24 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "dbutils"; - version = "3.1.0"; + version = "3.1.1"; pyproject = true; - disabled = pythonOlder "3.6"; - - src = fetchPypi { - inherit version; - pname = "DBUtils"; - hash = "sha256-6lKLoRBjJA7qgjRevG98yTJMBuQulCCwC80kWpW/zCQ="; + src = fetchFromGitHub { + owner = "WebwareForPython"; + repo = "DBUtils"; + tag = "Release-${lib.replaceStrings [ "." ] [ "_" ] version}"; + hash = "sha256-YyZKGN7oNuCR4lU7pxkY+vLOWGQzQjqvAIOZc7LlvUM="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/deep-chainmap/default.nix b/pkgs/development/python-modules/deep-chainmap/default.nix index 9b3c6c9ac2408..1b12d8bd9d562 100644 --- a/pkgs/development/python-modules/deep-chainmap/default.nix +++ b/pkgs/development/python-modules/deep-chainmap/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "deep-chainmap"; - version = "0.1.2"; + version = "0.1.3"; pyproject = true; src = fetchPypi { pname = "deep_chainmap"; inherit version; - hash = "sha256-R7Pfh+1bYJ7LCU+0SyZi2XGOsgL1zWiMkp1z9HD1I1w="; + hash = "sha256-Cw6Eiey501mzeigfdwnMuZH28abG4rcoACUGlmkzECA="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/deepface/default.nix b/pkgs/development/python-modules/deepface/default.nix index f6984e4da51be..cc877c8d8ea90 100644 --- a/pkgs/development/python-modules/deepface/default.nix +++ b/pkgs/development/python-modules/deepface/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "deepface"; - version = "0.0.93"; + version = "0.0.94"; pyproject = true; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "serengil"; repo = "deepface"; tag = "v${version}"; - hash = "sha256-G/e0tvf4GbXPjqJCTMgWDe59701fxfrtAf+bioEn8io="; + hash = "sha256-jtDj1j2STjoEW6MdQai6ZuRYVmLo0Ga+VPJ01105Byc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/defcon/default.nix b/pkgs/development/python-modules/defcon/default.nix index 06efc8018d32d..4c9beacba9746 100644 --- a/pkgs/development/python-modules/defcon/default.nix +++ b/pkgs/development/python-modules/defcon/default.nix @@ -11,15 +11,14 @@ buildPythonPackage rec { pname = "defcon"; - version = "0.12.1"; + version = "0.12.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-rKhnSo9xcjr2oI8zLz7TFWug/gBZHrWv91csqtFHLQk="; - extension = "zip"; + hash = "sha256-Jd/n/QFSzPKSyxkNGSikfViImcILBGhUKT4DnhyT5eA="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/dep-logic/default.nix b/pkgs/development/python-modules/dep-logic/default.nix index c85fc1b95e299..845203c5d99fa 100644 --- a/pkgs/development/python-modules/dep-logic/default.nix +++ b/pkgs/development/python-modules/dep-logic/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dep-logic"; - version = "0.5.1"; + version = "0.5.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pdm-project"; repo = "dep-logic"; tag = version; - hash = "sha256-W/y5iM9dHnle7y3VzqvW7DSGy8ALvjqt5CN/2z5oEi8="; + hash = "sha256-BjqPtfYsHSDQoaYs+hB0r/mRuONqBHOb6goi1dxkFWo="; }; nativeBuildInputs = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/dependency-groups/default.nix b/pkgs/development/python-modules/dependency-groups/default.nix index bf0f83d276d9d..6bfbe3e799779 100644 --- a/pkgs/development/python-modules/dependency-groups/default.nix +++ b/pkgs/development/python-modules/dependency-groups/default.nix @@ -4,8 +4,8 @@ fetchFromGitHub, flit-core, packaging, - pythonOlder, pytestCheckHook, + tomli, }: buildPythonPackage rec { @@ -13,32 +13,41 @@ buildPythonPackage rec { version = "1.3.1"; pyproject = true; - disabled = pythonOlder "3.12"; - src = fetchFromGitHub { owner = "pypa"; repo = "dependency-groups"; - rev = version; + tag = version; hash = "sha256-suuSx3zf0Y45FJdH8Cb6N7hcvPnzleREpHhtdiG2CLg="; }; - build-system = [ flit-core ]; + build-system = [ + flit-core + ]; - dependencies = [ packaging ]; + dependencies = [ + packaging + tomli + ]; optional-dependencies = { - cli = [ ]; + cli = [ + tomli + ]; }; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "dependency_groups" ]; + pythonImportsCheck = [ + "dependency_groups" + ]; meta = { - description = "Standalone implementation of PEP 735 Dependency Groups"; + description = "A standalone implementation of PEP 735 Dependency Groups"; homepage = "https://github.com/pypa/dependency-groups"; - changelog = "https://github.com/pypa/dependency-groups/blob/${src.rev}/CHANGELOG.rst"; + changelog = "https://github.com/pypa/dependency-groups/blob/${src.tag}/CHANGELOG.rst"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ fab ]; + maintainers = with lib.maintainers; [ hexa ]; }; } diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index cd48ac472e5e1..54154d2991043 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "dependency-injector"; - version = "4.42.0"; + version = "4.48.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "ets-labs"; repo = "python-dependency-injector"; tag = version; - hash = "sha256-ryPNmiIKQzR4WSjt7hi4C+iTsYvfj5TYGy+9PJxX+10="; + hash = "sha256-jsV+PmUGtK8QiI2ga963H/gkd31UEq0SouEia+spSpg="; }; build-system = [ setuptools ]; @@ -64,7 +64,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dependency injection microframework for Python"; homepage = "https://github.com/ets-labs/python-dependency-injector"; - changelog = "https://github.com/ets-labs/python-dependency-injector/blob/${version}/docs/main/changelog.rst"; + changelog = "https://github.com/ets-labs/python-dependency-injector/blob/${src.tag}/docs/main/changelog.rst"; license = licenses.bsd3; maintainers = with maintainers; [ gerschtli ]; # https://github.com/ets-labs/python-dependency-injector/issues/726 diff --git a/pkgs/development/python-modules/devolo-plc-api/default.nix b/pkgs/development/python-modules/devolo-plc-api/default.nix index d9dcbbb73a3f2..89f1bbb6853b7 100644 --- a/pkgs/development/python-modules/devolo-plc-api/default.nix +++ b/pkgs/development/python-modules/devolo-plc-api/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, httpx, protobuf, - pytest-asyncio, + pytest-asyncio_0, pytest-httpx, pytest-mock, pytestCheckHook, @@ -48,7 +48,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; nativeCheckInputs = [ - pytest-asyncio + pytest-asyncio_0 pytest-httpx pytest-mock pytestCheckHook diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix index 7197be7d23360..99ddb9b692ef9 100644 --- a/pkgs/development/python-modules/devpi-common/default.nix +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -15,15 +15,15 @@ buildPythonPackage rec { pname = "devpi-common"; - version = "4.0.4"; + version = "4.1.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - pname = "devpi_common"; + pname = "devpi-common"; inherit version; - hash = "sha256-I1oKmkXJblTGC6a6L3fYVs+Q8aacG+6UmIfp7cA6Qcw="; + hash = "sha256-WNf3YeP+f9/kScSmqeI1DU3fvrZssPbSCAJRQpQwMNM="; }; build-system = [ diff --git a/pkgs/development/python-modules/dicomweb-client/default.nix b/pkgs/development/python-modules/dicomweb-client/default.nix index 0e886d8325b09..2d34fa5b8455e 100644 --- a/pkgs/development/python-modules/dicomweb-client/default.nix +++ b/pkgs/development/python-modules/dicomweb-client/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dicomweb-client"; - version = "0.59.3"; + version = "0.60.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "ImagingDataCommons"; repo = "dicomweb-client"; tag = "v${version}"; - hash = "sha256-D3j5EujrEdGTfR8/V3o2VJ/VkGdZ8IifPYMhP4ppXhw="; + hash = "sha256-ZxeZiCw8I5+Bf266PQ6WQA8mBRC7K3/kZrmuW4l6kQU="; }; build-system = [ setuptools ]; @@ -47,7 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for DICOMweb RESTful services"; homepage = "https://dicomweb-client.readthedocs.io"; - changelog = "https://github.com/ImagingDataCommons/dicomweb-client/releases/tag/v${version}"; + changelog = "https://github.com/ImagingDataCommons/dicomweb-client/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; mainProgram = "dicomweb_client"; diff --git a/pkgs/development/python-modules/diofant/default.nix b/pkgs/development/python-modules/diofant/default.nix index 696e8e4e63add..0deaf22888cb8 100644 --- a/pkgs/development/python-modules/diofant/default.nix +++ b/pkgs/development/python-modules/diofant/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "diofant"; - version = "0.14.0"; + version = "0.15.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "diofant"; repo = "diofant"; tag = "v${version}"; - hash = "sha256-+VM5JBj4NRhNwyAVhnsACg5cVyyxJ3IcOKNL1osr67E="; + hash = "sha256-uQvAYSURDhuAKcX0WVMk4y2ZXiiq0lPZct/7A5n5t34="; }; patches = [ @@ -81,7 +81,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "diofant" ]; meta = with lib; { - changelog = "https://diofant.readthedocs.io/en/latest/release/notes-${version}.html"; + changelog = "https://diofant.readthedocs.io/en/latest/release/notes-${src.tag}.html"; description = "Python CAS library"; homepage = "https://github.com/diofant/diofant"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/discid/default.nix b/pkgs/development/python-modules/discid/default.nix index 83cc31223521c..75439108a15bc 100644 --- a/pkgs/development/python-modules/discid/default.nix +++ b/pkgs/development/python-modules/discid/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "discid"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "1fc6kvnqwaz9lrs2qgsp8wh0nabf49010r0r53wnsmpmafy315nd"; + sha256 = "sha256-cWChIRrD1qbYIT+4jdPXPjKr5eATNqWkyYWwgql9QzU="; }; patchPhase = diff --git a/pkgs/development/python-modules/dissect-fve/default.nix b/pkgs/development/python-modules/dissect-fve/default.nix index d8ffe7bbd871b..a7608a4012af1 100644 --- a/pkgs/development/python-modules/dissect-fve/default.nix +++ b/pkgs/development/python-modules/dissect-fve/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dissect-fve"; - version = "4.1"; + version = "4.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.fve"; tag = version; - hash = "sha256-xPjwyI134E0JWkM+S2ae9TuBGHMSrgyjooM9CGECqgg="; + hash = "sha256-OgagTnt4y6Fzd7jbsCgbkTzcsdnozImfdKI9ew9JaqI="; }; build-system = [ diff --git a/pkgs/development/python-modules/distlib/default.nix b/pkgs/development/python-modules/distlib/default.nix index 0a636477ea7b4..02e084b0f6863 100644 --- a/pkgs/development/python-modules/distlib/default.nix +++ b/pkgs/development/python-modules/distlib/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "distlib"; - version = "0.3.9"; + version = "0.4.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-pg8g3qZGuKM/Pndy903AstB3LSg37hNCoAZFyB7flAM="; + hash = "sha256-/uxAB1vgOgRQGpc9gfYzc1tLafmLBUUFkjEMD0AaTg0="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 6f2bb78a106f4..db117b6a05af8 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "distributed"; - version = "2025.3.0"; + version = "2025.7.0"; pyproject = true; src = fetchFromGitHub { owner = "dask"; repo = "distributed"; tag = version; - hash = "sha256-+vegdEXhQi3ns5iMs6FavKnAlRNIWCUNyZENVBWZsuQ="; + hash = "sha256-np4hCamNTbnmLdfjFeHsxEEm9XI1O0kOczDe1YjSziw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/dj-rest-auth/default.nix b/pkgs/development/python-modules/dj-rest-auth/default.nix index a00c31ab7aede..5191ff624b789 100644 --- a/pkgs/development/python-modules/dj-rest-auth/default.nix +++ b/pkgs/development/python-modules/dj-rest-auth/default.nix @@ -81,6 +81,9 @@ buildPythonPackage rec { disabledTests = [ # Test connects to graph.facebook.com "TestSocialLoginSerializer" + # claim[user_id] is "1" (str) vs 1 (int) + "test_custom_jwt_claims" + "test_custom_jwt_claims_cookie_w_authentication" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix index 3e1b6e31a42c6..e710032e90060 100644 --- a/pkgs/development/python-modules/django-allauth/default.nix +++ b/pkgs/development/python-modules/django-allauth/default.nix @@ -2,11 +2,13 @@ lib, buildPythonPackage, fetchFromGitea, + fetchpatch, pythonOlder, python, # build-system setuptools, + setuptools-scm, # build-time dependencies gettext, @@ -41,7 +43,7 @@ buildPythonPackage rec { pname = "django-allauth"; - version = "65.9.0"; + version = "65.10.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -51,12 +53,23 @@ buildPythonPackage rec { owner = "allauth"; repo = "django-allauth"; tag = version; - hash = "sha256-gusA9TnsgSSnWBPwHsNYeESD9nX5DWh4HqMgcsoJRw0="; + hash = "sha256-pwWrdWk3bARM4dKbEnUWXuyjw/rTcOjk3YXowDa+Hm8="; }; + patches = [ + (fetchpatch { + name = "dj-rest-auth-compat.patch"; + url = "https://github.com/pennersr/django-allauth/commit/d50a9b09bada6753b52e52571d0830d837dc08ee.patch"; + hash = "sha256-cFj9HEAlAITbRcR23ptzUYamoLmdtFEUVkDtv4+BBY0="; + }) + ]; + nativeBuildInputs = [ gettext ]; - build-system = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; dependencies = [ asgiref diff --git a/pkgs/development/python-modules/django-bootstrap3/default.nix b/pkgs/development/python-modules/django-bootstrap3/default.nix index 34ff3e849f1a3..62abd28fde239 100644 --- a/pkgs/development/python-modules/django-bootstrap3/default.nix +++ b/pkgs/development/python-modules/django-bootstrap3/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, # build-system - hatchling, + uv-build, # dependencies django, @@ -16,17 +16,17 @@ buildPythonPackage rec { pname = "django-bootstrap3"; - version = "25.1"; + version = "25.2"; format = "pyproject"; src = fetchFromGitHub { owner = "zostera"; repo = "django-bootstrap3"; tag = "v${version}"; - hash = "sha256-gRDU2IDE6cOVBJzdOs8Ww9mItMy/2DPMYusC0TCTqkI="; + hash = "sha256-TaB2PeBjmCNFuEZ+To2Q3C6zlFCaaTB70LxQWWb5AEo="; }; - build-system = [ hatchling ]; + build-system = [ uv-build ]; dependencies = [ django ]; diff --git a/pkgs/development/python-modules/django-cachalot/default.nix b/pkgs/development/python-modules/django-cachalot/default.nix index 55f91c63bb2d9..7d8377e74039c 100644 --- a/pkgs/development/python-modules/django-cachalot/default.nix +++ b/pkgs/development/python-modules/django-cachalot/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "django-cachalot"; version = "2.8.0"; - pyproject = true; + format = "setuptools"; src = fetchFromGitHub { owner = "noripyt"; @@ -73,7 +73,7 @@ buildPythonPackage rec { meta = with lib; { description = "No effort, no worry, maximum performance"; homepage = "https://github.com/noripyt/django-cachalot"; - changelog = "https://github.com/noripyt/django-cachalot/blob/${src.rev}/CHANGELOG.rst"; + changelog = "https://github.com/noripyt/django-cachalot/blob/${src.tag}/CHANGELOG.rst"; license = licenses.bsd3; maintainers = with maintainers; [ onny ]; }; diff --git a/pkgs/development/python-modules/django-cms/default.nix b/pkgs/development/python-modules/django-cms/default.nix index a33caa7b80248..ca3034af55127 100644 --- a/pkgs/development/python-modules/django-cms/default.nix +++ b/pkgs/development/python-modules/django-cms/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "django-cms"; - version = "4.1.6"; + version = "5.0.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -30,24 +30,9 @@ buildPythonPackage rec { owner = "django-cms"; repo = "django-cms"; tag = version; - hash = "sha256-KowhiJz84hR5VqW+WNIBEhC+X9zPE1opDWygFfsFfPE="; + hash = "sha256-qv6eVs5jKJXQczEa6+H5n4+pw1JFTkb7XJD+0DBVFM0="; }; - patches = [ - # Removed django-app-manage dependency by updating ./manage.py - # https://github.com/django-cms/django-cms/pull/8061 - (fetchpatch { - url = "https://github.com/django-cms/django-cms/commit/3270edb72f6a736b5cb448864ce2eaf68f061740.patch"; - hash = "sha256-DkgAfE/QGAXwKMNvgcYxtO0yAc7oAaAAui2My8ml1Vk="; - name = "remove_django_app_manage_dependency.patch"; - }) - (fetchpatch { - url = "https://github.com/django-cms/django-cms/pull/8061/commits/04005ff693e775db645c62fefbb62367822e66f9.patch"; - hash = "sha256-4M/VKEv7pnqCk6fDyA6FurSCCu/k9tNnz16wT4Tr0Rw="; - name = "manage_py_update_dj_database_url.patch"; - }) - ]; - build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/django-csp/default.nix b/pkgs/development/python-modules/django-csp/default.nix index 5c5920404fbc8..70ec6444eee83 100644 --- a/pkgs/development/python-modules/django-csp/default.nix +++ b/pkgs/development/python-modules/django-csp/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "django-csp"; - version = "3.8"; + version = "4.0"; pyproject = true; src = fetchPypi { inherit version; pname = "django_csp"; - hash = "sha256-7w8an32Nporm4WnALprGYcDs8E23Dg0dhWQFEqaEccA="; + hash = "sha256-snAQu3Ausgo9rTKReN8rYaK4LTOLcPvcE8OjvShxKDM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/django-debug-toolbar/default.nix b/pkgs/development/python-modules/django-debug-toolbar/default.nix index e7820589c4817..a497e80beb690 100644 --- a/pkgs/development/python-modules/django-debug-toolbar/default.nix +++ b/pkgs/development/python-modules/django-debug-toolbar/default.nix @@ -16,13 +16,11 @@ html5lib, jinja2, pygments, - pytest-django, - pytestCheckHook, }: buildPythonPackage rec { pname = "django-debug-toolbar"; - version = "5.0.1"; + version = "6.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,9 +29,14 @@ buildPythonPackage rec { owner = "jazzband"; repo = "django-debug-toolbar"; tag = version; - hash = "sha256-Q0joSIFXhoVmNQ+AfESdEWUGY1xmJzr4iR6Ak54YM7c="; + hash = "sha256-ZNevSqEpTdk0cZeMzOpbtatEiV9SAsVUlRb9YddcAGY="; }; + postPatch = '' + # not actually used and we don't have django-template-partials packaged + sed -i "/template_partials/d" tests/settings.py + ''; + build-system = [ hatchling ]; dependencies = [ diff --git a/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix b/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix index 8569e756d5eec..3355b6e4af84b 100644 --- a/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix +++ b/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix @@ -61,6 +61,8 @@ buildPythonPackage rec { export DJANGO_SETTINGS_MODULE=tests.settings ''; + doCheck = false; # tests broke with django-debug-toolbar 6.0 + meta = with lib; { changelog = "https://github.com/flavors/django-graphiql-debug-toolbar/releases/tag/${src.rev}"; description = "Django Debug Toolbar for GraphiQL IDE"; diff --git a/pkgs/development/python-modules/django-guardian/default.nix b/pkgs/development/python-modules/django-guardian/default.nix index 4a3aa96606846..2f03409bcd592 100644 --- a/pkgs/development/python-modules/django-guardian/default.nix +++ b/pkgs/development/python-modules/django-guardian/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, django-environ, - mock, django, pytestCheckHook, pytest-django, @@ -28,7 +27,6 @@ buildPythonPackage rec { nativeCheckInputs = [ django-environ - mock pytestCheckHook pytest-django ]; @@ -38,9 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Per object permissions for Django"; homepage = "https://github.com/django-guardian/django-guardian"; - license = with licenses; [ - bsd2 - ]; + license = with licenses; [ bsd2 ]; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/django-health-check/default.nix b/pkgs/development/python-modules/django-health-check/default.nix index 17d187a6a6cbc..229f31e1892e9 100644 --- a/pkgs/development/python-modules/django-health-check/default.nix +++ b/pkgs/development/python-modules/django-health-check/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "django-health-check"; - version = "3.18.3"; + version = "3.20.0"; pyproject = true; src = fetchFromGitHub { owner = "KristianOellegaard"; repo = "django-health-check"; tag = version; - hash = "sha256-+6+YxB/x4JdKUCwxxe+YIc+r1YAzngFUHiS6atupWM8="; + hash = "sha256-qgABCDWKGYZ67sKvCozUQfmYcKWMpEVNLxInTnIaojk="; }; build-system = [ setuptools-scm ]; @@ -58,7 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pluggable app that runs a full check on the deployment"; homepage = "https://github.com/KristianOellegaard/django-health-check"; - changelog = "https://github.com/revsys/django-health-check/releases/tag/${version}"; + changelog = "https://github.com/revsys/django-health-check/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ onny ]; }; diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index 55b6bf4244f94..872f77d956716 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "django-hijack"; - version = "3.7.2"; + version = "3.7.3"; pyproject = true; src = fetchFromGitHub { owner = "django-hijack"; repo = "django-hijack"; tag = version; - hash = "sha256-JGcVXM/kWsahGNh1llV4NB+/FLAh3hqFRbs3PyYqRnA="; + hash = "sha256-0Ix8bTOt+5Bzvbx0OrgxvQU/t9IaZlq7gLtCeVPR2qc="; }; build-system = [ @@ -52,7 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Allows superusers to hijack (=login as) and work on behalf of another user"; homepage = "https://github.com/django-hijack/django-hijack"; - changelog = "https://github.com/django-hijack/django-hijack/releases/tag/${version}"; + changelog = "https://github.com/django-hijack/django-hijack/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ ris ]; }; diff --git a/pkgs/development/python-modules/django-mfa3/default.nix b/pkgs/development/python-modules/django-mfa3/default.nix index 5651335e8c2f9..2f7cfff01122f 100644 --- a/pkgs/development/python-modules/django-mfa3/default.nix +++ b/pkgs/development/python-modules/django-mfa3/default.nix @@ -5,7 +5,7 @@ django, setuptools, pyotp, - fido2_2, + fido2, qrcode, python, }: @@ -27,7 +27,7 @@ buildPythonPackage rec { dependencies = [ django pyotp - fido2_2 + fido2 qrcode ]; diff --git a/pkgs/development/python-modules/django-modeltranslation/default.nix b/pkgs/development/python-modules/django-modeltranslation/default.nix index 65bcd446d902e..91ee56a3382d8 100644 --- a/pkgs/development/python-modules/django-modeltranslation/default.nix +++ b/pkgs/development/python-modules/django-modeltranslation/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "django-modeltranslation"; - version = "0.19.14"; + version = "0.19.16"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "deschler"; repo = "django-modeltranslation"; tag = "v${version}"; - hash = "sha256-jvVzSltq4wkSmndyyOGxldXJVpydmCCrHMGTGiMUNA0="; + hash = "sha256-8A5fIZuUMlXe8bHQR0Ha5HoT9VIQsgqpJVMONB5KqCI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/django-pattern-library/default.nix b/pkgs/development/python-modules/django-pattern-library/default.nix index 268187cf852c5..da43dd05c8acf 100644 --- a/pkgs/development/python-modules/django-pattern-library/default.nix +++ b/pkgs/development/python-modules/django-pattern-library/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "django-pattern-library"; - version = "1.3.0"; + version = "1.5.0"; pyproject = true; src = fetchFromGitHub { owner = "torchbox"; repo = "django-pattern-library"; tag = "v${version}"; - hash = "sha256-2a/Rg6ljBe1J0FOob7Z9aNVZZ3l+gTD34QCRjk4PiQg="; + hash = "sha256-urK34rlBU5GuEOlUtmJLGv6wlTP5H/RMAkwQu5S2Jbo="; }; nativeBuildInputs = [ poetry-core ]; @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "UI pattern libraries for Django templates"; homepage = "https://github.com/torchbox/django-pattern-library/"; - changelog = "https://github.com/torchbox/django-pattern-library/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/torchbox/django-pattern-library/blob/${src.tag}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ sephi ]; }; diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix index ff2682c6d3e77..bcc8f58aae387 100644 --- a/pkgs/development/python-modules/django-polymorphic/default.nix +++ b/pkgs/development/python-modules/django-polymorphic/default.nix @@ -11,21 +11,16 @@ buildPythonPackage rec { pname = "django-polymorphic"; - version = "4.0.0"; + version = "4.1.0"; pyproject = true; src = fetchFromGitHub { owner = "django-polymorphic"; repo = "django-polymorphic"; tag = "v${version}"; - hash = "sha256-cEV9gnc9gLpAVmYkzSaQwDbgXsklMTq71edndDJeP9E="; + hash = "sha256-QcJUKGhWPUHhVVsEZhhjN411Pz4Wn7OL2fhotPOGVm4="; }; - patches = [ - # https://github.com/jazzband/django-polymorphic/issues/616 - ./django-5.1-compat.patch - ]; - build-system = [ setuptools ]; dependencies = [ django ]; diff --git a/pkgs/development/python-modules/django-polymorphic/django-5.1-compat.patch b/pkgs/development/python-modules/django-polymorphic/django-5.1-compat.patch deleted file mode 100644 index 42976118728ad..0000000000000 --- a/pkgs/development/python-modules/django-polymorphic/django-5.1-compat.patch +++ /dev/null @@ -1,22 +0,0 @@ -From a2c48cedc45db52469b93b6fa7a5d50c6722586f Mon Sep 17 00:00:00 2001 -From: Ben Gosney -Date: Sun, 25 Aug 2024 14:49:33 +0100 -Subject: [PATCH] fix(query): handle None - ---- - polymorphic/query.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/polymorphic/query.py b/polymorphic/query.py -index 8e93281a..2d2df6c3 100644 ---- a/polymorphic/query.py -+++ b/polymorphic/query.py -@@ -278,7 +278,7 @@ def tree_node_test___lookup(my_model, node): - elif hasattr(a, "get_source_expressions"): - for source_expression in a.get_source_expressions(): - test___lookup(source_expression) -- else: -+ elif a is not None: - assert "___" not in a.name, ___lookup_assert_msg - - for a in args: diff --git a/pkgs/development/python-modules/django-q2/default.nix b/pkgs/development/python-modules/django-q2/default.nix index b520ea4367766..53f3d46dfd900 100644 --- a/pkgs/development/python-modules/django-q2/default.nix +++ b/pkgs/development/python-modules/django-q2/default.nix @@ -10,10 +10,10 @@ django-redis, fetchFromGitHub, hiredis, - pkgs, poetry-core, pytest-django, pytestCheckHook, + redisTestHook, stdenv, }: @@ -49,31 +49,14 @@ buildPythonPackage rec { blessed croniter django-redis - # pyredis refuses to load with hiredis<3.0.0 - (hiredis.overrideAttrs ( - new: old: { - version = "3.1.0"; - src = old.src.override { - tag = "v${new.version}"; - hash = "sha256-ID5OJdARd2N2GYEpcYOpxenpZlhWnWr5fAClAgqEgGg="; - }; - } - )) + hiredis pytest-django pytestCheckHook + redisTestHook ]; pythonImportsCheck = [ "django_q" ]; - preCheck = '' - ${pkgs.valkey}/bin/redis-server & - REDIS_PID=$! - ''; - - postCheck = '' - kill $REDIS_PID - ''; - env = { MONGO_HOST = "127.0.0.1"; REDIS_HOST = "127.0.0.1"; diff --git a/pkgs/development/python-modules/django-rq/default.nix b/pkgs/development/python-modules/django-rq/default.nix index 9d5c228222c1d..1cbd4d7c30112 100644 --- a/pkgs/development/python-modules/django-rq/default.nix +++ b/pkgs/development/python-modules/django-rq/default.nix @@ -1,34 +1,44 @@ { lib, buildPythonPackage, - isPy27, fetchFromGitHub, + hatchling, django, redis, rq, + prometheus-client, sentry-sdk, + psycopg, + pytest-django, + pytestCheckHook, + redisTestHook, }: buildPythonPackage rec { pname = "django-rq"; - version = "3.0.1"; - format = "setuptools"; - disabled = isPy27; + version = "3.1"; + pyproject = true; src = fetchFromGitHub { owner = "rq"; repo = "django-rq"; tag = "v${version}"; - hash = "sha256-f4ilMKMWNr/NVKRhylr0fFiKFEKHXU/zIlPnq7fCYNs="; + hash = "sha256-TnOKgw52ykKcR0gHXcdYfv77js7I63PE1F3POdwJgvc="; }; - propagatedBuildInputs = [ + build-system = [ hatchling ]; + + dependencies = [ django redis rq - sentry-sdk ]; + optional-dependencies = { + prometheus = [ prometheus-client ]; + sentry = [ sentry-sdk ]; + }; + pythonImportsCheck = [ "django_rq" ]; doCheck = false; # require redis-server diff --git a/pkgs/development/python-modules/django-scim2/default.nix b/pkgs/development/python-modules/django-scim2/default.nix index 7125394c00fe0..fa91f8fe1e763 100644 --- a/pkgs/development/python-modules/django-scim2/default.nix +++ b/pkgs/development/python-modules/django-scim2/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "django-scim2"; - version = "0.19.0"; + version = "0.20.0"; pyproject = true; src = fetchFromGitHub { owner = "15five"; repo = "django-scim2"; tag = version; - hash = "sha256-larDh4f9/xVr11/n/WfkJ2Tx45DMQqyK3ZzkWAvzeig="; + hash = "sha256-OsfC6Jc/oQl6nzy3Nr3vkY+XicRxUoV62hK8MHa3LJ8="; }; # remove this when upstream releases a new version > 0.19.0 @@ -51,7 +51,7 @@ buildPythonPackage rec { ]; meta = with lib; { - changelog = "https://github.com/15five/django-scim2/blob/${src.rev}/CHANGES.txt"; + changelog = "https://github.com/15five/django-scim2/blob/${src.tag}/CHANGES.txt"; description = "SCIM 2.0 Service Provider Implementation (for Django)"; homepage = "https://github.com/15five/django-scim2"; license = licenses.mit; diff --git a/pkgs/development/python-modules/django-stubs-ext/default.nix b/pkgs/development/python-modules/django-stubs-ext/default.nix index c0c9b8d8a706e..a2afd5ec0e5d7 100644 --- a/pkgs/development/python-modules/django-stubs-ext/default.nix +++ b/pkgs/development/python-modules/django-stubs-ext/default.nix @@ -2,12 +2,13 @@ lib, buildPythonPackage, django, - fetchPypi, + fetchFromGitHub, + hatchling, oracledb, + pytest-mypy-plugins, + pytest-xdist, pytestCheckHook, - pythonOlder, redis, - hatchling, typing-extensions, }: @@ -16,14 +17,18 @@ buildPythonPackage rec { version = "5.2.2"; pyproject = true; - disabled = pythonOlder "3.10"; - - src = fetchPypi { - pname = "django_stubs_ext"; - inherit version; - hash = "sha256-2dFRuRn+JDh2D1vZOPA+HLCMhNBlH55ZF/ExOQfkJoM="; + src = fetchFromGitHub { + owner = "typeddjango"; + repo = "django-stubs"; + tag = version; + hash = "sha256-kF5g0/rkMQxYTfSrTqzZ6BuqGlE42K/AVhc1/ARc+/c="; }; + postPatch = '' + cd ext + ln -s ../scripts + ''; + build-system = [ hatchling ]; dependencies = [ @@ -36,8 +41,18 @@ buildPythonPackage rec { oracle = [ oracledb ]; }; + nativeCheckInputs = [ + pytest-mypy-plugins + pytest-xdist + pytestCheckHook + ]; + + disabledTestPaths = [ + # error: Skipping analyzing "django.db": module is installed, but missing library stubs or py.typed marker [import-untyped] (diff) + "tests/typecheck" + ]; + # Tests are not shipped with PyPI - doCheck = false; pythonImportsCheck = [ "django_stubs_ext" ]; diff --git a/pkgs/development/python-modules/django-stubs/default.nix b/pkgs/development/python-modules/django-stubs/default.nix index 1bc25588fcd8b..d18c267c68469 100644 --- a/pkgs/development/python-modules/django-stubs/default.nix +++ b/pkgs/development/python-modules/django-stubs/default.nix @@ -5,12 +5,12 @@ django, fetchFromGitHub, hatchling, + redis, mypy, + pytest-mypy-plugins, oracledb, pytestCheckHook, - pytest-mypy-plugins, pythonOlder, - redis, tomli, types-pytz, types-pyyaml, @@ -23,8 +23,6 @@ buildPythonPackage rec { version = "5.2.2"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "typeddjango"; repo = "django-stubs"; @@ -56,12 +54,10 @@ buildPythonPackage rec { pytest-mypy-plugins pytestCheckHook ] - ++ lib.flatten (builtins.attrValues optional-dependencies); - - pythonImportsCheck = [ "django-stubs" ]; + ++ lib.flatten (lib.attrValues optional-dependencies); disabledTests = [ - # AttributeError: module 'django.contrib.auth.forms' has no attribute + # AttributeError: module 'django.contrib.auth.forms' has no attribute 'SetUnusablePasswordMixin' "test_find_classes_inheriting_from_generic" ]; @@ -70,6 +66,8 @@ buildPythonPackage rec { "tests/typecheck/" ]; + pythonImportsCheck = [ "django-stubs" ]; + meta = with lib; { description = "PEP-484 stubs for Django"; homepage = "https://github.com/typeddjango/django-stubs"; diff --git a/pkgs/development/python-modules/django-tasks/default.nix b/pkgs/development/python-modules/django-tasks/default.nix index b7798dce23198..e8d556f773b4f 100644 --- a/pkgs/development/python-modules/django-tasks/default.nix +++ b/pkgs/development/python-modules/django-tasks/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "django-tasks"; - version = "0.7.0"; + version = "0.8.1"; pyproject = true; src = fetchFromGitHub { owner = "RealOrangeOne"; repo = "django-tasks"; tag = version; - hash = "sha256-AWsqAvn11uklrFXtiV2a6fR3owZ02osEzrdHZgDKkOM="; + hash = "sha256-fXXqPmpyIq+66okWDmTIBaoaslY8BSILXjJWn8cXnMM="; }; build-system = [ @@ -65,6 +65,8 @@ buildPythonPackage rec { "test_dry_run" # AssertionError: '' != 'Deleted 1 task result(s)' "test_prunes_tasks" + # AssertionError: 'Run maximum tasks (2)' not found in '' + "test_max_tasks" ]; preCheck = '' @@ -74,7 +76,7 @@ buildPythonPackage rec { meta = { description = "Reference implementation and backport of background workers and tasks in Django"; homepage = "https://github.com/RealOrangeOne/django-tasks"; - changelog = "https://github.com/RealOrangeOne/django-tasks/releases/tag/${version}"; + changelog = "https://github.com/RealOrangeOne/django-tasks/releases/tag/${src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ GaetanLepage ]; }; diff --git a/pkgs/development/python-modules/django-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix index 30bd093ac061d..1d9693514dcab 100644 --- a/pkgs/development/python-modules/django-webpack-loader/default.nix +++ b/pkgs/development/python-modules/django-webpack-loader/default.nix @@ -2,29 +2,27 @@ lib, buildPythonPackage, django, - fetchPypi, - pythonOlder, + fetchFromGitHub, setuptools-scm, }: buildPythonPackage rec { pname = "django-webpack-loader"; - version = "3.1.1"; + version = "3.2.1"; pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-8Rt5cA0b/BKZExvfS6R5wewgD4OhQA4aL+tcK6e2+MQ="; + src = fetchFromGitHub { + owner = "django-webpack"; + repo = "django-webpack-loader"; + tag = version; + hash = "sha256-2CmIaVDSZlqfSJVPVBmOcT89znjxQhe7ZHhe7i6DCGY="; }; build-system = [ setuptools-scm ]; dependencies = [ django ]; - # django.core.exceptions.ImproperlyConfigured (path issue with DJANGO_SETTINGS_MODULE?) - doCheck = false; + doCheck = false; # tests require fetching node_modules pythonImportsCheck = [ "webpack_loader" ]; diff --git a/pkgs/development/python-modules/django/3.13.6-html-parser.patch b/pkgs/development/python-modules/django/3.13.6-html-parser.patch new file mode 100644 index 0000000000000..6d986be384782 --- /dev/null +++ b/pkgs/development/python-modules/django/3.13.6-html-parser.patch @@ -0,0 +1,58 @@ +From e0a1e8d549e7be25960b8ad060c63def3dc35d1d Mon Sep 17 00:00:00 2001 +From: Natalia <124304+nessita@users.noreply.github.com> +Date: Mon, 21 Jul 2025 15:23:32 -0300 +Subject: [PATCH 1/2] Fixed test_utils.tests.HTMLEqualTests.test_parsing_errors + following Python's HTMLParser fixed parsing. + +Further details about Python changes can be found in: +https://github.com/python/cpython/commit/0243f97cbadec8d985e63b1daec5d1cbc850cae3. + +Thank you Clifford Gama for the thorough review! +--- + tests/test_utils/tests.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/test_utils/tests.py b/tests/test_utils/tests.py +index 37e87aa1022c..9c22b61b4ff2 100644 +--- a/tests/test_utils/tests.py ++++ b/tests/test_utils/tests.py +@@ -962,7 +962,7 @@ def test_parsing_errors(self): + "('Unexpected end tag `div` (Line 1, Column 6)', (1, 6))" + ) + with self.assertRaisesMessage(AssertionError, error_msg): +- self.assertHTMLEqual("< div>", "
") ++ self.assertHTMLEqual("< div>", "
") + with self.assertRaises(HTMLParseError): + parse_html("

") + + +From e8afcf0e644553bcba3e5f931266963bffc46748 Mon Sep 17 00:00:00 2001 +From: Natalia <124304+nessita@users.noreply.github.com> +Date: Mon, 14 Jul 2025 14:45:03 -0300 +Subject: [PATCH 2/2] Fixed #36499 -- Adjusted + utils_tests.test_html.TestUtilsHtml.test_strip_tags following Python's + HTMLParser new behavior. + +Python fixed a quadratic complexity processing for HTMLParser in: +https://github.com/python/cpython/commit/6eb6c5dbfb528bd07d77b60fd71fd05d81d45c41. +--- + tests/utils_tests/test_html.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/utils_tests/test_html.py b/tests/utils_tests/test_html.py +index 284f33aedcfb..51573b81eb9d 100644 +--- a/tests/utils_tests/test_html.py ++++ b/tests/utils_tests/test_html.py +@@ -142,10 +142,10 @@ def test_strip_tags(self): + ("&gotcha&#;<>", "&gotcha&#;<>"), + ("ript>test</script>", "ript>test"), + ("&h", "alert()h"), +- (">"), + ("X<<<
br>br>br>X", "XX"), + ("<" * 50 + "a>" * 50, ""), +- (">" + "" + "" + ""), + ("=8.0.1 - # https://github.com/fonttools/fonttools/issues/3458 - "Tests/ttLib/woff2_test.py" - "Tests/ttx/ttx_test.py" - ]; - meta = with lib; { homepage = "https://github.com/fonttools/fonttools"; description = "Library to manipulate font files from Python"; diff --git a/pkgs/development/python-modules/fonttools/python-3.13.4.patch b/pkgs/development/python-modules/fonttools/python-3.13.4.patch deleted file mode 100644 index c05def255b17b..0000000000000 --- a/pkgs/development/python-modules/fonttools/python-3.13.4.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/Lib/fontTools/feaLib/ast.py b/Lib/fontTools/feaLib/ast.py -index efcce8c680..18e5a891d3 100644 ---- a/Lib/fontTools/feaLib/ast.py -+++ b/Lib/fontTools/feaLib/ast.py -@@ -719,7 +719,8 @@ def __init__(self, prefix, glyphs, suffix, lookups, location=None): - for i, lookup in enumerate(lookups): - if lookup: - try: -- (_ for _ in lookup) -+ for _ in lookup: -+ break - except TypeError: - self.lookups[i] = [lookup] - -@@ -777,7 +778,8 @@ def __init__(self, prefix, glyphs, suffix, lookups, location=None): - for i, lookup in enumerate(lookups): - if lookup: - try: -- (_ for _ in lookup) -+ for _ in lookup: -+ break - except TypeError: - self.lookups[i] = [lookup] - - diff --git a/pkgs/development/python-modules/foxdot/default.nix b/pkgs/development/python-modules/foxdot/default.nix index c9bdda75abb6f..1fdce02786946 100644 --- a/pkgs/development/python-modules/foxdot/default.nix +++ b/pkgs/development/python-modules/foxdot/default.nix @@ -3,22 +3,24 @@ stdenv, buildPythonPackage, fetchPypi, + setuptools, tkinter, supercollider, }: buildPythonPackage rec { pname = "foxdot"; - version = "0.8.12"; - format = "setuptools"; + version = "0.9.0"; + pyproject = true; src = fetchPypi { - pname = "FoxDot"; - inherit version; - sha256 = "528999da55ad630e540a39c0eaeacd19c58c36f49d65d24ea9704d0781e18c90"; + inherit pname version; + hash = "sha256-9dIaqrGcYpZeWlRlymRvG9YnTRav0zktfmUpFBlN/7E="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ tkinter ] # we currently build SuperCollider only on Linux diff --git a/pkgs/development/python-modules/fpdf2/default.nix b/pkgs/development/python-modules/fpdf2/default.nix index 55a223cc859af..41e518d004906 100644 --- a/pkgs/development/python-modules/fpdf2/default.nix +++ b/pkgs/development/python-modules/fpdf2/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "fpdf2"; - version = "2.8.2"; + version = "2.8.3"; pyproject = true; src = fetchFromGitHub { owner = "py-pdf"; repo = "fpdf2"; tag = version; - hash = "sha256-NfHMmyFT+ZpqfRc41DetbFXs/twr12XagOkk3nGhrYk="; + hash = "sha256-uLaVRseakLg7Q9QO4F6BM7vQIFeA44ry8cqDfas8oMA="; }; nativeBuildInputs = [ setuptools ]; @@ -63,7 +63,7 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/py-pdf/fpdf2"; description = "Simple PDF generation for Python"; - changelog = "https://github.com/py-pdf/fpdf2/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/py-pdf/fpdf2/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.lgpl3Only; maintainers = with lib.maintainers; [ jfvillablanca ]; }; diff --git a/pkgs/development/python-modules/freezegun/default.nix b/pkgs/development/python-modules/freezegun/default.nix index 046b3f20046fe..991a4d67c5b11 100644 --- a/pkgs/development/python-modules/freezegun/default.nix +++ b/pkgs/development/python-modules/freezegun/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "freezegun"; - version = "1.5.1"; + version = "1.5.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-sp3t/NptXo4IPOcbK1QnU61Iz+xEA3s/x5cC4pgKiek="; + hash = "sha256-eYuTcv3U2QfzPotqWLxk5oLZ/6jUlM5g94AZfugfrtE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/freud/default.nix b/pkgs/development/python-modules/freud/default.nix index 360b15d8439ca..b7f7646f18bd2 100644 --- a/pkgs/development/python-modules/freud/default.nix +++ b/pkgs/development/python-modules/freud/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "freud"; - version = "3.1.0"; + version = "3.3.1"; pyproject = true; src = fetchFromGitHub { owner = "glotzerlab"; repo = "freud"; tag = "v${version}"; - hash = "sha256-jlscEHQ1q4oqxE06NhVWCOlPRcjDcJVrvy4h6iYrkz0="; + hash = "sha256-3THoGPjfaDy2s96+Oaf1f2SDzxTaqRDQlNa3gZ/ytUU="; fetchSubmodules = true; }; @@ -93,7 +93,7 @@ buildPythonPackage rec { meta = { description = "Powerful, efficient particle trajectory analysis in scientific Python"; homepage = "https://github.com/glotzerlab/freud"; - changelog = "https://github.com/glotzerlab/freud/blob/${src.rev}/ChangeLog.md"; + changelog = "https://github.com/glotzerlab/freud/blob/${src.tag}/ChangeLog.md"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ doronbehar ]; }; diff --git a/pkgs/development/python-modules/frozenlist/default.nix b/pkgs/development/python-modules/frozenlist/default.nix index 967df73bac5d3..3a18ffc017d6b 100644 --- a/pkgs/development/python-modules/frozenlist/default.nix +++ b/pkgs/development/python-modules/frozenlist/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "frozenlist"; - version = "1.6.0"; + version = "1.7.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "frozenlist"; tag = "v${version}"; - hash = "sha256-x2o4eiSDxA7nvrifzvV38kjIGmOY8gaQrPNDhCupovg="; + hash = "sha256-aBHX/U1L2mcah80edJFY/iXsM05DVas7lJT8yVTjER8="; }; postPatch = '' @@ -48,7 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for list-like structure"; homepage = "https://github.com/aio-libs/frozenlist"; - changelog = "https://github.com/aio-libs/frozenlist/blob/v${version}/CHANGES.rst"; + changelog = "https://github.com/aio-libs/frozenlist/blob/${src.tag}/CHANGES.rst"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/fugashi/default.nix b/pkgs/development/python-modules/fugashi/default.nix index d2d60b3e8143b..b2e5997ace6bb 100644 --- a/pkgs/development/python-modules/fugashi/default.nix +++ b/pkgs/development/python-modules/fugashi/default.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitHub, - pythonOlder, pytestCheckHook, buildPythonPackage, cython, @@ -15,8 +14,7 @@ buildPythonPackage rec { pname = "fugashi"; version = "1.5.1"; - format = "pyproject"; - disabled = pythonOlder "3.9"; + pyproject = true; src = fetchFromGitHub { owner = "polm"; @@ -25,7 +23,12 @@ buildPythonPackage rec { hash = "sha256-rkQskRz7lgVBrqBeyj9kWO2/7POrZ0TaM+Z7mhpZLvM="; }; - nativeBuildInputs = [ + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "Cython~=3.0.11" "Cython" + ''; + + build-system = [ cython mecab setuptools-scm @@ -51,7 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cython MeCab wrapper for fast, pythonic Japanese tokenization and morphological analysis"; homepage = "https://github.com/polm/fugashi"; - changelog = "https://github.com/polm/fugashi/releases/tag/${version}"; + changelog = "https://github.com/polm/fugashi/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ laurent-f1z1 ]; }; diff --git a/pkgs/development/python-modules/functions-framework/default.nix b/pkgs/development/python-modules/functions-framework/default.nix index cd0e2177eba69..20cd253b2e0a3 100644 --- a/pkgs/development/python-modules/functions-framework/default.nix +++ b/pkgs/development/python-modules/functions-framework/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "functions-framework-python"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-TvC+URJtsquBX/5F5Z2Nw/4sD3hsvF2c/jlv87lGjfM="; }; @@ -67,7 +67,7 @@ buildPythonPackage rec { meta = { description = "FaaS (Function as a service) framework for writing portable Python functions"; homepage = "https://github.com/GoogleCloudPlatform/functions-framework-python"; - changelog = "https://github.com/GoogleCloudPlatform/functions-framework-python/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/GoogleCloudPlatform/functions-framework-python/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/functiontrace/default.nix b/pkgs/development/python-modules/functiontrace/default.nix index 7da09ce41208f..e08ca4340ac19 100644 --- a/pkgs/development/python-modules/functiontrace/default.nix +++ b/pkgs/development/python-modules/functiontrace/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "functiontrace"; - version = "0.3.10"; + version = "0.5.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-E2MNp3wKb9FEjEQK/vL/XBfScPuAwbWV5JeA9+ujckY="; + hash = "sha256-yRzcg8BDuwF74J2EYa/3GMkTaRGsx0WyDIQEWHwj12M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/furo/default.nix b/pkgs/development/python-modules/furo/default.nix index 71bc32d7a5168..2bb4606fada42 100644 --- a/pkgs/development/python-modules/furo/default.nix +++ b/pkgs/development/python-modules/furo/default.nix @@ -1,48 +1,75 @@ { lib, + buildNpmPackage, buildPythonPackage, - pythonOlder, - fetchPypi, - sphinx, + fetchFromGitHub, + flit-core, + accessible-pygments, beautifulsoup4, + pygments, + sphinx, sphinx-basic-ng, }: -buildPythonPackage rec { +let pname = "furo"; - version = "2024.8.6"; - format = "wheel"; + version = "2025.07.19"; + + src = fetchFromGitHub { + owner = "pradyunsg"; + repo = "furo"; + tag = version; + hash = "sha256-pIF5zrh5YbkuSkrateEB/tDULSNbeVn2Qx+Fm3nOYGE="; + }; - disabled = pythonOlder "3.8"; + web = buildNpmPackage { + pname = "${pname}-web"; + inherit version src; - src = fetchPypi { - inherit pname version format; - dist = "py3"; - python = "py3"; - hash = "sha256-bNl8WLR4E9NhnmPpCBFpiA++Mx8MqIPIcf8fPxGBT1w="; + npmDepsHash = "sha256-dcdHoyqF9zC/eKtEqMho7TK2E1KIvoXo0iwSPTzj+Kw="; + + installPhase = '' + pushd src/furo/theme/furo/static + mkdir $out + cp -rv scripts styles $out/ + popd + ''; }; +in + +buildPythonPackage rec { + inherit pname version src; + pyproject = true; + + postPatch = '' + # build with boring backend that does not manage a node env + substituteInPlace pyproject.toml \ + --replace-fail "sphinx-theme-builder >= 0.2.0a10" "flit-core" \ + --replace-fail "sphinx_theme_builder" "flit_core.buildapi" + + pushd src/furo/theme/furo/static + cp -rv ${web}/{scripts,styles} . + popd + ''; + + build-system = [ flit-core ]; pythonRelaxDeps = [ "sphinx" ]; - propagatedBuildInputs = [ - sphinx + dependencies = [ + accessible-pygments beautifulsoup4 + pygments + sphinx sphinx-basic-ng ]; - installCheckPhase = '' - # furo was built incorrectly if this directory is empty - # Ignore the hidden file .gitignore - cd "$out/lib/python"* - if [ "$(ls 'site-packages/furo/theme/furo/static/' | wc -l)" -le 0 ]; then - echo 'static directory must not be empty' - exit 1 - fi - cd - - ''; - pythonImportsCheck = [ "furo" ]; + passthru = { + inherit web; + }; + meta = with lib; { description = "Clean customizable documentation theme for Sphinx"; homepage = "https://github.com/pradyunsg/furo"; diff --git a/pkgs/development/python-modules/fyta-cli/default.nix b/pkgs/development/python-modules/fyta-cli/default.nix index c81ec0c160a66..4c92997a7fa8f 100644 --- a/pkgs/development/python-modules/fyta-cli/default.nix +++ b/pkgs/development/python-modules/fyta-cli/default.nix @@ -33,6 +33,8 @@ buildPythonPackage rec { mashumaro ]; + doCheck = false; # Failed: async def functions are not natively supported. + nativeCheckInputs = [ aioresponses pytest-asyncio diff --git a/pkgs/development/python-modules/gdsfactory/default.nix b/pkgs/development/python-modules/gdsfactory/default.nix index cfd04c5ec56a4..b591a368133f2 100644 --- a/pkgs/development/python-modules/gdsfactory/default.nix +++ b/pkgs/development/python-modules/gdsfactory/default.nix @@ -46,14 +46,14 @@ }: buildPythonPackage rec { pname = "gdsfactory"; - version = "9.5.2"; + version = "9.12.0"; pyproject = true; src = fetchFromGitHub { owner = "gdsfactory"; repo = "gdsfactory"; tag = "v${version}"; - hash = "sha256-BcFEMcHt0qUQ0hTLSznuIH37rAk+10JGrPdrhE/sTfU="; + hash = "sha256-en976F8BjMK8Ku1QXz4MIxTs+mswVBascmGguPXeEbI="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index ac3b0e6e2057d..5609564aeb0c4 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -8,13 +8,14 @@ shapely, sqlalchemy, alembic, + pytest-benchmark, pytestCheckHook, pythonOlder, }: buildPythonPackage rec { pname = "geoalchemy2"; - version = "0.17.1"; + version = "0.18.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "geoalchemy"; repo = "geoalchemy2"; tag = version; - hash = "sha256-ze0AWwlmBsMUhbmaCNUeEwhFcLxRDeal0IDO421++ck="; + hash = "sha256-xQxry/JJTkhsailk12lhu1SkpLlx0By/D35VSw+S/4M="; }; build-system = [ @@ -38,10 +39,13 @@ buildPythonPackage rec { nativeCheckInputs = [ alembic + pytest-benchmark pytestCheckHook ] ++ optional-dependencies.shapely; + pytestFlags = [ "--benchmark-disable" ]; + disabledTestPaths = [ # tests require live databases "tests/gallery/test_decipher_raster.py" diff --git a/pkgs/development/python-modules/geocachingapi/default.nix b/pkgs/development/python-modules/geocachingapi/default.nix index 47364ccbea160..554df72a7009a 100644 --- a/pkgs/development/python-modules/geocachingapi/default.nix +++ b/pkgs/development/python-modules/geocachingapi/default.nix @@ -33,6 +33,8 @@ buildPythonPackage rec { yarl ]; + pythonRelaxDeps = [ "reverse_geocode" ]; + # Tests require a token and network access doCheck = false; diff --git a/pkgs/development/python-modules/geoip2/default.nix b/pkgs/development/python-modules/geoip2/default.nix index 01c3a58f6fb48..0a397725ac9ce 100644 --- a/pkgs/development/python-modules/geoip2/default.nix +++ b/pkgs/development/python-modules/geoip2/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "geoip2"; - version = "5.0.1"; + version = "5.1.0"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-kK+LbTaH877yUfJwitAXsw1ifRFEwAQOq8TJAXqAfYY="; + hash = "sha256-7j+H8M6TJetkhP4Yy9l3GgPQorrR3RVvo1hPr6Vi05o="; }; build-system = [ diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index 9d7d1e1d9bf4c..3c9c36b0311bd 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -1,11 +1,8 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch, pytestCheckHook, - pythonOlder, setuptools, packaging, @@ -29,27 +26,16 @@ buildPythonPackage rec { pname = "geopandas"; - version = "1.0.1"; + version = "1.1.1"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "geopandas"; repo = "geopandas"; tag = "v${version}"; - hash = "sha256-SZizjwkx8dsnaobDYpeQm9jeXZ4PlzYyjIScnQrH63Q="; + hash = "sha256-7ZsO4jresikA17M8cyHskdcVnTscGHxTCLJv5p1SvfI="; }; - patches = [ - (fetchpatch { - # Remove geom_almost_equals, because it broke with shapely 2.1.0 and is not being updated - url = "https://github.com/geopandas/geopandas/commit/0e1f871a02e9612206dcadd6817284131026f61c.patch"; - excludes = [ "CHANGELOG.md" ]; - hash = "sha256-n9AmmbjjNwV66lxDQV2hfkVVfxRgMfEGfHZT6bql684="; - }) - ]; - build-system = [ setuptools ]; dependencies = [ @@ -102,7 +88,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python geospatial data analysis framework"; homepage = "https://geopandas.org"; - changelog = "https://github.com/geopandas/geopandas/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/geopandas/geopandas/blob/${src.tag}/CHANGELOG.md"; license = licenses.bsd3; teams = [ teams.geospatial ]; }; diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix index b9cf371ab744a..6da0af5310e99 100644 --- a/pkgs/development/python-modules/geopy/default.nix +++ b/pkgs/development/python-modules/geopy/default.nix @@ -4,7 +4,7 @@ docutils, fetchFromGitHub, geographiclib, - pytestCheckHook, + pytest7CheckHook, pythonAtLeast, pythonOlder, pytz, @@ -27,7 +27,7 @@ buildPythonPackage rec { nativeCheckInputs = [ docutils - pytestCheckHook + pytest7CheckHook pytz ]; diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index bc996a338ab38..4158ef056ad5d 100644 --- a/pkgs/development/python-modules/gevent/default.nix +++ b/pkgs/development/python-modules/gevent/default.nix @@ -11,10 +11,8 @@ greenlet, importlib-metadata, setuptools, - wheel, zope-event, zope-interface, - pythonOlder, c-ares, libuv, @@ -26,20 +24,17 @@ buildPythonPackage rec { pname = "gevent"; - version = "24.11.1"; - format = "pyproject"; - - disabled = pythonOlder "3.7"; + version = "25.5.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-i9FBkRTp5KPtM6W612av/5o892XLRApYKhs6m8gMGso="; + hash = "sha256-WCyUj6miMYi4kNC8Ewc0pQbQOaLlrYfa4nakVsxoPmE="; }; - nativeBuildInputs = [ + build-system = [ cython setuptools - wheel ] ++ lib.optionals (!isPyPy) [ cffi ]; @@ -49,7 +44,7 @@ buildPythonPackage rec { c-ares ]; - propagatedBuildInputs = [ + dependencies = [ importlib-metadata zope-event zope-interface diff --git a/pkgs/development/python-modules/githubkit/default.nix b/pkgs/development/python-modules/githubkit/default.nix index 4b8b24fdf04ba..b24fdbe1e6395 100644 --- a/pkgs/development/python-modules/githubkit/default.nix +++ b/pkgs/development/python-modules/githubkit/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "githubkit"; - version = "0.12.13"; + version = "0.13.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "yanyongyu"; repo = "githubkit"; tag = "v${version}"; - hash = "sha256-TMn81YY44bXUyU6GHSGtLtQ7aC2/vA9nZf/PaGhBi0s="; + hash = "sha256-BhTGik8JZ9QxE8zmfgToU7rVkY8T5iykJx4Bg4evyzY="; }; pythonRelaxDeps = [ "hishel" ]; diff --git a/pkgs/development/python-modules/gitingest/default.nix b/pkgs/development/python-modules/gitingest/default.nix index e1126aeef371b..48fc94d64b0e4 100644 --- a/pkgs/development/python-modules/gitingest/default.nix +++ b/pkgs/development/python-modules/gitingest/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "gitingest"; - version = "0.1.5"; + version = "0.3.1"; pyproject = true; src = fetchFromGitHub { owner = "cyclotruc"; repo = "gitingest"; tag = "v${version}"; - hash = "sha256-f/srwLhTXboSlW28qnShqTuc2yLMuHH3MyzfKpDIitQ="; + hash = "sha256-drsncGneZyOCC2GJbrDM+bf4QGI2luacxMhrmdk03l4="; }; build-system = [ diff --git a/pkgs/development/python-modules/gitpython/default.nix b/pkgs/development/python-modules/gitpython/default.nix index e3e9d05ae8d8a..5bfda634e1360 100644 --- a/pkgs/development/python-modules/gitpython/default.nix +++ b/pkgs/development/python-modules/gitpython/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "gitpython"; - version = "3.1.44"; + version = "3.1.45"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gitpython-developers"; repo = "GitPython"; tag = version; - hash = "sha256-KnKaBv/tKk4wiGWUWCEgd1vgrTouwUhqxJ1/nMjRaWk="; + hash = "sha256-VHnuHliZEc/jiSo/Zi9J/ipAykj7D6NttuzPZiE8svM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix index cdb94a007b64a..fb91ab4ebe95b 100644 --- a/pkgs/development/python-modules/glean-parser/default.nix +++ b/pkgs/development/python-modules/glean-parser/default.nix @@ -4,34 +4,29 @@ click, diskcache, fetchPypi, + hatchling, + hatch-vcs, jinja2, jsonschema, platformdirs, pytestCheckHook, pyyaml, - setuptools, - setuptools-scm, }: buildPythonPackage rec { pname = "glean-parser"; - version = "17.1.0"; + version = "17.3.0"; pyproject = true; src = fetchPypi { pname = "glean_parser"; inherit version; - hash = "sha256-pZq2bdc0qL6n16LLYyJ2YC3YmUEe4cHLifQ5qDO6FZg="; + hash = "sha256-9w+0SWQ2Bo+B73hgKaGzafYa4vkyfusvpQM126We4hQ="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace-fail "pytest-runner" "" - ''; - build-system = [ - setuptools - setuptools-scm + hatchling + hatch-vcs ]; dependencies = [ diff --git a/pkgs/development/python-modules/glocaltokens/default.nix b/pkgs/development/python-modules/glocaltokens/default.nix index 42f0d66968a1d..118ef46fe4d7c 100644 --- a/pkgs/development/python-modules/glocaltokens/default.nix +++ b/pkgs/development/python-modules/glocaltokens/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "glocaltokens"; - version = "0.7.5"; + version = "0.7.6"; pyproject = true; src = fetchFromGitHub { owner = "leikoilja"; repo = "glocaltokens"; tag = "v${version}"; - hash = "sha256-anIiYNUVHHzv21yV7Y3S+lIst3iWEwgQZD9Ymx86tbk="; + hash = "sha256-+7HpyZUumu1r/UXM4awckjTkpVbCz7MsAJOp2JiJzho="; }; build-system = [ diff --git a/pkgs/development/python-modules/glueviz/default.nix b/pkgs/development/python-modules/glueviz/default.nix index 31d3a412118c2..e33d009e87489 100644 --- a/pkgs/development/python-modules/glueviz/default.nix +++ b/pkgs/development/python-modules/glueviz/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "glueviz"; - version = "1.22.2"; + version = "1.23.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "glue-viz"; repo = "glue"; tag = "v${version}"; - hash = "sha256-5YwZxVer3icA/7YmUIXTuyIlZYKrlFn5+4OYMbfvIlU="; + hash = "sha256-Ql5eMyMm48zNLQ3tkPyqM4+r3QfxqVAGHx1/LcLUiyo="; }; buildInputs = [ pyqt-builder ]; diff --git a/pkgs/development/python-modules/glyphslib/default.nix b/pkgs/development/python-modules/glyphslib/default.nix index 3cd569339bf04..5827c8bdabef4 100644 --- a/pkgs/development/python-modules/glyphslib/default.nix +++ b/pkgs/development/python-modules/glyphslib/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "glyphslib"; - version = "6.11.0"; + version = "6.11.4"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "googlefonts"; repo = "glyphsLib"; tag = "v${version}"; - hash = "sha256-hJLJ30ZT6uRSVTUi6XPGyn9fncy1A1hvhgRKTL9a2gs="; + hash = "sha256-gOzETXI2ZgW69qxbrXxsXfBEJaVhYrcqwjRjCsryqmk="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix index 76b7f78528eb2..9269c2d259cd1 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "2.24.2"; + version = "2.25.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "googleapis"; repo = "python-api-core"; tag = "v${version}"; - hash = "sha256-7/9oU8KqwvL7DIDKDIUlGxfJZp7kGp1W6/tsEp6zcuc="; + hash = "sha256-lh4t03upQQxY2KGwucXfEeNvqVVXlZ6hjR/e47imetk="; }; build-system = [ setuptools ]; @@ -86,7 +86,7 @@ buildPythonPackage rec { helpers used by all Google API clients. ''; homepage = "https://github.com/googleapis/python-api-core"; - changelog = "https://github.com/googleapis/python-api-core/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/googleapis/python-api-core/blob/${src.tag}/CHANGELOG.md"; license = licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 35a3b4b54d75d..304595531a241 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.169.0"; + version = "2.177.0"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "google-api-python-client"; tag = "v${version}"; - hash = "sha256-XJwZ/gWL2pO9P+HuN6BtVbacNjwbZV2jW6FVLgNsj/0="; + hash = "sha256-CEjbUIXtG5z1/28DsNCm/npMSd/+DyY5PMJHm9XDe2M="; }; build-system = [ setuptools ]; @@ -43,7 +43,7 @@ buildPythonPackage rec { any new features. ''; homepage = "https://github.com/google/google-api-python-client"; - changelog = "https://github.com/googleapis/google-api-python-client/releases/tag/v${version}"; + changelog = "https://github.com/googleapis/google-api-python-client/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.sarahec ]; }; diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index 1990720e3159f..e0389c8f8f410 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "google-auth"; - version = "2.40.2"; + version = "2.40.3"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "google-auth-library-python"; tag = "v${version}"; - hash = "sha256-jO6brNdTH8BitLKKP/nwrlUo5hfQnThT/bPbzefvRbM="; + hash = "sha256-X1HTh24oos2GUxB9DDLtNH7BsBRLD0S/ngjsDAQYvhI="; }; build-system = [ setuptools ]; @@ -64,6 +64,8 @@ buildPythonPackage rec { requests = [ requests ]; }; + pythonRelaxDeps = [ "cachetools" ]; + nativeCheckInputs = [ aioresponses flask @@ -101,7 +103,7 @@ buildPythonPackage rec { authentication mechanisms to access Google APIs. ''; homepage = "https://github.com/googleapis/google-auth-library-python"; - changelog = "https://github.com/googleapis/google-auth-library-python/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/googleapis/google-auth-library-python/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.sarahec ]; }; diff --git a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix index b5016ef747600..965c6bab7362b 100644 --- a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix +++ b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix @@ -7,6 +7,7 @@ lib, proto-plus, protobuf, + pytest-asyncio, pytestCheckHook, pythonOlder, setuptools, @@ -36,7 +37,10 @@ buildPythonPackage rec { ] ++ google-api-core.optional-dependencies.grpc; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; pythonImportsCheck = [ "google.cloud.artifactregistry" diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index 6c8f06f8d6f36..6cc9e31a97f5f 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.30.1"; + version = "3.31.3"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-python"; - tag = "google-cloud-asset-v${version}"; - sha256 = "sha256-4Ifg9igzsVR8pWH/lcrGwCnByqYQjPKChNPJGmmQbKI="; + tag = "google-cloud-build-v${version}"; + sha256 = "sha256-qQ+8X6I8lt4OTgbvODsbdab2dYUk0wxWsbaVT2T651U="; }; sourceRoot = "${src.name}/packages/google-cloud-asset"; @@ -76,7 +76,7 @@ buildPythonPackage rec { meta = { description = "Python Client for Google Cloud Asset API"; homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-asset"; - changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-asset-v${version}/packages/google-cloud-asset/CHANGELOG.md"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-asset-${src.tag}/packages/google-cloud-asset/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.sarahec ]; }; diff --git a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix index 2d63743221f3b..f146ff26ee1dc 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-storage"; - version = "2.30.0"; + version = "2.32.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_bigquery_storage"; inherit version; - hash = "sha256-QayD+p7dvIIBAhd5hKuS+Le736fZDqZLOgr17LT8o/I="; + hash = "sha256-6UT19DhfC+J+BJ5z5NzPVIt3NIMBZjp3O10Dq9vUniA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index b98ab101924b7..73cb6d0832985 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -37,13 +37,13 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "3.31.0"; + version = "3.35.1"; pyproject = true; src = fetchPypi { pname = "google_cloud_bigquery"; inherit version; - hash = "sha256-uJ3HFtvkq9t6T4c/cFAQAoe8mFFOBhTF1UzWqOn7CZE="; + hash = "sha256-WZ8mys8ZCs/ogAD2zF9Lyea6rHiZ5PQGygVPGQb3GWA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index de60cd24d2a37..86061cedbc546 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.27.1"; + version = "3.31.3"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-python"; - tag = "google-cloud-datacatalog-v${version}"; - hash = "sha256-4Ifg9igzsVR8pWH/lcrGwCnByqYQjPKChNPJGmmQbKI="; + tag = "google-cloud-build-v${version}"; + hash = "sha256-qQ+8X6I8lt4OTgbvODsbdab2dYUk0wxWsbaVT2T651U="; }; sourceRoot = "${src.name}/packages/google-cloud-datacatalog"; @@ -57,7 +57,7 @@ buildPythonPackage rec { meta = { description = "Google Cloud Data Catalog API API client library"; homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-datacatalog"; - changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-datacatalog-v${version}/packages/google-cloud-datacatalog/CHANGELOG.md"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-datacatalog-${src.tag}/packages/google-cloud-datacatalog/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.sarahec ]; }; diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix index a9f77a1c8582a..21e96f3e9aa9a 100644 --- a/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-cloud-iam"; - version = "2.19.0"; + version = "3.31.3"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-python"; - tag = "google-cloud-iam-v${version}"; - hash = "sha256-E1LISOLQcXqUMTTPLR+lwkR6gF1fuGGB44j38cIK/Z4="; + tag = "google-cloud-build-v${version}"; + hash = "sha256-qQ+8X6I8lt4OTgbvODsbdab2dYUk0wxWsbaVT2T651U="; }; sourceRoot = "${src.name}/packages/google-cloud-iam"; diff --git a/pkgs/development/python-modules/google-cloud-netapp/default.nix b/pkgs/development/python-modules/google-cloud-netapp/default.nix index 8cb21256a174d..7b8efdc6c2541 100644 --- a/pkgs/development/python-modules/google-cloud-netapp/default.nix +++ b/pkgs/development/python-modules/google-cloud-netapp/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-netapp"; - version = "0.3.23"; + version = "3.31.3"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-python"; - rev = "google-cloud-netapp-v${version}"; - hash = "sha256-ietiyPCghGUD1jlGdZMhVgVozAlyfdvYgkV6NNlzLQg="; + tag = "google-cloud-build-v${version}"; + hash = "sha256-qQ+8X6I8lt4OTgbvODsbdab2dYUk0wxWsbaVT2T651U="; }; sourceRoot = "${src.name}/packages/google-cloud-netapp"; @@ -55,7 +55,7 @@ buildPythonPackage rec { meta = { description = "Python Client for NetApp API"; homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-netapp"; - changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-netapp-v${version}/packages/google-cloud-netapp/CHANGELOG.md"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-netapp-${src.tag}/packages/google-cloud-netapp/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.sarahec ]; }; diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index 431672efee5aa..84fa74f9e9e0a 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "3.1.0"; + version = "3.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_storage"; inherit version; - hash = "sha256-lEJzF5iXx8igfuFfLmRmoC2gx8S57M6sKiYBfLKXIEk="; + hash = "sha256-3syoQwdgNvRWMxmMEl0YYf+/R+v1wOO5jcubLbFViWw="; }; pythonRelaxDeps = [ "google-auth" ]; diff --git a/pkgs/development/python-modules/google-genai/default.nix b/pkgs/development/python-modules/google-genai/default.nix index 3962d195d8bf5..d685b595b474e 100644 --- a/pkgs/development/python-modules/google-genai/default.nix +++ b/pkgs/development/python-modules/google-genai/default.nix @@ -37,7 +37,9 @@ buildPythonPackage rec { twine ]; - pythonRelaxDeps = [ "websockets" ]; + pythonRelaxDeps = [ + "tenacity" + ]; dependencies = [ anyio diff --git a/pkgs/development/python-modules/google-geo-type/default.nix b/pkgs/development/python-modules/google-geo-type/default.nix index 5bacb21694c7e..4dff787e4bf71 100644 --- a/pkgs/development/python-modules/google-geo-type/default.nix +++ b/pkgs/development/python-modules/google-geo-type/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-geo-type"; - version = "0.3.13"; + version = "3.31.3"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-python"; - tag = "google-geo-type-v${version}"; - hash = "sha256-VYkgkVrUgBiUEFF2J8ZFrh2Sw7h653stYxNcpYfRAj4="; + tag = "google-cloud-build-v${version}"; + hash = "sha256-qQ+8X6I8lt4OTgbvODsbdab2dYUk0wxWsbaVT2T651U="; }; sourceRoot = "${src.name}/packages/google-geo-type"; diff --git a/pkgs/development/python-modules/google-maps-routing/default.nix b/pkgs/development/python-modules/google-maps-routing/default.nix index a6b7031eb30b0..d2669fb55b7d4 100644 --- a/pkgs/development/python-modules/google-maps-routing/default.nix +++ b/pkgs/development/python-modules/google-maps-routing/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-maps-routing"; - version = "0.6.16"; + version = "3.31.3"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-python"; - tag = "google-maps-routing-v${version}"; - hash = "sha256-VYkgkVrUgBiUEFF2J8ZFrh2Sw7h653stYxNcpYfRAj4="; + tag = "google-cloud-build-v${version}"; + hash = "sha256-qQ+8X6I8lt4OTgbvODsbdab2dYUk0wxWsbaVT2T651U="; }; sourceRoot = "${src.name}/packages/google-maps-routing"; diff --git a/pkgs/development/python-modules/google-re2/default.nix b/pkgs/development/python-modules/google-re2/default.nix index dea16732f29a7..da3a9ab52a23a 100644 --- a/pkgs/development/python-modules/google-re2/default.nix +++ b/pkgs/development/python-modules/google-re2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "google-re2"; - version = "1.1.20240702"; + version = "1.1.20250722"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_re2"; inherit version; - hash = "sha256-h4jbafbJPLIp32LHSy2aqOZL91TpSVcA+FgSr6Mu/Ss="; + hash = "sha256-XipGTfddvO+f4Nrxinj3PD8KUbgc24ZUYKBXmyJvLvM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/googleapis-common-protos/default.nix b/pkgs/development/python-modules/googleapis-common-protos/default.nix index 5195d3472c5f3..0c065525c0ce1 100644 --- a/pkgs/development/python-modules/googleapis-common-protos/default.nix +++ b/pkgs/development/python-modules/googleapis-common-protos/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "googleapis-common-protos"; - version = "1.70.0"; + version = "3.31.3"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-python"; - rev = "googleapis-common-protos-v${version}"; - hash = "sha256-E1LISOLQcXqUMTTPLR+lwkR6gF1fuGGB44j38cIK/Z4="; + tag = "google-cloud-build-v${version}"; + hash = "sha256-qQ+8X6I8lt4OTgbvODsbdab2dYUk0wxWsbaVT2T651U="; }; sourceRoot = "${src.name}/packages/googleapis-common-protos"; @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = { description = "Common protobufs used in Google APIs"; homepage = "https://github.com/googleapis/python-api-common-protos"; - changelog = "https://github.com/googleapis/python-api-common-protos/releases/tag/v${version}"; + changelog = "https://github.com/googleapis/python-api-common-protos/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.sarahec ]; }; diff --git a/pkgs/development/python-modules/gpsoauth/default.nix b/pkgs/development/python-modules/gpsoauth/default.nix index d40d2f3c61747..bf604c9f7138d 100644 --- a/pkgs/development/python-modules/gpsoauth/default.nix +++ b/pkgs/development/python-modules/gpsoauth/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "gpsoauth"; - version = "1.1.1"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-WCAu0wM5fSkntGTcleJxS///haGw+Iv2jzrWOFnr5DU="; + hash = "sha256-njt2WmpOA2TewbxBV70+1+XsMGZYnihdC0aYaRCqa9I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/gql/default.nix b/pkgs/development/python-modules/gql/default.nix index 42141609db834..93a380706c89d 100644 --- a/pkgs/development/python-modules/gql/default.nix +++ b/pkgs/development/python-modules/gql/default.nix @@ -11,7 +11,7 @@ httpx, mock, parse, - pytest-asyncio, + pytest-asyncio_0, pytest-console-scripts, pytestCheckHook, pythonOlder, @@ -51,7 +51,7 @@ buildPythonPackage rec { aiofiles mock parse - pytest-asyncio + pytest-asyncio_0 pytest-console-scripts pytestCheckHook vcrpy diff --git a/pkgs/development/python-modules/gradient/default.nix b/pkgs/development/python-modules/gradient/default.nix index 36c3e2d82495d..f8a9896b1f8b9 100644 --- a/pkgs/development/python-modules/gradient/default.nix +++ b/pkgs/development/python-modules/gradient/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "gradient"; - version = "2.0.6"; + version = "2.99.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-pqyyNzx2YPP3qmWQbzGd3q2HzCkrWlIVSJZeFrGm9dk="; + hash = "sha256-Ep3Qh9Q1xWt2JveCf/A/KInQ3cnGE7D1YNdavDS0ZE8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/graphql-core/default.nix b/pkgs/development/python-modules/graphql-core/default.nix index fa1aa996d6234..c1c49ee454489 100644 --- a/pkgs/development/python-modules/graphql-core/default.nix +++ b/pkgs/development/python-modules/graphql-core/default.nix @@ -6,27 +6,23 @@ pytest-benchmark, pytest-asyncio, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "graphql-core"; - version = "3.2.5"; + version = "3.2.6"; pyproject = true; - disabled = pythonOlder "3.6"; - src = fetchFromGitHub { owner = "graphql-python"; repo = "graphql-core"; tag = "v${version}"; - hash = "sha256-xZOiQOFWnImDXuvHP9V6BDjIZwlwHSxN/os+UYV4A0M="; + hash = "sha256-RkVyoTSVmtKhs42IK+oOrOL4uBs3As3N5KY0Sz1VaDQ="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "poetry_core>=1,<2" "poetry-core" \ - --replace-fail ', "setuptools>=59,<70"' "" + --replace-fail ', "setuptools>=59,<76"' "" ''; build-system = [ @@ -44,7 +40,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "graphql" ]; meta = with lib; { - changelog = "https://github.com/graphql-python/graphql-core/releases/tag/v${version}"; + changelog = "https://github.com/graphql-python/graphql-core/releases/tag/${src.tag}"; description = "Port of graphql-js to Python"; homepage = "https://github.com/graphql-python/graphql-core"; license = licenses.mit; diff --git a/pkgs/development/python-modules/graphrag/default.nix b/pkgs/development/python-modules/graphrag/default.nix index 606bf11bb9369..f44129f282af0 100644 --- a/pkgs/development/python-modules/graphrag/default.nix +++ b/pkgs/development/python-modules/graphrag/default.nix @@ -40,14 +40,14 @@ buildPythonPackage rec { pname = "graphrag"; - version = "1.2.0"; + version = "2.4.0"; pyproject = true; src = fetchFromGitHub { owner = "microsoft"; repo = "graphrag"; - tag = "v${version}"; - hash = "sha256-z3gO0wV8YBNi2Z53avujAt/Es9mSzugEFa/qRgq7ItM="; + tag = "v.${version}"; + hash = "sha256-a8t6Nl9W/Cr7eueAvJ3dbz5G0oIhddqFMIm7HeZ8N9A="; }; build-system = [ diff --git a/pkgs/development/python-modules/great-expectations/default.nix b/pkgs/development/python-modules/great-expectations/default.nix index ca563093c75ec..8ba61a03efae9 100644 --- a/pkgs/development/python-modules/great-expectations/default.nix +++ b/pkgs/development/python-modules/great-expectations/default.nix @@ -40,14 +40,14 @@ buildPythonPackage rec { pname = "great-expectations"; - version = "1.3.2"; + version = "1.5.7"; pyproject = true; src = fetchFromGitHub { owner = "great-expectations"; repo = "great_expectations"; tag = version; - hash = "sha256-MV6T8PyOyAQ2SfT8B38YdCtqj6oeZCW+z08koBR739A="; + hash = "sha256-pa44metr9KP2KF2ulq7kd84BVdBMvMhsWJeBsJ2AnG0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix index aecb962449914..03638e41377b9 100644 --- a/pkgs/development/python-modules/greenlet/default.nix +++ b/pkgs/development/python-modules/greenlet/default.nix @@ -1,4 +1,5 @@ { + stdenv, lib, buildPythonPackage, fetchPypi, @@ -16,12 +17,12 @@ let greenlet = buildPythonPackage rec { pname = "greenlet"; - version = "3.2.2"; + version = "3.2.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-rQU9NEIaLeu6Rao8w5rPRUrLzQJbP8Gp+KDe4jer1IU="; + hash = "sha256-iw3YrkwNb15U7lW6k17rPXNam1iooeW1y6tk4Bo582U="; }; build-system = [ setuptools ]; @@ -35,6 +36,9 @@ let unittestCheckHook ]; + # https://github.com/python-greenlet/greenlet/issues/395 + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isPower64 "-fomit-frame-pointer"; + preCheck = '' pushd ${placeholder "out"}/${python.sitePackages} ''; diff --git a/pkgs/development/python-modules/greynoise/default.nix b/pkgs/development/python-modules/greynoise/default.nix index 716e0fc1b4986..935b0220e6196 100644 --- a/pkgs/development/python-modules/greynoise/default.nix +++ b/pkgs/development/python-modules/greynoise/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "greynoise"; - version = "2.3.0"; + version = "3.0.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "GreyNoise-Intelligence"; repo = "pygreynoise"; tag = "v${version}"; - hash = "sha256-17NieDQ57qVT2i4S26vLS9N6zALZ+eTtCCcBbhQ8fhQ="; + hash = "sha256-wJDO666HC3EohfR+LbG5F0Cp/eL7q4kXniWhJfc7C3s="; }; propagatedBuildInputs = [ @@ -57,7 +57,7 @@ buildPythonPackage rec { description = "Python3 library and command line for GreyNoise"; mainProgram = "greynoise"; homepage = "https://github.com/GreyNoise-Intelligence/pygreynoise"; - changelog = "https://github.com/GreyNoise-Intelligence/pygreynoise/blob/${src.rev}/CHANGELOG.rst"; + changelog = "https://github.com/GreyNoise-Intelligence/pygreynoise/blob/${src.tag}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ mbalatsko ]; }; diff --git a/pkgs/development/python-modules/grpc-google-iam-v1/default.nix b/pkgs/development/python-modules/grpc-google-iam-v1/default.nix index c0aaca1466643..aba72a96b8aa4 100644 --- a/pkgs/development/python-modules/grpc-google-iam-v1/default.nix +++ b/pkgs/development/python-modules/grpc-google-iam-v1/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "grpc-google-iam-v1"; - version = "0.14.2"; + version = "3.31.3"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-python"; - tag = "grpc-google-iam-v1-v${version}"; - hash = "sha256-5PzidE1CWN+pt7+gcAtbuXyL/pq6cnn0MCRkBfmeUSw="; + tag = "google-cloud-build-v${version}"; + hash = "sha256-qQ+8X6I8lt4OTgbvODsbdab2dYUk0wxWsbaVT2T651U="; }; sourceRoot = "${src.name}/packages/grpc-google-iam-v1"; diff --git a/pkgs/development/python-modules/grpcio-channelz/default.nix b/pkgs/development/python-modules/grpcio-channelz/default.nix index 1b23f39166b44..ae82882b7ba8c 100644 --- a/pkgs/development/python-modules/grpcio-channelz/default.nix +++ b/pkgs/development/python-modules/grpcio-channelz/default.nix @@ -12,13 +12,13 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-channelz"; - version = "1.73.1"; + version = "1.74.0"; pyproject = true; src = fetchPypi { pname = "grpcio_channelz"; inherit version; - hash = "sha256-5IxURNtQXZ5CzspDmcy5kmvOtBGJqJVhQKlNL5VTi+k="; + hash = "sha256-a4AHm21uNITq+J9OVHQ46Py4ZY8kQCfa+2eAO7vQfUs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/grpcio-health-checking/default.nix b/pkgs/development/python-modules/grpcio-health-checking/default.nix index 0f21392ca7ad0..ea3c3dbb14bc3 100644 --- a/pkgs/development/python-modules/grpcio-health-checking/default.nix +++ b/pkgs/development/python-modules/grpcio-health-checking/default.nix @@ -11,13 +11,13 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-health-checking"; - version = "1.73.1"; + version = "1.74.0"; format = "setuptools"; src = fetchPypi { pname = "grpcio_health_checking"; inherit version; - hash = "sha256-NSdTcT7euj8j6oozIMV1K+4YYALZR1plT1+BX/TgY0U="; + hash = "sha256-1nSUUdTO9UPD9iYK6ahshLmrAqkkIc7K5zpjLn/pIL8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/grpcio-reflection/default.nix b/pkgs/development/python-modules/grpcio-reflection/default.nix index 4f25517578363..35b0e1ca1e0c5 100644 --- a/pkgs/development/python-modules/grpcio-reflection/default.nix +++ b/pkgs/development/python-modules/grpcio-reflection/default.nix @@ -12,13 +12,13 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-reflection"; - version = "1.73.1"; + version = "1.74.0"; pyproject = true; src = fetchPypi { pname = "grpcio_reflection"; inherit version; - hash = "sha256-LWpCAmTjHoPoERTdJYa1zQWmxomwHdXiEh2R8rThZ/I="; + hash = "sha256-xzJ9JSDc2sIJhy6/V3dMMjlkba2ILkq7Ste+vMrKLIM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix index 2952084a783c0..c003dda3cd2ba 100644 --- a/pkgs/development/python-modules/grpcio-status/default.nix +++ b/pkgs/development/python-modules/grpcio-status/default.nix @@ -13,7 +13,7 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-status"; - version = "1.73.1"; + version = "1.74.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "grpcio_status"; inherit version; - hash = "sha256-ko9JzPlojbXyDNnkXEV4odAczKKa6qvwZvKsdqqIZmg="; + hash = "sha256-xYwbJKpFTjDx/Gp+DbvBlMVKQIFDlxqUtfTkC7WDFDI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix index cd5854c7b166c..b89cc4aa7df87 100644 --- a/pkgs/development/python-modules/grpcio-testing/default.nix +++ b/pkgs/development/python-modules/grpcio-testing/default.nix @@ -13,7 +13,7 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-testing"; - version = "1.73.1"; + version = "1.74.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "grpcio_testing"; inherit version; - hash = "sha256-H7olzlrspjILsQShvdFoMvv2igiL9QUQm9AmHTCBeI4="; + hash = "sha256-Ed7bU6QQ/jsqK8mp7ZyaaXlCDJMkPafXh/fM+aJUPjc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 38bdc67c187c4..ba25ada573e46 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -12,13 +12,13 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.73.1"; + version = "1.74.0"; pyproject = true; src = fetchPypi { pname = "grpcio_tools"; inherit version; - hash = "sha256-bgat7DsIcPWUeVOw74298s683/Yfsf4IEgzHSDx5eKo="; + hash = "sha256-iKuesYtqwbSHKt1rOUBzvY1E7ufDLk3GCgIuJf+v+5U="; }; outputs = [ diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index eb90a2b0e4f8a..7c92d6904ec36 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -18,14 +18,14 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio"; - version = "1.73.1"; + version = "1.74.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-f84s0cDBEWzzhQVk6/wyZPunXTx0p0FDc/EjjqNl74c="; + hash = "sha256-gNH0+7NbB0LT49O7ZUtzgc1fAV+ElyeaHpwhumI+AbE="; }; outputs = [ diff --git a/pkgs/development/python-modules/grpclib/default.nix b/pkgs/development/python-modules/grpclib/default.nix index c9553e5c81b1e..35494aa1d7cec 100644 --- a/pkgs/development/python-modules/grpclib/default.nix +++ b/pkgs/development/python-modules/grpclib/default.nix @@ -8,7 +8,7 @@ googleapis-common-protos, h2, multidict, - pytest-asyncio, + pytest-asyncio_0, pytestCheckHook, pythonOlder, setuptools, @@ -37,7 +37,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-asyncio + pytest-asyncio_0 async-timeout faker googleapis-common-protos diff --git a/pkgs/development/python-modules/guidance/default.nix b/pkgs/development/python-modules/guidance/default.nix index 2f9c1bfe8ffdc..ed279cf885ae7 100644 --- a/pkgs/development/python-modules/guidance/default.nix +++ b/pkgs/development/python-modules/guidance/default.nix @@ -36,14 +36,14 @@ buildPythonPackage rec { pname = "guidance"; - version = "0.2.1"; + version = "0.2.5"; pyproject = true; src = fetchFromGitHub { owner = "guidance-ai"; repo = "guidance"; tag = version; - hash = "sha256-FBnND9kCIVmE/IEz3TNOww8x0EAH6TTBYfKTprqSbDg="; + hash = "sha256-dTMJOBGirEumbpTanCVZQJATfLxqxmpUCqE7pah97Zw="; }; build-system = [ @@ -119,7 +119,7 @@ buildPythonPackage rec { meta = { description = "Guidance language for controlling large language models"; homepage = "https://github.com/guidance-ai/guidance"; - changelog = "https://github.com/guidance-ai/guidance/releases/tag/v${version}"; + changelog = "https://github.com/guidance-ai/guidance/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ natsukium ]; }; diff --git a/pkgs/development/python-modules/gym-notices/default.nix b/pkgs/development/python-modules/gym-notices/default.nix index 0a4e2bd4089cc..1132fa795d5b4 100644 --- a/pkgs/development/python-modules/gym-notices/default.nix +++ b/pkgs/development/python-modules/gym-notices/default.nix @@ -2,18 +2,22 @@ lib, buildPythonPackage, fetchPypi, + setuptools, }: buildPythonPackage rec { pname = "gym-notices"; - version = "0.0.8"; - format = "setuptools"; + version = "0.1.0"; + pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-rSXiAEh8r6NpcoYl/gZOiK2hNGYYUmECZZtGQPK0uRE="; + pname = "gym_notices"; + inherit version; + hash = "sha256-n5R372iowV5CYl1PpTYxI34+aulH8yW1wUnAgUma3Bs="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "gym_notices" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/h3/default.nix b/pkgs/development/python-modules/h3/default.nix index f1379544ba21d..5d9b87746bfc9 100644 --- a/pkgs/development/python-modules/h3/default.nix +++ b/pkgs/development/python-modules/h3/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "h3"; - version = "4.2.2"; + version = "4.3.0"; pyproject = true; # pypi version does not include tests @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "uber"; repo = "h3-py"; tag = "v${version}"; - hash = "sha256-HvJT5SuE7UHhGMlaQG3YSHfGkgsdDAVVGsGRsAeNHGQ="; + hash = "sha256-D2imgxGzJpOEQ3xddM42SKWPZEIwuXQ31mm8ZIQhqkE="; }; dontConfigure = true; diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index cd43c0e057983..1deb3ab9f2cfe 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -22,7 +22,7 @@ let mpiSupport = hdf5.mpiSupport; in buildPythonPackage rec { - version = "3.13.0"; + version = "3.14.0"; pname = "h5py"; pyproject = true; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-GHDkZRhyACPahdCJWhlg/yzjmMVnHqw7GkHsaWtxBcM="; + hash = "sha256-I3IRay4NXT5ecFt/Zj98jZb6eaQFLSUEhO+R0k1qCPQ="; }; pythonRelaxDeps = [ "mpi4py" ]; diff --git a/pkgs/development/python-modules/ha-silabs-firmware-client/default.nix b/pkgs/development/python-modules/ha-silabs-firmware-client/default.nix index 2264a9a20d2fd..dd983d98cdd48 100644 --- a/pkgs/development/python-modules/ha-silabs-firmware-client/default.nix +++ b/pkgs/development/python-modules/ha-silabs-firmware-client/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, fetchFromGitHub, lib, + pytest-asyncio, pytestCheckHook, pythonOlder, setuptools, @@ -41,6 +42,7 @@ buildPythonPackage rec { nativeCheckInputs = [ aioresponses + pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/habluetooth/default.nix b/pkgs/development/python-modules/habluetooth/default.nix index ab77d4cdfeb1e..b491a740e1d4f 100644 --- a/pkgs/development/python-modules/habluetooth/default.nix +++ b/pkgs/development/python-modules/habluetooth/default.nix @@ -33,6 +33,11 @@ buildPythonPackage rec { hash = "sha256-82eV76oY/exkHbhZt3OaifOoKxN2D6npstvfBDVgszw="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'Cython>=3,<3.1' 'Cython' + ''; + build-system = [ cython poetry-core diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index a5d976155de3e..9a4a1d87d1817 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -43,6 +43,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "acme" "josepy" + "snitun" ]; dependencies = [ diff --git a/pkgs/development/python-modules/hassil/default.nix b/pkgs/development/python-modules/hassil/default.nix index 9c68f8c18c3c1..ec274094ab26a 100644 --- a/pkgs/development/python-modules/hassil/default.nix +++ b/pkgs/development/python-modules/hassil/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, # build-system setuptools, @@ -17,9 +16,9 @@ let pname = "hassil"; - version = "2.2.3"; + version = "3.1.0"; in -buildPythonPackage { +buildPythonPackage rec { inherit pname version; pyproject = true; @@ -27,7 +26,7 @@ buildPythonPackage { owner = "home-assistant"; repo = "hassil"; tag = "v${version}"; - hash = "sha256-rP7F0BovD0Klf06lywo+1uFhPf+dS0qbNBZluun8+cE="; + hash = "sha256-GwlnlOeG4uMMbT09Nm+UIr5FcOJf00+7r/2Kls4Rb4g="; }; build-system = [ setuptools ]; @@ -39,8 +38,13 @@ buildPythonPackage { nativeCheckInputs = [ pytestCheckHook ]; + disabledTestPaths = [ + # infinite recursion with home-assistant.intents + "tests/test_fuzzy.py" + ]; + meta = with lib; { - changelog = "https://github.com/home-assistant/hassil/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/home-assistant/hassil/blob/${src.tag}/CHANGELOG.md"; description = "Intent parsing for Home Assistant"; mainProgram = "hassil"; homepage = "https://github.com/home-assistant/hassil"; diff --git a/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix b/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix index c8efd2065cc46..61b5824ba7b7d 100644 --- a/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix +++ b/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "hatch-fancy-pypi-readme"; - version = "24.1.0"; + version = "25.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "hatch_fancy_pypi_readme"; inherit version; - hash = "sha256-RN0jnxp3m53PjryUAaYR/X9+PhRXjc8iwmXfr3wVFLg="; + hash = "sha256-nFjtPf+Q1R9DQUzjcAmtHVsPCP/J/CFpmKBjgPAcAEU="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/hatch-nodejs-version/default.nix b/pkgs/development/python-modules/hatch-nodejs-version/default.nix index 376f3f1390a2d..e46a1d40b92f9 100644 --- a/pkgs/development/python-modules/hatch-nodejs-version/default.nix +++ b/pkgs/development/python-modules/hatch-nodejs-version/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "hatch-nodejs-version"; - version = "0.3.2"; + version = "0.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "agoose77"; repo = "hatch-nodejs-version"; tag = "v${version}"; - hash = "sha256-hknlb11DCe+b55CfF3Pr62ccWPxVrjQ197ZagSiH/zU="; + hash = "sha256-Oe07HFzhhnAGTWM51xSgRmpJgIZg0oMIxkmMxKRPMwI="; }; propagatedBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/hatch-vcs/default.nix b/pkgs/development/python-modules/hatch-vcs/default.nix index 0eeded66ee6ab..2bdb4e7622a50 100644 --- a/pkgs/development/python-modules/hatch-vcs/default.nix +++ b/pkgs/development/python-modules/hatch-vcs/default.nix @@ -4,14 +4,14 @@ fetchPypi, pytestCheckHook, pythonOlder, - git, + gitMinimal, hatchling, setuptools-scm, }: buildPythonPackage rec { pname = "hatch-vcs"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "hatch_vcs"; inherit version; - hash = "sha256-CTgQdI/gHbDUUfq88sGsJojK79Iy1O3pZwkLHBsH2fc="; + hash = "sha256-A5X6EmlANAIVCQw0Siv04qd7y+faqxb0Gze5jJWAn/k="; }; build-system = [ hatchling ]; @@ -30,20 +30,13 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - git + gitMinimal pytestCheckHook ]; disabledTests = [ - # incompatible with setuptools-scm>=7 - # https://github.com/ofek/hatch-vcs/issues/8 - "test_write" - ] - ++ lib.optionals (pythonOlder "3.11") [ - # https://github.com/pypa/setuptools_scm/issues/1038, fixed in setuptools_scm@8.1.0 - "test_basic" - "test_root" - "test_metadata" + # reacts to our setup-hook pretending a version + "test_custom_tag_pattern_get_version" ]; pythonImportsCheck = [ "hatch_vcs" ]; diff --git a/pkgs/development/python-modules/haystack-ai/default.nix b/pkgs/development/python-modules/haystack-ai/default.nix index dec9d6684d276..ba792ffa3e7f1 100644 --- a/pkgs/development/python-modules/haystack-ai/default.nix +++ b/pkgs/development/python-modules/haystack-ai/default.nix @@ -91,14 +91,14 @@ buildPythonPackage rec { pname = "haystack-ai"; - version = "2.9.0"; + version = "2.16.1"; pyproject = true; src = fetchFromGitHub { owner = "deepset-ai"; repo = "haystack"; tag = "v${version}"; - hash = "sha256-h/4KskpzO3+e6aLQlBb8yitmfdbdc+J6Hz6TMs8bnr8="; + hash = "sha256-Z5T5X92Hig7nW1fUc8b+LuegJlIZbMfyjJ0PnVudPew="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix index d332237010f28..a6f28d87a60d5 100644 --- a/pkgs/development/python-modules/hg-evolve/default.nix +++ b/pkgs/development/python-modules/hg-evolve/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "11.1.8"; + version = "11.1.9"; pyproject = true; src = fetchPypi { pname = "hg_evolve"; inherit version; - hash = "sha256-JIberZCiRmxPkn0P+Dsps42jHWhkA1hLKGXPlbb+APU="; + hash = "sha256-sypSfUqXQkmDSITJq/XHH82EGNIMvjgocc+3mLK+n0A="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/hid-parser/default.nix b/pkgs/development/python-modules/hid-parser/default.nix index 1106accebf073..91cb21d24cfa9 100644 --- a/pkgs/development/python-modules/hid-parser/default.nix +++ b/pkgs/development/python-modules/hid-parser/default.nix @@ -1,26 +1,28 @@ { lib, buildPythonPackage, - fetchPypi, - setuptools, - pytest7CheckHook, + fetchFromGitHub, + flit-core, + pytestCheckHook, hypothesis, }: buildPythonPackage rec { pname = "hid-parser"; - version = "0.0.3"; - format = "pyproject"; + version = "0.1.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-zbm+h+ieDmd1K0uH+9B8EWtYScxqYJXVpY9bXdBivA4="; + src = fetchFromGitHub { + owner = "usb-tools"; + repo = "python-hid-parser"; + tag = version; + hash = "sha256-8aGyLTsBK5etwbqFkNinbLHCt20fsQEmuBvu3RrwCDA="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ flit-core ]; nativeCheckInputs = [ - pytest7CheckHook + pytestCheckHook hypothesis ]; diff --git a/pkgs/development/python-modules/hijri-converter/default.nix b/pkgs/development/python-modules/hijri-converter/default.nix deleted file mode 100644 index f99bddec45936..0000000000000 --- a/pkgs/development/python-modules/hijri-converter/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - pytestCheckHook, - pythonOlder, -}: - -buildPythonPackage rec { - pname = "hijri-converter"; - version = "2.3.1"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-BptniSkeCDD0hgp53NNPs87qO5VRbtQBAgK5ZWuhq2E="; - }; - - nativeCheckInputs = [ pytestCheckHook ]; - - pythonImportsCheck = [ "hijri_converter" ]; - - meta = with lib; { - description = "Accurate Hijri-Gregorian date converter based on the Umm al-Qura calendar"; - homepage = "https://github.com/dralshehri/hijri-converter"; - changelog = "https://github.com/dralshehri/hijridate/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ hexa ]; - }; -} diff --git a/pkgs/development/python-modules/hijridate/default.nix b/pkgs/development/python-modules/hijridate/default.nix new file mode 100644 index 0000000000000..904159b7144a0 --- /dev/null +++ b/pkgs/development/python-modules/hijridate/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + hatch-fancy-pypi-readme, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "hijridate"; + version = "2.5.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "dralshehri"; + repo = "hijridate"; + tag = "v${version}"; + hash = "sha256-IT5OnFDuNQ9tMfuZ5pFqnAPd7nspIfAmeN6Pqtn0OwA="; + }; + + build-system = [ + hatchling + hatch-fancy-pypi-readme + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "hijridate" ]; + + meta = with lib; { + description = "Accurate Hijri-Gregorian date converter based on the Umm al-Qura calendar"; + homepage = "https://github.com/dralshehri/hijridate"; + changelog = "https://github.com/dralshehri/hijridate/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/hikari-crescent/default.nix b/pkgs/development/python-modules/hikari-crescent/default.nix index 28e809136ed36..b13050474204e 100644 --- a/pkgs/development/python-modules/hikari-crescent/default.nix +++ b/pkgs/development/python-modules/hikari-crescent/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "hikari-crescent"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; src = fetchFromGitHub { owner = "hikari-crescent"; repo = "hikari-crescent"; tag = "v${version}"; - hash = "sha256-aQjT5sAaqConUtRGcqddzwcbBJkbwYOCxvnNJpKu3yI="; + hash = "sha256-wFWltwhayvv/zkIWMGogjTqy/qZfO1hUU6CzF3T9E1Y="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/hikari-lightbulb/default.nix b/pkgs/development/python-modules/hikari-lightbulb/default.nix index f9af95b701475..92d2ea4d1f0f1 100644 --- a/pkgs/development/python-modules/hikari-lightbulb/default.nix +++ b/pkgs/development/python-modules/hikari-lightbulb/default.nix @@ -2,30 +2,30 @@ lib, buildPythonPackage, fetchFromGitHub, - setuptools, - wheel, + flit-core, hikari, croniter, + typing-extensions, }: buildPythonPackage rec { pname = "hikari-lightbulb"; - version = "2.3.5.post1"; + version = "3.1.1"; pyproject = true; src = fetchFromGitHub { owner = "tandemdude"; repo = "hikari-lightbulb"; tag = version; - hash = "sha256-sxBrOgMgUcPjqtNuuq5+NfyxR5V812dfHnGoO9DhdXU="; + hash = "sha256-hsd7K7VFXndQ3tE8UkIcFXADgG/Kjd2oNWdFvwAwUtw="; }; - nativeBuildInputs = [ - setuptools - wheel - ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ hikari ]; + dependencies = [ + hikari + typing-extensions + ]; optional-dependencies = { crontrigger = [ croniter ]; @@ -34,6 +34,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "lightbulb" ]; meta = with lib; { + broken = true; # missing linkd and confspec dependencies description = "Command handler for Hikari, the Python Discord API wrapper library"; longDescription = '' Lightbulb is designed to be an easy to use command handler library that integrates with the Discord API wrapper library for Python, Hikari. diff --git a/pkgs/development/python-modules/hikari/default.nix b/pkgs/development/python-modules/hikari/default.nix index 7be50c2b2d2b9..ee7fce10d6fc2 100644 --- a/pkgs/development/python-modules/hikari/default.nix +++ b/pkgs/development/python-modules/hikari/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, pytestCheckHook, pythonOlder, + hatchling, aiohttp, attrs, multidict, @@ -16,14 +17,14 @@ }: buildPythonPackage rec { pname = "hikari"; - version = "2.1.0"; - format = "setuptools"; + version = "2.3.5"; + pyproject = true; src = fetchFromGitHub { owner = "hikari-py"; repo = "hikari"; tag = version; - hash = "sha256-/A3D3nG1lSCQU92dM+6YroxWlGKrv47ntkZaJZTAJUA="; + hash = "sha256-jcPgO4tJKHzrA1fFeksSL9PVMsxnHuzh4CLVwTq06sM="; # The git commit is part of the `hikari.__git_sha1__` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -36,6 +37,8 @@ buildPythonPackage rec { ''; }; + build-system = [ hatchling ]; + propagatedBuildInputs = [ aiohttp attrs @@ -72,7 +75,7 @@ buildPythonPackage rec { meta = { description = "Discord API wrapper for Python written with asyncio"; homepage = "https://www.hikari-py.dev/"; - changelog = "https://github.com/hikari-py/hikari/releases/tag/${version}"; + changelog = "https://github.com/hikari-py/hikari/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ tomodachi94 diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 54f580a6f5946..f3ee10e4e81f8 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "Generate and work with holidays in Python"; homepage = "https://github.com/vacanza/python-holidays"; - changelog = "https://github.com/vacanza/python-holidays/releases/tag/v${version}"; + changelog = "https://github.com/vacanza/python-holidays/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab diff --git a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix index dfa41a0bfedf4..d1ea3bd046628 100644 --- a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix +++ b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, pythonOlder, # build-system @@ -20,7 +19,7 @@ buildPythonPackage rec { pname = "home-assistant-bluetooth"; - version = "1.13.1"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -29,18 +28,9 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "home-assistant-bluetooth"; tag = "v${version}"; - hash = "sha256-piX812Uzd2F8A8+IF/17N+xy6ENpfRVJ1BxsAxL5aj0="; + hash = "sha256-A29Jezj9kQ/v4irvpcpCiZlrNQBQwByrSJOx4HaXTdc="; }; - patches = [ - (fetchpatch { - name = "fix-tests-with-habluetooth-3.42.0.patch"; - url = "https://github.com/home-assistant-libs/home-assistant-bluetooth/commit/515516bf9b2577c5d4af25cd2f052023ccb8b108.patch"; - includes = [ "tests/test_models.py" ]; - hash = "sha256-9t8VRKQSDxSYiy7bFII62B4O5w5Hx9AbRgvzcT6z1BQ="; - }) - ]; - build-system = [ poetry-core setuptools 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 f911963420396..5665f7eb2c9d4 100644 --- a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix @@ -12,6 +12,7 @@ cryptography, diskcache, fetchFromGitHub, + fetchpatch, glib, gn, googleapis-common-protos, @@ -128,6 +129,19 @@ stdenv.mkDerivation rec { libnl ]; + patches = [ + (fetchpatch { + # Fix building with newer gn version + name = "pw_protobuf_compiler-Create-a-new-includes.txt-for-each-toolchain.patch"; + # https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/300272 + url = "https://pigweed.googlesource.com/pigweed/pigweed/+/b66729b90fcb9df2ee4818f6d4fff59385cdbc80^!?format=TEXT"; + decode = "base64 -d"; + stripLen = 1; + extraPrefix = "connectedhomeip/third_party/pigweed/repo/"; + hash = "sha256-6ss3j8j69w7EMio9mFP/EL2oPqQ2sLh67eWsJjHdDa8="; + }) + ]; + postPatch = '' cd connectedhomeip export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/html2image/default.nix b/pkgs/development/python-modules/html2image/default.nix index 4e5d1d50dbd67..b6990aa5ca9af 100644 --- a/pkgs/development/python-modules/html2image/default.nix +++ b/pkgs/development/python-modules/html2image/default.nix @@ -2,30 +2,24 @@ lib, buildPythonPackage, fetchFromGitHub, - poetry-core, + hatchling, requests, websocket-client, }: buildPythonPackage rec { pname = "html2image"; - version = "2.0.5"; + version = "2.0.7"; pyproject = true; src = fetchFromGitHub { owner = "vgalin"; repo = "html2image"; tag = version; - hash = "sha256-k5y89nUF+fhUj9uzTAPkkAdOb2TsTL2jm/ZXwHlxu/A="; + hash = "sha256-qGp6i4fNmduTZfdxNvYJTAQV/Ovm3XFNOJ8uSj6Ipic="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail poetry.masonry.api poetry.core.masonry.api \ - --replace-fail "poetry>=" "poetry-core>=" - ''; - - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ requests @@ -37,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Package acting as a wrapper around the headless mode of existing web browsers to generate images from URLs and from HTML+CSS strings or files"; homepage = "https://github.com/vgalin/html2image"; - changelog = "https://github.com/vgalin/html2image/releases/tag/${version}"; + changelog = "https://github.com/vgalin/html2image/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ happysalada ]; }; diff --git a/pkgs/development/python-modules/html2text/default.nix b/pkgs/development/python-modules/html2text/default.nix index 656370931ca44..bf13a97b95610 100644 --- a/pkgs/development/python-modules/html2text/default.nix +++ b/pkgs/development/python-modules/html2text/default.nix @@ -5,11 +5,12 @@ pythonOlder, pytestCheckHook, setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "html2text"; - version = "2024.2.26"; + version = "2025.4.15"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,10 +19,13 @@ buildPythonPackage rec { owner = "Alir3z4"; repo = "html2text"; tag = version; - hash = "sha256-1CLkTFR+/XQ428WjMF7wliyAG6CB+n8JSsLDdLHPO7I="; + hash = "sha256-SMdILvCVXMe3Tlf3kK54VfEKsQ/KvpBZK3xZ4zVwcfo="; }; - build-system = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -30,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Turn HTML into equivalent Markdown-structured text"; homepage = "https://github.com/Alir3z4/html2text/"; - changelog = "https://github.com/Alir3z4/html2text/blob/${src.rev}/ChangeLog.rst"; + changelog = "https://github.com/Alir3z4/html2text/blob/${src.tag}/ChangeLog.rst"; license = licenses.gpl3Only; maintainers = [ ]; mainProgram = "html2text"; diff --git a/pkgs/development/python-modules/htmldate/default.nix b/pkgs/development/python-modules/htmldate/default.nix index 9fa529db9c2d4..c97199f97a3df 100644 --- a/pkgs/development/python-modules/htmldate/default.nix +++ b/pkgs/development/python-modules/htmldate/default.nix @@ -38,6 +38,8 @@ buildPythonPackage rec { urllib3 ]; + pythonRelaxDeps = [ "lxml" ]; + optional-dependencies = { speed = [ faust-cchardet diff --git a/pkgs/development/python-modules/http-message-signatures/default.nix b/pkgs/development/python-modules/http-message-signatures/default.nix index d3fcc3296dad2..c5877acb81194 100644 --- a/pkgs/development/python-modules/http-message-signatures/default.nix +++ b/pkgs/development/python-modules/http-message-signatures/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "http-message-signatures"; - version = "0.5.0"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyauth"; repo = "http-message-signatures"; - rev = "v${version}"; - hash = "sha256-Jsivw4lNA/2oqsOGGx8D4gUPftzuys877A9RXyapnSQ="; + tag = "v${version}"; + hash = "sha256-vPZeAS3hR7Bmj2FtME+V9WU3TViBndrBb9GLkdMVh2Q="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/hydra-core/default.nix b/pkgs/development/python-modules/hydra-core/default.nix index 132c8faba6a76..92ff70c9020b6 100644 --- a/pkgs/development/python-modules/hydra-core/default.nix +++ b/pkgs/development/python-modules/hydra-core/default.nix @@ -20,7 +20,7 @@ packaging, # tests - pytestCheckHook, + pytest8_3CheckHook, pythonAtLeast, }: @@ -70,7 +70,7 @@ buildPythonPackage rec { packaging ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytest8_3CheckHook ]; pytestFlags = [ "-Wignore::UserWarning" diff --git a/pkgs/development/python-modules/hyperion-py/default.nix b/pkgs/development/python-modules/hyperion-py/default.nix index 5cb6a69ec2acd..a6803e8bc26eb 100644 --- a/pkgs/development/python-modules/hyperion-py/default.nix +++ b/pkgs/development/python-modules/hyperion-py/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, poetry-core, pytest-aiohttp, - pytest-asyncio, + pytest-asyncio_0, pytest-cov-stub, pytest-timeout, pytestCheckHook, @@ -28,8 +28,8 @@ buildPythonPackage rec { dependencies = [ aiohttp ]; nativeCheckInputs = [ - pytest-asyncio - pytest-aiohttp + pytest-asyncio_0 + (pytest-aiohttp.override { pytest-asyncio = pytest-asyncio_0; }) pytest-cov-stub pytest-timeout pytestCheckHook diff --git a/pkgs/development/python-modules/hyperscan/default.nix b/pkgs/development/python-modules/hyperscan/default.nix index 8850d1a532833..e63a155781d30 100644 --- a/pkgs/development/python-modules/hyperscan/default.nix +++ b/pkgs/development/python-modules/hyperscan/default.nix @@ -23,14 +23,14 @@ let in buildPythonPackage rec { pname = "hyperscan"; - version = "0.7.16"; + version = "0.7.22"; pyproject = true; src = fetchFromGitHub { owner = "darvid"; repo = "python-hyperscan"; tag = "v${version}"; - hash = "sha256-iinBu/6zSbRiuxytHnS3G+8OffcdLdCTqKzj44NQqcU="; + hash = "sha256-99PkxxGCwyGa5xhfHLa7+1JnTgcRfDEKcTRopGzqkh8="; }; env.CMAKE_ARGS = "-DHS_SRC_ROOT=${pkgs.hyperscan.src} -DHS_BUILD_LIB_ROOT=${lib-deps}/lib"; diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index a46583e063b5b..22b65220f4e4b 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "hypothesis"; - version = "6.131.17"; + version = "6.136.9"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,8 +32,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "HypothesisWorks"; repo = "hypothesis"; - rev = "hypothesis-python-${version}"; - hash = "sha256-bNaDC2n0VaI7L4/FdD8eQ4cqn5ewquy89wV/pQn9uo0="; + tag = "hypothesis-python-${version}"; + hash = "sha256-Q1wxIJwAYKZ0x6c85CJSGgcdKw9a3xFw8YpJROElSNU="; }; # I tried to package sphinx-selective-exclude, but it throws @@ -115,6 +115,29 @@ buildPythonPackage rec { # AssertionError: assert [b'def \... f(): pass'] == [b'def\\', b' f(): pass'] # https://github.com/HypothesisWorks/hypothesis/issues/4355 "test_clean_source" + ] + ++ lib.optionals (pythonAtLeast "3.14") [ + "test_attrs_inference_builds" + "test_bound_missing_dot_access_forward_ref" + "test_bound_missing_forward_ref" + "test_bound_type_checking_only_forward_ref_wrong_type" + "test_bound_type_cheking_only_forward_ref" + "test_builds_suggests_from_type" + "test_bytestring_not_treated_as_generic_sequence" + "test_evil_prng_registration_nonsense" + "test_issue_4194_regression" + "test_passing_referenced_instance_within_function_scope_warns" + "test_registering_a_Random_is_idempotent" + "test_register_random_within_nested_function_scope" + "test_resolve_fwd_refs" + "test_resolves_forwardrefs_to_builtin_types" + "test_resolving_standard_collection_as_generic" + "test_resolving_standard_container_as_generic" + "test_resolving_standard_contextmanager_as_generic" + "test_resolving_standard_iterable_as_generic" + "test_resolving_standard_reversible_as_generic" + "test_resolving_standard_sequence_as_generic" + "test_specialised_collection_types" ]; pythonImportsCheck = [ "hypothesis" ]; diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index e800262be966e..2939b7c2ab9c5 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -98,14 +98,14 @@ in buildPythonPackage rec { pname = "ibis-framework"; - version = "10.5.0"; + version = "10.8.0"; pyproject = true; src = fetchFromGitHub { owner = "ibis-project"; repo = "ibis"; tag = version; - hash = "sha256-KJPl5bkD/tQlHY2k0b9zok5YCPekaXw7Y9z8P4AD3FQ="; + hash = "sha256-Uuqm9Exu/oK3BGBL4ViUOGArMWhVutUn1gFRj1I4vt4="; }; build-system = [ @@ -142,6 +142,7 @@ buildPythonPackage rec { pytestFlags = [ "--benchmark-disable" + "-Wignore::FutureWarning" ]; enabledTestMarks = testBackends ++ [ "core" ]; @@ -353,7 +354,7 @@ buildPythonPackage rec { meta = { description = "Productivity-centric Python Big Data Framework"; homepage = "https://github.com/ibis-project/ibis"; - changelog = "https://github.com/ibis-project/ibis/blob/${version}/docs/release_notes.md"; + changelog = "https://github.com/ibis-project/ibis/blob/${src.tag}/docs/release_notes.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ cpcloud diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix index a7ed92051f652..c483932f3d4fd 100644 --- a/pkgs/development/python-modules/icalendar/default.nix +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -48,6 +48,8 @@ buildPythonPackage rec { # AssertionError: assert {'Atlantic/Jan_Mayen'} == {'Arctic/Longyearbyen'} "test_dateutil_timezone_is_matched_with_tzname" "test_docstring_of_python_file" + # AssertionError: assert $TZ not in set() + "test_add_missing_timezones_to_example" ]; enabledTestPaths = [ "src/icalendar" ]; diff --git a/pkgs/development/python-modules/icecream/default.nix b/pkgs/development/python-modules/icecream/default.nix index 6ae3f20ad9adc..f3ed505cfae55 100644 --- a/pkgs/development/python-modules/icecream/default.nix +++ b/pkgs/development/python-modules/icecream/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "icecream"; - version = "2.1.4"; + version = "2.1.5"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-WHVeWDl9U1CnbyWXbe57YH9f67PG4c3f5rGVGJbpFXM="; + hash = "sha256-FNIeM4MyammowaO88R+DKDRZ8NJp7OWvg/ziwNZj7+w="; }; postPatch = '' diff --git a/pkgs/development/python-modules/imagecodecs/default.nix b/pkgs/development/python-modules/imagecodecs/default.nix index 30dfe4dc7de7a..6d0411ce16d95 100644 --- a/pkgs/development/python-modules/imagecodecs/default.nix +++ b/pkgs/development/python-modules/imagecodecs/default.nix @@ -21,9 +21,9 @@ }: let - version = "2025.3.30"; + version = "2025.8.2"; in -buildPythonPackage { +buildPythonPackage rec { pname = "imagecodecs"; inherit version; pyproject = true; @@ -32,7 +32,7 @@ buildPythonPackage { owner = "cgohlke"; repo = "imagecodecs"; tag = "v${version}"; - hash = "sha256-KtrQNABQOr3mNiWOfaZBcFceSCixPGV8Hte2uPKn1+k="; + hash = "sha256-HDyA5SQNZe9G83ARfvD4AAIIos8Oatp+RhnEQTdnRp4="; }; build-system = [ @@ -83,7 +83,7 @@ buildPythonPackage { meta = { description = "Image transformation, compression, and decompression codecs"; homepage = "https://github.com/cgohlke/imagecodecs"; - changelog = "https://github.com/cgohlke/imagecodecs/blob/v${version}/CHANGES.rst"; + changelog = "https://github.com/cgohlke/imagecodecs/blob/${src.tag}/CHANGES.rst"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ yzx9 ]; }; diff --git a/pkgs/development/python-modules/imagededup/default.nix b/pkgs/development/python-modules/imagededup/default.nix index 4ecc2f693c784..d5993e3586435 100644 --- a/pkgs/development/python-modules/imagededup/default.nix +++ b/pkgs/development/python-modules/imagededup/default.nix @@ -33,7 +33,7 @@ let in buildPythonPackage rec { pname = "imagededup"; - version = "0.3.2"; + version = "03.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "idealo"; repo = "imagededup"; tag = "v${version}"; - hash = "sha256-B2IuNMTZnzBi6IxrHBoMDsmIcqGQpznd/2f1XKo1Oa4="; + hash = "sha256-tm6WGf74xu3CcwpyeA7+rvO5wemO0daXpj/jvYrH19E="; }; nativeBuildInputs = [ @@ -88,7 +88,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://idealo.github.io/imagededup/"; - changelog = "https://github.com/idealo/imagededup/releases/tag/v${version}"; + changelog = "https://github.com/idealo/imagededup/releases/tag/${src.tag}"; description = "Finding duplicate images made easy"; license = licenses.asl20; maintainers = with maintainers; [ stunkymonkey ]; diff --git a/pkgs/development/python-modules/inkbird-ble/default.nix b/pkgs/development/python-modules/inkbird-ble/default.nix index b2a31ed4c13c8..4d507af22ac15 100644 --- a/pkgs/development/python-modules/inkbird-ble/default.nix +++ b/pkgs/development/python-modules/inkbird-ble/default.nix @@ -6,6 +6,7 @@ fetchFromGitHub, home-assistant-bluetooth, poetry-core, + pytest-asyncio, pytest-cov-stub, pytestCheckHook, pythonOlder, @@ -36,6 +37,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytest-asyncio pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/inkex/default.nix b/pkgs/development/python-modules/inkex/default.nix index 3195032e03e9b..534aa8ae551d3 100644 --- a/pkgs/development/python-modules/inkex/default.nix +++ b/pkgs/development/python-modules/inkex/default.nix @@ -27,7 +27,10 @@ buildPythonPackage { build-system = [ poetry-core ]; - pythonRelaxDeps = [ "numpy" ]; + pythonRelaxDeps = [ + "lxml" + "numpy" + ]; dependencies = [ cssselect diff --git a/pkgs/development/python-modules/inline-snapshot/default.nix b/pkgs/development/python-modules/inline-snapshot/default.nix index 635bdf36c530b..bff769ab1ec5d 100644 --- a/pkgs/development/python-modules/inline-snapshot/default.nix +++ b/pkgs/development/python-modules/inline-snapshot/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "inline-snapshot"; - version = "0.23.0"; + version = "0.24.0"; pyproject = true; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/instructor/default.nix b/pkgs/development/python-modules/instructor/default.nix index 97c1d863d189d..959449e53e76c 100644 --- a/pkgs/development/python-modules/instructor/default.nix +++ b/pkgs/development/python-modules/instructor/default.nix @@ -23,6 +23,7 @@ anthropic, diskcache, fastapi, + google-genai, google-generativeai, pytest-asyncio, pytestCheckHook, @@ -32,16 +33,14 @@ buildPythonPackage rec { pname = "instructor"; - version = "1.7.9"; + version = "1.10.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "jxnl"; repo = "instructor"; tag = version; - hash = "sha256-3IwvbepDrylOIlL+IteyFChqYc/ZIu6IieIkbAPL+mw="; + hash = "sha256-vknPfRHyLoLo2838p/fbjrqyaBORZzLp9+fN98yVDz0="; }; build-system = [ hatchling ]; @@ -65,6 +64,7 @@ buildPythonPackage rec { anthropic diskcache fastapi + google-genai google-generativeai pytest-asyncio pytestCheckHook @@ -90,12 +90,20 @@ buildPythonPackage rec { # Performance benchmarks that sometimes fail when running many parallel builds "test_combine_system_messages_benchmark" "test_extract_system_messages_benchmark" + + # pydantic validation mismatch + "test_control_characters_not_allowed_in_anthropic_json_strict_mode" + "test_control_characters_allowed_in_anthropic_json_non_strict_mode" ]; disabledTestPaths = [ # Tests require OpenAI API key - "tests/test_distil.py" "tests/llm/" + # Network and requires API keys + "tests/test_auto_client.py" + # annoying dependencies + "tests/docs" + "examples" ]; meta = { diff --git a/pkgs/development/python-modules/ionoscloud/default.nix b/pkgs/development/python-modules/ionoscloud/default.nix index 8c4d079a5b9e1..d0ee3b2833066 100644 --- a/pkgs/development/python-modules/ionoscloud/default.nix +++ b/pkgs/development/python-modules/ionoscloud/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "ionoscloud"; - version = "6.1.11"; + version = "6.1.12"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-OQNdif263rY7c3tytKPMjXESmYsCBVtk0M25M3XDSJM="; + hash = "sha256-sc1qJjfLiI+KjLe3b+JE66giV1pIakYT7FsSjQjWA30="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/iplotx/default.nix b/pkgs/development/python-modules/iplotx/default.nix index bb7623222c289..f01b9b0f0ef33 100644 --- a/pkgs/development/python-modules/iplotx/default.nix +++ b/pkgs/development/python-modules/iplotx/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "iplotx"; - version = "0.4.0"; + version = "0.6.1"; pyproject = true; src = fetchFromGitHub { owner = "fabilab"; repo = "iplotx"; tag = version; - hash = "sha256-5piMXKr61F3euiCOlamZD7Iv6FQtrlbxwYYbZmD92Cg="; + hash = "sha256-RleGCDsH9VLX5hgU1l5pN6a1x9p52VA35CM5B9rJiy0="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 2ccb4cd94ee37..8751238168fea 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "6.29.5"; + version = "6.30.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-8JOiLEpA+IKPjjMKnCl8uT3KsTvZZ43tbejlz4HFYhU="; + hash = "sha256-arsnAWGJZALna5E5T83OXRvl1F9FZnHlCAVy+FBb45s="; }; # debugpy is optional, see https://github.com/ipython/ipykernel/pull/767 diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index 66680b336217a..a2f8bac3b77a8 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -36,12 +36,12 @@ buildPythonPackage rec { pname = "ipython"; - version = "9.3.0"; + version = "9.4.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-eeuJb58j9QrRbDvCBfaG9uAwrSRswwnGJ5okKxSv6dg="; + hash = "sha256-wDPG1OeRTD2XaKq+drvoe6HcZqkqBdtr+hEl2B8u4nA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/itemadapter/default.nix b/pkgs/development/python-modules/itemadapter/default.nix index 459c6b9a76fcc..72c2d930334d5 100644 --- a/pkgs/development/python-modules/itemadapter/default.nix +++ b/pkgs/development/python-modules/itemadapter/default.nix @@ -3,25 +3,23 @@ attrs, buildPythonPackage, fetchPypi, + hatchling, pydantic, pythonOlder, scrapy, - setuptools, }: buildPythonPackage rec { pname = "itemadapter"; - version = "0.11.0"; + version = "0.12.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchPypi { inherit pname version; - hash = "sha256-Ow8n9MXi6K5BXYPj1g0zrbe6CbmMMGOLxgb7Hf8uzdI="; + hash = "sha256-pQiCQ+iO/jCY8XIIVecHF25zVa2H0dIOKwMpf10V0b4="; }; - build-system = [ setuptools ]; + build-system = [ hatchling ]; optional-dependencies = { attrs = [ attrs ]; diff --git a/pkgs/development/python-modules/itemdb/default.nix b/pkgs/development/python-modules/itemdb/default.nix index 20148a8b6d0ce..5b92b75044b01 100644 --- a/pkgs/development/python-modules/itemdb/default.nix +++ b/pkgs/development/python-modules/itemdb/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "itemdb"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; # PyPI tarball doesn't include tests directory @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "almarklein"; repo = "itemdb"; tag = "v${version}"; - sha256 = "sha256-egxQ1tGC6R5p1stYm4r05+b2HkuT+nBySTZPGqeAbSE="; + sha256 = "sha256-HXdOERq2td6CME8zWN0DRVkSlmdqTg2po7aJrOuITHE="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/iterm2/default.nix b/pkgs/development/python-modules/iterm2/default.nix index 22ddacfb0cba2..6e92003720efd 100644 --- a/pkgs/development/python-modules/iterm2/default.nix +++ b/pkgs/development/python-modules/iterm2/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "iterm2"; - version = "2.9"; + version = "2.10"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-FoR17UloBtFg3pRurquHCzGaySehUPhVtmQmNkhWTz4="; + hash = "sha256-jAz5X/yp8b90CYg2GN7uZqzXPGOSkiLiNDV4DcxRaGk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jaraco-abode/default.nix b/pkgs/development/python-modules/jaraco-abode/default.nix index e5c4147dd0ac7..fe1f78a4c2504 100644 --- a/pkgs/development/python-modules/jaraco-abode/default.nix +++ b/pkgs/development/python-modules/jaraco-abode/default.nix @@ -25,16 +25,20 @@ buildPythonPackage rec { pname = "jaraco-abode"; - version = "6.3.0"; + version = "6.4.0"; pyproject = true; src = fetchFromGitHub { owner = "jaraco"; repo = "jaraco.abode"; tag = "v${version}"; - hash = "sha256-AqnyQdLkg2vobVJ84X15AB0Yyj3gZf4rP3pEdk3MqZ4="; + hash = "sha256-nnnVtNXQ7Sa4wXl0ay3OyjvOq2j90pTwhK24WR8mrBo="; }; + postPatch = '' + sed -i "/coherent\.licensed/d" pyproject.toml + ''; + build-system = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/jaraco-collections/default.nix b/pkgs/development/python-modules/jaraco-collections/default.nix index 128592ba047d8..8f913f2d11a39 100644 --- a/pkgs/development/python-modules/jaraco-collections/default.nix +++ b/pkgs/development/python-modules/jaraco-collections/default.nix @@ -10,18 +10,17 @@ buildPythonPackage rec { pname = "jaraco-collections"; - version = "5.1.0"; + version = "5.2.1"; pyproject = true; src = fetchPypi { pname = "jaraco_collections"; inherit version; - hash = "sha256-DkgpQJ05rRikCqZ1T+4nZ/TZcwxLpm3J34nx0nVplMI="; + hash = "sha256-2rgZcLrW8KtTsgdF8bAdo3km5MD81CUEaqReDY76GO0="; }; postPatch = '' - # break dependency cycle - sed -i "/'jaraco.text',/d" setup.cfg + sed -i "/coherent\.licensed/d" pyproject.toml ''; build-system = [ diff --git a/pkgs/development/python-modules/jaraco-functools/default.nix b/pkgs/development/python-modules/jaraco-functools/default.nix index 20f50cb6a7896..90b983a1c504b 100644 --- a/pkgs/development/python-modules/jaraco-functools/default.nix +++ b/pkgs/development/python-modules/jaraco-functools/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "jaraco-functools"; - version = "4.1.0"; + version = "4.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,9 +21,13 @@ buildPythonPackage rec { src = fetchPypi { pname = "jaraco_functools"; inherit version; - hash = "sha256-cPfg4q4HZJjiElYjJegFIE/Akte0wX4OhslZ4klwGp0="; + hash = "sha256-vmNKv8yrzlb6MFP4x+vje2gmg6Tud5NnDO0XurAIc1M="; }; + postPatch = '' + sed -i "/coherent\.licensed/d" pyproject.toml + ''; + build-system = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/jaraco-itertools/default.nix b/pkgs/development/python-modules/jaraco-itertools/default.nix index 07c1cd3385186..971dbd9aba1c9 100644 --- a/pkgs/development/python-modules/jaraco-itertools/default.nix +++ b/pkgs/development/python-modules/jaraco-itertools/default.nix @@ -1,41 +1,40 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools-scm, inflect, more-itertools, - six, - pytest, + pytestCheckHook, }: buildPythonPackage rec { pname = "jaraco-itertools"; - version = "6.4.1"; - format = "pyproject"; - - src = fetchPypi { - pname = "jaraco.itertools"; - inherit version; - hash = "sha256-MU/OVi67RepIIqmLvXsi5f6sfVEY28Gk8ess0Ea/+kc="; + version = "6.4.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jaraco"; + repo = "jaraco.itertools"; + tag = "v${version}"; + hash = "sha256-LjWkyY9I8BBYpFm8TT3kq4vk63pNQrnZ15haJCQ5xlk="; }; pythonNamespaces = [ "jaraco" ]; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; + + postPatch = '' + # downloads license texts at build time + sed -i "/coherent\.licensed/d" pyproject.toml + ''; - propagatedBuildInputs = [ + dependencies = [ inflect more-itertools - six ]; - nativeCheckInputs = [ pytest ]; - # tests no longer available through pypi - doCheck = false; - checkPhase = '' - pytest - ''; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "jaraco.itertools" ]; diff --git a/pkgs/development/python-modules/jaraco-logging/default.nix b/pkgs/development/python-modules/jaraco-logging/default.nix index 3368ac4ae19e6..44e8ad050bcfd 100644 --- a/pkgs/development/python-modules/jaraco-logging/default.nix +++ b/pkgs/development/python-modules/jaraco-logging/default.nix @@ -10,17 +10,21 @@ buildPythonPackage rec { pname = "jaraco-logging"; - version = "3.3.0"; + version = "3.4.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { - pname = "jaraco.logging"; + pname = "jaraco_logging"; inherit version; - hash = "sha256-9KfPusuGqDTCiGwBo7UrxM3icowdlxfEnU3OHWJI8Hs="; + hash = "sha256-59bcg2hHfOaesdbthR2AWJahypQs4/0Xc1gDEbC3dfs="; }; + postPatch = '' + sed -i "/coherent\.licensed/d" pyproject.toml + ''; + pythonNamespaces = [ "jaraco" ]; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jiwer/default.nix b/pkgs/development/python-modules/jiwer/default.nix index 5f0ab0b1b73d1..86891d10edcbc 100644 --- a/pkgs/development/python-modules/jiwer/default.nix +++ b/pkgs/development/python-modules/jiwer/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "jiwer"; - version = "3.04"; + version = "4.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jitsi"; repo = "jiwer"; tag = "v${version}"; - hash = "sha256-2LzAOgABK00Pz3v5WWYUAcZOYcTbRKfgw7U5DOohB/Q="; + hash = "sha256-iyFcxZGYMeQXSZBHJg7kBWyOciZyEV7gSzSy4SvBGzw="; }; build-system = [ @@ -39,7 +39,7 @@ buildPythonPackage rec { description = "Simple and fast python package to evaluate an automatic speech recognition system"; mainProgram = "jiwer"; homepage = "https://github.com/jitsi/jiwer"; - changelog = "https://github.com/jitsi/jiwer/releases/tag/v${version}"; + changelog = "https://github.com/jitsi/jiwer/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ GaetanLepage ]; }; diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index ac35a717420d1..4959b53e22839 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "joblib"; - version = "1.5.0"; + version = "1.5.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2HV/lVOJo916IxUuQ7wpfC4MLTBgBW2tD+78iKBpObU="; + hash = "sha256-9PhuNR85/j0NMqnyw9ivHuTOwoWq/LJwA92lIFV2tEQ="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/josepy/default.nix b/pkgs/development/python-modules/josepy/default.nix index 7358a9375e00b..15f1282b8bf04 100644 --- a/pkgs/development/python-modules/josepy/default.nix +++ b/pkgs/development/python-modules/josepy/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "josepy"; - version = "2.0.0"; + version = "2.1.0"; pyproject = true; src = fetchFromGitHub { owner = "certbot"; repo = "josepy"; tag = "v${version}"; - hash = "sha256-9hY3A+XSoVrRLds4tNV+5HWkmMwcS9UtehrKoj0OIEw="; + hash = "sha256-gXXsipvlxLs/dc0rjnaKlR4lySDfDfpo0tcSVrOz9P4="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/joserfc/default.nix b/pkgs/development/python-modules/joserfc/default.nix index 9823612e5371d..5cbe913821b5e 100644 --- a/pkgs/development/python-modules/joserfc/default.nix +++ b/pkgs/development/python-modules/joserfc/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "joserfc"; - version = "1.1.0"; + version = "1.2.2"; pyproject = true; src = fetchFromGitHub { owner = "authlib"; repo = "joserfc"; tag = version; - hash = "sha256-95xtUzzIxxvDtpHX/5uCHnTQTB8Fc08DZGUOR/SdKLs="; + hash = "sha256-GS1UvhOdeuyGaF/jS0zgdYkRxz6M8w4lFXcbtIPqQcY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/jsonargparse/default.nix b/pkgs/development/python-modules/jsonargparse/default.nix index f1c6e76b41a32..90588f7b68643 100644 --- a/pkgs/development/python-modules/jsonargparse/default.nix +++ b/pkgs/development/python-modules/jsonargparse/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "jsonargparse"; - version = "4.40.2"; + version = "4.40.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "omni-us"; repo = "jsonargparse"; tag = "v${version}"; - hash = "sha256-3Zs2F46tGcvIF9UOGI/P079BZLJJyEyP9LDPRfvSk4E="; + hash = "sha256-GxltSN1o7vAZQXrejpBp5YMqOQaln8pqKxmGNa0vA/Q="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/jsonfield/default.nix b/pkgs/development/python-modules/jsonfield/default.nix index bf7e67eb6207b..b6139135a560d 100644 --- a/pkgs/development/python-modules/jsonfield/default.nix +++ b/pkgs/development/python-modules/jsonfield/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "jsonfield"; - version = "3.1.0"; + version = "3.2.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "0yl828cd0m8jsyr4di6hcjdqmi31ijh5vk57mbpfl7p2gmcq8kky"; + sha256 = "sha256-ylOHG8MwiuT0zdw7T5ntXG/Gq7GDL7+0mbxtpWbHDko="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix index d8da4abe884d2..c67eb0b78f005 100644 --- a/pkgs/development/python-modules/jsonpickle/default.nix +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "jsonpickle"; - version = "4.0.5"; + version = "4.1.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-8pmBizk2fDYbPya9uoJ9QkmrXTg82TFE0PlLVBeqyzU="; + hash = "sha256-+G4Y8T4rlsHB7t4Le5AJW7th2Z/twUgTxE3C82HbuuE="; }; build-system = [ diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix index 47d2215b9bfe4..cde9fcf1114e6 100644 --- a/pkgs/development/python-modules/jsonrpc-async/default.nix +++ b/pkgs/development/python-modules/jsonrpc-async/default.nix @@ -6,15 +6,13 @@ jsonrpc-base, pytest-aiohttp, pytestCheckHook, - pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "jsonrpc-async"; version = "2.1.2"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchFromGitHub { owner = "emlove"; @@ -23,7 +21,14 @@ buildPythonPackage rec { hash = "sha256-KOnycsOZFDEVj8CJDwGbdtbOpMPQMVdrXbHG0fzr9PI="; }; - propagatedBuildInputs = [ + patches = [ + # https://github.com/emlove/jsonrpc-async/pull/11 + ./mark-tests-async.patch + ]; + + build-system = [ setuptools ]; + + dependencies = [ aiohttp jsonrpc-base ]; diff --git a/pkgs/development/python-modules/jsonrpc-async/mark-tests-async.patch b/pkgs/development/python-modules/jsonrpc-async/mark-tests-async.patch new file mode 100644 index 0000000000000..c63a4f8a644f1 --- /dev/null +++ b/pkgs/development/python-modules/jsonrpc-async/mark-tests-async.patch @@ -0,0 +1,104 @@ +From af9b471eba92f1f353fec57f60e48702e79bcb80 Mon Sep 17 00:00:00 2001 +From: Martin Weinelt +Date: Thu, 21 Aug 2025 15:24:37 +0200 +Subject: [PATCH] Fix tests with pytest 8.4 + +Pytest 8.4 will fail on async functions, if they are not handled by a +plugin. And since pytest-aiohttp relies on pytest-asyncio, the obvious +fix is to mark them as asyncio. +--- + tests.py | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/tests.py b/tests.py +index e11c4d5..547d636 100644 +--- a/tests.py ++++ b/tests.py +@@ -11,6 +11,7 @@ + from jsonrpc_async import Server, ProtocolError, TransportError + + ++@pytest.mark.asyncio + async def test_send_message_timeout(aiohttp_client): + """Test the catching of the timeout responses.""" + +@@ -37,6 +38,7 @@ def create_app(): + assert isinstance(transport_error.value.args[1], asyncio.TimeoutError) + + ++@pytest.mark.asyncio + async def test_send_message(aiohttp_client): + """Test the sending of messages.""" + # catch non-json responses +@@ -100,6 +102,7 @@ def create_app(): + "Error calling method 'my_method': Transport Error") + + ++@pytest.mark.asyncio + async def test_exception_passthrough(aiohttp_client): + async def callback(*args, **kwargs): + raise aiohttp.ClientOSError('aiohttp exception') +@@ -120,6 +123,7 @@ def create_app(): + assert isinstance(transport_error.value.args[1], aiohttp.ClientOSError) + + ++@pytest.mark.asyncio + async def test_forbid_private_methods(aiohttp_client): + """Test that we can't call private methods (those starting with '_').""" + def create_app(): +@@ -137,6 +141,7 @@ def create_app(): + await server.foo.bar._baz() + + ++@pytest.mark.asyncio + async def test_headers_passthrough(aiohttp_client): + """Test that we correctly send RFC headers and merge them with users.""" + async def handler(request): +@@ -170,6 +175,7 @@ async def callback(*args, **kwargs): + await server.foo() + + ++@pytest.mark.asyncio + async def test_method_call(aiohttp_client): + """Mixing *args and **kwargs is forbidden by the spec.""" + def create_app(): +@@ -185,6 +191,7 @@ def create_app(): + "JSON-RPC spec forbids mixing arguments and keyword arguments") + + ++@pytest.mark.asyncio + async def test_method_nesting(aiohttp_client): + """Test that we correctly nest namespaces.""" + async def handler(request): +@@ -211,6 +218,7 @@ def create_app(): + "nest.testmethod.some.other.method") is True + + ++@pytest.mark.asyncio + async def test_calls(aiohttp_client): + """Test RPC call with positional parameters.""" + async def handler1(request): +@@ -265,6 +273,7 @@ def create_app(): + await server.foobar({'foo': 'bar'}) + + ++@pytest.mark.asyncio + async def test_notification(aiohttp_client): + """Verify that we ignore the server response.""" + async def handler(request): +@@ -283,6 +292,7 @@ def create_app(): + assert await server.subtract(42, 23, _notification=True) is None + + ++@pytest.mark.asyncio + async def test_custom_loads(aiohttp_client): + """Test RPC call with custom load.""" + loads_mock = mock.Mock(wraps=json.loads) +@@ -306,6 +316,7 @@ def create_app(): + assert loads_mock.call_count == 1 + + ++@pytest.mark.asyncio + async def test_context_manager(aiohttp_client): + # catch non-json responses + async def handler1(request): diff --git a/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/pkgs/development/python-modules/jsonrpc-websocket/default.nix index 8047a7a7ebecf..8fd8391120a63 100644 --- a/pkgs/development/python-modules/jsonrpc-websocket/default.nix +++ b/pkgs/development/python-modules/jsonrpc-websocket/default.nix @@ -5,7 +5,7 @@ buildPythonPackage, fetchFromGitHub, jsonrpc-base, - pytest-asyncio, + pytest-asyncio_0, pytestCheckHook, pythonOlder, setuptools, @@ -34,7 +34,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytest-asyncio + pytest-asyncio_0 pytestCheckHook ]; diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index 0407a46ba1980..9eb7cdf30e5c2 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -6,12 +6,10 @@ hatch-fancy-pypi-readme, hatch-vcs, hatchling, - importlib-resources, + jsonpath-ng, jsonschema-specifications, - pkgutil-resolve-name, pip, pytestCheckHook, - pythonOlder, referencing, rpds-py, @@ -23,20 +21,19 @@ rfc3339-validator, rfc3986-validator, rfc3987, + rfc3987-syntax, uri-template, webcolors, }: buildPythonPackage rec { pname = "jsonschema"; - version = "4.23.0"; + version = "4.25.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchPypi { inherit pname version; - hash = "sha256-1xSX/vJjUaMyZTN/p3/+uCQj8+ohKDzZRnuwOZkma8Q="; + hash = "sha256-5jrPXBF2LA5mcv+2FIK99X8IdmhNjSScD+LXMNSLxV8="; }; postPatch = '' @@ -51,13 +48,10 @@ buildPythonPackage rec { dependencies = [ attrs + jsonpath-ng jsonschema-specifications referencing rpds-py - ] - ++ lib.optionals (pythonOlder "3.9") [ - importlib-resources - pkgutil-resolve-name ]; optional-dependencies = { @@ -78,6 +72,7 @@ buildPythonPackage rec { jsonpointer rfc3339-validator rfc3986-validator + rfc3987-syntax uri-template webcolors ]; diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix index ed62d63062217..b8e921969b60b 100644 --- a/pkgs/development/python-modules/jug/default.nix +++ b/pkgs/development/python-modules/jug/default.nix @@ -2,28 +2,29 @@ lib, bottle, buildPythonPackage, - fetchPypi, + fetchFromGitHub, numpy, pytestCheckHook, - pythonOlder, pyyaml, redis, + setuptools, }: buildPythonPackage rec { pname = "jug"; - version = "2.3.1"; - format = "setuptools"; + version = "2.4.0"; + pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - pname = "Jug"; - inherit version; - hash = "sha256-Y2TWqJi7GjmWUFpe1b150NgwRw9VKhCk5EoN5NDcPXU="; + src = fetchFromGitHub { + owner = "luispedro"; + repo = "jug"; + tag = "v${version}"; + hash = "sha256-zERCY9JxceBmhJbytfsm/6rDwipqQ1XjzY/2QFsEEEg="; }; - propagatedBuildInputs = [ bottle ]; + build-system = [ setuptools ]; + + dependenciesk = [ bottle ]; nativeCheckInputs = [ numpy diff --git a/pkgs/development/python-modules/jupyter-lsp/default.nix b/pkgs/development/python-modules/jupyter-lsp/default.nix index 54ce115af8dfc..d2c97fb659852 100644 --- a/pkgs/development/python-modules/jupyter-lsp/default.nix +++ b/pkgs/development/python-modules/jupyter-lsp/default.nix @@ -8,12 +8,13 @@ buildPythonPackage rec { pname = "jupyter-lsp"; - version = "2.2.5"; + version = "2.2.6"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-eTFHoFrURvgJ/VPvHNGan1JW/Qota3zpQ6mCy09UUAE="; + pname = "jupyter_lsp"; + inherit version; + hash = "sha256-BWa9m7BP2eZ3SpN+0BUitVW6eL43vr73h8irIt5MA2E="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix index e88befd0acd17..bcf31bfb43afa 100644 --- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "jupyter-repo2docker"; - version = "2024.07.0"; + version = "2025.08.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "jupyterhub"; repo = "repo2docker"; tag = version; - hash = "sha256-ZzZBuJBPDG4to1fSYn2xysupXbPS9Q6wqWr3Iq/Vds8="; + hash = "sha256-vqLZbqshEl3xC5hcE4OkWfZpPSlSfv70oygEYPFqyFE="; }; nativeBuildInputs = [ setuptools ]; @@ -64,7 +64,7 @@ buildPythonPackage rec { meta = with lib; { description = "Turn code repositories into Jupyter enabled Docker Images"; homepage = "https://repo2docker.readthedocs.io/"; - changelog = "https://github.com/jupyterhub/repo2docker/blob/${src.rev}/docs/source/changelog.md"; + changelog = "https://github.com/jupyterhub/repo2docker/blob/${src.tag}/docs/source/changelog.md"; license = licenses.bsd3; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 1be0da1b95ea0..5a95b94810254 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "4.4.3"; + version = "4.4.5"; pyproject = true; src = fetchFromGitHub { owner = "jupyterlab"; repo = "jupyterlab"; tag = "v${version}"; - hash = "sha256-ZenPoUnUlNLiOVI6tkF/Lq6l3tMA8WXKg9ENwOgS720="; + hash = "sha256-Joc8gtUJS8J2SLJqBV3f4bzmOje1grdgIMUkcwl9K44="; }; nativeBuildInputs = [ @@ -48,7 +48,7 @@ buildPythonPackage rec { offlineCache = yarn-berry_3.fetchYarnBerryDeps { inherit src; sourceRoot = "${src.name}/jupyterlab/staging"; - hash = "sha256-qW0SiISQhwVPk0wwnEtxB4fJMyVS3wzp/4pS8bPleM4="; + hash = "sha256-EwR1gVrEy7QV8DnJBPx1AlbWY10FFngpLXdAIKn1HI0="; }; preBuild = '' diff --git a/pkgs/development/python-modules/kajiki/default.nix b/pkgs/development/python-modules/kajiki/default.nix index 1632d83f1af9e..e801f49aca4a0 100644 --- a/pkgs/development/python-modules/kajiki/default.nix +++ b/pkgs/development/python-modules/kajiki/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "kajiki"; - version = "0.9.2"; + version = "1.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jackrosenthal"; repo = "kajiki"; tag = "v${version}"; - hash = "sha256-EbXe4Jh2IKAYw9GE0kFgKVv9c9uAOiFFYaMF8CGaOfg="; + hash = "sha256-5qsRxKeWCndi2r1HaIX/bm92oOWU4J4eM9aud6ai8ZQ="; }; propagatedBuildInputs = [ linetable ]; @@ -35,7 +35,7 @@ buildPythonPackage rec { description = "Module provides fast well-formed XML templates"; mainProgram = "kajiki"; homepage = "https://github.com/nandoflorestan/kajiki"; - changelog = "https://github.com/jackrosenthal/kajiki/releases/tag/v${version}"; + changelog = "https://github.com/jackrosenthal/kajiki/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ onny ]; }; diff --git a/pkgs/development/python-modules/karton-core/default.nix b/pkgs/development/python-modules/karton-core/default.nix index 57b51af427f66..dd9293b0f273e 100644 --- a/pkgs/development/python-modules/karton-core/default.nix +++ b/pkgs/development/python-modules/karton-core/default.nix @@ -26,7 +26,10 @@ buildPythonPackage rec { build-system = [ setuptools ]; - pythonRelaxDeps = [ "boto3" ]; + pythonRelaxDeps = [ + "aioboto3" + "boto3" + ]; dependencies = [ aioboto3 diff --git a/pkgs/development/python-modules/kernels/default.nix b/pkgs/development/python-modules/kernels/default.nix index 4f97afd113e02..47e087b90b3f9 100644 --- a/pkgs/development/python-modules/kernels/default.nix +++ b/pkgs/development/python-modules/kernels/default.nix @@ -7,14 +7,14 @@ }: buildPythonPackage rec { pname = "kernels"; - version = "0.7.0"; + version = "0.9.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "kernels"; tag = "v${version}"; - hash = "sha256-IbOadtnuRgN54Sg+mFULkkqi6LVlW+ohBgtemz/Pxxc="; + hash = "sha256-lREccuvahjNV44reYNF8fkJ2o4fMZRB9Ddr9r4HmT2k="; }; build-system = [ diff --git a/pkgs/development/python-modules/kestra/default.nix b/pkgs/development/python-modules/kestra/default.nix index 31653a931a3c7..c6039c8a121c8 100644 --- a/pkgs/development/python-modules/kestra/default.nix +++ b/pkgs/development/python-modules/kestra/default.nix @@ -9,14 +9,14 @@ }: buildPythonPackage rec { pname = "kestra"; - version = "0.21.0"; + version = "0.23.0"; pyproject = true; src = fetchFromGitHub { owner = "kestra-io"; repo = "libs"; tag = "v${version}"; - hash = "sha256-WaAw/PKoHPjbNrpCV6CuqUIb2Ysv4rHYFJbgGyU6li0="; + hash = "sha256-WtwvOSgAcN+ly0CnkL0Y7lrO4UhSSiXmoAyGXP/hFtE="; }; sourceRoot = "${src.name}/python"; diff --git a/pkgs/development/python-modules/kfactory/default.nix b/pkgs/development/python-modules/kfactory/default.nix index 2f661515e3299..a164a03d5ccbb 100644 --- a/pkgs/development/python-modules/kfactory/default.nix +++ b/pkgs/development/python-modules/kfactory/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "kfactory"; - version = "1.4.4"; + version = "1.12.1"; pyproject = true; src = fetchFromGitHub { owner = "gdsfactory"; repo = "kfactory"; tag = "v${version}"; - hash = "sha256-/dhlAcrqQP/YeKGhnBAVMEy80X3yShn65ywoZMRU/ZM="; + hash = "sha256-C7ner1jkMCHI8/sRiw82l+THhAIWhwJuZ/ctJ9V76Us="; }; build-system = [ @@ -77,7 +77,7 @@ buildPythonPackage rec { meta = { description = "KLayout API implementation of gdsfactory"; homepage = "https://github.com/gdsfactory/kfactory"; - changelog = "https://github.com/gdsfactory/kfactory/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/gdsfactory/kfactory/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fbeffa ]; }; diff --git a/pkgs/development/python-modules/kiss-headers/default.nix b/pkgs/development/python-modules/kiss-headers/default.nix index 3bc40680fb7ee..79011b9660bf5 100644 --- a/pkgs/development/python-modules/kiss-headers/default.nix +++ b/pkgs/development/python-modules/kiss-headers/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "kiss-headers"; - version = "2.4.3"; + version = "2.5.0"; pyproject = true; src = fetchFromGitHub { owner = "Ousret"; repo = "kiss-headers"; tag = version; - hash = "sha256-WeAzlC1yT+0nPSuB278z8T0XvPjbre051f/Rva5ujAk="; + hash = "sha256-h0e7kFbn6qxIeSG85qetBg6IeSi/2YAaZLGS0+JH2g8="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/kornia/default.nix b/pkgs/development/python-modules/kornia/default.nix index 943bcf4931acd..0ea0b2eaf1b74 100644 --- a/pkgs/development/python-modules/kornia/default.nix +++ b/pkgs/development/python-modules/kornia/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "kornia"; - version = "0.8.0"; + version = "0.8.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "kornia"; repo = "kornia"; tag = "v${version}"; - hash = "sha256-pMCGL33DTnMLlxRbhBhRuR/ZA575+kbUJ59N3nuqpdI="; + hash = "sha256-LT+F/tskySvSmaBufIaQhI4+wK5DZBNanQbnYj4ywGo="; }; build-system = [ setuptools ]; @@ -52,7 +52,7 @@ buildPythonPackage rec { meta = { homepage = "https://kornia.readthedocs.io"; - changelog = "https://github.com/kornia/kornia/releases/tag/v${version}"; + changelog = "https://github.com/kornia/kornia/releases/tag/${src.tag}"; description = "Differentiable computer vision library"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ bcdarwin ]; diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index de99487b25039..7861d5e2ff1b1 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "kubernetes"; - version = "32.0.1"; + version = "33.1.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "kubernetes-client"; repo = "python"; tag = "v${version}"; - hash = "sha256-pQuo2oLWMmq4dHTqJYL+Z1xg3ZoYp9ZzLDT7jWIsglo="; + hash = "sha256-+jL0XS7Y8qOqzZ5DcG/hZFUpj7krJAaA4fgPNSEgIAE="; }; build-system = [ diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index 50ba167f6f47b..2c9d723afd2c2 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -29,14 +29,14 @@ }: let - version = "6.10.0"; + version = "7.1.1"; pyproject = true; src = fetchFromGitHub { owner = "Labelbox"; repo = "labelbox-python"; - tag = "v.${version}"; - hash = "sha256-EstHsY9yFeUhQAx3pgvKk/o3EMkr3JeHDDg/p6meDIE="; + tag = "v${version}"; + hash = "sha256-zlcyvouvemHhbD1UcYbbbkmCkTVwarSTF9mCi0I/ZzY="; }; lbox-clients = buildPythonPackage { diff --git a/pkgs/development/python-modules/labgrid/default.nix b/pkgs/development/python-modules/labgrid/default.nix index f0e6b5b61a9ee..a73a986154859 100644 --- a/pkgs/development/python-modules/labgrid/default.nix +++ b/pkgs/development/python-modules/labgrid/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "labgrid"; - version = "25.0"; + version = "25.0.1"; pyproject = true; src = fetchFromGitHub { owner = "labgrid-project"; repo = "labgrid"; tag = "v${version}"; - hash = "sha256-Czq8Wx8ThKLcR8GjdlRND+Y1nY1PTl6wDkz9ml83DBk="; + hash = "sha256-cLofkkp2T6Y9nQ5LIS7w9URZlt8DQNN8dm3NnrvcKWY="; }; # Remove after package bump diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix index 573090fad0111..3d29e1bdfe010 100644 --- a/pkgs/development/python-modules/lacuscore/default.nix +++ b/pkgs/development/python-modules/lacuscore/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "lacuscore"; - version = "1.14.0"; + version = "1.16.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ail-project"; repo = "LacusCore"; tag = "v${version}"; - hash = "sha256-szcvg4jfJ84kHYWjPBwecfvfsc258SS0OIuYle1lC1g="; + hash = "sha256-LcqGJU+wMKTF1E4asysQPcfURqmgc4WQompPpHEgjb8="; }; pythonRelaxDeps = [ @@ -60,7 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "Modulable part of Lacus"; homepage = "https://github.com/ail-project/LacusCore"; - changelog = "https://github.com/ail-project/LacusCore/releases/tag/v${version}"; + changelog = "https://github.com/ail-project/LacusCore/releases/tag/${src.tag}"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix b/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix index a278a133bba19..f404c0562d977 100644 --- a/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix +++ b/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "langchain-azure-dynamic-sessions"; - version = "0.2.0"; + version = "0.3.72"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - tag = "langchain-azure-dynamic-sessions==${version}"; - hash = "sha256-ACR+JzKcnYXROGOQe6DlZeqcYd40KlesgXSUOybOT20="; + tag = "langchain-core==${version}"; + hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc="; }; sourceRoot = "${src.name}/libs/partners/azure-dynamic-sessions"; diff --git a/pkgs/development/python-modules/langchain-deepseek/default.nix b/pkgs/development/python-modules/langchain-deepseek/default.nix index 9830a391d3234..f267693153521 100644 --- a/pkgs/development/python-modules/langchain-deepseek/default.nix +++ b/pkgs/development/python-modules/langchain-deepseek/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "langchain-deepseek"; - version = "0.1.4"; + version = "0.3.72"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - tag = "langchain-deepseek==${version}"; - hash = "sha256-lIlThVpyZF5osiCyYMO8kQUNtG5eUjXGZLdgRraj4Yc="; + tag = "langchain-core==${version}"; + hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc="; }; sourceRoot = "${src.name}/libs/partners/deepseek"; diff --git a/pkgs/development/python-modules/langchain-fireworks/default.nix b/pkgs/development/python-modules/langchain-fireworks/default.nix index 460c842ebebdf..48a221a7766c5 100644 --- a/pkgs/development/python-modules/langchain-fireworks/default.nix +++ b/pkgs/development/python-modules/langchain-fireworks/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "langchain-fireworks"; - version = "0.3.0"; + version = "0.3.72"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - tag = "langchain-fireworks==${version}"; - hash = "sha256-OZou323FAk2I4YuQV7sllbzDwFQWy/90FK3gIHnEBd0="; + tag = "langchain-core==${version}"; + hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc="; }; sourceRoot = "${src.name}/libs/partners/fireworks"; diff --git a/pkgs/development/python-modules/langchain-mistralai/default.nix b/pkgs/development/python-modules/langchain-mistralai/default.nix index 69ca227713919..e7e45057e77c8 100644 --- a/pkgs/development/python-modules/langchain-mistralai/default.nix +++ b/pkgs/development/python-modules/langchain-mistralai/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "langchain-mistralai"; - version = "0.2.11"; + version = "0.3.72"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - tag = "langchain-mistralai==${version}"; - hash = "sha256-14mYvW7j2hxAFZanRhuuo1seX6E4+tAuEPExDbdwHKg="; + tag = "langchain-core==${version}"; + hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc="; }; sourceRoot = "${src.name}/libs/partners/mistralai"; diff --git a/pkgs/development/python-modules/langchain-mongodb/default.nix b/pkgs/development/python-modules/langchain-mongodb/default.nix index 978bfffbc6ed9..212efde0e2329 100644 --- a/pkgs/development/python-modules/langchain-mongodb/default.nix +++ b/pkgs/development/python-modules/langchain-mongodb/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "langchain-mongodb"; - version = "0.2.0"; + version = "0.3.72"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - tag = "langchain-mongodb==${version}"; - hash = "sha256-Jd9toXkS9dGtSIrJQ/5W+swV1z2BJOJKBtkyGzj3oSc="; + tag = "langchain-core==${version}"; + hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc="; }; sourceRoot = "${src.name}/libs/partners/mongodb"; diff --git a/pkgs/development/python-modules/langchain-ollama/default.nix b/pkgs/development/python-modules/langchain-ollama/default.nix index 75a6c8f8e55d1..d76f1cef40c4e 100644 --- a/pkgs/development/python-modules/langchain-ollama/default.nix +++ b/pkgs/development/python-modules/langchain-ollama/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "langchain-ollama"; - version = "0.3.6"; + version = "0.3.72"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - tag = "langchain-ollama==${version}"; - hash = "sha256-GQkyJaYvwRbjDR0Rfen7/X5hFhY2+WU74B6/9Ufhpo4="; + tag = "langchain-core==${version}"; + hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc="; }; sourceRoot = "${src.name}/libs/partners/ollama"; diff --git a/pkgs/development/python-modules/langchain-openai/default.nix b/pkgs/development/python-modules/langchain-openai/default.nix index fa62fad8522cf..142098443e91f 100644 --- a/pkgs/development/python-modules/langchain-openai/default.nix +++ b/pkgs/development/python-modules/langchain-openai/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "langchain-openai"; - version = "0.3.28"; + version = "0.3.72"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - tag = "langchain-openai==${version}"; - hash = "sha256-HpAdCHxmfGJcqXArvtlYagNuEBGBjrbICIwh9nI0qMQ="; + tag = "langchain-core==${version}"; + hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc="; }; sourceRoot = "${src.name}/libs/partners/openai"; diff --git a/pkgs/development/python-modules/langchain-perplexity/default.nix b/pkgs/development/python-modules/langchain-perplexity/default.nix index 0afbb0d521a4f..79f6078643a5a 100644 --- a/pkgs/development/python-modules/langchain-perplexity/default.nix +++ b/pkgs/development/python-modules/langchain-perplexity/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "langchain-perplexity"; - version = "0.1.2"; + version = "0.3.72"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - tag = "langchain-perplexity==${version}"; - hash = "sha256-4KYLyhGbG8Y8cDGffE4/8OM61eAKRFTgxKDKMTQExic="; + tag = "langchain-core==${version}"; + hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc="; }; sourceRoot = "${src.name}/libs/partners/perplexity"; diff --git a/pkgs/development/python-modules/langchain-tests/default.nix b/pkgs/development/python-modules/langchain-tests/default.nix index 495d772296667..42afbb15a0cc9 100644 --- a/pkgs/development/python-modules/langchain-tests/default.nix +++ b/pkgs/development/python-modules/langchain-tests/default.nix @@ -20,7 +20,7 @@ # tests numpy, - pytest-asyncio, + pytest-asyncio_0, pytest-socket, pytestCheckHook, @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "langchain-tests"; - version = "0.3.20"; + version = "0.3.72"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - tag = "langchain-tests==${version}"; - hash = "sha256-RMuxWA/n8d71FReFKO3Y/5P0MYk4aZ5WU2/TRxf9UuE="; + tag = "langchain-core==${version}"; + hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc="; }; sourceRoot = "${src.name}/libs/standard-tests"; @@ -54,7 +54,7 @@ buildPythonPackage rec { dependencies = [ httpx langchain-core - pytest-asyncio + pytest-asyncio_0 pytest-benchmark pytest-codspeed pytest-recording diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix index 73398f9cf85bc..53ddcc2ae78c4 100644 --- a/pkgs/development/python-modules/langchain-text-splitters/default.nix +++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "langchain-text-splitters"; - version = "0.3.9"; + version = "0.3.72"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - tag = "langchain-text-splitters==${version}"; - hash = "sha256-dMGvGZyux38Svl0OYgiAoYLdAf0lv27lzXgHFTBp3cs="; + tag = "langchain-core==${version}"; + hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc="; }; sourceRoot = "${src.name}/libs/text-splitters"; diff --git a/pkgs/development/python-modules/langchain-xai/default.nix b/pkgs/development/python-modules/langchain-xai/default.nix index 655813d52e141..9d61f9437079e 100644 --- a/pkgs/development/python-modules/langchain-xai/default.nix +++ b/pkgs/development/python-modules/langchain-xai/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "langchain-xai"; - version = "0.2.5"; + version = "0.3.72"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - tag = "langchain-xai==${version}"; - hash = "sha256-nae7KwCKjkvenOO8vErxFQStHolc+N8EUuK6U8r48Kc="; + tag = "langchain-core==${version}"; + hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc="; }; sourceRoot = "${src.name}/libs/partners/xai"; diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index 39b81c33af584..96754ea94d52f 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -44,14 +44,14 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.3.27"; + version = "0.3.72"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - tag = "langchain==${version}"; - hash = "sha256-bqzJ0017Td65rhDCr2wfx+SCaJzPZTFzQpzy3RlaRj4="; + tag = "langchain-core==${version}"; + hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc="; }; sourceRoot = "${src.name}/libs/langchain"; diff --git a/pkgs/development/python-modules/langfuse/default.nix b/pkgs/development/python-modules/langfuse/default.nix index 11447656a9191..d0331f9b16f62 100644 --- a/pkgs/development/python-modules/langfuse/default.nix +++ b/pkgs/development/python-modules/langfuse/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "langfuse"; - version = "2.60.7"; + version = "3.2.1"; pyproject = true; src = fetchFromGitHub { owner = "langfuse"; repo = "langfuse-python"; tag = "v${version}"; - hash = "sha256-8IlqHO46Kzz+ifmIu2y5SxshNv/lpZO74b1KTE2Opk4="; + hash = "sha256-O2mu152aQnYZkPgJTf9TGrC4Ohcp89qQxxrup63yxu8="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix index b94a9890090d5..78fbcc0a8e0cb 100644 --- a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix +++ b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "langgraph-checkpoint-postgres"; - version = "2.0.23"; + version = "2.1.1"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; - tag = "checkpointpostgres==${version}"; - hash = "sha256-QAzT8T3bf3R3gwI/iWDYYDz0SxgLZsP61oMk72dYz4s="; + tag = "checkpoint==${version}"; + hash = "sha256-UY3AChShKfOrtOQzOm5vi3Yy3rlBc+TAje9L2L6My/U="; }; postgresqlTestSetupPost = '' diff --git a/pkgs/development/python-modules/langgraph-cli/default.nix b/pkgs/development/python-modules/langgraph-cli/default.nix index f395d6b61d2ce..312d92cf45499 100644 --- a/pkgs/development/python-modules/langgraph-cli/default.nix +++ b/pkgs/development/python-modules/langgraph-cli/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "langgraph-cli"; - version = "0.3.6"; + version = "2.1.1"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; - tag = "cli==${version}"; - hash = "sha256-tBMdFOHSRjw0PtE19XytLU4MmjR3NBLJxUqWoG4L2F8="; + tag = "checkpoint==${version}"; + hash = "sha256-UY3AChShKfOrtOQzOm5vi3Yy3rlBc+TAje9L2L6My/U="; }; sourceRoot = "${src.name}/libs/cli"; @@ -87,7 +87,7 @@ buildPythonPackage rec { meta = { description = "Official CLI for LangGraph API"; homepage = "https://github.com/langchain-ai/langgraph/tree/main/libs/cli"; - changelog = "https://github.com/langchain-ai/langgraph/releases/tag/${version}"; + changelog = "https://github.com/langchain-ai/langgraph/releases/tag/${src.tag}"; mainProgram = "langgraph"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sarahec ]; diff --git a/pkgs/development/python-modules/langgraph-sdk/default.nix b/pkgs/development/python-modules/langgraph-sdk/default.nix index 0b1ce18275288..4b5515c2a5ea5 100644 --- a/pkgs/development/python-modules/langgraph-sdk/default.nix +++ b/pkgs/development/python-modules/langgraph-sdk/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "langgraph-sdk"; - version = "0.2.0"; + version = "2.1.1"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; - tag = "sdk==${version}"; - hash = "sha256-uhVdtB/fLy0hfZKfzNV2eoO83bvKppGVl4Lm8IEscL0="; + tag = "checkpoint==${version}"; + hash = "sha256-UY3AChShKfOrtOQzOm5vi3Yy3rlBc+TAje9L2L6My/U="; }; sourceRoot = "${src.name}/libs/sdk-py"; diff --git a/pkgs/development/python-modules/langgraph/default.nix b/pkgs/development/python-modules/langgraph/default.nix index 4bf3b7ab9bd94..9b3670490a8d7 100644 --- a/pkgs/development/python-modules/langgraph/default.nix +++ b/pkgs/development/python-modules/langgraph/default.nix @@ -40,14 +40,14 @@ }: buildPythonPackage rec { pname = "langgraph"; - version = "0.6.4"; + version = "2.1.1"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; - tag = version; - hash = "sha256-9jl16cKp3E7j79PXrr/3splrcJtfQQN7yFJ5sfa6c+I="; + tag = "checkpoint==${version}"; + hash = "sha256-UY3AChShKfOrtOQzOm5vi3Yy3rlBc+TAje9L2L6My/U="; }; postgresqlTestSetupPost = '' diff --git a/pkgs/development/python-modules/lazy-object-proxy/default.nix b/pkgs/development/python-modules/lazy-object-proxy/default.nix index 33467e6f3b1e7..a3d7834f7f508 100644 --- a/pkgs/development/python-modules/lazy-object-proxy/default.nix +++ b/pkgs/development/python-modules/lazy-object-proxy/default.nix @@ -1,27 +1,24 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pytestCheckHook, setuptools-scm, }: buildPythonPackage rec { pname = "lazy-object-proxy"; - version = "1.10.0"; - format = "setuptools"; + version = "1.11.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-eCR7bUX0OlLvNcJbVYFFnoURciVAikEoo9r4v5ZIrGk="; + src = fetchFromGitHub { + owner = "ionelmc"; + repo = "python-lazy-object-proxy"; + tag = "v${version}"; + hash = "sha256-iOftyGx5wLxIUwlmo1lY06MXqgxfZek6RR1S5UydOEs="; }; - nativeBuildInputs = [ setuptools-scm ]; - - postPatch = '' - substituteInPlace pyproject.toml --replace ",<6.0" "" - substituteInPlace setup.cfg --replace ",<6.0" "" - ''; + build-system = [ setuptools-scm ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index a53dfbce8b968..95c9c6cb6474c 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "ledgerblue"; - version = "0.1.54"; + version = "0.1.55"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Hn99ST6RnER6XI6+rqA3O9/aC+whYoTOzeoHGF/fFz4="; + hash = "sha256-6s2V8cXik6jEg8z3UK49qVwodPbwXMIkWk7iJ7OY0rM="; }; build-system = [ diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix index a218eec80568b..9b1b1ca28f85e 100644 --- a/pkgs/development/python-modules/levenshtein/default.nix +++ b/pkgs/development/python-modules/levenshtein/default.nix @@ -23,6 +23,11 @@ buildPythonPackage rec { hash = "sha256-EFEyP7eqB4sUQ2ksD67kCr0BEShTiKWbk1PxXOUOGc4="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "Cython>=3.0.12,<3.1.0" Cython + ''; + build-system = [ cmake cython diff --git a/pkgs/development/python-modules/lib4sbom/default.nix b/pkgs/development/python-modules/lib4sbom/default.nix index 5b8b4297cdf3f..9515619827df9 100644 --- a/pkgs/development/python-modules/lib4sbom/default.nix +++ b/pkgs/development/python-modules/lib4sbom/default.nix @@ -3,16 +3,18 @@ buildPythonPackage, defusedxml, fetchFromGitHub, + jsonschema, pytestCheckHook, pythonOlder, pyyaml, semantic-version, setuptools, + xmlschema, }: buildPythonPackage rec { pname = "lib4sbom"; - version = "0.8.4"; + version = "0.8.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,15 +23,17 @@ buildPythonPackage rec { owner = "anthonyharrison"; repo = "lib4sbom"; tag = "v${version}"; - hash = "sha256-QTYtaEo5LdDPfv8KgQ3IUJgKphQl2xyQXrcSn19IeKo="; + hash = "sha256-qHKedDh7G6yvk6LOs5drJJbkLo20/dP49GG7Q/pOmBw="; }; build-system = [ setuptools ]; dependencies = [ defusedxml + jsonschema pyyaml semantic-version + xmlschema ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/libarchive-c/default.nix b/pkgs/development/python-modules/libarchive-c/default.nix index 4eb83031c8851..f72bf7b43cdc3 100644 --- a/pkgs/development/python-modules/libarchive-c/default.nix +++ b/pkgs/development/python-modules/libarchive-c/default.nix @@ -12,28 +12,28 @@ buildPythonPackage rec { pname = "libarchive-c"; - version = "5.1"; + version = "5.3"; format = "setuptools"; src = fetchFromGitHub { owner = "Changaco"; repo = "python-${pname}"; tag = version; - sha256 = "sha256-CO9llPIbVTuE74AeohrMAu5ICkuT/MorRlYEEFne6Uk="; + sha256 = "sha256-JqXTV1aD3k88OlW+8rT3xsDuW34+1xErG7hkupvL7Uo="; }; patches = [ + # https://github.com/Changaco/python-libarchive-c/pull/141 (fetchpatch { - name = "fix-tests-with-recent-libarchive.patch"; - url = "https://github.com/Changaco/python-libarchive-c/commit/a56e9402c76c2fb9631651de7bae07b5fbb0b624.patch"; - hash = "sha256-OLwJQurEFAmwZJbQfhkibrR7Rcnc9vpWwBuhKxgmT7g="; + url = "https://github.com/Changaco/python-libarchive-c/commit/e0e2a47b2403632642ee932dd56acd11e4a79efe.diff"; + hash = "sha256-C9eD4cGQOIdBYy4ytom49lA/Jaarj7LbSIgjxCk/H84="; }) ]; LC_ALL = "en_US.UTF-8"; postPatch = '' - substituteInPlace libarchive/ffi.py --replace \ + substituteInPlace libarchive/ffi.py --replace-fail \ "find_library('archive')" "'${libarchive.lib}/lib/libarchive${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; diff --git a/pkgs/development/python-modules/libbs/default.nix b/pkgs/development/python-modules/libbs/default.nix index d52182af34820..b69b2c3ddde67 100644 --- a/pkgs/development/python-modules/libbs/default.nix +++ b/pkgs/development/python-modules/libbs/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "libbs"; - version = "2.13.0"; + version = "2.15.4"; pyproject = true; src = fetchFromGitHub { owner = "binsync"; repo = "libbs"; tag = "v${version}"; - hash = "sha256-QNiI8qNqh3DlYoGcfExu5PXK1FHXRmcyefMsAfpOMy0="; + hash = "sha256-i5y0aPCBcCzR2pYYtdxy9OEFFF47chINMRfhj9zAf7g="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/libevdev/default.nix b/pkgs/development/python-modules/libevdev/default.nix index 1d511b3afae51..814dee2473247 100644 --- a/pkgs/development/python-modules/libevdev/default.nix +++ b/pkgs/development/python-modules/libevdev/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "libevdev"; - version = "0.11"; + version = "0.12"; format = "setuptools"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-6coAak3ySIpgvZp0ABHulI2BkEviNk8BflYBaVCPVg8="; + hash = "sha256-AulSYy7GwknLucZvb6AAEupEiwZgbHfNE5EzvC/kawg="; }; patches = [ diff --git a/pkgs/development/python-modules/libpass/default.nix b/pkgs/development/python-modules/libpass/default.nix index cfa17149b3504..80480c9e22c85 100644 --- a/pkgs/development/python-modules/libpass/default.nix +++ b/pkgs/development/python-modules/libpass/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "libpass"; - version = "1.9.1"; + version = "1.9.1.post0"; pyproject = true; src = fetchFromGitHub { owner = "ThirVondukr"; repo = "passlib"; tag = version; - hash = "sha256-G6Fu1RjVb+OPdxt2hWpgAzTefRA41S0zV4hSvvCEWEA="; + hash = "sha256-4J18UktqllRA8DVdHL4AJUuAkjZRdUjiql9a71XXhCA="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index bef6495dd28f1..951b441068f6b 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2025.5.3"; + version = "2025.7.18"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-EZ42Ufnw3sUM1fM3+hTreKr58QOgeRANilXP9uxU/Cs="; + hash = "sha256-iXu+ObOFd0iQae8/mY2ztt7s4kuKutX3huHN7jP3cHE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/line-profiler/default.nix b/pkgs/development/python-modules/line-profiler/default.nix index 7d16424409141..5bc0a75e4209f 100644 --- a/pkgs/development/python-modules/line-profiler/default.nix +++ b/pkgs/development/python-modules/line-profiler/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "line-profiler"; - version = "4.2.0"; + version = "5.0.0"; format = "setuptools"; disabled = pythonOlder "3.8" || isPyPy; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "line_profiler"; inherit version; - hash = "sha256-CeEPJfh2UUOAs/rubek/sMIoq7qFgguhpZHds+tFGpY="; + hash = "sha256-qA8K+wW6DSddnd3F/5fqtjdHEWf/Pmbcx9E1dVBZOYw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/litestar/default.nix b/pkgs/development/python-modules/litestar/default.nix index abf46e6fce890..ed087bbc005d5 100644 --- a/pkgs/development/python-modules/litestar/default.nix +++ b/pkgs/development/python-modules/litestar/default.nix @@ -43,14 +43,14 @@ buildPythonPackage rec { pname = "litestar"; - version = "2.13.0"; + version = "2.16.0"; pyproject = true; src = fetchFromGitHub { owner = "litestar-org"; repo = "litestar"; tag = "v${version}"; - hash = "sha256-PR2DVNRtILHs7XwVi9/ZCVRJQFqfGLn1x2gpYtYjHDo="; + hash = "sha256-67O/NxPBBLa1QfH1o9laOAQEin8jRA8SkcV7QEzCjI0="; }; build-system = [ @@ -105,7 +105,7 @@ buildPythonPackage rec { homepage = "https://litestar.dev/"; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ bot-wxt1221 ]; - changelog = "https://github.com/litestar-org/litestar/releases/tag/v${version}"; + changelog = "https://github.com/litestar-org/litestar/releases/tag/${src.tag}"; description = "Production-ready, Light, Flexible and Extensible ASGI API framework"; license = lib.licenses.mit; mainProgram = "litestar"; diff --git a/pkgs/development/python-modules/livekit-api/default.nix b/pkgs/development/python-modules/livekit-api/default.nix index d1b13ef1e49f3..6dc8377f023ae 100644 --- a/pkgs/development/python-modules/livekit-api/default.nix +++ b/pkgs/development/python-modules/livekit-api/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "livekit-api"; - version = "1.0.5"; + version = "1.0.12"; pyproject = true; src = fetchFromGitHub { owner = "livekit"; repo = "python-sdks"; - tag = "api-v${version}"; - hash = "sha256-GoVPOLA4aCC26+x9//mlmOO6tb3dczN+s1C+VtGRiRE="; + tag = "rtc-v${version}"; + hash = "sha256-NfFlj44aRMA7oUXyIKljNdtb/2MLvjIJGcAvIGNbNxM="; }; pypaBuildFlags = [ "livekit-api" ]; diff --git a/pkgs/development/python-modules/livekit-protocol/default.nix b/pkgs/development/python-modules/livekit-protocol/default.nix index af1cf54caf207..c2dfe95f12435 100644 --- a/pkgs/development/python-modules/livekit-protocol/default.nix +++ b/pkgs/development/python-modules/livekit-protocol/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "livekit-protocol"; - version = "1.0.4"; + version = "1.0.12"; pyproject = true; src = fetchFromGitHub { owner = "livekit"; repo = "python-sdks"; - tag = "protocol-v${version}"; - hash = "sha256-W9WmruzN5Nm9vrjG1Kcf3Orst0b2Mxm80hKLjwXowl8="; + tag = "rtc-v${version}"; + hash = "sha256-NfFlj44aRMA7oUXyIKljNdtb/2MLvjIJGcAvIGNbNxM="; }; pypaBuildFlags = [ "livekit-protocol" ]; diff --git a/pkgs/development/python-modules/livisi/default.nix b/pkgs/development/python-modules/livisi/default.nix index 5bb7bfc5208d3..ac9f5f3d24ad3 100644 --- a/pkgs/development/python-modules/livisi/default.nix +++ b/pkgs/development/python-modules/livisi/default.nix @@ -4,20 +4,21 @@ colorlog, fetchFromGitHub, lib, + python-dateutil, setuptools, websockets, }: buildPythonPackage rec { pname = "livisi"; - version = "0.0.25"; + version = "1.0.1"; pyproject = true; src = fetchFromGitHub { owner = "planbnet"; repo = "livisi"; tag = "v${version}"; - hash = "sha256-kEkbuZmYzxhrbTdo7eZJYu2N2uJtfspgqepplXvSXFg="; + hash = "sha256-5TRJfI4irg2/ZxpfgzShXE08HWU2aWLR8zGbrZKpwbc="; }; pythonRelaxDeps = [ "colorlog" ]; @@ -27,6 +28,7 @@ buildPythonPackage rec { dependencies = [ aiohttp colorlog + python-dateutil websockets ]; diff --git a/pkgs/development/python-modules/llama-cloud/default.nix b/pkgs/development/python-modules/llama-cloud/default.nix index 1f6013aad7ac1..b74c23ce0d304 100644 --- a/pkgs/development/python-modules/llama-cloud/default.nix +++ b/pkgs/development/python-modules/llama-cloud/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-cloud"; - version = "0.1.36"; + version = "0.1.37"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_cloud"; inherit version; - hash = "sha256-Mihmsnyj1tQzEEsbW4NG/pN5c+4V2uloACvhqYXxBCg="; + hash = "sha256-ttYuc4bRqoWQW34/fBmkBpS+VMFZZmi86qRWzYTt5mY="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-cli/default.nix b/pkgs/development/python-modules/llama-index-cli/default.nix index 64e8f8d4d8ecc..62517983f5259 100644 --- a/pkgs/development/python-modules/llama-index-cli/default.nix +++ b/pkgs/development/python-modules/llama-index-cli/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "llama-index-cli"; - version = "0.4.4"; + version = "0.5.0"; pyproject = true; src = fetchPypi { pname = "llama_index_cli"; inherit version; - hash = "sha256-w68M8eKn5e9E0Lrlqo6IcrVMXda3Ma+66fE//rSZe+A="; + hash = "sha256-LrlCYjLo2J/98PpnhP+NoJRJ2SDXHQ/MgdB76Tz5Np8="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix index 3109f18373b79..688c6238544a5 100644 --- a/pkgs/development/python-modules/llama-index-core/default.nix +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pname = "llama-index-core"; - version = "0.12.46"; + version = "0.13.0.post1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -48,7 +48,7 @@ buildPythonPackage rec { owner = "run-llama"; repo = "llama_index"; tag = "v${version}"; - hash = "sha256-B1i5zabacapc/ipPTQtQzLVZql5ifqxfFoDhaBR+eYc="; + hash = "sha256-X4PDvxynQkHOdhDC5Aqwnr3jSF/83VgbFiDD1M9LOoM="; }; sourceRoot = "${src.name}/${pname}"; diff --git a/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix index 8022f766c45c3..2bf7acb72d833 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-embeddings-gemini"; - version = "0.3.2"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_embeddings_gemini"; inherit version; - hash = "sha256-Ske1mqNVBXYirf3BGFAkZqeFywXntMLHNuR/+pjDupU="; + hash = "sha256-Cyy89LP4B+J4fbMQmyZyH3VrRSnX7A0U6zGIvS0xPqw="; }; pythonRelaxDeps = [ "google-generativeai" ]; diff --git a/pkgs/development/python-modules/llama-index-embeddings-google/default.nix b/pkgs/development/python-modules/llama-index-embeddings-google/default.nix index b5cfb79df1ff0..e984a934cc0bd 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-google/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-google/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-embeddings-google"; - version = "0.3.1"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_embeddings_google"; inherit version; - hash = "sha256-gMFfA/USIYkOIaNPZfpLoRzkDGnN2e+gNlylAOrTxKs="; + hash = "sha256-wVtJ+BAX49/Ijga9cUXB6xcOrK+IkOzjj+Wgd0cRRb0="; }; pythonRelaxDeps = [ "google-generativeai" ]; diff --git a/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix b/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix index 39c334ced50fc..5add4ba28966e 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-embeddings-huggingface"; - version = "0.5.5"; + version = "0.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_embeddings_huggingface"; inherit version; - hash = "sha256-f26aAx2RRvI131l8DM1igM3pa5tDf5kFLOebty5frF4="; + hash = "sha256-Ps59jFtoPSBV/t7KRFfeoT91yBptf7lNd+h4zXPZDZc="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix b/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix index 4ad411a7a43b5..b6e00c2d616c9 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-embeddings-ollama"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_embeddings_ollama"; inherit version; - hash = "sha256-7GL6vymKzrNNIFpQmKLcK9eSTT2bVmwkyh69ZLw9/pA="; + hash = "sha256-StV3rCFInL4oi/YEytu9s1a9rx9qdC7MG6uN855pOvQ="; }; pythonRelaxDeps = [ "ollama" ]; diff --git a/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix b/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix index 4040659ac664e..1f4da3f6b17cb 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-embeddings-openai"; - version = "0.3.1"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_embeddings_openai"; inherit version; - hash = "sha256-E2iq084ky67SPVrSUTQ87x63tKBtZWPWYG1ZyzR/7yA="; + hash = "sha256-rFh4OaERCJ6opiVfkhQBbXqBOzg7u7+SB3mb4RAHWOs="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix index b89b802b0d776..f08c410a191ee 100644 --- a/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix +++ b/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-graph-stores-nebula"; - version = "0.4.2"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_graph_stores_nebula"; inherit version; - hash = "sha256-0CooGtmDz9OAJ+B543eFbrFTzii5iXwmo0dV4c/E/es="; + hash = "sha256-BzArWYZIY1SRl1q48wAdAy+mWoId+lNbcsw9LQmmw7Q="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix index 0c253982aa613..ee1a9fa73c3f4 100644 --- a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix +++ b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-graph-stores-neo4j"; - version = "0.4.6"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_graph_stores_neo4j"; inherit version; - hash = "sha256-wTmLGWu/Wnrs1sXqs4LFigJVR+/iAGWxUv6oTFGfLBQ="; + hash = "sha256-Iumsnln5iGMAoB3aY4haecm87jYXlEW4/2+uppW8m9c="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix index 98bf1e735e19f..79c0866688bb3 100644 --- a/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix +++ b/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-graph-stores-neptune"; - version = "0.3.3"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_graph_stores_neptune"; inherit version; - hash = "sha256-IqY4dEWcbM9371vuZ7C9NlDux9O/j6wF7Hcc4aiBiIE="; + hash = "sha256-kSAfIh683fwahMjSgp0dYHmNR+NGBr71Q/OFxGtkUTc="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix index 0372283f8d2a8..4d4ebf6add42d 100644 --- a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix +++ b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-indices-managed-llama-cloud"; - version = "0.7.10"; + version = "0.9.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_indices_managed_llama_cloud"; inherit version; - hash = "sha256-UyZ5B+I9j7y7l8epYXekFEbeGFUMpgMCdgkuc7RcqIA="; + hash = "sha256-+6rbauPucS2vQ5qpvjZ+3h+LGQAYtVAQ18NTddKc5Lc="; }; pythonRelaxDeps = [ "llama-cloud" ]; diff --git a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix index 85be869d1e2da..675e10bbd9fb4 100644 --- a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-llms-ollama"; - version = "0.6.2"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_ollama"; inherit version; - hash = "sha256-G+QIHwupyd07XScMLoAJwlaztqExLLOKDHJNuousEwQ="; + hash = "sha256-ThKtTl6mEAZsTgeTVpnFnZMkffIhh27X9+Gn9wwzs8c="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix b/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix index 7fb71c87f8e5c..1668fd637929f 100644 --- a/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-llms-openai-like"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_openai_like"; inherit version; - hash = "sha256-Fa4cFrAboL+oItU5APA+NcGf/ke1KJWCNL8ZQqkfWHw="; + hash = "sha256-lFe+3rY7aVThUPxntC5EbjdTpxSqkDoAdiUvt8IN/+4="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-llms-openai/default.nix index 6c81842583009..b81017db54edd 100644 --- a/pkgs/development/python-modules/llama-index-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-llms-openai"; - version = "0.4.7"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_openai"; inherit version; - hash = "sha256-Vkr4qzn7Pzrf6uc6WcDcpGwJmrhEoo5yXu4MVR1Iafg="; + hash = "sha256-CJlnMoLFjRmlu/ImFqAQkCROMIcm05KiTkZJOZMkdg8="; }; pythonRemoveDeps = [ diff --git a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix index 63bac0367ff07..2b1954b76fa32 100644 --- a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "llama-index-multi-modal-llms-openai"; - version = "0.5.1"; + version = "0.6.0"; pyproject = true; src = fetchPypi { pname = "llama_index_multi_modal_llms_openai"; inherit version; - hash = "sha256-3zr/AMNgI8X4xJ+XKjJfcYI+0PTdnNR5lV12r8FGV18="; + hash = "sha256-4YWvPQH5GevRVsmegIXU5AApt+nsMEj0DSDebWsPYR4="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/llama-index-readers-database/default.nix b/pkgs/development/python-modules/llama-index-readers-database/default.nix index aecb2c6278991..c52b6f97c0726 100644 --- a/pkgs/development/python-modules/llama-index-readers-database/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-database/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-readers-database"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_database"; inherit version; - hash = "sha256-BdZzn2T3EkR0N3C0uEF3kj1QV5Qnzut7yapAVxdc7C8="; + hash = "sha256-5eaNufjXiM4sgc101d19Z3W3CQLE3m8uLa1GOPh05ek="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-readers-file/default.nix b/pkgs/development/python-modules/llama-index-readers-file/default.nix index ed3ba1adece55..c3af3b457026e 100644 --- a/pkgs/development/python-modules/llama-index-readers-file/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-file/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "llama-index-readers-file"; - version = "0.4.11"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_file"; inherit version; - hash = "sha256-GyHLZteN1fYOhxZgfZpHzNgbs5EG1FlmW+HKd5npWXs="; + hash = "sha256-8yRhe/xNmzITbSX/U1G5K8C1aaKWFz7iqFkcH4hu/ww="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/llama-index-readers-json/default.nix b/pkgs/development/python-modules/llama-index-readers-json/default.nix index f16f736469c28..434430ee79691 100644 --- a/pkgs/development/python-modules/llama-index-readers-json/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-json/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-readers-json"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_json"; inherit version; - hash = "sha256-mS8nEK8LV1wVh0wV7W8EujLH7QcPagHI4P5cT0bHAJ4="; + hash = "sha256-ThQWERdEzPIAUaYWQDkSJdIIvixrKv0eN4LGRaNaS3U="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix b/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix index d06fd69723ec0..9b415779ee928 100644 --- a/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-readers-llama-parse"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_llama_parse"; inherit version; - hash = "sha256-6Z7Fb0+FRtf9oafBriYWL7mst+vKw0O1q9tCNLRkTg8="; + hash = "sha256-iRsh+2P+H+ci4jz6Jjp02ac1Tl2NegHy1AQKUvjY/u8="; }; pythonRelaxDeps = [ "llama-parse" ]; diff --git a/pkgs/development/python-modules/llama-index-readers-s3/default.nix b/pkgs/development/python-modules/llama-index-readers-s3/default.nix index f7cf53876802a..9f40cadfdf5c6 100644 --- a/pkgs/development/python-modules/llama-index-readers-s3/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-s3/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-readers-s3"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_s3"; inherit version; - hash = "sha256-oCXpLZyIrZKNNDg8hkEh5xxXEqz7B1hLjE5OUwEIozg="; + hash = "sha256-3wzxfKkwhC4YfUYPBa/XKqIZQ6zLgB9SSHR+vPhwzOA="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-readers-twitter/default.nix b/pkgs/development/python-modules/llama-index-readers-twitter/default.nix index 6cc9844dcbc3c..97e07d49f89db 100644 --- a/pkgs/development/python-modules/llama-index-readers-twitter/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-twitter/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-readers-twitter"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_twitter"; inherit version; - hash = "sha256-I7xZQj/Kpwl6D0ltNuKI7TYoQVD9lBiM6I63C23hCwY="; + hash = "sha256-AfruOaKbPJasPS0eQjr6501yt32nQ7PvFwD2QVdgBYA="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-readers-txtai/default.nix b/pkgs/development/python-modules/llama-index-readers-txtai/default.nix index 4024b1c33f95f..a6cfc2c6568bb 100644 --- a/pkgs/development/python-modules/llama-index-readers-txtai/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-txtai/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-readers-txtai"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_txtai"; inherit version; - hash = "sha256-N5FiwVZ+KWEQlcfVqHVcHJHzRb6Ct+iR2Dc+Wee7y+M="; + hash = "sha256-0eOJ9r27lG6WwOz27+N5qldROoaU5UAewtY4N4m8Kcs="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-readers-weather/default.nix b/pkgs/development/python-modules/llama-index-readers-weather/default.nix index 225cfb6c75b74..6b24f3b8f9f52 100644 --- a/pkgs/development/python-modules/llama-index-readers-weather/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-weather/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-readers-weather"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_weather"; inherit version; - hash = "sha256-oGk2M/YaVm8pY4JDFOWGkKbDhEfd/OYBgWLSzV3peAQ="; + hash = "sha256-qgrHlJXOKWY5UnB2lZAJun3xA9sxn5+ZNNI6+aDnE98="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix index 1fb8eaf7c1264..53d96d53493ff 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-chroma"; - version = "0.4.2"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_chroma"; inherit version; - hash = "sha256-F0YzgV4KiDiutiiBbiz10djG+PaEf0J+ADLTUHHq0ME="; + hash = "sha256-5gkwYvmBXeRxGBL1CoM5H/obYDTceap1TP00uv8SDs4="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix index ca7b63b1c0789..7449e0113e1ad 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-google"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_google"; inherit version; - hash = "sha256-6l4MFO7h5xJexN3Sf78F+OgzaKHNWxOffQvkqRhXEJw="; + hash = "sha256-EjokpP+46z/OwgmtQO4OnL+w4mUFR0M+2MmycojAc7E="; }; pythonRelaxDeps = [ "google-generativeai" ]; diff --git a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix index ae044cb1e4a40..ab54499442bf5 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-postgres"; - version = "0.5.5"; + version = "0.6.1"; pyproject = true; src = fetchPypi { pname = "llama_index_vector_stores_postgres"; inherit version; - hash = "sha256-R0dJXw6msPwO7kjsLLXyxSsmmAC64yviJZzb8YUbrlQ="; + hash = "sha256-E+PFvOTRO3FGGSwFwEUe0fEpmuE/fmRtiCGHwO53qm4="; }; pythonRemoveDeps = [ "psycopg2-binary" ]; diff --git a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix index d5cc82737303d..b77fe1aeee91b 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-qdrant"; - version = "0.6.1"; + version = "0.7.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_qdrant"; inherit version; - hash = "sha256-14hQ/MCrwf1tucVprPbo2mLRuBWaHI0S515sbNB3Q1I="; + hash = "sha256-1RpWHcWq0nDEu+1yNwzqkALkty0AOOxbRl9rzbZ7EhM="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/llm-echo/default.nix b/pkgs/development/python-modules/llm-echo/default.nix index 588b6f64909da..d0ed2f5ab5335 100644 --- a/pkgs/development/python-modules/llm-echo/default.nix +++ b/pkgs/development/python-modules/llm-echo/default.nix @@ -5,6 +5,7 @@ setuptools, llm, llm-echo, + pytest-asyncio, pytestCheckHook, writableTmpDirAsHomeHook, }: @@ -26,6 +27,7 @@ buildPythonPackage rec { dependencies = [ llm ]; nativeCheckInputs = [ + pytest-asyncio pytestCheckHook writableTmpDirAsHomeHook ]; diff --git a/pkgs/development/python-modules/lm-format-enforcer/default.nix b/pkgs/development/python-modules/lm-format-enforcer/default.nix index c449430465504..2086dcc17e901 100644 --- a/pkgs/development/python-modules/lm-format-enforcer/default.nix +++ b/pkgs/development/python-modules/lm-format-enforcer/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "lm-format-enforcer"; - version = "0.10.11"; + version = "0.10.12"; pyproject = true; src = fetchFromGitHub { owner = "noamgat"; repo = "lm-format-enforcer"; tag = "v${version}"; - hash = "sha256-8BsfA1R/X+wA0H0MqQKn+CljUIT8VdoInoczSGvu74o="; + hash = "sha256-7QNJtuRIuHHSXmiyO+6TDxswsbLET2ucXjhz0j7xTvQ="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix index f78b3fe2cf11b..a97f71dad2123 100644 --- a/pkgs/development/python-modules/lmdb/default.nix +++ b/pkgs/development/python-modules/lmdb/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchPypi, setuptools, + patch-ng, pytestCheckHook, cffi, lmdb, @@ -11,20 +12,24 @@ buildPythonPackage rec { pname = "lmdb"; - version = "1.6.2"; + version = "1.7.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0o4/pZk1/2iIWHYOxS8gLsuMEImj9o0fFi6jB40VHnM="; + hash = "sha256-1KJ7evT+OPNAnZ+/v0e2F7PZTe6YoAvIwqgzbM0/mxU="; }; build-system = [ setuptools ]; buildInputs = [ lmdb ]; + env.LMDB_FORCE_SYSTEM = 1; + + dependencies = [ patch-ng ]; + pythonImportsCheck = [ "lmdb" ]; nativeCheckInputs = [ @@ -32,8 +37,6 @@ buildPythonPackage rec { pytestCheckHook ]; - LMDB_FORCE_SYSTEM = 1; - meta = { description = "Universal Python binding for the LMDB 'Lightning' Database"; homepage = "https://github.com/dw/py-lmdb"; diff --git a/pkgs/development/python-modules/localstack-ext/default.nix b/pkgs/development/python-modules/localstack-ext/default.nix index f1fa5ba5278fe..0973bccb4157c 100644 --- a/pkgs/development/python-modules/localstack-ext/default.nix +++ b/pkgs/development/python-modules/localstack-ext/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { pname = "localstack-ext"; - version = "4.3.0"; + version = "4.7.0"; pyproject = true; src = fetchPypi { pname = "localstack_ext"; inherit version; - hash = "sha256-YlKGdIteeIjqqO9L4BAfEEurOa7vrYaAmreH8gIRcPU="; + hash = "sha256-OLeCbAybP6SgHb2DNf8rXUrxt89mOiQfp2wxdh2A3F4="; }; build-system = [ diff --git a/pkgs/development/python-modules/locust/default.nix b/pkgs/development/python-modules/locust/default.nix index 1d7056d38a805..2ed342d62a4f9 100644 --- a/pkgs/development/python-modules/locust/default.nix +++ b/pkgs/development/python-modules/locust/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "locust"; - version = "2.33.1"; + version = "2.37.14"; pyproject = true; src = fetchFromGitHub { owner = "locustio"; repo = "locust"; tag = version; - hash = "sha256-cOYdf3F1OF1P4xFEG3isuiePIl1tHnjL7UVoFIpb40A="; + hash = "sha256-16pMl72OIZlAi6jNx0qv0TO9RTm6O9CgiE84sndsEhc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/loopy/default.nix b/pkgs/development/python-modules/loopy/default.nix index 0be0d9802eb9e..4af0824f633ae 100644 --- a/pkgs/development/python-modules/loopy/default.nix +++ b/pkgs/development/python-modules/loopy/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "loopy"; - version = "2025.1"; + version = "2025.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "inducer"; repo = "loopy"; tag = "v${version}"; - hash = "sha256-3Ebnje+EBw2Jdp2xLqffWx592OoUrSdRDXQkw6FpEzc="; + hash = "sha256-VgsUOMCIg61mYNDMcGpMs5I1CkobhUFVjoQFdD8Vchs="; fetchSubmodules = true; # submodule at `loopy/target/c/compyte` }; diff --git a/pkgs/development/python-modules/lsprotocol/default.nix b/pkgs/development/python-modules/lsprotocol/default.nix index 06e85fae1e733..fdb10e5dd3c58 100644 --- a/pkgs/development/python-modules/lsprotocol/default.nix +++ b/pkgs/development/python-modules/lsprotocol/default.nix @@ -7,15 +7,14 @@ flit-core, importlib-resources, jsonschema, - nox, pyhamcrest, - pytest, + pytestCheckHook, pythonOlder, }: buildPythonPackage rec { pname = "lsprotocol"; - version = "2023.0.1"; + version = "2025.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,20 +23,23 @@ buildPythonPackage rec { owner = "microsoft"; repo = "lsprotocol"; tag = version; - hash = "sha256-PHjLKazMaT6W4Lve1xNxm6hEwqE3Lr2m5L7Q03fqb68="; + hash = "sha256-DrWXHMgDZSQQ6vsmorThMrUTX3UQU+DajSEOdxoXrFQ="; }; - nativeBuildInputs = [ + postPatch = '' + pushd packages/python + ''; + + build-system = [ flit-core - nox ]; - propagatedBuildInputs = [ + dependencies = [ attrs cattrs ]; - nativeCheckInputs = [ pytest ]; + nativeCheckInputs = [ pytestCheckHook ]; checkInputs = [ importlib-resources @@ -45,21 +47,12 @@ buildPythonPackage rec { pyhamcrest ]; - preBuild = '' - cd packages/python - ''; + disabledTests = [ + "test_notebook_sync_options" + ]; preCheck = '' - cd ../../ - ''; - - checkPhase = '' - runHook preCheck - - sed -i "/^ _install_requirements/d" noxfile.py - nox --session tests - - runHook postCheck + popd ''; pythonImportsCheck = [ "lsprotocol" ]; @@ -67,7 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python implementation of the Language Server Protocol"; homepage = "https://github.com/microsoft/lsprotocol"; - changelog = "https://github.com/microsoft/lsprotocol/releases/tag/${version}"; + changelog = "https://github.com/microsoft/lsprotocol/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ doronbehar diff --git a/pkgs/development/python-modules/luna-usb/default.nix b/pkgs/development/python-modules/luna-usb/default.nix index 313f626cd4916..1ea097280ed02 100644 --- a/pkgs/development/python-modules/luna-usb/default.nix +++ b/pkgs/development/python-modules/luna-usb/default.nix @@ -20,14 +20,14 @@ }: buildPythonPackage rec { pname = "luna-usb"; - version = "0.2.1"; + version = "0.2.2"; pyproject = true; src = fetchFromGitHub { owner = "greatscottgadgets"; repo = "luna"; tag = version; - hash = "sha256-8onTF0iJF7HpNCjNxUg89YRjfYb94CrFgGtmprp7g2E="; + hash = "sha256-gySaNbebWUS8wS8adPQo1mT+jmdb+2ddlMckTa36JCY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/lupa/default.nix b/pkgs/development/python-modules/lupa/default.nix index a34a52b5988b7..3acc709a30230 100644 --- a/pkgs/development/python-modules/lupa/default.nix +++ b/pkgs/development/python-modules/lupa/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "lupa"; - version = "2.4"; + version = "2.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-UwDSH4GqG9TUX1XjHd26O4eYlWlgaKP4TPy1/ZFIqs0="; + hash = "sha256-acaonyt7CKMEDX7Soe7MujejHdyS+hmTOcU6KuPEjDQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index ec8c3e0c7a90e..de73a2010d1cf 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -3,7 +3,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, # build-system cython, @@ -18,14 +17,14 @@ buildPythonPackage rec { pname = "lxml"; - version = "5.4.0"; + version = "6.0.0"; pyproject = true; src = fetchFromGitHub { owner = "lxml"; repo = "lxml"; tag = "lxml-${version}"; - hash = "sha256-yp0Sb/0Em3HX1XpDNFpmkvW/aXwffB4D1sDYEakwKeY="; + hash = "sha256-e1Lhtn8cjuDWkBV29icIqe0CJ59Ab05hBGMa+eRBzAw="; }; build-system = [ diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix index ca976b887cf6b..da94945fa869d 100644 --- a/pkgs/development/python-modules/m2crypto/default.nix +++ b/pkgs/development/python-modules/m2crypto/default.nix @@ -13,21 +13,15 @@ buildPythonPackage rec { pname = "m2crypto"; - version = "0.45.0"; + version = "0.45.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/8ENTQmQFRT0CNx09gpNffIcROvJv3dslHv9xzWUIc8="; + hash = "sha256-0PyBqIKO2/QwhDKzBAvwa7JrrZWruefUaQthGFUeduw="; }; - patches = [ - (fetchurl { - url = "https://sources.debian.org/data/main/m/m2crypto/0.42.0-2.1/debian/patches/0004-swig-Workaround-for-reading-sys-select.h-ending-with.patch"; - hash = "sha256-/Bkuqu/Od+S56AUWo0ZzpZF7FGMxP766K2GJnfKXrOI="; - }) - ]; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/makefun/default.nix b/pkgs/development/python-modules/makefun/default.nix index 2a234b829c688..2929f361f5c27 100644 --- a/pkgs/development/python-modules/makefun/default.nix +++ b/pkgs/development/python-modules/makefun/default.nix @@ -8,7 +8,7 @@ setuptools-scm, # tests - pytestCheckHook, + pytest7CheckHook, }: buildPythonPackage rec { @@ -31,7 +31,7 @@ buildPythonPackage rec { setuptools-scm ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytest7CheckHook ]; pythonImportsCheck = [ "makefun" ]; diff --git a/pkgs/development/python-modules/manifestoo-core/default.nix b/pkgs/development/python-modules/manifestoo-core/default.nix index c9164c3bce05a..8c5d9bebc78ef 100644 --- a/pkgs/development/python-modules/manifestoo-core/default.nix +++ b/pkgs/development/python-modules/manifestoo-core/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "manifestoo-core"; - version = "1.9"; + version = "1.10"; format = "pyproject"; src = fetchPypi { inherit version; pname = "manifestoo_core"; - hash = "sha256-4cBgxbjXfOVMRQ+iQnjb/LdRUkoeb2hWI6VhSnqSMVM="; + hash = "sha256-LLxr96/cuAAncddMeBBVlFq2Hl5+pNXqgMbvbnfzcE8="; }; nativeBuildInputs = [ hatch-vcs ]; diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix index 3137d1e594bb2..58cfef91d255d 100644 --- a/pkgs/development/python-modules/manimpango/default.nix +++ b/pkgs/development/python-modules/manimpango/default.nix @@ -25,6 +25,11 @@ buildPythonPackage rec { hash = "sha256-nN+XOnki8fG7URMy2Fhs2X+yNi8Y7wDo53d61xaRa3w="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "Cython>=3.0.2,<3.1" Cython + ''; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pango ]; diff --git a/pkgs/development/python-modules/mapclassify/default.nix b/pkgs/development/python-modules/mapclassify/default.nix index 7bf817fab321a..ef30592b9b66a 100644 --- a/pkgs/development/python-modules/mapclassify/default.nix +++ b/pkgs/development/python-modules/mapclassify/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "mapclassify"; - version = "2.8.1"; + version = "2.10.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "pysal"; repo = "mapclassify"; tag = "v${version}"; - hash = "sha256-VClkMOR8P9sX3slVjJ2xYYLVnvZuOgVYZiCGrBxoZEc="; + hash = "sha256-OQpDrxa0zRPDAdyS6KP5enb/JZwbYoXTV8kUijV3tNM="; }; build-system = [ setuptools-scm ]; @@ -59,7 +59,7 @@ buildPythonPackage rec { meta = { description = "Classification Schemes for Choropleth Maps"; homepage = "https://pysal.org/mapclassify/"; - changelog = "https://github.com/pysal/mapclassify/releases/tag/v${version}"; + changelog = "https://github.com/pysal/mapclassify/releases/tag/${src.tag}"; license = lib.licenses.bsd3; teams = [ lib.teams.geospatial ]; }; diff --git a/pkgs/development/python-modules/mariadb/default.nix b/pkgs/development/python-modules/mariadb/default.nix index b4b20905dfd42..fde0be2c4c163 100644 --- a/pkgs/development/python-modules/mariadb/default.nix +++ b/pkgs/development/python-modules/mariadb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "mariadb"; - version = "1.1.11"; + version = "1.1.13"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "mariadb-corporation"; repo = "mariadb-connector-python"; tag = "v${version}"; - hash = "sha256-f3WeVtsjxm/HVPv0cbpPkmklcNFWJaFqI2LxDElcCFw="; + hash = "sha256-BYE+W/P2/kPtbi6tzE1FQkI/KFCO5C1KQnB67XfJqkA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index 69ba558d227da..267cfc589754e 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -33,13 +33,13 @@ buildPythonPackage rec { pname = "marimo"; - version = "0.13.6"; + version = "0.14.16"; pyproject = true; # The github archive does not include the static assets src = fetchPypi { inherit pname version; - hash = "sha256-Qsz0SJvWOJ/MH9eIMyBODCBCGC7vp2lzPsq+32tRKU8="; + hash = "sha256-8PKRrH+m+HyAcvQBnG6fY1rX77N+AhTyJUPI3ZgwQtE="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix index 87020cb9e10ff..39f3dda5f21ec 100644 --- a/pkgs/development/python-modules/markdown/default.nix +++ b/pkgs/development/python-modules/markdown/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + fetchpatch, importlib-metadata, pyyaml, setuptools, @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "markdown"; - version = "3.8"; + version = "3.8.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,9 +21,16 @@ buildPythonPackage rec { owner = "Python-Markdown"; repo = "markdown"; tag = version; - hash = "sha256-H1xvDM2ShiPbfcpW+XGrxCxtaRFVaquuMuGg1RhjeNA="; + hash = "sha256-L5OTjllMUrpsKZbK+EHcqlua/6I4onJvRC3povbHgfY="; }; + patches = [ + (fetchpatch { + url = "https://github.com/Python-Markdown/markdown/commit/23c301de28e12426408656efdfa153b11d4ff558.patch"; + hash = "sha256-85HP97iL1umG60jwUgfnHvKHYmws5FSL0xfgZF95aiQ="; + }) + ]; + build-system = [ setuptools ]; dependencies = lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; diff --git a/pkgs/development/python-modules/markdown2/default.nix b/pkgs/development/python-modules/markdown2/default.nix index 832a20c670fdf..01fa47856207e 100644 --- a/pkgs/development/python-modules/markdown2/default.nix +++ b/pkgs/development/python-modules/markdown2/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, latex2mathml, pygments, - pytestCheckHook, + pytest7CheckHook, pythonOlder, setuptools, wavedrom, @@ -28,7 +28,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "markdown2" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytest7CheckHook ]; optional-dependencies = { code_syntax_highlighting = [ pygments ]; diff --git a/pkgs/development/python-modules/mashumaro/default.nix b/pkgs/development/python-modules/mashumaro/default.nix index e9e06355a552b..d0acb1d790d8a 100644 --- a/pkgs/development/python-modules/mashumaro/default.nix +++ b/pkgs/development/python-modules/mashumaro/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Serialization library on top of dataclasses"; homepage = "https://github.com/Fatal1ty/mashumaro"; - changelog = "https://github.com/Fatal1ty/mashumaro/releases/tag/v${version}"; + changelog = "https://github.com/Fatal1ty/mashumaro/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ tjni ]; }; diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 7f151fe2d364f..4c23466b9880a 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -80,7 +80,7 @@ let in buildPythonPackage rec { - version = "3.10.3"; + version = "3.10.5"; pname = "matplotlib"; pyproject = true; @@ -88,7 +88,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-L4LSxbt66TqqpM1CrKZdds5jdvgzBPo6YwtWmsonTfA="; + hash = "sha256-NS7WzPt5mKAIgWkvOLTKCDxpHT4nW0FFQjcEw0yQkHY="; }; env.XDG_RUNTIME_DIR = "/tmp"; diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 8c8e0b3828b5c..fba252975c702 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -29,6 +29,7 @@ hyperframe, hypothesis, pytest-aiohttp, + pytest-asyncio_0, pytest-benchmark, pytestCheckHook, @@ -93,7 +94,7 @@ buildPythonPackage rec { hpack hyperframe hypothesis - pytest-aiohttp + (pytest-aiohttp.override { pytest-asyncio = pytest-asyncio_0; }) pytest-benchmark pytestCheckHook ]; diff --git a/pkgs/development/python-modules/maxminddb/default.nix b/pkgs/development/python-modules/maxminddb/default.nix index 25de18f228a2f..df4ea5f300a9c 100644 --- a/pkgs/development/python-modules/maxminddb/default.nix +++ b/pkgs/development/python-modules/maxminddb/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "maxminddb"; - version = "2.6.3"; + version = "2.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0sOAa6p6oEeqG6x0GefjU9tDX4jwnVEQaoTbrPZF0lQ="; + hash = "sha256-JqjlNiKNjMKMW49XSlcaJwS+/OOzaM7KWTp21WtlkPk="; }; buildInputs = [ libmaxminddb ]; diff --git a/pkgs/development/python-modules/mdtraj/default.nix b/pkgs/development/python-modules/mdtraj/default.nix index 6d8afed4ab348..fcbc8f4c931c1 100644 --- a/pkgs/development/python-modules/mdtraj/default.nix +++ b/pkgs/development/python-modules/mdtraj/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "mdtraj"; - version = "1.10.3"; + version = "1.11.0"; pyproject = true; src = fetchFromGitHub { owner = "mdtraj"; repo = "mdtraj"; tag = version; - hash = "sha256-xmxVPF6GhZpyuTxdmxB7mkfrDb1FIh9Z3obgUOdQmrw="; + hash = "sha256-Re8noXZGT+WEW8HzdoHSsr52R06TzLPzfPzHdvweRdQ="; }; patches = [ diff --git a/pkgs/development/python-modules/mesa/default.nix b/pkgs/development/python-modules/mesa/default.nix index e34ce49d24ece..c26bf68c85821 100644 --- a/pkgs/development/python-modules/mesa/default.nix +++ b/pkgs/development/python-modules/mesa/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "mesa"; - version = "3.1.5"; + version = "3.2.0"; format = "setuptools"; # According to their docs, this library is for Python 3+. @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "mesa"; inherit version; - hash = "sha256-ZXWQrCwA8PCRNBGpVNxXrpxfx5wMtKPH2djmxqRwwdA="; + hash = "sha256-k4UjkUGL4qDgOhucQU7svRNZtM3ZqtO6NUxpl4NhQl0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/meson-python/default.nix b/pkgs/development/python-modules/meson-python/default.nix index f4658c97c8c37..96c7b369004ce 100644 --- a/pkgs/development/python-modules/meson-python/default.nix +++ b/pkgs/development/python-modules/meson-python/default.nix @@ -14,7 +14,7 @@ # tests cython, - git, + gitMinimal, pytestCheckHook, pytest-mock, }: @@ -54,7 +54,7 @@ buildPythonPackage rec { nativeCheckInputs = [ cython - git + gitMinimal pytestCheckHook pytest-mock ]; diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix index d7f21ee8e2a67..e96d65184f84f 100644 --- a/pkgs/development/python-modules/mezzanine/default.nix +++ b/pkgs/development/python-modules/mezzanine/default.nix @@ -6,47 +6,51 @@ chardet, django, django-contrib-comments, - fetchPypi, + fetchFromGitHub, filebrowser-safe, - future, grappelli-safe, isPyPy, - pep8, pillow, - pyflakes, + pytestCheckHook, + pytest-cov-stub, + pytest-django, pythonOlder, pytz, requests, requests-oauthlib, + requirements-parser, + setuptools, tzlocal, }: buildPythonPackage rec { pname = "mezzanine"; - version = "6.0.0"; + version = "6.1.1"; format = "setuptools"; disabled = pythonOlder "3.7" || isPyPy; - src = fetchPypi { - pname = "Mezzanine"; - inherit version; - hash = "sha256-R/PB4PFQpVp6jnCasyPszgC294SKjLzq2oMkR2qV86s="; + src = fetchFromGitHub { + owner = "stephenmcd"; + repo = "mezzanine"; + tag = "v${version}"; + hash = "sha256-TdGWlquS4hsnxIM0bhbWR7C0X4wyUcqC+YrBDSShRhg="; }; - buildInputs = [ - pyflakes - pep8 + patches = [ + # drop git requirement from tests and fake stable branch + ./tests-no-git.patch ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ beautifulsoup4 bleach chardet django django-contrib-comments filebrowser-safe - future grappelli-safe pillow pytz @@ -56,15 +60,12 @@ buildPythonPackage rec { ] ++ bleach.optional-dependencies.css; - # Tests Fail Due to Syntax Warning, Fixed for v3.1.11+ - doCheck = false; - - # sed calls will be unnecessary in v3.1.11+ - preConfigure = '' - sed -i 's/==/>=/' setup.py - ''; - - LC_ALL = "en_US.UTF-8"; + nativeCheckInputs = [ + pytest-django + pytest-cov-stub + pytestCheckHook + requirements-parser + ]; meta = with lib; { description = "Content management platform built using the Django framework"; diff --git a/pkgs/development/python-modules/mezzanine/tests-no-git.patch b/pkgs/development/python-modules/mezzanine/tests-no-git.patch new file mode 100644 index 0000000000000..8d2292edf3227 --- /dev/null +++ b/pkgs/development/python-modules/mezzanine/tests-no-git.patch @@ -0,0 +1,17 @@ +diff --git a/tests/test_core.py b/tests/test_core.py +index 40cd39fe..57abbec0 100644 +--- a/tests/test_core.py ++++ b/tests/test_core.py +@@ -47,11 +47,7 @@ from mezzanine.utils.sites import current_site_id, override_current_site_id + from mezzanine.utils.tests import TestCase + from mezzanine.utils.urls import admin_url + +-BRANCH_NAME = ( +- subprocess.check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"]) +- .decode() +- .strip() +-) ++BRANCH_NAME = "stable" + VERSION_WARN = ( + "Unpinned or pre-release dependencies detected in Mezzanine's requirements: {}" + ) diff --git a/pkgs/development/python-modules/mindsdb-evaluator/default.nix b/pkgs/development/python-modules/mindsdb-evaluator/default.nix index 3abef9cf4cdaa..2f7b18a346538 100644 --- a/pkgs/development/python-modules/mindsdb-evaluator/default.nix +++ b/pkgs/development/python-modules/mindsdb-evaluator/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "mindsdb-evaluator"; - version = "0.0.16"; + version = "0.0.18"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "mindsdb_evaluator"; inherit version; - hash = "sha256-92XGu6ob1AfOoqcB/hqDf+lSDAUjZ5SPju5FkpcbOHA="; + hash = "sha256-UGg7P/OKmRi70z2roRBsA95FAXm7CG+TdPzTRy7+p4w="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/minikanren/default.nix b/pkgs/development/python-modules/minikanren/default.nix index 9e28d4c6bb8d5..911b6edbbd65f 100644 --- a/pkgs/development/python-modules/minikanren/default.nix +++ b/pkgs/development/python-modules/minikanren/default.nix @@ -10,21 +10,28 @@ py, pytestCheckHook, pytest-html, + setuptools, + setuptools-scm, }: -buildPythonPackage { +buildPythonPackage rec { pname = "minikanren"; - version = "1.0.3"; - format = "setuptools"; + version = "1.0.5"; + pyproject = true; src = fetchFromGitHub { owner = "pythological"; repo = "kanren"; - rev = "5aa9b1734cbb3fe072a7c72b46e1b72a174d28ac"; - hash = "sha256-daAtREgm91634Q0mc0/WZivDiyZHC7TIRoGRo8hMnGE="; + tag = "v${version}"; + hash = "sha256-lCQ0mKT99zK5A74uoo/9bP+eFdm3MC43Fh8+P2krXrs="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ toolz cons multipledispatch @@ -48,7 +55,7 @@ buildPythonPackage { meta = with lib; { description = "Relational programming in Python"; homepage = "https://github.com/pythological/kanren"; - changelog = "https://github.com/pythological/kanren/releases"; + changelog = "https://github.com/pythological/kanren/releases/tag/${src.tag}"; license = licenses.bsd3; maintainers = with maintainers; [ Etjean ]; }; diff --git a/pkgs/development/python-modules/mistral-common/default.nix b/pkgs/development/python-modules/mistral-common/default.nix index 2c6b42a76333a..e245f5b7e524d 100644 --- a/pkgs/development/python-modules/mistral-common/default.nix +++ b/pkgs/development/python-modules/mistral-common/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "mistral-common"; - version = "1.5.6"; + version = "1.8.3"; pyproject = true; src = fetchPypi { pname = "mistral_common"; inherit version; - hash = "sha256-TauSQwaEMhFKFfLEb/SRagViCnIrDfjetJ3POD+34r8="; + hash = "sha256-DRl52CIntiX21xs8goF28FnajQ9aMwfN9TtIQJo5cKQ="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index 15096b38df842..3717e7e03b891 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -60,6 +60,8 @@ buildPythonPackage rec { requests ]; + pythonRelaxDeps = [ "backrefs" ]; + optional-dependencies = { recommended = [ mkdocs-minify-plugin diff --git a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix index 095300fa58465..e3174f10b0ad5 100644 --- a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix +++ b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocs-swagger-ui-tag"; - version = "0.6.11"; + version = "0.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Blueswen"; repo = "mkdocs-swagger-ui-tag"; tag = "v${version}"; - hash = "sha256-hxf7onjH26QsdB19r71NSC/67u+pEYdJo3e4OvWGgtI="; + hash = "sha256-zn+ASunOiAg/kxsvaHUYKuWc5UZ406RO/LSQ+qkAEn0="; }; propagatedBuildInputs = [ @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "MkDocs plugin supports for add Swagger UI in page"; homepage = "https://github.com/Blueswen/mkdocs-swagger-ui-tag"; - changelog = "https://github.com/blueswen/mkdocs-swagger-ui-tag/blob/v${version}/CHANGELOG"; + changelog = "https://github.com/blueswen/mkdocs-swagger-ui-tag/blob/${src.tag}/CHANGELOG"; license = licenses.mit; maintainers = with maintainers; [ snpschaaf ]; }; diff --git a/pkgs/development/python-modules/mkl-service/default.nix b/pkgs/development/python-modules/mkl-service/default.nix index a437f066f4b05..07e7a870b38d8 100644 --- a/pkgs/development/python-modules/mkl-service/default.nix +++ b/pkgs/development/python-modules/mkl-service/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "mkl-service"; - version = "2.4.2"; + version = "2.5.2"; pyproject = true; src = fetchFromGitHub { owner = "IntelPython"; repo = "mkl-service"; tag = "v${version}"; - hash = "sha256-o5mjZhqQc7tu44EjrScuGzv6pZNlnZnndMIAhl8pY5o="; + hash = "sha256-uP4TzBLhlpT83FIYCjolP3QN5/90YjBOnauy780gUJc="; }; build-system = [ diff --git a/pkgs/development/python-modules/mlcroissant/default.nix b/pkgs/development/python-modules/mlcroissant/default.nix index 96bf7b6dc9f64..510c7d617acee 100644 --- a/pkgs/development/python-modules/mlcroissant/default.nix +++ b/pkgs/development/python-modules/mlcroissant/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "mlcroissant"; - version = "1.0.17"; + version = "1.0.21"; pyproject = true; src = fetchFromGitHub { owner = "mlcommons"; repo = "croissant"; tag = "v${version}"; - hash = "sha256-jiyr8x+YRSsRwOVxDPaWemPqglTKVb5jg4rRzUXd3BE="; + hash = "sha256-yUAF/NQHz8WUIaIIsqOwTMppl5+EZhURFpHnde9OOpE="; }; sourceRoot = "${src.name}/python/mlcroissant"; @@ -89,7 +89,7 @@ buildPythonPackage rec { meta = { description = "High-level format for machine learning datasets that brings together four rich layers"; homepage = "https://github.com/mlcommons/croissant"; - changelog = "https://github.com/mlcommons/croissant/releases/tag/v${version}"; + changelog = "https://github.com/mlcommons/croissant/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ GaetanLepage ]; platforms = lib.platforms.all; diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index bc36ab6d3465a..3abe96a359351 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -71,14 +71,14 @@ buildPythonPackage rec { pname = "mlflow"; - version = "2.20.3"; + version = "3.1.4"; pyproject = true; src = fetchFromGitHub { owner = "mlflow"; repo = "mlflow"; tag = "v${version}"; - hash = "sha256-kgohENAx5PpLQ9pBfl/zSq65l/DqJfufBf0gWR1WJHY="; + hash = "sha256-GU1CVwc31bLai8QoXch/UTx//+OG2V/6jG9Ocz4MDuA="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index 7dac034861b00..7c0ae8c4335b1 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -36,12 +36,12 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.13.4"; + version = "3.13.10"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-KoZ2V0M4ezW58c65wc9vJHrYMZ2ywKUjCOietKYS94Q="; + hash = "sha256-MnFH77ryrLyu//IH6FYb3ZVFlsdkimJKzKGbDH1sgmw="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/modelcif/default.nix b/pkgs/development/python-modules/modelcif/default.nix index e8b03321620f2..242986272bc55 100644 --- a/pkgs/development/python-modules/modelcif/default.nix +++ b/pkgs/development/python-modules/modelcif/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "modelcif"; - version = "1.3"; + version = "1.4"; pyproject = true; src = fetchFromGitHub { owner = "ihmwg"; repo = "python-modelcif"; tag = version; - hash = "sha256-3wuKD6oQp3QdsWRpYsnC5IPpVRcQVDERSClEKJko3dg="; + hash = "sha256-Uj6E25uqFdCo2lGf0Cmhc7rs3Rwj7vkpe2G0uhv53gc="; }; build-system = [ @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package for handling ModelCIF mmCIF and BinaryCIF files"; homepage = "https://github.com/ihmwg/python-modelcif"; - changelog = "https://github.com/ihmwg/python-modelcif/blob/${src.rev}/ChangeLog.rst"; + changelog = "https://github.com/ihmwg/python-modelcif/blob/${src.tag}/ChangeLog.rst"; license = licenses.mit; maintainers = with maintainers; [ natsukium ]; }; diff --git a/pkgs/development/python-modules/monai-deploy/default.nix b/pkgs/development/python-modules/monai-deploy/default.nix index fc5982711dfa7..3ae67044ff933 100644 --- a/pkgs/development/python-modules/monai-deploy/default.nix +++ b/pkgs/development/python-modules/monai-deploy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "monai-deploy"; - version = "0.5.1"; + version = "3.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Project-MONAI"; repo = "monai-deploy-app-sdk"; tag = version; - hash = "sha256-a5WtU+1XjsYsXB/uZS8ufE0fOOWDf+Wy7mOX2xPEQEg="; + hash = "sha256-W2GXVd4gWgfGLjXR+8m/Ztm52Agj4FGWtEFrh4mjYk0="; }; postPatch = '' @@ -68,7 +68,7 @@ buildPythonPackage rec { description = "Framework and tools to design, develop and verify AI applications in healthcare imaging"; mainProgram = "monai-deploy"; homepage = "https://monai.io/deploy.html"; - changelog = "https://github.com/Project-MONAI/monai-deploy-app-sdk/blob/main/docs/source/release_notes/v${version}.md"; + changelog = "https://github.com/Project-MONAI/monai-deploy-app-sdk/blob/main/docs/source/release_notes/${src.tag}.md"; license = licenses.asl20; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 3fe8eaea2371f..bf54158febbfe 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -10,7 +10,6 @@ cryptography, docker, fetchFromGitHub, - fetchpatch, flask-cors, flask, freezegun, @@ -38,7 +37,7 @@ buildPythonPackage rec { pname = "moto"; - version = "5.1.4"; + version = "5.1.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -47,18 +46,9 @@ buildPythonPackage rec { owner = "getmoto"; repo = "moto"; tag = version; - hash = "sha256-bDRd1FTBpv6t2j8cBzcYiK4B0F4sLcoW9K0Wnd0oo+4="; + hash = "sha256-UbCSGpvS8Jvpe8iV1rVplSoGykHSup9pVTd3odbPq6Y="; }; - # Fix tests with botocore 1.38.32 - # FIXME: remove in next update - patches = [ - (fetchpatch { - url = "https://github.com/getmoto/moto/commit/8dcaaca0eefdf9ac957650c1562317b6d07fadf9.diff"; - hash = "sha256-5zaerJR1rsMZQLn8cXjS8RYiKlSQ6azp7dk7JzLp+7I="; - }) - ]; - build-system = [ setuptools ]; @@ -364,9 +354,6 @@ buildPythonPackage rec { # Parameter validation fails "test_conditional_write" - # Requires newer botocore version - "test_dynamodb_with_account_id_routing" - # Assumes too much about threading.Timer() behavior (that it honors the # timeout precisely and that the thread handler will complete in just 0.1s # from the requested timeout) @@ -395,6 +382,9 @@ buildPythonPackage rec { # botocore.exceptions.ParamValidationError: Parameter validation failed: Unknown parameter in input: "EnableWorkDocs", must be one of: [...] "tests/test_workspaces/test_workspaces.py" + + # Requires sagemaker client + "other_langs/tests_sagemaker_client/test_model_training.py" ]; meta = { diff --git a/pkgs/development/python-modules/motor/default.nix b/pkgs/development/python-modules/motor/default.nix index f0d13adab90e0..d62180f93e19f 100644 --- a/pkgs/development/python-modules/motor/default.nix +++ b/pkgs/development/python-modules/motor/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "motor"; - version = "3.7.0"; + version = "3.7.1"; pyproject = true; src = fetchFromGitHub { owner = "mongodb"; repo = "motor"; tag = version; - hash = "sha256-O3MHVzL/ECO0vnzJItXTDmmMN8aicbvh0Sve/HlAlZw="; + hash = "sha256-ul2GKzSiAewwGEuCpQQ61h3cqrJikaJeKs5KlX+aAjo="; }; build-system = [ diff --git a/pkgs/development/python-modules/mozjpeg_lossless_optimization/default.nix b/pkgs/development/python-modules/mozjpeg_lossless_optimization/default.nix index 684d15400c4ae..51353639a6471 100644 --- a/pkgs/development/python-modules/mozjpeg_lossless_optimization/default.nix +++ b/pkgs/development/python-modules/mozjpeg_lossless_optimization/default.nix @@ -12,15 +12,15 @@ }: buildPythonPackage rec { pname = "mozjpeg_lossless_optimization"; - version = "1.3.0"; + version = "1.3.1"; pyproject = true; src = fetchFromGitHub { owner = "wanadev"; repo = "mozjpeg-lossless-optimization"; # https://github.com/NixOS/nixpkgs/issues/26302 - rev = "refs/tags/v${version}"; - hash = "sha256-g2+QpV3F7wtu37qRJlA4a5r1J9yuJZcC99fDDy03JqU="; + tag = "v${version}"; + hash = "sha256-HAOmD87oazwlGx1O+tAV5qzSn4EHbzeYQ5e8kmegwbo="; fetchSubmodules = true; }; @@ -46,7 +46,7 @@ buildPythonPackage rec { meta = { description = "Python library to optimize JPEGs losslessly using MozJPEG"; homepage = "https://github.com/wanadev/mozjpeg-lossless-optimization"; - changelog = "https://github.com/wanadev/mozjpeg-lossless-optimization/releases/tag/v${version}"; + changelog = "https://github.com/wanadev/mozjpeg-lossless-optimization/releases/tag/${src.tag}"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.adfaure ]; }; diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index bf894a84e5689..202ba506dfe1d 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "mpi4py"; - version = "4.0.3"; + version = "4.1.0"; pyproject = true; src = fetchFromGitHub { repo = "mpi4py"; owner = "mpi4py"; tag = version; - hash = "sha256-eN/tjlnNla6RHYOXcprVVqtec1nwCEGn+MBcV/5mHJg="; + hash = "sha256-Hm+x79utOrjAbprud2MECgakyOzgShSwNuoyZUcTluQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/mpl-typst/default.nix b/pkgs/development/python-modules/mpl-typst/default.nix index 040807fde8cd4..c2d0d1ffc697f 100644 --- a/pkgs/development/python-modules/mpl-typst/default.nix +++ b/pkgs/development/python-modules/mpl-typst/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "mpl-typst"; - version = "0.1.0"; + version = "0.2.1"; pyproject = true; src = fetchFromGitHub { owner = "daskol"; repo = "mpl-typst"; tag = "v${version}"; - hash = "sha256-Pm5z4tkpgwjYtpBh9+AJWlsHl7HNGxyftfaNSwQDpdk="; + hash = "sha256-lkO4BTo3duNAsppTjteeBuzgSJL/UnKVW2QXgrfVrqM="; }; build-system = [ @@ -46,7 +46,7 @@ buildPythonPackage rec { meta = { description = "Typst backend for matplotlib"; homepage = "https://github.com/daskol/mpl-typst"; - changelog = "https://github.com/daskol/mpl-typst/releases/tag/v${version}"; + changelog = "https://github.com/daskol/mpl-typst/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ genga898 ]; }; diff --git a/pkgs/development/python-modules/mplhep/default.nix b/pkgs/development/python-modules/mplhep/default.nix index c344603579772..36729e8c5285d 100644 --- a/pkgs/development/python-modules/mplhep/default.nix +++ b/pkgs/development/python-modules/mplhep/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "mplhep"; - version = "0.3.59"; + version = "0.4.0"; pyproject = true; src = fetchFromGitHub { owner = "scikit-hep"; repo = "mplhep"; tag = "v${version}"; - hash = "sha256-Xanj2AkFRq/zu2ntTHVt1QkikN0bYfRcBj6CBho15os="; + hash = "sha256-VpdhgFUX1qUiUT5HlA2j3QQv7s3bF671e1I53MsML8w="; }; build-system = [ diff --git a/pkgs/development/python-modules/mrsqm/default.nix b/pkgs/development/python-modules/mrsqm/default.nix index e6828479a5dd7..e8a2a0ffea8b7 100644 --- a/pkgs/development/python-modules/mrsqm/default.nix +++ b/pkgs/development/python-modules/mrsqm/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "mrsqm"; - version = "0.0.7"; + version = "4"; pyproject = true; build-system = [ @@ -28,8 +28,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mlgig"; repo = "mrsqm"; - tag = "v.${version}"; - hash = "sha256-5K6vCU0HExnmYNThZNDCbEtII9bUGauxDtKkJXe/85Q="; + tag = "r${version}"; + hash = "sha256-59f18zItV3K6tXcg1v1q2Z8HYrQB8T0ntaaqjxeAEbM="; }; buildInputs = [ fftw ]; diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix index 955c4f97a85ba..2d570ab0d5941 100644 --- a/pkgs/development/python-modules/msal/default.nix +++ b/pkgs/development/python-modules/msal/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "msal"; - version = "1.32.3"; + version = "1.33.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XuoDhonHilpwyo7L4SRUWLVahXvQlu+2mJxpuhWYXTU="; + hash = "sha256-g2rYD6o+JafXEBXJkM5h9wSocyix5zvLsGI6GMvxdRA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/msgpack/default.nix b/pkgs/development/python-modules/msgpack/default.nix index ea30f58d8109b..36f886ad7609a 100644 --- a/pkgs/development/python-modules/msgpack/default.nix +++ b/pkgs/development/python-modules/msgpack/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "msgpack"; - version = "1.1.0"; + version = "1.1.1"; pyproject = true; src = fetchFromGitHub { owner = "msgpack"; repo = "msgpack-python"; tag = "v${version}"; - hash = "sha256-yKQcQi0oSJ33gzsx1Q6ME3GbuSaHR091n7maU6F5QlU="; + hash = "sha256-j1MpdnfG6tCgAFlza64erMhJm/MkSK2QnixNv7MrQes="; }; build-system = [ setuptools ]; @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "MessagePack serializer implementation"; homepage = "https://github.com/msgpack/msgpack-python"; - changelog = "https://github.com/msgpack/msgpack-python/blob/v${version}/ChangeLog.rst"; + changelog = "https://github.com/msgpack/msgpack-python/blob/${src.tag}/ChangeLog.rst"; license = licenses.asl20; maintainers = with maintainers; [ nickcao ]; }; diff --git a/pkgs/development/python-modules/msgraph-core/default.nix b/pkgs/development/python-modules/msgraph-core/default.nix index a684239a6d012..235a8be3a46a8 100644 --- a/pkgs/development/python-modules/msgraph-core/default.nix +++ b/pkgs/development/python-modules/msgraph-core/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "msgraph-core"; - version = "1.3.4"; + version = "1.3.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "microsoftgraph"; repo = "msgraph-sdk-python-core"; tag = "v${version}"; - hash = "sha256-F3vZUglO0AvWZPwV8329Wrd5S4PHShBv8Gg3Jvsz6Kk="; + hash = "sha256-0ey8sV0JDuOjdrOeO/hRxZ847DMcWai0B/YUWZ1VJ48="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 7f731d7bb8c7a..c0c053d498bc2 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -1,4 +1,5 @@ { + stdenv, lib, fetchFromGitHub, buildPythonPackage, @@ -13,14 +14,14 @@ buildPythonPackage rec { pname = "multidict"; - version = "6.4.4"; + version = "6.6.3"; pyproject = true; src = fetchFromGitHub { owner = "aio-libs"; repo = "multidict"; tag = "v${version}"; - hash = "sha256-crnWaThjymY0nbY4yvD+wX20vQcBkPrFAI+UkexNAbo="; + hash = "sha256-AB35kVgKizzPi3r4tDVQ7vI50Xsb2BeBp3rFh+UOXQc="; }; postPatch = '' @@ -35,6 +36,12 @@ buildPythonPackage rec { typing-extensions ]; + env = + { } + // lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=unused-command-line-argument"; + }; + nativeCheckInputs = [ objgraph pytestCheckHook diff --git a/pkgs/development/python-modules/multipart/default.nix b/pkgs/development/python-modules/multipart/default.nix index 587c2e3aa1090..4eb143a42c578 100644 --- a/pkgs/development/python-modules/multipart/default.nix +++ b/pkgs/development/python-modules/multipart/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "multipart"; - version = "1.2.1"; + version = "1.3.0"; pyproject = true; src = fetchFromGitHub { owner = "defnull"; repo = "multipart"; tag = "v${version}"; - hash = "sha256-mQMv5atWrWpwyY9YYjaRYNDm5AfW54drPSKL7qiae+I="; + hash = "sha256-6vlyoi4nayZOKyfO4jbKNzUy7G6K7mySYzkqfp+45O4="; }; build-system = [ flit-core ]; @@ -25,7 +25,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "multipart" ]; meta = { - changelog = "https://github.com/defnull/multipart/blob/${src.rev}/CHANGELOG.rst"; + changelog = "https://github.com/defnull/multipart/blob/${src.tag}/CHANGELOG.rst"; description = "Parser for multipart/form-data"; homepage = "https://github.com/defnull/multipart"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 0d73893e2c38a..3dd094a0edd8e 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -402,8 +402,8 @@ rec { "sha256-aQR1CrCbisf0vApIjFXa5/oKC4Q1eT0AsLTg0EBojAs="; mypy-boto3-directconnect = - buildMypyBoto3Package "directconnect" "1.40.10" - "sha256-ZM9nCSSzMmRjyxnypQcaORwYXiXMXz25Gw2dJlOVcc0="; + buildMypyBoto3Package "directconnect" "1.40.0" + "sha256-UmrcCxy3zK/cEkM/KCGnr4JEMOOjhNwBNRC6IiMm+NM="; mypy-boto3-discovery = buildMypyBoto3Package "discovery" "1.40.0" @@ -558,8 +558,8 @@ rec { "sha256-i76hozLLcN4Y5Jpg/92+6FSgStpw2SfF0HeRhQiRPqE="; mypy-boto3-fsx = - buildMypyBoto3Package "fsx" "1.40.10" - "sha256-E9s3Mh66bXUsy/BUPorYaOp58hkY0HpkyX3dX0OsXz4="; + buildMypyBoto3Package "fsx" "1.40.9" + "sha256-mNs8PA3GpvonrX6vwErh1muD4K2+zdr0ZWvOJP8PRjY="; mypy-boto3-gamelift = buildMypyBoto3Package "gamelift" "1.40.0" @@ -866,8 +866,8 @@ rec { "sha256-DJEU4Ha8jpV/J8UP6emYMjcv9RfZt1njsBPD11q0BUI="; mypy-boto3-medialive = - buildMypyBoto3Package "medialive" "1.40.10" - "sha256-hGbdgOvsb+gd7640D1WeXj4tOkzuGwi8Ib/RmmQd4tY="; + buildMypyBoto3Package "medialive" "1.40.0" + "sha256-+2qM6+qeDJnvkvVI+z1EzMfGps7ejjVq4FOxOfEzJdg="; mypy-boto3-mediapackage = buildMypyBoto3Package "mediapackage" "1.40.15" @@ -1246,8 +1246,8 @@ rec { "sha256-ET2prHzHi0EBkWB9MlmdudaaJhay5in5+rdUF0T6veE="; mypy-boto3-servicediscovery = - buildMypyBoto3Package "servicediscovery" "1.40.10" - "sha256-/Gyq9dgCjeIrNTxUqE/mvfPr+4c+Ann5+ep3/NJhrW8="; + buildMypyBoto3Package "servicediscovery" "1.40.0" + "sha256-hg/KQ7V0ej2jmLLYLmBChuxZ4IvKypMWAOs6j5zRoYY="; mypy-boto3-ses = buildMypyBoto3Package "ses" "1.40.0" @@ -1426,8 +1426,8 @@ rec { "sha256-zApXRQ+MpzmwpQcghnoC34FaKlLQ/g8kZZUwbU0G8p8="; mypy-boto3-workspaces = - buildMypyBoto3Package "workspaces" "1.40.10" - "sha256-6PTGF3akduOS0VRS43ykcKzK25iyQb+bqvpCe+BM9Qw="; + buildMypyBoto3Package "workspaces" "1.40.0" + "sha256-LRf2JH9+Z+a1yX1TodO6ASUFY7+Ct9RLu2BS0CF3X0U="; mypy-boto3-workspaces-web = buildMypyBoto3Package "workspaces-web" "1.40.0" diff --git a/pkgs/development/python-modules/myst-nb/default.nix b/pkgs/development/python-modules/myst-nb/default.nix index f12ee7e8c1b76..cba8ec7113797 100644 --- a/pkgs/development/python-modules/myst-nb/default.nix +++ b/pkgs/development/python-modules/myst-nb/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "myst-nb"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "myst_nb"; - hash = "sha256-r0Wex1OzQZUhgrRbCoC0d2zr+Aye5qrKKj9AJ7RAyd4="; + hash = "sha256-3zzUaA9Rpa9nP9RrOLVivjVZrvFHXpBu0PLmbkWHzks="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/nanoeigenpy/default.nix b/pkgs/development/python-modules/nanoeigenpy/default.nix index 9e1f0378dc3ff..29bb740b4aaa4 100644 --- a/pkgs/development/python-modules/nanoeigenpy/default.nix +++ b/pkgs/development/python-modules/nanoeigenpy/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "nanoeigenpy"; - version = "0.3.0"; + version = "0.4.0"; pyproject = false; # Built with cmake src = fetchFromGitHub { owner = "Simple-Robotics"; repo = "nanoeigenpy"; tag = "v${version}"; - hash = "sha256-asDe1mrTsAxVl0gAo7zlWqQRfWYBiSLqQk1d8bEBsn4="; + hash = "sha256-2Lp3fYw3rQYxjkCQCeHI+N32Y4vTJ8l+PoKqLCmAXIU="; }; # Fix: diff --git a/pkgs/development/python-modules/napari-npe2/default.nix b/pkgs/development/python-modules/napari-npe2/default.nix index e9a9beeed4cda..02a0a99047e30 100644 --- a/pkgs/development/python-modules/napari-npe2/default.nix +++ b/pkgs/development/python-modules/napari-npe2/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "napari-npe2"; - version = "0.7.8"; + version = "0.7.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "napari"; repo = "npe2"; tag = "v${version}"; - hash = "sha256-J15CmJ1L173M54fCo4oTV9XP7946c0aHzLqKjTvzG0g="; + hash = "sha256-q+vgzUuSSHFR64OajT/j/tLsNgSm3azQPCvDlrIvceM="; }; build-system = [ diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix index 3d49194633e66..48f842bc15a63 100644 --- a/pkgs/development/python-modules/napari/default.nix +++ b/pkgs/development/python-modules/napari/default.nix @@ -45,14 +45,14 @@ mkDerivationWith buildPythonPackage rec { pname = "napari"; - version = "0.6.2"; + version = "0.6.3"; pyproject = true; src = fetchFromGitHub { owner = "napari"; repo = "napari"; tag = "v${version}"; - hash = "sha256-p6deNHnlvgZXV3Ym3OADC44j5bOkMDjlmM2N3yE5GxE="; + hash = "sha256-OPbjq9jXA5onLBCVvCx4g935y7GNvf4GA5s5sfNjIKY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/narwhals/default.nix b/pkgs/development/python-modules/narwhals/default.nix index 35d4ac5131458..71e531679c3e8 100644 --- a/pkgs/development/python-modules/narwhals/default.nix +++ b/pkgs/development/python-modules/narwhals/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "narwhals"; - version = "1.40.0"; + version = "2.0.1"; pyproject = true; src = fetchFromGitHub { owner = "narwhals-dev"; repo = "narwhals"; tag = "v${version}"; - hash = "sha256-cCgWKH4DzENTI1vwxOU+GRp/poUe55XqSPY8UHYy9PI="; + hash = "sha256-NptQHnv0PoAbD0RIghBrtDPsYidq1k4LN/mUfz4n6G0="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/nbdev/default.nix b/pkgs/development/python-modules/nbdev/default.nix index d14141e18966b..6a582a67d6c89 100644 --- a/pkgs/development/python-modules/nbdev/default.nix +++ b/pkgs/development/python-modules/nbdev/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "nbdev"; - version = "2.4.2"; + version = "2.4.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OtCpN2Jw4ghv19jY4N2Yn46CxxZuPQSybFw62MIIf0g="; + hash = "sha256-Evp67exwUVu7Dv3z85AAeTVB4CCcBHzRFXYcq+KEpj0="; }; pythonRelaxDeps = [ "ipywidgets" ]; diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix index 7c31e3e4acc70..2274c41496dd8 100644 --- a/pkgs/development/python-modules/nbformat/default.nix +++ b/pkgs/development/python-modules/nbformat/default.nix @@ -46,13 +46,7 @@ buildPythonPackage rec { testpath ]; - disabledTestPaths = lib.optionals (pythonAtLeast "3.13") [ - # ResourceWarning: unclosed database in - "tests/test_validator.py" - "tests/v4/test_convert.py" - "tests/v4/test_json.py" - "tests/v4/test_validate.py" - ]; + pytestFlags = [ "-Wignore::pytest.PytestUnraisableExceptionWarning" ]; # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/ndindex/default.nix b/pkgs/development/python-modules/ndindex/default.nix index 54edcb1b2e4c6..c4eef602132bc 100644 --- a/pkgs/development/python-modules/ndindex/default.nix +++ b/pkgs/development/python-modules/ndindex/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "ndindex"; - version = "1.9.2"; + version = "1.10.0"; pyproject = true; src = fetchFromGitHub { owner = "Quansight-Labs"; repo = "ndindex"; tag = version; - hash = "sha256-5S4HN5MFLgURImwFsyyTOxDhrZJ5Oe+Ln/TA/bsCsek="; + hash = "sha256-gPhRln7cUoRmypuTDTwoz4LyCBX3EwuKes/SEoz9NYM="; }; build-system = [ @@ -76,7 +76,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for manipulating indices of ndarrays"; homepage = "https://github.com/Quansight-Labs/ndindex"; - changelog = "https://github.com/Quansight-Labs/ndindex/releases/tag/${version}"; + changelog = "https://github.com/Quansight-Labs/ndindex/releases/tag/${src.tag}"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index 7a9110fdd9c5b..36d64c317dd06 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.28.1"; + version = "5.28.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; tag = version; - hash = "sha256-6Qa6llM8ke9dOkZ7q057ruM0h7pByxAQ+I6Mus2ExVA="; + hash = "sha256-dQvQO+Re+ki9w+itzE6/WdiiLdMlU4yePt01vAPe4+M="; }; postPatch = '' @@ -58,7 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Neo4j Bolt Driver for Python"; homepage = "https://github.com/neo4j/neo4j-python-driver"; - changelog = "https://github.com/neo4j/neo4j-python-driver/releases/tag/${version}"; + changelog = "https://github.com/neo4j/neo4j-python-driver/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/neoteroi-mkdocs/default.nix b/pkgs/development/python-modules/neoteroi-mkdocs/default.nix index cc7fd7dc45424..bec4a6bad9749 100644 --- a/pkgs/development/python-modules/neoteroi-mkdocs/default.nix +++ b/pkgs/development/python-modules/neoteroi-mkdocs/default.nix @@ -16,14 +16,14 @@ }: buildPythonPackage rec { pname = "neoteroi-mkdocs"; - version = "1.1.2"; + version = "1.1.3"; pyproject = true; src = fetchFromGitHub { owner = "Neoteroi"; repo = "mkdocs-plugins"; tag = "v${version}"; - hash = "sha256-+bH4pkY+BE31t3b750ZAbbesKLFjgx6KF9b2tXFTmhI="; + hash = "sha256-4Rd4VhgaMzoSZ87FMQsUxadGG1ucQgGY0Y4uZoZl380="; }; buildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix index 3b90aaed74b44..db1d17de07caf 100644 --- a/pkgs/development/python-modules/netdisco/default.nix +++ b/pkgs/development/python-modules/netdisco/default.nix @@ -1,26 +1,26 @@ { lib, buildPythonPackage, + isPy3k, fetchPypi, - pytestCheckHook, requests, - setuptools, zeroconf, + pytestCheckHook, }: buildPythonPackage rec { pname = "netdisco"; version = "3.0.0"; - pyproject = true; + format = "setuptools"; + + disabled = !isPy3k; src = fetchPypi { inherit pname version; hash = "sha256-TbtZBILzd8zEYeAXQnB8y+jx0tGyhXivkdybf+vNy9I="; }; - build-system = [ setuptools ]; - - dependencies = [ + propagatedBuildInputs = [ requests zeroconf ]; diff --git a/pkgs/development/python-modules/netmiko/default.nix b/pkgs/development/python-modules/netmiko/default.nix index cf9a77afe338d..659151015602f 100644 --- a/pkgs/development/python-modules/netmiko/default.nix +++ b/pkgs/development/python-modules/netmiko/default.nix @@ -6,7 +6,6 @@ paramiko, poetry-core, pyserial, - pythonOlder, pyyaml, rich, ruamel-yaml, @@ -16,22 +15,14 @@ buildPythonPackage rec { pname = "netmiko"; - version = "4.5.0"; + version = "4.6.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchPypi { inherit pname version; - hash = "sha256-29/CC2yq+OXXpXC7G0Kia5pvjYI06R9cZfTb/gwOT1A="; + hash = "sha256-lwG7LBoV6y6AdMsuKMoAfGm5+lKWG4O5jHV+rWuA3u8="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "poetry>=1.6.1" "poetry-core" \ - --replace-fail "poetry.masonry.api" "poetry.core.masonry.api" - ''; - build-system = [ poetry-core ]; dependencies = [ diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index ce41c43032bc1..3a68b5330ef31 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -29,6 +29,11 @@ buildPythonPackage rec { hash = "sha256-Lgtq+Jho2IkXnVLVlPRxL2hvhB8gW/9Et2yqXOkM8MI="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'version = "0.0.0"' 'version = "${version}"' + ''; + build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix index 5efea6b24831b..3f4d14d6294ca 100644 --- a/pkgs/development/python-modules/netutils/default.nix +++ b/pkgs/development/python-modules/netutils/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library that is a collection of objects for common network automation tasks"; homepage = "https://github.com/networktocode/netutils"; - changelog = "https://github.com/networktocode/netutils/releases/tag/v${version}"; + changelog = "https://github.com/networktocode/netutils/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix index 91ff6b59b5317..089c287784752 100644 --- a/pkgs/development/python-modules/networkx/default.nix +++ b/pkgs/development/python-modules/networkx/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "networkx"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "3.4.2"; + version = "3.5"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-MHw2aUKMU2KqsnyKEmCqj0fE6R04kfSL4BQXONjQU+E="; + hash = "sha256-1Mb5z4H1LWkjCGZ5a4KvvM3sPbeuT70bZep1D+7VADc="; }; # backport patch to fix tests with Python 3.13.4 diff --git a/pkgs/development/python-modules/neurokit2/default.nix b/pkgs/development/python-modules/neurokit2/default.nix index 923eaa7b7e422..9e2f9acbee322 100644 --- a/pkgs/development/python-modules/neurokit2/default.nix +++ b/pkgs/development/python-modules/neurokit2/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "neurokit2"; - version = "0.2.10"; + version = "0.2.12"; pyproject = true; src = fetchFromGitHub { owner = "neuropsychology"; repo = "NeuroKit"; tag = "v${version}"; - hash = "sha256-e/B1JvO6uYZ6iVskFvxZLSSXi0cPep9bBZ0JXZTVS28="; + hash = "sha256-gn02l0vYl+/7hXp4gFVlgblxC4dewXckW3JL3wPC89Y="; }; postPatch = '' @@ -104,7 +104,7 @@ buildPythonPackage rec { meta = { description = "Python Toolbox for Neurophysiological Signal Processing"; homepage = "https://github.com/neuropsychology/NeuroKit"; - changelog = "https://github.com/neuropsychology/NeuroKit/releases/tag/v${version}"; + changelog = "https://github.com/neuropsychology/NeuroKit/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ genga898 ]; }; diff --git a/pkgs/development/python-modules/niaarm/default.nix b/pkgs/development/python-modules/niaarm/default.nix index c0979f4c7a4f9..a324761df8954 100644 --- a/pkgs/development/python-modules/niaarm/default.nix +++ b/pkgs/development/python-modules/niaarm/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "niaarm"; # nixpkgs-update: no auto update - version = "0.4.2"; + version = "0.13.4"; pyproject = true; src = fetchFromGitHub { owner = "firefly-cpp"; repo = "NiaARM"; tag = version; - hash = "sha256-WvVXL1a1DvgLF3upbGUi1+nH5aDBUNx5Bitlkb8lQkc="; + hash = "sha256-524rJ5b9e0U1rqu1iCGMA3Tgnn9bO4biCC1FMoGNqms="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/nidaqmx/default.nix b/pkgs/development/python-modules/nidaqmx/default.nix index 76b93355d9680..8beeb417972fb 100644 --- a/pkgs/development/python-modules/nidaqmx/default.nix +++ b/pkgs/development/python-modules/nidaqmx/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "nidaqmx"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "ni"; repo = "nidaqmx-python"; tag = version; - hash = "sha256-WNr+zVrA4X2AjizsmMEau54Vv1Svey3LNsCo8Bm/W+A="; + hash = "sha256-uxf+1nmJ+YFS3zGu+0YP4zOdBlSCHPYC8euqZIGwb00="; }; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index d9da5fcf52d68..95709d26c281e 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "nilearn"; - version = "0.11.1"; + version = "0.12.0"; pyproject = true; src = fetchFromGitHub { owner = "nilearn"; repo = "nilearn"; tag = version; - hash = "sha256-ZvodSRJkKwPwpYHOLmxAYIIv7f9AlrjmZS9KLPjz5rM="; + hash = "sha256-olA3Yqf+upMJZiwpQp6HDSMxe9OssGLGMdHbZARg0+Y="; }; postPatch = '' @@ -71,7 +71,7 @@ buildPythonPackage rec { meta = { description = "Module for statistical learning on neuroimaging data"; homepage = "https://nilearn.github.io"; - changelog = "https://github.com/nilearn/nilearn/releases/tag/${version}"; + changelog = "https://github.com/nilearn/nilearn/releases/tag/${src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ GaetanLepage ]; }; diff --git a/pkgs/development/python-modules/nitrokey/default.nix b/pkgs/development/python-modules/nitrokey/default.nix index 8258a73e57bd5..158925460e5c1 100644 --- a/pkgs/development/python-modules/nitrokey/default.nix +++ b/pkgs/development/python-modules/nitrokey/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "nitrokey"; - version = "0.3.2"; + version = "0.4.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-JAgorA2V+WHgqtwk8fEPjdwoog7Q3xk93aKSJ0mxHkQ="; + hash = "sha256-uZ3KF+8PUwVjwf73buFpq/6Fu+fqkfIecP3A33FmtKk="; }; disabled = pythonOlder "3.9"; diff --git a/pkgs/development/python-modules/niworkflows/default.nix b/pkgs/development/python-modules/niworkflows/default.nix index a91d07cf99a3e..784be8a25b901 100644 --- a/pkgs/development/python-modules/niworkflows/default.nix +++ b/pkgs/development/python-modules/niworkflows/default.nix @@ -40,14 +40,14 @@ buildPythonPackage rec { pname = "niworkflows"; - version = "1.12.2"; + version = "1.13.5"; pyproject = true; src = fetchFromGitHub { owner = "nipreps"; repo = "niworkflows"; tag = version; - hash = "sha256-rgnfp12SHlL3LFFMSrHlTd0tWNnA4ekxZ9kKYRvZWlw="; + hash = "sha256-Q43IXlzmCO7m9y/tRlJJ2Dz4wNeK+kXtLLLrthO+n58="; }; pythonRelaxDeps = [ "traits" ]; diff --git a/pkgs/development/python-modules/nixpkgs-updaters-library/default.nix b/pkgs/development/python-modules/nixpkgs-updaters-library/default.nix index 30ef74dbe66e3..661dd2d8721ab 100644 --- a/pkgs/development/python-modules/nixpkgs-updaters-library/default.nix +++ b/pkgs/development/python-modules/nixpkgs-updaters-library/default.nix @@ -74,7 +74,7 @@ buildPythonPackage rec { meta = { description = "Boilerplate-less updater library for Nixpkgs ecosystems"; homepage = "https://github.com/PerchunPak/nixpkgs-updaters-library"; - changelog = "https://github.com/PerchunPak/nixpkgs-updaters-library/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/PerchunPak/nixpkgs-updaters-library/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ perchun ]; }; diff --git a/pkgs/development/python-modules/nocasedict/default.nix b/pkgs/development/python-modules/nocasedict/default.nix index f50c1df9902f6..4397658c0bf43 100644 --- a/pkgs/development/python-modules/nocasedict/default.nix +++ b/pkgs/development/python-modules/nocasedict/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "nocasedict"; - version = "2.0.4"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-TKk09l31exDQ/KtfDDnp3MuTV3/58ivvmCZd2/EvivE="; + hash = "sha256-tWPVhRy7DgsQ+7YYm6h+BhLSLlpvOgBKRXOrWziqqn0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/nocaselist/default.nix b/pkgs/development/python-modules/nocaselist/default.nix index ddb10ecf6fdc0..891b78487ca2e 100644 --- a/pkgs/development/python-modules/nocaselist/default.nix +++ b/pkgs/development/python-modules/nocaselist/default.nix @@ -5,22 +5,26 @@ pytestCheckHook, pythonOlder, setuptools, + setuptools-scm, six, }: buildPythonPackage rec { pname = "nocaselist"; - version = "2.0.3"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-VXFNqEM/tIQ855dASXfkOF1ePfnkqgD33emD/YdBD+8="; + hash = "sha256-+3MG9aPgRVNOc3q37L7uA5ul6br7xbXyMfYW1+khG2U="; }; - build-system = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; dependencies = [ six ]; diff --git a/pkgs/development/python-modules/nominal-api-protos/default.nix b/pkgs/development/python-modules/nominal-api-protos/default.nix index 2e080e4ff2c36..0c39ac7fd383e 100644 --- a/pkgs/development/python-modules/nominal-api-protos/default.nix +++ b/pkgs/development/python-modules/nominal-api-protos/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "nominal-api-protos"; - version = "0.708.0"; + version = "0.806.0"; pyproject = true; # nixpkgs-update: no auto update src = fetchPypi { inherit version; pname = "nominal_api_protos"; - hash = "sha256-EYyBRmmCq4OA6xgf4JpajUtlJClkxxPn48Wmmy2mqN4="; + hash = "sha256-wbMGgW3YYX+MVc525rH6pOk72H7NlmiyEJiFtz+Osoo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/nominal-api/default.nix b/pkgs/development/python-modules/nominal-api/default.nix index 0554264d1f3f7..fb5a51f4cfa1e 100644 --- a/pkgs/development/python-modules/nominal-api/default.nix +++ b/pkgs/development/python-modules/nominal-api/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "nominal-api"; - version = "0.708.0"; + version = "0.806.0"; pyproject = true; # nixpkgs-update: no auto update src = fetchPypi { inherit version; pname = "nominal_api"; - hash = "sha256-gaMQ4bLhdBkDTUoHP5Cb0vS5emNcYga5eTvV2TEWQiU="; + hash = "sha256-V9zncQFNBi3MtgBHmwY4SoSgI9cjQuBt90PeRHjaXsw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/nominal/default.nix b/pkgs/development/python-modules/nominal/default.nix index 75233a1421d5f..c4183dfa41077 100644 --- a/pkgs/development/python-modules/nominal/default.nix +++ b/pkgs/development/python-modules/nominal/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "nominal"; - version = "1.66.0"; + version = "1.71.0"; pyproject = true; src = fetchFromGitHub { owner = "nominal-io"; repo = "nominal-client"; tag = "v${version}"; - hash = "sha256-xRt8xRMjjQQ+2IujW//F6Z3xaPz4+YuV0AP4Km8mc04="; + hash = "sha256-C0afrzWlq2Z3a21MIJ/3XgvjkEZONwBgCZ+06XIYFGE="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index b25773185de53..2235147911aef 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "notebook"; - version = "7.4.3"; + version = "7.4.4"; pyproject = true; src = fetchFromGitHub { owner = "jupyter"; repo = "notebook"; tag = "v${version}"; - hash = "sha256-DpGWBV5MeCvoGSBadObVEaYwA5kRmHj8NdVWpJ+pHjA="; + hash = "sha256-bj4iQvm0TGBiCu9drJ8QFXsedzm/cEjevNQS6UsasNs="; }; postPatch = '' @@ -54,7 +54,7 @@ buildPythonPackage rec { offlineCache = yarn-berry_3.fetchYarnBerryDeps { inherit src missingHashes; - hash = "sha256-S0lnRJ+9F1RhymlAOxo3sEJJrHYo5IWeWn80obcgVlM="; + hash = "sha256-nRaWzr5Q904KojfK0mPgLX9be82axb8Aab0SJULE7RU="; }; build-system = [ @@ -88,7 +88,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; meta = { - changelog = "https://github.com/jupyter/notebook/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/jupyter/notebook/blob/${src.tag}/CHANGELOG.md"; description = "Web-based notebook environment for interactive computing"; homepage = "https://github.com/jupyter/notebook"; license = lib.licenses.bsd3; diff --git a/pkgs/development/python-modules/nox/default.nix b/pkgs/development/python-modules/nox/default.nix index 78777f18b4d8a..f419359780c62 100644 --- a/pkgs/development/python-modules/nox/default.nix +++ b/pkgs/development/python-modules/nox/default.nix @@ -1,24 +1,17 @@ { lib, - buildPythonPackage, - fetchFromGitHub, - pythonOlder, - - # build-system - hatchling, - - # dependencies - attrs, argcomplete, + attrs, + buildPythonPackage, colorlog, dependency-groups, + fetchFromGitHub, + hatchling, jinja2, - - # tests + packaging, pytestCheckHook, - writableTmpDirAsHomeHook, - - # passthru + pythonOlder, + tomli, tox, uv, virtualenv, @@ -29,7 +22,7 @@ buildPythonPackage rec { version = "2025.05.01"; pyproject = true; - disabled = pythonOlder "3.12"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "wntrblm"; @@ -41,11 +34,15 @@ buildPythonPackage rec { build-system = [ hatchling ]; dependencies = [ - attrs argcomplete + attrs colorlog dependency-groups + packaging virtualenv + ] + ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; optional-dependencies = { @@ -56,20 +53,22 @@ buildPythonPackage rec { uv = [ uv ]; }; - nativeCheckInputs = [ - pytestCheckHook - writableTmpDirAsHomeHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; pythonImportsCheck = [ "nox" ]; disabledTests = [ + # our conda is not available on 3.11 + "test__create_venv_options" # Assertion errors "test_uv" - # Test requires network access - "test_noxfile_script_mode_url_req" - # Don't test CLi mode + # calls to naked python "test_noxfile_script_mode" + "test_noxfile_script_mode_url_req" ]; disabledTestPaths = [ @@ -77,12 +76,12 @@ buildPythonPackage rec { "tests/test_tox_to_nox.py" ]; - meta = { + meta = with lib; { description = "Flexible test automation for Python"; homepage = "https://nox.thea.codes/"; changelog = "https://github.com/wntrblm/nox/blob/${src.tag}/CHANGELOG.md"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ + license = licenses.asl20; + maintainers = with maintainers; [ doronbehar fab ]; diff --git a/pkgs/development/python-modules/nskeyedunarchiver/default.nix b/pkgs/development/python-modules/nskeyedunarchiver/default.nix index 1141248f84579..c63b8793fb3f6 100644 --- a/pkgs/development/python-modules/nskeyedunarchiver/default.nix +++ b/pkgs/development/python-modules/nskeyedunarchiver/default.nix @@ -7,13 +7,12 @@ buildPythonPackage rec { pname = "nskeyedunarchiver"; - version = "1.5"; + version = "1.5.2"; pyproject = true; src = fetchPypi { - inherit version; - pname = "NSKeyedUnArchiver"; - hash = "sha256-7toEgAIYFzNuD/6sqAN3wajwjsxfwGvkg7SMRLrUFPQ="; + inherit pname version; + hash = "sha256-2aLV1I6p4seNMb+/xKl8AnlBkvO0VINC1yfVS90gvro="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/numpy/1.nix b/pkgs/development/python-modules/numpy/1.nix index 0d040582c8832..9e3b3a60d2e8b 100644 --- a/pkgs/development/python-modules/numpy/1.nix +++ b/pkgs/development/python-modules/numpy/1.nix @@ -94,6 +94,7 @@ buildPythonPackage rec { --replace 'py.full_path()' "'python'" substituteInPlace pyproject.toml \ + --replace-fail "Cython>=0.29.34,<3.1" Cython \ --replace-fail "meson-python>=0.15.0,<0.16.0" "meson-python" ''; diff --git a/pkgs/development/python-modules/numpy/2.nix b/pkgs/development/python-modules/numpy/2.nix index d4ea336d499a6..397b071909e8b 100644 --- a/pkgs/development/python-modules/numpy/2.nix +++ b/pkgs/development/python-modules/numpy/2.nix @@ -59,7 +59,7 @@ let in buildPythonPackage rec { pname = "numpy"; - version = "2.3.1"; + version = "2.3.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -67,7 +67,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-HsmuIKQibaN0NizKPGLNdT+vL5UUQLDjuY6TwjVEHSs="; + hash = "sha256-4EhqEewwzey1PxhNSW0caiB4bIHlXkFkAnATAFb47kg="; }; patches = lib.optionals python.hasDistutilsCxxPatch [ diff --git a/pkgs/development/python-modules/nvdlib/default.nix b/pkgs/development/python-modules/nvdlib/default.nix index f9c669ca73d89..b775e05126e6d 100644 --- a/pkgs/development/python-modules/nvdlib/default.nix +++ b/pkgs/development/python-modules/nvdlib/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "nvdlib"; - version = "0.8.0"; + version = "0.8.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Vehemont"; repo = "nvdlib"; tag = "v${version}"; - hash = "sha256-fj7tgTv3r++oo+45QFQy/rmXYdKyKhR74maHOdp+0yA="; + hash = "sha256-8Tg9JN63+zGRUppIXBQ46mKeDq+nLNQvAjtCwcTuC1g="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix index 9fd14254fd49a..c34c9ccfc667d 100644 --- a/pkgs/development/python-modules/oauthlib/default.nix +++ b/pkgs/development/python-modules/oauthlib/default.nix @@ -7,8 +7,6 @@ mock, pyjwt, pytestCheckHook, - pythonAtLeast, - pythonOlder, setuptools, # for passthru.tests @@ -20,16 +18,14 @@ buildPythonPackage rec { pname = "oauthlib"; - version = "3.2.2"; + version = "3.3.1"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "oauthlib"; repo = "oauthlib"; - rev = "v${version}"; - hash = "sha256-KADS1pEaLYi86LEt2VVuz8FVTBANzxC8EeQLgGMxuBU="; + tag = "v${version}"; + hash = "sha256-ZTmR+pTNQaRQMnUA+8hXM5VACRd8Hn62KTNooy5FQyk="; }; nativeBuildInputs = [ setuptools ]; @@ -50,11 +46,8 @@ buildPythonPackage rec { ++ lib.flatten (lib.attrValues optional-dependencies); disabledTests = [ - # https://github.com/oauthlib/oauthlib/issues/877 - "test_rsa_bad_keys" - ] - ++ lib.optionals (pythonAtLeast "3.13") [ - "test_filter_params" + # too narrow time comparison issues + "test_fetch_access_token" ]; pythonImportsCheck = [ "oauthlib" ]; @@ -69,7 +62,7 @@ buildPythonPackage rec { }; meta = with lib; { - changelog = "https://github.com/oauthlib/oauthlib/blob/${src.rev}/CHANGELOG.rst"; + changelog = "https://github.com/oauthlib/oauthlib/blob/${src.tag}/CHANGELOG.rst"; description = "Generic, spec-compliant, thorough implementation of the OAuth request-signing logic"; homepage = "https://github.com/oauthlib/oauthlib"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/odc-stac/default.nix b/pkgs/development/python-modules/odc-stac/default.nix index d077e9c37db5d..00ec04b1f6748 100644 --- a/pkgs/development/python-modules/odc-stac/default.nix +++ b/pkgs/development/python-modules/odc-stac/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "odc-stac"; - version = "0.4.0rc2"; + version = "0.4.0"; pyproject = true; src = fetchFromGitHub { owner = "opendatacube"; repo = "odc-stac"; tag = "v${version}"; - hash = "sha256-I25qAJEryYaYO7KIVIoTlgzLS6PWkNG6b4NFyhghyKQ="; + hash = "sha256-Ekyavcin13B4DAxv0/XG5QTBuLE7PRospAXe40fHeX0="; }; build-system = [ @@ -88,7 +88,7 @@ buildPythonPackage rec { meta = { description = "Load STAC items into xarray Datasets"; homepage = "https://github.com/opendatacube/odc-stac/"; - changelog = "https://github.com/opendatacube/odc-stac/tag/v${version}"; + changelog = "https://github.com/opendatacube/odc-stac/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ daspk04 ]; }; diff --git a/pkgs/development/python-modules/oelint-data/default.nix b/pkgs/development/python-modules/oelint-data/default.nix index 9ef22aaebe2b7..12aed15167c03 100644 --- a/pkgs/development/python-modules/oelint-data/default.nix +++ b/pkgs/development/python-modules/oelint-data/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "oelint-data"; - version = "1.0.24"; + version = "1.0.25"; pyproject = true; src = fetchFromGitHub { owner = "priv-kweihmann"; repo = "oelint-data"; tag = version; - hash = "sha256-vKXRlqpFxdmq+UOGCm59LVwjLW8h1N/fQr4kx1eW8ys="; + hash = "sha256-obX8grYYSa9H/UoSBQon44Of4Eh4BtqJrfwZbaqh6IU="; }; build-system = [ diff --git a/pkgs/development/python-modules/okonomiyaki/default.nix b/pkgs/development/python-modules/okonomiyaki/default.nix index 5f57b9968304a..812379dda9075 100644 --- a/pkgs/development/python-modules/okonomiyaki/default.nix +++ b/pkgs/development/python-modules/okonomiyaki/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "okonomiyaki"; - version = "2.0.0"; + version = "3.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "enthought"; repo = "okonomiyaki"; tag = version; - hash = "sha256-JQZhw0H4iSdxoyS6ODICJz1vAZsOISQitX7wTgSS1xc="; + hash = "sha256-xAF9Tdr+IM3lU+mcNcAWATJLZOVvbx0llqznqHLVqDc="; }; postPatch = '' @@ -79,7 +79,7 @@ buildPythonPackage rec { meta = with lib; { description = "Experimental library aimed at consolidating a lot of low-level code used for Enthought's eggs"; homepage = "https://github.com/enthought/okonomiyaki"; - changelog = "https://github.com/enthought/okonomiyaki/releases/tag/${version}"; + changelog = "https://github.com/enthought/okonomiyaki/releases/tag/${src.tag}"; maintainers = with maintainers; [ genericnerdyusername ]; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/omegaconf/default.nix b/pkgs/development/python-modules/omegaconf/default.nix index c21ee73c3e05b..c55f1b4ccd1e4 100644 --- a/pkgs/development/python-modules/omegaconf/default.nix +++ b/pkgs/development/python-modules/omegaconf/default.nix @@ -9,7 +9,7 @@ jre_minimal, pydevd, pytest-mock, - pytestCheckHook, + pytest7CheckHook, pythonAtLeast, pythonOlder, pyyaml, @@ -60,13 +60,14 @@ buildPythonPackage rec { attrs pydevd pytest-mock - pytestCheckHook + pytest7CheckHook ]; pythonImportsCheck = [ "omegaconf" ]; pytestFlags = [ "-Wignore::DeprecationWarning" + "-Wignore::UserWarning" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/onnxconverter-common/default.nix b/pkgs/development/python-modules/onnxconverter-common/default.nix index 075f2bb29ef4c..f1abe38004fd4 100644 --- a/pkgs/development/python-modules/onnxconverter-common/default.nix +++ b/pkgs/development/python-modules/onnxconverter-common/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "onnxconverter-common"; - version = "1.14.0"; + version = "1.15.0"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "onnxconverter-common"; tag = "v${version}"; - hash = "sha256-NbHyjLcr/Gq1zRiJW3ZBpEVQGVQGhp7SmfVd5hBIi2o="; + hash = "sha256-e4rk1qTTSEFu+g/cP+RmMUqxkBQfodIpr2CVK24DPv4="; }; build-system = [ @@ -56,7 +56,7 @@ buildPythonPackage rec { meta = { description = "ONNX Converter and Optimization Tools"; homepage = "https://github.com/microsoft/onnxconverter-common"; - changelog = "https://github.com/microsoft/onnxconverter-common/releases/tag/v${version}"; + changelog = "https://github.com/microsoft/onnxconverter-common/releases/tag/${src.tag}"; license = with lib.licenses; [ mit ]; }; } diff --git a/pkgs/development/python-modules/onnxmltools/default.nix b/pkgs/development/python-modules/onnxmltools/default.nix index 350cea07a6d0b..809ab48115ba0 100644 --- a/pkgs/development/python-modules/onnxmltools/default.nix +++ b/pkgs/development/python-modules/onnxmltools/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "onnxmltools"; - version = "1.13"; + version = "1.14.0"; pyproject = true; src = fetchFromGitHub { owner = "onnx"; repo = "onnxmltools"; - tag = "v${version}"; - hash = "sha256-uNd7N7/FgX8zaJp8ouvftwGqGqas8lZRXFmjpS+t2B4="; + tag = version; + hash = "sha256-CcZlGLX8/ANHnhoOv5s/ybBN74gRH/8eLYJ6q/BJo/4="; }; postPatch = '' @@ -71,7 +71,7 @@ buildPythonPackage rec { meta = { description = "ONNXMLTools enables conversion of models to ONNX"; homepage = "https://github.com/onnx/onnxmltools"; - changelog = "https://github.com/onnx/onnxmltools/blob/v${version}/CHANGELOGS.md"; + changelog = "https://github.com/onnx/onnxmltools/blob/${src.tag}/CHANGELOGS.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ happysalada ]; }; diff --git a/pkgs/development/python-modules/onnxslim/default.nix b/pkgs/development/python-modules/onnxslim/default.nix index 6710f10649900..a2e35dc06d0e0 100644 --- a/pkgs/development/python-modules/onnxslim/default.nix +++ b/pkgs/development/python-modules/onnxslim/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "onnxslim"; - version = "0.1.57"; + version = "0.1.62"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-VI1OaNMHuL2AhYxZ/n5zrwlqnfcCbjY39QXHX8gcdw8="; + hash = "sha256-f9SYFsqIM1h+W62ut3gezrNvv02mMVM/Q9UONJsE2Wg="; }; build-system = [ diff --git a/pkgs/development/python-modules/open-clip-torch/default.nix b/pkgs/development/python-modules/open-clip-torch/default.nix index e35c30030bdab..e3a61f9300f9d 100644 --- a/pkgs/development/python-modules/open-clip-torch/default.nix +++ b/pkgs/development/python-modules/open-clip-torch/default.nix @@ -29,14 +29,14 @@ }: buildPythonPackage rec { pname = "open-clip-torch"; - version = "2.32.0"; + version = "3.0.0"; pyproject = true; src = fetchFromGitHub { owner = "mlfoundations"; repo = "open_clip"; tag = "v${version}"; - hash = "sha256-HXzorEAVPieCHfW3xzXqNTTIzJSbIuaZhcfcp0htdCk="; + hash = "sha256-MMvDg5opsu9ILGHc1rJjWQfTb3T0PZ0i+8GSrQvIu8Y="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index a7b959e2987a2..cd2cc24fb4497 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -126,7 +126,7 @@ buildPythonPackage rec { meta = { description = "Python client library for the OpenAI API"; homepage = "https://github.com/openai/openai-python"; - changelog = "https://github.com/openai/openai-python/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/openai/openai-python/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = [ lib.maintainers.malo ]; mainProgram = "openai"; diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix index 7bb12970bd87f..9e87a51128d18 100644 --- a/pkgs/development/python-modules/openapi-spec-validator/default.nix +++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "openapi-spec-validator"; - version = "0.7.1"; + version = "0.7.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "python-openapi"; repo = "openapi-spec-validator"; tag = version; - hash = "sha256-X0ePdHQeBSWjsCFQgCoNloQZRhKbvPBE43aavBppvmg="; + hash = "sha256-APEx7+vc824DLmdzLvhfFVrcjPxVwwUwxkh19gjXEvc="; }; nativeBuildInputs = [ poetry-core ]; @@ -62,7 +62,7 @@ buildPythonPackage rec { ]; meta = with lib; { - changelog = "https://github.com/p1c2u/openapi-spec-validator/releases/tag/${version}"; + changelog = "https://github.com/p1c2u/openapi-spec-validator/releases/tag/${src.tag}"; description = "Validates OpenAPI Specs against the OpenAPI 2.0 (aka Swagger) and OpenAPI 3.0.0 specification"; mainProgram = "openapi-spec-validator"; homepage = "https://github.com/p1c2u/openapi-spec-validator"; diff --git a/pkgs/development/python-modules/opencensus-ext-azure/default.nix b/pkgs/development/python-modules/opencensus-ext-azure/default.nix index 34db90917e065..63d751a131941 100644 --- a/pkgs/development/python-modules/opencensus-ext-azure/default.nix +++ b/pkgs/development/python-modules/opencensus-ext-azure/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, azure-core, azure-identity, opencensus, @@ -12,14 +12,18 @@ buildPythonPackage rec { pname = "opencensus-ext-azure"; - version = "1.1.14"; + version = "1.1.15"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-ycbrrVQq62GBMyLmJ9WImlY+e4xOAkv1hGnQbbc6sUg="; + src = fetchFromGitHub { + owner = "census-instrumentation"; + repo = "opencensus-python"; + tag = "opencensus-ext-azure@${version}"; + hash = "sha256-fnqflSyNnkEy9XYoirk4iDZI1zYTRMbrYMyQ/4ge3Rs="; }; + sourceRoot = "${src.name}/contrib/opencensus-ext-azure"; + build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index e7c62ed57f021..f973232edbfda 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -6,8 +6,7 @@ lxml, pandas, pillow, - pytest7CheckHook, - pythonAtLeast, + pytestCheckHook, pythonOlder, setuptools, }: @@ -35,7 +34,7 @@ buildPythonPackage rec { lxml pandas pillow - pytest7CheckHook + pytestCheckHook ]; pytestFlags = [ @@ -43,26 +42,8 @@ buildPythonPackage rec { ]; disabledTests = [ - # Tests broken since lxml 2.12; https://foss.heptapod.net/openpyxl/openpyxl/-/issues/2116 - "test_read" - "test_read_comments" - "test_ignore_external_blip" - "test_from_xml" - "test_filenames" - "test_exts" - "test_from_complex" - "test_merge_named_styles" - "test_unprotected_cell" - "test_none_values" - "test_rgb_colors" - "test_named_styles" - "test_read_ole_link" - ] - ++ lib.optionals (pythonAtLeast "3.11") [ - "test_broken_sheet_ref" - "test_name_invalid_index" - "test_defined_names_print_area" - "test_no_styles" + # lxml 6.0 + "test_iterparse" ]; pythonImportsCheck = [ "openpyxl" ]; diff --git a/pkgs/development/python-modules/openstep-plist/default.nix b/pkgs/development/python-modules/openstep-plist/default.nix index eca377b4b7382..7bde570f3d48d 100644 --- a/pkgs/development/python-modules/openstep-plist/default.nix +++ b/pkgs/development/python-modules/openstep-plist/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + fetchpatch, cython, setuptools, setuptools-scm, @@ -25,6 +26,14 @@ buildPythonPackage rec { setuptools-scm ]; + patches = [ + (fetchpatch { + name = "openstep-plist-cpython-3.1-compat.patch"; + url = "https://github.com/fonttools/openstep-plist/commit/5467a2c3bed3004b79c70b5b288f33293c96742b.patch"; + hash = "sha256-dKZgthvPgdnCKA0o70TBtvipwnBr4wcayvK8SFqwrbY="; + }) + ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "openstep_plist" ]; diff --git a/pkgs/development/python-modules/opentypespec/default.nix b/pkgs/development/python-modules/opentypespec/default.nix index 81fc60e5dc55c..8359a2687d5d0 100644 --- a/pkgs/development/python-modules/opentypespec/default.nix +++ b/pkgs/development/python-modules/opentypespec/default.nix @@ -3,16 +3,23 @@ buildPythonPackage, fetchPypi, unittestCheckHook, + setuptools-scm, + setuptools, }: buildPythonPackage rec { pname = "opentypespec"; - version = "1.9.1"; - format = "setuptools"; + version = "1.9.2"; + pyproject = true; + + build-system = [ + setuptools + setuptools-scm + ]; src = fetchPypi { inherit pname version; - hash = "sha256-fOEHmtlCkFhn1jyIA+CsHIfud7x3PPb7UWQsnrVyDqY="; + hash = "sha256-5j89rMDKxGLLoN88/T7+e0xE8/eOmKN3eDpWxekJGiQ="; }; nativeCheckInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index 7b75db2db8f9c..dec90f17bedb7 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -41,6 +41,11 @@ buildPythonPackage rec { python-dotenv ]; + disabledTestPaths = [ + # network access + "tests/test_opower.py" + ]; + pythonImportsCheck = [ "opower" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/optimum/default.nix b/pkgs/development/python-modules/optimum/default.nix index 79959c3a651e9..d63eeb4af122d 100644 --- a/pkgs/development/python-modules/optimum/default.nix +++ b/pkgs/development/python-modules/optimum/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "optimum"; - version = "1.26.1"; + version = "1.27.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "optimum"; tag = "v${version}"; - hash = "sha256-GfUlvz7b0DlqBPibndRzUkszGnbYXg6E8u144ZFAZxA="; + hash = "sha256-ZH7D3dc6f33Jl1JN7BIGUhTXDxOLv0FR9T3c5LMmhiY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/optree/default.nix b/pkgs/development/python-modules/optree/default.nix index f6ef3fd6b63fd..5b7be8f92b5ec 100644 --- a/pkgs/development/python-modules/optree/default.nix +++ b/pkgs/development/python-modules/optree/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "optree"; - version = "0.14.1"; + version = "0.17.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "metaopt"; repo = "optree"; tag = "v${version}"; - hash = "sha256-5PIe/mXPNohwM0oNT/zSPmNUycjXuujtIFCki5t7V1I="; + hash = "sha256-4ZkUdGF+Fauy6KWbyrGQ684Ay5XlFT2S2I9lv/1KeWs="; }; dontUseCmakeConfigure = true; @@ -41,6 +41,10 @@ buildPythonPackage rec { disabledTests = [ # Fails because the 'test_treespec' module can't be found "test_treespec_pickle_missing_registration" + # optree import during tests raises CalledProcessError + "test_warn_deprecated_import" + "test_import_no_warnings" + "test_treespec_construct" ]; pythonImportsCheck = [ "optree" ]; diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index 007b43ef6bfcb..7bc6f58ee0687 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -43,14 +43,14 @@ buildPythonPackage rec { pname = "optuna"; - version = "4.2.1"; + version = "4.4.0"; pyproject = true; src = fetchFromGitHub { owner = "optuna"; repo = "optuna"; tag = "v${version}"; - hash = "sha256-WLrdHrdfCtCZMW2J375N8vmod7FcKCMwQPGKicRA878="; + hash = "sha256-S9F9xni1cnmIbWu5n7BFvUCvQmBP3iBYS1ntg6vQ8ZQ="; }; build-system = [ @@ -143,7 +143,7 @@ buildPythonPackage rec { meta = { description = "Hyperparameter optimization framework"; homepage = "https://optuna.org/"; - changelog = "https://github.com/optuna/optuna/releases/tag/${version}"; + changelog = "https://github.com/optuna/optuna/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ natsukium ]; mainProgram = "optuna"; diff --git a/pkgs/development/python-modules/optype/default.nix b/pkgs/development/python-modules/optype/default.nix index 0b29c8a5fddf9..e810b2744f418 100644 --- a/pkgs/development/python-modules/optype/default.nix +++ b/pkgs/development/python-modules/optype/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "optype"; - version = "0.12.0"; + version = "0.13.1"; pyproject = true; src = fetchFromGitHub { owner = "jorenham"; repo = "optype"; tag = "v${version}"; - hash = "sha256-sDMB9gSYf108Elsqj6Obk+6B4QKiJcStkJndVrIAWQI="; + hash = "sha256-GhG2TR5FJgEXBXLyGTNQKFYtR2iZ0tLgZ9B0YL8SXu8="; }; disabled = pythonOlder "3.11"; diff --git a/pkgs/development/python-modules/oracledb/default.nix b/pkgs/development/python-modules/oracledb/default.nix index 6821701549349..e0ea963e9d4ec 100644 --- a/pkgs/development/python-modules/oracledb/default.nix +++ b/pkgs/development/python-modules/oracledb/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "oracledb"; - version = "3.2.0"; + version = "3.3.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-m/nxyT5TFCsz0cXr9aur7r0gYqAdXq1ou7ZAQ57PIiM="; + hash = "sha256-6DDTVEoVeClryqVMboyK4QpYx9tGfFKMSyetv5yLTLA="; }; build-system = [ diff --git a/pkgs/development/python-modules/orange-canvas-core/default.nix b/pkgs/development/python-modules/orange-canvas-core/default.nix index 354e8e5d4f48e..91ad4e2334c1e 100644 --- a/pkgs/development/python-modules/orange-canvas-core/default.nix +++ b/pkgs/development/python-modules/orange-canvas-core/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "orange-canvas-core"; - version = "0.2.5"; + version = "0.2.6"; pyproject = true; src = fetchFromGitHub { owner = "biolab"; repo = "orange-canvas-core"; tag = version; - hash = "sha256-uh9wNqgLYRcnCSOdpeLx6ZTRC0cpq6lG/sqmrYLR+3g="; + hash = "sha256-cEy9ADU/jZoKmGXVlqwG+qWKZ22STjALgCb1IxAwpO0="; }; build-system = [ setuptools ]; @@ -95,7 +95,7 @@ buildPythonPackage rec { meta = { description = "Orange framework for building graphical user interfaces for editing workflows"; homepage = "https://github.com/biolab/orange-canvas-core"; - changelog = "https://github.com/biolab/orange-canvas-core/releases/tag/${version}"; + changelog = "https://github.com/biolab/orange-canvas-core/releases/tag/${src.tag}"; license = [ lib.licenses.gpl3 ]; maintainers = [ lib.maintainers.lucasew ]; # Segmentation fault during tests diff --git a/pkgs/development/python-modules/orange3/default.nix b/pkgs/development/python-modules/orange3/default.nix index c98128db9d735..30a49b4edc40c 100644 --- a/pkgs/development/python-modules/orange3/default.nix +++ b/pkgs/development/python-modules/orange3/default.nix @@ -58,14 +58,14 @@ let self = buildPythonPackage rec { pname = "orange3"; - version = "3.38.1"; + version = "3.39.0"; pyproject = true; src = fetchFromGitHub { owner = "biolab"; repo = "orange3"; tag = version; - hash = "sha256-bzF2rK8/cKAoe9Wzj+rQJatgBQTP3KVtT6xU+IzKYIY="; + hash = "sha256-P2e3Wq33UXnTmGSxkoW8kYYCBfYBB9Z50v4g7n//Fbw="; }; build-system = [ diff --git a/pkgs/development/python-modules/orderly-set/default.nix b/pkgs/development/python-modules/orderly-set/default.nix index be269ed8c1733..3d7c05c53fb39 100644 --- a/pkgs/development/python-modules/orderly-set/default.nix +++ b/pkgs/development/python-modules/orderly-set/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, # build-system - setuptools, + flit-core, # tests pytestCheckHook, @@ -12,18 +12,18 @@ buildPythonPackage rec { pname = "orderly-set"; - version = "5.4.1"; + version = "5.5.0"; pyproject = true; src = fetchFromGitHub { owner = "seperman"; repo = "orderly-set"; tag = version; - hash = "sha256-0B8qnXU6oET1J933uTVDf2XIHwNzecxQ3FiP7EMnxQc="; + hash = "sha256-xrxH/LB+cyZlVf+sVwOtAf9+DojYPDnudHpqlVuARLg="; }; build-system = [ - setuptools + flit-core ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/orgparse/default.nix b/pkgs/development/python-modules/orgparse/default.nix index 65b99928cd613..025f607958f8b 100644 --- a/pkgs/development/python-modules/orgparse/default.nix +++ b/pkgs/development/python-modules/orgparse/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "orgparse"; - version = "0.4.20231004"; + version = "0.4.20250520"; src = fetchPypi { inherit pname version; - hash = "sha256-pOOK6tq/mYiw9npmrNCCedGCILy8QioSkGDCiQu6kaA="; + hash = "sha256-ZHL9Ft3Ku1I5GFBchlJjq/oFrIC1k+ZooInNopGxot4="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/osxphotos/default.nix b/pkgs/development/python-modules/osxphotos/default.nix index 05c4962bf0593..7c728b002db2b 100644 --- a/pkgs/development/python-modules/osxphotos/default.nix +++ b/pkgs/development/python-modules/osxphotos/default.nix @@ -36,14 +36,14 @@ buildPythonPackage rec { pname = "osxphotos"; - version = "0.69.2"; + version = "0.72.1"; pyproject = true; src = fetchFromGitHub { owner = "RhetTbull"; repo = "osxphotos"; tag = "v${version}"; - hash = "sha256-uVcoGIfxz+jKirnE3giST/v20eA5pq+LHgrsRb5b+Lc="; + hash = "sha256-6BUdF2l/C0Zim7ei/t4DKs4RUIDMWikhZmhattYrXmg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/outlines/default.nix b/pkgs/development/python-modules/outlines/default.nix index f29fdac01667d..6cef333055bd7 100644 --- a/pkgs/development/python-modules/outlines/default.nix +++ b/pkgs/development/python-modules/outlines/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "outlines"; - version = "0.1.13"; + version = "1.2.1"; pyproject = true; src = fetchFromGitHub { owner = "outlines-dev"; repo = "outlines"; tag = version; - hash = "sha256-HuJqLbBHyoyY5ChQQi+9ftvPjLuh63Guk2w6KSZxq6s="; + hash = "sha256-WmkA+plIouEzleo3yoSxfCjK0E3EfMGQIPl20aIKxl8="; }; build-system = [ diff --git a/pkgs/development/python-modules/packageurl-python/default.nix b/pkgs/development/python-modules/packageurl-python/default.nix index c3d4e4e792baa..8d8eb13944557 100644 --- a/pkgs/development/python-modules/packageurl-python/default.nix +++ b/pkgs/development/python-modules/packageurl-python/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "packageurl-python"; - version = "0.16.0"; + version = "0.17.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "packageurl_python"; inherit version; - hash = "sha256-aeO/ijky/pwkAPVqrrn4aRHs7i+TmNvhtY7DQ0C+Nl0="; + hash = "sha256-cZmV8Mf3BokCd7pX7JWvyqlpbINqdnV3ChJ5sBpB974="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 82351f93e3b1c..970a880d0fe6d 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch, pythonOlder, # build-system @@ -64,7 +63,7 @@ let pandas = buildPythonPackage rec { pname = "pandas"; - version = "2.2.3"; + version = "2.3.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -73,17 +72,9 @@ let owner = "pandas-dev"; repo = "pandas"; tag = "v${version}"; - hash = "sha256-6YUROcqOV2P1AbJF9IMBIqTt7/PSTeXDwGgE4uI9GME="; + hash = "sha256-xvdiWjJ5uHfrzXB7c4cYjFjZ6ue5i7qzb4tAEPJMAV0="; }; - patches = [ - (fetchpatch { - name = "musl.patch"; - url = "https://github.com/pandas-dev/pandas/commit/1e487982ff7501f07e2bba7a7d924fb92b3d5c7f.patch"; - hash = "sha256-F1pVce1W951Ea82Ux198e5fBFH6kDOG+EeslDTYbjio="; - }) - ]; - # A NOTE regarding the Numpy version relaxing: Both Numpy versions 1.x & # 2.x are supported. However upstream wants to always build with Numpy 2, # and with it to still be able to run with a Numpy 1 or 2. We insist to @@ -97,12 +88,10 @@ let # that override globally the `numpy` attribute to point to `numpy_1`. postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "numpy>=2.0" numpy \ - --replace-fail "meson-python==0.13.1" "meson-python>=0.13.1" \ - --replace-fail "meson==1.2.1" "meson>=1.2.1" + --replace-fail "numpy>=2.0" numpy ''; - nativeBuildInputs = [ + build-system = [ cython meson-python meson @@ -115,7 +104,7 @@ let enableParallelBuilding = true; - propagatedBuildInputs = [ + dependencies = [ numpy python-dateutil pytz diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index 5269e2bf612e9..85779346c836c 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "panel"; - version = "1.7.2"; + version = "1.7.5"; format = "wheel"; @@ -25,7 +25,7 @@ buildPythonPackage rec { # tries to fetch even more artifacts src = fetchPypi { inherit pname version format; - hash = "sha256-5gFBqEupP+v/W+tWe+x9wScejTJcvaplXtt1Gidoazo="; + hash = "sha256-HDtKM11W1aoM9dbhw2hKKX4kpiz5k0XF6euFUoN7l8M="; dist = "py3"; python = "py3"; }; diff --git a/pkgs/development/python-modules/panphon/default.nix b/pkgs/development/python-modules/panphon/default.nix index 230c7a310ba86..183d440da9deb 100644 --- a/pkgs/development/python-modules/panphon/default.nix +++ b/pkgs/development/python-modules/panphon/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "panphon"; - version = "0.22.0"; + version = "0.22.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-iSdCZjzeZhxsrkaRYHpg60evmo9g09a9Fwr0I5WWd1A="; + hash = "sha256-OD1HfVh/66HKWoKHjiT+d8FkXW++ngHJ6X1JjYopujU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix index 9ece875296c3f..5e6bb7b713277 100644 --- a/pkgs/development/python-modules/papermill/default.nix +++ b/pkgs/development/python-modules/papermill/default.nix @@ -95,6 +95,9 @@ buildPythonPackage rec { disabledTests = [ # pytest 8 compat "test_read_with_valid_file_extension" + + # azure datalake api compat issue + "test_create_adapter" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # might fail due to the sandbox diff --git a/pkgs/development/python-modules/parameterized/default.nix b/pkgs/development/python-modules/parameterized/default.nix index 643bab1e58dcc..0e14c59f6f2ee 100644 --- a/pkgs/development/python-modules/parameterized/default.nix +++ b/pkgs/development/python-modules/parameterized/default.nix @@ -40,6 +40,9 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; + # 'yield' keyword is allowed in fixtures, but not in tests (test_naked_function) + doCheck = false; + checkInputs = [ mock pytestCheckHook diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index c779ec730b495..7cb53debdf754 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -3,7 +3,6 @@ bcrypt, buildPythonPackage, cryptography, - fetchpatch, fetchPypi, gssapi, icecream, @@ -18,23 +17,14 @@ buildPythonPackage rec { pname = "paramiko"; - version = "3.5.1"; + version = "4.0.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ssZlvEWyshW9fX8DmQGxSwZ9oA86EeZkCZX9WPJmSCI="; + hash = "sha256-aiXwezgMycmojSuSCtNxZ6xGZ/jZiGzOvY+Q9lS11p8="; }; - patches = [ - # Fix usage of dsa keys - # https://github.com/paramiko/paramiko/pull/1606/ - (fetchpatch { - url = "https://github.com/paramiko/paramiko/commit/18e38b99f515056071fb27b9c1a4f472005c324a.patch"; - hash = "sha256-bPDghPeLo3NiOg+JwD5CJRRLv2VEqmSx1rOF2Tf8ZDA="; - }) - ]; - build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix index ae7eb8b7a79e1..5674b4ceb3f1a 100644 --- a/pkgs/development/python-modules/paste/default.nix +++ b/pkgs/development/python-modules/paste/default.nix @@ -40,6 +40,11 @@ buildPythonPackage rec { touch tests/urlparser_data/secured.txt ''; + disabledTests = [ + # pkg_resources deprecation warning + "test_form" + ]; + pythonNamespaces = [ "paste" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/path/default.nix b/pkgs/development/python-modules/path/default.nix index 1f7c3361eb3a4..1fa86795c4afb 100644 --- a/pkgs/development/python-modules/path/default.nix +++ b/pkgs/development/python-modules/path/default.nix @@ -11,16 +11,20 @@ buildPythonPackage rec { pname = "path"; - version = "17.1.0"; + version = "17.1.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1B4F7U+h1PbXAt88HgoaJV17VEKHQyRWRV3HxR5fmOk="; + hash = "sha256-Lfy/7ItNlg80acUqzxMxE8KovxKse5jWKfqRr4ckjUI="; }; + postPatch = '' + sed -i "/coherent\.licensed/d" pyproject.toml + ''; + nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/pdoc3/default.nix b/pkgs/development/python-modules/pdoc3/default.nix index 4aa77c4f2f1f1..99e6a481e26eb 100644 --- a/pkgs/development/python-modules/pdoc3/default.nix +++ b/pkgs/development/python-modules/pdoc3/default.nix @@ -2,29 +2,30 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, mako, markdown, - setuptools-git, setuptools-scm, unittestCheckHook, }: buildPythonPackage rec { pname = "pdoc3"; - version = "0.11.1"; + version = "0.11.6"; pyproject = true; - disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "pdoc3"; repo = "pdoc"; tag = version; - hash = "sha256-Opj1fU1eZvqsYJGCBliVwugxFV4H1hzOOTkjs4fOEWA="; + hash = "sha256-I8EPsjwA9dHOLvM2Oa4dbtB0N4dVczeGfzk+BVyfBcQ="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "'setuptools_git'," "" + ''; + build-system = [ - setuptools-git setuptools-scm ]; @@ -38,7 +39,7 @@ buildPythonPackage rec { nativeCheckInputs = [ unittestCheckHook ]; meta = { - changelog = "https://github.com/pdoc3/pdoc/blob/${src.rev}/CHANGELOG"; + changelog = "https://github.com/pdoc3/pdoc/blob/${src.tag}/CHANGELOG"; description = "Auto-generate API documentation for Python projects"; homepage = "https://pdoc3.github.io/pdoc/"; license = lib.licenses.agpl3Plus; diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index 0d9e1f6740720..ae485714ade83 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.18.1"; + version = "3.18.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "coleifer"; repo = "peewee"; tag = version; - hash = "sha256-7MLDhMiW9LaedPMQ2QqSqos4SegzUmTX1joyV18MkEg="; + hash = "sha256-BIOY3vAHzSonxXYFmfFbVxbbUWnUVtcBRsTVMRo7peE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/peft/default.nix b/pkgs/development/python-modules/peft/default.nix index e77696cae0dfc..e29a2eee51fcd 100644 --- a/pkgs/development/python-modules/peft/default.nix +++ b/pkgs/development/python-modules/peft/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "peft"; - version = "0.15.2"; + version = "0.17.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "peft"; tag = "v${version}"; - hash = "sha256-c9oHBQCdJpPAeI7xwePXx75Sp39I8QVjRZSxxSOm2PM="; + hash = "sha256-YkJGVSeeEs+ErOUgRL5OXDUaJDqABjOTicM+1gX+CDM="; }; build-system = [ setuptools ]; @@ -102,6 +102,9 @@ buildPythonPackage rec { "tests/test_tuners_utils.py" "tests/test_vision_models.py" "tests/test_xlora.py" + "tests/test_target_parameters.py" + "tests/test_seq_classifier.py" + "tests/test_low_level_api.py" ]; meta = { diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index 2500db486c60a..094ee63ca9a11 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.31.2"; + version = "1.31.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-HqRs8J2Oygf+fqre/XlR43vuf6vmdd8WTxpXL/swCHY="; + hash = "sha256-5+zOQzmJHyewsi4veeue/kQRi9OEIHNZ/Bg1D3iKzgA="; }; build-system = [ diff --git a/pkgs/development/python-modules/pgmpy/default.nix b/pkgs/development/python-modules/pgmpy/default.nix index 6e9f962c60bd4..80d79d8978f56 100644 --- a/pkgs/development/python-modules/pgmpy/default.nix +++ b/pkgs/development/python-modules/pgmpy/default.nix @@ -27,14 +27,14 @@ }: buildPythonPackage rec { pname = "pgmpy"; - version = "0.1.26"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "pgmpy"; repo = "pgmpy"; tag = "v${version}"; - hash = "sha256-RusVREhEXYaJuQXTaCQ7EJgbo4+wLB3wXXCAc3sBGtU="; + hash = "sha256-WmRtek3lN7vEfXqoaZDiaNjMQ7R2PmJ/OEwxOV7m5sE="; }; dependencies = [ @@ -78,7 +78,7 @@ buildPythonPackage rec { meta = { description = "Python Library for learning (Structure and Parameter), inference (Probabilistic and Causal), and simulations in Bayesian Networks"; homepage = "https://github.com/pgmpy/pgmpy"; - changelog = "https://github.com/pgmpy/pgmpy/releases/tag/v${version}"; + changelog = "https://github.com/pgmpy/pgmpy/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ happysalada ]; }; diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix index 641416809161a..10fe8a87c17c8 100644 --- a/pkgs/development/python-modules/pgspecial/default.nix +++ b/pkgs/development/python-modules/pgspecial/default.nix @@ -4,26 +4,29 @@ click, configobj, fetchPypi, + postgresql, + postgresqlTestHook, psycopg, pytestCheckHook, - pythonOlder, setuptools, + setuptools-scm, sqlparse, }: buildPythonPackage rec { pname = "pgspecial"; - version = "2.1.3"; + version = "2.2.1"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { inherit pname version; - hash = "sha256-bU0jFq/31HlU25nUw5HWwLsmVo68udFR9l2reTi2y+I="; + hash = "sha256-2mx/zHvve7ATLcIEb3TsZROx/m8MgOVSjWMNFLfEhJ0="; }; - build-system = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; dependencies = [ click @@ -34,11 +37,21 @@ buildPythonPackage rec { nativeCheckInputs = [ configobj pytestCheckHook + postgresqlTestHook + postgresql ]; + pytestFlagsArray = [ "-vvv" ]; + + env = { + PGDATABASE = "_test_db"; + PGUSER = "postgres"; + }; + disabledTests = [ - # Test requires a Postgresql server - "test_slash_dp_pattern_schema" + "test_slash_d_view_verbose" + "test_slash_ddp" + "test_slash_ddp_pattern" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/phik/default.nix b/pkgs/development/python-modules/phik/default.nix index 90c5eebb2721a..72e4d48abf2fd 100644 --- a/pkgs/development/python-modules/phik/default.nix +++ b/pkgs/development/python-modules/phik/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "phik"; - version = "0.12.4"; + version = "0.12.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "KaveIO"; repo = "PhiK"; tag = "v${version}"; - hash = "sha256-YsH7vVn6gzejunUjUY/RIcvWtaQ/W1gbciJWKi5LDTk="; + hash = "sha256-/Zzin3IHwlFEDQwKjzTwY4ET2r0k3Ne/2lGzXkur9p8="; }; build-system = [ @@ -67,7 +67,7 @@ buildPythonPackage rec { Pearson’s hypothesis test of independence of two variables. ''; homepage = "https://phik.readthedocs.io/"; - changelog = "https://github.com/KaveIO/PhiK/blob/${version}/CHANGES.rst"; + changelog = "https://github.com/KaveIO/PhiK/blob/${src.tag}/CHANGES.rst"; license = licenses.asl20; maintainers = with maintainers; [ melsigl ]; }; diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index e8b59a1441583..ce2ab2e57b44f 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "9.0.5"; + version = "9.0.10"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cP3haKkt2cc/V4cjWVFRgdbN5ruOfsVmDpTEykVpLFA="; + hash = "sha256-wtFaap0FNLFKd2T1EkatqZVj4mP2W4CwJR0adgrEobo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pillow-avif-plugin/default.nix b/pkgs/development/python-modules/pillow-avif-plugin/default.nix index 3750e1d1dd4c8..4f06ceba1bb5c 100644 --- a/pkgs/development/python-modules/pillow-avif-plugin/default.nix +++ b/pkgs/development/python-modules/pillow-avif-plugin/default.nix @@ -1,25 +1,32 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, libavif, pillow, + pytestCheckHook, }: buildPythonPackage rec { pname = "pillow-avif-plugin"; - version = "1.4.6"; + version = "1.5.2"; pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-hVz1DQP2/Bbh/V42SzzqC3n0v5DTn/ISOWlzXYUeCLo="; + src = fetchFromGitHub { + owner = "fdintino"; + repo = "pillow-avif-plugin"; + tag = "v${version}"; + hash = "sha256-gdDVgVNympxlTzj1VUqO+aU1/xWNjDm97a0biOTlKtA="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; + buildInputs = [ libavif ]; - propagatedBuildInputs = [ pillow ]; + + dependencies = [ pillow ]; + + nativeCheckInputs = [ pytestCheckHook ]; meta = { description = "Pillow plugin that adds support for AVIF files"; diff --git a/pkgs/development/python-modules/pillow-heif/default.nix b/pkgs/development/python-modules/pillow-heif/default.nix index 55114a3c6672e..69826e90b6830 100644 --- a/pkgs/development/python-modules/pillow-heif/default.nix +++ b/pkgs/development/python-modules/pillow-heif/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "pillow-heif"; - version = "0.22.0"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "bigcat88"; repo = "pillow_heif"; tag = "v${version}"; - hash = "sha256-xof6lFb0DhmWVmYuBNslcGZs82NRkcgZgt+SX9gsrBY="; + hash = "sha256-CY//orCEKBfgHF7lTTSMenDsvf9NOQo8iiQS3p9NMH8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index 050c403b763a5..153192fb6dbff 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -74,7 +74,7 @@ buildPythonPackage rec { pypaBuildFlags = [ # Disable platform guessing, which tries various FHS paths - "--config=setting=--disable-platform-guessing" + "--config-setting=--disable-platform-guessing" ]; preConfigure = diff --git a/pkgs/development/python-modules/pinecone-client/default.nix b/pkgs/development/python-modules/pinecone-client/default.nix index eff92a25eec1c..a1aee13ecc505 100644 --- a/pkgs/development/python-modules/pinecone-client/default.nix +++ b/pkgs/development/python-modules/pinecone-client/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pinecone-client"; - version = "5.4.2"; + version = "7.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "pinecone-io"; repo = "pinecone-python-client"; tag = "v${version}"; - hash = "sha256-5BCjqcJ+xCTTF/Q+PrgNV4Y/GcT2cfNqvY1ydUL6EZ8="; + hash = "sha256-PT8Jr3sq5iZ9VFt6H6t4lLk72FXnHdyPUbcNGftg4QU="; }; build-system = [ @@ -56,7 +56,7 @@ buildPythonPackage rec { meta = { description = "Pinecone python client"; homepage = "https://www.pinecone.io/"; - changelog = "https://github.com/pinecone-io/pinecone-python-client/releases/tag/v${version}"; + changelog = "https://github.com/pinecone-io/pinecone-python-client/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ happysalada ]; }; diff --git a/pkgs/development/python-modules/pins/default.nix b/pkgs/development/python-modules/pins/default.nix index e30b2f326a3ed..1a2d5b2a05ff5 100644 --- a/pkgs/development/python-modules/pins/default.nix +++ b/pkgs/development/python-modules/pins/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "pins"; - version = "0.8.7"; + version = "0.9.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "rstudio"; repo = "pins-python"; tag = "v${version}"; - hash = "sha256-79TVAfr872Twc7D2iej51jiKNwZ9ESOa66ItNDmyfFM="; + hash = "sha256-1NoJ2PA0ov9ZOWaZdlajV23UqTelRzfW7jESMsfOxkg="; }; build-system = [ @@ -89,7 +89,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to publishes data, models and other Python objects"; homepage = "https://github.com/rstudio/pins-python"; - changelog = "https://github.com/rstudio/pins-python/releases/tag/v${version}"; + changelog = "https://github.com/rstudio/pins-python/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pip-system-certs/default.nix b/pkgs/development/python-modules/pip-system-certs/default.nix index 0476aed562123..3503ba4d84050 100644 --- a/pkgs/development/python-modules/pip-system-certs/default.nix +++ b/pkgs/development/python-modules/pip-system-certs/default.nix @@ -3,29 +3,27 @@ buildPythonPackage, fetchPypi, setuptools-scm, - wheel, git-versioner, - wrapt, + pip, }: buildPythonPackage rec { pname = "pip-system-certs"; - version = "4.0"; + version = "5.2"; pyproject = true; src = fetchPypi { inherit version; pname = "pip_system_certs"; - hash = "sha256-245qMTiNl5XskTmVffGon6UnT7ZhZEVv0JGl0+lMNQw="; + hash = "sha256-gLd2tc8XGRv5nTE2mbf84v24Tre7siX9E0EJqCcGQG8="; }; - nativeBuildInputs = [ + build-system = [ setuptools-scm - wheel git-versioner ]; - propagatedBuildInputs = [ wrapt ]; + dependencies = [ pip ]; pythonImportsCheck = [ "pip_system_certs.wrapt_requests" diff --git a/pkgs/development/python-modules/piqp/default.nix b/pkgs/development/python-modules/piqp/default.nix index 15b609181960e..63c7bd058b37d 100644 --- a/pkgs/development/python-modules/piqp/default.nix +++ b/pkgs/development/python-modules/piqp/default.nix @@ -20,7 +20,7 @@ }: buildPythonPackage rec { pname = "piqp"; - version = "0.4.2"; + version = "0.6.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "PREDICT-EPFL"; repo = "piqp"; tag = "v${version}"; - hash = "sha256-/lADjg4NyDdV9yeYBW2gbPydY8TfV247B/dI/ViRVlI="; + hash = "sha256-hVUeDV2GrBAOIgaWhg+RV+8CFRIm8Kv6/wCs5bXs2aY="; }; postPatch = diff --git a/pkgs/development/python-modules/pixel-font-builder/default.nix b/pkgs/development/python-modules/pixel-font-builder/default.nix index 0dd26012e434b..66ef417e6b5d7 100644 --- a/pkgs/development/python-modules/pixel-font-builder/default.nix +++ b/pkgs/development/python-modules/pixel-font-builder/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pixel-font-builder"; - version = "0.0.34"; + version = "0.0.37"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pixel_font_builder"; inherit version; - hash = "sha256-+t1N2GlIyPr7OHppP3h0TDQNYhrQCrBHc8fGyYq2AiM="; + hash = "sha256-qlF+dp2umL3H7l/9R5kbpFLOsaZnl5V2WjLaeXMzGls="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pkg-about/default.nix b/pkgs/development/python-modules/pkg-about/default.nix index 58d217546d345..f357ec7d67324 100644 --- a/pkgs/development/python-modules/pkg-about/default.nix +++ b/pkgs/development/python-modules/pkg-about/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pkg-about"; - version = "1.2.11"; + version = "1.3.7"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pkg_about"; inherit version; - hash = "sha256-fm/b4Vm7YGTq+BXVltwRz42qXYULXL9KBCINB8mMuWI="; + hash = "sha256-xYGDHXLRWxqA7dxs4hhh+qsEcdNwSh1jvAhpyUdbJOg="; }; # tox is listed in build requirements but not actually used to build diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index a89e5305117cd..bd8e3cd62ccaf 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.29.1"; + version = "1.31.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; tag = "v${version}"; - hash = "sha256-n2lVP+oThZ2hRVOadudaaNFU2KI14rrkG7ipJ0vrj20="; + hash = "sha256-+yVAqDbPuul9pZaEiABFVEmWbfq89SyCULHYRWpXKNc="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index e5a62637975ab..0d9a5c4ecdee2 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, pythonOlder, build, - git, + gitMinimal, pytest-cov-stub, pytest-mock, pytestCheckHook, @@ -31,7 +31,7 @@ buildPythonPackage rec { nativeCheckInputs = [ build - git + gitMinimal pytest-mock pytest-cov-stub pytestCheckHook diff --git a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix index fe2bec35dc909..c5910a0d79dd1 100644 --- a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix +++ b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "poetry-dynamic-versioning"; - version = "1.7.0"; + version = "1.9.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mtkennerly"; repo = "poetry-dynamic-versioning"; tag = "v${version}"; - hash = "sha256-V5UuODRwm829c1KPdQm9oqeN6YdcCo1ODDsEHbm4e/Y="; + hash = "sha256-SKVx20RrwhCpdDIc2Pu1oFaXWe2d2GnbJGUX7KqMvo0="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pook/default.nix b/pkgs/development/python-modules/pook/default.nix index 66d6e2da8db8e..ba904883f8806 100644 --- a/pkgs/development/python-modules/pook/default.nix +++ b/pkgs/development/python-modules/pook/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + falcon, fetchFromGitHub, furl, hatchling, @@ -9,33 +10,31 @@ pytest-httpbin, pytest-pook, pytestCheckHook, - pythonOlder, xmltodict, }: buildPythonPackage rec { pname = "pook"; - version = "2.1.3"; + version = "2.1.4"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "h2non"; repo = "pook"; tag = "v${version}"; - hash = "sha256-DDHaKsye28gxyorILulrLRBy/B9zV673jeVZ85uPZAo="; + hash = "sha256-z0QaMdsX2xLXICgQwnlUD2KsgCn0jB4wO83+6O4B3D8="; }; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ furl jsonschema xmltodict ]; nativeCheckInputs = [ + falcon pytest-asyncio pytest-httpbin pytest-pook @@ -62,8 +61,8 @@ buildPythonPackage rec { meta = with lib; { description = "HTTP traffic mocking and testing"; homepage = "https://github.com/h2non/pook"; - changelog = "https://github.com/h2non/pook/blob/v${version}/History.rst"; - license = with licenses; [ mit ]; + changelog = "https://github.com/h2non/pook/blob/v${src.tag}/History.rst"; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/portalocker/default.nix b/pkgs/development/python-modules/portalocker/default.nix index cb01274dfea16..4c45509dc8de7 100644 --- a/pkgs/development/python-modules/portalocker/default.nix +++ b/pkgs/development/python-modules/portalocker/default.nix @@ -14,19 +14,21 @@ # tests pygments, pytest-cov-stub, + pytest-rerunfailures, + pytest-timeout, pytestCheckHook, }: buildPythonPackage rec { pname = "portalocker"; - version = "3.1.1"; + version = "3.2.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7CD23aKtnOifo5ml8x9PFJX1FZWPDLfKZUPO97tadJ4="; + hash = "sha256-HzAClWpUqMNzBYbFx3vxj65BSeB+rxwp/D+vTVo/iaw="; }; nativeBuildInputs = [ @@ -39,6 +41,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pygments pytest-cov-stub + pytest-rerunfailures + pytest-timeout pytestCheckHook ]; diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index 35bf5d1a8be5d..6411878265e21 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -10,19 +10,23 @@ buildPythonPackage rec { pname = "portend"; - version = "3.2.0"; - format = "pyproject"; + version = "3.2.1"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-UlCjUsGclZ12fKyHi4Kdk+XcdiWlFDOZoqANxmKP+3I="; + hash = "sha256-qp1Aqx+eFL231AH0IhDfNdAXybl5kbrrGFaM7fuMZIk="; }; - nativeBuildInputs = [ setuptools-scm ]; + postPatch = '' + sed -i "/coherent\.licensed/d" pyproject.toml; + ''; - propagatedBuildInputs = [ tempora ]; + build-system = [ setuptools-scm ]; + + dependencies = [ tempora ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/preggy/default.nix b/pkgs/development/python-modules/preggy/default.nix index 4281e6de0edfd..db95ae1278857 100644 --- a/pkgs/development/python-modules/preggy/default.nix +++ b/pkgs/development/python-modules/preggy/default.nix @@ -2,27 +2,30 @@ lib, buildPythonPackage, fetchPypi, + setuptools, six, unidecode, - pytestCheckHook, + pytest8_3CheckHook, }: buildPythonPackage rec { pname = "preggy"; version = "1.4.4"; - format = "setuptools"; - - propagatedBuildInputs = [ - six - unidecode - ]; - nativeCheckInputs = [ pytestCheckHook ]; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "25ba803afde4f35ef543a60915ced2e634926235064df717c3cb3e4e3eb4670c"; }; + build-system = [ setuptools ]; + + dependencies = [ + six + unidecode + ]; + nativeCheckInputs = [ pytest8_3CheckHook ]; + meta = with lib; { description = "Assertion library for Python"; homepage = "http://heynemann.github.io/preggy/"; diff --git a/pkgs/development/python-modules/primer3/default.nix b/pkgs/development/python-modules/primer3/default.nix index 12fe9407cb730..2c93e066ad141 100644 --- a/pkgs/development/python-modules/primer3/default.nix +++ b/pkgs/development/python-modules/primer3/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "primer3"; - version = "2.1.0"; + version = "2.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "libnano"; repo = "primer3-py"; tag = "v${version}"; - hash = "sha256-Kp4JH57gEdj7SzY+7XGBzGloWuTSwUQRBK9QbgXQfUE="; + hash = "sha256-GrVYYjS/+LZScZETfk7YcSy2yrWc3SPumXvyQeEpFUg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/progress/default.nix b/pkgs/development/python-modules/progress/default.nix index 20c2954a10f70..26edbf0a1d586 100644 --- a/pkgs/development/python-modules/progress/default.nix +++ b/pkgs/development/python-modules/progress/default.nix @@ -2,21 +2,26 @@ lib, buildPythonPackage, fetchPypi, + setuptools, python, }: buildPythonPackage rec { - version = "1.6"; - format = "setuptools"; + version = "1.6.1"; pname = "progress"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "c9c86e98b5c03fa1fe11e3b67c1feda4788b8d0fe7336c2ff7d5644ccfba34cd"; + hash = "sha256-wbpxn4Ys6IUjKnWeq0eXH+dN/Hu3arilHvWUC601CGw="; }; + build-system = [ setuptools ]; + checkPhase = '' + runHook preCheck ${python.interpreter} test_progress.py + runHook postCheck ''; meta = with lib; { diff --git a/pkgs/development/python-modules/prometheus-client/default.nix b/pkgs/development/python-modules/prometheus-client/default.nix index 1efd9a4d9a1ce..88e9c6fff24e7 100644 --- a/pkgs/development/python-modules/prometheus-client/default.nix +++ b/pkgs/development/python-modules/prometheus-client/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "prometheus-client"; - version = "0.22.0"; + version = "0.22.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "prometheus"; repo = "client_python"; tag = "v${version}"; - hash = "sha256-JLkDFciDsfjfrA7BiIq3js+UtLRA/lzcdFvqPhUJyB8="; + hash = "sha256-DEuIoVpRDJTd9qXBeHa5jrBscmGgosCKAluqCuUBzuU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/promise/default.nix b/pkgs/development/python-modules/promise/default.nix index ee6df45657a9c..d182becf95be9 100644 --- a/pkgs/development/python-modules/promise/default.nix +++ b/pkgs/development/python-modules/promise/default.nix @@ -46,6 +46,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # Failed: async def functions are not natively supported + "test_issue_9_safe" + ]; + disabledTestPaths = [ "tests/test_benchmark.py" ]; pythonImportsCheck = [ "promise" ]; diff --git a/pkgs/development/python-modules/propcache/default.nix b/pkgs/development/python-modules/propcache/default.nix index 67fbfd5422a25..b07c062c96fb4 100644 --- a/pkgs/development/python-modules/propcache/default.nix +++ b/pkgs/development/python-modules/propcache/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "propcache"; - version = "0.3.1"; + version = "0.3.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "propcache"; tag = "v${version}"; - hash = "sha256-sVZsa6WkG1wUj9G+1vzgT+HT4fWLBqRNmn5nlEj5J0w="; + hash = "sha256-G8SLIZaJUu3uwyFicrQF+PjKp3vsUh/pNUsmDpnnAAg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/protego/default.nix b/pkgs/development/python-modules/protego/default.nix index 5823c42526c0f..372715859af05 100644 --- a/pkgs/development/python-modules/protego/default.nix +++ b/pkgs/development/python-modules/protego/default.nix @@ -2,14 +2,14 @@ lib, buildPythonPackage, fetchFromGitHub, + hatchling, pytestCheckHook, pythonOlder, - setuptools, }: buildPythonPackage rec { pname = "protego"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,10 +18,10 @@ buildPythonPackage rec { owner = "scrapy"; repo = "protego"; tag = version; - hash = "sha256-2vyETqRYeof5CzOCXCGUYb5vSyV/eT5+lm2GNWiuaF0="; + hash = "sha256-70/DPap3FgLfh4ldYSve5Pt8o7gM1lME/OmRFaew/38="; }; - build-system = [ setuptools ]; + build-system = [ hatchling ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/prov/default.nix b/pkgs/development/python-modules/prov/default.nix index f4606cda7f48d..ef7361277d5e7 100644 --- a/pkgs/development/python-modules/prov/default.nix +++ b/pkgs/development/python-modules/prov/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "prov"; - version = "2.0.1"; + version = "2.1.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-DiOMFAXRpVxyvTmzttc9b3q/2dCn+rLsBpOhmimlYX8="; + hash = "sha256-fQErFk9bu0LhGO2dJXiKsBLQkIK3Iryd1OgRownqV/U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/proxy-py/default.nix b/pkgs/development/python-modules/proxy-py/default.nix index fd4779abeab37..7011a191dc070 100644 --- a/pkgs/development/python-modules/proxy-py/default.nix +++ b/pkgs/development/python-modules/proxy-py/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "proxy-py"; - version = "2.4.9"; + version = "2.4.10"; pyproject = true; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "abhinavsingh"; repo = "proxy.py"; tag = "v${version}"; - hash = "sha256-q7GfPVPtlH5XlOFDEHUwLYp5ZSBF4lrZOU2AsktHlcI="; + hash = "sha256-47Qt8J60QFfHUSquD17xMfl+wBTsSimaPSRvS/sSPMI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pscript/default.nix b/pkgs/development/python-modules/pscript/default.nix index 499f479b4d88a..c9673c7eb900a 100644 --- a/pkgs/development/python-modules/pscript/default.nix +++ b/pkgs/development/python-modules/pscript/default.nix @@ -2,15 +2,15 @@ lib, buildPythonPackage, fetchFromGitHub, + flit-core, pytestCheckHook, nodejs, pythonOlder, - setuptools, }: buildPythonPackage rec { pname = "pscript"; - version = "0.7.7"; + version = "0.8.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,10 +19,10 @@ buildPythonPackage rec { owner = "flexxui"; repo = "pscript"; tag = "v${version}"; - hash = "sha256-AhVI+7FiWyH+DfAXnau4aAHJAJtsWEpmnU90ey2z35o="; + hash = "sha256-pqjig3dFJ4zfpor6TT6fiBMS7lAtJE/bAYbzl46W/YY="; }; - build-system = [ setuptools ]; + build-system = [ flit-core ]; nativeCheckInputs = [ pytestCheckHook @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python to JavaScript compiler"; homepage = "https://pscript.readthedocs.io"; - changelog = "https://github.com/flexxui/pscript/blob/v${version}/docs/releasenotes.rst"; + changelog = "https://github.com/flexxui/pscript/blob/${src.tag}/docs/releasenotes.rst"; license = licenses.bsd2; maintainers = with maintainers; [ matthiasbeyer ]; }; diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index d1812889b6632..d50a40738b060 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, fetchFromGitHub, fetchurl, - pythonOlder, replaceVars, # build @@ -69,6 +68,9 @@ let # move into source root after patching postPatch = '' cd psycopg_c + + substituteInPlace pyproject.toml \ + --replace-fail "Cython >= 3.0.0, < 3.1.0" "Cython" ''; nativeBuildInputs = [ @@ -116,9 +118,7 @@ in buildPythonPackage rec { inherit pname version src; - format = "pyproject"; - - disabled = pythonOlder "3.7"; + pyproject = true; outputs = [ "out" @@ -143,15 +143,15 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - furo setuptools - shapely ] # building the docs fails with the following error when cross compiling # AttributeError: module 'psycopg_c.pq' has no attribute '__impl__' ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ + furo sphinx-autodoc-typehints sphinxHook + shapely ]; propagatedBuildInputs = [ @@ -209,9 +209,6 @@ buildPythonPackage rec { # Mypy typing test "tests/test_typing.py" "tests/crdb/test_typing.py" - # https://github.com/psycopg/psycopg/pull/915 - "tests/test_notify.py" - "tests/test_notify_async.py" ]; pytestFlags = [ diff --git a/pkgs/development/python-modules/psygnal/default.nix b/pkgs/development/python-modules/psygnal/default.nix index f5fe9fff8ded9..40191587278b2 100644 --- a/pkgs/development/python-modules/psygnal/default.nix +++ b/pkgs/development/python-modules/psygnal/default.nix @@ -7,6 +7,7 @@ mypy-extensions, numpy, pydantic, + pytest-asyncio, pytestCheckHook, pythonOlder, toolz, @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "psygnal"; - version = "0.13.0"; + version = "0.14.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "pyapp-kit"; repo = "psygnal"; tag = "v${version}"; - hash = "sha256-ZEN8S2sI1usXl5A1Ow1+l4BBB6qNnlVt/nvFtAX4maY="; + hash = "sha256-RQ53elonwvna5UDVell3JI1dcZSMHREyB51r+ddsW2M="; }; build-system = [ @@ -42,6 +43,7 @@ buildPythonPackage rec { nativeCheckInputs = [ numpy pydantic + pytest-asyncio pytestCheckHook toolz wrapt diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix index 3ec9a6f76d763..2d6a19ca74efc 100644 --- a/pkgs/development/python-modules/ptpython/default.nix +++ b/pkgs/development/python-modules/ptpython/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ptpython"; - version = "3.0.29"; + version = "3.0.30"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-udYlGDrvk6Zz/DLL4cH8r1FBLnpPGVkFIc2syt8lGG4="; + hash = "sha256-UaB/m46/hDWlqusigxzKSlLocCl3GiY33ydjx509h3Y="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index 30983db1986bc..5d4928938c261 100644 --- a/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independent of pulumi's. - version = "6.66.3"; + version = "7.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-aws"; tag = "v${version}"; - hash = "sha256-BPL4B0KwXQld+/aPTJKhsFMPEbJByccTj+Zs70b8O6A="; + hash = "sha256-fYcApSVMBSlw9YMf1J5PRma8GXPCGKDpnPd1BXJh5EE="; }; sourceRoot = "${src.name}/sdk/python"; diff --git a/pkgs/development/python-modules/puremagic/default.nix b/pkgs/development/python-modules/puremagic/default.nix index accf500a91fa2..51cdabd8e0d6a 100644 --- a/pkgs/development/python-modules/puremagic/default.nix +++ b/pkgs/development/python-modules/puremagic/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "puremagic"; - version = "1.28"; + version = "1.30"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "cdgriffith"; repo = "puremagic"; tag = version; - hash = "sha256-a7jRQUSbH3E6eJiXNKr4ikdSXRZ6+/csl/EMiKXMzmk="; + hash = "sha256-k2xrcML8XxI9cMTQTv0pDLkOrmEr5mbDnVsyWuD1rEc="; }; build-system = [ setuptools ]; @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Implementation of magic file detection"; homepage = "https://github.com/cdgriffith/puremagic"; - changelog = "https://github.com/cdgriffith/puremagic/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/cdgriffith/puremagic/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ globin ]; }; diff --git a/pkgs/development/python-modules/py-ccm15/default.nix b/pkgs/development/python-modules/py-ccm15/default.nix index aa4ccf9928e2e..14008ca3f28dd 100644 --- a/pkgs/development/python-modules/py-ccm15/default.nix +++ b/pkgs/development/python-modules/py-ccm15/default.nix @@ -9,9 +9,9 @@ aiohttp, }: -buildPythonPackage { +buildPythonPackage rec { pname = "py-ccm15"; - version = "0.0.9"; + version = "0.1.2"; pyproject = true; src = fetchFromGitHub { @@ -20,8 +20,8 @@ buildPythonPackage { # Upstream does not have a tag for this release and this is the exact release commit # Therefore it should not be marked unstable # upstream issue: https://github.com/ocalvo/py-ccm15/issues/10 - rev = "3891d840e69d241c85bf9486e7fe0bb3c7443980"; - hash = "sha256-I2/AdG07PAvuC8rQKOIAUk7u3pJpANMaFpvEsejWeBU="; + tag = "v${version}"; + hash = "sha256-QfitJzCFk0gnlcCvvKzuI4fS1lVm79q4xaDZFKKt458="; }; build-system = [ setuptools ]; @@ -34,9 +34,15 @@ buildPythonPackage { nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = [ + # tests use outdated function signature + "test_async_set_state" + ]; + pythonImportsCheck = [ "ccm15" ]; meta = { + changelog = "https://github.com/ocalvo/py-ccm15/releases/tag/${src.tag}"; description = "Python Library to access a Midea CCM15 data converter"; homepage = "https://github.com/ocalvo/py-ccm15"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/py-multiaddr/default.nix b/pkgs/development/python-modules/py-multiaddr/default.nix index 49ba5ea550916..92bc2ac0987dd 100644 --- a/pkgs/development/python-modules/py-multiaddr/default.nix +++ b/pkgs/development/python-modules/py-multiaddr/default.nix @@ -14,15 +14,15 @@ buildPythonPackage rec { pname = "py-multiaddr"; - version = "0.0.9"; + version = "0.0.10"; format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "multiformats"; repo = "py-multiaddr"; - rev = "v${version}"; - hash = "sha256-cGM7iYQPP+UOkbTxRhzuED0pkcydFCO8vpx9wTc0/HI="; + tag = "v${version}"; + hash = "sha256-N46D2H3RG6rtdBrSyDjh8UxD+Ph/FXEa4FcEI2uz4y8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/py-serializable/default.nix b/pkgs/development/python-modules/py-serializable/default.nix index 6cbf0a63200dd..7b48a7c049509 100644 --- a/pkgs/development/python-modules/py-serializable/default.nix +++ b/pkgs/development/python-modules/py-serializable/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "py-serializable"; - version = "1.1.2"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "madpah"; repo = "serializable"; tag = "v${version}"; - hash = "sha256-2A+QjokZ7gtgstclZ7PFSPymYjQYKsLVXy9xbFOfxLo="; + hash = "sha256-nou1/80t9d2iKOdZZbcN4SI3dlvuC8T55KMCP/cDEEU="; }; build-system = [ poetry-core ]; @@ -36,7 +36,7 @@ buildPythonPackage rec { xmldiff ]; - pythonImportsCheck = [ "serializable" ]; + pythonImportsCheck = [ "py_serializable" ]; disabledTests = [ # AssertionError: 'The Phoenix @@ -47,7 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to aid with serialisation and deserialisation to/from JSON and XML"; homepage = "https://github.com/madpah/serializable"; - changelog = "https://github.com/madpah/serializable/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/madpah/serializable/blob/${src.tag}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/py7zr/default.nix b/pkgs/development/python-modules/py7zr/default.nix index 9e986b4cae525..0a96e999ec497 100644 --- a/pkgs/development/python-modules/py7zr/default.nix +++ b/pkgs/development/python-modules/py7zr/default.nix @@ -15,31 +15,25 @@ texttable, py-cpuinfo, pytest-benchmark, + pytest-httpserver, pytest-remotedata, pytest-timeout, pytestCheckHook, + requests, }: buildPythonPackage rec { pname = "py7zr"; - version = "0.22.0"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "miurahr"; repo = "py7zr"; tag = "v${version}"; - hash = "sha256-YR2cuHZWwqrytidAMbNvRV1/N4UZG8AMMmzcTcG9FvY="; + hash = "sha256-uV4zBQZlHfHgM/NiVSjI5I9wJRk9i4ihJn4B2R6XRuM="; }; - postPatch = - # Replace inaccessible mirror (qt.mirrors.tds.net): - # upstream PR: https://github.com/miurahr/py7zr/pull/637 - '' - substituteInPlace tests/test_concurrent.py \ - --replace-fail 'http://qt.mirrors.tds.net/qt/' 'https://download.qt.io/' - ''; - build-system = [ setuptools setuptools-scm @@ -60,9 +54,11 @@ buildPythonPackage rec { nativeCheckInputs = [ py-cpuinfo pytest-benchmark + pytest-httpserver pytest-remotedata pytest-timeout pytestCheckHook + requests ]; pytestFlags = [ "--benchmark-disable" ]; diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 550809f9150d7..ee3cc7a354e85 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pytelegrambotapi"; - version = "4.27.0"; + version = "4.28.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "eternnoir"; repo = "pyTelegramBotAPI"; tag = version; - hash = "sha256-UozVUdqNxxwWTBoq7ekr8ZX5KdkvQj+SiNSwebVXblI="; + hash = "sha256-T6OzlL+IzQr38sjE8DhVO3NN3apgHzJQjGx3No8kRNA="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix index e7902b1d72a44..7088ee5ae36b1 100644 --- a/pkgs/development/python-modules/pyaml/default.nix +++ b/pkgs/development/python-modules/pyaml/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pyaml"; - version = "25.5.0"; + version = "25.7.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-V5lWDHscna81p6RTX1PiwwMj90y9fLTy5xWxbdaBpYo="; + hash = "sha256-4ROmTsFogb8rCS4r64S33PG9mAlq0X9fFOj7eCp12Zs="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyaprilaire/default.nix b/pkgs/development/python-modules/pyaprilaire/default.nix index 40f41216094f9..b28342011276c 100644 --- a/pkgs/development/python-modules/pyaprilaire/default.nix +++ b/pkgs/development/python-modules/pyaprilaire/default.nix @@ -5,7 +5,7 @@ pytestCheckHook, crc, setuptools, - pytest-asyncio, + pytest-asyncio_0, }: buildPythonPackage rec { @@ -28,7 +28,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-asyncio + pytest-asyncio_0 ]; meta = { diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index 767b8c5eb0674..c3266fffe3a4f 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -13,7 +13,7 @@ pydantic, pyfakefs, pytest-aiohttp, - pytest-asyncio, + pytest-asyncio_0, pytest-httpserver, pytest-timeout, pytestCheckHook, @@ -79,8 +79,8 @@ buildPythonPackage rec { nativeCheckInputs = [ deepdiff pyfakefs - pytest-aiohttp - pytest-asyncio + (pytest-aiohttp.override { pytest-asyncio = pytest-asyncio_0; }) + pytest-asyncio_0 pytest-httpserver pytest-timeout pytestCheckHook diff --git a/pkgs/development/python-modules/pybalboa/default.nix b/pkgs/development/python-modules/pybalboa/default.nix index e001868096906..5ad085c449755 100644 --- a/pkgs/development/python-modules/pybalboa/default.nix +++ b/pkgs/development/python-modules/pybalboa/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, poetry-core, poetry-dynamic-versioning, - pytest-asyncio, + pytest-asyncio_0, pytestCheckHook, }: @@ -27,10 +27,15 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytest-asyncio + pytest-asyncio_0 pytestCheckHook ]; + disabledTests = [ + # async def functions are not natively supported. + "test_cancel_task" + ]; + pythonImportsCheck = [ "pybalboa" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pyblu/default.nix b/pkgs/development/python-modules/pyblu/default.nix index 5ba66443feda2..5dd61924f9e5a 100644 --- a/pkgs/development/python-modules/pyblu/default.nix +++ b/pkgs/development/python-modules/pyblu/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/LouisChrist/pyblu/releases/tag/v${version}"; + changelog = "https://github.com/LouisChrist/pyblu/releases/tag/${src.tag}"; description = "BluOS API client"; homepage = "https://github.com/LouisChrist/pyblu"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index 883a879d3b1f4..e3ee49b201133 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pycairo"; - version = "1.27.0"; + version = "1.28.0"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "pygobject"; repo = "pycairo"; tag = "v${version}"; - hash = "sha256-P9AC8+WlokAxoy6KTJqAz7kOYK/FQVjIKWuj8jQw2OA="; + hash = "sha256-OAF1Yv9aoUctklGzH2xM+cVu5csyEnX2AV9n0OeoFUw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 56c3b6184b93e..93ea352b2be7a 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -25,7 +25,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools>=65.6,<78.0" setuptools + --replace-fail "setuptools>=65.6,<78.0" setuptools \ + --replace-fail "wheel>=0.37.1,<0.46.0" wheel ''; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pycocotools/default.nix b/pkgs/development/python-modules/pycocotools/default.nix index 304b04df00beb..c5bfa9e4d0a09 100644 --- a/pkgs/development/python-modules/pycocotools/default.nix +++ b/pkgs/development/python-modules/pycocotools/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pycocotools"; - version = "2.0.9"; + version = "2.0.10"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-uoLlUGcKoRgqkR+z5fDoM0VDIERDhwe9UsJRnNoWhyo="; + hash = "sha256-ekdgnN78leXhUTE8fZOmHPBuFdQse6mbYB47wPns4uE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pycomposefile/default.nix b/pkgs/development/python-modules/pycomposefile/default.nix index b907155a4195d..f82c86315f93e 100644 --- a/pkgs/development/python-modules/pycomposefile/default.nix +++ b/pkgs/development/python-modules/pycomposefile/default.nix @@ -2,24 +2,21 @@ lib, buildPythonPackage, fetchPypi, + flit-core, pyyaml, - pythonOlder, - setuptools, }: buildPythonPackage rec { pname = "pycomposefile"; - version = "0.0.32"; + version = "0.0.34"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchPypi { inherit pname version; - hash = "sha256-o1XVFcTE/5LuWhZZDeizZ6O+SCcEZZLQhw+MtqxKbjQ="; + hash = "sha256-kzqTtDn4aSiCtNUP90ThKj2ZYEAGjpZlGjfdhCEmpQg="; }; - build-system = [ setuptools ]; + build-system = [ flit-core ]; dependencies = [ pyyaml ]; diff --git a/pkgs/development/python-modules/pycrdt-websocket/default.nix b/pkgs/development/python-modules/pycrdt-websocket/default.nix index 7a3a2362de002..573c4917bbc54 100644 --- a/pkgs/development/python-modules/pycrdt-websocket/default.nix +++ b/pkgs/development/python-modules/pycrdt-websocket/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "pycrdt-websocket"; - version = "0.15.5"; + version = "0.16.0"; pyproject = true; src = fetchFromGitHub { owner = "jupyter-server"; repo = "pycrdt-websocket"; - tag = "v${version}"; - hash = "sha256-piNd85X5YsTAOC9frYQRDyb/DPfzZicIPJ+bEVzgOsU="; + tag = version; + hash = "sha256-Qux8IxJR1nGbdpGz7RZBKJjYN0qfwfEpd2UDlduOna0="; }; build-system = [ hatchling ]; @@ -77,7 +77,7 @@ buildPythonPackage rec { meta = { description = "WebSocket Connector for pycrdt"; homepage = "https://github.com/jupyter-server/pycrdt-websocket"; - changelog = "https://github.com/jupyter-server/pycrdt-websocket/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/jupyter-server/pycrdt-websocket/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; teams = [ lib.teams.jupyter ]; }; diff --git a/pkgs/development/python-modules/pydaikin/default.nix b/pkgs/development/python-modules/pydaikin/default.nix index 877da83d4cba3..66342b59f2053 100644 --- a/pkgs/development/python-modules/pydaikin/default.nix +++ b/pkgs/development/python-modules/pydaikin/default.nix @@ -46,6 +46,12 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # Failed: async def functions are not natively supported. + "test_power_sensors" + "test_device_factory" + ]; + pythonImportsCheck = [ "pydaikin" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pydal/default.nix b/pkgs/development/python-modules/pydal/default.nix index ab696abe6d182..eb890f9ea3917 100644 --- a/pkgs/development/python-modules/pydal/default.nix +++ b/pkgs/development/python-modules/pydal/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pydal"; - version = "20250607.2"; + version = "20250629.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Zr1d6kCwAyhjeV2tQ+n9y9x80yD/Atb6TJq7AnRz+PQ="; + hash = "sha256-P65iULncYasN7ahwD75czGlwum+N4D1Y0WCd6XpBXSk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pydmd/default.nix b/pkgs/development/python-modules/pydmd/default.nix index b5041e8e73fff..d05de4c779973 100644 --- a/pkgs/development/python-modules/pydmd/default.nix +++ b/pkgs/development/python-modules/pydmd/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "pydmd"; - version = "2025.06.01"; + version = "2025.08.01"; pyproject = true; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pydot/default.nix b/pkgs/development/python-modules/pydot/default.nix index eb16cd4481dda..d71957a1a9895 100644 --- a/pkgs/development/python-modules/pydot/default.nix +++ b/pkgs/development/python-modules/pydot/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pydot"; - version = "4.0.0"; + version = "4.0.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-EvFkkzN8reL3YxuHyMzSmbouJR8+5dBzKgWN8oh6/pc="; + hash = "sha256-whSPaBxKM+CL8OJqnl+OQJmoLg4qBoCY8yzoZXc2StU="; }; build-system = [ diff --git a/pkgs/development/python-modules/pyee/default.nix b/pkgs/development/python-modules/pyee/default.nix index a0942645a94b3..34144038080bd 100644 --- a/pkgs/development/python-modules/pyee/default.nix +++ b/pkgs/development/python-modules/pyee/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchPypi, mock, - pytest-asyncio, + pytest-asyncio_0, pytest-trio, pytestCheckHook, pythonOlder, @@ -36,7 +36,7 @@ buildPythonPackage rec { nativeCheckInputs = [ mock - pytest-asyncio + pytest-asyncio_0 pytest-trio pytestCheckHook twisted diff --git a/pkgs/development/python-modules/pyephember2/default.nix b/pkgs/development/python-modules/pyephember2/default.nix index 35af2f5e8da18..fd4ee04d2abd0 100644 --- a/pkgs/development/python-modules/pyephember2/default.nix +++ b/pkgs/development/python-modules/pyephember2/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyephember2"; - version = "0.4.12"; + version = "2"; pyproject = true; src = fetchFromGitHub { owner = "roberty99"; repo = "pyephember2"; - tag = version; - hash = "sha256-R63Ts+1620QQOFF8o2/6CFNZi5jAeWTQkElgqZhNA7c="; + tag = "Release${version}"; + hash = "sha256-BxDXjrXPx6UNWo7mGLzbIGtenE0B10x39iCUCzGFAr0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyexcel-xls/default.nix b/pkgs/development/python-modules/pyexcel-xls/default.nix index 81bcc8ade7724..eede60aa59a92 100644 --- a/pkgs/development/python-modules/pyexcel-xls/default.nix +++ b/pkgs/development/python-modules/pyexcel-xls/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pyexcel-xls"; - version = "0.7.0"; + version = "0.7.1"; pyproject = true; src = fetchFromGitHub { owner = "pyexcel"; repo = "pyexcel-xls"; - rev = "v${version}"; - hash = "sha256-wxsx/LfeBxi+NnHxfxk3svzsBcdwOiLQ1660eoHfmLg="; + tag = "v${version}"; + hash = "sha256-+iwdMSGUsUbWFO4s4+3Zf+47J9bzFffWthZoeThT8f0="; }; patches = [ diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index 99379e07d034e..82b7874d26671 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pyfakefs"; - version = "5.8.0"; + version = "5.9.2"; pyproject = true; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-flRX7jzGcGnTzvbieCJ+z8gL+2HpJbwKTTsK8y0cmc4="; + hash = "sha256-ZsXGzNQJe0hPh4L5pQeP7gUz1GXg2cr1lMkVfVQ4JVM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyftdi/default.nix b/pkgs/development/python-modules/pyftdi/default.nix index c95c9fea7ffb5..b775d1b21eade 100644 --- a/pkgs/development/python-modules/pyftdi/default.nix +++ b/pkgs/development/python-modules/pyftdi/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyftdi"; - version = "0.57.1"; + version = "0.56.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "eblot"; repo = "pyftdi"; tag = "v${version}"; - hash = "sha256-RkZXcGvCZXmFrLvj7YqHc6FeZskEqMSQcYgizBSuwIk="; + hash = "sha256-/MwgBqwN7xmZepdJzyRhZflbCUpGdWEbEGGKkBnKTFI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pygelf/default.nix b/pkgs/development/python-modules/pygelf/default.nix index d2e5f6f62f7aa..6b31df89924c5 100644 --- a/pkgs/development/python-modules/pygelf/default.nix +++ b/pkgs/development/python-modules/pygelf/default.nix @@ -9,13 +9,13 @@ }: buildPythonPackage rec { pname = "pygelf"; - version = "0.4.2"; + version = "0.4.3"; pyproject = true; src = fetchPypi { pname = "pygelf"; inherit version; - hash = "sha256-0LuPRf9kipoYdxP0oFwJ9oX8uK3XsEu3Rx8gBxvRGq0="; + hash = "sha256-jtlyVjvjyPFoSD8B2/UitrxpeVnJej9IgTJLP3ljiRE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pygeocodio/default.nix b/pkgs/development/python-modules/pygeocodio/default.nix index 6f23fa579352c..cf06e8687ca9f 100644 --- a/pkgs/development/python-modules/pygeocodio/default.nix +++ b/pkgs/development/python-modules/pygeocodio/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pygeocodio"; - version = "1.4.0"; + version = "2.0.1"; pyproject = true; src = fetchFromGitHub { owner = "bennylope"; repo = "pygeocodio"; tag = "v${version}"; - hash = "sha256-s6sY+iHuWv7+6ydxDWoN9eKiAXw0jeASWiMtz12TTHo="; + hash = "sha256-4jT/PX+jvJx81eaSXTsb/vLNbv4dNNVgeYrE7QwGlL8="; }; build-system = [ @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = { description = "Python wrapper for the Geocodio geolocation service API"; downloadPage = "https://github.com/bennylope/pygeocodio/tree/master"; - changelog = "https://github.com/bennylope/pygeocodio/blob/v${version}/HISTORY.rst"; + changelog = "https://github.com/bennylope/pygeocodio/blob/${src.tag}/HISTORY.rst"; homepage = "https://www.geocod.io/docs/#introduction"; license = with lib.licenses; [ bsd3 ]; maintainers = with lib.maintainers; [ ethancedwards8 ]; diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 3e62e5dd42f74..efee1979e1a32 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.18.0"; + version = "1.18.1"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-+9AdBKTSziiaqgLPhYBDZ5vw3R+YVca4jtlTgsH1ARo="; + hash = "sha256-hOBvw3CLjTvu787GN/Ydh96zgnLnSH6hxSkXQYT/9sQ="; }; preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/development/python-modules/pygitguardian/default.nix b/pkgs/development/python-modules/pygitguardian/default.nix index 323aa1d69b07f..c759e67bbf07c 100644 --- a/pkgs/development/python-modules/pygitguardian/default.nix +++ b/pkgs/development/python-modules/pygitguardian/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pygitguardian"; - version = "1.23.0"; + version = "1.24.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "GitGuardian"; repo = "py-gitguardian"; tag = "v${version}"; - hash = "sha256-vpz7HBxRu1srqe+EBnjwNJ7xJ1TMrOIXBulPjDTTk3k="; + hash = "sha256-9Zk2XpMS8WhCOGYwtUgsjWKbUhmtKOgVWyqskLJ8DOw="; }; pythonRelaxDeps = [ @@ -56,7 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to access the GitGuardian API"; homepage = "https://github.com/GitGuardian/py-gitguardian"; - changelog = "https://github.com/GitGuardian/py-gitguardian/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/GitGuardian/py-gitguardian/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pygithub/default.nix b/pkgs/development/python-modules/pygithub/default.nix index 86cc0e4366601..38777b3b88ba0 100644 --- a/pkgs/development/python-modules/pygithub/default.nix +++ b/pkgs/development/python-modules/pygithub/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pygithub"; - version = "2.6.1"; + version = "2.7.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "PyGithub"; repo = "PyGithub"; tag = "v${version}"; - hash = "sha256-CfAgN5vxHbVyDSeP0KR1QFnL6gDQsd46Q0zosr0ALqM="; + hash = "sha256-meWuetrgE2ks3BEQedrvrfYEVAJsFGgYO6GXPRUcJv4="; }; build-system = [ diff --git a/pkgs/development/python-modules/pyglm/default.nix b/pkgs/development/python-modules/pyglm/default.nix index 6dd07457ebd26..41d7277b1ac27 100644 --- a/pkgs/development/python-modules/pyglm/default.nix +++ b/pkgs/development/python-modules/pyglm/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyglm"; - version = "2.7.3"; + version = "2.8.2"; pyproject = true; src = fetchFromGitHub { owner = "Zuzu-Typ"; repo = "PyGLM"; tag = version; - hash = "sha256-5NXueFZ4+hIP1xd30Dt7sv/oxEqh6ejJoJtQv2rpGyQ="; + hash = "sha256-oLPZ6sCIAt12iolcSBNXEjbHGE4ou+dgoFhB400pyRk="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/pygments/default.nix b/pkgs/development/python-modules/pygments/default.nix index 7b9829c0a8ee9..7966f6ebd742d 100644 --- a/pkgs/development/python-modules/pygments/default.nix +++ b/pkgs/development/python-modules/pygments/default.nix @@ -15,14 +15,12 @@ let pygments = buildPythonPackage rec { pname = "pygments"; - version = "2.19.1"; + version = "2.19.2"; pyproject = true; - disabled = pythonOlder "3.8"; # 2.18.0 requirement - src = fetchPypi { inherit pname version; - hash = "sha256-YcFtKoV23AZJ2fOeCJtfArzSf7oQ2PtNzCgXP3pFFR8="; + hash = "sha256-Y2yyR3zsf4lSU2lwvFM7xDdDVC9wOSrgJjdGAK3VuIc="; }; nativeBuildInputs = [ hatchling ]; @@ -54,7 +52,10 @@ let description = "Generic syntax highlighter"; mainProgram = "pygmentize"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ sigmanificient ]; + maintainers = with lib.maintainers; [ + sigmanificient + ryand56 + ]; }; }; in diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix index a6cd5f14e724f..8b6b6e68627c7 100644 --- a/pkgs/development/python-modules/pyhomematic/default.nix +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -1,31 +1,32 @@ { lib, buildPythonPackage, - setuptools, + isPy3k, fetchPypi, - unittestCheckHook, + python, }: buildPythonPackage rec { pname = "pyhomematic"; version = "0.1.78"; - pyproject = true; + format = "setuptools"; + + disabled = !isPy3k; src = fetchPypi { inherit pname version; hash = "sha256-uB9aDa1urIwL2DBdBwPi0sHWPW7SUZ3EaAjuMLSOudc="; }; - build-system = [ setuptools ]; - - nativeCheckInputs = [ unittestCheckHook ]; + checkPhase = '' + ${python.interpreter} -m unittest + ''; pythonImportsCheck = [ "pyhomematic" ]; meta = with lib; { description = "Python 3 Interface to interact with Homematic devices"; homepage = "https://github.com/danielperna84/pyhomematic"; - changelog = "https://github.com/danielperna84/pyhomematic/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix index 88bd5a77e5259..7276fa1f1b47b 100644 --- a/pkgs/development/python-modules/pyinfra/default.nix +++ b/pkgs/development/python-modules/pyinfra/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pyinfra"; - version = "3.2"; + version = "3.4.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "Fizzadar"; repo = "pyinfra"; tag = "v${version}"; - hash = "sha256-l0RD4lOLjzM9Ydf7vJr+PXpUGsVdAZN/dTUFJ3fo078="; + hash = "sha256-7bNkDm5SyIgVkrGQ95/q7AiY/JnxtWx+jkDO/rJQ2WQ="; }; build-system = [ setuptools ]; @@ -66,7 +66,7 @@ buildPythonPackage rec { ''; homepage = "https://pyinfra.com"; downloadPage = "https://pyinfra.com/Fizzadar/pyinfra/releases"; - changelog = "https://github.com/Fizzadar/pyinfra/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/Fizzadar/pyinfra/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ totoroot ]; mainProgram = "pyinfra"; diff --git a/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix b/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix index 4747662e6dcf1..fefa0bc3cdf54 100644 --- a/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix +++ b/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyinstaller-hooks-contrib"; - version = "2025.5"; + version = "2025.8"; pyproject = true; src = fetchPypi { pname = "pyinstaller_hooks_contrib"; inherit version; - hash = "sha256-cHOGdwuP4GbASq0YpxvEg8eyXhi0dQp1aZn32iqzGYI="; + hash = "sha256-NAKtQd/ptREK8TRCLjf8XUIbo0LGy5gL1nyzC3QVZBw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyinstaller-versionfile/default.nix b/pkgs/development/python-modules/pyinstaller-versionfile/default.nix index 9659cd9bae807..2962ea7b30048 100644 --- a/pkgs/development/python-modules/pyinstaller-versionfile/default.nix +++ b/pkgs/development/python-modules/pyinstaller-versionfile/default.nix @@ -9,15 +9,15 @@ buildPythonPackage rec { pname = "pyinstaller-versionfile"; - version = "2.1.1"; + version = "3.0.1"; format = "setuptools"; src = fetchFromGitHub { owner = "DudeNr33"; repo = "pyinstaller-versionfile"; - rev = "v${version}"; - hash = "sha256-lz1GuiXU+r8sMld5SsG3qS+FOsWfbvkQmO2bxAR3XcY="; + tag = "v${version}"; + hash = "sha256-UNrXP5strO6LIkIM3etBo1+Vm+1lR5wF0VfKtZYRoYc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyinstaller/default.nix b/pkgs/development/python-modules/pyinstaller/default.nix index 207e4deae50ed..b80a5945fbc82 100644 --- a/pkgs/development/python-modules/pyinstaller/default.nix +++ b/pkgs/development/python-modules/pyinstaller/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "pyinstaller"; - version = "6.14.2"; + version = "6.15.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-FCzOBxnnkxXwzCZADC5cRdm2sX5+BJH+5ESp+PFvSRc="; + hash = "sha256-pI/EZE7kqiqio157UfSW+PvX7s9qIVBka78WE60HvC0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pykaleidescape/default.nix b/pkgs/development/python-modules/pykaleidescape/default.nix index e461e8e661675..64b495fe92f8b 100644 --- a/pkgs/development/python-modules/pykaleidescape/default.nix +++ b/pkgs/development/python-modules/pykaleidescape/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, dnspython, fetchFromGitHub, - pytest-asyncio, + pytest-asyncio_0, pytestCheckHook, pythonAtLeast, pythonOlder, @@ -33,7 +33,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytest-asyncio + pytest-asyncio_0 pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pykcs11/default.nix b/pkgs/development/python-modules/pykcs11/default.nix index fe3cd809bcca9..7edb41e9dcabd 100644 --- a/pkgs/development/python-modules/pykcs11/default.nix +++ b/pkgs/development/python-modules/pykcs11/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pykcs11"; - version = "1.5.17"; + version = "1.5.18"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-e2Z+lZ+gtq0HULA+IIGgWcvppieJdmFD5Q+QmIoziZQ="; + hash = "sha256-Ev2HizaYIdgMG+ihQMheig+xNY/Kq6ZspmhpITaS8ic="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pykdtree/default.nix b/pkgs/development/python-modules/pykdtree/default.nix index a1958b26bb2f5..1e311b580ebf3 100644 --- a/pkgs/development/python-modules/pykdtree/default.nix +++ b/pkgs/development/python-modules/pykdtree/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "pykdtree"; - version = "1.4.1"; + version = "1.4.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-EISP9qxzMraOZb+MLolme2tisHWq0nI0d0Smm/HIrX4="; + hash = "sha256-vSuWehalUQ76hz7lLZWdDYITicx0m7UWc65oMW7rZfU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pykka/default.nix b/pkgs/development/python-modules/pykka/default.nix index 209624aa801f6..de877d4e3442b 100644 --- a/pkgs/development/python-modules/pykka/default.nix +++ b/pkgs/development/python-modules/pykka/default.nix @@ -3,30 +3,25 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - poetry-core, + hatchling, pydantic, pytestCheckHook, pytest-mock, - typing-extensions, }: buildPythonPackage rec { pname = "pykka"; - version = "4.1.1"; - format = "pyproject"; - - disabled = pythonOlder "3.8"; + version = "4.2.0"; + pyproject = true; src = fetchFromGitHub { owner = "jodal"; repo = "pykka"; tag = "v${version}"; - hash = "sha256-n9TgXcmUEIQdqtrY+9T+EtPys+7OzXCemRwNPj1xPDw="; + hash = "sha256-cxW6xKG0x7pPXvCanh0ZNMYRSdnCf8JrnJbjYgDUQSI="; }; - build-system = [ poetry-core ]; - - dependencies = lib.optionals (pythonOlder "3.10") [ typing-extensions ]; + build-system = [ hatchling ]; nativeCheckInputs = [ pydantic diff --git a/pkgs/development/python-modules/pylink-square/default.nix b/pkgs/development/python-modules/pylink-square/default.nix index b23aca51e5298..d2e365e86b507 100644 --- a/pkgs/development/python-modules/pylink-square/default.nix +++ b/pkgs/development/python-modules/pylink-square/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pylink-square"; - version = "1.4.0"; + version = "1.6.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "square"; repo = "pylink"; tag = "v${version}"; - hash = "sha256-Fjulh2wmcVO+/608uTO10orRz8Pq0I+ZhJ8zMa3YFC0="; + hash = "sha256-rkkdnpkl9UHcBDjp6lsFXR1zNn7tH1KeTQ7wV+yJ3m0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index ce570a8572655..4f747ea9a321a 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pymongo"; - version = "4.13.0"; + version = "4.13.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "pymongo"; - hash = "sha256-kqBuNwnjx+UIINNS09TmABVAa8ummAiTfawqbSIib94="; + hash = "sha256-D2TGRpwjYpYubOlyWK4Tkau6FWapU6SSVi0pJLRIFcI="; }; build-system = [ diff --git a/pkgs/development/python-modules/pymoo/default.nix b/pkgs/development/python-modules/pymoo/default.nix index 82d137ae4592b..350e7b5144d34 100644 --- a/pkgs/development/python-modules/pymoo/default.nix +++ b/pkgs/development/python-modules/pymoo/default.nix @@ -29,20 +29,20 @@ let pymoo_data = fetchFromGitHub { owner = "anyoptimization"; repo = "pymoo-data"; - rev = "33f61a78182ceb211b95381dd6d3edee0d2fc0f3"; + tag = "33f61a78182ceb211b95381dd6d3edee0d2fc0f3"; hash = "sha256-iGWPepZw3kJzw5HKV09CvemVvkvFQ38GVP+BAryBSs0="; }; in buildPythonPackage rec { pname = "pymoo"; - version = "0.6.1.3"; + version = "0.6.1.5"; pyproject = true; src = fetchFromGitHub { owner = "anyoptimization"; repo = "pymoo"; tag = version; - hash = "sha256-CbeJwv51lu4cABgGieqy/8DCDJCb8wOPPVqUHk8Jb7E="; + hash = "sha256-IRNYluK6fO1cQq0u9dIJYnI5HWqtTPLXARXNoHa4F0I="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pymssql/default.nix b/pkgs/development/python-modules/pymssql/default.nix index 25e904ea24907..959d7b69e6dac 100644 --- a/pkgs/development/python-modules/pymssql/default.nix +++ b/pkgs/development/python-modules/pymssql/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "pymssql"; - version = "2.3.4"; + version = "2.3.7"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-EXyC16qQIRcaqb6YNoR1UZ8z2cMgc83Pmw12Ixq8ZDY="; + hash = "sha256-Xm15x7HOxArr7EsJnG5EXMqsJFGeXnZ7SaTm9IwIflA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pymunk/default.nix b/pkgs/development/python-modules/pymunk/default.nix index d69adbdf3c635..bc25bb966d193 100644 --- a/pkgs/development/python-modules/pymunk/default.nix +++ b/pkgs/development/python-modules/pymunk/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pymunk"; - version = "7.0.1"; + version = "7.1.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-lqOOgSP02J+IILQ2QPH2I9aETx+X7qCcRmDwMXgKn/g="; + hash = "sha256-8wRYlyYTJbs+iShEAt1DuQjQpYcdwgEFl+NrQwnwIps="; }; nativeBuildInputs = [ cffi ]; diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index 9cd4b74ee0edb..15a7a69ba9478 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - fetchpatch, python, toPythonModule, @@ -46,7 +45,7 @@ let in buildPythonPackage rec { pname = "pymupdf"; - version = "1.26.1"; + version = "1.26.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -55,7 +54,7 @@ buildPythonPackage rec { owner = "pymupdf"; repo = "PyMuPDF"; tag = version; - hash = "sha256-Z+TO4MaLFmgNSRMTltY77bHnA5RHc4Ii45sDjJsFZto="; + hash = "sha256-djTbALLvdX2jOTGgoyUIBhiqJ6KzM+Dkb4M7d2eVoPM="; }; # swig is not wrapped as Python package @@ -127,6 +126,11 @@ buildPythonPackage rec { "test_open2" ]; + disabledTestPaths = [ + # mad about markdown table formatting + "tests/test_tables.py::test_markdown" + ]; + pythonImportsCheck = [ "pymupdf" "fitz" diff --git a/pkgs/development/python-modules/pymupdf4llm/default.nix b/pkgs/development/python-modules/pymupdf4llm/default.nix index c2fc51f7be96e..d1eb118e26b76 100644 --- a/pkgs/development/python-modules/pymupdf4llm/default.nix +++ b/pkgs/development/python-modules/pymupdf4llm/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pymupdf4llm"; - version = "0.0.25"; + version = "0.0.27"; pyproject = true; src = fetchFromGitHub { owner = "pymupdf"; repo = "RAG"; tag = "v${version}"; - hash = "sha256-20upIcCoUB8zjW/qBvA3kFxJ6jcdXV3ohkurMmnlMkc="; + hash = "sha256-rezdDsjNCDetvrX3uvykYuL/y40MZnr0fFMvQY3JRr0="; }; sourceRoot = "${src.name}/pymupdf4llm"; diff --git a/pkgs/development/python-modules/pynamecheap/default.nix b/pkgs/development/python-modules/pynamecheap/default.nix index 4ab6da4a25a91..658ff62a5d266 100644 --- a/pkgs/development/python-modules/pynamecheap/default.nix +++ b/pkgs/development/python-modules/pynamecheap/default.nix @@ -3,35 +3,28 @@ buildPythonPackage, fetchFromGitHub, requests, - setuptools, }: buildPythonPackage rec { pname = "pynamecheap"; version = "0.0.3"; - pyproject = true; + format = "setuptools"; - src = fetchFromGitHub { - owner = "Bemmu"; - repo = "PyNamecheap"; - tag = "v${version}"; - hash = "sha256-J2WYWtZGtZiox4q9tdkLyU1nix9Jn64K0+1mw7xoLLw="; - }; - - build-system = [ setuptools ]; - - dependencies = [ requests ]; + propagatedBuildInputs = [ requests ]; # Tests require access to api.sandbox.namecheap.com doCheck = false; - pythonImportsCheck = [ "namecheap" ]; + src = fetchFromGitHub { + owner = "Bemmu"; + repo = "PyNamecheap"; + rev = "v${version}"; + sha256 = "1g1cd2yc6rpdsc5ax7s93y5nfkf91gcvbgcaqyl9ida6srd9hr97"; + }; meta = with lib; { description = "Namecheap API client in Python"; homepage = "https://github.com/Bemmu/PyNamecheap"; - changelog = "https://github.com/Bemmu/PyNamecheap/releases/tag/${src.tag}"; license = licenses.mit; - maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pynamodb/default.nix b/pkgs/development/python-modules/pynamodb/default.nix index c79ffdb9f624e..862971e81f331 100644 --- a/pkgs/development/python-modules/pynamodb/default.nix +++ b/pkgs/development/python-modules/pynamodb/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pynamodb"; - version = "6.0.2"; + version = "6.1.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "pynamodb"; repo = "PynamoDB"; tag = version; - hash = "sha256-i4cO1fzERKHJW2Ym0ogc2YID3IXVpBVDE33UumxvvHE="; + hash = "sha256-i4oxZO3gBVc2PMFSISeytaO8YrzYR9YuUMxrEqrg2c4="; }; build-system = [ setuptools ]; @@ -69,7 +69,7 @@ buildPythonPackage rec { verbose. PynamoDB presents you with a simple, elegant API. ''; homepage = "http://jlafon.io/pynamodb.html"; - changelog = "https://github.com/pynamodb/PynamoDB/releases/tag/${version}"; + changelog = "https://github.com/pynamodb/PynamoDB/releases/tag/${src.tag}"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/pynanoleaf/default.nix b/pkgs/development/python-modules/pynanoleaf/default.nix index 113818784680f..892900c118ba5 100644 --- a/pkgs/development/python-modules/pynanoleaf/default.nix +++ b/pkgs/development/python-modules/pynanoleaf/default.nix @@ -2,23 +2,23 @@ lib, buildPythonPackage, fetchPypi, + isPy3k, requests, - setuptools, }: buildPythonPackage rec { pname = "pynanoleaf"; version = "0.1.1"; - pyproject = true; + format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-MqCDdZxPmeAZ4AE2cEh4Qfjt+AfHoHdCqXH6GHBwcqc="; + sha256 = "32a083759c4f99e019e0013670487841f8edf807c7a07742a971fa18707072a7"; }; - build-system = [ setuptools ]; + disabled = !isPy3k; - dependencies = [ requests ]; + propagatedBuildInputs = [ requests ]; # pynanoleaf does not contain tests doCheck = false; @@ -26,9 +26,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "pynanoleaf" ]; meta = with lib; { - description = "Python3 wrapper for the Nanoleaf API, capable of controlling both Nanoleaf Aurora and Nanoleaf Canvas"; homepage = "https://github.com/Oro/pynanoleaf"; - changelog = "https://github.com/Oro/pynanoleaf/releases/tag/${version}"; + description = "Python3 wrapper for the Nanoleaf API, capable of controlling both Nanoleaf Aurora and Nanoleaf Canvas"; license = licenses.mit; maintainers = with maintainers; [ oro ]; }; diff --git a/pkgs/development/python-modules/pynitrokey/default.nix b/pkgs/development/python-modules/pynitrokey/default.nix index 1586313a88237..187d085943341 100644 --- a/pkgs/development/python-modules/pynitrokey/default.nix +++ b/pkgs/development/python-modules/pynitrokey/default.nix @@ -4,33 +4,27 @@ fetchPypi, installShellFiles, libnitrokey, - flit-core, - certifi, + poetry-core, cffi, click, cryptography, - ecdsa, fido2, + hidapi, intelhex, nkdfu, - python-dateutil, pyusb, requests, tqdm, tlv8, - typing-extensions, - click-aliases, semver, nethsm, - importlib-metadata, nitrokey, pyscard, - asn1crypto, }: let pname = "pynitrokey"; - version = "0.8.5"; + version = "0.10.0"; mainProgram = "nitropy"; in @@ -40,49 +34,42 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-mPhH4IdpKKA9d8sJOGMWpGerzki5qZHFHe4u4ao2RgE="; + hash = "sha256-Kr6VtBADLvXUva7csbsHujGzBfRG1atJLF7qbIWmToM="; }; nativeBuildInputs = [ installShellFiles ]; - build-system = [ flit-core ]; + build-system = [ poetry-core ]; dependencies = [ - certifi cffi click cryptography - ecdsa fido2 + hidapi intelhex nkdfu - python-dateutil + nitrokey pyusb requests tqdm tlv8 - typing-extensions - click-aliases semver nethsm - importlib-metadata - nitrokey - pyscard - asn1crypto ]; - pythonRelaxDeps = true; + optional-dependencies = { + pcsc = [ + pyscard + ]; + }; - # pythonRelaxDepsHook runs in postBuild so cannot be used - pypaBuildFlags = [ "--skip-dependency-check" ]; + pythonRelaxDeps = true; # libnitrokey is not propagated to users of the pynitrokey Python package. # It is only usable from the wrapped bin/nitropy makeWrapperArgs = [ "--set LIBNK_PATH ${lib.makeLibraryPath [ libnitrokey ]}" ]; - # no tests - doCheck = false; - pythonImportsCheck = [ "pynitrokey" ]; postInstall = '' diff --git a/pkgs/development/python-modules/pyocd/default.nix b/pkgs/development/python-modules/pyocd/default.nix index 35d09a9373a02..a6ba9cd6c7451 100644 --- a/pkgs/development/python-modules/pyocd/default.nix +++ b/pkgs/development/python-modules/pyocd/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "pyocd"; - version = "0.36.0"; + version = "0.38.0"; pyproject = true; src = fetchFromGitHub { owner = "pyocd"; repo = "pyOCD"; tag = "v${version}"; - hash = "sha256-CSdVWDiSe+xd0MzD9tsKs3DklNjnhchYFuI3Udi0O20="; + hash = "sha256-4fdVcTNH125e74S3mA/quuDun17ntGCazX6CV+obUGc="; }; patches = [ @@ -81,7 +81,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { - changelog = "https://github.com/pyocd/pyOCD/releases/tag/v${version}"; + changelog = "https://github.com/pyocd/pyOCD/releases/tag/${src.tag}"; description = "Python library for programming and debugging Arm Cortex-M microcontrollers"; downloadPage = "https://github.com/pyocd/pyOCD"; homepage = "https://pyocd.io"; diff --git a/pkgs/development/python-modules/pyogrio/default.nix b/pkgs/development/python-modules/pyogrio/default.nix index 8c3ed073d9f05..330fcd31225ca 100644 --- a/pkgs/development/python-modules/pyogrio/default.nix +++ b/pkgs/development/python-modules/pyogrio/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pyogrio"; - version = "0.11.0"; + version = "0.11.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "geopandas"; repo = "pyogrio"; tag = "v${version}"; - hash = "sha256-3XrP3/sqGRtA+sfaoOV/ByGAtfpGZB5RYRr5lyYZUj0="; + hash = "sha256-F6XfkihN3k2xquYS8jJMlqtLXzaTORaduJ2Q9LhSQGM="; }; postPatch = '' @@ -66,7 +66,7 @@ buildPythonPackage rec { meta = { description = "Vectorized spatial vector file format I/O using GDAL/OGR"; homepage = "https://pyogrio.readthedocs.io/"; - changelog = "https://github.com/geopandas/pyogrio/blob/${src.rev}/CHANGES.md"; + changelog = "https://github.com/geopandas/pyogrio/blob/${src.tag}/CHANGES.md"; license = lib.licenses.mit; teams = [ lib.teams.geospatial ]; }; diff --git a/pkgs/development/python-modules/pypiserver/default.nix b/pkgs/development/python-modules/pypiserver/default.nix index d6bda6918515c..ef39dbe21f803 100644 --- a/pkgs/development/python-modules/pypiserver/default.nix +++ b/pkgs/development/python-modules/pypiserver/default.nix @@ -7,12 +7,10 @@ pip, pytestCheckHook, pythonOlder, - setuptools-git, setuptools, twine, watchdog, webtest, - wheel, build, importlib-resources, }: @@ -31,10 +29,13 @@ buildPythonPackage rec { hash = "sha256-ODwDYAEAqel31+kR/BE1yBfgOZOtPz3iaCLg/d6jbb4="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace-fail '"setuptools-git>=0.3",' "" + ''; + build-system = [ setuptools - setuptools-git - wheel ]; dependencies = [ diff --git a/pkgs/development/python-modules/pyprecice/default.nix b/pkgs/development/python-modules/pyprecice/default.nix index 712476ee14361..01b60f0e6ceb7 100644 --- a/pkgs/development/python-modules/pyprecice/default.nix +++ b/pkgs/development/python-modules/pyprecice/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { meta = { description = "Python language bindings for preCICE"; homepage = "https://github.com/precice/python-bindings"; - changelog = "https://github.com/precice/python-bindings/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/precice/python-bindings/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.lgpl3Only; maintainers = with lib.maintainers; [ Scriptkiddi ]; }; diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix index 577197aa371b0..a991be205b01f 100644 --- a/pkgs/development/python-modules/pyproj/default.nix +++ b/pkgs/development/python-modules/pyproj/default.nix @@ -8,25 +8,26 @@ certifi, cython, - mock, numpy, pandas, proj, + setuptools, shapely, xarray, }: buildPythonPackage rec { pname = "pyproj"; - version = "3.7.1"; - format = "setuptools"; - disabled = pythonOlder "3.9"; + version = "3.7.2"; + pyproject = true; + + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "pyproj4"; repo = "pyproj"; tag = version; - hash = "sha256-tVzifc+Y5u9Try5FHt67rj/+zaok0JNn3M8plMqX90g="; + hash = "sha256-WV344gxcmq08sIUVevn6uD50FSy4JvLt4aret5ZakYQ="; }; # force pyproj to use ${proj} @@ -37,13 +38,16 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ cython ]; + build-system = [ + cython + setuptools + ]; + buildInputs = [ proj ]; - propagatedBuildInputs = [ certifi ]; + dependencies = [ certifi ]; nativeCheckInputs = [ - mock numpy pandas pytestCheckHook @@ -57,7 +61,6 @@ buildPythonPackage rec { ''; disabledTestPaths = [ - "test/test_doctest_wrapper.py" "test/test_datadir.py" ]; @@ -65,25 +68,13 @@ buildPythonPackage rec { # The following tests try to access network and end up with a URLError "test__load_grid_geojson_old_file" "test_get_transform_grid_list" - "test_get_transform_grid_list__area_of_use" - "test_get_transform_grid_list__bbox__antimeridian" - "test_get_transform_grid_list__bbox__out_of_bounds" - "test_get_transform_grid_list__contains" - "test_get_transform_grid_list__file" - "test_get_transform_grid_list__source_id" "test_sync__area_of_use__list" "test_sync__bbox__list" - "test_sync__bbox__list__exclude_world_coverage" "test_sync__download_grids" "test_sync__file__list" "test_sync__source_id__list" "test_sync_download" - "test_sync_download__directory" - "test_sync_download__system_directory" "test_transformer_group__download_grids" - - # proj-data grid required - "test_azimuthal_equidistant" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pyqt-builder/default.nix b/pkgs/development/python-modules/pyqt-builder/default.nix index a256e3faa1467..442339d6e528b 100644 --- a/pkgs/development/python-modules/pyqt-builder/default.nix +++ b/pkgs/development/python-modules/pyqt-builder/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pyqt-builder"; - version = "1.18.1"; + version = "1.18.2"; pyproject = true; src = fetchPypi { pname = "pyqt_builder"; inherit version; - hash = "sha256-P3o6JxWUeik6l1MKdv1Z8TCfy45XpYMPRcef5ySbOZg="; + hash = "sha256-Vt/qRhSEqHqPDIsCKRkN78Q21+xd5xEC4gs15WORgLw="; }; build-system = [ diff --git a/pkgs/development/python-modules/pyqt6-charts/default.nix b/pkgs/development/python-modules/pyqt6-charts/default.nix index b50651cfcc2b4..758ae6e93bfde 100644 --- a/pkgs/development/python-modules/pyqt6-charts/default.nix +++ b/pkgs/development/python-modules/pyqt6-charts/default.nix @@ -13,15 +13,15 @@ buildPythonPackage rec { pname = "pyqt6-charts"; - version = "6.8.0"; + version = "6.9.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { - pname = "PyQt6_Charts"; + pname = "pyqt6_charts"; inherit version; - hash = "sha256-+GcFuHQOMEFmfOIRrqogW3UOtrr0yQj04/bcjHINEPE="; + hash = "sha256-fvvpu35q1PmEUhGg7+D5HKXhT5Ni7RuoTVXyuFFQkfc="; }; # fix include path and increase verbosity diff --git a/pkgs/development/python-modules/pyqt6-webengine/default.nix b/pkgs/development/python-modules/pyqt6-webengine/default.nix index e71d5128184fe..8cafdbf543be8 100644 --- a/pkgs/development/python-modules/pyqt6-webengine/default.nix +++ b/pkgs/development/python-modules/pyqt6-webengine/default.nix @@ -7,7 +7,6 @@ sip, pyqt-builder, qt6Packages, - pythonOlder, pyqt6, python, mesa, @@ -15,15 +14,13 @@ buildPythonPackage rec { pname = "pyqt6-webengine"; - version = "6.8.0"; + version = "6.9.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchPypi { - pname = "PyQt6_WebEngine"; + pname = "pyqt6_webengine"; inherit version; - hash = "sha256-ZARepiK2pBiCwrGPVa6XFLhmCs/walTpEOtygiwvP/I="; + hash = "sha256-auU347vaBrjgZTXkhSKX4Lw7AFQ8R5KVQfzJsRmBqiU="; }; patches = [ diff --git a/pkgs/development/python-modules/pyrainbird/default.nix b/pkgs/development/python-modules/pyrainbird/default.nix index ba3bd8c2eee96..b145c5bd469ea 100644 --- a/pkgs/development/python-modules/pyrainbird/default.nix +++ b/pkgs/development/python-modules/pyrainbird/default.nix @@ -9,7 +9,7 @@ parameterized, pycryptodome, pytest-aiohttp, - pytest-asyncio, + pytest-asyncio_0, pytest-cov-stub, pytest-golden, pytest-mock, @@ -54,8 +54,8 @@ buildPythonPackage rec { nativeCheckInputs = [ freezegun parameterized - pytest-aiohttp - pytest-asyncio + (pytest-aiohttp.override { pytest-asyncio = pytest-asyncio_0; }) + pytest-asyncio_0 pytest-cov-stub pytest-golden pytest-mock diff --git a/pkgs/development/python-modules/pyrate-limiter/default.nix b/pkgs/development/python-modules/pyrate-limiter/default.nix index 45867188d2065..3d15ac47bd262 100644 --- a/pkgs/development/python-modules/pyrate-limiter/default.nix +++ b/pkgs/development/python-modules/pyrate-limiter/default.nix @@ -4,8 +4,6 @@ fetchFromGitHub, filelock, poetry-core, - postgresql, - postgresqlTestHook, psycopg, psycopg-pool, pytestCheckHook, @@ -17,14 +15,14 @@ buildPythonPackage rec { pname = "pyrate-limiter"; - version = "3.7.0"; + version = "3.9.0"; pyproject = true; src = fetchFromGitHub { owner = "vutran1710"; repo = "PyrateLimiter"; tag = "v${version}"; - hash = "sha256-oNwFxH75TJm0iJSbLIO8SlIih72ImlHIhUW7GjOEorw="; + hash = "sha256-CAN3OWxXQaAzrh2q6z0OxPs4i02L/g2ISYFdUMHsHpg="; }; postPatch = '' @@ -51,12 +49,17 @@ buildPythonPackage rec { ] ++ lib.flatten (lib.attrValues optional-dependencies); + disabledTests = [ + # hangs + "test_limiter_01" + ]; + pythonImportsCheck = [ "pyrate_limiter" ]; meta = with lib; { description = "Python Rate-Limiter using Leaky-Bucket Algorimth Family"; homepage = "https://github.com/vutran1710/PyrateLimiter"; - changelog = "https://github.com/vutran1710/PyrateLimiter/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/vutran1710/PyrateLimiter/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ kranzes ]; }; diff --git a/pkgs/development/python-modules/pyrevolve/default.nix b/pkgs/development/python-modules/pyrevolve/default.nix index 0af3e6fe85ec5..ba3b693a4ff86 100644 --- a/pkgs/development/python-modules/pyrevolve/default.nix +++ b/pkgs/development/python-modules/pyrevolve/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyrevolve"; - version = "2.2.4"; + version = "2.2.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "devitocodes"; repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-fcIq/zuKO3W7K9N2E4f2Q6ZVcssZwN/n8o9cCOYmr3E="; + tag = "v${version}"; + hash = "sha256-jjiFOlxXjaa4L4IEtojeeS0jx4GsftAeIGBpJLhUcY4="; }; postPatch = '' @@ -51,7 +51,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/devitocodes/pyrevolve"; - changelog = "https://github.com/devitocodes/pyrevolve/releases/tag/v${version}"; + changelog = "https://github.com/devitocodes/pyrevolve/releases/tag/${src.tag}"; description = "Python library to manage checkpointing for adjoints"; license = licenses.epl10; maintainers = with maintainers; [ atila ]; diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 093185721fb3f..b501bddec5dfb 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Netlink library"; homepage = "https://github.com/svinota/pyroute2"; - changelog = "https://github.com/svinota/pyroute2/blob/${version}/CHANGELOG.rst"; + changelog = "https://github.com/svinota/pyroute2/blob/${src.tag}/CHANGELOG.rst"; license = with licenses; [ asl20 # or gpl2Plus diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index 6440d5839f9ec..7f19bfb0c4c19 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyscard"; - version = "2.2.2"; + version = "2.3.0"; pyproject = true; src = fetchFromGitHub { owner = "LudovicRousseau"; repo = "pyscard"; tag = version; - hash = "sha256-oaKmWLydwfWPnED11dbJKob9vxkl+pgOS0mvhL6XWrM="; + hash = "sha256-rz3m8eVbmJUMcQFuEMZwF3k/ES75KcNA8R+xix+Mgq8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyshp/default.nix b/pkgs/development/python-modules/pyshp/default.nix index 623fbebfb6d77..7811afc42edd2 100644 --- a/pkgs/development/python-modules/pyshp/default.nix +++ b/pkgs/development/python-modules/pyshp/default.nix @@ -2,24 +2,24 @@ lib, buildPythonPackage, fetchFromGitHub, + hatchling, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "pyshp"; - version = "2.4.1"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "3.0.0"; + pyproject = true; src = fetchFromGitHub { owner = "GeospatialPython"; repo = "pyshp"; tag = version; - hash = "sha256-NBZCqCbrCUIowj/EwWfC1vNC1fyNdg7EC06RRi6pul0="; + hash = "sha256-bN6n/cHuhoJPP2N9hcaPY87QgLNDSNdjHkpmyjO/+70="; }; + build-system = [ hatchling ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "shapefile" ]; diff --git a/pkgs/development/python-modules/pysiaalarm/default.nix b/pkgs/development/python-modules/pysiaalarm/default.nix index 2bb3e6611a820..1ec26947d3569 100644 --- a/pkgs/development/python-modules/pysiaalarm/default.nix +++ b/pkgs/development/python-modules/pysiaalarm/default.nix @@ -6,7 +6,7 @@ dataclasses-json, pycryptodome, setuptools-scm, - pytest-asyncio, + pytest-asyncio_0, pytest-cases, pytest-cov-stub, pytestCheckHook, @@ -39,7 +39,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytest-asyncio + pytest-asyncio_0 pytest-cases pytest-cov-stub pytestCheckHook diff --git a/pkgs/development/python-modules/pysnooper/default.nix b/pkgs/development/python-modules/pysnooper/default.nix index f8ce981e1d38f..8f313fa16b814 100644 --- a/pkgs/development/python-modules/pysnooper/default.nix +++ b/pkgs/development/python-modules/pysnooper/default.nix @@ -1,24 +1,25 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pytestCheckHook, - pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "pysnooper"; - version = "1.2.1"; - format = "setuptools"; + version = "1.2.3"; + pyproject = true; - disabled = pythonOlder "3.8"; - - src = fetchPypi { - inherit version; - pname = "PySnooper"; - hash = "sha256-2DLd8myARAqUVrOmZNr/lX9zfnMTxAt2JQ69tczbajE="; + src = fetchFromGitHub { + owner = "cool-RR"; + repo = "PySnooper"; + tag = version; + hash = "sha256-+Cjqi0xkWO4QVAZymmcper4dal9pNWbpPgPY4UzbXfA="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pysnooper" ]; diff --git a/pkgs/development/python-modules/pyssim/default.nix b/pkgs/development/python-modules/pyssim/default.nix index 1d49929d2710f..6c08c68b5278d 100644 --- a/pkgs/development/python-modules/pyssim/default.nix +++ b/pkgs/development/python-modules/pyssim/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyssim"; - version = "0.7"; + version = "0.7.1"; pyproject = true; build-system = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "jterrace"; repo = "pyssim"; tag = "v${version}"; - sha256 = "sha256-LDNIugQeRqNsAZ5ZxS/NxHokEAwefpfRutTRpR0IcXk="; + sha256 = "sha256-6393EATaXg12pYXPaHty+8LepUM6kgtZ0zSjZ1Izytg="; }; patches = [ diff --git a/pkgs/development/python-modules/pystemd/default.nix b/pkgs/development/python-modules/pystemd/default.nix index f91803243e675..f3847e0300659 100644 --- a/pkgs/development/python-modules/pystemd/default.nix +++ b/pkgs/development/python-modules/pystemd/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "pystemd"; - version = "0.13.2"; + version = "0.13.4"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Tc+ksTpVaFxJ09F8EGMeyhjDN3D2Yxb47yM3uJUcwUQ="; + hash = "sha256-8G1OWyGIGnyRAEkuYMzC9LZOULTWt3c8lAE9LG8aANs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pysunspec2/default.nix b/pkgs/development/python-modules/pysunspec2/default.nix index e3d321895db60..0e8f04916660f 100644 --- a/pkgs/development/python-modules/pysunspec2/default.nix +++ b/pkgs/development/python-modules/pysunspec2/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pysunspec2"; - version = "1.2.1"; + version = "1.3.2"; pyproject = true; disabled = pythonOlder "3.5"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "sunspec"; repo = "pysunspec2"; tag = "v${version}"; - hash = "sha256-N3Daa1l2uzRbj2GpgdulzNhqxtRLvxZuEHxlKMsAdso="; + hash = "sha256-a5dync6B0KA1Qus/3xfDzASirEh7yLuiUrQXB2jMVQw="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix index e24e88f1e62f6..852802ede046d 100644 --- a/pkgs/development/python-modules/pytapo/default.nix +++ b/pkgs/development/python-modules/pytapo/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pytapo"; - version = "3.3.48"; + version = "3.3.49"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2MBolLmcInRO1EMYsV0cV4AsvS9cJATDiP5iBjPkrk0="; + hash = "sha256-urAGAcSoJ8AkHHIPEBEfk08Y34URVN/sX0N4WkIcUR4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytask/default.nix b/pkgs/development/python-modules/pytask/default.nix index af475846e3a0f..7e1ae80c0b6a6 100644 --- a/pkgs/development/python-modules/pytask/default.nix +++ b/pkgs/development/python-modules/pytask/default.nix @@ -25,7 +25,7 @@ }: buildPythonPackage rec { pname = "pytask"; - version = "0.5.2"; + version = "0.5.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "pytask-dev"; repo = "pytask"; tag = "v${version}"; - hash = "sha256-YJouWQ9Edj27nD72m7EDSH9TXcrsu6X+pGDo5fgGU5U="; + hash = "sha256-0e1pJzoszTW8n+uFJlEeYstvHf4v+I2Is7oEHJ1qV7o="; }; build-system = [ @@ -79,7 +79,7 @@ buildPythonPackage rec { meta = with lib; { description = "Workflow management system that facilitates reproducible data analyses"; homepage = "https://github.com/pytask-dev/pytask"; - changelog = "https://github.com/pytask-dev/pytask/releases/tag/v${version}"; + changelog = "https://github.com/pytask-dev/pytask/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ erooke ]; }; diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix index 41a075b0229ac..d5212c6533bd4 100644 --- a/pkgs/development/python-modules/pytensor/default.nix +++ b/pkgs/development/python-modules/pytensor/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "pytensor"; - version = "2.31.7"; + version = "2.32.0"; pyproject = true; src = fetchFromGitHub { @@ -43,7 +43,7 @@ buildPythonPackage rec { postFetch = '' sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${src.tag})"/' $out/pytensor/_version.py ''; - hash = "sha256-FtB5DfeKHl3zlnDxsRn0rs08EJhPwVkXFBFLVA0k6oA="; + hash = "sha256-B72BZmSYl/trpgaTUXwjWo95gR90pNPcKgpnnOqP7Tg="; }; build-system = [ @@ -167,7 +167,7 @@ buildPythonPackage rec { description = "Python library to define, optimize, and efficiently evaluate mathematical expressions involving multi-dimensional arrays"; mainProgram = "pytensor-cache"; homepage = "https://github.com/pymc-devs/pytensor"; - changelog = "https://github.com/pymc-devs/pytensor/releases/tag/rel-${version}"; + changelog = "https://github.com/pymc-devs/pytensor/releases/tag/rel-${src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ bcdarwin diff --git a/pkgs/development/python-modules/pytest-aiohttp/default.nix b/pkgs/development/python-modules/pytest-aiohttp/default.nix index 5ef7d3de55ae3..79df48b8250fd 100644 --- a/pkgs/development/python-modules/pytest-aiohttp/default.nix +++ b/pkgs/development/python-modules/pytest-aiohttp/default.nix @@ -38,6 +38,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + pytestFlags = [ "-Wignore::pytest.PytestDeprecationWarning" ]; + meta = with lib; { homepage = "https://github.com/aio-libs/pytest-aiohttp/"; changelog = "https://github.com/aio-libs/pytest-aiohttp/blob/${src.rev}/CHANGES.rst"; diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index 226f7d8c0b6c7..a0e5024d8c1fc 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pytest-ansible"; - version = "25.5.0"; + version = "25.6.3"; pyproject = true; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "ansible"; repo = "pytest-ansible"; tag = "v${version}"; - hash = "sha256-k6JFaB5VbUCwknN8SkNotdPRvSvW1tFmTx5p3hGfesg="; + hash = "sha256-NOvVzZCqbPbzbDgrs94qgS82c+8U+ysyH/LdQRsawt4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pytest-asyncio/0.nix b/pkgs/development/python-modules/pytest-asyncio/0.nix new file mode 100644 index 0000000000000..e6887edf85e10 --- /dev/null +++ b/pkgs/development/python-modules/pytest-asyncio/0.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + callPackage, + fetchFromGitHub, + pytest, + setuptools-scm, +}: + +buildPythonPackage rec { + pname = "pytest-asyncio"; + version = "0.26.0"; # N.B.: when updating, tests bleak and aioesphomeapi tests + pyproject = true; + + src = fetchFromGitHub { + owner = "pytest-dev"; + repo = "pytest-asyncio"; + tag = "v${version}"; + hash = "sha256-GEhFwwQCXwtqfSiew/sOvJYV3JREqOGD4fQONlRR/Mw="; + }; + + outputs = [ + "out" + "testout" + ]; + + build-system = [ setuptools-scm ]; + + buildInputs = [ pytest ]; + + postInstall = '' + mkdir $testout + cp -R tests $testout/tests + ''; + + doCheck = false; + passthru.tests.pytest = callPackage ./tests.nix { }; + + pythonImportsCheck = [ "pytest_asyncio" ]; + + meta = with lib; { + description = "Library for testing asyncio code with pytest"; + homepage = "https://github.com/pytest-dev/pytest-asyncio"; + changelog = "https://github.com/pytest-dev/pytest-asyncio/blob/${src.tag}/docs/reference/changelog.rst"; + license = licenses.asl20; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index e6887edf85e10..5ac0fdc37f877 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.26.0"; # N.B.: when updating, tests bleak and aioesphomeapi tests + version = "1.1.0"; # N.B.: when updating, tests bleak and aioesphomeapi tests pyproject = true; src = fetchFromGitHub { owner = "pytest-dev"; repo = "pytest-asyncio"; tag = "v${version}"; - hash = "sha256-GEhFwwQCXwtqfSiew/sOvJYV3JREqOGD4fQONlRR/Mw="; + hash = "sha256-+dLOzMPKI3nawfyZVZZ6hg6OkaEGZBp8oC5VIr7y0es="; }; outputs = [ diff --git a/pkgs/development/python-modules/pytest-bdd/default.nix b/pkgs/development/python-modules/pytest-bdd/default.nix index 0bd4ae71d8b09..df3b22f92089f 100644 --- a/pkgs/development/python-modules/pytest-bdd/default.nix +++ b/pkgs/development/python-modules/pytest-bdd/default.nix @@ -7,7 +7,7 @@ parse-type, poetry-core, pytest, - pytestCheckHook, + pytest7CheckHook, pythonOlder, typing-extensions, }: @@ -37,7 +37,8 @@ buildPythonPackage rec { typing-extensions ]; - nativeCheckInputs = [ pytestCheckHook ]; + # requires an update for pytest 8.4 compat + nativeCheckInputs = [ pytest7CheckHook ]; preCheck = '' export PATH=$PATH:$out/bin diff --git a/pkgs/development/python-modules/pytest-benchmark/default.nix b/pkgs/development/python-modules/pytest-benchmark/default.nix index 44eb68ebb3729..1b14abd0d1892 100644 --- a/pkgs/development/python-modules/pytest-benchmark/default.nix +++ b/pkgs/development/python-modules/pytest-benchmark/default.nix @@ -5,14 +5,13 @@ elasticsearch, fetchFromGitHub, freezegun, - git, + gitMinimal, mercurial, nbmake, py-cpuinfo, pygal, pytest, pytestCheckHook, - pytest-xdist, pythonAtLeast, pythonOlder, setuptools, @@ -52,11 +51,10 @@ buildPythonPackage rec { nativeCheckInputs = [ freezegun - git + gitMinimal mercurial nbmake pytestCheckHook - pytest-xdist ] ++ lib.flatten (lib.attrValues optional-dependencies); diff --git a/pkgs/development/python-modules/pytest-celery/default.nix b/pkgs/development/python-modules/pytest-celery/default.nix index 9c3555f1012d1..568159010c9d6 100644 --- a/pkgs/development/python-modules/pytest-celery/default.nix +++ b/pkgs/development/python-modules/pytest-celery/default.nix @@ -5,12 +5,11 @@ debugpy, docker, fetchFromGitHub, + kombu, poetry-core, psutil, - pytest-cov-stub, pytest-docker-tools, pytest, - pytestCheckHook, pythonOlder, setuptools, tenacity, @@ -18,7 +17,7 @@ buildPythonPackage rec { pname = "pytest-celery"; - version = "1.1.3"; + version = "1.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +26,7 @@ buildPythonPackage rec { owner = "celery"; repo = "pytest-celery"; tag = "v${version}"; - hash = "sha256-TUtKfGOxvVkiMhsUqyNDK08OTuzzKHrBiPU4JCKsIKM="; + hash = "sha256-E8GO/00IC9kUvQLZmTFaK4FFQ7d+/tw/kVTQbAqRRRM="; }; postPatch = '' @@ -46,8 +45,10 @@ buildPythonPackage rec { buildInput = [ pytest ]; dependencies = [ + (celery.overridePythonAttrs { doCheck = false; }) debugpy docker + kombu psutil pytest-docker-tools setuptools @@ -60,7 +61,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pytest plugin to enable celery.contrib.pytest"; homepage = "https://github.com/celery/pytest-celery"; - changelog = "https://github.com/celery/pytest-celery/blob/v${version}/Changelog.rst"; + changelog = "https://github.com/celery/pytest-celery/blob/${src.tag}/Changelog.rst"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/pytest-codspeed/default.nix b/pkgs/development/python-modules/pytest-codspeed/default.nix index dbf611fa5b1a4..0de2195da0fc4 100644 --- a/pkgs/development/python-modules/pytest-codspeed/default.nix +++ b/pkgs/development/python-modules/pytest-codspeed/default.nix @@ -16,18 +16,34 @@ setuptools, }: +let + instrument-hooks = fetchFromGitHub { + owner = "CodSpeedHQ"; + repo = "instrument-hooks"; + rev = "b003e5024d61cfb784d6ac6f3ffd7d61bf7b9ec9"; + hash = "sha256-JTSH4wOpOGJ97iV6sagiRUu8d3sKM2NJRXcB3NmozNQ="; + }; +in + buildPythonPackage rec { pname = "pytest-codspeed"; - version = "3.2.0"; + version = "4.0.0"; pyproject = true; src = fetchFromGitHub { owner = "CodSpeedHQ"; repo = "pytest-codspeed"; tag = "v${version}"; - hash = "sha256-SNVJtnanaSQTSeX3EFG+21GFC1WFCQTbaNyi7QjQROw="; + hash = "sha256-5fdG7AEiLD3ZZzU/7zBK0+LDacTZooyDUo+FefcE4uQ="; }; + postPatch = '' + pushd src/pytest_codspeed/instruments/hooks + rmdir instrument-hooks + ln -nsf ${instrument-hooks} instrument-hooks + popd + ''; + build-system = [ hatchling ]; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix index a7dbf32414b1c..67da986e1e917 100644 --- a/pkgs/development/python-modules/pytest-cov/default.nix +++ b/pkgs/development/python-modules/pytest-cov/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "pytest-cov"; - version = "6.1.1"; + version = "6.2.1"; pyproject = true; src = fetchPypi { pname = "pytest_cov"; inherit version; - hash = "sha256-RpNfeq77p2DnFsLr++HCFiQLlZKWbn2pnqgpLU0+Kgo="; + hash = "sha256-JcxswKU1ggS4EI7O3FGptXs0zGuMlnzCwBpOANimfaI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytest-datadir/default.nix b/pkgs/development/python-modules/pytest-datadir/default.nix index ecd1d81e45171..0b8532f1ed490 100644 --- a/pkgs/development/python-modules/pytest-datadir/default.nix +++ b/pkgs/development/python-modules/pytest-datadir/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytest-datadir"; - version = "1.7.2"; + version = "1.8.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "gabrielcnr"; repo = "pytest-datadir"; tag = "v${version}"; - hash = "sha256-0y+1Al8nocCJXZyu8gLbYnXJzUu/oD31Zhn901XxWds="; + hash = "sha256-ttzYFzePPpFY6DfMGLVImZMiehuR9IhmIFxBlgrDDmk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-describe/default.nix b/pkgs/development/python-modules/pytest-describe/default.nix index 6ce782c442004..6eb2b8390b2ca 100644 --- a/pkgs/development/python-modules/pytest-describe/default.nix +++ b/pkgs/development/python-modules/pytest-describe/default.nix @@ -1,13 +1,16 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, - # build + # build-system + setuptools, + + # dependencies pytest, # tests - pytestCheckHook, + pytest7CheckHook, }: let @@ -16,16 +19,21 @@ let in buildPythonPackage { inherit pname version; - format = "setuptools"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-ObsF65DySX2co0Lvmgt/pbraflhQWuwz9m1mHWMZVbc="; + src = fetchFromGitHub { + owner = "pytest-dev"; + repo = "pytest-describe"; + tag = version; + hash = "sha256-ih0XkYOtB+gwUsgo1oSti2460P3gq3tR+UsyRlzMjLE="; }; + build-system = [ setuptools ]; + buildInputs = [ pytest ]; - nativeCheckInputs = [ pytestCheckHook ]; + # test_fixture breaks with pytest 8.4 + nativeCheckInputs = [ pytest7CheckHook ]; meta = with lib; { description = "Describe-style plugin for the pytest framework"; diff --git a/pkgs/development/python-modules/pytest-examples/default.nix b/pkgs/development/python-modules/pytest-examples/default.nix index ec26ae5eea97e..a1d0903465439 100644 --- a/pkgs/development/python-modules/pytest-examples/default.nix +++ b/pkgs/development/python-modules/pytest-examples/default.nix @@ -43,6 +43,11 @@ buildPythonPackage rec { "test_black_error_multiline" ]; + disabledTestPaths = [ + # assert 1 + 2 == 4 + "tests/test_run_examples.py::test_run_example_ok_fail" + ]; + meta = { description = "Pytest plugin for testing examples in docstrings and markdown files"; homepage = "https://github.com/pydantic/pytest-examples"; diff --git a/pkgs/development/python-modules/pytest-factoryboy/default.nix b/pkgs/development/python-modules/pytest-factoryboy/default.nix index b7e3942333464..5f932e44d25fc 100644 --- a/pkgs/development/python-modules/pytest-factoryboy/default.nix +++ b/pkgs/development/python-modules/pytest-factoryboy/default.nix @@ -20,21 +20,21 @@ buildPythonPackage rec { pname = "pytest-factoryboy"; - version = "2.6.1"; - format = "pyproject"; + version = "2.8.1"; + pyproject = true; src = fetchFromGitHub { owner = "pytest-dev"; repo = "pytest-factoryboy"; rev = version; - sha256 = "sha256-GYqYwtbmMWVqImVPPBbZNRJJGcbksUPsIbi6QuPRMco="; + sha256 = "sha256-9dMsUujMCk89Ze4H9VJRS+ihjk0PAxKb8xqlw0+ROEI="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; buildInputs = [ pytest ]; - propagatedBuildInputs = [ + dependencies = [ factory-boy inflection typing-extensions diff --git a/pkgs/development/python-modules/pytest-fixture-config/default.nix b/pkgs/development/python-modules/pytest-fixture-config/default.nix index b00643e7749aa..c39764c6cfe29 100644 --- a/pkgs/development/python-modules/pytest-fixture-config/default.nix +++ b/pkgs/development/python-modules/pytest-fixture-config/default.nix @@ -3,8 +3,9 @@ buildPythonPackage, fetchFromGitHub, setuptools, - setuptools-git, pytest, + pytestCheckHook, + six, }: buildPythonPackage rec { @@ -23,14 +24,16 @@ buildPythonPackage rec { cd pytest-fixture-config ''; - nativeBuildInputs = [ + build-system = [ setuptools - setuptools-git ]; buildInputs = [ pytest ]; - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + six + ]; meta = with lib; { changelog = "https://github.com/man-group/pytest-plugins/blob/${src.tag}/CHANGES.md"; diff --git a/pkgs/development/python-modules/pytest-httpserver/default.nix b/pkgs/development/python-modules/pytest-httpserver/default.nix index 6a136e9d3c05c..bf2016701ddef 100644 --- a/pkgs/development/python-modules/pytest-httpserver/default.nix +++ b/pkgs/development/python-modules/pytest-httpserver/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytest-httpserver"; - version = "1.1.2"; + version = "1.1.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "csernazs"; repo = "pytest-httpserver"; tag = version; - hash = "sha256-41JrZ3ubaJHNzwGDWUSseJ3Z405k21SOpwW7jG5rNxg="; + hash = "sha256-5pyCDzt9nCwYcUdCjWlJiAkyNmf6oWBqSHQL7kJJluA="; }; nativeBuildInputs = [ poetry-core ]; @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "HTTP server for pytest to test HTTP clients"; homepage = "https://www.github.com/csernazs/pytest-httpserver"; - changelog = "https://github.com/csernazs/pytest-httpserver/blob/${version}/CHANGES.rst"; + changelog = "https://github.com/csernazs/pytest-httpserver/blob/${src.tag}/CHANGES.rst"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix b/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix index 6bb33a00394f2..4acc40ff1934d 100644 --- a/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix +++ b/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix @@ -2,25 +2,40 @@ lib, buildPythonPackage, fetchFromGitHub, - poetry-core, + hatchling, + pytest, pytestCheckHook, }: buildPythonPackage rec { pname = "pytest-lazy-fixtures"; - version = "1.1.2"; + version = "1.3.2"; pyproject = true; src = fetchFromGitHub { owner = "dev-petrov"; repo = "pytest-lazy-fixtures"; tag = version; - hash = "sha256-EkvSmSTwoWmQlUZ4qBBqboOomxwn72H8taJ3CY142ms="; + hash = "sha256-h2Zm8Vbw3L9WeXaeFE/fJqiOgI3r+XnJUnnELDkmyaU="; }; - build-system = [ poetry-core ]; + postPatch = '' + # Prevent double registration here and in the pyproject.toml entrypoint + # ValueError: Plugin already registered under a different name: + substituteInPlace tests/conftest.py \ + --replace-fail '"pytest_lazy_fixtures.plugin",' "" + ''; - dependencies = [ pytestCheckHook ]; + build-system = [ hatchling ]; + + dependencies = [ pytest ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTestPaths = [ + # missing pytest-deadfixtures + "tests/test_deadfixtures_support.py" + ]; pythonImportsCheck = [ "pytest_lazy_fixtures" ]; diff --git a/pkgs/development/python-modules/pytest-mockservers/default.nix b/pkgs/development/python-modules/pytest-mockservers/default.nix index 4f521fc236bfb..6f8ad594ab5f1 100644 --- a/pkgs/development/python-modules/pytest-mockservers/default.nix +++ b/pkgs/development/python-modules/pytest-mockservers/default.nix @@ -46,6 +46,9 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + # relies on the removed event_loop fixture + disabledTests = [ "test_udp_server_factory" ]; + pythonImportsCheck = [ "pytest_mockservers" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pytest-qt/default.nix b/pkgs/development/python-modules/pytest-qt/default.nix index eac27debb474e..36758f51da08b 100644 --- a/pkgs/development/python-modules/pytest-qt/default.nix +++ b/pkgs/development/python-modules/pytest-qt/default.nix @@ -1,29 +1,35 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools-scm, pytest, + pluggy, + typing-extensions, pyqt5, - pythonOlder, }: buildPythonPackage rec { pname = "pytest-qt"; - version = "4.4.0"; - format = "setuptools"; - - disabled = pythonOlder "3.8"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-dolhQqlApChTOQCNaSijbUvnSv7H5jRXfoQsnMXFaEQ="; + version = "4.5.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pytest-dev"; + repo = "pytest-qt"; + tag = version; + hash = "sha256-ZCWWhd1/7qdSgGLNbsjPlxg24IFdqbNtLRktgMFVCJY="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; buildInputs = [ pytest ]; + dependencies = [ + pluggy + typing-extensions + ]; + nativeCheckInputs = [ pyqt5 ]; pythonImportsCheck = [ "pytestqt" ]; diff --git a/pkgs/development/python-modules/pytest-random-order/default.nix b/pkgs/development/python-modules/pytest-random-order/default.nix index 9886bcf7f869b..1c900d4b6e842 100644 --- a/pkgs/development/python-modules/pytest-random-order/default.nix +++ b/pkgs/development/python-modules/pytest-random-order/default.nix @@ -1,28 +1,31 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, py, pytest, pytest-xdist, pytestCheckHook, - pythonOlder, setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "pytest-random-order"; - version = "1.1.1"; + version = "1.2.0"; pyproject = true; - disabled = pythonOlder "3.5"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-RHLX008fHF86NZxP/FwT7QZSMvMeyhnIhEwatAbnkIA="; + src = fetchFromGitHub { + owner = "jbasko"; + repo = "pytest-random-order"; + tag = "v${version}"; + hash = "sha256-c282PrdXxG7WChnkpLWe059OmtTOl1Mn6yWgMRfCjBA="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-regressions/default.nix b/pkgs/development/python-modules/pytest-regressions/default.nix index 337c5f048a17c..18286d14fcd94 100644 --- a/pkgs/development/python-modules/pytest-regressions/default.nix +++ b/pkgs/development/python-modules/pytest-regressions/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pytest-regressions"; - version = "2.7.0"; + version = "2.8.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "ESSS"; repo = "pytest-regressions"; tag = "v${version}"; - hash = "sha256-w9uwJJtikbjUtjpJJ3dEZ1zU0KbdyLaDuJWJr45WpCg="; + hash = "sha256-8FbPWKYHy/0ITrCx9044iYOR7B9g8tgEdV+QfUg4esk="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytest-relaxed/default.nix b/pkgs/development/python-modules/pytest-relaxed/default.nix index a706d0fc87dcd..7f317759960b0 100644 --- a/pkgs/development/python-modules/pytest-relaxed/default.nix +++ b/pkgs/development/python-modules/pytest-relaxed/default.nix @@ -21,6 +21,12 @@ buildPythonPackage rec { hash = "sha256-lW6gKOww27+2gN2Oe0p/uPgKI5WV6Ius4Bi/LA1xgkg="; }; + patches = [ + # https://github.com/bitprophet/pytest-relaxed/issues/28 + # https://github.com/bitprophet/pytest-relaxed/pull/29 + ./fix-oldstyle-hookimpl-setup.patch + ]; + buildInputs = [ pytest ]; propagatedBuildInputs = [ decorator ]; @@ -32,6 +38,10 @@ buildPythonPackage rec { enabledTestPaths = [ "tests" ]; + disabledTests = [ + "test_skips_pytest_fixtures" + ]; + pythonImportsCheck = [ "pytest_relaxed" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pytest-relaxed/fix-oldstyle-hookimpl-setup.patch b/pkgs/development/python-modules/pytest-relaxed/fix-oldstyle-hookimpl-setup.patch new file mode 100644 index 0000000000000..ef44c262ca513 --- /dev/null +++ b/pkgs/development/python-modules/pytest-relaxed/fix-oldstyle-hookimpl-setup.patch @@ -0,0 +1,22 @@ +From ec22fc4da8cc081c53da7b3aaaa2d5095b7abdec Mon Sep 17 00:00:00 2001 +From: Marcel Telka +Date: Mon, 13 Nov 2023 16:18:28 +0100 +Subject: [PATCH] Fix deprecation warning + +--- + pytest_relaxed/plugin.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pytest_relaxed/plugin.py b/pytest_relaxed/plugin.py +index 562a597..28798d3 100644 +--- a/pytest_relaxed/plugin.py ++++ b/pytest_relaxed/plugin.py +@@ -37,7 +37,7 @@ def pytest_collect_file(file_path, parent): + return SpecModule.from_parent(parent=parent, path=file_path) + + +-@pytest.mark.trylast # So we can be sure builtin terminalreporter exists ++@pytest.hookimpl(trylast=True) # Be sure builtin terminalreporter exists + def pytest_configure(config): + # TODO: we _may_ sometime want to do the isatty/slaveinput/etc checks that + # pytest-sugar does? diff --git a/pkgs/development/python-modules/pytest-run-parallel/default.nix b/pkgs/development/python-modules/pytest-run-parallel/default.nix index cad82d8f2244d..4a061f97c6863 100644 --- a/pkgs/development/python-modules/pytest-run-parallel/default.nix +++ b/pkgs/development/python-modules/pytest-run-parallel/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pytest-run-parallel"; - version = "0.3.1"; + version = "0.6.0"; pyproject = true; src = fetchFromGitHub { owner = "Quansight-Labs"; repo = "pytest-run-parallel"; tag = "v${version}"; - hash = "sha256-YBky+aoMO3dclod6RTQZF0X8fE8CAgHHY4es8vWHb3U="; + hash = "sha256-6cfpPJItOmb79KERqpKz/nQlyTrAj4yv+bGM8SXrsXg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytest-services/default.nix b/pkgs/development/python-modules/pytest-services/default.nix index 537e06b5e04b7..c45a7649629f1 100644 --- a/pkgs/development/python-modules/pytest-services/default.nix +++ b/pkgs/development/python-modules/pytest-services/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, psutil, pylibmc, pytest, @@ -17,7 +16,7 @@ buildPythonPackage rec { pname = "pytest-services"; - version = "2.2.1"; + version = "2.2.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,19 +24,10 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pytest-dev"; repo = "pytest-services"; - tag = version; - hash = "sha256-E/VcKcAb1ekypm5jP4lsSz1LYJTcTSed6i5OY5ihP30="; + tag = "v${version}"; + hash = "sha256-kWgqb7+3/hZKUz7B3PnfxHZq6yU3JUeJ+mruqrMD/NE="; }; - patches = [ - # Replace distutils.spawn.find_executable with shutil.which, https://github.com/pytest-dev/pytest-services/pull/46 - (fetchpatch { - name = "replace-distutils.patch"; - url = "https://github.com/pytest-dev/pytest-services/commit/e0e2a85434a2dcbcc0584299c5b2b751efe0b6db.patch"; - hash = "sha256-hvr7EedfjfonHDn6v2slwUBqz1xQoF7Ez/kqAhZRXEc="; - }) - ]; - nativeBuildInputs = [ setuptools-scm toml @@ -72,7 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "Services plugin for pytest testing framework"; homepage = "https://github.com/pytest-dev/pytest-services"; - changelog = "https://github.com/pytest-dev/pytest-services/blob/${version}/CHANGES.rst"; + changelog = "https://github.com/pytest-dev/pytest-services/blob/${src.tag}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix index 36b88d7ffea3f..8636389eb12b7 100644 --- a/pkgs/development/python-modules/pytest-shutil/default.nix +++ b/pkgs/development/python-modules/pytest-shutil/default.nix @@ -6,12 +6,9 @@ # build-time setuptools, - setuptools-git, # runtime pytest, - mock, - path, execnet, termcolor, six, @@ -31,14 +28,11 @@ buildPythonPackage { build-system = [ setuptools - setuptools-git ]; buildInputs = [ pytest ]; dependencies = [ - mock - path execnet termcolor six @@ -46,10 +40,7 @@ buildPythonPackage { nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = [ - "test_pretty_formatter" - ] - ++ lib.optionals isPyPy [ + disabledTests = lib.optionals isPyPy [ "test_run" "test_run_integration" ]; diff --git a/pkgs/development/python-modules/pytest-subtests/default.nix b/pkgs/development/python-modules/pytest-subtests/default.nix index 0b4f03e7942b8..2826f917cee10 100644 --- a/pkgs/development/python-modules/pytest-subtests/default.nix +++ b/pkgs/development/python-modules/pytest-subtests/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pytest-subtests"; - version = "0.14.1"; + version = "0.14.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pytest_subtests"; inherit version; - hash = "sha256-NQwArcNsOv9namYTXIGu2eIYLhX2w+yHITZpGLu/dYA="; + hash = "sha256-cVSoZl/VKO5wp20AIWpE0TncPJyDUhoPd597CtT4AN4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index 5660820d969c3..3fd5f57fc93cd 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pytest-xdist"; - version = "3.6.1"; + version = "3.8.0"; disabled = pythonOlder "3.7"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pytest_xdist"; inherit version; - hash = "sha256-6tFWpNsjHux2lzf1dmjvWKIISjSy5VxKj6INhhEHMA0="; + hash = "sha256-fleBJeybxgUIYaqT8tWfHY0IVZXWVRwskLb0+tjTqfE="; }; build-system = [ diff --git a/pkgs/development/python-modules/pytest/8_3.nix b/pkgs/development/python-modules/pytest/8_3.nix new file mode 100644 index 0000000000000..2b7cc734324f0 --- /dev/null +++ b/pkgs/development/python-modules/pytest/8_3.nix @@ -0,0 +1,111 @@ +{ + lib, + buildPythonPackage, + callPackage, + pythonOlder, + fetchPypi, + writeText, + + # build-system + setuptools, + setuptools-scm, + + # dependencies + attrs, + exceptiongroup, + iniconfig, + packaging, + pluggy, + tomli, + + # optional-dependencies + argcomplete, + hypothesis, + mock, + pygments, + requests, + xmlschema, +}: + +buildPythonPackage rec { + pname = "pytest"; + version = "8.3.5"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-9O/nDMFOURVlrEdrV8J54SqFWxH0jyEq8QgO8iY9OEU="; + }; + + outputs = [ + "out" + "testout" + ]; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + iniconfig + packaging + pluggy + pygments + ] + ++ lib.optionals (pythonOlder "3.11") [ + exceptiongroup + tomli + ]; + + optional-dependencies = { + testing = [ + argcomplete + attrs + hypothesis + mock + requests + setuptools + xmlschema + ]; + }; + + postInstall = '' + mkdir $testout + cp -R testing $testout/testing + ''; + + doCheck = false; + passthru.tests.pytest = callPackage ./tests.nix { }; + + # Remove .pytest_cache when using py.test in a Nix build + setupHook = writeText "pytest-hook" '' + pytestcachePhase() { + find $out -name .pytest_cache -type d -exec rm -rf {} + + } + appendToVar preDistPhases pytestcachePhase + + # pytest generates it's own bytecode files to improve assertion messages. + # These files similar to cpython's bytecode files but are never laoded + # by python interpreter directly. We remove them for a few reasons: + # - files are non-deterministic: https://github.com/NixOS/nixpkgs/issues/139292 + # (file headers are generatedt by pytest directly and contain timestamps) + # - files are not needed after tests are finished + pytestRemoveBytecodePhase () { + # suffix is defined at: + # https://github.com/pytest-dev/pytest/blob/7.2.1/src/_pytest/assertion/rewrite.py#L51-L53 + find $out -name "*-pytest-*.py[co]" -delete + } + appendToVar preDistPhases pytestRemoveBytecodePhase + ''; + + pythonImportsCheck = [ "pytest" ]; + + meta = with lib; { + description = "Framework for writing tests"; + homepage = "https://docs.pytest.org"; + changelog = "https://github.com/pytest-dev/pytest/releases/tag/${version}"; + teams = [ teams.python ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 6eb3a02661cb7..17d42090876cd 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -29,12 +29,12 @@ buildPythonPackage rec { pname = "pytest"; - version = "8.3.5"; + version = "8.4.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-9O/nDMFOURVlrEdrV8J54SqFWxH0jyEq8QgO8iY9OEU="; + hash = "sha256-fGf9aRdIdzWe2Tcew6+KPSsEdBgYxR5emcwXQiUfqTw="; }; outputs = [ @@ -42,15 +42,16 @@ buildPythonPackage rec { "testout" ]; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ iniconfig packaging pluggy + pygments ] ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup @@ -63,7 +64,6 @@ buildPythonPackage rec { attrs hypothesis mock - pygments requests setuptools xmlschema diff --git a/pkgs/development/python-modules/python-awair/default.nix b/pkgs/development/python-modules/python-awair/default.nix index c814188477fa7..21d946e89d625 100644 --- a/pkgs/development/python-modules/python-awair/default.nix +++ b/pkgs/development/python-modules/python-awair/default.nix @@ -31,6 +31,9 @@ buildPythonPackage rec { voluptuous ]; + # Failed: async def functions are not natively supported. + doCheck = false; + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook diff --git a/pkgs/development/python-modules/python-binance/default.nix b/pkgs/development/python-modules/python-binance/default.nix index 77db7394f7e1d..5f7c7d37e4c05 100644 --- a/pkgs/development/python-modules/python-binance/default.nix +++ b/pkgs/development/python-modules/python-binance/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "python-binance"; - version = "1.0.27"; + version = "1.0.29"; pyproject = true; disabled = pythonOlder "3.11"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "sammchardy"; repo = "python-binance"; tag = "v${version}"; - hash = "sha256-nsJuHxPXhMBRY4BUDDLj5sHK/GuJA0pBU3RGUDxVm50="; + hash = "sha256-Hqd6228k2j1BPzBBCRpdEp0rAGxZt00XPnzpCPlwIfg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-box/default.nix b/pkgs/development/python-modules/python-box/default.nix index 80bfb3ef7e052..701c93f8f0c92 100644 --- a/pkgs/development/python-modules/python-box/default.nix +++ b/pkgs/development/python-modules/python-box/default.nix @@ -49,6 +49,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.all; + disabledTests = [ + # ruamel 8.18.13 update changed white space rules + "test_to_yaml_ruamel" + ]; + pythonImportsCheck = [ "box" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/python-codon-tables/default.nix b/pkgs/development/python-modules/python-codon-tables/default.nix index af0e275321d1c..af72906af4eb5 100644 --- a/pkgs/development/python-modules/python-codon-tables/default.nix +++ b/pkgs/development/python-modules/python-codon-tables/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "python-codon-tables"; - version = "0.1.15"; + version = "0.1.18"; format = "setuptools"; src = fetchPypi { pname = "python_codon_tables"; inherit version; - hash = "sha256-bK0Y8y5W6xmtGeRUtLDGsg1voVKp1uU37tBqi0/raLY="; + hash = "sha256-c/VSmArSkq+46LzW3r+CQEG1mwp87ACbZ7EWkMOGOQc="; }; # no tests in tarball diff --git a/pkgs/development/python-modules/python-constraint/default.nix b/pkgs/development/python-modules/python-constraint/default.nix index ae00c34c33546..2ac55f35c9f10 100644 --- a/pkgs/development/python-modules/python-constraint/default.nix +++ b/pkgs/development/python-modules/python-constraint/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "python-constraint"; - version = "1.4.0"; + version = "2.4.0"; format = "setuptools"; src = fetchFromGitHub { owner = "python-constraint"; repo = "python-constraint"; - rev = version; - sha256 = "1dv11406yxmmgkkhwzqicajbg2bmla5xfad7lv57zyahxz8jzz94"; + tag = version; + sha256 = "sha256-Vi+dD/QmHfUrL0l5yTb7B1ILuXj3HYfT0QINdyfoqFo="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/python-crontab/default.nix b/pkgs/development/python-modules/python-crontab/default.nix index c89cd3d07bdab..9fd4c03572edb 100644 --- a/pkgs/development/python-modules/python-crontab/default.nix +++ b/pkgs/development/python-modules/python-crontab/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "python-crontab"; - version = "3.2.0"; + version = "3.3.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "python_crontab"; inherit version; - hash = "sha256-QAZ9HdOa3jRgsq2FV8dlFRTNOFHe//9hxcYOEifFw2s="; + hash = "sha256-AHyK7mjd3z4E7E3OD6wSS5O9aL50cPyV0qlhehXeKRs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix index 18cd8884ee1fe..48dc270bac443 100644 --- a/pkgs/development/python-modules/python-dbusmock/default.nix +++ b/pkgs/development/python-modules/python-dbusmock/default.nix @@ -30,14 +30,14 @@ let in buildPythonPackage rec { pname = "python-dbusmock"; - version = "0.34.2"; + version = "0.36.0"; pyproject = true; src = fetchFromGitHub { owner = "martinpitt"; repo = "python-dbusmock"; tag = version; - hash = "sha256-7h5SIcgWcbzInmCkbGz/ulfPJvqPPguWLJY+AXJuo0c="; + hash = "sha256-9YnMOQUuwAcrL0ZaQr7iGly9esZaSRIFThQRNUtSndo="; }; build-system = [ diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix index 2d46ddd688d39..44e978008bdfd 100644 --- a/pkgs/development/python-modules/python-dotenv/default.nix +++ b/pkgs/development/python-modules/python-dotenv/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "python-dotenv"; - version = "1.1.0"; + version = "1.1.1"; pyproject = true; src = fetchFromGitHub { owner = "theskumar"; repo = "python-dotenv"; tag = "v${version}"; - hash = "sha256-jpSOChCUgJxrA5n+DNQX3dtFQ5Q6VG4g4pdWRIh+dOo="; + hash = "sha256-GeN6/pnqhm7TTP+H9bKhJat6EwEl2EPl46mNSJWwFKk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-fontconfig/default.nix b/pkgs/development/python-modules/python-fontconfig/default.nix index f249489e4bac5..18f40cbb647cf 100644 --- a/pkgs/development/python-modules/python-fontconfig/default.nix +++ b/pkgs/development/python-modules/python-fontconfig/default.nix @@ -22,13 +22,13 @@ let in buildPythonPackage rec { pname = "python-fontconfig"; - version = "0.6.0"; + version = "0.6.1"; pyproject = true; src = fetchPypi { pname = "python_fontconfig"; inherit version; - sha256 = "sha256-1esVZVMvkcAKWchaOrIki2CYoJDffN1PW+A9nXWjCeU="; + sha256 = "sha256-qka4KksXW9LPn+Grmyng3kyrhwIEG7UEpVDeKfX89zM="; }; build-system = [ diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix index 8fb7866efbd09..0ba82fdcccb8b 100644 --- a/pkgs/development/python-modules/python-gnupg/default.nix +++ b/pkgs/development/python-modules/python-gnupg/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "python-gnupg"; - version = "0.5.4"; + version = "0.5.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-8v21+ylhXHfCdD4cs9kxQ1Om6HsQw30jjZGuHG/q4IY="; + hash = "sha256-P9yvdvYKG5SP+ON9w5jQPPnOdCcGXVgwgrktp6T/WmM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-hosts/default.nix b/pkgs/development/python-modules/python-hosts/default.nix index 0f582e7602501..5c7f7418313f1 100644 --- a/pkgs/development/python-modules/python-hosts/default.nix +++ b/pkgs/development/python-modules/python-hosts/default.nix @@ -3,22 +3,18 @@ buildPythonPackage, fetchPypi, pytestCheckHook, - pythonOlder, pyyaml, setuptools, }: buildPythonPackage rec { pname = "python-hosts"; - version = "1.0.7"; + version = "1.1.2"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { - pname = "python_hosts"; - inherit version; - hash = "sha256-TFaZHiL2v/woCWgz3nh/kjUOhbfN1ghnBnJcVcTwSrk="; + inherit pname version; + hash = "sha256-XiU6aO6EhFVgj1g7TYMdbgg7IvjkU2DFoiwYikrB13A="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-jenkins/default.nix b/pkgs/development/python-modules/python-jenkins/default.nix index e06a0760fbdd6..6e2eb9c169ba3 100644 --- a/pkgs/development/python-modules/python-jenkins/default.nix +++ b/pkgs/development/python-modules/python-jenkins/default.nix @@ -18,12 +18,13 @@ buildPythonPackage rec { pname = "python-jenkins"; - version = "1.8.2"; + version = "1.8.3"; format = "setuptools"; src = fetchPypi { - inherit pname version; - hash = "sha256-VufauwYHvbjh1vxtLUMBq+2+2RZdorIG+svTBxy27ss="; + pname = "python_jenkins"; + inherit version; + hash = "sha256-j0dhw5GsEejB8j93EBCSDBBEBJdwWrcXXVI1j1oS3Jg="; }; # test uses timeout mechanism unsafe for use with the "spawn" diff --git a/pkgs/development/python-modules/python-json-logger/default.nix b/pkgs/development/python-modules/python-json-logger/default.nix index 9e7a8198ecb47..acae4e2689da5 100644 --- a/pkgs/development/python-modules/python-json-logger/default.nix +++ b/pkgs/development/python-modules/python-json-logger/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "python-json-logger"; - version = "3.2.1"; + version = "3.3.0"; pyproject = true; src = fetchFromGitHub { owner = "nhairs"; repo = "python-json-logger"; tag = "v${version}"; - hash = "sha256-dM9/ehPY/BnJSNBq1BiTUpJRigdzbGb3jD8Uhx+hmKc="; + hash = "sha256-q1s+WRU5xTmF4YW20DrDnXbMeW6vGYzVekxxIDVt8gw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-markdown-math/default.nix b/pkgs/development/python-modules/python-markdown-math/default.nix index 3bf104029b40a..508229050afee 100644 --- a/pkgs/development/python-modules/python-markdown-math/default.nix +++ b/pkgs/development/python-modules/python-markdown-math/default.nix @@ -1,22 +1,25 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, markdown, - isPy27, }: buildPythonPackage rec { pname = "python-markdown-math"; - version = "0.8"; - format = "setuptools"; - disabled = isPy27; + version = "0.9"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "8564212af679fc18d53f38681f16080fcd3d186073f23825c7ce86fadd3e3635"; + src = fetchFromGitHub { + owner = "mitya57"; + repo = "python-markdown-math"; + tag = version; + hash = "sha256-m/i43lvOehZSazHXhoAZTRSB5BQgn2VFjXADxSKeXfs="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ markdown ]; meta = { diff --git a/pkgs/development/python-modules/python-on-whales/default.nix b/pkgs/development/python-modules/python-on-whales/default.nix index bbe238cde8179..9b917d59b2ba5 100644 --- a/pkgs/development/python-modules/python-on-whales/default.nix +++ b/pkgs/development/python-modules/python-on-whales/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "python-on-whales"; - version = "0.75.1"; + version = "0.78.0"; pyproject = true; src = fetchFromGitHub { owner = "gabrieldemarmiesse"; repo = "python-on-whales"; tag = "v${version}"; - hash = "sha256-JjzBFVgPNnU0q5hL+RZJMs3WxbeZbBKyvsV6clUFjpE="; + hash = "sha256-mpCBqFxxFxljhoTveLmk4XfqngiQPsufqr927hSwNfA="; }; build-system = [ setuptools ]; @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = { description = "Docker client for Python, designed to be fun and intuitive"; homepage = "https://github.com/gabrieldemarmiesse/python-on-whales"; - changelog = "https://github.com/gabrieldemarmiesse/python-on-whales/releases/tag/v${version}"; + changelog = "https://github.com/gabrieldemarmiesse/python-on-whales/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix b/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix index 5aaca9b14f110..6c11fb6da1204 100644 --- a/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix +++ b/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "python-owasp-zap-v2-4"; - version = "0.0.18"; + version = "0.4.0"; format = "setuptools"; src = fetchFromGitHub { owner = "zaproxy"; repo = "zap-api-python"; - rev = version; - sha256 = "0b46m9s0vwaaq8vhiqspdr2ns9qdw65fnjh8mf58gjinlsd27ygk"; + tag = version; + sha256 = "sha256-UG8+0jJwnywvuc68/9r10kKMqxNIOg5mIdPt2Fx2BZA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-pkcs11/default.nix b/pkgs/development/python-modules/python-pkcs11/default.nix index 10e37e558501a..baa6e6b45e631 100644 --- a/pkgs/development/python-modules/python-pkcs11/default.nix +++ b/pkgs/development/python-modules/python-pkcs11/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "python-pkcs11"; - version = "0.7.0"; - format = "setuptools"; + version = "0.8.1"; + pyproject = true; src = fetchFromGitHub { owner = "danni"; repo = "python-pkcs11"; - rev = "v${version}"; - sha256 = "0kncbipfpsb7m7mhv5s5b9wk604h1j08i2j26fn90pklgqll0xhv"; + tag = "v${version}"; + sha256 = "sha256-iCfcVVzAwwg69Ym1uVimSzYZBQmC+Yppl5YXDaLIcqc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index bd85309718d65..cd621b30166dc 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -18,7 +18,7 @@ # tests msgpack, - pytestCheckHook, + pytest7CheckHook, simple-websocket, uvicorn, @@ -53,7 +53,7 @@ buildPythonPackage rec { nativeCheckInputs = [ msgpack - pytestCheckHook + pytest7CheckHook uvicorn simple-websocket ] diff --git a/pkgs/development/python-modules/python-socks/default.nix b/pkgs/development/python-modules/python-socks/default.nix index 8d0c255cbbc20..183fdd950cb5b 100644 --- a/pkgs/development/python-modules/python-socks/default.nix +++ b/pkgs/development/python-modules/python-socks/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "python-socks"; - version = "2.7.1"; + version = "2.7.2"; pyproject = true; disabled = pythonOlder "3.6.2"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "romis2012"; repo = "python-socks"; tag = "v${version}"; - hash = "sha256-7BfdyQDfRIPSC3Iv+cDcR0VFHX+l1OPRMElzHGL2x3M="; + hash = "sha256-9RzlK8iErM94vpVLeildYjqXbRxdiVyxASCZHKd0mao="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index cf0c31466010d..15722e6b44969 100644 --- a/pkgs/development/python-modules/python-stdnum/default.nix +++ b/pkgs/development/python-modules/python-stdnum/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pytestCheckHook, pytest-cov-stub, setuptools, @@ -13,23 +13,24 @@ buildPythonPackage rec { version = "2.1"; pyproject = true; - src = fetchPypi { - pname = "python_stdnum"; - inherit version; - hash = "sha256-awFkWWnrPf1VBhoBFNWTdTzZ5lPOqQgxmLfuoSZEOXo="; + src = fetchFromGitHub { + owner = "arthurdejong"; + repo = "python-stdnum"; + tag = version; + hash = "sha256-9m4tO9TX9lV4V3wTkMFDj0Mc+jl4bKsHM/adeF3cBTE="; }; build-system = [ setuptools ]; + optional-dependencies = { + SOAP = [ zeep ]; + }; + nativeCheckInputs = [ pytestCheckHook pytest-cov-stub ]; - optional-dependencies = { - SOAP = [ zeep ]; - }; - pythonImportsCheck = [ "stdnum" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/python-tado/default.nix b/pkgs/development/python-modules/python-tado/default.nix index 7cde7aa3d8e68..7ef8016aad0f3 100644 --- a/pkgs/development/python-modules/python-tado/default.nix +++ b/pkgs/development/python-modules/python-tado/default.nix @@ -2,33 +2,35 @@ lib, buildPythonPackage, fetchFromGitHub, + poetry-core, pytest-cov-stub, pytest-mock, + pytest-socket, pytestCheckHook, requests, responses, - setuptools, }: buildPythonPackage rec { pname = "python-tado"; - version = "0.18.15"; + version = "0.19.2"; pyproject = true; src = fetchFromGitHub { owner = "wmalgadey"; repo = "PyTado"; tag = version; - hash = "sha256-FUnD5JVS816XQYqXGSDnypqcYuKVhEeFIFcENf8BkcU="; + hash = "sha256-me62VPjKU+vh0vo4Fl86sEse1QZYD2zDpxchSiUcxTY="; }; - build-system = [ setuptools ]; + build-system = [ poetry-core ]; dependencies = [ requests ]; nativeCheckInputs = [ pytest-cov-stub pytest-mock + pytest-socket pytestCheckHook responses ]; diff --git a/pkgs/development/python-modules/pytraccar/default.nix b/pkgs/development/python-modules/pytraccar/default.nix index 6344f1e6d9bd2..47c3a72338822 100644 --- a/pkgs/development/python-modules/pytraccar/default.nix +++ b/pkgs/development/python-modules/pytraccar/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pytraccar"; - version = "2.1.1"; + version = "3.0.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = "pytraccar"; tag = version; - hash = "sha256-WTRqYw66iD4bbb1aWJfBI67+DtE1FE4oiuUKpfVqypE="; + hash = "sha256-DtxZCvLuvQpbu/1lIXz2BVbACt5Q1N2txVMyqwd4d9A="; }; nativeBuildInputs = [ poetry-core ]; @@ -48,7 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to handle device information from Traccar"; homepage = "https://github.com/ludeeus/pytraccar"; - changelog = "https://github.com/ludeeus/pytraccar/releases/tag/${version}"; + changelog = "https://github.com/ludeeus/pytraccar/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pytransportnswv2/default.nix b/pkgs/development/python-modules/pytransportnswv2/default.nix index eba1a03114543..83e7b8452d2a8 100644 --- a/pkgs/development/python-modules/pytransportnswv2/default.nix +++ b/pkgs/development/python-modules/pytransportnswv2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytransportnswv2"; - version = "0.8.10"; + version = "0.9.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyTransportNSWv2"; inherit version; - hash = "sha256-/9NtytE2zjIfrhVz1gTMLXtiSWlICjhQUFHtVCeg7FA="; + hash = "sha256-J3OW8fWldbkKzCDlXSv7nucVdyEnDFx8uCicF+ELQkQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyttsx3/default.nix b/pkgs/development/python-modules/pyttsx3/default.nix index ba9afeb6be85d..a66e1ca4489ab 100644 --- a/pkgs/development/python-modules/pyttsx3/default.nix +++ b/pkgs/development/python-modules/pyttsx3/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyttsx3"; - version = "2.98"; + version = "2.99"; format = "wheel"; src = fetchPypi { inherit pname version format; - sha256 = "sha256-s/tMpNWuT45oNtaze/X+4P1R0Vf/on+5Bkvm5749o3o="; + sha256 = "sha256-/z5P91bCTXK58/LzBODtqv0PWK2w5vS5DZMEQM2osgc="; dist = "py3"; python = "py3"; }; diff --git a/pkgs/development/python-modules/pytubefix/default.nix b/pkgs/development/python-modules/pytubefix/default.nix index 77d81e25bd5b6..0051f76692981 100644 --- a/pkgs/development/python-modules/pytubefix/default.nix +++ b/pkgs/development/python-modules/pytubefix/default.nix @@ -1,5 +1,6 @@ { lib, + aiohttp, buildPythonPackage, fetchFromGitHub, setuptools, @@ -8,18 +9,20 @@ buildPythonPackage rec { pname = "pytubefix"; - version = "9.2.2"; + version = "9.4.1"; pyproject = true; src = fetchFromGitHub { owner = "JuanBindez"; repo = "pytubefix"; tag = "v${version}"; - hash = "sha256-Abx4VIA8dnEZpl86IyGJYSR8n6sPmtCTq5eJbqKyNRM="; + hash = "sha256-aw17XiWdr8cDIL8o4Dc91YLi3t4B8r5VAhBgZtCm3x8="; }; build-system = [ setuptools ]; + dependencies = [ aiohttp ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/pyturbojpeg/default.nix b/pkgs/development/python-modules/pyturbojpeg/default.nix index 8cfb975b808c8..881ff4ec71828 100644 --- a/pkgs/development/python-modules/pyturbojpeg/default.nix +++ b/pkgs/development/python-modules/pyturbojpeg/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyturbojpeg"; - version = "1.8.0"; + version = "1.8.2"; pyproject = true; src = fetchFromGitHub { owner = "lilohuang"; repo = "PyTurboJPEG"; tag = "v${version}"; - hash = "sha256-4DPkzHjEsVjioRNLZii/5gZIEbj8A8rNkL8UXUQsgdY="; + hash = "sha256-zyLNIo7hQuzTlEgdvri3bSnAiRRKKup57tfCIxiBq24="; }; patches = [ @@ -44,7 +44,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "turbojpeg" ]; meta = with lib; { - changelog = "https://github.com/lilohuang/PyTurboJPEG/releases/tag/v${version}"; + changelog = "https://github.com/lilohuang/PyTurboJPEG/releases/tag/${src.tag}"; description = "Python wrapper of libjpeg-turbo for decoding and encoding JPEG image"; homepage = "https://github.com/lilohuang/PyTurboJPEG"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix index d258ad926ec2b..5049c209f0886 100644 --- a/pkgs/development/python-modules/pytz/default.nix +++ b/pkgs/development/python-modules/pytz/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchPypi, setuptools, + tzdata, unittestCheckHook, }: @@ -16,6 +17,12 @@ buildPythonPackage rec { hash = "sha256-NguePbtJognCGtYYCcf7RTZD4EiziSTHZYE1RnRugcM="; }; + postPatch = '' + # Use our system-wide zoneinfo dir instead of the bundled one + rm -rf pytz/zoneinfo + ln -snvf ${tzdata}/share/zoneinfo pytz/zoneinfo + ''; + build-system = [ setuptools ]; nativeCheckInputs = [ unittestCheckHook ]; @@ -32,6 +39,9 @@ buildPythonPackage rec { description = "World timezone definitions, modern and historical"; homepage = "https://pythonhosted.org/pytz"; license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with maintainers; [ + dotlambda + jherland + ]; }; } diff --git a/pkgs/development/python-modules/pyvesync/default.nix b/pkgs/development/python-modules/pyvesync/default.nix index fbc5ae395b981..70e1197a90a24 100644 --- a/pkgs/development/python-modules/pyvesync/default.nix +++ b/pkgs/development/python-modules/pyvesync/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyvesync"; - version = "2.1.18"; + version = "2.18"; pyproject = true; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "webdjoe"; repo = "pyvesync"; tag = version; - hash = "sha256-p46QVjJ8MzvsAu9JAQo4XN+z96arWLoJakdT81ITasU="; + hash = "sha256-bcjFa/6GgWk9UZLaB+oUOWVb6b7o0kKB2jzHr9I48eI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyvisa-py/default.nix b/pkgs/development/python-modules/pyvisa-py/default.nix index f432fa6c11124..aa05ec2c606e4 100644 --- a/pkgs/development/python-modules/pyvisa-py/default.nix +++ b/pkgs/development/python-modules/pyvisa-py/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pyvisa-py"; - version = "0.7.2"; + version = "0.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "pyvisa"; repo = "pyvisa-py"; tag = version; - hash = "sha256-UFAKLrZ1ZrTmFXwVuyTCPVo3Y1YIDOvkx5krpsz71BM="; + hash = "sha256-bYxl7zJ36uorEasAKvPiVWLaG2ISQGBHrQZJcnkbfzU="; }; nativeBuildInputs = [ @@ -53,7 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module that implements the Virtual Instrument Software Architecture"; homepage = "https://github.com/pyvisa/pyvisa-py"; - changelog = "https://github.com/pyvisa/pyvisa-py/blob/${version}/CHANGES"; + changelog = "https://github.com/pyvisa/pyvisa-py/blob/${src.tag}/CHANGES"; license = licenses.mit; maintainers = with maintainers; [ mvnetbiz ]; }; diff --git a/pkgs/development/python-modules/pyvisa-sim/default.nix b/pkgs/development/python-modules/pyvisa-sim/default.nix index 69e61ea9d0342..0dc5ab72663f9 100644 --- a/pkgs/development/python-modules/pyvisa-sim/default.nix +++ b/pkgs/development/python-modules/pyvisa-sim/default.nix @@ -15,24 +15,21 @@ buildPythonPackage rec { pname = "pyvisa-sim"; - version = "0.6.0"; - format = "pyproject"; - - disabled = pythonOlder "3.8"; + version = "0.7.0"; + pyproject = true; src = fetchPypi { - pname = "PyVISA-sim"; + pname = "pyvisa_sim"; inherit version; - hash = "sha256-kHahaRKoEUtDxEsdMolPwfEy1DidiytxmvYiQeQhYcE="; + hash = "sha256-fVpnLKSK25SL5hbwYSuFMrHu5mSvZ8Gt8Qv/Tjv7+NA="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm - wheel ]; - propagatedBuildInputs = [ + dependencies = [ pyvisa pyyaml stringparser diff --git a/pkgs/development/python-modules/pyvisa/default.nix b/pkgs/development/python-modules/pyvisa/default.nix index 3a7fea7b051f9..465057dde14ee 100644 --- a/pkgs/development/python-modules/pyvisa/default.nix +++ b/pkgs/development/python-modules/pyvisa/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyvisa"; - version = "1.14.1"; + version = "1.15.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pyvisa"; repo = "pyvisa"; tag = version; - hash = "sha256-GKrgUK2nSZi+8oJoS45MjpU9+INEgcla9Kaw6ceNVp0="; + hash = "sha256-cjKOyBn5O7ThZI7pi6JXeLhe47xGbhQaSRcAqXb3lV8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix index 5ebc09edb2394..7c9102a7c0d21 100644 --- a/pkgs/development/python-modules/pyvmomi/default.nix +++ b/pkgs/development/python-modules/pyvmomi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyvmomi"; - version = "8.0.3.0.1"; + version = "9.0.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "vmware"; repo = "pyvmomi"; tag = "v${version}"; - hash = "sha256-wJe45r9fWNkg8oWJZ47bcqoWzOvxpO4soV2SU4N0tb0="; + hash = "sha256-4r0UtLR1dhhNQ+Lx12JiEozDAjMxPly+RR0LWRg/A4E="; }; propagatedBuildInputs = [ @@ -46,7 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python SDK for the VMware vSphere API that allows you to manage ESX, ESXi, and vCenter"; homepage = "https://github.com/vmware/pyvmomi"; - changelog = "https://github.com/vmware/pyvmomi/releases/tag/v${version}"; + changelog = "https://github.com/vmware/pyvmomi/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/pywatchman/default.nix b/pkgs/development/python-modules/pywatchman/default.nix index f51d3c2dbce54..27beb138785d3 100644 --- a/pkgs/development/python-modules/pywatchman/default.nix +++ b/pkgs/development/python-modules/pywatchman/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pywatchman"; - version = "2.0.0"; + version = "3.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-JTVNnjZH+UQRpME+UQyDoc7swXl3sFJbpBsW5wGceww="; + hash = "sha256-79MqFzkaWHIRjFUEHacaIJYORrpLc0QMJO+sKH7qkR4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pywavelets/default.nix b/pkgs/development/python-modules/pywavelets/default.nix index 4bb23a6acd421..c61dff8b51ca8 100644 --- a/pkgs/development/python-modules/pywavelets/default.nix +++ b/pkgs/development/python-modules/pywavelets/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pywavelets"; - version = "1.8.0"; + version = "1.9.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "PyWavelets"; repo = "pywt"; tag = "v${version}"; - hash = "sha256-v5NkzgIztREYz2Idg0E3grejWhZ/5BX0nCexUX8XcTQ="; + hash = "sha256-UVQWZPuOyUPcWI3cV2u+jQyAZN/RV3aKAT6BQxqRE4M="; }; build-system = [ diff --git a/pkgs/development/python-modules/pywebview/default.nix b/pkgs/development/python-modules/pywebview/default.nix index ca01c3e7ca9f0..b7b2096f27a9f 100644 --- a/pkgs/development/python-modules/pywebview/default.nix +++ b/pkgs/development/python-modules/pywebview/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pywebview"; - version = "5.3.2"; + version = "5.4"; pyproject = true; disabled = pythonOlder "3.5"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "r0x0r"; repo = "pywebview"; tag = version; - hash = "sha256-/jKauq+G3Nz91n/keTZGNDTaW5EhdyCx4c2Nylxqc+0="; + hash = "sha256-HQ95tg1BuOr+SyOEDCbIc6Xm2dzzWS0mMcnV4bHMNBs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pywikibot/default.nix b/pkgs/development/python-modules/pywikibot/default.nix index 6c05e1e533a49..9375756f4eb22 100644 --- a/pkgs/development/python-modules/pywikibot/default.nix +++ b/pkgs/development/python-modules/pywikibot/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pywikibot"; - version = "10.2.0"; + version = "10.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-pwXF2JgcK6rA1YNQ2VQ1svBDsc8xt3Xx2+o0Xr+cOZM="; + hash = "sha256-QXgv++Vr2HYzoAAwk2eVg/EnKqX9EFUJo6OBHvlYbjQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyyaml-env-tag/default.nix b/pkgs/development/python-modules/pyyaml-env-tag/default.nix index 8167c85c6534f..69014895c8ce8 100644 --- a/pkgs/development/python-modules/pyyaml-env-tag/default.nix +++ b/pkgs/development/python-modules/pyyaml-env-tag/default.nix @@ -2,24 +2,25 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, pyyaml, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "pyyaml-env-tag"; - version = "0.1"; - format = "setuptools"; - disabled = pythonOlder "3.6"; + version = "1.1"; + pyproject = true; src = fetchPypi { pname = "pyyaml_env_tag"; inherit version; - sha256 = "1nsva88jsmwn0cb9jnrfiz4dvs9xakkpgfii7g1xwkx1pmsjc2bh"; + sha256 = "sha256-LrOLdaLSHuBHXW2X7BnGMoen4UAjHkIUlp0OrJI81/8="; }; - propagatedBuildInputs = [ pyyaml ]; + build-system = [ setuptools ]; + + dependencies = [ pyyaml ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyyaml-ft/default.nix b/pkgs/development/python-modules/pyyaml-ft/default.nix index 65061acf48ecd..15abcf542c441 100644 --- a/pkgs/development/python-modules/pyyaml-ft/default.nix +++ b/pkgs/development/python-modules/pyyaml-ft/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage, - cython_3_1, + cython, fetchFromGitHub, lib, libyaml, @@ -24,7 +24,7 @@ buildPythonPackage rec { }; build-system = [ - cython_3_1 + cython setuptools ]; diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index 40789b68dbc02..723997fc32ce2 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "pyzmq"; - version = "26.4.0"; + version = "27.0.1"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-S9E/hfgJYvkaZRpzVv4EcnkaX3qS8ieCK1rPRHlcYm0="; + hash = "sha256-RcVJIEvCDnSE/9JVX2zwLlckQOzy873WDUQEsg/d9ks="; }; build-system = [ diff --git a/pkgs/development/python-modules/qcodes/default.nix b/pkgs/development/python-modules/qcodes/default.nix index 451a7f43bb457..337f078f88559 100644 --- a/pkgs/development/python-modules/qcodes/default.nix +++ b/pkgs/development/python-modules/qcodes/default.nix @@ -61,14 +61,14 @@ buildPythonPackage rec { pname = "qcodes"; - version = "0.52.0"; + version = "0.53.0"; pyproject = true; src = fetchFromGitHub { owner = "microsoft"; repo = "Qcodes"; tag = "v${version}"; - hash = "sha256-AQBzYKD4RsPQBtq/FxFwYnSUf8wW87JOb2cOnk9MHDY="; + hash = "sha256-uXVL25U7szJF/v7OEsB9Ww1h6ziBxsMJdqhZG5qn0VU="; }; postPatch = '' @@ -200,7 +200,7 @@ buildPythonPackage rec { meta = { description = "Python-based data acquisition framework"; - changelog = "https://github.com/QCoDeS/Qcodes/releases/tag/v${version}"; + changelog = "https://github.com/QCoDeS/Qcodes/releases/tag/${src.tag}"; downloadPage = "https://github.com/QCoDeS/Qcodes"; homepage = "https://qcodes.github.io/Qcodes/"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index ef15dc42303c5..6e208ebb80697 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "qiskit-aer"; - version = "0.16.0.1"; + version = "0.17.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aer"; tag = version; - hash = "sha256-YF5X//X0fvJyALEB4gqsKRNWSoEsOrZFLVQUgHOA+0A="; + hash = "sha256-jvapuARJUHgAKFUzGb5MUft01LNefVIXtStJqFnCo90="; }; postPatch = '' diff --git a/pkgs/development/python-modules/qiskit-machine-learning/default.nix b/pkgs/development/python-modules/qiskit-machine-learning/default.nix index 4a872f34f554f..559d858e0fbbf 100644 --- a/pkgs/development/python-modules/qiskit-machine-learning/default.nix +++ b/pkgs/development/python-modules/qiskit-machine-learning/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "qiskit-machine-learning"; - version = "0.8.2"; + version = "0.8.3"; pyproject = true; disabled = pythonOlder "3.6"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; tag = version; - hash = "sha256-dvGUtB7R44B+DYZKl4R2Q0GdvLTjVKWD0KmuyCoaOSc="; + hash = "sha256-XnLCejK6m8p/OC5gKCoP1UXVblISChu3lKF8BnrnRbk="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index ac39260c0df0e..38bd460cff8ab 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -33,7 +33,7 @@ in buildPythonPackage rec { pname = "qiskit"; # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history - version = "1.3.1"; + version = "2.1.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit"; tag = version; - hash = "sha256-Dqd8ywnACfvrfY7Fzw5zYwhlsDvHZErPGvxBPs2pS04="; + hash = "sha256-WHfsl/T4lmnvkGY7gF5PStilGq3G66TZG9oB1tKwuOQ="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/qnapstats/default.nix b/pkgs/development/python-modules/qnapstats/default.nix index fec3e1968c260..bcbe9c775469d 100644 --- a/pkgs/development/python-modules/qnapstats/default.nix +++ b/pkgs/development/python-modules/qnapstats/default.nix @@ -30,6 +30,11 @@ buildPythonPackage rec { nativeCheckInputs = [ responses ]; + # File "/build/source/tests/test-models.py", line 124, in + # assert json.dumps(qnap.get_system_stats(), sort_keys=True) == systemstats + # https://github.com/colinodell/python-qnapstats/issues/104 + doCheck = false; + checkPhase = '' runHook preCheck @@ -38,9 +43,6 @@ buildPythonPackage rec { runHook postCheck ''; - # https://github.com/colinodell/python-qnapstats/issues/104 - doCheck = false; - pythonImportsCheck = [ "qnapstats" ]; meta = { diff --git a/pkgs/development/python-modules/qt-material/default.nix b/pkgs/development/python-modules/qt-material/default.nix index 2a6d64c55e22d..3f3bb9e072842 100644 --- a/pkgs/development/python-modules/qt-material/default.nix +++ b/pkgs/development/python-modules/qt-material/default.nix @@ -1,28 +1,34 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, jinja2, + setuptools, }: buildPythonPackage rec { pname = "qt-material"; - version = "2.14"; - format = "setuptools"; + version = "2.17"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-tdu1relyF8964za7fAR8kL6zncfyBIpJjJFq1fL3riM="; + src = fetchFromGitHub { + owner = "dunderlab"; + repo = "qt-material"; + tag = "v${version}"; + hash = "sha256-ilrPA8SoVCo6FgwxWQ4sOjqURCFDQJLlTTkCZzTZQKI="; }; - propagatedBuildInputs = [ jinja2 ]; + build-system = [ setuptools ]; + + dependencies = [ jinja2 ]; pythonImportsCheck = [ "qt_material" ]; - meta = with lib; { + meta = { + changelog = "https://github.com/dunderlab/qt-material/releases/tag/${src.tag}"; description = "Material inspired stylesheet for PySide2, PySide6, PyQt5 and PyQt6"; - homepage = "https://github.com/UN-GCPDS/qt-material"; - license = licenses.bsd2; - maintainers = with maintainers; [ _999eagle ]; + homepage = "https://github.com/dunderlab/qt-material"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ _999eagle ]; }; } diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index d7ac4bcde75a0..9803f449dc97c 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -37,6 +37,11 @@ buildPythonPackage rec { }) ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "Cython >=3.0.12, <3.1.0" Cython + ''; + build-system = [ cmake cython diff --git a/pkgs/development/python-modules/rapidgzip/default.nix b/pkgs/development/python-modules/rapidgzip/default.nix index 230f94c0ad73b..f3dc069b9ffff 100644 --- a/pkgs/development/python-modules/rapidgzip/default.nix +++ b/pkgs/development/python-modules/rapidgzip/default.nix @@ -10,19 +10,21 @@ buildPythonPackage rec { pname = "rapidgzip"; - version = "0.14.4"; + version = "0.14.5"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-sHtL5TKVR6iP9pRg0/omw0gXqxgEQG8VcTAzkL3jjWs="; + hash = "sha256-+u1GAToaYqUZPElhWolmg+pcFO1HRLy0vRhpsUIFUdg="; }; prePatch = '' # pythonRelaxDeps doesn't work here - substituteInPlace pyproject.toml --replace-fail "setuptools >= 61.2, < 72" "setuptools" + substituteInPlace pyproject.toml \ + --replace-fail "setuptools >= 61.2, < 72" "setuptools" \ + --replace-fail "cython >= 3, < 3.1" cython ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix index e0af42135d967..1ead42bb779bb 100644 --- a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix +++ b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix @@ -21,13 +21,13 @@ requests, }: let - version = "2.1.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "RapidAI"; repo = "RapidOCR"; tag = "v${version}"; - hash = "sha256-4R2rOCfnhElII0+a5hnvbn+kKQLEtH1jBvfFdxpLEBk="; + hash = "sha256-EgVBMQX+E8ejUd/6FUQ+uJoWjrQSVznpPcc2gA2wAOE="; }; models = diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 47ef8ed315609..9fc55c214146a 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -45,6 +45,11 @@ buildPythonPackage rec { hash = "sha256-InejYBRa4i0E2GxEWbtBpaErtcoYrhtypAlRtMlUoDk="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "cython~=3.0.2" cython + ''; + nativeBuildInputs = [ cython gdal diff --git a/pkgs/development/python-modules/ratarmount/default.nix b/pkgs/development/python-modules/ratarmount/default.nix index 8cc31927bcf75..c6ae9038fb85a 100644 --- a/pkgs/development/python-modules/ratarmount/default.nix +++ b/pkgs/development/python-modules/ratarmount/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "ratarmount"; - version = "1.0.0"; + version = "1.1.2"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-cXm301LMEsiE1eKJO70gTy7asdZ5CKnKtxLinW2+iJ4="; + hash = "sha256-XiwtmZ7HGZwjJJrUD3TOP3o19RBwB/Yu09xdwK13+hk="; }; pythonRelaxDeps = [ "python-xz" ]; diff --git a/pkgs/development/python-modules/ratarmountcore/default.nix b/pkgs/development/python-modules/ratarmountcore/default.nix index 3d5ef3529f57c..c0d4e5c06dc00 100644 --- a/pkgs/development/python-modules/ratarmountcore/default.nix +++ b/pkgs/development/python-modules/ratarmountcore/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "ratarmountcore"; - version = "1.0.0"; + version = "1.1.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "mxmlnkn"; repo = "ratarmount"; tag = "v${version}"; - hash = "sha256-nTKbwZoD7nf3cKFJOR5p6ZRFHsKVeJXboOAhPjvnQAM="; + hash = "sha256-8DjmYYTb0BR5KvtSeI2s7VtYdbRSI+QCjhZfDwqnk3M="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/rawpy/default.nix b/pkgs/development/python-modules/rawpy/default.nix index 6270febe7bfa0..ed82047d9a295 100644 --- a/pkgs/development/python-modules/rawpy/default.nix +++ b/pkgs/development/python-modules/rawpy/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "rawpy"; - version = "0.24.0"; + version = "0.25.1"; pyproject = true; src = fetchFromGitHub { owner = "letmaik"; repo = "rawpy"; tag = "v${version}"; - hash = "sha256-u/KWbviyhbMts40Gc/9shXSESwihWZQQaf3Z44gMgvs="; + hash = "sha256-d3TxPW3GdCQT8bBbnveSxtWHkf5zinM8nSy4m/P7m7Q="; }; build-system = [ diff --git a/pkgs/development/python-modules/recline/default.nix b/pkgs/development/python-modules/recline/default.nix index d7c3d896ee283..3b88fda29ef9f 100644 --- a/pkgs/development/python-modules/recline/default.nix +++ b/pkgs/development/python-modules/recline/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "recline"; - version = "2024.7.1"; + version = "2025.6"; pyproject = true; src = fetchFromGitHub { owner = "NetApp"; repo = "recline"; tag = "v${version}"; - sha256 = "sha256-Qc4oofuhSZ2S5zuCY9Ce9ISldYI3MDUJXFc8VcXdLIU="; + sha256 = "sha256-WBMt5jDPCBmTgVdYDN662uU2HVjB1U3GYJwn0P56WsI="; }; patches = [ diff --git a/pkgs/development/python-modules/redis-om/default.nix b/pkgs/development/python-modules/redis-om/default.nix index be929f9cd306b..5800bcb20004e 100644 --- a/pkgs/development/python-modules/redis-om/default.nix +++ b/pkgs/development/python-modules/redis-om/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "redis-om"; - version = "0.3.3"; + version = "0.3.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "redis"; repo = "redis-om-python"; tag = "v${version}"; - hash = "sha256-Pp404HaFpYEPie9xknoabotFrqcI2ibDlPTM+MmnMbg="; + hash = "sha256-TfwMYDZYDKCdI5i8izBVZaXN5GC/Skhkl905c/DHuXY="; }; build-system = [ @@ -77,7 +77,7 @@ buildPythonPackage rec { description = "Object mapping, and more, for Redis and Python"; mainProgram = "migrate"; homepage = "https://github.com/redis/redis-om-python"; - changelog = "https://github.com/redis/redis-om-python/releases/tag/v${version}"; + changelog = "https://github.com/redis/redis-om-python/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ natsukium ]; }; diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix index 64ec9fa2f62ac..35f2e517fc3a4 100644 --- a/pkgs/development/python-modules/redis/default.nix +++ b/pkgs/development/python-modules/redis/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "redis"; - version = "6.1.0"; + version = "6.2.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ySjiZ61p0waa8oqYI6B3Ju33LH43dk9D3AEj83kowHU="; + hash = "sha256-6CHxKbdd3my5ndNeXHboxJUSpaDY39xWCy+9RLhcqXc="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index 4543c90e1e42f..df4590459ed58 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "regex"; - version = "2024.11.6"; + version = "2025.7.34"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-erFZsGPFKgMzyITkZ5+NeoURLuMHj+PZAEst2HVYVRk="; + hash = "sha256-nq2XZSF6/QSoaCLfzU7SdH3+Qm6IfaQTsV/wrCRX4ho="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/remarshal/default.nix b/pkgs/development/python-modules/remarshal/default.nix index 45b745d0f8870..e6d70e5dad6a4 100644 --- a/pkgs/development/python-modules/remarshal/default.nix +++ b/pkgs/development/python-modules/remarshal/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "remarshal"; - version = "1.0.0"; + version = "1.0.1"; # test with `nix-build pkgs/pkgs-lib/format` pyproject = true; src = fetchFromGitHub { owner = "dbohdan"; repo = "remarshal"; tag = "v${version}"; - hash = "sha256-14vkLX7wKi+AYv2wPeHJ7MhKBKp+GB3oHWqxiPdkQhs="; + hash = "sha256-7Gng/Oc9dwtWx4Xej6hf5IuUGM9/E9Hk9QTntqWk/Z0="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/rencode/default.nix b/pkgs/development/python-modules/rencode/default.nix index 4c1857e1b70b9..0d8d495eb41c9 100644 --- a/pkgs/development/python-modules/rencode/default.nix +++ b/pkgs/development/python-modules/rencode/default.nix @@ -3,23 +3,28 @@ buildPythonPackage, fetchFromGitHub, cython, + poetry-core, + setuptools, pytestCheckHook, }: -buildPythonPackage { +buildPythonPackage rec { pname = "rencode"; - version = "unstable-2021-08-10"; - - format = "setuptools"; + version = "1.0.8"; + pyproject = true; src = fetchFromGitHub { owner = "aresch"; repo = "rencode"; - rev = "572ff74586d9b1daab904c6f7f7009ce0143bb75"; - hash = "sha256-cL1hV3RMDuSdcjpPXXDYIEbzQrxiPeRs82PU8HTEQYk="; + tag = "v${version}"; + hash = "sha256-k2b6DoKwNeQBkmqSRXqaRTjK7CVX6IKuXCLG9lBdLLY="; }; - nativeBuildInputs = [ cython ]; + nativeBuildInputs = [ + poetry-core + setuptools + cython + ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/repl-python-wakatime/default.nix b/pkgs/development/python-modules/repl-python-wakatime/default.nix index 72bdb809a8cb6..3c9be8145a5e9 100644 --- a/pkgs/development/python-modules/repl-python-wakatime/default.nix +++ b/pkgs/development/python-modules/repl-python-wakatime/default.nix @@ -1,12 +1,11 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, ipython, keyring, ptpython, pytestCheckHook, - pythonOlder, setuptools, setuptools-generate, setuptools-scm, @@ -14,14 +13,14 @@ buildPythonPackage rec { pname = "repl-python-wakatime"; - version = "0.0.11"; + version = "0.0.12"; pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-HoCdeo03Lf3g5Xg0GgAyWOu2PtGqy33vg5bQrfkEPkE="; + src = fetchFromGitHub { + owner = "wakatime"; + repo = "repl-python-wakatime"; + tag = version; + hash = "sha256-fp59usITk7gsUIhrnH5vj36kU1u2QWyu/bs46RDz+As="; }; build-system = [ diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index 04d6fada9d2d7..c6bed3f383fb0 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - chardet, + charset-normalizer, fetchPypi, freetype, pillow, @@ -17,7 +17,7 @@ let in buildPythonPackage rec { pname = "reportlab"; - version = "4.4.1"; + version = "4.4.3"; pyproject = true; # See https://bitbucket.org/pypy/compatibility/wiki/reportlab%20toolkit @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-X5ufwLekjokSwlzPadJrgpgKsNpxjk9YP6cg6Pj1Bz8="; + hash = "sha256-BzsJddq2lTas0yUYWOawUk7T4IfnHx0NGJWstQrPnHs="; }; postPatch = '' @@ -39,12 +39,12 @@ buildPythonPackage rec { rm tests/test_graphics_charts.py ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; buildInputs = [ ft ]; - propagatedBuildInputs = [ - chardet + dependencies = [ + charset-normalizer pillow ]; diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix index b81f576584f54..46f7180776847 100644 --- a/pkgs/development/python-modules/reproject/default.nix +++ b/pkgs/development/python-modules/reproject/default.nix @@ -7,6 +7,7 @@ cloudpickle, cython, dask, + extension-helpers, fetchPypi, fsspec, numpy, @@ -20,14 +21,14 @@ buildPythonPackage rec { pname = "reproject"; - version = "0.14.1"; + version = "0.15.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-U8jqJ5uLVX8zoeQwr14FPNdHACRA4HK65q2TAtRr5Xk="; + hash = "sha256-l9pmxtXIGnl8T8fCsUp/5y3kReg3MXdaN0i2rpcEqE4="; }; postPatch = '' @@ -47,6 +48,7 @@ buildPythonPackage rec { astropy-healpix cloudpickle dask + extension-helpers fsspec numpy scipy diff --git a/pkgs/development/python-modules/reptor/default.nix b/pkgs/development/python-modules/reptor/default.nix index 168ee1054606b..4611e85cf0133 100644 --- a/pkgs/development/python-modules/reptor/default.nix +++ b/pkgs/development/python-modules/reptor/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "reptor"; - version = "0.31"; + version = "0.32"; pyproject = true; src = fetchFromGitHub { owner = "Syslifters"; repo = "reptor"; tag = version; - hash = "sha256-AbrfQJQvKXpV4FrhkGZOLYX3px9dzr9whJZwzR/7UYM="; + hash = "sha256-nNG4rQHloOqcPZPnvw3hbw0+wCbB2XAdQ5/XnJtCHnE="; }; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/reqif/default.nix b/pkgs/development/python-modules/reqif/default.nix index aa3ab6303cc61..b45ca4d2bad60 100644 --- a/pkgs/development/python-modules/reqif/default.nix +++ b/pkgs/development/python-modules/reqif/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "reqif"; - version = "0.0.42"; + version = "0.0.46"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "strictdoc-project"; repo = "reqif"; tag = version; - hash = "sha256-cQhis7jrcly3cw2LRv7hpPBFAB0Uag69czf+wJvbh/Q="; + hash = "sha256-QI+OhhV+jKw3g2erSCdTj10JW+XFQQyXuAC0LAnts7c="; }; postPatch = '' @@ -51,7 +51,7 @@ buildPythonPackage rec { description = "Python library for ReqIF format"; mainProgram = "reqif"; homepage = "https://github.com/strictdoc-project/reqif"; - changelog = "https://github.com/strictdoc-project/reqif/releases/tag/${version}"; + changelog = "https://github.com/strictdoc-project/reqif/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ yuu ]; }; diff --git a/pkgs/development/python-modules/requests-oauthlib/default.nix b/pkgs/development/python-modules/requests-oauthlib/default.nix index 27b2ae885573a..2cb1259f93157 100644 --- a/pkgs/development/python-modules/requests-oauthlib/default.nix +++ b/pkgs/development/python-modules/requests-oauthlib/default.nix @@ -30,11 +30,13 @@ buildPythonPackage rec { requests-mock ]; - # Exclude tests which require network access disabledTests = [ + # Exclude tests which require network access "testCanPostBinaryData" "test_content_type_override" "test_url_is_native_str" + # too narrow time comparison + "test_fetch_access_token" ]; # Requires selenium and chrome diff --git a/pkgs/development/python-modules/retrying/default.nix b/pkgs/development/python-modules/retrying/default.nix index ebef0e8ee6776..6339e060e364c 100644 --- a/pkgs/development/python-modules/retrying/default.nix +++ b/pkgs/development/python-modules/retrying/default.nix @@ -2,23 +2,26 @@ lib, buildPythonPackage, fetchPypi, + setuptools, six, pythonOlder, }: buildPythonPackage rec { pname = "retrying"; - version = "1.4.1"; - format = "setuptools"; + version = "1.4.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TSBuDtKv9e8vPNhnq7lRHp6PMRJ8Wsog8dUkbkdpA7A="; + hash = "sha256-0QLnXVPY0wuIVi1FNh1sbJNNoG+rMb2BwEIKy5eoujk="; }; - propagatedBuildInputs = [ six ]; + build-system = [ setuptools ]; + + dependencies = [ six ]; # doesn't ship tests in tarball doCheck = false; diff --git a/pkgs/development/python-modules/returns/default.nix b/pkgs/development/python-modules/returns/default.nix index 82e00f4583163..dc2a443f4a95f 100644 --- a/pkgs/development/python-modules/returns/default.nix +++ b/pkgs/development/python-modules/returns/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "returns"; - version = "0.24.0"; + version = "0.26.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "dry-python"; repo = "returns"; tag = version; - hash = "sha256-qmBxW1XxUlFpAqf2t2ix01TN5NSxOtnYqLyE5ovZU58="; + hash = "sha256-VQzsa/uNTQVND0kc20d25to/6LELEiS3cqvG7a1kDw4="; }; postPatch = '' @@ -63,7 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "Make your functions return something meaningful, typed, and safe"; homepage = "https://github.com/dry-python/returns"; - changelog = "https://github.com/dry-python/returns/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/dry-python/returns/blob/${src.tag}/CHANGELOG.md"; license = licenses.bsd2; maintainers = with maintainers; [ jessemoore ]; }; diff --git a/pkgs/development/python-modules/reverse-geocode/default.nix b/pkgs/development/python-modules/reverse-geocode/default.nix index 8c87d9b7c5b0d..04b6ff052ac23 100644 --- a/pkgs/development/python-modules/reverse-geocode/default.nix +++ b/pkgs/development/python-modules/reverse-geocode/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "reverse-geocode"; - version = "1.6.5"; + version = "1.6.6"; pyproject = true; disabled = pythonOlder "3.10"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "reverse_geocode"; inherit version; - hash = "sha256-AyqkLnbHa8ZylVfrJHpsxLeBfLTl6u9IQ3EV8grXrkE="; + hash = "sha256-FBZYFYFsxjnddOtmCnTkZK7rzR0IFN50qJfWIHHJnyo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/rfc3987-syntax/default.nix b/pkgs/development/python-modules/rfc3987-syntax/default.nix new file mode 100644 index 0000000000000..6de67fae9bde4 --- /dev/null +++ b/pkgs/development/python-modules/rfc3987-syntax/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + lark, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "rfc3987-syntax"; + version = "1.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "willynilly"; + repo = "rfc3987-syntax"; + tag = "v${version}"; + hash = "sha256-6jA/x8KnwBvyW2k384/EB/NJ8BmJJTEHA8YUlQP+1Y4="; + }; + + build-system = [ + hatchling + ]; + + dependencies = [ + lark + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "rfc3987_syntax" + ]; + + meta = { + changelog = "https://github.com/willynilly/rfc3987-syntax/releases/tag/${src.tag}"; + description = "Helper functions to syntactically validate strings according to RFC 3987"; + homepage = "https://github.com/willynilly/rfc3987-syntax"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/rich-toolkit/default.nix b/pkgs/development/python-modules/rich-toolkit/default.nix index 12a34cb96ccf9..f80020bdd9a91 100644 --- a/pkgs/development/python-modules/rich-toolkit/default.nix +++ b/pkgs/development/python-modules/rich-toolkit/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "rich-toolkit"; - version = "0.14.6"; + version = "0.14.9"; pyproject = true; src = fetchFromGitHub { owner = "patrick91"; repo = "rich-toolkit"; tag = "v${version}"; - hash = "sha256-SHQZ0idEx/zDEtP0xQoJg7eUT8+SqLdWljxfTgXzjkk="; + hash = "sha256-bX6HqUwFkXXc2Z1LF6BSVBEOl2UUJE9pCBKsfOxUoc0="; }; build-system = [ diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index 6e381290a19a6..fda066f3b813e 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, # build-system poetry-core, @@ -10,7 +9,6 @@ # dependencies markdown-it-py, pygments, - typing-extensions, # optional-dependencies ipywidgets, @@ -29,16 +27,14 @@ buildPythonPackage rec { pname = "rich"; - version = "14.0.0"; + version = "14.1.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "Textualize"; repo = "rich"; tag = "v${version}"; - hash = "sha256-gnKzb4lw4zgepTfJahHnpw2/vcg8o1kv8KfeVDSHcQI="; + hash = "sha256-44L3eVf/gI0FlOlxzJ7/+A1jN6ILkeVEelaru1Io20U="; }; build-system = [ poetry-core ]; @@ -46,8 +42,7 @@ buildPythonPackage rec { dependencies = [ markdown-it-py pygments - ] - ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]; + ]; optional-dependencies = { jupyter = [ ipywidgets ]; @@ -59,14 +54,6 @@ buildPythonPackage rec { which ]; - disabledTests = [ - # pygments 2.19 regressions - # https://github.com/Textualize/rich/issues/3612 - "test_inline_code" - "test_blank_lines" - "test_python_render_simple_indent_guides" - ]; - pythonImportsCheck = [ "rich" ]; passthru.tests = { diff --git a/pkgs/development/python-modules/rio-tiler/default.nix b/pkgs/development/python-modules/rio-tiler/default.nix index 18c1739231612..1be8c56cf9acf 100644 --- a/pkgs/development/python-modules/rio-tiler/default.nix +++ b/pkgs/development/python-modules/rio-tiler/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "rio-tiler"; - version = "7.3.0"; + version = "7.8.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "cogeotiff"; repo = "rio-tiler"; tag = version; - hash = "sha256-8Ly1QKKFzct0CPAN/54/kzNUE2FPiwvM+EqmX1utboU="; + hash = "sha256-w7uw5PY3uiJmxsgSB1YDbtG7IY1pd4WU3JExZRc40gs="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/rlax/default.nix b/pkgs/development/python-modules/rlax/default.nix index 7d800cc5e62f3..b6a8a8c0a753d 100644 --- a/pkgs/development/python-modules/rlax/default.nix +++ b/pkgs/development/python-modules/rlax/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "rlax"; - version = "0.1.6"; + version = "0.1.7"; pyproject = true; src = fetchFromGitHub { owner = "google-deepmind"; repo = "rlax"; tag = "v${version}"; - hash = "sha256-v2Lbzya+E9d7tlUVlQQa4fuPp2q3E309Qvyt70mcdb0="; + hash = "sha256-w5vhXBMUlcqlLTKA58QgQ4pxyGs3etxJLIFUVPhE7H8="; }; # TODO: remove these patches at the next release (already on master) @@ -111,7 +111,7 @@ buildPythonPackage rec { meta = { description = "Library of reinforcement learning building blocks in JAX"; homepage = "https://github.com/deepmind/rlax"; - changelog = "https://github.com/google-deepmind/rlax/releases/tag/v${version}"; + changelog = "https://github.com/google-deepmind/rlax/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ onny ]; }; diff --git a/pkgs/development/python-modules/roadtx/default.nix b/pkgs/development/python-modules/roadtx/default.nix index 67313581adb69..bdd0c68c8b17d 100644 --- a/pkgs/development/python-modules/roadtx/default.nix +++ b/pkgs/development/python-modules/roadtx/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "roadtx"; - version = "1.17.0"; + version = "1.18.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-C/s5zNvqREDc6r9EdPrN4+L913XWYTniKQVbaosh9iE="; + hash = "sha256-tJLsxo8XQ0FGyob2SSpjvN9RgVYYhDxGcbP6jytcjaU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/robotstatuschecker/default.nix b/pkgs/development/python-modules/robotstatuschecker/default.nix index 95efb791fe19f..69ea26d867dfc 100644 --- a/pkgs/development/python-modules/robotstatuschecker/default.nix +++ b/pkgs/development/python-modules/robotstatuschecker/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "robotstatuschecker"; - version = "3.0.1"; + version = "4.1.1"; pyproject = true; # no tests included in PyPI tarball @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "robotframework"; repo = "statuschecker"; tag = "v${version}"; - hash = "sha256-yW6353gDwo/IzoWOB8oelaS6IUbvTtwwDT05yD7w6UA="; + hash = "sha256-YyiGd3XSIe+4PEL2l9LYDGH3lt1iRAAJflcBGYXaBzY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/rotary-embedding-torch/default.nix b/pkgs/development/python-modules/rotary-embedding-torch/default.nix index 6ddff713ea0fb..6668fde9720a5 100644 --- a/pkgs/development/python-modules/rotary-embedding-torch/default.nix +++ b/pkgs/development/python-modules/rotary-embedding-torch/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "rotary-embedding-torch"; - version = "0.8.7"; + version = "0.8.9"; pyproject = true; src = fetchFromGitHub { owner = "lucidrains"; repo = "rotary-embedding-torch"; tag = version; - hash = "sha256-xnLZ19IH6ellTmOjj7XVZ21Kly+Exe3ZQwaGzhSRGIA="; + hash = "sha256-mPiOtEmRtn73KGoYMum80q0iETJa9zZW9KIWL8O0dnM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index 8a6a5fe9bcaae..0f6b273fa3aba 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -27,14 +27,14 @@ }: buildPythonPackage rec { - version = "3.5.17"; + version = "3.6.2"; format = "setuptools"; pname = "rpy2"; disabled = isPyPy; src = fetchPypi { inherit version pname; - hash = "sha256-2/8Iww89eRYZImI4WKWztoo/uo7hdH1q9BvEumjz1YI="; + hash = "sha256-F06ld2qR0Ds13VYRiJlg4PVFHp0KvqSr/IwL5qhTd9A="; }; patches = [ diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index fdd697e9d76a2..f4af7b1be9d44 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "rq"; - version = "2.4"; + version = "2.4.1"; pyproject = true; src = fetchFromGitHub { owner = "rq"; repo = "rq"; tag = "v${version}"; - hash = "sha256-7aq9JeyM+IjlRPgh4gs1DmkF0hU5EasgTuUPPlf8960="; + hash = "sha256-CtxirZg6WNQpTMoXQRvB8i/KB3r58WlKh+wjBvyVMMs="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/rtslib-fb/default.nix b/pkgs/development/python-modules/rtslib-fb/default.nix index ab2f3b9d5553d..5704aec8ddb79 100644 --- a/pkgs/development/python-modules/rtslib-fb/default.nix +++ b/pkgs/development/python-modules/rtslib-fb/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "rtslib-fb"; - version = "2.2.2"; + version = "2.2.3"; pyproject = true; # TypeError: 'method' object does not support the context manager protocol @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "open-iscsi"; repo = "rtslib-fb"; tag = "v${version}"; - hash = "sha256-FuXO/yGZBR+QRvB5s1tE77hjnisSfjjHSCPLvGJOYdM="; + hash = "sha256-UGRQMdOkyPZWjXoJUsXuWqstb473KR+Sf9XHbjIdfJ8="; }; build-system = [ @@ -48,7 +48,7 @@ buildPythonPackage rec { meta = { description = "Python object API for managing the Linux LIO kernel target"; homepage = "https://github.com/open-iscsi/rtslib-fb"; - changelog = "https://github.com/open-iscsi/rtslib-fb/releases/tag/v${version}"; + changelog = "https://github.com/open-iscsi/rtslib-fb/releases/tag/${src.tag}"; license = lib.licenses.asl20; platforms = lib.platforms.linux; mainProgram = "targetctl"; diff --git a/pkgs/development/python-modules/ruamel-yaml/default.nix b/pkgs/development/python-modules/ruamel-yaml/default.nix index 9d1aee84809d3..4096a930e5bf8 100644 --- a/pkgs/development/python-modules/ruamel-yaml/default.nix +++ b/pkgs/development/python-modules/ruamel-yaml/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "ruamel-yaml"; - version = "0.18.10"; + version = "0.18.14"; pyproject = true; src = fetchPypi { pname = "ruamel.yaml"; inherit version; - hash = "sha256-IMhqsprCFT+ApCjhJUqK32htM4PfBEkFFMo7eaNi21g="; + hash = "sha256-cie3aq7DZN8Vk2cw7799crMMC3mx1Xi7uOPcstgfUrc="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/rubicon-objc/default.nix b/pkgs/development/python-modules/rubicon-objc/default.nix index 83fe9636748c0..cab1a5684b8df 100644 --- a/pkgs/development/python-modules/rubicon-objc/default.nix +++ b/pkgs/development/python-modules/rubicon-objc/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "rubicon-objc"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "beeware"; repo = "rubicon-objc"; tag = "v${version}"; - hash = "sha256-yEsW8xHW004O7aDU4/mlbfTuF2H5UcpbNR9NACxQv3M="; + hash = "sha256-HnPp7VUrcTfkl5XdXYasydMqxhp7eb7r5RW/7yRWmko="; }; postPatch = '' diff --git a/pkgs/development/python-modules/rucio/default.nix b/pkgs/development/python-modules/rucio/default.nix index 15ffb3309b941..7e43bc92ac3dc 100644 --- a/pkgs/development/python-modules/rucio/default.nix +++ b/pkgs/development/python-modules/rucio/default.nix @@ -37,14 +37,14 @@ buildPythonPackage rec { pname = "rucio"; - version = "32.8.6"; + version = "37.7.1"; pyproject = true; src = fetchFromGitHub { owner = "rucio"; repo = "rucio"; tag = version; - hash = "sha256-VQQ4gy9occism1WDrlcHnB7b7D5/G68wKct2PhD59FA="; + hash = "sha256-PZ6g/ILs1ed+lxcH2GyV1YJyJqLgYb5/xQ31OXiXnBU="; }; pythonRelaxDeps = [ @@ -107,7 +107,7 @@ buildPythonPackage rec { meta = { description = "Tool for Scientific Data Management"; homepage = "http://rucio.cern.ch/"; - changelog = "https://github.com/rucio/rucio/releases/tag/${version}"; + changelog = "https://github.com/rucio/rucio/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ veprbl ]; }; diff --git a/pkgs/development/python-modules/ruff/default.nix b/pkgs/development/python-modules/ruff/default.nix index edd44682d7f75..d32d951c4aec5 100644 --- a/pkgs/development/python-modules/ruff/default.nix +++ b/pkgs/development/python-modules/ruff/default.nix @@ -29,7 +29,7 @@ buildPythonPackage { # to avoid rebuilding the ruff binary for every active python package set. + '' substituteInPlace pyproject.toml \ - --replace-fail 'requires = ["maturin>=1.0,<2.0"]' 'requires = ["hatchling"]' \ + --replace-fail 'requires = ["maturin>=1.9,<2.0"]' 'requires = ["hatchling"]' \ --replace-fail 'build-backend = "maturin"' 'build-backend = "hatchling.build"' cat >> pyproject.toml <=8.0.4,<9"]' '["setuptools_scm"]' substituteInPlace pyproject.toml \ - --replace-fail "mypy[mypyc]==1.15.0" "mypy" + --replace-fail '"setuptools_scm[toml]>=8.0.4,<9"' '"setuptools_scm[toml]"' \ + --replace-fail "mypy[mypyc]==1.17.0" "mypy" sed -i "/black>=/d" pyproject.toml ''; diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix index 3da89a537923b..347c9364e41b7 100644 --- a/pkgs/development/python-modules/scikit-bio/default.nix +++ b/pkgs/development/python-modules/scikit-bio/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "scikit-bio"; - version = "0.6.3"; + version = "0.7.0"; pyproject = true; src = fetchFromGitHub { owner = "scikit-bio"; repo = "scikit-bio"; tag = version; - hash = "sha256-yZa9Kl7+Rk4FLQkZIxa9UIsIGAo6YI4UAiJYbhhPIaI="; + hash = "sha256-M0P5DUAMlRTkaIPbxSvO99N3y5eTrkg4NMlkIpGr4/g="; }; build-system = [ diff --git a/pkgs/development/python-modules/scikit-build-core/default.nix b/pkgs/development/python-modules/scikit-build-core/default.nix index ebca328cc73a4..d4f73945c8be8 100644 --- a/pkgs/development/python-modules/scikit-build-core/default.nix +++ b/pkgs/development/python-modules/scikit-build-core/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "scikit-build-core"; - version = "0.11.3"; + version = "0.11.5"; pyproject = true; src = fetchFromGitHub { owner = "scikit-build"; repo = "scikit-build-core"; - rev = "refs/tags/v${version}"; - hash = "sha256-RtRk0g0ZREFPjm2i2uTqV3UfKZ/aDHUGyju3SI8vs0Y="; + tag = "v${version}"; + hash = "sha256-4DwODJw1U/0+K/d7znYtDO2va71lzp1gDm4Bg9OBjQY="; }; postPatch = lib.optionalString (pythonOlder "3.11") '' @@ -91,7 +91,7 @@ buildPythonPackage rec { meta = with lib; { description = "Next generation Python CMake adaptor and Python API for plugins"; homepage = "https://github.com/scikit-build/scikit-build-core"; - changelog = "https://github.com/scikit-build/scikit-build-core/blob/${src.rev}/docs/about/changelog.md"; + changelog = "https://github.com/scikit-build/scikit-build-core/blob/${src.tag}/docs/about/changelog.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ veprbl ]; }; diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index b264eabd5ec16..9ebbffd136c29 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { __structuredAttrs = true; pname = "scikit-learn"; - version = "1.6.1"; + version = "1.7.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -34,13 +34,16 @@ buildPythonPackage rec { src = fetchPypi { pname = "scikit_learn"; inherit version; - hash = "sha256-tPwlJeyixppZJg9YPFanVXxszfjer9um4GD5TBxZc44="; + hash = "sha256-JLPx6XakZlqnTuD8qsK4/Mxq53yOB6sl2jum0ykrmAI="; }; postPatch = '' substituteInPlace meson.build --replace-fail \ "run_command('sklearn/_build_utils/version.py', check: true).stdout().strip()," \ "'${version}'," + substituteInPlace pyproject.toml \ + --replace-fail "numpy>=2,<2.3.0" numpy \ + --replace-fail "scipy>=1.8.0,<1.16.0" scipy ''; buildInputs = [ @@ -68,6 +71,11 @@ buildPythonPackage rec { threadpoolctl ]; + pythonRelaxDeps = [ + "numpy" + "scipy" + ]; + nativeCheckInputs = [ pytestCheckHook pytest-xdist diff --git a/pkgs/development/python-modules/scikit-rf/default.nix b/pkgs/development/python-modules/scikit-rf/default.nix index 7948fe945b72d..ffb55f28ca282 100644 --- a/pkgs/development/python-modules/scikit-rf/default.nix +++ b/pkgs/development/python-modules/scikit-rf/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "scikit-rf"; - version = "1.7.0"; + version = "1.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "scikit-rf"; repo = "scikit-rf"; tag = "v${version}"; - hash = "sha256-Ovrr1U7VuuGKDNSBSCyYSz3DNpaJrA57ccl4AFdzC5E="; + hash = "sha256-wQOphwG5/4Bfa+re3S0d7lS4CJlKRjrRqnFZKaTG70M="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/scim2-client/default.nix b/pkgs/development/python-modules/scim2-client/default.nix index 388c21af38529..8748ccf4e62b3 100644 --- a/pkgs/development/python-modules/scim2-client/default.nix +++ b/pkgs/development/python-modules/scim2-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "scim2-client"; - version = "0.5.2"; + version = "0.6.1"; pyproject = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "scim2_client"; - hash = "sha256-viIriAFyfJVrJRr04GBD3dhaQ+iUVujigsx1ucSSeqA="; + hash = "sha256-5XOUOKf0vYHkewY22x5NQdhICXCd+EftKhsxtQurgHQ="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/scim2-models/default.nix b/pkgs/development/python-modules/scim2-models/default.nix index a3e2681e7ad95..2ea8a47a578a7 100644 --- a/pkgs/development/python-modules/scim2-models/default.nix +++ b/pkgs/development/python-modules/scim2-models/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "scim2-models"; - version = "0.3.5"; + version = "0.4.1"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "scim2_models"; - hash = "sha256-nOLCYyyB7Si+KfwdWM7DCkDoaVEj/coUA//ZW3hKHuA="; + hash = "sha256-SRUPO67otfZsrdjGQyTul5vIrYRU2WFaL0fvAtVd/1c="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/scim2-server/default.nix b/pkgs/development/python-modules/scim2-server/default.nix index fa844171be8b0..3f5ea98884ebd 100644 --- a/pkgs/development/python-modules/scim2-server/default.nix +++ b/pkgs/development/python-modules/scim2-server/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "scim2-server"; - version = "0.1.5"; + version = "0.1.7"; pyproject = true; src = fetchPypi { inherit version; pname = "scim2_server"; - hash = "sha256-VCJVLnYg3+Kz7/DXWnZXkFqXVszsd2hm3cLY22J4NRw="; + hash = "sha256-nMS6vjMZ/Lyu0kiVH+IlmxZsuu7McY7AZS/xamfZSlk="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/scipy-stubs/default.nix b/pkgs/development/python-modules/scipy-stubs/default.nix index ce38381ca3efc..984c29e674e4c 100644 --- a/pkgs/development/python-modules/scipy-stubs/default.nix +++ b/pkgs/development/python-modules/scipy-stubs/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "scipy-stubs"; - version = "1.16.0.2"; + version = "1.16.1.0"; pyproject = true; src = fetchFromGitHub { owner = "scipy"; repo = "scipy-stubs"; tag = "v${version}"; - hash = "sha256-xaBii3vONwfHlrsLr+uvXvirZ2WT1OgUzlYxRIRnGdI="; + hash = "sha256-KRwFQG1Nb+Kh9OpQCGtvUzQA0MHNEZnRlzSkpZCNxuw="; }; disabled = pythonOlder "3.11"; diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index e466fb3f8655a..92151e4682599 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -28,6 +28,8 @@ pybind11, pooch, xsimd, + boost188, + qhull, # dependencies numpy, @@ -48,8 +50,8 @@ let # nix-shell maintainers/scripts/update.nix --argstr package python3.pkgs.scipy # # The update script uses sed regexes to replace them with the updated hashes. - version = "1.16.0"; - srcHash = "sha256-PFWUq7RsqMgBK1bTw52y1renoPygWNreikNTFHWE2Ig="; + version = "1.16.1"; + srcHash = "sha256-/LgYQUMGoQjSWMCWBgnekNGzEc0LVg2qiN2tV399rQU="; datasetsHashes = { ascent = "1qjp35ncrniq9rhzb14icwwykqg2208hcssznn3hz27w39615kh3"; ecg = "1bwbjp43b7znnwha5hv6wiz3g0bhwrpqpi75s12zidxrbwvd62pj"; @@ -130,6 +132,8 @@ buildPythonPackage { pybind11 pooch xsimd + boost188 + qhull ]; dependencies = [ numpy ]; @@ -185,6 +189,7 @@ buildPythonPackage { # meson the proper cross compilation related arguments. See also: # https://docs.scipy.org/doc/scipy/building/cross_compilation.html "--cross-file=${crossFileScipy}" + "-Duse-system-libraries=all" ]; # disable stackprotector on aarch64-darwin for now diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index 012ddd088a506..c6bfc4ec364fa 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "3.3.11"; + version = "3.5.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "scmrepo"; tag = version; - hash = "sha256-0vgpfUeqhol3AZuUotSbGYVyknVSxRLBwVMkcKx3m48="; + hash = "sha256-pAORKgS6IivDjx5sms/9XYZKQ3+hRuRvsEFGkfKj0ME="; }; build-system = [ diff --git a/pkgs/development/python-modules/scooby/default.nix b/pkgs/development/python-modules/scooby/default.nix index 12bbb889ffd9b..97a5eb2887702 100644 --- a/pkgs/development/python-modules/scooby/default.nix +++ b/pkgs/development/python-modules/scooby/default.nix @@ -3,7 +3,9 @@ beautifulsoup4, buildPythonPackage, fetchFromGitHub, + iniconfig, numpy, + psutil, pytest-console-scripts, pytestCheckHook, pythonOlder, @@ -28,8 +30,16 @@ buildPythonPackage rec { build-system = [ setuptools-scm ]; + optional-dependencies = { + cpu = [ + psutil + # mkl + ]; + }; + nativeCheckInputs = [ beautifulsoup4 + iniconfig numpy pytest-console-scripts pytestCheckHook @@ -51,6 +61,8 @@ buildPythonPackage rec { "test_import_time" # TypeError: expected str, bytes or os.PathLike object, not list "test_cli" + # Fails to find iniconfig in environment + "test_auto_report" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/segyio/default.nix b/pkgs/development/python-modules/segyio/default.nix index 005a194afd6d6..1346623c98071 100644 --- a/pkgs/development/python-modules/segyio/default.nix +++ b/pkgs/development/python-modules/segyio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "segyio"; - version = "1.9.12"; + version = "1.9.13"; pyproject = false; # Built with cmake patches = [ @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "equinor"; repo = "segyio"; tag = "v${version}"; - hash = "sha256-+N2JvHBxpdbysn4noY/9LZ4npoQ9143iFEzaxoafnms="; + hash = "sha256-uVQ5cs9EPGUTSbaclLjFDwnbJevtv6ie94FLi+9vd94="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sensor-state-data/default.nix b/pkgs/development/python-modules/sensor-state-data/default.nix index fd414913be3e6..12a40c0af256a 100644 --- a/pkgs/development/python-modules/sensor-state-data/default.nix +++ b/pkgs/development/python-modules/sensor-state-data/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sensor-state-data"; - version = "2.18.1"; + version = "2.19.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "sensor-state-data"; tag = "v${version}"; - hash = "sha256-9GdBKUhueis8pnQP5ZNxvEyRXVGINTueVzLOR4xx5mU="; + hash = "sha256-Jl+kyr9WhYEzvsnSdqfeDDWgcEU9Yi6Snd67YQ+1MqQ="; }; nativeBuildInputs = [ poetry-core ]; @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Models for storing and converting Sensor Data state"; homepage = "https://github.com/bluetooth-devices/sensor-state-data"; - changelog = "https://github.com/Bluetooth-Devices/sensor-state-data/releases/tag/v${version}"; + changelog = "https://github.com/Bluetooth-Devices/sensor-state-data/releases/tag/${src.tag}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/sentence-stream/default.nix b/pkgs/development/python-modules/sentence-stream/default.nix index 3d7d2f8edba3b..0c6907dba076e 100644 --- a/pkgs/development/python-modules/sentence-stream/default.nix +++ b/pkgs/development/python-modules/sentence-stream/default.nix @@ -28,6 +28,10 @@ buildPythonPackage rec { regex ]; + pythonRelaxDeps = [ + "regex" + ]; + nativeCheckInputs = [ pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 076a829967631..c23fc3a688a4b 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -67,14 +67,14 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "2.25.0"; + version = "2.34.1"; pyproject = true; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-python"; tag = version; - hash = "sha256-HQxZczpfTURbkLaWjOqnYB86UuFHD71kE7HPPjlkUqc="; + hash = "sha256-RQnjvX3bDiB9csn/DsQ769EiVm7HY+B7x9V5jpvsOOA="; }; postPatch = '' @@ -214,6 +214,7 @@ buildPythonPackage rec { "test_http_timeout" # KeyError: 'sentry.release' "test_logs_attributes" + "test_logger_with_all_attributes" ]; pythonImportsCheck = [ "sentry_sdk" ]; @@ -221,7 +222,7 @@ buildPythonPackage rec { meta = with lib; { description = "Official Python SDK for Sentry.io"; homepage = "https://github.com/getsentry/sentry-python"; - changelog = "https://github.com/getsentry/sentry-python/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/getsentry/sentry-python/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/setuptools-git/default.nix b/pkgs/development/python-modules/setuptools-git/default.nix index ae5b4224ad0fe..4431e1d8c751d 100644 --- a/pkgs/development/python-modules/setuptools-git/default.nix +++ b/pkgs/development/python-modules/setuptools-git/default.nix @@ -1,26 +1,37 @@ { lib, buildPythonPackage, - fetchPypi, - pkgs, + fetchFromGitHub, + gitMinimal, + replaceVars, + setuptools, }: buildPythonPackage rec { pname = "setuptools-git"; version = "1.2"; - format = "setuptools"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "ff64136da01aabba76ae88b050e7197918d8b2139ccbf6144e14d472b9c40445"; + src = fetchFromGitHub { + owner = "msabramo"; + repo = "setuptools-git"; + tag = version; + hash = "sha256-dbQ15y62nanuWgh2puLYSio391Ja3SF+HrafvTBVNbk="; }; - propagatedBuildInputs = [ pkgs.git ]; + patches = [ + (replaceVars ./hardcode-git-path.patch { + git = lib.getExe gitMinimal; + }) + ]; + + build-system = [ setuptools ]; + doCheck = false; - meta = with lib; { + meta = { description = "Setuptools revision control system plugin for Git"; - homepage = "https://pypi.python.org/pypi/setuptools-git"; - license = licenses.bsd3; + homepage = "https://github.com/msabramo/setuptools-git"; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/setuptools-git/hardcode-git-path.patch b/pkgs/development/python-modules/setuptools-git/hardcode-git-path.patch new file mode 100644 index 0000000000000..1cd8599c51b1c --- /dev/null +++ b/pkgs/development/python-modules/setuptools-git/hardcode-git-path.patch @@ -0,0 +1,31 @@ +diff --git a/setuptools_git/__init__.py b/setuptools_git/__init__.py +index 24c9b8c..a289aca 100644 +--- a/setuptools_git/__init__.py ++++ b/setuptools_git/__init__.py +@@ -28,7 +28,7 @@ def version_calc(dist, attr, value): + + + def calculate_version(): +- return check_output(['git', 'describe', '--tags', '--dirty']).strip() ++ return check_output(['@git@', 'describe', '--tags', '--dirty']).strip() + + + def ntfsdecode(path): +@@ -64,7 +64,7 @@ def gitlsfiles(dirname=''): + + try: + topdir = check_output( +- ['git', 'rev-parse', '--show-toplevel'], cwd=dirname or None, ++ ['@git@', 'rev-parse', '--show-toplevel'], cwd=dirname or None, + stderr=PIPE).strip() + + if sys.platform == 'win32': +@@ -73,7 +73,7 @@ def gitlsfiles(dirname=''): + cwd = topdir + + filenames = check_output( +- ['git', 'ls-files', '-z'], cwd=cwd, stderr=PIPE) ++ ['@git@', 'ls-files', '-z'], cwd=cwd, stderr=PIPE) + except (CalledProcessError, OSError): + # Setuptools mandates we fail silently + return res diff --git a/pkgs/development/python-modules/setuptools-scm/default.nix b/pkgs/development/python-modules/setuptools-scm/default.nix index e8eb947c18304..a576af2ce3648 100644 --- a/pkgs/development/python-modules/setuptools-scm/default.nix +++ b/pkgs/development/python-modules/setuptools-scm/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "setuptools-scm"; - version = "8.3.1"; + version = "9.0.1"; pyproject = true; src = fetchPypi { pname = "setuptools_scm"; inherit version; - hash = "sha256-PVVekrddrNA30yuv35T5evUeoprox7I0z5S3pb0kKmM="; + hash = "sha256-RuHPfooJZSthP5uk/ptV8vSW56Iz5OANJafLQflMPAs="; }; postPatch = diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 6590a4d126d73..03156d16334c2 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "setuptools"; - version = "80.7.1"; + version = "80.9.0"; pyproject = true; src = fetchFromGitHub { owner = "pypa"; repo = "setuptools"; tag = "v${version}"; - hash = "sha256-lOGvJoVwFxASI7e5fJkeS7iGOIPklGRYmmMfclqn0H4="; + hash = "sha256-wueVQsV0ja/iPFRK7OKV27FQ7hYKF8cP3WH5wJeIXnI="; }; patches = [ diff --git a/pkgs/development/python-modules/shap/default.nix b/pkgs/development/python-modules/shap/default.nix index 3c4a217fb2b31..498899a7e78ff 100644 --- a/pkgs/development/python-modules/shap/default.nix +++ b/pkgs/development/python-modules/shap/default.nix @@ -7,6 +7,7 @@ writeText, catboost, cloudpickle, + cython, ipython, lightgbm, lime, @@ -30,7 +31,7 @@ buildPythonPackage rec { pname = "shap"; - version = "0.46.0"; + version = "0.48.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -39,15 +40,17 @@ buildPythonPackage rec { owner = "slundberg"; repo = "shap"; tag = "v${version}"; - hash = "sha256-qW36/Xw5oaYKmaMfE5euzkED9CKkjl2O55aO0OpCkfI="; + hash = "sha256-eWZhyrFpEFlmTFPTHZng9V+uMRMXDVzFdgrqIzRQTws="; }; postPatch = '' substituteInPlace pyproject.toml \ + --replace-fail "cython>=3.0.11" cython \ --replace-fail "numpy>=2.0" "numpy" ''; build-system = [ + cython numpy setuptools setuptools-scm @@ -147,7 +150,7 @@ buildPythonPackage rec { meta = with lib; { description = "Unified approach to explain the output of any machine learning model"; homepage = "https://github.com/slundberg/shap"; - changelog = "https://github.com/slundberg/shap/releases/tag/v${version}"; + changelog = "https://github.com/slundberg/shap/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ evax diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 3e204277afbe2..ccad45bbac48c 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "shapely"; - version = "2.1.0"; + version = "2.1.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "shapely"; repo = "shapely"; tag = version; - hash = "sha256-Co3acjWsGWjwzMoklRx2CqBDOlEpaj3wWenLWxopvKY="; + hash = "sha256-qIITlPym92wfq0byqjRxofpmYYg7vohbi1qPVEu6hRg="; }; nativeBuildInputs = [ @@ -61,7 +61,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "shapely" ]; meta = { - changelog = "https://github.com/shapely/shapely/blob/${version}/CHANGES.txt"; + changelog = "https://github.com/shapely/shapely/blob/${src.tag}/CHANGES.txt"; description = "Manipulation and analysis of geometric objects"; homepage = "https://github.com/shapely/shapely"; license = lib.licenses.bsd3; diff --git a/pkgs/development/python-modules/shazamio/default.nix b/pkgs/development/python-modules/shazamio/default.nix index eec2b5bdcc73e..d46ea0258aa1e 100644 --- a/pkgs/development/python-modules/shazamio/default.nix +++ b/pkgs/development/python-modules/shazamio/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "shazamio"; - version = "0.7.0"; + version = "0.8.1"; format = "pyproject"; src = fetchFromGitHub { owner = "dotX12"; repo = "ShazamIO"; tag = version; - hash = "sha256-72bZyEKvCt/MSqQKzEMQZUC3z53rGm0LJCv6oBCQEYE="; + hash = "sha256-beEEr9Y8w0XlC/0+mNL/oWscmnfwt9KChlZ7Ullyk3E="; }; patches = [ diff --git a/pkgs/development/python-modules/shtab/default.nix b/pkgs/development/python-modules/shtab/default.nix index f89577c49a5a0..c72372b84ad46 100644 --- a/pkgs/development/python-modules/shtab/default.nix +++ b/pkgs/development/python-modules/shtab/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, pytest-timeout, pytestCheckHook, pytest-cov-stub, @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "shtab"; - version = "1.7.1"; + version = "1.7.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,9 +23,17 @@ buildPythonPackage rec { owner = "iterative"; repo = "shtab"; tag = "v${version}"; - hash = "sha256-8bAwLSdJCzFw5Vf9CKBrH5zOoojeXds7aIRncl+sLBI="; + hash = "sha256-ngTAST+6lBek0PHvULmlJZAHVU49YN5+XAu5KEk6cIM="; }; + patches = [ + # Fix bash error on optional nargs="?" (iterative/shtab#184) + (fetchpatch2 { + url = "https://github.com/iterative/shtab/commit/a04ddf92896f7e206c9b19d48dcc532765364c59.patch?full_index=1"; + hash = "sha256-H4v81xQLI9Y9R5OyDPJevCLh4gIUaiJKHVEU/eWdNbA="; + }) + ]; + nativeBuildInputs = [ setuptools setuptools-scm @@ -43,7 +52,7 @@ buildPythonPackage rec { description = "Module for shell tab completion of Python CLI applications"; mainProgram = "shtab"; homepage = "https://docs.iterative.ai/shtab/"; - changelog = "https://github.com/iterative/shtab/releases/tag/v${version}"; + changelog = "https://github.com/iterative/shtab/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/simplesat/default.nix b/pkgs/development/python-modules/simplesat/default.nix index 391701e6ca24b..d325847f9ab0c 100644 --- a/pkgs/development/python-modules/simplesat/default.nix +++ b/pkgs/development/python-modules/simplesat/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "simplesat"; - version = "0.9.1"; + version = "0.9.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "enthought"; repo = "sat-solver"; tag = "v${version}"; - hash = "sha256-/fBnpf1DtaF+wQYZztcB8Y20/ZMYxrF3fH5qRsMucL0="; + hash = "sha256-C3AQN999iuckaY9I0RTI8Uj6hrV4UB1XYvua5VG8hHw="; }; postPatch = '' @@ -57,7 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "Prototype for SAT-based dependency handling"; homepage = "https://github.com/enthought/sat-solver"; - changelog = "https://github.com/enthought/sat-solver/blob/v${version}/CHANGES.rst"; + changelog = "https://github.com/enthought/sat-solver/blob/${src.tag}/CHANGES.rst"; license = licenses.bsd3; maintainers = with maintainers; [ genericnerdyusername ]; }; diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 067560caee500..c5059665cd78d 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -16,19 +16,14 @@ buildPythonPackage rec { pname = "sip"; - version = "6.10.0"; + version = "6.12.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-+gUVaX1MmNvgTZ6JjYFt4UJ+W5rl0OFSFpEJ/SH10pw="; + hash = "sha256-CDztlPhTFUkyMRGaY5cLK6QrHTizjnMKcOAqmRkaicY="; }; - patches = [ - # Make wheel file generation deterministic https://github.com/NixOS/nixpkgs/issues/383885 - ./sip-builder.patch - ]; - build-system = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/sip/sip-builder.patch b/pkgs/development/python-modules/sip/sip-builder.patch deleted file mode 100644 index 2a7e1a5753d79..0000000000000 --- a/pkgs/development/python-modules/sip/sip-builder.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/sipbuild/builder.py 2025-04-21 12:19:34 -+++ b/sipbuild/builder.py 2025-04-21 12:27:09 -@@ -177,16 +177,23 @@ - saved_cwd = os.getcwd() - os.chdir(wheel_build_dir) - -- from zipfile import ZipFile, ZIP_DEFLATED -+ from zipfile import ZipFile, ZipInfo, ZIP_DEFLATED -+ import time - -+ epoch = int(os.environ.get('SOURCE_DATE_EPOCH', '946684800')) -+ zip_timestamp = time.gmtime(epoch)[:6] -+ - with ZipFile(wheel_path, 'w', compression=ZIP_DEFLATED) as zf: - for dirpath, _, filenames in os.walk('.'): - for filename in filenames: - # This will result in a name with no leading '.'. - name = os.path.relpath(os.path.join(dirpath, filename)) - -- zf.write(name) -+ zi = ZipInfo(name, zip_timestamp) - -+ with open(name, 'rb') as f: -+ zf.writestr(zi, f.read()) -+ - os.chdir(saved_cwd) - - return wheel_file diff --git a/pkgs/development/python-modules/sismic/default.nix b/pkgs/development/python-modules/sismic/default.nix index f5996194a091b..fcd9a4edf8b92 100644 --- a/pkgs/development/python-modules/sismic/default.nix +++ b/pkgs/development/python-modules/sismic/default.nix @@ -11,9 +11,9 @@ }: let - version = "1.6.8"; + version = "1.6.10"; in -buildPythonPackage { +buildPythonPackage rec { pname = "sismic"; inherit version; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage { owner = "AlexandreDecan"; repo = "sismic"; tag = version; - hash = "sha256-0g39jJI3UIniJY/oHQMZ53GCOJIbqdVeOED9PWxlw6E="; + hash = "sha256-FUjOn2b4nhHf2DfYbY+wsRMaVEG90nPgLlNbNTiq3fQ="; }; pythonRelaxDeps = [ "behave" ]; @@ -50,7 +50,7 @@ buildPythonPackage { ]; meta = { - changelog = "https://github.com/AlexandreDecan/sismic/releases/tag/${version}"; + changelog = "https://github.com/AlexandreDecan/sismic/releases/tag/${src.tag}"; description = "Sismic Interactive Statechart Model Interpreter and Checker"; homepage = "https://github.com/AlexandreDecan/sismic"; license = lib.licenses.lgpl3Only; diff --git a/pkgs/development/python-modules/skops/default.nix b/pkgs/development/python-modules/skops/default.nix index 2f911749e5f41..4356e4fe49832 100644 --- a/pkgs/development/python-modules/skops/default.nix +++ b/pkgs/development/python-modules/skops/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "skops"; - version = "0.11.0"; + version = "0.12.0"; pyproject = true; src = fetchFromGitHub { owner = "skops-dev"; repo = "skops"; tag = "v${version}"; - hash = "sha256-23Wy/VSd/CvpqT/zDX4ApplfsUwbjOj9q+T8YCKs8X4="; + hash = "sha256-OLRnaG++5Z7Y0WZnvfdPn6iIXzum5FTL0+geiO5QjYs="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/slapd/default.nix b/pkgs/development/python-modules/slapd/default.nix index 2e466bec45af5..789ecbb24e58d 100644 --- a/pkgs/development/python-modules/slapd/default.nix +++ b/pkgs/development/python-modules/slapd/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "slapd"; - version = "0.1.5"; + version = "0.1.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "python-ldap"; repo = "python-slapd"; tag = version; - hash = "sha256-AiJvhgJ62vCj75m6l5kuIEb7k2qCh/QJybS0uqw2vBY="; + hash = "sha256-xXIKC8xDJ3Q6yV1BL5Io0PkLqVbFRbbkB0QSXQGHMNg="; }; build-system = [ poetry-core ]; @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Controls a slapd process in a pythonic way"; homepage = "https://github.com/python-ldap/python-slapd"; - changelog = "https://github.com/python-ldap/python-slapd/blob/${src.rev}/CHANGES.rst"; + changelog = "https://github.com/python-ldap/python-slapd/blob/${src.tag}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ erictapen ]; }; diff --git a/pkgs/development/python-modules/smart-open/default.nix b/pkgs/development/python-modules/smart-open/default.nix index 1f078d327c75a..4c25a8091069c 100644 --- a/pkgs/development/python-modules/smart-open/default.nix +++ b/pkgs/development/python-modules/smart-open/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + awscli, azure-common, azure-core, azure-storage-blob, @@ -10,17 +11,21 @@ google-cloud-storage, requests, moto, + numpy, paramiko, + pytest-cov-stub, pytestCheckHook, + pyopenssl, responses, setuptools, + setuptools-scm, wrapt, zstandard, }: buildPythonPackage rec { pname = "smart-open"; - version = "7.2.0"; + version = "7.3.0.post1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,10 +34,13 @@ buildPythonPackage rec { owner = "RaRe-Technologies"; repo = "smart_open"; tag = "v${version}"; - hash = "sha256-/16Is90235scTAYUW/65QxcTddD0+aiG5TLzYsBUE1A="; + hash = "sha256-79q1uQML7WMHsaKQ7+4JA6LpeysJRA4fFxYVqQFntag="; }; - build-system = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; dependencies = [ wrapt ]; @@ -53,13 +61,18 @@ buildPythonPackage rec { pythonImportsCheck = [ "smart_open" ]; nativeCheckInputs = [ + awscli moto + numpy + pytest-cov-stub pytestCheckHook + pyopenssl responses ] + ++ moto.optional-dependencies.server ++ lib.flatten (lib.attrValues optional-dependencies); - enabledTestPaths = [ "smart_open" ]; + enabledTestPaths = [ "tests" ]; disabledTests = [ # https://github.com/RaRe-Technologies/smart_open/issues/784 @@ -72,7 +85,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/piskvorky/smart_open/releases/tag/${src.tag}"; description = "Library for efficient streaming of very large file"; - homepage = "https://github.com/RaRe-Technologies/smart_open"; + homepage = "https://github.com/piskvorky/smart_open"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/snitun/default.nix b/pkgs/development/python-modules/snitun/default.nix index 3f95f9cd081be..b17c173e0144c 100644 --- a/pkgs/development/python-modules/snitun/default.nix +++ b/pkgs/development/python-modules/snitun/default.nix @@ -8,6 +8,7 @@ cryptography, fetchFromGitHub, pytest-aiohttp, + pytest-codspeed, pytestCheckHook, pythonAtLeast, pythonOlder, @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "snitun"; - version = "0.40.0"; + version = "0.44.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -25,9 +26,14 @@ buildPythonPackage rec { owner = "NabuCasa"; repo = "snitun"; tag = version; - hash = "sha256-wit0GVuWFMl1u+VC7Aw+dPcvqLGyviSz/DVUKXvSvAs="; + hash = "sha256-jZRA/UKamB5fUSvyaemN0Vq4GX6bNL8rsYCgToEkIL4="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'version = "0.0.0"' 'version = "${version}"' + ''; + build-system = [ setuptools ]; dependencies = [ @@ -39,6 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-aiohttp + pytest-codspeed pytestCheckHook ]; diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index 2bcb2cc5f9693..c0f0b7773b8b7 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -13,6 +13,7 @@ filelock, idna, keyring, + numpy, packaging, pandas, platformdirs, @@ -32,7 +33,7 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "3.15.0"; + version = "3.16.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +42,7 @@ buildPythonPackage rec { owner = "snowflakedb"; repo = "snowflake-connector-python"; tag = "v${version}"; - hash = "sha256-Dz5jxmbBfWThmd7H0MIO5+DfnjpDw9ADHg5Sc7P+DYs="; + hash = "sha256-mow8TxmkeaMkgPTLUpx5Gucn4347gohHPyiBYjI/cDs="; }; build-system = [ @@ -87,6 +88,7 @@ buildPythonPackage rec { ''; nativeCheckInputs = [ + numpy pytest-xdist pytestCheckHook ]; @@ -125,7 +127,7 @@ buildPythonPackage rec { meta = with lib; { description = "Snowflake Connector for Python"; homepage = "https://github.com/snowflakedb/snowflake-connector-python"; - changelog = "https://github.com/snowflakedb/snowflake-connector-python/blob/v${version}/DESCRIPTION.md"; + changelog = "https://github.com/snowflakedb/snowflake-connector-python/blob/${src.tag}/DESCRIPTION.md"; license = licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/snowflake-core/default.nix b/pkgs/development/python-modules/snowflake-core/default.nix index 09d8a36822a92..98a78511d16f4 100644 --- a/pkgs/development/python-modules/snowflake-core/default.nix +++ b/pkgs/development/python-modules/snowflake-core/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "snowflake-core"; - version = "1.4.0"; + version = "1.7.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "snowflake_core"; inherit version; - hash = "sha256-3BzO3s5BtS/cuF+JwKuAG8Usca5oo79ffp33TXUP5E8="; + hash = "sha256-hlWpTCEa4E0dgD28h2JJ3m0/gCHMVzjWia6oQtG2an8="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix index 3062d7b8758d8..9f15789497d24 100644 --- a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "snowflake-sqlalchemy"; - version = "1.7.4"; + version = "1.7.6"; pyproject = true; src = fetchFromGitHub { owner = "snowflakedb"; repo = "snowflake-sqlalchemy"; tag = "v${version}"; - hash = "sha256-Twv8ugLrQT9y4wHNo0B8vkWOFNSci/t4eY9XvFlq/TE="; + hash = "sha256-8Q4cqfldSilBpj/1/4u5HRUDT8fD9MPzVGcokYt0dJA="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/social-auth-app-django/default.nix b/pkgs/development/python-modules/social-auth-app-django/default.nix index bec09abd2fe57..a819b8a468316 100644 --- a/pkgs/development/python-modules/social-auth-app-django/default.nix +++ b/pkgs/development/python-modules/social-auth-app-django/default.nix @@ -2,40 +2,48 @@ lib, buildPythonPackage, fetchFromGitHub, - social-auth-core, + setuptools, django, - python, - pythonOlder, + social-auth-core, + pytest-django, + pytestCheckHook, }: buildPythonPackage rec { pname = "social-auth-app-django"; - version = "5.4.2"; - format = "setuptools"; - - disabled = pythonOlder "3.8"; + version = "5.5.1"; + pyproject = true; src = fetchFromGitHub { owner = "python-social-auth"; repo = "social-app-django"; tag = version; - hash = "sha256-W9boogixZ7X6qysfh2YEat+TOBy1VNreGr27y8hno+0="; + hash = "sha256-XS7Uj0h2kb+NfO/9S5DAwZ+6LSjqeNslLwNbbVZmkTw="; }; - propagatedBuildInputs = [ social-auth-core ]; + build-system = [ setuptools ]; + + dependencies = [ + django + social-auth-core + ]; pythonImportsCheck = [ "social_django" ]; - nativeCheckInputs = [ django ]; + nativeCheckInputs = [ + pytest-django + pytestCheckHook + ]; - checkPhase = '' - ${python.interpreter} -m django test --settings="tests.settings" + preCheck = '' + export DJANGO_SETTINGS_MODULE=tests.settings ''; meta = with lib; { + broken = lib.versionOlder django.version "5.1"; description = "Module for social authentication/registration mechanism"; homepage = "https://github.com/python-social-auth/social-app-django"; - changelog = "https://github.com/python-social-auth/social-app-django/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/python-social-auth/social-app-django/blob/${src.tag}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/social-auth-core/default.nix b/pkgs/development/python-modules/social-auth-core/default.nix index 860b3981b4086..2ea49b464d6ed 100644 --- a/pkgs/development/python-modules/social-auth-core/default.nix +++ b/pkgs/development/python-modules/social-auth-core/default.nix @@ -8,6 +8,7 @@ lxml, oauthlib, pyjwt, + pytest-xdist, pytestCheckHook, python-jose, python3-openid, @@ -15,12 +16,14 @@ pythonOlder, requests, requests-oauthlib, + responses, setuptools, + typing-extensions, }: buildPythonPackage rec { pname = "social-auth-core"; - version = "4.5.4"; + version = "4.7.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +32,7 @@ buildPythonPackage rec { owner = "python-social-auth"; repo = "social-core"; tag = version; - hash = "sha256-tFaRvNoO5K7ytqMhL//Ntasc7jb4PYXB1yyjFvFqQH8="; + hash = "sha256-PQPnLTTCAUE1UmaDRmEXLozY0607e2/fLsvzcJzo4bQ="; }; nativeBuildInputs = [ setuptools ]; @@ -54,27 +57,29 @@ buildPythonPackage rec { }; nativeCheckInputs = [ + pytest-xdist pytestCheckHook httpretty + responses + typing-extensions ] ++ lib.flatten (lib.attrValues optional-dependencies); - # Disable checking the code coverage - prePatch = '' - substituteInPlace social_core/tests/requirements.txt \ - --replace "coverage>=3.6" "" \ - --replace "pytest-cov>=2.7.1" "" + disabledTestPaths = [ + # missing google-auth-stubs + "social_core/tests/backends/test_google.py" - substituteInPlace tox.ini \ - --replace "{posargs:-v --cov=social_core}" "{posargs:-v}" - ''; + # network access + "social_core/tests/backends/test_steam.py::SteamOpenIdMissingSteamIdTest::test_login" + "social_core/tests/backends/test_steam.py::SteamOpenIdMissingSteamIdTest::test_partial_pipeline" + ]; pythonImportsCheck = [ "social_core" ]; meta = with lib; { description = "Module for social authentication/registration mechanisms"; homepage = "https://github.com/python-social-auth/social-core"; - changelog = "https://github.com/python-social-auth/social-core/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/python-social-auth/social-core/blob/${src.tag}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/solc-select/default.nix b/pkgs/development/python-modules/solc-select/default.nix index 3a9e0f7bb4a98..38525508feb10 100644 --- a/pkgs/development/python-modules/solc-select/default.nix +++ b/pkgs/development/python-modules/solc-select/default.nix @@ -1,22 +1,27 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, packaging, pycryptodome, }: buildPythonPackage rec { pname = "solc-select"; - version = "1.0.4"; - format = "setuptools"; + version = "1.1.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-23ud4AmvbeOlQWuAu+W21ja/MUcDwBYxm4wSMeJIpsc="; + src = fetchFromGitHub { + owner = "crytic"; + repo = "solc-select"; + tag = "v${version}"; + hash = "sha256-ZB9WM6YTWEqfs5y1DqxbSADiFw997PHIR9uVSjJg1/E="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ packaging pycryptodome ]; diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix index 0c6298207e683..02da03091cfd3 100644 --- a/pkgs/development/python-modules/sopel/default.nix +++ b/pkgs/development/python-modules/sopel/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "sopel"; - version = "8.0.2"; + version = "8.0.3"; pyproject = true; disabled = isPyPy || pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7LNbnSri+yjH2Nw8rBCTO8Lg84VXY6A+xMXscEkUVK8="; + hash = "sha256-lhoEgfYaqaZfrfVgyHSwl/algqjnvAc/pnVPwK8YdCc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix index 8784657600b9d..8481f75272eb5 100644 --- a/pkgs/development/python-modules/sounddevice/default.nix +++ b/pkgs/development/python-modules/sounddevice/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "sounddevice"; - version = "0.5.1"; + version = "0.5.2"; pyproject = true; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-CcqZHa7ajOS+mskeFamoHI+B76a2laNIyRceoMFssEE="; + hash = "sha256-xjTVG9TpItbw+l4al1zIl8lH9h0x2p95un6jTf9Ei0k="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/soxr/default.nix b/pkgs/development/python-modules/soxr/default.nix index 3470810e5b7e4..a090b6d24bd25 100644 --- a/pkgs/development/python-modules/soxr/default.nix +++ b/pkgs/development/python-modules/soxr/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; pypaBuildFlags = [ - "--config=cmake.define.USE_SYSTEM_LIBSOXR=ON" + "--config-setting=cmake.define.USE_SYSTEM_LIBSOXR=ON" ]; build-system = [ diff --git a/pkgs/development/python-modules/sparklines/default.nix b/pkgs/development/python-modules/sparklines/default.nix index c04f1908def71..afcf086f0ccac 100644 --- a/pkgs/development/python-modules/sparklines/default.nix +++ b/pkgs/development/python-modules/sparklines/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "sparklines"; - version = "0.5.0"; + version = "0.7.0"; format = "setuptools"; src = fetchFromGitHub { owner = "deeplook"; repo = "sparklines"; tag = "v${version}"; - sha256 = "sha256-oit1bDqP96wwfTRCV8V0N9P/+pkdW2WYOWT6u3lb4Xs="; + sha256 = "sha256-jiMrxZMWN+moap0bDH+uy66gF4XdGst9HJpnboJrQm4="; }; propagatedBuildInputs = [ future ]; diff --git a/pkgs/development/python-modules/sparsezoo/default.nix b/pkgs/development/python-modules/sparsezoo/default.nix index 9df360195f927..47333d8710fe3 100644 --- a/pkgs/development/python-modules/sparsezoo/default.nix +++ b/pkgs/development/python-modules/sparsezoo/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "sparsezoo"; - version = "1.8.1"; + version = "1.9.0"; pyproject = true; src = fetchFromGitHub { owner = "neuralmagic"; repo = "sparsezoo"; tag = "v${version}"; - hash = "sha256-c4F95eVvj673eFO/rbmv4LY3pGmqo+arbsYqElznwdA="; + hash = "sha256-eMP/whm06QX5x/RBoYsYwuKxFnpFmqlgh2uDsI3Vaog="; }; build-system = [ setuptools ]; @@ -114,7 +114,7 @@ buildPythonPackage rec { meta = { description = "Neural network model repository for highly sparse and sparse-quantized models with matching sparsification recipes"; homepage = "https://github.com/neuralmagic/sparsezoo"; - changelog = "https://github.com/neuralmagic/sparsezoo/releases/tag/v${version}"; + changelog = "https://github.com/neuralmagic/sparsezoo/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ GaetanLepage ]; }; diff --git a/pkgs/development/python-modules/sphinx-intl/default.nix b/pkgs/development/python-modules/sphinx-intl/default.nix index 42b2ff02e0fce..d99b107cc7471 100644 --- a/pkgs/development/python-modules/sphinx-intl/default.nix +++ b/pkgs/development/python-modules/sphinx-intl/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "sphinx-intl"; - version = "2.3.1"; + version = "2.3.2"; pyproject = true; src = fetchFromGitHub { owner = "sphinx-doc"; repo = "sphinx-intl"; tag = version; - hash = "sha256-VrWtRdI9j/y2m7kN7/m/5cdxpI0dAaiprdXKt8m6MPc="; + hash = "sha256-5Ro+UG9pwwp656fYyCsna6P4s9Gb86Tu3Qm2WUI7tsE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sphinx-reredirects/default.nix b/pkgs/development/python-modules/sphinx-reredirects/default.nix index 8fc57ab6d1f02..b250106a46c99 100644 --- a/pkgs/development/python-modules/sphinx-reredirects/default.nix +++ b/pkgs/development/python-modules/sphinx-reredirects/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "sphinx-reredirects"; - version = "0.1.6"; + version = "1.0.0"; pyproject = true; src = fetchPypi { pname = "sphinx_reredirects"; inherit version; - hash = "sha256-xJHLpUX2e+lpdQhyeBjYYmYmNmJFrmRFb+KfN+m76mQ="; + hash = "sha256-fJutqfEzBIn89Mcpei1toqScpId9P0LROIrh3hAZv1w="; }; build-system = [ diff --git a/pkgs/development/python-modules/sphinx-sitemap/default.nix b/pkgs/development/python-modules/sphinx-sitemap/default.nix index 84155186c1634..97d643eb95abd 100644 --- a/pkgs/development/python-modules/sphinx-sitemap/default.nix +++ b/pkgs/development/python-modules/sphinx-sitemap/default.nix @@ -10,9 +10,9 @@ }: let pname = "sphinx-sitemap"; - version = "2.6.0"; + version = "2.7.2"; in -buildPythonPackage { +buildPythonPackage rec { inherit pname version; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage { owner = "jdillard"; repo = "sphinx-sitemap"; tag = "v${version}"; - hash = "sha256-RERa+/MVug2OQ/FAXS4LOQHB4eEuIW2rwcdZUOrr6g8="; + hash = "sha256-b8eo77Ab9w8JR6mLqXcIWeTkuJFTHjJBk440fksBbyw="; }; nativeBuildInputs = [ setuptools ]; @@ -34,7 +34,7 @@ buildPythonPackage { ]; meta = with lib; { - changelog = "https://github.com/jdillard/sphinx-sitemap/releases/tag/v${version}"; + changelog = "https://github.com/jdillard/sphinx-sitemap/releases/tag/${src.tag}"; description = "Sitemap generator for Sphinx"; homepage = "https://github.com/jdillard/sphinx-sitemap"; maintainers = with maintainers; [ alejandrosame ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix index 83b3f959af1a3..0329aab01206b 100644 --- a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-confluencebuilder"; - version = "2.13.0"; + version = "2.14.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "sphinxcontrib_confluencebuilder"; inherit version; - hash = "sha256-2Sl0ZwdHn0dXf+kbNcxaDMfWLaGdfUgCRjKTADA+unM="; + hash = "sha256-3XWs1SCb6AJpYC3njbBFXsSOebNjRh0Gp1Fqi5E51lI="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix index 44f1e74e62b08..987e4d2b94d9b 100644 --- a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-katex"; - version = "0.9.10"; + version = "0.9.11"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "sphinxcontrib_katex"; inherit version; - hash = "sha256-MJqS2uJF28WE/36l+2VJcnuuleTlIAi3TSWdL9GtDew="; + hash = "sha256-LTKyENILvuRRpR0ZZF9v719VaLmlTigTr/uW76ZhI4o="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/pkgs/development/python-modules/sphinxext-opengraph/default.nix index 2f2d76bd99133..70bd42464cae0 100644 --- a/pkgs/development/python-modules/sphinxext-opengraph/default.nix +++ b/pkgs/development/python-modules/sphinxext-opengraph/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "sphinxext-opengraph"; - version = "0.9.1"; + version = "0.12.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "wpilibsuite"; repo = "sphinxext-opengraph"; tag = "v${version}"; - hash = "sha256-B+bJ1tKqTTlbNeJLxk56o2a21n3Yg6OHwJiFfCx46aw="; + hash = "sha256-2ch9BxgrqbfIJ8fzFKYscha4+G7OAVz+OIOqYwX2gSA="; }; nativeBuildInputs = [ setuptools-scm ]; @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Sphinx extension to generate unique OpenGraph metadata"; homepage = "https://github.com/wpilibsuite/sphinxext-opengraph"; - changelog = "https://github.com/wpilibsuite/sphinxext-opengraph/releases/tag/v${version}"; + changelog = "https://github.com/wpilibsuite/sphinxext-opengraph/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ Luflosi ]; }; diff --git a/pkgs/development/python-modules/spotifyaio/default.nix b/pkgs/development/python-modules/spotifyaio/default.nix index b08260bf14943..5fafd5db1f8fe 100644 --- a/pkgs/development/python-modules/spotifyaio/default.nix +++ b/pkgs/development/python-modules/spotifyaio/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "spotifyaio"; - version = "0.8.11"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-spotify"; tag = "v${version}"; - hash = "sha256-mRv/bsMER+rn4JOSe2EK0ykP5oEydl8QNhtn7yN+ykE="; + hash = "sha256-wl8THtmdJ2l6XNDtmmnk/MF+qTZL0UsbL8o6i/Vwf5k="; }; build-system = [ poetry-core ]; @@ -54,7 +54,7 @@ buildPythonPackage rec { meta = { description = "Module for interacting with for Spotify"; homepage = "https://github.com/joostlek/python-spotify/"; - changelog = "https://github.com/joostlek/python-spotify/releases/tag/v${version}"; + changelog = "https://github.com/joostlek/python-spotify/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/spsdk/default.nix b/pkgs/development/python-modules/spsdk/default.nix index cc518a0b33438..edc8c5e9eeb02 100644 --- a/pkgs/development/python-modules/spsdk/default.nix +++ b/pkgs/development/python-modules/spsdk/default.nix @@ -49,14 +49,14 @@ buildPythonPackage rec { pname = "spsdk"; - version = "2.6.1"; + version = "3.1.0"; pyproject = true; src = fetchFromGitHub { owner = "nxp-mcuxpresso"; repo = "spsdk"; tag = "v${version}"; - hash = "sha256-AdW19Zf5TZ6hChXbW9dLGcMpFTQOT1wrPzEqaSfWzDE="; + hash = "sha256-G8UNT9lsUt6Xe++xx+Pqv4hmrkGv68w7FrZSgWJHb1k="; }; postPatch = '' @@ -137,7 +137,7 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/nxp-mcuxpresso/spsdk/blob/v${version}/docs/release_notes.rst"; + changelog = "https://github.com/nxp-mcuxpresso/spsdk/blob/${src.tag}/docs/release_notes.rst"; description = "NXP Secure Provisioning SDK"; homepage = "https://github.com/nxp-mcuxpresso/spsdk"; license = lib.licenses.bsd3; diff --git a/pkgs/development/python-modules/sqlalchemy-cockroachdb/default.nix b/pkgs/development/python-modules/sqlalchemy-cockroachdb/default.nix index 0cbdb6651a97f..4d0ba47d58abd 100644 --- a/pkgs/development/python-modules/sqlalchemy-cockroachdb/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-cockroachdb/default.nix @@ -3,26 +3,25 @@ buildPythonPackage, fetchPypi, setuptools, - wheel, sqlalchemy, }: buildPythonPackage rec { pname = "sqlalchemy-cockroachdb"; - version = "2.0.2"; + version = "2.0.3"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-EZdW65BYVdahE0W5nP6FMDGj/lmKnEvzWo3ayfif6Mw="; + pname = "sqlalchemy_cockroachdb"; + inherit version; + hash = "sha256-SLdj/9iypNydVkWZNKVtfV/61BXG5o0RS67l0Sz3nB0="; }; - nativeBuildInputs = [ + build-system = [ setuptools - wheel ]; - propagatedBuildInputs = [ + dependencies = [ sqlalchemy ]; @@ -30,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "CockroachDB dialect for SQLAlchemy"; - homepage = "https://pypi.org/project/sqlalchemy-cockroachdb"; + homepage = "https://github.com/cockroachdb/sqlalchemy-cockroachdb/tree/master/sqlalchemy_cockroachdb"; license = licenses.asl20; maintainers = with maintainers; [ pinpox ]; }; diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index f48abe0214bed..5bc964ff493a6 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -4,6 +4,7 @@ pythonOlder, fetchFromGitHub, buildPythonPackage, + nix-update-script, # build cython, @@ -43,7 +44,7 @@ buildPythonPackage rec { pname = "sqlalchemy"; - version = "2.0.41"; + version = "2.0.42"; pyproject = true; disabled = pythonOlder "3.7"; @@ -52,7 +53,7 @@ buildPythonPackage rec { owner = "sqlalchemy"; repo = "sqlalchemy"; tag = "rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-DixgBUI+HJLTCsunN5Y+ogcAHnRnQ3CKSFc6HrxzsPM="; + hash = "sha256-e/DkS9CioMLG/qMOf0//DxMFDTep4xEtCVTp/Hn0Wiw="; }; postPatch = '' @@ -109,6 +110,13 @@ buildPythonPackage rec { "test/aaa_profiling" ]; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^rel_([0-9]+)_([0-9]+)_([0-9]+)$" + ]; + }; + meta = with lib; { changelog = "https://github.com/sqlalchemy/sqlalchemy/releases/tag/rel_${ builtins.replaceStrings [ "." ] [ "_" ] version diff --git a/pkgs/development/python-modules/sqlfmt/default.nix b/pkgs/development/python-modules/sqlfmt/default.nix index 2f1dff47901a5..709a4746c8c9d 100644 --- a/pkgs/development/python-modules/sqlfmt/default.nix +++ b/pkgs/development/python-modules/sqlfmt/default.nix @@ -5,14 +5,15 @@ click, fetchFromGitHub, gitpython, + importlib-metadata, jinja2, platformdirs, poetry-core, pytest-asyncio, pytestCheckHook, pythonOlder, + tomli, tqdm, - writableTmpDirAsHomeHook, }: buildPythonPackage rec { @@ -20,7 +21,7 @@ buildPythonPackage rec { version = "0.27.0"; pyproject = true; - disabled = pythonOlder "3.12"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "tconbeer"; @@ -29,12 +30,16 @@ buildPythonPackage rec { hash = "sha256-Yel9SB7KrDqtuZxNx4omz6u4AID8Fk5kFYKBEZD1fuU="; }; + pythonRelaxDeps = [ "platformdirs" ]; + build-system = [ poetry-core ]; dependencies = [ click + importlib-metadata jinja2 platformdirs + tomli tqdm ]; @@ -46,11 +51,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio pytestCheckHook - writableTmpDirAsHomeHook ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' + export HOME=$(mktemp -d) export PATH="$PATH:$out/bin"; ''; diff --git a/pkgs/development/python-modules/sqlframe/default.nix b/pkgs/development/python-modules/sqlframe/default.nix index 84885a2767cc3..e5d4dca2f152a 100644 --- a/pkgs/development/python-modules/sqlframe/default.nix +++ b/pkgs/development/python-modules/sqlframe/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "sqlframe"; - version = "3.31.3"; + version = "3.38.2"; pyproject = true; src = fetchFromGitHub { owner = "eakmanrq"; repo = "sqlframe"; tag = "v${version}"; - hash = "sha256-x9ILbtl71Xp4p5OWQ/goays5W6uE17FCes7ZVfWZBwY="; + hash = "sha256-ekDt9vsHdHhUNaQghG3EaM82FRZYdw+gaxENcurSayk="; }; build-system = [ @@ -72,7 +72,7 @@ buildPythonPackage rec { meta = { description = "Turning PySpark Into a Universal DataFrame API"; homepage = "https://github.com/eakmanrq/sqlframe"; - changelog = "https://github.com/eakmanrq/sqlframe/releases/tag/v${version}"; + changelog = "https://github.com/eakmanrq/sqlframe/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; }; diff --git a/pkgs/development/python-modules/sqlglot/default.nix b/pkgs/development/python-modules/sqlglot/default.nix index 7b109e1f25905..5b6bb1ceec67e 100644 --- a/pkgs/development/python-modules/sqlglot/default.nix +++ b/pkgs/development/python-modules/sqlglot/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "sqlglot"; - version = "26.16.2"; + version = "27.6.0"; pyproject = true; src = fetchFromGitHub { repo = "sqlglot"; owner = "tobymao"; tag = "v${version}"; - hash = "sha256-uX72AHr4IC+u5AYkW/3myruVPs5NZ1V3THVg+9GWxpg="; + hash = "sha256-/+hrbyAQJHbKzjaBr9ssuXuKpbCSWAarLa5oX5NqfOc="; }; build-system = [ diff --git a/pkgs/development/python-modules/srctools/default.nix b/pkgs/development/python-modules/srctools/default.nix index 117a97e5b39ae..7d6de7ff21840 100644 --- a/pkgs/development/python-modules/srctools/default.nix +++ b/pkgs/development/python-modules/srctools/default.nix @@ -4,7 +4,7 @@ fetchPypi, meson, meson-python, - cython_3_1, + cython, attrs, useful-types, pytestCheckHook, @@ -28,7 +28,7 @@ buildPythonPackage { build-system = [ meson meson-python - cython_3_1 + cython ]; dependencies = [ diff --git a/pkgs/development/python-modules/sse-starlette/default.nix b/pkgs/development/python-modules/sse-starlette/default.nix index e64e15fe2c0a2..7298d302a41b9 100644 --- a/pkgs/development/python-modules/sse-starlette/default.nix +++ b/pkgs/development/python-modules/sse-starlette/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "sse-starlette"; - version = "2.3.6"; + version = "3.0.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "sysid"; repo = "sse-starlette"; tag = "v${version}"; - hash = "sha256-7FlyV+TsVKGFsecONPm/Z50cCnyuUsr6pimPdc4Cs6c="; + hash = "sha256-9NI6CUcK5AqITKxtCMz9Z1+Ke87u2y2E0LlwsFUDhgw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ssh-python/default.nix b/pkgs/development/python-modules/ssh-python/default.nix index c87730307d505..2cd5144191517 100644 --- a/pkgs/development/python-modules/ssh-python/default.nix +++ b/pkgs/development/python-modules/ssh-python/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "ssh-python"; - version = "1.1.1"; + version = "03.0"; format = "setuptools"; src = fetchFromGitHub { owner = "ParallelSSH"; repo = "ssh-python"; tag = version; - hash = "sha256-kidz4uHT5C8TUROLGQUHihemYtwOoWZQNw7ElbwYKLM="; + hash = "sha256-hrTf0eywmK/sbZ7fVPatJvcWh5e1/rCLpk0yQKlyLYU="; }; build-system = [ setuptools ]; @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = { description = "Python bindings for libssh C library"; homepage = "https://github.com/ParallelSSH/ssh-python"; - changelog = "https://github.com/ParallelSSH/ssh-python/blob/${version}/Changelog.rst"; + changelog = "https://github.com/ParallelSSH/ssh-python/blob/${src.tag}/Changelog.rst"; license = lib.licenses.lgpl21Only; maintainers = with lib.maintainers; [ infinidoge ]; }; diff --git a/pkgs/development/python-modules/sshtunnel/default.nix b/pkgs/development/python-modules/sshtunnel/default.nix index 08d6bf114082c..59a2bbd6243cd 100644 --- a/pkgs/development/python-modules/sshtunnel/default.nix +++ b/pkgs/development/python-modules/sshtunnel/default.nix @@ -18,6 +18,9 @@ buildPythonPackage rec { hash = "sha256-58sOp3Tbgb+RhE2yLecqQKro97D5u5ug9mbUdO9r+fw="; }; + # https://github.com/pahaz/sshtunnel/pull/301 + patches = [ ./paramiko-4.0-compat.patch ]; + build-system = [ setuptools ]; dependencies = [ paramiko ]; diff --git a/pkgs/development/python-modules/sshtunnel/paramiko-4.0-compat.patch b/pkgs/development/python-modules/sshtunnel/paramiko-4.0-compat.patch new file mode 100644 index 0000000000000..f6118fa407f93 --- /dev/null +++ b/pkgs/development/python-modules/sshtunnel/paramiko-4.0-compat.patch @@ -0,0 +1,117 @@ +commit 46d08c8eefc18d22e9d893a627cc6d73b43cdb9a +Author: Martin Weinelt +Date: Mon Aug 11 00:48:21 2025 +0200 + + sshtunnel: remove DSA support + + The support for DSA keys was removed[1] in Paramiko 4.0. + + [1] https://www.paramiko.org/changelog.html#4.0.0 + +diff --git a/README.rst b/README.rst +index 7400816..ff27733 100644 +--- a/README.rst ++++ b/README.rst +@@ -255,9 +255,9 @@ CLI usage + -k SSH_HOST_KEY, --ssh_host_key SSH_HOST_KEY + Gateway's host key + -K KEY_FILE, --private_key_file KEY_FILE +- RSA/DSS/ECDSA private key file ++ RSA/ECDSA private key file + -S KEY_PASSWORD, --private_key_password KEY_PASSWORD +- RSA/DSS/ECDSA private key password ++ RSA/ECDSA private key password + -t, --threaded Allow concurrent connections to each tunnel + -v, --verbose Increase output verbosity (default: ERROR) + -V, --version Show version number and quit +diff --git a/sshtunnel.py b/sshtunnel.py +index c48e330..e6442da 100644 +--- a/sshtunnel.py ++++ b/sshtunnel.py +@@ -1090,7 +1090,6 @@ class SSHTunnelForwarder(object): + host_pkey_directories = [DEFAULT_SSH_DIRECTORY] + + paramiko_key_types = {'rsa': paramiko.RSAKey, +- 'dsa': paramiko.DSSKey, + 'ecdsa': paramiko.ECDSAKey} + if hasattr(paramiko, 'Ed25519Key'): + # NOQA: new in paramiko>=2.2: http://docs.paramiko.org/en/stable/api/keys.html#module-paramiko.ed25519key +@@ -1286,7 +1285,7 @@ class SSHTunnelForwarder(object): + + Arguments: + pkey_file (str): +- File containing a private key (RSA, DSS or ECDSA) ++ File containing a private key (RSA or ECDSA) + Keyword Arguments: + pkey_password (Optional[str]): + Password to decrypt the private key +@@ -1295,7 +1294,7 @@ class SSHTunnelForwarder(object): + paramiko.Pkey + """ + ssh_pkey = None +- key_types = (paramiko.RSAKey, paramiko.DSSKey, paramiko.ECDSAKey) ++ key_types = (paramiko.RSAKey, paramiko.ECDSAKey) + if hasattr(paramiko, 'Ed25519Key'): + # NOQA: new in paramiko>=2.2: http://docs.paramiko.org/en/stable/api/keys.html#module-paramiko.ed25519key + key_types += (paramiko.Ed25519Key, ) +@@ -1805,7 +1804,7 @@ def _parse_arguments(args=None): + dest='ssh_private_key', + metavar='KEY_FILE', + type=str, +- help='RSA/DSS/ECDSA private key file' ++ help='RSA/ECDSA private key file' + ) + + parser.add_argument( +@@ -1813,7 +1812,7 @@ def _parse_arguments(args=None): + dest='ssh_private_key_password', + metavar='KEY_PASSWORD', + type=str, +- help='RSA/DSS/ECDSA private key password' ++ help='RSA/ECDSA private key password' + ) + + parser.add_argument( +diff --git a/tests/test_forwarder.py b/tests/test_forwarder.py +index 40662d0..02af175 100644 +--- a/tests/test_forwarder.py ++++ b/tests/test_forwarder.py +@@ -81,11 +81,9 @@ open_tunnel = partial( + + SSH_USERNAME = get_random_string() + SSH_PASSWORD = get_random_string() +-SSH_DSS = b'\x44\x78\xf0\xb9\xa2\x3c\xc5\x18\x20\x09\xff\x75\x5b\xc1\xd2\x6c' + SSH_RSA = b'\x60\x73\x38\x44\xcb\x51\x86\x65\x7f\xde\xda\xa2\x2b\x5a\x57\xd5' + ECDSA = b'\x25\x19\xeb\x55\xe6\xa1\x47\xff\x4f\x38\xd2\x75\x6f\xa5\xd5\x60' + FINGERPRINTS = { +- 'ssh-dss': SSH_DSS, + 'ssh-rsa': SSH_RSA, + 'ecdsa-sha2-nistp256': ECDSA, + } +@@ -1202,7 +1200,7 @@ class AuxiliaryTest(unittest.TestCase): + '-P={0}'.format(SSH_PASSWORD), # GW password + '-R', '10.0.0.1:8080', '10.0.0.2:8080', # remote bind list + '-L', ':8081', ':8082', # local bind list +- '-k={0}'.format(SSH_DSS), # hostkey ++ '-k={0}'.format(SSH_RSA), # hostkey + '-K={0}'.format(__file__), # pkey file + '-S={0}'.format(SSH_PASSWORD), # pkey password + '-t', # concurrent connections (threaded) +@@ -1232,7 +1230,7 @@ class AuxiliaryTest(unittest.TestCase): + '--password={0}'.format(SSH_PASSWORD), # GW password + '--remote_bind_address', '10.0.0.1:8080', '10.0.0.2:8080', + '--local_bind_address', ':8081', ':8082', # local bind list +- '--ssh_host_key={0}'.format(SSH_DSS), # hostkey ++ '--ssh_host_key={0}'.format(SSH_RSA), # hostkey + '--private_key_file={0}'.format(__file__), # pkey file + '--private_key_password={0}'.format(SSH_PASSWORD), + '--threaded', # concurrent connections (threaded) +@@ -1254,7 +1252,7 @@ class AuxiliaryTest(unittest.TestCase): + [('10.0.0.1', 8080), ('10.0.0.2', 8080)]) + self.assertListEqual(parser['local_bind_addresses'], + [('', 8081), ('', 8082)]) +- self.assertEqual(parser['ssh_host_key'], str(SSH_DSS)) ++ self.assertEqual(parser['ssh_host_key'], str(SSH_RSA)) + self.assertEqual(parser['ssh_private_key'], __file__) + self.assertEqual(parser['ssh_private_key_password'], SSH_PASSWORD) + self.assertTrue(parser['threaded']) diff --git a/pkgs/development/python-modules/stamina/default.nix b/pkgs/development/python-modules/stamina/default.nix index e1eda7924fcd3..7b764abe8bcb9 100644 --- a/pkgs/development/python-modules/stamina/default.nix +++ b/pkgs/development/python-modules/stamina/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "stamina"; - version = "24.3.0"; + version = "25.1.0"; pyproject = true; src = fetchFromGitHub { owner = "hynek"; repo = "stamina"; tag = version; - hash = "sha256-DasubVqKRhX4CRyKyJ3fIA9Rxmy+kGxkW0pDdu8OPPo="; + hash = "sha256-TehGqR3vbjLNByHZE2+Ytq52dpEpiL6+7TRUKwXcC1M="; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Production-grade retries for Python"; homepage = "https://github.com/hynek/stamina"; - changelog = "https://github.com/hynek/stamina/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/hynek/stamina/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ mbalatsko ]; }; diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index 91ae514304b69..c327f0bf46db6 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "starlette"; - version = "0.46.2"; + version = "0.47.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "encode"; repo = "starlette"; tag = version; - hash = "sha256-K/0Y6plw+zbRKpzSLbEG6xb30e/Ou//4jddpUYdfs/k="; + hash = "sha256-FseSZrLWuNaLro2iLMcfiCrbx2Gz8+aEmLaSk/+PgN4="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/statmake/default.nix b/pkgs/development/python-modules/statmake/default.nix index ffaa22ef68410..d75c9c3727b37 100644 --- a/pkgs/development/python-modules/statmake/default.nix +++ b/pkgs/development/python-modules/statmake/default.nix @@ -13,11 +13,13 @@ pythonOlder, ufo2ft, ufolib2, + hatchling, + hatch-vcs, }: buildPythonPackage rec { pname = "statmake"; - version = "0.6.0"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,9 +28,14 @@ buildPythonPackage rec { owner = "daltonmaag"; repo = "statmake"; tag = "v${version}"; - hash = "sha256-3BZ71JVvj7GCojM8ycu160viPj8BLJ1SiW86Df2fzsw="; + hash = "sha256-UqL3l27Icu5DoVvFYctbOF7gvKvVV6hK1R5A1y9SYkU="; }; + build-system = [ + hatchling + hatch-vcs + ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ @@ -59,7 +66,7 @@ buildPythonPackage rec { description = "Applies STAT information from a Stylespace to a variable font"; mainProgram = "statmake"; homepage = "https://github.com/daltonmaag/statmake"; - changelog = "https://github.com/daltonmaag/statmake/releases/tag/v${version}"; + changelog = "https://github.com/daltonmaag/statmake/releases/tag/${src.tag}"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix index 0499b856422fd..345bbe85f1e61 100644 --- a/pkgs/development/python-modules/statsmodels/default.nix +++ b/pkgs/development/python-modules/statsmodels/default.nix @@ -7,7 +7,6 @@ packaging, pandas, patsy, - pythonOlder, scipy, setuptools, setuptools-scm, @@ -19,13 +18,16 @@ buildPythonPackage rec { version = "0.14.5"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchPypi { inherit pname version; hash = "sha256-3iYOWMzP0s7d+DW1WjVyM9bKhToapPkPdVOlLMccbd8="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'setuptools_scm[toml]>=8,<9' 'setuptools_scm[toml]' + ''; + build-system = [ cython numpy diff --git a/pkgs/development/python-modules/stone/default.nix b/pkgs/development/python-modules/stone/default.nix index e58b1870a6d5d..d567ff447c5d1 100644 --- a/pkgs/development/python-modules/stone/default.nix +++ b/pkgs/development/python-modules/stone/default.nix @@ -2,6 +2,7 @@ buildPythonPackage, fetchFromGitHub, lib, + jinja2, mock, packaging, ply, @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "stone"; - version = "3.3.8"; + version = "3.3.9"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "dropbox"; repo = "stone"; tag = "v${version}"; - hash = "sha256-W+wRVWPaAzhdHMVE54GEJC/YJqYZVJhwFDWWSMKUPdw="; + hash = "sha256-3tUV2JrE3S2Tj/9aHvzfBTkIWUmWzkWNsVLr5yWRE/Q="; }; postPatch = '' @@ -33,6 +34,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; dependencies = [ + jinja2 ply six packaging @@ -46,9 +48,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "stone" ]; meta = with lib; { - description = "Official Api Spec Language for Dropbox"; + description = "Official API Spec Language for Dropbox API V2"; homepage = "https://github.com/dropbox/stone"; - changelog = "https://github.com/dropbox/stone/releases/tag/v${version}"; + changelog = "https://github.com/dropbox/stone/releases/tag/${src.tag}"; license = licenses.mit; maintainers = [ ]; mainProgram = "stone"; diff --git a/pkgs/development/python-modules/strawberry-django/default.nix b/pkgs/development/python-modules/strawberry-django/default.nix index 5f4dddff4a8ef..b5abd44e5a9be 100644 --- a/pkgs/development/python-modules/strawberry-django/default.nix +++ b/pkgs/development/python-modules/strawberry-django/default.nix @@ -26,6 +26,7 @@ factory-boy, pillow, psycopg2, + pytest-asyncio, pytest-cov-stub, pytest-django, pytest-mock, @@ -34,16 +35,21 @@ buildPythonPackage rec { pname = "strawberry-django"; - version = "0.60.0"; + version = "0.65.1"; pyproject = true; src = fetchFromGitHub { owner = "strawberry-graphql"; repo = "strawberry-django"; tag = "v${version}"; - hash = "sha256-mMI/tPdt9XK6Lz7VmI3uDxcCjIuidUeGHjG+6AQLoeQ="; + hash = "sha256-cX/eG6qWe/h9U4p1pMhhI+bZ5pLmiwGeYxNthKvdI6o="; }; + postPatch = '' + # django.core.exceptions.ImproperlyConfigured: You're using the staticfiles app without having set the required STATIC_URL setting. + echo 'STATIC_URL = "static/"' >> tests/django_settings.py + ''; + build-system = [ poetry-core setuptools @@ -71,6 +77,7 @@ buildPythonPackage rec { factory-boy pillow psycopg2 + pytest-asyncio pytest-cov-stub pytest-django pytest-mock diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index 8db811e095b95..7378ba44d71b5 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.275.5"; + version = "0.278.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "strawberry-graphql"; repo = "strawberry"; tag = version; - hash = "sha256-bgKxZuk0cp43oyPbgTdx5aG5l1HSCz0JOVNeaCJRhdo="; + hash = "sha256-GNjjSD40fhbMqfvuYSuP3tU8lfOqBGJIsoGWZCfj6C4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/streamdeck/default.nix b/pkgs/development/python-modules/streamdeck/default.nix index 2d4009c57c7ee..16ba119d7ca29 100644 --- a/pkgs/development/python-modules/streamdeck/default.nix +++ b/pkgs/development/python-modules/streamdeck/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "streamdeck"; - version = "0.9.6"; + version = "0.9.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-7ELZtxGzUuonStMFputI7OHu06W//nC5KOCC3OD3iPA="; + hash = "sha256-jVhuZihvjuA5rwl55JAmtFq+h/f5M68Vo44jh8HjUI4="; }; patches = [ diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 60e199561ab8d..618d1cf3a1cd4 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "12.1.0"; + version = "12.4.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-SkuFFpUs9QlemCJX8NR8RcHSu/d0PiyxLWaF9V2ouNQ="; + hash = "sha256-HNH1sFeYZ5IwgbrPWUlZ0fQD8hgiOgbcOCc76wfQFWc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix index 638f8a1315a80..43fa45173a131 100644 --- a/pkgs/development/python-modules/subliminal/default.nix +++ b/pkgs/development/python-modules/subliminal/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "subliminal"; - version = "2.2.1"; + version = "2.3.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "Diaoul"; repo = "subliminal"; tag = version; - hash = "sha256-g7gg2qdLKl7bg/nNXRWN9wZaNShOOc38sVASZrIycMU="; + hash = "sha256-eAXzD6diep28wCZjWLOZpOX1bnakEldhs2LX5CPu5OI="; }; build-system = [ setuptools ]; @@ -85,7 +85,7 @@ buildPythonPackage rec { description = "Python library to search and download subtitles"; mainProgram = "subliminal"; homepage = "https://github.com/Diaoul/subliminal"; - changelog = "https://github.com/Diaoul/subliminal/blob/${version}/HISTORY.rst"; + changelog = "https://github.com/Diaoul/subliminal/blob/${src.tag}/HISTORY.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ doronbehar ]; }; diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index 44ef351a37c33..e09eae34658ed 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "sunpy"; - version = "6.1.1"; + version = "7.0.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-xgmmsbC7KGvUJ4mUD1T8t9aQDfz+IX31T4Wf9gguE9s="; + hash = "sha256-9ZCG9CtTpgGGlqtXcl2epRBzFcbVvIMzZcXk5CQ5/+A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sunwatcher/default.nix b/pkgs/development/python-modules/sunwatcher/default.nix index 9729093eec663..0fcac2bfb205f 100644 --- a/pkgs/development/python-modules/sunwatcher/default.nix +++ b/pkgs/development/python-modules/sunwatcher/default.nix @@ -4,22 +4,21 @@ fetchPypi, pythonOlder, requests, - setuptools, }: buildPythonPackage rec { pname = "sunwatcher"; version = "0.2.1"; - pyproject = true; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-u0vHCw0h0h6pgadBLPBSwv/4CXNj+3HIJCEtt2rdlWs="; + sha256 = "0swmvmmbfb914k473yv3fc4zizy2abq2qhd7h6lixli11l5wfjxv"; }; - build-system = [ setuptools ]; - - dependencies = [ requests ]; + propagatedBuildInputs = [ requests ]; # Project has no tests doCheck = false; @@ -29,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for the SolarLog HTTP API"; homepage = "https://bitbucket.org/Lavode/sunwatcher/src/master/"; - license = licenses.asl20; + license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/swcgeom/default.nix b/pkgs/development/python-modules/swcgeom/default.nix index e940ac5e6c495..a2654535d4660 100644 --- a/pkgs/development/python-modules/swcgeom/default.nix +++ b/pkgs/development/python-modules/swcgeom/default.nix @@ -26,9 +26,9 @@ }: let - version = "0.19.3"; + version = "0.19.4"; in -buildPythonPackage { +buildPythonPackage rec { pname = "swcgeom"; inherit version; pyproject = true; @@ -37,7 +37,7 @@ buildPythonPackage { owner = "yzx9"; repo = "swcgeom"; tag = "v${version}"; - hash = "sha256-mpp8Dw0XcU59fYt7vjswAnXCmrRP3mhbgTDG+J4UwzI="; + hash = "sha256-emffSI4LO+5UU267d+qj/NCVvHmRpzikJ7jdCOtPFNo="; }; build-system = [ @@ -88,7 +88,7 @@ buildPythonPackage { meta = { description = "Neuron geometry library for swc format"; homepage = "https://github.com/yzx9/swcgeom"; - changelog = "https://github.com/yzx9/swcgeom/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/yzx9/swcgeom/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ yzx9 ]; }; diff --git a/pkgs/development/python-modules/swisshydrodata/default.nix b/pkgs/development/python-modules/swisshydrodata/default.nix index 4d7d159401bdf..e9581c48ea5b0 100644 --- a/pkgs/development/python-modules/swisshydrodata/default.nix +++ b/pkgs/development/python-modules/swisshydrodata/default.nix @@ -1,13 +1,14 @@ { lib, + aiohttp, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, + pytest-asyncio, pytest-cov-stub, + pytestCheckHook, pythonOlder, requests-mock, requests, - aiohttp, setuptools, }: @@ -33,8 +34,9 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook + pytest-asyncio pytest-cov-stub + pytestCheckHook requests-mock ]; diff --git a/pkgs/development/python-modules/systemdunitparser/default.nix b/pkgs/development/python-modules/systemdunitparser/default.nix index 0b3431c066809..b3e008f0d7440 100644 --- a/pkgs/development/python-modules/systemdunitparser/default.nix +++ b/pkgs/development/python-modules/systemdunitparser/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "systemdunitparser"; - version = "0.3"; + version = "0.4"; pyproject = true; src = fetchFromGitHub { owner = "sgallagher"; repo = "systemdunitparser"; - rev = version; - hash = "sha256-lcvXEieaifPUDhLdaz2FXaNdbw7wKR+x/kC+MMDT0tE="; + tag = version; + hash = "sha256-BlOj1rvRfh0SQ7io2N8MsMvAtWvXk0V6hYzlOSrr7hU="; }; build-system = [ diff --git a/pkgs/development/python-modules/tagoio-sdk/default.nix b/pkgs/development/python-modules/tagoio-sdk/default.nix index 8a7687a666023..efc9fff18e22c 100644 --- a/pkgs/development/python-modules/tagoio-sdk/default.nix +++ b/pkgs/development/python-modules/tagoio-sdk/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "tagoio-sdk"; - version = "4.3.0"; + version = "5.0.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "tago-io"; repo = "sdk-python"; tag = "v${version}"; - hash = "sha256-37/fg2vbwYPhYPvSJ2YxWAPrfspqTE3thIL/VR1+AkI="; + hash = "sha256-PNPG1FUniwZhOKjynp4ba6kjGJmB/OW0F5b2ZOYaYwY="; }; pythonRelaxDeps = [ "requests" ]; @@ -49,7 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for interacting with Tago.io"; homepage = "https://github.com/tago-io/sdk-python"; - changelog = "https://github.com/tago-io/sdk-python/releases/tag/v${version}"; + changelog = "https://github.com/tago-io/sdk-python/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/tcxparser/default.nix b/pkgs/development/python-modules/tcxparser/default.nix index 5c06e2f83bf04..97b1e8d97c79b 100644 --- a/pkgs/development/python-modules/tcxparser/default.nix +++ b/pkgs/development/python-modules/tcxparser/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "tcxparser"; - version = "2.4.0"; + version = "2.4.0-r1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "vkurup"; repo = "python-tcxparser"; tag = version; - hash = "sha256-YZgzvwRy47MOTClAeJhzD6kZhGgCeVSGko6LgR/Uy0o="; + hash = "sha256-lQczTuxmxu4nCPJsgblrW2RXST7kvhtPnscemwXCx0Y="; }; build-system = [ diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 070a3637b803c..15ad8fc444abd 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "tempora"; - version = "5.8.0"; + version = "5.8.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,9 +21,13 @@ buildPythonPackage rec { owner = "jaraco"; repo = "tempora"; tag = "v${version}"; - hash = "sha256-ojllPOmz+laxFMCobLcDnCVMvo1354vS5nBnO1mxokM="; + hash = "sha256-1Zeo8bUCHKPZ6I0HGT7bIh7IgbRL4j9Cv3t9FFiZ72s="; }; + postPatch = '' + sed -i "/coherent\.licensed/d" pyproject.toml + ''; + build-system = [ setuptools-scm ]; dependencies = [ diff --git a/pkgs/development/python-modules/tensorboard/default.nix b/pkgs/development/python-modules/tensorboard/default.nix index ac4647c99f13d..09ff9cdfe8a98 100644 --- a/pkgs/development/python-modules/tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorboard/default.nix @@ -9,9 +9,9 @@ markdown, numpy, packaging, + pillow, protobuf, setuptools, - six, tensorboard-data-server, werkzeug, standard-imghdr, @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "tensorboard"; - version = "2.19.0"; + version = "2.20.0"; format = "wheel"; # tensorflow/tensorboard is built from a downloaded wheel, because @@ -30,7 +30,7 @@ buildPythonPackage rec { inherit pname version format; dist = "py3"; python = "py3"; - hash = "sha256-XnG5hmOmQafOim5wsL6OGkwMRdSHYLB2ODrEdVw1uaA="; + hash = "sha256-ncn5eMuEwHI6z5o0XZbBhPApPRjxZruNWe4Jjmz6q6Y="; }; pythonRelaxDeps = [ @@ -44,9 +44,9 @@ buildPythonPackage rec { markdown numpy packaging + pillow protobuf setuptools - six tensorboard-data-server werkzeug diff --git a/pkgs/development/python-modules/terminado/default.nix b/pkgs/development/python-modules/terminado/default.nix index 7773844c2febc..6b266e62ee748 100644 --- a/pkgs/development/python-modules/terminado/default.nix +++ b/pkgs/development/python-modules/terminado/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { pytest-timeout pytestCheckHook ]; + pytestFlags = [ "-Wignore::pytest.PytestUnraisableExceptionWarning" ]; meta = with lib; { description = "Terminals served by Tornado websockets"; diff --git a/pkgs/development/python-modules/tesserocr/default.nix b/pkgs/development/python-modules/tesserocr/default.nix index 40c5dbfb49af5..8166f0b866263 100644 --- a/pkgs/development/python-modules/tesserocr/default.nix +++ b/pkgs/development/python-modules/tesserocr/default.nix @@ -44,6 +44,9 @@ buildPythonPackage rec { # https://github.com/sirfz/tesserocr/issues/314 postPatch = '' sed -i '/allheaders.h/a\ pass\n\ncdef extern from "leptonica/pix_internal.h" nogil:' tesserocr/tesseract.pxd + + substituteInPlace setup.py \ + --replace-fail "Cython>=0.23,<3.1.0" Cython ''; build-system = [ diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index 0cc3d187af0b9..547ad584741ae 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - fetchpatch2, fetchPypi, mock, pytestCheckHook, @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "8.3.0"; + version = "9.1.0"; pyproject = true; # DO NOT CONTACT upstream. # https://github.com/simplistix/ is only concerned with internal CI process. @@ -26,17 +25,9 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-1MC4SvLyZ2EPkIAJtQ1vmDpOWK3iLGe6tnh7WkAtWcA="; + hash = "sha256-UX6c81OUJyNTOuEQDKRd0n/geFw60nZQdfXLHLzgFII="; }; - patches = [ - (fetchpatch2 { - name = "python313-compat.patch"; - url = "https://github.com/simplistix/testfixtures/commit/a23532c7bc685589cce6a5037821a74da48959e7.patch?full_index=1"; - hash = "sha256-k0j/WgA+6LNTYJ233GJjeRU403bJJRxbpOu+BUsMeyQ="; - }) - ]; - build-system = [ setuptools ]; nativeCheckInputs = [ @@ -46,6 +37,11 @@ buildPythonPackage rec { twisted ]; + disabledTests = [ + "test_filter_missing" + "test_filter_present" + ]; + disabledTestPaths = [ # Django is too much hasle to setup at the moment "testfixtures/tests/test_django" diff --git a/pkgs/development/python-modules/testrail-api/default.nix b/pkgs/development/python-modules/testrail-api/default.nix index 309f46fd27db6..7a7d3cbcf0abd 100644 --- a/pkgs/development/python-modules/testrail-api/default.nix +++ b/pkgs/development/python-modules/testrail-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "testrail-api"; - version = "1.13.3"; + version = "1.13.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tolstislon"; repo = "testrail-api"; tag = version; - hash = "sha256-jsdxKcXFjP9ifQLwRN3M2xpx1a+KpGv469Ag6NNph6w="; + hash = "sha256-0RrNqSuimXXBEkjmnRQiIXUDy6z2y9wKneWqBTi5FHY="; }; build-system = [ diff --git a/pkgs/development/python-modules/textstat/default.nix b/pkgs/development/python-modules/textstat/default.nix index d5dacef7917c0..c0d3ef77cc897 100644 --- a/pkgs/development/python-modules/textstat/default.nix +++ b/pkgs/development/python-modules/textstat/default.nix @@ -8,15 +8,15 @@ pytest, }: buildPythonPackage rec { - version = "0.7.4"; + version = "0.7.8"; pname = "textstat"; pyproject = true; src = fetchFromGitHub { owner = "textstat"; repo = "textstat"; - rev = version; - hash = "sha256-UOCWsIdoVGxmkro4kNBYNMYhA3kktngRDxKjo6o+GXY="; + tag = version; + hash = "sha256-EEGTmZXTAZ4fsfZk/ictvjQ6lCAi5Ma/Ae83ziGDQXQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index 45dcec6ce6a5f..a21583c5c4c22 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "textual"; - version = "4.0.0"; + version = "5.3.0"; pyproject = true; src = fetchFromGitHub { owner = "Textualize"; repo = "textual"; tag = "v${version}"; - hash = "sha256-rVDr4Snp5qnErxWRM9yoxnzzX8gg8nD3RbBkL1rmgqI="; + hash = "sha256-J7Sb4nv9wOl1JnR6Ky4XS9HZHABKtNKPB3uYfC/UGO4="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/thermopro-ble/default.nix b/pkgs/development/python-modules/thermopro-ble/default.nix index 0da7947b12c62..8e6f8fa45df67 100644 --- a/pkgs/development/python-modules/thermopro-ble/default.nix +++ b/pkgs/development/python-modules/thermopro-ble/default.nix @@ -5,6 +5,7 @@ buildPythonPackage, fetchFromGitHub, poetry-core, + pytest-asyncio, pytest-cov-stub, pytestCheckHook, pythonOlder, @@ -34,6 +35,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytest-asyncio pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/thrift/default.nix b/pkgs/development/python-modules/thrift/default.nix index e3301d3ab4ccb..214aaea6ced13 100644 --- a/pkgs/development/python-modules/thrift/default.nix +++ b/pkgs/development/python-modules/thrift/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "thrift"; - version = "0.21.0"; + version = "0.22.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Xm98UPk26/oj6SQimvyV6yGfjI5agyAt1KORJEgD5AI="; + hash = "sha256-QugnavvV9U/h02SFi2h3vF5aSl7Wn2oAW5TKSRj+FGY="; }; build-system = [ diff --git a/pkgs/development/python-modules/thriftpy2/default.nix b/pkgs/development/python-modules/thriftpy2/default.nix index db5292a9f5d66..03ac0195c2d3a 100644 --- a/pkgs/development/python-modules/thriftpy2/default.nix +++ b/pkgs/development/python-modules/thriftpy2/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "thriftpy2"; - version = "0.5.2"; + version = "0.5.3"; pyproject = true; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Thriftpy"; repo = "thriftpy2"; tag = "v${version}"; - hash = "sha256-GBJL+IqZpT1/msJLiwiS5YDyB4hIe/e3pYPWx0A+lWY="; + hash = "sha256-idUKqpyRj8lq9Aq6vEEeYEawzRPOdNsySnkgfhwPtMc="; }; build-system = [ setuptools ]; @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for Apache Thrift"; homepage = "https://github.com/Thriftpy/thriftpy2"; - changelog = "https://github.com/Thriftpy/thriftpy2/blob/v${version}/CHANGES.rst"; + changelog = "https://github.com/Thriftpy/thriftpy2/blob/${src.tag}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/tianshou/default.nix b/pkgs/development/python-modules/tianshou/default.nix index 2336768719cf5..7cb9052c2d021 100644 --- a/pkgs/development/python-modules/tianshou/default.nix +++ b/pkgs/development/python-modules/tianshou/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { pname = "tianshou"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -56,7 +56,7 @@ buildPythonPackage rec { owner = "thu-ml"; repo = "tianshou"; tag = "v${version}"; - hash = "sha256-eiwbSX8Q3KF6h7CfjuZ+7HlXwpvLga1NVr3e+FkPaHc="; + hash = "sha256-lJAxjE+GMwssov1r4jOCOTf5Aonu+q6FSz5oWvZpuQQ="; }; pythonRelaxDeps = [ @@ -182,7 +182,7 @@ buildPythonPackage rec { meta = { description = "Elegant PyTorch deep reinforcement learning library"; homepage = "https://github.com/thu-ml/tianshou"; - changelog = "https://github.com/thu-ml/tianshou/releases/tag/v${version}"; + changelog = "https://github.com/thu-ml/tianshou/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ derdennisop ]; }; diff --git a/pkgs/development/python-modules/tiledb/default.nix b/pkgs/development/python-modules/tiledb/default.nix index ca08af4ac055a..d43419139032e 100644 --- a/pkgs/development/python-modules/tiledb/default.nix +++ b/pkgs/development/python-modules/tiledb/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "tiledb"; - version = "0.33.2"; + version = "0.34.2"; format = "setuptools"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB-Py"; tag = version; - hash = "sha256-c7mEYgk+9sHvOI7z/jp/VI3mA7XOlNFik8X5rTyBclg="; + hash = "sha256-EXRrWp/2sMn7DCzgXk5L0692rhGtQZwWpVWYnfrxmGA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tiler/default.nix b/pkgs/development/python-modules/tiler/default.nix index 40766f6436c6d..16dc515e04f25 100644 --- a/pkgs/development/python-modules/tiler/default.nix +++ b/pkgs/development/python-modules/tiler/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "tiler"; - version = "0.5.7"; + version = "0.6.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-2HWO/iJ9RCWNVmw2slu9F/+Mchk3evB5/F8EfbuMI/Y="; + hash = "sha256-ps0uHgzPa+ZoXXrB+0gfuVIEBUNmym/ym6xCxiyHhxA="; }; patches = [ diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index af3444f39a1de..ae02585f8ba06 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -12,16 +12,17 @@ pscript, pyjwt, pytestCheckHook, + pythonOlder, requests, - setuptools, uvicorn, - writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "timetagger"; version = "25.06.1"; - pyproject = true; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "almarklein"; @@ -30,9 +31,7 @@ buildPythonPackage rec { hash = "sha256-fuZj4DoqtgIcRd/u7l0GsWqmuLEgF3BW5gN5wY8FdK0="; }; - build-system = [ setuptools ]; - - dependencies = [ + propagatedBuildInputs = [ asgineer bcrypt iptools @@ -44,21 +43,22 @@ buildPythonPackage rec { uvicorn ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + nativeCheckInputs = [ nodejs pytestCheckHook requests - writableTmpDirAsHomeHook ]; - pythonImportsCheck = [ "timetagger" ]; - - meta = { + meta = with lib; { description = "Library to interact with TimeTagger"; + mainProgram = "timetagger"; homepage = "https://github.com/almarklein/timetagger"; changelog = "https://github.com/almarklein/timetagger/releases/tag/${src.tag}"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ matthiasbeyer ]; - mainProgram = "timetagger"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix index 767651e322dfb..c07115722106c 100644 --- a/pkgs/development/python-modules/tld/default.nix +++ b/pkgs/development/python-modules/tld/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "tld"; - version = "0.13"; + version = "0.13.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-k93l4cBL3xhEl26uRAcGN50h9KsjW3PAXXSD4HT7Vik="; + hash = "sha256-dewAk2y89WT2c2HEFxM2NEC2xO8PDBWStbD75ywXo1A="; }; nativeCheckInputs = [ @@ -31,6 +31,8 @@ buildPythonPackage rec { faker ]; + doCheck = false; # missing pytest-codeblock + # These tests require network access, but disabledTestPaths doesn't work. # the file needs to be `import`ed by another Python test file, so it # can't simply be removed. diff --git a/pkgs/development/python-modules/total-connect-client/default.nix b/pkgs/development/python-modules/total-connect-client/default.nix index 79c1d18604372..5f61748dc1fc9 100644 --- a/pkgs/development/python-modules/total-connect-client/default.nix +++ b/pkgs/development/python-modules/total-connect-client/default.nix @@ -7,13 +7,14 @@ pytestCheckHook, pythonOlder, requests-mock, + requests-oauthlib, setuptools, zeep, }: buildPythonPackage rec { pname = "total-connect-client"; - version = "2025.1.4"; + version = "2025.5"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "craigjmidwinter"; repo = "total-connect-client"; tag = version; - hash = "sha256-zzSYi/qhHmugH30bnYHK9lCBVN5wuv6n9rvaZC/sIag="; + hash = "sha256-xVpR5gd185eZBoqUhVVcFGPbPFjCavwOZP7yFObzGic="; }; build-system = [ setuptools ]; @@ -32,6 +33,7 @@ buildPythonPackage rec { dependencies = [ pycryptodome pyjwt + requests-oauthlib zeep ]; @@ -45,7 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Interact with Total Connect 2 alarm systems"; homepage = "https://github.com/craigjmidwinter/total-connect-client"; - changelog = "https://github.com/craigjmidwinter/total-connect-client/releases/tag/${version}"; + changelog = "https://github.com/craigjmidwinter/total-connect-client/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 0427ed68a8004..93be8bfdb6883 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "tox"; - version = "4.26.0"; + version = "4.28.4"; format = "pyproject"; src = fetchFromGitHub { owner = "tox-dev"; repo = "tox"; tag = version; - hash = "sha256-VySdeZDC71vi2mOtjdFJ4iCSpWbFEW3nzrVucPUz/oc="; + hash = "sha256-EKJsFf4LvfDi3OL6iNhKEBl5zlpdLET9RkfHEP7E9xU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/trackpy/default.nix b/pkgs/development/python-modules/trackpy/default.nix index 1190aad1f3134..2f7b012cf10b9 100644 --- a/pkgs/development/python-modules/trackpy/default.nix +++ b/pkgs/development/python-modules/trackpy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "trackpy"; - version = "0.6.4"; + version = "0.7"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "soft-matter"; repo = "trackpy"; tag = "v${version}"; - hash = "sha256-6i1IfdxgV6bpf//mXATpnsQ0zN26S8rlL0/1ql68sd8="; + hash = "sha256-3e+gHdn/4n8T78eA3Gjz1TdSI4Hd935U2pqd8wG+U0M="; }; propagatedBuildInputs = [ @@ -52,7 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Particle-tracking toolkit"; homepage = "https://github.com/soft-matter/trackpy"; - changelog = "https://github.com/soft-matter/trackpy/releases/tag/v${version}"; + changelog = "https://github.com/soft-matter/trackpy/releases/tag/${src.tag}"; license = licenses.bsd3; maintainers = [ ]; broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); diff --git a/pkgs/development/python-modules/tree-sitter-markdown/default.nix b/pkgs/development/python-modules/tree-sitter-markdown/default.nix index 70511b6031279..554324248f4b2 100644 --- a/pkgs/development/python-modules/tree-sitter-markdown/default.nix +++ b/pkgs/development/python-modules/tree-sitter-markdown/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "tree-sitter-markdown"; # only update to the latest version on PyPI - version = "0.3.2"; + version = "0.5.0"; pyproject = true; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-markdown"; tag = "v${version}"; - hash = "sha256-OlVuHz9/5lxsGVT+1WhKx+7XtQiezMW1odiHGinzro8="; + hash = "sha256-I9KDE1yZce8KIGPLG5tmv5r/NCWwN95R6fIyvGdx+So="; }; build-system = [ diff --git a/pkgs/development/python-modules/tree-sitter-rust/default.nix b/pkgs/development/python-modules/tree-sitter-rust/default.nix index 8820bd0680b41..f720341200b18 100644 --- a/pkgs/development/python-modules/tree-sitter-rust/default.nix +++ b/pkgs/development/python-modules/tree-sitter-rust/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "tree-sitter-rust"; - version = "0.23.2"; + version = "0.24.0"; pyproject = true; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; tag = "v${version}"; - hash = "sha256-aT+tlrEKMgWqTEq/NHh8Vj92h6i1aU6uPikDyaP2vfc="; + hash = "sha256-y3sJURlSTM7LRRN5WGIAeslsdRZU522Tfcu6dnXH/XQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/tree-sitter/default.nix b/pkgs/development/python-modules/tree-sitter/default.nix index 4c176538beb0b..74d54cfedbd64 100644 --- a/pkgs/development/python-modules/tree-sitter/default.nix +++ b/pkgs/development/python-modules/tree-sitter/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "tree-sitter"; - version = "0.24.0"; + version = "0.25.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-q9la9lyi9Pfso1Y0M5HtZp52Tzd0i1NSlG8A9/x45zQ="; + hash = "sha256-FciHdc8k2wZne6/mLfBYpkV9im3eZ7qkjdNyO5BeeaY="; }; # see https://github.com/tree-sitter/py-tree-sitter/issues/330#issuecomment-2629403946 diff --git a/pkgs/development/python-modules/treelib/default.nix b/pkgs/development/python-modules/treelib/default.nix index 1fd566f4c27d4..77b3fc6340478 100644 --- a/pkgs/development/python-modules/treelib/default.nix +++ b/pkgs/development/python-modules/treelib/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "treelib"; - version = "1.7.1"; + version = "1.8.0"; format = "setuptools"; src = fetchFromGitHub { owner = "caesar0301"; repo = "treelib"; tag = "v${version}"; - hash = "sha256-+6Ur2hEhUxHccZLdWHCyCkdI6Zr/wGTBIIzzbpEEiSY="; + hash = "sha256-jvaZVy+FUcCcIdvWK6zFL8IBVH+hMiPMmv5shFXLo0k="; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index 2f19ecf00a0a5..621dc5ad2acca 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -5,11 +5,12 @@ # build-system incremental, - setuptools, + hatchling, # dependencies attrs, hyperlink, + multipart, requests, twisted, @@ -19,23 +20,24 @@ buildPythonPackage rec { pname = "treq"; - version = "24.9.1"; + version = "25.5.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Fdp/xATz5O1Z0Kvl+O70lm+rvmGAOaKiO8fBUwXO/qg="; + hash = "sha256-Jd3jpVroXsLyxWMyyZrvJVqxT5l9DQBVLr/xNTipgEo="; }; nativeBuildInputs = [ incremental - setuptools + hatchling ]; propagatedBuildInputs = [ attrs hyperlink incremental + multipart requests twisted ] diff --git a/pkgs/development/python-modules/trino-python-client/default.nix b/pkgs/development/python-modules/trino-python-client/default.nix index 333d3fc2ee2d6..bbf712cdf37ea 100644 --- a/pkgs/development/python-modules/trino-python-client/default.nix +++ b/pkgs/development/python-modules/trino-python-client/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "trino-python-client"; - version = "0.323.0"; + version = "0.334.0"; format = "setuptools"; src = fetchFromGitHub { repo = "trino-python-client"; owner = "trinodb"; tag = version; - hash = "sha256-Nr7p7x5cxxuPv2NUh1uMth97OQ+H2KBlu0SHVJ7Zu1M="; + hash = "sha256-cSwMmzIUFYX8VgSwobth8EsARUff3hhfBf+IrhuFSYM="; }; nativeBuildInputs = [ setuptools ]; @@ -62,7 +62,7 @@ buildPythonPackage rec { disabledTestMarks = [ "auth" ]; meta = with lib; { - changelog = "https://github.com/trinodb/trino-python-client/blob/${version}/CHANGES.md"; + changelog = "https://github.com/trinodb/trino-python-client/blob/${src.tag}/CHANGES.md"; description = "Client for the Trino distributed SQL Engine"; homepage = "https://github.com/trinodb/trino-python-client"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/trl/default.nix b/pkgs/development/python-modules/trl/default.nix index 102e879db55fa..bc89ac18fd4bc 100644 --- a/pkgs/development/python-modules/trl/default.nix +++ b/pkgs/development/python-modules/trl/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "trl"; - version = "0.19.0"; + version = "0.20.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "trl"; tag = "v${version}"; - hash = "sha256-TlTq3tIQfNuI+CPvIy/qPFiKPhoSQd7g7FDj4F7C3CQ="; + hash = "sha256-z14refdNySnKcfFq54l+slsi4SLe5FG8UNoAKxfmAy0="; }; build-system = [ diff --git a/pkgs/development/python-modules/ttkbootstrap/default.nix b/pkgs/development/python-modules/ttkbootstrap/default.nix index 458ae0b51d691..626030ea4d8a3 100644 --- a/pkgs/development/python-modules/ttkbootstrap/default.nix +++ b/pkgs/development/python-modules/ttkbootstrap/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "ttkbootstrap"; - version = "1.12.1"; - format = "setuptools"; + version = "1.14.2"; + pyproject = true; src = fetchFromGitHub { owner = "israel-dryer"; repo = "ttkbootstrap"; tag = "v${version}"; - hash = "sha256-Pkp45lB1Xeu9ZoLjKS8aSW2By/k3ID1qwMig/jdYHh4="; + hash = "sha256-D1Gx+gP6xbeOhKcjb2uhwhHlYFhma9y04tp0ibJCw6g="; }; build-system = [ @@ -27,6 +27,8 @@ buildPythonPackage rec { pillow ]; + pythonRelaxDeps = [ "pillow" ]; + # As far as I can tell, all tests require a display and are not normal-ish pytests # but appear to just be python scripts that run demos of components? doCheck = false; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 4274fe5e05d2d..4b3c8b3e576f6 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -33,7 +33,7 @@ # tests cython-test-exception-raiser, - git, + gitMinimal, glibcLocales, pyhamcrest, hypothesis, @@ -55,7 +55,7 @@ buildPythonPackage rec { pname = "twisted"; - version = "24.11.0"; + version = "25.5.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -63,7 +63,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-aV0FVtXsV53MRk0oVrY0iA7RMZ9FsQ0ZBD8rV+sBFbU="; + hash = "sha256-HesnI1jLa+Hj6PxvnIs2946w+nwiM9Lb4R7G/uBOoxY="; }; __darwinAllowLocalNetworking = true; @@ -194,7 +194,7 @@ buildPythonPackage rec { ''; nativeCheckInputs = [ - git + gitMinimal glibcLocales ] ++ optional-dependencies.test diff --git a/pkgs/development/python-modules/type-infer/default.nix b/pkgs/development/python-modules/type-infer/default.nix index 371708f7d0d0a..5bc50ccf9e455 100644 --- a/pkgs/development/python-modules/type-infer/default.nix +++ b/pkgs/development/python-modules/type-infer/default.nix @@ -24,7 +24,7 @@ let d.stopwords ]); - version = "0.0.21"; + version = "0.0.23"; tag = "v${version}"; in buildPythonPackage { @@ -38,7 +38,7 @@ buildPythonPackage { owner = "mindsdb"; repo = "type_infer"; inherit tag; - hash = "sha256-Q5f4WihaT88R+x4jMUuRNBvWglkGdS5oi+o9jOk+tSE="; + hash = "sha256-tqT/MTcSHcKGoPUUzjPLFpOTchannFsCd2VMC+8kVZ8="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix index 2e37f4f02ac1f..78802f283b336 100644 --- a/pkgs/development/python-modules/typed-settings/default.nix +++ b/pkgs/development/python-modules/typed-settings/default.nix @@ -21,7 +21,7 @@ }: buildPythonPackage rec { pname = "typed-settings"; - version = "24.6.0"; + version = "25.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "typed_settings"; inherit version; - hash = "sha256-mlWV3jP4BFKiA44Bi8RVCP/8I4qHUvCPXAPcjnvA0eI="; + hash = "sha256-Kbr9Mc1PXgD+OAw/ADp3HXC+rnAJcFEqjlXxQq/1wRM="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index 4873e61061daf..b14939e91f515 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.4.2"; + version = "4.4.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-pvEGWBPjLvNlvDs/UDr4qW+d1OADOgLCjEpJg96MbEk="; + hash = "sha256-On/S3/twXU0O+u1DBqcEyJud7oULaI8GCosWFaeeX3Q="; }; outputs = [ @@ -53,6 +53,10 @@ buildPythonPackage rec { pytestCheckHook ]; + # To prevent test from writing out non-reproducible .pyc files + # https://github.com/agronholm/typeguard/blob/ca512c28132999da514f31b5e93ed2f294ca8f77/tests/test_typechecked.py#L641 + preCheck = "export PYTHONDONTWRITEBYTECODE=1"; + pythonImportsCheck = [ "typeguard" ]; meta = { diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index 044cda7730722..337369c869dfa 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "typer"; - version = "0.15.4"; + version = "0.16.0"; pyproject = true; src = fetchFromGitHub { owner = "fastapi"; repo = "typer"; tag = version; - hash = "sha256-lZJKE8bxYxmDxAmnL7L/fL89gMe44voyHT20DUazd9E="; + hash = "sha256-WB9PIxagTHutfk3J+mNTVK8bC7TMDJquu3GLBQgaras="; }; build-system = [ pdm-backend ]; @@ -73,6 +73,12 @@ buildPythonPackage rec { "test_install_completion" ]; + disabledTestPaths = [ + # likely click 8.2 compat issue + "tests/test_tutorial/test_parameter_types/test_bool/test_tutorial002_an.py" + "tests/test_tutorial/test_parameter_types/test_bool/test_tutorial002.py" + ]; + pythonImportsCheck = [ "typer" ]; meta = { diff --git a/pkgs/development/python-modules/types-colorama/default.nix b/pkgs/development/python-modules/types-colorama/default.nix index c14b2e4ded7a0..404583aeffda8 100644 --- a/pkgs/development/python-modules/types-colorama/default.nix +++ b/pkgs/development/python-modules/types-colorama/default.nix @@ -7,12 +7,13 @@ buildPythonPackage rec { pname = "types-colorama"; - version = "0.4.15.20240311"; + version = "0.4.15.20250801"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-oo5/mNF9KxT7lWXTI4jkGfQQj1V6fZOaZjGZabK5nHo="; + pname = "types_colorama"; + inherit version; + hash = "sha256-AlZdE9aJY9EiN9PzMPXs1iKjF597WxTufxYUYnDDV/U="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-lxml/default.nix b/pkgs/development/python-modules/types-lxml/default.nix index 270dac5caa1d2..02e93cd4cd461 100644 --- a/pkgs/development/python-modules/types-lxml/default.nix +++ b/pkgs/development/python-modules/types-lxml/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "types-lxml"; - version = "2025.03.04"; + version = "2025.03.30"; pyproject = true; src = fetchFromGitHub { owner = "abelcheung"; repo = "types-lxml"; tag = version; - hash = "sha256-dA9sspqEChHarwk2LrK2F7Ehri2ffjOlGk3nj4KFsfU="; + hash = "sha256-+H1VOO72/zq0nITq2a+4wEarPqBdBF7wIfRShFBsLPw="; }; pythonRelaxDeps = [ "beautifulsoup4" ]; diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix index 75d8c55bfaa3f..f8f2066c7bd5e 100644 --- a/pkgs/development/python-modules/types-protobuf/default.nix +++ b/pkgs/development/python-modules/types-protobuf/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "5.29.1.20250315"; + version = "6.30.2.20250703"; format = "setuptools"; src = fetchPypi { pname = "types_protobuf"; inherit version; - hash = "sha256-CwW8NGIdBG3lS5T93V9Os7+En+LhOlD4+46J81BF/0k="; + hash = "sha256-YJqXR1S7tx+hePxkH1EFA5Xo4YSfSdBCCmKB7Y0d30Y="; }; propagatedBuildInputs = [ types-futures ]; diff --git a/pkgs/development/python-modules/types-psutil/default.nix b/pkgs/development/python-modules/types-psutil/default.nix index 92cd3efb2a968..0083966409468 100644 --- a/pkgs/development/python-modules/types-psutil/default.nix +++ b/pkgs/development/python-modules/types-psutil/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "types-psutil"; - version = "7.0.0.20250401"; + version = "7.0.0.20250801"; format = "setuptools"; src = fetchPypi { pname = "types_psutil"; inherit version; - hash = "sha256-Kn1mPAiIoHn8FkPrwQmtEuV6IclVKp4gNdpQQZEzbb8="; + hash = "sha256-AjC1YjQlLMb1nDYdzLqqCPMIjqNWk2er5pAEhdOIyX0="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-python-dateutil/default.nix b/pkgs/development/python-modules/types-python-dateutil/default.nix index 0dd1b01af601f..a7590da661ba5 100644 --- a/pkgs/development/python-modules/types-python-dateutil/default.nix +++ b/pkgs/development/python-modules/types-python-dateutil/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "types-python-dateutil"; - version = "2.9.0.20241206"; + version = "2.9.0.20250708"; pyproject = true; src = fetchPypi { pname = "types_python_dateutil"; inherit version; - hash = "sha256-GPSTQUwm/7ppKnI2n+p6FUxQJkYwHr/j1WoEs3ZyhMs="; + hash = "sha256-zNvXXastbJaWw1BXnzTP/iwoHkxfJ6WFsqJDjdHVyKs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-pyyaml/default.nix b/pkgs/development/python-modules/types-pyyaml/default.nix index 46893f2f9f57a..e9dbdeb82433c 100644 --- a/pkgs/development/python-modules/types-pyyaml/default.nix +++ b/pkgs/development/python-modules/types-pyyaml/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "types-pyyaml"; - version = "6.0.12.20250402"; + version = "6.0.12.20250516"; pyproject = true; src = fetchPypi { pname = "types_pyyaml"; inherit version; - hash = "sha256-18E8Pm0zW2r0sBIqAf8dJwq6hKuW0aGhBj7Lo+E+wHU="; + hash = "sha256-nyGnAhb8D6GyFqgXbbX54K9us10vKTKsuHaJ0Dpb9ro="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index 6c508858478f0..8fdcc17567d78 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "78.1.0.20250329"; + version = "80.9.0.20250801"; pyproject = true; src = fetchPypi { pname = "types_setuptools"; inherit version; - hash = "sha256-MeYpUMOLjMHFEUsHdQTjZCaGCgZCh8rBG5ZmqzpIMjQ="; + hash = "sha256-4ekmgvoHImQVOWu04tMfEWoW/75YOwWwH5kQ/N6jt+g="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/typeshed-client/default.nix b/pkgs/development/python-modules/typeshed-client/default.nix index 748fe0f050161..507bfd771f417 100644 --- a/pkgs/development/python-modules/typeshed-client/default.nix +++ b/pkgs/development/python-modules/typeshed-client/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "typeshed-client"; - version = "2.7.0"; + version = "2.8.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "JelleZijlstra"; repo = "typeshed_client"; tag = "v${version}"; - hash = "sha256-dEfKZ930Jxa84HUqKpsL2JWQLeeWx6gIMtFHTbiw3Es="; + hash = "sha256-+muWm2/Psp8V1n7mEloc+ltuwHG/uRvDUgSFRNzz5EQ="; }; build-system = [ setuptools ]; @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Retrieve information from typeshed and other typing stubs"; homepage = "https://github.com/JelleZijlstra/typeshed_client"; - changelog = "https://github.com/JelleZijlstra/typeshed_client/releases/tag/v${version}"; + changelog = "https://github.com/JelleZijlstra/typeshed_client/releases/tag/${src.tag}"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/typing-extensions/default.nix b/pkgs/development/python-modules/typing-extensions/default.nix index b31e894e59db7..662ad9c5eb9a8 100644 --- a/pkgs/development/python-modules/typing-extensions/default.nix +++ b/pkgs/development/python-modules/typing-extensions/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "typing-extensions"; - version = "4.13.2"; + version = "4.14.1"; pyproject = true; src = fetchFromGitHub { owner = "python"; repo = "typing_extensions"; tag = version; - hash = "sha256-6wG+f0+sGI3sWy4EYeWDTffLicMiIkACHwrw0oP4Z1w="; + hash = "sha256-KzfxVUgPN1cLg73A3TC2zQjYfeLc8x9TtbLmOfmlOkY="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/tyro/default.nix b/pkgs/development/python-modules/tyro/default.nix index c0d4ccddee266..6422a960ccd1c 100644 --- a/pkgs/development/python-modules/tyro/default.nix +++ b/pkgs/development/python-modules/tyro/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "tyro"; - version = "0.9.19"; + version = "0.9.27"; pyproject = true; src = fetchFromGitHub { owner = "brentyi"; repo = "tyro"; tag = "v${version}"; - hash = "sha256-A1Vplc84Xy8TufqmklPUzIdgiPpFcIjqV0eUgdKmYRM="; + hash = "sha256-2duLVdBwNpGWCV+WgtzyXjoVhukVjUUhIWXVBEk4QIA="; }; build-system = [ hatchling ]; @@ -62,7 +62,7 @@ buildPythonPackage rec { meta = { description = "CLI interfaces & config objects, from types"; homepage = "https://github.com/brentyi/tyro"; - changelog = "https://github.com/brentyi/tyro/releases/tag/v${version}"; + changelog = "https://github.com/brentyi/tyro/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ hoh ]; }; diff --git a/pkgs/development/python-modules/uart-devices/default.nix b/pkgs/development/python-modules/uart-devices/default.nix index a8ae51c93c631..3005eb14e7d23 100644 --- a/pkgs/development/python-modules/uart-devices/default.nix +++ b/pkgs/development/python-modules/uart-devices/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "uart-devices"; - version = "0.1.0"; + version = "0.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "uart-devices"; tag = "v${version}"; - hash = "sha256-rmOWyTdOwnlr8Rwsvd2oeZq79LuGVJDAkIW2/9gGrKQ="; + hash = "sha256-vBwQXeXw9y7eETtlC4dcqGytIgrAm7iomnvoaxhl6JI="; }; postPatch = '' @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "UART Devices for Linux"; homepage = "https://github.com/bdraco/uart-devices"; - changelog = "https://github.com/bdraco/uart-devices/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/bdraco/uart-devices/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/uasiren/default.nix b/pkgs/development/python-modules/uasiren/default.nix index 7b26d889cedca..e82ee94bb7ae9 100644 --- a/pkgs/development/python-modules/uasiren/default.nix +++ b/pkgs/development/python-modules/uasiren/default.nix @@ -10,6 +10,7 @@ aiohttp, # tests + pytest-asyncio, pytestCheckHook, }: @@ -33,7 +34,10 @@ buildPythonPackage { propagatedBuildInputs = [ aiohttp ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; pythonImportsCheck = [ "uasiren" diff --git a/pkgs/development/python-modules/ueberzug/default.nix b/pkgs/development/python-modules/ueberzug/default.nix index 633e2d9d7db27..e10e0b5785972 100644 --- a/pkgs/development/python-modules/ueberzug/default.nix +++ b/pkgs/development/python-modules/ueberzug/default.nix @@ -1,35 +1,44 @@ { lib, + attrs, buildPythonPackage, + docopt, fetchPypi, - isPy27, libX11, libXext, - attrs, - docopt, + libXres, + meson-python, + meson, pillow, + pkg-config, psutil, xlib, }: buildPythonPackage rec { pname = "ueberzug"; - version = "18.1.9"; - format = "setuptools"; - - disabled = isPy27; + version = "18.3.1"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "7ce49f351132c7d1b0f8097f6e4c5635376151ca59318540da3e296e5b21adc3"; + hash = "sha256-1Lk4E5YwEq2mUnYbIWDhzz9/CCwfXMJ11/TtJ44ugOk="; }; + build-system = [ + meson + meson-python + ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 + libXres libXext ]; - propagatedBuildInputs = [ + dependencies = [ attrs docopt pillow @@ -42,10 +51,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "ueberzug" ]; meta = with lib; { - homepage = "https://github.com/seebye/ueberzug"; description = "Alternative for w3mimgdisplay"; + homepage = "https://github.com/ueber-devel/ueberzug"; + changelog = "https://github.com/ueber-devel/ueberzug/releases/tag/${version}"; + license = licenses.gpl3Only; mainProgram = "ueberzug"; - license = licenses.gpl3; maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix index a7b85b658083c..871fb640c09f4 100644 --- a/pkgs/development/python-modules/ufo2ft/default.nix +++ b/pkgs/development/python-modules/ufo2ft/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "ufo2ft"; - version = "3.5.1"; + version = "3.6.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-FUITbL+FnscmZjZMlgh/dX4+tJR6MD0LoH5jDNisQkI="; + hash = "sha256-hKqTjD8cTgyxHZnaojPAT5JY11okvLiNOnemoULnpmw="; }; build-system = [ diff --git a/pkgs/development/python-modules/ufolib2/default.nix b/pkgs/development/python-modules/ufolib2/default.nix index 6597a46dabeb8..6d6ab0af094c1 100644 --- a/pkgs/development/python-modules/ufolib2/default.nix +++ b/pkgs/development/python-modules/ufolib2/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "ufolib2"; - version = "0.17.1"; + version = "0.18.1"; format = "pyproject"; src = fetchFromGitHub { owner = "fonttools"; repo = "ufoLib2"; tag = "v${version}"; - hash = "sha256-pVwQOVtUUDphBZIUoiIf19DdZ+t7uS32Ery8+e2ZLlE="; + hash = "sha256-YFGgPpiEurPaTUFaSMsVBKS4Ob+vPyZhputfRE39wtg="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/uharfbuzz/default.nix b/pkgs/development/python-modules/uharfbuzz/default.nix index b04167f1e6dba..d03057e8cc14c 100644 --- a/pkgs/development/python-modules/uharfbuzz/default.nix +++ b/pkgs/development/python-modules/uharfbuzz/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "uharfbuzz"; - version = "0.45.0"; + version = "0.51.1"; pyproject = true; disabled = pythonOlder "3.5"; @@ -22,7 +22,7 @@ buildPythonPackage rec { repo = "uharfbuzz"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-dfEyeejJdLHGHH+YI0mWdjF2rvFpM6/KVm2tLo9ssUs="; + hash = "sha256-mVxG0unTjMjb0/6w58Py+TARw8YmOWljTlQQwUEdMpg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ultralytics/default.nix b/pkgs/development/python-modules/ultralytics/default.nix index 926844ac46f69..04048239733ff 100644 --- a/pkgs/development/python-modules/ultralytics/default.nix +++ b/pkgs/development/python-modules/ultralytics/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "ultralytics"; - version = "8.3.143"; + version = "8.3.174"; pyproject = true; src = fetchFromGitHub { owner = "ultralytics"; repo = "ultralytics"; tag = "v${version}"; - hash = "sha256-qpFQcGLTEQS7Bt9CvdXgv2JyNfOONS0Cf71dckCrlPw="; + hash = "sha256-wQ16e67ldrV8KwAXoLyxqzx9DG+LAmU5Mt+65dQzUkY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix index 616aefb657eb9..5b462a1c37697 100644 --- a/pkgs/development/python-modules/umap-learn/default.nix +++ b/pkgs/development/python-modules/umap-learn/default.nix @@ -34,14 +34,14 @@ buildPythonPackage rec { pname = "umap-learn"; - version = "0.5.8"; + version = "0.5.9.post2"; pyproject = true; src = fetchFromGitHub { owner = "lmcinnes"; repo = "umap"; tag = "release-${version}"; - hash = "sha256-VR+qBZyFtpW/xuFXI8pxDkkwJKt9qajnUtvuZLFZtF0="; + hash = "sha256-ollUXPVB07v6DkQ/d1eke0/j1f4Ekfygo1r6CtIRTuk="; }; build-system = [ setuptools ]; @@ -101,7 +101,7 @@ buildPythonPackage rec { meta = { description = "Uniform Manifold Approximation and Projection"; homepage = "https://github.com/lmcinnes/umap"; - changelog = "https://github.com/lmcinnes/umap/releases/tag/release-${version}"; + changelog = "https://github.com/lmcinnes/umap/releases/tag/release-${src.tag}"; license = lib.licenses.bsd3; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/unidata-blocks/default.nix b/pkgs/development/python-modules/unidata-blocks/default.nix index df0f39d9ce77d..716e67b2f29c4 100644 --- a/pkgs/development/python-modules/unidata-blocks/default.nix +++ b/pkgs/development/python-modules/unidata-blocks/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "unidata-blocks"; - version = "0.0.16"; + version = "0.0.17"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "unidata_blocks"; inherit version; - hash = "sha256-b/5Yq9wI+qSYSObBMCqZ3j8fSXwe4ssenNlvpkJSZro="; + hash = "sha256-QI9niECwNRyVpyzjaibPmlXxLpIbVA5v0bz94s0dDtM="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/unsloth-zoo/default.nix b/pkgs/development/python-modules/unsloth-zoo/default.nix index 03f4a6e9d577c..d5f50d0578eca 100644 --- a/pkgs/development/python-modules/unsloth-zoo/default.nix +++ b/pkgs/development/python-modules/unsloth-zoo/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "unsloth-zoo"; - version = "2025.6.4"; + version = "2025.8.1"; pyproject = true; # no tags on GitHub src = fetchPypi { pname = "unsloth_zoo"; inherit version; - hash = "sha256-3KLsFYhnTPqaeydFJDHr+qNkTVi2NL3ADjzkd0NBOQQ="; + hash = "sha256-AkAfd+dJb8A9cUYK/VH30Q5xN2BW/x4zyndnIyN9y14="; }; # pyproject.toml requires an obsolete version of protobuf, diff --git a/pkgs/development/python-modules/unsloth/default.nix b/pkgs/development/python-modules/unsloth/default.nix index 1e9124ad1a629..dc45bf8ded2f6 100644 --- a/pkgs/development/python-modules/unsloth/default.nix +++ b/pkgs/development/python-modules/unsloth/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "unsloth"; - version = "2025.6.5"; + version = "2025.8.1"; pyproject = true; # Tags on the GitHub repo don't match src = fetchPypi { pname = "unsloth"; inherit version; - hash = "sha256-o4c4gANnjM+z4Dp/0BZ48SMLMbCyIgjF3C5Q/AXV49A="; + hash = "sha256-hkE+f6apgilrE0lFTWRe8PEvRQ71YuoHpQgzd/R/FaI="; }; build-system = [ diff --git a/pkgs/development/python-modules/unstructured-client/default.nix b/pkgs/development/python-modules/unstructured-client/default.nix index b3c58f576e579..c92072ee35b8d 100644 --- a/pkgs/development/python-modules/unstructured-client/default.nix +++ b/pkgs/development/python-modules/unstructured-client/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "unstructured-client"; - version = "0.38.1"; + version = "0.42.0"; pyproject = true; src = fetchFromGitHub { owner = "Unstructured-IO"; repo = "unstructured-python-client"; tag = "v${version}"; - hash = "sha256-gzNPzS//7MU6nX3cA0p6dPqIG273VlGMU0ePyObn4d4="; + hash = "sha256-LXCKD2LL1rFObr2Ew0vsa5Uh96sR8/821ecL/il30r0="; }; preBuild = '' diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix index fb11ac5990036..5cd2137eca44e 100644 --- a/pkgs/development/python-modules/unstructured/default.nix +++ b/pkgs/development/python-modules/unstructured/default.nix @@ -116,9 +116,9 @@ grpcio, }: let - version = "0.17.2"; + version = "0.18.12"; in -buildPythonPackage { +buildPythonPackage rec { pname = "unstructured"; inherit version; pyproject = true; @@ -127,7 +127,7 @@ buildPythonPackage { owner = "Unstructured-IO"; repo = "unstructured"; tag = version; - hash = "sha256-DbNfhJzpPJObACWSc2r16kjIE2X/CrOCiT7fdgGNwIg="; + hash = "sha256-YZsfpfkvjkNStYhU4lC3I/Hr1ahJ1wccyJ8lckwejaA="; }; build-system = [ setuptools ]; @@ -278,7 +278,7 @@ buildPythonPackage { description = "Open source libraries and APIs to build custom preprocessing pipelines for labeling, training, or production machine learning pipelines"; mainProgram = "unstructured-ingest"; homepage = "https://github.com/Unstructured-IO/unstructured"; - changelog = "https://github.com/Unstructured-IO/unstructured/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/Unstructured-IO/unstructured/blob/${src.tag}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ happysalada ]; }; diff --git a/pkgs/development/python-modules/uqbar/default.nix b/pkgs/development/python-modules/uqbar/default.nix index 68eca27e01288..4b19a46863cc6 100644 --- a/pkgs/development/python-modules/uqbar/default.nix +++ b/pkgs/development/python-modules/uqbar/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "uqbar"; - version = "0.7.4"; + version = "0.9.5"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-q4p+ki5wA/gYGWnt2tzCiEakk4fBl9P96ONz2ZxlCCg="; + hash = "sha256-MHSnuPiJu2p3NiG/bV6qFUO90xQEFcyQrcxMY0hw8E8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/uritemplate/default.nix b/pkgs/development/python-modules/uritemplate/default.nix index 1d757d4134a76..2cf866a315b2e 100644 --- a/pkgs/development/python-modules/uritemplate/default.nix +++ b/pkgs/development/python-modules/uritemplate/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "uritemplate"; - version = "4.1.1"; + version = "4.2.0"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Q0bt/Fw7efaUvM1tYJmjIrvrYo2/LNhu6lWkVs5RJPA="; + hash = "sha256-SAwu0YCHiVWGMyPuoxsO3maHld4YJhf++cbKCebsnQ4="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index 624db352750b7..8a98c2c5bd59b 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -24,12 +24,12 @@ let self = buildPythonPackage rec { pname = "urllib3"; - version = "2.4.0"; + version = "2.5.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-QUvGU1t4f+vXVngEzAFf7jnaq4rYYmjxMQqSUGl95GY="; + hash = "sha256-P8R3M8fkGdS8P2s9wrT4kLt0OQajDVa6Slv6S7/5J2A="; }; build-system = [ @@ -37,6 +37,11 @@ let hatch-vcs ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail ', "setuptools-scm>=8,<9"' "" + ''; + optional-dependencies = { brotli = if isPyPy then [ brotlicffi ] else [ brotli ]; socks = [ pysocks ]; diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 2b3f67d2a0d24..464b2609fd7d1 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "urwid"; - version = "2.6.16"; + version = "3.0.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "urwid"; repo = "urwid"; tag = version; - hash = "sha256-D5NHtU7XQRh8OqkwrN5r8U/VGF87LGwdnaqGhdjN8AE="; + hash = "sha256-pMGNybuJZeCzZRZr0/+N87/z+ZtLmSaWW47MWDirTjQ="; }; postPatch = '' @@ -83,7 +83,7 @@ buildPythonPackage rec { meta = with lib; { description = "Full-featured console (xterm et al.) user interface library"; - changelog = "https://github.com/urwid/urwid/releases/tag/${version}"; + changelog = "https://github.com/urwid/urwid/releases/tag/${src.tag}"; downloadPage = "https://github.com/urwid/urwid"; homepage = "https://urwid.org/"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/python-modules/urwidtrees/default.nix b/pkgs/development/python-modules/urwidtrees/default.nix index 3928a034a08cf..f9085a6479a4c 100644 --- a/pkgs/development/python-modules/urwidtrees/default.nix +++ b/pkgs/development/python-modules/urwidtrees/default.nix @@ -9,23 +9,16 @@ buildPythonPackage rec { pname = "urwidtrees"; - version = "1.0.3"; + version = "1.0.4"; pyproject = true; src = fetchFromGitHub { owner = "pazz"; repo = "urwidtrees"; tag = version; - hash = "sha256-yGSjwagCd5TiwEFtF6ZhDuVqj4PTa5pVXhs8ebr2O/g="; + hash = "sha256-MQy2b0Q3gTbY8lmmt39Z1Nix0UpQtj+14T/zE1F/YJ4="; }; - patches = [ - (fetchpatch { - url = "https://github.com/pazz/urwidtrees/commit/ed39dbc4fc67b0e0249bf108116a88cd18543aa9.patch"; - hash = "sha256-fA+30d2uVaoNCg4rtoWLNPvrZtq41Co4vcmM80hkURs="; - }) - ]; - nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ urwid ]; @@ -38,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tree widgets for urwid"; homepage = "https://github.com/pazz/urwidtrees"; - changelog = "https://github.com/pazz/urwidtrees/releases/tag/${version}"; + changelog = "https://github.com/pazz/urwidtrees/releases/tag/${src.tag}"; license = licenses.gpl3Plus; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index cb436823f6ade..ed7eb42839f71 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "uvicorn"; - version = "0.34.2"; + version = "0.35.0"; disabled = pythonOlder "3.8"; pyproject = true; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "encode"; repo = "uvicorn"; tag = version; - hash = "sha256-r5G3Z2sMFCs5HlUpVQ05Vip+3MjlSy+3Dkv6FO52uh4="; + hash = "sha256-6tuLL0KMggujYI97HSSBHjiLrePwEkxFHjq2HWl8kqE="; }; outputs = [ diff --git a/pkgs/development/python-modules/uxsim/default.nix b/pkgs/development/python-modules/uxsim/default.nix index 345d78df0aeb2..6b84988e90d44 100644 --- a/pkgs/development/python-modules/uxsim/default.nix +++ b/pkgs/development/python-modules/uxsim/default.nix @@ -8,6 +8,7 @@ python, dill, matplotlib, + networkx, numpy, pandas, pillow, @@ -17,26 +18,24 @@ }: buildPythonPackage rec { pname = "uxsim"; - version = "1.7.2"; + version = "1.8.2"; pyproject = true; src = fetchFromGitHub { owner = "toruseo"; repo = "UXsim"; tag = "v${version}"; - hash = "sha256-5up44edivGWj0nQOOL3+lqjdOBBfxk01nFokG5ht+5Y="; + hash = "sha256-aHJ2AAoSm+5viEieAHzhU0EDyS+VQrMWlhm0CkV7/s4="; }; patches = [ ./add-qt-plugin-path-to-env.patch ]; - nativeBuildInputs = [ - setuptools - wheel - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ dill matplotlib + networkx numpy pandas pillow diff --git a/pkgs/development/python-modules/versioningit/default.nix b/pkgs/development/python-modules/versioningit/default.nix index ad530786614fb..42cf3a141c0d0 100644 --- a/pkgs/development/python-modules/versioningit/default.nix +++ b/pkgs/development/python-modules/versioningit/default.nix @@ -3,9 +3,9 @@ buildPythonPackage, pythonOlder, fetchPypi, - importlib-metadata, packaging, tomli, + coverage, pytestCheckHook, build, hatchling, @@ -13,20 +13,18 @@ pytest-cov-stub, pytest-mock, setuptools, - git, + gitMinimal, mercurial, }: buildPythonPackage rec { pname = "versioningit"; - version = "3.1.2"; + version = "3.3.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchPypi { inherit pname version; - hash = "sha256-Tbg+2Z9WsH2DlAvuNEXKRsoSDRO2swTNtftE5apO3sA="; + hash = "sha256-uRrX1z5z0hIg5pVA8gIT8rcpofmzXATp4Tfq8o0iFNo="; }; build-system = [ hatchling ]; @@ -34,13 +32,10 @@ buildPythonPackage rec { dependencies = [ packaging ] - ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - # AttributeError: type object 'CaseDetails' has no attribute 'model_validate_json' - doCheck = lib.versionAtLeast pydantic.version "2"; - nativeCheckInputs = [ + coverage pytestCheckHook build hatchling @@ -48,13 +43,16 @@ buildPythonPackage rec { pytest-cov-stub pytest-mock setuptools - git + gitMinimal mercurial ]; disabledTests = [ # wants to write to the Nix store "test_editable_mode" + # network access + "test_install_from_git_url" + "test_install_from_zip_url" ]; pythonImportsCheck = [ "versioningit" ]; diff --git a/pkgs/development/python-modules/vfblib/default.nix b/pkgs/development/python-modules/vfblib/default.nix index fd7f6c3ddae50..c32bfe946fec2 100644 --- a/pkgs/development/python-modules/vfblib/default.nix +++ b/pkgs/development/python-modules/vfblib/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "vfblib"; - version = "0.9.5"; + version = "0.10.2"; pyproject = true; src = fetchFromGitHub { owner = "LucasFonts"; repo = "vfbLib"; - rev = "v${version}"; - hash = "sha256-nWySeGikbPhZmJ9yLpcFeTNxaG2EmMhTBtZvykrMsBo="; + tag = "v${version}"; + hash = "sha256-lcYk6h2kWFIknCHKkrxdSKab7szvSZhFwmFvkT6VTEo="; }; build-system = [ diff --git a/pkgs/development/python-modules/viewstate/default.nix b/pkgs/development/python-modules/viewstate/default.nix index 9200466e07a30..b42703cb038a7 100644 --- a/pkgs/development/python-modules/viewstate/default.nix +++ b/pkgs/development/python-modules/viewstate/default.nix @@ -2,23 +2,23 @@ lib, buildPythonPackage, fetchFromGitHub, - poetry-core, + setuptools, pytestCheckHook, }: buildPythonPackage rec { pname = "viewstate"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; src = fetchFromGitHub { owner = "yuvadm"; repo = "viewstate"; tag = "v${version}"; - sha256 = "sha256-cXT5niE3rNdqmNqnITWy9c9/MF0gZ6LU2i1uzfOzkUI="; + sha256 = "sha256-fvqz03rKkA2WVVXU74eo0otnuRseE83cv6pw3rMso34="; }; - build-system = [ poetry-core ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index e058d36035cb2..5d26d7d548202 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "20.31.2"; + version = "20.33.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4QwKnQKDXlklIb5IszK2yu5oh/MywRGqeaCbnnnvwq8="; + hash = "sha256-G0RHjZ4mGz+4uqXnSgyjvA4F8hqjYWe/nL+FDlQnZbg="; }; nativeBuildInputs = [ @@ -69,9 +69,12 @@ buildPythonPackage rec { "test_seed_link_via_app_data" # Permission Error "test_bad_exe_py_info_no_raise" + # https://github.com/pypa/virtualenv/issues/2933 + # https://github.com/pypa/virtualenv/issues/2939 + "test_py_info_cache_invalidation_on_py_info_change" ] ++ lib.optionals (pythonOlder "3.11") [ "test_help" ] - ++ lib.optionals (isPyPy) [ + ++ lib.optionals isPyPy [ # encoding problems "test_bash" # permission error diff --git a/pkgs/development/python-modules/virtualenvwrapper/default.nix b/pkgs/development/python-modules/virtualenvwrapper/default.nix index 6466e08496f6e..000e4c679220b 100644 --- a/pkgs/development/python-modules/virtualenvwrapper/default.nix +++ b/pkgs/development/python-modules/virtualenvwrapper/default.nix @@ -9,12 +9,14 @@ virtualenv, virtualenv-clone, python, + setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "virtualenvwrapper"; version = "6.1.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -24,6 +26,11 @@ buildPythonPackage rec { # pip depend on $HOME setting preConfigure = "export HOME=$TMPDIR"; + build-system = [ + setuptools + setuptools-scm + ]; + buildInputs = [ pbr pip @@ -78,7 +85,7 @@ buildPythonPackage rec { meta = with lib; { description = "Enhancements to virtualenv"; - homepage = "https://pypi.python.org/pypi/virtualenvwrapper"; + homepage = "https://github.com/python-virtualenvwrapper/virtualenvwrapper"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/viser/default.nix b/pkgs/development/python-modules/viser/default.nix index 8ae02805aefbd..211c755e1ed79 100644 --- a/pkgs/development/python-modules/viser/default.nix +++ b/pkgs/development/python-modules/viser/default.nix @@ -50,14 +50,14 @@ buildPythonPackage rec { pname = "viser"; - version = "1.0.0"; + version = "1.0.3"; pyproject = true; src = fetchFromGitHub { owner = "nerfstudio-project"; repo = "viser"; tag = "v${version}"; - hash = "sha256-itFJ9mlN2VaWbLzQp1ERMxBvXg0O7SMWzEWDdxoTA/0="; + hash = "sha256-zufWYq4HvkmbSawTq8G7TheWNpspRL/dptyLuGnUQ2U="; }; postPatch = '' diff --git a/pkgs/development/python-modules/volvooncall/default.nix b/pkgs/development/python-modules/volvooncall/default.nix index bb630bbe02ed8..deaa8c466f378 100644 --- a/pkgs/development/python-modules/volvooncall/default.nix +++ b/pkgs/development/python-modules/volvooncall/default.nix @@ -9,7 +9,7 @@ fetchpatch, geopy, mock, - pytest-asyncio, + pytest-asyncio_0, pytestCheckHook, pythonOlder, }: @@ -53,7 +53,7 @@ buildPythonPackage rec { checkInputs = [ mock - pytest-asyncio + pytest-asyncio_0 pytestCheckHook ] ++ optional-dependencies.mqtt; diff --git a/pkgs/development/python-modules/vultr/default.nix b/pkgs/development/python-modules/vultr/default.nix index 79c4f10607224..4e10e0144243e 100644 --- a/pkgs/development/python-modules/vultr/default.nix +++ b/pkgs/development/python-modules/vultr/default.nix @@ -3,24 +3,21 @@ buildPythonPackage, fetchFromGitHub, requests, - setuptools, }: buildPythonPackage rec { - pname = "vultr"; version = "1.0.1"; - pyproject = true; + format = "setuptools"; + pname = "vultr"; src = fetchFromGitHub { owner = "spry-group"; repo = "python-vultr"; - tag = "v${version}"; - hash = "sha256-ByPtIU6Yro28nH2cIzxqgZR0VwpggCsOAXVDBhssjAI="; + rev = "v${version}"; + sha256 = "00lc5hdhchvm0472p03019bp9541d8y2773xkjy8vblq9qhys8q7"; }; - build-system = [ setuptools ]; - - dependencies = [ requests ]; + propagatedBuildInputs = [ requests ]; # Tests disabled. They fail because they try to access the network doCheck = false; @@ -30,7 +27,6 @@ buildPythonPackage rec { meta = with lib; { description = "Vultr.com API Client"; homepage = "https://github.com/spry-group/python-vultr"; - changelog = "https://github.com/spry-group/python-vultr/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ lihop ]; }; diff --git a/pkgs/development/python-modules/wagtail/default.nix b/pkgs/development/python-modules/wagtail/default.nix index fe49bbaf53a63..18e4aba217eba 100644 --- a/pkgs/development/python-modules/wagtail/default.nix +++ b/pkgs/development/python-modules/wagtail/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "wagtail"; - version = "6.4.1"; + version = "7.1"; pyproject = true; # The GitHub source requires some assets to be compiled, which in turn @@ -39,7 +39,7 @@ buildPythonPackage rec { # until https://github.com/wagtail/wagtail/pull/13136 gets merged. src = fetchPypi { inherit pname version; - hash = "sha256-zsPm1JIKbRePoetvSvgLNw/dVXDtkkuXkQThV/EMoJc="; + hash = "sha256-4d4q+Ctiy/TTt3qTxVd5vGetezF5trT4JOxPIU1XDAE="; }; build-system = [ diff --git a/pkgs/development/python-modules/weatherflow4py/default.nix b/pkgs/development/python-modules/weatherflow4py/default.nix index 1922631205981..627eae7a30a24 100644 --- a/pkgs/development/python-modules/weatherflow4py/default.nix +++ b/pkgs/development/python-modules/weatherflow4py/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to interact with the WeatherFlow REST API"; homepage = "https://github.com/jeeftor/weatherflow4py"; - changelog = "https://github.com/jeeftor/weatherflow4py/releases/tag/v${version}"; + changelog = "https://github.com/jeeftor/weatherflow4py/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index 69fd64c3b8c5d..6f94a76e928b1 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "weaviate-client"; - version = "4.12.0"; + version = "4.16.5"; pyproject = true; disabled = pythonOlder "3.12"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "weaviate"; repo = "weaviate-python-client"; tag = "v${version}"; - hash = "sha256-7Mg6d7gbBQfbkxsZI6aGVpfdhBS6MwmK6cl/8koy46k="; + hash = "sha256-AjZZ9kmVxePlomX6bXUohZZXl2IXMbrjG00qNlGdjRc="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/webssh/default.nix b/pkgs/development/python-modules/webssh/default.nix index deb657038054d..ae4043556e20d 100644 --- a/pkgs/development/python-modules/webssh/default.nix +++ b/pkgs/development/python-modules/webssh/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "webssh"; - version = "1.6.2"; + version = "1.6.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-mRestRJukaf7ti3vIs/MM/R+zpGmK551j5HAM2chBsE="; + hash = "sha256-K85buvIGrTRZEMfk3IAks8QY5oHJ9f8JjxgCvv924QA="; }; patches = [ diff --git a/pkgs/development/python-modules/webtest-aiohttp/default.nix b/pkgs/development/python-modules/webtest-aiohttp/default.nix index 101a8040cef87..67c513601e533 100644 --- a/pkgs/development/python-modules/webtest-aiohttp/default.nix +++ b/pkgs/development/python-modules/webtest-aiohttp/default.nix @@ -5,6 +5,7 @@ fetchFromGitHub, fetchpatch, pytest-aiohttp, + pytest-asyncio_0, pytestCheckHook, setuptools, webtest, @@ -44,6 +45,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytest-asyncio_0 pytest-aiohttp pytestCheckHook ]; diff --git a/pkgs/development/python-modules/webtest/default.nix b/pkgs/development/python-modules/webtest/default.nix index 1759284570c15..9d5773b6c4071 100644 --- a/pkgs/development/python-modules/webtest/default.nix +++ b/pkgs/development/python-modules/webtest/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "webtest"; - version = "3.0.4"; + version = "3.0.6"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-lHeNGaN+Wr1ziNrU2Th0QQ7M7VOhc5qOX/Lby6HPwMQ="; + hash = "sha256-Qlb9UkJEj1bFdby5r+J14wWm8HI8SwFDjb3U3VNElEs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index c4d08efb46d73..ed1c14c863b57 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -43,6 +43,8 @@ buildPythonPackage rec { requests ]; + pythonRelaxDeps = [ "oauthlib" ]; + optional-dependencies = { Images = [ ascii-magic diff --git a/pkgs/development/python-modules/wgpu-py/default.nix b/pkgs/development/python-modules/wgpu-py/default.nix index e951f5a30933e..0760ef3f22700 100644 --- a/pkgs/development/python-modules/wgpu-py/default.nix +++ b/pkgs/development/python-modules/wgpu-py/default.nix @@ -38,14 +38,14 @@ }: buildPythonPackage rec { pname = "wgpu-py"; - version = "0.22.2"; + version = "0.23.0"; pyproject = true; src = fetchFromGitHub { owner = "pygfx"; repo = "wgpu-py"; tag = "v${version}"; - hash = "sha256-HGpOEsTj4t57z38qKF6i1oUj7R7aFl8Xgk5y0TtgyMg="; + hash = "sha256-z9MRnhPSI+9lGS0UQ5VnSwdCGdYdNnqlDQmb8JAqmyc="; }; postPatch = diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix index ffed1c4a18e02..1bc96ff57b58f 100644 --- a/pkgs/development/python-modules/wheel/default.nix +++ b/pkgs/development/python-modules/wheel/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "pypa"; repo = "wheel"; tag = version; - hash = "sha256-tgueGEWByS5owdA5rhXGn3qh1Vtf0HGYC6+BHfrnGAs="; + hash = "sha256-iyGfGr3pLVZSEIHetjsPbIIXkuXrmIPiSqqOw31l9Qw="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/whisperx/default.nix b/pkgs/development/python-modules/whisperx/default.nix index e08506532d808..72883f63cf761 100644 --- a/pkgs/development/python-modules/whisperx/default.nix +++ b/pkgs/development/python-modules/whisperx/default.nix @@ -35,14 +35,14 @@ let in buildPythonPackage rec { pname = "whisperx"; - version = "3.3.2"; + version = "3.4.2"; pyproject = true; src = fetchFromGitHub { owner = "m-bain"; repo = "whisperX"; tag = "v${version}"; - hash = "sha256-JJa8gUQjIcgJ5lug3ULGkHxkl66qnXkiUA3SwwUVpqk="; + hash = "sha256-7MjrtvZGWfgtdQNotzdVMjj0sYfab/6PLQcZCOoqoNM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/wn/default.nix b/pkgs/development/python-modules/wn/default.nix index b742ee5902b45..6637038c34a51 100644 --- a/pkgs/development/python-modules/wn/default.nix +++ b/pkgs/development/python-modules/wn/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "wn"; - version = "0.11.0"; + version = "0.13.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-TDvTNh+5cxgBoy9nuXItHOdtfbsP+3F16egZjUBSpak="; + hash = "sha256-wOaFLlFCNUo7RWWiMXRuztyVJTXpJtPvZJi9d6UmkcY="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/wrf-python/default.nix b/pkgs/development/python-modules/wrf-python/default.nix index 0bac9b4da09ed..ce8dfd259aab0 100644 --- a/pkgs/development/python-modules/wrf-python/default.nix +++ b/pkgs/development/python-modules/wrf-python/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "wrf-python"; - version = "1.3.4.1"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "NCAR"; repo = "wrf-python"; tag = "v${version}"; - hash = "sha256-4iIs/M9fzGJsnKCDSl09OTUoh7j6REBXuutE5uXFe3k="; + hash = "sha256-LvNorZ28j/O8fs9z6jhYWC8RcCDIwh7k5iR9iumCvnQ="; }; nativeBuildInputs = [ gfortran ]; diff --git a/pkgs/development/python-modules/x-transformers/default.nix b/pkgs/development/python-modules/x-transformers/default.nix index ffdc30857b500..9aae527a124d9 100644 --- a/pkgs/development/python-modules/x-transformers/default.nix +++ b/pkgs/development/python-modules/x-transformers/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "x-transformers"; - version = "2.5.6"; + version = "2.6.1"; pyproject = true; src = fetchFromGitHub { owner = "lucidrains"; repo = "x-transformers"; tag = version; - hash = "sha256-9PUOPcTm2xvtKV4T2lAGu/3BiQZzSlwo43i0x1gbrAM="; + hash = "sha256-UDZBN/k1VDnfxv1t4EpvXJ6rfC0XgGCWSFBaCGN43E0="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index b089e18cb966c..012d46b52a069 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "xarray"; - version = "2025.04.0"; + version = "2025.07.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "pydata"; repo = "xarray"; tag = "v${version}"; - hash = "sha256-HEad3+JvLeBl4/vUFzTTdHz3Y4QjwvnycVkb9gV/8Qk="; + hash = "sha256-UvBRGYZFkjxUYT+S4By+7xQZW6h0usQ26iFeJvWcxo0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/xbox-webapi/default.nix b/pkgs/development/python-modules/xbox-webapi/default.nix index 07aabe7253025..53932099f0dcd 100644 --- a/pkgs/development/python-modules/xbox-webapi/default.nix +++ b/pkgs/development/python-modules/xbox-webapi/default.nix @@ -9,7 +9,7 @@ httpx, ms-cv, pydantic, - pytest-asyncio, + pytest-asyncio_0, pytestCheckHook, respx, }: @@ -19,8 +19,6 @@ buildPythonPackage rec { version = "2.1.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "OpenXbox"; repo = "xbox-webapi-python"; @@ -28,9 +26,9 @@ buildPythonPackage rec { hash = "sha256-9A3gdSlRjBCx5fBW+jkaSWsFuGieXQKvbEbZzGzLf94="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ appdirs ecdsa httpx @@ -39,7 +37,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytest-asyncio + pytest-asyncio_0 pytestCheckHook respx ]; diff --git a/pkgs/development/python-modules/xgrammar/default.nix b/pkgs/development/python-modules/xgrammar/default.nix index 66022da38e277..9f653da2d179e 100644 --- a/pkgs/development/python-modules/xgrammar/default.nix +++ b/pkgs/development/python-modules/xgrammar/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "xgrammar"; - version = "0.1.19"; + version = "0.1.22"; pyproject = true; src = fetchFromGitHub { @@ -33,7 +33,7 @@ buildPythonPackage rec { repo = "xgrammar"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-0b2tJx1D/2X/uosbthHfevUpTCBtuSKNlxOKyidTotA="; + hash = "sha256-mz6eabETkAzDoPjXE5VJvgrR1vnXXmx3JO4xZRH4TRQ="; }; patches = [ @@ -92,7 +92,7 @@ buildPythonPackage rec { meta = { description = "Efficient, Flexible and Portable Structured Generation"; homepage = "https://xgrammar.mlc.ai"; - changelog = "https://github.com/mlc-ai/xgrammar/releases/tag/v${version}"; + changelog = "https://github.com/mlc-ai/xgrammar/releases/tag/${src.tag}"; license = lib.licenses.asl20; }; } diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 6c8692ccf9b15..26947d8b5d6b7 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -6,7 +6,7 @@ cryptography, ifaddr, freezegun, - pytest-asyncio, + pytest-asyncio_0, pytestCheckHook, pythonOlder, setuptools, @@ -36,7 +36,7 @@ buildPythonPackage rec { nativeCheckInputs = [ freezegun - pytest-asyncio + pytest-asyncio_0 pytestCheckHook ]; diff --git a/pkgs/development/python-modules/xmldiff/default.nix b/pkgs/development/python-modules/xmldiff/default.nix index 868341a8cfac4..fd0c85cffd26d 100644 --- a/pkgs/development/python-modules/xmldiff/default.nix +++ b/pkgs/development/python-modules/xmldiff/default.nix @@ -29,6 +29,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = [ + # lxml 6.0 compat issue + "test_api_diff_texts" + ]; + pythonImportsCheck = [ "xmldiff" ]; meta = { diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index 9e27d760c19e7..be3f1ecb12ec8 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xmlschema"; - version = "4.0.1"; + version = "4.1.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "xmlschema"; tag = "v${version}"; - hash = "sha256-J2A1dBLo5LtO1ldRuopfTjaew38B27D4wE+y387bQvs="; + hash = "sha256-3nvl49rlwQpNARmWBSw+faL+yNGqNecokjGGpnaC8a0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/xvfbwrapper/default.nix b/pkgs/development/python-modules/xvfbwrapper/default.nix index 2b7e7d63cb530..966e4f18b4bef 100644 --- a/pkgs/development/python-modules/xvfbwrapper/default.nix +++ b/pkgs/development/python-modules/xvfbwrapper/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "xvfbwrapper"; - version = "0.2.10"; + version = "0.2.13"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1mLPjyZu/T0KHAIu67jSwECD1uh/2BOS+1QA2VA27Yw="; + sha256 = "sha256-ouR2yaTxlzf+Ky0LgB5m8P9wH9oz2YakvzTdxBR1QQI="; }; propagatedBuildInputs = [ xorg.xvfb ]; diff --git a/pkgs/development/python-modules/xyzservices/default.nix b/pkgs/development/python-modules/xyzservices/default.nix index 347e5f0b62960..c96c0c65d0285 100644 --- a/pkgs/development/python-modules/xyzservices/default.nix +++ b/pkgs/development/python-modules/xyzservices/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "xyzservices"; - version = "2025.1.0"; + version = "2025.4.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-XNuwkHwgvhvgZsbi3GnGRYQtEROk6D5kIGVgSiHyVLo="; + hash = "sha256-b+dkcTZI+sU0UPvGGjw2bLauUzWhsq4MN5a0ld43Cdg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/yangson/default.nix b/pkgs/development/python-modules/yangson/default.nix index 2e82d5c33962a..5705ef4dc312e 100644 --- a/pkgs/development/python-modules/yangson/default.nix +++ b/pkgs/development/python-modules/yangson/default.nix @@ -27,6 +27,8 @@ buildPythonPackage rec { pyyaml ]; + pythonRelaxDeps = [ "elementpath" ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "yangson" ]; diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index 5805d35482d16..36184650fcb9d 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - cython_3_1, + cython, expandvars, setuptools, idna, @@ -28,7 +28,7 @@ buildPythonPackage rec { }; build-system = [ - cython_3_1 + cython expandvars setuptools ]; diff --git a/pkgs/development/python-modules/youseedee/0001-use-packaged-unicode-data.patch b/pkgs/development/python-modules/youseedee/0001-use-packaged-unicode-data.patch index a1bc6fd92cc6a..88a2e10b7096e 100644 --- a/pkgs/development/python-modules/youseedee/0001-use-packaged-unicode-data.patch +++ b/pkgs/development/python-modules/youseedee/0001-use-packaged-unicode-data.patch @@ -1,33 +1,26 @@ diff --git a/lib/youseedee/__init__.py b/lib/youseedee/__init__.py -index 8db9c5f..9ad6618 100644 +index 5e73ef8..2cdbdd0 100644 --- a/lib/youseedee/__init__.py +++ b/lib/youseedee/__init__.py -@@ -38,12 +38,7 @@ UCD_URL = "https://unicode.org/Public/UCD/latest/ucd/UCD.zip" +@@ -38,19 +38,12 @@ UCD_URL = "https://unicode.org/Public/UCD/latest/ucd/UCD.zip" def ucd_dir(): """Return the directory where Unicode data is stored""" -- ucddir = expanduser("~/.youseedee") -- try: -- os.mkdir(ucddir) -- except FileExistsError: -- pass -- return ucddir -+ return "@ucd_dir@" +- return Path(platformdirs.user_cache_dir("youseedee", ensure_exists=True)) ++ return Path("@ucd_dir@") - def up_to_date(): -@@ -65,14 +60,6 @@ def up_to_date(): - def ensure_files(): """Ensure the Unicode data files are downloaded and up to date, and download them if not""" -- if not os.path.isfile(os.path.join(ucd_dir(), "UnicodeData.txt")): -- download_files() -- if not up_to_date(): -- # Remove the zip if it exists -- zip_path = os.path.join(ucd_dir(), "UCD.zip") -- if os.path.isfile(zip_path): -- os.unlink(zip_path) -- download_files() - return +- file_lock = FileLock(ucd_dir() / ".youseedee_ensure_files.lock") +- with file_lock: +- if not (ucd_dir() / "UnicodeData.txt").is_file(): +- _download_files() +- if not _up_to_date(): +- # Remove the zip if it exists +- (ucd_dir() / "UCD.zip").unlink(missing_ok=True) +- _download_files() ++ return + def _up_to_date(): diff --git a/pkgs/development/python-modules/youseedee/default.nix b/pkgs/development/python-modules/youseedee/default.nix index 6117e329d62a5..26b2bfe877be6 100644 --- a/pkgs/development/python-modules/youseedee/default.nix +++ b/pkgs/development/python-modules/youseedee/default.nix @@ -7,17 +7,18 @@ setuptools-scm, filelock, requests, + platformdirs, unicode-character-database, }: buildPythonPackage rec { pname = "youseedee"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-9w6yr28zq0LgOvMp5fCFaHGOwK4wbbDo/g1jH4Uky0E="; + hash = "sha256-b5gxBIr/mowzlG4/N0C22S1XTq0NAGTq1/+iMUfxD18="; }; patches = [ @@ -36,6 +37,7 @@ buildPythonPackage rec { dependencies = [ filelock requests + platformdirs ]; # Package has no unit tests, but we can check an example as per README.rst: diff --git a/pkgs/development/python-modules/youtube-transcript-api/default.nix b/pkgs/development/python-modules/youtube-transcript-api/default.nix index 505be0ac17eff..fe35393e7f92c 100644 --- a/pkgs/development/python-modules/youtube-transcript-api/default.nix +++ b/pkgs/development/python-modules/youtube-transcript-api/default.nix @@ -40,13 +40,16 @@ buildPythonPackage rec { pytestCheckHook ]; + preCheck = '' + export PATH=$out/bin:$PATH + ''; + disabledTests = [ - # fail with various assertions around numbers + # network access "test_fetch__create_consent_cookie_if_needed" "test_fetch__with_generic_proxy_reraise_when_blocked" "test_fetch__with_proxy_retry_when_blocked" "test_fetch__with_webshare_proxy_reraise_when_blocked" - "test_version_matches_metadata" ]; pythonImportsCheck = [ "youtube_transcript_api" ]; diff --git a/pkgs/development/python-modules/z3c-checkversions/default.nix b/pkgs/development/python-modules/z3c-checkversions/default.nix index 400d225844516..838192b4b2583 100644 --- a/pkgs/development/python-modules/z3c-checkversions/default.nix +++ b/pkgs/development/python-modules/z3c-checkversions/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "z3c-checkversions"; - version = "2.1"; + version = "3.0"; format = "setuptools"; # distutils usage @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "z3c.checkversions"; - hash = "sha256-j5So40SyJf7XfCz3P9YFR/6z94up3LY2/dfEmmIbxAk="; + hash = "sha256-VMGSlocgEddBrUT0A4ihtCdhSbirWYe9FmQ0QyOGOEs="; }; propagatedBuildInputs = [ zc-buildout ]; diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index 5ee06ae09ca3f..755d64cc780d2 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -2,44 +2,34 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, # build-system hatchling, hatch-vcs, # dependencies - asciitree, donfig, numpy, - fasteners, numcodecs, + packaging, typing-extensions, # tests - pytestCheckHook, - pytest-asyncio, - pytest-cov-stub, hypothesis, - aiohttp, - fsspec, - moto, - requests, + pytest-asyncio, + pytest-xdist, + pytestCheckHook, tomlkit, - uv, - writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "zarr"; - version = "3.1.0"; + version = "3.1.1"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchPypi { inherit pname version; - hash = "sha256-rOWxEdxp1TFcsWVd/Q+BbFrPl5jSrZL0O2CKUsjIrCs="; + hash = "sha256-F9ty838kiUUtITesiRxBM7j5dvkYnY79PnXzs63YTow="; }; build-system = [ @@ -48,50 +38,32 @@ buildPythonPackage rec { ]; dependencies = [ - asciitree donfig - numpy - fasteners numcodecs + numpy + packaging typing-extensions ] ++ numcodecs.optional-dependencies.crc32c; - optional-dependencies = { - remote = [ fsspec ]; - }; - nativeCheckInputs = [ - pytestCheckHook - pytest-asyncio - pytest-cov-stub hypothesis - aiohttp - moto - requests + pytest-asyncio + pytest-xdist + pytestCheckHook tomlkit - uv - writableTmpDirAsHomeHook - ] - ++ moto.optional-dependencies.s3 - ++ moto.optional-dependencies.server - ++ optional-dependencies.remote; - pytestFlagsArray = [ - # Don't measure the time it takes for hypothesis related tests to succeed. - # See https://github.com/astropy/astropy/issues/17649 for a similar - # discussion, and see: - # https://github.com/zarr-developers/zarr-python/blob/v3.0.4/tests/conftest.py#L182C1-L187C2 - "--hypothesis-profile=ci" ]; - disabledTests = [ - # 3 tests that require multiple Python versions to co-exist - "test_scripts_can_run" - "test_roundtrip_v2" - "test_roundtrip_v3" + + disabledTestPaths = [ + # requires uv and then fails at setting up python envs + "tests/test_examples.py" ]; pythonImportsCheck = [ "zarr" ]; + # FIXME remove once zarr's reverse dependencies support v3 + passthru.skipBulkUpdate = true; + meta = { description = "Implementation of chunked, compressed, N-dimensional arrays for Python"; homepage = "https://github.com/zarr-developers/zarr"; diff --git a/pkgs/development/python-modules/zdaemon/default.nix b/pkgs/development/python-modules/zdaemon/default.nix index 58b4fccde1e72..5501429c83676 100644 --- a/pkgs/development/python-modules/zdaemon/default.nix +++ b/pkgs/development/python-modules/zdaemon/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "zdaemon"; - version = "5.1"; + version = "5.2.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Iun+UFDq67ngPZrWTk9jzNheBMOP2zUc8RO+9vaNt6Q="; + hash = "sha256-8GwsfK9RnHYINPj+JuVzWVDVAX9y1cII3IsZABQFlM0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix index 430a01e452e04..cfc6479eb9b8d 100644 --- a/pkgs/development/python-modules/zha/default.nix +++ b/pkgs/development/python-modules/zha/default.nix @@ -8,7 +8,7 @@ pyserial, pyserial-asyncio, pyserial-asyncio-fast, - pytest-asyncio, + pytest-asyncio_0, pytest-timeout, pytest-xdist, pytestCheckHook, @@ -68,7 +68,7 @@ buildPythonPackage rec { nativeCheckInputs = [ freezegun - pytest-asyncio + pytest-asyncio_0 pytest-timeout pytest-xdist pytestCheckHook diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 2dc40f5b3d7a2..073565b0b0c34 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -14,7 +14,7 @@ frozendict, jsonschema, pyserial-asyncio, - pytest-asyncio, + pytest-asyncio_0, pytest-timeout, pytestCheckHook, pythonOlder, @@ -60,7 +60,7 @@ buildPythonPackage rec { nativeCheckInputs = [ aioresponses freezegun - pytest-asyncio + pytest-asyncio_0 pytest-timeout pytestCheckHook ]; diff --git a/pkgs/development/python-modules/zimports/default.nix b/pkgs/development/python-modules/zimports/default.nix index f5d50241a8810..4d1a4f1902c47 100644 --- a/pkgs/development/python-modules/zimports/default.nix +++ b/pkgs/development/python-modules/zimports/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "zimports"; - version = "0.6.1"; + version = "0.6.2"; format = "setuptools"; # upstream technically support 3.7 through 3.9, but 3.10 happens to work while 3.11 breaks with an import error @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sqlalchemyorg"; repo = "zimports"; - rev = "refs/tags/v${version}"; - hash = "sha256-+sDvl8z0O0cZyS1oZgt924hlOkYeHiStpXL9y9+JZ5I="; + tag = "v${version}"; + hash = "sha256-yI/ZTNqVIu76xivXJ+MoLpPupf0RQjQOnP6OWMPajBo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index d7b11ad7a8ab9..f7c9a5ad3149a 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -1,27 +1,35 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, func-timeout, jaraco-itertools, - pythonOlder, + setuptools, setuptools-scm, }: let zipp = buildPythonPackage rec { pname = "zipp"; - version = "3.21.0"; - format = "pyproject"; - - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-LJlY9kMKIEA0GlLrYI7W3ZPvQ5LgL/4hlBfBsotd0fQ="; + version = "3.23.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jaraco"; + repo = "zipp"; + tag = "v${version}"; + hash = "sha256-iao7Aco1Ktvyt1uQCD/le4tAdyVpxfKPi3TRT12YHuU="; }; - nativeBuildInputs = [ setuptools-scm ]; + postPatch = '' + # Downloads license text at build time + sed -i "/coherent\.licensed/d" pyproject.toml + ''; + + build-system = [ + setuptools + setuptools-scm + ]; # Prevent infinite recursion with pytest doCheck = false; diff --git a/pkgs/development/python-modules/zstd/default.nix b/pkgs/development/python-modules/zstd/default.nix index fd1333d092013..32b453396b342 100644 --- a/pkgs/development/python-modules/zstd/default.nix +++ b/pkgs/development/python-modules/zstd/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "zstd"; - version = "1.5.6.6"; + version = "1.5.7.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-gixLZXXc0waR695lRUJbUcFOwbLlGfaE70sNBhaSEIg="; + hash = "sha256-bYaExpAJvknhsY7CUaXrDX4k+TYkmQqKEkodpmqS/Io="; }; postPatch = '' diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index 9e52be186a3ed..9cb67f2871c06 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/pkgs/development/tools/devpi-server/default.nix @@ -19,6 +19,7 @@ py, httpx, pyramid, + pytest-asyncio, pytestCheckHook, repoze-lru, setuptools, @@ -80,6 +81,7 @@ buildPythonApplication rec { beautifulsoup4 nginx py + pytest-asyncio pytestCheckHook webtest ]; diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index 44c4ea2c62a07..3bc8a00dcae61 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -86,26 +86,6 @@ in patches = base.patches - # Fix building with Rust 1.86+ - # electron_33 and electron_34 use older chromium versions which expect rust - # to provide the older `adler` library instead of the newer `adler2` library - # This patch makes those older versions also use the new adler2 library - ++ lib.optionals (lib.versionOlder info.version "35") [ - ./use-rust-adler2.patch - ] - # Requirements for the next section - ++ lib.optionals (lib.versionOlder info.version "35") [ - (fetchpatch { - name = "Avoid-build-rust-PartitionAlloc-dep-when-not-build_with_chromium.patch"; - url = "https://github.com/chromium/chromium/commit/ee94f376a0dd642a93fbf4a5fa8e7aa8fb2a69b5.patch"; - hash = "sha256-qGjy9VZ4d3T5AuqOrBKEajBswwBU/7j0n80rpvHZLmM="; - }) - (fetchpatch { - name = "Suppress-unsafe_libc_call-warning-for-rust-remap_alloc-cc.patch"; - url = "https://github.com/chromium/chromium/commit/d5d79d881e74c6c8630f7d2f3affd4f656fdeb4e.patch"; - hash = "sha256-1oy5WRvNzKuUTJkt8kULUqE4JU+EKEV1PB9QN8HF4SE="; - }) - ] # Fix building with Rust 1.87+ # https://issues.chromium.org/issues/407024458 ++ lib.optionals (lib.versionOlder info.version "37") [ @@ -151,6 +131,15 @@ in url = "https://github.com/chromium/chromium/commit/f8f21fb4aa01f75acbb12abf5ea8c263c6817141.patch"; hash = "sha256-z/aQ1oQjFZnkUeRnrD6P/WDZiYAI1ncGhOUM+HmjMZA="; }) + ] + # Fix build with Rust 1.89.0 + ++ lib.optionals (lib.versionOlder info.version "38") [ + # https://chromium-review.googlesource.com/c/chromium/src/+/6624733 + (fetchpatch { + name = "Define-rust-no-alloc-shim-is-unstable-v2.patch"; + url = "https://github.com/chromium/chromium/commit/6aae0e2353c857d98980ff677bf304288d7c58de.patch"; + hash = "sha256-Dd38c/0hiH+PbGPJhhEFuW6kUR45A36XZqOVExoxlhM="; + }) ]; npmRoot = "third_party/node"; diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index ba5feb04f48a3..1c35ab67aee37 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -4,10 +4,9 @@ "chromium": { "deps": { "gn": { - "hash": "sha256-EqbwCLkseND1v3UqM+49N7GuoXJ3PlJjWOes4OijQ3U=", + "hash": "sha256-U0f/Q134UJrSke+/o9Hs4+mQa/vSM2hdkRXhLfhnqME=", "rev": "ed1abc107815210dc66ec439542bee2f6cbabc00", - "url": "https://gn.googlesource.com/gn", - "version": "2025-01-13" + "version": "0-unstable-2025-01-13" } }, "version": "134.0.6998.205" @@ -1313,10 +1312,9 @@ "chromium": { "deps": { "gn": { - "hash": "sha256-vDKMt23RMDI+KX6CmjfeOhRv2haf/mDOuHpWKnlODcg=", + "hash": "sha256-MnGl+D9ahQibUHCtyOUf1snvmeupUn4D2yrDj55JTe4=", "rev": "6e8e0d6d4a151ab2ed9b4a35366e630c55888444", - "url": "https://gn.googlesource.com/gn", - "version": "2025-03-24" + "version": "0-unstable-2025-03-24" } }, "version": "136.0.7103.177" @@ -2638,10 +2636,9 @@ "chromium": { "deps": { "gn": { - "hash": "sha256-UB9a7Fr1W0yYld6WbXyRR8dFqWsj/zx4KumDZ5JQKSM=", + "hash": "sha256-BplU8qNKObVrKMLKTyqivPF1L6bbJulFC+Zop9UpmZY=", "rev": "ebc8f16ca7b0d36a3e532ee90896f9eb48e5423b", - "url": "https://gn.googlesource.com/gn", - "version": "2025-05-21" + "version": "0-unstable-2025-05-21" } }, "version": "138.0.7204.235" diff --git a/pkgs/development/tools/electron/update.py b/pkgs/development/tools/electron/update.py index 0303cb1c682bb..94ba8eca4fa7d 100755 --- a/pkgs/development/tools/electron/update.py +++ b/pkgs/development/tools/electron/update.py @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i python -p python3.pkgs.joblib python3.pkgs.click python3.pkgs.click-log nix nix-prefetch-git prefetch-yarn-deps prefetch-npm-deps gclient2nix +#! nix-shell -i python -p python3.pkgs.joblib python3.pkgs.click python3.pkgs.click-log nix nurl prefetch-yarn-deps prefetch-npm-deps gclient2nix """ electron updater @@ -32,7 +32,7 @@ import click import click_log -from datetime import datetime +from datetime import datetime, UTC from typing import Iterable, Tuple from urllib.request import urlopen from joblib import Parallel, delayed, Memory @@ -44,6 +44,9 @@ os.chdir(os.path.dirname(__file__)) +# Absolute path of nixpkgs top-level directory +NIXPKGS_PATH = subprocess.check_output(["git", "rev-parse", "--show-toplevel"]).decode("utf-8").strip() + memory: Memory = Memory("cache", verbose=0) logger = logging.getLogger(__name__) @@ -78,26 +81,34 @@ def get_electron_file(electron_tag: str, filepath: str) -> str: ) +@memory.cache +def get_gn_hash(gn_version, gn_commit): + print("gn.override", file=sys.stderr) + expr = f'(import {NIXPKGS_PATH} {{}}).gn.override {{ version = "{gn_version}"; rev = "{gn_commit}"; hash = ""; }}' + out = subprocess.check_output(["nurl", "--hash", "--expr", expr]) + return out.decode("utf-8").strip() + @memory.cache def get_chromium_gn_source(chromium_tag: str) -> dict: gn_pattern = r"'gn_version': 'git_revision:([0-9a-f]{40})'" gn_commit = re.search(gn_pattern, get_chromium_file(chromium_tag, "DEPS")).group(1) - gn_prefetch: bytes = subprocess.check_output( - [ - "nix-prefetch-git", - "--quiet", - "https://gn.googlesource.com/gn", - "--rev", - gn_commit, - ] + + gn_commit_info = json.loads( + urlopen(f"https://gn.googlesource.com/gn/+/{gn_commit}?format=json") + .read() + .decode("utf-8") + .split(")]}'\n")[1] ) - gn: dict = json.loads(gn_prefetch) + + gn_commit_date = datetime.strptime(gn_commit_info["committer"]["time"], "%a %b %d %H:%M:%S %Y %z") + gn_date = gn_commit_date.astimezone(UTC).date().isoformat() + gn_version = f"0-unstable-{gn_date}" + return { "gn": { - "version": datetime.fromisoformat(gn["date"]).date().isoformat(), - "url": gn["url"], - "rev": gn["rev"], - "hash": gn["hash"], + "version": gn_version, + "rev": gn_commit, + "hash": get_gn_hash(gn_version, gn_commit), } } diff --git a/pkgs/development/tools/electron/use-rust-adler2.patch b/pkgs/development/tools/electron/use-rust-adler2.patch deleted file mode 100644 index 7a7bdacecd3d8..0000000000000 --- a/pkgs/development/tools/electron/use-rust-adler2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/build/rust/std/BUILD.gn b/build/rust/std/BUILD.gn -index 6b996aa1fe3865187d02c017e56c0918bcc9b8f4..68b085be200fa4f116aa709b9157c4d2efdf7d6a 100644 ---- a/build/rust/std/BUILD.gn -+++ b/build/rust/std/BUILD.gn -@@ -89,7 +89,7 @@ if (toolchain_has_rust) { - # These are no longer present in the Windows toolchain. - stdlib_files += [ - "addr2line", -- "adler", -+ "adler2", - "gimli", - "libc", - "memchr", diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index 64f9d9f6ae699..9b823ac3982fa 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "luarocks_bootstrap"; - version = "3.12.0"; + version = "3.12.2"; src = fetchFromGitHub { owner = "luarocks"; repo = "luarocks"; tag = "v${finalAttrs.version}"; - hash = "sha256-PGK4gjEhCJt2+0viNU0/qJBBOxPIy2swXplQOolmP2E="; + hash = "sha256-hQysstYGUcZnnEXL+9ECS0sBViYggeDIMgo6LpUexBA="; }; patches = [ diff --git a/pkgs/development/tools/pnpm/fetch-deps/default.nix b/pkgs/development/tools/pnpm/fetch-deps/default.nix index 158112a692621..d532c2fa43d3c 100644 --- a/pkgs/development/tools/pnpm/fetch-deps/default.nix +++ b/pkgs/development/tools/pnpm/fetch-deps/default.nix @@ -167,5 +167,9 @@ in configHook = makeSetupHook { name = "pnpm-config-hook"; propagatedBuildInputs = [ pnpm ]; + substitutions = { + npmArch = stdenvNoCC.targetPlatform.node.arch; + npmPlatform = stdenvNoCC.targetPlatform.node.platform; + }; } ./pnpm-config-hook.sh; } diff --git a/pkgs/development/tools/pnpm/fetch-deps/pnpm-config-hook.sh b/pkgs/development/tools/pnpm/fetch-deps/pnpm-config-hook.sh index fc0103bbe8f1f..fbeebc8dff942 100644 --- a/pkgs/development/tools/pnpm/fetch-deps/pnpm-config-hook.sh +++ b/pkgs/development/tools/pnpm/fetch-deps/pnpm-config-hook.sh @@ -23,6 +23,8 @@ pnpmConfigHook() { export HOME=$(mktemp -d) export STORE_PATH=$(mktemp -d) + export npm_config_arch="@npmArch@" + export npm_config_platform="@npmPlatform@" cp -Tr "$pnpmDeps" "$STORE_PATH" chmod -R +w "$STORE_PATH" diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index b574eb5464214..734d31aba2d3f 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -1,5 +1,4 @@ { - lib, rust-bindgen-unwrapped, zlib, bash, @@ -14,7 +13,6 @@ let #for substituteAll inherit bash; unwrapped = rust-bindgen-unwrapped; - libclang = (lib.getLib clang.cc); meta = rust-bindgen-unwrapped.meta // { longDescription = rust-bindgen-unwrapped.meta.longDescription + '' This version of bindgen is wrapped with the required compiler flags diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix index c569789143d5c..39b4de40b83bf 100644 --- a/pkgs/development/tools/rust/bindgen/unwrapped.nix +++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix @@ -21,12 +21,16 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-K/iM79RfNU+3f2ae6wy/FMFAD68vfqzSUebqALPJpJY="; - buildInputs = [ (lib.getLib clang.cc) ]; - preConfigure = '' export LIBCLANG_PATH="${lib.getLib clang.cc}/lib" ''; + # Disable the "runtime" feature, so libclang is linked. + buildNoDefaultFeatures = true; + buildFeatures = [ "logging" ]; + checkNoDefaultFeatures = buildNoDefaultFeatures; + checkFeatures = buildFeatures; + doCheck = true; nativeCheckInputs = [ clang ]; diff --git a/pkgs/development/tools/rust/bindgen/wrapper.sh b/pkgs/development/tools/rust/bindgen/wrapper.sh index b7110385c26d6..4311b9720aa8a 100755 --- a/pkgs/development/tools/rust/bindgen/wrapper.sh +++ b/pkgs/development/tools/rust/bindgen/wrapper.sh @@ -27,10 +27,8 @@ fi; if [[ -n "$NIX_DEBUG" ]]; then set -x; fi; -export LIBCLANG_PATH="@libclang@/lib" # shellcheck disable=SC2086 # cxxflags and NIX_CFLAGS_COMPILE should be word-split exec -a "$0" @unwrapped@/bin/bindgen "$@" $sep $cxxflags @cincludes@ $NIX_CFLAGS_COMPILE # note that we add the flags after $@ which is incorrect. This is only for the sake # of simplicity. - diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index fd84c71c01592..33d3f2ce452b6 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -70,30 +70,6 @@ let "freebsd" else throw "unsupported os ${platform.uname.system}"; - destCPU = - let - platform = stdenv.hostPlatform; - in - if platform.isAarch then - "arm" + lib.optionalString platform.is64bit "64" - else if platform.isMips32 then - "mips" + lib.optionalString platform.isLittleEndian "le" - else if platform.isMips64 && platform.isLittleEndian then - "mips64el" - else if platform.isPower then - "ppc" + lib.optionalString platform.is64bit "64" - else if platform.isx86_64 then - "x64" - else if platform.isx86_32 then - "ia32" - else if platform.isS390x then - "s390x" - else if platform.isRiscV64 then - "riscv64" - else if platform.isLoongArch64 then - "loong64" - else - throw "unsupported cpu ${platform.uname.processor}"; destARMFPU = let platform = stdenv.hostPlatform; @@ -256,7 +232,7 @@ let # --cross-compiling flag enables use of CC_host et. al (if canExecute || canEmulate then "--no-cross-compiling" else "--cross-compiling") "--dest-os=${destOS}" - "--dest-cpu=${destCPU}" + "--dest-cpu=${stdenv.hostPlatform.node.arch}" ] ++ lib.optionals (destARMFPU != null) [ "--with-arm-fpu=${destARMFPU}" ] ++ lib.optionals (destARMFloatABI != null) [ "--with-arm-float-abi=${destARMFloatABI}" ] diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix index 6110bbed9e630..4300e29637138 100644 --- a/pkgs/development/web/nodejs/v22.nix +++ b/pkgs/development/web/nodejs/v22.nix @@ -14,15 +14,11 @@ let inherit openssl; python = python3; }; - - gypPatches = callPackage ./gyp-patches.nix { - patch_tools = false; - }; in buildNodejs { inherit enableNpm; - version = "22.17.0"; - sha256 = "7a3ef2aedb905ea7926e5209157266e2376a5db619d9ac0cba3c967f6f5db4f9"; + version = "22.18.0"; + sha256 = "120e0f74419097a9fafae1fd80b9de7791a587e6f1c48c22b193239ccd0f7084"; patches = ( if (stdenv.hostPlatform.emulatorAvailable buildPackages) then @@ -48,7 +44,6 @@ buildNodejs { hash = "sha256-hSTLljmVzYmc3WAVeRq9EPYluXGXFeWVXkykufGQPVw="; }) ] - ++ gypPatches ++ [ ./configure-armv6-vfpv2.patch ./disable-darwin-v8-system-instrumentation-node19.patch @@ -56,12 +51,5 @@ buildNodejs { ./node-npm-build-npm-package-logic.patch ./use-correct-env-in-tests.patch ./bin-sh-node-run-v22.patch - - # Fix for flaky test - # TODO: remove when included in a release - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/cd685fe3b6b18d2a1433f2635470513896faebe6.patch?full_index=1"; - hash = "sha256-KA7WBFnLXCKx+QVDGxFixsbj3Y7uJkAKEUTeLShI1Xo="; - }) ]; } diff --git a/pkgs/kde/gear/kamoso/default.nix b/pkgs/kde/gear/kamoso/default.nix index a760428ae134d..11c8dff098b29 100644 --- a/pkgs/kde/gear/kamoso/default.nix +++ b/pkgs/kde/gear/kamoso/default.nix @@ -2,6 +2,7 @@ mkKdeDerivation, pkg-config, gst_all_1, + frei0r, }: mkKdeDerivation { pname = "kamoso"; @@ -10,12 +11,12 @@ mkKdeDerivation { extraBuildInputs = [ gst_all_1.gst-plugins-base (gst_all_1.gst-plugins-good.override { qt6Support = true; }) + gst_all_1.gst-plugins-bad ]; + qtWrapperArgs = [ "--set FREI0R_PATH ${frei0r}/lib/frei0r-1" ]; + preFixup = '' qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") ''; - - # requires newer GStreamer - meta.broken = true; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix index 4fe40e86aab9d..942f0a26da436 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix @@ -27,6 +27,8 @@ mkAppleDerivation (finalAttrs: { ./patches/llvm-18-compatibility.patch # Fix a memory leak when using the trampoline dylib. See https://github.com/libffi/libffi/pull/621#discussion_r955298301. ./patches/fix-tramponline-memory-leak.patch + # Fix automake-18.18 compatibility, https://github.com/libffi/libffi/issues/853#issuecomment-2909994482 + ./patches/automake-1.18.patch ]; # Make sure libffi is using the trampolines dylib in this package not the system one. diff --git a/pkgs/os-specific/darwin/apple-source-releases/libffi/patches/automake-1.18.patch b/pkgs/os-specific/darwin/apple-source-releases/libffi/patches/automake-1.18.patch new file mode 100644 index 0000000000000..148baa6d1e86c --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/libffi/patches/automake-1.18.patch @@ -0,0 +1,14 @@ +The hunk is used from https://github.com/libffi/libffi/issues/853#issuecomment-2909994482 +--- a/Makefile.am ++++ b/Makefile.am +@@ -4,6 +4,10 @@ AUTOMAKE_OPTIONS = foreign subdir-objects + + ACLOCAL_AMFLAGS = -I m4 + ++# Alias required by AX_ENABLE_BUILDDIR / config-ml ++.PHONY: all-configured ++all-configured: all ++ + SUBDIRS = include testsuite man + if BUILD_DOCS + ## This hack is needed because it doesn't seem possible to make a diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index 371eb343f74d7..0b36cdcbcedfb 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -90,6 +90,16 @@ let # `$(..)` expanded by make alone "HOSTCC:=$(CC_FOR_BUILD)" "HOSTCXX:=$(CXX_FOR_BUILD)" + # To properly detect LFS flags 32-bit build environments like + # pkgsi686Linux.linuxHeaders Kbuild uses this Makefile bit: + # HOST_LFS_CFLAGS := $(shell getconf LFS_CFLAGS 2>/dev/null) + # + # `getconf` is not available in early bootstrap and thus the + # build fails on filesystems with 64-bit inodes as: + # linux-headers> fixdep: error fstat'ing file: scripts/basic/.fixdep.d: Value too large for defined data type + # + # Let's hardcode subset of the output of `getconf` for this case. + "HOST_LFS_CFLAGS=-D_FILE_OFFSET_BITS=64" ]; # Skip clean on darwin, case-sensitivity issues. @@ -142,13 +152,13 @@ in linuxHeaders = let - version = "6.14.7"; + version = "6.16"; in makeLinuxHeaders { inherit version; src = fetchurl { url = "mirror://kernel/linux/kernel/v${lib.versions.major version}.x/linux-${version}.tar.xz"; - hash = "sha256-gRIgK8JtCGlXqU0hCabc1EeMW6GNDwpeHF3+6gH1SXI="; + hash = "sha256-Gkvi/mtSRqpKyJh6ikrzTEKo3X0ItGq0hRa8wb77zYM="; }; 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 6570019838d95..069f4b6c94a35 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -527,7 +527,9 @@ let 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; + # Not available when using clang + # See: https://github.com/torvalds/linux/blob/172a9d94339cea832d89630b89d314e41d622bd8/drivers/gpu/drm/amd/display/Kconfig#L14 + DRM_AMD_DC_FP = lib.mkIf (!stdenv.cc.isClang) (whenAtLeast "6.4" yes); DRM_AMD_DC_HDCP = whenBetween "5.5" "6.4" yes; DRM_AMD_DC_SI = whenAtLeast "5.10" yes; diff --git a/pkgs/os-specific/linux/kernel/common-flags.nix b/pkgs/os-specific/linux/kernel/common-flags.nix new file mode 100644 index 0000000000000..2fb92049195d4 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/common-flags.nix @@ -0,0 +1,34 @@ +{ + lib, + stdenv, + buildPackages, + extraMakeFlags ? [ ], +}: +# Absolute paths for compilers avoid any PATH-clobbering issues. +[ + # + # We use the unwrapped compiler, because the clang-wrapper doesn't like -target. + "CC=${lib.getExe stdenv.cc.cc}" + # 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=${lib.getExe' stdenv.cc.bintools.bintools "${stdenv.cc.targetPrefix}ld"}" + "AR=${lib.getExe' stdenv.cc "${stdenv.cc.targetPrefix}ar"}" + "NM=${lib.getExe' stdenv.cc "${stdenv.cc.targetPrefix}nm"}" + "STRIP=${lib.getExe' stdenv.cc.bintools.bintools "${stdenv.cc.targetPrefix}strip"}" + "OBJCOPY=${lib.getExe' stdenv.cc "${stdenv.cc.targetPrefix}objcopy"}" + "OBJDUMP=${lib.getExe' stdenv.cc "${stdenv.cc.targetPrefix}objdump"}" + "READELF=${lib.getExe' stdenv.cc "${stdenv.cc.targetPrefix}readelf"}" + "HOSTCC=${lib.getExe' buildPackages.stdenv.cc "${buildPackages.stdenv.cc.targetPrefix}cc"}" + "HOSTCXX=${lib.getExe' buildPackages.stdenv.cc "${buildPackages.stdenv.cc.targetPrefix}c++"}" + "HOSTAR=${lib.getExe' buildPackages.stdenv.cc.bintools "${buildPackages.stdenv.cc.targetPrefix}ar"}" + "HOSTLD=${lib.getExe' buildPackages.stdenv.cc.bintools "${buildPackages.stdenv.cc.targetPrefix}ld"}" + "ARCH=${stdenv.hostPlatform.linuxArch}" + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" +] +# Add the built in headers the kernel needs +++ lib.optionals (stdenv.cc.isClang) [ + "CFLAGS_MODULE=-I${lib.getLib stdenv.cc.cc}/lib/clang/${lib.versions.major stdenv.cc.cc.version}/include" + "CFLAGS_KERNEL=-I${lib.getLib stdenv.cc.cc}/lib/clang/${lib.versions.major stdenv.cc.cc.version}/include" +] +++ (stdenv.hostPlatform.linux-kernel.makeFlags or [ ]) +++ extraMakeFlags diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 7e86efa4c9bb0..1bd981110c025 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -11,9 +11,9 @@ pahole, lib, stdenv, - rustc, + rustc-unwrapped, rustPlatform, - rust-bindgen, + rust-bindgen-unwrapped, # testing emptyFile, nixos, @@ -126,7 +126,7 @@ let commonStructuredConfig = import ./common-config.nix { inherit lib stdenv version; - rustAvailable = lib.meta.availableOn stdenv.hostPlatform rustc; + rustAvailable = lib.meta.availableOn stdenv.hostPlatform rustc-unwrapped; features = kernelFeatures; # Ensure we know of all extra patches, etc. }; @@ -197,8 +197,8 @@ let ] ++ lib.optional (lib.versionAtLeast version "5.2") pahole ++ lib.optionals withRust [ - rust-bindgen - rustc + rust-bindgen-unwrapped + rustc-unwrapped ]; RUST_LIB_SRC = lib.optionalString withRust rustPlatform.rustLibSrc; @@ -208,11 +208,14 @@ let kernelBaseConfig = if defconfig != null then defconfig else stdenv.hostPlatform.linux-kernel.baseConfig; - makeFlags = - lib.optionals ( - stdenv.hostPlatform.linux-kernel ? makeFlags - ) stdenv.hostPlatform.linux-kernel.makeFlags - ++ extraMakeFlags; + makeFlags = import ./common-flags.nix { + inherit + lib + stdenv + buildPackages + extraMakeFlags + ; + }; postPatch = kernel.postPatch + '' # Patch kconfig to print "###" after every question so that @@ -240,6 +243,24 @@ let KERNEL_CONFIG="$buildRoot/kernel-config" AUTO_MODULES=$autoModules \ PREFER_BUILTIN=$preferBuiltin BUILD_ROOT="$buildRoot" SRC=. MAKE_FLAGS="$makeFlags" \ perl -w $generateConfig + '' + + lib.optionalString stdenv.cc.isClang '' + if ! grep -Fq CONFIG_CC_IS_CLANG=y $buildRoot/.config; then + echo "Kernel config didn't recognize the clang compiler?" + exit 1 + fi + '' + + lib.optionalString stdenv.cc.bintools.isLLVM '' + if ! grep -Fq CONFIG_LD_IS_LLD=y $buildRoot/.config; then + echo "Kernel config didn't recognize the LLVM linker?" + exit 1 + fi + '' + + lib.optionalString withRust '' + if ! grep -Fq CONFIG_RUST_IS_AVAILABLE=y $buildRoot/.config; then + echo "Kernel config didn't find Rust toolchain?" + exit 1 + fi ''; installPhase = "mv $buildRoot/.config $out"; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 200969bc8af2f..460a5b0a52b7b 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -21,8 +21,8 @@ kmod, ubootTools, fetchpatch, - rustc, - rust-bindgen, + rustc-unwrapped, + rust-bindgen-unwrapped, rustPlatform, }: @@ -178,8 +178,8 @@ lib.makeOverridable ( ] ++ optional (lib.versionAtLeast version "5.13") zstd ++ optionals withRust [ - rustc - rust-bindgen + rustc-unwrapped + rust-bindgen-unwrapped ]; in @@ -241,8 +241,8 @@ lib.makeOverridable ( zlib ] ++ optionals withRust [ - rustc - rust-bindgen + rustc-unwrapped + rust-bindgen-unwrapped ]; RUST_LIB_SRC = lib.optionalString withRust rustPlatform.rustLibSrc; @@ -542,20 +542,14 @@ lib.makeOverridable ( // extraMeta; }; - # Absolute paths for compilers avoid any PATH-clobbering issues. - commonMakeFlags = [ - "ARCH=${stdenv.hostPlatform.linuxArch}" - "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; + commonMakeFlags = import ./common-flags.nix { + inherit + lib + stdenv + buildPackages + extraMakeFlags + ; + }; in stdenv.mkDerivation ( diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix index 7a3f5160bf5f1..81e6fb47d838f 100644 --- a/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/pkgs/os-specific/linux/kernel/perf/default.nix @@ -3,7 +3,6 @@ stdenv, fetchurl, kernel, - kernelModuleMakeFlags, elfutils, python3, newt, @@ -102,8 +101,9 @@ stdenv.mkDerivation { "prefix=$(out)" "WERROR=0" "ASCIIDOC8=1" + "ARCH=${stdenv.hostPlatform.linuxArch}" + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ] - ++ kernelModuleMakeFlags ++ lib.optional (!withGtk) "NO_GTK2=1" ++ lib.optional (!withZstd) "NO_LIBZSTD=1" ++ lib.optional (!withLibcap) "NO_LIBCAP=1"; diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index 21241a2952db1..37b6bb5578fa0 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libbpf"; - version = "1.5.1"; + version = "1.6.1"; src = fetchFromGitHub { owner = "libbpf"; repo = "libbpf"; rev = "v${version}"; - hash = "sha256-bTT7ehTHVaqkT27hJrH2YQBrVU6uo2gkgHE1AJtDKKY="; + hash = "sha256-2AtUwCN17bSM0mJrERTklVluUduMMAX25pOGEwNPjAU="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.cxx.nix b/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.cxx.nix index e899a0a7413e7..f4bc0d4784c32 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.cxx.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.cxx.nix @@ -102,6 +102,7 @@ bash.runCommand "${pname}-${version}" license = licenses.gpl3Plus; teams = [ teams.minimal-bootstrap ]; platforms = platforms.unix; + mainProgram = "gcc"; }; } '' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.nix b/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.nix index 7b98276305b52..0acddf7e042c0 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.nix @@ -84,6 +84,7 @@ bash.runCommand "${pname}-${version}" license = licenses.gpl3Plus; teams = [ teams.minimal-bootstrap ]; platforms = platforms.unix; + mainProgram = "gcc"; }; } '' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gcc/8.nix b/pkgs/os-specific/linux/minimal-bootstrap/gcc/8.nix index f0911017d2216..8f996d7dea22e 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/gcc/8.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/gcc/8.nix @@ -101,6 +101,7 @@ bash.runCommand "${pname}-${version}" license = licenses.gpl3Plus; teams = [ teams.minimal-bootstrap ]; platforms = platforms.unix; + mainProgram = "gcc"; }; } '' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gcc/latest.nix b/pkgs/os-specific/linux/minimal-bootstrap/gcc/latest.nix index 25c9f25e5c872..262232d669e5d 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/gcc/latest.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/gcc/latest.nix @@ -100,6 +100,7 @@ bash.runCommand "${pname}-${version}" license = licenses.gpl3Plus; teams = [ teams.minimal-bootstrap ]; platforms = platforms.unix; + mainProgram = "gcc"; }; } '' diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index 0f9a175711f21..f260c8edc33b3 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -26,12 +26,12 @@ }: stdenv.mkDerivation rec { - version = "1.1.3"; + version = "1.1.4"; pname = "nftables"; src = fetchurl { url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.xz"; - hash = "sha256-nIpktZyQsIJeVAqbj8udLZQsY2+BulAZnwaP3kTzTtg="; + hash = "sha256-NETwASrwRyOZ7q6Jp1i5xtxfMR9sZ6SJiPoWAPxLrIY="; }; patches = [ 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 d6a64437c2ace..9e34969868597 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 @@ -27,10 +27,10 @@ index d6a256c4a7..f74d5198f1 100644 "/etc")) return true; diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c -index 4bc01c75e0..ede9ac7b87 100644 +index 84da5eed63..d6e2f36d52 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) { +@@ -175,8 +175,10 @@ int mount_points_list_get(const char *mountinfo, MountPoint **head) { static bool nonunmountable_path(const char *path) { assert(path); 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 23029da39f23c..7cc2804a05bbb 100644 --- a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch +++ b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch @@ -10,7 +10,7 @@ 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 500725d35f..2b735e4df4 100644 +index 6f90f2f418..74b2a237d3 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -6189,6 +6189,7 @@ static int run(int argc, char *argv[]) { 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 c23b7315cde93..6c4a41ab06098 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,7 +13,7 @@ in containers. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/manager.c b/src/core/manager.c -index f21a4f7ceb..4c24ce5c98 100644 +index 4ccaba9054..9577b89783 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1672,7 +1672,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) { 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 119dd75bc2c3b..1f4184e928360 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 @@ -75,7 +75,7 @@ index 29afb08ebc..398ff340cd 100644 return -EINVAL; if (!timezone_is_valid(e, LOG_DEBUG)) diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c -index 9be62b8df3..2044e9f8d0 100644 +index a389eeae10..c817e91991 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c @@ -598,7 +598,7 @@ static int process_timezone(int rfd) { @@ -88,7 +88,7 @@ index 9be62b8df3..2044e9f8d0 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 2b735e4df4..7a21f34edd 100644 +index 74b2a237d3..cf9eabf0f2 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -1851,8 +1851,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid 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 14ff6ca57d464..856fdee934756 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 4c24ce5c98..3c944559fc 100644 +index 9577b89783..9cfd2798b9 100644 --- a/src/core/manager.c +++ b/src/core/manager.c -@@ -4135,9 +4135,17 @@ static int build_generator_environment(Manager *m, char ***ret) { +@@ -4158,9 +4158,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/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 41e836ca04eba..fe8ac0ddd913a 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,7 +27,7 @@ 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 36a0f906da..e0f42abca2 100644 +index 5b6b3ea93c..8ab04241b6 100644 --- a/src/shared/tpm2-util.c +++ b/src/shared/tpm2-util.c @@ -721,7 +721,7 @@ int tpm2_context_new(const char *device, Tpm2Context **ret_context) { 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 6c7a1aff4094e..50dd842cc221e 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,7 +30,7 @@ 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 c42a31153d..154dbf0402 100644 +index 7165fa1cf7..7498cf9f4c 100644 --- a/src/systemctl/systemctl-edit.c +++ b/src/systemctl/systemctl-edit.c @@ -323,6 +323,9 @@ int verb_edit(int argc, char *argv[], void *userdata) { 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 debcaab14e814..76b85b8db6742 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 bffda86845..cb5dcec0f9 100644 +index 7ede6f7a96..90860be99a 100644 --- a/meson.build +++ b/meson.build -@@ -2781,7 +2781,6 @@ install_data('LICENSE.GPL2', +@@ -2795,7 +2795,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 deleted file mode 100644 index b4b9d9ee3e3d7..0000000000000 --- a/pkgs/os-specific/linux/systemd/0018-Revert-bootctl-update-list-remove-all-instances-of-s.patch +++ /dev/null @@ -1,125 +0,0 @@ -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-bootctl-do-not-fail-when-the-same-file-is-updated-mu.patch b/pkgs/os-specific/linux/systemd/0018-bootctl-do-not-fail-when-the-same-file-is-updated-mu.patch new file mode 100644 index 0000000000000..70c3f0ef5f26c --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0018-bootctl-do-not-fail-when-the-same-file-is-updated-mu.patch @@ -0,0 +1,57 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Yu Watanabe +Date: Wed, 19 Jun 2024 16:11:23 +0900 +Subject: [PATCH] bootctl: do not fail when the same file is updated multiple + times + +In the second or later trial, copy_file_with_version_check() -> version_check() +fails with -ESRCH. Let's ignore the failure. + +This also adds missing assertions in update_efi_boot_binaries(), and +drop redundant version check in update_efi_boot_binaries(), as version +will be anyway checked later. + +Fixes a regression caused by 929f41c6528fb630753d4e2f588a8eb6c2f6a609. +Fixes #33392. +--- + src/bootctl/bootctl-install.c | 16 +++++++--------- + 1 file changed, 7 insertions(+), 9 deletions(-) + +diff --git a/src/bootctl/bootctl-install.c b/src/bootctl/bootctl-install.c +index e15c2c6bed..5b4cff5d5e 100644 +--- a/src/bootctl/bootctl-install.c ++++ b/src/bootctl/bootctl-install.c +@@ -329,6 +329,9 @@ static int update_efi_boot_binaries(const char *esp_path, const char *source_pat + _cleanup_free_ char *p = NULL; + int r, ret = 0; + ++ assert(esp_path); ++ assert(source_path); ++ + r = chase_and_opendir("/EFI/BOOT", esp_path, CHASE_PREFIX_ROOT|CHASE_PROHIBIT_SYMLINKS, &p, &d); + if (r == -ENOENT) + return 0; +@@ -354,19 +357,14 @@ static int update_efi_boot_binaries(const char *esp_path, const char *source_pat + if (r == 0) + continue; + +- r = get_file_version(fd, &v); +- if (r == -ESRCH) +- continue; /* No version information */ +- if (r < 0) +- return r; +- if (!startswith(v, "systemd-boot ")) +- continue; +- + _cleanup_free_ char *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)); ++ r = copy_file_with_version_check(source_path, dest_path, /* force = */ false); ++ if (IN_SET(r, -ESTALE, -ESRCH)) ++ continue; ++ RET_GATHER(ret, r); + } + + return ret; diff --git a/pkgs/os-specific/linux/systemd/0019-meson-Don-t-link-ssh-dropins.patch b/pkgs/os-specific/linux/systemd/0019-meson-Don-t-link-ssh-dropins.patch index a5b7c168ee943..55d8f989e842a 100644 --- a/pkgs/os-specific/linux/systemd/0019-meson-Don-t-link-ssh-dropins.patch +++ b/pkgs/os-specific/linux/systemd/0019-meson-Don-t-link-ssh-dropins.patch @@ -8,10 +8,10 @@ Subject: [PATCH] meson: Don't link ssh dropins 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build -index d392610625..c17d0a1feb 100644 +index 90860be99a..f021f76031 100644 --- a/meson.build +++ b/meson.build -@@ -211,13 +211,13 @@ sshconfdir = get_option('sshconfdir') +@@ -207,13 +207,13 @@ sshconfdir = get_option('sshconfdir') if sshconfdir == '' sshconfdir = sysconfdir / 'ssh/ssh_config.d' endif @@ -27,6 +27,3 @@ index d392610625..c17d0a1feb 100644 sshdprivsepdir = get_option('sshdprivsepdir') conf.set10('CREATE_SSHDPRIVSEPDIR', sshdprivsepdir != 'no' and not sshdprivsepdir.startswith('/usr/')) --- -2.47.0 - diff --git a/pkgs/os-specific/linux/systemd/0020-install-unit_file_exists_full-follow-symlinks.patch b/pkgs/os-specific/linux/systemd/0020-install-unit_file_exists_full-follow-symlinks.patch index e138aca05ac20..4d7ceedcbab09 100644 --- a/pkgs/os-specific/linux/systemd/0020-install-unit_file_exists_full-follow-symlinks.patch +++ b/pkgs/os-specific/linux/systemd/0020-install-unit_file_exists_full-follow-symlinks.patch @@ -1,4 +1,4 @@ -From 7be486fb25dc4ea212cb17f6a3f4a434a557b0d9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Fri, 10 Jan 2025 15:51:33 +0100 Subject: [PATCH] install: unit_file_exists_full: follow symlinks @@ -8,10 +8,10 @@ Subject: [PATCH] install: unit_file_exists_full: follow symlinks 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/install.c b/src/shared/install.c -index 53566b7eef..0975cd47c7 100644 +index 6d87858a3c..8da022eb64 100644 --- a/src/shared/install.c +++ b/src/shared/install.c -@@ -3217,7 +3217,7 @@ int unit_file_exists_full(RuntimeScope scope, const LookupPaths *lp, const char +@@ -3226,7 +3226,7 @@ int unit_file_exists_full(RuntimeScope scope, const LookupPaths *lp, const char &c, lp, name, @@ -20,6 +20,3 @@ index 53566b7eef..0975cd47c7 100644 ret_path ? &info : NULL, /* changes= */ NULL, /* n_changes= */ NULL); --- -2.47.0 - diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 579da4ca686ee..1a29a6306c9ac 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -138,6 +138,7 @@ withLogind ? true, withMachined ? true, withNetworkd ? true, + withNspawn ? !buildLibsOnly, withNss ? !stdenv.hostPlatform.isMusl, withOomd ? true, withOpenSSL ? true, @@ -195,7 +196,7 @@ assert withBootloader -> withEfi; let wantCurl = withRemote || withImportd; - version = "257.6"; + version = "257.7"; # Use the command below to update `releaseTimestamp` on every (major) version # change. More details in the commentary at mesonFlags. @@ -203,6 +204,8 @@ let # $ curl -s https://api.github.com/repos/systemd/systemd/releases/latest | \ # jq '.created_at|strptime("%Y-%m-%dT%H:%M:%SZ")|mktime' releaseTimestamp = "1734643670"; + + kbd' = if withPam then kbd else kbd.override { withVlock = false; }; in stdenv.mkDerivation (finalAttrs: { inherit pname version; @@ -213,7 +216,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "systemd"; repo = "systemd"; rev = "v${version}"; - hash = "sha256-Myb/ra7NQTDzN7B9jn8svbhTrLSfiqWaSxREe/nDyYo="; + hash = "sha256-9OnjeMrfV5DSAoX/aetI4r/QLPYITUd2aOY0DYfkTzQ="; }; # On major changes, or when otherwise required, you *must* : @@ -242,11 +245,16 @@ stdenv.mkDerivation (finalAttrs: { ./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 + + # https://github.com/systemd/systemd/issues/33392 + # https://github.com/systemd/systemd/pull/33400 + ./0018-bootctl-do-not-fail-when-the-same-file-is-updated-mu.patch + # systemd tries to link the systemd-ssh-proxy ssh config snippet with tmpfiles # if the install prefix is not /usr, but that does not work for us # because we include the config snippet manually ./0019-meson-Don-t-link-ssh-dropins.patch + ./0020-install-unit_file_exists_full-follow-symlinks.patch ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu) [ @@ -359,7 +367,6 @@ stdenv.mkDerivation (finalAttrs: { ninja meson glibcLocales - getent m4 autoPatchelfHook @@ -391,7 +398,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libxcrypt - libcap + (if withPam then libcap else libcap.override { usePam = false; }) libuuid linuxHeaders bashInteractive # for patch shebangs @@ -480,8 +487,8 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonOption "pkgconfigdatadir" "${placeholder "dev"}/share/pkgconfig") # Keyboard - (lib.mesonOption "loadkeys-path" "${kbd}/bin/loadkeys") - (lib.mesonOption "setfont-path" "${kbd}/bin/setfont") + (lib.mesonOption "loadkeys-path" "${kbd'}/bin/loadkeys") + (lib.mesonOption "setfont-path" "${kbd'}/bin/setfont") # SBAT (lib.mesonOption "sbat-distro" "nixos") @@ -562,6 +569,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonEnable "libiptc" withIptables) (lib.mesonEnable "repart" withRepart) (lib.mesonEnable "sysupdate" withSysupdate) + (lib.mesonEnable "sysupdated" withSysupdate) (lib.mesonEnable "seccomp" withLibseccomp) (lib.mesonEnable "selinux" withSelinux) (lib.mesonEnable "tpm2" withTpm2Tss) @@ -577,6 +585,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonEnable "gnutls" false) (lib.mesonEnable "xkbcommon" false) (lib.mesonEnable "man" true) + # (lib.mesonEnable "nspawn" withNspawn) # nspawn build can be turned off on systemd 258, on 257.x it will just not be installed in systemdLibs but the build is unconditional (lib.mesonBool "analyze" withAnalyze) (lib.mesonBool "logind" withLogind) @@ -624,11 +633,6 @@ stdenv.mkDerivation (finalAttrs: { # 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"; @@ -676,6 +680,16 @@ stdenv.mkDerivation (finalAttrs: { where = [ "man/systemd-fsck@.service.xml" ]; } ] + ++ lib.optionals withNspawn [ + { + # we only need to patch getent when nspawn will actually be built/installed + # as of systemd 257.x, nspawn will not be installed on systemdLibs, so we don't need to patch it + # patching getent unconditionally here introduces infinite recursion on musl + search = "/usr/bin/getent"; + replacement = "${getent}/bin/getent"; + where = [ "src/nspawn/nspawn-setuid.c" ]; + } + ] ++ lib.optionals withImportd [ { search = "\"gpg\""; @@ -911,14 +925,16 @@ stdenv.mkDerivation (finalAttrs: { withMachined withNetworkd withPortabled + withSysupdate withTimedated withTpm2Tss withUtmp util-linux kmod - kbd ; + kbd = kbd'; + # Many TPM2-related units are only installed if this trio of features are # enabled. See https://github.com/systemd/systemd/blob/876ee10e0eb4bbb0920bdab7817a9f06cc34910f/units/meson.build#L521 withTpm2Units = withTpm2Tss && withBootloader && withOpenSSL; diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index 5518fe5d64b5b..beaaeaffdd0f8 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -19,10 +19,10 @@ withUtils ? true, withGUI ? true, alsa-lib, - qt5compat, - qtbase, libGLU, - wrapQtAppsHook, + qt6Packages, + linuxHeaders, + buildPackages, }: # See libv4l in all-packages.nix for the libs only (overrides alsa, QT) @@ -66,6 +66,10 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isGnu [ (lib.mesonOption "gconvsysdir" "${glibc.out}/lib/gconv") + ] + ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # BPF support fail to cross compile, unable to find `linux/lirc.h` + (lib.mesonOption "bpf" "disabled") ]; postFixup = '' @@ -82,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { perl udevCheckHook ] - ++ lib.optional withQt wrapQtAppsHook; + ++ lib.optional withQt qt6Packages.wrapQtAppsHook; buildInputs = [ json_c @@ -93,8 +97,8 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (!stdenv.hostPlatform.isGnu) argp-standalone ++ lib.optionals withQt [ alsa-lib - qt5compat - qtbase + qt6Packages.qt5compat + qt6Packages.qtbase libGLU ]; @@ -115,6 +119,12 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "get_option('datadir') / 'locale'" "get_option('localedir')" ''; + # Meson unable to find moc/uic/rcc in case of cross-compilation + # https://github.com/mesonbuild/meson/issues/13018 + preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + export PATH=${buildPackages.qt6Packages.qtbase}/libexec:$PATH + ''; + enableParallelBuilding = true; doInstallCheck = true; diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index d27fe85114341..98d0236bcd900 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -221,11 +221,9 @@ let "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ] - ++ kernelModuleMakeFlags + ++ map (f: "KERNEL_${f}") kernelModuleMakeFlags ); - makeFlags = optionals buildKernel kernelModuleMakeFlags; - enableParallelBuilding = true; doInstallCheck = true; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 9eb40aa68e001..67940e720745f 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -138,6 +138,18 @@ let ]; }); + hassil = super.hassil.overridePythonAttrs (oldAttrs: rec { + version = "2.2.3"; + + src = fetchFromGitHub { + inherit (oldAttrs.src) repo owner; + tag = "v${version}"; + hash = "sha256-rP7F0BovD0Klf06lywo+1uFhPf+dS0qbNBZluun8+cE="; + }; + + disabledTestPaths = [ ]; + }); + mcp = super.mcp.overridePythonAttrs (oldAttrs: rec { version = "1.5.0"; src = fetchFromGitHub { diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index dece0210839e7..e4ece30ec3740 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.29.1"; - hash = "sha256-xYn35+2AHdvZBK+/PeJq4k6wzOJ8dxei6U33+xLWrSc="; + version = "1.27.5"; + hash = "sha256-6WrOu5wqbbigAMPdGzLsuhuBDwzVhiMtTZIeN2Z03Q4="; } diff --git a/pkgs/servers/mail/mailman/python.nix b/pkgs/servers/mail/mailman/python.nix index 397362bd2e51c..ffa3b18ea88bb 100644 --- a/pkgs/servers/mail/mailman/python.nix +++ b/pkgs/servers/mail/mailman/python.nix @@ -36,19 +36,7 @@ lib.fix ( tag = new.version; hash = "sha256-13/QbA//wyHE9yMB7Jy/sJEyqPKxiMN+CZwSc4U6okU="; }; - } - ); - - # the redis python library only supports hiredis 3+ from version 5.1.0 onwards - hiredis = super.hiredis.overrideAttrs ( - new: - { src, ... }: - { - version = "3.1.0"; - src = src.override { - tag = new.version; - hash = "sha256-ID5OJdARd2N2GYEpcYOpxenpZlhWnWr5fAClAgqEgGg="; - }; + patches = [ ]; } ); }) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 5bed1a79d65a6..0296130ba6a3f 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -30,16 +30,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2025-06-13T11-33-47Z"; + version = "2025-07-18T21-56-31Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - hash = "sha256-pck/K/BJZC0OdjgeCr+3ErkOyqmVTCdZv61jG24tp2E="; + hash = "sha256-kQxCrL1hzyEttpqCtJiK6so8L1bKvKaVU5wGWfb24fM="; }; - vendorHash = "sha256-0UoEIlxbAveYlCbGZ2z1q+RAksJrVjdE+ymc6ozDGcE="; + vendorHash = "sha256-XxvSTdHC8l3EwRP8odtcyGv9dlCTCl9dho8BOg6J8zY="; doCheck = false; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index a4cf06a4f8d5f..b8ba563931b7c 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -3,6 +3,7 @@ stdenv, buildGoModule, fetchFromGitHub, + fetchpatch, removeReferencesTo, tzdata, wire, @@ -56,6 +57,15 @@ buildGoModule rec { hash = "sha256-yraCuPLe68ryCgFzOZPL1H/JYynEvxijjgxMmQvcPZE="; }; + # Fix build + # FIXME: remove in next update + patches = [ + (fetchpatch { + url = "https://github.com/grafana/grafana/commit/21f305c6a0e242463f5219cc6944fb880ea809f0.patch"; + hash = "sha256-sXooRlnKY5ax0+1CPhy4zxDQtDGspbSdOoHHciqLTD8="; + }) + ]; + # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22 env = { CYPRESS_INSTALL_BINARY = 0; diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix index bacf1c7feb55e..bf93888c7b01d 100644 --- a/pkgs/servers/nosql/influxdb2/default.nix +++ b/pkgs/servers/nosql/influxdb2/default.nix @@ -43,10 +43,12 @@ let # https://github.com/influxdata/flux/pull/5542 ./fix-unsigned-char.patch ]; - # Don't fail on missing code documentation + # Don't fail on warnings postPatch = '' - substituteInPlace flux-core/src/lib.rs \ - --replace-fail "deny(warnings, missing_docs))]" "deny(warnings))]" + substituteInPlace flux/Cargo.toml \ + --replace-fail 'default = ["strict", ' 'default = [' + substituteInPlace flux-core/Cargo.toml \ + --replace-fail 'default = ["strict"]' 'default = []' ''; sourceRoot = "${src.name}/libflux"; diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/servers/spicedb/default.nix index 57584d390e71d..5cbd2033445ee 100644 --- a/pkgs/servers/spicedb/default.nix +++ b/pkgs/servers/spicedb/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "spicedb"; - version = "1.45.2"; + version = "1.45.1"; src = fetchFromGitHub { owner = "authzed"; repo = "spicedb"; rev = "v${version}"; - hash = "sha256-LDAZdcUfrCWtld6V4GDpAbK+BeT/aeVOQ7G++sMoXU4="; + hash = "sha256-cKCAA9C0vsCa0BszspvPfrKbdWyaccrMtiO6UWhLIh4="; }; - vendorHash = "sha256-hr+xIfPjlrH9igRsYeqNOPgx/jWhDfu73gA+/NoWWxI="; + vendorHash = "sha256-R4lOmHIBgnlvOukMjXdVx5e9Oneo1EizhsrDXiTbwTc="; ldflags = [ "-X 'github.com/jzelinskie/cobrautil/v2.Version=${src.rev}'" diff --git a/pkgs/servers/sql/postgresql/13.nix b/pkgs/servers/sql/postgresql/13.nix index 45a38d9ff7656..53aa3ea5e44ee 100644 --- a/pkgs/servers/sql/postgresql/13.nix +++ b/pkgs/servers/sql/postgresql/13.nix @@ -1,7 +1,7 @@ import ./generic.nix { - version = "13.21"; - rev = "refs/tags/REL_13_21"; - hash = "sha256-je3nC8zymK9pIISWSv/hMNeloYuiB7ulLinWFzqAWFc="; + version = "13.22"; + rev = "refs/tags/REL_13_22"; + hash = "sha256-6zHA+WU1FroUbGJcTAeEbPKBVQY7SKpT5+Kxe9ZhtoM="; muslPatches = { disable-test-collate-icu-utf8 = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql13/disable-test-collate.icu.utf8.patch?id=69faa146ec9fff3b981511068f17f9e629d4688b"; diff --git a/pkgs/servers/sql/postgresql/14.nix b/pkgs/servers/sql/postgresql/14.nix index c543e329dffc3..e0b6deadab984 100644 --- a/pkgs/servers/sql/postgresql/14.nix +++ b/pkgs/servers/sql/postgresql/14.nix @@ -1,7 +1,7 @@ import ./generic.nix { - version = "14.18"; - rev = "refs/tags/REL_14_18"; - hash = "sha256-pGPTq4I8WQnysVh3hHi/1Fto5vqtIbdGBu7EyBonIoo="; + version = "14.19"; + rev = "refs/tags/REL_14_19"; + hash = "sha256-z8MEeLae4W4YqGBNcPtKnUENxnixugnv5Q6r+LW4uu8="; muslPatches = { disable-test-collate-icu-utf8 = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7"; diff --git a/pkgs/servers/sql/postgresql/15.nix b/pkgs/servers/sql/postgresql/15.nix index 7af553659b5ee..6cb49891ad0d7 100644 --- a/pkgs/servers/sql/postgresql/15.nix +++ b/pkgs/servers/sql/postgresql/15.nix @@ -1,7 +1,7 @@ import ./generic.nix { - version = "15.13"; - rev = "refs/tags/REL_15_13"; - hash = "sha256-6guX2ms54HhJJ0MoHfQb5MI9qrcA0niJ06oa1glsFuY="; + version = "15.14"; + rev = "refs/tags/REL_15_14"; + hash = "sha256-KzN0gsEY6wFLqNYMxbTj2NH+4IWO0pplWP4XO/fqRLM="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql15/dont-use-locale-a-on-musl.patch?id=f424e934e6d076c4ae065ce45e734aa283eecb9c"; diff --git a/pkgs/servers/sql/postgresql/16.nix b/pkgs/servers/sql/postgresql/16.nix index aa53cd8254989..c0b7498da49cb 100644 --- a/pkgs/servers/sql/postgresql/16.nix +++ b/pkgs/servers/sql/postgresql/16.nix @@ -1,7 +1,7 @@ import ./generic.nix { - version = "16.9"; - rev = "refs/tags/REL_16_9"; - hash = "sha256-CLLCT4wiCWeLqMdtGdXM2/DtlENLWSey6nNtOcfNPRw="; + version = "16.10"; + rev = "refs/tags/REL_16_10"; + hash = "sha256-1zG8+G/lNA1xm0hxLVEilIaI+25d4gfpqA2aCb4+taY="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql16/dont-use-locale-a-on-musl.patch?id=08a24be262339fd093e641860680944c3590238e"; diff --git a/pkgs/servers/sql/postgresql/17.nix b/pkgs/servers/sql/postgresql/17.nix index e65dc8579ece0..faacd3b72fc51 100644 --- a/pkgs/servers/sql/postgresql/17.nix +++ b/pkgs/servers/sql/postgresql/17.nix @@ -1,7 +1,7 @@ import ./generic.nix { - version = "17.5"; - rev = "refs/tags/REL_17_5"; - hash = "sha256-jWV7hglu7IPMZbqHrZVZHLbZYjVuDeut7nH50aSQIBc="; + version = "17.6"; + rev = "refs/tags/REL_17_6"; + hash = "sha256-/7C+bjmiJ0/CvoAc8vzTC50vP7OsrM6o0w+lmmHvKvU="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql17/dont-use-locale-a-on-musl.patch?id=d69ead2c87230118ae7f72cef7d761e761e1f37e"; diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0002-allow-dangerous-implicit-autorefs.diff b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0002-allow-dangerous-implicit-autorefs.diff new file mode 100644 index 0000000000000..34230c372de09 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0002-allow-dangerous-implicit-autorefs.diff @@ -0,0 +1,21 @@ +diff --git a/crates/common/src/lib.rs b/crates/common/src/lib.rs +index 18172b9..6fc7e82 100644 +--- a/crates/common/src/lib.rs ++++ b/crates/common/src/lib.rs +@@ -1,3 +1,4 @@ ++#![warn(dangerous_implicit_autorefs)] + pub mod clean; + pub mod dir_ops; + pub mod file_atomic; +diff --git a/src/lib.rs b/src/lib.rs +index 068c65d..82609e9 100644 +--- a/src/lib.rs ++++ b/src/lib.rs +@@ -6,6 +6,7 @@ + #![allow(clippy::needless_range_loop)] + #![allow(clippy::single_match)] + #![allow(clippy::too_many_arguments)] ++#![warn(dangerous_implicit_autorefs)] + + mod bgworker; + mod datatype; diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/package.nix b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/package.nix index 323674e118336..412e466462470 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/package.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/package.nix @@ -27,6 +27,9 @@ buildPgrxExtension (finalAttrs: { (replaceVars ./0001-read-clang-flags-from-environment.diff { clang = lib.getExe clang; }) + # Rust 1.89 denies implicit autorefs by default, making the compilation fail. + # This restores the behaviour of previous rust versions by making the lint throw a warning instead. + ./0002-allow-dangerous-implicit-autorefs.diff ]; src = fetchFromGitHub { diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 72fa8f20b1b58..dab99654eb6e5 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -8,7 +8,12 @@ imake, libpciaccess, libpthread-stubs, + libx11, + libxau, + libxcb, libxcvt, + libxdmcp, + libxext, lndir, luit, makedepend, @@ -32,6 +37,7 @@ self: with self; { gccmakedep imake libpciaccess + libxcb libxcvt lndir luit @@ -45,6 +51,10 @@ self: with self; { fontalias = font-alias; fontutil = font-util; libpthreadstubs = libpthread-stubs; + libX11 = libx11; + libXau = libxau; + libXdmcp = libxdmcp; + libXext = libxext; utilmacros = util-macros; xcbproto = xcb-proto; xkeyboardconfig = xkeyboard-config; @@ -1909,49 +1919,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - libX11 = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - libpthreadstubs, - libxcb, - xtrans, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "libX11"; - version = "1.8.12"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libX11-1.8.12.tar.xz"; - sha256 = "16lspc3bw2pg3jal7zyq6mxmxmmaax0fz6lgh1n4skqjn2dny0ps"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgproto - libpthreadstubs - libxcb - xtrans - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ - "x11" - "x11-xcb" - ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! libXScrnSaver = callPackage ( { @@ -2030,38 +1997,6 @@ 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.12"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXau-1.0.12.tar.xz"; - sha256 = "1yy0gx3psxyjcj284xhh44labav7b5zs7gcrks9xi6nklggy9l3l"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ "xau" ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! libXaw = callPackage ( { @@ -2225,74 +2160,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - libXdmcp = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "libXdmcp"; - version = "1.1.5"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXdmcp-1.1.5.tar.xz"; - sha256 = "1312l8x3asib77wgf123w3nbabnky61mb6pnmmqapbf350l259fq"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ "xdmcp" ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - - # THIS IS A GENERATED FILE. DO NOT EDIT! - libXext = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libX11, - xorgproto, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "libXext"; - version = "1.3.6"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXext-1.3.6.tar.xz"; - sha256 = "0lwpx0b7lid47pff6dagp5h63bi0b3gsy05lqpyhbr4l76i9zdgd"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libX11 - xorgproto - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ "xext" ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! libXfixes = callPackage ( { @@ -3165,82 +3032,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - libxcb = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libxslt, - libpthreadstubs, - libXau, - xcbproto, - libXdmcp, - python3, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "libxcb"; - version = "1.17.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libxcb-1.17.0.tar.xz"; - sha256 = "0mbdkajqhg0j0zjc9a2z1qyv9mca797ihvifc9qyl3vijscvz7jr"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ - pkg-config - python3 - ]; - buildInputs = [ - libxslt - libpthreadstubs - libXau - xcbproto - libXdmcp - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ - "xcb" - "xcb-composite" - "xcb-damage" - "xcb-dbe" - "xcb-dpms" - "xcb-dri2" - "xcb-dri3" - "xcb-ge" - "xcb-glx" - "xcb-present" - "xcb-randr" - "xcb-record" - "xcb-render" - "xcb-res" - "xcb-screensaver" - "xcb-shape" - "xcb-shm" - "xcb-sync" - "xcb-xevie" - "xcb-xf86dri" - "xcb-xfixes" - "xcb-xinerama" - "xcb-xinput" - "xcb-xkb" - "xcb-xprint" - "xcb-xselinux" - "xcb-xtest" - "xcb-xv" - "xcb-xvmc" - ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! libxkbfile = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 025c6e9e253db..2515d4bd7e24e 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -39,14 +39,25 @@ $pcMap{"fontutil"} = "fontutil"; $pcMap{"pciaccess"} = "libpciaccess"; $pcMap{"pthread-stubs"} = "libpthreadstubs"; +$pcMap{"x11"} = "libX11"; +$pcMap{"x11-xcb"} = "libX11"; +$pcMap{"xau"} = "libXau"; $pcMap{"xbitmaps"} = "xbitmaps"; $pcMap{"xcb-proto"} = "xcbproto"; +$pcMap{"xdmcp"} = "libXdmcp"; +$pcMap{"xext"} = "libXext"; $pcMap{"xtrans"} = "xtrans"; $pcMap{"\$PIXMAN"} = "pixman"; $pcMap{"\$RENDERPROTO"} = "xorgproto"; $pcMap{"\$DRI3PROTO"} = "xorgproto"; $pcMap{"\$DRI2PROTO"} = "xorgproto"; $pcMap{"\${XKBMODULE}"} = "libxkbfile"; +foreach my $mod ("xcb", "xcb-composite", "xcb-damage", "xcb-dpms", "xcb-dri2", "xcb-dri3", + "xcb-glx", "xcb-present", "xcb-randr", "xcb-record", "xcb-render", "xcb-res", "xcb-screensaver", + "xcb-shape", "xcb-shm", "xcb-sync", "xcb-xf86dri", "xcb-xfixes", "xcb-xinerama", "xcb-xinput", + "xcb-xkb", "xcb-xtest", "xcb-xv", "xcb-xvmc") { + $pcMap{$mod} = "libxcb"; +} foreach my $mod ("applewmproto", "bigreqsproto", "compositeproto", "damageproto", "dmxproto", "dpmsproto", "dri2proto", "dri3proto", "evieproto", "fixesproto", "fontcacheproto", "fontsproto", "glproto", "inputproto", "kbproto", "lg3dproto", "presentproto", @@ -282,7 +293,12 @@ imake, libpciaccess, libpthread-stubs, + libx11, + libxau, + libxcb, libxcvt, + libxdmcp, + libxext, lndir, luit, makedepend, @@ -306,6 +322,7 @@ gccmakedep imake libpciaccess + libxcb libxcvt lndir luit @@ -319,6 +336,10 @@ fontalias = font-alias; fontutil = font-util; libpthreadstubs = libpthread-stubs; + libX11 = libx11; + libXau = libxau; + libXdmcp = libxdmcp; + libXext = libxext; utilmacros = util-macros; xcbproto = xcb-proto; xkeyboardconfig = xkeyboard-config; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 6fc024e55571d..eac49140c19ff 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -151,79 +151,6 @@ self: super: mkfontdir = xorg.mkfontscale; - libxcb = super.libxcb.overrideAttrs (attrs: { - # $dev/include/xcb/xcb.h includes pthread.h - propagatedBuildInputs = - attrs.propagatedBuildInputs or [ ] ++ lib.optional stdenv.hostPlatform.isMinGW windows.pthreads; - configureFlags = [ - "--enable-xkb" - "--enable-xinput" - ] - ++ lib.optional stdenv.hostPlatform.isStatic "--disable-shared"; - outputs = [ - "out" - "dev" - "man" - "doc" - ]; - meta = attrs.meta // { - pkgConfigModules = [ - "xcb-composite" - "xcb-damage" - "xcb-dpms" - "xcb-dri2" - "xcb-dri3" - "xcb-glx" - "xcb-present" - "xcb-randr" - "xcb-record" - "xcb-render" - "xcb-res" - "xcb-screensaver" - "xcb-shape" - "xcb-shm" - "xcb-sync" - "xcb-xf86dri" - "xcb-xfixes" - "xcb-xinerama" - "xcb-xinput" - "xcb-xkb" - "xcb-xtest" - "xcb-xv" - "xcb-xvmc" - "xcb" - ]; - platforms = lib.platforms.unix ++ lib.platforms.windows; - }; - }); - - libX11 = super.libX11.overrideAttrs (attrs: { - outputs = [ - "out" - "dev" - "man" - ]; - configureFlags = - attrs.configureFlags or [ ] - ++ malloc0ReturnsNullCrossFlag - ++ lib.optional (stdenv.targetPlatform.useLLVM or false) "ac_cv_path_RAWCPP=cpp"; - depsBuildBuild = [ - buildPackages.stdenv.cc - ] - ++ lib.optionals stdenv.hostPlatform.isStatic [ - (xorg.buildPackages.libc.static or null) - ]; - preConfigure = '' - sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure - ''; - postInstall = '' - # Remove useless DocBook XML files. - rm -rf $out/share/doc - ''; - CPP = lib.optionalString stdenv.hostPlatform.isDarwin "clang -E -"; - propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ xorg.xorgproto ]; - }); - libAppleWM = super.libAppleWM.overrideAttrs (attrs: { nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook @@ -234,25 +161,6 @@ self: super: }; }); - libXau = super.libXau.overrideAttrs (attrs: { - outputs = [ - "out" - "dev" - ]; - propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ xorg.xorgproto ]; - }); - - libXdmcp = super.libXdmcp.overrideAttrs (attrs: { - outputs = [ - "out" - "dev" - "doc" - ]; - meta = attrs.meta // { - pkgConfigModules = [ "xdmcp" ]; - }; - }); - libXtst = super.libXtst.overrideAttrs (attrs: { meta = attrs.meta // { pkgConfigModules = [ "xtst" ]; @@ -408,20 +316,6 @@ self: super: }; }); - libXext = super.libXext.overrideAttrs (attrs: { - outputs = [ - "out" - "dev" - "man" - "doc" - ]; - propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ - xorg.xorgproto - xorg.libXau - ]; - configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag; - }); - libXfixes = super.libXfixes.overrideAttrs (attrs: { outputs = [ "out" diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index ab2622766043a..059b308c7ed7f 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -161,15 +161,10 @@ mirror://xorg/individual/lib/libFS-1.0.10.tar.xz mirror://xorg/individual/lib/libICE-1.1.2.tar.xz mirror://xorg/individual/lib/libSM-1.2.6.tar.xz mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 -mirror://xorg/individual/lib/libX11-1.8.12.tar.xz -mirror://xorg/individual/lib/libXau-1.0.12.tar.xz mirror://xorg/individual/lib/libXaw-1.0.16.tar.xz -mirror://xorg/individual/lib/libxcb-1.17.0.tar.xz mirror://xorg/individual/lib/libXcomposite-0.4.6.tar.xz mirror://xorg/individual/lib/libXcursor-1.2.3.tar.xz mirror://xorg/individual/lib/libXdamage-1.1.6.tar.xz -mirror://xorg/individual/lib/libXdmcp-1.1.5.tar.xz -mirror://xorg/individual/lib/libXext-1.3.6.tar.xz mirror://xorg/individual/lib/libXfixes-6.0.1.tar.xz mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2 mirror://xorg/individual/lib/libXfont2-2.0.7.tar.xz diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix index 70a615951c3ea..424769a4a5c17 100644 --- a/pkgs/shells/bash/5.nix +++ b/pkgs/shells/bash/5.nix @@ -36,7 +36,7 @@ lib.warnIf (withDocs != null) src = fetchurl { url = "mirror://gnu/bash/bash-${lib.removeSuffix patch_suffix version}.tar.gz"; - hash = "sha256-Yt1JxEw5ntGz9/cx6Hp4IzTYNPCOCYo18sh1R9Xbsmk="; + hash = "sha256-DVzYaWX4aaJs9k9Lcb57lvkKO6iz104n6OnZ1VUPMbo="; }; hardeningDisable = [ diff --git a/pkgs/shells/bash/bash-5.3-patches.nix b/pkgs/shells/bash/bash-5.3-patches.nix index b8019fb335024..b285f9918ca6c 100644 --- a/pkgs/shells/bash/bash-5.3-patches.nix +++ b/pkgs/shells/bash/bash-5.3-patches.nix @@ -1,4 +1,7 @@ # Automatically generated by `update-patch-set.sh'; do not edit. patch: [ + (patch "001" "0zr8wgg1gb67vxn7ws971n1znrdinczymc688ndnpy2a6qs88q0z") + (patch "002" "009051z55plsy4jmmjdb3ys7li2jraynz99qg7n6a1qk025591g3") + (patch "003" "1vb0gnrkmz49rcfpxjcxy0v0k5278wrlkljk9gc20nizvk3xjigj") ] diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 5a2121dc36be5..5aebafc157491 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -519,7 +519,7 @@ isELF() { local fd local magic exec {fd}< "$fn" - read -r -n 4 -u "$fd" magic + LANG=C read -r -n 4 -u "$fd" magic exec {fd}<&- if [ "$magic" = $'\177ELF' ]; then return 0; else return 1; fi } @@ -530,7 +530,7 @@ isMachO() { local fd local magic exec {fd}< "$fn" - read -r -n 4 -u "$fd" magic + LANG=C read -r -n 4 -u "$fd" magic exec {fd}<&- # nix uses 'declare -F' in get-env.sh to retrieve the loaded functions. @@ -559,7 +559,7 @@ isScript() { local fd local magic exec {fd}< "$fn" - read -r -n 2 -u "$fd" magic + LANG=C read -r -n 2 -u "$fd" magic exec {fd}<&- if [[ "$magic" =~ \#! ]]; then return 0; else return 1; fi } @@ -1174,15 +1174,13 @@ substituteAllInPlace() { # What follows is the generic builder. -# This function is useful for debugging broken Nix builds. It dumps -# all environment variables to a file `env-vars' in the build -# directory. If the build fails and the `-K' option is used, you can -# then go to the build directory and source in `env-vars' to reproduce -# the environment used for building. +# This function is useful for debugging broken Nix builds. It dumps all environment variables to a +# file `env-vars' in the Nix build directory. If the build fails and the `-K' option is used, +# you can then go to the build directory and source the `env-vars' file to reproduce the environment +# used for building. Set `noDumpEnvVars` in the derivation to avoid this, and if for whatever reason +# `$NIX_BUILD_TOP` is not a directory, this function also does nothing. dumpVars() { - if [ "${noDumpEnvVars:-0}" != 1 ]; then - # Don't use `install` here to prevent executing a process each time. - + if [[ "${noDumpEnvVars:-0}" != 1 && -d "$NIX_BUILD_TOP" ]]; then # Set umask to create env-vars file with 0600 permissions (owner read/write only) local old_umask old_umask=$(umask) diff --git a/pkgs/tools/filesystems/ceph/arrow-cpp-19.nix b/pkgs/tools/filesystems/ceph/arrow-cpp-19.nix index d39d012455881..d4226feffb529 100644 --- a/pkgs/tools/filesystems/ceph/arrow-cpp-19.nix +++ b/pkgs/tools/filesystems/ceph/arrow-cpp-19.nix @@ -8,6 +8,7 @@ stdenv, lib, fetchurl, + fetchpatch2, fetchFromGitHub, fixDarwinDylibNames, autoconf, @@ -42,7 +43,7 @@ openssl, perl, pkg-config, - protobuf_29, + protobuf, python3, rapidjson, re2, @@ -67,9 +68,6 @@ }: let - # https://github.com/apache/arrow/issues/45807 - protobuf = protobuf_29; - arrow-testing = fetchFromGitHub { name = "arrow-testing"; owner = "apache"; @@ -101,6 +99,15 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/cpp"; + patches = [ + (fetchpatch2 { + name = "protobuf-30-compat.patch"; + url = "https://github.com/apache/arrow/pull/46136.patch"; + hash = "sha256-WTpe/eT3himlCHN/R78w1sF0HG859mE2ZN70U+9N8Ag="; + stripLen = 1; + }) + ]; + # versions are all taken from # https://github.com/apache/arrow/blob/apache-arrow-${version}/cpp/thirdparty/versions.txt diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 6fbfbde63fc03..944a97bff76e4 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -50,6 +50,7 @@ kmod, libcap, libcap_ng, + libnbd, libnl, libxml2, lmdb, @@ -360,10 +361,10 @@ let ); inherit (ceph-python-env.python) sitePackages; - version = "19.2.2"; + version = "19.2.3"; src = fetchurl { url = "https://download.ceph.com/tarballs/ceph-${version}.tar.gz"; - hash = "sha256-7FD9LJs25VzUCRIBm01Cm3ss1YLTN9YLwPZnHSMd8rs="; + hash = "sha256-zlgp28C81SZbaFJ4yvQk4ZgYz4K/aZqtcISTO8LscSU="; }; in rec { @@ -372,14 +373,6 @@ rec { inherit src version; patches = [ - (fetchpatch2 { - name = "ceph-s3select-arrow-18-compat.patch"; - url = "https://github.com/ceph/s3select/commit/f333ec82e6e8a3f7eb9ba1041d1442b2c7cd0f05.patch"; - hash = "sha256-21fi5tMIs/JmuhwPYMWtampv/aqAe+EoPAXZLJlOvgo="; - stripLen = 1; - extraPrefix = "src/s3select/"; - }) - ./boost-1.85.patch (fetchpatch2 { @@ -393,14 +386,6 @@ rec { # * # * ./boost-1.86-PyModule.patch - - # TODO: Remove with Ceph >= 19.2.3 - (fetchpatch2 { - name = "ceph-squid-client-disallow-unprivileged-users-to-escalate-root-privileges.patch"; - url = "https://github.com/ceph/ceph/commit/380da5049e8ea7c35f34022fba24d3e2d4db6dd8.patch?full_index=1"; - hash = "sha256-hVJ1v/n2YCJLusw+DEyK12MG73sJ/ccwbSc+2pLRxvw="; - }) - ]; nativeBuildInputs = [ @@ -441,6 +426,7 @@ rec { gtest icu libcap + libnbd libnl libxml2 lmdb diff --git a/pkgs/tools/filesystems/kdiskmark/default.nix b/pkgs/tools/filesystems/kdiskmark/default.nix index c401567ed9b41..2f9f09fdc9d37 100644 --- a/pkgs/tools/filesystems/kdiskmark/default.nix +++ b/pkgs/tools/filesystems/kdiskmark/default.nix @@ -6,19 +6,19 @@ qttools, fio, cmake, - polkit-qt-1, + polkit-qt, extra-cmake-modules, fetchFromGitHub, }: stdenv.mkDerivation rec { pname = "kdiskmark"; - version = "3.2.0"; + version = "3.1.4"; src = fetchFromGitHub { owner = "jonmagon"; repo = "kdiskmark"; rev = version; - hash = "sha256-b42PNUrG10RyGct6dPtdT89oO222tEovkSPoRcROfaQ="; + hash = "sha256-JueY7zw9PIo9ETi7pQLpw8FGRhNXYXeXEvTzZGz9lbw="; fetchSubmodules = true; }; @@ -31,12 +31,12 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qttools - polkit-qt-1 + polkit-qt ]; preConfigure = '' substituteInPlace CMakeLists.txt \ - --replace-fail \$\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\} $out/share/polkit-1/actions + --replace \$\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\} $out/share/polkit-1/actions ''; qtWrapperArgs = [ diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index e38289e360b16..92ff966a5bc14 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -234,6 +234,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Intelligent Input Bus, input method framework"; license = lib.licenses.lgpl21Plus; platforms = lib.platforms.linux; + mainProgram = "ibus"; maintainers = with lib.maintainers; [ ttuegel ]; }; }) diff --git a/pkgs/tools/networking/openvpn/dco.patch b/pkgs/tools/networking/openvpn/dco.patch new file mode 100644 index 0000000000000..22572e6bc48b8 --- /dev/null +++ b/pkgs/tools/networking/openvpn/dco.patch @@ -0,0 +1,25 @@ +diff --git a/src/openvpn/ovpn_dco_linux.h b/src/openvpn/ovpn_dco_linux.h +index 73e19b5..46c2786 100644 +--- a/src/openvpn/ovpn_dco_linux.h ++++ b/src/openvpn/ovpn_dco_linux.h +@@ -237,20 +237,4 @@ enum ovpn_netlink_packet_attrs { + OVPN_PACKET_ATTR_MAX = __OVPN_PACKET_ATTR_AFTER_LAST - 1, + }; + +-enum ovpn_ifla_attrs { +- IFLA_OVPN_UNSPEC = 0, +- IFLA_OVPN_MODE, +- +- __IFLA_OVPN_AFTER_LAST, +- IFLA_OVPN_MAX = __IFLA_OVPN_AFTER_LAST - 1, +-}; +- +-enum ovpn_mode { +- __OVPN_MODE_FIRST = 0, +- OVPN_MODE_P2P = __OVPN_MODE_FIRST, +- OVPN_MODE_MP, +- +- __OVPN_MODE_AFTER_LAST, +-}; +- + #endif /* _UAPI_LINUX_OVPN_DCO_H_ */ diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index 61937d6200f5e..0f5c809ffc8c0 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -30,6 +30,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-nramYYNS+ee3canTiuFjG17f7tbUAjPiQ+YC3fIZXno="; }; + # Effectively a backport of https://github.com/OpenVPN/openvpn/commit/1d3c2b67a73a0aa011c13e62f876d24e49d41df0 + # to fix build on linux-headers 6.16. + # FIXME: remove in next update + patches = [ + ./dco.patch + ]; + nativeBuildInputs = [ pkg-config ] diff --git a/pkgs/tools/package-management/nix/common-autoconf.nix b/pkgs/tools/package-management/nix/common-autoconf.nix index fed7eb3ac0a97..8dfefe1544a21 100644 --- a/pkgs/tools/package-management/nix/common-autoconf.nix +++ b/pkgs/tools/package-management/nix/common-autoconf.nix @@ -21,6 +21,7 @@ }@args: assert (hash == null) -> (src != null); let + atLeast24 = lib.versionAtLeast version "2.4"; atLeast225 = lib.versionAtLeast version "2.25pre"; in { @@ -74,7 +75,8 @@ in withAWS ? lib.meta.availableOn stdenv.hostPlatform aws-c-common && !enableStatic - && (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin), + && (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin) + && atLeast24, aws-c-common, aws-sdk-cpp, withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp, diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index db149bf8b3e4e..231f514a627bc 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -29,11 +29,7 @@ let stateDir confDir ; - aws-sdk-cpp = - if lib.versionAtLeast args.version "2.12pre" then - nixDependencies.aws-sdk-cpp - else - nixDependencies.aws-sdk-cpp-old; + inherit (nixDependencies) aws-sdk-cpp; }; # Called for Nix == 2.28. Transitional until we always use diff --git a/pkgs/tools/package-management/nix/dependencies.nix b/pkgs/tools/package-management/nix/dependencies.nix index 281b1f6c390cf..a00078939ab71 100644 --- a/pkgs/tools/package-management/nix/dependencies.nix +++ b/pkgs/tools/package-management/nix/dependencies.nix @@ -9,65 +9,6 @@ regular@{ { scopeFunction = scope: { boehmgc = regular.boehmgc.override { enableLargeConfig = true; }; - - # old nix fails to build with newer aws-sdk-cpp and the patch doesn't apply - aws-sdk-cpp-old = - (regular.aws-sdk-cpp.override { - apis = [ - "s3" - "transfer" - ]; - customMemoryManagement = false; - }).overrideAttrs - (args: rec { - # intentionally overriding postPatch - version = "1.9.294"; - - src = fetchFromGitHub { - owner = "aws"; - repo = "aws-sdk-cpp"; - rev = version; - hash = "sha256-Z1eRKW+8nVD53GkNyYlZjCcT74MqFqqRMeMc33eIQ9g="; - }; - postPatch = '' - # Avoid blanket -Werror to evade build failures on less - # tested compilers. - substituteInPlace cmake/compiler_settings.cmake \ - --replace '"-Werror"' ' ' - - # Missing includes for GCC11 - sed '5i#include ' -i \ - aws-cpp-sdk-cloudfront-integration-tests/CloudfrontOperationTest.cpp \ - aws-cpp-sdk-cognitoidentity-integration-tests/IdentityPoolOperationTest.cpp \ - aws-cpp-sdk-dynamodb-integration-tests/TableOperationTest.cpp \ - aws-cpp-sdk-elasticfilesystem-integration-tests/ElasticFileSystemTest.cpp \ - aws-cpp-sdk-lambda-integration-tests/FunctionTest.cpp \ - aws-cpp-sdk-mediastore-data-integration-tests/MediaStoreDataTest.cpp \ - aws-cpp-sdk-queues/source/sqs/SQSQueue.cpp \ - aws-cpp-sdk-redshift-integration-tests/RedshiftClientTest.cpp \ - aws-cpp-sdk-s3-crt-integration-tests/BucketAndObjectOperationTest.cpp \ - aws-cpp-sdk-s3-integration-tests/BucketAndObjectOperationTest.cpp \ - aws-cpp-sdk-s3control-integration-tests/S3ControlTest.cpp \ - aws-cpp-sdk-sqs-integration-tests/QueueOperationTest.cpp \ - aws-cpp-sdk-transfer-tests/TransferTests.cpp - # Flaky on Hydra - rm aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp - # Includes aws-c-auth private headers, so only works with submodule build - rm aws-cpp-sdk-core-tests/aws/auth/AWSAuthSignerTest.cpp - # TestRandomURLMultiThreaded fails - rm aws-cpp-sdk-core-tests/http/HttpClientTest.cpp - '' - + lib.optionalString aws-sdk-cpp.stdenv.hostPlatform.isi686 '' - # EPSILON is exceeded - rm aws-cpp-sdk-core-tests/aws/client/AdaptiveRetryStrategyTest.cpp - ''; - - patches = (args.patches or [ ]) ++ [ ./patches/aws-sdk-cpp-TransferManager-ContentEncoding.patch ]; - - # only a stripped down version is build which takes a lot less resources to build - requiredSystemFeatures = [ ]; - }); - aws-sdk-cpp = (regular.aws-sdk-cpp.override { apis = [ diff --git a/pkgs/tools/package-management/nix/patches/aws-sdk-cpp-TransferManager-ContentEncoding.patch b/pkgs/tools/package-management/nix/patches/aws-sdk-cpp-TransferManager-ContentEncoding.patch deleted file mode 100644 index 59cc305a60bc5..0000000000000 --- a/pkgs/tools/package-management/nix/patches/aws-sdk-cpp-TransferManager-ContentEncoding.patch +++ /dev/null @@ -1,127 +0,0 @@ -From 7d58e303159b2fb343af9a1ec4512238efa147c7 Mon Sep 17 00:00:00 2001 -From: Eelco Dolstra -Date: Mon, 6 Aug 2018 17:15:04 +0200 -Subject: [PATCH] TransferManager: Allow setting a content-encoding for S3 uploads - ---- a/aws-cpp-sdk-transfer/include/aws/transfer/TransferHandle.h -+++ b/aws-cpp-sdk-transfer/include/aws/transfer/TransferHandle.h -@@ -297,6 +297,14 @@ namespace Aws - * Content type of the object being transferred - */ - inline void SetContentType(const Aws::String& value) { std::lock_guard locker(m_getterSetterLock); m_contentType = value; } -+ /** -+ * Content encoding of the object being transferred -+ */ -+ inline const Aws::String GetContentEncoding() const { std::lock_guard locker(m_getterSetterLock); return m_contentEncoding; } -+ /** -+ * Content type of the object being transferred -+ */ -+ inline void SetContentEncoding(const Aws::String& value) { std::lock_guard locker(m_getterSetterLock); m_contentEncoding = value; } - /** - * In case of an upload, this is the metadata that was placed on the object when it was uploaded. - * In the case of a download, this is the object metadata from the GetObject operation. -@@ -383,6 +391,7 @@ namespace Aws - Aws::String m_key; - Aws::String m_fileName; - Aws::String m_contentType; -+ Aws::String m_contentEncoding; - Aws::String m_versionId; - Aws::Map m_metadata; - TransferStatus m_status; ---- a/aws-cpp-sdk-transfer/include/aws/transfer/TransferManager.h -+++ b/aws-cpp-sdk-transfer/include/aws/transfer/TransferManager.h -@@ -154,7 +154,8 @@ namespace Aws - const Aws::String& keyName, - const Aws::String& contentType, - const Aws::Map& metadata, -- const std::shared_ptr& context = nullptr); -+ const std::shared_ptr& context = nullptr, -+ const Aws::String& contentEncoding = ""); - - /** - * Downloads the contents of bucketName/keyName in S3 to the file specified by writeToFile. This will perform a GetObject operation. -@@ -246,7 +247,8 @@ namespace Aws - const Aws::Map& metadata, - const std::shared_ptr& context, -- const Aws::String& fileName = ""); -+ const Aws::String& fileName = "", -+ const Aws::String& contentEncoding = ""); - - /** - * Submits the actual task to task schecduler -@@ -262,7 +264,8 @@ namespace Aws - const Aws::String& keyName, - const Aws::String& contentType, - const Aws::Map& metadata, -- const std::shared_ptr& context); -+ const std::shared_ptr& context, -+ const Aws::String& contentEncoding); - - /** - * Uploads the contents of file, to bucketName/keyName in S3. contentType and metadata will be added to the object. If the object is larger than the configured bufferSize, ---- a/aws-cpp-sdk-transfer/source/transfer/TransferManager.cpp -+++ b/aws-cpp-sdk-transfer/source/transfer/TransferManager.cpp -@@ -87,9 +87,10 @@ namespace Aws - const Aws::String& bucketName, - const Aws::String& keyName, const Aws::String& contentType, - const Aws::Map& metadata, -- const std::shared_ptr& context) -+ const std::shared_ptr& context, -+ const Aws::String& contentEncoding) - { -- return this->DoUploadFile(fileStream, bucketName, keyName, contentType, metadata, context); -+ return this->DoUploadFile(fileStream, bucketName, keyName, contentType, metadata, context, contentEncoding); - } - - std::shared_ptr TransferManager::DownloadFile(const Aws::String& bucketName, -@@ -286,6 +287,9 @@ namespace Aws - createMultipartRequest.WithKey(handle->GetKey()); - createMultipartRequest.WithMetadata(handle->GetMetadata()); - -+ if (handle->GetContentEncoding() != "") -+ createMultipartRequest.WithContentEncoding(handle->GetContentEncoding()); -+ - auto createMultipartResponse = m_transferConfig.s3Client->CreateMultipartUpload(createMultipartRequest); - if (createMultipartResponse.IsSuccess()) - { -@@ -441,6 +445,9 @@ namespace Aws - - putObjectRequest.SetContentType(handle->GetContentType()); - -+ if (handle->GetContentEncoding() != "") -+ putObjectRequest.SetContentEncoding(handle->GetContentEncoding()); -+ - auto buffer = m_bufferManager.Acquire(); - - auto lengthToWrite = (std::min)(m_transferConfig.bufferSize, handle->GetBytesTotalSize()); -@@ -1140,12 +1147,15 @@ namespace Aws - const Aws::String& contentType, - const Aws::Map& metadata, - const std::shared_ptr& context, -- const Aws::String& fileName) -+ const Aws::String& fileName, -+ const Aws::String& contentEncoding) - { - auto handle = Aws::MakeShared(CLASS_TAG, bucketName, keyName, 0, fileName); - handle->SetContentType(contentType); - handle->SetMetadata(metadata); - handle->SetContext(context); -+ if (contentEncoding != "") -+ handle->SetContentEncoding(contentEncoding); - - if (!fileStream->good()) - { -@@ -1213,9 +1223,10 @@ namespace Aws - const Aws::String& keyName, - const Aws::String& contentType, - const Aws::Map& metadata, -- const std::shared_ptr& context) -+ const std::shared_ptr& context, -+ const Aws::String& contentEncoding) - { -- auto handle = CreateUploadFileHandle(fileStream.get(), bucketName, keyName, contentType, metadata, context); -+ auto handle = CreateUploadFileHandle(fileStream.get(), bucketName, keyName, contentType, metadata, context, "", contentEncoding); - return SubmitUpload(handle, fileStream); - } - diff --git a/pkgs/tools/security/gnupg/24.nix b/pkgs/tools/security/gnupg/24.nix index 3722f0abc2409..446ec69617f14 100644 --- a/pkgs/tools/security/gnupg/24.nix +++ b/pkgs/tools/security/gnupg/24.nix @@ -21,6 +21,7 @@ readline, sqlite, zlib, + openssh, enableMinimal ? false, withPcsc ? !enableMinimal, pcsclite, @@ -75,6 +76,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withTpm2Tss [ tpm2-tss ]; + # Maintained by Andrew Gallapher, who's involved with GPG in multiple ways: https://andrewg.com/ freepgPatches = fetchFromGitLab { domain = "gitlab.com"; owner = "freepg"; @@ -84,7 +86,16 @@ stdenv.mkDerivation rec { }; patches = [ + # Without this, scdaemon isn't linked to libusb, causing smartcards to not work correctly ./fix-libusb-include-path.patch + # Use pkg-config to find tss2-esys to fix static building + # Submitted upstream: https://dev.gnupg.org/D606 + # The diff is larger than upstream because configure.ac was modified, + # requiring configure to be regenerated. For reasons we don't totally + # understand, regenerating configure has all sorts of other undesirable + # side effects. So to unbreak things, instead of regenerating configure, + # we can include just the configure changes relevant to the static patch + # in the patch file. ./static.patch ] ++ lib.map (v: "${freepgPatches}/STABLE-BRANCH-2-4-freepg/" + v) [ @@ -113,17 +124,27 @@ stdenv.mkDerivation rec { "0034-gpg-Verify-Text-mode-Signatures-over-binary-Literal-.patch" ]; - postPatch = '' - sed -i 's,\(hkps\|https\)://keyserver.ubuntu.com,hkps://keys.openpgp.org,g' configure configure.ac doc/dirmngr.texi doc/gnupg.info-1 - '' - + lib.optionalString (stdenv.hostPlatform.isLinux && withPcsc) '' - sed -i 's,"libpcsclite\.so[^"]*","${lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c - ''; + postPatch = + # Switch the default key server to keys.openpgp.org + # The original motivation in 2019 was to switch away from the then-default SKS network: https://github.com/NixOS/nixpkgs/pull/63952 + # In 2021 upstream also switched away, but to keyserver.ubuntu.com: https://dev.gnupg.org/rG47c4e3e00a7ef55f954c14b3c237496e54a853c1, + # while NixOS kept the keys.openpgp.org default: https://github.com/NixOS/nixpkgs/pull/159604 + # TODO: Should this patch be removed so that the now-uncompromised default is used once again? + # A significant difference between the two seems to be that keys.openpgp.org is verifying keys, while keyserver.ubuntu.com isn't: https://unix.stackexchange.com/a/694528 + # The keys.openpgp.org also has a great FAQ: https://keys.openpgp.org/about/faq + '' + 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 + ''; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-implicit-function-declaration"; configureFlags = [ "--sysconfdir=/etc" + # Needed for large RSA key support (patch 0033) + "--enable-large-secmem" "--with-libgpg-error-prefix=${libgpg-error.dev}" "--with-libgcrypt-prefix=${libgcrypt.dev}" "--with-libassuan-prefix=${libassuan.dev}" @@ -159,6 +180,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + nativeCheckInputs = [ + # A test would be skipped without SSH + openssh + ]; + doCheck = !enableMinimal; + passthru.tests = nixosTests.gnupg; meta = with lib; { diff --git a/pkgs/top-level/agda-packages.nix b/pkgs/top-level/agda-packages.nix index a943c2c52cfdd..1289445a58723 100644 --- a/pkgs/top-level/agda-packages.nix +++ b/pkgs/top-level/agda-packages.nix @@ -28,9 +28,7 @@ let agda = withPackages [ ]; - standard-library = callPackage ../development/libraries/agda/standard-library { - inherit (pkgs.haskellPackages) ghcWithPackages; - }; + standard-library = callPackage ../development/libraries/agda/standard-library { }; iowa-stdlib = callPackage ../development/libraries/agda/iowa-stdlib { }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f86b74337d906..6ef821fdd2657 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1154,7 +1154,6 @@ mapAliases { imagemagick7Big = throw "'imagemagick7Big' has been renamed to/replaced by 'imagemagickBig'"; # Converted to throw 2024-10-17 imagemagick7 = throw "'imagemagick7' has been renamed to/replaced by 'imagemagick'"; # Converted to throw 2024-10-17 imagemagick7_light = throw "'imagemagick7_light' has been renamed to/replaced by 'imagemagick_light'"; # Converted to throw 2024-10-17 - imaginer = throw "'imaginer' has been removed due to lack of upstream maintenance"; # Added 2025-08-15 immersed-vr = lib.warnOnInstantiate "'immersed-vr' has been renamed to 'immersed'" immersed; # Added 2024-08-11 inconsolata-nerdfont = lib.warnOnInstantiate "inconsolata-nerdfont is redundant. Use nerd-fonts.inconsolata instead." nerd-fonts.inconsolata; # Added 2024-11-10 incrtcl = tclPackages.incrtcl; # Added 2024-10-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34809a6c4df25..cb4e782ce3ae3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3305,7 +3305,7 @@ with pkgs; kaffeine = libsForQt5.callPackage ../applications/video/kaffeine { }; - kdiskmark = kdePackages.callPackage ../tools/filesystems/kdiskmark { }; + kdiskmark = libsForQt5.callPackage ../tools/filesystems/kdiskmark { }; keepkey-agent = with python3Packages; toPythonApplication keepkey-agent; @@ -5652,17 +5652,17 @@ with pkgs; wrapRustcWith = { rustc-unwrapped, ... }@args: callPackage ../build-support/rust/rustc-wrapper args; wrapRustc = rustc-unwrapped: wrapRustcWith { inherit rustc-unwrapped; }; - rust_1_88 = callPackage ../development/compilers/rust/1_88.nix { + rust_1_89 = callPackage ../development/compilers/rust/1_89.nix { llvm_20 = llvmPackages_20.libllvm; }; - rust = rust_1_88; + rust = rust_1_89; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { }; - rustPackages_1_88 = rust_1_88.packages.stable; - rustPackages = rustPackages_1_88; + rustPackages_1_89 = rust_1_89.packages.stable; + rustPackages = rustPackages_1_89; inherit (rustPackages) cargo @@ -5670,6 +5670,7 @@ with pkgs; cargo-auditable-cargo-wrapper clippy rustc + rustc-unwrapped rustPlatform ; @@ -6576,7 +6577,7 @@ with pkgs; autoconf269 = callPackage ../development/tools/misc/autoconf/2.69.nix { }; autoconf271 = callPackage ../development/tools/misc/autoconf/2.71.nix { }; - automake = automake116x; + automake = automake118x; automake116x = callPackage ../development/tools/misc/automake/automake-1.16.x.nix { }; @@ -8455,13 +8456,11 @@ with pkgs; libxcrypt-legacy = libxcrypt.override { enableHashes = "all"; }; libxkbcommon = libxkbcommon_8; - libxml2 = callPackage ../development/libraries/libxml2 { - python = python3; - stdenv = - # libxml2 is a dependency of xcbuild. Avoid an infinite recursion by using a bootstrap stdenv - # that does not propagate xcrun. - if stdenv.hostPlatform.isDarwin then darwin.bootstrapStdenv else stdenv; - }; + + inherit (callPackage ../development/libraries/libxml2 { }) + libxml2_13 + libxml2 + ; libxml2Python = let @@ -10946,9 +10945,10 @@ with pkgs; shadowSupport = false; systemdSupport = false; translateManpages = false; + withLastlog = false; }; - v4l-utils = qt6.callPackage ../os-specific/linux/v4l-utils { }; + v4l-utils = callPackage ../os-specific/linux/v4l-utils { }; windows = callPackages ../os-specific/windows { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5ff4d114a76c4..cdbd951cd866b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2063,7 +2063,17 @@ with self; url = "mirror://cpan/authors/id/E/EH/EHUELS/Authen-SASL-2.1700.tar.gz"; hash = "sha256-uG1aV2uNOHruJPOfR6VK/RS7ZrCQA9tQZQAfHeA6js4="; }; - propagatedBuildInputs = [ DigestHMAC ]; + patches = [ + (fetchurl { + name = "CVE-2025-40918.patch"; + url = "https://security.metacpan.org/patches/A/Authen-SASL/2.1800/CVE-2025-40918-r1.patch"; + hash = "sha256-2Mk6RoD7tI8V6YFV8gs08LLs0QeMJqwGz/eZ6zXBBpw="; + }) + ]; + propagatedBuildInputs = [ + DigestHMAC + CryptURandom + ]; meta = { description = "SASL Authentication framework"; license = with lib.licenses; [ diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 1462962efaf5b..b5830cf6fe213 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -332,6 +332,7 @@ mapAliases ({ hcs_utils = hcs-utils; # added 2024-01-06 hdlparse = throw "hdlparse has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 hglib = python-hglib; # added 2023-10-13 + hijri-converter = hijridate; # added 2025-08-07 hkdf = throw "hkdf has been removed, as it is no longer maintained upstream."; # added 2024-10-04 homeassistant-bring-api = bring-api; # added 2024-04-11 homeassistant-pyozw = throw "homeassistant-pyozw has been removed, as it was packaged for home-assistant which has removed it as a dependency."; # added 2024-01-05 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4b9e90dcfdcbd..f4128c2b6fc7d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3246,16 +3246,6 @@ self: super: with self; { cython_0 = callPackage ../development/python-modules/cython/0.nix { }; - cython_3_1 = cython.overridePythonAttrs rec { - version = "3.1.2"; - src = pkgs.fetchFromGitHub { - owner = "cython"; - repo = "cython"; - tag = version; - hash = "sha256-lP8ILCzAZuoPzFhCqGXwIpifN8XoWz93SJ7c3XVe69Y="; - }; - }; - cytoolz = callPackage ../development/python-modules/cytoolz { }; dacite = callPackage ../development/python-modules/dacite { }; @@ -3425,6 +3415,8 @@ self: super: with self; { dbt-postgres = callPackage ../development/python-modules/dbt-postgres { }; + dbt-protos = callPackage ../development/python-modules/dbt-protos { }; + dbt-redshift = callPackage ../development/python-modules/dbt-redshift { }; dbt-semantic-interfaces = callPackage ../development/python-modules/dbt-semantic-interfaces { }; @@ -5079,9 +5071,7 @@ self: super: with self; { feedgen = callPackage ../development/python-modules/feedgen { }; - feedgenerator = callPackage ../development/python-modules/feedgenerator { - inherit (pkgs) glibcLocales; - }; + feedgenerator = callPackage ../development/python-modules/feedgenerator { }; feedparser = callPackage ../development/python-modules/feedparser { }; @@ -5109,8 +5099,6 @@ self: super: with self; { fido2 = callPackage ../development/python-modules/fido2 { }; - fido2_2 = callPackage ../development/python-modules/fido2/2.nix { }; - fields = callPackage ../development/python-modules/fields { }; file-read-backwards = callPackage ../development/python-modules/file-read-backwards { }; @@ -6586,7 +6574,7 @@ self: super: with self; { hightime = callPackage ../development/python-modules/hightime { }; - hijri-converter = callPackage ../development/python-modules/hijri-converter { }; + hijridate = callPackage ../development/python-modules/hijridate { }; hikari = callPackage ../development/python-modules/hikari { }; @@ -8321,7 +8309,7 @@ self: super: with self; { (toPythonModule ( pkgs.libxml2.override { pythonSupport = true; - inherit python; + python3 = python; } )).py; @@ -14245,6 +14233,8 @@ self: super: with self; { callPackage ../development/python-modules/pytest-asyncio-cooperative { }; + pytest-asyncio_0 = callPackage ../development/python-modules/pytest-asyncio/0.nix { }; + pytest-asyncio_0_21 = pytest-asyncio.overridePythonAttrs (old: rec { version = "0.21.2"; src = pkgs.fetchFromGitHub { @@ -14527,8 +14517,12 @@ self: super: with self; { pytest7CheckHook = pytestCheckHook.override { pytest = pytest_7; }; + pytest8_3CheckHook = pytestCheckHook.override { pytest = pytest_8_3; }; + pytest_7 = callPackage ../development/python-modules/pytest/7.nix { }; + pytest_8_3 = callPackage ../development/python-modules/pytest/8_3.nix { }; + pytestcache = callPackage ../development/python-modules/pytestcache { }; python-aodhclient = callPackage ../development/python-modules/python-aodhclient { }; @@ -15117,7 +15111,9 @@ self: super: with self; { pytweening = callPackage ../development/python-modules/pytweening { }; - pytz = callPackage ../development/python-modules/pytz { }; + pytz = callPackage ../development/python-modules/pytz { + inherit (pkgs) tzdata; + }; pytz-deprecation-shim = callPackage ../development/python-modules/pytz-deprecation-shim { }; @@ -15794,6 +15790,8 @@ self: super: with self; { rfc3987 = callPackage ../development/python-modules/rfc3987 { }; + rfc3987-syntax = callPackage ../development/python-modules/rfc3987-syntax { }; + rfc6555 = callPackage ../development/python-modules/rfc6555 { }; rfc7464 = callPackage ../development/python-modules/rfc7464 { }; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 124e77761ad82..1552fbeab76c8 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -479,6 +479,26 @@ let }; pkgsCross = { + aarch64-android-prebuilt.pkgsStatic = + removePlatforms + [ + # Android NDK package doesn't support building on + "aarch64-darwin" + "aarch64-linux" + + "x86_64-darwin" + ] + { + haskell.packages.ghc912 = { + inherit + (packagePlatforms pkgs.pkgsCross.aarch64-android-prebuilt.pkgsStatic.haskell.packages.ghc912) + ghc + hello + microlens + ; + }; + }; + ghcjs = removePlatforms [ @@ -512,14 +532,6 @@ let ; }; - haskell.packages.ghc910 = { - inherit (packagePlatforms pkgs.pkgsCross.aarch64-android-prebuilt.haskell.packages.ghc910) - ghc - hello - microlens - ; - }; - haskell.packages.ghcHEAD = { inherit (packagePlatforms pkgs.pkgsCross.ghcjs.haskell.packages.ghcHEAD) ghc @@ -529,6 +541,14 @@ let }; }; + ucrt64.haskell.packages.ghc912 = { + inherit (packagePlatforms pkgs.pkgsCross.ucrt64.haskell.packages.ghc912) + ghc + # hello # executables don't build yet + microlens + ; + }; + riscv64 = { # Cross compilation of GHC haskell.compiler = { diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index bc5b83d3db564..f087876479c84 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -259,9 +259,7 @@ let jobs.tests.stdenv.hooks.patch-shebangs.x86_64-linux */ ] - # FIXME: these are just temporarily omitted until fixed - # see https://hydra.nixos.org/build/303330677#tabs-constituents - #++ collect isDerivation jobs.stdenvBootstrapTools + ++ collect isDerivation jobs.stdenvBootstrapTools ++ optionals supportDarwin.x86_64 [ jobs.stdenv.x86_64-darwin jobs.cargo.x86_64-darwin diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index bfc2ee8f664c9..90e842703417f 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -54,8 +54,8 @@ in # `stdenv` without a C compiler. Passing in this helps avoid infinite # recursions, and may eventually replace passing in the full stdenv. - stdenvNoCC ? ( - stdenv.override { + stdenvNoCC ? stdenv.override ( + { cc = null; hasCC = false; }