diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index 93012bbe9dea..d84a0645a234 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -9,6 +9,9 @@ - Node.js default version has been updated from 22 LTS to 24 LTS. This introduces some breaking changes; Refer to the [upstream migration article](https://nodejs.org/en/blog/migrations/v22-to-v24) for details. +- Ruby default version has been updated from 3.3 to 3.4. + Refer to the [upstream release announcement](https://www.ruby-lang.org/en/news/2024/12/25/ruby-3-4-0-released/) for details. + - The Factor programming language has been updated to Version 0.101 bringing various improvements to UI rendering and HiDPI support as well as support for Unicode 17.0.0. Starting from Version 0.100, the Factor VM is compiled with Clang. @@ -160,6 +163,8 @@ - `services.openssh.settings.AcceptEnv` now explicitly defined as an option that takes a list of strings, to facilitate option merging. Setting it to a string value is no longer supported. +- `nodejs-slim` has a `npm` and a `corepack` outputs, and `nodejs` no longer has a `libv8` output. + - All Xfce packages have been moved to top level (e.g. if you previously added `pkgs.xfce.xfce4-whiskermenu-plugin` to `environment.systemPackages`, you will need to change it to `pkgs.xfce4-whiskermenu-plugin`). The `xfce` scope will be removed in NixOS 26.11. - `spacefm` was removed because it appeared to be unmaintained upstream. @@ -186,6 +191,8 @@ - `fetchPnpmDeps` and `pnpmConfigHook` were added as top-level attributes, replacing the now deprecated `pnpm.fetchDeps` and `pnpm.configHook` attributes. +- `buildNpmPackage` now supports `npmDepsCacheVersion`. Set to `2` to enable packument caching, which fixes builds for projects using npm workspaces. + - Added `dell-bios-fan-control` package and service. - `openrgb` was updated to 1.0rc2, which now uses Plugin API version 4. diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 3cb60cea6ae2..6b5e9dd045b9 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -80,7 +80,7 @@ luaepnf,,,,,, luaevent,,,,,, luaexpat,,,,1.4.1-1,,arobyn flosse luaffi,,,https://luarocks.org/dev,,, -luafilesystem,,,,1.8.0-1,,flosse +luafilesystem,,,,,,flosse lualdap,,,,,,aanderse lualine.nvim,,,https://luarocks.org/dev,,, lualogging,,,,,, diff --git a/nixos/modules/services/hardware/pcscd.nix b/nixos/modules/services/hardware/pcscd.nix index 10229c468740..f7e23df84f01 100644 --- a/nixos/modules/services/hardware/pcscd.nix +++ b/nixos/modules/services/hardware/pcscd.nix @@ -106,6 +106,8 @@ in services.pcscd.plugins = [ pkgs.ccid ]; + services.udev.packages = [ pkgs.ccid ]; + systemd.sockets.pcscd.wantedBy = [ "sockets.target" ]; systemd.services.pcscd = { @@ -134,5 +136,12 @@ in "${lib.getExe package} -f -x -c ${cfgFile} ${lib.escapeShellArgs cfg.extraArgs}" ]; }; + + users.users.pcscd = { + isSystemUser = true; + group = "pcscd"; + }; + + users.groups.pcscd = { }; }; } diff --git a/nixos/modules/services/home-automation/deye-dummycloud.nix b/nixos/modules/services/home-automation/deye-dummycloud.nix index 561a6c39d2fe..7c33200c8f6d 100644 --- a/nixos/modules/services/home-automation/deye-dummycloud.nix +++ b/nixos/modules/services/home-automation/deye-dummycloud.nix @@ -37,7 +37,7 @@ in wantedBy = [ "multi-user.target" ]; serviceConfig = { WorkingDirectory = "${pkgs.deye-dummycloud}/lib/node_modules/deye-dummycloud"; - ExecStart = "${pkgs.nodejs}/bin/node app.js"; + ExecStart = "${pkgs.lib.getExe pkgs.nodejs-slim} app.js"; Restart = "always"; User = "deye-dummycloud"; DynamicUser = true; diff --git a/nixos/modules/services/matrix/appservice-irc.nix b/nixos/modules/services/matrix/appservice-irc.nix index 1e842353e3fa..35bf435ea80d 100644 --- a/nixos/modules/services/matrix/appservice-irc.nix +++ b/nixos/modules/services/matrix/appservice-irc.nix @@ -229,7 +229,7 @@ in sed -i "s/^as_token:.*$/$as_token/g" ${registrationFile} fi if ! [ -f "${cfg.settings.ircService.mediaProxy.signingKeyPath}" ]; then - ${lib.getExe pkgs.nodejs} ${pkg}/lib/generate-signing-key.js > "${cfg.settings.ircService.mediaProxy.signingKeyPath}" + ${lib.getExe pkgs.nodejs-slim} ${pkg}/lib/generate-signing-key.js > "${cfg.settings.ircService.mediaProxy.signingKeyPath}" fi # Allow synapse access to the registration if ${pkgs.getent}/bin/getent group matrix-synapse > /dev/null; then diff --git a/nixos/modules/services/misc/atuin.nix b/nixos/modules/services/misc/atuin.nix index 43636b948030..df1eaa9c63fa 100644 --- a/nixos/modules/services/misc/atuin.nix +++ b/nixos/modules/services/misc/atuin.nix @@ -104,7 +104,7 @@ in wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${lib.getExe cfg.package} server start"; + ExecStart = "${lib.getExe' cfg.package "atuin-server"} start"; RuntimeDirectory = "atuin"; RuntimeDirectoryMode = "0700"; DynamicUser = true; diff --git a/nixos/modules/services/monitoring/uptime.nix b/nixos/modules/services/monitoring/uptime.nix index c7c77d6a09e1..53e2d441bd49 100644 --- a/nixos/modules/services/monitoring/uptime.nix +++ b/nixos/modules/services/monitoring/uptime.nix @@ -97,7 +97,7 @@ in NODE_PATH = "${pkgs.nodePackages.node-uptime}/lib/node_modules/node-uptime/node_modules"; }; preStart = "mkdir -p /var/lib/uptime"; - serviceConfig.ExecStart = "${pkgs.nodejs}/bin/node ${pkgs.nodePackages.node-uptime}/lib/node_modules/node-uptime/app.js"; + serviceConfig.ExecStart = "${pkgs.lib.getExe pkgs.nodejs-slim} ${pkgs.nodePackages.node-uptime}/lib/node_modules/node-uptime/app.js"; }; services.mongodb.enable = mkIf (!cfg.usesRemoteMongo) true; @@ -115,7 +115,7 @@ in }; # Ugh, need to wait for web service to be up preStart = if cfg.enableWebService then "sleep 1s" else "mkdir -p /var/lib/uptime"; - serviceConfig.ExecStart = "${pkgs.nodejs}/bin/node ${pkgs.nodePackages.node-uptime}/lib/node_modules/node-uptime/monitor.js"; + serviceConfig.ExecStart = "${pkgs.lib.getExe pkgs.nodejs-slim} ${pkgs.nodePackages.node-uptime}/lib/node_modules/node-uptime/monitor.js"; }; }) ]; diff --git a/nixos/modules/services/web-apps/jitsi-meet.nix b/nixos/modules/services/web-apps/jitsi-meet.nix index 2a63b06a8fab..b7993cfc46dc 100644 --- a/nixos/modules/services/web-apps/jitsi-meet.nix +++ b/nixos/modules/services/web-apps/jitsi-meet.nix @@ -25,7 +25,7 @@ let userJson = pkgs.writeText "user.json" (builtins.toJSON userCfg); in (pkgs.runCommand "${varName}.js" { } '' - ${pkgs.nodejs}/bin/node ${extractor} ${source} ${varName} > default.json + ${pkgs.lib.getExe pkgs.nodejs-slim} ${extractor} ${source} ${varName} > default.json ( echo "var ${varName} = " ${pkgs.jq}/bin/jq -s '.[0] * .[1]' default.json ${userJson} diff --git a/nixos/modules/services/web-apps/lemmy.nix b/nixos/modules/services/web-apps/lemmy.nix index 662007d40640..54194518ca3b 100644 --- a/nixos/modules/services/web-apps/lemmy.nix +++ b/nixos/modules/services/web-apps/lemmy.nix @@ -377,7 +377,7 @@ in serviceConfig = { DynamicUser = true; WorkingDirectory = "${cfg.ui.package}"; - ExecStart = "${pkgs.nodejs}/bin/node ${cfg.ui.package}/dist/js/server.js"; + ExecStart = "${pkgs.lib.getExe pkgs.nodejs-slim} ${cfg.ui.package}/dist/js/server.js"; }; }; }; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 9331257a6dfe..ef52e8d0c3e9 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1234,6 +1234,7 @@ in pass-secret-service = runTest ./pass-secret-service.nix; password-option-override-ordering = runTest ./password-option-override-ordering.nix; patroni = handleTestOn [ "x86_64-linux" ] ./patroni.nix { }; + pcsclite = runTest ./pcsclite.nix; pdfding = import ./web-apps/pdfding { inherit (pkgs) lib; inherit runTest; diff --git a/nixos/tests/installed-tests/appstream-qt.nix b/nixos/tests/installed-tests/appstream-qt.nix index d08187bfe466..0d00cc4f2b4b 100644 --- a/nixos/tests/installed-tests/appstream-qt.nix +++ b/nixos/tests/installed-tests/appstream-qt.nix @@ -1,7 +1,7 @@ { pkgs, makeInstalledTest, ... }: makeInstalledTest { - tested = pkgs.libsForQt5.appstream-qt; + tested = pkgs.kdePackages.appstream-qt; testConfig = { appstream.enable = true; diff --git a/nixos/tests/pcsclite.nix b/nixos/tests/pcsclite.nix new file mode 100644 index 000000000000..de70e7fb9313 --- /dev/null +++ b/nixos/tests/pcsclite.nix @@ -0,0 +1,29 @@ +{ + lib, + ... +}: + +{ + name = "pcsclite"; + meta.maintainers = [ lib.maintainers.bjornfor ]; + + nodes = { + machine = + { pkgs, ... }: + { + environment.systemPackages = [ + pkgs.pcsc-tools + ]; + services.pcscd = { + enable = true; + }; + }; + }; + + testScript = '' + machine.wait_for_unit("pcscd.socket") + + with subtest("client can connect"): + machine.succeed("pcsc_scan -r") + ''; +} diff --git a/nixos/tests/web-apps/sshwifty/default.nix b/nixos/tests/web-apps/sshwifty/default.nix index ac6ac689de71..a90f729a0764 100644 --- a/nixos/tests/web-apps/sshwifty/default.nix +++ b/nixos/tests/web-apps/sshwifty/default.nix @@ -25,7 +25,7 @@ machine.wait_for_unit("sshwifty.service") machine.wait_for_open_port(80) machine.wait_until_succeeds("curl --fail -6 http://localhost/", timeout=60) - machine.wait_until_succeeds("${lib.getExe pkgs.nodejs} ${./sshwifty-test.js}", timeout=60) + machine.wait_until_succeeds("${lib.getExe pkgs.nodejs-slim} ${./sshwifty-test.js}", timeout=60) ''; meta.maintainers = [ lib.maintainers.ungeskriptet ]; diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 8faedc246732..e335403a14a0 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.2035"; + version = "9.1.2109"; outputs = [ "out" @@ -11,7 +11,7 @@ rec { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-x7WosfqYApaY2Vv1X9+2at/A/KqfacuPy53MGtnxk9w="; + hash = "sha256-Lglu940Uf0ZOaitoI41XK4Xgk7e1UeXsfdIxOMgNQ18="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/vim-clap/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/vim-clap/default.nix index 84a3627ad6ef..4b2580557baf 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/vim-clap/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/vim-clap/default.nix @@ -33,6 +33,8 @@ let pname = "maple"; inherit version src meta; + strictDeps = false; + cargoHash = "sha256-RMDlLpPWDLHCRWLz7NAAQhp6FhKA7aNYqx9MCqR8vYM="; cargoPatches = [ @@ -59,6 +61,8 @@ vimUtils.buildVimPlugin { pname = "vim-clap"; inherit version src meta; + strictDeps = false; + postInstall = '' ln -s ${maple}/bin/maple $out/bin/maple ''; diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 9c4d8cdbf427..f08bca6a1e64 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, # Remove gcc and python references removeReferencesTo, @@ -309,6 +310,14 @@ stdenv.mkDerivation ( patches = [ # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227 ./modtool-newmod-permissions.patch + + # Finding `boost_system` fails because the stub compiled library of + # Boost.System, which has been a header-only library since 1.69, was + # removed in 1.89. + (fetchpatch { + url = "https://github.com/gnuradio/gnuradio/commit/d8814e0c3ef68372e5a1093603ef602e2119cd8a.patch"; + hash = "sha256-TQxqsce1AhSjdwaG2IP11QTeOgdJHN6cAAnznBl8eM8="; + }) ]; passthru = shared.passthru // { # Deps that are potentially overridden and are used inside GR plugins - the same version must diff --git a/pkgs/build-support/bintools-wrapper/setup-hook.sh b/pkgs/build-support/bintools-wrapper/setup-hook.sh index c146cbea80e4..93aa7825f9a9 100644 --- a/pkgs/build-support/bintools-wrapper/setup-hook.sh +++ b/pkgs/build-support/bintools-wrapper/setup-hook.sh @@ -55,7 +55,7 @@ fi export NIX_BINTOOLS${role_post}=@out@ for cmd in \ - ar as ld nm objcopy objdump readelf ranlib strip strings size windres + ar as ld nm objcopy objdump readelf ranlib strip strings size windres rc do if PATH=$_PATH type -p "@targetPrefix@${cmd}" > /dev/null @@ -64,6 +64,16 @@ do fi done +# If there is no `rc`, but there is a `windres`, define +# `RC=${WINDRES}`. +if + [[ ! -v "RC${role_post}" ]] && [[ -v "WINDRES${role_post}" ]] +then + windres_var="WINDRES${role_post}" + export "RC${role_post}=${!windres_var}" + unset -v windres_var +fi + # If unset, assume the default hardening flags. : ${NIX_HARDENING_ENABLE="@default_hardening_flags_str@"} export NIX_HARDENING_ENABLE diff --git a/pkgs/build-support/node/build-npm-package/default.nix b/pkgs/build-support/node/build-npm-package/default.nix index 747043e3d12a..1e316d1be9c6 100644 --- a/pkgs/build-support/node/build-npm-package/default.nix +++ b/pkgs/build-support/node/build-npm-package/default.nix @@ -26,6 +26,9 @@ lib.extendMkDerivation { # The output hash of the dependencies for this project. # Can be calculated in advance with prefetch-npm-deps. npmDepsHash ? "", + # Fetcher format version for npmDeps. Set to 2 to enable packument caching + # for workspace support. Changing this will invalidate npmDepsHash. + npmDepsFetcherVersion ? 1, # Whether to force the usage of Git dependencies that have install scripts, but not a lockfile. # Use with care. forceGitDeps ? false, @@ -66,6 +69,7 @@ lib.extendMkDerivation { ; name = "${name}-npm-deps"; hash = npmDepsHash; + fetcherVersion = npmDepsFetcherVersion; }, # Custom npmConfigHook npmConfigHook ? null, @@ -85,6 +89,10 @@ lib.extendMkDerivation { { inherit npmDeps npmBuildScript; + env = (args.env or { }) // { + NIX_NPM_FETCHER_VERSION = npmDepsFetcherVersion; + }; + nativeBuildInputs = nativeBuildInputs ++ [ 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 d954bb010df2..3e7fcbd69133 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 @@ -28,6 +28,29 @@ npmConfigHook() { exit 1 fi + if [[ -e "$npmDeps/.fetcher-version" ]]; then + local -r fetcherVersion=$(cat "$npmDeps/.fetcher-version") + else + local -r fetcherVersion="1" + fi + + # Only run this in buildNpmPackage, this is just for a nicer error message; we trust that + # people using the setup hook directly also know how FODs work. ;) + if [[ -n ${NIX_NPM_FETCHER_VERSION+x} ]] && [[ $NIX_NPM_FETCHER_VERSION != $fetcherVersion ]]; then + echo + echo "ERROR: npmDepsHash is out of date" + echo + echo "The fetcher version in the arguments to buildNpmPackage ($NIX_NPM_FETCHER_VERSION) is not the same as the one in $npmDeps ($fetcherVersion)." + echo + echo "To fix the issue:" + echo '1. Use `lib.fakeHash` as the npmDepsHash value' + echo "2. Build the derivation and wait for it to fail with a hash mismatch" + echo "3. Copy the 'got: sha256-' value back into the npmDepsHash field" + echo + + exit 1 + fi + local -r cacheLockfile="$npmDeps/package-lock.json" if [[ -f npm-shrinkwrap.json ]]; then local -r srcLockfile="$PWD/npm-shrinkwrap.json" @@ -78,7 +101,11 @@ npmConfigHook() { local cachePath - if [ -z "${makeCacheWritable-}" ]; then + # When a given cache key has multiple entries (which is the case with + # fetcher version 2), npm always needs to write to the cache. + # + # TODO(winter): report upstream? + if [ -z "${makeCacheWritable-}" ] && (( fetcherVersion == 1 )); then cachePath="$npmDeps" else echo "Making cache writable" @@ -100,9 +127,10 @@ npmConfigHook() { echo "ERROR: npm failed to install dependencies" echo echo "Here are a few things you can try, depending on the error:" - echo '1. Set `makeCacheWritable = true`' + echo '1. Set `npmDepsFetcherVersion = 2` (and update `npmDepsHash`)' + echo '2. Set `makeCacheWritable = true`' echo " Note that this won't help if npm is complaining about not being able to write to the logs directory -- look above that for the actual error." - echo '2. Set `npmFlags = [ "--legacy-peer-deps" ]`' + echo '3. Set `npmFlags = [ "--legacy-peer-deps" ]`' echo exit 1 diff --git a/pkgs/build-support/node/prefetch-npm-deps/default.nix b/pkgs/build-support/node/prefetch-npm-deps/default.nix index d5c67dbca65e..bfa8fb863e4b 100644 --- a/pkgs/build-support/node/prefetch-npm-deps/default.nix +++ b/pkgs/build-support/node/prefetch-npm-deps/default.nix @@ -215,6 +215,10 @@ # A string with a JSON attrset specifying registry mirrors, for example # {"registry.example.org": "my-mirror.local/registry.example.org"} npmRegistryOverridesString ? config.npmRegistryOverridesString, + # Fetcher format version. Bump this to invalidate all existing hashes. + # Version 1: original format (tarballs only) + # Version 2: includes packuments for workspace support + fetcherVersion ? 1, ... }@args: let @@ -272,6 +276,10 @@ NIX_NPM_REGISTRY_OVERRIDES = npmRegistryOverridesString; + # Fetcher version controls which features are enabled in prefetch-npm-deps + # Version 2+ enables packument fetching for workspace support + NPM_FETCHER_VERSION = toString fetcherVersion; + SSL_CERT_FILE = if ( diff --git a/pkgs/build-support/node/prefetch-npm-deps/src/cacache.rs b/pkgs/build-support/node/prefetch-npm-deps/src/cacache.rs index 403c909dee11..648a9ae1a828 100644 --- a/pkgs/build-support/node/prefetch-npm-deps/src/cacache.rs +++ b/pkgs/build-support/node/prefetch-npm-deps/src/cacache.rs @@ -24,9 +24,16 @@ pub(super) struct Key { #[derive(Serialize, Deserialize)] pub(super) struct Metadata { pub(super) url: Url, + #[serde(rename = "reqHeaders", skip_serializing_if = "Option::is_none")] + pub(super) req_headers: Option, pub(super) options: Options, } +#[derive(Serialize, Deserialize)] +pub struct ReqHeaders { + pub accept: String, +} + #[derive(Serialize, Deserialize)] pub(super) struct Options { pub(super) compress: bool, @@ -58,6 +65,7 @@ impl Cache { url: Url, data: &[u8], integrity: Option, + req_headers: Option, ) -> anyhow::Result<()> { let (algo, hash, integrity) = if let Some(integrity) = integrity { let (algo, hash) = integrity @@ -115,13 +123,27 @@ impl Cache { size: data.len(), metadata: Metadata { url, + req_headers, options: Options { compress: true }, }, })?; - let mut file = File::options().append(true).create(true).open(index_path)?; + let mut file = File::options() + .append(true) + .create(true) + .open(&index_path)?; - write!(file, "{:x}\t{data}", Sha1::new().chain(&data).finalize())?; + // cacache format uses newline as entry separator (see cacache entry-index.js) + // Only add newline prefix if file already has content, to maintain backwards compatibility with previous versions of prefetch-npm-deps, which handled this case incorrectly. + let needs_newline = fs::metadata(&index_path) + .map(|m| m.len() > 0) + .unwrap_or(false); + let prefix = if needs_newline { "\n" } else { "" }; + write!( + file, + "{prefix}{:x}\t{data}", + Sha1::new().chain(&data).finalize() + )?; Ok(()) } diff --git a/pkgs/build-support/node/prefetch-npm-deps/src/main.rs b/pkgs/build-support/node/prefetch-npm-deps/src/main.rs index cdac7ef84c0b..2882aee9ec20 100644 --- a/pkgs/build-support/node/prefetch-npm-deps/src/main.rs +++ b/pkgs/build-support/node/prefetch-npm-deps/src/main.rs @@ -1,11 +1,12 @@ #![warn(clippy::pedantic)] -use crate::cacache::{Cache, Key}; +use crate::cacache::{Cache, Key, ReqHeaders}; use anyhow::{anyhow, bail}; +use log::info; use rayon::prelude::*; use serde_json::{Map, Value}; use std::{ - collections::HashMap, + collections::{HashMap, HashSet}, env, fs, path::{Path, PathBuf}, process, @@ -22,6 +23,178 @@ fn cache_map_path() -> Option { env::var_os("CACHE_MAP_PATH").map(PathBuf::from) } +/// Get the packument URL for a package name +fn get_packument_url(registry: &str, package_name: &str) -> anyhow::Result { + // URL-encode the package name for scoped packages + let encoded_name = package_name.replace('/', "%2f"); + Url::parse(&format!("{registry}/{encoded_name}")) + .map_err(|e| anyhow!("failed to construct packument URL: {e}")) +} + +/// Normalize packument data to ensure determinism. +/// +/// Filters to whitelisted fields and requested versions only. +/// Allowed top-level fields in normalized packuments. +/// +/// For lockfile-based installs, versions are exact (e.g., "4.17.21") so npm-pick-manifest +/// just does a direct `versions[ver]` lookup. Tarballs are fetched via the resolved URL. +const ALLOWED_TOP_LEVEL_FIELDS: &[&str] = &["name", "versions"]; + +/// Allowed fields in version objects. +/// +/// Based on analysis of pacote, npm-pick-manifest, npm-install-checks, and arborist. +/// Only fields actually read during `npm install` are included. +const ALLOWED_VERSION_FIELDS: &[&str] = &[ + "name", + "version", + // Dependencies + "dependencies", + "devDependencies", + "peerDependencies", + "peerDependenciesMeta", + "optionalDependencies", + "bundleDependencies", + "bundledDependencies", + // Distribution (tarball URL and integrity) + "dist", + // Executables + "bin", + // Platform constraints (npm-install-checks) + "engines", + "os", + "cpu", + // Lifecycle scripts + "scripts", +]; + +/// Allowed fields in `dist` sub-objects. +/// +/// Only fields that npm reads during `npm install` are included. +/// Excluded volatile fields: +/// - `signatures`: changes when npm rotates registry signing keys +/// - `npm-signature`: legacy signature format, also mutable +/// - `attestations`: provenance attestations, can be added/updated post-publish +/// - `fileCount`, `unpackedSize`: informational only, not used during install +const ALLOWED_DIST_FIELDS: &[&str] = &[ + "tarball", // URL to download the package tarball + "integrity", // SRI hash for verification (e.g., sha512-...) + "shasum", // SHA-1 fallback hash for older lockfiles +]; + +fn normalize_packument( + package_name: &str, + data: &[u8], + requested_versions: &HashSet, +) -> anyhow::Result> { + let mut json: Value = serde_json::from_slice(data) + .map_err(|e| anyhow!("failed to parse packument JSON for {package_name}: {e}"))?; + + let obj = json + .as_object_mut() + .ok_or_else(|| anyhow!("packument for {package_name} is not a JSON object"))?; + + // Keep only whitelisted top-level fields to ensure determinism + obj.retain(|key, _| ALLOWED_TOP_LEVEL_FIELDS.contains(&key.as_str())); + + // Filter and normalize versions + if let Some(Value::Object(versions)) = obj.get_mut("versions") { + // Only keep versions that are in the lockfile + versions.retain(|version, _| requested_versions.contains(version)); + + // Normalize each version object to only include necessary fields + for version_val in versions.values_mut() { + if let Some(version_obj) = version_val.as_object_mut() { + version_obj.retain(|key, _| ALLOWED_VERSION_FIELDS.contains(&key.as_str())); + + // Normalize the dist sub-object to strip volatile fields + // (signatures, npm-signature, attestations, fileCount, unpackedSize) + if let Some(Value::Object(dist_obj)) = version_obj.get_mut("dist") { + dist_obj.retain(|key, _| ALLOWED_DIST_FIELDS.contains(&key.as_str())); + } + } + } + } + + serde_json::to_vec(&json) + .map_err(|e| anyhow!("failed to re-serialize packument for {package_name}: {e}")) +} + +/// Fetch and cache packuments (package metadata) for all packages. +/// +/// This is needed because npm may query package metadata for optional peer dependencies +/// and for workspace packages. +/// +/// npm's cache policy checks that the Accept header matches between the cached +/// request and the new request. npm can request packuments with two different headers: +/// 1. "corgiDoc" (abbreviated metadata) - used initially +/// 2. "fullDoc" (full metadata) - used when npm needs full package info (e.g., workspaces) +/// +/// We cache both versions to ensure cache hits regardless of which header npm uses. +/// See: pacote/lib/registry.js and @npmcli/arborist/lib/arborist/build-ideal-tree.js +fn fetch_packuments( + cache: &Cache, + package_versions: HashMap>, +) -> anyhow::Result<()> { + const CORGI_DOC: &str = + "application/vnd.npm.install-v1+json; q=1.0, application/json; q=0.8, */*"; + const FULL_DOC: &str = "application/json"; + + info!("Fetching {} packuments", package_versions.len()); + + package_versions + .into_par_iter() + .try_for_each(|(package_name, requested_versions)| { + let packument_url = get_packument_url("https://registry.npmjs.org", &package_name)?; + + match util::get_url_body_with_retry(&packument_url) { + Ok(packument_data) => { + let normalized_data = + normalize_packument(&package_name, &packument_data, &requested_versions)?; + + // npm's make-fetch-happen uses the URL-encoded form for cache keys + // e.g., "https://registry.npmjs.org/@types%2freact-dom" not "@types/react-dom" + // We must use the encoded form in both the cache key string AND the metadata URL + + // Cache with corgiDoc header (for initial requests) + cache + .put( + format!("make-fetch-happen:request-cache:{packument_url}"), + packument_url.clone(), + &normalized_data, + None, // Packuments don't have integrity hashes + Some(ReqHeaders { + accept: String::from(CORGI_DOC), + }), + ) + .map_err(|e| { + anyhow!("couldn't insert packument cache entry (corgi) for {package_name}: {e:?}") + })?; + + // Cache with fullDoc header (for workspace/full metadata requests) + cache + .put( + format!("make-fetch-happen:request-cache:{packument_url}"), + packument_url.clone(), + &normalized_data, + None, + Some(ReqHeaders { + accept: String::from(FULL_DOC), + }), + ) + .map_err(|e| { + anyhow!("couldn't insert packument cache entry (full) for {package_name}: {e:?}") + })?; + } + Err(e) => { + // Log but don't fail - some packages might not need packuments + info!("Warning: couldn't fetch packument for {package_name}: {e}"); + } + } + + Ok::<_, anyhow::Error>(()) + }) +} + /// `fixup_lockfile` rewrites `integrity` hashes to match cache and removes the `integrity` field from Git dependencies. /// /// Sometimes npm has multiple instances of a given `resolved` URL that have different types of `integrity` hashes (e.g. SHA-1 @@ -157,9 +330,21 @@ fn map_cache() -> anyhow::Result> { if entry.file_type().is_file() { let content = fs::read_to_string(entry.path())?; - let key: Key = serde_json::from_str(content.split_ascii_whitespace().nth(1).unwrap())?; + // cacache index format: each line is \t + // Multiple entries can exist in the same file (e.g., same URL with different headers) + for line in content.lines() { + if line.is_empty() { + continue; + } + // Split on tab, not whitespace, because JSON values may contain spaces + let json_part = line + .split_once('\t') + .map(|(_, json)| json) + .ok_or_else(|| anyhow!("invalid cache index entry: missing tab separator"))?; + let key: Key = serde_json::from_str(json_part)?; - hashes.insert(key.metadata.url, key.integrity); + hashes.insert(key.metadata.url, key.integrity); + } } } @@ -241,6 +426,26 @@ fn main() -> anyhow::Result<()> { let cache = Cache::new(out.join("_cacache")); cache.init()?; + // Collect package names and their versions from the lockfile for packument filtering. + // For non-aliased packages: extract from lockfile keys like "node_modules/@scope/name" -> "@scope/name" + // For aliased packages: the name is already the real package name (e.g., "string-width" not "string-width-cjs") + // We only care about packages that have a version string (registry packages). + let mut package_versions: HashMap> = HashMap::new(); + for p in &packages { + if let Some(version) = &p.version { + let pkg_name = p + .name + .rsplit_once("node_modules/") + .map(|(_, name)| name.to_string()) + .unwrap_or_else(|| p.name.clone()); + package_versions + .entry(pkg_name) + .or_default() + .insert(version.to_string()); + } + } + + // Fetch and cache tarballs packages.into_par_iter().try_for_each(|package| { let tarball = package .tarball() @@ -253,12 +458,24 @@ fn main() -> anyhow::Result<()> { package.url, &tarball, integrity, + None, // tarballs don't need special request headers ) .map_err(|e| anyhow!("couldn't insert cache entry for {}: {e:?}", package.name))?; Ok::<_, anyhow::Error>(()) })?; + // Fetch and cache packuments (package metadata) - only for fetcher version 2+ + let fetcher_version: u32 = env::var("NPM_FETCHER_VERSION") + .ok() + .and_then(|v| v.parse().ok()) + .unwrap_or(1); + + if fetcher_version >= 2 { + fetch_packuments(&cache, package_versions)?; + fs::write(out.join(".fetcher-version"), format!("{fetcher_version}"))?; + } + fs::write(out.join("package-lock.json"), lock_content)?; if print_hash { @@ -422,4 +639,5 @@ mod tests { Ok(()) } + } diff --git a/pkgs/build-support/node/prefetch-npm-deps/src/parse/lock.rs b/pkgs/build-support/node/prefetch-npm-deps/src/parse/lock.rs index 17c6c633ee8f..c420fb1e3ede 100644 --- a/pkgs/build-support/node/prefetch-npm-deps/src/parse/lock.rs +++ b/pkgs/build-support/node/prefetch-npm-deps/src/parse/lock.rs @@ -25,7 +25,12 @@ pub(super) fn packages(content: &str) -> anyhow::Result> { .unwrap_or_default() .into_iter() .filter(|(n, p)| !n.is_empty() && matches!(p.resolved, Some(UrlOrString::Url(_)))) - .map(|(n, p)| Package { name: Some(n), ..p }) + .map(|(n, p)| Package { + // Use the package's own name if present (for aliases like string-width-cjs -> string-width), + // otherwise extract from the lockfile key + name: Some(p.name.unwrap_or(n)), + ..p + }) .collect(), _ => bail!( "We don't support lockfile version {}, please file an issue.", @@ -73,6 +78,7 @@ struct OldPackage { pub(super) struct Package { #[serde(default)] pub(super) name: Option, + pub(super) version: Option, pub(super) resolved: Option, pub(super) integrity: Option, } @@ -249,6 +255,7 @@ fn to_new_packages( new.push(Package { name: Some(name), + version: None, // v1 lockfiles don't include version in the same structure resolved: if matches!(package.version, UrlOrString::Url(_)) { Some(package.version) } else { @@ -310,6 +317,7 @@ mod tests { assert_eq!(new.len(), 1, "new packages map should contain 1 value"); assert_eq!(new[0], Package { name: Some(String::from("sqlite3")), + version: None, resolved: Some(UrlOrString::Url(Url::parse("git+ssh://git@github.com/mapbox/node-sqlite3.git#593c9d498be2510d286349134537e3bf89401c4a").unwrap())), integrity: None }); diff --git a/pkgs/build-support/node/prefetch-npm-deps/src/parse/mod.rs b/pkgs/build-support/node/prefetch-npm-deps/src/parse/mod.rs index 6c54d404f3cb..3e6f5019ea33 100644 --- a/pkgs/build-support/node/prefetch-npm-deps/src/parse/mod.rs +++ b/pkgs/build-support/node/prefetch-npm-deps/src/parse/mod.rs @@ -112,6 +112,7 @@ pub fn lockfile( #[derive(Debug)] pub struct Package { pub name: String, + pub version: Option, pub url: Url, specifics: Specifics, } @@ -175,6 +176,7 @@ impl Package { Ok(Package { name: pkg.name.unwrap(), + version: pkg.version, url: resolved, specifics, }) diff --git a/pkgs/build-support/nuke-references/default.nix b/pkgs/build-support/nuke-references/default.nix index 13f2061b5aa8..6eab2ecb7144 100644 --- a/pkgs/build-support/nuke-references/default.nix +++ b/pkgs/build-support/nuke-references/default.nix @@ -5,36 +5,23 @@ { lib, - stdenvNoCC, + replaceVarsWith, perl, signingUtils, + stdenvNoCC, shell ? stdenvNoCC.shell, }: - -stdenvNoCC.mkDerivation { - name = "nuke-references"; - - strictDeps = true; - enableParallelBuilding = true; - dontUnpack = true; - dontConfigure = true; - dontBuild = true; - - installPhase = '' - mkdir -p $out/bin - substituteAll ${./nuke-refs.sh} $out/bin/nuke-refs - chmod a+x $out/bin/nuke-refs - ''; - - # FIXME: get rid of perl dependency. - env = { - inherit perl; +replaceVarsWith { + src = ./nuke-refs; + replacements = { + inherit perl; # FIXME: get rid of perl dependency. inherit (builtins) storeDir; shell = lib.getBin shell + (shell.shellPath or ""); signingUtils = lib.optionalString ( stdenvNoCC.targetPlatform.isDarwin && stdenvNoCC.targetPlatform.isAarch64 ) signingUtils; }; - + dir = "bin"; + isExecutable = true; meta.mainProgram = "nuke-refs"; } diff --git a/pkgs/build-support/nuke-references/nuke-refs.sh b/pkgs/build-support/nuke-references/nuke-refs similarity index 100% rename from pkgs/build-support/nuke-references/nuke-refs.sh rename to pkgs/build-support/nuke-references/nuke-refs diff --git a/pkgs/build-support/pkg-config-wrapper/default.nix b/pkgs/build-support/pkg-config-wrapper/default.nix index cb0eb5635bee..2d0b29bf76d6 100644 --- a/pkgs/build-support/pkg-config-wrapper/default.nix +++ b/pkgs/build-support/pkg-config-wrapper/default.nix @@ -5,6 +5,9 @@ stdenvNoCC, lib, buildPackages, + replaceVars, + makeSetupHook, + expand-response-params, pkg-config, baseBinName ? "pkg-config", propagateDoc ? pkg-config != null && pkg-config ? man, @@ -35,6 +38,7 @@ let # See description in cc-wrapper. suffixSalt = replaceStrings [ "-" "." ] [ "_" "_" ] targetPlatform.config; + wrapperName = "PKG_CONFIG_WRAPPER"; wrapperBinName = "${targetPrefix}${baseBinName}"; in @@ -48,50 +52,90 @@ stdenv.mkDerivation { outputs = [ "out" ] ++ optionals propagateDoc ([ "man" ] ++ optional (pkg-config ? doc) "doc"); - passthru = { - inherit targetPrefix suffixSalt; - inherit pkg-config; - }; - strictDeps = true; dontBuild = true; dontConfigure = true; dontUnpack = true; - # Additional flags passed to pkg-config. - env.addFlags = optionalString stdenv.targetPlatform.isStatic "--static"; + installPhase = + let + addFlags = optionalString stdenv.targetPlatform.isStatic "--static"; + shell = getBin stdenvNoCC.shell + stdenvNoCC.shell.shellPath or ""; + prog = "${getBin pkg-config}/bin/${baseBinName}"; + in + '' + mkdir -p $out/bin $out/nix-support + wrap() { + local dst="$1" + local wrapper="$2" + export prog="$3" + # Do not take variables from env but substitute them explicitly + # to prepare for structuredAttrs + # Avoid using a nested derivation since we need to substitute $out + substitute "$wrapper" "$out/bin/$dst" \ + --replace-fail "@suffixSalt@" "${suffixSalt}" \ + --replace-fail "@shell@" "${shell}" \ + --replace-fail "@prog@" "$prog" \ + --replace-fail "@out@" "$out" \ + --replace-fail "@addFlags@" "${addFlags}" - installPhase = '' - mkdir -p $out/bin $out/nix-support + chmod +x "$out/bin/$dst" + } - wrap() { - local dst="$1" - local wrapper="$2" - export prog="$3" - substituteAll "$wrapper" "$out/bin/$dst" - chmod +x "$out/bin/$dst" - } + echo $pkg-config > $out/nix-support/orig-pkg-config - echo $pkg-config > $out/nix-support/orig-pkg-config + wrap ${wrapperBinName} ${./pkg-config-wrapper.sh} "${getBin pkg-config}/bin/${baseBinName}" + '' + # symlink in share for autoconf to find macros - wrap ${wrapperBinName} ${./pkg-config-wrapper.sh} "${getBin pkg-config}/bin/${baseBinName}" - '' - # symlink in share for autoconf to find macros + # TODO(@Ericson2314): in the future just make the unwrapped pkg-config a + # propagated dep once we can rely on downstream deps coming first in + # search paths. (https://github.com/NixOS/nixpkgs/pull/31414 took a crack + # at this.) + + '' + ln -s ${pkg-config}/share $out/share + ''; - # TODO(@Ericson2314): in the future just make the unwrapped pkg-config a - # propagated dep once we can rely on downstream deps coming first in - # search paths. (https://github.com/NixOS/nixpkgs/pull/31414 took a crack - # at this.) - + '' - ln -s ${pkg-config}/share $out/share - ''; - - setupHooks = [ - ../setup-hooks/role.bash - ./setup-hook.sh - ]; + setupHooks = + let + roleHook = makeSetupHook rec { + name = "pkg-config-role-hook"; + substitutions = { + inherit + name + suffixSalt + wrapperName + ; + }; + } ../setup-hooks/role.bash; + setupHook = makeSetupHook { + name = "pkgs-config-setup-hook"; + substitutions = { + inherit + targetPrefix + baseBinName + ; + }; + } ./setup-hook.sh; + in + [ + "${roleHook}/nix-support/setup-hook" + "${setupHook}/nix-support/setup-hook" + ]; postFixup = + let + addFlags = replaceVars ./add-flags.sh { inherit suffixSalt; }; + utils = replaceVars ../wrapper-common/utils.bash { + inherit + suffixSalt + wrapperName + ; + inherit (targetPlatform) darwinMinVersion; + expandResponseParams = "${expand-response-params}/bin/expand-response-params"; + }; + + in ## ## User env support ## @@ -115,8 +159,8 @@ stdenv.mkDerivation { ) + '' - substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh - substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash + install -m444 -T ${addFlags} $out/nix-support/add-flags.sh + install -m444 -T ${utils} $out/nix-support/utils.bash '' ## @@ -124,10 +168,14 @@ stdenv.mkDerivation { ## + extraBuildCommands; - env = { - shell = getBin stdenvNoCC.shell + stdenvNoCC.shell.shellPath or ""; - wrapperName = "PKG_CONFIG_WRAPPER"; - inherit targetPrefix suffixSalt baseBinName; + passthru = { + inherit + targetPrefix + suffixSalt + pkg-config + baseBinName + wrapperName + ; }; meta = diff --git a/pkgs/build-support/remove-references-to/default.nix b/pkgs/build-support/remove-references-to/default.nix index 13d3eb8a78d8..95fa6e402fb8 100644 --- a/pkgs/build-support/remove-references-to/default.nix +++ b/pkgs/build-support/remove-references-to/default.nix @@ -5,31 +5,21 @@ { lib, - stdenvNoCC, + replaceVarsWith, signingUtils, + stdenvNoCC, shell ? stdenvNoCC.shell, }: - -stdenvNoCC.mkDerivation { - name = "remove-references-to"; - - dontUnpack = true; - dontConfigure = true; - dontBuild = true; - - installPhase = '' - mkdir -p $out/bin - substituteAll ${./remove-references-to.sh} $out/bin/remove-references-to - chmod a+x $out/bin/remove-references-to - ''; - - env = { +replaceVarsWith { + src = ./remove-references-to; + replacements = { inherit (builtins) storeDir; shell = lib.getBin shell + (shell.shellPath or ""); signingUtils = lib.optionalString ( stdenvNoCC.targetPlatform.isDarwin && stdenvNoCC.targetPlatform.isAarch64 ) signingUtils; }; - + dir = "bin"; + isExecutable = true; 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 similarity index 100% rename from pkgs/build-support/remove-references-to/remove-references-to.sh rename to pkgs/build-support/remove-references-to/remove-references-to diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index 3f3c1bc3a0bc..8d102e161527 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -780,6 +780,8 @@ rec { # but users are likely passing non-substitution arguments through substitutions # turn off __structuredAttrs to unbreak substituteAll __structuredAttrs = false; + pname = name; + version = lib.trivial.release + "pre-git"; inherit meta; inherit depsTargetTargetPropagated; inherit propagatedBuildInputs; diff --git a/pkgs/build-support/writers/scripts.nix b/pkgs/build-support/writers/scripts.nix index 8f2110bdfa58..9987031a047b 100644 --- a/pkgs/build-support/writers/scripts.nix +++ b/pkgs/build-support/writers/scripts.nix @@ -1086,7 +1086,7 @@ rec { in writeDash name '' export NODE_PATH=${node-env}/lib/node_modules - exec ${lib.getExe pkgs.nodejs} ${pkgs.writeText "js" content} "$@" + exec ${lib.getExe pkgs.nodejs-slim} ${pkgs.writeText "js" content} "$@" ''; /** diff --git a/pkgs/by-name/aa/aalib/package.nix b/pkgs/by-name/aa/aalib/package.nix index ed722db84c0d..576f7ffd2550 100644 --- a/pkgs/by-name/aa/aalib/package.nix +++ b/pkgs/by-name/aa/aalib/package.nix @@ -31,16 +31,24 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./darwin.patch ]; - # The fuloong2f is not supported by aalib still - preConfigure = '' + preConfigure = # The configure script does the correct thing when 'system' is already set # Export it explicitly in case __structuredAttrs is true. - export system - appendToVar configureFlags \ - "--bindir=$bin/bin" \ - "--includedir=$dev/include" \ - "--libdir=$out/lib" - ''; + '' + export system + appendToVar configureFlags \ + "--bindir=$bin/bin" \ + "--includedir=$dev/include" \ + "--libdir=$out/lib" + '' + # There is a check for linux-gnu on POWER that disables shared library creation if /lib/ld.so.1 doesn't exists + # (which it never does for us), because it assumes that it is then running on / targeting MkLinux, which supposedly + # didn't support shared libraries. + # MkLinux is discontinued, regular Linux supports POWER now. Delete the case and allow shared libraries to be made. + + '' + substituteInPlace ltconfig \ + --replace-fail 'powerpc*) dynamic_linker=no ;;' "" + ''; buildInputs = [ ncurses ]; diff --git a/pkgs/by-name/ad/ada/package.nix b/pkgs/by-name/ad/ada/package.nix index a6d2ef1fe989..ce13ea4d4473 100644 --- a/pkgs/by-name/ad/ada/package.nix +++ b/pkgs/by-name/ad/ada/package.nix @@ -3,27 +3,57 @@ stdenv, fetchFromGitHub, cmake, + gbenchmark, + gtest, + simdjson, + simdutf, + testers, + validatePkgConfig, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "ada"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "ada-url"; repo = "ada"; tag = "v${finalAttrs.version}"; - hash = "sha256-2xrued35FRqmtZjrMTBtl5r/TB/pXNhhcKOfuwjxrhc="; + hash = "sha256-+aXZY6JFfbw1N+EkenPhfp6ErUJFnbiJsgHpQq36Os4="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + validatePkgConfig + ]; + buildInputs = [ simdutf ]; + + doCheck = true; + checkInputs = [ + simdjson + gtest + gbenchmark + ]; cmakeFlags = [ # uses CPM that requires network access (lib.cmakeBool "ADA_TOOLS" false) - (lib.cmakeBool "ADA_TESTING" false) + (lib.cmakeBool "ADA_TESTING" finalAttrs.finalPackage.doCheck) + (lib.cmakeBool "ADA_USE_SIMDUTF" true) + (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) + (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true) + (lib.cmakeBool "CPM_USE_LOCAL_PACKAGES" true) ]; + passthru = { + updateScript = nix-update-script { }; + + tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + }; + meta = { description = "WHATWG-compliant and fast URL parser written in modern C"; homepage = "https://github.com/ada-url/ada"; @@ -33,5 +63,6 @@ stdenv.mkDerivation (finalAttrs: { ]; maintainers = with lib.maintainers; [ nickcao ]; platforms = lib.platforms.all; + pkgConfigModules = [ "ada" ]; }; }) diff --git a/pkgs/by-name/al/alsa-topology-conf/package.nix b/pkgs/by-name/al/alsa-topology-conf/package.nix index f74378c61ebf..e0ab9ef654f4 100644 --- a/pkgs/by-name/al/alsa-topology-conf/package.nix +++ b/pkgs/by-name/al/alsa-topology-conf/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { - name = "alsa-topology-conf-${version}"; +stdenv.mkDerivation (finalAttrs: { + pname = "alsa-topology-conf"; version = "1.2.5.1"; src = fetchurl { - url = "mirror://alsa/lib/${name}.tar.bz2"; + url = "mirror://alsa/lib/alsa-topology-conf-${finalAttrs.version}.tar.bz2"; hash = "sha256-98W64VRavNc4JLyX9OcsNA4Rq+oYi6DxwG9eCtd2sXk="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.roastiek ]; platforms = lib.platforms.linux ++ lib.platforms.freebsd; }; -} +}) diff --git a/pkgs/by-name/ar/arrow-cpp/package.nix b/pkgs/by-name/ar/arrow-cpp/package.nix index 35d801df0f95..3035c88fc08f 100644 --- a/pkgs/by-name/ar/arrow-cpp/package.nix +++ b/pkgs/by-name/ar/arrow-cpp/package.nix @@ -69,8 +69,8 @@ let name = "arrow-testing"; owner = "apache"; repo = "arrow-testing"; - rev = "9a02925d1ba80bd493b6d4da6e8a777588d57ac4"; - hash = "sha256-dEFCkeQpQrU61uCwJp/XB2umbQHjXtzado36BGChoc0="; + rev = "19dda67f485ffb3ffa92f4c6fa083576ef052d58"; + hash = "sha256-mna6I/a5ZxMLdWN0QfCsgsre6yMeuSv4syX5ePGLhfg="; }; parquet-testing = fetchFromGitHub { @@ -81,7 +81,7 @@ let hash = "sha256-Xd6o3RT6Q0tPutV77J0P1x3F6U3RHdCBOKGUKtkQCKk="; }; - version = "22.0.0"; + version = "23.0.0"; in stdenv.mkDerivation (finalAttrs: { pname = "arrow-cpp"; @@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "apache"; repo = "arrow"; rev = "apache-arrow-${version}"; - hash = "sha256-i4Smt43oi4sddUt3qH7ePjensBSfPW+w/ExLVcVNKic="; + hash = "sha256-BluUlbtGJwvlrpN/c/KziOfFh5dvzZyuCy4JZkkFea4="; }; sourceRoot = "${finalAttrs.src.name}/cpp"; @@ -120,8 +120,8 @@ stdenv.mkDerivation (finalAttrs: { ARROW_XSIMD_URL = fetchFromGitHub { owner = "xtensor-stack"; repo = "xsimd"; - tag = "13.0.0"; - hash = "sha256-qElJYW5QDj3s59L3NgZj5zkhnUMzIP2mBa1sPks3/CE="; + tag = "14.0.0"; + hash = "sha256-ijNoHb6xC+OHJbUB4j1PRsoHMzjrnOHVoDRe/nKguDo="; }; ARROW_SUBSTRAIT_URL = fetchFromGitHub { diff --git a/pkgs/by-name/as/asio/boost-1.89.patch b/pkgs/by-name/as/asio/boost-1.89.patch new file mode 100644 index 000000000000..a77f556b7f3d --- /dev/null +++ b/pkgs/by-name/as/asio/boost-1.89.patch @@ -0,0 +1,16 @@ +diff --git a/src/examples/cpp11/Makefile.am b/src/examples/cpp11/Makefile.am +index a132a469f..65eb90a6d 100644 +--- a/src/examples/cpp11/Makefile.am ++++ b/src/examples/cpp11/Makefile.am +@@ -289,9 +289,9 @@ endif + + if HAVE_BOOST_COROUTINE + spawn_echo_server_SOURCES = spawn/echo_server.cpp +-spawn_echo_server_LDADD = $(LDADD) -lboost_coroutine -lboost_context -lboost_thread -lboost_chrono -lboost_system ++spawn_echo_server_LDADD = $(LDADD) -lboost_coroutine -lboost_context -lboost_thread -lboost_chrono + spawn_parallel_grep_SOURCES = spawn/parallel_grep.cpp +-spawn_parallel_grep_LDADD = $(LDADD) -lboost_coroutine -lboost_context -lboost_thread -lboost_chrono -lboost_system ++spawn_parallel_grep_LDADD = $(LDADD) -lboost_coroutine -lboost_context -lboost_thread -lboost_chrono + endif + + EXTRA_DIST = \ diff --git a/pkgs/by-name/as/asio/package.nix b/pkgs/by-name/as/asio/package.nix index 01b982933956..952ae79565ef 100644 --- a/pkgs/by-name/as/asio/package.nix +++ b/pkgs/by-name/as/asio/package.nix @@ -29,6 +29,14 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/asio"; + patches = [ + # Linking against `boost_system` fails because the stub compiled library + # of Boost.System, which has been a header-only library since 1.69, was + # removed in 1.89. + # Upstream issue: https://github.com/chriskohlhoff/asio/issues/1716 + ./boost-1.89.patch + ]; + nativeBuildInputs = [ autoreconfHook pkg-config diff --git a/pkgs/by-name/at/at-spi2-core/package.nix b/pkgs/by-name/at/at-spi2-core/package.nix index 06e85ff8ccc5..9d352c0b3fe9 100644 --- a/pkgs/by-name/at/at-spi2-core/package.nix +++ b/pkgs/by-name/at/at-spi2-core/package.nix @@ -27,9 +27,9 @@ systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemdLibs, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "at-spi2-core"; - version = "2.58.2"; + version = "2.58.3"; outputs = [ "out" @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { separateDebugInfo = true; src = fetchurl { - url = "mirror://gnome/sources/at-spi2-core/${lib.versions.majorMinor version}/at-spi2-core-${version}.tar.xz"; - hash = "sha256-ooI7li7RbN1csfxTZQKf0hg5TYUqzUCYsyGFS9ZpL24="; + url = "mirror://gnome/sources/at-spi2-core/${lib.versions.majorMinor finalAttrs.version}/at-spi2-core-${finalAttrs.version}.tar.xz"; + hash = "sha256-sPq+psl0LtqMnGdfm4wdG6u6HagtoD6hEDcQIzcXwbA="; }; nativeBuildInputs = [ @@ -122,4 +122,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.gnome ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/at/atuin/package.nix b/pkgs/by-name/at/atuin/package.nix index a55c5cad8a49..adbdc2974326 100644 --- a/pkgs/by-name/at/atuin/package.nix +++ b/pkgs/by-name/at/atuin/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "atuin"; - version = "18.11.0"; + version = "18.12.1"; src = fetchFromGitHub { owner = "atuinsh"; repo = "atuin"; tag = "v${finalAttrs.version}"; - hash = "sha256-yjsCNN15E06te6cueSZksg7mcMyx2FiXKrbGAEcQWmg="; + hash = "sha256-ojIL8Iy74UgFE4Mp75oHWbZDsFRKRhOBdkPP/TtZpz4="; }; - cargoHash = "sha256-xaALIVJpMek4nbSozxtOEWivRDlMmKdu6KqKiNMp0jk="; + cargoHash = "sha256-KamAFi6OHE38ss8rIncNecNMVjd8gAeSWMh8G7Yb/rQ="; # atuin's default features include 'check-updates', which do not make sense # for distribution builds. List all other default features. @@ -27,7 +27,6 @@ rustPlatform.buildRustPackage (finalAttrs: { buildFeatures = [ "client" "sync" - "server" "clipboard" "daemon" ]; diff --git a/pkgs/by-name/au/auto-patchelf/source/auto-patchelf.py b/pkgs/by-name/au/auto-patchelf/source/auto-patchelf.py index 360756375f48..33813168f560 100644 --- a/pkgs/by-name/au/auto-patchelf/source/auto-patchelf.py +++ b/pkgs/by-name/au/auto-patchelf/source/auto-patchelf.py @@ -9,10 +9,10 @@ import json from fnmatch import fnmatch from collections import defaultdict from contextlib import contextmanager -from dataclasses import dataclass +from dataclasses import dataclass, asdict from itertools import chain from pathlib import Path, PurePath -from typing import DefaultDict, Generator, Iterator, Optional +from typing import DefaultDict, Generator, Iterator, Optional, Protocol from elftools.common.exceptions import ELFError # type: ignore from elftools.elf.dynamic import DynamicSection # type: ignore @@ -233,40 +233,107 @@ def find_first_matching_rpath_with_origin(binary: Path, lib_dir: Path, rpaths: l return Path(rpath) return None +class Event(Protocol): + """Protocol for loggable events that occur during the auto-patchelf process.""" + def to_human_readable_str(self) -> str: ... + + +@dataclass +class SkipFile: + file: Path # The file being skipped + reason: str # Why the file is being skipped + + def to_human_readable_str(self) -> str: + return f"skipping {self.file} because {self.reason}" + + +@dataclass +class SetInterpreter: + file: Path # The file being patched + interpreter_path: Path # The interpreter being set + + def to_human_readable_str(self) -> str: + return f"setting interpreter of {self.file}" + + +@dataclass +class IgnoredDependency: + file: Path # The file that contains the ignored dependency + name: Path # The name of the dependency + pattern: str # The pattern that caused this missing dep to be ignored + + def to_human_readable_str(self) -> str: + return f"warn: auto-patchelf ignoring missing {self.name} wanted by {self.file}" @dataclass class Dependency: - file: Path # The file that contains the dependency - name: Path # The name of the dependency - found: bool = False # Whether it was found somewhere + file: Path # The file that contains the dependency + name: Path # The name of the dependency + found: bool = False # Whether it was found somewhere + location: Optional[Path] = None # Where the dependency was found (if found) + + def to_human_readable_str(self) -> str: + if self.found: + return f" {self.name} -> found: {self.location}" + else: + return f" {self.name} -> not found!" -def auto_patchelf_file(path: Path, runtime_deps: list[Path], append_rpaths: list[Path] = [], keep_libc: bool = False, preserve_origin: bool = False, extra_args: list[str] = []) -> list[Dependency]: +@dataclass +class SetRpath: + file: Path # The file being patched + rpath: str # The RPATH being set + + def to_human_readable_str(self) -> str: + return f"setting RPATH to: {self.rpath}" + + +class Logger: + """Outputs events in either structured (JSON) or human-readable format.""" + + def __init__(self, structured: bool = False): + self.structured = structured + + def debug(self, message: str): + """Output a debug log message (text), only if not in structured mode.""" + if not self.structured: + print(message) + + def log(self, event: Event) -> None: + """Output an event immediately. In structured mode, output JSON. In human-readable mode, output human-readable text.""" + if self.structured: + event_type = type(event).__name__ + event_data = asdict(event) + print(json.dumps({event_type: event_data}, default=str)) + else: + print(event.to_human_readable_str()) + + + +def auto_patchelf_file(logger: Logger, path: Path, runtime_deps: list[Path], append_rpaths: list[Path] = [], keep_libc: bool = False, preserve_origin: bool = False, extra_args: list[str] = []) -> list[Dependency]: try: with open_elf(path) as elf: if is_static_executable(elf): # No point patching these - print(f"skipping {path} because it is statically linked") + logger.log(SkipFile(file=path, reason="it is statically linked")) return [] if elf.num_segments() == 0: # no segment (e.g. object file) - print(f"skipping {path} because it contains no segment") + logger.log(SkipFile(file=path, reason="it contains no segment")) return [] file_arch = get_arch(elf) if interpreter_arch != file_arch: # Our target architecture is different than this file's # architecture, so skip it. - print(f"skipping {path} because its architecture ({file_arch})" - f" differs from target ({interpreter_arch})") + logger.log(SkipFile(file=path, reason=f"its architecture ({file_arch}) differs from target ({interpreter_arch})")) return [] file_osabi = get_osabi(elf) if not osabi_are_compatible(interpreter_osabi, file_osabi): - print(f"skipping {path} because its OS ABI ({file_osabi}) is" - f" not compatible with target ({interpreter_osabi})") + logger.log(SkipFile(file=path, reason=f"its OS ABI ({file_osabi}) is not compatible with target ({interpreter_osabi})")) return [] file_is_dynamic_executable = is_dynamic_executable(elf) @@ -283,13 +350,13 @@ def auto_patchelf_file(path: Path, runtime_deps: list[Path], append_rpaths: list rpath = [] if file_is_dynamic_executable: - print("setting interpreter of", path) + logger.log(SetInterpreter(file=path, interpreter_path=interpreter_path)) subprocess.run( ["patchelf", "--set-interpreter", interpreter_path.as_posix(), path.as_posix()] + extra_args, check=True) rpath += runtime_deps - print("searching for dependencies of", path) + logger.debug(f"searching for dependencies of {path}") dependencies = [] # Be sure to get the output of all missing dependencies instead of # failing at the first one, because it's more useful when working @@ -335,8 +402,9 @@ def auto_patchelf_file(path: Path, runtime_deps: list[Path], append_rpaths: list elif found_dependency := find_dependency(candidate.name, file_arch, file_osabi): origin_rpath_entry = find_first_matching_rpath_with_origin(path, found_dependency, existing_rpaths) if preserve_origin else None rpath.append(origin_rpath_entry or found_dependency) - dependencies.append(Dependency(path, candidate, found=True)) - print(f" {candidate} -> found: {found_dependency}") + dep = Dependency(file=path, name=candidate, found=True, location=found_dependency) + dependencies.append(dep) + logger.log(dep) was_found = True break elif is_libc and keep_libc: @@ -345,8 +413,9 @@ def auto_patchelf_file(path: Path, runtime_deps: list[Path], append_rpaths: list if not was_found: dep_name = dep[0] if len(dep) == 1 else f"any({', '.join(map(str, dep))})" - dependencies.append(Dependency(path, dep_name, found=False)) - print(f" {dep_name} -> not found!") + dep = Dependency(file=path, name=dep_name, found=False, location=None) + dependencies.append(dep) + logger.log(dep) rpath.extend(append_rpaths) @@ -360,7 +429,7 @@ def auto_patchelf_file(path: Path, runtime_deps: list[Path], append_rpaths: list rpath_str = ":".join(dict.fromkeys(map(Path.as_posix, rpath))) if rpath: - print("setting RPATH to:", rpath_str) + logger.log(SetRpath(file=path, rpath=rpath_str)) subprocess.run( ["patchelf", "--set-rpath", rpath_str, path.as_posix()] + extra_args, check=True) @@ -369,6 +438,7 @@ def auto_patchelf_file(path: Path, runtime_deps: list[Path], append_rpaths: list def auto_patchelf( + logger: Logger, paths_to_patch: list[Path], lib_dirs: list[Path], runtime_deps: list[Path], @@ -393,20 +463,20 @@ def auto_patchelf( dependencies = [] for path in chain.from_iterable(glob(p, '*', recursive) for p in paths_to_patch): if not path.is_symlink() and path.is_file(): - dependencies += auto_patchelf_file(path, runtime_deps, append_rpaths, keep_libc, preserve_origin, extra_args) + dependencies += auto_patchelf_file(logger, path, runtime_deps, append_rpaths, keep_libc, preserve_origin, extra_args) missing = [dep for dep in dependencies if not dep.found] # Print a summary of the missing dependencies at the end - print(f"auto-patchelf: {len(missing)} dependencies could not be satisfied") + logger.debug(f"auto-patchelf: {len(missing)} dependencies could not be satisfied") failure = False for dep in missing: for pattern in ignore_missing: if fnmatch(dep.name.name, pattern): - print(f"warn: auto-patchelf ignoring missing {dep.name} wanted by {dep.file}") + logger.log(IgnoredDependency(file=dep.file, name=dep.name, pattern=pattern)) break else: - print(f"error: auto-patchelf could not satisfy dependency {dep.name} wanted by {dep.file}") + logger.debug(f"error: auto-patchelf could not satisfy dependency {dep.name} wanted by {dep.file}") failure = True if failure: @@ -485,6 +555,11 @@ def main() -> None: action="store_false", help="Do not add the existing rpaths of the patched files to the list of directories to search for dependencies.", ) + parser.add_argument( + "--structured-logs", + action="store_true", + help="Output events as JSON Lines to stdout instead of human-readable diagnostics.", + ) parser.add_argument( "--extra-args", # Undocumented Python argparse feature: consume all remaining arguments @@ -496,11 +571,13 @@ def main() -> None: help="Extra arguments to pass to patchelf. This argument should always come last.", ) - print("automatically fixing dependencies for ELF files") args = parser.parse_args() - pprint.pprint(vars(args)) + logger = Logger(structured=args.structured_logs) + logger.debug("automatically fixing dependencies for ELF files") + logger.debug(pprint.pformat(vars(args))) auto_patchelf( + logger, args.paths, args.libs, args.runtime_dependencies, diff --git a/pkgs/by-name/aw/awscli/package.nix b/pkgs/by-name/aw/awscli/package.nix index 35018deb4cf7..3e18a1e9b065 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.42.18"; + version = "1.44.21"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; tag = version; - hash = "sha256-f6CVQotsdvU2g/GjOMWPay/7FxxRvhtBrVZE5TLHTNY="; + hash = "sha256-yQFK1YjehmACZGMXfMQLc5OiiIGDO08OtwFSpaRyi58="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/aw/awsebcli/package.nix b/pkgs/by-name/aw/awsebcli/package.nix index 4fff803c6dca..e1c6596b0b40 100644 --- a/pkgs/by-name/aw/awsebcli/package.nix +++ b/pkgs/by-name/aw/awsebcli/package.nix @@ -46,6 +46,7 @@ python.pkgs.buildPythonApplication rec { "six" "termcolor" "urllib3" + "wcwidth" ]; dependencies = with python.pkgs; [ @@ -62,6 +63,7 @@ python.pkgs.buildPythonApplication rec { setuptools tabulate termcolor + wcwidth websocket-client ]; diff --git a/pkgs/by-name/cc/ccid/package.nix b/pkgs/by-name/cc/ccid/package.nix index c5bc1aa625d3..3157c01c0fd2 100644 --- a/pkgs/by-name/cc/ccid/package.nix +++ b/pkgs/by-name/cc/ccid/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ccid"; - version = "1.6.2"; + version = "1.7.0"; src = fetchFromGitHub { owner = "LudovicRousseau"; repo = "CCID"; tag = finalAttrs.version; - hash = "sha256-n7rOjnLZH4RLmddtBycr3FK2Bi/OLR+9IjWBRbWjnUw="; + hash = "sha256-6eaznSIQZl1bpIe1F9EtwotF9BjOruJ9g/c2QrTgfUg="; }; postPatch = '' @@ -33,6 +33,9 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ (lib.mesonBool "serial" true) + # Upstream tries to install udev outside of PREFIX. It's easier to disable + # this and install it ourself than to patch meson.build. + (lib.mesonBool "udev-rules" false) ]; # error: call to undeclared function 'InterruptRead'; @@ -61,6 +64,10 @@ stdenv.mkDerivation (finalAttrs: { install -Dm 0444 -t $out/lib/udev/rules.d ../src/92_pcscd_ccid.rules substituteInPlace $out/lib/udev/rules.d/92_pcscd_ccid.rules \ --replace-fail "/usr/sbin/pcscd" "${pcsclite}/bin/pcscd" + # Disable reference to binary that we don't build. + substituteInPlace $out/lib/udev/rules.d/92_pcscd_ccid.rules \ + --replace-fail 'ATTRS{idVendor}=="0d46", ATTRS{idProduct}=="4081", RUN+="/usr/sbin/Kobil_mIDentity_switch"' \ + '# disabled: ATTRS{idVendor}=="0d46", ATTRS{idProduct}=="4081", RUN+="/usr/sbin/Kobil_mIDentity_switch"' ''; # The resulting shared object ends up outside of the default paths which are diff --git a/pkgs/by-name/ce/ceph/old-python-packages/cryptography.nix b/pkgs/by-name/ce/ceph/old-python-packages/cryptography.nix index 5afd24f0b573..5fdee3f12b7f 100644 --- a/pkgs/by-name/ce/ceph/old-python-packages/cryptography.nix +++ b/pkgs/by-name/ce/ceph/old-python-packages/cryptography.nix @@ -15,7 +15,6 @@ cffi, pkg-config, pytestCheckHook, - pytest-subtests, pretend, libiconv, iso8601, @@ -98,7 +97,6 @@ buildPythonPackage rec { pretend py pytestCheckHook - pytest-subtests pytz ]; diff --git a/pkgs/by-name/cr/cryptsetup/package.nix b/pkgs/by-name/cr/cryptsetup/package.nix index 08869add459e..a03ce6838b6f 100644 --- a/pkgs/by-name/cr/cryptsetup/package.nix +++ b/pkgs/by-name/cr/cryptsetup/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "cryptsetup"; - version = "2.8.3"; + version = "2.8.4"; outputs = [ "bin" @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { url = "mirror://kernel/linux/utils/cryptsetup/v${lib.versions.majorMinor finalAttrs.version}/" + "cryptsetup-${finalAttrs.version}.tar.xz"; - hash = "sha256-SoojuLnRoyUEUuQKzq1EIaA+RaOJVK0FlWNPQmaqgA8="; + hash = "sha256-RD5G+JZMmsx4D0Va+7jiOqDo7X7FBM/FngT0BvoeioM="; }; patches = [ diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix index 978c494b6eea..422f2ff3a7bf 100644 --- a/pkgs/by-name/cu/curlMinimal/package.nix +++ b/pkgs/by-name/cu/curlMinimal/package.nix @@ -87,7 +87,7 @@ assert stdenv.mkDerivation (finalAttrs: { pname = "curl"; - version = "8.17.0"; + version = "8.18.0"; src = fetchurl { urls = [ @@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version }/curl-${finalAttrs.version}.tar.xz" ]; - hash = "sha256-lV9ucprWs1ZiYOj+9oYg52ujwxrPChhSRBahhaz3eZI="; + hash = "sha256-QN95Fm50qiAUk2XhHuTHmKRq1Xw05PaP0TEA4smpGUY="; }; # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion diff --git a/pkgs/by-name/d-/d-seams/package.nix b/pkgs/by-name/d-/d-seams/package.nix index 7b7215851389..4e3744ccdd04 100644 --- a/pkgs/by-name/d-/d-seams/package.nix +++ b/pkgs/by-name/d-/d-seams/package.nix @@ -21,6 +21,8 @@ clangStdenv.mkDerivation rec { version = "1.0.1"; pname = "d-SEAMS"; + strictDeps = false; + src = fetchFromGitHub { owner = "d-SEAMS"; repo = "seams-core"; diff --git a/pkgs/by-name/db/dbus-broker/package.nix b/pkgs/by-name/db/dbus-broker/package.nix index 88e40e8d455c..82528f959cf9 100644 --- a/pkgs/by-name/db/dbus-broker/package.nix +++ b/pkgs/by-name/db/dbus-broker/package.nix @@ -10,6 +10,7 @@ dbus, linuxHeaders, systemd, + expat, }: let @@ -146,6 +147,7 @@ stdenv.mkDerivation (finalAttrs: { dbus linuxHeaders systemd + expat ]; mesonFlags = [ diff --git a/pkgs/by-name/db/dbus/implement-getgrouplist.patch b/pkgs/by-name/db/dbus/implement-getgrouplist.patch index e3a4a25cb720..d738334b78b3 100644 --- a/pkgs/by-name/db/dbus/implement-getgrouplist.patch +++ b/pkgs/by-name/db/dbus/implement-getgrouplist.patch @@ -95,14 +95,15 @@ Without it, only the user's primary group is used in authentication! +} --- dbus-1.6.8/dbus/dbus-sysdeps-unix.c.orig 2013-02-28 13:08:52.171215237 +0000 +++ dbus-1.6.8/dbus/dbus-sysdeps-unix.c 2013-02-28 13:13:52.224615146 +0000 -@@ -21,6 +21,10 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ +@@ -26,6 +26,11 @@ + + #include + +#ifndef HAVE_GETGROUPLIST +#include "getgrouplist.c" +#define HAVE_GETGROUPLIST +#endif - - #include - ++ + #include "dbus-internals.h" + #include "dbus-sysdeps.h" + #include "dbus-sysdeps-unix.h" diff --git a/pkgs/by-name/db/dbus/meson-install-dirs.patch b/pkgs/by-name/db/dbus/meson-install-dirs.patch new file mode 100644 index 000000000000..82c02c9245b4 --- /dev/null +++ b/pkgs/by-name/db/dbus/meson-install-dirs.patch @@ -0,0 +1,190 @@ +diff --git a/bus/legacy-config/meson.build b/bus/legacy-config/meson.build +index 1e635713..4be240e9 100644 +--- a/bus/legacy-config/meson.build ++++ b/bus/legacy-config/meson.build +@@ -24,7 +24,7 @@ if platform_unix + input: 'system.conf.in', + output: 'system.conf', + configuration: data_config, +- install_dir: get_option('sysconfdir') / 'dbus-1', ++ install_dir: install_sysconfdir / 'dbus-1', + ) + endif + +@@ -32,5 +32,5 @@ configure_file( + input: 'session.conf.in', + output: 'session.conf', + configuration: data_config, +- install_dir: get_option('sysconfdir') / 'dbus-1', ++ install_dir: install_sysconfdir / 'dbus-1', + ) +diff --git a/bus/meson.build b/bus/meson.build +index 058e3b25..0a5de112 100644 +--- a/bus/meson.build ++++ b/bus/meson.build +@@ -23,7 +23,7 @@ session_conf = configure_file( + input: 'session.conf.in', + output: 'session.conf', + configuration: data_config, +- install_dir: get_option('datadir') / 'dbus-1', ++ install_dir: install_datadir / 'dbus-1', + ) + + if platform_unix +@@ -31,7 +31,7 @@ if platform_unix + input: 'system.conf.in', + output: 'system.conf', + configuration: data_config, +- install_dir: get_option('datadir') / 'dbus-1', ++ install_dir: install_datadir / 'dbus-1', + ) + endif + +@@ -39,19 +39,19 @@ configure_file( + input: 'example-system-enable-stats.conf.in', + output: 'example-system-enable-stats.conf', + configuration: data_config, +- install_dir: get_option('datadir') / 'doc' / 'dbus' / 'examples', ++ install_dir: install_datadir / 'doc' / 'dbus' / 'examples', + ) + + configure_file( + input: 'example-session-disable-stats.conf.in', + output: 'example-session-disable-stats.conf', + configuration: data_config, +- install_dir: get_option('datadir') / 'doc' / 'dbus' / 'examples', ++ install_dir: install_datadir / 'doc' / 'dbus' / 'examples', + ) + + install_data( + 'example-system-hardening-without-traditional-activation.conf', +- install_dir: get_option('datadir') / 'doc' / 'dbus' / 'examples', ++ install_dir: install_datadir / 'doc' / 'dbus' / 'examples', + ) + + if use_launchd +@@ -185,15 +185,14 @@ if platform_unix and use_traditional_activation + endif + + install_emptydirs += [ +- get_option('datadir') / 'dbus-1' / 'session.d', +- get_option('datadir') / 'dbus-1' / 'services', ++ install_datadir / 'dbus-1' / 'session.d', ++ install_datadir / 'dbus-1' / 'services', + ] + + if platform_unix + install_emptydirs += [ +- runstatedir / 'dbus', +- get_option('datadir') / 'dbus-1' / 'system.d', +- get_option('datadir') / 'dbus-1' / 'system-services', ++ install_datadir / 'dbus-1' / 'system.d', ++ install_datadir / 'dbus-1' / 'system-services', + ] + endif + +diff --git a/doc/meson.build b/doc/meson.build +index adc6f17d..1f2c5dce 100644 +--- a/doc/meson.build ++++ b/doc/meson.build +@@ -142,7 +142,7 @@ configure_file( + # Install dtd files + + +-xml_dir = get_option('datadir') / 'xml' / 'dbus-1' ++xml_dir = install_datadir / 'xml' / 'dbus-1' + dtd_files = [ + 'busconfig.dtd', + 'introspect.dtd', +diff --git a/meson.build b/meson.build +index 3f4ad316..6cee2c6b 100644 +--- a/meson.build ++++ b/meson.build +@@ -918,7 +918,17 @@ dbus_enable_modular_tests = ( + ############################################################################### + # Paths and directories + +-docs_dir = get_option('datadir') / 'doc' / 'dbus' ++install_datadir = get_option('install_datadir') ++if install_datadir == '' ++ install_datadir = get_option('prefix') / get_option('datadir') ++endif ++ ++install_sysconfdir = get_option('install_sysconfdir') ++if install_sysconfdir == '' ++ install_sysconfdir = get_option('prefix') / get_option('sysconfdir') ++endif ++ ++docs_dir = install_datadir / 'doc' / 'dbus' + + # TODO: If a future Meson version gets a runstatedir option, try both. + # https://github.com/mesonbuild/meson/issues/4141 +diff --git a/meson_options.txt b/meson_options.txt +index 1bd00579..1dfb3c15 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -109,6 +109,20 @@ option( + description: 'Inotify support on Linux' + ) + ++option( ++ 'install_datadir', ++ type: 'string', ++ value: '', ++ description: 'datadir for installation, so that we can set --datadir=/etc and have dbus load files from there but still install them to $out/share' ++) ++ ++option( ++ 'install_sysconfdir', ++ type: 'string', ++ value: '', ++ description: 'sysconfdir for installation, so that we can set --sysconfdir=/etc and have dbus load files from there but still install them to $out/etc' ++) ++ + option( + 'installed_tests', + type: 'boolean', +diff --git a/test/data/meson.build b/test/data/meson.build +index ef570492..713396b7 100644 +--- a/test/data/meson.build ++++ b/test/data/meson.build +@@ -224,14 +224,14 @@ if install_tests + 'link_name': 'session.conf', + 'install_dir': test_exec_dir / 'data' / 'valid-config-files', + 'pointing_to': +- get_option('prefix') / get_option('datadir') / ++ install_datadir / + 'dbus-1' / 'session.conf', + }, + { + 'link_name': 'system.conf', + 'install_dir': test_exec_dir / 'data' / 'valid-config-files-system', + 'pointing_to': +- get_option('prefix') / get_option('datadir') / ++ install_datadir / + 'dbus-1' / 'system.conf', + }, + ] +diff --git a/test/meson.build b/test/meson.build +index a60afac6..be7bd935 100644 +--- a/test/meson.build ++++ b/test/meson.build +@@ -25,7 +25,7 @@ + install_tests = get_option('installed_tests') + + test_exec_dir = get_option('libexecdir') / 'installed-tests' / 'dbus' +-test_meta_dir = get_option('datadir') / 'installed-tests' / 'dbus' ++test_meta_dir = install_datadir / 'installed-tests' / 'dbus' + + ############################################################################### + # Test configuration needs some specific keys +diff --git a/tools/meson.build b/tools/meson.build +index 5d78d93a..7d094364 100644 +--- a/tools/meson.build ++++ b/tools/meson.build +@@ -112,5 +112,4 @@ install_data('GetAllMatchRules.py', + + # Create the empty directory to hold the machine ID + install_emptydirs += [ +- get_option('localstatedir') / 'lib' / 'dbus', + ] diff --git a/pkgs/by-name/db/dbus/package.nix b/pkgs/by-name/db/dbus/package.nix index 8789436b6a24..09631d16f05c 100644 --- a/pkgs/by-name/db/dbus/package.nix +++ b/pkgs/by-name/db/dbus/package.nix @@ -7,14 +7,17 @@ enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal, systemdMinimal, audit, + libcap_ng, libapparmor, dbus, docbook_xml_dtd_44, docbook-xsl-nons, - xmlto, - autoreconfHook, - autoconf-archive, + libxslt, + meson, + ninja, + python3, x11Support ? (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin), + writeText, libx11, libsm, libice, @@ -22,30 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "dbus"; - version = "1.14.10"; - - src = fetchurl { - url = "https://dbus.freedesktop.org/releases/dbus/dbus-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-uh8h0r2dM52i1KqHgMCd8y/qh5mLc9ok9Jq53x42pQ8="; - }; - - patches = lib.optional stdenv.hostPlatform.isSunOS ./implement-getgrouplist.patch; - - postPatch = '' - substituteInPlace bus/Makefile.am \ - --replace 'install-data-hook:' 'disabled:' \ - --replace '$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus' ':' - substituteInPlace tools/Makefile.am \ - --replace 'install-data-local:' 'disabled:' \ - --replace 'installcheck-local:' 'disabled:' - '' - # cleanup of runtime references - + '' - substituteInPlace ./dbus/dbus-sysdeps-unix.c \ - --replace 'DBUS_BINDIR "/dbus-launch"' "\"$lib/bin/dbus-launch\"" - substituteInPlace ./tools/dbus-launch.c \ - --replace 'DBUS_DAEMONDIR"/dbus-daemon"' '"/run/current-system/sw/bin/dbus-daemon"' - ''; + version = "1.16.2"; outputs = [ "out" @@ -54,76 +34,126 @@ stdenv.mkDerivation (finalAttrs: { "doc" "man" ]; + separateDebugInfo = true; + src = fetchurl { + url = "https://dbus.freedesktop.org/releases/dbus/dbus-${finalAttrs.version}.tar.xz"; + sha256 = "sha256-C6KhpLFq/nvOssB+nOmajCw1COXewpDbtkM4S9a+t+I="; + }; + + patches = [ + # Implement getgrouplist for platforms where it is not available (e.g. Illumos/Solaris) + ./implement-getgrouplist.patch + + # Add a Meson configuration option that will allow us to use a different + # `datadir` for installation from the one that will be compiled into dbus. + # This is necessary to allow NixOS to manage dbus service definitions, + # since the `datadir` in the package will be immutable. But we still want + # to install the files to the latter, since there is no other suitable + # place for the project to install them. + # + # We will also just remove installation of empty `${runstatedir}/dbus` + # and `${localstatedir}/lib/dbus` since these are useless in the package. + ./meson-install-dirs.patch + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Fixes Darwin issues like: + # dyld[29056]: Library not loaded: @rpath/libdbus-1.3.dylib + # Referenced from: <...> /nix/store/.../bin/dbus-run-session + # Reason: no LC_RPATH's found + ./set-install_rpath.patch + ]; + strictDeps = true; + nativeBuildInputs = [ - autoreconfHook - autoconf-archive + meson + ninja pkg-config docbook_xml_dtd_44 docbook-xsl-nons - xmlto + libxslt # for xsltproc + python3 ]; - propagatedBuildInputs = [ + buildInputs = [ expat + ] + ++ lib.optionals x11Support [ + libx11 + libice + libsm + ] + ++ lib.optional enableSystemd systemdMinimal + ++ lib.optionals stdenv.hostPlatform.isLinux [ + audit + libapparmor + libcap_ng ]; - - buildInputs = - lib.optionals x11Support [ - libx11 - libice - libsm - ] - ++ lib.optional enableSystemd systemdMinimal - ++ lib.optionals stdenv.hostPlatform.isLinux [ - audit - libapparmor - ]; # ToDo: optional selinux? __darwinAllowLocalNetworking = true; - configureFlags = [ - "--enable-user-session" - "--enable-xml-docs" + mesonFlags = [ "--libexecdir=${placeholder "out"}/libexec" + # datadir from which dbus will load files will be managed by the NixOS module: "--datadir=/etc" + # But we still want to install stuff to the package: + "-Dinstall_datadir=${placeholder "out"}/share" "--localstatedir=/var" - "--runstatedir=/run" + "-Druntime_dir=/run" "--sysconfdir=/etc" - "--with-session-socket-dir=/tmp" - "--with-system-pid-file=/run/dbus/pid" - "--with-system-socket=/run/dbus/system_bus_socket" - "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" - "--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user" + "-Dinstall_sysconfdir=${placeholder "out"}/etc" + "-Ddoxygen_docs=disabled" + "-Dducktype_docs=disabled" + "-Dlaunchd_agent_dir=${placeholder "out"}/Library/LaunchAgents" + "-Dqt_help=disabled" + "-Drelocation=disabled" # Conflicts with multiple outputs + "-Dmodular_tests=disabled" # Requires glib + "-Dsession_socket_dir=/tmp" + "-Dsystemd_system_unitdir=${placeholder "out"}/etc/systemd/system" + "-Dsystemd_user_unitdir=${placeholder "out"}/etc/systemd/user" + (lib.mesonEnable "x11_autolaunch" x11Support) + (lib.mesonEnable "apparmor" stdenv.hostPlatform.isLinux) + (lib.mesonEnable "epoll" stdenv.hostPlatform.isLinux) + (lib.mesonEnable "inotify" stdenv.hostPlatform.isLinux) + (lib.mesonEnable "libaudit" stdenv.hostPlatform.isLinux) + (lib.mesonEnable "kqueue" (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isBSD)) + (lib.mesonEnable "launchd" stdenv.hostPlatform.isDarwin) + (lib.mesonEnable "systemd" enableSystemd) + "-Dselinux=disabled" ] - ++ lib.optional (!x11Support) "--without-x" - ++ lib.optionals stdenv.hostPlatform.isLinux [ - "--enable-apparmor" - "--enable-libaudit" + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # `launchctl` is only needed at runtime. Lie to `find_program` because it will always be present on a Darwin host. + "--cross-file=${writeText "darwin.ini" '' + [binaries] + launchctl = 'true' + ''}" ] - ++ lib.optionals enableSystemd [ "SYSTEMCTL=${systemdMinimal}/bin/systemctl" ]; - - NIX_CFLAGS_LINK = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-Wl,--as-needed"; - - enableParallelBuilding = true; + ++ lib.optionals enableSystemd [ + "--cross-file=${writeText "crossfile.ini" '' + [binaries] + systemctl = '${systemdMinimal}/bin/systemctl' + ''}" + ]; doCheck = true; - makeFlags = [ - # Fix paths in XML catalog broken by mismatching build/install datadir. - "dtddir=${placeholder "out"}/share/xml/dbus-1" - ]; + postPatch = '' + patchShebangs \ + test/data/copy_data_for_tests.py \ + meson_post_install.py - installFlags = [ - "sysconfdir=${placeholder "out"}/etc" - "datadir=${placeholder "out"}/share" - ]; + # Cleanup of runtime references + substituteInPlace ./dbus/dbus-sysdeps-unix.c \ + --replace-fail 'DBUS_BINDIR "/dbus-launch"' "\"$lib/bin/dbus-launch\"" + substituteInPlace ./tools/dbus-launch.c \ + --replace-fail 'DBUS_DAEMONDIR"/dbus-daemon"' '"/run/current-system/sw/bin/dbus-daemon"' + ''; - # it's executed from $lib by absolute path postFixup = '' + # It's executed from $lib by absolute path moveToOutput bin/dbus-launch "$lib" ln -s "$lib/bin/dbus-launch" "$out/bin/" ''; diff --git a/pkgs/by-name/db/dbus/set-install_rpath.patch b/pkgs/by-name/db/dbus/set-install_rpath.patch new file mode 100644 index 000000000000..40267e4c981a --- /dev/null +++ b/pkgs/by-name/db/dbus/set-install_rpath.patch @@ -0,0 +1,58 @@ +From 95a13025ec6fe4dd3c7a927732267e4abc4f4daf Mon Sep 17 00:00:00 2001 +From: Michael Daniels +Date: Sun, 22 Feb 2026 11:49:35 -0500 +Subject: [PATCH] set install_rpath for some executables + +Fixes Darwin issues like: + +dyld[29056]: Library not loaded: @rpath/libdbus-1.3.dylib + Referenced from: <3A452FD0-A471-30CB-A14F-FD0F818E4625> /nix/store/6ghcwk1zrkqkzvsh6i3b2dlagx7hs2d7-dbus-1.16.2/bin/dbus-run-session + Reason: no LC_RPATH's found +--- + bus/meson.build | 2 ++ + tools/meson.build | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/bus/meson.build b/bus/meson.build +index 176894d6..bec64aa1 100644 +--- a/bus/meson.build ++++ b/bus/meson.build +@@ -139,6 +139,7 @@ dbus_daemon = executable('dbus-daemon', + include_directories: root_include, + link_with: libdbus_daemon_internal, + install: true, ++ install_rpath: get_option('libdir'), + ) + + +@@ -180,6 +181,7 @@ if platform_unix and use_traditional_activation + link_with: liblaunch_helper_internal, + install: true, + install_dir: get_option('libexecdir'), ++ install_rpath: get_option('libdir'), + ) + endif + +diff --git a/tools/meson.build b/tools/meson.build +index 5d78d93a..def2a716 100644 +--- a/tools/meson.build ++++ b/tools/meson.build +@@ -65,6 +65,7 @@ if message_bus + include_directories: root_include, + link_with: libdbus_internal, + install: true, ++ install_rpath: get_option('libdir'), + ) + endif + +@@ -75,6 +76,7 @@ dbus_send = executable('dbus-send', + include_directories: root_include, + link_with: libdbus, + install: true, ++ install_rpath: get_option('libdir'), + ) + + dbus_test_tool = executable('dbus-test-tool', +-- +2.51.2 + diff --git a/pkgs/by-name/do/doxygen/package.nix b/pkgs/by-name/do/doxygen/package.nix index be439f4faf7f..2e798115b111 100644 --- a/pkgs/by-name/do/doxygen/package.nix +++ b/pkgs/by-name/do/doxygen/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doxygen"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "doxygen"; repo = "doxygen"; tag = "Release_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; - hash = "sha256-HbUAIfkfP0Tvb2NLSerTSL8A+8Ox2thgGL2/zGLkZdc="; + hash = "sha256-pVO5hSKSwhR8ZiKaHhiTUMGnLD+EqIbzVxMUUHl5x0c="; }; # https://github.com/doxygen/doxygen/issues/10928#issuecomment-2179320509 diff --git a/pkgs/by-name/ec/echidna/package.nix b/pkgs/by-name/ec/echidna/package.nix index bb3db8743a1c..e23895064382 100644 --- a/pkgs/by-name/ec/echidna/package.nix +++ b/pkgs/by-name/ec/echidna/package.nix @@ -11,32 +11,28 @@ haskellPackages.mkDerivation rec { pname = "echidna"; - version = "2.2.7"; + version = "2.3.1"; src = fetchFromGitHub { owner = "crytic"; repo = "echidna"; tag = "v${version}"; - sha256 = "sha256-rDtxyUpWfdMvS5BY1y8nydkQk/eCdmtjCqGJ+I4vy0I="; + sha256 = "sha256-Zopkqc01uUccJzdjP+qmHHZzB2iXK0U0fQi6EhgCRKg="; }; isExecutable = true; - patches = [ - # Fix build with GHC 9.10 - # https://github.com/crytic/echidna/pull/1446 - (fetchpatch { - url = "https://github.com/crytic/echidna/commit/1b498bdb8c86d8297aa34de8f48b6dce2f4dd84d.patch"; - hash = "sha256-JeKPv2Q2gIt1XpI81XPFu80/x8QcOI4k1QN/mTf+bqk="; - }) - ]; - buildTools = with haskellPackages; [ hpack + makeWrapper ]; + prePatch = '' + hpack + ''; + executableHaskellDepends = with haskellPackages; [ - # base dependencies + # package.yml/dependencies aeson base containers @@ -45,9 +41,9 @@ haskellPackages.mkDerivation rec { MonadRandom mtl text - # library dependencies + # package.yml/library.dependencies ansi-terminal - async + array base16-bytestring binary brick @@ -58,11 +54,14 @@ haskellPackages.mkDerivation rec { exceptions extra filepath + Glob hashable html-conduit html-entities http-conduit ListLike + mcp-server + mustache optics optics-core process @@ -71,19 +70,22 @@ haskellPackages.mkDerivation rec { semver signal split + stm strip-ansi-escape time unliftio + unliftio-core utf8-string vector vty vty-crossplatform wai-extra warp + wreq word-wrap xml-conduit yaml - # executable dependencies + # package.yml/ecutable.echidna.dependencies code-page filepath hashable @@ -92,14 +94,6 @@ haskellPackages.mkDerivation rec { with-utf8 ]; - executableToolDepends = [ - makeWrapper - ]; - - prePatch = '' - hpack - ''; - postInstall = with haskellPackages; # https://github.com/NixOS/nixpkgs/pull/304352 @@ -127,6 +121,4 @@ haskellPackages.mkDerivation rec { ]; platforms = lib.platforms.unix; mainProgram = "echidna"; - # Fails to build since https://hydra.nixos.org/build/313316669/nixlog/2 - broken = true; } diff --git a/pkgs/by-name/ex/exo/package.nix b/pkgs/by-name/ex/exo/package.nix index 7a63cd3e0d92..ebb8d6cd55e1 100644 --- a/pkgs/by-name/ex/exo/package.nix +++ b/pkgs/by-name/ex/exo/package.nix @@ -75,7 +75,7 @@ let sourceRoot ; fetcherVersion = 2; - hash = "sha256-3ZgE1ysb1OeB4BNszvlrnYcc7gOo7coPfOEQmMHC6E0="; + hash = "sha256-ok1Yl8CIPwViioH5HOM4VWilRU3HsSa8IAsBFl/QgG0="; }; }); diff --git a/pkgs/by-name/ex/expat/package.nix b/pkgs/by-name/ex/expat/package.nix index 39dca62d6c1e..80f5f017a36a 100644 --- a/pkgs/by-name/ex/expat/package.nix +++ b/pkgs/by-name/ex/expat/package.nix @@ -18,7 +18,7 @@ # files. let - version = "2.7.3"; + version = "2.7.4"; tag = "R_${lib.replaceStrings [ "." ] [ "_" ] version}"; in stdenv.mkDerivation (finalAttrs: { @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { url = with finalAttrs; "https://github.com/libexpat/libexpat/releases/download/${tag}/${pname}-${version}.tar.xz"; - hash = "sha256-cd+PQHBqe7CoClNnB56nXZHaT4xlxY7Fm837997Nq58="; + hash = "sha256-npyrtFfB4J3pHbJwbYNlZFeSY46zvh+U27IUkwEIasA="; }; strictDeps = true; diff --git a/pkgs/by-name/ff/fftw/package.nix b/pkgs/by-name/ff/fftw/package.nix index ae56ad4b321c..0d9736335f68 100644 --- a/pkgs/by-name/ff/fftw/package.nix +++ b/pkgs/by-name/ff/fftw/package.nix @@ -75,6 +75,11 @@ stdenv.mkDerivation (finalAttrs: { "--enable-avx512" "--enable-avx128-fma" ] + ++ + lib.optionals (stdenv.hostPlatform.isAarch64 && (precision == "single" || precision == "double")) + [ + "--enable-neon" + ] ++ lib.optionals enableMpi [ "--enable-mpi" # link libfftw3_mpi explicitly with -lmpi diff --git a/pkgs/by-name/fl/flatbuffers/package.nix b/pkgs/by-name/fl/flatbuffers/package.nix index c9309930da81..4ab64ae642ab 100644 --- a/pkgs/by-name/fl/flatbuffers/package.nix +++ b/pkgs/by-name/fl/flatbuffers/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "flatbuffers"; - version = "25.9.23"; + version = "25.12.19"; src = fetchFromGitHub { owner = "google"; repo = "flatbuffers"; - rev = "v${version}"; - hash = "sha256-A9nWfgcuVW3x9MDFeviCUK/oGcWJQwadI8LqNR8BlQw="; + tag = "v${version}"; + hash = "sha256-I4PthsQOOV8tsi5uRYudyqBPcbE+ZH8Q9j0Ms4HP9Ec="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fl/flow/package.nix b/pkgs/by-name/fl/flow/package.nix index f72170289894..6dcd6ecbe120 100644 --- a/pkgs/by-name/fl/flow/package.nix +++ b/pkgs/by-name/fl/flow/package.nix @@ -8,7 +8,7 @@ }: let - ocamlPackages = ocaml-ng.ocamlPackages.overrideScope ( + ocamlPackages = ocaml-ng.ocamlPackages_5_3.overrideScope ( self: super: { ppxlib = super.ppxlib.override { version = "0.34.0"; }; } diff --git a/pkgs/by-name/fo/fontforge/package.nix b/pkgs/by-name/fo/fontforge/package.nix index d929d95d6ea4..4cdcfacbb326 100644 --- a/pkgs/by-name/fo/fontforge/package.nix +++ b/pkgs/by-name/fo/fontforge/package.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, + fetchpatch, lib, replaceVars, cmake, @@ -10,6 +11,7 @@ zlib, glib, giflib, + gettext, libpng, libjpeg, libtiff, @@ -48,6 +50,26 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Provide a Nix-controlled location for the initial `sys.path` entry. (replaceVars ./set-python-sys-path.patch { python = "${py}/${py.sitePackages}"; }) + (fetchpatch { + name = "CVE-2025-15279_1.patch"; + url = "https://github.com/fontforge/fontforge/commit/7d67700cf8888e0bb37b453ad54ed932c8587073.patch"; + hash = "sha256-AqixWSgMc75qkgO30nWnI9NKLRtVwCDR+uSEiwMtFKg="; + }) + (fetchpatch { + name = "CVE-2025-15279_2.patch"; + url = "https://github.com/fontforge/fontforge/commit/720ea95020c964202928afd2e93b0f5fac11027e.patch"; + hash = "sha256-DsP2fDTZlTtg8MXcnsuGQ4PFPOVp56Jm95gq877PLlE="; + }) + (fetchpatch { + name = "CVE-2025-15275.patch"; + url = "https://github.com/fontforge/fontforge/commit/7195402701ace7783753ef9424153eff48c9af44.patch"; + hash = "sha256-NHgKUvHF389z7PRqaDj3IWLSLijlSw0F3UYcMjLxKvE="; + }) + (fetchpatch { + name = "CVE-2025-15269.patch"; + url = "https://github.com/fontforge/fontforge/commit/6aea6db5da332d8ac94e3501bb83c1b21f52074d.patch"; + hash = "sha256-3KsWSXVRpPJbytVmzjExCGw6IaCgcrKwqQGRKpQAOiY="; + }) ]; # use $SOURCE_DATE_EPOCH instead of non-deterministic timestamps @@ -62,9 +84,12 @@ stdenv.mkDerivation (finalAttrs: { # do not use x87's 80-bit arithmetic, rounding errors result in very different font binaries env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isi686 "-msse2 -mfpmath=sse"; + strictDeps = true; + nativeBuildInputs = [ pkg-config cmake + gettext ]; buildInputs = [ @@ -97,6 +122,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (!withGUI) "-DENABLE_GUI=OFF" ++ lib.optional (!withGTK) "-DENABLE_X11=ON" ++ lib.optional (!withPython) "-DENABLE_PYTHON_SCRIPTING=OFF" + ++ lib.optional withPython "-DPython3_EXECUTABLE=${lib.getExe py}" ++ lib.optional withExtras "-DENABLE_FONTFORGE_EXTRAS=ON"; preConfigure = '' diff --git a/pkgs/by-name/fr/freecell-solver/package.nix b/pkgs/by-name/fr/freecell-solver/package.nix index aac6385849c7..5e271ff8a57d 100644 --- a/pkgs/by-name/fr/freecell-solver/package.nix +++ b/pkgs/by-name/fr/freecell-solver/package.nix @@ -11,6 +11,7 @@ pkg-config, python3, rinutils, + versionCheckHook, }: stdenv.mkDerivation (finalAttrs: { @@ -74,10 +75,29 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "BUILD_STATIC_LIBRARY" false) ]; - postFixup = '' - wrapPythonProgramsIn "$out/bin" "$out $pythonPath" + preFixup = '' + # This is a module and should not be wrapped, or it causes import errors + # on the scripts that are actually executable + chmod a-x $out/bin/fc_solve_find_index_s2ints.py ''; + postFixup = '' + wrapPythonProgramsIn "$out/bin" "$out ''${pythonPath[*]}" + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + postInstallCheck = '' + # Check that the python wrappers work correctly: + # * fc_solve_find_index_s2ints.py should be unwrapped (we get SyntaxError otherwise) + # * the wrapper should provide all modules from the pythonPath (we get ModuleNotFoundError otherwise) + # * we don't provide valid input so expect IndexError + unset PYTHONPATH + ($out/bin/make_pysol_freecell_board.py 2>&1 | tee /dev/stderr || true) | grep -q "IndexError:" + ''; + doInstallCheck = true; + + __structuredAttrs = true; + meta = { homepage = "https://fc-solve.shlomifish.org/"; description = "FreeCell automatic solver"; diff --git a/pkgs/by-name/fr/frigate/onnxruntime-compat.patch b/pkgs/by-name/fr/frigate/onnxruntime-compat.patch new file mode 100644 index 000000000000..145c6e6722dc --- /dev/null +++ b/pkgs/by-name/fr/frigate/onnxruntime-compat.patch @@ -0,0 +1,19 @@ +Disable the SimplifedLayerNormFusion optimization for onnxruntime embedding +models to prevent a crash when using FP16 models (like jinna-clip-v1) with newer +onnxruntime versions. + +https://github.com/microsoft/onnxruntime/issues/26717#issuecomment-3800462654 + + +diff --git a/frigate/embeddings/onnx/runner.py b/frigate/embeddings/onnx/runner.py +index c34c97a8d..dca91daae 100644 +--- a/frigate/embeddings/onnx/runner.py ++++ b/frigate/embeddings/onnx/runner.py +@@ -52,6 +52,7 @@ class ONNXModelRunner: + model_path, + providers=providers, + provider_options=options, ++ disabled_optimizers=["SimplifiedLayerNormFusion"], + ) + + def get_input_names(self) -> list[str]: diff --git a/pkgs/by-name/fr/frigate/package.nix b/pkgs/by-name/fr/frigate/package.nix index 2f93c2bf5806..ca26f3f83c8b 100644 --- a/pkgs/by-name/fr/frigate/package.nix +++ b/pkgs/by-name/fr/frigate/package.nix @@ -84,7 +84,22 @@ python3Packages.buildPythonApplication rec { hash = "sha256-1+n0n0yCtjfAHkXzsZdIF0iCVdPGmsG7l8/VTqBVEjU="; }) ./ffmpeg.patch + # https://github.com/blakeblackshear/frigate/pull/21876 ./ai-edge-litert.patch + (fetchpatch { + # peewee-migrate 0.14.x compat + url = "https://github.com/blakeblackshear/frigate/commit/dde02cadb2168c44e9eb395ddfbb7b169096bd15.patch"; + excludes = [ + "docker/main/requirements-wheels.txt" + "migrations/031_create_trigger_table.py" + "migrations/032_add_password_changed_at.py" + ]; + hash = "sha256-RrmwjE4SHJIUOYfqcCtMy9Pht7UXhHcoAZlFQv9aQFw="; + }) + # https://github.com/microsoft/onnxruntime/issues/26717 + ./onnxruntime-compat.patch + # https://github.com/blakeblackshear/frigate/pull/22089 + ./proc-cmdline-strip.patch ]; postPatch = '' diff --git a/pkgs/by-name/fr/frigate/proc-cmdline-strip.patch b/pkgs/by-name/fr/frigate/proc-cmdline-strip.patch new file mode 100644 index 000000000000..426dd20ae266 --- /dev/null +++ b/pkgs/by-name/fr/frigate/proc-cmdline-strip.patch @@ -0,0 +1,27 @@ +Strip trailing whitespace from process commandlines. This is annoying for exact +process matches against Prometheus labels. + +https://github.com/blakeblackshear/frigate/pull/22089 + +diff --git a/frigate/util/services.py b/frigate/util/services.py +index b31a7eea3..f1e8f0f5f 100644 +--- a/frigate/util/services.py ++++ b/frigate/util/services.py +@@ -118,7 +118,7 @@ def get_cpu_stats() -> dict[str, dict]: + pid = str(process.info["pid"]) + try: + cpu_percent = process.info["cpu_percent"] +- cmdline = process.info["cmdline"] ++ cmdline = " ".join(process.info["cmdline"]).rstrip() + + with open(f"/proc/{pid}/stat", "r") as f: + stats = f.readline().split() +@@ -152,7 +152,7 @@ def get_cpu_stats() -> dict[str, dict]: + "cpu": str(cpu_percent), + "cpu_average": str(round(cpu_average_usage, 2)), + "mem": f"{mem_pct}", +- "cmdline": clean_camera_user_pass(" ".join(cmdline)), ++ "cmdline": clean_camera_user_pass(cmdline), + } + except Exception: + continue diff --git a/pkgs/by-name/gd/gdb/package.nix b/pkgs/by-name/gd/gdb/package.nix index a9d78b415103..8b1d613b8043 100644 --- a/pkgs/by-name/gd/gdb/package.nix +++ b/pkgs/by-name/gd/gdb/package.nix @@ -181,13 +181,11 @@ stdenv.mkDerivation (finalAttrs: { (withFeatureAs true "auto-load-safe-path" (builtins.concatStringsSep ":" safePaths)) (withFeature enableDebuginfod "debuginfod") (enableFeature (!stdenv.hostPlatform.isMusl) "nls") - ] - ++ optional (!hostCpuOnly) "--enable-targets=all" - ++ [ (enableFeature ( !stdenv.hostPlatform.isStatic && !stdenv.hostPlatform.isLoongArch64 ) "inprocess-agent") ] + ++ optional (!hostCpuOnly) "--enable-targets=all" # Workaround for Apple Silicon, "--target" must be "faked", see eg: https://github.com/Homebrew/homebrew-core/pull/209753 ++ optional ( stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 diff --git a/pkgs/by-name/gd/gdk-pixbuf/package.nix b/pkgs/by-name/gd/gdk-pixbuf/package.nix index 2ac75b359a52..8b782a384304 100644 --- a/pkgs/by-name/gd/gdk-pixbuf/package.nix +++ b/pkgs/by-name/gd/gdk-pixbuf/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdk-pixbuf"; - version = "2.44.4"; + version = "2.44.5"; outputs = [ "out" @@ -38,14 +38,10 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withIntrospection "devdoc" ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) "installedTests"; - src = - let - inherit (finalAttrs) pname version; - in - fetchurl { - url = "mirror://gnome/sources/gdk-pixbuf/${lib.versions.majorMinor version}/gdk-pixbuf-${version}.tar.xz"; - hash = "sha256-k6Gqw/FCeuc0Vzl1gqLDjQSWOKgBeIzL1fSMpge9vRc="; - }; + src = fetchurl { + url = "mirror://gnome/sources/gdk-pixbuf/${lib.versions.majorMinor finalAttrs.version}/gdk-pixbuf-${finalAttrs.version}.tar.xz"; + hash = "sha256-abk+CRObgMDuZhUD1g3rWlh0oxdytRhLnNVGKkEAq2g="; + }; patches = [ # Move installed tests to a separate output @@ -155,7 +151,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = gnome.updateScript { - packageName = finalAttrs.pname; + packageName = "gdk-pixbuf"; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/by-name/gh/gh/package.nix b/pkgs/by-name/gh/gh/package.nix index 0b632f163173..b9b6734e1dba 100644 --- a/pkgs/by-name/gh/gh/package.nix +++ b/pkgs/by-name/gh/gh/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "gh"; - version = "2.86.0"; + version = "2.87.2"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-+MPhDgXIVfYGp5ALI5GjRoeLRRUtNgpzUawxoqR76iE="; + hash = "sha256-QPQVsdZy17rNX5ACoKHiJG+f/2CAiBfO3B1ucton0tw="; }; - vendorHash = "sha256-pBHEqMgEoR3sWNbQjGBNso7WLP9Rz2gu89Bzu+7jz5c="; + vendorHash = "sha256-POrm4lHEO2Eti7dbohKBwXW+DTs22EUZX+tMNUCL3lg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/gi/gi-docgen/package.nix b/pkgs/by-name/gi/gi-docgen/package.nix index 7053bcd87800..3fbb9b0aae50 100644 --- a/pkgs/by-name/gi/gi-docgen/package.nix +++ b/pkgs/by-name/gi/gi-docgen/package.nix @@ -5,17 +5,18 @@ ninja, python3, gnome, + versionCheckHook, }: python3.pkgs.buildPythonApplication rec { pname = "gi-docgen"; - version = "2025.5"; + version = "2026.1"; pyproject = false; src = fetchurl { url = "mirror://gnome/sources/gi-docgen/${lib.versions.major version}/gi-docgen-${version}.tar.xz"; - hash = "sha256-JXmjP/h7Yi0Q0QLJG30OzlBjQLcONNu2UiFj4WyQrKM="; + hash = "sha256-wxbWwEaZl2toI5Eqrh+ypqP/olU7Qivoj7VuuIGs9Hk="; }; depsBuildBuild = [ @@ -36,12 +37,17 @@ python3.pkgs.buildPythonApplication rec { typogrify ]; - doCheck = false; # no tests + # For Python this must be placed in nativeCheckInputs instead of nativeInstallCheckInputs + # https://github.com/nixos/nixpkgs/issues/420531 + nativeCheckInputs = [ versionCheckHook ]; + # doCheck = false; # no tests - restore this after versionCheckHook can be moved + + __structuredAttrs = true; postFixup = '' # Do not propagate Python substituteInPlace $out/nix-support/propagated-build-inputs \ - --replace "${python3}" "" + --replace-fail "${python3}" "" ''; passthru = { diff --git a/pkgs/by-name/gi/git/osxkeychain-link-rust_lib.patch b/pkgs/by-name/gi/git/osxkeychain-link-rust_lib.patch new file mode 100644 index 000000000000..a0015f87888d --- /dev/null +++ b/pkgs/by-name/gi/git/osxkeychain-link-rust_lib.patch @@ -0,0 +1,15 @@ +diff -ur a/Makefile b/Makefile +--- a/Makefile 2026-02-14 15:58:16.624434564 -0500 ++++ b/Makefile 2026-02-14 15:59:25.701016105 -0500 +@@ -4059,9 +4059,9 @@ + contrib/libgit-sys/libgitpub.a: $(LIBGIT_HIDDEN_EXPORT) + $(AR) $(ARFLAGS) $@ $^ + +-contrib/credential/osxkeychain/git-credential-osxkeychain: contrib/credential/osxkeychain/git-credential-osxkeychain.o $(LIB_FILE) GIT-LDFLAGS ++contrib/credential/osxkeychain/git-credential-osxkeychain: contrib/credential/osxkeychain/git-credential-osxkeychain.o $(LIB_FILE) $(RUST_LIB) GIT-LDFLAGS + $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) \ +- $(filter %.o,$^) $(LIB_FILE) $(EXTLIBS) -framework Security -framework CoreFoundation ++ $(filter %.o,$^) $(LIB_FILE) $(RUST_LIB) $(EXTLIBS) -framework Security -framework CoreFoundation + + contrib/credential/osxkeychain/git-credential-osxkeychain.o: contrib/credential/osxkeychain/git-credential-osxkeychain.c GIT-CFLAGS + $(QUIET_LINK)$(CC) -o $@ -c $(dep_args) $(compdb_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $< diff --git a/pkgs/by-name/gi/git/package.nix b/pkgs/by-name/gi/git/package.nix index 7740b9ef2d1f..0706590fe968 100644 --- a/pkgs/by-name/gi/git/package.nix +++ b/pkgs/by-name/gi/git/package.nix @@ -51,7 +51,7 @@ deterministic-host-uname, # trick Makefile into targeting the host platform when cross-compiling doInstallCheck ? !stdenv.hostPlatform.isDarwin, # extremely slow on darwin tests, - rustSupport ? false, + rustSupport ? lib.meta.availableOn stdenv.hostPlatform rustc, cargo, rustc, }: @@ -61,7 +61,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.52.0"; + version = "2.53.0"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI @@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { }.tar.xz" else "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - hash = "sha256-PNj+6G9pqUnLYQ/ujNkmTmhz0H+lhBH2Bgs9YnKe18U="; + hash = "sha256-WBi9fYCwYbu9/sikM9YJ3IgYoFmR9zH/xKVh4soYxlM="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; @@ -130,13 +130,20 @@ stdenv.mkDerivation (finalAttrs: { url = "https://lore.kernel.org/git/20251201031040.1120091-1-brianmlyles@gmail.com/raw"; hash = "sha256-vvhbvg74OIMzfksHiErSnjOZ+W0M/T9J8GOQ4E4wKbU="; }) - # Fixes t8020 test on big-endian + ] + ++ lib.optionals osxkeychainSupport [ + # Fix build failure on Darwin when building Keychain integration + # See https://github.com/git/git/pull/2188 and https://github.com/Homebrew/homebrew-core/pull/266961 (fetchurl { - name = "last-modified-fix-bug-caused-by-inproper-initialized-memory.patch"; - url = "https://lore.kernel.org/git/20251128-toon-big-endian-ci-v1-1-80da0f629c1e@iotcl.com/raw"; - hash = "sha256-WdewOwD7hMhnahhUUEYAlM58tT3MkxUlBa3n8IwrESU="; + name = "osxkeychain-define-build-targets-in-toplevel-Makefile.patch"; + url = "https://lore.kernel.org/git/pull.2046.v2.git.1770775169908.gitgitgadget@gmail.com/raw"; + hash = "sha256-7jTiMM5XFRDj/srtVf8olW62T/mesqLcyRp3NZJcid8="; }) ] + ++ lib.optionals (rustSupport && osxkeychainSupport) [ + # The above patch doesn’t work with Rust support enabled. + ./osxkeychain-link-rust_lib.patch + ] ++ lib.optionals withSsh [ # Hard-code the ssh executable to ${pkgs.openssh}/bin/ssh instead of # searching in $PATH @@ -277,7 +284,7 @@ stdenv.mkDerivation (finalAttrs: { make -C contrib/diff-highlight "''${flagsArray[@]}" '' + lib.optionalString osxkeychainSupport '' - make -C contrib/credential/osxkeychain "''${flagsArray[@]}" + make -C contrib/credential/osxkeychain COMPUTE_HEADER_DEPENDENCIES=no "''${flagsArray[@]}" '' + lib.optionalString withLibsecret '' make -C contrib/credential/libsecret "''${flagsArray[@]}" diff --git a/pkgs/by-name/gl/globus-cli/package.nix b/pkgs/by-name/gl/globus-cli/package.nix index b6f307957362..35d9cd5e1d5c 100644 --- a/pkgs/by-name/gl/globus-cli/package.nix +++ b/pkgs/by-name/gl/globus-cli/package.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { }; build-system = with python3Packages; [ - setuptools + flit-core ruamel-yaml flit-core ]; @@ -33,6 +33,8 @@ python3Packages.buildPythonApplication rec { requests ]; + pythonRelaxDeps = [ "globus-sdk" ]; + nativeBuildInputs = [ installShellFiles ]; nativeCheckInputs = with python3Packages; [ @@ -52,10 +54,6 @@ python3Packages.buildPythonApplication rec { versionCheckHook ]; - pythonRelaxDeps = [ - "globus-sdk" - ]; - versionCheckProgramArg = "version"; postInstall = '' diff --git a/pkgs/by-name/gl/glslang/external-gtest.patch b/pkgs/by-name/gl/glslang/external-gtest.patch new file mode 100644 index 000000000000..3477b7584bfc --- /dev/null +++ b/pkgs/by-name/gl/glslang/external-gtest.patch @@ -0,0 +1,69 @@ +From ab20ba112e6fa5117bfeadde199fdc6c18cbdfb5 Mon Sep 17 00:00:00 2001 +From: OPNA2608 +Date: Mon, 12 Jan 2026 16:41:53 +0100 +Subject: [PATCH] Look for external gtest build, if not building in-tree + +--- + CMakeLists.txt | 12 ++++++++++++ + gtests/CMakeLists.txt | 8 +++----- + 2 files changed, 15 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1e7d3ec9..ecda9c53 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -321,6 +321,18 @@ if(ENABLE_GLSLANG_BINARIES) + add_subdirectory(StandAlone) + endif() + ++option(ALLOW_EXTERNAL_GTEST "Allows to build against installed googletest. This is unsupported if the commit isn't the one in known_good.json") ++set(GMOCK_TARGET gmock) ++if(NOT TARGET ${GMOCK_TARGET}) ++ if(ALLOW_EXTERNAL_GTEST) ++ message(STATUS "Trying to find local googletest") ++ find_package(GTest) ++ if(TARGET GTest::gmock) ++ set(GMOCK_TARGET GTest::gmock) ++ endif() ++ endif() ++endif() ++ + if(GLSLANG_TESTS) + enable_testing() + add_subdirectory(gtests) +diff --git a/gtests/CMakeLists.txt b/gtests/CMakeLists.txt +index 27a5500c..21125775 100644 +--- a/gtests/CMakeLists.txt ++++ b/gtests/CMakeLists.txt +@@ -32,7 +32,7 @@ + # POSSIBILITY OF SUCH DAMAGE. + + if(GLSLANG_TESTS) +- if(TARGET gmock) ++ if(TARGET ${GMOCK_TARGET}) + message(STATUS "Google Mock found - building tests") + + set(TEST_SOURCES +@@ -76,9 +76,7 @@ if(GLSLANG_TESTS) + PRIVATE GLSLANG_TEST_BUILD=1) + target_include_directories(glslangtests PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} +- ${PROJECT_SOURCE_DIR} +- ${gmock_SOURCE_DIR}/include +- ${gtest_SOURCE_DIR}/include) ++ ${PROJECT_SOURCE_DIR}) + + if(ENABLE_OPT) + target_link_libraries(glslangtests +@@ -90,7 +88,7 @@ if(GLSLANG_TESTS) + glslang glslang-default-resource-limits + $<$,$,9.0>>:stdc++fs>) + +- target_link_libraries(glslangtests PRIVATE ${LIBRARIES} gmock) ++ target_link_libraries(glslangtests PRIVATE ${LIBRARIES} ${GMOCK_TARGET}) + + # The TARGET_RUNTIME_DLL_DIRS feature requires CMake 3.27 or greater. + if(WIN32 AND BUILD_SHARED_LIBS AND CMAKE_VERSION VERSION_LESS "3.27") +-- +2.51.2 + diff --git a/pkgs/by-name/gl/glslang/package.nix b/pkgs/by-name/gl/glslang/package.nix index b0fcf1bf56f5..3af77636355d 100644 --- a/pkgs/by-name/gl/glslang/package.nix +++ b/pkgs/by-name/gl/glslang/package.nix @@ -3,6 +3,8 @@ stdenv, fetchFromGitHub, cmake, + ctestCheckHook, + gtest, python3, spirv-headers, spirv-tools, @@ -10,15 +12,21 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "glslang"; - version = "16.1.0"; + version = "16.2.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; tag = finalAttrs.version; - hash = "sha256-cEREniYgSd62mnvKaQkgs69ETL5pLl5Gyv3hKOtSv3w="; + hash = "sha256-2uWnZZNGdZorHaiLzMb/rpM6bL9oBClKqiFkUH3krJQ="; }; + patches = [ + # Allow building against our already-built gtest, without eating a rebuild + # https://github.com/KhronosGroup/glslang/pull/4140 + ./external-gtest.patch + ]; + outputs = [ "bin" "out" @@ -35,12 +43,32 @@ stdenv.mkDerivation (finalAttrs: { spirv-headers ]; + nativeCheckInputs = [ + ctestCheckHook + ]; + + checkInputs = [ + gtest + ]; + cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) (lib.cmakeBool "BUILD_EXTERNAL" false) (lib.cmakeBool "ALLOW_EXTERNAL_SPIRV_TOOLS" true) + (lib.cmakeBool "ALLOW_EXTERNAL_GTEST" finalAttrs.finalPackage.doCheck) ]; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + disabledTests = + # CompileToAstTest.FromFile/array_frag looks for result of UB, expected output is LE + # https://github.com/KhronosGroup/glslang/issues/2797 + # GlslNonSemanticShaderDebugInfoSpirv13Test.FromFile/spv_debuginfo_coopmatKHR_comp has endianness-issues + # https://github.com/KhronosGroup/glslang/issues/4145 + lib.optionals (!stdenv.hostPlatform.isLittleEndian) [ + "glslang-gtests" + ]; + postInstall = '' # add a symlink for backwards compatibility ln -s $bin/bin/glslang $bin/bin/glslangValidator diff --git a/pkgs/by-name/gn/gn/package.nix b/pkgs/by-name/gn/gn/package.nix index f3fc70734fd7..edfc0f2536e5 100644 --- a/pkgs/by-name/gn/gn/package.nix +++ b/pkgs/by-name/gn/gn/package.nix @@ -11,11 +11,11 @@ version ? # This is a workaround for update-source-version to be able to update this let - _version = "0-unstable-2025-10-08"; + _version = "0-unstable-2025-12-01"; in _version, - rev ? "07d3c6f4dc290fae5ca6152ebcb37d6815c411ab", - hash ? "sha256-kIPhfuJBQSISdRjloe0N2JrqvuVrEkNijb92/9zSE9I=", + rev ? "6e0b557db44b3c164094e57687d20ba036a80667", + hash ? "sha256-04h38X/hqWwMiAOVsVu4OUrt8N+S7yS/JXc5yvRGo1I=", }: stdenv.mkDerivation { diff --git a/pkgs/by-name/gn/gnu-config/package.nix b/pkgs/by-name/gn/gnu-config/package.nix index cbabe904f349..bb0a3d799e04 100644 --- a/pkgs/by-name/gn/gnu-config/package.nix +++ b/pkgs/by-name/gn/gnu-config/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + runtimeShell, }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -53,6 +54,19 @@ stdenv.mkDerivation { runHook postInstall ''; + fixupPhase = '' + runHook preFixup + if [[ -z "''${dontPatchShebangs-}" ]]; then + substituteInPlace $out/config.guess \ + --replace-fail '#! /bin/sh' '#!${runtimeShell}' + substituteInPlace $out/config.sub \ + --replace-fail '#! /bin/sh' '#!${runtimeShell}' + fi + runHook postFixup + ''; + + strictDeps = true; + meta = { description = "Attempt to guess a canonical system name"; homepage = "https://savannah.gnu.org/projects/config"; diff --git a/pkgs/by-name/gn/gnutls/package.nix b/pkgs/by-name/gn/gnutls/package.nix index cb61a8d837b0..f47370729a2e 100644 --- a/pkgs/by-name/gn/gnutls/package.nix +++ b/pkgs/by-name/gn/gnutls/package.nix @@ -62,11 +62,11 @@ in stdenv.mkDerivation rec { pname = "gnutls"; - version = "3.8.11"; + version = "3.8.12"; src = fetchurl { url = "mirror://gnupg/gnutls/v${lib.versions.majorMinor version}/gnutls-${version}.tar.xz"; - hash = "sha256-kb0jxKhuvGFS6BMD0gz2zq65e8j4QmbQ+uxuKfF7qiA="; + hash = "sha256-p7NBQhv9RZrPejdMpK87ngZgjc1715Kyv0cL6gErjlE="; }; outputs = [ diff --git a/pkgs/by-name/gr/grpc/package.nix b/pkgs/by-name/gr/grpc/package.nix index 9eff6acea234..8f3bc9bba869 100644 --- a/pkgs/by-name/gr/grpc/package.nix +++ b/pkgs/by-name/gr/grpc/package.nix @@ -25,7 +25,7 @@ # nixpkgs-update: no auto update stdenv.mkDerivation (finalAttrs: { pname = "grpc"; - version = "1.76.0"; # N.B: if you change this, please update: + version = "1.78.0"; # N.B: if you change this, please update: # pythonPackages.grpcio # pythonPackages.grpcio-channelz # pythonPackages.grpcio-health-checking @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "grpc"; repo = "grpc"; tag = "v${finalAttrs.version}"; - hash = "sha256-f25ccZC0pJw00ETgxBtXU6+0OnlJsV7zXjK/ayiCIJY="; + hash = "sha256-hupso9w++lYtAMoLS/qVmUYqZyQAX3rH0I8zCLyBo40="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/he/heisenbridge/package.nix b/pkgs/by-name/he/heisenbridge/package.nix index 625ff384a2c5..e4193a0eaad1 100644 --- a/pkgs/by-name/he/heisenbridge/package.nix +++ b/pkgs/by-name/he/heisenbridge/package.nix @@ -27,6 +27,8 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pythonRelaxDeps = [ "irc" + "ruamel.yaml" + "mautrix" ]; dependencies = with python3.pkgs; [ diff --git a/pkgs/by-name/hi/highfive/package.nix b/pkgs/by-name/hi/highfive/package.nix index 202d6239c11a..2e38ca138c1b 100644 --- a/pkgs/by-name/hi/highfive/package.nix +++ b/pkgs/by-name/hi/highfive/package.nix @@ -3,8 +3,6 @@ stdenv, fetchFromGitHub, cmake, - boost, - eigen, hdf5, mpiSupport ? hdf5.mpiSupport, mpi ? hdf5.mpi, @@ -14,20 +12,18 @@ assert mpiSupport -> mpi != null; stdenv.mkDerivation (finalAttrs: { pname = "highfive${lib.optionalString mpiSupport "-mpi"}"; - version = "2.10.1"; + version = "3.3.0"; src = fetchFromGitHub { - owner = "BlueBrain"; - repo = "HighFive"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-Nv+nbel/xGlGTB8sKF0EM1xwz/ZEri5uGB7ma6Ba6fo="; + owner = "highfive-devs"; + repo = "highfive"; + tag = "v${finalAttrs.version}"; + sha256 = "sha256-BuDvoQgMdZIDHYwXqigM78DQ+WtT+K0FdXERMUjmXc0="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ - boost - eigen hdf5 ]; @@ -36,19 +32,16 @@ stdenv.mkDerivation (finalAttrs: { }; cmakeFlags = [ - "-DHIGHFIVE_USE_BOOST=ON" - "-DHIGHFIVE_USE_EIGEN=ON" "-DHIGHFIVE_EXAMPLES=OFF" "-DHIGHFIVE_UNIT_TESTS=OFF" - "-DHIGHFIVE_USE_INSTALL_DEPS=ON" - (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5") ] - ++ (lib.optionals mpiSupport [ "-DHIGHFIVE_PARALLEL_HDF5=ON" ]); + ++ (lib.optionals mpiSupport [ "-DHDF5_IS_PARALLEL=ON" ]); meta = { description = "Header-only C++ HDF5 interface"; + homepage = "https://github.com/highfive-devs/highfive"; + changelog = "https://github.com/highfive-devs/highfive/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.boost; - homepage = "https://bluebrain.github.io/HighFive/"; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ robertodr ]; }; diff --git a/pkgs/by-name/hw/hwdata/package.nix b/pkgs/by-name/hw/hwdata/package.nix index a523b6ac82d2..354bb477642d 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.403"; + version = "0.404"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${finalAttrs.version}"; - hash = "sha256-90Op2armm7Fg0Eyj5+Md0IMos915wqjv8cqTYVJF/NA="; + hash = "sha256-/OHPLONJF66HN2Xmbo5Ifi+VgevmbQhpsC1RXMKkDBk="; }; doCheck = false; # this does build machine-specific checks (e.g. enumerates PCI bus) diff --git a/pkgs/by-name/hy/hyprpanel/package.nix b/pkgs/by-name/hy/hyprpanel/package.nix index 80eb30425f5f..9cbaf657ceb6 100644 --- a/pkgs/by-name/hy/hyprpanel/package.nix +++ b/pkgs/by-name/hy/hyprpanel/package.nix @@ -25,7 +25,7 @@ networkmanager, nix-update-script, python3, - pywal, + pywal16, stdenv, swww, upower, @@ -79,7 +79,7 @@ ags.bundle { libsoup_3 matugen networkmanager - pywal + pywal16 swww upower wireplumber diff --git a/pkgs/by-name/ia/iana-etc/package.nix b/pkgs/by-name/ia/iana-etc/package.nix index 10fadcb2da6e..da283674f11c 100644 --- a/pkgs/by-name/ia/iana-etc/package.nix +++ b/pkgs/by-name/ia/iana-etc/package.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation rec { pname = "iana-etc"; - version = "20250505"; + version = "20251215"; src = fetchzip { url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz"; - sha256 = "sha256-p+VTQMtuhMu64bPK86dRMA7qpk8PtlgI+/vAuiyljXw="; + sha256 = "sha256-BUGhVHvWSdFJdqaoPasLt87lTUFVF2B7X7sfigwrJss="; }; installPhase = '' diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/by-name/im/imagemagick/package.nix similarity index 95% rename from pkgs/applications/graphics/ImageMagick/default.nix rename to pkgs/by-name/im/imagemagick/package.nix index 6862b5461960..28122b98239f 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/by-name/im/imagemagick/package.nix @@ -54,6 +54,7 @@ potrace, coreutils, curl, + versionCheckHook, testers, nixos-icons, perlPackages, @@ -85,13 +86,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.2-12"; + version = "7.1.2-13"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; tag = finalAttrs.version; - hash = "sha256-0X8Zpr4frknRbWzAu1nprok2ceScTHV8d4+ktnBpQF0="; + hash = "sha256-meADRjoV1c48laD35TuWAwuE95L90agROuuKBd++Kn8="; }; outputs = [ @@ -173,7 +174,7 @@ stdenv.mkDerivation (finalAttrs: { configDestination=($out/share/ImageMagick-*) grep -v '/nix/store' $dev/lib/ImageMagick-*/config-Q16HDRI/configure.xml > $configDestination/configure.xml for file in "$dev"/bin/*-config; do - substituteInPlace "$file" --replace pkg-config \ + substituteInPlace "$file" --replace-fail "$PKG_CONFIG" \ "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '$(command -v $PKG_CONFIG)'" done '' @@ -183,8 +184,13 @@ stdenv.mkDerivation (finalAttrs: { done ''; + doInstallCheck = true; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + passthru.tests = { - version = testers.testVersion { package = finalAttrs.finalPackage; }; inherit nixos-icons; inherit (perlPackages) ImageMagick; inherit (python3.pkgs) img2pdf willow; diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/by-name/im/imagemagick6/package.nix similarity index 100% rename from pkgs/applications/graphics/ImageMagick/6.x.nix rename to pkgs/by-name/im/imagemagick6/package.nix diff --git a/pkgs/by-name/im/imlib2/package.nix b/pkgs/by-name/im/imlib2/package.nix index c20a777b9a27..716707df70ab 100644 --- a/pkgs/by-name/im/imlib2/package.nix +++ b/pkgs/by-name/im/imlib2/package.nix @@ -44,11 +44,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "imlib2"; - version = "1.12.5"; + version = "1.12.6"; src = fetchurl { url = "mirror://sourceforge/enlightenment/imlib2-${finalAttrs.version}.tar.xz"; - hash = "sha256-+iMV8oN5tDCm5mBbQoSwe+BqPvQi1PXhybskcUxM9t0="; + hash = "sha256-JQ+XUvadxSLlKagaqpOVcF9/wxL/JFPl3lmsK6HyhY8="; }; buildInputs = [ diff --git a/pkgs/by-name/im/immich-machine-learning/package.nix b/pkgs/by-name/im/immich-machine-learning/package.nix index 92bf2b833aab..d56a22565a18 100644 --- a/pkgs/by-name/im/immich-machine-learning/package.nix +++ b/pkgs/by-name/im/immich-machine-learning/package.nix @@ -17,6 +17,7 @@ python.pkgs.buildPythonApplication rec { pyproject = true; pythonRelaxDeps = [ + "huggingface-hub" "numpy" "pillow" "pydantic-settings" diff --git a/pkgs/by-name/in/inetutils/package.nix b/pkgs/by-name/in/inetutils/package.nix index 460b2bbf5eec..8b3d074e30fc 100644 --- a/pkgs/by-name/in/inetutils/package.nix +++ b/pkgs/by-name/in/inetutils/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchurl, + fetchpatch, ncurses, perl, help2man, @@ -9,26 +10,38 @@ libxcrypt, util-linux, }: - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "inetutils"; - version = "2.6"; + version = "2.7"; src = fetchurl { - url = "mirror://gnu/inetutils/inetutils-${version}.tar.xz"; - hash = "sha256-aL7b/q9z99hr4qfZm8+9QJPYKfUncIk5Ga4XTAsjV8o="; + url = "mirror://gnu/inetutils/inetutils-${finalAttrs.version}.tar.gz"; + hash = "sha256-oVa+HN48XA/+/CYhgNk2mmBIQIeQeqVUxieH0vQOwIY="; }; outputs = [ "out" "apparmor" + "info" + "man" ]; patches = [ # https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3 ./inetutils-1_9-PATH_PROCNET_DEV.patch - ./tests-libls.sh.patch + (if stdenv.isDarwin then ./tests-libls-2.sh.patch else ./tests-libls.sh.patch) + + (fetchpatch { + name = "CVE-2026-24061_1.patch"; + url = "https://codeberg.org/inetutils/inetutils/commit/fd702c02497b2f398e739e3119bed0b23dd7aa7b.patch"; + hash = "sha256-d/FdQyLD0gYr+erFqKDr8Okf04DFXknFaN03ls2aonQ="; + }) + (fetchpatch { + name = "CVE-2026-24061_2.patch"; + url = "https://codeberg.org/inetutils/inetutils/commit/ccba9f748aa8d50a38d7748e2e60362edd6a32cc.patch"; + hash = "sha256-ws+ed5vb7kVMHEbqK7yj6FUT355pTv2RZEYuXs5M7Io="; + }) ]; strictDeps = true; @@ -64,6 +77,8 @@ stdenv.mkDerivation rec { ] ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-servers"; + ${if stdenv.isDarwin then "hardeningDisable" else null} = [ "format" ]; + doCheck = true; installFlags = [ "SUIDMODE=" ]; @@ -110,4 +125,4 @@ stdenv.mkDerivation rec { */ priority = (util-linux.meta.priority or lib.meta.defaultPriority) + 1; }; -} +}) diff --git a/pkgs/by-name/in/inetutils/tests-libls-2.sh.patch b/pkgs/by-name/in/inetutils/tests-libls-2.sh.patch new file mode 100644 index 000000000000..41c566811cac --- /dev/null +++ b/pkgs/by-name/in/inetutils/tests-libls-2.sh.patch @@ -0,0 +1,18 @@ +tests: Remove bogus test for unsorted file listing and tests for -u and -c, which fail on apfs. + +Minimized from what Debian applies: +https://git.hadrons.org/cgit/debian/pkgs/inetutils.git/tree/debian/patches/local/0006-tests-Remove-bogus-test-for-unsorted-file-listing.patch?id=8ab7f49fe5cf194e989ae6ae6a78eb65397c5778 +--- a/tests/libls.sh ++++ b/tests/libls.sh +@@ -94 +93,0 @@ REPLY_C=`$LS -C $LSDIR` +-REPLY_Cf=`$LS -Cf $LSDIR` +@@ -108,2 +106,0 @@ REPLY_n=`$LS -n $LSDIR` +-REPLY_Ccts=`$LS -Ccts $LSDIR` +-REPLY_Cuts=`$LS -Cuts $LSDIR` +@@ -133,2 +129,0 @@ test `echo "$diff" | $GREP -c -v '^[.]\{1,2\}$'` -eq 0 || +-test x"$REPLY_C" != x"$REPLY_Cf" || +- { errno=1; echo >&2 'Failed to disable sorting with "-f".'; } +@@ -153,3 +146,0 @@ test x"$REPLY_l" != x"$REPLY_n" || +-test x"$REPLY_Ccts" != x"$REPLY_Cuts" || +- { errno=1; echo >&2 'Failed to distinguish "-u" from "-c".'; } +- diff --git a/pkgs/by-name/in/innoextract/package.nix b/pkgs/by-name/in/innoextract/package.nix index 7e8db93d1ad0..365a1745966a 100644 --- a/pkgs/by-name/in/innoextract/package.nix +++ b/pkgs/by-name/in/innoextract/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, cmake, makeWrapper, - boost, + boost188, xz, libiconv, withGog ? false, @@ -25,7 +25,9 @@ stdenv.mkDerivation { buildInputs = [ xz - boost + # pin to oplder boost188 as boost189 + # fails to find cmake bits: https://github.com/dscharrer/innoextract/pull/199 + boost188 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; diff --git a/pkgs/by-name/is/isocodes/package.nix b/pkgs/by-name/is/isocodes/package.nix index 49cc31de2aca..9b717758c76d 100644 --- a/pkgs/by-name/is/isocodes/package.nix +++ b/pkgs/by-name/is/isocodes/package.nix @@ -3,28 +3,34 @@ stdenv, fetchurl, gettext, + meson, + ninja, python3, testers, }: stdenv.mkDerivation (finalAttrs: { pname = "iso-codes"; - version = "4.19.0"; + version = "4.20.1"; src = fetchurl { url = with finalAttrs; - "https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/v${version}/${pname}-v${version}.tar.gz"; - hash = "sha256-SxQ6iR/rfRu2TkT+PvJT7za6EYXR0SnBQlM43G5G4n0="; + "https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/v${version}/iso-codes-v${version}.tar.gz"; + hash = "sha256-LX2fYISrnObFNM5xo91RRLbkdPPJdhZFmoj3P0SmS/8="; }; + postPatch = '' + patchShebangs scripts + ''; + nativeBuildInputs = [ gettext + meson + ninja python3 ]; - enableParallelBuilding = true; - passthru.tests = { pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; diff --git a/pkgs/by-name/ja/jack2/package.nix b/pkgs/by-name/ja/jack2/package.nix index 5ff5b4b47661..5f460514b1d7 100644 --- a/pkgs/by-name/ja/jack2/package.nix +++ b/pkgs/by-name/ja/jack2/package.nix @@ -16,6 +16,7 @@ # Optional Dependencies dbus ? null, + expat, # for dbus libffado ? null, alsa-lib ? null, @@ -66,6 +67,7 @@ stdenv.mkDerivation (finalAttrs: { optLibffado optAlsaLib ] + ++ lib.optionals (optDbus != null) [ expat ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ aften ] diff --git a/pkgs/by-name/ja/jansson/package.nix b/pkgs/by-name/ja/jansson/package.nix index b16e87636424..8b6f8b77da8e 100644 --- a/pkgs/by-name/ja/jansson/package.nix +++ b/pkgs/by-name/ja/jansson/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "jansson"; - version = "2.14.1"; + version = "2.15.0"; outputs = [ "dev" @@ -20,8 +20,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "akheron"; repo = "jansson"; - rev = "v${finalAttrs.version}"; - hash = "sha256-ct/EzRDrHkZrCcm98XGCbjbOM2h3AAMldPoTWA5+dAE="; + tag = "v${finalAttrs.version}"; + hash = "sha256-s7g1QvJjl9LsWw+VZsTQHCoEgw2Ad9+8V0b2NFml5rw="; }; nativeBuildInputs = [ @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "C library for encoding, decoding and manipulating JSON data"; homepage = "https://github.com/akheron/jansson"; - changelog = "https://github.com/akheron/jansson/raw/${finalAttrs.src.rev}/CHANGES"; + changelog = "https://github.com/akheron/jansson/raw/${finalAttrs.src.tag}/CHANGES"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ getchoo ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/ke/kea/boost-1.89.patch b/pkgs/by-name/ke/kea/boost-1.89.patch new file mode 100644 index 000000000000..b8bba747075f --- /dev/null +++ b/pkgs/by-name/ke/kea/boost-1.89.patch @@ -0,0 +1,61 @@ +https://gitlab.isc.org/isc-projects/kea/-/commit/b03071ba6912a08e4cc4cb4db50d9624ce86f41e + +From b03071ba6912a08e4cc4cb4db50d9624ce86f41e Mon Sep 17 00:00:00 2001 +From: Francis Dupont +Date: Fri, 29 Aug 2025 00:40:03 +0200 +Subject: [PATCH] [#4085] Proposed update + +--- + meson.build | 3 ++- + src/lib/asiodns/io_fetch.h | 1 + + src/lib/asiolink/interval_timer.h | 1 + + 3 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 434abf58313..fbd76dce5e5 100644 +--- a/meson.build ++++ b/meson.build +@@ -189,7 +189,7 @@ message(f'Detected system "@SYSTEM@".') + + #### Dependencies + +-boost_dep = dependency('boost', version: '>=1.66', modules: ['system']) ++boost_dep = dependency('boost', version: '>=1.66') + dl_dep = dependency('dl') + threads_dep = dependency('threads') + add_project_dependencies(boost_dep, dl_dep, threads_dep, language: ['cpp']) +@@ -200,6 +200,7 @@ boost_headers = [ + 'boost/asio/coroutine.hpp', + 'boost/asio/io_context.hpp', + 'boost/asio/ip/address.hpp', ++ 'boost/asio/deadline_timer.hpp', + 'boost/asio/signal_set.hpp', + 'boost/circular_buffer.hpp', + 'boost/date_time/posix_time/posix_time_types.hpp', +diff --git a/src/lib/asiodns/io_fetch.h b/src/lib/asiodns/io_fetch.h +index 6fcbb78abb0..3053cc2e0a2 100644 +--- a/src/lib/asiodns/io_fetch.h ++++ b/src/lib/asiodns/io_fetch.h +@@ -16,6 +16,7 @@ + #include + + #include ++#include + #include + #include + #include +diff --git a/src/lib/asiolink/interval_timer.h b/src/lib/asiolink/interval_timer.h +index 0b1c10c7882..790d132b42a 100644 +--- a/src/lib/asiolink/interval_timer.h ++++ b/src/lib/asiolink/interval_timer.h +@@ -7,6 +7,7 @@ + #ifndef ASIOLINK_INTERVAL_TIMER_H + #define ASIOLINK_INTERVAL_TIMER_H 1 + ++#include + #include + #include + +-- +GitLab + diff --git a/pkgs/by-name/ke/kea/package.nix b/pkgs/by-name/ke/kea/package.nix index c2017262a9e5..3acec26710ae 100644 --- a/pkgs/by-name/ke/kea/package.nix +++ b/pkgs/by-name/ke/kea/package.nix @@ -38,6 +38,9 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./dont-create-system-paths.patch + # backport of an upstream fix for boost-1.89: + # https://gitlab.isc.org/isc-projects/kea/-/merge_requests/2771 + ./boost-1.89.patch ]; postPatch = '' diff --git a/pkgs/by-name/lc/lcms2/package.nix b/pkgs/by-name/lc/lcms2/package.nix index e6976467c455..ecb0c3280adb 100644 --- a/pkgs/by-name/lc/lcms2/package.nix +++ b/pkgs/by-name/lc/lcms2/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "lcms2"; - version = "2.17"; + version = "2.18"; src = fetchurl { url = "mirror://sourceforge/lcms/lcms2-${version}.tar.gz"; - hash = "sha256-0Rr1aeQqG6oWUNIK1h0S5Br0/q1Kp5ZKAfk7CLU6sHQ="; + hash = "sha256-7me+NWb0WTYsHuCU/eLBWdM/oDkKpO1fWvZ2+eUAQ0c="; }; outputs = [ diff --git a/pkgs/by-name/ld/ld64/package.nix b/pkgs/by-name/ld/ld64/package.nix index f6a1dfc2cdf8..6ecbc20da105 100644 --- a/pkgs/by-name/ld/ld64/package.nix +++ b/pkgs/by-name/ld/ld64/package.nix @@ -73,6 +73,10 @@ stdenv.mkDerivation (finalAttrs: { ./patches/0016-Add-dyldinfo-to-the-ld64-build.patch ./patches/0017-Fix-dyldinfo-build.patch ./patches/0018-Use-STL-containers-instead-of-LLVM-containers.patch + + # Fix zippered versions on macOS 26+. Part of upstream ld64-956.6. Remove on next version bump. + # https://github.com/apple-oss-distributions/ld64/commit/1a4389663d65d6630e4b3e31ace2a86b6183b452 + ./patches/0019-Fix-zippered-versions-macos-26.patch ]; prePatch = '' diff --git a/pkgs/by-name/ld/ld64/patches/0019-Fix-zippered-versions-macos-26.patch b/pkgs/by-name/ld/ld64/patches/0019-Fix-zippered-versions-macos-26.patch new file mode 100644 index 000000000000..06f5ce310272 --- /dev/null +++ b/pkgs/by-name/ld/ld64/patches/0019-Fix-zippered-versions-macos-26.patch @@ -0,0 +1,13 @@ +diff --git a/src/ld/Options.cpp b/src/ld/Options.cpp +--- a/src/ld/Options.cpp ++++ b/src/ld/Options.cpp +@@ -4882,7 +4885,8 @@ void Options::reconfigureDefaults() + uint32_t iOSMacOSMajorVersion = (iOSMacVersion >> 16) & 0xFFFF; + + // macOS 11 -> iOSMac 14, and so on +- uint32_t newMajorVersion = macOSMajorVersion + 3; ++ uint32_t newMajorVersion = macOSMajorVersion < 26 ? macOSMajorVersion + 3 : macOSMajorVersion; ++ // rdar://154107557 (ld64 fix handling of zippered versions for macOS 26+) + if ( newMajorVersion > iOSMacOSMajorVersion ) { + uint32_t newVersion = newMajorVersion << 16; + std::string oldVersionString = getVersionString32(iOSMacVersion); diff --git a/pkgs/by-name/le/less/package.nix b/pkgs/by-name/le/less/package.nix index 711f3be6711c..6e4272c156f9 100644 --- a/pkgs/by-name/le/less/package.nix +++ b/pkgs/by-name/le/less/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "less"; - version = "685"; + version = "691"; # `less` is provided by the following sources: # - meta.homepage @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { # homepage, and only those not marked as beta. src = fetchurl { url = "https://www.greenwoodsoftware.com/less/less-${finalAttrs.version}.tar.gz"; - hash = "sha256-JwEEHnZ+aX7kIM4IJWQc7cjyC1FXar6Z2SwWZtMy6dw="; + hash = "sha256-iLSA7aG7T5IAn3losjGJ6vEykhH1o1FYaeEz0oYVTSU="; }; buildInputs = [ diff --git a/pkgs/by-name/li/libadwaita/package.nix b/pkgs/by-name/li/libadwaita/package.nix index 15eb730ff1fd..8f17183cb39a 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.8.3"; + version = "1.8.4"; outputs = [ "out" @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GNOME"; repo = "libadwaita"; tag = finalAttrs.version; - hash = "sha256-IrniaMcsM1ZADNNgAmT3ELbkcwPTpYIBf8lOY4TaLd0="; + hash = "sha256-Dj1QJatjnK7Rb+SZLiRO0eHERzqmoq01n8fUE7SVWMI="; }; depsBuildBuild = [ diff --git a/pkgs/by-name/li/libargon2/package.nix b/pkgs/by-name/li/libargon2/package.nix index 58bcb4caa6d3..b798b895b4af 100644 --- a/pkgs/by-name/li/libargon2/package.nix +++ b/pkgs/by-name/li/libargon2/package.nix @@ -41,6 +41,11 @@ stdenv.mkDerivation (finalAttrs: { "LINKED_LIB_EXT=" ]; + outputs = [ + "out" + "dev" + ]; + meta = { description = "Key derivation function that was selected as the winner of the Password Hashing Competition in July 2015"; longDescription = '' diff --git a/pkgs/by-name/li/libavc1394/package.nix b/pkgs/by-name/li/libavc1394/package.nix index b99d5c9bbe5f..a51d65ab76b1 100644 --- a/pkgs/by-name/li/libavc1394/package.nix +++ b/pkgs/by-name/li/libavc1394/package.nix @@ -20,7 +20,9 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ libraw1394 ]; - NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-largp"; + env = lib.optionalAttrs stdenv.hostPlatform.isMusl { + NIX_LDFLAGS = "-largp"; + }; meta = { description = "Programming interface for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set"; diff --git a/pkgs/by-name/li/libblake3/package.nix b/pkgs/by-name/li/libblake3/package.nix index 6259025537b9..da12d4c73181 100644 --- a/pkgs/by-name/li/libblake3/package.nix +++ b/pkgs/by-name/li/libblake3/package.nix @@ -3,7 +3,6 @@ stdenv, cmake, fetchFromGitHub, - fetchpatch, onetbb, useTBB ? lib.meta.availableOn stdenv.hostPlatform onetbb, @@ -11,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libblake3"; - version = "1.8.2"; + version = "1.8.3"; outputs = [ "out" @@ -22,30 +21,9 @@ stdenv.mkDerivation (finalAttrs: { owner = "BLAKE3-team"; repo = "BLAKE3"; tag = finalAttrs.version; - hash = "sha256-IABVErXWYQFXZcwsFKfQhm3ox7UZUcW5uzVrGwsSp94="; + hash = "sha256-aj+fru2saqWxDDiV3mNCZZeZIGTxSgta/X50R87hoko="; }; - patches = [ - # build(cmake): Use tbb32 pkgconfig package on 32-bit builds (BLAKE3-team/BLAKE3#482) - (fetchpatch { - url = "https://github.com/BLAKE3-team/BLAKE3/commit/dab799623310c8f4be6575002d5c681c09a0e209.patch"; - hash = "sha256-npCtM8nOFU8Tcu//IykjMs8aLU12d93+mIfKuxHkuaQ="; - relative = "c"; - }) - # build(cmake): Relax Clang frontend variant detection (BLAKE3-team/BLAKE3#477) - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/BLAKE3-team/BLAKE3/pull/477.patch"; - hash = "sha256-kidCMGd/i9D9HLLTt7l1DbiU71sFTEyr3Vew4XHUHls="; - relative = "c"; - }) - # fix cygwin build - (fetchpatch { - url = "https://github.com/BLAKE3-team/BLAKE3/commit/d62babb7ebb01c8ac4aaa580f4b49071a639195e.patch"; - hash = "sha256-qO8HsmBIAkR03rqITooyBiQTorUM6JCJLZOrOc2yss8="; - relative = "c"; - }) - ]; - sourceRoot = finalAttrs.src.name + "/c"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/li/libcamera/package.nix b/pkgs/by-name/li/libcamera/package.nix index 2b76cf35e5d6..7c7ae06fd369 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.6.0"; + version = "0.7.0"; src = fetchgit { url = "https://git.libcamera.org/libcamera/libcamera.git"; rev = "v${version}"; - hash = "sha256-zGcbzL1Q2hUaj/s9NjBlp7hVjmSFb0GF8CnCoDS82Tw="; + hash = "sha256-W9pRE8/0Cf2EEP5bbvy4FsDSeKKSklfJb6T48ZN4dzE="; }; outputs = [ @@ -121,6 +121,10 @@ stdenv.mkDerivation rec { # Given that upstream also provides public documentation, # we can disable it here. "-Ddocumentation=disabled" + ] + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ + # we don't have tensorflow-lite to build this + "-Drpi-awb-nn=disabled" ]; env = { diff --git a/pkgs/by-name/li/libcap_ng/package.nix b/pkgs/by-name/li/libcap_ng/package.nix index da302c3cf49b..c5fab14e7db0 100644 --- a/pkgs/by-name/li/libcap_ng/package.nix +++ b/pkgs/by-name/li/libcap_ng/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, autoreconfHook, + pkg-config, swig, testers, nix-update-script, @@ -10,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libcap-ng"; - version = "0.8.5"; + version = "0.9"; src = fetchFromGitHub { owner = "stevegrubb"; repo = "libcap-ng"; tag = "v${finalAttrs.version}"; - hash = "sha256-qcHIHG59PDPfPsXA1r4hG4QhK2qyE7AgXOwUDjIy7lE="; + hash = "sha256-KF4SaES6FYuoBoZB+hhWlFuQemWM4Vg8aybCOgXM+Uc="; }; # NEWS needs to exist or else the build fails @@ -29,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook + pkg-config swig ]; diff --git a/pkgs/by-name/li/libheif/package.nix b/pkgs/by-name/li/libheif/package.nix index 14168a25b284..9c3bb60b8015 100644 --- a/pkgs/by-name/li/libheif/package.nix +++ b/pkgs/by-name/li/libheif/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, pkg-config, dav1d, @@ -41,6 +42,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-PVfdX3/Oe3DXpYU5WMnCSi2p9X4fPszq2X3uuyh8RVU="; }; + patches = [ + # CVE-2025-68431 (https://github.com/strukturag/libheif/security/advisories/GHSA-j87x-4gmq-cqfq) + (fetchpatch { + name = "001-fix-wrong-copy-width-in-overlay-images.patch"; + url = "https://github.com/strukturag/libheif/commit/b8c12a7b70f46c9516711a988483bed377b78d46.patch"; + hash = "sha256-PzGfcbdWAPdfExbSrPQwpk4v++TcNCXOhtwhgLGM13c="; + }) + ]; + nativeBuildInputs = [ pkg-config cmake diff --git a/pkgs/by-name/li/libhwy/package.nix b/pkgs/by-name/li/libhwy/package.nix index cf30a6fe94d5..d78d12faf698 100644 --- a/pkgs/by-name/li/libhwy/package.nix +++ b/pkgs/by-name/li/libhwy/package.nix @@ -10,26 +10,30 @@ stdenv.mkDerivation rec { pname = "libhwy"; - version = "1.0.7"; + version = "1.3.0"; src = fetchFromGitHub { owner = "google"; repo = "highway"; rev = version; - hash = "sha256-Z+mAR9nSAbCskUvo6oK79Yd85bu0HtI2aR5THS1EozM="; + hash = "sha256-8QOk96Y3GIIvBUGIDikMgTylx8y5aCyr68/TP5w5ha4="; }; - patches = - lib.optional stdenv.hostPlatform.isRiscV - # Adds CMake option HWY_CMAKE_RVV - # https://github.com/google/highway/pull/1743 - ( - fetchpatch { - name = "libhwy-add-rvv-optout.patch"; - url = "https://github.com/google/highway/commit/5d58d233fbcec0c6a39df8186a877329147324b3.patch"; - hash = "sha256-ileSNYddOt1F5rooRB0fXT20WkVlnG+gP5w7qJdBuww="; - } - ); + patches = [ + # Apply upstream workaround for gcc-15 bug: + # https://github.com/google/highway/issues/2813 + # https://github.com/google/highway/pull/2824 + (fetchpatch { + name = "gcc-15-clone-hack-prerequisite.patch"; + url = "https://github.com/google/highway/commit/3b680cde3a556bead9cc23c8f595d07a44d5a0d5.patch"; + hash = "sha256-8xBPuhsifalhzKgeEOQq6yZw2NWas+SFQrNIaMicRnY="; + }) + (fetchpatch { + name = "gcc-15-clone-hack.patch"; + url = "https://github.com/google/highway/commit/5af21b8a9078330a3d7456d855e69245bb87bc7a.patch"; + hash = "sha256-hC/oEdxHsdZKlLFIw929ZHjffPURGzk9jiKz6iGSLkY="; + }) + ]; hardeningDisable = lib.optionals stdenv.hostPlatform.isAarch64 [ # aarch64-specific code gets: diff --git a/pkgs/by-name/li/libjxl/package.nix b/pkgs/by-name/li/libjxl/package.nix index baafab3033bf..040b1d7a0bef 100644 --- a/pkgs/by-name/li/libjxl/package.nix +++ b/pkgs/by-name/li/libjxl/package.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitHub, - fetchpatch, brotli, cmake, ctestCheckHook, @@ -32,7 +31,7 @@ in stdenv.mkDerivation rec { pname = "libjxl"; - version = "0.11.1"; + version = "0.11.2"; outputs = [ "out" @@ -43,7 +42,7 @@ stdenv.mkDerivation rec { owner = "libjxl"; repo = "libjxl"; tag = "v${version}"; - hash = "sha256-ORwhKOp5Nog366UkLbuWpjz/6sJhxUO6+SkoJGH+3fE="; + hash = "sha256-L4/BY68ZBCpebQxryR7D1CxrsneYvw8B8EvW2mkF7bA="; # There are various submodules in `third_party/`. fetchSubmodules = true; }; @@ -145,17 +144,6 @@ stdenv.mkDerivation rec { rm -rf third_party/!(sjpeg)/ shopt -u extglob - # Fix the build with CMake 4. - # - # See: - # - # * - # * - substituteInPlace third_party/sjpeg/CMakeLists.txt \ - --replace-fail \ - 'cmake_minimum_required(VERSION 2.8.7)' \ - 'cmake_minimum_required(VERSION 3.5...3.10)' - substituteInPlace plugins/gdk-pixbuf/jxl.thumbnailer \ --replace '/usr/bin/gdk-pixbuf-thumbnailer' "$out/libexec/gdk-pixbuf-thumbnailer-jxl" substituteInPlace CMakeLists.txt \ diff --git a/pkgs/by-name/li/liblas/package.nix b/pkgs/by-name/li/liblas/package.nix index ad61379d71c5..ef79672bd975 100644 --- a/pkgs/by-name/li/liblas/package.nix +++ b/pkgs/by-name/li/liblas/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, fetchpatch, boost, cmake, @@ -14,46 +14,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "liblas"; - version = "1.8.1"; + version = "1.8.1-unstable-2025-11-08"; - src = fetchurl { - url = "https://download.osgeo.org/liblas/libLAS-${finalAttrs.version}.tar.bz2"; - sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws"; + src = fetchFromGitHub { + owner = "libLAS"; + repo = "libLAS"; + rev = "0756b73ed41211d1bb8d9b96c6767f2350d8fe2b"; + hash = "sha256-A+Ek3MVw2wcmVSn1qFNLS59rbgTW+Nlzy6NCZIQ+y7I="; }; patches = [ - (fetchpatch { - name = "aarch64-darwin.patch"; - url = "https://github.com/libLAS/libLAS/commit/ded463732db1f9baf461be6f3fe5b8bb683c41cd.patch"; - sha256 = "sha256-aWMpazeefDHE9OzuLR3FJ8+oXeGhEsk1igEm6j2DUnw="; - }) - (fetchpatch { - name = "fix-build-with-boost-1.73-1.patch"; - url = "https://github.com/libLAS/libLAS/commit/af431abce95076b59f4eb7c6ef0930ca57c8a063.patch"; - hash = "sha256-2lr028t5hq3oOLZFXnvIJXCUsoVHbG/Mus93OZvi5ZU="; - }) - (fetchpatch { - name = "fix-build-with-boost-1.73-2.patch"; - url = "https://github.com/libLAS/libLAS/commit/0d3b8d75f371a6b7c605bbe5293091cb64a7e2d3.patch"; - hash = "sha256-gtNIazR+l1h+Xef+4qQc7EVi+Nlht3F8CrwkINothtA="; - }) - # remove on update. fix compile error in apps/las2col.c - # https://github.com/libLAS/libLAS/pull/151 - (fetchpatch { - name = "fflush-x2-is-not-an-fsync.patch"; - url = "https://github.com/libLAS/libLAS/commit/e789d43df4500da0c12d2f6d3ac1d031ed835493.patch"; - hash = "sha256-0zI0NvOt9C5BPrfAbgU1N1kj3rZFB7rf0KRj7yemyWI="; - }) - (fetchpatch { - name = "set-macos-rpath-to-off-explicitly.patch"; - url = "https://github.com/libLAS/libLAS/commit/ce9bc0da9e5d1eb8527259854aa826df062ed18e.patch"; - hash = "sha256-Rse0p8bNgORNaw/EBbu0i2/iVmikFyeloJL8YkYarn0="; - }) - (fetchpatch { - name = "fix-findLASZIP.patch"; - url = "https://github.com/libLAS/libLAS/commit/be77a75f475ec8d59c0dae1c3c896289bcb5a287.patch"; - hash = "sha256-5XDexk3IW7s2/G27GXkWp7cw1WZyQLMk/lTpfOM6PM0="; - }) (fetchpatch { name = "fix-gcc15.patch"; url = "https://gitlab.archlinux.org/archlinux/packaging/packages/liblas/-/raw/1.8.1.r128+gded46373-17/liblas-gcc15.patch"; @@ -61,16 +31,11 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - # Disable setting of C++98 standard which was dropped in boost 1.84.0 - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail 'set(CMAKE_CXX_FLAGS "''${CMAKE_CXX_FLAGS} -std=c++98 -ansi")' '#' - '' # Upstream libLAS still uses cmake_minimum_required(VERSION 2.8.11). # This is not compatible with CMake 4, because support for CMake < 3.5 has been removed. - + '' + postPatch = '' substituteInPlace CMakeLists.txt \ - --replace-fail 'cmake_minimum_required(VERSION 2.6.0)' 'cmake_minimum_required(VERSION 3.10)' + --replace-fail 'cmake_minimum_required(VERSION 2.8.11)' 'cmake_minimum_required(VERSION 3.10)' ''; nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; diff --git a/pkgs/by-name/li/liblqr1/package.nix b/pkgs/by-name/li/liblqr1/package.nix index 337381f04d71..fbfd9bf0d8bf 100644 --- a/pkgs/by-name/li/liblqr1/package.nix +++ b/pkgs/by-name/li/liblqr1/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "liblqr-1"; - version = "0.4.2"; + version = "0.4.3"; outputs = [ "out" @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "carlobaldassi"; repo = "liblqr"; rev = "v${finalAttrs.version}"; - hash = "sha256-rgVX+hEGRfWY1FvwDBLy5nLPOyh2JE4+lB0KOmahuYI="; + hash = "sha256-RN58r9AUceziWfZBqyAjjPXrdfilR6cxn3FzQxiQEdE="; }; # Fix build with gcc15 diff --git a/pkgs/by-name/li/libmbim/package.nix b/pkgs/by-name/li/libmbim/package.nix index c81226a8c509..9a61356c8463 100644 --- a/pkgs/by-name/li/libmbim/package.nix +++ b/pkgs/by-name/li/libmbim/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libmbim"; - version = "1.32.0"; + version = "1.34.0"; outputs = [ "out" @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "mobile-broadband"; repo = "libmbim"; rev = finalAttrs.version; - hash = "sha256-+4INXuH2kbKs9C6t4bOJye7yyfYH/BLukmgDVvXo+u0="; + hash = "sha256-NhSjW1ZK4XFv7L/IaoTjN5ojwjTDQa178k73zoaneuE="; }; mesonFlags = [ diff --git a/pkgs/by-name/li/libmd/package.nix b/pkgs/by-name/li/libmd/package.nix index d64679f607f9..3ecb7834f29b 100644 --- a/pkgs/by-name/li/libmd/package.nix +++ b/pkgs/by-name/li/libmd/package.nix @@ -23,6 +23,12 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook ]; + outputs = [ + "out" + "dev" + "man" + ]; + meta = { homepage = "https://www.hadrons.org/software/libmd/"; changelog = "https://archive.hadrons.org/software/libmd/libmd-${finalAttrs.version}.announce"; diff --git a/pkgs/by-name/li/libmnl/package.nix b/pkgs/by-name/li/libmnl/package.nix index ed9e2570b138..f6f521e260df 100644 --- a/pkgs/by-name/li/libmnl/package.nix +++ b/pkgs/by-name/li/libmnl/package.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-J0ubkZ7zFSv7PaOhPJUN1g1uK81UIw/+yimNA7QNBSU="; }; + outputs = [ + "out" + "dev" + ]; + meta = { description = "Minimalistic user-space library oriented to Netlink developers"; longDescription = '' diff --git a/pkgs/by-name/li/libnotify/package.nix b/pkgs/by-name/li/libnotify/package.nix index 28b9eacefb7b..d31ba706e0a8 100644 --- a/pkgs/by-name/li/libnotify/package.nix +++ b/pkgs/by-name/li/libnotify/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - fetchpatch, meson, ninja, pkg-config, @@ -20,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libnotify"; - version = "0.8.7"; + version = "0.8.8"; outputs = [ "out" @@ -30,18 +29,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/libnotify/${lib.versions.majorMinor version}/libnotify-${version}.tar.xz"; - hash = "sha256-S+FSAuxBhPzhrBWZfs5VMNK+Mv6Vc4da6xDjtXOFh0g="; + hash = "sha256-I0IO9hncLLWuutYT9II6L6QcB+Wh0FYo1A9uxLNb/d0="; }; - patches = [ - # build: Do not use GDesktopAppInfo if not available - # https://gitlab.gnome.org/GNOME/libnotify/-/issues/62 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/libnotify/-/commit/13de65ad2a76255ffde5d6da91d246cd7226583b.patch"; - hash = "sha256-a1wiUQnrncPqL2OTY1sUWyvVcoI54bXPvkIkZAcC6kI="; - }) - ]; - mesonFlags = [ # disable tests as we don't need to depend on GTK 4 "-Dtests=false" diff --git a/pkgs/by-name/li/libopus/package.nix b/pkgs/by-name/li/libopus/package.nix index ec138dc62b81..94c4d9d1fa4b 100644 --- a/pkgs/by-name/li/libopus/package.nix +++ b/pkgs/by-name/li/libopus/package.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libopus"; - version = "1.5.2"; + version = "1.6.1"; src = fetchurl { url = "https://downloads.xiph.org/releases/opus/opus-${finalAttrs.version}.tar.gz"; - hash = "sha256-ZcHS94ufL7IAgsOMvkfJUa1YOTRYduRpQWEu6H+afOE="; + hash = "sha256-b/y1kyB76SWE3xWzJGbtZLvsmRCfAHyCIF8BlFckEaE="; }; patches = [ diff --git a/pkgs/by-name/li/libphonenumber/boost-1.89.patch b/pkgs/by-name/li/libphonenumber/boost-1.89.patch new file mode 100644 index 000000000000..835721381768 --- /dev/null +++ b/pkgs/by-name/li/libphonenumber/boost-1.89.patch @@ -0,0 +1,22 @@ +From 72c1023fbf00fc48866acab05f6ccebcae7f3213 Mon Sep 17 00:00:00 2001 +From: Michael Cho +Date: Mon, 11 Aug 2025 17:08:15 -0400 +Subject: [PATCH] Fix build with Boost 1.89.0 + +--- + cpp/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt +index 27e4680ccc..39f05d2c9a 100644 +--- a/cpp/CMakeLists.txt ++++ b/cpp/CMakeLists.txt +@@ -145,7 +145,7 @@ if (USE_BOOST) + if (WIN32) + set (Boost_USE_STATIC_LIBS ON) + endif () +- find_package (Boost 1.40.0 COMPONENTS date_time system thread) ++ find_package (Boost 1.40.0 COMPONENTS date_time thread OPTIONAL_COMPONENTS system) + if (NOT Boost_FOUND) + print_error ("Boost Date_Time/System/Thread" "Boost") + endif () diff --git a/pkgs/by-name/li/libphonenumber/package.nix b/pkgs/by-name/li/libphonenumber/package.nix index 5b4ecd3e530d..8f0d10b8e09c 100644 --- a/pkgs/by-name/li/libphonenumber/package.nix +++ b/pkgs/by-name/li/libphonenumber/package.nix @@ -30,6 +30,11 @@ stdenv.mkDerivation (finalAttrs: { ./build-reproducibility.patch # Fix include directory in generated cmake files with split outputs ./cmake-include-dir.patch + # Finding `boost_system` fails because the stub compiled library of + # Boost.System, which has been a header-only library since 1.69, was + # removed in 1.89. + # Upstream PR: https://github.com/google/libphonenumber/pull/3903 + ./boost-1.89.patch ]; outputs = [ diff --git a/pkgs/by-name/li/libpng/package.nix b/pkgs/by-name/li/libpng/package.nix index fa8ef30cf583..fbea8ca20d09 100644 --- a/pkgs/by-name/li/libpng/package.nix +++ b/pkgs/by-name/li/libpng/package.nix @@ -11,10 +11,10 @@ assert zlib != null; let - patchVersion = "1.6.50"; + patchVersion = "1.6.54"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz"; - hash = "sha256-aH3cDHyxKKPqWOFZtRKSUlN8J+3gwyqT8R8DEn8MAWU="; + hash = "sha256-Vjj8RQDq9IRXtNfJ5VP9gqsB13MEpwB32DNoQp1E8bQ="; }; whenPatched = lib.optionalString apngSupport; @@ -24,11 +24,15 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "libpng" + whenPatched "-apng"; - version = "1.6.53"; + version = if !stdenv.isDarwin then "1.6.55" else "1.6.54"; # FIXME: darwin lags temporarily src = fetchurl { url = "mirror://sourceforge/libpng/libpng-${finalAttrs.version}.tar.xz"; - hash = "sha256-HT+4zMKTLQSqNmPiLvXvSQJENw9OVo14UBZQaHeNmNQ="; + hash = + if !stdenv.isDarwin then + "sha256-2SVyKGSDetWuKoIHDUsuBgPccq9EvUV8OWIpgli46C0=" + else + "sha256-AcnYowPJQewsURwUMSo7HTbO20Hi9RaMzaqF1TuIeAU="; }; postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1" diff --git a/pkgs/by-name/li/libproxy/package.nix b/pkgs/by-name/li/libproxy/package.nix index 8c641d3770b9..640beee9e97e 100644 --- a/pkgs/by-name/li/libproxy/package.nix +++ b/pkgs/by-name/li/libproxy/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libproxy"; - version = "0.5.11"; + version = "0.5.12"; outputs = [ "out" @@ -37,8 +37,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "libproxy"; repo = "libproxy"; - rev = finalAttrs.version; - hash = "sha256-CSI6GrTDBoYR6RFAQvgNjwzkMk8oXatEMpsv5FYB5eE="; + tag = finalAttrs.version; + hash = "sha256-pkvmeD7O2EUDzw59/e7YcgiHDf2vvIXmd11axGSwCEs="; }; patches = [ diff --git a/pkgs/by-name/li/libraqm/package.nix b/pkgs/by-name/li/libraqm/package.nix index 7d94d69d7ceb..3baaf6aa3f80 100644 --- a/pkgs/by-name/li/libraqm/package.nix +++ b/pkgs/by-name/li/libraqm/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libraqm"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "HOST-Oman"; repo = "libraqm"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-URW29aEONbMN/DQ6mkKksnwtbIL+SGm5VvKsC9h5MH4="; + sha256 = "sha256-8tCMxhRhqbrpry4ktHYQc9eAH49W4Wo39TbIVgjVF5g="; }; buildInputs = [ diff --git a/pkgs/by-name/li/libredirect/libredirect.c b/pkgs/by-name/li/libredirect/libredirect.c index fdbdcb6ebb86..d0b9ae8b9626 100644 --- a/pkgs/by-name/li/libredirect/libredirect.c +++ b/pkgs/by-name/li/libredirect/libredirect.c @@ -1,11 +1,15 @@ #define _GNU_SOURCE #include #include +#include #include #include #include +#include #include #include +#include +#include #include #include #include @@ -107,6 +111,48 @@ static int open_needs_mode(int flags) it contains only what we needed for programs in Nixpkgs. Just add more functions as needed. */ +WRAPPER(int, bind)(int socket, const struct sockaddr *addr, socklen_t addr_len) +{ + int (*bind_real) (int, const struct sockaddr *, socklen_t) = LOOKUP_REAL(bind); + char buf[PATH_MAX]; + const struct sockaddr *real_addr = addr; + if (addr->sa_family == AF_UNIX) { + struct sockaddr_un real_addr_un = *(struct sockaddr_un *)addr; + const char *sun_path = rewrite(real_addr_un.sun_path, buf); + if (sun_path != real_addr_un.sun_path) { + int n = snprintf(real_addr_un.sun_path, sizeof(real_addr_un.sun_path), "%s", buf); + if (n < 0 || n >= sizeof(real_addr_un.sun_path)) { + abort(); + } + real_addr = (struct sockaddr *)&real_addr_un; + addr_len = offsetof(struct sockaddr_un, sun_path) + strlen(real_addr_un.sun_path) + 1; + } + } + return bind_real(socket, real_addr, addr_len); +} +WRAPPER_DEF(bind) + +WRAPPER(int, connect)(int socket, const struct sockaddr *addr, socklen_t addr_len) +{ + int (*connect_real) (int, const struct sockaddr *, socklen_t) = LOOKUP_REAL(connect); + char buf[PATH_MAX]; + const struct sockaddr *real_addr = addr; + if (addr->sa_family == AF_UNIX) { + struct sockaddr_un real_addr_un = *(struct sockaddr_un *)addr; + const char *sun_path = rewrite(real_addr_un.sun_path, buf); + if (sun_path != real_addr_un.sun_path) { + int n = snprintf(real_addr_un.sun_path, sizeof(real_addr_un.sun_path), "%s", buf); + if (n < 0 || n >= sizeof(real_addr_un.sun_path)) { + abort(); + } + real_addr = (struct sockaddr *)&real_addr_un; + addr_len = offsetof(struct sockaddr_un, sun_path) + strlen(real_addr_un.sun_path) + 1; + } + } + return connect_real(socket, real_addr, addr_len); +} +WRAPPER_DEF(connect) + WRAPPER(int, open)(const char * path, int flags, ...) { int (*open_real) (const char *, int, ...) = LOOKUP_REAL(open); @@ -155,6 +201,24 @@ WRAPPER(int, openat)(int dirfd, const char * path, int flags, ...) } WRAPPER_DEF(openat) +// In musl libc, openat64 is simply a macro for openat +#if !defined(__APPLE__) && !defined(openat64) +WRAPPER(int, openat64)(int dirfd, const char * path, int flags, ...) +{ + int (*openat64_real) (int, const char *, int, ...) = LOOKUP_REAL(openat64); + mode_t mode = 0; + if (open_needs_mode(flags)) { + va_list ap; + va_start(ap, flags); + mode = va_arg(ap, mode_t); + va_end(ap); + } + char buf[PATH_MAX]; + return openat64_real(dirfd, rewrite(path, buf), flags, mode); +} +WRAPPER_DEF(openat64) +#endif + WRAPPER(FILE *, fopen)(const char * path, const char * mode) { FILE * (*fopen_real) (const char *, const char *) = LOOKUP_REAL(fopen); @@ -300,29 +364,109 @@ WRAPPER_DEF(execv) WRAPPER(int, execvp)(const char * path, char * const argv[]) { - int (*_execvp) (const char *, char * const argv[]) = LOOKUP_REAL(execvp); + int (*execvp_real) (const char *, char * const argv[]) = LOOKUP_REAL(execvp); char buf[PATH_MAX]; - return _execvp(rewrite(path, buf), argv); + return execvp_real(rewrite(path, buf), argv); } WRAPPER_DEF(execvp) WRAPPER(int, execve)(const char * path, char * const argv[], char * const envp[]) { - int (*_execve) (const char *, char * const argv[], char * const envp[]) = LOOKUP_REAL(execve); + int (*execve_real) (const char *, char * const argv[], char * const envp[]) = LOOKUP_REAL(execve); char buf[PATH_MAX]; - return _execve(rewrite(path, buf), argv, envp); + return execve_real(rewrite(path, buf), argv, envp); } WRAPPER_DEF(execve) WRAPPER(DIR *, opendir)(const char * path) { char buf[PATH_MAX]; - DIR * (*_opendir) (const char*) = LOOKUP_REAL(opendir); + DIR * (*opendir_real) (const char*) = LOOKUP_REAL(opendir); - return _opendir(rewrite(path, buf)); + return opendir_real(rewrite(path, buf)); } WRAPPER_DEF(opendir) +#if !defined(__APPLE__) +WRAPPER(ssize_t, getxattr)(const char * path, const char * name, void * value, size_t size) +{ + ssize_t (*getxattr_real) (const char *, const char *, void *, size_t) = LOOKUP_REAL(getxattr); + char buf[PATH_MAX]; + return getxattr_real(rewrite(path, buf), name, value, size); +} +WRAPPER_DEF(getxattr); +#endif + +#if !defined(__APPLE__) +WRAPPER(ssize_t, lgetxattr)(const char * path, const char * name, void * value, size_t size) +{ + ssize_t (*lgetxattr_real) (const char *, const char *, void *, size_t) = LOOKUP_REAL(lgetxattr); + char buf[PATH_MAX]; + return lgetxattr_real(rewrite(path, buf), name, value, size); +} +WRAPPER_DEF(lgetxattr); +#endif + +#if !defined(__APPLE__) +WRAPPER(ssize_t, listxattr)(const char * path, char * list, size_t size) +{ + ssize_t (*listxattr_real) (const char *, char *, size_t) = LOOKUP_REAL(listxattr); + char buf[PATH_MAX]; + return listxattr_real(rewrite(path, buf), list, size); +} +WRAPPER_DEF(listxattr); +#endif + +#if !defined(__APPLE__) +WRAPPER(ssize_t, llistxattr)(const char * path, char * list, size_t size) +{ + ssize_t (*llistxattr_real) (const char *, char *, size_t) = LOOKUP_REAL(llistxattr); + char buf[PATH_MAX]; + return llistxattr_real(rewrite(path, buf), list, size); +} +WRAPPER_DEF(llistxattr); +#endif + +#if !defined(__APPLE__) +WRAPPER(int, setxattr)(const char * path, const char * name, const void * value, size_t size, int flags) +{ + int (*setxattr_real) (const char *, const char *, const void *, size_t, int) = LOOKUP_REAL(setxattr); + char buf[PATH_MAX]; + return setxattr_real(rewrite(path, buf), name, value, size, flags); +} +WRAPPER_DEF(setxattr); +#endif + +#if !defined(__APPLE__) +WRAPPER(int, lsetxattr)(const char * path, const char * name, const void * value, size_t size, int flags) +{ + int (*lsetxattr_real) (const char *, const char *, const void *, size_t, int) = LOOKUP_REAL(lsetxattr); + char buf[PATH_MAX]; + return lsetxattr_real(rewrite(path, buf), name, value, size, flags); +} +WRAPPER_DEF(setxattr); +#endif + +#if !defined(__APPLE__) +WRAPPER(int, removexattr)(const char * path, const char * name) +{ + int (*removexattr_real) (const char *, const char *) = LOOKUP_REAL(removexattr); + char buf[PATH_MAX]; + return removexattr_real(rewrite(path, buf), name); +} +WRAPPER_DEF(removexattr); +#endif + +#if !defined(__APPLE__) +WRAPPER(int, lremovexattr)(const char * path, const char * name) +{ + int (*lremovexattr_real) (const char *, const char *) = LOOKUP_REAL(lremovexattr); + char buf[PATH_MAX]; + return lremovexattr_real(rewrite(path, buf), name); +} +WRAPPER_DEF(lremovexattr); +#endif + #define SYSTEM_CMD_MAX 512 static char * replace_substring(char * source, char * buf, char * replace_string, char * start_ptr, char * suffix_ptr) { @@ -383,11 +527,11 @@ static void rewriteSystemCall(const char * command, char * buf) { WRAPPER(int, system)(const char *command) { - int (*_system) (const char*) = LOOKUP_REAL(system); + int (*system_real) (const char*) = LOOKUP_REAL(system); char newCommand[SYSTEM_CMD_MAX]; rewriteSystemCall(command, newCommand); - return _system(newCommand); + return system_real(newCommand); } WRAPPER_DEF(system) @@ -399,6 +543,14 @@ WRAPPER(int, chdir)(const char *path) } WRAPPER_DEF(chdir); +WRAPPER(int, chmod)(const char * path, mode_t mode) +{ + int (*chmod_real) (const char *, mode_t) = LOOKUP_REAL(chmod); + char buf[PATH_MAX]; + return chmod_real(rewrite(path, buf), mode); +} +WRAPPER_DEF(chmod) + WRAPPER(int, mkdir)(const char *path, mode_t mode) { int (*mkdir_real) (const char *path, mode_t mode) = LOOKUP_REAL(mkdir); @@ -431,6 +583,14 @@ WRAPPER(int, unlinkat)(int dirfd, const char *path, int flags) } WRAPPER_DEF(unlinkat) +WRAPPER(int, remove)(const char *path) +{ + int (*remove_real) (const char *path) = LOOKUP_REAL(remove); + char buf[PATH_MAX]; + return remove_real(rewrite(path, buf)); +} +WRAPPER_DEF(remove) + WRAPPER(int, rmdir)(const char *path) { int (*rmdir_real) (const char *path) = LOOKUP_REAL(rmdir); diff --git a/pkgs/by-name/li/libredirect/package.nix b/pkgs/by-name/li/libredirect/package.nix index 59e98b5eca65..2981d4d41a20 100644 --- a/pkgs/by-name/li/libredirect/package.nix +++ b/pkgs/by-name/li/libredirect/package.nix @@ -124,7 +124,7 @@ else installCheckPhase = '' ( source "$hook/nix-support/setup-hook" - NIX_REDIRECTS="/foo/bar/test=${coreutils}/bin/true:/bar/baz=$(mktemp -d)" ./test + NIX_REDIRECTS="/foo/bar/test=${coreutils}/bin/true:/bar/baz=$(mktemp -d):/run/sock=$PWD/test.sock" ./test ) ''; diff --git a/pkgs/by-name/li/libredirect/test.c b/pkgs/by-name/li/libredirect/test.c index 59a47d8a02ae..6d8d3494c2fe 100644 --- a/pkgs/by-name/li/libredirect/test.c +++ b/pkgs/by-name/li/libredirect/test.c @@ -8,16 +8,61 @@ #include #include +#include #include #include +#include #include #define TESTDIR "/bar/baz" #define TESTPATH "/foo/bar/test" +#define TESTSOCK "/run/sock" #define SUBTEST "./test sub" extern char **environ; +void test_bind(void) { + int fd = socket(AF_UNIX, SOCK_STREAM, 0); + assert(fd != -1); + struct sockaddr_un addr = { + .sun_family = AF_UNIX, + .sun_path = TESTSOCK, + }; + unlink(TESTSOCK); + int ret = bind(fd, (struct sockaddr *)&addr, sizeof(addr)); + assert(ret == 0); + close(fd); +} + +void test_connect(void) { + // server + int server_fd = socket(AF_UNIX, SOCK_STREAM, 0); + assert(server_fd != -1); + struct sockaddr_un server_addr = { + .sun_family = AF_UNIX, + .sun_path = TESTSOCK, + }; + unlink(TESTSOCK); + int bind_ret = bind(server_fd, (struct sockaddr *)&server_addr, sizeof(server_addr)); + assert(bind_ret == 0); + int listen_ret = listen(server_fd, 5); + assert(listen_ret == 0); + + // client + int client_fd = socket(AF_UNIX, SOCK_STREAM, 0); + assert(client_fd != -1); + struct sockaddr_un client_addr = { + .sun_family = AF_UNIX, + .sun_path = TESTSOCK, + }; + int connect_ret = connect(client_fd, (struct sockaddr *)&client_addr, sizeof(client_addr)); + assert(connect_ret == 0); + + // clean up + close(server_fd); + close(client_fd); +} + void test_spawn(void) { pid_t pid; int ret; @@ -160,6 +205,8 @@ int main(int argc, char *argv[]) assert(mktemp(buf) == buf); assert_mktemp_path(TESTDIR "/temp", "", buf); + test_bind(); + test_connect(); test_spawn(); test_system(); test_stat_with_null_path(); diff --git a/pkgs/by-name/li/libsndfile/package.nix b/pkgs/by-name/li/libsndfile/package.nix index a8e74d8884ac..cb3297ee0902 100644 --- a/pkgs/by-name/li/libsndfile/package.nix +++ b/pkgs/by-name/li/libsndfile/package.nix @@ -80,7 +80,8 @@ stdenv.mkDerivation (finalAttrs: { # Needed on Darwin. NIX_CFLAGS_LINK = "-logg -lvorbis"; - doCheck = true; + # Broken with libopus >= 1.6.0 + doCheck = false; preCheck = '' patchShebangs tests/test_wrapper.sh tests/pedantic-header-test.sh diff --git a/pkgs/by-name/li/libsodium/package.nix b/pkgs/by-name/li/libsodium/package.nix index 383ee5a05a08..8cb1249f1da9 100644 --- a/pkgs/by-name/li/libsodium/package.nix +++ b/pkgs/by-name/li/libsodium/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libsodium"; - version = "1.0.20-unstable-2025-12-31"; + version = "1.0.21-unstable-2026-01-22"; src = fetchFromGitHub { owner = "jedisct1"; repo = "libsodium"; - rev = "d44593f1a5b7d31b5122689605b489577356f7e8"; - hash = "sha256-6DC9JJLUwAoZHrYdCIiqOtAlWOEczec2r2FmaBbsa/Q="; + rev = "f6c18801a8a9be6a1bef4af177098b8de88f7880"; + hash = "sha256-TFPyC6JzkDQe1er4GfaM2TzSRTXqm5XS8Sxq2V6grLM="; }; outputs = [ diff --git a/pkgs/by-name/li/liburcu/package.nix b/pkgs/by-name/li/liburcu/package.nix index 4a50d964d2ce..a983e5e99f9a 100644 --- a/pkgs/by-name/li/liburcu/package.nix +++ b/pkgs/by-name/li/liburcu/package.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "0.15.5"; + version = "0.15.6"; pname = "liburcu"; src = fetchurl { url = "https://lttng.org/files/urcu/userspace-rcu-${finalAttrs.version}.tar.bz2"; - hash = "sha256-sveHqKg1EsMlmecc2rzFExRklHuCAUiWvRFBOy14LeE="; + hash = "sha256-hQsZIJbrEevyxw6Pl7x9p0ee5B2hvr60TjmGkIusQU8="; }; outputs = [ diff --git a/pkgs/by-name/li/libuv/package.nix b/pkgs/by-name/li/libuv/package.nix index b5eab694e9f0..387a8bb0c923 100644 --- a/pkgs/by-name/li/libuv/package.nix +++ b/pkgs/by-name/li/libuv/package.nix @@ -174,6 +174,11 @@ stdenv.mkDerivation (finalAttrs: { # routinely hangs on powerpc64le !stdenv.hostPlatform.isPower64; + # Tests like to time out when run in parallel to large builds + preCheck = '' + export UV_TEST_TIMEOUT_MULTIPLIER=10 + ''; + # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/li/libvdpau/package.nix b/pkgs/by-name/li/libvdpau/package.nix index 92f3b31fab61..5942fc8ddc46 100644 --- a/pkgs/by-name/li/libvdpau/package.nix +++ b/pkgs/by-name/li/libvdpau/package.nix @@ -42,7 +42,9 @@ stdenv.mkDerivation (finalAttrs: { "-Dmoduledir=${mesa.driverLink}/lib/vdpau" ]; - NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-lX11"; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + NIX_LDFLAGS = "-lX11"; + }; # The tracing library in this package must be conditionally loaded with dlopen(). # Therefore, we must restore the RPATH entry for the library itself that was removed by the patchelf hook. diff --git a/pkgs/by-name/li/libxcomposite/package.nix b/pkgs/by-name/li/libxcomposite/package.nix index b141e7eece76..8094f0e168ed 100644 --- a/pkgs/by-name/li/libxcomposite/package.nix +++ b/pkgs/by-name/li/libxcomposite/package.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libxcomposite"; - version = "0.4.6"; + version = "0.4.7"; outputs = [ "out" @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://xorg/individual/lib/libXcomposite-${finalAttrs.version}.tar.xz"; - hash = "sha256-/kC88K4aCQcOuiQIil65gQ7+V0U3eeweIKVQgMbcLIc="; + hash = "sha256-i98xCWf0hFA/pRcUz5e/8HI9m2c+Duy/krP5fAYMjMs="; }; strictDeps = true; diff --git a/pkgs/by-name/li/libxdamage/package.nix b/pkgs/by-name/li/libxdamage/package.nix index 39c34e3530fa..5f1ef0f064cb 100644 --- a/pkgs/by-name/li/libxdamage/package.nix +++ b/pkgs/by-name/li/libxdamage/package.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libxdamage"; - version = "1.1.6"; + version = "1.1.7"; outputs = [ "out" @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://xorg/individual/lib/libXdamage-${finalAttrs.version}.tar.xz"; - hash = "sha256-UnM8H1Ji/KNfZOfVBgxvzYGogLqOHmXJYhzwcnr7XRE="; + hash = "sha256-EnBn9SHT7kZ7l7yxRa66EHjiRU1EjodI65hNWzl73iQ="; }; strictDeps = true; diff --git a/pkgs/by-name/li/libxext/package.nix b/pkgs/by-name/li/libxext/package.nix index 1701f3ecf19b..879d0c6233d9 100644 --- a/pkgs/by-name/li/libxext/package.nix +++ b/pkgs/by-name/li/libxext/package.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libxext"; - version = "1.3.6"; + version = "1.3.7"; outputs = [ "out" @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://xorg/individual/lib/libXext-${finalAttrs.version}.tar.xz"; - hash = "sha256-7bWfojmU5AX9xbQAr99YIK5hYLlPNePcPaRFehbol1M="; + hash = "sha256-bGQ8cDXNrPZ6/WjyXQG5DviJ1UbJ/NfArffCz5Hjoy0="; }; strictDeps = true; diff --git a/pkgs/by-name/li/libxinerama/package.nix b/pkgs/by-name/li/libxinerama/package.nix index 824fc9e937d6..5515e281cf7d 100644 --- a/pkgs/by-name/li/libxinerama/package.nix +++ b/pkgs/by-name/li/libxinerama/package.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libxinerama"; - version = "1.1.5"; + version = "1.1.6"; outputs = [ "out" @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://xorg/individual/lib/libXinerama-${finalAttrs.version}.tar.xz"; - hash = "sha256-UJTR8PzBgoyxaW0NOdnoZq4yUgxU0B9hjxo8HjDCCFw="; + hash = "sha256-0A/BWZwwPcXLwSK4BovcdAXW/LGQYPRZf8Ub06i+Udc="; }; strictDeps = true; diff --git a/pkgs/by-name/li/libxmlb/package.nix b/pkgs/by-name/li/libxmlb/package.nix index 99a35aeec67d..1d480f08f1e0 100644 --- a/pkgs/by-name/li/libxmlb/package.nix +++ b/pkgs/by-name/li/libxmlb/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libxmlb"; - version = "0.3.24"; + version = "0.3.25"; outputs = [ "out" @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "hughsie"; repo = "libxmlb"; rev = finalAttrs.version; - hash = "sha256-3Yxq0KZMV9GRmNjZ19eIqGq+UJS4PGyVPS6HBcMEbHo="; + hash = "sha256-GBsaVJpnB6m1oItwD7t59BmoZcVQBU/sPz5fGGVzBG0="; }; patches = [ @@ -85,6 +85,8 @@ stdenv.mkDerivation (finalAttrs: { }; }; + __structuredAttrs = true; + meta = { description = "Library to help create and query binary XML blobs"; mainProgram = "xb-tool"; diff --git a/pkgs/by-name/li/libxmu/package.nix b/pkgs/by-name/li/libxmu/package.nix index 301d03ff5678..ca531f255210 100644 --- a/pkgs/by-name/li/libxmu/package.nix +++ b/pkgs/by-name/li/libxmu/package.nix @@ -12,7 +12,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libxmu"; - version = "1.2.1"; + version = "1.3.1"; outputs = [ "out" @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://xorg/individual/lib/libXmu-${finalAttrs.version}.tar.xz"; - hash = "sha256-/LJ3kySKOeX8xbnErsQMwHNLPKdqrD19HCZOf34U6LI="; + hash = "sha256-gamelMRQHoHEJ8uqShF0i1hJM+lLehVoMMNiElaFe8Q="; }; strictDeps = true; diff --git a/pkgs/by-name/li/libxpm/package.nix b/pkgs/by-name/li/libxpm/package.nix index 8ffd2d3fd203..2fa6270c2155 100644 --- a/pkgs/by-name/li/libxpm/package.nix +++ b/pkgs/by-name/li/libxpm/package.nix @@ -15,7 +15,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libxpm"; - version = "3.5.17"; + version = "3.5.18"; outputs = [ "bin" @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://xorg/individual/lib/libXpm-${finalAttrs.version}.tar.xz"; - hash = "sha256-ZLMfgQGefTiMgisLKK+NUcRiK4Px8Mtvo/yV4nEibkM="; + hash = "sha256-tO15v8cYAA7e6DfVUcNShvC4RXbbDOB7u+vmCkr/oeQ="; }; strictDeps = true; diff --git a/pkgs/by-name/li/libxrandr/package.nix b/pkgs/by-name/li/libxrandr/package.nix index 93a575ce705b..c4d67efbcf8e 100644 --- a/pkgs/by-name/li/libxrandr/package.nix +++ b/pkgs/by-name/li/libxrandr/package.nix @@ -12,7 +12,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libxrandr"; - version = "1.5.4"; + version = "1.5.5"; outputs = [ "out" @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://xorg/individual/lib/libXrandr-${finalAttrs.version}.tar.xz"; - hash = "sha256-GtWwZTdfSoWRWqYGEcxkB8BgSSohTX+dryFL51LDtNM="; + hash = "sha256-crkiwudlQ06enwlgFIBwvUUEsogmPihopMzOG3zydno="; }; strictDeps = true; diff --git a/pkgs/by-name/li/libxxf86vm/package.nix b/pkgs/by-name/li/libxxf86vm/package.nix index c3e6cf66883e..e7f342170eb6 100644 --- a/pkgs/by-name/li/libxxf86vm/package.nix +++ b/pkgs/by-name/li/libxxf86vm/package.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libxxf86vm"; - version = "1.1.6"; + version = "1.1.7"; outputs = [ "out" @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://xorg/individual/lib/libXxf86vm-${finalAttrs.version}.tar.xz"; - hash = "sha256-lq9BTHPOHVRJrQS+f58n+oMw+ES23ahD7yLj4b77PuM="; + hash = "sha256-rlDA9mngr1pnzEzQ9U8h1kpk0mYK+IPoDpXT/lG5Rdg="; }; strictDeps = true; diff --git a/pkgs/by-name/li/lilv/package.nix b/pkgs/by-name/li/lilv/package.nix index 8c320c44577f..9431da915ed6 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.26.0"; + version = "0.26.2"; outputs = [ "out" @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.drobilla.net/lilv-${version}.tar.xz"; - hash = "sha256-kS+dAlprXZYkTY3FHnXb/GeT45h2tTwZbboWYjCNt/A="; + hash = "sha256-nHEvfES6ix/b+buqeTu/doRL5As2HEMivapcTtNsa4k="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/lm/lmdb/package.nix b/pkgs/by-name/lm/lmdb/package.nix index a1c592565271..41c92ea0c8b6 100644 --- a/pkgs/by-name/lm/lmdb/package.nix +++ b/pkgs/by-name/lm/lmdb/package.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "lmdb"; - version = "0.9.33"; + version = "0.9.35"; src = fetchFromGitLab { domain = "git.openldap.org"; owner = "openldap"; repo = "openldap"; rev = "LMDB_${version}"; - sha256 = "sha256-5IBoJ3jaNXao5zVzb0LDM8RGid4s8DGQpjVqrVPLpXQ="; + sha256 = "sha256-XkOeVqzKojRLojBLkXB0V9lypJnL5ZmGAwutn6aRQIU="; }; postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; diff --git a/pkgs/by-name/lu/lucenepp/package.nix b/pkgs/by-name/lu/lucenepp/package.nix index d95cfb2ccaff..d39f251e4df7 100644 --- a/pkgs/by-name/lu/lucenepp/package.nix +++ b/pkgs/by-name/lu/lucenepp/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, boost, gtest, @@ -11,13 +10,13 @@ stdenv.mkDerivation rec { pname = "lucene++"; - version = "3.0.9"; + version = "3.0.9-unstable-2026-01-25"; src = fetchFromGitHub { owner = "luceneplusplus"; repo = "LucenePlusPlus"; - rev = "rel_${version}"; - hash = "sha256-VxEV45OXHRldFdIt2OC6O7ey5u98VQzlzeOb9ZiKfd8="; + rev = "f11e0895cf1dd7d6a68a0a736f13414f1e37ef7a"; + hash = "sha256-3q1iRWTbd+PHIBM5mCfJ1h5ssxBeyao/CkRhyvApND8="; }; nativeBuildInputs = [ cmake ]; @@ -32,38 +31,7 @@ stdenv.mkDerivation rec { (lib.cmakeBool "ENABLE_TEST" doCheck) ]; - patches = [ - (fetchpatch { - name = "fix-build-with-boost-1_85_0.patch"; - url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/76dc90f2b65d81be018c499714ff11e121ba5585.patch"; - hash = "sha256-SNAngHwy7yxvly8d6u1LcPsM6NYVx3FrFiSHLmkqY6Q="; - }) - (fetchpatch { - name = "fix-install-path-for-liblucene_pc.patch"; - url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/f40f59c6e169b4e16b7a6439ecb26a629c6540d1.patch"; - hash = "sha256-YtZMqh/cnkGikatcgRjOWXj570M5ZOnCqgW8/K0/nVo="; - }) - (fetchpatch { - name = "migrate-to-boost_asio_io_context.patch"; - url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/e6a376836e5c891577eae6369263152106b9bc02.patch"; - hash = "sha256-0mdVvrS0nTxSJXRzVdx2Zb/vm9aVxGfARG/QliRx7tA="; - }) - (fetchpatch { - name = "Bump-minimum-required-cmake-version-to-3_10.patch"; - url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/2857419531c45e542afdc52001a65733f4f9b128.patch"; - hash = "sha256-qgXnDhJIa32vlw3MRLbOWsBMj67d9n+ZFLn+yHpU9Hk="; - }) - ]; - - # Don't use the built in gtest - but the nixpkgs one requires C++14. - postPatch = '' - substituteInPlace src/test/CMakeLists.txt \ - --replace-fail "add_subdirectory(gtest)" "" - substituteInPlace CMakeLists.txt \ - --replace-fail "set(CMAKE_CXX_STANDARD 11)" "set(CMAKE_CXX_STANDARD 14)" - ''; - - # FIXME: Stuck for several hours after passing 1472 tests + # FIXME: 7 tests fail, https://github.com/luceneplusplus/LucenePlusPlus/issues/212 doCheck = false; checkPhase = '' diff --git a/pkgs/by-name/lz/lzip/package.nix b/pkgs/by-name/lz/lzip/package.nix index 3f5cfb37720d..a35a37e786c3 100644 --- a/pkgs/by-name/lz/lzip/package.nix +++ b/pkgs/by-name/lz/lzip/package.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; enableParallelBuilding = true; + strictDeps = true; meta = { homepage = "https://www.nongnu.org/lzip/lzip.html"; diff --git a/pkgs/by-name/lz/lzo/package.nix b/pkgs/by-name/lz/lzo/package.nix index 66b096a5b591..a3ecb16bb807 100644 --- a/pkgs/by-name/lz/lzo/package.nix +++ b/pkgs/by-name/lz/lzo/package.nix @@ -24,6 +24,12 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; + outputs = [ + "out" + "dev" + "doc" + ]; + meta = { description = "Real-time data (de)compression library"; longDescription = '' diff --git a/pkgs/by-name/ma/man-db/package.nix b/pkgs/by-name/ma/man-db/package.nix index b86a1acab0e7..0277e5e7e043 100644 --- a/pkgs/by-name/ma/man-db/package.nix +++ b/pkgs/by-name/ma/man-db/package.nix @@ -1,14 +1,21 @@ { buildPackages, gdbm, - fetchurl, + fetchFromGitLab, + autoconf, + automake, + flex, + gettext, + gnulib, groff, gzip, lib, libiconv, libiconvReal, libpipeline, + libtool, makeWrapper, + nix-update-script, nixosTests, pkg-config, stdenv, @@ -24,9 +31,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "man-db"; version = "2.13.1"; - src = fetchurl { - url = "mirror://savannah/man-db/man-db-${finalAttrs.version}.tar.xz"; - hash = "sha256-iv67b362u4VCkpRYhB9cfm8kDjDIY1jB+8776gdsh9k="; + src = fetchFromGitLab { + owner = "man-db"; + repo = "man-db"; + tag = finalAttrs.version; + hash = "sha256-o85IJCsP5NA4AUhr6SNLOSnAoIEWoEejVG8w08jfyqQ="; }; outputs = [ @@ -37,7 +46,12 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; nativeBuildInputs = [ + autoconf + automake + flex + gettext groff + libtool makeWrapper pkg-config zstd @@ -88,6 +102,7 @@ stdenv.mkDerivation (finalAttrs: { ]; preConfigure = '' + ./bootstrap --no-git --gnulib-srcdir=${gnulib} --gen configureFlagsArray+=("--with-sections=1 n l 8 3 0 2 5 4 9 6 7") ''; @@ -117,8 +132,11 @@ stdenv.mkDerivation (finalAttrs: { !stdenv.hostPlatform.isMusl # iconv binary ; - passthru.tests = { - nixos = nixosTests.man; + passthru = { + tests = { + nixos = nixosTests.man; + }; + updateScript = nix-update-script { }; }; meta = { @@ -127,5 +145,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; mainProgram = "man"; + maintainers = with lib.maintainers; [ mdaniels5757 ]; }; }) diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix index 09f915de572e..e40797f08d13 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.10.0"; + version = "1.11.5"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-txbMVkbws/3mvYsxf332WhTymsVdr6JlgQoi85e4pgE="; + hash = "sha256-OTL6Poz6FIR+zpKiaCDGsUGkm2/jMVAuOS0bV/o4F3M="; }; - cargoHash = "sha256-2eLzT9Ozz7p43hbysoE5isLuithqJhvo8TfRZnklzf4="; + cargoHash = "sha256-pBhKuVfq9x4kHYmE2p5ly1EXG2Sr8hHQ7pHCaERqsw0="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv diff --git a/pkgs/by-name/ma/maturin/pyo3-test/Cargo.lock b/pkgs/by-name/ma/maturin/pyo3-test/Cargo.lock index 5e698d4ff735..49ae79ecbca4 100644 --- a/pkgs/by-name/ma/maturin/pyo3-test/Cargo.lock +++ b/pkgs/by-name/ma/maturin/pyo3-test/Cargo.lock @@ -1,405 +1,130 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -[[package]] -name = "ahash" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" - -[[package]] -name = "assert_approx_eq" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c07dab4369547dbe5114677b33fbbf724971019f3818172d59a97a61c774ffd" +version = 4 [[package]] name = "autocfg" -version = "1.0.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" - -[[package]] -name = "bitflags" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - -[[package]] -name = "byteorder" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "const_fn" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6" - -[[package]] -name = "crossbeam-channel" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "crossbeam-deque" -version = "0.8.0" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.1" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "cfg-if", - "const_fn", "crossbeam-utils", - "lazy_static", - "memoffset", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.1" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d" -dependencies = [ - "autocfg", - "cfg-if", - "lazy_static", -] - -[[package]] -name = "ctor" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8f45d9ad417bcef4817d614a501ab55cdd96a6fdb24f49aab89a54acfd66b19" -dependencies = [ - "quote", - "syn", -] +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "either" -version = "1.6.1" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" [[package]] -name = "getrandom" -version = "0.1.16" +name = "heck" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "ghost" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5bcf1bbeab73aa4cf2fde60a846858dc036163c7c33bec309f8d17de785479" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "glob" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" - -[[package]] -name = "hashbrown" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" -dependencies = [ - "ahash", -] - -[[package]] -name = "hermit-abi" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" -dependencies = [ - "libc", -] +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "indoc" -version = "0.3.6" +version = "2.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" +checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706" dependencies = [ - "indoc-impl", - "proc-macro-hack", + "rustversion", ] -[[package]] -name = "indoc-impl" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "syn", - "unindent", -] - -[[package]] -name = "instant" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "inventory" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0f7efb804ec95e33db9ad49e4252f049e37e8b0a4652e3cd61f7999f2eff7f" -dependencies = [ - "ctor", - "ghost", - "inventory-impl", -] - -[[package]] -name = "inventory-impl" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75c094e94816723ab936484666968f5b58060492e880f3c8d00489a1e244fa51" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "itoa" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - [[package]] name = "libc" -version = "0.2.86" +version = "0.2.180" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c" - -[[package]] -name = "lock_api" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312" -dependencies = [ - "scopeguard", -] +checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc" [[package]] name = "memoffset" -version = "0.6.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] [[package]] -name = "num-bigint" -version = "0.3.1" +name = "once_cell" +version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9a41747ae4633fce5adffb4d2e81ffc5e89593cb19917f8fb2cc5ff76507bf" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] -name = "num-complex" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" +name = "portable-atomic" version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "parking_lot" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall", - "smallvec", - "winapi", -] - -[[package]] -name = "paste" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" -dependencies = [ - "paste-impl", - "proc-macro-hack", -] - -[[package]] -name = "paste-impl" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" -dependencies = [ - "proc-macro-hack", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" - -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" +checksum = "f89776e4d69bb58bc6993e99ffa1d11f228b839984854c7daeb5d37f87cbe950" [[package]] name = "proc-macro2" -version = "1.0.24" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" +checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" dependencies = [ - "unicode-xid", -] - -[[package]] -name = "proptest" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12e6c80c1139113c28ee4670dc50cc42915228b51f56a9e407f0ec60f966646f" -dependencies = [ - "bitflags", - "byteorder", - "lazy_static", - "num-traits", - "quick-error", - "rand", - "rand_chacha", - "rand_xorshift", - "regex-syntax", + "unicode-ident", ] [[package]] name = "pyo3" -version = "0.13.2" +version = "0.27.2" dependencies = [ - "assert_approx_eq", - "cfg-if", - "ctor", - "hashbrown", "indoc", - "inventory", "libc", - "num-bigint", - "num-complex", - "parking_lot", - "paste", - "proptest", - "pyo3", + "memoffset", + "once_cell", + "portable-atomic", + "pyo3-build-config", + "pyo3-ffi", "pyo3-macros", - "rustversion", - "serde", - "serde_json", - "trybuild", "unindent", ] [[package]] -name = "pyo3-macros" -version = "0.13.2" +name = "pyo3-build-config" +version = "0.27.2" dependencies = [ + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.27.2" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-macros" +version = "0.27.2" +dependencies = [ + "proc-macro2", "pyo3-macros-backend", "quote", "syn", @@ -407,271 +132,78 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.13.2" +version = "0.27.2" dependencies = [ + "heck", "proc-macro2", + "pyo3-build-config", "quote", "syn", ] -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - [[package]] name = "quote" -version = "1.0.9" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4" dependencies = [ "proc-macro2", ] -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom", - "libc", - "rand_chacha", - "rand_core", - "rand_hc", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core", -] - -[[package]] -name = "rand_xorshift" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8" -dependencies = [ - "rand_core", -] - [[package]] name = "rayon" -version = "1.5.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" +checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" dependencies = [ - "autocfg", - "crossbeam-deque", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.9.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" +checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "lazy_static", - "num_cpus", -] - -[[package]] -name = "redox_syscall" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" -dependencies = [ - "bitflags", -] - -[[package]] -name = "regex-syntax" -version = "0.6.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581" - -[[package]] -name = "rustapi-module" -version = "0.1.0" -dependencies = [ - "pyo3", ] [[package]] name = "rustversion" -version = "1.0.4" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd" - -[[package]] -name = "ryu" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "serde" -version = "1.0.123" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.123" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.62" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea1c6153794552ea7cf7cf63b1231a25de00ec90db326ba6264440fa08e31486" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "smallvec" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "syn" -version = "1.0.60" +version = "2.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081" +checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", ] [[package]] -name = "termcolor" -version = "1.1.2" +name = "target-lexicon" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" -dependencies = [ - "winapi-util", -] +checksum = "b1dd07eb858a2067e2f3c7155d54e929265c264e6f37efe3ee7a8d1b5a1dd0ba" [[package]] -name = "toml" -version = "0.5.8" +name = "unicode-ident" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" -dependencies = [ - "serde", -] - -[[package]] -name = "trybuild" -version = "1.0.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99471a206425fba51842a9186315f32d91c56eadc21ea4c21f847b59cf778f8b" -dependencies = [ - "glob", - "lazy_static", - "serde", - "serde_json", - "termcolor", - "toml", -] - -[[package]] -name = "unicode-xid" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" [[package]] name = "unindent" -version = "0.1.7" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7" - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3" [[package]] name = "word-count" diff --git a/pkgs/by-name/ma/maturin/pyo3-test/default.nix b/pkgs/by-name/ma/maturin/pyo3-test/default.nix index ecb5a8cab58d..d5083caf0b06 100644 --- a/pkgs/by-name/ma/maturin/pyo3-test/default.nix +++ b/pkgs/by-name/ma/maturin/pyo3-test/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "word-count"; - version = "0.13.2"; + version = "0.27.2"; src = fetchFromGitHub { owner = "PyO3"; repo = "pyo3"; rev = "v${version}"; - hash = "sha256-NOMrrfo8WjlPhtGxWUOPJS/UDDdbLQRCXR++Zd6JmIA="; + hash = "sha256-xuC/7rynufWCHBnMiJny4m1Y1aaogdv/5UsafpmZLAw="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; diff --git a/pkgs/by-name/md/md2pdf/package.nix b/pkgs/by-name/md/md2pdf/package.nix new file mode 100644 index 000000000000..32e608f76b83 --- /dev/null +++ b/pkgs/by-name/md/md2pdf/package.nix @@ -0,0 +1,9 @@ +{ + python3Packages, +}: + +python3Packages.toPythonApplication ( + python3Packages.md2pdf.overridePythonAttrs (oldAttrs: { + dependencies = oldAttrs.dependencies ++ oldAttrs.optional-dependencies.cli; + }) +) diff --git a/pkgs/by-name/me/mercurial/package.nix b/pkgs/by-name/me/mercurial/package.nix index 3475132f885f..3ac5b2529b12 100644 --- a/pkgs/by-name/me/mercurial/package.nix +++ b/pkgs/by-name/me/mercurial/package.nix @@ -40,11 +40,11 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial${lib.optionalString fullBuild "-full"}"; - version = "7.1"; + version = "7.1.2"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - hash = "sha256-6NkgyDw4xHXY6XO+YHYKSdw1w3ldZL1oduVq26Yi5cs="; + hash = "sha256-zie5pHZ88upJa1FGi65RL6am6vCJHkn4lh3GlLTcgco="; }; pyproject = false; diff --git a/pkgs/by-name/me/meshcentral/package.nix b/pkgs/by-name/me/meshcentral/package.nix index 5b645935ce38..282d368c77a6 100644 --- a/pkgs/by-name/me/meshcentral/package.nix +++ b/pkgs/by-name/me/meshcentral/package.nix @@ -3,7 +3,7 @@ fetchzip, fetchYarnDeps, yarn2nix-moretea, - nodejs_20, + nodejs-slim_20, dos2unix, }: @@ -37,7 +37,7 @@ yarn2nix-moretea.mkYarnPackage { preFixup = '' mkdir -p $out/bin chmod a+x $out/libexec/meshcentral/deps/meshcentral/meshcentral.js - sed -i '1i#!${nodejs_20}/bin/node' $out/libexec/meshcentral/deps/meshcentral/meshcentral.js + sed -i '1i#!${lib.getExe nodejs-slim_20}' $out/libexec/meshcentral/deps/meshcentral/meshcentral.js ln -s $out/libexec/meshcentral/deps/meshcentral/meshcentral.js $out/bin/meshcentral ''; diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix index 322bf863e0f9..44662e9b51b9 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.9.1"; + version = "1.10.1"; format = "setuptools"; src = fetchFromGitHub { owner = "mesonbuild"; repo = "meson"; tag = version; - hash = "sha256-t4a/Zp8rC+DMjskdwVvYIfYDAT57zGVfVu7IApwRNGA="; + hash = "sha256-UeSD3lIZ5hz3UsxZ1sCPzUhiekr3WIEiGxu+inyV8vo="; }; patches = [ diff --git a/pkgs/by-name/mi/mimir/package.nix b/pkgs/by-name/mi/mimir/package.nix index c2e42872e1aa..739d2c1a9a6a 100644 --- a/pkgs/by-name/mi/mimir/package.nix +++ b/pkgs/by-name/mi/mimir/package.nix @@ -7,13 +7,13 @@ }: buildGoModule (finalAttrs: { pname = "mimir"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { rev = "mimir-${finalAttrs.version}"; owner = "grafana"; repo = "mimir"; - hash = "sha256-8dym3E6VinpExE4A+ekbhiQ+Zhwvue6/s1mAhBkwPMU="; + hash = "sha256-OUFmtHGGDU1+7EwfGVzrjPS2hqba0FfIuQl0V7up9Yk="; }; vendorHash = null; diff --git a/pkgs/by-name/mo/modemmanager/package.nix b/pkgs/by-name/mo/modemmanager/package.nix index d2f43bb42572..a7a73ee2c50f 100644 --- a/pkgs/by-name/mo/modemmanager/package.nix +++ b/pkgs/by-name/mo/modemmanager/package.nix @@ -32,14 +32,14 @@ stdenv.mkDerivation rec { pname = "modemmanager"; - version = "1.24.0"; + version = "1.24.2"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mobile-broadband"; repo = "ModemManager"; rev = version; - hash = "sha256-3jI75aR2esmv5dkE4TrdCHIcCvtdOBKnBC5XLEKoVFs="; + hash = "sha256-rBLOqpx7Y2BB6/xvhIw+rDEXsLtePhHLBvfpSuJzQik="; }; patches = [ diff --git a/pkgs/by-name/mu/munge/package.nix b/pkgs/by-name/mu/munge/package.nix index 47551a1755b5..f955a5668e56 100644 --- a/pkgs/by-name/mu/munge/package.nix +++ b/pkgs/by-name/mu/munge/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "munge"; - version = "0.5.17"; + version = "0.5.18"; src = fetchFromGitHub { owner = "dun"; repo = "munge"; rev = "munge-${finalAttrs.version}"; - sha256 = "sha256-MfxED81P4ipdP4fuxwmpNrAeej3ZH+qiHIt5bSrct1o="; + sha256 = "sha256-Hoaldm55E0HC3qqqBS5uZvlgcWepnVLyJNQMB2P/t9Q="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mu/mupdf/package.nix b/pkgs/by-name/mu/mupdf/package.nix index 337500cde283..8decbcb600dd 100644 --- a/pkgs/by-name/mu/mupdf/package.nix +++ b/pkgs/by-name/mu/mupdf/package.nix @@ -73,12 +73,12 @@ let }); in stdenv.mkDerivation rec { - version = "1.26.10"; + version = "1.27.0"; pname = "mupdf"; src = fetchurl { url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; - hash = "sha256-FlPzW9j72XDwVSPv3H+G5B6XKOJWSjKVKW4Dz1mlFDc="; + hash = "sha256-riRCQW3kmRgtN6UmxvorrMejvtWoiNETygSERITf58Y="; }; patches = [ @@ -88,19 +88,6 @@ stdenv.mkDerivation rec { # Upstream C++ wrap script only defines fixed-sized integers on macOS but # this is required on aarch64-linux too. ./fix-cpp-build.patch - ] - # fix compatibility with Clang >= 20 - ++ lib.optionals enableCxx [ - (fetchpatch { - name = "scripts-wrap-parse.py-get_args-improve-caching-of-re.patch"; - url = "https://github.com/ArtifexSoftware/mupdf/commit/559e45ac8c134712cd8eaee01536ea3841e3a449.patch"; - hash = "sha256-gI3hzrNo6jj9eqQ9E/BJ3jxXi/sl1C5WRyYlkG3Gkfg="; - }) - (fetchpatch { - name = "scripts-wrap-parse.py-get_args-fix-for-libclang-20.patch"; - url = "https://github.com/ArtifexSoftware/mupdf/commit/4bbf411898341d3ba30f521a6c137a788793cd45.patch"; - hash = "sha256-cxKNziAGjpDwEw/9ZQHslMeJbiqYo80899BDkUOIX8g="; - }) ]; postPatch = '' diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix index 9b0e4ecdce32..4affc2ae99f0 100644 --- a/pkgs/by-name/mu/music-assistant/package.nix +++ b/pkgs/by-name/mu/music-assistant/package.nix @@ -99,6 +99,7 @@ python.pkgs.buildPythonApplication rec { ]; pythonRelaxDeps = [ + "aiofiles" "aiohttp" "aiosqlite" "certifi" diff --git a/pkgs/by-name/ne/netpbm/package.nix b/pkgs/by-name/ne/netpbm/package.nix index 224e95d900fd..d9b346ac227d 100644 --- a/pkgs/by-name/ne/netpbm/package.nix +++ b/pkgs/by-name/ne/netpbm/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "11.13.0"; + version = "11.13.1"; outputs = [ "bin" @@ -31,8 +31,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "5141"; - sha256 = "sha256-WfmUfP/uc2k8qPki5Gh7WrTH6nIeyhACcn+F5GaFJCE="; + rev = "5148"; + sha256 = "sha256-Dj0S6mnSZXXrIcKTI90XjDVn0uMrC60hsKCcerayTdU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ng/nghttp3/package.nix b/pkgs/by-name/ng/nghttp3/package.nix index 410708dbb7f0..5741d2dd8cc5 100644 --- a/pkgs/by-name/ng/nghttp3/package.nix +++ b/pkgs/by-name/ng/nghttp3/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "nghttp3"; - version = "1.13.1"; + version = "1.14.0"; src = fetchurl { url = "https://github.com/ngtcp2/nghttp3/releases/download/v${finalAttrs.version}/nghttp3-${finalAttrs.version}.tar.bz2"; - hash = "sha256-8lH+Vm4oIdz9BChVN15QsevqxfHKeUjQDiFWPFgiHiA="; + hash = "sha256-JUi0zz3Bl6hB30/rBv1jfRlx4dahu+ES3KLsYYqz6UU="; }; outputs = [ diff --git a/pkgs/by-name/ni/ninja/package.nix b/pkgs/by-name/ni/ninja/package.nix index 6f15be615ace..29196bd5db6a 100644 --- a/pkgs/by-name/ni/ninja/package.nix +++ b/pkgs/by-name/ni/ninja/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ninja-build"; repo = "ninja"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = { # TODO: Remove Ninja 1.11 as soon as possible. @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' # write rebuild args to file after bootstrap - substituteInPlace configure.py --replace "subprocess.check_call(rebuild_args)" "open('rebuild_args','w').write(rebuild_args[0])" + substituteInPlace configure.py --replace-fail "subprocess.check_call(rebuild_args)" "open('rebuild_args','w').write(rebuild_args[0])" ''; buildPhase = '' diff --git a/pkgs/by-name/oa/oauth2-proxy/package.nix b/pkgs/by-name/oa/oauth2-proxy/package.nix index 3f36fb7fba00..5abf7c742089 100644 --- a/pkgs/by-name/oa/oauth2-proxy/package.nix +++ b/pkgs/by-name/oa/oauth2-proxy/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "oauth2-proxy"; - version = "7.14.0"; + version = "7.14.2"; src = fetchFromGitHub { repo = "oauth2-proxy"; owner = "oauth2-proxy"; - sha256 = "sha256-lFyEfSOJwzuLgHnVGEUbLTWauboUYxBNF6iTV06vmOw="; + sha256 = "sha256-Er5AFAuG/F2G5un/VCZkRp6NXI259vFrhtL7NYySff8="; rev = "v${version}"; }; - vendorHash = "sha256-HMuQSpUUnMmhsawy2PD8QONLRkJ1vi2LhJnYQzj/TJ4="; + vendorHash = "sha256-LAJx4PwGXNqQ5hGX33695JoQa/cJ8gnz0cYPjEmg72U="; # Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile ldflags = [ "-X github.com/oauth2-proxy/oauth2-proxy/v7/pkg/version.VERSION=v${version}" ]; @@ -29,5 +29,8 @@ buildGoModule rec { homepage = "https://github.com/oauth2-proxy/oauth2-proxy/"; license = lib.licenses.mit; mainProgram = "oauth2-proxy"; + maintainers = with lib.maintainers; [ + swarsel + ]; }; } diff --git a/pkgs/by-name/ol/olympus-unwrapped/package.nix b/pkgs/by-name/ol/olympus-unwrapped/package.nix index a27663030f35..2d0f43ede95d 100644 --- a/pkgs/by-name/ol/olympus-unwrapped/package.nix +++ b/pkgs/by-name/ol/olympus-unwrapped/package.nix @@ -39,6 +39,8 @@ buildDotnetModule { pname = "olympus-unwrapped"; inherit version; + strictDeps = false; + src = fetchFromGitHub { inherit rev; owner = "EverestAPI"; diff --git a/pkgs/by-name/on/onnxruntime/package.nix b/pkgs/by-name/on/onnxruntime/package.nix index 8671a61e2977..097e54955b37 100644 --- a/pkgs/by-name/on/onnxruntime/package.nix +++ b/pkgs/by-name/on/onnxruntime/package.nix @@ -40,29 +40,6 @@ let cudaArchitecturesString = cudaPackages.flags.cmakeCudaArchitecturesString; - # While onnxruntime suggests using (3 year-old) protobuf 21.12 - # https://github.com/microsoft/onnxruntime/blob/v1.23.2/cmake/deps.txt#L40, using a newer - # protobuf version is possible. - # We still need to patch the nixpkgs protobuf (32.1) to address the following test failure that - # occurs when cudaSupport is enabled: - # [libprotobuf ERROR /build/source/src/google/protobuf/descriptor_database.cc:642] File already exists in database: onnx/onnx-ml.proto - # [libprotobuf FATAL /build/source/src/google/protobuf/descriptor.cc:1986] CHECK failed: GeneratedDatabase()->Add(encoded_file_descriptor, size): - # terminate called after throwing an instance of 'google::protobuf::FatalException' - # what(): CHECK failed: GeneratedDatabase()->Add(encoded_file_descriptor, size): - # - # - # Caused by: https://github.com/protocolbuffers/protobuf/commit/8f7aab29b21afb89ea0d6e2efeafd17ca71486a9 - # Reported upstream: https://github.com/protocolbuffers/protobuf/issues/21542 - protobuf' = protobuf.overrideAttrs (old: { - patches = (old.patches or [ ]) ++ [ - (fetchpatch { - name = "Workaround nvcc bug in message_lite.h"; - url = "https://raw.githubusercontent.com/conda-forge/protobuf-feedstock/737a13ea0680484c08e8e0ab0144dab82c10c1b3/recipe/patches/0010-Workaround-nvcc-bug-in-message_lite.h.patch"; - hash = "sha256-joK50Il4mrwIc6zuNW9gDIfOx9LuA4FlusJuzUf9kqI="; - }) - ]; - }); - # TODO: update the following dependencies according to: # https://github.com/microsoft/onnxruntime/blob/v/cmake/deps.txt @@ -172,7 +149,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { cmake pkg-config python3Packages.python - protobuf' + protobuf ] ++ lib.optionals pythonSupport ( with python3Packages; @@ -287,7 +264,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_SAFEINT" "${safeint-src}") (lib.cmakeFeature "FETCHCONTENT_TRY_FIND_PACKAGE_MODE" "ALWAYS") # fails to find protoc on darwin, so specify it - (lib.cmakeFeature "ONNX_CUSTOM_PROTOC_EXECUTABLE" (lib.getExe protobuf')) + (lib.cmakeFeature "ONNX_CUSTOM_PROTOC_EXECUTABLE" (lib.getExe protobuf)) (lib.cmakeBool "onnxruntime_BUILD_SHARED_LIB" true) (lib.cmakeBool "onnxruntime_BUILD_UNIT_TESTS" finalAttrs.doCheck) (lib.cmakeBool "onnxruntime_USE_FULL_PROTOBUF" withFullProtobuf) @@ -402,7 +379,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { passthru = { inherit cudaSupport cudaPackages ncclSupport; # for the python module - protobuf = protobuf'; + inherit protobuf; tests = lib.optionalAttrs pythonSupport { python = python3Packages.onnxruntime; }; diff --git a/pkgs/by-name/op/opam2json/package.nix b/pkgs/by-name/op/opam2json/package.nix index a8cbfbb6e494..be0a3a05edf4 100644 --- a/pkgs/by-name/op/opam2json/package.nix +++ b/pkgs/by-name/op/opam2json/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = with ocamlPackages; [ yojson opam-file-format - cmdliner + cmdliner_1 ]; nativeBuildInputs = with ocamlPackages; [ ocaml diff --git a/pkgs/by-name/op/openapv/package.nix b/pkgs/by-name/op/openapv/package.nix index 0b6cde0ea30a..3dd0561f947d 100644 --- a/pkgs/by-name/op/openapv/package.nix +++ b/pkgs/by-name/op/openapv/package.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "openapv"; - version = "0.2.0.4"; + version = "0.2.1.0"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "openapv"; tag = "v${finalAttrs.version}"; - hash = "sha256-IkzZnf2/JZJIwg9g/6SvWTAcUkAQ/C36xXC+t44VejU="; + hash = "sha256-33fhm8+6t/TTcSy0dOihp19GCwJS/5ZDcsulsqnA1JY="; }; postPatch = '' diff --git a/pkgs/by-name/p1/p11-kit/package.nix b/pkgs/by-name/p1/p11-kit/package.nix index dcdc9549c38a..254fceef1677 100644 --- a/pkgs/by-name/p1/p11-kit/package.nix +++ b/pkgs/by-name/p1/p11-kit/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "p11-kit"; - version = "0.25.10"; + version = "0.26.1"; src = fetchFromGitHub { owner = "p11-glue"; repo = "p11-kit"; tag = version; - hash = "sha256-srZyY14PqPoPMcEj/3WWEPrBuCcAGibvziKgZV1vxO8="; + hash = "sha256-RQgPSHnpkDYUL8qAZCljy/+IF0nnaH13M+MnXBZLDeY="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index 7a32da6418a5..5e59d3204026 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -56,7 +56,7 @@ let }; # 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; }; + ocrmypdf = prev.ocrmypdf_16.override { tesseract = tesseract5; }; }; }; @@ -163,6 +163,8 @@ python.pkgs.buildPythonApplication rec { --replace-fail '--maxprocesses=16' "--numprocesses=$NIX_BUILD_CORES" ''; + build-system = [ python.pkgs.setuptools ]; + nativeBuildInputs = [ gettext lndir @@ -171,10 +173,12 @@ python.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "celery" "django-allauth" + "django-auditlog" "drf-spectacular-sidecar" "python-dotenv" "gotenberg-client" "redis" + "scikit-learn" # requested by maintainer "ocrmypdf" ]; @@ -302,11 +306,11 @@ python.pkgs.buildPythonApplication rec { "src" ]; - # The tests require: - # - PATH with runtime binaries - # - A temporary HOME directory for gnupg - # - XDG_DATA_DIRS with test-specific fonts preCheck = '' + # The tests require: + # - PATH with runtime binaries + # - A temporary HOME directory for gnupg + # - XDG_DATA_DIRS with test-specific fonts export PATH="${path}:$PATH" export HOME=$(mktemp -d) export XDG_DATA_DIRS="${liberation_ttf}/share:$XDG_DATA_DIRS" @@ -315,27 +319,26 @@ python.pkgs.buildPythonApplication rec { # ocrmypdf has an internal limit of 256 jobs and will fail with more: # https://github.com/ocrmypdf/OCRmyPDF/blob/66308c281306302fac3470f587814c3b212d0c40/src/ocrmypdf/cli.py#L234 export PAPERLESS_THREADS_PER_WORKER=$(( NIX_BUILD_CORES > 256 ? 256 : NIX_BUILD_CORES )) + + # the generated pyc files conflict when running the tests + rm -r build/lib ''; disabledTests = [ # FileNotFoundError(2, 'No such file or directory'): /build/tmp... "test_script_with_output" "test_script_exit_non_zero" - "testDocumentPageCountMigrated" - # AssertionError: 10 != 4 (timezone/time issue) - # Due to getting local time from modification date in test_consumer.py - "testNormalOperation" # Something broken with new Tesseract and inline RTL/LTR overrides? "test_rtl_language_detection" - # django.core.exceptions.FieldDoesNotExist: Document has no field named 'transaction_id' - "test_convert" # Favicon tests fail due to static file handling in the test environment + # https://github.com/NixOS/nixpkgs/issues/421393 "test_favicon_view" "test_favicon_view_missing_file" # Requires DNS "test_send_webhook_data_or_json" - "test_workflow_webhook_send_webhook_retry" - "test_workflow_webhook_send_webhook_task" + # execnet.gateway_base.DumpError: can't serialize + # https://github.com/pytest-dev/pytest-xdist/issues/384 + "test_subdirectory_upload" ]; doCheck = !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/pc/pcsclite/package.nix b/pkgs/by-name/pc/pcsclite/package.nix index b222c64655a3..c4d14fe7a137 100644 --- a/pkgs/by-name/pc/pcsclite/package.nix +++ b/pkgs/by-name/pc/pcsclite/package.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitLab, - fetchpatch, meson, ninja, flex, @@ -21,11 +20,12 @@ nix-update-script, pname ? "pcsclite", polkitSupport ? false, + nixosTests, }: stdenv.mkDerivation (finalAttrs: { inherit pname; - version = "2.3.0"; + version = "2.4.1"; outputs = [ "out" @@ -40,18 +40,9 @@ stdenv.mkDerivation (finalAttrs: { owner = "rousseau"; repo = "PCSC"; tag = finalAttrs.version; - hash = "sha256-37qeWGEuutF0cOOidoLchKJLQCvJFdVRZXepWzD4pZs="; + hash = "sha256-I4kWToLixfkP0XaONiWqNLXXmz+3n+LafbITfZOxLZw="; }; - # fix build with macOS 11 SDK - patches = [ - (fetchpatch { - url = "https://salsa.debian.org/rousseau/PCSC/-/commit/f41fdaaf7c82bc270af6d7439c6da037bf149be8.patch"; - revert = true; - hash = "sha256-8A76JfYqcILi52X9l/uIpJXeRJDf2dkrNEToOsxGZXk="; - }) - ]; - mesonFlags = [ (lib.mesonOption "sysconfdir" "/etc") # The OS should care on preparing the drivers into this location @@ -67,17 +58,23 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonBool "libudev" false) ]; - # disable building pcsc-wirecheck{,-gen} when cross compiling - # see also: https://github.com/LudovicRousseau/PCSC/issues/25 postPatch = '' substituteInPlace src/libredirect.c src/spy/libpcscspy.c \ --replace-fail "libpcsclite_real.so.1" "$lib/lib/libpcsclite_real.so.1" + substituteInPlace meson.build \ + --replace-fail \ + "install_dir : get_option('sysconfdir') / 'default'" \ + "install_dir : '${placeholder "out"}/etc/default'" '' + lib.optionalString systemdSupport '' substituteInPlace meson.build \ --replace-fail \ - "systemdsystemunitdir = systemd.get_variable(pkgconfig : 'systemd' + unit + 'unitdir')" \ + "systemdsystemunitdir = systemd.get_variable(pkgconfig : 'systemd' + systemdunit + 'unitdir')" \ "systemdsystemunitdir = '${placeholder "out"}/lib/systemd/system'" + substituteInPlace meson.build \ + --replace-fail \ + "sysusersdir = systemd.get_variable(pkgconfig : 'sysusersdir')" \ + "sysusersdir = '${placeholder "out"}/lib/sysusers.d'" '' + lib.optionalString polkitSupport '' substituteInPlace meson.build \ @@ -110,6 +107,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { tests = { + nixos = nixosTests.pcsclite; pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; version = testers.testVersion { package = finalAttrs.finalPackage; diff --git a/pkgs/by-name/pd/pdm/package.nix b/pkgs/by-name/pd/pdm/package.nix index 3700f96f4a3e..fd15fc336149 100644 --- a/pkgs/by-name/pd/pdm/package.nix +++ b/pkgs/by-name/pd/pdm/package.nix @@ -30,14 +30,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "pdm"; - version = "2.26.2"; + version = "2.26.6"; pyproject = true; src = fetchFromGitHub { owner = "pdm-project"; repo = "pdm"; tag = version; - hash = "sha256-l5ALdpRSN7gzN+KPfFcfMno7gxs0E7VhtKip/LasyEo="; + hash = "sha256-khgaI9ivwF6i2zlW57vQtBwQpk5mzYVCV4lMOio7ibw="; }; pythonRelaxDeps = [ "hishel" ]; diff --git a/pkgs/by-name/pm/pmix/package.nix b/pkgs/by-name/pm/pmix/package.nix index 7c9f41c9874f..8807343ee0e8 100644 --- a/pkgs/by-name/pm/pmix/package.nix +++ b/pkgs/by-name/pm/pmix/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pmix"; - version = "5.0.9"; + version = "5.0.10"; src = fetchFromGitHub { repo = "openpmix"; owner = "openpmix"; tag = "v${finalAttrs.version}"; - hash = "sha256-3z3NZPssaKBujulASYEJXwX/dhyCQxmRmjy31kOMpAQ="; + hash = "sha256-i7DZCJeNwjcRYCp3t0GlKM1V1rU/ws22u5Ct/JZ5P1Q="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/po/poetry/package.nix b/pkgs/by-name/po/poetry/package.nix index 26cd52f672a6..749858239819 100644 --- a/pkgs/by-name/po/poetry/package.nix +++ b/pkgs/by-name/po/poetry/package.nix @@ -18,12 +18,12 @@ let # We keep the override around even when the versions match, as # it's likely to become relevant again after the next Poetry update. poetry-core = super.poetry-core.overridePythonAttrs (old: rec { - version = "2.2.1"; + version = "2.3.0"; src = fetchFromGitHub { owner = "python-poetry"; repo = "poetry-core"; tag = version; - hash = "sha256-l5WTjKa+A66QfWLmrjCQq7ZrSaeuylGIRZr8jsiYq+A="; + hash = "sha256-oE0kv6ofe+qBFJq+OrgDIHsaysN+y5D9bIy8IB5n5y8="; }; }); } diff --git a/pkgs/by-name/po/poetry/unwrapped.nix b/pkgs/by-name/po/poetry/unwrapped.nix index 9e631c2f11d7..1bbd628be083 100644 --- a/pkgs/by-name/po/poetry/unwrapped.nix +++ b/pkgs/by-name/po/poetry/unwrapped.nix @@ -30,18 +30,19 @@ httpretty, pytest-mock, pytest-xdist, + responses, }: buildPythonPackage rec { pname = "poetry"; - version = "2.2.1"; + version = "2.3.1"; pyproject = true; src = fetchFromGitHub { owner = "python-poetry"; repo = "poetry"; tag = version; - hash = "sha256-oPHRDYci4lrZBY3MC4QU1juwbMJYFDJjARg1Y8us4FQ="; + hash = "sha256-JhSseoXoNc4NZ/fuvf3ztQD6MhyaErE2pqmLLeBf0ak="; }; build-system = [ @@ -100,6 +101,7 @@ buildPythonPackage rec { httpretty pytest-mock pytest-xdist + responses ]; preCheck = ( diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index 9f8221217fd4..d8788eca93cc 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -35,6 +35,8 @@ let inherit version; hash = "sha256-hOXkMINaSwzU/SpXzjhTJp0ds0OREc2mtu11LjSc9KE="; }; + + build-system = with self; [ setuptools ]; }; pretix = self.toPythonModule pretix; diff --git a/pkgs/by-name/pr/protobufc/package.nix b/pkgs/by-name/pr/protobufc/package.nix index b12d395d1a16..5b270776e847 100644 --- a/pkgs/by-name/pr/protobufc/package.nix +++ b/pkgs/by-name/pr/protobufc/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, autoreconfHook, pkg-config, - protobuf_25, + protobuf, zlib, buildPackages, }: @@ -32,11 +32,11 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - protobuf_25 + protobuf zlib ]; - env.PROTOC = lib.getExe buildPackages.protobuf_25; + env.PROTOC = lib.getExe buildPackages.protobuf; meta = { homepage = "https://github.com/protobuf-c/protobuf-c/"; diff --git a/pkgs/by-name/pr/prrte/package.nix b/pkgs/by-name/pr/prrte/package.nix index dccb6e831ef5..e95860f0a244 100644 --- a/pkgs/by-name/pr/prrte/package.nix +++ b/pkgs/by-name/pr/prrte/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "prrte"; - version = "3.0.12"; + version = "3.0.13"; src = fetchFromGitHub { owner = "openpmix"; repo = "prrte"; tag = "v${finalAttrs.version}"; - hash = "sha256-sOCJc70imSzAqYXz29tOKKETsSHvgMUQmeTHlfnQXj4="; + hash = "sha256-T/iHmSO2isyIjsaiTrNYeTiBobM/9eg7gTP12m7ehno="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/pu/publicsuffix-list/package.nix b/pkgs/by-name/pu/publicsuffix-list/package.nix index 4d53a001b997..bdfb3b97e38e 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-12-28"; + version = "0-unstable-2026-01-25"; src = fetchFromGitHub { owner = "publicsuffix"; repo = "list"; - rev = "1ef6d3bc102c85d12e92be54ec0dad8ee990dd5f"; - hash = "sha256-rQdum6XLgfXwzpKTneakFmC80tOmlPFrZ8C7dfEnlSo="; + rev = "6c40921fc61160568b101aff506d548ba3300ba6"; + hash = "sha256-BOSau54FwCHNLordlN0+I708acXSogjnfKINpfMeYcc="; }; dontBuild = true; diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix index d21cf6254984..96d0b5d8aedb 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.407"; + version = "1.1.408"; src = fetchFromGitHub { owner = "Microsoft"; repo = "pyright"; tag = version; - hash = "sha256-TQrmA65CzXar++79DLRWINaMsjoqNFdvNlwDzAcqOjM="; + hash = "sha256-+tU4BiAqKsX+4dX1k3JvygrzCoHaoXcCXKJgecvfN60="; }; patchedPackageJSON = @@ -49,7 +49,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-0czcnWOgIp/KtqBts908r4vGgMuwFLvIom89v+uCzpk="; + npmDepsHash = "sha256-/Y+DhyWC34Rco6qSQTZBm3Kqh2fKrk+kaHH9x+C6wP8="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -63,7 +63,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-NyZAvboojw9gTj52WrdNIL2Oyy2wtpVnb5JyxKLJqWM="; + npmDepsHash = "sha256-3w2XEURdfriVaQ2ruSbxVfwcZEEXKt0/51TFR3rR8tc="; postPatch = '' chmod +w ../../ diff --git a/pkgs/by-name/rd/rdkafka/package.nix b/pkgs/by-name/rd/rdkafka/package.nix index 7a9b56a64b41..50e12a97f3db 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.11.1"; + version = "2.13.0"; src = fetchFromGitHub { owner = "confluentinc"; repo = "librdkafka"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-Hg0l44wFQSk8x14V4CxJN80aGrhaj3CIFOYBfNUbG3E="; + sha256 = "sha256-gxZ20qpG3iXwY21fY2lvafWudcnsqN6hOml1UR9fPKQ="; }; outputs = [ diff --git a/pkgs/by-name/re/redmine/package.nix b/pkgs/by-name/re/redmine/package.nix index cbe8b0dbfd60..6bb71a66e369 100644 --- a/pkgs/by-name/re/redmine/package.nix +++ b/pkgs/by-name/re/redmine/package.nix @@ -19,7 +19,7 @@ let rubyEnv = bundlerEnv { name = "redmine-env-${version}"; - inherit ruby_3_3; + ruby = ruby_3_3; gemdir = ./.; groups = [ "development" diff --git a/pkgs/by-name/s2/s2n-tls/package.nix b/pkgs/by-name/s2/s2n-tls/package.nix index bf2d157eb017..f0b7e03873bd 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 (finalAttrs: { pname = "s2n-tls"; - version = "1.5.27"; + version = "1.6.4"; src = fetchFromGitHub { owner = "aws"; repo = "s2n-tls"; - rev = "v${finalAttrs.version}"; - hash = "sha256-aJRw1a/XJivNZS3NkZ4U6nC12+wY/aoNv33mbAzNl0k="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Hnjf+NaxfXFxUvPPIBcK2larrzyQHKh/8FkBYdTexr4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/sd/sdl2-compat/package.nix b/pkgs/by-name/sd/sdl2-compat/package.nix index 696786bd4dd9..5e26709db68a 100644 --- a/pkgs/by-name/sd/sdl2-compat/package.nix +++ b/pkgs/by-name/sd/sdl2-compat/package.nix @@ -30,13 +30,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "sdl2-compat"; - version = "2.32.62"; + version = "2.32.64"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "sdl2-compat"; tag = "release-${finalAttrs.version}"; - hash = "sha256-JYHkc3DyCsKtq8zbwLGsptCrIRDDbHUjlC9rVaEbEzc="; + hash = "sha256-1K+KW5cK3YgcZtrMqJ7VxKGsYnZR/fJmQtRZbWk2TGM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/se/selenium-manager/disable-telemetry.patch b/pkgs/by-name/se/selenium-manager/disable-telemetry.patch index 28db72d7595b..2c2ee004f82d 100644 --- a/pkgs/by-name/se/selenium-manager/disable-telemetry.patch +++ b/pkgs/by-name/se/selenium-manager/disable-telemetry.patch @@ -1,12 +1,12 @@ diff --git a/src/config.rs b/src/config.rs -index f7cd4f32ec..ec454127be 100644 +index 93d28c4eea..49c534d326 100644 --- a/src/config.rs +++ b/src/config.rs -@@ -120,7 +120,7 @@ impl ManagerConfig { +@@ -132,7 +132,7 @@ impl ManagerConfig { avoid_browser_download: BooleanKey("avoid-browser-download", false).get_value(), language_binding: StringKey(vec!["language-binding"], "").get_value(), selenium_version: StringKey(vec!["selenium-version"], "").get_value(), -- avoid_stats: BooleanKey("avoid-stats", false).get_value(), +- avoid_stats: BooleanKey("avoid-stats", cfg!(feature = "avoid_stats")).get_value(), + avoid_stats: BooleanKey("avoid-stats", true).get_value(), skip_driver_in_path: BooleanKey("skip-driver-in-path", false).get_value(), skip_browser_in_path: BooleanKey("skip-browser-in-path", false).get_value(), diff --git a/pkgs/by-name/se/selenium-manager/package.nix b/pkgs/by-name/se/selenium-manager/package.nix index 50bb4e7d82c8..3a2217995c44 100644 --- a/pkgs/by-name/se/selenium-manager/package.nix +++ b/pkgs/by-name/se/selenium-manager/package.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "selenium-manager"; - version = "4.29.0"; + version = "4.40.0"; src = fetchFromGitHub { owner = "SeleniumHQ"; repo = "selenium"; tag = "selenium-${version}"; - hash = "sha256-IyMXgYl/TPTpe/Y0pFyJVKj4Mp0xbkg1LSCNHzFL3bE="; + hash = "sha256-Yfm2kpAmmEUP+m48PQf09UvFPeGBxd0ukqTtVah5h+E="; }; sourceRoot = "${src.name}/rust"; @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { ./disable-telemetry.patch ]; - cargoHash = "sha256-MgnmEJif4Z4CcmBFkC5BJR67DMGm1ttObtl4LhAFw4g="; + cargoHash = "sha256-D7lki2/xWcNStcHIS8q1fTkW+37Q+m/yetn05DwA2C8="; # TODO: enable tests # The test suite depends on a number of browsers and network requests, diff --git a/pkgs/by-name/sh/shaderc/fix-pc-file-generation.patch b/pkgs/by-name/sh/shaderc/fix-pc-file-generation.patch new file mode 100644 index 000000000000..a016bcee97df --- /dev/null +++ b/pkgs/by-name/sh/shaderc/fix-pc-file-generation.patch @@ -0,0 +1,53 @@ +diff --git a/cmake/shaderc.pc.in b/cmake/shaderc.pc.in +index 6d217bf..bb37c29 100644 +--- a/cmake/shaderc.pc.in ++++ b/cmake/shaderc.pc.in +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@PKG_CONFIG_LIBDIR@ ++includedir=@PKG_CONFIG_INCLUDEDIR@ + + Name: shaderc + Description: Tools and libraries for Vulkan shader compilation +diff --git a/cmake/shaderc_combined.pc.in b/cmake/shaderc_combined.pc.in +index 6d217bf..bb37c29 100644 +--- a/cmake/shaderc_combined.pc.in ++++ b/cmake/shaderc_combined.pc.in +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@PKG_CONFIG_LIBDIR@ ++includedir=@PKG_CONFIG_INCLUDEDIR@ + + Name: shaderc + Description: Tools and libraries for Vulkan shader compilation +diff --git a/cmake/shaderc_static.pc.in b/cmake/shaderc_static.pc.in +index 6d217bf..bb37c29 100644 +--- a/cmake/shaderc_static.pc.in ++++ b/cmake/shaderc_static.pc.in +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@PKG_CONFIG_LIBDIR@ ++includedir=@PKG_CONFIG_INCLUDEDIR@ + + Name: shaderc + Description: Tools and libraries for Vulkan shader compilation +diff --git a/cmake/write_pkg_config.cmake b/cmake/write_pkg_config.cmake +index d367ce3..18502ee 100644 +--- a/cmake/write_pkg_config.cmake ++++ b/cmake/write_pkg_config.cmake +@@ -28,4 +28,6 @@ REGEX + # CMake support "-dev" in the version. + # If it's not a "-dev" version then ensure it ends with ".1" + string(REGEX REPLACE "-dev.1" ".0" CURRENT_VERSION "${CURRENT_VERSION}.1") ++cmake_path(APPEND PKG_CONFIG_LIBDIR "\${exec_prefix}" "${CMAKE_INSTALL_LIBDIR}") ++cmake_path(APPEND PKG_CONFIG_INCLUDEDIR "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}") + configure_file(${TEMPLATE_FILE} ${OUT_FILE} @ONLY) diff --git a/pkgs/by-name/sh/shaderc/package.nix b/pkgs/by-name/sh/shaderc/package.nix index b9e2e157f7d3..97e1f69018bf 100644 --- a/pkgs/by-name/sh/shaderc/package.nix +++ b/pkgs/by-name/sh/shaderc/package.nix @@ -10,10 +10,11 @@ cctools, glslang, spirv-tools, + testers, }: stdenv.mkDerivation (finalAttrs: { pname = "shaderc"; - version = "2025.5"; + version = "2026.1"; outputs = [ "out" @@ -27,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "google"; repo = "shaderc"; rev = "v${finalAttrs.version}"; - hash = "sha256-PmGRZDXblrBhZe16QfpHfRdsRhXnGsN7o+qh14nlOUQ="; + hash = "sha256-OiBv18zxeE/gqY4zOMXTsCdkAEWo9BIehdu/adw0+cE="; }; patches = [ @@ -36,13 +37,13 @@ stdenv.mkDerivation (finalAttrs: { spirv-tools-version = spirv-tools.version; glslang-version = glslang.version; }) + + # https://github.com/google/shaderc/pull/1529 + ./fix-pc-file-generation.patch ]; postPatch = '' patchShebangs --build utils/ - - substituteInPlace cmake/*.pc.in \ - --replace-fail $'{prefix}/@CMAKE_INSTALL_' '@CMAKE_INSTALL_FULL_' ''; nativeBuildInputs = [ @@ -70,11 +71,22 @@ stdenv.mkDerivation (finalAttrs: { versionCheckProgramArg = "--version"; doInstallCheck = true; + passthru.tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + # The version in pc files has `.1` appended to indicate that it's not a dev version + versionCheck = false; + }; + meta = { description = "Collection of tools, libraries and tests for shader compilation"; inherit (finalAttrs.src.meta) homepage; license = lib.licenses.asl20; platforms = lib.platforms.all; mainProgram = "glslc"; + pkgConfigModules = [ + "shaderc_combined" + "shaderc" + "shaderc_static" + ]; }; }) diff --git a/pkgs/by-name/sh/shadow/disable-xaprintf-test.patch b/pkgs/by-name/sh/shadow/disable-xaprintf-test.patch deleted file mode 100644 index bdf45af1d604..000000000000 --- a/pkgs/by-name/sh/shadow/disable-xaprintf-test.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am -index 6e94318..dca18bb 100644 ---- a/tests/unit/Makefile.am -+++ b/tests/unit/Makefile.am -@@ -10,8 +10,7 @@ check_PROGRAMS = \ - test_snprintf \ - test_strncpy \ - test_strtcpy \ -- test_typetraits \ -- test_xaprintf -+ test_typetraits - - if ENABLE_LOGIND - check_PROGRAMS += \ diff --git a/pkgs/by-name/sh/shadow/package.nix b/pkgs/by-name/sh/shadow/package.nix index 4094c6e99f91..a506c9f96e27 100644 --- a/pkgs/by-name/sh/shadow/package.nix +++ b/pkgs/by-name/sh/shadow/package.nix @@ -33,13 +33,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "shadow"; - version = "4.18.0"; + version = "4.19.3"; src = fetchFromGitHub { owner = "shadow-maint"; repo = "shadow"; tag = finalAttrs.version; - hash = "sha256-M7We3JboNpr9H0ELbKcFtMvfmmVYaX9dYcsQ3sVX0lM="; + hash = "sha256-fnsiztMXaLmsOMIwl+wW/QArvbawtow91jZ4k0bz65U="; }; outputs = [ @@ -77,9 +77,6 @@ stdenv.mkDerivation (finalAttrs: { # Would have to be done as part of the NixOS modules, # see https://github.com/NixOS/nixpkgs/issues/109457 ./fix-install-with-tcb.patch - # This unit test fails: https://github.com/shadow-maint/shadow/issues/1382 - # Can be removed after the next release - ./disable-xaprintf-test.patch ]; postPatch = '' @@ -103,6 +100,7 @@ stdenv.mkDerivation (finalAttrs: { "--with-group-name-max-length=32" "--with-bcrypt" "--with-yescrypt" + "--disable-logind" # needs systemd, which causes infinite recursion (lib.withFeature withLibbsd "libbsd") ] ++ lib.optional (stdenv.hostPlatform.libc != "glibc") "--disable-nscd" diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix index e7c733c683fe..0ebf29c8a97c 100644 --- a/pkgs/by-name/si/simdutf/package.nix +++ b/pkgs/by-name/si/simdutf/package.nix @@ -4,6 +4,9 @@ fetchFromGitHub, cmake, libiconv, + nix-update-script, + testers, + validatePkgConfig, }: stdenv.mkDerivation (finalAttrs: { @@ -22,14 +25,27 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace tools/CMakeLists.txt --replace "-Wl,--gc-sections" "" ''; + cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) + ]; + nativeBuildInputs = [ cmake + validatePkgConfig ]; buildInputs = [ libiconv ]; + passthru = { + updateScript = nix-update-script { }; + + tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + }; + meta = { description = "Unicode routines validation and transcoding at billions of characters per second"; homepage = "https://github.com/simdutf/simdutf"; @@ -38,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { mit ]; maintainers = with lib.maintainers; [ wineee ]; - mainProgram = "simdutf"; + pkgConfigModules = [ "simdutf" ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/sl/slipshow/package.nix b/pkgs/by-name/sl/slipshow/package.nix index 95a2235a3b3a..495f3739d1f0 100644 --- a/pkgs/by-name/sl/slipshow/package.nix +++ b/pkgs/by-name/sl/slipshow/package.nix @@ -45,6 +45,11 @@ ocamlPackages.buildDunePackage rec { sexplib ]; + # This check fails with cmdliner ≥ 2.0 + preCheck = '' + rm -f test/compiler/dimension.t/run.t + ''; + doCheck = true; nativeCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/so/socat/musl.patch b/pkgs/by-name/so/socat/musl.patch new file mode 100644 index 000000000000..9ec957b4d8c2 --- /dev/null +++ b/pkgs/by-name/so/socat/musl.patch @@ -0,0 +1,46 @@ +From 8be51b7c3520fd2dbd1ba2e917a499c90822817f Mon Sep 17 00:00:00 2001 +From: Alyssa Ross +Date: Tue, 27 Jan 2026 10:46:19 +0100 +Subject: [PATCH] Fix build for musl +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +musl's struct msghdr includes padding members, so using undesignated +initializers as was previously being done ended up initializing the +wrong members: + + gcc -O -D_GNU_SOURCE -Wall -Wno-parentheses -DHAVE_CONFIG_H -I. -I. -c -o xio-netlink.o xio-netlink.c + xio-netlink.c: In function ‘xio_netlink_mtu’: + xio-netlink.c:33:59: error: initialization of ‘int’ from ‘void *’ makes integer from pointer without a cast [-Wint-conversion] + 33 | ct msghdr rtmsg = { &sa, sizeof(sa), &iov, 1, NULL, 0, 0 }; + | ^~~~ + xio-netlink.c:33:59: note: (near initialization for ‘rtmsg.__pad1’) + make: *** [: xio-netlink.o] Error 1 +--- + xio-netlink.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/xio-netlink.c b/xio-netlink.c +index 533d78c..b0c5c3c 100644 +--- a/xio-netlink.c ++++ b/xio-netlink.c +@@ -30,7 +30,12 @@ int xio_netlink_mtu( + struct nlmsghdr buf[8192/sizeof(struct nlmsghdr)]; + struct iovec iov = { buf, sizeof(buf) }; + struct sockaddr_nl sa; +- struct msghdr rtmsg = { &sa, sizeof(sa), &iov, 1, NULL, 0, 0 }; ++ struct msghdr rtmsg = { ++ .msg_name = &sa, ++ .msg_namelen = sizeof(sa), ++ .msg_iov = &iov, ++ .msg_iovlen = 1, ++ }; + struct nlmsghdr *nh; + + Info2("Setting interface %d MTU to %u using netlink", interface_index, mtu); + +base-commit: 8834d6cc7e0d7b04cd31f9f7d0cb3e06913b0323 +-- +2.52.0 + diff --git a/pkgs/by-name/so/socat/package.nix b/pkgs/by-name/so/socat/package.nix index e18f75fd7611..e80b57df9f07 100644 --- a/pkgs/by-name/so/socat/package.nix +++ b/pkgs/by-name/so/socat/package.nix @@ -11,13 +11,17 @@ stdenv.mkDerivation rec { pname = "socat"; - version = "1.8.0.3"; + version = "1.8.1.0"; src = fetchurl { url = "http://www.dest-unreach.org/socat/download/socat-${version}.tar.bz2"; - hash = "sha256-AesBc2HZW7OmlB6EC1nkRjo/q/kt9BVO0CsWou1qAJU="; + hash = "sha256-kfIi7mVVkDZgDCUFuZms6+1IuJnw4uU64cnDHWmGtqQ="; }; + patches = [ + ./musl.patch + ]; + postPatch = '' patchShebangs test.sh substituteInPlace test.sh \ diff --git a/pkgs/by-name/so/softhsm/package.nix b/pkgs/by-name/so/softhsm/package.nix index 14d1174463a4..ce734c965c2b 100644 --- a/pkgs/by-name/so/softhsm/package.nix +++ b/pkgs/by-name/so/softhsm/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "softhsm"; - version = "2.6.1"; + version = "2.7.0"; src = fetchFromGitHub { owner = "softhsm"; repo = "SoftHSMv2"; rev = "${finalAttrs.version}"; - hash = "sha256-sx0ceVY795JbtKbQGAVFllB9UJfTdgd242d6c+s1tBw="; + hash = "sha256-gwqdgGCVPQwPkE6gFlZxZdk6Ln/qZn3CmMfbcLm9p04="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sp/spdlog/package.nix b/pkgs/by-name/sp/spdlog/package.nix index 02c62bc429c4..11589629b129 100644 --- a/pkgs/by-name/sp/spdlog/package.nix +++ b/pkgs/by-name/sp/spdlog/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "spdlog"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "gabime"; repo = "spdlog"; tag = "v${finalAttrs.version}"; - hash = "sha256-VB82cNfpJlamUjrQFYElcy0CXAbkPqZkD5zhuLeHLzs="; + hash = "sha256-bL3hQmERXNwGmDoi7+wLv/TkppGhG6cO47k1iZvJGzY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/sp/spirv-cross/package.nix b/pkgs/by-name/sp/spirv-cross/package.nix index 7836c338656e..c97272ca8d3a 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.335.0"; + version = "1.4.341.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Cross"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-BmWHmGh7wu2hkOm04PhHxwTs3e8r8O62tq6SDx6b5xM="; + hash = "sha256-F3/j2+B/qv3sDiOiOy1OhR9G+DnM7I4LJqljZXL4S7Q="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sp/spirv-headers/package.nix b/pkgs/by-name/sp/spirv-headers/package.nix index 41fe45a1f388..95a5f55b4cf2 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 (finalAttrs: { pname = "spirv-headers"; - version = "1.4.335.0"; + version = "1.4.341.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-HjJjMuqTrYv5LUOWcexzPHb8nhOT4duooDAhDsd44Zo="; + hash = "sha256-aYKFJxRDoY/Cor8gYVoR/YSyXWSNtcRG0HK8BZH0Ztk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/sp/spirv-tools/0001-Fix-generated-pkg-config-modules-with-absolute-insta.patch b/pkgs/by-name/sp/spirv-tools/0001-Fix-generated-pkg-config-modules-with-absolute-insta.patch new file mode 100644 index 000000000000..403570fc29ea --- /dev/null +++ b/pkgs/by-name/sp/spirv-tools/0001-Fix-generated-pkg-config-modules-with-absolute-insta.patch @@ -0,0 +1,55 @@ +From 2c8680324480bc0c20a026eb7ff9ffae1fe5fb13 Mon Sep 17 00:00:00 2001 +From: Marcin Serwin +Date: Tue, 6 Jan 2026 13:22:42 +0100 +Subject: [PATCH] Fix generated pkg-config modules with absolute installdirs + +Fixes: https://github.com/KhronosGroup/SPIRV-Tools/issues/3905 +Signed-off-by: Marcin Serwin +--- + cmake/SPIRV-Tools-shared.pc.in | 4 ++-- + cmake/SPIRV-Tools.pc.in | 4 ++-- + cmake/write_pkg_config.cmake | 2 ++ + 3 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/cmake/SPIRV-Tools-shared.pc.in b/cmake/SPIRV-Tools-shared.pc.in +index 0dcaa276..f6a282bd 100644 +--- a/cmake/SPIRV-Tools-shared.pc.in ++++ b/cmake/SPIRV-Tools-shared.pc.in +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@PKG_CONFIG_LIBDIR@ ++includedir=@PKG_CONFIG_INCLUDEDIR@ + + Name: SPIRV-Tools + Description: Tools for SPIR-V +diff --git a/cmake/SPIRV-Tools.pc.in b/cmake/SPIRV-Tools.pc.in +index 2984dc57..62902e58 100644 +--- a/cmake/SPIRV-Tools.pc.in ++++ b/cmake/SPIRV-Tools.pc.in +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@PKG_CONFIG_LIBDIR@ ++includedir=@PKG_CONFIG_INCLUDEDIR@ + + Name: SPIRV-Tools + Description: Tools for SPIR-V +diff --git a/cmake/write_pkg_config.cmake b/cmake/write_pkg_config.cmake +index d367ce3e..ed932271 100644 +--- a/cmake/write_pkg_config.cmake ++++ b/cmake/write_pkg_config.cmake +@@ -28,4 +28,6 @@ REGEX + # CMake support "-dev" in the version. + # If it's not a "-dev" version then ensure it ends with ".1" + string(REGEX REPLACE "-dev.1" ".0" CURRENT_VERSION "${CURRENT_VERSION}.1") ++cmake_path(APPEND PKG_CONFIG_LIBDIR "\${exec_prefix}" "${CMAKE_INSTALL_LIBDIR}") ++cmake_path(APPEND PKG_CONFIG_INCLUDEDIR "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}") + configure_file(${TEMPLATE_FILE} ${OUT_FILE} @ONLY) +-- +2.51.2 + diff --git a/pkgs/by-name/sp/spirv-tools/package.nix b/pkgs/by-name/sp/spirv-tools/package.nix index 9cb82cd659f5..e08ae33d33e6 100644 --- a/pkgs/by-name/sp/spirv-tools/package.nix +++ b/pkgs/by-name/sp/spirv-tools/package.nix @@ -9,19 +9,29 @@ stdenv.mkDerivation (finalAttrs: { pname = "spirv-tools"; - version = "1.4.335.0"; + version = "1.4.341.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-H+t7ZH4SB+XgWTLj9XaJWZwAWk8M2QeC98Zi5ay8PBc="; + hash = "sha256-8haVqfmTBvNuv5jEc/LaAO34pWjTZAJ04FIxuxfJNUc="; }; + patches = [ + # https://github.com/KhronosGroup/SPIRV-Tools/pull/6483 + ./0001-Fix-generated-pkg-config-modules-with-absolute-insta.patch + ] # The cmake options are sufficient for turning on static building, but not # for disabling shared building, just trim the shared lib from the CMake # description - patches = lib.optional stdenv.hostPlatform.isStatic ./no-shared-libs.patch; + ++ lib.optional stdenv.hostPlatform.isStatic ./no-shared-libs.patch; + + outputs = [ + "out" + "lib" + "dev" + ]; nativeBuildInputs = [ cmake @@ -29,27 +39,12 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DSPIRV-Headers_SOURCE_DIR=${spirv-headers.src}" + "-DSPIRV-Headers_SOURCE_DIR=${spirv-headers}" # Avoid blanket -Werror to evade build failures on less # tested compilers. "-DSPIRV_WERROR=OFF" ]; - # https://github.com/KhronosGroup/SPIRV-Tools/issues/3905 - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail '-P ''${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake' \ - '-DCMAKE_INSTALL_FULL_LIBDIR=''${CMAKE_INSTALL_FULL_LIBDIR} - -DCMAKE_INSTALL_FULL_INCLUDEDIR=''${CMAKE_INSTALL_FULL_INCLUDEDIR} - -P ''${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake' - substituteInPlace cmake/SPIRV-Tools.pc.in \ - --replace-fail '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace-fail '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ - substituteInPlace cmake/SPIRV-Tools-shared.pc.in \ - --replace-fail '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace-fail '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ - ''; - meta = { description = "SPIR-V Tools project provides an API and commands for processing SPIR-V modules"; homepage = "https://github.com/KhronosGroup/SPIRV-Tools"; diff --git a/pkgs/by-name/st/stanc/package.nix b/pkgs/by-name/st/stanc/package.nix index 7007f0aa5792..9bdab90f50d8 100644 --- a/pkgs/by-name/st/stanc/package.nix +++ b/pkgs/by-name/st/stanc/package.nix @@ -9,7 +9,6 @@ ocamlPackages.buildDunePackage rec { version = "2.37.0"; minimalOCamlVersion = "4.12"; - duneVersion = "3"; src = fetchFromGitHub { owner = "stan-dev"; @@ -26,7 +25,7 @@ ocamlPackages.buildDunePackage rec { ppx_deriving fmt yojson - cmdliner + cmdliner_1 ]; meta = { diff --git a/pkgs/by-name/ta/talloc/package.nix b/pkgs/by-name/ta/talloc/package.nix index 880e8a381862..5f833dcf30be 100644 --- a/pkgs/by-name/ta/talloc/package.nix +++ b/pkgs/by-name/ta/talloc/package.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "talloc"; - version = "2.4.3"; + version = "2.4.4"; src = fetchurl { url = "mirror://samba/talloc/talloc-${version}.tar.gz"; - sha256 = "sha256-3EbEC59GuzTdl/5B9Uiw6LJHt3qRhXZzPFKOg6vYVN0="; + sha256 = "sha256-VeR5lAGME3Q0hVROcgZ4D/uzyElecEqZY2UD5ud6v1k="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/th/thelounge/package.nix b/pkgs/by-name/th/thelounge/package.nix index 219881398473..6a2db216f110 100644 --- a/pkgs/by-name/th/thelounge/package.nix +++ b/pkgs/by-name/th/thelounge/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, fetchYarnDeps, nodejs, + nodejs-slim, yarn, fixup-yarn-lock, python3, @@ -84,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { rm -rf node_modules/sqlite3/build-tmp-napi-v6/{Release/obj.target,node_sqlite3.target.mk} ''; - disallowedReferences = [ nodejs.src ]; + disallowedReferences = [ nodejs-slim.src ]; dontNpmPrune = true; diff --git a/pkgs/by-name/ti/tinyxxd/package.nix b/pkgs/by-name/ti/tinyxxd/package.nix index ed491ca42b61..2dc0d8342afa 100644 --- a/pkgs/by-name/ti/tinyxxd/package.nix +++ b/pkgs/by-name/ti/tinyxxd/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tinyxxd"; - version = "1.3.7"; + version = "1.3.10"; src = fetchFromGitHub { repo = "tinyxxd"; owner = "xyproto"; rev = "v${finalAttrs.version}"; - hash = "sha256-Yj9n/reWAjKY1spXiW/fjPGTgj1Yc18FzFln6f5LK9c="; + hash = "sha256-DrAwUwaiEnaOCo0YLXSaAJDEyBJ4t7mVxEarDSO6XeU="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/to/todoman/package.nix b/pkgs/by-name/to/todoman/package.nix index f16c5ea01aac..3abcd2678439 100644 --- a/pkgs/by-name/to/todoman/package.nix +++ b/pkgs/by-name/to/todoman/package.nix @@ -90,8 +90,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: { "test_xdg_existant" # Tests are sensitive to performance "test_sorting_fields" - # Test fails with urwid 3.0.4, but should work with 3.0.5 again - "test_todo_editor_list" ]; pythonImportsCheck = [ diff --git a/pkgs/by-name/us/usbutils/fix-paths.patch b/pkgs/by-name/us/usbutils/fix-paths.patch index af522ac50d7b..87392c6171b0 100644 --- a/pkgs/by-name/us/usbutils/fix-paths.patch +++ b/pkgs/by-name/us/usbutils/fix-paths.patch @@ -1,12 +1,13 @@ diff --git a/lsusb.py b/lsusb.py -index bbc4dbb..8af1b1f 100755 +index 8f19ec4..ae81134 100755 --- a/lsusb.py +++ b/lsusb.py -@@ -27,8 +27,7 @@ showwakeup = False +@@ -27,9 +27,7 @@ showwakeup = False prefix = "/sys/bus/usb/devices/" usbids = [ - "/usr/share/hwdata/usb.ids", +- "/usr/share/misc/usb.ids", - "/usr/share/usb.ids", + "@hwdata@/share/hwdata/usb.ids", ] diff --git a/pkgs/by-name/us/usbutils/package.nix b/pkgs/by-name/us/usbutils/package.nix index ed9c38b3f1fc..d2fd680436aa 100644 --- a/pkgs/by-name/us/usbutils/package.nix +++ b/pkgs/by-name/us/usbutils/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "usbutils"; - version = "018"; + version = "019"; src = fetchurl { url = "mirror://kernel/linux/utils/usb/usbutils/usbutils-${finalAttrs.version}.tar.xz"; - hash = "sha256-g/aLWbWFR1icACZugmcYZGJ1k6tDYtjIB/UO6pI8rZM="; + hash = "sha256-ZZ9AxEDjG6hlxSyBijPTumqXNJ4zU/ixmFF5yyqnHsU="; }; patches = [ @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (fetchpatch { - url = "https://raw.githubusercontent.com/Homebrew/formula-patches/24a6945778381a62ecdcc1d78bcc16b9f86778c1/usbutils/portable.patch"; + url = "https://raw.githubusercontent.com/Homebrew/homebrew-core/1cf441a09f572566b1b7c4695a4d169d1177248a/Patches/usbutils/portable.patch"; hash = "sha256-spTkWURij4sPLoWtDaWVMIk81AS5W+qUUOQL1pAZEvs="; }) ]; diff --git a/pkgs/by-name/ut/utf8cpp/package.nix b/pkgs/by-name/ut/utf8cpp/package.nix index b8c53dce7e66..f8e88753470f 100644 --- a/pkgs/by-name/ut/utf8cpp/package.nix +++ b/pkgs/by-name/ut/utf8cpp/package.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "utf8cpp"; - version = "4.0.8"; + version = "4.0.9"; src = fetchFromGitHub { owner = "nemtrif"; repo = "utfcpp"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-9lfs2tqsSDbf1appDC+S3qdmS4DipHhXoiJQluKytbM="; + hash = "sha256-0FgMKHymFOA3BM7VS8US2is8TmQlL/wWj4nSRihqcDo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/vu/vulkan-extension-layer/package.nix b/pkgs/by-name/vu/vulkan-extension-layer/package.nix index 31ffe26e9f2d..1be76857c00f 100644 --- a/pkgs/by-name/vu/vulkan-extension-layer/package.nix +++ b/pkgs/by-name/vu/vulkan-extension-layer/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vulkan-extension-layer"; - version = "1.4.335.0"; + version = "1.4.341.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ExtensionLayer"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-1Ax/0W882nJFO2hVqXamT89lFu5ncnrytnwDdUIihnk="; + hash = "sha256-Qj2sZ9O3WNDb7thv5PzWmONIKBO6hXwz0wQ0PobFgvg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vu/vulkan-headers/package.nix b/pkgs/by-name/vu/vulkan-headers/package.nix index 81ca1d849c86..65d0a32fdfd9 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 (finalAttrs: { pname = "vulkan-headers"; - version = "1.4.335.0"; + version = "1.4.341.0"; # Adding `ninja` here to enable Ninja backend. Otherwise on gcc-14 or # later the build fails as: @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-DIePLzDoImnaso0WYUv819wSDeA7Zy1I/tYAbsALXKg="; + hash = "sha256-R/t0mAhNX+jREDVIFnv0agB9qtcnRb06K4OHtLRxWow="; }; 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 cd1eae906799..a0f31bfc1014 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.335.0"; + version = "1.4.341.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-1xLT4AynJumzwkYOBS5i0OpCi3EdE8QctctDn+DGrvU="; + hash = "sha256-OcguNyi1yZ2OMnI2HSrx+pYvk4RHbn6IGZqnYwWGmB0="; }; 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 eb93c4f4395b..89c59d98e8e2 100644 --- a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix +++ b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vulkan-tools-lunarg"; - version = "1.4.335.0"; + version = "1.4.341.0"; src = fetchFromGitHub { owner = "LunarG"; repo = "VulkanTools"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-2DUxlGH9Yco64Y74QByVniWXiYYy+e4MfyN4S+E6KKA="; + hash = "sha256-y/xTeEBjhDBlB0qcWUe159SvsRa5tBLUy6FZSmupQsU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vu/vulkan-tools/package.nix b/pkgs/by-name/vu/vulkan-tools/package.nix index c8b0574c0a40..826602ba462e 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.335"; + version = "1.4.341.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Tools"; rev = "vulkan-sdk-${version}"; - hash = "sha256-C/wzLLiG7DrLyP3YRKhjawNoEOCCogXkrFeBczeVZR0="; + hash = "sha256-+5BL28h7+r+mLr1Tr7UT4UEB8jRrIc2JwoasJ7HzxI0="; }; 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 cd947b27809e..b6f8c7ff3e5b 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.335.0"; + version = "1.4.341.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Utility-Libraries"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-lDO0B7wEYT6cc/t/ZW5OAxxgRfDORoGd+pF5r5R7yoQ="; + hash = "sha256-QB9U7Nj2jRTYlHql/qUuwpWoEQ+/T/cVYvs+zKXUUfw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vu/vulkan-validation-layers/package.nix b/pkgs/by-name/vu/vulkan-validation-layers/package.nix index 5cf659e9f551..5e4834e111a2 100644 --- a/pkgs/by-name/vu/vulkan-validation-layers/package.nix +++ b/pkgs/by-name/vu/vulkan-validation-layers/package.nix @@ -26,13 +26,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "vulkan-validation-layers"; - version = "1.4.335.0"; + version = "1.4.341.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-FRxr33epHe+HIH/7Y7ms+6E9L0yzaNnFzN3YnswZfRo="; + hash = "sha256-xUeMqtQ7bR3P50yQN5TXVzCO9Ugp9tUyFMtYnvc3g8s="; }; strictDeps = true; diff --git a/pkgs/by-name/vu/vulkan-volk/package.nix b/pkgs/by-name/vu/vulkan-volk/package.nix index 1534219f2756..52ae5b0de349 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.335.0"; + version = "1.4.341.0"; src = fetchFromGitHub { owner = "zeux"; repo = "volk"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-qAMMhaeJweHNeW7+5RUpFh65jUnuw0TsYwq3PrKvCkM="; + hash = "sha256-jAXUwejUJGc8H+2lDGLHIlrI0sdzQbnJ+ZNbZHYdFX8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/w3/w3m/package.nix b/pkgs/by-name/w3/w3m/package.nix index 9bc737d13b4b..9014f39f8256 100644 --- a/pkgs/by-name/w3/w3m/package.nix +++ b/pkgs/by-name/w3/w3m/package.nix @@ -39,13 +39,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "w3m"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromSourcehut { owner = "~rkta"; repo = "w3m"; tag = "v${finalAttrs.version}"; - hash = "sha256-rz9tNkMg5xUqMpMdK2AQlKjCJlCjgLQOkj4A/eyPm0M="; + hash = "sha256-VJztcvcmmA8f5RJ+NEYjPE8CGEfCRRjQ+fuF0UpY+sA="; }; env = { @@ -115,6 +115,11 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace ./configure --replace /usr /no-such-path ''; + outputs = [ + "out" + "man" + ]; + enableParallelBuilding = false; passthru.tests.version = testers.testVersion { diff --git a/pkgs/by-name/wa/wayland-proxy-virtwl/package.nix b/pkgs/by-name/wa/wayland-proxy-virtwl/package.nix index 175a00f86a7a..7fee68ab8f64 100644 --- a/pkgs/by-name/wa/wayland-proxy-virtwl/package.nix +++ b/pkgs/by-name/wa/wayland-proxy-virtwl/package.nix @@ -32,7 +32,7 @@ ocamlPackages.buildDunePackage { eio_main ppx_cstruct wayland - cmdliner + cmdliner_1 logs ppx_cstruct ]); diff --git a/pkgs/by-name/wp/wpgtk/package.nix b/pkgs/by-name/wp/wpgtk/package.nix index 17d6f952dbd7..de4b878d5fb9 100644 --- a/pkgs/by-name/wp/wpgtk/package.nix +++ b/pkgs/by-name/wp/wpgtk/package.nix @@ -39,9 +39,12 @@ python3Packages.buildPythonApplication (finalAttrs: { dependencies = with python3Packages; [ pygobject3 pillow - pywal + pywal16 ]; + # use pywal16 fork instead + pythonRemoveDeps = [ "pywal" ]; + dontWrapGApps = true; makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ]; @@ -54,7 +57,7 @@ python3Packages.buildPythonApplication (finalAttrs: { longDescription = '' In short, wpgtk is a colorscheme/wallpaper manager with a template system attached which lets you create templates from any textfile and will replace keywords on it on the fly, allowing for great styling and theming possibilities. - wpgtk uses pywal as its colorscheme generator, but builds upon it with a UI and other features, such as the abilty to mix and edit the colorschemes generated and save them with their respective wallpapers, having light and dark themes, hackable and fast GTK theme made specifically for wpgtk and custom keywords and values to replace in templates. + wpgtk uses pywal16 as its colorscheme generator, but builds upon it with a UI and other features, such as the abilty to mix and edit the colorschemes generated and save them with their respective wallpapers, having light and dark themes, hackable and fast GTK theme made specifically for wpgtk and custom keywords and values to replace in templates. INFO: To work properly, this tool needs "programs.dconf.enable = true" on nixos or dconf installed. A reboot may be required after installing dconf. ''; diff --git a/pkgs/by-name/x2/x2t/package.nix b/pkgs/by-name/x2/x2t/package.nix index 482c00705f1d..2d6595ac45c8 100644 --- a/pkgs/by-name/x2/x2t/package.nix +++ b/pkgs/by-name/x2/x2t/package.nix @@ -16,6 +16,7 @@ jdk, lib, nodejs_22, + nodejs-slim_22, openssl, pkg-config, python3, @@ -704,7 +705,7 @@ let qmakeFlags ++ icuQmakeFlags ++ [ - # c++1z for nodejs_22.libv8 (20 seems to produce errors around 'is_void_v' there) + # c++1z for nodejs-slim_22.libv8 (20 seems to produce errors around 'is_void_v' there) # c++ 20 for nodejs_23.libv8 "CONFIG+=c++2a" # v8_base.h will set nMaxVirtualMemory to 4000000000/5000000000 @@ -735,8 +736,8 @@ let echo "== v8 ==" mkdir -p Common/3dParty/v8_89/v8/out.gn/linux_64 # using nodejs_22 here is a workaround for https://github.com/NixOS/nixpkgs/issues/477805 - ln -s ${nodejs_22.libv8}/lib Common/3dParty/v8_89/v8/out.gn/linux_64/obj - tar xf ${nodejs_22.libv8.src} --one-top-level=/tmp/xxxxx + ln -s ${nodejs-slim_22.libv8}/lib Common/3dParty/v8_89/v8/out.gn/linux_64/obj + tar xf ${nodejs-slim_22.libv8.src} --one-top-level=/tmp/xxxxx for i in /tmp/xxxxx/*/deps/v8/*; do cp -r $i Common/3dParty/v8_89/v8/ done diff --git a/pkgs/by-name/xa/xandikos/package.nix b/pkgs/by-name/xa/xandikos/package.nix index 3d9650a1b5a5..4343f0acf839 100644 --- a/pkgs/by-name/xa/xandikos/package.nix +++ b/pkgs/by-name/xa/xandikos/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "xandikos"; - version = "0.2.12"; + version = "0.3.4"; pyproject = true; src = fetchFromGitHub { owner = "jelmer"; repo = "xandikos"; tag = "v${version}"; - hash = "sha256-wdEwIVN9dkLVj8oe+2eh5n258pZRfKgLgzVCmwafCis="; + hash = "sha256-udKhJUsWFcyapEzYJOoujpq/VioFLGCCKq5WAlXsHnU="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/ya/yarn-berry/fetcher/default.nix b/pkgs/by-name/ya/yarn-berry/fetcher/default.nix index a9e3b920fe04..5392c6450ccd 100644 --- a/pkgs/by-name/ya/yarn-berry/fetcher/default.nix +++ b/pkgs/by-name/ya/yarn-berry/fetcher/default.nix @@ -8,6 +8,7 @@ zlib-ng, makeScopeWithSplicing', generateSplicesForMkScope, + fetchpatch, }: let @@ -46,9 +47,22 @@ let libzip = (libzip.override { # Known good version: 2.2.4 - zlib = zlib-ng.override { - withZlibCompat = true; - }; + zlib = + (zlib-ng.overrideAttrs (old: { + patches = old.patches or [ ] ++ [ + # Yarn hashes the output of libzip(untar(tarball)), so the output of libzip + # needs to be an exact match across versions, and this commit changes the + # exact output. This is ridiculous, but such is life. + (fetchpatch { + url = "https://github.com/zlib-ng/zlib-ng/commit/be819413be8a284b1827437006c0859644d0c367.patch"; + revert = true; + hash = "sha256-rwRcNKpA2dMWkC6WRATDOCYCDDqqPvFJkQ6DLDohQd8="; + }) + ]; + })).override + { + withZlibCompat = true; + }; }).overrideAttrs (old: { patches = (old.patches or [ ]) ++ [ diff --git a/pkgs/by-name/zl/zlib-ng/package.nix b/pkgs/by-name/zl/zlib-ng/package.nix index 83dbfb8558b9..6d813b919db7 100644 --- a/pkgs/by-name/zl/zlib-ng/package.nix +++ b/pkgs/by-name/zl/zlib-ng/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zlib-ng"; - version = "2.3.2"; + version = "2.3.3"; src = fetchFromGitHub { owner = "zlib-ng"; repo = "zlib-ng"; rev = finalAttrs.version; - hash = "sha256-lO6fO18Z74+wKF0O/JjfrhS8lyaNQ37eamWGThb39F8="; + hash = "sha256-6GlHCnx9dQtmViPnvHnMS+l9Z+g6M8ynrSxLhLtmAKU="; }; outputs = [ @@ -44,10 +44,7 @@ stdenv.mkDerivation (finalAttrs: { "-DBUILD_SHARED_LIBS=ON" "-DINSTALL_UTILS=OFF" ] - ++ lib.optionals withZlibCompat [ "-DZLIB_COMPAT=ON" ] - ++ lib.optional ( - stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isCygwin - ) "-DCMAKE_RC_COMPILER=${stdenv.cc.targetPrefix}windres"; + ++ lib.optionals withZlibCompat [ "-DZLIB_COMPAT=ON" ]; meta = { description = "Zlib data compression library for the next generation systems"; diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index ea775ba9d60a..556516f937a9 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "d1602cb2b331058fcfa5580f16159e47325bcd1a", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d1602cb2b331058fcfa5580f16159e47325bcd1a.tar.gz", - "sha256": "134qhqlxfkv0vs58pzkll1cbqci8npr42yh0x1gmd0s8y00crqa4", - "msg": "Update from Hackage at 2025-12-30T09:01:27Z" + "commit": "2128173b41632a6cc5b2342152a28985650cc4ce", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/2128173b41632a6cc5b2342152a28985650cc4ce.tar.gz", + "sha256": "19amns4ybljw2xf240anldqxaabymxad4izjclh5kxd13llk0jdb", + "msg": "Update from Hackage at 2026-01-30T20:25:58Z" } diff --git a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix index 0c89451871a4..b90123017bde 100644 --- a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix +++ b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix @@ -20,7 +20,8 @@ let in stdenv.mkDerivation { - name = "docbook-sgml-3.1"; + pname = "docbook-sgml"; + version = "3.1"; dontUnpack = true; diff --git a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix index d20313d7e237..b417674798b2 100644 --- a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix +++ b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix @@ -20,7 +20,8 @@ let in stdenv.mkDerivation { - name = "docbook-sgml-4.1"; + pname = "docbook-sgml"; + version = "4.1"; dontUnpack = true; diff --git a/pkgs/development/compilers/gcc/patches/15/aarch64-sve-rtx.patch b/pkgs/development/compilers/gcc/patches/15/aarch64-sve-rtx.patch new file mode 100644 index 000000000000..257c76d735da --- /dev/null +++ b/pkgs/development/compilers/gcc/patches/15/aarch64-sve-rtx.patch @@ -0,0 +1,87 @@ +Without the change `libhwy-1.3.0` ICEs when built for aarch64-linux as: +https://github.com/NixOS/nixpkgs/pull/320616#issuecomment-3764400891 + +Upstream report: http://gcc.gnu.org/PR120718 +Upstream fix: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=d755aa03db0ad5b71ee7f39b09c92870789f2f00 +Fetched as: +$ curl -L 'https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=d755aa03db0ad5b71ee7f39b09c92870789f2f00' > aarch64-sve-rtx.patch + +From: Richard Sandiford +Date: Thu, 14 Aug 2025 16:56:50 +0000 (+0100) +Subject: Remove MODE_COMPOSITE_P test from simplify_gen_subreg [PR120718] +X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=d755aa03db0ad5b71ee7f39b09c92870789f2f00 + +Remove MODE_COMPOSITE_P test from simplify_gen_subreg [PR120718] + +simplify_gen_subreg rejected subregs of literal constants if +MODE_COMPOSITE_P. This was added by the fix for PR96648 in +g:c0f772894b6b3cd8ed5c5dd09d0c7917f51cf70f. Jakub said: + + As for the simplify_gen_subreg change, I think it would be desirable + to just avoid creating SUBREGs of constants on all targets and for all + constants, if simplify_immed_subreg simplified, fine, otherwise punt, + but as we are late in GCC11 development, the patch instead guards this + behavior on MODE_COMPOSITE_P (outermode) - i.e. only conversions to + powerpc{,64,64le} double double long double - and only for the cases where + simplify_immed_subreg was called. + +I'm not sure about relaxing the codes further, since subregs might +be wanted for CONST, SYMBOL_REF and LABEL_REF. But removing the +MODE_COMPOSITE_P is needed to fix PR120718, where we get an ICE +from generating a subreg of a V2SI const_vector. + +Unlike the trunk version, this backport does not remove the +VOIDmode test; see PR121501. + +gcc/ + PR rtl-optimization/120718 + * simplify-rtx.cc (simplify_context::simplify_gen_subreg): + Remove MODE_COMPOSITE_P condition. + +gcc/testsuite/ + PR rtl-optimization/120718 + * gcc.target/aarch64/sve/acle/general/pr120718.c: New test. +--- + +diff --git a/gcc/simplify-rtx.cc b/gcc/simplify-rtx.cc +index 88d31a71c05a..8d4cbf1371a3 100644 +--- a/gcc/simplify-rtx.cc ++++ b/gcc/simplify-rtx.cc +@@ -8317,14 +8317,11 @@ simplify_context::simplify_gen_subreg (machine_mode outermode, rtx op, + + if (GET_CODE (op) == SUBREG + || GET_CODE (op) == CONCAT +- || GET_MODE (op) == VOIDmode) +- return NULL_RTX; +- +- if (MODE_COMPOSITE_P (outermode) +- && (CONST_SCALAR_INT_P (op) +- || CONST_DOUBLE_AS_FLOAT_P (op) +- || CONST_FIXED_P (op) +- || GET_CODE (op) == CONST_VECTOR)) ++ || GET_MODE (op) == VOIDmode ++ || CONST_SCALAR_INT_P (op) ++ || CONST_DOUBLE_AS_FLOAT_P (op) ++ || CONST_FIXED_P (op) ++ || GET_CODE (op) == CONST_VECTOR) + return NULL_RTX; + + if (validate_subreg (outermode, innermode, op, byte)) +diff --git a/gcc/testsuite/gcc.target/aarch64/sve/acle/general/pr120718.c b/gcc/testsuite/gcc.target/aarch64/sve/acle/general/pr120718.c +new file mode 100644 +index 000000000000..9ca0938e36bf +--- /dev/null ++++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/general/pr120718.c +@@ -0,0 +1,12 @@ ++/* { dg-options "-O2" } */ ++ ++#include ++typedef int __attribute__((vector_size(8))) v2si; ++typedef struct { int x; int y; } A; ++void bar(A a); ++void foo() ++{ ++ A a; ++ *(v2si *)&a = (v2si){0, (int)svcntd_pat(SV_ALL)}; ++ bar(a); ++} diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index 92369c5d0c60..914cbb170e1f 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -102,6 +102,9 @@ optionals noSysDirs ( # c++tools: Don't check --enable-default-pie. # --enable-default-pie breaks bootstrap gcc otherwise, because libiberty.a is not found ++ optional (is14 || is15) ./c++tools-dont-check-enable-default-pie.patch +# http://gcc.gnu.org/PR120718 backport (will be inclkuded in 15.3.0) to +# fix `highway-1.3.0` ICE on aarch64-linux. +++ optional is15 ./15/aarch64-sve-rtx.patch ## 2. Patches relevant on specific platforms #################################### diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index a9ed3e75e7ea..33f95c9c37eb 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -50,8 +50,9 @@ # If enabled, GHC will be built with the GPL-free but slightly slower native # bignum backend instead of the faster but GPLed gmp backend. enableNativeBignum ? - !(lib.meta.availableOn stdenv.hostPlatform gmp && lib.meta.availableOn stdenv.targetPlatform gmp) - || stdenv.targetPlatform.isGhcjs, + stdenv.targetPlatform.isGhcjs + || !(lib.meta.availableOn stdenv.hostPlatform gmp) + || !(lib.meta.availableOn stdenv.targetPlatform gmp), gmp, # If enabled, use -fPIC when compiling static libs. @@ -72,10 +73,13 @@ stdenv.targetPlatform.isWindows || stdenv.targetPlatform.isGhcjs # Before , - # we couldn't force hadrian to build terminfo for cross. + # we couldn't force hadrian to build terminfo for different triples. || ( lib.versionOlder version "9.15.20250808" - && (stdenv.buildPlatform != stdenv.hostPlatform || stdenv.hostPlatform != stdenv.targetPlatform) + && ( + stdenv.buildPlatform.config != stdenv.hostPlatform.config + || stdenv.hostPlatform.config != stdenv.targetPlatform.config + ) ) ), @@ -211,18 +215,6 @@ ./Cabal-3.16-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="; - }) - ] - ++ lib.optionals stdenv.targetPlatform.isGhcjs [ - # https://gitlab.haskell.org/ghc/ghc/-/issues/26290 - ./export-heap-methods.patch - ] # 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 @@ -311,11 +303,26 @@ }) ] - # Missing ELF symbols - ++ lib.optionals stdenv.targetPlatform.isAndroid [ + # Unreleased or still in-progress upstream cross fixes + ++ lib.optionals (lib.versionAtLeast version "9.10.2" && lib.versionOlder version "9.15") [ + # 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="; + }) + + # https://gitlab.haskell.org/ghc/ghc/-/issues/26290 krank:ignore-line + ./export-heap-methods.patch + ] + ++ lib.optionals (lib.versionAtLeast version "9.10.3") [ + # https://gitlab.haskell.org/ghc/ghc/-/issues/26518 krank:ignore-line ./ghc-define-undefined-elf-st-visibility.patch ] + # Fix docs build with Sphinx >= 9 https://gitlab.haskell.org/ghc/ghc/-/issues/26810 + ++ [ ./ghc-9.6-or-later-docs-sphinx-9.patch ] + ++ (import ./common-llvm-patches.nix { inherit lib version fetchpatch; }); stdenv = stdenvNoCC; @@ -361,7 +368,9 @@ let inherit (stdenv) buildPlatform hostPlatform targetPlatform; # TODO(@Ericson2314) Make unconditional - targetPrefix = lib.optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; + targetPrefix = lib.optionalString ( + targetPlatform.config != hostPlatform.config + ) "${targetPlatform.config}-"; # TODO(@sternenseemann): there's no stage0:exe:haddock target by default, # so haddock isn't available for GHC cross-compilers. Can we fix that? @@ -520,6 +529,9 @@ stdenv.mkDerivation ( pname = "${targetPrefix}ghc${variantSuffix}"; inherit version; + # Useful as hadrianSettings often have spaces in them + __structuredAttrs = true; + src = ghcSrc; enableParallelBuilding = true; @@ -640,15 +652,8 @@ stdenv.mkDerivation ( }/share/emscripten/cache/* "$EM_CACHE/" chmod u+rwX -R "$EM_CACHE" '' - # Create bash array hadrianFlagsArray for use in buildPhase. Do it in - # preConfigure, so overrideAttrs can be used to modify it effectively. - # hadrianSettings are passed via the command line so they are more visible - # in the build log. + '' - hadrianFlagsArray=( - "-j$NIX_BUILD_CORES" - ${lib.escapeShellArgs hadrianSettings} - ) + hadrianFlags+=("-j$NIX_BUILD_CORES") ''; ${if targetPlatform.isGhcjs then "configureScript" else null} = "emconfigure ./configure"; @@ -675,7 +680,7 @@ stdenv.mkDerivation ( "--with-ffi-includes=${targetLibs.libffi.dev}/include" "--with-ffi-libraries=${targetLibs.libffi.out}/lib" ] - ++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [ + ++ lib.optionals (!enableNativeBignum) [ "--with-gmp-includes=${targetLibs.gmp.dev}/include" "--with-gmp-libraries=${targetLibs.gmp.out}/lib" ] @@ -790,16 +795,16 @@ stdenv.mkDerivation ( # In 9.14 this will be default with release flavour. # See https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13444 "--hash-unit-ids" - ]; + ] + ++ hadrianSettings; buildPhase = '' runHook preBuild - # hadrianFlagsArray is created in preConfigure - echo "hadrianFlags: $hadrianFlags ''${hadrianFlagsArray[@]}" + echo "hadrianFlags: ''${hadrianFlags[@]}" # We need to go via the bindist for installing - hadrian $hadrianFlags "''${hadrianFlagsArray[@]}" binary-dist-dir + hadrian "''${hadrianFlags[@]}" binary-dist-dir runHook postBuild ''; @@ -838,8 +843,9 @@ stdenv.mkDerivation ( export InstallNameToolCmd=$INSTALL_NAME_TOOL export OtoolCmd=$OTOOL '' + # Replicate configurePhase + '' - $configureScript $configureFlags "''${configureFlagsArray[@]}" + $configureScript "''${configureFlags[@]}" ''; postInstall = '' diff --git a/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/pkgs/development/compilers/ghc/common-make-native-bignum.nix index 2300e0470ca7..84df764cbcc3 100644 --- a/pkgs/development/compilers/ghc/common-make-native-bignum.nix +++ b/pkgs/development/compilers/ghc/common-make-native-bignum.nix @@ -305,6 +305,9 @@ stdenv.mkDerivation ( # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 krank:ignore-line ./docs-sphinx-7.patch + # Fix docs build with Sphinx >= 9 https://gitlab.haskell.org/ghc/ghc/-/issues/26810 + ./ghc-9.4-docs-sphinx-9.patch + # 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 @@ -536,6 +539,8 @@ stdenv.mkDerivation ( ] ++ lib.optionals enableUnregisterised [ "--enable-unregisterised" + # The C backend generates code incompatible with gnu23 + "CONF_CC_OPTS_STAGE2=-std=gnu17" ]; # Make sure we never relax`$PATH` and hooks support for compatibility. diff --git a/pkgs/development/compilers/ghc/ghc-9.4-docs-sphinx-9.patch b/pkgs/development/compilers/ghc/ghc-9.4-docs-sphinx-9.patch new file mode 100644 index 000000000000..74053b94e9a9 --- /dev/null +++ b/pkgs/development/compilers/ghc/ghc-9.4-docs-sphinx-9.patch @@ -0,0 +1,31 @@ +From db33b15c27e607cd66b85d0a2a6868c7b718a96b Mon Sep 17 00:00:00 2001 +From: sterni +Date: Wed, 28 Jan 2026 00:09:54 +0100 +Subject: [PATCH] users_guide: fix runtime error during build with Sphinx 9.1.0 + +Appears that pathto is stricter about what it accepts now. +Tested Sphinx 8.2.3 and 9.1.0 on the ghc-9.10 branch. + +Resolves #26810. + +Co-authored-by: Martin Weinelt +--- + docs/users_guide/rtd-theme/layout.html | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs/users_guide/rtd-theme/layout.html b/docs/users_guide/rtd-theme/layout.html +index 2a61142514..4b3c1befba 100644 +--- a/docs/users_guide/rtd-theme/layout.html ++++ b/docs/users_guide/rtd-theme/layout.html +@@ -70,7 +70,7 @@ + {%- if css|attr("rel") %} + + {%- else %} +- ++ + {%- endif %} + {%- endfor %} + +-- +2.52.0 + diff --git a/pkgs/development/compilers/ghc/ghc-9.6-or-later-docs-sphinx-9.patch b/pkgs/development/compilers/ghc/ghc-9.6-or-later-docs-sphinx-9.patch new file mode 100644 index 000000000000..5e6960f7e96c --- /dev/null +++ b/pkgs/development/compilers/ghc/ghc-9.6-or-later-docs-sphinx-9.patch @@ -0,0 +1,30 @@ +From 9653a2b9a9e3a756b287b0a59204860511e4abce Mon Sep 17 00:00:00 2001 +From: sterni +Date: Wed, 28 Jan 2026 00:09:54 +0100 +Subject: [PATCH] users_guide: fix runtime error during build with Sphinx 9.1.0 + +Appears that pathto is stricter about what it accepts now. +Tested Sphinx 8.2.3 and 9.1.0 on the ghc-9.10 branch. + +Resolves #26810. + +Co-authored-by: Martin Weinelt +--- + docs/users_guide/rtd-theme/layout.html | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs/users_guide/rtd-theme/layout.html b/docs/users_guide/rtd-theme/layout.html +index 94a40cc1c3..f2441378a8 100644 +--- a/docs/users_guide/rtd-theme/layout.html ++++ b/docs/users_guide/rtd-theme/layout.html +@@ -32,7 +32,7 @@ + {%- if css|attr("rel") %} + + {%- else %} +- ++ + {%- endif %} + {%- endfor %} + +-- +2.52.0 diff --git a/pkgs/development/compilers/gnat-bootstrap/default.nix b/pkgs/development/compilers/gnat-bootstrap/default.nix index dffb81bb47ee..ef7ed876e583 100644 --- a/pkgs/development/compilers/gnat-bootstrap/default.nix +++ b/pkgs/development/compilers/gnat-bootstrap/default.nix @@ -209,6 +209,12 @@ stdenv.mkDerivation ( fi done + '' + + # x86_64-darwin needs this for the reason above, and aarch64-linux needs it + # to avoid https://gcc.gnu.org/bugzilla/show_bug.cgi?id=118009, + # but x86_64-linux doesn't seem to need it. + + lib.optionalString (stdenv.hostPlatform.system != "x86_64-linux") '' "$out"/libexec/gcc/${upstreamTriplet}/${gccVersion}/install-tools/mkheaders -v -v \ "$out" "${stdenv.cc.libc}" ''; diff --git a/pkgs/development/compilers/go/1.25.nix b/pkgs/development/compilers/go/1.25.nix index b961310629b2..726ba8d16ac9 100644 --- a/pkgs/development/compilers/go/1.25.nix +++ b/pkgs/development/compilers/go/1.25.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.25.5"; + version = "1.25.7"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-IqX9CpHvzSihsFNxBrmVmygEth9Zw3WLUejlQpwalU8="; + hash = "sha256-F48oMoICdLQ+F30y8Go+uwEp5CfdIKXkyI3ywXY88Qo="; }; strictDeps = true; diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index 1ea7c1b3a953..effaa92bedff 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -303,17 +303,10 @@ stdenv.mkDerivation ( # This was fixed upstream in LLVM 21 with # 88f041f3e05e26617856cc096d2e2864dfaa1c7b, but it’s too # painful to backport all the way. - lib.optionalString - ( - lib.versionOlder release_version "21" - || - # Rebuild avoidance; TODO: clean up on `staging`. - stdenv.hostPlatform.isx86 - ) - '' - substituteInPlace unittests/TargetParser/Host.cpp \ - --replace-fail "getMacOSHostVersion" "DISABLED_getMacOSHostVersion" - '' + lib.optionalString (lib.versionOlder release_version "21") '' + substituteInPlace unittests/TargetParser/Host.cpp \ + --replace-fail "getMacOSHostVersion" "DISABLED_getMacOSHostVersion" + '' + # This test fails with a `dysmutil` crash; have not yet dug into what's # going on here (TODO(@rrbutani)). diff --git a/pkgs/development/compilers/ocaml/4.09.nix b/pkgs/development/compilers/ocaml/4.09.nix index d67a43273bc0..7e3685d8d365 100644 --- a/pkgs/development/compilers/ocaml/4.09.nix +++ b/pkgs/development/compilers/ocaml/4.09.nix @@ -7,6 +7,9 @@ import ./generic.nix { # Breaks build with Clang hardeningDisable = [ "strictoverflow" ]; + # Tests do not seem to run on this old version + doCheck = false; + patches = [ ./4.09.1-Werror.patch # Compatibility with Glibc 2.34 diff --git a/pkgs/development/compilers/ocaml/4.10.nix b/pkgs/development/compilers/ocaml/4.10.nix index 48d01a5a8c8d..b5eb694e84c0 100644 --- a/pkgs/development/compilers/ocaml/4.10.nix +++ b/pkgs/development/compilers/ocaml/4.10.nix @@ -3,6 +3,10 @@ import ./generic.nix { minor_version = "10"; patch_version = "2"; sha256 = "sha256-locUYQeCgtXbAiB32JveJchfteN2YStE+MN9ToTwAOM="; + + # Tests do not seem to run on this old version + doCheck = false; + patches = [ ./glibc-2.34-for-ocaml-4.10-and-11.patch ]; diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 3dd5bf932160..d074173a8143 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -3,6 +3,7 @@ major_version, patch_version, patches ? [ ], + doCheck ? true, ... }@args: let @@ -83,6 +84,7 @@ let in stdenv.mkDerivation ( + finalArgs: args // { @@ -90,6 +92,15 @@ stdenv.mkDerivation ( patches = map fetchpatch' patches; + # https://github.com/ocaml/ocaml/issues/14543 + postPatch = + if stdenv.cc.isClang then + '' + rm testsuite/tests/basic/trigraph.ml + '' + else + null; + strictDeps = true; prefixKey = "-prefix "; @@ -115,7 +126,9 @@ stdenv.mkDerivation ( "-host ${stdenv.hostPlatform.config}" "-target ${stdenv.targetPlatform.config}" ] - ++ optional noNakedPointers (flags "--disable-naked-pointers" "-no-naked-pointers"); + ++ optional noNakedPointers (flags "--disable-naked-pointers" "-no-naked-pointers") + ++ optional finalArgs.doCheck "--enable-ocamltest"; + dontAddStaticConfigureFlags = lib.versionOlder version "4.08"; env = @@ -195,6 +208,9 @@ stdenv.mkDerivation ( nativeCompilers = useNativeCompilers; }; + checkTarget = "tests"; + inherit doCheck; + meta = { homepage = "https://ocaml.org/"; branch = versionNoPatch; @@ -204,6 +220,8 @@ stdenv.mkDerivation ( ]; description = "OCaml is an industrial-strength programming language supporting functional, imperative and object-oriented styles"; + maintainers = [ lib.maintainers.georgyo ]; + longDescription = '' OCaml is a general purpose programming language with an emphasis on expressiveness and safety. Developed for more than 20 years at Inria by a group of leading researchers, it has an advanced type system that helps catch your mistakes without getting in your way. It's used in environments where a single mistake can cost millions and speed matters, is supported by an active community, and has a rich set of libraries and development tools. It's widely used in teaching for its power and simplicity. diff --git a/pkgs/development/compilers/openjdk/21/source.json b/pkgs/development/compilers/openjdk/21/source.json index a43dec0d9066..5edd47f2b576 100644 --- a/pkgs/development/compilers/openjdk/21/source.json +++ b/pkgs/development/compilers/openjdk/21/source.json @@ -1,6 +1,6 @@ { - "hash": "sha256-VYTitbgKgd9co9LXVnneaaKjMwAXFmscYp9McJV01Jg=", + "hash": "sha256-xaaYt63uvoB5zfwUxHjNR3HiBPzFTNc4xyQfuTC/7VU=", "owner": "openjdk", "repo": "jdk21u", - "rev": "refs/tags/jdk-21.0.9+10" + "rev": "refs/tags/jdk-21.0.10+7" } diff --git a/pkgs/development/compilers/rust/1_92.nix b/pkgs/development/compilers/rust/1_93.nix similarity index 56% rename from pkgs/development/compilers/rust/1_92.nix rename to pkgs/development/compilers/rust/1_93.nix index 572446c1d2a4..50be1140a7db 100644 --- a/pkgs/development/compilers/rust/1_92.nix +++ b/pkgs/development/compilers/rust/1_93.nix @@ -50,8 +50,8 @@ let in import ./default.nix { - rustcVersion = "1.92.0"; - rustcSha256 = "sha256-ng0sp1x+J1/cdYJVv0sDr7PWXRVDYCdGkHyTO2kBw7g="; + rustcVersion = "1.93.0"; + rustcSha256 = "sha256-aREr2DwyGUP/w5C32y9Z7z/ruV2scA9nwhVvv2tQpwU="; rustcPatches = [ ./ignore-missing-docs.patch ]; llvmSharedForBuild = llvmSharedFor pkgsBuildBuild; @@ -66,30 +66,30 @@ 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.92.0"; + bootstrapVersion = "1.93.0"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "0028378e76fc10255677a5398886664f619c15757f3e830d7464f3c716bc3f7e"; - x86_64-unknown-linux-gnu = "6e5efd6c25953b2732d4e6b1842512536650c68cf72a8b99a0fc566012dd6ca5"; - x86_64-unknown-linux-musl = "1a257be51efac7bea14d5566e521777b85c473ee42524a38abb181c6443c38e4"; - arm-unknown-linux-gnueabihf = "e8d400cc169f858915f8c5bd23070d5b7f63ca8b1d14a5ef53423d952e33a794"; - armv7-unknown-linux-gnueabihf = "1c0f84532a91f3ce7223613565f15f8992a8e09859d699c163a7782d15d6beef"; - aarch64-unknown-linux-gnu = "c812028423c3d7dd7ba99f66101e9e1aa3f66eab44a1285f41c363825d49dca4"; - aarch64-unknown-linux-musl = "ad412daf7b31aadbeb12f836ed14983f5d1d0717bd444e305f94ee68ea822fcd"; - x86_64-apple-darwin = "fc6868991e61e9262272effbb8956b23428430f5f4300c1b48eaae3969f8af2a"; - aarch64-apple-darwin = "235a6cca2dd4881130a9ae61ad1149bbf28bba184dd4621700f0c98c97457716"; - powerpc64-unknown-linux-gnu = "189dd8a254202d32066f123b42497b88f809a11680842e67c68e48a4200b6caf"; - powerpc64le-unknown-linux-gnu = "e2fe00a3c91f21c52947ebf96b4da016c9def5ccfedd1c335f30746db58bbf35"; - powerpc64le-unknown-linux-musl = "4655468ef2ccc3d6eaf55015054970ab4a8fb79d853add830c9e4016551b7101"; - riscv64gc-unknown-linux-gnu = "c2d1b80d3c69edcca5c0d2b2042fad43fdb06fa614a8cd09063c1c259dca8a7e"; - s390x-unknown-linux-gnu = "1ca05b6bd892c358ae0a12acbb605560529d80633abebb43ec004142205d7bd2"; - loongarch64-unknown-linux-gnu = "2f9a85ff1816d6e28a96c1f5b9c9c5d9fe710a20a36f172c41bc289cc780956e"; - loongarch64-unknown-linux-musl = "4fe07780b1ac08baee71de2ddbd275ba14cc082df54ea5a95055514130152546"; - x86_64-unknown-freebsd = "f32b7d8d5ad5c186fa496dd0b7202899f89e93870940e41c37e576f324494189"; + i686-unknown-linux-gnu = "10036f92f7dbbef6519bd16c4b9ce3699071e8fa49c58b4b8204b69803c7cd54"; + x86_64-unknown-linux-gnu = "ca55df589f7cd68eec883086c5ff63ece04a1820e6d23e514fbb412cc8bf77a4"; + x86_64-unknown-linux-musl = "3cca6e0536fbb1f9ab17bf5f1ccc62aadbaa936f72326a8972698af10d40799b"; + arm-unknown-linux-gnueabihf = "8788045554de26e5858e64947989dd28ead702e6f3a0cba2855d65730183db18"; + armv7-unknown-linux-gnueabihf = "29a6871136f23545ea2d3f6c0258898440ca8fdca47be0ae7e2e3fcc8a482847"; + aarch64-unknown-linux-gnu = "091f981b95cbc6713ce6d6c23817286d4c10fd35fc76a990a3af430421751cfc"; + aarch64-unknown-linux-musl = "d8beb93a11bc84f131d66b3bcc964acf514371203b8ccb9121e942b9922f210f"; + x86_64-apple-darwin = "0297504189bdee029bacb61245cb131e3a2cc4bfd50c9e11281ea8957706e675"; + aarch64-apple-darwin = "e33cf237cfff8af75581fedece9f3c348e976bb8246078786f1888c3b251d380"; + powerpc64-unknown-linux-gnu = "d535af6a90d79b67a6e08b5fc4442285c3e330541516f4fec72d70f996b7f5b4"; + powerpc64le-unknown-linux-gnu = "dba9e9428e216cc781be25083f3f40eaca432c32fe399bfe4330c234f441a172"; + powerpc64le-unknown-linux-musl = "66213e58a4088eb7291ddebe4d44fffcc50d561e53b00e69a16773ec41de76d3"; + riscv64gc-unknown-linux-gnu = "c4214fa5b68eb15c37e1fd5bd205e5033e40e5a9a146f520c76dadd4cc316e3a"; + s390x-unknown-linux-gnu = "3afdc7d3e24895f3c852ceb7cb3fd080334015d1f5e9dc89e4cd4dc574819c2e"; + loongarch64-unknown-linux-gnu = "0e913233ced8c42fa162d36eabf5629a9ec6e918ef02ddedb79217d93b464a96"; + loongarch64-unknown-linux-musl = "65edcb0b6b4da21df2fb5a4d56c56806a0460bb91e702222006ca9eb1a06f498"; + x86_64-unknown-freebsd = "22660fb38447806d59f39c1a0105e2a9aadf0b2cc442349da9e7574edc1cc84f"; }; - selectRustPackage = pkgs: pkgs.rust_1_92; + selectRustPackage = pkgs: pkgs.rust_1_93; } ( diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 6bcf350ffc22..5a0a447a826f 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -30,8 +30,8 @@ let "2.4.10".sha256 = "sha256-zus5a2nSkT7uBIQcKva+ylw0LOFGTD/j5FPy3hDF4vg="; # By unofficial and very loose convention we keep the latest version of # SBCL, and the previous one in case someone quickly needs to roll back. - "2.5.10".sha256 = "sha256-v1+0nypC82s+AD0uTSNDhq3fB9ndjKhjRlaSfMls4SU="; "2.6.0".sha256 = "sha256-CkvVsByI5rRcLwWWBdJyirk3emUpsupiKnq7W6LWkcY="; + "2.6.1".sha256 = "sha256-XyzVu30+bZFJpZwFrNhCmzvhhJIRdp5aN0UdAB4ZbX8="; }; # Collection of pre-built SBCL binaries for platforms that need them for # bootstrapping. Ideally these are to be avoided. If ECL (or any other diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5464ac65bac5..0c8239346a81 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -79,7 +79,7 @@ with haskellLib; } ) ); - Cabal_3_16_0_0 = + Cabal_3_16_1_0 = overrideCabal (drv: { # Revert increased lower bound on unix since we have backported @@ -90,8 +90,8 @@ with haskellLib; }) ( doDistribute ( - super.Cabal_3_16_0_0.override { - Cabal-syntax = self.Cabal-syntax_3_16_0_0; + super.Cabal_3_16_1_0.override { + Cabal-syntax = self.Cabal-syntax_3_16_1_0; } ) ); @@ -113,8 +113,8 @@ with haskellLib; let # !!! Use cself/csuper inside for the actual overrides cabalInstallOverlay = cself: csuper: { - Cabal = cself.Cabal_3_16_0_0; - Cabal-syntax = cself.Cabal-syntax_3_16_0_0; + Cabal = cself.Cabal_3_16_1_0; + Cabal-syntax = cself.Cabal-syntax_3_16_1_0; }; in { @@ -174,10 +174,6 @@ with haskellLib; } ); - # 2025-09-20: Too strict bound on filepath (<1.5) - # https://github.com/dan-t/cabal-cargs/issues/10 - cabal-cargs = doJailbreak super.cabal-cargs; - # Extensions wants a specific version of Cabal for its list of Haskell # language extensions. extensions = doJailbreak ( @@ -277,9 +273,6 @@ with haskellLib; "vector-tests-O0" "vector-tests-O2" ]; - # Ironically, we still need to build the doctest suite. - # vector-0.13.2.0 has a doctest < 0.24 constraint - jailbreak = true; # inspection-testing doesn't work on all archs & ABIs doCheck = !self.inspection-testing.meta.broken; }) super.vector; @@ -318,10 +311,6 @@ with haskellLib; # 2023-06-28: Test error: https://hydra.nixos.org/build/225565149 orbits = dontCheck super.orbits; - # 2025-09-20: Restrictive upper bound on hashable. - # https://github.com/softwarefactory-project/matrix-client-haskell/issues/46 - matrix-client = doJailbreak super.matrix-client; - # 2025-02-10: Too strict bounds on tasty-quickcheck < 0.11 tasty-discover = doJailbreak super.tasty-discover; @@ -400,10 +389,6 @@ with haskellLib; }; }) super.leveldb-haskell; - # 2025-08-08: Allow inspection-testing >= 0.6 in fused-effects' test-suite - # https://github.com/fused-effects/fused-effects/pull/466 - fused-effects = doJailbreak super.fused-effects; - # 2025-08-08: Allow QuickCheck >= 2.15 in selective's test-suite # https://github.com/snowleopard/selective/pull/81 selective = doJailbreak super.selective; @@ -615,7 +600,7 @@ with haskellLib; name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; tag = super.git-annex.version; - sha256 = "sha256-Cnkohi1sl7kS4JECCsNDbxXKIWBus1gDcWoO3xZtXoM="; + sha256 = "sha256-wH/As9KdHLlUgGUuIVjBjC8akqHfCZPBWABFXry6z28="; # 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 @@ -640,10 +625,6 @@ with haskellLib; })) ]; - # Too strict bounds on servant - # Pending a hackage revision: https://github.com/berberman/arch-web/commit/5d08afee5b25e644f9e2e2b95380a5d4f4aa81ea#commitcomment-89230555 - arch-web = doJailbreak super.arch-web; - # Fix test trying to access /home directory shell-conduit = overrideCabal (drv: { postPatch = "sed -i s/home/tmp/ test/Spec.hs"; @@ -836,6 +817,12 @@ with haskellLib; HerbiePlugin = dontCheck super.HerbiePlugin; wai-cors = dontCheck super.wai-cors; + # Needs QuickCheck >= 2.16, but Stackage is currently on 2.15 + integer-logarithms = + lib.warnIf (lib.versionAtLeast super.QuickCheck.version "2.16") + "override for haskellPackages.integer-logarithms may no longer be needed" + (dontCheck super.integer-logarithms); + # Apply patch fixing an incorrect QuickCheck property which occasionally causes false negatives # https://github.com/Philonous/xml-picklers/issues/5 xml-picklers = appendPatch (pkgs.fetchpatch { @@ -871,10 +858,6 @@ with haskellLib; }) ] super.pandoc; - # Too strict bounds on QuickCheck (<2.15), containers (<0.7), hashable (<1.5), pandoc (<3.7) - # https://github.com/jaspervdj/patat/issues/194 - patat = doJailbreak super.patat; - # Too strict upper bound on data-default-class (< 0.2) # https://github.com/stackbuilders/dotenv-hs/issues/203 dotenv = doJailbreak super.dotenv; @@ -1020,7 +1003,6 @@ with haskellLib; lvmrun = disableHardening [ "format" ] (dontCheck super.lvmrun); matplotlib = dontCheck super.matplotlib; milena = dontCheck super.milena; - MIP = dontCheck super.MIP; # https://github.com/msakai/haskell-MIP/issues/87 modular-arithmetic = dontCheck super.modular-arithmetic; # tests require a very old Glob (0.7.*) nats-queue = dontCheck super.nats-queue; network-dbus = dontCheck super.network-dbus; @@ -1112,9 +1094,6 @@ with haskellLib; # https://github.com/pixbi/duplo/issues/25 duplo = doJailbreak super.duplo; - # https://github.com/fgaz/dual/pull/3 - dual-game = doJailbreak super.dual-game; - # https://github.com/evanrinehart/mikmod/issues/1 mikmod = addExtraLibrary pkgs.libmikmod super.mikmod; @@ -1179,12 +1158,6 @@ with haskellLib; # else dontCheck super.doctest-discover); doctest-discover = dontCheck super.doctest-discover; - # 2025-02-10: Too strict bounds on doctest < 0.22 - tasty-checklist = doJailbreak super.tasty-checklist; - - # 2025-02-10: Too strict bounds on hedgehog < 1.5 - tasty-sugar = doJailbreak super.tasty-sugar; - # Known issue with nondeterministic test suite failure # https://github.com/nomeata/tasty-expected-failure/issues/21 tasty-expected-failure = dontCheck super.tasty-expected-failure; @@ -1239,49 +1212,6 @@ with haskellLib; # 2022-03-19: Testsuite is failing: https://github.com/puffnfresh/haskell-jwt/issues/2 jwt = dontCheck super.jwt; - # Build Selda with the latest git version. - # See https://github.com/valderman/selda/issues/187 - inherit - ( - let - mkSeldaPackage = - name: - overrideCabal (drv: { - version = "2024-05-05-unstable"; - src = - pkgs.fetchFromGitHub { - owner = "valderman"; - repo = "selda"; - rev = "50c3ba5c5da72bb758a4112363ba2fe1c0e968ea"; - hash = "sha256-LEAJsSsDL0mmVHntnI16fH8m5DmePfcU0hFw9ErqTgQ="; - } - + "/${name}"; - # 2025-04-09: jailbreak to allow bytestring >= 0.12, text >= 2.1 - # Note: jailbreak ignores constraints under an if(flag) - postPatch = '' - check_sed() { - if ! test -s "$1"; then - echo "sed: pattern '$2' doesn't match anything" >&2 - exit 1 - fi - } - sed -i ${name}.cabal \ - -e 's/\(bytestring\) .*/\1/w c1' \ - -e 's/\(text\) .*/\1/w c2' \ - -e 's/\(aeson\) .*/\1/w c3' - check_sed c1 'bytestring .*' - check_sed c2 'text .*' - ${lib.optionalString (name == "selda-json") "check_sed c3 'aeson .*'"} - ''; - }) super.${name}; - in - lib.genAttrs [ "selda" "selda-sqlite" "selda-json" ] mkSeldaPackage - ) - selda - selda-sqlite - selda-json - ; - # 2024-03-10: Getting the test suite to run requires a correctly crafted GHC_ENVIRONMENT variable. graphql-client = dontCheck super.graphql-client; @@ -1645,6 +1575,15 @@ with haskellLib; ''; }) (addExtraLibrary self.QuickCheck super.Chart-tests); + # 2026-01-17: too strict bounds on QuickCheck < 2.15 + # https://github.com/hasufell/lzma-static/pull/15 + xz = doJailbreak super.xz; + + ghcup = + lib.throwIf pkgs.config.allowAliases + "ghcup cannot be used to install the haskell tool chain on NixOS because there is no compatible bindist. Please install ghc etc. via Nix. On non-NixOS systems you can use the ghcup shell installer" + super.ghcup; + # This breaks because of version bounds, but compiles and runs fine. # Last commit is 5 years ago, so we likely won't get upstream fixed soon. # https://bitbucket.org/rvlm/hakyll-contrib-hyphenation/src/master/ @@ -1745,6 +1684,21 @@ with haskellLib; (appendPatches [ ./patches/pattern-arrows-add-fix-import.patch ]) ]; + # posix-waitpid - Fix CPid constructor import and version bounds + # Broken since 2011 (GHC 7.4+), marked broken in nixpkgs since 2016 + # The original package has no repo however there's a fork with the + # fix at https://github.com/GaloisInc/posix-waitpid + posix-waitpid = lib.pipe super.posix-waitpid [ + (overrideCabal (drv: { + postPatch = '' + substituteInPlace System/Posix/Waitpid.hs \ + --replace 'import System.Posix.Types (CPid)' \ + 'import System.Posix.Types (CPid(..))' + ''; + })) + doJailbreak + ]; + # 2024-03-19: Fix for mtl >= 2.3 cheapskate = lib.pipe super.cheapskate [ doJailbreak @@ -1994,9 +1948,6 @@ with haskellLib; "--haddock-option=--optghc=-fno-safe-haskell" ] super.alg; - # 2025-02-11: Too strict bounds on hedgehog < 1.5 - nothunks = doJailbreak super.nothunks; - # Test suite fails, upstream not reachable for simple fix (not responsive on github) vivid-supercollider = dontCheck super.vivid-supercollider; @@ -2051,10 +2002,6 @@ with haskellLib; # list `modbus` in librarySystemDepends, correct to `libmodbus` libmodbus = doJailbreak (addExtraLibrary pkgs.libmodbus super.libmodbus); - # Too strict version bounds on ghc-events - # https://github.com/mpickering/hs-speedscope/issues/16 - hs-speedscope = doJailbreak super.hs-speedscope; - # Missing test files in sdist tarball: # https://gitlab.com/dpwiz/geomancy-layout/-/issues/1 geomancy-layout = dontCheck super.geomancy-layout; @@ -2143,70 +2090,6 @@ with haskellLib; ); gi-gtk-declarative-app-simple = doJailbreak super.gi-gtk-declarative-app-simple; - # stack-3.7.1 requires Cabal < 3.12 - stack = - let - stack' = super.stack.overrideScope (self: super: { hpack = self.hpack_0_38_1; }); - in - if lib.versionOlder self.ghc.version "9.10" then - stack' - else - lib.pipe - # to reduce rebuilds, don't override Cabal in the entire scope - ((stack'.override { Cabal = self.Cabal_3_10_3_0; }).overrideScope ( - self: super: - let - downgradeCabal = - drv: - lib.pipe drv [ - # Since Cabal and Cabal-syntax are in the global package db, we can't - # remove them from the available packages. Instead, we pass a constraint. - (appendConfigureFlags [ - "--constraint=Cabal<3.12" - "--constraint=Cabal-syntax<3.12" - ]) - (addBuildDepends [ - self.Cabal-syntax_3_10_3_0 - self.Cabal_3_10_3_0 - ]) - ]; - in - lib.mapAttrs (_: downgradeCabal) { - inherit (super) - hpack - hackage-security - pantry - rio-prettyprint - ; - } - )) - [ - # In order to apply a patch to a file with DOS line endings with GNU patch(1), - # we need to use --binary with a patch that has DOS line endings. - (overrideCabal (drv: { - prePatch = '' - ${drv.prePatch or ""} - patchFlags="--binary -p1" - ''; - })) - (appendPatch ( - pkgs.fetchpatch { - postFetch = '' - sed -e 's/$/\r/' -i "$out" - ''; - # Type equality operator warning and failure with text >= 2.1.2 - # We filter out all Cabal related changes from this patch as Cabal bumps may change the behavior of stack. - name = "stack-ghc-9.10.patch"; - url = "https://github.com/commercialhaskell/stack/commit/6a672dd12f25151707cf45e9823447334728d245.patch"; - hash = "sha256-MVwYIvFwiuBx9r6QUR0dHejmsQxVI6KFoZlujSXYJPM="; - includes = [ - "src/Stack/Prelude.hs" - "src/Stack/Types/CompilerBuild.hs" - ]; - } - )) - ]; - # 2023-04-09: haskell-ci needs Cabal-syntax 3.10 # 2024-03-21: pins specific version of ShellCheck # 2025-03-10: jailbreak, https://github.com/haskell-CI/haskell-ci/issues/771 @@ -2283,10 +2166,6 @@ with haskellLib; # https://github.com/hadolint/hadolint/issues/1127 hadolint = doJailbreak super.hadolint; - # Too strict lower bounds on (test) deps - # https://github.com/phadej/puresat/issues/6 - puresat = doJailbreak super.puresat; - # test suite requires stack to run, https://github.com/dino-/photoname/issues/24 photoname = dontCheck super.photoname; @@ -2331,14 +2210,6 @@ with haskellLib; # https://github.com/fieldstrength/aeson-deriving/issues/5 aeson-deriving = dontCheck super.aeson-deriving; - # 2025-02-11: Too strict bounds on tasty < 1.5, all of the below. - morpheus-graphql-app = doJailbreak super.morpheus-graphql-app; - morpheus-graphql-client = doJailbreak super.morpheus-graphql-client; - morpheus-graphql-core = doJailbreak super.morpheus-graphql-core; - morpheus-graphql-server = doJailbreak super.morpheus-graphql-server; - morpheus-graphql-tests = doJailbreak super.morpheus-graphql-tests; - morpheus-graphql = doJailbreak super.morpheus-graphql; - drunken-bishop = doJailbreak super.drunken-bishop; # https://github.com/SupercedeTech/dropbox-client/issues/1 dropbox = overrideCabal (drv: { @@ -2554,15 +2425,23 @@ with haskellLib; NGLess = dontCheck super.NGLess; # Too strict bound on network (<3.2) - hookup = appendPatches [ - (pkgs.fetchpatch { - name = "hookup-network-3.2.patch"; - url = "https://github.com/glguy/irc-core/commit/a3ec982e729b0f77b2db336ec32c5e4b7283bed5.patch"; - sha256 = "0qc1qszn3l69xlbpfv8vz9ld0q7sghfcbp0wjds81kwcpdpl4jgv"; - stripLen = 1; - includes = [ "hookup.cabal" ]; - }) - ] super.hookup; + hookup = + appendPatches + [ + (pkgs.fetchpatch { + name = "hookup-network-3.2.patch"; + url = "https://github.com/glguy/irc-core/commit/a3ec982e729b0f77b2db336ec32c5e4b7283bed5.patch"; + sha256 = "0qc1qszn3l69xlbpfv8vz9ld0q7sghfcbp0wjds81kwcpdpl4jgv"; + stripLen = 1; + includes = [ "hookup.cabal" ]; + }) + ] + ( + overrideCabal { + revision = null; + editedCabalFile = null; + } super.hookup + ); basic-sop = appendPatch (fetchpatch { # https://github.com/well-typed/basic-sop/pull/13 @@ -2607,9 +2486,6 @@ with haskellLib; # 2025-08-06: Upper bounds on containers <0.7 and hedgehog < 1.5 too strict. hermes-json = doJailbreak super.hermes-json; - # Allow containers >= 0.7, https://github.com/nomeata/arbtt/issues/181 - arbtt = doJailbreak super.arbtt; - # hexstring is not compatible with newer versions of base16-bytestring # See https://github.com/solatis/haskell-hexstring/issues/3 hexstring = overrideCabal (old: { @@ -2713,9 +2589,6 @@ with haskellLib; composite-aeson = doJailbreak super.composite-aeson; hashable = lib.pipe super.hashable [ - # Overly strict bounds on tasty-quickcheck (test suite) (< 0.11) - doJailbreak - # Big-endian POWER: # Test suite xxhash-tests: RUNNING... # xxhash @@ -2754,15 +2627,11 @@ with haskellLib; # Doesn't compile with tasty-quickcheck == 0.11 (see issue above) serialise = dontCheck super.serialise; - # https://github.com/Bodigrim/data-array-byte/issues/1 - data-array-byte = doJailbreak super.data-array-byte; # 2025-02-06: Allow tasty-quickcheck == 0.11.* # https://github.com/google/ghc-source-gen/issues/120 ghc-source-gen = doJailbreak super.ghc-source-gen; # https://github.com/byteverse/bytebuild/issues/20#issuecomment-2652113837 bytebuild = doJailbreak super.bytebuild; - # https://github.com/haskellari/lattices/issues/132 - lattices = doJailbreak super.lattices; # Too strict bounds on tasty <1.5 and tasty-quickcheck <0.11 # https://github.com/phadej/aeson-extra/issues/62 @@ -2789,9 +2658,6 @@ with haskellLib; # tests can't find the test binary anymore - parseargs-example parseargs = dontCheck super.parseargs; - # base <4.14 - decimal-literals = doJailbreak super.decimal-literals; - # Test failure https://gitlab.com/lysxia/ap-normalize/-/issues/2 ap-normalize = dontCheck super.ap-normalize; @@ -2804,10 +2670,7 @@ with haskellLib; }) ] super.heist; - heist-extra = doJailbreak super.heist-extra; # base <4.18.0.0.0 - unionmount = doJailbreak super.unionmount; # base <4.18 tailwind = doJailbreak super.tailwind; # base <=4.17.0.0 - commonmark-wikilink = doJailbreak super.commonmark-wikilink; # base <4.18.0.0.0 # 2025-09-03: Disable tests until this is solved: # https://github.com/clash-lang/ghc-typelits-extra/issues/60 @@ -2844,7 +2707,7 @@ with haskellLib; # Matching dependencies for hasql < 1.6.x hasql-dynamic-statements = dontCheck super.hasql-dynamic-statements_0_3_1_5; hasql-implicits = dontCheck super.hasql-implicits_0_1_1_3; - hasql-notifications = dontCheck super.hasql-notifications_0_2_2_2; + hasql-notifications = unmarkBroken (dontCheck super.hasql-notifications_0_2_2_2); hasql-pool = dontCheck super.hasql-pool_1_0_1; hasql-transaction = dontCheck super.hasql-transaction_1_1_0_1; text-builder = super.text-builder_0_6_10; @@ -2912,10 +2775,6 @@ with haskellLib; ]; }) super.tree-diff; - # base <4.19 - # https://github.com/well-typed/large-records/issues/168 - large-generics = doJailbreak super.large-generics; - # Too strict bound on bytestring < 0.12 # https://github.com/raehik/heystone/issues/2 heystone = doJailbreak super.heystone; @@ -3014,39 +2873,11 @@ with haskellLib; # https://github.com/google/proto-lens/issues/403 proto-lens-arbitrary = doJailbreak super.proto-lens-arbitrary; - # Forbids QuickCheck >= 2.15 - # https://github.com/mchav/granite/issues/12#issuecomment-3360209408 - granite = doJailbreak super.granite; - - # Erroneously forbids vector >= 0.13.2.0 - # https://github.com/mchav/snappy-hs/commit/400490df38e0db7f353c0427f034a231bdf73098#r167007963 - snappy-hs = doJailbreak super.snappy-hs; - - # Too strict upper bound on doctest - # https://github.com/awakesecurity/proto3-wire/pull/111 - proto3-wire = appendPatches [ - (fetchpatch { - name = "add-reverse-encoders-for-packed-repeated-fields.patch"; - url = "https://github.com/awakesecurity/proto3-wire/commit/fcc53d9935b64b6d8aaf65c8cef17f4bbed56867.patch"; - hash = "sha256-GzXlweRshVLA29xVHhJSRIU40y+KtAplIqfvp0I8cY0="; - }) - ] super.proto3-wire; - # 2024-07-27: building test component requires non-trivial custom build steps # https://github.com/awakesecurity/proto3-suite/blob/bec9d40e2767143deed5b2d451197191f1d8c7d5/nix/overlays/haskell-packages.nix#L311 - # Hackage release trails a good deal behind master proto3-suite = lib.pipe super.proto3-suite [ dontCheck doJailbreak - (overrideSrc { - version = "0.9.0-unstable-2025-04-10"; - src = pkgs.fetchFromGitHub { - owner = "awakesecurity"; - repo = "proto3-suite"; - rev = "24bb3f9c6c83b4ecc31783fa5a8fa4406e6ef0d8"; - hash = "sha256-009UNd1rEg/wDCCxReQWhPwHaONwlB6l6qoIPR0mVBU="; - }; - }) ]; # Tests require docker @@ -3090,7 +2921,7 @@ with haskellLib; http2-tls = lib.warnIf (lib.versionAtLeast self.tls.version "2.1.10") "haskellPackages.http2-tls: tls override can be removed" - (super.http2-tls.override { tls = self.tls_2_1_13; }); + (super.http2-tls.override { tls = self.tls_2_2_1; }); # Relax http2 version bound (5.3.9 -> 5.3.10) # https://github.com/well-typed/grapesy/issues/297 @@ -3100,9 +2931,6 @@ with haskellLib; # doctests are failing https://github.com/alpmestan/taggy-lens/issues/8 taggy-lens = dontCheck super.taggy-lens; - # https://github.com/snoyberg/http-client/pull/563 - http-client-tls = doJailbreak super.http-client-tls; - # 2025-09-03: allow bytestring 0.12 # https://github.com/wangbj/hashing/issues/4 hashing = lib.pipe super.hashing [ @@ -3144,9 +2972,6 @@ with haskellLib; # 2025-04-09: jailbreak to allow hedgehog >= 1.5 hw-int = warnAfterVersion "0.0.2.0" (doJailbreak super.hw-int); - # 2025-04-09: jailbreak to allow tasty-quickcheck >= 0.11 - chimera = warnAfterVersion "0.4.1.0" (doJailbreak super.chimera); - # 2025-04-09: jailbreak to allow tasty-quickcheck >= 0.11 bzlib = warnAfterVersion "0.5.2.0" (doJailbreak super.bzlib); @@ -3174,7 +2999,7 @@ with haskellLib; ] ) super) what4 - what4_1_7_2 + what4_1_7_3 ; copilot-theorem = lib.pipe super.copilot-theorem [ @@ -3186,12 +3011,20 @@ with haskellLib; doJailbreak super.egison-pattern-src-th-mode ); + # Missing test files, (and one the test suite needs stack) + # https://github.com/egison/egison/issues/283 + egison = dontCheck super.egison; + # 2025-12-27: doctests broken with -Wx-partial warning # https://github.com/junjihashimoto/th-cas/issues/1 th-cas = overrideCabal { testTargets = [ "spec" ]; } super.th-cas; + # https://github.com/TristanCacqueray/haskell-xstatic/issues/5 + # Test suite gets confused by mime-types >= 0.1.2.1 + xstatic-th = dontCheck super.xstatic-th; + # 2025-04-09: jailbreak to allow base >= 4.17, hasql >= 1.6, hasql-transaction-io >= 0.2 hasql-streams-core = warnAfterVersion "0.1.0.0" (doJailbreak super.hasql-streams-core); @@ -3204,9 +3037,6 @@ with haskellLib; # 2025-04-09: missing dependency - somehow it's not listed on hackage broadcast-chan = addExtraLibrary self.conduit super.broadcast-chan; - # 2025-04-09: jailbreak to allow template-haskell >= 2.21, th-abstraction >= 0.7 - kind-generics-th = warnAfterVersion "0.2.3.3" (doJailbreak super.kind-generics-th); - # 2025-04-09: jailbreak to allow aeson >= 2.2, base >= 4.19, text >= 2.1 ebird-api = warnAfterVersion "0.2.0.0" (doJailbreak super.ebird-api); @@ -3245,12 +3075,12 @@ with haskellLib; # 2025-04-13: jailbreak to allow th-abstraction >= 0.7 crucible = doJailbreak ( super.crucible.override { - what4 = self.what4_1_7_2; + what4 = self.what4_1_7_3; } ); crucible-llvm = super.crucible-llvm.override { - what4 = self.what4_1_7_2; + what4 = self.what4_1_7_3; }; # Test suite invokes cabal-install in a way incompatible with our generic builder @@ -3304,16 +3134,9 @@ with haskellLib; # https://github.com/mrkkrp/wave/issues/48 wave = doJailbreak super.wave; - # 2025-04-23: disable bounds microlens <0.5, QuickCheck < 2.16 - # https://github.com/debug-ito/wild-bind/issues/7 - wild-bind = doJailbreak super.wild-bind; - # Test suite no longer compiles with hspec-hedgehog >= 0.3 finitary = dontCheck super.finitary; - # 2025-04-13: jailbreak to allow bytestring >= 0.12, text >= 2.1 - ktx-codec = warnAfterVersion "0.0.2.1" (doJailbreak super.ktx-codec); - # 2025-04-13: jailbreak to allow template-haskell >= 2.17 sr-extra = warnAfterVersion "1.88" ( overrideCabal (drv: { diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix index 66942b6809d4..adf516e84147 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix @@ -68,6 +68,51 @@ in # “Unfortunately we are unable to support GHC 9.10.” apply-refact = dontDistribute (markBroken super.apply-refact); + stack = + # Setup.hs depends on Cabal-syntax >= 3.14 + overrideCabal + (drv: { + setupHaskellDepends = drv.setupHaskellDepends or [ ] ++ [ + self.Cabal-syntax_3_14_2_0 + self.Cabal_3_14_2_0 + ]; + # We need to tell GHC to ignore the Cabal core libraries while + # compiling Setup.hs since it depends on Cabal >= 3.14. + # ATTN: This override assumes we are using GHC 9.10.3 since we need + # to give an exact Cabal version at the GHC (!) command line. + # FIXME(@sternenseemann): make direct argument to generic-builder.nix + env = drv.env or { } // { + setupCompileFlags = lib.concatStringsSep " " [ + "-hide-package" + "Cabal-syntax-3.12.1.0" + "-hide-package" + "Cabal-3.12.1.0" + ]; + }; + }) + + # Stack itself depends on Cabal >= 3.14 which also needs to be updated for deps + ( + super.stack.overrideScope ( + sself: ssuper: + let + upgradeCabal = + drv: + lib.pipe drv [ + (addBuildDepends [ sself.Cabal_3_14_2_0 ]) + (appendConfigureFlags [ "--constraint=Cabal>=3.14" ]) + ]; + in + { + pantry = upgradeCabal ssuper.pantry_0_11_2; + rio-prettyprint = upgradeCabal ssuper.rio-prettyprint; + hackage-security = upgradeCabal ssuper.hackage-security; + hpack = upgradeCabal sself.hpack_0_39_1; + stack = upgradeCabal ssuper.stack; + } + ) + ); + # # Version upgrades # 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 07e33c894c29..d5c3595591c1 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix @@ -99,6 +99,10 @@ with haskellLib; timezone-series = doJailbreak super.timezone-series; # time <1.14 timezone-olson = doJailbreak super.timezone-olson; # time <1.14 cabal-plan = doJailbreak super.cabal-plan; # base <4.21 + decimal-literals = doJailbreak super.decimal-literals; # base <4.21 + matrix-client = doJailbreak super.matrix-client; # time <1.13 + patat = doJailbreak super.patat; # time <1.13 + puresat = doJailbreak super.puresat; # base <4.21 dbus = doJailbreak super.dbus; # template-haskell <2.23 xmobar = doJailbreak super.xmobar; # base <4.21 diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index e17851404614..5483021c3e73 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -56,7 +56,7 @@ self: super: { semaphore-compat = doDistribute self.semaphore-compat_1_0_0; # Becomes a core package in GHC >= 9.10 - os-string = doDistribute self.os-string_2_0_8; + os-string = doDistribute self.os-string_2_0_10; # Becomes a core package in GHC >= 9.10, no release compatible with GHC < 9.10 is available ghc-internal = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 03b4375bda34..414ad17b0c81 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -64,7 +64,7 @@ in semaphore-compat = doDistribute self.semaphore-compat_1_0_0; # Becomes a core package in GHC >= 9.10 - os-string = doDistribute self.os-string_2_0_8; + os-string = doDistribute self.os-string_2_0_10; # Becomes a core package in GHC >= 9.10, no release compatible with GHC < 9.10 is available ghc-internal = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index 1a3e6d13b652..84238d0fcde5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -64,7 +64,7 @@ in Win32 = null; # Becomes a core package in GHC >= 9.10 - os-string = doDistribute self.os-string_2_0_8; + os-string = doDistribute self.os-string_2_0_10; # Becomes a core package in GHC >= 9.10, no release compatible with GHC < 9.10 is available ghc-internal = null; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 687974063d1e..08e360606093 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -133,7 +133,6 @@ broken-packages: - alga # failure in job https://hydra.nixos.org/build/233252723 at 2023-09-02 - algebra-dag # failure in job https://hydra.nixos.org/build/233191945 at 2023-09-02 - algebraic # failure in job https://hydra.nixos.org/build/296049876 at 2025-05-02 - - algebraic-classes # failure in job https://hydra.nixos.org/build/233246872 at 2023-09-02 - algebraic-prelude # failure in job https://hydra.nixos.org/build/233197561 at 2023-09-02 - algo-s # failure in job https://hydra.nixos.org/build/233221988 at 2023-09-02 - AlgorithmW # failure in job https://hydra.nixos.org/build/233245254 at 2023-09-02 @@ -467,6 +466,7 @@ broken-packages: - bindings-fann # failure in job https://hydra.nixos.org/build/233232900 at 2023-09-02 - bindings-fluidsynth # failure in job https://hydra.nixos.org/build/233221612 at 2023-09-02 - bindings-friso # failure in job https://hydra.nixos.org/build/233201584 at 2023-09-02 + - bindings-gpgme # failure in job https://hydra.nixos.org/build/320157224 at 2026-01-26 - bindings-gsl # failure in job https://hydra.nixos.org/build/233243360 at 2023-09-02 - bindings-hamlib # failure in job https://hydra.nixos.org/build/233259986 at 2023-09-02 - bindings-hdf5 # failure in job https://hydra.nixos.org/build/233215409 at 2023-09-02 @@ -575,7 +575,6 @@ broken-packages: - brick-dropdownmenu # failure in job https://hydra.nixos.org/build/233223686 at 2023-09-02 - brick-filetree # failure in job https://hydra.nixos.org/build/233217076 at 2023-09-02 - brick-list-search # failure in job https://hydra.nixos.org/build/233193835 at 2023-09-02 - - brick-panes # failure in job https://hydra.nixos.org/build/233207542 at 2023-09-02 - bricks-internal # failure in job https://hydra.nixos.org/build/233215572 at 2023-09-02 - brillig # failure in job https://hydra.nixos.org/build/233208148 at 2023-09-02 - brillo-algorithms # failure in job https://hydra.nixos.org/build/307517131 at 2025-09-19 @@ -664,7 +663,6 @@ broken-packages: - cabal-ghci # failure in job https://hydra.nixos.org/build/233239354 at 2023-09-02 - cabal-graphdeps # failure in job https://hydra.nixos.org/build/233221966 at 2023-09-02 - cabal-helper # failure in job https://hydra.nixos.org/build/252732588 at 2024-03-16 - - cabal-hoogle # failure in job https://hydra.nixos.org/build/233191666 at 2023-09-02 - Cabal-hooks # failure in job https://hydra.nixos.org/build/307515931 at 2025-09-19 - Cabal-ide-backend # failure in job https://hydra.nixos.org/build/233258880 at 2023-09-02 - cabal-info # failure in job https://hydra.nixos.org/build/233225001 at 2023-09-02 @@ -752,6 +750,7 @@ broken-packages: - 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 - cayley-client # failure in job https://hydra.nixos.org/build/233260112 at 2023-09-02 + - cbf # failure in job https://hydra.nixos.org/build/320157491 at 2026-01-26 - cblrepo # failure in job https://hydra.nixos.org/build/233251926 at 2023-09-02 - CC-delcont # failure in job https://hydra.nixos.org/build/252735236 at 2024-03-16 - CC-delcont-cxe # failure in job https://hydra.nixos.org/build/233190865 at 2023-09-02 @@ -1144,6 +1143,7 @@ broken-packages: - cryptoconditions # failure in job https://hydra.nixos.org/build/233211816 at 2023-09-02 - cryptoids-types # failure in job https://hydra.nixos.org/build/233242596 at 2023-09-02 - crypton-box # failure in job https://hydra.nixos.org/build/295092591 at 2025-04-22 + - crypton-x509-util # failure in job https://hydra.nixos.org/build/320781736 at 2026-02-07 - cryptsy-api # failure in job https://hydra.nixos.org/build/233195814 at 2023-09-02 - csa # failure in job https://hydra.nixos.org/build/233233907 at 2023-09-02 - cse-ghc-plugin # failure in job https://hydra.nixos.org/build/233251963 at 2023-09-02 @@ -1334,7 +1334,6 @@ broken-packages: - derive # failure in job https://hydra.nixos.org/build/233209166 at 2023-09-02 - derive-enumerable # failure in job https://hydra.nixos.org/build/233254290 at 2023-09-02 - derive-gadt # failure in job https://hydra.nixos.org/build/233220430 at 2023-09-02 - - derive-lifted-instances # failure in job https://hydra.nixos.org/build/233194868 at 2023-09-02 - derive-monoid # failure in job https://hydra.nixos.org/build/233205670 at 2023-09-02 - derive-prim # failure in job https://hydra.nixos.org/build/307517819 at 2025-09-19 - derive-storable-plugin # failure in job https://hydra.nixos.org/build/295092800 at 2025-04-22 @@ -1581,11 +1580,11 @@ broken-packages: - 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 - - effects # failure in job https://hydra.nixos.org/build/307518053 at 2025-09-19 - effet # failure in job https://hydra.nixos.org/build/233204265 at 2023-09-02 - effin # failure in job https://hydra.nixos.org/build/233212960 at 2023-09-02 - eflint # failure in job https://hydra.nixos.org/build/295122827 at 2025-04-22 - egison-pattern-src-haskell-mode # failure in job https://hydra.nixos.org/build/295093048 at 2025-04-22 + - egison-quote # failure in job https://hydra.nixos.org/build/320478191 at 2026-01-30 - ehaskell # failure in job https://hydra.nixos.org/build/233196183 at 2023-09-02 - ehs # failure in job https://hydra.nixos.org/build/233234594 at 2023-09-02 - eibd-client-simple # failure in job https://hydra.nixos.org/build/233225416 at 2023-09-02 @@ -1655,6 +1654,7 @@ broken-packages: - eo-phi-normalizer # failure in job https://hydra.nixos.org/build/307518140 at 2025-09-19 - epanet-haskell # failure in job https://hydra.nixos.org/build/233197331 at 2023-09-02 - epass # failure in job https://hydra.nixos.org/build/233194117 at 2023-09-02 + - ephemeral # failure in job https://hydra.nixos.org/build/321063329 at 2026-02-07 - epi-sim # failure in job https://hydra.nixos.org/build/233246076 at 2023-09-02 - epic # failure in job https://hydra.nixos.org/build/233204921 at 2023-09-02 - epoll # failure in job https://hydra.nixos.org/build/233247564 at 2023-09-02 @@ -1680,6 +1680,7 @@ broken-packages: - ersaconcat # failure in job https://hydra.nixos.org/build/233196142 at 2023-09-02 - ersatz # failure in job https://hydra.nixos.org/build/233256809 at 2023-09-02 - ert # failure in job https://hydra.nixos.org/build/233250717 at 2023-09-02 + - esb-fireplace # failure in job https://hydra.nixos.org/build/320158333 at 2026-01-26 - escape-artist # failure in job https://hydra.nixos.org/build/233195305 at 2023-09-02 - escoger # failure in job https://hydra.nixos.org/build/233224731 at 2023-09-02 - espial # failure in job https://hydra.nixos.org/build/295093136 at 2025-04-22 @@ -1870,7 +1871,6 @@ broken-packages: - firestore # failure in job https://hydra.nixos.org/build/295093356 at 2025-04-22 - first-and-last # failure in job https://hydra.nixos.org/build/233256888 at 2023-09-02 - first-class-patterns # failure in job https://hydra.nixos.org/build/252739352 at 2024-03-16 - - FirstPrelude # failure in job https://hydra.nixos.org/build/233256065 at 2023-09-02 - fit # failure in job https://hydra.nixos.org/build/233239893 at 2023-09-02 - fitsio # failure in job https://hydra.nixos.org/build/233246119 at 2023-09-02 - fix-imports # failure in job https://hydra.nixos.org/build/233251518 at 2023-09-02 @@ -1879,8 +1879,12 @@ broken-packages: - fixed-precision # failure in job https://hydra.nixos.org/build/233226433 at 2023-09-02 - fixed-storable-array # failure in job https://hydra.nixos.org/build/233200413 at 2023-09-02 - fixed-timestep # failure in job https://hydra.nixos.org/build/233252950 at 2023-09-02 + - fixed-vector-aeson # failure in job https://hydra.nixos.org/build/320782377 at 2026-02-07 + - fixed-vector-binary # failure in job https://hydra.nixos.org/build/320782366 at 2026-02-07 - fixed-vector-cborg # failure in job https://hydra.nixos.org/build/307518304 at 2025-09-19 + - fixed-vector-cereal # failure in job https://hydra.nixos.org/build/320782363 at 2026-02-07 - fixed-vector-hetero # failure in job https://hydra.nixos.org/build/307518298 at 2025-09-19 + - fixed-vector-QC # failure in job https://hydra.nixos.org/build/320782369 at 2026-02-07 - fixed-width # failure in job https://hydra.nixos.org/build/233236195 at 2023-09-02 - fixedprec # failure in job https://hydra.nixos.org/build/233231519 at 2023-09-02 - fixer # failure in job https://hydra.nixos.org/build/233246038 at 2023-09-02 @@ -2114,7 +2118,6 @@ broken-packages: - GeocoderOpenCage # failure in job https://hydra.nixos.org/build/233214852 at 2023-09-02 - geodetic-types # failure in job https://hydra.nixos.org/build/233209496 at 2023-09-02 - GeoIp # failure in job https://hydra.nixos.org/build/233257383 at 2023-09-02 - - geojson # failure in job https://hydra.nixos.org/build/295093530 at 2025-04-22 - geojson-types # failure in job https://hydra.nixos.org/build/233224929 at 2023-09-02 - geom2d # failure in job https://hydra.nixos.org/build/233254609 at 2023-09-02 - geomancy # failure in job https://hydra.nixos.org/build/315096508 at 2025-11-29 @@ -2133,6 +2136,7 @@ broken-packages: - ghc-compat # failure in job https://hydra.nixos.org/build/311052382 at 2025-11-02 - ghc-core-smallstep # failure in job https://hydra.nixos.org/build/233209763 at 2023-09-02 - ghc-corroborate # failure in job https://hydra.nixos.org/build/233223692 at 2023-09-02 + - ghc-debugger # failure in job https://hydra.nixos.org/build/320158718 at 2026-01-26 - ghc-definitions-th # failure in job https://hydra.nixos.org/build/233254844 at 2023-09-02 - ghc-dump-core # failure in job https://hydra.nixos.org/build/233214478 at 2023-09-02 - ghc-dump-tree # failure in job https://hydra.nixos.org/build/233237228 at 2023-09-02 @@ -2228,7 +2232,6 @@ broken-packages: - GLFW # failure in job https://hydra.nixos.org/build/233234389 at 2023-09-02 - GLFW-b-demo # failure in job https://hydra.nixos.org/build/233230505 at 2023-09-02 - gli # failure in job https://hydra.nixos.org/build/233210279 at 2023-09-02 - - glicko # failure in job https://hydra.nixos.org/build/233200868 at 2023-09-02 - glider-nlp # failure in job https://hydra.nixos.org/build/233229600 at 2023-09-02 - gll # failure in job https://hydra.nixos.org/build/307518707 at 2025-09-19 - GLMatrix # failure in job https://hydra.nixos.org/build/233202880 at 2023-09-02 @@ -2706,6 +2709,7 @@ broken-packages: - helm # failure in job https://hydra.nixos.org/build/233251620 at 2023-09-02 - help-esb # failure in job https://hydra.nixos.org/build/233202622 at 2023-09-02 - hemkay # failure in job https://hydra.nixos.org/build/233227889 at 2023-09-02 + - henforcer # failure in job https://hydra.nixos.org/build/320783245 at 2026-02-07 - her-lexer-parsec # failure in job https://hydra.nixos.org/build/233237312 at 2023-09-02 - HERA # failure in job https://hydra.nixos.org/build/233204724 at 2023-09-02 - herbalizer # failure in job https://hydra.nixos.org/build/233214866 at 2023-09-02 @@ -2767,6 +2771,7 @@ broken-packages: - hhwloc # failure in job https://hydra.nixos.org/build/233215132 at 2023-09-02 - hi # failure in job https://hydra.nixos.org/build/295094222 at 2025-04-22 - hi3status # failure in job https://hydra.nixos.org/build/233217321 at 2023-09-02 + - hic # failure in job https://hydra.nixos.org/build/320783257 at 2026-02-07 - hichi # failure in job https://hydra.nixos.org/build/233208897 at 2023-09-02 - hid # failure in job https://hydra.nixos.org/build/233209289 at 2023-09-02 - hid-examples # failure in job https://hydra.nixos.org/build/233221413 at 2023-09-02 @@ -2788,8 +2793,8 @@ broken-packages: - highWaterMark # failure in job https://hydra.nixos.org/build/233244731 at 2023-09-02 - hikchr # failure in job https://hydra.nixos.org/build/295094234 at 2025-04-22 - hills # failure in job https://hydra.nixos.org/build/233215201 at 2023-09-02 + - himari # failure in job https://hydra.nixos.org/build/320159405 at 2026-01-26 - himg # failure in job https://hydra.nixos.org/build/233213810 at 2023-09-02 - - hindent # failure in job https://hydra.nixos.org/build/307519252 at 2025-09-19 - hindley-milner # failure in job https://hydra.nixos.org/build/233195252 at 2023-09-02 - hindley-milner-type-check # failure in job https://hydra.nixos.org/build/233216545 at 2023-09-02 - hinotify-bytestring # failure in job https://hydra.nixos.org/build/252716847 at 2024-03-16 @@ -3163,7 +3168,6 @@ broken-packages: - http-rfc7807 # failure in job https://hydra.nixos.org/build/233191433 at 2023-09-02 - http-server # failure in job https://hydra.nixos.org/build/233209925 at 2023-09-02 - http-shed # failure in job https://hydra.nixos.org/build/233236325 at 2023-09-02 - - http-slim # failure in job https://hydra.nixos.org/build/252734524 at 2024-03-16 - http-test # failure in job https://hydra.nixos.org/build/252738556 at 2024-03-16 - http-wget # failure in job https://hydra.nixos.org/build/233236793 at 2023-09-02 - http2-client-exe # failure in job https://hydra.nixos.org/build/260189666 at 2024-05-19 @@ -3528,6 +3532,7 @@ broken-packages: - kawa # failure in job https://hydra.nixos.org/build/252728326 at 2024-03-16 - kawaii # failure in job https://hydra.nixos.org/build/233205134 at 2023-09-02 - kawhi # failure in job https://hydra.nixos.org/build/233193086 at 2023-09-02 + - kb-text-shape # failure in job https://hydra.nixos.org/build/320159978 at 2026-01-26 - kd-tree # failure in job https://hydra.nixos.org/build/233207928 at 2023-09-02 - kdesrc-build-extra # failure in job https://hydra.nixos.org/build/233193718 at 2023-09-02 - kdt # test failure in job https://hydra.nixos.org/build/239264029 at 2023-11-10 @@ -3705,7 +3710,6 @@ broken-packages: - levmar # failure in job https://hydra.nixos.org/build/233254731 at 2023-09-02 - lfst # failure in job https://hydra.nixos.org/build/233240622 at 2023-09-02 - lhc # failure in job https://hydra.nixos.org/build/233220731 at 2023-09-02 - - lhs2tex # failure in job https://hydra.nixos.org/build/307520007 at 2025-09-19 - lhs2TeX-hl # failure in job https://hydra.nixos.org/build/233221405 at 2023-09-02 - lhslatex # failure in job https://hydra.nixos.org/build/233246375 at 2023-09-02 - LibClang # failure in job https://hydra.nixos.org/build/233194732 at 2023-09-02 @@ -3783,12 +3787,14 @@ broken-packages: - linux-framebuffer # failure in job https://hydra.nixos.org/build/252721503 at 2024-03-16 - linux-kmod # failure in job https://hydra.nixos.org/build/233205933 at 2023-09-02 - linux-perf # failure in job https://hydra.nixos.org/build/233193731 at 2023-09-02 + - linux-ptrace # failure in job https://hydra.nixos.org/build/320478197 at 2026-01-30 - linux-xattr # failure in job https://hydra.nixos.org/build/233226493 at 2023-09-02 - linx-gateway # failure in job https://hydra.nixos.org/build/233220744 at 2023-09-02 - lio-fs # failure in job https://hydra.nixos.org/build/252736678 at 2024-03-16 - lio-simple # failure in job https://hydra.nixos.org/build/233200711 at 2023-09-02 - lipsum-gen # failure in job https://hydra.nixos.org/build/233233734 at 2023-09-02 - liquid # failure in job https://hydra.nixos.org/build/233255883 at 2023-09-02 + - liquid-finfield # failure in job https://hydra.nixos.org/build/321063345 at 2026-02-07 - liquid-ghc-prim # failure in job https://hydra.nixos.org/build/307520084 at 2025-09-19 - liquid-parallel # failure in job https://hydra.nixos.org/build/307520068 at 2025-09-19 - liquid-prelude # failure in job https://hydra.nixos.org/build/307520076 at 2025-09-19 @@ -4054,7 +4060,6 @@ broken-packages: - minizinc-process # failure in job https://hydra.nixos.org/build/233211497 at 2023-09-02 - minst-idx # failure in job https://hydra.nixos.org/build/233259901 at 2023-09-02 - mios # failure in job https://hydra.nixos.org/build/233251863 at 2023-09-02 - - MIP-glpk # incompatible with extended-reals >=0.2.7.0, https://github.com/msakai/haskell-MIP/commit/60a5ee234fc6667d2c34152761fa5a54a6f6e533 - mirror-tweet # failure in job https://hydra.nixos.org/build/233216951 at 2023-09-02 - mismi-p # failure in job https://hydra.nixos.org/build/233257227 at 2023-09-02 - mit-3qvpPyAi6mH # failure in job https://hydra.nixos.org/build/233229967 at 2023-09-02 @@ -4187,6 +4192,7 @@ 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 + - msdf-atlas # failure in job https://hydra.nixos.org/build/320160626 at 2026-01-26 - 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 @@ -4248,6 +4254,7 @@ broken-packages: - mysql-pure # failure in job https://hydra.nixos.org/build/233250825 at 2023-09-02 - mysql-simple-quasi # failure in job https://hydra.nixos.org/build/233214755 at 2023-09-02 - mystem # failure in job https://hydra.nixos.org/build/233215180 at 2023-09-02 + - mywork # failure in job https://hydra.nixos.org/build/321063347 at 2026-02-07 - myxine-client # failure in job https://hydra.nixos.org/build/233236439 at 2023-09-02 - mzv # failure in job https://hydra.nixos.org/build/233241826 at 2023-09-02 - n-m # failure in job https://hydra.nixos.org/build/254311712 at 2024-03-31 @@ -4281,6 +4288,7 @@ broken-packages: - natural # failure in job https://hydra.nixos.org/build/233232490 at 2023-09-02 - NaturalLanguageAlphabets # failure in job https://hydra.nixos.org/build/245539294 at 2024-01-02 - NaturalSort # failure in job https://hydra.nixos.org/build/233213239 at 2023-09-02 + - nauty-parser # failure in job https://hydra.nixos.org/build/320160686 at 2026-01-26 - naver-translate # failure in job https://hydra.nixos.org/build/233225934 at 2023-09-02 - nbparts # failure in job https://hydra.nixos.org/build/309815729 at 2025-10-15 - nbt # failure in job https://hydra.nixos.org/build/233253509 at 2023-09-02 @@ -4925,7 +4933,6 @@ broken-packages: - posix-acl # failure in job https://hydra.nixos.org/build/233222892 at 2023-09-02 - posix-filelock # failure in job https://hydra.nixos.org/build/252726822 at 2024-03-16 - posix-realtime # failure in job https://hydra.nixos.org/build/233191463 at 2023-09-02 - - posix-waitpid # failure in job https://hydra.nixos.org/build/233206551 at 2023-09-02 - postcodes # failure in job https://hydra.nixos.org/build/233247290 at 2023-09-02 - postgis-trivial # failure in job https://hydra.nixos.org/build/295096168 at 2025-04-22 - postgres-embedded # failure in job https://hydra.nixos.org/build/233246098 at 2023-09-02 @@ -5084,7 +5091,6 @@ broken-packages: - prune-juice # failure in job https://hydra.nixos.org/build/233198633 at 2023-09-02 - psc-ide # failure in job https://hydra.nixos.org/build/267966912 at 2024-07-31 - pseudo-trie # failure in job https://hydra.nixos.org/build/233230636 at 2023-09-02 - - psi # failure in job https://hydra.nixos.org/build/233222861 at 2023-09-02 - pstemmer # failure in job https://hydra.nixos.org/build/233241342 at 2023-09-02 - psx # failure in job https://hydra.nixos.org/build/233199666 at 2023-09-02 - ptera-core # failure in job https://hydra.nixos.org/build/295096340 at 2025-04-22 @@ -5157,7 +5163,6 @@ broken-packages: - QuickAnnotate # failure in job https://hydra.nixos.org/build/233197428 at 2023-09-02 - 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-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 @@ -5288,6 +5293,7 @@ broken-packages: - reflex-dom-svg # failure in job https://hydra.nixos.org/build/233193544 at 2023-09-02 - reflex-dynamic-containers # failure in job https://hydra.nixos.org/build/295096540 at 2025-04-22 - reflex-external-ref # failure in job https://hydra.nixos.org/build/233215834 at 2023-09-02 + - reflex-ghci # failure in job https://hydra.nixos.org/build/320161685 at 2026-01-26 - reflex-gi-gtk # failure in job https://hydra.nixos.org/build/307611276 at 2025-09-19 - reflex-jsx # failure in job https://hydra.nixos.org/build/233207137 at 2023-09-02 - reflex-orphans # failure in job https://hydra.nixos.org/build/233249128 at 2023-09-02 @@ -5539,6 +5545,7 @@ broken-packages: - scrz # failure in job https://hydra.nixos.org/build/233230705 at 2023-09-02 - scythe # failure in job https://hydra.nixos.org/build/233259400 at 2023-09-02 - scyther-proof # failure in job https://hydra.nixos.org/build/233248937 at 2023-09-02 + - sd-jwt # failure in job https://hydra.nixos.org/build/320161801 at 2026-01-26 - sde-solver # failure in job https://hydra.nixos.org/build/233251017 at 2023-09-02 - sdl2-cairo-image # failure in job https://hydra.nixos.org/build/233210135 at 2023-09-02 - sdl2-compositor # failure in job https://hydra.nixos.org/build/233198910 at 2023-09-02 @@ -5563,8 +5570,6 @@ broken-packages: - SecureHash-SHA3 # failure in job https://hydra.nixos.org/build/233216866 at 2023-09-02 - secureUDP # failure in job https://hydra.nixos.org/build/233215410 at 2023-09-02 - SegmentTree # failure in job https://hydra.nixos.org/build/233216161 at 2023-09-02 - - selda # failure in job https://hydra.nixos.org/build/307521709 at 2025-09-19 - - selda-postgresql # failure in job https://hydra.nixos.org/build/245539286 at 2024-01-02 - selectors # failure in job https://hydra.nixos.org/build/233227433 at 2023-09-02 - selenium # failure in job https://hydra.nixos.org/build/233214276 at 2023-09-02 - selinux # failure in job https://hydra.nixos.org/build/233192853 at 2023-09-02 @@ -5763,7 +5768,6 @@ broken-packages: - simpleprelude # failure in job https://hydra.nixos.org/build/233259585 at 2023-09-02 - simplesmtpclient # failure in job https://hydra.nixos.org/build/233235261 at 2023-09-02 - simplessh # failure in job https://hydra.nixos.org/build/252738958 at 2024-03-16 - - simplest-sqlite # failure in job https://hydra.nixos.org/build/233248487 at 2023-09-02 - simplex # failure in job https://hydra.nixos.org/build/252731268 at 2024-03-16 - simplex-method # failure in job https://hydra.nixos.org/build/295097008 at 2025-04-22 - simplexmq # failure in job https://hydra.nixos.org/build/233223717 at 2023-09-02 @@ -6331,7 +6335,6 @@ broken-packages: - streamproc # failure in job https://hydra.nixos.org/build/233196179 at 2023-09-02 - streamt # failure in job https://hydra.nixos.org/build/252724093 at 2024-03-16 - strelka-core # failure in job https://hydra.nixos.org/build/233218594 at 2023-09-02 - - strict-checked-vars # failure in job https://hydra.nixos.org/build/316128155 at 2025-12-19 - strict-containers # failure in job https://hydra.nixos.org/build/307522197 at 2025-09-19 - strict-ghc-plugin # failure in job https://hydra.nixos.org/build/233246830 at 2023-09-02 - strict-io # failure in job https://hydra.nixos.org/build/295097302 at 2025-04-22 @@ -6854,7 +6857,6 @@ broken-packages: - typed-encoding # failure in job https://hydra.nixos.org/build/233208093 at 2023-09-02 - typed-gui # failure in job https://hydra.nixos.org/build/309817848 at 2025-10-15 - typed-process-effectful # failure in job https://hydra.nixos.org/build/236684332 at 2023-10-04 - - typed-protocols # failure in job https://hydra.nixos.org/build/316128170 at 2025-12-19 - typed-protocols-doc # failure in job https://hydra.nixos.org/build/311460024 at 2025-11-02 - typed-session # failure in job https://hydra.nixos.org/build/270089993 at 2024-08-31 - typed-session-state-algorithm # failure in job https://hydra.nixos.org/build/273462641 at 2024-10-01 @@ -6900,7 +6902,6 @@ broken-packages: - unbreak # failure in job https://hydra.nixos.org/build/233242560 at 2023-09-02 - unescaping-print # failure in job https://hydra.nixos.org/build/252736030 at 2024-03-16 - unfix-binders # failure in job https://hydra.nixos.org/build/233259262 at 2023-09-02 - - unfoldable # failure in job https://hydra.nixos.org/build/252721990 at 2024-03-16 - unfork # failure in job https://hydra.nixos.org/build/307522805 at 2025-09-19 - unfree # failure in job https://hydra.nixos.org/build/295097900 at 2025-04-22 - uni-util # failure in job https://hydra.nixos.org/build/233219676 at 2023-09-02 @@ -7252,6 +7253,7 @@ broken-packages: - wumpus-core # failure in job https://hydra.nixos.org/build/233244405 at 2023-09-02 - wxdirect # failure in job https://hydra.nixos.org/build/233255519 at 2023-09-02 - wybor # failure in job https://hydra.nixos.org/build/252729784 at 2024-03-16 + - wyvern-diagrams # failure in job https://hydra.nixos.org/build/320787128 at 2026-02-07 - X # failure in job https://hydra.nixos.org/build/233217783 at 2023-09-02 - x-dsp # failure in job https://hydra.nixos.org/build/233218091 at 2023-09-02 - x-sum-type-boilerplate # failure in job https://hydra.nixos.org/build/307523148 at 2025-09-19 @@ -7318,7 +7320,6 @@ broken-packages: - xslt # failure in job https://hydra.nixos.org/build/233225636 at 2023-09-02 - xtea # failure in job https://hydra.nixos.org/build/282175333 at 2024-12-23 - xxhash # failure in job https://hydra.nixos.org/build/233240335 at 2023-09-02 - - xz # failure in job https://hydra.nixos.org/build/307523211 at 2025-09-19 - y0l0bot # failure in job https://hydra.nixos.org/build/233212722 at 2023-09-02 - yabi-muno # failure in job https://hydra.nixos.org/build/233246871 at 2023-09-02 - yackage # failure in job https://hydra.nixos.org/build/233213393 at 2023-09-02 @@ -7343,7 +7344,6 @@ broken-packages: - yamlparse-applicative # failure in job https://hydra.nixos.org/build/252718434 at 2024-03-16 - YamlReference # failure in job https://hydra.nixos.org/build/233222700 at 2023-09-02 - yamlscript # failure in job https://hydra.nixos.org/build/307523231 at 2025-09-19 - - yampa-canvas # failure in job https://hydra.nixos.org/build/307611616 at 2025-09-19 - yampa-glfw # failure in job https://hydra.nixos.org/build/233215695 at 2023-09-02 - yampa-gloss # failure in job https://hydra.nixos.org/build/295098349 at 2025-04-22 - yampa-glut # failure in job https://hydra.nixos.org/build/234458324 at 2023-09-13 @@ -7477,6 +7477,5 @@ broken-packages: - Zwaluw # failure in job https://hydra.nixos.org/build/233216701 at 2023-09-02 - zwirn-core # failure in job https://hydra.nixos.org/build/295098470 at 2025-04-22 - zxcvbn-dvorak # failure in job https://hydra.nixos.org/build/233194326 at 2023-09-02 - - zxcvbn-hs # failure in job https://hydra.nixos.org/build/295098457 at 2025-04-22 - zydiskell # failure in job https://hydra.nixos.org/build/233259592 at 2023-09-02 - zyre2 # failure in job https://hydra.nixos.org/build/233215215 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 3582699b0b10..1d1d63abd4b6 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -29,6 +29,10 @@ default-package-overrides: # 2025-12-26: Needs to match egison-pattern-src from Stackage LTS - egison-pattern-src-th-mode < 0.2.2 - extensions == 0.1.0.2 # matches Cabal 3.12 (GHC 9.10) + # 2026-01-30: Needs to match hasql from Stackage LTS 24 + - hasql-notifications < 0.2.5.0 + # 2026-02-04: as requested by ghcide >= 2.13 + - hiedb < 0.8.0 # 2025-09-13: hnix 0.17.0 doesn't support hnix-store-core >= 0.8 # https://github.com/haskell-nix/hnix/pull/1112 - hnix-store-core < 0.7 @@ -47,6 +51,8 @@ default-package-overrides: - pandoc-crossref == 0.3.21 # 2025-12-19: Needs to match Stackage version of rhine - rhine-bayes < 1.6 + # 2026-02-08: compatibility with crypton-x509* in Stackage LTS 24 + - x509-ocsp < 0.4.1.0 # keep-sorted end # keep-sorted start skip_lines=1 case=no numeric=yes @@ -92,7 +98,6 @@ extra-packages: - hasql-transaction < 1.1.1 # 2025-01-19: Needed for building postgrest - hlint == 3.6.* # 2025-04-14: needed for hls with ghc-lib-parser 9.6 - hlint == 3.8.* # 2025-09-21: needed for hls with ghc-lib-parser 9.8 - - hpack == 0.38.1 # 2025-09-18: to match exact version upstream stack-3.7.1 uses - language-javascript == 0.7.0.0 # required by purescript - network-run == 0.4.0 # 2024-10-20: for GHC 9.10/network == 3.1.* - ormolu == 0.7.2.0 # 2023-11-13: for ghc-lib-parser 9.6 compat @@ -492,6 +497,7 @@ package-maintainers: - irc-client - chatter - envy + - krank t4ccer: - aeson-better-errors - cheapskate diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 589d0d5fca3b..1a878bd18f99 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 24.26 +# Stackage LTS 24.29 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -6,14 +6,14 @@ default-package-overrides: - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 - - acc ==0.2.0.3 + - acc ==0.2.0.4 - ace ==0.6 - acid-state ==0.16.1.4 - action-permutations ==0.0.0.1 - active ==0.2.1 - ad ==4.5.6 - ad-delcont ==0.5.0.0 - - adjunctions ==4.4.3 + - adjunctions ==4.4.4 - adler32 ==0.1.2.0 - advent-of-code-api ==0.2.11.0 - aern2-mp ==0.2.16.1 @@ -29,7 +29,7 @@ default-package-overrides: - aeson-jsonpath ==0.3.0.2 - aeson-pretty ==0.8.10 - aeson-qq ==0.8.4 - - aeson-schemas ==1.4.3.0 + - aeson-schemas ==1.4.3.1 - aeson-typescript ==0.6.4.0 - aeson-unqualified-ast ==1.0.0.3 - aeson-value-parser ==0.19.7.2 @@ -95,7 +95,7 @@ default-package-overrides: - assignment ==0.0.1.0 - assoc ==1.1.1 - astro ==0.4.3.0 - - async ==2.2.5 + - async ==2.2.6 - async-extra ==0.2.0.0 - async-pool ==0.9.2 - async-refresh ==0.3.0.0 @@ -127,7 +127,7 @@ default-package-overrides: - autodocodec-servant-multipart ==0.0.0.2 - autodocodec-swagger2 ==0.1.0.0 - autodocodec-yaml ==0.4.0.2 - - autoexporter ==2.0.0.15 + - autoexporter ==2.0.0.17 - automaton ==1.5 - avro ==0.6.2.1 - aws ==0.24.4 @@ -139,12 +139,12 @@ default-package-overrides: - aws-xray-client-wai ==0.1.0.2 - backprop ==0.2.7.2 - backtracking ==0.1.0 - - bank-holiday-germany ==2.1.0.1 + - bank-holiday-germany ==2.1.0.2 - bank-holidays-england ==0.2.0.11 - barbies ==2.1.1.0 - base-compat ==0.14.1 - base-compat-batteries ==0.14.1 - - base-orphans ==0.9.3 + - base-orphans ==0.9.4 - base-prelude ==1.6.1.1 - base-unicode-symbols ==0.2.4.2 - base16 ==1.0 @@ -180,8 +180,8 @@ default-package-overrides: - between ==0.11.0.0 - bhoogle ==0.1.4.4 - bibtex ==0.1.0.7 - - bifunctor-classes-compat ==0.1 - - bifunctors ==5.6.2 + - bifunctor-classes-compat ==0.1.1 + - bifunctors ==5.6.3 - bimap ==0.5.0 - bimaps ==0.1.0.2 - bin ==0.1.4 @@ -210,7 +210,7 @@ default-package-overrides: - bitwise ==1.0.0.1 - bitwise-enum ==1.0.1.2 - Blammo ==2.1.3.0 - - blank-canvas ==0.7.4 + - blank-canvas ==0.7.5 - blas-carray ==0.1.0.2 - blas-comfort-array ==0.0.0.4 - blas-ffi ==0.1 @@ -246,10 +246,10 @@ default-package-overrides: - boundingboxes ==0.2.3 - bower-json ==1.1.0.0 - bowtie ==0.7.0 - - box ==0.9.3.3 - - box-socket ==0.5.2.1 + - box ==0.9.4.0 + - box-socket ==0.5.3.0 - boxes ==0.1.5 - - breakpoint ==0.1.5.0 + - breakpoint ==0.1.5.1 - brick ==2.9 - brotli ==0.0.0.3 - brotli-streams ==0.0.0.0 @@ -263,7 +263,7 @@ default-package-overrides: - bugsnag-wai ==1.0.1.1 - bugsnag-yesod ==1.0.1.0 - bugzilla-redhat ==1.0.1.1 - - burrito ==2.0.1.14 + - burrito ==2.0.1.16 - butcher ==1.3.3.2 - bv ==0.5 - bv-sized ==1.0.6 @@ -274,7 +274,7 @@ default-package-overrides: - bytedump ==1.0 - bytehash ==0.1.1.2 - byteorder ==1.0.4 - - bytes ==0.17.4 + - bytes ==0.17.5 - byteset ==0.1.1.2 - byteslice ==0.2.15.0 - bytesmith ==0.3.14.0 @@ -298,13 +298,13 @@ default-package-overrides: - c2hs ==0.28.8 - ca-province-codes ==1.0.0.0 - cabal-add ==0.2 - - cabal-appimage ==0.4.2.0 + - cabal-appimage ==0.4.3.0 - cabal-clean ==0.2.20230609 - cabal-debian ==5.2.6 - cabal-doctest ==1.0.12 - cabal-file ==0.1.1 - cabal-flatpak ==0.1.2 - - cabal-gild ==1.6.0.2 + - cabal-gild ==1.6.0.4 - cabal-install-parsers ==0.6.2 - cabal-plan ==0.7.6.1 - cabal-rpm ==2.3.0 @@ -314,7 +314,7 @@ default-package-overrides: - cached-json-file ==0.1.1 - cacophony ==0.11.0 - cairo ==0.13.12.0 - - cairo-image ==0.1.0.5 + - cairo-image ==0.1.0.6 - calendar-recycling ==0.0.0.1 - call-alloy ==0.6.0.3 - call-plantuml ==0.0.1.3 @@ -356,7 +356,7 @@ default-package-overrides: - Chart ==1.9.5 - Chart-cairo ==1.9.4.1 - Chart-diagrams ==1.9.5.1 - - chart-svg ==0.8.2.1 + - chart-svg ==0.8.3.2 - ChasingBottoms ==1.3.1.17 - check-email ==1.0.2 - checkers ==0.6.0 @@ -374,6 +374,8 @@ default-package-overrides: - circle-packing ==0.1.0.6 - circular ==0.4.0.3 - citeproc ==0.9.0.1 + - clash-ghc ==1.8.4 + - clash-lib ==1.8.4 - clash-prelude ==1.8.4 - clash-prelude-hedgehog ==1.8.4 - classy-prelude ==1.5.0.3 @@ -393,7 +395,7 @@ default-package-overrides: - cmdargs ==0.10.22 - co-log ==0.7.0.0 - co-log-concurrent ==0.5.1.1 - - co-log-core ==0.3.2.5 + - co-log-core ==0.3.2.6 - co-log-polysemy ==0.0.1.6 - code-conjure ==0.7.8 - code-page ==0.2.1 @@ -420,7 +422,7 @@ default-package-overrides: - commonmark-pandoc ==0.2.3 - commutative ==0.0.2 - commutative-semigroups ==0.2.0.2 - - comonad ==5.0.9 + - comonad ==5.0.10 - compact ==0.2.0.0 - compactmap ==0.1.4.6 - companion ==0.1.0 @@ -455,7 +457,7 @@ default-package-overrides: - configurator-export ==0.1.0.1 - constrained-categories ==0.4.2.0 - constraint-tuples ==0.2 - - constraints ==0.14.2 + - constraints ==0.14.3 - constraints-extras ==0.4.0.2 - construct ==0.3.2 - consumers ==2.3.3.1 @@ -464,7 +466,7 @@ default-package-overrides: - context-resource ==0.2.0.2 - context-wai-middleware ==0.2.0.2 - contiguous ==0.6.5.0 - - contravariant ==1.5.5 + - contravariant ==1.5.6 - contravariant-extras ==0.3.5.4 - control-bool ==0.2.1 - control-dsl ==0.2.1.3 @@ -514,14 +516,14 @@ default-package-overrides: - cryptohash-sha1 ==0.11.101.0 - cryptohash-sha256 ==0.11.102.1 - cryptohash-sha512 ==0.11.103.0 - - crypton ==1.0.4 + - crypton ==1.0.5 - crypton-conduit ==0.2.3 - crypton-connection ==0.4.5 - crypton-pem ==0.3.0 - crypton-socks ==0.6.2 - crypton-x509 ==1.7.7 - - crypton-x509-store ==1.6.12 - - crypton-x509-system ==1.6.7 + - crypton-x509-store ==1.6.14 + - crypton-x509-system ==1.6.8 - crypton-x509-validation ==1.6.14 - cryptonite ==0.30 - cryptonite-conduit ==0.2.2 @@ -554,7 +556,7 @@ default-package-overrides: - data-checked ==0.3 - data-clist ==0.2 - data-compat ==0.1.0.5 - - data-default ==0.8.0.1 + - data-default ==0.8.0.2 - data-default-class ==0.2.0.0 - data-diverse ==4.7.1.0 - data-dword ==0.3.2.1 @@ -595,9 +597,9 @@ default-package-overrides: - Decimal ==0.5.2 - declarative ==0.5.4 - deepseq-generics ==0.2.0.1 - - deferred-folds ==0.9.18.7 + - deferred-folds ==0.9.18.10 - defun-core ==0.1.0.1 - - dejafu ==2.4.0.7 + - dejafu ==2.4.0.8 - delta-types ==1.0.0.0 - dense-linear-algebra ==0.1.0.0 - dependent-map ==0.4.0.1 @@ -611,7 +613,7 @@ default-package-overrides: - derive-topdown ==0.1.1.0 - deriveJsonNoPrefix ==0.1.0.1 - deriving-aeson ==0.2.10 - - deriving-compat ==0.6.7 + - deriving-compat ==0.6.8 - deriving-trans ==0.9.1.0 - detour-via-sci ==1.0.0 - df1 ==0.4.3 @@ -641,7 +643,7 @@ default-package-overrides: - digest ==0.0.2.1 - digits ==0.3.2 - digraph ==0.3.2 - - dimensional ==1.6.1 + - dimensional ==1.6.2 - direct-sqlite ==2.3.29 - directory-ospath-streaming ==0.2.2 - directory-tree ==0.12.1 @@ -663,7 +665,7 @@ default-package-overrides: - distributed-process-tests ==0.5.2 - distributed-static ==0.3.11 - distribution-opensuse ==1.1.4 - - distributive ==0.6.2.1 + - distributive ==0.6.3 - djinn-lib ==0.0.1.4 - djot ==0.1.2.4 - dl-fedora ==2.0.1 @@ -677,7 +679,7 @@ default-package-overrides: - doclayout ==0.5.0.1 - docopt ==0.7.0.8 - doctemplates ==0.11.0.1 - - doctest ==0.24.2 + - doctest ==0.24.3 - doctest-discover ==0.2.0.0 - doctest-driver-gen ==0.3.0.8 - doctest-exitcode-stdio ==0.0.0.1 @@ -686,14 +688,14 @@ default-package-overrides: - doctest-parallel ==0.4 - doldol ==0.4.1.2 - domain ==0.1.1.5 - - domain-aeson ==0.1.1.2 + - domain-aeson ==0.1.1.3 - domain-cereal ==0.1.0.1 - domain-core ==0.1.0.4 - domain-optics ==0.1.0.4 - dot ==0.3 - dotgen ==0.4.3 - dotnet-timespan ==0.0.1.0 - - dotparse ==0.1.3.0 + - dotparse ==0.1.4.0 - double-conversion ==2.0.5.0 - download ==0.3.2.7 - download-curl ==0.1.4 @@ -763,7 +765,7 @@ default-package-overrides: - enumset ==0.1 - envelope ==0.2.2.0 - envparse ==0.6.0 - - envy ==2.1.4.0 + - envy ==2.1.5.0 - epub-metadata ==5.4 - eq ==4.3 - equal-files ==0.0.5.4 @@ -789,7 +791,7 @@ default-package-overrides: - evm-opcodes ==0.2.0 - exact-combinatorics ==0.2.0.11 - exact-pi ==0.5.0.2 - - exception-hierarchy ==0.1.0.13 + - exception-hierarchy ==0.1.0.14 - exception-mtl ==0.4.0.2 - exception-transformers ==0.4.0.12 - executable-hash ==0.2.0.4 @@ -822,7 +824,7 @@ default-package-overrides: - fast-math ==1.0.2 - fast-myers-diff ==0.0.1 - fbrnch ==1.7.1 - - fcf-family ==0.2.0.2 + - fcf-family ==0.2.0.3 - fdo-notify ==0.3.1 - feature-flags ==0.1.0.1 - fedora-krb ==0.1.0 @@ -840,7 +842,7 @@ default-package-overrides: - file-io ==0.1.5 - file-modules ==0.1.2.4 - file-path-th ==0.1.0.0 - - filecache ==0.5.2 + - filecache ==0.5.3 - filelock ==0.1.1.8 - filemanip ==0.3.6.3 - filepath-bytestring ==1.5.2.0.3 @@ -870,16 +872,16 @@ default-package-overrides: - flexible-defaults ==0.0.3 - FloatingHex ==0.5 - floatshow ==0.2.4 - - flow ==2.0.0.9 + - flow ==2.0.0.11 - flush-queue ==1.0.0 - fmlist ==0.9.4 - fmt ==0.6.3.0 - fn ==0.3.0.2 - focus ==1.0.3.2 - focuslist ==0.1.1.0 - - fold-debounce ==0.2.0.16 - - fold-debounce-conduit ==0.2.0.8 - - foldable1-classes-compat ==0.1.2 + - fold-debounce ==0.2.0.17 + - fold-debounce-conduit ==0.2.0.9 + - foldable1-classes-compat ==0.1.3 - foldl ==1.4.18 - folds ==0.7.8 - FontyFruity ==0.5.3.5 @@ -889,7 +891,7 @@ default-package-overrides: - forkable-monad ==0.2.0.3 - forma ==1.2.0 - format-numbers ==0.1.0.1 - - formatn ==0.3.2.0 + - formatn ==0.3.3.1 - formatting ==7.2.0 - foundation ==0.0.30 - free ==5.2 @@ -929,7 +931,7 @@ default-package-overrides: - generic-data ==1.1.0.2 - generic-data-functions ==0.6.0 - generic-data-surgery ==0.3.0.0 - - generic-deriving ==1.14.6 + - generic-deriving ==1.14.7 - generic-enumeration ==0.1.0.4 - generic-functor ==1.1.0.0 - generic-lens ==2.2.2.0 @@ -988,8 +990,8 @@ default-package-overrides: - ghc-events ==0.20.0.0 - ghc-exactprint ==1.10.0.0 - ghc-hs-meta ==0.1.5.0 - - ghc-lib ==9.12.2.20250421 - - ghc-lib-parser ==9.12.2.20250421 + - ghc-lib ==9.12.3.20251228 + - ghc-lib-parser ==9.12.3.20251228 - ghc-lib-parser-ex ==9.12.0.0 - ghc-parser ==0.2.8.0 - ghc-paths ==0.1.0.12 @@ -1049,7 +1051,7 @@ default-package-overrides: - git-mediate ==1.1.0 - githash ==0.1.7.0 - github ==0.30.0.1 - - github-release ==2.0.0.14 + - github-release ==2.0.0.17 - github-rest ==1.2.1 - github-types ==0.2.1 - github-webhooks ==0.18.0 @@ -1163,7 +1165,7 @@ default-package-overrides: - gpolyline ==0.1.0.1 - graph-core ==0.3.0.0 - graphite ==0.10.0.1 - - graphql ==1.5.0.1 + - graphql ==1.5.0.2 - graphql-client ==1.2.4 - graphql-spice ==1.0.6.0 - graphs ==0.7.3 @@ -1202,11 +1204,11 @@ default-package-overrides: - happy ==2.1.7 - happy-lib ==2.1.7 - happy-meta ==0.2.1.0 - - harpie ==0.1.3.1 - - harpie-numhask ==0.1.0.2 + - harpie ==0.1.4.0 + - harpie-numhask ==0.1.1.0 - has-transformers ==0.1.0.4 - HasBigDecimal ==0.2.0.0 - - hashable ==1.5.0.0 + - hashable ==1.5.1.0 - hashmap ==1.3.3 - hashtables ==1.4.2 - haskell-gi ==0.26.17 @@ -1227,7 +1229,7 @@ default-package-overrides: - hasktags ==0.73.0 - hasql ==1.9.3.1 - hasql-dynamic-statements ==0.3.1.8 - - hasql-implicits ==0.2.0.1 + - hasql-implicits ==0.2.0.2 - hasql-interpolate ==1.0.1.0 - hasql-listen-notify ==0.1.0.1 - hasql-migration ==0.3.1 @@ -1304,7 +1306,7 @@ default-package-overrides: - hoauth2 ==2.14.3 - hoogle ==5.0.18.4 - hopenssl ==2.2.5 - - horizontal-rule ==0.7.0.0 + - horizontal-rule ==0.7.1.0 - hosc ==0.21.1 - hostname ==1.0 - hostname-validate ==1.0.0 @@ -1341,12 +1343,12 @@ default-package-overrides: - HSlippyMap ==3.0.1 - hslogger ==1.3.2.0 - hslua ==2.3.1 - - hslua-aeson ==2.3.1.1 - - hslua-classes ==2.3.1 - - hslua-cli ==1.4.3 - - hslua-core ==2.3.2 + - hslua-aeson ==2.3.2 + - hslua-classes ==2.3.2 + - hslua-cli ==1.4.4 + - hslua-core ==2.3.2.1 - hslua-list ==1.1.4 - - hslua-marshalling ==2.3.1 + - hslua-marshalling ==2.3.2 - hslua-module-doclayout ==1.2.0.1 - hslua-module-path ==1.1.1 - hslua-module-system ==1.1.3 @@ -1379,7 +1381,7 @@ default-package-overrides: - hspec-leancheck ==0.0.6 - hspec-megaparsec ==2.2.1 - hspec-meta ==2.11.16 - - hspec-need-env ==0.1.0.12 + - hspec-need-env ==0.1.0.13 - hspec-parsec ==0 - hspec-smallcheck ==0.5.3 - hspec-tmp-proc ==0.7.0.0 @@ -1401,7 +1403,7 @@ default-package-overrides: - html-entity-map ==0.1.0.0 - html-parse ==0.2.2.0 - HTTP ==4000.4.1 - - http-api-data ==0.6.2 + - http-api-data ==0.6.3 - http-api-data-qq ==0.1.0.1 - http-client ==0.7.19 - http-client-openssl ==0.3.3 @@ -1464,13 +1466,13 @@ default-package-overrides: - IfElse ==0.85 - iff ==0.0.6.1 - ihaskell ==0.12.0.0 - - ihaskell-hvega ==0.5.0.6 + - ihaskell-hvega ==0.5.0.7 - ihs ==0.1.0.3 - imagesize-conduit ==1.1 - Imlib ==0.1.2 - immortal ==0.3 - immortal-queue ==0.1.0.1 - - imp ==1.0.3.3 + - imp ==1.0.3.5 - ImpSpec ==0.1.0.0 - inbox ==0.2.0 - incipit-base ==0.6.1.1 @@ -1496,11 +1498,11 @@ default-package-overrides: - inline-c-cpp ==0.5.0.2 - input-parsers ==0.3.0.2 - insert-ordered-containers ==0.2.7 - - inspection-testing ==0.6.2 + - inspection-testing ==0.6.3 - int-cast ==0.2.0.0 - int-supply ==1.0.0 - integer-conversion ==0.1.1 - - integer-logarithms ==1.0.4 + - integer-logarithms ==1.0.5 - integer-roots ==1.0.4.0 - integration ==0.2.1 - intermediate-structures ==0.1.2.0 @@ -1512,7 +1514,7 @@ default-package-overrides: - IntervalMap ==0.6.2.1 - intervals ==0.9.3 - intset-imperative ==0.1.0.0 - - invariant ==0.6.4 + - invariant ==0.6.5 - invertible ==0.2.0.8 - invertible-grammar ==0.1.3.5 - io-embed ==0.1.0.1 @@ -1539,7 +1541,7 @@ default-package-overrides: - iso639 ==0.1.0.3 - iso8601-time ==0.1.5 - isocline ==1.0.9 - - isomorphism-class ==0.3.1.2 + - isomorphism-class ==0.3.1.4 - ix-shapable ==0.1.0 - jack ==0.7.2.2 - jalaali ==1.0.0.0 @@ -1557,7 +1559,7 @@ default-package-overrides: - jsaddle-dom ==0.9.9.2 - jsaddle-warp ==0.9.9.5 - json ==0.11 - - json-feed ==2.0.0.15 + - json-feed ==2.0.0.18 - json-rpc ==1.1.2 - json-spec ==1.1.1.2 - json-spec-elm ==0.4.0.6 @@ -1571,21 +1573,21 @@ default-package-overrides: - JuicyPixels-extra ==0.6.0 - junit-xml ==0.1.0.4 - justified-containers ==0.3.0.0 - - kan-extensions ==5.2.7 - - kansas-comet ==0.4.3 + - kan-extensions ==5.2.8 + - kansas-comet ==0.4.4 - katip ==0.8.8.4 - katip-logstash ==0.1.0.2 - - katip-wai ==0.2.0.0 + - katip-wai ==0.2.0.1 - kazura-queue ==0.1.0.4 - kdt ==0.2.6 - keep-alive ==0.2.1.0 - keter ==2.1.10 - - keycode ==0.2.3 - - keyed-vals ==0.2.3.2 - - keyed-vals-hspec-tests ==0.2.3.2 - - keyed-vals-mem ==0.2.3.2 - - keyed-vals-redis ==0.2.3.2 - - keys ==3.12.4 + - keycode ==0.2.4 + - keyed-vals ==0.2.3.4 + - keyed-vals-hspec-tests ==0.2.3.4 + - keyed-vals-mem ==0.2.3.4 + - keyed-vals-redis ==0.2.3.4 + - keys ==3.12.5 - ki ==1.0.1.2 - ki-unlifted ==1.0.0.2 - kind-apply ==0.4.0.1 @@ -1596,7 +1598,7 @@ default-package-overrides: - koji-tool ==1.3.1 - kvitable ==1.1.1.0 - labels ==0.3.3 - - lackey ==2.0.0.11 + - lackey ==2.0.0.12 - lambdabot-core ==5.3.1.2 - lambdabot-irc-plugins ==5.3.1.2 - LambdaHack ==0.11.0.1 @@ -1634,7 +1636,7 @@ default-package-overrides: - leapseconds-announced ==2017.1.0.1 - learn-physics ==0.6.7 - leb128-cereal ==1.2 - - lens ==5.3.5 + - lens ==5.3.6 - lens-action ==0.2.6 - lens-aeson ==1.2.3 - lens-csv ==0.1.1.0 @@ -1656,12 +1658,12 @@ default-package-overrides: - libsodium-bindings ==0.0.3.0 - libyaml ==0.1.4 - libyaml-clib ==0.2.5 - - lift-generics ==0.3 + - lift-generics ==0.3.1 - lift-type ==0.1.2.0 - lifted-async ==0.10.2.7 - lifted-base ==0.2.3.12 - lifted-threads ==1.0 - - linear ==1.23.2 + - linear ==1.23.3 - linear-base ==0.5.0 - linear-generics ==0.2.3 - linear-geo ==0.1.0.0 @@ -1701,14 +1703,14 @@ default-package-overrides: - logict ==0.8.2.0 - logstash ==0.1.0.4 - loop ==0.3.0 - - lpeg ==1.1.0 + - lpeg ==1.1.0.1 - LPFP ==1.1.5 - LPFP-core ==1.1.5 - lr-acts ==0.0.1 - lrucache ==1.2.0.1 - lsfrom ==2.0 - lua ==2.3.4 - - lua-arbitrary ==1.0.1.1 + - lua-arbitrary ==1.0.1.2 - lucid ==2.11.20250303 - lucid-cdn ==0.2.2.0 - lucid-extras ==0.2.2 @@ -1735,7 +1737,7 @@ default-package-overrides: - markdown-unlit ==0.6.0 - markov-chain ==0.0.3.4 - markov-chain-usage-model ==0.0.0 - - markup-parse ==0.2.1.0 + - markup-parse ==0.2.2.0 - massiv ==1.0.5.0 - massiv-io ==1.0.0.1 - massiv-serialise ==1.0.0.2 @@ -1755,14 +1757,14 @@ default-package-overrides: - mbox-utility ==0.0.3.1 - mcmc ==0.8.3.1 - mcmc-types ==1.0.3 - - mcp-server ==0.1.0.15 - - mealy ==0.5.0.1 + - mcp-server ==0.1.0.16 + - mealy ==0.5.1.1 - med-module ==0.1.3 - median-stream ==0.7.0.0 - megaparsec ==9.7.0 - megaparsec-tests ==9.7.0 - melf ==1.3.1 - - mem-info ==0.4.1.1 + - mem-info ==0.4.1.2 - membership ==0.0.1 - memcache ==0.3.0.2 - memory ==0.18.0 @@ -1795,7 +1797,7 @@ default-package-overrides: - mighty-metropolis ==2.0.0 - mime-mail ==0.5.1 - mime-mail-ses ==0.4.3 - - mime-types ==0.1.2.0 + - mime-types ==0.1.2.1 - minimal-configuration ==0.1.4 - minimorph ==0.3.0.1 - minisat ==0.1.4 @@ -1807,13 +1809,13 @@ default-package-overrides: - misfortune ==0.1.2.1 - miso ==1.8.7.0 - missing-foreign ==0.1.1 - - MissingH ==1.6.0.2 + - MissingH ==1.6.0.3 - mixed-types-num ==0.6.2 - mmap ==0.5.9 - mmark ==0.0.8.0 - mmark-cli ==0.0.5.2 - mmark-ext ==0.2.1.5 - - mmorph ==1.2.1 + - mmorph ==1.2.2 - mmsyn2-array ==0.3.1.1 - mmsyn7l ==0.9.2.0 - mmsyn7ukr-array ==0.3.0.0 @@ -1834,11 +1836,11 @@ default-package-overrides: - monad-control ==1.0.3.1 - monad-control-aligned ==0.0.2.1 - monad-control-identity ==0.2.0.0 - - monad-coroutine ==0.9.2 + - monad-coroutine ==0.9.3 - monad-extras ==0.6.0 - monad-interleave ==0.2.0.1 - monad-logger ==0.3.42 - - monad-logger-aeson ==0.4.1.4 + - monad-logger-aeson ==0.4.1.5 - monad-logger-extras ==0.1.1.2 - monad-logger-json ==0.1.0.0 - monad-logger-logstash ==0.2.0.2 @@ -1848,7 +1850,7 @@ default-package-overrides: - monad-metrics ==0.2.2.2 - monad-par ==0.3.6 - monad-par-extras ==0.3.3 - - monad-parallel ==0.8 + - monad-parallel ==0.8.0.1 - monad-peel ==0.3 - monad-resumption ==0.1.4.0 - monad-schedule ==0.2.0.2 @@ -1858,7 +1860,7 @@ default-package-overrides: - monadoid ==0.0.3 - monadology ==0.4 - MonadPrompt ==1.0.0.5 - - MonadRandom ==0.6.2 + - MonadRandom ==0.6.2.1 - monads-tf ==0.3.0.1 - mongoDB ==2.7.1.4 - mono-traversable ==1.0.21.0 @@ -1866,7 +1868,7 @@ default-package-overrides: - monoid-extras ==0.7 - monoid-insertleft ==0.1.0.1 - monoid-map ==0.2.0.1 - - monoid-subclasses ==1.2.6 + - monoid-subclasses ==1.2.6.1 - monoid-transformer ==0.0.4 - monoidal-containers ==0.6.6.0 - monoidal-functors ==0.2.3.0 @@ -1905,7 +1907,7 @@ default-package-overrides: - mustache ==2.4.3.1 - mutable-containers ==0.3.4.1 - mwc-probability ==2.3.1 - - mwc-random ==0.15.2.0 + - mwc-random ==0.15.3.0 - mx-state-codes ==1.0.0.0 - myers-diff ==0.3.0.2 - mysql ==0.2.1 @@ -1980,14 +1982,14 @@ default-package-overrides: - normaldistribution ==1.1.0.3 - nothunks ==0.3.1 - nowdoc ==0.1.1.0 - - nsis ==0.3.3 + - nsis ==0.3.4 - numbers ==3000.2.0.2 - numeric-extras ==0.1 - numeric-limits ==0.1.0.0 - numeric-prelude ==0.4.4 - numeric-quest ==0.2.0.2 - - numhask ==0.13.1.0 - - numhask-space ==0.13.1.0 + - numhask ==0.13.2.1 + - numhask-space ==0.13.2.0 - NumInstances ==1.4 - numtype-dk ==0.5.0.3 - nvim-hs ==2.3.2.4 @@ -2014,7 +2016,7 @@ default-package-overrides: - ogma-language-xmlspec ==1.7.0 - ogma-spec ==1.7.0 - old-locale ==1.0.0.7 - - old-time ==1.1.0.4 + - old-time ==1.1.0.5 - ollama-haskell ==0.2.1.0 - om-doh ==0.1.0.4 - om-elm ==2.0.1.1 @@ -2025,9 +2027,9 @@ default-package-overrides: - om-show ==0.1.2.11 - om-time ==0.3.1.1 - once ==0.4 - - one-liner ==2.1 + - one-liner ==2.1.1 - one-liner-instances ==0.1.3.0 - - OneTuple ==0.4.2 + - OneTuple ==0.4.2.1 - Only ==0.1 - oo-prototypes ==0.1.0.0 - oops ==0.2.0.1 @@ -2075,11 +2077,11 @@ default-package-overrides: - pandoc ==3.7.0.2 - pandoc-cli ==3.7.0.2 - pandoc-lua-engine ==0.4.3 - - pandoc-lua-marshal ==0.3.1 + - pandoc-lua-marshal ==0.3.2.1 - pandoc-plot ==1.9.1 - pandoc-server ==0.1.0.11 - pandoc-throw ==0.1.0.0 - - pandoc-types ==1.23.1 + - pandoc-types ==1.23.1.1 - pango ==0.13.12.0 - panic ==0.4.0.1 - pantry ==0.10.1 @@ -2094,8 +2096,8 @@ default-package-overrides: - parsec-numbers ==0.1.0 - parsec-numeric ==0.1.0.0 - ParsecTools ==0.0.2.0 - - parser-combinators ==1.3.0 - - parser-combinators-tests ==1.3.0 + - parser-combinators ==1.3.1 + - parser-combinators-tests ==1.3.1 - parser-regex ==0.3.0.0 - parsers ==0.12.12 - partial-handler ==1.0.3 @@ -2128,7 +2130,7 @@ default-package-overrides: - pdf-toolbox-content ==0.1.2 - pdf-toolbox-core ==0.1.3 - pdf-toolbox-document ==0.1.4 - - peano ==0.1.0.3 + - peano ==0.1.1.0 - pedersen-commitment ==0.2.0 - pem ==0.2.4 - percent-format ==0.0.4 @@ -2212,11 +2214,11 @@ default-package-overrides: - postgresql-migration ==0.2.1.8 - postgresql-schema ==0.1.14 - postgresql-simple ==0.7.0.1 - - postgresql-syntax ==0.4.1.3 + - postgresql-syntax ==0.4.2 - postgresql-typed ==0.6.2.5 - pptable ==0.3.0.0 - pqueue ==1.5.0.0 - - prairie ==0.1.0.0 + - prairie ==0.1.1.0 - pred-set ==0.0.1 - prefix-units ==0.3.0.1 - prelude-compat ==0.0.0.2 @@ -2228,7 +2230,7 @@ default-package-overrides: - pretty-simple ==4.1.4.0 - pretty-sop ==0.2.0.3 - pretty-terminal ==0.1.0.0 - - prettychart ==0.3.0.2 + - prettychart ==0.3.0.3 - prettyclass ==1.0.0.0 - prettyprinter ==1.7.1 - prettyprinter-ansi-terminal ==1.1.3 @@ -2280,7 +2282,7 @@ default-package-overrides: - psqueues ==0.2.8.3 - pthread ==0.2.1 - ptr ==0.16.8.7 - - ptr-poker ==0.1.2.16 + - ptr-poker ==0.1.3 - pulse-simple ==0.1.14 - pureMD5 ==2.1.4 - puresat ==0.1 @@ -2323,7 +2325,7 @@ default-package-overrides: - rainbow ==0.34.2.2 - rainbox ==0.26.0.0 - ral ==0.2.2 - - rampart ==2.0.0.11 + - rampart ==2.0.0.13 - ramus ==0.1.2 - rando ==0.0.0.4 - random ==1.2.1.3 @@ -2337,12 +2339,12 @@ default-package-overrides: - Ranged-sets ==0.5.0 - ranges ==0.2.4 - rank1dynamic ==0.4.3 - - rank2classes ==1.5.5 + - rank2classes ==1.5.5.1 - Rasterific ==0.7.5.4 - rasterific-svg ==0.3.3.2 - rate-limit ==1.4.3 - - ratel ==2.0.0.15 - - ratel-wai ==2.0.0.10 + - ratel ==2.0.0.17 + - ratel-wai ==2.0.0.12 - ratio-int ==0.1.2 - rattle ==0.2 - rattletrap ==14.1.4 @@ -2365,7 +2367,7 @@ default-package-overrides: - rebase ==1.21.2 - rec-def ==0.2.2 - record-hasfield ==1.0.1 - - recover-rtti ==0.5.2 + - recover-rtti ==0.5.3 - recursion-schemes ==5.2.3 - recv ==0.1.1 - redact ==0.6.0.0 @@ -2473,13 +2475,13 @@ default-package-overrides: - safe-exceptions ==0.1.7.4 - safe-foldable ==0.1.0.0 - safe-gen ==1.0.1 - - safe-json ==1.2.1.0 + - safe-json ==1.2.1.1 - safe-money ==0.9.1 - safecopy ==0.10.4.3 - safeio ==0.0.6.0 - SafeSemaphore ==0.10.1 - saltine ==0.2.2.0 - - salve ==2.0.0.8 + - salve ==2.0.0.10 - sample-frame ==0.0.4 - sample-frame-np ==0.0.5 - sampling ==0.3.5 @@ -2502,7 +2504,7 @@ default-package-overrides: - scanner ==0.3.1 - scheduler ==2.0.1.0 - SciBaseTypes ==0.1.1.0 - - scientific ==0.3.8.0 + - scientific ==0.3.8.1 - scientist ==0.0.0.0 - scotty ==0.22 - scrypt ==0.5.0 @@ -2519,8 +2521,8 @@ default-package-overrides: - selections ==0.3.0.0 - selective ==0.7.0.1 - semialign ==1.3.1 - - semigroupoids ==6.0.1 - - semigroups ==0.20 + - semigroupoids ==6.0.2 + - semigroups ==0.20.1 - semiring-simple ==1.0.0.1 - semirings ==0.7 - semver ==0.4.0.1 @@ -2581,7 +2583,7 @@ default-package-overrides: - setlocale ==1.0.0.10 - sexp-grammar ==2.3.4.2 - SHA ==1.6.4.4 - - shake ==0.19.8 + - shake ==0.19.9 - shake-plus ==0.3.4.0 - shakespeare ==2.1.0.1 - shakespeare-text ==1.1.0 @@ -2590,7 +2592,7 @@ default-package-overrides: - shell-escape ==0.2.0 - shell-utility ==0.1 - shellify ==0.14.0.2 - - shellmet ==0.0.5.0 + - shellmet ==0.0.6.0 - shelltestrunner ==1.10 - shellwords ==0.1.4.6 - shelly ==1.12.1.1 @@ -2610,7 +2612,7 @@ default-package-overrides: - simple-media-timestamp ==0.2.1.0 - simple-media-timestamp-attoparsec ==0.1.0.0 - simple-pango ==0.1.0.2 - - simple-prompt ==0.2.3 + - simple-prompt ==0.2.4 - simple-reflect ==0.3.3 - simple-sendfile ==0.2.32 - simple-session ==2.0.0 @@ -2679,7 +2681,7 @@ default-package-overrides: - splice ==0.6.1.1 - split ==0.2.5 - split-record ==0.1.1.4 - - splitmix ==0.1.3.1 + - splitmix ==0.1.3.2 - splitmix-distributions ==1.1.0 - Spock-api ==0.14.0.0 - spoon ==0.3.1 @@ -2692,7 +2694,7 @@ default-package-overrides: - srtree ==2.0.1.5 - stache ==2.3.4 - stack-all ==0.7.1 - - stack-clean-old ==0.5.1 + - stack-clean-old ==0.5.2 - stack-templatizer ==0.1.1.0 - stamina ==0.1.0.3 - state-codes ==0.1.3 @@ -2702,7 +2704,7 @@ default-package-overrides: - stateWriter ==0.4.0 - static-bytes ==0.1.1 - static-text ==0.2.0.7 - - statistics ==0.16.4.0 + - statistics ==0.16.5.0 - statistics-linreg ==0.3 - statsd-rupp ==0.5.0.1 - status-notifier-item ==0.3.1.0 @@ -2710,10 +2712,10 @@ default-package-overrides: - stitch ==0.6.0.0 - stm-chans ==3.0.0.9 - stm-conduit ==4.0.1 - - stm-containers ==1.2.1.1 + - stm-containers ==1.2.2 - stm-delay ==0.1.1.2 - stm-extras ==0.1.0.3 - - stm-hamt ==1.2.1.1 + - stm-hamt ==1.2.2.1 - stm-split ==0.0.2.1 - stm-supply ==0.2.0.0 - STMonadTrans ==0.4.8.1 @@ -2764,7 +2766,7 @@ default-package-overrides: - stringsearch ==0.3.6.6 - strive ==6.0.0.17 - strongweak ==0.12.0 - - structs ==0.1.9 + - structs ==0.1.10 - stylish-haskell ==0.15.1.0 - subcategories ==0.2.1.2 - sundown ==0.6 @@ -2772,7 +2774,7 @@ default-package-overrides: - svg-tree ==0.6.2.4 - SVGFonts ==1.8.1 - swagger2 ==2.8.10 - - swish ==0.10.10.0 + - swish ==0.10.11.0 - swizzle ==0.1.0.4 - swizzle-lens ==0.1.0.0 - swizzle-modify ==0.1.0.0 @@ -2796,8 +2798,8 @@ default-package-overrides: - sydtest-wai ==0.2.0.2 - sydtest-webdriver ==0.0.0.1 - sydtest-webdriver-screenshot ==0.1.0.0 - - sydtest-webdriver-yesod ==0.0.0.1 - - sydtest-yesod ==0.3.0.3 + - sydtest-webdriver-yesod ==0.0.1.0 + - sydtest-yesod ==0.3.1.0 - symbol ==0.2.4.1 - symbolize ==1.0.3.1 - symengine ==0.1.2.0 @@ -2827,7 +2829,7 @@ default-package-overrides: - tao-example ==1.0.0 - tar ==0.6.4.0 - tar-conduit ==0.4.1 - - tardis ==0.5.0 + - tardis ==0.5.0.1 - tasty ==1.5.3 - tasty-ant-xml ==1.1.9 - tasty-autocollect ==0.4.4 @@ -2840,7 +2842,7 @@ default-package-overrides: - tasty-focus ==1.0.1 - tasty-golden ==2.3.5 - tasty-hedgehog ==1.4.0.2 - - tasty-hslua ==1.1.1 + - tasty-hslua ==1.1.1.1 - tasty-hspec ==1.2.0.4 - tasty-html ==0.4.2.2 - tasty-hunit ==0.10.2 @@ -2854,7 +2856,7 @@ default-package-overrides: - tasty-rerun ==1.1.20 - tasty-silver ==3.3.2.1 - tasty-smallcheck ==0.8.2 - - tasty-sugar ==2.2.3.2 + - tasty-sugar ==2.2.3.3 - tasty-tap ==0.1.0 - tasty-th ==0.1.7 - tasty-wai ==0.1.2.0 @@ -2866,7 +2868,7 @@ default-package-overrides: - telegram-bot-simple ==0.14.4 - tempgres-client ==1.0.0 - template ==0.2.0.10 - - template-haskell-compat-v0208 ==0.1.9.5 + - template-haskell-compat-v0208 ==0.1.9.6 - temporary ==1.3 - temporary-rc ==1.2.0.3 - temporary-resourcet ==0.1.0.1 @@ -2880,11 +2882,11 @@ default-package-overrides: - terminal ==0.2.0.0 - terminal-progress-bar ==0.4.2 - terminal-size ==0.3.4 - - test-certs ==0.1.1.1 - - test-framework ==0.8.2.2 - - test-framework-hunit ==0.3.0.2 + - test-certs ==0.1.1.2 + - test-framework ==0.8.2.3 + - test-framework-hunit ==0.3.0.3 - test-framework-leancheck ==0.0.4 - - test-framework-quickcheck2 ==0.3.0.6 + - test-framework-quickcheck2 ==0.3.0.7 - test-framework-smallcheck ==0.2 - test-fun ==0.1.0.0 - testing-feat ==1.1.1.1 @@ -2894,7 +2896,7 @@ default-package-overrides: - text-binary ==0.2.1.1 - text-builder ==1.0.0.4 - text-builder-core ==0.1.1.1 - - text-builder-dev ==0.4 + - text-builder-dev ==0.4.0.1 - text-builder-linear ==0.1.3 - text-conversions ==0.3.1.1 - text-convert ==0.1.0.1 @@ -2911,16 +2913,16 @@ default-package-overrides: - text-printer ==0.5.0.2 - text-regex-replace ==0.1.1.5 - text-rope ==0.3 - - text-short ==0.1.6 - - text-show ==3.11.2 + - text-short ==0.1.6.1 + - text-show ==3.11.3 - text-show-instances ==3.9.10 - text-zipper ==0.13 - textlocal ==0.1.0.5 - tf-random ==0.5 - tfp ==1.0.2 - - th-abstraction ==0.7.1.0 + - th-abstraction ==0.7.2.0 - th-bang-compat ==0.0.1.0 - - th-compat ==0.1.6 + - th-compat ==0.1.7 - th-constraint-compat ==0.0.1.0 - th-data-compat ==0.1.3.1 - th-deepstrict ==0.1.1.0 @@ -2929,15 +2931,15 @@ default-package-overrides: - th-expand-syns ==0.4.12.0 - th-extras ==0.0.0.8 - th-lego ==0.3.0.3 - - th-lift ==0.8.6 + - th-lift ==0.8.7 - th-lift-instances ==0.1.20 - th-nowq ==0.1.0.5 - - th-orphans ==0.13.16 + - th-orphans ==0.13.17 - th-printf ==0.8 - th-reify-compat ==0.0.1.5 - th-reify-many ==0.1.10 - th-strict-compat ==0.1.0.1 - - th-test-utils ==1.2.2 + - th-test-utils ==1.2.3 - th-utilities ==0.2.5.2 - these ==1.2.1 - these-lens ==1.0.2 @@ -2978,7 +2980,7 @@ default-package-overrides: - tlynx ==0.8.0.0 - tmapchan ==0.0.3 - tmapmvar ==0.0.4 - - tmp-proc ==0.7.2.2 + - tmp-proc ==0.7.2.5 - tmp-proc-postgres ==0.7.2.4 - tmp-proc-rabbitmq ==0.7.2.4 - tmp-proc-redis ==0.7.2.4 @@ -3007,7 +3009,7 @@ default-package-overrides: - trimdent ==0.1.0.0 - trivial-constraint ==0.7.0.0 - tsv2csv ==0.1.0.2 - - ttc ==1.5.0.0 + - ttc ==1.5.0.1 - ttrie ==0.1.2.2 - tuple ==0.3.0.2 - tuple-sop ==0.3.1.0 @@ -3144,7 +3146,7 @@ default-package-overrides: - vector-algorithms ==0.9.1.0 - vector-binary-instances ==0.2.5.2 - vector-buffer ==0.4.1 - - vector-builder ==0.3.8.6 + - vector-builder ==0.3.8.7 - vector-bytes-instances ==0.1.1 - vector-extras ==0.3 - vector-fftw ==0.1.4.1 @@ -3194,7 +3196,7 @@ default-package-overrides: - wai-middleware-delegate ==0.2.0.1 - wai-middleware-metrics ==0.2.4 - wai-middleware-prometheus ==1.0.1.0 - - wai-middleware-static ==0.9.3 + - wai-middleware-static ==0.9.4 - wai-middleware-throttle ==0.3.0.1 - wai-rate-limit ==0.3.0.0 - wai-rate-limit-redis ==0.2.0.1 @@ -3209,8 +3211,8 @@ default-package-overrides: - warp-tls ==3.4.13 - wave ==0.2.1 - wcwidth ==0.0.2 - - web-cookiejar ==0.1.3.0 - - web-rep ==0.14.0.0 + - web-cookiejar ==0.1.3.1 + - web-rep ==0.14.0.1 - web-routes ==0.27.16 - web-routes-th ==0.22.8.3 - web-view ==0.7.0 @@ -3234,12 +3236,12 @@ default-package-overrides: - what4 ==1.6.3 - wherefrom-compat ==0.1.1.1 - which ==0.2.0.3 - - wide-word ==0.1.8.1 - - wild-bind ==0.1.2.13 - - wild-bind-x11 ==0.2.0.17 + - wide-word ==0.1.9.0 + - wild-bind ==0.1.2.14 + - wild-bind-x11 ==0.2.0.18 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - - witch ==1.3.0.6 + - witch ==1.3.0.9 - with-utf8 ==1.1.0.0 - withdependencies ==0.3.1 - witherable ==0.5 @@ -3262,7 +3264,7 @@ default-package-overrides: - wreq-stringless ==0.5.9.1 - writer-cps-transformers ==0.5.6.1 - ws ==0.0.6 - - wuss ==2.0.2.5 + - wuss ==2.0.2.7 - X11 ==1.10.3 - X11-xft ==0.3.4 - x11-xim ==0.0.9.0 @@ -3295,7 +3297,7 @@ default-package-overrides: - xss-sanitize ==0.3.7.2 - xxhash-ffi ==0.3.1 - yaml ==0.11.11.2 - - yaml-unscrambler ==0.1.0.20 + - yaml-unscrambler ==0.1.0.21 - Yampa ==0.15 - yarn-lock ==0.6.5 - yaya ==0.6.2.3 @@ -3306,7 +3308,7 @@ default-package-overrides: - yes-precure5-command ==5.5.3 - yeshql-core ==4.2.0.0 - yesod ==1.6.2.1 - - yesod-auth ==1.6.11.3 + - yesod-auth ==1.6.12.0 - yesod-auth-basic ==0.1.0.3 - yesod-auth-hashdb ==1.7.1.7 - yesod-auth-oauth2 ==0.7.4.0 @@ -3325,7 +3327,7 @@ default-package-overrides: - yesod-recaptcha2 ==1.0.2.1 - yesod-routes-flow ==3.0.0.2 - yesod-sitemap ==1.6.0 - - yesod-static ==1.6.1.0 + - yesod-static ==1.6.1.2 - yesod-test ==1.6.19 - yesod-websockets ==0.3.0.3 - yggdrasil-schema ==1.0.0.6 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 1e8b91f66da8..154e3812ff1e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -127,7 +127,6 @@ dont-distribute-packages: - arithmetic-circuits - array-forth - arraylist - - arx - arxiv-client-cli - ascii - ascii-cows @@ -190,7 +189,6 @@ dont-distribute-packages: - azimuth-hs - aztecs-sdl-image - aztecs-sdl-text - - aztecs-transform - azure-functions-worker - azure-service-api - azure-servicebus @@ -278,7 +276,6 @@ dont-distribute-packages: - birch-beer - bird - BirdPP - - bisc - biscuit-servant - bishbosh - bit-array @@ -835,7 +832,6 @@ dont-distribute-packages: - EditTimeReport - effect-monad - effective-aspects-mzv - - effects-parser - ekg-carbon - elasticsearch-interchange - electrs-client @@ -859,7 +855,6 @@ dont-distribute-packages: - enumerator-fd - enumerator-tf - enumfun - - ephemeral - erf-native - eros-client - eros-http @@ -950,6 +945,7 @@ dont-distribute-packages: - fay-uri - fay-websockets - fbrnch + - fbrnch_1_8 - fcd - FComp - feature-flipper-postgres @@ -1044,7 +1040,6 @@ dont-distribute-packages: - freckle-otel - freckle-prelude - freckle-stats - - free-functors - free-game - free-theorems-seq-webui - freekick2 @@ -1427,6 +1422,7 @@ dont-distribute-packages: - hasloGUI - hasql-postgres - hasql-postgres-options + - hasql-postgresql-types - hasql-queue - hasql-streams-core - hasql-streams-example @@ -1646,6 +1642,7 @@ dont-distribute-packages: - hs-ffmpeg - hs-functors - hs-gen-iface + - hs-hath - hs-ix - hs-opentelemetry-instrumentation-cloudflare - hs-opentelemetry-instrumentation-http-client @@ -1778,7 +1775,7 @@ dont-distribute-packages: - hylotab - hyloutils - hyperbole - - hyperbole_0_5_0 + - hyperbole_0_6_0 - hyperpublic - ide-backend - ide-backend-server @@ -2085,7 +2082,6 @@ dont-distribute-packages: - linkcore - linnet-aeson - linnet-conduit - - linux-ptrace - lio-eci11 - lion - liquid-base @@ -2385,7 +2381,6 @@ dont-distribute-packages: - mysql-simple-typed - myTestlll - mywatch - - mywork - n2o-web - NaCl - nakadi-client @@ -2426,6 +2421,7 @@ dont-distribute-packages: - network-rpca - network-stream - network-topic-models + - network-transport-quic - network-websocket - neuron - newsletter-mailgun @@ -2596,7 +2592,7 @@ dont-distribute-packages: - persistent-hssqlppp - persistent-iproute - persistent-map - - persistent-postgresql_2_14_2_0 + - persistent-postgresql_2_14_3_0 - persistent-protobuf - persona-idp - peyotls @@ -2653,6 +2649,7 @@ dont-distribute-packages: - pms-application-service - pms-domain-service - pms-infra-cmdrun + - pms-infra-filesystem - pms-infra-procspawn - pms-infra-serial - pms-infra-socket @@ -2704,11 +2701,14 @@ dont-distribute-packages: - postgresql-common-persistent - postgresql-pure - postgresql-simple-ltree + - postgresql-simple-postgresql-types - postgresql-simple-queue - postgresql-simple-typed - postgresql-tx-query - postgresql-tx-squeal - postgresql-tx-squeal-compat-simple + - postgresql-types + - postgresql-types-algebra - postmark - potoki - potoki-cereal @@ -2915,6 +2915,7 @@ dont-distribute-packages: - repa-flow - repa-plugin - repa-v4l2 + - repl-alliance - replicant - repo-based-blog - repr @@ -3088,8 +3089,6 @@ dont-distribute-packages: - secrm - sednaDBXML - seitz-symbol - - selda-json - - selda-sqlite - SelectSequencesFromMSA - selenium-server - semantic-source @@ -3204,7 +3203,7 @@ dont-distribute-packages: - SimpleLog - SimpleServer - simseq - - singletons-base_3_5 + - singletons-base_3_5_1 - singletons-presburger - siphon - siren-json @@ -3394,13 +3393,13 @@ dont-distribute-packages: - sydtest-amqp - sydtest-webdriver-screenshot - sydtest-webdriver-yesod - - sydtest-webdriver-yesod_0_0_1_0 - sylvia - symantic-atom - symantic-http-demo - symantic-http-test - symantic-lib - symbiote + - symbolic-regression - symmetry-operations-symbols - Synapse - synapse @@ -3599,7 +3598,6 @@ dont-distribute-packages: - UMM - unagi-bloomfilter - unbound - - unfoldable-restricted - uni-events - uni-graphs - uni-htk @@ -3857,7 +3855,6 @@ dont-distribute-packages: - yesod-articles - yesod-auth-ldap - yesod-auth-lti13 - - yesod-auth-simple - yesod-colonnade - yesod-continuations - yesod-examples diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index e30198453072..2e0aee58aa7b 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -454,6 +454,9 @@ builtins.intersectAttrs super { })) ]; + # Wants to execute cabal-install + ghci-quickfix = dontCheck super.ghci-quickfix; + # These packages try to access the network. amqp = dontCheck super.amqp; amqp-conduit = dontCheck super.amqp-conduit; @@ -495,18 +498,46 @@ builtins.intersectAttrs super { mustache = dontCheck super.mustache; arch-web = dontCheck super.arch-web; + # Some test cases require network access + hpack_0_39_1 = doDistribute ( + overrideCabal (drv: { + testFlags = drv.testFlags or [ ] ++ [ + "--skip=/EndToEnd/hpack/defaults/fails if defaults don't exist/" + "--skip=/Hpack.Defaults/ensureFile/downloads file if missing/" + "--skip=/Hpack.Defaults/ensureFile/with 404/does not create any files/" + ]; + }) super.hpack_0_39_1 + ); + # Tries accessing the GitHub API github-app-token = dontCheck super.github-app-token; - # The curl executable is required for withApplication tests. - warp = addTestToolDepend pkgs.curl super.warp; + warp = lib.pipe super.warp [ + # The curl executable is required for withApplication tests. + (addTestToolDepend pkgs.curl) + # Avoids much closure size of downstream deps on macOS: https://github.com/yesodweb/wai/pull/1044 + (disableCabalFlag "include-warp-version") + ]; lz4-frame-conduit = addTestToolDepends [ pkgs.lz4 ] super.lz4-frame-conduit; - safe-exceptions = overrideCabal (drv: { - # Fix strictDeps build error "could not execute: hspec-discover" - testToolDepends = drv.testToolDepends or [ ] ++ [ self.hspec-discover ]; - }) super.safe-exceptions; + # Package does not declare tool dependency hspec-discover + hspec-wai = addTestToolDepends [ self.hspec-discover ] super.hspec-wai; + + # Package does not declare tool dependency hspec-discover + http-date = addTestToolDepends [ self.hspec-discover ] super.http-date; + + # Package does not declare tool dependency hspec-discover + http-types = addTestToolDepends [ self.hspec-discover ] super.http-types; + + # Package does not declare tool dependency hspec-discover + safe-exceptions = addTestToolDepends [ self.hspec-discover ] super.safe-exceptions; + + # Package does not declare tool dependency hspec-discover + unliftio = addTestToolDepends [ self.hspec-discover ] super.unliftio; + + # Package does not declare tool dependency hspec-discover + word8 = addTestToolDepends [ self.hspec-discover ] super.word8; # Test suite requires running a database server. Testing is done upstream. hasql = dontCheck super.hasql; @@ -897,6 +928,10 @@ builtins.intersectAttrs super { splitmix = dontCheck super.splitmix; splitmix_0_1_1 = dontCheck super.splitmix_0_1_1; + # Break infinite recursion + # hedgehog (dep)→ async (dep)→ unordered-containers (test)→ nothunks (test)→ hedgehog + nothunks = dontCheck super.nothunks; + # Break infinite recursion cycle with OneTuple and quickcheck-instances. foldable1-classes-compat = dontCheck super.foldable1-classes-compat; @@ -931,13 +966,17 @@ builtins.intersectAttrs super { ]; }) super.liquid-fixpoint; - # overrideCabal because the tests need to execute the built executable "liquid" + # overrideCabal because + # - tests need to execute the built executable "liquid" + # - LiquidHaskell needs an SMT solver. We use Z3. + # - LiquidHaskell clash with Haddock as of now, see https://github.com/ucsd-progsys/liquidhaskell/issues/2188 liquidhaskell = overrideCabal (drv: { preCheck = '' export PATH=$PWD/dist/build/liquid:$PATH '' + (drv.preCheck or ""); libraryToolDepends = (drv.libraryToolDepends or [ ]) ++ [ pkgs.z3 ]; + doHaddock = false; }) super.liquidhaskell; # Break cyclic reference that results in an infinite recursion. @@ -1026,6 +1065,8 @@ builtins.intersectAttrs super { (disableCabalFlag "no-exe") enableSeparateBinOutput (addBuildDepend self.optparse-applicative) + # Package does not declare tool dependency hspec-discover + (addTestToolDepend self.hspec-discover) ]; # Compile manpages (which are in RST and are compiled with Sphinx). @@ -1181,8 +1222,7 @@ builtins.intersectAttrs super { http-download = dontCheck super.http-download; http-download_0_2_1_0 = doDistribute (dontCheck super.http-download_0_2_1_0); pantry = dontCheck super.pantry; - pantry_0_9_3_1 = dontCheck super.pantry_0_9_3_1; - pantry_0_10_0 = dontCheck super.pantry_0_10_0; + pantry_0_11_2 = doDistribute (dontCheck super.pantry_0_11_2); # gtk2hs-buildtools is listed in setupHaskellDepends, but we # need it during the build itself, too. @@ -1328,6 +1368,8 @@ builtins.intersectAttrs super { ]; doCheck = drv.doCheck or true && !(pkgs.postgresqlTestHook.meta.broken); }) super.haskell-pgmq; + # Needs pgmq available at test time with somehow preinitialized database (?) + stakhanov = dontCheck super.stakhanov; migrant-postgresql-simple = lib.pipe super.migrant-postgresql-simple [ (overrideCabal { diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 0a35479f4d72..07e7977f7175 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2603,6 +2603,73 @@ self: { } ) { }; + BNFC_2_9_6_2 = callPackage ( + { + mkDerivation, + alex, + array, + base, + containers, + deepseq, + directory, + filepath, + happy, + hspec, + hspec-discover, + HUnit, + mtl, + pretty, + QuickCheck, + string-qq, + temporary, + time, + }: + mkDerivation { + pname = "BNFC"; + version = "2.9.6.2"; + sha256 = "12cap3xqsa06bkhq46qazaqvpcckh0p7cnyacr4p1klr1nvlxkcr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array + base + containers + deepseq + directory + filepath + mtl + pretty + string-qq + time + ]; + libraryToolDepends = [ + alex + happy + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base + directory + filepath + hspec + HUnit + mtl + pretty + QuickCheck + temporary + ]; + testToolDepends = [ + alex + happy + hspec-discover + ]; + description = "A compiler front-end generator"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "bnfc"; + } + ) { }; + BNFC-meta = callPackage ( { mkDerivation, @@ -5931,7 +5998,7 @@ self: { } ) { }; - Cabal_3_16_0_0 = callPackage ( + Cabal_3_16_1_0 = callPackage ( { mkDerivation, array, @@ -5952,10 +6019,8 @@ self: { }: mkDerivation { pname = "Cabal"; - version = "3.16.0.0"; - sha256 = "030v97qnq7299ldi6zz9lb8ashldybp9l1x2f9ga8l7m8xns72nn"; - revision = "1"; - editedCabalFile = "0rxxs5qqhblldfd5200aqd84y0pxsil2m5lhv45s4s1i4syw4wlr"; + version = "3.16.1.0"; + sha256 = "0mi5xy9ksj4vmbmwmhdwp15isf99ln72b9inip3c2ryw45ys7f66"; setupHaskellDepends = [ mtl parsec @@ -6219,7 +6284,7 @@ self: { } ) { }; - Cabal-syntax_3_16_0_0 = callPackage ( + Cabal-syntax_3_16_1_0 = callPackage ( { mkDerivation, alex, @@ -6240,8 +6305,8 @@ self: { }: mkDerivation { pname = "Cabal-syntax"; - version = "3.16.0.0"; - sha256 = "17w0av34br7l5p2hw4bvzjmmrass6s0775big1w3hiig0lbx8nzl"; + version = "3.16.1.0"; + sha256 = "19xx6q5va5hv2c6khf5khgyv1l84nm6a65vfi6jar5jdkd263mbb"; libraryHaskellDepends = [ array base @@ -6628,8 +6693,8 @@ self: { pname = "Chart-cairo"; version = "1.9.4.1"; sha256 = "0x10l9y38bscx88n849k9ybn7axp4j9hlivc1jv9wwvv4gqw5jr7"; - revision = "3"; - editedCabalFile = "0rl4var9s1521n6ryxp59kglfip2bw1svm3mx72ya8zc4yj3z5rb"; + revision = "4"; + editedCabalFile = "1yw1y233bzir1i75cln0ljrpmg52izh9kdrplf27sgqcplzqww8r"; libraryHaskellDepends = [ array base @@ -6675,8 +6740,8 @@ self: { pname = "Chart-diagrams"; version = "1.9.5.1"; sha256 = "1pk2fsmjl2dsabzpdwk3190nw0nwy581c4qsl93npx764qcxkp7q"; - revision = "4"; - editedCabalFile = "0lkpn0jdx0nj6991dkakm3262z4l9sqzbyhck2nrxcisgg8afmn6"; + revision = "6"; + editedCabalFile = "1sjfjd3y48fq1y7wphcrx08y1bjh7s58ssasg2d31ywh2yc7vi7x"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base @@ -6956,6 +7021,8 @@ self: { pname = "ChasingBottoms"; version = "1.3.1.17"; sha256 = "0713mgd71dix9dq1i812ydahcacfpsxmciqxwhg4qj0migyc4ymg"; + revision = "1"; + editedCabalFile = "1xz1wpi3k2bzgxnai38840z18hk03ha4xdgjvjg5g8dlja946dih"; libraryHaskellDepends = [ base containers @@ -11412,6 +11479,8 @@ self: { pname = "EdisonAPI"; version = "1.3.3.2"; sha256 = "0cqcji5lsyd0n60qy76d18vmfamabdvybd6d4v1y658cqylsnrgn"; + revision = "1"; + editedCabalFile = "01lf4ixr0npd3jfxb9sb65043r87v33xs813cqp5sj7r0agflaxj"; libraryHaskellDepends = [ base ]; description = "A library of efficient, purely-functional data structures (API)"; license = lib.licenses.mit; @@ -11421,7 +11490,6 @@ self: { EdisonCore = callPackage ( { mkDerivation, - array, base, containers, EdisonAPI, @@ -11429,10 +11497,9 @@ self: { }: mkDerivation { pname = "EdisonCore"; - version = "1.3.3.2"; - sha256 = "1d7nq6zmxnd2h1zdzpql2k48cqxsr8hncd8xarb8g27709qlgyag"; + version = "1.3.3.3"; + sha256 = "11pbdrgcqfr333lxhbzyi1xqp3bi0bc82i5682l8gx26iqizbz0c"; libraryHaskellDepends = [ - array base containers EdisonAPI @@ -13457,13 +13524,11 @@ self: { { mkDerivation, base }: mkDerivation { pname = "FirstPrelude"; - version = "0.1.2.0"; - sha256 = "00qv9h9i3yy7rh6wl8qs2r00z9hqpm56y9g717qh0skrl1fdk3yk"; + version = "0.2.0.0"; + sha256 = "0cpkklm4dqv023ywb2qh49pndbsj2vz7rd2892vnsd9idd34aj6w"; libraryHaskellDepends = [ base ]; description = "A version of Prelude suitable for teaching"; license = lib.licensesSpdx."BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -20483,8 +20548,8 @@ self: { pname = "HStringTemplate"; version = "0.8.8"; sha256 = "1n8ci0kzjcgnqh4dfpqwlh7mnlzyiqiqc6hc0zr65p0balbg8zbi"; - revision = "9"; - editedCabalFile = "1pfn0g6zchygdp3y2laj67ni81iyq57kwj7wpf5z4g0dfg286abp"; + revision = "10"; + editedCabalFile = "03i9glxnx7g6k56zhi50bp3rfz1mw3kxxnf1k3jlk5zkf9fyvhb5"; libraryHaskellDepends = [ array base @@ -20755,6 +20820,8 @@ self: { pname = "HTTP"; version = "4000.5.0"; sha256 = "16sg079a630jpbf41b3bv063z4iz5ry2h67fmwh8yz9jh713p8yj"; + revision = "1"; + editedCabalFile = "0vjzxbn8mjc6qdfxf4v0lbz4r9hnw7g2bnp3c0vjzz3zb4l3dw2c"; libraryHaskellDepends = [ array base @@ -21554,8 +21621,8 @@ self: { pname = "HaXml"; version = "1.25.14"; sha256 = "1zvrpa88pydak4yx984zk7j5z84hqfyv682j6chk8j4kva6xhxza"; - revision = "1"; - editedCabalFile = "00na7cp1d6pf797xyq17qgsdj2hlhdgvirm1ssvad4wgrb66v0la"; + revision = "2"; + editedCabalFile = "0ancsjscz52173n7xf5grjawsn8f1amfhmwgpqwh2lms1jplk061"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -22651,6 +22718,8 @@ self: { pname = "Hastructure"; version = "0.50.4"; sha256 = "15g4hsgh2spfmynz4rs9za0ifcgdgcvp4n5qgm2szf4i9sdly0cf"; + revision = "3"; + editedCabalFile = "09gqhb2h0sxwfvmaxb5ff0xh02dmxv7cj1d2iv2imah8fkga1ws0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -24090,6 +24159,8 @@ self: { pname = "HsOpenSSL"; version = "0.11.7.9"; sha256 = "0z3nyqlcgqw4ncn90gs6bznyj3lrqpjv83nzs4854knm15x6cbsa"; + revision = "1"; + editedCabalFile = "0nw5p8szaip7g4yh81b89wc4k7j0crda0wilfyaqb0kc6qal71m2"; libraryHaskellDepends = [ base bytestring @@ -26113,6 +26184,8 @@ self: { pname = "JuicyPixels"; version = "3.3.9"; sha256 = "0kc68bjj3izbdvw67kyzg74fv1ksj2dclq5gxzlnajv87rfsqi1y"; + revision = "1"; + editedCabalFile = "01lyl7nxwnfy9vci1800pvb30yr3a55gikj39fw80dbz5hi9fmxz"; libraryHaskellDepends = [ base binary @@ -29308,6 +29381,7 @@ self: { case-insensitive, containers, data-default-class, + directory, extended-reals, filepath, hashable, @@ -29332,8 +29406,8 @@ self: { }: mkDerivation { pname = "MIP"; - version = "0.2.0.0"; - sha256 = "0ss8xbi9l8q3vqdrshb30g1rvi7xhmcrzz7w415rxaxqmsk3n8s7"; + version = "0.2.0.1"; + sha256 = "0vgbmwzf0s2w8zkrl3nv9fx0vvhbzmyszb1zrqw11mb683bj8d29"; libraryHaskellDepends = [ aeson base @@ -29342,6 +29416,7 @@ self: { case-insensitive containers data-default-class + directory extended-reals filepath hashable @@ -29401,8 +29476,8 @@ self: { }: mkDerivation { pname = "MIP-glpk"; - version = "0.2.0.0"; - sha256 = "1614lgn3ggaqb948pqbd3gif7pk55cmh4lvyjk90a3hvjgc76v1m"; + version = "0.2.0.1"; + sha256 = "04rgd7d2d9dvigwvssvzghc2k5x5gs1gym2k6y5lidw49cc0lg4d"; libraryHaskellDepends = [ base bytestring @@ -29433,8 +29508,6 @@ self: { ]; description = "A GLPK backend to the MIP library"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { inherit (pkgs) glpk; }; @@ -30272,8 +30345,8 @@ self: { }: mkDerivation { pname = "MissingH"; - version = "1.6.0.2"; - sha256 = "17ckc5hck9ng9rqx2afj1xac0d7m1p0vqfc5mdmmlkg5nza432is"; + version = "1.6.0.3"; + sha256 = "1a54diqjhhr03n9nmxd00r9bn4nw5p9xbw7xvb2ziyrkkindi4qs"; libraryHaskellDepends = [ array base @@ -30301,7 +30374,6 @@ self: { old-time parsec regex-compat - time unix ]; description = "Large utility library"; @@ -30696,19 +30768,17 @@ self: { primitive, random, transformers, - transformers-compat, }: mkDerivation { pname = "MonadRandom"; - version = "0.6.2"; - sha256 = "0sk61xbpagiwfpmfskysc2f7y05rpmaz0q8hr0a7m6f2xyw1rw02"; + version = "0.6.2.1"; + sha256 = "1dkqn7j99f47zsn4524fnrq6s0h09c5ww6qvxwa4vkx6bx3kn45k"; libraryHaskellDepends = [ base mtl primitive random transformers - transformers-compat ]; description = "Random-number generation monad"; license = lib.licenses.bsd3; @@ -33786,10 +33856,8 @@ self: { }: mkDerivation { pname = "OneTuple"; - version = "0.4.2"; - sha256 = "0mdbga3a5pjzszlq9bny3zgfbz25w2q2bjw2h6q1fk80yjhahk8p"; - revision = "1"; - editedCabalFile = "1m54gsnc1bqy30vv3fab7axxmfns23cass11cvjp0afshgwncwnx"; + version = "0.4.2.1"; + sha256 = "0gp06vc9pg80jkslmjxhk3dg826j3szxbj68wspzbj79a4ji6165"; libraryHaskellDepends = [ base ghc-prim @@ -33798,7 +33866,6 @@ self: { testHaskellDepends = [ base hashable - template-haskell ]; description = "Singleton Tuple"; license = lib.licenses.bsd3; @@ -34623,6 +34690,8 @@ self: { pname = "PSQueue"; version = "1.2.2"; sha256 = "1jm8fswmmlrlg0cxgc358sc4jinjligm5qzqrzdli8pi8d06p5ni"; + revision = "1"; + editedCabalFile = "09wzjxijch5k4vdz1aa0pd1f385v9p6ajhwpvhz3mjkn025gjjja"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base @@ -38727,8 +38796,8 @@ self: { pname = "RoundingFiasco"; version = "0.1.0.0"; sha256 = "1n51zrbngiickyh7mqm3jnvnf7qcbjdrqz5q4pjqpx9cl9hx7yl0"; - revision = "2"; - editedCabalFile = "01rkg5s8xjxrqnzzfcs7fvshnydc5g3m7mdgxgim2rc133h7hg56"; + revision = "3"; + editedCabalFile = "01q1fz5gqkw3pqb4vxs0zprwzdlpxw2nv9vwsbn15hr1d3fnacfh"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "rounding variants floor, ceil and truncate for floating point operations +-*/√…"; @@ -49208,8 +49277,8 @@ self: { }: mkDerivation { pname = "Ztrategic"; - version = "0.1.0"; - sha256 = "0720gmpijd89sma3699cqc2mwj60bz6gidrgfsnm0zw67saqcq1f"; + version = "0.2.0"; + sha256 = "01x3rgs1rp2rmglnn0lfcjylbxhblgchc6611in9zhgwy48x3hl9"; libraryHaskellDepends = [ base monadplus @@ -49880,10 +49949,8 @@ self: { }: mkDerivation { pname = "acc"; - version = "0.2.0.3"; - sha256 = "13gx2d2bdwkcdk8q06hq3q4a6jlamljbimd57ck2lfmr1lm5r1w9"; - revision = "1"; - editedCabalFile = "0qsggnxzzb1awfcjqm7xihr6lxjpx0yxpvwd6hzvd52s3j0qbz1a"; + version = "0.2.0.4"; + sha256 = "04fcxxpm5x86qxwz0ih62q73iqb1x093xhdj2ykf83g4mja59pc5"; libraryHaskellDepends = [ base deepseq @@ -53432,11 +53499,9 @@ self: { adjunctions = callPackage ( { mkDerivation, - array, base, comonad, containers, - contravariant, distributive, free, hspec, @@ -53444,32 +53509,24 @@ self: { mtl, profunctors, semigroupoids, - semigroups, tagged, transformers, - transformers-compat, - void, }: mkDerivation { pname = "adjunctions"; - version = "4.4.3"; - sha256 = "16hqxd88998dgjib8k1dy78a1waww3hd33hqqgd17y9bxqf15swb"; + version = "4.4.4"; + sha256 = "0i9icqx20ra0gvry79yj35p4cmigb4g2i1nfaysk2hy7sfdqsh11"; libraryHaskellDepends = [ - array base comonad containers - contravariant distributive free mtl profunctors semigroupoids - semigroups tagged transformers - transformers-compat - void ]; testHaskellDepends = [ base @@ -55302,6 +55359,8 @@ self: { pname = "aeson-jsonpath"; version = "0.3.0.2"; sha256 = "0z869j8hdgbc86y9zb3ssrjzqyzryky08x2iyw2ys6pdh5mgcckl"; + revision = "1"; + editedCabalFile = "19hvg97zmqjm4m4jdr6p6722pfzh7zjaa54qdzyiv2jsvkn76pbz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson @@ -55993,8 +56052,8 @@ self: { }: mkDerivation { pname = "aeson-schemas"; - version = "1.4.3.0"; - sha256 = "1cc9irb91p8zpa04vpgc8rb5dxg65mg8vmssmf2y3xpn4djzzpxx"; + version = "1.4.3.1"; + sha256 = "106ca6bfw6g91zlxgzw4fxcdsx747y025wli08nzn3lhw5xixgvx"; libraryHaskellDepends = [ aeson base @@ -59266,10 +59325,8 @@ self: { }: mkDerivation { pname = "algebraic-classes"; - version = "0.9.4"; - sha256 = "06q0vzixc5dz98ia5ii862ryd9nlfinnmly2l5br8rixsbnks82s"; - revision = "1"; - editedCabalFile = "0w3845hl7cppdk3zvhmz0zic7sbcklfircx97wf9dhh40q3qdcmi"; + version = "0.10"; + sha256 = "1706x7bzp2jm33x6yqb30h1h7v6rvmnyrkgr83h9d9jkaayizs8g"; libraryHaskellDepends = [ base syb @@ -59277,8 +59334,6 @@ self: { ]; description = "Conversions between algebraic classes and F-algebras"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -59365,6 +59420,45 @@ self: { } ) { }; + algebraic-graphs_0_8 = callPackage ( + { + mkDerivation, + array, + base, + containers, + deepseq, + extra, + inspection-testing, + QuickCheck, + transformers, + }: + mkDerivation { + pname = "algebraic-graphs"; + version = "0.8"; + sha256 = "071q78h5l6pafcn39jdkvgi62hjvxk09204gfdckp7az4j9qk9m4"; + libraryHaskellDepends = [ + array + base + containers + deepseq + transformers + ]; + testHaskellDepends = [ + array + base + containers + deepseq + extra + inspection-testing + QuickCheck + transformers + ]; + description = "A library for algebraic graph construction and transformation"; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + algebraic-graphs-io = callPackage ( { mkDerivation, @@ -59436,6 +59530,44 @@ self: { } ) { }; + algebraic-path = callPackage ( + { + mkDerivation, + attoparsec, + base, + hashable, + hspec, + natural-sort, + QuickCheck, + quickcheck-classes, + rerebase, + text, + text-builder, + }: + mkDerivation { + pname = "algebraic-path"; + version = "0.1.0.1"; + sha256 = "0msq2v8zzikfmdl0j9y75ai5rd2xwa7bfpjjd7bj98mxm3knzd5v"; + libraryHaskellDepends = [ + attoparsec + base + hashable + natural-sort + QuickCheck + text + text-builder + ]; + testHaskellDepends = [ + hspec + quickcheck-classes + rerebase + ]; + doHaddock = false; + description = "Flexible and simple path manipulation library"; + license = lib.licensesSpdx."MIT"; + } + ) { }; + algebraic-prelude = callPackage ( { mkDerivation, @@ -77061,8 +77193,8 @@ self: { pname = "ansi-terminal-game"; version = "1.9.3.0"; sha256 = "1yy7hzdcawdmwl8wqzabbamzjdg260xbwryj0hdjn7b0n6qlqymk"; - revision = "4"; - editedCabalFile = "0ccd308nkvwihg81p14bjzliaapig5bw697afmvivsxy400yf4x3"; + revision = "5"; + editedCabalFile = "047n59p2sslawlv7fs6dn0mwgf4fsbk4lwlvl622dj45mbn77sgm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -77449,6 +77581,49 @@ self: { } ) { }; + antigen = callPackage ( + { + mkDerivation, + base, + criterion, + free, + hspec, + mtl, + QuickCheck, + quickcheck-transformer, + random, + }: + mkDerivation { + pname = "antigen"; + version = "0.3.0.0"; + sha256 = "0wh163xsy3pspdpxbk8lx04q73bn8f2cg8cy5mhcm8j29bb2l3fz"; + revision = "2"; + editedCabalFile = "14ndq7wmjwbnx6jv533606vm5zn34j3v7q4f6w4q4kf43ab9f4mm"; + libraryHaskellDepends = [ + base + free + mtl + QuickCheck + quickcheck-transformer + random + ]; + testHaskellDepends = [ + base + hspec + QuickCheck + quickcheck-transformer + ]; + benchmarkHaskellDepends = [ + base + criterion + QuickCheck + quickcheck-transformer + ]; + description = "Fault injection for QuickCheck"; + license = lib.licensesSpdx."MIT"; + } + ) { }; + antikythera = callPackage ( { mkDerivation, @@ -84505,7 +84680,6 @@ self: { base, blaze-builder, bytestring, - bytestring-nums, containers, file-embed, hashable, @@ -84516,8 +84690,8 @@ self: { }: mkDerivation { pname = "arx"; - version = "0.3.2"; - sha256 = "01mz46r54fhvaaawvng4csf9qk2vlr4y3zgnwwl6q6449y1w1k25"; + version = "0.3.3"; + sha256 = "18ggi9jifmjdyp6dps3zjkjgmm0vpf4bjdky99k8nd9sqrfncv4d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84525,7 +84699,6 @@ self: { base blaze-builder bytestring - bytestring-nums containers file-embed hashable @@ -84539,7 +84712,6 @@ self: { base blaze-builder bytestring - bytestring-nums containers file-embed hashable @@ -84549,8 +84721,7 @@ self: { template-haskell ]; description = "Archive execution tool"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; + license = lib.licensesSpdx."BSD-3-Clause"; mainProgram = "arx"; } ) { }; @@ -86515,8 +86686,8 @@ self: { pname = "assoc"; version = "1.1.1"; sha256 = "1xhg7fqs8i067q2wmpma1yynsa9vbrhjh4pmbbcmv7zhzsvlj493"; - revision = "1"; - editedCabalFile = "0pqq27nzpsabvklgbldqls37mcl2hzs19qy6balsqk7b3x6rpcqa"; + revision = "2"; + editedCabalFile = "1r0as5s5a0xv2pcpxj1a1snxc3kdq1crh6hfy7y5n9d5xm010svn"; libraryHaskellDepends = [ base ]; description = "swap and assoc: Symmetric and Semigroupy Bifunctors"; license = lib.licensesSpdx."BSD-3-Clause"; @@ -86969,19 +87140,19 @@ self: { stm, test-framework, test-framework-hunit, + unordered-containers, }: mkDerivation { pname = "async"; - version = "2.2.5"; - sha256 = "1xqnixmcxbird7rxl124bn5swpyyxxx2jxpdsbx2l8drp8z4f60q"; - revision = "3"; - editedCabalFile = "0fvnk4rz1d2j4n5pww17qy0km0blv2gqycnbjlyrg6kjcmhqqr5p"; + version = "2.2.6"; + sha256 = "06cnb6a9cbpg9nl87llfm1ilwch73l9ljv6s849100w032y7318l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hashable stm + unordered-containers ]; testHaskellDepends = [ base @@ -91095,8 +91266,8 @@ self: { }: mkDerivation { pname = "autoexporter"; - version = "2.0.0.15"; - sha256 = "0jx5vih8fjfy4xamiw38z9ycq27fmqdx0yjidbqgfc3js5rhhcki"; + version = "2.0.0.17"; + sha256 = "0sg2nbr7iaa5bl0c6ha9wrh4yf0g3h3brdpx30f1c9wqqrl3p552"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91274,7 +91445,7 @@ self: { } ) { }; - automaton_1_6 = callPackage ( + automaton_1_6_1 = callPackage ( { mkDerivation, base, @@ -91296,8 +91467,8 @@ self: { }: mkDerivation { pname = "automaton"; - version = "1.6"; - sha256 = "1sykk3dlbwqgmb0fs5lk66gaar8ivhsf5iwlffjc51bv3pvm3vas"; + version = "1.6.1"; + sha256 = "19mccv73yzd3jg1mphijidgnqf5jm4ad5vnqxzmmi6mfv4spg4dm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95318,27 +95489,18 @@ self: { deepseq, hspec, mtl, - primitive, QuickCheck, - sparse-set, + vector, }: mkDerivation { pname = "aztecs"; - version = "0.14.0"; - sha256 = "0v9k2svhcrsj5gqwjrd4xhd4f3gxghwjr7mnb6ifbilw17h86651"; - isLibrary = true; - isExecutable = true; + version = "0.17.1"; + sha256 = "0cv2qxly5i4fisxb27a6k8m5y5j38p1fvv9mnb4wl0bzc3c5xibl"; libraryHaskellDepends = [ base containers - deepseq - mtl - primitive - sparse-set - ]; - executableHaskellDepends = [ - base mtl + vector ]; testHaskellDepends = [ base @@ -95346,13 +95508,13 @@ self: { deepseq hspec QuickCheck + vector ]; benchmarkHaskellDepends = [ base criterion deepseq - primitive - sparse-set + vector ]; description = "A modular game engine and Entity-Component-System (ECS) for Haskell"; license = lib.licensesSpdx."BSD-3-Clause"; @@ -95386,6 +95548,105 @@ self: { } ) { }; + aztecs-gl = callPackage ( + { + mkDerivation, + aztecs, + aztecs-glfw, + aztecs-transform, + base, + bytestring, + containers, + GLFW-b, + JuicyPixels, + OpenGL, + vector, + }: + mkDerivation { + pname = "aztecs-gl"; + version = "0.3.0"; + sha256 = "0iqgpipd95apznipnb1jcyja3jpycdnihh1a7vilvr564a714xz5"; + libraryHaskellDepends = [ + aztecs + aztecs-glfw + aztecs-transform + base + bytestring + containers + GLFW-b + JuicyPixels + OpenGL + vector + ]; + testHaskellDepends = [ base ]; + description = "OpenGL rendering for Aztecs"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + + aztecs-gl-text = callPackage ( + { + mkDerivation, + aztecs, + aztecs-gl, + base, + containers, + freetype2, + linear, + OpenGL, + vector, + }: + mkDerivation { + pname = "aztecs-gl-text"; + version = "0.1.0"; + sha256 = "1qbd7yhndnlq5lppwq49s43l02sp1235mrzvgq22lghw7p3xwrvq"; + libraryHaskellDepends = [ + aztecs + aztecs-gl + base + containers + freetype2 + linear + OpenGL + vector + ]; + testHaskellDepends = [ base ]; + description = "OpenGL text rendering for Aztecs"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + + aztecs-glfw = callPackage ( + { + mkDerivation, + aztecs, + base, + containers, + GLFW-b, + }: + mkDerivation { + pname = "aztecs-glfw"; + version = "0.2.0"; + sha256 = "0jgcfp6pcfbw3mjwlndlg64xm7wmpwnknfks1rdx8cjkd9zgkady"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aztecs + base + containers + GLFW-b + ]; + executableHaskellDepends = [ + aztecs + base + ]; + testHaskellDepends = [ base ]; + description = "GLFW backed for Aztecs"; + license = lib.licensesSpdx."BSD-3-Clause"; + mainProgram = "aztecs-glfw"; + } + ) { }; + aztecs-hierarchy = callPackage ( { mkDerivation, @@ -95531,25 +95792,22 @@ self: { { mkDerivation, aztecs, - aztecs-hierarchy, base, + containers, linear, - mtl, }: mkDerivation { pname = "aztecs-transform"; - version = "0.2.0.0"; - sha256 = "0nbq24ksbk2xx4yx7lqkr23ky857bn75mv9bkmrndzpdg0fy9yk3"; + version = "0.3.2"; + sha256 = "1crd8v02bbm23n2janrbzz5y6vzgz6nzy3p9bc0kgzwv15164myk"; libraryHaskellDepends = [ aztecs - aztecs-hierarchy base + containers linear - mtl ]; - description = "A type-safe and friendly Entity-Component-System (ECS) for Haskell"; + description = "Transform components for Aztecs"; license = lib.licensesSpdx."BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -97204,10 +97462,8 @@ self: { }: mkDerivation { pname = "bank-holiday-germany"; - version = "2.1.0.1"; - sha256 = "17mfcdm55bh8a4a00khwvij5zc2iibr7hibw9fh5zz9yzywvqniw"; - revision = "1"; - editedCabalFile = "0wzq52z1fv59pwvhwjpj2jw6mf2jkqpxlcil6kr8i1pngpc8lp5p"; + version = "2.1.0.2"; + sha256 = "136n6032clb2w8sgnwqsf29will566yg2ib87803hcj6ivv77lxh"; libraryHaskellDepends = [ base time @@ -97774,6 +98030,26 @@ self: { } ) { }; + base-compat_0_15_0 = callPackage ( + { + mkDerivation, + base, + ghc-prim, + }: + mkDerivation { + pname = "base-compat"; + version = "0.15.0"; + sha256 = "0ca5h8r1da7m1pw2s5mmah7gpgf2acv5i426j84ah84sfzblkajr"; + libraryHaskellDepends = [ + base + ghc-prim + ]; + description = "A compatibility layer for base"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + } + ) { }; + base-compat-batteries = callPackage ( { mkDerivation, @@ -97804,6 +98080,39 @@ self: { } ) { }; + base-compat-batteries_0_15_0 = callPackage ( + { + mkDerivation, + base, + base-compat, + ghc-prim, + hspec, + hspec-discover, + QuickCheck, + }: + mkDerivation { + pname = "base-compat-batteries"; + version = "0.15.0"; + sha256 = "1f2am604ndi9ghksk9003jly1m7i64mrm6l3ad0p30issg66q5jc"; + revision = "1"; + editedCabalFile = "1nhwq8klffz81km0wrdn8h7y7ldsckqw54fm2n19i5333j7f10yr"; + libraryHaskellDepends = [ + base + base-compat + ghc-prim + ]; + testHaskellDepends = [ + base + hspec + QuickCheck + ]; + testToolDepends = [ hspec-discover ]; + description = "base-compat with extra batteries"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + } + ) { }; + base-compat-constptr = callPackage ( { mkDerivation, base }: mkDerivation { @@ -97933,19 +98242,15 @@ self: { { mkDerivation, base, - ghc-prim, hspec, hspec-discover, QuickCheck, }: mkDerivation { pname = "base-orphans"; - version = "0.9.3"; - sha256 = "1n5bpwzgw8xg00p23prajw0bj08kxh2ri3821ib1943ir1wm18qp"; - libraryHaskellDepends = [ - base - ghc-prim - ]; + version = "0.9.4"; + sha256 = "0ay7ai4xswlvk4i74gixb7r3gqryd6pk2p9aig97n3rm64x2ik08"; + libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec @@ -98002,8 +98307,8 @@ self: { pname = "base16"; version = "1.0"; sha256 = "1plwc4yrkvd5j6y09fjvyzhr05mzhzwz6z41fyb60y0bj5j66dl6"; - revision = "3"; - editedCabalFile = "16c3jahmfzbb7i8grimxkb38ygga27vaz3zvc6jmc63sg514p1ln"; + revision = "4"; + editedCabalFile = "0xvk439dhk1znz3zc0127rqs09p7bqbp5pal77hcvwk8h4i43lsd"; libraryHaskellDepends = [ base bytestring @@ -102887,8 +103192,8 @@ self: { pname = "bhoogle"; version = "0.1.4.4"; sha256 = "1z19h0jgnipj16rqbrflcjnqaslafq9bvwkyg8q0il76q7s4wyxa"; - revision = "5"; - editedCabalFile = "1ffiijfyb0k8mm5jiygvai1kgshnn53zagy2cdv3i4nvi88jsn3v"; + revision = "6"; + editedCabalFile = "1k302sip83cq06b82hv7sxy4vv2wjap8f07rqg7nnswl40gwkv8r"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -103229,23 +103534,14 @@ self: { ) { }; bifunctor-classes-compat = callPackage ( - { - mkDerivation, - base, - base-orphans, - tagged, - transformers, - }: + { mkDerivation, base }: mkDerivation { pname = "bifunctor-classes-compat"; - version = "0.1"; - sha256 = "0by738hg600sf5dcbjsn9flpqn3bgam72036znxbml17rcw6xj9p"; - libraryHaskellDepends = [ - base - base-orphans - tagged - transformers - ]; + version = "0.1.1"; + sha256 = "16lvakpv50xq3xfmmsksg3ldl1kgh59wgnv1qq27dmflic5hx373"; + revision = "1"; + editedCabalFile = "126417ws739lxmlqrwzmz50701qwslccwmbwh6dll75arapyyhib"; + libraryHaskellDepends = [ base ]; doHaddock = false; description = "Compatibility package for the Bifunctor, Bifoldable, and Bitraversable classes"; license = lib.licenses.bsd3; @@ -103265,15 +103561,13 @@ self: { tagged, template-haskell, th-abstraction, - transformers, - transformers-compat, }: mkDerivation { pname = "bifunctors"; - version = "5.6.2"; - sha256 = "0yk9v71xpwnxd6xia1bdr8pxbvrx4am6bjykqp1d1vk1a0lak1hh"; - revision = "2"; - editedCabalFile = "1ll0i0pjrmswpps64l1h6k83j7z2f4rxvr7r6iwb1axa9qf64nhi"; + version = "5.6.3"; + sha256 = "0p0iv1akpmxv4dhsn2sagdlzv9063hzxfh2ha067hk1g09zkaymd"; + revision = "1"; + editedCabalFile = "0vj6crkqj6nf57bvzdb9795kaabbk2ha3b4fciqdvn8ynxnxdwaq"; libraryHaskellDepends = [ assoc base @@ -103282,15 +103576,11 @@ self: { tagged template-haskell th-abstraction - transformers ]; testHaskellDepends = [ base hspec QuickCheck - template-haskell - transformers - transformers-compat ]; testToolDepends = [ hspec-discover ]; description = "Bifunctors"; @@ -105721,6 +106011,8 @@ self: { librarySystemDepends = [ gpgme ]; description = "Project bindings-* raw interface to gpgme"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { inherit (pkgs) gpgme; }; @@ -107658,7 +107950,6 @@ self: { ]; description = "A small tool that clears cookies (and more)"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; mainProgram = "bisc"; } ) { }; @@ -110531,16 +110822,13 @@ self: { colour, containers, data-default-class, - fail, http-types, kansas-comet, mime-types, scotty, - semigroups, stm, text, text-show, - transformers, vector, wai, wai-extra, @@ -110548,10 +110836,10 @@ self: { }: mkDerivation { pname = "blank-canvas"; - version = "0.7.4"; - sha256 = "1qm0ms3jk8m5zv81lh3pn5n04afyq7bpn9lc137ddmm9blnkzndi"; - revision = "7"; - editedCabalFile = "06knam8p11j08cgxjrnfysrbzgp8fabh651xna0ygpfffylbj9qc"; + version = "0.7.5"; + sha256 = "0i3qkhfc0dqm0dn2n9f3f54i6wfayrg2n4ijnh0cv3jzyci2sp5x"; + revision = "1"; + editedCabalFile = "03ivkf7gb6nk8i178lg77ydcmfahiywc6lw50ya8ky59vzvsqayp"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson @@ -110562,16 +110850,13 @@ self: { colour containers data-default-class - fail http-types kansas-comet mime-types scotty - semigroups stm text text-show - transformers vector wai wai-extra @@ -112952,12 +113237,12 @@ self: { } ) { }; - bluefin_0_2_4_0 = callPackage ( + bluefin_0_2_6_0 = callPackage ( { mkDerivation, bluefin-internal }: mkDerivation { pname = "bluefin"; - version = "0.2.4.0"; - sha256 = "0m2byj3cb9d32kr6qyvyf2pbwwm0wznncjysyd2p803apf1kv5ga"; + version = "0.2.6.0"; + sha256 = "0fdlj319kny23giacwha56xb3z482hjybpjjrqfsv1aqwzvaw4si"; libraryHaskellDepends = [ bluefin-internal ]; description = "The Bluefin effect system"; license = lib.licensesSpdx."MIT"; @@ -113052,7 +113337,7 @@ self: { } ) { }; - bluefin-internal_0_3_2_0 = callPackage ( + bluefin-internal_0_3_4_0 = callPackage ( { mkDerivation, async, @@ -113064,8 +113349,8 @@ self: { }: mkDerivation { pname = "bluefin-internal"; - version = "0.3.2.0"; - sha256 = "05v4q9khr429z263i3h4kppcfhi3cfsl5lr6v4ib5fzg8xjyv20j"; + version = "0.3.4.0"; + sha256 = "0cg8d3rhy23rwn14p8j6cz1xjfsal1j6ij05h3kw2bla7alcjig0"; libraryHaskellDepends = [ async base @@ -113092,6 +113377,8 @@ self: { pname = "bluefin-random"; version = "0.2.0.0"; sha256 = "1kvhcz84gdpv0x4jmqi75i2l85kfkmsyp8vqpl39hgxwy1d8fmyf"; + revision = "1"; + editedCabalFile = "185pbhxr5kpm4jqr8j8fxv6ifigv7038xy474dy3dak08b9ijnh3"; libraryHaskellDepends = [ base bluefin @@ -115339,16 +115626,12 @@ self: { mkDerivation, base, botan, - bytestring, }: mkDerivation { pname = "botan-bindings"; - version = "0.1.0.0"; - sha256 = "1lajqsnf6v03qh3xnksbxh2h2sz4hkrvqw2jy94swyy8abd8qbqs"; - libraryHaskellDepends = [ - base - bytestring - ]; + version = "0.2.0.0"; + sha256 = "13wh1m0znwj8waz2m9indwlrmg53a9ibb0pz72aig8vbnpgwrsdc"; + libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ botan ]; description = "Raw Botan bindings"; license = lib.licensesSpdx."BSD-3-Clause"; @@ -115359,20 +115642,24 @@ self: { botan-low = callPackage ( { mkDerivation, + async, base, botan-bindings, bytestring, - crypton, + containers, deepseq, hspec, QuickCheck, - tasty-bench, + tasty, + tasty-hspec, + tasty-hunit, + tasty-quickcheck, text, }: mkDerivation { pname = "botan-low"; - version = "0.0.2.0"; - sha256 = "16sha2cd03n7g3lykvcsfmxadyv3iyq9898sv9xjvcndfii3wg25"; + version = "0.1.0.0"; + sha256 = "0qvy7md3k4mql3zbjbfni8ff7maq93br17p66d7av0av6lggp6im"; libraryHaskellDepends = [ base botan-bindings @@ -115381,18 +115668,18 @@ self: { text ]; testHaskellDepends = [ + async base botan-bindings bytestring + containers hspec QuickCheck - ]; - benchmarkHaskellDepends = [ - base - botan-bindings - bytestring - crypton - tasty-bench + tasty + tasty-hspec + tasty-hunit + tasty-quickcheck + text ]; description = "Low-level Botan bindings"; license = lib.licensesSpdx."BSD-3-Clause"; @@ -115883,7 +116170,6 @@ self: { containers, contravariant, dlist, - doctest-parallel, exceptions, kan-extensions, mtl, @@ -115895,8 +116181,8 @@ self: { }: mkDerivation { pname = "box"; - version = "0.9.3.3"; - sha256 = "1gn8hrq6f32jp91ckbz1bizhbpbm2a2wkh1id6ngdhdfxs7zx3di"; + version = "0.9.4.0"; + sha256 = "1r6zdqy8gci5cmszncsc7rl4yc3g12rq0sqsxl0mcxqrdpip08sm"; libraryHaskellDepends = [ async base @@ -115913,10 +116199,6 @@ self: { text time ]; - testHaskellDepends = [ - base - doctest-parallel - ]; description = "A profunctor effect system?"; license = lib.licensesSpdx."BSD-3-Clause"; } @@ -115956,7 +116238,6 @@ self: { base, box, bytestring, - doctest-parallel, network-simple, optparse-applicative, profunctors, @@ -115965,8 +116246,8 @@ self: { }: mkDerivation { pname = "box-socket"; - version = "0.5.2.1"; - sha256 = "0g2mw17s88z84268rdnv8jxpdrn9ix4bjk1bwc4w0krf7q750i75"; + version = "0.5.3.0"; + sha256 = "1389yip3az2ihfqxfkrhsxa1ah1lzk38f9sgig5r5ywqciigq3si"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115983,10 +116264,6 @@ self: { base optparse-applicative ]; - testHaskellDepends = [ - base - doctest-parallel - ]; description = "Box websockets"; license = lib.licensesSpdx."BSD-3-Clause"; mainProgram = "box-socket"; @@ -116442,8 +116719,8 @@ self: { }: mkDerivation { pname = "breakpoint"; - version = "0.1.5.0"; - sha256 = "1x70c0m111557r947zcdgcrfsbnm0j4dzw3b885pxvfz7i58pysc"; + version = "0.1.5.1"; + sha256 = "0bwrcdz8wk72r8mm96jwyffxmpc0dnxb3d6959pfw6pspvk1mkn2"; libraryHaskellDepends = [ ansi-terminal base @@ -116677,6 +116954,8 @@ self: { pname = "brick"; version = "2.10"; sha256 = "08byr2w0697bdlnpycnb73f33v2as6sy7q9w9r8a2nhilv49yhmq"; + revision = "1"; + editedCabalFile = "0676jxx939xwhaqzf8zjz9vdl5jsx2zqvpclg34b3435n142hy2d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116932,8 +117211,8 @@ self: { }: mkDerivation { pname = "brick-panes"; - version = "1.0.2.0"; - sha256 = "1rdkwvsmm0dyzinvvc4z933vdz7hj9kz7zvbmnmmlpffbal1avjf"; + version = "1.0.3.0"; + sha256 = "1k7jpvs641b4f6rhkw8j0g045xzrwn3r12qvirk227j84z83raic"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116960,9 +117239,7 @@ self: { testHaskellDepends = [ base ]; description = "Panes library for Brick providing composition and isolation for TUI apps"; license = lib.licensesSpdx."ISC"; - hydraPlatforms = lib.platforms.none; mainProgram = "mywork-example"; - broken = true; } ) { }; @@ -120311,8 +120588,8 @@ self: { }: mkDerivation { pname = "burrito"; - version = "2.0.1.14"; - sha256 = "1mywmf72rsj5p6mrg3454wsihlh1b26x4acb2gp0awx4bg96j09i"; + version = "2.0.1.16"; + sha256 = "13ls840xvpnnwnkm3cczvxps7nray98mlqv79wb1dibyv7m7nklz"; libraryHaskellDepends = [ base bytestring @@ -120993,6 +121270,51 @@ self: { } ) { }; + bv-sized_1_0_7 = callPackage ( + { + mkDerivation, + base, + bitwise, + bytestring, + deepseq, + hedgehog, + MonadRandom, + panic, + parameterized-utils, + random, + tasty, + tasty-hedgehog, + th-lift, + }: + mkDerivation { + pname = "bv-sized"; + version = "1.0.7"; + sha256 = "1hs83r58hxpchacrhhgvzkkx4vk50vz93njx6i1c93d14yaalysn"; + libraryHaskellDepends = [ + base + bitwise + bytestring + deepseq + panic + parameterized-utils + random + th-lift + ]; + testHaskellDepends = [ + base + bytestring + hedgehog + MonadRandom + parameterized-utils + tasty + tasty-hedgehog + ]; + description = "a bitvector datatype that is parameterized by the vector width"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + bv-sized-lens = callPackage ( { mkDerivation, @@ -121602,14 +121924,11 @@ self: { transformers, transformers-compat, unordered-containers, - void, }: mkDerivation { pname = "bytes"; - version = "0.17.4"; - sha256 = "14x3wnjg7ik1kh3vy9ahfal0hl86v8z3kj1h152364mf94j9macc"; - revision = "1"; - editedCabalFile = "0jhzp9ihka03fsgnjhhj3864p3zq500xqm2whjyvin3580wigc97"; + version = "0.17.5"; + sha256 = "0j5m8rijvmkzj3jjqj3maj3lrlwcw3n3mm6l3012vw5r0d8302qh"; libraryHaskellDepends = [ base binary @@ -121624,7 +121943,6 @@ self: { transformers transformers-compat unordered-containers - void ]; description = "Sharing code for serialization between binary and cereal"; license = lib.licenses.bsd3; @@ -123985,8 +124303,8 @@ self: { }: mkDerivation { pname = "cabal-appimage"; - version = "0.4.2.0"; - sha256 = "0vaxrp127anayn9zyk1icrzrq975f773fysn20ql1zs6msbwd9ca"; + version = "0.4.3.0"; + sha256 = "0j0r0px234b05k34b9p6mhjdgflgfyay0919d7j8sz78k1lrxpr1"; libraryHaskellDepends = [ base Cabal @@ -124590,7 +124908,7 @@ self: { } ) { }; - cabal-debian_5_4_1 = callPackage ( + cabal-debian_5_4_4 = callPackage ( { mkDerivation, base, @@ -124622,8 +124940,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "5.4.1"; - sha256 = "16c3jj9hcda9lhnyp6qp49f8w2rhakxiy4gr5jz5d9x8w2izrc9v"; + version = "5.4.4"; + sha256 = "1q1wfq0m00b7hz9csncnbp176x8d901fk43hsziqjv3jdx99na0q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -124825,6 +125143,8 @@ self: { pname = "cabal-doctest"; version = "1.0.12"; sha256 = "0b4vlfdcazlyaklcqv2w94bh6xipjpfdffzp6w36bzj5639g049i"; + revision = "1"; + editedCabalFile = "0nlk23g4y7ypsrynsmmr5h6j38nskm5y7pc32drnwil6ml9dzlq7"; libraryHaskellDepends = [ base Cabal @@ -125245,8 +125565,8 @@ self: { }: mkDerivation { pname = "cabal-gild"; - version = "1.6.0.2"; - sha256 = "166ijl0lixglqpmif2934frdcxz8x6xp1ihfbi1j338mw6l212q2"; + version = "1.6.0.4"; + sha256 = "1ph40qnhwypdhgki9sxrwidaw5j7asg1gszir5myhpbpm7ygawcp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125282,6 +125602,64 @@ self: { } ) { }; + cabal-gild_1_7_0_1 = callPackage ( + { + mkDerivation, + base, + bytestring, + Cabal-syntax, + containers, + directory, + exceptions, + filepath, + filepattern, + hspec, + parsec, + pretty, + temporary, + text, + transformers, + }: + mkDerivation { + pname = "cabal-gild"; + version = "1.7.0.1"; + sha256 = "1r7bzwfacvjwvsdp1gbh91nrwsc7wlxd7kcnsmhxwkdc25m61yrp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + bytestring + Cabal-syntax + containers + exceptions + filepath + filepattern + parsec + pretty + text + transformers + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base + bytestring + containers + directory + exceptions + filepath + filepattern + hspec + temporary + transformers + ]; + description = "Formats package descriptions"; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + mainProgram = "cabal-gild"; + maintainers = [ lib.maintainers.turion ]; + } + ) { }; + cabal-graphdeps = callPackage ( { mkDerivation, @@ -125437,10 +125815,8 @@ self: { }: mkDerivation { pname = "cabal-hoogle"; - version = "3.10.0.0"; - sha256 = "0plvb2xg112brxq3ribwhpq8wfmdr43bn8yfcazvy86d6h2bgyyn"; - revision = "1"; - editedCabalFile = "0hkknwh6cbd61hxvariphrkyr9n3lgw3qzdq82gk1w0rqj14yhd4"; + version = "3.16.0.0"; + sha256 = "0bx1vqgpg5df6j7p78cals9xhn21wb8ygj7r7iy0p7r041rjisvr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125473,9 +125849,7 @@ self: { testToolDepends = [ tasty-discover ]; description = "generate hoogle database for cabal project and dependencies"; license = lib.licensesSpdx."BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; mainProgram = "cabal-hoogle"; - broken = true; } ) { }; @@ -125575,10 +125949,10 @@ self: { }: mkDerivation { pname = "cabal-install"; - version = "3.16.0.0"; - sha256 = "06jndk7xcm837rsy4y9nhy8a0162ckravh8dlnif1vmywfgljai8"; - revision = "3"; - editedCabalFile = "0vcpy83jjfrqbr9z6nmgid2ci5h9gqmfy8zq1yrpxh1iif4gjy7w"; + version = "3.16.1.0"; + sha256 = "082ix6d443yqyirsjimzj5lg3znqlb06mfkvd9436fczk0ibq9wx"; + revision = "1"; + editedCabalFile = "0kz3b3yp3xzpbpl149kdy5d1nhhlfnlppmvvsm3r2sfbr95q2jd6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126014,8 +126388,10 @@ self: { }: mkDerivation { pname = "cabal-install-solver"; - version = "3.16.0.0"; - sha256 = "0jp4iipc7j05hwvxpw4xiiv1rjaadc8c5a1jhqggr9q8l9pkvaw1"; + version = "3.16.1.0"; + sha256 = "0a546gpwi8j9ijzqfgm15pajs1myrs6h94bfypgrjygajig2pz5d"; + revision = "1"; + editedCabalFile = "0s003vpqfchy967zwgp51q3vczhmldaa10bkckch4dfpyb5qjbw8"; libraryHaskellDepends = [ array base @@ -126327,16 +126703,18 @@ self: { mkDerivation, base, Cabal, + containers, lens, process, }: mkDerivation { pname = "cabal-pkg-config-version-hook"; - version = "0.1.0.1"; - sha256 = "1r02b2gbj9ph85pkz6l0hs7r85zvvbawnh27hnxmdl2j9z29kzqi"; + version = "0.1.1.0"; + sha256 = "18l87dcq2854vqchg21bvv85sdm4126nbk8sj9ilr5819qslk26f"; libraryHaskellDepends = [ base Cabal + containers lens process ]; @@ -126810,8 +127188,8 @@ self: { pname = "cabal-sort"; version = "0.1.2.2"; sha256 = "1gyx5d485mzya147d7gwh0i9bkvdqxixrb80bfv5sn710p07bfdz"; - revision = "1"; - editedCabalFile = "0hlz8y734rgcqjlncv0bwi05m30iviz6bi9bsafvsv1w25lxlpc4"; + revision = "2"; + editedCabalFile = "0bzx8s7a5vl271dz0kkzdn6l5jkwwgch9r5k396ymbmj6s07dlgl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -128173,8 +128551,8 @@ self: { }: mkDerivation { pname = "cachix"; - version = "1.9.2"; - sha256 = "0yzc90i9sv9np6q7fhkmbcyy67a7irsgdd9b072r1rgr5afn773q"; + version = "1.10.0"; + sha256 = "1q2cbi8sfld1rjx7m4mlb064xvmrydr4sfglrw5sjvs9zj8ladjk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128337,8 +128715,8 @@ self: { }: mkDerivation { pname = "cachix-api"; - version = "1.9.2"; - sha256 = "07bnnkh2b9ryhi8adwa9i9nh17qhmfknxn3l84lld2ry43hnwkww"; + version = "1.10.0"; + sha256 = "1zw2l23phxm292zl6xjppdv1mx1skk0zhif9rchcghk82m0rz0d4"; libraryHaskellDepends = [ aeson async @@ -128706,8 +129084,8 @@ self: { }: mkDerivation { pname = "cairo-image"; - version = "0.1.0.5"; - sha256 = "13k7s3lpcb6mcc7ndyp139zr4xglfvhvx6d5ji2dxgk0s0nkj899"; + version = "0.1.0.6"; + sha256 = "0jbq4qsa3cfydc0xcdi5xv1ssf0hlrq0yxg3xgx7sld8aqbi8r62"; libraryHaskellDepends = [ base c-enum @@ -131323,8 +131701,8 @@ self: { }: mkDerivation { pname = "cardano-addresses"; - version = "4.0.1"; - sha256 = "0s9m54v5rfy1h0d75a59v6lqaqi2j827wh29x2xk83i3kks2arv2"; + version = "4.0.2"; + sha256 = "0a9dr7bs5d0g0w5744mgnyrf2x44n1kxzb16lsn2yjf025fqq848"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134261,6 +134639,54 @@ self: { } ) { }; + cbf = callPackage ( + { + mkDerivation, + attoparsec, + base, + binary, + bytestring, + tasty, + tasty-hunit, + text, + vector, + }: + mkDerivation { + pname = "cbf"; + version = "0.1.0.0"; + sha256 = "1ajm5kgxr20z0w94np0krhg2lvk9y359nqw2h5xn2zcghidhk79r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec + base + binary + bytestring + text + vector + ]; + executableHaskellDepends = [ + base + binary + bytestring + vector + ]; + testHaskellDepends = [ + base + binary + bytestring + tasty + tasty-hunit + vector + ]; + description = "Bindings to read Crystallographic Binary Files (mostly from detectors)"; + license = lib.licensesSpdx."GPL-3.0-or-later"; + hydraPlatforms = lib.platforms.none; + mainProgram = "cbf-bench-binary"; + broken = true; + } + ) { }; + cblrepo = callPackage ( { mkDerivation, @@ -137356,7 +137782,6 @@ self: { Color, containers, cubicbezier, - doctest-parallel, flatparse, formatn, harpie, @@ -137367,14 +137792,13 @@ self: { numhask-space, optics-core, random, - string-interpolate, text, time, }: mkDerivation { pname = "chart-svg"; - version = "0.8.2.1"; - sha256 = "0nxg8ggd7nslr585sag2zzgal6scs66sf5v42hrpjdslkqks85sl"; + version = "0.8.3.2"; + sha256 = "10lq0dqn0xdhk0wsx0v2lmakq733p0qg5gd4wwivyk989fbxmlgq"; libraryHaskellDepends = [ base bytestring @@ -137391,14 +137815,9 @@ self: { numhask-space optics-core random - string-interpolate text time ]; - testHaskellDepends = [ - base - doctest-parallel - ]; description = "Charting library targetting SVGs"; license = lib.licensesSpdx."BSD-3-Clause"; } @@ -140456,6 +140875,7 @@ self: { hspec-discover, monad-parallel, mtl, + optparse-applicative, prettyprinter, prettyprinter-ansi-terminal, QuickCheck, @@ -140465,8 +140885,8 @@ self: { }: mkDerivation { pname = "cimple"; - version = "0.0.27"; - sha256 = "08ig9617cr0s9kxl81rlhyi1kv5kycninfpk8w56zspf2dqhnjja"; + version = "0.0.30"; + sha256 = "1x7dkkjiays4yc7j4bi35qgcn44gzanxzcrfrf517jwnykishyc0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140483,6 +140903,7 @@ self: { mtl prettyprinter prettyprinter-ansi-terminal + QuickCheck split text transformers-compat @@ -140495,13 +140916,16 @@ self: { base bytestring groom + optparse-applicative text ]; testHaskellDepends = [ base + containers data-fix extra hspec + mtl prettyprinter prettyprinter-ansi-terminal QuickCheck @@ -142193,6 +142617,56 @@ self: { } ) { }; + claims-x12-dsl = callPackage ( + { + mkDerivation, + base, + containers, + Decimal, + hspec, + parsec, + QuickCheck, + text, + time, + }: + mkDerivation { + pname = "claims-x12-dsl"; + version = "0.1.0.0"; + sha256 = "1fyh2j1k52bp6wmm74bh88bc9g5086phd1bmvrn8rbchz8n559hp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + containers + Decimal + parsec + text + time + ]; + executableHaskellDepends = [ + base + containers + Decimal + parsec + text + time + ]; + testHaskellDepends = [ + base + containers + Decimal + hspec + parsec + QuickCheck + text + time + ]; + description = "Type-safe DSL for healthcare claims validation and X12 processing"; + license = lib.licensesSpdx."BSD-3-Clause"; + mainProgram = "claims-x12-dsl-exe"; + } + ) { }; + clang-compilation-database = callPackage ( { mkDerivation, @@ -142498,6 +142972,8 @@ self: { pname = "clash-ghc"; version = "1.8.4"; sha256 = "1dgmqy5nm8fn55lmgd05akpkal46cydvbk0w6ian2z3979q4w4gb"; + revision = "1"; + editedCabalFile = "0pq4j5v7z94mr2v5gnivmcm03jr3z7xg16cz0hjqkrk2z2awrr2s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142845,8 +143321,8 @@ self: { pname = "clash-prelude"; version = "1.8.4"; sha256 = "0vc9vcqbh0i8xkm833nwxfmwxi47kzcajrh8nywymal2nsid1gby"; - revision = "1"; - editedCabalFile = "0jxnnzxkv1s43r4bpf8pxa2br9g5silf3a0rsni53wiiky3pc31i"; + revision = "2"; + editedCabalFile = "0y3czgr1rvnbrnh8y15wga0qpjbh8dih55qq376x6qm8pij9a78q"; libraryHaskellDepends = [ array arrows @@ -143785,6 +144261,8 @@ self: { pname = "clay"; version = "0.16.1"; sha256 = "1zfbicn8mh48a3j4ms97v0ah7gmph0nb927ilcb37ghr1qzm054b"; + revision = "1"; + editedCabalFile = "059j6v4wl7mh5ib6dk6qmw16z8wgziwi7vqmshc55fc35fqb8ac3"; libraryHaskellDepends = [ base mtl @@ -148388,8 +148866,8 @@ self: { }: mkDerivation { pname = "co-log-core"; - version = "0.3.2.5"; - sha256 = "0nizwa5z13ydhqc0vvpzpb8cwdqqdsgpv45v0k6929m0yxhrwp7r"; + version = "0.3.2.6"; + sha256 = "04y26fzj1n4nfn0cbl863bdcf2iv4gcgwins278n3f309ljyjmv4"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base @@ -151448,8 +151926,8 @@ self: { pname = "colourista"; version = "0.1.0.2"; sha256 = "0g06116kjg9pbp0l7n33agqbks3kw5z4rjqyhylha8miah5sxbwn"; - revision = "6"; - editedCabalFile = "1vdz4msdl6plsshf4h61wlv231yyv6hjw3h4sgnasqnsav19dd5z"; + revision = "7"; + editedCabalFile = "1s085zx8p5nklxcky2j5hmj7qqqyx9ajbv9q7r0rhjaylmgrbdg1"; libraryHaskellDepends = [ ansi-terminal base @@ -152105,8 +152583,8 @@ self: { pname = "comfort-array"; version = "0.5.5"; sha256 = "0jyhlxm64di682i2hwf1f1mw6f7xjwhb1ihnp8dh9vsg93hwik5i"; - revision = "1"; - editedCabalFile = "123q7i0zv3cl2218dkb9xcccf7j5kpw0awhgrj05gjhancfcdzcr"; + revision = "2"; + editedCabalFile = "1bwgcf8h114f8d0ppmkr92s1gp1iy2vvdwjkmjiyz71ab627ibjh"; libraryHaskellDepends = [ base bifunctors @@ -153141,14 +153619,11 @@ self: { indexed-traversable, tagged, transformers, - transformers-compat, }: mkDerivation { pname = "comonad"; - version = "5.0.9"; - sha256 = "12d7g3c2x1jb6jlmdgwdmi840z3p91b0l7fkfsdml1c0kas0xyv9"; - revision = "1"; - editedCabalFile = "0ly3cy3p99zvizspassk0wjnw9bz0spc11s69s790g2qpxwyvbbm"; + version = "5.0.10"; + sha256 = "1hgrjgwynnzhyznl82gfkj3w0ddzwfyp7sm4ca09ai2rpzr9swz9"; libraryHaskellDepends = [ base containers @@ -153156,7 +153631,6 @@ self: { indexed-traversable tagged transformers - transformers-compat ]; description = "Comonads"; license = lib.licenses.bsd3; @@ -159373,8 +159847,8 @@ self: { pname = "config-schema"; version = "1.3.0.0"; sha256 = "1j5br9y4s51ajxyg4aldibywqhf4qrxhrypac8jgca2irxdwb29w"; - revision = "6"; - editedCabalFile = "19wmiw8scjh5bc9id5s54hkws2k87y0iwvj49vlb3m4vmlchyy32"; + revision = "7"; + editedCabalFile = "19yg0k7cixxfhwxfdyy6js7rgfiy8ag8n8n3wlbkcsacl3r4jwca"; libraryHaskellDepends = [ base config-value @@ -159440,8 +159914,8 @@ self: { pname = "config-value"; version = "0.8.3"; sha256 = "0pkcwxg91wali7986k03d7q940hb078hlsxfknqhkp2spr3d1f3w"; - revision = "9"; - editedCabalFile = "082fxqjf40fn14m6w5j0pq21qbl89l6yflxpy9wcna2nmv9rc3sk"; + revision = "11"; + editedCabalFile = "1k26bmynzplq2nx9f50ch39hli6xk1qshva8fjml3cxixswklaz4"; libraryHaskellDepends = [ array base @@ -160868,7 +161342,6 @@ self: { binary, boring, deepseq, - ghc-prim, hashable, hspec, hspec-discover, @@ -160877,16 +161350,13 @@ self: { }: mkDerivation { pname = "constraints"; - version = "0.14.2"; - sha256 = "1y0rzl41wwkr3gqzf3ymf0mns86qkafamqindvcfq1qqbn09y92g"; - revision = "1"; - editedCabalFile = "1rx81r735ih046j4afgqlbmqlsf3zk2c5d8k9mj3gndasplm66iq"; + version = "0.14.3"; + sha256 = "1c3vsybgzd35rrydza7kjh1m92kb7hhamxfz61zii9imhk2gjjjq"; libraryHaskellDepends = [ base binary boring deepseq - ghc-prim hashable mtl transformers @@ -160901,6 +161371,43 @@ self: { } ) { }; + constraints_0_14_4 = callPackage ( + { + mkDerivation, + base, + binary, + boring, + deepseq, + hashable, + hspec, + hspec-discover, + mtl, + transformers, + }: + mkDerivation { + pname = "constraints"; + version = "0.14.4"; + sha256 = "0fbdpgc8s1km4axqcg8ljr1vzrgl8fzmmy3clymb97n32zi23040"; + libraryHaskellDepends = [ + base + binary + boring + deepseq + hashable + mtl + transformers + ]; + testHaskellDepends = [ + base + hspec + ]; + testToolDepends = [ hspec-discover ]; + description = "Constraint manipulation"; + license = lib.licensesSpdx."BSD-2-Clause"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + constraints-deriving = callPackage ( { mkDerivation, @@ -162305,8 +162812,8 @@ self: { }: mkDerivation { pname = "contravariant"; - version = "1.5.5"; - sha256 = "1ynz89vfn7czxpa203zmdqknkvpylzzl9rlkpasx1anph1jxcbq6"; + version = "1.5.6"; + sha256 = "1qzgwqh7ilwsjws3f1ag4m67jayjk7zlrigzqzrd2pzfah1jdwv5"; libraryHaskellDepends = [ base StateVar @@ -163127,14 +163634,14 @@ self: { base, criterion, hspec, - linear, + ieee754, QuickCheck, template-haskell, }: mkDerivation { pname = "convert-units"; - version = "0"; - sha256 = "1bwivxq8farqzr2wmmnknnnrr8mv46i6kz1akackqvpl4d0n7cnm"; + version = "0.1"; + sha256 = "0qm42khbjaqamrxk4x5adyspdby2qzwnzx3sv7a6xijzyrbjv0w0"; libraryHaskellDepends = [ base template-haskell @@ -163142,7 +163649,7 @@ self: { testHaskellDepends = [ base hspec - linear + ieee754 QuickCheck template-haskell ]; @@ -163151,7 +163658,7 @@ self: { criterion template-haskell ]; - description = "Arithmetic and type checked conversions between units"; + description = "Statically typed unit conversions"; license = lib.licensesSpdx."BSD-3-Clause"; } ) { }; @@ -163589,7 +164096,7 @@ self: { } ) { }; - copilot_4_6 = callPackage ( + copilot_4_6_1 = callPackage ( { mkDerivation, base, @@ -163605,8 +164112,8 @@ self: { }: mkDerivation { pname = "copilot"; - version = "4.6"; - sha256 = "11m838rfnqg11ldbj5byvql0sf8bpy2piay2fm610rkqqmilqfmf"; + version = "4.6.1"; + sha256 = "12sxdyv0vc9z8qz3vqghk2km3fzkhyqqizpgl3mrndcgz584y3h5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163633,48 +164140,26 @@ self: { base, copilot-core, directory, - extra, filepath, - HUnit, + fp-ieee, ieee754, language-bluespec, pretty, - process, - QuickCheck, - random, - test-framework, - test-framework-hunit, - test-framework-quickcheck2, - unix, }: mkDerivation { pname = "copilot-bluespec"; - version = "4.6"; - sha256 = "0g28nxpqdrwabmpq4c68r826mlfcvxknlwzdnjxmdf56akiywjij"; + version = "4.6.1"; + sha256 = "1krfc6zhdj728x0v3xm9b69h16ci8hsqqhhnrqjsl9p2w0hvlli7"; libraryHaskellDepends = [ base copilot-core directory filepath + fp-ieee + ieee754 language-bluespec pretty ]; - testHaskellDepends = [ - base - copilot-core - directory - extra - HUnit - ieee754 - pretty - process - QuickCheck - random - test-framework - test-framework-hunit - test-framework-quickcheck2 - unix - ]; description = "A compiler for Copilot targeting FPGAs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -163735,7 +164220,7 @@ self: { } ) { }; - copilot-c99_4_6 = callPackage ( + copilot-c99_4_6_1 = callPackage ( { mkDerivation, base, @@ -163757,8 +164242,8 @@ self: { }: mkDerivation { pname = "copilot-c99"; - version = "4.6"; - sha256 = "11g890ximcm5i6ds3fpx4hqzqps055ng7mmcp8cgi6p9s7shx8hj"; + version = "4.6.1"; + sha256 = "109854rkpgd5b5j2mdgj3vvmrksbprsv6gbcgp0my455r7sxhh0g"; libraryHaskellDepends = [ base copilot-core @@ -163849,7 +164334,7 @@ self: { } ) { }; - copilot-core_4_6 = callPackage ( + copilot-core_4_6_1 = callPackage ( { mkDerivation, base, @@ -163861,8 +164346,8 @@ self: { }: mkDerivation { pname = "copilot-core"; - version = "4.6"; - sha256 = "0831qjcvs6d7zc1xw8snn65b2lhvxia44s6j8z196lj8sf82wkpc"; + version = "4.6.1"; + sha256 = "1jhrck3rw1y20c7xzzgnvr2x7dzqgs7qhysv24pa5d5mnylpa3py"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base @@ -163949,7 +164434,7 @@ self: { } ) { }; - copilot-interpreter_4_6 = callPackage ( + copilot-interpreter_4_6_1 = callPackage ( { mkDerivation, base, @@ -163962,8 +164447,8 @@ self: { }: mkDerivation { pname = "copilot-interpreter"; - version = "4.6"; - sha256 = "1vpjrrv6z7mssqxswyr9aqrc0gf580gfyhfp87xxvrpmay8jchb4"; + version = "4.6.1"; + sha256 = "1lb27k01vnlwk683w8svxf7axzd4c0ar82p6f0nr2si3w5ypb7fb"; libraryHaskellDepends = [ base copilot-core @@ -164032,7 +164517,7 @@ self: { } ) { }; - copilot-language_4_6 = callPackage ( + copilot-language_4_6_1 = callPackage ( { mkDerivation, array, @@ -164052,8 +164537,8 @@ self: { }: mkDerivation { pname = "copilot-language"; - version = "4.6"; - sha256 = "01llv51lyagq2kgi2kfspi7gb6rix9zxhppy3avww0av08a6a6li"; + version = "4.6.1"; + sha256 = "0yr9cz9y0dpf1cqw6bbg3lx956nv22hfdnh3diqpg3yzcv84n1lx"; libraryHaskellDepends = [ array base @@ -164120,7 +164605,7 @@ self: { } ) { }; - copilot-libraries_4_6 = callPackage ( + copilot-libraries_4_6_1 = callPackage ( { mkDerivation, base, @@ -164136,8 +164621,8 @@ self: { }: mkDerivation { pname = "copilot-libraries"; - version = "4.6"; - sha256 = "12mflyq9721p2npjsinbab0icdad6v16z72d4ax29xap3j0ccw4p"; + version = "4.6.1"; + sha256 = "0mcj29cxxpiga9wv5y4mmzrbd1vdxkyzdyi6w8krz2ng4yb67f3a"; libraryHaskellDepends = [ base containers @@ -164181,7 +164666,7 @@ self: { } ) { }; - copilot-prettyprinter_4_6 = callPackage ( + copilot-prettyprinter_4_6_1 = callPackage ( { mkDerivation, base, @@ -164190,8 +164675,8 @@ self: { }: mkDerivation { pname = "copilot-prettyprinter"; - version = "4.6"; - sha256 = "0ng8zdjspgi62lzi3s42h25gf2j3mqn8rssbxrljpb8dmic479sr"; + version = "4.6.1"; + sha256 = "1jjmzrzzy3zqj24cm3hqpcxcnysjv6s6xbs8rqshjjjbrkang0pk"; libraryHaskellDepends = [ base copilot-core @@ -164296,7 +164781,7 @@ self: { } ) { }; - copilot-theorem_4_6 = callPackage ( + copilot-theorem_4_6_1 = callPackage ( { mkDerivation, base, @@ -164324,8 +164809,8 @@ self: { }: mkDerivation { pname = "copilot-theorem"; - version = "4.6"; - sha256 = "0plm8kf69mgq7qr0xv3xvl3ay3b6zdx25my2zdc826wki9iavvr8"; + version = "4.6.1"; + sha256 = "1x4pxhr9psm9bc29hvg100a2hlfy2qj81f1kf2njj08jh4wfs2bl"; libraryHaskellDepends = [ base bimap @@ -164399,8 +164884,8 @@ self: { }: mkDerivation { pname = "copilot-verifier"; - version = "4.6"; - sha256 = "13czl47yisjknvhrpqw56gpvqm2qk547ci369pkin2yhrkqv91ja"; + version = "4.6.1"; + sha256 = "0pm62nammyh2pmlxd3bh42892v0b2mmfn2v1rxpivak8q5xl47fz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -164517,8 +165002,8 @@ self: { }: mkDerivation { pname = "copilot-visualizer"; - version = "4.6"; - sha256 = "18iv2ihcp24im88wvy1aqx3cpiwawrizjr5v0cq8sd8c3hi6g4zk"; + version = "4.6.1"; + sha256 = "17jkl7p46k6bx3jh0dk69hj19yccgfnybcbs3gyqkba40sqjygf7"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -169148,6 +169633,8 @@ self: { pname = "criterion"; version = "1.6.4.1"; sha256 = "03danwzqimrnw39s91pxmya3jrb4wxvx0ijm3qr5mik8axn6z9af"; + revision = "1"; + editedCabalFile = "02sbckvbz107n369crcpb31jq4x6jw4kqvrkh3m03i8wn9bxbkis"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -169865,8 +170352,8 @@ self: { }: mkDerivation { pname = "crucible"; - version = "0.8.0.0"; - sha256 = "0vvgxa0ah2hbnj2dh1iyc9i6wwq9qa01mzc8494wv6nj3hvcbn7y"; + version = "0.9"; + sha256 = "0p6bh7vwb8gjrglb9gq4ksw730cmm4ilk6y7yks8v35s5r5kym9a"; libraryHaskellDepends = [ async base @@ -170018,8 +170505,8 @@ self: { }: mkDerivation { pname = "crucible-llvm"; - version = "0.8.0.0"; - sha256 = "1nj45d75llj2laspiql6wzv54p5lv52x11ya06y0qgqcb0x8k4ai"; + version = "0.9"; + sha256 = "1mbh5mlhk3i65a1nf5lh7f9k3ggfk45hxl02jhw7z56vnap92k2f"; libraryHaskellDepends = [ attoparsec base @@ -170312,8 +170799,8 @@ self: { }: mkDerivation { pname = "crux"; - version = "0.8.0.0"; - sha256 = "09j0syp834xb968cjjjvlvqbyya5kavdd9xg726n064kbqj1kb5r"; + version = "0.9"; + sha256 = "0jr1xryxw584cd254rj5rlgx02cz8pkch2z2889w8mzi14dkb9h6"; libraryHaskellDepends = [ aeson ansi-terminal @@ -170403,8 +170890,8 @@ self: { }: mkDerivation { pname = "crux-llvm"; - version = "0.11.0.0"; - sha256 = "1jhygc1yxw847v9qzrc7a7nvx1q2kvsn2kps8qkvfhcf6g08kscs"; + version = "0.12"; + sha256 = "0mhbk96inp6cnwaj580sy2z96dri372jwzkmlkqg5624abf7sbxs"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -171974,8 +172461,10 @@ self: { }: mkDerivation { pname = "cryptol"; - version = "3.4.0"; - sha256 = "1253c4rkv5i1kyvagyqxn94la0slsp7yvf0v4lkhlz1hzl6mfwsr"; + version = "3.5.0"; + sha256 = "111gzcqzrdmm0wqrrk850rbd2x1z00vxpzjcg0n8vcc3xwkc0hbk"; + revision = "1"; + editedCabalFile = "169lminzlpq2m0mkr76ljf8gjlix1rjf6q7jivria6a44629v1qy"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -172083,7 +172572,6 @@ self: { bytestring, deepseq, gauge, - ghc-prim, integer-gmp, memory, random, @@ -172094,14 +172582,13 @@ self: { }: mkDerivation { pname = "crypton"; - version = "1.0.4"; - sha256 = "06h1qjvqd8gmiyzvh31sc061vcgns101l0774c44a8k44015925l"; + version = "1.0.5"; + sha256 = "111xhadds1nvi6kn87iirf1pb18469zq584b9dzlpx118xb5kwdk"; libraryHaskellDepends = [ base basement bytestring deepseq - ghc-prim integer-gmp memory ]; @@ -172127,6 +172614,57 @@ self: { } ) { }; + crypton_1_0_6 = callPackage ( + { + mkDerivation, + base, + basement, + bytestring, + deepseq, + gauge, + integer-gmp, + memory, + random, + tasty, + tasty-hunit, + tasty-kat, + tasty-quickcheck, + }: + mkDerivation { + pname = "crypton"; + version = "1.0.6"; + sha256 = "1rl25dszzfqahznrn5fd1lgyxca3dcgpl07566kvvw3dykkj6rcw"; + libraryHaskellDepends = [ + base + basement + bytestring + deepseq + integer-gmp + memory + ]; + testHaskellDepends = [ + base + bytestring + memory + tasty + tasty-hunit + tasty-kat + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base + bytestring + deepseq + gauge + memory + random + ]; + description = "Cryptography Primitives sink"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + crypton-asn1-encoding = callPackage ( { mkDerivation, @@ -172304,6 +172842,8 @@ self: { pname = "crypton-connection"; version = "0.4.5"; sha256 = "1pi56aw3yr4zjfvdrcp6q4vwggml040c5m6bdd916zzbjpqbkpdw"; + revision = "1"; + editedCabalFile = "04df18dicgdbqyccfnsbdn5n2q1sr805firlqp8qylhfdgyn27aj"; libraryHaskellDepends = [ base bytestring @@ -172434,6 +172974,57 @@ self: { } ) { }; + crypton-x509_1_8_0 = callPackage ( + { + mkDerivation, + base, + bytestring, + containers, + crypton, + crypton-asn1-encoding, + crypton-asn1-parse, + crypton-asn1-types, + crypton-pem, + memory, + mtl, + tasty, + tasty-quickcheck, + time-hourglass, + transformers, + }: + mkDerivation { + pname = "crypton-x509"; + version = "1.8.0"; + sha256 = "1kf2y6l25k0izvlmcafyi41nx3yx4w5jv82wi6b11shx5k8wds3w"; + libraryHaskellDepends = [ + base + bytestring + containers + crypton + crypton-asn1-encoding + crypton-asn1-parse + crypton-asn1-types + crypton-pem + memory + time-hourglass + transformers + ]; + testHaskellDepends = [ + base + bytestring + crypton + crypton-asn1-types + mtl + tasty + tasty-quickcheck + time-hourglass + ]; + description = "X509 reader and writer"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + crypton-x509-store_1_6_11 = callPackage ( { mkDerivation, @@ -172501,10 +173092,8 @@ self: { }: mkDerivation { pname = "crypton-x509-store"; - version = "1.6.12"; - sha256 = "149wx24blr9b0pd1kaw14zl8li825hfdksyi47x1460zvxdsz86p"; - revision = "1"; - editedCabalFile = "1im0mbnshvp2f5279ca003f6vjna59yfiiphs7xggbk7fxs2iwab"; + version = "1.6.14"; + sha256 = "1d4dipa7by8zj913aag31swikpz4xznkfsq8d0f6ndvsciyvmpk8"; libraryHaskellDepends = [ asn1-encoding asn1-types @@ -172531,6 +173120,55 @@ self: { } ) { }; + crypton-x509-store_1_8_0 = callPackage ( + { + mkDerivation, + base, + bytestring, + containers, + crypton, + crypton-asn1-encoding, + crypton-asn1-types, + crypton-pem, + crypton-x509, + directory, + filepath, + mtl, + tasty, + tasty-hunit, + unix, + }: + mkDerivation { + pname = "crypton-x509-store"; + version = "1.8.0"; + sha256 = "0zps1xr2869syfqxr4jdf7wzby95w1fqk33nada33ws04qqshzd7"; + libraryHaskellDepends = [ + base + bytestring + containers + crypton + crypton-asn1-encoding + crypton-asn1-types + crypton-pem + crypton-x509 + directory + filepath + mtl + unix + ]; + testHaskellDepends = [ + base + bytestring + crypton-x509 + tasty + tasty-hunit + ]; + description = "X.509 collection accessing and storing methods"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + crypton-x509-system = callPackage ( { mkDerivation, @@ -172547,8 +173185,8 @@ self: { }: mkDerivation { pname = "crypton-x509-system"; - version = "1.6.7"; - sha256 = "1jilnr9715njlx1hqvg5lrsrwk12r04maypmh18di0sybwg2cdm4"; + version = "1.6.8"; + sha256 = "13hvl03d0nyx1j6q8yn4wa57mcp662j166yjdzdydzlgf0yi62z8"; libraryHaskellDepends = [ base bytestring @@ -172566,6 +173204,88 @@ self: { } ) { }; + crypton-x509-system_1_8_0 = callPackage ( + { + mkDerivation, + base, + bytestring, + containers, + crypton-pem, + crypton-x509, + crypton-x509-store, + directory, + filepath, + mtl, + process, + }: + mkDerivation { + pname = "crypton-x509-system"; + version = "1.8.0"; + sha256 = "0qv3a1sxblcw5mxn6h2c68qzwf9cdb9m3qqw5n0zm1n27gf26zxw"; + libraryHaskellDepends = [ + base + bytestring + containers + crypton-pem + crypton-x509 + crypton-x509-store + directory + filepath + mtl + process + ]; + description = "Handle per-operating-system X.509 accessors and storage"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + + crypton-x509-util = callPackage ( + { + mkDerivation, + base, + bytestring, + crypton, + crypton-asn1-encoding, + crypton-asn1-types, + crypton-pem, + crypton-x509, + crypton-x509-store, + crypton-x509-system, + crypton-x509-validation, + directory, + memory, + time-hourglass, + }: + mkDerivation { + pname = "crypton-x509-util"; + version = "1.8.0"; + sha256 = "0kxl31z2rdmjjdd4i8ivb5i3sy5hdfj17ln0y339917ql5rcp16j"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base + bytestring + crypton + crypton-asn1-encoding + crypton-asn1-types + crypton-pem + crypton-x509 + crypton-x509-store + crypton-x509-system + crypton-x509-validation + directory + memory + time-hourglass + ]; + description = "Utility for X509 certificate and chain"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "crypton-x509-util"; + broken = true; + } + ) { }; + crypton-x509-validation = callPackage ( { mkDerivation, @@ -172625,6 +173345,66 @@ self: { } ) { }; + crypton-x509-validation_1_8_0 = callPackage ( + { + mkDerivation, + base, + bytestring, + containers, + crypton, + crypton-asn1-encoding, + crypton-asn1-types, + crypton-pem, + crypton-x509, + crypton-x509-store, + data-default, + iproute, + memory, + mtl, + tasty, + tasty-hunit, + time-hourglass, + }: + mkDerivation { + pname = "crypton-x509-validation"; + version = "1.8.0"; + sha256 = "0is9bbz6x002q473r80ddnr0v32h8kdmjk6hgvp5f8wi8iwjrmf3"; + libraryHaskellDepends = [ + base + bytestring + containers + crypton + crypton-asn1-encoding + crypton-asn1-types + crypton-pem + crypton-x509 + crypton-x509-store + data-default + iproute + memory + mtl + time-hourglass + ]; + testHaskellDepends = [ + base + bytestring + crypton + crypton-asn1-encoding + crypton-asn1-types + crypton-x509 + crypton-x509-store + data-default + memory + tasty + tasty-hunit + time-hourglass + ]; + description = "X.509 Certificate and CRL validation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + cryptonite = callPackage ( { mkDerivation, @@ -174571,8 +175351,8 @@ self: { pname = "cue-sheet"; version = "2.0.2"; sha256 = "0n8a5m5qlz8dz03sphj9pybfjfkc0gngpmh56h6idj88frn1z947"; - revision = "4"; - editedCabalFile = "1r2sf31lkmx5s48r7n0lcy2z1r2vkir8chnjcfd5hhjmpcbwrng1"; + revision = "5"; + editedCabalFile = "14pjkxxw0qlwn5srf780dlb8xrln0401z51nik3chh27ghrcn4ky"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base @@ -175280,13 +176060,13 @@ self: { curryer-rpc = callPackage ( { mkDerivation, - asn1-types, async, base, binary, bytestring, containers, criterion, + crypton-asn1-types, crypton-x509, crypton-x509-store, crypton-x509-system, @@ -175311,22 +176091,23 @@ self: { text, time, tls, + unix, uuid, winery, }: mkDerivation { pname = "curryer-rpc"; - version = "0.5.0"; - sha256 = "1ksz7ixgaqhmxwf8kxixf4zm3d4mbrfd8wbpf0dbagv7870q565d"; + version = "0.5.1"; + sha256 = "168b34jf4f9a16fyx4lazmbcbbmkhmq75qy8hz56qgkvvvfgbn37"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - asn1-types async base binary bytestring containers + crypton-asn1-types crypton-x509 crypton-x509-store crypton-x509-system @@ -175345,6 +176126,7 @@ self: { text time tls + unix uuid winery ]; @@ -177029,6 +177811,29 @@ self: { } ) { }; + dani-optics-dot = callPackage ( + { + mkDerivation, + base, + optics-core, + }: + mkDerivation { + pname = "dani-optics-dot"; + version = "0.2.0.0"; + sha256 = "0d6y1v8603nq549618cabx84mvbjbdf2hgicrql8afic8p5j9yz2"; + libraryHaskellDepends = [ + base + optics-core + ]; + testHaskellDepends = [ + base + optics-core + ]; + description = "Use OverloadedRecordDot for nested optics access"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + dani-servant-lucid2 = callPackage ( { mkDerivation, @@ -177070,7 +177875,6 @@ self: { base16-bytestring, bytestring, directory, - HUnit, sqlite, tasty, tasty-hunit, @@ -177079,8 +177883,8 @@ self: { }: mkDerivation { pname = "dani-sqlite"; - version = "0.1.0.0"; - sha256 = "04md1gf6s09xw2jbwx5nkn7vx9j9z9807bc8g5iy9gnjfxjx8s33"; + version = "0.1.1.0"; + sha256 = "0pmmh7n90z7qql6r0iymbn01qlhjr5n4v59kvfwml222jhznsp0q"; libraryHaskellDepends = [ base bytestring @@ -177092,14 +177896,13 @@ self: { base16-bytestring bytestring directory - HUnit tasty tasty-hunit temporary text ]; doHaddock = false; - description = "Low-level binding to Sqlite3"; + description = "SQLite client library"; license = lib.licensesSpdx."BSD-3-Clause"; hydraPlatforms = lib.platforms.none; broken = true; @@ -177282,8 +178085,8 @@ self: { }: mkDerivation { pname = "dap"; - version = "0.3.1.0"; - sha256 = "0il9qcd7xss5vc9g9f5rni8bb8i5wzi8m6w6faq2357igf37n00v"; + version = "0.4.0.0"; + sha256 = "0nrk7r417706hgcfkh1a7v9bljwp4mkdq19nr27ixhbckj1qz6np"; libraryHaskellDepends = [ aeson aeson-pretty @@ -179091,8 +179894,8 @@ self: { }: mkDerivation { pname = "data-default"; - version = "0.8.0.1"; - sha256 = "1jmn83y7ss7896xvykpxxp4kfmvxa65avw0asg0z15i1xkl5s26f"; + version = "0.8.0.2"; + sha256 = "1687hx4nkhinbkaiqgp11mi4php1ina69k8pgwd3ixyf1kkmszgs"; libraryHaskellDepends = [ base containers @@ -180139,8 +180942,8 @@ self: { pname = "data-fix"; version = "0.3.4"; sha256 = "0dxb2s2bxdl4fcd0kfybprz9kwsskdwshdh543lvjyh4ik8m5w4d"; - revision = "1"; - editedCabalFile = "06r6054jfaqqf8yx21m86x5bzpnkjmqrbppyf3b7h26ad1hvwy7f"; + revision = "2"; + editedCabalFile = "04yk077mzip7ly0b159kkp8gygz0mvaayjfzpfwgh768kk2600r0"; libraryHaskellDepends = [ base deepseq @@ -182824,12 +183627,14 @@ self: { criterion, directory, filepath, + Glob, granite, hashable, HUnit, mmap, parallel, process, + QuickCheck, random, random-shuffle, regex-tdfa, @@ -182838,6 +183643,7 @@ self: { template-haskell, text, time, + unix, unordered-containers, vector, vector-algorithms, @@ -182846,8 +183652,8 @@ self: { }: mkDerivation { pname = "dataframe"; - version = "0.4.0.0"; - sha256 = "191yk3bxp66yilxpcdsyb02nlrfcm785724d5b03lv029zqhmxf9"; + version = "0.4.1.0"; + sha256 = "1673idd2dvny2cih4a5wn21i6xc1a0z60y1vm8p1rlsm5b1vr4x0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -182860,6 +183666,8 @@ self: { cassava containers directory + filepath + Glob granite hashable mmap @@ -182884,12 +183692,17 @@ self: { filepath process random + text time + unix vector ]; testHaskellDepends = [ base + containers + directory HUnit + QuickCheck random random-shuffle text @@ -182902,7 +183715,7 @@ self: { process ]; description = "A fast, safe, and intuitive DataFrame library"; - license = lib.licensesSpdx."GPL-3.0-or-later"; + license = lib.licensesSpdx."MIT"; hydraPlatforms = lib.platforms.none; broken = true; } @@ -183561,36 +184374,47 @@ self: { base, binary, bitvec, + bytestring, + containers, criterion, deepseq, hashable, hspec, hspec-discover, primitive, + QuickCheck, text, vector, - vector-binary, + vector-algorithms, vector-hashtables, }: mkDerivation { pname = "dawgdic"; - version = "0.1.0"; - sha256 = "0jjzaw7na10d8y4nniiv13d15pv17h7nfb44v3nz3h76q7hqzysf"; + version = "1.0.0"; + sha256 = "0gwypkr2vbmh9h2j6hapr1l38bsh16mhykzs0x2lcjizwnipsv7j"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base binary bitvec + bytestring + containers deepseq hashable primitive vector - vector-binary + vector-algorithms vector-hashtables ]; testHaskellDepends = [ base + binary + bytestring + containers hashable hspec + QuickCheck text vector ]; @@ -186889,8 +187713,8 @@ self: { }: mkDerivation { pname = "deferred-folds"; - version = "0.9.18.7"; - sha256 = "1bkq05zzy1apvh9cmnj771xhrimx097ci1hs8bwv2zfkxisl9a6g"; + version = "0.9.18.10"; + sha256 = "18z14q0j2pwvgphwakrg8qgbn4db5h7nsvychla218argmz0fl2b"; libraryHaskellDepends = [ base bytestring @@ -187316,8 +188140,8 @@ self: { }: mkDerivation { pname = "dejafu"; - version = "2.4.0.7"; - sha256 = "18507xbwxikgnj2b0rxpqkb543ml6nbq4f5qw1ivmlj23gkgmxml"; + version = "2.4.0.8"; + sha256 = "0xjk25dajyhqwf5ggxj7ppvdvhmgifl6fd6lbxlyy7ma1mn3kgpc"; libraryHaskellDepends = [ base concurrency @@ -189217,8 +190041,8 @@ self: { }: mkDerivation { pname = "derive-lifted-instances"; - version = "0.2.2"; - sha256 = "0a7a9qh1mf8yaw6g752mjxbgxmav6jqhqx1jf0rfd6b9x5mf6rzd"; + version = "0.3"; + sha256 = "0jy5dbxzyd51m6mmgh1ng35vx87gl7jm22w55aqgsc7mrq4kpnm5"; libraryHaskellDepends = [ base bifunctors @@ -189227,8 +190051,6 @@ self: { ]; description = "Derive class instances though various kinds of lifting"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -189508,46 +190330,30 @@ self: { { mkDerivation, base, - base-orphans, containers, ghc-boot-th, - ghc-prim, hspec, hspec-discover, QuickCheck, - tagged, template-haskell, th-abstraction, - transformers, - transformers-compat, - void, }: mkDerivation { pname = "deriving-compat"; - version = "0.6.7"; - sha256 = "1pzmqwjfd4j5bbcxl8xcgaxilmsfvcwak47rqkakn87n2c85zi6x"; - revision = "1"; - editedCabalFile = "0wmpl2falxhrksd8wf4p7amq5mlyawjpypysip4f1izcwq4vkvdl"; + version = "0.6.8"; + sha256 = "0lv8n2w8b375npp6129b9srffg91dj904g907mr3xlvkiiwa1vbd"; libraryHaskellDepends = [ base containers ghc-boot-th - ghc-prim template-haskell th-abstraction - transformers - transformers-compat ]; testHaskellDepends = [ base - base-orphans hspec QuickCheck - tagged template-haskell - transformers - transformers-compat - void ]; testToolDepends = [ hspec-discover ]; description = "Backports of GHC deriving extensions"; @@ -192365,8 +193171,8 @@ self: { }: mkDerivation { pname = "dhscanner-ast"; - version = "1.1.3"; - sha256 = "0xkr9d945r4g7xdfr3mjl6263ykjjlqwl6g2rklwj1917ir59war"; + version = "1.1.4"; + sha256 = "021gwh23vndd88av6f0daycnvx83pbacwrnavyd46f9mrjnygqwm"; libraryHaskellDepends = [ aeson base @@ -194669,8 +195475,8 @@ self: { pname = "diff-loc"; version = "0.1.0.0"; sha256 = "08sbxkf804bq3lwr9s1k1vigq7yrdjgicrj114zi14cdi4168k3x"; - revision = "3"; - editedCabalFile = "0msy6gqch9nz5dr1hddwvyq57kf0l8c0dybsl6d2f3109f60rsrn"; + revision = "4"; + editedCabalFile = "1ns06a8wvilv07z3qvd3q72sdmknvzhgcc0659lbghcv1babbhni"; libraryHaskellDepends = [ base fingertree @@ -195726,8 +196532,8 @@ self: { }: mkDerivation { pname = "dimensional"; - version = "1.6.1"; - sha256 = "1alys6kxhs0cbadk0sgs0k5whyn62klpf08b5n1kny7qpq3rhaq4"; + version = "1.6.2"; + sha256 = "17m78zx0ax7kc3y38nv8d65cn4zx26v4gjv366696yv0f2yhrcln"; libraryHaskellDepends = [ base deepseq @@ -196549,7 +197355,7 @@ self: { } ) { }; - directory_1_3_10_0 = callPackage ( + directory_1_3_10_1 = callPackage ( { mkDerivation, base, @@ -196560,8 +197366,8 @@ self: { }: mkDerivation { pname = "directory"; - version = "1.3.10.0"; - sha256 = "1xz5ffxd0hn42481bgkgnshwqmshjq7b9cihw9q8zy6qkhglzrw0"; + version = "1.3.10.1"; + sha256 = "0nf2jhz4djibiv8ji5dnp61r79jpnd721l56liy3anm23a2iixyq"; libraryHaskellDepends = [ base file-io @@ -198410,6 +199216,8 @@ self: { pname = "distributed-process"; version = "0.7.8"; sha256 = "0jmk3yh994hip8lkp3ss26iz1r22ra2qh8ada65h4snld11rqbrz"; + revision = "1"; + editedCabalFile = "05014rccl0mnmvifrxwb2lwnvriblyvrmza7nz9xchxlm2xn9x6s"; libraryHaskellDepends = [ base binary @@ -198556,6 +199364,8 @@ self: { pname = "distributed-process-client-server"; version = "0.2.8.0"; sha256 = "097sa879ykxiylnbyjv0cxvyyaybfpiig023di2jb9v63vlif2iq"; + revision = "1"; + editedCabalFile = "1ry4x1j0z9p5rwgsqarjylrra8r5ig0d28b2skyv44m109is6bfj"; libraryHaskellDepends = [ base binary @@ -198639,6 +199449,8 @@ self: { pname = "distributed-process-execution"; version = "0.1.5.0"; sha256 = "1q4y4sm8xdzsi643v4q8ynbyxv4al3wq0gc1g3ijwigznfqpy3d4"; + revision = "1"; + editedCabalFile = "1wxjwa61nc94jalpigkka1gi0agyih7kibp8ycf13aq47w1vwa60"; libraryHaskellDepends = [ base binary @@ -198693,6 +199505,8 @@ self: { pname = "distributed-process-extras"; version = "0.3.9"; sha256 = "1ig9s6aaa6lq2nc689hmh8z2872gsgsrnff0yi3gjc13l9fbvp5y"; + revision = "1"; + editedCabalFile = "1m9yq6yrlih8fc2im6m7x7fwvj3nbxrgg7132d12inx9vm2gfsy3"; libraryHaskellDepends = [ base binary @@ -199134,6 +199948,8 @@ self: { pname = "distributed-process-simplelocalnet"; version = "0.3.3"; sha256 = "1bq745sl9w8j7livcy36237a44rrpnm782lyprfcq63gdl8h0b5d"; + revision = "1"; + editedCabalFile = "19lywdffpanf5c45w7gad1vqgyk9jg085mrhf8nawv1c02fr9f4n"; libraryHaskellDepends = [ base binary @@ -199187,6 +200003,8 @@ self: { pname = "distributed-process-supervisor"; version = "0.2.4"; sha256 = "16pfqbxh3jjp9i45zmr0zzmfik4jl9ivz1vg12c34q1gcjmd25ag"; + revision = "1"; + editedCabalFile = "0490vfzdrgd6098irlhq30f2dvpcl8ay6pnyd6ydx96zgv9lc0gb"; libraryHaskellDepends = [ base binary @@ -199471,8 +200289,8 @@ self: { pname = "distributed-static"; version = "0.3.11"; sha256 = "0h9psda6bc8sq1gc8rdkgljs4hh4973bhsg9bzgvwqx26rdwvs7h"; - revision = "1"; - editedCabalFile = "1ifq0rls8rp8p1xmynzb7rx5vmqwi6jxb65lmv0z244d2b35d3x3"; + revision = "2"; + editedCabalFile = "1mwwq8fmb95vgv3aklrx15qxdpjwbq5s7zq8rprc9h28qx95mh54"; libraryHaskellDepends = [ base binary @@ -199657,7 +200475,6 @@ self: { { mkDerivation, base, - base-orphans, generic-deriving, hspec, hspec-discover, @@ -199666,13 +200483,10 @@ self: { }: mkDerivation { pname = "distributive"; - version = "0.6.2.1"; - sha256 = "14bb66qyfn43bj688igfvnfjw7iycjf4n2k38sm8rxbqw2916dfp"; - revision = "1"; - editedCabalFile = "033890dfyd23dh7g7px863l0hr1b881jnhv4kgwaq16a3iagb68g"; + version = "0.6.3"; + sha256 = "1ajb4vljfv196fzhcys05f6dbfbrddvbv9i47q3rp7yv4f505sxf"; libraryHaskellDepends = [ base - base-orphans tagged transformers ]; @@ -201913,8 +202727,8 @@ self: { pname = "docopt"; version = "0.7.0.8"; sha256 = "0pcixlpa5cwf531aa5nmwvp50gagm2khwl1xsy8hi4jn7ksnk1y8"; - revision = "2"; - editedCabalFile = "07vr5q9nn81ilklzg22n3s4fswgd596d459r8jbd4ca2w2a1s76v"; + revision = "3"; + editedCabalFile = "1gcfkw1ay5y9f6gb6ggazbvw9hn895k4wamm9vrn62ab1ikh2akg"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base @@ -202110,8 +202924,8 @@ self: { }: mkDerivation { pname = "doctest"; - version = "0.24.2"; - sha256 = "1dpffnr24zaricmkwc13npap569crwwfha1w9vz3fhywmh0dnfjk"; + version = "0.24.3"; + sha256 = "0f0j5ds8wihac23ck5fd1bf6m8i4vxnqvazfyn6fasl5247hy935"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -202787,6 +203601,7 @@ self: { hashable, hedgehog, hspec, + hspec-api, hspec-discover, hspec-expectations-pretty-diff, hspec-hedgehog, @@ -202796,6 +203611,7 @@ self: { monad-logger, mtl, optparse-applicative, + os-string, parser-combinators, pretty-terminal, process, @@ -202810,8 +203626,8 @@ self: { }: mkDerivation { pname = "dojang"; - version = "0.1.0"; - sha256 = "1bdyq39lphjlpc3agnbwdqvkqg8r4lmg7pzi87gd4kyx9wc8waw7"; + version = "0.2.0"; + sha256 = "0rx46glmms94nn0hp6nb5wb8gd6ma1md87pvyh7y3fa6nmai4v2y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -202871,6 +203687,7 @@ self: { hashable hedgehog hspec + hspec-api hspec-discover hspec-expectations-pretty-diff hspec-hedgehog @@ -202880,6 +203697,7 @@ self: { monad-logger mtl optparse-applicative + os-string pretty-terminal random regex-tdfa @@ -203187,8 +204005,8 @@ self: { }: mkDerivation { pname = "domain-aeson"; - version = "0.1.1.2"; - sha256 = "01jg6psmpywkw76yf8gasiivkxigfnr2r3hapqrig34wl9ns3ags"; + version = "0.1.1.3"; + sha256 = "1a3salf5z30mii1wvj0rjrgshvd21779160xrj4dag4g78m3f6k2"; libraryHaskellDepends = [ aeson base @@ -204053,7 +204871,6 @@ self: { bytestring, chart-svg, containers, - doctest-parallel, flatparse, numhask-space, optics-core, @@ -204065,8 +204882,10 @@ self: { }: mkDerivation { pname = "dotparse"; - version = "0.1.3.0"; - sha256 = "1rhd4bd2796hl5w8p7hrqpwjaq76ma37k7578m4b1gzy4j6l0gqv"; + version = "0.1.4.0"; + sha256 = "1r0263f3zryvr4y714h185qqaw9mj9rfbyxb967h2prh1ilicvyk"; + revision = "1"; + editedCabalFile = "13gld9mih8pby566la70sdyf4l5gryls8nccvbwdlz1r8a8acrkk"; libraryHaskellDepends = [ algebraic-graphs base @@ -204082,10 +204901,6 @@ self: { text these ]; - testHaskellDepends = [ - base - doctest-parallel - ]; description = "dot language parsing and printing"; license = lib.licensesSpdx."BSD-3-Clause"; } @@ -206603,14 +207418,10 @@ self: { mkDerivation, base, bytestring, - Cabal, containers, - directory, duckdb, exceptions, - filepath, mtl, - process, tasty, tasty-expected-failure, tasty-hunit, @@ -206620,15 +207431,8 @@ self: { }: mkDerivation { pname = "duckdb-ffi"; - version = "1.4.1.3"; - sha256 = "1drn5raf1phaqbac3svkww0gs21h51sh1kpmwnvz0xxk5ksmp3lk"; - setupHaskellDepends = [ - base - Cabal - directory - filepath - process - ]; + version = "1.4.1.4"; + sha256 = "0qrd5r9lhyr5wqckbvm5733bgihda01qygc9xy59y9qfrrskyz20"; libraryHaskellDepends = [ base bytestring @@ -207654,6 +208458,39 @@ self: { } ) { }; + dvv = callPackage ( + { + mkDerivation, + base, + hashable, + hspec, + lattices, + QuickCheck, + unordered-containers, + }: + mkDerivation { + pname = "dvv"; + version = "0.1.1.0"; + sha256 = "0sdi830lm1i1vm3ws8m3h1i1ymfwg9nzvmfz0fnq03yg511krjz7"; + libraryHaskellDepends = [ + base + hashable + lattices + unordered-containers + ]; + testHaskellDepends = [ + base + hashable + hspec + lattices + QuickCheck + unordered-containers + ]; + description = "Dotted Version Vectors (DVV)"; + license = lib.licensesSpdx."MIT"; + } + ) { }; + dwarf = callPackage ( { mkDerivation, @@ -211589,8 +212426,8 @@ self: { pname = "effectful-th"; version = "1.0.0.3"; sha256 = "0dzjy054n4zcrnnnj50yxxqicv50mfmzhgcqzhz4n6ap8v88ykiv"; - revision = "1"; - editedCabalFile = "02p2pb43znjrmwrrpgrm6aflli1dg27ig6kbnd5j5kqab8nhbcbb"; + revision = "2"; + editedCabalFile = "1lw9kipgmvcm5cfhjz3iyb8f1fj8nzn60i4x4qvy9dlfykjsyd96"; libraryHaskellDepends = [ base containers @@ -211814,6 +212651,8 @@ self: { pname = "effects"; version = "0.2.4"; sha256 = "06cx0l9vxpjpgc1cxai19hw9rxfq89m61qvf7wxp1w2xd6yqa7xk"; + revision = "1"; + editedCabalFile = "067cbzjscqiwn463w5znmvkn140j1lcfjvxyzhrafp5fagbmhrk2"; libraryHaskellDepends = [ base containers @@ -211822,8 +212661,6 @@ self: { ]; description = "Computational Effects"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -211843,7 +212680,6 @@ self: { ]; description = "Parser Effect for the Control.Effects Library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -212315,6 +213151,8 @@ self: { ]; description = "A quasi quotes for using Egison expression in Haskell code"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -212948,6 +213786,8 @@ self: { pname = "ekg-core"; version = "0.1.2.0"; sha256 = "12d4xzkdczbrmhhpgymf9brjn0kpq5645dq57xw05sylalfyslzz"; + revision = "1"; + editedCabalFile = "0vna1fd06iy8am9hv46qa1vpbqb9z0sd7jnvjrb6mv8a8zb5w2jx"; libraryHaskellDepends = [ base containers @@ -213266,6 +214106,8 @@ self: { pname = "ekg-statsd"; version = "0.2.6.2"; sha256 = "1gkh3fqp41sgskwgp9bzpfxign9wkm8agyzqqxvadipr0v7wih13"; + revision = "1"; + editedCabalFile = "02mdmylmfsbxjhbgv147kbn3gqwk2xv646ph9ny5cilaf230cm67"; libraryHaskellDepends = [ base bytestring @@ -213660,7 +214502,7 @@ self: { } ) { }; - eliminators_0_9_6 = callPackage ( + eliminators_0_9_7 = callPackage ( { mkDerivation, base, @@ -213676,8 +214518,8 @@ self: { }: mkDerivation { pname = "eliminators"; - version = "0.9.6"; - sha256 = "1iw8x7y7g0fhswkmjwaar1xdiwly68rsxhj2bas03041k2hgkvvi"; + version = "0.9.7"; + sha256 = "195cyfghvw8gcpip7cbcbj3lzjkfzyj14chkyz7vw7i8081wh86i"; libraryHaskellDepends = [ base extra @@ -217502,6 +218344,8 @@ self: { pname = "entropy"; version = "0.4.1.11"; sha256 = "1slj5n783k2amsx2hqs5qwvcw4rgfhdhgmiyg7cii0wg4w0mmpgm"; + revision = "1"; + editedCabalFile = "04vrqipcdr584wcn5vqc90x0mi0qrj2bxafpwrqpcvdsh9r1m6qv"; setupHaskellDepends = [ base Cabal @@ -218419,8 +219263,8 @@ self: { }: mkDerivation { pname = "envy"; - version = "2.1.4.0"; - sha256 = "1gd975m8vwgvvgfa6q9gsq5b517zg0wndypiikz7xi55d5vsrydl"; + version = "2.1.5.0"; + sha256 = "15zs4ssnad13hp39h1xsbvgyns4a1m7rmg4wws7spp6r5dn2mjm3"; libraryHaskellDepends = [ base bytestring @@ -218714,66 +219558,25 @@ self: { ephemeral = callPackage ( { mkDerivation, - attoparsec, base, - box, - box-csv, - chart-svg, - concurrency, - doctest, - lens, - lucid, - mealy, - microlens, - moo, - mwc-probability, + free, numhask, - numhask-array, - numhask-space, - primitive, profunctors, - random, - text, - time, - transformers, - unordered-containers, }: mkDerivation { pname = "ephemeral"; - version = "0.0.1"; - sha256 = "1xxdifw1mcyfgz4749z136xqxmxbm26v0x0yk8238wm08i80y8fy"; + version = "0.0.2.0"; + sha256 = "06dy7fm9jhis8kipbyw8ca5xz8c880kyibfcfr4mf1ai3kjah7g7"; libraryHaskellDepends = [ - attoparsec base - box - box-csv - chart-svg - concurrency - lens - lucid - mealy - microlens - moo - mwc-probability + free numhask - numhask-array - numhask-space - primitive profunctors - random - text - time - transformers - unordered-containers - ]; - testHaskellDepends = [ - base - doctest - numhask ]; description = "See readme.md"; license = lib.licensesSpdx."BSD-3-Clause"; hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -219142,6 +219945,8 @@ self: { pname = "equational-reasoning"; version = "0.7.1.0"; sha256 = "02m4gpjf5nffzsmdwmyz03sx22nydliv149bs6abld57vflcmwb4"; + revision = "1"; + editedCabalFile = "0431grrdnkkpb5asd7dc97qk6j8kklfx89cgpb0cij4sbb0k6vsh"; libraryHaskellDepends = [ base containers @@ -219436,8 +220241,8 @@ self: { }: mkDerivation { pname = "erebos-tester"; - version = "0.3.3"; - sha256 = "0xcwijr034dw5s4f6jyb727449wayyd31lv8afmfr49i0jmwhgay"; + version = "0.3.4"; + sha256 = "0ys9pqmsyvw0sfw5k7w1nkjxigsgw6azaksmafhfc0pzjk5qhhyh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -220462,6 +221267,40 @@ self: { } ) { }; + esb-fireplace = callPackage ( + { + mkDerivation, + base, + optparse-applicative, + process, + regex-tdfa, + tasty, + tasty-hunit, + time, + }: + mkDerivation { + pname = "esb-fireplace"; + version = "0.1.0.0"; + sha256 = "0gilnwyph5szv709kjmi2wmq56vj9kmayiwy6h587xpjgqzwzaqz"; + libraryHaskellDepends = [ + base + optparse-applicative + time + ]; + testHaskellDepends = [ + base + process + regex-tdfa + tasty + tasty-hunit + ]; + description = "Easily build and run haskell code to solve AoC problems"; + license = lib.licensesSpdx."AGPL-3.0-or-later"; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + escape-artist = callPackage ( { mkDerivation, @@ -224608,6 +225447,65 @@ self: { } ) { }; + evm-opcodes_0_3_3 = callPackage ( + { + mkDerivation, + base, + bytestring, + cereal, + containers, + data-dword, + hedgehog, + hspec, + tasty, + tasty-bench, + tasty-discover, + tasty-hedgehog, + tasty-hspec, + text, + }: + mkDerivation { + pname = "evm-opcodes"; + version = "0.3.3"; + sha256 = "0davis4dikzv7vkmbc8dmw6cvxqciy078rka569chv1kwdfhxgbx"; + libraryHaskellDepends = [ + base + bytestring + cereal + containers + data-dword + text + ]; + testHaskellDepends = [ + base + bytestring + cereal + containers + data-dword + hedgehog + hspec + tasty + tasty-discover + tasty-hedgehog + tasty-hspec + text + ]; + testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ + base + bytestring + cereal + containers + data-dword + tasty-bench + text + ]; + description = "Opcode types for Ethereum Virtual Machine (EVM)"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + } + ) { }; + evoke = callPackage ( { mkDerivation, @@ -224953,8 +225851,8 @@ self: { }: mkDerivation { pname = "exception-hierarchy"; - version = "0.1.0.13"; - sha256 = "18pbkp82d6mlndx06b7sxwcacp41c342cqljmp2iksa05kwrdzny"; + version = "0.1.0.14"; + sha256 = "0lh6yg3n65k64swvxh8pz8rcn8zl5h695lw2inrrxccmqz1y12lk"; libraryHaskellDepends = [ base template-haskell @@ -225169,7 +226067,7 @@ self: { } ) { }; - exceptions_0_10_11 = callPackage ( + exceptions_0_10_12 = callPackage ( { mkDerivation, base, @@ -225184,8 +226082,8 @@ self: { }: mkDerivation { pname = "exceptions"; - version = "0.10.11"; - sha256 = "1v3gyzy3yjs4ph6jz97ivgddy0saa3rkmxsxfm9fdp7mzlb2z9ai"; + version = "0.10.12"; + sha256 = "08xz6j33l1zy6vihsiggn1p2pxp3yn974n4ssch1b5mz14xj8djk"; libraryHaskellDepends = [ base mtl @@ -225201,7 +226099,6 @@ self: { tasty tasty-hunit tasty-quickcheck - template-haskell transformers ]; description = "Extensible optionally-pure exceptions"; @@ -228120,6 +229017,8 @@ self: { pname = "extensions"; version = "0.1.1.0"; sha256 = "1v8hikf03p81rzg6cpiadzpbjljfc6q8dj4q8yr09nwgxcjij3h7"; + revision = "2"; + editedCabalFile = "18wml60bsiwa9h0aj53ylh0qvi0y6bbyf7lx6b3m6ya4mypzmh27"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -231556,6 +232455,99 @@ self: { } ) { }; + fbrnch_1_8 = callPackage ( + { + mkDerivation, + aeson, + async, + base, + bodhi, + bugzilla-redhat, + bytestring, + config-ini, + copr-api, + directory, + either, + email-validate, + extra, + fedora-krb, + fedora-releases, + filepath, + http-conduit, + http-directory, + http-query, + koji, + network-uri, + pagure, + pretty-terminal, + process, + rpm-nvr, + rpmbuild-order, + safe, + say, + select-rpms, + simple-cmd, + simple-cmd-args, + simple-prompt, + text, + time, + typed-process, + unix, + utf8-string, + xdg-basedir, + }: + mkDerivation { + pname = "fbrnch"; + version = "1.8"; + sha256 = "0zl0b8h9mnk86fjq4dbdr5xjgav6ikx9whayvw3cmqdhrx29dw1y"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson + async + base + bodhi + bugzilla-redhat + bytestring + config-ini + copr-api + directory + either + email-validate + extra + fedora-krb + fedora-releases + filepath + http-conduit + http-directory + http-query + koji + network-uri + pagure + pretty-terminal + process + rpm-nvr + rpmbuild-order + safe + say + select-rpms + simple-cmd + simple-cmd-args + simple-prompt + text + time + typed-process + unix + utf8-string + xdg-basedir + ]; + description = "Fedora packager tool to build package branches"; + license = lib.licensesSpdx."GPL-2.0-or-later"; + hydraPlatforms = lib.platforms.none; + mainProgram = "fbrnch"; + } + ) { }; + fca = callPackage ( { mkDerivation, @@ -231673,6 +232665,8 @@ self: { pname = "fcf-base"; version = "0.1.0.1"; sha256 = "0wncldd9s52mz2viyafazzhpgjydxmnvslv8bmigwd8qizrvbpl8"; + revision = "1"; + editedCabalFile = "0zyxw9xc37fvmz2psykhvdaf2w1xgb45lj8bgn3cj2bm30rs517c"; libraryHaskellDepends = [ base fcf-family @@ -231780,8 +232774,8 @@ self: { }: mkDerivation { pname = "fcf-family"; - version = "0.2.0.2"; - sha256 = "1hkvki5gjqz531rxvpby9mzdn5wsrwwcd4dkf6k4mvay174cnnqg"; + version = "0.2.0.3"; + sha256 = "1p4rvbaj5fcmw2zw829wqlqxnrydx3apq4mlc7s7d6a765xlrz43"; libraryHaskellDepends = [ base containers @@ -235154,6 +236148,45 @@ self: { } ) { }; + file-io_0_2_0 = callPackage ( + { + mkDerivation, + base, + bytestring, + deepseq, + directory, + filepath, + tasty, + tasty-hunit, + temporary, + unix, + }: + mkDerivation { + pname = "file-io"; + version = "0.2.0"; + sha256 = "1rxbbmbm10p36ilniksy05l2j3pz35x9wxv4c57137vwbn8ghxcf"; + libraryHaskellDepends = [ + base + bytestring + deepseq + filepath + unix + ]; + testHaskellDepends = [ + base + bytestring + directory + filepath + tasty + tasty-hunit + temporary + ]; + description = "Basic file IO operations via 'OsPath'"; + license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + file-location = callPackage ( { mkDerivation, @@ -235344,16 +236377,15 @@ self: { filepath, fsnotify, hspec, - mtl, stm, - strict-base-types, + strict, temporary, time, }: mkDerivation { pname = "filecache"; - version = "0.5.2"; - sha256 = "1h7l5r5dlb793in1jqfic4j5rbvp0xj9hr2a34h17lbmp7fs5k0r"; + version = "0.5.3"; + sha256 = "0gqp2gsvcxnfbl6lx4ya5bw07dy9sl3rbhqqn71nj1n6lfsb9wvb"; libraryHaskellDepends = [ base containers @@ -235361,9 +236393,8 @@ self: { exceptions filepath fsnotify - mtl stm - strict-base-types + strict time ]; testHaskellDepends = [ @@ -235518,7 +236549,7 @@ self: { } ) { }; - filepath_1_5_4_0 = callPackage ( + filepath_1_5_5_0 = callPackage ( { mkDerivation, base, @@ -235528,6 +236559,7 @@ self: { generic-deriving, generic-random, os-string, + QuickCheck, quickcheck-classes-base, tasty, tasty-bench, @@ -235536,10 +236568,8 @@ self: { }: mkDerivation { pname = "filepath"; - version = "1.5.4.0"; - sha256 = "1bswvf1hrsslb8xlwvsccz12h5habrdpqq4zgcyjg4zm6b28dajl"; - revision = "1"; - editedCabalFile = "0b7hmqygr29ppazwbmrrl60bshpqg7zhvzq5g4wl3pgj19iw55ql"; + version = "1.5.5.0"; + sha256 = "07kx9ax51r5ad8qdx79n506lh6pi3wr4s61ishzjkkpz8c7zbrl7"; libraryHaskellDepends = [ base bytestring @@ -235555,6 +236585,7 @@ self: { generic-deriving generic-random os-string + QuickCheck quickcheck-classes-base tasty tasty-quickcheck @@ -237950,6 +238981,42 @@ self: { } ) { }; + fixed-vector_2_1_0_0 = callPackage ( + { + mkDerivation, + base, + deepseq, + doctest, + filemanip, + primitive, + tasty, + tasty-inspection-testing, + template-haskell, + }: + mkDerivation { + pname = "fixed-vector"; + version = "2.1.0.0"; + sha256 = "04nda87wy4zfs2crmajk9yv0kypk52kqf0vbsyalffw6h72rm0ag"; + libraryHaskellDepends = [ + base + deepseq + primitive + ]; + testHaskellDepends = [ + base + doctest + filemanip + primitive + tasty + tasty-inspection-testing + template-haskell + ]; + description = "Generic vectors with statically known size"; + license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + fixed-vector-QC = callPackage ( { mkDerivation, @@ -237959,8 +239026,8 @@ self: { }: mkDerivation { pname = "fixed-vector-QC"; - version = "2.0.0.0"; - sha256 = "0yv4r93i26ak98h6qmd7crllbz33ys63yp5kigb9745271pi5ip7"; + version = "2.1.0.0"; + sha256 = "04gh0svia3q60al47fp994s1iyy7idblg8ax63c4z42ixmwga2wr"; libraryHaskellDepends = [ base fixed-vector @@ -237968,6 +239035,8 @@ self: { ]; description = "QuickCheck instances for fixed-vector"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -237981,8 +239050,8 @@ self: { }: mkDerivation { pname = "fixed-vector-aeson"; - version = "2.0.0.0"; - sha256 = "0cdhdy0ay5044vxal8dhx9gqv07x8dd358n21vlas6s0kb6jxmvy"; + version = "2.1.0.0"; + sha256 = "0wpzk4jvwicqrn36kfn9fl45y9qmdjyfjsaxv1426nsvmrnvg4w1"; libraryHaskellDepends = [ aeson base @@ -237991,6 +239060,8 @@ self: { ]; description = "Aeson instances for fixed-vector"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -238003,8 +239074,8 @@ self: { }: mkDerivation { pname = "fixed-vector-binary"; - version = "2.0.0.0"; - sha256 = "04fxpi7x7psfwdfr398l3y7x17qkm5hfjr444p29b0wbg89ldwwm"; + version = "2.1.0.0"; + sha256 = "19id0z8is2x1pxj58w70n0ndq302256gwriijp4f54v7k2c8ckrh"; libraryHaskellDepends = [ base binary @@ -238012,6 +239083,8 @@ self: { ]; description = "Binary instances for fixed-vector"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -238022,26 +239095,17 @@ self: { cborg, fixed-vector, serialise, - tasty, - tasty-quickcheck, }: mkDerivation { pname = "fixed-vector-cborg"; - version = "1.0.0.2"; - sha256 = "0rpdxkf0kmhrf7l1a7wvjxigg3yybmc3pcb5vxww57676qp0pm0d"; + version = "2.1.0.0"; + sha256 = "1dim11aa3fmmn95rc01da3525kjlcmdm16mm0ws0ivw6m329nwim"; libraryHaskellDepends = [ base cborg fixed-vector serialise ]; - testHaskellDepends = [ - base - fixed-vector - serialise - tasty - tasty-quickcheck - ]; description = "Binary instances for fixed-vector"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -238058,8 +239122,8 @@ self: { }: mkDerivation { pname = "fixed-vector-cereal"; - version = "2.0.0.0"; - sha256 = "0pac616jkz2385yqzmrb71c4sqr4cvabw8rr9k316zygc89xy2jx"; + version = "2.1.0.0"; + sha256 = "1zlz1j90l8isabjm8vi8aly2b0gy5hgkkyl1njqdkkbz6v0xmgyj"; libraryHaskellDepends = [ base cereal @@ -238067,6 +239131,8 @@ self: { ]; description = "Cereal instances for fixed-vector"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -238563,8 +239629,8 @@ self: { pname = "flac"; version = "0.2.1"; sha256 = "0ca41lyl21x9nrlnj5df4fbhycpsmfrl6fsd8pmza2wklx8zlv9d"; - revision = "3"; - editedCabalFile = "1s1x9dzzryccpsdyaqhivz5awlwrwqhmkfnvv58wpxqyjcc236jp"; + revision = "4"; + editedCabalFile = "1vc9ry902yvzblagqkw2041n4kaayk42i3b09y724c5svbn8mj79"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base @@ -239085,8 +240151,8 @@ self: { }: mkDerivation { pname = "flat-tex"; - version = "0.8.1"; - sha256 = "1j6kjs1pl6lbcmkfwdxpa1m3bmb8ja53w9k99pzps5b9amdrcjgv"; + version = "0.8.2"; + sha256 = "16qpkrzpb1fn1mjwajd1hi5d5fmcmakzqbk9s9zhz50q7s742q1m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -239315,6 +240381,33 @@ self: { } ) { }; + flatcv = callPackage ( + { + mkDerivation, + base, + c2hs, + hspec, + vector, + }: + mkDerivation { + pname = "flatcv"; + version = "0.3.0.1"; + sha256 = "1z5gml04h9lzklfij5dby1s2ya7lvfjka4vzsr0r2fqhxqvhj741"; + libraryHaskellDepends = [ + base + vector + ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ + base + hspec + vector + ]; + description = "Haskell bindings for FlatCV image processing library"; + license = lib.licensesSpdx."ISC"; + } + ) { }; + flatparse = callPackage ( { mkDerivation, @@ -240121,8 +241214,8 @@ self: { }: mkDerivation { pname = "flow"; - version = "2.0.0.9"; - sha256 = "1cvz65jq882f3ip9fwifdjjf6hx9vm1w21403z3hiiwc7i39zxqb"; + version = "2.0.0.11"; + sha256 = "1xq6jrg3czbgvslgwixm17lrxcp0lmpy87v9vij38vfcv9mvvp9y"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base @@ -241622,8 +242715,8 @@ self: { }: mkDerivation { pname = "fold-debounce"; - version = "0.2.0.16"; - sha256 = "0clc38mv6ss1js1b4lpyzx0z50f1hk2zl7ccx52yznid2a3ndw7p"; + version = "0.2.0.17"; + sha256 = "1k6xhdf8anr29x6d6jic86hlx58cv0l81jb11002flgpcf8za8gq"; libraryHaskellDepends = [ base data-default @@ -241658,8 +242751,8 @@ self: { }: mkDerivation { pname = "fold-debounce-conduit"; - version = "0.2.0.8"; - sha256 = "17zyg28rhjlns7hs2yllhgc0c7srx2bajmwpx4d9anmkl0qi26dk"; + version = "0.2.0.9"; + sha256 = "101sc5d9zapbl3g471rfhnh8152fn2zzjf27cvcgsix9kbagqq4s"; libraryHaskellDepends = [ base conduit @@ -241736,8 +242829,10 @@ self: { }: mkDerivation { pname = "foldable1-classes-compat"; - version = "0.1.2"; - sha256 = "1n6a8ga07gdwnhy485qzy23algcmnzppfcxfy8c6qipamn4hw5p3"; + version = "0.1.3"; + sha256 = "1yg83bxl41ysjlbznn8v9nbp6v0yix858fb92w5a5dzyrjhxq0bp"; + revision = "1"; + editedCabalFile = "1jspmaifvx1xjpd7bhk8bx8kk829jjry76d6h7675q5b2p1qal6z"; libraryHaskellDepends = [ base ghc-prim @@ -241761,7 +242856,7 @@ self: { ]; doHaddock = false; description = "Compatibility package for the Foldable1 and Bifoldable1 type classes"; - license = lib.licenses.bsd3; + license = lib.licensesSpdx."BSD-3-Clause"; } ) { }; @@ -241789,8 +242884,8 @@ self: { pname = "foldl"; version = "1.4.18"; sha256 = "03jhj5p017r6f75vb0dk6igcaklgykjpp23j5wk7blzph18z9n6a"; - revision = "1"; - editedCabalFile = "1isis41wbfpgdqgrhapkcqqrkd20kxxl8qcqyqmrr41pvgca0hma"; + revision = "2"; + editedCabalFile = "0k39y5nmb9h26501iw9xjqjvq87ap78rcs847bkjczapx69gva8x"; libraryHaskellDepends = [ base bytestring @@ -243033,8 +244128,8 @@ self: { pname = "forma"; version = "1.2.0"; sha256 = "13kyggzlf156d3d3mj453jwmafyz74vk4bim3f30zxyd6syl3m5v"; - revision = "3"; - editedCabalFile = "0lh9dgi3m75078ijvc7s4c1bd1nr1l3v4w81l2455m6gydwsrrkd"; + revision = "4"; + editedCabalFile = "1kaxb0mpr46psvas9rk3yvqwmhbx0a90v8rxdzd4angwjxw4k1yi"; libraryHaskellDepends = [ aeson base @@ -243203,24 +244298,17 @@ self: { mkDerivation, base, containers, - doctest-parallel, - QuickCheck, text, }: mkDerivation { pname = "formatn"; - version = "0.3.2.0"; - sha256 = "082cakp1wwndb02ig387sc5r6dji27r6ahdbsvxvwmxfg52rqa2l"; + version = "0.3.3.1"; + sha256 = "1y3fbj2vfbaa7ygwif12klnxd8xiqlbx282r5cq6yl23clba17y0"; libraryHaskellDepends = [ base containers text ]; - testHaskellDepends = [ - base - doctest-parallel - QuickCheck - ]; description = "Formatting of doubles"; license = lib.licensesSpdx."BSD-3-Clause"; } @@ -244468,6 +245556,8 @@ self: { pname = "fourmolu"; version = "0.19.0.1"; sha256 = "1xawjckgf1jsdkdscmfnlqazx0lidbpwy3qjf94by48ld3vpyywm"; + revision = "1"; + editedCabalFile = "0lzbxm7qz5yg187mzhw05acpa96fjfln35j1s9skvgs2209zjii3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -245444,8 +246534,8 @@ self: { }: mkDerivation { pname = "freckle-app"; - version = "1.24.0.1"; - sha256 = "1hv8mgdr9qfwrl6a4p1kcqhxswqp8b513s2pf6qzsx370ynkw3c1"; + version = "1.25.0.1"; + sha256 = "12xyn2g38yrqgaziiqxw400gl6h0vdzk73dq1x1d867y9c8pxivd"; libraryHaskellDepends = [ aeson annotated-exception @@ -245528,6 +246618,8 @@ self: { bytestring cassava conduit + freckle-exception + freckle-prelude freckle-stats hs-opentelemetry-api hspec @@ -246097,8 +247189,8 @@ self: { pname = "free"; version = "5.2"; sha256 = "12agp68cwwixcwfwnvk2xamg34a2x6ax7s1naxv66chpi5y7z1kj"; - revision = "7"; - editedCabalFile = "0h43xp4f38bpxhs5s06x1jw6d6zv55hhyhj6cmdbmfw7d6k94fbz"; + revision = "8"; + editedCabalFile = "0r0imkhc4xzyz4azhj6shx595p2ba4f8j9j2svzhhbvwbxj03jir"; libraryHaskellDepends = [ base comonad @@ -246375,8 +247467,8 @@ self: { }: mkDerivation { pname = "free-functors"; - version = "1.2.1"; - sha256 = "1jbrhbqjlcwx11ch4wwbjdxfq1yszj60ifj6frp8bly8bslyyfzs"; + version = "1.3"; + sha256 = "1zsib2hq5rq2r4cl6nswmzxbrhr31hyzndja7i3bzxsq4791w9fg"; libraryHaskellDepends = [ base bifunctors @@ -246389,7 +247481,6 @@ self: { ]; description = "Free functors, adjoint to functors that forget class constraints"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -255465,7 +256556,6 @@ self: { mkDerivation, base, containers, - ghc-prim, hspec, hspec-discover, template-haskell, @@ -255473,21 +256563,17 @@ self: { }: mkDerivation { pname = "generic-deriving"; - version = "1.14.6"; - sha256 = "1bxjar1kc29nma3whxb0kqgjgxmmm7wvhql7pyick8rj39zw35gi"; - revision = "1"; - editedCabalFile = "0mdcj86qy4qnjlx4nh3bi4nrplmycjci7mns4zp0w3ipj0fhfz7l"; + version = "1.14.7"; + sha256 = "1jnqwn8h2rdqw3jgyv879rpx1hi2mh7550z1vmxbv6qmr6jj05n9"; libraryHaskellDepends = [ base containers - ghc-prim template-haskell th-abstraction ]; testHaskellDepends = [ base hspec - template-haskell ]; testToolDepends = [ hspec-discover ]; description = "Generic programming library for generalised deriving"; @@ -255929,8 +257015,8 @@ self: { pname = "generic-monoid"; version = "0.1.0.1"; sha256 = "1pradfv1i2z73f3vxx78ahmfsdszcgi44kn29aww2hdgf2np5l6g"; - revision = "5"; - editedCabalFile = "0p4f9rvqfvvhbc1rkfrq14k9wp7s06qlp5dvj3kdmjhynr9rpyk9"; + revision = "6"; + editedCabalFile = "18grhkbbbqylpvc1f83b15655ls4sk52lz6zqnqdf6zgxz655wbv"; libraryHaskellDepends = [ base ]; description = "Derive monoid instances for product types"; license = lib.licenses.bsd3; @@ -256483,8 +257569,8 @@ self: { pname = "generically"; version = "0.1.1"; sha256 = "1ks3pi6mpma83xffplz8vmimyhvzpnhmcgvk3bvl3c64pqva9i84"; - revision = "4"; - editedCabalFile = "0bj5vhnrggf9ka89z628hcxx1g3r00lv2rrrjv3dfbaqbj7jfr1z"; + revision = "5"; + editedCabalFile = "0sd3lja677rivn6rxc5a1d6kfilyjsn9jy270a2bapj59liibr3z"; libraryHaskellDepends = [ base ]; description = "Generically newtype to use with DerivingVia"; license = lib.licenses.bsd3; @@ -256592,8 +257678,8 @@ self: { pname = "generics-sop"; version = "0.5.1.4"; sha256 = "0zkri1w7qdqlxcfx0kzld7ai5g7xzxwxjxjfa7wnjx09fqhiqsk1"; - revision = "2"; - editedCabalFile = "0xacmrv5jscb2jxqpvrnrd8cq80zk2ww6f3ajkdl9y4nl2h68a56"; + revision = "3"; + editedCabalFile = "0rrlkscz4d7avbi95rsj1vf1aghcy8v92jv8765hwrm3yjxs6yn9"; libraryHaskellDepends = [ base ghc-prim @@ -258882,6 +259968,41 @@ self: { } ) { }; + geodetics_2_0_0 = callPackage ( + { + mkDerivation, + array, + base, + checkers, + hspec, + HUnit, + parsec, + QuickCheck, + Stream, + }: + mkDerivation { + pname = "geodetics"; + version = "2.0.0"; + sha256 = "0q02xiq2dmm021x7snwkbc921n626m0wc5qg6dw5halvc306aibl"; + libraryHaskellDepends = [ + array + base + parsec + Stream + ]; + testHaskellDepends = [ + base + checkers + hspec + HUnit + QuickCheck + ]; + description = "Terrestrial coordinate systems and geodetic calculations"; + license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + geohash = callPackage ( { mkDerivation, @@ -258956,8 +260077,8 @@ self: { }: mkDerivation { pname = "geojson"; - version = "4.1.1"; - sha256 = "16b5mvn4as3xi620n6wr3gfd138p48c4sif2bxqw915fwm4z10sl"; + version = "4.1.3"; + sha256 = "0m482a8a3d1v6a4bipy5hnwifay7ccvp9l9ivn6r13kwr06dizsh"; libraryHaskellDepends = [ aeson base @@ -258985,8 +260106,6 @@ self: { ]; description = "A thin GeoJSON Layer above the aeson library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -259803,8 +260922,8 @@ self: { pname = "ghc-bignum-orphans"; version = "0.1.1"; sha256 = "1ns129cx6b2di2w66r38cwiirqcpkvwk6xn64hzbm202p73igim4"; - revision = "1"; - editedCabalFile = "0d7zmxnwv8ql6isp5hwwqkb5xxa2nla9fb9rn2zby9dxhb4hlkwy"; + revision = "2"; + editedCabalFile = "1gr6l11w32qbfc2i43ssb2nfqd9gzl4g0b1sha3axwhjdfsly6xv"; libraryHaskellDepends = [ base ghc-bignum @@ -260005,8 +261124,8 @@ self: { { mkDerivation, base }: mkDerivation { pname = "ghc-compat"; - version = "0.5.4.0"; - sha256 = "0lfny2dyq1r58wbzrwsz3kw9kyb0p0jcqkzih41lk8ychn7zf7d6"; + version = "0.5.5.0"; + sha256 = "0y8n31ri08rl1nzm4phjz5azia7zmwswv2fhzkx828xll6cpqbc3"; libraryHaskellDepends = [ base ]; description = "GHC compatibility for MicroHs"; license = lib.licensesSpdx."Apache-2.0"; @@ -260426,7 +261545,9 @@ self: { testHaskellDepends = [ base ]; description = "A step-through machine-interface debugger for GHC Haskell"; license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; mainProgram = "ghc-debug-adapter"; + broken = true; } ) { }; @@ -261874,8 +262995,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "9.12.2.20250421"; - sha256 = "1liyrxdf790b3ga7v1kq501pa54wq92yvaggzy6vf1l3viakyxpl"; + version = "9.12.3.20251228"; + sha256 = "0241bbhccx2k1186fq1swj416zri7091mm0xhqwcs2w87w9rpyxc"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array @@ -262107,6 +263228,7 @@ self: { ghc-internal, ghc-prim, happy, + hpc, os-string, parsec, pretty, @@ -262117,8 +263239,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.12.2.20250421"; - sha256 = "1lscfnbpmyv0fahl9y33kwiypnp45iljljax69dxhlr9zdijv7x4"; + version = "9.12.3.20251228"; + sha256 = "0dgg174j31xmlrgb221szb796frnk8pxz0yk2c14klci1n6548sj"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array @@ -262132,6 +263254,7 @@ self: { filepath ghc-internal ghc-prim + hpc os-string parsec pretty @@ -263526,6 +264649,37 @@ self: { } ) { }; + ghc-syntax-highlighter_0_0_14_0 = callPackage ( + { + mkDerivation, + base, + ghc-lib-parser, + hspec, + hspec-discover, + text, + }: + mkDerivation { + pname = "ghc-syntax-highlighter"; + version = "0.0.14.0"; + sha256 = "1gi4rk3biqf60998am74i2rvvykg4hahh9z8qnx66zbllnm2krk2"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base + ghc-lib-parser + text + ]; + testHaskellDepends = [ + base + hspec + text + ]; + testToolDepends = [ hspec-discover ]; + description = "Syntax highlighter for Haskell using the lexer of GHC"; + license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + ghc-tags_1_7 = callPackage ( { mkDerivation, @@ -263827,8 +264981,8 @@ self: { }: mkDerivation { pname = "ghc-tcplugin-api"; - version = "0.18.1.0"; - sha256 = "0nqcbilwzlvphbf5v902y84xx1f0h15bw2qnbh6zpcw97pbrliz5"; + version = "0.18.2.0"; + sha256 = "1xzx3f4rxhc8apbx8b0fsxxn3yjg5ap23nfanxvcq9s06695rj2c"; libraryHaskellDepends = [ array base @@ -264754,6 +265908,50 @@ self: { } ) { }; + ghci-quickfix = callPackage ( + { + mkDerivation, + async, + base, + deferred-folds, + directory, + foldl, + ghc, + process, + stm, + stm-containers, + tasty, + tasty-hunit, + text, + }: + mkDerivation { + pname = "ghci-quickfix"; + version = "0.1.0.0"; + sha256 = "1zgbj4klclfkrgzskjcj4ngf2hjsqw8g2fpcwl6zvwk9snz7hfhz"; + libraryHaskellDepends = [ + async + base + deferred-folds + directory + foldl + ghc + stm + stm-containers + text + ]; + testHaskellDepends = [ + async + base + directory + process + tasty + tasty-hunit + ]; + description = "GHC plugin that writes errors to a file for use with quickfix"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + ghci-websockets = callPackage ( { mkDerivation, @@ -264943,6 +266141,7 @@ self: { Diff, directory, dlist, + edit-distance, enummapset, exceptions, extra, @@ -264974,6 +266173,7 @@ self: { parallel, prettyprinter, prettyprinter-ansi-terminal, + process, random, regex-tdfa, safe-exceptions, @@ -264994,8 +266194,8 @@ self: { }: mkDerivation { pname = "ghcide"; - version = "2.12.0.0"; - sha256 = "0m0a89ilkwcwpmjkp9jx4f40v3kn6cgjrmsws20blas6kcrjk68l"; + version = "2.13.0.0"; + sha256 = "0y78kl4gcqalv454jifwkhhjn1q2ml5z0r4zd9ym4qmqhxrcph0d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -265017,6 +266217,7 @@ self: { Diff directory dlist + edit-distance enummapset exceptions extra @@ -265047,6 +266248,7 @@ self: { parallel prettyprinter prettyprinter-ansi-terminal + process random regex-tdfa safe-exceptions @@ -265919,6 +267121,8 @@ self: { pname = "ghcup"; version = "0.1.50.2"; sha256 = "1djhvm1iw5hff0cicg3kyi29hbhpk0klqia8sd8rp90wkb7ipfnx"; + revision = "1"; + editedCabalFile = "1hxldnqh5y9484an8inabf3ikjm2iyflj1bprphsillnpcawshpj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -271017,8 +272221,6 @@ self: { mtl, network, network-bsd, - network-info, - network-multicast, network-uri, old-locale, optparse-applicative, @@ -271073,8 +272275,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "10.20251215"; - sha256 = "17xn1mf6f785yc71ig7ayvhbvrrv2ysgjj2qdk17bw70xzhwbmxq"; + version = "10.20260115"; + sha256 = "0pi9zrw1dincw71ind4s7b3j7g1ji76bgh6rmvq5vhq30vbcy1v3"; configureFlags = [ "-fassistant" "-f-benchmark" @@ -271152,8 +272354,6 @@ self: { mtl network network-bsd - network-info - network-multicast network-uri old-locale optparse-applicative @@ -272854,8 +274054,8 @@ self: { }: mkDerivation { pname = "github-release"; - version = "2.0.0.14"; - sha256 = "1918vvxfya3b2zw56kbdblkbf5c524yz6m9d7bcr5rbpsx9fr9zh"; + version = "2.0.0.17"; + sha256 = "0vz4avcflyavwwgals33g217b385g0nz1zbqg2bbz3c4sqgmrnqb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -272906,6 +274106,8 @@ self: { pname = "github-rest"; version = "1.2.1"; sha256 = "1d7jiidqaz1z07gdn6gka8cmp8jdn0v21ppbivxc8718vj5pq5xf"; + revision = "1"; + editedCabalFile = "156hsqk60ppncgm0z3jqgzva04k83360qr1mrss8ffa3h9zfhq7x"; libraryHaskellDepends = [ aeson base @@ -273375,6 +274577,37 @@ self: { } ) { }; + gitignore-ospath = callPackage ( + { + mkDerivation, + base, + filepath, + hspec, + os-string, + text, + }: + mkDerivation { + pname = "gitignore-ospath"; + version = "0.1.0.2"; + sha256 = "0qng1lbyhm8k38zl1lis46la8v6x3iy9pgpjv4qplk727cj7j242"; + libraryHaskellDepends = [ + base + filepath + os-string + text + ]; + testHaskellDepends = [ + base + filepath + hspec + os-string + text + ]; + description = "Library for reading .gitignore files and filtering paths"; + license = lib.licensesSpdx."Apache-2.0"; + } + ) { }; + gitit = callPackage ( { mkDerivation, @@ -275456,8 +276689,8 @@ self: { }: mkDerivation { pname = "glicko"; - version = "0.3.0.2"; - sha256 = "1vx9sk2w1914c7y7cr89yvps44xpd4n2pwnk3v337d8bqhanl1jp"; + version = "0.3.0.3"; + sha256 = "0v3l42wihnkb2f7hcvfrddq6gp4snx6bhmiirsrx7dg9hf7547w2"; libraryHaskellDepends = [ base containers @@ -275473,8 +276706,6 @@ self: { ]; description = "Glicko-2 implementation in Haskell"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -275698,8 +276929,8 @@ self: { }: mkDerivation { pname = "glob-imports"; - version = "0.0.3.0"; - sha256 = "0xc0l0llfkhgvxg9c5y0w6g36r48jyq8cmij3sqxdwyc6lx7p9b7"; + version = "0.0.5.0"; + sha256 = "14a47injxa8230ajbqcqg70963h74dgsjxzd3320br8dvrva6v14"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -277481,8 +278712,8 @@ self: { pname = "gnuplot"; version = "0.5.7"; sha256 = "1glahh3si5bpazsklnpwxx4h4ivgb4wyngc032797zq1496fhhm3"; - revision = "3"; - editedCabalFile = "1rwlkr94h6lzp6aa3p4i5dgdl1i9nl7mahxny2qz9ggjbj4yiw65"; + revision = "4"; + editedCabalFile = "1cdqq9r3r83hk6k39nhgz2rg30h3drilcp3my72hs07cxx50rxb8"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -280690,6 +281921,52 @@ self: { } ) { }; + golds-gym = callPackage ( + { + mkDerivation, + aeson, + base, + benchpress, + boxes, + bytestring, + directory, + filepath, + hspec, + hspec-core, + process, + statistics, + text, + time, + vector, + }: + mkDerivation { + pname = "golds-gym"; + version = "0.2.0.0"; + sha256 = "17jngahdl6kiaik3fmgj6glg00qhmi7jrdjrl4jdflicjrwwk99i"; + libraryHaskellDepends = [ + aeson + base + benchpress + boxes + bytestring + directory + filepath + hspec-core + process + statistics + text + time + vector + ]; + testHaskellDepends = [ + base + hspec + ]; + description = "Golden testing framework for performance benchmarks"; + license = lib.licensesSpdx."MIT"; + } + ) { }; + gooey = callPackage ( { mkDerivation, @@ -285046,8 +286323,8 @@ self: { }: mkDerivation { pname = "graphql"; - version = "1.5.0.1"; - sha256 = "0kx0pnf16zwdjxc1ig46mbv7px7r7v6xn6kmlypl0d73ik8jfzrq"; + version = "1.5.0.2"; + sha256 = "0wphj1ybrx6kld36fmwc1wmrarkdydgxz72szgxwd25lbplcjvib"; libraryHaskellDepends = [ base conduit @@ -285285,6 +286562,65 @@ self: { } ) { }; + graphql-spice_1_0_7_0 = callPackage ( + { + mkDerivation, + aeson, + base, + conduit, + containers, + exceptions, + graphql, + hspec, + hspec-discover, + hspec-expectations, + megaparsec, + scientific, + template-haskell, + text, + time, + transformers, + unordered-containers, + vector, + }: + mkDerivation { + pname = "graphql-spice"; + version = "1.0.7.0"; + sha256 = "0f3g44mc8g9j644kq2zqag2n8gpb6h9rka0qd2par66c2sv5mw30"; + libraryHaskellDepends = [ + aeson + base + conduit + containers + exceptions + graphql + hspec-expectations + megaparsec + scientific + template-haskell + text + time + transformers + unordered-containers + vector + ]; + testHaskellDepends = [ + aeson + base + graphql + hspec + scientific + text + time + unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "GraphQL with batteries"; + license = lib.licensesSpdx."MPL-2.0"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + graphql-utils = callPackage ( { mkDerivation, @@ -287588,8 +288924,8 @@ self: { pname = "group-by-date"; version = "0.1.0.5"; sha256 = "1c19x8qqrq8fiaxdz917nim8z8dcsi4bcyf88ci39d3xq1iq9iis"; - revision = "2"; - editedCabalFile = "1hgil34is14j10dhxwbmmwkwgbqv0as1cmm2lm1j5p6aknz1swvh"; + revision = "3"; + editedCabalFile = "06w78vjj9y4vc61ngjynnly9pfx28pi7ar23yp8ykl1fdf4l6bm4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -290406,10 +291742,8 @@ self: { }: mkDerivation { pname = "h-raylib"; - version = "5.5.3.1"; - sha256 = "1977pd0aqb9jiply9fyz1f5rw0vh6wpv8v2dyvk0awk8v5lbsaa0"; - revision = "1"; - editedCabalFile = "0zq58lnvkpg1mcx7f1jr12gzaj2qwmsva548k4l1nall7pv93h4m"; + version = "5.6.0.0"; + sha256 = "1ali2n1iwkxv36jjc25j8dv3i7jl74l62y5xcq1sjx493zgw9bh9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -296000,6 +297334,8 @@ self: { pname = "hakyll"; version = "4.16.7.1"; sha256 = "18wg5ay6l3ngsmqq00g6y7djmg4f8285kwdi47g0rg70mq6sn0py"; + revision = "1"; + editedCabalFile = "0y4my8p32yihpxkfvm159vgh5na35f1jgrnj6fhlvq2c3460p0cf"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -296555,6 +297891,63 @@ self: { } ) { }; + hakyll-diagrams = callPackage ( + { + mkDerivation, + base, + base16-bytestring, + containers, + cryptohash-sha1, + data-default, + diagrams, + diagrams-core, + diagrams-lib, + diagrams-svg, + hakyll, + hint, + hspec, + HUnit, + pandoc-types, + split, + svg-builder, + tagsoup, + text, + }: + mkDerivation { + pname = "hakyll-diagrams"; + version = "0.1.0.2"; + sha256 = "172v6zinjpsjg8lzczjpabqmqhls5qma33qvxb6xipgry36rqh5z"; + libraryHaskellDepends = [ + base + base16-bytestring + cryptohash-sha1 + data-default + diagrams + diagrams-core + diagrams-lib + diagrams-svg + hakyll + hint + pandoc-types + split + svg-builder + text + ]; + testHaskellDepends = [ + base + containers + hakyll + hspec + HUnit + pandoc-types + tagsoup + text + ]; + description = "A Hakyll plugin for rendering diagrams figures from embedded Haskell code"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + hakyll-dir-list = callPackage ( { mkDerivation, @@ -300597,6 +301990,34 @@ self: { } ) { }; + happy_2_2 = callPackage ( + { + mkDerivation, + base, + happy-lib, + process, + }: + mkDerivation { + pname = "happy"; + version = "2.2"; + sha256 = "1c2y9brklg7kf7nh2k4s94cs5ghwg7mc3mdrl6sjkg31kb4lb4rf"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base + happy-lib + ]; + testHaskellDepends = [ + base + process + ]; + description = "Happy is a parser generator for Haskell"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + mainProgram = "happy"; + } + ) { }; + happy-arbitrary = callPackage ( { mkDerivation, @@ -300749,6 +302170,34 @@ self: { } ) { }; + happy-lib_2_2 = callPackage ( + { + mkDerivation, + array, + base, + containers, + mtl, + transformers, + }: + mkDerivation { + pname = "happy-lib"; + version = "2.2"; + sha256 = "00rh3q7w0jlcxlrx9c2by050mvgnsjn982rqgiw0h85m28mndq6j"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array + base + containers + mtl + transformers + ]; + doHaddock = false; + description = "Happy is a parser generator for Haskell implemented using this library"; + license = lib.licensesSpdx."BSD-2-Clause"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + happy-meta = callPackage ( { mkDerivation, @@ -301399,7 +302848,6 @@ self: { adjunctions, base, distributive, - doctest-parallel, first-class-families, prettyprinter, QuickCheck, @@ -301410,8 +302858,8 @@ self: { }: mkDerivation { pname = "harpie"; - version = "0.1.3.1"; - sha256 = "1wdr4jqfaqiy089hkgimaxhmrqh82cb73ycg6sl5bx22k871fjyr"; + version = "0.1.4.0"; + sha256 = "10y5g2ivdzgicsssfipg37nak2f8kv7r3lkfvhij4sj85ssjflv2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -301431,12 +302879,48 @@ self: { base first-class-families ]; - testHaskellDepends = [ + description = "Haskell array programming"; + license = lib.licensesSpdx."BSD-3-Clause"; + mainProgram = "harpie-bug-issue1"; + } + ) { }; + + harpie_0_2_0_0 = callPackage ( + { + mkDerivation, + adjunctions, + base, + distributive, + first-class-families, + prettyprinter, + random, + vector, + vector-algorithms, + }: + mkDerivation { + pname = "harpie"; + version = "0.2.0.0"; + sha256 = "0ki1pbpjy8fqr8hp9krvk45yiqifkvjangqkhnxn3004rm679726"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + adjunctions base - doctest-parallel + distributive + first-class-families + prettyprinter + random + vector + vector-algorithms + ]; + executableHaskellDepends = [ + adjunctions + base + first-class-families ]; description = "Haskell array programming"; license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; mainProgram = "harpie-bug-issue1"; } ) { }; @@ -301446,7 +302930,6 @@ self: { mkDerivation, adjunctions, base, - doctest-parallel, first-class-families, harpie, numhask, @@ -301454,18 +302937,14 @@ self: { }: mkDerivation { pname = "harpie-numhask"; - version = "0.1.0.2"; - sha256 = "1vf21nbqrgws4lk6k1rhw00wccdskjl5cqdc9w0psgcdrq8xvprm"; + version = "0.1.1.0"; + sha256 = "1zj29m08cp1fgi1axi04id9r8dfk4k1a941il456rhpvsq1aip6q"; libraryHaskellDepends = [ adjunctions base first-class-families harpie numhask - ]; - testHaskellDepends = [ - base - doctest-parallel prettyprinter ]; description = "numhask shim for harpie"; @@ -301473,6 +302952,34 @@ self: { } ) { }; + harpie-numhask_0_2_0_0 = callPackage ( + { + mkDerivation, + adjunctions, + base, + first-class-families, + harpie, + numhask, + prettyprinter, + }: + mkDerivation { + pname = "harpie-numhask"; + version = "0.2.0.0"; + sha256 = "0xvnd8jkhdzbjmd6cjsnl6nznmccqmxkpsb9gpcxycwafbkpf6vm"; + libraryHaskellDepends = [ + adjunctions + base + first-class-families + harpie + numhask + prettyprinter + ]; + description = "numhask shim for harpie"; + license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + harpy = callPackage ( { mkDerivation, @@ -302567,33 +304074,25 @@ self: { containers, deepseq, filepath, - ghc-bignum, ghc-prim, - HUnit, os-string, primitive, QuickCheck, - random, tasty, tasty-hunit, tasty-quickcheck, text, - unix, }: mkDerivation { pname = "hashable"; - version = "1.5.0.0"; - sha256 = "0snvrnh9q4arjwk6hdvb4zwb22sh7rlgvr9px7bnqpys3273m2z5"; - revision = "1"; - editedCabalFile = "1vsq3wv397lp208p7zs8fplxdix4jmv688dj4ych4983prn188rg"; + version = "1.5.1.0"; + sha256 = "04mig5gzgjbwaq9zycrnzy3b97fkqqwdrni0akjgzjcjrq87q2zd"; libraryHaskellDepends = [ base bytestring containers deepseq filepath - ghc-bignum - ghc-prim os-string text ]; @@ -302602,16 +304101,13 @@ self: { bytestring filepath ghc-prim - HUnit os-string primitive QuickCheck - random tasty tasty-hunit tasty-quickcheck text - unix ]; description = "A class for types that can be converted to a hash value"; license = lib.licensesSpdx."BSD-3-Clause"; @@ -305239,6 +306735,7 @@ self: { aeson-pretty, array, async, + attoparsec, base, base16-bytestring, binary, @@ -305254,6 +306751,7 @@ self: { ghc, ghc-boot, ghc-boot-th, + ghc-heap, ghci, haskeline, haskell-debugger-view, @@ -305268,6 +306766,7 @@ self: { random, regex, tasty, + tasty-expected-failure, tasty-golden, tasty-hunit, temporary, @@ -305279,13 +306778,14 @@ self: { }: mkDerivation { pname = "haskell-debugger"; - version = "0.10.1.0"; - sha256 = "0jqnbrv9a7k1lpmvkdzmc88wz576m9f6cag5in4s65y6akna6mh5"; + version = "0.11.0.0"; + sha256 = "00l8z1rnfbax7imr4syq845i8nf6kxqm3lsw75r4dinrvf94nh42"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson array + attoparsec base base16-bytestring binary @@ -305300,6 +306800,7 @@ self: { ghc ghc-boot ghc-boot-th + ghc-heap ghci haskell-debugger-view hie-bios @@ -305333,7 +306834,6 @@ self: { process text transformers - unix unordered-containers ]; testHaskellDepends = [ @@ -305351,6 +306851,7 @@ self: { random regex tasty + tasty-expected-failure tasty-golden tasty-hunit temporary @@ -305374,8 +306875,8 @@ self: { }: mkDerivation { pname = "haskell-debugger-view"; - version = "0.1.0.0"; - sha256 = "0kfpkpbw3m2z7qr0fibsacqcfiiczawhml6hvr25i7czrg4vnk4a"; + version = "0.2.0.0"; + sha256 = "0wcw8kppq68gdpyyhvp1j338c0rcdrrxkd0w6sfwsq7z5nkww7cg"; libraryHaskellDepends = [ base bytestring @@ -305699,8 +307200,8 @@ self: { }: mkDerivation { pname = "haskell-ffprobe"; - version = "0.1.0.1"; - sha256 = "00b7pacn8bn7xhhznpbnnxzqjzf615winq6pnhs08yhawyvb0af3"; + version = "0.1.0.3"; + sha256 = "1c4lfmac3xka4c396qvbi6qrjr4i1nzvlbyqbzg1y8np480g222m"; libraryHaskellDepends = [ aeson base @@ -306536,14 +308037,11 @@ self: { ghc-boot, ghc-boot-th, ghc-exactprint, - ghc-lib-parser, - ghc-lib-parser-ex, ghcide, githash, hashable, hie-bios, hiedb, - hlint, hls-graph, hls-plugin-api, hls-test-utils, @@ -306568,7 +308066,6 @@ self: { process-extras, QuickCheck, random, - refact, regex-applicative, regex-tdfa, row-types, @@ -306589,7 +308086,6 @@ self: { tasty-quickcheck, tasty-rerun, template-haskell, - temporary, text, text-rope, time, @@ -306604,8 +308100,8 @@ self: { }: mkDerivation { pname = "haskell-language-server"; - version = "2.12.0.0"; - sha256 = "1la7kmpapzchypjarvy8vwjggxr4smaqfjpc1wfrgh3y3anb6s8p"; + version = "2.13.0.0"; + sha256 = "1hm5p40gkq3nh9dm7ws9nx3hpvykzq3prd2spyqrcgq390q8crxv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -306633,14 +308129,11 @@ self: { ghc-boot ghc-boot-th ghc-exactprint - ghc-lib-parser - ghc-lib-parser-ex ghcide githash hashable hie-bios hiedb - hlint hls-graph hls-plugin-api hls-test-utils @@ -306660,7 +308153,6 @@ self: { prettyprinter process process-extras - refact regex-applicative regex-tdfa row-types @@ -306674,7 +308166,6 @@ self: { stylish-haskell syb template-haskell - temporary text text-rope time @@ -308478,6 +309969,8 @@ self: { pname = "haskell-src-meta"; version = "0.8.15"; sha256 = "1ghdddbrhv4qwa7fgibafs7y2mr1rxrh2w67irs15wfmk4qvdsi6"; + revision = "1"; + editedCabalFile = "1ifh83zib6m113gzd4cfdw70w1lcz1ag5cskxnf1nvsfaa2k115h"; libraryHaskellDepends = [ base haskell-src-exts @@ -314341,7 +315834,7 @@ self: { } ) { }; - hasql_1_9_3_2 = callPackage ( + hasql_1_10_2 = callPackage ( { mkDerivation, aeson, @@ -314349,9 +315842,7 @@ self: { base, bytestring, bytestring-strict-builder, - containers, contravariant, - contravariant-extras, criterion, dlist, hashable, @@ -314360,10 +315851,12 @@ self: { iproute, mtl, postgresql-binary, + postgresql-connection-string, postgresql-libpq, profunctors, QuickCheck, quickcheck-instances, + random, rerebase, scientific, testcontainers-postgresql, @@ -314378,24 +315871,51 @@ self: { }: mkDerivation { pname = "hasql"; - version = "1.9.3.2"; - sha256 = "1qaiawgz9qrkw11p6z6spqsvwmcq6s4xjkl54cn3vpwqzyvfcacf"; + version = "1.10.2"; + sha256 = "1l9la57k41v3swq7wfwrqwv07xvaawwdl0ycwhwwxgivs0smv40x"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-strict-builder - containers contravariant dlist hashable iproute mtl postgresql-binary + postgresql-connection-string postgresql-libpq profunctors scientific + text + text-builder + time + transformers + unordered-containers + uuid + vector + witherable + ]; + testHaskellDepends = [ + aeson + attoparsec + base + bytestring + contravariant + dlist + hashable + hspec + iproute + mtl + postgresql-libpq + profunctors + QuickCheck + quickcheck-instances + random + rerebase + scientific testcontainers-postgresql text text-builder @@ -314406,20 +315926,11 @@ self: { vector witherable ]; - testHaskellDepends = [ - contravariant-extras - hspec - QuickCheck - quickcheck-instances - rerebase - testcontainers-postgresql - ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ criterion rerebase ]; - doHaddock = false; description = "Fast PostgreSQL driver with a flexible mapping API"; license = lib.licensesSpdx."MIT"; hydraPlatforms = lib.platforms.none; @@ -314520,7 +316031,7 @@ self: { hasql-cursor-query = callPackage ( { mkDerivation, - base-prelude, + base, bytestring, contravariant, foldl, @@ -314534,10 +316045,10 @@ self: { }: mkDerivation { pname = "hasql-cursor-query"; - version = "0.4.5.2"; - sha256 = "130wvfsvyi96kwnhifs947m62iz46hrwc9s0k4xw59106v9vmdnc"; + version = "0.4.5.3"; + sha256 = "0blvwhxn5f1r1j2g2d7ycq1a0skgccgq90nc811xjm0zp4nghynd"; libraryHaskellDepends = [ - base-prelude + base bytestring contravariant foldl @@ -314564,28 +316075,26 @@ self: { { mkDerivation, base, - base-prelude, bytestring, - bytestring-tree-builder, contravariant, contravariant-extras, hasql, hasql-transaction, + text, transformers, }: mkDerivation { pname = "hasql-cursor-transaction"; - version = "0.6.5.2"; - sha256 = "1l9r0x174xaiz79s9mqr760isjcqz4wcznrjsplkrkk8974zm92n"; + version = "0.6.6.1"; + sha256 = "1n5ms3ric7gvys7lp6d17r4xq3b0dc4lrd4bj71lrc0ji41yvixp"; libraryHaskellDepends = [ base - base-prelude bytestring - bytestring-tree-builder contravariant contravariant-extras hasql hasql-transaction + text transformers ]; description = "An abstraction for simultaneous fetching from multiple PostgreSQL cursors"; @@ -314674,6 +316183,47 @@ self: { } ) { }; + hasql-dynamic-statements_0_5_0_1 = callPackage ( + { + mkDerivation, + base, + bytestring, + containers, + hasql, + hasql-implicits, + hspec, + hspec-discover, + rerebase, + testcontainers-postgresql, + text, + text-builder, + }: + mkDerivation { + pname = "hasql-dynamic-statements"; + version = "0.5.0.1"; + sha256 = "13xjv3k9xykczp6rch4rvxzmxg6226grl4hfsak2322231qbc1n9"; + libraryHaskellDepends = [ + base + bytestring + containers + hasql + hasql-implicits + text + text-builder + ]; + testHaskellDepends = [ + hasql + hspec + rerebase + testcontainers-postgresql + ]; + testToolDepends = [ hspec-discover ]; + description = "Hasql extension for dynamic construction of statements"; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + hasql-effectful = callPackage ( { mkDerivation, @@ -314854,8 +316404,8 @@ self: { }: mkDerivation { pname = "hasql-implicits"; - version = "0.2.0.1"; - sha256 = "01qkb4fgi0i6h4gsdrfya9sl4flfvjhyilx5awpyay34nqfcs4rh"; + version = "0.2.0.2"; + sha256 = "0gp6kn5ijc7x3gxyn0gywg7bnrlw6l1jjkd40b8gyq0qi2hk4qr6"; libraryHaskellDepends = [ aeson base @@ -315145,6 +316695,52 @@ self: { } ) { }; + hasql-notifications_0_2_5_0 = callPackage ( + { + mkDerivation, + base, + bytestring, + hasql, + hasql-pool, + hspec, + hspec-discover, + postgresql-libpq, + QuickCheck, + text, + }: + mkDerivation { + pname = "hasql-notifications"; + version = "0.2.5.0"; + sha256 = "0zkglh01v5vr73lmr8r38i2f81cssysvm8dscyga7miib0daiisb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + bytestring + hasql + hasql-pool + postgresql-libpq + text + ]; + executableHaskellDepends = [ + base + hasql + ]; + testHaskellDepends = [ + base + bytestring + hasql + hspec + QuickCheck + ]; + testToolDepends = [ hspec-discover ]; + description = "LISTEN/NOTIFY support for Hasql"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hasql-notifications"; + } + ) { }; + hasql-optparse-applicative = callPackage ( { mkDerivation, @@ -315178,6 +316774,40 @@ self: { } ) { }; + hasql-optparse-applicative_0_9_1 = callPackage ( + { + mkDerivation, + attoparsec, + attoparsec-time, + base, + bytestring, + hasql, + hasql-pool, + optparse-applicative, + text, + time, + }: + mkDerivation { + pname = "hasql-optparse-applicative"; + version = "0.9.1"; + sha256 = "00gjwi39ihj7ccszh44x7aw1sph4wzqhmw4bgpis5ms7dsa81mla"; + libraryHaskellDepends = [ + attoparsec + attoparsec-time + base + bytestring + hasql + hasql-pool + optparse-applicative + text + time + ]; + description = "\"optparse-applicative\" parsers for \"hasql\""; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + hasql-pipes = callPackage ( { mkDerivation, @@ -315296,6 +316926,57 @@ self: { } ) { }; + hasql-pool_1_4_1 = callPackage ( + { + mkDerivation, + async, + base, + bytestring, + hasql, + hspec, + hspec-discover, + postgresql-libpq, + random, + rerebase, + stm, + testcontainers-postgresql, + text, + text-builder, + time, + tuple, + uuid, + }: + mkDerivation { + pname = "hasql-pool"; + version = "1.4.1"; + sha256 = "1vkb8zz0dx92p5x1scb9i9i42v699lcq97b6q0jzh1sx09slfxr0"; + libraryHaskellDepends = [ + base + bytestring + hasql + stm + text + time + uuid + ]; + testHaskellDepends = [ + async + hasql + hspec + postgresql-libpq + random + rerebase + testcontainers-postgresql + text-builder + tuple + ]; + testToolDepends = [ hspec-discover ]; + description = "Pool of connections for Hasql"; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + hasql-postgres = callPackage ( { mkDerivation, @@ -315438,6 +317119,36 @@ self: { } ) { }; + hasql-postgresql-types = callPackage ( + { + mkDerivation, + base, + hasql, + postgresql-types-algebra, + ptr-peeker, + ptr-poker, + tagged, + text-builder, + }: + mkDerivation { + pname = "hasql-postgresql-types"; + version = "0.1.0.1"; + sha256 = "0x1vdfqm1mg640cvsa6m4i37nnrrs6l5p076hx4gbmzjcv30xv21"; + libraryHaskellDepends = [ + base + hasql + postgresql-types-algebra + ptr-peeker + ptr-poker + tagged + text-builder + ]; + description = "Integration of \"hasql\" with \"postgresql-types\""; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + hasql-queue = callPackage ( { mkDerivation, @@ -315552,8 +317263,8 @@ self: { }: mkDerivation { pname = "hasql-resource-pool"; - version = "1.9.1.3"; - sha256 = "10hgwdpnd82yhsjflbskngwkjmkpp49qrvxspgka24ngp8q08zyz"; + version = "1.10.1.0"; + sha256 = "0nkpsj3zpr64qmr9va9cizq9wc118f8pmjch1g9gh8rdyv9lv5nv"; libraryHaskellDepends = [ base-prelude clock @@ -315845,6 +317556,44 @@ self: { } ) { }; + hasql-th_0_5 = callPackage ( + { + mkDerivation, + base, + containers, + contravariant, + foldl, + hasql, + postgresql-syntax, + template-haskell, + template-haskell-compat-v0208, + text, + uuid, + vector, + }: + mkDerivation { + pname = "hasql-th"; + version = "0.5"; + sha256 = "0s8bc64ycxrsffcb59v2inj7s2qpf7ar3pcjgxcrd0dq6djqc5gd"; + libraryHaskellDepends = [ + base + containers + contravariant + foldl + hasql + postgresql-syntax + template-haskell + template-haskell-compat-v0208 + text + uuid + vector + ]; + description = "Template Haskell utilities for Hasql"; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + hasql-transaction_1_1_0_1 = callPackage ( { mkDerivation, @@ -315921,6 +317670,45 @@ self: { } ) { }; + hasql-transaction_1_2_2 = callPackage ( + { + mkDerivation, + async, + base, + bytestring, + bytestring-tree-builder, + contravariant, + hasql, + mtl, + rerebase, + text, + transformers, + }: + mkDerivation { + pname = "hasql-transaction"; + version = "1.2.2"; + sha256 = "1nmc9srmic0jpfl0n17v0s0m99qb1jmsrmind55y8d9hk1x2r45z"; + libraryHaskellDepends = [ + base + bytestring + bytestring-tree-builder + contravariant + hasql + mtl + text + transformers + ]; + testHaskellDepends = [ + async + hasql + rerebase + ]; + description = "Composable abstraction over retryable transactions for Hasql"; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + hasql-transaction-io = callPackage ( { mkDerivation, @@ -316006,6 +317794,7 @@ self: { megaparsec, mtl, mysql-haskell, + non-empty, optics-core, pretty-simple, prettyprinter, @@ -316016,8 +317805,8 @@ self: { }: mkDerivation { pname = "hasqlator-mysql"; - version = "0.2.1"; - sha256 = "02hkkv2f0zck15dfmdrfr6vw9ma4xifv4jmz5crkyvmr68jw6n4d"; + version = "0.2.2"; + sha256 = "0hwnlw5n9idx9iz3lck402lm7n0c2mip46hm9zzs248pikkvl4k5"; libraryHaskellDepends = [ aeson base @@ -316029,6 +317818,7 @@ self: { megaparsec mtl mysql-haskell + non-empty optics-core pretty-simple prettyprinter @@ -321034,8 +322824,8 @@ self: { { mkDerivation, base }: mkDerivation { pname = "heck"; - version = "1.0.0.0"; - sha256 = "1j318pv3afazvl7m65w2gbmhcddnyn3gxf25k36wkd6rlclzbnrh"; + version = "1.0.1.0"; + sha256 = "00lnlv0hwlsq5y5r0b2y0v18l7kcwbfn8w5gnphrw3rihdp70ik8"; libraryHaskellDepends = [ base ]; description = "Abstract unit test interface"; license = lib.licensesSpdx."0BSD"; @@ -321309,6 +323099,8 @@ self: { pname = "hedgehog"; version = "1.7"; sha256 = "0kjn3dxyhk55ayjd9m8acr8kxhbzc70piszkiy2gbnwqyyhbrqh9"; + revision = "1"; + editedCabalFile = "17k8m45craiwpfhp4kypnzxwkv7vzgsh9q99r3k3bzcxnfycqj8z"; libraryHaskellDepends = [ ansi-terminal async @@ -322283,8 +324075,8 @@ self: { pname = "hedn"; version = "0.3.0.4"; sha256 = "06js9mcif99k8bfyrsynlg1w5rjygydk5l0qhlrk6pa5v288a7wv"; - revision = "3"; - editedCabalFile = "0yaxvs2ywl1scpp2hjqlivhbxgd7qmn5ilzx8hzz59q1z9x075v4"; + revision = "4"; + editedCabalFile = "0svxilf3c540nvhlfwz0dc97sqn98w24k2gka92r74qd7663cpix"; libraryHaskellDepends = [ base containers @@ -323976,6 +325768,52 @@ self: { } ) { }; + henforcer = callPackage ( + { + mkDerivation, + base, + containers, + dlist, + filepattern, + ghc, + hedgehog, + optparse-applicative, + pollock, + tasty, + tasty-hedgehog, + text, + tomland, + }: + mkDerivation { + pname = "henforcer"; + version = "1.0.0.0"; + sha256 = "1mlavim9qvpxxadswx5nfkjb8qwrvs8jpx05h3hxm99baj4pa7bc"; + libraryHaskellDepends = [ + base + containers + dlist + filepattern + ghc + optparse-applicative + pollock + text + tomland + ]; + testHaskellDepends = [ + base + containers + hedgehog + tasty + tasty-hedgehog + ]; + doHaddock = false; + description = "GHC plugin to enforce user specified rules on code"; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + hepevt = callPackage ( { mkDerivation, @@ -324070,8 +325908,8 @@ self: { }: mkDerivation { pname = "heptapod"; - version = "1.1.0.1"; - sha256 = "19453ljazkgssj53ws2xlaln6kvr2fv1yh0crjx4zr17vl7pgc7x"; + version = "1.1.0.3"; + sha256 = "0vf6wff85z3r2gga9bqc1idvi7wf7sljzm0f8flm8y1bz9wi8i9d"; libraryHaskellDepends = [ base bytestring @@ -324300,8 +326138,8 @@ self: { }: mkDerivation { pname = "hercules-ci-agent"; - version = "0.10.7"; - sha256 = "1d2hmhh2r0drg37cm9f3jwv5k8gjmg3mnsrsvfip0m49n09bmpqi"; + version = "0.10.8"; + sha256 = "0f8d5xfix0bsxdvanf6zn1l2qs80aivva86qf3j1clfr2dny4g59"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ @@ -324835,8 +326673,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cli"; - version = "0.3.8"; - sha256 = "1dkb2njp9agmawfyfsyy3sz3kx42jlv0zmbrr2b4r6zmv8v9q97h"; + version = "0.3.9"; + sha256 = "091j83ac4byr6vbmd0wq1b86p23d1z7sn5ls6w24l72dp8fvfjjp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -324946,8 +326784,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cnix-expr"; - version = "0.5.0.0"; - sha256 = "0dlci548d4kpi3za59fdfd5y5p8h08rfyyvhi0a0vm4zz4jip249"; + version = "0.5.1.0"; + sha256 = "01m6l915yy3v6qpc53xq48kp3mi39bclsjdwswvgwvp9z9hjvg0p"; setupHaskellDepends = [ base Cabal @@ -325030,8 +326868,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cnix-store"; - version = "0.4.0.0"; - sha256 = "0jrln90r7yg2gdd5xiwfqz8wsmzx21pfvi8bn23p30hfv5flpha8"; + version = "0.4.1.0"; + sha256 = "0jy7p69jhv81rg8xikd7smgpg3vwccjzly3k8hs7ipdp2mprwffc"; setupHaskellDepends = [ base Cabal @@ -326144,6 +327982,7 @@ self: { libff, megaparsec, memory, + monad-loops, mtl, operational, optics-core, @@ -326186,8 +328025,8 @@ self: { }: mkDerivation { pname = "hevm"; - version = "0.56.0"; - sha256 = "1axwzs066312s3ncr89rmm14ny8ibzhrcqn9f9gfibsgyw9w5z7d"; + version = "0.57.0"; + sha256 = "0vf21hlz2h45xsnbliaqnj56jw4s51avs1aa37qvbwsyhncankpy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -326212,6 +328051,7 @@ self: { filepattern megaparsec memory + monad-loops mtl operational optics-core @@ -326307,8 +328147,6 @@ self: { base bytestring containers - filemanip - filepath here mtl tasty @@ -328585,8 +330423,8 @@ self: { pname = "hgmp"; version = "0.1.2.1"; sha256 = "08w0b6yla086vk802xqcqslpkqpjx2h2hc6l3jyymms77qyn70f6"; - revision = "2"; - editedCabalFile = "15n60g7bp59f6sbch4ww2k5dgjbghghw0k0jifn3rgiiki14gsxk"; + revision = "3"; + editedCabalFile = "1m4rhz6myq5bwysmcv4jsaayxfgfn6ka3dfxppnvxjgcrn4nd0zd"; libraryHaskellDepends = [ base ghc-bignum @@ -329139,6 +330977,84 @@ self: { } ) { }; + hic = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + cimple, + containers, + data-fix, + groom, + hashable, + hspec, + hspec-discover, + mtl, + optparse-applicative, + prettyprinter, + prettyprinter-ansi-terminal, + process, + QuickCheck, + text, + transformers-compat, + }: + mkDerivation { + pname = "hic"; + version = "0.0.0.1"; + sha256 = "0y5gncc29ksdj2xmy737qyy2csni8wrhmps0mdkyxhnddzyhif2c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + base + cimple + containers + data-fix + hashable + mtl + prettyprinter + prettyprinter-ansi-terminal + QuickCheck + text + transformers-compat + ]; + executableHaskellDepends = [ + aeson + base + bytestring + cimple + containers + data-fix + groom + optparse-applicative + prettyprinter + prettyprinter-ansi-terminal + process + text + ]; + testHaskellDepends = [ + base + cimple + containers + data-fix + groom + hspec + mtl + prettyprinter + prettyprinter-ansi-terminal + QuickCheck + text + ]; + testToolDepends = [ hspec-discover ]; + description = "High Integrity Cimple (Hic) inference and lowering"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "hic-check"; + broken = true; + } + ) { }; + hiccup = callPackage ( { mkDerivation, @@ -329711,6 +331627,77 @@ self: { } ) { }; + hiedb_0_8_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.8.0.0"; + sha256 = "0jfq70fidsfjja566idr9dlx7yvb4nhr14hkap1fxfnjkcrx0045"; + 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.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + mainProgram = "hiedb"; + } + ) { }; + hiedb-plugin = callPackage ( { mkDerivation, @@ -330819,6 +332806,107 @@ self: { } ) { }; + himari = callPackage ( + { + mkDerivation, + aeson, + aeson-pretty, + base, + bytestring, + containers, + convertible, + data-default, + deepseq, + deriving-aeson, + exceptions, + filepath, + hashable, + hlint, + lens, + monad-logger, + mtl, + pretty-simple, + primitive, + QuickCheck, + retry, + safe, + sydtest, + text, + time, + typed-process, + unliftio, + unordered-containers, + vector, + }: + mkDerivation { + pname = "himari"; + version = "1.0.5.0"; + sha256 = "1dg3sx3242yajxqcky6mmjjhhsc5qbyhdp3f06wgb9wphc1m13lg"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson + aeson-pretty + base + bytestring + containers + convertible + data-default + deepseq + deriving-aeson + exceptions + filepath + hashable + lens + monad-logger + mtl + pretty-simple + primitive + retry + safe + text + time + typed-process + unliftio + unordered-containers + vector + ]; + testHaskellDepends = [ + aeson + aeson-pretty + base + bytestring + containers + convertible + data-default + deepseq + deriving-aeson + exceptions + filepath + hashable + lens + monad-logger + mtl + pretty-simple + primitive + QuickCheck + retry + safe + sydtest + text + time + typed-process + unliftio + unordered-containers + vector + ]; + testToolDepends = [ hlint ]; + description = "A standard library for Haskell as an alternative to rio"; + license = lib.licensesSpdx."Apache-2.0"; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + himerge = callPackage ( { mkDerivation, @@ -330992,8 +333080,8 @@ self: { }: mkDerivation { pname = "hindent"; - version = "6.2.1"; - sha256 = "0vhhbqlf4j17xqwln40z29vsv3r1rb0gd596skd1wkgljm124wrp"; + version = "6.3.0"; + sha256 = "0axbrrpqm4p8d43ypdsgi345xz7zbdll9a1zv235dia4cxk0mpv4"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -331101,9 +333189,7 @@ self: { doHaddock = false; description = "Extensible Haskell pretty printer"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hindent"; - broken = true; } ) { }; @@ -334043,8 +336129,10 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.51.1"; - sha256 = "05hpsb3iqr5pxfq0nghs2zf51bmfx43czx8n18vm60sbqby9dw7b"; + version = "1.51.2"; + sha256 = "0bcb1dxlmi3h12wb7y4iqbi0p0wvzp23m0xkghiz5k5ydp3ixrv8"; + revision = "1"; + editedCabalFile = "082qb8n4lhgjab0829dgf7pchh1p8j8d0qq39sx8mcinyjwmm9gd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -334598,8 +336686,8 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "1.51.1"; - sha256 = "1zhg7fxclkyz5iwbxg97ha1d0lvbqxbwwfp9szb1d7gqnnibp458"; + version = "1.51.2"; + sha256 = "03smy5xc817c797nkh5pjvrb2p41xdvxvwlkhzgkb9b7hrk9nic8"; libraryHaskellDepends = [ aeson aeson-pretty @@ -334865,8 +336953,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.51.1"; - sha256 = "19vm8gj0zkkcd07b4xr1rpcl8cvsb2xb821kk6r2xkylvn164daa"; + version = "1.51.2"; + sha256 = "0wmqqr83zfz82qdw2pvqd937233brxa67wvjgaag7fqjhlbpd9qk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -335001,8 +337089,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.51.1"; - sha256 = "1fxkdaibjp7sigdhdchrpw9lbjlq5l75jrqgya4l7vgyhbfmd8k8"; + version = "1.51.2"; + sha256 = "12k2sl9ll8lfxl194hin8c58gbipxh4yyzycbwn0lbb231agyjfg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -336525,8 +338613,8 @@ self: { }: mkDerivation { pname = "hls-graph"; - version = "2.12.0.0"; - sha256 = "1z43wbyy41knmipc3yq8wg18nzbhygphk715xpmlg36xhgcwa85l"; + version = "2.13.0.0"; + sha256 = "0iwjiamckwkbxc7q20dqfiirpmr1krwav75rrqrjj7l9bnvdhjhs"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson @@ -336807,8 +338895,8 @@ self: { }: mkDerivation { pname = "hls-plugin-api"; - version = "2.12.0.0"; - sha256 = "1s13cyvzndf2rlhxdw9kbhj2yrzjlxx2hq9b3gwdd1wrfn0ix1r1"; + version = "2.13.0.0"; + sha256 = "1804fbiwl0f8mnliwm6275gmc8yc03lf6qa6157fvi9aav37va3z"; libraryHaskellDepends = [ aeson base @@ -337275,8 +339363,8 @@ self: { }: mkDerivation { pname = "hls-test-utils"; - version = "2.12.0.0"; - sha256 = "0wqabmas8wkif93ffqw0818v6iha80c1vlr2jqxd86vkbpnl55ig"; + version = "2.13.0.0"; + sha256 = "19l3wv1jg9mi6rdbqdirk5qcwrl36v5lbs2brk6h2dfaj686gk4n"; libraryHaskellDepends = [ aeson async @@ -338578,8 +340666,8 @@ self: { }: mkDerivation { pname = "hmp3-ng"; - version = "2.17.2"; - sha256 = "1ybpn7gw7f1n6jpynvp9l36jz9h5iky6zhch7g303adc08n6hr95"; + version = "2.17.3"; + sha256 = "1afws7lm7c4bxwy31nrfq4li7ign1g6vdjk5qdrp9lv1xymsd4ly"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -342625,6 +344713,122 @@ self: { } ) { }; + hoogle_5_0_19_0 = callPackage ( + { + mkDerivation, + aeson, + ansi-terminal, + base, + binary, + blaze-html, + blaze-markup, + bytestring, + Cabal-syntax, + cmdargs, + conduit, + conduit-extra, + containers, + crypton-connection, + data-default-class, + deepseq, + directory, + extra, + filepath, + ghc-lib-parser, + hackage-revdeps, + hashable, + haskell-src-exts, + http-conduit, + http-types, + js-flot, + js-jquery, + mmap, + old-locale, + process-extras, + QuickCheck, + resourcet, + safe, + storable-tuple, + tar, + template-haskell, + temporary, + text, + time, + transformers, + uniplate, + utf8-string, + vector, + wai, + wai-logger, + warp, + warp-tls, + zlib, + }: + mkDerivation { + pname = "hoogle"; + version = "5.0.19.0"; + sha256 = "05qv17pv0sg4gbmabzqn9fyh6lxjzckfiqbkgsfqp1imb5w3szd3"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson + ansi-terminal + base + binary + blaze-html + blaze-markup + bytestring + Cabal-syntax + cmdargs + conduit + conduit-extra + containers + crypton-connection + data-default-class + deepseq + directory + extra + filepath + ghc-lib-parser + hackage-revdeps + hashable + haskell-src-exts + http-conduit + http-types + js-flot + js-jquery + mmap + old-locale + process-extras + QuickCheck + resourcet + safe + storable-tuple + tar + template-haskell + temporary + text + time + transformers + uniplate + utf8-string + vector + wai + wai-logger + warp + warp-tls + zlib + ]; + executableHaskellDepends = [ base ]; + testFlags = [ "--no-net" ]; + description = "Haskell API Search"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hoogle"; + } + ) { }; + hoogle-index = callPackage ( { mkDerivation, @@ -342710,6 +344914,8 @@ self: { pname = "hookup"; version = "0.8"; sha256 = "1p8mkb71bbs3lv7n1krcngaskn2s2icm3sl30qs8dsla7ww8afqm"; + revision = "1"; + editedCabalFile = "0z9q3y8zfnjz3snrzkqva1nl81l0v98zl542blayxhyhzkxb980i"; libraryHaskellDepends = [ async attoparsec @@ -343792,34 +345998,19 @@ self: { horizontal-rule = callPackage ( { mkDerivation, - ansi-wl-pprint, - array, base, - constraints, - containers, - data-default, - exceptions, - extra, - monad-control, - mtl, optparse-applicative, - stm, - syb, + prettyprinter, tasty, tasty-hunit, - template-haskell, terminal-size, text, time, - transformers-base, - unliftio, }: mkDerivation { pname = "horizontal-rule"; - version = "0.7.0.0"; - sha256 = "0s4hf7frj1gc41v83qk8fgdfn49msmvhcfw6vjklx6w7b6pkfx9x"; - revision = "2"; - editedCabalFile = "02cql9yvsvbi6xf7kplidmxay7n70lxb1z2499vngn7197b6d5kh"; + version = "0.7.1.0"; + sha256 = "0h4i9crz0hv2b01hmb9i5gp8cwf0hw3wxwphi9f65d7gjywscr2k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -343828,29 +346019,16 @@ self: { text ]; executableHaskellDepends = [ - ansi-wl-pprint base optparse-applicative + prettyprinter text time ]; testHaskellDepends = [ - array base - constraints - containers - data-default - exceptions - extra - monad-control - mtl - stm - syb tasty tasty-hunit - template-haskell - transformers-base - unliftio ]; description = "horizontal rule for the terminal"; license = lib.licensesSpdx."MIT"; @@ -344708,141 +346886,6 @@ self: { } ) { }; - hpack_0_38_1 = 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, - vcr, - vector, - yaml, - }: - mkDerivation { - pname = "hpack"; - version = "0.38.1"; - sha256 = "03qygb51jb4r6sg2bkaz7k80h11wgjr27hgpx6h08xm8axdk2gba"; - revision = "1"; - editedCabalFile = "0dyd6pp2pk62nynp0x2j9kjddfv43p9inplk4iya7hdldyjs77k0"; - 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 - vcr - vector - yaml - ]; - testToolDepends = [ hspec-discover ]; - description = "A modern format for Haskell packages"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - mainProgram = "hpack"; - } - ) { }; - hpack = callPackage ( { mkDerivation, @@ -348758,6 +350801,307 @@ self: { } ) { }; + hs-hath = callPackage ( + { + mkDerivation, + aeson, + async, + base, + base64, + base64-bytestring, + binary, + bytestring, + case-insensitive, + co-log, + co-log-core, + co-log-polysemy, + conduit, + conduit-extra, + containers, + crypton, + crypton-connection, + crypton-x509, + crypton-x509-store, + cryptostore, + data-default-class, + dhall, + digest, + directory, + exceptions, + extra, + filepath, + ghc-prim, + hex-text, + hspec, + http-client, + http-client-tls, + http-conduit, + http-media, + http-types, + ini, + lrucache, + mason, + memory, + monad-control, + monad-loops, + mtl, + network, + network-uri, + optparse-applicative, + polysemy, + polysemy-zoo, + process, + recv, + relude, + resourcet, + retry, + safe-exceptions, + servant, + servant-client, + servant-client-core, + servant-server, + sqlite-simple, + stm, + streaming-commons, + string-interpolate, + suspend, + template-haskell, + temporary, + text, + time, + time-units, + timers, + tls, + tls-session-manager, + transformers, + unix, + unliftio, + unliftio-core, + unordered-containers, + wai, + wai-extra, + warp, + xml-conduit, + }: + mkDerivation { + pname = "hs-hath"; + version = "1.1.1"; + sha256 = "11l0q99d9a5ynhxxbqk1vfhjxbzrqkvy7wln4ygkwmxd4y3cf1rg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + async + base + base64 + base64-bytestring + binary + bytestring + case-insensitive + co-log + co-log-core + co-log-polysemy + conduit + conduit-extra + containers + crypton + crypton-connection + crypton-x509 + crypton-x509-store + cryptostore + data-default-class + dhall + digest + directory + exceptions + extra + filepath + ghc-prim + hex-text + http-client + http-client-tls + http-conduit + http-media + http-types + ini + lrucache + mason + memory + monad-control + monad-loops + mtl + network + network-uri + optparse-applicative + polysemy + polysemy-zoo + process + recv + relude + resourcet + retry + safe-exceptions + servant + servant-client + servant-client-core + servant-server + sqlite-simple + stm + streaming-commons + string-interpolate + suspend + template-haskell + text + time + time-units + timers + tls + tls-session-manager + transformers + unix + unliftio + unliftio-core + unordered-containers + wai + wai-extra + warp + xml-conduit + ]; + executableHaskellDepends = [ + aeson + async + base + base64 + bytestring + co-log + co-log-core + co-log-polysemy + conduit + containers + crypton + crypton-connection + crypton-x509 + crypton-x509-store + cryptostore + dhall + directory + exceptions + extra + filepath + hex-text + http-client + http-client-tls + http-conduit + http-media + http-types + lrucache + mason + memory + monad-control + monad-loops + mtl + network + optparse-applicative + polysemy + polysemy-zoo + process + relude + resourcet + safe-exceptions + servant + servant-client + servant-client-core + servant-server + sqlite-simple + stm + string-interpolate + suspend + template-haskell + text + time + timers + tls + tls-session-manager + transformers + unix + unliftio + unordered-containers + wai + wai-extra + warp + ]; + testHaskellDepends = [ + aeson + async + base + base64 + bytestring + co-log + co-log-core + co-log-polysemy + conduit + containers + crypton + crypton-connection + crypton-x509 + crypton-x509-store + cryptostore + dhall + directory + exceptions + extra + filepath + hex-text + hspec + http-client + http-client-tls + http-conduit + http-media + http-types + lrucache + mason + memory + monad-control + monad-loops + mtl + network + optparse-applicative + polysemy + polysemy-zoo + process + relude + resourcet + safe-exceptions + servant + servant-client + servant-client-core + servant-server + sqlite-simple + stm + string-interpolate + suspend + template-haskell + temporary + text + time + timers + tls + tls-session-manager + transformers + unix + unliftio + unordered-containers + wai + wai-extra + warp + ]; + doHaddock = false; + description = "A Haskell implementation of the Hentai@Home client"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + } + ) { }; + hs-highlight = callPackage ( { mkDerivation, @@ -351978,8 +354322,8 @@ self: { pname = "hsc2hs"; version = "0.68.10"; sha256 = "0xpgbi6pssnizazz54583c50cz4axq3h78g03q4sfb7yi3bk8kkg"; - revision = "4"; - editedCabalFile = "0gphymx87rjky73mxk6y656jxms5xrds7q2dvcrf7mnk0gdgcpkj"; + revision = "5"; + editedCabalFile = "09fpqh14ffp6hix6n9w2wbwz19idig5cgzjrzsih2axh57cmzcir"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -355549,7 +357893,7 @@ self: { } ) { }; - hslua_2_4_0 = callPackage ( + hslua_2_5_0 = callPackage ( { mkDerivation, base, @@ -355569,8 +357913,8 @@ self: { }: mkDerivation { pname = "hslua"; - version = "2.4.0"; - sha256 = "093cjgrzxyvd7kg7ap5bszbfpgzcggwsnypm2q2ij6hyqz8x8gqk"; + version = "2.5.0"; + sha256 = "13wj85dhb6zkn98y9ddg9fgqrvw12cz3r91cxnlhhqlajjm5iawx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -355605,11 +357949,8 @@ self: { aeson, base, bytestring, - containers, - hashable, hslua-core, hslua-marshalling, - mtl, QuickCheck, quickcheck-instances, scientific, @@ -355617,36 +357958,26 @@ self: { tasty-hunit, tasty-quickcheck, text, - unordered-containers, vector, }: mkDerivation { pname = "hslua-aeson"; - version = "2.3.1.1"; - sha256 = "09a5xbl8ib79vln01naw9cd5g100arfx5nm41n0xbk272cjf7cgg"; + version = "2.3.2"; + sha256 = "1l4q088hx5qbhjxhii4p7xjaxacmr5iadyl9lyhlxxcybv2n2imr"; libraryHaskellDepends = [ aeson base bytestring - containers - hashable hslua-core hslua-marshalling - mtl scientific - text - unordered-containers vector ]; testHaskellDepends = [ aeson base - bytestring - containers - hashable hslua-core hslua-marshalling - mtl QuickCheck quickcheck-instances scientific @@ -355654,7 +357985,6 @@ self: { tasty-hunit tasty-quickcheck text - unordered-containers vector ]; description = "Allow aeson data types to be used with Lua"; @@ -355668,7 +357998,6 @@ self: { base, bytestring, containers, - exceptions, hslua-core, hslua-marshalling, lua-arbitrary, @@ -355682,13 +358011,12 @@ self: { }: mkDerivation { pname = "hslua-classes"; - version = "2.3.1"; - sha256 = "185lynrinz1y38346b80jx8ag77ka53sg606wdlgzsqrx7rk66kq"; + version = "2.3.2"; + sha256 = "0yl6svmigz2w1rn5f4c58gzfpkg9fsyqh46090zdgvgdkyd49c7v"; libraryHaskellDepends = [ base bytestring containers - exceptions hslua-core hslua-marshalling text @@ -355697,9 +358025,7 @@ self: { base bytestring containers - exceptions hslua-core - hslua-marshalling lua-arbitrary QuickCheck quickcheck-instances @@ -355728,8 +358054,8 @@ self: { }: mkDerivation { pname = "hslua-cli"; - version = "1.4.3"; - sha256 = "1sn8mc18lqn8c0pm7rms623p49vpmmhbp07bh561x6q96fgjcwzm"; + version = "1.4.4"; + sha256 = "1h3mdaajvxgakvhbx8kqk9m36ja5jqlvsjkcdkdpvn04rzx0lv2z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -355757,7 +358083,6 @@ self: { lua-arbitrary, mtl, QuickCheck, - quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, @@ -355765,8 +358090,8 @@ self: { }: mkDerivation { pname = "hslua-core"; - version = "2.3.2"; - sha256 = "0h3d2r5wkbz0d2gylmc282mn0c7b7bfglmchr5hs7vq20206zv0l"; + version = "2.3.2.1"; + sha256 = "1asfzpliwv297lnjqdgi6637p4h0ncn78f50074i20ndk3vp45k8"; libraryHaskellDepends = [ base bytestring @@ -355778,16 +358103,12 @@ self: { testHaskellDepends = [ base bytestring - exceptions lua lua-arbitrary - mtl QuickCheck - quickcheck-instances tasty tasty-hunit tasty-quickcheck - text ]; description = "Bindings to Lua, an embeddable scripting language"; license = lib.licensesSpdx."MIT"; @@ -355805,8 +358126,8 @@ self: { }: mkDerivation { pname = "hslua-examples"; - version = "2.0.2"; - sha256 = "1sbraw39fz5kx11nz828mpyx07jh3xm2n01k6q4p0xh9zlhc94va"; + version = "2.0.3"; + sha256 = "0xjczc2h4k7j4wz0sfpnyanz0d2r25l61nipvwf6a3f7l9b1ms8v"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -355858,7 +358179,6 @@ self: { containers, hslua-core, lua-arbitrary, - mtl, QuickCheck, quickcheck-instances, tasty, @@ -355869,14 +358189,13 @@ self: { }: mkDerivation { pname = "hslua-marshalling"; - version = "2.3.1"; - sha256 = "0v7hpzhj24zif89x4h2j3ji1ch7qifj7xh4r1rfvbsg48pzxjj89"; + version = "2.3.2"; + sha256 = "1jik10a3i834ia859gwrdrzb5mv7jy66yy9h51f26xf8998za1qm"; libraryHaskellDepends = [ base bytestring containers hslua-core - mtl text ]; testHaskellDepends = [ @@ -355885,7 +358204,6 @@ self: { containers hslua-core lua-arbitrary - mtl QuickCheck quickcheck-instances tasty @@ -355934,6 +358252,42 @@ self: { } ) { }; + hslua-module-doclayout_1_2_1_1 = callPackage ( + { + mkDerivation, + base, + doclayout, + hslua, + tasty, + tasty-hunit, + tasty-lua, + text, + }: + mkDerivation { + pname = "hslua-module-doclayout"; + version = "1.2.1.1"; + sha256 = "06bbpxcpsrlxrf59appi49qq6qd8nfqgspfp0dx2xyzczgk5h863"; + libraryHaskellDepends = [ + base + doclayout + hslua + text + ]; + testHaskellDepends = [ + base + doclayout + hslua + tasty + tasty-hunit + tasty-lua + text + ]; + description = "Lua module wrapping Text.DocLayout."; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + hslua-module-path = callPackage ( { mkDerivation, @@ -355975,6 +358329,45 @@ self: { } ) { }; + hslua-module-path_1_2_0 = callPackage ( + { + mkDerivation, + base, + filepath, + hslua-core, + hslua-marshalling, + hslua-packaging, + tasty, + tasty-hunit, + tasty-lua, + text, + }: + mkDerivation { + pname = "hslua-module-path"; + version = "1.2.0"; + sha256 = "03xqvg0278lvc644yzbc8gafdm1nmhm56h29gsvmx7yqki31h97j"; + libraryHaskellDepends = [ + base + filepath + hslua-core + hslua-marshalling + hslua-packaging + text + ]; + testHaskellDepends = [ + base + hslua-core + hslua-packaging + tasty + tasty-hunit + tasty-lua + ]; + description = "Lua module to work with file paths"; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + hslua-module-system = callPackage ( { mkDerivation, @@ -356020,7 +358413,7 @@ self: { } ) { }; - hslua-module-system_1_2_3 = callPackage ( + hslua-module-system_1_3_0 = callPackage ( { mkDerivation, base, @@ -356041,10 +358434,8 @@ self: { }: mkDerivation { pname = "hslua-module-system"; - version = "1.2.3"; - sha256 = "125d50q90l9w35aqgwgbv2bdmj65zlvn7pxlwrg1nr2j4bnfmyjk"; - revision = "1"; - editedCabalFile = "19bv56i9xpsx5xfl7k411sbbnrl4sxp8hnm1a96iqpk22g3dqv5l"; + version = "1.3.0"; + sha256 = "1fwglklhxb56135ki8c6rf61c0pq28m1myrfkdb8wvi51hhyb5pf"; libraryHaskellDepends = [ base bytestring @@ -356110,6 +358501,43 @@ self: { } ) { }; + hslua-module-text_1_2_0 = callPackage ( + { + mkDerivation, + base, + hslua-core, + hslua-marshalling, + hslua-packaging, + tasty, + tasty-hunit, + tasty-lua, + text, + }: + mkDerivation { + pname = "hslua-module-text"; + version = "1.2.0"; + sha256 = "0bnnmi165msx79rp50d429h4cfmar4x1j6adk17hxjm6ph2nzb0m"; + libraryHaskellDepends = [ + base + hslua-core + hslua-marshalling + hslua-packaging + text + ]; + testHaskellDepends = [ + base + hslua-core + hslua-packaging + tasty + tasty-hunit + tasty-lua + ]; + description = "Lua module for text"; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + hslua-module-version = callPackage ( { mkDerivation, @@ -356151,6 +358579,43 @@ self: { } ) { }; + hslua-module-version_1_2_0_1 = callPackage ( + { + mkDerivation, + base, + hslua-core, + hslua-marshalling, + hslua-packaging, + tasty, + tasty-hunit, + tasty-lua, + text, + }: + mkDerivation { + pname = "hslua-module-version"; + version = "1.2.0.1"; + sha256 = "1aakzdk1jvvwx0caa8nbvfwp2ysqhd5nvanyqy8xjz5cj5jwk0l5"; + libraryHaskellDepends = [ + base + hslua-core + hslua-marshalling + hslua-packaging + text + ]; + testHaskellDepends = [ + base + hslua-core + hslua-packaging + tasty + tasty-hunit + tasty-lua + ]; + description = "Lua module to work with version specifiers"; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + hslua-module-zip = callPackage ( { mkDerivation, @@ -356199,6 +358664,51 @@ self: { } ) { }; + hslua-module-zip_1_2_1 = callPackage ( + { + mkDerivation, + base, + hslua-core, + hslua-list, + hslua-marshalling, + hslua-module-system, + hslua-packaging, + tasty, + tasty-hunit, + tasty-lua, + text, + time, + zip-archive, + }: + mkDerivation { + pname = "hslua-module-zip"; + version = "1.2.1"; + sha256 = "0nv665shbsg8v27gvlgz18y0cgvy20aflkdqlcs89sm5lxw8wjnq"; + libraryHaskellDepends = [ + base + hslua-core + hslua-list + hslua-marshalling + hslua-packaging + text + time + zip-archive + ]; + testHaskellDepends = [ + base + hslua-core + hslua-module-system + hslua-packaging + tasty + tasty-hunit + tasty-lua + ]; + description = "Lua module to work with file zips"; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + hslua-objectorientation = callPackage ( { mkDerivation, @@ -356257,7 +358767,7 @@ self: { } ) { }; - hslua-objectorientation_2_4_0 = callPackage ( + hslua-objectorientation_2_5_0 = callPackage ( { mkDerivation, base, @@ -356272,8 +358782,8 @@ self: { }: mkDerivation { pname = "hslua-objectorientation"; - version = "2.4.0"; - sha256 = "0gm7l5gqbxrvniivz82wl9rmwgmrg2swji3q0wk43s2xxhajbihs"; + version = "2.5.0"; + sha256 = "1rj2ciyvp2b5bnkv0059cjc9358n5dy6whzsyri33qs85zza2bq3"; libraryHaskellDepends = [ base containers @@ -356345,7 +358855,7 @@ self: { } ) { }; - hslua-packaging_2_3_2 = callPackage ( + hslua-packaging_2_4_1 = callPackage ( { mkDerivation, base, @@ -356362,8 +358872,8 @@ self: { }: mkDerivation { pname = "hslua-packaging"; - version = "2.3.2"; - sha256 = "1w7929fr6pkwm9x25ags1nk5xrfq9kn3g113wi5c02a8m8zqwh8s"; + version = "2.4.1"; + sha256 = "1kg6fn70zpq44zabca1d4mijqqfpyn3lp6zacbhcbmk67109yxll"; libraryHaskellDepends = [ base containers @@ -356381,7 +358891,6 @@ self: { tasty tasty-hslua tasty-hunit - text ]; description = "Utilities to build Lua modules"; license = lib.licensesSpdx."MIT"; @@ -356460,6 +358969,47 @@ self: { } ) { }; + hslua-typing_0_2_0 = callPackage ( + { + mkDerivation, + base, + containers, + hslua-core, + hslua-marshalling, + lua-arbitrary, + QuickCheck, + quickcheck-instances, + tasty, + tasty-hunit, + tasty-quickcheck, + }: + mkDerivation { + pname = "hslua-typing"; + version = "0.2.0"; + sha256 = "0wsvvfdpca6chd0y9birzylg2ljv2a5p4zb4nl4xgra426lzmkh4"; + libraryHaskellDepends = [ + base + containers + hslua-core + hslua-marshalling + ]; + testHaskellDepends = [ + base + hslua-core + hslua-marshalling + lua-arbitrary + QuickCheck + quickcheck-instances + tasty + tasty-hunit + tasty-quickcheck + ]; + description = "Type specifiers for Lua"; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + hsluv-haskell = callPackage ( { mkDerivation, @@ -358391,8 +360941,8 @@ self: { }: mkDerivation { pname = "hspec-need-env"; - version = "0.1.0.12"; - sha256 = "0z35n7agd96b0qfshp1k822yj9xyf6mfwpy38hsy3srfhbb2vqbn"; + version = "0.1.0.13"; + sha256 = "13ig8x3mvbjgla027880kagsnndh7cvfbh5ql534rw3ap6wsy3db"; libraryHaskellDepends = [ base hspec-core @@ -359151,8 +361701,8 @@ self: { }: mkDerivation { pname = "hspec-yesod"; - version = "0.2.1.0"; - sha256 = "005a0i6z1mg9wm8xvm014jzagcr7pji754phagj42nidi545p31f"; + version = "0.2.1.1"; + sha256 = "1r4vnrlsr30wax6zyjbm01b6g29iswinl7allphgi7i3pbll7hri"; libraryHaskellDepends = [ aeson attoparsec @@ -362760,21 +365310,19 @@ self: { hspec, hspec-discover, http-types, - HUnit, QuickCheck, quickcheck-instances, tagged, text, text-iso8601, time-compat, - transformers, unordered-containers, uuid-types, }: mkDerivation { pname = "http-api-data"; - version = "0.6.2"; - sha256 = "0d42xkm60i3irxcvwixvn5c01paz2kpfsz29vhxz08ir83zsk16w"; + version = "0.6.3"; + sha256 = "13ssij2wxk1bb9lbyjc0yqqk4r7v8mqxwnic2436padnmvbaciys"; libraryHaskellDepends = [ base bytestring @@ -362786,7 +365334,6 @@ self: { text text-iso8601 time-compat - transformers unordered-containers uuid-types ]; @@ -362795,7 +365342,6 @@ self: { bytestring cookie hspec - HUnit QuickCheck quickcheck-instances text @@ -362809,6 +365355,61 @@ self: { } ) { }; + http-api-data_0_7 = callPackage ( + { + mkDerivation, + base, + bytestring, + containers, + cookie, + hashable, + hspec, + hspec-discover, + http-types, + QuickCheck, + quickcheck-instances, + tagged, + text, + text-iso8601, + time-compat, + uuid-types, + }: + mkDerivation { + pname = "http-api-data"; + version = "0.7"; + sha256 = "13l1bfcjvpgmp0i66j35x9j4rq8fb8wihc3xwagwqr8f6iw0cih9"; + libraryHaskellDepends = [ + base + bytestring + containers + cookie + hashable + http-types + tagged + text + text-iso8601 + time-compat + uuid-types + ]; + testHaskellDepends = [ + base + bytestring + containers + cookie + hspec + QuickCheck + quickcheck-instances + text + time-compat + uuid-types + ]; + testToolDepends = [ hspec-discover ]; + description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + http-api-data-ip = callPackage ( { mkDerivation, @@ -362851,6 +365452,8 @@ self: { pname = "http-api-data-qq"; version = "0.1.0.1"; sha256 = "1dah5sgmqls4x17drs3x2sz7gxx8jlh86yjdsahkq5kjv2jshy1n"; + revision = "1"; + editedCabalFile = "1gmnjvf92wni6s2b51gs2c4823mixqmnrk26v7y13hjz27jsr7ib"; libraryHaskellDepends = [ base http-api-data @@ -365281,8 +367884,8 @@ self: { }: mkDerivation { pname = "http-slim"; - version = "1.0"; - sha256 = "0jqm1id1n0zyz78610xqc5rvr6fa0r5qiavj4v1idp1rvcfp2iif"; + version = "1.2"; + sha256 = "1n5ally89p9p27krndgjmaamyij6yky8xrv6g2grr3zmxdq56pvr"; libraryHaskellDepends = [ array base @@ -365299,8 +367902,6 @@ self: { ]; description = "A library for client/server HTTP with TLS support"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -365979,8 +368580,8 @@ self: { }: mkDerivation { pname = "http2-tls"; - version = "0.5.1"; - sha256 = "08lcmnyrdpfj2lqnc7zm82qa8gr9s90qqg0vfghx9xzsa1g6c2l2"; + version = "0.5.2"; + sha256 = "14n7dhrlcx423bwslyc1rybndc6qpyw0blll9k9sly1fiallw8xs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -366041,6 +368642,8 @@ self: { pname = "http3"; version = "0.1.2"; sha256 = "09s7n19aw4my7rrpjkrh4ql53282gjgfjkd2k1fn85xgz3y7jcbc"; + revision = "1"; + editedCabalFile = "0mgq4c3065iidllx3agvwclwacq6zgrpv4wrd20z1l8gz26hg2ar"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -373513,7 +376116,7 @@ self: { } ) { }; - hyperbole_0_5_0 = callPackage ( + hyperbole_0_6_0 = callPackage ( { mkDerivation, aeson, @@ -373548,8 +376151,8 @@ self: { }: mkDerivation { pname = "hyperbole"; - version = "0.5.0"; - sha256 = "0b141p2yd50p4blqynxss8jjk5h1wa3rsq766i37zqfxldbmagd0"; + version = "0.6.0"; + sha256 = "19xvm5q10wc0zcycjs28pc1szcwszyw1i0s4n5n2px3w7p7z7yk4"; libraryHaskellDepends = [ aeson atomic-css @@ -374538,8 +377141,8 @@ self: { pname = "i18n"; version = "0.4.0.0"; sha256 = "1ylk5zz3d6wp0wqfr69lzn0dwf7acc8sq2nj1j5l5crzi1sz63by"; - revision = "1"; - editedCabalFile = "1sxiifn4m17294inyb4q7isbdd3s77zpqxafghpbfkz5hkrv0xxg"; + revision = "4"; + editedCabalFile = "1id3zbrvclg0zhblfrcqv32zczq3vg5bwxfacll3vh8minx1sjsb"; libraryHaskellDepends = [ base containers @@ -377216,8 +379819,8 @@ self: { }: mkDerivation { pname = "ihaskell-hvega"; - version = "0.5.0.6"; - sha256 = "00b5i33n2c1s6pvrn3799dx4wdwmik7wqpldqai85zsk3wd04wpb"; + version = "0.5.0.7"; + sha256 = "159kbr3chz9h9wv7xgl8xain06w8nk4vbdm1q03ygdljg91xd7wh"; libraryHaskellDepends = [ aeson base @@ -379224,8 +381827,8 @@ self: { }: mkDerivation { pname = "imp"; - version = "1.0.3.3"; - sha256 = "1ybhn2cyca928q8yshsf0yvwi7s2gqqwd0k542prdm2ip45hizmj"; + version = "1.0.3.5"; + sha256 = "1rfx8kjg6r3jh1jvks8n0jiwinnk4lg0g66gql6l25dg768ir5ib"; libraryHaskellDepends = [ base Cabal-syntax @@ -383054,8 +385657,8 @@ self: { }: mkDerivation { pname = "inline-python"; - version = "0.2"; - sha256 = "168iz8nfqwqx0wd6ijdgw29gkfqvy7rdxhaw9yzbhl9msraxb05i"; + version = "0.2.1.0"; + sha256 = "000caapdd654pr5ylamzsb8q8spcivm0aly39wx02diihjwxvk64"; libraryHaskellDepends = [ base bytestring @@ -383411,19 +386014,17 @@ self: { base, containers, ghc, - mtl, template-haskell, transformers, }: mkDerivation { pname = "inspection-testing"; - version = "0.6.2"; - sha256 = "0zi1q86sd9jy5dpqfs2j71acdl7kvik0ps78xirpdhyldhwwyqws"; + version = "0.6.3"; + sha256 = "04p5y2qqp1sbslzjxr961m6ahizq0rhlcx117sl2w5g56s8blibq"; libraryHaskellDepends = [ base containers ghc - mtl template-haskell transformers ]; @@ -384322,8 +386923,8 @@ self: { pname = "integer-conversion"; version = "0.1.1"; sha256 = "0nhm487gdg17w02wwqwr56wa8lkv0g4n9g1y6pv10cq792h690f1"; - revision = "1"; - editedCabalFile = "1jf1wqbs6cgjbc1igy4lll1qxz4ynknspqpgbpzwn911dvhll7cl"; + revision = "2"; + editedCabalFile = "17vw8kq3glpb5bihhmff10ly78lajw2q33f601jrgw04hh41ng8j"; libraryHaskellDepends = [ base bytestring @@ -384376,31 +386977,25 @@ self: { mkDerivation, array, base, - ghc-bignum, - ghc-prim, QuickCheck, smallcheck, tasty, - tasty-hunit, tasty-quickcheck, tasty-smallcheck, }: mkDerivation { pname = "integer-logarithms"; - version = "1.0.4"; - sha256 = "0icg8k0h7yc3aynsbidppwyfkjnq8spaczdi5bby5jqq4mncg4va"; + version = "1.0.5"; + sha256 = "0nclcr82rypaj7453iil6xj9asjfrljy37qki731xzkqyzqzdpv6"; libraryHaskellDepends = [ array base - ghc-bignum - ghc-prim ]; testHaskellDepends = [ base QuickCheck smallcheck tasty - tasty-hunit tasty-quickcheck tasty-smallcheck ]; @@ -386242,7 +388837,6 @@ self: { comonad, containers, contravariant, - ghc-prim, hspec, hspec-discover, profunctors, @@ -386253,15 +388847,12 @@ self: { template-haskell, th-abstraction, transformers, - transformers-compat, unordered-containers, }: mkDerivation { pname = "invariant"; - version = "0.6.4"; - sha256 = "1cxfy1s3p91g5n1z85058lc27xy4xfl3dnkvxcxn3m70wd7apqm9"; - revision = "1"; - editedCabalFile = "1inib3bc400cghq70lqslw5a6v9cha05lkrvicayvzwk9sgn16ja"; + version = "0.6.5"; + sha256 = "0fkf75r5wlz72f6544cjz7yaa06bj9lpgk3di4ahzyr5r73xwsv2"; libraryHaskellDepends = [ array base @@ -386269,7 +388860,6 @@ self: { comonad containers contravariant - ghc-prim profunctors StateVar stm @@ -386277,14 +388867,12 @@ self: { template-haskell th-abstraction transformers - transformers-compat unordered-containers ]; testHaskellDepends = [ base hspec QuickCheck - template-haskell ]; testToolDepends = [ hspec-discover ]; description = "Haskell98 invariant functors"; @@ -386672,6 +389260,8 @@ self: { pname = "io-classes"; version = "1.9.0.0"; sha256 = "1qgj52m078j3cr0pfijvp6r7a793n0ssaqy6nyfy1bv9qxs761hz"; + revision = "1"; + editedCabalFile = "0m5g282s0jl5071b5dazng8s968rdcnyw90v9ckmxy19z48j0lg3"; libraryHaskellDepends = [ array async @@ -386887,8 +389477,8 @@ self: { }: mkDerivation { pname = "io-sim"; - version = "1.9.0.0"; - sha256 = "0b8iav4s1dmnngg2ihbn6ycfhmgg7giv2krqbb5fdk1gpvw7c5rw"; + version = "1.9.1.0"; + sha256 = "0l6plpb8d9qcdfnf58gw3cwvyc2ibrfkycznr5zxq9lqkhddx9bn"; libraryHaskellDepends = [ base containers @@ -386973,8 +389563,8 @@ self: { pname = "io-streams"; version = "1.5.2.2"; sha256 = "1zn4iyd18g9jc1qdgixp6hi56nj7czy4jdz2xca59hcn2q2xarfk"; - revision = "6"; - editedCabalFile = "12nra580v0l6ijqqg6ccbhqmpczbb8r7g0iqp1hcsg0pbxjmkywj"; + revision = "7"; + editedCabalFile = "0jm8j8xghxk24lavpj4v02vja9nkrxvg8hn69kfcbz61vn6kcnqr"; configureFlags = [ "-fnointeractivetests" ]; libraryHaskellDepends = [ attoparsec @@ -387400,8 +389990,8 @@ self: { }: mkDerivation { pname = "ip2location"; - version = "8.6.0"; - sha256 = "0my5rnrbnrr9g8rndwd8491kwf5kn5y9y0f82lqwjzv719l66wd7"; + version = "8.7.0"; + sha256 = "06bddf3y0iaxqg8b0lx7avkk5k1zlgg67dzxjyfkvrx4p4llqwdw"; libraryHaskellDepends = [ aeson base @@ -387469,8 +390059,8 @@ self: { }: mkDerivation { pname = "ip2proxy"; - version = "3.3.0"; - sha256 = "0634gb27s8g132vwq3qnnfwcrc5irls3h8cdin69d815adglpmfl"; + version = "3.4.0"; + sha256 = "1yk7fxndxgnsj5vrqr709mphywff8zs6swskbilwrb8pyqbwl1nk"; libraryHaskellDepends = [ aeson base @@ -389657,8 +392247,8 @@ self: { }: mkDerivation { pname = "isomorphism-class"; - version = "0.3.1.2"; - sha256 = "0zsjpvxv6j81idqi8g18bahx24rp1y78p2g48yikr3lbbgjwlcic"; + version = "0.3.1.4"; + sha256 = "0wv9k1m8vi7hzj9lz7pzl6fdv4vnqm3cwnaa4aycggsjvxs4yjyx"; libraryHaskellDepends = [ base bytestring @@ -392250,6 +394840,42 @@ self: { } ) { }; + java-adt_1_1 = callPackage ( + { + mkDerivation, + alex, + array, + base, + filepath, + happy, + pretty, + }: + mkDerivation { + pname = "java-adt"; + version = "1.1"; + sha256 = "02qbjhm62ph6alphkgsy3ng9lbmqa5jnmzkgm9fymryqcq4jxd9r"; + revision = "1"; + editedCabalFile = "1jy15wnr2mz3x8iy0bx3k70fqii41jshjb93710zi3w1vwcvql8w"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + array + base + filepath + pretty + ]; + executableToolDepends = [ + alex + happy + ]; + description = "Create immutable algebraic data structures for Java"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + mainProgram = "java-adt"; + } + ) { }; + java-bridge = callPackage ( { mkDerivation, @@ -392637,6 +395263,8 @@ self: { pname = "javelin"; version = "0.1.4.2"; sha256 = "09kld84lvi6lh5szd3n9kkykg78acwgn50h5qah7dmj9vlc7lch4"; + revision = "1"; + editedCabalFile = "0fczpydfqnkx0g47xil9n465m30vp0awq82d99j58h2iiipha63x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -392700,6 +395328,8 @@ self: { pname = "javelin-frames"; version = "0.1.0.2"; sha256 = "0g4vw1qb5m8ypyjr72hh0f1dmba0r43ggkvx4zpwcv7ij3qd25bl"; + revision = "1"; + editedCabalFile = "18qw69lgww25b9dfgcy8i0caxkbr9ch47266karp8dsygiypysy4"; libraryHaskellDepends = [ base containers @@ -392747,6 +395377,8 @@ self: { pname = "javelin-io"; version = "0.1.1.3"; sha256 = "1gjc5134m6c2sddmjifkr1cxy75k76qc9ilsjgvxp88iirgid0bp"; + revision = "1"; + editedCabalFile = "1ic8081v8hz0zqap23mxc1zccbswdwjdannfj97grb9cfpsr9y6d"; libraryHaskellDepends = [ base bytestring @@ -396050,8 +398682,8 @@ self: { }: mkDerivation { pname = "json-feed"; - version = "2.0.0.15"; - sha256 = "0rkcwd61j4bfp4jmhjj34nsid6mwgzyf715cn9jrm0xsxwcx5bx9"; + version = "2.0.0.18"; + sha256 = "18vwwr2r8n7rwajhrj6jj73rhjx5g76in9p9wwpvxy0cvfd3jirn"; libraryHaskellDepends = [ aeson base @@ -396818,13 +399450,12 @@ self: { text, time, transformers, - unordered-containers, vector, }: mkDerivation { pname = "json-sop"; - version = "0.2.3"; - sha256 = "1yfa6fpc968pyy403dxq9ipk4k2xl16pjdimm0n8bn7766ihcszb"; + version = "0.2.4"; + sha256 = "00fdwkirkgbfkqs4cbiw93z6z1h9vrpxzc92vigw35mjjh89dikh"; libraryHaskellDepends = [ aeson base @@ -396834,7 +399465,6 @@ self: { text time transformers - unordered-containers vector ]; testHaskellDepends = [ @@ -400258,38 +402888,34 @@ self: { { mkDerivation, adjunctions, - array, base, comonad, - containers, contravariant, distributive, + exceptions, free, invariant, mtl, profunctors, semigroupoids, - tagged, transformers, }: mkDerivation { pname = "kan-extensions"; - version = "5.2.7"; - sha256 = "0n716zyihbnq3s1zhqbh3fm0qzhgy2hk79ziy8b6bvydjpzsq8y3"; + version = "5.2.8"; + sha256 = "08cdn0dbv9di9jiqkj1qnr3jy7hblbi55dazkn23qhhdm12alvgp"; libraryHaskellDepends = [ adjunctions - array base comonad - containers contravariant distributive + exceptions free invariant mtl profunctors semigroupoids - tagged transformers ]; description = "Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads"; @@ -400378,15 +403004,11 @@ self: { stm, text, time, - transformers, - unordered-containers, }: mkDerivation { pname = "kansas-comet"; - version = "0.4.3"; - sha256 = "0c4nm5ns5acg73biysww8jam1v4kj1k9rk96bl6ad5g2nria7hlp"; - revision = "2"; - editedCabalFile = "1mhk8gfvkmlg49p7z4fp791rlw2hnrawfw2v3abcjv2af190zi6x"; + version = "0.4.4"; + sha256 = "1kaglsz8xdzx2r7487a5w5mahxwiysf7ca0fxbxy421g3a49430p"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson @@ -400397,8 +403019,6 @@ self: { stm text time - transformers - unordered-containers ]; description = "A JavaScript push mechanism based on the comet idiom"; license = lib.licenses.bsd3; @@ -401418,8 +404038,8 @@ self: { }: mkDerivation { pname = "katip-wai"; - version = "0.2.0.0"; - sha256 = "0n5p0sh961lsj86anx2bpnhhbcaf7y9kvhchqkd18aaw5s899yr3"; + version = "0.2.0.1"; + sha256 = "0v1zsg158hfq0dl1d3535b5bz60j78mx3n8bi3y6482dhjnx35gp"; libraryHaskellDepends = [ aeson base @@ -401875,6 +404495,43 @@ self: { } ) { }; + kb-text-shape = callPackage ( + { + mkDerivation, + base, + bytestring, + containers, + text, + unliftio, + }: + mkDerivation { + pname = "kb-text-shape"; + version = "0.1.0.0"; + sha256 = "1kgqpnbfxg30dawg5dkfv4i6chaf4zr29g4iq2cwcqz3qd1sp7as"; + libraryHaskellDepends = [ + base + bytestring + containers + text + ]; + testHaskellDepends = [ + base + bytestring + text + ]; + benchmarkHaskellDepends = [ + base + bytestring + text + unliftio + ]; + description = "Unicode segmentation and shaping using kb_text_shape"; + license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + kbq-gu = callPackage ( { mkDerivation, base }: mkDerivation { @@ -402031,6 +404688,45 @@ self: { } ) { }; + kdl-hs = callPackage ( + { + mkDerivation, + base, + containers, + megaparsec, + prettyprinter, + scientific, + skeletest, + temporary, + text, + transformers, + }: + mkDerivation { + pname = "kdl-hs"; + version = "0.2.1"; + sha256 = "0xv1i7830f0ngqlzfkq7x0ii663nb57h2h0p3fjg6g5kl1qk6q5q"; + libraryHaskellDepends = [ + base + containers + megaparsec + prettyprinter + scientific + text + transformers + ]; + testHaskellDepends = [ + base + containers + skeletest + temporary + text + ]; + testToolDepends = [ skeletest ]; + description = "KDL language parser and API"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + kdt = callPackage ( { mkDerivation, @@ -404191,19 +406887,15 @@ self: { mkDerivation, base, containers, - ghc-prim, template-haskell, }: mkDerivation { pname = "keycode"; - version = "0.2.3"; - sha256 = "1zq02yd7ldbyk7zpgq9bj37y52ckzyyrad2yi48amh7dzym1sbj2"; - revision = "1"; - editedCabalFile = "12kpkn9l45rfb5vdakgf2sbqs2by98d4dzq2qyzkfl4jlxk7l4j4"; + version = "0.2.4"; + sha256 = "0zhb8cg4d78plwmpi48dzjnr9aaqqw64ffm0xn84dxbxkz5yml51"; libraryHaskellDepends = [ base containers - ghc-prim template-haskell ]; description = "Maps web browser keycodes to their corresponding keyboard keys"; @@ -404247,8 +406939,8 @@ self: { }: mkDerivation { pname = "keyed-vals"; - version = "0.2.3.2"; - sha256 = "1jszp5zagnqjwspglb466lq3k2hfdgaizrp4av7lyy26vbg0gia8"; + version = "0.2.3.4"; + sha256 = "0y228myr6vh96224nb6fw3k3r26crn0wxidvgjsxv4kjqr0gwqg3"; libraryHaskellDepends = [ aeson base @@ -404278,8 +406970,8 @@ self: { }: mkDerivation { pname = "keyed-vals-hspec-tests"; - version = "0.2.3.2"; - sha256 = "1cab5cj8d4vl47j1dqpvinw8vh9c62dznk2fdz9swm5cl9p0fwpx"; + version = "0.2.3.4"; + sha256 = "0di6wk3lwj7j42cvc1ynrm67j16vwa4rgzh5q7b9vhi0x7lvkla3"; libraryHaskellDepends = [ aeson base @@ -404311,8 +407003,8 @@ self: { }: mkDerivation { pname = "keyed-vals-mem"; - version = "0.2.3.2"; - sha256 = "0vqbanny1vsjjb5wsvrzxk47nz11n5dck77f42bsk0sirvgzs973"; + version = "0.2.3.4"; + sha256 = "13k88cs59pxb0psr79gzw5wxpkyp68855mzb0wq8w8zbi7hv2yj1"; libraryHaskellDepends = [ base bytestring @@ -404352,8 +407044,8 @@ self: { }: mkDerivation { pname = "keyed-vals-redis"; - version = "0.2.3.2"; - sha256 = "1bfs8rhvsfbkxvxa1awqywmhdwnfc224vskjd66ngm26ix8bplj0"; + version = "0.2.3.4"; + sha256 = "19746dkdh5nk1p09id3qv8zlfcn11k7xnnjfzzvbk39ngdk947jf"; libraryHaskellDepends = [ base bytestring @@ -404437,18 +407129,14 @@ self: { free, hashable, semigroupoids, - semigroups, tagged, transformers, - transformers-compat, unordered-containers, }: mkDerivation { pname = "keys"; - version = "3.12.4"; - sha256 = "04l9ssmns3v2xzfrk5pxcacvl8nh26rsw5hhw22v4zxzbh9s44ll"; - revision = "1"; - editedCabalFile = "05ma1kakwvvm618fmlwhkz16230w3qsn3p10c3zjysjhn1g0hhyf"; + version = "3.12.5"; + sha256 = "00zkk51n1c1n4hw4i5y501vxy8gps16c4lkwb4c411r3cjngl15h"; libraryHaskellDepends = [ array base @@ -404457,10 +407145,8 @@ self: { free hashable semigroupoids - semigroups tagged transformers - transformers-compat unordered-containers ]; description = "Keyed functors and containers"; @@ -405941,6 +408627,29 @@ self: { } ) { }; + known-lists = callPackage ( + { + mkDerivation, + base, + bifunctors, + }: + mkDerivation { + pname = "known-lists"; + version = "0.1.0.0"; + sha256 = "0q5z4z8hmav035iq1jm9gwk0pphc142rmk0yxi5xcwzdhjq3j26c"; + libraryHaskellDepends = [ + base + bifunctors + ]; + testHaskellDepends = [ + base + bifunctors + ]; + description = "Easy type-level lists with term-level membership proofs"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + koellner-phonetic = callPackage ( { mkDerivation, @@ -406585,6 +409294,7 @@ self: { description = "Krank checks issue tracker link status in your source code"; license = lib.licensesSpdx."BSD-3-Clause"; mainProgram = "krank"; + maintainers = [ lib.maintainers.sternenseemann ]; } ) { }; @@ -406824,10 +409534,8 @@ self: { }: mkDerivation { pname = "ktx-codec"; - version = "0.0.2.1"; - sha256 = "0cigkpvgx12py0i942sci359xsj87pa0bhgmmamhigynimbfspzr"; - revision = "5"; - editedCabalFile = "0djld1sps7a3qj1a4gfb69k70xgb1psjnc7a6nkksgpiwjf1m951"; + version = "0.1.0.0"; + sha256 = "1lwyc4l2mx3ir15vhldzkwibw51z00n6v0gblqhxfks4kwqlvsk9"; libraryHaskellDepends = [ base binary @@ -407987,8 +410695,8 @@ self: { }: mkDerivation { pname = "lackey"; - version = "2.0.0.11"; - sha256 = "0k9mad0kdjbpi2i2i8vfmp6y2cfkk0fvh3iara4m6rrdn2vy0h27"; + version = "2.0.0.12"; + sha256 = "0bl2d7ijsfag7jks262vhkw9ahffwhdypm35nxhiw967df8cksmw"; libraryHaskellDepends = [ base servant-foreign @@ -412471,8 +415179,8 @@ self: { }: mkDerivation { pname = "language-oberon"; - version = "0.3.4"; - sha256 = "1v3p99lkvx3w8fmkd7cc81jz14vxqbp77jznm25wjbka4sidnzb2"; + version = "0.3.4.1"; + sha256 = "0pwlnwdfvv6cs8svfxm1z1753iskzdrq5idbvg6gg6ar4bg0i818"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -413314,8 +416022,8 @@ self: { pname = "language-sygus"; version = "0.1.1.3"; sha256 = "15xxagcsqjchng2nr1qg6ncqch5l74m62iv58pgkcqhzqqhf3fwg"; - revision = "4"; - editedCabalFile = "1mx9kn0p4r22asv1v0c7lwlcxc00194jnizyz2awdmm4r7nv1ycw"; + revision = "6"; + editedCabalFile = "185ni1vab6qmhfwv4ha0i9rdw652gwmkhpcz5yxiwh34qbpllwf5"; libraryHaskellDepends = [ array base @@ -415122,7 +417830,7 @@ self: { } ) { }; - lawful-conversions_0_3_0_1 = callPackage ( + lawful-conversions_0_3_1 = callPackage ( { mkDerivation, base, @@ -415144,8 +417852,8 @@ self: { }: mkDerivation { pname = "lawful-conversions"; - version = "0.3.0.1"; - sha256 = "1n4ix4gjsankh2hxzzgk7ijv1dnmb5vcyl3mlh2rsx6gva19qwdn"; + version = "0.3.1"; + sha256 = "0rv5q5svsz5r20i5yd0hdlwgg39q1j9xngc3ng1xajiy3kqnfysk"; libraryHaskellDepends = [ base bytestring @@ -417810,7 +420518,6 @@ self: { filepath, free, generic-deriving, - ghc-prim, hashable, indexed-traversable, indexed-traversable-instances, @@ -417832,16 +420539,13 @@ self: { th-abstraction, these, transformers, - transformers-compat, unordered-containers, vector, }: mkDerivation { pname = "lens"; - version = "5.3.5"; - sha256 = "1s0ziznj60l9z3z5dacq58kaq8cdfxcz0r75f5hwj25ivzrsrszg"; - revision = "1"; - editedCabalFile = "06asqa9n6grq6dpzd2m9ynhn28mxmyqpj79bnh95x8lynf4kchg0"; + version = "5.3.6"; + sha256 = "1hi320652dqnmcagvn0bfm9cz0zpca5n6hjdp0ks3m54zpqxqifk"; libraryHaskellDepends = [ array assoc @@ -417857,7 +420561,6 @@ self: { exceptions filepath free - ghc-prim hashable indexed-traversable indexed-traversable-instances @@ -417874,7 +420577,6 @@ self: { th-abstraction these transformers - transformers-compat unordered-containers vector ]; @@ -418515,19 +421217,15 @@ self: { base, generics-sop, optics-core, - transformers, }: mkDerivation { pname = "lens-sop"; - version = "0.3.0"; - sha256 = "145yplksxyk15fyhjssjy5f4z18h1d8bgf25pb1vqdfr10rnffi1"; - revision = "2"; - editedCabalFile = "1qrcpp7wwin7gsbd8r0g7mx4a45wg6sjpl85v6l8dd056s7a9w16"; + version = "0.3.1"; + sha256 = "1nmb1jkja48zxhin4x84d7nafs7fvdv49nyd2sg4jx51q4g9dk3l"; libraryHaskellDepends = [ base generics-sop optics-core - transformers ]; description = "Computing lenses generically using generics-sop"; license = lib.licenses.bsd3; @@ -419107,6 +421805,30 @@ self: { } ) { }; + lesspass = callPackage ( + { + mkDerivation, + base, + openssl, + process, + }: + mkDerivation { + pname = "lesspass"; + version = "1.0.0.1"; + sha256 = "1n5gjjr8yg44yvx9y383ap86f4h8108mcdvp3ygbq62vlvs99m8z"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base + process + ]; + executableSystemDepends = [ openssl ]; + description = "The Stateless Password Manager"; + license = lib.licensesSpdx."GPL-3.0-only"; + mainProgram = "lesspass"; + } + ) { inherit (pkgs) openssl; }; + level-monad = callPackage ( { mkDerivation, @@ -419675,8 +422397,8 @@ self: { }: mkDerivation { pname = "lhs2tex"; - version = "1.25"; - sha256 = "0cf66z6mgadgqd1xs5b6gw8l9rkwgbfsc5czwdiapn7ichi26qyj"; + version = "1.26"; + sha256 = "19f6x07bl2pj824l394zpv7dy1677n6f24iy6nps2w9f39fsb8r6"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ @@ -419695,11 +422417,9 @@ self: { regex-compat ]; description = "Preprocessor for typesetting Haskell sources with LaTeX"; - license = "GPL"; - hydraPlatforms = lib.platforms.none; + license = lib.licensesSpdx."GPL-2.0-or-later"; mainProgram = "lhs2TeX"; maintainers = [ lib.maintainers.nomeata ]; - broken = true; } ) { }; @@ -419821,8 +422541,8 @@ self: { }: mkDerivation { pname = "libarchive"; - version = "3.0.4.2"; - sha256 = "1jzpp4sn3lchp68c6wrcfvg4yr8g1fhhki1s2qp2a15nyzljpq8i"; + version = "3.0.5.0"; + sha256 = "1khq64gl93d2bx5h1ki6yz3n6w8sagpgf343zvghn99440rz7rwi"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ @@ -419871,6 +422591,19 @@ self: { } ) { inherit (pkgs) libarchive; }; + libarchive-clib = callPackage ( + { mkDerivation, zlib-clib }: + mkDerivation { + pname = "libarchive-clib"; + version = "3.8.5"; + sha256 = "0v2l84ay1mhc4b86ddzyk0fl2ahc4y2fnkw8jyvzdia4g2mg08jr"; + libraryHaskellDepends = [ zlib-clib ]; + doHaddock = false; + description = "Haskell interface to libarchive (C sources)"; + license = "unknown"; + } + ) { }; + libarchive-conduit = callPackage ( { mkDerivation, @@ -420053,6 +422786,18 @@ self: { } ) { }; + libffi-clib = callPackage ( + { mkDerivation }: + mkDerivation { + pname = "libffi-clib"; + version = "3.5.2"; + sha256 = "12wsws5fsq3khfxakppagi5730c38ahh1ngax3gyh9ppqhzgfqmn"; + doHaddock = false; + description = "libffi clibs"; + license = lib.licensesSpdx."MIT"; + } + ) { }; + libffi-dynamic = callPackage ( { mkDerivation, @@ -421226,10 +423971,8 @@ self: { }: mkDerivation { pname = "libphonenumber"; - version = "0.1.3.0"; - sha256 = "1yhkkik6471gvx36i04hhbc9aq5fywgc6yrkii81rc4m6g3xnkig"; - revision = "1"; - editedCabalFile = "141bvakcs79ggxwfwqmpv8dm18zb8chfwd5g4l4wzj1835wr9aab"; + version = "0.1.4.0"; + sha256 = "0c88r1y0qrbnlhvisiln1rx1cz6nmkvaz9gkf7zx0afngx5ls2n1"; libraryHaskellDepends = [ base bytestring @@ -421238,10 +423981,8 @@ self: { system-cxx-std-lib transformers ]; - librarySystemDepends = [ - phonenumber - protobuf - ]; + librarySystemDepends = [ phonenumber ]; + libraryPkgconfigDepends = [ protobuf ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base @@ -422911,7 +425652,6 @@ self: { mkDerivation, base, containers, - ghc-prim, hspec, hspec-discover, mtl, @@ -422921,13 +425661,10 @@ self: { }: mkDerivation { pname = "lift-generics"; - version = "0.3"; - sha256 = "1walsrpschxg2bqw925z6cr24cznrcq04bb37azvwdcfrbl19r7a"; - revision = "2"; - editedCabalFile = "1l90p9nwklklj95w00iavgf4ldgsr33c3w2vrb5gpcgigghvbmfy"; + version = "0.3.1"; + sha256 = "052wja2k6bnvp719s17db5nhfhf5pgkrm1wabqnggmzixrp7ykbg"; libraryHaskellDepends = [ base - ghc-prim template-haskell th-compat ]; @@ -424229,7 +426966,6 @@ self: { containers, deepseq, distributive, - ghc-prim, hashable, indexed-traversable, lens, @@ -424238,21 +426974,18 @@ self: { reflection, semigroupoids, simple-reflect, - tagged, tasty, tasty-hunit, tasty-quickcheck, template-haskell, transformers, - transformers-compat, unordered-containers, vector, - void, }: mkDerivation { pname = "linear"; - version = "1.23.2"; - sha256 = "05v91is8rwm34a86gra2q03d5f1klj4nmlxx8r3cx0gbkdhrvmmv"; + version = "1.23.3"; + sha256 = "08pshls57w6pyb22bndacys9i0hbg1b01z302fmx67x8wps8f2f7"; libraryHaskellDepends = [ adjunctions base @@ -424263,20 +426996,16 @@ self: { containers deepseq distributive - ghc-prim hashable indexed-traversable lens random reflection semigroupoids - tagged template-haskell transformers - transformers-compat unordered-containers vector - void ]; testHaskellDepends = [ base @@ -424715,8 +427444,8 @@ self: { pname = "linear-generics"; version = "0.2.3"; sha256 = "0093ywl8s8k92b50li28gcmqc616f6l7jkv7vslkvqzn42yrvbq2"; - revision = "3"; - editedCabalFile = "1xg7v40hj38r5zqj65d3kjbzynp4vwh8fgwjsjw85lf11sl83kf8"; + revision = "4"; + editedCabalFile = "1wxb2r70bn1rhs771jlq08q1wvaf7risn6y931snaxa0xwi6a4zq"; libraryHaskellDepends = [ base containers @@ -426163,6 +428892,7 @@ self: { description = "Wrapping of Linux' ptrace(2)"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -426622,6 +429352,27 @@ self: { } ) { }; + liquid-finfield = callPackage ( + { + mkDerivation, + base, + liquidhaskell, + }: + mkDerivation { + pname = "liquid-finfield"; + version = "0.9.12.2.1"; + sha256 = "0p3h8zwh6y32qcgfdns4jcjkrh9jj2254wsmqb6808nxnxpg9lz4"; + libraryHaskellDepends = [ + base + liquidhaskell + ]; + description = "Finite field utilities for LiquidHaskell (requires cvc5)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + liquid-fixpoint = callPackage ( { mkDerivation, @@ -426741,7 +429492,7 @@ self: { } ) { }; - liquid-fixpoint_0_9_6_3_3 = callPackage ( + liquid-fixpoint_0_9_6_3_5 = callPackage ( { mkDerivation, aeson, @@ -426761,13 +429512,13 @@ self: { directory, fgl, filepath, + gitrev, hashable, intern, lens-family, megaparsec, mtl, optparse-applicative, - parallel, parser-combinators, pretty, process, @@ -426790,8 +429541,8 @@ self: { }: mkDerivation { pname = "liquid-fixpoint"; - version = "0.9.6.3.3"; - sha256 = "07dpgi5iwi1kf182vpcy5h3xq3bjxsvp16ayafbr0wv8wxg6l5ib"; + version = "0.9.6.3.5"; + sha256 = "0644bvcvikqkjzcnrsjz3l8f66r3pylbkrq8y0l9hpfkkj3zyj60"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -426812,12 +429563,12 @@ self: { directory fgl filepath + gitrev hashable intern lens-family megaparsec mtl - parallel parser-combinators pretty process @@ -426832,7 +429583,10 @@ self: { unordered-containers vector ]; - executableHaskellDepends = [ base ]; + executableHaskellDepends = [ + base + gitrev + ]; testHaskellDepends = [ base containers @@ -426970,8 +429724,8 @@ self: { }: mkDerivation { pname = "liquid-prelude"; - version = "0.9.10.1.2"; - sha256 = "07a9zpp3q2albipasag02jjzcws9fcz40cja6za1555n9qhqzy96"; + version = "0.9.12.2.1"; + sha256 = "0gxrdb98ch414ihdvhjrl19khz6amqk4cbcrl1fj3vxj1wh5im2g"; setupHaskellDepends = [ base Cabal @@ -427002,8 +429756,8 @@ self: { }: mkDerivation { pname = "liquid-vector"; - version = "0.13.1.0.1"; - sha256 = "1cb1kf48jcgw10i8sbs83873vccwsc220j8q6zg9p2wni8k52mrx"; + version = "0.13.1.0.2"; + sha256 = "05g70809rf96svbfl8myh32ld934wiyb9c7k27xh8dzzr55bfdf9"; setupHaskellDepends = [ base Cabal @@ -427057,7 +429811,7 @@ self: { } ) { inherit (pkgs) z3; }; - liquidhaskell_0_9_12_2 = callPackage ( + liquidhaskell_0_9_12_2_1 = callPackage ( { mkDerivation, base, @@ -427070,8 +429824,8 @@ self: { }: mkDerivation { pname = "liquidhaskell"; - version = "0.9.12.2"; - sha256 = "1my8qsky01ksd7j5f4pfk17n9rf7aii2x43g6yrl5qc46d85bpms"; + version = "0.9.12.2.1"; + sha256 = "1l4sx3mcqvvkd6plqvg7npjgwcgp5k24pl8732cx6npipd331r4b"; setupHaskellDepends = [ base Cabal @@ -427211,7 +429965,7 @@ self: { } ) { }; - liquidhaskell-boot_0_9_12_2 = callPackage ( + liquidhaskell-boot_0_9_12_2_1 = callPackage ( { mkDerivation, aeson, @@ -427261,10 +430015,8 @@ self: { }: mkDerivation { pname = "liquidhaskell-boot"; - version = "0.9.12.2"; - sha256 = "1gfphzqpj36valrmsbwijac12nr5b3fkgfxbkgq8dlws983hbadr"; - revision = "1"; - editedCabalFile = "0mywy0kck9q1rldzwi7r505a6zfbwaj6fjqq230x6abbqkba7rj6"; + version = "0.9.12.2.1"; + sha256 = "01pa2mm8rz6hidhw6ik51b8zz587hx4dv5r547shg3v0rydshbfk"; libraryHaskellDepends = [ aeson array @@ -428394,8 +431146,8 @@ self: { { mkDerivation, base }: mkDerivation { pname = "literally"; - version = "1.0.0.0"; - sha256 = "0ckprvl1f1iy3960d8wgal3pl54i5b47qlsimgr6i2r6vlqciv0y"; + version = "1.0.0.2"; + sha256 = "1hhasxqq0wj1qh9i8a29lpg0shxwj38fhflypkz0rq67vfigilmg"; libraryHaskellDepends = [ base ]; description = "Type-safe conversion of type literals into runtime values"; license = lib.licensesSpdx."0BSD"; @@ -429923,8 +432675,8 @@ self: { }: mkDerivation { pname = "llvm-pretty"; - version = "0.13.1.0"; - sha256 = "0i2j1n6xfii2vm5s4jvh3cqa2x03bmz640n4jjlf6aywldmwx3hy"; + version = "0.14.0.0"; + sha256 = "1qx1bid4r0zn1yqvbpsdkc1kd35clsj665cr37z416di0cw0f0jd"; libraryHaskellDepends = [ base containers @@ -429983,14 +432735,15 @@ self: { terminal-size, text, transformers, + tree-diff, uniplate, utf8-string, versions, }: mkDerivation { pname = "llvm-pretty-bc-parser"; - version = "0.5.1.0"; - sha256 = "1x0h735xkj5cxjx35040dv5ny5gnmnhs5z57w4hlpaj6sppsy7bg"; + version = "0.6.0.0"; + sha256 = "0351wyj2w3hdw85ifnrpg22kr912q8wmq1mcd5x6wcz7mqnxk9m4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -430040,6 +432793,7 @@ self: { terminal-size text transformers + tree-diff versions ]; description = "LLVM bitcode parsing library"; @@ -432082,6 +434836,68 @@ self: { } ) { }; + logging-effect_1_4_2 = callPackage ( + { + mkDerivation, + async, + base, + bytestring, + criterion, + exceptions, + fast-logger, + free, + lifted-async, + monad-control, + monad-logger, + mtl, + prettyprinter, + semigroups, + stm, + stm-delay, + text, + time, + transformers, + transformers-base, + unliftio-core, + }: + mkDerivation { + pname = "logging-effect"; + version = "1.4.2"; + sha256 = "1814lnbdmsjjc0qnza49ih7a63zgpybnk4r4yqinpyprdn7ihl7p"; + libraryHaskellDepends = [ + async + base + exceptions + free + monad-control + mtl + prettyprinter + semigroups + stm + stm-delay + text + time + transformers + transformers-base + unliftio-core + ]; + benchmarkHaskellDepends = [ + base + bytestring + criterion + fast-logger + lifted-async + monad-logger + prettyprinter + text + time + ]; + description = "A mtl-style monad transformer for general purpose & compositional logging"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + logging-effect-colors = callPackage ( { mkDerivation, @@ -434407,8 +437223,8 @@ self: { }: mkDerivation { pname = "lpeg"; - version = "1.1.0"; - sha256 = "0yav34yxrkbgnkcd3870smay5s3cypyd28m0fsg2jhlikgmhj5a1"; + version = "1.1.0.1"; + sha256 = "0r7qq93w39pvifwjqcq0p5vmy1k160gpn4wpqlfs1q0s9gq55z3a"; libraryHaskellDepends = [ base lua @@ -434499,6 +437315,50 @@ self: { } ) { }; + lrclib-client = callPackage ( + { + mkDerivation, + aeson, + base, + base16-bytestring, + bytestring, + cryptohash-sha256, + http-client, + http-client-tls, + http-types, + mtl, + tasty, + tasty-hunit, + text, + }: + mkDerivation { + pname = "lrclib-client"; + version = "0.3.1"; + sha256 = "05v17jh7f80x9v0cwhrrcggal4240r6rq4fzmxz1hhl4gm60g0d0"; + libraryHaskellDepends = [ + aeson + base + base16-bytestring + bytestring + cryptohash-sha256 + http-client + http-client-tls + http-types + mtl + text + ]; + testHaskellDepends = [ + aeson + base + bytestring + tasty + tasty-hunit + ]; + description = "A Haskell client for the LrcLib API (lyrics database)"; + license = lib.licensesSpdx."GPL-3.0-only"; + } + ) { }; + lrucache = callPackage ( { mkDerivation, @@ -435711,8 +438571,8 @@ self: { }: mkDerivation { pname = "lua-arbitrary"; - version = "1.0.1.1"; - sha256 = "0kbvcgi54ycl8zfdkc80ap5yhz0dml9bjdgmzx9l9m4rkhyi9xnm"; + version = "1.0.1.2"; + sha256 = "0d68giwa40g81m0qswpqnf4kqb0lxsd4bc05yk4g2gcnz2gdg888"; libraryHaskellDepends = [ base lua @@ -441402,8 +444262,8 @@ self: { pname = "map-syntax"; version = "0.3"; sha256 = "0b3ddi998saw5gi5r4bjbpid03rxlifn08zv15wf0b90ambhcc4k"; - revision = "9"; - editedCabalFile = "0xzb8pjljfyjbhilfi8sv13i87w5a2yzyn6piw3kgf86f6j6349i"; + revision = "10"; + editedCabalFile = "172vs749yd3zr7sl0qylmnqv502q46i3hzji5a16sl8wm5c236ww"; libraryHaskellDepends = [ base containers @@ -442201,31 +445061,27 @@ self: { containers, deepseq, Diff, - doctest-parallel, flatparse, - string-interpolate, tasty, tasty-golden, these, }: mkDerivation { pname = "markup-parse"; - version = "0.2.1.0"; - sha256 = "0g80sx8naqbzk21pb8msz7sr9z09brkdr2nkwx1qc3b2g41j5fd9"; + version = "0.2.2.0"; + sha256 = "0ws8d6grq79gicnil3qqm5sxds2jq0fwsjml33znwjdsdnagfg0i"; libraryHaskellDepends = [ base bytestring containers deepseq flatparse - string-interpolate these ]; testHaskellDepends = [ base bytestring Diff - doctest-parallel tasty tasty-golden ]; @@ -445144,8 +448000,8 @@ self: { pname = "mbox-utility"; version = "0.0.3.1"; sha256 = "0vh9ibh4g3fssq9jfzrmaa56sk4k35r27lmz2xq4fhc62fmkia92"; - revision = "3"; - editedCabalFile = "10smxm3w0f8n0milq67vy1zlb7ikks1pb9bjnrk54b1wsgap5div"; + revision = "4"; + editedCabalFile = "0hnrbknv7wdsaplvx48d3n86d7r3cgi9chxzrqc1kr2q62hqz3kl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -445687,8 +448543,8 @@ self: { }: mkDerivation { pname = "mcp-server"; - version = "0.1.0.15"; - sha256 = "0wmrjgd7sabkb9y2dx0bjdxabm2qply5rnfhnskbrshzx72rnrj7"; + version = "0.1.0.16"; + sha256 = "1dr5s9la0d9qljn1lrkh074rjfkrc3xvd40h9hbhjmkfaxn7lyji"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -445726,6 +448582,59 @@ self: { } ) { }; + mcp-server_0_1_0_17 = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + containers, + hspec, + http-types, + network-uri, + QuickCheck, + template-haskell, + text, + wai, + warp, + }: + mkDerivation { + pname = "mcp-server"; + version = "0.1.0.17"; + sha256 = "1q8z3ml3iznns3sa0gla12z8gjm0s6552yd47jbqywxz1f86pi47"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + base + bytestring + containers + http-types + network-uri + template-haskell + text + wai + warp + ]; + executableHaskellDepends = [ + base + text + ]; + testHaskellDepends = [ + aeson + base + bytestring + hspec + network-uri + QuickCheck + text + ]; + description = "Library for building Model Context Protocol (MCP) servers"; + license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + mcpi = callPackage ( { mkDerivation, @@ -445992,33 +448901,22 @@ self: { mkDerivation, adjunctions, base, - clock, containers, - deepseq, - doctest-parallel, - formatn, harpie, harpie-numhask, - mtl, mwc-probability, numhask, - optics-core, - optparse-applicative, - perf, primitive, profunctors, tdigest, text, - time, vector, vector-algorithms, }: mkDerivation { pname = "mealy"; - version = "0.5.0.1"; - sha256 = "095rqkb2skzj5sizj1f8l3d37brqmws4jx2pi004gkff2czawdzz"; - isLibrary = true; - isExecutable = true; + version = "0.5.1.1"; + sha256 = "1irggwyrq1bp47534nq805g2a7zj58jiz1gnc4mgfxpmbgdqi5ps"; libraryHaskellDepends = [ adjunctions base @@ -446034,29 +448932,8 @@ self: { vector vector-algorithms ]; - executableHaskellDepends = [ - base - clock - containers - deepseq - formatn - harpie - harpie-numhask - mtl - optics-core - optparse-applicative - perf - tdigest - text - time - ]; - testHaskellDepends = [ - base - doctest-parallel - ]; description = "Mealy machines for processing time-series and ordered data"; license = lib.licensesSpdx."BSD-3-Clause"; - mainProgram = "mealy-perf"; } ) { }; @@ -446915,6 +449792,8 @@ self: { pname = "megaparsec"; version = "9.7.0"; sha256 = "15zc66lplq5382wayigcw9kql08nvp9403a8f9xaw85z4lv45vdr"; + revision = "1"; + editedCabalFile = "0f3ys1k834924w5fhcixdxjlpzk3gvfn3j8wwnaliyvb2r5sdbsh"; libraryHaskellDepends = [ array base @@ -446983,8 +449862,8 @@ self: { pname = "megaparsec-tests"; version = "9.7.0"; sha256 = "17jwz62f8lnrfmmfrsv1jcvn9wmpk4jlhmxjwk5qqx2iyijnrpb1"; - revision = "2"; - editedCabalFile = "08lkj731i0pvynw9kvx72xi7rph84syg0dxvcz2ssnqdg3q6jxqf"; + revision = "3"; + editedCabalFile = "06r004sdmxr4i28cwf94pacfs9n6j1ny5nyl6b46cjkkm07gny1x"; libraryHaskellDepends = [ base bytestring @@ -447570,8 +450449,8 @@ self: { }: mkDerivation { pname = "mem-info"; - version = "0.4.1.1"; - sha256 = "10b3lmqh4nbyfpglgjb04xx0wd65vxfyc53m3l89linhvij61kmc"; + version = "0.4.1.2"; + sha256 = "1v7jmhydbndpncb5p30rlqv2frnzbk3zjja7f64hrxjdnia6h94x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -450353,6 +453232,8 @@ self: { pname = "microaeson"; version = "0.1.0.3"; sha256 = "04sngljny67zcs4271b4f1yvcjlahmn55yh30nwjpmwjybwahg66"; + revision = "1"; + editedCabalFile = "0vcpzz89w9ngfn07vxx1ry2pfjc9kyycgs0bqaaknqkbpppmf2c1"; libraryHaskellDepends = [ array base @@ -452231,8 +455112,8 @@ self: { }: mkDerivation { pname = "migrant-core"; - version = "0.1.0.3"; - sha256 = "15g7w2bpzhpp0gann0s8sj5ha315jf3bwlhkapfbrbjmswph0fgf"; + version = "0.1.1.1"; + sha256 = "1lgx2j5383ch611f9c6zahjk9sp2w531348ryriyg61rcmc5c499"; libraryHaskellDepends = [ base text @@ -452269,8 +455150,8 @@ self: { }: mkDerivation { pname = "migrant-hdbc"; - version = "0.1.0.3"; - sha256 = "181n17jxwii3c64crzrpxry9fbpmclpanf6sqbb3rc9vdpm7df0g"; + version = "0.1.1.1"; + sha256 = "1jan56sca8r1395sgca2cnqh3a8v7bcvn2k3bbid0z4fgimdadjc"; libraryHaskellDepends = [ base HDBC @@ -452313,8 +455194,8 @@ self: { }: mkDerivation { pname = "migrant-postgresql-simple"; - version = "0.1.0.3"; - sha256 = "096lj9ibminyfb09ciab20q014mqhwahqh3prc530lhv5arin1ml"; + version = "0.1.1.1"; + sha256 = "1m13siizja96zsqa3pcg07flbsybrd0cgz7zjw9qxghcxkrz65gp"; libraryHaskellDepends = [ base migrant-core @@ -452354,8 +455235,8 @@ self: { }: mkDerivation { pname = "migrant-sqlite-simple"; - version = "0.1.0.3"; - sha256 = "0gcji3kmdndn77kg74bxki32fwrvzafjv4svpxj31advprn6jdgx"; + version = "0.1.1.1"; + sha256 = "0gqskfp9gnnib343a4qld0sm2zx556zacyiqbaqwb9b29bn76axx"; libraryHaskellDepends = [ base migrant-core @@ -452774,8 +455655,8 @@ self: { }: mkDerivation { pname = "mime-types"; - version = "0.1.2.0"; - sha256 = "0qagjx5mxzl62ajlvhdqsjkh7f8zzvrq5s343bws89hp9j5f8fh1"; + version = "0.1.2.1"; + sha256 = "0nb30xn011p30y6sn5krnqvg9i5qmyan43ywg6wa36qzhqp5mjhw"; libraryHaskellDepends = [ base bytestring @@ -455567,8 +458448,8 @@ self: { pname = "mmark"; version = "0.0.8.0"; sha256 = "05wzjyqh4605g2y3lhcqrjh4qzj4fv8xg5baf3xi0x6ararrwjgr"; - revision = "2"; - editedCabalFile = "0gy66sawj11za86rwkvmr791acd84f895ym568w7wnbks9p6gmmr"; + revision = "3"; + editedCabalFile = "1ha5y8fb5bqfbvp6vbx03fwv1754zviyr1y6x8xyi23n7d7gc05q"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson @@ -455719,10 +458600,10 @@ self: { }: mkDerivation { pname = "mmorph"; - version = "1.2.1"; - sha256 = "1rjclyxyr5ajnpmkrlwap77h5fmdwys8bpwfj0n87v33hh1dcn8f"; + version = "1.2.2"; + sha256 = "1bwzgd0xwvlxcgn86lvm26lnq0d4kd693zpyqr7m8xk77cmjsvyx"; revision = "1"; - editedCabalFile = "00pf88q7vpgf8inbk50023zpcwy64gvaarpj3w3ssxyk15zi6k7a"; + editedCabalFile = "093280asv0ni2yz0nn6zbvl7650b5wddfq3b521vi8vi16zizf9s"; libraryHaskellDepends = [ base mtl @@ -456663,7 +459544,7 @@ self: { } ) { }; - mockcat_1_1_0_0 = callPackage ( + mockcat_1_4_1_1 = callPackage ( { mkDerivation, async, @@ -456684,8 +459565,8 @@ self: { }: mkDerivation { pname = "mockcat"; - version = "1.1.0.0"; - sha256 = "1k6cgj01dq3pmy4a084zf2qna139yq17wby2wqaqap693khkg7q0"; + version = "1.4.1.1"; + sha256 = "1mgscbw4xf4qrdz36qd4acji1fkmf3r1xmi5qfwwj4dvjvi07v6n"; libraryHaskellDepends = [ base containers @@ -456942,8 +459823,8 @@ self: { pname = "modern-uri"; version = "0.3.6.1"; sha256 = "1sag8l91qd7xs56rlx8r6dz9zxxmqsnfw0v47az7l8nirv7zjih2"; - revision = "3"; - editedCabalFile = "0snpm04nhll3y25c1dypbjsq736cfpiiynijpfahcnv9gsyhzw0z"; + revision = "4"; + editedCabalFile = "110s10ypd1v0nk21xb3ihcgp32v1hwi9xaanhlladzg67pmmqd85"; libraryHaskellDepends = [ base bytestring @@ -458100,6 +460981,51 @@ self: { } ) { }; + monad-actions = callPackage ( + { + mkDerivation, + base, + checkers, + free, + kan-extensions, + mmorph, + mtl, + QuickCheck, + tasty, + tasty-quickcheck, + template-haskell, + transformers, + }: + mkDerivation { + pname = "monad-actions"; + version = "1.0.0.0"; + sha256 = "1lva4vy9rnsnw6g9xaggxq9g3j6g9c86sc9ldj4frb4y44xxzm3c"; + libraryHaskellDepends = [ + base + free + kan-extensions + mmorph + mtl + template-haskell + transformers + ]; + testHaskellDepends = [ + base + checkers + free + kan-extensions + mmorph + mtl + QuickCheck + tasty + tasty-quickcheck + transformers + ]; + description = "Left or right actions of a monad on a functor"; + license = lib.licensesSpdx."LGPL-2.0-or-later"; + } + ) { }; + monad-atom = callPackage ( { mkDerivation, @@ -458688,8 +461614,8 @@ self: { }: mkDerivation { pname = "monad-coroutine"; - version = "0.9.2"; - sha256 = "0bikrq73r1xc6vrpwll3i8pkg4vflj3sa2ifv913mjkcmnwqijzs"; + version = "0.9.3"; + sha256 = "1x625cbykg6m655k7cn264wjbsly0rnb0157w77ncxdk67566ycx"; libraryHaskellDepends = [ base monad-parallel @@ -459369,8 +462295,8 @@ self: { }: mkDerivation { pname = "monad-logger-aeson"; - version = "0.4.1.4"; - sha256 = "0gfzp22c4my130wxk1q9xzigl7kn30f203f7d53mgcrmg43kvnbq"; + version = "0.4.1.5"; + sha256 = "1x7smw5xmrzs73s4vijj3ga7a1zajflrfdbxcdvxgfcqrr3aa9gj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -460034,8 +462960,8 @@ self: { }: mkDerivation { pname = "monad-parallel"; - version = "0.8"; - sha256 = "1j905cwc440g7rvbhsdkqf50ag7p2bi6cy2rqsk918rn80fqqra4"; + version = "0.8.0.1"; + sha256 = "03g3p3acz1bkbzzvix9rpqzka71hm5n5qfwb5y3x9pzf7f5ww7hs"; libraryHaskellDepends = [ base parallel @@ -462383,6 +465309,35 @@ self: { } ) { }; + monoid-extras_0_7_0_1 = callPackage ( + { + mkDerivation, + base, + criterion, + groups, + semigroupoids, + semigroups, + }: + mkDerivation { + pname = "monoid-extras"; + version = "0.7.0.1"; + sha256 = "0g4jgbpgvk6blzczv1vddq98z4ym613mgpw4j92290prmj9zvhmz"; + libraryHaskellDepends = [ + base + groups + semigroupoids + ]; + benchmarkHaskellDepends = [ + base + criterion + semigroups + ]; + description = "Various extra monoid-related definitions and utilities"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + monoid-insertleft = callPackage ( { mkDerivation, base }: mkDerivation { @@ -462527,8 +465482,8 @@ self: { }: mkDerivation { pname = "monoid-subclasses"; - version = "1.2.6"; - sha256 = "0z7mcgph78qfzhn25vnjfzkf99i1b0ssja8ivb1iy7d6kgzamnp4"; + version = "1.2.6.1"; + sha256 = "15jw1rv227322pgckpgk2syd4lxyl47d6hw6r5v9ls6s4m0bmbqn"; libraryHaskellDepends = [ base bytestring @@ -462613,6 +465568,45 @@ self: { } ) { }; + monoidal-containers_0_6_7_0 = callPackage ( + { + mkDerivation, + aeson, + base, + containers, + deepseq, + hashable, + lens, + newtype, + semialign, + these, + unordered-containers, + witherable, + }: + mkDerivation { + pname = "monoidal-containers"; + version = "0.6.7.0"; + sha256 = "1hgzgb09i0ylplcv1mnb51a19h1x608ams9jvwxn9mkvni36y3rv"; + libraryHaskellDepends = [ + aeson + base + containers + deepseq + hashable + lens + newtype + semialign + these + unordered-containers + witherable + ]; + description = "Containers with monoidal accumulation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.alexfmpe ]; + } + ) { }; + monoidal-functors = callPackage ( { mkDerivation, @@ -466843,6 +469837,69 @@ self: { } ) { }; + mquickjs-hs = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + containers, + exceptions, + HUnit, + inline-c, + mtl, + QuickCheck, + scientific, + string-conv, + tasty, + tasty-hunit, + tasty-quickcheck, + text, + time, + transformers, + unliftio-core, + unordered-containers, + vector, + }: + mkDerivation { + pname = "mquickjs-hs"; + version = "0.1.2.4"; + sha256 = "0mg8v35yr27bx7xlbm79v5n689pg9jbipkgn593hi4qxfa0n7s4d"; + libraryHaskellDepends = [ + aeson + base + bytestring + containers + exceptions + inline-c + mtl + scientific + string-conv + text + time + transformers + unliftio-core + unordered-containers + vector + ]; + testHaskellDepends = [ + aeson + base + exceptions + HUnit + QuickCheck + tasty + tasty-hunit + tasty-quickcheck + text + unordered-containers + vector + ]; + description = "Wrapper for the Micro QuickJS JavaScript Engine"; + license = lib.licenses.mit; + } + ) { }; + mr-env = callPackage ( { mkDerivation, @@ -467166,6 +470223,44 @@ self: { } ) { }; + msdf-atlas = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + containers, + text, + vector, + zstd, + }: + mkDerivation { + pname = "msdf-atlas"; + version = "0.1.0.0"; + sha256 = "1kc2hirz07rrz1wfarpfzw3vcyihndwj84jjjy0scki211qbhxzc"; + libraryHaskellDepends = [ + aeson + base + containers + text + vector + ]; + testHaskellDepends = [ + aeson + base + bytestring + containers + text + vector + zstd + ]; + description = "Types and parser for the MSDF atlas layout"; + license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + msgpack = callPackage ( { mkDerivation, @@ -472018,6 +475113,7 @@ self: { criterion, deepseq, entropy, + ppad-hmac-drbg, ppad-secp256k1, ppad-sha256, tasty, @@ -472026,8 +475122,8 @@ self: { }: mkDerivation { pname = "musig2"; - version = "0.1.1"; - sha256 = "11fpnflz39g97wmlvysyw0v1d9c99mh2qas7x4fsmyyfgmyg66xp"; + version = "0.1.4"; + sha256 = "1pxyhi8d29dlac45qscgsjmfpnnc7n7ir9jnx59450awzv6mdxp2"; libraryHaskellDepends = [ base base16-bytestring @@ -472035,6 +475131,7 @@ self: { bytestring containers entropy + ppad-hmac-drbg ppad-secp256k1 ppad-sha256 ]; @@ -472693,8 +475790,8 @@ self: { }: mkDerivation { pname = "mwc-random"; - version = "0.15.2.0"; - sha256 = "0cs12ycr966ff5k4z515rqxnw3a0hrjf5dafm8k96469ww3anhsq"; + version = "0.15.3.0"; + sha256 = "17a78gy5p6ypfpynq6r5ah1xh3z6dx98qzzdg4wp20h815cl1vzn"; libraryHaskellDepends = [ base math-functions @@ -474133,6 +477230,7 @@ self: { license = lib.licensesSpdx."ISC"; hydraPlatforms = lib.platforms.none; mainProgram = "mywork"; + broken = true; } ) { }; @@ -476248,8 +479346,8 @@ self: { pname = "natural-transformation"; version = "0.4.1"; sha256 = "1mx4m6dy6fm56xyhm6xjavv4q3188r2xnrnqgvmqf9a5m678yskf"; - revision = "2"; - editedCabalFile = "19nz1qqf2zs44y0y2imvcbrdn4g9cd9l810rx1vfwpcafyw50x3l"; + revision = "3"; + editedCabalFile = "1vmjjknp5iasc17p2gxj14jnci1b86fxl723ivh7a9wmhq64zcki"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base @@ -476296,6 +479394,46 @@ self: { } ) { }; + nauty-parser = callPackage ( + { + mkDerivation, + array, + base, + bytestring, + containers, + HUnit, + mtl, + text, + transformers, + }: + mkDerivation { + pname = "nauty-parser"; + version = "1.0.0.0"; + sha256 = "1bd82a7f65ivhdq1c1w8y1352ll3nms91wjp8p1sy6qhpr5vjlmw"; + libraryHaskellDepends = [ + array + base + bytestring + containers + mtl + text + transformers + ]; + testHaskellDepends = [ + array + base + bytestring + HUnit + text + transformers + ]; + description = "Parse/encode graph6, digraph6 and sparse6 formats (nauty)"; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + naver-translate = callPackage ( { mkDerivation, @@ -481212,6 +484350,80 @@ self: { } ) { }; + network-transport-quic = callPackage ( + { + mkDerivation, + async, + base, + binary, + bytestring, + containers, + filepath, + hedgehog, + microlens-platform, + network, + network-transport, + network-transport-tcp, + network-transport-tests, + quic, + stm, + tasty, + tasty-bench, + tasty-flaky, + tasty-hedgehog, + tasty-hunit, + tls, + tls-session-manager, + }: + mkDerivation { + pname = "network-transport-quic"; + version = "0.1.1"; + sha256 = "1grif580mw6kp5hdgmimia8a14ydqcz1q4wj824hs3qwmxgmp44d"; + revision = "1"; + editedCabalFile = "0sm97r2p3fgd64mdq12pamv2554cmi6wpi84y5h700xvvd5aqlg8"; + libraryHaskellDepends = [ + async + base + binary + bytestring + containers + microlens-platform + network + network-transport + quic + stm + tls + tls-session-manager + ]; + testHaskellDepends = [ + base + bytestring + filepath + hedgehog + network + network-transport + network-transport-tests + tasty + tasty-flaky + tasty-hedgehog + tasty-hunit + ]; + benchmarkHaskellDepends = [ + async + base + bytestring + filepath + network-transport + network-transport-tcp + tasty + tasty-bench + ]; + description = "Networking layer for Cloud Haskell based on QUIC"; + license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + network-transport-tcp = callPackage ( { mkDerivation, @@ -481622,6 +484834,59 @@ self: { } ) { }; + network-uri-template_0_1_2_0 = callPackage ( + { + mkDerivation, + base, + conduit, + containers, + hspec, + markdown-unlit, + megaparsec, + network-uri, + optparse-applicative, + prettyprinter, + prettyprinter-ansi-terminal, + text, + }: + mkDerivation { + pname = "network-uri-template"; + version = "0.1.2.0"; + sha256 = "1dg7nx4wpmg2x7qjwz9245rpz4mj3mq2hd930pvxqkgmq35p3mm5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + containers + megaparsec + network-uri + prettyprinter + text + ]; + executableHaskellDepends = [ + base + containers + optparse-applicative + prettyprinter + prettyprinter-ansi-terminal + text + ]; + testHaskellDepends = [ + base + conduit + containers + hspec + megaparsec + text + ]; + testToolDepends = [ markdown-unlit ]; + description = "Library for parsing and expanding URI Templates, as per RFC 6570"; + license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "network-uri-template"; + } + ) { }; + network-voicetext = callPackage ( { mkDerivation, @@ -482955,8 +486220,8 @@ self: { }: mkDerivation { pname = "ngx-export"; - version = "1.7.10.1"; - sha256 = "1gzyygw3l434s7kb5iqj6maxrwrnlx5fw1jiir14zdq6p3vafnp8"; + version = "1.7.10.2"; + sha256 = "0d712xy7gy03z22cdns4alf6nbqj62dlhrqq4msv4hlbk1w6iivk"; libraryHaskellDepends = [ async base @@ -482987,8 +486252,8 @@ self: { }: mkDerivation { pname = "ngx-export-distribution"; - version = "0.6.0.1"; - sha256 = "1in397s832ivw5wqvdydbc3j63cmmzvra8lfic6476dpm9k1m8s4"; + version = "0.6.0.2"; + sha256 = "0isppragiiv9d7bzircxcgbc8zqzhgdf133dfp8d0nqb4za52wqf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -483118,8 +486383,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools"; - version = "1.2.6.1"; - sha256 = "1xvhmvlcs10ibn0i2hrphp168gkygsxkbzbdmzp72pn8lhnjsgvd"; + version = "1.2.6.2"; + sha256 = "0fb7w75bk3z0mbkpcp6vsq3ag6cjhbnqpha1gdxx4ijns4g6dp7f"; libraryHaskellDepends = [ aeson base @@ -483171,8 +486436,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools-extra"; - version = "1.2.11"; - sha256 = "0aj78jb6vl4vl50z8qz2hjrid36wgrnfsgcmqsxm4pg1ph7bqkd0"; + version = "1.2.12"; + sha256 = "0py9pylysfnpzlcd7kxxj890lh6gs9xycp7sadppss1yb38li21f"; libraryHaskellDepends = [ aeson array @@ -485393,7 +488658,7 @@ self: { } ) { }; - no-recursion_0_3_0_0 = callPackage ( + no-recursion_0_4_0_0 = callPackage ( { mkDerivation, base, @@ -485404,8 +488669,8 @@ self: { }: mkDerivation { pname = "no-recursion"; - version = "0.3.0.0"; - sha256 = "01g5gg2jrq5p8frq722z4a60j8s69kgb2shz3rvvcm4da91v62l9"; + version = "0.4.0.0"; + sha256 = "0i1bfh2iqwrzmbvhdjprmyf80899mbd3nk476zfwlpzfv9vzwgdn"; setupHaskellDepends = [ base Cabal @@ -485420,7 +488685,7 @@ self: { doctest ]; description = "A GHC plugin to remove support for recursion"; - license = "(AGPL-3.0-only WITH Universal-FOSS-exception-1.0 OR AGPL-3.0-only OR LicenseRef-commercial)"; + license = "(AGPL-3.0-only WITH Universal-FOSS-exception-1.0 OR LicenseRef-commercial)"; hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.sellout ]; } @@ -487155,8 +490420,8 @@ self: { pname = "nothunks"; version = "0.3.1"; sha256 = "0pcpgv4pp0likra1rxyf70w48qn0nyqqghagym1x73j4zr9gk0rp"; - revision = "1"; - editedCabalFile = "1qsabpyjcwkm75jh7pa6yv2aza0z50rpn0q27sxjxmhw1gbv0rja"; + revision = "2"; + editedCabalFile = "0v1x4ypv7hx473ik3r6yhbgjrjlqn3fhv8p7yn6wd8b75ndsbv43"; libraryHaskellDepends = [ base bytestring @@ -488309,16 +491574,18 @@ self: { mkDerivation, base, directory, + extra, process, transformers, uniplate, }: mkDerivation { pname = "nsis"; - version = "0.3.3"; - sha256 = "12vp44g56x6lkagh9qm5rf0hfrn7kqk4jxsswlml60iji7r8x9mx"; + version = "0.3.4"; + sha256 = "1a55qfm8zf0l3qyv7vfzjlvmj13sax74fcja7cbw8b4xp170317c"; libraryHaskellDepends = [ base + extra transformers uniplate ]; @@ -489553,22 +492820,12 @@ self: { ) { }; numhask = callPackage ( - { - mkDerivation, - base, - doctest-parallel, - QuickCheck, - }: + { mkDerivation, base }: mkDerivation { pname = "numhask"; - version = "0.13.1.0"; - sha256 = "0l326qwhra12ryjq9xmssl6pphfa4c5rhhbg1rm47rklclahwcy5"; + version = "0.13.2.1"; + sha256 = "1sh6k2b90p2gwxspqpv3v5bl8pbs5nfzkpsxmsk59ag852klhbci"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base - doctest-parallel - QuickCheck - ]; description = "A numeric class hierarchy"; license = lib.licensesSpdx."BSD-3-Clause"; } @@ -489772,7 +493029,6 @@ self: { base, containers, distributive, - doctest-parallel, numhask, semigroupoids, tdigest, @@ -489782,8 +493038,8 @@ self: { }: mkDerivation { pname = "numhask-space"; - version = "0.13.1.0"; - sha256 = "145jb3vcy1n1i0xfhsnz4bm9fl2wnvikrazavv6x5yxjnba1m24m"; + version = "0.13.2.0"; + sha256 = "0vjj3dj7hab1gjv6c4knbvmwmszca5z1njz7p6i088dw2yk036ka"; libraryHaskellDepends = [ adjunctions base @@ -489796,10 +493052,6 @@ self: { time vector ]; - testHaskellDepends = [ - base - doctest-parallel - ]; description = "Numerical spaces"; license = lib.licensesSpdx."BSD-3-Clause"; } @@ -492420,7 +495672,7 @@ self: { } ) { }; - ogma-cli_1_11_0 = callPackage ( + ogma-cli_1_12_0 = callPackage ( { mkDerivation, aeson, @@ -492437,8 +495689,8 @@ self: { }: mkDerivation { pname = "ogma-cli"; - version = "1.11.0"; - sha256 = "0ba5y46p8gi7vjl62791cjxly6ik00bfjbzma6z4n8irnf2frdzy"; + version = "1.12.0"; + sha256 = "1qj6lvjdcj77gfzyavr8rf4g2ywfq4maq38m9xvl7mqa9as235d2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -492536,7 +495788,7 @@ self: { } ) { }; - ogma-core_1_11_0 = callPackage ( + ogma-core_1_12_0 = callPackage ( { mkDerivation, aeson, @@ -492568,8 +495820,8 @@ self: { }: mkDerivation { pname = "ogma-core"; - version = "1.11.0"; - sha256 = "0bx7rjddwxwqacy3mw59502dc9jwy88s1mya4yn6mp9a1k62ha7g"; + version = "1.12.0"; + sha256 = "1pg9ikal0dd6b7kxs3rxbcv0hfiqb32lazzihpvivyngybb3wh3b"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson @@ -492649,7 +495901,7 @@ self: { } ) { }; - ogma-extra_1_11_0 = callPackage ( + ogma-extra_1_12_0 = callPackage ( { mkDerivation, aeson, @@ -492666,8 +495918,8 @@ self: { }: mkDerivation { pname = "ogma-extra"; - version = "1.11.0"; - sha256 = "1az9v4zrwwfwpnqhdqcnr1bhyx3zkx2m372sp90f4v5m3gmk64mp"; + version = "1.12.0"; + sha256 = "0qkxnmhb2lj0g5vi7bwybib56m3p4malqiiwgv8jqc1p7c4j7phg"; libraryHaskellDepends = [ aeson base @@ -492733,7 +495985,7 @@ self: { } ) { }; - ogma-language-c_1_11_0 = callPackage ( + ogma-language-c_1_12_0 = callPackage ( { mkDerivation, alex, @@ -492749,8 +496001,8 @@ self: { }: mkDerivation { pname = "ogma-language-c"; - version = "1.11.0"; - sha256 = "0qh8v892bf25cs8csrc0sa4li172v20zr1qfpq4q8apb2hz71bpb"; + version = "1.12.0"; + sha256 = "07wgqwp0lmmj3klfn0kzhzkr8b2f74ffi1g9hdrzfd38dax0lccz"; setupHaskellDepends = [ base Cabal @@ -492828,12 +496080,12 @@ self: { } ) { }; - ogma-language-copilot_1_11_0 = callPackage ( + ogma-language-copilot_1_12_0 = callPackage ( { mkDerivation, base }: mkDerivation { pname = "ogma-language-copilot"; - version = "1.11.0"; - sha256 = "1d26p8qrdpisxgjs3ij09qkvs61p6ik18r311w3lbm1z6ryi3ifm"; + version = "1.12.0"; + sha256 = "1xcjf704lmwi94f4gbq1a9fcllphkqhv28kwgxsskazwkb65ql7z"; libraryHaskellDepends = [ base ]; description = "Ogma: Runtime Monitor translator: Copilot Language Endpoints"; license = lib.licenses.asl20; @@ -492870,7 +496122,7 @@ self: { } ) { }; - ogma-language-csv_1_11_0 = callPackage ( + ogma-language-csv_1_12_0 = callPackage ( { mkDerivation, base, @@ -492883,8 +496135,8 @@ self: { }: mkDerivation { pname = "ogma-language-csv"; - version = "1.11.0"; - sha256 = "0ba1y8shyanj97zlxpxpl158p5r9fy4x31zzx9mjxq0fglyi7fbs"; + version = "1.12.0"; + sha256 = "0cwfzpnlb1m9vphkzq3w7mxkby6vp1cda9iaz62364khglixzk61"; libraryHaskellDepends = [ base bytestring @@ -493005,7 +496257,7 @@ self: { } ) { }; - ogma-language-jsonspec_1_11_0 = callPackage ( + ogma-language-jsonspec_1_12_0 = callPackage ( { mkDerivation, aeson, @@ -493019,8 +496271,8 @@ self: { }: mkDerivation { pname = "ogma-language-jsonspec"; - version = "1.11.0"; - sha256 = "0mwph8zw0jdx4dvg4agd2jry9cjm2x96bbpacs8g5g49lp41bd3j"; + version = "1.12.0"; + sha256 = "1hr7a7pjwm52njnrg8ps9pwqgq88ls3vsr0nms49lz92xlnx150x"; libraryHaskellDepends = [ aeson base @@ -493080,7 +496332,7 @@ self: { } ) { }; - ogma-language-lustre_1_11_0 = callPackage ( + ogma-language-lustre_1_12_0 = callPackage ( { mkDerivation, alex, @@ -493096,8 +496348,8 @@ self: { }: mkDerivation { pname = "ogma-language-lustre"; - version = "1.11.0"; - sha256 = "03ckm7555snxrzs45n81h1rmma3ahc5m5rh9yarkwns34n8a20xg"; + version = "1.12.0"; + sha256 = "0rw6nd91lwjd8mx79vx1fd9k7lv520x7ii8a8j3acgpmg736x5cc"; setupHaskellDepends = [ base Cabal @@ -493167,7 +496419,7 @@ self: { } ) { }; - ogma-language-smv_1_11_0 = callPackage ( + ogma-language-smv_1_12_0 = callPackage ( { mkDerivation, alex, @@ -493183,8 +496435,8 @@ self: { }: mkDerivation { pname = "ogma-language-smv"; - version = "1.11.0"; - sha256 = "02zks4b679j4mjf624sf3kn2b4s9dfqiymkl9c8jhrimxvh20g49"; + version = "1.12.0"; + sha256 = "0xw93x9i2xdydwmnbm55jjx1l7ibavr5bd9dkamyhwanc3mr828x"; setupHaskellDepends = [ base Cabal @@ -493236,7 +496488,7 @@ self: { } ) { }; - ogma-language-xlsx_1_11_0 = callPackage ( + ogma-language-xlsx_1_12_0 = callPackage ( { mkDerivation, base, @@ -493247,8 +496499,8 @@ self: { }: mkDerivation { pname = "ogma-language-xlsx"; - version = "1.11.0"; - sha256 = "0i8k5baqcl9gfqkzxg3pydr3gji6n1530zf7w2rfzwzda13mi7n1"; + version = "1.12.0"; + sha256 = "1y4nwwaqqsr2dsw5zixvfjqfphhbxmacdid6z6kw16lng7dwksfg"; libraryHaskellDepends = [ base bytestring @@ -493291,7 +496543,7 @@ self: { } ) { }; - ogma-language-xmlspec_1_11_0 = callPackage ( + ogma-language-xmlspec_1_12_0 = callPackage ( { mkDerivation, base, @@ -493304,8 +496556,8 @@ self: { }: mkDerivation { pname = "ogma-language-xmlspec"; - version = "1.11.0"; - sha256 = "0d9mqz7g996d0gn13l93fy3spvqqld35hllc6haimzm4pahyq7ai"; + version = "1.12.0"; + sha256 = "0p6dzvy445330zl1kiz46jfd6kapkvaddsl6sp549d3zd29db2rr"; libraryHaskellDepends = [ base hxt @@ -493333,12 +496585,12 @@ self: { } ) { }; - ogma-spec_1_11_0 = callPackage ( + ogma-spec_1_12_0 = callPackage ( { mkDerivation, base }: mkDerivation { pname = "ogma-spec"; - version = "1.11.0"; - sha256 = "0wdhb4n9ngrxy5b8s89ms1m72ykp36vldslm8w66181icinn96d9"; + version = "1.12.0"; + sha256 = "1da8sq40zj22grc34qfnlchys70ai3n5plfjq1b8w47x83cww51q"; libraryHaskellDepends = [ base ]; description = "Ogma: Runtime Monitor translator: JSON Frontend"; license = lib.licenses.asl20; @@ -493711,8 +496963,8 @@ self: { }: mkDerivation { pname = "old-time"; - version = "1.1.0.4"; - sha256 = "0vqn9iifrg601734pvvl3khyxv2y7dxr25z3a9pnfjljgdzyn8hy"; + version = "1.1.0.5"; + sha256 = "17x96snkj17ancbb1rk5vmsb9rxas81k6ijrmmm15nzqny27c5h9"; libraryHaskellDepends = [ base old-locale @@ -494909,14 +498161,11 @@ self: { linear-base, profunctors, tagged, - transformers, }: mkDerivation { pname = "one-liner"; - version = "2.1"; - sha256 = "09gdivd38disddxs42179vmgca0yzk5dfm6ygicgl5l25qbizrfh"; - revision = "1"; - editedCabalFile = "1n6d74s0x91qi4fi6wv5yggjb1nvwk0ir580mkf67bca2x6f1cqn"; + version = "2.1.1"; + sha256 = "0fy43ms9p0yyvxz0kl2if8qypy1f9wnzrwrxarp1idspgcsv6n7p"; libraryHaskellDepends = [ base bifunctors @@ -494925,11 +498174,9 @@ self: { linear-base profunctors tagged - transformers ]; testHaskellDepends = [ base - contravariant HUnit ]; description = "Constraint-based generics"; @@ -495402,8 +498649,8 @@ self: { pname = "opaleye"; version = "0.10.7.0"; sha256 = "0giy1g65lsvfhqqczxf0gqd4vbpb9n5van583jdlrd9w3vyf388b"; - revision = "1"; - editedCabalFile = "1mmbwdrslh4gfcc370cssv51yfjlfya9fwvxdh3254amzgh1232v"; + revision = "2"; + editedCabalFile = "0n9ams05bf8dfkp789yc2p5khdai1k6z28viw2by4fq7dd0qkbsa"; libraryHaskellDepends = [ aeson base @@ -499683,8 +502930,8 @@ self: { pname = "optics-th"; version = "0.4.1"; sha256 = "05zxljfqmhr5if7l8gld5s864nql6kqjfizsf1z7r3ydknvmff6p"; - revision = "9"; - editedCabalFile = "0v96pjcm6g59d49vg2a0zcaxyky1yml7rcg2q0635qq27bc01x14"; + revision = "10"; + editedCabalFile = "04jlmkxjnii6qpklgp1kmjxzvd21k3hspqjhk4cmk8h8wd3y6nbb"; libraryHaskellDepends = [ base containers @@ -501906,6 +505153,8 @@ self: { pname = "ormolu"; version = "0.8.0.2"; sha256 = "1fh2m4sy8vzxvm1qm9413apzblqf4sla3454mx64ngkwx0pgi2ad"; + revision = "2"; + editedCabalFile = "0sqxf4rrz48v6fgvwnkkbfis2b0qwjr7j64x4knkkvy9l5vganj0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -502051,8 +505300,8 @@ self: { }: mkDerivation { pname = "orville-postgresql"; - version = "1.1.0.0"; - sha256 = "11yax49l861qkx22nqphdch1w1gg1yp01m6kb2dcrgn50clbxqql"; + version = "1.1.1.0"; + sha256 = "02377anyhsgiw1g5xqj5w6686ad6q99ik3q59h6nwcikd1hrvjpv"; libraryHaskellDepends = [ attoparsec base @@ -502285,7 +505534,7 @@ self: { } ) { }; - os-string_2_0_8 = callPackage ( + os-string_2_0_10 = callPackage ( { mkDerivation, base, @@ -502300,8 +505549,8 @@ self: { }: mkDerivation { pname = "os-string"; - version = "2.0.8"; - sha256 = "11i62ysdlqjzajj5s7s6n696mqhflpfn1a251mxjwa1hvmwl4y82"; + version = "2.0.10"; + sha256 = "19asqyappgnyzvr3wrh5jnaim6zs7girk7g61j1gq28s2akbi0pn"; libraryHaskellDepends = [ base bytestring @@ -506825,8 +510074,8 @@ self: { }: mkDerivation { pname = "pandoc-lua-marshal"; - version = "0.3.1"; - sha256 = "0869amr9w5s90dha694vy6rwfni7p1wp9dyjyyk2jvh8h22gcpr0"; + version = "0.3.2.1"; + sha256 = "04gakgcyqj5pjnfv4xnfsbkskfbq2lnc2in8g06hffp55cnz0p1a"; libraryHaskellDepends = [ aeson base @@ -507490,68 +510739,6 @@ self: { ) { }; pandoc-types = callPackage ( - { - mkDerivation, - aeson, - base, - bytestring, - containers, - criterion, - deepseq, - ghc-prim, - HUnit, - QuickCheck, - syb, - template-haskell, - test-framework, - test-framework-hunit, - test-framework-quickcheck2, - text, - transformers, - }: - mkDerivation { - pname = "pandoc-types"; - version = "1.23.1"; - sha256 = "1hd18l1c5yh7x24gsligkbraadq12hn7mim16xyjnicdsa1s03xd"; - revision = "4"; - editedCabalFile = "1slrkh9q4vcpsw4dxs8lznh7gxbvp27a3xqpxpyvzahjrlaqm45q"; - libraryHaskellDepends = [ - aeson - base - bytestring - containers - deepseq - ghc-prim - QuickCheck - syb - text - transformers - ]; - testHaskellDepends = [ - aeson - base - bytestring - containers - HUnit - QuickCheck - syb - template-haskell - test-framework - test-framework-hunit - test-framework-quickcheck2 - text - ]; - benchmarkHaskellDepends = [ - base - criterion - text - ]; - description = "Types for representing a structured document"; - license = lib.licensesSpdx."BSD-3-Clause"; - } - ) { }; - - pandoc-types_1_23_1_1 = callPackage ( { mkDerivation, aeson, @@ -507606,7 +510793,6 @@ self: { ]; description = "Types for representing a structured document"; license = lib.licensesSpdx."BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -509684,6 +512870,8 @@ self: { pname = "parallel"; version = "3.3.0.0"; sha256 = "148pakbn546a16fhwrl8n7fzywcy307d6bx7g9jvz3lfimvixhj7"; + revision = "1"; + editedCabalFile = "1aligqvx0zvhfvx4jcw1kax0ayg1r4rfwhp47ddqzqw3mp9q4jvs"; libraryHaskellDepends = [ array base @@ -509901,6 +513089,74 @@ self: { } ) { }; + parameterized-utils_2_2_0_0 = callPackage ( + { + mkDerivation, + base, + base-orphans, + constraints, + containers, + deepseq, + hashable, + hashtables, + hedgehog, + hedgehog-classes, + indexed-traversable, + microlens, + microlens-pro, + mtl, + profunctors, + tasty, + tasty-ant-xml, + tasty-hedgehog, + tasty-hunit, + template-haskell, + text, + th-abstraction, + vector, + }: + mkDerivation { + pname = "parameterized-utils"; + version = "2.2.0.0"; + sha256 = "0kz5ssgah0n5in76mibif3phqqd5mxy5cca26aafcvvm2g45v336"; + libraryHaskellDepends = [ + base + base-orphans + constraints + containers + deepseq + hashable + hashtables + indexed-traversable + microlens + microlens-pro + mtl + profunctors + template-haskell + text + th-abstraction + vector + ]; + testHaskellDepends = [ + base + hashable + hashtables + hedgehog + hedgehog-classes + indexed-traversable + microlens + mtl + tasty + tasty-ant-xml + tasty-hedgehog + tasty-hunit + ]; + description = "Classes and data structures for working with data-kind indexed types"; + license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + parametric-functor = callPackage ( { mkDerivation, @@ -511147,13 +514403,11 @@ self: { { mkDerivation, base }: mkDerivation { pname = "parser-combinators"; - version = "1.3.0"; - sha256 = "0is45q3q6ngfqvzpwwga9phbwk45v7g1q2x1rlm95a7q946yy44k"; - revision = "1"; - editedCabalFile = "0xkqxas64dd77lgc341b526rip7vva0ipy2kbczmfga41lz5fnc6"; + version = "1.3.1"; + sha256 = "1gs0yz7qw5j4w06pfpaiaingr6873znkkrs2m4izrw4xiz1nql4w"; libraryHaskellDepends = [ base ]; description = "Lightweight package providing commonly useful parser combinators"; - license = lib.licenses.bsd3; + license = lib.licensesSpdx."BSD-3-Clause"; } ) { }; @@ -511163,7 +514417,6 @@ self: { base, hspec, hspec-discover, - hspec-expectations, hspec-megaparsec, megaparsec, megaparsec-tests, @@ -511172,16 +514425,13 @@ self: { }: mkDerivation { pname = "parser-combinators-tests"; - version = "1.3.0"; - sha256 = "0sw6ws7za93y3lbmxp6jp1k17zi3wdg7698ab133kcw82f6mzba2"; - revision = "2"; - editedCabalFile = "1b038wk6b1kria8627qb0nfrz4v67j2yq5rx01m3vigfxf6h4422"; + version = "1.3.1"; + sha256 = "1xk3mk35m8fif47b8widww2696ldrjf7f7aw5f154g7vmgvp9qgv"; isLibrary = false; isExecutable = false; testHaskellDepends = [ base hspec - hspec-expectations hspec-megaparsec megaparsec megaparsec-tests @@ -511190,7 +514440,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Test suite of parser-combinators"; - license = lib.licenses.bsd3; + license = lib.licensesSpdx."BSD-3-Clause"; hydraPlatforms = lib.platforms.none; broken = true; } @@ -512921,10 +516171,8 @@ self: { }: mkDerivation { pname = "patch-image"; - version = "0.3.3.2"; - sha256 = "1kbd19vaizhbrpb4pa3py125kaw313yn3aq70yr7wygk1kk6v7ql"; - revision = "4"; - editedCabalFile = "0li4lra7d79vkmlzbgrdr19szvhdm5ifsszk54l5w3pkrijiqv5k"; + version = "0.3.3.3"; + sha256 = "1mncv450iwhd26syn077dzv855dqcx8m10gj0r4bsb9yqnmnyahw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -513255,6 +516503,8 @@ self: { pname = "path-io"; version = "1.8.2"; sha256 = "1a4s4fc2rbzri1cb27gzlm0v24k5g2975smvqg2j4d4h6xmpzbfd"; + revision = "1"; + editedCabalFile = "13q4vv3pn1fx478bhijvqjlk8dfxniz2667wx2zlghv52jv9avns"; libraryHaskellDepends = [ base containers @@ -513735,7 +516985,7 @@ self: { } ) { }; - patrol_1_2_0_0 = callPackage ( + patrol_1_2_0_3 = callPackage ( { mkDerivation, aeson, @@ -513755,8 +517005,8 @@ self: { }: mkDerivation { pname = "patrol"; - version = "1.2.0.0"; - sha256 = "1d7xvcxn37xas8iy8z271dbk6w21ps3j7br417fgd7xj18nnrkiy"; + version = "1.2.0.3"; + sha256 = "1l0yfznc25cm4daa80fpqy7slym16pizbqqjv54mzzsqdfl30bn2"; libraryHaskellDepends = [ aeson base @@ -514916,6 +518166,63 @@ self: { } ) { }; + pcre2_2_3_0 = callPackage ( + { + mkDerivation, + base, + containers, + criterion, + microlens, + microlens-platform, + mtl, + pcre-light, + regex-pcre-builtin, + tasty, + tasty-hunit, + template-haskell, + text, + }: + mkDerivation { + pname = "pcre2"; + version = "2.3.0"; + sha256 = "1wp82d3hbb3v758hqgh0xw6qbqn8pbgsvcnnqh8nb0009i2ass54"; + libraryHaskellDepends = [ + base + containers + microlens + mtl + template-haskell + text + ]; + testHaskellDepends = [ + base + containers + microlens + microlens-platform + mtl + tasty + tasty-hunit + template-haskell + text + ]; + benchmarkHaskellDepends = [ + base + containers + criterion + microlens + microlens-platform + mtl + pcre-light + regex-pcre-builtin + template-haskell + text + ]; + description = "Regular expressions via the PCRE2 C library (included)"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + } + ) { }; + pcubature = callPackage ( { mkDerivation, @@ -515604,8 +518911,8 @@ self: { }: mkDerivation { pname = "peano"; - version = "0.1.0.3"; - sha256 = "0hfxxfs0ds28p8mm7v5bmn176za3q13znl6b52pfqr3yr7r5jygx"; + version = "0.1.1.0"; + sha256 = "0a6yymmrqv1dw2g0i7w322dag0m07dwfhypjgr1d3h07an7757wk"; libraryHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base @@ -516742,6 +520049,67 @@ self: { } ) { }; + perf_0_14_2_1 = callPackage ( + { + mkDerivation, + base, + boxes, + chart-svg, + clock, + containers, + deepseq, + formatn, + mtl, + numhask-space, + optics-core, + optparse-applicative, + prettychart, + prettyprinter, + recursion-schemes, + text, + vector, + }: + mkDerivation { + pname = "perf"; + version = "0.14.2.1"; + sha256 = "15cvr0c1szy8gaa5lsklsnvdqqy53bq1mf295aiv059bwn51ng6y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + boxes + chart-svg + clock + containers + deepseq + formatn + mtl + numhask-space + optics-core + optparse-applicative + prettychart + prettyprinter + recursion-schemes + text + vector + ]; + executableHaskellDepends = [ + base + containers + deepseq + mtl + optics-core + optparse-applicative + text + ]; + benchmarkHaskellDepends = [ base ]; + description = "Performance tools"; + license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + mainProgram = "perf-explore"; + } + ) { }; + perf-analysis = callPackage ( { mkDerivation, @@ -517791,7 +521159,7 @@ self: { } ) { }; - persistent_2_18_0_0 = callPackage ( + persistent_2_18_1_0 = callPackage ( { mkDerivation, aeson, @@ -517836,8 +521204,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.18.0.0"; - sha256 = "19qj5kqjvyqfj6zzrncwkdfz08gp50xl9p3mnqyhrfgldzp2fxjp"; + version = "2.18.1.0"; + sha256 = "0yiyfa84c47rp9np6qfpjlq396plcvny0allady88dj9p66jzm6k"; libraryHaskellDepends = [ aeson attoparsec @@ -519264,7 +522632,7 @@ self: { } ) { }; - persistent-postgresql_2_14_2_0 = callPackage ( + persistent-postgresql_2_14_3_0 = callPackage ( { mkDerivation, aeson, @@ -519306,8 +522674,8 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.14.2.0"; - sha256 = "0kg7advrdpqxdm26imbb2jbszpwhqqc80mm41hskicglzxnibxf8"; + version = "2.14.3.0"; + sha256 = "1dl6bbpvffia6an10608a06z16lkpm1vnf5pggyfigwrn4ldjcz5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -521503,8 +524871,8 @@ self: { }: mkDerivation { pname = "phino"; - version = "0.0.0.59"; - sha256 = "0zdb19daapw22bs4rvcs1pp7i1ch3fjvicsfpmfqwy77fdsn0qqz"; + version = "0.0.0.64"; + sha256 = "0lmvrrqpm44qhi5jm1davklfg2w1wnzmivnqyd2w6lg153kidizs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -521545,6 +524913,7 @@ self: { process silently text + time xml-conduit yaml ]; @@ -529961,8 +533330,8 @@ self: { }: mkDerivation { pname = "pms-application-service"; - version = "0.0.8.0"; - sha256 = "05j7p58wi7vjrcpgs0zd3br74jprbyn1w0xf0llj5rkl5mhnr4hj"; + version = "0.0.9.0"; + sha256 = "0nbfpbagxbvymrz9w8ph36v8xa9gmvm3z3r672j1lglb01q5yg2k"; libraryHaskellDepends = [ aeson async @@ -530023,8 +533392,8 @@ self: { }: mkDerivation { pname = "pms-domain-model"; - version = "0.1.2.0"; - sha256 = "0zhc0bf5gbkqqhp6bvhpf2snaagx4v4qsydvbv18blrpkavvqrbk"; + version = "0.1.3.0"; + sha256 = "1dpjhh9q4hb2hbvpxiwlqy87yimq9kn7v7b7nywc4x8sj5dz3ll7"; libraryHaskellDepends = [ aeson async @@ -530092,8 +533461,8 @@ self: { }: mkDerivation { pname = "pms-domain-service"; - version = "0.0.9.0"; - sha256 = "1icxrid4a1slsz6vpfzm78mljjmvylji68wwl7i1xpha1fgw10a1"; + version = "0.1.0.0"; + sha256 = "1xfxcz5qarwnsyj2is4pxzlcgsdcmfiralclcwv1v96y5bkwf72b"; libraryHaskellDepends = [ aeson base @@ -530203,6 +533572,76 @@ self: { } ) { }; + pms-infra-filesystem = 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-filesystem"; + version = "0.0.1.0"; + sha256 = "19jizc4rdyxnyva8r6p60sgi8llx41hcq1ypcc2qngpvxkg1blfh"; + 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 + directory + filepath + hspec + hspec-discover + lens + monad-logger + pms-domain-model + stm + unix + ]; + testToolDepends = [ hspec-discover ]; + description = "pms-infra-filesystem"; + license = lib.licensesSpdx."Apache-2.0"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + pms-infra-procspawn = callPackage ( { mkDerivation, @@ -530230,8 +533669,8 @@ self: { }: mkDerivation { pname = "pms-infra-procspawn"; - version = "0.0.7.0"; - sha256 = "09bhgq681pj2jn24wrmh38mb6574qvj77719cp8sm8aws0sanclx"; + version = "0.0.8.0"; + sha256 = "0n96yp399grggivd9a3hk2n483cdsyywdkgam9bmkxr0pms8grqp"; libraryHaskellDepends = [ aeson async @@ -532021,8 +535460,8 @@ self: { }: mkDerivation { pname = "pollock"; - version = "0.1.0.3"; - sha256 = "14nvwjb0bsddkp34wm0cvqz7jrs4505p5c1yb2lm7fdw63mb0lb5"; + version = "0.1.0.4"; + sha256 = "1qw53vbx6sl2biamw9hbj371yp7ifbc9rnr3rj1cpgazv1qh27zm"; libraryHaskellDepends = [ attoparsec base @@ -536755,8 +540194,6 @@ self: { ]; description = "Low-level wrapping of POSIX waitpid(2)"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -537235,7 +540672,7 @@ self: { } ) { }; - postgresql-binary_0_15 = callPackage ( + postgresql-binary_0_15_0_1 = callPackage ( { mkDerivation, aeson, @@ -537264,8 +540701,8 @@ self: { }: mkDerivation { pname = "postgresql-binary"; - version = "0.15"; - sha256 = "1h33igb63d6x572g6ah4kzk5yllf40y91mdkf73gdi8ci4znivc5"; + version = "0.15.0.1"; + sha256 = "0kz3hmfvc1ss3pmbmi9y1lgx7zw3q0r9kaqpcim5480qnn8y0dkp"; libraryHaskellDepends = [ aeson base @@ -537418,8 +540855,8 @@ self: { }: mkDerivation { pname = "postgresql-connection-string"; - version = "0.1.0.3"; - sha256 = "00kc7krgibxdq88wyr8lk6k7rini7rn6md4mlkpinrc0xmafgq47"; + version = "0.1.0.5"; + sha256 = "06b3rcjj0ynqq3zqk509cik9j96zr2r7mq6j8z83k9q5s9a4h073"; libraryHaskellDepends = [ base bytestring @@ -537720,8 +541157,8 @@ self: { pname = "postgresql-migration"; version = "0.2.1.8"; sha256 = "1lr1fgr23zxhn52jarpwlcxkha23glgin71mdm34ph44xim9n6ra"; - revision = "1"; - editedCabalFile = "1r8j7ydf03bddxp1r9jcqg0s2mw1f9mjy6zyz9bhvj3ldrzi5931"; + revision = "2"; + editedCabalFile = "1cipwxpizrk79jh5gdsaax102d96kdz602bjmw8silx255jmyfbd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -538461,8 +541898,8 @@ self: { }: mkDerivation { pname = "postgresql-simple-interval"; - version = "1.0.1.1"; - sha256 = "1m1bjmzaini8l7q8d9rsfzdhpjpg4kn1jahy9vsfk38z0w9v6bv3"; + version = "1.0.1.2"; + sha256 = "0kajdnl9gl3np4c1cjlpcp5gj0fx38gn4177ym6qj7vq4jh1x9zp"; libraryHaskellDepends = [ attoparsec base @@ -538682,6 +542119,58 @@ self: { } ) { }; + postgresql-simple-postgresql-types = callPackage ( + { + mkDerivation, + async, + attoparsec, + base, + hspec, + postgresql-simple, + postgresql-types, + postgresql-types-algebra, + QuickCheck, + quickcheck-instances, + stm, + tagged, + testcontainers-postgresql, + text, + text-builder, + }: + mkDerivation { + pname = "postgresql-simple-postgresql-types"; + version = "0.1.0.1"; + sha256 = "0rzi00yww6xb9srai836fz6d6mxa7r8yrbmx5b65yhx02y56rym2"; + libraryHaskellDepends = [ + attoparsec + base + postgresql-simple + postgresql-types + postgresql-types-algebra + tagged + text + text-builder + ]; + testHaskellDepends = [ + async + base + hspec + postgresql-simple + postgresql-types + postgresql-types-algebra + QuickCheck + quickcheck-instances + stm + tagged + testcontainers-postgresql + text + ]; + description = "Integration of \"postgresql-simple\" with \"postgresql-types\""; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + postgresql-simple-queue = callPackage ( { mkDerivation, @@ -538857,8 +542346,8 @@ self: { }: mkDerivation { pname = "postgresql-syntax"; - version = "0.4.1.3"; - sha256 = "0fg4zicn3kwdvvpf3si9pi6pmnsm9k5ph3drqd57jp8xz16b1rzl"; + version = "0.4.2"; + sha256 = "0aqr407n7lgf3r9043y3zgrixz251apyri8w31nzyydvq3qy5sda"; libraryHaskellDepends = [ base bytestring @@ -539192,6 +542681,129 @@ self: { } ) { }; + postgresql-types = callPackage ( + { + mkDerivation, + aeson, + async, + attoparsec, + base, + bytestring, + containers, + hashable, + hspec, + hspec-discover, + jsonifier, + mtl, + postgresql-libpq, + postgresql-types-algebra, + ptr-peeker, + ptr-poker, + QuickCheck, + quickcheck-classes, + quickcheck-instances, + scientific, + stm, + tagged, + testcontainers-postgresql, + text, + text-builder, + time, + transformers, + uuid, + vector, + }: + mkDerivation { + pname = "postgresql-types"; + version = "0.1.1.1"; + sha256 = "1w7f5z4dicy0a7h6cwd9lv71dj4qy587czdpf5fs26yij9hsvgi0"; + libraryHaskellDepends = [ + aeson + attoparsec + base + bytestring + containers + hashable + jsonifier + mtl + postgresql-types-algebra + ptr-peeker + ptr-poker + QuickCheck + scientific + tagged + text + text-builder + time + transformers + uuid + vector + ]; + testHaskellDepends = [ + aeson + async + attoparsec + base + bytestring + containers + hspec + postgresql-libpq + postgresql-types-algebra + ptr-peeker + ptr-poker + QuickCheck + quickcheck-classes + quickcheck-instances + scientific + stm + tagged + testcontainers-postgresql + text + text-builder + time + uuid + vector + ]; + testToolDepends = [ hspec-discover ]; + doHaddock = false; + description = "Precise PostgreSQL types representation and driver-agnostic codecs"; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + + postgresql-types-algebra = callPackage ( + { + mkDerivation, + attoparsec, + base, + bytestring, + ptr-peeker, + ptr-poker, + tagged, + text, + text-builder, + }: + mkDerivation { + pname = "postgresql-types-algebra"; + version = "0.1"; + sha256 = "1r1s37nc6bk77r5fzva5nhil4rr99hc3wgcby00nq2rg8jfwlh3c"; + libraryHaskellDepends = [ + attoparsec + base + bytestring + ptr-peeker + ptr-poker + tagged + text + text-builder + ]; + description = "Type classes for PostgreSQL type mappings"; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + postgrest = callPackage ( { mkDerivation, @@ -540362,8 +543974,10 @@ self: { }: mkDerivation { pname = "ppad-base58"; - version = "0.2.2"; - sha256 = "1z5dcpsjrdijs0d9zcgr52bs2k7jd52n1dg98a38khyqlngchb9j"; + version = "0.2.3"; + sha256 = "0a1pxl7g8zjlvmm5cvcg26j7n11bxsnacq1qlq5vmc902mvgkwm8"; + revision = "1"; + editedCabalFile = "1s1m4z03jx0x8cxkyvb7n3kdd80vy152pb4p5hjwxyv6kpsn70df"; libraryHaskellDepends = [ base bytestring @@ -540448,8 +544062,8 @@ self: { }: mkDerivation { pname = "ppad-bip32"; - version = "0.3.2"; - sha256 = "1jdgp6n9sjd4wlm9ah6y33ss868gbzg5f75wd0jagb60lbxsizbk"; + version = "0.3.3"; + sha256 = "1h0j5wq6hky83hj79gz2s1dv2bs8cib754va0lq4mjznfga82y6z"; libraryHaskellDepends = [ base bytestring @@ -540508,8 +544122,8 @@ self: { }: mkDerivation { pname = "ppad-bip39"; - version = "0.3.1"; - sha256 = "1989xkclz8djd4ysa7fl1nb1icimyvk514mqxfncsil6517cxg53"; + version = "0.3.2"; + sha256 = "1kkbwar3diispj5idi72djqyfsmszd1wajl3ia9ma9087ag6jfnq"; libraryHaskellDepends = [ base bytestring @@ -540639,8 +544253,8 @@ self: { }: mkDerivation { pname = "ppad-hkdf"; - version = "0.3.1"; - sha256 = "0r62xdibpbnk1gv3krw7xpxbl2nh3l18j8x9z374hkhd4z9ii4xi"; + version = "0.3.2"; + sha256 = "1g3wvi6i8v162gj3zx42ws0cbvc39mhxyqqzq7xxzq2xayvcqv89"; libraryHaskellDepends = [ base bytestring @@ -540685,8 +544299,8 @@ self: { }: mkDerivation { pname = "ppad-hmac-drbg"; - version = "0.1.3"; - sha256 = "0bgg3nrc3a62bidjpjdvwjhaai6kp97iqy90f3jzfrwl0iqh6mh0"; + version = "0.2.1"; + sha256 = "12wpx5ba1z5c5x8slk2fvs72dmzjq2qq801wa8n02j9153mxnhgi"; libraryHaskellDepends = [ base bytestring @@ -540731,8 +544345,8 @@ self: { }: mkDerivation { pname = "ppad-pbkdf"; - version = "0.2.1"; - sha256 = "0aw7ps0z1l1b1h1n26w2sariglki38ya7iaa2ahb674a64imwpkz"; + version = "0.2.2"; + sha256 = "18rh2rb9dvrwm46j7gplkrxy5qlywzhzsiig4vpy5xqkkcqzxwdy"; libraryHaskellDepends = [ base bytestring @@ -540909,8 +544523,8 @@ self: { }: mkDerivation { pname = "ppad-secp256k1"; - version = "0.5.2"; - sha256 = "0q0b7maq824rbniv6ag20nn8qvk74fx9fjkz9xhj7pngxgkm8rks"; + version = "0.5.3"; + sha256 = "1xxgfnnw70bhqafb7m40930is8l5yi09zm9dslsgi1y8kbjjl3p1"; libraryHaskellDepends = [ base bytestring @@ -540953,16 +544567,20 @@ self: { base, bytestring, criterion, + deepseq, ppad-base16, + quickcheck-instances, SHA, tasty, tasty-hunit, + tasty-quickcheck, text, + weigh, }: mkDerivation { pname = "ppad-sha256"; - version = "0.2.4"; - sha256 = "0cbg4hpcfxzxzvp23bzyrwiqzdqb79pmvd4m33fimilmbw1rlk02"; + version = "0.3.1"; + sha256 = "10blakf26r9fq4ah1bnd73gxdkh8sr0lm8vxw667s77m10ylbwk4"; libraryHaskellDepends = [ base bytestring @@ -540972,15 +544590,19 @@ self: { base bytestring ppad-base16 + quickcheck-instances tasty tasty-hunit + tasty-quickcheck text ]; benchmarkHaskellDepends = [ base bytestring criterion + deepseq SHA + weigh ]; description = "The SHA-256 and HMAC-SHA256 algorithms"; license = lib.licensesSpdx."MIT"; @@ -540996,16 +544618,20 @@ self: { base, bytestring, criterion, + deepseq, ppad-base16, + quickcheck-instances, SHA, tasty, tasty-hunit, + tasty-quickcheck, text, + weigh, }: mkDerivation { pname = "ppad-sha512"; - version = "0.1.4"; - sha256 = "1rmxd38yfjbjf3v5pn5pvjsb0c7b26pxnd4m3f7fwidqq8x69w4v"; + version = "0.2.1"; + sha256 = "0ric9q4y6k5vvd4sjsdnpry20y678qs26p7wig39fbm84b3dq83x"; libraryHaskellDepends = [ base bytestring @@ -541015,15 +544641,19 @@ self: { base bytestring ppad-base16 + quickcheck-instances tasty tasty-hunit + tasty-quickcheck text ]; benchmarkHaskellDepends = [ base bytestring criterion + deepseq SHA + weigh ]; description = "The SHA-512 and HMAC-SHA512 algorithms"; license = lib.licensesSpdx."MIT"; @@ -541474,8 +545104,8 @@ self: { }: mkDerivation { pname = "prairie"; - version = "0.1.0.0"; - sha256 = "06qmm3f0zfa31909vz09fanra9nhmgr4f686raif272hpxiayznp"; + version = "0.1.1.0"; + sha256 = "1ik2dpdwm4jp9wb2hp4y7pyvxbsjqlpsp5n28wkh6rhi05kmmv1p"; libraryHaskellDepends = [ aeson base @@ -543468,7 +547098,6 @@ self: { bytestring, chart-svg, containers, - doctest-parallel, filepath, fsnotify, markup-parse, @@ -543481,8 +547110,8 @@ self: { }: mkDerivation { pname = "prettychart"; - version = "0.3.0.2"; - sha256 = "0qa4p1yx5ld2gbxymq2x5pd3y37hcqmjiyymxcwd8ndxh3f66llp"; + version = "0.3.0.3"; + sha256 = "1h47z9pnb9q9yiasqhq7liq9y12qzya2ynaaa9qy3xxyn1mjp8z2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -543509,10 +547138,6 @@ self: { optparse-applicative web-rep ]; - testHaskellDepends = [ - base - doctest-parallel - ]; description = "Pretty print charts from ghci"; license = lib.licensesSpdx."BSD-3-Clause"; mainProgram = "prettychart-watch"; @@ -544327,6 +547952,8 @@ self: { pname = "primecount"; version = "0.1.0.2"; sha256 = "090k1ks5ax6f8x8dkyjz3p7dp2wlvrrm2g655lh57d16l8h5p7sj"; + revision = "2"; + editedCabalFile = "11lpcq8ldkp2y6wdc4kwb5wqlcfmkq9ysf2fjdjjirpnlrvkbmfa"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ primecount ]; testHaskellDepends = [ @@ -545903,6 +549530,8 @@ self: { pname = "process"; version = "1.6.26.1"; sha256 = "1w58md2dv4ijprjgd3v3imxn7f052l1g6bxlhkx8cyb0fyxd4cdl"; + revision = "1"; + editedCabalFile = "159sw9ryhwd0i8mrkh6p0gz1kah4ys9fd4plskmqjqcx6drzawcm"; libraryHaskellDepends = [ base deepseq @@ -546819,8 +550448,8 @@ self: { pname = "product-profunctors"; version = "0.11.1.1"; sha256 = "1nhwpfjz4iz30h8q7d40hlibqqymvmcf6wmbl6h3212d54hqdgiz"; - revision = "6"; - editedCabalFile = "1sq9cgyqlylbkirw72yk68m86is65rbjpg3cir9vska0skxmdhjs"; + revision = "7"; + editedCabalFile = "15p519fy1zx3v8jhlnqi1xv2f99h4lqy8msj9ydq5s59p7g5arj1"; libraryHaskellDepends = [ base bifunctors @@ -546984,8 +550613,8 @@ self: { }: mkDerivation { pname = "profiteur"; - version = "0.4.7.0"; - sha256 = "1pkjca5l5nbvkrhw3s2j54mr0wg5a53wyffzwvhfxmfslgd1s7pw"; + version = "0.4.7.1"; + sha256 = "0jkk1k7h9dnl1bz0gsjspjsf10fmbrys0dy9clqa35y948fpxx1z"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -547453,6 +551082,7 @@ self: { base64-bytestring, blaze-html, bytestring, + byteunits, Cabal, cassava, conduit, @@ -547460,6 +551090,7 @@ self: { convertible, criterion, cryptohash-sha256, + crypton, curryer-rpc, data-default, data-interval, @@ -547474,6 +551105,7 @@ self: { filepath, foldl, ghc, + ghc-bignum, ghc-boot, ghc-paths, ghci, @@ -547485,6 +551117,7 @@ self: { http-conduit, http-types, HUnit, + linux-xattr, list-t, megaparsec, modern-uri, @@ -547492,12 +551125,14 @@ self: { MonadRandom, mtl, network, + network-byte-order, old-locale, optparse-applicative, parallel, parser-combinators, path-pieces, prettyprinter, + process, QuickCheck, quickcheck-instances, random, @@ -547508,9 +551143,12 @@ self: { scientific, scotty, semigroups, + sqlite-simple, stm, stm-containers, streamly, + streamly-core, + system-linux-proc, template-haskell, temporary, text, @@ -547532,8 +551170,8 @@ self: { }: mkDerivation { pname = "project-m36"; - version = "1.1.1"; - sha256 = "1hn6zfnymgknvi2crn6pmr7h24dpm0wky8iq0sqi5nyzx72pilj8"; + version = "1.2.0"; + sha256 = "0339b1kkgjc5cg36balnf3jlkljjg1lix9akf82v3b9453hg4ykf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -547548,7 +551186,9 @@ self: { containers convertible cryptohash-sha256 + crypton curryer-rpc + data-default data-interval deepseq deepseq-generics @@ -547561,6 +551201,7 @@ self: { filepath foldl ghc + ghc-bignum ghc-boot ghc-paths ghci @@ -547569,26 +551210,35 @@ self: { hashable haskeline http-api-data + linux-xattr list-t + megaparsec monad-parallel MonadRandom mtl network + network-byte-order old-locale optparse-applicative parallel path-pieces + prettyprinter + process QuickCheck quickcheck-instances + random random-shuffle recursion-schemes resourcet rset scientific semigroups + sqlite-simple stm stm-containers streamly + streamly-core + system-linux-proc temporary text text-manipulate @@ -547645,6 +551295,7 @@ self: { parser-combinators path-pieces prettyprinter + process random recursion-schemes scientific @@ -547706,6 +551357,7 @@ self: { semigroups stm stm-containers + streamly temporary text time @@ -547725,6 +551377,7 @@ self: { base16-bytestring base64-bytestring bytestring + byteunits Cabal cassava containers @@ -547757,6 +551410,7 @@ self: { semigroups stm stm-containers + streamly temporary text time @@ -548466,8 +552120,8 @@ self: { }: mkDerivation { pname = "prometheus-wai"; - version = "0.2.0.0"; - sha256 = "1dpnh98smsgl41hrc3xia1ny12jmpiclg6in5jgsjwalyg2pisx6"; + version = "0.2.0.1"; + sha256 = "0i1wj9dshl0y4dzhxsqd8l99i4nrzs9n0ckzhpagppcnqnxv4rjd"; libraryHaskellDepends = [ base bytestring @@ -549854,6 +553508,7 @@ self: { aeson, aeson-pretty, attoparsec, + attoparsec-aeson, base, base64-bytestring, binary, @@ -549862,17 +553517,14 @@ self: { containers, contravariant, deepseq, - dhall, doctest, filepath, foldl, generic-arbitrary, + ghc-lib-parser, hashable, - haskell-src, hedgehog, insert-ordered-containers, - large-generics, - large-records, lens, mtl, neat-interpolation, @@ -549885,7 +553537,6 @@ self: { proto3-wire, QuickCheck, quickcheck-instances, - range-set-list, record-hasfield, safe, split, @@ -549895,6 +553546,7 @@ self: { tasty-hedgehog, tasty-hunit, tasty-quickcheck, + template-haskell, text, text-short, time, @@ -549904,8 +553556,8 @@ self: { }: mkDerivation { pname = "proto3-suite"; - version = "0.7.0"; - sha256 = "0yvp43clms55csjdr552ygszzcnyc32a53i11301awmvr8yxsarm"; + version = "0.9.4"; + sha256 = "1psfqrn09c3p1b9zd8237i28r5dfjp3zpk5f2jq9l5izzam71y6a"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -549913,6 +553565,7 @@ self: { aeson aeson-pretty attoparsec + attoparsec-aeson base base64-bytestring binary @@ -549921,14 +553574,11 @@ self: { containers contravariant deepseq - dhall filepath foldl + ghc-lib-parser hashable - haskell-src insert-ordered-containers - large-generics - large-records lens mtl neat-interpolation @@ -549943,6 +553593,7 @@ self: { split swagger2 system-filepath + template-haskell text text-short time @@ -549953,11 +553604,11 @@ self: { executableHaskellDepends = [ base containers + ghc-lib-parser mtl optparse-applicative optparse-generic proto3-wire - range-set-list system-filepath text turtle @@ -549973,9 +553624,8 @@ self: { deepseq doctest generic-arbitrary + ghc-lib-parser hedgehog - large-generics - large-records mtl parsec pretty @@ -550029,8 +553679,8 @@ self: { }: mkDerivation { pname = "proto3-wire"; - version = "1.4.5"; - sha256 = "0khwcn2wkbvgr643my5rwc2v959ypy831n3icp9jnhgmx8fj6lxm"; + version = "1.4.6"; + sha256 = "0i952f3b1pdsb5fqcimycxw6dxxzphqgx346wmdxx46ya66jlgch"; libraryHaskellDepends = [ base bytestring @@ -551067,6 +554717,8 @@ self: { pname = "pseudo-boolean"; version = "0.1.12.0"; sha256 = "1imnlqbfzqk80zkcbqqprfyynh1b10akgiafpbqd1cp7abgz3w5m"; + revision = "1"; + editedCabalFile = "1ijqykfxh81svgpg43sy9lgz6i1zbgisb31896hj8pl1a1qxqx6d"; libraryHaskellDepends = [ attoparsec base @@ -551147,24 +554799,20 @@ self: { base, bytestring, deepseq, - semigroups, text, }: mkDerivation { pname = "psi"; - version = "0.1.1.0"; - sha256 = "0z6h3x4dv6f4may3lr2pc3rpsjbbzxax1j17x0n4mxmv9jjkggag"; + version = "0.2.0.0"; + sha256 = "13mjmip5nkrrzj1h7kp740r54f55xgbzsq3v9mdf9qqxr8d1xj3f"; libraryHaskellDepends = [ base bytestring deepseq - semigroups text ]; description = "Yet another custom Prelude"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -551692,17 +555340,19 @@ self: { base, bytestring, criterion, - hedgehog, + hspec, + hspec-discover, isomorphism-class, numeric-limits, + QuickCheck, rerebase, scientific, text, }: mkDerivation { pname = "ptr-poker"; - version = "0.1.2.16"; - sha256 = "15x169xihal3y4is4rcdx7rq4yz62dx6xj864vqs2dhxa819iw0l"; + version = "0.1.3"; + sha256 = "0aggq4mnikln6rsy8n9qy6d3znq5d7jayz4hnak5s6badd7f2h8b"; libraryHaskellDepends = [ base bytestring @@ -551710,11 +555360,13 @@ self: { text ]; testHaskellDepends = [ - hedgehog + hspec isomorphism-class numeric-limits + QuickCheck rerebase ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ criterion rerebase @@ -551745,6 +555397,7 @@ self: { pms-domain-model, pms-domain-service, pms-infra-cmdrun, + pms-infra-filesystem, pms-infra-procspawn, pms-infra-serial, pms-infra-socket, @@ -551757,8 +555410,8 @@ self: { }: mkDerivation { pname = "pty-mcp-server"; - version = "0.1.4.0"; - sha256 = "0jvchk9g1f0g77filmylqss5h4wx4fn8jssmdzfn358fh36i5710"; + version = "0.1.5.0"; + sha256 = "0d4hgy279kbq40045r4xclyv1y2gmxmqm5m8va34a35qciv756nc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -551768,6 +555421,7 @@ self: { pms-domain-model pms-domain-service pms-infra-cmdrun + pms-infra-filesystem pms-infra-procspawn pms-infra-serial pms-infra-socket @@ -552581,8 +556235,8 @@ self: { }: mkDerivation { pname = "pup"; - version = "0.1.0"; - sha256 = "15jyl295frn3ylfwm01cx630hjllcsbmkm4pl2n1anayw6j9pm0r"; + version = "0.1.1"; + sha256 = "18sn2kq6ilgxgdwa6rvy7lim1b12l0m1a3fpa2hjaindgywgp19r"; libraryHaskellDepends = [ base comonad @@ -555483,8 +559137,8 @@ self: { }: mkDerivation { pname = "qhs"; - version = "0.4.0"; - sha256 = "10b996ymvsmcmjyiaw567idr52mc017cgppma9va8yw94xqgdx7s"; + version = "0.4.1"; + sha256 = "0j7jdjgq45qahf1dyys94a3appi70n9jrhglwv0c52zn703vwqa4"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -557468,8 +561122,8 @@ self: { }: mkDerivation { pname = "quic"; - version = "0.2.21"; - sha256 = "118ds282flakcdadvybn35bvr02dz2iqwg5c1m6d0gj51mmkb054"; + version = "0.2.23"; + sha256 = "0kjbqxd0hpi91s9jpyp7s8kr9jqd7aqh8lxkwhq9l0cjfwqgisn0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -558075,8 +561729,6 @@ self: { ]; description = "Simple type-level combinators for augmenting QuickCheck instances"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -558140,6 +561792,29 @@ self: { } ) { }; + quickcheck-extras = callPackage ( + { + mkDerivation, + base, + containers, + QuickCheck, + splitmix, + }: + mkDerivation { + pname = "quickcheck-extras"; + version = "0.1.0.1"; + sha256 = "1xp5qasgq47zwdv54fcgqf5ng7bgwyihq8sg66jv3c1vlny89s0q"; + libraryHaskellDepends = [ + base + containers + QuickCheck + splitmix + ]; + description = "Extra utilities for QuickCheck"; + license = lib.licensesSpdx."MIT"; + } + ) { }; + quickcheck-groups = callPackage ( { mkDerivation, @@ -558286,6 +561961,78 @@ self: { } ) { }; + quickcheck-instances_0_4 = callPackage ( + { + mkDerivation, + array, + base, + bytestring, + case-insensitive, + containers, + data-fix, + hashable, + integer-logarithms, + old-time, + primitive, + QuickCheck, + scientific, + splitmix, + strict, + tagged, + text, + text-short, + these, + time-compat, + transformers, + unordered-containers, + uuid-types, + vector, + }: + mkDerivation { + pname = "quickcheck-instances"; + version = "0.4"; + sha256 = "1wr7czlr1sk6l6gfka712qf28mnddrnmzl8fsahw16afrqpzwa7v"; + libraryHaskellDepends = [ + array + base + bytestring + case-insensitive + data-fix + hashable + integer-logarithms + old-time + QuickCheck + scientific + splitmix + strict + tagged + text + text-short + these + time-compat + transformers + unordered-containers + uuid-types + vector + ]; + testHaskellDepends = [ + base + containers + primitive + QuickCheck + uuid-types + ]; + benchmarkHaskellDepends = [ + base + bytestring + QuickCheck + ]; + description = "Common quickcheck instances"; + license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + quickcheck-io = callPackage ( { mkDerivation, @@ -561088,6 +564835,8 @@ self: { pname = "rails-session"; version = "0.1.4.0"; sha256 = "1gmy0xf7fsjaadmawzssaas7ngwgil9sgnw7s0xhqx1kxz2860sz"; + revision = "1"; + editedCabalFile = "0mnc0x1n3h6hpklwnk4i5yw9gg9qyvmvqlw7c5831wd999lgzrlk"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson @@ -561626,8 +565375,8 @@ self: { }: mkDerivation { pname = "rampart"; - version = "2.0.0.11"; - sha256 = "04hj1sh0ad3fg10d7w9fz4xvic6kfxi6iacci63g4m2151w9l7gl"; + version = "2.0.0.13"; + sha256 = "1y2hykmzi6988lwc0iirngk5xa4jr6a59xrcfdbvxrqf3ags2wvz"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base @@ -562955,8 +566704,8 @@ self: { }: mkDerivation { pname = "rank2classes"; - version = "1.5.5"; - sha256 = "0xbngg520d1r1lp3zsjgdvajz4i6x12ia9zyka8vivypiwcg7ll8"; + version = "1.5.5.1"; + sha256 = "1jnvii4rw0mp5wncqrifhzpnvyfj2dqfq69fa6pk71gsvihspf1n"; libraryHaskellDepends = [ base data-functor-logistic @@ -563639,8 +567388,8 @@ self: { }: mkDerivation { pname = "ratel"; - version = "2.0.0.15"; - sha256 = "1d074x3vdnkdrh2m7z0iswbiihgafbm8ik2nf56ipry27pvkjfq3"; + version = "2.0.0.17"; + sha256 = "1vr1a7r32xknsvkbbj6y5lalf9kyj5zrm8hc7jgnsavmyi8gswzb"; libraryHaskellDepends = [ aeson base @@ -563675,8 +567424,8 @@ self: { }: mkDerivation { pname = "ratel-wai"; - version = "2.0.0.10"; - sha256 = "06wdcy1zych0lwwddznnrgapmzmxmahy98yqcfikqrrf85nd73ng"; + version = "2.0.0.12"; + sha256 = "1c7zsk9vmg0zrlryickq28k165kg124xfdq2idckqk825jj556a2"; libraryHaskellDepends = [ base bytestring @@ -567134,6 +570883,76 @@ self: { } ) { }; + rebase_1_23 = callPackage ( + { + mkDerivation, + base, + bifunctors, + bytestring, + comonad, + containers, + contravariant, + deepseq, + dlist, + either, + groups, + hashable, + invariant, + mtl, + profunctors, + scientific, + selective, + semigroupoids, + stm, + text, + time, + time-compat, + transformers, + unordered-containers, + uuid, + vector, + vector-instances, + void, + }: + mkDerivation { + pname = "rebase"; + version = "1.23"; + sha256 = "10bswk6acyfxlmr84bfb2valwmzn425l6622nc2qy9mnm66hcz14"; + libraryHaskellDepends = [ + base + bifunctors + bytestring + comonad + containers + contravariant + deepseq + dlist + either + groups + hashable + invariant + mtl + profunctors + scientific + selective + semigroupoids + stm + text + time + time-compat + transformers + unordered-containers + uuid + vector + vector-instances + void + ]; + description = "A more progressive alternative to the \"base\" package"; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + rebindable = callPackage ( { mkDerivation, @@ -567811,8 +571630,8 @@ self: { }: mkDerivation { pname = "recover-rtti"; - version = "0.5.2"; - sha256 = "1wq7sg93b4igqm21cjwq3fwdjcma17widnics8467d12bgfq7psx"; + version = "0.5.3"; + sha256 = "1vnvf2yrl626xa3zn96lfg2bw6klxhapgw606yrm23p1vjcgm9sz"; libraryHaskellDepends = [ aeson base @@ -570893,7 +574712,9 @@ self: { ]; description = "A GHCi widget library for use in reflex applications"; license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; mainProgram = "reflex-ghci"; + broken = true; } ) { }; @@ -572645,8 +576466,8 @@ self: { pname = "regex-pcre-builtin"; version = "0.95.2.3.8.44"; sha256 = "0pn55ssrwr05c9sa9jvp0knvzjksz04wn3pmzf5dz4xgbyjadkna"; - revision = "6"; - editedCabalFile = "1rn3649yqqrbd177mbyk12gdpbm3kdzjgnjqxfv68crah237y08j"; + revision = "7"; + editedCabalFile = "0gv55qvcsp579f925xb32n27h5nsvlpfgx65y17h0mk8cf2wwm0y"; libraryHaskellDepends = [ array base @@ -575186,8 +579007,8 @@ self: { pname = "relude"; version = "1.2.2.2"; sha256 = "1865bladis4czglyvkcj05qh3fr2bvrm1w5dm5gz3wjs2cnsivci"; - revision = "1"; - editedCabalFile = "130ifkvrksr7p87sll4spgp9xp9cpgfcmy07ibp1j80xjw5wf7sy"; + revision = "2"; + editedCabalFile = "0mv37443g7ipz9ndkcsq4ad0jlimxffjzrwprhlpiijj3jkb48dk"; libraryHaskellDepends = [ base bytestring @@ -576403,6 +580224,40 @@ self: { } ) { }; + repl-alliance = callPackage ( + { + mkDerivation, + auto-export, + auto-extract, + auto-import, + auto-split, + base, + ghc, + ghci-quickfix, + monoidal-plugins, + pinned-warnings, + }: + mkDerivation { + pname = "repl-alliance"; + version = "0.1.0.0"; + sha256 = "09jnk151s9phvrif2kg97m7p983qhb41bp72f31qk0pcxvj3l48m"; + libraryHaskellDepends = [ + auto-export + auto-extract + auto-import + auto-split + base + ghc + ghci-quickfix + monoidal-plugins + pinned-warnings + ]; + description = "Currated set of plugins for REPL based development"; + license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + repl-toolkit = callPackage ( { mkDerivation, @@ -577029,8 +580884,8 @@ self: { pname = "req"; version = "3.13.4"; sha256 = "0s80kl29b7d35v044yvkfa6ja40k4sm3wh26qpnscqzv2n6w8zzk"; - revision = "4"; - editedCabalFile = "14r4xkchdpwcvsmsqx6wq77wj79yd6xa0lxf5rphl21gpsdcym4k"; + revision = "7"; + editedCabalFile = "0m0ba98f0fykda9258m8xr2g7gx9l251gj3csipyrk52m1kb53lx"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson @@ -577511,6 +581366,20 @@ self: { } ) { }; + rerebase_1_23 = callPackage ( + { mkDerivation, rebase }: + mkDerivation { + pname = "rerebase"; + version = "1.23"; + sha256 = "0l60drp8fh1zz2bwr6dhjzaq757571zsm4cmvmml29dclq82na84"; + libraryHaskellDepends = [ rebase ]; + doHaddock = false; + description = "Reexports from \"base\" with a bunch of other standard libraries"; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + rerefined = callPackage ( { mkDerivation, @@ -579147,6 +583016,82 @@ self: { } ) { }; + restman = callPackage ( + { + mkDerivation, + ansi-terminal-types, + base, + binary, + brick, + bytestring, + case-insensitive, + containers, + http-client, + http-client-tls, + http-types, + lens, + microlens, + microlens-mtl, + mime-types, + mtl, + optparse-applicative, + skylighting, + text, + text-zipper, + unliftio, + utf8-string, + vector, + vty, + wreq, + }: + mkDerivation { + pname = "restman"; + version = "0.7.1.1"; + sha256 = "04vnvazrcdsdx5j22gkgi9zpd3l34bxg1fbyzqv5p1rdyhzk2ai7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal-types + base + binary + brick + bytestring + case-insensitive + containers + http-client + http-client-tls + http-types + lens + microlens-mtl + mime-types + mtl + skylighting + text + text-zipper + unliftio + vector + vty + wreq + ]; + executableHaskellDepends = [ + base + brick + bytestring + case-insensitive + http-types + microlens + optparse-applicative + text + utf8-string + wreq + ]; + testHaskellDepends = [ base ]; + description = "Web request TUI program"; + license = lib.licenses.bsd2; + mainProgram = "restman"; + } + ) { }; + restricted-workers = callPackage ( { mkDerivation, @@ -583531,8 +587476,8 @@ self: { }: mkDerivation { pname = "rme"; - version = "0.1.1"; - sha256 = "0c7q0jwhlwsvy6prgwczabd039pza2zlvxddfiswcma4l1npszly"; + version = "0.1.2"; + sha256 = "1i52bp18117ch45z9h667dfr648w98qmhzw4qjns6sn1d09qg5dv"; libraryHaskellDepends = [ base containers @@ -583556,8 +587501,8 @@ self: { }: mkDerivation { pname = "rme-what4"; - version = "0.1.1"; - sha256 = "0px6id65hjk8cqphvs6lr05212w9d7i2hryv26v5ia40vh9nxhyf"; + version = "0.1.2"; + sha256 = "1zfhhfhfvm1gbin48rgjgmvqs0m7bz261q8fd8fr0yvvww1w6fcj"; libraryHaskellDepends = [ base bv-sized @@ -587776,8 +591721,8 @@ self: { pname = "ruby-marshal"; version = "0.2.1"; sha256 = "18kdagf0lyghpaffzgw42ql1wrqkh13rfqjpj23i09i67pqrv3lk"; - revision = "2"; - editedCabalFile = "0sm6gk2v7f3hsr5y22g35bl2fdia5827bfk8pnrv3sf61fjh6mrd"; + revision = "3"; + editedCabalFile = "01zvrzwd6knw3lkbnc50m8ql4bk7wsnglsf2s2cbvjmd3fzacdka"; libraryHaskellDepends = [ base bytestring @@ -589291,8 +593236,8 @@ self: { }: mkDerivation { pname = "safe-json"; - version = "1.2.1.0"; - sha256 = "1yfyk840l9xnigx2c2fkfxcyvlb29ggywp87mk0g80xkgxhxjd42"; + version = "1.2.1.1"; + sha256 = "06dms3ywjb80hhxsnaaq4higwcki0cxwp1ym11k6b3b7sfdxg0g4"; libraryHaskellDepends = [ aeson base @@ -590609,8 +594554,8 @@ self: { }: mkDerivation { pname = "salve"; - version = "2.0.0.8"; - sha256 = "1nnzsfqyls0kfrb0fcfg88hg4nscydvc6kzk7gd8ryv4hr2g7xy7"; + version = "2.0.0.10"; + sha256 = "04qyvpxqrc0n0rf95bm302m7gxcl135xmrl1ysy52zd4yv89zxfx"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base @@ -592617,7 +596562,7 @@ self: { } ) { }; - saturn_1_1_0_2 = callPackage ( + saturn_1_1_0_5 = callPackage ( { mkDerivation, base, @@ -592632,8 +596577,8 @@ self: { }: mkDerivation { pname = "saturn"; - version = "1.1.0.2"; - sha256 = "0pixf0xb1y5l0r9hp1d9jvgxdqy8flmrrppaz294p1yjryavk6kq"; + version = "1.1.0.5"; + sha256 = "0yncg50zbnv7lrh4ydqx0djxq6sh671kw9n4rlmyrblrr10pq0nh"; libraryHaskellDepends = [ base containers @@ -593236,7 +597181,7 @@ self: { } ) { inherit (pkgs) z3; }; - sbv_13_3 = callPackage ( + sbv_13_5 = callPackage ( { mkDerivation, array, @@ -593276,8 +597221,8 @@ self: { }: mkDerivation { pname = "sbv"; - version = "13.3"; - sha256 = "1aij3wsn25gyn0aicwxm2r1hbqgcwkja98i381mk68a59fkzyjzf"; + version = "13.5"; + sha256 = "0gikry5cwjgl8xrvrdqv6cvzxspn4lyfciyqk2j7h511j9snyiqf"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array @@ -593391,8 +597336,8 @@ self: { }: mkDerivation { pname = "sbvPlugin"; - version = "9.12.1"; - sha256 = "04xg0bk1v9m5avcnwgnlpx8gw0lm8374x34bwmlhyriw8lywnab5"; + version = "9.14.1"; + sha256 = "1k0p6bf95fg6bz59hfdq876bh3z48971j2jmgwj2bk300ynsj5ja"; libraryHaskellDepends = [ base containers @@ -594245,8 +598190,8 @@ self: { }: mkDerivation { pname = "scc"; - version = "0.8.4"; - sha256 = "017swv1mvwq05c8fvbqsnbr9xikga4sp9ngmzckggvpbqx5vxd3n"; + version = "0.8.4.1"; + sha256 = "1cswzf46zmyyyqgsj2ib9ax9ib0qqjmkfmy3d38my4sda6h5gff5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -595358,10 +599303,8 @@ self: { }: mkDerivation { pname = "scientific"; - version = "0.3.8.0"; - sha256 = "1kqqf8hyffrkqp6cgjxgxm9nc18ql7jj5rjjirqxf9mam2y47cqk"; - revision = "2"; - editedCabalFile = "0bkks5hdi3w7xx2k1dvj8alsz1i7ljjaqmrp8hw024fh3mqad0xs"; + version = "0.3.8.1"; + sha256 = "1znwribsk6rdyv91dbjdbfcfkl6yg2nw7f9fwqv7kz4x2jz82dxd"; libraryHaskellDepends = [ base binary @@ -595984,6 +599927,113 @@ self: { } ) { }; + scotty_0_30 = callPackage ( + { + mkDerivation, + aeson, + async, + base, + blaze-builder, + bytestring, + case-insensitive, + containers, + cookie, + directory, + doctest, + exceptions, + hspec, + hspec-discover, + hspec-wai, + http-api-data, + http-client, + http-types, + lifted-base, + lucid, + monad-control, + mtl, + network, + random, + regex-compat, + resourcet, + stm, + text, + time, + transformers, + transformers-base, + unliftio, + unordered-containers, + wai, + wai-extra, + warp, + weigh, + }: + mkDerivation { + pname = "scotty"; + version = "0.30"; + sha256 = "0jscz8a2xk6y5rrbg62z7m7j2vh219zhmbya2h9qww004j2ai46z"; + libraryHaskellDepends = [ + aeson + base + blaze-builder + bytestring + case-insensitive + containers + cookie + exceptions + http-api-data + http-types + monad-control + mtl + network + random + regex-compat + resourcet + stm + text + time + transformers + transformers-base + unliftio + unordered-containers + wai + wai-extra + warp + ]; + testHaskellDepends = [ + async + base + bytestring + directory + doctest + hspec + hspec-wai + http-api-data + http-client + http-types + lifted-base + network + text + time + wai + wai-extra + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base + bytestring + lucid + mtl + resourcet + text + transformers + weigh + ]; + description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + scotty-binding-play = callPackage ( { mkDerivation, @@ -597353,6 +601403,102 @@ self: { } ) { }; + sd-jwt = callPackage ( + { + mkDerivation, + aeson, + base, + base64-bytestring, + bytestring, + containers, + cryptonite, + directory, + doctest, + filepath, + hspec, + jose, + lens, + markdown-unlit, + memory, + mtl, + process, + QuickCheck, + scientific, + text, + time, + vector, + }: + mkDerivation { + pname = "sd-jwt"; + version = "0.1.0.1"; + sha256 = "0p4q4lm3g8y2g8ig0mj93azycgjank10p0352kn1q4l0za2diaw1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + base + base64-bytestring + bytestring + containers + cryptonite + jose + lens + memory + mtl + scientific + text + time + vector + ]; + executableHaskellDepends = [ + aeson + base + base64-bytestring + bytestring + containers + cryptonite + directory + jose + lens + memory + mtl + scientific + text + time + vector + ]; + testHaskellDepends = [ + aeson + base + base64-bytestring + bytestring + containers + cryptonite + directory + doctest + filepath + hspec + jose + lens + markdown-unlit + memory + mtl + process + QuickCheck + scientific + text + time + vector + ]; + testToolDepends = [ markdown-unlit ]; + description = "Selective Disclosure for JSON Web Tokens (RFC 9901)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "sd-jwt-example"; + broken = true; + } + ) { }; + sde-solver = callPackage ( { mkDerivation, @@ -599274,10 +603420,8 @@ self: { }: mkDerivation { pname = "selda"; - version = "0.5.2.0"; - sha256 = "1n0zkd80a9z83q5nld0gyg2p25nfy4rjkihql88binhknhk3hkgk"; - revision = "1"; - editedCabalFile = "1vr4yzwvqp9wd7l6yxf7r6vc78bpy2b6n3mx81ximsr7mlpxwg86"; + version = "0.5.2.1"; + sha256 = "0kpp2a3xw1vfqafznn5p3kncj9nx9q6xg9pllfb7qhdhkhfkdayb"; libraryHaskellDepends = [ base bytestring @@ -599291,8 +603435,6 @@ self: { ]; description = "Multi-backend, high-level EDSL for interacting with SQL databases"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -599307,8 +603449,8 @@ self: { }: mkDerivation { pname = "selda-json"; - version = "0.1.1.1"; - sha256 = "0sjy83538g6a2yq1q9ifadfwp7lf5b2grmm0i02qpp47n1b039rh"; + version = "0.1.1.2"; + sha256 = "132yzm0d9bjrcjdpvr5c5lg1fjbg3fvqzi4bkkbd38c5vyx7vdlf"; libraryHaskellDepends = [ aeson base @@ -599318,7 +603460,6 @@ self: { ]; description = "JSON support for the Selda database library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -599338,8 +603479,8 @@ self: { }: mkDerivation { pname = "selda-postgresql"; - version = "0.1.8.2"; - sha256 = "1rn75ynvn2iipz9yj3h4iwgz2922s9hwpgiga0brj00pb0b5a52g"; + version = "0.1.8.3"; + sha256 = "1r85w54i1lz8vfb672yy6hc1szsdydfhll4jdspzg3qmyrri5nzv"; libraryHaskellDepends = [ base bytestring @@ -599354,8 +603495,6 @@ self: { ]; description = "PostgreSQL backend for the Selda database EDSL"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -599374,8 +603513,8 @@ self: { }: mkDerivation { pname = "selda-sqlite"; - version = "0.1.7.2"; - sha256 = "1cldk804vv82dp3hyxcddzy3plijgkmjz3ykrjzy7afqni97yc4y"; + version = "0.1.7.3"; + sha256 = "0ricym21lkf9cmfv0flyhp9g9gs6dh1pbd804pjfzzjn8bbrhc1h"; libraryHaskellDepends = [ base bytestring @@ -599389,7 +603528,6 @@ self: { ]; description = "SQLite backend for the Selda database EDSL"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -600056,7 +604194,6 @@ self: { comonad, containers, contravariant, - distributive, hashable, tagged, template-haskell, @@ -600066,10 +604203,10 @@ self: { }: mkDerivation { pname = "semigroupoids"; - version = "6.0.1"; - sha256 = "07yc5759y4njlb2f7s2yy3ji9akp7xw03w7nybaga514hqq20lqx"; - revision = "2"; - editedCabalFile = "089c5hjsjm5dnxmdr1059nhy6pmz63123z0hvn6shf40v2k0dvmz"; + version = "6.0.2"; + sha256 = "0bm1ma6h8z4cbhxjrn8kn28splfihfd42zwdqpv5w922jpj5i0p4"; + revision = "1"; + editedCabalFile = "0b1f40hfsbwf9ngg1pxvim4pi47gi54pizv7ixhq0hzpzm3a7iaj"; libraryHaskellDepends = [ base base-orphans @@ -600077,7 +604214,6 @@ self: { comonad containers contravariant - distributive hashable tagged template-haskell @@ -600161,8 +604297,8 @@ self: { { mkDerivation, base }: mkDerivation { pname = "semigroups"; - version = "0.20"; - sha256 = "1qbk6scp1rzb69dy8mz26p6az5vi16g2lzwmwnfshh3br4rjwbch"; + version = "0.20.1"; + sha256 = "1zlg6j3isiiqa7jlb0sl4wzs3m9ikif5y53rd9z7ghwp8ci72k5z"; libraryHaskellDepends = [ base ]; description = "Anything that associates"; license = lib.licenses.bsd3; @@ -610341,8 +614477,8 @@ self: { }: mkDerivation { pname = "serversession-backend-persistent"; - version = "2.0.3"; - sha256 = "1f6zpxi16frs6jn1dx2kzk0cacw549pg2id2z6vqxkc5fw98iswq"; + version = "2.0.4"; + sha256 = "12a3rn9ha8vjbw2zq86ydrvc1235nia83qj7h3fjaspgsvbibc6y"; libraryHaskellDepends = [ aeson base @@ -612417,8 +616553,8 @@ self: { }: mkDerivation { pname = "shake"; - version = "0.19.8"; - sha256 = "0db5kmza7jp4f691q31lnp29m2bb0y0qis0r6zrhnnd24qxf7133"; + version = "0.19.9"; + sha256 = "12nbvp780fx2m3d1rv3f0m1bh7ghv5k78dzj37q16y1vikixcxj1"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -614749,8 +618885,8 @@ self: { }: mkDerivation { pname = "shellmet"; - version = "0.0.5.0"; - sha256 = "1yqz8nlhjbi5ngl548j4gy07m6dbvxfykj5y2gm4vviwvx0kgmz4"; + version = "0.0.6.0"; + sha256 = "0vxbqpsmd7g3dfkgildzb34vzbz4j1p1ry55910f0jl79dx1w6xj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -619054,8 +623190,8 @@ self: { }: mkDerivation { pname = "simple-prompt"; - version = "0.2.3"; - sha256 = "1ijnfrb6jxrwaj9fnva6mj55a998ld5nwqaxk1x23z57b5wnkacc"; + version = "0.2.4"; + sha256 = "04az8qmq1w79pnr70cwb17vy7y64a92g2lb8x48hw913ckda09s5"; libraryHaskellDepends = [ base exceptions @@ -619911,8 +624047,8 @@ self: { }: mkDerivation { pname = "simplest-sqlite"; - version = "0.1.0.2"; - sha256 = "02ws0f4cf9mdbkadzp4val5kqiflgwskil71iq7mb90d41j1khmp"; + version = "0.1.0.4"; + sha256 = "012azwr8grq38ic1dsdxp4482zsc7y37376n1f10nv9ls598bgyh"; libraryHaskellDepends = [ base bytestring @@ -619923,8 +624059,6 @@ self: { librarySystemDepends = [ sqlite ]; description = "Simplest SQLite3 binding"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { inherit (pkgs) sqlite; }; @@ -620630,6 +624764,8 @@ self: { pname = "singletons"; version = "3.0.4"; sha256 = "0rcxb8l9vizpq3xgfsijzlig79dw7gx5cds1kv2qnz8ziwxlncq1"; + revision = "1"; + editedCabalFile = "00a4507ainpdq0kx03kxvphikla6ws3is8vprlvc9v3qgp45qxjc"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Basic singleton types and definitions"; @@ -620692,7 +624828,7 @@ self: { } ) { }; - singletons-base_3_5 = callPackage ( + singletons-base_3_5_1 = callPackage ( { mkDerivation, base, @@ -620718,8 +624854,8 @@ self: { }: mkDerivation { pname = "singletons-base"; - version = "3.5"; - sha256 = "0425ihzx67zyac30dj38a631iwhxbwr6xzzmf92bm8z4nr2i493s"; + version = "3.5.1"; + sha256 = "1qh4bp6ivf6mpaakg4jf57whhzjk4chh40bkxa76r9k8nvhwiyv8"; libraryHaskellDepends = [ base pretty @@ -620727,7 +624863,6 @@ self: { singletons-th template-haskell text - th-desugar ]; testHaskellDepends = [ base @@ -620765,6 +624900,8 @@ self: { pname = "singletons-base-code-generator"; version = "0.1"; sha256 = "0g016brkby95xwgfjx5n058vm8w3awhljiiblxvcxvbfvr99s23y"; + revision = "1"; + editedCabalFile = "1p2qwksz5glxi22yvvpmff5kadnj1735jz5nr2951zalfr9q283w"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -620872,7 +625009,7 @@ self: { } ) { }; - singletons-th_3_5 = callPackage ( + singletons-th_3_5_1 = callPackage ( { mkDerivation, base, @@ -620888,8 +625025,8 @@ self: { }: mkDerivation { pname = "singletons-th"; - version = "3.5"; - sha256 = "13ws4fgaw286a1ym29wlxaqg6330yg6hy2h941dj2p9vpdcsf8za"; + version = "3.5.1"; + sha256 = "11mci1lchh15fgg3dhv8p0qir4p1mzcfpx612inq6p2pq1916rlz"; libraryHaskellDepends = [ base containers @@ -622005,6 +626142,86 @@ self: { } ) { }; + skeletest_0_3_2 = callPackage ( + { + mkDerivation, + aeson, + aeson-pretty, + ansi-terminal, + base, + colour, + containers, + Diff, + directory, + exceptions, + filepath, + ghc, + hedgehog, + megaparsec, + ordered-containers, + parser-combinators, + pretty, + process, + recover-rtti, + template-haskell, + terminal-size, + text, + transformers, + unliftio, + }: + mkDerivation { + pname = "skeletest"; + version = "0.3.2"; + sha256 = "10iviwgza1h5nymzr0yc1yd68qffz47rvbg44ym494qr32c4368p"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + aeson-pretty + ansi-terminal + base + colour + containers + Diff + directory + exceptions + filepath + ghc + hedgehog + megaparsec + ordered-containers + parser-combinators + pretty + process + recover-rtti + template-haskell + terminal-size + text + transformers + unliftio + ]; + executableHaskellDepends = [ + base + text + unliftio + ]; + testHaskellDepends = [ + aeson + base + containers + directory + filepath + process + text + unliftio + ]; + description = "Batteries-included, opinionated test framework"; + license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + mainProgram = "skeletest-preprocessor"; + } + ) { }; + skeleton = callPackage ( { mkDerivation, @@ -623728,6 +627945,39 @@ self: { } ) { }; + slist_0_3_0_0 = callPackage ( + { + mkDerivation, + base, + containers, + doctest, + Glob, + hedgehog, + hspec, + hspec-hedgehog, + }: + mkDerivation { + pname = "slist"; + version = "0.3.0.0"; + sha256 = "1d3p1x1z4h10iap8fhq5bg2s09qpxhqv1q0pi70larnzcnk8l9lv"; + libraryHaskellDepends = [ + base + containers + ]; + testHaskellDepends = [ + base + doctest + Glob + hedgehog + hspec + hspec-hedgehog + ]; + description = "Sized list"; + license = lib.licensesSpdx."MPL-2.0"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + sloane = callPackage ( { mkDerivation, @@ -626495,8 +630745,8 @@ self: { pname = "snap-core"; version = "1.0.5.1"; sha256 = "00h5xijkjvnhcgxpw3vmkpf5nwfpknqflvxgig6gvsy4wahc2157"; - revision = "6"; - editedCabalFile = "0sc559ahr96y0xzahxj25rrr6mhq3d12ljj42rwvnpnfyaynqbqc"; + revision = "7"; + editedCabalFile = "17jw3sdj4raqiy6xknl14si9d38ycq1kaivx5s9nm2ji6hx7b1ym"; libraryHaskellDepends = [ attoparsec base @@ -631374,8 +635624,8 @@ self: { pname = "sop-core"; version = "0.5.0.2"; sha256 = "0rbj56icbaqlcxx5xwvbx4n4vmyv6cfcv7s45n1fv3drahigvgw7"; - revision = "5"; - editedCabalFile = "0kls940ickggjbib991d2f5hfcci0v7bgx8977gq0ca2zyplrdqb"; + revision = "6"; + editedCabalFile = "055z4pcsfl8imn9ra97xasqn9ynyv20ymrk8r4ca6mf13jvkkwyv"; libraryHaskellDepends = [ base deepseq @@ -633240,8 +637490,8 @@ self: { }: mkDerivation { pname = "sparse-set"; - version = "0.3.0"; - sha256 = "0wgnl1xd047j3g222clm5vx1g7g1br27zzj43vv33k9gf37xcsrn"; + version = "0.4.0"; + sha256 = "1hcjgmkip5yzqgcb0g4h5apjmggzpykp4v3ynk718dzmgjffm6q0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -633333,8 +637583,8 @@ self: { }: mkDerivation { pname = "sparse-vector"; - version = "0.3.0"; - sha256 = "0f86qh8akaimz7q146w6sbshxiay0w7bqi7zx7n4877gsq0hirys"; + version = "0.4.0"; + sha256 = "0x91524jm73ngw201ysj3wvnhh3agwwq90nvqll75krlcxhzsj87"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -634942,61 +639192,28 @@ self: { splitmix = callPackage ( { mkDerivation, - async, base, - base-compat-batteries, - bytestring, - containers, - criterion, deepseq, HUnit, - math-functions, - process, - random, template-haskell, - test-framework, - test-framework-hunit, - testu01, - tf-random, - vector, }: mkDerivation { pname = "splitmix"; - version = "0.1.3.1"; - sha256 = "0w32z3rhsnijb9s5k6h60rhbzgzkw8xq1glfbjbl1znlkgbx1g5n"; + version = "0.1.3.2"; + sha256 = "136yjj3vsqrks5h80dvz43928ydffjv724fkswk6b8gm625lw7d6"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ - async base - base-compat-batteries - bytestring - containers - deepseq HUnit - math-functions - process - random template-haskell - test-framework - test-framework-hunit - tf-random - vector - ]; - testSystemDepends = [ testu01 ]; - benchmarkHaskellDepends = [ - base - containers - criterion - random - tf-random ]; description = "Fast Splittable PRNG"; license = lib.licensesSpdx."BSD-3-Clause"; } - ) { testu01 = null; }; + ) { }; splitmix-distributions = callPackage ( { @@ -637597,6 +641814,136 @@ self: { } ) { inherit (pkgs) nlopt; }; + srtree_2_0_1_6 = callPackage ( + { + mkDerivation, + ad, + attoparsec, + attoparsec-expr, + base, + binary, + bytestring, + containers, + dlist, + exceptions, + filepath, + hashable, + HUnit, + ieee754, + lens, + list-shuffle, + massiv, + mtl, + nlopt, + optparse-applicative, + random, + scheduler, + split, + statistics, + transformers, + unliftio, + unliftio-core, + unordered-containers, + vector, + zlib, + }: + mkDerivation { + pname = "srtree"; + version = "2.0.1.6"; + sha256 = "0y4caqlmnfb0vc0cn4gcszasjkmaxvp16g096fxkai15p6d7wwsz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec + attoparsec-expr + base + binary + bytestring + containers + dlist + exceptions + filepath + hashable + ieee754 + lens + list-shuffle + massiv + mtl + random + scheduler + split + statistics + transformers + unliftio + unliftio-core + unordered-containers + vector + zlib + ]; + librarySystemDepends = [ nlopt ]; + executableHaskellDepends = [ + attoparsec + attoparsec-expr + base + binary + bytestring + containers + dlist + exceptions + filepath + hashable + ieee754 + lens + list-shuffle + massiv + mtl + optparse-applicative + random + scheduler + split + statistics + transformers + unliftio + unliftio-core + unordered-containers + vector + zlib + ]; + testHaskellDepends = [ + ad + attoparsec + attoparsec-expr + base + binary + bytestring + containers + dlist + exceptions + filepath + hashable + HUnit + ieee754 + lens + list-shuffle + massiv + mtl + random + scheduler + split + statistics + transformers + unliftio + unliftio-core + unordered-containers + vector + zlib + ]; + description = "A general library to work with Symbolic Regression expression trees"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { inherit (pkgs) nlopt; }; + srv = callPackage ( { mkDerivation, @@ -638358,8 +642705,8 @@ self: { pname = "stache"; version = "2.3.4"; sha256 = "0kgiyxws2kir8q8zrqkzmk103y7hl6nksxl70f6fy8m9fqkjga51"; - revision = "5"; - editedCabalFile = "1kvqv42w223r53mjkj2am6j65qly8bvahr5fxvlbnx88bairp0zm"; + revision = "6"; + editedCabalFile = "1yl7n6jqam01sgj5139cg3345igxpp3vbdg79j1hi73pxj2q1q36"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -638490,10 +642837,8 @@ self: { }: mkDerivation { pname = "stack"; - version = "3.7.1"; - sha256 = "03n8191slbq9zs9h437qda1w24nnf73p7x48x8lqp8sbcn6plaj1"; - revision = "1"; - editedCabalFile = "1rfqqgmxgp7xbsqzln4nz2ywcdmdwh66mryzrh7nnd4iym44556s"; + version = "3.9.1"; + sha256 = "1k06kram1y4732pgkrndmgrvyvm43abdvmqkjjs8p8f6qk256na9"; configureFlags = [ "-fdisable-git-info" "-fhide-dependency-versions" @@ -638721,7 +643066,7 @@ self: { mkdir -p $out/share/bash-completion/completions $exe --bash-completion-script $exe >$out/share/bash-completion/completions/stack ''; - description = "The Haskell Tool Stack"; + description = "A program for developing Haskell projects"; license = lib.licensesSpdx."BSD-3-Clause"; mainProgram = "stack"; maintainers = [ lib.maintainers.cdepillabout ]; @@ -638838,40 +643183,6 @@ self: { ) { }; stack-clean-old = callPackage ( - { - mkDerivation, - base, - directory, - extra, - filemanip, - filepath, - simple-cmd, - simple-cmd-args, - simple-prompt, - }: - mkDerivation { - pname = "stack-clean-old"; - version = "0.5.1"; - sha256 = "0crk2pqfsjqd386ggg0i6nx2nd0an50y9vglwix184s7mry7yzvm"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base - directory - extra - filemanip - filepath - simple-cmd - simple-cmd-args - simple-prompt - ]; - description = "Clean away old stack build artifacts"; - license = lib.licenses.bsd3; - mainProgram = "stack-clean-old"; - } - ) { }; - - stack-clean-old_0_5_2 = callPackage ( { mkDerivation, base, @@ -638903,7 +643214,6 @@ self: { ]; description = "Clean away old stack build artifacts"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "stack-clean-old"; } ) { }; @@ -640729,8 +645039,8 @@ self: { }: mkDerivation { pname = "stacked"; - version = "0.1.0"; - sha256 = "12wh22kh73khs6w0jlf2d011pr4cs7id0rjjl1wms5xph2bcswww"; + version = "0.1.1"; + sha256 = "013v6gbldwr4bqy7l3mz0v2jn8hg9j1dllvgxhjm1nnldfz52zgi"; libraryHaskellDepends = [ base comonad @@ -640890,6 +645200,48 @@ self: { } ) { }; + stakhanov = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + contravariant-extras, + hasql, + hasql-dynamic-statements, + hasql-th, + hspec, + text, + time, + vector, + }: + mkDerivation { + pname = "stakhanov"; + version = "0.0.1.0"; + sha256 = "1v966nnavbm81xzh0i9ad3r0kz3isp1f3hddb9hwdpvmzykcv9xk"; + libraryHaskellDepends = [ + aeson + base + bytestring + contravariant-extras + hasql + hasql-dynamic-statements + hasql-th + text + time + vector + ]; + testHaskellDepends = [ + aeson + base + hspec + vector + ]; + description = "A Haskell PGMQ client"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + stamina = callPackage ( { mkDerivation, @@ -640977,8 +645329,8 @@ self: { pname = "stan"; version = "0.2.1.0"; sha256 = "1mf01bpy291131jfl4fcslv0jfn8i8jqwr29v1v48j6c6q49rias"; - revision = "3"; - editedCabalFile = "1wrr3vpv8hvj2rgb9gqrnwnjwzyyz28c9x1914277qqk39gy8zqq"; + revision = "4"; + editedCabalFile = "052qy3ckclp5qz8yf37m3lqbj8fw9hxv2lcl3wxy6gj8q76z4a90"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -642110,8 +646462,8 @@ self: { }: mkDerivation { pname = "statistics"; - version = "0.16.4.0"; - sha256 = "0srx02a591kyim3khd99k8mjni03668b2774wjv7ifxyc8kw9jw2"; + version = "0.16.5.0"; + sha256 = "0hhvnh8ygzhzx2r6m0l7cjaxi0jw1jqcnkbv74x901amz4q68wfy"; libraryHaskellDepends = [ aeson async @@ -643683,8 +648035,8 @@ self: { }: mkDerivation { pname = "stm-containers"; - version = "1.2.1.1"; - sha256 = "0w28l4pyp6pix17ybnf70mbs0b1k6nybsg631g1vh7mhpni68v15"; + version = "1.2.2"; + sha256 = "15h55r2i50f30jxid1gqjbsa1cd2l5kaaivpccb9nl0b7cwvf8b4"; libraryHaskellDepends = [ base deferred-folds @@ -643832,8 +648184,8 @@ self: { }: mkDerivation { pname = "stm-hamt"; - version = "1.2.1.1"; - sha256 = "11k7a2fzgng23ggng1d4v3nhai0d1b3bkci56v7p2n0vdbr7w5d7"; + version = "1.2.2.1"; + sha256 = "13yc6bn83i3fjcxrv46533x9bgfj6nj6cfzi6hyyshs8jl18md1y"; libraryHaskellDepends = [ base deferred-folds @@ -654087,6 +658439,8 @@ self: { pname = "strict-checked-vars"; version = "0.2.1.0"; sha256 = "12c4j4rlmxcdri2sgrb383nnvbjmvhxf8pp4mgmkfsipvwyv2clm"; + revision = "1"; + editedCabalFile = "0ghsx08krngbbh9i21lcgbh60i7d3yzma5h6i88nsz07x757xndw"; libraryHaskellDepends = [ base io-classes @@ -654102,8 +658456,6 @@ self: { ]; description = "Strict MVars and TVars with invariant checking for IO and IOSim"; license = lib.licensesSpdx."Apache-2.0"; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -654967,8 +659319,8 @@ self: { pname = "string-interpolate"; version = "0.3.4.0"; sha256 = "13hb3spabggr6gsn9xhwpwldjvpl2l7z4lgssis82c40n108b0w8"; - revision = "3"; - editedCabalFile = "0grq9v023186gfq3a2as9974qlwcjx3dhxqczpq22bq2wfpw24x7"; + revision = "4"; + editedCabalFile = "1sj0sgli6kvspbphaz7ndhx3dg8a9nvjggirwyvd956ps4jwv993"; libraryHaskellDepends = [ base bytestring @@ -656183,7 +660535,7 @@ self: { } ) { }; - strive_6_1_0_0 = callPackage ( + strive_6_1_0_3 = callPackage ( { mkDerivation, aeson, @@ -656200,8 +660552,8 @@ self: { }: mkDerivation { pname = "strive"; - version = "6.1.0.0"; - sha256 = "1nhm1spxqjp80ik96vz3a0yhfa5i7zmliky0jz76bj687y70kbwz"; + version = "6.1.0.3"; + sha256 = "091irrvl8sab9chx9bpdvf4k782w07ya217ya0ngsf8p5h6s4nmc"; libraryHaskellDepends = [ aeson base @@ -656471,8 +660823,6 @@ self: { { mkDerivation, base, - deepseq, - ghc-prim, primitive, QuickCheck, tasty, @@ -656483,14 +660833,10 @@ self: { }: mkDerivation { pname = "structs"; - version = "0.1.9"; - sha256 = "033vx729k9jn4w4hs3kp8nlnf0ylsqgg3q4cmb7zjfpgk4bk511w"; - revision = "3"; - editedCabalFile = "05ymnx9vzba6jqkx2jil2qj15399qz9dxzqsy6gfpx1j65spjrva"; + version = "0.1.10"; + sha256 = "19qjxbdcxla72v1w2b7vkpi0mffiwfbdsfg85l825vh82sv2shkn"; libraryHaskellDepends = [ base - deepseq - ghc-prim primitive template-haskell th-abstraction @@ -659053,10 +663399,8 @@ self: { summoner = callPackage ( { mkDerivation, - aeson, base, colourista, - containers, directory, filepath, generic-data, @@ -659064,12 +663408,11 @@ self: { hedgehog, hspec, hspec-hedgehog, - neat-interpolation, + microaeson, optparse-applicative, process, relude, shellmet, - text, time, tomland, tree-diff, @@ -659077,25 +663420,22 @@ self: { }: mkDerivation { pname = "summoner"; - version = "2.0.1.1"; - sha256 = "15n4dwhy4ri1vi446fa2k9i6cxvfrl79hjjgsdjhpyz290lfwvjv"; + version = "2.2.0.0"; + sha256 = "093y9b5kcf5m251vzbwmz2nlkzfinxr4yrdkg10bjglgv49wggki"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base colourista - containers directory filepath generic-data gitrev - neat-interpolation + microaeson optparse-applicative process relude shellmet - text time tomland validation-selective @@ -659111,9 +663451,7 @@ self: { hedgehog hspec hspec-hedgehog - neat-interpolation relude - text tomland tree-diff validation-selective @@ -659121,7 +663459,6 @@ self: { description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects"; license = lib.licensesSpdx."MPL-2.0"; hydraPlatforms = lib.platforms.none; - mainProgram = "summon"; broken = true; } ) { }; @@ -659137,14 +663474,14 @@ self: { microlens-th, relude, summoner, - text, validation-selective, vty, + vty-crossplatform, }: mkDerivation { pname = "summoner-tui"; - version = "2.0.1.1"; - sha256 = "09rc3yyngma602yyd7bmc6cix9rcwmanfphcxnsv8m1cswjhz14z"; + version = "2.2.0.0"; + sha256 = "0zc4ws3g0c658ggicviqamcmw480hyqcx5wwyvxpmxinjmczi0vi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -659156,9 +663493,9 @@ self: { microlens-th relude summoner - text validation-selective vty + vty-crossplatform ]; executableHaskellDepends = [ base @@ -661819,8 +666156,8 @@ self: { }: mkDerivation { pname = "swish"; - version = "0.10.10.0"; - sha256 = "1ssw4qg0dcxz9bas30g1z98sgfq3x92kbslm640vn01frga48m9c"; + version = "0.10.11.0"; + sha256 = "0mxbbkma50306jx4qcqqvdbm6aiwx8j5f4s0sqg1zm15kl1hacvw"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -662401,7 +666738,7 @@ self: { } ) { }; - sydtest_0_22_0_0 = callPackage ( + sydtest_0_23_0_1 = callPackage ( { mkDerivation, async, @@ -662433,8 +666770,8 @@ self: { }: mkDerivation { pname = "sydtest"; - version = "0.22.0.0"; - sha256 = "1fvj90c6cmr03w3ac7xa4s1334w8md181gvd87bv0f07s9k9ki1q"; + version = "0.23.0.1"; + sha256 = "03vzlrzlqz9nx8phmhvasgfkpz5kphvmbyh7z7lp5am4sj0g9kvp"; libraryHaskellDepends = [ async autodocodec @@ -663216,60 +667553,6 @@ self: { ) { }; sydtest-webdriver-yesod = callPackage ( - { - mkDerivation, - base, - bytestring, - http-client, - http-types, - mtl, - network-uri, - path, - path-io, - sydtest, - sydtest-discover, - sydtest-wai, - sydtest-webdriver, - sydtest-yesod, - text, - webdriver, - yesod, - }: - mkDerivation { - pname = "sydtest-webdriver-yesod"; - version = "0.0.0.1"; - sha256 = "0rfsr45ff7p81y157x06qspjp00ng2kikw84c2ciw4bfjicdvvsr"; - libraryHaskellDepends = [ - base - bytestring - http-client - http-types - mtl - network-uri - sydtest - sydtest-wai - sydtest-webdriver - sydtest-yesod - text - webdriver - yesod - ]; - testHaskellDepends = [ - base - path - path-io - sydtest - sydtest-webdriver - yesod - ]; - testToolDepends = [ sydtest-discover ]; - description = "A webdriver+yesod companion library for sydtest"; - license = "unknown"; - hydraPlatforms = lib.platforms.none; - } - ) { }; - - sydtest-webdriver-yesod_0_0_1_0 = callPackage ( { mkDerivation, base, @@ -663326,92 +667609,6 @@ self: { ) { }; sydtest-yesod = callPackage ( - { - mkDerivation, - base, - binary, - bytestring, - case-insensitive, - conduit, - containers, - cookie, - exceptions, - http-client, - http-client-tls, - http-types, - monad-logger, - mtl, - network, - network-uri, - path, - path-io, - persistent, - persistent-sqlite, - QuickCheck, - sydtest, - sydtest-discover, - sydtest-persistent-sqlite, - sydtest-wai, - text, - time, - xml-conduit, - yesod, - yesod-core, - yesod-test, - }: - mkDerivation { - pname = "sydtest-yesod"; - version = "0.3.0.3"; - sha256 = "1674k3frszzwmk5c94wxwgdfabbi804kbbsjcih7z5g7z6jaljh4"; - libraryHaskellDepends = [ - base - binary - bytestring - case-insensitive - containers - cookie - exceptions - http-client - http-client-tls - http-types - mtl - network - network-uri - sydtest - sydtest-wai - text - time - xml-conduit - yesod-core - yesod-test - ]; - testHaskellDepends = [ - base - bytestring - conduit - cookie - http-client - monad-logger - mtl - path - path-io - persistent - persistent-sqlite - QuickCheck - sydtest - sydtest-persistent-sqlite - sydtest-wai - text - yesod - yesod-core - ]; - testToolDepends = [ sydtest-discover ]; - description = "A yesod companion library for sydtest"; - license = "unknown"; - } - ) { }; - - sydtest-yesod_0_3_1_0 = callPackage ( { mkDerivation, base, @@ -663496,7 +667693,6 @@ self: { testToolDepends = [ sydtest-discover ]; description = "A yesod companion library for sydtest"; license = "unknown"; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -664583,6 +668779,85 @@ self: { } ) { }; + symbolic-regression = callPackage ( + { + mkDerivation, + attoparsec, + attoparsec-expr, + base, + binary, + bytestring, + containers, + dataframe, + directory, + dlist, + exceptions, + filepath, + hashable, + ieee754, + lens, + list-shuffle, + massiv, + mtl, + optparse-applicative, + random, + scheduler, + split, + srtree, + statistics, + text, + time, + transformers, + unliftio, + unliftio-core, + unordered-containers, + vector, + zlib, + }: + mkDerivation { + pname = "symbolic-regression"; + version = "0.1.0.2"; + sha256 = "0j1avmyajhqw38hgrlq53zhcifl73mzx7hshpmns5p5nlb6fiikl"; + libraryHaskellDepends = [ + attoparsec + attoparsec-expr + base + binary + bytestring + containers + dataframe + directory + dlist + exceptions + filepath + hashable + ieee754 + lens + list-shuffle + massiv + mtl + optparse-applicative + random + scheduler + split + srtree + statistics + text + time + transformers + unliftio + unliftio-core + unordered-containers + vector + zlib + ]; + testHaskellDepends = [ base ]; + description = "Symbolic Regression in Haskell"; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + symbolise = callPackage ( { mkDerivation, @@ -668049,6 +672324,8 @@ self: { pname = "tagged"; version = "0.8.10"; sha256 = "0pbcyl88qgcyy1shibr459f6jjqz1xx84n5injii9wyanhg7kvqp"; + revision = "1"; + editedCabalFile = "0chxndgcwylzzm0vvf4jxjn6gfvbkszzxi9p5zb82yc2x6c7rfg9"; libraryHaskellDepends = [ base deepseq @@ -669450,8 +673727,11 @@ self: { }: mkDerivation { pname = "tail"; - version = "0.1.0.0"; - sha256 = "1zpld1s7nac596ahc5as594px750arajqqw7d5b2i6as1660d8vp"; + version = "0.2.0.0"; + sha256 = "0k2sajcc325sm7jn7ddha549h1dzi08nbix4ggwl0fx42zlj4gnz"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ async base @@ -669464,7 +673744,7 @@ self: { text which ]; - testHaskellDepends = [ + executableHaskellDepends = [ async base directory @@ -669479,9 +673759,9 @@ self: { text which ]; - testToolDepends = [ hspec-discover ]; description = "Haskell API for tail -f streaming"; license = lib.licenses.mit; + mainProgram = "tail-test"; } ) { }; @@ -670680,8 +674960,8 @@ self: { }: mkDerivation { pname = "tardis"; - version = "0.5.0"; - sha256 = "1ckzhydqkx0p81xygbdi05ad8dd9z20fadxh3sv20s1izrh6n07n"; + version = "0.5.0.1"; + sha256 = "1xwiyksisx4p69495zm1yw5hqd20zcfrfs3m2v4bn89pysy4h4fs"; libraryHaskellDepends = [ base mmorph @@ -672082,8 +676362,8 @@ self: { }: mkDerivation { pname = "tasty-flaky"; - version = "0.1.3.0"; - sha256 = "1jwi5f44h02dd0cc3mavk6cdj1z2zasn0s3dqrg5d0gmbi0pjp93"; + version = "0.1.3.1"; + sha256 = "1kzscvsdjig8xzkv1szmiafqav0x4ny1bvl356szj83ahkwr0v08"; libraryHaskellDepends = [ base retry @@ -672317,8 +676597,8 @@ self: { pname = "tasty-hedgehog"; version = "1.4.0.2"; sha256 = "0lki03z0p38x0dkqx5cqga30zy5m31gxn1saqylja9bi6bbq8d25"; - revision = "7"; - editedCabalFile = "0xcg6qiw7fgl8hw50zfw8rayzynl4czhmvbgdkydq2a2ajipz06r"; + revision = "8"; + editedCabalFile = "06iccmqazsdvcwlx2x68xg77m26cyg66r8xqijgqmz2pkx73mrni"; libraryHaskellDepends = [ base hedgehog @@ -672393,8 +676673,8 @@ self: { }: mkDerivation { pname = "tasty-hslua"; - version = "1.1.1"; - sha256 = "066q54kw3y3knxgxpkmhdspb7bdxkv0z68zi2r81sm9xsqg17a5b"; + version = "1.1.1.1"; + sha256 = "0bwkwa4aq9id9hdxs2qvhbkjni75b9sx6arxgaz7x6c1ynqxr1ww"; libraryHaskellDepends = [ base bytestring @@ -673372,8 +677652,10 @@ self: { }: mkDerivation { pname = "tasty-sugar"; - version = "2.2.3.2"; - sha256 = "02vl0mwmpg9myz0nnaq4kwl73xla446n0q5zigllaqfgv8razw0n"; + version = "2.2.3.3"; + sha256 = "1bkrvx75vdsprh810m1nmrkzm343wygh9d2c414h0n7i3xf18jjv"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers @@ -673390,6 +677672,11 @@ self: { tasty text ]; + executableHaskellDepends = [ + base + tasty + tasty-hunit + ]; testHaskellDepends = [ base filepath @@ -673407,6 +677694,7 @@ self: { doHaddock = false; description = "Tests defined by Search Using Golden Answer References"; license = lib.licenses.isc; + mainProgram = "test-passthru-ascii"; } ) { }; @@ -675379,8 +679667,8 @@ self: { }: mkDerivation { pname = "telescope"; - version = "0.4.0"; - sha256 = "13bls8czlwk6df5p5i37cs4sdf0wmz4w4bnjjhpf8kk7bnglpr97"; + version = "0.4.1"; + sha256 = "0xshx4y2xdd7s8kipai8s25y7y1smm93lks1nj55vnkyxld0j6k7"; libraryHaskellDepends = [ base binary @@ -675712,8 +680000,8 @@ self: { }: mkDerivation { pname = "template-haskell-compat-v0208"; - version = "0.1.9.5"; - sha256 = "07wx8k16rhhkm3mx1by4np4zdi0kgn1i9li1jnsk07ymr26rydai"; + version = "0.1.9.6"; + sha256 = "1r9bgisricwd9l8k4jphdbl1z4kviaad9zf118ay5z5xr1q7v2jg"; libraryHaskellDepends = [ base template-haskell @@ -677858,8 +682146,8 @@ self: { }: mkDerivation { pname = "terminal-punch"; - version = "0.1.3"; - sha256 = "1hc8gl0bjrz8h9nfrvlkxbkgys62xr7mcdk22lm8dc1cl8y42nkv"; + version = "0.2.1"; + sha256 = "0cawrff9bxchr05pkchz6c0i4wr3ww7j7y2waq7cp15bqwp013qi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -678421,8 +682709,8 @@ self: { }: mkDerivation { pname = "test-certs"; - version = "0.1.1.1"; - sha256 = "032v48ljhhynvib7b47pzndrvrlm640y318jg8d5lifzrplwmb6p"; + version = "0.1.1.2"; + sha256 = "1g5hp1s5m6ygapy4xj8kgajq9mm142d7m8w8wn0nbkrdmdvhnig6"; libraryHaskellDepends = [ base bytestring @@ -678495,50 +682783,37 @@ self: { ansi-terminal, ansi-wl-pprint, base, - bytestring, containers, hostname, HUnit, - old-locale, QuickCheck, random, regex-posix, - semigroups, time, xml, }: mkDerivation { pname = "test-framework"; - version = "0.8.2.2"; - sha256 = "04ijf5x6xx8i5lqv9ir33zs1rfzc4qkwwz8c1fdycnzvydcv4dnp"; - revision = "1"; - editedCabalFile = "1yv1qsr6bxphxk9430id9bqhfmkffdqmfg0k017dp9pnn4pqj0zh"; + version = "0.8.2.3"; + sha256 = "0pn5qzhzcjxk4cm1h8ld0arxh4awkw44g96ql679wfhcj1n7h2ii"; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint base containers hostname - old-locale random regex-posix time xml ]; testHaskellDepends = [ - ansi-terminal - ansi-wl-pprint base - bytestring containers - hostname HUnit - old-locale QuickCheck random regex-posix - semigroups - time xml ]; description = "Framework for running and organising tests, with HUnit and QuickCheck support"; @@ -678610,19 +682885,15 @@ self: { { mkDerivation, base, - extensible-exceptions, HUnit, test-framework, }: mkDerivation { pname = "test-framework-hunit"; - version = "0.3.0.2"; - sha256 = "1y0b6vg8nfm43v90lxxcydhi6qlxhfy4vpxbzm5ic2w55bh8xjwm"; - revision = "3"; - editedCabalFile = "0i9mlalv7cl1iq43ld5myrnpszq5rxmd79hk495dcb08rglhgl3z"; + version = "0.3.0.3"; + sha256 = "0imvskciq9kr1hfvz721p2n4rf2iphrky41fyrx2zrfldj1hcyv6"; libraryHaskellDepends = [ base - extensible-exceptions HUnit test-framework ]; @@ -678713,20 +682984,16 @@ self: { { mkDerivation, base, - extensible-exceptions, QuickCheck, random, test-framework, }: mkDerivation { pname = "test-framework-quickcheck2"; - version = "0.3.0.6"; - sha256 = "1d0w2q9sm8aayk0aj1zr2irpnqwpzixn6pdfq1i904vs1kkb2xin"; - revision = "1"; - editedCabalFile = "1af2gw9gvq143jdqmsnxj23cgss9ffdyr67951a5x151aps04y7z"; + version = "0.3.0.7"; + sha256 = "15gpkmk3lvg618bqrzx482zafn9cljvm3qi0a3iiz4jbpx70qzby"; libraryHaskellDepends = [ base - extensible-exceptions QuickCheck random test-framework @@ -679620,8 +683887,8 @@ self: { }: mkDerivation { pname = "testcontainers-postgresql"; - version = "0.2"; - sha256 = "0pb653vv5mv69h6i6dgrvhzsppr4cnz1v7p9v04jw3f2njlm4wqr"; + version = "0.2.0.1"; + sha256 = "0qbsi1g97qghx4hm4yvg3458v75yyf38qp53z6n7wx4bvw6j82f1"; libraryHaskellDepends = [ base testcontainers @@ -680146,7 +684413,7 @@ self: { } ) { }; - text_2_1_3 = callPackage ( + text_2_1_4 = callPackage ( { mkDerivation, array, @@ -680171,10 +684438,8 @@ self: { }: mkDerivation { pname = "text"; - version = "2.1.3"; - sha256 = "17gqrvcw7hsm64560dypvmvpqfn1zwb772fllwbn9b4x7vj1xfxi"; - revision = "1"; - editedCabalFile = "0lw01f0vgppdxxnkmqv4wilfb47abv590rpsqmca8zbi9wkb352h"; + version = "2.1.4"; + sha256 = "0x0h11694iqbnzlxs2y4rljddzc9qhxmfi50axjc9c77q9vqybhn"; libraryHaskellDepends = [ array base @@ -680448,6 +684713,57 @@ self: { } ) { }; + text-builder_1_0_0_5 = callPackage ( + { + mkDerivation, + base, + bytestring, + QuickCheck, + quickcheck-classes, + quickcheck-instances, + tasty, + tasty-bench, + tasty-quickcheck, + text, + text-builder-core, + text-builder-linear, + time, + transformers, + }: + mkDerivation { + pname = "text-builder"; + version = "1.0.0.5"; + sha256 = "02gdc61rzya90i5251cw2iqgcvfy06fnqk93c6zf5cry9xp5rq1r"; + libraryHaskellDepends = [ + base + bytestring + text + text-builder-core + time + transformers + ]; + testHaskellDepends = [ + base + bytestring + QuickCheck + quickcheck-classes + quickcheck-instances + tasty + tasty-quickcheck + text + ]; + benchmarkHaskellDepends = [ + base + tasty-bench + text + text-builder-linear + ]; + description = "Efficient and flexible strict text builder"; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + text-builder-core = callPackage ( { mkDerivation, @@ -680490,6 +684806,49 @@ self: { } ) { }; + text-builder-core_0_1_1_3 = callPackage ( + { + mkDerivation, + base, + QuickCheck, + quickcheck-classes, + quickcheck-instances, + tasty, + tasty-bench, + tasty-quickcheck, + text, + text-builder-linear, + }: + mkDerivation { + pname = "text-builder-core"; + version = "0.1.1.3"; + sha256 = "1ynmcnzglr9d6ch1sn99q351jjj071a1spcriqxnlc66nlyzr5ga"; + libraryHaskellDepends = [ + base + QuickCheck + text + ]; + testHaskellDepends = [ + base + QuickCheck + quickcheck-classes + quickcheck-instances + tasty + tasty-quickcheck + text + ]; + benchmarkHaskellDepends = [ + base + tasty-bench + text + text-builder-linear + ]; + description = "Internals of \"text-builder\""; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + text-builder-dev_0_3_10 = callPackage ( { mkDerivation, @@ -680568,8 +684927,8 @@ self: { }: mkDerivation { pname = "text-builder-dev"; - version = "0.4"; - sha256 = "1b8lxbd10d29lvlxwmcyljrgpcw2vb2a2xzacah5ys9ivp9i9xi9"; + version = "0.4.0.1"; + sha256 = "1zqqp3rj3rh9s06px1l0w3s8amp25pspc3i7rsy6zbmdsr2glccl"; libraryHaskellDepends = [ base bytestring @@ -681145,8 +685504,8 @@ self: { pname = "text-icu"; version = "0.8.0.5"; sha256 = "1nzd7al2vpm07xa19w9vy6f696bm4z48h0m4fljsxjg4v0wblbj4"; - revision = "1"; - editedCabalFile = "1zqbcsnf9943mk8i9lyj1ab2xvg6dw9k6jfjhblxqcliq53c3dpp"; + revision = "2"; + editedCabalFile = "1p683nr0q979xnps2s2zvnffm1hnv2wgi7qql1mlg353p1d6jbql"; libraryHaskellDepends = [ base bytestring @@ -681611,6 +685970,8 @@ self: { pname = "text-metrics"; version = "0.3.3"; sha256 = "0gl5xxagdgs32m5xh58zlgwnysg0i19m31gg2lpm58x9d1bal81k"; + revision = "1"; + editedCabalFile = "1ri3x1x2x3i3c6jhc62bf8ngyjsdsllcvj9gd6p5n6b5w5c4pxvb"; libraryHaskellDepends = [ base containers @@ -682123,10 +686484,8 @@ self: { }: mkDerivation { pname = "text-short"; - version = "0.1.6"; - sha256 = "1avfamw6sig6r5zpm2hbas373qbrdszi4q33gds9ihvxil9ylww1"; - revision = "3"; - editedCabalFile = "0fhnd5dd46pjja8rpawq8ld93ix31q9wa18bkfv6lr7nsg699gj1"; + version = "0.1.6.1"; + sha256 = "05klm26sx1kd1hngflg4anwnfckkmx1n84kmvjy4y9sl4d09yrl3"; libraryHaskellDepends = [ base binary @@ -682144,7 +686503,6 @@ self: { tasty tasty-hunit tasty-quickcheck - template-haskell text ]; description = "Memory-efficient representation of Unicode text strings"; @@ -682175,13 +686533,14 @@ self: { template-haskell, text, th-abstraction, - transformers, transformers-compat, }: mkDerivation { pname = "text-show"; - version = "3.11.2"; - sha256 = "10nm8kj524hkl65qvxkrjjyykzgj85n3p96gv7zc7j3x90v9g1z2"; + version = "3.11.3"; + sha256 = "0mvahiljlvizfbldnv8cjn94h9j76s1zj7d8gb6wl6rwxf7fphrg"; + revision = "1"; + editedCabalFile = "0vhl7zqqg3q8dm4dkw0b940ka8kaaxsa7adxpbw1frgqg8xrg960"; libraryHaskellDepends = [ array base @@ -682194,8 +686553,6 @@ self: { template-haskell text th-abstraction - transformers - transformers-compat ]; testHaskellDepends = [ array @@ -682211,7 +686568,6 @@ self: { quickcheck-instances template-haskell text - transformers transformers-compat ]; testToolDepends = [ hspec-discover ]; @@ -682219,7 +686575,6 @@ self: { base criterion deepseq - ghc-prim text ]; description = "Efficient conversion of values into Text"; @@ -682273,8 +686628,8 @@ self: { pname = "text-show-instances"; version = "3.9.10"; sha256 = "09cb391gi0hgkjk4ap4d83vg13lczrghmb9db96a4ckw1bp9pbc1"; - revision = "4"; - editedCabalFile = "1k5h1lqc8z593cwnmy2yngh3nlq2b4zfbjwkmyqddg192xia8bbh"; + revision = "5"; + editedCabalFile = "0mrlg1pn18vc8bj6dh3wncc7xcyaaamdsz5ja24sgxv2g08m3wvg"; libraryHaskellDepends = [ aeson base @@ -683067,19 +687422,15 @@ self: { mkDerivation, base, containers, - ghc-prim, template-haskell, }: mkDerivation { pname = "th-abstraction"; - version = "0.7.1.0"; - sha256 = "1i843j7lhq6qly9zknrw3nhb17ac3badmxwn1pfn2sscp951idpr"; - revision = "1"; - editedCabalFile = "1n2gpcajn2sm8zw5ibkjwvhd3k1m0lvvjrixwcq0c1xhhlyl049h"; + version = "0.7.2.0"; + sha256 = "08knffg6ffx5rz9r437jvndbx668m1hih1jq01yzybgav2y58rll"; libraryHaskellDepends = [ base containers - ghc-prim template-haskell ]; testHaskellDepends = [ @@ -683217,8 +687568,8 @@ self: { }: mkDerivation { pname = "th-compat"; - version = "0.1.6"; - sha256 = "1sx4l374vjw3clc7a3vk8kkq37kxzbv9h3nh0racjaw7b70a10dp"; + version = "0.1.7"; + sha256 = "1zym9yia0is8wxfd6d1ldwvvghwxg4ww3y4lrxnyb2nk60ig29ly"; libraryHaskellDepends = [ base template-haskell @@ -683365,8 +687716,8 @@ self: { pname = "th-deepstrict"; version = "0.1.1.0"; sha256 = "0y0wlgzsm44sbwbchg4pqyb0s398aqjmd1awgd019bp29gzkd1hp"; - revision = "2"; - editedCabalFile = "1h4shx5kcyj3k0bngr2fbngl2l4dcyk8qffvbfm2qjlp4ymz6m0n"; + revision = "3"; + editedCabalFile = "0amva110705z0cbjls1nsgrf4ly570jvcp7d2x4iksyrw6hznv7b"; libraryHaskellDepends = [ base containers @@ -683439,7 +687790,7 @@ self: { } ) { }; - th-desugar_1_18 = callPackage ( + th-desugar_1_19 = callPackage ( { mkDerivation, base, @@ -683458,8 +687809,8 @@ self: { }: mkDerivation { pname = "th-desugar"; - version = "1.18"; - sha256 = "0nq64z9nb2jbvs6pvnbafz33pymbgil2r783sl6fx2yjblqw3l3h"; + version = "1.19"; + sha256 = "1lahffbsrkwhdb4vwcsyfc5lga7fxkb8pll9rfvnk6v10i9sk6vv"; libraryHaskellDepends = [ base containers @@ -683479,11 +687830,9 @@ self: { ghc-prim hspec HUnit - mtl syb template-haskell th-abstraction - th-orphans ]; description = "Functions to desugar Template Haskell"; license = lib.licenses.bsd3; @@ -683554,6 +687903,8 @@ self: { pname = "th-expand-syns"; version = "0.4.12.0"; sha256 = "03zgqq0bwcjmy4d3m00gqzh4r1big2yh9v69rxvg72cw69krkq8q"; + revision = "1"; + editedCabalFile = "09mhaz7ylkh35c7zaix1gfx3z4bqvvibsmb4nd8x42mf87xja5fp"; libraryHaskellDepends = [ base containers @@ -683888,23 +688239,20 @@ self: { { mkDerivation, base, - ghc-prim, template-haskell, th-abstraction, }: mkDerivation { pname = "th-lift"; - version = "0.8.6"; - sha256 = "07zgl42fq7ijmm29x7q10iv02hk6lqs7snysxdad03pq1vbrlc04"; + version = "0.8.7"; + sha256 = "01lqqsnhy8cbca3y7z436m8czz7ab8q90dmcmmqzmc5hdii7q5fx"; libraryHaskellDepends = [ base - ghc-prim template-haskell th-abstraction ]; testHaskellDepends = [ base - ghc-prim template-haskell ]; description = "Derive Template Haskell's Lift class for datatypes"; @@ -684017,7 +688365,6 @@ self: { mkDerivation, base, bytestring, - ghc-prim, hspec, hspec-discover, mtl, @@ -684028,8 +688375,8 @@ self: { }: mkDerivation { pname = "th-orphans"; - version = "0.13.16"; - sha256 = "04x95fwsiczbi4gxadnnz6z39hy72hsj1smfaa52ljhwh8sh3479"; + version = "0.13.17"; + sha256 = "0qlhbsm5d083m50vzn93c72c91y0fczlbpnp3rv7y7lz9i4gnrww"; libraryHaskellDepends = [ base mtl @@ -684041,7 +688388,6 @@ self: { testHaskellDepends = [ base bytestring - ghc-prim hspec template-haskell th-lift @@ -684266,8 +688612,8 @@ self: { }: mkDerivation { pname = "th-test-utils"; - version = "1.2.2"; - sha256 = "1ihngf4g4q1c3hvzjax5ar437xm0h2yxiwnr518jm4mnsfkx3sss"; + version = "1.2.3"; + sha256 = "1l77hfb3l690jszhgpyycf4jmzzbabp8fcr89ssh7li04d3vzy1s"; libraryHaskellDepends = [ base template-haskell @@ -688101,22 +692447,29 @@ self: { } ) { }; - time-manager_0_3_0 = callPackage ( + time-manager_0_3_1_1 = callPackage ( { mkDerivation, base, containers, + hspec, + HUnit, stm, }: mkDerivation { pname = "time-manager"; - version = "0.3.0"; - sha256 = "0bk2wcdg26s60k4aq7ahy46yr81l19yjzd33y1vcjrdr9clazvwh"; + version = "0.3.1.1"; + sha256 = "0d76m2qcvcl4pwdj82gvgag13mzsvrbby4s7iz2w6920qkyc31gd"; libraryHaskellDepends = [ base containers stm ]; + testHaskellDepends = [ + base + hspec + HUnit + ]; description = "Scalable timer"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -691105,11 +695458,9 @@ self: { } ) { }; - tls_2_1_13 = callPackage ( + tls_2_2_1 = callPackage ( { mkDerivation, - asn1-encoding, - asn1-types, async, base, base16-bytestring, @@ -691118,12 +695469,13 @@ self: { cereal, containers, crypton, + crypton-asn1-encoding, + crypton-asn1-types, crypton-x509, crypton-x509-store, crypton-x509-validation, data-default, ech-config, - hourglass, hpke, hspec, hspec-discover, @@ -691135,24 +695487,25 @@ self: { random, serialise, tasty-bench, + time-hourglass, transformers, unix-time, zlib, }: mkDerivation { pname = "tls"; - version = "2.1.13"; - sha256 = "0d249apxcm39431vpjwamr145iz7i2q1fj4g89xg409hl3r2jadd"; + version = "2.2.1"; + sha256 = "0cwi77q86llncxnksq45lv0nfgc0d163p134g6ql6v3mc5h49cih"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - asn1-encoding - asn1-types base base16-bytestring bytestring cereal crypton + crypton-asn1-encoding + crypton-asn1-types crypton-x509 crypton-x509-store crypton-x509-validation @@ -691169,41 +695522,41 @@ self: { zlib ]; testHaskellDepends = [ - asn1-types async base base64-bytestring bytestring crypton + crypton-asn1-types crypton-x509 crypton-x509-validation ech-config - hourglass hspec QuickCheck serialise + time-hourglass ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ - asn1-types async base base64-bytestring bytestring containers crypton + crypton-asn1-types crypton-x509 crypton-x509-store crypton-x509-validation data-default ech-config - hourglass hspec network network-run QuickCheck serialise tasty-bench + time-hourglass ]; description = "TLS protocol native implementation"; license = lib.licenses.bsd3; @@ -691645,7 +695998,6 @@ self: { base, bytestring, crypton-connection, - crypton-x509-system, data-default, directory, filepath, @@ -691671,8 +696023,8 @@ self: { }: mkDerivation { pname = "tmp-proc"; - version = "0.7.2.2"; - sha256 = "1hqgawf9z38kfd52f3mj4sv3xif98iql26n80g0dlpbyl9apg36s"; + version = "0.7.2.5"; + sha256 = "1ixfig07xg3zzb81s9dsrcfrmi5sgwm5rm6izzh1128wr7l9zw1m"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -691696,7 +696048,6 @@ self: { base bytestring crypton-connection - crypton-x509-system data-default directory filepath @@ -692931,6 +697282,8 @@ self: { pname = "toml-parser"; version = "2.0.2.0"; sha256 = "1a71imxdzhkjbbsj39jmj1w9hbp3m0wphd1j2x2a5gm9xvjmx2wy"; + revision = "1"; + editedCabalFile = "02mgl73181q92iwzws45ixgr358xs5qpz54xpkpx1spwxx1r4fms"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -693121,8 +697474,8 @@ self: { pname = "tomland"; version = "1.3.3.3"; sha256 = "1asnz773mrbg8fkfabq5w24v63sgqljspc4p4nmf4dm6abm2p6d0"; - revision = "3"; - editedCabalFile = "0aclzlwr7xmjzda327vzfb8av90g3lpcln1h1gkw76x5w7xq662s"; + revision = "4"; + editedCabalFile = "128mzn1d9cxhw4kfvgy2rv2hn362dn57k8ha4jdj34caaaagdq9w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -696188,12 +700541,12 @@ self: { } ) { }; - transformers_0_6_2_0 = callPackage ( + transformers_0_6_3_0 = callPackage ( { mkDerivation, base }: mkDerivation { pname = "transformers"; - version = "0.6.2.0"; - sha256 = "0qr8ysnr6s4ky04qw9qsmysx64a9pvcp7hc5qaps0gffnx127gk5"; + version = "0.6.3.0"; + sha256 = "10zn7xryl60n91xl99dp7zkg3hdkjc8dljc3xdl2k4q75y7xws2i"; libraryHaskellDepends = [ base ]; description = "Concrete functor and monad transformers"; license = lib.licenses.bsd3; @@ -696299,6 +700652,26 @@ self: { } ) { }; + transformers-compat_0_8 = callPackage ( + { + mkDerivation, + base, + transformers, + }: + mkDerivation { + pname = "transformers-compat"; + version = "0.8"; + sha256 = "1a2d3559qybb0xbsg45g36a4vgpqqxvpmlh875vysxwdxr2j2p7h"; + libraryHaskellDepends = [ + base + transformers + ]; + description = "A small compatibility shim for the transformers library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + transformers-compose = callPackage ( { mkDerivation, @@ -698581,8 +702954,8 @@ self: { pname = "trial"; version = "0.0.0.0"; sha256 = "0lnq80983bg2cjim3fy8rwisn55f6acqwp67w7791kzfdwshxkww"; - revision = "5"; - editedCabalFile = "1bsgash3gjvqybfl0n77gw5l1xhidjpm253n4v5dfk7qls6nplm1"; + revision = "6"; + editedCabalFile = "0l2xm4abh9y01c1p0smdvqn31pgcpvvqhq7az5q4gnm2gxsczlbg"; libraryHaskellDepends = [ base colourista @@ -698613,8 +702986,8 @@ self: { pname = "trial-optparse-applicative"; version = "0.0.0.0"; sha256 = "1h8pfznf1dp9z3r2kl2ljgmxxkfp3va9yqba00fyvw85lna2aggn"; - revision = "5"; - editedCabalFile = "0jvl3q2lh134z1r9zq2acpsilbjzpjia3xdh51szp6r708jnlpg1"; + revision = "6"; + editedCabalFile = "03a6d0b8f7279qg2vq1fziy4qw9mxkkhxcs9w3mphyzz4ly5hfdz"; libraryHaskellDepends = [ base optparse-applicative @@ -698637,8 +703010,8 @@ self: { pname = "trial-tomland"; version = "0.0.0.0"; sha256 = "12klfq5ajn4bjrws633pfdc2zhpkwvwmrm7269xfh252fjwk1x23"; - revision = "5"; - editedCabalFile = "1x43dsjqzs1sqfqljwjd96p3p0gcy8gzbafbvvsyi8vrbj6vphpv"; + revision = "6"; + editedCabalFile = "1isp7n96nf4w800ppy37y82pasp3dxvvd9d3vkij8bmj8pb789w2"; libraryHaskellDepends = [ base text @@ -698704,8 +703077,8 @@ self: { pname = "trie-simple"; version = "0.4.4"; sha256 = "16q0a39l5rvssxgbsri1jlcbk65xd9qwwyakxax49h8cii1sdkn7"; - revision = "1"; - editedCabalFile = "1wf5q15j83d87q19a7i78l95x1ban79nlxkgciwa46g96bggvl4c"; + revision = "2"; + editedCabalFile = "18cdkjxdl2gqgilyiy7f95vh7jbg1w57hgya61x6wbqadm3hl69f"; libraryHaskellDepends = [ base containers @@ -699946,8 +704319,8 @@ self: { }: mkDerivation { pname = "ttc"; - version = "1.5.0.0"; - sha256 = "014cfx9fja2w9gln1ljb81n1r1yi8py7hyz2z9kccgwdb99f18b1"; + version = "1.5.0.1"; + sha256 = "0mm3kjrymp6a2kska4an2xn71crd8kscil33lvnfifvvhca4kdav"; libraryHaskellDepends = [ base bytestring @@ -701248,8 +705621,8 @@ self: { }: mkDerivation { pname = "twee"; - version = "2.5"; - sha256 = "16vyccbs05nklzq3vm71s2qh4ahkig8vsmw2lsijlrcma03wffq8"; + version = "2.6.1"; + sha256 = "1gd9drd8h9gam9ry0gasg20lh30316hqs777fl73xhq3drigckvy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -701295,8 +705668,8 @@ self: { }: mkDerivation { pname = "twee-lib"; - version = "2.5"; - sha256 = "0svy129pd9k8ssm332ni950r0i7nj82d11ajcsgk8v4fh17b3xyx"; + version = "2.6.1"; + sha256 = "0s8i926z4096alxrzld8qi2w2px86m2rq78scmsd1m5lqlzv0y40"; libraryHaskellDepends = [ base bytestring @@ -704993,6 +709366,8 @@ self: { pname = "typed-protocols"; version = "1.1.0.1"; sha256 = "1sfcdhvb99yzmzsh63qdvghbjhd5r1g3bi6yyb432pdqnw9i4s9g"; + revision = "1"; + editedCabalFile = "10hvss36prs3mg3xi6czh41ajlbaiwsaq613jacp48d0hh7x7cxq"; libraryHaskellDepends = [ base bytestring @@ -705019,8 +709394,6 @@ self: { doHaddock = false; description = "A framework for strongly typed protocols"; license = lib.licensesSpdx."Apache-2.0"; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -705865,8 +710238,8 @@ self: { }: mkDerivation { pname = "typerep-map"; - version = "0.6.0.0"; - sha256 = "011whbmc9157jw68mgkqxbgngl9zcc478b9fw10w5pkjb01anvz3"; + version = "0.7.0.0"; + sha256 = "13d7hvlzlqihyfc2iqlg16cxlmbfnlgxf4pfn7diapz1h4m7y26s"; libraryHaskellDepends = [ base containers @@ -708824,7 +713197,6 @@ self: { mkDerivation, base, containers, - ghc-prim, one-liner, QuickCheck, random, @@ -708832,23 +713204,20 @@ self: { }: mkDerivation { pname = "unfoldable"; - version = "1.0.1"; - sha256 = "1h1zps55adzhfsfq1bgwc235qywpad9z7rfqid81l4405pi5zw83"; - revision = "1"; - editedCabalFile = "1hl63gcidca977jbjj37vwkd96v4bjgvdpjm8xz33g8jcs7f9a8m"; + version = "1.1"; + sha256 = "0dabyhn3cl1pix2g554jql33n2lpq18lf09r56dqnar01pygmfdv"; + revision = "3"; + editedCabalFile = "1g38gq83gzhbgaxiv4f1j1yil6ascqx8bx37fk9d6g2mcl91qrmc"; libraryHaskellDepends = [ base containers - ghc-prim one-liner QuickCheck random transformers ]; description = "Class of data structures that can be unfolded"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; + license = lib.licensesSpdx."BSD-3-Clause"; } ) { }; @@ -708880,7 +713249,6 @@ self: { ]; description = "An alternative to the Unfoldable typeclass"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -709628,8 +713996,8 @@ self: { pname = "unicode-transforms"; version = "0.4.0.1"; sha256 = "1z29jvli2rqkynfxni1gibl81458j7h8lrb8fg6lpnj8svhy2y1j"; - revision = "8"; - editedCabalFile = "0m2frv6g0hnsjif4acxy6dgfzzxhk7g82s57fcwc3zqsr2sr1i0z"; + revision = "9"; + editedCabalFile = "1vjm2c3f8bhhjd51a5ii1w93jf71fzj5p3nxnnsn1ykjz4ij9lv6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -717660,8 +722028,8 @@ self: { pname = "validation-selective"; version = "0.2.0.0"; sha256 = "11s9qsp5w19lbk6vg6psr3864xdsx2kmx3gcmnn2qkx6wsblx24s"; - revision = "6"; - editedCabalFile = "14m1iwnz026ypqn1xzs5dgsq2jkyxfcam82dbmdidwhviyr7hzbz"; + revision = "7"; + editedCabalFile = "0yd0imzv9h7mq8h6q6rhn341hn6qi4fgi4y3yswrqjfwchr7as4i"; libraryHaskellDepends = [ base deepseq @@ -718216,6 +722584,33 @@ self: { } ) { }; + valor_1_0_0_1 = callPackage ( + { + mkDerivation, + base, + doctest, + hspec, + hspec-discover, + QuickCheck, + }: + mkDerivation { + pname = "valor"; + version = "1.0.0.1"; + sha256 = "0vg7d0p58l592y9b81xq3y56jq53bqld3rb4wyyi9iv9mr9mwcqa"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base + doctest + hspec + QuickCheck + ]; + testToolDepends = [ hspec-discover ]; + description = "Simple and powerful data validation"; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + value-supply = callPackage ( { mkDerivation, base }: mkDerivation { @@ -719817,8 +724212,8 @@ self: { }: mkDerivation { pname = "vector-builder"; - version = "0.3.8.6"; - sha256 = "1zspnyzahxahirx8gvrw5fnn6xnmsb24cm6vd8wldpp3355jdlbx"; + version = "0.3.8.7"; + sha256 = "0lfbbck29y7avf7qvbqkjmvkd6hgb6l4kazld38iynw8hwf37jmi"; libraryHaskellDepends = [ base vector @@ -719832,7 +724227,7 @@ self: { tasty-quickcheck ]; description = "Vector builder"; - license = lib.licenses.mit; + license = lib.licensesSpdx."MIT"; } ) { }; @@ -720211,6 +724606,8 @@ self: { pname = "vector-hashtables"; version = "0.1.2.1"; sha256 = "1cdfvrpnia7bgqaw8yg0n23svbsdz72gss0hrkrvc5rwzxwhz49k"; + revision = "1"; + editedCabalFile = "0745rz7ym5y39n74skq7qw4lf6bg3ysh6k35sj7775zlbd5drp3l"; libraryHaskellDepends = [ base hashable @@ -720794,8 +725191,8 @@ self: { pname = "vector-th-unbox"; version = "0.2.2"; sha256 = "0j81m09xxv24zziv0nanfppckzmas5184jr3npjhc9w49r3cm94a"; - revision = "8"; - editedCabalFile = "1dzn47l5hqs541gjfq09r10rrqxw0wsj727kxkv334lw926npljh"; + revision = "9"; + editedCabalFile = "19ii0sr843crmlrbhysl4byfpkp2nlgd61icshm47gcl5nkcrrp9"; libraryHaskellDepends = [ base template-haskell @@ -720892,8 +725289,8 @@ self: { }: mkDerivation { pname = "vega-view"; - version = "0.4.0.1"; - sha256 = "17sfx8jn8kd6r2ik3iad3zzrpxr7qp4h8aka0jag78h0cpnapz3n"; + version = "0.4.0.2"; + sha256 = "0z8isq3sc9i5q9hihmm6985aynfnl7k8mi0kd8754d08l4x7mm50"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -728076,7 +732473,6 @@ self: { base, base16-bytestring, bytestring, - containers, cryptohash-sha1, directory, expiring-cache-map, @@ -728088,9 +732484,7 @@ self: { http-types, mime-types, mockery, - old-locale, scotty, - semigroups, text, time, wai, @@ -728098,23 +732492,18 @@ self: { }: mkDerivation { pname = "wai-middleware-static"; - version = "0.9.3"; - sha256 = "0ylynnxj8jh99jdg7fddd1zs9358h2m15dizjrz904s3fhls6dp1"; - revision = "1"; - editedCabalFile = "0clzf364cg2rhviidahqlkfcad44yns1x2s71mrgy0ywqvnbca3r"; + version = "0.9.4"; + sha256 = "1p28br8ll417wc56sds8sk11hvjljq47h9swd2bpa8n5vvbdjmfq"; libraryHaskellDepends = [ base base16-bytestring bytestring - containers cryptohash-sha1 directory expiring-cache-map filepath http-types mime-types - old-locale - semigroups text time wai @@ -730353,7 +734742,7 @@ self: { } ) { }; - warp_3_4_11 = callPackage ( + warp_3_4_12 = callPackage ( { mkDerivation, array, @@ -730392,10 +734781,10 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.4.11"; - sha256 = "0cvw9syvvg492ydw1z28rcjhsinfxb53q47rzk6pqg5098rv0955"; + version = "3.4.12"; + sha256 = "10kha4imjn2c86ssqj68xyg5ylns8hiiwpyx0zvadhkjbg9r1k83"; revision = "1"; - editedCabalFile = "04zby3f2d5zg8nvwxj52kqnsq6755d8a3j42lkqrr46i4svigslw"; + editedCabalFile = "0k717j5csxxksrrq08zix7nxp1pgzgrd72m3nhsjps7iqh3lwi74"; libraryHaskellDepends = [ array async @@ -730693,6 +735082,8 @@ self: { pname = "warp-tls"; version = "3.4.13"; sha256 = "0xxcd5202qcvd1jkiaj85gd8r3www3p7mxwf2j92awvg75jh9lsi"; + revision = "1"; + editedCabalFile = "09d5q913kc55i77qj0gfs7w5f4d1da4azp9ddlk112y3hzwkzp3x"; libraryHaskellDepends = [ base bytestring @@ -731354,8 +735745,8 @@ self: { pname = "wave"; version = "0.2.1"; sha256 = "1b8qm9jl453z9pklmqcz13f2abl69ab0j31151gz77l4dgxnnqzl"; - revision = "1"; - editedCabalFile = "1j6ycd1v6c5khkmybzss2vbfm93n28dh1ah8sipqqpd94yqwvdiz"; + revision = "2"; + editedCabalFile = "0s4vhlbkhpa60kq850l76klmizz11vbfg5aj9ffa850dnp57dldr"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base @@ -731831,8 +736222,8 @@ self: { }: mkDerivation { pname = "web-cookiejar"; - version = "0.1.3.0"; - sha256 = "0n8r23nk89hlp5z5zirj2yng818fba39f5yz0l351z7rpx0pi8vy"; + version = "0.1.3.1"; + sha256 = "18r56nw4bb6rjzlxv7aamxwrza956iykg5kv7d4im7rmcn9262f8"; libraryHaskellDepends = [ attoparsec base @@ -732210,7 +736601,6 @@ self: { box, box-socket, bytestring, - doctest-parallel, flatparse, markup-parse, mtl, @@ -732219,7 +736609,6 @@ self: { optparse-applicative, profunctors, scotty, - string-interpolate, text, transformers, unordered-containers, @@ -732229,8 +736618,8 @@ self: { }: mkDerivation { pname = "web-rep"; - version = "0.14.0.0"; - sha256 = "1vjnvsdwjwvlmz1gwrga38wmj4akff3xnh0gjxzbi2hv4vdax7yn"; + version = "0.14.0.1"; + sha256 = "1ws7hyk85jwzpy6dvq7giryq8i3d04xxn4px66jlfg9pi1b1rz1x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -732247,7 +736636,6 @@ self: { optics-extra profunctors scotty - string-interpolate text transformers unordered-containers @@ -732262,10 +736650,6 @@ self: { optics-core optparse-applicative ]; - testHaskellDepends = [ - base - doctest-parallel - ]; description = "representations of a web page"; license = lib.licensesSpdx."BSD-3-Clause"; mainProgram = "web-rep-example"; @@ -734091,6 +738475,75 @@ self: { } ) { }; + webdriver-precore_0_2_0_2 = callPackage ( + { + mkDerivation, + aeson, + aeson-pretty, + base, + base64, + bytestring, + containers, + dhall, + directory, + falsify, + filepath, + ghc, + network, + pretty-show, + raw-strings-qq, + req, + tasty, + tasty-hunit, + text, + time, + unliftio, + vector, + websockets, + }: + mkDerivation { + pname = "webdriver-precore"; + version = "0.2.0.2"; + sha256 = "0f9y56cip577m9i45gvm8dwf98bd5c4l4nx3lnpl3936l671kfh3"; + libraryHaskellDepends = [ + aeson + aeson-pretty + base + bytestring + containers + pretty-show + text + vector + ]; + testHaskellDepends = [ + aeson + base + base64 + bytestring + containers + dhall + directory + falsify + filepath + ghc + network + pretty-show + raw-strings-qq + req + tasty + tasty-hunit + text + time + unliftio + websockets + ]; + doHaddock = false; + description = "A typed wrapper for W3C WebDriver (HTTP and BiDi) protocols"; + license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + webdriver-snoy = callPackage ( { mkDerivation, @@ -736805,7 +741258,7 @@ self: { } ) { }; - what4_1_7_2 = callPackage ( + what4_1_7_3 = callPackage ( { mkDerivation, async, @@ -736867,8 +741320,8 @@ self: { }: mkDerivation { pname = "what4"; - version = "1.7.2"; - sha256 = "0mb9r3mzh3zmd8bs0d9km42xnqcxx2cbn8wmavbpklb9vmv6g3wi"; + version = "1.7.3"; + sha256 = "0q87hbrmgjz0qhhx938b5iqzfj4pp0pyxb3jsrd6b04s15qz6zqp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -737398,10 +741851,8 @@ self: { }: mkDerivation { pname = "wide-word"; - version = "0.1.8.1"; - sha256 = "0jisg5y3rxcqwd3kgdvcmz5awwcgzdhdkl768llhh388kp64mjcy"; - revision = "1"; - editedCabalFile = "164049ll7rxddxsw5ly8jcbhfmb7gywwrspw63cfwng20hsfqc0y"; + version = "0.1.9.0"; + sha256 = "1x4a42swszpfspqkdlfj1k7ifq1ia5ih3fmgmna74zbfajxwkpa6"; libraryHaskellDepends = [ base binary @@ -737970,8 +742421,8 @@ self: { }: mkDerivation { pname = "wild-bind"; - version = "0.1.2.13"; - sha256 = "03r1a233d6vq6z5pd6lsxf738kna4r369301xr5blyjnj46h0dp1"; + version = "0.1.2.14"; + sha256 = "0hypj27387bnvlad61pk0frsi05lkxjylmifj8jz1qa9j72cb9y7"; libraryHaskellDepends = [ base containers @@ -738008,8 +742459,8 @@ self: { }: mkDerivation { pname = "wild-bind-indicator"; - version = "1.0.0.3"; - sha256 = "0ihvskd09gmrf376m5bih5ywhixpj9bsssa7b8k7r7yw1q27iasy"; + version = "1.0.0.4"; + sha256 = "1dlz91p9wb43qxagg0j24q3lm1yqxq2yx5k7jwfjm6qwwc459f3l"; enableSeparateDataOutput = true; libraryHaskellDepends = [ async @@ -738041,8 +742492,8 @@ self: { }: mkDerivation { pname = "wild-bind-task-x11"; - version = "0.2.0.5"; - sha256 = "0za92w5yfbp6xyzr0q7ql1i62vafgh5kgqchq7grmqvb4hcq45fl"; + version = "0.2.0.6"; + sha256 = "00is35zrcj878n5pyxkck4jyhrjs24q521vs5d7y5fl7q00l972f"; libraryHaskellDepends = [ base text @@ -738078,8 +742529,8 @@ self: { }: mkDerivation { pname = "wild-bind-x11"; - version = "0.2.0.17"; - sha256 = "119pd6bajvgv09vfn0rhcssqzqyh570hvdjyd1vby6fvhykymmvs"; + version = "0.2.0.18"; + sha256 = "168zb4s79xrf92b0f46zhywvkn6865wv2cb2k8lpvkj9s02hmsj8"; libraryHaskellDepends = [ base containers @@ -738668,8 +743119,8 @@ self: { }: mkDerivation { pname = "witch"; - version = "1.3.0.6"; - sha256 = "03sx7514g375gc9fdn4439zp967g7ysq94xp7lki5rlbj8rjid1l"; + version = "1.3.0.9"; + sha256 = "05a2fn013qcyqcj4mb2qz79rv59ajwz06dn39m6iw3k7d9vwn9cv"; libraryHaskellDepends = [ base bytestring @@ -742753,8 +747204,8 @@ self: { }: mkDerivation { pname = "wuss"; - version = "2.0.2.5"; - sha256 = "1ipr57cndcn1wnvd0j4b0x0f271kzy1gg049qwi397r9flrmh157"; + version = "2.0.2.7"; + sha256 = "042pnniwn4kyb4d29zdh0284l497r1x393y5yw6jgigkvpdmpddb"; libraryHaskellDepends = [ base bytestring @@ -743180,6 +747631,60 @@ self: { } ) { }; + wyvern-diagrams = callPackage ( + { + mkDerivation, + array, + base, + colour, + containers, + diagrams-lib, + diagrams-svg, + HUnit, + MissingH, + optparse-applicative, + text, + unordered-containers, + }: + mkDerivation { + pname = "wyvern-diagrams"; + version = "0.3.2.0"; + sha256 = "0adpl9g87hn8ak29lakjzp2syhk3kaa23sxgwlgh0424fn8jms7f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array + base + colour + containers + diagrams-lib + diagrams-svg + MissingH + optparse-applicative + text + unordered-containers + ]; + executableHaskellDepends = [ + array + base + diagrams-lib + diagrams-svg + optparse-applicative + ]; + testHaskellDepends = [ + base + containers + diagrams-lib + HUnit + ]; + description = "Simple flowchart diagrams. Inspired by DRAKON."; + license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + mainProgram = "wyvern-diagrams"; + broken = true; + } + ) { }; + x-dsp = callPackage ( { mkDerivation, @@ -743385,6 +747890,49 @@ self: { } ) { }; + x509-ocsp_0_4_1_0 = callPackage ( + { + mkDerivation, + base, + bytestring, + cryptohash-sha1, + crypton-asn1-encoding, + crypton-asn1-types, + crypton-pem, + crypton-x509, + crypton-x509-validation, + HUnit, + }: + mkDerivation { + pname = "x509-ocsp"; + version = "0.4.1.0"; + sha256 = "1yqggigc9anfmkpfg179i7mzh0jk9nyqrsw6kxhgl0qmrgmfh2jc"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base + bytestring + cryptohash-sha1 + crypton-asn1-encoding + crypton-asn1-types + crypton-x509 + crypton-x509-validation + ]; + testHaskellDepends = [ + base + bytestring + crypton-asn1-encoding + crypton-asn1-types + crypton-pem + crypton-x509 + crypton-x509-validation + HUnit + ]; + description = "Basic X509 OCSP implementation"; + license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + x509-store = callPackage ( { mkDerivation, @@ -748036,8 +752584,10 @@ self: { }: mkDerivation { pname = "xnobar"; - version = "1.0.0.0"; - sha256 = "0rf3308wiy2ilssshrv9y5w55rrhw0nxjgdq39scc78562dw7z2l"; + version = "1.0.0.1"; + sha256 = "0y8hf0vq0wvg1g3s00i7wdq5vjdv044bhh38lyzvcvj0fxn4b5k7"; + revision = "1"; + editedCabalFile = "106sd5sqv9lf61zm6hlifn36qhsgs0sv60gr6lqv4d0ya2hxbich"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -748067,7 +752617,7 @@ self: { license = lib.licensesSpdx."BSD-3-Clause"; badPlatforms = lib.platforms.darwin; hydraPlatforms = lib.platforms.none; - mainProgram = "Echo"; + mainProgram = "echo"; broken = true; } ) { }; @@ -748752,8 +753302,8 @@ self: { }: mkDerivation { pname = "xstatic-th"; - version = "0.1.0"; - sha256 = "06vl6mf6jqgvzbhgq496swydl9xk4k37n6d0qzgi349j1235yiw9"; + version = "0.1.1"; + sha256 = "0fy7w22zvzd16ygczq6rw26j9dvxibgxqwsbxlj1x4h50c1a0r5c"; libraryHaskellDepends = [ base bytestring @@ -748994,8 +753544,8 @@ self: { pname = "xz"; version = "5.6.3"; sha256 = "15450bmpbka14ykajr38aj8lyilg0vxsrhsdlq20a9zg63ppvc4d"; - revision = "1"; - editedCabalFile = "0a71h34i6bqywmsnhxqp8sya2q61lm6wdrfrjhg9hgnjkc09pkz2"; + revision = "2"; + editedCabalFile = "192ik7g7afjpzkvsh4wfkvg98c6b1zdysvzpk9byqp1m0k0zipka"; libraryHaskellDepends = [ base bytestring @@ -749012,8 +753562,6 @@ self: { ]; description = "LZMA/XZ compression and decompression"; license = lib.licensesSpdx."BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { inherit (pkgs) xz; }; @@ -749021,8 +753569,8 @@ self: { { mkDerivation }: mkDerivation { pname = "xz-clib"; - version = "5.8.1"; - sha256 = "0cycldc04ffkm5kvhb9x9mjgcw9vhzlbh34idpapv9bin9b594ic"; + version = "5.8.2"; + sha256 = "0q9cwdbqvc8i337gp9wmxbb79v8i2lasi39i92r42202m7mzsa79"; doHaddock = false; description = "LZMA/XZ clibs"; license = lib.licensesSpdx."0BSD"; @@ -750949,8 +755497,8 @@ self: { }: mkDerivation { pname = "yaml-unscrambler"; - version = "0.1.0.20"; - sha256 = "0s73nmvmnd1gn7hvmcbpvg1l10vwlzb5xfg7ljiwbp1dsfmqyzkw"; + version = "0.1.0.21"; + sha256 = "1i8jddnrbxywp9lvb77cpl1027kd1vm9qpn5i1226cz2x6pzdz1j"; libraryHaskellDepends = [ acc attoparsec @@ -751171,6 +755719,8 @@ self: { pname = "yampa-canvas"; version = "0.2.4"; sha256 = "0v5n5xzpp94w6ib10zq67z1b3rz1r8zha7ryd7a34lannnrd1kz1"; + revision = "1"; + editedCabalFile = "1qpxh5lf4r692hqqijz9998mcp7c9n2451mdl1hkn23d5impz3w5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -751182,8 +755732,6 @@ self: { ]; description = "blank-canvas frontend for Yampa"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -751992,6 +756540,57 @@ self: { } ) { }; + yaya_0_7_0_0 = callPackage ( + { + mkDerivation, + base, + Cabal, + cabal-doctest, + comonad, + doctest, + either, + free, + kan-extensions, + lens, + profunctors, + strict, + template-haskell, + th-abstraction, + transformers, + }: + mkDerivation { + pname = "yaya"; + version = "0.7.0.0"; + sha256 = "10lf9pqmmvy1g7y8zvf9mxy33zanfngcqmgsrizm8mzvwnnq95hl"; + setupHaskellDepends = [ + base + Cabal + cabal-doctest + ]; + libraryHaskellDepends = [ + base + comonad + either + free + kan-extensions + lens + profunctors + strict + template-haskell + th-abstraction + transformers + ]; + testHaskellDepends = [ + base + doctest + ]; + description = "Total recursion schemes"; + license = "(AGPL-3.0-only WITH Universal-FOSS-exception-1.0 OR LicenseRef-commercial)"; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.sellout ]; + } + ) { }; + yaya-containers = callPackage ( { mkDerivation, @@ -752026,6 +756625,41 @@ self: { } ) { }; + yaya-containers_0_2_0_0 = callPackage ( + { + mkDerivation, + base, + Cabal, + cabal-doctest, + containers, + doctest, + yaya, + }: + mkDerivation { + pname = "yaya-containers"; + version = "0.2.0.0"; + sha256 = "1wmmylwaqy9yw1v719qj590c9yzncnrzmkc6gshh3khadc7y9ida"; + setupHaskellDepends = [ + base + Cabal + cabal-doctest + ]; + libraryHaskellDepends = [ + base + containers + yaya + ]; + testHaskellDepends = [ + base + doctest + ]; + description = "Pattern functors and instances for types in the containers package"; + license = "(AGPL-3.0-only WITH Universal-FOSS-exception-1.0 OR LicenseRef-commercial)"; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.sellout ]; + } + ) { }; + yaya-hedgehog = callPackage ( { mkDerivation, @@ -752065,6 +756699,46 @@ self: { } ) { }; + yaya-hedgehog_0_4_0_0 = callPackage ( + { + mkDerivation, + base, + Cabal, + cabal-doctest, + deriving-compat, + doctest, + hedgehog, + yaya, + }: + mkDerivation { + pname = "yaya-hedgehog"; + version = "0.4.0.0"; + sha256 = "116s0ddwhxjgkm3i02njbzw47p2kl4mi133cri7vn2d9z8xrnbhp"; + setupHaskellDepends = [ + base + Cabal + cabal-doctest + ]; + libraryHaskellDepends = [ + base + deriving-compat + hedgehog + yaya + ]; + testHaskellDepends = [ + base + deriving-compat + doctest + hedgehog + yaya + ]; + description = "Hedgehog testing support for the Yaya recursion scheme library"; + license = "(AGPL-3.0-only WITH Universal-FOSS-exception-1.0 OR LicenseRef-commercial)"; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.sellout ]; + } + ) { }; + yaya-quickcheck = callPackage ( { mkDerivation, @@ -752099,6 +756773,41 @@ self: { } ) { }; + yaya-quickcheck_0_3_0_0 = callPackage ( + { + mkDerivation, + base, + Cabal, + cabal-doctest, + doctest, + QuickCheck, + yaya, + }: + mkDerivation { + pname = "yaya-quickcheck"; + version = "0.3.0.0"; + sha256 = "1ffpvya09br090bzn4znl28a60nhm2amsx6k7i0crn2qa7253nlm"; + setupHaskellDepends = [ + base + Cabal + cabal-doctest + ]; + libraryHaskellDepends = [ + base + QuickCheck + yaya + ]; + testHaskellDepends = [ + base + doctest + ]; + description = "QuickCheck testing support for the Yaya recursion scheme library"; + license = "(AGPL-3.0-only WITH Universal-FOSS-exception-1.0 OR LicenseRef-commercial)"; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.sellout ]; + } + ) { }; + yaya-test = callPackage ( { mkDerivation, @@ -752171,6 +756880,50 @@ self: { } ) { }; + yaya-unsafe_0_5_0_0 = callPackage ( + { + mkDerivation, + base, + Cabal, + cabal-doctest, + comonad, + doctest, + free, + hedgehog, + lens, + yaya, + yaya-hedgehog, + }: + mkDerivation { + pname = "yaya-unsafe"; + version = "0.5.0.0"; + sha256 = "1as1gik8dm2n06d4dnx019wpsmhblvpn69x03lfhgb11cr03x21a"; + setupHaskellDepends = [ + base + Cabal + cabal-doctest + ]; + libraryHaskellDepends = [ + base + comonad + free + lens + yaya + ]; + testHaskellDepends = [ + base + doctest + hedgehog + yaya + yaya-hedgehog + ]; + description = "Non-total extensions to the Yaya recursion scheme library"; + license = "(AGPL-3.0-only WITH Universal-FOSS-exception-1.0 OR LicenseRef-commercial)"; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.sellout ]; + } + ) { }; + yaya-unsafe-test = callPackage ( { mkDerivation, @@ -752893,7 +757646,7 @@ self: { conduit, conduit-extra, containers, - cryptonite, + crypton, data-default, email-validate, file-embed, @@ -752922,8 +757675,8 @@ self: { }: mkDerivation { pname = "yesod-auth"; - version = "1.6.11.3"; - sha256 = "1qfzg4khdzrhzq78323648780divjllqrxn9hhzpnis61f0fwni8"; + version = "1.6.12.0"; + sha256 = "0z3b7qc4cinzmhksspzhm33v1kvnqjv07dg52mm8pld0j645f922"; libraryHaskellDepends = [ aeson attoparsec-aeson @@ -752939,7 +757692,7 @@ self: { conduit conduit-extra containers - cryptonite + crypton data-default email-validate file-embed @@ -753809,6 +758562,68 @@ self: { } ) { }; + yesod-auth-oauth2_0_8_0_0 = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + crypton, + errors, + hoauth2, + hspec, + http-client, + http-conduit, + http-types, + memory, + microlens, + mtl, + safe-exceptions, + text, + transformers, + unliftio, + uri-bytestring, + yesod-auth, + yesod-core, + }: + mkDerivation { + pname = "yesod-auth-oauth2"; + version = "0.8.0.0"; + sha256 = "1wb4g4mlwfavj3fjzy7ss5spz154mdgy72lzilca7fnyw612fnw3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + base + bytestring + crypton + errors + hoauth2 + http-client + http-conduit + http-types + memory + microlens + mtl + safe-exceptions + text + transformers + unliftio + uri-bytestring + yesod-auth + yesod-core + ]; + testHaskellDepends = [ + base + hspec + uri-bytestring + ]; + description = "OAuth 2.0 authentication plugins"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + } + ) { }; + yesod-auth-oidc = callPackage ( { mkDerivation, @@ -754022,7 +758837,6 @@ self: { description = "Traditional email/pass auth for Yesod"; license = lib.licensesSpdx."BSD-3-Clause"; platforms = lib.platforms.x86; - hydraPlatforms = lib.platforms.none; mainProgram = "yesod-auth-simple-test"; } ) { }; @@ -757315,8 +762129,8 @@ self: { bytestring, conduit, containers, - cryptonite, - cryptonite-conduit, + crypton, + crypton-conduit, css-text, data-default, directory, @@ -757344,8 +762158,8 @@ self: { }: mkDerivation { pname = "yesod-static"; - version = "1.6.1.0"; - sha256 = "18f5hm9ncvkzl8bkn39cg841z0k5iqs5w45afsyk9y6k98pjd54p"; + version = "1.6.1.2"; + sha256 = "0xp3fa310zsmamnmfzwjf8hgyp0z4csxd06yjxinzy5rnry781dp"; libraryHaskellDepends = [ async attoparsec @@ -757355,8 +762169,8 @@ self: { bytestring conduit containers - cryptonite - cryptonite-conduit + crypton + crypton-conduit css-text data-default directory @@ -757384,8 +762198,8 @@ self: { bytestring conduit containers - cryptonite - cryptonite-conduit + crypton + crypton-conduit data-default directory file-embed @@ -757730,7 +762544,7 @@ self: { } ) { }; - yesod-test_1_6_23 = callPackage ( + yesod-test_1_7_0_1 = callPackage ( { mkDerivation, aeson, @@ -757769,8 +762583,8 @@ self: { }: mkDerivation { pname = "yesod-test"; - version = "1.6.23"; - sha256 = "1bisgnvfda16ryg9npdn4s041z7vvvgdmpkq9wqwccpw4vwylklv"; + version = "1.7.0.1"; + sha256 = "1mkzccbzmj83fr8jf31q6qhdia01m24sr8iayb6jj6p1wfwspsk3"; libraryHaskellDepends = [ aeson attoparsec @@ -759475,39 +764289,42 @@ self: { bytestring, containers, hspec, - hspec-discover, - mtl, optparse-applicative, random, + text, + transformers, yaml, }: mkDerivation { pname = "yiyd"; - version = "1.0.1"; - sha256 = "15rf8mgd938pdqn88cyc77wr8gs1siqz78g7f657wcq49sksypl0"; - isLibrary = false; + version = "1.1.0"; + sha256 = "03q7yal8byxpndf9563f0zkxq9r3iwavcdcsyrfim7n224in5fk1"; + isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; - executableHaskellDepends = [ + libraryHaskellDepends = [ base bytestring containers - mtl + random + text + transformers + yaml + ]; + executableHaskellDepends = [ + base + bytestring optparse-applicative random - yaml + text ]; testHaskellDepends = [ base bytestring - containers hspec - mtl - optparse-applicative random - yaml + text ]; - testToolDepends = [ hspec-discover ]; license = lib.licensesSpdx."GPL-3.0-only"; mainProgram = "yiyd"; } @@ -762251,6 +767068,8 @@ self: { pname = "zip"; version = "2.2.1"; sha256 = "1wq0nl034b2nknd627adzffj6rymykvkdn5b0smydcv5wp7i6p6j"; + revision = "2"; + editedCabalFile = "12g22anj0qqa8n44icyh6jmxf5pqwqa1vb2cs7y7q625j40hpfrs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -763798,8 +768617,8 @@ self: { }: mkDerivation { pname = "ztail"; - version = "1.2.0.3"; - sha256 = "0chxsaivxfxphcwzkwyzc7px6lrf5vkr4d7rbd909j4n96293hha"; + version = "1.2.0.4"; + sha256 = "04s5qw25vr32rpbbxknddf4bakwbd2g4yai3s1000mfnrhx3k4zg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -764234,8 +769053,8 @@ self: { }: mkDerivation { pname = "zxcvbn-hs"; - version = "0.3.6"; - sha256 = "14bpsn5q6dsd7bn0rnhp8rsw6hqixn9ywckzlpg39ghld3yqi73h"; + version = "0.3.8"; + sha256 = "0inf1lc74jlbmj06njx3w78pnzx98z03xkffaybz9dl652fmbwgl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -764313,9 +769132,7 @@ self: { ]; description = "Password strength estimation based on zxcvbn"; license = lib.licensesSpdx."MIT"; - hydraPlatforms = lib.platforms.none; mainProgram = "zxcvbn-example"; - broken = true; } ) { }; diff --git a/pkgs/development/haskell-modules/replacements-by-name/cabal-pkg-config-version-hook.nix b/pkgs/development/haskell-modules/replacements-by-name/cabal-pkg-config-version-hook.nix deleted file mode 100644 index 0381063b1689..000000000000 --- a/pkgs/development/haskell-modules/replacements-by-name/cabal-pkg-config-version-hook.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ - mkDerivation, - base, - Cabal, - containers, - lens, - lib, - process, -}: -mkDerivation { - pname = "cabal-pkg-config-version-hook"; - version = "0.1.1.0"; - sha256 = "18l87dcq2854vqchg21bvv85sdm4126nbk8sj9ilr5819qslk26f"; - libraryHaskellDepends = [ - base - Cabal - containers - lens - process - ]; - homepage = "https://github.com/hercules-ci/hercules-ci-agent/tree/master/cabal-pkg-config-version-hook#readme"; - description = "Make Cabal aware of pkg-config package versions"; - license = lib.licensesSpdx."BSD-3-Clause"; -} diff --git a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-agent.nix b/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-agent.nix deleted file mode 100644 index ff02b6fb32d2..000000000000 --- a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-agent.nix +++ /dev/null @@ -1,255 +0,0 @@ -{ - mkDerivation, - aeson, - async, - attoparsec, - base, - base64-bytestring, - bifunctors, - binary, - binary-conduit, - boost, - bytestring, - Cabal, - cabal-pkg-config-version-hook, - cachix, - cachix-api, - conduit, - conduit-extra, - containers, - directory, - dlist, - exceptions, - file-embed, - filepath, - hercules-ci-api, - hercules-ci-api-agent, - hercules-ci-api-core, - hercules-ci-cnix-expr, - hercules-ci-cnix-store, - hostname, - hspec, - hspec-discover, - http-client, - http-client-tls, - http-conduit, - HUnit, - inline-c, - inline-c-cpp, - katip, - lens, - lens-aeson, - lib, - lifted-async, - lifted-base, - monad-control, - mtl, - network, - network-uri, - nix, - optparse-applicative, - process, - process-extras, - profunctors, - protolude, - QuickCheck, - safe-exceptions, - scientific, - servant, - servant-auth-client, - servant-client, - servant-client-core, - stm, - tagged, - temporary, - text, - time, - tls, - tomland, - transformers, - transformers-base, - unbounded-delays, - unix, - unliftio, - unliftio-core, - unordered-containers, - uuid, - vector, - websockets, - wuss, -}: -mkDerivation { - pname = "hercules-ci-agent"; - version = "0.10.8"; - sha256 = "0f8d5xfix0bsxdvanf6zn1l2qs80aivva86qf3j1clfr2dny4g59"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ - base - Cabal - cabal-pkg-config-version-hook - ]; - libraryHaskellDepends = [ - aeson - async - base - binary - binary-conduit - bytestring - conduit - containers - directory - dlist - exceptions - file-embed - filepath - hercules-ci-api-agent - hercules-ci-api-core - hercules-ci-cnix-expr - hercules-ci-cnix-store - katip - lens - lens-aeson - lifted-async - lifted-base - monad-control - mtl - network - network-uri - process - process-extras - protolude - safe-exceptions - stm - tagged - temporary - text - time - tls - transformers - transformers-base - unbounded-delays - unix - unliftio - unliftio-core - uuid - vector - websockets - wuss - ]; - executableHaskellDepends = [ - aeson - async - attoparsec - base - base64-bytestring - bifunctors - binary - binary-conduit - bytestring - cachix - cachix-api - conduit - conduit-extra - containers - directory - dlist - exceptions - filepath - hercules-ci-api - hercules-ci-api-agent - hercules-ci-api-core - hercules-ci-cnix-expr - hercules-ci-cnix-store - hostname - http-client - http-client-tls - http-conduit - inline-c - inline-c-cpp - katip - lens - lens-aeson - lifted-async - lifted-base - monad-control - mtl - network - network-uri - optparse-applicative - process - process-extras - profunctors - protolude - safe-exceptions - scientific - servant - servant-auth-client - servant-client - servant-client-core - stm - temporary - text - time - tomland - transformers - transformers-base - unix - unliftio - unliftio-core - unordered-containers - uuid - vector - websockets - wuss - ]; - executableSystemDepends = [ boost ]; - executablePkgconfigDepends = [ nix ]; - testHaskellDepends = [ - aeson - async - attoparsec - base - bifunctors - binary - binary-conduit - bytestring - conduit - containers - exceptions - filepath - hercules-ci-api-agent - hercules-ci-api-core - hercules-ci-cnix-store - hspec - HUnit - katip - lens - lens-aeson - lifted-async - lifted-base - monad-control - mtl - process - profunctors - protolude - QuickCheck - safe-exceptions - scientific - stm - tagged - temporary - text - tomland - transformers - transformers-base - unliftio-core - unordered-containers - uuid - vector - ]; - testToolDepends = [ hspec-discover ]; - homepage = "https://docs.hercules-ci.com"; - description = "Runs Continuous Integration tasks on your machines"; - license = lib.licensesSpdx."Apache-2.0"; -} diff --git a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cli.nix b/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cli.nix deleted file mode 100644 index e06ec7fbfc1e..000000000000 --- a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cli.nix +++ /dev/null @@ -1,132 +0,0 @@ -{ - mkDerivation, - aeson, - aeson-pretty, - async, - atomic-write, - attoparsec, - base, - bytestring, - conduit, - containers, - data-has, - directory, - exceptions, - filepath, - hercules-ci-agent, - hercules-ci-api, - hercules-ci-api-agent, - hercules-ci-api-core, - hercules-ci-cnix-expr, - hercules-ci-cnix-store, - hercules-ci-optparse-applicative, - hostname, - hspec, - http-client, - http-client-tls, - http-types, - inline-c-cpp, - katip, - lens, - lens-aeson, - lib, - lifted-base, - monad-control, - network-uri, - process, - protolude, - QuickCheck, - retry, - rio, - safe-exceptions, - servant, - servant-auth-client, - servant-client, - servant-client-core, - servant-conduit, - temporary, - text, - tls, - transformers, - transformers-base, - unix, - unliftio, - unliftio-core, - unordered-containers, - uuid, -}: -mkDerivation { - pname = "hercules-ci-cli"; - version = "0.3.9"; - sha256 = "091j83ac4byr6vbmd0wq1b86p23d1z7sn5ls6w24l72dp8fvfjjp"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson - aeson-pretty - async - atomic-write - attoparsec - base - bytestring - conduit - containers - data-has - directory - exceptions - filepath - hercules-ci-agent - hercules-ci-api - hercules-ci-api-agent - hercules-ci-api-core - hercules-ci-cnix-expr - hercules-ci-cnix-store - hercules-ci-optparse-applicative - hostname - http-client - http-client-tls - http-types - inline-c-cpp - katip - lens - lens-aeson - lifted-base - monad-control - network-uri - process - protolude - retry - rio - safe-exceptions - servant - servant-auth-client - servant-client - servant-client-core - servant-conduit - temporary - text - tls - transformers - transformers-base - unix - unliftio - unliftio-core - unordered-containers - uuid - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - aeson - base - bytestring - containers - hspec - protolude - QuickCheck - unordered-containers - ]; - homepage = "https://docs.hercules-ci.com"; - description = "The hci command for working with Hercules CI"; - license = lib.licenses.asl20; - mainProgram = "hci"; -} diff --git a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-expr.nix b/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-expr.nix deleted file mode 100644 index 90ad7e7240a5..000000000000 --- a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-expr.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ - mkDerivation, - aeson, - base, - boost, - bytestring, - Cabal, - cabal-pkg-config-version-hook, - conduit, - containers, - directory, - exceptions, - filepath, - hercules-ci-cnix-store, - hspec, - hspec-discover, - inline-c, - inline-c-cpp, - lib, - nix, - process, - protolude, - QuickCheck, - scientific, - temporary, - text, - unliftio, - unordered-containers, - vector, -}: -mkDerivation { - pname = "hercules-ci-cnix-expr"; - version = "0.5.1.0"; - sha256 = "01m6l915yy3v6qpc53xq48kp3mi39bclsjdwswvgwvp9z9hjvg0p"; - setupHaskellDepends = [ - base - Cabal - cabal-pkg-config-version-hook - ]; - libraryHaskellDepends = [ - aeson - base - bytestring - conduit - containers - directory - exceptions - filepath - hercules-ci-cnix-store - inline-c - inline-c-cpp - protolude - scientific - text - unliftio - unordered-containers - vector - ]; - librarySystemDepends = [ boost ]; - libraryPkgconfigDepends = [ nix ]; - testHaskellDepends = [ - aeson - base - bytestring - containers - filepath - hercules-ci-cnix-store - hspec - process - protolude - QuickCheck - scientific - temporary - text - unordered-containers - vector - ]; - testToolDepends = [ hspec-discover ]; - homepage = "https://docs.hercules-ci.com"; - description = "Bindings for the Nix evaluator"; - license = lib.licensesSpdx."Apache-2.0"; -} diff --git a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-store.nix b/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-store.nix deleted file mode 100644 index 7fd0763154ea..000000000000 --- a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-store.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - mkDerivation, - base, - boost, - bytestring, - Cabal, - cabal-pkg-config-version-hook, - conduit, - containers, - exceptions, - hspec, - hspec-discover, - inline-c, - inline-c-cpp, - lib, - nix, - protolude, - template-haskell, - temporary, - text, - unix, - unliftio-core, - vector, -}: -mkDerivation { - pname = "hercules-ci-cnix-store"; - version = "0.4.1.0"; - sha256 = "0jy7p69jhv81rg8xikd7smgpg3vwccjzly3k8hs7ipdp2mprwffc"; - setupHaskellDepends = [ - base - Cabal - cabal-pkg-config-version-hook - ]; - libraryHaskellDepends = [ - base - bytestring - conduit - containers - inline-c - inline-c-cpp - protolude - template-haskell - unix - unliftio-core - vector - ]; - librarySystemDepends = [ boost ]; - libraryPkgconfigDepends = [ nix ]; - testHaskellDepends = [ - base - bytestring - containers - exceptions - hspec - inline-c - inline-c-cpp - protolude - temporary - text - ]; - testToolDepends = [ hspec-discover ]; - homepage = "https://docs.hercules-ci.com"; - description = "Haskell bindings for Nix's libstore"; - license = lib.licensesSpdx."Apache-2.0"; -} diff --git a/pkgs/development/interpreters/lua-5/build-luarocks-package.nix b/pkgs/development/interpreters/lua-5/build-luarocks-package.nix index 2c7450aa40d2..d17547eff73a 100644 --- a/pkgs/development/interpreters/lua-5/build-luarocks-package.nix +++ b/pkgs/development/interpreters/lua-5/build-luarocks-package.nix @@ -88,6 +88,7 @@ let inherit rockspecVersion; __structuredAttrs = true; + strictDeps = true; env = { LUAROCKS_CONFIG = self.configFile; } @@ -99,7 +100,8 @@ let lua # for lua.h wrapLua luarocks_bootstrap - ]; + ] + ++ lib.optionals self.doCheck self.nativeCheckInputs; inherit doCheck @@ -115,10 +117,7 @@ let # example externalDeps': [ { name = "CRYPTO"; dep = pkgs.openssl; } ] externalDeps' = lib.filter (dep: !lib.isDerivation dep) self.externalDeps; in - [ luarocks_bootstrap ] - ++ buildInputs - ++ lib.optionals self.doCheck ([ luarocksCheckHook ] ++ self.nativeCheckInputs) - ++ (map (d: d.dep) externalDeps'); + [ luarocks_bootstrap ] ++ buildInputs ++ (map (d: d.dep) externalDeps'); # propagate lua to active setup-hook in nix-shell propagatedBuildInputs = propagatedBuildInputs ++ [ lua ]; @@ -227,12 +226,6 @@ let runHook postInstall ''; - checkPhase = '' - runHook preCheck - luarocks test - runHook postCheck - ''; - shellHook = '' runHook preShell export LUAROCKS_CONFIG="$PWD/${luarocks_config}"; diff --git a/pkgs/development/interpreters/lua-5/hooks/busted-check-hook.sh b/pkgs/development/interpreters/lua-5/hooks/busted-check-hook.sh new file mode 100644 index 000000000000..e8de6f0af522 --- /dev/null +++ b/pkgs/development/interpreters/lua-5/hooks/busted-check-hook.sh @@ -0,0 +1,24 @@ +# hook for running busted +# shellcheck shell=bash +echo "Sourcing busted-check-hook.sh" + +bustedCheckPhase () { + echo "Executing bustedCheckPhase" + runHook preCheck + + if command -v nlua && [ -z "${bustedNoNlua-}" ]; then + bustedFlags+=("--lua=nlua") + fi + + busted "${bustedFlags[@]}" + + runHook postCheck + echo "Finished executing bustedCheckPhase" +} + +if [ -z "${dontBustedCheck-}" ] && [ -z "${checkPhase-}" ]; then + echo "Using bustedCheckPhase" + checkPhase+=" bustedCheckPhase" +fi + + diff --git a/pkgs/development/interpreters/lua-5/hooks/default.nix b/pkgs/development/interpreters/lua-5/hooks/default.nix index 9f7396f2a518..318564ba52b1 100644 --- a/pkgs/development/interpreters/lua-5/hooks/default.nix +++ b/pkgs/development/interpreters/lua-5/hooks/default.nix @@ -8,6 +8,19 @@ let callPackage = lua.pkgs.callPackage; in { + /** + Accepts "bustedFlags" as an array. + You can customize the call by setting "bustedFlags" and prevent the test from running by setting "dontBustedCheck" + */ + bustedCheckHook = callPackage ( + { busted }: + makeSetupHook { + name = "busted-check-hook"; + propagatedBuildInputs = [ + busted + ]; + } ./busted-check-hook.sh + ) { }; luarocksCheckHook = callPackage ( { luarocks }: diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix index 05272e980b4f..c4fc149074ee 100644 --- a/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/pkgs/development/interpreters/lua-5/interpreter.nix @@ -31,10 +31,10 @@ stdenv.mkDerivation ( luaversion = lib.versions.majorMinor finalAttrs.version; plat = - if (stdenv.hostPlatform.isLinux && lib.versionOlder self.luaversion "5.4") then - "linux" - else if (stdenv.hostPlatform.isLinux && self.luaversion == "5.4") then + if (stdenv.hostPlatform.isLinux && self.luaversion == "5.4") then "linux-readline" + else if stdenv.hostPlatform.isLinux then + "linux" else if stdenv.hostPlatform.isDarwin then "macosx" else if stdenv.hostPlatform.isMinGW then diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 68077e4dce2e..c4325a4494f5 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -152,8 +152,6 @@ let passthru = let - # When we override the interpreter we also need to override the spliced versions of the interpreter - inputs' = lib.filterAttrs (n: v: n != "passthruFun" && !lib.isDerivation v) inputs; # Memoization of the splices to avoid re-evaluating this function for all combinations of splices e.g. # python3.pythonOnBuildForHost.pythonOnBuildForTarget == python3.pythonOnBuildForTarget by consuming # __splices as an arg and using the cache if populated. @@ -170,13 +168,9 @@ let override = attr: let - python = attr.override ( - inputs' - // { - self = python; - __splices = splices; - } - ); + python = attr.override { + self = python; + }; in python; in diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index dcefe50b516d..2f97f6fbc6f0 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 = "11"; + patch = "12"; suffix = ""; }; - hash = "sha256-Fu3nu3zb+oldEbBkL6DlI/KR5khxlNU89tOzOMOhfqI="; + hash = "sha256-KoTNMd2Njqiq/3XeZvwbSwEn3VeZqlCmSumjE4hbRZM="; }; }; @@ -79,10 +79,10 @@ sourceVersion = { major = "3"; minor = "14"; - patch = "2"; + patch = "3"; suffix = ""; }; - hash = "sha256-zlQ6uFS8JWthtx6bJ/gx/9G/1gpHnWOfi+f5dXz1c+k="; + hash = "sha256-qX1VSemtgf4XFZ7QLGh3StXSZscvjZoLWpw3H+hdkCs="; inherit passthruFun; }; diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 2a04623cdee5..1c2106cefae2 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -278,6 +278,14 @@ lib.extendMkDerivation { name = namePrefix + attrs.name or "${finalAttrs.pname}-${finalAttrs.version}"; + runtimeDepsCheckHook = + if isBootstrapPackage then + pythonRuntimeDepsCheckHook.override { + inherit (python.pythonOnBuildForHost.pkgs.bootstrap) packaging; + } + else + pythonRuntimeDepsCheckHook; + in { inherit name; @@ -325,17 +333,11 @@ lib.extendMkDerivation { else pypaBuildHook ) - ( - if isBootstrapPackage then - pythonRuntimeDepsCheckHook.override { - inherit (python.pythonOnBuildForHost.pkgs.bootstrap) packaging; - } - else - pythonRuntimeDepsCheckHook - ) + runtimeDepsCheckHook ] ++ optionals (format' == "wheel") [ wheelUnpackHook + runtimeDepsCheckHook ] ++ optionals (format' == "egg") [ eggUnpackHook diff --git a/pkgs/development/interpreters/python/setup-hook.nix b/pkgs/development/interpreters/python/setup-hook.nix index 364048484825..6f1933aaa25d 100644 --- a/pkgs/development/interpreters/python/setup-hook.nix +++ b/pkgs/development/interpreters/python/setup-hook.nix @@ -1,19 +1,19 @@ -{ runCommand }: +{ + runCommand, + replaceVars, +}: sitePackages: let - hook = ./setup-hook.sh; + hook = replaceVars ./setup-hook.sh { + inherit sitePackages; + }; in runCommand "python-setup-hook.sh" { strictDeps = true; - env = { - inherit sitePackages; - }; } '' - cp ${hook} hook.sh - substituteAllInPlace hook.sh - mv hook.sh $out + cp ${hook} $out '' diff --git a/pkgs/development/interpreters/python/wrap.sh b/pkgs/development/interpreters/python/wrap.sh index f10ba003432b..c4f9270fa202 100644 --- a/pkgs/development/interpreters/python/wrap.sh +++ b/pkgs/development/interpreters/python/wrap.sh @@ -1,7 +1,7 @@ # Wrapper around wrapPythonProgramsIn, below. The $pythonPath # variable is passed in from the buildPythonPackage function. wrapPythonPrograms() { - wrapPythonProgramsIn "$out/bin" "$out $pythonPath" + wrapPythonProgramsIn "$out/bin" "$out ${pythonPath[*]}" } # Builds environment variables like PYTHONPATH and PATH walking through closure diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index da0a77dc608d..c98d1bb4d43c 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -239,13 +239,9 @@ let ++ lib.optional stdenv.cc.isGNU "CFLAGS=-O3" ++ [ ] - ++ ops stdenv.hostPlatform.isDarwin [ - # on darwin, we have /usr/include/tk.h -- so the configure script detects - # that tk is installed - "--with-out-ext=tk" - # on yosemite, "generating encdb.h" will hang for a very long time without this flag - "--with-setjmp-type=setjmp" - ] + # on darwin, we have /usr/include/tk.h -- so the configure script detects + # that tk is installed + ++ lib.optional stdenv.hostPlatform.isDarwin "--with-out-ext=tk" ++ ops stdenv.hostPlatform.isFreeBSD [ "rb_cv_gnu_qsort_r=no" "rb_cv_bsd_qsort_r=yes" diff --git a/pkgs/development/interpreters/spidermonkey/140.nix b/pkgs/development/interpreters/spidermonkey/140.nix index 8187047403b7..cdba5d1e78ed 100644 --- a/pkgs/development/interpreters/spidermonkey/140.nix +++ b/pkgs/development/interpreters/spidermonkey/140.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "140.6.0"; - hash = "sha512-7WZle9Sy2UeRiSJh18DA2VC09jDRKrKKd32TOTQnRRqaoSXloB7hXyrA/zeNC+B0oIWD3P/TVgkRK6Tm+a2nmA=="; + version = "140.7.0"; + hash = "sha512-d4Gx4gMTDBzfKgwuywWpz6gkx11Gfn+sp4tmvVVoyCEyQRKuy3dIg9n0R69/pK3jZIj/EBclWvVRDI9kGZDkcg=="; } diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index 7ecc8250b9c2..9f2e781124e5 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -90,6 +90,18 @@ let ] ++ lib.optional stdenv.hostPlatform.is64bit "--enable-64bit"; + buildFlags = lib.optionals stdenv.hostPlatform.isStatic [ + # Don't use the default Make target for static, + # since it builds shared libraries for bundled packages. + "binaries" + "libraries" + "doc" + ]; + + makeFlags = lib.optionals stdenv.hostPlatform.isStatic [ + "INSTALL_PACKAGE_TARGETS=" + ]; + enableParallelBuilding = true; postInstall = diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 85ca849d5be4..61e1d7792264 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -4,7 +4,6 @@ buildPackages, replaceVars, fetchFromGitHub, - fetchpatch, meson, mesonEmulatorHook, appstream, @@ -21,7 +20,7 @@ xapian, libxml2, libxmlb, - libyaml, + libfyaml, gobject-introspection, itstool, gperf, @@ -31,6 +30,7 @@ gdk-pixbuf, pango, librsvg, + bash-completion, systemd, nixosTests, testers, @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "appstream"; - version = "1.0.4"; + version = "1.1.2"; outputs = [ "out" @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ximion"; repo = "appstream"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-UnSJcXH0yWK/dPKgbOx9x3iJjKcKNYFkD2Qs5c3FtM8="; + sha256 = "sha256-tvdWWdL6PthffAZZnNZ3+17/eJdZFx8xFkqm7IvyPWE="; }; patches = [ @@ -65,12 +65,6 @@ stdenv.mkDerivation (finalAttrs: { # Allow installing installed tests to a separate output. ./installed-tests-path.patch - - (fetchpatch { - name = "static.patch"; - url = "https://github.com/ximion/appstream/commit/90675d8853188f65897d2453346cb0acd531b58f.patch"; - hash = "sha256-d3h5h7B/MP3Sun5YwYCqMHcw4PMMwg1YS/S9vsMzkQ4="; - }) ]; strictDeps = true; @@ -110,12 +104,13 @@ stdenv.mkDerivation (finalAttrs: { xapian libxml2 libxmlb - libyaml + libfyaml curl cairo gdk-pixbuf pango librsvg + bash-completion ] ++ lib.optionals withSystemd [ systemd diff --git a/pkgs/development/libraries/appstream/qt.nix b/pkgs/development/libraries/appstream/qt.nix index d79db8c3c640..dcd5593ba5e7 100644 --- a/pkgs/development/libraries/appstream/qt.nix +++ b/pkgs/development/libraries/appstream/qt.nix @@ -9,9 +9,6 @@ # TODO: look into using the libraries from the regular appstream derivation as we keep duplicates here -let - qtSuffix = lib.optionalString (lib.versions.major qtbase.version == "5") "5"; -in stdenv.mkDerivation { pname = "appstream-qt"; inherit (appstream) version src; @@ -31,7 +28,6 @@ stdenv.mkDerivation { mesonFlags = appstream.mesonFlags ++ [ (lib.mesonBool "qt" true) - (lib.mesonOption "qt-versions" (lib.versions.major qtbase.version)) ]; patches = appstream.patches; @@ -41,9 +37,9 @@ stdenv.mkDerivation { # AppStreamQt tries to be relocatable, in hacky cmake ways that generally fail # horribly on NixOS. Just hardcode the paths. postFixup = '' - sed -i "$dev/lib/cmake/AppStreamQt${qtSuffix}/AppStreamQt${qtSuffix}Config.cmake" \ + sed -i "$dev/lib/cmake/AppStreamQt/AppStreamQtConfig.cmake" \ -e "/INTERFACE_INCLUDE_DIRECTORIES/ s@\''${PACKAGE_PREFIX_DIR}@$dev@" - sed -i "$dev/lib/cmake/AppStreamQt${qtSuffix}/AppStreamQt${qtSuffix}Config.cmake" \ + sed -i "$dev/lib/cmake/AppStreamQt/AppStreamQtConfig.cmake" \ -e "/IMPORTED_LOCATION/ s@\''${PACKAGE_PREFIX_DIR}@$out@" ''; diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/core.nix b/pkgs/development/libraries/azure-sdk-for-cpp/core.nix index a9b2ca39ac43..0b2ef8ad9d85 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/core.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/core.nix @@ -10,7 +10,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "azure-sdk-for-cpp-core"; - version = "1.16.1"; + version = "1.16.2"; outputs = [ "out" "dev" @@ -19,8 +19,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "Azure"; repo = "azure-sdk-for-cpp"; - tag = "azure-core_1.16.1"; - hash = "sha256-gMINz3bH80l0QYX3iKJlL962WIMujR1wuN+t4t7g7qg="; + tag = "azure-core_${finalAttrs.version}"; + hash = "sha256-IGhJi8fnNY/NXnZ6ZGclJxG1gEx7BRj9setMaFUJZNQ="; }; sourceRoot = "${finalAttrs.src.name}/sdk/core/azure-core"; diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/identity.nix b/pkgs/development/libraries/azure-sdk-for-cpp/identity.nix index 266375e6664c..9cfb5d8f9c4c 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/identity.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/identity.nix @@ -10,7 +10,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "azure-sdk-for-cpp-identity"; - version = "1.13.2"; + version = "1.13.3"; outputs = [ "out" "dev" @@ -19,8 +19,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "Azure"; repo = "azure-sdk-for-cpp"; - tag = "azure-identity_1.13.2"; - hash = "sha256-864fU7BkVWXE0vVEYniXQUbrNRvLhhv6aR3wwdnjbQo="; + tag = "azure-identity_${finalAttrs.version}"; + hash = "sha256-IGhJi8fnNY/NXnZ6ZGclJxG1gEx7BRj9setMaFUJZNQ="; }; sourceRoot = "${finalAttrs.src.name}/sdk/identity/azure-identity"; diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/storage-blobs.nix b/pkgs/development/libraries/azure-sdk-for-cpp/storage-blobs.nix index 79b8131b1d06..f58321a29e79 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/storage-blobs.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/storage-blobs.nix @@ -9,7 +9,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "azure-sdk-for-cpp-storage-blobs"; - version = "12.15.0"; + version = "12.16.0"; outputs = [ "out" "dev" @@ -18,8 +18,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "Azure"; repo = "azure-sdk-for-cpp"; - tag = "azure-storage-blobs_12.15.0"; - hash = "sha256-u+zaMoX64GcTKE7QIF5WyENTogLBMTCenoI8hPY7m08="; + tag = "azure-storage-blobs_${finalAttrs.version}"; + hash = "sha256-cycBXSvc3G8TdLnI4Ht1lBd9ndPOjxWFQA54a24iUsY="; }; sourceRoot = "${finalAttrs.src.name}/sdk/storage/azure-storage-blobs"; diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/storage-common.nix b/pkgs/development/libraries/azure-sdk-for-cpp/storage-common.nix index 74f74639bd37..1e6e03197202 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/storage-common.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/storage-common.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "azure-sdk-for-cpp-storage-common"; - version = "12.11.0"; + version = "12.12.0"; outputs = [ "out" "dev" @@ -20,8 +20,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "Azure"; repo = "azure-sdk-for-cpp"; - tag = "azure-storage-common_12.11.0"; - hash = "sha256-u+zaMoX64GcTKE7QIF5WyENTogLBMTCenoI8hPY7m08="; + tag = "azure-storage-common_${finalAttrs.version}"; + hash = "sha256-cycBXSvc3G8TdLnI4Ht1lBd9ndPOjxWFQA54a24iUsY="; }; sourceRoot = "${finalAttrs.src.name}/sdk/storage/azure-storage-common"; diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/storage-files-datalake.nix b/pkgs/development/libraries/azure-sdk-for-cpp/storage-files-datalake.nix index a543e40332ef..03240d452b4f 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/storage-files-datalake.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/storage-files-datalake.nix @@ -10,7 +10,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "azure-sdk-for-cpp-storage-files-datalake"; - version = "12.13.0"; + version = "12.14.0"; outputs = [ "out" "dev" @@ -19,8 +19,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "Azure"; repo = "azure-sdk-for-cpp"; - tag = "azure-storage-files-datalake_12.13.0"; - hash = "sha256-u+zaMoX64GcTKE7QIF5WyENTogLBMTCenoI8hPY7m08="; + tag = "azure-storage-files-datalake_${finalAttrs.version}"; + hash = "sha256-cycBXSvc3G8TdLnI4Ht1lBd9ndPOjxWFQA54a24iUsY="; }; sourceRoot = "${finalAttrs.src.name}/sdk/storage/azure-storage-files-datalake"; diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 203052505e5e..d0433feaac48 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -144,7 +144,7 @@ withV4l2 ? withHeadlessDeps && stdenv.hostPlatform.isLinux, # Video 4 Linux support withV4l2M2m ? withV4l2, withVaapi ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD), # Vaapi hardware acceleration - withVdpau ? withSmallDeps && !stdenv.hostPlatform.isMinGW, # Vdpau hardware acceleration + withVdpau ? withSmallDeps && (with stdenv; isLinux || isFreeBSD), # Vdpau hardware acceleration withVidStab ? withHeadlessDeps && withGPL, # Video stabilization withVmaf ? withFullDeps && lib.versionAtLeast version "5", # Netflix's VMAF (Video Multi-Method Assessment Fusion) withVoAmrwbenc ? withFullDeps && withVersion3, # AMR-WB encoder diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 45116f2db9ec..f45c206c96f2 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -15,18 +15,17 @@ stdenv.mkDerivation rec { pname = "gettext"; - version = "0.25.1"; + version = "0.26"; src = fetchurl { url = "mirror://gnu/gettext/${pname}-${version}.tar.gz"; - hash = "sha256-dG+VXULXHrac52OGnLkmgvCaQGZSjQGLbKej9ICJoIU="; + hash = "sha256-Oaz0sDcemxELYABVYqrOWzYx/tmxu57Mz8f1bli7HX8="; }; patches = [ ./absolute-paths.diff # fix reproducibile output, in particular in the grub2 build # https://savannah.gnu.org/bugs/index.php?59658 ./0001-msginit-Do-not-use-POT-Creation-Date.patch - ./memory-safety.patch ]; outputs = [ diff --git a/pkgs/development/libraries/gettext/memory-safety.patch b/pkgs/development/libraries/gettext/memory-safety.patch deleted file mode 100644 index 8c6c9f5e5052..000000000000 --- a/pkgs/development/libraries/gettext/memory-safety.patch +++ /dev/null @@ -1,44 +0,0 @@ -From: Bruno Haible -Date: Mon, 7 Jul 2025 07:02:41 +0000 (+0200) -Subject: xgettext: Perl: Fix bug with comment lines longer than 1024 (regr. 2024-09-26). -X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?p=gettext.git;a=commitdiff_plain;h=f98de965a08d1883a46ba5411922b54cc5125f14 - -xgettext: Perl: Fix bug with comment lines longer than 1024 (regr. 2024-09-26). - -Reported by Alyssa Ross in -. - -* gettext-tools/src/x-perl.c (phase2_getc): Move the sb_free call until after -the savable_comment_add call. ---- - -diff --git a/gettext-tools/src/x-perl.c b/gettext-tools/src/x-perl.c -index d3aa50476..312fef371 100644 ---- a/gettext-tools/src/x-perl.c -+++ b/gettext-tools/src/x-perl.c -@@ -558,7 +558,6 @@ phase2_getc (struct perl_extractor *xp) - { - int lineno; - int c; -- char *utf8_string; - - c = phase1_getc (xp); - if (c == '#') -@@ -587,12 +586,13 @@ phase2_getc (struct perl_extractor *xp) - sb_xappend1 (&buffer, c); - } - /* Convert it to UTF-8. */ -- utf8_string = -- from_current_source_encoding (sb_xcontents_c (&buffer), lc_comment, -+ const char *contents = sb_xcontents_c (&buffer); -+ char *utf8_contents = -+ from_current_source_encoding (contents, lc_comment, - logical_file_name, lineno); -- sb_free (&buffer); - /* Save it until we encounter the corresponding string. */ -- savable_comment_add (utf8_string); -+ savable_comment_add (utf8_contents); -+ sb_free (&buffer); - xp->last_comment_line = lineno; - } - return c; diff --git a/pkgs/development/libraries/glibc/2.42-master.patch b/pkgs/development/libraries/glibc/2.42-master.patch index efed2a43b7e2..f82e155832c4 100644 --- a/pkgs/development/libraries/glibc/2.42-master.patch +++ b/pkgs/development/libraries/glibc/2.42-master.patch @@ -5370,3 +5370,383 @@ index ab37d3d58c..29e59da958 100644 /* Not added to the tree. */ free (crname); } + +commit f122d0b4d145814869bf10c56db1d971bcba55c5 +Author: Sunil K Pandey +Date: Tue Dec 9 08:57:44 2025 -0800 + + nptl: Optimize trylock for high cache contention workloads (BZ #33704) + + Check lock availability before acquisition to reduce cache line + bouncing. Significantly improves trylock throughput on multi-core + systems under heavy contention. + + Tested on x86_64. + + Fixes BZ #33704. + + Co-authored-by: Alex M Wells + Reviewed-by: Wilco Dijkstra + (cherry picked from commit 63716823dbad9482e09972907ae98e9cb00f9b86) + +diff --git a/nptl/pthread_mutex_trylock.c b/nptl/pthread_mutex_trylock.c +index dbb8fcc754..392619021b 100644 +--- a/nptl/pthread_mutex_trylock.c ++++ b/nptl/pthread_mutex_trylock.c +@@ -48,7 +48,8 @@ ___pthread_mutex_trylock (pthread_mutex_t *mutex) + return 0; + } + +- if (lll_trylock (mutex->__data.__lock) == 0) ++ if (atomic_load_relaxed (&(mutex->__data.__lock)) == 0 ++ && lll_trylock (mutex->__data.__lock) == 0) + { + /* Record the ownership. */ + mutex->__data.__owner = id; +@@ -71,7 +72,10 @@ ___pthread_mutex_trylock (pthread_mutex_t *mutex) + /*FALL THROUGH*/ + case PTHREAD_MUTEX_ADAPTIVE_NP: + case PTHREAD_MUTEX_ERRORCHECK_NP: +- if (lll_trylock (mutex->__data.__lock) != 0) ++ /* Mutex type is already loaded, lock check overhead should ++ be minimal. */ ++ if (atomic_load_relaxed (&(mutex->__data.__lock)) != 0 ++ || lll_trylock (mutex->__data.__lock) != 0) + break; + + /* Record the ownership. */ + +commit b0ec8fb689df862171f0f78994a3bdeb51313545 +Author: Siddhesh Poyarekar +Date: Thu Jan 15 06:06:40 2026 -0500 + + memalign: reinstate alignment overflow check (CVE-2026-0861) + + The change to cap valid sizes to PTRDIFF_MAX inadvertently dropped the + overflow check for alignment in memalign functions, _mid_memalign and + _int_memalign. Reinstate the overflow check in _int_memalign, aligned + with the PTRDIFF_MAX change since that is directly responsible for the + CVE. The missing _mid_memalign check is not relevant (and does not have + a security impact) and may need a different approach to fully resolve, + so it has been omitted. + + CVE-Id: CVE-2026-0861 + Vulnerable-Commit: 9bf8e29ca136094f73f69f725f15c51facc97206 + Reported-by: Igor Morgenstern, Aisle Research + Fixes: BZ #33796 + Reviewed-by: Wilco Dijkstra + Signed-off-by: Siddhesh Poyarekar + (cherry picked from commit c9188d333717d3ceb7e3020011651f424f749f93) + +diff --git a/malloc/malloc.c b/malloc/malloc.c +index 5f3e701fd1..1d5aa304d3 100644 +--- a/malloc/malloc.c ++++ b/malloc/malloc.c +@@ -5167,7 +5167,7 @@ _int_memalign (mstate av, size_t alignment, size_t bytes) + INTERNAL_SIZE_T size; + + nb = checked_request2size (bytes); +- if (nb == 0) ++ if (nb == 0 || alignment > PTRDIFF_MAX) + { + __set_errno (ENOMEM); + return NULL; +@@ -5183,7 +5183,10 @@ _int_memalign (mstate av, size_t alignment, size_t bytes) + we don't find anything in those bins, the common malloc code will + scan starting at 2x. */ + +- /* Call malloc with worst case padding to hit alignment. */ ++ /* Call malloc with worst case padding to hit alignment. ALIGNMENT is a ++ power of 2, so it tops out at (PTRDIFF_MAX >> 1) + 1, leaving plenty of ++ space to add MINSIZE and whatever checked_request2size adds to BYTES to ++ get NB. Consequently, total below also does not overflow. */ + m = (char *) (_int_malloc (av, nb + alignment + MINSIZE)); + + if (m == NULL) +diff --git a/malloc/tst-malloc-too-large.c b/malloc/tst-malloc-too-large.c +index a548a37b46..a1bda673a3 100644 +--- a/malloc/tst-malloc-too-large.c ++++ b/malloc/tst-malloc-too-large.c +@@ -152,7 +152,6 @@ test_large_allocations (size_t size) + } + + +-static long pagesize; + + /* This function tests the following aligned memory allocation functions + using several valid alignments and precedes each allocation test with a +@@ -171,8 +170,8 @@ test_large_aligned_allocations (size_t size) + + /* All aligned memory allocation functions expect an alignment that is a + power of 2. Given this, we test each of them with every valid +- alignment from 1 thru PAGESIZE. */ +- for (align = 1; align <= pagesize; align *= 2) ++ alignment for the type of ALIGN, i.e. until it wraps to 0. */ ++ for (align = 1; align > 0; align <<= 1) + { + test_setup (); + #if __GNUC_PREREQ (7, 0) +@@ -265,11 +264,6 @@ do_test (void) + DIAG_IGNORE_NEEDS_COMMENT (7, "-Walloc-size-larger-than="); + #endif + +- /* Aligned memory allocation functions need to be tested up to alignment +- size equivalent to page size, which should be a power of 2. */ +- pagesize = sysconf (_SC_PAGESIZE); +- TEST_VERIFY_EXIT (powerof2 (pagesize)); +- + /* Loop 1: Ensure that all allocations with SIZE close to SIZE_MAX, i.e. + in the range (SIZE_MAX - 2^14, SIZE_MAX], fail. + + +commit 453e6b8dbab935257eb0802b0c97bca6b67ba30e +Author: Carlos O'Donell +Date: Thu Jan 15 15:09:38 2026 -0500 + + resolv: Fix NSS DNS backend for getnetbyaddr (CVE-2026-0915) + + The default network value of zero for net was never tested for and + results in a DNS query constructed from uninitialized stack bytes. + The solution is to provide a default query for the case where net + is zero. + + Adding a test case for this was straight forward given the existence of + tst-resolv-network and if the test is added without the fix you observe + this failure: + + FAIL: resolv/tst-resolv-network + original exit status 1 + error: tst-resolv-network.c:174: invalid QNAME: \146\218\129\128 + error: 1 test failures + + With a random QNAME resulting from the use of uninitialized stack bytes. + + After the fix the test passes. + + Additionally verified using wireshark before and after to ensure + on-the-wire bytes for the DNS query were as expected. + + No regressions on x86_64. + + Reviewed-by: Florian Weimer + (cherry picked from commit e56ff82d5034ec66c6a78f517af6faa427f65b0b) + +diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c +index 519f8422ca..e14e959d7c 100644 +--- a/resolv/nss_dns/dns-network.c ++++ b/resolv/nss_dns/dns-network.c +@@ -207,6 +207,10 @@ _nss_dns_getnetbyaddr_r (uint32_t net, int type, struct netent *result, + sprintf (qbuf, "%u.%u.%u.%u.in-addr.arpa", net_bytes[3], net_bytes[2], + net_bytes[1], net_bytes[0]); + break; ++ default: ++ /* Default network (net is originally zero). */ ++ strcpy (qbuf, "0.0.0.0.in-addr.arpa"); ++ break; + } + + net_buffer.buf = orig_net_buffer = (querybuf *) alloca (1024); +diff --git a/resolv/tst-resolv-network.c b/resolv/tst-resolv-network.c +index d9f69649d0..181be80835 100644 +--- a/resolv/tst-resolv-network.c ++++ b/resolv/tst-resolv-network.c +@@ -46,6 +46,9 @@ handle_code (const struct resolv_response_context *ctx, + { + switch (code) + { ++ case 0: ++ send_ptr (b, qname, qclass, qtype, "0.in-addr.arpa"); ++ break; + case 1: + send_ptr (b, qname, qclass, qtype, "1.in-addr.arpa"); + break; +@@ -265,6 +268,9 @@ do_test (void) + "error: TRY_AGAIN\n"); + + /* Lookup by address, success cases. */ ++ check_reverse (0, ++ "name: 0.in-addr.arpa\n" ++ "net: 0x00000000\n"); + check_reverse (1, + "name: 1.in-addr.arpa\n" + "net: 0x00000001\n"); + +commit cbf39c26b25801e9bc88499b4fd361ac172d4125 +Author: Adhemerval Zanella +Date: Thu Jan 15 10:32:19 2026 -0300 + + posix: Reset wordexp_t fields with WRDE_REUSE (CVE-2025-15281 / BZ 33814) + + The wordexp fails to properly initialize the input wordexp_t when + WRDE_REUSE is used. The wordexp_t struct is properly freed, but + reuses the old wc_wordc value and updates the we_wordv in the + wrong position. A later wordfree will then call free with an + invalid pointer. + + Checked on x86_64-linux-gnu and i686-linux-gnu. + + Reviewed-by: Carlos O'Donell + (cherry picked from commit 80cc58ea2de214f85b0a1d902a3b668ad2ecb302) + +diff --git a/NEWS b/NEWS +index ed3c114c7a..7e7e1930dd 100644 +--- a/NEWS ++++ b/NEWS +@@ -16,6 +16,8 @@ The following bugs were resolved with this release: + [33356] nptl: creating thread stack with guardsize 0 can erroneously + conclude MADV_GUARD_INSTALL is available + [33361] nss: Group merge does not react to ERANGE during merge ++ [33814] glob: wordexp with WRDE_REUSE and WRDE_APPEND may return ++ uninitialized memory + + Version 2.42 + +diff --git a/posix/Makefile b/posix/Makefile +index a36e5decd3..1ea86efcc1 100644 +--- a/posix/Makefile ++++ b/posix/Makefile +@@ -327,6 +327,7 @@ tests := \ + tst-wait4 \ + tst-waitid \ + tst-wordexp-nocmd \ ++ tst-wordexp-reuse \ + tstgetopt \ + # tests + +@@ -457,6 +458,8 @@ generated += \ + tst-rxspencer-no-utf8.mtrace \ + tst-vfork3-mem.out \ + tst-vfork3.mtrace \ ++ tst-wordexp-reuse-mem.out \ ++ tst-wordexp-reuse.mtrace \ + # generated + endif + endif +@@ -492,6 +495,7 @@ tests-special += \ + $(objpfx)tst-pcre-mem.out \ + $(objpfx)tst-rxspencer-no-utf8-mem.out \ + $(objpfx)tst-vfork3-mem.out \ ++ $(objpfx)tst-wordexp-reuse.out \ + # tests-special + endif + endif +@@ -775,3 +779,10 @@ $(objpfx)posix-conf-vars-def.h: $(..)scripts/gen-posix-conf-vars.awk \ + $(make-target-directory) + $(AWK) -f $(filter-out Makefile, $^) > $@.tmp + mv -f $@.tmp $@ ++ ++tst-wordexp-reuse-ENV += MALLOC_TRACE=$(objpfx)tst-wordexp-reuse.mtrace \ ++ LD_PRELOAD=$(common-objpfx)/malloc/libc_malloc_debug.so ++ ++$(objpfx)tst-wordexp-reuse-mem.out: $(objpfx)tst-wordexp-reuse.out ++ $(common-objpfx)malloc/mtrace $(objpfx)tst-wordexp-reuse.mtrace > $@; \ ++ $(evaluate-test) +diff --git a/posix/tst-wordexp-reuse.c b/posix/tst-wordexp-reuse.c +new file mode 100644 +index 0000000000..3926b9f557 +--- /dev/null ++++ b/posix/tst-wordexp-reuse.c +@@ -0,0 +1,89 @@ ++/* Test for wordexp with WRDE_REUSE flag. ++ Copyright (C) 2026 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 ++ ++static int ++do_test (void) ++{ ++ mtrace (); ++ ++ { ++ wordexp_t p = { 0 }; ++ TEST_COMPARE (wordexp ("one", &p, 0), 0); ++ TEST_COMPARE (p.we_wordc, 1); ++ TEST_COMPARE_STRING (p.we_wordv[0], "one"); ++ TEST_COMPARE (wordexp ("two", &p, WRDE_REUSE), 0); ++ TEST_COMPARE (p.we_wordc, 1); ++ TEST_COMPARE_STRING (p.we_wordv[0], "two"); ++ wordfree (&p); ++ } ++ ++ { ++ wordexp_t p = { .we_offs = 2 }; ++ TEST_COMPARE (wordexp ("one", &p, 0), 0); ++ TEST_COMPARE (p.we_wordc, 1); ++ TEST_COMPARE_STRING (p.we_wordv[0], "one"); ++ TEST_COMPARE (wordexp ("two", &p, WRDE_REUSE | WRDE_DOOFFS), 0); ++ TEST_COMPARE (p.we_wordc, 1); ++ TEST_COMPARE_STRING (p.we_wordv[p.we_offs + 0], "two"); ++ wordfree (&p); ++ } ++ ++ { ++ wordexp_t p = { 0 }; ++ TEST_COMPARE (wordexp ("one", &p, 0), 0); ++ TEST_COMPARE (p.we_wordc, 1); ++ TEST_COMPARE_STRING (p.we_wordv[0], "one"); ++ TEST_COMPARE (wordexp ("two", &p, WRDE_REUSE | WRDE_APPEND), 0); ++ TEST_COMPARE (p.we_wordc, 1); ++ TEST_COMPARE_STRING (p.we_wordv[0], "two"); ++ wordfree (&p); ++ } ++ ++ { ++ wordexp_t p = { .we_offs = 2 }; ++ TEST_COMPARE (wordexp ("one", &p, WRDE_DOOFFS), 0); ++ TEST_COMPARE (p.we_wordc, 1); ++ TEST_COMPARE_STRING (p.we_wordv[p.we_offs + 0], "one"); ++ TEST_COMPARE (wordexp ("two", &p, WRDE_REUSE ++ | WRDE_DOOFFS), 0); ++ TEST_COMPARE (p.we_wordc, 1); ++ TEST_COMPARE_STRING (p.we_wordv[p.we_offs + 0], "two"); ++ wordfree (&p); ++ } ++ ++ { ++ wordexp_t p = { .we_offs = 2 }; ++ TEST_COMPARE (wordexp ("one", &p, WRDE_DOOFFS), 0); ++ TEST_COMPARE (p.we_wordc, 1); ++ TEST_COMPARE_STRING (p.we_wordv[p.we_offs + 0], "one"); ++ TEST_COMPARE (wordexp ("two", &p, WRDE_REUSE ++ | WRDE_DOOFFS | WRDE_APPEND), 0); ++ TEST_COMPARE (p.we_wordc, 1); ++ TEST_COMPARE_STRING (p.we_wordv[p.we_offs + 0], "two"); ++ wordfree (&p); ++ } ++ ++ return 0; ++} ++ ++#include +diff --git a/posix/wordexp.c b/posix/wordexp.c +index a69b732801..9df4bb7424 100644 +--- a/posix/wordexp.c ++++ b/posix/wordexp.c +@@ -2216,7 +2216,9 @@ wordexp (const char *words, wordexp_t *pwordexp, int flags) + { + /* Minimal implementation of WRDE_REUSE for now */ + wordfree (pwordexp); ++ old_word.we_wordc = 0; + old_word.we_wordv = NULL; ++ pwordexp->we_wordc = 0; + } + + if ((flags & WRDE_APPEND) == 0) diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index d7a384b00539..9b2946d019fb 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -50,7 +50,7 @@ let version = "2.42"; - patchSuffix = "-47"; + patchSuffix = "-51"; sha256 = "sha256-0XdeMuRijmTvkw9DW2e7Y691may2viszW58Z8WUJ8X8="; in @@ -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.42-47-ga1d3294a5b + glibc-2.42-51-gcbf39c26b2 $ git show --minimal --reverse glibc-2.42.. ':!ADVISORIES' > 2.42-master.patch To compare the archive contents zdiff can be used. diff --git a/pkgs/development/libraries/glibc/fix_path_attribute_in_getconf.patch b/pkgs/development/libraries/glibc/fix_path_attribute_in_getconf.patch index 714e49db5607..d9733257d34a 100644 --- a/pkgs/development/libraries/glibc/fix_path_attribute_in_getconf.patch +++ b/pkgs/development/libraries/glibc/fix_path_attribute_in_getconf.patch @@ -3,4 +3,4 @@ diff -ubr glibc-2.17-orig/sysdeps/unix/confstr.h glibc-2.17/sysdeps/unix/confstr +++ glibc-2.17/sysdeps/unix/confstr.h 2013-06-03 22:04:39.469376740 +0200 @@ -1 +1 @@ -#define CS_PATH "/bin:/usr/bin" -+#define CS_PATH "/run/current-system/sw/bin:/bin:/usr/bin" ++#define CS_PATH "/run/current-system/sw/bin:/bin:/usr/bin:/nix/var/nix/profiles/default/bin" diff --git a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch index b6dc66fc66b1..bfee16860274 100644 --- a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch +++ b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch @@ -2,15 +2,12 @@ diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py index 64575557..1eb0a2b4 100644 --- a/giscanner/scannermain.py +++ b/giscanner/scannermain.py -@@ -95,6 +95,39 @@ def get_windows_option_group(parser): +@@ -95,6 +95,36 @@ def get_windows_option_group(parser): return group +def _get_default_fallback_libpath(): -+ # Newer multiple-output-optimized stdenv has an environment variable -+ # $outputLib which in turn specifies another variable which then is used as -+ # the destination for the library contents (${!outputLib}/lib). -+ store_path = os.environ.get(os.environ.get("outputLib")) if "outputLib" in os.environ else None ++ store_path = os.environ.get("NIX_GOBJECT_INTROSPECTION_DEFAULT_FALLBACK_LIBPATH") + if store_path is None: + outputs = os.environ.get("outputs", "out").split() + if "lib" in outputs: diff --git a/pkgs/development/libraries/gobject-introspection/setup-hook.sh b/pkgs/development/libraries/gobject-introspection/setup-hook.sh index ee048867a278..e05f80a27cb9 100644 --- a/pkgs/development/libraries/gobject-introspection/setup-hook.sh +++ b/pkgs/development/libraries/gobject-introspection/setup-hook.sh @@ -10,7 +10,17 @@ make_gobject_introspection_find_gir_files() { fi } +export_gobject_introspection_fallback_path() { + # Newer multiple-output-optimized stdenv has a variable $outputLib, + # which in turn specifies another variable which then is used as + # the destination for the library contents (${!outputLib}/lib). + # We export this so it is available to subprocesses, such as giscanner, + # which we patch to prioritize this variable if available. + export NIX_GOBJECT_INTROSPECTION_DEFAULT_FALLBACK_LIBPATH=${!outputLib} +} + addEnvHooks "$targetOffset" make_gobject_introspection_find_gir_files +addEnvHooks "$targetOffset" export_gobject_introspection_fallback_path giDiscoverSelf() { if [ -d "$prefix/lib/girepository-1.0" ]; then diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index f2330c8cf20f..80573843063d 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -399,6 +399,10 @@ stdenv.mkDerivation (finalAttrs: { doCheck = false; # fails 20 out of 58 tests, expensive + preFixup = '' + moveToOutput "lib/gstreamer-1.0/pkgconfig" "$dev" + ''; + passthru = { tests = { full = gst-plugins-bad.override { diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index a8c80341210f..b3531d024121 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -170,6 +170,10 @@ stdenv.mkDerivation (finalAttrs: { doCheck = false; # fails, wants DRI access for OpenGL + preFixup = '' + moveToOutput "lib/gstreamer-1.0/pkgconfig" "$dev" + ''; + passthru = { # Downstream `gst-*` packages depending on `gst-plugins-base` # have meson build options like 'gl' etc. that depend diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 73f3badbbdd8..5179b6e5d5e5 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -134,6 +134,7 @@ stdenv.mkDerivation (finalAttrs: { ''; preFixup = '' + moveToOutput "lib/gstreamer-1.0/pkgconfig" "$dev" moveToOutput "share/bash-completion" "$bin" ''; diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix index e92607625e9f..080760f4ed23 100644 --- a/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -127,6 +127,10 @@ stdenv.mkDerivation (finalAttrs: { ]; }; + preFixup = '' + moveToOutput "lib/gstreamer-1.0/pkgconfig" "$dev" + ''; + meta = { description = "Integration testing infrastructure for the GStreamer framework"; homepage = "https://gstreamer.freedesktop.org"; diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 60cabc07f942..99ffb34f8b64 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -73,6 +73,10 @@ stdenv.mkDerivation (finalAttrs: { scripts/extract-release-date-from-doap-file.py ''; + preFixup = '' + moveToOutput "lib/gstreamer-1.0/pkgconfig" "$dev" + ''; + passthru = { updateScript = directoryListingUpdater { }; }; diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 3087cff50443..b95e7110c6c0 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -107,11 +107,14 @@ stdenv.mkDerivation (finalAttrs: { meson ninja gettext - nasm orc libshout glib ] + # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/bb7069bd6fff80e8599d6e79f3f000b83dbce4d6/subprojects/gst-plugins-good/meson.build#L435-443 + ++ lib.optionals stdenv.hostPlatform.isx86_64 [ + nasm + ] ++ lib.optionals enableDocumentation [ hotdoc ] @@ -212,6 +215,7 @@ stdenv.mkDerivation (finalAttrs: { "-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Dglib_debug=disabled" # cast checks should be disabled on stable releases (lib.mesonEnable "doc" enableDocumentation) + (lib.mesonEnable "asm" true) ] ++ lib.optionals (!qt5Support) [ "-Dqt5=disabled" @@ -266,6 +270,10 @@ stdenv.mkDerivation (finalAttrs: { # must be explicitly set since 5590e365 dontWrapQtApps = true; + preFixup = '' + moveToOutput "lib/gstreamer-1.0/pkgconfig" "$dev" + ''; + passthru = { tests = { gtk = gst-plugins-good.override { diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 990ed19d1b7b..66573381c184 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -60,6 +60,10 @@ stdenv.mkDerivation (finalAttrs: { scripts/extract-release-date-from-doap-file.py ''; + preFixup = '' + moveToOutput "lib/gstreamer-1.0/pkgconfig" "$dev" + ''; + passthru = { updateScript = directoryListingUpdater { }; }; diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index 61dfb7b58037..1fbc9f19cd2a 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -62,6 +62,10 @@ stdenv.mkDerivation (finalAttrs: { scripts/extract-release-date-from-doap-file.py ''; + preFixup = '' + moveToOutput "lib/gstreamer-1.0/pkgconfig" "$dev" + ''; + passthru = { updateScript = directoryListingUpdater { }; }; diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 91ed20d57dda..d3670fa88cc1 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -93,6 +93,10 @@ stdenv.mkDerivation (finalAttrs: { scripts/extract-release-date-from-doap-file.py ''; + preFixup = '' + moveToOutput "lib/gstreamer-1.0/pkgconfig" "$dev" + ''; + passthru = { tests = { lgplOnly = gst-plugins-ugly.override { diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index 284cdee16455..dd98ca848a7f 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -99,6 +99,10 @@ stdenv.mkDerivation (finalAttrs: { scripts/extract-release-date-from-doap-file.py ''; + preFixup = '' + moveToOutput "lib/gstreamer-1.0/pkgconfig" "$dev" + ''; + passthru = { updateScript = directoryListingUpdater { }; }; diff --git a/pkgs/development/libraries/kde-frameworks/kconfig.nix b/pkgs/development/libraries/kde-frameworks/kconfig.nix index ea992b7b52d8..f703b4e56472 100644 --- a/pkgs/development/libraries/kde-frameworks/kconfig.nix +++ b/pkgs/development/libraries/kde-frameworks/kconfig.nix @@ -7,6 +7,10 @@ mkDerivation { pname = "kconfig"; + outputs = [ + "out" + "dev" + ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix index ac1a8273362c..35d01f5e7d89 100644 --- a/pkgs/development/libraries/kde-frameworks/kxmlgui.nix +++ b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix @@ -17,6 +17,10 @@ mkDerivation { pname = "kxmlgui"; + outputs = [ + "out" + "dev" + ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ attica diff --git a/pkgs/development/libraries/libidn2/no-bootstrap-reference.nix b/pkgs/development/libraries/libidn2/no-bootstrap-reference.nix index 7c01fddb75bd..ff8c47915067 100644 --- a/pkgs/development/libraries/libidn2/no-bootstrap-reference.nix +++ b/pkgs/development/libraries/libidn2/no-bootstrap-reference.nix @@ -18,7 +18,7 @@ runCommandLocal "${libidn2.pname}-${libidn2.version}" passthru = { inherit (libidn2) out info devdoc; # no need to touch these store paths }; - inherit (libidn2) meta; + inherit (libidn2) meta pname version; } '' cp -r '${libidn2.bin}' "$bin" diff --git a/pkgs/development/libraries/libsoup/3.x.nix b/pkgs/development/libraries/libsoup/3.x.nix index 391486612657..00278cc47213 100644 --- a/pkgs/development/libraries/libsoup/3.x.nix +++ b/pkgs/development/libraries/libsoup/3.x.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchurl, + fetchpatch, glib, meson, ninja, @@ -37,6 +38,19 @@ stdenv.mkDerivation rec { hash = "sha256-aJF2Wqw+lJAXlFw+rr2MyCFt93JFbcn0YJdvvbetojQ="; }; + patches = [ + (fetchpatch { + name = "soup-init-use-libdl-instead-of-gmodule-in-soup2_is_loaded.patch"; + url = "https://gitlab.gnome.org/GNOME/libsoup/-/commit/2316e56a5502ac4c41ef4ff56a3266e680aca129.patch"; + hash = "sha256-6TOM6sygVPpBWjTNgFG37JFbJDl0t2f9Iwidvh/isa4="; + }) + (fetchpatch { + name = "CVE-2025-11021.patch"; + url = "https://gitlab.gnome.org/GNOME/libsoup/-/commit/9e1a427d2f047439d0320defe1593e6352595788.patch"; + hash = "sha256-08WiDnqg4//y8uPhIcV6svWdpRo27FmW+6DHy4OEZk8="; + }) + ]; + depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/development/libraries/libxml2/2.13-CVE-2026-0989.patch b/pkgs/development/libraries/libxml2/2.13-CVE-2026-0989.patch new file mode 100644 index 000000000000..d3154c40d461 --- /dev/null +++ b/pkgs/development/libraries/libxml2/2.13-CVE-2026-0989.patch @@ -0,0 +1,237 @@ +diff --git a/include/libxml/relaxng.h b/include/libxml/relaxng.h +index 079b7f12..78985e5e 100644 +--- a/include/libxml/relaxng.h ++++ b/include/libxml/relaxng.h +@@ -138,6 +138,10 @@ XMLPUBFUN int + xmlRelaxParserSetFlag (xmlRelaxNGParserCtxtPtr ctxt, + int flag); + ++XMLPUBFUN int ++ xmlRelaxParserSetIncLImit (xmlRelaxNGParserCtxt *ctxt, ++ int limit); ++ + XMLPUBFUN void + xmlRelaxNGFreeParserCtxt (xmlRelaxNGParserCtxtPtr ctxt); + XMLPUBFUN void +diff --git a/relaxng.c b/relaxng.c +index 24c3e510..eb0f2b36 100644 +--- a/relaxng.c ++++ b/relaxng.c +@@ -18,6 +18,8 @@ + + #ifdef LIBXML_SCHEMAS_ENABLED + ++#include ++#include + #include + #include + #include +@@ -44,6 +46,12 @@ + static const xmlChar *xmlRelaxNGNs = (const xmlChar *) + "http://relaxng.org/ns/structure/1.0"; + ++/* ++ * Default include limit, this can be override with RNG_INCLUDE_LIMIT ++ * env variable ++ */ ++static const int _xmlRelaxNGIncludeLimit = 1000; ++ + #define IS_RELAXNG(node, typ) \ + ((node != NULL) && (node->ns != NULL) && \ + (node->type == XML_ELEMENT_NODE) && \ +@@ -220,6 +228,7 @@ struct _xmlRelaxNGParserCtxt { + int incNr; /* Depth of the include parsing stack */ + int incMax; /* Max depth of the parsing stack */ + xmlRelaxNGIncludePtr *incTab; /* array of incs */ ++ int incLimit; /* Include limit, to avoid stack-overflow on parse */ + + int idref; /* requires idref checking */ + +@@ -1403,6 +1412,23 @@ xmlRelaxParserSetFlag(xmlRelaxNGParserCtxtPtr ctxt, int flags) + return(0); + } + ++/** ++ * Semi private function used to set the include recursion limit to a ++ * parser context. Set to 0 to use the default value. ++ * ++ * @param ctxt a RelaxNG parser context ++ * @param limit the new include depth limit ++ * @returns 0 if success and -1 in case of error ++ */ ++int ++xmlRelaxParserSetIncLImit(xmlRelaxNGParserCtxt *ctxt, int limit) ++{ ++ if (ctxt == NULL) return(-1); ++ if (limit < 0) return(-1); ++ ctxt->incLimit = limit; ++ return(0); ++} ++ + /************************************************************************ + * * + * Document functions * +@@ -1454,7 +1480,7 @@ xmlRelaxReadMemory(xmlRelaxNGParserCtxtPtr ctxt, const char *buf, int size) { + * + * Pushes a new include on top of the include stack + * +- * Returns 0 in case of error, the index in the stack otherwise ++ * Returns -1 in case of error, the index in the stack otherwise + */ + static int + xmlRelaxNGIncludePush(xmlRelaxNGParserCtxtPtr ctxt, +@@ -1468,9 +1494,15 @@ xmlRelaxNGIncludePush(xmlRelaxNGParserCtxtPtr ctxt, + sizeof(ctxt->incTab[0])); + if (ctxt->incTab == NULL) { + xmlRngPErrMemory(ctxt); +- return (0); ++ return (-1); + } + } ++ if (ctxt->incNr >= ctxt->incLimit) { ++ xmlRngPErr(ctxt, (xmlNodePtr)value->doc, XML_RNGP_PARSE_ERROR, ++ "xmlRelaxNG: inclusion recursion limit reached\n", NULL, NULL); ++ return(-1); ++ } ++ + if (ctxt->incNr >= ctxt->incMax) { + ctxt->incMax *= 2; + ctxt->incTab = +@@ -1479,7 +1511,7 @@ xmlRelaxNGIncludePush(xmlRelaxNGParserCtxtPtr ctxt, + sizeof(ctxt->incTab[0])); + if (ctxt->incTab == NULL) { + xmlRngPErrMemory(ctxt); +- return (0); ++ return (-1); + } + } + ctxt->incTab[ctxt->incNr] = value; +@@ -1649,7 +1681,9 @@ xmlRelaxNGLoadInclude(xmlRelaxNGParserCtxtPtr ctxt, const xmlChar * URL, + /* + * push it on the stack + */ +- xmlRelaxNGIncludePush(ctxt, ret); ++ if (xmlRelaxNGIncludePush(ctxt, ret) < 0) { ++ return (NULL); ++ } + + /* + * Some preprocessing of the document content, this include recursing +@@ -7373,11 +7407,32 @@ xmlRelaxNGParse(xmlRelaxNGParserCtxtPtr ctxt) + xmlDocPtr doc; + xmlNodePtr root; + ++ const char *include_limit_env = getenv("RNG_INCLUDE_LIMIT"); ++ + xmlRelaxNGInitTypes(); + + if (ctxt == NULL) + return (NULL); + ++ if (ctxt->incLimit == 0) { ++ ctxt->incLimit = _xmlRelaxNGIncludeLimit; ++ if (include_limit_env != NULL) { ++ char *strEnd; ++ unsigned long val = 0; ++ errno = 0; ++ val = strtoul(include_limit_env, &strEnd, 10); ++ if (errno != 0 || *strEnd != 0 || val > INT_MAX) { ++ xmlRngPErr(ctxt, NULL, XML_RNGP_PARSE_ERROR, ++ "xmlRelaxNGParse: invalid RNG_INCLUDE_LIMIT %s\n", ++ (const xmlChar*)include_limit_env, ++ NULL); ++ return(NULL); ++ } ++ if (val) ++ ctxt->incLimit = val; ++ } ++ } ++ + /* + * First step is to parse the input document into an DOM/Infoset + */ +diff --git a/runtest.c b/runtest.c +index 26681a3c..a41897dd 100644 +--- a/runtest.c ++++ b/runtest.c +@@ -3529,6 +3529,70 @@ rngTest(const char *filename, + return(ret); + } + ++/** ++ * Parse an RNG schemas with a custom RNG_INCLUDE_LIMIT ++ * ++ * @param filename the schemas file ++ * @param result the file with expected result ++ * @param err the file with error messages ++ * @returns 0 in case of success, an error code otherwise ++ */ ++static int ++rngIncludeTest(const char *filename, ++ const char *resul ATTRIBUTE_UNUSED, ++ const char *errr ATTRIBUTE_UNUSED, ++ int options ATTRIBUTE_UNUSED) { ++ xmlRelaxNGParserCtxtPtr ctxt; ++ xmlRelaxNGPtr schemas; ++ int ret = 0; ++ ++ /* first compile the schemas if possible */ ++ ctxt = xmlRelaxNGNewParserCtxt(filename); ++ xmlRelaxNGSetParserStructuredErrors(ctxt, testStructuredErrorHandler, ++ NULL); ++ ++ /* Should work */ ++ schemas = xmlRelaxNGParse(ctxt); ++ if (schemas == NULL) { ++ testErrorHandler(NULL, "Relax-NG schema %s failed to compile\n", ++ filename); ++ ret = -1; ++ goto done; ++ } ++ xmlRelaxNGFree(schemas); ++ xmlRelaxNGFreeParserCtxt(ctxt); ++ ++ ctxt = xmlRelaxNGNewParserCtxt(filename); ++ /* Should fail */ ++ xmlRelaxParserSetIncLImit(ctxt, 2); ++ xmlRelaxNGSetParserStructuredErrors(ctxt, testStructuredErrorHandler, ++ NULL); ++ schemas = xmlRelaxNGParse(ctxt); ++ if (schemas != NULL) { ++ ret = -1; ++ xmlRelaxNGFree(schemas); ++ } ++ xmlRelaxNGFreeParserCtxt(ctxt); ++ ++ ctxt = xmlRelaxNGNewParserCtxt(filename); ++ /* Should work */ ++ xmlRelaxParserSetIncLImit(ctxt, 3); ++ xmlRelaxNGSetParserStructuredErrors(ctxt, testStructuredErrorHandler, ++ NULL); ++ schemas = xmlRelaxNGParse(ctxt); ++ if (schemas == NULL) { ++ testErrorHandler(NULL, "Relax-NG schema %s failed to compile\n", ++ filename); ++ ret = -1; ++ goto done; ++ } ++ xmlRelaxNGFree(schemas); ++ ++done: ++ xmlRelaxNGFreeParserCtxt(ctxt); ++ return(ret); ++} ++ + #ifdef LIBXML_READER_ENABLED + /** + * rngStreamTest: +@@ -4873,6 +4937,9 @@ testDesc testDescriptions[] = { + { "Relax-NG regression tests" , + rngTest, "./test/relaxng/*.rng", NULL, NULL, NULL, + XML_PARSE_DTDATTR | XML_PARSE_NOENT }, ++ { "Relax-NG include limit tests" , ++ rngIncludeTest, "./test/relaxng/include/include-limit.rng", NULL, NULL, NULL, ++ 0 }, + #ifdef LIBXML_READER_ENABLED + { "Relax-NG streaming regression tests" , + rngStreamTest, "./test/relaxng/*.rng", NULL, NULL, NULL, diff --git a/pkgs/development/libraries/libxml2/2.13-CVE-2026-0992.patch b/pkgs/development/libraries/libxml2/2.13-CVE-2026-0992.patch new file mode 100644 index 000000000000..95dde2b5017f --- /dev/null +++ b/pkgs/development/libraries/libxml2/2.13-CVE-2026-0992.patch @@ -0,0 +1,49 @@ +From f75abfcaa419a740a3191e56c60400f3ff18988d Mon Sep 17 00:00:00 2001 +From: Daniel Garcia Moreno +Date: Fri, 19 Dec 2025 11:02:18 +0100 +Subject: [PATCH] catalog: Ignore repeated nextCatalog entries + +This patch makes the catalog parsing to ignore repeated entries of +nextCatalog with the same value. + +Fix https://gitlab.gnome.org/GNOME/libxml2/-/issues/1019 +--- + catalog.c | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +diff --git a/catalog.c b/catalog.c +index 46b877e62..fa6d77ca1 100644 +--- a/catalog.c ++++ b/catalog.c +@@ -1223,9 +1223,27 @@ xmlParseXMLCatalogNode(xmlNodePtr cur, xmlCatalogPrefer prefer, + BAD_CAST "delegateURI", BAD_CAST "uriStartString", + BAD_CAST "catalog", prefer, cgroup); + } else if (xmlStrEqual(cur->name, BAD_CAST "nextCatalog")) { ++ xmlCatalogEntryPtr prev = parent->children; ++ + entry = xmlParseXMLCatalogOneNode(cur, XML_CATA_NEXT_CATALOG, + BAD_CAST "nextCatalog", NULL, + BAD_CAST "catalog", prefer, cgroup); ++ /* Avoid duplication of nextCatalog */ ++ while (prev != NULL) { ++ if ((prev->type == XML_CATA_NEXT_CATALOG) && ++ (xmlStrEqual (prev->URL, entry->URL)) && ++ (xmlStrEqual (prev->value, entry->value)) && ++ (prev->prefer == entry->prefer) && ++ (prev->group == entry->group)) { ++ if (xmlDebugCatalogs) ++ fprintf(stderr, ++ "Ignoring repeated nextCatalog %s\n", entry->URL); ++ xmlFreeCatalogEntry(entry, NULL); ++ entry = NULL; ++ break; ++ } ++ prev = prev->next; ++ } + } + if (entry != NULL) { + if (parent != NULL) { +-- +GitLab + + diff --git a/pkgs/development/libraries/libxml2/CVE-2025-6021.patch b/pkgs/development/libraries/libxml2/CVE-2025-6021.patch deleted file mode 100644 index 7d20a17c7038..000000000000 --- a/pkgs/development/libraries/libxml2/CVE-2025-6021.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 deleted file mode 100644 index b66f24e305e0..000000000000 --- a/pkgs/development/libraries/libxml2/CVE-2025-6170.patch +++ /dev/null @@ -1,112 +0,0 @@ -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/default.nix b/pkgs/development/libraries/libxml2/default.nix index 41d2b1f953f0..be187c33ffc4 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -8,39 +8,35 @@ let packages = { libxml2_13 = callPackage ./common.nix { - version = "2.13.8"; + version = "2.13.9"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "libxml2"; tag = "v${packages.libxml2_13.version}"; - hash = "sha256-acemyYs1yRSTSLH7YCGxnQzrEDm8YPTK4HtisC36LsY="; + hash = "sha256-1qrgoMu702MglErNH9N2eCWFqxQnNHepR13m53GJb58="; }; 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 - (fetchpatch { - name = "CVE-2025-49794-49796.patch"; - url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/f7ebc65f05bffded58d1e1b2138eb124c2e44f21.patch"; - hash = "sha256-p5Vc/lkakHKsxuFNnCQtFczjqFJBeLnCwIwv2GnrQco="; - }) - (fetchpatch { - name = "CVE-2025-49795.patch"; - url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/c24909ba2601848825b49a60f988222da3019667.patch"; - hash = "sha256-vICVSb+X89TTE4QY92/v/6fRk77Hy9vzEWWsADHqMlk="; - 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 - # 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 + + (fetchpatch { + name = "CVE-2026-0990.patch"; + url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/1961208e958ca22f80a0b4e4c9d71cfa050aa982.patch"; + hash = "sha256-Df2WLCTsP/ItSzgnVkNjRpLKkBP4xUOXEfCUV9o/Yks="; + }) + + # Based on https://gitlab.gnome.org/GNOME/libxml2/-/commit/f75abfcaa419a740a3191e56c60400f3ff18988d + # Vendored, because there is no xmlCatalogPrintDebug in 2.13.9, use fprintf instead + ./2.13-CVE-2026-0992.patch + + # Based on https://gitlab.gnome.org/GNOME/libxml2/-/commit/19549c61590c1873468c53e0026a2fbffae428ef.patch + # There are only whitespace differences from upstream. + ./2.13-CVE-2026-0989.patch ]; freezeUpdateScript = true; extraMeta = { @@ -58,6 +54,23 @@ let tag = "v${packages.libxml2.version}"; hash = "sha256-FUfYMq5xT2i88JdIw9OtSofraUL3yjsyOVund+mfJKQ="; }; + extraPatches = [ + (fetchpatch { + name = "CVE-2026-0990.patch"; + url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/1961208e958ca22f80a0b4e4c9d71cfa050aa982.patch"; + hash = "sha256-Df2WLCTsP/ItSzgnVkNjRpLKkBP4xUOXEfCUV9o/Yks="; + }) + (fetchpatch { + name = "CVE-2026-0992.patch"; + url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/f75abfcaa419a740a3191e56c60400f3ff18988d.patch"; + hash = "sha256-an/PpmsncNwim/pe/zsDx9P6jbuCqvr4QSgTokyDvzw="; + }) + (fetchpatch { + name = "CVE-2026-0989.patch"; + url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/19549c61590c1873468c53e0026a2fbffae428ef.patch"; + hash = "sha256-YOF5cYdoFQuvsbcAezamglh/RKv8Zq6rm1nfo2/CLzo="; + }) + ]; extraMeta = { maintainers = with lib.maintainers; [ jtojnar diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index efc54fd6fca0..b05d452fa04d 100644 --- a/pkgs/development/libraries/ngtcp2/default.nix +++ b/pkgs/development/libraries/ngtcp2/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "ngtcp2"; - version = "1.18.0"; + version = "1.19.0"; src = fetchurl { url = "https://github.com/ngtcp2/ngtcp2/releases/download/v${finalAttrs.version}/ngtcp2-${finalAttrs.version}.tar.bz2"; - hash = "sha256-E7r7bFCdv2pw2WBaLIkuE/WuuTZnOZWHeKhXvHDOH6c="; + hash = "sha256-snZBbT1cChV4En+8Q2qXLRD0vK66g6aj2ukbQcxRqTI="; }; outputs = [ diff --git a/pkgs/development/libraries/openssl/3.5/use-etc-ssl-certs-darwin.patch b/pkgs/development/libraries/openssl/3.5/use-etc-ssl-certs-darwin.patch deleted file mode 100644 index e8b07b4ae599..000000000000 --- a/pkgs/development/libraries/openssl/3.5/use-etc-ssl-certs-darwin.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/include/internal/common.h b/include/internal/common.h -index 15666f1..d91e25b 100644 ---- a/include/internal/common.h -+++ b/include/internal/common.h -@@ -83,7 +83,7 @@ __owur static ossl_inline int ossl_assert_int(int expr, const char *exprstr, - # ifndef OPENSSL_SYS_VMS - # define X509_CERT_AREA OPENSSLDIR - # define X509_CERT_DIR OPENSSLDIR "/certs" --# define X509_CERT_FILE OPENSSLDIR "/cert.pem" -+# define X509_CERT_FILE "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt" - # define X509_PRIVATE_DIR OPENSSLDIR "/private" - # define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf" - # else diff --git a/pkgs/development/libraries/openssl/3.5/use-etc-ssl-certs.patch b/pkgs/development/libraries/openssl/3.5/use-etc-ssl-certs.patch deleted file mode 100644 index 13a36fbcd031..000000000000 --- a/pkgs/development/libraries/openssl/3.5/use-etc-ssl-certs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/include/internal/common.h b/include/internal/common.h -index 15666f1..d91e25b 100644 ---- a/include/internal/common.h -+++ b/include/internal/common.h -@@ -83,7 +83,7 @@ __owur static ossl_inline int ossl_assert_int(int expr, const char *exprstr, - # ifndef OPENSSL_SYS_VMS - # define X509_CERT_AREA OPENSSLDIR - # define X509_CERT_DIR OPENSSLDIR "/certs" --# define X509_CERT_FILE OPENSSLDIR "/cert.pem" -+# define X509_CERT_FILE "/etc/ssl/certs/ca-certificates.crt" - # define X509_PRIVATE_DIR OPENSSLDIR "/private" - # define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf" - # else diff --git a/pkgs/development/libraries/openssl/3.6/use-etc-ssl-certs-darwin.patch b/pkgs/development/libraries/openssl/3.6/use-etc-ssl-certs-darwin.patch new file mode 100644 index 000000000000..bb2d048542cb --- /dev/null +++ b/pkgs/development/libraries/openssl/3.6/use-etc-ssl-certs-darwin.patch @@ -0,0 +1,13 @@ +diff --git a/include/internal/common.h b/include/internal/common.h +index 15666f1..d91e25b 100644 +--- a/include/internal/common.h ++++ b/include/internal/common.h +@@ -83,7 +83,7 @@ __owur static ossl_inline int ossl_assert_int(int expr, const char *exprstr, + #ifndef OPENSSL_SYS_VMS + #define X509_CERT_AREA OPENSSLDIR + #define X509_CERT_DIR OPENSSLDIR "/certs" +-#define X509_CERT_FILE OPENSSLDIR "/cert.pem" ++#define X509_CERT_FILE "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt" + #define X509_PRIVATE_DIR OPENSSLDIR "/private" + #define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf" + #else diff --git a/pkgs/development/libraries/openssl/3.6/use-etc-ssl-certs.patch b/pkgs/development/libraries/openssl/3.6/use-etc-ssl-certs.patch new file mode 100644 index 000000000000..e0fb994161de --- /dev/null +++ b/pkgs/development/libraries/openssl/3.6/use-etc-ssl-certs.patch @@ -0,0 +1,13 @@ +diff --git a/include/internal/common.h b/include/internal/common.h +index 15666f1..d91e25b 100644 +--- a/include/internal/common.h ++++ b/include/internal/common.h +@@ -83,7 +83,7 @@ __owur static ossl_inline int ossl_assert_int(int expr, const char *exprstr, + #ifndef OPENSSL_SYS_VMS + #define X509_CERT_AREA OPENSSLDIR + #define X509_CERT_DIR OPENSSLDIR "/certs" +-#define X509_CERT_FILE OPENSSLDIR "/cert.pem" ++#define X509_CERT_FILE "/etc/ssl/certs/ca-certificates.crt" + #define X509_PRIVATE_DIR OPENSSLDIR "/private" + #define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf" + #else diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 25a046309a54..f107a2242c07 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -463,8 +463,8 @@ in }; openssl_3_6 = common { - version = "3.6.0"; - hash = "sha256-tqX0S362nj+jXb8VUkQFtEg3pIHUPYHa3d4/8h/LuOk="; + version = "3.6.1"; + hash = "sha256-sb/tzVson/Iq7ofJ1gD1FXZ+v0X3cWjLbWTyMfUYqC4="; patches = [ # Support for NIX_SSL_CERT_FILE, motivation: @@ -478,9 +478,9 @@ in # Look up SSL certificates in /etc rather than the immutable installation directory ( if stdenv.hostPlatform.isDarwin then - ./3.5/use-etc-ssl-certs-darwin.patch + ./3.6/use-etc-ssl-certs-darwin.patch else - ./3.5/use-etc-ssl-certs.patch + ./3.6/use-etc-ssl-certs.patch ) ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index c85d46a34a36..e7e1b0a87353 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -80,7 +80,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "pipewire"; - version = "1.4.9"; + version = "1.4.10"; outputs = [ "out" @@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "pipewire"; repo = "pipewire"; rev = finalAttrs.version; - sha256 = "sha256-380KY17l6scVchZAoSHswTvceYl427e79eU11JQallc="; + sha256 = "sha256-/Av2iXWInsY6S+PdbfCm1AFtHEFt4LXhgRJ6r9lqOpM="; }; patches = [ diff --git a/pkgs/development/libraries/protobuf/33.nix b/pkgs/development/libraries/protobuf/33.nix index 3945cf75cc8a..a1973638f0eb 100644 --- a/pkgs/development/libraries/protobuf/33.nix +++ b/pkgs/development/libraries/protobuf/33.nix @@ -2,8 +2,8 @@ callPackage ./generic.nix ( { - version = "33.3"; - hash = "sha256-why+EKsH19jSj6LmlUySidx6shbvpItVjWq5deH3EXw="; + version = "33.5"; + hash = "sha256-bn8wMZSAqukZyo+fLT4O044ld53FvIfCdajr2WwM93E="; } // args ) diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index dd19dd083a3b..8099f04007d2 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -13,7 +13,6 @@ zlib, version, hash, - replaceVars, versionCheckHook, # downstream dependencies @@ -58,6 +57,18 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/protocolbuffers/protobuf/commit/0e9d0f6e77280b7a597ebe8361156d6bb1971dca.patch"; hash = "sha256-rIP+Ft/SWVwh9Oy8y8GSUBgP6CtLCLvGmr6nOqmyHhY="; }) + ] + ++ lib.optionals (lib.versionAtLeast version "30") [ + # workaround nvcc bug in message_lite.h + # https://github.com/protocolbuffers/protobuf/issues/21542 + # Caused by: https://github.com/protocolbuffers/protobuf/commit/8f7aab29b21afb89ea0d6e2efeafd17ca71486a9 + # + # A specific consequence of this bug is a test failure when building onnxruntime with cudaSupport + # See https://github.com/NixOS/nixpkgs/pull/450587#discussion_r2698215974 + (fetchpatch { + url = "https://github.com/protocolbuffers/protobuf/commit/211f52431b9ec30d4d4a1c76aafd64bd78d93c43.patch"; + hash = "sha256-2/vc4anc+kH7otfLHfBtW8dRowPyObiXZn0+HtQktak="; + }) ]; preHook = '' diff --git a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh index 42b685e7f792..6f7cdac0c941 100644 --- a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh @@ -1,5 +1,7 @@ if [[ -z "${__nix_wrapQtAppsHook-}" ]]; then -__nix_wrapQtAppsHook=1 # Don't run this hook more than once. +__nix_wrapQtAppsHook=1 +# wrap only once per output +declare -a qtWrapperDoneForOuputs # Inherit arguments given in mkDerivation qtWrapperArgs=( ${qtWrapperArgs-} ) @@ -72,12 +74,17 @@ wrapQtAppsHook() { # skip this hook when requested [ -z "${dontWrapQtApps-}" ] || return 0 - # guard against running multiple times (e.g. due to propagation) - [ -z "$wrapQtAppsHookHasRun" ] || return 0 - wrapQtAppsHookHasRun=1 + local doneOutput + for doneOutput in "${qtWrapperDoneForOuputs[@]}"; do + if [ "$doneOutput" = "$prefix" ]; then + nixWarnLog "Warning: attempted to wrapQtAppsHook $prefix a second time" + return 0 + fi + done + qtWrapperDoneForOuputs+=("$prefix") local targetDirs=( "$prefix/bin" "$prefix/sbin" "$prefix/libexec" "$prefix/Applications" "$prefix/"*.app ) - echo "wrapping Qt applications in ${targetDirs[@]}" + echo "wrapping Qt applications in ${targetDirs[*]}" for targetDir in "${targetDirs[@]}" do diff --git a/pkgs/development/libraries/qt-6/fetch.sh b/pkgs/development/libraries/qt-6/fetch.sh index 06f618c23179..7e4781e5114e 100644 --- a/pkgs/development/libraries/qt-6/fetch.sh +++ b/pkgs/development/libraries/qt-6/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.qt.io/official_releases/qt/6.10/6.10.1/submodules/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.qt.io/official_releases/qt/6.10/6.10.2/submodules/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh b/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh index cc3e9179475d..18056b9ddf3b 100644 --- a/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh +++ b/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh @@ -1,5 +1,7 @@ if [[ -z "${__nix_wrapQtAppsHook-}" ]]; then - __nix_wrapQtAppsHook=1 # Don't run this hook more than once. + __nix_wrapQtAppsHook=1 + # wrap only once per output + declare -a qtWrapperDoneForOuputs # Inherit arguments given in mkDerivation qtWrapperArgs=(${qtWrapperArgs-}) @@ -71,11 +73,17 @@ if [[ -z "${__nix_wrapQtAppsHook-}" ]]; then [ -z "${dontWrapQtApps-}" ] || return 0 # guard against running multiple times (e.g. due to propagation) - [ -z "$wrapQtAppsHookHasRun" ] || return 0 - wrapQtAppsHookHasRun=1 + local doneOutput + for doneOutput in "${qtWrapperDoneForOuputs[@]}"; do + if [ "$doneOutput" = "$prefix" ]; then + nixWarnLog "Warning: attempted to wrapQtAppsHook $prefix a second time" + return 0 + fi + done + qtWrapperDoneForOuputs+=("$prefix") local targetDirs=("$prefix/bin" "$prefix/sbin" "$prefix/libexec" "$prefix/Applications" "$prefix/"*.app) - echo "wrapping Qt applications in ${targetDirs[@]}" + echo "wrapping Qt applications in ${targetDirs[*]}" for targetDir in "${targetDirs[@]}"; do [ -d "$targetDir" ] || continue diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix index 400d503240fc..040041f93b3c 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix @@ -9,6 +9,8 @@ lndir, perl, pkg-config, + copyPathToStore, + makeSetupHook, which, cmake, ninja, @@ -90,8 +92,12 @@ let isCrossBuild = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; + fix_qt_builtin_paths = copyPathToStore ../../hooks/fix-qt-builtin-paths.sh; + fix_qt_module_paths = copyPathToStore ../../hooks/fix-qt-module-paths.sh; + qtPluginPrefix = "lib/qt-6/plugins"; + qtQmlPrefix = "lib/qt-6/qml"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "qtbase"; inherit src version; @@ -261,16 +267,11 @@ stdenv.mkDerivation rec { --replace-fail 'CONFIG += ' 'CONFIG += no_default_rpath ' ''; - fix_qt_builtin_paths = ../../hooks/fix-qt-builtin-paths.sh; - fix_qt_module_paths = ../../hooks/fix-qt-module-paths.sh; preHook = '' - . "$fix_qt_builtin_paths" - . "$fix_qt_module_paths" + . ${fix_qt_builtin_paths} + . ${fix_qt_module_paths} ''; - qtPluginPrefix = "lib/qt-6/plugins"; - qtQmlPrefix = "lib/qt-6/qml"; - cmakeFlags = [ # makes Qt print the configure summary "--log-level=STATUS" @@ -329,7 +330,25 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; - setupHook = ../../hooks/qtbase-setup-hook.sh; + setupHook = + let + hook = makeSetupHook { + name = "qtbase6-setup-hook"; + substitutions = { + inherit + fix_qt_builtin_paths + fix_qt_module_paths + qtPluginPrefix + qtQmlPrefix + ; + }; + } ../../hooks/qtbase-setup-hook.sh; + in + "${hook}/nix-support/setup-hook"; + + passthru = { + inherit qtPluginPrefix qtQmlPrefix; + }; meta = { homepage = "https://www.qt.io/"; diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/no-sbom.patch b/pkgs/development/libraries/qt-6/modules/qtbase/no-sbom.patch index d26bf4267c13..bed920da611f 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase/no-sbom.patch +++ b/pkgs/development/libraries/qt-6/modules/qtbase/no-sbom.patch @@ -1,13 +1,13 @@ diff --git a/cmake/QtPublicSbomHelpers.cmake b/cmake/QtPublicSbomHelpers.cmake -index 3767fb4ff26..b642ea3e4b6 100644 +index 45342c2efb6..74bf58e6246 100644 --- a/cmake/QtPublicSbomHelpers.cmake +++ b/cmake/QtPublicSbomHelpers.cmake -@@ -369,7 +369,7 @@ function(_qt_internal_setup_sbom) - endif() +@@ -538,7 +538,7 @@ function(_qt_internal_setup_sbom) + # Main SBOM toggle. Used to be the toggle for SPDX v2.3 only, but now would also enable Cyclone + # DX as well. + set(sbom_help_string "Generate SBOM.") +- option(QT_GENERATE_SBOM "${sbom_help_string}" "${default_value}") ++ option(QT_GENERATE_SBOM "${sbom_help_string}" OFF) - option(QT_GENERATE_SBOM "Generate SBOM documents in SPDX v2.3 tag:value format." -- "${default_value}") -+ OFF) - string(CONCAT help_string - "Generate SBOM documents in SPDX v2.3 JSON format if required python dependency " + # Toggle for SPDX V2.3 generation. diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix index d78544b8dc8d..972a8f372170 100644 --- a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix @@ -10,7 +10,6 @@ lib, pkgsBuildBuild, replaceVars, - fetchpatch, }: qtModule { @@ -37,29 +36,10 @@ qtModule { # add version specific QML import path ./use-versioned-import-path.patch - # fix common Plasma crasher - # FIXME: remove in 6.10.2 - (fetchpatch { - url = "https://github.com/qt/qtdeclarative/commit/9c6b2b78e9076f1c2676aa0c41573db9ca480654.diff"; - hash = "sha256-KMFurA9Q84qwuyBraU3ZdoFWs8uO3uoUcinfcfh/ps8="; - }) - # Backport of https://codereview.qt-project.org/c/qt/qtdeclarative/+/704031 # Fixes common Plasma crash # FIXME: remove in 6.10.3 ./another-crash-fix.patch - - # https://qt-project.atlassian.net/browse/QTBUG-137440 - (fetchpatch { - name = "rb-dialogs-link-labsfolderlistmodel-into-quickdialogs2quickimpl.patch"; - url = "https://github.com/qt/qtdeclarative/commit/4047fa8c6017d8e214e6ec3ddbed622fd34058e4.patch"; - hash = "sha256-0a7a1AI8N35rqLY4M3aSruXXPBqz9hX2yT65r/xzfhc="; - }) - (fetchpatch { - name = "rb-quickcontrols-fix-controls-styles-linkage.patch"; - url = "https://github.com/qt/qtdeclarative/commit/aa805ed54d55479360e0e95964dcc09a858aeb28.patch"; - hash = "sha256-EDdsXRokHPQ5jflaVucOZP3WSopMjrAM39WZD1Hk/5I="; - }) ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix index e2f1b86f12b0..ea00d966e8a3 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix @@ -6,13 +6,13 @@ qtModule rec { pname = "qtmqtt"; - version = "6.10.1"; + version = "6.10.2"; src = fetchFromGitHub { owner = "qt"; repo = "qtmqtt"; tag = "v${version}"; - hash = "sha256-ve9fyhUZFI6TAr/SFRXJudA1yTmTlg8+Fgyc9OUv3ds="; + hash = "sha256-NjYvL6BCn0UP7F2CW81upzZ8EwFAkhoUa5cdaH0uhM4="; }; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/qt-6/modules/qtvirtualkeyboard.nix b/pkgs/development/libraries/qt-6/modules/qtvirtualkeyboard.nix index fe333c4ab623..4c9f449f5a19 100644 --- a/pkgs/development/libraries/qt-6/modules/qtvirtualkeyboard.nix +++ b/pkgs/development/libraries/qt-6/modules/qtvirtualkeyboard.nix @@ -5,7 +5,6 @@ qtsvg, hunspell, pkg-config, - fetchpatch, }: qtModule { @@ -17,12 +16,4 @@ qtModule { hunspell ]; nativeBuildInputs = [ pkg-config ]; - patches = [ - # https://qt-project.atlassian.net/browse/QTBUG-137440 - (fetchpatch { - name = "rb-link-core-into-styles.patch"; - url = "https://github.com/qt/qtvirtualkeyboard/commit/0b1e8be8dd874e1fbacd0c30ed5be7342f6cd44d.patch"; - hash = "sha256-Uk6EJOlkCRLUg1w3ljHaxV/dXEVWyUpP/ijoyjptbNc="; - }) - ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix index ac01102f18b2..c76700cbd193 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix @@ -33,6 +33,7 @@ harfbuzz, icu, dbus, + expat, libdrm, zlib, minizip, @@ -116,12 +117,6 @@ qtModule { # Reproducibility QTBUG-136068 ./gn-object-sorted.patch - - # Backport crash fix - (fetchpatch2 { - url = "https://invent.kde.org/qt/qt/qtwebengine/-/commit/ecf90f65ef738ae20b114691d02fb15c82e6babe.diff"; - hash = "sha256-TW+EmCxasH5LdZ80y/0YHird3NsrVdlwciDJpgSD9x0="; - }) ] ++ lib.optionals stdenv.cc.isClang [ # https://chromium-review.googlesource.com/c/chromium/src/+/6633292 @@ -237,6 +232,7 @@ qtModule { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ dbus + expat zlib minizip snappy diff --git a/pkgs/development/libraries/qt-6/srcs.nix b/pkgs/development/libraries/qt-6/srcs.nix index 38ac43ed4c39..585e16fb0148 100644 --- a/pkgs/development/libraries/qt-6/srcs.nix +++ b/pkgs/development/libraries/qt-6/srcs.nix @@ -4,315 +4,315 @@ { qt3d = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qt3d-everywhere-src-6.10.1.tar.xz"; - sha256 = "16lw0gpjcaf90iqnff95hxw3hng42c8hzknxczf4h7kv9zakynb0"; - name = "qt3d-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qt3d-everywhere-src-6.10.2.tar.xz"; + sha256 = "0vdvid42m9jyhmpclfgpc7j1ivxlj0jr23kp5pxa1v0z96fwmfzy"; + name = "qt3d-everywhere-src-6.10.2.tar.xz"; }; }; qt5compat = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qt5compat-everywhere-src-6.10.1.tar.xz"; - sha256 = "097yvzmfz9w5xsrr3dxd2gv4q826mplwmw0wnh0ywg8m18b6sfbj"; - name = "qt5compat-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qt5compat-everywhere-src-6.10.2.tar.xz"; + sha256 = "1hk18428bpp60ypjzabzpc77nr10bzignqppqppvjbn0zbq1i91z"; + name = "qt5compat-everywhere-src-6.10.2.tar.xz"; }; }; qtactiveqt = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qtactiveqt-everywhere-src-6.10.1.tar.xz"; - sha256 = "078bnj8a1faln3dibx14wxdsic5s94m00x73zwncfzx7ywczcr05"; - name = "qtactiveqt-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtactiveqt-everywhere-src-6.10.2.tar.xz"; + sha256 = "09swk8xv93gmk67v6zccxr3hjy4404q0awljfjlapas9xi10bnym"; + name = "qtactiveqt-everywhere-src-6.10.2.tar.xz"; }; }; qtbase = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qtbase-everywhere-src-6.10.1.tar.xz"; - sha256 = "0p96bnkgfb9s5aw6qkfcy1y49xgkafx1w4i36bf1zd9xwbvjcqjs"; - name = "qtbase-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtbase-everywhere-src-6.10.2.tar.xz"; + sha256 = "07pjmnwmlsbxc9zxgcazq9w4jnq6ypw50ndm7kamyaqs54lqvdxf"; + name = "qtbase-everywhere-src-6.10.2.tar.xz"; }; }; qtcharts = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qtcharts-everywhere-src-6.10.1.tar.xz"; - sha256 = "1x1adsv3nnx44y9ldfjrz4nlhacxalsixdklxypqzyvw05w2568p"; - name = "qtcharts-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtcharts-everywhere-src-6.10.2.tar.xz"; + sha256 = "001ckwq5w5w164cz2hkkb2dvci1d77mm9hf4hha9ivgdqns1cla0"; + name = "qtcharts-everywhere-src-6.10.2.tar.xz"; }; }; qtconnectivity = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qtconnectivity-everywhere-src-6.10.1.tar.xz"; - sha256 = "1zsl46nbacpkvgma9si39p8k7qhqq3cdwnfw7pij0f67j0xgvbkv"; - name = "qtconnectivity-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtconnectivity-everywhere-src-6.10.2.tar.xz"; + sha256 = "0chs66537ki0yvq94m2i3k69wf8kyr741m4wg6vbamr8ychz0n6g"; + name = "qtconnectivity-everywhere-src-6.10.2.tar.xz"; }; }; qtdatavis3d = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qtdatavis3d-everywhere-src-6.10.1.tar.xz"; - sha256 = "01xva2m5x71avdqzp48zlq57l8v7kishzg75iwjjbrbazpx7q730"; - name = "qtdatavis3d-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtdatavis3d-everywhere-src-6.10.2.tar.xz"; + sha256 = "1hav6ncccdhw2kyx608xhchpmygx6sbfap8x6ch35l53yj5l0sdp"; + name = "qtdatavis3d-everywhere-src-6.10.2.tar.xz"; }; }; qtdeclarative = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qtdeclarative-everywhere-src-6.10.1.tar.xz"; - sha256 = "0gl4akd7p0g6sf0y234lwkxvr16njjbxc19maj465fg0jjwfzd2g"; - name = "qtdeclarative-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtdeclarative-everywhere-src-6.10.2.tar.xz"; + sha256 = "03sb1wfxqvy5dhyd85yc0776vvm2jzczlpwbvzqdpp3cyr7r2jd2"; + name = "qtdeclarative-everywhere-src-6.10.2.tar.xz"; }; }; qtdoc = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qtdoc-everywhere-src-6.10.1.tar.xz"; - sha256 = "16h90yp34yn17z56y570yldl287glfasq4ayci7sk09jpd5n39h3"; - name = "qtdoc-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtdoc-everywhere-src-6.10.2.tar.xz"; + sha256 = "011pp0nf019dg790vhr9i3xiy6vspzjpr8w8xd9cpyk723nsj54c"; + name = "qtdoc-everywhere-src-6.10.2.tar.xz"; }; }; qtgraphs = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qtgraphs-everywhere-src-6.10.1.tar.xz"; - sha256 = "0vjpbv7ck5p8z38j9a70a6kgsjvfx432lvh5slmbgim33yra0ksd"; - name = "qtgraphs-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtgraphs-everywhere-src-6.10.2.tar.xz"; + sha256 = "1bvsvmwf4csl63fqf4gdqb03s97b9dl0sdyffrp9mn37lmmgr47n"; + name = "qtgraphs-everywhere-src-6.10.2.tar.xz"; }; }; qtgrpc = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qtgrpc-everywhere-src-6.10.1.tar.xz"; - sha256 = "0zspyhlhl4irwrr4vm4pg3mppyybyw0q76zlgvpj4j9wcfw8y4wq"; - name = "qtgrpc-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtgrpc-everywhere-src-6.10.2.tar.xz"; + sha256 = "0dnibqlsnra4kwk1dng4g6rrndszx5kz1p12zzjj0y8cq74vz1kk"; + name = "qtgrpc-everywhere-src-6.10.2.tar.xz"; }; }; qthttpserver = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qthttpserver-everywhere-src-6.10.1.tar.xz"; - sha256 = "0fz98hczfkkrhjmkwxi7159zpal4wvv5sb2y8pid9d2bsfb8sv52"; - name = "qthttpserver-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qthttpserver-everywhere-src-6.10.2.tar.xz"; + sha256 = "0hs6zq1qfs4yfr9bf2d089q37wcyhgvx48vq54szsn72prcqsmi6"; + name = "qthttpserver-everywhere-src-6.10.2.tar.xz"; }; }; qtimageformats = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qtimageformats-everywhere-src-6.10.1.tar.xz"; - sha256 = "0wksip3a9xszlkq6368fdkz60qszfqy3wawl13w9dnw14ggsp3j9"; - name = "qtimageformats-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtimageformats-everywhere-src-6.10.2.tar.xz"; + sha256 = "0rwxcdpzx5mls7sqvscq58hb2h01j4qpy3h07ixiw21qhrqrr3wb"; + name = "qtimageformats-everywhere-src-6.10.2.tar.xz"; }; }; qtlanguageserver = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qtlanguageserver-everywhere-src-6.10.1.tar.xz"; - sha256 = "0v2m18bbm82n9lhb0lxabqnsabfh2nga8a8yndrncmad9xmm4q1k"; - name = "qtlanguageserver-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtlanguageserver-everywhere-src-6.10.2.tar.xz"; + sha256 = "0lqdqknblw4nsv1mgi5jw6rqsf7h9zf59af7bw371d5hhhn3y14s"; + name = "qtlanguageserver-everywhere-src-6.10.2.tar.xz"; }; }; qtlocation = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qtlocation-everywhere-src-6.10.1.tar.xz"; - sha256 = "02agg502pkdqgl3156al26bn4ascgyjz6ybsd7b53p4wp7qii5ib"; - name = "qtlocation-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtlocation-everywhere-src-6.10.2.tar.xz"; + sha256 = "0g0gwldmdslzx0zjdpi3vc0pqnd266qkxynh8xy534y5xmfz04yk"; + name = "qtlocation-everywhere-src-6.10.2.tar.xz"; }; }; qtlottie = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qtlottie-everywhere-src-6.10.1.tar.xz"; - sha256 = "1hjp0hml4cih3vk9dgn3cs94klp7q2di29cdk457jva890y3d75w"; - name = "qtlottie-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtlottie-everywhere-src-6.10.2.tar.xz"; + sha256 = "1302lh7432372qy0mw2pv67miikf2ny2n103s8mhyfl30xx6pn55"; + name = "qtlottie-everywhere-src-6.10.2.tar.xz"; }; }; qtmultimedia = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qtmultimedia-everywhere-src-6.10.1.tar.xz"; - sha256 = "1f371qrcf9rp384niqxqfx0wa01m7p5hv7rjyzwz1m2052ygk97p"; - name = "qtmultimedia-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtmultimedia-everywhere-src-6.10.2.tar.xz"; + sha256 = "0aryhch6qlamgfcbrxc0d1ggq4f96vjg68r7b8b33mzv0q0yzxwk"; + name = "qtmultimedia-everywhere-src-6.10.2.tar.xz"; }; }; qtnetworkauth = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qtnetworkauth-everywhere-src-6.10.1.tar.xz"; - sha256 = "039qrymh18as1ksch470mzrxixr3fry2jnkrs7bqin3jh5cynd8l"; - name = "qtnetworkauth-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtnetworkauth-everywhere-src-6.10.2.tar.xz"; + sha256 = "1cw1355xxf0ca96xwjaw33nnrxh1qw26naa2zha5fpsh9fggsaag"; + name = "qtnetworkauth-everywhere-src-6.10.2.tar.xz"; }; }; qtpositioning = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qtpositioning-everywhere-src-6.10.1.tar.xz"; - sha256 = "08xy8rzm86b55pr8hk1g5rym7y0kblk0wj121l4rzqyn3gpi3cxb"; - name = "qtpositioning-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtpositioning-everywhere-src-6.10.2.tar.xz"; + sha256 = "1kndqjh3ylbs5a2chqv3a6jip83j6zy9dlya82c7crkw8xjgllbh"; + name = "qtpositioning-everywhere-src-6.10.2.tar.xz"; }; }; qtquick3d = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qtquick3d-everywhere-src-6.10.1.tar.xz"; - sha256 = "1rh3wi6pxahdpzlnxw8xrxfx5l931k7kncv03fvxmw6fprr05m0p"; - name = "qtquick3d-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtquick3d-everywhere-src-6.10.2.tar.xz"; + sha256 = "0xfdlafzz7k3vps0kzz4mnyv0cmr0f5v8a4qkqvhqn0y3prkjm5r"; + name = "qtquick3d-everywhere-src-6.10.2.tar.xz"; }; }; qtquick3dphysics = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qtquick3dphysics-everywhere-src-6.10.1.tar.xz"; - sha256 = "1vigiln79xy6xgr00wgmbfngqqpv6wsr5pviww8yfvmyy5yq8wyr"; - name = "qtquick3dphysics-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtquick3dphysics-everywhere-src-6.10.2.tar.xz"; + sha256 = "1nqw5kqrivmajbw2sqxll8zgqjk79g2pic8rghfkb52ps1xzdbxp"; + name = "qtquick3dphysics-everywhere-src-6.10.2.tar.xz"; }; }; qtquickeffectmaker = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qtquickeffectmaker-everywhere-src-6.10.1.tar.xz"; - sha256 = "1jdc2bgkrk1kl72h2cjb6j8p9pd2p7ck0zbw9afgam2hqm69hdih"; - name = "qtquickeffectmaker-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtquickeffectmaker-everywhere-src-6.10.2.tar.xz"; + sha256 = "1i62d7s6fl4lf92cfwljk7blirz82mv174k1d5nrw38c9qxz3jp3"; + name = "qtquickeffectmaker-everywhere-src-6.10.2.tar.xz"; }; }; qtquicktimeline = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qtquicktimeline-everywhere-src-6.10.1.tar.xz"; - sha256 = "1dsiwbvd5gqlwm87s05w4qb20731sxqmlm724kisqaf2nj4x4bl8"; - name = "qtquicktimeline-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtquicktimeline-everywhere-src-6.10.2.tar.xz"; + sha256 = "0933sggxp28mybdr8wgfyny9m0c23h70f3fy1mwxy7yjb2vxhckh"; + name = "qtquicktimeline-everywhere-src-6.10.2.tar.xz"; }; }; qtremoteobjects = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qtremoteobjects-everywhere-src-6.10.1.tar.xz"; - sha256 = "03cakd52p33qi8cjn9zjjmympjd74bc2fsk22cyy6064wbdmd7kw"; - name = "qtremoteobjects-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtremoteobjects-everywhere-src-6.10.2.tar.xz"; + sha256 = "1kb5xd1ckp4phq820rl9h6nbaryrybzk2zxlq83cykg79w23ys5w"; + name = "qtremoteobjects-everywhere-src-6.10.2.tar.xz"; }; }; qtscxml = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qtscxml-everywhere-src-6.10.1.tar.xz"; - sha256 = "0s8q7873bklgd19ynwil0fxi03m0b7wbx39z07iqim66skjs0rzb"; - name = "qtscxml-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtscxml-everywhere-src-6.10.2.tar.xz"; + sha256 = "0si3vpzva8wyqa0gh0fyk75knlgmsyjalahp41nv1cginf6ig70g"; + name = "qtscxml-everywhere-src-6.10.2.tar.xz"; }; }; qtsensors = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qtsensors-everywhere-src-6.10.1.tar.xz"; - sha256 = "15dkhkb6hfybzy4wib3w2bzjqmkymi7fzb7wdmq8jii36gh9rkj9"; - name = "qtsensors-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtsensors-everywhere-src-6.10.2.tar.xz"; + sha256 = "10gmis63gpqhbb7ljy1gx3gh7hww6psk66c6jqvaxgzbgidm3rli"; + name = "qtsensors-everywhere-src-6.10.2.tar.xz"; }; }; qtserialbus = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qtserialbus-everywhere-src-6.10.1.tar.xz"; - sha256 = "1m9ymfggv3l8lj7ji6kgayr5x6cisi20r3ikasbsbpzjgbvzqf95"; - name = "qtserialbus-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtserialbus-everywhere-src-6.10.2.tar.xz"; + sha256 = "0yrsg50gmjlxnp1574fzkfbxls1cmjkn1qpagayhx55nrzzbydj7"; + name = "qtserialbus-everywhere-src-6.10.2.tar.xz"; }; }; qtserialport = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qtserialport-everywhere-src-6.10.1.tar.xz"; - sha256 = "0k2c1zbx20mcrn6hkcnsxy1252g1ycjh3mszqyh8axzn6n2gdchp"; - name = "qtserialport-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtserialport-everywhere-src-6.10.2.tar.xz"; + sha256 = "0sxxvrn1bwrzm140988prn12f14pj15v8z3yxs7zl7qiv8lvy35l"; + name = "qtserialport-everywhere-src-6.10.2.tar.xz"; }; }; qtshadertools = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qtshadertools-everywhere-src-6.10.1.tar.xz"; - sha256 = "1djvynddqksxnbb94m2pvf1ngkdqc8631xa61nnkvdaj6fk98y5n"; - name = "qtshadertools-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtshadertools-everywhere-src-6.10.2.tar.xz"; + sha256 = "1j8ncwhjcy2k6p05cldnb20vbqijq1frdac9xpk9cvky9yydpn8q"; + name = "qtshadertools-everywhere-src-6.10.2.tar.xz"; }; }; qtspeech = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qtspeech-everywhere-src-6.10.1.tar.xz"; - sha256 = "0kvzic83d98szj6scgkm6hhj1p6jgr3i17c1523dw43f1xafrjj2"; - name = "qtspeech-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtspeech-everywhere-src-6.10.2.tar.xz"; + sha256 = "051h4v0qqjkz1brkypx6i2wzdpn8pwz5353f0f7hsavr2p3zcdyr"; + name = "qtspeech-everywhere-src-6.10.2.tar.xz"; }; }; qtsvg = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qtsvg-everywhere-src-6.10.1.tar.xz"; - sha256 = "07xh78s2krgnhvdsysf2ji5dicmfns4g92v2990czfzkb1d3aby0"; - name = "qtsvg-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtsvg-everywhere-src-6.10.2.tar.xz"; + sha256 = "1qfnv8ssflndjhv6r8s9vxfl8yblra956d00f8c3bwna707zhzzh"; + name = "qtsvg-everywhere-src-6.10.2.tar.xz"; }; }; qttools = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qttools-everywhere-src-6.10.1.tar.xz"; - sha256 = "16yl0hj540bnf1c1w4h7ph6s6bk15f0mqc1638807spzh21l0j41"; - name = "qttools-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qttools-everywhere-src-6.10.2.tar.xz"; + sha256 = "092vimkdpad6q9dilkhc45wmzzzs5ykfmbkfbi1d4xpxq43jqg8y"; + name = "qttools-everywhere-src-6.10.2.tar.xz"; }; }; qttranslations = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qttranslations-everywhere-src-6.10.1.tar.xz"; - sha256 = "0513kpwmsmmk85rwzh77nkmmgkwi58kvvrws8xm3fb51i3gs4jcf"; - name = "qttranslations-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qttranslations-everywhere-src-6.10.2.tar.xz"; + sha256 = "0i56a03b7f6snvxfjsa5q4mnw6x7kxjnx2yw2rbm8sypr4xq3cxk"; + name = "qttranslations-everywhere-src-6.10.2.tar.xz"; }; }; qtvirtualkeyboard = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qtvirtualkeyboard-everywhere-src-6.10.1.tar.xz"; - sha256 = "1pxnp4lg6i3v57ynqvisljp3dmfcjpp6q0dr0av03g5gi0qxx72v"; - name = "qtvirtualkeyboard-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtvirtualkeyboard-everywhere-src-6.10.2.tar.xz"; + sha256 = "0swqvcgp6p80k2g7nzb6dcjr2spxcj4lk48s7ll3ygx8j5h2awv2"; + name = "qtvirtualkeyboard-everywhere-src-6.10.2.tar.xz"; }; }; qtwayland = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qtwayland-everywhere-src-6.10.1.tar.xz"; - sha256 = "04yb4x7k0dv4m7j6qagvgxz2k08yvl1msk0zjwn6nyi202w6vgs9"; - name = "qtwayland-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtwayland-everywhere-src-6.10.2.tar.xz"; + sha256 = "1qkyabklzzzbh4ryxhbnvnpz52vzqvyqwzd6lqkdy6978gmrh69r"; + name = "qtwayland-everywhere-src-6.10.2.tar.xz"; }; }; qtwebchannel = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qtwebchannel-everywhere-src-6.10.1.tar.xz"; - sha256 = "049iv4vhzx061ka5skz2803npjsb477c20nfxxc0zrihy8jnk8bv"; - name = "qtwebchannel-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtwebchannel-everywhere-src-6.10.2.tar.xz"; + sha256 = "09rc9y51bdb46pj7wad59gycy2l4ki3siizxai6kgq0risgsa7p3"; + name = "qtwebchannel-everywhere-src-6.10.2.tar.xz"; }; }; qtwebengine = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qtwebengine-everywhere-src-6.10.1.tar.xz"; - sha256 = "1qyix9wbb2k96ybfavl56ffh3s6kbkfswvv5irmrlhm0hrhymdbp"; - name = "qtwebengine-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtwebengine-everywhere-src-6.10.2.tar.xz"; + sha256 = "07ln4f89qlxvsxg5gjwvwqhcfkhvf5kympk7hmhqi6m6jbrdsvl5"; + name = "qtwebengine-everywhere-src-6.10.2.tar.xz"; }; }; qtwebsockets = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qtwebsockets-everywhere-src-6.10.1.tar.xz"; - sha256 = "00dxjl3zr2vgj374vd31frnp8sxxknl3pmw46cxv3qhq8klwfai7"; - name = "qtwebsockets-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtwebsockets-everywhere-src-6.10.2.tar.xz"; + sha256 = "1g9fnj73q3s8a49qzhr1iv2h7z50hwwnja80s9bgd7jhx8dpbk7c"; + name = "qtwebsockets-everywhere-src-6.10.2.tar.xz"; }; }; qtwebview = { - version = "6.10.1"; + version = "6.10.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.1/submodules/qtwebview-everywhere-src-6.10.1.tar.xz"; - sha256 = "0vvgn95bkrisjqwml16964zk0r9s6qvc6g81anl69xbs7mc80422"; - name = "qtwebview-everywhere-src-6.10.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtwebview-everywhere-src-6.10.2.tar.xz"; + sha256 = "1d7as06xmbmjx1rfnhrvizhy85dz3xdlx3pzy370r44q17zhdi3y"; + name = "qtwebview-everywhere-src-6.10.2.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/spandsp/common.nix b/pkgs/development/libraries/spandsp/common.nix index 317e5494f790..1aacb0f1123f 100644 --- a/pkgs/development/libraries/spandsp/common.nix +++ b/pkgs/development/libraries/spandsp/common.nix @@ -45,12 +45,18 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs autogen.sh - - # pkg-config? What's that? - # Actually *check* the value given for --{en,dis}able-tests, not just whether the option was passed + '' + # pkg-config? What's that? + # Actually *check* the value given for --{en,dis}able-tests, not just whether the option was passed + + '' substituteInPlace configure.ac \ --replace-fail '$xml2_include_dir /usr/include /usr/local/include /usr/include/libxml2 /usr/local/include/libxml2' '$xml2_include_dir ${lib.getDev libxml2}/include ${lib.getDev libxml2}/include/libxml2 /usr/local/include/libxml2' \ --replace-fail 'if test -n "$enable_tests" ; then' 'if test "$enable_tests" = "yes" ; then' + '' + # Don't install generated test data + + '' + substituteInPlace test-data/{etsi,itu}/fax/Makefile.am \ + --replace-fail 'nobase_data_DATA' 'noinst_DATA' ''; outputs = [ diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 51afd948b2ac..9c6d4d86828d 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, unzip, + tcl, zlib, readline, ncurses, @@ -32,8 +33,8 @@ stdenv.mkDerivation rec { # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { - url = "https://sqlite.org/2026/sqlite-autoconf-${archiveVersion version}.tar.gz"; - hash = "sha256-+9ifhmsUA7tmoUMGVEAInddhAPIjgxTZInSggtTyt7s="; + url = "https://sqlite.org/2026/sqlite-src-${archiveVersion version}.zip"; + hash = "sha256-hREPdi1QeUFNmd1deRe8P/fgWHbmzL0T2ElqOBfyCCk="; }; docsrc = fetchurl { url = "https://sqlite.org/2026/sqlite-doc-${archiveVersion version}.zip"; @@ -55,6 +56,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip + tcl ]; buildInputs = [ zlib @@ -74,10 +76,13 @@ stdenv.mkDerivation rec { # on a per-output basis. setOutputFlags = false; + env.TCLLIBDIR = "${placeholder "out"}/lib"; + configureFlags = [ "--bindir=${placeholder "bin"}/bin" "--includedir=${placeholder "dev"}/include" "--libdir=${placeholder "out"}/lib" + (if stdenv.hostPlatform.isStatic then "--disable-tcl" else "--with-tcl=${lib.getLib tcl}/lib") ] ++ lib.optional (!interactive) "--disable-readline" # autosetup only looks up readline.h in predefined set of directories. @@ -95,6 +100,7 @@ stdenv.mkDerivation rec { "-DSQLITE_ENABLE_FTS5" "-DSQLITE_ENABLE_GEOPOLY" "-DSQLITE_ENABLE_MATH_FUNCTIONS" + "-DSQLITE_ENABLE_PERCENTILE" "-DSQLITE_ENABLE_PREUPDATE_HOOK" "-DSQLITE_ENABLE_RBU" "-DSQLITE_ENABLE_RTREE" @@ -123,7 +129,10 @@ stdenv.mkDerivation rec { mv sqlite-doc-${archiveVersion version} $doc/share/doc/sqlite ''; - doCheck = false; # fails to link against tcl + # SQLite’s tests are unreliable on Darwin. Sometimes they run successfully, but often they do not. + doCheck = !stdenv.hostPlatform.isDarwin; + # When tcl is not available, only run test targets that don't need it. + checkTarget = lib.optionalString stdenv.hostPlatform.isStatic "fuzztest sourcetest"; passthru = { tests = { diff --git a/pkgs/development/libraries/wayland/darwin.patch b/pkgs/development/libraries/wayland/darwin.patch index 8300307398cf..2c6d923e267c 100644 --- a/pkgs/development/libraries/wayland/darwin.patch +++ b/pkgs/development/libraries/wayland/darwin.patch @@ -1,5 +1,35 @@ +diff --git a/egl/wayland-egl-symbols-check b/egl/wayland-egl-symbols-check +index d04fd042f..82b9499d1 100755 +--- a/egl/wayland-egl-symbols-check ++++ b/egl/wayland-egl-symbols-check +@@ -14,7 +14,15 @@ if ! test -n "$NM"; then + exit 99 + fi + +-AVAIL_FUNCS="$($NM -D --format=bsd --defined-only $LIB | awk '{print $3}')" ++if [ "$(uname)" == "Darwin" ]; then ++ NM_DYNSYM_TABLE="" ++ SYMBOL_PREFIX="_" ++else ++ NM_DYNSYM_TABLE="-D" ++ SYMBOL_PREFIX="" ++fi ++ ++AVAIL_FUNCS="$($NM ${NM_DYNSYM_TABLE} --format=bsd --defined-only $LIB | awk '{print $3}')" + + # Official ABI, taken from the header. + REQ_FUNCS="wl_egl_window_resize +@@ -37,7 +45,7 @@ if test -n "$NEW_ABI"; then + fi + + REMOVED_ABI=$(echo "$REQ_FUNCS" | while read func; do +- echo "$AVAIL_FUNCS" | grep -q "^$func$" && continue ++ echo "$AVAIL_FUNCS" | grep -q "^${SYMBOL_PREFIX}$func$" && continue + + echo $func + done) diff --git a/meson.build b/meson.build -index 8e28f2a..c8d1dc9 100644 +index a3126b63e..97a9036c2 100644 --- a/meson.build +++ b/meson.build @@ -16,7 +16,7 @@ config_h.set_quoted('PACKAGE', meson.project_name()) @@ -7,68 +37,583 @@ index 8e28f2a..c8d1dc9 100644 cc_args = [] -if host_machine.system() not in ['freebsd', 'openbsd'] -+if host_machine.system() not in ['darwin', 'freebsd', 'openbsd'] ++if host_machine.system() not in ['freebsd', 'openbsd', 'darwin'] cc_args += ['-D_POSIX_C_SOURCE=200809L'] endif add_project_arguments(cc_args, language: 'c') -@@ -52,7 +52,7 @@ foreach f: have_funcs - endforeach - config_h.set10('HAVE_XUCRED_CR_PID', cc.has_member('struct xucred', 'cr_pid', prefix : '#include ')) - have_broken_msg_cmsg_cloexec = false --if host_machine.system() == 'freebsd' -+if host_machine.system() in ['darwin', 'freebsd'] - have_broken_msg_cmsg_cloexec = not cc.compiles(''' - #include /* To get __FreeBSD_version. */ - #if __FreeBSD_version < 1300502 || \ -@@ -69,7 +69,7 @@ endif +@@ -69,8 +69,8 @@ endif config_h.set10('HAVE_BROKEN_MSG_CMSG_CLOEXEC', have_broken_msg_cmsg_cloexec) if get_option('libraries') - if host_machine.system() in ['freebsd', 'openbsd'] -+ if host_machine.system() in ['darwin', 'freebsd', 'openbsd'] - # When building for FreeBSD, epoll(7) is provided by a userspace +- # When building for FreeBSD, epoll(7) is provided by a userspace ++ if host_machine.system() in ['freebsd', 'openbsd', 'darwin'] ++ # When building for BSDs, epoll(7) is provided by a userspace # wrapper around kqueue(2). epoll_dep = dependency('epoll-shim') + else diff --git a/src/event-loop.c b/src/event-loop.c -index 45222f7..fb3b464 100644 +index 89294fd97..60c574690 100644 --- a/src/event-loop.c +++ b/src/event-loop.c -@@ -49,6 +49,13 @@ - - #define TIMER_REMOVED -2 +@@ -45,6 +45,14 @@ + #include "wayland-server-private.h" + #include "wayland-os.h" +#ifdef __APPLE__ ++/* epoll-shim should provide this by design */ +struct itimerspec { + struct timespec it_interval; + struct timespec it_value; +}; +#endif + - struct wl_event_loop; - struct wl_event_source_interface; - struct wl_event_source_timer; + /** \cond INTERNAL */ + + #define TIMER_REMOVED -2 +diff --git a/src/wayland-client.c b/src/wayland-client.c +index fe14a6b13..5f72ec248 100644 +--- a/src/wayland-client.c ++++ b/src/wayland-client.c +@@ -38,7 +38,6 @@ + #include + #include + #include +-#include + #include + + #include "wayland-util.h" +@@ -1999,7 +1998,7 @@ wl_display_poll(struct wl_display *display, + timespec_sub_saturate(&result, &deadline, &now); + remaining_timeout = &result; + } +- ret = ppoll(pfd, 1, remaining_timeout, NULL); ++ ret = wl_os_ppoll(pfd, 1, remaining_timeout, NULL); + } while (ret == -1 && errno == EINTR); + + return ret; diff --git a/src/wayland-os.c b/src/wayland-os.c -index f00ead4..4dc01d0 100644 +index f00ead4b9..9f0f6fb1c 100644 --- a/src/wayland-os.c +++ b/src/wayland-os.c -@@ -75,17 +75,19 @@ wl_os_socket_cloexec(int domain, int type, int protocol) +@@ -39,6 +39,9 @@ + #ifdef HAVE_SYS_UCRED_H + #include + #endif ++#if defined(__APPLE__) && !defined(EPOLL_SHIM_DISABLE_WRAPPER_MACROS) ++#include ++#endif + + #include "wayland-os.h" + +@@ -74,18 +77,20 @@ int + wl_os_socket_cloexec(int domain, int type, int protocol) { int fd; - -+#ifdef SOCK_CLOEXEC +- ++#if !defined(__APPLE__) ++ /* It is ok to bypass this logic on Darwin, ++ FD_CLOEXEC will be set by set_cloexec_or_close() */ fd = wl_socket(domain, type | SOCK_CLOEXEC, protocol); if (fd >= 0) return fd; if (errno != EINVAL) return -1; +- +#endif - fd = wl_socket(domain, type, protocol); return set_cloexec_or_close(fd); } -#if defined(__FreeBSD__) -+#if defined(__APPLE__) || defined(__FreeBSD__) ++#if defined(LOCAL_PEERCRED) int wl_os_socket_peercred(int sockfd, uid_t *uid, gid_t *gid, pid_t *pid) { +@@ -101,6 +106,14 @@ wl_os_socket_peercred(int sockfd, uid_t *uid, gid_t *gid, pid_t *pid) + #if HAVE_XUCRED_CR_PID + /* Since https://cgit.freebsd.org/src/commit/?id=c5afec6e895a */ + *pid = ucred.cr_pid; ++#elif defined(LOCAL_PEERPID) ++ /* Try LOCAL_PEERPID if no cr_pid in xucred */ ++ size_t pid_size; ++ pid_t peerpid; ++ if (getsockopt(sockfd, SOL_LOCAL, LOCAL_PEERPID, &peerpid, &pid_size)) ++ *pid = peerpid; ++ else ++ *pid = 0; + #else + *pid = 0; + #endif +@@ -178,13 +191,16 @@ recvmsg_cloexec_fallback(int sockfd, struct msghdr *msg, int flags) + ssize_t + wl_os_recvmsg_cloexec(int sockfd, struct msghdr *msg, int flags) + { +-#if HAVE_BROKEN_MSG_CMSG_CLOEXEC ++#if HAVE_BROKEN_MSG_CMSG_CLOEXEC || defined(__APPLE__) + /* + * FreeBSD had a broken implementation of MSG_CMSG_CLOEXEC between 2015 + * and 2021, so we have to use the non-MSG_CMSG_CLOEXEC fallback + * directly when compiling against a version that does not include the + * fix (https://cgit.freebsd.org/src/commit/?id=6ceacebdf52211). + */ ++ /* ++ * Darwin has no MSG_CMSG_CLOEXEC, so use fallback too. ++ */ + #pragma message("Using fallback directly since MSG_CMSG_CLOEXEC is broken.") + #else + ssize_t len; +@@ -220,7 +236,7 @@ wl_os_accept_cloexec(int sockfd, struct sockaddr *addr, socklen_t *addrlen) + { + int fd; + +-#ifdef HAVE_ACCEPT4 ++#if defined(HAVE_ACCEPT4) && !defined(__APPLE__) + fd = accept4(sockfd, addr, addrlen, SOCK_CLOEXEC); + if (fd >= 0) + return fd; +@@ -273,3 +289,18 @@ wl_os_mremap_maymove(int fd, void *old_data, ssize_t *old_size, + + return result; + } ++ ++int ++wl_os_ppoll(struct pollfd *fds, nfds_t nfds, ++ const struct timespec *timeout_ts, const sigset_t *sigmask) ++{ ++#if defined(__APPLE__) ++#ifndef EPOLL_SHIM_DISABLE_WRAPPER_MACROS ++ return epoll_shim_ppoll(fds, nfds, timeout_ts, sigmask); ++#else ++ return -1; ++#endif ++#endif ++ ++ return ppoll(fds, nfds, timeout_ts, sigmask); ++} +diff --git a/src/wayland-os.h b/src/wayland-os.h +index 068fd2fea..3f9d02bce 100644 +--- a/src/wayland-os.h ++++ b/src/wayland-os.h +@@ -28,6 +28,7 @@ + + #include + #include ++#include + + int + wl_os_socket_cloexec(int domain, int type, int protocol); +@@ -51,6 +52,9 @@ void * + wl_os_mremap_maymove(int fd, void *old_data, ssize_t *old_size, + ssize_t new_size, int prot, int flags); + ++int ++wl_os_ppoll(struct pollfd *fds, nfds_t nfds, ++ const struct timespec *timeout_ts, const sigset_t *sigmask); + + /* + * The following are for wayland-os.c and the unit tests. +diff --git a/tests/client-test.c b/tests/client-test.c +index 5585c0cd0..b5c3f924a 100644 +--- a/tests/client-test.c ++++ b/tests/client-test.c +@@ -97,7 +97,13 @@ TEST(client_destroy_listener) + bool user_data_destroyed = false; + int s[2]; + ++#ifdef SOCK_CLOEXEC + assert(socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, s) == 0); ++#else ++ assert(socketpair(AF_UNIX, SOCK_STREAM, 0, s) == 0); ++ assert(set_cloexec_or_close(s[0]) != -1); ++ assert(set_cloexec_or_close(s[1]) != -1); ++#endif + display = wl_display_create(); + assert(display); + client = wl_client_create(display, s[0]); +@@ -184,7 +190,13 @@ TEST(client_destroy_removes_link) + struct client_destroy_listener destroy_listener; + int s[2]; + ++#ifdef SOCK_CLOEXEC + assert(socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, s) == 0); ++#else ++ assert(socketpair(AF_UNIX, SOCK_STREAM, 0, s) == 0); ++ assert(set_cloexec_or_close(s[0]) != -1); ++ assert(set_cloexec_or_close(s[1]) != -1); ++#endif + display = wl_display_create(); + assert(display); + client = wl_client_create(display, s[0]); +diff --git a/tests/connection-test.c b/tests/connection-test.c +index aed97a0a4..60244223c 100644 +--- a/tests/connection-test.c ++++ b/tests/connection-test.c +@@ -48,7 +48,13 @@ setup(int *s) + { + struct wl_connection *connection; + ++#ifdef SOCK_CLOEXEC + assert(socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, s) == 0); ++#else ++ assert(socketpair(AF_UNIX, SOCK_STREAM, 0, s) == 0); ++ assert(set_cloexec_or_close(s[0]) != -1); ++ assert(set_cloexec_or_close(s[1]) != -1); ++#endif + + connection = wl_connection_create(s[0], WL_BUFFER_DEFAULT_MAX_SIZE); + assert(connection); +@@ -181,8 +187,14 @@ struct marshal_data { + static void + setup_marshal_data(struct marshal_data *data) + { ++#ifdef SOCK_CLOEXEC + assert(socketpair(AF_UNIX, + SOCK_STREAM | SOCK_CLOEXEC, 0, data->s) == 0); ++#else ++ assert(socketpair(AF_UNIX, SOCK_STREAM , 0, data->s) == 0); ++ assert(set_cloexec_or_close(data->s[0]) != -1); ++ assert(set_cloexec_or_close(data->s[1]) != -1); ++#endif + data->read_connection = wl_connection_create(data->s[0], + WL_BUFFER_DEFAULT_MAX_SIZE); + assert(data->read_connection); +@@ -885,7 +897,13 @@ TEST(request_bogus_size) + for (bogus_size = 11; bogus_size >= 0; bogus_size--) { + fprintf(stderr, "* bogus size %d\n", bogus_size); + ++#ifdef SOCK_CLOEXEC + assert(socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, s) == 0); ++#else ++ assert(socketpair(AF_UNIX, SOCK_STREAM, 0, s) == 0); ++ assert(set_cloexec_or_close(s[0]) != -1); ++ assert(set_cloexec_or_close(s[1]) != -1); ++#endif + display = wl_display_create(); + assert(display); + client = wl_client_create(display, s[0]); +diff --git a/tests/display-test.c b/tests/display-test.c +index 89606c731..fbcd40fd5 100644 +--- a/tests/display-test.c ++++ b/tests/display-test.c +@@ -39,6 +39,10 @@ + #include + #include + ++#ifdef __APPLE__ ++#include ++#endif ++ + #include + #include + +@@ -1499,6 +1503,10 @@ send_overflow_client(void *data) + /* Limit the send buffer size for the display socket to guarantee + * that the test will cause an overflow. */ + sock = wl_display_get_fd(c->wl_display); ++#if __APPLE__ ++ /* Darwin sockets may by non-blocked after accept() */ ++ assert(fcntl(sock, F_SETFL, ~O_NONBLOCK) != -1); ++#endif + assert(setsockopt(sock, SOL_SOCKET, SO_SNDBUF, &optval, sizeof(optval)) == 0); + + /* Request to break out of 'display_run' in the main process */ +diff --git a/tests/os-wrappers-test.c b/tests/os-wrappers-test.c +index 061d29e6a..d9cd7c40d 100644 +--- a/tests/os-wrappers-test.c ++++ b/tests/os-wrappers-test.c +@@ -62,12 +62,12 @@ static int + socket_wrapper(int domain, int type, int protocol) + { + wrapped_calls_socket++; +- ++#ifdef SOCK_CLOEXEC + if (fall_back && (type & SOCK_CLOEXEC)) { + errno = EINVAL; + return -1; + } +- ++#endif + return socket(domain, type, protocol); + } + +@@ -111,11 +111,12 @@ static ssize_t + recvmsg_wrapper(int sockfd, struct msghdr *msg, int flags) + { + wrapped_calls_recvmsg++; +- ++#ifdef MSG_CMSG_CLOEXEC + if (fall_back && (flags & MSG_CMSG_CLOEXEC)) { + errno = EINVAL; + return -1; + } ++#endif + + return recvmsg(sockfd, msg, flags); + } +@@ -160,8 +161,11 @@ do_os_wrappers_socket_cloexec(int n) + * Must have 2 calls if falling back, but must also allow + * falling back without a forced fallback. + */ ++#ifdef SOCK_CLOEXEC + assert(wrapped_calls_socket > n); +- ++#else ++ assert(wrapped_calls_socket == 1); ++#endif + exec_fd_leak_check(nr_fds); + } + +@@ -234,8 +238,14 @@ struct marshal_data { + static void + setup_marshal_data(struct marshal_data *data) + { ++#ifdef SOCK_CLOEXEC + assert(socketpair(AF_UNIX, + SOCK_STREAM | SOCK_CLOEXEC, 0, data->s) == 0); ++#else ++ assert(socketpair(AF_UNIX, SOCK_STREAM, 0, data->s) == 0); ++ assert(set_cloexec_or_close(data->s[0]) != -1); ++ assert(set_cloexec_or_close(data->s[1]) != -1); ++#endif + + data->read_connection = wl_connection_create(data->s[0], + WL_BUFFER_DEFAULT_MAX_SIZE); +@@ -325,7 +335,7 @@ do_os_wrappers_recvmsg_cloexec(int n) + struct marshal_data data; + + data.nr_fds_begin = count_open_fds(); +-#if HAVE_BROKEN_MSG_CMSG_CLOEXEC ++#if HAVE_BROKEN_MSG_CMSG_CLOEXEC || !defined(MSG_CMSG_CLOEXEC) + /* We call the fallback directly on FreeBSD versions with a broken + * MSG_CMSG_CLOEXEC, so we don't call the local recvmsg() wrapper. */ + data.wrapped_calls = 0; +diff --git a/tests/queue-test.c b/tests/queue-test.c +index 7dfdd3064..de9adfc6d 100644 +--- a/tests/queue-test.c ++++ b/tests/queue-test.c +@@ -23,7 +23,26 @@ + * SOFTWARE. + */ + ++#ifndef __APPLE__ + #define _GNU_SOURCE /* For memrchr */ ++#else ++#include ++/* No memrchr() on Darwin, borrow one from OpenBSD */ ++static void * ++memrchr(const void *s, int c, size_t n) ++{ ++ const unsigned char *cp; ++ ++ if (n != 0) { ++ cp = (unsigned char *)s + n; ++ do { ++ if (*(--cp) == (unsigned char)c) ++ return((void *)cp); ++ } while (--n != 0); ++ } ++ return(NULL); ++} ++#endif + #include + #include + #include +diff --git a/tests/resources-test.c b/tests/resources-test.c +index 92707297b..33f6e21d2 100644 +--- a/tests/resources-test.c ++++ b/tests/resources-test.c +@@ -40,7 +40,14 @@ TEST(create_resource_tst) + int s[2]; + uint32_t id; + ++#ifdef SOCK_CLOEXEC + assert(socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, s) == 0); ++#else ++ assert(socketpair(AF_UNIX, SOCK_STREAM, 0, s) == 0); ++ assert(set_cloexec_or_close(s[0]) != -1); ++ assert(set_cloexec_or_close(s[1]) != -1); ++#endif ++ + display = wl_display_create(); + assert(display); + client = wl_client_create(display, s[0]); +@@ -111,7 +118,13 @@ TEST(destroy_res_tst) + .notify = &destroy_notify + }; + ++#ifdef SOCK_CLOEXEC + assert(socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, s) == 0); ++#else ++ assert(socketpair(AF_UNIX, SOCK_STREAM, 0, s) == 0); ++ assert(set_cloexec_or_close(s[0]) != -1); ++ assert(set_cloexec_or_close(s[1]) != -1); ++#endif + display = wl_display_create(); + assert(display); + client = wl_client_create(display, s[0]); +@@ -159,7 +172,13 @@ TEST(create_resource_with_same_id) + int s[2]; + uint32_t id; + ++#ifdef SOCK_CLOEXEC + assert(socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, s) == 0); ++#else ++ assert(socketpair(AF_UNIX, SOCK_STREAM, 0, s) == 0); ++ assert(set_cloexec_or_close(s[0]) != -1); ++ assert(set_cloexec_or_close(s[1]) != -1); ++#endif + display = wl_display_create(); + assert(display); + client = wl_client_create(display, s[0]); +@@ -243,7 +262,13 @@ TEST(resource_destroy_iteration) + .notify = &resource_destroy_notify + }; + ++#ifdef SOCK_CLOEXEC + assert(socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, s) == 0); ++#else ++ assert(socketpair(AF_UNIX, SOCK_STREAM, 0, s) == 0); ++ assert(set_cloexec_or_close(s[0]) != -1); ++ assert(set_cloexec_or_close(s[1]) != -1); ++#endif + display = wl_display_create(); + assert(display); + client = wl_client_create(display, s[0]); +diff --git a/tests/test-helpers.c b/tests/test-helpers.c +index 1af813bb4..9ae96b1b4 100644 +--- a/tests/test-helpers.c ++++ b/tests/test-helpers.c +@@ -88,6 +88,30 @@ count_open_fds(void) + /* return the current number of entries */ + return size / sizeof(struct kinfo_file); + } ++#elif defined(__APPLE__) ++#include ++ ++/* ++ * On Darwin, use libproc API to get fds of a PID ++ */ ++int ++count_open_fds(void) ++{ ++ int buffer_size, buffer_used; ++ pid_t pid = getpid(); ++ int nfds; ++ struct proc_fdinfo *fdinfo; ++ ++ buffer_size = proc_pidinfo(pid, PROC_PIDLISTFDS, 0, 0, 0); ++ fdinfo = malloc(buffer_size); ++ ++ buffer_used = proc_pidinfo(pid, PROC_PIDLISTFDS, 0, fdinfo, buffer_size); ++ assert(buffer_used > 0 && "proc_pidinfo PROC_PIDLISTFDS failed."); ++ ++ nfds = buffer_used / PROC_PIDLISTFD_SIZE; ++ free(fdinfo); ++ return nfds; ++} + #else + int + count_open_fds(void) +diff --git a/tests/test-runner.c b/tests/test-runner.c +index 9a50d1dd1..639f5a2e8 100644 +--- a/tests/test-runner.c ++++ b/tests/test-runner.c +@@ -63,7 +63,12 @@ static int timeouts_enabled = 1; + /* set to one if the output goes to the terminal */ + static int is_atty = 0; + ++#if __APPLE__ ++extern const struct test __start_test_section __asm("section$start$__RODATA$test_section"); ++extern const struct test __stop_test_section __asm("section$end$__RODATA$test_section"); ++#else + extern const struct test __start_test_section, __stop_test_section; ++#endif + + static const struct test * + find_test(const char *name) +@@ -308,6 +313,23 @@ is_debugger_attached(void) + + return rc; + } ++#elif defined(__APPLE__) ++#include ++/* https://stackoverflow.com/a/2200786 */ ++static int ++is_debugger_attached(void) ++{ ++ int ret; ++ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid() }; ++ struct kinfo_proc info; ++ size_t size; ++ ++ info.kp_proc.p_flag = 0; ++ ret = sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, NULL, 0); ++ assert(ret == 0); ++ ++ return ( (info.kp_proc.p_flag & P_TRACED) != 0 ); ++} + #else + static int + is_debugger_attached(void) +diff --git a/tests/test-runner.h b/tests/test-runner.h +index d07340096..50eff6afb 100644 +--- a/tests/test-runner.h ++++ b/tests/test-runner.h +@@ -37,11 +37,17 @@ struct test { + int must_fail; + } __attribute__ ((aligned (16))); + ++#if __APPLE__ ++#define TEST_SECTION "__RODATA,test_section" ++#else ++#define TEST_SECTION "test_section" ++#endif ++ + #define TEST(name) \ + static void name(void); \ + \ + const struct test test##name \ +- __attribute__ ((used, section ("test_section"))) = { \ ++ __attribute__ ((used, section (TEST_SECTION))) = { \ + #name, name, 0 \ + }; \ + \ +@@ -51,7 +57,7 @@ struct test { + static void name(void); \ + \ + const struct test test##name \ +- __attribute__ ((used, section ("test_section"))) = { \ ++ __attribute__ ((used, section (TEST_SECTION))) = { \ + #name, name, 1 \ + }; \ + \ +@@ -93,3 +99,28 @@ test_disable_coredumps(void); + } while (0); + + #endif ++ ++/* For systems without SOCK_CLOEXEC */ ++#include ++__attribute__((used)) ++static int ++set_cloexec_or_close(int fd) ++{ ++ long flags; ++ ++ if (fd == -1) ++ return -1; ++ ++ flags = fcntl(fd, F_GETFD); ++ if (flags == -1) ++ goto err; ++ ++ if (fcntl(fd, F_SETFD, flags | FD_CLOEXEC) == -1) ++ goto err; ++ ++ return fd; ++ ++err: ++ close(fd); ++ return -1; ++} diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index ae052da63084..876e767d32ec 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ + # patch from: https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/481 ./darwin.patch ]; @@ -107,7 +108,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://wayland.freedesktop.org/"; license = lib.licenses.mit; # Expat version platforms = lib.platforms.unix; - # requires more work: https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/481 + # Builds with a large downstream patch, but breaks at least the + # `qt6Packages.qtbase` build. Please audit Wayland availability + # checks throughout the tree before enabling (and work with + # upstream if you want sustainable Wayland support on macOS). badPlatforms = lib.platforms.darwin; maintainers = with lib.maintainers; [ qyliss diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 251fe2886d19..c98af56362d4 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -29,6 +29,7 @@ libjxl, at-spi2-core, cairo, + expat, libxml2, libsoup_3, libsecret, @@ -142,6 +143,7 @@ clangStdenv.mkDerivation (finalAttrs: { at-spi2-core cairo # required even when using skia enchant + expat flite libavif libepoxy diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index c13c293fc806..d7f8229e17a9 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -5,11 +5,8 @@ shared ? !stdenv.hostPlatform.isStatic, static ? true, # If true, a separate .static output is created and the .a is moved there. - # In this case `pkg-config` auto detection does not currently work if the - # .static output is given as `buildInputs` to another package (#66461), because - # the `.pc` file lists only the main output's lib dir. # If false, and if `{ static = true; }`, the .a stays in the main output. - splitStaticOutput ? shared && static, + splitStaticOutput ? shared && static && !stdenv.hostPlatform.isWindows, testers, minizip, }: @@ -70,6 +67,11 @@ stdenv.mkDerivation (finalAttrs: { export CHOST=${stdenv.hostPlatform.config} ''; + configureFlags = [ + "--includedir=${placeholder "dev"}/include" + "--sharedlibdir=${placeholder "out"}/lib" + "--libdir=${placeholder (if splitStaticOutput then "static" else "out")}/lib" + ] # For zlib's ./configure (as of version 1.2.11), the order # of --static/--shared flags matters! # `--shared --static` builds only static libs, while @@ -82,7 +84,8 @@ stdenv.mkDerivation (finalAttrs: { # `--static --shared`, `--shared` and giving nothing. # Of these, we choose `--static --shared`, for clarity and simpler # conditions. - configureFlags = lib.optional static "--static" ++ lib.optional shared "--shared"; + ++ lib.optional static "--static" + ++ lib.optional shared "--shared"; # We do the right thing manually, above, so don't need these. dontDisableStatic = true; dontAddStaticConfigureFlags = true; @@ -96,13 +99,10 @@ stdenv.mkDerivation (finalAttrs: { # but we don't do it simply to avoid mass rebuilds. postInstall = - lib.optionalString splitStaticOutput '' - moveToOutput lib/libz.a "$static" - '' # jww (2015-01-06): Sometimes this library install as a .so, even on # Darwin; others time it installs as a .dylib. I haven't yet figured out # what causes this difference. - + lib.optionalString stdenv.hostPlatform.isDarwin '' + lib.optionalString stdenv.hostPlatform.isDarwin '' for file in $out/lib/*.so* $out/lib/*.dylib* ; do ${stdenv.cc.bintools.targetPrefix}install_name_tool -id "$file" $file done @@ -144,6 +144,7 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=${stdenv.cc.targetPrefix}" + "pkgconfigdir=${placeholder "dev"}/share/pkgconfig" ] ++ lib.optionals (stdenv.hostPlatform.isMinGW || stdenv.hostPlatform.isCygwin) [ "-f" diff --git a/pkgs/development/lisp-modules/imported.nix b/pkgs/development/lisp-modules/imported.nix index 0b87b344e36c..431bb65a6f7a 100644 --- a/pkgs/development/lisp-modules/imported.nix +++ b/pkgs/development/lisp-modules/imported.nix @@ -491,12 +491,12 @@ lib.makeScope pkgs.newScope (self: { _3d-math = ( build-asdf-system { pname = "3d-math"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "3d-math" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/3d-math/2025-06-22/3d-math-20250622-git.tgz"; - sha256 = "14jmmv1vsri0qil6hksax7xcakfmxjndj90gkszin67c8sazqzzb"; + url = "https://beta.quicklisp.org/archive/3d-math/2026-01-01/3d-math-20260101-git.tgz"; + sha256 = "0fl8byjl1icljgmqzbb0p1vg5s0i3rvfjn7n5fa10nxg4gn07gmc"; system = "3d-math"; asd = "3d-math"; } @@ -514,12 +514,12 @@ lib.makeScope pkgs.newScope (self: { _3d-math-test = ( build-asdf-system { pname = "3d-math-test"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "3d-math-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/3d-math/2025-06-22/3d-math-20250622-git.tgz"; - sha256 = "14jmmv1vsri0qil6hksax7xcakfmxjndj90gkszin67c8sazqzzb"; + url = "https://beta.quicklisp.org/archive/3d-math/2026-01-01/3d-math-20260101-git.tgz"; + sha256 = "0fl8byjl1icljgmqzbb0p1vg5s0i3rvfjn7n5fa10nxg4gn07gmc"; system = "3d-math-test"; asd = "3d-math-test"; } @@ -537,12 +537,12 @@ lib.makeScope pkgs.newScope (self: { _3d-matrices = ( build-asdf-system { pname = "3d-matrices"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "3d-matrices" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/3d-matrices/2023-10-21/3d-matrices-20231021-git.tgz"; - sha256 = "0kn68awww0h8gwiqih8a65d2p34q3qh4z5ji2g5ja99vgpr1498q"; + url = "https://beta.quicklisp.org/archive/3d-matrices/2026-01-01/3d-matrices-20260101-git.tgz"; + sha256 = "0jzckgb5lsmh1gn1f4mczjfc5ckkw01a73wrl1shyb9sil93a751"; system = "3d-matrices"; asd = "3d-matrices"; } @@ -560,12 +560,12 @@ lib.makeScope pkgs.newScope (self: { _3d-matrices-test = ( build-asdf-system { pname = "3d-matrices-test"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "3d-matrices-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/3d-matrices/2023-10-21/3d-matrices-20231021-git.tgz"; - sha256 = "0kn68awww0h8gwiqih8a65d2p34q3qh4z5ji2g5ja99vgpr1498q"; + url = "https://beta.quicklisp.org/archive/3d-matrices/2026-01-01/3d-matrices-20260101-git.tgz"; + sha256 = "0jzckgb5lsmh1gn1f4mczjfc5ckkw01a73wrl1shyb9sil93a751"; system = "3d-matrices-test"; asd = "3d-matrices-test"; } @@ -583,12 +583,12 @@ lib.makeScope pkgs.newScope (self: { _3d-quaternions = ( build-asdf-system { pname = "3d-quaternions"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "3d-quaternions" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/3d-quaternions/2023-10-21/3d-quaternions-20231021-git.tgz"; - sha256 = "1m72g2rn1n5xsqaa50qbj6hcp8b4gk7xsld4qaly788bwscparl8"; + url = "https://beta.quicklisp.org/archive/3d-quaternions/2026-01-01/3d-quaternions-20260101-git.tgz"; + sha256 = "0bfy9isd5dp2yv63nl7klg4amrkbkwk679fsdkjgfri7026zgh2f"; system = "3d-quaternions"; asd = "3d-quaternions"; } @@ -607,12 +607,12 @@ lib.makeScope pkgs.newScope (self: { _3d-quaternions-test = ( build-asdf-system { pname = "3d-quaternions-test"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "3d-quaternions-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/3d-quaternions/2023-10-21/3d-quaternions-20231021-git.tgz"; - sha256 = "1m72g2rn1n5xsqaa50qbj6hcp8b4gk7xsld4qaly788bwscparl8"; + url = "https://beta.quicklisp.org/archive/3d-quaternions/2026-01-01/3d-quaternions-20260101-git.tgz"; + sha256 = "0bfy9isd5dp2yv63nl7klg4amrkbkwk679fsdkjgfri7026zgh2f"; system = "3d-quaternions-test"; asd = "3d-quaternions-test"; } @@ -630,12 +630,12 @@ lib.makeScope pkgs.newScope (self: { _3d-spaces = ( build-asdf-system { pname = "3d-spaces"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "3d-spaces" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/3d-spaces/2025-06-22/3d-spaces-20250622-git.tgz"; - sha256 = "16m87s9mpynxgjxcp3yn70s6l7mh9sgx3yxwkzdp20y5x5nkknlb"; + url = "https://beta.quicklisp.org/archive/3d-spaces/2026-01-01/3d-spaces-20260101-git.tgz"; + sha256 = "0jz1lwnkfs7cjaf2pgfpacx6frysd57cmhykkv7dsmw7mpj4n7q5"; system = "3d-spaces"; asd = "3d-spaces"; } @@ -658,12 +658,12 @@ lib.makeScope pkgs.newScope (self: { _3d-transforms = ( build-asdf-system { pname = "3d-transforms"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "3d-transforms" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/3d-transforms/2023-10-21/3d-transforms-20231021-git.tgz"; - sha256 = "0876pih289fgn8maclihiz9xl66zbi4nbznpdq2xpfbsr1k4sihy"; + url = "https://beta.quicklisp.org/archive/3d-transforms/2026-01-01/3d-transforms-20260101-git.tgz"; + sha256 = "04z532aq5rwfg3z7nijxzxikmcv504d6xx7gwmc7blk7z3mjk7dd"; system = "3d-transforms"; asd = "3d-transforms"; } @@ -683,12 +683,12 @@ lib.makeScope pkgs.newScope (self: { _3d-transforms-test = ( build-asdf-system { pname = "3d-transforms-test"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "3d-transforms-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/3d-transforms/2023-10-21/3d-transforms-20231021-git.tgz"; - sha256 = "0876pih289fgn8maclihiz9xl66zbi4nbznpdq2xpfbsr1k4sihy"; + url = "https://beta.quicklisp.org/archive/3d-transforms/2026-01-01/3d-transforms-20260101-git.tgz"; + sha256 = "04z532aq5rwfg3z7nijxzxikmcv504d6xx7gwmc7blk7z3mjk7dd"; system = "3d-transforms-test"; asd = "3d-transforms-test"; } @@ -706,12 +706,12 @@ lib.makeScope pkgs.newScope (self: { _3d-vectors = ( build-asdf-system { pname = "3d-vectors"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "3d-vectors" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/3d-vectors/2025-06-22/3d-vectors-20250622-git.tgz"; - sha256 = "1zmk47ggghajq5b493z2ikjm28ddmva244fsg4dlyp02shan221a"; + url = "https://beta.quicklisp.org/archive/3d-vectors/2026-01-01/3d-vectors-20260101-git.tgz"; + sha256 = "0im0c4yv3bmlipbpfqfcbkdpqknr4468xjvdmrr01pchc8r4m11j"; system = "3d-vectors"; asd = "3d-vectors"; } @@ -726,12 +726,12 @@ lib.makeScope pkgs.newScope (self: { _3d-vectors-test = ( build-asdf-system { pname = "3d-vectors-test"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "3d-vectors-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/3d-vectors/2025-06-22/3d-vectors-20250622-git.tgz"; - sha256 = "1zmk47ggghajq5b493z2ikjm28ddmva244fsg4dlyp02shan221a"; + url = "https://beta.quicklisp.org/archive/3d-vectors/2026-01-01/3d-vectors-20260101-git.tgz"; + sha256 = "0im0c4yv3bmlipbpfqfcbkdpqknr4468xjvdmrr01pchc8r4m11j"; system = "3d-vectors-test"; asd = "3d-vectors-test"; } @@ -882,12 +882,12 @@ lib.makeScope pkgs.newScope (self: { _40ants-doc = ( build-asdf-system { pname = "40ants-doc"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "40ants-doc" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/doc/2025-06-22/doc-20250622-git.tgz"; - sha256 = "0343172ci1hff6q83fbrpck5j02p0983qdrzsrvbq6kdyfm48l7q"; + url = "https://beta.quicklisp.org/archive/doc/2026-01-01/doc-20260101-git.tgz"; + sha256 = "05wqpxryc7pshyg5m4z37ngar2vi8msphf07nzss5raywppgpcx9"; system = "40ants-doc"; asd = "40ants-doc"; } @@ -906,12 +906,12 @@ lib.makeScope pkgs.newScope (self: { _40ants-doc-full = ( build-asdf-system { pname = "40ants-doc-full"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "40ants-doc-full" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/doc/2025-06-22/doc-20250622-git.tgz"; - sha256 = "0343172ci1hff6q83fbrpck5j02p0983qdrzsrvbq6kdyfm48l7q"; + url = "https://beta.quicklisp.org/archive/doc/2026-01-01/doc-20260101-git.tgz"; + sha256 = "05wqpxryc7pshyg5m4z37ngar2vi8msphf07nzss5raywppgpcx9"; system = "40ants-doc-full"; asd = "40ants-doc-full"; } @@ -1049,12 +1049,12 @@ lib.makeScope pkgs.newScope (self: { _40ants-doc-test = ( build-asdf-system { pname = "40ants-doc-test"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "40ants-doc-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/doc/2025-06-22/doc-20250622-git.tgz"; - sha256 = "0343172ci1hff6q83fbrpck5j02p0983qdrzsrvbq6kdyfm48l7q"; + url = "https://beta.quicklisp.org/archive/doc/2026-01-01/doc-20260101-git.tgz"; + sha256 = "05wqpxryc7pshyg5m4z37ngar2vi8msphf07nzss5raywppgpcx9"; system = "40ants-doc-test"; asd = "40ants-doc-test"; } @@ -1076,12 +1076,12 @@ lib.makeScope pkgs.newScope (self: { _40ants-logging = ( build-asdf-system { pname = "40ants-logging"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "40ants-logging" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/logging/2025-06-22/logging-20250622-git.tgz"; - sha256 = "1q9zfq50jprhiij87pvhw4wjzzf2yfaxaqbyjj4k5r5lihgk785d"; + url = "https://beta.quicklisp.org/archive/logging/2026-01-01/logging-20260101-git.tgz"; + sha256 = "1aa1h6j8vg344zwfdf8py9xm8lrzx7zg956y6y0c685i1j8nnawa"; system = "40ants-logging"; asd = "40ants-logging"; } @@ -1100,12 +1100,12 @@ lib.makeScope pkgs.newScope (self: { _40ants-logging-ci = ( build-asdf-system { pname = "40ants-logging-ci"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "40ants-logging-ci" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/logging/2025-06-22/logging-20250622-git.tgz"; - sha256 = "1q9zfq50jprhiij87pvhw4wjzzf2yfaxaqbyjj4k5r5lihgk785d"; + url = "https://beta.quicklisp.org/archive/logging/2026-01-01/logging-20260101-git.tgz"; + sha256 = "1aa1h6j8vg344zwfdf8py9xm8lrzx7zg956y6y0c685i1j8nnawa"; system = "40ants-logging-ci"; asd = "40ants-logging-ci"; } @@ -1120,12 +1120,12 @@ lib.makeScope pkgs.newScope (self: { _40ants-logging-docs = ( build-asdf-system { pname = "40ants-logging-docs"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "40ants-logging-docs" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/logging/2025-06-22/logging-20250622-git.tgz"; - sha256 = "1q9zfq50jprhiij87pvhw4wjzzf2yfaxaqbyjj4k5r5lihgk785d"; + url = "https://beta.quicklisp.org/archive/logging/2026-01-01/logging-20260101-git.tgz"; + sha256 = "1aa1h6j8vg344zwfdf8py9xm8lrzx7zg956y6y0c685i1j8nnawa"; system = "40ants-logging-docs"; asd = "40ants-logging-docs"; } @@ -1146,12 +1146,12 @@ lib.makeScope pkgs.newScope (self: { _40ants-logging-example = ( build-asdf-system { pname = "40ants-logging-example"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "40ants-logging-example" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/logging/2025-06-22/logging-20250622-git.tgz"; - sha256 = "1q9zfq50jprhiij87pvhw4wjzzf2yfaxaqbyjj4k5r5lihgk785d"; + url = "https://beta.quicklisp.org/archive/logging/2026-01-01/logging-20260101-git.tgz"; + sha256 = "1aa1h6j8vg344zwfdf8py9xm8lrzx7zg956y6y0c685i1j8nnawa"; system = "40ants-logging-example"; asd = "40ants-logging-example"; } @@ -1172,12 +1172,12 @@ lib.makeScope pkgs.newScope (self: { _40ants-logging-tests = ( build-asdf-system { pname = "40ants-logging-tests"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "40ants-logging-tests" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/logging/2025-06-22/logging-20250622-git.tgz"; - sha256 = "1q9zfq50jprhiij87pvhw4wjzzf2yfaxaqbyjj4k5r5lihgk785d"; + url = "https://beta.quicklisp.org/archive/logging/2026-01-01/logging-20260101-git.tgz"; + sha256 = "1aa1h6j8vg344zwfdf8py9xm8lrzx7zg956y6y0c685i1j8nnawa"; system = "40ants-logging-tests"; asd = "40ants-logging-tests"; } @@ -1818,12 +1818,12 @@ lib.makeScope pkgs.newScope (self: { action-list = ( build-asdf-system { pname = "action-list"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "action-list" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/action-list/2025-06-22/action-list-20250622-git.tgz"; - sha256 = "10x90idgrzhc7blg85mgbr6yrh23rhwavcm4p0kbjmgnnfvvibq9"; + url = "https://beta.quicklisp.org/archive/action-list/2026-01-01/action-list-20260101-git.tgz"; + sha256 = "01l2drszjmbzlcpm4m7bk9m80gaxkm7xc1sw1z5cn8zgl51kysmj"; system = "action-list"; asd = "action-list"; } @@ -1838,44 +1838,24 @@ lib.makeScope pkgs.newScope (self: { }; } ); - add-two = ( - build-asdf-system { - pname = "add-two"; - version = "20250622-git"; - asds = [ "add-two" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "add-two" ]; - lispLibs = [ - (getAttr "cl-annot" self) - (getAttr "whereiseveryone_dot_command-line-args" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); adhoc = ( build-asdf-system { pname = "adhoc"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "adhoc" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/adhoc/2024-10-12/adhoc-20241012-git.tgz"; - sha256 = "1h7mnwybapxzpv0zlwr1mr91lsd7wiv722ifa21gczllvrg5qai6"; + url = "https://beta.quicklisp.org/archive/adhoc/2026-01-01/adhoc-20260101-git.tgz"; + sha256 = "13kixn168dri2cpw2l4jaymqa7pikz1yvz0q9vm5yif69daw0b4b"; system = "adhoc"; asd = "adhoc"; } ); systems = [ "adhoc" ]; - lispLibs = [ (getAttr "closer-mop" self) ]; + lispLibs = [ + (getAttr "bordeaux-threads" self) + (getAttr "closer-mop" self) + ]; meta = { hydraPlatforms = [ ]; }; @@ -1884,12 +1864,12 @@ lib.makeScope pkgs.newScope (self: { adhoc-tests = ( build-asdf-system { pname = "adhoc-tests"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "adhoc-tests" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/adhoc/2024-10-12/adhoc-20241012-git.tgz"; - sha256 = "1h7mnwybapxzpv0zlwr1mr91lsd7wiv722ifa21gczllvrg5qai6"; + url = "https://beta.quicklisp.org/archive/adhoc/2026-01-01/adhoc-20260101-git.tgz"; + sha256 = "13kixn168dri2cpw2l4jaymqa7pikz1yvz0q9vm5yif69daw0b4b"; system = "adhoc-tests"; asd = "adhoc-tests"; } @@ -2667,12 +2647,12 @@ lib.makeScope pkgs.newScope (self: { anypool = ( build-asdf-system { pname = "anypool"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "anypool" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/anypool/2024-10-12/anypool-20241012-git.tgz"; - sha256 = "1ffssc5fzh7gj0z94xxfb3mk5cwja65lrhxyfgib15a6yxqf1kk1"; + url = "https://beta.quicklisp.org/archive/anypool/2026-01-01/anypool-20260101-git.tgz"; + sha256 = "14g152bwwgyqp35qf8krcwavmbjgl5v1m6c29a9csmvb1ni6p83y"; system = "anypool"; asd = "anypool"; } @@ -3347,12 +3327,12 @@ lib.makeScope pkgs.newScope (self: { array-utils = ( build-asdf-system { pname = "array-utils"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "array-utils" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/array-utils/2024-10-12/array-utils-20241012-git.tgz"; - sha256 = "0rya7k9sfpyrn5vrn12wywpgsr2f0pmcywv51ixzb0sv8ska0mhs"; + url = "https://beta.quicklisp.org/archive/array-utils/2026-01-01/array-utils-20260101-git.tgz"; + sha256 = "0xacdjirb4bkszilmyyg7fzinka71f14z30nz2jwi7a88b8lxk1g"; system = "array-utils"; asd = "array-utils"; } @@ -3365,12 +3345,12 @@ lib.makeScope pkgs.newScope (self: { array-utils-test = ( build-asdf-system { pname = "array-utils-test"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "array-utils-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/array-utils/2024-10-12/array-utils-20241012-git.tgz"; - sha256 = "0rya7k9sfpyrn5vrn12wywpgsr2f0pmcywv51ixzb0sv8ska0mhs"; + url = "https://beta.quicklisp.org/archive/array-utils/2026-01-01/array-utils-20260101-git.tgz"; + sha256 = "0xacdjirb4bkszilmyyg7fzinka71f14z30nz2jwi7a88b8lxk1g"; system = "array-utils-test"; asd = "array-utils-test"; } @@ -3584,6 +3564,26 @@ lib.makeScope pkgs.newScope (self: { }; } ); + asdf-dependency-traverser = ( + build-asdf-system { + pname = "asdf-dependency-traverser"; + version = "20260101-git"; + asds = [ "asdf-dependency-traverser" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/asdf-dependency-traverser/2026-01-01/asdf-dependency-traverser-20260101-git.tgz"; + sha256 = "1v0y3dbb7nh6iwv826nrs8cp2zm916p2qddnnzdw90i6g1582nd0"; + system = "asdf-dependency-traverser"; + asd = "asdf-dependency-traverser"; + } + ); + systems = [ "asdf-dependency-traverser" ]; + lispLibs = [ ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); asdf-driver = ( build-asdf-system { pname = "asdf-driver"; @@ -3975,12 +3975,12 @@ lib.makeScope pkgs.newScope (self: { async-process = ( build-asdf-system { pname = "async-process"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "async-process" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/async-process/2025-06-22/async-process-20250622-git.tgz"; - sha256 = "0ykbkmcf46rgiphsb8c03xf9l4l23xn1rppm51mviz7brs0zx7g4"; + url = "https://beta.quicklisp.org/archive/async-process/2026-01-01/async-process-20260101-git.tgz"; + sha256 = "0l1qzi1zn6kbwkmkggsdgll1xzj313lh840rkarkx1zfp9kn786s"; system = "async-process"; asd = "async-process"; } @@ -4022,12 +4022,12 @@ lib.makeScope pkgs.newScope (self: { atomics = ( build-asdf-system { pname = "atomics"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "atomics" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/atomics/2025-06-22/atomics-20250622-git.tgz"; - sha256 = "14x6mahmwxjm91zvg59z189l081ww6wlia7gbamj8ydx214014cl"; + url = "https://beta.quicklisp.org/archive/atomics/2026-01-01/atomics-20260101-git.tgz"; + sha256 = "09av6dhhcrry1cfp0msxgccx9m7wbn8hcpr01dl11c5akp26kmrw"; system = "atomics"; asd = "atomics"; } @@ -4042,12 +4042,12 @@ lib.makeScope pkgs.newScope (self: { atomics-test = ( build-asdf-system { pname = "atomics-test"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "atomics-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/atomics/2025-06-22/atomics-20250622-git.tgz"; - sha256 = "14x6mahmwxjm91zvg59z189l081ww6wlia7gbamj8ydx214014cl"; + url = "https://beta.quicklisp.org/archive/atomics/2026-01-01/atomics-20260101-git.tgz"; + sha256 = "09av6dhhcrry1cfp0msxgccx9m7wbn8hcpr01dl11c5akp26kmrw"; system = "atomics-test"; asd = "atomics-test"; } @@ -4174,12 +4174,12 @@ lib.makeScope pkgs.newScope (self: { autoload = ( build-asdf-system { pname = "autoload"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "autoload" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz"; - sha256 = "09wcwil8jyxm34cs7x1i3vclj84n6gxzxp21k0d23129c9adhi66"; + url = "https://beta.quicklisp.org/archive/mgl-pax/2026-01-01/mgl-pax-20260101-git.tgz"; + sha256 = "0avgalak566pzcdpnzvvhz4nqbwjp98xw5jvglvgbbxifs8x8azr"; system = "autoload"; asd = "autoload"; } @@ -4194,12 +4194,12 @@ lib.makeScope pkgs.newScope (self: { automaton = ( build-asdf-system { pname = "automaton"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "automaton" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "automaton"; asd = "automaton"; } @@ -4463,12 +4463,12 @@ lib.makeScope pkgs.newScope (self: { babel = ( build-asdf-system { pname = "babel"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "babel" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/babel/2024-10-12/babel-20241012-git.tgz"; - sha256 = "0359bj3yr6frybcmg8qr5vi4q8hzbsb7hmvxdc0jgkfz3c33q667"; + url = "https://beta.quicklisp.org/archive/babel/2026-01-01/babel-20260101-git.tgz"; + sha256 = "04h23yx6hl95509j5nfz4x66yn5hp7gmfrm7n3kk4l4szfnmy379"; system = "babel"; asd = "babel"; } @@ -4484,12 +4484,12 @@ lib.makeScope pkgs.newScope (self: { babel-streams = ( build-asdf-system { pname = "babel-streams"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "babel-streams" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/babel/2024-10-12/babel-20241012-git.tgz"; - sha256 = "0359bj3yr6frybcmg8qr5vi4q8hzbsb7hmvxdc0jgkfz3c33q667"; + url = "https://beta.quicklisp.org/archive/babel/2026-01-01/babel-20260101-git.tgz"; + sha256 = "04h23yx6hl95509j5nfz4x66yn5hp7gmfrm7n3kk4l4szfnmy379"; system = "babel-streams"; asd = "babel-streams"; } @@ -4508,12 +4508,12 @@ lib.makeScope pkgs.newScope (self: { babel-tests = ( build-asdf-system { pname = "babel-tests"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "babel-tests" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/babel/2024-10-12/babel-20241012-git.tgz"; - sha256 = "0359bj3yr6frybcmg8qr5vi4q8hzbsb7hmvxdc0jgkfz3c33q667"; + url = "https://beta.quicklisp.org/archive/babel/2026-01-01/babel-20260101-git.tgz"; + sha256 = "04h23yx6hl95509j5nfz4x66yn5hp7gmfrm7n3kk4l4szfnmy379"; system = "babel-tests"; asd = "babel-tests"; } @@ -4554,12 +4554,12 @@ lib.makeScope pkgs.newScope (self: { base = ( build-asdf-system { pname = "base"; - version = "master-5a621564-git"; + version = "master-bfa9fc5c-git"; asds = [ "base" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; - sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; + url = "https://beta.quicklisp.org/archive/gendl/2026-01-01/gendl-master-bfa9fc5c-git.tgz"; + sha256 = "1hbbflaiplf4qxqlc5bqi28xh419lijrz4rvz18maqiavg059bfk"; system = "base"; asd = "base"; } @@ -4661,12 +4661,12 @@ lib.makeScope pkgs.newScope (self: { batis = ( build-asdf-system { pname = "batis"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "batis" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-batis/2025-06-22/cl-batis-20250622-git.tgz"; - sha256 = "1hmgvp32ivs34xj6a5nnrmj16kphdckz1ygfkrb5f0iwr305qbjf"; + url = "https://beta.quicklisp.org/archive/cl-batis/2026-01-01/cl-batis-20260101-git.tgz"; + sha256 = "1yd9xx6rk403wdv3ddchyx952fj10dvmznjhrxhyl77bgcdrf2v9"; system = "batis"; asd = "batis"; } @@ -4684,29 +4684,6 @@ lib.makeScope pkgs.newScope (self: { }; } ); - 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"; @@ -4997,12 +4974,12 @@ lib.makeScope pkgs.newScope (self: { binary-lass = ( build-asdf-system { pname = "binary-lass"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "binary-lass" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lass/2025-06-22/lass-20250622-git.tgz"; - sha256 = "0pj9p7asqaqjakjjn8i7k6lb9piakjxd8xa732c88q5qijbmvkb2"; + url = "https://beta.quicklisp.org/archive/lass/2026-01-01/lass-20260101-git.tgz"; + sha256 = "0vdj6kp76h5cgp821j4xwdj3pyv1fjixd18inrdbxp4z6n745k1f"; system = "binary-lass"; asd = "binary-lass"; } @@ -5062,12 +5039,12 @@ lib.makeScope pkgs.newScope (self: { binary-structures = ( build-asdf-system { pname = "binary-structures"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "binary-structures" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/binary-structures/2025-06-22/binary-structures-20250622-git.tgz"; - sha256 = "15i2s639pc1s6jw1zzlh114bgkzv61ykdi51g1dah206fwp4lbn7"; + url = "https://beta.quicklisp.org/archive/binary-structures/2026-01-01/binary-structures-20260101-git.tgz"; + sha256 = "1fzidkwr9hs623cp0f0xsvxrcsaj494b7lnczpj26ag6ai9fw4ha"; system = "binary-structures"; asd = "binary-structures"; } @@ -5169,12 +5146,12 @@ lib.makeScope pkgs.newScope (self: { binding-knx = ( build-asdf-system { pname = "binding-knx"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "binding-knx" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/chipi/2025-06-22/chipi-20250622-git.tgz"; - sha256 = "00wqwgdzfnwxkm1bd42axp69bpl0gs99i7a3mq2x6q1dvn1rczac"; + url = "https://beta.quicklisp.org/archive/chipi/2026-01-01/chipi-20260101-git.tgz"; + sha256 = "140i9gyq2dw3dbdf7fp7rycbz386zwc99rmdafv3m189fyibs9r4"; system = "binding-knx"; asd = "binding-knx"; } @@ -5815,12 +5792,12 @@ lib.makeScope pkgs.newScope (self: { blas = ( build-asdf-system { pname = "blas"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "blas" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; - sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; + url = "https://beta.quicklisp.org/archive/f2cl/2026-01-01/f2cl-20260101-git.tgz"; + sha256 = "025hdyvyk9il71aya05sma13m3x9yxcj7g3sadpzck55manbpfnm"; system = "blas"; asd = "blas"; } @@ -5839,12 +5816,12 @@ lib.makeScope pkgs.newScope (self: { blas-complex = ( build-asdf-system { pname = "blas-complex"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "blas-complex" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; - sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; + url = "https://beta.quicklisp.org/archive/f2cl/2026-01-01/f2cl-20260101-git.tgz"; + sha256 = "025hdyvyk9il71aya05sma13m3x9yxcj7g3sadpzck55manbpfnm"; system = "blas-complex"; asd = "blas-complex"; } @@ -5862,12 +5839,12 @@ lib.makeScope pkgs.newScope (self: { blas-hompack = ( build-asdf-system { pname = "blas-hompack"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "blas-hompack" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; - sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; + url = "https://beta.quicklisp.org/archive/f2cl/2026-01-01/f2cl-20260101-git.tgz"; + sha256 = "025hdyvyk9il71aya05sma13m3x9yxcj7g3sadpzck55manbpfnm"; system = "blas-hompack"; asd = "blas-hompack"; } @@ -5885,12 +5862,12 @@ lib.makeScope pkgs.newScope (self: { blas-package = ( build-asdf-system { pname = "blas-package"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "blas-package" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; - sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; + url = "https://beta.quicklisp.org/archive/f2cl/2026-01-01/f2cl-20260101-git.tgz"; + sha256 = "025hdyvyk9il71aya05sma13m3x9yxcj7g3sadpzck55manbpfnm"; system = "blas-package"; asd = "blas-package"; } @@ -5905,12 +5882,12 @@ lib.makeScope pkgs.newScope (self: { blas-real = ( build-asdf-system { pname = "blas-real"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "blas-real" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; - sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; + url = "https://beta.quicklisp.org/archive/f2cl/2026-01-01/f2cl-20260101-git.tgz"; + sha256 = "025hdyvyk9il71aya05sma13m3x9yxcj7g3sadpzck55manbpfnm"; system = "blas-real"; asd = "blas-real"; } @@ -6542,12 +6519,12 @@ lib.makeScope pkgs.newScope (self: { bp = ( build-asdf-system { pname = "bp"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "bp" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/bp/2025-06-22/bp-20250622-git.tgz"; - sha256 = "06g7xrkll4qqkqhlwqsw695yann8fpvz5ln5lzigqljzyg09wxk8"; + url = "https://beta.quicklisp.org/archive/bp/2026-01-01/bp-20260101-git.tgz"; + sha256 = "0iw56fms95ar8mn7wm0kvrgfjwszlcc16nsd6z75xrp3awjv4dnb"; system = "bp"; asd = "bp"; } @@ -6992,12 +6969,12 @@ lib.makeScope pkgs.newScope (self: { bus = ( build-asdf-system { pname = "bus"; - version = "master-5a621564-git"; + version = "master-bfa9fc5c-git"; asds = [ "bus" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; - sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; + url = "https://beta.quicklisp.org/archive/gendl/2026-01-01/gendl-master-bfa9fc5c-git.tgz"; + sha256 = "1hbbflaiplf4qxqlc5bqi28xh419lijrz4rvz18maqiavg059bfk"; system = "bus"; asd = "bus"; } @@ -7227,6 +7204,54 @@ lib.makeScope pkgs.newScope (self: { }; } ); + calendar-times = ( + build-asdf-system { + pname = "calendar-times"; + version = "20260101-git"; + asds = [ "calendar-times" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/calendar-times/2026-01-01/calendar-times-20260101-git.tgz"; + sha256 = "0lq3s20dlz26j82dhmk608rk5ydhdsp6s3f06shkg4fxhd7dnl19"; + system = "calendar-times"; + asd = "calendar-times"; + } + ); + systems = [ "calendar-times" ]; + lispLibs = [ + (getAttr "alexandria" self) + (getAttr "closer-mop" self) + (getAttr "local-time" self) + (getAttr "split-sequence" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + calendar-times-tests = ( + build-asdf-system { + pname = "calendar-times-tests"; + version = "20260101-git"; + asds = [ "calendar-times-tests" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/calendar-times/2026-01-01/calendar-times-20260101-git.tgz"; + sha256 = "0lq3s20dlz26j82dhmk608rk5ydhdsp6s3f06shkg4fxhd7dnl19"; + system = "calendar-times-tests"; + asd = "calendar-times-tests"; + } + ); + systems = [ "calendar-times-tests" ]; + lispLibs = [ + (getAttr "calendar-times" self) + (getAttr "fiasco" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); calispel = ( build-asdf-system { pname = "calispel"; @@ -7304,12 +7329,12 @@ lib.makeScope pkgs.newScope (self: { cambl = ( build-asdf-system { pname = "cambl"; - version = "20181210-git"; + version = "20260101-git"; asds = [ "cambl" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cambl/2018-12-10/cambl-20181210-git.tgz"; - sha256 = "103mry04j2k9vznsxm7wcvccgxkil92cdrv52miwcmxl8daa4jiz"; + url = "https://beta.quicklisp.org/archive/cambl/2026-01-01/cambl-20260101-git.tgz"; + sha256 = "1jp0i0pwdvzg689wx2rhm2ajm4w8b55rw6q6jas3498myy2gif4d"; system = "cambl"; asd = "cambl"; } @@ -7330,12 +7355,12 @@ lib.makeScope pkgs.newScope (self: { cambl-test = ( build-asdf-system { pname = "cambl-test"; - version = "20181210-git"; + version = "20260101-git"; asds = [ "cambl-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cambl/2018-12-10/cambl-20181210-git.tgz"; - sha256 = "103mry04j2k9vznsxm7wcvccgxkil92cdrv52miwcmxl8daa4jiz"; + url = "https://beta.quicklisp.org/archive/cambl/2026-01-01/cambl-20260101-git.tgz"; + sha256 = "1jp0i0pwdvzg689wx2rhm2ajm4w8b55rw6q6jas3498myy2gif4d"; system = "cambl-test"; asd = "cambl-test"; } @@ -7528,12 +7553,12 @@ lib.makeScope pkgs.newScope (self: { cari3s = ( build-asdf-system { pname = "cari3s"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "cari3s" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cari3s/2023-10-21/cari3s-20231021-git.tgz"; - sha256 = "1q977ykj4fb095ilr1x4g0nrhqmipcgmdxbxn4gmlksg457sb4lm"; + url = "https://beta.quicklisp.org/archive/cari3s/2026-01-01/cari3s-20260101-git.tgz"; + sha256 = "0x05i3bj6ck63k7ai5a0y804amjc4ny92v8x1dcqdsj2nhivxmc1"; system = "cari3s"; asd = "cari3s"; } @@ -8031,12 +8056,12 @@ lib.makeScope pkgs.newScope (self: { cephes = ( build-asdf-system { pname = "cephes"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "cephes" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cephes.cl/2024-10-12/cephes.cl-20241012-git.tgz"; - sha256 = "1p0npidiy9zjb90gyihdmx0nmm87a5akph1jhs6y7z50fx8470hb"; + url = "https://beta.quicklisp.org/archive/cephes.cl/2026-01-01/cephes.cl-20260101-git.tgz"; + sha256 = "0w6cgxkv64x8z96h69ln0lbacrxd2k0zyyhw0fyanjnphaaqax1k"; system = "cephes"; asd = "cephes"; } @@ -8537,12 +8562,12 @@ lib.makeScope pkgs.newScope (self: { cffi = ( build-asdf-system { pname = "cffi"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cffi" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz"; - sha256 = "1s7b5zrgbf5pz52hcncvvmd22nppwpgvh7s0hg8lnk74k42vpms1"; + url = "https://beta.quicklisp.org/archive/cffi/2026-01-01/cffi-20260101-git.tgz"; + sha256 = "1qwd5m6k1g1ywxg4hf2sdgzs8w98n3znh93zdnads3dvs9ing313"; system = "cffi"; asd = "cffi"; } @@ -8582,12 +8607,12 @@ lib.makeScope pkgs.newScope (self: { cffi-examples = ( build-asdf-system { pname = "cffi-examples"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cffi-examples" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz"; - sha256 = "1s7b5zrgbf5pz52hcncvvmd22nppwpgvh7s0hg8lnk74k42vpms1"; + url = "https://beta.quicklisp.org/archive/cffi/2026-01-01/cffi-20260101-git.tgz"; + sha256 = "1qwd5m6k1g1ywxg4hf2sdgzs8w98n3znh93zdnads3dvs9ing313"; system = "cffi-examples"; asd = "cffi-examples"; } @@ -8602,12 +8627,12 @@ lib.makeScope pkgs.newScope (self: { cffi-grovel = ( build-asdf-system { pname = "cffi-grovel"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cffi-grovel" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz"; - sha256 = "1s7b5zrgbf5pz52hcncvvmd22nppwpgvh7s0hg8lnk74k42vpms1"; + url = "https://beta.quicklisp.org/archive/cffi/2026-01-01/cffi-20260101-git.tgz"; + sha256 = "1qwd5m6k1g1ywxg4hf2sdgzs8w98n3znh93zdnads3dvs9ing313"; system = "cffi-grovel"; asd = "cffi-grovel"; } @@ -8624,12 +8649,12 @@ lib.makeScope pkgs.newScope (self: { cffi-libffi = ( build-asdf-system { pname = "cffi-libffi"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cffi-libffi" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz"; - sha256 = "1s7b5zrgbf5pz52hcncvvmd22nppwpgvh7s0hg8lnk74k42vpms1"; + url = "https://beta.quicklisp.org/archive/cffi/2026-01-01/cffi-20260101-git.tgz"; + sha256 = "1qwd5m6k1g1ywxg4hf2sdgzs8w98n3znh93zdnads3dvs9ing313"; system = "cffi-libffi"; asd = "cffi-libffi"; } @@ -8648,12 +8673,12 @@ lib.makeScope pkgs.newScope (self: { cffi-object = ( build-asdf-system { pname = "cffi-object"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cffi-object" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cffi-object/2025-06-22/cffi-object-20250622-git.tgz"; - sha256 = "1v5yaf2y366mbpqbvqnqg1za5k3vsa6d4px56ldis996vb2kv84h"; + url = "https://beta.quicklisp.org/archive/cffi-object/2026-01-01/cffi-object-20260101-git.tgz"; + sha256 = "1jfc6yhbxjpad3ngc01mm9k37sv5p7msc6jy5c4ggfcd71n75kqs"; system = "cffi-object"; asd = "cffi-object"; } @@ -8672,12 +8697,12 @@ lib.makeScope pkgs.newScope (self: { cffi-object_dot_ops = ( build-asdf-system { pname = "cffi-object.ops"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cffi-object.ops" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cffi-object/2025-06-22/cffi-object-20250622-git.tgz"; - sha256 = "1v5yaf2y366mbpqbvqnqg1za5k3vsa6d4px56ldis996vb2kv84h"; + url = "https://beta.quicklisp.org/archive/cffi-object/2026-01-01/cffi-object-20260101-git.tgz"; + sha256 = "1jfc6yhbxjpad3ngc01mm9k37sv5p7msc6jy5c4ggfcd71n75kqs"; system = "cffi-object.ops"; asd = "cffi-object.ops"; } @@ -8720,12 +8745,12 @@ lib.makeScope pkgs.newScope (self: { cffi-tests = ( build-asdf-system { pname = "cffi-tests"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cffi-tests" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz"; - sha256 = "1s7b5zrgbf5pz52hcncvvmd22nppwpgvh7s0hg8lnk74k42vpms1"; + url = "https://beta.quicklisp.org/archive/cffi/2026-01-01/cffi-20260101-git.tgz"; + sha256 = "1qwd5m6k1g1ywxg4hf2sdgzs8w98n3znh93zdnads3dvs9ing313"; system = "cffi-tests"; asd = "cffi-tests"; } @@ -8746,12 +8771,12 @@ lib.makeScope pkgs.newScope (self: { cffi-toolchain = ( build-asdf-system { pname = "cffi-toolchain"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cffi-toolchain" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz"; - sha256 = "1s7b5zrgbf5pz52hcncvvmd22nppwpgvh7s0hg8lnk74k42vpms1"; + url = "https://beta.quicklisp.org/archive/cffi/2026-01-01/cffi-20260101-git.tgz"; + sha256 = "1qwd5m6k1g1ywxg4hf2sdgzs8w98n3znh93zdnads3dvs9ing313"; system = "cffi-toolchain"; asd = "cffi-toolchain"; } @@ -8764,12 +8789,12 @@ lib.makeScope pkgs.newScope (self: { cffi-uffi-compat = ( build-asdf-system { pname = "cffi-uffi-compat"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cffi-uffi-compat" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz"; - sha256 = "1s7b5zrgbf5pz52hcncvvmd22nppwpgvh7s0hg8lnk74k42vpms1"; + url = "https://beta.quicklisp.org/archive/cffi/2026-01-01/cffi-20260101-git.tgz"; + sha256 = "1qwd5m6k1g1ywxg4hf2sdgzs8w98n3znh93zdnads3dvs9ing313"; system = "cffi-uffi-compat"; asd = "cffi-uffi-compat"; } @@ -8782,12 +8807,12 @@ lib.makeScope pkgs.newScope (self: { chain = ( build-asdf-system { pname = "chain"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "chain" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/chain/2025-06-22/chain-20250622-git.tgz"; - sha256 = "10kq8dlwbib6chc9m5wn7v7narjpdksf000vycaj1nqqqdy348mp"; + url = "https://beta.quicklisp.org/archive/chain/2026-01-01/chain-20260101-git.tgz"; + sha256 = "1456wzn20463kg5qbjr0bgnqdgldgqjc97rcjigvzrcg23ijpl2d"; system = "chain"; asd = "chain"; } @@ -8822,6 +8847,26 @@ lib.makeScope pkgs.newScope (self: { }; } ); + champ-lite = ( + build-asdf-system { + pname = "champ-lite"; + version = "v1.0.1"; + asds = [ "champ-lite" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/champ-lite/2026-01-01/champ-lite-v1.0.1.tgz"; + sha256 = "0yr74n93f6g1xdahc1j7hkcg70vlbff00m0b7wda443nlx9ngcdv"; + system = "champ-lite"; + asd = "champ-lite"; + } + ); + systems = [ "champ-lite" ]; + lispLibs = [ ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); chancery = ( build-asdf-system { pname = "chancery"; @@ -9285,12 +9330,12 @@ lib.makeScope pkgs.newScope (self: { chipi = ( build-asdf-system { pname = "chipi"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "chipi" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/chipi/2025-06-22/chipi-20250622-git.tgz"; - sha256 = "00wqwgdzfnwxkm1bd42axp69bpl0gs99i7a3mq2x6q1dvn1rczac"; + url = "https://beta.quicklisp.org/archive/chipi/2026-01-01/chipi-20260101-git.tgz"; + sha256 = "140i9gyq2dw3dbdf7fp7rycbz386zwc99rmdafv3m189fyibs9r4"; system = "chipi"; asd = "chipi"; } @@ -9312,20 +9357,20 @@ lib.makeScope pkgs.newScope (self: { }; } ); - chipi-web = ( + chipi-api = ( build-asdf-system { - pname = "chipi-web"; - version = "20250622-git"; - asds = [ "chipi-web" ]; + pname = "chipi-api"; + version = "20260101-git"; + asds = [ "chipi-api" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/chipi/2025-06-22/chipi-20250622-git.tgz"; - sha256 = "00wqwgdzfnwxkm1bd42axp69bpl0gs99i7a3mq2x6q1dvn1rczac"; - system = "chipi-web"; - asd = "chipi-web"; + url = "https://beta.quicklisp.org/archive/chipi/2026-01-01/chipi-20260101-git.tgz"; + sha256 = "140i9gyq2dw3dbdf7fp7rycbz386zwc99rmdafv3m189fyibs9r4"; + system = "chipi-api"; + asd = "chipi-api"; } ); - systems = [ "chipi-web" ]; + systems = [ "chipi-api" ]; lispLibs = [ (getAttr "chipi" self) (getAttr "cl-base64" self) @@ -9341,6 +9386,29 @@ lib.makeScope pkgs.newScope (self: { }; } ); + chipi-ui = ( + build-asdf-system { + pname = "chipi-ui"; + version = "20260101-git"; + asds = [ "chipi-ui" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/chipi/2026-01-01/chipi-20260101-git.tgz"; + sha256 = "140i9gyq2dw3dbdf7fp7rycbz386zwc99rmdafv3m189fyibs9r4"; + system = "chipi-ui"; + asd = "chipi-ui"; + } + ); + systems = [ "chipi-ui" ]; + lispLibs = [ + (getAttr "chipi-api" self) + (getAttr "clog" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); chipmunk-blob = ( build-asdf-system { pname = "chipmunk-blob"; @@ -9385,12 +9453,12 @@ lib.makeScope pkgs.newScope (self: { chirp = ( build-asdf-system { pname = "chirp"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "chirp" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/chirp/2025-06-22/chirp-20250622-git.tgz"; - sha256 = "00q82i0jkz61a15q658w3l82c8blz7s8197zgh72zwypgis8aw0q"; + url = "https://beta.quicklisp.org/archive/chirp/2026-01-01/chirp-20260101-git.tgz"; + sha256 = "0f6syqam0vsldnqdbccfzx4zqw0jcqyv8yw947qlm9n8zpkhhm06"; system = "chirp"; asd = "chirp"; } @@ -9405,12 +9473,12 @@ lib.makeScope pkgs.newScope (self: { chirp-core = ( build-asdf-system { pname = "chirp-core"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "chirp-core" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/chirp/2025-06-22/chirp-20250622-git.tgz"; - sha256 = "00q82i0jkz61a15q658w3l82c8blz7s8197zgh72zwypgis8aw0q"; + url = "https://beta.quicklisp.org/archive/chirp/2026-01-01/chirp-20260101-git.tgz"; + sha256 = "0f6syqam0vsldnqdbccfzx4zqw0jcqyv8yw947qlm9n8zpkhhm06"; system = "chirp-core"; asd = "chirp-core"; } @@ -9436,12 +9504,12 @@ lib.makeScope pkgs.newScope (self: { chirp-dexador = ( build-asdf-system { pname = "chirp-dexador"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "chirp-dexador" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/chirp/2025-06-22/chirp-20250622-git.tgz"; - sha256 = "00q82i0jkz61a15q658w3l82c8blz7s8197zgh72zwypgis8aw0q"; + url = "https://beta.quicklisp.org/archive/chirp/2026-01-01/chirp-20260101-git.tgz"; + sha256 = "0f6syqam0vsldnqdbccfzx4zqw0jcqyv8yw947qlm9n8zpkhhm06"; system = "chirp-dexador"; asd = "chirp-dexador"; } @@ -9459,12 +9527,12 @@ lib.makeScope pkgs.newScope (self: { chirp-drakma = ( build-asdf-system { pname = "chirp-drakma"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "chirp-drakma" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/chirp/2025-06-22/chirp-20250622-git.tgz"; - sha256 = "00q82i0jkz61a15q658w3l82c8blz7s8197zgh72zwypgis8aw0q"; + url = "https://beta.quicklisp.org/archive/chirp/2026-01-01/chirp-20260101-git.tgz"; + sha256 = "0f6syqam0vsldnqdbccfzx4zqw0jcqyv8yw947qlm9n8zpkhhm06"; system = "chirp-drakma"; asd = "chirp-drakma"; } @@ -9618,12 +9686,12 @@ lib.makeScope pkgs.newScope (self: { chunga = ( build-asdf-system { pname = "chunga"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "chunga" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/chunga/2024-10-12/chunga-20241012-git.tgz"; - sha256 = "17jswsp31dh1jpg2n60nn34wxf4z6vvxjq1avy50z9fnzywvikyi"; + url = "https://beta.quicklisp.org/archive/chunga/2026-01-01/chunga-20260101-git.tgz"; + sha256 = "1gwqmz8j4gxnv7bcwxdnz3pgnf7k9gq83azhkhraz8a1xidi9gh2"; system = "chunga"; asd = "chunga"; } @@ -9813,12 +9881,12 @@ lib.makeScope pkgs.newScope (self: { cl_plus_ssl = ( build-asdf-system { pname = "cl+ssl"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl+ssl" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl+ssl/2025-06-22/cl+ssl-20250622-git.tgz"; - sha256 = "0ns7if8f6i3ag0xrxkxy9k25ybypb2y3h4bq75cf7a0y82j3wlax"; + url = "https://beta.quicklisp.org/archive/cl+ssl/2026-01-01/cl+ssl-20260101-git.tgz"; + sha256 = "01ddxqp7fang9iqajwsr2g6wbcvcx6niyarrzblbl4rizk0596f3"; system = "cl+ssl"; asd = "cl+ssl"; } @@ -9840,12 +9908,12 @@ lib.makeScope pkgs.newScope (self: { cl_plus_ssl_dot_test = ( build-asdf-system { pname = "cl+ssl.test"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl+ssl.test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl+ssl/2025-06-22/cl+ssl-20250622-git.tgz"; - sha256 = "0ns7if8f6i3ag0xrxkxy9k25ybypb2y3h4bq75cf7a0y82j3wlax"; + url = "https://beta.quicklisp.org/archive/cl+ssl/2026-01-01/cl+ssl-20260101-git.tgz"; + sha256 = "01ddxqp7fang9iqajwsr2g6wbcvcx6niyarrzblbl4rizk0596f3"; system = "cl+ssl.test"; asd = "cl+ssl.test"; } @@ -10037,12 +10105,12 @@ lib.makeScope pkgs.newScope (self: { cl-algebraic-data-type = ( build-asdf-system { pname = "cl-algebraic-data-type"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "cl-algebraic-data-type" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-algebraic-data-type/2024-10-12/cl-algebraic-data-type-20241012-git.tgz"; - sha256 = "02bfx9g4267f7f85banmfy15adyvlzaz3flia8zmhlzhpx7j4bj6"; + url = "https://beta.quicklisp.org/archive/cl-algebraic-data-type/2026-01-01/cl-algebraic-data-type-20260101-git.tgz"; + sha256 = "188r4f3biqfbcq9y9b3m3ar2zgj30f41w0nw9jk5ha4f5rq4f73i"; system = "cl-algebraic-data-type"; asd = "cl-algebraic-data-type"; } @@ -10060,12 +10128,12 @@ lib.makeScope pkgs.newScope (self: { cl-all = ( build-asdf-system { pname = "cl-all"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "cl-all" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-all/2024-10-12/cl-all-20241012-git.tgz"; - sha256 = "02n30b3yp949fxwnb9wr3m9hd5h1kcmxcbjc8c5fj4ihphf8sd7d"; + url = "https://beta.quicklisp.org/archive/cl-all/2026-01-01/cl-all-20260101-git.tgz"; + sha256 = "08jsbnkapijn0v4n5h9g6s87i279xmg4fnbw6jajylrg512n38cx"; system = "cl-all"; asd = "cl-all"; } @@ -10157,74 +10225,14 @@ lib.makeScope pkgs.newScope (self: { }; } ); - cl-ana = ( - build-asdf-system { - pname = "cl-ana"; - version = "20220707-git"; - asds = [ "cl-ana" ]; - src = ( - createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana"; - asd = "cl-ana"; - } - ); - systems = [ "cl-ana" ]; - lispLibs = [ - (getAttr "cl-ana_dot_array-utils" self) - (getAttr "cl-ana_dot_binary-tree" self) - (getAttr "cl-ana_dot_calculus" self) - (getAttr "cl-ana_dot_clos-utils" self) - (getAttr "cl-ana_dot_columnar-table" self) - (getAttr "cl-ana_dot_csv-table" self) - (getAttr "cl-ana_dot_error-propogation" self) - (getAttr "cl-ana_dot_file-utils" self) - (getAttr "cl-ana_dot_fitting" self) - (getAttr "cl-ana_dot_generic-math" self) - (getAttr "cl-ana_dot_hash-table-utils" self) - (getAttr "cl-ana_dot_hdf-table" self) - (getAttr "cl-ana_dot_histogram" self) - (getAttr "cl-ana_dot_int-char" self) - (getAttr "cl-ana_dot_linear-algebra" self) - (getAttr "cl-ana_dot_list-utils" self) - (getAttr "cl-ana_dot_lorentz" self) - (getAttr "cl-ana_dot_makeres" self) - (getAttr "cl-ana_dot_makeres-block" self) - (getAttr "cl-ana_dot_makeres-branch" self) - (getAttr "cl-ana_dot_makeres-graphviz" self) - (getAttr "cl-ana_dot_makeres-macro" self) - (getAttr "cl-ana_dot_makeres-progress" self) - (getAttr "cl-ana_dot_makeres-table" self) - (getAttr "cl-ana_dot_makeres-utils" self) - (getAttr "cl-ana_dot_map" self) - (getAttr "cl-ana_dot_math-functions" self) - (getAttr "cl-ana_dot_ntuple-table" self) - (getAttr "cl-ana_dot_package-utils" self) - (getAttr "cl-ana_dot_pathname-utils" self) - (getAttr "cl-ana_dot_plotting" self) - (getAttr "cl-ana_dot_quantity" self) - (getAttr "cl-ana_dot_reusable-table" self) - (getAttr "cl-ana_dot_serialization" self) - (getAttr "cl-ana_dot_spline" self) - (getAttr "cl-ana_dot_statistical-learning" self) - (getAttr "cl-ana_dot_statistics" self) - (getAttr "cl-ana_dot_table" self) - (getAttr "cl-ana_dot_table-utils" self) - (getAttr "cl-ana_dot_table-viewing" self) - (getAttr "cl-ana_dot_tensor" self) - ]; - meta = { }; - } - ); cl-ana_dot_array-utils = ( build-asdf-system { pname = "cl-ana.array-utils"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.array-utils" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.array-utils"; asd = "cl-ana.array-utils"; @@ -10240,11 +10248,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_binary-tree = ( build-asdf-system { pname = "cl-ana.binary-tree"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.binary-tree" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.binary-tree"; asd = "cl-ana.binary-tree"; @@ -10264,11 +10272,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_calculus = ( build-asdf-system { pname = "cl-ana.calculus"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.calculus" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.calculus"; asd = "cl-ana.calculus"; @@ -10287,11 +10295,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_clos-utils = ( build-asdf-system { pname = "cl-ana.clos-utils"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.clos-utils" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.clos-utils"; asd = "cl-ana.clos-utils"; @@ -10312,11 +10320,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_columnar-table = ( build-asdf-system { pname = "cl-ana.columnar-table"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.columnar-table" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.columnar-table"; asd = "cl-ana.columnar-table"; @@ -10335,11 +10343,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_csv-table = ( build-asdf-system { pname = "cl-ana.csv-table"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.csv-table" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.csv-table"; asd = "cl-ana.csv-table"; @@ -10362,11 +10370,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_error-propogation = ( build-asdf-system { pname = "cl-ana.error-propogation"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.error-propogation" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.error-propogation"; asd = "cl-ana.error-propogation"; @@ -10385,11 +10393,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_file-utils = ( build-asdf-system { pname = "cl-ana.file-utils"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.file-utils" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.file-utils"; asd = "cl-ana.file-utils"; @@ -10408,11 +10416,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_fitting = ( build-asdf-system { pname = "cl-ana.fitting"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.fitting" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.fitting"; asd = "cl-ana.fitting"; @@ -10435,11 +10443,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_functional-utils = ( build-asdf-system { pname = "cl-ana.functional-utils"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.functional-utils" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.functional-utils"; asd = "cl-ana.functional-utils"; @@ -10455,11 +10463,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_generic-math = ( build-asdf-system { pname = "cl-ana.generic-math"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.generic-math" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.generic-math"; asd = "cl-ana.generic-math"; @@ -10478,11 +10486,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_gnuplot-interface = ( build-asdf-system { pname = "cl-ana.gnuplot-interface"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.gnuplot-interface" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.gnuplot-interface"; asd = "cl-ana.gnuplot-interface"; @@ -10498,11 +10506,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_gsl-cffi = ( build-asdf-system { pname = "cl-ana.gsl-cffi"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.gsl-cffi" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.gsl-cffi"; asd = "cl-ana.gsl-cffi"; @@ -10518,11 +10526,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_hash-table-utils = ( build-asdf-system { pname = "cl-ana.hash-table-utils"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.hash-table-utils" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.hash-table-utils"; asd = "cl-ana.hash-table-utils"; @@ -10538,11 +10546,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_hdf-cffi = ( build-asdf-system { pname = "cl-ana.hdf-cffi"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.hdf-cffi" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.hdf-cffi"; asd = "cl-ana.hdf-cffi"; @@ -10561,11 +10569,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_hdf-table = ( build-asdf-system { pname = "cl-ana.hdf-table"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.hdf-table" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.hdf-table"; asd = "cl-ana.hdf-table"; @@ -10591,11 +10599,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_hdf-typespec = ( build-asdf-system { pname = "cl-ana.hdf-typespec"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.hdf-typespec" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.hdf-typespec"; asd = "cl-ana.hdf-typespec"; @@ -10620,11 +10628,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_hdf-utils = ( build-asdf-system { pname = "cl-ana.hdf-utils"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.hdf-utils" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.hdf-utils"; asd = "cl-ana.hdf-utils"; @@ -10650,11 +10658,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_histogram = ( build-asdf-system { pname = "cl-ana.histogram"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.histogram" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.histogram"; asd = "cl-ana.histogram"; @@ -10684,11 +10692,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_int-char = ( build-asdf-system { pname = "cl-ana.int-char"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.int-char" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.int-char"; asd = "cl-ana.int-char"; @@ -10704,11 +10712,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_linear-algebra = ( build-asdf-system { pname = "cl-ana.linear-algebra"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.linear-algebra" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.linear-algebra"; asd = "cl-ana.linear-algebra"; @@ -10730,11 +10738,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_list-utils = ( build-asdf-system { pname = "cl-ana.list-utils"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.list-utils" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.list-utils"; asd = "cl-ana.list-utils"; @@ -10754,11 +10762,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_lorentz = ( build-asdf-system { pname = "cl-ana.lorentz"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.lorentz" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.lorentz"; asd = "cl-ana.lorentz"; @@ -10779,11 +10787,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_macro-utils = ( build-asdf-system { pname = "cl-ana.macro-utils"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.macro-utils" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.macro-utils"; asd = "cl-ana.macro-utils"; @@ -10802,249 +10810,14 @@ lib.makeScope pkgs.newScope (self: { }; } ); - cl-ana_dot_makeres = ( - build-asdf-system { - pname = "cl-ana.makeres"; - version = "20220707-git"; - asds = [ "cl-ana.makeres" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "cl-ana.makeres" ]; - lispLibs = [ - (getAttr "alexandria" self) - (getAttr "cl-ana_dot_error-propogation" self) - (getAttr "cl-ana_dot_file-utils" self) - (getAttr "cl-ana_dot_functional-utils" self) - (getAttr "cl-ana_dot_generic-math" self) - (getAttr "cl-ana_dot_hash-table-utils" self) - (getAttr "cl-ana_dot_hdf-utils" self) - (getAttr "cl-ana_dot_histogram" self) - (getAttr "cl-ana_dot_list-utils" self) - (getAttr "cl-ana_dot_macro-utils" self) - (getAttr "cl-ana_dot_map" self) - (getAttr "cl-ana_dot_memoization" self) - (getAttr "cl-ana_dot_pathname-utils" self) - (getAttr "cl-ana_dot_plotting" self) - (getAttr "cl-ana_dot_reusable-table" self) - (getAttr "cl-ana_dot_serialization" self) - (getAttr "cl-ana_dot_string-utils" self) - (getAttr "cl-ana_dot_symbol-utils" self) - (getAttr "cl-ana_dot_table" self) - (getAttr "cl-fad" self) - (getAttr "external-program" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - cl-ana_dot_makeres-block = ( - build-asdf-system { - pname = "cl-ana.makeres-block"; - version = "20220707-git"; - asds = [ "cl-ana.makeres-block" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "cl-ana.makeres-block" ]; - lispLibs = [ - (getAttr "alexandria" self) - (getAttr "cl-ana_dot_list-utils" self) - (getAttr "cl-ana_dot_macro-utils" self) - (getAttr "cl-ana_dot_makeres" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - cl-ana_dot_makeres-branch = ( - build-asdf-system { - pname = "cl-ana.makeres-branch"; - version = "20220707-git"; - asds = [ "cl-ana.makeres-branch" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "cl-ana.makeres-branch" ]; - lispLibs = [ - (getAttr "alexandria" self) - (getAttr "cl-ana_dot_generic-math" self) - (getAttr "cl-ana_dot_hash-table-utils" self) - (getAttr "cl-ana_dot_list-utils" self) - (getAttr "cl-ana_dot_makeres" self) - (getAttr "cl-ana_dot_map" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - cl-ana_dot_makeres-graphviz = ( - build-asdf-system { - pname = "cl-ana.makeres-graphviz"; - version = "20220707-git"; - asds = [ "cl-ana.makeres-graphviz" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "cl-ana.makeres-graphviz" ]; - lispLibs = [ - (getAttr "cl-ana_dot_makeres" self) - (getAttr "external-program" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - cl-ana_dot_makeres-macro = ( - build-asdf-system { - pname = "cl-ana.makeres-macro"; - version = "20220707-git"; - asds = [ "cl-ana.makeres-macro" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "cl-ana.makeres-macro" ]; - lispLibs = [ - (getAttr "cl-ana_dot_list-utils" self) - (getAttr "cl-ana_dot_makeres" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - cl-ana_dot_makeres-progress = ( - build-asdf-system { - pname = "cl-ana.makeres-progress"; - version = "20220707-git"; - asds = [ "cl-ana.makeres-progress" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "cl-ana.makeres-progress" ]; - lispLibs = [ - (getAttr "alexandria" self) - (getAttr "cl-ana_dot_generic-math" self) - (getAttr "cl-ana_dot_makeres" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - cl-ana_dot_makeres-table = ( - build-asdf-system { - pname = "cl-ana.makeres-table"; - version = "20220707-git"; - asds = [ "cl-ana.makeres-table" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "cl-ana.makeres-table" ]; - lispLibs = [ - (getAttr "cl-ana_dot_csv-table" self) - (getAttr "cl-ana_dot_hash-table-utils" self) - (getAttr "cl-ana_dot_hdf-table" self) - (getAttr "cl-ana_dot_hdf-utils" self) - (getAttr "cl-ana_dot_list-utils" self) - (getAttr "cl-ana_dot_macro-utils" self) - (getAttr "cl-ana_dot_makeres" self) - (getAttr "cl-ana_dot_makeres-macro" self) - (getAttr "cl-ana_dot_memoization" self) - (getAttr "cl-ana_dot_ntuple-table" self) - (getAttr "cl-ana_dot_reusable-table" self) - (getAttr "cl-ana_dot_string-utils" self) - (getAttr "cl-ana_dot_table" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - cl-ana_dot_makeres-utils = ( - build-asdf-system { - pname = "cl-ana.makeres-utils"; - version = "20220707-git"; - asds = [ "cl-ana.makeres-utils" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "cl-ana.makeres-utils" ]; - lispLibs = [ - (getAttr "alexandria" self) - (getAttr "cl-ana_dot_file-utils" self) - (getAttr "cl-ana_dot_fitting" self) - (getAttr "cl-ana_dot_functional-utils" self) - (getAttr "cl-ana_dot_generic-math" self) - (getAttr "cl-ana_dot_histogram" self) - (getAttr "cl-ana_dot_list-utils" self) - (getAttr "cl-ana_dot_macro-utils" self) - (getAttr "cl-ana_dot_makeres" self) - (getAttr "cl-ana_dot_map" self) - (getAttr "cl-ana_dot_pathname-utils" self) - (getAttr "cl-ana_dot_plotting" self) - (getAttr "cl-ana_dot_reusable-table" self) - (getAttr "cl-ana_dot_string-utils" self) - (getAttr "cl-ana_dot_symbol-utils" self) - (getAttr "cl-ana_dot_table" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); cl-ana_dot_map = ( build-asdf-system { pname = "cl-ana.map"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.map" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.map"; asd = "cl-ana.map"; @@ -11060,11 +10833,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_math-functions = ( build-asdf-system { pname = "cl-ana.math-functions"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.math-functions" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.math-functions"; asd = "cl-ana.math-functions"; @@ -11083,11 +10856,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_memoization = ( build-asdf-system { pname = "cl-ana.memoization"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.memoization" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.memoization"; asd = "cl-ana.memoization"; @@ -11103,11 +10876,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_ntuple-table = ( build-asdf-system { pname = "cl-ana.ntuple-table"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.ntuple-table" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.ntuple-table"; asd = "cl-ana.ntuple-table"; @@ -11132,11 +10905,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_package-utils = ( build-asdf-system { pname = "cl-ana.package-utils"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.package-utils" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.package-utils"; asd = "cl-ana.package-utils"; @@ -11152,11 +10925,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_pathname-utils = ( build-asdf-system { pname = "cl-ana.pathname-utils"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.pathname-utils" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.pathname-utils"; asd = "cl-ana.pathname-utils"; @@ -11172,11 +10945,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_plotting = ( build-asdf-system { pname = "cl-ana.plotting"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.plotting" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.plotting"; asd = "cl-ana.plotting"; @@ -11208,11 +10981,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_quantity = ( build-asdf-system { pname = "cl-ana.quantity"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.quantity" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.quantity"; asd = "cl-ana.quantity"; @@ -11236,11 +11009,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_reusable-table = ( build-asdf-system { pname = "cl-ana.reusable-table"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.reusable-table" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.reusable-table"; asd = "cl-ana.reusable-table"; @@ -11259,11 +11032,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_serialization = ( build-asdf-system { pname = "cl-ana.serialization"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.serialization" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.serialization"; asd = "cl-ana.serialization"; @@ -11287,11 +11060,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_spline = ( build-asdf-system { pname = "cl-ana.spline"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.spline" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.spline"; asd = "cl-ana.spline"; @@ -11316,11 +11089,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_statistical-learning = ( build-asdf-system { pname = "cl-ana.statistical-learning"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.statistical-learning" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.statistical-learning"; asd = "cl-ana.statistical-learning"; @@ -11346,11 +11119,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_statistics = ( build-asdf-system { pname = "cl-ana.statistics"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.statistics" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.statistics"; asd = "cl-ana.statistics"; @@ -11373,11 +11146,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_string-utils = ( build-asdf-system { pname = "cl-ana.string-utils"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.string-utils" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.string-utils"; asd = "cl-ana.string-utils"; @@ -11393,11 +11166,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_symbol-utils = ( build-asdf-system { pname = "cl-ana.symbol-utils"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.symbol-utils" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.symbol-utils"; asd = "cl-ana.symbol-utils"; @@ -11413,11 +11186,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_table = ( build-asdf-system { pname = "cl-ana.table"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.table" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.table"; asd = "cl-ana.table"; @@ -11440,11 +11213,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_table-utils = ( build-asdf-system { pname = "cl-ana.table-utils"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.table-utils" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.table-utils"; asd = "cl-ana.table-utils"; @@ -11467,11 +11240,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_table-viewing = ( build-asdf-system { pname = "cl-ana.table-viewing"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.table-viewing" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.table-viewing"; asd = "cl-ana.table-viewing"; @@ -11495,11 +11268,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_tensor = ( build-asdf-system { pname = "cl-ana.tensor"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.tensor" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.tensor"; asd = "cl-ana.tensor"; @@ -11521,11 +11294,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_typed-table = ( build-asdf-system { pname = "cl-ana.typed-table"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.typed-table" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.typed-table"; asd = "cl-ana.typed-table"; @@ -11548,11 +11321,11 @@ lib.makeScope pkgs.newScope (self: { cl-ana_dot_typespec = ( build-asdf-system { pname = "cl-ana.typespec"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-ana.typespec" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-ana/2026-01-01/cl-ana-20260101-git.tgz"; sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; system = "cl-ana.typespec"; asd = "cl-ana.typespec"; @@ -12429,6 +12202,38 @@ lib.makeScope pkgs.newScope (self: { }; } ); + cl-avro = ( + build-asdf-system { + pname = "cl-avro"; + version = "20260101-git"; + asds = [ "cl-avro" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-avro/2026-01-01/cl-avro-20260101-git.tgz"; + sha256 = "04qpa9iq6b951hy6myqcwbn33yw6p1rj3czvxrlyb1kpln779sxz"; + system = "cl-avro"; + asd = "cl-avro"; + } + ); + systems = [ "cl-avro" ]; + lispLibs = [ + (getAttr "alexandria" self) + (getAttr "babel" self) + (getAttr "chipz" self) + (getAttr "closer-mop" self) + (getAttr "flexi-streams" self) + (getAttr "ieee-floats" self) + (getAttr "local-time" self) + (getAttr "local-time-duration" self) + (getAttr "md5" self) + (getAttr "salza2" self) + (getAttr "st-json" self) + (getAttr "time-interval" self) + (getAttr "trivial-extensible-sequences" self) + ]; + meta = { }; + } + ); cl-azure = ( build-asdf-system { pname = "cl-azure"; @@ -12568,12 +12373,12 @@ lib.makeScope pkgs.newScope (self: { cl-batis = ( build-asdf-system { pname = "cl-batis"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-batis" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-batis/2025-06-22/cl-batis-20250622-git.tgz"; - sha256 = "1hmgvp32ivs34xj6a5nnrmj16kphdckz1ygfkrb5f0iwr305qbjf"; + url = "https://beta.quicklisp.org/archive/cl-batis/2026-01-01/cl-batis-20260101-git.tgz"; + sha256 = "1yd9xx6rk403wdv3ddchyx952fj10dvmznjhrxhyl77bgcdrf2v9"; system = "cl-batis"; asd = "cl-batis"; } @@ -12807,12 +12612,12 @@ lib.makeScope pkgs.newScope (self: { cl-bmp = ( build-asdf-system { pname = "cl-bmp"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-bmp" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-bmp/2025-06-22/cl-bmp-20250622-git.tgz"; - sha256 = "0zv91gad3bvd3sd4ah91d3i1fp0sn23rz6vi3nj28mw9r90sf6z1"; + url = "https://beta.quicklisp.org/archive/cl-bmp/2026-01-01/cl-bmp-20260101-git.tgz"; + sha256 = "0dkkvjm6vj1mr2p8m633ycvxs6cf6hnm43jq19cs5wb1wn1bsqa4"; system = "cl-bmp"; asd = "cl-bmp"; } @@ -13602,12 +13407,12 @@ lib.makeScope pkgs.newScope (self: { cl-charms = ( build-asdf-system { pname = "cl-charms"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-charms" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-charms/2025-06-22/cl-charms-20250622-git.tgz"; - sha256 = "102jiq0y8ckf14s1i8b42r44yjlb761q8jinqf2q4c2ki0vgflw9"; + url = "https://beta.quicklisp.org/archive/cl-charms/2026-01-01/cl-charms-20260101-git.tgz"; + sha256 = "1pz327wl9m07xrsmvplfvzgmc1k8habhx2s9vk9h0vlw9g9x1m2z"; system = "cl-charms"; asd = "cl-charms"; } @@ -13626,12 +13431,12 @@ lib.makeScope pkgs.newScope (self: { cl-charms-marquee = ( build-asdf-system { pname = "cl-charms-marquee"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-charms-marquee" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-charms/2025-06-22/cl-charms-20250622-git.tgz"; - sha256 = "102jiq0y8ckf14s1i8b42r44yjlb761q8jinqf2q4c2ki0vgflw9"; + url = "https://beta.quicklisp.org/archive/cl-charms/2026-01-01/cl-charms-20260101-git.tgz"; + sha256 = "1pz327wl9m07xrsmvplfvzgmc1k8habhx2s9vk9h0vlw9g9x1m2z"; system = "cl-charms-marquee"; asd = "cl-charms-marquee"; } @@ -13646,12 +13451,12 @@ lib.makeScope pkgs.newScope (self: { cl-charms-paint = ( build-asdf-system { pname = "cl-charms-paint"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-charms-paint" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-charms/2025-06-22/cl-charms-20250622-git.tgz"; - sha256 = "102jiq0y8ckf14s1i8b42r44yjlb761q8jinqf2q4c2ki0vgflw9"; + url = "https://beta.quicklisp.org/archive/cl-charms/2026-01-01/cl-charms-20260101-git.tgz"; + sha256 = "1pz327wl9m07xrsmvplfvzgmc1k8habhx2s9vk9h0vlw9g9x1m2z"; system = "cl-charms-paint"; asd = "cl-charms-paint"; } @@ -13666,12 +13471,12 @@ lib.makeScope pkgs.newScope (self: { cl-charms-timer = ( build-asdf-system { pname = "cl-charms-timer"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-charms-timer" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-charms/2025-06-22/cl-charms-20250622-git.tgz"; - sha256 = "102jiq0y8ckf14s1i8b42r44yjlb761q8jinqf2q4c2ki0vgflw9"; + url = "https://beta.quicklisp.org/archive/cl-charms/2026-01-01/cl-charms-20260101-git.tgz"; + sha256 = "1pz327wl9m07xrsmvplfvzgmc1k8habhx2s9vk9h0vlw9g9x1m2z"; system = "cl-charms-timer"; asd = "cl-charms-timer"; } @@ -13683,6 +13488,30 @@ lib.makeScope pkgs.newScope (self: { }; } ); + cl-chise = ( + build-asdf-system { + pname = "cl-chise"; + version = "20260101-git"; + asds = [ "cl-chise" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-chise/2026-01-01/cl-chise-20260101-git.tgz"; + sha256 = "1cmyn4wixlhjyiiqcap3fwsk3waaccqnw9047y0v1wj31yxsmcpr"; + system = "cl-chise"; + asd = "cl-chise"; + } + ); + systems = [ "cl-chise" ]; + lispLibs = [ + (getAttr "cl-concord" self) + (getAttr "cl-json" self) + (getAttr "split-sequence" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); cl-clblas = ( build-asdf-system { pname = "cl-clblas"; @@ -13826,12 +13655,12 @@ lib.makeScope pkgs.newScope (self: { cl-collider = ( build-asdf-system { pname = "cl-collider"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-collider" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-collider/2025-06-22/cl-collider-20250622-git.tgz"; - sha256 = "01yiwwi9zhh1vksk26m170i6x9lsbygbznaxggf8h9psiyqg5991"; + url = "https://beta.quicklisp.org/archive/cl-collider/2026-01-01/cl-collider-20260101-git.tgz"; + sha256 = "0c53h7hg6vmgr4zkrz074raxh6jfb2wwv1sh8axwrrvfm8hqw5fs"; system = "cl-collider"; asd = "cl-collider"; } @@ -13845,6 +13674,7 @@ lib.makeScope pkgs.newScope (self: { (getAttr "flexi-streams" self) (getAttr "named-readtables" self) (getAttr "pileup" self) + (getAttr "precise-time" self) (getAttr "sc-osc" self) ]; meta = { @@ -13921,12 +13751,12 @@ lib.makeScope pkgs.newScope (self: { cl-concord = ( build-asdf-system { pname = "cl-concord"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-concord" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-concord/2025-06-22/cl-concord-20250622-git.tgz"; - sha256 = "1kyz9wjcr5xq4fvzvs8cib4a52vwnv08cv5kzf3hyaipxd7fq37y"; + url = "https://beta.quicklisp.org/archive/cl-concord/2026-01-01/cl-concord-20260101-git.tgz"; + sha256 = "07zfsk7wax010vpjngl535a4zarh2rd8bp50mzkana5kl67zlfkp"; system = "cl-concord"; asd = "cl-concord"; } @@ -14663,12 +14493,12 @@ lib.makeScope pkgs.newScope (self: { cl-data-structures = ( build-asdf-system { pname = "cl-data-structures"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-data-structures" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-data-structures/2025-06-22/cl-data-structures-20250622-git.tgz"; - sha256 = "1sxp8gh2737v5qm6hb9j4wqqcairmlr14xylhdizrmgkza9dqp0d"; + url = "https://beta.quicklisp.org/archive/cl-data-structures/2026-01-01/cl-data-structures-20260101-git.tgz"; + sha256 = "1m056h1wxap8cfrxlpz5fh620spqjrwa2hpglv11xp3i9rl0ckx2"; system = "cl-data-structures"; asd = "cl-data-structures"; } @@ -14696,12 +14526,12 @@ lib.makeScope pkgs.newScope (self: { cl-data-structures-tests = ( build-asdf-system { pname = "cl-data-structures-tests"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-data-structures-tests" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-data-structures/2025-06-22/cl-data-structures-20250622-git.tgz"; - sha256 = "1sxp8gh2737v5qm6hb9j4wqqcairmlr14xylhdizrmgkza9dqp0d"; + url = "https://beta.quicklisp.org/archive/cl-data-structures/2026-01-01/cl-data-structures-20260101-git.tgz"; + sha256 = "1m056h1wxap8cfrxlpz5fh620spqjrwa2hpglv11xp3i9rl0ckx2"; system = "cl-data-structures-tests"; asd = "cl-data-structures-tests"; } @@ -14747,12 +14577,12 @@ lib.makeScope pkgs.newScope (self: { cl-dbi = ( build-asdf-system { pname = "cl-dbi"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "cl-dbi" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz"; - sha256 = "17szd6sz1hlwl5fm4qjgyd8ax01wkbhv8hxcyy8qscx39sc0cnpy"; + url = "https://beta.quicklisp.org/archive/cl-dbi/2026-01-01/cl-dbi-20260101-git.tgz"; + sha256 = "19kai3kd061valrr3v31shrizyh9qsyxmcl034b16zllqjrnmyi7"; system = "cl-dbi"; asd = "cl-dbi"; } @@ -14765,12 +14595,12 @@ lib.makeScope pkgs.newScope (self: { cl-dbi-connection-pool = ( build-asdf-system { pname = "cl-dbi-connection-pool"; - version = "20250622-git"; + version = "20260101-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"; + url = "https://beta.quicklisp.org/archive/cl-dbi-connection-pool/2026-01-01/cl-dbi-connection-pool-20260101-git.tgz"; + sha256 = "177c6kl452y4pdkgn3z3s3wicj5p8k91pgh32fb04h8x92z23457"; system = "cl-dbi-connection-pool"; asd = "cl-dbi-connection-pool"; } @@ -15179,6 +15009,26 @@ lib.makeScope pkgs.newScope (self: { }; } ); + cl-double-metaphone = ( + build-asdf-system { + pname = "cl-double-metaphone"; + version = "20260101-git"; + asds = [ "cl-double-metaphone" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-double-metaphone/2026-01-01/cl-double-metaphone-20260101-git.tgz"; + sha256 = "0miaxdbv12p51srlzgsjjsfgb4cqc5j2akxcrpkdc4ylyjbfvkcq"; + system = "cl-double-metaphone"; + asd = "cl-double-metaphone"; + } + ); + systems = [ "cl-double-metaphone" ]; + lispLibs = [ ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); cl-drawille = ( build-asdf-system { pname = "cl-drawille"; @@ -15745,12 +15595,12 @@ lib.makeScope pkgs.newScope (self: { cl-fast-ecs = ( build-asdf-system { pname = "cl-fast-ecs"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-fast-ecs" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-fast-ecs/2025-06-22/cl-fast-ecs-20250622-git.tgz"; - sha256 = "067nfx7cp0qbzva54ym01rvvdiq9f6gnl92w026132p7bzdls2i5"; + url = "https://beta.quicklisp.org/archive/cl-fast-ecs/2026-01-01/cl-fast-ecs-20260101-git.tgz"; + sha256 = "0s2pc1ffbddjsvc92pdd4wlv1353byaar60kmn4zcnwy5g9p81nv"; system = "cl-fast-ecs"; asd = "cl-fast-ecs"; } @@ -15813,12 +15663,12 @@ lib.makeScope pkgs.newScope (self: { cl-fbx = ( build-asdf-system { pname = "cl-fbx"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "cl-fbx" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-fbx/2024-10-12/cl-fbx-20241012-git.tgz"; - sha256 = "1g6s3ili3fcxy37g34ykmf2zc6nm70sh5q0diqbikikaly8kfi50"; + url = "https://beta.quicklisp.org/archive/cl-fbx/2026-01-01/cl-fbx-20260101-git.tgz"; + sha256 = "19vwb5af1ss4cxwd2nfc7yg936gpz6yxjhnpw45z6zxqm3sz0l8k"; system = "cl-fbx"; asd = "cl-fbx"; } @@ -15974,12 +15824,12 @@ lib.makeScope pkgs.newScope (self: { cl-flac = ( build-asdf-system { pname = "cl-flac"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-flac" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-flac/2025-06-22/cl-flac-20250622-git.tgz"; - sha256 = "018kllg8zjdwzm3l3fcxyy47sv1h67mlib7585hvg2hnvqljffh8"; + url = "https://beta.quicklisp.org/archive/cl-flac/2026-01-01/cl-flac-20260101-git.tgz"; + sha256 = "1p4bwzfk6j0vvvzva8j9migbcgq2dgd8bnkm13ap6dlznlij48bn"; system = "cl-flac"; asd = "cl-flac"; } @@ -16141,12 +15991,12 @@ lib.makeScope pkgs.newScope (self: { cl-fond = ( build-asdf-system { pname = "cl-fond"; - version = "20191130-git"; + version = "20260101-git"; asds = [ "cl-fond" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-fond/2019-11-30/cl-fond-20191130-git.tgz"; - sha256 = "03ygcw1azb44bhdsqcq99xi4ci0by76ap5jf5l2d1vfxq04v8grq"; + url = "https://beta.quicklisp.org/archive/cl-fond/2026-01-01/cl-fond-20260101-git.tgz"; + sha256 = "171f799g9lgd6fb2hjfvw7bdi389qisr9sq6rv7caj34ay3cfh2s"; system = "cl-fond"; asd = "cl-fond"; } @@ -16431,6 +16281,50 @@ lib.makeScope pkgs.newScope (self: { }; } ); + cl-freelock = ( + build-asdf-system { + pname = "cl-freelock"; + version = "20260101-git"; + asds = [ "cl-freelock" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-freelock/2026-01-01/cl-freelock-20260101-git.tgz"; + sha256 = "04gzbgbfhwplhi400whfyc6rqi47zy9vgaw9dxi9prgzg0rfd212"; + system = "cl-freelock"; + asd = "cl-freelock"; + } + ); + systems = [ "cl-freelock" ]; + lispLibs = [ ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + cl-freelock-tests = ( + build-asdf-system { + pname = "cl-freelock-tests"; + version = "20260101-git"; + asds = [ "cl-freelock-tests" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-freelock/2026-01-01/cl-freelock-20260101-git.tgz"; + sha256 = "04gzbgbfhwplhi400whfyc6rqi47zy9vgaw9dxi9prgzg0rfd212"; + system = "cl-freelock-tests"; + asd = "cl-freelock-tests"; + } + ); + systems = [ "cl-freelock-tests" ]; + lispLibs = [ + (getAttr "bordeaux-threads" self) + (getAttr "cl-freelock" self) + (getAttr "fiveam" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); cl-freetype2 = ( build-asdf-system { pname = "cl-freetype2"; @@ -16617,12 +16511,12 @@ lib.makeScope pkgs.newScope (self: { cl-gamepad = ( build-asdf-system { pname = "cl-gamepad"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-gamepad" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-gamepad/2025-06-22/cl-gamepad-20250622-git.tgz"; - sha256 = "1flnsqa33hm3ab4vbab0r62xbjjrwi5g6a9asjr77mp2vhdwycsr"; + url = "https://beta.quicklisp.org/archive/cl-gamepad/2026-01-01/cl-gamepad-20260101-git.tgz"; + sha256 = "06lln0khm86kzzx985bigszjnb90543dawhaa5s72mfqndgphj6r"; system = "cl-gamepad"; asd = "cl-gamepad"; } @@ -24301,12 +24195,12 @@ lib.makeScope pkgs.newScope (self: { cl-gltf = ( build-asdf-system { pname = "cl-gltf"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-gltf" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-gltf/2025-06-22/cl-gltf-20250622-git.tgz"; - sha256 = "0ais6p3mw22zmhcfkab34sfb717si3a1wjx1xq8lig6fr75fw6k1"; + url = "https://beta.quicklisp.org/archive/cl-gltf/2026-01-01/cl-gltf-20260101-git.tgz"; + sha256 = "1vqllcmd6xybrq8l9bm957yb8vlmcrawk9yllfyfmm0k08n8k40x"; system = "cl-gltf"; asd = "cl-gltf"; } @@ -24331,12 +24225,12 @@ lib.makeScope pkgs.newScope (self: { cl-glu = ( build-asdf-system { pname = "cl-glu"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-glu" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-opengl/2025-06-22/cl-opengl-20250622-git.tgz"; - sha256 = "1ksm330gsw20ajcl1jri3s7ydmrkyqbmajmk4gp452nsgqm62axm"; + url = "https://beta.quicklisp.org/archive/cl-opengl/2026-01-01/cl-opengl-20260101-git.tgz"; + sha256 = "16alk0nfg5alydm3gb4sn1hyg8akjmnxm9v67nqpk4363n37wwyk"; system = "cl-glu"; asd = "cl-glu"; } @@ -24354,12 +24248,12 @@ lib.makeScope pkgs.newScope (self: { cl-glut = ( build-asdf-system { pname = "cl-glut"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-glut" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-opengl/2025-06-22/cl-opengl-20250622-git.tgz"; - sha256 = "1ksm330gsw20ajcl1jri3s7ydmrkyqbmajmk4gp452nsgqm62axm"; + url = "https://beta.quicklisp.org/archive/cl-opengl/2026-01-01/cl-opengl-20260101-git.tgz"; + sha256 = "16alk0nfg5alydm3gb4sn1hyg8akjmnxm9v67nqpk4363n37wwyk"; system = "cl-glut"; asd = "cl-glut"; } @@ -24378,12 +24272,12 @@ lib.makeScope pkgs.newScope (self: { cl-glut-examples = ( build-asdf-system { pname = "cl-glut-examples"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-glut-examples" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-opengl/2025-06-22/cl-opengl-20250622-git.tgz"; - sha256 = "1ksm330gsw20ajcl1jri3s7ydmrkyqbmajmk4gp452nsgqm62axm"; + url = "https://beta.quicklisp.org/archive/cl-opengl/2026-01-01/cl-opengl-20260101-git.tgz"; + sha256 = "16alk0nfg5alydm3gb4sn1hyg8akjmnxm9v67nqpk4363n37wwyk"; system = "cl-glut-examples"; asd = "cl-glut-examples"; } @@ -24470,12 +24364,12 @@ lib.makeScope pkgs.newScope (self: { cl-gobject-introspection-wrapper = ( build-asdf-system { pname = "cl-gobject-introspection-wrapper"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "cl-gobject-introspection-wrapper" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-gobject-introspection-wrapper/2023-10-21/cl-gobject-introspection-wrapper-20231021-git.tgz"; - sha256 = "0x1nryxkv6i0bzn2zmlsgbq0impni4drzawy3wc7zy5nr2qnd1x5"; + url = "https://beta.quicklisp.org/archive/cl-gobject-introspection-wrapper/2026-01-01/cl-gobject-introspection-wrapper-20260101-git.tgz"; + sha256 = "10ywyvsdj7qfin0v6yqhc9qjcvlaq7kqsivvzag10ag60d5z5q7w"; system = "cl-gobject-introspection-wrapper"; asd = "cl-gobject-introspection-wrapper"; } @@ -24494,12 +24388,12 @@ lib.makeScope pkgs.newScope (self: { cl-gog-galaxy = ( build-asdf-system { pname = "cl-gog-galaxy"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-gog-galaxy" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-gog-galaxy/2025-06-22/cl-gog-galaxy-20250622-git.tgz"; - sha256 = "0y8qp74njyidl93l3spbrizdfmmxdd0vs36hw4ihn5gr62y8yf18"; + url = "https://beta.quicklisp.org/archive/cl-gog-galaxy/2026-01-01/cl-gog-galaxy-20260101-git.tgz"; + sha256 = "01z4zhbci427dzyxd9kn2m7fy31wsprdqd510hayrwgmmc5hza7i"; system = "cl-gog-galaxy"; asd = "cl-gog-galaxy"; } @@ -24546,12 +24440,12 @@ lib.makeScope pkgs.newScope (self: { cl-gpio = ( build-asdf-system { pname = "cl-gpio"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-gpio" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-gpio/2025-06-22/cl-gpio-20250622-git.tgz"; - sha256 = "0z5w2p87plmgqnn8r6kc040303c7wynngr0fq3m25p29n776fibw"; + url = "https://beta.quicklisp.org/archive/cl-gpio/2026-01-01/cl-gpio-20260101-git.tgz"; + sha256 = "0l5mhrw5hl2q5rl4frz9s7d0ff9y27y8pmk4c1yhld46b0wxy1wb"; system = "cl-gpio"; asd = "cl-gpio"; } @@ -25118,12 +25012,12 @@ lib.makeScope pkgs.newScope (self: { cl-html-readme = ( build-asdf-system { pname = "cl-html-readme"; - version = "quicklisp-current-release-f8aed591-git"; + version = "quicklisp-current-release-69178207-git"; asds = [ "cl-html-readme" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-html-readme/2024-10-12/cl-html-readme-quicklisp-current-release-f8aed591-git.tgz"; - sha256 = "1q23fdbhmra7hl12vd70m7q350wych6f739l8xmz6f84dwm9i8c7"; + url = "https://beta.quicklisp.org/archive/cl-html-readme/2026-01-01/cl-html-readme-quicklisp-current-release-69178207-git.tgz"; + sha256 = "1ssn74qd9p6ab9mys605h3v30q7qmfwv7fhpw326423jab0bhw53"; system = "cl-html-readme"; asd = "cl-html-readme"; } @@ -25276,12 +25170,12 @@ lib.makeScope pkgs.newScope (self: { cl-i18n = ( build-asdf-system { pname = "cl-i18n"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-i18n" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-i18n/2025-06-22/cl-i18n-20250622-git.tgz"; - sha256 = "1vz0ynfx557c9nydnq5c32ha7qv8viypvmqg36s1l6mbp16b76ws"; + url = "https://beta.quicklisp.org/archive/cl-i18n/2026-01-01/cl-i18n-20260101-git.tgz"; + sha256 = "0g6qvjskdnanal632xs8s285vny1wm0zly7zsqa98iwhn5dl5qkk"; system = "cl-i18n"; asd = "cl-i18n"; } @@ -25617,6 +25511,26 @@ lib.makeScope pkgs.newScope (self: { }; } ); + cl-inix = ( + build-asdf-system { + pname = "cl-inix"; + version = "20260101-git"; + asds = [ "cl-inix" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-inix/2026-01-01/cl-inix-20260101-git.tgz"; + sha256 = "1hhaf1skf4cbk2y4nrmd4kfyy1279z4fvhm3aj9m2n3pjnrf4v3m"; + system = "cl-inix"; + asd = "cl-inix"; + } + ); + systems = [ "cl-inix" ]; + lispLibs = [ ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); cl-inotify = ( build-asdf-system { pname = "cl-inotify"; @@ -26185,6 +26099,29 @@ lib.makeScope pkgs.newScope (self: { }; } ); + cl-jsonpath = ( + build-asdf-system { + pname = "cl-jsonpath"; + version = "20260101-git"; + asds = [ "cl-jsonpath" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-jsonpath/2026-01-01/cl-jsonpath-20260101-git.tgz"; + sha256 = "04kgnxxps7xnnjgmkrcz9j19pzrk2qyirjgym3dhnhj6jrlapww4"; + system = "cl-jsonpath"; + asd = "cl-jsonpath"; + } + ); + systems = [ "cl-jsonpath" ]; + lispLibs = [ + (getAttr "cl-ppcre" self) + (getAttr "parse-number" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); cl-jsx = ( build-asdf-system { pname = "cl-jsx"; @@ -26386,12 +26323,12 @@ lib.makeScope pkgs.newScope (self: { cl-k8055 = ( build-asdf-system { pname = "cl-k8055"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-k8055" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-k8055/2025-06-22/cl-k8055-20250622-git.tgz"; - sha256 = "0ml2i5zkidc01dmjqxrk2y4a24wnh6wz4amc979rilj6nwrxzj1f"; + url = "https://beta.quicklisp.org/archive/cl-k8055/2026-01-01/cl-k8055-20260101-git.tgz"; + sha256 = "0pvw5w94jq3qg2rj9y7rbyqs8l7nk6z9warrv1fbs4qz8n04crgg"; system = "cl-k8055"; asd = "cl-k8055"; } @@ -26554,12 +26491,12 @@ lib.makeScope pkgs.newScope (self: { cl-ktx = ( build-asdf-system { pname = "cl-ktx"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "cl-ktx" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ktx/2023-10-21/cl-ktx-20231021-git.tgz"; - sha256 = "1nggg3qixnmv9gisj0aqd369z1rm2qqdf17xnsxcpzz1d9lvxqhq"; + url = "https://beta.quicklisp.org/archive/cl-ktx/2026-01-01/cl-ktx-20260101-git.tgz"; + sha256 = "0s4isxs2qb5v5raihgb9mslq6ccli78gp836hwqh65fgnv3j53ff"; system = "cl-ktx"; asd = "cl-ktx"; } @@ -26576,6 +26513,29 @@ lib.makeScope pkgs.newScope (self: { }; } ); + cl-ktx2 = ( + build-asdf-system { + pname = "cl-ktx2"; + version = "20260101-git"; + asds = [ "cl-ktx2" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-ktx2/2026-01-01/cl-ktx2-20260101-git.tgz"; + sha256 = "0g6fl3syqn8hkbs42racdj9yi5jif1q64bxhnz6csrw103np9dz8"; + system = "cl-ktx2"; + asd = "cl-ktx2"; + } + ); + systems = [ "cl-ktx2" ]; + lispLibs = [ + (getAttr "binary-structures" self) + (getAttr "documentation-utils" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); cl-kyoto-cabinet = ( build-asdf-system { pname = "cl-kyoto-cabinet"; @@ -26689,12 +26649,12 @@ lib.makeScope pkgs.newScope (self: { cl-las = ( build-asdf-system { pname = "cl-las"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-las" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-las/2025-06-22/cl-las-20250622-git.tgz"; - sha256 = "0gmygdn36lwfi2v9k6izk2l2gj7f02vcnlkrxlmgyqc0x6plf3n8"; + url = "https://beta.quicklisp.org/archive/cl-las/2026-01-01/cl-las-20260101-git.tgz"; + sha256 = "025bvhnzvyy8q19vdgvk5x7bir01h9jlv3xzah2pjcnawx2ihaj8"; system = "cl-las"; asd = "cl-las"; } @@ -26777,12 +26737,12 @@ lib.makeScope pkgs.newScope (self: { cl-lc = ( build-asdf-system { pname = "cl-lc"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "cl-lc" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-lc/2024-10-12/cl-lc-20241012-git.tgz"; - sha256 = "07wpbwgjybhp6vdr2rbd93jwakqixr9dyymp3yz1h684ln7wvfkb"; + url = "https://beta.quicklisp.org/archive/cl-lc/2026-01-01/cl-lc-20260101-git.tgz"; + sha256 = "01pgah5xllid74g4vkqsckww7lc68vm20xkhg2yxmqjmx67xj72q"; system = "cl-lc"; asd = "cl-lc"; } @@ -26801,12 +26761,12 @@ lib.makeScope pkgs.newScope (self: { cl-ledger = ( build-asdf-system { pname = "cl-ledger"; - version = "20200218-git"; + version = "20260101-git"; asds = [ "cl-ledger" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-ledger/2020-02-18/cl-ledger-20200218-git.tgz"; - sha256 = "1dpxna9s0rgshqbc58h698ihwyk34a3napb8zrm8vbq8aigjrrzs"; + url = "https://beta.quicklisp.org/archive/cl-ledger/2026-01-01/cl-ledger-20260101-git.tgz"; + sha256 = "09d9d1pk9ap76a651c3hzz7y27bgr7s61wws1dggp23fkzi699as"; system = "cl-ledger"; asd = "cl-ledger"; } @@ -26826,12 +26786,12 @@ lib.makeScope pkgs.newScope (self: { cl-lex = ( build-asdf-system { pname = "cl-lex"; - version = "20160929-git"; + version = "20260101-git"; asds = [ "cl-lex" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-lex/2016-09-29/cl-lex-20160929-git.tgz"; - sha256 = "1kg50f76bfpfxcv4dfivq1n9a0xlsra2ajb0vd68lxwgbidgyc2y"; + url = "https://beta.quicklisp.org/archive/cl-lex/2026-01-01/cl-lex-20260101-git.tgz"; + sha256 = "1v77af4m2ckslnk5s020x1bs8l07756jxnmlf6bfxwzr0asn7xvh"; system = "cl-lex"; asd = "cl-lex"; } @@ -26866,12 +26826,12 @@ lib.makeScope pkgs.newScope (self: { cl-liballegro = ( build-asdf-system { pname = "cl-liballegro"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-liballegro" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-liballegro/2025-06-22/cl-liballegro-20250622-git.tgz"; - sha256 = "1kqywmc4zp45kh1b6hix1dsm1n01zpmz8qkwfbwjrpq4a07rx30l"; + url = "https://beta.quicklisp.org/archive/cl-liballegro/2026-01-01/cl-liballegro-20260101-git.tgz"; + sha256 = "0z3cq1200wqzfg7syva6808wqn60nbwwf4xl6hnpylb2v4fmgwrf"; system = "cl-liballegro"; asd = "cl-liballegro"; } @@ -26893,12 +26853,12 @@ lib.makeScope pkgs.newScope (self: { cl-liballegro-nuklear = ( build-asdf-system { pname = "cl-liballegro-nuklear"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-liballegro-nuklear" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-liballegro-nuklear/2025-06-22/cl-liballegro-nuklear-20250622-git.tgz"; - sha256 = "1nfayk1as4ss9fmi04rz5gb5l9v7zs98zj1ddx15h4lml811n322"; + url = "https://beta.quicklisp.org/archive/cl-liballegro-nuklear/2026-01-01/cl-liballegro-nuklear-20260101-git.tgz"; + sha256 = "1nk9fxq170zf28c0rflgaffy7565jqvq9j7c8b0dpnjnmq0gk49n"; system = "cl-liballegro-nuklear"; asd = "cl-liballegro-nuklear"; } @@ -27070,12 +27030,12 @@ lib.makeScope pkgs.newScope (self: { cl-libre-translate = ( build-asdf-system { pname = "cl-libre-translate"; - version = "20250622-git"; + version = "20260101-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"; + url = "https://beta.quicklisp.org/archive/cl-libre-translate/2026-01-01/cl-libre-translate-20260101-git.tgz"; + sha256 = "0lkpy1m5fjr7rir3k4mp9rafln8114myxiidqghgsxf0v79l0yyw"; system = "cl-libre-translate"; asd = "cl-libre-translate"; } @@ -27095,12 +27055,12 @@ lib.makeScope pkgs.newScope (self: { cl-libre-translate_dot_test = ( build-asdf-system { pname = "cl-libre-translate.test"; - version = "20250622-git"; + version = "20260101-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"; + url = "https://beta.quicklisp.org/archive/cl-libre-translate/2026-01-01/cl-libre-translate-20260101-git.tgz"; + sha256 = "0lkpy1m5fjr7rir3k4mp9rafln8114myxiidqghgsxf0v79l0yyw"; system = "cl-libre-translate.test"; asd = "cl-libre-translate.test"; } @@ -27341,12 +27301,12 @@ lib.makeScope pkgs.newScope (self: { cl-lite = ( build-asdf-system { pname = "cl-lite"; - version = "master-5a621564-git"; + version = "master-bfa9fc5c-git"; asds = [ "cl-lite" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; - sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; + url = "https://beta.quicklisp.org/archive/gendl/2026-01-01/gendl-master-bfa9fc5c-git.tgz"; + sha256 = "1hbbflaiplf4qxqlc5bqi28xh419lijrz4rvz18maqiavg059bfk"; system = "cl-lite"; asd = "cl-lite"; } @@ -27719,12 +27679,12 @@ lib.makeScope pkgs.newScope (self: { cl-markless = ( build-asdf-system { pname = "cl-markless"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-markless" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz"; - sha256 = "1vqjbhwqnx1i97r36sqr0alyqb39aszil6dswzdvx4s54h5dpphy"; + url = "https://beta.quicklisp.org/archive/cl-markless/2026-01-01/cl-markless-20260101-git.tgz"; + sha256 = "0m2h7ia0g9g2mf3i7gidb6gmqb3247r0xsqzc52i1bhaj1k1kh23"; system = "cl-markless"; asd = "cl-markless"; } @@ -27742,12 +27702,12 @@ lib.makeScope pkgs.newScope (self: { cl-markless-epub = ( build-asdf-system { pname = "cl-markless-epub"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-markless-epub" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz"; - sha256 = "1vqjbhwqnx1i97r36sqr0alyqb39aszil6dswzdvx4s54h5dpphy"; + url = "https://beta.quicklisp.org/archive/cl-markless/2026-01-01/cl-markless-20260101-git.tgz"; + sha256 = "0m2h7ia0g9g2mf3i7gidb6gmqb3247r0xsqzc52i1bhaj1k1kh23"; system = "cl-markless-epub"; asd = "cl-markless-epub"; } @@ -27769,12 +27729,12 @@ lib.makeScope pkgs.newScope (self: { cl-markless-latex = ( build-asdf-system { pname = "cl-markless-latex"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-markless-latex" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz"; - sha256 = "1vqjbhwqnx1i97r36sqr0alyqb39aszil6dswzdvx4s54h5dpphy"; + url = "https://beta.quicklisp.org/archive/cl-markless/2026-01-01/cl-markless-20260101-git.tgz"; + sha256 = "0m2h7ia0g9g2mf3i7gidb6gmqb3247r0xsqzc52i1bhaj1k1kh23"; system = "cl-markless-latex"; asd = "cl-markless-latex"; } @@ -27789,12 +27749,12 @@ lib.makeScope pkgs.newScope (self: { cl-markless-markdown = ( build-asdf-system { pname = "cl-markless-markdown"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-markless-markdown" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz"; - sha256 = "1vqjbhwqnx1i97r36sqr0alyqb39aszil6dswzdvx4s54h5dpphy"; + url = "https://beta.quicklisp.org/archive/cl-markless/2026-01-01/cl-markless-20260101-git.tgz"; + sha256 = "0m2h7ia0g9g2mf3i7gidb6gmqb3247r0xsqzc52i1bhaj1k1kh23"; system = "cl-markless-markdown"; asd = "cl-markless-markdown"; } @@ -27813,18 +27773,19 @@ lib.makeScope pkgs.newScope (self: { cl-markless-plump = ( build-asdf-system { pname = "cl-markless-plump"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-markless-plump" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz"; - sha256 = "1vqjbhwqnx1i97r36sqr0alyqb39aszil6dswzdvx4s54h5dpphy"; + url = "https://beta.quicklisp.org/archive/cl-markless/2026-01-01/cl-markless-20260101-git.tgz"; + sha256 = "0m2h7ia0g9g2mf3i7gidb6gmqb3247r0xsqzc52i1bhaj1k1kh23"; system = "cl-markless-plump"; asd = "cl-markless-plump"; } ); systems = [ "cl-markless-plump" ]; lispLibs = [ + (getAttr "babel" self) (getAttr "cl-markless" self) (getAttr "plump-dom" self) ]; @@ -27836,12 +27797,12 @@ lib.makeScope pkgs.newScope (self: { cl-markless-standalone = ( build-asdf-system { pname = "cl-markless-standalone"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-markless-standalone" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz"; - sha256 = "1vqjbhwqnx1i97r36sqr0alyqb39aszil6dswzdvx4s54h5dpphy"; + url = "https://beta.quicklisp.org/archive/cl-markless/2026-01-01/cl-markless-20260101-git.tgz"; + sha256 = "0m2h7ia0g9g2mf3i7gidb6gmqb3247r0xsqzc52i1bhaj1k1kh23"; system = "cl-markless-standalone"; asd = "cl-markless-standalone"; } @@ -27864,12 +27825,12 @@ lib.makeScope pkgs.newScope (self: { cl-markless-test = ( build-asdf-system { pname = "cl-markless-test"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-markless-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz"; - sha256 = "1vqjbhwqnx1i97r36sqr0alyqb39aszil6dswzdvx4s54h5dpphy"; + url = "https://beta.quicklisp.org/archive/cl-markless/2026-01-01/cl-markless-20260101-git.tgz"; + sha256 = "0m2h7ia0g9g2mf3i7gidb6gmqb3247r0xsqzc52i1bhaj1k1kh23"; system = "cl-markless-test"; asd = "cl-markless-test"; } @@ -27970,6 +27931,29 @@ lib.makeScope pkgs.newScope (self: { }; } ); + cl-match-patterns = ( + build-asdf-system { + pname = "cl-match-patterns"; + version = "20260101-git"; + asds = [ "cl-match-patterns" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-match-patterns/2026-01-01/cl-match-patterns-20260101-git.tgz"; + sha256 = "00inxz9kc2ckayw7c6fm6gm45bniwn090lrjl3146qdk7glxi6q5"; + system = "cl-match-patterns"; + asd = "cl-match-patterns"; + } + ); + systems = [ "cl-match-patterns" ]; + lispLibs = [ + (getAttr "cl-ppcre" self) + (getAttr "quri" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); cl-match-test = ( build-asdf-system { pname = "cl-match-test"; @@ -28431,12 +28415,12 @@ lib.makeScope pkgs.newScope (self: { cl-migratum = ( build-asdf-system { pname = "cl-migratum"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "cl-migratum" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz"; - sha256 = "0bkzbvv3s2j5gs032nj82b0p3x6j3in54kqyg74x54b25q75ymvw"; + url = "https://beta.quicklisp.org/archive/cl-migratum/2026-01-01/cl-migratum-20260101-git.tgz"; + sha256 = "04fdk56c8kl1xc57i9mwxriz7s6man1fy8s4g17b8jaagj4l9xwd"; system = "cl-migratum"; asd = "cl-migratum"; } @@ -28456,12 +28440,12 @@ lib.makeScope pkgs.newScope (self: { cl-migratum_dot_cli = ( build-asdf-system { pname = "cl-migratum.cli"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "cl-migratum.cli" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz"; - sha256 = "0bkzbvv3s2j5gs032nj82b0p3x6j3in54kqyg74x54b25q75ymvw"; + url = "https://beta.quicklisp.org/archive/cl-migratum/2026-01-01/cl-migratum-20260101-git.tgz"; + sha256 = "04fdk56c8kl1xc57i9mwxriz7s6man1fy8s4g17b8jaagj4l9xwd"; system = "cl-migratum.cli"; asd = "cl-migratum.cli"; } @@ -28482,12 +28466,12 @@ lib.makeScope pkgs.newScope (self: { cl-migratum_dot_driver_dot_dbi = ( build-asdf-system { pname = "cl-migratum.driver.dbi"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "cl-migratum.driver.dbi" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz"; - sha256 = "0bkzbvv3s2j5gs032nj82b0p3x6j3in54kqyg74x54b25q75ymvw"; + url = "https://beta.quicklisp.org/archive/cl-migratum/2026-01-01/cl-migratum-20260101-git.tgz"; + sha256 = "04fdk56c8kl1xc57i9mwxriz7s6man1fy8s4g17b8jaagj4l9xwd"; system = "cl-migratum.driver.dbi"; asd = "cl-migratum.driver.dbi"; } @@ -28508,12 +28492,12 @@ lib.makeScope pkgs.newScope (self: { cl-migratum_dot_driver_dot_mixins = ( build-asdf-system { pname = "cl-migratum.driver.mixins"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "cl-migratum.driver.mixins" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz"; - sha256 = "0bkzbvv3s2j5gs032nj82b0p3x6j3in54kqyg74x54b25q75ymvw"; + url = "https://beta.quicklisp.org/archive/cl-migratum/2026-01-01/cl-migratum-20260101-git.tgz"; + sha256 = "04fdk56c8kl1xc57i9mwxriz7s6man1fy8s4g17b8jaagj4l9xwd"; system = "cl-migratum.driver.mixins"; asd = "cl-migratum.driver.mixins"; } @@ -28528,12 +28512,12 @@ lib.makeScope pkgs.newScope (self: { cl-migratum_dot_driver_dot_postmodern-postgresql = ( build-asdf-system { pname = "cl-migratum.driver.postmodern-postgresql"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "cl-migratum.driver.postmodern-postgresql" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz"; - sha256 = "0bkzbvv3s2j5gs032nj82b0p3x6j3in54kqyg74x54b25q75ymvw"; + url = "https://beta.quicklisp.org/archive/cl-migratum/2026-01-01/cl-migratum-20260101-git.tgz"; + sha256 = "04fdk56c8kl1xc57i9mwxriz7s6man1fy8s4g17b8jaagj4l9xwd"; system = "cl-migratum.driver.postmodern-postgresql"; asd = "cl-migratum.driver.postmodern-postgresql"; } @@ -28555,12 +28539,12 @@ lib.makeScope pkgs.newScope (self: { cl-migratum_dot_driver_dot_rdbms-postgresql = ( build-asdf-system { pname = "cl-migratum.driver.rdbms-postgresql"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "cl-migratum.driver.rdbms-postgresql" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz"; - sha256 = "0bkzbvv3s2j5gs032nj82b0p3x6j3in54kqyg74x54b25q75ymvw"; + url = "https://beta.quicklisp.org/archive/cl-migratum/2026-01-01/cl-migratum-20260101-git.tgz"; + sha256 = "04fdk56c8kl1xc57i9mwxriz7s6man1fy8s4g17b8jaagj4l9xwd"; system = "cl-migratum.driver.rdbms-postgresql"; asd = "cl-migratum.driver.rdbms-postgresql"; } @@ -28582,12 +28566,12 @@ lib.makeScope pkgs.newScope (self: { cl-migratum_dot_provider_dot_local-path = ( build-asdf-system { pname = "cl-migratum.provider.local-path"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "cl-migratum.provider.local-path" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz"; - sha256 = "0bkzbvv3s2j5gs032nj82b0p3x6j3in54kqyg74x54b25q75ymvw"; + url = "https://beta.quicklisp.org/archive/cl-migratum/2026-01-01/cl-migratum-20260101-git.tgz"; + sha256 = "04fdk56c8kl1xc57i9mwxriz7s6man1fy8s4g17b8jaagj4l9xwd"; system = "cl-migratum.provider.local-path"; asd = "cl-migratum.provider.local-path"; } @@ -28606,12 +28590,12 @@ lib.makeScope pkgs.newScope (self: { cl-migratum_dot_test = ( build-asdf-system { pname = "cl-migratum.test"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "cl-migratum.test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz"; - sha256 = "0bkzbvv3s2j5gs032nj82b0p3x6j3in54kqyg74x54b25q75ymvw"; + url = "https://beta.quicklisp.org/archive/cl-migratum/2026-01-01/cl-migratum-20260101-git.tgz"; + sha256 = "04fdk56c8kl1xc57i9mwxriz7s6man1fy8s4g17b8jaagj4l9xwd"; system = "cl-migratum.test"; asd = "cl-migratum.test"; } @@ -28745,6 +28729,26 @@ lib.makeScope pkgs.newScope (self: { }; } ); + cl-minifloats = ( + build-asdf-system { + pname = "cl-minifloats"; + version = "20260101-git"; + asds = [ "cl-minifloats" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-minifloats/2026-01-01/cl-minifloats-20260101-git.tgz"; + sha256 = "10vj7adfxa2qab4zbyhnp764bjjj529830xjhmykm3cxlp09cd41"; + system = "cl-minifloats"; + asd = "cl-minifloats"; + } + ); + systems = [ "cl-minifloats" ]; + lispLibs = [ (getAttr "float-features" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); cl-minify-css = ( build-asdf-system { pname = "cl-minify-css"; @@ -28793,12 +28797,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed = ( build-asdf-system { pname = "cl-mixed"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-mixed" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; - sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2026-01-01/cl-mixed-20260101-git.tgz"; + sha256 = "1z9dlnsrzd7m4dyi9wv63mx8hs8pnrl5g9r4hvyl402f7lakzp1r"; system = "cl-mixed"; asd = "cl-mixed"; } @@ -28819,12 +28823,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-aaudio = ( build-asdf-system { pname = "cl-mixed-aaudio"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-mixed-aaudio" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; - sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2026-01-01/cl-mixed-20260101-git.tgz"; + sha256 = "1z9dlnsrzd7m4dyi9wv63mx8hs8pnrl5g9r4hvyl402f7lakzp1r"; system = "cl-mixed-aaudio"; asd = "cl-mixed-aaudio"; } @@ -28842,12 +28846,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-alsa = ( build-asdf-system { pname = "cl-mixed-alsa"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-mixed-alsa" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; - sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2026-01-01/cl-mixed-20260101-git.tgz"; + sha256 = "1z9dlnsrzd7m4dyi9wv63mx8hs8pnrl5g9r4hvyl402f7lakzp1r"; system = "cl-mixed-alsa"; asd = "cl-mixed-alsa"; } @@ -28865,12 +28869,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-coreaudio = ( build-asdf-system { pname = "cl-mixed-coreaudio"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-mixed-coreaudio" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; - sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2026-01-01/cl-mixed-20260101-git.tgz"; + sha256 = "1z9dlnsrzd7m4dyi9wv63mx8hs8pnrl5g9r4hvyl402f7lakzp1r"; system = "cl-mixed-coreaudio"; asd = "cl-mixed-coreaudio"; } @@ -28890,12 +28894,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-examples = ( build-asdf-system { pname = "cl-mixed-examples"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-mixed-examples" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; - sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2026-01-01/cl-mixed-20260101-git.tgz"; + sha256 = "1z9dlnsrzd7m4dyi9wv63mx8hs8pnrl5g9r4hvyl402f7lakzp1r"; system = "cl-mixed-examples"; asd = "cl-mixed-examples"; } @@ -28916,12 +28920,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-flac = ( build-asdf-system { pname = "cl-mixed-flac"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-mixed-flac" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; - sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2026-01-01/cl-mixed-20260101-git.tgz"; + sha256 = "1z9dlnsrzd7m4dyi9wv63mx8hs8pnrl5g9r4hvyl402f7lakzp1r"; system = "cl-mixed-flac"; asd = "cl-mixed-flac"; } @@ -28939,12 +28943,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-jack = ( build-asdf-system { pname = "cl-mixed-jack"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-mixed-jack" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; - sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2026-01-01/cl-mixed-20260101-git.tgz"; + sha256 = "1z9dlnsrzd7m4dyi9wv63mx8hs8pnrl5g9r4hvyl402f7lakzp1r"; system = "cl-mixed-jack"; asd = "cl-mixed-jack"; } @@ -28962,12 +28966,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-mpg123 = ( build-asdf-system { pname = "cl-mixed-mpg123"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-mixed-mpg123" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; - sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2026-01-01/cl-mixed-20260101-git.tgz"; + sha256 = "1z9dlnsrzd7m4dyi9wv63mx8hs8pnrl5g9r4hvyl402f7lakzp1r"; system = "cl-mixed-mpg123"; asd = "cl-mixed-mpg123"; } @@ -28985,12 +28989,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-mpt = ( build-asdf-system { pname = "cl-mixed-mpt"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-mixed-mpt" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; - sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2026-01-01/cl-mixed-20260101-git.tgz"; + sha256 = "1z9dlnsrzd7m4dyi9wv63mx8hs8pnrl5g9r4hvyl402f7lakzp1r"; system = "cl-mixed-mpt"; asd = "cl-mixed-mpt"; } @@ -29008,12 +29012,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-nxau = ( build-asdf-system { pname = "cl-mixed-nxau"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-mixed-nxau" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; - sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2026-01-01/cl-mixed-20260101-git.tgz"; + sha256 = "1z9dlnsrzd7m4dyi9wv63mx8hs8pnrl5g9r4hvyl402f7lakzp1r"; system = "cl-mixed-nxau"; asd = "cl-mixed-nxau"; } @@ -29031,12 +29035,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-opus = ( build-asdf-system { pname = "cl-mixed-opus"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-mixed-opus" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; - sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2026-01-01/cl-mixed-20260101-git.tgz"; + sha256 = "1z9dlnsrzd7m4dyi9wv63mx8hs8pnrl5g9r4hvyl402f7lakzp1r"; system = "cl-mixed-opus"; asd = "cl-mixed-opus"; } @@ -29054,12 +29058,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-oss = ( build-asdf-system { pname = "cl-mixed-oss"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-mixed-oss" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; - sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2026-01-01/cl-mixed-20260101-git.tgz"; + sha256 = "1z9dlnsrzd7m4dyi9wv63mx8hs8pnrl5g9r4hvyl402f7lakzp1r"; system = "cl-mixed-oss"; asd = "cl-mixed-oss"; } @@ -29077,12 +29081,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-out123 = ( build-asdf-system { pname = "cl-mixed-out123"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-mixed-out123" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; - sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2026-01-01/cl-mixed-20260101-git.tgz"; + sha256 = "1z9dlnsrzd7m4dyi9wv63mx8hs8pnrl5g9r4hvyl402f7lakzp1r"; system = "cl-mixed-out123"; asd = "cl-mixed-out123"; } @@ -29100,12 +29104,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-pipewire = ( build-asdf-system { pname = "cl-mixed-pipewire"; - version = "20250622-git"; + version = "20260101-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"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2026-01-01/cl-mixed-20260101-git.tgz"; + sha256 = "1z9dlnsrzd7m4dyi9wv63mx8hs8pnrl5g9r4hvyl402f7lakzp1r"; system = "cl-mixed-pipewire"; asd = "cl-mixed-pipewire"; } @@ -29124,12 +29128,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-pulse = ( build-asdf-system { pname = "cl-mixed-pulse"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-mixed-pulse" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; - sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2026-01-01/cl-mixed-20260101-git.tgz"; + sha256 = "1z9dlnsrzd7m4dyi9wv63mx8hs8pnrl5g9r4hvyl402f7lakzp1r"; system = "cl-mixed-pulse"; asd = "cl-mixed-pulse"; } @@ -29147,12 +29151,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-qoa = ( build-asdf-system { pname = "cl-mixed-qoa"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-mixed-qoa" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; - sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2026-01-01/cl-mixed-20260101-git.tgz"; + sha256 = "1z9dlnsrzd7m4dyi9wv63mx8hs8pnrl5g9r4hvyl402f7lakzp1r"; system = "cl-mixed-qoa"; asd = "cl-mixed-qoa"; } @@ -29170,12 +29174,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-sdl2 = ( build-asdf-system { pname = "cl-mixed-sdl2"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-mixed-sdl2" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; - sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2026-01-01/cl-mixed-20260101-git.tgz"; + sha256 = "1z9dlnsrzd7m4dyi9wv63mx8hs8pnrl5g9r4hvyl402f7lakzp1r"; system = "cl-mixed-sdl2"; asd = "cl-mixed-sdl2"; } @@ -29193,12 +29197,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-sf3 = ( build-asdf-system { pname = "cl-mixed-sf3"; - version = "20250622-git"; + version = "20260101-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"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2026-01-01/cl-mixed-20260101-git.tgz"; + sha256 = "1z9dlnsrzd7m4dyi9wv63mx8hs8pnrl5g9r4hvyl402f7lakzp1r"; system = "cl-mixed-sf3"; asd = "cl-mixed-sf3"; } @@ -29213,12 +29217,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-vorbis = ( build-asdf-system { pname = "cl-mixed-vorbis"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-mixed-vorbis" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; - sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2026-01-01/cl-mixed-20260101-git.tgz"; + sha256 = "1z9dlnsrzd7m4dyi9wv63mx8hs8pnrl5g9r4hvyl402f7lakzp1r"; system = "cl-mixed-vorbis"; asd = "cl-mixed-vorbis"; } @@ -29236,12 +29240,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-wasapi = ( build-asdf-system { pname = "cl-mixed-wasapi"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-mixed-wasapi" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; - sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2026-01-01/cl-mixed-20260101-git.tgz"; + sha256 = "1z9dlnsrzd7m4dyi9wv63mx8hs8pnrl5g9r4hvyl402f7lakzp1r"; system = "cl-mixed-wasapi"; asd = "cl-mixed-wasapi"; } @@ -29260,12 +29264,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-wav = ( build-asdf-system { pname = "cl-mixed-wav"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-mixed-wav" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; - sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2026-01-01/cl-mixed-20260101-git.tgz"; + sha256 = "1z9dlnsrzd7m4dyi9wv63mx8hs8pnrl5g9r4hvyl402f7lakzp1r"; system = "cl-mixed-wav"; asd = "cl-mixed-wav"; } @@ -29280,12 +29284,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-winmm = ( build-asdf-system { pname = "cl-mixed-winmm"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-mixed-winmm" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; - sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2026-01-01/cl-mixed-20260101-git.tgz"; + sha256 = "1z9dlnsrzd7m4dyi9wv63mx8hs8pnrl5g9r4hvyl402f7lakzp1r"; system = "cl-mixed-winmm"; asd = "cl-mixed-winmm"; } @@ -29303,12 +29307,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-xaudio2 = ( build-asdf-system { pname = "cl-mixed-xaudio2"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-mixed-xaudio2" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz"; - sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2026-01-01/cl-mixed-20260101-git.tgz"; + sha256 = "1z9dlnsrzd7m4dyi9wv63mx8hs8pnrl5g9r4hvyl402f7lakzp1r"; system = "cl-mixed-xaudio2"; asd = "cl-mixed-xaudio2"; } @@ -29328,12 +29332,12 @@ lib.makeScope pkgs.newScope (self: { cl-mixed-xmp = ( build-asdf-system { pname = "cl-mixed-xmp"; - version = "20250622-git"; + version = "20260101-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"; + url = "https://beta.quicklisp.org/archive/cl-mixed/2026-01-01/cl-mixed-20260101-git.tgz"; + sha256 = "1z9dlnsrzd7m4dyi9wv63mx8hs8pnrl5g9r4hvyl402f7lakzp1r"; system = "cl-mixed-xmp"; asd = "cl-mixed-xmp"; } @@ -29444,12 +29448,12 @@ lib.makeScope pkgs.newScope (self: { cl-modio = ( build-asdf-system { pname = "cl-modio"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-modio" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-modio/2025-06-22/cl-modio-20250622-git.tgz"; - sha256 = "1f591m3g9a6y434wypfzw1vqwslxm1llzarz99qgp0bf930cwfgb"; + url = "https://beta.quicklisp.org/archive/cl-modio/2026-01-01/cl-modio-20260101-git.tgz"; + sha256 = "11njccizmpak57fxprvf84xbx45r03xgyrqbdjdhwrj1r1k9fdny"; system = "cl-modio"; asd = "cl-modio"; } @@ -29592,12 +29596,12 @@ lib.makeScope pkgs.newScope (self: { cl-monitors = ( build-asdf-system { pname = "cl-monitors"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "cl-monitors" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-monitors/2023-10-21/cl-monitors-20231021-git.tgz"; - sha256 = "09ddgs7sbqjx91bajpk5qf6716vnx63mfg9yw0biw16mnfjhrg4i"; + url = "https://beta.quicklisp.org/archive/cl-monitors/2026-01-01/cl-monitors-20260101-git.tgz"; + sha256 = "0nknjnyq913l6drk99lsm95lzbl0sn5l5kyb9cnqc81kpks72w21"; system = "cl-monitors"; asd = "cl-monitors"; } @@ -29701,12 +29705,12 @@ lib.makeScope pkgs.newScope (self: { cl-mpg123 = ( build-asdf-system { pname = "cl-mpg123"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-mpg123" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-mpg123/2025-06-22/cl-mpg123-20250622-git.tgz"; - sha256 = "0hlzx72ga43vhh1wfi7g9imf5jmqyga2sn135yf99s38bpznh4p7"; + url = "https://beta.quicklisp.org/archive/cl-mpg123/2026-01-01/cl-mpg123-20260101-git.tgz"; + sha256 = "1pl8rbxxmqzz1h301v2z3hcdmkj4wbjwlpwpwvi1wss7ydbs4j11"; system = "cl-mpg123"; asd = "cl-mpg123"; } @@ -29727,12 +29731,12 @@ lib.makeScope pkgs.newScope (self: { cl-mpg123-example = ( build-asdf-system { pname = "cl-mpg123-example"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-mpg123-example" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-mpg123/2025-06-22/cl-mpg123-20250622-git.tgz"; - sha256 = "0hlzx72ga43vhh1wfi7g9imf5jmqyga2sn135yf99s38bpznh4p7"; + url = "https://beta.quicklisp.org/archive/cl-mpg123/2026-01-01/cl-mpg123-20260101-git.tgz"; + sha256 = "1pl8rbxxmqzz1h301v2z3hcdmkj4wbjwlpwpwvi1wss7ydbs4j11"; system = "cl-mpg123-example"; asd = "cl-mpg123-example"; } @@ -30268,12 +30272,12 @@ lib.makeScope pkgs.newScope (self: { cl-naive-tests = ( build-asdf-system { pname = "cl-naive-tests"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "cl-naive-tests" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-naive-tests/2024-10-12/cl-naive-tests-20241012-git.tgz"; - sha256 = "1b7vvl5myybx92k778p3ca5367g4m6rh5k3rpr6qp9p4amd0yy2f"; + url = "https://beta.quicklisp.org/archive/cl-naive-tests/2026-01-01/cl-naive-tests-20260101-git.tgz"; + sha256 = "0qdf28by0gjq1m43a2kiydvb51aclziwwxgpk30kdadln65hknsw"; system = "cl-naive-tests"; asd = "cl-naive-tests"; } @@ -30288,12 +30292,12 @@ lib.makeScope pkgs.newScope (self: { cl-naive-tests_dot_tests = ( build-asdf-system { pname = "cl-naive-tests.tests"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "cl-naive-tests.tests" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-naive-tests/2024-10-12/cl-naive-tests-20241012-git.tgz"; - sha256 = "1b7vvl5myybx92k778p3ca5367g4m6rh5k3rpr6qp9p4amd0yy2f"; + url = "https://beta.quicklisp.org/archive/cl-naive-tests/2026-01-01/cl-naive-tests-20260101-git.tgz"; + sha256 = "0qdf28by0gjq1m43a2kiydvb51aclziwwxgpk30kdadln65hknsw"; system = "cl-naive-tests.tests"; asd = "cl-naive-tests.tests"; } @@ -30717,12 +30721,12 @@ lib.makeScope pkgs.newScope (self: { cl-oju = ( build-asdf-system { pname = "cl-oju"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-oju" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-oju/2025-06-22/cl-oju-20250622-git.tgz"; - sha256 = "1gsi43fk1brh0is5k9ahwp3vshb63i8mizf2zshk231zd9rvp1ai"; + url = "https://beta.quicklisp.org/archive/cl-oju/2026-01-01/cl-oju-20260101-git.tgz"; + sha256 = "01k6vf10yyay2phd6hf2m681z11325412ib1jyfv18nqlb4694bd"; system = "cl-oju"; asd = "cl-oju"; } @@ -30962,12 +30966,12 @@ lib.makeScope pkgs.newScope (self: { cl-opengl = ( build-asdf-system { pname = "cl-opengl"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-opengl" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-opengl/2025-06-22/cl-opengl-20250622-git.tgz"; - sha256 = "1ksm330gsw20ajcl1jri3s7ydmrkyqbmajmk4gp452nsgqm62axm"; + url = "https://beta.quicklisp.org/archive/cl-opengl/2026-01-01/cl-opengl-20260101-git.tgz"; + sha256 = "16alk0nfg5alydm3gb4sn1hyg8akjmnxm9v67nqpk4363n37wwyk"; system = "cl-opengl"; asd = "cl-opengl"; } @@ -30983,6 +30987,30 @@ lib.makeScope pkgs.newScope (self: { }; } ); + cl-opengl-examples = ( + build-asdf-system { + pname = "cl-opengl-examples"; + version = "20260101-git"; + asds = [ "cl-opengl-examples" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-opengl/2026-01-01/cl-opengl-20260101-git.tgz"; + sha256 = "16alk0nfg5alydm3gb4sn1hyg8akjmnxm9v67nqpk4363n37wwyk"; + system = "cl-opengl-examples"; + asd = "cl-opengl-examples"; + } + ); + systems = [ "cl-opengl-examples" ]; + lispLibs = [ + (getAttr "cl-glut" self) + (getAttr "cl-glut-examples" self) + (getAttr "cl-opengl" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); cl-opensearch-query-builder = ( build-asdf-system { pname = "cl-opensearch-query-builder"; @@ -31081,12 +31109,12 @@ lib.makeScope pkgs.newScope (self: { cl-opus = ( build-asdf-system { pname = "cl-opus"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "cl-opus" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-opus/2024-10-12/cl-opus-20241012-git.tgz"; - sha256 = "183xjlqjwildm1fb8piiic1f6l9fx4mxf9gcagpav8r60d1wmbpm"; + url = "https://beta.quicklisp.org/archive/cl-opus/2026-01-01/cl-opus-20260101-git.tgz"; + sha256 = "0b3sx35nc0rwz8iwvdwg0dv0x5gc5lvsyw7x4wm1kl4gq5lh2nld"; system = "cl-opus"; asd = "cl-opus"; } @@ -31130,12 +31158,12 @@ lib.makeScope pkgs.newScope (self: { cl-out123 = ( build-asdf-system { pname = "cl-out123"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-out123" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-out123/2025-06-22/cl-out123-20250622-git.tgz"; - sha256 = "1qsdp2pk1b4b3vfy0n7k70q1xa5kjkddsvf4lqw0lawh1m88mb9i"; + url = "https://beta.quicklisp.org/archive/cl-out123/2026-01-01/cl-out123-20260101-git.tgz"; + sha256 = "01nrlr2hbv1yardmmz93vklcxfzj6ndj30zr5anksjkrb2dxxv7h"; system = "cl-out123"; asd = "cl-out123"; } @@ -32020,12 +32048,12 @@ lib.makeScope pkgs.newScope (self: { cl-postgres = ( build-asdf-system { pname = "cl-postgres"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "cl-postgres" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/postmodern/2024-10-12/postmodern-20241012-git.tgz"; - sha256 = "1hj0dpclzihy1rcnwhiv16abmaa54wygxyib3j2h9q4qs26w7pzb"; + url = "https://beta.quicklisp.org/archive/postmodern/2026-01-01/postmodern-20260101-git.tgz"; + sha256 = "0y30b02gvfscx1pb0kwc9lmb7fklp5bj6am3k01b8dgk16mcyf3x"; system = "cl-postgres"; asd = "cl-postgres"; } @@ -32044,12 +32072,12 @@ lib.makeScope pkgs.newScope (self: { cl-postgres_plus_local-time = ( build-asdf-system { pname = "cl-postgres+local-time"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-postgres+local-time" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/local-time/2025-06-22/local-time-20250622-git.tgz"; - sha256 = "1xdxm1js8n1b3k0g013s810hzf7jr6yhapyvj9agfyl7b6knj0kg"; + url = "https://beta.quicklisp.org/archive/local-time/2026-01-01/local-time-20260101-git.tgz"; + sha256 = "1rj26g8yx3p5q8bmikgk8jfwmbi5q65mfzgijh51xckdj28ckkh1"; system = "cl-postgres+local-time"; asd = "cl-postgres+local-time"; } @@ -32153,12 +32181,12 @@ lib.makeScope pkgs.newScope (self: { cl-ppcre-template = ( build-asdf-system { pname = "cl-ppcre-template"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-ppcre-template" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-unification/2025-06-22/cl-unification-20250622-git.tgz"; - sha256 = "0s9lhh6nzbbsds967aixadwzfqbdiy5f19xp2a5181gd970w187r"; + url = "https://beta.quicklisp.org/archive/cl-unification/2026-01-01/cl-unification-20260101-git.tgz"; + sha256 = "0vdrwnw03pk0471qrj2m70dr0b1hap28kr9d7a87rdlppazhd312"; system = "cl-ppcre-template"; asd = "cl-ppcre-template"; } @@ -32663,12 +32691,12 @@ lib.makeScope pkgs.newScope (self: { cl-protobufs_dot_asdf = ( build-asdf-system { pname = "cl-protobufs.asdf"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-protobufs.asdf" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-protobufs/2025-06-22/cl-protobufs-20250622-git.tgz"; - sha256 = "0kxryqk283qm7shrx7swiqkmv7kj1lawjlrz9pdqbci2fcs763kj"; + url = "https://beta.quicklisp.org/archive/cl-protobufs/2026-01-01/cl-protobufs-20260101-git.tgz"; + sha256 = "01fbjpzz9sjvizkf1ffb3k2hhq53m4hnvi4sgcnq14f9ncqdc2vf"; system = "cl-protobufs.asdf"; asd = "cl-protobufs.asdf"; } @@ -32683,12 +32711,12 @@ lib.makeScope pkgs.newScope (self: { cl-pslib = ( build-asdf-system { pname = "cl-pslib"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "cl-pslib" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-pslib/2024-10-12/cl-pslib-20241012-git.tgz"; - sha256 = "12lg64nbjkxmaf212qr4i0msnsixc2cbqmxkdgqjii9rsyqdvrn6"; + url = "https://beta.quicklisp.org/archive/cl-pslib/2026-01-01/cl-pslib-20260101-git.tgz"; + sha256 = "0j9y9xx3ida4rzmhg4gqwbmfqmqrrycvhw207wa6d3dwdb5lmmgl"; system = "cl-pslib"; asd = "cl-pslib"; } @@ -32778,12 +32806,12 @@ lib.makeScope pkgs.newScope (self: { cl-qoa = ( build-asdf-system { pname = "cl-qoa"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "cl-qoa" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-qoa/2024-10-12/cl-qoa-20241012-git.tgz"; - sha256 = "0gxrra0mvvkyvhvg7cc4bvi3nwdsnx0dbjszp41ch6dsdhd3pcpy"; + url = "https://beta.quicklisp.org/archive/cl-qoa/2026-01-01/cl-qoa-20260101-git.tgz"; + sha256 = "0x8ijd0bgmk24a80wfqdg276x3493byaj6hcn2lchjjzkvw77pl7"; system = "cl-qoa"; asd = "cl-qoa"; } @@ -33253,12 +33281,12 @@ lib.makeScope pkgs.newScope (self: { cl-resvg = ( build-asdf-system { pname = "cl-resvg"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-resvg" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-resvg/2025-06-22/cl-resvg-20250622-git.tgz"; - sha256 = "0i0ji3zylcpy25sa8an1s14rpqc7xl0058xm0gr9fmwgiglx3jvi"; + url = "https://beta.quicklisp.org/archive/cl-resvg/2026-01-01/cl-resvg-20260101-git.tgz"; + sha256 = "1zaggr9nx1pbvx40fmg3ghj78l9p66ra2bwwzl7z7hlsa1k4aw00"; system = "cl-resvg"; asd = "cl-resvg"; } @@ -34441,12 +34469,12 @@ lib.makeScope pkgs.newScope (self: { cl-sf3 = ( build-asdf-system { pname = "cl-sf3"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-sf3" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-sf3/2025-06-22/cl-sf3-20250622-git.tgz"; - sha256 = "0rp435whhcb8i46kp9g8fsnbr4w7jkimsngs7v6pga99j5rngfgn"; + url = "https://beta.quicklisp.org/archive/cl-sf3/2026-01-01/cl-sf3-20260101-git.tgz"; + sha256 = "1ia37lbhmi0i8nnl1yqbm0i87i2hwk3lvj5d472knrhqcxnxhz2c"; system = "cl-sf3"; asd = "cl-sf3"; } @@ -34912,12 +34940,12 @@ lib.makeScope pkgs.newScope (self: { cl-soloud = ( build-asdf-system { pname = "cl-soloud"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-soloud" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-soloud/2025-06-22/cl-soloud-20250622-git.tgz"; - sha256 = "0rkvy4pf2hn82bm0vmjp6b0is3zrjm2r2lrcgvxhh6dxcx71zs7i"; + url = "https://beta.quicklisp.org/archive/cl-soloud/2026-01-01/cl-soloud-20260101-git.tgz"; + sha256 = "13yzqafwkcsn9a4xxmbl0kn7n4iz4lxa1lki6j00p5dqpfsbsjq7"; system = "cl-soloud"; asd = "cl-soloud"; } @@ -35098,12 +35126,12 @@ lib.makeScope pkgs.newScope (self: { cl-spidev = ( build-asdf-system { pname = "cl-spidev"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-spidev" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-spidev/2025-06-22/cl-spidev-20250622-git.tgz"; - sha256 = "1wyg67mr3wawdrvv6flxkxbi3saaddxajr0lfzzyvswpy3s117bm"; + url = "https://beta.quicklisp.org/archive/cl-spidev/2026-01-01/cl-spidev-20260101-git.tgz"; + sha256 = "1x4pz1fzw0hrcph5jdapb9nqc29q8na7gz13jj8419v6ckgx0n23"; system = "cl-spidev"; asd = "cl-spidev"; } @@ -35276,12 +35304,12 @@ lib.makeScope pkgs.newScope (self: { cl-steamworks = ( build-asdf-system { pname = "cl-steamworks"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-steamworks" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-steamworks/2025-06-22/cl-steamworks-20250622-git.tgz"; - sha256 = "0s10n0qnlbj1cwmkv1zhwwnhv79gp04070z0743qyjjvba24l650"; + url = "https://beta.quicklisp.org/archive/cl-steamworks/2026-01-01/cl-steamworks-20260101-git.tgz"; + sha256 = "1h9qz603ab62sw0j7yyixb20z05pfgxqpg8mhd8zxhgmfm7cccy7"; system = "cl-steamworks"; asd = "cl-steamworks"; } @@ -35306,12 +35334,12 @@ lib.makeScope pkgs.newScope (self: { cl-steamworks-generator = ( build-asdf-system { pname = "cl-steamworks-generator"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-steamworks-generator" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-steamworks/2025-06-22/cl-steamworks-20250622-git.tgz"; - sha256 = "0s10n0qnlbj1cwmkv1zhwwnhv79gp04070z0743qyjjvba24l650"; + url = "https://beta.quicklisp.org/archive/cl-steamworks/2026-01-01/cl-steamworks-20260101-git.tgz"; + sha256 = "1h9qz603ab62sw0j7yyixb20z05pfgxqpg8mhd8zxhgmfm7cccy7"; system = "cl-steamworks-generator"; asd = "cl-steamworks-generator"; } @@ -35601,12 +35629,12 @@ lib.makeScope pkgs.newScope (self: { cl-svg = ( build-asdf-system { pname = "cl-svg"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "cl-svg" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-svg/2024-10-12/cl-svg-20241012-git.tgz"; - sha256 = "05zrg6sxi01xn940c7lygfgxwjkq0zmlkihbhm7lhfaszg2xj8bh"; + url = "https://beta.quicklisp.org/archive/cl-svg/2026-01-01/cl-svg-20260101-git.tgz"; + sha256 = "077s35wff8wndq29iynnv0kiqwb29dm7barc51884sh49bcg4qyl"; system = "cl-svg"; asd = "cl-svg"; } @@ -36001,6 +36029,30 @@ lib.makeScope pkgs.newScope (self: { }; } ); + cl-tbnl-gserver-tmgr = ( + build-asdf-system { + pname = "cl-tbnl-gserver-tmgr"; + version = "20260101-git"; + asds = [ "cl-tbnl-gserver-tmgr" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-tbnl-gserver-tmgr/2026-01-01/cl-tbnl-gserver-tmgr-20260101-git.tgz"; + sha256 = "0szimidbcc7yr4m3wj88q9dv7qbgc0lwbidcxkla7f20a1h05f98"; + system = "cl-tbnl-gserver-tmgr"; + asd = "cl-tbnl-gserver-tmgr"; + } + ); + systems = [ "cl-tbnl-gserver-tmgr" ]; + lispLibs = [ + (getAttr "hunchentoot" self) + (getAttr "log4cl" self) + (getAttr "sento" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); cl-telebot = ( build-asdf-system { pname = "cl-telebot"; @@ -36672,12 +36724,12 @@ lib.makeScope pkgs.newScope (self: { cl-transmission = ( build-asdf-system { pname = "cl-transmission"; - version = "20200325-git"; + version = "20260101-git"; asds = [ "cl-transmission" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-transmission/2020-03-25/cl-transmission-20200325-git.tgz"; - sha256 = "0sg3f2jqs2z3mvscjhc43hkd34vlcc4c8hq8rhh5w1gjg19z57hb"; + url = "https://beta.quicklisp.org/archive/cl-transmission/2026-01-01/cl-transmission-20260101-git.tgz"; + sha256 = "1rzqfn5dpqrncz781n9bc7cs0wnvfc3a9ia6j83kgq17hr186qf1"; system = "cl-transmission"; asd = "cl-transmission"; } @@ -36698,12 +36750,12 @@ lib.makeScope pkgs.newScope (self: { cl-transmission-test = ( build-asdf-system { pname = "cl-transmission-test"; - version = "20200325-git"; + version = "20260101-git"; asds = [ "cl-transmission-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-transmission/2020-03-25/cl-transmission-20200325-git.tgz"; - sha256 = "0sg3f2jqs2z3mvscjhc43hkd34vlcc4c8hq8rhh5w1gjg19z57hb"; + url = "https://beta.quicklisp.org/archive/cl-transmission/2026-01-01/cl-transmission-20260101-git.tgz"; + sha256 = "1rzqfn5dpqrncz781n9bc7cs0wnvfc3a9ia6j83kgq17hr186qf1"; system = "cl-transmission-test"; asd = "cl-transmission-test"; } @@ -36833,6 +36885,30 @@ lib.makeScope pkgs.newScope (self: { }; } ); + cl-turbojpeg = ( + build-asdf-system { + pname = "cl-turbojpeg"; + version = "20260101-git"; + asds = [ "cl-turbojpeg" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-turbojpeg/2026-01-01/cl-turbojpeg-20260101-git.tgz"; + sha256 = "0cwskjm232rxrx16b9v48a1j5ajxkyr2f8ffy677aqnjz1n1bx20"; + system = "cl-turbojpeg"; + asd = "cl-turbojpeg"; + } + ); + systems = [ "cl-turbojpeg" ]; + lispLibs = [ + (getAttr "cffi" self) + (getAttr "documentation-utils" self) + (getAttr "pathname-utils" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); cl-twit-repl = ( build-asdf-system { pname = "cl-twit-repl"; @@ -37013,12 +37089,12 @@ lib.makeScope pkgs.newScope (self: { cl-unification = ( build-asdf-system { pname = "cl-unification"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-unification" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-unification/2025-06-22/cl-unification-20250622-git.tgz"; - sha256 = "0s9lhh6nzbbsds967aixadwzfqbdiy5f19xp2a5181gd970w187r"; + url = "https://beta.quicklisp.org/archive/cl-unification/2026-01-01/cl-unification-20260101-git.tgz"; + sha256 = "0vdrwnw03pk0471qrj2m70dr0b1hap28kr9d7a87rdlppazhd312"; system = "cl-unification"; asd = "cl-unification"; } @@ -37031,12 +37107,12 @@ lib.makeScope pkgs.newScope (self: { cl-unification-lib = ( build-asdf-system { pname = "cl-unification-lib"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-unification-lib" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-unification/2025-06-22/cl-unification-20250622-git.tgz"; - sha256 = "0s9lhh6nzbbsds967aixadwzfqbdiy5f19xp2a5181gd970w187r"; + url = "https://beta.quicklisp.org/archive/cl-unification/2026-01-01/cl-unification-20260101-git.tgz"; + sha256 = "0vdrwnw03pk0471qrj2m70dr0b1hap28kr9d7a87rdlppazhd312"; system = "cl-unification-lib"; asd = "cl-unification-lib"; } @@ -37054,12 +37130,12 @@ lib.makeScope pkgs.newScope (self: { cl-unification-test = ( build-asdf-system { pname = "cl-unification-test"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-unification-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-unification/2025-06-22/cl-unification-20250622-git.tgz"; - sha256 = "0s9lhh6nzbbsds967aixadwzfqbdiy5f19xp2a5181gd970w187r"; + url = "https://beta.quicklisp.org/archive/cl-unification/2026-01-01/cl-unification-20260101-git.tgz"; + sha256 = "0vdrwnw03pk0471qrj2m70dr0b1hap28kr9d7a87rdlppazhd312"; system = "cl-unification-test"; asd = "cl-unification-test"; } @@ -37153,59 +37229,6 @@ lib.makeScope pkgs.newScope (self: { meta = { }; } ); - cl-vhdl = ( - build-asdf-system { - pname = "cl-vhdl"; - version = "20160421-git"; - asds = [ "cl-vhdl" ]; - src = ( - createAsd { - url = "https://beta.quicklisp.org/archive/cl-vhdl/2016-04-21/cl-vhdl-20160421-git.tgz"; - sha256 = "0i2780ljak8kcqa2zm24dk2fk771m2mvmnbq4xd4vvx9z87lbnvi"; - system = "cl-vhdl"; - asd = "cl-vhdl"; - } - ); - systems = [ "cl-vhdl" ]; - lispLibs = [ - (getAttr "alexandria" self) - (getAttr "cl-interpol" self) - (getAttr "cl-itertools" self) - (getAttr "cl-ppcre" self) - (getAttr "esrap-liquid" self) - (getAttr "iterate" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - cl-vhdl-tests = ( - build-asdf-system { - pname = "cl-vhdl-tests"; - version = "20160421-git"; - asds = [ "cl-vhdl-tests" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "cl-vhdl-tests" ]; - lispLibs = [ - (getAttr "cl-interpol" self) - (getAttr "cl-vhdl" self) - (getAttr "fare-quasiquote-optima" self) - (getAttr "fiveam" self) - (getAttr "optima" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); cl-video = ( build-asdf-system { pname = "cl-video"; @@ -37355,12 +37378,12 @@ lib.makeScope pkgs.newScope (self: { cl-vorbis = ( build-asdf-system { pname = "cl-vorbis"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-vorbis" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-vorbis/2025-06-22/cl-vorbis-20250622-git.tgz"; - sha256 = "0xigqkh4lqz734nniyifbymgxyxcr6if4358598md0y4mnv709sx"; + url = "https://beta.quicklisp.org/archive/cl-vorbis/2026-01-01/cl-vorbis-20260101-git.tgz"; + sha256 = "1ifzgqggvkq89bj8np96lh66bwmab0s954f4c6snkl9lw8pjhlkn"; system = "cl-vorbis"; asd = "cl-vorbis"; } @@ -37511,12 +37534,12 @@ lib.makeScope pkgs.newScope (self: { cl-wavefront = ( build-asdf-system { pname = "cl-wavefront"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-wavefront" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-wavefront/2025-06-22/cl-wavefront-20250622-git.tgz"; - sha256 = "0yc6850v8hvfll34fz30yxbazzjs31ylf1rdwi62dzfmmqyxk2cs"; + url = "https://beta.quicklisp.org/archive/cl-wavefront/2026-01-01/cl-wavefront-20260101-git.tgz"; + sha256 = "1h6w5nz9kxhyrr4mvcrflrnbjg7xs3rjik52p17wbc8fq0686fhg"; system = "cl-wavefront"; asd = "cl-wavefront"; } @@ -37535,12 +37558,12 @@ lib.makeScope pkgs.newScope (self: { cl-wavelets = ( build-asdf-system { pname = "cl-wavelets"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "cl-wavelets" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-wavelets/2022-07-07/cl-wavelets-20220707-git.tgz"; - sha256 = "0z4r01d5mv4rachz5rr5zvnv94q7ka17138vcpsb05sz00vv03ba"; + url = "https://beta.quicklisp.org/archive/cl-wavelets/2026-01-01/cl-wavelets-20260101-git.tgz"; + sha256 = "1paxf6frbqpl83f9dwjjgh9fjr5qc8wi0kzh6nz6l51ir421d6zf"; system = "cl-wavelets"; asd = "cl-wavelets"; } @@ -37728,12 +37751,12 @@ lib.makeScope pkgs.newScope (self: { cl-who = ( build-asdf-system { pname = "cl-who"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cl-who" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-who/2025-06-22/cl-who-20250622-git.tgz"; - sha256 = "1x65mwkj40ii1rpnm7qaf9hhj23l2hcadkfc6s22mpd422ljd3kd"; + url = "https://beta.quicklisp.org/archive/cl-who/2026-01-01/cl-who-20260101-git.tgz"; + sha256 = "17phkx7l1a3pvbmcadazh3ywy7dsij8917v9nghn1nkbgm1xdnjl"; system = "cl-who"; asd = "cl-who"; } @@ -37786,6 +37809,26 @@ lib.makeScope pkgs.newScope (self: { }; } ); + cl-win32-errors = ( + build-asdf-system { + pname = "cl-win32-errors"; + version = "20260101-git"; + asds = [ "cl-win32-errors" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-win32-errors/2026-01-01/cl-win32-errors-20260101-git.tgz"; + sha256 = "1z3bj90b3hk32z61r824rzjr90vhk0wysvq8dyjia1h4zlc65iaa"; + system = "cl-win32-errors"; + asd = "cl-win32-errors"; + } + ); + systems = [ "cl-win32-errors" ]; + lispLibs = [ ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); cl-with = ( build-asdf-system { pname = "cl-with"; @@ -37954,12 +37997,12 @@ lib.makeScope pkgs.newScope (self: { cl-xkb = ( build-asdf-system { pname = "cl-xkb"; - version = "20230214-git"; + version = "20260101-git"; asds = [ "cl-xkb" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-xkb/2023-02-14/cl-xkb-20230214-git.tgz"; - sha256 = "002bskv0dvq2hahz7dah2zwwkp2zrkf98w7lm96jmqfn8vyp4k75"; + url = "https://beta.quicklisp.org/archive/cl-xkb/2026-01-01/cl-xkb-20260101-git.tgz"; + sha256 = "0s1x4zwrnb5gvwm4zhbmkl0bsgzzzh3flvxlhqlwxvfiz58ryhkk"; system = "cl-xkb"; asd = "cl-xkb"; } @@ -38192,12 +38235,12 @@ lib.makeScope pkgs.newScope (self: { cl-yahoo-finance = ( build-asdf-system { pname = "cl-yahoo-finance"; - version = "20130312-git"; + version = "20260101-git"; asds = [ "cl-yahoo-finance" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-yahoo-finance/2013-03-12/cl-yahoo-finance-20130312-git.tgz"; - sha256 = "1qhs4j00iw1w81lx0vmyiayzqyvixaxc5j2rc89qlr1gx12mqadl"; + url = "https://beta.quicklisp.org/archive/cl-yahoo-finance/2026-01-01/cl-yahoo-finance-20260101-git.tgz"; + sha256 = "00fw8q49kmllj81mclv2xv9h33jwhc7l6d24c709svw1vhvn8khn"; system = "cl-yahoo-finance"; asd = "cl-yahoo-finance"; } @@ -38218,11 +38261,11 @@ lib.makeScope pkgs.newScope (self: { cl-yaml = ( build-asdf-system { pname = "cl-yaml"; - version = "20221106-git"; + version = "20260101-git"; asds = [ "cl-yaml" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-yaml/2022-11-06/cl-yaml-20221106-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-yaml/2026-01-01/cl-yaml-20260101-git.tgz"; sha256 = "053fvrrd0p2xx4zxbz4kg9469895ypwsbjfd3nwpi7lwcll2bir5"; system = "cl-yaml"; asd = "cl-yaml"; @@ -38240,34 +38283,6 @@ lib.makeScope pkgs.newScope (self: { }; } ); - cl-yaml-test = ( - build-asdf-system { - pname = "cl-yaml-test"; - version = "20221106-git"; - asds = [ "cl-yaml-test" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "cl-yaml-test" ]; - lispLibs = [ - (getAttr "alexandria" self) - (getAttr "cl-fad" self) - (getAttr "cl-yaml" self) - (getAttr "fiveam" self) - (getAttr "generic-comparability" self) - (getAttr "trivial-benchmark" self) - (getAttr "yason" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); cl-yesql = ( build-asdf-system { pname = "cl-yesql"; @@ -38965,12 +38980,12 @@ lib.makeScope pkgs.newScope (self: { clad = ( build-asdf-system { pname = "clad"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "clad" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/clad/2025-06-22/clad-20250622-git.tgz"; - sha256 = "0qr59j0d2df08vaijw3il5hh4j6vgrmwgm9nm1dc4nipqci1wadc"; + url = "https://beta.quicklisp.org/archive/clad/2026-01-01/clad-20260101-git.tgz"; + sha256 = "1r0cwkk73adl6nf1njgdqm62iz36797hazcssyirwsa9n2iaqv70"; system = "clad"; asd = "clad"; } @@ -39030,12 +39045,12 @@ lib.makeScope pkgs.newScope (self: { classimp = ( build-asdf-system { pname = "classimp"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "classimp" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/classimp/2025-06-22/classimp-20250622-git.tgz"; - sha256 = "0grily13njibm60fw81vlycn3131qi2dgp9yys5xj65cacjfyky0"; + url = "https://beta.quicklisp.org/archive/classimp/2026-01-01/classimp-20260101-git.tgz"; + sha256 = "0v1qf78841q23dil6hjvaq2jsy6wpk71qsslfdcpclzw4zm29pr6"; system = "classimp"; asd = "classimp"; } @@ -39053,12 +39068,12 @@ lib.makeScope pkgs.newScope (self: { classimp-samples = ( build-asdf-system { pname = "classimp-samples"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "classimp-samples" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/classimp/2025-06-22/classimp-20250622-git.tgz"; - sha256 = "0grily13njibm60fw81vlycn3131qi2dgp9yys5xj65cacjfyky0"; + url = "https://beta.quicklisp.org/archive/classimp/2026-01-01/classimp-20260101-git.tgz"; + sha256 = "0v1qf78841q23dil6hjvaq2jsy6wpk71qsslfdcpclzw4zm29pr6"; system = "classimp-samples"; asd = "classimp-samples"; } @@ -39079,12 +39094,12 @@ lib.makeScope pkgs.newScope (self: { classowary = ( build-asdf-system { pname = "classowary"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "classowary" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/classowary/2023-10-21/classowary-20231021-git.tgz"; - sha256 = "099zhf41d4frlrm99ldzypqjh03ijrvfn29f2pb0j6664h65bcsm"; + url = "https://beta.quicklisp.org/archive/classowary/2026-01-01/classowary-20260101-git.tgz"; + sha256 = "0m1m50jdmq1cpiqlds5frlx5pb0qkppy5qmilsp7c1dxjnxrri5n"; system = "classowary"; asd = "classowary"; } @@ -39097,12 +39112,12 @@ lib.makeScope pkgs.newScope (self: { classowary-test = ( build-asdf-system { pname = "classowary-test"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "classowary-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/classowary/2023-10-21/classowary-20231021-git.tgz"; - sha256 = "099zhf41d4frlrm99ldzypqjh03ijrvfn29f2pb0j6664h65bcsm"; + url = "https://beta.quicklisp.org/archive/classowary/2026-01-01/classowary-20260101-git.tgz"; + sha256 = "0m1m50jdmq1cpiqlds5frlx5pb0qkppy5qmilsp7c1dxjnxrri5n"; system = "classowary-test"; asd = "classowary-test"; } @@ -39120,12 +39135,12 @@ lib.makeScope pkgs.newScope (self: { clast = ( build-asdf-system { pname = "clast"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "clast" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/clast/2025-06-22/clast-20250622-git.tgz"; - sha256 = "0ipybqc928ncdpq3rkxgk9c4y9mis4k139w284nn4g4yzh28vq1i"; + url = "https://beta.quicklisp.org/archive/clast/2026-01-01/clast-20260101-git.tgz"; + sha256 = "170q923i8vc8l8ayzzil27c57kk026izxn3vkfri19h9bmzrlssx"; system = "clast"; asd = "clast"; } @@ -39140,12 +39155,12 @@ lib.makeScope pkgs.newScope (self: { clath = ( build-asdf-system { pname = "clath"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "clath" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/clath/2025-06-22/clath-20250622-git.tgz"; - sha256 = "136zf18g734mhvh3ghk9ag4y2ginzvirn1v51kchn7nxzsm8ay97"; + url = "https://beta.quicklisp.org/archive/clath/2026-01-01/clath-20260101-git.tgz"; + sha256 = "1c7ybp7wkjkhhwdkmw4cn76wwhvfgcrnvijqaixqwy6sswgv54g9"; system = "clath"; asd = "clath"; } @@ -39405,12 +39420,12 @@ lib.makeScope pkgs.newScope (self: { clazy = ( build-asdf-system { pname = "clazy"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "clazy" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/clazy/2025-06-22/clazy-20250622-git.tgz"; - sha256 = "023wx26gcswgkx0b7i2bjhpaqrphnniv5vrljhbhx1v1w9cf47yh"; + url = "https://beta.quicklisp.org/archive/clazy/2026-01-01/clazy-20260101-git.tgz"; + sha256 = "1hby8ssmdvczvfzyl5jxf8hc5vjpf403mvycjspwxabak2w9wx5l"; system = "clazy"; asd = "clazy"; } @@ -39482,6 +39497,26 @@ lib.makeScope pkgs.newScope (self: { }; } ); + cleopter = ( + build-asdf-system { + pname = "cleopter"; + version = "20260101-git"; + asds = [ "cleopter" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cleopter/2026-01-01/cleopter-20260101-git.tgz"; + sha256 = "1xbrkb8h9gw35053nnw15zalxymh67mmafi8pa4d58p9n1mpwds8"; + system = "cleopter"; + asd = "cleopter"; + } + ); + systems = [ "cleopter" ]; + lispLibs = [ ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); cleric = ( build-asdf-system { pname = "cleric"; @@ -39830,12 +39865,12 @@ lib.makeScope pkgs.newScope (self: { clim = ( build-asdf-system { pname = "clim"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "clim" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "clim"; asd = "clim"; } @@ -39853,18 +39888,19 @@ lib.makeScope pkgs.newScope (self: { clim-core = ( build-asdf-system { pname = "clim-core"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "clim-core" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "clim-core"; asd = "clim-core"; } ); systems = [ "clim-core" ]; lispLibs = [ + (getAttr "alexandria" self) (getAttr "bordeaux-threads" self) (getAttr "closer-mop" self) (getAttr "cluffer" self) @@ -39881,12 +39917,12 @@ lib.makeScope pkgs.newScope (self: { clim-debugger = ( build-asdf-system { pname = "clim-debugger"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "clim-debugger" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "clim-debugger"; asd = "clim-debugger"; } @@ -39906,12 +39942,12 @@ lib.makeScope pkgs.newScope (self: { clim-examples = ( build-asdf-system { pname = "clim-examples"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "clim-examples" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "clim-examples"; asd = "clim-examples"; } @@ -39934,22 +39970,24 @@ lib.makeScope pkgs.newScope (self: { clim-lisp = ( build-asdf-system { pname = "clim-lisp"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "clim-lisp" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "clim-lisp"; asd = "clim-lisp"; } ); systems = [ "clim-lisp" ]; lispLibs = [ + (getAttr "alexandria" self) (getAttr "bordeaux-threads" self) (getAttr "closer-mop" self) (getAttr "cluffer" self) (getAttr "trivial-features" self) + (getAttr "trivial-garbage" self) (getAttr "trivial-gray-streams" self) ]; meta = { @@ -39960,12 +39998,12 @@ lib.makeScope pkgs.newScope (self: { clim-listener = ( build-asdf-system { pname = "clim-listener"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "clim-listener" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "clim-listener"; asd = "clim-listener"; } @@ -39984,12 +40022,12 @@ lib.makeScope pkgs.newScope (self: { clim-pdf = ( build-asdf-system { pname = "clim-pdf"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "clim-pdf" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "clim-pdf"; asd = "clim-pdf"; } @@ -40011,12 +40049,12 @@ lib.makeScope pkgs.newScope (self: { clim-postscript = ( build-asdf-system { pname = "clim-postscript"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "clim-postscript" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "clim-postscript"; asd = "clim-postscript"; } @@ -40034,12 +40072,12 @@ lib.makeScope pkgs.newScope (self: { clim-postscript-font = ( build-asdf-system { pname = "clim-postscript-font"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "clim-postscript-font" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "clim-postscript-font"; asd = "clim-postscript-font"; } @@ -40349,12 +40387,12 @@ lib.makeScope pkgs.newScope (self: { clingon = ( build-asdf-system { pname = "clingon"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "clingon" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/clingon/2024-10-12/clingon-20241012-git.tgz"; - sha256 = "0p8i9bkzzy4v0pg15dldrl73xri4kxyxa7si82bawh1dnnm53jgc"; + url = "https://beta.quicklisp.org/archive/clingon/2026-01-01/clingon-20260101-git.tgz"; + sha256 = "1j4m8w8rrpfrkr1wwp212jdd47p94sswy43bcv5z7ai8iv1yf0rs"; system = "clingon"; asd = "clingon"; } @@ -40374,12 +40412,12 @@ lib.makeScope pkgs.newScope (self: { clingon_dot_demo = ( build-asdf-system { pname = "clingon.demo"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "clingon.demo" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/clingon/2024-10-12/clingon-20241012-git.tgz"; - sha256 = "0p8i9bkzzy4v0pg15dldrl73xri4kxyxa7si82bawh1dnnm53jgc"; + url = "https://beta.quicklisp.org/archive/clingon/2026-01-01/clingon-20260101-git.tgz"; + sha256 = "1j4m8w8rrpfrkr1wwp212jdd47p94sswy43bcv5z7ai8iv1yf0rs"; system = "clingon.demo"; asd = "clingon.demo"; } @@ -40394,12 +40432,12 @@ lib.makeScope pkgs.newScope (self: { clingon_dot_intro = ( build-asdf-system { pname = "clingon.intro"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "clingon.intro" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/clingon/2024-10-12/clingon-20241012-git.tgz"; - sha256 = "0p8i9bkzzy4v0pg15dldrl73xri4kxyxa7si82bawh1dnnm53jgc"; + url = "https://beta.quicklisp.org/archive/clingon/2026-01-01/clingon-20260101-git.tgz"; + sha256 = "1j4m8w8rrpfrkr1wwp212jdd47p94sswy43bcv5z7ai8iv1yf0rs"; system = "clingon.intro"; asd = "clingon.intro"; } @@ -40414,12 +40452,12 @@ lib.makeScope pkgs.newScope (self: { clingon_dot_test = ( build-asdf-system { pname = "clingon.test"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "clingon.test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/clingon/2024-10-12/clingon-20241012-git.tgz"; - sha256 = "0p8i9bkzzy4v0pg15dldrl73xri4kxyxa7si82bawh1dnnm53jgc"; + url = "https://beta.quicklisp.org/archive/clingon/2026-01-01/clingon-20260101-git.tgz"; + sha256 = "1j4m8w8rrpfrkr1wwp212jdd47p94sswy43bcv5z7ai8iv1yf0rs"; system = "clingon.test"; asd = "clingon.test"; } @@ -40437,12 +40475,12 @@ lib.makeScope pkgs.newScope (self: { clip = ( build-asdf-system { pname = "clip"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "clip" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/clip/2025-06-22/clip-20250622-git.tgz"; - sha256 = "1ikyf0340clllafjb7jg2bvwxfnb0vv8bjnd8ngn4qlpsx75m1nl"; + url = "https://beta.quicklisp.org/archive/clip/2026-01-01/clip-20260101-git.tgz"; + sha256 = "1mzlsixs472r5arf56qazrlljg77cs0rnh95i3v6n5g19a50zr5r"; system = "clip"; asd = "clip"; } @@ -40536,12 +40574,12 @@ lib.makeScope pkgs.newScope (self: { clith = ( build-asdf-system { pname = "clith"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "clith" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/clith/2025-06-22/clith-20250622-git.tgz"; - sha256 = "0n973pf696bi8mv6nazjwdwgp1i2p8jfp3ab068y0cvnrww693x6"; + url = "https://beta.quicklisp.org/archive/clith/2026-01-01/clith-20260101-git.tgz"; + sha256 = "1q2vw2zpixwccbw5k5vgpxalyz6ybp6ydx04r6vckvmrnvl4flml"; system = "clith"; asd = "clith"; } @@ -41594,12 +41632,12 @@ lib.makeScope pkgs.newScope (self: { clog = ( build-asdf-system { pname = "clog"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "clog" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/clog/2025-06-22/clog-20250622-git.tgz"; - sha256 = "1sf2xan0fh2qqr8xgmsbmq9qcj5nkzrp3nq7gd69ssbkz9ab6qpw"; + url = "https://beta.quicklisp.org/archive/clog/2026-01-01/clog-20260101-git.tgz"; + sha256 = "0y6qfj4f7s7507cikdc6fqvhlnikb1s9mmlqd2ln21lyxh7b4dm5"; system = "clog"; asd = "clog"; } @@ -41615,6 +41653,7 @@ lib.makeScope pkgs.newScope (self: { (getAttr "cl-ppcre" self) (getAttr "cl-template" self) (getAttr "clack" self) + (getAttr "clack-handler-hunchentoot" self) (getAttr "closer-mop" self) (getAttr "hunchentoot" self) (getAttr "lack-middleware-static" self) @@ -41722,12 +41761,12 @@ lib.makeScope pkgs.newScope (self: { clohost = ( build-asdf-system { pname = "clohost"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "clohost" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/clohost/2024-10-12/clohost-20241012-git.tgz"; - sha256 = "1qph7nrjb62qxwkv5wbzqkycdavsjvi39b97qvs5g8jsrvbl50lh"; + url = "https://beta.quicklisp.org/archive/clohost/2026-01-01/clohost-20260101-git.tgz"; + sha256 = "0hlh5mrw4d6kcis56mq642mm1cidvq92l503cykghry2likpmsqq"; system = "clohost"; asd = "clohost"; } @@ -41908,12 +41947,12 @@ lib.makeScope pkgs.newScope (self: { closer-mop = ( build-asdf-system { pname = "closer-mop"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "closer-mop" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/closer-mop/2025-06-22/closer-mop-20250622-git.tgz"; - sha256 = "11mzk34j9mq1sq99im1n6y798kfrxgavskwx9mrywmvs316pssly"; + url = "https://beta.quicklisp.org/archive/closer-mop/2026-01-01/closer-mop-20260101-git.tgz"; + sha256 = "0hgn1bn85mzhl37gc4l06ddnr9vxm1idcighan8gja1hgp2zxxab"; system = "closer-mop"; asd = "closer-mop"; } @@ -42068,12 +42107,12 @@ lib.makeScope pkgs.newScope (self: { clouseau = ( build-asdf-system { pname = "clouseau"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "clouseau" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "clouseau"; asd = "clouseau"; } @@ -42112,6 +42151,26 @@ lib.makeScope pkgs.newScope (self: { }; } ); + clq = ( + build-asdf-system { + pname = "clq"; + version = "20260101-git"; + asds = [ "clq" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/clq/2026-01-01/clq-20260101-git.tgz"; + sha256 = "12b1hb59j9rpyapddw851bzla3ch9ilglah0hd108png5khw4wz1"; + system = "clq"; + asd = "clq"; + } + ); + systems = [ "clq" ]; + lispLibs = [ ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); clsql = ( build-asdf-system { pname = "clsql"; @@ -42551,12 +42610,12 @@ lib.makeScope pkgs.newScope (self: { clss = ( build-asdf-system { pname = "clss"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "clss" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/clss/2025-06-22/clss-20250622-git.tgz"; - sha256 = "08ivm4x6j9lvvl55df71h2azwf4l47nyvi0yrb4rs5paqjd4afq3"; + url = "https://beta.quicklisp.org/archive/clss/2026-01-01/clss-20260101-git.tgz"; + sha256 = "0q5ih9dxq6j4927msd99g8x8ywy4kw4b8dz6czbk326z5bpw44ac"; system = "clss"; asd = "clss"; } @@ -42834,12 +42893,12 @@ lib.makeScope pkgs.newScope (self: { clunit2 = ( build-asdf-system { pname = "clunit2"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "clunit2" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/clunit2/2025-06-22/clunit2-20250622-git.tgz"; - sha256 = "0xm9jsy2wsvbbf8cgln6601a1rbyiz8hk17vh0lm747sqhg2vxc5"; + url = "https://beta.quicklisp.org/archive/clunit2/2026-01-01/clunit2-20260101-git.tgz"; + sha256 = "02ngs5bd07ypa7bq82x4q3qs5rg93n2dj62irvl7a6vc1lrisqx9"; system = "clunit2"; asd = "clunit2"; } @@ -42852,12 +42911,12 @@ lib.makeScope pkgs.newScope (self: { clustered-intset = ( build-asdf-system { pname = "clustered-intset"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "clustered-intset" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/clustered-intset/2022-07-07/clustered-intset-20220707-git.tgz"; - sha256 = "035s2gn59l8389b0ypnb4qna7zplz9rxk05aw88qf8g4b7wyba1h"; + url = "https://beta.quicklisp.org/archive/clustered-intset/2026-01-01/clustered-intset-20260101-git.tgz"; + sha256 = "0kcw0sf51gdjizmak6g545a5mx1c6xj2hk32g7i84z6mdznc2fdx"; system = "clustered-intset"; asd = "clustered-intset"; } @@ -42872,12 +42931,12 @@ lib.makeScope pkgs.newScope (self: { clustered-intset-test = ( build-asdf-system { pname = "clustered-intset-test"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "clustered-intset-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/clustered-intset/2022-07-07/clustered-intset-20220707-git.tgz"; - sha256 = "035s2gn59l8389b0ypnb4qna7zplz9rxk05aw88qf8g4b7wyba1h"; + url = "https://beta.quicklisp.org/archive/clustered-intset/2026-01-01/clustered-intset-20260101-git.tgz"; + sha256 = "0kcw0sf51gdjizmak6g545a5mx1c6xj2hk32g7i84z6mdznc2fdx"; system = "clustered-intset-test"; asd = "clustered-intset-test"; } @@ -42992,12 +43051,12 @@ lib.makeScope pkgs.newScope (self: { clws = ( build-asdf-system { pname = "clws"; - version = "20130813-git"; + version = "20260101-git"; asds = [ "clws" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/clws/2013-08-13/clws-20130813-git.tgz"; - sha256 = "1svj025zwsbkb0hrbz1nj0x306hkhy9xinq0x1qdflc9vg169dh6"; + url = "https://beta.quicklisp.org/archive/clws/2026-01-01/clws-20260101-git.tgz"; + sha256 = "1f222cgl4wxws7i09i13p3qprzfc793i3rd6pwrv0kbvllky6sz7"; system = "clws"; asd = "clws"; } @@ -43019,12 +43078,12 @@ lib.makeScope pkgs.newScope (self: { clx = ( build-asdf-system { pname = "clx"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "clx" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/clx/2024-10-12/clx-20241012-git.tgz"; - sha256 = "16l0badm7dxwi7x5ynk1scrbrilnxi1nzz79h1v15xi6b41pf65w"; + url = "https://beta.quicklisp.org/archive/clx/2026-01-01/clx-20260101-git.tgz"; + sha256 = "12cqmr1h5sn79fifn2jzcx1y1vsc1kf0q231axqc5aa4xg04g2b0"; system = "clx"; asd = "clx"; } @@ -43084,12 +43143,12 @@ lib.makeScope pkgs.newScope (self: { cmd = ( build-asdf-system { pname = "cmd"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cmd" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cmd/2025-06-22/cmd-20250622-git.tgz"; - sha256 = "1wm06jvb24pcrfy5h8xm5l6jh13dsrir789bz1c50pjm17wlbk3k"; + url = "https://beta.quicklisp.org/archive/cmd/2026-01-01/cmd-20260101-git.tgz"; + sha256 = "0rmfcl8lphn5wrlh65llw0qkxk8b890vnxk52ydqgvm2ywm1435b"; system = "cmd"; asd = "cmd"; } @@ -43153,12 +43212,12 @@ lib.makeScope pkgs.newScope (self: { coalton = ( build-asdf-system { pname = "coalton"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "coalton" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz"; - sha256 = "0g6gfp3y9smzssi3dbddwxvx7g4hq6wz98h253gs4i15pd2pf3qp"; + url = "https://beta.quicklisp.org/archive/coalton/2026-01-01/coalton-20260101-git.tgz"; + sha256 = "1ykx0570dmy8q6ysw98wh7x6r60x2ix5n5clf43g9grknypp0dim"; system = "coalton"; asd = "coalton"; } @@ -43178,12 +43237,12 @@ lib.makeScope pkgs.newScope (self: { coalton-asdf = ( build-asdf-system { pname = "coalton-asdf"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "coalton-asdf" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz"; - sha256 = "0g6gfp3y9smzssi3dbddwxvx7g4hq6wz98h253gs4i15pd2pf3qp"; + url = "https://beta.quicklisp.org/archive/coalton/2026-01-01/coalton-20260101-git.tgz"; + sha256 = "1ykx0570dmy8q6ysw98wh7x6r60x2ix5n5clf43g9grknypp0dim"; system = "coalton-asdf"; asd = "coalton-asdf"; } @@ -43198,12 +43257,12 @@ lib.makeScope pkgs.newScope (self: { coalton-compiler = ( build-asdf-system { pname = "coalton-compiler"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "coalton-compiler" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz"; - sha256 = "0g6gfp3y9smzssi3dbddwxvx7g4hq6wz98h253gs4i15pd2pf3qp"; + url = "https://beta.quicklisp.org/archive/coalton/2026-01-01/coalton-20260101-git.tgz"; + sha256 = "1ykx0570dmy8q6ysw98wh7x6r60x2ix5n5clf43g9grknypp0dim"; system = "coalton-compiler"; asd = "coalton-compiler"; } @@ -43228,12 +43287,12 @@ lib.makeScope pkgs.newScope (self: { coalton-testing-example-project = ( build-asdf-system { pname = "coalton-testing-example-project"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "coalton-testing-example-project" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz"; - sha256 = "0g6gfp3y9smzssi3dbddwxvx7g4hq6wz98h253gs4i15pd2pf3qp"; + url = "https://beta.quicklisp.org/archive/coalton/2026-01-01/coalton-20260101-git.tgz"; + sha256 = "1ykx0570dmy8q6ysw98wh7x6r60x2ix5n5clf43g9grknypp0dim"; system = "coalton-testing-example-project"; asd = "coalton-testing-example-project"; } @@ -43251,12 +43310,12 @@ lib.makeScope pkgs.newScope (self: { cocoas = ( build-asdf-system { pname = "cocoas"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "cocoas" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cocoas/2025-06-22/cocoas-20250622-git.tgz"; - sha256 = "1mw20p5apf75vf26hqbvsbmr46kw6nab36mg11wff1p22l4xmlqx"; + url = "https://beta.quicklisp.org/archive/cocoas/2026-01-01/cocoas-20260101-git.tgz"; + sha256 = "0mxx3msv20gmvadbh6bh3fx73lfnwdir34glnpv0sc0rl3nzxydx"; system = "cocoas"; asd = "cocoas"; } @@ -43448,6 +43507,32 @@ lib.makeScope pkgs.newScope (self: { meta = { }; } ); + collidxr = ( + build-asdf-system { + pname = "collidxr"; + version = "20260101-git"; + asds = [ "collidxr" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/collidxr/2026-01-01/collidxr-20260101-git.tgz"; + sha256 = "0qsx7znmp55vm8s19nd0047kk313gfwp0yh9hs6zbscrpksksa5q"; + system = "collidxr"; + asd = "collidxr"; + } + ); + systems = [ "collidxr" ]; + lispLibs = [ + (getAttr "alexandria" self) + (getAttr "cl-collider" self) + (getAttr "mutility" self) + (getAttr "trivial-types" self) + (getAttr "vgplot" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); colliflower = ( build-asdf-system { pname = "colliflower"; @@ -43523,12 +43608,12 @@ lib.makeScope pkgs.newScope (self: { colnew = ( build-asdf-system { pname = "colnew"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "colnew" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; - sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; + url = "https://beta.quicklisp.org/archive/f2cl/2026-01-01/f2cl-20260101-git.tgz"; + sha256 = "025hdyvyk9il71aya05sma13m3x9yxcj7g3sadpzck55manbpfnm"; system = "colnew"; asd = "colnew"; } @@ -43543,12 +43628,12 @@ lib.makeScope pkgs.newScope (self: { colored = ( build-asdf-system { pname = "colored"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "colored" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/colored/2025-06-22/colored-20250622-git.tgz"; - sha256 = "1wsj4449165h8diclk74a80x847yzsqnx9s02l314nm1wa37y3c7"; + url = "https://beta.quicklisp.org/archive/colored/2026-01-01/colored-20260101-git.tgz"; + sha256 = "1n9k8rh2p7kb2ikxpgw8sywaxw0n5m3iky808dwc4hqz04piqmmh"; system = "colored"; asd = "colored"; } @@ -43563,12 +43648,12 @@ lib.makeScope pkgs.newScope (self: { colored-test = ( build-asdf-system { pname = "colored-test"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "colored-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/colored/2025-06-22/colored-20250622-git.tgz"; - sha256 = "1wsj4449165h8diclk74a80x847yzsqnx9s02l314nm1wa37y3c7"; + url = "https://beta.quicklisp.org/archive/colored/2026-01-01/colored-20260101-git.tgz"; + sha256 = "1n9k8rh2p7kb2ikxpgw8sywaxw0n5m3iky808dwc4hqz04piqmmh"; system = "colored-test"; asd = "colored-test"; } @@ -43608,12 +43693,12 @@ lib.makeScope pkgs.newScope (self: { com-on = ( build-asdf-system { pname = "com-on"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "com-on" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/com-on/2025-06-22/com-on-20250622-git.tgz"; - sha256 = "0ycg3iijaj5p2xmd0lzpgqpdkxi6q9kx9gijyv0ww18xzqd8s3z1"; + url = "https://beta.quicklisp.org/archive/com-on/2026-01-01/com-on-20260101-git.tgz"; + sha256 = "00b3lrkidq950p6dsrz00a4c3dzyi740r1r7vgr07rs5sb6pa30y"; system = "com-on"; asd = "com-on"; } @@ -43631,12 +43716,12 @@ lib.makeScope pkgs.newScope (self: { com-on-test = ( build-asdf-system { pname = "com-on-test"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "com-on-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/com-on/2025-06-22/com-on-20250622-git.tgz"; - sha256 = "0ycg3iijaj5p2xmd0lzpgqpdkxi6q9kx9gijyv0ww18xzqd8s3z1"; + url = "https://beta.quicklisp.org/archive/com-on/2026-01-01/com-on-20260101-git.tgz"; + sha256 = "00b3lrkidq950p6dsrz00a4c3dzyi740r1r7vgr07rs5sb6pa30y"; system = "com-on-test"; asd = "com-on-test"; } @@ -43689,9 +43774,7 @@ lib.makeScope pkgs.newScope (self: { } ); 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 = [ ]; }; @@ -43768,12 +43851,12 @@ lib.makeScope pkgs.newScope (self: { com_dot_danielkeogh_dot_graph = ( build-asdf-system { pname = "com.danielkeogh.graph"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "com.danielkeogh.graph" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/com.danielkeogh.graph/2024-10-12/com.danielkeogh.graph-20241012-git.tgz"; - sha256 = "1hy9g49aqi1li0cdxzjmzgiskh00vlxbp1kjwiyk8a8kqzg69hj2"; + url = "https://beta.quicklisp.org/archive/com.danielkeogh.graph/2026-01-01/com.danielkeogh.graph-20260101-git.tgz"; + sha256 = "0f4mbhxbcv40c7y9gvrrjbj5l4cmd6v2qnlhzz39z261maqz9bgl"; system = "com.danielkeogh.graph"; asd = "com.danielkeogh.graph"; } @@ -43792,12 +43875,12 @@ lib.makeScope pkgs.newScope (self: { com_dot_danielkeogh_dot_graph-tests = ( build-asdf-system { pname = "com.danielkeogh.graph-tests"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "com.danielkeogh.graph-tests" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/com.danielkeogh.graph/2024-10-12/com.danielkeogh.graph-20241012-git.tgz"; - sha256 = "1hy9g49aqi1li0cdxzjmzgiskh00vlxbp1kjwiyk8a8kqzg69hj2"; + url = "https://beta.quicklisp.org/archive/com.danielkeogh.graph/2026-01-01/com.danielkeogh.graph-20260101-git.tgz"; + sha256 = "0f4mbhxbcv40c7y9gvrrjbj5l4cmd6v2qnlhzz39z261maqz9bgl"; system = "com.danielkeogh.graph-tests"; asd = "com.danielkeogh.graph-tests"; } @@ -43815,12 +43898,12 @@ lib.makeScope pkgs.newScope (self: { com_dot_dvlsoft_dot_rcfiles = ( build-asdf-system { pname = "com.dvlsoft.rcfiles"; - version = "20111203-http"; + version = "20260101-git"; asds = [ "com.dvlsoft.rcfiles" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-rcfiles/2011-12-03/cl-rcfiles-20111203-http.tgz"; - sha256 = "06ahp9jaim216k7vbya1kp8iy5yb1i7axwrsjx7gwhl2b2q63r0a"; + url = "https://beta.quicklisp.org/archive/cl-rcfiles/2026-01-01/cl-rcfiles-20260101-git.tgz"; + sha256 = "01xbr65ljhphhzh95p8ys0byladg7dg11pkvf1i4nijvp4nzjdzl"; system = "com.dvlsoft.rcfiles"; asd = "com.dvlsoft.rcfiles"; } @@ -44726,12 +44809,12 @@ lib.makeScope pkgs.newScope (self: { concrete-syntax-tree = ( build-asdf-system { pname = "concrete-syntax-tree"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "concrete-syntax-tree" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/concrete-syntax-tree/2025-06-22/concrete-syntax-tree-20250622-git.tgz"; - sha256 = "1g5iyfn6hly08rngza4bc21yamv9vq699c2zb5ndqahns1r7q5fl"; + url = "https://beta.quicklisp.org/archive/concrete-syntax-tree/2026-01-01/concrete-syntax-tree-20260101-git.tgz"; + sha256 = "07v4wy90q3pnnr3k65zcwxrv6gyhn75p7kws1bnki0i0g3z78dqn"; system = "concrete-syntax-tree"; asd = "concrete-syntax-tree"; } @@ -44746,12 +44829,12 @@ lib.makeScope pkgs.newScope (self: { concrete-syntax-tree-destructuring = ( build-asdf-system { pname = "concrete-syntax-tree-destructuring"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "concrete-syntax-tree-destructuring" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/concrete-syntax-tree/2025-06-22/concrete-syntax-tree-20250622-git.tgz"; - sha256 = "1g5iyfn6hly08rngza4bc21yamv9vq699c2zb5ndqahns1r7q5fl"; + url = "https://beta.quicklisp.org/archive/concrete-syntax-tree/2026-01-01/concrete-syntax-tree-20260101-git.tgz"; + sha256 = "07v4wy90q3pnnr3k65zcwxrv6gyhn75p7kws1bnki0i0g3z78dqn"; system = "concrete-syntax-tree-destructuring"; asd = "concrete-syntax-tree-destructuring"; } @@ -44766,12 +44849,12 @@ lib.makeScope pkgs.newScope (self: { concrete-syntax-tree-lambda-list = ( build-asdf-system { pname = "concrete-syntax-tree-lambda-list"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "concrete-syntax-tree-lambda-list" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/concrete-syntax-tree/2025-06-22/concrete-syntax-tree-20250622-git.tgz"; - sha256 = "1g5iyfn6hly08rngza4bc21yamv9vq699c2zb5ndqahns1r7q5fl"; + url = "https://beta.quicklisp.org/archive/concrete-syntax-tree/2026-01-01/concrete-syntax-tree-20260101-git.tgz"; + sha256 = "07v4wy90q3pnnr3k65zcwxrv6gyhn75p7kws1bnki0i0g3z78dqn"; system = "concrete-syntax-tree-lambda-list"; asd = "concrete-syntax-tree-lambda-list"; } @@ -44786,12 +44869,12 @@ lib.makeScope pkgs.newScope (self: { concrete-syntax-tree-source-info = ( build-asdf-system { pname = "concrete-syntax-tree-source-info"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "concrete-syntax-tree-source-info" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/concrete-syntax-tree/2025-06-22/concrete-syntax-tree-20250622-git.tgz"; - sha256 = "1g5iyfn6hly08rngza4bc21yamv9vq699c2zb5ndqahns1r7q5fl"; + url = "https://beta.quicklisp.org/archive/concrete-syntax-tree/2026-01-01/concrete-syntax-tree-20260101-git.tgz"; + sha256 = "07v4wy90q3pnnr3k65zcwxrv6gyhn75p7kws1bnki0i0g3z78dqn"; system = "concrete-syntax-tree-source-info"; asd = "concrete-syntax-tree-source-info"; } @@ -44806,12 +44889,12 @@ lib.makeScope pkgs.newScope (self: { conditional-commands = ( build-asdf-system { pname = "conditional-commands"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "conditional-commands" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "conditional-commands"; asd = "conditional-commands"; } @@ -45050,12 +45133,12 @@ lib.makeScope pkgs.newScope (self: { consfigurator = ( build-asdf-system { pname = "consfigurator"; - version = "v1.5.2"; + version = "v1.5.3"; asds = [ "consfigurator" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/consfigurator/2025-06-22/consfigurator-v1.5.2.tgz"; - sha256 = "18v87zky9rlrp0xhg1q3ydd5v18c4zx37kaxiw4swlxpf2br6gfa"; + url = "https://beta.quicklisp.org/archive/consfigurator/2026-01-01/consfigurator-v1.5.3.tgz"; + sha256 = "1cnjr4vh99mlhhb8r94g6i5m95x5b7vnlshcqj75bndcc0jh9lzz"; system = "consfigurator"; asd = "consfigurator"; } @@ -45224,6 +45307,44 @@ lib.makeScope pkgs.newScope (self: { }; } ); + copimap = ( + build-asdf-system { + pname = "copimap"; + version = "20260101-git"; + asds = [ "copimap" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/copimap/2026-01-01/copimap-20260101-git.tgz"; + sha256 = "0wv9s97pm4ddv00ljhdcg481696sd469yadmwimq45qsj4dyxaay"; + system = "copimap"; + asd = "copimap"; + } + ); + systems = [ "copimap" ]; + lispLibs = [ + (getAttr "alexandria" self) + (getAttr "anaphora" self) + (getAttr "babel" self) + (getAttr "bordeaux-threads" self) + (getAttr "cl_plus_ssl" self) + (getAttr "cl-base64" self) + (getAttr "cl-date-time-parser" self) + (getAttr "cl-dbi" self) + (getAttr "cl-fad" self) + (getAttr "cl-ppcre" self) + (getAttr "file-attributes" self) + (getAttr "flexi-streams" self) + (getAttr "local-time" self) + (getAttr "named-readtables" self) + (getAttr "trivial-utf-8" self) + (getAttr "usocket" self) + (getAttr "verbose" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); copy-directory = ( build-asdf-system { pname = "copy-directory"; @@ -45413,58 +45534,6 @@ lib.makeScope pkgs.newScope (self: { }; } ); - crane = ( - build-asdf-system { - pname = "crane"; - version = "20160208-git"; - asds = [ "crane" ]; - src = ( - createAsd { - url = "https://beta.quicklisp.org/archive/crane/2016-02-08/crane-20160208-git.tgz"; - sha256 = "1wai4h7vz5i0ld1fnnbcmpz5d67dmykyxx0ay0fkclkwvpj7gh5n"; - system = "crane"; - asd = "crane"; - } - ); - systems = [ "crane" ]; - lispLibs = [ - (getAttr "anaphora" self) - (getAttr "cl-fad" self) - (getAttr "clos-fixtures" self) - (getAttr "closer-mop" self) - (getAttr "dbi" self) - (getAttr "iterate" self) - (getAttr "local-time" self) - (getAttr "sxql" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - crane-test = ( - build-asdf-system { - pname = "crane-test"; - version = "20160208-git"; - asds = [ "crane-test" ]; - src = ( - createAsd { - url = "https://beta.quicklisp.org/archive/crane/2016-02-08/crane-20160208-git.tgz"; - sha256 = "1wai4h7vz5i0ld1fnnbcmpz5d67dmykyxx0ay0fkclkwvpj7gh5n"; - system = "crane-test"; - asd = "crane-test"; - } - ); - systems = [ "crane-test" ]; - lispLibs = [ - (getAttr "crane" self) - (getAttr "fiveam" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); cricket = ( build-asdf-system { pname = "cricket"; @@ -45631,12 +45700,12 @@ lib.makeScope pkgs.newScope (self: { crypto-shortcuts = ( build-asdf-system { pname = "crypto-shortcuts"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "crypto-shortcuts" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/crypto-shortcuts/2025-06-22/crypto-shortcuts-20250622-git.tgz"; - sha256 = "1ah1jw2vf3sz2ns835rbv8jm2sc821icmdj9qjw06h2x5lspw7xs"; + url = "https://beta.quicklisp.org/archive/crypto-shortcuts/2026-01-01/crypto-shortcuts-20260101-git.tgz"; + sha256 = "1b0dzf84xzw444kib1744sls4l24zh3nx1cz77xbc8qphic0m0ms"; system = "crypto-shortcuts"; asd = "crypto-shortcuts"; } @@ -46180,12 +46249,12 @@ lib.makeScope pkgs.newScope (self: { cxx = ( build-asdf-system { pname = "cxx"; - version = "20230214-git"; + version = "20260101-git"; asds = [ "cxx" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-cxx/2023-02-14/cl-cxx-20230214-git.tgz"; - sha256 = "08jh7ajgfdr3cqla02c4d2y06y0imkky5d4mwnlph01nczzf85cy"; + url = "https://beta.quicklisp.org/archive/cl-cxx/2026-01-01/cl-cxx-20260101-git.tgz"; + sha256 = "1mn7rfvbsar4qps4w4lga0xr480443104y0g3mvfbkhpckd4ngv9"; system = "cxx"; asd = "cxx"; } @@ -46249,12 +46318,12 @@ lib.makeScope pkgs.newScope (self: { cxx-test = ( build-asdf-system { pname = "cxx-test"; - version = "20230214-git"; + version = "20260101-git"; asds = [ "cxx-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-cxx/2023-02-14/cl-cxx-20230214-git.tgz"; - sha256 = "08jh7ajgfdr3cqla02c4d2y06y0imkky5d4mwnlph01nczzf85cy"; + url = "https://beta.quicklisp.org/archive/cl-cxx/2026-01-01/cl-cxx-20260101-git.tgz"; + sha256 = "1mn7rfvbsar4qps4w4lga0xr480443104y0g3mvfbkhpckd4ngv9"; system = "cxx-test"; asd = "cxx-test"; } @@ -46316,12 +46385,12 @@ lib.makeScope pkgs.newScope (self: { damn-fast-priority-queue = ( build-asdf-system { pname = "damn-fast-priority-queue"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "damn-fast-priority-queue" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/damn-fast-priority-queue/2024-10-12/damn-fast-priority-queue-20241012-git.tgz"; - sha256 = "1mbigpgi7qbqvpj59l1f7p2qcg00ybvqzdca1j1b9hx62h224ndw"; + url = "https://beta.quicklisp.org/archive/damn-fast-priority-queue/2026-01-01/damn-fast-priority-queue-20260101-git.tgz"; + sha256 = "0ch4yma51r2lnsjpr45mxga7sf03l3c76l6ijffm1rq2g9ywaksa"; system = "damn-fast-priority-queue"; asd = "damn-fast-priority-queue"; } @@ -46336,12 +46405,12 @@ lib.makeScope pkgs.newScope (self: { damn-fast-stable-priority-queue = ( build-asdf-system { pname = "damn-fast-stable-priority-queue"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "damn-fast-stable-priority-queue" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/damn-fast-priority-queue/2024-10-12/damn-fast-priority-queue-20241012-git.tgz"; - sha256 = "1mbigpgi7qbqvpj59l1f7p2qcg00ybvqzdca1j1b9hx62h224ndw"; + url = "https://beta.quicklisp.org/archive/damn-fast-priority-queue/2026-01-01/damn-fast-priority-queue-20260101-git.tgz"; + sha256 = "0ch4yma51r2lnsjpr45mxga7sf03l3c76l6ijffm1rq2g9ywaksa"; system = "damn-fast-stable-priority-queue"; asd = "damn-fast-stable-priority-queue"; } @@ -46641,12 +46710,12 @@ lib.makeScope pkgs.newScope (self: { data-frame = ( build-asdf-system { pname = "data-frame"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "data-frame" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/data-frame/2025-06-22/data-frame-20250622-git.tgz"; - sha256 = "1xbh1bicwlqn5kfj6my869ngx1f5x4xrb91hc7rgbz3bmsg19qpr"; + url = "https://beta.quicklisp.org/archive/data-frame/2026-01-01/data-frame-20260101-git.tgz"; + sha256 = "0n89xfsvqxqrl1zri0jf38f1gci13gaml1f4r4nwyqq2sifbcnh0"; system = "data-frame"; asd = "data-frame"; } @@ -46671,12 +46740,12 @@ lib.makeScope pkgs.newScope (self: { data-lens = ( build-asdf-system { pname = "data-lens"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "data-lens" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/data-lens/2024-10-12/data-lens-20241012-git.tgz"; - sha256 = "1bark9r3br5ndcbkiagq891gn82xdiy8hrgzp72656yyadsrid5i"; + url = "https://beta.quicklisp.org/archive/data-lens/2026-01-01/data-lens-20260101-git.tgz"; + sha256 = "0rmx69xidlhxc4y44jqy86adm0rl79lvf64qjyz8xd4xlnikwxia"; system = "data-lens"; asd = "data-lens"; } @@ -46694,12 +46763,12 @@ lib.makeScope pkgs.newScope (self: { data-lens_plus_fset = ( build-asdf-system { pname = "data-lens+fset"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "data-lens+fset" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/data-lens/2024-10-12/data-lens-20241012-git.tgz"; - sha256 = "1bark9r3br5ndcbkiagq891gn82xdiy8hrgzp72656yyadsrid5i"; + url = "https://beta.quicklisp.org/archive/data-lens/2026-01-01/data-lens-20260101-git.tgz"; + sha256 = "0rmx69xidlhxc4y44jqy86adm0rl79lvf64qjyz8xd4xlnikwxia"; system = "data-lens+fset"; asd = "data-lens+fset"; } @@ -46858,12 +46927,12 @@ lib.makeScope pkgs.newScope (self: { datafly = ( build-asdf-system { pname = "datafly"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "datafly" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/datafly/2024-10-12/datafly-20241012-git.tgz"; - sha256 = "103zp5s778lys4lsn7hvyis65757338n0l9gzl595qfim4apx8g0"; + url = "https://beta.quicklisp.org/archive/datafly/2026-01-01/datafly-20260101-git.tgz"; + sha256 = "0za7w7k6kkkqknqx721ar8iml07gsk00avfcffmd889apgzvg3b2"; system = "datafly"; asd = "datafly"; } @@ -46893,12 +46962,12 @@ lib.makeScope pkgs.newScope (self: { datafly-test = ( build-asdf-system { pname = "datafly-test"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "datafly-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/datafly/2024-10-12/datafly-20241012-git.tgz"; - sha256 = "103zp5s778lys4lsn7hvyis65757338n0l9gzl595qfim4apx8g0"; + url = "https://beta.quicklisp.org/archive/datafly/2026-01-01/datafly-20260101-git.tgz"; + sha256 = "0za7w7k6kkkqknqx721ar8iml07gsk00avfcffmd889apgzvg3b2"; system = "datafly-test"; asd = "datafly-test"; } @@ -46915,70 +46984,15 @@ lib.makeScope pkgs.newScope (self: { }; } ); - dataloader = ( - build-asdf-system { - pname = "dataloader"; - version = "20210531-git"; - asds = [ "dataloader" ]; - src = ( - createAsd { - url = "https://beta.quicklisp.org/archive/dataloader/2021-05-31/dataloader-20210531-git.tgz"; - sha256 = "1a7nap2yp0jjd9r3xpkj0a6z0m3gshz73abm8kfza4kf31ipzyik"; - system = "dataloader"; - asd = "dataloader"; - } - ); - systems = [ "dataloader" ]; - lispLibs = [ - (getAttr "alexandria" self) - (getAttr "cl-csv" self) - (getAttr "cl-jpeg" self) - (getAttr "cl-wav" self) - (getAttr "iterate" self) - (getAttr "magicffi" self) - (getAttr "numcl" self) - (getAttr "numpy-file-format" self) - (getAttr "png" self) - (getAttr "retrospectiff" self) - (getAttr "trivia" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - dataloader_dot_test = ( - build-asdf-system { - pname = "dataloader.test"; - version = "20210531-git"; - asds = [ "dataloader.test" ]; - src = ( - createAsd { - url = "https://beta.quicklisp.org/archive/dataloader/2021-05-31/dataloader-20210531-git.tgz"; - sha256 = "1a7nap2yp0jjd9r3xpkj0a6z0m3gshz73abm8kfza4kf31ipzyik"; - system = "dataloader.test"; - asd = "dataloader.test"; - } - ); - systems = [ "dataloader.test" ]; - lispLibs = [ - (getAttr "dataloader" self) - (getAttr "fiveam" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); datamuse = ( build-asdf-system { pname = "datamuse"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "datamuse" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/datamuse/2023-10-21/datamuse-20231021-git.tgz"; - sha256 = "18mminvwv6wql6qh9kxxkhjfbxfz37gr125wy9h6za83vn1rkpwc"; + url = "https://beta.quicklisp.org/archive/datamuse/2026-01-01/datamuse-20260101-git.tgz"; + sha256 = "05bq2g155cjhj2ic6w9hzgcd1bijcd54lzmxd8c1692l338jmnfk"; system = "datamuse"; asd = "datamuse"; } @@ -47057,12 +47071,12 @@ lib.makeScope pkgs.newScope (self: { dbd-mysql = ( build-asdf-system { pname = "dbd-mysql"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "dbd-mysql" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz"; - sha256 = "17szd6sz1hlwl5fm4qjgyd8ax01wkbhv8hxcyy8qscx39sc0cnpy"; + url = "https://beta.quicklisp.org/archive/cl-dbi/2026-01-01/cl-dbi-20260101-git.tgz"; + sha256 = "19kai3kd061valrr3v31shrizyh9qsyxmcl034b16zllqjrnmyi7"; system = "dbd-mysql"; asd = "dbd-mysql"; } @@ -47075,15 +47089,35 @@ lib.makeScope pkgs.newScope (self: { meta = { }; } ); + dbd-null = ( + build-asdf-system { + pname = "dbd-null"; + version = "20260101-git"; + asds = [ "dbd-null" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-dbi/2026-01-01/cl-dbi-20260101-git.tgz"; + sha256 = "19kai3kd061valrr3v31shrizyh9qsyxmcl034b16zllqjrnmyi7"; + system = "dbd-null"; + asd = "dbd-null"; + } + ); + systems = [ "dbd-null" ]; + lispLibs = [ (getAttr "dbi" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); dbd-postgres = ( build-asdf-system { pname = "dbd-postgres"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "dbd-postgres" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz"; - sha256 = "17szd6sz1hlwl5fm4qjgyd8ax01wkbhv8hxcyy8qscx39sc0cnpy"; + url = "https://beta.quicklisp.org/archive/cl-dbi/2026-01-01/cl-dbi-20260101-git.tgz"; + sha256 = "19kai3kd061valrr3v31shrizyh9qsyxmcl034b16zllqjrnmyi7"; system = "dbd-postgres"; asd = "dbd-postgres"; } @@ -47100,12 +47134,12 @@ lib.makeScope pkgs.newScope (self: { dbd-sqlite3 = ( build-asdf-system { pname = "dbd-sqlite3"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "dbd-sqlite3" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz"; - sha256 = "17szd6sz1hlwl5fm4qjgyd8ax01wkbhv8hxcyy8qscx39sc0cnpy"; + url = "https://beta.quicklisp.org/archive/cl-dbi/2026-01-01/cl-dbi-20260101-git.tgz"; + sha256 = "19kai3kd061valrr3v31shrizyh9qsyxmcl034b16zllqjrnmyi7"; system = "dbd-sqlite3"; asd = "dbd-sqlite3"; } @@ -47122,12 +47156,12 @@ lib.makeScope pkgs.newScope (self: { dbi = ( build-asdf-system { pname = "dbi"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "dbi" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz"; - sha256 = "17szd6sz1hlwl5fm4qjgyd8ax01wkbhv8hxcyy8qscx39sc0cnpy"; + url = "https://beta.quicklisp.org/archive/cl-dbi/2026-01-01/cl-dbi-20260101-git.tgz"; + sha256 = "19kai3kd061valrr3v31shrizyh9qsyxmcl034b16zllqjrnmyi7"; system = "dbi"; asd = "dbi"; } @@ -47145,18 +47179,19 @@ lib.makeScope pkgs.newScope (self: { dbi-cp = ( build-asdf-system { pname = "dbi-cp"; - version = "20250622-git"; + version = "20260101-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"; + url = "https://beta.quicklisp.org/archive/cl-dbi-connection-pool/2026-01-01/cl-dbi-connection-pool-20260101-git.tgz"; + sha256 = "177c6kl452y4pdkgn3z3s3wicj5p8k91pgh32fb04h8x92z23457"; system = "dbi-cp"; asd = "dbi-cp"; } ); systems = [ "dbi-cp" ]; lispLibs = [ + (getAttr "babel" self) (getAttr "bt-semaphore" self) (getAttr "cl-dbi" self) (getAttr "cl-syntax" self) @@ -47170,12 +47205,12 @@ lib.makeScope pkgs.newScope (self: { dbi-cp-test = ( build-asdf-system { pname = "dbi-cp-test"; - version = "20250622-git"; + version = "20260101-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"; + url = "https://beta.quicklisp.org/archive/cl-dbi-connection-pool/2026-01-01/cl-dbi-connection-pool-20260101-git.tgz"; + sha256 = "177c6kl452y4pdkgn3z3s3wicj5p8k91pgh32fb04h8x92z23457"; system = "dbi-cp-test"; asd = "dbi-cp-test"; } @@ -47193,12 +47228,12 @@ lib.makeScope pkgs.newScope (self: { dbi-test = ( build-asdf-system { pname = "dbi-test"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "dbi-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz"; - sha256 = "17szd6sz1hlwl5fm4qjgyd8ax01wkbhv8hxcyy8qscx39sc0cnpy"; + url = "https://beta.quicklisp.org/archive/cl-dbi/2026-01-01/cl-dbi-20260101-git.tgz"; + sha256 = "19kai3kd061valrr3v31shrizyh9qsyxmcl034b16zllqjrnmyi7"; system = "dbi-test"; asd = "dbi-test"; } @@ -47363,12 +47398,12 @@ lib.makeScope pkgs.newScope (self: { decimals = ( build-asdf-system { pname = "decimals"; - version = "20211209-git"; + version = "20260101-git"; asds = [ "decimals" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-decimals/2021-12-09/cl-decimals-20211209-git.tgz"; - sha256 = "0wn5hq1pwd3wpjqqhpjzarcdk1q6416g8y447iaf55j5nbhlmbn6"; + url = "https://beta.quicklisp.org/archive/cl-decimals/2026-01-01/cl-decimals-20260101-git.tgz"; + sha256 = "01id30hs71h9vsnbqxxjah76nyzfcgmji0lipq27d3dj0grw4x5z"; system = "decimals"; asd = "decimals"; } @@ -47383,12 +47418,12 @@ lib.makeScope pkgs.newScope (self: { deeds = ( build-asdf-system { pname = "deeds"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "deeds" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/deeds/2025-06-22/deeds-20250622-git.tgz"; - sha256 = "0qhb95msyl0fv3swczdjfp413q8dckpf2kx7xrlryjdw3628wisq"; + url = "https://beta.quicklisp.org/archive/deeds/2026-01-01/deeds-20260101-git.tgz"; + sha256 = "1kx5x783cxw5whfwl1akwmzybh6dbrrjmygqmigirqcwdmxk5h8c"; system = "deeds"; asd = "deeds"; } @@ -47408,12 +47443,12 @@ lib.makeScope pkgs.newScope (self: { def-properties = ( build-asdf-system { pname = "def-properties"; - version = "20230618-git"; + version = "20260101-git"; asds = [ "def-properties" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-def-properties/2023-06-18/cl-def-properties-20230618-git.tgz"; - sha256 = "0yvii6llhmjv1k7hli6waj1bprj8fqhncgnk8mdlg08wwa27a2j8"; + url = "https://beta.quicklisp.org/archive/cl-def-properties/2026-01-01/cl-def-properties-20260101-git.tgz"; + sha256 = "1aakpipcihqg4az2g7jqm1jdz4b1zkhi3kqhcflj4cmacqdbmqv4"; system = "def-properties"; asd = "def-properties"; } @@ -47500,12 +47535,12 @@ lib.makeScope pkgs.newScope (self: { defenum = ( build-asdf-system { pname = "defenum"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "defenum" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/defenum/2025-06-22/defenum-20250622-git.tgz"; - sha256 = "1rrm5gvb9l1ynvq2mnpvmv1mdgmbm48169r05zmpmvbfyyd2ngs9"; + url = "https://beta.quicklisp.org/archive/defenum/2026-01-01/defenum-20260101-git.tgz"; + sha256 = "1h6wqdca9f0scwm9qsnhh9hsqsr2cnk9p3qhsjk3gh1p6ah6bd3c"; system = "defenum"; asd = "defenum"; } @@ -47520,12 +47555,12 @@ lib.makeScope pkgs.newScope (self: { deferred = ( build-asdf-system { pname = "deferred"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "deferred" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/deferred/2025-06-22/deferred-20250622-git.tgz"; - sha256 = "1f7rv7vz5jld1wd9b087af6a62wjd5a1hwwmk47wklwmhvk32pk9"; + url = "https://beta.quicklisp.org/archive/deferred/2026-01-01/deferred-20260101-git.tgz"; + sha256 = "1abvpmc7a670qk61946dya98s1jmd00dbn5nh45snvg01zrrcwip"; system = "deferred"; asd = "deferred"; } @@ -47560,12 +47595,12 @@ lib.makeScope pkgs.newScope (self: { definer = ( build-asdf-system { pname = "definer"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "definer" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/definer/2025-06-22/definer-20250622-git.tgz"; - sha256 = "1dndgm78bylick7yh46rna40z0rq5l84lsyzlfpr6bfv51skpckc"; + url = "https://beta.quicklisp.org/archive/definer/2026-01-01/definer-20260101-git.tgz"; + sha256 = "1avxv6grgqxai51llbbvd9i0bqbz4vz6pvy1p9dk24li7yv43mh2"; system = "definer"; asd = "definer"; } @@ -47580,12 +47615,12 @@ lib.makeScope pkgs.newScope (self: { definitions = ( build-asdf-system { pname = "definitions"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "definitions" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/definitions/2024-10-12/definitions-20241012-git.tgz"; - sha256 = "16wg9rzxc193qvhzay69czr19wzy16b53vm1gy6p25gqvz90zryd"; + url = "https://beta.quicklisp.org/archive/definitions/2026-01-01/definitions-20260101-git.tgz"; + sha256 = "0vd32rj87f8icqglpkylgr0bs2m4qjsii3wd5i5ixiy5dz3918md"; system = "definitions"; asd = "definitions"; } @@ -48299,12 +48334,12 @@ lib.makeScope pkgs.newScope (self: { deploy = ( build-asdf-system { pname = "deploy"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "deploy" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/deploy/2025-06-22/deploy-20250622-git.tgz"; - sha256 = "0lhc0ca4y29wpcv8j78613y5rmq0q8fmh7hq6kxi3b9ykfgr5n31"; + url = "https://beta.quicklisp.org/archive/deploy/2026-01-01/deploy-20260101-git.tgz"; + sha256 = "1f2sahr2k4d291hn7x7bcy4nxav4va3rrw2gcw122zsg97siqy8h"; system = "deploy"; asd = "deploy"; } @@ -48325,12 +48360,12 @@ lib.makeScope pkgs.newScope (self: { deploy-test = ( build-asdf-system { pname = "deploy-test"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "deploy-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/deploy/2025-06-22/deploy-20250622-git.tgz"; - sha256 = "0lhc0ca4y29wpcv8j78613y5rmq0q8fmh7hq6kxi3b9ykfgr5n31"; + url = "https://beta.quicklisp.org/archive/deploy/2026-01-01/deploy-20260101-git.tgz"; + sha256 = "1f2sahr2k4d291hn7x7bcy4nxav4va3rrw2gcw122zsg97siqy8h"; system = "deploy-test"; asd = "deploy-test"; } @@ -48349,12 +48384,12 @@ lib.makeScope pkgs.newScope (self: { depot = ( build-asdf-system { pname = "depot"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "depot" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/depot/2025-06-22/depot-20250622-git.tgz"; - sha256 = "1hmd7pi3zharalqv2zl6aicw4ir3gd0gnawd6w55qvia8c5y9bm8"; + url = "https://beta.quicklisp.org/archive/depot/2026-01-01/depot-20260101-git.tgz"; + sha256 = "0ka6lan77phinhw66jbzl4xpngyfwk67rhzaxf4vv13f5ajdi2gb"; system = "depot"; asd = "depot"; } @@ -48373,12 +48408,12 @@ lib.makeScope pkgs.newScope (self: { depot-in-memory = ( build-asdf-system { pname = "depot-in-memory"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "depot-in-memory" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/depot/2025-06-22/depot-20250622-git.tgz"; - sha256 = "1hmd7pi3zharalqv2zl6aicw4ir3gd0gnawd6w55qvia8c5y9bm8"; + url = "https://beta.quicklisp.org/archive/depot/2026-01-01/depot-20260101-git.tgz"; + sha256 = "0ka6lan77phinhw66jbzl4xpngyfwk67rhzaxf4vv13f5ajdi2gb"; system = "depot-in-memory"; asd = "depot-in-memory"; } @@ -48396,12 +48431,12 @@ lib.makeScope pkgs.newScope (self: { depot-test = ( build-asdf-system { pname = "depot-test"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "depot-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/depot/2025-06-22/depot-20250622-git.tgz"; - sha256 = "1hmd7pi3zharalqv2zl6aicw4ir3gd0gnawd6w55qvia8c5y9bm8"; + url = "https://beta.quicklisp.org/archive/depot/2026-01-01/depot-20260101-git.tgz"; + sha256 = "0ka6lan77phinhw66jbzl4xpngyfwk67rhzaxf4vv13f5ajdi2gb"; system = "depot-test"; asd = "depot-test"; } @@ -48421,12 +48456,12 @@ lib.makeScope pkgs.newScope (self: { depot-virtual = ( build-asdf-system { pname = "depot-virtual"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "depot-virtual" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/depot/2025-06-22/depot-20250622-git.tgz"; - sha256 = "1hmd7pi3zharalqv2zl6aicw4ir3gd0gnawd6w55qvia8c5y9bm8"; + url = "https://beta.quicklisp.org/archive/depot/2026-01-01/depot-20260101-git.tgz"; + sha256 = "0ka6lan77phinhw66jbzl4xpngyfwk67rhzaxf4vv13f5ajdi2gb"; system = "depot-virtual"; asd = "depot-virtual"; } @@ -48441,12 +48476,12 @@ lib.makeScope pkgs.newScope (self: { depot-zip = ( build-asdf-system { pname = "depot-zip"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "depot-zip" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/depot/2025-06-22/depot-20250622-git.tgz"; - sha256 = "1hmd7pi3zharalqv2zl6aicw4ir3gd0gnawd6w55qvia8c5y9bm8"; + url = "https://beta.quicklisp.org/archive/depot/2026-01-01/depot-20260101-git.tgz"; + sha256 = "0ka6lan77phinhw66jbzl4xpngyfwk67rhzaxf4vv13f5ajdi2gb"; system = "depot-zip"; asd = "depot-zip"; } @@ -48601,12 +48636,12 @@ lib.makeScope pkgs.newScope (self: { dexador = ( build-asdf-system { pname = "dexador"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "dexador" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/dexador/2024-10-12/dexador-20241012-git.tgz"; - sha256 = "19y95k821665vcy7gbxhh4rqwk7fh4brv1sgkaykncpw2l2lll5r"; + url = "https://beta.quicklisp.org/archive/dexador/2026-01-01/dexador-20260101-git.tgz"; + sha256 = "079689l56jmvbfx8kpiqlgivsh0cc5a81kaj04nbq2s21407xjbi"; system = "dexador"; asd = "dexador"; } @@ -48637,12 +48672,12 @@ lib.makeScope pkgs.newScope (self: { dexador-test = ( build-asdf-system { pname = "dexador-test"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "dexador-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/dexador/2024-10-12/dexador-20241012-git.tgz"; - sha256 = "19y95k821665vcy7gbxhh4rqwk7fh4brv1sgkaykncpw2l2lll5r"; + url = "https://beta.quicklisp.org/archive/dexador/2026-01-01/dexador-20260101-git.tgz"; + sha256 = "079689l56jmvbfx8kpiqlgivsh0cc5a81kaj04nbq2s21407xjbi"; system = "dexador-test"; asd = "dexador-test"; } @@ -48664,12 +48699,12 @@ lib.makeScope pkgs.newScope (self: { dexador-usocket = ( build-asdf-system { pname = "dexador-usocket"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "dexador-usocket" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/dexador/2024-10-12/dexador-20241012-git.tgz"; - sha256 = "19y95k821665vcy7gbxhh4rqwk7fh4brv1sgkaykncpw2l2lll5r"; + url = "https://beta.quicklisp.org/archive/dexador/2026-01-01/dexador-20260101-git.tgz"; + sha256 = "079689l56jmvbfx8kpiqlgivsh0cc5a81kaj04nbq2s21407xjbi"; system = "dexador-usocket"; asd = "dexador-usocket"; } @@ -48687,12 +48722,12 @@ lib.makeScope pkgs.newScope (self: { dfio = ( build-asdf-system { pname = "dfio"; - version = "20221106-git"; + version = "20260101-git"; asds = [ "dfio" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/dfio/2022-11-06/dfio-20221106-git.tgz"; - sha256 = "1p53r7773939jnap518xp4b4wfvc1kbrz9jp6yd40xq0jpf9pbqg"; + url = "https://beta.quicklisp.org/archive/dfio/2026-01-01/dfio-20260101-git.tgz"; + sha256 = "0b68anf0zwjfysw4273n4p8bn0di3f18kwyq2n2101jrmaszi2mb"; system = "dfio"; asd = "dfio"; } @@ -48734,29 +48769,6 @@ lib.makeScope pkgs.newScope (self: { }; } ); - diff-match-patch = ( - build-asdf-system { - pname = "diff-match-patch"; - version = "20210531-git"; - asds = [ "diff-match-patch" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "diff-match-patch" ]; - lispLibs = [ - (getAttr "cl-ppcre" self) - (getAttr "iterate" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); dirt = ( build-asdf-system { pname = "dirt"; @@ -48849,12 +48861,12 @@ lib.makeScope pkgs.newScope (self: { dissect = ( build-asdf-system { pname = "dissect"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "dissect" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/dissect/2024-10-12/dissect-20241012-git.tgz"; - sha256 = "1ym1zggwrj15l7y2mcz5l2gfk68prqxhdswffd9s5014pa6zyysr"; + url = "https://beta.quicklisp.org/archive/dissect/2026-01-01/dissect-20260101-git.tgz"; + sha256 = "00m90l4bh6gnbqwqj0b697n3n2kll8kdjgl526wypn9vsj02sqjm"; system = "dissect"; asd = "dissect"; } @@ -48896,12 +48908,12 @@ lib.makeScope pkgs.newScope (self: { djula = ( build-asdf-system { pname = "djula"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "djula" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/djula/2025-06-22/djula-20250622-git.tgz"; - sha256 = "07pwb5cg3a978xzsvsqrsd9r1w0spfx3379wim4bn7fb1d417s9a"; + url = "https://beta.quicklisp.org/archive/djula/2026-01-01/djula-20260101-git.tgz"; + sha256 = "1cklgxzxilx3hmcbfxgb9m52ay6ngg0v67afky5qz80v5x2xfki4"; system = "djula"; asd = "djula"; } @@ -48928,12 +48940,12 @@ lib.makeScope pkgs.newScope (self: { djula-demo = ( build-asdf-system { pname = "djula-demo"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "djula-demo" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/djula/2025-06-22/djula-20250622-git.tgz"; - sha256 = "07pwb5cg3a978xzsvsqrsd9r1w0spfx3379wim4bn7fb1d417s9a"; + url = "https://beta.quicklisp.org/archive/djula/2026-01-01/djula-20260101-git.tgz"; + sha256 = "1cklgxzxilx3hmcbfxgb9m52ay6ngg0v67afky5qz80v5x2xfki4"; system = "djula-demo"; asd = "djula-demo"; } @@ -48952,12 +48964,12 @@ lib.makeScope pkgs.newScope (self: { djula-gettext = ( build-asdf-system { pname = "djula-gettext"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "djula-gettext" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/djula/2025-06-22/djula-20250622-git.tgz"; - sha256 = "07pwb5cg3a978xzsvsqrsd9r1w0spfx3379wim4bn7fb1d417s9a"; + url = "https://beta.quicklisp.org/archive/djula/2026-01-01/djula-20260101-git.tgz"; + sha256 = "1cklgxzxilx3hmcbfxgb9m52ay6ngg0v67afky5qz80v5x2xfki4"; system = "djula-gettext"; asd = "djula-gettext"; } @@ -48975,12 +48987,12 @@ lib.makeScope pkgs.newScope (self: { djula-locale = ( build-asdf-system { pname = "djula-locale"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "djula-locale" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/djula/2025-06-22/djula-20250622-git.tgz"; - sha256 = "07pwb5cg3a978xzsvsqrsd9r1w0spfx3379wim4bn7fb1d417s9a"; + url = "https://beta.quicklisp.org/archive/djula/2026-01-01/djula-20260101-git.tgz"; + sha256 = "1cklgxzxilx3hmcbfxgb9m52ay6ngg0v67afky5qz80v5x2xfki4"; system = "djula-locale"; asd = "djula-locale"; } @@ -48998,12 +49010,12 @@ lib.makeScope pkgs.newScope (self: { djula-test = ( build-asdf-system { pname = "djula-test"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "djula-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/djula/2025-06-22/djula-20250622-git.tgz"; - sha256 = "07pwb5cg3a978xzsvsqrsd9r1w0spfx3379wim4bn7fb1d417s9a"; + url = "https://beta.quicklisp.org/archive/djula/2026-01-01/djula-20260101-git.tgz"; + sha256 = "1cklgxzxilx3hmcbfxgb9m52ay6ngg0v67afky5qz80v5x2xfki4"; system = "djula-test"; asd = "djula-test"; } @@ -49021,12 +49033,12 @@ lib.makeScope pkgs.newScope (self: { djula-translate = ( build-asdf-system { pname = "djula-translate"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "djula-translate" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/djula/2025-06-22/djula-20250622-git.tgz"; - sha256 = "07pwb5cg3a978xzsvsqrsd9r1w0spfx3379wim4bn7fb1d417s9a"; + url = "https://beta.quicklisp.org/archive/djula/2026-01-01/djula-20260101-git.tgz"; + sha256 = "1cklgxzxilx3hmcbfxgb9m52ay6ngg0v67afky5qz80v5x2xfki4"; system = "djula-translate"; asd = "djula-translate"; } @@ -49112,12 +49124,12 @@ lib.makeScope pkgs.newScope (self: { dns-client = ( build-asdf-system { pname = "dns-client"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "dns-client" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/dns-client/2025-06-22/dns-client-20250622-git.tgz"; - sha256 = "1ylnhnpcs25nzax2bxrnxl1kjghmnl5yy2vsi6ps3fafw6b2ras3"; + url = "https://beta.quicklisp.org/archive/dns-client/2026-01-01/dns-client-20260101-git.tgz"; + sha256 = "1k3w52k9j9sbj4vh76lxk5944lpljs4ir1765inrd3fdspvxl0fl"; system = "dns-client"; asd = "dns-client"; } @@ -49325,12 +49337,12 @@ lib.makeScope pkgs.newScope (self: { documentation-utils = ( build-asdf-system { pname = "documentation-utils"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "documentation-utils" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/documentation-utils/2025-06-22/documentation-utils-20250622-git.tgz"; - sha256 = "1rmb9m3rilj5c4cr7bn5gnx1wrksi85zizp4hr7409qzg345mg7l"; + url = "https://beta.quicklisp.org/archive/documentation-utils/2026-01-01/documentation-utils-20260101-git.tgz"; + sha256 = "0x0ckmihz19mcd0lfbd9237ky881ifgrd9hv528qli7xnv0r1kz9"; system = "documentation-utils"; asd = "documentation-utils"; } @@ -49387,12 +49399,12 @@ lib.makeScope pkgs.newScope (self: { dom = ( build-asdf-system { pname = "dom"; - version = "master-5a621564-git"; + version = "master-bfa9fc5c-git"; asds = [ "dom" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; - sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; + url = "https://beta.quicklisp.org/archive/gendl/2026-01-01/gendl-master-bfa9fc5c-git.tgz"; + sha256 = "1hbbflaiplf4qxqlc5bqi28xh419lijrz4rvz18maqiavg059bfk"; system = "dom"; asd = "dom"; } @@ -49643,12 +49655,12 @@ lib.makeScope pkgs.newScope (self: { dref = ( build-asdf-system { pname = "dref"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "dref" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz"; - sha256 = "09wcwil8jyxm34cs7x1i3vclj84n6gxzxp21k0d23129c9adhi66"; + url = "https://beta.quicklisp.org/archive/mgl-pax/2026-01-01/mgl-pax-20260101-git.tgz"; + sha256 = "0avgalak566pzcdpnzvvhz4nqbwjp98xw5jvglvgbbxifs8x8azr"; system = "dref"; asd = "dref"; } @@ -49669,12 +49681,12 @@ lib.makeScope pkgs.newScope (self: { dref-test = ( build-asdf-system { pname = "dref-test"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "dref-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz"; - sha256 = "09wcwil8jyxm34cs7x1i3vclj84n6gxzxp21k0d23129c9adhi66"; + url = "https://beta.quicklisp.org/archive/mgl-pax/2026-01-01/mgl-pax-20260101-git.tgz"; + sha256 = "0avgalak566pzcdpnzvvhz4nqbwjp98xw5jvglvgbbxifs8x8azr"; system = "dref-test"; asd = "dref-test"; } @@ -49696,12 +49708,12 @@ lib.makeScope pkgs.newScope (self: { dref-test-package-inferred = ( build-asdf-system { pname = "dref-test-package-inferred"; - version = "20250622-git"; + version = "20260101-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"; + url = "https://beta.quicklisp.org/archive/mgl-pax/2026-01-01/mgl-pax-20260101-git.tgz"; + sha256 = "0avgalak566pzcdpnzvvhz4nqbwjp98xw5jvglvgbbxifs8x8azr"; system = "dref-test-package-inferred"; asd = "dref-test-package-inferred"; } @@ -49716,12 +49728,12 @@ lib.makeScope pkgs.newScope (self: { drei-mcclim = ( build-asdf-system { pname = "drei-mcclim"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "drei-mcclim" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "drei-mcclim"; asd = "drei-mcclim"; } @@ -49740,58 +49752,38 @@ lib.makeScope pkgs.newScope (self: { }; } ); - dso-lex = ( + dual-numbers = ( build-asdf-system { - pname = "dso-lex"; - version = "0.3.2"; - asds = [ "dso-lex" ]; + pname = "dual-numbers"; + version = "20260101-git"; + asds = [ "dual-numbers" ]; src = ( createAsd { - 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"; + url = "https://beta.quicklisp.org/archive/dual-numbers/2026-01-01/dual-numbers-20260101-git.tgz"; + sha256 = "02iqah8f3pylvl6cqzi57a7qg4kzk0kyi3yglqafkfy5rf79wi4s"; + system = "dual-numbers"; + asd = "dual-numbers"; } ); - systems = [ "dso-lex" ]; + systems = [ "dual-numbers" ]; lispLibs = [ - (getAttr "cl-ppcre" self) - (getAttr "dso-util" self) + (getAttr "alexandria" self) + (getAttr "generic-arithmetic" self) ]; meta = { hydraPlatforms = [ ]; }; } ); - dso-util = ( - build-asdf-system { - pname = "dso-util"; - version = "0.1.2"; - asds = [ "dso-util" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "dso-util" ]; - lispLibs = [ (getAttr "cl-ppcre" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); duckdb = ( build-asdf-system { pname = "duckdb"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "duckdb" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-duckdb/2025-06-22/cl-duckdb-20250622-git.tgz"; - sha256 = "13l74slzsd6vdn1ankphbrrqd4021g2d28am677xrmlm1p7nlw52"; + url = "https://beta.quicklisp.org/archive/cl-duckdb/2026-01-01/cl-duckdb-20260101-git.tgz"; + sha256 = "1075pjp6r8ps5jydwh0r2a24244axra1k20i1ldiyil814jddw6w"; system = "duckdb"; asd = "duckdb"; } @@ -50265,12 +50257,12 @@ lib.makeScope pkgs.newScope (self: { easy-audio = ( build-asdf-system { pname = "easy-audio"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "easy-audio" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/easy-audio/2025-06-22/easy-audio-20250622-git.tgz"; - sha256 = "1g8yrzrc6bv2487581hbfx1wjhf3gwvzznrfbmchqrfpx16vbmf1"; + url = "https://beta.quicklisp.org/archive/easy-audio/2026-01-01/easy-audio-20260101-git.tgz"; + sha256 = "195qgsm7j3yw1w94nhb7c4ilwl5pqr9bak0g4hm3zv2hhb971ppb"; system = "easy-audio"; asd = "easy-audio"; } @@ -50331,12 +50323,12 @@ lib.makeScope pkgs.newScope (self: { easy-routes = ( build-asdf-system { pname = "easy-routes"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "easy-routes" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/easy-routes/2025-06-22/easy-routes-20250622-git.tgz"; - sha256 = "0mw5w1gcss15b3wz1n9g7pd30a6d2w2xssfiznx3a61n7h7prb93"; + url = "https://beta.quicklisp.org/archive/easy-routes/2026-01-01/easy-routes-20260101-git.tgz"; + sha256 = "1a6wghxds765104c8fqybhgakznj6qcwp5zczlanbksk3gzhhckc"; system = "easy-routes"; asd = "easy-routes"; } @@ -50354,12 +50346,12 @@ lib.makeScope pkgs.newScope (self: { easy-routes_plus_djula = ( build-asdf-system { pname = "easy-routes+djula"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "easy-routes+djula" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/easy-routes/2025-06-22/easy-routes-20250622-git.tgz"; - sha256 = "0mw5w1gcss15b3wz1n9g7pd30a6d2w2xssfiznx3a61n7h7prb93"; + url = "https://beta.quicklisp.org/archive/easy-routes/2026-01-01/easy-routes-20260101-git.tgz"; + sha256 = "1a6wghxds765104c8fqybhgakznj6qcwp5zczlanbksk3gzhhckc"; system = "easy-routes+djula"; asd = "easy-routes+djula"; } @@ -50377,12 +50369,12 @@ lib.makeScope pkgs.newScope (self: { easy-routes_plus_errors = ( build-asdf-system { pname = "easy-routes+errors"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "easy-routes+errors" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/easy-routes/2025-06-22/easy-routes-20250622-git.tgz"; - sha256 = "0mw5w1gcss15b3wz1n9g7pd30a6d2w2xssfiznx3a61n7h7prb93"; + url = "https://beta.quicklisp.org/archive/easy-routes/2026-01-01/easy-routes-20260101-git.tgz"; + sha256 = "1a6wghxds765104c8fqybhgakznj6qcwp5zczlanbksk3gzhhckc"; system = "easy-routes+errors"; asd = "easy-routes+errors"; } @@ -50527,80 +50519,6 @@ lib.makeScope pkgs.newScope (self: { }; } ); - eazy-project = ( - build-asdf-system { - pname = "eazy-project"; - version = "20190710-git"; - asds = [ "eazy-project" ]; - src = ( - createAsd { - url = "https://beta.quicklisp.org/archive/eazy-project/2019-07-10/eazy-project-20190710-git.tgz"; - sha256 = "1dfzvsvzdwcfvynvik9kwhgil9m08jx8r0vwqj7l1m2d9zm4db3b"; - system = "eazy-project"; - asd = "eazy-project"; - } - ); - systems = [ "eazy-project" ]; - lispLibs = [ - (getAttr "bordeaux-threads" self) - (getAttr "cl-emb" self) - (getAttr "cl-ppcre" self) - (getAttr "cl-syntax" self) - (getAttr "cl-syntax-annot" self) - (getAttr "introspect-environment" self) - (getAttr "iterate" self) - (getAttr "lisp-namespace" self) - (getAttr "local-time" self) - (getAttr "trivia" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - eazy-project_dot_autoload = ( - build-asdf-system { - pname = "eazy-project.autoload"; - version = "20190710-git"; - asds = [ "eazy-project.autoload" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "eazy-project.autoload" ]; - lispLibs = [ (getAttr "eazy-project" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - eazy-project_dot_test = ( - build-asdf-system { - pname = "eazy-project.test"; - version = "20190710-git"; - asds = [ "eazy-project.test" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "eazy-project.test" ]; - lispLibs = [ - (getAttr "eazy-project" self) - (getAttr "fiveam" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); ec2 = ( build-asdf-system { pname = "ec2"; @@ -50738,12 +50656,12 @@ lib.makeScope pkgs.newScope (self: { eclector = ( build-asdf-system { pname = "eclector"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "eclector" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/eclector/2025-06-22/eclector-20250622-git.tgz"; - sha256 = "16yhh2zb9616zk1dsw2qbngq8pz2hhgq82habz8x3rg0sxwwnw8v"; + url = "https://beta.quicklisp.org/archive/eclector/2026-01-01/eclector-20260101-git.tgz"; + sha256 = "11ckdal65b0xr25j54lskmf54n3lsrdfjvi0wxnxz9znmi2bpjiq"; system = "eclector"; asd = "eclector"; } @@ -50762,12 +50680,12 @@ lib.makeScope pkgs.newScope (self: { eclector-concrete-syntax-tree = ( build-asdf-system { pname = "eclector-concrete-syntax-tree"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "eclector-concrete-syntax-tree" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/eclector/2025-06-22/eclector-20250622-git.tgz"; - sha256 = "16yhh2zb9616zk1dsw2qbngq8pz2hhgq82habz8x3rg0sxwwnw8v"; + url = "https://beta.quicklisp.org/archive/eclector/2026-01-01/eclector-20260101-git.tgz"; + sha256 = "11ckdal65b0xr25j54lskmf54n3lsrdfjvi0wxnxz9znmi2bpjiq"; system = "eclector-concrete-syntax-tree"; asd = "eclector-concrete-syntax-tree"; } @@ -50786,12 +50704,12 @@ lib.makeScope pkgs.newScope (self: { eclector_dot_syntax-extensions = ( build-asdf-system { pname = "eclector.syntax-extensions"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "eclector.syntax-extensions" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/eclector/2025-06-22/eclector-20250622-git.tgz"; - sha256 = "16yhh2zb9616zk1dsw2qbngq8pz2hhgq82habz8x3rg0sxwwnw8v"; + url = "https://beta.quicklisp.org/archive/eclector/2026-01-01/eclector-20260101-git.tgz"; + sha256 = "11ckdal65b0xr25j54lskmf54n3lsrdfjvi0wxnxz9znmi2bpjiq"; system = "eclector.syntax-extensions"; asd = "eclector.syntax-extensions"; } @@ -51029,12 +50947,12 @@ lib.makeScope pkgs.newScope (self: { enchant = ( build-asdf-system { pname = "enchant"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "enchant" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-enchant/2024-10-12/cl-enchant-20241012-git.tgz"; - sha256 = "1fcxyb9b8g0v2il2q4xj7z19y1qfxvgd34zax8sdjvl4rp66b08v"; + url = "https://beta.quicklisp.org/archive/cl-enchant/2026-01-01/cl-enchant-20260101-git.tgz"; + sha256 = "0a6gvj2gnb680pg0372dxj0bydnax08jf4adk9iybhidvjvihqxz"; system = "enchant"; asd = "enchant"; } @@ -51358,12 +51276,12 @@ lib.makeScope pkgs.newScope (self: { enumerations = ( build-asdf-system { pname = "enumerations"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "enumerations" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-enumeration/2025-06-22/cl-enumeration-20250622-git.tgz"; - sha256 = "1ldidii8a9qrl5l43cxx23x2nm9nqhrc259nq623qfxzakxdwlwz"; + url = "https://beta.quicklisp.org/archive/cl-enumeration/2026-01-01/cl-enumeration-20260101-git.tgz"; + sha256 = "0y3mdv5nd7avnm1bhd2f6z03mi93d2qj55psqy9g2klzggzjj154"; system = "enumerations"; asd = "enumerations"; } @@ -51748,12 +51666,12 @@ lib.makeScope pkgs.newScope (self: { esa-mcclim = ( build-asdf-system { pname = "esa-mcclim"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "esa-mcclim" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "esa-mcclim"; asd = "esa-mcclim"; } @@ -51814,12 +51732,12 @@ lib.makeScope pkgs.newScope (self: { esrap = ( build-asdf-system { pname = "esrap"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "esrap" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/esrap/2025-06-22/esrap-20250622-git.tgz"; - sha256 = "0c5w5sbd43apcxj57w88v7pmyf9cavynham4jz5asbx9g72clfv4"; + url = "https://beta.quicklisp.org/archive/esrap/2026-01-01/esrap-20260101-git.tgz"; + sha256 = "0nd1g4gwv12g196x6p2k9zzil0rp9r8qc247bassyn8nfm2ycv6d"; system = "esrap"; asd = "esrap"; } @@ -52278,12 +52196,12 @@ lib.makeScope pkgs.newScope (self: { expanders = ( build-asdf-system { pname = "expanders"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "expanders" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/expanders/2025-06-22/expanders-20250622-git.tgz"; - sha256 = "0lgx5r82l4mxw616xz3s02awq5miga9mb86s7yz8amfx20601qld"; + url = "https://beta.quicklisp.org/archive/expanders/2026-01-01/expanders-20260101-git.tgz"; + sha256 = "1sq52wnw14zwgz7dndx582fqyqiv07y8za27zcl99navk6ny1i2a"; system = "expanders"; asd = "expanders"; } @@ -52497,12 +52415,12 @@ lib.makeScope pkgs.newScope (self: { f2cl = ( build-asdf-system { pname = "f2cl"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "f2cl" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; - sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; + url = "https://beta.quicklisp.org/archive/f2cl/2026-01-01/f2cl-20260101-git.tgz"; + sha256 = "025hdyvyk9il71aya05sma13m3x9yxcj7g3sadpzck55manbpfnm"; system = "f2cl"; asd = "f2cl"; } @@ -52517,12 +52435,12 @@ lib.makeScope pkgs.newScope (self: { f2cl-asdf = ( build-asdf-system { pname = "f2cl-asdf"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "f2cl-asdf" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; - sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; + url = "https://beta.quicklisp.org/archive/f2cl/2026-01-01/f2cl-20260101-git.tgz"; + sha256 = "025hdyvyk9il71aya05sma13m3x9yxcj7g3sadpzck55manbpfnm"; system = "f2cl-asdf"; asd = "f2cl-asdf"; } @@ -53052,12 +52970,12 @@ lib.makeScope pkgs.newScope (self: { feeder = ( build-asdf-system { pname = "feeder"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "feeder" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/feeder/2023-10-21/feeder-20231021-git.tgz"; - sha256 = "00j3s98lbh6h2p007s7x48rw0ckd3c1apfwb28y89jxnwqk7sng7"; + url = "https://beta.quicklisp.org/archive/feeder/2026-01-01/feeder-20260101-git.tgz"; + sha256 = "1rhwihl29iyql48bzi5592fjwrv6173sc5sxqppbjwb6kkd86mna"; system = "feeder"; asd = "feeder"; } @@ -53065,6 +52983,7 @@ lib.makeScope pkgs.newScope (self: { systems = [ "feeder" ]; lispLibs = [ (getAttr "documentation-utils" self) + (getAttr "fuzzy-dates" self) (getAttr "local-time" self) (getAttr "plump" self) ]; @@ -53269,12 +53188,12 @@ lib.makeScope pkgs.newScope (self: { fftpack5 = ( build-asdf-system { pname = "fftpack5"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "fftpack5" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; - sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; + url = "https://beta.quicklisp.org/archive/f2cl/2026-01-01/f2cl-20260101-git.tgz"; + sha256 = "025hdyvyk9il71aya05sma13m3x9yxcj7g3sadpzck55manbpfnm"; system = "fftpack5"; asd = "fftpack5"; } @@ -53286,26 +53205,6 @@ lib.makeScope pkgs.newScope (self: { }; } ); - fftpack5-double = ( - build-asdf-system { - pname = "fftpack5-double"; - version = "20231021-git"; - asds = [ "fftpack5-double" ]; - src = ( - createAsd { - url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; - sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; - system = "fftpack5-double"; - asd = "fftpack5-double"; - } - ); - systems = [ "fftpack5-double" ]; - lispLibs = [ (getAttr "f2cl" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); fiasco = ( build-asdf-system { pname = "fiasco"; @@ -53350,12 +53249,12 @@ lib.makeScope pkgs.newScope (self: { file-attributes = ( build-asdf-system { pname = "file-attributes"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "file-attributes" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/file-attributes/2024-10-12/file-attributes-20241012-git.tgz"; - sha256 = "14jimsmwcp8bygm2f0fjmjv0ncc5yxl7pvh04x0kw6gs1mc7rc9x"; + url = "https://beta.quicklisp.org/archive/file-attributes/2026-01-01/file-attributes-20260101-git.tgz"; + sha256 = "0cq9k2wb10pin962w1grrf09lzwi3512f0r8m1svfwdyndnhspc5"; system = "file-attributes"; asd = "file-attributes"; } @@ -53372,12 +53271,12 @@ lib.makeScope pkgs.newScope (self: { file-finder = ( build-asdf-system { pname = "file-finder"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "file-finder" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/file-finder/2025-06-22/file-finder-20250622-git.tgz"; - sha256 = "05mbr6a2wy67swkpsmmyxw9vzlmj5117zjmmhqxls42kx4bsyl88"; + url = "https://beta.quicklisp.org/archive/file-finder/2026-01-01/file-finder-20260101-git.tgz"; + sha256 = "0mk7f0khk5jbr2fdpf91654kld2847yd91gmhq0czz8b4yrdi23z"; system = "file-finder"; asd = "file-finder"; } @@ -53446,12 +53345,12 @@ lib.makeScope pkgs.newScope (self: { file-lock = ( build-asdf-system { pname = "file-lock"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "file-lock" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/file-lock/2023-10-21/file-lock-20231021-git.tgz"; - sha256 = "0n2mn931h83dh2diifsghc78agsz4savlfv5dr9pfmpk16vkwi5b"; + url = "https://beta.quicklisp.org/archive/file-lock/2026-01-01/file-lock-20260101-git.tgz"; + sha256 = "0vrdsmk40wy11af0s1a0zkc33f0lni21m246qgb1f3jlfiqdln1p"; system = "file-lock"; asd = "file-lock"; } @@ -53470,12 +53369,12 @@ lib.makeScope pkgs.newScope (self: { file-notify = ( build-asdf-system { pname = "file-notify"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "file-notify" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/file-notify/2025-06-22/file-notify-20250622-git.tgz"; - sha256 = "1crwybqih0x43z12irbaz338k2y709igq69vghqi1rqw953i1l44"; + url = "https://beta.quicklisp.org/archive/file-notify/2026-01-01/file-notify-20260101-git.tgz"; + sha256 = "124grfff5xdk0llivnvirvh7fg3px7hvw16ch0kkk3rl3spchzrp"; system = "file-notify"; asd = "file-notify"; } @@ -53494,12 +53393,12 @@ lib.makeScope pkgs.newScope (self: { file-select = ( build-asdf-system { pname = "file-select"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "file-select" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/file-select/2025-06-22/file-select-20250622-git.tgz"; - sha256 = "17afb2p707l9nqmnl83zshayi4vvv9nvyfmxiippal3izz5k9mqq"; + url = "https://beta.quicklisp.org/archive/file-select/2026-01-01/file-select-20260101-git.tgz"; + sha256 = "0adjaa9bd86j5and1m9rzyjbsyydkzm0hg9dns5l888zyh4gsanl"; system = "file-select"; asd = "file-select"; } @@ -53540,12 +53439,12 @@ lib.makeScope pkgs.newScope (self: { filesystem-utils = ( build-asdf-system { pname = "filesystem-utils"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "filesystem-utils" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/filesystem-utils/2025-06-22/filesystem-utils-20250622-git.tgz"; - sha256 = "0ylf7csp7v2i1br654j945ns6capxb75p078vxiga5gkhhlxql5h"; + url = "https://beta.quicklisp.org/archive/filesystem-utils/2026-01-01/filesystem-utils-20260101-git.tgz"; + sha256 = "0cd226vdf7f1xz02f1fl71mv80df6k58qd5g0wwaxs6dvjxliymg"; system = "filesystem-utils"; asd = "filesystem-utils"; } @@ -53565,12 +53464,12 @@ lib.makeScope pkgs.newScope (self: { filesystem-utils-test = ( build-asdf-system { pname = "filesystem-utils-test"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "filesystem-utils-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/filesystem-utils/2025-06-22/filesystem-utils-20250622-git.tgz"; - sha256 = "0ylf7csp7v2i1br654j945ns6capxb75p078vxiga5gkhhlxql5h"; + url = "https://beta.quicklisp.org/archive/filesystem-utils/2026-01-01/filesystem-utils-20260101-git.tgz"; + sha256 = "0cd226vdf7f1xz02f1fl71mv80df6k58qd5g0wwaxs6dvjxliymg"; system = "filesystem-utils-test"; asd = "filesystem-utils-test"; } @@ -53782,12 +53681,12 @@ lib.makeScope pkgs.newScope (self: { fishpack = ( build-asdf-system { pname = "fishpack"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "fishpack" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; - sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; + url = "https://beta.quicklisp.org/archive/f2cl/2026-01-01/f2cl-20260101-git.tgz"; + sha256 = "025hdyvyk9il71aya05sma13m3x9yxcj7g3sadpzck55manbpfnm"; system = "fishpack"; asd = "fishpack"; } @@ -53911,12 +53810,12 @@ lib.makeScope pkgs.newScope (self: { flare = ( build-asdf-system { pname = "flare"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "flare" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/flare/2025-06-22/flare-20250622-git.tgz"; - sha256 = "11cdianshkq9mh0g83zb44b8iikp6qslgf8rqpny81m4x2x3mpjr"; + url = "https://beta.quicklisp.org/archive/flare/2026-01-01/flare-20260101-git.tgz"; + sha256 = "0n1knd2fg8gc3fqvz13k2gsf266ii7mpn8brsqyixfnlwx3nkwpi"; system = "flare"; asd = "flare"; } @@ -54036,12 +53935,12 @@ lib.makeScope pkgs.newScope (self: { float-features = ( build-asdf-system { pname = "float-features"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "float-features" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/float-features/2025-06-22/float-features-20250622-git.tgz"; - sha256 = "1i6apsg595hzyymvn0gz04xg58qxw8rx1fyc093arbakywjfcqas"; + url = "https://beta.quicklisp.org/archive/float-features/2026-01-01/float-features-20260101-git.tgz"; + sha256 = "0lbkml86q5ahd9hhh4i2xm7axdqfchqzjmj22q60cr73sw6673fw"; system = "float-features"; asd = "float-features"; } @@ -54057,12 +53956,12 @@ lib.makeScope pkgs.newScope (self: { float-features-tests = ( build-asdf-system { pname = "float-features-tests"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "float-features-tests" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/float-features/2025-06-22/float-features-20250622-git.tgz"; - sha256 = "1i6apsg595hzyymvn0gz04xg58qxw8rx1fyc093arbakywjfcqas"; + url = "https://beta.quicklisp.org/archive/float-features/2026-01-01/float-features-20260101-git.tgz"; + sha256 = "0lbkml86q5ahd9hhh4i2xm7axdqfchqzjmj22q60cr73sw6673fw"; system = "float-features-tests"; asd = "float-features-tests"; } @@ -54143,12 +54042,12 @@ lib.makeScope pkgs.newScope (self: { flow = ( build-asdf-system { pname = "flow"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "flow" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/flow/2025-06-22/flow-20250622-git.tgz"; - sha256 = "1x4mvqw8236pipdbbkbmj5szm725qwvbwlq8vzi8qmaks7l20q5i"; + url = "https://beta.quicklisp.org/archive/flow/2026-01-01/flow-20260101-git.tgz"; + sha256 = "03amb8n7rvi59mk3xr10n7wwpqcfbsib097hc6dcz4vicdmhh049"; system = "flow"; asd = "flow"; } @@ -54211,12 +54110,12 @@ lib.makeScope pkgs.newScope (self: { flx = ( build-asdf-system { pname = "flx"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "flx" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-flx/2025-06-22/cl-flx-20250622-git.tgz"; - sha256 = "0s7cmsjzsnvq1h4q4p7v8hkyavhrmv1mam2v9nrihzsgzx0yddb3"; + url = "https://beta.quicklisp.org/archive/cl-flx/2026-01-01/cl-flx-20260101-git.tgz"; + sha256 = "19wlgmd3swg5b2jp8x4gb53kcpl6np7kd8vma9hlbh6486bzya3p"; system = "flx"; asd = "flx"; } @@ -54406,6 +54305,26 @@ lib.makeScope pkgs.newScope (self: { }; } ); + fold = ( + build-asdf-system { + pname = "fold"; + version = "20260101-git"; + asds = [ "fold" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/fold/2026-01-01/fold-20260101-git.tgz"; + sha256 = "1wvmza7066v35fjfhdi7pjcwzb5plms7i5yjrrzc323rwpv38f1c"; + system = "fold"; + asd = "fold"; + } + ); + systems = [ "fold" ]; + lispLibs = [ ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); folio = ( build-asdf-system { pname = "folio"; @@ -55085,12 +55004,12 @@ lib.makeScope pkgs.newScope (self: { font-discovery = ( build-asdf-system { pname = "font-discovery"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "font-discovery" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/font-discovery/2025-06-22/font-discovery-20250622-git.tgz"; - sha256 = "0bfhd417kz73y1q38xn3j1k9j49lzng0j11x03jwlmjm6k8331vj"; + url = "https://beta.quicklisp.org/archive/font-discovery/2026-01-01/font-discovery-20260101-git.tgz"; + sha256 = "1yhgngg2i1fhmps3d18lg0c8sxjldq7jz05r68qw9lx1jm45hf03"; system = "font-discovery"; asd = "font-discovery"; } @@ -55132,12 +55051,12 @@ lib.makeScope pkgs.newScope (self: { for = ( build-asdf-system { pname = "for"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "for" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/for/2025-06-22/for-20250622-git.tgz"; - sha256 = "01n60r7wsdkbdr2prrxacjyx4klijgj5363rsdh0lfq32j0r078z"; + url = "https://beta.quicklisp.org/archive/for/2026-01-01/for-20260101-git.tgz"; + sha256 = "1qf58gj0yy26wyzj0xg2whpl1xllh1a4nrr1cf4rc95xk78j0z0b"; system = "for"; asd = "for"; } @@ -55204,12 +55123,12 @@ lib.makeScope pkgs.newScope (self: { form-fiddle = ( build-asdf-system { pname = "form-fiddle"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "form-fiddle" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/form-fiddle/2025-06-22/form-fiddle-20250622-git.tgz"; - sha256 = "0hg58xq2dbcdk31rfnwqc6h7krm6fmww103yzfbkg7cg7f3w7p51"; + url = "https://beta.quicklisp.org/archive/form-fiddle/2026-01-01/form-fiddle-20260101-git.tgz"; + sha256 = "02j75fwn4kncnhrsv4jwhp1bv5yqxdl0vhn9n24h46v9bfpgcb98"; system = "form-fiddle"; asd = "form-fiddle"; } @@ -55219,15 +55138,35 @@ lib.makeScope pkgs.newScope (self: { meta = { }; } ); + format-seconds = ( + build-asdf-system { + pname = "format-seconds"; + version = "production-21016ebe-git"; + asds = [ "format-seconds" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/format-seconds/2026-01-01/format-seconds-production-21016ebe-git.tgz"; + sha256 = "018k4i89n1mzjqcr68i44y4m3wvxw9d5bg7ymgprsz738dwc41mi"; + system = "format-seconds"; + asd = "format-seconds"; + } + ); + systems = [ "format-seconds" ]; + lispLibs = [ (getAttr "cl-ppcre" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); format-seconds-tests = ( build-asdf-system { pname = "format-seconds-tests"; - version = "production-e6b26811-git"; + version = "production-21016ebe-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"; + url = "https://beta.quicklisp.org/archive/format-seconds/2026-01-01/format-seconds-production-21016ebe-git.tgz"; + sha256 = "018k4i89n1mzjqcr68i44y4m3wvxw9d5bg7ymgprsz738dwc41mi"; system = "format-seconds-tests"; asd = "format-seconds-tests"; } @@ -55235,7 +55174,7 @@ lib.makeScope pkgs.newScope (self: { systems = [ "format-seconds-tests" ]; lispLibs = [ (getAttr "fiveam" self) - (getAttr "literate-lisp" self) + (getAttr "format-seconds" self) ]; meta = { hydraPlatforms = [ ]; @@ -55319,12 +55258,12 @@ lib.makeScope pkgs.newScope (self: { fprog = ( build-asdf-system { pname = "fprog"; - version = "20181210-git"; + version = "20260101-git"; asds = [ "fprog" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cambl/2018-12-10/cambl-20181210-git.tgz"; - sha256 = "103mry04j2k9vznsxm7wcvccgxkil92cdrv52miwcmxl8daa4jiz"; + url = "https://beta.quicklisp.org/archive/cambl/2026-01-01/cambl-20260101-git.tgz"; + sha256 = "1jp0i0pwdvzg689wx2rhm2ajm4w8b55rw6q6jas3498myy2gif4d"; system = "fprog"; asd = "fprog"; } @@ -55481,11 +55420,11 @@ lib.makeScope pkgs.newScope (self: { frpc = ( build-asdf-system { pname = "frpc"; - version = "20151031-git"; + version = "20260101-git"; asds = [ "frpc" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/frpc/2015-10-31/frpc-20151031-git.tgz"; + url = "https://beta.quicklisp.org/archive/frpc/2026-01-01/frpc-20260101-git.tgz"; sha256 = "0yac1q79kw1w1qd7zjgg912n780v318n2drzdimlv5n3bwd6pm2r"; system = "frpc"; asd = "frpc"; @@ -55507,37 +55446,14 @@ lib.makeScope pkgs.newScope (self: { }; } ); - frpc-des = ( - build-asdf-system { - pname = "frpc-des"; - version = "20151031-git"; - asds = [ "frpc-des" ]; - src = ( - createAsd { - url = "https://beta.quicklisp.org/archive/frpc/2015-10-31/frpc-20151031-git.tgz"; - sha256 = "0yac1q79kw1w1qd7zjgg912n780v318n2drzdimlv5n3bwd6pm2r"; - system = "frpc-des"; - asd = "frpc"; - } - ); - systems = [ "frpc-des" ]; - lispLibs = [ - (getAttr "frpc" self) - (getAttr "ironclad" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); frpc-gss = ( build-asdf-system { pname = "frpc-gss"; - version = "20151031-git"; + version = "20260101-git"; asds = [ "frpc-gss" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/frpc/2015-10-31/frpc-20151031-git.tgz"; + url = "https://beta.quicklisp.org/archive/frpc/2026-01-01/frpc-20260101-git.tgz"; sha256 = "0yac1q79kw1w1qd7zjgg912n780v318n2drzdimlv5n3bwd6pm2r"; system = "frpc-gss"; asd = "frpc"; @@ -55556,11 +55472,11 @@ lib.makeScope pkgs.newScope (self: { frpcgen = ( build-asdf-system { pname = "frpcgen"; - version = "20151031-git"; + version = "20260101-git"; asds = [ "frpcgen" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/frpc/2015-10-31/frpc-20151031-git.tgz"; + url = "https://beta.quicklisp.org/archive/frpc/2026-01-01/frpc-20260101-git.tgz"; sha256 = "0yac1q79kw1w1qd7zjgg912n780v318n2drzdimlv5n3bwd6pm2r"; system = "frpcgen"; asd = "frpcgen"; @@ -55580,11 +55496,11 @@ lib.makeScope pkgs.newScope (self: { frugal-uuid = ( build-asdf-system { pname = "frugal-uuid"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "frugal-uuid" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-frugal-uuid/2025-06-22/cl-frugal-uuid-20250622-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-frugal-uuid/2026-01-01/cl-frugal-uuid-20260101-git.tgz"; sha256 = "1naviw6qksf2zh2wsr9lqpdjfy10nfrc1pc0liz1hrq14f15lsrm"; system = "frugal-uuid"; asd = "frugal-uuid"; @@ -55623,12 +55539,12 @@ lib.makeScope pkgs.newScope (self: { fset = ( build-asdf-system { pname = "fset"; - version = "v1.4.6"; + version = "v2.2.0"; asds = [ "fset" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/fset/2025-06-22/fset-v1.4.6.tgz"; - sha256 = "1hgxs534w7x46y6pm6mjljyy4gvawfkyk2dg0qbiisgv7zj271ka"; + url = "https://beta.quicklisp.org/archive/fset/2026-01-01/fset-v2.2.0.tgz"; + sha256 = "0hfnxmmpikjijmqlnwsdw82lq4xk6ah88nv8fn3f92gl2mza745h"; system = "fset"; asd = "fset"; } @@ -55745,6 +55661,26 @@ lib.makeScope pkgs.newScope (self: { }; } ); + function = ( + build-asdf-system { + pname = "function"; + version = "20260101-git"; + asds = [ "function" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/function/2026-01-01/function-20260101-git.tgz"; + sha256 = "09v673w28svm08vv9z4jxr2vi9wm691sygvxxh23jlp2qp3370bd"; + system = "function"; + asd = "function"; + } + ); + systems = [ "function" ]; + lispLibs = [ (getAttr "fold" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); function-cache = ( build-asdf-system { pname = "function-cache"; @@ -55798,12 +55734,12 @@ lib.makeScope pkgs.newScope (self: { functional-geometry = ( build-asdf-system { pname = "functional-geometry"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "functional-geometry" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "functional-geometry"; asd = "functional-geometry"; } @@ -55818,12 +55754,12 @@ lib.makeScope pkgs.newScope (self: { functional-trees = ( build-asdf-system { pname = "functional-trees"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "functional-trees" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/functional-trees/2025-06-22/functional-trees-20250622-git.tgz"; - sha256 = "1z0z0g49jv6nvvqd5g0nyfac4h3l53n2lrszzvs3favp98z37byx"; + url = "https://beta.quicklisp.org/archive/functional-trees/2026-01-01/functional-trees-20260101-git.tgz"; + sha256 = "0x67mkp5zvy1586b9nzhw5cbmgbzimhkbz01fk0kh3rv00rq9gh3"; system = "functional-trees"; asd = "functional-trees"; } @@ -55888,12 +55824,12 @@ lib.makeScope pkgs.newScope (self: { fuzzy-dates = ( build-asdf-system { pname = "fuzzy-dates"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "fuzzy-dates" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/fuzzy-dates/2025-06-22/fuzzy-dates-20250622-git.tgz"; - sha256 = "0qaig90b91nrwgxs55c8zaah5iq72rgxw1clmjqw0iilfg5wgllr"; + url = "https://beta.quicklisp.org/archive/fuzzy-dates/2026-01-01/fuzzy-dates-20260101-git.tgz"; + sha256 = "1hyipcc6yl3bcnzwvw5x8qv82wyzxwdj7c1bgw6a7b16yyrb96c4"; system = "fuzzy-dates"; asd = "fuzzy-dates"; } @@ -55911,12 +55847,12 @@ lib.makeScope pkgs.newScope (self: { fuzzy-match = ( build-asdf-system { pname = "fuzzy-match"; - version = "20210124-git"; + version = "20260101-git"; asds = [ "fuzzy-match" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/fuzzy-match/2021-01-24/fuzzy-match-20210124-git.tgz"; - sha256 = "1lawndmzkl6f9sviy7ngn2s3xkc4akp8l505kvpslaz6qq0ayyqv"; + url = "https://beta.quicklisp.org/archive/fuzzy-match/2026-01-01/fuzzy-match-20260101-git.tgz"; + sha256 = "19d0dw45fmhis448myijcv41cgs35k8rdhhawzbnvdsgmxvsdrf1"; system = "fuzzy-match"; asd = "fuzzy-match"; } @@ -55934,12 +55870,12 @@ lib.makeScope pkgs.newScope (self: { fxml = ( build-asdf-system { pname = "fxml"; - version = "20210228-git"; + version = "20260101-git"; asds = [ "fxml" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/fxml/2021-02-28/fxml-20210228-git.tgz"; - sha256 = "1vxdb1cjjqi986f72bggnw1s4yzv12g4li7vn4y49b6lphshr8lm"; + url = "https://beta.quicklisp.org/archive/fxml/2026-01-01/fxml-20260101-git.tgz"; + sha256 = "1305z23jz201vdn8fnasggp2la0szkijkf949p9m30yrsnmdh974"; system = "fxml"; asd = "fxml"; } @@ -56099,12 +56035,12 @@ lib.makeScope pkgs.newScope (self: { gendl = ( build-asdf-system { pname = "gendl"; - version = "master-5a621564-git"; + version = "master-bfa9fc5c-git"; asds = [ "gendl" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; - sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; + url = "https://beta.quicklisp.org/archive/gendl/2026-01-01/gendl-master-bfa9fc5c-git.tgz"; + sha256 = "1hbbflaiplf4qxqlc5bqi28xh419lijrz4rvz18maqiavg059bfk"; system = "gendl"; asd = "gendl"; } @@ -56125,12 +56061,12 @@ lib.makeScope pkgs.newScope (self: { gendl-asdf = ( build-asdf-system { pname = "gendl-asdf"; - version = "master-5a621564-git"; + version = "master-bfa9fc5c-git"; asds = [ "gendl-asdf" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; - sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; + url = "https://beta.quicklisp.org/archive/gendl/2026-01-01/gendl-master-bfa9fc5c-git.tgz"; + sha256 = "1hbbflaiplf4qxqlc5bqi28xh419lijrz4rvz18maqiavg059bfk"; system = "gendl-asdf"; asd = "gendl-asdf"; } @@ -56145,12 +56081,12 @@ lib.makeScope pkgs.newScope (self: { general-accumulator = ( build-asdf-system { pname = "general-accumulator"; - version = "20211209-git"; + version = "20260101-git"; asds = [ "general-accumulator" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-general-accumulator/2021-12-09/cl-general-accumulator-20211209-git.tgz"; - sha256 = "14ybsk1ahgya67clspacqij1lvs5bzv07rdq60nhgqsbc6s56j9g"; + url = "https://beta.quicklisp.org/archive/cl-general-accumulator/2026-01-01/cl-general-accumulator-20260101-git.tgz"; + sha256 = "0azgyjjpv3f9syjzslh9ypq6vx1ach0y1kd0b9p3v6zk3idqgqfq"; system = "general-accumulator"; asd = "general-accumulator"; } @@ -56213,6 +56149,30 @@ lib.makeScope pkgs.newScope (self: { }; } ); + generic-arithmetic = ( + build-asdf-system { + pname = "generic-arithmetic"; + version = "20260101-git"; + asds = [ "generic-arithmetic" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/generic-arithmetic/2026-01-01/generic-arithmetic-20260101-git.tgz"; + sha256 = "01dgc9436qf6xf8k9sc7f6inb71jcld8b310s1rbf3n8y7khy73s"; + system = "generic-arithmetic"; + asd = "generic-arithmetic"; + } + ); + systems = [ "generic-arithmetic" ]; + lispLibs = [ + (getAttr "fiveam" self) + (getAttr "fold" self) + (getAttr "function" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); generic-cl = ( build-asdf-system { pname = "generic-cl"; @@ -56936,12 +56896,12 @@ lib.makeScope pkgs.newScope (self: { genhash = ( build-asdf-system { pname = "genhash"; - version = "20181210-git"; + version = "20260101-git"; asds = [ "genhash" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/genhash/2018-12-10/genhash-20181210-git.tgz"; - sha256 = "1jnk1fix1zydhy0kn3cvlp6dy0241x7v8ahq001nlr6v152z1cwk"; + url = "https://beta.quicklisp.org/archive/genhash/2026-01-01/genhash-20260101-git.tgz"; + sha256 = "049q66hc7s3gizyqpib18nsj9i41p5xfbj835ciz5232411az7gc"; system = "genhash"; asd = "genhash"; } @@ -56976,12 +56936,12 @@ lib.makeScope pkgs.newScope (self: { geom-base = ( build-asdf-system { pname = "geom-base"; - version = "master-5a621564-git"; + version = "master-bfa9fc5c-git"; asds = [ "geom-base" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; - sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; + url = "https://beta.quicklisp.org/archive/gendl/2026-01-01/gendl-master-bfa9fc5c-git.tgz"; + sha256 = "1hbbflaiplf4qxqlc5bqi28xh419lijrz4rvz18maqiavg059bfk"; system = "geom-base"; asd = "geom-base"; } @@ -57155,12 +57115,12 @@ lib.makeScope pkgs.newScope (self: { geysr = ( build-asdf-system { pname = "geysr"; - version = "master-5a621564-git"; + version = "master-bfa9fc5c-git"; asds = [ "geysr" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; - sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; + url = "https://beta.quicklisp.org/archive/gendl/2026-01-01/gendl-master-bfa9fc5c-git.tgz"; + sha256 = "1hbbflaiplf4qxqlc5bqi28xh419lijrz4rvz18maqiavg059bfk"; system = "geysr"; asd = "geysr"; } @@ -57424,12 +57384,12 @@ lib.makeScope pkgs.newScope (self: { glfw = ( build-asdf-system { pname = "glfw"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "glfw" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/glfw/2025-06-22/glfw-20250622-git.tgz"; - sha256 = "0a9s6mz92h1lhayja683gfraacpq7w1fg3y7b9brkfzdkg1nk5ik"; + url = "https://beta.quicklisp.org/archive/glfw/2026-01-01/glfw-20260101-git.tgz"; + sha256 = "0c6ad8y94iykdkkxw944rrrzaxy6vb96yz6r5hnyjdmbamvc06wz"; system = "glfw"; asd = "glfw"; } @@ -57498,12 +57458,12 @@ lib.makeScope pkgs.newScope (self: { glisp = ( build-asdf-system { pname = "glisp"; - version = "master-5a621564-git"; + version = "master-bfa9fc5c-git"; asds = [ "glisp" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; - sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; + url = "https://beta.quicklisp.org/archive/gendl/2026-01-01/gendl-master-bfa9fc5c-git.tgz"; + sha256 = "1hbbflaiplf4qxqlc5bqi28xh419lijrz4rvz18maqiavg059bfk"; system = "glisp"; asd = "glisp"; } @@ -57784,12 +57744,12 @@ lib.makeScope pkgs.newScope (self: { glsl-toolkit = ( build-asdf-system { pname = "glsl-toolkit"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "glsl-toolkit" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/glsl-toolkit/2025-06-22/glsl-toolkit-20250622-git.tgz"; - sha256 = "18vkhww1h6pdwarr3smzdzj96va6c6j7a33sf05rjkifa0bm8f4m"; + url = "https://beta.quicklisp.org/archive/glsl-toolkit/2026-01-01/glsl-toolkit-20260101-git.tgz"; + sha256 = "0xd2dg83ndkqim0ihr8kw6gw4gf4zsn9aich7xmfp9yldp30z682"; system = "glsl-toolkit"; asd = "glsl-toolkit"; } @@ -57922,12 +57882,12 @@ lib.makeScope pkgs.newScope (self: { graph = ( build-asdf-system { pname = "graph"; - version = "20220331-git"; + version = "20260101-git"; asds = [ "graph" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/graph/2022-03-31/graph-20220331-git.tgz"; - sha256 = "0m76vb0mk7rlbv9xhnix001gxik9f7vy9lspradcvzbk1rfxyyf7"; + url = "https://beta.quicklisp.org/archive/graph/2026-01-01/graph-20260101-git.tgz"; + sha256 = "14gnc0fdzn3yrv6c1synkxjb1aidyh93zwiwn8hyi408s2kkpff4"; system = "graph"; asd = "graph"; } @@ -57949,12 +57909,12 @@ lib.makeScope pkgs.newScope (self: { graphs = ( build-asdf-system { pname = "graphs"; - version = "master-5a621564-git"; + version = "master-bfa9fc5c-git"; asds = [ "graphs" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; - sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; + url = "https://beta.quicklisp.org/archive/gendl/2026-01-01/gendl-master-bfa9fc5c-git.tgz"; + sha256 = "1hbbflaiplf4qxqlc5bqi28xh419lijrz4rvz18maqiavg059bfk"; system = "graphs"; asd = "graphs"; } @@ -58204,12 +58164,12 @@ lib.makeScope pkgs.newScope (self: { grouping-stack = ( build-asdf-system { pname = "grouping-stack"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "grouping-stack" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lisa/2025-06-22/lisa-20250622-git.tgz"; - sha256 = "0m1ww61vbaxrj1jiln8f6x393i27sd604hv511bd67y6xj23qqai"; + url = "https://beta.quicklisp.org/archive/lisa/2026-01-01/lisa-20260101-git.tgz"; + sha256 = "176dy41jjbqgjx7xf71cgajlb2ivskv9kpg9wbv1klxjp7xraq9w"; system = "grouping-stack"; asd = "grouping-stack"; } @@ -58277,12 +58237,12 @@ lib.makeScope pkgs.newScope (self: { gt = ( build-asdf-system { pname = "gt"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "gt" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-utils/2024-10-12/cl-utils-20241012-git.tgz"; - sha256 = "133alv8368k9pjkvh3vsfsk50whw7si4i2i7b8z256knpb2d35gh"; + url = "https://beta.quicklisp.org/archive/cl-utils/2026-01-01/cl-utils-20260101-git.tgz"; + sha256 = "0k85d5aqj4ddpgrncma7v0fah65l59rzqbsc96z0a4r763bk1jk4"; system = "gt"; asd = "gt"; } @@ -58521,12 +58481,12 @@ lib.makeScope pkgs.newScope (self: { gwl = ( build-asdf-system { pname = "gwl"; - version = "master-5a621564-git"; + version = "master-bfa9fc5c-git"; asds = [ "gwl" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; - sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; + url = "https://beta.quicklisp.org/archive/gendl/2026-01-01/gendl-master-bfa9fc5c-git.tgz"; + sha256 = "1hbbflaiplf4qxqlc5bqi28xh419lijrz4rvz18maqiavg059bfk"; system = "gwl"; asd = "gwl"; } @@ -58549,12 +58509,12 @@ lib.makeScope pkgs.newScope (self: { gwl-graphics = ( build-asdf-system { pname = "gwl-graphics"; - version = "master-5a621564-git"; + version = "master-bfa9fc5c-git"; asds = [ "gwl-graphics" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; - sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; + url = "https://beta.quicklisp.org/archive/gendl/2026-01-01/gendl-master-bfa9fc5c-git.tgz"; + sha256 = "1hbbflaiplf4qxqlc5bqi28xh419lijrz4rvz18maqiavg059bfk"; system = "gwl-graphics"; asd = "gwl-graphics"; } @@ -58667,12 +58627,12 @@ lib.makeScope pkgs.newScope (self: { harmony = ( build-asdf-system { pname = "harmony"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "harmony" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/harmony/2025-06-22/harmony-20250622-git.tgz"; - sha256 = "1dfwwp0850qh6a0pqnia99kapcpli38k5ywx9rq9c1jj5xb5byc1"; + url = "https://beta.quicklisp.org/archive/harmony/2026-01-01/harmony-20260101-git.tgz"; + sha256 = "1h1wy598a0z96b3ch997j14fzhklsbk8s7756hi1731yy7m5xr82"; system = "harmony"; asd = "harmony"; } @@ -58916,12 +58876,12 @@ lib.makeScope pkgs.newScope (self: { helambdap = ( build-asdf-system { pname = "helambdap"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "helambdap" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/helambdap/2025-06-22/helambdap-20250622-git.tgz"; - sha256 = "0kvrajgglwf3zsfw7kafdkjwqv9y9pblmygcv1a2zvrnrgxmak1g"; + url = "https://beta.quicklisp.org/archive/helambdap/2026-01-01/helambdap-20260101-git.tgz"; + sha256 = "070svinbd7p3i5sdlpf4wnxw6fh6plp6q9dclxgady894yv363n2"; system = "helambdap"; asd = "helambdap"; } @@ -58941,12 +58901,12 @@ lib.makeScope pkgs.newScope (self: { hello-builder = ( build-asdf-system { pname = "hello-builder"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "hello-builder" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/clog/2025-06-22/clog-20250622-git.tgz"; - sha256 = "1sf2xan0fh2qqr8xgmsbmq9qcj5nkzrp3nq7gd69ssbkz9ab6qpw"; + url = "https://beta.quicklisp.org/archive/clog/2026-01-01/clog-20260101-git.tgz"; + sha256 = "0y6qfj4f7s7507cikdc6fqvhlnikb1s9mmlqd2ln21lyxh7b4dm5"; system = "hello-builder"; asd = "hello-builder"; } @@ -58961,12 +58921,12 @@ lib.makeScope pkgs.newScope (self: { hello-clog = ( build-asdf-system { pname = "hello-clog"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "hello-clog" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/clog/2025-06-22/clog-20250622-git.tgz"; - sha256 = "1sf2xan0fh2qqr8xgmsbmq9qcj5nkzrp3nq7gd69ssbkz9ab6qpw"; + url = "https://beta.quicklisp.org/archive/clog/2026-01-01/clog-20260101-git.tgz"; + sha256 = "0y6qfj4f7s7507cikdc6fqvhlnikb1s9mmlqd2ln21lyxh7b4dm5"; system = "hello-clog"; asd = "hello-clog"; } @@ -59319,12 +59279,12 @@ lib.makeScope pkgs.newScope (self: { hompack = ( build-asdf-system { pname = "hompack"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "hompack" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; - sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; + url = "https://beta.quicklisp.org/archive/f2cl/2026-01-01/f2cl-20260101-git.tgz"; + sha256 = "025hdyvyk9il71aya05sma13m3x9yxcj7g3sadpzck55manbpfnm"; system = "hompack"; asd = "hompack"; } @@ -59422,12 +59382,12 @@ lib.makeScope pkgs.newScope (self: { hsx = ( build-asdf-system { pname = "hsx"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "hsx" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/hsx/2025-06-22/hsx-20250622-git.tgz"; - sha256 = "16sb2vc0z51riaa4hm5537ns17jfbw45adj0ykifklkc36zahil2"; + url = "https://beta.quicklisp.org/archive/hsx/2026-01-01/hsx-20260101-git.tgz"; + sha256 = "1677ny8dc4ii4kb9hg3ykifi2m8wv1kd01p7bapk6471rp1jdmcv"; system = "hsx"; asd = "hsx"; } @@ -59445,12 +59405,12 @@ lib.makeScope pkgs.newScope (self: { hsx-test = ( build-asdf-system { pname = "hsx-test"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "hsx-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/hsx/2025-06-22/hsx-20250622-git.tgz"; - sha256 = "16sb2vc0z51riaa4hm5537ns17jfbw45adj0ykifklkc36zahil2"; + url = "https://beta.quicklisp.org/archive/hsx/2026-01-01/hsx-20260101-git.tgz"; + sha256 = "1677ny8dc4ii4kb9hg3ykifi2m8wv1kd01p7bapk6471rp1jdmcv"; system = "hsx-test"; asd = "hsx-test"; } @@ -59758,12 +59718,12 @@ lib.makeScope pkgs.newScope (self: { http2 = ( build-asdf-system { pname = "http2"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "http2" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/http2/2025-06-22/http2-20250622-git.tgz"; - sha256 = "0ypjgdic1a19gr0v77dh1gd8a51h2jf8gx8zm7f0rs42m09bbb7n"; + url = "https://beta.quicklisp.org/archive/http2/2026-01-01/http2-20260101-git.tgz"; + sha256 = "1adyzgg21iwpi2nsd712mf6zkf67y7n9gfr4lvl08vsxd1l2piwf"; system = "http2"; asd = "http2"; } @@ -59779,6 +59739,7 @@ lib.makeScope pkgs.newScope (self: { (getAttr "cl_plus_ssl" self) (getAttr "flexi-streams" self) (getAttr "gzip-stream" self) + (getAttr "let-over-lambda" self) (getAttr "mgl-pax" self) (getAttr "puri" self) (getAttr "trivial-gray-streams" self) @@ -59796,8 +59757,8 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.asdf" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/hu.dwim.asdf/2021-12-30/hu.dwim.asdf-stable-git.tgz"; - sha256 = "0zfwdsvcywvwzkn0a80ghi5kn1hs4iwinvi17ld58gyskf15frx9"; + url = "https://beta.quicklisp.org/archive/hu.dwim.asdf/2026-01-01/hu.dwim.asdf-stable-git.tgz"; + sha256 = "0y3w2fvsqgsy9v4pvzjhls422v6qklypphimfcyc99v7glb8356y"; system = "hu.dwim.asdf"; asd = "hu.dwim.asdf"; } @@ -59807,29 +59768,6 @@ lib.makeScope pkgs.newScope (self: { meta = { }; } ); - hu_dot_dwim_dot_asdf_dot_documentation = ( - build-asdf-system { - pname = "hu.dwim.asdf.documentation"; - version = "stable-git"; - asds = [ "hu.dwim.asdf.documentation" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "hu.dwim.asdf.documentation" ]; - lispLibs = [ - (getAttr "hu_dot_dwim_dot_asdf" self) - (getAttr "hu_dot_dwim_dot_presentation" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); hu_dot_dwim_dot_bluez = ( build-asdf-system { pname = "hu.dwim.bluez"; @@ -59859,11 +59797,11 @@ lib.makeScope pkgs.newScope (self: { hu_dot_dwim_dot_common = ( build-asdf-system { pname = "hu.dwim.common"; - version = "20150709-darcs"; + version = "stable-git"; asds = [ "hu.dwim.common" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.common-stable-git.tgz"; sha256 = "0mkhq6bqysdy09gswgxm1s50xrq7gimdyqiq84xk8vpyp2hv6hqq"; system = "hu.dwim.common"; asd = "hu.dwim.common"; @@ -59889,7 +59827,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.common-lisp" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.common-lisp-stable-git.tgz"; sha256 = "06zkdw3scnaw0d4nmsgkv7pi7sw00dikdgfgsqmbqfbz2yrsdabk"; system = "hu.dwim.common-lisp"; asd = "hu.dwim.common-lisp"; @@ -59900,62 +59838,14 @@ lib.makeScope pkgs.newScope (self: { meta = { }; } ); - hu_dot_dwim_dot_common-lisp_dot_documentation = ( - build-asdf-system { - pname = "hu.dwim.common-lisp.documentation"; - version = "stable-git"; - asds = [ "hu.dwim.common-lisp.documentation" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "hu.dwim.common-lisp.documentation" ]; - lispLibs = [ - (getAttr "hu_dot_dwim_dot_asdf" self) - (getAttr "hu_dot_dwim_dot_common-lisp" self) - (getAttr "hu_dot_dwim_dot_presentation" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - hu_dot_dwim_dot_common_dot_documentation = ( - build-asdf-system { - pname = "hu.dwim.common.documentation"; - version = "20150709-darcs"; - asds = [ "hu.dwim.common.documentation" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "hu.dwim.common.documentation" ]; - lispLibs = [ - (getAttr "hu_dot_dwim_dot_asdf" self) - (getAttr "hu_dot_dwim_dot_common" self) - (getAttr "hu_dot_dwim_dot_presentation" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); hu_dot_dwim_dot_computed-class = ( build-asdf-system { pname = "hu.dwim.computed-class"; - version = "20200427-darcs"; + version = "stable-git"; asds = [ "hu.dwim.computed-class" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.computed-class-stable-git.tgz"; sha256 = "1frr37g79x08pm7vkpyhnmzbbcgzxvz3vldm8skknpi790vxbpr1"; system = "hu.dwim.computed-class"; asd = "hu.dwim.computed-class"; @@ -59977,11 +59867,11 @@ lib.makeScope pkgs.newScope (self: { hu_dot_dwim_dot_computed-class_plus_hu_dot_dwim_dot_logger = ( build-asdf-system { pname = "hu.dwim.computed-class+hu.dwim.logger"; - version = "20200427-darcs"; + version = "stable-git"; asds = [ "hu.dwim.computed-class+hu.dwim.logger" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.computed-class-stable-git.tgz"; sha256 = "1frr37g79x08pm7vkpyhnmzbbcgzxvz3vldm8skknpi790vxbpr1"; system = "hu.dwim.computed-class+hu.dwim.logger"; asd = "hu.dwim.computed-class+hu.dwim.logger"; @@ -60001,11 +59891,11 @@ lib.makeScope pkgs.newScope (self: { hu_dot_dwim_dot_computed-class_plus_swank = ( build-asdf-system { pname = "hu.dwim.computed-class+swank"; - version = "20200427-darcs"; + version = "stable-git"; asds = [ "hu.dwim.computed-class+swank" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.computed-class-stable-git.tgz"; sha256 = "1frr37g79x08pm7vkpyhnmzbbcgzxvz3vldm8skknpi790vxbpr1"; system = "hu.dwim.computed-class+swank"; asd = "hu.dwim.computed-class+swank"; @@ -60022,38 +59912,14 @@ lib.makeScope pkgs.newScope (self: { }; } ); - hu_dot_dwim_dot_computed-class_dot_documentation = ( - build-asdf-system { - pname = "hu.dwim.computed-class.documentation"; - version = "20200427-darcs"; - asds = [ "hu.dwim.computed-class.documentation" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "hu.dwim.computed-class.documentation" ]; - lispLibs = [ - (getAttr "hu_dot_dwim_dot_asdf" self) - (getAttr "hu_dot_dwim_dot_computed-class_dot_test" self) - (getAttr "hu_dot_dwim_dot_presentation" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); hu_dot_dwim_dot_computed-class_dot_test = ( build-asdf-system { pname = "hu.dwim.computed-class.test"; - version = "20200427-darcs"; + version = "stable-git"; asds = [ "hu.dwim.computed-class.test" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.computed-class-stable-git.tgz"; sha256 = "1frr37g79x08pm7vkpyhnmzbbcgzxvz3vldm8skknpi790vxbpr1"; system = "hu.dwim.computed-class.test"; asd = "hu.dwim.computed-class.test"; @@ -60073,11 +59939,11 @@ lib.makeScope pkgs.newScope (self: { hu_dot_dwim_dot_debug = ( build-asdf-system { pname = "hu.dwim.debug"; - version = "20190107-darcs"; + version = "stable-git"; asds = [ "hu.dwim.debug" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.debug-stable-git.tgz"; sha256 = "0ad606bmrif82fyikb2hgwzh3y6nlrlsprb5yi86qwa2a2fvak4b"; system = "hu.dwim.debug"; asd = "hu.dwim.debug"; @@ -60098,38 +59964,14 @@ lib.makeScope pkgs.newScope (self: { }; } ); - hu_dot_dwim_dot_debug_dot_documentation = ( - build-asdf-system { - pname = "hu.dwim.debug.documentation"; - version = "20190107-darcs"; - asds = [ "hu.dwim.debug.documentation" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "hu.dwim.debug.documentation" ]; - lispLibs = [ - (getAttr "hu_dot_dwim_dot_asdf" self) - (getAttr "hu_dot_dwim_dot_debug_dot_test" self) - (getAttr "hu_dot_dwim_dot_presentation" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); hu_dot_dwim_dot_debug_dot_test = ( build-asdf-system { pname = "hu.dwim.debug.test"; - version = "20190107-darcs"; + version = "stable-git"; asds = [ "hu.dwim.debug.test" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.debug-stable-git.tgz"; sha256 = "0ad606bmrif82fyikb2hgwzh3y6nlrlsprb5yi86qwa2a2fvak4b"; system = "hu.dwim.debug.test"; asd = "hu.dwim.debug.test"; @@ -60153,7 +59995,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.def" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.def-stable-git.tgz"; sha256 = "1scjj9g2bn58l8i1g1brdqzrajy4bb63dqkwlcydcvk36iskpyab"; system = "hu.dwim.def"; asd = "hu.dwim.def"; @@ -60177,7 +60019,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.def+cl-l10n" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.def-stable-git.tgz"; sha256 = "1scjj9g2bn58l8i1g1brdqzrajy4bb63dqkwlcydcvk36iskpyab"; system = "hu.dwim.def+cl-l10n"; asd = "hu.dwim.def+cl-l10n"; @@ -60201,7 +60043,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.def+contextl" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.def-stable-git.tgz"; sha256 = "1scjj9g2bn58l8i1g1brdqzrajy4bb63dqkwlcydcvk36iskpyab"; system = "hu.dwim.def+contextl"; asd = "hu.dwim.def+contextl"; @@ -60225,7 +60067,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.def+hu.dwim.common" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.def-stable-git.tgz"; sha256 = "1scjj9g2bn58l8i1g1brdqzrajy4bb63dqkwlcydcvk36iskpyab"; system = "hu.dwim.def+hu.dwim.common"; asd = "hu.dwim.def+hu.dwim.common"; @@ -60249,7 +60091,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.def+hu.dwim.delico" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.def-stable-git.tgz"; sha256 = "1scjj9g2bn58l8i1g1brdqzrajy4bb63dqkwlcydcvk36iskpyab"; system = "hu.dwim.def+hu.dwim.delico"; asd = "hu.dwim.def+hu.dwim.delico"; @@ -60273,7 +60115,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.def+swank" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.def-stable-git.tgz"; sha256 = "1scjj9g2bn58l8i1g1brdqzrajy4bb63dqkwlcydcvk36iskpyab"; system = "hu.dwim.def+swank"; asd = "hu.dwim.def+swank"; @@ -60295,7 +60137,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.defclass-star" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.defclass-star-stable-git.tgz"; sha256 = "1lbmsn9s7v88w934r8rp4d59vsj1jg8p2cz9g5kl1n9vff5sxxw2"; system = "hu.dwim.defclass-star"; asd = "hu.dwim.defclass-star"; @@ -60313,7 +60155,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.defclass-star+contextl" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.defclass-star-stable-git.tgz"; sha256 = "1lbmsn9s7v88w934r8rp4d59vsj1jg8p2cz9g5kl1n9vff5sxxw2"; system = "hu.dwim.defclass-star+contextl"; asd = "hu.dwim.defclass-star+contextl"; @@ -60337,7 +60179,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.defclass-star+hu.dwim.def" ]; src = ( createAsd { - url = "https://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/2026-01-01/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"; @@ -60361,7 +60203,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.defclass-star+hu.dwim.def+contextl" ]; src = ( createAsd { - url = "https://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/2026-01-01/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"; @@ -60385,7 +60227,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.defclass-star+swank" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.defclass-star-stable-git.tgz"; sha256 = "1lbmsn9s7v88w934r8rp4d59vsj1jg8p2cz9g5kl1n9vff5sxxw2"; system = "hu.dwim.defclass-star+swank"; asd = "hu.dwim.defclass-star+swank"; @@ -60405,11 +60247,11 @@ lib.makeScope pkgs.newScope (self: { hu_dot_dwim_dot_delico = ( build-asdf-system { pname = "hu.dwim.delico"; - version = "20200925-darcs"; + version = "stable-git"; asds = [ "hu.dwim.delico" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.delico-stable-git.tgz"; sha256 = "12n5cddg7vd3y4dqjcf4wayxwj905ja8jh90ixvrhgnvs559lbnl"; system = "hu.dwim.delico"; asd = "hu.dwim.delico"; @@ -60434,7 +60276,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.graphviz" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.graphviz-stable-git.tgz"; sha256 = "0cz5g7d6817ajypp876k9m65sxxlf42x4bg04ya73aqci5s1vjwy"; system = "hu.dwim.graphviz"; asd = "hu.dwim.graphviz"; @@ -60451,30 +60293,6 @@ lib.makeScope pkgs.newScope (self: { }; } ); - hu_dot_dwim_dot_graphviz_dot_documentation = ( - build-asdf-system { - pname = "hu.dwim.graphviz.documentation"; - version = "stable-git"; - asds = [ "hu.dwim.graphviz.documentation" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "hu.dwim.graphviz.documentation" ]; - lispLibs = [ - (getAttr "hu_dot_dwim_dot_asdf" self) - (getAttr "hu_dot_dwim_dot_graphviz_dot_test" self) - (getAttr "hu_dot_dwim_dot_presentation" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); hu_dot_dwim_dot_graphviz_dot_test = ( build-asdf-system { pname = "hu.dwim.graphviz.test"; @@ -60482,7 +60300,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.graphviz.test" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.graphviz-stable-git.tgz"; sha256 = "0cz5g7d6817ajypp876k9m65sxxlf42x4bg04ya73aqci5s1vjwy"; system = "hu.dwim.graphviz.test"; asd = "hu.dwim.graphviz.test"; @@ -60507,7 +60325,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.logger" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.logger-stable-git.tgz"; sha256 = "17b7m86pggg85lczww7nvswz0nj9qg1fxwv1l9wn31jfcf061h74"; system = "hu.dwim.logger"; asd = "hu.dwim.logger"; @@ -60536,7 +60354,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.logger+iolib" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.logger-stable-git.tgz"; sha256 = "17b7m86pggg85lczww7nvswz0nj9qg1fxwv1l9wn31jfcf061h74"; system = "hu.dwim.logger+iolib"; asd = "hu.dwim.logger+iolib"; @@ -60560,7 +60378,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.logger+swank" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.logger-stable-git.tgz"; sha256 = "17b7m86pggg85lczww7nvswz0nj9qg1fxwv1l9wn31jfcf061h74"; system = "hu.dwim.logger+swank"; asd = "hu.dwim.logger+swank"; @@ -60577,30 +60395,6 @@ lib.makeScope pkgs.newScope (self: { }; } ); - hu_dot_dwim_dot_logger_dot_documentation = ( - build-asdf-system { - pname = "hu.dwim.logger.documentation"; - version = "stable-git"; - asds = [ "hu.dwim.logger.documentation" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "hu.dwim.logger.documentation" ]; - lispLibs = [ - (getAttr "hu_dot_dwim_dot_asdf" self) - (getAttr "hu_dot_dwim_dot_logger_dot_test" self) - (getAttr "hu_dot_dwim_dot_presentation" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); hu_dot_dwim_dot_logger_dot_test = ( build-asdf-system { pname = "hu.dwim.logger.test"; @@ -60608,7 +60402,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.logger.test" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.logger-stable-git.tgz"; sha256 = "17b7m86pggg85lczww7nvswz0nj9qg1fxwv1l9wn31jfcf061h74"; system = "hu.dwim.logger.test"; asd = "hu.dwim.logger.test"; @@ -60658,11 +60452,11 @@ lib.makeScope pkgs.newScope (self: { hu_dot_dwim_dot_perec = ( build-asdf-system { pname = "hu.dwim.perec"; - version = "20211209-darcs"; + version = "20260101-darcs"; asds = [ "hu.dwim.perec" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.perec-20260101-darcs.tgz"; sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; system = "hu.dwim.perec"; asd = "hu.dwim.perec"; @@ -60700,11 +60494,11 @@ lib.makeScope pkgs.newScope (self: { hu_dot_dwim_dot_perec_plus_hu_dot_dwim_dot_quasi-quote_dot_xml = ( build-asdf-system { pname = "hu.dwim.perec+hu.dwim.quasi-quote.xml"; - version = "20211209-darcs"; + version = "20260101-darcs"; asds = [ "hu.dwim.perec+hu.dwim.quasi-quote.xml" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.perec-20260101-darcs.tgz"; sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; system = "hu.dwim.perec+hu.dwim.quasi-quote.xml"; asd = "hu.dwim.perec+hu.dwim.quasi-quote.xml"; @@ -60724,11 +60518,11 @@ lib.makeScope pkgs.newScope (self: { hu_dot_dwim_dot_perec_plus_iolib = ( build-asdf-system { pname = "hu.dwim.perec+iolib"; - version = "20211209-darcs"; + version = "20260101-darcs"; asds = [ "hu.dwim.perec+iolib" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.perec-20260101-darcs.tgz"; sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; system = "hu.dwim.perec+iolib"; asd = "hu.dwim.perec+iolib"; @@ -60748,11 +60542,11 @@ lib.makeScope pkgs.newScope (self: { hu_dot_dwim_dot_perec_plus_swank = ( build-asdf-system { pname = "hu.dwim.perec+swank"; - version = "20211209-darcs"; + version = "20260101-darcs"; asds = [ "hu.dwim.perec+swank" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.perec-20260101-darcs.tgz"; sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; system = "hu.dwim.perec+swank"; asd = "hu.dwim.perec+swank"; @@ -60772,11 +60566,11 @@ lib.makeScope pkgs.newScope (self: { hu_dot_dwim_dot_perec_dot_all = ( build-asdf-system { pname = "hu.dwim.perec.all"; - version = "20211209-darcs"; + version = "20260101-darcs"; asds = [ "hu.dwim.perec.all" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.perec-20260101-darcs.tgz"; sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; system = "hu.dwim.perec.all"; asd = "hu.dwim.perec.all"; @@ -60794,63 +60588,14 @@ lib.makeScope pkgs.newScope (self: { }; } ); - hu_dot_dwim_dot_perec_dot_all_dot_test = ( - build-asdf-system { - pname = "hu.dwim.perec.all.test"; - version = "20211209-darcs"; - asds = [ "hu.dwim.perec.all.test" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "hu.dwim.perec.all.test" ]; - lispLibs = [ - (getAttr "hu_dot_dwim_dot_asdf" self) - (getAttr "hu_dot_dwim_dot_perec_dot_oracle_dot_test" self) - (getAttr "hu_dot_dwim_dot_perec_dot_postgresql_dot_test" self) - (getAttr "hu_dot_dwim_dot_perec_dot_sqlite_dot_test" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - hu_dot_dwim_dot_perec_dot_documentation = ( - build-asdf-system { - pname = "hu.dwim.perec.documentation"; - version = "20211209-darcs"; - asds = [ "hu.dwim.perec.documentation" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "hu.dwim.perec.documentation" ]; - lispLibs = [ - (getAttr "hu_dot_dwim_dot_asdf" self) - (getAttr "hu_dot_dwim_dot_perec_dot_all_dot_test" self) - (getAttr "hu_dot_dwim_dot_presentation" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); hu_dot_dwim_dot_perec_dot_oracle = ( build-asdf-system { pname = "hu.dwim.perec.oracle"; - version = "20211209-darcs"; + version = "20260101-darcs"; asds = [ "hu.dwim.perec.oracle" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.perec-20260101-darcs.tgz"; sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; system = "hu.dwim.perec.oracle"; asd = "hu.dwim.perec.oracle"; @@ -60867,38 +60612,14 @@ lib.makeScope pkgs.newScope (self: { }; } ); - hu_dot_dwim_dot_perec_dot_oracle_dot_test = ( - build-asdf-system { - pname = "hu.dwim.perec.oracle.test"; - version = "20211209-darcs"; - asds = [ "hu.dwim.perec.oracle.test" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "hu.dwim.perec.oracle.test" ]; - lispLibs = [ - (getAttr "hu_dot_dwim_dot_asdf" self) - (getAttr "hu_dot_dwim_dot_perec_dot_oracle" self) - (getAttr "hu_dot_dwim_dot_perec_dot_test" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); hu_dot_dwim_dot_perec_dot_postgresql = ( build-asdf-system { pname = "hu.dwim.perec.postgresql"; - version = "20211209-darcs"; + version = "20260101-darcs"; asds = [ "hu.dwim.perec.postgresql" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.perec-20260101-darcs.tgz"; sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; system = "hu.dwim.perec.postgresql"; asd = "hu.dwim.perec.postgresql"; @@ -60915,38 +60636,14 @@ lib.makeScope pkgs.newScope (self: { }; } ); - hu_dot_dwim_dot_perec_dot_postgresql_dot_test = ( - build-asdf-system { - pname = "hu.dwim.perec.postgresql.test"; - version = "20211209-darcs"; - asds = [ "hu.dwim.perec.postgresql.test" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "hu.dwim.perec.postgresql.test" ]; - lispLibs = [ - (getAttr "hu_dot_dwim_dot_asdf" self) - (getAttr "hu_dot_dwim_dot_perec_dot_postgresql" self) - (getAttr "hu_dot_dwim_dot_perec_dot_test" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); hu_dot_dwim_dot_perec_dot_sqlite = ( build-asdf-system { pname = "hu.dwim.perec.sqlite"; - version = "20211209-darcs"; + version = "20260101-darcs"; asds = [ "hu.dwim.perec.sqlite" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.perec-20260101-darcs.tgz"; sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; system = "hu.dwim.perec.sqlite"; asd = "hu.dwim.perec.sqlite"; @@ -60963,183 +60660,6 @@ lib.makeScope pkgs.newScope (self: { }; } ); - hu_dot_dwim_dot_perec_dot_sqlite_dot_test = ( - build-asdf-system { - pname = "hu.dwim.perec.sqlite.test"; - version = "20211209-darcs"; - asds = [ "hu.dwim.perec.sqlite.test" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "hu.dwim.perec.sqlite.test" ]; - lispLibs = [ - (getAttr "hu_dot_dwim_dot_asdf" self) - (getAttr "hu_dot_dwim_dot_perec_dot_sqlite" self) - (getAttr "hu_dot_dwim_dot_perec_dot_test" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - hu_dot_dwim_dot_perec_dot_test = ( - build-asdf-system { - pname = "hu.dwim.perec.test"; - version = "20211209-darcs"; - asds = [ "hu.dwim.perec.test" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "hu.dwim.perec.test" ]; - lispLibs = [ - (getAttr "hu_dot_dwim_dot_asdf" self) - (getAttr "hu_dot_dwim_dot_perec_plus_hu_dot_dwim_dot_quasi-quote_dot_xml" self) - (getAttr "hu_dot_dwim_dot_perec_plus_iolib" self) - (getAttr "hu_dot_dwim_dot_perec_plus_swank" self) - (getAttr "hu_dot_dwim_dot_util_dot_test" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - hu_dot_dwim_dot_presentation = ( - build-asdf-system { - pname = "hu.dwim.presentation"; - version = "20211230-darcs"; - asds = [ "hu.dwim.presentation" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "hu.dwim.presentation" ]; - lispLibs = [ - (getAttr "cl-graph_plus_hu_dot_dwim_dot_graphviz" self) - (getAttr "contextl" self) - (getAttr "hu_dot_dwim_dot_asdf" self) - (getAttr "hu_dot_dwim_dot_def_plus_contextl" self) - (getAttr "hu_dot_dwim_dot_logger" self) - (getAttr "hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def" self) - (getAttr "hu_dot_dwim_dot_util" self) - (getAttr "hu_dot_dwim_dot_web-server_dot_application" self) - (getAttr "iolib" self) - (getAttr "moptilities" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - hu_dot_dwim_dot_presentation_plus_cl-graph_plus_cl-typesetting = ( - build-asdf-system { - pname = "hu.dwim.presentation+cl-graph+cl-typesetting"; - version = "20211230-darcs"; - asds = [ "hu.dwim.presentation+cl-graph+cl-typesetting" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "hu.dwim.presentation+cl-graph+cl-typesetting" ]; - lispLibs = [ - (getAttr "cl-graph" self) - (getAttr "hu_dot_dwim_dot_asdf" self) - (getAttr "hu_dot_dwim_dot_presentation_plus_cl-typesetting" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - hu_dot_dwim_dot_presentation_plus_cl-typesetting = ( - build-asdf-system { - pname = "hu.dwim.presentation+cl-typesetting"; - version = "20211230-darcs"; - asds = [ "hu.dwim.presentation+cl-typesetting" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "hu.dwim.presentation+cl-typesetting" ]; - lispLibs = [ - (getAttr "cl-typesetting" self) - (getAttr "hu_dot_dwim_dot_asdf" self) - (getAttr "hu_dot_dwim_dot_presentation" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - hu_dot_dwim_dot_presentation_plus_hu_dot_dwim_dot_stefil = ( - build-asdf-system { - pname = "hu.dwim.presentation+hu.dwim.stefil"; - version = "20211230-darcs"; - asds = [ "hu.dwim.presentation+hu.dwim.stefil" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "hu.dwim.presentation+hu.dwim.stefil" ]; - lispLibs = [ - (getAttr "hu_dot_dwim_dot_asdf" self) - (getAttr "hu_dot_dwim_dot_presentation" self) - (getAttr "hu_dot_dwim_dot_stefil" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - hu_dot_dwim_dot_presentation_plus_hu_dot_dwim_dot_web-server = ( - build-asdf-system { - pname = "hu.dwim.presentation+hu.dwim.web-server"; - version = "20211230-darcs"; - asds = [ "hu.dwim.presentation+hu.dwim.web-server" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "hu.dwim.presentation+hu.dwim.web-server" ]; - lispLibs = [ - (getAttr "hu_dot_dwim_dot_asdf" self) - (getAttr "hu_dot_dwim_dot_presentation" self) - (getAttr "hu_dot_dwim_dot_web-server" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); hu_dot_dwim_dot_quasi-quote = ( build-asdf-system { pname = "hu.dwim.quasi-quote"; @@ -61317,11 +60837,11 @@ lib.makeScope pkgs.newScope (self: { hu_dot_dwim_dot_rdbms = ( build-asdf-system { pname = "hu.dwim.rdbms"; - version = "20201016-darcs"; + version = "20260101-darcs"; asds = [ "hu.dwim.rdbms" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.rdbms-20260101-darcs.tgz"; sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av"; system = "hu.dwim.rdbms"; asd = "hu.dwim.rdbms"; @@ -61347,11 +60867,11 @@ lib.makeScope pkgs.newScope (self: { hu_dot_dwim_dot_rdbms_dot_all = ( build-asdf-system { pname = "hu.dwim.rdbms.all"; - version = "20201016-darcs"; + version = "20260101-darcs"; asds = [ "hu.dwim.rdbms.all" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.rdbms-20260101-darcs.tgz"; sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av"; system = "hu.dwim.rdbms.all"; asd = "hu.dwim.rdbms.all"; @@ -61372,11 +60892,11 @@ lib.makeScope pkgs.newScope (self: { hu_dot_dwim_dot_rdbms_dot_all_dot_test = ( build-asdf-system { pname = "hu.dwim.rdbms.all.test"; - version = "20201016-darcs"; + version = "20260101-darcs"; asds = [ "hu.dwim.rdbms.all.test" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.rdbms-20260101-darcs.tgz"; sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av"; system = "hu.dwim.rdbms.all.test"; asd = "hu.dwim.rdbms.all.test"; @@ -61394,38 +60914,14 @@ lib.makeScope pkgs.newScope (self: { }; } ); - hu_dot_dwim_dot_rdbms_dot_documentation = ( - build-asdf-system { - pname = "hu.dwim.rdbms.documentation"; - version = "20201016-darcs"; - asds = [ "hu.dwim.rdbms.documentation" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "hu.dwim.rdbms.documentation" ]; - lispLibs = [ - (getAttr "hu_dot_dwim_dot_asdf" self) - (getAttr "hu_dot_dwim_dot_presentation" self) - (getAttr "hu_dot_dwim_dot_rdbms_dot_all_dot_test" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); hu_dot_dwim_dot_rdbms_dot_oracle = ( build-asdf-system { pname = "hu.dwim.rdbms.oracle"; - version = "20201016-darcs"; + version = "20260101-darcs"; asds = [ "hu.dwim.rdbms.oracle" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.rdbms-20260101-darcs.tgz"; sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av"; system = "hu.dwim.rdbms.oracle"; asd = "hu.dwim.rdbms.oracle"; @@ -61445,11 +60941,11 @@ lib.makeScope pkgs.newScope (self: { hu_dot_dwim_dot_rdbms_dot_oracle_dot_test = ( build-asdf-system { pname = "hu.dwim.rdbms.oracle.test"; - version = "20201016-darcs"; + version = "20260101-darcs"; asds = [ "hu.dwim.rdbms.oracle.test" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.rdbms-20260101-darcs.tgz"; sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av"; system = "hu.dwim.rdbms.oracle.test"; asd = "hu.dwim.rdbms.oracle.test"; @@ -61469,11 +60965,11 @@ lib.makeScope pkgs.newScope (self: { hu_dot_dwim_dot_rdbms_dot_postgresql = ( build-asdf-system { pname = "hu.dwim.rdbms.postgresql"; - version = "20201016-darcs"; + version = "20260101-darcs"; asds = [ "hu.dwim.rdbms.postgresql" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.rdbms-20260101-darcs.tgz"; sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av"; system = "hu.dwim.rdbms.postgresql"; asd = "hu.dwim.rdbms.postgresql"; @@ -61493,11 +60989,11 @@ lib.makeScope pkgs.newScope (self: { hu_dot_dwim_dot_rdbms_dot_postgresql_dot_test = ( build-asdf-system { pname = "hu.dwim.rdbms.postgresql.test"; - version = "20201016-darcs"; + version = "20260101-darcs"; asds = [ "hu.dwim.rdbms.postgresql.test" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.rdbms-20260101-darcs.tgz"; sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av"; system = "hu.dwim.rdbms.postgresql.test"; asd = "hu.dwim.rdbms.postgresql.test"; @@ -61517,11 +61013,11 @@ lib.makeScope pkgs.newScope (self: { hu_dot_dwim_dot_rdbms_dot_sqlite = ( build-asdf-system { pname = "hu.dwim.rdbms.sqlite"; - version = "20201016-darcs"; + version = "20260101-darcs"; asds = [ "hu.dwim.rdbms.sqlite" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.rdbms-20260101-darcs.tgz"; sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av"; system = "hu.dwim.rdbms.sqlite"; asd = "hu.dwim.rdbms.sqlite"; @@ -61541,11 +61037,11 @@ lib.makeScope pkgs.newScope (self: { hu_dot_dwim_dot_rdbms_dot_sqlite_dot_test = ( build-asdf-system { pname = "hu.dwim.rdbms.sqlite.test"; - version = "20201016-darcs"; + version = "20260101-darcs"; asds = [ "hu.dwim.rdbms.sqlite.test" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.rdbms-20260101-darcs.tgz"; sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av"; system = "hu.dwim.rdbms.sqlite.test"; asd = "hu.dwim.rdbms.sqlite.test"; @@ -61565,11 +61061,11 @@ lib.makeScope pkgs.newScope (self: { hu_dot_dwim_dot_rdbms_dot_test = ( build-asdf-system { pname = "hu.dwim.rdbms.test"; - version = "20201016-darcs"; + version = "20260101-darcs"; asds = [ "hu.dwim.rdbms.test" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.rdbms-20260101-darcs.tgz"; sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av"; system = "hu.dwim.rdbms.test"; asd = "hu.dwim.rdbms.test"; @@ -61670,11 +61166,11 @@ lib.makeScope pkgs.newScope (self: { hu_dot_dwim_dot_serializer = ( build-asdf-system { pname = "hu.dwim.serializer"; - version = "20161204-darcs"; + version = "stable-git"; asds = [ "hu.dwim.serializer" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.serializer-stable-git.tgz"; sha256 = "1c4zl2ql4w7nw8vrcrhhq45c5yhbcp4z5qpp1yxjpd3002q2lbh2"; system = "hu.dwim.serializer"; asd = "hu.dwim.serializer"; @@ -61695,38 +61191,14 @@ lib.makeScope pkgs.newScope (self: { }; } ); - hu_dot_dwim_dot_serializer_dot_documentation = ( - build-asdf-system { - pname = "hu.dwim.serializer.documentation"; - version = "20161204-darcs"; - asds = [ "hu.dwim.serializer.documentation" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "hu.dwim.serializer.documentation" ]; - lispLibs = [ - (getAttr "hu_dot_dwim_dot_asdf" self) - (getAttr "hu_dot_dwim_dot_presentation" self) - (getAttr "hu_dot_dwim_dot_serializer_dot_test" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); hu_dot_dwim_dot_serializer_dot_test = ( build-asdf-system { pname = "hu.dwim.serializer.test"; - version = "20161204-darcs"; + version = "stable-git"; asds = [ "hu.dwim.serializer.test" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.serializer-stable-git.tgz"; sha256 = "1c4zl2ql4w7nw8vrcrhhq45c5yhbcp4z5qpp1yxjpd3002q2lbh2"; system = "hu.dwim.serializer.test"; asd = "hu.dwim.serializer.test"; @@ -61835,7 +61307,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.syntax-sugar" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.syntax-sugar-stable-git.tgz"; sha256 = "1cy474di8njy4s39n7kn2w9jw39n4rssrk0fghrj0gabfxiz4wv9"; system = "hu.dwim.syntax-sugar"; asd = "hu.dwim.syntax-sugar"; @@ -61851,30 +61323,6 @@ lib.makeScope pkgs.newScope (self: { }; } ); - hu_dot_dwim_dot_syntax-sugar_dot_documentation = ( - build-asdf-system { - pname = "hu.dwim.syntax-sugar.documentation"; - version = "stable-git"; - asds = [ "hu.dwim.syntax-sugar.documentation" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "hu.dwim.syntax-sugar.documentation" ]; - lispLibs = [ - (getAttr "hu_dot_dwim_dot_asdf" self) - (getAttr "hu_dot_dwim_dot_presentation" self) - (getAttr "hu_dot_dwim_dot_syntax-sugar_dot_test" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); hu_dot_dwim_dot_syntax-sugar_dot_test = ( build-asdf-system { pname = "hu.dwim.syntax-sugar.test"; @@ -61882,7 +61330,7 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.syntax-sugar.test" ]; src = ( createAsd { - url = "https://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/2026-01-01/hu.dwim.syntax-sugar-stable-git.tgz"; sha256 = "1cy474di8njy4s39n7kn2w9jw39n4rssrk0fghrj0gabfxiz4wv9"; system = "hu.dwim.syntax-sugar.test"; asd = "hu.dwim.syntax-sugar.test"; @@ -61958,8 +61406,8 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.util" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz"; - sha256 = "01f0kvvaa94zkz5zzfaf8cbiihlp0l6627q3hmc0k154j3mdarmi"; + url = "https://beta.quicklisp.org/archive/hu.dwim.util/2026-01-01/hu.dwim.util-stable-git.tgz"; + sha256 = "1bwyxqs7adwfaj9v6zh8frs19iq0zc70j8j0vwim8v4rihw86yy5"; system = "hu.dwim.util"; asd = "hu.dwim.util"; } @@ -61983,8 +61431,8 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.util+iolib" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz"; - sha256 = "01f0kvvaa94zkz5zzfaf8cbiihlp0l6627q3hmc0k154j3mdarmi"; + url = "https://beta.quicklisp.org/archive/hu.dwim.util/2026-01-01/hu.dwim.util-stable-git.tgz"; + sha256 = "1bwyxqs7adwfaj9v6zh8frs19iq0zc70j8j0vwim8v4rihw86yy5"; system = "hu.dwim.util+iolib"; asd = "hu.dwim.util+iolib"; } @@ -62000,75 +61448,6 @@ lib.makeScope pkgs.newScope (self: { }; } ); - hu_dot_dwim_dot_util_dot_documentation = ( - build-asdf-system { - pname = "hu.dwim.util.documentation"; - version = "stable-git"; - asds = [ "hu.dwim.util.documentation" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "hu.dwim.util.documentation" ]; - lispLibs = [ - (getAttr "hu_dot_dwim_dot_asdf" self) - (getAttr "hu_dot_dwim_dot_presentation" self) - (getAttr "hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def_plus_swank" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - hu_dot_dwim_dot_util_dot_test = ( - build-asdf-system { - pname = "hu.dwim.util.test"; - version = "stable-git"; - asds = [ "hu.dwim.util.test" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "hu.dwim.util.test" ]; - lispLibs = [ - (getAttr "babel" self) - (getAttr "babel-streams" self) - (getAttr "bordeaux-threads" self) - (getAttr "cl-l10n" self) - (getAttr "cl-ppcre" self) - (getAttr "closer-mop" self) - (getAttr "command-line-arguments" self) - (getAttr "cxml" self) - (getAttr "drakma" self) - (getAttr "hu_dot_dwim_dot_asdf" self) - (getAttr "hu_dot_dwim_dot_def" self) - (getAttr "hu_dot_dwim_dot_def_plus_hu_dot_dwim_dot_common" self) - (getAttr "hu_dot_dwim_dot_defclass-star_plus_hu_dot_dwim_dot_def" self) - (getAttr "hu_dot_dwim_dot_delico" self) - (getAttr "hu_dot_dwim_dot_logger" self) - (getAttr "hu_dot_dwim_dot_perec_dot_postgresql" self) - (getAttr "hu_dot_dwim_dot_quasi-quote_dot_xml" self) - (getAttr "hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def_plus_swank" self) - (getAttr "hu_dot_dwim_dot_syntax-sugar" self) - (getAttr "hu_dot_dwim_dot_util" self) - (getAttr "hu_dot_dwim_dot_util_plus_iolib" self) - (getAttr "hu_dot_dwim_dot_web-server_dot_application" self) - (getAttr "iolib" self) - (getAttr "swank" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); hu_dot_dwim_dot_walker = ( build-asdf-system { pname = "hu.dwim.walker"; @@ -62076,8 +61455,8 @@ lib.makeScope pkgs.newScope (self: { asds = [ "hu.dwim.walker" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/hu.dwim.walker/2022-07-07/hu.dwim.walker-stable-git.tgz"; - sha256 = "0sw7z5iml82sklxjy1wr42mbp2qqml49ci36d6xsckar0sqsc8vr"; + url = "https://beta.quicklisp.org/archive/hu.dwim.walker/2026-01-01/hu.dwim.walker-stable-git.tgz"; + sha256 = "1j07m6xrbh8fyb1vzxws2c742mg2qn39m9gbhz9dg2ds88wkra7x"; system = "hu.dwim.walker"; asd = "hu.dwim.walker"; } @@ -62099,222 +61478,6 @@ lib.makeScope pkgs.newScope (self: { }; } ); - hu_dot_dwim_dot_web-server = ( - build-asdf-system { - pname = "hu.dwim.web-server"; - version = "20220707-darcs"; - asds = [ "hu.dwim.web-server" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "hu.dwim.web-server" ]; - lispLibs = [ - (getAttr "babel" self) - (getAttr "babel-streams" self) - (getAttr "bordeaux-threads" self) - (getAttr "cffi" self) - (getAttr "cl_plus_ssl" self) - (getAttr "hu_dot_dwim_dot_asdf" self) - (getAttr "hu_dot_dwim_dot_common" self) - (getAttr "hu_dot_dwim_dot_computed-class" self) - (getAttr "hu_dot_dwim_dot_def" self) - (getAttr "hu_dot_dwim_dot_def_plus_cl-l10n" self) - (getAttr "hu_dot_dwim_dot_def_plus_contextl" self) - (getAttr "hu_dot_dwim_dot_def_plus_hu_dot_dwim_dot_delico" self) - (getAttr "hu_dot_dwim_dot_logger_plus_iolib" self) - (getAttr "hu_dot_dwim_dot_quasi-quote_dot_xml_plus_hu_dot_dwim_dot_quasi-quote_dot_js" self) - (getAttr "hu_dot_dwim_dot_syntax-sugar" self) - (getAttr "hu_dot_dwim_dot_uri" self) - (getAttr "hu_dot_dwim_dot_util" self) - (getAttr "hu_dot_dwim_dot_zlib" self) - (getAttr "iolib" self) - (getAttr "local-time" self) - (getAttr "parse-number" self) - (getAttr "rfc2109" self) - (getAttr "rfc2388-binary" self) - (getAttr "swank" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - hu_dot_dwim_dot_web-server_plus_swank = ( - build-asdf-system { - pname = "hu.dwim.web-server+swank"; - version = "20220707-darcs"; - asds = [ "hu.dwim.web-server+swank" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "hu.dwim.web-server+swank" ]; - lispLibs = [ - (getAttr "hu_dot_dwim_dot_asdf" self) - (getAttr "hu_dot_dwim_dot_def_plus_swank" self) - (getAttr "hu_dot_dwim_dot_web-server" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - hu_dot_dwim_dot_web-server_dot_application = ( - build-asdf-system { - pname = "hu.dwim.web-server.application"; - version = "20220707-darcs"; - asds = [ "hu.dwim.web-server.application" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "hu.dwim.web-server.application" ]; - lispLibs = [ - (getAttr "hu_dot_dwim_dot_asdf" self) - (getAttr "hu_dot_dwim_dot_web-server" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - hu_dot_dwim_dot_web-server_dot_application_plus_hu_dot_dwim_dot_perec = ( - build-asdf-system { - pname = "hu.dwim.web-server.application+hu.dwim.perec"; - version = "20220707-darcs"; - asds = [ "hu.dwim.web-server.application+hu.dwim.perec" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "hu.dwim.web-server.application+hu.dwim.perec" ]; - lispLibs = [ - (getAttr "hu_dot_dwim_dot_asdf" self) - (getAttr "hu_dot_dwim_dot_perec" self) - (getAttr "hu_dot_dwim_dot_web-server_dot_application" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - hu_dot_dwim_dot_web-server_dot_application_dot_test = ( - build-asdf-system { - pname = "hu.dwim.web-server.application.test"; - version = "20220707-darcs"; - asds = [ "hu.dwim.web-server.application.test" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "hu.dwim.web-server.application.test" ]; - lispLibs = [ - (getAttr "hu_dot_dwim_dot_asdf" self) - (getAttr "hu_dot_dwim_dot_web-server_dot_application" self) - (getAttr "hu_dot_dwim_dot_web-server_dot_test" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - hu_dot_dwim_dot_web-server_dot_documentation = ( - build-asdf-system { - pname = "hu.dwim.web-server.documentation"; - version = "20220707-darcs"; - asds = [ "hu.dwim.web-server.documentation" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "hu.dwim.web-server.documentation" ]; - lispLibs = [ - (getAttr "hu_dot_dwim_dot_asdf" self) - (getAttr "hu_dot_dwim_dot_presentation" self) - (getAttr "hu_dot_dwim_dot_web-server_dot_test" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - hu_dot_dwim_dot_web-server_dot_test = ( - build-asdf-system { - pname = "hu.dwim.web-server.test"; - version = "20220707-darcs"; - asds = [ "hu.dwim.web-server.test" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "hu.dwim.web-server.test" ]; - lispLibs = [ - (getAttr "drakma" self) - (getAttr "hu_dot_dwim_dot_asdf" self) - (getAttr "hu_dot_dwim_dot_computed-class_plus_hu_dot_dwim_dot_logger" self) - (getAttr "hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def_plus_swank" self) - (getAttr "hu_dot_dwim_dot_web-server" self) - (getAttr "hu_dot_dwim_dot_web-server_plus_swank" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - hu_dot_dwim_dot_web-server_dot_websocket = ( - build-asdf-system { - pname = "hu.dwim.web-server.websocket"; - version = "20220707-darcs"; - asds = [ "hu.dwim.web-server.websocket" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "hu.dwim.web-server.websocket" ]; - lispLibs = [ - (getAttr "cl-base64" self) - (getAttr "hu_dot_dwim_dot_asdf" self) - (getAttr "hu_dot_dwim_dot_web-server" self) - (getAttr "ironclad" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); hu_dot_dwim_dot_zlib = ( build-asdf-system { pname = "hu.dwim.zlib"; @@ -62365,12 +61528,12 @@ lib.makeScope pkgs.newScope (self: { humbler = ( build-asdf-system { pname = "humbler"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "humbler" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/humbler/2025-06-22/humbler-20250622-git.tgz"; - sha256 = "0vca31p9ngzxzpmy5rshyywc7zy12d413a8rw0y5xd6l1jv9qpjh"; + url = "https://beta.quicklisp.org/archive/humbler/2026-01-01/humbler-20260101-git.tgz"; + sha256 = "1fww4cdj4xqwp7fm6a64kvqf31pww2w5c880qfh279ymxvscc3wi"; system = "humbler"; asd = "humbler"; } @@ -62497,6 +61660,50 @@ lib.makeScope pkgs.newScope (self: { meta = { }; } ); + hunchentoot-atomic-op-taskmaster = ( + build-asdf-system { + pname = "hunchentoot-atomic-op-taskmaster"; + version = "20260101-git"; + asds = [ "hunchentoot-atomic-op-taskmaster" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/hunchentoot-recycling-taskmaster/2026-01-01/hunchentoot-recycling-taskmaster-20260101-git.tgz"; + sha256 = "0n944bj235vsvkv9wymccvqrriwgjysjkjmk11r4zhikxlil2d7s"; + system = "hunchentoot-atomic-op-taskmaster"; + asd = "hunchentoot-atomic-op-taskmaster"; + } + ); + systems = [ "hunchentoot-atomic-op-taskmaster" ]; + lispLibs = [ (getAttr "hunchentoot-recycling-taskmaster" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + hunchentoot-atomic-op-taskmaster-test = ( + build-asdf-system { + pname = "hunchentoot-atomic-op-taskmaster-test"; + version = "20260101-git"; + asds = [ "hunchentoot-atomic-op-taskmaster-test" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/hunchentoot-recycling-taskmaster/2026-01-01/hunchentoot-recycling-taskmaster-20260101-git.tgz"; + sha256 = "0n944bj235vsvkv9wymccvqrriwgjysjkjmk11r4zhikxlil2d7s"; + system = "hunchentoot-atomic-op-taskmaster-test"; + asd = "hunchentoot-atomic-op-taskmaster-test"; + } + ); + systems = [ "hunchentoot-atomic-op-taskmaster-test" ]; + lispLibs = [ + (getAttr "_1am" self) + (getAttr "hunchentoot-atomic-op-taskmaster" self) + (getAttr "hunchentoot-recycling-taskmaster-test" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); hunchentoot-auth = ( build-asdf-system { pname = "hunchentoot-auth"; @@ -62595,6 +61802,50 @@ lib.makeScope pkgs.newScope (self: { }; } ); + hunchentoot-recycling-taskmaster = ( + build-asdf-system { + pname = "hunchentoot-recycling-taskmaster"; + version = "20260101-git"; + asds = [ "hunchentoot-recycling-taskmaster" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/hunchentoot-recycling-taskmaster/2026-01-01/hunchentoot-recycling-taskmaster-20260101-git.tgz"; + sha256 = "0n944bj235vsvkv9wymccvqrriwgjysjkjmk11r4zhikxlil2d7s"; + system = "hunchentoot-recycling-taskmaster"; + asd = "hunchentoot-recycling-taskmaster"; + } + ); + systems = [ "hunchentoot-recycling-taskmaster" ]; + lispLibs = [ (getAttr "hunchentoot" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + hunchentoot-recycling-taskmaster-test = ( + build-asdf-system { + pname = "hunchentoot-recycling-taskmaster-test"; + version = "20260101-git"; + asds = [ "hunchentoot-recycling-taskmaster-test" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/hunchentoot-recycling-taskmaster/2026-01-01/hunchentoot-recycling-taskmaster-20260101-git.tgz"; + sha256 = "0n944bj235vsvkv9wymccvqrriwgjysjkjmk11r4zhikxlil2d7s"; + system = "hunchentoot-recycling-taskmaster-test"; + asd = "hunchentoot-recycling-taskmaster-test"; + } + ); + systems = [ "hunchentoot-recycling-taskmaster-test" ]; + lispLibs = [ + (getAttr "_1am" self) + (getAttr "hunchentoot" self) + (getAttr "hunchentoot-recycling-taskmaster" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); hunchentoot-single-signon = ( build-asdf-system { pname = "hunchentoot-single-signon"; @@ -62815,12 +62066,12 @@ lib.makeScope pkgs.newScope (self: { iclendar = ( build-asdf-system { pname = "iclendar"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "iclendar" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/iclendar/2023-10-21/iclendar-20231021-git.tgz"; - sha256 = "13ic0zlwrlf6k08x7c8v96kjpbh1dmap15q4cv4in7rkx6rn2rsa"; + url = "https://beta.quicklisp.org/archive/iclendar/2026-01-01/iclendar-20260101-git.tgz"; + sha256 = "1a9q7hcabclb938w7nbm7xgwfic55qr5qvx5n2wdxyh67kjmmmlv"; system = "iclendar"; asd = "iclendar"; } @@ -63100,15 +62351,39 @@ lib.makeScope pkgs.newScope (self: { }; } ); + imagine = ( + build-asdf-system { + pname = "imagine"; + version = "20260101-git"; + asds = [ "imagine" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/imagine/2026-01-01/imagine-20260101-git.tgz"; + sha256 = "1r2vr00vzvvv6fvh953bhfb4s16gmd5glmy9h7c3n0pl2hpgwrw9"; + system = "imagine"; + asd = "imagine"; + } + ); + systems = [ "imagine" ]; + lispLibs = [ + (getAttr "closer-mop" self) + (getAttr "documentation-utils" self) + (getAttr "nibbles" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); imago = ( build-asdf-system { pname = "imago"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "imago" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/imago/2025-06-22/imago-20250622-git.tgz"; - sha256 = "17bfxp9z9hyi6sh382371fb822lqkgw1lrc1vvspsayax126yhpl"; + url = "https://beta.quicklisp.org/archive/imago/2026-01-01/imago-20260101-git.tgz"; + sha256 = "185byv3glncdlqayp3p7wylafx885j49rbkcyyqabk7m8s5zc44d"; system = "imago"; asd = "imago"; } @@ -63155,12 +62430,12 @@ lib.makeScope pkgs.newScope (self: { in-nomine = ( build-asdf-system { pname = "in-nomine"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "in-nomine" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/in-nomine/2024-10-12/in-nomine-20241012-git.tgz"; - sha256 = "1wcfxqj5dfmkg94rnz2nsmyw8iwicncxmklnirlngqqvlcrd0rv4"; + url = "https://beta.quicklisp.org/archive/in-nomine/2026-01-01/in-nomine-20260101-git.tgz"; + sha256 = "09gksd6vf1k1mqzh30m2jkb70j53hclidyvy5nqx5838amhxqns4"; system = "in-nomine"; asd = "in-nomine"; } @@ -63198,18 +62473,21 @@ lib.makeScope pkgs.newScope (self: { incless = ( build-asdf-system { pname = "incless"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "incless" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/incless/2024-10-12/incless-20241012-git.tgz"; - sha256 = "1ypxhsx3fqwfng3b425bsgxbra7asny9261amdbfd6p59r51cyiy"; + url = "https://beta.quicklisp.org/archive/incless/2026-01-01/incless-20260101-git.tgz"; + sha256 = "04j7rgm8wilnlspkr8q5d5wzfxh5x0vvmvqq8wixk90q44k2244y"; system = "incless"; asd = "incless"; } ); systems = [ "incless" ]; - lispLibs = [ (getAttr "quaviver" self) ]; + lispLibs = [ + (getAttr "quaviver" self) + (getAttr "trinsic" self) + ]; meta = { hydraPlatforms = [ ]; }; @@ -63218,12 +62496,12 @@ lib.makeScope pkgs.newScope (self: { incless-extrinsic = ( build-asdf-system { pname = "incless-extrinsic"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "incless-extrinsic" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/incless/2024-10-12/incless-20241012-git.tgz"; - sha256 = "1ypxhsx3fqwfng3b425bsgxbra7asny9261amdbfd6p59r51cyiy"; + url = "https://beta.quicklisp.org/archive/incless/2026-01-01/incless-20260101-git.tgz"; + sha256 = "04j7rgm8wilnlspkr8q5d5wzfxh5x0vvmvqq8wixk90q44k2244y"; system = "incless-extrinsic"; asd = "incless-extrinsic"; } @@ -63241,12 +62519,12 @@ lib.makeScope pkgs.newScope (self: { incless-native = ( build-asdf-system { pname = "incless-native"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "incless-native" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/incless/2024-10-12/incless-20241012-git.tgz"; - sha256 = "1ypxhsx3fqwfng3b425bsgxbra7asny9261amdbfd6p59r51cyiy"; + url = "https://beta.quicklisp.org/archive/incless/2026-01-01/incless-20260101-git.tgz"; + sha256 = "04j7rgm8wilnlspkr8q5d5wzfxh5x0vvmvqq8wixk90q44k2244y"; system = "incless-native"; asd = "incless-native"; } @@ -63529,12 +62807,12 @@ lib.makeScope pkgs.newScope (self: { inkwell = ( build-asdf-system { pname = "inkwell"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "inkwell" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/inkwell/2023-10-21/inkwell-20231021-git.tgz"; - sha256 = "07yxgs2zfnyr158v8q2s4npvzjzmpifx61hg7fc17dsmqgw296yc"; + url = "https://beta.quicklisp.org/archive/inkwell/2026-01-01/inkwell-20260101-git.tgz"; + sha256 = "0982isskqi8f4zrikw2jkccn4mkgypi3d4cqg8shpj5z7g3d86sc"; system = "inkwell"; asd = "inkwell"; } @@ -63792,12 +63070,12 @@ lib.makeScope pkgs.newScope (self: { inravina = ( build-asdf-system { pname = "inravina"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "inravina" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/inravina/2024-10-12/inravina-20241012-git.tgz"; - sha256 = "16kbxzsbb4vdhbf1dzgsgwj9n3cizk3sjixjgrfa8fal4nys7sa3"; + url = "https://beta.quicklisp.org/archive/inravina/2026-01-01/inravina-20260101-git.tgz"; + sha256 = "044sxmvsqpscqk8848dcqd84xbv0vc9p5259m7wmhnkbjpivyyc7"; system = "inravina"; asd = "inravina"; } @@ -63806,6 +63084,7 @@ lib.makeScope pkgs.newScope (self: { lispLibs = [ (getAttr "incless" self) (getAttr "nontrivial-gray-streams" self) + (getAttr "trinsic" self) ]; meta = { hydraPlatforms = [ ]; @@ -63815,12 +63094,12 @@ lib.makeScope pkgs.newScope (self: { inravina-examples = ( build-asdf-system { pname = "inravina-examples"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "inravina-examples" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/inravina/2024-10-12/inravina-20241012-git.tgz"; - sha256 = "16kbxzsbb4vdhbf1dzgsgwj9n3cizk3sjixjgrfa8fal4nys7sa3"; + url = "https://beta.quicklisp.org/archive/inravina/2026-01-01/inravina-20260101-git.tgz"; + sha256 = "044sxmvsqpscqk8848dcqd84xbv0vc9p5259m7wmhnkbjpivyyc7"; system = "inravina-examples"; asd = "inravina-examples"; } @@ -63838,12 +63117,12 @@ lib.makeScope pkgs.newScope (self: { inravina-extrinsic = ( build-asdf-system { pname = "inravina-extrinsic"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "inravina-extrinsic" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/inravina/2024-10-12/inravina-20241012-git.tgz"; - sha256 = "16kbxzsbb4vdhbf1dzgsgwj9n3cizk3sjixjgrfa8fal4nys7sa3"; + url = "https://beta.quicklisp.org/archive/inravina/2026-01-01/inravina-20260101-git.tgz"; + sha256 = "044sxmvsqpscqk8848dcqd84xbv0vc9p5259m7wmhnkbjpivyyc7"; system = "inravina-extrinsic"; asd = "inravina-extrinsic"; } @@ -63861,12 +63140,12 @@ lib.makeScope pkgs.newScope (self: { inravina-native = ( build-asdf-system { pname = "inravina-native"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "inravina-native" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/inravina/2024-10-12/inravina-20241012-git.tgz"; - sha256 = "16kbxzsbb4vdhbf1dzgsgwj9n3cizk3sjixjgrfa8fal4nys7sa3"; + url = "https://beta.quicklisp.org/archive/inravina/2026-01-01/inravina-20260101-git.tgz"; + sha256 = "044sxmvsqpscqk8848dcqd84xbv0vc9p5259m7wmhnkbjpivyyc7"; system = "inravina-native"; asd = "inravina-native"; } @@ -63878,30 +63157,6 @@ lib.makeScope pkgs.newScope (self: { }; } ); - inravina-shim = ( - build-asdf-system { - pname = "inravina-shim"; - version = "20241012-git"; - asds = [ "inravina-shim" ]; - src = ( - createAsd { - url = "https://beta.quicklisp.org/archive/inravina/2024-10-12/inravina-20241012-git.tgz"; - sha256 = "16kbxzsbb4vdhbf1dzgsgwj9n3cizk3sjixjgrfa8fal4nys7sa3"; - system = "inravina-shim"; - asd = "inravina-shim"; - } - ); - systems = [ "inravina-shim" ]; - lispLibs = [ - (getAttr "incless-native" self) - (getAttr "inravina" self) - (getAttr "trivial-package-locks" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); instance-tracking = ( build-asdf-system { pname = "instance-tracking"; @@ -64176,12 +63431,12 @@ lib.makeScope pkgs.newScope (self: { interfaces-test-implementation = ( build-asdf-system { pname = "interfaces-test-implementation"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "interfaces-test-implementation" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/modularize-interfaces/2023-10-21/modularize-interfaces-20231021-git.tgz"; - sha256 = "0lmq2jbkbr5wrrjl2qb1x64fcvl0lmii0h9301b9bq4d47s4w8sh"; + url = "https://beta.quicklisp.org/archive/modularize-interfaces/2026-01-01/modularize-interfaces-20260101-git.tgz"; + sha256 = "1whrz4la3bgx1d5m4xx2c0iir80sm944q02bb5vr9jkddn0r16mm"; system = "interfaces-test-implementation"; asd = "interfaces-test-implementation"; } @@ -64240,12 +63495,12 @@ lib.makeScope pkgs.newScope (self: { invistra = ( build-asdf-system { pname = "invistra"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "invistra" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/invistra/2025-06-22/invistra-20250622-git.tgz"; - sha256 = "1wkf5hi8939bxd39psbzc11w7xvqdfl1z6192spk7s73i3ql9s9x"; + url = "https://beta.quicklisp.org/archive/invistra/2026-01-01/invistra-20260101-git.tgz"; + sha256 = "0c1ka561c8jhl25d7vswyyaizld8c487hppx7221gzxsi9gvabcq"; system = "invistra"; asd = "invistra"; } @@ -64265,12 +63520,12 @@ lib.makeScope pkgs.newScope (self: { invistra-extrinsic = ( build-asdf-system { pname = "invistra-extrinsic"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "invistra-extrinsic" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/invistra/2025-06-22/invistra-20250622-git.tgz"; - sha256 = "1wkf5hi8939bxd39psbzc11w7xvqdfl1z6192spk7s73i3ql9s9x"; + url = "https://beta.quicklisp.org/archive/invistra/2026-01-01/invistra-20260101-git.tgz"; + sha256 = "0c1ka561c8jhl25d7vswyyaizld8c487hppx7221gzxsi9gvabcq"; system = "invistra-extrinsic"; asd = "invistra-extrinsic"; } @@ -64288,12 +63543,12 @@ lib.makeScope pkgs.newScope (self: { invistra-numeral = ( build-asdf-system { pname = "invistra-numeral"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "invistra-numeral" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/invistra/2025-06-22/invistra-20250622-git.tgz"; - sha256 = "1wkf5hi8939bxd39psbzc11w7xvqdfl1z6192spk7s73i3ql9s9x"; + url = "https://beta.quicklisp.org/archive/invistra/2026-01-01/invistra-20260101-git.tgz"; + sha256 = "0c1ka561c8jhl25d7vswyyaizld8c487hppx7221gzxsi9gvabcq"; system = "invistra-numeral"; asd = "invistra-numeral"; } @@ -64631,12 +63886,12 @@ lib.makeScope pkgs.newScope (self: { iterate = ( build-asdf-system { pname = "iterate"; - version = "release-b0f9a9c6-git"; + version = "release-d27d7ff4-git"; asds = [ "iterate" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/iterate/2021-05-31/iterate-release-b0f9a9c6-git.tgz"; - sha256 = "09xq2mdr97hagjrjpc47mp8l9wfp697aa9qaqmsy0yskayzg6xsc"; + url = "https://beta.quicklisp.org/archive/iterate/2026-01-01/iterate-release-d27d7ff4-git.tgz"; + sha256 = "10xyffd8g5zzxkdz9302xy5klicqwi31zl0kxx2j75phy571q45b"; system = "iterate"; asd = "iterate"; } @@ -64732,12 +63987,12 @@ lib.makeScope pkgs.newScope (self: { jingle = ( build-asdf-system { pname = "jingle"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "jingle" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-jingle/2025-06-22/cl-jingle-20250622-git.tgz"; - sha256 = "1rvv7a3qwm0wliszinkv7acscyqf099h6xl81c40is67zw42azd4"; + url = "https://beta.quicklisp.org/archive/cl-jingle/2026-01-01/cl-jingle-20260101-git.tgz"; + sha256 = "0x2d7bcwxjqnirc0b308mhiljq4yxkpwiphhyx59gmlslcjk9jav"; system = "jingle"; asd = "jingle"; } @@ -64766,12 +64021,12 @@ lib.makeScope pkgs.newScope (self: { jingle_dot_demo = ( build-asdf-system { pname = "jingle.demo"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "jingle.demo" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-jingle/2025-06-22/cl-jingle-20250622-git.tgz"; - sha256 = "1rvv7a3qwm0wliszinkv7acscyqf099h6xl81c40is67zw42azd4"; + url = "https://beta.quicklisp.org/archive/cl-jingle/2026-01-01/cl-jingle-20260101-git.tgz"; + sha256 = "0x2d7bcwxjqnirc0b308mhiljq4yxkpwiphhyx59gmlslcjk9jav"; system = "jingle.demo"; asd = "jingle.demo"; } @@ -64797,12 +64052,12 @@ lib.makeScope pkgs.newScope (self: { jingle_dot_demo_dot_test = ( build-asdf-system { pname = "jingle.demo.test"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "jingle.demo.test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-jingle/2025-06-22/cl-jingle-20250622-git.tgz"; - sha256 = "1rvv7a3qwm0wliszinkv7acscyqf099h6xl81c40is67zw42azd4"; + url = "https://beta.quicklisp.org/archive/cl-jingle/2026-01-01/cl-jingle-20260101-git.tgz"; + sha256 = "0x2d7bcwxjqnirc0b308mhiljq4yxkpwiphhyx59gmlslcjk9jav"; system = "jingle.demo.test"; asd = "jingle.demo.test"; } @@ -64820,12 +64075,12 @@ lib.makeScope pkgs.newScope (self: { jingle_dot_test = ( build-asdf-system { pname = "jingle.test"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "jingle.test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-jingle/2025-06-22/cl-jingle-20250622-git.tgz"; - sha256 = "1rvv7a3qwm0wliszinkv7acscyqf099h6xl81c40is67zw42azd4"; + url = "https://beta.quicklisp.org/archive/cl-jingle/2026-01-01/cl-jingle-20260101-git.tgz"; + sha256 = "0x2d7bcwxjqnirc0b308mhiljq4yxkpwiphhyx59gmlslcjk9jav"; system = "jingle.test"; asd = "jingle.test"; } @@ -65299,12 +64554,12 @@ lib.makeScope pkgs.newScope (self: { journal = ( build-asdf-system { pname = "journal"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "journal" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/journal/2025-06-22/journal-20250622-git.tgz"; - sha256 = "0flv7rikhgsm8074wmhi0wa16n9j5dcaif3xjm65ljmzj48m8qp1"; + url = "https://beta.quicklisp.org/archive/journal/2026-01-01/journal-20260101-git.tgz"; + sha256 = "079b639n47bacs62y9n3hv4bsca5zhk7j1b5kgms4nzfwmiqmljg"; system = "journal"; asd = "journal"; } @@ -65373,12 +64628,12 @@ lib.makeScope pkgs.newScope (self: { jpeg-turbo = ( build-asdf-system { pname = "jpeg-turbo"; - version = "20201220-git"; + version = "20260101-git"; asds = [ "jpeg-turbo" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/jpeg-turbo/2020-12-20/jpeg-turbo-20201220-git.tgz"; - sha256 = "1andd1ibbk3224idnpsnrn96flr5d1wm9ja3di57fs04wn577sag"; + url = "https://beta.quicklisp.org/archive/jpeg-turbo/2026-01-01/jpeg-turbo-20260101-git.tgz"; + sha256 = "0prga3xm4hxww9lzzxa7ygk0rah04wx240nvablpbr7hdh1kavmh"; system = "jpeg-turbo"; asd = "jpeg-turbo"; } @@ -65688,15 +64943,41 @@ lib.makeScope pkgs.newScope (self: { }; } ); + json-to-df = ( + build-asdf-system { + pname = "json-to-df"; + version = "20260101-git"; + asds = [ "json-to-df" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/json-to-data-frame/2026-01-01/json-to-data-frame-20260101-git.tgz"; + sha256 = "0fr29jf1xjk3cbn4ynbh8hkarblzpwncxqp1qc7dg64skxqpy76d"; + system = "json-to-df"; + asd = "json-to-df"; + } + ); + systems = [ "json-to-df" ]; + lispLibs = [ + (getAttr "data-frame" self) + (getAttr "dexador" self) + (getAttr "lisp-stat" self) + (getAttr "str" self) + (getAttr "yason" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); jsonrpc = ( build-asdf-system { pname = "jsonrpc"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "jsonrpc" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/jsonrpc/2025-06-22/jsonrpc-20250622-git.tgz"; - sha256 = "0kd550fsklsc4h0fj8jl6g4z5ldb8ba9dn68s7ykv3myaiwgsy1p"; + url = "https://beta.quicklisp.org/archive/jsonrpc/2026-01-01/jsonrpc-20260101-git.tgz"; + sha256 = "0na41pfvich9ck4q36k9n5z4mrr5k93z55mrq2npw7ggf2hsjvdl"; system = "jsonrpc"; asd = "jsonrpc"; } @@ -65804,12 +65085,12 @@ lib.makeScope pkgs.newScope (self: { just-getopt-parser = ( build-asdf-system { pname = "just-getopt-parser"; - version = "20211209-git"; + version = "20260101-git"; asds = [ "just-getopt-parser" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-just-getopt-parser/2021-12-09/cl-just-getopt-parser-20211209-git.tgz"; - sha256 = "0ngh8b51ngh3bqacl40j6wwiinhwxswsy02d9k7qlzv9sbjxay4s"; + url = "https://beta.quicklisp.org/archive/cl-just-getopt-parser/2026-01-01/cl-just-getopt-parser-20260101-git.tgz"; + sha256 = "0rgha7dpj9sykaschzhr8by6f271m07pfvmmsv8fdpw2yy1mgxsw"; system = "just-getopt-parser"; asd = "just-getopt-parser"; } @@ -66108,12 +65389,12 @@ lib.makeScope pkgs.newScope (self: { khazern = ( build-asdf-system { pname = "khazern"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "khazern" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/khazern/2025-06-22/khazern-20250622-git.tgz"; - sha256 = "1z13bds8hdgwncmhl1pbsp341wch6yks8mfgmy3nw9agwfnkpa0d"; + url = "https://beta.quicklisp.org/archive/khazern/2026-01-01/khazern-20260101-git.tgz"; + sha256 = "0srk42za3bxdj9274gh21b849x629hv382p37ds6s07i9y77pw7g"; system = "khazern"; asd = "khazern"; } @@ -66121,6 +65402,7 @@ lib.makeScope pkgs.newScope (self: { systems = [ "khazern" ]; lispLibs = [ (getAttr "acclimation" self) + (getAttr "trinsic" self) (getAttr "trivial-with-current-source-form" self) ]; meta = { @@ -66131,12 +65413,12 @@ lib.makeScope pkgs.newScope (self: { khazern-extension = ( build-asdf-system { pname = "khazern-extension"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "khazern-extension" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/khazern/2025-06-22/khazern-20250622-git.tgz"; - sha256 = "1z13bds8hdgwncmhl1pbsp341wch6yks8mfgmy3nw9agwfnkpa0d"; + url = "https://beta.quicklisp.org/archive/khazern/2026-01-01/khazern-20260101-git.tgz"; + sha256 = "0srk42za3bxdj9274gh21b849x629hv382p37ds6s07i9y77pw7g"; system = "khazern-extension"; asd = "khazern-extension"; } @@ -66151,21 +65433,18 @@ lib.makeScope pkgs.newScope (self: { khazern-extension-extrinsic = ( build-asdf-system { pname = "khazern-extension-extrinsic"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "khazern-extension-extrinsic" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/khazern/2025-06-22/khazern-20250622-git.tgz"; - sha256 = "1z13bds8hdgwncmhl1pbsp341wch6yks8mfgmy3nw9agwfnkpa0d"; + url = "https://beta.quicklisp.org/archive/khazern/2026-01-01/khazern-20260101-git.tgz"; + sha256 = "0srk42za3bxdj9274gh21b849x629hv382p37ds6s07i9y77pw7g"; system = "khazern-extension-extrinsic"; asd = "khazern-extension-extrinsic"; } ); systems = [ "khazern-extension-extrinsic" ]; - lispLibs = [ - (getAttr "khazern-extension" self) - (getAttr "khazern-extrinsic" self) - ]; + lispLibs = [ (getAttr "khazern-extension" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -66174,21 +65453,18 @@ lib.makeScope pkgs.newScope (self: { khazern-extension-intrinsic = ( build-asdf-system { pname = "khazern-extension-intrinsic"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "khazern-extension-intrinsic" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/khazern/2025-06-22/khazern-20250622-git.tgz"; - sha256 = "1z13bds8hdgwncmhl1pbsp341wch6yks8mfgmy3nw9agwfnkpa0d"; + url = "https://beta.quicklisp.org/archive/khazern/2026-01-01/khazern-20260101-git.tgz"; + sha256 = "0srk42za3bxdj9274gh21b849x629hv382p37ds6s07i9y77pw7g"; system = "khazern-extension-intrinsic"; asd = "khazern-extension-intrinsic"; } ); systems = [ "khazern-extension-intrinsic" ]; - lispLibs = [ - (getAttr "khazern-extension" self) - (getAttr "khazern-intrinsic" self) - ]; + lispLibs = [ (getAttr "khazern-extension" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -66197,12 +65473,12 @@ lib.makeScope pkgs.newScope (self: { khazern-extrinsic = ( build-asdf-system { pname = "khazern-extrinsic"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "khazern-extrinsic" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/khazern/2025-06-22/khazern-20250622-git.tgz"; - sha256 = "1z13bds8hdgwncmhl1pbsp341wch6yks8mfgmy3nw9agwfnkpa0d"; + url = "https://beta.quicklisp.org/archive/khazern/2026-01-01/khazern-20260101-git.tgz"; + sha256 = "0srk42za3bxdj9274gh21b849x629hv382p37ds6s07i9y77pw7g"; system = "khazern-extrinsic"; asd = "khazern-extrinsic"; } @@ -66217,21 +65493,18 @@ lib.makeScope pkgs.newScope (self: { khazern-intrinsic = ( build-asdf-system { pname = "khazern-intrinsic"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "khazern-intrinsic" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/khazern/2025-06-22/khazern-20250622-git.tgz"; - sha256 = "1z13bds8hdgwncmhl1pbsp341wch6yks8mfgmy3nw9agwfnkpa0d"; + url = "https://beta.quicklisp.org/archive/khazern/2026-01-01/khazern-20260101-git.tgz"; + sha256 = "0srk42za3bxdj9274gh21b849x629hv382p37ds6s07i9y77pw7g"; system = "khazern-intrinsic"; asd = "khazern-intrinsic"; } ); systems = [ "khazern-intrinsic" ]; - lispLibs = [ - (getAttr "khazern" self) - (getAttr "trivial-package-locks" self) - ]; + lispLibs = [ (getAttr "khazern" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -66298,12 +65571,12 @@ lib.makeScope pkgs.newScope (self: { knx-conn = ( build-asdf-system { pname = "knx-conn"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "knx-conn" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/knx-conn/2025-06-22/knx-conn-20250622-git.tgz"; - sha256 = "0vs31sipx6drd0hs0n9lggaz282br6d3yya5rnvssmv471wqrbsf"; + url = "https://beta.quicklisp.org/archive/knx-conn/2026-01-01/knx-conn-20260101-git.tgz"; + sha256 = "0nlr3lh1n0m7xmhxjpzgrjnniqqnxj13wsik5qlvq6w162bk0lbw"; system = "knx-conn"; asd = "knx-conn"; } @@ -66411,12 +65684,12 @@ lib.makeScope pkgs.newScope (self: { lack = ( build-asdf-system { pname = "lack"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "lack" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; - sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; + url = "https://beta.quicklisp.org/archive/lack/2026-01-01/lack-20260101-git.tgz"; + sha256 = "1daznafalsllr71vcbm5crc7md9j6h3wjn2gbxkxxrm9y1li9kz7"; system = "lack"; asd = "lack"; } @@ -66432,12 +65705,12 @@ lib.makeScope pkgs.newScope (self: { lack-app-directory = ( build-asdf-system { pname = "lack-app-directory"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "lack-app-directory" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; - sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; + url = "https://beta.quicklisp.org/archive/lack/2026-01-01/lack-20260101-git.tgz"; + sha256 = "1daznafalsllr71vcbm5crc7md9j6h3wjn2gbxkxxrm9y1li9kz7"; system = "lack-app-directory"; asd = "lack-app-directory"; } @@ -66458,12 +65731,12 @@ lib.makeScope pkgs.newScope (self: { lack-app-file = ( build-asdf-system { pname = "lack-app-file"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "lack-app-file" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; - sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; + url = "https://beta.quicklisp.org/archive/lack/2026-01-01/lack-20260101-git.tgz"; + sha256 = "1daznafalsllr71vcbm5crc7md9j6h3wjn2gbxkxxrm9y1li9kz7"; system = "lack-app-file"; asd = "lack-app-file"; } @@ -66483,12 +65756,12 @@ lib.makeScope pkgs.newScope (self: { lack-component = ( build-asdf-system { pname = "lack-component"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "lack-component" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; - sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; + url = "https://beta.quicklisp.org/archive/lack/2026-01-01/lack-20260101-git.tgz"; + sha256 = "1daznafalsllr71vcbm5crc7md9j6h3wjn2gbxkxxrm9y1li9kz7"; system = "lack-component"; asd = "lack-component"; } @@ -66501,12 +65774,12 @@ lib.makeScope pkgs.newScope (self: { lack-middleware-accesslog = ( build-asdf-system { pname = "lack-middleware-accesslog"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "lack-middleware-accesslog" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; - sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; + url = "https://beta.quicklisp.org/archive/lack/2026-01-01/lack-20260101-git.tgz"; + sha256 = "1daznafalsllr71vcbm5crc7md9j6h3wjn2gbxkxxrm9y1li9kz7"; system = "lack-middleware-accesslog"; asd = "lack-middleware-accesslog"; } @@ -66524,12 +65797,12 @@ lib.makeScope pkgs.newScope (self: { lack-middleware-anypool = ( build-asdf-system { pname = "lack-middleware-anypool"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "lack-middleware-anypool" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/anypool/2024-10-12/anypool-20241012-git.tgz"; - sha256 = "1ffssc5fzh7gj0z94xxfb3mk5cwja65lrhxyfgib15a6yxqf1kk1"; + url = "https://beta.quicklisp.org/archive/anypool/2026-01-01/anypool-20260101-git.tgz"; + sha256 = "14g152bwwgyqp35qf8krcwavmbjgl5v1m6c29a9csmvb1ni6p83y"; system = "lack-middleware-anypool"; asd = "lack-middleware-anypool"; } @@ -66544,12 +65817,12 @@ lib.makeScope pkgs.newScope (self: { lack-middleware-auth-basic = ( build-asdf-system { pname = "lack-middleware-auth-basic"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "lack-middleware-auth-basic" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; - sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; + url = "https://beta.quicklisp.org/archive/lack/2026-01-01/lack-20260101-git.tgz"; + sha256 = "1daznafalsllr71vcbm5crc7md9j6h3wjn2gbxkxxrm9y1li9kz7"; system = "lack-middleware-auth-basic"; asd = "lack-middleware-auth-basic"; } @@ -66567,12 +65840,12 @@ lib.makeScope pkgs.newScope (self: { lack-middleware-backtrace = ( build-asdf-system { pname = "lack-middleware-backtrace"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "lack-middleware-backtrace" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; - sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; + url = "https://beta.quicklisp.org/archive/lack/2026-01-01/lack-20260101-git.tgz"; + sha256 = "1daznafalsllr71vcbm5crc7md9j6h3wjn2gbxkxxrm9y1li9kz7"; system = "lack-middleware-backtrace"; asd = "lack-middleware-backtrace"; } @@ -66605,12 +65878,12 @@ lib.makeScope pkgs.newScope (self: { lack-middleware-csrf = ( build-asdf-system { pname = "lack-middleware-csrf"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "lack-middleware-csrf" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; - sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; + url = "https://beta.quicklisp.org/archive/lack/2026-01-01/lack-20260101-git.tgz"; + sha256 = "1daznafalsllr71vcbm5crc7md9j6h3wjn2gbxkxxrm9y1li9kz7"; system = "lack-middleware-csrf"; asd = "lack-middleware-csrf"; } @@ -66628,12 +65901,12 @@ lib.makeScope pkgs.newScope (self: { lack-middleware-dbpool = ( build-asdf-system { pname = "lack-middleware-dbpool"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "lack-middleware-dbpool" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; - sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; + url = "https://beta.quicklisp.org/archive/lack/2026-01-01/lack-20260101-git.tgz"; + sha256 = "1daznafalsllr71vcbm5crc7md9j6h3wjn2gbxkxxrm9y1li9kz7"; system = "lack-middleware-dbpool"; asd = "lack-middleware-dbpool"; } @@ -66648,15 +65921,42 @@ lib.makeScope pkgs.newScope (self: { }; } ); + lack-middleware-deflater = ( + build-asdf-system { + pname = "lack-middleware-deflater"; + version = "20260101-git"; + asds = [ "lack-middleware-deflater" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/lack/2026-01-01/lack-20260101-git.tgz"; + sha256 = "1daznafalsllr71vcbm5crc7md9j6h3wjn2gbxkxxrm9y1li9kz7"; + system = "lack-middleware-deflater"; + asd = "lack-middleware-deflater"; + } + ); + systems = [ "lack-middleware-deflater" ]; + lispLibs = [ + (getAttr "babel" self) + (getAttr "cl-ppcre" self) + (getAttr "lack-util-writer-stream" self) + (getAttr "salza2" self) + (getAttr "trivial-mimes" self) + (getAttr "zstd" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); lack-middleware-mito = ( build-asdf-system { pname = "lack-middleware-mito"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "lack-middleware-mito" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mito/2025-06-22/mito-20250622-git.tgz"; - sha256 = "17s00avmyy3ghzxb43hvjx2250w5b24vbcg2daf811qirl05s096"; + url = "https://beta.quicklisp.org/archive/mito/2026-01-01/mito-20260101-git.tgz"; + sha256 = "126hfa1vj78j0lffjfjikkcnxb63kpd4vr2j5jqisma0naxsymql"; system = "lack-middleware-mito"; asd = "lack-middleware-mito"; } @@ -66674,12 +65974,12 @@ lib.makeScope pkgs.newScope (self: { lack-middleware-mount = ( build-asdf-system { pname = "lack-middleware-mount"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "lack-middleware-mount" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; - sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; + url = "https://beta.quicklisp.org/archive/lack/2026-01-01/lack-20260101-git.tgz"; + sha256 = "1daznafalsllr71vcbm5crc7md9j6h3wjn2gbxkxxrm9y1li9kz7"; system = "lack-middleware-mount"; asd = "lack-middleware-mount"; } @@ -66694,12 +65994,12 @@ lib.makeScope pkgs.newScope (self: { lack-middleware-session = ( build-asdf-system { pname = "lack-middleware-session"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "lack-middleware-session" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; - sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; + url = "https://beta.quicklisp.org/archive/lack/2026-01-01/lack-20260101-git.tgz"; + sha256 = "1daznafalsllr71vcbm5crc7md9j6h3wjn2gbxkxxrm9y1li9kz7"; system = "lack-middleware-session"; asd = "lack-middleware-session"; } @@ -66720,12 +66020,12 @@ lib.makeScope pkgs.newScope (self: { lack-middleware-static = ( build-asdf-system { pname = "lack-middleware-static"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "lack-middleware-static" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; - sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; + url = "https://beta.quicklisp.org/archive/lack/2026-01-01/lack-20260101-git.tgz"; + sha256 = "1daznafalsllr71vcbm5crc7md9j6h3wjn2gbxkxxrm9y1li9kz7"; system = "lack-middleware-static"; asd = "lack-middleware-static"; } @@ -66741,15 +66041,35 @@ lib.makeScope pkgs.newScope (self: { }; } ); + lack-middleware-when = ( + build-asdf-system { + pname = "lack-middleware-when"; + version = "20260101-git"; + asds = [ "lack-middleware-when" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/lack/2026-01-01/lack-20260101-git.tgz"; + sha256 = "1daznafalsllr71vcbm5crc7md9j6h3wjn2gbxkxxrm9y1li9kz7"; + system = "lack-middleware-when"; + asd = "lack-middleware-when"; + } + ); + systems = [ "lack-middleware-when" ]; + lispLibs = [ (getAttr "lack-util" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); lack-request = ( build-asdf-system { pname = "lack-request"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "lack-request" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; - sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; + url = "https://beta.quicklisp.org/archive/lack/2026-01-01/lack-20260101-git.tgz"; + sha256 = "1daznafalsllr71vcbm5crc7md9j6h3wjn2gbxkxxrm9y1li9kz7"; system = "lack-request"; asd = "lack-request"; } @@ -66769,12 +66089,12 @@ lib.makeScope pkgs.newScope (self: { lack-response = ( build-asdf-system { pname = "lack-response"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "lack-response" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; - sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; + url = "https://beta.quicklisp.org/archive/lack/2026-01-01/lack-20260101-git.tgz"; + sha256 = "1daznafalsllr71vcbm5crc7md9j6h3wjn2gbxkxxrm9y1li9kz7"; system = "lack-response"; asd = "lack-response"; } @@ -66792,12 +66112,12 @@ lib.makeScope pkgs.newScope (self: { lack-session-store-dbi = ( build-asdf-system { pname = "lack-session-store-dbi"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "lack-session-store-dbi" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; - sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; + url = "https://beta.quicklisp.org/archive/lack/2026-01-01/lack-20260101-git.tgz"; + sha256 = "1daznafalsllr71vcbm5crc7md9j6h3wjn2gbxkxxrm9y1li9kz7"; system = "lack-session-store-dbi"; asd = "lack-session-store-dbi"; } @@ -66818,12 +66138,12 @@ lib.makeScope pkgs.newScope (self: { lack-session-store-redis = ( build-asdf-system { pname = "lack-session-store-redis"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "lack-session-store-redis" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; - sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; + url = "https://beta.quicklisp.org/archive/lack/2026-01-01/lack-20260101-git.tgz"; + sha256 = "1daznafalsllr71vcbm5crc7md9j6h3wjn2gbxkxxrm9y1li9kz7"; system = "lack-session-store-redis"; asd = "lack-session-store-redis"; } @@ -66844,12 +66164,12 @@ lib.makeScope pkgs.newScope (self: { lack-test = ( build-asdf-system { pname = "lack-test"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "lack-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; - sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; + url = "https://beta.quicklisp.org/archive/lack/2026-01-01/lack-20260101-git.tgz"; + sha256 = "1daznafalsllr71vcbm5crc7md9j6h3wjn2gbxkxxrm9y1li9kz7"; system = "lack-test"; asd = "lack-test"; } @@ -66869,33 +66189,30 @@ lib.makeScope pkgs.newScope (self: { lack-util = ( build-asdf-system { pname = "lack-util"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "lack-util" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; - sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; + url = "https://beta.quicklisp.org/archive/lack/2026-01-01/lack-20260101-git.tgz"; + sha256 = "1daznafalsllr71vcbm5crc7md9j6h3wjn2gbxkxxrm9y1li9kz7"; system = "lack-util"; asd = "lack-util"; } ); systems = [ "lack-util" ]; - lispLibs = [ - (getAttr "bordeaux-threads" self) - (getAttr "cl-isaac" self) - ]; + lispLibs = [ (getAttr "ironclad" self) ]; meta = { }; } ); lack-util-writer-stream = ( build-asdf-system { pname = "lack-util-writer-stream"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "lack-util-writer-stream" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz"; - sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048"; + url = "https://beta.quicklisp.org/archive/lack/2026-01-01/lack-20260101-git.tgz"; + sha256 = "1daznafalsllr71vcbm5crc7md9j6h3wjn2gbxkxxrm9y1li9kz7"; system = "lack-util-writer-stream"; asd = "lack-util-writer-stream"; } @@ -66986,12 +66303,12 @@ lib.makeScope pkgs.newScope (self: { lambda-fiddle = ( build-asdf-system { pname = "lambda-fiddle"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "lambda-fiddle" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lambda-fiddle/2025-06-22/lambda-fiddle-20250622-git.tgz"; - sha256 = "0ka9av9806qlj2blnf4k55fma3xvc8zksnqwc60g5hv20y858c1p"; + url = "https://beta.quicklisp.org/archive/lambda-fiddle/2026-01-01/lambda-fiddle-20260101-git.tgz"; + sha256 = "0jkfs5nc5l1j7p9ycw60mrj9civarsxc8a6iqxf9y0vp8aiial5b"; system = "lambda-fiddle"; asd = "lambda-fiddle"; } @@ -67070,12 +66387,12 @@ lib.makeScope pkgs.newScope (self: { language-codes = ( build-asdf-system { pname = "language-codes"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "language-codes" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/language-codes/2025-06-22/language-codes-20250622-git.tgz"; - sha256 = "00wlfnazvfl3kl7wls4vig1v6dg45z5k1ax0v512i3x63kvxr7bb"; + url = "https://beta.quicklisp.org/archive/language-codes/2026-01-01/language-codes-20260101-git.tgz"; + sha256 = "0fnc9s6rbd6bz9bk24is7fp06sb17lhnp9v43ixym70p0glps1af"; system = "language-codes"; asd = "language-codes"; } @@ -67090,12 +66407,12 @@ lib.makeScope pkgs.newScope (self: { lapack = ( build-asdf-system { pname = "lapack"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "lapack" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; - sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; + url = "https://beta.quicklisp.org/archive/f2cl/2026-01-01/f2cl-20260101-git.tgz"; + sha256 = "025hdyvyk9il71aya05sma13m3x9yxcj7g3sadpzck55manbpfnm"; system = "lapack"; asd = "lapack"; } @@ -67115,12 +66432,12 @@ lib.makeScope pkgs.newScope (self: { lass = ( build-asdf-system { pname = "lass"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "lass" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lass/2025-06-22/lass-20250622-git.tgz"; - sha256 = "0pj9p7asqaqjakjjn8i7k6lb9piakjxd8xa732c88q5qijbmvkb2"; + url = "https://beta.quicklisp.org/archive/lass/2026-01-01/lass-20260101-git.tgz"; + sha256 = "0vdj6kp76h5cgp821j4xwdj3pyv1fjixd18inrdbxp4z6n745k1f"; system = "lass"; asd = "lass"; } @@ -67309,12 +66626,12 @@ lib.makeScope pkgs.newScope (self: { ledger = ( build-asdf-system { pname = "ledger"; - version = "master-5a621564-git"; + version = "master-bfa9fc5c-git"; asds = [ "ledger" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; - sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; + url = "https://beta.quicklisp.org/archive/gendl/2026-01-01/gendl-master-bfa9fc5c-git.tgz"; + sha256 = "1hbbflaiplf4qxqlc5bqi28xh419lijrz4rvz18maqiavg059bfk"; system = "ledger"; asd = "ledger"; } @@ -67401,12 +66718,12 @@ lib.makeScope pkgs.newScope (self: { legit = ( build-asdf-system { pname = "legit"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "legit" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/legit/2025-06-22/legit-20250622-git.tgz"; - sha256 = "0k9jjng50d22i37vv3ag7f1j71yspr74n4akd4sw8mpyk7r66kh3"; + url = "https://beta.quicklisp.org/archive/legit/2026-01-01/legit-20260101-git.tgz"; + sha256 = "06cvplibn21nm9l4k3j4rik549wrcbscjfrz00l0gmxh68qsqy31"; system = "legit"; asd = "legit"; } @@ -67454,12 +66771,12 @@ lib.makeScope pkgs.newScope (self: { lemmy-api = ( build-asdf-system { pname = "lemmy-api"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "lemmy-api" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lemmy-api/2025-06-22/lemmy-api-20250622-git.tgz"; - sha256 = "1mbry0jv7zizvc23rz3h7428z65miccl1sanqa23d1xnlgjqvpbh"; + url = "https://beta.quicklisp.org/archive/lemmy-api/2026-01-01/lemmy-api-20260101-git.tgz"; + sha256 = "1cq851pbjqigj6hika5mhd6zy6a5psrb2djzwqzgc2ay8vm7j800"; system = "lemmy-api"; asd = "lemmy-api"; } @@ -67467,6 +66784,7 @@ lib.makeScope pkgs.newScope (self: { systems = [ "lemmy-api" ]; lispLibs = [ (getAttr "alexandria" self) + (getAttr "cl-ppcre" self) (getAttr "closer-mop" self) (getAttr "dexador" self) ]; @@ -67593,12 +66911,12 @@ lib.makeScope pkgs.newScope (self: { letv = ( build-asdf-system { pname = "letv"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "letv" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/letv/2025-06-22/letv-20250622-git.tgz"; - sha256 = "1hpqhrgrnf9rgy3dnvyl1q5wfa6xbb4x98qfymzgp8yfi1c9ic9w"; + url = "https://beta.quicklisp.org/archive/letv/2026-01-01/letv-20260101-git.tgz"; + sha256 = "028i8vj2zi2bc0sidh3qi4vfd4jgmb1ymvqgq71gvl26906f1fdj"; system = "letv"; asd = "letv"; } @@ -68091,12 +67409,12 @@ lib.makeScope pkgs.newScope (self: { lichat-ldap = ( build-asdf-system { pname = "lichat-ldap"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "lichat-ldap" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lichat-ldap/2023-10-21/lichat-ldap-20231021-git.tgz"; - sha256 = "1jgj5c0sgr4rw9vsjhz71k3ld7hp8fbbmzrn3g11fq8jl4c4iai1"; + url = "https://beta.quicklisp.org/archive/lichat-ldap/2026-01-01/lichat-ldap-20260101-git.tgz"; + sha256 = "1931j1pzcbmxllrpjnhq3pz5km2lwvvdm8k4w7z851x229li0icm"; system = "lichat-ldap"; asd = "lichat-ldap"; } @@ -68115,12 +67433,12 @@ lib.makeScope pkgs.newScope (self: { lichat-protocol = ( build-asdf-system { pname = "lichat-protocol"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "lichat-protocol" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lichat-protocol/2024-10-12/lichat-protocol-20241012-git.tgz"; - sha256 = "0y8546aaf539jnl29r4a8sa975jak1ld4d62w2n1kp8s9nb80z11"; + url = "https://beta.quicklisp.org/archive/lichat-protocol/2026-01-01/lichat-protocol-20260101-git.tgz"; + sha256 = "0w0r8zfn02zpvfrqvkic3l3bkdj8ivdwrzg7vzybpvglljpv4r9j"; system = "lichat-protocol"; asd = "lichat-protocol"; } @@ -68139,12 +67457,12 @@ lib.makeScope pkgs.newScope (self: { lichat-serverlib = ( build-asdf-system { pname = "lichat-serverlib"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "lichat-serverlib" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lichat-serverlib/2025-06-22/lichat-serverlib-20250622-git.tgz"; - sha256 = "1rai2r4ysrcj0wj3jwqc8yqn26nlm1vjm21imc1rvbqd5lprrc3b"; + url = "https://beta.quicklisp.org/archive/lichat-serverlib/2026-01-01/lichat-serverlib-20260101-git.tgz"; + sha256 = "01snwl1v5kh9szk4ifwpx1y248yd3q60fpg5hxl14rcr9pspz284"; system = "lichat-serverlib"; asd = "lichat-serverlib"; } @@ -68164,12 +67482,12 @@ lib.makeScope pkgs.newScope (self: { lichat-tcp-client = ( build-asdf-system { pname = "lichat-tcp-client"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "lichat-tcp-client" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lichat-tcp-client/2025-06-22/lichat-tcp-client-20250622-git.tgz"; - sha256 = "1d9zpcny7lqsmz5z1ssk09r3ncrf82mqlmxxcds03ijaaga117qv"; + url = "https://beta.quicklisp.org/archive/lichat-tcp-client/2026-01-01/lichat-tcp-client-20260101-git.tgz"; + sha256 = "077ras50p8fzs26ckm66s99dbs278bwq2dy41xb8b13b619z5xc3"; system = "lichat-tcp-client"; asd = "lichat-tcp-client"; } @@ -68192,12 +67510,12 @@ lib.makeScope pkgs.newScope (self: { lichat-tcp-server = ( build-asdf-system { pname = "lichat-tcp-server"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "lichat-tcp-server" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lichat-tcp-server/2025-06-22/lichat-tcp-server-20250622-git.tgz"; - sha256 = "00cvikcv560cgm4rzr1k9gm3i752i991g0z5ppsvbm79ay976gsf"; + url = "https://beta.quicklisp.org/archive/lichat-tcp-server/2026-01-01/lichat-tcp-server-20260101-git.tgz"; + sha256 = "177j9j1fw7qqj6fv4h6d2ywljax9mnivm3cfka3ca803xqdzrm05"; system = "lichat-tcp-server"; asd = "lichat-tcp-server"; } @@ -68219,12 +67537,12 @@ lib.makeScope pkgs.newScope (self: { lichat-ws-server = ( build-asdf-system { pname = "lichat-ws-server"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "lichat-ws-server" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lichat-ws-server/2025-06-22/lichat-ws-server-20250622-git.tgz"; - sha256 = "0cilzklkr24704s8g7m1i5bm2qwqpi7g63cqfkx1swrilzx77hg0"; + url = "https://beta.quicklisp.org/archive/lichat-ws-server/2026-01-01/lichat-ws-server-20260101-git.tgz"; + sha256 = "0yq6a2pxzgy37pw6ggfgdjcsin636hp7815h2w82zs0jxm657091"; system = "lichat-ws-server"; asd = "lichat-ws-server"; } @@ -68304,12 +67622,12 @@ lib.makeScope pkgs.newScope (self: { lil = ( build-asdf-system { pname = "lil"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "lil" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lisp-interface-library/2023-10-21/lisp-interface-library-20231021-git.tgz"; - sha256 = "0krh8z696a0p894vmqdw9clzhpqfqff4c4rd7s8d8hd5jwjm40aq"; + url = "https://beta.quicklisp.org/archive/lisp-interface-library/2026-01-01/lisp-interface-library-20260101-git.tgz"; + sha256 = "08nkh2c2qkhnksig3qd1f95f7fa1yqqxgp1fxnrhnkhi9k6hdmnr"; system = "lil"; asd = "lil"; } @@ -68444,12 +67762,12 @@ lib.makeScope pkgs.newScope (self: { linear-programming-glpk = ( build-asdf-system { pname = "linear-programming-glpk"; - version = "20221106-git"; + version = "20260101-git"; asds = [ "linear-programming-glpk" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/linear-programming-glpk/2022-11-06/linear-programming-glpk-20221106-git.tgz"; - sha256 = "0vm4qgjvw5k3v62h78j6802dm075aif06hbjw600m3hybn84rs3l"; + url = "https://beta.quicklisp.org/archive/linear-programming-glpk/2026-01-01/linear-programming-glpk-20260101-git.tgz"; + sha256 = "1bylshqmvps0b2a98ahj47bxa01hlmlsir8k7xjv63xkgd8rgfv7"; system = "linear-programming-glpk"; asd = "linear-programming-glpk"; } @@ -68610,12 +67928,12 @@ lib.makeScope pkgs.newScope (self: { lisa = ( build-asdf-system { pname = "lisa"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "lisa" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lisa/2025-06-22/lisa-20250622-git.tgz"; - sha256 = "0m1ww61vbaxrj1jiln8f6x393i27sd604hv511bd67y6xj23qqai"; + url = "https://beta.quicklisp.org/archive/lisa/2026-01-01/lisa-20260101-git.tgz"; + sha256 = "176dy41jjbqgjx7xf71cgajlb2ivskv9kpg9wbv1klxjp7xraq9w"; system = "lisa"; asd = "lisa"; } @@ -68675,12 +67993,12 @@ lib.makeScope pkgs.newScope (self: { lisp-chat = ( build-asdf-system { pname = "lisp-chat"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "lisp-chat" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lisp-chat/2024-10-12/lisp-chat-20241012-git.tgz"; - sha256 = "16ckgxg0c3rx6qvwj5cn6rmfgxbj7587r9g342bw3nfxab0sqlzd"; + url = "https://beta.quicklisp.org/archive/lisp-chat/2026-01-01/lisp-chat-20260101-git.tgz"; + sha256 = "1ngcp6kyv0wk7lk0s8jybk0gypxiwqqzs48zk2ffx2zh5mivzpiw"; system = "lisp-chat"; asd = "lisp-chat"; } @@ -68782,12 +68100,12 @@ lib.makeScope pkgs.newScope (self: { lisp-interface-library = ( build-asdf-system { pname = "lisp-interface-library"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "lisp-interface-library" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lisp-interface-library/2023-10-21/lisp-interface-library-20231021-git.tgz"; - sha256 = "0krh8z696a0p894vmqdw9clzhpqfqff4c4rd7s8d8hd5jwjm40aq"; + url = "https://beta.quicklisp.org/archive/lisp-interface-library/2026-01-01/lisp-interface-library-20260101-git.tgz"; + sha256 = "08nkh2c2qkhnksig3qd1f95f7fa1yqqxgp1fxnrhnkhi9k6hdmnr"; system = "lisp-interface-library"; asd = "lisp-interface-library"; } @@ -68947,12 +68265,12 @@ lib.makeScope pkgs.newScope (self: { lisp-stat = ( build-asdf-system { pname = "lisp-stat"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "lisp-stat" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lisp-stat/2025-06-22/lisp-stat-20250622-git.tgz"; - sha256 = "1n98bp3jdk724zr7h3z496z754j0fbj4ilgqxf1f3kzmw34sb14n"; + url = "https://beta.quicklisp.org/archive/lisp-stat/2026-01-01/lisp-stat-20260101-git.tgz"; + sha256 = "02mkz9111whgcf03vfycanr9i794bc9njl6k7gl0nfcpizhvwy18"; system = "lisp-stat"; asd = "lisp-stat"; } @@ -69941,11 +69259,11 @@ lib.makeScope pkgs.newScope (self: { listopia = ( build-asdf-system { pname = "listopia"; - version = "20210411-git"; + version = "20260101-git"; asds = [ "listopia" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/listopia/2021-04-11/listopia-20210411-git.tgz"; + url = "https://beta.quicklisp.org/archive/listopia/2026-01-01/listopia-20260101-git.tgz"; sha256 = "0jd3mdv0ia8mfgdbpndzm3rdgc6nn9d9xpjzqjx582qhbnc0yji0"; system = "listopia"; asd = "listopia"; @@ -69958,31 +69276,6 @@ lib.makeScope pkgs.newScope (self: { }; } ); - listopia-bench = ( - build-asdf-system { - pname = "listopia-bench"; - version = "20210411-git"; - asds = [ "listopia-bench" ]; - src = ( - createAsd { - url = "https://beta.quicklisp.org/archive/listopia/2021-04-11/listopia-20210411-git.tgz"; - sha256 = "0jd3mdv0ia8mfgdbpndzm3rdgc6nn9d9xpjzqjx582qhbnc0yji0"; - system = "listopia-bench"; - asd = "listopia-bench"; - } - ); - systems = [ "listopia-bench" ]; - lispLibs = [ - (getAttr "listopia" self) - (getAttr "prove" self) - (getAttr "prove-asdf" self) - (getAttr "trivial-benchmark" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); liter = ( build-asdf-system { pname = "liter"; @@ -70101,6 +69394,31 @@ lib.makeScope pkgs.newScope (self: { }; } ); + live-cells = ( + build-asdf-system { + pname = "live-cells"; + version = "20260101-git"; + asds = [ "live-cells" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/live-cells-cl/2026-01-01/live-cells-cl-20260101-git.tgz"; + sha256 = "0jr9irvjjxmpbq08mchr6va4n38fh1ldy6cnwhnv96ypm5ckp2ah"; + system = "live-cells"; + asd = "live-cells"; + } + ); + systems = [ "live-cells" ]; + lispLibs = [ + (getAttr "alexandria" self) + (getAttr "anaphora" self) + (getAttr "arrows" self) + (getAttr "generic-cl" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); livesupport = ( build-asdf-system { pname = "livesupport"; @@ -70124,12 +69442,12 @@ lib.makeScope pkgs.newScope (self: { lla = ( build-asdf-system { pname = "lla"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "lla" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lla/2024-10-12/lla-20241012-git.tgz"; - sha256 = "19j11z8m00ry2bfn3ahai155b6qz995qqg7ipzvjdr05sj4gfb58"; + url = "https://beta.quicklisp.org/archive/lla/2026-01-01/lla-20260101-git.tgz"; + sha256 = "1vng16z33zcvhfbv7zfa5y4vc3qsqx2vp75mmxydwic6i2v8qr0a"; system = "lla"; asd = "lla"; } @@ -70284,12 +69602,12 @@ lib.makeScope pkgs.newScope (self: { local-time = ( build-asdf-system { pname = "local-time"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "local-time" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/local-time/2025-06-22/local-time-20250622-git.tgz"; - sha256 = "1xdxm1js8n1b3k0g013s810hzf7jr6yhapyvj9agfyl7b6knj0kg"; + url = "https://beta.quicklisp.org/archive/local-time/2026-01-01/local-time-20260101-git.tgz"; + sha256 = "1rj26g8yx3p5q8bmikgk8jfwmbi5q65mfzgijh51xckdj28ckkh1"; system = "local-time"; asd = "local-time"; } @@ -70367,12 +69685,12 @@ lib.makeScope pkgs.newScope (self: { log4cl-extras = ( build-asdf-system { pname = "log4cl-extras"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "log4cl-extras" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/log4cl-extras/2024-10-12/log4cl-extras-20241012-git.tgz"; - sha256 = "17p8y884163j0gab0idra297kivzdgagl2im0gkmdhgrh0dw3b53"; + url = "https://beta.quicklisp.org/archive/log4cl-extras/2026-01-01/log4cl-extras-20260101-git.tgz"; + sha256 = "0r0p9890pi3rjgakgjbs463x47bvsdqkkm05m3w49hr4ir03sff5"; system = "log4cl-extras"; asd = "log4cl-extras"; } @@ -70400,12 +69718,12 @@ lib.makeScope pkgs.newScope (self: { log4cl-extras-test = ( build-asdf-system { pname = "log4cl-extras-test"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "log4cl-extras-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/log4cl-extras/2024-10-12/log4cl-extras-20241012-git.tgz"; - sha256 = "17p8y884163j0gab0idra297kivzdgagl2im0gkmdhgrh0dw3b53"; + url = "https://beta.quicklisp.org/archive/log4cl-extras/2026-01-01/log4cl-extras-20260101-git.tgz"; + sha256 = "0r0p9890pi3rjgakgjbs463x47bvsdqkkm05m3w49hr4ir03sff5"; system = "log4cl-extras-test"; asd = "log4cl-extras-test"; } @@ -70674,12 +69992,12 @@ lib.makeScope pkgs.newScope (self: { lquery = ( build-asdf-system { pname = "lquery"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "lquery" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lquery/2023-10-21/lquery-20231021-git.tgz"; - sha256 = "124cjp4a99cicdk18rwz2slcyzvm982saddrvqcr97fi4i2nhnsg"; + url = "https://beta.quicklisp.org/archive/lquery/2026-01-01/lquery-20260101-git.tgz"; + sha256 = "11l03pwlvv76lxrmvjs3prkrjsgl70wz7vbl1n6rhg9kmyv91a74"; system = "lquery"; asd = "lquery"; } @@ -70697,12 +70015,12 @@ lib.makeScope pkgs.newScope (self: { lquery-test = ( build-asdf-system { pname = "lquery-test"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "lquery-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lquery/2023-10-21/lquery-20231021-git.tgz"; - sha256 = "124cjp4a99cicdk18rwz2slcyzvm982saddrvqcr97fi4i2nhnsg"; + url = "https://beta.quicklisp.org/archive/lquery/2026-01-01/lquery-20260101-git.tgz"; + sha256 = "11l03pwlvv76lxrmvjs3prkrjsgl70wz7vbl1n6rhg9kmyv91a74"; system = "lquery-test"; asd = "lquery-test"; } @@ -70764,12 +70082,12 @@ lib.makeScope pkgs.newScope (self: { lru-cache = ( build-asdf-system { pname = "lru-cache"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "lru-cache" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lru-cache/2025-06-22/lru-cache-20250622-git.tgz"; - sha256 = "0nscrgkhzj1br9xgcxzrsr5pg4xcsv2l3736gxbba3wxlj4v2v3d"; + url = "https://beta.quicklisp.org/archive/lru-cache/2026-01-01/lru-cache-20260101-git.tgz"; + sha256 = "10nclq68k17kx6fr7vmwxci5i9bqsh32jiflfmzd9yzzc6rqvaxv"; system = "lru-cache"; asd = "lru-cache"; } @@ -70784,12 +70102,12 @@ lib.makeScope pkgs.newScope (self: { lru-cache-test = ( build-asdf-system { pname = "lru-cache-test"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "lru-cache-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lru-cache/2025-06-22/lru-cache-20250622-git.tgz"; - sha256 = "0nscrgkhzj1br9xgcxzrsr5pg4xcsv2l3736gxbba3wxlj4v2v3d"; + url = "https://beta.quicklisp.org/archive/lru-cache/2026-01-01/lru-cache-20260101-git.tgz"; + sha256 = "10nclq68k17kx6fr7vmwxci5i9bqsh32jiflfmzd9yzzc6rqvaxv"; system = "lru-cache-test"; asd = "lru-cache-test"; } @@ -70911,12 +70229,12 @@ lib.makeScope pkgs.newScope (self: { luckless = ( build-asdf-system { pname = "luckless"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "luckless" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/luckless/2025-06-22/luckless-20250622-git.tgz"; - sha256 = "1ajd6kzvdknl1wl2019aqajzr5v26b45fdgldky74m93piibznbn"; + url = "https://beta.quicklisp.org/archive/luckless/2026-01-01/luckless-20260101-git.tgz"; + sha256 = "1g3g1qvi2rgrrfgwxhgl5ra524fss5vpax8d4aq686r7ivy0rs0w"; system = "luckless"; asd = "luckless"; } @@ -70934,12 +70252,12 @@ lib.makeScope pkgs.newScope (self: { luckless-test = ( build-asdf-system { pname = "luckless-test"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "luckless-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/luckless/2025-06-22/luckless-20250622-git.tgz"; - sha256 = "1ajd6kzvdknl1wl2019aqajzr5v26b45fdgldky74m93piibznbn"; + url = "https://beta.quicklisp.org/archive/luckless/2026-01-01/luckless-20260101-git.tgz"; + sha256 = "1g3g1qvi2rgrrfgwxhgl5ra524fss5vpax8d4aq686r7ivy0rs0w"; system = "luckless-test"; asd = "luckless-test"; } @@ -70959,12 +70277,12 @@ lib.makeScope pkgs.newScope (self: { lunamech-matrix-api = ( build-asdf-system { pname = "lunamech-matrix-api"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "lunamech-matrix-api" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/lunamech-matrix-api/2025-06-22/lunamech-matrix-api-20250622-git.tgz"; - sha256 = "1ygdnwk1irnlfr6c3d07sqxwj2q74vpkd4hjjfvghr8v7kq4arpv"; + url = "https://beta.quicklisp.org/archive/lunamech-matrix-api/2026-01-01/lunamech-matrix-api-20260101-git.tgz"; + sha256 = "04ywfqxjk82sca7chjiy0hdii7l453qkql24x9x67k08s0l80cqa"; system = "lunamech-matrix-api"; asd = "lunamech-matrix-api"; } @@ -71112,12 +70430,12 @@ lib.makeScope pkgs.newScope (self: { machine-measurements = ( build-asdf-system { pname = "machine-measurements"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "machine-measurements" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/machine-measurements/2025-06-22/machine-measurements-20250622-git.tgz"; - sha256 = "0d2lhippyhyyzgp67vp8g30xx3r30vrbs1jpcl8wrmxzszyp4qg2"; + url = "https://beta.quicklisp.org/archive/machine-measurements/2026-01-01/machine-measurements-20260101-git.tgz"; + sha256 = "1i73pxq6bxnxjjkmz56msq7p3n3bdqnmzrrizg6dci252zv75rvi"; system = "machine-measurements"; asd = "machine-measurements"; } @@ -71136,12 +70454,12 @@ lib.makeScope pkgs.newScope (self: { machine-state = ( build-asdf-system { pname = "machine-state"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "machine-state" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/machine-state/2025-06-22/machine-state-20250622-git.tgz"; - sha256 = "01hdfzlw9zp0r3vrsdapg7djvld3g5sdh6r33kap7qa2zmicbivf"; + url = "https://beta.quicklisp.org/archive/machine-state/2026-01-01/machine-state-20260101-git.tgz"; + sha256 = "0dvvmahblrx1iil7266gcqhaq7d4a1gwqqb4vylng8mg9xd0jy13"; system = "machine-state"; asd = "machine-state"; } @@ -71486,12 +70804,12 @@ lib.makeScope pkgs.newScope (self: { maiden = ( build-asdf-system { pname = "maiden"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden"; asd = "maiden"; } @@ -71517,12 +70835,12 @@ lib.makeScope pkgs.newScope (self: { maiden-accounts = ( build-asdf-system { pname = "maiden-accounts"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-accounts" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-accounts"; asd = "maiden-accounts"; } @@ -71541,12 +70859,12 @@ lib.makeScope pkgs.newScope (self: { maiden-activatable = ( build-asdf-system { pname = "maiden-activatable"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-activatable" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-activatable"; asd = "maiden-activatable"; } @@ -71565,12 +70883,12 @@ lib.makeScope pkgs.newScope (self: { maiden-api-access = ( build-asdf-system { pname = "maiden-api-access"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-api-access" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-api-access"; asd = "maiden-api-access"; } @@ -71590,12 +70908,12 @@ lib.makeScope pkgs.newScope (self: { maiden-blocker = ( build-asdf-system { pname = "maiden-blocker"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-blocker" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-blocker"; asd = "maiden-blocker"; } @@ -71615,12 +70933,12 @@ lib.makeScope pkgs.newScope (self: { maiden-channel-relay = ( build-asdf-system { pname = "maiden-channel-relay"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-channel-relay" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-channel-relay"; asd = "maiden-channel-relay"; } @@ -71639,12 +70957,12 @@ lib.makeScope pkgs.newScope (self: { maiden-chatlog = ( build-asdf-system { pname = "maiden-chatlog"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-chatlog" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-chatlog"; asd = "maiden-chatlog"; } @@ -71666,12 +70984,12 @@ lib.makeScope pkgs.newScope (self: { maiden-client-entities = ( build-asdf-system { pname = "maiden-client-entities"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-client-entities" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-client-entities"; asd = "maiden-client-entities"; } @@ -71689,12 +71007,12 @@ lib.makeScope pkgs.newScope (self: { maiden-commands = ( build-asdf-system { pname = "maiden-commands"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-commands" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-commands"; asd = "maiden-commands"; } @@ -71713,12 +71031,12 @@ lib.makeScope pkgs.newScope (self: { maiden-core-manager = ( build-asdf-system { pname = "maiden-core-manager"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-core-manager" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-core-manager"; asd = "maiden-core-manager"; } @@ -71737,12 +71055,12 @@ lib.makeScope pkgs.newScope (self: { maiden-counter = ( build-asdf-system { pname = "maiden-counter"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-counter" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-counter"; asd = "maiden-counter"; } @@ -71763,12 +71081,12 @@ lib.makeScope pkgs.newScope (self: { maiden-crimes = ( build-asdf-system { pname = "maiden-crimes"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-crimes" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-crimes"; asd = "maiden-crimes"; } @@ -71790,12 +71108,12 @@ lib.makeScope pkgs.newScope (self: { maiden-dictionary = ( build-asdf-system { pname = "maiden-dictionary"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-dictionary" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-dictionary"; asd = "maiden-dictionary"; } @@ -71815,12 +71133,12 @@ lib.makeScope pkgs.newScope (self: { maiden-emoticon = ( build-asdf-system { pname = "maiden-emoticon"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-emoticon" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-emoticon"; asd = "maiden-emoticon"; } @@ -71841,12 +71159,12 @@ lib.makeScope pkgs.newScope (self: { maiden-help = ( build-asdf-system { pname = "maiden-help"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-help" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-help"; asd = "maiden-help"; } @@ -71865,12 +71183,12 @@ lib.makeScope pkgs.newScope (self: { maiden-irc = ( build-asdf-system { pname = "maiden-irc"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-irc" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-irc"; asd = "maiden-irc"; } @@ -71893,12 +71211,12 @@ lib.makeScope pkgs.newScope (self: { maiden-lastfm = ( build-asdf-system { pname = "maiden-lastfm"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-lastfm" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-lastfm"; asd = "maiden-lastfm"; } @@ -71919,12 +71237,12 @@ lib.makeScope pkgs.newScope (self: { maiden-lichat = ( build-asdf-system { pname = "maiden-lichat"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-lichat" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-lichat"; asd = "maiden-lichat"; } @@ -71943,12 +71261,12 @@ lib.makeScope pkgs.newScope (self: { maiden-location = ( build-asdf-system { pname = "maiden-location"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-location" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-location"; asd = "maiden-location"; } @@ -71968,12 +71286,12 @@ lib.makeScope pkgs.newScope (self: { maiden-lookup = ( build-asdf-system { pname = "maiden-lookup"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-lookup" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-lookup"; asd = "maiden-lookup"; } @@ -71995,12 +71313,12 @@ lib.makeScope pkgs.newScope (self: { maiden-markov = ( build-asdf-system { pname = "maiden-markov"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-markov" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-markov"; asd = "maiden-markov"; } @@ -72025,12 +71343,12 @@ lib.makeScope pkgs.newScope (self: { maiden-medals = ( build-asdf-system { pname = "maiden-medals"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-medals" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-medals"; asd = "maiden-medals"; } @@ -72051,12 +71369,12 @@ lib.makeScope pkgs.newScope (self: { maiden-networking = ( build-asdf-system { pname = "maiden-networking"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-networking" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-networking"; asd = "maiden-networking"; } @@ -72075,12 +71393,12 @@ lib.makeScope pkgs.newScope (self: { maiden-notify = ( build-asdf-system { pname = "maiden-notify"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-notify" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-notify"; asd = "maiden-notify"; } @@ -72100,12 +71418,12 @@ lib.makeScope pkgs.newScope (self: { maiden-permissions = ( build-asdf-system { pname = "maiden-permissions"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-permissions" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-permissions"; asd = "maiden-permissions"; } @@ -72126,12 +71444,12 @@ lib.makeScope pkgs.newScope (self: { maiden-relay = ( build-asdf-system { pname = "maiden-relay"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-relay" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-relay"; asd = "maiden-relay"; } @@ -72149,12 +71467,12 @@ lib.makeScope pkgs.newScope (self: { maiden-serialize = ( build-asdf-system { pname = "maiden-serialize"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-serialize" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-serialize"; asd = "maiden-serialize"; } @@ -72173,12 +71491,12 @@ lib.makeScope pkgs.newScope (self: { maiden-silly = ( build-asdf-system { pname = "maiden-silly"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-silly" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-silly"; asd = "maiden-silly"; } @@ -72201,12 +71519,12 @@ lib.makeScope pkgs.newScope (self: { maiden-storage = ( build-asdf-system { pname = "maiden-storage"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-storage" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-storage"; asd = "maiden-storage"; } @@ -72225,12 +71543,12 @@ lib.makeScope pkgs.newScope (self: { maiden-talk = ( build-asdf-system { pname = "maiden-talk"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-talk" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-talk"; asd = "maiden-talk"; } @@ -72252,12 +71570,12 @@ lib.makeScope pkgs.newScope (self: { maiden-throttle = ( build-asdf-system { pname = "maiden-throttle"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-throttle" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-throttle"; asd = "maiden-throttle"; } @@ -72276,12 +71594,12 @@ lib.makeScope pkgs.newScope (self: { maiden-time = ( build-asdf-system { pname = "maiden-time"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-time" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-time"; asd = "maiden-time"; } @@ -72301,12 +71619,12 @@ lib.makeScope pkgs.newScope (self: { maiden-trivia = ( build-asdf-system { pname = "maiden-trivia"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-trivia" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-trivia"; asd = "maiden-trivia"; } @@ -72326,12 +71644,12 @@ lib.makeScope pkgs.newScope (self: { maiden-twitter = ( build-asdf-system { pname = "maiden-twitter"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-twitter" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-twitter"; asd = "maiden-twitter"; } @@ -72349,12 +71667,12 @@ lib.makeScope pkgs.newScope (self: { maiden-urlinfo = ( build-asdf-system { pname = "maiden-urlinfo"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-urlinfo" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-urlinfo"; asd = "maiden-urlinfo"; } @@ -72376,12 +71694,12 @@ lib.makeScope pkgs.newScope (self: { maiden-vote = ( build-asdf-system { pname = "maiden-vote"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-vote" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-vote"; asd = "maiden-vote"; } @@ -72400,12 +71718,12 @@ lib.makeScope pkgs.newScope (self: { maiden-weather = ( build-asdf-system { pname = "maiden-weather"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "maiden-weather" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz"; - sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm"; + url = "https://beta.quicklisp.org/archive/maiden/2026-01-01/maiden-20260101-git.tgz"; + sha256 = "18xwj8bfiak9ga3yynvy12kvzkm2pv2vzsfsngmffhdpjzrbc5kv"; system = "maiden-weather"; asd = "maiden-weather"; } @@ -72562,12 +71880,12 @@ lib.makeScope pkgs.newScope (self: { manifolds = ( build-asdf-system { pname = "manifolds"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "manifolds" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/manifolds/2025-06-22/manifolds-20250622-git.tgz"; - sha256 = "0gygnblkd8x134lanj535mi14r5xgdp4kzv7g8a1l8p2drqqwrhw"; + url = "https://beta.quicklisp.org/archive/manifolds/2026-01-01/manifolds-20260101-git.tgz"; + sha256 = "1jzlii61fhnkiwybrnwcd7y00sfjhqfxfzf93qvz4f2fbmpxr6lb"; system = "manifolds"; asd = "manifolds"; } @@ -72803,12 +72121,12 @@ lib.makeScope pkgs.newScope (self: { math = ( build-asdf-system { pname = "math"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "math" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/math/2025-06-22/math-20250622-git.tgz"; - sha256 = "1rgx28m2cjp7bmrnmdhl4f74sdwvs6f4n15699hqhds3p11yk4r8"; + url = "https://beta.quicklisp.org/archive/math/2026-01-01/math-20260101-git.tgz"; + sha256 = "005qm4h7prfaqixlfx72icyb1x95srys21rify96kr106vp0gah4"; system = "math"; asd = "math"; } @@ -72826,6 +72144,29 @@ lib.makeScope pkgs.newScope (self: { }; } ); + math-tests = ( + build-asdf-system { + pname = "math-tests"; + version = "20260101-git"; + asds = [ "math-tests" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/math/2026-01-01/math-20260101-git.tgz"; + sha256 = "005qm4h7prfaqixlfx72icyb1x95srys21rify96kr106vp0gah4"; + system = "math-tests"; + asd = "math-tests"; + } + ); + systems = [ "math-tests" ]; + lispLibs = [ + (getAttr "fiveam" self) + (getAttr "math" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); mathkit = ( build-asdf-system { pname = "mathkit"; @@ -73038,12 +72379,12 @@ lib.makeScope pkgs.newScope (self: { mcclim = ( build-asdf-system { pname = "mcclim"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "mcclim" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "mcclim"; asd = "mcclim"; } @@ -73069,12 +72410,12 @@ lib.makeScope pkgs.newScope (self: { mcclim-bezier = ( build-asdf-system { pname = "mcclim-bezier"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "mcclim-bezier" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "mcclim-bezier"; asd = "mcclim-bezier"; } @@ -73097,12 +72438,12 @@ lib.makeScope pkgs.newScope (self: { mcclim-bitmaps = ( build-asdf-system { pname = "mcclim-bitmaps"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "mcclim-bitmaps" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "mcclim-bitmaps"; asd = "mcclim-bitmaps"; } @@ -73120,12 +72461,12 @@ lib.makeScope pkgs.newScope (self: { mcclim-clx = ( build-asdf-system { pname = "mcclim-clx"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "mcclim-clx" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "mcclim-clx"; asd = "mcclim-clx"; } @@ -73153,12 +72494,12 @@ lib.makeScope pkgs.newScope (self: { mcclim-clx-fb = ( build-asdf-system { pname = "mcclim-clx-fb"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "mcclim-clx-fb" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "mcclim-clx-fb"; asd = "mcclim-clx-fb"; } @@ -73176,12 +72517,12 @@ lib.makeScope pkgs.newScope (self: { mcclim-dot = ( build-asdf-system { pname = "mcclim-dot"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "mcclim-dot" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "mcclim-dot"; asd = "mcclim-dot"; } @@ -73204,12 +72545,12 @@ lib.makeScope pkgs.newScope (self: { mcclim-fontconfig = ( build-asdf-system { pname = "mcclim-fontconfig"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "mcclim-fontconfig" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "mcclim-fontconfig"; asd = "mcclim-fontconfig"; } @@ -73228,12 +72569,12 @@ lib.makeScope pkgs.newScope (self: { mcclim-fonts = ( build-asdf-system { pname = "mcclim-fonts"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "mcclim-fonts" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "mcclim-fonts"; asd = "mcclim-fonts"; } @@ -73248,12 +72589,12 @@ lib.makeScope pkgs.newScope (self: { mcclim-franz = ( build-asdf-system { pname = "mcclim-franz"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "mcclim-franz" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "mcclim-franz"; asd = "mcclim-franz"; } @@ -73268,12 +72609,12 @@ lib.makeScope pkgs.newScope (self: { mcclim-harfbuzz = ( build-asdf-system { pname = "mcclim-harfbuzz"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "mcclim-harfbuzz" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "mcclim-harfbuzz"; asd = "mcclim-harfbuzz"; } @@ -73293,12 +72634,12 @@ lib.makeScope pkgs.newScope (self: { mcclim-layouts = ( build-asdf-system { pname = "mcclim-layouts"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "mcclim-layouts" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "mcclim-layouts"; asd = "mcclim-layouts"; } @@ -73313,12 +72654,12 @@ lib.makeScope pkgs.newScope (self: { mcclim-null = ( build-asdf-system { pname = "mcclim-null"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "mcclim-null" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "mcclim-null"; asd = "mcclim-null"; } @@ -73333,12 +72674,12 @@ lib.makeScope pkgs.newScope (self: { mcclim-raster-image = ( build-asdf-system { pname = "mcclim-raster-image"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "mcclim-raster-image" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "mcclim-raster-image"; asd = "mcclim-raster-image"; } @@ -73356,12 +72697,12 @@ lib.makeScope pkgs.newScope (self: { mcclim-render = ( build-asdf-system { pname = "mcclim-render"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "mcclim-render" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "mcclim-render"; asd = "mcclim-render"; } @@ -73385,12 +72726,12 @@ lib.makeScope pkgs.newScope (self: { mcclim-svg = ( build-asdf-system { pname = "mcclim-svg"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "mcclim-svg" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "mcclim-svg"; asd = "mcclim-svg"; } @@ -73418,12 +72759,12 @@ lib.makeScope pkgs.newScope (self: { mcclim-tooltips = ( build-asdf-system { pname = "mcclim-tooltips"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "mcclim-tooltips" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "mcclim-tooltips"; asd = "mcclim-tooltips"; } @@ -73438,12 +72779,12 @@ lib.makeScope pkgs.newScope (self: { mcclim-tree-with-cross-edges = ( build-asdf-system { pname = "mcclim-tree-with-cross-edges"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "mcclim-tree-with-cross-edges" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "mcclim-tree-with-cross-edges"; asd = "mcclim-tree-with-cross-edges"; } @@ -73544,12 +72885,12 @@ lib.makeScope pkgs.newScope (self: { memory-regions = ( build-asdf-system { pname = "memory-regions"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "memory-regions" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/memory-regions/2025-06-22/memory-regions-20250622-git.tgz"; - sha256 = "1a4w7h4bciszdk9m3yc1n20kawnxbplrxh3qy2l53x8qp20ydsp5"; + url = "https://beta.quicklisp.org/archive/memory-regions/2026-01-01/memory-regions-20260101-git.tgz"; + sha256 = "16l4jxypxva1pg5gcncpk7v7zp3nrb64qw7zf2vpfyhl9jjvm0m9"; system = "memory-regions"; asd = "memory-regions"; } @@ -73592,12 +72933,12 @@ lib.makeScope pkgs.newScope (self: { messagebox = ( build-asdf-system { pname = "messagebox"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "messagebox" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/messagebox/2025-06-22/messagebox-20250622-git.tgz"; - sha256 = "197bfxh4w7m967chsbv76qf65r9z7m7fi16b76g8l5vdpf9v6aaw"; + url = "https://beta.quicklisp.org/archive/messagebox/2026-01-01/messagebox-20260101-git.tgz"; + sha256 = "0i8j8sxggsqlglyyinjcgpris02s2vwc7rsmgn10slp03nqfhdc0"; system = "messagebox"; asd = "messagebox"; } @@ -74219,12 +73560,12 @@ lib.makeScope pkgs.newScope (self: { mgl-pax = ( build-asdf-system { pname = "mgl-pax"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "mgl-pax" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz"; - sha256 = "09wcwil8jyxm34cs7x1i3vclj84n6gxzxp21k0d23129c9adhi66"; + url = "https://beta.quicklisp.org/archive/mgl-pax/2026-01-01/mgl-pax-20260101-git.tgz"; + sha256 = "0avgalak566pzcdpnzvvhz4nqbwjp98xw5jvglvgbbxifs8x8azr"; system = "mgl-pax"; asd = "mgl-pax"; } @@ -74243,12 +73584,12 @@ lib.makeScope pkgs.newScope (self: { mgl-pax-bootstrap = ( build-asdf-system { pname = "mgl-pax-bootstrap"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "mgl-pax-bootstrap" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz"; - sha256 = "09wcwil8jyxm34cs7x1i3vclj84n6gxzxp21k0d23129c9adhi66"; + url = "https://beta.quicklisp.org/archive/mgl-pax/2026-01-01/mgl-pax-20260101-git.tgz"; + sha256 = "0avgalak566pzcdpnzvvhz4nqbwjp98xw5jvglvgbbxifs8x8azr"; system = "mgl-pax-bootstrap"; asd = "mgl-pax-bootstrap"; } @@ -74266,12 +73607,12 @@ lib.makeScope pkgs.newScope (self: { mgl-pax-test = ( build-asdf-system { pname = "mgl-pax-test"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "mgl-pax-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz"; - sha256 = "09wcwil8jyxm34cs7x1i3vclj84n6gxzxp21k0d23129c9adhi66"; + url = "https://beta.quicklisp.org/archive/mgl-pax/2026-01-01/mgl-pax-20260101-git.tgz"; + sha256 = "0avgalak566pzcdpnzvvhz4nqbwjp98xw5jvglvgbbxifs8x8azr"; system = "mgl-pax-test"; asd = "mgl-pax-test"; } @@ -74301,12 +73642,12 @@ lib.makeScope pkgs.newScope (self: { mgl-pax_dot_asdf = ( build-asdf-system { pname = "mgl-pax.asdf"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "mgl-pax.asdf" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz"; - sha256 = "09wcwil8jyxm34cs7x1i3vclj84n6gxzxp21k0d23129c9adhi66"; + url = "https://beta.quicklisp.org/archive/mgl-pax/2026-01-01/mgl-pax-20260101-git.tgz"; + sha256 = "0avgalak566pzcdpnzvvhz4nqbwjp98xw5jvglvgbbxifs8x8azr"; system = "mgl-pax.asdf"; asd = "mgl-pax.asdf"; } @@ -74525,12 +73866,12 @@ lib.makeScope pkgs.newScope (self: { minpack = ( build-asdf-system { pname = "minpack"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "minpack" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; - sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; + url = "https://beta.quicklisp.org/archive/f2cl/2026-01-01/f2cl-20260101-git.tgz"; + sha256 = "025hdyvyk9il71aya05sma13m3x9yxcj7g3sadpzck55manbpfnm"; system = "minpack"; asd = "minpack"; } @@ -74545,12 +73886,12 @@ lib.makeScope pkgs.newScope (self: { misc-extensions = ( build-asdf-system { pname = "misc-extensions"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "misc-extensions" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/misc-extensions/2025-06-22/misc-extensions-20250622-git.tgz"; - sha256 = "168gi0d77rqh2nl1v8h3sj2ajjc9dk2imgbbir4y5v10915mzb6l"; + url = "https://beta.quicklisp.org/archive/misc-extensions/2026-01-01/misc-extensions-20260101-git.tgz"; + sha256 = "0q46hr75kzrqwg83f05ymxfd9k6dky6mm3c05xm8b2ryywhikzf7"; system = "misc-extensions"; asd = "misc-extensions"; } @@ -74563,12 +73904,12 @@ lib.makeScope pkgs.newScope (self: { mito = ( build-asdf-system { pname = "mito"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "mito" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mito/2025-06-22/mito-20250622-git.tgz"; - sha256 = "17s00avmyy3ghzxb43hvjx2250w5b24vbcg2daf811qirl05s096"; + url = "https://beta.quicklisp.org/archive/mito/2026-01-01/mito-20260101-git.tgz"; + sha256 = "126hfa1vj78j0lffjfjikkcnxb63kpd4vr2j5jqisma0naxsymql"; system = "mito"; asd = "mito"; } @@ -74617,12 +73958,12 @@ lib.makeScope pkgs.newScope (self: { mito-auth = ( build-asdf-system { pname = "mito-auth"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "mito-auth" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mito-auth/2025-06-22/mito-auth-20250622-git.tgz"; - sha256 = "1xffrhlihkn1mckyxrxz5kjy44y85vbyrhdzg7iaixy5qf742b45"; + url = "https://beta.quicklisp.org/archive/mito-auth/2026-01-01/mito-auth-20260101-git.tgz"; + sha256 = "03k4wgyyvyx7f6nznfyl1mrms9z39pkwn4wnpwj8jfsg3zcny0k3"; system = "mito-auth"; asd = "mito-auth"; } @@ -74641,12 +73982,12 @@ lib.makeScope pkgs.newScope (self: { mito-core = ( build-asdf-system { pname = "mito-core"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "mito-core" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mito/2025-06-22/mito-20250622-git.tgz"; - sha256 = "17s00avmyy3ghzxb43hvjx2250w5b24vbcg2daf811qirl05s096"; + url = "https://beta.quicklisp.org/archive/mito/2026-01-01/mito-20260101-git.tgz"; + sha256 = "126hfa1vj78j0lffjfjikkcnxb63kpd4vr2j5jqisma0naxsymql"; system = "mito-core"; asd = "mito-core"; } @@ -74671,12 +74012,12 @@ lib.makeScope pkgs.newScope (self: { mito-migration = ( build-asdf-system { pname = "mito-migration"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "mito-migration" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mito/2025-06-22/mito-20250622-git.tgz"; - sha256 = "17s00avmyy3ghzxb43hvjx2250w5b24vbcg2daf811qirl05s096"; + url = "https://beta.quicklisp.org/archive/mito/2026-01-01/mito-20260101-git.tgz"; + sha256 = "126hfa1vj78j0lffjfjikkcnxb63kpd4vr2j5jqisma0naxsymql"; system = "mito-migration"; asd = "mito-migration"; } @@ -74699,12 +74040,12 @@ lib.makeScope pkgs.newScope (self: { mito-test = ( build-asdf-system { pname = "mito-test"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "mito-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mito/2025-06-22/mito-20250622-git.tgz"; - sha256 = "17s00avmyy3ghzxb43hvjx2250w5b24vbcg2daf811qirl05s096"; + url = "https://beta.quicklisp.org/archive/mito/2026-01-01/mito-20260101-git.tgz"; + sha256 = "126hfa1vj78j0lffjfjikkcnxb63kpd4vr2j5jqisma0naxsymql"; system = "mito-test"; asd = "mito-test"; } @@ -74821,12 +74162,12 @@ lib.makeScope pkgs.newScope (self: { mk-defsystem = ( build-asdf-system { pname = "mk-defsystem"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "mk-defsystem" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mk-defsystem/2025-06-22/mk-defsystem-20250622-git.tgz"; - sha256 = "08dkr53ganqikg33a3b30zn8267bphx8mzmdl4302ri29srr0a1r"; + url = "https://beta.quicklisp.org/archive/mk-defsystem/2026-01-01/mk-defsystem-20260101-git.tgz"; + sha256 = "03w4aajk3srfvh2j2gydhmadxpyrr4mqrws1ycflhhcxlpfg9ca6"; system = "mk-defsystem"; asd = "mk-defsystem"; } @@ -74993,12 +74334,12 @@ lib.makeScope pkgs.newScope (self: { mmap = ( build-asdf-system { pname = "mmap"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "mmap" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mmap/2025-06-22/mmap-20250622-git.tgz"; - sha256 = "1s233i80ja9xfk820x4yjccbbqh6llc90n4lmkjglrk4jjk28x1h"; + url = "https://beta.quicklisp.org/archive/mmap/2026-01-01/mmap-20260101-git.tgz"; + sha256 = "0hixg32hf42wn8218a3hgqx1qz9lp53yg2zi3ws4pymi4dgn1282"; system = "mmap"; asd = "mmap"; } @@ -75016,12 +74357,12 @@ lib.makeScope pkgs.newScope (self: { mmap-test = ( build-asdf-system { pname = "mmap-test"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "mmap-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mmap/2025-06-22/mmap-20250622-git.tgz"; - sha256 = "1s233i80ja9xfk820x4yjccbbqh6llc90n4lmkjglrk4jjk28x1h"; + url = "https://beta.quicklisp.org/archive/mmap/2026-01-01/mmap-20260101-git.tgz"; + sha256 = "0hixg32hf42wn8218a3hgqx1qz9lp53yg2zi3ws4pymi4dgn1282"; system = "mmap-test"; asd = "mmap-test"; } @@ -75111,12 +74452,12 @@ lib.makeScope pkgs.newScope (self: { mnas-path = ( build-asdf-system { pname = "mnas-path"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "mnas-path" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mnas-path/2025-06-22/mnas-path-20250622-git.tgz"; - sha256 = "0lkgxk7kacy6c7x6sy1ykfpjqr945721fvjgjvlxndf4xhja6vl8"; + url = "https://beta.quicklisp.org/archive/mnas-path/2026-01-01/mnas-path-20260101-git.tgz"; + sha256 = "1625sbb4cldpp28wx26p4dkfpsf7w8nh4pghgs64rbbm9zccillb"; system = "mnas-path"; asd = "mnas-path"; } @@ -75389,12 +74730,12 @@ lib.makeScope pkgs.newScope (self: { modularize = ( build-asdf-system { pname = "modularize"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "modularize" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/modularize/2025-06-22/modularize-20250622-git.tgz"; - sha256 = "01ybc1mizn9xaxb2dbvvw8qvwwcz47kx0hma2nlq3kw8v7par58y"; + url = "https://beta.quicklisp.org/archive/modularize/2026-01-01/modularize-20260101-git.tgz"; + sha256 = "0c7hxdhy6ccbmqp4ycgyavm77c4lkl3mq6d0jw5l13n4vw3hw0m9"; system = "modularize"; asd = "modularize"; } @@ -75412,12 +74753,12 @@ lib.makeScope pkgs.newScope (self: { modularize-hooks = ( build-asdf-system { pname = "modularize-hooks"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "modularize-hooks" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/modularize-hooks/2025-06-22/modularize-hooks-20250622-git.tgz"; - sha256 = "0gqb217j7hgdsqzq9dbqb9wf2wp3vf1iijivixdkmbvl27d5jxmp"; + url = "https://beta.quicklisp.org/archive/modularize-hooks/2026-01-01/modularize-hooks-20260101-git.tgz"; + sha256 = "049k7qi2w4wrjbzfs90cx455xmb7r5dgqhqxd6bj7k4l95n1hrcc"; system = "modularize-hooks"; asd = "modularize-hooks"; } @@ -75437,12 +74778,12 @@ lib.makeScope pkgs.newScope (self: { modularize-interfaces = ( build-asdf-system { pname = "modularize-interfaces"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "modularize-interfaces" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/modularize-interfaces/2023-10-21/modularize-interfaces-20231021-git.tgz"; - sha256 = "0lmq2jbkbr5wrrjl2qb1x64fcvl0lmii0h9301b9bq4d47s4w8sh"; + url = "https://beta.quicklisp.org/archive/modularize-interfaces/2026-01-01/modularize-interfaces-20260101-git.tgz"; + sha256 = "1whrz4la3bgx1d5m4xx2c0iir80sm944q02bb5vr9jkddn0r16mm"; system = "modularize-interfaces"; asd = "modularize-interfaces"; } @@ -75462,12 +74803,12 @@ lib.makeScope pkgs.newScope (self: { modularize-test-module = ( build-asdf-system { pname = "modularize-test-module"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "modularize-test-module" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/modularize/2025-06-22/modularize-20250622-git.tgz"; - sha256 = "01ybc1mizn9xaxb2dbvvw8qvwwcz47kx0hma2nlq3kw8v7par58y"; + url = "https://beta.quicklisp.org/archive/modularize/2026-01-01/modularize-20260101-git.tgz"; + sha256 = "0c7hxdhy6ccbmqp4ycgyavm77c4lkl3mq6d0jw5l13n4vw3hw0m9"; system = "modularize-test-module"; asd = "modularize-test-module"; } @@ -75949,12 +75290,12 @@ lib.makeScope pkgs.newScope (self: { multilang-documentation = ( build-asdf-system { pname = "multilang-documentation"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "multilang-documentation" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/multilang-documentation/2025-06-22/multilang-documentation-20250622-git.tgz"; - sha256 = "1bhb1vqgahj5nw5rb4y8c22ksh10h12zn5y8qkpz772j3dnnxhhn"; + url = "https://beta.quicklisp.org/archive/multilang-documentation/2026-01-01/multilang-documentation-20260101-git.tgz"; + sha256 = "0xiac8ps4gckr2mgqsas56jwwcjasphl237nppm8jc6j2gxpqmw2"; system = "multilang-documentation"; asd = "multilang-documentation"; } @@ -75973,12 +75314,12 @@ lib.makeScope pkgs.newScope (self: { multilang-documentation-utils = ( build-asdf-system { pname = "multilang-documentation-utils"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "multilang-documentation-utils" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/documentation-utils/2025-06-22/documentation-utils-20250622-git.tgz"; - sha256 = "1rmb9m3rilj5c4cr7bn5gnx1wrksi85zizp4hr7409qzg345mg7l"; + url = "https://beta.quicklisp.org/archive/documentation-utils/2026-01-01/documentation-utils-20260101-git.tgz"; + sha256 = "0x0ckmihz19mcd0lfbd9237ky881ifgrd9hv528qli7xnv0r1kz9"; system = "multilang-documentation-utils"; asd = "multilang-documentation-utils"; } @@ -76020,12 +75361,12 @@ lib.makeScope pkgs.newScope (self: { multiposter = ( build-asdf-system { pname = "multiposter"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "multiposter" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/multiposter/2024-10-12/multiposter-20241012-git.tgz"; - sha256 = "1q1zinv4csnb0yjlndym5dlf7apax3f5qdiids3dlai09jb4hbjg"; + url = "https://beta.quicklisp.org/archive/multiposter/2026-01-01/multiposter-20260101-git.tgz"; + sha256 = "0gx34s9r675bkvh8x59w38k6ih1mj676avdhjrdkbaid6laycb4i"; system = "multiposter"; asd = "multiposter"; } @@ -76129,12 +75470,12 @@ lib.makeScope pkgs.newScope (self: { mutility = ( build-asdf-system { pname = "mutility"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "mutility" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mutility/2025-06-22/mutility-20250622-git.tgz"; - sha256 = "1vzcns6wsddd3jmy7kxs6gv27nhqncmpxc68xpikdznsm20qn9kb"; + url = "https://beta.quicklisp.org/archive/mutility/2026-01-01/mutility-20260101-git.tgz"; + sha256 = "1314si9wj55chfbxifnjc7vaxwx0f6b1jad4aw5gvcid26z1qg06"; system = "mutility"; asd = "mutility"; } @@ -76153,12 +75494,12 @@ lib.makeScope pkgs.newScope (self: { mutils = ( build-asdf-system { pname = "mutils"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "mutils" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mutils/2025-06-22/mutils-20250622-git.tgz"; - sha256 = "03inzkq60rbn0bskviqkx7n6akg7fjyvv1cnxnd85wjan3qssw0b"; + url = "https://beta.quicklisp.org/archive/mutils/2026-01-01/mutils-20260101-git.tgz"; + sha256 = "0yvx3h2xgq9n92wz05wirhwmw191rxb03rnibmh00q6wdnii08cn"; system = "mutils"; asd = "mutils"; } @@ -76548,6 +75889,26 @@ lib.makeScope pkgs.newScope (self: { }; } ); + named-let = ( + build-asdf-system { + pname = "named-let"; + version = "20260101-git"; + asds = [ "named-let" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/named-let/2026-01-01/named-let-20260101-git.tgz"; + sha256 = "1r7qp86xl2r2f4n792h5m07nmrpj0ch8zw7xb8fr7hwa4iadpwhc"; + system = "named-let"; + asd = "named-let"; + } + ); + systems = [ "named-let" ]; + lispLibs = [ ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); named-read-macros = ( build-asdf-system { pname = "named-read-macros"; @@ -76594,12 +75955,12 @@ lib.makeScope pkgs.newScope (self: { named-readtables = ( build-asdf-system { pname = "named-readtables"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "named-readtables" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/named-readtables/2025-06-22/named-readtables-20250622-git.tgz"; - sha256 = "0wm7k1xq6c8rji121wfnv396l59bw87010c7mqhdj9vg7amyr9af"; + url = "https://beta.quicklisp.org/archive/named-readtables/2026-01-01/named-readtables-20260101-git.tgz"; + sha256 = "0r3gi1856l8xsg8rdz1qr1kir420mshzj0hg630ak5a7zg71w94f"; system = "named-readtables"; asd = "named-readtables"; } @@ -76612,12 +75973,12 @@ lib.makeScope pkgs.newScope (self: { named-readtables-test = ( build-asdf-system { pname = "named-readtables-test"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "named-readtables-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/named-readtables/2025-06-22/named-readtables-20250622-git.tgz"; - sha256 = "0wm7k1xq6c8rji121wfnv396l59bw87010c7mqhdj9vg7amyr9af"; + url = "https://beta.quicklisp.org/archive/named-readtables/2026-01-01/named-readtables-20260101-git.tgz"; + sha256 = "0r3gi1856l8xsg8rdz1qr1kir420mshzj0hg630ak5a7zg71w94f"; system = "named-readtables-test"; asd = "named-readtables-test"; } @@ -77046,15 +76407,81 @@ lib.makeScope pkgs.newScope (self: { }; } ); + net_dot_didierverna_dot_declt = ( + build-asdf-system { + pname = "net.didierverna.declt"; + version = "20260101-git"; + asds = [ "net.didierverna.declt" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/declt/2026-01-01/declt-20260101-git.tgz"; + sha256 = "1sp1kwj5b7qznx040xcmg2ljyc4dz991ah3z5l0ajd1n742h8b7d"; + system = "net.didierverna.declt"; + asd = "net.didierverna.declt"; + } + ); + systems = [ "net.didierverna.declt" ]; + lispLibs = [ + (getAttr "net_dot_didierverna_dot_declt_dot_core" self) + (getAttr "net_dot_didierverna_dot_declt_dot_setup" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + net_dot_didierverna_dot_declt_dot_assess = ( + build-asdf-system { + pname = "net.didierverna.declt.assess"; + version = "20260101-git"; + asds = [ "net.didierverna.declt.assess" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/declt/2026-01-01/declt-20260101-git.tgz"; + sha256 = "1sp1kwj5b7qznx040xcmg2ljyc4dz991ah3z5l0ajd1n742h8b7d"; + system = "net.didierverna.declt.assess"; + asd = "net.didierverna.declt.assess"; + } + ); + systems = [ "net.didierverna.declt.assess" ]; + lispLibs = [ (getAttr "net_dot_didierverna_dot_declt_dot_setup" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + net_dot_didierverna_dot_declt_dot_core = ( + build-asdf-system { + pname = "net.didierverna.declt.core"; + version = "20260101-git"; + asds = [ "net.didierverna.declt.core" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/declt/2026-01-01/declt-20260101-git.tgz"; + sha256 = "1sp1kwj5b7qznx040xcmg2ljyc4dz991ah3z5l0ajd1n742h8b7d"; + system = "net.didierverna.declt.core"; + asd = "net.didierverna.declt.core"; + } + ); + systems = [ "net.didierverna.declt.core" ]; + lispLibs = [ + (getAttr "net_dot_didierverna_dot_declt_dot_assess" self) + (getAttr "net_dot_didierverna_dot_declt_dot_setup" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); net_dot_didierverna_dot_declt_dot_setup = ( build-asdf-system { pname = "net.didierverna.declt.setup"; - version = "4.0b2"; + version = "20260101-git"; asds = [ "net.didierverna.declt.setup" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/declt/2024-10-12/declt-4.0b2.tgz"; - sha256 = "1xkbf1xqrkmr8na09b0spmrznsx2ml10i9q026zv9mpbsc7gh0i6"; + url = "https://beta.quicklisp.org/archive/declt/2026-01-01/declt-20260101-git.tgz"; + sha256 = "1sp1kwj5b7qznx040xcmg2ljyc4dz991ah3z5l0ajd1n742h8b7d"; system = "net.didierverna.declt.setup"; asd = "net.didierverna.declt.setup"; } @@ -77254,6 +76681,33 @@ lib.makeScope pkgs.newScope (self: { }; } ); + netaddr = ( + build-asdf-system { + pname = "netaddr"; + version = "20260101-git"; + asds = [ "netaddr" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/netaddr/2026-01-01/netaddr-20260101-git.tgz"; + sha256 = "1k16havpga84qrvxv1398vqis2ilni7rinz2dmbrac8d7digli1w"; + system = "netaddr"; + asd = "netaddr"; + } + ); + systems = [ "netaddr" ]; + lispLibs = [ + (getAttr "alexandria" self) + (getAttr "cl-ppcre" self) + (getAttr "closer-mop" self) + (getAttr "computable-reals" self) + (getAttr "split-sequence" self) + (getAttr "str" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); network-addresses = ( build-asdf-system { pname = "network-addresses"; @@ -77300,12 +76754,12 @@ lib.makeScope pkgs.newScope (self: { neural-classifier = ( build-asdf-system { pname = "neural-classifier"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "neural-classifier" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/neural-classifier/2024-10-12/neural-classifier-20241012-git.tgz"; - sha256 = "0aq7m781c27di7lfs1a7di55f31i7x490yfd2033738biqn0x019"; + url = "https://beta.quicklisp.org/archive/neural-classifier/2026-01-01/neural-classifier-20260101-git.tgz"; + sha256 = "090a15rv9fjhcqqfyi77xg7pfb4gik9fkmx45dawcvrlg4666sr3"; system = "neural-classifier"; asd = "neural-classifier"; } @@ -77325,12 +76779,12 @@ lib.makeScope pkgs.newScope (self: { new-op = ( build-asdf-system { pname = "new-op"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "new-op" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/new-op/2025-06-22/new-op-20250622-git.tgz"; - sha256 = "1kw7rbrnjq9bk8i6gx17si8kdz58c5bxaf23zvxkprzzd4ydlrv0"; + url = "https://beta.quicklisp.org/archive/new-op/2026-01-01/new-op-20260101-git.tgz"; + sha256 = "15jhqy0lspr3k0iq6jhrxv65gsm2rdr5apkm2wcxlgiczysb5vah"; system = "new-op"; asd = "new-op"; } @@ -77589,12 +77043,12 @@ lib.makeScope pkgs.newScope (self: { nodgui = ( build-asdf-system { pname = "nodgui"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "nodgui" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/nodgui/2025-06-22/nodgui-20250622-git.tgz"; - sha256 = "01lkgb2xk2lgq32fflsbf1p0mxxpk3215awhb1f01hgdnr94r7fa"; + url = "https://beta.quicklisp.org/archive/nodgui/2026-01-01/nodgui-20260101-git.tgz"; + sha256 = "1fskj56ry9xdimycsi72x61g9xxda5zqa1s77xx9hjj4wv9kz80i"; system = "nodgui"; asd = "nodgui"; } @@ -77627,12 +77081,12 @@ lib.makeScope pkgs.newScope (self: { nodgui-lite = ( build-asdf-system { pname = "nodgui-lite"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "nodgui-lite" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/nodgui/2025-06-22/nodgui-20250622-git.tgz"; - sha256 = "01lkgb2xk2lgq32fflsbf1p0mxxpk3215awhb1f01hgdnr94r7fa"; + url = "https://beta.quicklisp.org/archive/nodgui/2026-01-01/nodgui-20260101-git.tgz"; + sha256 = "1fskj56ry9xdimycsi72x61g9xxda5zqa1s77xx9hjj4wv9kz80i"; system = "nodgui-lite"; asd = "nodgui-lite"; } @@ -77681,12 +77135,12 @@ lib.makeScope pkgs.newScope (self: { nontrivial-gray-streams = ( build-asdf-system { pname = "nontrivial-gray-streams"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "nontrivial-gray-streams" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/nontrivial-gray-streams/2025-06-22/nontrivial-gray-streams-20250622-git.tgz"; - sha256 = "1x5b2fw3kr1227vr4hab08cls5f7rzz7kf31xinvafbl5hpd2ynf"; + url = "https://beta.quicklisp.org/archive/nontrivial-gray-streams/2026-01-01/nontrivial-gray-streams-20260101-git.tgz"; + sha256 = "0l7dg253yrfxkf20yl2c9x8lc4q3p56bl47mrinpx3vrgb3i174p"; system = "nontrivial-gray-streams"; asd = "nontrivial-gray-streams"; } @@ -77701,12 +77155,12 @@ lib.makeScope pkgs.newScope (self: { north = ( build-asdf-system { pname = "north"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "north" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/north/2025-06-22/north-20250622-git.tgz"; - sha256 = "1vvcg5xd44siap7cfi4lzjdl7djq2vmyhpcdjd7fq86n30xqhnbk"; + url = "https://beta.quicklisp.org/archive/north/2026-01-01/north-20260101-git.tgz"; + sha256 = "0rk4ch9ydwzih5izf19l9hl9arj6pf0z61sibh35irp659vglxd6"; system = "north"; asd = "north"; } @@ -77721,12 +77175,12 @@ lib.makeScope pkgs.newScope (self: { north-core = ( build-asdf-system { pname = "north-core"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "north-core" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/north/2025-06-22/north-20250622-git.tgz"; - sha256 = "1vvcg5xd44siap7cfi4lzjdl7djq2vmyhpcdjd7fq86n30xqhnbk"; + url = "https://beta.quicklisp.org/archive/north/2026-01-01/north-20260101-git.tgz"; + sha256 = "0rk4ch9ydwzih5izf19l9hl9arj6pf0z61sibh35irp659vglxd6"; system = "north-core"; asd = "north-core"; } @@ -77748,12 +77202,12 @@ lib.makeScope pkgs.newScope (self: { north-dexador = ( build-asdf-system { pname = "north-dexador"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "north-dexador" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/north/2025-06-22/north-20250622-git.tgz"; - sha256 = "1vvcg5xd44siap7cfi4lzjdl7djq2vmyhpcdjd7fq86n30xqhnbk"; + url = "https://beta.quicklisp.org/archive/north/2026-01-01/north-20260101-git.tgz"; + sha256 = "0rk4ch9ydwzih5izf19l9hl9arj6pf0z61sibh35irp659vglxd6"; system = "north-dexador"; asd = "north-dexador"; } @@ -77771,12 +77225,12 @@ lib.makeScope pkgs.newScope (self: { north-drakma = ( build-asdf-system { pname = "north-drakma"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "north-drakma" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/north/2025-06-22/north-20250622-git.tgz"; - sha256 = "1vvcg5xd44siap7cfi4lzjdl7djq2vmyhpcdjd7fq86n30xqhnbk"; + url = "https://beta.quicklisp.org/archive/north/2026-01-01/north-20260101-git.tgz"; + sha256 = "0rk4ch9ydwzih5izf19l9hl9arj6pf0z61sibh35irp659vglxd6"; system = "north-drakma"; asd = "north-drakma"; } @@ -77794,12 +77248,12 @@ lib.makeScope pkgs.newScope (self: { north-example = ( build-asdf-system { pname = "north-example"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "north-example" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/north/2025-06-22/north-20250622-git.tgz"; - sha256 = "1vvcg5xd44siap7cfi4lzjdl7djq2vmyhpcdjd7fq86n30xqhnbk"; + url = "https://beta.quicklisp.org/archive/north/2026-01-01/north-20260101-git.tgz"; + sha256 = "0rk4ch9ydwzih5izf19l9hl9arj6pf0z61sibh35irp659vglxd6"; system = "north-example"; asd = "north-example"; } @@ -78171,12 +77625,12 @@ lib.makeScope pkgs.newScope (self: { num-utils = ( build-asdf-system { pname = "num-utils"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "num-utils" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/numerical-utilities/2024-10-12/numerical-utilities-20241012-git.tgz"; - sha256 = "00ck2bj4pqir2aan26xhirk41wzrfaziqmnngabhmwi0hz81bjs6"; + url = "https://beta.quicklisp.org/archive/numerical-utilities/2026-01-01/numerical-utilities-20260101-git.tgz"; + sha256 = "1vw6253ymfy3q6a02ji5czavrx5mmv3axn2dwzqbyb06p1565z5g"; system = "num-utils"; asd = "num-utils"; } @@ -78195,61 +77649,6 @@ lib.makeScope pkgs.newScope (self: { }; } ); - numcl = ( - build-asdf-system { - pname = "numcl"; - version = "20221106-git"; - asds = [ "numcl" ]; - src = ( - createAsd { - url = "https://beta.quicklisp.org/archive/numcl/2022-11-06/numcl-20221106-git.tgz"; - sha256 = "1x0j4vx5w3rn18pssfwys3ghfxr2lkkrv37y47144kr890jrcad9"; - system = "numcl"; - asd = "numcl"; - } - ); - systems = [ "numcl" ]; - lispLibs = [ - (getAttr "alexandria" self) - (getAttr "cl-randist" self) - (getAttr "constantfold" self) - (getAttr "float-features" self) - (getAttr "function-cache" self) - (getAttr "gtype" self) - (getAttr "iterate" self) - (getAttr "lisp-namespace" self) - (getAttr "specialized-function" self) - (getAttr "trivia" self) - (getAttr "type-r" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - numcl_dot_test = ( - build-asdf-system { - pname = "numcl.test"; - version = "20221106-git"; - asds = [ "numcl.test" ]; - src = ( - createAsd { - url = "https://beta.quicklisp.org/archive/numcl/2022-11-06/numcl-20221106-git.tgz"; - sha256 = "1x0j4vx5w3rn18pssfwys3ghfxr2lkkrv37y47144kr890jrcad9"; - system = "numcl.test"; - asd = "numcl.test"; - } - ); - systems = [ "numcl.test" ]; - lispLibs = [ - (getAttr "fiveam" self) - (getAttr "numcl" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); numericals = ( build-asdf-system { pname = "numericals"; @@ -78475,12 +77874,12 @@ lib.makeScope pkgs.newScope (self: { oclcl = ( build-asdf-system { pname = "oclcl"; - version = "20190521-git"; + version = "20260101-git"; asds = [ "oclcl" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/oclcl/2019-05-21/oclcl-20190521-git.tgz"; - sha256 = "1ccyrv4fknpln5askl8cpnwbp28sikrs6i3dwzm86jwhv272zc8q"; + url = "https://beta.quicklisp.org/archive/oclcl/2026-01-01/oclcl-20260101-git.tgz"; + sha256 = "05khk5xnz1fx6bgnfgfspxhjrbh370d4rjpwfigk5m9hlabfr5qf"; system = "oclcl"; asd = "oclcl"; } @@ -78495,6 +77894,7 @@ lib.makeScope pkgs.newScope (self: { (getAttr "external-program" self) (getAttr "lisp-namespace" self) (getAttr "osicat" self) + (getAttr "serapeum" self) (getAttr "split-sequence" self) ]; meta = { @@ -78505,12 +77905,12 @@ lib.makeScope pkgs.newScope (self: { oclcl-examples = ( build-asdf-system { pname = "oclcl-examples"; - version = "20190521-git"; + version = "20260101-git"; asds = [ "oclcl-examples" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/oclcl/2019-05-21/oclcl-20190521-git.tgz"; - sha256 = "1ccyrv4fknpln5askl8cpnwbp28sikrs6i3dwzm86jwhv272zc8q"; + url = "https://beta.quicklisp.org/archive/oclcl/2026-01-01/oclcl-20260101-git.tgz"; + sha256 = "05khk5xnz1fx6bgnfgfspxhjrbh370d4rjpwfigk5m9hlabfr5qf"; system = "oclcl-examples"; asd = "oclcl-examples"; } @@ -78526,25 +77926,24 @@ lib.makeScope pkgs.newScope (self: { }; } ); - oclcl-test = ( + oclcl-tests = ( build-asdf-system { - pname = "oclcl-test"; - version = "20190521-git"; - asds = [ "oclcl-test" ]; + pname = "oclcl-tests"; + version = "20260101-git"; + asds = [ "oclcl-tests" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/oclcl/2019-05-21/oclcl-20190521-git.tgz"; - sha256 = "1ccyrv4fknpln5askl8cpnwbp28sikrs6i3dwzm86jwhv272zc8q"; - system = "oclcl-test"; - asd = "oclcl-test"; + url = "https://beta.quicklisp.org/archive/oclcl/2026-01-01/oclcl-20260101-git.tgz"; + sha256 = "05khk5xnz1fx6bgnfgfspxhjrbh370d4rjpwfigk5m9hlabfr5qf"; + system = "oclcl-tests"; + asd = "oclcl-tests"; } ); - systems = [ "oclcl-test" ]; + systems = [ "oclcl-tests" ]; lispLibs = [ (getAttr "arrow-macros" self) (getAttr "oclcl" self) - (getAttr "prove" self) - (getAttr "prove-asdf" self) + (getAttr "rove" self) ]; meta = { hydraPlatforms = [ ]; @@ -78578,12 +77977,12 @@ lib.makeScope pkgs.newScope (self: { odepack = ( build-asdf-system { pname = "odepack"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "odepack" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; - sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; + url = "https://beta.quicklisp.org/archive/f2cl/2026-01-01/f2cl-20260101-git.tgz"; + sha256 = "025hdyvyk9il71aya05sma13m3x9yxcj7g3sadpzck55manbpfnm"; system = "odepack"; asd = "odepack"; } @@ -78688,12 +78087,12 @@ lib.makeScope pkgs.newScope (self: { omg = ( build-asdf-system { pname = "omg"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "omg" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/omglib/2025-06-22/omglib-20250622-git.tgz"; - sha256 = "0m3hzavsg8la8cjsdd153h1y8v2bjwmf31yl33nb7gnb2vb1nd5n"; + url = "https://beta.quicklisp.org/archive/omglib/2026-01-01/omglib-20260101-git.tgz"; + sha256 = "1hbzlvq7nczc9mjrv932c0c1f1qnhaxjy77gamkzgbw6zm2r7593"; system = "omg"; asd = "omg"; } @@ -78720,12 +78119,12 @@ lib.makeScope pkgs.newScope (self: { omgdaemon = ( build-asdf-system { pname = "omgdaemon"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "omgdaemon" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/omglib/2025-06-22/omglib-20250622-git.tgz"; - sha256 = "0m3hzavsg8la8cjsdd153h1y8v2bjwmf31yl33nb7gnb2vb1nd5n"; + url = "https://beta.quicklisp.org/archive/omglib/2026-01-01/omglib-20260101-git.tgz"; + sha256 = "1hbzlvq7nczc9mjrv932c0c1f1qnhaxjy77gamkzgbw6zm2r7593"; system = "omgdaemon"; asd = "omgdaemon"; } @@ -78752,12 +78151,12 @@ lib.makeScope pkgs.newScope (self: { one-more-re-nightmare = ( build-asdf-system { pname = "one-more-re-nightmare"; - version = "20250622-git"; + version = "20260101-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"; + url = "https://beta.quicklisp.org/archive/one-more-re-nightmare/2026-01-01/one-more-re-nightmare-20260101-git.tgz"; + sha256 = "1j1h63181fqjwrlcq5hvkbngy5kb77vd1byglgfvx03fvva9xnps"; system = "one-more-re-nightmare"; asd = "one-more-re-nightmare"; } @@ -78781,12 +78180,12 @@ lib.makeScope pkgs.newScope (self: { one-more-re-nightmare-simd = ( build-asdf-system { pname = "one-more-re-nightmare-simd"; - version = "20250622-git"; + version = "20260101-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"; + url = "https://beta.quicklisp.org/archive/one-more-re-nightmare/2026-01-01/one-more-re-nightmare-20260101-git.tgz"; + sha256 = "1j1h63181fqjwrlcq5hvkbngy5kb77vd1byglgfvx03fvva9xnps"; system = "one-more-re-nightmare-simd"; asd = "one-more-re-nightmare-simd"; } @@ -78801,18 +78200,19 @@ lib.makeScope pkgs.newScope (self: { one-more-re-nightmare-tests = ( build-asdf-system { pname = "one-more-re-nightmare-tests"; - version = "20250622-git"; + version = "20260101-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"; + url = "https://beta.quicklisp.org/archive/one-more-re-nightmare/2026-01-01/one-more-re-nightmare-20260101-git.tgz"; + sha256 = "1j1h63181fqjwrlcq5hvkbngy5kb77vd1byglgfvx03fvva9xnps"; system = "one-more-re-nightmare-tests"; asd = "one-more-re-nightmare-tests"; } ); systems = [ "one-more-re-nightmare-tests" ]; lispLibs = [ + (getAttr "cl-cpus" self) (getAttr "lparallel" self) (getAttr "one-more-re-nightmare" self) (getAttr "parachute" self) @@ -78825,12 +78225,12 @@ lib.makeScope pkgs.newScope (self: { ook = ( build-asdf-system { pname = "ook"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "ook" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/ook/2025-06-22/ook-20250622-git.tgz"; - sha256 = "0ibm7zii7nvjbz91ya5f98f1w3daxfpk1q6dcr59c9cimsnv2s3c"; + url = "https://beta.quicklisp.org/archive/ook/2026-01-01/ook-20260101-git.tgz"; + sha256 = "09hy7kb9m16ca89dndyw5ipv9n31zpdhsxmabb6ljy75djz3hi28"; system = "ook"; asd = "ook"; } @@ -78903,12 +78303,12 @@ lib.makeScope pkgs.newScope (self: { open-location-code = ( build-asdf-system { pname = "open-location-code"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "open-location-code" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/open-location-code/2024-10-12/open-location-code-20241012-git.tgz"; - sha256 = "17ip3xzqr2jk9br39d58grrjbk6gsh2mq1a9irjg9a5fig0jlyb2"; + url = "https://beta.quicklisp.org/archive/open-location-code/2026-01-01/open-location-code-20260101-git.tgz"; + sha256 = "1yvzxavz9kqiyqcqdzvd9nizk0i96np2g04j4dpi7qxqkza6fdyc"; system = "open-location-code"; asd = "open-location-code"; } @@ -78976,12 +78376,12 @@ lib.makeScope pkgs.newScope (self: { open-with = ( build-asdf-system { pname = "open-with"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "open-with" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/open-with/2025-06-22/open-with-20250622-git.tgz"; - sha256 = "0j0qv1389wbr84y3mis4qd2zz9qybnq4frvc01pamidsbryxss0r"; + url = "https://beta.quicklisp.org/archive/open-with/2026-01-01/open-with-20260101-git.tgz"; + sha256 = "05yyrz250jpjam8mmmlbz8iach5k443p22wpprhby3a47nx55i00"; system = "open-with"; asd = "open-with"; } @@ -79845,12 +79245,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_conduit-packages = ( build-asdf-system { pname = "org.tfeb.conduit-packages"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "org.tfeb.conduit-packages" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/conduit-packages/2025-06-22/conduit-packages-20250622-git.tgz"; - sha256 = "1nb58r52ic3k7dyis1h3pb16hf6nr37hr03drf09xhxir4n6gj77"; + url = "https://beta.quicklisp.org/archive/conduit-packages/2026-01-01/conduit-packages-20260101-git.tgz"; + sha256 = "0h4r8a0lx190zn3sm31v3pn39ba9w3y1w5ymg51ah6v9ibhgcn66"; system = "org.tfeb.conduit-packages"; asd = "org.tfeb.conduit-packages"; } @@ -79865,12 +79265,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_dsm = ( build-asdf-system { pname = "org.tfeb.dsm"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "org.tfeb.dsm" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/dsm/2025-06-22/dsm-20250622-git.tgz"; - sha256 = "1ahibwfrjdxvxw2rhfq4804lb9bidyzxcxwplc7sdfcsjzbvnzk7"; + url = "https://beta.quicklisp.org/archive/dsm/2026-01-01/dsm-20260101-git.tgz"; + sha256 = "1kcq6ng129iyy8r8fkzkrqw8z5p8zvgs9zw9d8mqwd4yh0wp0maz"; system = "org.tfeb.dsm"; asd = "org.tfeb.dsm"; } @@ -79891,12 +79291,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax = ( build-asdf-system { pname = "org.tfeb.hax"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "org.tfeb.hax" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; - sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2026-01-01/tfeb-lisp-hax-20260101-git.tgz"; + sha256 = "03c28p2k8vqci0pwiwcnlgar0bq79fj3jpid3vq91aspvb1xww05"; system = "org.tfeb.hax"; asd = "org.tfeb.hax"; } @@ -79911,12 +79311,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_abstract-classes = ( build-asdf-system { pname = "org.tfeb.hax.abstract-classes"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "org.tfeb.hax.abstract-classes" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; - sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2026-01-01/tfeb-lisp-hax-20260101-git.tgz"; + sha256 = "03c28p2k8vqci0pwiwcnlgar0bq79fj3jpid3vq91aspvb1xww05"; system = "org.tfeb.hax.abstract-classes"; asd = "org.tfeb.hax.abstract-classes"; } @@ -79931,12 +79331,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_binding = ( build-asdf-system { pname = "org.tfeb.hax.binding"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "org.tfeb.hax.binding" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; - sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2026-01-01/tfeb-lisp-hax-20260101-git.tgz"; + sha256 = "03c28p2k8vqci0pwiwcnlgar0bq79fj3jpid3vq91aspvb1xww05"; system = "org.tfeb.hax.binding"; asd = "org.tfeb.hax.binding"; } @@ -79951,21 +79351,41 @@ lib.makeScope pkgs.newScope (self: { }; } ); + org_dot_tfeb_dot_hax_dot_cached = ( + build-asdf-system { + pname = "org.tfeb.hax.cached"; + version = "20260101-git"; + asds = [ "org.tfeb.hax.cached" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2026-01-01/tfeb-lisp-hax-20260101-git.tgz"; + sha256 = "03c28p2k8vqci0pwiwcnlgar0bq79fj3jpid3vq91aspvb1xww05"; + system = "org.tfeb.hax.cached"; + asd = "org.tfeb.hax.cached"; + } + ); + systems = [ "org.tfeb.hax.cached" ]; + lispLibs = [ (getAttr "org_dot_tfeb_dot_hax_dot_utilities" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); org_dot_tfeb_dot_hax_dot_collecting = ( build-asdf-system { pname = "org.tfeb.hax.collecting"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "org.tfeb.hax.collecting" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; - sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2026-01-01/tfeb-lisp-hax-20260101-git.tgz"; + sha256 = "03c28p2k8vqci0pwiwcnlgar0bq79fj3jpid3vq91aspvb1xww05"; system = "org.tfeb.hax.collecting"; asd = "org.tfeb.hax.collecting"; } ); systems = [ "org.tfeb.hax.collecting" ]; - lispLibs = [ ]; + lispLibs = [ (getAttr "org_dot_tfeb_dot_hax_dot_utilities" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -79974,12 +79394,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_comment-form = ( build-asdf-system { pname = "org.tfeb.hax.comment-form"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "org.tfeb.hax.comment-form" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; - sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2026-01-01/tfeb-lisp-hax-20260101-git.tgz"; + sha256 = "03c28p2k8vqci0pwiwcnlgar0bq79fj3jpid3vq91aspvb1xww05"; system = "org.tfeb.hax.comment-form"; asd = "org.tfeb.hax.comment-form"; } @@ -79994,12 +79414,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_cs-forms = ( build-asdf-system { pname = "org.tfeb.hax.cs-forms"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "org.tfeb.hax.cs-forms" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; - sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2026-01-01/tfeb-lisp-hax-20260101-git.tgz"; + sha256 = "03c28p2k8vqci0pwiwcnlgar0bq79fj3jpid3vq91aspvb1xww05"; system = "org.tfeb.hax.cs-forms"; asd = "org.tfeb.hax.cs-forms"; } @@ -80014,12 +79434,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_define-functions = ( build-asdf-system { pname = "org.tfeb.hax.define-functions"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "org.tfeb.hax.define-functions" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; - sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2026-01-01/tfeb-lisp-hax-20260101-git.tgz"; + sha256 = "03c28p2k8vqci0pwiwcnlgar0bq79fj3jpid3vq91aspvb1xww05"; system = "org.tfeb.hax.define-functions"; asd = "org.tfeb.hax.define-functions"; } @@ -80034,12 +79454,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_dynamic-state = ( build-asdf-system { pname = "org.tfeb.hax.dynamic-state"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "org.tfeb.hax.dynamic-state" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; - sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2026-01-01/tfeb-lisp-hax-20260101-git.tgz"; + sha256 = "03c28p2k8vqci0pwiwcnlgar0bq79fj3jpid3vq91aspvb1xww05"; system = "org.tfeb.hax.dynamic-state"; asd = "org.tfeb.hax.dynamic-state"; } @@ -80054,12 +79474,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_iterate = ( build-asdf-system { pname = "org.tfeb.hax.iterate"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "org.tfeb.hax.iterate" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; - sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2026-01-01/tfeb-lisp-hax-20260101-git.tgz"; + sha256 = "03c28p2k8vqci0pwiwcnlgar0bq79fj3jpid3vq91aspvb1xww05"; system = "org.tfeb.hax.iterate"; asd = "org.tfeb.hax.iterate"; } @@ -80074,12 +79494,12 @@ 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"; + version = "20260101-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"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2026-01-01/tfeb-lisp-hax-20260101-git.tgz"; + sha256 = "03c28p2k8vqci0pwiwcnlgar0bq79fj3jpid3vq91aspvb1xww05"; system = "org.tfeb.hax.let-values"; asd = "org.tfeb.hax.let-values"; } @@ -80100,12 +79520,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_memoize = ( build-asdf-system { pname = "org.tfeb.hax.memoize"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "org.tfeb.hax.memoize" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; - sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2026-01-01/tfeb-lisp-hax-20260101-git.tgz"; + sha256 = "03c28p2k8vqci0pwiwcnlgar0bq79fj3jpid3vq91aspvb1xww05"; system = "org.tfeb.hax.memoize"; asd = "org.tfeb.hax.memoize"; } @@ -80120,12 +79540,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_metatronic = ( build-asdf-system { pname = "org.tfeb.hax.metatronic"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "org.tfeb.hax.metatronic" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; - sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2026-01-01/tfeb-lisp-hax-20260101-git.tgz"; + sha256 = "03c28p2k8vqci0pwiwcnlgar0bq79fj3jpid3vq91aspvb1xww05"; system = "org.tfeb.hax.metatronic"; asd = "org.tfeb.hax.metatronic"; } @@ -80140,12 +79560,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_object-accessors = ( build-asdf-system { pname = "org.tfeb.hax.object-accessors"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "org.tfeb.hax.object-accessors" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; - sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2026-01-01/tfeb-lisp-hax-20260101-git.tgz"; + sha256 = "03c28p2k8vqci0pwiwcnlgar0bq79fj3jpid3vq91aspvb1xww05"; system = "org.tfeb.hax.object-accessors"; asd = "org.tfeb.hax.object-accessors"; } @@ -80160,12 +79580,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_process-declarations = ( build-asdf-system { pname = "org.tfeb.hax.process-declarations"; - version = "20250622-git"; + version = "20260101-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"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2026-01-01/tfeb-lisp-hax-20260101-git.tgz"; + sha256 = "03c28p2k8vqci0pwiwcnlgar0bq79fj3jpid3vq91aspvb1xww05"; system = "org.tfeb.hax.process-declarations"; asd = "org.tfeb.hax.process-declarations"; } @@ -80180,12 +79600,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_read-package = ( build-asdf-system { pname = "org.tfeb.hax.read-package"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "org.tfeb.hax.read-package" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; - sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2026-01-01/tfeb-lisp-hax-20260101-git.tgz"; + sha256 = "03c28p2k8vqci0pwiwcnlgar0bq79fj3jpid3vq91aspvb1xww05"; system = "org.tfeb.hax.read-package"; asd = "org.tfeb.hax.read-package"; } @@ -80200,12 +79620,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_simple-loops = ( build-asdf-system { pname = "org.tfeb.hax.simple-loops"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "org.tfeb.hax.simple-loops" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; - sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2026-01-01/tfeb-lisp-hax-20260101-git.tgz"; + sha256 = "03c28p2k8vqci0pwiwcnlgar0bq79fj3jpid3vq91aspvb1xww05"; system = "org.tfeb.hax.simple-loops"; asd = "org.tfeb.hax.simple-loops"; } @@ -80224,12 +79644,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_singleton-classes = ( build-asdf-system { pname = "org.tfeb.hax.singleton-classes"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "org.tfeb.hax.singleton-classes" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; - sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2026-01-01/tfeb-lisp-hax-20260101-git.tgz"; + sha256 = "03c28p2k8vqci0pwiwcnlgar0bq79fj3jpid3vq91aspvb1xww05"; system = "org.tfeb.hax.singleton-classes"; asd = "org.tfeb.hax.singleton-classes"; } @@ -80244,12 +79664,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_slog = ( build-asdf-system { pname = "org.tfeb.hax.slog"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "org.tfeb.hax.slog" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; - sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2026-01-01/tfeb-lisp-hax-20260101-git.tgz"; + sha256 = "03c28p2k8vqci0pwiwcnlgar0bq79fj3jpid3vq91aspvb1xww05"; system = "org.tfeb.hax.slog"; asd = "org.tfeb.hax.slog"; } @@ -80269,12 +79689,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_spam = ( build-asdf-system { pname = "org.tfeb.hax.spam"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "org.tfeb.hax.spam" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; - sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2026-01-01/tfeb-lisp-hax-20260101-git.tgz"; + sha256 = "03c28p2k8vqci0pwiwcnlgar0bq79fj3jpid3vq91aspvb1xww05"; system = "org.tfeb.hax.spam"; asd = "org.tfeb.hax.spam"; } @@ -80289,12 +79709,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_stringtable = ( build-asdf-system { pname = "org.tfeb.hax.stringtable"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "org.tfeb.hax.stringtable" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; - sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2026-01-01/tfeb-lisp-hax-20260101-git.tgz"; + sha256 = "03c28p2k8vqci0pwiwcnlgar0bq79fj3jpid3vq91aspvb1xww05"; system = "org.tfeb.hax.stringtable"; asd = "org.tfeb.hax.stringtable"; } @@ -80312,12 +79732,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_trace-macroexpand = ( build-asdf-system { pname = "org.tfeb.hax.trace-macroexpand"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "org.tfeb.hax.trace-macroexpand" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; - sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2026-01-01/tfeb-lisp-hax-20260101-git.tgz"; + sha256 = "03c28p2k8vqci0pwiwcnlgar0bq79fj3jpid3vq91aspvb1xww05"; system = "org.tfeb.hax.trace-macroexpand"; asd = "org.tfeb.hax.trace-macroexpand"; } @@ -80329,15 +79749,35 @@ lib.makeScope pkgs.newScope (self: { }; } ); + org_dot_tfeb_dot_hax_dot_types = ( + build-asdf-system { + pname = "org.tfeb.hax.types"; + version = "20260101-git"; + asds = [ "org.tfeb.hax.types" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2026-01-01/tfeb-lisp-hax-20260101-git.tgz"; + sha256 = "03c28p2k8vqci0pwiwcnlgar0bq79fj3jpid3vq91aspvb1xww05"; + system = "org.tfeb.hax.types"; + asd = "org.tfeb.hax.types"; + } + ); + systems = [ "org.tfeb.hax.types" ]; + lispLibs = [ ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); org_dot_tfeb_dot_hax_dot_utilities = ( build-asdf-system { pname = "org.tfeb.hax.utilities"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "org.tfeb.hax.utilities" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; - sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2026-01-01/tfeb-lisp-hax-20260101-git.tgz"; + sha256 = "03c28p2k8vqci0pwiwcnlgar0bq79fj3jpid3vq91aspvb1xww05"; system = "org.tfeb.hax.utilities"; asd = "org.tfeb.hax.utilities"; } @@ -80352,12 +79792,12 @@ lib.makeScope pkgs.newScope (self: { org_dot_tfeb_dot_hax_dot_wrapping-standard = ( build-asdf-system { pname = "org.tfeb.hax.wrapping-standard"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "org.tfeb.hax.wrapping-standard" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz"; - sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd"; + url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2026-01-01/tfeb-lisp-hax-20260101-git.tgz"; + sha256 = "03c28p2k8vqci0pwiwcnlgar0bq79fj3jpid3vq91aspvb1xww05"; system = "org.tfeb.hax.wrapping-standard"; asd = "org.tfeb.hax.wrapping-standard"; } @@ -80369,141 +79809,30 @@ lib.makeScope pkgs.newScope (self: { }; } ); - org_dot_tfeb_dot_tools = ( + org_dot_tfeb_dot_star = ( build-asdf-system { - pname = "org.tfeb.tools"; - version = "20231021-git"; - asds = [ "org.tfeb.tools" ]; + pname = "org.tfeb.star"; + version = "20260101-git"; + asds = [ "org.tfeb.star" ]; src = ( createAsd { - 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"; + url = "https://beta.quicklisp.org/archive/star/2026-01-01/star-20260101-git.tgz"; + sha256 = "0bymyi1hn86ky4y72xrfyp2gp5fbblr5pqv3vk80fzsq7ya0dmdn"; + system = "org.tfeb.star"; + asd = "org.tfeb.star"; } ); - systems = [ "org.tfeb.tools" ]; - lispLibs = [ ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - org_dot_tfeb_dot_tools_dot_asdf-module-sysdcls = ( - build-asdf-system { - pname = "org.tfeb.tools.asdf-module-sysdcls"; - version = "20231021-git"; - asds = [ "org.tfeb.tools.asdf-module-sysdcls" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "org.tfeb.tools.asdf-module-sysdcls" ]; - lispLibs = [ ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - org_dot_tfeb_dot_tools_dot_build-modules = ( - build-asdf-system { - pname = "org.tfeb.tools.build-modules"; - version = "20231021-git"; - asds = [ "org.tfeb.tools.build-modules" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "org.tfeb.tools.build-modules" ]; - lispLibs = [ (getAttr "org_dot_tfeb_dot_tools_dot_require-module" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - org_dot_tfeb_dot_tools_dot_deprecations = ( - build-asdf-system { - pname = "org.tfeb.tools.deprecations"; - version = "20231021-git"; - asds = [ "org.tfeb.tools.deprecations" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "org.tfeb.tools.deprecations" ]; - lispLibs = [ ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - org_dot_tfeb_dot_tools_dot_feature-expressions = ( - build-asdf-system { - pname = "org.tfeb.tools.feature-expressions"; - version = "20231021-git"; - asds = [ "org.tfeb.tools.feature-expressions" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "org.tfeb.tools.feature-expressions" ]; - lispLibs = [ ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - org_dot_tfeb_dot_tools_dot_install-providers = ( - build-asdf-system { - pname = "org.tfeb.tools.install-providers"; - version = "20231021-git"; - asds = [ "org.tfeb.tools.install-providers" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "org.tfeb.tools.install-providers" ]; - lispLibs = [ (getAttr "org_dot_tfeb_dot_tools_dot_require-module" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); - org_dot_tfeb_dot_tools_dot_require-module = ( - build-asdf-system { - pname = "org.tfeb.tools.require-module"; - version = "20231021-git"; - asds = [ "org.tfeb.tools.require-module" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "org.tfeb.tools.require-module" ]; - lispLibs = [ ]; + systems = [ "org.tfeb.star" ]; + lispLibs = [ + (getAttr "org_dot_tfeb_dot_conduit-packages" self) + (getAttr "org_dot_tfeb_dot_dsm" self) + (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_let-values" self) + (getAttr "org_dot_tfeb_dot_hax_dot_process-declarations" self) + (getAttr "org_dot_tfeb_dot_hax_dot_types" self) + (getAttr "org_dot_tfeb_dot_hax_dot_utilities" self) + ]; meta = { hydraPlatforms = [ ]; }; @@ -80552,38 +79881,6 @@ lib.makeScope pkgs.newScope (self: { }; } ); - orizuru-orm = ( - build-asdf-system { - pname = "orizuru-orm"; - version = "20241012-git"; - asds = [ "orizuru-orm" ]; - src = ( - createAsd { - url = "https://beta.quicklisp.org/archive/orizuru-orm/2024-10-12/orizuru-orm-20241012-git.tgz"; - sha256 = "064sr0nxz884vrh550d8v3v9pqgs65d97lrr3828qn6bgaxwm1va"; - system = "orizuru-orm"; - asd = "orizuru-orm"; - } - ); - systems = [ "orizuru-orm" ]; - lispLibs = [ - (getAttr "alexandria" self) - (getAttr "anaphora" self) - (getAttr "cl-fad" self) - (getAttr "cl-ppcre-unicode" self) - (getAttr "clos-fixtures" self) - (getAttr "closer-mop" self) - (getAttr "clunit2" self) - (getAttr "dbi" self) - (getAttr "iterate" self) - (getAttr "local-time" self) - (getAttr "sxql" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); osc = ( build-asdf-system { pname = "osc"; @@ -80607,12 +79904,12 @@ lib.makeScope pkgs.newScope (self: { osicat = ( build-asdf-system { pname = "osicat"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "osicat" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/osicat/2025-06-22/osicat-20250622-git.tgz"; - sha256 = "1cwh4dim62ffm0hcrswk543zm3ynrqbkjxcrrc1ndfjl1b5kgars"; + url = "https://beta.quicklisp.org/archive/osicat/2026-01-01/osicat-20260101-git.tgz"; + sha256 = "1gic5ip0hrl8mpx1b46aa8ji0d1lyxwafnl1ryzi85yn4smqqc29"; system = "osicat"; asd = "osicat"; } @@ -80659,12 +79956,12 @@ lib.makeScope pkgs.newScope (self: { overlord = ( build-asdf-system { pname = "overlord"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "overlord" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/overlord/2025-06-22/overlord-20250622-git.tgz"; - sha256 = "1fr3nkycqhb2c5f94r9zv9b3viagik0qsx1bsrb4jcrr1r07vl4m"; + url = "https://beta.quicklisp.org/archive/overlord/2026-01-01/overlord-20260101-git.tgz"; + sha256 = "1ddm6qr2cdahhgk0j1ghh3s3xvvbrf4rrqdn0xb7qhpgql6hmi01"; system = "overlord"; asd = "overlord"; } @@ -80698,12 +79995,12 @@ lib.makeScope pkgs.newScope (self: { oxenfurt = ( build-asdf-system { pname = "oxenfurt"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "oxenfurt" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/oxenfurt/2023-10-21/oxenfurt-20231021-git.tgz"; - sha256 = "1yqw21l19091aghvnfpdp62zs8scspaas4syn2yajm1b55jzxvya"; + url = "https://beta.quicklisp.org/archive/oxenfurt/2026-01-01/oxenfurt-20260101-git.tgz"; + sha256 = "1wcq9zbvcxvgnkkxqb8xxxzkk7j9ic02rzqwpiv0zqrp6zvhr5x1"; system = "oxenfurt"; asd = "oxenfurt"; } @@ -80718,12 +80015,12 @@ lib.makeScope pkgs.newScope (self: { oxenfurt-core = ( build-asdf-system { pname = "oxenfurt-core"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "oxenfurt-core" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/oxenfurt/2023-10-21/oxenfurt-20231021-git.tgz"; - sha256 = "1yqw21l19091aghvnfpdp62zs8scspaas4syn2yajm1b55jzxvya"; + url = "https://beta.quicklisp.org/archive/oxenfurt/2026-01-01/oxenfurt-20260101-git.tgz"; + sha256 = "1wcq9zbvcxvgnkkxqb8xxxzkk7j9ic02rzqwpiv0zqrp6zvhr5x1"; system = "oxenfurt-core"; asd = "oxenfurt-core"; } @@ -80743,12 +80040,12 @@ lib.makeScope pkgs.newScope (self: { oxenfurt-dexador = ( build-asdf-system { pname = "oxenfurt-dexador"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "oxenfurt-dexador" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/oxenfurt/2023-10-21/oxenfurt-20231021-git.tgz"; - sha256 = "1yqw21l19091aghvnfpdp62zs8scspaas4syn2yajm1b55jzxvya"; + url = "https://beta.quicklisp.org/archive/oxenfurt/2026-01-01/oxenfurt-20260101-git.tgz"; + sha256 = "1wcq9zbvcxvgnkkxqb8xxxzkk7j9ic02rzqwpiv0zqrp6zvhr5x1"; system = "oxenfurt-dexador"; asd = "oxenfurt-dexador"; } @@ -80766,12 +80063,12 @@ lib.makeScope pkgs.newScope (self: { oxenfurt-drakma = ( build-asdf-system { pname = "oxenfurt-drakma"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "oxenfurt-drakma" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/oxenfurt/2023-10-21/oxenfurt-20231021-git.tgz"; - sha256 = "1yqw21l19091aghvnfpdp62zs8scspaas4syn2yajm1b55jzxvya"; + url = "https://beta.quicklisp.org/archive/oxenfurt/2026-01-01/oxenfurt-20260101-git.tgz"; + sha256 = "1wcq9zbvcxvgnkkxqb8xxxzkk7j9ic02rzqwpiv0zqrp6zvhr5x1"; system = "oxenfurt-drakma"; asd = "oxenfurt-drakma"; } @@ -80963,12 +80260,12 @@ lib.makeScope pkgs.newScope (self: { pango-markup = ( build-asdf-system { pname = "pango-markup"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "pango-markup" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/pango-markup/2023-10-21/pango-markup-20231021-git.tgz"; - sha256 = "1165z3ycbkgr9g3ni1z59r258c1jd2viyf3mj8a5p72kx6dqb8gf"; + url = "https://beta.quicklisp.org/archive/pango-markup/2026-01-01/pango-markup-20260101-git.tgz"; + sha256 = "0s1q6ij79yix2d8ak7rzknrvpk188k0xgqr9rn9x98npbs3dgaya"; system = "pango-markup"; asd = "pango-markup"; } @@ -80980,6 +80277,29 @@ lib.makeScope pkgs.newScope (self: { }; } ); + pantry = ( + build-asdf-system { + pname = "pantry"; + version = "20260101-git"; + asds = [ "pantry" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/pantry/2026-01-01/pantry-20260101-git.tgz"; + sha256 = "15dga925fw5rllskwv93srqwkqlw9qq6d9fcfj9y0syz1s2kf4wp"; + system = "pantry"; + asd = "pantry"; + } + ); + systems = [ "pantry" ]; + lispLibs = [ + (getAttr "com_dot_inuoe_dot_jzon" self) + (getAttr "dexador" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); papyrus = ( build-asdf-system { pname = "papyrus"; @@ -81003,12 +80323,12 @@ lib.makeScope pkgs.newScope (self: { parachute = ( build-asdf-system { pname = "parachute"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "parachute" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/parachute/2025-06-22/parachute-20250622-git.tgz"; - sha256 = "0zsqva66pd0vmxz9wbwccnjmkw8b9gyzkx36w2mdpfxspab3r4vr"; + url = "https://beta.quicklisp.org/archive/parachute/2026-01-01/parachute-20260101-git.tgz"; + sha256 = "1q54na265ji7bxdcd7rzfcb2cvhixdg6ck2wlaxq1h0cw0bjklcr"; system = "parachute"; asd = "parachute"; } @@ -81025,12 +80345,12 @@ lib.makeScope pkgs.newScope (self: { parachute-fiveam = ( build-asdf-system { pname = "parachute-fiveam"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "parachute-fiveam" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/parachute/2025-06-22/parachute-20250622-git.tgz"; - sha256 = "0zsqva66pd0vmxz9wbwccnjmkw8b9gyzkx36w2mdpfxspab3r4vr"; + url = "https://beta.quicklisp.org/archive/parachute/2026-01-01/parachute-20260101-git.tgz"; + sha256 = "1q54na265ji7bxdcd7rzfcb2cvhixdg6ck2wlaxq1h0cw0bjklcr"; system = "parachute-fiveam"; asd = "parachute-fiveam"; } @@ -81045,12 +80365,12 @@ lib.makeScope pkgs.newScope (self: { parachute-lisp-unit = ( build-asdf-system { pname = "parachute-lisp-unit"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "parachute-lisp-unit" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/parachute/2025-06-22/parachute-20250622-git.tgz"; - sha256 = "0zsqva66pd0vmxz9wbwccnjmkw8b9gyzkx36w2mdpfxspab3r4vr"; + url = "https://beta.quicklisp.org/archive/parachute/2026-01-01/parachute-20260101-git.tgz"; + sha256 = "1q54na265ji7bxdcd7rzfcb2cvhixdg6ck2wlaxq1h0cw0bjklcr"; system = "parachute-lisp-unit"; asd = "parachute-lisp-unit"; } @@ -81065,12 +80385,12 @@ lib.makeScope pkgs.newScope (self: { parachute-prove = ( build-asdf-system { pname = "parachute-prove"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "parachute-prove" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/parachute/2025-06-22/parachute-20250622-git.tgz"; - sha256 = "0zsqva66pd0vmxz9wbwccnjmkw8b9gyzkx36w2mdpfxspab3r4vr"; + url = "https://beta.quicklisp.org/archive/parachute/2026-01-01/parachute-20260101-git.tgz"; + sha256 = "1q54na265ji7bxdcd7rzfcb2cvhixdg6ck2wlaxq1h0cw0bjklcr"; system = "parachute-prove"; asd = "parachute-prove"; } @@ -81349,12 +80669,12 @@ lib.makeScope pkgs.newScope (self: { parse-float = ( build-asdf-system { pname = "parse-float"; - version = "20200218-git"; + version = "20260101-git"; asds = [ "parse-float" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/parse-float/2020-02-18/parse-float-20200218-git.tgz"; - sha256 = "0jd2spawc3v8vzqf8ky4cngl45jm65fhkrdf20mf6dcbn3mzpkmr"; + url = "https://beta.quicklisp.org/archive/parse-float/2026-01-01/parse-float-20260101-git.tgz"; + sha256 = "1xq4xsc5imxzsf4f6cw4nx3insv3z57hpd52r0hqr9y5yrhldqsj"; system = "parse-float"; asd = "parse-float"; } @@ -81364,29 +80684,6 @@ lib.makeScope pkgs.newScope (self: { meta = { }; } ); - parse-float-tests = ( - build-asdf-system { - pname = "parse-float-tests"; - version = "20200218-git"; - asds = [ "parse-float-tests" ]; - src = ( - createAsd { - 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"; - } - ); - systems = [ "parse-float-tests" ]; - lispLibs = [ - (getAttr "lisp-unit" self) - (getAttr "parse-float" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); parse-front-matter = ( build-asdf-system { pname = "parse-front-matter"; @@ -81883,12 +81180,12 @@ lib.makeScope pkgs.newScope (self: { pathname-utils = ( build-asdf-system { pname = "pathname-utils"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "pathname-utils" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/pathname-utils/2025-06-22/pathname-utils-20250622-git.tgz"; - sha256 = "1b89i0n70hr4wbbd9lqp0zf4sz70yvj5dn7x9a7mp1510g2wrii1"; + url = "https://beta.quicklisp.org/archive/pathname-utils/2026-01-01/pathname-utils-20260101-git.tgz"; + sha256 = "11hic5gspnkjfggdh4zzx9i1ha4vf7rjr2cyqmz1144sprl2nva6"; system = "pathname-utils"; asd = "pathname-utils"; } @@ -81903,12 +81200,12 @@ lib.makeScope pkgs.newScope (self: { pathname-utils-test = ( build-asdf-system { pname = "pathname-utils-test"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "pathname-utils-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/pathname-utils/2025-06-22/pathname-utils-20250622-git.tgz"; - sha256 = "1b89i0n70hr4wbbd9lqp0zf4sz70yvj5dn7x9a7mp1510g2wrii1"; + url = "https://beta.quicklisp.org/archive/pathname-utils/2026-01-01/pathname-utils-20260101-git.tgz"; + sha256 = "11hic5gspnkjfggdh4zzx9i1ha4vf7rjr2cyqmz1144sprl2nva6"; system = "pathname-utils-test"; asd = "pathname-utils-test"; } @@ -82297,12 +81594,12 @@ lib.makeScope pkgs.newScope (self: { peltadot = ( build-asdf-system { pname = "peltadot"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "peltadot" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/peltadot/2025-06-22/peltadot-20250622-git.tgz"; - sha256 = "1d1f7b864pd16aivf53y6sr5kczlibzlvcjlrllsfbrv4ygx759z"; + url = "https://beta.quicklisp.org/archive/peltadot/2026-01-01/peltadot-20260101-git.tgz"; + sha256 = "1iryz0wyb2hch7qh7gkmlskl8fm07ssxicpwv3vxk5b4d0i1wm69"; system = "peltadot"; asd = "peltadot"; } @@ -82332,12 +81629,12 @@ lib.makeScope pkgs.newScope (self: { peltadot-traits-library = ( build-asdf-system { pname = "peltadot-traits-library"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "peltadot-traits-library" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/peltadot/2025-06-22/peltadot-20250622-git.tgz"; - sha256 = "1d1f7b864pd16aivf53y6sr5kczlibzlvcjlrllsfbrv4ygx759z"; + url = "https://beta.quicklisp.org/archive/peltadot/2026-01-01/peltadot-20260101-git.tgz"; + sha256 = "1iryz0wyb2hch7qh7gkmlskl8fm07ssxicpwv3vxk5b4d0i1wm69"; system = "peltadot-traits-library"; asd = "peltadot-traits-library"; } @@ -82421,12 +81718,12 @@ lib.makeScope pkgs.newScope (self: { perceptual-hashes = ( build-asdf-system { pname = "perceptual-hashes"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "perceptual-hashes" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/perceptual-hashes/2022-07-07/perceptual-hashes-20220707-git.tgz"; - sha256 = "1hg2vxi4avmjwscgab7wqf3c4d60x933lac4d86fmfk0wgl5nzzd"; + url = "https://beta.quicklisp.org/archive/perceptual-hashes/2026-01-01/perceptual-hashes-20260101-git.tgz"; + sha256 = "1v5hs5bbxrm9z2w3ysg0b079jhi72h7m8sqy7np7ahx3slvrywph"; system = "perceptual-hashes"; asd = "perceptual-hashes"; } @@ -82466,12 +81763,12 @@ lib.makeScope pkgs.newScope (self: { periods = ( build-asdf-system { pname = "periods"; - version = "20221106-git"; + version = "20260101-git"; asds = [ "periods" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/periods/2022-11-06/periods-20221106-git.tgz"; - sha256 = "0ynhdmlzb499mlm7c7zy6vgw8vglkkf14zr0v40jcl1sgq3236ry"; + url = "https://beta.quicklisp.org/archive/periods/2026-01-01/periods-20260101-git.tgz"; + sha256 = "1m958891rl3sin6h6pgfjdh6ay1s7kfxbxpqvlnzk9rqid0hcs15"; system = "periods"; asd = "periods"; } @@ -82486,12 +81783,12 @@ lib.makeScope pkgs.newScope (self: { periods-series = ( build-asdf-system { pname = "periods-series"; - version = "20221106-git"; + version = "20260101-git"; asds = [ "periods-series" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/periods/2022-11-06/periods-20221106-git.tgz"; - sha256 = "0ynhdmlzb499mlm7c7zy6vgw8vglkkf14zr0v40jcl1sgq3236ry"; + url = "https://beta.quicklisp.org/archive/periods/2026-01-01/periods-20260101-git.tgz"; + sha256 = "1m958891rl3sin6h6pgfjdh6ay1s7kfxbxpqvlnzk9rqid0hcs15"; system = "periods-series"; asd = "periods-series"; } @@ -82559,12 +81856,12 @@ lib.makeScope pkgs.newScope (self: { persistent = ( build-asdf-system { pname = "persistent"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "persistent" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "persistent"; asd = "persistent"; } @@ -82642,12 +81939,12 @@ lib.makeScope pkgs.newScope (self: { petalisp = ( build-asdf-system { pname = "petalisp"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "petalisp" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz"; - sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11"; + url = "https://beta.quicklisp.org/archive/petalisp/2026-01-01/petalisp-20260101-git.tgz"; + sha256 = "0yvjjvxxs4d231vm8nirzdvlwz1wcb5xwfv7ks8rk8y173l0718v"; system = "petalisp"; asd = "petalisp"; } @@ -82665,12 +81962,12 @@ lib.makeScope pkgs.newScope (self: { petalisp_dot_api = ( build-asdf-system { pname = "petalisp.api"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "petalisp.api" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz"; - sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11"; + url = "https://beta.quicklisp.org/archive/petalisp/2026-01-01/petalisp-20260101-git.tgz"; + sha256 = "0yvjjvxxs4d231vm8nirzdvlwz1wcb5xwfv7ks8rk8y173l0718v"; system = "petalisp.api"; asd = "petalisp.api"; } @@ -82697,12 +81994,12 @@ lib.makeScope pkgs.newScope (self: { petalisp_dot_benchmarks = ( build-asdf-system { pname = "petalisp.benchmarks"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "petalisp.benchmarks" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz"; - sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11"; + url = "https://beta.quicklisp.org/archive/petalisp/2026-01-01/petalisp-20260101-git.tgz"; + sha256 = "0yvjjvxxs4d231vm8nirzdvlwz1wcb5xwfv7ks8rk8y173l0718v"; system = "petalisp.benchmarks"; asd = "petalisp.benchmarks"; } @@ -82721,12 +82018,12 @@ lib.makeScope pkgs.newScope (self: { petalisp_dot_codegen = ( build-asdf-system { pname = "petalisp.codegen"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "petalisp.codegen" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz"; - sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11"; + url = "https://beta.quicklisp.org/archive/petalisp/2026-01-01/petalisp-20260101-git.tgz"; + sha256 = "0yvjjvxxs4d231vm8nirzdvlwz1wcb5xwfv7ks8rk8y173l0718v"; system = "petalisp.codegen"; asd = "petalisp.codegen"; } @@ -82750,12 +82047,12 @@ lib.makeScope pkgs.newScope (self: { petalisp_dot_core = ( build-asdf-system { pname = "petalisp.core"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "petalisp.core" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz"; - sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11"; + url = "https://beta.quicklisp.org/archive/petalisp/2026-01-01/petalisp-20260101-git.tgz"; + sha256 = "0yvjjvxxs4d231vm8nirzdvlwz1wcb5xwfv7ks8rk8y173l0718v"; system = "petalisp.core"; asd = "petalisp.core"; } @@ -82778,12 +82075,12 @@ lib.makeScope pkgs.newScope (self: { petalisp_dot_examples = ( build-asdf-system { pname = "petalisp.examples"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "petalisp.examples" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz"; - sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11"; + url = "https://beta.quicklisp.org/archive/petalisp/2026-01-01/petalisp-20260101-git.tgz"; + sha256 = "0yvjjvxxs4d231vm8nirzdvlwz1wcb5xwfv7ks8rk8y173l0718v"; system = "petalisp.examples"; asd = "petalisp.examples"; } @@ -82801,12 +82098,12 @@ lib.makeScope pkgs.newScope (self: { petalisp_dot_graphviz = ( build-asdf-system { pname = "petalisp.graphviz"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "petalisp.graphviz" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz"; - sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11"; + url = "https://beta.quicklisp.org/archive/petalisp/2026-01-01/petalisp-20260101-git.tgz"; + sha256 = "0yvjjvxxs4d231vm8nirzdvlwz1wcb5xwfv7ks8rk8y173l0718v"; system = "petalisp.graphviz"; asd = "petalisp.graphviz"; } @@ -82831,12 +82128,12 @@ lib.makeScope pkgs.newScope (self: { petalisp_dot_ir = ( build-asdf-system { pname = "petalisp.ir"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "petalisp.ir" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz"; - sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11"; + url = "https://beta.quicklisp.org/archive/petalisp/2026-01-01/petalisp-20260101-git.tgz"; + sha256 = "0yvjjvxxs4d231vm8nirzdvlwz1wcb5xwfv7ks8rk8y173l0718v"; system = "petalisp.ir"; asd = "petalisp.ir"; } @@ -82858,12 +82155,12 @@ lib.makeScope pkgs.newScope (self: { petalisp_dot_native-backend = ( build-asdf-system { pname = "petalisp.native-backend"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "petalisp.native-backend" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz"; - sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11"; + url = "https://beta.quicklisp.org/archive/petalisp/2026-01-01/petalisp-20260101-git.tgz"; + sha256 = "0yvjjvxxs4d231vm8nirzdvlwz1wcb5xwfv7ks8rk8y173l0718v"; system = "petalisp.native-backend"; asd = "petalisp.native-backend"; } @@ -82891,12 +82188,12 @@ lib.makeScope pkgs.newScope (self: { petalisp_dot_packages = ( build-asdf-system { pname = "petalisp.packages"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "petalisp.packages" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz"; - sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11"; + url = "https://beta.quicklisp.org/archive/petalisp/2026-01-01/petalisp-20260101-git.tgz"; + sha256 = "0yvjjvxxs4d231vm8nirzdvlwz1wcb5xwfv7ks8rk8y173l0718v"; system = "petalisp.packages"; asd = "petalisp.packages"; } @@ -82911,12 +82208,12 @@ lib.makeScope pkgs.newScope (self: { petalisp_dot_test-suite = ( build-asdf-system { pname = "petalisp.test-suite"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "petalisp.test-suite" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz"; - sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11"; + url = "https://beta.quicklisp.org/archive/petalisp/2026-01-01/petalisp-20260101-git.tgz"; + sha256 = "0yvjjvxxs4d231vm8nirzdvlwz1wcb5xwfv7ks8rk8y173l0718v"; system = "petalisp.test-suite"; asd = "petalisp.test-suite"; } @@ -82937,12 +82234,12 @@ lib.makeScope pkgs.newScope (self: { petalisp_dot_utilities = ( build-asdf-system { pname = "petalisp.utilities"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "petalisp.utilities" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz"; - sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11"; + url = "https://beta.quicklisp.org/archive/petalisp/2026-01-01/petalisp-20260101-git.tgz"; + sha256 = "0yvjjvxxs4d231vm8nirzdvlwz1wcb5xwfv7ks8rk8y173l0718v"; system = "petalisp.utilities"; asd = "petalisp.utilities"; } @@ -83285,12 +82582,12 @@ lib.makeScope pkgs.newScope (self: { phos = ( build-asdf-system { pname = "phos"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "phos" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/phos/2024-10-12/phos-20241012-git.tgz"; - sha256 = "0lnv54iczidjpskciw7y2faazgxjwpncggdh5kggpjziq03pr7lv"; + url = "https://beta.quicklisp.org/archive/phos/2026-01-01/phos-20260101-git.tgz"; + sha256 = "0407vdy5q0h0r1p14wln8hgcn3gikgwazm7sbjcw4i5i3xnwsbl5"; system = "phos"; asd = "phos"; } @@ -83335,12 +82632,12 @@ lib.makeScope pkgs.newScope (self: { physical-quantities = ( build-asdf-system { pname = "physical-quantities"; - version = "20211020-git"; + version = "20260101-git"; asds = [ "physical-quantities" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/physical-quantities/2021-10-20/physical-quantities-20211020-git.tgz"; - sha256 = "0mb2s94s6fhw5vfa89naalw7ld11sdsszlqpz0c65dvpfyfmmdmh"; + url = "https://beta.quicklisp.org/archive/physical-quantities/2026-01-01/physical-quantities-20260101-git.tgz"; + sha256 = "02a1i6kbki6b3l274skcx7l3kdjgf3940r14r39y7g9q6v2fc43d"; system = "physical-quantities"; asd = "physical-quantities"; } @@ -83463,12 +82760,12 @@ lib.makeScope pkgs.newScope (self: { piping = ( build-asdf-system { pname = "piping"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "piping" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/piping/2025-06-22/piping-20250622-git.tgz"; - sha256 = "0c5mbgl19krr62gddfhqm7nybqwcdnla4d6gsifqizhyfmqsyl7n"; + url = "https://beta.quicklisp.org/archive/piping/2026-01-01/piping-20260101-git.tgz"; + sha256 = "1i3hygk766rllkvmspapsbbghhmmqpfkzg36as9p4h7iyf6rpmyz"; system = "piping"; asd = "piping"; } @@ -83480,6 +82777,85 @@ lib.makeScope pkgs.newScope (self: { }; } ); + pira = ( + build-asdf-system { + pname = "pira"; + version = "20260101-git"; + asds = [ "pira" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/pira/2026-01-01/pira-20260101-git.tgz"; + sha256 = "027qxb7sfiz5zgwwa72msk2gk0f6zmphk2fsdyy3kiir0zwd996w"; + system = "pira"; + asd = "pira"; + } + ); + systems = [ "pira" ]; + lispLibs = [ (getAttr "pira-core" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + pira-core = ( + build-asdf-system { + pname = "pira-core"; + version = "20260101-git"; + asds = [ "pira-core" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/pira/2026-01-01/pira-20260101-git.tgz"; + sha256 = "027qxb7sfiz5zgwwa72msk2gk0f6zmphk2fsdyy3kiir0zwd996w"; + system = "pira-core"; + asd = "pira-core"; + } + ); + systems = [ "pira-core" ]; + lispLibs = [ + (getAttr "alexandria" self) + (getAttr "assoc-utils" self) + (getAttr "aws-sign4" self) + (getAttr "cl-ppcre" self) + (getAttr "closer-mop" self) + (getAttr "dexador" self) + (getAttr "ironclad" self) + (getAttr "local-time" self) + (getAttr "parser_dot_ini" self) + (getAttr "quri" self) + (getAttr "smithy" self) + (getAttr "trivial-timeout" self) + (getAttr "yason" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); + pira-tests = ( + build-asdf-system { + pname = "pira-tests"; + version = "20260101-git"; + asds = [ "pira-tests" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/pira/2026-01-01/pira-20260101-git.tgz"; + sha256 = "027qxb7sfiz5zgwwa72msk2gk0f6zmphk2fsdyy3kiir0zwd996w"; + system = "pira-tests"; + asd = "pira-tests"; + } + ); + systems = [ "pira-tests" ]; + lispLibs = [ + (getAttr "alexandria" self) + (getAttr "pira" self) + (getAttr "rove" self) + (getAttr "smithy" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); pithy-xml = ( build-asdf-system { pname = "pithy-xml"; @@ -83665,12 +83041,12 @@ lib.makeScope pkgs.newScope (self: { plot = ( build-asdf-system { pname = "plot"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "plot" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/plot/2024-10-12/plot-20241012-git.tgz"; - sha256 = "1x5kc5y0s082y24qgq138331qmfs0xxxj43ss3aw0kgx7wfpxlms"; + url = "https://beta.quicklisp.org/archive/plot/2026-01-01/plot-20260101-git.tgz"; + sha256 = "0izjxijh7bpjjnghx0j90x7g1ajka402rrgljnjz9rhhwn45sa0k"; system = "plot"; asd = "plot"; } @@ -83733,12 +83109,12 @@ lib.makeScope pkgs.newScope (self: { plump = ( build-asdf-system { pname = "plump"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "plump" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/plump/2025-06-22/plump-20250622-git.tgz"; - sha256 = "181skw88n8z9997fcwbkjm5p42rnf1q8sv4m443qjc0a4y8b3pgq"; + url = "https://beta.quicklisp.org/archive/plump/2026-01-01/plump-20260101-git.tgz"; + sha256 = "0w2n5wskgqvazb721amfd7smydnj3mxsyzg03xk2k1vaizzxdzvk"; system = "plump"; asd = "plump"; } @@ -83779,12 +83155,12 @@ lib.makeScope pkgs.newScope (self: { plump-dom = ( build-asdf-system { pname = "plump-dom"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "plump-dom" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/plump/2025-06-22/plump-20250622-git.tgz"; - sha256 = "181skw88n8z9997fcwbkjm5p42rnf1q8sv4m443qjc0a4y8b3pgq"; + url = "https://beta.quicklisp.org/archive/plump/2026-01-01/plump-20260101-git.tgz"; + sha256 = "0w2n5wskgqvazb721amfd7smydnj3mxsyzg03xk2k1vaizzxdzvk"; system = "plump-dom"; asd = "plump-dom"; } @@ -83799,12 +83175,12 @@ lib.makeScope pkgs.newScope (self: { plump-lexer = ( build-asdf-system { pname = "plump-lexer"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "plump-lexer" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/plump/2025-06-22/plump-20250622-git.tgz"; - sha256 = "181skw88n8z9997fcwbkjm5p42rnf1q8sv4m443qjc0a4y8b3pgq"; + url = "https://beta.quicklisp.org/archive/plump/2026-01-01/plump-20260101-git.tgz"; + sha256 = "0w2n5wskgqvazb721amfd7smydnj3mxsyzg03xk2k1vaizzxdzvk"; system = "plump-lexer"; asd = "plump-lexer"; } @@ -83819,12 +83195,12 @@ lib.makeScope pkgs.newScope (self: { plump-parser = ( build-asdf-system { pname = "plump-parser"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "plump-parser" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/plump/2025-06-22/plump-20250622-git.tgz"; - sha256 = "181skw88n8z9997fcwbkjm5p42rnf1q8sv4m443qjc0a4y8b3pgq"; + url = "https://beta.quicklisp.org/archive/plump/2026-01-01/plump-20260101-git.tgz"; + sha256 = "0w2n5wskgqvazb721amfd7smydnj3mxsyzg03xk2k1vaizzxdzvk"; system = "plump-parser"; asd = "plump-parser"; } @@ -83839,12 +83215,12 @@ lib.makeScope pkgs.newScope (self: { plump-sexp = ( build-asdf-system { pname = "plump-sexp"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "plump-sexp" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/plump-sexp/2025-06-22/plump-sexp-20250622-git.tgz"; - sha256 = "0rl7abbaiwggdblcirn3mdcnnghvq9x9sn4pqk9fmkmsn3ladm7a"; + url = "https://beta.quicklisp.org/archive/plump-sexp/2026-01-01/plump-sexp-20260101-git.tgz"; + sha256 = "0iyz4xn7sk6pxx9avc2ajcy9268zdfr3xyvi16hgpajwcbqi5sjq"; system = "plump-sexp"; asd = "plump-sexp"; } @@ -83859,12 +83235,12 @@ lib.makeScope pkgs.newScope (self: { plump-tex = ( build-asdf-system { pname = "plump-tex"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "plump-tex" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/plump-tex/2023-10-21/plump-tex-20231021-git.tgz"; - sha256 = "1k0cmk5sbn042bx7nxiw0rvsjmgmj221zim1hg23r0485jbx0r3h"; + url = "https://beta.quicklisp.org/archive/plump-tex/2026-01-01/plump-tex-20260101-git.tgz"; + sha256 = "182g0rwygskhr211zw7xy7m80lrhyj5ykb2i2lw1szp6jz6kgrnr"; system = "plump-tex"; asd = "plump-tex"; } @@ -83882,12 +83258,12 @@ lib.makeScope pkgs.newScope (self: { plump-tex-test = ( build-asdf-system { pname = "plump-tex-test"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "plump-tex-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/plump-tex/2023-10-21/plump-tex-20231021-git.tgz"; - sha256 = "1k0cmk5sbn042bx7nxiw0rvsjmgmj221zim1hg23r0485jbx0r3h"; + url = "https://beta.quicklisp.org/archive/plump-tex/2026-01-01/plump-tex-20260101-git.tgz"; + sha256 = "182g0rwygskhr211zw7xy7m80lrhyj5ykb2i2lw1szp6jz6kgrnr"; system = "plump-tex-test"; asd = "plump-tex-test"; } @@ -84363,12 +83739,12 @@ lib.makeScope pkgs.newScope (self: { postmodern = ( build-asdf-system { pname = "postmodern"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "postmodern" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/postmodern/2024-10-12/postmodern-20241012-git.tgz"; - sha256 = "1hj0dpclzihy1rcnwhiv16abmaa54wygxyib3j2h9q4qs26w7pzb"; + url = "https://beta.quicklisp.org/archive/postmodern/2026-01-01/postmodern-20260101-git.tgz"; + sha256 = "0y30b02gvfscx1pb0kwc9lmb7fklp5bj6am3k01b8dgk16mcyf3x"; system = "postmodern"; asd = "postmodern"; } @@ -84645,12 +84021,12 @@ lib.makeScope pkgs.newScope (self: { precise-time = ( build-asdf-system { pname = "precise-time"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "precise-time" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/precise-time/2025-06-22/precise-time-20250622-git.tgz"; - sha256 = "1b7ky6m8ih8dz93psrznrxvvchrrhaby3q3fdlhr6nw8zpg63fsh"; + url = "https://beta.quicklisp.org/archive/precise-time/2026-01-01/precise-time-20260101-git.tgz"; + sha256 = "0gj98hvmzvay27rbdjnz65izcs0dr0rq1g11aac04c0w12xp1rq5"; system = "precise-time"; asd = "precise-time"; } @@ -84858,12 +84234,12 @@ lib.makeScope pkgs.newScope (self: { priority-queue-benchmark = ( build-asdf-system { pname = "priority-queue-benchmark"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "priority-queue-benchmark" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/damn-fast-priority-queue/2024-10-12/damn-fast-priority-queue-20241012-git.tgz"; - sha256 = "1mbigpgi7qbqvpj59l1f7p2qcg00ybvqzdca1j1b9hx62h224ndw"; + url = "https://beta.quicklisp.org/archive/damn-fast-priority-queue/2026-01-01/damn-fast-priority-queue-20260101-git.tgz"; + sha256 = "0ch4yma51r2lnsjpr45mxga7sf03l3c76l6ijffm1rq2g9ywaksa"; system = "priority-queue-benchmark"; asd = "priority-queue-benchmark"; } @@ -85625,12 +85001,12 @@ lib.makeScope pkgs.newScope (self: { promise = ( build-asdf-system { pname = "promise"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "promise" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/promise/2023-10-21/promise-20231021-git.tgz"; - sha256 = "1xm10s89a2f7ydzayjgg94y9plrz1jnyvi6yzhk5v3vrbnmpggh1"; + url = "https://beta.quicklisp.org/archive/promise/2026-01-01/promise-20260101-git.tgz"; + sha256 = "1fki8yrph5pm09fi9kp9d412x6p62kpzshlq40q0z7ypr1sgf4jm"; system = "promise"; asd = "promise"; } @@ -85645,12 +85021,12 @@ lib.makeScope pkgs.newScope (self: { promise-test = ( build-asdf-system { pname = "promise-test"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "promise-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/promise/2023-10-21/promise-20231021-git.tgz"; - sha256 = "1xm10s89a2f7ydzayjgg94y9plrz1jnyvi6yzhk5v3vrbnmpggh1"; + url = "https://beta.quicklisp.org/archive/promise/2026-01-01/promise-20260101-git.tgz"; + sha256 = "1fki8yrph5pm09fi9kp9d412x6p62kpzshlq40q0z7ypr1sgf4jm"; system = "promise-test"; asd = "promise-test"; } @@ -86023,12 +85399,12 @@ lib.makeScope pkgs.newScope (self: { punycode = ( build-asdf-system { pname = "punycode"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "punycode" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/punycode/2023-10-21/punycode-20231021-git.tgz"; - sha256 = "0779aj2bqsz7qb475x5sacr5q254wjar74sab04zfhrlpkgij9xh"; + url = "https://beta.quicklisp.org/archive/punycode/2026-01-01/punycode-20260101-git.tgz"; + sha256 = "1hb3rv64dhp1mdw10llci1fl2xfg9am7469qay0w2yvyd9h5kbng"; system = "punycode"; asd = "punycode"; } @@ -86043,12 +85419,12 @@ lib.makeScope pkgs.newScope (self: { punycode-test = ( build-asdf-system { pname = "punycode-test"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "punycode-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/punycode/2023-10-21/punycode-20231021-git.tgz"; - sha256 = "0779aj2bqsz7qb475x5sacr5q254wjar74sab04zfhrlpkgij9xh"; + url = "https://beta.quicklisp.org/archive/punycode/2026-01-01/punycode-20260101-git.tgz"; + sha256 = "1hb3rv64dhp1mdw10llci1fl2xfg9am7469qay0w2yvyd9h5kbng"; system = "punycode-test"; asd = "punycode-test"; } @@ -86256,12 +85632,12 @@ lib.makeScope pkgs.newScope (self: { py4cl2-cffi = ( build-asdf-system { pname = "py4cl2-cffi"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "py4cl2-cffi" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/py4cl2-cffi/2025-06-22/py4cl2-cffi-20250622-git.tgz"; - sha256 = "1niql10rjhm19qh3fsmp434h6j8x38dknwvwdc72r63gkn7lqiaa"; + url = "https://beta.quicklisp.org/archive/py4cl2-cffi/2026-01-01/py4cl2-cffi-20260101-git.tgz"; + sha256 = "1sclq1cidhxk1z0mah1wawb15xjyg3s4b3m2wjcxbfzx255wbxb6"; system = "py4cl2-cffi"; asd = "py4cl2-cffi"; } @@ -86485,19 +85861,18 @@ lib.makeScope pkgs.newScope (self: { qlot = ( build-asdf-system { pname = "qlot"; - version = "1.7.2"; + version = "1.8.2"; asds = [ "qlot" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/qlot/2025-06-22/qlot-1.7.2.tgz"; - sha256 = "0mnpz4z589wfmc2pjwgjv86v09p0pqwdk10izv7xri9hab1823vq"; + url = "https://beta.quicklisp.org/archive/qlot/2026-01-01/qlot-1.8.2.tgz"; + sha256 = "01nxpksmb91pvza0yrkzdsnf965fcims6bdzspd171d6j02gsrby"; system = "qlot"; asd = "qlot"; } ); systems = [ "qlot" ]; lispLibs = [ - (getAttr "archive" self) (getAttr "bordeaux-threads" self) (getAttr "cl_plus_ssl" self) (getAttr "cl-ppcre" self) @@ -86575,12 +85950,12 @@ lib.makeScope pkgs.newScope (self: { qoi = ( build-asdf-system { pname = "qoi"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "qoi" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/qoi/2024-10-12/qoi-20241012-git.tgz"; - sha256 = "06akq38q7m648c3kpx1pzw21fwqry7fkg6sfgbap0b7bifzg1dsn"; + url = "https://beta.quicklisp.org/archive/qoi/2026-01-01/qoi-20260101-git.tgz"; + sha256 = "0mm2j5g6x5z7nqzqipx1fdihqxxpmm86xagkrwkii1hk7zj2c9p4"; system = "qoi"; asd = "qoi"; } @@ -87124,12 +86499,12 @@ lib.makeScope pkgs.newScope (self: { quadpack = ( build-asdf-system { pname = "quadpack"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "quadpack" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; - sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; + url = "https://beta.quicklisp.org/archive/f2cl/2026-01-01/f2cl-20260101-git.tgz"; + sha256 = "025hdyvyk9il71aya05sma13m3x9yxcj7g3sadpzck55manbpfnm"; system = "quadpack"; asd = "quadpack"; } @@ -87295,12 +86670,12 @@ lib.makeScope pkgs.newScope (self: { quaviver = ( build-asdf-system { pname = "quaviver"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "quaviver" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/quaviver/2025-06-22/quaviver-20250622-git.tgz"; - sha256 = "1cghypzlpiprcw2napzvb4wjdykciqi7v4s70kqf4mk0mkbxymb2"; + url = "https://beta.quicklisp.org/archive/quaviver/2026-01-01/quaviver-20260101-git.tgz"; + sha256 = "02v32x8b2vzxfxfa84whhf0fzwxflvx0l6ch3fxsy1bl0gk1rsfa"; system = "quaviver"; asd = "quaviver"; } @@ -87318,12 +86693,12 @@ lib.makeScope pkgs.newScope (self: { queen = ( build-asdf-system { pname = "queen"; - version = "20230618-git"; + version = "20260101-git"; asds = [ "queen" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/queen.lisp/2023-06-18/queen.lisp-20230618-git.tgz"; - sha256 = "14y4688f9gazdxh03k2jnxnla2bygcsz6wk55yc0id1achak95fa"; + url = "https://beta.quicklisp.org/archive/queen.lisp/2026-01-01/queen.lisp-20260101-git.tgz"; + sha256 = "0a7vx02l9xlg1dsqsd829ix949slajb251znnn20n6zbindnjmzl"; system = "queen"; asd = "queen"; } @@ -87563,12 +86938,12 @@ lib.makeScope pkgs.newScope (self: { quickhull = ( build-asdf-system { pname = "quickhull"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "quickhull" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/quickhull/2025-06-22/quickhull-20250622-git.tgz"; - sha256 = "1krlyqqsb6jqlx7byby8v0nadkg4aylbiz8jj0w3z9z3nqwp415p"; + url = "https://beta.quicklisp.org/archive/quickhull/2026-01-01/quickhull-20260101-git.tgz"; + sha256 = "1r77zdxww69xfhgs37yfvmlf1py7cidkbs4k38x7m5nrxwg9188v"; system = "quickhull"; asd = "quickhull"; } @@ -87853,12 +87228,12 @@ lib.makeScope pkgs.newScope (self: { quil-coalton = ( build-asdf-system { pname = "quil-coalton"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "quil-coalton" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz"; - sha256 = "0g6gfp3y9smzssi3dbddwxvx7g4hq6wz98h253gs4i15pd2pf3qp"; + url = "https://beta.quicklisp.org/archive/coalton/2026-01-01/coalton-20260101-git.tgz"; + sha256 = "1ykx0570dmy8q6ysw98wh7x6r60x2ix5n5clf43g9grknypp0dim"; system = "quil-coalton"; asd = "quil-coalton"; } @@ -87893,12 +87268,12 @@ lib.makeScope pkgs.newScope (self: { quri = ( build-asdf-system { pname = "quri"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "quri" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/quri/2024-10-12/quri-20241012-git.tgz"; - sha256 = "0vismgg72xrflzdsrv8ybq3cxf717k5296g9b731974vwlf7ibh0"; + url = "https://beta.quicklisp.org/archive/quri/2026-01-01/quri-20260101-git.tgz"; + sha256 = "0579r9vg2vg2dyr8wx4sjl9lkpbahiriqb51iq9sk09cd8bjxnm9"; system = "quri"; asd = "quri"; } @@ -87917,12 +87292,12 @@ lib.makeScope pkgs.newScope (self: { quri-test = ( build-asdf-system { pname = "quri-test"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "quri-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/quri/2024-10-12/quri-20241012-git.tgz"; - sha256 = "0vismgg72xrflzdsrv8ybq3cxf717k5296g9b731974vwlf7ibh0"; + url = "https://beta.quicklisp.org/archive/quri/2026-01-01/quri-20260101-git.tgz"; + sha256 = "0579r9vg2vg2dyr8wx4sjl9lkpbahiriqb51iq9sk09cd8bjxnm9"; system = "quri-test"; asd = "quri-test"; } @@ -88121,12 +87496,12 @@ lib.makeScope pkgs.newScope (self: { random-sampling = ( build-asdf-system { pname = "random-sampling"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "random-sampling" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/random-sampling/2025-06-22/random-sampling-20250622-git.tgz"; - sha256 = "1kj7ak0fsmmvayp3yqfnr0j0z7pkyrlnbgabkkckw7gcr0z0kbay"; + url = "https://beta.quicklisp.org/archive/random-sampling/2026-01-01/random-sampling-20260101-git.tgz"; + sha256 = "0xc1a4fsb87a686ll16qgjrw6qyijzjv9v6j5ikap2skz6yq0xhf"; system = "random-sampling"; asd = "random-sampling"; } @@ -88145,12 +87520,12 @@ lib.makeScope pkgs.newScope (self: { random-state = ( build-asdf-system { pname = "random-state"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "random-state" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/random-state/2025-06-22/random-state-20250622-git.tgz"; - sha256 = "0bvb8hldhydmgf0vvjz10vwq8srkm0piglshzm260crvdq1nx4c0"; + url = "https://beta.quicklisp.org/archive/random-state/2026-01-01/random-state-20260101-git.tgz"; + sha256 = "18is7rq6i0rsqn224grn4s0a7ba61mrg3mq3zl2mqmf5fbmby13d"; system = "random-state"; asd = "random-state"; } @@ -88257,12 +87632,12 @@ lib.makeScope pkgs.newScope (self: { ratify = ( build-asdf-system { pname = "ratify"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "ratify" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/ratify/2025-06-22/ratify-20250622-git.tgz"; - sha256 = "0ja9rgx1n3zyyps4gxi8ws4r9vbqj5qj9bnmzwykfmsgy9wzi5d0"; + url = "https://beta.quicklisp.org/archive/ratify/2026-01-01/ratify-20260101-git.tgz"; + sha256 = "1b5ivdlf5802cpmk04gwpy9cw833k8d2p5ypgd20q7lkcqn13krw"; system = "ratify"; asd = "ratify"; } @@ -88528,12 +87903,12 @@ lib.makeScope pkgs.newScope (self: { reblocks = ( build-asdf-system { pname = "reblocks"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "reblocks" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/reblocks/2025-06-22/reblocks-20250622-git.tgz"; - sha256 = "1c5vr60010jshxf6kq1pvjqhlspky1djm39sz7sl9hyqh9jrvqdh"; + url = "https://beta.quicklisp.org/archive/reblocks/2026-01-01/reblocks-20260101-git.tgz"; + sha256 = "004b8mdaca9gyz16plfa2z8qgcpqfykyi792vj516y8cx2jy3ms3"; system = "reblocks"; asd = "reblocks"; } @@ -88702,12 +88077,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-docs = ( build-asdf-system { pname = "reblocks-docs"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "reblocks-docs" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/reblocks/2025-06-22/reblocks-20250622-git.tgz"; - sha256 = "1c5vr60010jshxf6kq1pvjqhlspky1djm39sz7sl9hyqh9jrvqdh"; + url = "https://beta.quicklisp.org/archive/reblocks/2026-01-01/reblocks-20260101-git.tgz"; + sha256 = "004b8mdaca9gyz16plfa2z8qgcpqfykyi792vj516y8cx2jy3ms3"; system = "reblocks-docs"; asd = "reblocks-docs"; } @@ -89167,12 +88542,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-tests = ( build-asdf-system { pname = "reblocks-tests"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "reblocks-tests" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/reblocks/2025-06-22/reblocks-20250622-git.tgz"; - sha256 = "1c5vr60010jshxf6kq1pvjqhlspky1djm39sz7sl9hyqh9jrvqdh"; + url = "https://beta.quicklisp.org/archive/reblocks/2026-01-01/reblocks-20260101-git.tgz"; + sha256 = "004b8mdaca9gyz16plfa2z8qgcpqfykyi792vj516y8cx2jy3ms3"; system = "reblocks-tests"; asd = "reblocks-tests"; } @@ -89558,12 +88933,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-websocket = ( build-asdf-system { pname = "reblocks-websocket"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "reblocks-websocket" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/reblocks-websocket/2025-06-22/reblocks-websocket-20250622-git.tgz"; - sha256 = "129mvzm1z6d5ffn21cqrm82yx2i6n5dc2n5sm5a51rf7f24lgcv6"; + url = "https://beta.quicklisp.org/archive/reblocks-websocket/2026-01-01/reblocks-websocket-20260101-git.tgz"; + sha256 = "1rn6gqm75q6x2xklgxiwrzpf06wpzgcxscka36jsc1ilfd62afyq"; system = "reblocks-websocket"; asd = "reblocks-websocket"; } @@ -89589,12 +88964,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-websocket-ci = ( build-asdf-system { pname = "reblocks-websocket-ci"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "reblocks-websocket-ci" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/reblocks-websocket/2025-06-22/reblocks-websocket-20250622-git.tgz"; - sha256 = "129mvzm1z6d5ffn21cqrm82yx2i6n5dc2n5sm5a51rf7f24lgcv6"; + url = "https://beta.quicklisp.org/archive/reblocks-websocket/2026-01-01/reblocks-websocket-20260101-git.tgz"; + sha256 = "1rn6gqm75q6x2xklgxiwrzpf06wpzgcxscka36jsc1ilfd62afyq"; system = "reblocks-websocket-ci"; asd = "reblocks-websocket-ci"; } @@ -89609,12 +88984,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-websocket-docs = ( build-asdf-system { pname = "reblocks-websocket-docs"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "reblocks-websocket-docs" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/reblocks-websocket/2025-06-22/reblocks-websocket-20250622-git.tgz"; - sha256 = "129mvzm1z6d5ffn21cqrm82yx2i6n5dc2n5sm5a51rf7f24lgcv6"; + url = "https://beta.quicklisp.org/archive/reblocks-websocket/2026-01-01/reblocks-websocket-20260101-git.tgz"; + sha256 = "1rn6gqm75q6x2xklgxiwrzpf06wpzgcxscka36jsc1ilfd62afyq"; system = "reblocks-websocket-docs"; asd = "reblocks-websocket-docs"; } @@ -89635,12 +89010,12 @@ lib.makeScope pkgs.newScope (self: { reblocks-websocket-tests = ( build-asdf-system { pname = "reblocks-websocket-tests"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "reblocks-websocket-tests" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/reblocks-websocket/2025-06-22/reblocks-websocket-20250622-git.tgz"; - sha256 = "129mvzm1z6d5ffn21cqrm82yx2i6n5dc2n5sm5a51rf7f24lgcv6"; + url = "https://beta.quicklisp.org/archive/reblocks-websocket/2026-01-01/reblocks-websocket-20260101-git.tgz"; + sha256 = "1rn6gqm75q6x2xklgxiwrzpf06wpzgcxscka36jsc1ilfd62afyq"; system = "reblocks-websocket-tests"; asd = "reblocks-websocket-tests"; } @@ -89785,12 +89160,12 @@ lib.makeScope pkgs.newScope (self: { redirect-stream = ( build-asdf-system { pname = "redirect-stream"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "redirect-stream" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/redirect-stream/2025-06-22/redirect-stream-20250622-git.tgz"; - sha256 = "1pg84dvfd0vnrc12zj6r7vpdkbqznsddk2a7qfqcdm8mjb5xf0ak"; + url = "https://beta.quicklisp.org/archive/redirect-stream/2026-01-01/redirect-stream-20260101-git.tgz"; + sha256 = "0lfjzr665q00h1vr4casjxqbiqwrfpsvl0iwgs2hnzpbf8vi1r49"; system = "redirect-stream"; asd = "redirect-stream"; } @@ -90356,12 +89731,12 @@ lib.makeScope pkgs.newScope (self: { robot = ( build-asdf-system { pname = "robot"; - version = "master-5a621564-git"; + version = "master-bfa9fc5c-git"; asds = [ "robot" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; - sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; + url = "https://beta.quicklisp.org/archive/gendl/2026-01-01/gendl-master-bfa9fc5c-git.tgz"; + sha256 = "1hbbflaiplf4qxqlc5bqi28xh419lijrz4rvz18maqiavg059bfk"; system = "robot"; asd = "robot"; } @@ -90518,12 +89893,12 @@ lib.makeScope pkgs.newScope (self: { rove = ( build-asdf-system { pname = "rove"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "rove" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/rove/2025-06-22/rove-20250622-git.tgz"; - sha256 = "082fz6gbifx0m255blxqvfdd5i930618i5ix3g5ar250abfdqabn"; + url = "https://beta.quicklisp.org/archive/rove/2026-01-01/rove-20260101-git.tgz"; + sha256 = "0g2f2479066gl6h238lnak5ypa06faykzwj8q9w56kqq79429hcr"; system = "rove"; asd = "rove"; } @@ -90541,12 +89916,12 @@ lib.makeScope pkgs.newScope (self: { rovers-problem-translator = ( build-asdf-system { pname = "rovers-problem-translator"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "rovers-problem-translator" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/shop3/2025-06-22/shop3-20250622-git.tgz"; - sha256 = "0vznjrg51bh261bh39d2cj5jifl7mlryksdb7rrcymqq0k6zc0pn"; + url = "https://beta.quicklisp.org/archive/shop3/2026-01-01/shop3-20260101-git.tgz"; + sha256 = "18b079lrd8gviymdqx2v9sv6rdvc8vvd680aiblvzkqfnh0bmkzn"; system = "rovers-problem-translator"; asd = "rovers-problem-translator"; } @@ -91367,12 +90742,12 @@ lib.makeScope pkgs.newScope (self: { s-sql = ( build-asdf-system { pname = "s-sql"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "s-sql" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/postmodern/2024-10-12/postmodern-20241012-git.tgz"; - sha256 = "1hj0dpclzihy1rcnwhiv16abmaa54wygxyib3j2h9q4qs26w7pzb"; + url = "https://beta.quicklisp.org/archive/postmodern/2026-01-01/postmodern-20260101-git.tgz"; + sha256 = "0y30b02gvfscx1pb0kwc9lmb7fklp5bj6am3k01b8dgk16mcyf3x"; system = "s-sql"; asd = "s-sql"; } @@ -91629,6 +91004,31 @@ lib.makeScope pkgs.newScope (self: { }; } ); + sanitize-html = ( + build-asdf-system { + pname = "sanitize-html"; + version = "20260101-git"; + asds = [ "sanitize-html" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-sanitize-html/2026-01-01/cl-sanitize-html-20260101-git.tgz"; + sha256 = "1y1w2sgxyq0j36spnqg3ac5lhlkyblnfcj2h78m9apprclh7i8d4"; + system = "sanitize-html"; + asd = "sanitize-html"; + } + ); + systems = [ "sanitize-html" ]; + lispLibs = [ + (getAttr "alexandria" self) + (getAttr "cl-ppcre" self) + (getAttr "lquery" self) + (getAttr "plump" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); sanitize-test = ( build-asdf-system { pname = "sanitize-test"; @@ -91765,12 +91165,12 @@ lib.makeScope pkgs.newScope (self: { sc-extensions = ( build-asdf-system { pname = "sc-extensions"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "sc-extensions" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/sc-extensions/2025-06-22/sc-extensions-20250622-git.tgz"; - sha256 = "1hxjcax7f6kqcf0a5lbqp407g7r1psy6wc0hsfdn5afrscdw5ak1"; + url = "https://beta.quicklisp.org/archive/sc-extensions/2026-01-01/sc-extensions-20260101-git.tgz"; + sha256 = "0baq4z7m97k1gzgf389k3zbgjv1g120z6d9b2z768xz6n8fvfipq"; system = "sc-extensions"; asd = "sc-extensions"; } @@ -91789,12 +91189,12 @@ lib.makeScope pkgs.newScope (self: { sc-osc = ( build-asdf-system { pname = "sc-osc"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "sc-osc" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-collider/2025-06-22/cl-collider-20250622-git.tgz"; - sha256 = "01yiwwi9zhh1vksk26m170i6x9lsbygbznaxggf8h9psiyqg5991"; + url = "https://beta.quicklisp.org/archive/cl-collider/2026-01-01/cl-collider-20260101-git.tgz"; + sha256 = "0c53h7hg6vmgr4zkrz074raxh6jfb2wwv1sh8axwrrvfm8hqw5fs"; system = "sc-osc"; asd = "sc-osc"; } @@ -91887,12 +91287,12 @@ lib.makeScope pkgs.newScope (self: { scigraph = ( build-asdf-system { pname = "scigraph"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "scigraph" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "scigraph"; asd = "scigraph"; } @@ -92105,12 +91505,12 @@ lib.makeScope pkgs.newScope (self: { scriptl = ( build-asdf-system { pname = "scriptl"; - version = "20180228-git"; + version = "20260101-git"; asds = [ "scriptl" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/scriptl/2018-02-28/scriptl-20180228-git.tgz"; - sha256 = "1q0d64syglfdjrzx2x7hlvznljpfwr9scn7rliigbm5z326lygg4"; + url = "https://beta.quicklisp.org/archive/scriptl/2026-01-01/scriptl-20260101-git.tgz"; + sha256 = "1igxaj15fangszv6f44jz4v4jkcff66x4sxzylpqksickqm0n6lz"; system = "scriptl"; asd = "scriptl"; } @@ -92135,12 +91535,12 @@ lib.makeScope pkgs.newScope (self: { scriptl-examples = ( build-asdf-system { pname = "scriptl-examples"; - version = "20180228-git"; + version = "20260101-git"; asds = [ "scriptl-examples" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/scriptl/2018-02-28/scriptl-20180228-git.tgz"; - sha256 = "1q0d64syglfdjrzx2x7hlvznljpfwr9scn7rliigbm5z326lygg4"; + url = "https://beta.quicklisp.org/archive/scriptl/2026-01-01/scriptl-20260101-git.tgz"; + sha256 = "1igxaj15fangszv6f44jz4v4jkcff66x4sxzylpqksickqm0n6lz"; system = "scriptl-examples"; asd = "scriptl-examples"; } @@ -92158,12 +91558,12 @@ lib.makeScope pkgs.newScope (self: { scriptl-util = ( build-asdf-system { pname = "scriptl-util"; - version = "20180228-git"; + version = "20260101-git"; asds = [ "scriptl-util" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/scriptl/2018-02-28/scriptl-20180228-git.tgz"; - sha256 = "1q0d64syglfdjrzx2x7hlvznljpfwr9scn7rliigbm5z326lygg4"; + url = "https://beta.quicklisp.org/archive/scriptl/2026-01-01/scriptl-20260101-git.tgz"; + sha256 = "1igxaj15fangszv6f44jz4v4jkcff66x4sxzylpqksickqm0n6lz"; system = "scriptl-util"; asd = "scriptl-util"; } @@ -92442,11 +91842,11 @@ lib.makeScope pkgs.newScope (self: { secp256k1 = ( build-asdf-system { pname = "secp256k1"; - version = "20220707-git"; + version = "20260101-git"; asds = [ "secp256k1" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-secp256k1/2022-07-07/cl-secp256k1-20220707-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-secp256k1/2026-01-01/cl-secp256k1-20260101-git.tgz"; sha256 = "0lg84jkwwp95nnk865yfhg16z0d04wk3dzf5yilkfm2yxnmjnv85"; system = "secp256k1"; asd = "secp256k1"; @@ -92691,11 +92091,11 @@ lib.makeScope pkgs.newScope (self: { sento = ( build-asdf-system { pname = "sento"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "sento" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-gserver/2025-06-22/cl-gserver-20250622-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-gserver/2026-01-01/cl-gserver-20260101-git.tgz"; sha256 = "1lwa2habxdmjl2y9jl7ds2b1v1ijcdp7kk060b57g8hyx0saxj6x"; system = "sento"; asd = "sento"; @@ -92839,12 +92239,12 @@ lib.makeScope pkgs.newScope (self: { serapeum = ( build-asdf-system { pname = "serapeum"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "serapeum" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/serapeum/2025-06-22/serapeum-20250622-git.tgz"; - sha256 = "0vg7pzv9y2qx0zydnkx5klf0vb3ac5q8hy35z919b9037s7nrcl7"; + url = "https://beta.quicklisp.org/archive/serapeum/2026-01-01/serapeum-20260101-git.tgz"; + sha256 = "1gdajk1bhvvn3zp2d7279956n879pkqwrrrrbc7mvbh8rzg4l9fx"; system = "serapeum"; asd = "serapeum"; } @@ -93173,12 +92573,12 @@ lib.makeScope pkgs.newScope (self: { shasht = ( build-asdf-system { pname = "shasht"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "shasht" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/shasht/2024-10-12/shasht-20241012-git.tgz"; - sha256 = "0i4k6w5r74f2a0i3ffian715v057w63psywk89ih0hl9xxpc4pga"; + url = "https://beta.quicklisp.org/archive/shasht/2026-01-01/shasht-20260101-git.tgz"; + sha256 = "0dca8vjw0pw6ync8nx8d3zq8lcqzlyqqkvj25r1jb0n7kjb8755f"; system = "shasht"; asd = "shasht"; } @@ -93339,12 +92739,12 @@ lib.makeScope pkgs.newScope (self: { shop3 = ( build-asdf-system { pname = "shop3"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "shop3" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/shop3/2025-06-22/shop3-20250622-git.tgz"; - sha256 = "0vznjrg51bh261bh39d2cj5jifl7mlryksdb7rrcymqq0k6zc0pn"; + url = "https://beta.quicklisp.org/archive/shop3/2026-01-01/shop3-20260101-git.tgz"; + sha256 = "18b079lrd8gviymdqx2v9sv6rdvc8vvd680aiblvzkqfnh0bmkzn"; system = "shop3"; asd = "shop3"; } @@ -93365,12 +92765,12 @@ lib.makeScope pkgs.newScope (self: { shop3-thmpr-api = ( build-asdf-system { pname = "shop3-thmpr-api"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "shop3-thmpr-api" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/shop3/2025-06-22/shop3-20250622-git.tgz"; - sha256 = "0vznjrg51bh261bh39d2cj5jifl7mlryksdb7rrcymqq0k6zc0pn"; + url = "https://beta.quicklisp.org/archive/shop3/2026-01-01/shop3-20260101-git.tgz"; + sha256 = "18b079lrd8gviymdqx2v9sv6rdvc8vvd680aiblvzkqfnh0bmkzn"; system = "shop3-thmpr-api"; asd = "shop3-thmpr-api"; } @@ -93436,12 +92836,12 @@ lib.makeScope pkgs.newScope (self: { si-kanren = ( build-asdf-system { pname = "si-kanren"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "si-kanren" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/si-kanren/2024-10-12/si-kanren-20241012-git.tgz"; - sha256 = "1m99ryyfjxbjbmswprz8gr9hl3srwz74fwjna35wf8d41ns5ajlj"; + url = "https://beta.quicklisp.org/archive/si-kanren/2026-01-01/si-kanren-20260101-git.tgz"; + sha256 = "1h9ism4ni7bssa771gay2pvxga3wschyh5asrkknwxjd51wv15yk"; system = "si-kanren"; asd = "si-kanren"; } @@ -93590,12 +92990,12 @@ lib.makeScope pkgs.newScope (self: { simple-date = ( build-asdf-system { pname = "simple-date"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "simple-date" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/postmodern/2024-10-12/postmodern-20241012-git.tgz"; - sha256 = "1hj0dpclzihy1rcnwhiv16abmaa54wygxyib3j2h9q4qs26w7pzb"; + url = "https://beta.quicklisp.org/archive/postmodern/2026-01-01/postmodern-20260101-git.tgz"; + sha256 = "0y30b02gvfscx1pb0kwc9lmb7fklp5bj6am3k01b8dgk16mcyf3x"; system = "simple-date"; asd = "simple-date"; } @@ -93717,12 +93117,12 @@ lib.makeScope pkgs.newScope (self: { simple-inferiors = ( build-asdf-system { pname = "simple-inferiors"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "simple-inferiors" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/simple-inferiors/2025-06-22/simple-inferiors-20250622-git.tgz"; - sha256 = "050bwv7m6li41rq9cq2achy9j3zibnwyn2xigngg4knir0hi1f4s"; + url = "https://beta.quicklisp.org/archive/simple-inferiors/2026-01-01/simple-inferiors-20260101-git.tgz"; + sha256 = "0f4h1xa2amyzqjyws87d4faqpp450j9xbca79ifdmqdvavh0d4wx"; system = "simple-inferiors"; asd = "simple-inferiors"; } @@ -93872,12 +93272,12 @@ lib.makeScope pkgs.newScope (self: { simple-tasks = ( build-asdf-system { pname = "simple-tasks"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "simple-tasks" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/simple-tasks/2025-06-22/simple-tasks-20250622-git.tgz"; - sha256 = "101fljqvac2msj5aaqbhk755c3ml3rnhz8675abixhfjzbhv1khi"; + url = "https://beta.quicklisp.org/archive/simple-tasks/2026-01-01/simple-tasks-20260101-git.tgz"; + sha256 = "0x2i8qmvs6w20cqhjxibwxypk08dghiiqy5mgq124rijs04fn3lj"; system = "simple-tasks"; asd = "simple-tasks"; } @@ -94357,12 +93757,12 @@ lib.makeScope pkgs.newScope (self: { slim = ( build-asdf-system { pname = "slim"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "slim" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz"; - sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s"; + url = "https://beta.quicklisp.org/archive/mcclim/2026-01-01/mcclim-20260101-git.tgz"; + sha256 = "0vxxgg3vlsyj4xls546s4qpfxzwl694jak6ibm6m53k1pjy4mzvw"; system = "slim"; asd = "slim"; } @@ -94475,12 +93875,12 @@ lib.makeScope pkgs.newScope (self: { slynk = ( build-asdf-system { pname = "slynk"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "slynk" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/sly/2025-06-22/sly-20250622-git.tgz"; - sha256 = "1744n32vc00n6fgc4sa8x6z7s1cym0nq6gqnqqyz56kcqc2h2qqb"; + url = "https://beta.quicklisp.org/archive/sly/2026-01-01/sly-20260101-git.tgz"; + sha256 = "0hjskkxcg8g05al3xhsgpdzixya1ihdygmpb351z3qxbl93bj2xv"; system = "slynk"; asd = "slynk"; } @@ -94584,12 +93984,12 @@ lib.makeScope pkgs.newScope (self: { small-coalton-programs = ( build-asdf-system { pname = "small-coalton-programs"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "small-coalton-programs" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz"; - sha256 = "0g6gfp3y9smzssi3dbddwxvx7g4hq6wz98h253gs4i15pd2pf3qp"; + url = "https://beta.quicklisp.org/archive/coalton/2026-01-01/coalton-20260101-git.tgz"; + sha256 = "1ykx0570dmy8q6ysw98wh7x6r60x2ix5n5clf43g9grknypp0dim"; system = "small-coalton-programs"; asd = "small-coalton-programs"; } @@ -94675,6 +94075,40 @@ lib.makeScope pkgs.newScope (self: { }; } ); + smithy = ( + build-asdf-system { + pname = "smithy"; + version = "20260101-git"; + asds = [ "smithy" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/smithy-lisp/2026-01-01/smithy-lisp-20260101-git.tgz"; + sha256 = "137zalhzirwcn8993bqwr6x0fyxfq6ygmd64bvsvq0laybhvhf67"; + system = "smithy"; + asd = "smithy"; + } + ); + systems = [ "smithy" ]; + lispLibs = [ + (getAttr "alexandria" self) + (getAttr "assoc-utils" self) + (getAttr "babel" self) + (getAttr "cl-base64" self) + (getAttr "cl-ppcre" self) + (getAttr "closer-mop" self) + (getAttr "ironclad" self) + (getAttr "kebab" self) + (getAttr "local-time" self) + (getAttr "plump" self) + (getAttr "quri" self) + (getAttr "split-sequence" self) + (getAttr "yason" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); smokebase = ( build-asdf-system { pname = "smokebase"; @@ -95306,12 +94740,12 @@ lib.makeScope pkgs.newScope (self: { softdrink = ( build-asdf-system { pname = "softdrink"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "softdrink" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/softdrink/2025-06-22/softdrink-20250622-git.tgz"; - sha256 = "07d3nswpxzb3xskya4n7dmv9lgnag0jv88nab6c4ls7ik1v4b9id"; + url = "https://beta.quicklisp.org/archive/softdrink/2026-01-01/softdrink-20260101-git.tgz"; + sha256 = "1gb9nyxx0cvcndqk06kw4p1s4w6x5i69rscvw0p2h8z6nsy4saqw"; system = "softdrink"; asd = "softdrink"; } @@ -95329,12 +94763,12 @@ lib.makeScope pkgs.newScope (self: { software-evolution-library = ( build-asdf-system { pname = "software-evolution-library"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "software-evolution-library" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/sel/2025-06-22/sel-20250622-git.tgz"; - sha256 = "0y8kysbk3r9r3lyfa1dj8yf6nxzbjj2wilf9yfcl8b66yf87a1qs"; + url = "https://beta.quicklisp.org/archive/sel/2026-01-01/sel-20260101-git.tgz"; + sha256 = "06ca6zv4wmkbd0jfjw9k9lf0rix4gvhdp4n7wcm0vf0jjc6hmq17"; system = "software-evolution-library"; asd = "software-evolution-library"; } @@ -95395,12 +94829,12 @@ lib.makeScope pkgs.newScope (self: { source-error = ( build-asdf-system { pname = "source-error"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "source-error" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz"; - sha256 = "0g6gfp3y9smzssi3dbddwxvx7g4hq6wz98h253gs4i15pd2pf3qp"; + url = "https://beta.quicklisp.org/archive/coalton/2026-01-01/coalton-20260101-git.tgz"; + sha256 = "1ykx0570dmy8q6ysw98wh7x6r60x2ix5n5clf43g9grknypp0dim"; system = "source-error"; asd = "source-error"; } @@ -95415,12 +94849,12 @@ lib.makeScope pkgs.newScope (self: { south = ( build-asdf-system { pname = "south"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "south" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/south/2023-10-21/south-20231021-git.tgz"; - sha256 = "0acvi3nwddwphxm92i8bbv1nbb9zzx7gbcza5cr68rs8wydsr8h3"; + url = "https://beta.quicklisp.org/archive/south/2026-01-01/south-20260101-git.tgz"; + sha256 = "1qabkwrnvzjmbsnzgkmfdif6as689snx5bphzqfq2xc8q2id8vdh"; system = "south"; asd = "south"; } @@ -95700,12 +95134,12 @@ lib.makeScope pkgs.newScope (self: { speechless = ( build-asdf-system { pname = "speechless"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "speechless" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/speechless/2025-06-22/speechless-20250622-git.tgz"; - sha256 = "1p9sgj0gaylzxv9vslvikzbj6vk2jm6rd6yklcslkfmyws6wyxhr"; + url = "https://beta.quicklisp.org/archive/speechless/2026-01-01/speechless-20260101-git.tgz"; + sha256 = "1m8xdwdsvvbd3rcmsc0w73zf8ffvc1nm0904m8qilhfjls4d7ffk"; system = "speechless"; asd = "speechless"; } @@ -95791,12 +95225,12 @@ lib.makeScope pkgs.newScope (self: { spinneret = ( build-asdf-system { pname = "spinneret"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "spinneret" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/spinneret/2025-06-22/spinneret-20250622-git.tgz"; - sha256 = "0bvs1055b91b0vdcagcbp3nqx064cjjf4vc8fdv4ym44yk1xzc79"; + url = "https://beta.quicklisp.org/archive/spinneret/2026-01-01/spinneret-20260101-git.tgz"; + sha256 = "1dvd1v3ngqizh1zwgi2y0jbzvqhsfqyd53s3wcnz6np3wzkcx2lw"; system = "spinneret"; asd = "spinneret"; } @@ -95807,7 +95241,6 @@ lib.makeScope pkgs.newScope (self: { (getAttr "cl-ppcre" self) (getAttr "global-vars" self) (getAttr "in-nomine" self) - (getAttr "parenscript" self) (getAttr "serapeum" self) (getAttr "trivia" self) (getAttr "trivial-gray-streams" self) @@ -96139,12 +95572,12 @@ lib.makeScope pkgs.newScope (self: { staple = ( build-asdf-system { pname = "staple"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "staple" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz"; - sha256 = "0pjrjvkn54wrncf44fnang6mkfll6bdgfs0iiawi7xq5rb2ln7ik"; + url = "https://beta.quicklisp.org/archive/staple/2026-01-01/staple-20260101-git.tgz"; + sha256 = "0vvgmfb4ai2df505cbr18j80w84fxf7mp1yybbv3hsjlap9m6cvx"; system = "staple"; asd = "staple"; } @@ -96169,12 +95602,12 @@ lib.makeScope pkgs.newScope (self: { staple-code-parser = ( build-asdf-system { pname = "staple-code-parser"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "staple-code-parser" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz"; - sha256 = "0pjrjvkn54wrncf44fnang6mkfll6bdgfs0iiawi7xq5rb2ln7ik"; + url = "https://beta.quicklisp.org/archive/staple/2026-01-01/staple-20260101-git.tgz"; + sha256 = "0vvgmfb4ai2df505cbr18j80w84fxf7mp1yybbv3hsjlap9m6cvx"; system = "staple-code-parser"; asd = "staple-code-parser"; } @@ -96198,12 +95631,12 @@ lib.makeScope pkgs.newScope (self: { staple-markdown = ( build-asdf-system { pname = "staple-markdown"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "staple-markdown" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz"; - sha256 = "0pjrjvkn54wrncf44fnang6mkfll6bdgfs0iiawi7xq5rb2ln7ik"; + url = "https://beta.quicklisp.org/archive/staple/2026-01-01/staple-20260101-git.tgz"; + sha256 = "0vvgmfb4ai2df505cbr18j80w84fxf7mp1yybbv3hsjlap9m6cvx"; system = "staple-markdown"; asd = "staple-markdown"; } @@ -96222,12 +95655,12 @@ lib.makeScope pkgs.newScope (self: { staple-markless = ( build-asdf-system { pname = "staple-markless"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "staple-markless" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz"; - sha256 = "0pjrjvkn54wrncf44fnang6mkfll6bdgfs0iiawi7xq5rb2ln7ik"; + url = "https://beta.quicklisp.org/archive/staple/2026-01-01/staple-20260101-git.tgz"; + sha256 = "0vvgmfb4ai2df505cbr18j80w84fxf7mp1yybbv3hsjlap9m6cvx"; system = "staple-markless"; asd = "staple-markless"; } @@ -96245,12 +95678,12 @@ lib.makeScope pkgs.newScope (self: { staple-package-recording = ( build-asdf-system { pname = "staple-package-recording"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "staple-package-recording" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz"; - sha256 = "0pjrjvkn54wrncf44fnang6mkfll6bdgfs0iiawi7xq5rb2ln7ik"; + url = "https://beta.quicklisp.org/archive/staple/2026-01-01/staple-20260101-git.tgz"; + sha256 = "0vvgmfb4ai2df505cbr18j80w84fxf7mp1yybbv3hsjlap9m6cvx"; system = "staple-package-recording"; asd = "staple-package-recording"; } @@ -96265,12 +95698,12 @@ lib.makeScope pkgs.newScope (self: { staple-restructured-text = ( build-asdf-system { pname = "staple-restructured-text"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "staple-restructured-text" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz"; - sha256 = "0pjrjvkn54wrncf44fnang6mkfll6bdgfs0iiawi7xq5rb2ln7ik"; + url = "https://beta.quicklisp.org/archive/staple/2026-01-01/staple-20260101-git.tgz"; + sha256 = "0vvgmfb4ai2df505cbr18j80w84fxf7mp1yybbv3hsjlap9m6cvx"; system = "staple-restructured-text"; asd = "staple-restructured-text"; } @@ -96288,12 +95721,12 @@ lib.makeScope pkgs.newScope (self: { staple-server = ( build-asdf-system { pname = "staple-server"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "staple-server" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz"; - sha256 = "0pjrjvkn54wrncf44fnang6mkfll6bdgfs0iiawi7xq5rb2ln7ik"; + url = "https://beta.quicklisp.org/archive/staple/2026-01-01/staple-20260101-git.tgz"; + sha256 = "0vvgmfb4ai2df505cbr18j80w84fxf7mp1yybbv3hsjlap9m6cvx"; system = "staple-server"; asd = "staple-server"; } @@ -96410,12 +95843,12 @@ lib.makeScope pkgs.newScope (self: { statistics = ( build-asdf-system { pname = "statistics"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "statistics" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/statistics/2024-10-12/statistics-20241012-git.tgz"; - sha256 = "00dir3sif9jqc0b48vsk8r41h4zmf95jj4nqrc45mbnr80pmdrsl"; + url = "https://beta.quicklisp.org/archive/statistics/2026-01-01/statistics-20260101-git.tgz"; + sha256 = "0m2n2h8ql0lk3n4vwliqbics0qcbp6hm9a9y0dy8s04shrjyzzhq"; system = "statistics"; asd = "statistics"; } @@ -96707,12 +96140,12 @@ lib.makeScope pkgs.newScope (self: { str = ( build-asdf-system { pname = "str"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "str" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-str/2025-06-22/cl-str-20250622-git.tgz"; - sha256 = "04hjv5cbflpsbhiic5ygld3kvzh775vprmn9n0i6q3w4xi2x56g2"; + url = "https://beta.quicklisp.org/archive/cl-str/2026-01-01/cl-str-20260101-git.tgz"; + sha256 = "0mka61ys601ns9gqlz54vjjmp0qdbw1x58fzawq1kq2r819ndya9"; system = "str"; asd = "str"; } @@ -96729,12 +96162,12 @@ lib.makeScope pkgs.newScope (self: { str_dot_test = ( build-asdf-system { pname = "str.test"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "str.test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-str/2025-06-22/cl-str-20250622-git.tgz"; - sha256 = "04hjv5cbflpsbhiic5ygld3kvzh775vprmn9n0i6q3w4xi2x56g2"; + url = "https://beta.quicklisp.org/archive/cl-str/2026-01-01/cl-str-20260101-git.tgz"; + sha256 = "0mka61ys601ns9gqlz54vjjmp0qdbw1x58fzawq1kq2r819ndya9"; system = "str.test"; asd = "str.test"; } @@ -97048,12 +96481,12 @@ lib.makeScope pkgs.newScope (self: { studio-client = ( build-asdf-system { pname = "studio-client"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "studio-client" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/studio-client/2023-10-21/studio-client-20231021-git.tgz"; - sha256 = "0wxakd5jd0y6h2ii4690qav7zna6iyamdyksw5zjyz4xmsg4by2l"; + url = "https://beta.quicklisp.org/archive/studio-client/2026-01-01/studio-client-20260101-git.tgz"; + sha256 = "03l49sjlyy96h7x42y7hkdl43wn14rrmy78958pkwj7jl1ciqjzw"; system = "studio-client"; asd = "studio-client"; } @@ -97289,12 +96722,12 @@ lib.makeScope pkgs.newScope (self: { surf = ( build-asdf-system { pname = "surf"; - version = "master-5a621564-git"; + version = "master-bfa9fc5c-git"; asds = [ "surf" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; - sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; + url = "https://beta.quicklisp.org/archive/gendl/2026-01-01/gendl-master-bfa9fc5c-git.tgz"; + sha256 = "1hbbflaiplf4qxqlc5bqi28xh419lijrz4rvz18maqiavg059bfk"; system = "surf"; asd = "surf"; } @@ -97309,12 +96742,12 @@ lib.makeScope pkgs.newScope (self: { swank = ( build-asdf-system { pname = "swank"; - version = "v2.31"; + version = "v2.32"; asds = [ "swank" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/slime/2025-06-22/slime-v2.31.tgz"; - sha256 = "0rqjw2c5hzmrmvbf37l6fdx6pria6d360nvqka47qc74s4pw1hyi"; + url = "https://beta.quicklisp.org/archive/slime/2026-01-01/slime-v2.32.tgz"; + sha256 = "1qqjda4vyrgk2sigjnr6f2148sazmb3qi52ixqa5qbszcydpbwyg"; system = "swank"; asd = "swank"; } @@ -97437,12 +96870,12 @@ lib.makeScope pkgs.newScope (self: { sxql = ( build-asdf-system { pname = "sxql"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "sxql" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/sxql/2025-06-22/sxql-20250622-git.tgz"; - sha256 = "0lm6f35h5cg0a1rrpfkfgifp1i2ws0vy3w98kngv886jj9r6jjdn"; + url = "https://beta.quicklisp.org/archive/sxql/2026-01-01/sxql-20260101-git.tgz"; + sha256 = "1gp9cnkpxqxm5hxs5z0zv4lhjvvqy1bvfxr5f382yld5vl5gp22m"; system = "sxql"; asd = "sxql"; } @@ -97450,13 +96883,8 @@ lib.makeScope pkgs.newScope (self: { systems = [ "sxql" ]; lispLibs = [ (getAttr "alexandria" self) - (getAttr "cl-annot" self) (getAttr "cl-package-locks" self) - (getAttr "iterate" self) - (getAttr "named-readtables" self) - (getAttr "split-sequence" self) (getAttr "trivia" self) - (getAttr "trivial-types" self) ]; meta = { hydraPlatforms = [ ]; @@ -97486,20 +96914,19 @@ lib.makeScope pkgs.newScope (self: { sxql-test = ( build-asdf-system { pname = "sxql-test"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "sxql-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/sxql/2025-06-22/sxql-20250622-git.tgz"; - sha256 = "0lm6f35h5cg0a1rrpfkfgifp1i2ws0vy3w98kngv886jj9r6jjdn"; + url = "https://beta.quicklisp.org/archive/sxql/2026-01-01/sxql-20260101-git.tgz"; + sha256 = "1gp9cnkpxqxm5hxs5z0zv4lhjvvqy1bvfxr5f382yld5vl5gp22m"; system = "sxql-test"; asd = "sxql-test"; } ); systems = [ "sxql-test" ]; lispLibs = [ - (getAttr "prove" self) - (getAttr "prove-asdf" self) + (getAttr "rove" self) (getAttr "sxql" self) ]; meta = { @@ -97510,12 +96937,12 @@ lib.makeScope pkgs.newScope (self: { sycamore = ( build-asdf-system { pname = "sycamore"; - version = "20211020-git"; + version = "20260101-git"; asds = [ "sycamore" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/sycamore/2021-10-20/sycamore-20211020-git.tgz"; - sha256 = "0icw7fba1ch51w24f4sinvy4xg3zc7zif0aqcjfrzxj14x108hai"; + url = "https://beta.quicklisp.org/archive/sycamore/2026-01-01/sycamore-20260101-git.tgz"; + sha256 = "0dxkzhs2iqp1734d99fjq769nqx1zrci1hv6wq2pjsh3fsj24nm9"; system = "sycamore"; asd = "sycamore"; } @@ -97634,12 +97061,12 @@ lib.makeScope pkgs.newScope (self: { system-locale = ( build-asdf-system { pname = "system-locale"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "system-locale" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/system-locale/2025-06-22/system-locale-20250622-git.tgz"; - sha256 = "1v794i2f652c1qplbb8igr4dl98xxz7ha9c5ckzql50ykdw871jy"; + url = "https://beta.quicklisp.org/archive/system-locale/2026-01-01/system-locale-20260101-git.tgz"; + sha256 = "13s64kc96i3zmrmnakjfcxj4pnxz4sg77p65hzswdp22w39c0pi7"; system = "system-locale"; asd = "system-locale"; } @@ -97720,12 +97147,12 @@ lib.makeScope pkgs.newScope (self: { ta2 = ( build-asdf-system { pname = "ta2"; - version = "master-5a621564-git"; + version = "master-bfa9fc5c-git"; asds = [ "ta2" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; - sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; + url = "https://beta.quicklisp.org/archive/gendl/2026-01-01/gendl-master-bfa9fc5c-git.tgz"; + sha256 = "1hbbflaiplf4qxqlc5bqi28xh419lijrz4rvz18maqiavg059bfk"; system = "ta2"; asd = "ta2"; } @@ -98027,12 +97454,12 @@ lib.makeScope pkgs.newScope (self: { tasty = ( build-asdf-system { pname = "tasty"; - version = "master-5a621564-git"; + version = "master-bfa9fc5c-git"; asds = [ "tasty" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; - sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; + url = "https://beta.quicklisp.org/archive/gendl/2026-01-01/gendl-master-bfa9fc5c-git.tgz"; + sha256 = "1hbbflaiplf4qxqlc5bqi28xh419lijrz4rvz18maqiavg059bfk"; system = "tasty"; asd = "tasty"; } @@ -98448,12 +97875,12 @@ lib.makeScope pkgs.newScope (self: { terrable = ( build-asdf-system { pname = "terrable"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "terrable" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/terrable/2023-10-21/terrable-20231021-git.tgz"; - sha256 = "03fjfdffr5lf12llqbf3d07dd87ykfyw525dxnwm6gpyvg49wlgl"; + url = "https://beta.quicklisp.org/archive/terrable/2026-01-01/terrable-20260101-git.tgz"; + sha256 = "0j60cjd1rsk5j9slmmdbnpb4v7hgzaif5y32vn3k856hj8c500qh"; system = "terrable"; asd = "terrable"; } @@ -98700,12 +98127,12 @@ lib.makeScope pkgs.newScope (self: { testiere = ( build-asdf-system { pname = "testiere"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "testiere" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/testiere/2025-06-22/testiere-20250622-git.tgz"; - sha256 = "0jn07812abpmlb4rig2v4ckgv5afx7jl03fvi06jn2890i527058"; + url = "https://beta.quicklisp.org/archive/testiere/2026-01-01/testiere-20260101-git.tgz"; + sha256 = "13d5l2s4wqfc5mwalwd4zcrrr2mwlawmmhhacv6zrr37n19q1b0d"; system = "testiere"; asd = "testiere"; } @@ -98717,26 +98144,6 @@ lib.makeScope pkgs.newScope (self: { }; } ); - 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 = [ ]; - }; - } - ); texp = ( build-asdf-system { pname = "texp"; @@ -98760,12 +98167,12 @@ lib.makeScope pkgs.newScope (self: { text-draw = ( build-asdf-system { pname = "text-draw"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "text-draw" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/text-draw/2025-06-22/text-draw-20250622-git.tgz"; - sha256 = "0iw4bx8ipa2y3in8j6d3gjzm26ppxgl93fmphn5574l0lfr0x5ng"; + url = "https://beta.quicklisp.org/archive/text-draw/2026-01-01/text-draw-20260101-git.tgz"; + sha256 = "0q8lh015wl43p71zfgr5g6591qhjzry2ckpdcgzqzx6c1526vs3a"; system = "text-draw"; asd = "text-draw"; } @@ -98901,12 +98308,12 @@ lib.makeScope pkgs.newScope (self: { thih-coalton = ( build-asdf-system { pname = "thih-coalton"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "thih-coalton" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz"; - sha256 = "0g6gfp3y9smzssi3dbddwxvx7g4hq6wz98h253gs4i15pd2pf3qp"; + url = "https://beta.quicklisp.org/archive/coalton/2026-01-01/coalton-20260101-git.tgz"; + sha256 = "1ykx0570dmy8q6ysw98wh7x6r60x2ix5n5clf43g9grknypp0dim"; system = "thih-coalton"; asd = "thih-coalton"; } @@ -99097,12 +98504,12 @@ lib.makeScope pkgs.newScope (self: { timer-wheel = ( build-asdf-system { pname = "timer-wheel"; - version = "20180228-git"; + version = "20260101-git"; asds = [ "timer-wheel" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/timer-wheel/2018-02-28/timer-wheel-20180228-git.tgz"; - sha256 = "12pc1dpnkwj43n1sdqhg8n8h0mb16zcx4wxly85b7bqf00s962bc"; + url = "https://beta.quicklisp.org/archive/timer-wheel/2026-01-01/timer-wheel-20260101-git.tgz"; + sha256 = "0w94q4h5n646l3iaywq1akag38vg2bwlrg7q6w5g7dj9lv4gl2iy"; system = "timer-wheel"; asd = "timer-wheel"; } @@ -99117,12 +98524,12 @@ lib.makeScope pkgs.newScope (self: { timer-wheel_dot_examples = ( build-asdf-system { pname = "timer-wheel.examples"; - version = "20180228-git"; + version = "20260101-git"; asds = [ "timer-wheel.examples" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/timer-wheel/2018-02-28/timer-wheel-20180228-git.tgz"; - sha256 = "12pc1dpnkwj43n1sdqhg8n8h0mb16zcx4wxly85b7bqf00s962bc"; + url = "https://beta.quicklisp.org/archive/timer-wheel/2026-01-01/timer-wheel-20260101-git.tgz"; + sha256 = "0w94q4h5n646l3iaywq1akag38vg2bwlrg7q6w5g7dj9lv4gl2iy"; system = "timer-wheel.examples"; asd = "timer-wheel.examples"; } @@ -99347,12 +98754,12 @@ lib.makeScope pkgs.newScope (self: { toms419 = ( build-asdf-system { pname = "toms419"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "toms419" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; - sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; + url = "https://beta.quicklisp.org/archive/f2cl/2026-01-01/f2cl-20260101-git.tgz"; + sha256 = "025hdyvyk9il71aya05sma13m3x9yxcj7g3sadpzck55manbpfnm"; system = "toms419"; asd = "toms419"; } @@ -99367,12 +98774,12 @@ lib.makeScope pkgs.newScope (self: { toms715 = ( build-asdf-system { pname = "toms715"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "toms715" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; - sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; + url = "https://beta.quicklisp.org/archive/f2cl/2026-01-01/f2cl-20260101-git.tgz"; + sha256 = "025hdyvyk9il71aya05sma13m3x9yxcj7g3sadpzck55manbpfnm"; system = "toms715"; asd = "toms715"; } @@ -99387,12 +98794,12 @@ lib.makeScope pkgs.newScope (self: { toms717 = ( build-asdf-system { pname = "toms717"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "toms717" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz"; - sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z"; + url = "https://beta.quicklisp.org/archive/f2cl/2026-01-01/f2cl-20260101-git.tgz"; + sha256 = "025hdyvyk9il71aya05sma13m3x9yxcj7g3sadpzck55manbpfnm"; system = "toms717"; asd = "toms717"; } @@ -99440,12 +98847,12 @@ lib.makeScope pkgs.newScope (self: { tooter = ( build-asdf-system { pname = "tooter"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "tooter" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/tooter/2025-06-22/tooter-20250622-git.tgz"; - sha256 = "1hyihg9mr9b69jbf6dr07g8w3k7ismw63a4zynmmzbba6lbbv3p0"; + url = "https://beta.quicklisp.org/archive/tooter/2026-01-01/tooter-20260101-git.tgz"; + sha256 = "1mlpgwbvzpg53kfsvlc6dq5d5n74s7ddw8p02wsx7jn1ynbc01jw"; system = "tooter"; asd = "tooter"; } @@ -99640,12 +99047,12 @@ lib.makeScope pkgs.newScope (self: { transducers = ( build-asdf-system { pname = "transducers"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "transducers" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-transducers/2025-06-22/cl-transducers-20250622-git.tgz"; - sha256 = "1ldcd4wkyc5ysw891hs4n3s71zfi0q1ji9pshmxvkq05p7gamqlp"; + url = "https://beta.quicklisp.org/archive/cl-transducers/2026-01-01/cl-transducers-20260101-git.tgz"; + sha256 = "0n550nsxmdgb44rrmwc07ni8wj3kr7smp9nci7693b0cw47yrm79"; system = "transducers"; asd = "transducers"; } @@ -99763,12 +99170,12 @@ lib.makeScope pkgs.newScope (self: { translators = ( build-asdf-system { pname = "translators"; - version = "master-5a621564-git"; + version = "master-bfa9fc5c-git"; asds = [ "translators" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; - sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; + url = "https://beta.quicklisp.org/archive/gendl/2026-01-01/gendl-master-bfa9fc5c-git.tgz"; + sha256 = "1hbbflaiplf4qxqlc5bqi28xh419lijrz4rvz18maqiavg059bfk"; system = "translators"; asd = "translators"; } @@ -99808,12 +99215,12 @@ lib.makeScope pkgs.newScope (self: { tree = ( build-asdf-system { pname = "tree"; - version = "master-5a621564-git"; + version = "master-bfa9fc5c-git"; asds = [ "tree" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; - sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; + url = "https://beta.quicklisp.org/archive/gendl/2026-01-01/gendl-master-bfa9fc5c-git.tgz"; + sha256 = "1hbbflaiplf4qxqlc5bqi28xh419lijrz4rvz18maqiavg059bfk"; system = "tree"; asd = "tree"; } @@ -99993,14 +99400,34 @@ lib.makeScope pkgs.newScope (self: { }; } ); + trinsic = ( + build-asdf-system { + pname = "trinsic"; + version = "20260101-git"; + asds = [ "trinsic" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/trinsic/2026-01-01/trinsic-20260101-git.tgz"; + sha256 = "0i54z3bmnxy1mikh1gjklgmgi931cl8k6s42a59dlpfd6z1rj1nd"; + system = "trinsic"; + asd = "trinsic"; + } + ); + systems = [ "trinsic" ]; + lispLibs = [ (getAttr "trivial-package-locks" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); trivia = ( build-asdf-system { pname = "trivia"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "trivia" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivia/2026-01-01/trivia-20260101-git.tgz"; sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia"; asd = "trivia"; @@ -100014,11 +99441,11 @@ lib.makeScope pkgs.newScope (self: { trivia_dot_balland2006 = ( build-asdf-system { pname = "trivia.balland2006"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "trivia.balland2006" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivia/2026-01-01/trivia-20260101-git.tgz"; sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia.balland2006"; asd = "trivia.balland2006"; @@ -100034,39 +99461,14 @@ lib.makeScope pkgs.newScope (self: { meta = { }; } ); - trivia_dot_benchmark = ( - build-asdf-system { - pname = "trivia.benchmark"; - version = "20241012-git"; - asds = [ "trivia.benchmark" ]; - src = ( - createAsd { - url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; - sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; - system = "trivia.benchmark"; - asd = "trivia.benchmark"; - } - ); - systems = [ "trivia.benchmark" ]; - lispLibs = [ - (getAttr "iterate" self) - (getAttr "optima" self) - (getAttr "trivia" self) - (getAttr "trivia_dot_balland2006" self) - ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); trivia_dot_cffi = ( build-asdf-system { pname = "trivia.cffi"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "trivia.cffi" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivia/2026-01-01/trivia-20260101-git.tgz"; sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia.cffi"; asd = "trivia.cffi"; @@ -100085,11 +99487,11 @@ lib.makeScope pkgs.newScope (self: { trivia_dot_fset = ( build-asdf-system { pname = "trivia.fset"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "trivia.fset" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivia/2026-01-01/trivia-20260101-git.tgz"; sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia.fset"; asd = "trivia.fset"; @@ -100108,11 +99510,11 @@ lib.makeScope pkgs.newScope (self: { trivia_dot_level0 = ( build-asdf-system { pname = "trivia.level0"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "trivia.level0" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivia/2026-01-01/trivia-20260101-git.tgz"; sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia.level0"; asd = "trivia.level0"; @@ -100126,11 +99528,11 @@ lib.makeScope pkgs.newScope (self: { trivia_dot_level1 = ( build-asdf-system { pname = "trivia.level1"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "trivia.level1" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivia/2026-01-01/trivia-20260101-git.tgz"; sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia.level1"; asd = "trivia.level1"; @@ -100144,11 +99546,11 @@ lib.makeScope pkgs.newScope (self: { trivia_dot_level2 = ( build-asdf-system { pname = "trivia.level2"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "trivia.level2" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivia/2026-01-01/trivia-20260101-git.tgz"; sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia.level2"; asd = "trivia.level2"; @@ -100167,11 +99569,11 @@ lib.makeScope pkgs.newScope (self: { trivia_dot_ppcre = ( build-asdf-system { pname = "trivia.ppcre"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "trivia.ppcre" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivia/2026-01-01/trivia-20260101-git.tgz"; sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia.ppcre"; asd = "trivia.ppcre"; @@ -100190,11 +99592,11 @@ lib.makeScope pkgs.newScope (self: { trivia_dot_quasiquote = ( build-asdf-system { pname = "trivia.quasiquote"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "trivia.quasiquote" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivia/2026-01-01/trivia-20260101-git.tgz"; sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia.quasiquote"; asd = "trivia.quasiquote"; @@ -100211,11 +99613,11 @@ lib.makeScope pkgs.newScope (self: { trivia_dot_test = ( build-asdf-system { pname = "trivia.test"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "trivia.test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivia/2026-01-01/trivia-20260101-git.tgz"; sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia.test"; asd = "trivia.test"; @@ -100239,11 +99641,11 @@ lib.makeScope pkgs.newScope (self: { trivia_dot_trivial = ( build-asdf-system { pname = "trivia.trivial"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "trivia.trivial" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + url = "https://beta.quicklisp.org/archive/trivia/2026-01-01/trivia-20260101-git.tgz"; sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia.trivial"; asd = "trivia.trivial"; @@ -100277,12 +99679,12 @@ lib.makeScope pkgs.newScope (self: { trivial-arguments = ( build-asdf-system { pname = "trivial-arguments"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "trivial-arguments" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/trivial-arguments/2025-06-22/trivial-arguments-20250622-git.tgz"; - sha256 = "1lgg057vp6iwf0k48dipgm5ffpqfakx0kgicf13xscfqzpv5pw6i"; + url = "https://beta.quicklisp.org/archive/trivial-arguments/2026-01-01/trivial-arguments-20260101-git.tgz"; + sha256 = "1176rmmidaskf6zzig0qvcqv91zj791wgyjz26kxqll3yzavc67s"; system = "trivial-arguments"; asd = "trivial-arguments"; } @@ -100356,18 +99758,18 @@ lib.makeScope pkgs.newScope (self: { trivial-benchmark = ( build-asdf-system { pname = "trivial-benchmark"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "trivial-benchmark" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/trivial-benchmark/2023-10-21/trivial-benchmark-20231021-git.tgz"; - sha256 = "1p48wgpady0n8frdcgp7sbg93b0fbvpx1qk5valmanhwr9j3xh88"; + url = "https://beta.quicklisp.org/archive/trivial-benchmark/2026-01-01/trivial-benchmark-20260101-git.tgz"; + sha256 = "0na1nbrzw89dfr563qad0rcs1fvwkrq1cldy95qxa50xijs96x18"; system = "trivial-benchmark"; asd = "trivial-benchmark"; } ); systems = [ "trivial-benchmark" ]; - lispLibs = [ (getAttr "alexandria" self) ]; + lispLibs = [ (getAttr "documentation-utils" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -100530,11 +99932,11 @@ lib.makeScope pkgs.newScope (self: { trivial-clock = ( build-asdf-system { pname = "trivial-clock"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "trivial-clock" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-trivial-clock/2025-06-22/cl-trivial-clock-20250622-git.tgz"; + url = "https://beta.quicklisp.org/archive/cl-trivial-clock/2026-01-01/cl-trivial-clock-20260101-git.tgz"; sha256 = "13pfghnar0c55fzha8nfihyjayycz659wp08s5fcip1ksdgkiw05"; system = "trivial-clock"; asd = "trivial-clock"; @@ -100759,12 +100161,12 @@ lib.makeScope pkgs.newScope (self: { trivial-download = ( build-asdf-system { pname = "trivial-download"; - version = "20230214-git"; + version = "20260101-git"; asds = [ "trivial-download" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/trivial-download/2023-02-14/trivial-download-20230214-git.tgz"; - sha256 = "17kag2zi1r766n2mg4knz4ix268bll2acl0150cksibfa4dbq1k7"; + url = "https://beta.quicklisp.org/archive/trivial-download/2026-01-01/trivial-download-20260101-git.tgz"; + sha256 = "1af0h90c4kvyiw14f9lq6zphd2mk8xlp8dvszn8sw0xgkfl63p9z"; system = "trivial-download"; asd = "trivial-download"; } @@ -100905,12 +100307,12 @@ lib.makeScope pkgs.newScope (self: { trivial-extensible-sequences = ( build-asdf-system { pname = "trivial-extensible-sequences"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "trivial-extensible-sequences" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/trivial-extensible-sequences/2025-06-22/trivial-extensible-sequences-20250622-git.tgz"; - sha256 = "1l3i99gcabh7b0cvkhqlhdfx5mk1n2smfvkxzgx8v55qa5gzsa8w"; + url = "https://beta.quicklisp.org/archive/trivial-extensible-sequences/2026-01-01/trivial-extensible-sequences-20260101-git.tgz"; + sha256 = "13bi8ds2vrbx9alrcv6a7f26746zlmhmd4hg0c7q4bldr9bkw28v"; system = "trivial-extensible-sequences"; asd = "trivial-extensible-sequences"; } @@ -101156,12 +100558,12 @@ lib.makeScope pkgs.newScope (self: { trivial-indent = ( build-asdf-system { pname = "trivial-indent"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "trivial-indent" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/trivial-indent/2025-06-22/trivial-indent-20250622-git.tgz"; - sha256 = "17zfm62szbvyn8qq6k88yh04xwa6dnmbla4yqaqqpc971xs562cy"; + url = "https://beta.quicklisp.org/archive/trivial-indent/2026-01-01/trivial-indent-20260101-git.tgz"; + sha256 = "12bakw9qrxqpzk670w238zzdmvv70rb824zls75avzbn6mlpcjbh"; system = "trivial-indent"; asd = "trivial-indent"; } @@ -101171,6 +100573,26 @@ lib.makeScope pkgs.newScope (self: { meta = { }; } ); + trivial-inspect = ( + build-asdf-system { + pname = "trivial-inspect"; + version = "20260101-git"; + asds = [ "trivial-inspect" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/trivial-inspect/2026-01-01/trivial-inspect-20260101-git.tgz"; + sha256 = "1w76m4zxhn37djfbyy26qfjzar3bkxvzca4q8yrklnl7hb6ivi34"; + system = "trivial-inspect"; + asd = "trivial-inspect"; + } + ); + systems = [ "trivial-inspect" ]; + lispLibs = [ (getAttr "trivial-arguments" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); trivial-inspector-hook = ( build-asdf-system { pname = "trivial-inspector-hook"; @@ -101417,12 +100839,12 @@ lib.makeScope pkgs.newScope (self: { trivial-main-thread = ( build-asdf-system { pname = "trivial-main-thread"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "trivial-main-thread" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/trivial-main-thread/2025-06-22/trivial-main-thread-20250622-git.tgz"; - sha256 = "0p7p6bh3rghj3yj2d9ry2jfvpjkky2mwwbbh4w422v6yplv6iwhx"; + url = "https://beta.quicklisp.org/archive/trivial-main-thread/2026-01-01/trivial-main-thread-20260101-git.tgz"; + sha256 = "17223avg1nizy6fp40d49lnd7jx3xr570zw203qzj4yrxhhb05i1"; system = "trivial-main-thread"; asd = "trivial-main-thread"; } @@ -101459,12 +100881,12 @@ lib.makeScope pkgs.newScope (self: { trivial-mimes = ( build-asdf-system { pname = "trivial-mimes"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "trivial-mimes" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/trivial-mimes/2025-06-22/trivial-mimes-20250622-git.tgz"; - sha256 = "0ahf8i2ghsg1kqfiaarxhlcsd3icmb2glsbcv2rwzdc06w7x2lms"; + url = "https://beta.quicklisp.org/archive/trivial-mimes/2026-01-01/trivial-mimes-20260101-git.tgz"; + sha256 = "0dhvrrjh11kcqxv6yi8y6ihcrwirviadlmb3a7m6jvbkj9zfs30v"; system = "trivial-mimes"; asd = "trivial-mimes"; } @@ -101635,18 +101057,18 @@ lib.makeScope pkgs.newScope (self: { trivial-open-browser = ( build-asdf-system { pname = "trivial-open-browser"; - version = "20160825-git"; + version = "20260101-git"; asds = [ "trivial-open-browser" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/trivial-open-browser/2016-08-25/trivial-open-browser-20160825-git.tgz"; - sha256 = "0ixay1piq420i6adx642qhw45l6ik7rvgk52lyz27dvx5f8yqsdb"; + url = "https://beta.quicklisp.org/archive/trivial-open-browser/2026-01-01/trivial-open-browser-20260101-git.tgz"; + sha256 = "19jg4mibbf6k5zpd6vqif6kanb3xfwimqn19abah2z5d1h8s391w"; system = "trivial-open-browser"; asd = "trivial-open-browser"; } ); systems = [ "trivial-open-browser" ]; - lispLibs = [ ]; + lispLibs = [ (getAttr "trivial-features" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -101725,12 +101147,12 @@ lib.makeScope pkgs.newScope (self: { trivial-package-locks = ( build-asdf-system { pname = "trivial-package-locks"; - version = "20241012-git"; + version = "20260101-git"; asds = [ "trivial-package-locks" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/trivial-package-locks/2024-10-12/trivial-package-locks-20241012-git.tgz"; - sha256 = "09zhirygjmwr4xvwp1zx9b17mkxml7f7rni1xiwxg5vfgn0y1bi3"; + url = "https://beta.quicklisp.org/archive/trivial-package-locks/2026-01-01/trivial-package-locks-20260101-git.tgz"; + sha256 = "0wsi806y7in0ylfph3i293m61drj7n8g69wk638biab25rhi810x"; system = "trivial-package-locks"; asd = "trivial-package-locks"; } @@ -102188,12 +101610,12 @@ lib.makeScope pkgs.newScope (self: { trivial-thumbnail = ( build-asdf-system { pname = "trivial-thumbnail"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "trivial-thumbnail" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/trivial-thumbnail/2025-06-22/trivial-thumbnail-20250622-git.tgz"; - sha256 = "1451yimch278s4qing3a71kpnhgk3dl4k096prvyiyqyz1qnq2ld"; + url = "https://beta.quicklisp.org/archive/trivial-thumbnail/2026-01-01/trivial-thumbnail-20260101-git.tgz"; + sha256 = "0knx2cf95a3z4h4dhsvyp9dpnkh77p6riq4xhr2bd77hc3wx4jql"; system = "trivial-thumbnail"; asd = "trivial-thumbnail"; } @@ -102205,6 +101627,26 @@ lib.makeScope pkgs.newScope (self: { }; } ); + trivial-time = ( + build-asdf-system { + pname = "trivial-time"; + version = "20260101-git"; + asds = [ "trivial-time" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/trivial-time/2026-01-01/trivial-time-20260101-git.tgz"; + sha256 = "1wdirszg6qmz7idj9zsg8zgx217a9zx8x5qxwknzyp1y371p3b37"; + system = "trivial-time"; + asd = "trivial-time"; + } + ); + systems = [ "trivial-time" ]; + lispLibs = [ ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); trivial-timeout = ( build-asdf-system { pname = "trivial-timeout"; @@ -102274,12 +101716,12 @@ lib.makeScope pkgs.newScope (self: { trivial-toplevel-prompt = ( build-asdf-system { pname = "trivial-toplevel-prompt"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "trivial-toplevel-prompt" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/trivial-toplevel-prompt/2025-06-22/trivial-toplevel-prompt-20250622-git.tgz"; - sha256 = "0n3apxjdxn8cnhl1w1ampzhc6j37ra4ygv44v6rz3sinw1pwcmf4"; + url = "https://beta.quicklisp.org/archive/trivial-toplevel-prompt/2026-01-01/trivial-toplevel-prompt-20260101-git.tgz"; + sha256 = "01fjzr8wk09yg8j7ps0iyqkd7p4qbqddzj2rpz70vha093f0nhgf"; system = "trivial-toplevel-prompt"; asd = "trivial-toplevel-prompt"; } @@ -102437,18 +101879,18 @@ lib.makeScope pkgs.newScope (self: { trivial-with-current-source-form = ( build-asdf-system { pname = "trivial-with-current-source-form"; - version = "20230618-git"; + version = "20260101-git"; asds = [ "trivial-with-current-source-form" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/trivial-with-current-source-form/2023-06-18/trivial-with-current-source-form-20230618-git.tgz"; - sha256 = "1856m234mcg8l0p63h0j76isx8n2iji569b4r4zf7qs135xbw930"; + url = "https://beta.quicklisp.org/archive/trivial-with-current-source-form/2026-01-01/trivial-with-current-source-form-20260101-git.tgz"; + sha256 = "0y1gmgbcpx669pr6nqm16ic7dc0klx21qsnr4hg5c3r31ffyirkw"; system = "trivial-with-current-source-form"; asd = "trivial-with-current-source-form"; } ); systems = [ "trivial-with-current-source-form" ]; - lispLibs = [ (getAttr "alexandria" self) ]; + lispLibs = [ ]; meta = { }; } ); @@ -102856,6 +102298,32 @@ lib.makeScope pkgs.newScope (self: { }; } ); + tuition = ( + build-asdf-system { + pname = "tuition"; + version = "20260101-git"; + asds = [ "tuition" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-tuition/2026-01-01/cl-tuition-20260101-git.tgz"; + sha256 = "1774jwj3vs9xdwnildg9irvavm66fd9fzinmp79g7fdjzh92w0wr"; + system = "tuition"; + asd = "tuition"; + } + ); + systems = [ "tuition" ]; + lispLibs = [ + (getAttr "alexandria" self) + (getAttr "bordeaux-threads" self) + (getAttr "serapeum" self) + (getAttr "trivial-channels" self) + (getAttr "version-string" self) + ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); twfy = ( build-asdf-system { pname = "twfy"; @@ -102997,12 +102465,12 @@ lib.makeScope pkgs.newScope (self: { type-templates = ( build-asdf-system { pname = "type-templates"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "type-templates" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/type-templates/2025-06-22/type-templates-20250622-git.tgz"; - sha256 = "1kc88zhvh2xvx73sxqq58kip31xa9ial1y1vi8rrw8za3bf31nc3"; + url = "https://beta.quicklisp.org/archive/type-templates/2026-01-01/type-templates-20260101-git.tgz"; + sha256 = "0zrkcf5171rhnwrz7jg58jq4y741dhc6lvymnhb7l1qan6gl4hyk"; system = "type-templates"; asd = "type-templates"; } @@ -103072,12 +102540,12 @@ lib.makeScope pkgs.newScope (self: { uax-14 = ( build-asdf-system { pname = "uax-14"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "uax-14" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/uax-14/2025-06-22/uax-14-20250622-git.tgz"; - sha256 = "1a1lzmmfqhxyg68fg0q0rpcpx57bv48svwgm5aq3ffi03j2wyy1l"; + url = "https://beta.quicklisp.org/archive/uax-14/2026-01-01/uax-14-20260101-git.tgz"; + sha256 = "1s504dm05i84bkh2j7gml24phihvlbaah93y03vpj75qm7b4c36j"; system = "uax-14"; asd = "uax-14"; } @@ -103092,12 +102560,12 @@ lib.makeScope pkgs.newScope (self: { uax-14-test = ( build-asdf-system { pname = "uax-14-test"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "uax-14-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/uax-14/2025-06-22/uax-14-20250622-git.tgz"; - sha256 = "1a1lzmmfqhxyg68fg0q0rpcpx57bv48svwgm5aq3ffi03j2wyy1l"; + url = "https://beta.quicklisp.org/archive/uax-14/2026-01-01/uax-14-20260101-git.tgz"; + sha256 = "1s504dm05i84bkh2j7gml24phihvlbaah93y03vpj75qm7b4c36j"; system = "uax-14-test"; asd = "uax-14-test"; } @@ -103137,12 +102605,12 @@ lib.makeScope pkgs.newScope (self: { uax-9 = ( build-asdf-system { pname = "uax-9"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "uax-9" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/uax-9/2023-10-21/uax-9-20231021-git.tgz"; - sha256 = "1kbq8v45pxhmwqn6is5lfsp51h80kns4s1cqbh9z0xdmxzw63ip1"; + url = "https://beta.quicklisp.org/archive/uax-9/2026-01-01/uax-9-20260101-git.tgz"; + sha256 = "0xxkhqifgzqha2xhb2aw9zr3bw2prvacvb126m2qs5ahjrfnpnag"; system = "uax-9"; asd = "uax-9"; } @@ -103157,12 +102625,12 @@ lib.makeScope pkgs.newScope (self: { uax-9-test = ( build-asdf-system { pname = "uax-9-test"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "uax-9-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/uax-9/2023-10-21/uax-9-20231021-git.tgz"; - sha256 = "1kbq8v45pxhmwqn6is5lfsp51h80kns4s1cqbh9z0xdmxzw63ip1"; + url = "https://beta.quicklisp.org/archive/uax-9/2026-01-01/uax-9-20260101-git.tgz"; + sha256 = "0xxkhqifgzqha2xhb2aw9zr3bw2prvacvb126m2qs5ahjrfnpnag"; system = "uax-9-test"; asd = "uax-9-test"; } @@ -103181,12 +102649,12 @@ lib.makeScope pkgs.newScope (self: { ubiquitous = ( build-asdf-system { pname = "ubiquitous"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "ubiquitous" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/ubiquitous/2023-10-21/ubiquitous-20231021-git.tgz"; - sha256 = "02q6yz9j374q23avi06lddy6gkzza0xn3855n7dqgy34fv1shw1i"; + url = "https://beta.quicklisp.org/archive/ubiquitous/2026-01-01/ubiquitous-20260101-git.tgz"; + sha256 = "0l32yrwvln7vdbx6lw9dgqv36vhawprp4gjy27bnj1z1v2pja2nc"; system = "ubiquitous"; asd = "ubiquitous"; } @@ -103202,12 +102670,12 @@ lib.makeScope pkgs.newScope (self: { ubiquitous-concurrent = ( build-asdf-system { pname = "ubiquitous-concurrent"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "ubiquitous-concurrent" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/ubiquitous/2023-10-21/ubiquitous-20231021-git.tgz"; - sha256 = "02q6yz9j374q23avi06lddy6gkzza0xn3855n7dqgy34fv1shw1i"; + url = "https://beta.quicklisp.org/archive/ubiquitous/2026-01-01/ubiquitous-20260101-git.tgz"; + sha256 = "0l32yrwvln7vdbx6lw9dgqv36vhawprp4gjy27bnj1z1v2pja2nc"; system = "ubiquitous-concurrent"; asd = "ubiquitous-concurrent"; } @@ -103644,12 +103112,12 @@ lib.makeScope pkgs.newScope (self: { uncursed = ( build-asdf-system { pname = "uncursed"; - version = "20220220-git"; + version = "20260101-git"; asds = [ "uncursed" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/uncursed/2022-02-20/uncursed-20220220-git.tgz"; - sha256 = "1hydiwh12851rrm12y0a6pb2jml2cjdk8wxvz4c00d2xwraqc6mr"; + url = "https://beta.quicklisp.org/archive/uncursed/2026-01-01/uncursed-20260101-git.tgz"; + sha256 = "19vmbcphijqf4nahaba50lw5b1xnn7q3pbg1rycbfi01j1ly4clw"; system = "uncursed"; asd = "uncursed"; } @@ -103670,18 +103138,19 @@ lib.makeScope pkgs.newScope (self: { uncursed-examples = ( build-asdf-system { pname = "uncursed-examples"; - version = "20220220-git"; + version = "20260101-git"; asds = [ "uncursed-examples" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/uncursed/2022-02-20/uncursed-20220220-git.tgz"; - sha256 = "1hydiwh12851rrm12y0a6pb2jml2cjdk8wxvz4c00d2xwraqc6mr"; + url = "https://beta.quicklisp.org/archive/uncursed/2026-01-01/uncursed-20260101-git.tgz"; + sha256 = "19vmbcphijqf4nahaba50lw5b1xnn7q3pbg1rycbfi01j1ly4clw"; system = "uncursed-examples"; asd = "uncursed-examples"; } ); systems = [ "uncursed-examples" ]; lispLibs = [ + (getAttr "bordeaux-threads" self) (getAttr "cffi-grovel" self) (getAttr "uncursed" self) ]; @@ -103980,12 +103449,12 @@ lib.makeScope pkgs.newScope (self: { usocket = ( build-asdf-system { pname = "usocket"; - version = "0.8.8"; + version = "0.8.9"; asds = [ "usocket" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/usocket/2024-10-12/usocket-0.8.8.tgz"; - sha256 = "13j2hyl7j06vl8hh3930wd3bi2p0pcg4dcd243al31fgw4m0bvag"; + url = "https://beta.quicklisp.org/archive/usocket/2026-01-01/usocket-0.8.9.tgz"; + sha256 = "0msrrp069vrma70fr0wzw5jc94r796ha53dhpq8bdm1h3fm7f103"; system = "usocket"; asd = "usocket"; } @@ -103998,12 +103467,12 @@ lib.makeScope pkgs.newScope (self: { usocket-server = ( build-asdf-system { pname = "usocket-server"; - version = "0.8.8"; + version = "0.8.9"; asds = [ "usocket-server" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/usocket/2024-10-12/usocket-0.8.8.tgz"; - sha256 = "13j2hyl7j06vl8hh3930wd3bi2p0pcg4dcd243al31fgw4m0bvag"; + url = "https://beta.quicklisp.org/archive/usocket/2026-01-01/usocket-0.8.9.tgz"; + sha256 = "0msrrp069vrma70fr0wzw5jc94r796ha53dhpq8bdm1h3fm7f103"; system = "usocket-server"; asd = "usocket-server"; } @@ -104019,12 +103488,12 @@ lib.makeScope pkgs.newScope (self: { usocket-test = ( build-asdf-system { pname = "usocket-test"; - version = "0.8.8"; + version = "0.8.9"; asds = [ "usocket-test" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/usocket/2024-10-12/usocket-0.8.8.tgz"; - sha256 = "13j2hyl7j06vl8hh3930wd3bi2p0pcg4dcd243al31fgw4m0bvag"; + url = "https://beta.quicklisp.org/archive/usocket/2026-01-01/usocket-0.8.9.tgz"; + sha256 = "0msrrp069vrma70fr0wzw5jc94r796ha53dhpq8bdm1h3fm7f103"; system = "usocket-test"; asd = "usocket-test"; } @@ -104290,26 +103759,6 @@ lib.makeScope pkgs.newScope (self: { meta = { }; } ); - uuidv7 = ( - build-asdf-system { - pname = "uuidv7"; - version = "20241012-git"; - asds = [ "uuidv7" ]; - src = ( - createAsd { - url = "https://beta.quicklisp.org/archive/uuidv7.lisp/2024-10-12/uuidv7.lisp-20241012-git.tgz"; - sha256 = "1lirb92a1b3hpf66gndas4yix0smfckg9arzk69lpcvxsidzc66l"; - system = "uuidv7"; - asd = "uuidv7"; - } - ); - systems = [ "uuidv7" ]; - lispLibs = [ (getAttr "local-time" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - } - ); validate-list = ( build-asdf-system { pname = "validate-list"; @@ -104544,12 +103993,12 @@ lib.makeScope pkgs.newScope (self: { vellum = ( build-asdf-system { pname = "vellum"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "vellum" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/vellum/2025-06-22/vellum-20250622-git.tgz"; - sha256 = "0bc8fdyzq01kfilz7zyibq8dghzp1gcvdn4681r5hzpsslprym44"; + url = "https://beta.quicklisp.org/archive/vellum/2026-01-01/vellum-20260101-git.tgz"; + sha256 = "11w8mldjl8cx89s1c4p57p5bdqxa7p4xi0gn05gq4rfyz1avkqjr"; system = "vellum"; asd = "vellum"; } @@ -104706,12 +104155,12 @@ lib.makeScope pkgs.newScope (self: { vellum-tests = ( build-asdf-system { pname = "vellum-tests"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "vellum-tests" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/vellum/2025-06-22/vellum-20250622-git.tgz"; - sha256 = "0bc8fdyzq01kfilz7zyibq8dghzp1gcvdn4681r5hzpsslprym44"; + url = "https://beta.quicklisp.org/archive/vellum/2026-01-01/vellum-20260101-git.tgz"; + sha256 = "11w8mldjl8cx89s1c4p57p5bdqxa7p4xi0gn05gq4rfyz1avkqjr"; system = "vellum-tests"; asd = "vellum-tests"; } @@ -104750,12 +104199,12 @@ lib.makeScope pkgs.newScope (self: { verbose = ( build-asdf-system { pname = "verbose"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "verbose" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/verbose/2025-06-22/verbose-20250622-git.tgz"; - sha256 = "1zpfbnfa4ii093aij4bzay6nm9kgms2smksrdj1d9kkl5qbrviyz"; + url = "https://beta.quicklisp.org/archive/verbose/2026-01-01/verbose-20260101-git.tgz"; + sha256 = "1435flzynwd9andni8b7qgv61g05v1pqlxzckyasaapiiz0ds6qj"; system = "verbose"; asd = "verbose"; } @@ -104852,6 +104301,26 @@ lib.makeScope pkgs.newScope (self: { }; } ); + version-string = ( + build-asdf-system { + pname = "version-string"; + version = "20260101-git"; + asds = [ "version-string" ]; + src = ( + createAsd { + url = "https://beta.quicklisp.org/archive/cl-version-string/2026-01-01/cl-version-string-20260101-git.tgz"; + sha256 = "1m4y59dyx54pxp856d4hwvdiyrxq9533rdnwy9lbnha1ailav7jz"; + system = "version-string"; + asd = "version-string"; + } + ); + systems = [ "version-string" ]; + lispLibs = [ ]; + meta = { + hydraPlatforms = [ ]; + }; + } + ); vertex = ( build-asdf-system { pname = "vertex"; @@ -105407,18 +104876,19 @@ lib.makeScope pkgs.newScope (self: { vp-trees = ( build-asdf-system { pname = "vp-trees"; - version = "20230214-git"; + version = "20260101-git"; asds = [ "vp-trees" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/vp-trees/2023-02-14/vp-trees-20230214-git.tgz"; - sha256 = "0fk41c97p5ck5g9nsvq6h9hzxz7yssyqz3v4f4qiavdnw6a9va1m"; + url = "https://beta.quicklisp.org/archive/vp-trees/2026-01-01/vp-trees-20260101-git.tgz"; + sha256 = "0yr29bc0vlrxgwa8dnxp8pz1k5yrvckjrzw5239ik2xvhisvjbi7"; system = "vp-trees"; asd = "vp-trees"; } ); systems = [ "vp-trees" ]; lispLibs = [ + (getAttr "alexandria" self) (getAttr "float-features" self) (getAttr "serapeum" self) ]; @@ -105502,12 +104972,12 @@ lib.makeScope pkgs.newScope (self: { wayflan = ( build-asdf-system { pname = "wayflan"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "wayflan" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/wayflan/2025-06-22/wayflan-20250622-git.tgz"; - sha256 = "0y6hzskp1vgaigzj5b3i695sc6dn5mk7nlxs21nh5ybzmf4chhyy"; + url = "https://beta.quicklisp.org/archive/wayflan/2026-01-01/wayflan-20260101-git.tgz"; + sha256 = "0ab45m2df8nps4jiir17j6vm3xv15xm4hh79wl3vd1ppzrkkn0i3"; system = "wayflan"; asd = "wayflan"; } @@ -105525,12 +104995,12 @@ lib.makeScope pkgs.newScope (self: { wayflan-client = ( build-asdf-system { pname = "wayflan-client"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "wayflan-client" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/wayflan/2025-06-22/wayflan-20250622-git.tgz"; - sha256 = "0y6hzskp1vgaigzj5b3i695sc6dn5mk7nlxs21nh5ybzmf4chhyy"; + url = "https://beta.quicklisp.org/archive/wayflan/2026-01-01/wayflan-20260101-git.tgz"; + sha256 = "0ab45m2df8nps4jiir17j6vm3xv15xm4hh79wl3vd1ppzrkkn0i3"; system = "wayflan-client"; asd = "wayflan-client"; } @@ -105816,12 +105286,12 @@ lib.makeScope pkgs.newScope (self: { websocket-driver = ( build-asdf-system { pname = "websocket-driver"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "websocket-driver" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/websocket-driver/2025-06-22/websocket-driver-20250622-git.tgz"; - sha256 = "16dgs47215xb2i2mw3w3wn3spsf1hac1dyla9lq87k155vy7zlry"; + url = "https://beta.quicklisp.org/archive/websocket-driver/2026-01-01/websocket-driver-20260101-git.tgz"; + sha256 = "1rvip17vz4mdia71qhfz3dhi6jkqzcbhqmjyr40vysddp3hp60x4"; system = "websocket-driver"; asd = "websocket-driver"; } @@ -105839,12 +105309,12 @@ lib.makeScope pkgs.newScope (self: { websocket-driver-base = ( build-asdf-system { pname = "websocket-driver-base"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "websocket-driver-base" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/websocket-driver/2025-06-22/websocket-driver-20250622-git.tgz"; - sha256 = "16dgs47215xb2i2mw3w3wn3spsf1hac1dyla9lq87k155vy7zlry"; + url = "https://beta.quicklisp.org/archive/websocket-driver/2026-01-01/websocket-driver-20260101-git.tgz"; + sha256 = "1rvip17vz4mdia71qhfz3dhi6jkqzcbhqmjyr40vysddp3hp60x4"; system = "websocket-driver-base"; asd = "websocket-driver-base"; } @@ -105867,12 +105337,12 @@ lib.makeScope pkgs.newScope (self: { websocket-driver-client = ( build-asdf-system { pname = "websocket-driver-client"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "websocket-driver-client" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/websocket-driver/2025-06-22/websocket-driver-20250622-git.tgz"; - sha256 = "16dgs47215xb2i2mw3w3wn3spsf1hac1dyla9lq87k155vy7zlry"; + url = "https://beta.quicklisp.org/archive/websocket-driver/2026-01-01/websocket-driver-20260101-git.tgz"; + sha256 = "1rvip17vz4mdia71qhfz3dhi6jkqzcbhqmjyr40vysddp3hp60x4"; system = "websocket-driver-client"; asd = "websocket-driver-client"; } @@ -105897,12 +105367,12 @@ lib.makeScope pkgs.newScope (self: { websocket-driver-server = ( build-asdf-system { pname = "websocket-driver-server"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "websocket-driver-server" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/websocket-driver/2025-06-22/websocket-driver-20250622-git.tgz"; - sha256 = "16dgs47215xb2i2mw3w3wn3spsf1hac1dyla9lq87k155vy7zlry"; + url = "https://beta.quicklisp.org/archive/websocket-driver/2026-01-01/websocket-driver-20260101-git.tgz"; + sha256 = "1rvip17vz4mdia71qhfz3dhi6jkqzcbhqmjyr40vysddp3hp60x4"; system = "websocket-driver-server"; asd = "websocket-driver-server"; } @@ -106015,11 +105485,11 @@ lib.makeScope pkgs.newScope (self: { whereiseveryone_dot_command-line-args = ( build-asdf-system { pname = "whereiseveryone.command-line-args"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "whereiseveryone.command-line-args" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/command-line-args/2025-06-22/command-line-args-20250622-git.tgz"; + url = "https://beta.quicklisp.org/archive/command-line-args/2026-01-01/command-line-args-20260101-git.tgz"; sha256 = "14x68ww8323vkvql3ryn9wkxf4fbj1brdn4f6mynr7wqygink2bd"; system = "whereiseveryone.command-line-args"; asd = "whereiseveryone.command-line-args"; @@ -106238,12 +105708,12 @@ lib.makeScope pkgs.newScope (self: { wire-world = ( build-asdf-system { pname = "wire-world"; - version = "master-5a621564-git"; + version = "master-bfa9fc5c-git"; asds = [ "wire-world" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; - sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; + url = "https://beta.quicklisp.org/archive/gendl/2026-01-01/gendl-master-bfa9fc5c-git.tgz"; + sha256 = "1hbbflaiplf4qxqlc5bqi28xh419lijrz4rvz18maqiavg059bfk"; system = "wire-world"; asd = "wire-world"; } @@ -106355,12 +105825,12 @@ lib.makeScope pkgs.newScope (self: { with-contexts = ( build-asdf-system { pname = "with-contexts"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "with-contexts" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/with-contexts/2025-06-22/with-contexts-20250622-git.tgz"; - sha256 = "16ak29iy4akxfz7la4mb3swfmyxqj0pf08j5wrpcp7djxb3y6wi9"; + url = "https://beta.quicklisp.org/archive/with-contexts/2026-01-01/with-contexts-20260101-git.tgz"; + sha256 = "1fj9dgmp7ivr5kmrj48ccxa6cxks7kh52yd4kpqj74isa7glngj9"; system = "with-contexts"; asd = "with-contexts"; } @@ -106639,12 +106109,12 @@ lib.makeScope pkgs.newScope (self: { wouldwork = ( build-asdf-system { pname = "wouldwork"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "wouldwork" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/wouldwork/2025-06-22/wouldwork-20250622-git.tgz"; - sha256 = "1g47djrdh2qipihvxph5df4z4l10ziwgd69bvjrb3a58r7nl4sj0"; + url = "https://beta.quicklisp.org/archive/wouldwork/2026-01-01/wouldwork-20260101-git.tgz"; + sha256 = "0zarniyx342nhmmc17ra81nv0yvnl2m25bcxgwimjygysw850f8s"; system = "wouldwork"; asd = "wouldwork"; } @@ -106929,12 +106399,12 @@ lib.makeScope pkgs.newScope (self: { xhtmlambda = ( build-asdf-system { pname = "xhtmlambda"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "xhtmlambda" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/xhtmlambda/2025-06-22/xhtmlambda-20250622-git.tgz"; - sha256 = "1s30s7panpxi59n0rzqls6pq34gx362s2f4xawswc242c922h3pc"; + url = "https://beta.quicklisp.org/archive/xhtmlambda/2026-01-01/xhtmlambda-20260101-git.tgz"; + sha256 = "13z5qdvhd9k0nxs55q93b8k7vypmbb17alw226r9gni3rbplmcb3"; system = "xhtmlambda"; asd = "xhtmlambda"; } @@ -107359,12 +106829,12 @@ lib.makeScope pkgs.newScope (self: { yacc = ( build-asdf-system { pname = "yacc"; - version = "20230214-git"; + version = "20260101-git"; asds = [ "yacc" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/cl-yacc/2023-02-14/cl-yacc-20230214-git.tgz"; - sha256 = "1f974ysi7mlrksnqg63iwwxgbypkng4n240q29imkrz6m5pwdig7"; + url = "https://beta.quicklisp.org/archive/cl-yacc/2026-01-01/cl-yacc-20260101-git.tgz"; + sha256 = "1l5nmgdmb7w0pabqc6dk09saj85a4x9ijfhhc2fjxl0gln7rncjz"; system = "yacc"; asd = "yacc"; } @@ -107400,12 +106870,12 @@ lib.makeScope pkgs.newScope (self: { yadd = ( build-asdf-system { pname = "yadd"; - version = "master-5a621564-git"; + version = "master-bfa9fc5c-git"; asds = [ "yadd" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz"; - sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8"; + url = "https://beta.quicklisp.org/archive/gendl/2026-01-01/gendl-master-bfa9fc5c-git.tgz"; + sha256 = "1hbbflaiplf4qxqlc5bqi28xh419lijrz4rvz18maqiavg059bfk"; system = "yadd"; asd = "yadd"; } @@ -107423,12 +106893,12 @@ lib.makeScope pkgs.newScope (self: { yah = ( build-asdf-system { pname = "yah"; - version = "20231021-git"; + version = "20260101-git"; asds = [ "yah" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/yah/2023-10-21/yah-20231021-git.tgz"; - sha256 = "1sklx9ak2rh9h19805i9wbym889pwd1qh3d4c4fsk9cbj2i9yxx5"; + url = "https://beta.quicklisp.org/archive/yah/2026-01-01/yah-20260101-git.tgz"; + sha256 = "1bfgy3cnzblr1j8vkvr17f8mxg45klik5i9j4asqdbyhlx4d2dnx"; system = "yah"; asd = "yah"; } @@ -107831,12 +107301,12 @@ lib.makeScope pkgs.newScope (self: { zippy = ( build-asdf-system { pname = "zippy"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "zippy" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/zippy/2025-06-22/zippy-20250622-git.tgz"; - sha256 = "12bkds03cx7wj91qs9dhg80zchm8vli73rkgwj6dy0fjrwczdws8"; + url = "https://beta.quicklisp.org/archive/zippy/2026-01-01/zippy-20260101-git.tgz"; + sha256 = "0fwfjap9xkrqqf7lvav3qwbz64sl1ypds4frgfjy40yjxy6rfgjy"; system = "zippy"; asd = "zippy"; } @@ -107861,12 +107331,12 @@ lib.makeScope pkgs.newScope (self: { zippy-dwim = ( build-asdf-system { pname = "zippy-dwim"; - version = "20250622-git"; + version = "20260101-git"; asds = [ "zippy-dwim" ]; src = ( createAsd { - url = "https://beta.quicklisp.org/archive/zippy/2025-06-22/zippy-20250622-git.tgz"; - sha256 = "12bkds03cx7wj91qs9dhg80zchm8vli73rkgwj6dy0fjrwczdws8"; + url = "https://beta.quicklisp.org/archive/zippy/2026-01-01/zippy-20260101-git.tgz"; + sha256 = "0fwfjap9xkrqqf7lvav3qwbz64sl1ypds4frgfjy40yjxy6rfgjy"; system = "zippy-dwim"; asd = "zippy-dwim"; } diff --git a/pkgs/development/lisp-modules/patches/cl-ana-fix-type-error.patch b/pkgs/development/lisp-modules/patches/cl-ana-fix-type-error.patch deleted file mode 100644 index de31a1255931..000000000000 --- a/pkgs/development/lisp-modules/patches/cl-ana-fix-type-error.patch +++ /dev/null @@ -1,21 +0,0 @@ -Fix type error in fixed-mem-cache for SBCL 2.6.0 - -cache starts as nil and may be emptied by the loop, so (last cache) -can return nil. (setf (cdr nil) ...) is undefined behavior that -SBCL 2.6.0 now catches as a type conflict during compilation, -causing COMPILE-FILE-ERROR. - -Use nconc instead, which handles the nil case correctly. - -Upstream issue: https://github.com/ghollisjr/cl-ana/issues/48 - ---- a/makeres/makeres.lisp -+++ b/makeres/makeres.lisp -@@ -936,5 +936,5 @@ - do (unload-target (pop cache)))) - (load-target id) -- (setf (cdr (last cache)) -- (list id))))))))) -+ (setf cache -+ (nconc cache (list id)))))))))) - diff --git a/pkgs/development/lisp-modules/ql.nix b/pkgs/development/lisp-modules/ql.nix index 624c7a04cc34..68812dfa6429 100644 --- a/pkgs/development/lisp-modules/ql.nix +++ b/pkgs/development/lisp-modules/ql.nix @@ -12,15 +12,6 @@ let overrides = ( self: super: { - named-readtables = super.named-readtables.overrideLispAttrs (o: { - patches = (o.patches or [ ]) ++ [ - (pkgs.fetchpatch { - name = "named-readtables-sbcl-fix.patch"; - url = "https://github.com/melisgl/named-readtables/commit/6eea56674442b884a4fee6ede4c8aad63541aa5b.patch"; - hash = "sha256-ZkmBz50tkJutCNhrgVTHyE+sxRjmL8y7YC7yewrmves="; - }) - ]; - }); cl_plus_ssl = super.cl_plus_ssl.overrideLispAttrs (o: { nativeLibs = [ pkgs.openssl ]; }); @@ -191,9 +182,6 @@ let "iolib/pathnames" ]; }); - cl-ana_dot_makeres = super.cl-ana_dot_makeres.overrideLispAttrs (o: { - patches = (o.patches or [ ]) ++ [ ./patches/cl-ana-fix-type-error.patch ]; - }); cl-ana_dot_hdf-cffi = super.cl-ana_dot_hdf-cffi.overrideLispAttrs (o: { nativeBuildInputs = [ pkgs.hdf5 ]; nativeLibs = [ pkgs.hdf5 ]; diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 9efb99dd490d..dfcc51cb6e30 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2661,23 +2661,23 @@ final: prev: { }: buildLuarocksPackage { pname = "luafilesystem"; - version = "1.8.0-1"; + version = "1.9.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luafilesystem-1.8.0-1.rockspec"; - sha256 = "18nkaks0b75dmycljg5vljap5w8d0ysdkg96yl5szgzr7nzrymfa"; + url = "mirror://luarocks/luafilesystem-1.9.0-1.rockspec"; + sha256 = "1jg1w8c22hpv1jfcv6qyl3j354h1ar2qfarkiwx0c41sl90gpfrj"; }).outPath; src = fetchFromGitHub { - owner = "keplerproject"; + owner = "lunarmodules"; repo = "luafilesystem"; - tag = "v1_8_0"; - hash = "sha256-pEA+Z1pkykWLTT6NHQ5lo8roOh2P0fiHtnK+byTkF5o="; + tag = "v1_9_0"; + hash = "sha256-xoNJra/yqxRG11TePcUKrAUU6cwypGnXIoLKZXNaoW0="; }; disabled = luaOlder "5.1"; meta = { - homepage = "https://github.com/keplerproject/luafilesystem"; + homepage = "https://github.com/lunarmodules/luafilesystem"; description = "File System Library for the Lua Programming Language"; maintainers = with lib.maintainers; [ flosse ]; license.fullName = "MIT/X11"; diff --git a/pkgs/development/lua-modules/luv/default.nix b/pkgs/development/lua-modules/luv/default.nix index 85e027d40374..342ff447e922 100644 --- a/pkgs/development/lua-modules/luv/default.nix +++ b/pkgs/development/lua-modules/luv/default.nix @@ -13,7 +13,7 @@ buildLuarocksPackage rec { pname = "luv"; - version = "1.51.0-1"; + version = "1.51.0-2"; src = fetchFromGitHub { owner = "luvit"; @@ -21,7 +21,7 @@ buildLuarocksPackage rec { rev = version; # Need deps/lua-compat-5.3 only fetchSubmodules = true; - hash = "sha256-vQfr0TwhkvRDJwZnxDD/53yCzyDouzQimTnwj4drs/c="; + hash = "sha256-UJHNXftAvtDuporyKCuJ7+KbtG0lBZ+DtESixS8rabQ="; }; # to make sure we dont use bundled deps diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 92b12d039847..2214cef83526 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -74,14 +74,10 @@ in # keep-sorted start block=yes case=no newline_separated=yes argparse = prev.argparse.overrideAttrs { doCheck = true; - nativeCheckInputs = [ final.busted ]; + nativeCheckInputs = [ final.bustedCheckHook ]; - checkPhase = '' - runHook preCheck - export LUA_PATH="src/?.lua;$LUA_PATH" - busted spec/ - runHook postCheck - ''; + preCheck = ''LUA_PATH="src/?.lua;$LUA_PATH"''; + bustedFlags = [ "spec/" ]; }; busted = prev.busted.overrideAttrs (old: { @@ -194,12 +190,8 @@ in fzy = prev.fzy.overrideAttrs { doCheck = true; - nativeCheckInputs = [ final.busted ]; - # Until https://github.com/swarn/fzy-lua/pull/8 is merged, - # we have to invoke busted manually - checkPhase = '' - busted - ''; + nativeCheckInputs = [ final.bustedCheckHook ]; + # bustedFlags = [ "." ]; }; grug-far-nvim = prev.grug-far-nvim.overrideAttrs { @@ -240,14 +232,9 @@ in doCheck = lua.luaversion == "5.1"; nativeCheckInputs = [ final.nlua - final.busted + final.bustedCheckHook writableTmpDirAsHomeHook ]; - checkPhase = '' - runHook preCheck - busted --lua=nlua - runHook postCheck - ''; }; ldbus = prev.ldbus.overrideAttrs (old: { @@ -382,6 +369,7 @@ in }; lrexlib-gnu = prev.lrexlib-gnu.overrideAttrs (old: { + strictDeps = false; buildInputs = old.buildInputs ++ [ gnulib ]; @@ -413,6 +401,7 @@ in }); lua-cmsgpack = prev.lua-cmsgpack.overrideAttrs { + strictDeps = false; meta.broken = isLuaJIT; }; @@ -447,6 +436,7 @@ in }; lua-rtoml = prev.lua-rtoml.overrideAttrs (old: { + strictDeps = false; cargoDeps = rustPlatform.fetchCargoVendor { inherit (old) src; @@ -580,16 +570,19 @@ in lualine-nvim = prev.lualine-nvim.overrideAttrs (_: { doCheck = lua.luaversion == "5.1"; nativeCheckInputs = [ - final.nlua - final.busted final.nvim-web-devicons + final.bustedCheckHook + final.nlua gitMinimal writableTmpDirAsHomeHook ]; - checkPhase = '' - runHook preCheck - busted --lua=nlua --lpath='lua/?.lua' --lpath='lua/?/init.lua' tests/ - runHook postCheck + + bustedFlags = [ + "tests/" + ]; + + preCheck = '' + LUA_PATH="lua/?.lua;lua/?/init.lua;$LUA_PATH" ''; }); @@ -760,44 +753,27 @@ in doCheck = lua.luaversion == "5.1"; nativeCheckInputs = [ final.nlua - final.busted + final.bustedCheckHook writableTmpDirAsHomeHook ]; - checkPhase = '' - runHook preCheck - busted --lua=nlua - runHook postCheck - ''; }; lze = prev.lze.overrideAttrs { doCheck = lua.luaversion == "5.1"; nativeCheckInputs = [ final.nlua - final.busted + final.bustedCheckHook writableTmpDirAsHomeHook ]; - checkPhase = '' - runHook preCheck - busted --lua=nlua - runHook postCheck - ''; }; lzextras = prev.lzextras.overrideAttrs { doCheck = lua.luaversion == "5.1"; - checkInputs = [ - final.lze - ]; nativeCheckInputs = [ final.nlua - final.busted + lua.pkgs.bustedCheckHook + final.lze ]; - checkPhase = '' - runHook preCheck - busted --lua=nlua - runHook postCheck - ''; }; magick = prev.magick.overrideAttrs (old: { @@ -864,6 +840,10 @@ in ''; }); + nfd = prev.nfd.overrideAttrs { + strictDeps = false; + }; + nlua = prev.nlua.overrideAttrs { # patchShebang removes the nvim in nlua's shebang so we hardcode one @@ -877,19 +857,21 @@ in doCheck = lua.luaversion == "5.1"; nativeCheckInputs = [ final.nlua - final.busted + # upstream uses PlenaryBusted which is a pain, run busted directly instead + final.bustedCheckHook writableTmpDirAsHomeHook ]; - # upstream uses PlenaryBusted which is a pain to setup - checkPhase = '' - runHook preCheck - busted --lua=nlua --lpath='lua/?.lua' --lpath='lua/?/init.lua' tests/ - runHook postCheck + preCheck = '' + LUA_PATH="lua/?.lua;lua/?/init.lua;$LUA_PATH" ''; + bustedFlags = [ + "tests/" + ]; }; orgmode = prev.orgmode.overrideAttrs { + strictDeps = false; # Patch in tree-sitter-orgmode dependency postPatch = '' substituteInPlace lua/orgmode/config/init.lua \ @@ -944,6 +926,10 @@ in ''; }; + rest-nvim = prev.rest-nvim.overrideAttrs { + strictDeps = false; + }; + rocks-dev-nvim = prev.rocks-dev-nvim.overrideAttrs { # E5113: Error while calling lua chunk [...] pl.path requires LuaFileSystem @@ -951,13 +937,9 @@ in doCheck = luaOlder "5.2" && stdenv.hostPlatform.isLinux; nativeCheckInputs = [ final.nlua - final.busted + final.bustedCheckHook ]; - checkPhase = '' - runHook preCheck - busted spec - runHook postCheck - ''; + bustedFlags = [ "spec" ]; }; rocks-nvim = prev.rocks-nvim.overrideAttrs (oa: { @@ -975,39 +957,27 @@ in "bootstrap" # tries to install luarocks from network ]; - checkPhase = '' - runHook preCheck - busted --run=offline - runHook postCheck - ''; + bustedFlags = [ + "--run=offline" + ]; }); rtp-nvim = prev.rtp-nvim.overrideAttrs { doCheck = lua.luaversion == "5.1"; nativeCheckInputs = [ final.nlua - final.busted + final.bustedCheckHook writableTmpDirAsHomeHook ]; - checkPhase = '' - runHook preCheck - busted --lua=nlua - runHook postCheck - ''; }; rustaceanvim = prev.rustaceanvim.overrideAttrs { doCheck = lua.luaversion == "5.1"; nativeCheckInputs = [ final.nlua - final.busted + final.bustedCheckHook writableTmpDirAsHomeHook ]; - checkPhase = '' - runHook preCheck - busted --lua=nlua - runHook postCheck - ''; }; sofa = prev.sofa.overrideAttrs (old: { @@ -1097,6 +1067,7 @@ in }); tree-sitter-http = prev.tree-sitter-http.overrideAttrs (old: { + strictDeps = false; propagatedBuildInputs = let # HACK: luarocks-nix puts rockspec build dependencies in the nativeBuildInputs, @@ -1130,7 +1101,7 @@ in }); tree-sitter-orgmode = prev.tree-sitter-orgmode.overrideAttrs (old: { - strictDeps = true; # can be removed after february 2026 + strictDeps = false; propagatedBuildInputs = let # HACK: luarocks-nix puts rockspec build dependencies in the nativeBuildInputs, diff --git a/pkgs/development/ocaml-modules/b0/default.nix b/pkgs/development/ocaml-modules/b0/default.nix index 2f76da1dec9f..dccc2abde3ca 100644 --- a/pkgs/development/ocaml-modules/b0/default.nix +++ b/pkgs/development/ocaml-modules/b0/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "ocaml${ocaml.version}-b0"; - version = "0.0.5"; + version = "0.0.6"; src = fetchurl { url = "https://erratique.ch/software/b0/releases/b0-${finalAttrs.version}.tbz"; - sha256 = "sha256-ty04JQcP4RCme/VQw0ko2IBebWWX5cBU6nRTTeV1I/I="; + hash = "sha256-FscuTlKqZ7fGJk0+aln6lvNtF7Ghph64A4ZVqCUE9ZM="; }; strictDeps = true; @@ -54,6 +54,6 @@ stdenv.mkDerivation (finalAttrs: { inherit (ocaml.meta) platforms; license = lib.licenses.isc; maintainers = [ lib.maintainers.Julow ]; - broken = !(lib.versionAtLeast ocaml.version "4.08"); + broken = !lib.versionAtLeast ocaml.version "4.14"; }; }) diff --git a/pkgs/development/ocaml-modules/carton/default.nix b/pkgs/development/ocaml-modules/carton/default.nix index 1a14a9c37f4a..d55250dc81dd 100644 --- a/pkgs/development/ocaml-modules/carton/default.nix +++ b/pkgs/development/ocaml-modules/carton/default.nix @@ -34,8 +34,6 @@ buildDunePackage (finalAttrs: { pname = "carton"; version = "0.7.0"; - minimalOCamlVersion = "4.08"; - src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/carton-v${finalAttrs.version}/git-carton-v${finalAttrs.version}.tbz"; hash = "sha256-vWkBJdP4ZpRCEwzrFMzsdHay4VyiXix/+1qzk+7yDvk="; @@ -74,7 +72,8 @@ buildDunePackage (finalAttrs: { fmt ]; - doCheck = true; + # Alcotest depends on cmdliner ≥ 2.0 + doCheck = false; nativeBuildInputs = [ findlib ]; diff --git a/pkgs/development/ocaml-modules/cmdliner/1_0.nix b/pkgs/development/ocaml-modules/cmdliner/1_0.nix deleted file mode 100644 index 772e688a9981..000000000000 --- a/pkgs/development/ocaml-modules/cmdliner/1_0.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - ocaml, -}: - -stdenv.mkDerivation rec { - pname = "cmdliner"; - version = "1.0.4"; - - src = fetchurl { - url = "https://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz"; - sha256 = "1h04q0zkasd0mw64ggh4y58lgzkhg6yhzy60lab8k8zq9ba96ajw"; - }; - - nativeBuildInputs = [ ocaml ]; - - makeFlags = [ "PREFIX=$(out)" ]; - installTargets = "install install-doc"; - installFlags = [ - "LIBDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/${pname}" - "DOCDIR=$(out)/share/doc/${pname}" - ]; - postInstall = '' - mv $out/lib/ocaml/${ocaml.version}/site-lib/${pname}/{opam,${pname}.opam} - ''; - - meta = { - homepage = "https://erratique.ch/software/cmdliner"; - description = "OCaml module for the declarative definition of command line interfaces"; - license = lib.licenses.isc; - inherit (ocaml.meta) platforms; - maintainers = [ lib.maintainers.vbgl ]; - broken = !(lib.versionAtLeast ocaml.version "4.03"); - }; -} diff --git a/pkgs/development/ocaml-modules/cmdliner/1_1.nix b/pkgs/development/ocaml-modules/cmdliner/1_1.nix deleted file mode 100644 index cf03c32d7e8b..000000000000 --- a/pkgs/development/ocaml-modules/cmdliner/1_1.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - ocaml, -}: - -stdenv.mkDerivation rec { - pname = "cmdliner"; - version = "1.3.0"; - - src = fetchurl { - url = "https://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz"; - sha256 = "sha256-joGA9XO0QPanqMII2rLK5KgjhP7HMtInhNG7bmQWjLs="; - }; - - nativeBuildInputs = [ ocaml ]; - - makeFlags = [ "PREFIX=$(out)" ]; - installTargets = "install install-doc"; - installFlags = [ - "LIBDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/${pname}" - "DOCDIR=$(out)/share/doc/${pname}" - ]; - postInstall = '' - mv $out/lib/ocaml/${ocaml.version}/site-lib/${pname}/{opam,${pname}.opam} - ''; - - meta = { - homepage = "https://erratique.ch/software/cmdliner"; - description = "OCaml module for the declarative definition of command line interfaces"; - license = lib.licenses.isc; - inherit (ocaml.meta) platforms; - maintainers = [ lib.maintainers.vbgl ]; - broken = !(lib.versionAtLeast ocaml.version "4.08"); - }; -} diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix new file mode 100644 index 000000000000..100175d5e508 --- /dev/null +++ b/pkgs/development/ocaml-modules/cmdliner/default.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenv, + fetchurl, + ocaml, + version ? "2.1.0", +}: + +stdenv.mkDerivation { + pname = "cmdliner"; + inherit version; + + src = fetchurl { + url = "https://erratique.ch/software/cmdliner/releases/cmdliner-${version}.tbz"; + hash = + { + "1.0.4" = "sha256-XCqT1Er4o4mWosD4D715cP5HUfEEvkcMr6BpNT/ABMA="; + "1.3.0" = "sha256-joGA9XO0QPanqMII2rLK5KgjhP7HMtInhNG7bmQWjLs="; + "2.1.0" = "sha256-iBTGFM1D1S/R68ivWjHZElwhTEmPpgVmDk7Rlf+ENOk="; + } + ."${version}"; + }; + + nativeBuildInputs = [ ocaml ]; + + makeFlags = [ "PREFIX=$(out)" ]; + installTargets = "install install-doc"; + installFlags = [ + "LIBDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/cmdliner" + "DOCDIR=$(out)/share/doc/cmdliner" + ]; + postInstall = '' + mv $out/lib/ocaml/${ocaml.version}/site-lib/cmdliner/{opam,cmdliner.opam} + ''; + + meta = { + homepage = "https://erratique.ch/software/cmdliner"; + description = "OCaml module for the declarative definition of command line interfaces"; + license = lib.licenses.isc; + inherit (ocaml.meta) platforms; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/get-activity/default.nix b/pkgs/development/ocaml-modules/get-activity/default.nix index 3976c9c24af9..5157b640aa09 100644 --- a/pkgs/development/ocaml-modules/get-activity/default.nix +++ b/pkgs/development/ocaml-modules/get-activity/default.nix @@ -1,6 +1,7 @@ { lib, buildDunePackage, + fetchpatch, get-activity-lib, ppx_expect, cmdliner, @@ -14,7 +15,13 @@ buildDunePackage rec { pname = "get-activity"; inherit (get-activity-lib) version src; - minimalOCamlVersion = "4.08"; + patches = [ + # Compatibility with cmdliner ≥ 2.0 + (fetchpatch { + url = "https://github.com/tarides/get-activity/commit/3f1ccbbcf7fc65c69c7752726f6886fc92b986fa.patch"; + hash = "sha256-6uvkBEI/ZCPrJ3Aus0/L86zUIa+kOBD0k8ADMEi+pkI="; + }) + ]; buildInputs = [ get-activity-lib diff --git a/pkgs/development/ocaml-modules/index/default.nix b/pkgs/development/ocaml-modules/index/default.nix index 415e02777a33..6fcf7bcf639f 100644 --- a/pkgs/development/ocaml-modules/index/default.nix +++ b/pkgs/development/ocaml-modules/index/default.nix @@ -1,6 +1,7 @@ { lib, fetchurl, + fetchpatch, buildDunePackage, repr, ppx_repr, @@ -27,6 +28,15 @@ buildDunePackage rec { hash = "sha256-k4iDUJik7UTuztBw7YaFXASd8SqYMR1JgLm3JOyriGA="; }; + patches = [ + # Compatibility with cmdliner 2.0 + (fetchpatch { + url = "https://github.com/mirage/index/commit/aa7aa4734213f74a246f66719a1085b522f431d4.patch"; + hash = "sha256-Vc4r/I3TeIy/D4FcYzj4vRrH87vI2JRagqAXhD9BUxc="; + includes = [ "*.ml" ]; + }) + ]; + # Compatibility with logs 0.8.0 postPatch = '' substituteInPlace test/unix/dune --replace-warn logs.fmt 'logs.fmt logs.threaded' diff --git a/pkgs/development/ocaml-modules/mirage/runtime.nix b/pkgs/development/ocaml-modules/mirage/runtime.nix index fca7f4c0da9f..002ab19e65b8 100644 --- a/pkgs/development/ocaml-modules/mirage/runtime.nix +++ b/pkgs/development/ocaml-modules/mirage/runtime.nix @@ -11,10 +11,10 @@ buildDunePackage (finalAttrs: { pname = "mirage-runtime"; - version = "4.10.1"; + version = "4.10.2"; src = fetchurl { url = "https://github.com/mirage/mirage/releases/download/v${finalAttrs.version}/mirage-${finalAttrs.version}.tbz"; - hash = "sha256:1155b5e9a585d3b44dfdd72777d94a7222b0f88a1737593bfb1f09954b6fb914"; + hash = "sha256:4184cbc7e51b0dcdcf4345c98818c34129ff42879ef091e54849faa57b29d397"; }; minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix index 6b42d1ca8cd5..7900a7261c08 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix @@ -20,6 +20,7 @@ result, pp, cmdliner, + cmdliner_1, ordering, ocamlformat-rpc-lib, ocaml, @@ -59,7 +60,7 @@ buildDunePackage { ''; buildInputs = - if lib.versionAtLeast version "1.12.0" then + if lib.versionAtLeast version "1.17.0" then [ pp re @@ -73,6 +74,20 @@ buildDunePackage { stdune chrome-trace ] + else if lib.versionAtLeast version "1.12.0" then + [ + pp + re + octavius + dune-build-info + dune-rpc + omd + cmdliner_1 + ocamlformat-rpc-lib + dyn + stdune + chrome-trace + ] else if lib.versionAtLeast version "1.10.0" then [ pp @@ -81,7 +96,7 @@ buildDunePackage { dune-build-info dune-rpc omd - cmdliner + cmdliner_1 ocamlformat-rpc-lib dyn stdune @@ -92,7 +107,7 @@ buildDunePackage { octavius dune-build-info omd - cmdliner + cmdliner_1 ocamlformat-rpc-lib ] else @@ -102,7 +117,7 @@ buildDunePackage { octavius dune-build-info omd - cmdliner + cmdliner_1 ]; nativeBuildInputs = lib.optional (lib.versionOlder version "1.7.0") cppo; diff --git a/pkgs/development/ocaml-modules/ocamlformat/generic.nix b/pkgs/development/ocaml-modules/ocamlformat/generic.nix index d4f2f3336fe8..9d77fbb8b126 100644 --- a/pkgs/development/ocaml-modules/ocamlformat/generic.nix +++ b/pkgs/development/ocaml-modules/ocamlformat/generic.nix @@ -6,7 +6,8 @@ base, camlp-streams, cmdliner_1_0, - cmdliner_1_1, + cmdliner_1, + cmdliner, csexp, dune-build-info, either, @@ -65,7 +66,13 @@ rec { "0.9.0"; }; - cmdliner_v = if lib.versionAtLeast version "0.21.0" then cmdliner_1_1 else cmdliner_1_0; + cmdliner_v = + if lib.versionAtLeast version "0.28.1" then + cmdliner + else if lib.versionAtLeast version "0.21.0" then + cmdliner_1 + else + cmdliner_1_0; library_deps = [ base diff --git a/pkgs/development/ocaml-modules/odig/default.nix b/pkgs/development/ocaml-modules/odig/default.nix index eee8e6f7f87b..5c5ca7a5ba3c 100644 --- a/pkgs/development/ocaml-modules/odig/default.nix +++ b/pkgs/development/ocaml-modules/odig/default.nix @@ -9,11 +9,11 @@ buildTopkgPackage rec { pname = "odig"; - version = "0.0.9"; + version = "0.1.0"; src = fetchurl { - url = "${meta.homepage}/releases/odig-${version}.tbz"; - sha256 = "sha256-sYKvGYkxeF5FmrNQdOyMAtlsJqhlmUESi9SkPn/cjM4="; + url = "https://erratique.ch/software/odig/releases/odig-${version}.tbz"; + hash = "sha256-uyiJXYKNGGb2FIRW0CDyB7QW9e4FI0+zVfkE7kNjtuE="; }; buildInputs = [ diff --git a/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix index ce489db2ff92..77b9cba4f679 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix @@ -42,7 +42,7 @@ buildDunePackage rec { doCheck = true; checkInputs = [ - alcotest + (alcotest.override { inherit cmdliner; }) ]; passthru.updateScript = gitUpdater { rev-prefix = "v"; }; diff --git a/pkgs/development/ocaml-modules/smtml/default.nix b/pkgs/development/ocaml-modules/smtml/default.nix index 72ea1a635acd..145b26cfab01 100644 --- a/pkgs/development/ocaml-modules/smtml/default.nix +++ b/pkgs/development/ocaml-modules/smtml/default.nix @@ -73,7 +73,9 @@ buildDunePackage (finalAttrs: { ]; doCheck = - !( + # Checks fail with cmdliner ≥ 2.0 + false + && !( lib.versions.majorMinor ocaml.version == "5.0" || lib.versions.majorMinor ocaml.version == "5.4" || stdenv.hostPlatform.isDarwin diff --git a/pkgs/development/ocaml-modules/synchronizer/default.nix b/pkgs/development/ocaml-modules/synchronizer/default.nix index 46a59432947b..b3d813b2ebe3 100644 --- a/pkgs/development/ocaml-modules/synchronizer/default.nix +++ b/pkgs/development/ocaml-modules/synchronizer/default.nix @@ -10,7 +10,7 @@ buildDunePackage (finalAttrs: { pname = "synchronizer"; version = "0.3"; - minimalOCamlVersion = "5.1"; + minimalOCamlVersion = "5.2"; src = fetchFromGitHub { owner = "OCamlPro"; diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix index 8e65dd942c4c..66e1a3fc5726 100644 --- a/pkgs/development/ocaml-modules/uucp/default.nix +++ b/pkgs/development/ocaml-modules/uucp/default.nix @@ -12,65 +12,54 @@ uucd, }: -let +stdenv.mkDerivation (finalAttrs: { + name = "ocaml${ocaml.version}-${finalAttrs.pname}-${finalAttrs.version}"; pname = "uucp"; version = "17.0.0"; - webpage = "https://erratique.ch/software/${pname}"; - minimalOCamlVersion = "4.03"; + + src = fetchurl { + url = "https://erratique.ch/software/uucp/releases/uucp-${finalAttrs.version}.tbz"; + hash = "sha256-mSQtTn4DYa15pYWFt0J+/BEpJRaa+6uIKnifMV4Euhs="; + }; + + nativeBuildInputs = [ + ocaml + findlib + ocamlbuild + topkg + ]; + buildInputs = [ + topkg + uutf + uunf + uucd + ]; + + propagatedBuildInputs = [ uchar ]; + + strictDeps = true; + + buildPhase = '' + runHook preBuild + ${topkg.buildPhase} --with-cmdliner false --tests ${lib.boolToString finalAttrs.doCheck} + runHook postBuild + ''; + + inherit (topkg) installPhase; + doCheck = true; -in + checkPhase = '' + runHook preCheck + ${topkg.run} test + runHook postCheck + ''; + checkInputs = [ uucd ]; -if lib.versionOlder ocaml.version minimalOCamlVersion then - throw "${pname} needs at least OCaml ${minimalOCamlVersion}" -else - - stdenv.mkDerivation { - - name = "ocaml${ocaml.version}-${pname}-${version}"; - - src = fetchurl { - url = "${webpage}/releases/${pname}-${version}.tbz"; - hash = "sha256-mSQtTn4DYa15pYWFt0J+/BEpJRaa+6uIKnifMV4Euhs="; - }; - - nativeBuildInputs = [ - ocaml - findlib - ocamlbuild - topkg - ]; - buildInputs = [ - topkg - uutf - uunf - uucd - ]; - - propagatedBuildInputs = [ uchar ]; - - strictDeps = true; - - buildPhase = '' - runHook preBuild - ${topkg.buildPhase} --with-cmdliner false --tests ${lib.boolToString doCheck} - runHook postBuild - ''; - - inherit (topkg) installPhase; - - inherit doCheck; - checkPhase = '' - runHook preCheck - ${topkg.run} test - runHook postCheck - ''; - checkInputs = [ uucd ]; - - meta = { - description = "OCaml library providing efficient access to a selection of character properties of the Unicode character database"; - homepage = webpage; - inherit (ocaml.meta) platforms; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.vbgl ]; - }; - } + meta = { + description = "OCaml library providing efficient access to a selection of character properties of the Unicode character database"; + homepage = "https://erratique.ch/software/uucp"; + inherit (ocaml.meta) platforms; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.vbgl ]; + }; +}) diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix index e0b3da947b52..4d68d8cfd375 100644 --- a/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/pkgs/development/ocaml-modules/uuidm/default.nix @@ -7,6 +7,7 @@ ocamlbuild, topkg, cmdliner, + cmdliner_1, version ? if lib.versionAtLeast ocaml.version "4.14" then "0.9.10" else "0.9.8", }: @@ -34,7 +35,7 @@ stdenv.mkDerivation { configurePlatforms = [ ]; buildInputs = [ topkg - cmdliner + (if lib.versionAtLeast version "0.9.10" then cmdliner else cmdliner_1) ]; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix index c0d1f67b1a22..7f75af89502b 100644 --- a/pkgs/development/ocaml-modules/uunf/default.nix +++ b/pkgs/development/ocaml-modules/uunf/default.nix @@ -22,9 +22,9 @@ let } ."${version}"; in -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-${pname}-${version}"; - inherit version; +stdenv.mkDerivation (finallAttrs: { + name = "ocaml${ocaml.version}-${finallAttrs.pname}-${finallAttrs.version}"; + inherit version pname; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; @@ -66,4 +66,4 @@ stdenv.mkDerivation { inherit (ocaml.meta) platforms; broken = lib.versionOlder ocaml.version "4.03"; }; -} +}) diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix index 86ce05644618..8c3c333c96a6 100644 --- a/pkgs/development/ocaml-modules/uutf/default.nix +++ b/pkgs/development/ocaml-modules/uutf/default.nix @@ -17,8 +17,9 @@ throw "uutf is not available with OCaml ${ocaml.version}", }: -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-uutf-${version}"; +stdenv.mkDerivation (finalAttrs: { + name = "ocaml${ocaml.version}-${finalAttrs.pname}-${finalAttrs.version}"; + pname = "uutf"; inherit version; src = fetchurl { @@ -56,4 +57,4 @@ stdenv.mkDerivation { mainProgram = "utftrip"; inherit (ocaml.meta) platforms; }; -} +}) diff --git a/pkgs/development/ocaml-modules/xmlm/default.nix b/pkgs/development/ocaml-modules/xmlm/default.nix index 17f3a2a59567..ed8634e7ff58 100644 --- a/pkgs/development/ocaml-modules/xmlm/default.nix +++ b/pkgs/development/ocaml-modules/xmlm/default.nix @@ -7,16 +7,13 @@ ocamlbuild, topkg, }: -let +stdenv.mkDerivation (finalAttrs: { + name = "ocaml${ocaml.version}-${finalAttrs.pname}-${finalAttrs.version}"; pname = "xmlm"; - webpage = "https://erratique.ch/software/${pname}"; -in -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-${pname}-${version}"; version = "1.4.0"; src = fetchurl { - url = "${webpage}/releases/${pname}-${version}.tbz"; + url = "https://erratique.ch/software/xmlm/releases/xmlm-${finalAttrs.version}.tbz"; sha256 = "sha256-CRJSJY490WMgw85N2yG81X79nIwuv7eZ7mpUPtSS2fo="; }; @@ -34,11 +31,10 @@ stdenv.mkDerivation rec { meta = { description = "OCaml streaming codec to decode and encode the XML data format"; - homepage = webpage; + homepage = "https://erratique.ch/software/xmlm"; license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; mainProgram = "xmltrip"; inherit (ocaml.meta) platforms; - broken = lib.versionOlder ocaml.version "4.05"; }; -} +}) diff --git a/pkgs/development/php-packages/imagick/default.nix b/pkgs/development/php-packages/imagick/default.nix index bea439c59417..8b1e40cc033c 100644 --- a/pkgs/development/php-packages/imagick/default.nix +++ b/pkgs/development/php-packages/imagick/default.nix @@ -1,21 +1,23 @@ { buildPecl, - fetchpatch, lib, imagemagick, pkg-config, pcre2, - php, }: buildPecl { pname = "imagick"; version = "3.8.1"; - sha256 = "sha256-OjWHwKUkwX0NrZZzoWC5DNd26DaDhHThc7VJ7YZDUu4="; + hash = "sha256-OjWHwKUkwX0NrZZzoWC5DNd26DaDhHThc7VJ7YZDUu4="; configureFlags = [ "--with-imagick=${imagemagick.dev}" ]; + + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ pcre2 ]; meta = { diff --git a/pkgs/development/python-modules/abjad/default.nix b/pkgs/development/python-modules/abjad/default.nix index 495db053a0d8..2a1d784020b5 100644 --- a/pkgs/development/python-modules/abjad/default.nix +++ b/pkgs/development/python-modules/abjad/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "abjad"; - version = "3.28"; + version = "3.31"; format = "setuptools"; # see issue upstream indicating Python 3.12 support will come @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-J4LPOSz34GvDRwpCG8yt4LAqt+dhDrfG/W451bZRpgk="; + hash = "sha256-JdbQL30q/EVLEgES0JDn09f+7aWxPZi4vDX1N50mmsg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/adb-enhanced/default.nix b/pkgs/development/python-modules/adb-enhanced/default.nix index cf03c7aa9a9a..7f4e3da88593 100644 --- a/pkgs/development/python-modules/adb-enhanced/default.nix +++ b/pkgs/development/python-modules/adb-enhanced/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "adb-enhanced"; - version = "2.5.24"; + version = "2.8.0"; pyproject = true; src = fetchFromGitHub { owner = "ashishb"; repo = "adb-enhanced"; tag = version; - hash = "sha256-0HxeL6VGM+HTiAxs3NFRcEFbmH9q+0/pJdGyF1hl4hU="; + hash = "sha256-YuQgz3WeN50hg/IgdoNV61St9gpu6lcgFfKCfI/ENl0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/affinegap/default.nix b/pkgs/development/python-modules/affinegap/default.nix index 6d315b347729..671e4c2073b8 100644 --- a/pkgs/development/python-modules/affinegap/default.nix +++ b/pkgs/development/python-modules/affinegap/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "affinegap"; - version = "1.12"; + version = "2"; pyproject = true; src = fetchFromGitHub { owner = "dedupeio"; repo = "affinegap"; - tag = "v${version}"; - hash = "sha256-9eX41eoME5Vdtq+c04eQbMYnViy6QKOhKkafrkeMylI="; + tag = "pypideploy${version}"; + hash = "sha256-TuydLF3YfeVIP2y2uDQH+oZ9Y2b325ZFEM0Fiu0Xhus="; }; build-system = [ diff --git a/pkgs/development/python-modules/agate-dbf/default.nix b/pkgs/development/python-modules/agate-dbf/default.nix index ba42cb30350a..b2b16b3bc523 100644 --- a/pkgs/development/python-modules/agate-dbf/default.nix +++ b/pkgs/development/python-modules/agate-dbf/default.nix @@ -1,32 +1,42 @@ { lib, - fetchPypi, + fetchFromGitHub, buildPythonPackage, + setuptools, agate, dbf, dbfread, + pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "agate-dbf"; - version = "0.2.3"; - format = "setuptools"; + version = "0.2.4"; + pyproject = true; - propagatedBuildInputs = [ + src = fetchFromGitHub { + owner = "wireservice"; + repo = "agate-dbf"; + tag = finalAttrs.version; + hash = "sha256-z68nYig+Z1/C+ys7HmjljdnHhUTqH58iBSbqnLnLFs4="; + }; + + build-system = [ setuptools ]; + + dependencies = [ agate - dbf dbfread ]; - src = fetchPypi { - inherit pname version; - hash = "sha256-mKK1N1cTbMdNwpflniEB009tSPQfdBVrtsDeJruiqj8="; - }; + nativeCheckInputs = [ + pytestCheckHook + ]; meta = { + changelog = "https://github.com/wireservice/agate-dbf/blob/${finalAttrs.src.tag}/CHANGELOG.rst"; description = "Adds read support for dbf files to agate"; homepage = "https://github.com/wireservice/agate-dbf"; license = with lib.licenses; [ mit ]; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/agate-excel/default.nix b/pkgs/development/python-modules/agate-excel/default.nix index a017f71834bd..5367dab12476 100644 --- a/pkgs/development/python-modules/agate-excel/default.nix +++ b/pkgs/development/python-modules/agate-excel/default.nix @@ -1,7 +1,8 @@ { lib, - fetchPypi, + fetchFromGitHub, buildPythonPackage, + setuptools, agate, openpyxl, xlrd, @@ -9,17 +10,21 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "agate-excel"; - version = "0.4.1"; - format = "setuptools"; + version = "0.4.2"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-KEJmGMkHRxEebVZumD2Djx4vrmQeppcNessOnUs4QJE="; + src = fetchFromGitHub { + owner = "wireservice"; + repo = "agate-excel"; + tag = finalAttrs.version; + hash = "sha256-sKy7NaRhJ4KYOOUKuNs0SGutUn8XEmSeQFQ/57gTGCg="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ agate openpyxl xlrd @@ -33,8 +38,8 @@ buildPythonPackage rec { meta = { description = "Adds read support for excel files to agate"; homepage = "https://github.com/wireservice/agate-excel"; - changelog = "https://github.com/wireservice/agate-excel/blob/${version}/CHANGELOG.rst"; + changelog = "https://github.com/wireservice/agate-excel/blob/${finalAttrs.src.tag}/CHANGELOG.rst"; license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix index fe82ffcce28d..83eccddb2c13 100644 --- a/pkgs/development/python-modules/agate-sql/default.nix +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -1,28 +1,29 @@ { lib, buildPythonPackage, - isPy27, - fetchPypi, + fetchFromGitHub, agate, + setuptools, sqlalchemy, - crate, pytestCheckHook, geojson, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "agate-sql"; - version = "0.7.2"; - format = "setuptools"; + version = "0.7.3"; + pyproject = true; - disabled = isPy27; - - src = fetchPypi { - inherit pname version; - hash = "sha256-mxswKEpXP9QWdZQ3Jz3MXIECK98vrLJLSqAppir9U7A="; + src = fetchFromGitHub { + owner = "wireservice"; + repo = "agate-sql"; + tag = finalAttrs.version; + hash = "sha256-YPpvLMidW0RnNz1x6FK1QwhOIc9AhwnSm6vxUzbLLBM="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ agate sqlalchemy ]; @@ -45,4 +46,4 @@ buildPythonPackage rec { license = with lib.licenses; [ mit ]; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 43d9ff3f99e7..1163d72f6f5e 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.154"; + version = "9.2.158"; pyproject = true; src = fetchFromGitHub { owner = "angr"; repo = "ailment"; tag = "v${version}"; - hash = "sha256-JjS+jYWrbErkb6uM0DtB5h2ht6ZMmiYOQL/Emm6wC5U="; + hash = "sha256-WnDtJaEpka6IhYOfOb2DZY0Hd8ghIn8mY5AuF/JktLg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aioasuswrt/default.nix b/pkgs/development/python-modules/aioasuswrt/default.nix index c34905445ac0..5abdb5cff282 100644 --- a/pkgs/development/python-modules/aioasuswrt/default.nix +++ b/pkgs/development/python-modules/aioasuswrt/default.nix @@ -1,6 +1,7 @@ { lib, asyncssh, + bcrypt, buildPythonPackage, fetchFromGitHub, pytest-cov-stub, @@ -12,19 +13,22 @@ buildPythonPackage rec { pname = "aioasuswrt"; - version = "1.5.4"; + version = "2.0.8"; pyproject = true; src = fetchFromGitHub { owner = "kennedyshead"; repo = "aioasuswrt"; tag = "V${version}"; - hash = "sha256-tsvtOe3EX/Z7g6Z0MM2npYOTEJoKV9wUbhkhcROILxE="; + hash = "sha256-ax2XvZjZ1P8p80JW2WZAy2pdBKgwxuEaf6Erdna8E1s="; }; build-system = [ setuptools ]; - dependencies = [ asyncssh ]; + dependencies = [ + asyncssh + bcrypt + ]; nativeCheckInputs = [ pytest-asyncio diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index 9be2133c4040..dc1d07992c2e 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -10,9 +10,9 @@ multidict, urllib3, wrapt, + anyio, dill, moto, - pytest-asyncio, time-machine, werkzeug, awscli, @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "2.24.2"; + version = "3.1.1"; pyproject = true; src = fetchFromGitHub { owner = "aio-libs"; repo = "aiobotocore"; tag = version; - hash = "sha256-Kt/+LboMMurZ00gVYSDCPLJXKPtuyXOTtOgSCUIR9Ho="; + hash = "sha256-/Yf2rt/5FH1WiD2VV2hEksM1XleEl4YRBqGQI4GVa8Q="; }; # Relax version constraints: aiobotocore works with newer botocore versions @@ -60,9 +60,9 @@ buildPythonPackage rec { }; nativeCheckInputs = [ + anyio dill moto - pytest-asyncio time-machine werkzeug pytestCheckHook diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix index 0c711ee81f50..e8cf0459bc65 100644 --- a/pkgs/development/python-modules/aiodns/default.nix +++ b/pkgs/development/python-modules/aiodns/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiodns"; - version = "3.6.1"; + version = "4.0.0"; pyproject = true; src = fetchFromGitHub { owner = "saghul"; repo = "aiodns"; tag = "v${version}"; - hash = "sha256-dRniMwmDAj8KtM/qMEJieUFq5h0e+PJydXpOT6xZA34="; + hash = "sha256-/iYkhzN01+NaUfMXaM39IvlEKfoKc29+f0S4y0y3GG8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiodukeenergy/default.nix b/pkgs/development/python-modules/aiodukeenergy/default.nix index 52dbd8296db7..54878fc31c9f 100644 --- a/pkgs/development/python-modules/aiodukeenergy/default.nix +++ b/pkgs/development/python-modules/aiodukeenergy/default.nix @@ -5,6 +5,7 @@ fetchFromGitHub, lib, poetry-core, + pyjwt, pytest-asyncio, pytest-cov-stub, pytestCheckHook, @@ -13,20 +14,21 @@ buildPythonPackage rec { pname = "aiodukeenergy"; - version = "0.3.0"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "hunterjm"; repo = "aiodukeenergy"; tag = "v${version}"; - hash = "sha256-BYDC2j2s6gg8/owTDdijqmReUSqDYWqHXf8BUzYn+sI="; + hash = "sha256-tHtuQFOw9CPqWJ6QzdqcN3W8uzjgZFh5z8DqAc+5jLo="; }; build-system = [ poetry-core ]; dependencies = [ aiohttp + pyjwt yarl ]; diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/pkgs/development/python-modules/aiofiles/default.nix index 5caa43377a0c..1b952e1bbad0 100644 --- a/pkgs/development/python-modules/aiofiles/default.nix +++ b/pkgs/development/python-modules/aiofiles/default.nix @@ -4,23 +4,27 @@ buildPythonPackage, fetchFromGitHub, hatchling, + hatch-vcs, pytest-asyncio, pytestCheckHook, }: buildPythonPackage rec { pname = "aiofiles"; - version = "24.1.0"; + version = "25.1.0"; pyproject = true; src = fetchFromGitHub { owner = "Tinche"; repo = "aiofiles"; tag = "v${version}"; - hash = "sha256-uDKDMSNbMIlAaifpEBh1+q2bdZNUia8pPb30IOIgOAE="; + hash = "sha256-NBmzoUb2una3+eWqR1HraVPibaRb9I51aYwskrjxskQ="; }; - build-system = [ hatchling ]; + build-system = [ + hatchling + hatch-vcs + ]; nativeCheckInputs = [ pytest-asyncio @@ -42,7 +46,7 @@ buildPythonPackage rec { meta = { description = "File support for asyncio"; homepage = "https://github.com/Tinche/aiofiles"; - changelog = "https://github.com/Tinche/aiofiles/releases/tag/v${version}"; + changelog = "https://github.com/Tinche/aiofiles/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/aiohttp-client-cache/default.nix b/pkgs/development/python-modules/aiohttp-client-cache/default.nix index bacd4f96abe5..2d92b4e7cc5c 100644 --- a/pkgs/development/python-modules/aiohttp-client-cache/default.nix +++ b/pkgs/development/python-modules/aiohttp-client-cache/default.nix @@ -11,7 +11,7 @@ fetchPypi, itsdangerous, motor, - poetry-core, + hatchling, pytest-asyncio, pytest-aiohttp, pytestCheckHook, @@ -21,16 +21,16 @@ buildPythonPackage rec { pname = "aiohttp-client-cache"; - version = "0.14.1"; + version = "0.14.3"; pyproject = true; src = fetchPypi { pname = "aiohttp_client_cache"; inherit version; - hash = "sha256-r1VW9xmBSsoC22OEJxBpzsame+Maa32UN+CmqZgKSU8="; + hash = "sha256-Mp9AOMao7QtBACOYC20aLEhK8z5meonOJFyJnWLB+6E="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ aiohttp diff --git a/pkgs/development/python-modules/aioitertools/default.nix b/pkgs/development/python-modules/aioitertools/default.nix index df08341f81bf..5d0da62eb151 100644 --- a/pkgs/development/python-modules/aioitertools/default.nix +++ b/pkgs/development/python-modules/aioitertools/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "aioitertools"; - version = "0.12.0"; + version = "0.13.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-wqkFW0+7dwX1YbnYYFPor10QzIRdIsMgCMQ0kLLY3Ws="; + hash = "sha256-YgvSQazAu7nsgZ8ashWGaHG0u9H3ODalX3mSAO6GlQw="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/aiokafka/default.nix b/pkgs/development/python-modules/aiokafka/default.nix index e8b7916c4020..7cf0929bc50d 100644 --- a/pkgs/development/python-modules/aiokafka/default.nix +++ b/pkgs/development/python-modules/aiokafka/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "aiokafka"; - version = "0.12.0"; + version = "0.13.0"; pyproject = true; src = fetchFromGitHub { owner = "aio-libs"; repo = "aiokafka"; tag = "v${version}"; - hash = "sha256-OU/Kept3TvMfGvVCjSthfZnfTX6/T0Fy3PS/ynrV3Cg="; + hash = "sha256-xmrNhtyFY+3CJhECIVZRMVx0sZbZ00RLiyZzOdPNNIs="; }; build-system = [ @@ -56,7 +56,7 @@ buildPythonPackage rec { meta = { description = "Kafka integration with asyncio"; homepage = "https://aiokafka.readthedocs.org"; - changelog = "https://github.com/aio-libs/aiokafka/releases/tag/v${version}"; + changelog = "https://github.com/aio-libs/aiokafka/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/aioquic/default.nix b/pkgs/development/python-modules/aioquic/default.nix index 703cd81b3583..786f1a104e84 100644 --- a/pkgs/development/python-modules/aioquic/default.nix +++ b/pkgs/development/python-modules/aioquic/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "aioquic"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-+RJjuz9xlIxciRW01Q7jcABPIKQW9n+rPcyQVWx+cZk="; + hash = "sha256-KNBwshg+PnmvqdTnvVWJYNDVOuuYvAzwo1iyebp5fJI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiosendspin/default.nix b/pkgs/development/python-modules/aiosendspin/default.nix index aba70a364c09..2a07a632890f 100644 --- a/pkgs/development/python-modules/aiosendspin/default.nix +++ b/pkgs/development/python-modules/aiosendspin/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "aiosendspin"; - version = "2.1.0"; + version = "3.0.1"; pyproject = true; src = fetchFromGitHub { owner = "Sendspin"; repo = "aiosendspin"; tag = version; - hash = "sha256-9VhNtfXH2r/cGkscz51PIK2/66pPOGv0S0IpO0wFvO4="; + hash = "sha256-Z0hQyJayA/8OR6nkKxd1HfjskX+WBBkBl7l8rleV+fo="; }; # https://github.com/Sendspin/aiosendspin/blob/1.2.0/pyproject.toml#L7 diff --git a/pkgs/development/python-modules/aiosyncthing/default.nix b/pkgs/development/python-modules/aiosyncthing/default.nix index 801e8a05e27c..742a6ea1c8e1 100644 --- a/pkgs/development/python-modules/aiosyncthing/default.nix +++ b/pkgs/development/python-modules/aiosyncthing/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = { description = "Python client for the Syncthing REST API"; homepage = "https://github.com/zhulik/aiosyncthing"; - changelog = "https://github.com/zhulik/aiosyncthing/releases/tag/v${version}"; + changelog = "https://github.com/zhulik/aiosyncthing/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 35c72db050ed..90e386d206dd 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "alembic"; - version = "1.17.2"; + version = "1.18.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-u+l1FwXF4PFId/AtRsU9EIheN349kO2oEKAW+bqhno4="; + hash = "sha256-g6xrgTWVloFvs7iTCZhBoIYvIReyljJY6WXXDcYvuGY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/alive-progress/default.nix b/pkgs/development/python-modules/alive-progress/default.nix index 5138b45ac842..3bcada01cb1c 100644 --- a/pkgs/development/python-modules/alive-progress/default.nix +++ b/pkgs/development/python-modules/alive-progress/default.nix @@ -32,9 +32,9 @@ buildPythonPackage rec { mv $out/LICENSE $out/share/doc/python${python.pythonVersion}-$pname-$version/ ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ about-time graphemeu ]; @@ -54,7 +54,7 @@ buildPythonPackage rec { meta = { description = "New kind of Progress Bar, with real-time throughput, ETA, and very cool animations"; homepage = "https://github.com/rsalmei/alive-progress"; - changelog = "https://github.com/rsalmei/alive-progress/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/rsalmei/alive-progress/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ thiagokokada ]; }; diff --git a/pkgs/development/python-modules/allure-behave/default.nix b/pkgs/development/python-modules/allure-behave/default.nix index 984bbe4f882e..44c6ff9baae9 100644 --- a/pkgs/development/python-modules/allure-behave/default.nix +++ b/pkgs/development/python-modules/allure-behave/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "allure-behave"; - version = "2.15.0"; + version = "2.15.3"; pyproject = true; src = fetchFromGitHub { owner = "allure-framework"; repo = "allure-python"; tag = version; - hash = "sha256-I3Zh9frOplcPqLd8b4peNM9WtbNmQjHX6ocVJJwPzyc="; + hash = "sha256-06SKodvyoT0mYn4RmAIryZc+VyTI79KXFK+2/zuhzQ0="; }; sourceRoot = "${src.name}/allure-behave"; diff --git a/pkgs/development/python-modules/allure-pytest/default.nix b/pkgs/development/python-modules/allure-pytest/default.nix index c3b8ce653529..6d4a520164d2 100644 --- a/pkgs/development/python-modules/allure-pytest/default.nix +++ b/pkgs/development/python-modules/allure-pytest/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "allure-pytest"; - version = "2.15.0"; + version = "2.15.3"; pyproject = true; src = fetchFromGitHub { owner = "allure-framework"; repo = "allure-python"; tag = version; - hash = "sha256-I3Zh9frOplcPqLd8b4peNM9WtbNmQjHX6ocVJJwPzyc="; + hash = "sha256-06SKodvyoT0mYn4RmAIryZc+VyTI79KXFK+2/zuhzQ0="; }; sourceRoot = "${src.name}/allure-pytest"; diff --git a/pkgs/development/python-modules/allure-python-commons/default.nix b/pkgs/development/python-modules/allure-python-commons/default.nix index c1a123d561fa..4c842c893d4b 100644 --- a/pkgs/development/python-modules/allure-python-commons/default.nix +++ b/pkgs/development/python-modules/allure-python-commons/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "allure-python-commons"; - version = "2.15.0"; + version = "2.15.3"; pyproject = true; src = fetchPypi { pname = "allure_python_commons"; inherit version; - hash = "sha256-T2Oci7S3nfDZTxuqiHgsk5m+P0X9g5rlg6MUpdRRuXg="; + hash = "sha256-tCqW1gdvsyPJ5DZF37hMBXT2utCg4AXZJWQBXNFy1WQ="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/ament-package/default.nix b/pkgs/development/python-modules/ament-package/default.nix index 4cd2b540770b..9af03c49e56e 100644 --- a/pkgs/development/python-modules/ament-package/default.nix +++ b/pkgs/development/python-modules/ament-package/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "ament-package"; - version = "0.18.2"; + version = "8"; pyproject = true; src = fetchFromGitHub { owner = "ament"; repo = "ament_package"; - tag = version; - hash = "sha256-m0tDgbjytBKhdqZrSmhKHRm69BZK54NHWmo+O5J8m6Q="; + tag = "release-alpha${version}"; + hash = "sha256-KaP75+95mRmSO0bRDy0LVG+kx1Z4YDn5edsvKq+UXeE="; }; build-system = [ diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 775f71cd9ea4..97981c960938 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -37,14 +37,14 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.154"; + version = "9.2.193"; pyproject = true; src = fetchFromGitHub { owner = "angr"; repo = "angr"; tag = "v${version}"; - hash = "sha256-aOgZXHk6GTWZAEraZQahEXUYs8LWAWv1n9GfX+2XTPU="; + hash = "sha256-7wBfxHWD5FRin8pfKup4izJBQzFN5N5dQZqIto5y83k="; }; pythonRelaxDeps = [ "capstone" ]; diff --git a/pkgs/development/python-modules/anndata/default.nix b/pkgs/development/python-modules/anndata/default.nix index b46103d35455..3d909a6e51d2 100644 --- a/pkgs/development/python-modules/anndata/default.nix +++ b/pkgs/development/python-modules/anndata/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "anndata"; - version = "0.12.6"; + version = "0.12.7"; pyproject = true; src = fetchFromGitHub { owner = "scverse"; repo = "anndata"; tag = version; - hash = "sha256-VFZrPcb6uaBSOPxJKTJtcYewD8K2Qrsuk3/7+QW6F78="; + hash = "sha256-LVpkLWlt7GtsHoh5rcHPM0JWlTDQqTl/c/38Mz7oBJA="; }; build-system = [ @@ -135,7 +135,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "anndata" ]; meta = { - changelog = "https://github.com/scverse/anndata/blob/main/docs/release-notes/${version}.md"; + changelog = "https://github.com/scverse/anndata/blob/main/docs/release-notes/${src.tag}.md"; description = "Python package for handling annotated data matrices in memory and on disk"; homepage = "https://anndata.readthedocs.io/"; license = lib.licenses.bsd3; diff --git a/pkgs/development/python-modules/annotated-doc/default.nix b/pkgs/development/python-modules/annotated-doc/default.nix index d3e9777a97e1..9e728e18c077 100644 --- a/pkgs/development/python-modules/annotated-doc/default.nix +++ b/pkgs/development/python-modules/annotated-doc/default.nix @@ -2,25 +2,25 @@ lib, buildPythonPackage, fetchFromGitHub, - uv-build, + pdm-backend, pytestCheckHook, typing-extensions, }: buildPythonPackage rec { pname = "annotated-doc"; - version = "0.0.3"; + version = "0.0.4"; pyproject = true; src = fetchFromGitHub { owner = "fastapi"; repo = "annotated-doc"; tag = version; - hash = "sha256-PFB+GqFRe5vF8xoWJPsXligSpzkUIt8TOqsmrKlfwyc="; + hash = "sha256-O7kobzzFfHelYsxTflifEcoEWsUmPzlDz3siFTAq0I0="; }; build-system = [ - uv-build + pdm-backend ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index b1354fe1e497..84be3d90c8cd 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -11,14 +11,12 @@ # dependencies exceptiongroup, idna, - sniffio, typing-extensions, # optionals trio, # tests - blockbuster, hypothesis, psutil, pytest-mock, @@ -47,7 +45,6 @@ buildPythonPackage rec { dependencies = [ idna - sniffio ] ++ lib.optionals (pythonOlder "3.13") [ typing-extensions @@ -58,7 +55,6 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - blockbuster exceptiongroup hypothesis psutil @@ -95,10 +91,6 @@ buildPythonPackage rec { "test_keyboardinterrupt_during_test" # racy with high thread count, see https://github.com/NixOS/nixpkgs/issues/448125 "test_multiple_threads" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # PermissionError: [Errno 1] Operation not permitted: '/dev/console' - "test_is_block_device" # These tests become flaky under heavy load "test_asyncio_run_sync_called" @@ -106,6 +98,10 @@ buildPythonPackage rec { "test_run_in_custom_limiter" "test_cancel_from_shielded_scope" "test_start_task_soon_cancel_later" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # PermissionError: [Errno 1] Operation not permitted: '/dev/console' + "test_is_block_device" # AssertionError: assert 'wheel' == 'nixbld' "test_group" diff --git a/pkgs/development/python-modules/anywidget/default.nix b/pkgs/development/python-modules/anywidget/default.nix index 9f94e0787eec..82a38dcf961e 100644 --- a/pkgs/development/python-modules/anywidget/default.nix +++ b/pkgs/development/python-modules/anywidget/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "anywidget"; - version = "0.9.18"; + version = "0.9.21"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Jiz0WbUXp9BE1vvIS5U+nIPwJnkLLdPOkPIaf47e0A8="; + hash = "sha256-uNAXICmsQmVzBTxBbGpYeDhmFhIgi7OQ+gYHhi5ZSyc="; }; # We do not need the jupyterlab build dependency, because we do not need to diff --git a/pkgs/development/python-modules/aocd-example-parser/default.nix b/pkgs/development/python-modules/aocd-example-parser/default.nix index d071b2ad303a..95bcae4cace3 100644 --- a/pkgs/development/python-modules/aocd-example-parser/default.nix +++ b/pkgs/development/python-modules/aocd-example-parser/default.nix @@ -7,14 +7,14 @@ buildPythonPackage { pname = "aocd-example-parser"; - version = "2024.12.25"; + version = "2025.12.12"; pyproject = true; src = fetchFromGitHub { owner = "wimglenn"; repo = "aocd-example-parser"; - rev = "c86bfc714d2f413965a46a2caf3483e823ea9ade"; - hash = "sha256-1Le1jrLCFRJcUngoq5bt22gM1lpAMBNBRWjOl3yLlsw="; + rev = "6331ed538dcb25c6d9fd2ef679ccd361ea4ea0af"; + hash = "sha256-RgTs17TxLhmexkWjPTWMcERVrmPkhMZfVL195JVToU0="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/aocd/default.nix b/pkgs/development/python-modules/aocd/default.nix index a61ccda40e60..888742aafac2 100644 --- a/pkgs/development/python-modules/aocd/default.nix +++ b/pkgs/development/python-modules/aocd/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "aocd"; - version = "2.1.0"; + version = "2.2.0"; pyproject = true; src = fetchFromGitHub { owner = "wimglenn"; repo = "advent-of-code-data"; tag = "v${version}"; - hash = "sha256-xR9CfyOUsKSSA/1zYi6kCK3oAaX6Kd625mKMWI+ZFMA="; + hash = "sha256-Oe+9Ur5O2GSRY7qB8oja7quJqEX/0yXKh4R5+N4kv7Q="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index 4c5863a035ca..0185e06c1973 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -87,6 +87,7 @@ buildPythonPackage (finalAttrs: { pythonRelaxDeps = [ "envoy-data-plane" + "httplib2" "jsonpickle" "objsize" "pyarrow" diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index c2c5f8861436..2e3bb006071a 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "apispec"; - version = "6.8.4"; + version = "6.9.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-/Q7RSvcaKUnZrrlrcs4VF8tKSKXFVmfNBIO37TMVaio="; + hash = "sha256-ejjOfD7tx3cebjMpWv3YxLCs3ZhltIP4z2zDack+jR4="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/apscheduler/default.nix b/pkgs/development/python-modules/apscheduler/default.nix index 1576651e77ff..aaa64871ccb7 100644 --- a/pkgs/development/python-modules/apscheduler/default.nix +++ b/pkgs/development/python-modules/apscheduler/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "apscheduler"; - version = "3.11.1"; + version = "3.11.2"; pyproject = true; src = fetchFromGitHub { owner = "agronholm"; repo = "apscheduler"; tag = version; - hash = "sha256-3KSW1RdiUXlDTr30Wrc8fYb4rRnlOn6lVhBgz3r1D/4="; + hash = "sha256-AhVlACRg0Xwy9XmFRl29of5uM2aJa5Gv2SzFuJXVCpE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/apswutils/default.nix b/pkgs/development/python-modules/apswutils/default.nix new file mode 100644 index 000000000000..035a74132ab5 --- /dev/null +++ b/pkgs/development/python-modules/apswutils/default.nix @@ -0,0 +1,55 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + apsw, + fastcore, + + # tests + pytestCheckHook, + hypothesis, +}: + +buildPythonPackage (finalAttrs: { + pname = "apswutils"; + version = "0.1.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "AnswerDotAI"; + repo = "apswutils"; + tag = finalAttrs.version; + hash = "sha256-lqtgjQ4nhmcf52mFeXdFxvd8WNsDDR9PEeWAncBX46g="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + apsw + fastcore + ]; + + nativeCheckInputs = [ + pytestCheckHook + hypothesis + ]; + + pythonImportsCheck = [ + "apswutils" + ]; + + meta = { + description = "A fork of sqlite-minutils for apsw"; + homepage = "https://github.com/AnswerDotAI/apswutils"; + changelog = "https://github.com/AnswerDotAI/apswutils/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = [ ]; + }; +}) diff --git a/pkgs/development/python-modules/arch/default.nix b/pkgs/development/python-modules/arch/default.nix index d1554c0a58a3..4362bbaa62c7 100644 --- a/pkgs/development/python-modules/arch/default.nix +++ b/pkgs/development/python-modules/arch/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "arch"; - version = "7.2.0"; + version = "8.0.0"; pyproject = true; src = fetchFromGitHub { owner = "bashtage"; repo = "arch"; tag = "v${version}"; - hash = "sha256-3H/6mdPg8rg+N1wecqLDzc7Ot3SnUVpOagns4PsTD/Q="; + hash = "sha256-qw8sSgsMu6YTiQlzsrePnDKkFBtrxD9RK6ZZE5jFeX0="; }; postPatch = '' @@ -59,7 +59,7 @@ buildPythonPackage rec { meta = { description = "Autoregressive Conditional Heteroskedasticity (ARCH) and other tools for financial econometrics"; homepage = "https://github.com/bashtage/arch"; - changelog = "https://github.com/bashtage/arch/releases/tag/v${version}"; + changelog = "https://github.com/bashtage/arch/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ jherland ]; }; diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index 8234aee37ffd..a8a1afa8d5a1 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "argcomplete"; - version = "3.6.2"; + version = "3.6.3"; pyproject = true; src = fetchFromGitHub { owner = "kislyuk"; repo = "argcomplete"; tag = "v${version}"; - hash = "sha256-2o0gQtkQP9cax/8SUd9+65TwAIAjBYnI+ufuzZtrVyo="; + hash = "sha256-GK78gW54cFE0yXra56wG8LnBL9CLbf0TuIgxFwA9zZY="; }; build-system = [ diff --git a/pkgs/development/python-modules/array-api-strict/default.nix b/pkgs/development/python-modules/array-api-strict/default.nix index 0fabcf0d2367..f7fca26c3938 100644 --- a/pkgs/development/python-modules/array-api-strict/default.nix +++ b/pkgs/development/python-modules/array-api-strict/default.nix @@ -38,6 +38,11 @@ buildPythonPackage rec { hypothesis ]; + pytestFlags = [ + # NumPy warning suppression and assertion utilities are deprecated. + "-Wignore::DeprecationWarning" + ]; + pythonImportsCheck = [ "array_api_strict" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index 56dcf4e28452..f8238e5641ab 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -1,54 +1,56 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, flit-core, python-dateutil, types-python-dateutil, + tzdata, pytestCheckHook, + pytest-cov-stub, pytest-mock, pytz, simplejson, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "arrow"; - version = "1.3.0"; + version = "1.4.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-1FQGF2SMtfiVcw8a2MgqZfLa0BZvV7dfPKVHWcTWeoU="; + src = fetchFromGitHub { + owner = "crsmithdev"; + repo = "arrow"; + tag = finalAttrs.version; + hash = "sha256-nK78Lo+7eitB+RS7BZkM+BNudviirAowc4a1uQdLC0w="; }; - postPatch = '' - # no coverage reports - sed -i "/addopts/d" tox.ini - ''; + build-system = [ flit-core ]; - nativeBuildInputs = [ flit-core ]; - - propagatedBuildInputs = [ + dependencies = [ python-dateutil types-python-dateutil + tzdata ]; nativeCheckInputs = [ pytestCheckHook + pytest-cov-stub pytest-mock pytz simplejson ]; # ParserError: Could not parse timezone expression "America/Nuuk" - disabledTests = [ "test_parse_tz_name_zzz" ]; + #disabledTests = [ "test_parse_tz_name_zzz" ]; pythonImportsCheck = [ "arrow" ]; meta = { + changelog = "https://github.com/arrow-py/arrow/releases/tag/${finalAttrs.src.tag}"; description = "Python library for date manipulation"; homepage = "https://github.com/crsmithdev/arrow"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ thoughtpolice ]; }; -} +}) diff --git a/pkgs/development/python-modules/ascii-magic/default.nix b/pkgs/development/python-modules/ascii-magic/default.nix index 2e13114d3dd4..7975d183b84c 100644 --- a/pkgs/development/python-modules/ascii-magic/default.nix +++ b/pkgs/development/python-modules/ascii-magic/default.nix @@ -2,23 +2,27 @@ lib, buildPythonPackage, colorama, - fetchPypi, + fetchFromGitHub, pillow, pytestCheckHook, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ascii-magic"; - version = "2.3.0"; - format = "setuptools"; + version = "2.7.4"; + pyproject = true; - src = fetchPypi { - pname = "ascii_magic"; - inherit version; - hash = "sha256-PtQaHLFn3u1cz8YotmnzWjoD9nvdctzBi+X/2KJkPYU="; + src = fetchFromGitHub { + owner = "LeandroBarone"; + repo = "python-ascii_magic"; + tag = "v${finalAttrs.version}"; + hash = "sha256-werCg7LW7MKMoYp/QxZU74MSc6WmscwWfvGRG4Dn60c="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ colorama pillow ]; @@ -28,7 +32,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "ascii_magic" ]; preCheck = '' - cd tests + ln -s ascii_magic/tests/*.{jpg,png} ./ ''; disabledTests = [ @@ -47,4 +51,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/asdf-astropy/default.nix b/pkgs/development/python-modules/asdf-astropy/default.nix index 000efabe8625..9aa40fda4a98 100644 --- a/pkgs/development/python-modules/asdf-astropy/default.nix +++ b/pkgs/development/python-modules/asdf-astropy/default.nix @@ -30,6 +30,11 @@ buildPythonPackage rec { hash = "sha256-8atPmtVWb+4Dj1Lf0UIusBtAIW7lF5D+1ay7G7Ay3PA="; }; + postPatch = '' + # pytest chokes on unhandled options in the [tool.pytest.ini_options] section + sed -i "/asdf_schema_/d" pyproject.toml + ''; + build-system = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix index 871d8d59e992..8a921df9f281 100644 --- a/pkgs/development/python-modules/asdf/default.nix +++ b/pkgs/development/python-modules/asdf/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "asdf"; - version = "4.3.0"; + version = "5.1.0"; pyproject = true; src = fetchFromGitHub { owner = "asdf-format"; repo = "asdf"; tag = version; - hash = "sha256-sCjDZ/6KiFH9LbdDpco8z1xRgJe0dm0HVhpRbO51RDI="; + hash = "sha256-pET6isOd8u0mK+axgedUcQkz4y5PCSzPMy+LOqEgtEs="; }; build-system = [ diff --git a/pkgs/development/python-modules/asf-search/default.nix b/pkgs/development/python-modules/asf-search/default.nix index 55046ea8b8bf..402bb9d11360 100644 --- a/pkgs/development/python-modules/asf-search/default.nix +++ b/pkgs/development/python-modules/asf-search/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "asf-search"; - version = "9.0.9"; + version = "11.0.0"; pyproject = true; src = fetchFromGitHub { owner = "asfadmin"; repo = "Discovery-asf_search"; tag = "v${version}"; - hash = "sha256-1ZJsVcbqvB0DpcVyCWaEdYEnDXDDIupiprcIZlRCWDo="; + hash = "sha256-Z6DZOjXpziCAn9ZqbRa1c0cAVAbPEt5Go63BlA4Umog="; }; pythonRelaxDeps = [ "tenacity" ]; diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix index d406465161d5..727587c610cd 100644 --- a/pkgs/development/python-modules/asgiref/default.nix +++ b/pkgs/development/python-modules/asgiref/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { - version = "3.9.1"; + version = "3.11.0"; pname = "asgiref"; format = "setuptools"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "django"; repo = "asgiref"; tag = version; - hash = "sha256-VD8OQP+Xq3JpUz3fZRl6g+SL7mGZjeHjOU9Cd+scYzc="; + hash = "sha256-2ZaUIWGF5cQVNj95b7WiKGsn2wYsoJmJ/CfPhIEZdjc="; }; propagatedBuildInputs = [ typing-extensions ]; @@ -34,7 +34,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "asgiref" ]; meta = { - changelog = "https://github.com/django/asgiref/blob/${src.rev}/CHANGELOG.txt"; + changelog = "https://github.com/django/asgiref/blob/${src.tag}/CHANGELOG.txt"; description = "Reference ASGI adapters and channel layers"; homepage = "https://github.com/django/asgiref"; license = lib.licenses.bsd3; diff --git a/pkgs/development/python-modules/asn1/default.nix b/pkgs/development/python-modules/asn1/default.nix index b5eb64ccf9a5..4729a5712656 100644 --- a/pkgs/development/python-modules/asn1/default.nix +++ b/pkgs/development/python-modules/asn1/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "asn1"; - version = "2.8.0"; + version = "3.1.0"; pyproject = true; src = fetchFromGitHub { owner = "andrivet"; repo = "python-asn1"; tag = "v${version}"; - hash = "sha256-DLKfdQzYLhfaIEPPymTzRqj3+L/fsm5Jh8kqud/ezfw="; + hash = "sha256-yDX2TydMtqIE4A4QUmKPJKLM1UdXxp0qFBJx08Ri2YQ="; }; build-system = [ setuptools ]; @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = { description = "Python ASN.1 encoder and decoder"; homepage = "https://github.com/andrivet/python-asn1"; - changelog = "https://github.com/andrivet/python-asn1/blob/v${version}/CHANGELOG.rst"; + changelog = "https://github.com/andrivet/python-asn1/blob/${src.tag}/CHANGELOG.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aspy-refactor-imports/default.nix b/pkgs/development/python-modules/aspy-refactor-imports/default.nix index 0e1445ae09d0..01c580bb56b2 100644 --- a/pkgs/development/python-modules/aspy-refactor-imports/default.nix +++ b/pkgs/development/python-modules/aspy-refactor-imports/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aspy-refactor-imports"; - version = "3.0.1"; + version = "4.2.0"; format = "setuptools"; src = fetchFromGitHub { owner = "asottile"; repo = "aspy.refactor_imports"; - rev = "v${version}"; - sha256 = "MlCM3zNTQZJ1RWrTQG0AN28RUepWINKCeLENykbu2nw="; + tag = "v${version}"; + sha256 = "sha256-f5wZfisKz9WGdq6u0rd/zg2CfMwWvQeR8xZQNbD7KfU="; }; pythonImportsCheck = [ "aspy.refactor_imports" ]; diff --git a/pkgs/development/python-modules/astropy-iers-data/default.nix b/pkgs/development/python-modules/astropy-iers-data/default.nix index 0226f800834a..dadecba12852 100644 --- a/pkgs/development/python-modules/astropy-iers-data/default.nix +++ b/pkgs/development/python-modules/astropy-iers-data/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "astropy-iers-data"; - version = "0.2025.11.24.0.39.11"; + version = "0.2026.1.19.0.42.31"; pyproject = true; src = fetchFromGitHub { owner = "astropy"; repo = "astropy-iers-data"; tag = "v${version}"; - hash = "sha256-B8568fGvS76igIlEWIbsTczQYqL0nPISM8rfUrF/DS4="; + hash = "sha256-psxVL7375xQuo6mqh+5rvv0xEuZNUOtFco1BrPPWLtg="; }; build-system = [ diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index dd969d710c0a..639e234acbb0 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -54,14 +54,14 @@ buildPythonPackage rec { pname = "astropy"; - version = "7.1.1"; + version = "7.2.0"; pyproject = true; src = fetchFromGitHub { owner = "astropy"; repo = "astropy"; tag = "v${version}"; - hash = "sha256-cvwwTa6eJYncB2V6UCuBrQ5WRRvjgZF5/z4d7Z/uHc8="; + hash = "sha256-U9kCzyOZcttlUP0DUGkhJVkk96sBM/Gm/s5ZPJZcEoA="; }; env = lib.optionalAttrs stdenv.cc.isClang { @@ -144,6 +144,10 @@ buildPythonPackage rec { preCheck = '' export HOME="$(mktemp -d)" export OMP_NUM_THREADS=$(( $NIX_BUILD_CORES / 4 )) + if [ $OMP_NUM_THREADS -eq 0 ]; then + export OMP_NUM_THREADS=1 + fi + # See https://github.com/astropy/astropy/issues/17649 and see # --hypothesis-profile=ci pytest flag below. cp conftest.py $out/ diff --git a/pkgs/development/python-modules/async-lru/default.nix b/pkgs/development/python-modules/async-lru/default.nix index 726476979bec..ee6e876f9cbd 100644 --- a/pkgs/development/python-modules/async-lru/default.nix +++ b/pkgs/development/python-modules/async-lru/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, setuptools, pytestCheckHook, pytest-asyncio, @@ -12,25 +11,16 @@ buildPythonPackage rec { pname = "async-lru"; - version = "2.0.5"; + version = "2.1.0"; pyproject = true; src = fetchFromGitHub { owner = "aio-libs"; repo = "async-lru"; tag = "v${version}"; - hash = "sha256-FJ1q6W9IYs0OSMZc+bI4v22hOAAWAv2OW3BAqixm8Hs="; + hash = "sha256-ab0l3JrjMPudfMsn0Tu2UpvSt8HePEl8tYF2EybmXak="; }; - patches = [ - (fetchpatch2 { - # https://github.com/aio-libs/async-lru/issues/635 - name = "python314-compatibility.patch"; - url = "https://github.com/aio-libs/async-lru/commit/4df3785d3e5210ce6277b3137c4625cd73918088.patch"; - hash = "sha256-B9KCJPbiZTQJrnxC/7VI+jgr2PKfwOmS7naXZwKtF9c="; - }) - ]; - build-system = [ setuptools ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/asyncclick/default.nix b/pkgs/development/python-modules/asyncclick/default.nix index 65ea50484bb7..11508f2eedf9 100644 --- a/pkgs/development/python-modules/asyncclick/default.nix +++ b/pkgs/development/python-modules/asyncclick/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "asyncclick"; - version = "8.1.8.0"; + version = "8.3.0.5+async"; pyproject = true; src = fetchFromGitHub { owner = "python-trio"; repo = "asyncclick"; - tag = "${version}+async"; - hash = "sha256-J294pYuNOSm7v2BbwDpzn3uelAnZ3ip2U1gWuchhOtA="; + tag = version; + hash = "sha256-gKtxwI/vDB2pDrhiA+e1TClwW5nXvBRCMF3oCNoLaDo="; }; build-system = [ flit-core ]; @@ -36,6 +36,8 @@ buildPythonPackage rec { disabledTests = [ # AttributeError: 'Context' object has no attribute '_ctx_mgr' "test_context_pushing" + # https://github.com/python-trio/asyncclick/issues/47 + "test_echo_via_pager" ]; pythonImportsCheck = [ "asyncclick" ]; @@ -43,7 +45,7 @@ buildPythonPackage rec { meta = { description = "Python composable command line utility"; homepage = "https://github.com/python-trio/asyncclick"; - changelog = "https://github.com/python-trio/asyncclick/blob/${version}/CHANGES.rst"; + changelog = "https://github.com/python-trio/asyncclick/blob/${src.tag}/CHANGES.rst"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/asyncpg/default.nix b/pkgs/development/python-modules/asyncpg/default.nix index c392c34b557a..705822b52d97 100644 --- a/pkgs/development/python-modules/asyncpg/default.nix +++ b/pkgs/development/python-modules/asyncpg/default.nix @@ -7,19 +7,19 @@ uvloop, postgresql, pytest-xdist, - pytestCheckHook, + pytest8_3CheckHook, setuptools, distro, }: buildPythonPackage rec { pname = "asyncpg"; - version = "0.30.0"; + version = "0.31.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-xVHpkoq2cHYC9EgRgX+CujxEbgGL/h06vsyLpfPqyFE="; + hash = "sha256-yYk4bIOUC/vXhxgPKxUZQV4tPWJ3pw2dDwFFrHNQBzU="; }; build-system = [ @@ -33,7 +33,7 @@ buildPythonPackage rec { postgresql postgresql.pg_config pytest-xdist - pytestCheckHook + pytest8_3CheckHook distro ]; diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index 1547c0f7d5d1..26277b500225 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "2.21.1"; + version = "2.22.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-mUOAKVXiExU2wrHnGqzGj1aXOjmZN+0LclCG10YcmQw="; + hash = "sha256-w85ysBvk+XtA5ihE3ThCJ+X/WkAaN5MAfEL4alyOtTc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/atenpdu/default.nix b/pkgs/development/python-modules/atenpdu/default.nix index fd0d23c7e24d..2cfd06220afe 100644 --- a/pkgs/development/python-modules/atenpdu/default.nix +++ b/pkgs/development/python-modules/atenpdu/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "atenpdu"; - version = "0.6.3"; + version = "0.7.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-BcCw5y5LB0jLp9dRP0ZsAObTZ07kS+h+Hm8PZ0NwU3E="; + hash = "sha256-+UQVCizqpyVe7nuQUYwSBOtiTwW+0LVH1HaaucnIg9k="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/audioread/default.nix b/pkgs/development/python-modules/audioread/default.nix index fc3bd9b2c43e..fffd8d21c87c 100644 --- a/pkgs/development/python-modules/audioread/default.nix +++ b/pkgs/development/python-modules/audioread/default.nix @@ -1,28 +1,41 @@ { lib, buildPythonPackage, - fetchPypi, - flit-core, + fetchFromGitHub, + poetry-core, + standard-aifc, + standard-sunau, + ffmpeg-headless, + pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "audioread"; - version = "3.0.1"; + version = "3.1.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-rFRgpUmMSL3y6OdnQCWDpNzRP0QU0ob0LOQ3nos1Bm0="; + src = fetchFromGitHub { + owner = "sampsyo"; + repo = "audioread"; + tag = "v${finalAttrs.version}"; + hash = "sha256-QvgwjUGuzeHH69YAdZdImjMT+9t4YxAukbuZKk0lBro="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ poetry-core ]; - # No tests, need to disable or py3k breaks - doCheck = false; + dependencies = [ + standard-aifc + standard-sunau + ]; + + nativeCheckInputs = [ + ffmpeg-headless + pytestCheckHook + ]; meta = { description = "Cross-platform audio decoding"; homepage = "https://github.com/sampsyo/audioread"; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/development/python-modules/authlib/default.nix b/pkgs/development/python-modules/authlib/default.nix index e003600cb49a..ac977abfcb0e 100644 --- a/pkgs/development/python-modules/authlib/default.nix +++ b/pkgs/development/python-modules/authlib/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "authlib"; - version = "1.6.5"; + version = "1.6.6"; pyproject = true; src = fetchFromGitHub { owner = "lepture"; repo = "authlib"; tag = "v${version}"; - hash = "sha256-lz2cPqag6lZ9PXb3O/SV4buIPDDzhI71/teqWHLG+vE="; + hash = "sha256-ma1YGsp9AhQowGhyk445le7hoZOEnWtHKo9nD9db950="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/autopxd2/default.nix b/pkgs/development/python-modules/autopxd2/default.nix index c66fde78483d..a76919118895 100644 --- a/pkgs/development/python-modules/autopxd2/default.nix +++ b/pkgs/development/python-modules/autopxd2/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "python-autopxd2"; - version = "2.5.0"; + version = "3.2.2"; pyproject = true; src = fetchPypi { pname = "autopxd2"; inherit version; - hash = "sha256-uxVWz2LSXWpDYvQFrxlrmxA1XQagyHTfFf4hhaHKOqc="; + hash = "sha256-fzq5xy7vPjxwgaEyBXk3Ke9JnySJ3PM5WAucFCZ/IP8="; }; build-system = [ diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index 738d75e59b73..a4faab93c6ad 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "av"; - version = "16.0.1"; + version = "16.1.0"; pyproject = true; src = fetchFromGitHub { owner = "PyAV-Org"; repo = "PyAV"; tag = "v${version}"; - hash = "sha256-iFKDDOJzCynaqwHIjykfh82diGiuOjWytwU3dq1J9PA="; + hash = "sha256-mz0VI72lqtur5HdCkPNxInk0pUWxji0boIZnfvdrxIs="; }; build-system = [ @@ -94,7 +94,7 @@ buildPythonPackage rec { description = "Pythonic bindings for FFmpeg"; mainProgram = "pyav"; homepage = "https://github.com/PyAV-Org/PyAV"; - changelog = "https://github.com/PyAV-Org/PyAV/blob/v${version}/CHANGELOG.rst"; + changelog = "https://github.com/PyAV-Org/PyAV/blob/${src.tag}/CHANGELOG.rst"; license = lib.licenses.bsd2; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index ff59db6ac3d8..33ced09ce46b 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.103.0"; + version = "1.106.0"; pyproject = true; # https://github.com/aws/serverless-application-model/issues/3831 @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "aws"; repo = "serverless-application-model"; tag = "v${version}"; - hash = "sha256-FW7tmXsD4VfR/c6IJUCvsYPYLIisaEqAhD0sp9ufA/s="; + hash = "sha256-9KrBoa50lgZcqe/wzt05TsuUYbjRuQXgXTVHjDKBmr4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix index 118e249ce4da..39792cb67089 100644 --- a/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "aws-xray-sdk"; - version = "2.14.0"; + version = "2.15.0"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-xray-sdk-python"; tag = version; - hash = "sha256-rWP0yQ+Ril0UByOCWJKcL3mD7TvzK8Ddq9JlFIRBFU4="; + hash = "sha256-Zu2+awB6Ynxp6hkY1bB1f6u+KpDvCcoGxDWanSH+yBY="; }; nativeBuildInputs = [ setuptools ]; @@ -68,7 +68,7 @@ buildPythonPackage rec { meta = { description = "AWS X-Ray SDK for the Python programming language"; homepage = "https://github.com/aws/aws-xray-sdk-python"; - changelog = "https://github.com/aws/aws-xray-sdk-python/blob/${version}/CHANGELOG.rst"; + changelog = "https://github.com/aws/aws-xray-sdk-python/blob/${src.tag}/CHANGELOG.rst"; license = lib.licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/ax-platform/default.nix b/pkgs/development/python-modules/ax-platform/default.nix index 6fea52b2f2d0..fd603523a1fa 100644 --- a/pkgs/development/python-modules/ax-platform/default.nix +++ b/pkgs/development/python-modules/ax-platform/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "ax-platform"; - version = "1.2.1"; + version = "1.2.2"; pyproject = true; src = fetchFromGitHub { owner = "facebook"; repo = "ax"; tag = version; - hash = "sha256-WjJhBSj5lKt1ygrJ2QdxUxEvCrfnanLY8yWs7qy/GIY="; + hash = "sha256-9aZxliG7687OBhaQDG6SoN7paSfVB5prxB3KgiOod0Q="; }; env.ALLOW_BOTORCH_LATEST = "1"; @@ -113,7 +113,7 @@ buildPythonPackage rec { meta = { description = "Platform for understanding, managing, deploying, and automating adaptive experiments"; homepage = "https://ax.dev/"; - changelog = "https://github.com/facebook/Ax/releases/tag/${version}"; + changelog = "https://github.com/facebook/Ax/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ veprbl ]; }; diff --git a/pkgs/development/python-modules/azure-appconfiguration/default.nix b/pkgs/development/python-modules/azure-appconfiguration/default.nix index 08da4dc91580..43a9b1968a07 100644 --- a/pkgs/development/python-modules/azure-appconfiguration/default.nix +++ b/pkgs/development/python-modules/azure-appconfiguration/default.nix @@ -9,12 +9,13 @@ buildPythonPackage rec { pname = "azure-appconfiguration"; - version = "1.7.1"; + version = "1.7.2"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-Pr5B6b4/SubKYeXbxCxLfMAHoBBUqFBlAaJt/Bmf0+w="; + pname = "azure_appconfiguration"; + inherit version; + hash = "sha256-zv11spi4mKjtn3MEjz859OgQWaWM2DLQUjeH/B2RKgY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index 530b1ffe88cc..fc2f2e07de42 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -11,10 +11,9 @@ opentelemetry-instrumentation, opentelemetry-instrumentation-requests, opentelemetry-sdk, - pytest, pytest-asyncio, pytest-trio, - pytestCheckHook, + pytest8_3CheckHook, requests, setuptools, six, @@ -23,7 +22,7 @@ }: buildPythonPackage rec { - version = "1.35.0"; + version = "1.38.0"; pname = "azure-core"; pyproject = true; @@ -32,7 +31,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_core"; inherit version; - hash = "sha256-wL5ShIlIXp7eWbaXHrY8HqrPg+9TABv+OQTkdelyvlw="; + hash = "sha256-gZTSaCJFo+TjFRpmfGhkZMN4b+15GLOU0DW9zWG7WZM="; }; build-system = [ setuptools ]; @@ -55,10 +54,9 @@ buildPythonPackage rec { opentelemetry-instrumentation opentelemetry-instrumentation-requests opentelemetry-sdk - pytest pytest-trio pytest-asyncio - pytestCheckHook + pytest8_3CheckHook trio ] ++ lib.concatAttrValues optional-dependencies; diff --git a/pkgs/development/python-modules/azure-cosmos/default.nix b/pkgs/development/python-modules/azure-cosmos/default.nix index fbdea1008726..77a2904f2366 100644 --- a/pkgs/development/python-modules/azure-cosmos/default.nix +++ b/pkgs/development/python-modules/azure-cosmos/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "azure-cosmos"; - version = "4.14.2"; + version = "4.14.5"; pyproject = true; src = fetchPypi { pname = "azure_cosmos"; inherit version; - hash = "sha256-f7dGRJ7xWTBMWvb+aHVI5WHB8eJX/WUF1gFY0AEB7G4="; + hash = "sha256-MjmmBf4pyUt3ORgmdzqj0Nm75Lk5A/zltkNLDzJ0K6c="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/pkgs/development/python-modules/azure-identity/default.nix index d9a764a80fca..5511129685b8 100644 --- a/pkgs/development/python-modules/azure-identity/default.nix +++ b/pkgs/development/python-modules/azure-identity/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "azure-identity"; - version = "1.23.1"; + version = "1.25.1"; pyproject = true; src = fetchPypi { pname = "azure_identity"; inherit version; - hash = "sha256-Imwe+YKp+NXc9uD57TXq7ypNlx592GMX6bnVLnCgNeQ="; + hash = "sha256-h8qDKIg95gNkQ+HDe0Do3I+3SJgkD2EHHgnS42k2FFY="; }; 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 7c3f6de7d24a..678d5bfa09e3 100644 --- a/pkgs/development/python-modules/azure-kusto-data/default.nix +++ b/pkgs/development/python-modules/azure-kusto-data/default.nix @@ -1,6 +1,7 @@ { lib, aiohttp, + aioresponses, asgiref, azure-core, azure-identity, @@ -10,27 +11,33 @@ msal, pandas, pytest-asyncio, + pytest-xdist, pytestCheckHook, python-dateutil, requests, - setuptools, + uv-build, }: buildPythonPackage rec { pname = "azure-kusto-data"; - version = "5.0.5"; + version = "6.0.1"; pyproject = true; src = fetchFromGitHub { owner = "Azure"; repo = "azure-kusto-python"; tag = "v${version}"; - hash = "sha256-DEHTxSvc6AeBMEJuAiDavFj2xVfPmWKpZBaZcpHWHak="; + hash = "sha256-ZwPF6YLb2w+Thds36UeQdx64SJqKHFXSQVv39YYQOHA="; }; sourceRoot = "${src.name}/${pname}"; - build-system = [ setuptools ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "uv_build>=0.8.9,<0.9.0" uv_build + ''; + + build-system = [ uv-build ]; dependencies = [ azure-core @@ -50,7 +57,9 @@ buildPythonPackage rec { }; nativeCheckInputs = [ + aioresponses pytest-asyncio + pytest-xdist pytestCheckHook ] ++ lib.concatAttrValues optional-dependencies; @@ -66,7 +75,7 @@ buildPythonPackage rec { meta = { description = "Kusto Data Client"; - homepage = "https://pypi.org/project/azure-kusto-data/"; + homepage = "https://github.com/Azure/azure-kusto-python/tree/master/azure-kusto-data"; changelog = "https://github.com/Azure/azure-kusto-python/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ pyrox0 ]; diff --git a/pkgs/development/python-modules/azure-kusto-ingest/default.nix b/pkgs/development/python-modules/azure-kusto-ingest/default.nix index f2745a72b4b4..e6bef7142123 100644 --- a/pkgs/development/python-modules/azure-kusto-ingest/default.nix +++ b/pkgs/development/python-modules/azure-kusto-ingest/default.nix @@ -8,27 +8,33 @@ fetchFromGitHub, pandas, pytest-asyncio, + pytest-xdist, pytestCheckHook, responses, - setuptools, + uv-build, tenacity, }: buildPythonPackage rec { pname = "azure-kusto-ingest"; - version = "5.0.5"; + version = "6.0.1"; pyproject = true; src = fetchFromGitHub { owner = "Azure"; repo = "azure-kusto-python"; tag = "v${version}"; - hash = "sha256-DEHTxSvc6AeBMEJuAiDavFj2xVfPmWKpZBaZcpHWHak="; + hash = "sha256-ZwPF6YLb2w+Thds36UeQdx64SJqKHFXSQVv39YYQOHA="; }; sourceRoot = "${src.name}/${pname}"; - build-system = [ setuptools ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "uv_build>=0.8.9,<0.9.0" uv-build + ''; + + build-system = [ uv-build ]; dependencies = [ azure-kusto-data @@ -49,6 +55,7 @@ buildPythonPackage rec { nativeCheckInputs = [ aiohttp pytest-asyncio + pytest-xdist pytestCheckHook responses ] diff --git a/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix b/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix index 87bf04916d1b..cbcc673a3972 100644 --- a/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix @@ -5,18 +5,19 @@ azure-common, azure-mgmt-core, isodate, + msrest, setuptools, }: buildPythonPackage rec { pname = "azure-mgmt-appcontainers"; - version = "3.2.0"; + version = "4.0.0"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_appcontainers"; inherit version; - hash = "sha256-bp7WPCwssPZD+tZ52BMIxKomFWztQfwDPl9MBJghjz4="; + hash = "sha256-FzETbKAWbF+8IaWM036nZ4fSCYnn+V3BKuYn768dw6U="; }; build-system = [ setuptools ]; @@ -25,6 +26,7 @@ buildPythonPackage rec { azure-common azure-mgmt-core isodate + msrest ]; # no tests included diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index ad1f36b8e8af..70a9b0e0339c 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "azure-mgmt-compute"; - version = "35.0.0"; + version = "37.1.0"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_compute"; inherit version; - hash = "sha256-QxlpERNVB9HOdvCJxOV9OyJYheUSfQI74s4cWX/UQzY="; + hash = "sha256-V67UT4TCpTMj4Rw3MUhd176ZruDdGnT1+nffYHlD00o="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index c7147f10ddc8..5255c17f0107 100644 --- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -5,26 +5,28 @@ buildPythonPackage, fetchPypi, isodate, + msrest, setuptools, }: buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "9.8.0"; + version = "9.9.0"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_cosmosdb"; inherit version; - hash = "sha256-IU7kcWU4flePhuZhH7MptNVNwpWtedo3udksXW0g0bE="; + hash = "sha256-Rni/BCvcIIqiT8pxdnrCm28qJyKseHJgg3Glki87bDc="; }; build-system = [ setuptools ]; dependencies = [ - isodate azure-common azure-mgmt-core + isodate + msrest ]; # Module has no tests diff --git a/pkgs/development/python-modules/azure-mgmt-dashboard/default.nix b/pkgs/development/python-modules/azure-mgmt-dashboard/default.nix index 6ae7e8ef8ccb..b6546b7b1db7 100644 --- a/pkgs/development/python-modules/azure-mgmt-dashboard/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-dashboard/default.nix @@ -5,13 +5,12 @@ buildPythonPackage, fetchPypi, isodate, - setuptools, typing-extensions, }: buildPythonPackage rec { pname = "azure-mgmt-dashboard"; - version = "1.1.0"; + version = "2.0.0"; format = "wheel"; src = fetchPypi { @@ -20,7 +19,7 @@ buildPythonPackage rec { format = "wheel"; python = "py3"; dist = "py3"; - hash = "sha256-WoZW5p30f0mrmMyhD68nxqlGrTtUU93V167B8wZitdA="; + hash = "sha256-1LASBzs+biyDDQPoCujcvLhK3iyNaHLU8VCtBSdTJxg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix index aca68e1350fe..a3164a34c03c 100644 --- a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "azure-mgmt-keyvault"; - version = "12.0.0"; + version = "13.0.0"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_keyvault"; inherit version; - hash = "sha256-4s8Y6KSSi10cqxJ75C6prQJG1ofKEvwnoq1mSHzhyGs="; + hash = "sha256-VsEpBObZrEn4hkg+UOP2Ndi/Q6SJ6zL6e0gy8yPTlsc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-mgmt-mysqlflexibleservers/default.nix b/pkgs/development/python-modules/azure-mgmt-mysqlflexibleservers/default.nix index 195ecfc16204..b2524c5286b3 100644 --- a/pkgs/development/python-modules/azure-mgmt-mysqlflexibleservers/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-mysqlflexibleservers/default.nix @@ -7,18 +7,19 @@ azure-common, azure-mgmt-core, isodate, + msrest, typing-extensions, }: buildPythonPackage rec { pname = "azure-mgmt-mysqlflexibleservers"; - version = "1.0.0b3"; + version = "1.0.0"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_mysqlflexibleservers"; inherit version; - hash = "sha256-YR/Yjz2x4KhHehYz/pTEYdFyE+IVFw61PB7qm4I71MM="; + hash = "sha256-0HemVoiKXFl39HmiRKZKxKHTUQAumaft2vakmoIZLlY="; }; build-system = [ @@ -30,6 +31,7 @@ buildPythonPackage rec { azure-common azure-mgmt-core isodate + msrest typing-extensions ]; diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index 93ad123c70e2..abc814fe1f4b 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "azure-mgmt-network"; - version = "29.0.0"; + version = "30.1.0"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_network"; inherit version; - hash = "sha256-V3+8dqGV90S5e6xCdeESeffz5jxlnZh3PztKmm4JQ7k="; + hash = "sha256-QUZKBTZJYvcRmgToqYPpCTXBoksu86Q6wQoOzJIIcJ8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-mgmt-postgresqlflexibleservers/default.nix b/pkgs/development/python-modules/azure-mgmt-postgresqlflexibleservers/default.nix index b18a41d7af01..6227d4ce04d7 100644 --- a/pkgs/development/python-modules/azure-mgmt-postgresqlflexibleservers/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-postgresqlflexibleservers/default.nix @@ -7,18 +7,19 @@ azure-common, azure-mgmt-core, isodate, + msrest, typing-extensions, }: buildPythonPackage rec { pname = "azure-mgmt-postgresqlflexibleservers"; - version = "1.1.0"; + version = "2.0.0"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_postgresqlflexibleservers"; inherit version; - hash = "sha256-nt6di6Y+nSh5y3StyQPGSa87xUYKAnhyh7DNGNdUrxQ="; + hash = "sha256-E9L0W6IYo2T7BAVoT4Bw8mGuPtWX1aVNBOMphzLEzao="; }; build-system = [ @@ -30,6 +31,7 @@ buildPythonPackage rec { azure-common azure-mgmt-core isodate + msrest typing-extensions ]; diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix index 1a3a47688a40..945a9dec0867 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix @@ -5,6 +5,7 @@ buildPythonPackage, fetchPypi, isodate, + msrest, setuptools, }: @@ -25,6 +26,7 @@ buildPythonPackage rec { azure-common azure-mgmt-core isodate + msrest ]; # Module has no tests diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix index 167154d0a952..520066ef703b 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix @@ -5,18 +5,19 @@ buildPythonPackage, fetchPypi, isodate, + msrest, setuptools, }: buildPythonPackage rec { pname = "azure-mgmt-recoveryservicesbackup"; - version = "9.2.0"; + version = "10.0.0"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_recoveryservicesbackup"; inherit version; - hash = "sha256-xAKz4ipsOHnfVrw34AYxQsM1LFECWZ/xAtGYJPGzKyk="; + hash = "sha256-DKw8a4cjBjWbvEdQHRhLcAhGzlSPk/nA9u99HRC3I+k="; }; build-system = [ setuptools ]; @@ -25,6 +26,7 @@ buildPythonPackage rec { azure-common azure-mgmt-core isodate + msrest ]; # Module has no tests diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/pkgs/development/python-modules/azure-mgmt-web/default.nix index 6b3839d7a2c7..a3264f919419 100644 --- a/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -5,19 +5,20 @@ buildPythonPackage, fetchPypi, isodate, + msrest, setuptools, typing-extensions, }: buildPythonPackage rec { pname = "azure-mgmt-web"; - version = "9.0.0"; + version = "10.1.0"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_web"; inherit version; - hash = "sha256-RFXs07SYV3CFwZBObRcTklTjWLoH/mxINaiRu697BsI="; + hash = "sha256-JtNZS74bMFibcpIsNYVbxbdMFR8CJBR6YNGnUjSFkiY="; }; build-system = [ setuptools ]; @@ -26,6 +27,7 @@ buildPythonPackage rec { azure-common azure-mgmt-core isodate + msrest typing-extensions ]; diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix index da8080a1f5ab..98a5e5cdbcbd 100644 --- a/pkgs/development/python-modules/azure-storage-blob/default.nix +++ b/pkgs/development/python-modules/azure-storage-blob/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "azure-storage-blob"; - version = "12.26.0"; + version = "12.28.0"; pyproject = true; src = fetchPypi { pname = "azure_storage_blob"; inherit version; - hash = "sha256-XdfXgkIk994Av+sDJ1NgHJgmVRcwYeJC8Tvm4m141x8="; + hash = "sha256-59mOoQgljSmqDvv9WRsuIHX6FyKi+uhpnws8neEe/0E="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix index 2f5a1710492c..b2694008bedd 100644 --- a/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.23.1"; + version = "12.24.0"; pyproject = true; src = fetchPypi { pname = "azure_storage_file_share"; inherit version; - hash = "sha256-naU7VvgJD8U9kz7OWp+yRwEMO0p1/5CKlI4kje+yH64="; + hash = "sha256-kPmwI053H9oIv1YQPEOk9KwIv3kzTZ2se7G283uq3SU="; }; 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 9ed4e895c171..2fddc44684ae 100644 --- a/pkgs/development/python-modules/azure-storage-queue/default.nix +++ b/pkgs/development/python-modules/azure-storage-queue/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "azure-storage-queue"; - version = "12.14.1"; + version = "12.15.0"; pyproject = true; src = fetchPypi { pname = "azure_storage_queue"; inherit version; - hash = "sha256-j3r7MR7xuZBzFuWbs+BkU5fI12BzrbG1lfAnsXwLevE="; + hash = "sha256-TgHcrlrv0MRj97rlx1yKkflVyJPxTtdZD8DNRHrEZm0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/batchgenerators/default.nix b/pkgs/development/python-modules/batchgenerators/default.nix index 73dbac7a998e..61409228421b 100644 --- a/pkgs/development/python-modules/batchgenerators/default.nix +++ b/pkgs/development/python-modules/batchgenerators/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "batchgenerators"; - version = "0.25"; + version = "0.25.1"; pyproject = true; src = fetchFromGitHub { owner = "MIC-DKFZ"; repo = "batchgenerators"; - rev = "v${version}"; - hash = "sha256-L2mWH2t8PN9o1M67KDdl1Tj2ZZ02MY4icsJY2VNrj3A="; + tag = "v${version}"; + hash = "sha256-lvsen2AFRwFjLMgxXBQ9/xxmCOBx2D2PBIl0KpOzR70="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/batinfo/default.nix b/pkgs/development/python-modules/batinfo/default.nix index 475ba6ac9510..16b277994a9b 100644 --- a/pkgs/development/python-modules/batinfo/default.nix +++ b/pkgs/development/python-modules/batinfo/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "batinfo"; - version = "0.4.2"; + version = "2.0"; pyproject = true; src = fetchFromGitHub { owner = "nicolargo"; repo = "batinfo"; tag = "v${version}"; - hash = "sha256-GgAJJA8bzQJLAU+nxmkDa5LFTHc4NGi+nj9PfKyw8/M="; + hash = "sha256-7oR8FRnl6reFHKPf49ZH3zQIjgOX1KTOxb3aCRNYOSg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/bce-python-sdk/default.nix b/pkgs/development/python-modules/bce-python-sdk/default.nix index 207e34faafab..a94416c3ba47 100644 --- a/pkgs/development/python-modules/bce-python-sdk/default.nix +++ b/pkgs/development/python-modules/bce-python-sdk/default.nix @@ -9,7 +9,7 @@ }: let - version = "0.9.57"; + version = "0.9.59"; in buildPythonPackage { pname = "bce-python-sdk"; @@ -19,7 +19,7 @@ buildPythonPackage { src = fetchPypi { pname = "bce_python_sdk"; inherit version; - hash = "sha256-797kmORvaBg/W31BnPgFJLzsLAzWHe+ABdNYtP7PQ4E="; + hash = "sha256-VK0JOUsKW6+Mjvh6yRn50RHBsFNghihrgK2nFlHY5Mg="; }; patches = [ diff --git a/pkgs/development/python-modules/bdffont/default.nix b/pkgs/development/python-modules/bdffont/default.nix index 4e1831e8201b..4daa5461fd77 100644 --- a/pkgs/development/python-modules/bdffont/default.nix +++ b/pkgs/development/python-modules/bdffont/default.nix @@ -1,31 +1,29 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pytestCheckHook, - nix-update-script, - hatchling, + uv-build, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bdffont"; - version = "0.0.32"; + version = "0.0.35"; pyproject = true; - src = fetchPypi { - pname = "bdffont"; - inherit version; - hash = "sha256-5O1AlidPMhp0ztzBi/eHJToFSKMcx+EuQHltt/w4goQ="; + src = fetchFromGitHub { + owner = "TakWolf"; + repo = "bdffont"; + tag = finalAttrs.version; + hash = "sha256-a93l7iX2/Htigs36zCv1x8SAGzycGU2y/stN0j794fw="; }; - build-system = [ hatchling ]; + build-system = [ uv-build ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "bdffont" ]; - passthru.updateScript = nix-update-script { }; - meta = { homepage = "https://github.com/TakWolf/bdffont"; description = "Library for manipulating Glyph Bitmap Distribution Format (BDF) Fonts"; @@ -36,4 +34,4 @@ buildPythonPackage rec { h7x4 ]; }; -} +}) diff --git a/pkgs/development/python-modules/beets-audible/default.nix b/pkgs/development/python-modules/beets-audible/default.nix index 42ec73c8f274..5dc42ab5faae 100644 --- a/pkgs/development/python-modules/beets-audible/default.nix +++ b/pkgs/development/python-modules/beets-audible/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "beets-audible"; - version = "1.1.0"; + version = "1.2.1"; pyproject = true; src = fetchFromGitHub { owner = "Neurrone"; repo = "beets-audible"; - rev = "v${version}"; - hash = "sha256-Hi/hI+zfAHwRLt8JhzL5RXEIHnSBX8oO/zuuq1HxT2s="; + tag = "v${version}"; + hash = "sha256-uQNF04BK87vN5Ak3g05rS8+LQLxsNEncgz4oKhNidWI="; }; build-system = [ diff --git a/pkgs/development/python-modules/beets-filetote/default.nix b/pkgs/development/python-modules/beets-filetote/default.nix index 9b12b86118de..3c27dfc65263 100644 --- a/pkgs/development/python-modules/beets-filetote/default.nix +++ b/pkgs/development/python-modules/beets-filetote/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "beets-filetote"; - version = "1.1.0"; + version = "1.1.1"; pyproject = true; src = fetchFromGitHub { owner = "gtronset"; repo = "beets-filetote"; tag = "v${version}"; - hash = "sha256-5o0Hif0dNavYRH1pa1ZPTnOvk9VPXCU/Lqpg2rKzU/I="; + hash = "sha256-NsYBsP60SiCfQ63C4WMkshyreFqOSmx3LP5Gwq6ECF0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/beniget/default.nix b/pkgs/development/python-modules/beniget/default.nix index 35756f510076..e4413a28a9c2 100644 --- a/pkgs/development/python-modules/beniget/default.nix +++ b/pkgs/development/python-modules/beniget/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "beniget"; - version = "0.4.2.post1"; + version = "0.5.0"; pyproject = true; src = fetchFromGitHub { owner = "serge-sans-paille"; repo = "beniget"; tag = version; - hash = "sha256-rNMgCEkI6p9KtLSz/2jVJ9rPeJzxv5rT+Pu6OHM8z70="; + hash = "sha256-abxBLrz4JhZX084fd2wZEhP7w5bPBxvNXudYUaqS1Yo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/bentoml/default.nix b/pkgs/development/python-modules/bentoml/default.nix index c1d89f818571..a50e9f70d991 100644 --- a/pkgs/development/python-modules/bentoml/default.nix +++ b/pkgs/development/python-modules/bentoml/default.nix @@ -78,7 +78,7 @@ }: let - version = "1.4.29"; + version = "1.4.33"; aws = [ fs-s3fs ]; grpc = [ grpcio @@ -128,7 +128,7 @@ let owner = "bentoml"; repo = "BentoML"; tag = "v${version}"; - hash = "sha256-humzefKjnFpbWp9QVcUGPD0+3l2bOyFA35reZLtwFt4="; + hash = "sha256-SR84EeZ9WNoaRDG4uklYhlFSDigZv81XX3VlKCn/7Zw="; }; in buildPythonPackage { diff --git a/pkgs/development/python-modules/berkeleydb/default.nix b/pkgs/development/python-modules/berkeleydb/default.nix index 3f9cd22ac720..e86417d791fe 100644 --- a/pkgs/development/python-modules/berkeleydb/default.nix +++ b/pkgs/development/python-modules/berkeleydb/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "berkeleydb"; - version = "18.1.14"; + version = "18.1.15"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-jCYCgvV+vVucPOU9oOt1vllXrdswPjGQk1txZEjzL30="; + hash = "sha256-evpTFD11TGuyyFZWwTJeuuUYrc/NG1nhPMKruI3fdY4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/bibtexparser/default.nix b/pkgs/development/python-modules/bibtexparser/default.nix index fa41f638d804..eb1ff7825f35 100644 --- a/pkgs/development/python-modules/bibtexparser/default.nix +++ b/pkgs/development/python-modules/bibtexparser/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "bibtexparser"; - version = "1.4.3"; + version = "1.4.4"; format = "setuptools"; src = fetchFromGitHub { owner = "sciunto-org"; repo = "python-${pname}"; tag = "v${version}"; - hash = "sha256-9m+7RbeJMJssviyIezPrSLMMGcQTHYaOFQwLhnu04Es="; + hash = "sha256-9zLJZAk2IBYTL7lACh6erY7A44XFZGJCr8dcpYlwKRI="; }; propagatedBuildInputs = [ pyparsing ]; diff --git a/pkgs/development/python-modules/binsync/default.nix b/pkgs/development/python-modules/binsync/default.nix index a5d69d47e235..069787354a05 100644 --- a/pkgs/development/python-modules/binsync/default.nix +++ b/pkgs/development/python-modules/binsync/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "binsync"; - version = "5.8.0"; + version = "5.11.0"; pyproject = true; src = fetchFromGitHub { owner = "binsync"; repo = "binsync"; tag = "v${version}"; - hash = "sha256-AF5V1MBhWQQNtmwWZT1oT0CLj0impP4zqBTM5IHwzcI="; + hash = "sha256-dRc/sF2eVCW1fX66PsF4xU1RbkSnn/sT/PFsRbvDpzY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix index 7d10c823bdce..d2d56fded6ce 100644 --- a/pkgs/development/python-modules/biopython/default.nix +++ b/pkgs/development/python-modules/biopython/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "biopython"; - version = "1.85"; + version = "1.86"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Xa+rdAWd5OePSfa1aE7drm585G8Jz6BZwdEznoseoKY="; + hash = "sha256-k6ULWGpNLOxoqy+Z0D71g8V2HY+6VTXLjoHaeB0Nkv8="; }; build-system = [ setuptools ]; @@ -33,6 +33,8 @@ buildPythonPackage rec { ''; meta = { + # https://github.com/biopython/biopython/issues/5135 + broken = lib.versionAtLeast numpy.version "2.4"; description = "Python library for bioinformatics"; longDescription = '' Biopython is a set of freely available tools for biological computation diff --git a/pkgs/development/python-modules/bip-utils/default.nix b/pkgs/development/python-modules/bip-utils/default.nix index ebfddb2b6640..96e4a8d8aeb5 100644 --- a/pkgs/development/python-modules/bip-utils/default.nix +++ b/pkgs/development/python-modules/bip-utils/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "bip-utils"; - version = "2.9.3"; + version = "2.10.0"; pyproject = true; src = fetchFromGitHub { owner = "ebellocchia"; repo = "bip_utils"; tag = "v${version}"; - hash = "sha256-3G37n/mfI+3JVIkmJWzbB1qPPTE6NJJlFZWdE0fIIWA="; + hash = "sha256-84fhL8+/hIHnS7QpbgvPXw/WH2XZbsN895KI/XIKsKw="; }; nativeBuildInputs = [ setuptools ]; @@ -46,7 +46,7 @@ buildPythonPackage rec { meta = { description = "Implementation of BIP39, BIP32, BIP44, BIP49 and BIP84 for wallet seeds, keys and addresses generation"; homepage = "https://github.com/ebellocchia/bip_utils"; - changelog = "https://github.com/ebellocchia/bip_utils/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/ebellocchia/bip_utils/blob/${src.tag}/CHANGELOG.md"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ prusnak diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index e188368e2ebb..20f95dc1f9f5 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "bitarray"; - version = "3.7.1"; + version = "3.8.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-eVsXYEGKt1CCZCCuJPBvOSwI4h3CNPCjaaacwARE+Ow="; + hash = "sha256-Pq442v/XfJYhroDBaTLuo/s6SvFB+3zHJNStk+/5IQ0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/bitcoinrpc/default.nix b/pkgs/development/python-modules/bitcoinrpc/default.nix index f24c2340168f..5bf2f03077ce 100644 --- a/pkgs/development/python-modules/bitcoinrpc/default.nix +++ b/pkgs/development/python-modules/bitcoinrpc/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "bitcoinrpc"; - version = "0.5.0"; + version = "0.7.0"; format = "setuptools"; src = fetchFromGitHub { owner = "bibajz"; repo = "bitcoin-python-async-rpc"; - rev = "v${version}"; - hash = "sha256-uxkSz99X9ior7l825PaXGIC5XJzO/Opv0vTyY1ixvxU="; + tag = "v${version}"; + hash = "sha256-QrLAhX2OZNP6k6TZ7OkD9phQidsExbep8MxWxQpqAU8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index 4a25ba76177e..69200ec70f9c 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -1,31 +1,33 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pytestCheckHook, - html5lib, setuptools, tinycss2, - packaging, webencodings, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bleach"; version = "6.3.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-bzuRscCgK7mni1pFTJJQaqD98Zfh1eEU0uAMb2QwbSI="; + src = fetchFromGitHub { + owner = "mozilla"; + repo = "bleach"; + tag = "v${finalAttrs.version}"; + hash = "sha256-a85gLy0Ix4cWvXY0s3m+ZD+ga7en6bYu1iAA22OaSwk="; }; - nativeBuildInputs = [ setuptools ]; + pythonRelaxDeps = [ + # Upstream views pins as known-good versions: https://github.com/mozilla/bleach/pull/741 + "tinycss2" + ]; - propagatedBuildInputs = [ - html5lib - packaging - setuptools + build-system = [ setuptools ]; + + dependencies = [ webencodings ]; @@ -57,8 +59,8 @@ buildPythonPackage rec { ''; homepage = "https://github.com/mozilla/bleach"; downloadPage = "https://github.com/mozilla/bleach/releases"; - changelog = "https://github.com/mozilla/bleach/blob/v${version}/CHANGES"; + changelog = "https://github.com/mozilla/bleach/blob/${finalAttrs.src.tag}/CHANGES"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ prikhi ]; }; -} +}) diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index f13e9190c551..add1c66a51f5 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -34,14 +34,14 @@ let in buildPythonPackage rec { pname = "blivet"; - version = "3.12.1"; + version = "3.13.1"; format = "setuptools"; src = fetchFromGitHub { owner = "storaged-project"; repo = "blivet"; tag = "blivet-${version}"; - hash = "sha256-ppX2rd1rFkRhca7F56JVQUDEQzW7Cg8ifV60URs2IMY="; + hash = "sha256-5uhiCnwj5DyffsI2XEaLdvHMepjGWt2JlDmyZExSNRI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/blobfile/default.nix b/pkgs/development/python-modules/blobfile/default.nix index 81976c721817..89c65b4c6633 100644 --- a/pkgs/development/python-modules/blobfile/default.nix +++ b/pkgs/development/python-modules/blobfile/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "blobfile"; - version = "3.0.0"; + version = "3.1.0"; format = "setuptools"; src = fetchFromGitHub { owner = "christopher-hesse"; repo = "blobfile"; tag = "v${version}"; - hash = "sha256-/v48rLvlN4lsfWKJvXRNuIO6jdsCgRcSPlJzdOfl3xk="; + hash = "sha256-aTHEJ1P+v9IWXPg9LN+KG1TlEVJh0qTl8J41iWpoPWk="; }; propagatedBuildInputs = [ @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = { description = "Read Google Cloud Storage, Azure Blobs, and local paths with the same interface"; homepage = "https://github.com/christopher-hesse/blobfile"; - changelog = "https://github.com/christopher-hesse/blobfile/blob/v${version}/CHANGES.md"; + changelog = "https://github.com/christopher-hesse/blobfile/blob/${src.tag}/CHANGES.md"; license = lib.licenses.unlicense; maintainers = with lib.maintainers; [ happysalada ]; }; diff --git a/pkgs/development/python-modules/bluecurrent-api/default.nix b/pkgs/development/python-modules/bluecurrent-api/default.nix index fcc9c6619a32..5d66b378581f 100644 --- a/pkgs/development/python-modules/bluecurrent-api/default.nix +++ b/pkgs/development/python-modules/bluecurrent-api/default.nix @@ -29,6 +29,8 @@ buildPythonPackage rec { websockets ]; + pythonRelaxDeps = [ "websockets" ]; + pythonImportsCheck = [ "bluecurrent_api" ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index b241f27cd7fa..f9a5e71186e0 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -44,12 +44,12 @@ buildPythonPackage rec { pname = "bokeh"; # update together with panel which is not straightforward - version = "3.7.3"; + version = "3.8.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-cKian3l7ED1e5q0V+3lErdoRXPDamW7Qt1z7phyxLys="; + hash = "sha256-jn3KzCHVOQVYG1QyitJwWVT3LymX+Z/DMsHejaU6o8w="; }; patches = [ diff --git a/pkgs/development/python-modules/boltons/default.nix b/pkgs/development/python-modules/boltons/default.nix index 2caf3b4c6f84..c186017c9c13 100644 --- a/pkgs/development/python-modules/boltons/default.nix +++ b/pkgs/development/python-modules/boltons/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, flit-core, pytestCheckHook, }: @@ -18,6 +19,14 @@ buildPythonPackage rec { hash = "sha256-kBOU17/jRRAGb4MGawY0PY31OJf5arVz+J7xGBoMBkg="; }; + patches = [ + (fetchpatch { + name = "pytest9-compat.patch"; + url = "https://github.com/mahmoud/boltons/commit/a2af58548936c51a3d859f780e54ba170a6829bb.patch"; + hash = "sha256-NRjfEKb0doJEtS5GyrF0dJYYr2u+ukogfUmmVnsHAwM="; + }) + ]; + build-system = [ flit-core ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/boost-histogram/default.nix b/pkgs/development/python-modules/boost-histogram/default.nix index 797e1732ce04..d31d9ed10d97 100644 --- a/pkgs/development/python-modules/boost-histogram/default.nix +++ b/pkgs/development/python-modules/boost-histogram/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "boost-histogram"; - version = "1.5.2"; + version = "1.6.1"; pyproject = true; src = fetchFromGitHub { owner = "scikit-hep"; repo = "boost-histogram"; tag = "v${version}"; - hash = "sha256-kduE5v1oQT76MRxMuGo+snCBdJ+yOjkOJFO45twcUIs="; + hash = "sha256-c2zREASzWfXhNTyygGxj3354l58pT/9zygmRou2bUNE="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/borb/default.nix b/pkgs/development/python-modules/borb/default.nix index ee101eed39c2..50763b2cf450 100644 --- a/pkgs/development/python-modules/borb/default.nix +++ b/pkgs/development/python-modules/borb/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "borb"; - version = "2.1.25"; + version = "3.0.4"; pyproject = true; src = fetchFromGitHub { owner = "jorisschellekens"; repo = "borb"; tag = "v${version}"; - hash = "sha256-eVxpcYL3ZgwidkSt6tUav3Bkne4lo1QCshdUFqkA0wI="; + hash = "sha256-p9tVG2Pvqk5uDXdeB+7F71w3h4/zut+htlm4p+qqfWA="; }; # ModuleNotFoundError: No module named '_decimal' @@ -72,7 +72,7 @@ buildPythonPackage rec { meta = { description = "Library for reading, creating and manipulating PDF files in Python"; homepage = "https://borbpdf.com/"; - changelog = "https://github.com/jorisschellekens/borb/releases/tag/v${version}"; + changelog = "https://github.com/jorisschellekens/borb/releases/tag/${src.tag}"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ getchoo ]; }; diff --git a/pkgs/development/python-modules/bork/default.nix b/pkgs/development/python-modules/bork/default.nix index eceafe8de5af..6c4e3c3bc4a4 100644 --- a/pkgs/development/python-modules/bork/default.nix +++ b/pkgs/development/python-modules/bork/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "bork"; - version = "9.0.0"; + version = "10.0.3"; pyproject = true; src = fetchFromGitHub { owner = "duckinator"; repo = "bork"; tag = "v${version}"; - hash = "sha256-YqvtOwd00TXD4I3fIQolvjHnjREvQgbdrEO9Z96v1Kk="; + hash = "sha256-/euPRR6TRCAAl42CHePfUr+9Kh271iLjTayUR1S/FBg="; }; build-system = [ diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 020c5fe91503..72c2266f8927 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-H6iCdOw0eFfd4rKhf5VRhWZhPG1ne+TrZYqxpY5R+T4="; + hash = "sha256-fzwVxbn4+5zkcAKQ9+bEbNSdwcPKZqsNIJZPqhV+n8w="; }; build-system = [ diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 36c1eb51e179..9164bcd76bb9 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.40.18"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.42.31"; # 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-m0pmfOzI1mgfthiAShO2oDYlnFqUfDv+FR5X1XlHHkM="; + hash = "sha256-avuv1uXKMeSr3SL+BI9XW8tDCQM/dlXFn590di3S03k="; }; build-system = [ @@ -61,7 +61,7 @@ buildPythonPackage rec { meta = { description = "Low-level interface to a growing number of Amazon Web Services"; homepage = "https://github.com/boto/botocore"; - changelog = "https://github.com/boto/botocore/blob/${version}/CHANGELOG.rst"; + changelog = "https://github.com/boto/botocore/blob/${src.tag}/CHANGELOG.rst"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ anthonyroussel ]; }; diff --git a/pkgs/development/python-modules/bqscales/default.nix b/pkgs/development/python-modules/bqscales/default.nix index a012e36ddf06..cec0e68a5845 100644 --- a/pkgs/development/python-modules/bqscales/default.nix +++ b/pkgs/development/python-modules/bqscales/default.nix @@ -1,33 +1,68 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + + # frontend + nodejs, + yarn-berry_3, + + # build-system hatchling, + hatch-build-scripts, hatch-jupyter-builder, + hatch-nodejs-version, jupyterlab, + + # dependencies ipywidgets, numpy, traitlets, traittypes, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bqscales"; - version = "0.3.3"; + version = "0.3.7"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-SlnNw4dWOzRedwIN3kCyl95qVqkY92QGOMS3Eyoqk0I="; + src = fetchFromGitHub { + owner = "bqplot"; + repo = "bqscales"; + tag = finalAttrs.version; + hash = "sha256-AAKnOEwdycSlxJEK0qbFJp2Dpiw/rEIk7fUa3NTymqQ="; + }; + + postPatch = '' + sed -i "/\"hatch\"/d" pyproject.toml + ''; + + missingHashes = ./missing-hashes.json; + + yarnOfflineCache = yarn-berry_3.fetchYarnBerryDeps { + inherit (finalAttrs) src missingHashes; + hash = "sha256-4Y5dRFwOyfHOzrdw2/epK3mN/+xrz+ccG86KP9axxjI="; }; nativeBuildInputs = [ + nodejs + yarn-berry_3.yarnBerryConfigHook + yarn-berry_3 + ]; + + preBuild = '' + npm run build + ''; + + build-system = [ + hatch-build-scripts hatch-jupyter-builder + hatch-nodejs-version hatchling jupyterlab ]; - propagatedBuildInputs = [ + dependencies = [ ipywidgets numpy traitlets @@ -47,4 +82,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ bcdarwin ]; }; -} +}) diff --git a/pkgs/development/python-modules/bqscales/missing-hashes.json b/pkgs/development/python-modules/bqscales/missing-hashes.json new file mode 100644 index 000000000000..43c071c5f5d2 --- /dev/null +++ b/pkgs/development/python-modules/bqscales/missing-hashes.json @@ -0,0 +1,3 @@ +{ + "@rollup/rollup-linux-x64-gnu@npm:4.9.5": "234c780999740b15999190d33d5994b28c880169a08ab5b82bb8dbc65f24d61329193e9f3817ed499f8486346336b8f256b32e020cbf4d81747d81cd490f6498" +} diff --git a/pkgs/development/python-modules/branca/default.nix b/pkgs/development/python-modules/branca/default.nix index c6da5141a9fe..c1e6ee150ad0 100644 --- a/pkgs/development/python-modules/branca/default.nix +++ b/pkgs/development/python-modules/branca/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "branca"; - version = "0.8.1"; + version = "0.8.2"; pyproject = true; src = fetchFromGitHub { owner = "python-visualization"; repo = "branca"; tag = "v${version}"; - hash = "sha256-Gnr3ONqWpUNOGiOlyq77d9PxcDT8TjqTHYBGxH+V+xc="; + hash = "sha256-H5hHQI4r0QavygQZzEZAEp+cjra5R9m/OoGHQPtnBg0="; }; postPatch = '' @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = { description = "Generate complex HTML+JS pages with Python"; homepage = "https://github.com/python-visualization/branca"; - changelog = "https://github.com/python-visualization/branca/blob/v${version}/CHANGES.txt"; + changelog = "https://github.com/python-visualization/branca/blob/${src.tag}/CHANGES.txt"; license = with lib.licenses; [ mit ]; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/breezy/Cargo.lock b/pkgs/development/python-modules/breezy/Cargo.lock index db5dbd76c7e8..ed1c97617aad 100644 --- a/pkgs/development/python-modules/breezy/Cargo.lock +++ b/pkgs/development/python-modules/breezy/Cargo.lock @@ -4,44 +4,26 @@ version = 4 [[package]] name = "aho-corasick" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" dependencies = [ "memchr", ] -[[package]] -name = "autocfg" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" - [[package]] name = "breezy" -version = "3.3.12" +version = "3.3.21" dependencies = [ "pyo3", ] -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - [[package]] name = "heck" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "indoc" -version = "2.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd" - [[package]] name = "lazy_static" version = "1.5.0" @@ -50,24 +32,15 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.172" +version = "0.2.182" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" +checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112" [[package]] name = "memchr" -version = "2.7.4" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] +checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" [[package]] name = "once_cell" @@ -77,52 +50,47 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "portable-atomic" -version = "1.11.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" +checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" [[package]] name = "proc-macro2" -version = "1.0.95" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" +checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.23.5" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7778bffd85cf38175ac1f545509665d0b9b92a198ca7941f131f85f7a4f9a872" +checksum = "cf85e27e86080aafd5a22eae58a162e133a589551542b3e5cee4beb27e54f8e1" dependencies = [ - "cfg-if", - "indoc", "libc", - "memoffset", "once_cell", "portable-atomic", "pyo3-build-config", "pyo3-ffi", "pyo3-macros", - "unindent", ] [[package]] name = "pyo3-build-config" -version = "0.23.5" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94f6cbe86ef3bf18998d9df6e0f3fc1050a8c5efa409bf712e661a4366e010fb" +checksum = "8bf94ee265674bf76c09fa430b0e99c26e319c945d96ca0d5a8215f31bf81cf7" dependencies = [ - "once_cell", "target-lexicon", ] [[package]] name = "pyo3-ffi" -version = "0.23.5" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9f1b4c431c0bb1c8fb0a338709859eed0d030ff6daa34368d3b152a63dfdd8d" +checksum = "491aa5fc66d8059dd44a75f4580a2962c1862a1c2945359db36f6c2818b748dc" dependencies = [ "libc", "pyo3-build-config", @@ -130,9 +98,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.23.5" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc2201328f63c4710f68abdf653c89d8dbc2858b88c5d88b0ff38a75288a9da" +checksum = "f5d671734e9d7a43449f8480f8b38115df67bef8d21f76837fa75ee7aaa5e52e" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -142,9 +110,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.23.5" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fca6726ad0f3da9c9de093d6f116a93c1a38e417ed73bf138472cf4064f72028" +checksum = "22faaa1ce6c430a1f71658760497291065e6450d7b5dc2bcf254d49f66ee700a" dependencies = [ "heck", "proc-macro2", @@ -155,18 +123,18 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.40" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4" dependencies = [ "proc-macro2", ] [[package]] name = "regex" -version = "1.11.1" +version = "1.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276" dependencies = [ "aho-corasick", "memchr", @@ -176,9 +144,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.9" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" dependencies = [ "aho-corasick", "memchr", @@ -187,13 +155,13 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.5" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" +checksum = "a96887878f22d7bad8a3b6dc5b7440e0ada9a245242924394987b21cf2210a4c" [[package]] name = "rio-py" -version = "3.3.12" +version = "3.3.21" dependencies = [ "lazy_static", "pyo3", @@ -202,9 +170,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.101" +version = "2.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" +checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" dependencies = [ "proc-macro2", "quote", @@ -213,18 +181,12 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.16" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" +checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca" [[package]] name = "unicode-ident" -version = "1.0.18" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" - -[[package]] -name = "unindent" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3" +checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" diff --git a/pkgs/development/python-modules/breezy/default.nix b/pkgs/development/python-modules/breezy/default.nix index 09d0e29caa07..a02f3d322980 100644 --- a/pkgs/development/python-modules/breezy/default.nix +++ b/pkgs/development/python-modules/breezy/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "breezy"; - version = "3.3.12"; + version = "3.3.21"; pyproject = true; src = fetchFromGitHub { owner = "breezy-team"; repo = "breezy"; - rev = "brz-${version}"; - hash = "sha256-V/SnzpslFGjISg+YxViFa+Lpnn0+9enPA3xmvwfXnUM="; + tag = "brz-${version}"; + hash = "sha256-S8YHFEWiSnkBFO75jMuEcvVZSnoV9SGCH/Ueodq2zow="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; @@ -46,18 +46,21 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - cython installShellFiles rustPlatform.cargoSetupHook cargo rustc - setuptools-gettext - setuptools-rust ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; - propagatedBuildInputs = [ + build-system = [ + cython + setuptools-gettext + setuptools-rust + ]; + + dependencies = [ configobj dulwich fastbencode @@ -114,8 +117,8 @@ buildPythonPackage rec { meta = { description = "Friendly distributed version control system"; homepage = "https://www.breezy-vcs.org/"; - changelog = "https://github.com/breezy-team/breezy/blob/${src.rev}/doc/en/release-notes/brz-${lib.versions.majorMinor version}.txt"; - license = lib.licenses.gpl2Only; + changelog = "https://github.com/breezy-team/breezy/blob/${src.tag}/doc/en/release-notes/brz-${lib.versions.majorMinor version}.txt"; + license = lib.licenses.gpl2Plus; maintainers = [ ]; mainProgram = "brz"; }; diff --git a/pkgs/development/python-modules/brian2/default.nix b/pkgs/development/python-modules/brian2/default.nix index 438e77c117c2..033afe488b06 100644 --- a/pkgs/development/python-modules/brian2/default.nix +++ b/pkgs/development/python-modules/brian2/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "brian2"; - version = "2.9.0"; + version = "2.10.1"; pyproject = true; # https://github.com/python/cpython/issues/117692 @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-5N3uwcwj83VC49BnrOoncGI8Jk+97RRMptehtsw8o5c="; + hash = "sha256-wdIdewkhkjYkGddvyHH+q5/wuz0A6SZdjNQIbMLhG08="; }; patches = [ diff --git a/pkgs/development/python-modules/bubop/default.nix b/pkgs/development/python-modules/bubop/default.nix index ac3388b38dac..6cf70dc32448 100644 --- a/pkgs/development/python-modules/bubop/default.nix +++ b/pkgs/development/python-modules/bubop/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "bubop"; - version = "0.1.12"; + version = "0.2.3"; pyproject = true; src = fetchFromGitHub { owner = "bergercookie"; repo = "bubop"; - rev = "v${version}"; - hash = "sha256-p4Mv73oX5bsYKby7l0nGon89KyAMIUhDAEKSTNB++Cw="; + tag = "v${version}"; + hash = "sha256-NXA3UDOkCoj4dm3UO/X0w2Mpx4bw3yFO6oyOzsPgtrU="; }; postPatch = '' @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = { description = "Bergercookie's Useful Bits Of Python; helper libraries for Bergercookie's programs"; homepage = "https://github.com/bergercookie/bubop"; - changelog = "https://github.com/bergercookie/bubop/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/bergercookie/bubop/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ raitobezarius ]; }; diff --git a/pkgs/development/python-modules/bugwarrior/default.nix b/pkgs/development/python-modules/bugwarrior/default.nix index 308f66c73e7c..f0b46945ddb4 100644 --- a/pkgs/development/python-modules/bugwarrior/default.nix +++ b/pkgs/development/python-modules/bugwarrior/default.nix @@ -34,7 +34,6 @@ # tests docutils, - pytest-subtests, pytestCheckHook, responses, sphinx, @@ -85,7 +84,6 @@ buildPythonPackage (finalAttrs: { nativeCheckInputs = [ docutils - pytest-subtests pytestCheckHook responses sphinx diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix index ca49dc3d76db..01145766af4d 100644 --- a/pkgs/development/python-modules/build/default.nix +++ b/pkgs/development/python-modules/build/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "build"; - version = "1.3.0"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "pypa"; repo = "build"; tag = version; - hash = "sha256-w2YKQzni8e6rpnQJH2J0bHzRigjWOlWiI8Po5d3ZqS8="; + hash = "sha256-otaAFL87o+1YB5/ar2rlOpDjFCWOKs+gfqZImuWH8IA="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/bumble/default.nix b/pkgs/development/python-modules/bumble/default.nix index 005f6317713f..8235e54a6541 100644 --- a/pkgs/development/python-modules/bumble/default.nix +++ b/pkgs/development/python-modules/bumble/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "bumble"; - version = "0.0.221"; + version = "0.0.223"; pyproject = true; src = fetchFromGitHub { owner = "google"; repo = "bumble"; tag = "v${version}"; - hash = "sha256-GCcvbYLHChvrsQuhFjeYnncjrzFqOlmL+LlG7t2iAkE="; + hash = "sha256-Iei2RBk7Tpb8yeTKdtftJfbG3DwuGjvBZuhhs+nMKcU="; }; build-system = [ @@ -45,6 +45,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "libusb-package" + "tomli" ]; dependencies = [ diff --git a/pkgs/development/python-modules/bundlewrap/default.nix b/pkgs/development/python-modules/bundlewrap/default.nix index 70cd0c90cf46..14b3f5ab212e 100644 --- a/pkgs/development/python-modules/bundlewrap/default.nix +++ b/pkgs/development/python-modules/bundlewrap/default.nix @@ -2,6 +2,7 @@ lib, fetchFromGitHub, buildPythonPackage, + bcrypt, cryptography, jinja2, librouteros, @@ -16,23 +17,22 @@ versionCheckHook, }: -let - version = "4.23.1"; -in -buildPythonPackage { +buildPythonPackage (finalAttrs: { pname = "bundlewrap"; - inherit version; + version = "4.24.0"; pyproject = true; src = fetchFromGitHub { owner = "bundlewrap"; repo = "bundlewrap"; - tag = version; - hash = "sha256-Nzfx2L/FlYXQcbKq/cuRZ+PWnjv4HDld9q01nwQ1sA8="; + tag = finalAttrs.version; + hash = "sha256-ayLceqYZC4cNuz9C6v2+W2TuiGWQeLMssbvwZ0N0n78="; }; build-system = [ setuptools ]; + dependencies = [ + bcrypt cryptography jinja2 mako @@ -60,9 +60,9 @@ buildPythonPackage { meta = { homepage = "https://bundlewrap.org/"; description = "Easy, Concise and Decentralized Config management with Python"; - changelog = "https://github.com/bundlewrap/bundlewrap/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/bundlewrap/bundlewrap/blob/${finalAttrs.src.tag}/CHANGELOG.md"; mainProgram = "bw"; license = [ lib.licenses.gpl3 ]; maintainers = with lib.maintainers; [ wamserma ]; }; -} +}) diff --git a/pkgs/development/python-modules/bx-py-utils/default.nix b/pkgs/development/python-modules/bx-py-utils/default.nix index 6553e788bd59..9eb7bd90ac64 100644 --- a/pkgs/development/python-modules/bx-py-utils/default.nix +++ b/pkgs/development/python-modules/bx-py-utils/default.nix @@ -74,6 +74,8 @@ buildPythonPackage rec { "test_assert_html_snapshot_by_css_selector" # test accesses the internet "test_happy_path" + # cli_base module not found + "test_doctests" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/cachecontrol/default.nix b/pkgs/development/python-modules/cachecontrol/default.nix index c25d7f157eed..d0dfe72e90c1 100644 --- a/pkgs/development/python-modules/cachecontrol/default.nix +++ b/pkgs/development/python-modules/cachecontrol/default.nix @@ -25,6 +25,11 @@ buildPythonPackage rec { hash = "sha256-627SqJocVOO0AfI8vswPqOr15MA/Lx7RLAdRAXzWu84="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "uv_build>=0.9.6,<0.10.0" uv_build + ''; + build-system = [ uv-build ]; dependencies = [ diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index 73920987827c..cfb384d074e3 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "cachetools"; - version = "6.2.2"; + version = "6.2.4"; pyproject = true; src = fetchFromGitHub { owner = "tkem"; repo = "cachetools"; tag = "v${version}"; - hash = "sha256-seoyqkrRQpRiMd5GTEvenjirn173Hq40Zuk1u7TvMPI="; + hash = "sha256-LlDyrjiRYCD9btDl5NA0Seb3jk3hlpNhwu0jAQp9YZE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/cadwyn/default.nix b/pkgs/development/python-modules/cadwyn/default.nix index 34fc2f74030e..fcf64ad1879d 100644 --- a/pkgs/development/python-modules/cadwyn/default.nix +++ b/pkgs/development/python-modules/cadwyn/default.nix @@ -25,16 +25,16 @@ pythonAtLeast, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cadwyn"; - version = "5.6.1"; - format = "pyproject"; + version = "6.0.1"; + pyproject = true; src = fetchFromGitHub { owner = "zmievsa"; repo = "cadwyn"; - tag = version; - hash = "sha256-VVi79c/Y1mu520H/7gy9lGdBIVuKsYedU49P501NQao="; + tag = finalAttrs.version; + hash = "sha256-wvwR4JCPvWoWSdkK61oDmQWNq2UnDZMRlWxo1GLznjk="; }; disabled = pythonAtLeast "3.14"; @@ -69,8 +69,8 @@ buildPythonPackage rec { meta = { description = "Production-ready community-driven modern Stripe-like API versioning in FastAPI"; homepage = "https://github.com/zmievsa/cadwyn"; - changelog = "https://github.com/zmievsa/cadwyn/releases/tag/${version}"; + changelog = "https://github.com/zmievsa/cadwyn/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ taranarmo ]; }; -} +}) diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix index 9db0bc009f54..48fe9f81e0ba 100644 --- a/pkgs/development/python-modules/caldav/default.nix +++ b/pkgs/development/python-modules/caldav/default.nix @@ -11,7 +11,7 @@ python, radicale, recurring-ical-events, - requests, + niquests, hatchling, hatch-vcs, proxy-py, @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "caldav"; - version = "2.2.1"; + version = "2.2.3"; pyproject = true; src = fetchFromGitHub { owner = "python-caldav"; repo = "caldav"; tag = "v${version}"; - hash = "sha256-FsIF4BcwAUyYw8J7o4j4CnSd8eIc1Yd5WtxErC6RZ7Y="; + hash = "sha256-v+r52YBrtE/FgUxOQoN0uLDmDOjJM7OvKQE1vZ49F+A="; }; build-system = [ @@ -43,7 +43,7 @@ buildPythonPackage rec { dependencies = [ dnspython lxml - requests + niquests icalendar icalendar-searcher recurring-ical-events diff --git a/pkgs/development/python-modules/causal-conv1d/default.nix b/pkgs/development/python-modules/causal-conv1d/default.nix index e2dd6730c877..4c447c06055a 100644 --- a/pkgs/development/python-modules/causal-conv1d/default.nix +++ b/pkgs/development/python-modules/causal-conv1d/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "causal-conv1d"; - version = "1.5.4"; + version = "1.6.0"; pyproject = true; src = fetchFromGitHub { owner = "Dao-AILab"; repo = "causal-conv1d"; tag = "v${version}"; - hash = "sha256-ELuvnKP2g1I2SuaWWiibXh/oDzp4n0vXkm4oeNPOdIw="; + hash = "sha256-hFaF/oMdScDpdq+zq8WppWe9GONWppEEx2pIcnaALiI="; }; build-system = [ diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index 237b721e8c1f..2d64160724b3 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "cbor2"; - version = "5.7.0"; + version = "5.8.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-P22EP0200OxQHEZFPCKk++uxq/tbdA4byrNMYVzXQGs="; + hash = "sha256-sZw1/K6WiKwB73W61dsnMAwlN+tO4A7QfgXYRWoNSTE="; }; build-system = [ diff --git a/pkgs/development/python-modules/celery-types/default.nix b/pkgs/development/python-modules/celery-types/default.nix index 193c6a71df97..c43b14fd2181 100644 --- a/pkgs/development/python-modules/celery-types/default.nix +++ b/pkgs/development/python-modules/celery-types/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "celery-types"; - version = "0.23.0"; + version = "0.24.0"; pyproject = true; src = fetchPypi { pname = "celery_types"; inherit version; - hash = "sha256-QC7QVVrqPNXh5iSPRjLk8Y7sjtskNRc/nm3AhEn6EB4="; + hash = "sha256-yT+80LBKnpwvVdVUCspKoepMwGqHDAyN7lBi/dWWY/4="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index cfc3c05a0808..d7d579b59b70 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -23,7 +23,6 @@ pydantic, pytest-celery, pytest-click, - pytest-subtests, pytest-timeout, pytest-xdist, pytestCheckHook, @@ -92,7 +91,6 @@ buildPythonPackage rec { moto pytest-celery pytest-click - pytest-subtests pytest-timeout pytest-xdist pytestCheckHook @@ -122,6 +120,10 @@ buildPythonPackage rec { "test_itercapture_limit" "test_stamping_headers_in_options" "test_stamping_with_replace" + # pymongo api compat + # TypeError: InvalidDocument.__init__() missing 1 required positional argumen... + "test_store_result" + "test_store_result_with_request" # Celery tries to look up group ID (e.g. 30000) # which does not reliably succeed in the sandbox on linux, diff --git a/pkgs/development/python-modules/cert-chain-resolver/default.nix b/pkgs/development/python-modules/cert-chain-resolver/default.nix index a87b05763c62..91da4c22f15d 100644 --- a/pkgs/development/python-modules/cert-chain-resolver/default.nix +++ b/pkgs/development/python-modules/cert-chain-resolver/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "cert-chain-resolver"; - version = "1.1.0"; + version = "1.4.1"; format = "setuptools"; src = fetchFromGitHub { owner = "rkoopmans"; repo = "python-certificate-chain-resolver"; tag = version; - hash = "sha256-2itpu/Ap5GNnqAiw3Cp+8rndreWlwfPd+WwM99G7U2E="; + hash = "sha256-DWE+mR7EO5ohuRAR0WC40GBY7HpwXIpU0hhVUnWNRno="; }; propagatedBuildInputs = [ cryptography ]; @@ -40,7 +40,7 @@ buildPythonPackage rec { description = "Resolve / obtain the certificate intermediates of a x509 certificate"; mainProgram = "cert-chain-resolver"; homepage = "https://github.com/rkoopmans/python-certificate-chain-resolver"; - changelog = "https://github.com/rkoopmans/python-certificate-chain-resolver/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/rkoopmans/python-certificate-chain-resolver/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ veehaitch ]; }; diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index fd65dcc1929f..0619d03bfe91 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -5,6 +5,7 @@ python, runCommand, fetchFromGitHub, + fetchpatch, configargparse, acme, configobj, @@ -24,16 +25,24 @@ buildPythonPackage rec { pname = "certbot"; - version = "5.1.0"; + version = "5.2.2"; pyproject = true; src = fetchFromGitHub { owner = "certbot"; repo = "certbot"; tag = "v${version}"; - hash = "sha256-jKhdclLBeWv6IxIZQtD8VWbSQ3SDZePA/kTxjiBXJ4o="; + hash = "sha256-+LQX845Qw/T+kR846bNu9xTJ0zcL76rtp48e/Cgu6Vk="; }; + patches = [ + (fetchpatch { + name = "fix-test_rollback_too_many.patch"; + url = "https://github.com/certbot/certbot/commit/4c61a450d4a843c66baab6d5d9a42ce0554e99d7.patch"; + hash = "sha256-PSh2JXoEWNUrqxNh8X5QchyIP8KRHT60T/cLax6VRWo="; + }) + ]; + postPatch = "cd certbot"; # using sourceRoot would interfere with patches build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix index 3f9b916eb949..94ef983a6a8e 100644 --- a/pkgs/development/python-modules/certifi/default.nix +++ b/pkgs/development/python-modules/certifi/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "certifi"; - version = "2025.07.14"; + version = "2026.01.04"; pyproject = true; src = fetchFromGitHub { owner = "certifi"; repo = "python-certifi"; rev = version; - hash = "sha256-TSqBca42i7i59ERTrnPN0fLdLWToYMCq5cfFFsgZm5U="; + hash = "sha256-JXv12im46xKabIRVZ4FMSZUbpw2k8WCcaZZLX2pFteY="; }; patches = [ diff --git a/pkgs/development/python-modules/certifi/env.patch b/pkgs/development/python-modules/certifi/env.patch index 332087802b1a..2577cba63c72 100644 --- a/pkgs/development/python-modules/certifi/env.patch +++ b/pkgs/development/python-modules/certifi/env.patch @@ -1,5 +1,5 @@ diff --git a/certifi/core.py b/certifi/core.py -index 1c9661c..7039be3 100644 +index 1c9661c..d904382 100644 --- a/certifi/core.py +++ b/certifi/core.py @@ -4,6 +4,7 @@ certifi.py @@ -51,3 +51,11 @@ index 1c9661c..7039be3 100644 def where() -> str: # This is slightly terrible, but we want to delay extracting the +@@ -80,4 +92,6 @@ else: + return _CACERT_PATH + + def contents() -> str: +- return read_text("certifi", "cacert.pem", encoding="ascii") ++ if _CACERT_PATH is not None: ++ return open(_CACERT_PATH, encoding="utf-8").read() ++ return read_text("certifi", "cacert.pem", encoding="utf-8") diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 0c837d51ffce..8be0bfc0872d 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -33,6 +33,15 @@ buildPythonPackage rec { doCheck = !(stdenv.hostPlatform.isMusl || stdenv.hostPlatform.useLLVM or false); + disabledTests = [ + # parse errror + "test_dont_remove_comment_in_line_directives" + "test_multiple_line_directives" + "test_commented_line_directive" + # exception mismatch + "test_unknown_name" + ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = { diff --git a/pkgs/development/python-modules/cflib/default.nix b/pkgs/development/python-modules/cflib/default.nix index b5a8ec105851..ec7fa149f29b 100644 --- a/pkgs/development/python-modules/cflib/default.nix +++ b/pkgs/development/python-modules/cflib/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "cflib"; - version = "0.1.28"; + version = "0.1.31"; pyproject = true; src = fetchFromGitHub { owner = "bitcraze"; repo = "crazyflie-lib-python"; tag = version; - hash = "sha256-vGqwQVD80NcFJosVAmqj66uxYNoVtAqzVhVQiuWP5yM="; + hash = "sha256-PYAkN52dx1qeRKoe5FwpKj1A4oJNYb7Dx8vko9Pwspw="; }; strictDeps = true; @@ -85,7 +85,7 @@ buildPythonPackage rec { meta = { description = "Python library for the Crazyflie quadcopter by Bitcraze"; homepage = "https://github.com/bitcraze/crazyflie-lib-python"; - changelog = "https://github.com/bitcraze/crazyflie-lib-python/releases/tag/${version}"; + changelog = "https://github.com/bitcraze/crazyflie-lib-python/releases/tag/${src.tag}"; license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.brianmcgillion ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index 0dc9f9919f0f..db06eac38155 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "1.41.0"; + version = "1.43.3"; pyproject = true; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = "cfn-lint"; tag = "v${version}"; - hash = "sha256-AudCeFMbCQucANLLAknCKC7gzi0vvFh9c9k7ll0a1MM="; + hash = "sha256-tolQ7O6J/pfmtw29t8SGBDEDGiTOsJdc/mI3ulUseKo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix index f161a45e2b84..c585dbff2afc 100644 --- a/pkgs/development/python-modules/cftime/default.nix +++ b/pkgs/development/python-modules/cftime/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "cftime"; - version = "1.6.4.post1"; + version = "1.6.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-UKx2zJ8Qq3vUbkSnHFGmknBRtJm0QH308pqxPXQblC8="; + hash = "sha256-giX+1rm0P7h2g+urUhMEUPwXMAERUNMJIJapDlTR6B4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/character-encoding-utils/default.nix b/pkgs/development/python-modules/character-encoding-utils/default.nix index 11e689505675..ff423f185c5c 100644 --- a/pkgs/development/python-modules/character-encoding-utils/default.nix +++ b/pkgs/development/python-modules/character-encoding-utils/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "character-encoding-utils"; - version = "0.0.9"; + version = "0.0.12"; pyproject = true; src = fetchPypi { pname = "character_encoding_utils"; inherit version; - hash = "sha256-QxnXNerl7qncoBxhfC3G0ar+YprfBpn6pWnUKakNR+c="; + hash = "sha256-sOXdpO7c2EpbNbJK1WIYx/Xb5UGIMW8daw154V/NpU0="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/charset-normalizer/default.nix b/pkgs/development/python-modules/charset-normalizer/default.nix index e5df64dc15a8..577e1f3d105f 100644 --- a/pkgs/development/python-modules/charset-normalizer/default.nix +++ b/pkgs/development/python-modules/charset-normalizer/default.nix @@ -22,6 +22,11 @@ buildPythonPackage rec { hash = "sha256-MtSBKG8bXUsgEPyXxMRBPPFI8mfuIETy6UVshe7yqGg="; }; + postPatch = '' + substituteInPlace _mypyc_hook/backend.py \ + --replace-fail "mypy>=1.4.1,<=1.18.2" "mypy" + ''; + build-system = [ setuptools ] diff --git a/pkgs/development/python-modules/chatlas/default.nix b/pkgs/development/python-modules/chatlas/default.nix index 423c8f6d9891..be3153e0eed1 100644 --- a/pkgs/development/python-modules/chatlas/default.nix +++ b/pkgs/development/python-modules/chatlas/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "chatlas"; - version = "0.13.2"; + version = "0.15.0"; pyproject = true; src = fetchFromGitHub { owner = "posit-dev"; repo = "chatlas"; tag = "v${version}"; - hash = "sha256-uCgpNvDJZKwxX4HYF8tyvJ1AiQLmybuxrZkYK/u5xlg="; + hash = "sha256-+muekY7WhnVFmZXWS4MuZO9ttEXfqx9mPw1t/1CSsmc="; }; build-system = [ diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 6f16c89beb18..610c7a1a5ba5 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -13,34 +13,27 @@ requests, requests-toolbelt, requests-unixsocket, + setuptools, setuptools-scm, six, }: buildPythonPackage rec { pname = "cheroot"; - version = "10.0.1"; - format = "setuptools"; + version = "11.1.2"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-4LgveXZY0muGE+yOtWPDsI5r1qeSHp1Qib0Rda0bF0A="; + hash = "sha256-v7cMSWY/Y7BEDytU28aw0WUOVt/k4mQfWbLG9ye0Sso="; }; - # remove setuptools-scm-git-archive dependency - # https://github.com/cherrypy/cheroot/commit/f0c51af263e20f332c6f675aa90ec6705ae4f5d1 - # there is a difference between the github source and the pypi tarball source, - # and it is not easy to apply patches. - postPatch = '' - substituteInPlace pyproject.toml \ - --replace '"setuptools_scm_git_archive>=1.1",' "" - substituteInPlace setup.cfg \ - --replace "setuptools_scm_git_archive>=1.0" "" - ''; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; - nativeBuildInputs = [ setuptools-scm ]; - - propagatedBuildInputs = [ + dependencies = [ jaraco-functools more-itertools six diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 177890be001b..1e6254e9a9d4 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -80,6 +80,8 @@ buildPythonPackage rec { "test_basic_request" "test_3_Redirect" "test_4_File_deletion" + # excepts a tcp reset for the 16th connection, but doesn't get it + "test_queue_full" ] ++ lib.optionals (pythonAtLeast "3.11") [ "testErrorHandling" diff --git a/pkgs/development/python-modules/ciscoconfparse2/default.nix b/pkgs/development/python-modules/ciscoconfparse2/default.nix index 731c78292b68..28db627d6e4c 100644 --- a/pkgs/development/python-modules/ciscoconfparse2/default.nix +++ b/pkgs/development/python-modules/ciscoconfparse2/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "ciscoconfparse2"; - version = "0.8.29"; + version = "0.9.4"; pyproject = true; src = fetchFromGitHub { owner = "mpenning"; repo = "ciscoconfparse2"; tag = version; - hash = "sha256-Dvryv3VPdyRuvIPksEnSlKnCJU70j2xd2aWpwXUGbUY="; + hash = "sha256-o96f1tlP3/gbdy6Ix8A9wDXXG9xxi05S9+NdUBHN0WA="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/ckcc-protocol/default.nix b/pkgs/development/python-modules/ckcc-protocol/default.nix index dc4d589327c7..7c2aeed1df75 100644 --- a/pkgs/development/python-modules/ckcc-protocol/default.nix +++ b/pkgs/development/python-modules/ckcc-protocol/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "ckcc-protocol"; - version = "1.4.0"; + version = "1.5.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-zZPU0+MwjqRYCqa+W0YTqCZv2WsMwa9R5xaN7ye77OU="; + hash = "sha256-Sdb30OtBOn2Txfh9N86yY1JAIxjkwL7/NB+fA8RI10w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix index 0e33c8e51500..3219f1cb3fc4 100644 --- a/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "11.9.8"; + version = "12.0.6"; pyproject = true; src = fetchFromGitHub { owner = "Clarifai"; repo = "clarifai-python-grpc"; tag = version; - hash = "sha256-eLX5wokrLH+YqrRp6Oug82a16w0sFMUClz6tQ8dDc1Q="; + hash = "sha256-P+L9sObNYCdjYgpgWVf7Mbr3bCbYzgTypXmoxc4CC3U="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix index ccd597174f1c..8080c240dba5 100644 --- a/pkgs/development/python-modules/clarifai/default.nix +++ b/pkgs/development/python-modules/clarifai/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "clarifai"; - version = "11.9.0"; + version = "12.1.4"; pyproject = true; src = fetchFromGitHub { owner = "Clarifai"; repo = "clarifai-python"; tag = version; - hash = "sha256-LTBAexfexeZ/Woe2GMaIArGy/ufFkgPdkstzSKCkYIU="; + hash = "sha256-+iIOAji6xDyGTZTE/DgRguYhgWYM1FS8+SIlPcmNpNo="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 2aa1a7708dad..e48bc9bfa047 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.154"; + version = "9.2.193"; pyproject = true; src = fetchFromGitHub { owner = "angr"; repo = "claripy"; tag = "v${version}"; - hash = "sha256-90JX+VDWK/yKhuX6D8hbLxjIOS8vGKrN1PKR8iWjt2o="; + hash = "sha256-nZ7ORbhi0R79pcHpkx/lRVdfUsoutCqU+zHX8AICTUE="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail diff --git a/pkgs/development/python-modules/clickhouse-cityhash/default.nix b/pkgs/development/python-modules/clickhouse-cityhash/default.nix index e2f1f567b436..a34f16c53378 100644 --- a/pkgs/development/python-modules/clickhouse-cityhash/default.nix +++ b/pkgs/development/python-modules/clickhouse-cityhash/default.nix @@ -9,12 +9,13 @@ buildPythonPackage rec { pname = "clickhouse-cityhash"; - version = "1.0.2.4"; + version = "1.0.2.5"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-ezEl19CqE8LMTnWDqWWmv7CqlqEhMUdbRCVSustV9Pg="; + inherit version; + pname = "clickhouse_cityhash"; + hash = "sha256-T5jvgbIfDU2tWCR76kC6/AmM9v+g7eaZiC1KQurD7Xk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/clickhouse-connect/default.nix b/pkgs/development/python-modules/clickhouse-connect/default.nix index 340bcca85bdd..cbd64f2de076 100644 --- a/pkgs/development/python-modules/clickhouse-connect/default.nix +++ b/pkgs/development/python-modules/clickhouse-connect/default.nix @@ -23,7 +23,7 @@ }: buildPythonPackage rec { pname = "clickhouse-connect"; - version = "0.8.18"; + version = "0.10.0"; format = "setuptools"; @@ -31,7 +31,7 @@ buildPythonPackage rec { repo = "clickhouse-connect"; owner = "ClickHouse"; tag = "v${version}"; - hash = "sha256-lU35s8hldexyH8YC942r+sYm5gZCWqO2GXW0qtTTWWY="; + hash = "sha256-D2D0sOFb0gcbLfMigYn0/GrT8zJav2Q6T39dONLxui4="; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/clifford/default.nix b/pkgs/development/python-modules/clifford/default.nix index 576cc7e331f0..64e5eb7ab60e 100644 --- a/pkgs/development/python-modules/clifford/default.nix +++ b/pkgs/development/python-modules/clifford/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "clifford"; - version = "1.4.0"; + version = "1.5.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-eVE8FrD0YHoRreY9CrNb8v4v4KrG83ZU0oFz+V+p+Q0="; + hash = "sha256-NISzEs/w4tXhT7mUCbgkIZPDWN+qave8bqIwxGBuZvM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/cloudsmith-api/default.nix b/pkgs/development/python-modules/cloudsmith-api/default.nix index 736f99478936..5bb864e215f0 100644 --- a/pkgs/development/python-modules/cloudsmith-api/default.nix +++ b/pkgs/development/python-modules/cloudsmith-api/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "cloudsmith-api"; - version = "2.0.22"; + version = "2.0.23"; format = "wheel"; src = fetchPypi { pname = "cloudsmith_api"; inherit format version; - hash = "sha256-FZcDjrK5+oHC3dVBSXf+txW6hofP6OkmkjO4NJF05YQ="; + hash = "sha256-CfNgISONtTrabCoNUzHbMMVKDwGj8fdmSwh1FfzH10g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cmarkgfm/default.nix b/pkgs/development/python-modules/cmarkgfm/default.nix index b5d5e556183d..f722d8dd5f3a 100644 --- a/pkgs/development/python-modules/cmarkgfm/default.nix +++ b/pkgs/development/python-modules/cmarkgfm/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "cmarkgfm"; - version = "2024.11.20"; + version = "2025.10.22"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-XdAc9hl1qKVyE83vXthw6TYDLxP+k9YN32Wf+5z3PGo="; + hash = "sha256-W+xhAHtluRlIhELIOMWKbIv0dB9RA8WTsu8YDTmBjto="; }; propagatedNativeBuildInputs = [ cffi ]; diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 2bf3c917838c..a8716b17f91d 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -12,16 +12,21 @@ rich-argparse, setuptools-scm, wcwidth, + python, }: buildPythonPackage rec { pname = "cmd2"; - version = "2.7.0"; + version = if python.isPy313 then "3.1.0" else "3.2.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-gdgTW0YhDh0DpagQuvhZBppiIUeIzu7DWI9E7thvvus="; + hash = + if python.isPy313 then + "sha256-zOOuzgGLCxBVmIraoraHrJwd84v9Kr/Cnb61GpcH3jM=" + else + "sha256-bGNyobJs0Uu2IJZTyJ1zAP58FDno3KMPW2tv/bXyFPo="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/coal/default.nix b/pkgs/development/python-modules/coal/default.nix index 28a7e1642d4f..30bd354bbdcc 100644 --- a/pkgs/development/python-modules/coal/default.nix +++ b/pkgs/development/python-modules/coal/default.nix @@ -17,6 +17,17 @@ toPythonModule ( coal.overrideAttrs (super: { pname = "py-${super.pname}"; + # Finding `boost_system` fails because the stub compiled library of + # Boost.System, which has been a header-only library since 1.69, was + # removed in 1.89. + # See https://www.boost.org/releases/1.89.0/ for details. + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail \ + "find_package(Boost REQUIRED COMPONENTS system)" \ + "find_package(Boost REQUIRED OPTIONAL_COMPONENTS system)" + ''; + cmakeFlags = super.cmakeFlags ++ [ (lib.cmakeBool "BUILD_PYTHON_INTERFACE" true) (lib.cmakeBool "BUILD_STANDALONE_PYTHON_INTERFACE" buildStandalone) diff --git a/pkgs/development/python-modules/coconut/default.nix b/pkgs/development/python-modules/coconut/default.nix index fa4027beaeef..9c4ec711bd56 100644 --- a/pkgs/development/python-modules/coconut/default.nix +++ b/pkgs/development/python-modules/coconut/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "coconut"; - version = "3.1.2"; + version = "3.2.0"; pyproject = true; src = fetchFromGitHub { owner = "evhub"; repo = "coconut"; tag = "v${version}"; - hash = "sha256-Vd6ZY3PlbPOy63/0/0YJ1U2PpsVdctOoInyKftj//cM="; + hash = "sha256-3L5n0nOE8NMXw2tPWjxDCWnHH94yecdnjQ+GBsxt08c="; }; disabled = pythonAtLeast "3.13"; @@ -59,7 +59,7 @@ buildPythonPackage rec { meta = { description = "Simple, elegant, Pythonic functional programming"; homepage = "http://coconut-lang.org/"; - changelog = "https://github.com/evhub/coconut/releases/tag/v${version}"; + changelog = "https://github.com/evhub/coconut/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fabianhjr ]; }; diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix index 55a37b4ff4cb..92d42937d813 100644 --- a/pkgs/development/python-modules/coffea/default.nix +++ b/pkgs/development/python-modules/coffea/default.nix @@ -44,14 +44,14 @@ buildPythonPackage rec { pname = "coffea"; - version = "2025.11.0"; + version = "2025.12.0"; pyproject = true; src = fetchFromGitHub { owner = "CoffeaTeam"; repo = "coffea"; tag = "v${version}"; - hash = "sha256-vv1eHb8vt4nxdnpLmE0J5g/3oYmcoIykKCuOcQoxA60="; + hash = "sha256-+Qfb5NHJTlSBUqyv+n3zebEwAZPB9+UMV5KiQhOxJSY="; }; build-system = [ diff --git a/pkgs/development/python-modules/cogapp/default.nix b/pkgs/development/python-modules/cogapp/default.nix index bd737273ca99..84eeceeeb9c9 100644 --- a/pkgs/development/python-modules/cogapp/default.nix +++ b/pkgs/development/python-modules/cogapp/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = { description = "Code generator for executing Python snippets in source files"; homepage = "https://nedbatchelder.com/code/cog"; - changelog = "https://github.com/nedbat/cog/blob/v${version}/CHANGELOG.rst"; + changelog = "https://github.com/nedbat/cog/blob/${src.tag}/CHANGELOG.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ lovek323 ]; }; diff --git a/pkgs/development/python-modules/colcon-cargo/default.nix b/pkgs/development/python-modules/colcon-cargo/default.nix index 00fb36c784bf..5311c5ce8196 100644 --- a/pkgs/development/python-modules/colcon-cargo/default.nix +++ b/pkgs/development/python-modules/colcon-cargo/default.nix @@ -13,14 +13,14 @@ }: buildPythonPackage rec { pname = "colcon-cargo"; - version = "0.1.3"; + version = "0.2.0"; pyproject = true; src = fetchFromGitHub { owner = "colcon"; repo = "colcon-cargo"; tag = version; - hash = "sha256-Do8i/Z1nn8wsj0xzCQdSaaXoDf9N34SiMb/GIe4YOs4="; + hash = "sha256-jhc5mN4jnLk2zLj01sBm63acrku/FIexnIWCQ6GKDKA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/columnize/default.nix b/pkgs/development/python-modules/columnize/default.nix index 60ea54eceb94..063baae35f3f 100644 --- a/pkgs/development/python-modules/columnize/default.nix +++ b/pkgs/development/python-modules/columnize/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "columnize"; - version = "0.3.11"; + version = "3.11"; pyproject = true; # 3.11 is the git tag for the 0.3.11 version @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rocky"; repo = "pycolumnize"; - tag = "3.11"; + tag = version; hash = "sha256-YJEIujoRpLvUM4H4CB1nEJaYStFOSVKIGzchnptlt7M="; }; diff --git a/pkgs/development/python-modules/cometx/default.nix b/pkgs/development/python-modules/cometx/default.nix index c232b0b2c56a..dcb8d0a3dfd9 100644 --- a/pkgs/development/python-modules/cometx/default.nix +++ b/pkgs/development/python-modules/cometx/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "cometx"; - version = "3.1.0"; + version = "3.4.3"; pyproject = true; build-system = [ setuptools ]; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "comet-ml"; repo = "cometx"; tag = version; - hash = "sha256-7rxEJNmJsFExfvYCuO/JOgj7yRFBjceE1bhRL1hFoPU="; + hash = "sha256-Wb4En/fTXeC5kvOIVAQzKxl8HXyOYvG4OGWhKhrAP6g="; }; dependencies = [ @@ -51,7 +51,7 @@ buildPythonPackage rec { meta = { description = "Open source extensions for the Comet SDK"; homepage = "https://github.com/comet-ml/comet-sdk-extensions/"; - changelog = "https://github.com/comet-ml/cometx/releases/tag/${version}"; + changelog = "https://github.com/comet-ml/cometx/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ jherland ]; mainProgram = "cometx"; diff --git a/pkgs/development/python-modules/complycube/default.nix b/pkgs/development/python-modules/complycube/default.nix index 7e74f3d56ba9..c06abaeb7784 100644 --- a/pkgs/development/python-modules/complycube/default.nix +++ b/pkgs/development/python-modules/complycube/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "complycube"; - version = "1.1.6"; + version = "1.1.8"; pyproject = true; src = fetchPypi { inherit version; pname = "complycube"; - hash = "sha256-hetcn5RX582CRVmtG5dAvr+NXD+7NKJjaqgOo8LlpqM="; + hash = "sha256-lN8J9QQ9YvclYzuXtck+lt1IgS5McOE1YU0NLl9rW0I="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/compreffor/default.nix b/pkgs/development/python-modules/compreffor/default.nix index 0c6ffcf68733..77b7b25396aa 100644 --- a/pkgs/development/python-modules/compreffor/default.nix +++ b/pkgs/development/python-modules/compreffor/default.nix @@ -10,19 +10,16 @@ buildPythonPackage rec { pname = "compreffor"; - version = "0.5.6"; + version = "0.6.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-icE9GDf5SD/gmqZrGe30SQ7ghColye3VIytSXaI/EA4="; + hash = "sha256-fqA0pQxZzHhzLxSABA6sK7Nvgmzi62B8MCm104qxG6g="; }; postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail '"setuptools_git_ls_files",' "" - substituteInPlace setup.py \ - --replace-fail ', "setuptools_git_ls_files"' "" + sed -i "/setuptools_git_ls_files/d" pyproject.toml ''; build-system = [ diff --git a/pkgs/development/python-modules/compressed-tensors/default.nix b/pkgs/development/python-modules/compressed-tensors/default.nix index 3c6fd45b0ebc..c2c93147d64a 100644 --- a/pkgs/development/python-modules/compressed-tensors/default.nix +++ b/pkgs/development/python-modules/compressed-tensors/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "compressed-tensors"; - version = "0.11.0"; + version = "0.13.0"; pyproject = true; # Release on PyPI is missing the `utils` directory, which `setup.py` wants to import @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "neuralmagic"; repo = "compressed-tensors"; tag = version; - hash = "sha256-sSXn4/N/Pn+wOCY1Z0ziqFxfMRvRA1c90jPOBe+SwZw="; + hash = "sha256-XsQRP186ISarMMES3P+ov4t/1KKJdl0tXBrfpjyM3XA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/conda-libmamba-solver/default.nix b/pkgs/development/python-modules/conda-libmamba-solver/default.nix index ea4c9e0f4d03..636b5d08bffb 100644 --- a/pkgs/development/python-modules/conda-libmamba-solver/default.nix +++ b/pkgs/development/python-modules/conda-libmamba-solver/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { pname = "conda-libmamba-solver"; - version = "25.4.0"; + version = "25.11.0"; pyproject = true; src = fetchFromGitHub { @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "conda"; repo = "conda-libmamba-solver"; tag = version; - hash = "sha256-DnRy5ntSjKADeHbqvLJz62WlLbM94U7urZLJg+Tpqbw="; + hash = "sha256-t4mwQ9nsduicT1sL1TQLbuCoS4r7K/GaXyBFOO+3/m8="; }; build-system = [ diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index ccd7f3b18a6d..291d861bd954 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -20,6 +20,7 @@ protobuf, pyflakes, pyrsistent, + pytest-asyncio, pytestCheckHook, pyyaml, rdkafka, @@ -31,14 +32,14 @@ buildPythonPackage rec { pname = "confluent-kafka"; - version = "2.11.1"; + version = "2.13.0"; pyproject = true; src = fetchFromGitHub { owner = "confluentinc"; repo = "confluent-kafka-python"; tag = "v${version}"; - hash = "sha256-WpvWv6UG7T0yJ1ZKZweHbWjh+C0PbEIYbbMAS4yyhzg="; + hash = "sha256-VnZf6YvvpOs9/9uJHJvcmF56Ra9hhsoqrVisDuf+C6w="; }; buildInputs = [ rdkafka ]; @@ -87,6 +88,7 @@ buildPythonPackage rec { cachetools orjson pyflakes + pytest-asyncio pytestCheckHook requests-mock respx diff --git a/pkgs/development/python-modules/consolekit/default.nix b/pkgs/development/python-modules/consolekit/default.nix index e69d6d14982c..4412b3bb70c2 100644 --- a/pkgs/development/python-modules/consolekit/default.nix +++ b/pkgs/development/python-modules/consolekit/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "consolekit"; - version = "1.11.0"; + version = "1.12.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-PZGrN5GJVtDruZkW3bJJpOfTi1nT3lN6XoBaaMLJE8E="; + hash = "sha256-IOyOjl2rSsXSowbBWTgDTxoj1UOFNn0el2wrJxIE2BQ="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/convertertools/default.nix b/pkgs/development/python-modules/convertertools/default.nix index 49648d8c9cc1..065dc25637f9 100644 --- a/pkgs/development/python-modules/convertertools/default.nix +++ b/pkgs/development/python-modules/convertertools/default.nix @@ -10,19 +10,20 @@ # checks pytestCheckHook, + pytest-codspeed, pytest-cov-stub, }: buildPythonPackage rec { pname = "convertertools"; - version = "0.6.1"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "bluetooth-devices"; repo = "convertertools"; tag = "v${version}"; - hash = "sha256-Oy1Nf/mS2Lr2N7OB27QDlW+uuhafib2kolEXzXLppWU="; + hash = "sha256-YLEZGTq3wtiLsqQkdxcdM4moUEYPN29Uai5o81FUtVc="; }; build-system = [ @@ -33,6 +34,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + pytest-codspeed pytest-cov-stub ]; diff --git a/pkgs/development/python-modules/cookidoo-api/default.nix b/pkgs/development/python-modules/cookidoo-api/default.nix index 4c019677f204..f961acc4e5b8 100644 --- a/pkgs/development/python-modules/cookidoo-api/default.nix +++ b/pkgs/development/python-modules/cookidoo-api/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "cookidoo-api"; - version = "0.15.0"; + version = "0.16.0"; pyproject = true; src = fetchFromGitHub { owner = "miaucl"; repo = "cookidoo-api"; tag = version; - hash = "sha256-oMosKW6MjeKPqSjF0+dc7CrNp4/5qlRoEY01HZ4sqog="; + hash = "sha256-Qg2zyQrgRo21wAGYfzeZbUnBM4zHHDdq3kzGLo1UJ8M="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/coq-tools/default.nix b/pkgs/development/python-modules/coq-tools/default.nix index d9137343e773..e788bafafec3 100644 --- a/pkgs/development/python-modules/coq-tools/default.nix +++ b/pkgs/development/python-modules/coq-tools/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "coq-tools"; - version = "0.0.39"; + version = "0.0.42"; pyproject = true; src = fetchPypi { pname = "coq_tools"; inherit version; - hash = "sha256-MPgu5inr2CMOU3qlF9v8QtqhkPuP/uIQrJYyfmpZBxE="; + hash = "sha256-d+SAGmZKUQo2ZKuC91r/2RHDvi5GCIKGTxcuau1kN0U="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/coredis/default.nix b/pkgs/development/python-modules/coredis/default.nix index b30d32d603e8..d54d4e0a6525 100644 --- a/pkgs/development/python-modules/coredis/default.nix +++ b/pkgs/development/python-modules/coredis/default.nix @@ -3,8 +3,10 @@ async-timeout, beartype, buildPythonPackage, - setuptools, - versioneer, + hatchling, + hatch-mypyc, + hatch-vcs, + types-deprecated, deprecated, fetchFromGitHub, packaging, @@ -19,14 +21,14 @@ buildPythonPackage rec { pname = "coredis"; - version = "5.1.0"; + version = "5.6.0"; pyproject = true; src = fetchFromGitHub { owner = "alisaifee"; repo = "coredis"; tag = version; - hash = "sha256-KaS048C8YLo7UNiryqjYk3yulf/gYGsFQ//Jnx10dQ4="; + hash = "sha256-84mFHEPvCv7c1u2giTwTmC+56KCB/3snl8vJ4c+sE2s="; }; postPatch = '' @@ -39,8 +41,10 @@ buildPythonPackage rec { ''; build-system = [ - setuptools - versioneer + hatchling + hatch-mypyc + hatch-vcs + types-deprecated ]; dependencies = [ diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index 78b6cf110d96..c42919f80a06 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -1,13 +1,11 @@ { lib, - stdenv, buildPythonPackage, - isPy312, fetchFromGitHub, flaky, hypothesis, pytest-xdist, - pytestCheckHook, + pytest7CheckHook, setuptools, }: @@ -29,7 +27,7 @@ buildPythonPackage rec { flaky hypothesis pytest-xdist - pytestCheckHook + pytest7CheckHook ]; preCheck = '' diff --git a/pkgs/development/python-modules/crc32c/default.nix b/pkgs/development/python-modules/crc32c/default.nix index 471067f25300..6f403ca1d190 100644 --- a/pkgs/development/python-modules/crc32c/default.nix +++ b/pkgs/development/python-modules/crc32c/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "crc32c"; - version = "2.7.1"; + version = "2.8"; pyproject = true; src = fetchFromGitHub { owner = "ICRAR"; repo = "crc32c"; tag = "v${version}"; - hash = "sha256-WBFiAbdzV719vPdZkRGei2+Y33RroMZ7FeQmWo/OfE0="; + hash = "sha256-LPiKms0fVHmgIiwUNWGTAdGByV+Pmh9dRaF/tro2rKo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/crewai/default.nix b/pkgs/development/python-modules/crewai/default.nix index ae303a57bab9..1f49c26e1926 100644 --- a/pkgs/development/python-modules/crewai/default.nix +++ b/pkgs/development/python-modules/crewai/default.nix @@ -46,14 +46,14 @@ buildPythonPackage rec { pname = "crewai"; - version = "1.7.2"; + version = "1.8.1"; pyproject = true; src = fetchFromGitHub { owner = "crewAIInc"; repo = "crewAI"; tag = version; - hash = "sha256-liJS3hrNsyAt49ROUi3/pWXfMP2wA/bFyy6yEOV6Rrk="; + hash = "sha256-MQx1FOh2bwbkDbvR6aP5z071xwbGT8bxK9OjhskdVyI="; }; sourceRoot = "${src.name}/lib/crewai"; @@ -449,7 +449,7 @@ buildPythonPackage rec { meta = { description = "Framework for orchestrating role-playing, autonomous AI agents"; homepage = "https://github.com/crewAIInc/crewAI"; - changelog = "https://github.com/crewAIInc/crewAI/releases/tag/${version}"; + changelog = "https://github.com/crewAIInc/crewAI/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ liberodark ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/python-modules/cross-web/default.nix b/pkgs/development/python-modules/cross-web/default.nix new file mode 100644 index 000000000000..738faa760522 --- /dev/null +++ b/pkgs/development/python-modules/cross-web/default.nix @@ -0,0 +1,89 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatchling, + + # dependencies + typing-extensions, + + # optional-dependencies + fastapi, + httpx, + python-multipart, + starlette, + django, + flask, + werkzeug, + sanic, + aiohttp, + yarl, + quart, + chalice, + litestar, + sanic-testing, + + # tests + pytest-asyncio, + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "cross-web"; + version = "0.4.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "usecross"; + repo = "cross-web"; + rev = finalAttrs.version; + hash = "sha256-CH7SKePJcBgLPrdb3/qoim0Wzdx78+rNpJFWDHO7JWA="; + }; + + build-system = [ + hatchling + ]; + + dependencies = [ + typing-extensions + ]; + + optional-dependencies = { + integrations = [ + fastapi + httpx + python-multipart + starlette + django + flask + werkzeug + sanic + aiohttp + yarl + quart + chalice + litestar + sanic-testing + ]; + }; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ] + ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; + + pythonImportsCheck = [ + "cross_web" + ]; + + meta = { + description = "Universal web framework adapter for Python"; + homepage = "https://github.com/usecross/cross-web"; + changelog = "https://github.com/usecross/cross-web/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = [ ]; + }; +}) diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 61a65b165fc5..debc1dc8cb5c 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "cryptography"; - version = "46.0.3"; + version = "46.0.4"; pyproject = true; src = fetchFromGitHub { owner = "pyca"; repo = "cryptography"; tag = version; - hash = "sha256-6t7f/BaMkA24MY05B7aYa0myxnCjrCsh1qk6RgAjeQc="; + hash = "sha256-vT99F/wmd/ipgASmIcQITXNgng69Nn7cN66W2cXOzZY="; }; cargoDeps = rustPlatform.fetchCargoVendor { diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index 832c4ce358a8..705466ed4d33 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -14,16 +14,10 @@ buildPythonPackage rec { sourceRoot = "${src.name}/vectors"; - patches = [ - # https://github.com/NixOS/nixpkgs/pull/449568 - (fetchpatch2 { - name = "uv-build.patch"; - url = "https://github.com/pyca/cryptography/commit/5f311c1cbe09ddea6136b0bb737fb7df6df1b923.patch?full_index=1"; - stripLen = 1; - includes = [ "pyproject.toml" ]; - hash = "sha256-OdHK0OGrvOi3mS0q+v8keDLvKxtgQkDkHQSYnmC/vd4="; - }) - ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "uv_build>=0.7.19,<0.9.0" "uv_build>=0.7.19,<0.11.0" + ''; build-system = [ uv-build ]; diff --git a/pkgs/development/python-modules/cucumber-expressions/default.nix b/pkgs/development/python-modules/cucumber-expressions/default.nix index dd0a28ebe6f2..1624c6f45fd2 100644 --- a/pkgs/development/python-modules/cucumber-expressions/default.nix +++ b/pkgs/development/python-modules/cucumber-expressions/default.nix @@ -2,26 +2,26 @@ buildPythonPackage, fetchFromGitHub, lib, - poetry-core, + uv-build, pytestCheckHook, pyyaml, }: buildPythonPackage rec { pname = "cucumber-expressions"; - version = "18.0.1"; + version = "18.1.0"; pyproject = true; src = fetchFromGitHub { owner = "cucumber"; repo = "cucumber-expressions"; tag = "v${version}"; - hash = "sha256-Mbf7bG7NvKFdv6kYPkd6UlPDJGjnK2GPl0qnLUhQ3es="; + hash = "sha256-X/ukgf5+Tn0G9E40W8KsVfo3f0NYEOnYWag4IXmHjY8="; }; sourceRoot = "${src.name}/python"; - build-system = [ poetry-core ]; + build-system = [ uv-build ]; pythonImportsCheck = [ "cucumber_expressions" ]; diff --git a/pkgs/development/python-modules/cx-freeze/default.nix b/pkgs/development/python-modules/cx-freeze/default.nix index fb553b042f2e..639e648dabf0 100644 --- a/pkgs/development/python-modules/cx-freeze/default.nix +++ b/pkgs/development/python-modules/cx-freeze/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "cx-freeze"; - version = "8.3.0"; + version = "8.5.3"; pyproject = true; src = fetchFromGitHub { owner = "marcelotduarte"; repo = "cx_Freeze"; tag = version; - hash = "sha256-PhUzHSn9IqUcb11D0kRT8zhmZ/KusTBDpAempiDN4Rc="; + hash = "sha256-tV2i0o6D/Cz0ePYgJN+c4VgMkhVhO/2xhPX8vsasFPs="; }; patches = [ diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix index 64c22184c809..262efd4920ca 100644 --- a/pkgs/development/python-modules/cymem/default.nix +++ b/pkgs/development/python-modules/cymem/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "cymem"; - version = "2.0.11"; + version = "2.0.13"; pyproject = true; src = fetchFromGitHub { owner = "explosion"; repo = "cymem"; tag = "release-v${version}"; - hash = "sha256-kZHnfUNbDyw+LD/7GgtXa6ZssTkJG2PkcM+6YLFK5RQ="; + hash = "sha256-n65tkACZi1G4qS/VQWB5ghopzCd5QHRyp9qit+yENIs="; }; build-system = [ diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix index bdf788fbed23..aa7200228968 100644 --- a/pkgs/development/python-modules/cypari2/default.nix +++ b/pkgs/development/python-modules/cypari2/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "cypari2"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "2.2.2"; + version = "2.2.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-E6M4c16iIcEGj4/EFVYb93fYxoclcCvHSVRyZP0JFyA="; + hash = "sha256-+fDplKmgsGRhkyBBHh2cMDFYhH4FW1gILv2t5ayX9hM="; }; preBuild = '' diff --git a/pkgs/development/python-modules/cython/default.nix b/pkgs/development/python-modules/cython/default.nix index 796df1cad647..5676bed17b70 100644 --- a/pkgs/development/python-modules/cython/default.nix +++ b/pkgs/development/python-modules/cython/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "cython"; - version = "3.1.6"; + version = "3.2.4"; pyproject = true; src = fetchFromGitHub { owner = "cython"; repo = "cython"; tag = version; - hash = "sha256-OB9DsGabbn5pE+8Ru29D3Jp9Wu+gwlHYYy79x+M+HPI="; + hash = "sha256-8J5EcaQXexWEA+se5rCR06CwlEYao2XK5TnVNgFGHYQ="; }; build-system = [ @@ -117,7 +117,7 @@ buildPythonPackage rec { attributes. This allows the compiler to generate very efficient C code from Cython code. ''; - changelog = "https://github.com/cython/cython/blob/${version}/CHANGES.rst"; + changelog = "https://github.com/cython/cython/blob/${src.tag}/CHANGES.rst"; license = lib.licenses.asl20; mainProgram = "cython"; maintainers = [ ]; diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix index 13d5147780e8..70ea9d121e39 100644 --- a/pkgs/development/python-modules/cytoolz/default.nix +++ b/pkgs/development/python-modules/cytoolz/default.nix @@ -5,8 +5,8 @@ pytestCheckHook, cython, setuptools, + setuptools-git-versioning, toolz, - python, }: buildPythonPackage (finalAttrs: { @@ -30,12 +30,16 @@ buildPythonPackage (finalAttrs: { nativeBuildInputs = [ cython setuptools + setuptools-git-versioning ]; - propagatedBuildInputs = [ toolz ]; + dependencies = [ toolz ]; + # tests are located in cytoolz/tests, but we need to prevent import from the cytoolz source preCheck = '' - cd $out/${python.sitePackages} + mv cytoolz/tests tests + rm -rf cytoolz + sed -i "/testpaths/d" pyproject.toml ''; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index cdf1c244e160..b7a9230937a9 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -39,14 +39,14 @@ buildPythonPackage (finalAttrs: { pname = "dash"; - version = "3.3.0"; + version = "3.4.0"; pyproject = true; src = fetchFromGitHub { owner = "plotly"; repo = "dash"; tag = "v${finalAttrs.version}"; - hash = "sha256-8Vt109x4T+DhBXfQf7MKoexmWFc23uuU0Nn3Ia/Xm5I="; + hash = "sha256-8LR0iNc8lJBKzbJuvZ8jzta1G3TbQ9yIBSXFvvyeqmI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dashscope/default.nix b/pkgs/development/python-modules/dashscope/default.nix index 4c495649ff29..685106b24dd3 100644 --- a/pkgs/development/python-modules/dashscope/default.nix +++ b/pkgs/development/python-modules/dashscope/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "dashscope"; - version = "1.25.6"; + version = "1.25.9"; pyproject = true; src = fetchFromGitHub { owner = "dashscope"; repo = "dashscope-sdk-python"; tag = "v${version}"; - hash = "sha256-rArpiEXiy/HVaNYSwONS71d0SucQ9uIbZcvlyaO/EOI="; + hash = "sha256-VR7Auso+0al9qAE3IDFAPl5zIX0Yp9OfJchR+Q9DB1o="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/dask-gateway-server/default.nix b/pkgs/development/python-modules/dask-gateway-server/default.nix index e5f37600ce50..855cb0685cc7 100644 --- a/pkgs/development/python-modules/dask-gateway-server/default.nix +++ b/pkgs/development/python-modules/dask-gateway-server/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "dask-gateway-server"; - version = "2023.9.0"; + version = "2025.4.0"; format = "setuptools"; src = fetchFromGitHub { owner = "dask"; repo = "dask-gateway"; - rev = version; - hash = "sha256-hwNLcuFN6ItH5KhC2gDUsaZT7qTC48fPR/Qx6u8B1+M="; + tag = version; + hash = "sha256-Ezt5QkA21SDfuCMm+XY8d+xso8SDb4lmK/yd89Guu0Y="; }; sourceRoot = "${src.name}/${pname}"; diff --git a/pkgs/development/python-modules/dask-gateway/default.nix b/pkgs/development/python-modules/dask-gateway/default.nix index 89845cf4ff31..58b6125df811 100644 --- a/pkgs/development/python-modules/dask-gateway/default.nix +++ b/pkgs/development/python-modules/dask-gateway/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "dask-gateway"; # update dask-gateway lock step with dask-gateway-server - version = "2023.1.1"; + version = "2025.4.0"; pyproject = true; src = fetchFromGitHub { owner = "dask"; repo = "dask-gateway"; tag = version; - hash = "sha256-+YCHIfNq8E2rXO8b91Q1D21dVzNWnJZIKZeY4AETa7s="; + hash = "sha256-Ezt5QkA21SDfuCMm+XY8d+xso8SDb4lmK/yd89Guu0Y="; }; sourceRoot = "${src.name}/dask-gateway"; diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix index c022db21a26a..e17ebb975c62 100644 --- a/pkgs/development/python-modules/dask-image/default.nix +++ b/pkgs/development/python-modules/dask-image/default.nix @@ -16,7 +16,6 @@ # tests pyarrow, - pytest-flake8, pytestCheckHook, scikit-image, }: @@ -33,6 +32,14 @@ buildPythonPackage rec { hash = "sha256-+nzYthnobcemunMcAWwRpHOQy6yFtjdib/7VZqWEiqc="; }; + postPatch = '' + sed -i "/--flake8/d" pyproject.toml + + # https://numpy.org/doc/stable//release/2.4.0-notes.html#removed-numpy-in1d + substituteInPlace tests/test_dask_image/test_ndmeasure/test_core.py \ + --replace-fail "np.in1d" "np.isin" + ''; + build-system = [ setuptools setuptools-scm @@ -48,7 +55,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pyarrow - pytest-flake8 pytestCheckHook scikit-image ]; @@ -64,6 +70,11 @@ buildPythonPackage rec { # AssertionError (comparing slices) "test_find_objects_with_empty_chunks" + + # scipy compat issue + # TypeError: only 0-dimensional arrays can be converted to Python scalars + "test_generic_filter_identity" + "test_generic_filter_comprehensions" ]; meta = { diff --git a/pkgs/development/python-modules/dask-mpi/default.nix b/pkgs/development/python-modules/dask-mpi/default.nix index 342b74048033..37e8a6d1d61c 100644 --- a/pkgs/development/python-modules/dask-mpi/default.nix +++ b/pkgs/development/python-modules/dask-mpi/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "dask-mpi"; - version = "2022.4.0"; + version = "2025.10.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-CgTx19NaBs3/UGWTMw1EFOokLJFySYzhkfV0LqxJnhc="; + hash = "sha256-YxQOdPrILlB5jlfn/b3SVKUTg87lyjeqazRbGHF1g8A="; }; patches = [ diff --git a/pkgs/development/python-modules/databricks-sdk/default.nix b/pkgs/development/python-modules/databricks-sdk/default.nix index fcd5efe78395..031401f2e448 100644 --- a/pkgs/development/python-modules/databricks-sdk/default.nix +++ b/pkgs/development/python-modules/databricks-sdk/default.nix @@ -8,6 +8,7 @@ # dependencies google-auth, + protobuf, requests, # tests @@ -21,14 +22,14 @@ buildPythonPackage rec { pname = "databricks-sdk"; - version = "0.67.0"; + version = "0.78.0"; pyproject = true; src = fetchFromGitHub { owner = "databricks"; repo = "databricks-sdk-py"; tag = "v${version}"; - hash = "sha256-3UGPB3KEO7M4QFYiniU4hcaOUmCMq3vW4yBIxDUhHLk="; + hash = "sha256-hoY4YuKIa7LmoW2MxUWKhLLsuTyO2b6qtpxr36hjP20="; }; build-system = [ @@ -37,6 +38,7 @@ buildPythonPackage rec { dependencies = [ google-auth + protobuf requests ]; diff --git a/pkgs/development/python-modules/databricks-sql-connector/default.nix b/pkgs/development/python-modules/databricks-sql-connector/default.nix index f7cfe3de6504..11636858fa0b 100644 --- a/pkgs/development/python-modules/databricks-sql-connector/default.nix +++ b/pkgs/development/python-modules/databricks-sql-connector/default.nix @@ -10,6 +10,8 @@ pandas, poetry-core, pyarrow, + pybreaker, + pyjwt, pytestCheckHook, sqlalchemy, thrift, @@ -19,14 +21,14 @@ buildPythonPackage rec { pname = "databricks-sql-connector"; - version = "4.0.5"; + version = "4.2.4"; pyproject = true; src = fetchFromGitHub { owner = "databricks"; repo = "databricks-sql-python"; tag = "v${version}"; - hash = "sha256-CzS6aVOFkBSJ9+0KJOaJLxK2ZiRY4OybNkCX5VdybqY="; + hash = "sha256-QoauhA2Zx2UvlCuKe9mxaOFJKpglVHQmPVVS56np4A0="; }; pythonRelaxDeps = [ @@ -35,11 +37,11 @@ buildPythonPackage rec { "thrift" ]; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ alembic lz4 numpy @@ -47,6 +49,8 @@ buildPythonPackage rec { openpyxl pandas pyarrow + pybreaker + pyjwt sqlalchemy thrift requests diff --git a/pkgs/development/python-modules/datamodel-code-generator/default.nix b/pkgs/development/python-modules/datamodel-code-generator/default.nix index 7fed821d24f6..6c78f81659c8 100644 --- a/pkgs/development/python-modules/datamodel-code-generator/default.nix +++ b/pkgs/development/python-modules/datamodel-code-generator/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "datamodel-code-generator"; - version = "0.35.0"; + version = "0.53.0"; pyproject = true; src = fetchFromGitHub { owner = "koxudaxi"; repo = "datamodel-code-generator"; tag = version; - hash = "sha256-whhyTkX3R76idVNmY/6O9aVDU7DSvDtLq7JK0NJXn0U="; + hash = "sha256-9UXlqVikxaO3IaGwcaJYV3HY2YqlgY0zVfb0EI1bFvY="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix index 0eb926b85478..9d40ebea0107 100644 --- a/pkgs/development/python-modules/datasets/default.nix +++ b/pkgs/development/python-modules/datasets/default.nix @@ -22,14 +22,14 @@ }: buildPythonPackage rec { pname = "datasets"; - version = "4.4.1"; + version = "4.5.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "datasets"; tag = version; - hash = "sha256-4uKGbT/EtPD1nk66SZu0r4lqGSQXMHkZh8q8x6g3YqU="; + hash = "sha256-K8JqIbYz3ZfT1t1h5dRGCo9kBQp0E+kElqzaw2InaOI="; }; build-system = [ @@ -50,12 +50,17 @@ buildPythonPackage rec { requests tqdm xxhash - ]; + ] + ++ fsspec.optional-dependencies.http; pythonRelaxDeps = [ # https://github.com/huggingface/datasets/blob/a256b85cbc67aa3f0e75d32d6586afc507cf535b/setup.py#L117 # "pin until dill has official support for determinism" "dill" + # https://github.com/huggingface/datasets/blob/4.5.0/setup.py#L127 + "multiprocess" + # https://github.com/huggingface/datasets/blob/4.5.0/setup.py#L130 + "fsspec" ]; # Tests require pervasive internet access diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index 6d67a2a3c556..23e7a5bb92cf 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "datasette"; - version = "0.65.1"; + version = "0.65.2"; pyproject = true; src = fetchFromGitHub { owner = "simonw"; repo = "datasette"; tag = version; - hash = "sha256-kVtldBuDy19DmyxEQLtAjs1qiNIjaT8+rnHlFfGNHec="; + hash = "sha256-9ZMQ9xpWalkM4Ymoc/IA0ct+0r8ht1TxW5qPlVMFspE="; }; postPatch = '' @@ -115,7 +115,7 @@ buildPythonPackage rec { description = "Multi-tool for exploring and publishing data"; mainProgram = "datasette"; homepage = "https://datasette.io/"; - changelog = "https://github.com/simonw/datasette/releases/tag/${version}"; + changelog = "https://github.com/simonw/datasette/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index e88eb4d03c5b..9261412cbca9 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, setuptools, python-dateutil, pytz, @@ -11,6 +10,7 @@ hijridate, convertdate, fasttext, + numpy, langdetect, parameterized, pytestCheckHook, @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "dateparser"; - version = "1.2.2"; + version = "1.3.0"; pyproject = true; @@ -30,20 +30,12 @@ buildPythonPackage rec { owner = "scrapinghub"; repo = "dateparser"; tag = "v${version}"; - hash = "sha256-cUbY6c0JFzs1oZJOTnMXz3uCah2f50g8/3uWQXtwiGY="; + hash = "sha256-X15zNHlF34+8Lmo6Ia3HyKOdfgsu76KbcJUxzHax0EE="; }; - patches = [ - (fetchpatch { - # https://github.com/scrapinghub/dateparser/pull/1294 - url = "https://github.com/scrapinghub/dateparser/commit/6b23348b9367d43bebc9a40b00dda3363eb2acd5.patch"; - hash = "sha256-LriRbGdYxF51Nwrm7Dp4kivyMikzmhytNQo0txMGsVI="; - }) - ]; + build-system = [ setuptools ]; - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ + dependencies = [ python-dateutil pytz regex @@ -55,7 +47,10 @@ buildPythonPackage rec { hijridate convertdate ]; - fasttext = [ fasttext ]; + fasttext = [ + fasttext + numpy + ]; langdetect = [ langdetect ]; }; @@ -80,10 +75,6 @@ buildPythonPackage rec { # access network "test_custom_language_detect_fast_text_0" "test_custom_language_detect_fast_text_1" - - # breaks with latest tzdata: https://github.com/scrapinghub/dateparser/issues/1237 - # FIXME: look into this more - "test_relative_base" ]; pythonImportsCheck = [ "dateparser" ]; diff --git a/pkgs/development/python-modules/dazl/default.nix b/pkgs/development/python-modules/dazl/default.nix index 120dd5fca970..b27fabd3b3f7 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.6.0"; + version = "8.8.0"; pyproject = true; src = fetchFromGitHub { owner = "digital-asset"; repo = "dazl-client"; tag = "v${version}"; - hash = "sha256-zFe6FomsT6aCR5B8hYEN6oTzaprVzs7fvdM3hv99LgY="; + hash = "sha256-8J7sSGOZSE/U8NPuOKIXtpEpvJwMUG/mctp/nN4OK5A="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/db-dtypes/default.nix b/pkgs/development/python-modules/db-dtypes/default.nix index 8d783a15c3b5..82f7dde2133d 100644 --- a/pkgs/development/python-modules/db-dtypes/default.nix +++ b/pkgs/development/python-modules/db-dtypes/default.nix @@ -7,29 +7,21 @@ pandas, pyarrow, pytest8_3CheckHook, - pythonAtLeast, setuptools, }: buildPythonPackage rec { pname = "db-dtypes"; - version = "1.4.4"; + version = "1.5.0"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "python-db-dtypes-pandas"; tag = "v${version}"; - hash = "sha256-Aq/2yDyvUpLsGr+mmBDQpC9X1pWLpDtYD6qql2sgGNw="; + hash = "sha256-cF40Y2J944AojOXKoTzQ/ybTFY4GP5G8KWY6+NWyRT8="; }; - # https://github.com/googleapis/python-db-dtypes-pandas/pull/379 - postPatch = lib.optionalString (pythonAtLeast "3.14") '' - substituteInPlace tests/unit/test_date.py \ - --replace-fail '"year 10000 is out of range"' '"year must be in 1..9999, not 10000"' \ - --replace-fail '"day is out of range for month"' '"day 99 must be in range 1..28 for month 2 in year 2021"' - ''; - build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/dbt-adapters/default.nix b/pkgs/development/python-modules/dbt-adapters/default.nix index d610012f2974..449c1f270deb 100644 --- a/pkgs/development/python-modules/dbt-adapters/default.nix +++ b/pkgs/development/python-modules/dbt-adapters/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "dbt-adapters"; - version = "1.16.7"; + version = "1.22.5"; pyproject = true; # missing tags on GitHub src = fetchPypi { pname = "dbt_adapters"; inherit version; - hash = "sha256-I3bE6RP0Udp4bO+OXlRdXM2H+TaXvNFJiHIrqgb0i4A="; + hash = "sha256-gN/NWm55NtvPp6hg4YtpZszpmUmjJRSHvPAou0e1GEI="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix index 79c2b8a759c7..b8beafb2b614 100644 --- a/pkgs/development/python-modules/dbt-core/default.nix +++ b/pkgs/development/python-modules/dbt-core/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, # build-system - setuptools, + hatchling, # dependencies agate, @@ -37,14 +37,14 @@ buildPythonPackage rec { pname = "dbt-core"; - version = "1.10.15"; + version = "1.11.2"; pyproject = true; src = fetchFromGitHub { owner = "dbt-labs"; repo = "dbt-core"; tag = "v${version}"; - hash = "sha256-n/tU34XUf/s4m/SbPth/jlfo2xKhQk1hVjP3vLA/67s="; + hash = "sha256-+7q332Te3R6g8HvT1Gwa7vHo8OBmT0/E/CzunBYIvZk="; }; sourceRoot = "${src.name}/core"; @@ -60,11 +60,12 @@ buildPythonPackage rec { "pathspec" "protobuf" "pydantic" + "sqlparse" "urllib3" ]; build-system = [ - setuptools + hatchling ]; dependencies = [ diff --git a/pkgs/development/python-modules/dbt-snowflake/default.nix b/pkgs/development/python-modules/dbt-snowflake/default.nix index 9236175562fd..476f1970b559 100644 --- a/pkgs/development/python-modules/dbt-snowflake/default.nix +++ b/pkgs/development/python-modules/dbt-snowflake/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "dbt-snowflake"; - version = "1.10.2"; + version = "1.11.1"; pyproject = true; # missing tags on GitHub src = fetchPypi { pname = "dbt_snowflake"; inherit version; - hash = "sha256-7bq+IU7VAJLecv5JERXnxNtPY0I/6WSCyGedXCYoDLk="; + hash = "sha256-C2uS13vwN9AuZ0XgrdRHMsunuzSwoM06HGFmJ45Bs0A="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index 0c0478fc751c..fc51d319ed94 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -18,12 +18,13 @@ # tests jsonpickle, numpy, + pandas, + polars, + pydantic, pytestCheckHook, python-dateutil, - pydantic, + pytz, tomli-w, - polars, - pandas, uuid6, }: @@ -60,12 +61,13 @@ buildPythonPackage rec { nativeCheckInputs = [ jsonpickle numpy + pandas + polars + pydantic pytestCheckHook python-dateutil - pydantic + pytz tomli-w - polars - pandas uuid6 ] ++ lib.concatAttrValues optional-dependencies; diff --git a/pkgs/development/python-modules/deepface/default.nix b/pkgs/development/python-modules/deepface/default.nix index 9aa1bd3f5473..100bbb0853f4 100644 --- a/pkgs/development/python-modules/deepface/default.nix +++ b/pkgs/development/python-modules/deepface/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "deepface"; - version = "0.0.96"; + version = "0.0.97"; pyproject = true; src = fetchFromGitHub { owner = "serengil"; repo = "deepface"; tag = "v${version}"; - hash = "sha256-UusTzMZl7ITKFbMTZI457Y2K9knO2U1n9LurJZhUJ0A="; + hash = "sha256-TstY/ZxKzXCQ0e+mFNkg+y0rMDBJNz++MwXPZnsD0IA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/deepl/default.nix b/pkgs/development/python-modules/deepl/default.nix index cf086082acd2..70d40da21693 100644 --- a/pkgs/development/python-modules/deepl/default.nix +++ b/pkgs/development/python-modules/deepl/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "deepl"; - version = "1.25.0"; + version = "1.27.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-nFvmNQVug6czSECorez9lixcuFV58hsVwQZD6dd8I4o="; + hash = "sha256-jYOlPZWP+pY4j17NZCWp2dkxFEwWwFx6hOzrmhRUu5I="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/deepwave/default.nix b/pkgs/development/python-modules/deepwave/default.nix index e3eb4a9e0071..766a7727bef1 100644 --- a/pkgs/development/python-modules/deepwave/default.nix +++ b/pkgs/development/python-modules/deepwave/default.nix @@ -19,14 +19,14 @@ let in buildPythonPackage rec { pname = "deepwave"; - version = "0.0.18"; + version = "0.0.26"; pyproject = true; src = fetchFromGitHub { owner = "ar4"; repo = "deepwave"; - rev = "v${version}"; - hash = "sha256-DOOy+B12jgwJzQ90qzX50OFxYLPRcVdVYSE5gi3pqDM="; + tag = "v${version}"; + hash = "sha256-gjFbBn7fJiLZUm+97xf6xd7C+OkEoeFe3061tFkJhFk="; }; # unable to find ninja although it is available, most likely because it looks for its pip version diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index cdf3cd7397cf..25279d246c36 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "dependency-injector"; - version = "4.48.0"; + version = "4.48.3"; pyproject = true; src = fetchFromGitHub { owner = "ets-labs"; repo = "python-dependency-injector"; tag = version; - hash = "sha256-jsV+PmUGtK8QiI2ga963H/gkd31UEq0SouEia+spSpg="; + hash = "sha256-J4M4SM256vZa2JUhagcbKu+DAUk1Op9HN+WpLL6ScBc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/deprecated/default.nix b/pkgs/development/python-modules/deprecated/default.nix index 96b42737a957..195534a8add3 100644 --- a/pkgs/development/python-modules/deprecated/default.nix +++ b/pkgs/development/python-modules/deprecated/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "deprecated"; - version = "1.2.18"; + version = "1.3.1"; pyproject = true; outputs = [ @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "tantale"; repo = "deprecated"; tag = "v${version}"; - hash = "sha256-gx5D1KAPELKfb2U93lvuztv3Ea3V+PshcfshIS6uwCo="; + hash = "sha256-1mB9aRZOsaW7Mqcu1SWIYTusQ7MlMvUucdTyfu++Nx8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/devito/default.nix b/pkgs/development/python-modules/devito/default.nix index aa9e855d9a00..fd884f337460 100644 --- a/pkgs/development/python-modules/devito/default.nix +++ b/pkgs/development/python-modules/devito/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "devito"; - version = "4.8.19"; + version = "4.8.20"; pyproject = true; src = fetchFromGitHub { owner = "devitocodes"; repo = "devito"; tag = "v${version}"; - hash = "sha256-kE4u5r2GFe4Y+IdSEnNZEOAO9WoSIM00Ify1eLaflWI="; + hash = "sha256-7GlpvPjiUckzh1s2Pwfaoy/bMsAW1FscnyxGaADyie8="; }; pythonRemoveDeps = [ "pip" ]; @@ -152,7 +152,7 @@ buildPythonPackage rec { meta = { description = "Code generation framework for automated finite difference computation"; homepage = "https://www.devitoproject.org/"; - changelog = "https://github.com/devitocodes/devito/releases/tag/v${version}"; + changelog = "https://github.com/devitocodes/devito/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/diagrams/0001-Add-build-system-section.patch b/pkgs/development/python-modules/diagrams/0001-Add-build-system-section.patch deleted file mode 100644 index 2f3f539e5864..000000000000 --- a/pkgs/development/python-modules/diagrams/0001-Add-build-system-section.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 59b84698b142f5a0998ee9e395df717a1b77e9b2 Mon Sep 17 00:00:00 2001 -From: Fabian Affolter -Date: Wed, 1 Jan 2025 21:57:06 +0100 -Subject: [PATCH] Add build-system section - ---- - pyproject.toml | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/pyproject.toml b/pyproject.toml -index bcb1e65e3..00dc374fe 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -28,3 +28,7 @@ black = "^24.4" - - [tool.black] - line-length=120 -+ -+[build-system] -+requires = ["poetry_core>=1.0.0"] -+build-backend = "poetry.core.masonry.api" diff --git a/pkgs/development/python-modules/diagrams/0002-Fix-packaging-Ensure-resources-are-included.patch b/pkgs/development/python-modules/diagrams/0002-Fix-packaging-Ensure-resources-are-included.patch deleted file mode 100644 index 564df2a01141..000000000000 --- a/pkgs/development/python-modules/diagrams/0002-Fix-packaging-Ensure-resources-are-included.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4ecaacf3fa93720a13cc06732d427415ae66d48f Mon Sep 17 00:00:00 2001 -From: Nick Bathum -Date: Fri, 14 Mar 2025 20:36:49 -0400 -Subject: [PATCH] Fix packaging: Ensure resources are included in both sdist - and wheel - -Poetry's `include` directive defaults to only including files in the sdist. -See https://github.com/python-poetry/poetry-core/pull/773 ---- - pyproject.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pyproject.toml b/pyproject.toml -index 0262552..c7deb2d 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -7,7 +7,7 @@ authors = ["mingrammer "] - readme = "README.md" - homepage = "https://diagrams.mingrammer.com" - repository = "https://github.com/mingrammer/diagrams" --include = ["resources/**/*"] -+include = [{ path = "resources/**/*", format = ["sdist", "wheel"] }] - - [tool.poetry.scripts] - diagrams="diagrams.cli:main" --- -2.47.2 - diff --git a/pkgs/development/python-modules/diagrams/default.nix b/pkgs/development/python-modules/diagrams/default.nix index bfd3c588822f..5d6b6d1060f0 100644 --- a/pkgs/development/python-modules/diagrams/default.nix +++ b/pkgs/development/python-modules/diagrams/default.nix @@ -2,33 +2,28 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, graphviz, imagemagick, inkscape, jinja2, - poetry-core, + hatchling, pytestCheckHook, round, }: buildPythonPackage rec { pname = "diagrams"; - version = "0.24.4"; + version = "0.25.1"; pyproject = true; src = fetchFromGitHub { owner = "mingrammer"; repo = "diagrams"; tag = "v${version}"; - hash = "sha256-N4JGrtgLgGUayFR6/xTf3GZEZjtxC/4De3ZCfRZbi6M="; + hash = "sha256-uDBmQSEn9LMT2CbR3VDhxW1ec4udXN5wZ1H1+RX/K0U="; }; patches = [ - # Add build-system, https://github.com/mingrammer/diagrams/pull/1089 - ./0001-Add-build-system-section.patch - # Fix poetry include, https://github.com/mingrammer/diagrams/pull/1128 - ./0002-Fix-packaging-Ensure-resources-are-included.patch ./remove-black-requirement.patch ]; @@ -41,7 +36,7 @@ buildPythonPackage rec { ./autogen.sh ''; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; # Despite living in 'tool.poetry.dependencies', # these are only used at build time to process the image resource files diff --git a/pkgs/development/python-modules/dict2xml/default.nix b/pkgs/development/python-modules/dict2xml/default.nix index d156c00dddbf..266f5519289b 100644 --- a/pkgs/development/python-modules/dict2xml/default.nix +++ b/pkgs/development/python-modules/dict2xml/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "dict2xml"; - version = "1.7.7"; + version = "1.7.8"; pyproject = true; src = fetchFromGitHub { owner = "delfick"; repo = "python-dict2xml"; tag = "release-${version}"; - hash = "sha256-66ODdslXF6nWYqJku8cNG0RPK/YGEfbpHwVLLnSoDrk="; + hash = "sha256-wCspFcqn6uAvecxx4Agzg7N3ps82mg8ukmmGwhfgajk="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix index 2fdb0851c2dd..94b0e778c72e 100644 --- a/pkgs/development/python-modules/diff-cover/default.nix +++ b/pkgs/development/python-modules/diff-cover/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "diff-cover"; - version = "9.7.2"; + version = "10.2.0"; pyproject = true; src = fetchPypi { pname = "diff_cover"; inherit version; - hash = "sha256-hyyCDS7L95xh1Sx9xwQZAV4KuSiViVZseR3ScPwMbjs="; + hash = "sha256-Yb+DAl8QUQx272pYIGgM9hubl06Pgd5wxXrJJvpjhyo="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/diffsync/default.nix b/pkgs/development/python-modules/diffsync/default.nix index 6a5a6f82d67e..23bd07f6bd74 100644 --- a/pkgs/development/python-modules/diffsync/default.nix +++ b/pkgs/development/python-modules/diffsync/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "diffsync"; - version = "2.1.0"; + version = "2.2.0"; pyproject = true; src = fetchFromGitHub { owner = "networktocode"; repo = "diffsync"; tag = "v${version}"; - hash = "sha256-UZpGWa/UjHXp6jD0fPNWTMl1DZ1AWmILRX/5XRIpLdE="; + hash = "sha256-NkISo4AmyxA0pQEkzajq+hpxoMefgSOHQTy70kOjDl8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/diffusers/default.nix b/pkgs/development/python-modules/diffusers/default.nix index d72e188c70b3..ff7c61692b96 100644 --- a/pkgs/development/python-modules/diffusers/default.nix +++ b/pkgs/development/python-modules/diffusers/default.nix @@ -45,14 +45,14 @@ buildPythonPackage rec { pname = "diffusers"; - version = "0.35.1"; + version = "0.36.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "diffusers"; tag = "v${version}"; - hash = "sha256-VZXf1YCIFtzuBWaeYG3A+AyqnMEAKEI2nStjuPJ8ZTk="; + hash = "sha256-bDGiY1PR3JilEzkynUGE5IwDA+bgVQWW1jpGEfftI3U="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix index d04dd0ec6a64..b0bcdc3260fc 100644 --- a/pkgs/development/python-modules/dill/default.nix +++ b/pkgs/development/python-modules/dill/default.nix @@ -10,19 +10,19 @@ datasets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dill"; - version = "0.4.0-unstable-2025-11-09"; + version = "0.4.1"; pyproject = true; src = fetchFromGitHub { owner = "uqfoundation"; repo = "dill"; - rev = "d948ecd748772f2812361982ec1496da0cd47b53"; - hash = "sha256-/A84BpZnwSwsEYqLL0Xdf8OjJtg1UMu6dig3QEN+n1A="; + tag = finalAttrs.version; + hash = "sha256-Yh9WvescLgV7DmxGBTGKsb29+eRzF9qjZMg0DQQyLyY="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; checkPhase = '' runHook preCheck @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = { description = "Serialize all of python (almost)"; homepage = "https://github.com/uqfoundation/dill/"; - changelog = "https://github.com/uqfoundation/dill/releases/tag/dill-${version}"; + changelog = "https://github.com/uqfoundation/dill/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.bsd3; }; -} +}) diff --git a/pkgs/development/python-modules/dirty-equals/default.nix b/pkgs/development/python-modules/dirty-equals/default.nix index e17ed42f3e47..6ec2a6015311 100644 --- a/pkgs/development/python-modules/dirty-equals/default.nix +++ b/pkgs/development/python-modules/dirty-equals/default.nix @@ -12,14 +12,14 @@ let dirty-equals = buildPythonPackage rec { pname = "dirty-equals"; - version = "0.9.0"; + version = "0.11.0"; pyproject = true; src = fetchFromGitHub { owner = "samuelcolvin"; repo = "dirty-equals"; tag = "v${version}"; - hash = "sha256-V+Ef/X4xQNSp2PiiXHHIAZT7v2sjU4vDBd9hNOqiRQw="; + hash = "sha256-JFKWrbMdxhvSBbjQ+S9HPW87CK+5ZZiXHg8Wltlv2YY="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/disnake/default.nix b/pkgs/development/python-modules/disnake/default.nix index 12ebfea86489..f791f5e9ff08 100644 --- a/pkgs/development/python-modules/disnake/default.nix +++ b/pkgs/development/python-modules/disnake/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "disnake"; - version = "2.10.1"; + version = "2.11.0"; pyproject = true; src = fetchFromGitHub { owner = "DisnakeDev"; repo = "disnake"; tag = "v${version}"; - hash = "sha256-MQxYkUA3uclmY2cKBr4DsBg79ovsH1EsMOjiVPGaLVE="; + hash = "sha256-pwhUX5lzqSPik/rPsT42M3AMjzWWeqFN+0mVHA84cCo="; }; build-system = [ setuptools ]; @@ -57,7 +57,7 @@ buildPythonPackage rec { meta = { description = "API wrapper for Discord written in Python"; homepage = "https://disnake.dev/"; - changelog = "https://github.com/DisnakeDev/disnake/blob/v${version}/docs/whats_new.rst"; + changelog = "https://github.com/DisnakeDev/disnake/blob/${src.tag}/docs/whats_new.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ infinidoge ]; }; diff --git a/pkgs/development/python-modules/distorm3/default.nix b/pkgs/development/python-modules/distorm3/default.nix index a109c6e3a607..5c3ad161d265 100644 --- a/pkgs/development/python-modules/distorm3/default.nix +++ b/pkgs/development/python-modules/distorm3/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "distorm3"; - version = "3.5.2b"; + version = "3.5.2"; pyproject = true; src = fetchFromGitHub { owner = "gdabah"; repo = "distorm"; tag = version; - hash = "sha256-2ftEV3TMS3HT7f96k+Pwt3Mm31fVEXcHpcbbz05jycU="; + hash = "sha256-Fhvxag2UN5wXEySP1n1pCahMQR/SfssywikeLmiASwQ="; }; build-system = [ @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = { description = "Disassembler library for x86/AMD64"; homepage = "https://github.com/gdabah/distorm"; - changelog = "https://github.com/gdabah/distorm/releases/tag/${version}"; + changelog = "https://github.com/gdabah/distorm/releases/tag/${src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dj-database-url/default.nix b/pkgs/development/python-modules/dj-database-url/default.nix index 1a2a93544ef4..3ec990d64a56 100644 --- a/pkgs/development/python-modules/dj-database-url/default.nix +++ b/pkgs/development/python-modules/dj-database-url/default.nix @@ -3,22 +3,27 @@ buildPythonPackage, fetchFromGitHub, django, - setuptools, + uv-build, }: buildPythonPackage rec { pname = "dj-database-url"; - version = "3.0.1"; + version = "3.1.0"; pyproject = true; src = fetchFromGitHub { owner = "jazzband"; repo = "dj-database-url"; tag = "v${version}"; - hash = "sha256-wiPTszgix4QjF82f5mmNvDKGspYl15jScK2TAsP5zP8="; + hash = "sha256-zQiyEtDTFZHwuEIfRZHdgszyfsRSayFqPv9MIS4Ip6s="; }; - build-system = [ setuptools ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "uv_build>=0.9.17,<0.10.0" uv_build + ''; + + build-system = [ uv-build ]; dependencies = [ django ]; diff --git a/pkgs/development/python-modules/dj-rest-auth/default.nix b/pkgs/development/python-modules/dj-rest-auth/default.nix index 5191ff624b78..ff05d3f18d16 100644 --- a/pkgs/development/python-modules/dj-rest-auth/default.nix +++ b/pkgs/development/python-modules/dj-rest-auth/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "dj-rest-auth"; - version = "7.0.1"; + version = "7.0.2"; pyproject = true; src = fetchFromGitHub { owner = "iMerica"; repo = "dj-rest-auth"; tag = version; - hash = "sha256-bus7Sf5H4PA5YFrkX7hbALOq04koDz3KTO42hHFJPhw="; + hash = "sha256-tgcEnB9n9pq+TBde8udsr8osdAAJqmXaaU1Wt2psPIw="; }; patches = [ @@ -34,13 +34,6 @@ buildPythonPackage rec { url = "https://github.com/iMerica/dj-rest-auth/commit/cc5587e4e3f327697709f3f0d491650bff5464e7.diff"; hash = "sha256-2LahibxuNECAfjqsbNs2ezaWt1VH0ZBNwSNWCZwIe8I="; }) - # Add compatibility with django-allauth v65.4 - # See https://github.com/iMerica/dj-rest-auth/pull/681 - (fetchpatch { - name = "django-allauth_65.4_compatibility.patch"; - url = "https://github.com/iMerica/dj-rest-auth/commit/59b8cab7e2f4e3f2fdc11ab3b027a32cad45deef.patch"; - hash = "sha256-CH85vB3EOQvFxx+ZP2LYI4LEvaZ+ccLdXZGuAvEfStc="; - }) ]; postPatch = '' @@ -97,7 +90,7 @@ buildPythonPackage rec { meta = { description = "Authentication for Django Rest Framework"; homepage = "https://github.com/iMerica/dj-rest-auth"; - changelog = "https://github.com/iMerica/dj-rest-auth/releases/tag/${version}"; + changelog = "https://github.com/iMerica/dj-rest-auth/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ onny ]; }; diff --git a/pkgs/development/python-modules/django-anymail/default.nix b/pkgs/development/python-modules/django-anymail/default.nix index 06cd6011ab65..4301eee23da0 100644 --- a/pkgs/development/python-modules/django-anymail/default.nix +++ b/pkgs/development/python-modules/django-anymail/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "django-anymail"; - version = "13.1"; + version = "14.0"; pyproject = true; src = fetchFromGitHub { owner = "anymail"; repo = "django-anymail"; tag = "v${version}"; - hash = "sha256-R/PPAar93yMslKnhiiMcv4DIZrIJEQGqMm5yLZ9Mn+8="; + hash = "sha256-S/HEbWyvfAQ/kHodN0ylrg1lU7lYWGUznSqVC+yUzSU="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/django-auditlog/default.nix b/pkgs/development/python-modules/django-auditlog/default.nix index 029100aad941..c589b1ecb1c2 100644 --- a/pkgs/development/python-modules/django-auditlog/default.nix +++ b/pkgs/development/python-modules/django-auditlog/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "django-auditlog"; - version = "3.3.0"; + version = "3.4.1"; pyproject = true; src = fetchFromGitHub { owner = "jazzband"; repo = "django-auditlog"; tag = "v${version}"; - hash = "sha256-ZOCLlS9SUY8W3jfA+51gy5yUchJr+rpBzH+Sx1G/kUM="; + hash = "sha256-/IOzMGRR8EP/AGP7fcqwP4GeSKXPwE6NF6AZmiF1+lA="; }; build-system = [ diff --git a/pkgs/development/python-modules/django-bootstrap3/default.nix b/pkgs/development/python-modules/django-bootstrap3/default.nix index d11dbc981557..de8f72449231 100644 --- a/pkgs/development/python-modules/django-bootstrap3/default.nix +++ b/pkgs/development/python-modules/django-bootstrap3/default.nix @@ -16,16 +16,21 @@ buildPythonPackage rec { pname = "django-bootstrap3"; - version = "25.3"; + version = "26.1"; pyproject = true; src = fetchFromGitHub { owner = "zostera"; repo = "django-bootstrap3"; tag = "v${version}"; - hash = "sha256-OCr25Sc5fbL5ivrM2LpDAcTj8bPX4Q23Yj1j6jRG03U="; + hash = "sha256-DpdgwG+4We/r3NZ50no/SurEtL1BkB3P0nMv8KRj+GY="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "uv_build>=0.9.6,<0.10.0" uv_build + ''; + build-system = [ uv-build ]; dependencies = [ django ]; @@ -42,7 +47,7 @@ buildPythonPackage rec { meta = { description = "Bootstrap 3 integration for Django"; homepage = "https://github.com/zostera/django-bootstrap3"; - changelog = "https://github.com/zostera/django-bootstrap3/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/zostera/django-bootstrap3/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/django-bootstrap4/default.nix b/pkgs/development/python-modules/django-bootstrap4/default.nix index 68d0de112c6a..727e11b5076b 100644 --- a/pkgs/development/python-modules/django-bootstrap4/default.nix +++ b/pkgs/development/python-modules/django-bootstrap4/default.nix @@ -29,6 +29,11 @@ buildPythonPackage rec { hash = "sha256-g66JJVPB+YQjN5IHSu/jqKVu5gS8Llb+mALJ9f5H2ds="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "uv_build>=0.9.6,<0.10.0" uv_build + ''; + build-system = [ uv-build ]; dependencies = [ beautifulsoup4 ]; diff --git a/pkgs/development/python-modules/django-bootstrap5/default.nix b/pkgs/development/python-modules/django-bootstrap5/default.nix index b67136837e8e..1272b9b7c2df 100644 --- a/pkgs/development/python-modules/django-bootstrap5/default.nix +++ b/pkgs/development/python-modules/django-bootstrap5/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, django, fetchFromGitHub, - fetchpatch2, jinja2, pillow, pytest-django, @@ -14,23 +13,20 @@ buildPythonPackage rec { pname = "django-bootstrap5"; - version = "25.2"; + version = "26.1"; pyproject = true; src = fetchFromGitHub { owner = "zostera"; repo = "django-bootstrap5"; tag = "v${version}"; - hash = "sha256-aqP2IkAkZsw5vbQxhiy9L3giSgb0seub9gsxPTajiXo="; + hash = "sha256-kLq1BHN4PKwtAH/TqHn8B697K9Nk5mNMpjUsW5cCrj4="; }; - patches = [ - (fetchpatch2 { - name = "uv-build.patch"; - url = "https://github.com/zostera/django-bootstrap5/commit/d1d54f5fc8041d2781189321402b4f3937f77913.patch?full_index=1"; - hash = "sha256-cFOY+pu2TAZXpAipSIQh1nPPC0ipfncvpObcH667+ac="; - }) - ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "uv_build>=0.9.6,<0.10.0" uv_build + ''; build-system = [ uv-build ]; diff --git a/pkgs/development/python-modules/django-choices-field/default.nix b/pkgs/development/python-modules/django-choices-field/default.nix index ea115e5c6258..e568e989ec65 100644 --- a/pkgs/development/python-modules/django-choices-field/default.nix +++ b/pkgs/development/python-modules/django-choices-field/default.nix @@ -5,6 +5,7 @@ poetry-core, django, typing-extensions, + inline-snapshot, pytestCheckHook, pytest-cov-stub, pytest-django, @@ -12,14 +13,14 @@ buildPythonPackage rec { pname = "django-choices-field"; - version = "2.3.0"; + version = "4.0.0"; pyproject = true; src = fetchFromGitHub { owner = "bellini666"; repo = "django-choices-field"; - rev = "v${version}"; - hash = "sha256-2oLMUM/aE4aY0eEU+CLIjTNQJAMUt/GK5Fw26QN7t34="; + tag = "v${version}"; + hash = "sha256-EnJMn6tAjhylY8qsT/T/N9v/w/vD+d93U2RMxwEcc84="; }; build-system = [ poetry-core ]; @@ -30,6 +31,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + inline-snapshot pytestCheckHook pytest-cov-stub pytest-django diff --git a/pkgs/development/python-modules/django-ckeditor/default.nix b/pkgs/development/python-modules/django-ckeditor/default.nix index e78a17c6ae52..1c05c28ba54d 100644 --- a/pkgs/development/python-modules/django-ckeditor/default.nix +++ b/pkgs/development/python-modules/django-ckeditor/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "django-ckeditor"; - version = "6.7.1"; + version = "6.7.3"; pyproject = true; src = fetchFromGitHub { owner = "django-ckeditor"; repo = "django-ckeditor"; tag = version; - hash = "sha256-tPwWXQAKoHPpZDZ+fnEoOA29at6gUXBw6CcPdireTr8="; + hash = "sha256-EqauGFy3VKWHV/MaHhga1lGZhmbHcz6nvc5I87RQ4Dc="; }; build-system = [ setuptools-scm ]; @@ -49,7 +49,7 @@ buildPythonPackage rec { meta = { description = "Django admin CKEditor integration"; homepage = "https://github.com/django-ckeditor/django-ckeditor"; - changelog = "https://github.com/django-ckeditor/django-ckeditor/blob/${version}/CHANGELOG.rst"; + changelog = "https://github.com/django-ckeditor/django-ckeditor/blob/${src.tag}/CHANGELOG.rst"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ onny ]; knownVulnerabilities = [ diff --git a/pkgs/development/python-modules/django-countries/default.nix b/pkgs/development/python-modules/django-countries/default.nix index e79d314f2545..5836247abd8c 100644 --- a/pkgs/development/python-modules/django-countries/default.nix +++ b/pkgs/development/python-modules/django-countries/default.nix @@ -30,6 +30,11 @@ buildPythonPackage rec { hash = "sha256-MtRlZFrTlY7t0n08X0aYN5HRGZUGLHkcU1gaZCtj07Q="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "uv_build>=0.9.6,<0.10.0" uv_build + ''; + build-system = [ uv-build ]; dependencies = [ diff --git a/pkgs/development/python-modules/django-htmx/default.nix b/pkgs/development/python-modules/django-htmx/default.nix index c0914c269b6d..b619fca8ac0e 100644 --- a/pkgs/development/python-modules/django-htmx/default.nix +++ b/pkgs/development/python-modules/django-htmx/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "django-htmx"; - version = "1.26.0"; + version = "1.27.0"; pyproject = true; src = fetchFromGitHub { owner = "adamchainz"; repo = "django-htmx"; - rev = version; - hash = "sha256-cJpZsjPAg1ss1dxhvjY+Xw29xAzuHzlVSDxUfAU9fgI="; + tag = version; + hash = "sha256-5Z/Ji1J6ofOHG64aj9bsHEw6EBELFQ4Lwsn8vGQUFe8="; }; build-system = [ setuptools ]; @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = { description = "Extensions for using Django with htmx"; homepage = "https://github.com/adamchainz/django-htmx"; - changelog = "https://github.com/adamchainz/django-htmx/blob/${version}/docs/changelog.rst"; + changelog = "https://github.com/adamchainz/django-htmx/blob/${src.tag}/docs/changelog.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ minijackson ]; }; diff --git a/pkgs/development/python-modules/django-json-widget/default.nix b/pkgs/development/python-modules/django-json-widget/default.nix index c3339b466da4..e89c6249b523 100644 --- a/pkgs/development/python-modules/django-json-widget/default.nix +++ b/pkgs/development/python-modules/django-json-widget/default.nix @@ -4,24 +4,27 @@ fetchFromGitHub, django, setuptools, - python, + setuptools-scm, pytestCheckHook, pytest-django, }: buildPythonPackage rec { pname = "django-json-widget"; - version = "2.0.3"; + version = "2.1.1"; pyproject = true; src = fetchFromGitHub { owner = "jmrivas86"; repo = "django-json-widget"; tag = "v${version}"; - hash = "sha256-11XDmSYJzrjcV3q3P0Kl2WkfoAtuPYzQt5D2ZzRTCCY="; + hash = "sha256-AABJHWoEIcyJyRHv3sp1d1l6ZByF8Q5h+xEHJe/4uC0="; }; - build-system = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; dependencies = [ django ]; @@ -39,7 +42,7 @@ buildPythonPackage rec { meta = { description = "Alternative widget that makes it easy to edit the jsonfield field of django"; homepage = "https://github.com/jmrivas86/django-json-widget"; - changelog = "https://github.com/jmrivas86/django-json-widget/blob/v${version}/CHANGELOG.rst"; + changelog = "https://github.com/jmrivas86/django-json-widget/blob/${src.tag}/CHANGELOG.rst"; # Contradictory license specifications # https://github.com/jmrivas86/django-json-widget/issues/93 license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/django-lasuite/default.nix b/pkgs/development/python-modules/django-lasuite/default.nix index e571f8b42ac2..32979f2632f0 100644 --- a/pkgs/development/python-modules/django-lasuite/default.nix +++ b/pkgs/development/python-modules/django-lasuite/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "django-lasuite"; - version = "0.0.22"; + version = "0.0.23"; pyproject = true; src = fetchFromGitHub { owner = "suitenumerique"; repo = "django-lasuite"; tag = "v${version}"; - hash = "sha256-T9FLxgWePifYIiD2Ivbfir2dlpUvZl2jj8y86VbxVDk="; + hash = "sha256-H0sa/JaYsOqUdyAdlTzxRwY4WtCmZS+zorhERpCksDs="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/django-leaflet/default.nix b/pkgs/development/python-modules/django-leaflet/default.nix index da07286702c8..4aa698bc448a 100644 --- a/pkgs/development/python-modules/django-leaflet/default.nix +++ b/pkgs/development/python-modules/django-leaflet/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "django-leaflet"; - version = "0.32.0"; + version = "0.33.0"; pyproject = true; src = fetchPypi { pname = "django_leaflet"; inherit version; - hash = "sha256-ATzLBu4IBxyuyYpl3/1oqzaU2vznLK/zTz1481VoriU="; + hash = "sha256-tRxx5xee7ZlhSE39V7h70ezjsf977k37f01XAiBrLso="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/django-ninja/default.nix b/pkgs/development/python-modules/django-ninja/default.nix index 9dd2a92357de..c872b2421de9 100644 --- a/pkgs/development/python-modules/django-ninja/default.nix +++ b/pkgs/development/python-modules/django-ninja/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "django-ninja"; - version = "1.4.5"; + version = "1.5.3"; pyproject = true; src = fetchFromGitHub { owner = "vitalik"; repo = "django-ninja"; tag = "v${version}"; - hash = "sha256-C54Y5Rmhk9trEeNhE+i3aeKcnoeUc6BqFbp3dzL9xjA="; + hash = "sha256-TmdwxOy+YwzEp/LrRb7/AqUahlmEodZdmswvfqtD5PY="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/django-otp-webauthn/default.nix b/pkgs/development/python-modules/django-otp-webauthn/default.nix index 4182e3a0903c..821fd95575b0 100644 --- a/pkgs/development/python-modules/django-otp-webauthn/default.nix +++ b/pkgs/development/python-modules/django-otp-webauthn/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "django-otp-webauthn"; - version = "0.6.0"; + version = "0.8.0"; pyproject = true; src = fetchPypi { inherit version; pname = "django_otp_webauthn"; - hash = "sha256-Exyao6i63S7czGAcZMULrNcnxjRNw21ufNFaxj9kkFs="; + hash = "sha256-GMkKL+U7CPfw3WaSlsnoi0VmEPF/wbb86phfl01NM6I="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix index e42cb80f4b2b..9e64db47993c 100644 --- a/pkgs/development/python-modules/django-polymorphic/default.nix +++ b/pkgs/development/python-modules/django-polymorphic/default.nix @@ -2,35 +2,47 @@ lib, buildPythonPackage, fetchFromGitHub, - setuptools, + hatchling, django, dj-database-url, + django-test-migrations, + pytest-cov-stub, pytest-django, + pytest-playwright, pytestCheckHook, }: buildPythonPackage rec { pname = "django-polymorphic"; - version = "4.1.0"; + version = "4.5.2"; pyproject = true; src = fetchFromGitHub { owner = "django-polymorphic"; repo = "django-polymorphic"; tag = "v${version}"; - hash = "sha256-QcJUKGhWPUHhVVsEZhhjN411Pz4Wn7OL2fhotPOGVm4="; + hash = "sha256-8MZrQErWWd4GiNaIEnGvj4jONGFzsi3bu5NervF4AnE="; }; - build-system = [ setuptools ]; + build-system = [ hatchling ]; dependencies = [ django ]; nativeCheckInputs = [ dj-database-url + django-test-migrations + pytest-cov-stub pytest-django + pytest-playwright pytestCheckHook ]; + disabledTestPaths = [ + # RuntimeError: Playwright failed to start. This often happens if browser drivers are missing. + "src/polymorphic/tests/test_admin.py" + "src/polymorphic/tests/examples/views/test.py::ViewExampleTests::test_view_example" + ]; + pythonImportsCheck = [ "polymorphic" ]; meta = { diff --git a/pkgs/development/python-modules/django-pydantic-field/default.nix b/pkgs/development/python-modules/django-pydantic-field/default.nix index f6c5919adf76..124b6b8e9bda 100644 --- a/pkgs/development/python-modules/django-pydantic-field/default.nix +++ b/pkgs/development/python-modules/django-pydantic-field/default.nix @@ -10,28 +10,35 @@ pytest-django, djangorestframework, pyyaml, - setuptools, syrupy, + typing-extensions, uritemplate, + uv-build, }: buildPythonPackage rec { pname = "django-pydantic-field"; - version = "0.4.1"; + version = "0.5.2"; pyproject = true; src = fetchFromGitHub { owner = "surenkov"; repo = "django-pydantic-field"; tag = "v${version}"; - hash = "sha256-AyI58ij6bMs0i1bwgpBTpEqjYxVo0qC6xBz43iJiHrc="; + hash = "sha256-BqQurRjtA9AxvagmMIt+QjKKVdyFo+LVgn/vYS6+Ayc="; }; - build-system = [ setuptools ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "uv_build>=0.9.17,<0.10.0" uv_build + ''; + + build-system = [ uv-build ]; dependencies = [ django pydantic + typing-extensions ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/django-q2/default.nix b/pkgs/development/python-modules/django-q2/default.nix index b878b464cc80..e5ebe7e58eda 100644 --- a/pkgs/development/python-modules/django-q2/default.nix +++ b/pkgs/development/python-modules/django-q2/default.nix @@ -19,21 +19,16 @@ buildPythonPackage rec { pname = "django-q2"; - version = "1.8.0"; + version = "1.9.0"; pyproject = true; src = fetchFromGitHub { owner = "django-q2"; repo = "django-q2"; tag = "v${version}"; - hash = "sha256-SmTiplQzmMiK6xBs1TDikHE1ChI2twqemaP/ID6kvc4="; + hash = "sha256-xqRm9vv/lD9HLX+ekdPgIGGwr5H7QZBATPx0CCjQAmw="; }; - postPatch = '' - substituteInPlace django_q/tests/settings.py \ - --replace-fail "HiredisParser" "_HiredisParser" - ''; - build-system = [ poetry-core ]; @@ -88,7 +83,7 @@ buildPythonPackage rec { meta = { description = "Multiprocessing distributed task queue for Django based on Django-Q"; homepage = "https://github.com/django-q2/django-q2"; - changelog = "https://github.com/django-q2/django-q2/releases/tag/v${version}"; + changelog = "https://github.com/django-q2/django-q2/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/django-reversion/default.nix b/pkgs/development/python-modules/django-reversion/default.nix index 19098647898c..f3739ebb66d5 100644 --- a/pkgs/development/python-modules/django-reversion/default.nix +++ b/pkgs/development/python-modules/django-reversion/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "django-reversion"; - version = "6.0.0"; + version = "6.1.0"; pyproject = true; src = fetchPypi { pname = "django_reversion"; inherit version; - hash = "sha256-yrD9kGQLLOs316iXgjynKiG5YK0dajuctONR+rvSfZw="; + hash = "sha256-Md1/7gLiohr3wtCmHBwPJ7oH3yMXyaCj8x0+5ABpAl0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/django-scheduler/default.nix b/pkgs/development/python-modules/django-scheduler/default.nix index b6808dfb43f8..e87268bdf2d7 100644 --- a/pkgs/development/python-modules/django-scheduler/default.nix +++ b/pkgs/development/python-modules/django-scheduler/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "django-scheduler"; - version = "0.10.1"; + version = "1.0"; pyproject = true; src = fetchFromGitHub { owner = "llazzaro"; repo = "django-scheduler"; - tag = version; - hash = "sha256-dY2TPo15RRWrv7LheUNJSQl4d/HeptSMM/wQirRSI5w="; + tag = "v${version}"; + hash = "sha256-TgIp2oqju3O6zPp3WMEB9HeNgAJILNkWWfbDFmMQ3eA="; }; build-system = [ setuptools ]; @@ -64,7 +64,7 @@ buildPythonPackage rec { meta = { description = "Calendar app for Django"; homepage = "https://github.com/llazzaro/django-scheduler"; - changelog = "https://github.com/llazzaro/django-scheduler/releases/tag/${version}"; + changelog = "https://github.com/llazzaro/django-scheduler/releases/tag/${src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ derdennisop ]; }; diff --git a/pkgs/development/python-modules/django-silk/default.nix b/pkgs/development/python-modules/django-silk/default.nix index cf76dd80507e..76573dd65565 100644 --- a/pkgs/development/python-modules/django-silk/default.nix +++ b/pkgs/development/python-modules/django-silk/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "django-silk"; - version = "5.3.2"; + version = "5.4.3"; format = "setuptools"; src = fetchFromGitHub { owner = "jazzband"; repo = "django-silk"; tag = version; - hash = "sha256-+JOUpjKR0rx+4+hU/5gSov5nW2aj7HR+HYr5FPbUkSA="; + hash = "sha256-VVgH4h2OeOu/NKGMSOHo2tg8Owj1t+HhEN8xWGrj3m8="; }; # "test_time_taken" tests aren't suitable for reproducible execution, but Django's @@ -84,7 +84,7 @@ buildPythonPackage rec { meta = { description = "Silky smooth profiling for the Django Framework"; homepage = "https://github.com/jazzband/django-silk"; - changelog = "https://github.com/jazzband/django-silk/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/jazzband/django-silk/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ris ]; }; diff --git a/pkgs/development/python-modules/django-simple-history/default.nix b/pkgs/development/python-modules/django-simple-history/default.nix index 6d256ed3ee66..2c2c7e05cc40 100644 --- a/pkgs/development/python-modules/django-simple-history/default.nix +++ b/pkgs/development/python-modules/django-simple-history/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "django-simple-history"; - version = "3.10.1"; + version = "3.11.0"; pyproject = true; src = fetchFromGitHub { owner = "jazzband"; repo = "django-simple-history"; tag = version; - hash = "sha256-th0ZkHMKWcI6nNhgjpkvmyKaJ/TdWK12mBPUTFab8g4="; + hash = "sha256-pTWorV++YSr/oIdcShrJTBUFfn5ekJ29rNn6ltDhN5Q="; }; build-system = [ diff --git a/pkgs/development/python-modules/django-stubs-ext/default.nix b/pkgs/development/python-modules/django-stubs-ext/default.nix index d2f705011128..b5bbf0d3521c 100644 --- a/pkgs/development/python-modules/django-stubs-ext/default.nix +++ b/pkgs/development/python-modules/django-stubs-ext/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, django, fetchFromGitHub, - hatchling, + uv-build, oracledb, pytest-mypy-plugins, pytest-xdist, @@ -14,22 +14,25 @@ buildPythonPackage rec { pname = "django-stubs-ext"; - version = "5.2.5"; + version = "5.2.9"; pyproject = true; src = fetchFromGitHub { owner = "typeddjango"; repo = "django-stubs"; tag = version; - hash = "sha256-v+MlMy9XABb9gw3U6Xv+aXXF6AZuvu+OBdU5+8tE9Oo="; + hash = "sha256-42FluS2fmfgj4qk2u+Z/7TGhXY4WKUc0cI00go6rnGc="; }; postPatch = '' cd ext ln -s ../scripts + + substituteInPlace pyproject.toml \ + --replace-fail "uv_build>=0.9.9,<0.10.0" uv_build ''; - build-system = [ hatchling ]; + build-system = [ uv-build ]; dependencies = [ django @@ -59,7 +62,7 @@ buildPythonPackage rec { meta = { description = "Extensions and monkey-patching for django-stubs"; homepage = "https://github.com/typeddjango/django-stubs"; - changelog = "https://github.com/typeddjango/django-stubs/releases/tag/${version}"; + changelog = "https://github.com/typeddjango/django-stubs/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/django-stubs/default.nix b/pkgs/development/python-modules/django-stubs/default.nix index fc3a8538e907..575840c15ca3 100644 --- a/pkgs/development/python-modules/django-stubs/default.nix +++ b/pkgs/development/python-modules/django-stubs/default.nix @@ -4,7 +4,7 @@ django-stubs-ext, django, fetchFromGitHub, - hatchling, + uv-build, redis, mypy, pytest-mypy-plugins, @@ -18,17 +18,17 @@ buildPythonPackage rec { pname = "django-stubs"; - version = "5.2.2"; + version = "5.2.9"; pyproject = true; src = fetchFromGitHub { owner = "typeddjango"; repo = "django-stubs"; tag = version; - hash = "sha256-kF5g0/rkMQxYTfSrTqzZ6BuqGlE42K/AVhc1/ARc+/c="; + hash = "sha256-42FluS2fmfgj4qk2u+Z/7TGhXY4WKUc0cI00go6rnGc="; }; - build-system = [ hatchling ]; + build-system = [ uv-build ]; dependencies = [ django @@ -68,7 +68,7 @@ buildPythonPackage rec { meta = { description = "PEP-484 stubs for Django"; homepage = "https://github.com/typeddjango/django-stubs"; - changelog = "https://github.com/typeddjango/django-stubs/releases/tag/${version}"; + changelog = "https://github.com/typeddjango/django-stubs/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/django-tasks/default.nix b/pkgs/development/python-modules/django-tasks/default.nix index 415108364e3d..5c163b781715 100644 --- a/pkgs/development/python-modules/django-tasks/default.nix +++ b/pkgs/development/python-modules/django-tasks/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "django-tasks"; - version = "0.8.1"; + version = "0.11.0"; pyproject = true; src = fetchFromGitHub { owner = "RealOrangeOne"; repo = "django-tasks"; tag = version; - hash = "sha256-fXXqPmpyIq+66okWDmTIBaoaslY8BSILXjJWn8cXnMM="; + hash = "sha256-WU2TQa4FMEqtNtetH4qAyXqkrP/9PTw/K63MfUWEWGw="; }; build-system = [ @@ -73,6 +73,8 @@ buildPythonPackage rec { "test_prunes_tasks" # AssertionError: 'Run maximum tasks (2)' not found in '' "test_max_tasks" + # AssertionError: is not an instance of + "test_uses_lib_tasks_by_default" ]; preCheck = '' diff --git a/pkgs/development/python-modules/django-test-migrations/default.nix b/pkgs/development/python-modules/django-test-migrations/default.nix new file mode 100644 index 000000000000..383fbb9ce89d --- /dev/null +++ b/pkgs/development/python-modules/django-test-migrations/default.nix @@ -0,0 +1,69 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies + typing-extensions, + + # tests + pytest-cov-stub, + pytest-django, + pytest-mock, + pytest-randomly, + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "django-test-migrations"; + version = "1.5.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "wemake-services"; + repo = "django-test-migrations"; + tag = finalAttrs.version; + hash = "sha256-mYDGGfkLo+GMgItCje46KtXdPsedawRKXLbRnD+CC+8="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + typing-extensions + ]; + + preCheck = '' + export DJANGO_DATABASE_NAME=test_db + ''; + + nativeCheckInputs = [ + pytest-cov-stub + pytest-django + pytest-mock + pytest-randomly + pytestCheckHook + ]; + + disabledTests = [ + # nested pytest calls complain about import file mismatch (out vs source) + "test_call_pytest_setup_plan" + "test_pytest_markers" + ]; + + pythonImportsCheck = [ + "django_test_migrations" + ]; + + meta = { + description = "Test django schema and data migrations, including migrations' order and best practices"; + homepage = "https://github.com/wemake-services/django-test-migrations"; + changelog = "https://github.com/wemake-services/django-test-migrations/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = [ ]; + }; +}) diff --git a/pkgs/development/python-modules/django-timezone-field/default.nix b/pkgs/development/python-modules/django-timezone-field/default.nix index a15fe4e8e11c..039d6ac6b2a6 100644 --- a/pkgs/development/python-modules/django-timezone-field/default.nix +++ b/pkgs/development/python-modules/django-timezone-field/default.nix @@ -7,20 +7,20 @@ djangorestframework, pytestCheckHook, pytest-django, - pytest-lazy-fixture, + pytest-lazy-fixtures, pytz, }: buildPythonPackage rec { pname = "django-timezone-field"; - version = "7.0"; + version = "7.2.1"; pyproject = true; src = fetchFromGitHub { owner = "mfogel"; repo = "django-timezone-field"; - rev = version; - hash = "sha256-q06TuYkBA4z6tJdT3an6Z8o1i/o85XbYa1JYZBHC8lI="; + tag = version; + hash = "sha256-iOdWgLj6qzMYusfpG/aCBk3ca9Ge7Kx2p9herJtpORs="; }; build-system = [ poetry-core ]; @@ -40,7 +40,7 @@ buildPythonPackage rec { djangorestframework pytestCheckHook pytest-django - pytest-lazy-fixture + pytest-lazy-fixtures pytz ]; diff --git a/pkgs/development/python-modules/django-tree-queries/default.nix b/pkgs/development/python-modules/django-tree-queries/default.nix index 6484ff054d24..3c49051b1a1c 100644 --- a/pkgs/development/python-modules/django-tree-queries/default.nix +++ b/pkgs/development/python-modules/django-tree-queries/default.nix @@ -4,20 +4,21 @@ fetchFromGitHub, hatchling, django, + pytest-cov-stub, pytest-django, pytestCheckHook, }: buildPythonPackage rec { pname = "django-tree-queries"; - version = "0.19"; + version = "0.23"; pyproject = true; src = fetchFromGitHub { owner = "feincms"; repo = "django-tree-queries"; tag = version; - hash = "sha256-0RSmwgyXaLCp2GcUZ0l7zkyofd5qemd/er+7KfGsoGM="; + hash = "sha256-ZAR93mleN4Gqf9v2ufnPjIqatkygpvXoLpfN4bJpHw8="; }; build-system = [ @@ -26,6 +27,7 @@ buildPythonPackage rec { nativeCheckInputs = [ django + pytest-cov-stub pytest-django pytestCheckHook ]; diff --git a/pkgs/development/python-modules/django-treebeard/default.nix b/pkgs/development/python-modules/django-treebeard/default.nix index d386010f81d7..2be7692434bd 100644 --- a/pkgs/development/python-modules/django-treebeard/default.nix +++ b/pkgs/development/python-modules/django-treebeard/default.nix @@ -2,22 +2,27 @@ lib, buildPythonPackage, django, - fetchPypi, + fetchFromGitHub, pytest-django, pytestCheckHook, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-treebeard"; - version = "4.7.1"; - format = "setuptools"; + version = "4.8.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-hG5GKQS0NxVfduBJB7pOSEgHFoVfiLiY30Eivc+9bpg="; + src = fetchFromGitHub { + owner = "django-treebeard"; + repo = "django-treebeard"; + tag = finalAttrs.version; + hash = "sha256-DrjI0HlrJhNqrYul3SO0xkkFwjWRn94OgvTA/Z3wv84="; }; - propagatedBuildInputs = [ django ]; + build-system = [ setuptools ]; + + dependencies = [ django ]; nativeCheckInputs = [ pytest-django @@ -29,7 +34,7 @@ buildPythonPackage rec { meta = { description = "Efficient tree implementations for Django"; homepage = "https://tabo.pe/projects/django-treebeard/"; - changelog = "https://github.com/django-treebeard/django-treebeard/blob/${version}/CHANGES.md"; + changelog = "https://github.com/django-treebeard/django-treebeard/blob/${finalAttrs.src.tag}/CHANGES.md"; license = lib.licenses.asl20; }; -} +}) diff --git a/pkgs/development/python-modules/django-two-factor-auth/default.nix b/pkgs/development/python-modules/django-two-factor-auth/default.nix index 772f74c0560a..fae47ecf5082 100644 --- a/pkgs/development/python-modules/django-two-factor-auth/default.nix +++ b/pkgs/development/python-modules/django-two-factor-auth/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "django-two-factor-auth"; - version = "1.17.0"; + version = "1.18.1"; pyproject = true; src = fetchFromGitHub { owner = "jazzband"; repo = "django-two-factor-auth"; tag = version; - hash = "sha256-gg5QpPQbYnQr7KkCXFZ9Gnz48Cf4Nm67uV6JuyxK18c="; + hash = "sha256-rhcEVmh5Am1TKO+01rb9VBKJdFVa8uRdTimEKq2pA7w="; }; build-system = [ setuptools-scm ]; @@ -65,7 +65,7 @@ buildPythonPackage rec { meta = { description = "Complete Two-Factor Authentication for Django"; homepage = "https://github.com/jazzband/django-two-factor-auth"; - changelog = "https://github.com/jazzband/django-two-factor-auth/releases/tag/${version}"; + changelog = "https://github.com/jazzband/django-two-factor-auth/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ derdennisop ]; }; diff --git a/pkgs/development/python-modules/django/django_5_disable_failing_tests.patch b/pkgs/development/python-modules/django/5.2/disable-failing-test.patch similarity index 100% rename from pkgs/development/python-modules/django/django_5_disable_failing_tests.patch rename to pkgs/development/python-modules/django/5.2/disable-failing-test.patch diff --git a/pkgs/development/python-modules/django/django_5_set_geos_gdal_lib.patch b/pkgs/development/python-modules/django/5.2/gdal.patch similarity index 100% rename from pkgs/development/python-modules/django/django_5_set_geos_gdal_lib.patch rename to pkgs/development/python-modules/django/5.2/gdal.patch diff --git a/pkgs/development/python-modules/django/django_5_tests_pythonpath.patch b/pkgs/development/python-modules/django/5.2/pythonpath.patch similarity index 100% rename from pkgs/development/python-modules/django/django_5_tests_pythonpath.patch rename to pkgs/development/python-modules/django/5.2/pythonpath.patch diff --git a/pkgs/development/python-modules/django/django_5_set_zoneinfo_dir.patch b/pkgs/development/python-modules/django/5.2/zoneinfo.patch similarity index 100% rename from pkgs/development/python-modules/django/django_5_set_zoneinfo_dir.patch rename to pkgs/development/python-modules/django/5.2/zoneinfo.patch diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix index d35469b1af38..621ff3972623 100644 --- a/pkgs/development/python-modules/django/5.nix +++ b/pkgs/development/python-modules/django/5.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch, replaceVars, # build-system @@ -42,39 +41,27 @@ buildPythonPackage rec { pname = "django"; - version = "5.2.9"; + version = "5.2.11"; pyproject = true; src = fetchFromGitHub { owner = "django"; repo = "django"; tag = version; - hash = "sha256-9URe8hB15WP92AU1YgGGFfZhVxn59gfBRrORZ04L+F0="; + hash = "sha256-Ldscb87ts0CPbt5uBiL3DK3qhU6SzTmsEUl90Afko84="; }; patches = [ - (replaceVars ./django_5_set_zoneinfo_dir.patch { + (replaceVars ./5.2/zoneinfo.patch { zoneinfo = tzdata + "/share/zoneinfo"; }) # prevent tests from messing with our pythonpath - ./django_5_tests_pythonpath.patch + ./5.2/pythonpath.patch # disable test that expects timezone issues - ./django_5_disable_failing_tests.patch - - # 3.14.1/3.13.10 comapt - (fetchpatch { - # https://github.com/django/django/pull/20390 - url = "https://github.com/django/django/commit/5ca0f62213911a77dd4a62e843db7e420cc98b78.patch"; - hash = "sha256-SpVdbS4S5wqvrrUOoZJ7d2cIbtmgI0mvxwwCveSA068="; - }) - (fetchpatch { - # https://github.com/django/django/pull/20392 - url = "https://github.com/django/django/commit/9cc231e8243091519f5d627cd02ee40bbb853ced.patch"; - hash = "sha256-/aimmqxurMCCntraxOtybEq8qNgZgQWLD5Gxs/3pkIU="; - }) + ./5.2/disable-failing-test.patch ] ++ lib.optionals withGdal [ - (replaceVars ./django_5_set_geos_gdal_lib.patch { + (replaceVars ./5.2/gdal.patch { geos = geos; gdal = gdal; extension = stdenv.hostPlatform.extensions.sharedLibrary; diff --git a/pkgs/development/python-modules/django/6.nix b/pkgs/development/python-modules/django/6.nix new file mode 100644 index 000000000000..148b597baaf7 --- /dev/null +++ b/pkgs/development/python-modules/django/6.nix @@ -0,0 +1,143 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + replaceVars, + + # build-system + setuptools, + + # patched in + geos, + gdal, + withGdal ? false, + + # dependencies + asgiref, + sqlparse, + + # optional-dependencies + argon2-cffi, + bcrypt, + + # tests + aiosmtpd, + docutils, + geoip2, + jinja2, + numpy, + pillow, + pylibmc, + pymemcache, + python, + pyyaml, + pytz, + redis, + selenium, + tblib, + tzdata, +}: + +buildPythonPackage (finalAttrs: { + pname = "django"; + version = "6.0.2"; + pyproject = true; + + disabled = pythonOlder "3.12"; + + src = fetchFromGitHub { + owner = "django"; + repo = "django"; + tag = finalAttrs.version; + hash = "sha256-59zbILbU+G9q7hwF8IbipykZLCWEHEx+cLRglJpvuQw="; + }; + + patches = [ + (replaceVars ./6.x/zoneinfo.patch { + zoneinfo = tzdata + "/share/zoneinfo"; + }) + # prevent tests from messing with our pythonpath + ./6.x/pythonpath.patch + # test_incorrect_timezone should raise but doesn't + ./6.x/disable-failing-test.patch + ] + ++ lib.optionals withGdal [ + (replaceVars ./6.x/gdal.patch { + geos = geos; + gdal = gdal; + extension = stdenv.hostPlatform.extensions.sharedLibrary; + }) + ]; + + postPatch = '' + substituteInPlace tests/utils_tests/test_autoreload.py \ + --replace-fail "/usr/bin/python" "${python.interpreter}" + ''; + + build-system = [ setuptools ]; + + dependencies = [ + asgiref + sqlparse + ]; + + optional-dependencies = { + argon2 = [ argon2-cffi ]; + bcrypt = [ bcrypt ]; + }; + + nativeCheckInputs = [ + # tests/requirements/py3.txt + aiosmtpd + docutils + geoip2 + jinja2 + numpy + pillow + pylibmc + pymemcache + pyyaml + pytz + redis + selenium + tblib + tzdata + ] + ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; + + preCheck = '' + # make sure the installed library gets imported + rm -rf django + + # fails to import github_links from docs/_ext/github_links.py + rm tests/sphinx/test_github_links.py + + # provide timezone data, works only on linux + export TZDIR=${tzdata}/${python.sitePackages}/tzdata/zoneinfo + + export PYTHONPATH=$PWD/docs/_ext:$PYTHONPATH + ''; + + checkPhase = '' + runHook preCheck + + pushd tests + # without --parallel=1, tests fail with an "unexpected error due to a database lock" on Darwin + ${python.interpreter} runtests.py --settings=test_sqlite ${lib.optionalString stdenv.hostPlatform.isDarwin "--parallel=1"} + popd + + runHook postCheck + ''; + + __darwinAllowLocalNetworking = true; + + meta = with lib; { + changelog = "https://docs.djangoproject.com/en/${lib.versions.majorMinor finalAttrs.version}/releases/${finalAttrs.version}/"; + description = "High-level Python Web framework that encourages rapid development and clean, pragmatic design"; + homepage = "https://www.djangoproject.com"; + license = licenses.bsd3; + maintainers = with maintainers; [ hexa ]; + }; +}) diff --git a/pkgs/development/python-modules/django/6.x/disable-failing-test.patch b/pkgs/development/python-modules/django/6.x/disable-failing-test.patch new file mode 100644 index 000000000000..9245d8f1cc2a --- /dev/null +++ b/pkgs/development/python-modules/django/6.x/disable-failing-test.patch @@ -0,0 +1,21 @@ +diff --git a/tests/settings_tests/tests.py b/tests/settings_tests/tests.py +index 7794aeef9a..1b6be46ffa 100644 +--- a/tests/settings_tests/tests.py ++++ b/tests/settings_tests/tests.py +@@ -2,7 +2,7 @@ import os + import sys + import unittest + from types import ModuleType, SimpleNamespace +-from unittest import mock ++from unittest import mock, skip + + from django.conf import ENVIRONMENT_VARIABLE, LazySettings, Settings, settings + from django.core.exceptions import ImproperlyConfigured +@@ -334,6 +334,7 @@ class SettingsTests(SimpleTestCase): + getattr(s, "foo") + + @requires_tz_support ++ @skip("Assertion fails, exception does not get raised") + @mock.patch("django.conf.global_settings.TIME_ZONE", "test") + def test_incorrect_timezone(self): + with self.assertRaisesMessage(ValueError, "Incorrect timezone setting: test"): diff --git a/pkgs/development/python-modules/django/6.x/gdal.patch b/pkgs/development/python-modules/django/6.x/gdal.patch new file mode 100644 index 000000000000..a7e32ee92c0e --- /dev/null +++ b/pkgs/development/python-modules/django/6.x/gdal.patch @@ -0,0 +1,26 @@ +diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py +index f92a1cdea0..037a926dfe 100644 +--- a/django/contrib/gis/gdal/libgdal.py ++++ b/django/contrib/gis/gdal/libgdal.py +@@ -15,7 +15,7 @@ try: + + lib_path = settings.GDAL_LIBRARY_PATH + except (AttributeError, ImportError, ImproperlyConfigured, OSError): +- lib_path = None ++ lib_path = "@gdal@/lib/libgdal@extension@" + + if lib_path: + lib_names = None +diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py +index feb225cf8c..cf5797d786 100644 +--- a/django/contrib/gis/geos/libgeos.py ++++ b/django/contrib/gis/geos/libgeos.py +@@ -26,7 +26,7 @@ def load_geos(): + + lib_path = settings.GEOS_LIBRARY_PATH + except (AttributeError, ImportError, ImproperlyConfigured, OSError): +- lib_path = None ++ lib_path = "@geos@/lib/libgeos_c@extension@" + + # Setting the appropriate names for the GEOS-C library. + if lib_path: diff --git a/pkgs/development/python-modules/django/6.x/pythonpath.patch b/pkgs/development/python-modules/django/6.x/pythonpath.patch new file mode 100644 index 000000000000..c44f9c9b5141 --- /dev/null +++ b/pkgs/development/python-modules/django/6.x/pythonpath.patch @@ -0,0 +1,12 @@ +diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py +index 0c27194568..37ee505c21 100644 +--- a/tests/admin_scripts/tests.py ++++ b/tests/admin_scripts/tests.py +@@ -132,6 +132,7 @@ class AdminScriptTestCase(SimpleTestCase): + del test_environ["DJANGO_SETTINGS_MODULE"] + python_path = [base_dir, django_dir, tests_dir] + python_path.extend(ext_backend_base_dirs) ++ python_path.extend(sys.path) + test_environ["PYTHONPATH"] = os.pathsep.join(python_path) + test_environ["PYTHONWARNINGS"] = "" + diff --git a/pkgs/development/python-modules/django/6.x/zoneinfo.patch b/pkgs/development/python-modules/django/6.x/zoneinfo.patch new file mode 100644 index 000000000000..2e61ec037118 --- /dev/null +++ b/pkgs/development/python-modules/django/6.x/zoneinfo.patch @@ -0,0 +1,13 @@ +diff --git a/django/conf/__init__.py b/django/conf/__init__.py +index c7ae36aba0..ef322b8251 100644 +--- a/django/conf/__init__.py ++++ b/django/conf/__init__.py +@@ -185,7 +185,7 @@ class Settings: + if hasattr(time, "tzset") and self.TIME_ZONE: + # When we can, attempt to validate the timezone. If we can't find + # this file, no check happens and it's harmless. +- zoneinfo_root = Path("/usr/share/zoneinfo") ++ zoneinfo_root = Path("@zoneinfo@") + zone_info_file = zoneinfo_root.joinpath(*self.TIME_ZONE.split("/")) + if zoneinfo_root.exists() and not zone_info_file.exists(): + raise ValueError("Incorrect timezone setting: %s" % self.TIME_ZONE) diff --git a/pkgs/development/python-modules/djangorestframework-stubs/default.nix b/pkgs/development/python-modules/djangorestframework-stubs/default.nix index a7e66d47261a..2a9600808084 100644 --- a/pkgs/development/python-modules/djangorestframework-stubs/default.nix +++ b/pkgs/development/python-modules/djangorestframework-stubs/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "djangorestframework-stubs"; - version = "3.16.2"; + version = "3.16.7"; pyproject = true; src = fetchFromGitHub { owner = "typeddjango"; repo = "djangorestframework-stubs"; tag = version; - hash = "sha256-A6IyRJwuc0eqRtkCHtWN5C5yCMdgxfygqmpHV+/MJhE="; + hash = "sha256-reOx6b1isu6wtC8cM8KI1HEr5wfJUNIeQd2YaZjIRnQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index cd6255364eb9..f8b4577aa08b 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -9,7 +9,6 @@ # dependencies django, - pytz, # optional-dependencies coreapi, @@ -23,48 +22,45 @@ # tests pytestCheckHook, pytest-django, + pytz, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "djangorestframework"; - version = "3.16.0"; + version = "3.16.1"; pyproject = true; src = fetchFromGitHub { owner = "encode"; repo = "django-rest-framework"; - rev = version; - hash = "sha256-LFq8mUx+jAFFnQTfysYs+DSN941p+8h9mDDOp+LO7VU="; + tag = finalAttrs.version; + hash = "sha256-kjviZFuGt/x0RSc7wwl/+SeYQ5AGuv0e7HMhAmu4IgY="; }; build-system = [ setuptools ]; dependencies = [ django - pygments - ] - ++ (lib.optional (lib.versionOlder django.version "5.0.0") pytz); + ]; optional-dependencies = { complete = [ + coreapi coreschema django-guardian inflection psycopg2 pygments pyyaml - ] - ++ lib.optionals (pythonOlder "3.13") [ - # broken on 3.13 - coreapi ]; }; nativeCheckInputs = [ pytest-django pytestCheckHook + pytz ] - ++ optional-dependencies.complete; + ++ finalAttrs.passthru.optional-dependencies.complete; disabledTests = [ # https://github.com/encode/django-rest-framework/issues/9422 @@ -74,9 +70,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "rest_framework" ]; meta = { - changelog = "https://github.com/encode/django-rest-framework/releases/tag/3.15.1"; + changelog = "https://github.com/encode/django-rest-framework/releases/tag/${finalAttrs.src.tag}"; description = "Web APIs for Django, made easy"; homepage = "https://www.django-rest-framework.org/"; license = lib.licenses.bsd2; }; -} +}) diff --git a/pkgs/development/python-modules/dmgbuild/default.nix b/pkgs/development/python-modules/dmgbuild/default.nix index 319003ed6b90..899bd5992a02 100644 --- a/pkgs/development/python-modules/dmgbuild/default.nix +++ b/pkgs/development/python-modules/dmgbuild/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "dmgbuild"; - version = "1.6.2"; + version = "1.6.7"; pyproject = true; src = fetchFromGitHub { owner = "dmgbuild"; repo = "dmgbuild"; tag = "v${version}"; - hash = "sha256-PozYxmXumFnptIgb4FM4b/Q5tx0MIS2bVw2kCuGucA8="; + hash = "sha256-dJHUpMPsYTgJdR3FoIzrH6C/VLWXlktW3o8VXeHxey8="; }; postPatch = '' @@ -47,7 +47,7 @@ buildPythonPackage rec { meta = { description = "MacOS command line utility to build disk images"; homepage = "https://github.com/dmgbuild/dmgbuild"; - changelog = "https://github.com/dmgbuild/dmgbuild/releases/tag/v${version}"; + changelog = "https://github.com/dmgbuild/dmgbuild/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ moraxyc ]; mainProgram = "dmgbuild"; diff --git a/pkgs/development/python-modules/docling-jobkit/default.nix b/pkgs/development/python-modules/docling-jobkit/default.nix index fcbbff916315..c4157254da97 100644 --- a/pkgs/development/python-modules/docling-jobkit/default.nix +++ b/pkgs/development/python-modules/docling-jobkit/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "docling-jobkit"; - version = "1.5.0"; + version = "1.8.1"; pyproject = true; src = fetchFromGitHub { owner = "docling-project"; repo = "docling-jobkit"; tag = "v${version}"; - hash = "sha256-/rFMP5KiWHBsGaA2LVOWP2TkJLVeguIlrmO+JL610hQ="; + hash = "sha256-9DzQY/XMmx/8XP1bMYZYl+Bp7AVcYfuv3MtO6lvQ/24="; }; build-system = [ diff --git a/pkgs/development/python-modules/docling-mcp/default.nix b/pkgs/development/python-modules/docling-mcp/default.nix index 4e5f5599105d..ea2216b2cd9a 100644 --- a/pkgs/development/python-modules/docling-mcp/default.nix +++ b/pkgs/development/python-modules/docling-mcp/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "docling-mcp"; - version = "1.3.1"; + version = "1.3.3"; pyproject = true; src = fetchFromGitHub { owner = "docling-project"; repo = "docling-mcp"; tag = "v${version}"; - hash = "sha256-MEGj/tPHDZqvgqmzXsoeEIWWU7vlLo8H4KhMFgf6q2c="; + hash = "sha256-OyLL8g9fh1H9N3i5ok885IzC5pFckMoqsjd8oX/HdRY="; }; pythonRemoveDeps = [ diff --git a/pkgs/development/python-modules/docling-parse/default.nix b/pkgs/development/python-modules/docling-parse/default.nix index ab1a5f14f32a..0cfb2b047488 100644 --- a/pkgs/development/python-modules/docling-parse/default.nix +++ b/pkgs/development/python-modules/docling-parse/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "docling-parse"; - version = "4.5.0"; + version = "5.0.0"; pyproject = true; src = fetchFromGitHub { owner = "docling-project"; repo = "docling-parse"; tag = "v${version}"; - hash = "sha256-8eHYMvfjPuGgrgrlqEh061ug+yer+1nQLbeDR1dQu68="; + hash = "sha256-qxD3ryU1jXf8Gm5/IiG2NTOnRgA6HADPfgBj6Kn+Pj4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/docling-serve/default.nix b/pkgs/development/python-modules/docling-serve/default.nix index b81c15a62747..199d12993e35 100644 --- a/pkgs/development/python-modules/docling-serve/default.nix +++ b/pkgs/development/python-modules/docling-serve/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "docling-serve"; - version = "1.5.1"; + version = "1.10.0"; pyproject = true; src = fetchFromGitHub { owner = "docling-project"; repo = "docling-serve"; tag = "v${version}"; - hash = "sha256-JUHXrvsZBF/WHxsMT1xkPzpuX483RxF3ZlO+/NUMZ/8="; + hash = "sha256-g0ATehTRtrqgTjvMTs+yvFdFwXTZ8AWsO+Hljwlcbto="; }; build-system = [ diff --git a/pkgs/development/python-modules/docling/default.nix b/pkgs/development/python-modules/docling/default.nix index 783bb524f318..d58e3a9198a0 100644 --- a/pkgs/development/python-modules/docling/default.nix +++ b/pkgs/development/python-modules/docling/default.nix @@ -52,14 +52,14 @@ buildPythonPackage rec { pname = "docling"; - version = "2.47.1"; + version = "2.69.1"; pyproject = true; src = fetchFromGitHub { owner = "docling-project"; repo = "docling"; tag = "v${version}"; - hash = "sha256-U82hGvWXkKwZ4um0VevVoYiIfzswu5hLDYvxtqJqmHU="; + hash = "sha256-r7jAah/tqLylPyyzrK0NW2ok66NVdb/V/YLV95McGC4="; }; build-system = [ diff --git a/pkgs/development/python-modules/docplex/default.nix b/pkgs/development/python-modules/docplex/default.nix index 23c123aa6c81..3f3f7674cda1 100644 --- a/pkgs/development/python-modules/docplex/default.nix +++ b/pkgs/development/python-modules/docplex/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "docplex"; - version = "2.30.251"; + version = "2.31.254"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ZQMhn1tRJ1p+TnfKQzKQOw+Akl0gUDCkjT9qp8oNvyo="; + hash = "sha256-LGMpeN3r9/xIzLhGwtWrTrXs0CUMDGEmspu6vVNpwEY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/docutils/default.nix b/pkgs/development/python-modules/docutils/default.nix index 4d1758c3ab44..9c798666f445 100644 --- a/pkgs/development/python-modules/docutils/default.nix +++ b/pkgs/development/python-modules/docutils/default.nix @@ -13,12 +13,12 @@ let self = buildPythonPackage rec { pname = "docutils"; - version = "0.21.2"; + version = "0.22.4"; pyproject = true; src = fetchurl { url = "mirror://sourceforge/docutils/docutils-${version}.tar.gz"; - hash = "sha256-OmsYcy7fGC2qPNEndbuzOM9WkUaPke7rEJ3v9uv6mG8="; + hash = "sha256-TbU7H96avsu3TZEjDTKrYm2U9rrfxXXW25GUpJ3ymWg="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/docx2python/default.nix b/pkgs/development/python-modules/docx2python/default.nix index 5a47b3ee57a3..08dbbdc24756 100644 --- a/pkgs/development/python-modules/docx2python/default.nix +++ b/pkgs/development/python-modules/docx2python/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "docx2python"; - version = "3.3.0"; + version = "4.0.0"; pyproject = true; src = fetchFromGitHub { owner = "ShayHill"; repo = "docx2python"; tag = version; - hash = "sha256-u1zOMfYMhmBsvUcfG7UEMvKT9U5XEkBalGtMOgN8RCU="; + hash = "sha256-seOm5u5PDqDaPytQ8kfVr0CJV/Uv4NtWhmANWcSLp/M="; }; build-system = [ @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = { description = "Extract docx headers, footers, (formatted) text, footnotes, endnotes, properties, and images"; homepage = "https://github.com/ShayHill/docx2python"; - changelog = "https://github.com/ShayHill/docx2python/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/ShayHill/docx2python/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/dogpile-cache/default.nix b/pkgs/development/python-modules/dogpile-cache/default.nix index 1da77c52dede..0f0c8c5a4c1e 100644 --- a/pkgs/development/python-modules/dogpile-cache/default.nix +++ b/pkgs/development/python-modules/dogpile-cache/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "dogpile-cache"; - version = "1.4.1"; + version = "1.5.0"; pyproject = true; src = fetchPypi { pname = "dogpile_cache"; inherit version; - hash = "sha256-4lxg5nel4o/4YSR2X78YxTJXvNeDB0nNW6NQrOKhKYk="; + hash = "sha256-hJxVc8mjjxVc1BcxA8cCtjft4DYcEuhkh2h30M0SXuw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/dramatiq/default.nix b/pkgs/development/python-modules/dramatiq/default.nix index 71401af22f5e..3600b0aa51fb 100644 --- a/pkgs/development/python-modules/dramatiq/default.nix +++ b/pkgs/development/python-modules/dramatiq/default.nix @@ -8,6 +8,7 @@ prometheus-client, pylibmc, pytestCheckHook, + pytest-benchmark, pytest-cov-stub, redis, setuptools, @@ -17,14 +18,14 @@ buildPythonPackage rec { pname = "dramatiq"; - version = "1.18.0"; + version = "2.0.1"; pyproject = true; src = fetchFromGitHub { owner = "Bogdanp"; repo = "dramatiq"; tag = "v${version}"; - hash = "sha256-noq2tWi7IUdYmRB9N3MN9oWrnNaYBgXFumOpcGw8Jn0="; + hash = "sha256-VqMHSn2mdkO140t7IpZt32OHoEU0nEXiRWJ0w6Km0o8="; }; build-system = [ setuptools ]; @@ -53,16 +54,13 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-cov-stub + pytest-benchmark pika redis pylibmc ]; - postPatch = '' - sed -i ./setup.cfg \ - -e 's:--benchmark-autosave::' \ - -e 's:--benchmark-compare::' \ - ''; + pytestFlags = [ "--benchmark-disable" ]; disabledTests = [ # Requires a running redis diff --git a/pkgs/development/python-modules/drf-orjson-renderer/default.nix b/pkgs/development/python-modules/drf-orjson-renderer/default.nix index a234c66c9929..8dd94574fdf7 100644 --- a/pkgs/development/python-modules/drf-orjson-renderer/default.nix +++ b/pkgs/development/python-modules/drf-orjson-renderer/default.nix @@ -8,16 +8,16 @@ orjson, }: -buildPythonPackage { +buildPythonPackage (finalAttrs: { pname = "drf-orjson-renderer"; - version = "1.7.3"; + version = "1.8.0"; pyproject = true; src = fetchFromGitHub { owner = "brianjbuck"; repo = "drf_orjson_renderer"; - rev = "8885ef748f0152927106ee068375429774a519df"; - hash = "sha256-opC7KcuTg7kdl8xy8H8ZszJb5nn8vJCpRUUIizdnYqU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-PMVb+BtTl25BsftQhYlKdEhGhhH3HTlROVYsm+7PBjY="; }; build-system = [ setuptools ]; @@ -32,9 +32,10 @@ buildPythonPackage { pythonImportsCheck = [ "drf_orjson_renderer" ]; meta = { + changelog = "https://github.com/brianjbuck/drf_orjson_renderer/releases/tag/${finalAttrs.src.tag}"; description = "JSON renderer and parser for Django Rest Framework using the orjson library"; homepage = "https://github.com/brianjbuck/drf_orjson_renderer"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ jvanbruegge ]; }; -} +}) diff --git a/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix b/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix index 4cafc401f499..18b7e38f43ee 100644 --- a/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix +++ b/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "drf-spectacular-sidecar"; - version = "2025.12.1"; + version = "2026.1.1"; pyproject = true; src = fetchFromGitHub { owner = "tfranzel"; repo = "drf-spectacular-sidecar"; tag = version; - hash = "sha256-OPUTLI/BZTATa3f2RwoM0LbDKWXUCBEKtkTgG8OUgTI="; + hash = "sha256-8+KfFyGcwA99mSZi95uOqOqzcJUa1GXu0BYva+hJDOw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/drf-yasg/default.nix b/pkgs/development/python-modules/drf-yasg/default.nix index 9cf5f63a7975..16130db8b06d 100644 --- a/pkgs/development/python-modules/drf-yasg/default.nix +++ b/pkgs/development/python-modules/drf-yasg/default.nix @@ -19,17 +19,18 @@ buildPythonPackage rec { pname = "drf-yasg"; - version = "1.21.10"; + version = "1.21.14"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-+G1Q+u48MfzsRUWYWocfgyNmx/tbd7YsSAidVuz0+NQ="; + inherit version; + pname = "drf_yasg"; + hash = "sha256-aNYtX3UFYRupV3EVyDs2IRzCDZdIpQzpWkSr5BFyfRA="; }; postPatch = '' - # https://github.com/axnsan12/drf-yasg/pull/710 - sed -i "/packaging/d" requirements/base.txt + substituteInPlace pyproject.toml \ + --replace-fail "setuptools-scm ~= 7.0" "setuptools-scm >= 7.0" ''; build-system = [ diff --git a/pkgs/development/python-modules/ds-store/default.nix b/pkgs/development/python-modules/ds-store/default.nix index fe0638df9643..26a525c98cc0 100644 --- a/pkgs/development/python-modules/ds-store/default.nix +++ b/pkgs/development/python-modules/ds-store/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "ds-store"; - version = "1.3.1"; + version = "1.3.2"; pyproject = true; src = fetchFromGitHub { owner = "al45tair"; repo = "ds_store"; tag = "v${version}"; - hash = "sha256-45lmkE61uXVCBUMyVVzowTJoALY1m9JI68s7Yb0vCks="; + hash = "sha256-UqBZ6w9y+eOQ+OdhXJReT4GwaxEbrGFvmUQMrNyBdjU="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/duct-py/default.nix b/pkgs/development/python-modules/duct-py/default.nix index cb7d092be27b..27da99cb6319 100644 --- a/pkgs/development/python-modules/duct-py/default.nix +++ b/pkgs/development/python-modules/duct-py/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "duct-py"; - version = "0.6.4"; + version = "1.0.1"; format = "setuptools"; src = fetchFromGitHub { owner = "oconnor663"; repo = "duct.py"; - rev = version; - hash = "sha256-4ja/SQ9R/SbKlf3NqKxLi+Fl/4JI0Fl/zG9EmTZjWZc="; + tag = version; + hash = "sha256-i811nQB8CVJPYPR0Jdzpk64EXxrTMDIBpdDoUs9Xu/k="; }; pythonImportsCheck = [ "duct" ]; diff --git a/pkgs/development/python-modules/duecredit/default.nix b/pkgs/development/python-modules/duecredit/default.nix index e735931dc34f..04542f8938b8 100644 --- a/pkgs/development/python-modules/duecredit/default.nix +++ b/pkgs/development/python-modules/duecredit/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "duecredit"; - version = "0.10.2"; + version = "0.11.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-/nOiDk+7LZcroB7fN97BsLoeZG7+XvTMrwxnJMoofUI="; + hash = "sha256-e1wa4Qkn+eAs9NVOLHSoqgDNKcONY33v48lI09jp8zo="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index b2ed18893711..a30f62726f83 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -11,6 +11,7 @@ gnupg, gpgme, merge3, + openssh, paramiko, pytestCheckHook, rich, @@ -23,19 +24,19 @@ buildPythonPackage rec { pname = "dulwich"; - version = "0.24.1"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "jelmer"; repo = "dulwich"; tag = "dulwich-${version}"; - hash = "sha256-GGVvTKDLWPcx1f28Esl9sDXj33157NhSssYD/C+fLy4="; + hash = "sha256-7/aXxwK6LmERD8CSo+b1uuNVBrXcbBvksZ1YY28vB8A="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-qGAvy0grueKI+A0nsXntf/EWtozSc138iFDhlfiktK8="; + hash = "sha256-O35g5LflL8ZF0HNWdsqg1mp09dKFNrryz23G1WZhhPE="; }; nativeBuildInputs = [ @@ -70,6 +71,7 @@ buildPythonPackage rec { geventhttpclient git glibcLocales + openssh # for ssh-keygen pytestCheckHook ] ++ lib.concatAttrValues optional-dependencies; @@ -77,21 +79,19 @@ buildPythonPackage rec { enabledTestPaths = [ "tests" ]; disabledTests = [ - # AssertionError: 'C:\\\\foo.bar\\\\baz' != 'C:\\foo.bar\\baz' - "test_file_win" - # dulwich.errors.NotGitRepository: No git repository was found at . - "WorktreeCliTests" - # Adding a symlink to a directory outside the repo doesn't raise - "test_add_symlink_absolute_to_system" # Depends on setuid which is not available in sandboxed environments "SharedRepositoryTests" - # TypeError: pack index v1 only supports SHA-1 names - "test_pack_index_v1_with_sha256" ]; + preCheck = '' + export TMPDIR=$(mktemp -d) + ''; + disabledTestPaths = [ # "Code [in contrib] is not an official part of Dulwich, and may no longer work" "tests/contrib" + # AssertionError: GPGMEError not raised + "tests/test_signature.py::GPGSignatureVendorTests::test_verify_invalid_signature" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/durationpy/default.nix b/pkgs/development/python-modules/durationpy/default.nix index a86bc41ec301..470749bf0b03 100644 --- a/pkgs/development/python-modules/durationpy/default.nix +++ b/pkgs/development/python-modules/durationpy/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "durationpy"; - version = "0.9"; + version = "0.10"; pyproject = true; src = fetchFromGitHub { owner = "icholy"; repo = "durationpy"; - rev = version; - hash = "sha256-R/cZPnUUlosGHCOcqwRJ0GJlcB6Lu5a3e5h1CQ6fysA="; + tag = version; + hash = "sha256-tJ3zOCROkwFWzTgIKx+0H7J1rNkwy5XJPh8Zec7jJ5g="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/dvc-s3/default.nix b/pkgs/development/python-modules/dvc-s3/default.nix index 8bc579742710..af81d9568130 100644 --- a/pkgs/development/python-modules/dvc-s3/default.nix +++ b/pkgs/development/python-modules/dvc-s3/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "dvc-s3"; - version = "3.2.2"; + version = "3.3.0"; pyproject = true; src = fetchPypi { pname = "dvc_s3"; inherit version; - hash = "sha256-Dqcsm2sADf6hqDTUEGczts3HRdCm7h1cCluMg0RnFxY="; + hash = "sha256-8dcYpE3O5Rkb60bkSt9LsiiCy46czdjyZAB4q8VkV9Q="; }; # Prevent circular dependency diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix index 6b0a2881c8e5..ea3a0a7a9266 100644 --- a/pkgs/development/python-modules/easy-thumbnails/default.nix +++ b/pkgs/development/python-modules/easy-thumbnails/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, django, fetchFromGitHub, - fetchpatch, pillow, reportlab, svglib, @@ -15,24 +14,16 @@ buildPythonPackage rec { pname = "easy-thumbnails"; - version = "2.10.0"; + version = "2.10.1"; pyproject = true; src = fetchFromGitHub { owner = "SmileyChris"; repo = "easy-thumbnails"; tag = version; - hash = "sha256-8JTHYQIBbu/4fknK2ZEQeDSgaxKGDfflxumcFMpaGQk="; + hash = "sha256-GPZ99OaQRSogS8gJXz8rVUjUeNkEk019TYx0VWa0Q6I="; }; - patches = [ - (fetchpatch { - name = "python313-compat.patch"; - url = "https://github.com/SmileyChris/easy-thumbnails/pull/650.patch"; - hash = "sha256-qD/YnDlDZ7DghLv/mxjQ2o6pSl3fGR+Ipx5NX2BV6zc="; - }) - ]; - build-system = [ setuptools ]; dependencies = [ @@ -67,7 +58,7 @@ buildPythonPackage rec { meta = { description = "Easy thumbnails for Django"; homepage = "https://github.com/SmileyChris/easy-thumbnails"; - changelog = "https://github.com/SmileyChris/easy-thumbnails/blob/${version}/CHANGES.rst"; + changelog = "https://github.com/SmileyChris/easy-thumbnails/blob/${src.tag}/CHANGES.rst"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.onny ]; }; diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix index 189bc10bc20d..add1d5724f05 100644 --- a/pkgs/development/python-modules/elastic-apm/default.nix +++ b/pkgs/development/python-modules/elastic-apm/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "elastic-apm"; - version = "6.24.1"; + version = "6.25.0"; pyproject = true; src = fetchFromGitHub { owner = "elastic"; repo = "apm-agent-python"; tag = "v${version}"; - hash = "sha256-8Q2fzaIG9dghjt4T00nqffGEfPDr4DEcdeHPJqhU8fs="; + hash = "sha256-0RNZqQqXVI7CkzcKE0qA+iOBkjkH0s7Tre/a38LPW7c="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/electrum-aionostr/default.nix b/pkgs/development/python-modules/electrum-aionostr/default.nix index 93ff8e024733..d39f95fcb5da 100644 --- a/pkgs/development/python-modules/electrum-aionostr/default.nix +++ b/pkgs/development/python-modules/electrum-aionostr/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "electrum-aionostr"; - version = "0.0.11"; + version = "0.1.0"; pyproject = true; build-system = [ setuptools ]; src = fetchPypi { pname = "electrum_aionostr"; inherit version; - hash = "sha256-DusdAeVdS6ssEWJolloLLBFJBlnpaf2GTEUxBFWLz4E="; + hash = "sha256-N3T46DEjiCcuEIUahpyfTT1KVNjVZIUcNuLcQCl77IQ="; }; dependencies = [ diff --git a/pkgs/development/python-modules/electrum-ecc/default.nix b/pkgs/development/python-modules/electrum-ecc/default.nix index 527f3693c511..f162b894da4b 100644 --- a/pkgs/development/python-modules/electrum-ecc/default.nix +++ b/pkgs/development/python-modules/electrum-ecc/default.nix @@ -19,14 +19,14 @@ let in buildPythonPackage rec { pname = "electrum-ecc"; - version = "0.0.5"; + version = "0.0.6"; pyproject = true; build-system = [ setuptools ]; src = fetchPypi { pname = "electrum_ecc"; inherit version; - hash = "sha256-9zO4WWoPeyXINx0Ir2Hvece4cdW0DwWluV0tBesvt9I="; + hash = "sha256-Y2DHH7CLUdgKRV6TjxJrpMeQvnS6ImRh1U16OqaJC4k="; }; env = { diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index 84f764fc5f9a..d0ae92e5bc2d 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "elementpath"; - version = "5.1.0"; + version = "5.1.1"; pyproject = true; src = fetchFromGitHub { owner = "sissaschool"; repo = "elementpath"; tag = "v${version}"; - hash = "sha256-3eVxGBvYkTLHTD5uDE2rB09v0mzj1DkuZb8N1ZFj4qs="; + hash = "sha256-Ngvoq8BugTH8r187S+nUhNX/NRVhhBDX+eVc/zvq08g="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/email-validator/default.nix b/pkgs/development/python-modules/email-validator/default.nix index a2c1d441a141..840b8dfcfd8a 100644 --- a/pkgs/development/python-modules/email-validator/default.nix +++ b/pkgs/development/python-modules/email-validator/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "email-validator"; - version = "2.2.0"; + version = "2.3.0"; format = "setuptools"; src = fetchPypi { pname = "email_validator"; inherit version; - hash = "sha256-y2kPNExhenFPIuZq53FEWhzrRoIRUt+OFlxfmjZFgrc="; + hash = "sha256-n8BcN/L2z0Of9BT4/EbZF5KZdKgiRMIOsQIxumDFRCY="; }; dependencies = [ diff --git a/pkgs/development/python-modules/energyzero/default.nix b/pkgs/development/python-modules/energyzero/default.nix index 94a3fe441a1b..dee80614ff94 100644 --- a/pkgs/development/python-modules/energyzero/default.nix +++ b/pkgs/development/python-modules/energyzero/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "energyzero"; - version = "4.0.1"; + version = "5.0.0"; pyproject = true; src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "python-energyzero"; tag = "v${version}"; - hash = "sha256-Tisng08X/jyNtT27qy1hH6qM6Nqho/X8bg1tFg1oIx8="; + hash = "sha256-gX8clg0xqIhk8/RYV6P5exnzXPLmYLGUX65Y0Nwt2F8="; }; postPatch = '' @@ -51,7 +51,7 @@ buildPythonPackage rec { meta = { description = "Module for getting the dynamic prices from EnergyZero"; homepage = "https://github.com/klaasnicolaas/python-energyzero"; - changelog = "https://github.com/klaasnicolaas/python-energyzero/releases/tag/v${version}"; + changelog = "https://github.com/klaasnicolaas/python-energyzero/releases/tag/${src.tag}"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/entrance/default.nix b/pkgs/development/python-modules/entrance/default.nix index c5aea78bb920..0360444e0408 100644 --- a/pkgs/development/python-modules/entrance/default.nix +++ b/pkgs/development/python-modules/entrance/default.nix @@ -35,12 +35,12 @@ in buildPythonPackage rec { pname = "entrance"; - version = "1.1.20"; + version = "1.1.21"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-PvsP6HXCllW102h3o7abz9uC2AZTwvg5qIqP+rdkk6Y="; + hash = "sha256-1rKQPIhnVVtM93K3Ppg+m4/L4k0YD+mcE9bZhDmfmbo="; }; # The versions of `sanic` and `websockets` in nixpkgs only support 3.6 or later diff --git a/pkgs/development/python-modules/epitran/default.nix b/pkgs/development/python-modules/epitran/default.nix index d0f84f587b11..6261be420cea 100644 --- a/pkgs/development/python-modules/epitran/default.nix +++ b/pkgs/development/python-modules/epitran/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "epitran"; - version = "1.24"; + version = "1.34.0"; pyproject = true; src = fetchFromGitHub { owner = "dmort27"; repo = "epitran"; - tag = version; - hash = "sha256-AH4q8J5oMaUVJ559qe/ZlJXlCcGdxWnxMhnZKCH5Rlk="; + tag = "v${version}"; + hash = "sha256-LKESBSLn2gpXx8kEXmykEkTboIMiS5gZ2Kb9rj1lDTk="; }; build-system = [ setuptools ]; @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = { description = "Tools for transcribing languages into IPA"; homepage = "https://github.com/dmort27/epitran"; - changelog = "https://github.com/dmort27/epitran/releases/tag/${version}"; + changelog = "https://github.com/dmort27/epitran/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ vizid ]; }; diff --git a/pkgs/development/python-modules/es-client/default.nix b/pkgs/development/python-modules/es-client/default.nix index 342310360799..bf1e0c6723e9 100644 --- a/pkgs/development/python-modules/es-client/default.nix +++ b/pkgs/development/python-modules/es-client/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "es-client"; - version = "8.18.2"; + version = "9.0.2"; pyproject = true; src = fetchFromGitHub { owner = "untergeek"; repo = "es_client"; tag = "v${version}"; - hash = "sha256-siB17xVRS/eeKOsJcWdh4foOHXbeV8wwRclXDHodADM="; + hash = "sha256-83EBDmbZuOAVT2oYn98s6XTZrB38lx03nozAkBqHfgg="; }; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/escapism/default.nix b/pkgs/development/python-modules/escapism/default.nix index 80b754aaf3ab..3c691359b3d5 100644 --- a/pkgs/development/python-modules/escapism/default.nix +++ b/pkgs/development/python-modules/escapism/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "escapism"; - version = "1.0.1"; + version = "1.1.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "73256bdfb4f22230f0428fc6efecee61cdc4fad531b6f98b849cb9c80711e4ec"; + sha256 = "sha256-rdEw5IqFuxquo+dPsDH1AzxwVa7bOaMmX5I9X0DD+XQ="; }; # No tests distributed diff --git a/pkgs/development/python-modules/eth-abi/default.nix b/pkgs/development/python-modules/eth-abi/default.nix index 13875854934e..4350c0851aab 100644 --- a/pkgs/development/python-modules/eth-abi/default.nix +++ b/pkgs/development/python-modules/eth-abi/default.nix @@ -35,6 +35,8 @@ buildPythonPackage rec { parsimonious ]; + pythonRelaxDeps = [ "parsimonious" ]; + nativeCheckInputs = [ hypothesis pytestCheckHook diff --git a/pkgs/development/python-modules/etils/default.nix b/pkgs/development/python-modules/etils/default.nix index ba43cd26c647..a547390bba71 100644 --- a/pkgs/development/python-modules/etils/default.nix +++ b/pkgs/development/python-modules/etils/default.nix @@ -7,7 +7,6 @@ # tests chex, jaxlib, - pytest-subtests, pytest-xdist, pytestCheckHook, yapf, @@ -116,7 +115,6 @@ buildPythonPackage rec { nativeCheckInputs = [ chex jaxlib - pytest-subtests pytest-xdist pytestCheckHook yapf diff --git a/pkgs/development/python-modules/euporie/default.nix b/pkgs/development/python-modules/euporie/default.nix index 52c750a132b5..69eb019afc98 100644 --- a/pkgs/development/python-modules/euporie/default.nix +++ b/pkgs/development/python-modules/euporie/default.nix @@ -36,14 +36,14 @@ buildPythonPackage rec { pname = "euporie"; - version = "2.9.1"; + version = "2.10.3"; pyproject = true; src = fetchFromGitHub { owner = "joouha"; repo = "euporie"; tag = "v${version}"; - hash = "sha256-3wP6NzQaudXfACuMKYjWAQjNYQYmqeuyrvQUN8lbgyk="; + hash = "sha256-wXHhv5vK17XDGh+2GTaw7hoSi4tC9jGVoyrfw1yt6Zo="; }; build-system = [ diff --git a/pkgs/development/python-modules/eval-type-backport/default.nix b/pkgs/development/python-modules/eval-type-backport/default.nix index d890c80c76b9..e964ec538083 100644 --- a/pkgs/development/python-modules/eval-type-backport/default.nix +++ b/pkgs/development/python-modules/eval-type-backport/default.nix @@ -8,14 +8,14 @@ }: buildPythonPackage (finalAttrs: { pname = "eval-type-backport"; - version = "0.3.0"; + version = "0.3.1"; format = "setuptools"; src = fetchFromGitHub { owner = "alexmojaki"; repo = "eval_type_backport"; tag = "v${finalAttrs.version}"; - hash = "sha256-K+FrgRyxCbrKHcrUaHEJWlLp2i0xes3HwXPN9ucioZY="; + hash = "sha256-3DV2xMXRImkl1kyvVLTDAQiRPPSnjBRHHTl1S9Usjag="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/everett/default.nix b/pkgs/development/python-modules/everett/default.nix index 718e68c10ef7..bb1cf6d53a63 100644 --- a/pkgs/development/python-modules/everett/default.nix +++ b/pkgs/development/python-modules/everett/default.nix @@ -6,22 +6,26 @@ pytestCheckHook, pyyaml, setuptools, + setuptools-scm, sphinx, }: buildPythonPackage rec { pname = "everett"; - version = "3.4.0"; + version = "3.5.0"; pyproject = true; src = fetchFromGitHub { owner = "willkg"; repo = "everett"; tag = "v${version}"; - hash = "sha256-olYxUbsKaL7C5UTAPwW+EufjbWbbHZdZcQ/lfogNJrg="; + hash = "sha256-5cjPV2pt2x8RmaGWTRWeX3Nb1QeDd7245FZ0tEmYCSk="; }; - build-system = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; dependencies = [ configobj @@ -38,7 +42,7 @@ buildPythonPackage rec { meta = { description = "Python configuration library for your app"; homepage = "https://github.com/willkg/everett"; - changelog = "https://github.com/willkg/everett/releases/tag/${version}"; + changelog = "https://github.com/willkg/everett/releases/tag/${src.tag}"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ jherland ]; }; diff --git a/pkgs/development/python-modules/exceptiongroup/default.nix b/pkgs/development/python-modules/exceptiongroup/default.nix index 6f60d865d3cb..d55affdc2484 100644 --- a/pkgs/development/python-modules/exceptiongroup/default.nix +++ b/pkgs/development/python-modules/exceptiongroup/default.nix @@ -6,21 +6,31 @@ pytestCheckHook, pythonAtLeast, pythonOlder, + isPy313, typing-extensions, }: buildPythonPackage rec { pname = "exceptiongroup"; - version = "1.3.0"; + version = "1.3.1"; pyproject = true; src = fetchFromGitHub { owner = "agronholm"; repo = "exceptiongroup"; tag = version; - hash = "sha256-b3Z1NsYKp0CecUq8kaC/j3xR/ZZHDIw4MhUeadizz88="; + hash = "sha256-3WInufN+Pp6vB/Gik6e8V1a34Dr/oiH3wDMB+2lHRMM="; }; + # CPython fixed https://github.com/python/cpython/issues/141732 in + # https://github.com/python/cpython/pull/141736, but exceptiongroup 1.3.1, + # including its test suite, still matches the old repr behavior. + # The CPython fix has only been backported to 3.13 so far, where it was + # first included in version 3.13.12, so we only need to patch for 3.13 + # and 3.15+. + # Upstream issue: https://github.com/agronholm/exceptiongroup/issues/154 + patches = lib.optional (isPy313 || pythonAtLeast "3.15") ./match-repr-fix.patch; + build-system = [ flit-scm ]; dependencies = lib.optionals (pythonOlder "3.13") [ typing-extensions ]; diff --git a/pkgs/development/python-modules/exceptiongroup/match-repr-fix.patch b/pkgs/development/python-modules/exceptiongroup/match-repr-fix.patch new file mode 100644 index 000000000000..ed09c9f39600 --- /dev/null +++ b/pkgs/development/python-modules/exceptiongroup/match-repr-fix.patch @@ -0,0 +1,48 @@ +From 9be2b65dbd8366da27cd79c09195493217dbf539 Mon Sep 17 00:00:00 2001 +From: Tom Hunze +Date: Sat, 7 Feb 2026 11:37:49 +0100 +Subject: [PATCH] Fix `ExceptionGroup` repr changing when original exception + sequence is mutated + +https://github.com/python/cpython/pull/141736 +--- + src/exceptiongroup/_exceptions.py | 3 ++- + tests/test_exceptions.py | 3 +-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/exceptiongroup/_exceptions.py b/src/exceptiongroup/_exceptions.py +index f42c1ad..996d8e1 100644 +--- a/src/exceptiongroup/_exceptions.py ++++ b/src/exceptiongroup/_exceptions.py +@@ -101,6 +101,7 @@ class BaseExceptionGroup(BaseException, Generic[_BaseExceptionT_co]): + ) + + instance = super().__new__(cls, __message, __exceptions) ++ instance._exceptions_str = repr(__exceptions) + instance._exceptions = tuple(__exceptions) + return instance + +@@ -275,7 +276,7 @@ class BaseExceptionGroup(BaseException, Generic[_BaseExceptionT_co]): + return f"{self.message} ({len(self._exceptions)} sub-exception{suffix})" + + def __repr__(self) -> str: +- return f"{self.__class__.__name__}({self.args[0]!r}, {self.args[1]!r})" ++ return f"{self.__class__.__name__}({self.args[0]!r}, {self._exceptions_str})" + + + class ExceptionGroup(BaseExceptionGroup[_ExceptionT_co], Exception): +diff --git a/tests/test_exceptions.py b/tests/test_exceptions.py +index e2bc81a..a253236 100644 +--- a/tests/test_exceptions.py ++++ b/tests/test_exceptions.py +@@ -883,6 +883,5 @@ def test_exceptions_mutate_original_sequence(): + exceptions.append(KeyError("bar")) + assert excgrp.exceptions is exc_tuple + assert repr(excgrp) == ( +- "BaseExceptionGroup('foo', [ValueError(1), KeyboardInterrupt(), " +- "KeyError('bar')])" ++ "BaseExceptionGroup('foo', [ValueError(1), KeyboardInterrupt()])" + ) +-- +2.51.2 + diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index f8eed419d8dd..8f1643fc73c5 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "exchangelib"; - version = "5.5.1"; + version = "5.6.0"; pyproject = true; src = fetchFromGitHub { owner = "ecederstrand"; repo = "exchangelib"; tag = "v${version}"; - hash = "sha256-HO88wM0yzETWS0eBnLABCjYHGE5wFpcjQgC8wsSumWA="; + hash = "sha256-tmJq0AZLuOic63ziIr173lbz6sDF/u75Y2ASYnHHDTM="; }; pythonRelaxDeps = [ "defusedxml" ]; diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix index b83fbd7a7530..e5628956bfc9 100644 --- a/pkgs/development/python-modules/execnet/default.nix +++ b/pkgs/development/python-modules/execnet/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "execnet"; - version = "2.1.1"; + version = "2.1.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-UYm1LGEhwk/q4ogWarQbMlScfiNIZSc2VAuebn1OcuM="; + hash = "sha256-Y9g7/dmiPjW5xqMmFBIyT5ZMLsjc2NPGkW7pNz4L780="; }; postPatch = '' diff --git a/pkgs/development/python-modules/exiv2/default.nix b/pkgs/development/python-modules/exiv2/default.nix index 6b718221c6fa..3b9861911045 100644 --- a/pkgs/development/python-modules/exiv2/default.nix +++ b/pkgs/development/python-modules/exiv2/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { meta = { description = "Low level Python interface to the Exiv2 C++ library"; homepage = "https://github.com/jim-easterbrook/python-exiv2"; - changelog = "https://python-exiv2.readthedocs.io/en/release-${version}/misc/changelog.html"; + changelog = "https://python-exiv2.readthedocs.io/en/release-${src.tag}/misc/changelog.html"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ zebreus ]; }; diff --git a/pkgs/development/python-modules/expandvars/default.nix b/pkgs/development/python-modules/expandvars/default.nix index cfd3079f63a4..557f201d6e0e 100644 --- a/pkgs/development/python-modules/expandvars/default.nix +++ b/pkgs/development/python-modules/expandvars/default.nix @@ -2,29 +2,42 @@ lib, buildPythonPackage, fetchPypi, + fetchpatch, # build-system hatchling, # tests pytestCheckHook, + pytest-cov-stub, }: buildPythonPackage rec { pname = "expandvars"; - version = "1.1.1"; + version = "1.1.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-mK3YJot2Df7kV73hwXv3RXlf3rwit92rdf0yeGU/HgU="; + hash = "sha256-bFgit7dWqZo1a5Fd0SZ/UquKTvqhNZY71/S9XTaPcdc="; }; + patches = [ + (fetchpatch { + name = "pytest9-compat.patch"; + url = "https://github.com/sayanarijit/expandvars/commit/0ab5747185be9135b0711e72fc64dfa6a33f3fd3.patch"; + hash = "sha256-raO5dGbcXb0adUCeHmnWp49vpIMllRW9Ow8rG4OH+Hs="; + }) + ]; + nativeBuildInputs = [ hatchling ]; pythonImportsCheck = [ "expandvars" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; meta = { description = "Expand system variables Unix style"; diff --git a/pkgs/development/python-modules/expecttest/default.nix b/pkgs/development/python-modules/expecttest/default.nix index 0d52c20ba8f0..a4f5e3a92c68 100644 --- a/pkgs/development/python-modules/expecttest/default.nix +++ b/pkgs/development/python-modules/expecttest/default.nix @@ -7,16 +7,16 @@ pytestCheckHook, }: -buildPythonPackage { +buildPythonPackage (finalAttrs: { pname = "expecttest"; - version = "0.2.1"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { owner = "pytorch"; repo = "expecttest"; - rev = "683b09a352cc426851adc2e3a9f46e0ab25e4dee"; # no tags - hash = "sha256-e9/KxPN/w0mrFYgesRGqaiDQ6gor7BpX/5/B0NPtXLY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-/BMaQD3ZgYiprRYZ/fIlW7mStyFGzsjqup62tegBP7Y="; }; build-system = [ poetry-core ]; @@ -35,4 +35,4 @@ buildPythonPackage { homepage = "https://github.com/pytorch/expecttest"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/development/python-modules/extension-helpers/default.nix b/pkgs/development/python-modules/extension-helpers/default.nix index c8a18ff01540..fdca32ec44fe 100644 --- a/pkgs/development/python-modules/extension-helpers/default.nix +++ b/pkgs/development/python-modules/extension-helpers/default.nix @@ -47,6 +47,8 @@ buildPythonPackage rec { disabledTests = [ # https://github.com/astropy/extension-helpers/issues/43 "test_write_if_different" + # ValueError: Unrecognized abi version for limited API: invalid + "test_limited_api_invalid_abi" ]; meta = { diff --git a/pkgs/development/python-modules/ezyrb/default.nix b/pkgs/development/python-modules/ezyrb/default.nix index f779b98cb4d2..01e3f70682cf 100644 --- a/pkgs/development/python-modules/ezyrb/default.nix +++ b/pkgs/development/python-modules/ezyrb/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "ezyrb"; - version = "1.3.0.post2404"; + version = "1.3.3"; pyproject = true; src = fetchFromGitHub { owner = "mathLab"; repo = "EZyRB"; tag = "v${version}"; - hash = "sha256-nu75Geyeu1nTLoGaohXB9pmbUWKgdgch9Z5OJqz9xKQ="; + hash = "sha256-dta8Vc7sUQEtcFEJaFbJUafSsjgZ7ZSLaFJTOMSfKmU="; }; # AttributeError: module 'numpy' has no attribute 'VisibleDeprecationWarning' diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index a8e2e565de9a..c15988dbd5c4 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "faker"; - version = "37.5.3"; + version = "40.1.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-gxXY/01vT1iL1C/+Y6vVmYhseFBz4mpEcH4Q7rpXE9w="; + hash = "sha256-t2poFjql8XHSYPwkgnqDSbwdtnL2pmU1no0AlegTXTA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/falcon/default.nix b/pkgs/development/python-modules/falcon/default.nix index 8b9a2898cd73..c6c8ffa7fae0 100644 --- a/pkgs/development/python-modules/falcon/default.nix +++ b/pkgs/development/python-modules/falcon/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "falcon"; - version = "4.0.2"; + version = "4.2.0"; pyproject = true; src = fetchFromGitHub { owner = "falconry"; repo = "falcon"; tag = version; - hash = "sha256-umNuHyZrdDGyrhQEG9+f08D4Wwrz6bVJ6ysw8pfbHv4="; + hash = "sha256-Vi7J607PsjwxAKYNCiVGxSRYIbKHgrGvRX9Ent3+LQo="; }; build-system = [ setuptools ] ++ lib.optionals (!isPyPy) [ cython ]; @@ -84,7 +84,7 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://falcon.readthedocs.io/en/stable/changes/${version}.html"; + changelog = "https://falcon.readthedocs.io/en/stable/changes/${src.tag}.html"; description = "Ultra-reliable, fast ASGI+WSGI framework for building data plane APIs at scale"; homepage = "https://falconframework.org/"; license = lib.licenses.asl20; diff --git a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix index 13581602bc2c..076a1e61d727 100644 --- a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix +++ b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "faraday-agent-parameters-types"; - version = "1.8.1"; + version = "1.9.1"; pyproject = true; src = fetchPypi { pname = "faraday_agent_parameters_types"; inherit version; - hash = "sha256-o4N1op+beeoM0GGtcQGWNfFt6SMDohiNnOyD8lWzuk0="; + hash = "sha256-PWO4wufHGIgAi1BHoM/+6ZjsUDB4oY26NsHOdNYYTJc="; }; pythonRelaxDeps = [ "validators" ]; diff --git a/pkgs/development/python-modules/fastai/default.nix b/pkgs/development/python-modules/fastai/default.nix index 597ede53046d..95098b61e44f 100644 --- a/pkgs/development/python-modules/fastai/default.nix +++ b/pkgs/development/python-modules/fastai/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "fastai"; - version = "2.8.5"; + version = "2.8.6"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-kq7ndxj8h5nBJTZ8wVenqSquZ6CoqTyde4lQO9rFybY="; + hash = "sha256-eZW96Upogr6qws6lD8eX2kywuBmTXsbG7vaQKLwx9y8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fastapi-github-oidc/default.nix b/pkgs/development/python-modules/fastapi-github-oidc/default.nix index 288c55482cdc..0e133890d1cc 100644 --- a/pkgs/development/python-modules/fastapi-github-oidc/default.nix +++ b/pkgs/development/python-modules/fastapi-github-oidc/default.nix @@ -43,6 +43,7 @@ buildPythonPackage (finalAttrs: { disabledTests = [ "test_with_auth" # calls github api + "test_no_auth" # returns 401 instead of 403 ]; meta = { diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index 4e4b1869406e..bc40f7acb728 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -42,14 +42,14 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.121.1"; + version = "0.128.0"; pyproject = true; src = fetchFromGitHub { owner = "tiangolo"; repo = "fastapi"; tag = version; - hash = "sha256-uUUARIHY8VBoLfWfMvveapypqiB00cTTWpJ4fi9nvUo="; + hash = "sha256-qUTSqTe9mQzfuwqsTCQY6u7Tcnh9XNy4tr5o0/qFFLs="; }; build-system = [ pdm-backend ]; @@ -132,6 +132,8 @@ buildPythonPackage rec { # Don't test docs and examples "docs_src" "tests/test_tutorial/test_sql_databases" + # Infinite recursion with strawberry-graphql + "tests/test_tutorial/test_graphql/test_tutorial001.py" ]; pythonImportsCheck = [ "fastapi" ]; diff --git a/pkgs/development/python-modules/fastcrc/default.nix b/pkgs/development/python-modules/fastcrc/default.nix index 0400f83ecfd3..d259a442f5f4 100644 --- a/pkgs/development/python-modules/fastcrc/default.nix +++ b/pkgs/development/python-modules/fastcrc/default.nix @@ -9,13 +9,13 @@ }: let pname = "fastcrc"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "overcat"; repo = "fastcrc"; tag = "v${version}"; - hash = "sha256-iBbYiF0y/3Cax4P9+/gKS6FUBqZ3BleCwnpItsVd7Ps="; + hash = "sha256-Q1R0EgxrfCMn/DxblOAW4Z7YOxpaZPL5Sx8SL/dry98="; }; in buildPythonPackage { @@ -29,7 +29,7 @@ buildPythonPackage { cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-VbS5xTqj+Flxxdg06MO34AZCVozlNgFvc+yKemEmCzs="; + hash = "sha256-dWxQuWV3w1UM8yvLG/9SrJQxSSyWTXV0FWFDKjIHBf0="; }; pythonImportsCheck = [ "fastcrc" ]; diff --git a/pkgs/development/python-modules/fasthtml/default.nix b/pkgs/development/python-modules/fasthtml/default.nix new file mode 100644 index 000000000000..cc939fda4141 --- /dev/null +++ b/pkgs/development/python-modules/fasthtml/default.nix @@ -0,0 +1,91 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + beautifulsoup4, + fastcore, + fastlite, + httpx, + itsdangerous, + oauthlib, + python-dateutil, + python-multipart, + starlette, + uvicorn, + + # optional-dependencies + ipython, + lxml, + monsterui ? null, # TODO: package + pyjwt, + pysymbol-llm ? null, # TODO: package + + # tests + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "fasthtml"; + version = "0.12.47"; + pyproject = true; + + src = fetchFromGitHub { + owner = "AnswerDotAI"; + repo = "fasthtml"; + tag = finalAttrs.version; + hash = "sha256-dlG6pOVsd9RSmy/rgr7lUANRllND4tZDnsOecsI4bh8="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + beautifulsoup4 + fastcore + fastlite + httpx + itsdangerous + oauthlib + python-dateutil + python-multipart + starlette + uvicorn + ]; + + optional-dependencies = { + dev = [ + ipython + lxml + monsterui + pyjwt + pysymbol-llm + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # https://github.com/AnswerDotAI/fasthtml/issues/835 + "test_get_toaster_with_typehint" + ]; + + pythonImportsCheck = [ + "fasthtml" + ]; + + meta = { + description = "The fastest way to create an HTML app"; + homepage = "https://github.com/AnswerDotAI/fasthtml"; + changelog = "https://github.com/AnswerDotAI/fasthtml/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = [ ]; + }; +}) diff --git a/pkgs/development/python-modules/fastimport/default.nix b/pkgs/development/python-modules/fastimport/default.nix index e4cd46b185ac..5ef66f01e7f7 100644 --- a/pkgs/development/python-modules/fastimport/default.nix +++ b/pkgs/development/python-modules/fastimport/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "fastimport"; - version = "0.9.14"; + version = "0.9.16"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "6ac99dda4e7b0b3ae831507b6d0094802e6dd95891feafde8cc5c405b6c149ca"; + sha256 = "sha256-agpvtWqjYH3nGtTnq9VRr+m9rJS6uNLddNjg+Y9S414="; }; nativeCheckInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/python-modules/fastjet/default.nix b/pkgs/development/python-modules/fastjet/default.nix index 08b3098d4825..943823bc22f2 100644 --- a/pkgs/development/python-modules/fastjet/default.nix +++ b/pkgs/development/python-modules/fastjet/default.nix @@ -31,13 +31,13 @@ in buildPythonPackage rec { pname = "fastjet"; - version = "3.5.1.1"; + version = "3.5.1.2"; pyproject = true; src = fetchPypi { pname = "fastjet"; inherit version; - hash = "sha256-2GG9A+/2rgYpsJo1tu3BprOM7bKwYVV6/qIIMtYSr9o="; + hash = "sha256-dDvlFBZrTWhpNhngKuAvu9zpbcLWvz7IpRQsmctvaW0="; }; # unvendor fastjet/fastjet-contrib diff --git a/pkgs/development/python-modules/fastjsonschema/default.nix b/pkgs/development/python-modules/fastjsonschema/default.nix index 566122d57abe..fbf17c993198 100644 --- a/pkgs/development/python-modules/fastjsonschema/default.nix +++ b/pkgs/development/python-modules/fastjsonschema/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "fastjsonschema"; - version = "2.21.1"; + version = "2.21.2"; pyproject = true; src = fetchFromGitHub { @@ -17,7 +17,7 @@ buildPythonPackage rec { repo = "python-fastjsonschema"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-H/jmvm5U4RB9KuD5EgCedbc499Fl8L2S9Y5SXy51JP0="; + hash = "sha256-EV7/vPYeJSG2uTLpENso9WhcR98/ZTbanKffJfmfZz4="; }; build-system = [ setuptools ]; @@ -27,7 +27,8 @@ buildPythonPackage rec { disabledTests = [ "benchmark" # these tests require network access - "remote ref" + "remote" + "ref" "definitions" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/development/python-modules/fastlite/default.nix b/pkgs/development/python-modules/fastlite/default.nix new file mode 100644 index 000000000000..c1c9efde7f3e --- /dev/null +++ b/pkgs/development/python-modules/fastlite/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + fastcore, + apswutils, +}: + +buildPythonPackage (finalAttrs: { + pname = "fastlite"; + version = "0.2.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "AnswerDotAI"; + repo = "fastlite"; + tag = finalAttrs.version; + hash = "sha256-q2eGP/GRWqgbvWOVuLch33VkYbedeDRsxsnN+xsevPI="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + fastcore + apswutils + ]; + + # No tests + doCheck = false; + + pythonImportsCheck = [ + "fastlite" + ]; + + meta = { + description = "A bit of extra usability for sqlite"; + homepage = "https://github.com/AnswerDotAI/fastlite"; + changelog = "https://github.com/AnswerDotAI/fastlite/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = [ ]; + }; +}) diff --git a/pkgs/development/python-modules/fastnumbers/default.nix b/pkgs/development/python-modules/fastnumbers/default.nix index 00d94f61ae6e..af07d5fea685 100644 --- a/pkgs/development/python-modules/fastnumbers/default.nix +++ b/pkgs/development/python-modules/fastnumbers/default.nix @@ -7,24 +7,28 @@ numpy, pytestCheckHook, setuptools, + setuptools-scm, typing-extensions, }: buildPythonPackage rec { pname = "fastnumbers"; - version = "5.1.0"; + version = "5.1.1"; pyproject = true; src = fetchFromGitHub { owner = "SethMMorton"; repo = "fastnumbers"; tag = version; - hash = "sha256-TC9+xOvskABpChlrSJcHy6O7D7EnIKL6Ekt/vaLBX2E="; + hash = "sha256-7UjUkZPGsrtdQhgisI5IA37WvgGGiEXsey9NhATy064="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = [ typing-extensions ]; + dependencies = [ typing-extensions ]; # Tests fail due to numeric precision differences on ARM # See https://github.com/SethMMorton/fastnumbers/issues/28 @@ -43,7 +47,7 @@ buildPythonPackage rec { meta = { description = "Python module for number conversion"; homepage = "https://github.com/SethMMorton/fastnumbers"; - changelog = "https://github.com/SethMMorton/fastnumbers/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/SethMMorton/fastnumbers/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/fastprogress/default.nix b/pkgs/development/python-modules/fastprogress/default.nix index c1c711ff9685..25d21494eb0a 100644 --- a/pkgs/development/python-modules/fastprogress/default.nix +++ b/pkgs/development/python-modules/fastprogress/default.nix @@ -1,21 +1,34 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, + fastcore, numpy, + fasthtml, + ipython, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fastprogress"; - version = "1.0.5"; - format = "setuptools"; + version = "1.1.5"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-WMoWqYHwKSgE2QXy4AQq1gjXiL9svmq5a3HsSyBFOu8="; + src = fetchFromGitHub { + owner = "fastai"; + repo = "fastprogress"; + tag = finalAttrs.version; + hash = "sha256-n4FwOgxYn2JWlF8VwtO7m7mOXg1l27lT/3Rd+GeDlvw="; }; - propagatedBuildInputs = [ numpy ]; + build-system = [ setuptools ]; + + dependencies = [ + fastcore + numpy + fasthtml + ipython + ]; # no real tests doCheck = false; @@ -23,8 +36,9 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/fastai/fastprogress"; + changelog = "https://github.com/AnswerDotAI/fastprogress/blob/${finalAttrs.src.tag}/CHANGELOG.md"; description = "Simple and flexible progress bar for Jupyter Notebook and console"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ ris ]; }; -} +}) diff --git a/pkgs/development/python-modules/fastremap/default.nix b/pkgs/development/python-modules/fastremap/default.nix index 0e2fd9cfbefd..2337bc54fc5c 100644 --- a/pkgs/development/python-modules/fastremap/default.nix +++ b/pkgs/development/python-modules/fastremap/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "fastremap"; - version = "1.15.1"; + version = "1.17.7"; pyproject = true; src = fetchFromGitHub { owner = "seung-lab"; repo = "fastremap"; tag = version; - hash = "sha256-naDagGD0VNRjoJ1+gkgLm3QbrnE9hD85ULz91xAfKa4="; + hash = "sha256-k3MneLLpClx0hkOqm+botD/LozyoUJW89qf0VJ3P05M="; }; build-system = [ @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = { description = "Remap, mask, renumber, unique, and in-place transposition of 3D labeled images and point clouds"; homepage = "https://github.com/seung-lab/fastremap"; - changelog = "https://github.com/seung-lab/fastremap/releases/tag/${version}"; + changelog = "https://github.com/seung-lab/fastremap/releases/tag/${src.tag}"; license = lib.licenses.lgpl3Only; maintainers = with lib.maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/fava-portfolio-returns/default.nix b/pkgs/development/python-modules/fava-portfolio-returns/default.nix index 14948206ac10..ec38ca5fe303 100644 --- a/pkgs/development/python-modules/fava-portfolio-returns/default.nix +++ b/pkgs/development/python-modules/fava-portfolio-returns/default.nix @@ -14,12 +14,12 @@ }: let pname = "fava-portfolio-returns"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "andreasgerstmayr"; repo = "fava-portfolio-returns"; - rev = "v${version}"; - hash = "sha256-NM+0gcgSztcgzYj0nCe9DOK90lrzE0TOzH30WvTKsUA="; + tag = "v${version}"; + hash = "sha256-3v5zIpho6HppNm1yJdVJKhPxKgNsvRetOQIAKkp6u9U="; }; frontend = buildNpmPackage (finalAttrs: { diff --git a/pkgs/development/python-modules/fava/default.nix b/pkgs/development/python-modules/fava/default.nix index 03337bf01f44..0c2db1d6bb9b 100644 --- a/pkgs/development/python-modules/fava/default.nix +++ b/pkgs/development/python-modules/fava/default.nix @@ -25,17 +25,17 @@ let src = buildNpmPackage (finalAttrs: { pname = "fava-frontend"; - version = "1.30.9"; + version = "1.30.11"; src = fetchFromGitHub { owner = "beancount"; repo = "fava"; tag = "v${finalAttrs.version}"; - hash = "sha256-/Tnu1SgYhd22HVEzOtJ8YEHyxXuQ9xW0c/1oRyVePXw="; + hash = "sha256-/e3HNAlezqUTt0RYxjrdktM/mwBpZ4CqRuYbLTzww0w="; }; sourceRoot = "${finalAttrs.src.name}/frontend"; - npmDepsHash = "sha256-5ee044Ev2FoxcdChZwfHnLQiiP+Ag4bNSAlzEnenAa0="; + npmDepsHash = "sha256-K0XDMTqqSq0wbCqs8HXXP0XgADJQaiYD2AN5ilAXfRM="; makeCacheWritable = true; preBuild = '' diff --git a/pkgs/development/python-modules/ffmpy/default.nix b/pkgs/development/python-modules/ffmpy/default.nix index 16d62090e03d..bdb886cec55c 100644 --- a/pkgs/development/python-modules/ffmpy/default.nix +++ b/pkgs/development/python-modules/ffmpy/default.nix @@ -11,30 +11,33 @@ buildPythonPackage rec { pname = "ffmpy"; - version = "0.6.2"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "Ch00k"; repo = "ffmpy"; tag = version; - hash = "sha256-XFC7f8wdIsySIn4qXqo61GmRcaF0QciLYN5lwhzlIuA="; + hash = "sha256-TDE/r6qoWpkIU47+FPLqWgZAJd9FxSbZthhLh9g4evo="; }; - postPatch = - # Default to store ffmpeg. - '' - substituteInPlace ffmpy/ffmpy.py \ - --replace-fail \ - 'executable: str = "ffmpeg",' \ - 'executable: str = "${lib.getExe ffmpeg-headless}",' - '' - # The tests test a mock that does not behave like ffmpeg. If we default to the nix-store ffmpeg they fail. - + '' - for fname in tests/*.py; do - echo >>"$fname" 'FFmpeg.__init__.__defaults__ = ("ffmpeg", *FFmpeg.__init__.__defaults__[1:])' - done - ''; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "uv_build>=0.7.9,<0.10.0" uv_build + '' + # Default to store ffmpeg. + + '' + substituteInPlace ffmpy/ffmpy.py \ + --replace-fail \ + 'executable: str = "ffmpeg",' \ + 'executable: str = "${lib.getExe ffmpeg-headless}",' + '' + # The tests test a mock that does not behave like ffmpeg. If we default to the nix-store ffmpeg they fail. + + '' + for fname in tests/*.py; do + echo >>"$fname" 'FFmpeg.__init__.__defaults__ = ("ffmpeg", *FFmpeg.__init__.__defaults__[1:])' + done + ''; pythonImportsCheck = [ "ffmpy" ]; diff --git a/pkgs/development/python-modules/fido2/default.nix b/pkgs/development/python-modules/fido2/default.nix index 5ed38a04b68c..f279e558460d 100644 --- a/pkgs/development/python-modules/fido2/default.nix +++ b/pkgs/development/python-modules/fido2/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "fido2"; - version = "2.0.0"; + version = "2.1.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-MGHNBec7Og72r8O4A9V8gmqi1qlzLRar1ydzYfWOeWQ="; + hash = "sha256-8TefhFhwzH/GTH8HMjw85B6MlsNwVOeeCs1WMLP+xaw="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix index 9b86a3beb8ed..54fc63da2f08 100644 --- a/pkgs/development/python-modules/filelock/default.nix +++ b/pkgs/development/python-modules/filelock/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "filelock"; - version = "3.20.1"; + version = "3.20.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-uDYJSLNRuA9CCHjYUWUZoiBLB6783P0kkSpdMxJ/GIw="; + hash = "sha256-GMV+6RXH7GHP8Oz38Phpk2x8MBkbsM9AbxNBd40INOE="; }; build-system = [ diff --git a/pkgs/development/python-modules/filterpy/default.nix b/pkgs/development/python-modules/filterpy/default.nix index 11c103e5a040..110d3b136b0d 100644 --- a/pkgs/development/python-modules/filterpy/default.nix +++ b/pkgs/development/python-modules/filterpy/default.nix @@ -24,6 +24,8 @@ buildPythonPackage { hash = "sha256-KuuVu0tqrmQuNKYmDmdy+TU6BnnhDxh4G8n9BGzjGag="; }; + patches = [ ./numpy-2.4-compat.patch ]; + build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/filterpy/numpy-2.4-compat.patch b/pkgs/development/python-modules/filterpy/numpy-2.4-compat.patch new file mode 100644 index 000000000000..ab0969e54735 --- /dev/null +++ b/pkgs/development/python-modules/filterpy/numpy-2.4-compat.patch @@ -0,0 +1,69 @@ +diff --git a/filterpy/kalman/EKF.py b/filterpy/kalman/EKF.py +index 5e83aec..06e9c42 100644 +--- a/filterpy/kalman/EKF.py ++++ b/filterpy/kalman/EKF.py +@@ -406,7 +406,8 @@ class ExtendedKalmanFilter(object): + mahalanobis : float + """ + if self._mahalanobis is None: +- self._mahalanobis = sqrt(float(dot(dot(self.y.T, self.SI), self.y))) ++ d2 = self.y.T @ self.SI @ self.y ++ self._mahalanobis = sqrt(np.asarray(d2).item()) + return self._mahalanobis + + def __repr__(self): +diff --git a/filterpy/kalman/fading_memory.py b/filterpy/kalman/fading_memory.py +index 36c9dcc..2c4d582 100644 +--- a/filterpy/kalman/fading_memory.py ++++ b/filterpy/kalman/fading_memory.py +@@ -438,7 +438,7 @@ class FadingKalmanFilter(object): + mahalanobis : float + """ + if self._mahalanobis is None: +- self._mahalanobis = sqrt(float(dot(dot(self.y.T, self.SI), self.y))) ++ self._mahalanobis = sqrt((self.y.T @ self.SI @ self.y).item()) + return self._mahalanobis + + def __repr__(self): +diff --git a/filterpy/kalman/kalman_filter.py b/filterpy/kalman/kalman_filter.py +index 994b596..0f72d85 100644 +--- a/filterpy/kalman/kalman_filter.py ++++ b/filterpy/kalman/kalman_filter.py +@@ -1235,7 +1235,8 @@ class KalmanFilter(object): + mahalanobis : float + """ + if self._mahalanobis is None: +- self._mahalanobis = sqrt(float(dot(dot(self.y.T, self.SI), self.y))) ++ d2 = dot(dot(self.y.T, self.SI), self.y) ++ self._mahalanobis = sqrt(np.asarray(d2).item()) + return self._mahalanobis + + @property +diff --git a/filterpy/kalman/tests/test_imm.py b/filterpy/kalman/tests/test_imm.py +index aa71fc2..ec2fdc1 100644 +--- a/filterpy/kalman/tests/test_imm.py ++++ b/filterpy/kalman/tests/test_imm.py +@@ -176,8 +176,8 @@ def test_imm(): + + zs = np.zeros((N, 2)) + for i in range(len(zs)): +- zs[i, 0] = simxs[i, 0] + randn()*r +- zs[i, 1] = simxs[i, 2] + randn()*r ++ zs[i, 0] = simxs[i, 0, 0] + randn()*r ++ zs[i, 1] = simxs[i, 2, 0] + randn()*r + + ''' + try: +diff --git a/filterpy/leastsq/least_squares.py b/filterpy/leastsq/least_squares.py +index 2610b14..6c5eb8f 100644 +--- a/filterpy/leastsq/least_squares.py ++++ b/filterpy/leastsq/least_squares.py +@@ -129,7 +129,7 @@ class LeastSquaresFilter(object): + + if self._order == 0: + K[0] = 1. / n +- y = z - x ++ y = z - x[0] + x[0] += K[0] * y + + elif self._order == 1: diff --git a/pkgs/development/python-modules/findimports/default.nix b/pkgs/development/python-modules/findimports/default.nix index 7bb873cffe69..a917a3f992ef 100644 --- a/pkgs/development/python-modules/findimports/default.nix +++ b/pkgs/development/python-modules/findimports/default.nix @@ -2,35 +2,28 @@ lib, buildPythonPackage, fetchFromGitHub, - python, + pytestCheckHook, setuptools, }: buildPythonPackage rec { pname = "findimports"; - version = "2.7.0"; + version = "3.0.0"; pyproject = true; src = fetchFromGitHub { owner = "mgedmin"; repo = "findimports"; tag = version; - hash = "sha256-ztbf9F1tz5EhqSkE8W6i7ihJYJTymKQdXI+K/G7DbHM="; + hash = "sha256-3MYHl35FfStmyhBNvedIHIZQYTyBuRyg5OI3d3Mi57I="; }; build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "findimports" ]; - checkPhase = '' - # Tests fails - rm tests/cmdline.txt - - runHook preCheck - ${python.interpreter} testsuite.py - runHook postCheck - ''; - meta = { description = "Module for the analysis of Python import statements"; homepage = "https://github.com/mgedmin/findimports"; diff --git a/pkgs/development/python-modules/finvizfinance/default.nix b/pkgs/development/python-modules/finvizfinance/default.nix index a8c61c26a2a6..4c9dc24151cf 100644 --- a/pkgs/development/python-modules/finvizfinance/default.nix +++ b/pkgs/development/python-modules/finvizfinance/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "finvizfinance"; - version = "1.1.1"; + version = "1.3.0"; pyproject = true; src = fetchFromGitHub { owner = "lit26"; repo = "finvizfinance"; tag = "v${version}"; - hash = "sha256-QVR0ig51EHdMVzg6wBDpvMGjPnmO2ZGBs2Q0SVxauik="; + hash = "sha256-M/EyQgINdJLLfOFNm/RhqONz3slb4ukugHLdiozDY0s="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index 04d5d9b8f5f6..04db9811aa1d 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -42,6 +42,10 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "cython~=3.0.2" cython + + # pyparsing deprecated parseString in favor of parse_string + substituteInPlace fiona/fio/features.py fiona/_vendor/snuggs.py \ + --replace-fail parseString parse_string ''; build-system = [ diff --git a/pkgs/development/python-modules/fipy/default.nix b/pkgs/development/python-modules/fipy/default.nix index 7f7f4e307496..4b5a0f9500bd 100644 --- a/pkgs/development/python-modules/fipy/default.nix +++ b/pkgs/development/python-modules/fipy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "fipy"; - version = "3.4.5"; + version = "4.0"; format = "setuptools"; # Python 3.12 is not yet supported. @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "usnistgov"; repo = "fipy"; tag = version; - hash = "sha256-usuAj+bIzbCSxYuKeUDxEESbjxPCwYwdD/opaBbgl1w="; + hash = "sha256-pq5Xjp3YD5cILfV+Atl/Sq0SeZjDR/QQa4/F59LhGIo="; }; propagatedBuildInputs = [ @@ -65,7 +65,7 @@ buildPythonPackage rec { meta = { homepage = "https://www.ctcms.nist.gov/fipy/"; description = "Finite Volume PDE Solver Using Python"; - changelog = "https://github.com/usnistgov/fipy/blob/${version}/CHANGELOG.rst"; + changelog = "https://github.com/usnistgov/fipy/blob/${src.tag}/CHANGELOG.rst"; license = lib.licenses.free; maintainers = with lib.maintainers; [ wd15 ]; }; diff --git a/pkgs/development/python-modules/firecrawl-py/default.nix b/pkgs/development/python-modules/firecrawl-py/default.nix index 26600b692e3a..3055d73165b5 100644 --- a/pkgs/development/python-modules/firecrawl-py/default.nix +++ b/pkgs/development/python-modules/firecrawl-py/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "firecrawl-py"; - version = "1.15.0"; + version = "2.7.0"; pyproject = true; src = fetchFromGitHub { owner = "mendableai"; repo = "firecrawl"; tag = "v${version}"; - hash = "sha256-GIde8FiU1/gS3oFfTf7f7Tc4KvDVL873VE5kjyh33Is="; + hash = "sha256-l42FfMrkqeFuAB4Sibxe4J+lifePSu2naIySEUGPQW0="; }; sourceRoot = "${src.name}/apps/python-sdk"; diff --git a/pkgs/development/python-modules/fixtures/default.nix b/pkgs/development/python-modules/fixtures/default.nix index 1396001b00fd..08d89a0c6896 100644 --- a/pkgs/development/python-modules/fixtures/default.nix +++ b/pkgs/development/python-modules/fixtures/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "fixtures"; - version = "4.2.6"; + version = "4.2.8"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-lUcrFbFFBjpnL74zsSRMz/gp++yX1TDYYtJvQW0WyQs="; + hash = "sha256-6hRlZKZmYQbEgffDX5ek1lSFyEsMyGpQdZcWS2zA2Ek="; }; build-system = [ diff --git a/pkgs/development/python-modules/flashinfer/default.nix b/pkgs/development/python-modules/flashinfer/default.nix index a0a5a107d0ec..5882d0ee8164 100644 --- a/pkgs/development/python-modules/flashinfer/default.nix +++ b/pkgs/development/python-modules/flashinfer/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "flashinfer"; - version = "0.3.1"; + version = "0.6.1"; pyproject = true; src = fetchFromGitHub { @@ -39,7 +39,7 @@ buildPythonPackage rec { repo = "flashinfer"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-e9PfLfU0DdoLKlXiHylCbGd125c7Iw9y4NDIOAP0xHs="; + hash = "sha256-NRjas11VvvCY6MZiZaYtxG5MXEaFqfbhJxflUT/uraE="; }; patches = [ diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix index 90a8093cfb6f..4e7950b3b064 100644 --- a/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -26,13 +26,13 @@ buildPythonPackage rec { pname = "flask-appbuilder"; - version = "4.8.0"; + version = "5.0.2"; format = "setuptools"; src = fetchPypi { pname = "Flask-AppBuilder"; inherit version; - hash = "sha256-MrkDcUCNgHzHnTM3DJenPXOP7HLTTthD/YBtupNprhM="; + hash = "sha256-9Xe5gqGuQLwhMjjO25PDnGfPIZmqHgBuCH6hs1B9VFA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix index f0de16eb7d49..d59f01611bb0 100644 --- a/pkgs/development/python-modules/flask-compress/default.nix +++ b/pkgs/development/python-modules/flask-compress/default.nix @@ -5,6 +5,7 @@ isPyPy, setuptools, setuptools-scm, + backports-zstd, flask, flask-caching, zstandard, @@ -14,7 +15,7 @@ }: buildPythonPackage rec { - version = "1.17"; + version = "1.23"; pname = "flask-compress"; pyproject = true; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "colour-science"; repo = "flask-compress"; tag = "v${version}"; - hash = "sha256-87fjJxaS7eJbOkSUljnhqFIeahoS4L2tAOhmv4ryVUM="; + hash = "sha256-iKZfwSFvNrG/ApbqBuDgoUHz296nr+ZMrAX97pMgNTQ="; }; build-system = [ @@ -31,8 +32,8 @@ buildPythonPackage rec { ]; dependencies = [ + backports-zstd flask - zstandard ] ++ lib.optionals (!isPyPy) [ brotli ] ++ lib.optionals isPyPy [ brotlicffi ]; @@ -52,7 +53,7 @@ buildPythonPackage rec { meta = { description = "Compress responses in your Flask app with gzip, deflate or brotli"; homepage = "https://github.com/colour-science/flask-compress"; - changelog = "https://github.com/colour-science/flask-compress/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/colour-science/flask-compress/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ nickcao ]; }; diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/pkgs/development/python-modules/flask-cors/default.nix index 6565d6ed6503..0f8510073034 100644 --- a/pkgs/development/python-modules/flask-cors/default.nix +++ b/pkgs/development/python-modules/flask-cors/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "flask-cors"; - version = "6.0.1"; + version = "6.0.2"; pyproject = true; src = fetchFromGitHub { owner = "corydolphin"; repo = "flask-cors"; tag = version; - hash = "sha256-ySn5o9yDlCYqHozGJ82cPtty/N+EK/NvIynxv9w+hwc="; + hash = "sha256-9WlD5Qd0WiBDrVHf5nT1qAK2gtYavlPnY7qFkiAgxws="; }; build-system = [ diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix index 2bc8a592e551..9e2599004147 100644 --- a/pkgs/development/python-modules/flask-limiter/default.nix +++ b/pkgs/development/python-modules/flask-limiter/default.nix @@ -3,58 +3,53 @@ asgiref, buildPythonPackage, fetchFromGitHub, - fetchpatch, flask, + hatchling, + hatch-vcs, hiro, limits, ordered-set, pymemcache, pymongo, + pytest-check, pytest-cov-stub, pytest-mock, pytestCheckHook, redis, rich, - setuptools, - typing-extensions, }: buildPythonPackage rec { pname = "flask-limiter"; - version = "3.12"; + version = "4.1.1"; pyproject = true; src = fetchFromGitHub { owner = "alisaifee"; repo = "flask-limiter"; tag = version; - hash = "sha256-3GFbLQExd4c3Cyr7UDX/zOAfedOluXMwCbBhOgoKfn0="; + hash = "sha256-lrq4WCc2gxm039nXW6tiDt7laJFEICO0x9jw71UUwaI="; }; - patches = [ - # permit use of rich < 15 -- remove when updating past 3.12 - (fetchpatch { - url = "https://github.com/alisaifee/flask-limiter/commit/008a5c89f249e18e5375f16d79efc3ac518e9bcc.patch"; - hash = "sha256-dvTPVnuPs7xCRfUBBA1bgeWGuevFUZ+Kgl9MBHdgfKU="; - }) - ]; - postPatch = '' # flask-restful is unmaintained and breaks regularly, don't depend on it substituteInPlace tests/test_views.py \ --replace-fail "import flask_restful" "" ''; - build-system = [ setuptools ]; + build-system = [ + hatchling + hatch-vcs + ]; dependencies = [ flask limits ordered-set - rich ]; optional-dependencies = { + cli = [ rich ]; redis = limits.optional-dependencies.redis; memcached = limits.optional-dependencies.memcached; mongodb = limits.optional-dependencies.mongodb; @@ -62,6 +57,7 @@ buildPythonPackage rec { nativeCheckInputs = [ asgiref + pytest-check pytest-cov-stub pytest-mock pytestCheckHook @@ -69,7 +65,8 @@ buildPythonPackage rec { redis pymemcache pymongo - ]; + ] + ++ optional-dependencies.cli; disabledTests = [ # flask-restful is unmaintained and breaks regularly diff --git a/pkgs/development/python-modules/flet/default.nix b/pkgs/development/python-modules/flet/default.nix index c7e2775fe153..b89bb04671d6 100644 --- a/pkgs/development/python-modules/flet/default.nix +++ b/pkgs/development/python-modules/flet/default.nix @@ -4,12 +4,12 @@ flet-client-flutter, # build-system - poetry-core, - pytestCheckHook, + setuptools, - # propagates + # dependencies fastapi, httpx, + msgpack, oauthlib, packaging, qrcode, @@ -19,6 +19,13 @@ watchdog, websocket-client, websockets, + + # tests + numpy, + pillow, + pytest-asyncio, + pytestCheckHook, + scikit-image, }: buildPythonPackage rec { @@ -28,9 +35,7 @@ buildPythonPackage rec { sourceRoot = "${src.name}/sdk/python/packages/flet"; - build-system = [ poetry-core ]; - - nativeCheckInputs = [ pytestCheckHook ]; + build-system = [ setuptools ]; makeWrapperArgs = [ "--prefix" @@ -40,7 +45,7 @@ buildPythonPackage rec { ]; _flet_version = '' - version = "${version}" + flet_version = "${version}" def update_version(): pass ''; @@ -56,19 +61,26 @@ buildPythonPackage rec { ''; dependencies = [ - fastapi - uvicorn - websocket-client - watchdog - oauthlib - websockets - httpx - packaging - repath - qrcode cookiecutter fastapi + httpx + msgpack + oauthlib + packaging + qrcode + repath uvicorn + watchdog + websocket-client + websockets + ]; + + nativeCheckInputs = [ + numpy + pillow + pytest-asyncio + pytestCheckHook + scikit-image ]; pythonImportsCheck = [ "flet" ]; diff --git a/pkgs/development/python-modules/flexcache/default.nix b/pkgs/development/python-modules/flexcache/default.nix index d828755b4593..5e1389986fb7 100644 --- a/pkgs/development/python-modules/flexcache/default.nix +++ b/pkgs/development/python-modules/flexcache/default.nix @@ -14,7 +14,6 @@ # checks pytestCheckHook, pytest-mpl, - pytest-subtests, }: buildPythonPackage rec { @@ -40,7 +39,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-mpl - pytest-subtests ]; pythonImportsCheck = [ "flexcache" ]; diff --git a/pkgs/development/python-modules/flexmock/default.nix b/pkgs/development/python-modules/flexmock/default.nix index 62fb1077b347..62020d902569 100644 --- a/pkgs/development/python-modules/flexmock/default.nix +++ b/pkgs/development/python-modules/flexmock/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "flexmock"; - version = "0.12.2"; + version = "0.13.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Q1xmHDs1R3V165FQQooc/Xxiy5kqp4h1Z8M1euvJrKE="; + hash = "sha256-aCnXoNf3Rtswh9qP2mL5JOUt9+zkBRwvWa1YbPWteXc="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/flexparser/default.nix b/pkgs/development/python-modules/flexparser/default.nix index db20b68d7fc5..51d7e223c9ba 100644 --- a/pkgs/development/python-modules/flexparser/default.nix +++ b/pkgs/development/python-modules/flexparser/default.nix @@ -13,7 +13,6 @@ # checks pytestCheckHook, pytest-mpl, - pytest-subtests, }: buildPythonPackage rec { @@ -38,7 +37,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-mpl - pytest-subtests ]; pythonImportsCheck = [ "flexparser" ]; diff --git a/pkgs/development/python-modules/frozenlist/default.nix b/pkgs/development/python-modules/frozenlist/default.nix index 6b428ba55196..f789e8ea447e 100644 --- a/pkgs/development/python-modules/frozenlist/default.nix +++ b/pkgs/development/python-modules/frozenlist/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "frozenlist"; - version = "1.7.0"; + version = "1.8.0"; pyproject = true; src = fetchFromGitHub { owner = "aio-libs"; repo = "frozenlist"; tag = "v${version}"; - hash = "sha256-aBHX/U1L2mcah80edJFY/iXsM05DVas7lJT8yVTjER8="; + hash = "sha256-vkZ60qI0yQ82QSLQkBDzLnikTBQhUUuAzV+YsorrM2Q="; }; postPatch = '' diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index 4f55ef6384bf..61ecabf3b925 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -65,6 +65,9 @@ buildPythonPackage rec { "tests/test_move.py" "tests/test_mirror.py" "tests/test_copy.py" + # pyftpdlib removed tests from installation in 2.1.0, resulting in + # ModuleNotFoundError: No module named 'pyftpdlib.test' + "tests/test_ftpfs.py" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index 231c0b27f051..ee8e1ed82a01 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -38,14 +38,14 @@ buildPythonPackage rec { pname = "fsspec"; - version = "2025.10.0"; + version = "2026.1.0"; pyproject = true; src = fetchFromGitHub { owner = "fsspec"; repo = "filesystem_spec"; tag = version; - hash = "sha256-rIn2m3lRhlJwkB54X4sRT9JH+e4pIIEt7dPjnknczjs="; + hash = "sha256-jwtFFjaAZbGY7PeR3ZZzai+el0SlyojyAkptaqNePhE="; }; build-system = [ @@ -141,7 +141,7 @@ buildPythonPackage rec { meta = { description = "Specification that Python filesystems should adhere to"; homepage = "https://github.com/fsspec/filesystem_spec"; - changelog = "https://github.com/fsspec/filesystem_spec/raw/${version}/docs/source/changelog.rst"; + changelog = "https://github.com/fsspec/filesystem_spec/raw/${src.tag}/docs/source/changelog.rst"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ nickcao ]; }; diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index 0f6295323c05..883459222443 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -41,6 +41,11 @@ buildPythonPackage rec { export PATH=$out/bin:$PATH ''; + disabledTests = [ + # https://github.com/rspeer/python-ftfy/issues/226 + "ftfy.formatting.monospaced_width" + ]; + meta = { changelog = "https://github.com/rspeer/python-ftfy/blob/${src.rev}/CHANGELOG.md"; description = "Given Unicode text, make its representation consistent and possibly less broken"; diff --git a/pkgs/development/python-modules/gaphas/default.nix b/pkgs/development/python-modules/gaphas/default.nix index cb1ab47e3ffd..456840539ae1 100644 --- a/pkgs/development/python-modules/gaphas/default.nix +++ b/pkgs/development/python-modules/gaphas/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "gaphas"; - version = "5.1.1"; + version = "5.1.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ifr1Ul9/IaIvZ6b2SU08o110lRXlZ6RoqkH3CRYcH5A="; + hash = "sha256-XdawWTHzhWqWtiMmm1AYcjG0q/e5hJ9I9+7FKJhWNpY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/garth/default.nix b/pkgs/development/python-modules/garth/default.nix index 39e4fd0030b9..a8d27a8904df 100644 --- a/pkgs/development/python-modules/garth/default.nix +++ b/pkgs/development/python-modules/garth/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + freezegun, hatchling, pydantic, pytest-vcr, @@ -12,12 +13,12 @@ buildPythonPackage (finalAttrs: { pname = "garth"; - version = "0.5.21"; + version = "0.6.3"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-jZeVldHU6iOhtGarSmCVXRObcfiG9GSQvhQPzuWE2rQ="; + hash = "sha256-UZ1LUylEY4ZSu3QO5E3PNuHSNDIa7PCF7dfxqB6mb2k="; }; pythonRelaxDeps = [ "requests-oauthlib" ]; @@ -31,6 +32,7 @@ buildPythonPackage (finalAttrs: { ]; nativeCheckInputs = [ + freezegun pytest-vcr pytestCheckHook ]; @@ -50,6 +52,9 @@ buildPythonPackage (finalAttrs: { "test_sleep_data" "test_username" "test_weekly" + # Telemetry mock not working out, no idea + "test_telemetry_env_enabled_with_mock" + "test_default_callback_calls_logfire" ]; meta = { diff --git a/pkgs/development/python-modules/gast/default.nix b/pkgs/development/python-modules/gast/default.nix index 18c4e186e980..35f3906c1576 100644 --- a/pkgs/development/python-modules/gast/default.nix +++ b/pkgs/development/python-modules/gast/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "gast"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; src = fetchFromGitHub { owner = "serge-sans-paille"; repo = "gast"; tag = version; - hash = "sha256-zrbxW8qWhCY6tObP+/WDReoCnlCpMEzQucX2inpRTL4="; + hash = "sha256-paaXVdhstNlLc/zv/L1tHuv9IZ0Vz/vz2x2y2ePpXRc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/gcsfs/default.nix b/pkgs/development/python-modules/gcsfs/default.nix index fec4de581d3f..0f2ba6274676 100644 --- a/pkgs/development/python-modules/gcsfs/default.nix +++ b/pkgs/development/python-modules/gcsfs/default.nix @@ -2,31 +2,29 @@ lib, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, setuptools, google-auth, google-auth-oauthlib, google-cloud-storage, + google-cloud-storage-control, requests, decorator, fsspec, fusepy, aiohttp, crcmod, - pytest-timeout, - pytest-asyncio, }: buildPythonPackage rec { pname = "gcsfs"; - version = "2025.10.0"; + version = "2026.1.0"; pyproject = true; src = fetchFromGitHub { owner = "fsspec"; repo = "gcsfs"; tag = version; - hash = "sha256-Co98M3zK839mIWhV1Sifyb9r0sy1BjX6stDIj/0ONYo="; + hash = "sha256-WAHRaLsb6znzfuTOtulDhI0rQOOmmcgv9UEEMujPgkE="; }; build-system = [ @@ -40,6 +38,7 @@ buildPythonPackage rec { google-auth google-auth-oauthlib google-cloud-storage + google-cloud-storage-control requests ]; @@ -48,32 +47,15 @@ buildPythonPackage rec { crc = [ crcmod ]; }; - nativeCheckInputs = [ - pytest-timeout - pytest-asyncio - pytestCheckHook - ]; - - disabledTests = [ - # Cannot connect to host storage.googleapis.com:443 - "test_credentials_from_raw_token" - ]; - - disabledTestPaths = [ - # Tests require a running Docker instance - "gcsfs/tests/test_core.py" - "gcsfs/tests/test_mapping.py" - "gcsfs/tests/test_retry.py" - "gcsfs/tests/derived/gcsfs_test.py" - "gcsfs/tests/test_inventory_report_listing.py" - ]; + # Tests require a running Docker instance + doCheck = false; pythonImportsCheck = [ "gcsfs" ]; meta = { description = "Convenient Filesystem interface over GCS"; homepage = "https://github.com/fsspec/gcsfs"; - changelog = "https://github.com/fsspec/gcsfs/raw/${version}/docs/source/changelog.rst"; + changelog = "https://github.com/fsspec/gcsfs/raw/${src.tag}/docs/source/changelog.rst"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ nbren12 ]; }; diff --git a/pkgs/development/python-modules/genshi/default.nix b/pkgs/development/python-modules/genshi/default.nix index 99b18bca47c8..1dee12d5bb70 100644 --- a/pkgs/development/python-modules/genshi/default.nix +++ b/pkgs/development/python-modules/genshi/default.nix @@ -3,28 +3,22 @@ buildPythonPackage, fetchPypi, setuptools, - six, + pytestCheckHook, }: buildPythonPackage rec { pname = "genshi"; - version = "0.7.9"; - format = "setuptools"; + version = "0.7.10"; + pyproject = true; src = fetchPypi { - pname = "Genshi"; - inherit version; - hash = "sha256-x2FwqLLcGJROCRUQPChMuInfzuNODhQLozY8gPdUGtI="; + inherit pname version; + hash = "sha256-hbDbETYlMU8PRPP+bvDrJWTWw03S7lZ3tJXRUUK7SXM="; }; - # FAIL: test_sanitize_remove_script_elem (genshi.filters.tests.html.HTMLSanitizerTestCase) - # FAIL: test_sanitize_remove_src_javascript (genshi.filters.tests.html.HTMLSanitizerTestCase) - doCheck = false; + build-system = [ setuptools ]; - propagatedBuildInputs = [ - setuptools - six - ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = { description = "Python components for parsing HTML, XML and other textual content"; diff --git a/pkgs/development/python-modules/geoarrow-pandas/default.nix b/pkgs/development/python-modules/geoarrow-pandas/default.nix index 56c1d1d15e8a..057522cc5437 100644 --- a/pkgs/development/python-modules/geoarrow-pandas/default.nix +++ b/pkgs/development/python-modules/geoarrow-pandas/default.nix @@ -11,14 +11,14 @@ }: buildPythonPackage rec { pname = "geoarrow-pandas"; - version = "0.1.2"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { repo = "geoarrow-python"; owner = "geoarrow"; - tag = "geoarrow-pandas-${version}"; - hash = "sha256-Ni+GKTRhRDRHip1us3OZPuUhHQCNU7Nap865T/+CU8Y="; + tag = "geoarrow-types-${version}"; + hash = "sha256-ciElwh94ukFyFdOBuQWyOUVpn4jBM1RKfxiBCcM+nmE="; }; sourceRoot = "${src.name}/geoarrow-pandas"; diff --git a/pkgs/development/python-modules/geoarrow-pyarrow/default.nix b/pkgs/development/python-modules/geoarrow-pyarrow/default.nix index d87f07cfb5a9..75cf29cddb3d 100644 --- a/pkgs/development/python-modules/geoarrow-pyarrow/default.nix +++ b/pkgs/development/python-modules/geoarrow-pyarrow/default.nix @@ -16,14 +16,14 @@ }: buildPythonPackage rec { pname = "geoarrow-pyarrow"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { repo = "geoarrow-python"; owner = "geoarrow"; - tag = "geoarrow-pyarrow-${version}"; - hash = "sha256-tgeWrVpGIyRqRGk1y9OdS/eYMJjt80sXHt6VCx8RWys="; + tag = "geoarrow-types-${version}"; + hash = "sha256-ciElwh94ukFyFdOBuQWyOUVpn4jBM1RKfxiBCcM+nmE="; }; sourceRoot = "${src.name}/geoarrow-pyarrow"; diff --git a/pkgs/development/python-modules/geographiclib/default.nix b/pkgs/development/python-modules/geographiclib/default.nix index 05a23a6dec88..23dce71bb032 100644 --- a/pkgs/development/python-modules/geographiclib/default.nix +++ b/pkgs/development/python-modules/geographiclib/default.nix @@ -3,18 +3,21 @@ buildPythonPackage, fetchPypi, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "geographiclib"; - version = "2.0"; - format = "setuptools"; + version = "2.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-9/Qchdw+HC09k17IZmDcOyyEjIPhf5qeUbqdUUahWFk="; + hash = "sha256-amVF5iYtDtNSLhPFFXE3GHl+N+2MZywxrXsknzcu8Qg="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "geographiclib" ]; diff --git a/pkgs/development/python-modules/geoip2/default.nix b/pkgs/development/python-modules/geoip2/default.nix index 828db106a9a5..b90d1c34edb5 100644 --- a/pkgs/development/python-modules/geoip2/default.nix +++ b/pkgs/development/python-modules/geoip2/default.nix @@ -6,27 +6,31 @@ h11, maxminddb, pytestCheckHook, - pythonAtLeast, requests-mock, pytest-httpserver, requests, setuptools-scm, - setuptools, + uv-build, urllib3, }: buildPythonPackage rec { pname = "geoip2"; - version = "5.1.0"; + version = "5.2.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-7j+H8M6TJetkhP4Yy9l3GgPQorrR3RVvo1hPr6Vi05o="; + hash = "sha256-bJ3tGVP46xYEPtCo6iDm6VJOp7Zet0VyThJJCspE7wA="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "uv_build>=0.7.19,<0.8.0" uv_build + ''; + build-system = [ - setuptools + uv-build setuptools-scm ]; @@ -46,13 +50,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "geoip2" ]; - disabledTests = - lib.optionals (pythonAtLeast "3.10") [ - # https://github.com/maxmind/GeoIP2-python/pull/136 - "TestAsyncClient" - ] - ++ lib.optionals (pythonAtLeast "3.10") [ "test_request" ]; - meta = { description = "GeoIP2 webservice client and database reader"; homepage = "https://github.com/maxmind/GeoIP2-python"; diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index 210f522713db..4cc1e0145ef8 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -27,27 +27,18 @@ buildPythonPackage rec { pname = "geopandas"; - version = "1.1.1"; + version = "1.1.2"; pyproject = true; src = fetchFromGitHub { owner = "geopandas"; repo = "geopandas"; tag = "v${version}"; - hash = "sha256-7ZsO4jresikA17M8cyHskdcVnTscGHxTCLJv5p1SvfI="; + hash = "sha256-TBb9Bb12OZ9RWiwAGU6JKqiumw1C11USycpKM8mJVdU="; }; build-system = [ setuptools ]; - patches = [ - # fix tests for geos 3.14 - # see https://github.com/geopandas/geopandas/pull/3645 - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/geopandas/geopandas/pull/3645.patch"; - hash = "sha256-TLJixFRR+g739PLgwhTGuwYTVJ4SRr2BMGD14CLgmcY="; - }) - ]; - dependencies = [ packaging pandas diff --git a/pkgs/development/python-modules/gerbonara/default.nix b/pkgs/development/python-modules/gerbonara/default.nix index 6294c13c7794..1faba0f4d8a8 100644 --- a/pkgs/development/python-modules/gerbonara/default.nix +++ b/pkgs/development/python-modules/gerbonara/default.nix @@ -3,41 +3,32 @@ buildPythonPackage, fetchFromGitHub, gitUpdater, - setuptools, + uv-build, click, - numpy, - scipy, + quart, rtree, }: buildPythonPackage rec { pname = "gerbonara"; - version = "1.5.0"; + version = "1.6.1"; + pyproject = true; + src = fetchFromGitHub { owner = "jaseg"; repo = "gerbonara"; - rev = "v${version}"; - hash = "sha256-yxSZuBw93wqIAw1wke80Vy/dtBcQwpQ2tQ1nwXdWi4k="; + tag = "v${version}"; + hash = "sha256-kzEjfM9QrT+izwyCnNdN6Bv6lk1rzqs7tfDvERzJzzI="; }; - format = "setuptools"; + build-system = [ uv-build ]; - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ + dependencies = [ click - numpy - scipy + quart rtree ]; - preConfigure = '' - # setup.py tries to execute a call to git in a subprocess, this avoids it. - substituteInPlace setup.py \ - --replace "version=version()," \ - "version='${version}'," - ''; - pythonImportsCheck = [ "gerbonara" ]; # Test environment is exceptionally tricky to get set up, so skip for now. diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index 27ff94c13f8d..af22c81a7395 100644 --- a/pkgs/development/python-modules/gevent/default.nix +++ b/pkgs/development/python-modules/gevent/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "gevent"; - version = "25.5.1"; + version = "25.9.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-WCyUj6miMYi4kNC8Ewc0pQbQOaLlrYfa4nakVsxoPmE="; + hash = "sha256-rfnNVS3kSk5nVMUf8ueNkZO3+m6rEj25V4ohDmVyNd0="; }; build-system = [ diff --git a/pkgs/development/python-modules/geventhttpclient/default.nix b/pkgs/development/python-modules/geventhttpclient/default.nix index 983a66f0ed32..0311dd10d9bb 100644 --- a/pkgs/development/python-modules/geventhttpclient/default.nix +++ b/pkgs/development/python-modules/geventhttpclient/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "geventhttpclient"; - version = "2.3.4"; + version = "2.3.7"; pyproject = true; src = fetchFromGitHub { @@ -23,7 +23,7 @@ buildPythonPackage rec { tag = version; # TODO: unvendor llhttp fetchSubmodules = true; - hash = "sha256-X85co03fMG7OSpkL02n3ektRNzu7oHChtwZzkspsSTk="; + hash = "sha256-vca2uCQ1S21xQmAXdpLhI0DFZYUSyKhSkvETa2VqbkA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/gguf/default.nix b/pkgs/development/python-modules/gguf/default.nix index 4bddf387d180..def6e73ea671 100644 --- a/pkgs/development/python-modules/gguf/default.nix +++ b/pkgs/development/python-modules/gguf/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "gguf"; - version = "0.17.1"; + version = "7789"; pyproject = true; src = fetchFromGitHub { owner = "ggml-org"; repo = "llama.cpp"; - tag = "gguf-v${version}"; - hash = "sha256-XjDMDca4pyc72WQee4h3R6Iq9M0LzO+6ukV6CBWQO1M="; + tag = "b${version}"; + hash = "sha256-EQYyRSptjEmhe6AaOs3KV0N4aoGvK8Z+WBKacEYW8Wo="; }; sourceRoot = "${src.name}/gguf-py"; diff --git a/pkgs/development/python-modules/gios/default.nix b/pkgs/development/python-modules/gios/default.nix index 5bfc2409e934..a07a17dcd5da 100644 --- a/pkgs/development/python-modules/gios/default.nix +++ b/pkgs/development/python-modules/gios/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { version = "7.0.0"; pyproject = true; - disabled = pythonOlder "3.14"; + disabled = pythonOlder "3.13"; src = fetchFromGitHub { owner = "bieniu"; diff --git a/pkgs/development/python-modules/gitpython/default.nix b/pkgs/development/python-modules/gitpython/default.nix index b3b9a81a027e..31d79fc7167e 100644 --- a/pkgs/development/python-modules/gitpython/default.nix +++ b/pkgs/development/python-modules/gitpython/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "gitpython"; - version = "3.1.45"; + version = "3.1.46"; pyproject = true; src = fetchFromGitHub { owner = "gitpython-developers"; repo = "GitPython"; tag = version; - hash = "sha256-VHnuHliZEc/jiSo/Zi9J/ipAykj7D6NttuzPZiE8svM="; + hash = "sha256-ymuJlxGEmWwvmVFYiIW23k5Gl2h09ugFLPosnUWg5S0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix index fb91ab4ebe95..6ea46fce5595 100644 --- a/pkgs/development/python-modules/glean-parser/default.nix +++ b/pkgs/development/python-modules/glean-parser/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "glean-parser"; - version = "17.3.0"; + version = "18.2.0"; pyproject = true; src = fetchPypi { pname = "glean_parser"; inherit version; - hash = "sha256-9w+0SWQ2Bo+B73hgKaGzafYa4vkyfusvpQM126We4hQ="; + hash = "sha256-VDLOZL9HMp3+Smt+QE1TnMsG2Z/d633u7XRUkfvVt+c="; }; build-system = [ diff --git a/pkgs/development/python-modules/gmpy/default.nix b/pkgs/development/python-modules/gmpy/default.nix index 1e84679782a0..e3c9761142cc 100644 --- a/pkgs/development/python-modules/gmpy/default.nix +++ b/pkgs/development/python-modules/gmpy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "gmpy"; - version = "1.17"; + version = "2.2.2"; pyproject = true; # Python 3.11 has finally made changes to its C API for which gmpy 1.17, @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aleaxit"; repo = "gmpy"; - tag = "gmpy_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-kMidOjhKJlDRu2qaiq9c+XcwD1tNAoPhRTvvGcOJe8I="; + tag = "v${version}"; + hash = "sha256-joeHec/d82sovfASCU3nlNL6SaThnS/XYPqujiZ9h8s="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/gmpy2/default.nix b/pkgs/development/python-modules/gmpy2/default.nix index bf1e2ee92f78..2d8b46b150d3 100644 --- a/pkgs/development/python-modules/gmpy2/default.nix +++ b/pkgs/development/python-modules/gmpy2/default.nix @@ -1,9 +1,7 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch2, isPyPy, setuptools, gmp, @@ -19,7 +17,7 @@ buildPythonPackage (finalAttrs: { pname = "gmpy2"; - version = "2.2.1"; + version = "2.2.2"; pyproject = true; disabled = isPyPy; @@ -28,17 +26,9 @@ buildPythonPackage (finalAttrs: { owner = "aleaxit"; repo = "gmpy"; tag = "v${finalAttrs.version}"; - hash = "sha256-wrMN3kqLnjItoybKYeo4Pp2M0uma7Kg0JEQM8lr6OI0="; + hash = "sha256-joeHec/d82sovfASCU3nlNL6SaThnS/XYPqujiZ9h8s="; }; - patches = [ - (fetchpatch2 { - name = "fix-to_bytes-tests.patch"; - url = "https://github.com/aleaxit/gmpy/commit/1903841667e7a6842bdead90bd7798b99de5b7be.patch?full_index=1"; - hash = "sha256-rlssUIkQ1RCRSu5eCXKJ2lNa/oIoLzf9sxJuNfDrVmk="; - }) - ]; - build-system = [ setuptools ]; buildInputs = [ diff --git a/pkgs/development/python-modules/gnureadline/default.nix b/pkgs/development/python-modules/gnureadline/default.nix index 4f03b8533867..670efed315b3 100644 --- a/pkgs/development/python-modules/gnureadline/default.nix +++ b/pkgs/development/python-modules/gnureadline/default.nix @@ -7,14 +7,14 @@ }: buildPythonPackage rec { - version = "8.2.13"; + version = "8.3.3"; format = "setuptools"; pname = "gnureadline"; disabled = isPyPy; src = fetchPypi { inherit pname version; - hash = "sha256-ybnh57qZqAu1DBICfWzmkldPd6Zb9XvJcEHPgcD0m9E="; + hash = "sha256-CXI5K9LzEkTi2YEXgkb+i3Kch2ZFT9rrJ1lGrEe36f0="; }; buildInputs = [ pkgs.ncurses ]; diff --git a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix index 5d88dedcd2b5..47fa213a0dc6 100644 --- a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix +++ b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "google-ai-generativelanguage"; - version = "0.9.0"; + version = "0.10.0"; pyproject = true; src = fetchPypi { pname = "google_ai_generativelanguage"; inherit version; - hash = "sha256-JSR0j0E5F0Rv68jgh53A1PAmoGT4nxfEK4G+p3q3bIQ="; + hash = "sha256-F+mYCUADpWbg+lIkn91J6PTAMM6+f+DFIbQNYFq6eD4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix index b67721431018..1c0db8d4a07e 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -7,10 +7,10 @@ grpcio, grpcio-gcp, grpcio-status, - mock, proto-plus, protobuf, pytest-asyncio, + pytest-mock, pytestCheckHook, requests, setuptools, @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "2.26.0"; + version = "2.29.0"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "python-api-core"; tag = "v${version}"; - hash = "sha256-BA2OWzr0sH77YUkFqMsGJQppqbG3R4sQ2kepicdzejE="; + hash = "sha256-wqDGtCYAH2f+P3zUfXgiQTePLr7a0qzUTeEc6pdCGio="; }; build-system = [ setuptools ]; @@ -49,8 +49,8 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - mock pytest-asyncio + pytest-mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix index 3d5a0d4a33fc..b0afbfd77763 100644 --- a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "google-cloud-appengine-logging"; - version = "1.6.2"; + version = "1.8.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_appengine_logging"; inherit version; - hash = "sha256-SJCShGTJjanuzHv04FQuuiVRUSwCZUYsEPOj0qZCS5A="; + hash = "sha256-hLcFpp5BCfwvaN/jbOPfajTVw9mJ7ubQrBsCTdoLpvU="; }; build-system = [ setuptools ]; 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 b32a966b5411..79957a27f5da 100644 --- a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix +++ b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "google-cloud-artifact-registry"; - version = "1.18.0"; + version = "1.19.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_artifact_registry"; inherit version; - hash = "sha256-GLYw5FsVCBp9EgGRR1wiJpKSo14SlmqLRCL85pi1ASg="; + hash = "sha256-QVAy29BzPd9EO4RDKo3kiZqktupkGWDJjd8v6x10mpE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index 78247da0aebc..497aa28becd0 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.17.0"; + version = "2.18.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_automl"; inherit version; - hash = "sha256-Fnd7X75kt2+HN665ZFQYv9+ST3wso1Dx/VViUyggfpw="; + hash = "sha256-F9JU0usvIFAxWQem49LpoD4KbJ+yaq1akoCJ7qUhRXI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index 01c9f78dfbb9..54261ccc2d41 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.19.2"; + version = "3.21.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_bigquery_datatransfer"; inherit version; - hash = "sha256-l/9g7Sc6umoVdPf6kzE08gRmLH6co2dLJ8mdLPLXtN8="; + hash = "sha256-zVgZBASf80Iv4RPHFa9Oy7E8+/UqU+l63UH6nl6+SHA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix index 45b10c93db0c..4c949fcc40ef 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-logging"; - version = "1.6.3"; + version = "1.8.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_bigquery_logging"; inherit version; - hash = "sha256-55xND/MHByzkQEmjeOnTEDEASqUR5zB/OvDHFsAEt8U="; + hash = "sha256-2ENcmRKghxKocDtYOjZgsvOfQ2GooC/RpoSdKSVhBV0="; }; build-system = [ setuptools ]; 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 b1ba431d915b..a735f83a89ca 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-storage"; - version = "2.32.0"; + version = "2.36.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_bigquery_storage"; inherit version; - hash = "sha256-6UT19DhfC+J+BJ5z5NzPVIt3NIMBZjp3O10Dq9vUniA="; + hash = "sha256-08HOnS06TXEWJZiJ3L48fHBQb3H2zmu+VKoKaLu6j48="; }; 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 73cb6d083298..9b9bf37da1f8 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -32,18 +32,18 @@ mock, psutil, pytest-xdist, - pytestCheckHook, + pytest8_3CheckHook, }: buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "3.35.1"; + version = "3.40.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_bigquery"; inherit version; - hash = "sha256-WZ8mys8ZCs/ogAD2zF9Lyea6rHiZ5PQGygVPGQb3GWA="; + hash = "sha256-s8yxHK8AKfFbKVaVGPZnVT/gj28UWblZAgyD+72PLmg="; }; build-system = [ setuptools ]; @@ -84,7 +84,7 @@ buildPythonPackage rec { mock psutil pytest-xdist - pytestCheckHook + pytest8_3CheckHook ] ++ optional-dependencies.pandas ++ optional-dependencies.ipython; @@ -109,6 +109,8 @@ buildPythonPackage rec { "test_list_rows_scalars_extreme" "test_session" "test_to_arrow_query_with_empty_result" + "test_list_rows_pico" + "test_list_rows_pico_truncate" # Mocking of _ensure_bqstorage_client fails "test_to_arrow_ensure_bqstorage_client_wo_bqstorage" diff --git a/pkgs/development/python-modules/google-cloud-compute/default.nix b/pkgs/development/python-modules/google-cloud-compute/default.nix index db5b4f79da4c..b1b982aeedfd 100644 --- a/pkgs/development/python-modules/google-cloud-compute/default.nix +++ b/pkgs/development/python-modules/google-cloud-compute/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "google-cloud-compute"; - version = "1.38.0"; + version = "1.42.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_compute"; inherit version; - hash = "sha256-5LynsDwi4q+P9Xa0+05591ZvsRC1eLq7D9zYZjNqAQ4="; + hash = "sha256-CLHbxXWLqlSRCHvO+1dOWdkRUgtxTtp5tOvxy0KdjZg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index 001b138a8a09..e6dfec1844bb 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.61.0"; + version = "2.62.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_container"; inherit version; - hash = "sha256-mkkbT7ybP7bjNo8fCPo8rsXGzw8WoDh7l2YS+5CJOr8="; + hash = "sha256-O647Jw3v9kD1Pn0naPvAP/vzUxqIZWD7nk97VRRs1T8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix index 177d0697d72d..91367569fb99 100644 --- a/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/pkgs/development/python-modules/google-cloud-core/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-core"; - version = "2.4.3"; + version = "2.5.0"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "python-cloud-core"; tag = "v${version}"; - hash = "sha256-hYOtpHIHJVITrei6/0m1YteTog2WBWCUFCl/Zr6BLlc="; + hash = "sha256-mB0gHxyK+g+e5I/3TRVAyQzPu005ug7fTvRNxciJ9LQ="; }; build-system = [ setuptools ]; @@ -53,7 +53,7 @@ buildPythonPackage rec { meta = { description = "API Client library for Google Cloud: Core Helpers"; homepage = "https://github.com/googleapis/python-cloud-core"; - changelog = "https://github.com/googleapis/python-cloud-core/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/googleapis/python-cloud-core/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 01762d7bd474..b2a7d70c5b12 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "5.23.0"; + version = "5.24.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_dataproc"; inherit version; - hash = "sha256-lLOFvb9nt+K29TyglTrC3yGV4T4TG60TLvyGZFn2BqM="; + hash = "sha256-yKIv5tswCOc1uPzce2ARf2JD2Q4O2RDWMNFQTOXAvbQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index c32eb5c870bf..907c97a346a9 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.33.0"; + version = "3.34.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_dlp"; inherit version; - hash = "sha256-qRC+EY7DyImMOFIWENYvShbzM6Tesqvrdz5yD25fZ+M="; + hash = "sha256-bfoxclINWn+ozM5HqWIs3oFfA3tKpvttaZhP1Ze/gAc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index 1c6cf556cfe1..19ba313198b6 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -12,18 +12,19 @@ protobuf, pytest-asyncio, pytestCheckHook, + pyyaml, setuptools, }: buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.21.0"; + version = "2.23.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_firestore"; inherit version; - hash = "sha256-DDf6qFBil/gn7vw4/rFVJHpty5pUEoljEBXRJfGwA/g="; + hash = "sha256-qc/7p83GEBER1tVM3iLVIcmPnn1BXmdIaxN/oW8GqgM="; }; build-system = [ setuptools ]; @@ -43,6 +44,7 @@ buildPythonPackage rec { mock pytest-asyncio pytestCheckHook + pyyaml ]; preCheck = '' @@ -55,12 +57,7 @@ buildPythonPackage rec { "tests/system/test_system.py" "tests/system/test_system_async.py" # Test requires credentials - "tests/unit/v1/test_bulk_writer.py" - ]; - - disabledTests = [ - # Test requires credentials - "test_collections" + "tests/system/test_pipeline_acceptance.py" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix index 48b80a05fefd..1d8995698fa9 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.20.0"; + version = "2.21.0"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-python"; tag = "google-cloud-iam-v${version}"; - hash = "sha256-ICSBKEqNaXZZopGDwB0pkt06xN0gnsTBUA/HCQVxQTU="; + hash = "sha256-dVgcnnInqjUjySL7wjxGzI33t1YZJ8e9mSsmjAJ+fBI="; }; sourceRoot = "${src.name}/packages/google-cloud-iam"; diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix index f0aa00153a76..0a58754d60d4 100644 --- a/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "3.7.0"; + version = "3.9.0"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-python"; tag = "google-cloud-kms-v${version}"; - hash = "sha256-/ZBpSn6bZpzFgIg3LmfV7xMowh9Gpslw0fcN021jAow="; + hash = "sha256-JR3fcwCuMZkHyJHnMt4EGvTZZ7MLgQrgxCaTlJZ1zYE="; }; sourceRoot = "${src.name}/packages/google-cloud-kms"; diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index 98b04c7fb8c0..f1532c23754b 100644 --- a/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "google-cloud-language"; - version = "2.18.0"; + version = "2.19.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_language"; inherit version; - hash = "sha256-dblTX2tCTJwI/h7118zkKTJZGoDac6HacsWR39xpxB4="; + hash = "sha256-O4j26r0cJBOhxskYy+QKIqXRRAGTAwlxfbtwmzU8bGQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index c2437586f4d4..6dccc4cdb373 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -23,13 +23,13 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "3.12.1"; + version = "3.13.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_logging"; inherit version; - hash = "sha256-Nu/II5hQVbIDkE6D4cj5+ZmzxkJwvNo51XOGyk7/1ng="; + hash = "sha256-Oq4Fc7GhpPWezfRXH054gbWCO9Ep/kaVYcHEmn+opME="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index dc2de9c829db..78aef666177c 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.22.0"; + version = "1.23.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_os_config"; inherit version; - hash = "sha256-15oxD2+hznRwqqCExw443AXZhTH0aPghs6Um5NM6cOQ="; + hash = "sha256-pinPVbPt42st+JgUxszzwdQ8fxtD22x8AutIYIUbrzo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index e8fac81a98a4..f689c8a596b6 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.19.0"; + version = "2.20.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_redis"; inherit version; - hash = "sha256-PG98eUvo/JnrbOPj7nxclqIKaIFO0LgzjidX8jJ0gNc="; + hash = "sha256-pnLkxqxBj/IM6J73AnYtZ4nD1W/9F8MT6Z+SWiWPHoo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index b8ada5017686..01ec7cad5d8e 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -33,14 +33,14 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.58.0"; + version = "3.62.0"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "python-spanner"; tag = "v${version}"; - hash = "sha256-bIagQjQv+oatIo8mkA8t5wP9igMnorkiudgyWkVnJcg="; + hash = "sha256-3WmfDwbdhYY1xaA5RnrAuD1+EDrJ3KMBsonQkuFkgcA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index 1bfdfd2a6e8c..9afac1123d80 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.34.0"; + version = "2.36.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_speech"; inherit version; - hash = "sha256-Knv/2E8TS5twyfEcu1CIxTT5K+FJ1x2Qc9C53TpDGs8="; + hash = "sha256-OkRaAzzHdy99BzwDFCp+gASEFdtCmBNyxrge3Hah4no="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-storage-control/default.nix b/pkgs/development/python-modules/google-cloud-storage-control/default.nix new file mode 100644 index 000000000000..d02438fd87d7 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-storage-control/default.nix @@ -0,0 +1,68 @@ +{ + buildPythonPackage, + fetchFromGitHub, + gitUpdater, + google-api-core, + google-auth, + grpc-google-iam-v1, + grpcio, + lib, + proto-plus, + protobuf, + pytest-asyncio, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage (finalAttrs: { + pname = "google-cloud-storage-control"; + version = "1.9.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "googleapis"; + repo = "google-cloud-python"; + tag = "google-cloud-storage-control-v${finalAttrs.version}"; + hash = "sha256-5xQ4p9xi/6Y8oi7dWo+fdVT8X8U7UGmdKtSsoEanRso="; + }; + + sourceRoot = "${finalAttrs.src.name}/packages/google-cloud-storage-control"; + + build-system = [ setuptools ]; + + dependencies = [ + google-api-core + google-auth + grpc-google-iam-v1 + grpcio + proto-plus + protobuf + ] + ++ google-api-core.optional-dependencies.grpc; + + pythonImportsCheck = [ + "google.cloud.storage_control" + "google.cloud.storage_control_v2" + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + passthru = { + # bulk updater selects wrong tag + skipBulkUpdate = true; + updateScript = gitUpdater { + rev-prefix = "google-cloud-storage-control-v"; + }; + }; + + meta = { + changelog = "https://github.com/googleapis/google-cloud-python/blob/${finalAttrs.src.tag}/packages/google-cloud-storage-control/CHANGELOG.md"; + description = "Google Cloud Storage Control API client library"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-storage-control"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.dotlambda ]; + }; +}) diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index d6c158e67dd9..ce738191c2f6 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "3.4.1"; + version = "3.8.0"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "python-storage"; tag = "v${version}"; - hash = "sha256-fLS1rrblNKm8dTG/Srg6IfcEjeZCS2QGNwW6ZXIo7UQ="; + hash = "sha256-CHku6tiELE3deP6ZCRx/ekn60FmF3gO51cOAF1DkQrI="; }; pythonRelaxDeps = [ "google-auth" ]; @@ -74,6 +74,9 @@ buildPythonPackage rec { "test_restore_bucket" "test_set_api_request_attr" "upload" + "test_update_user_agent_when_default_clientinfo_provided" + "test_update_user_agent_when_none_clientinfo_provided" + "test_update_user_agent_with_existing_user_agent" ]; disabledTestPaths = [ @@ -98,7 +101,7 @@ buildPythonPackage rec { meta = { description = "Google Cloud Storage API client library"; homepage = "https://github.com/googleapis/python-storage"; - changelog = "https://github.com/googleapis/python-storage/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/googleapis/python-storage/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ sarahec ]; }; diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index 78cc6475d419..eafb44e5be22 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.20.0"; + version = "2.21.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_tasks"; inherit version; - hash = "sha256-czz0QKJdNP4c205slG0XO9g6LCLD17LHaiRZHzwWBBI="; + hash = "sha256-0o8zJIVT+vD/Ap4Zgaq1bNE72TNjXDvDOqGHZ15+FNE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-testutils/default.nix b/pkgs/development/python-modules/google-cloud-testutils/default.nix index 7f22b14d12d3..74f96b899bfd 100644 --- a/pkgs/development/python-modules/google-cloud-testutils/default.nix +++ b/pkgs/development/python-modules/google-cloud-testutils/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-testutils"; - version = "1.6.4"; + version = "1.7.0"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "python-test-utils"; tag = "v${version}"; - hash = "sha256-VTu/ElWZrSUrUBrfLPTBV4PMSQCRAyF9Ka7jKEqVzLk="; + hash = "sha256-g7XwDQp4c+duKfUWqhnI8T001fu6cM22oWLriyCZZag="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index d1f5aa99b7e1..c5d2dccfd227 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.17.0"; + version = "1.18.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_trace"; inherit version; - hash = "sha256-aHA7/JNxgIPwYdkTCjhS4xgewba3lrdoVpl8KPUblZU="; + hash = "sha256-RtQrkCc9o7xIULsNa5ogXrgmpUVh/xswyjPMkhdMPzc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-crc32c/default.nix b/pkgs/development/python-modules/google-crc32c/default.nix index 8d4f9156041a..29d377fc8170 100644 --- a/pkgs/development/python-modules/google-crc32c/default.nix +++ b/pkgs/development/python-modules/google-crc32c/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "google-crc32c"; - version = "1.7.1"; + version = "1.8.0"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "python-crc32c"; tag = "v${version}"; - hash = "sha256-YXXoEXnJckF1kqpLXbIbJEcW+le6aeKyc6Y6xmf0SSw="; + hash = "sha256-bNTWyOWie1tPiptJ6NPCyC5kzcCpgOZ0w5hKVw07iwc="; }; build-system = [ setuptools ]; @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = { description = "Wrapper the google/crc32c hardware-based implementation of the CRC32C hashing algorithm"; homepage = "https://github.com/googleapis/python-crc32c"; - changelog = "https://github.com/googleapis/python-crc32c/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/googleapis/python-crc32c/blob/${src.tag}/CHANGELOG.md"; license = with lib.licenses; [ asl20 ]; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/google-genai/default.nix b/pkgs/development/python-modules/google-genai/default.nix index 50aa4c9dda2a..deb9f80d99c6 100644 --- a/pkgs/development/python-modules/google-genai/default.nix +++ b/pkgs/development/python-modules/google-genai/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "tenacity" + "websockets" ]; dependencies = [ diff --git a/pkgs/development/python-modules/google-re2/default.nix b/pkgs/development/python-modules/google-re2/default.nix index 9f225de58ec1..914bcee16e98 100644 --- a/pkgs/development/python-modules/google-re2/default.nix +++ b/pkgs/development/python-modules/google-re2/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "google-re2"; - version = "1.1.20250805"; + version = "1.1.20251105"; pyproject = true; src = fetchPypi { pname = "google_re2"; inherit version; - hash = "sha256-xV2ffJKoFOtTkYp7OOW6XqocmVSDIay4JtqVMnga9bU="; + hash = "sha256-HbFKKS7oMDuR6R58N+BawX08Rn8pQWx5rHCni+PmW9o="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix index 895b5f6351d9..40b55ff77c56 100644 --- a/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/pkgs/development/python-modules/google-resumable-media/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "2.7.2"; + version = "2.8.0"; pyproject = true; src = fetchPypi { pname = "google_resumable_media"; inherit version; - hash = "sha256-UoCu1GKfK2C4R7DUL5hX/Uk1wRryZnRN8z2AdMrpL+A="; + hash = "sha256-8RV+2LRplNYKG8QyVE22I1IEMRNoTU4DDuAud+vpoa4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/gotrue/default.nix b/pkgs/development/python-modules/gotrue/default.nix index 28cdc92a1307..baa701d1a7ec 100644 --- a/pkgs/development/python-modules/gotrue/default.nix +++ b/pkgs/development/python-modules/gotrue/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "gotrue"; - version = "2.12.3"; + version = "2.12.4"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-+HTPnQsvAzW/vQ1uKeP3r/eZmM0cFNKtgU24wGzuOFI="; + hash = "sha256-NdLljgZkhjIfTf8AM7MKU9BXx/Q2wVKHEi+gy4MwKbE="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/gpytorch/default.nix b/pkgs/development/python-modules/gpytorch/default.nix index 77e5c45f05f1..1e2eb55fe82b 100644 --- a/pkgs/development/python-modules/gpytorch/default.nix +++ b/pkgs/development/python-modules/gpytorch/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "gpytorch"; - version = "1.14.3"; + version = "1.15.1"; pyproject = true; src = fetchFromGitHub { owner = "cornellius-gp"; repo = "gpytorch"; tag = "v${version}"; - hash = "sha256-AuWVNAduh2y/sLIJAXg/9YgpFa21d1sbRHlcdG5cpJ8="; + hash = "sha256-ftiAY02K0EwVQZufk8xR+/21A+2ONWchuWPF3a5lRW0="; }; build-system = [ diff --git a/pkgs/development/python-modules/gradient/default.nix b/pkgs/development/python-modules/gradient/default.nix index 76e4830516f3..a03dd7d1de8a 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.99.3"; + version = "3.10.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-Ep3Qh9Q1xWt2JveCf/A/KInQ3cnGE7D1YNdavDS0ZE8="; + hash = "sha256-TL9Jbo9UvQhgG9aT3wjLD8DvTY48Os04DdaUfNAwcu4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/gradio/client.nix b/pkgs/development/python-modules/gradio/client.nix index d4c02beafb07..7c218fabfdae 100644 --- a/pkgs/development/python-modules/gradio/client.nix +++ b/pkgs/development/python-modules/gradio/client.nix @@ -23,6 +23,7 @@ pydub, pytest-asyncio, pytestCheckHook, + requests, rich, safehttpx, tomlkit, @@ -85,6 +86,7 @@ buildPythonPackage rec { pydub pytest-asyncio pytestCheckHook + requests rich safehttpx tomlkit diff --git a/pkgs/development/python-modules/grandalf/default.nix b/pkgs/development/python-modules/grandalf/default.nix index 7e7408b3ffac..8d012e2e0ee5 100644 --- a/pkgs/development/python-modules/grandalf/default.nix +++ b/pkgs/development/python-modules/grandalf/default.nix @@ -2,30 +2,31 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, pyparsing, pytestCheckHook, }: buildPythonPackage rec { pname = "grandalf"; - version = "0.7"; - format = "setuptools"; + version = "0.8"; + pyproject = true; src = fetchFromGitHub { owner = "bdcht"; repo = "grandalf"; - rev = "v${version}"; - hash = "sha256-j2SvpQvDMfwoj2PAQSxzEIyIzzJ61Eb9wgetKyni6A4="; + tag = "v${version}"; + hash = "sha256-oKuzk/vsEkoiEPgt/fsaaurKfz5CElXPEJe88aFBLqU="; }; - propagatedBuildInputs = [ - pyparsing - ]; + patches = [ ./no-setup-requires-pytestrunner.patch ]; + + build-system = [ setuptools ]; + + dependencies = [ pyparsing ]; nativeCheckInputs = [ pytestCheckHook ]; - patches = [ ./no-setup-requires-pytestrunner.patch ]; - pythonImportsCheck = [ "grandalf" ]; meta = { diff --git a/pkgs/development/python-modules/granian/default.nix b/pkgs/development/python-modules/granian/default.nix index df9ed11f79c7..bceeb7c6ef21 100644 --- a/pkgs/development/python-modules/granian/default.nix +++ b/pkgs/development/python-modules/granian/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "granian"; - version = "2.6.0"; + version = "2.6.1"; pyproject = true; src = fetchFromGitHub { owner = "emmett-framework"; repo = "granian"; tag = "v${version}"; - hash = "sha256-Jj75ycr9Y0aCTP5YGzd6um/7emWKqqegUDB7HpTfTcM="; + hash = "sha256-vsCDz749bmqFDzQeupYiNZlfIqwEmG2zIxdeCe4OHm4="; }; # Granian forces a custom allocator for all the things it runs, @@ -35,17 +35,12 @@ buildPythonPackage rec { # and allow the final application to make the allocator decision # via LD_PRELOAD or similar. patches = [ - (fetchurl { - # Refresh expired TLS certificates for tests - url = "https://github.com/emmett-framework/granian/commit/189f1bed2effb4a8a9cba07b2c5004e599a6a890.patch"; - hash = "sha256-7FgVR7/lAh2P5ptGx6jlFzWuk24RY7wieN+aLaAEY+c="; - }) ./no-alloc.patch ]; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-Q7BWwvkK5rRuhVobxW4qXLo6tnusOaQYN8mBoNVoulw="; + hash = "sha256-iQdcpCqXG1alVTbzCW3o4x0127zxyJCqtKyso9oVWS8="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/graphemeu/default.nix b/pkgs/development/python-modules/graphemeu/default.nix index 060aae37b12e..bb55c7cd2179 100644 --- a/pkgs/development/python-modules/graphemeu/default.nix +++ b/pkgs/development/python-modules/graphemeu/default.nix @@ -7,7 +7,7 @@ pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "graphemeu"; version = "0.10.0"; pyproject = true; @@ -15,24 +15,28 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "timendum"; repo = "grapheme"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-qDspbeOmlfQ4VLPdKEuxNPYilKjwUcAJiEOMfx9fFlI="; }; - build-system = [ hatchling ]; + build-system = [ + hatchling + ]; nativeCheckInputs = [ pytest-cov-stub pytestCheckHook ]; - pythonImportsCheck = [ "grapheme" ]; + pythonImportsCheck = [ + "grapheme" + ]; meta = { description = "Python package for grapheme aware string handling"; homepage = "https://github.com/timendum/grapheme"; - changelog = "https://github.com/timendum/grapheme/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/timendum/grapheme/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ anthonyroussel ]; }; -} +}) diff --git a/pkgs/development/python-modules/graphql-core/default.nix b/pkgs/development/python-modules/graphql-core/default.nix index 5ad49b0dae6c..d820a754c9a8 100644 --- a/pkgs/development/python-modules/graphql-core/default.nix +++ b/pkgs/development/python-modules/graphql-core/default.nix @@ -10,19 +10,19 @@ buildPythonPackage rec { pname = "graphql-core"; - version = "3.2.6"; + version = "3.2.7"; pyproject = true; src = fetchFromGitHub { owner = "graphql-python"; repo = "graphql-core"; tag = "v${version}"; - hash = "sha256-RkVyoTSVmtKhs42IK+oOrOL4uBs3As3N5KY0Sz1VaDQ="; + hash = "sha256-ag8yFf6254dX2xNZMKtVBW5QtI5JOZjzgcZveuoeAss="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail ', "setuptools>=59,<76"' "" + --replace-fail ', "setuptools>=59,<81"' "" ''; build-system = [ diff --git a/pkgs/development/python-modules/great-expectations/default.nix b/pkgs/development/python-modules/great-expectations/default.nix index 8ba61a03efae..d525615184bc 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.5.7"; + version = "1.11.1"; pyproject = true; src = fetchFromGitHub { owner = "great-expectations"; repo = "great_expectations"; tag = version; - hash = "sha256-pa44metr9KP2KF2ulq7kd84BVdBMvMhsWJeBsJ2AnG0="; + hash = "sha256-8yKuEVupqbwlBGeUDu25pvGltybljkmpbkcbC+G+/VI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/greatfet/default.nix b/pkgs/development/python-modules/greatfet/default.nix index c09e24401ae3..7883daea7aa7 100644 --- a/pkgs/development/python-modules/greatfet/default.nix +++ b/pkgs/development/python-modules/greatfet/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "greatfet"; - version = "2024.0.4"; + version = "2025.0.0"; pyproject = true; src = fetchFromGitHub { owner = "greatscottgadgets"; repo = "greatfet"; tag = "v${version}"; - hash = "sha256-3ClM4UzVIDEkVBrFwzvLokbxUHXqdQWyNVqcFtiXCOQ="; + hash = "sha256-tY1ZUtjCeb0+EmmbzKbIcPQrjHc3JzgA/6yDuFwwHu4="; }; sourceRoot = "${src.name}/host"; diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix index a67e6ce71b6b..fe6554328bc0 100644 --- a/pkgs/development/python-modules/greenlet/default.nix +++ b/pkgs/development/python-modules/greenlet/default.nix @@ -17,12 +17,12 @@ let greenlet = buildPythonPackage rec { pname = "greenlet"; - version = "3.2.3"; + version = "3.3.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-iw3YrkwNb15U7lW6k17rPXNam1iooeW1y6tk4Bo582U="; + hash = "sha256-qCuyJaTp5NZT3S+3uLLTbk+yW8AWVCKhHki4jp5vePs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/grpcio-channelz/default.nix b/pkgs/development/python-modules/grpcio-channelz/default.nix index 9bc503ab1b3f..36402aa4aaa9 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.76.0"; + version = "1.78.0"; pyproject = true; src = fetchPypi { pname = "grpcio_channelz"; inherit version; - hash = "sha256-KrFe97IlKpujHfUAu+KVzlMQqLAepvbWehcXLZFKQag="; + hash = "sha256-5E/gR414spB1xtJYuMUQdhnAZGXAE6sYSeW+9JOvFT4="; }; 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 92b297dad980..929e90aef8e8 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.76.0"; + version = "1.78.0"; format = "setuptools"; src = fetchPypi { pname = "grpcio_health_checking"; inherit version; - hash = "sha256-t6mddAlrOrOlmYf8AjdAaOHBgKNS6NH3nxDlojcnCY0="; + hash = "sha256-eFJtXGC5uZ/RiVS4n4bXADPHAulq1szJdJuvFhNpebM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/grpcio-reflection/default.nix b/pkgs/development/python-modules/grpcio-reflection/default.nix index 0f86b98deda3..a10c4dc6fb3c 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.76.0"; + version = "1.78.0"; pyproject = true; src = fetchPypi { pname = "grpcio_reflection"; inherit version; - hash = "sha256-4OfkmSHC7pUeXd/wvbrL0awacIiL62HVZ/PQG3md7LE="; + hash = "sha256-5uYMC4XbzfljtNTRUMDx0ji6iR2AW1dcUsA2XQf8DEA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix index a9a545291486..e9997b8849a3 100644 --- a/pkgs/development/python-modules/grpcio-status/default.nix +++ b/pkgs/development/python-modules/grpcio-status/default.nix @@ -12,13 +12,13 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-status"; - version = "1.76.0"; + version = "1.78.0"; format = "setuptools"; src = fetchPypi { pname = "grpcio_status"; inherit version; - hash = "sha256-Jfy/7HTBXRoctdo/q47pZyhS3Balqe61uvfXqZUpQ80="; + hash = "sha256-o0z9KBAb/qhLWqD5NrS0IwGekhOIKQcWavazvdxZ4Yk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix index 41494ba571bd..d855789f1842 100644 --- a/pkgs/development/python-modules/grpcio-testing/default.nix +++ b/pkgs/development/python-modules/grpcio-testing/default.nix @@ -12,13 +12,13 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-testing"; - version = "1.76.0"; + version = "1.78.0"; pyproject = true; src = fetchPypi { pname = "grpcio_testing"; inherit version; - hash = "sha256-loQmPvqyo9xRFBeDOx5qB1hZfic6Ibbb8XwXAizvfCQ="; + hash = "sha256-BuQoB75GlJvciDOaA6cQ7AVbBta8ghy1ljZuUWWRU8w="; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index cd0e267d9c2b..00033efa4620 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchPypi, protobuf, + cython, grpcio, setuptools, }: @@ -12,15 +13,20 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.76.0"; + version = "1.78.0"; pyproject = true; src = fetchPypi { pname = "grpcio_tools"; inherit version; - hash = "sha256-zoAWm15q3z6DAvPrtssMOp8ICJEzq8pLdq1n91H1rYg="; + hash = "sha256-Sw3YZWAnQxbhVdklFYJ2+FZFCBkwiLxD4g0/Xf+Vays="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "Cython==3.1.1" Cython + ''; + outputs = [ "out" "dev" @@ -28,7 +34,10 @@ buildPythonPackage rec { enableParallelBuilding = true; - build-system = [ setuptools ]; + build-system = [ + cython + setuptools + ]; pythonRelaxDeps = [ "protobuf" diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 89c0a800d1a4..722d3990eafe 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -18,14 +18,19 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio"; - version = "1.76.0"; + version = "1.78.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-e+eDiNbaGiXA1exQZSPbWLGL4i2cN9jToywIvkmHvXM="; + hash = "sha256-c4K5UYlUbzdcF09TpfqHPO+RxLgAX6oFzFs77qnE8cU="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail cython==3.1.1 cython + ''; + outputs = [ "out" "dev" diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index 02c607cb4ad6..0ed34436a423 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "gsd"; - version = "4.0.0"; + version = "4.2.0"; pyproject = true; src = fetchFromGitHub { owner = "glotzerlab"; repo = "gsd"; tag = "v${version}"; - hash = "sha256-8pEs1use/R7g0l6h+rxjpN5j8PznqkJpjLxqiupn9iY="; + hash = "sha256-qswKeZ8HJEjIV27O2UBmjN+Napa2sItECS5r/vb+l7k="; }; build-system = [ diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index 91895d345aa4..5772954ab7da 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -6,7 +6,7 @@ google-auth, google-auth-oauthlib, pytest-vcr, - pytestCheckHook, + pytest8_3CheckHook, strenum, }: @@ -32,7 +32,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-vcr - pytestCheckHook + pytest8_3CheckHook ]; pythonImportsCheck = [ "gspread" ]; diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index ac2e95c12f72..156a7aee13af 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -20,21 +20,23 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gssapi"; - version = "1.9.0"; + version = "1.10.1"; pyproject = true; src = fetchFromGitHub { owner = "pythongssapi"; - repo = "python-${pname}"; - tag = "v${version}"; - hash = "sha256-Y53HoLcamoFIrwZtNcL1BOrzBjRD09mT3AiS0QUT7dY="; + repo = "python-gssapi"; + tag = "v${finalAttrs.version}"; + hash = "sha256-A1y3PD+zycKxlZT2vZ9b9p8SMr+aZA62CIAUpi4eOvo="; }; postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "Cython == 3.1.3" Cython substituteInPlace setup.py \ - --replace 'get_output(f"{kc} gssapi --prefix")' '"${lib.getDev krb5-c}"' + --replace-fail 'get_output(f"{kc} gssapi --prefix")' '"${lib.getDev krb5-c}"' ''; env = lib.optionalAttrs (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) { @@ -70,8 +72,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "gssapi" ]; meta = { - homepage = "https://pypi.python.org/pypi/gssapi"; + changelog = "https://github.com/pythongssapi/python-gssapi/releases/tag/${finalAttrs.src.tag}"; + homepage = "https://github.com/pythongssapi/python-gssapi"; description = "Python GSSAPI Wrapper"; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/development/python-modules/guidata/default.nix b/pkgs/development/python-modules/guidata/default.nix index e734c0db51d7..edb94e014924 100644 --- a/pkgs/development/python-modules/guidata/default.nix +++ b/pkgs/development/python-modules/guidata/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "guidata"; - version = "3.12.0"; + version = "3.13.4"; pyproject = true; src = fetchFromGitHub { owner = "PlotPyStack"; repo = "guidata"; tag = "v${version}"; - hash = "sha256-dh1WyUgJ+rkBFtcyXEFgU8UNPQEkJfiJBwmkT1eqKoI="; + hash = "sha256-JuYxPkKeOQOzoDiyk50IhAiICUcKptyD5RUx4DaiOOI="; }; build-system = [ diff --git a/pkgs/development/python-modules/h3/default.nix b/pkgs/development/python-modules/h3/default.nix index 9d440d665531..7f90dca93656 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.3.1"; + version = "4.4.1"; pyproject = true; # pypi version does not include tests @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "uber"; repo = "h3-py"; tag = "v${version}"; - hash = "sha256-zt7zbBgSp2P9q7mObZeQZpW9Szip62dAYdPZ2cGTmi4="; + hash = "sha256-ugYx8FJUxfrJHfzRxyjaOlG/Z0KhKglRHTgKKBHzUGQ="; }; dontConfigure = true; diff --git a/pkgs/development/python-modules/h5netcdf/default.nix b/pkgs/development/python-modules/h5netcdf/default.nix index debef02bde26..d00a2515f2bd 100644 --- a/pkgs/development/python-modules/h5netcdf/default.nix +++ b/pkgs/development/python-modules/h5netcdf/default.nix @@ -3,22 +3,22 @@ buildPythonPackage, fetchFromGitHub, h5py, + netcdf, pytestCheckHook, - netcdf4, setuptools, setuptools-scm, }: buildPythonPackage rec { pname = "h5netcdf"; - version = "1.6.4"; + version = "1.8.0"; pyproject = true; src = fetchFromGitHub { owner = "h5netcdf"; repo = "h5netcdf"; tag = "v${version}"; - hash = "sha256-SFlea/ABP78GQgGkh7hscAlGfpKVnXN2zr99D9LCpeQ="; + hash = "sha256-m+8vdWOQb9aIg/mPeTrN20EzTj229Cit3nYgrkPlfGA="; }; build-system = [ @@ -29,8 +29,8 @@ buildPythonPackage rec { dependencies = [ h5py ]; nativeCheckInputs = [ + netcdf pytestCheckHook - netcdf4 ]; pythonImportsCheck = [ "h5netcdf" ]; diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index 9e58d5641a00..b0ab2fc32af4 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -20,25 +20,17 @@ let mpiSupport = hdf5.mpiSupport; in buildPythonPackage rec { - version = "3.14.0"; + version = "3.15.1"; pname = "h5py"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-I3IRay4NXT5ecFt/Zj98jZb6eaQFLSUEhO+R0k1qCPQ="; + hash = "sha256-yG4+1FxEc1ZN5VqoO2/J5erYZXh3PfvZMEc4AELia2k="; }; pythonRelaxDeps = [ "mpi4py" ]; - # Avoid strict pinning of Numpy, can't be replaced with pythonRelaxDepsHook, - # as these are build time dependencies. See: - # https://github.com/NixOS/nixpkgs/issues/327941 - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "numpy >=2.0.0, <3" "numpy" - ''; - env = { HDF5_DIR = "${hdf5}"; HDF5_MPI = if mpiSupport then "ON" else "OFF"; diff --git a/pkgs/development/python-modules/hakuin/default.nix b/pkgs/development/python-modules/hakuin/default.nix index e85410908061..76e32ddec27a 100644 --- a/pkgs/development/python-modules/hakuin/default.nix +++ b/pkgs/development/python-modules/hakuin/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "hakuin"; - version = "0.1.10"; + version = "0.2.2"; pyproject = true; src = fetchFromGitHub { owner = "pruzko"; repo = "hakuin"; tag = version; - hash = "sha256-l5YnGRPUZUQqOaRvQd4l4eowWGpuPBignjkDDT9q7fg="; + hash = "sha256-97nh+woUsCXcoO2i5KprCwJiE24V3mg91qcNgy7bpgg="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/harlequin-postgres/default.nix b/pkgs/development/python-modules/harlequin-postgres/default.nix index baa1d0d4b343..bcc9f7c9a811 100644 --- a/pkgs/development/python-modules/harlequin-postgres/default.nix +++ b/pkgs/development/python-modules/harlequin-postgres/default.nix @@ -2,23 +2,23 @@ lib, buildPythonPackage, fetchPypi, - poetry-core, + hatchling, psycopg, }: buildPythonPackage rec { pname = "harlequin-postgres"; - version = "1.2.2"; + version = "1.3.0"; pyproject = true; src = fetchPypi { pname = "harlequin_postgres"; inherit version; - hash = "sha256-u/x8Jx1yfUtFSYX6oyvOZJmdPWbaOkFn3OGQdqxyK8A="; + hash = "sha256-01MllGk8dFeWtbpENCGGYs4/nlq7aLLkFZqCXGLrN4s="; }; build-system = [ - poetry-core + hatchling ]; dependencies = [ diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index 0064212fdbc8..d8bfd65582b1 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -51,11 +51,6 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; - pythonRelaxDeps = [ - "acme" - "snitun" - ]; - dependencies = [ acme aiohttp diff --git a/pkgs/development/python-modules/hatch-min-requirements/default.nix b/pkgs/development/python-modules/hatch-min-requirements/default.nix index 57a4d3dcb248..f04a12949468 100644 --- a/pkgs/development/python-modules/hatch-min-requirements/default.nix +++ b/pkgs/development/python-modules/hatch-min-requirements/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "hatch-min-requirements"; - version = "0.1.0"; + version = "0.2.0"; pyproject = true; src = fetchFromGitHub { owner = "tlambert03"; repo = "hatch-min-requirements"; tag = "v${version}"; - hash = "sha256-7/6Es0DHDJ8jZ76kVbWkQjWFd8hWuB+PwCbOmIjzK5o="; + hash = "sha256-QKO5fVvjSqwY+48Fc8sAiZazrxZ4eBYxzVElHr2lcEA="; }; build-system = [ diff --git a/pkgs/development/python-modules/hatch-mypyc/default.nix b/pkgs/development/python-modules/hatch-mypyc/default.nix new file mode 100644 index 000000000000..14b513074388 --- /dev/null +++ b/pkgs/development/python-modules/hatch-mypyc/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + mypy, + pathspec, + setuptools, + build, + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "hatch-mypyc"; + version = "0.16.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ofek"; + repo = "hatch-mypyc"; + rev = "v${finalAttrs.version}"; + hash = "sha256-3bIi2tlAcBurWqqPDVTJ1/EU2KTd1XVU97jFOaYtW5U="; + }; + + build-system = [ + hatchling + ]; + + dependencies = [ + hatchling + mypy + pathspec + setuptools + ]; + + doCheck = false; # network access + + pythonImportsCheck = [ + "hatch_mypyc" + ]; + + meta = { + description = "Hatch build hook plugin for Mypyc"; + homepage = "https://github.com/ofek/hatch-mypyc"; + license = lib.licenses.mit; + maintainers = [ ]; + }; +}) diff --git a/pkgs/development/python-modules/hatch-regex-commit/default.nix b/pkgs/development/python-modules/hatch-regex-commit/default.nix index 83453dde3eaa..d1fc441c5bf6 100644 --- a/pkgs/development/python-modules/hatch-regex-commit/default.nix +++ b/pkgs/development/python-modules/hatch-regex-commit/default.nix @@ -7,23 +7,16 @@ buildPythonPackage rec { pname = "hatch-regex-commit"; - version = "0.0.3"; + version = "0.0.4"; pyproject = true; src = fetchFromGitHub { owner = "frankie567"; repo = "hatch-regex-commit"; tag = "v${version}"; - hash = "sha256-E0DIBBaDmTCsZQ41NcjcbzgJ16BwhdexlrGWBdf77oA="; + hash = "sha256-xdt3qszigdCudt2+EpUZPkJzL+XQ6TnVEAMm0sV3zwY="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail 'dynamic = ["version"]' 'version = "${version}"' \ - --replace-fail ', "hatch-regex-commit"' "" \ - --replace-fail " --cov-report=term-missing --cov-config=pyproject.toml --cov=hatch_regex_commit --cov=tests" "" - ''; - build-system = [ hatchling ]; dependencies = [ hatchling ]; diff --git a/pkgs/development/python-modules/hawkmoth/default.nix b/pkgs/development/python-modules/hawkmoth/default.nix index ed1a0cc67f86..aedd7da24c45 100644 --- a/pkgs/development/python-modules/hawkmoth/default.nix +++ b/pkgs/development/python-modules/hawkmoth/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = { description = "Sphinx Autodoc for C"; homepage = "https://jnikula.github.io/hawkmoth/"; - changelog = "https://github.com/jnikula/hawkmoth/blob/v${version}/CHANGELOG.rst"; + changelog = "https://github.com/jnikula/hawkmoth/blob/${src.tag}/CHANGELOG.rst"; license = lib.licenses.bsd2; maintainers = [ lib.maintainers.cynerd ]; }; diff --git a/pkgs/development/python-modules/haystack-ai/default.nix b/pkgs/development/python-modules/haystack-ai/default.nix index f64753da6dda..07252bc18662 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.16.1"; + version = "2.22.0"; pyproject = true; src = fetchFromGitHub { owner = "deepset-ai"; repo = "haystack"; tag = "v${version}"; - hash = "sha256-Z5T5X92Hig7nW1fUc8b+LuegJlIZbMfyjJ0PnVudPew="; + hash = "sha256-QqQTlyVUJU90lzMUe43Qd0WXXaxUi/53apvz/GlrsY0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index 0312436eaf95..a712625fa08f 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "hdbscan"; - version = "0.8.40"; + version = "0.8.41"; format = "setuptools"; src = fetchFromGitHub { owner = "scikit-learn-contrib"; repo = "hdbscan"; tag = "release-${version}"; - hash = "sha256-xsBlmSQU47e+M+nRqUXdWKS7Rtj2QZ1UWLAvjSQOJ0Q="; + hash = "sha256-4uwWoNkrdLB2KzDAksPupdgkIFBgTahzravOtu1WYws="; }; patches = [ @@ -78,7 +78,7 @@ buildPythonPackage rec { meta = { description = "Hierarchical Density-Based Spatial Clustering of Applications with Noise, a clustering algorithm with a scikit-learn compatible API"; homepage = "https://github.com/scikit-learn-contrib/hdbscan"; - changelog = "https://github.com/scikit-learn-contrib/hdbscan/releases/tag/release-${version}"; + changelog = "https://github.com/scikit-learn-contrib/hdbscan/releases/tag/release-${src.tag}"; license = lib.licenses.bsd3; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/hdf5plugin/default.nix b/pkgs/development/python-modules/hdf5plugin/default.nix index 935fa2f65dc8..b8847f4e2746 100644 --- a/pkgs/development/python-modules/hdf5plugin/default.nix +++ b/pkgs/development/python-modules/hdf5plugin/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "hdf5plugin"; - version = "5.1.0"; + version = "6.0.0"; pyproject = true; src = fetchFromGitHub { owner = "silx-kit"; repo = "hdf5plugin"; tag = "v${version}"; - hash = "sha256-12OWsNZfKToNLyokNrwgPc7WRISJI4nRA0J/zwgCZwI="; + hash = "sha256-LW6rY+zLta4hENBbTll+1amf9TYJiuAumwzgpk1LZ3M="; }; build-system = [ diff --git a/pkgs/development/python-modules/helion/default.nix b/pkgs/development/python-modules/helion/default.nix index d54fd0b22d49..cfd72e377006 100644 --- a/pkgs/development/python-modules/helion/default.nix +++ b/pkgs/development/python-modules/helion/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "helion"; - version = "0.2.1"; + version = "0.2.10"; pyproject = true; src = fetchFromGitHub { owner = "pytorch"; repo = "helion"; tag = "v${version}"; - hash = "sha256-JuuVPz8FPKtaGxbJM4omUzIjY9chtGZFGXwEMX34/Y0="; + hash = "sha256-kZyay9X2RcN3by+2oFAjt17Zuu34i3p+MeApBuhejmg="; }; build-system = [ @@ -75,7 +75,7 @@ buildPythonPackage rec { meta = { description = "Python-embedded DSL that makes it easy to write fast, scalable ML kernels with minimal boilerplate"; homepage = "https://github.com/pytorch/helion"; - changelog = "https://github.com/pytorch/helion/releases/tag/v${version}"; + changelog = "https://github.com/pytorch/helion/releases/tag/${src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ GaetanLepage ]; # This package explicitly requires CUDA-enabled pytorch diff --git a/pkgs/development/python-modules/hepunits/default.nix b/pkgs/development/python-modules/hepunits/default.nix index 8fa4386ce708..b6af6a2d77d8 100644 --- a/pkgs/development/python-modules/hepunits/default.nix +++ b/pkgs/development/python-modules/hepunits/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "hepunits"; - version = "2.3.6"; + version = "2.4.4"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-z/wcggQLFbtTBULsl/PB+DquYFDKpMxcGgMJe+vjSTI="; + hash = "sha256-GEbnKfo+T7Nr/1me17i9LNxKvcApBoMPt1wgX9VJBes="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/hikari-lightbulb/default.nix b/pkgs/development/python-modules/hikari-lightbulb/default.nix index 7c47b7349417..1c860196f7d8 100644 --- a/pkgs/development/python-modules/hikari-lightbulb/default.nix +++ b/pkgs/development/python-modules/hikari-lightbulb/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "hikari-lightbulb"; - version = "3.1.1"; + version = "3.2.3"; pyproject = true; src = fetchFromGitHub { owner = "tandemdude"; repo = "hikari-lightbulb"; tag = version; - hash = "sha256-hsd7K7VFXndQ3tE8UkIcFXADgG/Kjd2oNWdFvwAwUtw="; + hash = "sha256-u8RrvHaawCIwVN9n7m3Ti29tPr66GNkwpKf/oo5eMUQ="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/hishel/default.nix b/pkgs/development/python-modules/hishel/default.nix index 66aa39657bc0..66f9b1f51116 100644 --- a/pkgs/development/python-modules/hishel/default.nix +++ b/pkgs/development/python-modules/hishel/default.nix @@ -7,32 +7,45 @@ hatch-fancy-pypi-readme, hatchling, httpx, + inline-snapshot, moto, + msgpack, pytest-asyncio, pytestCheckHook, pyyaml, redis, + redisTestHook, + time-machine, trio, + typing-extensions, }: buildPythonPackage rec { pname = "hishel"; - version = "0.1.3"; + version = "1.1.8"; pyproject = true; src = fetchFromGitHub { owner = "karpetrosyan"; repo = "hishel"; tag = version; - hash = "sha256-3dcXj9MPPtHBzafdccrOeh+Wrn9hulDA8L3itOe8ZXw="; + hash = "sha256-VuUt1M0+ZztWoFZomAR5s1YQ4suIN3uEq54gLTjBLeY="; }; + postPatch = '' + sed -i "/addopts/d" pyproject.toml + ''; + build-system = [ hatch-fancy-pypi-readme hatchling ]; - dependencies = [ httpx ]; + dependencies = [ + httpx + msgpack + typing-extensions + ]; optional-dependencies = { redis = [ redis ]; @@ -42,25 +55,24 @@ buildPythonPackage rec { }; nativeCheckInputs = [ + inline-snapshot moto pytest-asyncio pytestCheckHook + redisTestHook + time-machine trio ] ++ lib.concatAttrValues optional-dependencies; - pythonImportsCheck = [ "hishel" ]; - disabledTests = [ - # Tests require a running Redis instance - "test_redis" + # network access + "test_encoded_content_caching" + "test_simple_caching" + "test_simple_caching_ignoring_spec" ]; - disabledTestPaths = [ - # ImportError: cannot import name 'mock_s3' from 'moto' - "tests/_async/test_storages.py" - "tests/_sync/test_storages.py" - ]; + pythonImportsCheck = [ "hishel" ]; meta = { description = "HTTP Cache implementation for HTTPX and HTTP Core"; diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 647859ca8621..db4da8a1c994 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -8,6 +8,7 @@ numpy, polib, pytest-cov-stub, + pytest-xdist, pytestCheckHook, python-dateutil, setuptools, @@ -15,14 +16,14 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.85"; + version = "0.89"; pyproject = true; src = fetchFromGitHub { owner = "vacanza"; repo = "python-holidays"; tag = "v${version}"; - hash = "sha256-ExleK66foB2Q/KK7zcPJ16q4ucz3gOkntB2SQETfHqk="; + hash = "sha256-g7f0364Xxz+jTjgA8y0nEPbzNalQdMLdwoBZ2odq1W0="; }; build-system = [ @@ -36,6 +37,10 @@ buildPythonPackage rec { postPatch = '' patchShebangs scripts/l10n/*.py + + # generating l10n files imports holidays before distinfo metadata exists + substituteInPlace holidays/version.py \ + --replace-fail 'version("holidays")' '"${version}"' ''; preBuild = '' @@ -51,6 +56,7 @@ buildPythonPackage rec { numpy polib pytest-cov-stub + pytest-xdist pytestCheckHook ]; diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index 77886f1dcc36..60bcfd6c4d9c 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.21.0"; + version = "1.22.1"; pyproject = true; src = fetchFromGitHub { owner = "holoviz"; repo = "holoviews"; tag = "v${version}"; - hash = "sha256-JEGTfi4CaJaL/5AFtB92RV0DJvaIYVloukWKQSUFBZA="; + hash = "sha256-rZZQgM8gchWTsgA47BVWblzWiWMuHK2vAZD/1Z8BHAk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/home-assistant-chip-core/default.nix b/pkgs/development/python-modules/home-assistant-chip-core/default.nix index 2cf2b5602511..70d20bec4bde 100644 --- a/pkgs/development/python-modules/home-assistant-chip-core/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-core/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - aenum, home-assistant-chip-wheels, coloredlogs, construct, @@ -9,8 +8,6 @@ dacite, deprecation, ipdb, - mobly, - pygobject3, pyyaml, rich, }: @@ -28,7 +25,6 @@ buildPythonPackage rec { ''; dependencies = [ - aenum coloredlogs construct cryptography @@ -37,10 +33,10 @@ buildPythonPackage rec { pyyaml ipdb deprecation - mobly - pygobject3 - ] - ++ home-assistant-chip-wheels.propagatedBuildInputs; + ]; + + # only used for testing purposes, unsafe to use in production + pythonRemoveDeps = [ "ecdsa" ]; pythonNamespaces = [ "chip" diff --git a/pkgs/development/python-modules/html-text/default.nix b/pkgs/development/python-modules/html-text/default.nix index 8eb617fff491..a670b4a43c61 100644 --- a/pkgs/development/python-modules/html-text/default.nix +++ b/pkgs/development/python-modules/html-text/default.nix @@ -5,22 +5,22 @@ lxml, lxml-html-clean, pytestCheckHook, - setuptools, + hatchling, }: buildPythonPackage (finalAttrs: { pname = "html-text"; - version = "0.6.2"; + version = "0.7.1"; pyproject = true; src = fetchFromGitHub { owner = "zytedata"; repo = "html-text"; tag = finalAttrs.version; - hash = "sha256-e9gkibQv8mn1Jbt77UmpauOeTqhJQhY9R5Sge/iYi+U="; + hash = "sha256-KLWgdVHGYRiQ61hMNx+Kcx9mE7d/TsBe110TfCe+ejU="; }; - build-system = [ setuptools ]; + build-system = [ hatchling ]; dependencies = [ lxml diff --git a/pkgs/development/python-modules/html2pdf4doc/default.nix b/pkgs/development/python-modules/html2pdf4doc/default.nix index 6f0e02d41fdd..8d86e7246fe6 100644 --- a/pkgs/development/python-modules/html2pdf4doc/default.nix +++ b/pkgs/development/python-modules/html2pdf4doc/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "html2pdf4doc"; - version = "0.0.21"; + version = "0.0.31"; pyproject = true; src = fetchFromGitHub { owner = "mettta"; repo = "html2pdf4doc_python"; tag = version; - hash = "sha256-cYKbnMVsENA17VsNXjV/funmBPbbrwA6enpIxOZ2sbQ="; + hash = "sha256-ailiZfqO2NacJmCbWWtZ2bnerjc9mdJZKDVWNUTMEAg="; }; build-system = [ @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = { description = "Print HTML to PDF in the Browser – Python Package for HTML2PDF.js"; homepage = "https://github.com/mettta/html2pdf4doc_python"; - changelog = "https://github.com/mettta/html2pdf4doc_python/releases/tag/${version}"; + changelog = "https://github.com/mettta/html2pdf4doc_python/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ puzzlewolf ]; }; diff --git a/pkgs/development/python-modules/html5lib/default.nix b/pkgs/development/python-modules/html5lib/default.nix index 990ccacb4fbc..dc252d84b8a1 100644 --- a/pkgs/development/python-modules/html5lib/default.nix +++ b/pkgs/development/python-modules/html5lib/default.nix @@ -25,6 +25,8 @@ buildPythonPackage { patches = [ # https://github.com/html5lib/html5lib-python/pull/583 ./python314-compat.patch + # https://github.com/html5lib/html5lib-python/pull/590 + ./pytest9-compat.patch ]; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/html5lib/pytest9-compat.patch b/pkgs/development/python-modules/html5lib/pytest9-compat.patch new file mode 100644 index 000000000000..2714a6389275 --- /dev/null +++ b/pkgs/development/python-modules/html5lib/pytest9-compat.patch @@ -0,0 +1,48 @@ +From b502a5e2b3048a996ada4c4246aafad99d3dd14c Mon Sep 17 00:00:00 2001 +From: Steve Kowalik +Date: Thu, 27 Nov 2025 10:44:40 +1100 +Subject: [PATCH] Support pytest 9 changes + +The old py.path arguments to the hook functions have been removed as of +pytest 9, switch to the shiny new pathlib ones. +--- + html5lib/tests/conftest.py | 18 +++++++++--------- + requirements-test.txt | 2 +- + 2 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/html5lib/tests/conftest.py b/html5lib/tests/conftest.py +index fffeb50c..4a97dc21 100644 +--- a/html5lib/tests/conftest.py ++++ b/html5lib/tests/conftest.py +@@ -90,22 +90,22 @@ def pytest_configure(config): + pytest.exit("\n".join(msgs)) + + +-def pytest_collect_file(path, parent): +- dir = os.path.abspath(path.dirname) ++def pytest_collect_file(file_path, parent): ++ dir = file_path.parent + dir_and_parents = set() + while dir not in dir_and_parents: + dir_and_parents.add(dir) +- dir = os.path.dirname(dir) ++ dir = dir.parent + + if _tree_construction in dir_and_parents: +- if path.ext == ".dat": +- return TreeConstructionFile.from_parent(parent, fspath=path) ++ if file_path.suffix == ".dat": ++ return TreeConstructionFile.from_parent(parent, path=file_path) + elif _tokenizer in dir_and_parents: +- if path.ext == ".test": +- return TokenizerFile.from_parent(parent, fspath=path) ++ if file_path.suffix == ".test": ++ return TokenizerFile.from_parent(parent, path=file_path) + elif _sanitizer_testdata in dir_and_parents: +- if path.ext == ".dat": +- return SanitizerFile.from_parent(parent, fspath=path) ++ if file_path.suffix == ".dat": ++ return SanitizerFile.from_parent(parent, path=file_path) + + + # Tiny wrapper to allow .from_parent constructors on older pytest for PY27 diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index 780fff3ba1a9..5d5156adb042 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -6,31 +6,36 @@ fetchFromGitHub, mock, pyparsing, + pysocks, pytest-cov-stub, pytest-forked, pytest-randomly, pytest-timeout, pytestCheckHook, + setuptools, six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "httplib2"; - version = "0.22.0"; - format = "setuptools"; + version = "0.31.1"; + pyproject = true; src = fetchFromGitHub { owner = "httplib2"; repo = "httplib2"; - rev = "v${version}"; - hash = "sha256-76gdiRbF535CEaNXwNqsVeVc0dKglovMPQpGsOkbd/4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-1OO3BNtOGJxV9L34C60CHv95LLH9Ih1lY0zQUD4wrnc="; }; - propagatedBuildInputs = [ pyparsing ]; + build-system = [ setuptools ]; + + dependencies = [ pyparsing ]; nativeCheckInputs = [ cryptography mock + pysocks pytest-cov-stub pytest-forked pytest-randomly @@ -58,14 +63,13 @@ buildPythonPackage rec { "test_connection_close" ]; - disabledTestPaths = [ "python2" ]; - pythonImportsCheck = [ "httplib2" ]; meta = { + changelog = "https://github.com/httplib2/httplib2/blob/${finalAttrs.src.tag}/CHANGELOG"; description = "Comprehensive HTTP client library"; homepage = "https://github.com/httplib2/httplib2"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/httptools/default.nix b/pkgs/development/python-modules/httptools/default.nix index 2bc6bac0ec5f..3be345cfb6f0 100644 --- a/pkgs/development/python-modules/httptools/default.nix +++ b/pkgs/development/python-modules/httptools/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "httptools"; - version = "0.6.4"; + version = "0.7.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-TpPu5K3WSTtZpcUU2pjJObJE/OSg2Iec0/RmVi9LfVw="; + hash = "sha256-q9clVpdPjnx0olllWSSnF6I2WyNsiCw/b4pF/pRwOsk="; }; # Tests are not included in pypi tarball diff --git a/pkgs/development/python-modules/httpx-ws/default.nix b/pkgs/development/python-modules/httpx-ws/default.nix index 630403baac7f..0db98c9f1006 100644 --- a/pkgs/development/python-modules/httpx-ws/default.nix +++ b/pkgs/development/python-modules/httpx-ws/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "httpx-ws"; - version = "0.7.2"; + version = "0.8.2"; pyproject = true; src = fetchFromGitHub { owner = "frankie567"; repo = "httpx-ws"; tag = "v${version}"; - hash = "sha256-ixaD7X6V/tUalZbYtic7D9lRqv8yGnwl+j5m832n/hQ="; + hash = "sha256-3gSXUpHs1tF8FJ7Jz174VBoRCrepYcpYU1FZaNMpZqg="; }; # we don't need to use the hatch-regex-commit plugin @@ -61,7 +61,7 @@ buildPythonPackage rec { meta = { description = "WebSocket support for HTTPX"; homepage = "https://github.com/frankie567/httpx-ws"; - changelog = "https://github.com/frankie567/httpx-ws/releases/tag/v${version}"; + changelog = "https://github.com/frankie567/httpx-ws/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index f5adfe000434..ea110609e84d 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -10,97 +10,81 @@ filelock, fsspec, hf-xet, + httpx, packaging, pyyaml, - requests, + shellingham, tqdm, + typer, typing-extensions, # optional-dependencies - # cli - inquirerpy, - # inference - aiohttp, # torch torch, safetensors, - # hf_transfer - hf-transfer, # fastai toml, fastai, fastcore, - # tensorflow - tensorflow, - pydot, - graphviz, - # tensorflow-testing - keras, + # mcp + mcp, # tests versionCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "huggingface-hub"; - version = "0.35.3"; + version = "1.4.1"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "huggingface_hub"; - tag = "v${version}"; - hash = "sha256-KOq3qxt3AyWQIOG0+HUbNr15u85tyTEstoUkYBFkpC4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-At3FN+dplQ3L9B4vDZrEvREdwgepUvzWC7yeU6L5XY8="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "typer-slim" "typer" + ''; + build-system = [ setuptools ]; dependencies = [ filelock fsspec hf-xet + httpx packaging pyyaml - requests + shellingham tqdm + typer typing-extensions ]; optional-dependencies = { all = [ - ]; - cli = [ - inquirerpy - ]; - inference = [ - aiohttp ]; torch = [ torch safetensors ] ++ safetensors.optional-dependencies.torch; - hf_transfer = [ - hf-transfer - ]; fastai = [ toml fastai fastcore ]; - tensorflow = [ - tensorflow - pydot - graphviz - ]; - tensorflow-testing = [ - tensorflow - keras - ]; hf_xet = [ hf-xet ]; + mcp = [ + mcp + ]; }; nativeCheckInputs = [ @@ -114,11 +98,11 @@ buildPythonPackage rec { description = "Download and publish models and other files on the huggingface.co hub"; mainProgram = "hf"; homepage = "https://github.com/huggingface/huggingface_hub"; - changelog = "https://github.com/huggingface/huggingface_hub/releases/tag/v${version}"; + changelog = "https://github.com/huggingface/huggingface_hub/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ GaetanLepage osbm ]; }; -} +}) diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index d4da528e272c..558ec560deb1 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "humanize"; - version = "4.12.3"; + version = "4.15.0"; pyproject = true; src = fetchFromGitHub { owner = "python-humanize"; repo = "humanize"; tag = version; - hash = "sha256-VsB59tS2KRZ0JKd1FzA+RTEzpkUyj9RhhSopseHg+m8="; + hash = "sha256-EG0QrW4b5NK9+78B0Cs4eAuicIsN/V/77+JxyYrTReA="; }; nativeBuildInputs = [ @@ -46,7 +46,7 @@ buildPythonPackage rec { meta = { description = "Python humanize utilities"; homepage = "https://github.com/python-humanize/humanize"; - changelog = "https://github.com/python-humanize/humanize/releases/tag/${version}"; + changelog = "https://github.com/python-humanize/humanize/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ rmcgibbo diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix index 3eef49a3ffc0..1b3fa147f489 100644 --- a/pkgs/development/python-modules/hvplot/default.nix +++ b/pkgs/development/python-modules/hvplot/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "hvplot"; - version = "0.11.3"; + version = "0.12.2"; pyproject = true; src = fetchFromGitHub { owner = "holoviz"; repo = "hvplot"; tag = "v${version}"; - hash = "sha256-V1KJtv1FCGITHdgxRWq1LWEgmWOU0N0iW60Wk0O5gC8="; + hash = "sha256-hJ9lgpM3AVyDeFxobUKDNYO39NKEejSDywOgnHPEm2c="; }; build-system = [ diff --git a/pkgs/development/python-modules/hwdata/default.nix b/pkgs/development/python-modules/hwdata/default.nix index 3470fcc40e2b..3e9d72c29270 100644 --- a/pkgs/development/python-modules/hwdata/default.nix +++ b/pkgs/development/python-modules/hwdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "hwdata"; - version = "2.4.1"; + version = "2.4.3-1"; pyproject = true; src = fetchFromGitHub { owner = "xsuchy"; repo = "python-hwdata"; - rev = "python-hwdata-${version}-1"; - hash = "sha256-hmvxVF9LOkezXnJdbtbEJWhU4uvUJgxQHYeWUoiniF0="; + tag = "python-hwdata-${version}"; + hash = "sha256-5bcdyCGv1sM8HThoSsvJe68LprDq0kI801F/aTH5FVs="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/hyper-connections/default.nix b/pkgs/development/python-modules/hyper-connections/default.nix index 67312b1b0deb..2a10d0d38e9c 100644 --- a/pkgs/development/python-modules/hyper-connections/default.nix +++ b/pkgs/development/python-modules/hyper-connections/default.nix @@ -10,14 +10,14 @@ buildPythonPackage (finalAttrs: { pname = "hyper-connections"; - version = "0.4.5"; + version = "0.4.7"; pyproject = true; src = fetchFromGitHub { owner = "lucidrains"; repo = "hyper-connections"; tag = finalAttrs.version; - hash = "sha256-CAhLDBZvmdHwVTbKVgWnS0qs5TE4a05iorbR7Ejh2uM="; + hash = "sha256-x1Yx9Fnow9154kFGLmjeCBLYJsbv6oJiC6Rk1XudqJQ="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/hypercorn/default.nix b/pkgs/development/python-modules/hypercorn/default.nix index a3867e07900b..90b53d2de96d 100644 --- a/pkgs/development/python-modules/hypercorn/default.nix +++ b/pkgs/development/python-modules/hypercorn/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, aioquic, - cacert, h11, h2, httpx, @@ -11,7 +10,7 @@ trio, uvloop, wsproto, - poetry-core, + pdm-backend, pytest-asyncio, pytest-trio, pytestCheckHook, @@ -19,21 +18,21 @@ buildPythonPackage rec { pname = "hypercorn"; - version = "0.17.3"; + version = "0.18.0"; pyproject = true; src = fetchFromGitHub { owner = "pgjones"; repo = "Hypercorn"; tag = version; - hash = "sha256-AtSMURz1rOr6VTQ7L2EQ4XZeKVEGTPXTbs3u7IhnZo8"; + hash = "sha256-RNurpDq5Z3N9Wv9Hq/l6A3yKUriCCKx9BrbrWGwBsUk="; }; postPatch = '' sed -i "/^addopts/d" pyproject.toml ''; - build-system = [ poetry-core ]; + build-system = [ pdm-backend ]; dependencies = [ h11 diff --git a/pkgs/development/python-modules/hyperscan/default.nix b/pkgs/development/python-modules/hyperscan/default.nix index f4634220306f..5931a4ef227a 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.29"; + version = "0.8.0"; pyproject = true; src = fetchFromGitHub { owner = "darvid"; repo = "python-hyperscan"; tag = "v${version}"; - hash = "sha256-gfrcUIJVtEFUvDLejaP3DyxW1kTHSOA0EwzWZggEyxA="; + hash = "sha256-on++eSNaVY2Q6yT/O+unvE0x/Pt/SsIQFQblIqii2sM="; }; 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 1c8850d91f0d..6f7d3eb7588e 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -9,27 +9,21 @@ doCheck ? true, pytestCheckHook, pytest-xdist, - python, sortedcontainers, - stdenv, pythonAtLeast, - sphinxHook, - sphinx-rtd-theme, - sphinx-hoverxref, - sphinx-codeautolink, tzdata, }: buildPythonPackage rec { pname = "hypothesis"; - version = "6.145.1"; + version = "6.150.2"; pyproject = true; src = fetchFromGitHub { owner = "HypothesisWorks"; repo = "hypothesis"; tag = "hypothesis-python-${version}"; - hash = "sha256-xyUR3yY2tmF4LGhZRUlv6fdcfVyVWwukodA0WIW0bXU="; + hash = "sha256-5u6/x+sO14N6qiyLcnJbTxqYfoWjpNi/m/lt6PfLFTE="; }; # I tried to package sphinx-selective-exclude, but it throws @@ -134,30 +128,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "hypothesis" ]; - passthru = { - doc = stdenv.mkDerivation { - # Forge look and feel of multi-output derivation as best as we can. - # - # Using 'outputs = [ "doc" ];' breaks a lot of assumptions. - pname = "${pname}-doc"; - inherit src version; - - postInstallSphinx = '' - mv $out/share/doc/* $out/share/doc/python$pythonVersion-$pname-$version - ''; - - nativeBuildInputs = [ - sphinxHook - sphinx-rtd-theme - sphinx-hoverxref - sphinx-codeautolink - ]; - - inherit (python) pythonVersion; - inherit meta; - }; - }; - meta = { description = "Library for property based testing"; mainProgram = "hypothesis"; diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index 40062a4ba80e..3e6722a09e92 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -99,14 +99,14 @@ in buildPythonPackage (finalAttrs: { pname = "ibis-framework"; - version = "11.0.0"; + version = "12.0.0"; pyproject = true; src = fetchFromGitHub { owner = "ibis-project"; repo = "ibis"; tag = finalAttrs.version; - hash = "sha256-hf5guWeX9WQbKaNrs7ALwwDxV1Rgeb5Z0PedTQ4P7S0="; + hash = "sha256-GqSbjjUr4EaWueMl4TrhaDvqn1iDd4CO3QcDnOXfSAk="; }; build-system = [ @@ -185,6 +185,69 @@ buildPythonPackage (finalAttrs: { # assert 0 == 3 (tests edge case behavior of databases) "test_self_join_with_generated_keys" + + # https://github.com/ibis-project/ibis/issues/11929 + # AssertionError: value does not match the expected value + "ibasic_aggregation_with_join" + "itest_endswith" + "itest_multiple_limits" + "itest_simple_joins" + "test_aggregate_count_joined" + "test_anti_join" + "test_binop_parens" + "test_bool_bool" + "test_case_in_projection" + "test_column_distinct" + "test_column_expr_default_name" + "test_column_expr_retains_name" + "test_count_distinct" + "test_difference_project_column" + "test_fuse_projections" + "test_having_from_filter" + "test_intersect_project_column" + "test_join_between_joins" + "test_join_just_materialized" + "test_limit_with_self_join" + "test_lower_projection_sort_key" + "test_multiple_count_distinct" + "test_multiple_joins" + "test_no_cart_join" + "test_order_by_on_limit_yield_subquery" + "test_parse_sql_aggregation_with_multiple_joins" + "test_parse_sql_basic_aggregation" + "test_parse_sql_basic_join[inner]" + "test_parse_sql_basic_join[left]" + "test_parse_sql_basic_join[right]" + "test_parse_sql_basic_projection" + "test_parse_sql_in_clause" + "test_parse_sql_join_subquery" + "test_parse_sql_join_with_filter" + "test_parse_sql_limited_join" + "test_parse_sql_multiple_joins" + "test_parse_sql_scalar_subquery" + "test_parse_sql_simple_reduction" + "test_parse_sql_simple_select_count" + "test_parse_sql_table_alias" + "test_parse_sql_tpch" + "test_sample" + "test_select_sql" + "test_selects_with_impure_operations_not_merged" + "test_semi_join" + "test_startswith" + "test_subquery_in_union" + "test_subquery_where_location" + "test_table_difference" + "test_table_distinct" + "test_table_drop_with_filter" + "test_table_intersect" + "test_union_order_by" + "test_union_project_column" + "test_union" + "test_where_analyze_scalar_op" + "test_where_no_pushdown_possible" + "test_where_simple_comparisons" + "test_where_with_between" + "test_where_with_join" ] ++ lib.optionals (pythonAtLeast "3.14") [ # ExceptionGroup: multiple unraisable exception warnings (4 sub-exceptions) diff --git a/pkgs/development/python-modules/ibmiotf/default.nix b/pkgs/development/python-modules/ibmiotf/default.nix index 5f68b854723e..fbcfa3298bae 100644 --- a/pkgs/development/python-modules/ibmiotf/default.nix +++ b/pkgs/development/python-modules/ibmiotf/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "ibmiotf"; - version = "0.4.0"; + version = "1.0.1"; pyproject = true; src = fetchFromGitHub { owner = "ibm-watson-iot"; repo = "iot-python"; tag = version; - hash = "sha256-/hRRYf3mY7LqZq0jq7neJRwpvgKczHNNo5bN92Rcv5M="; + hash = "sha256-miNkOVPYf2EGlLKtx4UiOu/xkoffaPSiYbTpAA3El7I="; }; build-system = [ @@ -47,7 +47,7 @@ buildPythonPackage rec { meta = { description = "Python Client for IBM Watson IoT Platform"; homepage = "https://github.com/ibm-watson-iot/iot-python"; - changelog = "https://github.com/ibm-watson-iot/iot-python/releases/tag/${version}"; + changelog = "https://github.com/ibm-watson-iot/iot-python/releases/tag/${src.tag}"; license = lib.licenses.epl10; maintainers = [ lib.maintainers.jamiemagee ]; }; diff --git a/pkgs/development/python-modules/icecream/default.nix b/pkgs/development/python-modules/icecream/default.nix index dd3ed339f854..e232eedd65c3 100644 --- a/pkgs/development/python-modules/icecream/default.nix +++ b/pkgs/development/python-modules/icecream/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, # build-system setuptools, @@ -18,22 +18,19 @@ buildPythonPackage rec { pname = "icecream"; - version = "2.1.5"; + version = "2.1.10"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-FNIeM4MyammowaO88R+DKDRZ8NJp7OWvg/ziwNZj7+w="; + src = fetchFromGitHub { + owner = "gruns"; + repo = "icecream"; + tag = "v${version}"; + hash = "sha256-5PFl+DIsWGbh2VR+xW/L9fYBF0VCo1B10b+mzsq85As="; }; - postPatch = '' - substituteInPlace tests/test_icecream.py \ - --replace assertRegexpMatches assertRegex - ''; + build-system = [ setuptools ]; - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ + dependencies = [ asttokens colorama executing @@ -42,13 +39,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = [ - # icecream.icecream.NoSourceAvailableError - "testSingledispatchArgumentToString" - # AssertionError: assert [[('REPL (e.g...ion?', None)]] == [[('a', '1')], [('c', '3')]] - "testEnableDisable" - ]; - meta = { description = "Little library for sweet and creamy print debugging"; homepage = "https://github.com/gruns/icecream"; diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix index 5668aed0c0da..37988bb8452e 100644 --- a/pkgs/development/python-modules/ifcopenshell/default.nix +++ b/pkgs/development/python-modules/ifcopenshell/default.nix @@ -163,6 +163,10 @@ buildPythonPackage rec { # NOTE: the following is directly inspired by https://github.com/IfcOpenShell/IfcOpenShell/blob/v0.8.0/src/ifcopenshell-python/Makefile#L123 cp ../../README.md README.md popd + + # boost189 compatibility; see https://www.boost.org/releases/1.89.0/ + substituteInPlace cmake/CMakeLists.txt \ + --replace-fail 'set(BOOST_COMPONENTS system' 'set(BOOST_COMPONENTS' ''; preConfigure = '' diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix index 0f498a60ef9f..3cbfff2c1d21 100644 --- a/pkgs/development/python-modules/ignite/default.nix +++ b/pkgs/development/python-modules/ignite/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "ignite"; - version = "0.5.2"; + version = "0.5.3"; pyproject = true; src = fetchFromGitHub { owner = "pytorch"; repo = "ignite"; tag = "v${version}"; - hash = "sha256-aWm+rj/9A7oNBW5jkMg/BRuEw2gQUJ88At1wB75FgNQ="; + hash = "sha256-0lQe5fWR4t3uAJVfGVebkxiWHx8TvgNQzJylKNmjjo0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/imagecodecs/default.nix b/pkgs/development/python-modules/imagecodecs/default.nix index b3e05d9826f0..98ab5de0b3f3 100644 --- a/pkgs/development/python-modules/imagecodecs/default.nix +++ b/pkgs/development/python-modules/imagecodecs/default.nix @@ -29,7 +29,7 @@ }: let - version = "2025.8.2"; + version = "2026.1.14"; in buildPythonPackage rec { pname = "imagecodecs"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "cgohlke"; repo = "imagecodecs"; tag = "v${version}"; - hash = "sha256-HDyA5SQNZe9G83ARfvD4AAIIos8Oatp+RhnEQTdnRp4="; + hash = "sha256-1q1CF6kIWQEcKRa+ah/MVlSZg8524bn/UbRn3IF6M6I="; }; build-system = [ diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix index 53819cdd085c..794715cb4815 100644 --- a/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "imbalanced-learn"; - version = "0.14.0"; + version = "0.14.1"; pyproject = true; src = fetchFromGitHub { owner = "scikit-learn-contrib"; repo = "imbalanced-learn"; tag = version; - hash = "sha256-1R7jHOkTO3zK9bkUvvOPQ420ofqIO7J1rqixFEbApR0="; + hash = "sha256-nY8Hn+EsKOXqAQV9TtuZaQY+XnxNNzIaHYM2n0gD5rY="; }; build-system = [ @@ -83,7 +83,7 @@ buildPythonPackage rec { meta = { description = "Library offering a number of re-sampling techniques commonly used in datasets showing strong between-class imbalance"; homepage = "https://github.com/scikit-learn-contrib/imbalanced-learn"; - changelog = "https://github.com/scikit-learn-contrib/imbalanced-learn/releases/tag/${version}"; + changelog = "https://github.com/scikit-learn-contrib/imbalanced-learn/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ rmcgibbo diff --git a/pkgs/development/python-modules/imeon-inverter-api/default.nix b/pkgs/development/python-modules/imeon-inverter-api/default.nix index ccb608ae2186..85fef418a007 100644 --- a/pkgs/development/python-modules/imeon-inverter-api/default.nix +++ b/pkgs/development/python-modules/imeon-inverter-api/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "imeon-inverter-api"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; src = fetchFromGitHub { owner = "Imeon-Inverters-for-Home-Assistant"; repo = "inverter-api"; tag = version; - hash = "sha256-8tecWWDYFq+kAqWM9vKhM15LKnEVqaDBkH6jh0xwIsE="; + hash = "sha256-+LIDrbSAGVkakofHZsyNJh8vPV87qA6VCW9eY1DhWEU="; }; build-system = [ pdm-pep517 ]; diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix index f6cbbb13c2de..1252bf46083d 100644 --- a/pkgs/development/python-modules/img2pdf/default.nix +++ b/pkgs/development/python-modules/img2pdf/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, replaceVars, colord, - setuptools, + flit-core, pikepdf, pillow, stdenv, @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "img2pdf"; - version = "0.6.1"; + version = "0.6.3"; pyproject = true; # gitlab.mister-muffin.de produces a 500 error on 0.6.1 @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "josch"; repo = "img2pdf"; tag = version; - hash = "sha256-71u6ex+UAEFPDtR9QI8Ezah5zCorn4gMdAnzFz4blsI="; + hash = "sha256-uHcGCx5DdUxFnATG3T565R+NatLukPPpnRj0TZHToC0="; }; patches = [ @@ -47,7 +47,7 @@ buildPythonPackage rec { }) ]; - build-system = [ setuptools ]; + build-system = [ flit-core ]; dependencies = [ pikepdf diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index 9a311c66a90c..106bd1735764 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -13,15 +13,19 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "8.7.0"; + version = "8.7.1"; pyproject = true; src = fetchPypi { pname = "importlib_metadata"; inherit version; - hash = "sha256-0TuBrSI7iQqhbFRx8qwwVs92xfEPgtb5KS8LQV84kAA="; + hash = "sha256-Sf7xrmRAwYIFL0B8jTSmj3Lvw225ypDcARM5jy/d6Ls="; }; + postPatch = '' + sed -i "/coherent.licensed/d" pyproject.toml + ''; + build-system = [ setuptools # otherwise cross build fails setuptools-scm diff --git a/pkgs/development/python-modules/iniconfig/default.nix b/pkgs/development/python-modules/iniconfig/default.nix index 29aa32c17416..cc04d54ca9b3 100644 --- a/pkgs/development/python-modules/iniconfig/default.nix +++ b/pkgs/development/python-modules/iniconfig/default.nix @@ -1,28 +1,24 @@ { lib, buildPythonPackage, - replaceVars, fetchPypi, - hatchling, + setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "iniconfig"; - version = "2.1.0"; + version = "2.3.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-OrvS4ws2cz/uePnH9zCPLQBQ6I8Ah/0lwmRfY8dz4cc="; + hash = "sha256-x2MVx32waGUNScW1YxR3SngE3xb+5EAsHxnW0V2MRzA="; }; - build-system = [ hatchling ]; - - patches = [ - # Cannot use hatch-vcs, due to an infinite recursion - (replaceVars ./version.patch { - inherit version; - }) + build-system = [ + setuptools + setuptools-scm ]; pythonImportsCheck = [ "iniconfig" ]; diff --git a/pkgs/development/python-modules/iniconfig/version.patch b/pkgs/development/python-modules/iniconfig/version.patch deleted file mode 100644 index fa046cdc2076..000000000000 --- a/pkgs/development/python-modules/iniconfig/version.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/pyproject.toml b/pyproject.toml -index 05cd96e..eb2000f 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -1,12 +1,12 @@ - [build-system] - build-backend = "hatchling.build" - requires = [ -- "hatch-vcs", - "hatchling>=1.26", - ] - - [project] - name = "iniconfig" -+version = "@version@" - description = "brain-dead simple config-ini parsing" - readme = "README.rst" - license = "MIT" -@@ -15,9 +15,6 @@ authors = [ - { name = "Holger Krekel", email = "holger.krekel@gmail.com" }, - ] - requires-python = ">=3.8" --dynamic = [ -- "version", --] - classifiers = [ - "Development Status :: 4 - Beta", - "Intended Audience :: Developers", -@@ -40,12 +37,6 @@ classifiers = [ - Homepage = "https://github.com/pytest-dev/iniconfig" - - --[tool.hatch.version] --source = "vcs" -- --[tool.hatch.build.hooks.vcs] --version-file = "src/iniconfig/_version.py" -- - [tool.hatch.build.targets.sdist] - include = [ - "/src", diff --git a/pkgs/development/python-modules/injector/default.nix b/pkgs/development/python-modules/injector/default.nix index 0d33da935af4..f90d005959ef 100644 --- a/pkgs/development/python-modules/injector/default.nix +++ b/pkgs/development/python-modules/injector/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "injector"; - version = "0.22.0"; + version = "0.24.0"; format = "setuptools"; src = fetchFromGitHub { owner = "python-injector"; repo = "injector"; tag = version; - hash = "sha256-FRO/stQDTa4W1f6mLPDCJslYFfIvgS0EgoEhuh0rxwA="; + hash = "sha256-Pv+3D2eyZiposXMsfhVniGNvlNGb3xSZfjIQBLMcbLA="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/inline-snapshot/default.nix b/pkgs/development/python-modules/inline-snapshot/default.nix index ab00215125f0..bf4272905afb 100644 --- a/pkgs/development/python-modules/inline-snapshot/default.nix +++ b/pkgs/development/python-modules/inline-snapshot/default.nix @@ -13,7 +13,6 @@ pyright, pytest-freezer, pytest-mock, - pytest-subtests, pytest-xdist, pytestCheckHook, rich, @@ -23,14 +22,14 @@ buildPythonPackage rec { pname = "inline-snapshot"; - version = "0.28.0"; + version = "0.31.1"; pyproject = true; src = fetchFromGitHub { owner = "15r10nk"; repo = "inline-snapshot"; tag = version; - hash = "sha256-f572H7jeolv9nONuRBtZR/pcVDs5oX/dOiEjXlJyiio="; + hash = "sha256-45e3M7WjGLhmn1Tdf7fD04jSA32TvB0QmFzvywJc3Ac="; }; build-system = [ hatchling ]; @@ -49,7 +48,6 @@ buildPythonPackage rec { pyright pytest-freezer pytest-mock - pytest-subtests pytest-xdist pytestCheckHook time-machine diff --git a/pkgs/development/python-modules/inotify-simple/default.nix b/pkgs/development/python-modules/inotify-simple/default.nix index 6bcab191c5b7..36fca20cc1d9 100644 --- a/pkgs/development/python-modules/inotify-simple/default.nix +++ b/pkgs/development/python-modules/inotify-simple/default.nix @@ -2,19 +2,22 @@ lib, buildPythonPackage, fetchPypi, + setuptools, }: buildPythonPackage rec { pname = "inotify-simple"; - version = "1.3.5"; - format = "setuptools"; + version = "2.0.1"; + pyproject = true; src = fetchPypi { pname = "inotify_simple"; inherit version; - sha256 = "0a61bh087cq5wfrvz680hg5pmykb9gmy26kwyn6ims2akkjgyh44"; + hash = "sha256-8BC7vYKDvXGp9Ost6UdlgE7eJL1HMgsObvQTblQc3Cw="; }; + build-system = [ setuptools ]; + # The package has no tests doCheck = false; diff --git a/pkgs/development/python-modules/inscriptis/default.nix b/pkgs/development/python-modules/inscriptis/default.nix index a16f217864dd..c07234e0ae06 100644 --- a/pkgs/development/python-modules/inscriptis/default.nix +++ b/pkgs/development/python-modules/inscriptis/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "inscriptis"; - version = "2.6.0"; + version = "2.7.0"; pyproject = true; src = fetchFromGitHub { owner = "weblyzard"; repo = "inscriptis"; tag = version; - hash = "sha256-+qLHdQ4i/PYSUCZLYV3BguXjacjs7aB3MP0rJegv+dI="; + hash = "sha256-m1LZiGu79I9fMQXtL1MuzHxUd6KSwuc87Edkt9sp0DE="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/instructor/default.nix b/pkgs/development/python-modules/instructor/default.nix index 9cb8219ab095..76988306ffbc 100644 --- a/pkgs/development/python-modules/instructor/default.nix +++ b/pkgs/development/python-modules/instructor/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "instructor"; - version = "1.11.3"; + version = "1.14.4"; pyproject = true; src = fetchFromGitHub { owner = "jxnl"; repo = "instructor"; tag = "v${version}"; - hash = "sha256-VWFrMgfe92bHUK1hueqJLHQ7G7ATCgK7wXr+eqrVWcw="; + hash = "sha256-6NYS6nY9phIY9fWEp0X3fC90uFedaot2xzZynzGnZSE="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/intervaltree/default.nix b/pkgs/development/python-modules/intervaltree/default.nix index ed18a50246e0..d5fce46a7cba 100644 --- a/pkgs/development/python-modules/intervaltree/default.nix +++ b/pkgs/development/python-modules/intervaltree/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, fetchPypi, - setuptools, + hatchling, + uv-dynamic-versioning, pytestCheckHook, sortedcontainers, }: buildPythonPackage rec { - version = "3.1.0"; + version = "3.2.1"; pname = "intervaltree"; pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "902b1b88936918f9b2a19e0e5eb7ccb430ae45cde4f39ea4b36932920d33952d"; + sha256 = "sha256-8/fouut911ufem0zzz7BACWYSo5m4wFtU35SEwxzz+I="; }; - build-system = [ setuptools ]; + build-system = [ + hatchling + uv-dynamic-versioning + ]; dependencies = [ sortedcontainers ]; diff --git a/pkgs/development/python-modules/invocations/default.nix b/pkgs/development/python-modules/invocations/default.nix index 7927a501aeb0..1a8ee27a6528 100644 --- a/pkgs/development/python-modules/invocations/default.nix +++ b/pkgs/development/python-modules/invocations/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "invocations"; - version = "3.3.0"; + version = "4.0.2"; format = "setuptools"; src = fetchFromGitHub { owner = "pyinvoke"; repo = "invocations"; tag = version; - hash = "sha256-JnhdcxhBNsYgDMcljtGKjOT1agujlao/66QifGuh6I0="; + hash = "sha256-G6EKypqP2/coPChLwwEKZ2WIEay0qfyM8M5jKb0oS2c="; }; patches = [ ./replace-blessings-with-blessed.patch ]; @@ -69,7 +69,7 @@ buildPythonPackage rec { meta = { description = "Common/best-practice Invoke tasks and collections"; homepage = "https://invocations.readthedocs.io/"; - changelog = "https://github.com/pyinvoke/invocations/blob/${version}/docs/changelog.rst"; + changelog = "https://github.com/pyinvoke/invocations/blob/${src.tag}/docs/changelog.rst"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ samuela ]; }; diff --git a/pkgs/development/python-modules/ipycanvas/default.nix b/pkgs/development/python-modules/ipycanvas/default.nix index f0efaffd1a4c..55eb9f22fabe 100644 --- a/pkgs/development/python-modules/ipycanvas/default.nix +++ b/pkgs/development/python-modules/ipycanvas/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "ipycanvas"; - version = "0.14.2"; + version = "0.14.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-OFNwRHcRlN2jFjbEEHh4RxZyp6y1hLfotRgrIpsXBtU="; + hash = "sha256-xqU6Iu6/TWEbFouPRDQUWIPyenV1UJvZmkv8SMU4Wjk="; }; # We relax dependencies here instead of pulling in a patch because upstream diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 1690144b24f2..173bcc8ffcc0 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "6.30.1"; + version = "7.1.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-arsnAWGJZALna5E5T83OXRvl1F9FZnHlCAVy+FBb45s="; + hash = "sha256-WKP8iFM9WTDDVG3H6sZsbSiKzeT4AeIAHmXtxdyc8Ns="; }; # debugpy is optional, see https://github.com/ipython/ipykernel/pull/767 diff --git a/pkgs/development/python-modules/ipympl/default.nix b/pkgs/development/python-modules/ipympl/default.nix index 485628c0b747..7f009c27b255 100644 --- a/pkgs/development/python-modules/ipympl/default.nix +++ b/pkgs/development/python-modules/ipympl/default.nix @@ -1,32 +1,63 @@ { lib, buildPythonPackage, - fetchPypi, - ipykernel, - ipython-genutils, + fetchFromGitHub, + + # frontend + nodejs, + yarn-berry_3, + + # build-system + hatch-jupyter-builder, + hatch-nodejs-version, + hatchling, + jupyterlab, + + # dependencies + ipython, ipywidgets, matplotlib, numpy, pillow, traitlets, + + # tests + importlib-metadata, + nbval, + pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ipympl"; - version = "0.9.7"; - format = "wheel"; + version = "0.10.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - format = "wheel"; - hash = "sha256-NpjufqoLBHp2A1F9eqG3GzIRil9RdUyrRexdmU9nII8="; - dist = "py3"; - python = "py3"; + src = fetchFromGitHub { + owner = "matplotlib"; + repo = "ipympl"; + tag = "v${finalAttrs.version}"; + hash = "sha256-IJ7tLUE0Ac4biQc9b87adgDcD8pa9XH1bo8rzDl9DCY="; }; - propagatedBuildInputs = [ - ipykernel - ipython-genutils + yarnOfflineCache = yarn-berry_3.fetchYarnBerryDeps { + inherit (finalAttrs) src; + hash = "sha256-tdfrAf2BSz9n83ctWqRxDHZnhnfhKA3BFNhXVr9wvLY="; + }; + + nativeBuildInputs = [ + nodejs + yarn-berry_3.yarnBerryConfigHook + ]; + + build-system = [ + hatch-jupyter-builder + hatch-nodejs-version + hatchling + jupyterlab + ]; + + dependencies = [ + ipython ipywidgets matplotlib numpy @@ -34,14 +65,19 @@ buildPythonPackage rec { traitlets ]; - # There are no unit tests in repository - doCheck = false; + nativeCheckInputs = [ + importlib-metadata + nbval + pytestCheckHook + ]; + pythonImportsCheck = [ "ipympl" "ipympl.backend_nbagg" ]; meta = { + changelog = "https://github.com/matplotlib/ipympl/releases/tag/${finalAttrs.src.tag}"; description = "Matplotlib Jupyter Extension"; homepage = "https://github.com/matplotlib/jupyter-matplotlib"; maintainers = with lib.maintainers; [ @@ -50,4 +86,4 @@ buildPythonPackage rec { ]; license = lib.licenses.bsd3; }; -} +}) diff --git a/pkgs/development/python-modules/ipyniivue/default.nix b/pkgs/development/python-modules/ipyniivue/default.nix index 6c36a1a7fb83..846023ad6c1d 100644 --- a/pkgs/development/python-modules/ipyniivue/default.nix +++ b/pkgs/development/python-modules/ipyniivue/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "ipyniivue"; - version = "2.1.0"; + version = "2.4.4"; pyproject = true; src = fetchFromGitHub { owner = "niivue"; repo = "ipyniivue"; - rev = "v${version}"; - hash = "sha256-rgScBBJ0Jqr5REZ+YFJcKwWcV33RzJ/sn6RqTL/limo="; + tag = "v${version}"; + hash = "sha256-Jk8Os8g2W5IRqLQSLQeH59ffGgWK/gjuUZgUl+HflVA="; }; npmDeps = fetchNpmDeps { @@ -55,7 +55,7 @@ buildPythonPackage rec { meta = { description = "Show a nifti image in a webgl 2.0 canvas within a jupyter notebook cell"; homepage = "https://github.com/niivue/ipyniivue"; - changelog = "https://github.com/niivue/ipyniivue/releases/tag/${version}"; + changelog = "https://github.com/niivue/ipyniivue/releases/tag/${src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index f92475f19fe1..556b9a91e21f 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -34,9 +34,9 @@ testpath, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ipython"; - version = "9.7.0"; + version = "9.9.0"; outputs = [ "out" "man" @@ -44,8 +44,8 @@ buildPythonPackage rec { pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-X23ojJBaVmxqnWxACo/tVKY44fdUPReq4lURMyFrHk4="; + inherit (finalAttrs) pname version; + hash = "sha256-SPvtGy3l4scXfu+hRKun/LgtrFFPCbV+KsnaNN21QiA="; }; build-system = [ setuptools ]; @@ -106,9 +106,9 @@ buildPythonPackage rec { description = "IPython: Productive Interactive Computing"; downloadPage = "https://github.com/ipython/ipython/"; homepage = "https://ipython.readthedocs.io/en/stable/"; - changelog = "https://github.com/ipython/ipython/blob/${version}/docs/source/whatsnew/version${lib.versions.major version}.rst"; + changelog = "https://github.com/ipython/ipython/blob/${finalAttrs.version}/docs/source/whatsnew/version${lib.versions.major finalAttrs.version}.rst"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ bjornfor ]; teams = [ lib.teams.jupyter ]; }; -} +}) diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index ba8080138a5c..9439961ad122 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "ipywidgets"; - version = "8.1.7"; + version = "8.1.8"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-FfGsBQucy+/UXcz7su9r7QAp2CeGgtVp1xuN2WvuA3Y="; + hash = "sha256-YflpMGuV+F+6a2mGt/5F1zEk0dnjAjqAaHENR6Iupmg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix index f6a0f9847ddf..3e79a6888b69 100644 --- a/pkgs/development/python-modules/isort/default.nix +++ b/pkgs/development/python-modules/isort/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "isort"; - version = "6.0.1"; + version = "7.0.0"; pyproject = true; src = fetchFromGitHub { owner = "PyCQA"; repo = "isort"; tag = version; - hash = "sha256-+O6bIbIpEMRUhzGUOQtBlHB//DaXaaOTjqMBTFvYnLk="; + hash = "sha256-GN76dLk+Ju+Do/BymIuHD/9KAjYZ3sKvfz2cvNEnF5U="; }; build-system = [ diff --git a/pkgs/development/python-modules/itemadapter/default.nix b/pkgs/development/python-modules/itemadapter/default.nix index c1268553e0f9..a10601ef75cf 100644 --- a/pkgs/development/python-modules/itemadapter/default.nix +++ b/pkgs/development/python-modules/itemadapter/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "itemadapter"; - version = "0.12.0"; + version = "0.13.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-pQiCQ+iO/jCY8XIIVecHF25zVa2H0dIOKwMpf10V0b4="; + hash = "sha256-+hOce+KqgPiHSy8j0WXV1KpHxLhcVKtTC1Z/1faE8bQ="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/iterm2/default.nix b/pkgs/development/python-modules/iterm2/default.nix index 650077742e73..ad0dca14632b 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.10"; + version = "2.13"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-jAz5X/yp8b90CYg2GN7uZqzXPGOSkiLiNDV4DcxRaGk="; + hash = "sha256-vslDklETWNlOfD+E4xvMOAJXyyYYVs9/CKHk5WPXI34="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jaconv/default.nix b/pkgs/development/python-modules/jaconv/default.nix index 1702f27244f7..f461f81bcc56 100644 --- a/pkgs/development/python-modules/jaconv/default.nix +++ b/pkgs/development/python-modules/jaconv/default.nix @@ -8,21 +8,16 @@ buildPythonPackage rec { pname = "jaconv"; - version = "0.3.4"; + version = "0.4.1"; pyproject = true; src = fetchFromGitHub { owner = "ikegami-yukino"; repo = "jaconv"; tag = "v${version}"; - hash = "sha256-9ruhOLaYNESeKOwJs3IN6ct66fSq7My9DOyA7/cH3d0="; + hash = "sha256-43sziwJ/SDdpLHJyGXyI5nXEofbos2W+NV7DlOpWWa8="; }; - patches = [ - ./fix-packaging.patch - ./use-pytest.patch - ]; - build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -32,7 +27,7 @@ buildPythonPackage rec { meta = { description = "Python Japanese character interconverter for Hiragana, Katakana, Hankaku and Zenkaku"; homepage = "https://github.com/ikegami-yukino/jaconv"; - changelog = "https://github.com/ikegami-yukino/jaconv/blob/v${version}/CHANGES.rst"; + changelog = "https://github.com/ikegami-yukino/jaconv/blob/${src.tag}/CHANGES.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/jaconv/fix-packaging.patch b/pkgs/development/python-modules/jaconv/fix-packaging.patch deleted file mode 100644 index f970b4e6c969..000000000000 --- a/pkgs/development/python-modules/jaconv/fix-packaging.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/setup.py b/setup.py -index 297357b..12b861f 100644 ---- a/setup.py -+++ b/setup.py -@@ -39,7 +42,6 @@ - 'Programming Language :: Python :: 3.10', - 'Programming Language :: Python :: 3.11', 'Topic :: Text Processing' - ], -- data_files=[('', ['README.rst', 'CHANGES.rst'])], - long_description='%s\n\n%s' % - (open('README.rst', encoding='utf8').read(), - open('CHANGES.rst', encoding='utf8').read()), diff --git a/pkgs/development/python-modules/jaconv/use-pytest.patch b/pkgs/development/python-modules/jaconv/use-pytest.patch deleted file mode 100644 index b91704ee4f32..000000000000 --- a/pkgs/development/python-modules/jaconv/use-pytest.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/test_jaconv.py b/test_jaconv.py -index 7e0a169..aaf180d 100644 ---- a/test_jaconv.py -+++ b/test_jaconv.py -@@ -1,11 +1,8 @@ - # -*- coding: utf-8 -*- - from __future__ import unicode_literals --from nose.tools import assert_equal, nottest - import jaconv - from functools import partial - --assert_equal.__self__.maxDiff = None -- - HIRAGANA = ('ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞた', - 'だちぢっつづてでとどなにぬねのはばぱひびぴふぶぷへべぺほぼぽま', - 'みむめもゃやゅゆょよらりるれろわをんーゎゐゑゕゖゔゝゞ・「」。、') -@@ -25,13 +22,15 @@ FULL_ASCII = ('!"#$%&'()*+,-./:;<=>? - FULL_DIGIT = '0123456789' - - --@nottest -+def assert_equal(x, y): -+ assert x == y -+ -+ - def _compare(mathod, lhs, rhs): - for i in range(len(lhs)): - assert_equal(mathod(lhs[i]), rhs[i]) - - --@nottest - def _concat(*iterables): - result = '' - for iterable in iterables: diff --git a/pkgs/development/python-modules/jaraco-context/default.nix b/pkgs/development/python-modules/jaraco-context/default.nix index 4014c235f91e..c7754b6a0ff5 100644 --- a/pkgs/development/python-modules/jaraco-context/default.nix +++ b/pkgs/development/python-modules/jaraco-context/default.nix @@ -9,16 +9,20 @@ buildPythonPackage rec { pname = "jaraco-context"; - version = "6.0.1"; + version = "6.1.0"; pyproject = true; src = fetchFromGitHub { owner = "jaraco"; repo = "jaraco.context"; tag = "v${version}"; - hash = "sha256-WXZX2s9Qehp0F3bSv2c5lGxhhn6HKFkABbtYKizG1/8="; + hash = "sha256-2UYG1xXnH1kjYNvB6EKJPRZJ1Zd0yYhTDBTdrNFN1p4="; }; + postPatch = '' + sed -i "/coherent.licensed/d" pyproject.toml + ''; + pythonNamespaces = [ "jaraco" ]; build-system = [ setuptools-scm ]; @@ -33,7 +37,7 @@ buildPythonPackage rec { meta = { description = "Python module for context management"; homepage = "https://github.com/jaraco/jaraco.context"; - changelog = "https://github.com/jaraco/jaraco.context/blob/v${version}/CHANGES.rst"; + changelog = "https://github.com/jaraco/jaraco.context/blob/${src.tag}/CHANGES.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/jaraco-functools/default.nix b/pkgs/development/python-modules/jaraco-functools/default.nix index fba8bc9b0021..0499b672f0fc 100644 --- a/pkgs/development/python-modules/jaraco-functools/default.nix +++ b/pkgs/development/python-modules/jaraco-functools/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "jaraco-functools"; - version = "4.2.1"; + version = "4.4.0"; pyproject = true; src = fetchPypi { pname = "jaraco_functools"; inherit version; - hash = "sha256-vmNKv8yrzlb6MFP4x+vje2gmg6Tud5NnDO0XurAIc1M="; + hash = "sha256-2iGTOwQXuJUVViZWVHp3tJMfmBdusXNkTA01Ayoz1rs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index 3f4c2cb1fc92..83e64b65474b 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -16,22 +16,24 @@ nixosTests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jenkins-job-builder"; - version = "6.4.2"; - format = "setuptools"; - - build-system = [ setuptools ]; + version = "6.4.4"; + pyproject = true; + # forge at opendev.org does not provide release tarballs src = fetchPypi { - inherit pname version; - hash = "sha256-G+DVRd6o3GwTdFNnJkotIidrxexJZSdgCGXTA4KnJJA="; + pname = "jenkins_job_builder"; + inherit (finalAttrs) version; + hash = "sha256-7PpCDpe3KLRpt+R/Nu+qxdDxLKWVqTiCPK3j+nNaum8="; }; postPatch = '' export HOME=$(mktemp -d) ''; + build-system = [ setuptools ]; + dependencies = [ pbr python-jenkins @@ -57,4 +59,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ bot-wxt1221 ]; }; -} +}) diff --git a/pkgs/development/python-modules/jenkinsapi/default.nix b/pkgs/development/python-modules/jenkinsapi/default.nix index 5ae93e9731f5..4a7fec38bdfe 100644 --- a/pkgs/development/python-modules/jenkinsapi/default.nix +++ b/pkgs/development/python-modules/jenkinsapi/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "jenkinsapi"; - version = "0.3.15"; + version = "0.3.17"; pyproject = true; src = fetchFromGitHub { owner = "pycontribs"; repo = "jenkinsapi"; tag = version; - hash = "sha256-r6GOi/0ALJDy6R6cd/bECk+HVe/AyKZYG96sr9y9o/4="; + hash = "sha256-1dTcT84cDpP9V4tVrgW2MTYx4jQj0/tZiAuakC+orUQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index 3522ce0064d2..2474439fc910 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "joblib"; - version = "1.5.2"; + version = "1.5.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-P6pcOQVLLwPKVH2psvUv3mfAYkDDGFPzBq6pfxNke1U="; + hash = "sha256-hWGjJp5oARBoY/0NbYS7c3vp52MeM6rtP7nOWVNojaM="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/joserfc/default.nix b/pkgs/development/python-modules/joserfc/default.nix index 42e20b524812..16fd842083c6 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.2.2"; + version = "1.6.1"; pyproject = true; src = fetchFromGitHub { owner = "authlib"; repo = "joserfc"; tag = version; - hash = "sha256-GS1UvhOdeuyGaF/jS0zgdYkRxz6M8w4lFXcbtIPqQcY="; + hash = "sha256-druh7ybcQBjTxUFMVLUwknw/aa/fyrUdS4ftS/ftYeA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/json5/default.nix b/pkgs/development/python-modules/json5/default.nix index a32a45e946eb..89c2f5a15df5 100644 --- a/pkgs/development/python-modules/json5/default.nix +++ b/pkgs/development/python-modules/json5/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "json5"; - version = "0.12.1"; + version = "0.13.0"; pyproject = true; src = fetchFromGitHub { owner = "dpranke"; repo = "pyjson5"; tag = "v${version}"; - hash = "sha256-ou4Rc50PsWtgWmD05JUU2fmZc2IRYppao5Kf0WVfYF0="; + hash = "sha256-KL5YsWSHS8xI+lQB+ZtdEKUHGKICOduZsBd51z4jItw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/jsonargparse/default.nix b/pkgs/development/python-modules/jsonargparse/default.nix index ed0f830cb914..a7d3b265d266 100644 --- a/pkgs/development/python-modules/jsonargparse/default.nix +++ b/pkgs/development/python-modules/jsonargparse/default.nix @@ -8,7 +8,6 @@ jsonnet, jsonschema, omegaconf, - pytest-subtests, pytestCheckHook, pyyaml, reconplogger, @@ -68,7 +67,6 @@ buildPythonPackage (finalAttrs: { }; nativeCheckInputs = [ - pytest-subtests pytestCheckHook types-pyyaml types-requests diff --git a/pkgs/development/python-modules/jsonpath-python/default.nix b/pkgs/development/python-modules/jsonpath-python/default.nix index abb7ec231aa8..41807a3ef89b 100644 --- a/pkgs/development/python-modules/jsonpath-python/default.nix +++ b/pkgs/development/python-modules/jsonpath-python/default.nix @@ -1,22 +1,27 @@ { buildPythonPackage, fetchPypi, + hatchling, lib, pytestCheckHook, - setuptools, + pytest-benchmark, }: buildPythonPackage rec { pname = "jsonpath-python"; - version = "1.0.6"; + version = "1.1.4"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-3Vvkpy2KKZXD9YPPgr880alUTP2r8tIllbZ6/wc0lmY="; + inherit version; + pname = "jsonpath_python"; + hash = "sha256-uz4ThU5IB8B4oVA64th8IRuL/02bQLZFXtWDs7UKf90="; }; - build-system = [ setuptools ]; - nativeCheckInputs = [ pytestCheckHook ]; + build-system = [ hatchling ]; + nativeCheckInputs = [ + pytest-benchmark + pytestCheckHook + ] + ++ pytest-benchmark.optional-dependencies.histogram; pythonImportsCheck = [ "jsonpath" ]; - enabledTestPaths = [ "test/test*.py" ]; meta = { homepage = "https://github.com/sean2077/jsonpath-python"; diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix index 77d61bacfa58..39c607b43aa5 100644 --- a/pkgs/development/python-modules/jsonrpc-async/default.nix +++ b/pkgs/development/python-modules/jsonrpc-async/default.nix @@ -11,21 +11,16 @@ buildPythonPackage rec { pname = "jsonrpc-async"; - version = "2.1.2"; + version = "2.1.3"; pyproject = true; src = fetchFromGitHub { owner = "emlove"; repo = "jsonrpc-async"; - rev = version; - hash = "sha256-KOnycsOZFDEVj8CJDwGbdtbOpMPQMVdrXbHG0fzr9PI="; + tag = version; + hash = "sha256-WcO2mj5QYZTMnFTNo1ABgpJPxM+GREVIf+z9viFDJHM="; }; - patches = [ - # https://github.com/emlove/jsonrpc-async/pull/11 - ./mark-tests-async.patch - ]; - build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/jsonrpc-async/mark-tests-async.patch b/pkgs/development/python-modules/jsonrpc-async/mark-tests-async.patch deleted file mode 100644 index c63a4f8a644f..000000000000 --- a/pkgs/development/python-modules/jsonrpc-async/mark-tests-async.patch +++ /dev/null @@ -1,104 +0,0 @@ -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/jsonschema-specifications/default.nix b/pkgs/development/python-modules/jsonschema-specifications/default.nix index 74af572a77d5..f4528ccc4d63 100644 --- a/pkgs/development/python-modules/jsonschema-specifications/default.nix +++ b/pkgs/development/python-modules/jsonschema-specifications/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "jsonschema-specifications"; - version = "2025.4.1"; + version = "2025.9.1"; pyproject = true; src = fetchPypi { pname = "jsonschema_specifications"; inherit version; - hash = "sha256-YwFZyfTb6hYaaiIFwwEcxPGP84Gxif/0i7Obm/Jq5gg="; + hash = "sha256-tUCYfyOedFYTx6kXbz7bcrgypKxGXPAnEiiDl4MrXo0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index dac12f2f81a8..aae7dacff91e 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -28,12 +28,12 @@ buildPythonPackage rec { pname = "jsonschema"; - version = "4.25.0"; + version = "4.26.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-5jrPXBF2LA5mcv+2FIK99X8IdmhNjSScD+LXMNSLxV8="; + hash = "sha256-DCZwfi762Kob/Ft84XDz/MwuSRj/hZibqf+p+ssr4yY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/junitparser/default.nix b/pkgs/development/python-modules/junitparser/default.nix index be695611cd60..6e8471c8a02c 100644 --- a/pkgs/development/python-modules/junitparser/default.nix +++ b/pkgs/development/python-modules/junitparser/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, glibcLocales, lxml, pytestCheckHook, @@ -9,16 +10,18 @@ buildPythonPackage rec { pname = "junitparser"; - version = "3.2.0"; - format = "setuptools"; + version = "4.0.2"; + pyproject = true; src = fetchFromGitHub { owner = "weiwei"; repo = "junitparser"; - rev = version; - hash = "sha256-efP9t5eto6bcjk33wpJmunLlPH7wUwAa6/OjjYG/fgM="; + tag = version; + hash = "sha256-+81n5xW9SEE+NZbYKxXu6xupoq4/haUZokVardh43iM="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook lxml diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix index 6b7efc5f0ae2..d440d15fd188 100644 --- a/pkgs/development/python-modules/junos-eznc/default.nix +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -18,19 +18,19 @@ pytestCheckHook, six, transitions, - yamlordereddictloader, + yamlloader, }: buildPythonPackage rec { pname = "junos-eznc"; - version = "2.7.5"; + version = "2.7.6"; pyproject = true; src = fetchFromGitHub { owner = "Juniper"; repo = "py-junos-eznc"; tag = version; - hash = "sha256-1OOXhhY3fBG00PptUSfIPI906YLgludr9PRMoWBbPnU="; + hash = "sha256-+bheNSRcFnq/07Y6BaTqsUAVxEQcdQwtz39cX1nKOBs="; }; build-system = [ setuptools ]; @@ -50,7 +50,7 @@ buildPythonPackage rec { scp six transitions - yamlordereddictloader + yamlloader ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/jupysql/default.nix b/pkgs/development/python-modules/jupysql/default.nix index e7b742bde38c..a7a43b3c7874 100644 --- a/pkgs/development/python-modules/jupysql/default.nix +++ b/pkgs/development/python-modules/jupysql/default.nix @@ -38,15 +38,15 @@ buildPythonPackage rec { pname = "jupysql"; - version = "0.11.1"; + version = "0.38"; pyproject = true; src = fetchFromGitHub { owner = "ploomber"; repo = "jupysql"; - tag = version; - hash = "sha256-7wfKvKqDf8LlUiLoevNRxmq8x5wLheOgIeWz72oFcuw="; + tag = "v${version}"; + hash = "sha256-Z132bGkjXUNPIscIfIM8FKRO0Uc/z4Sl932CVN8f3lc="; }; pythonRelaxDeps = [ "sqlalchemy" ]; @@ -131,7 +131,7 @@ buildPythonPackage rec { meta = { description = "Better SQL in Jupyter"; homepage = "https://github.com/ploomber/jupysql"; - changelog = "https://github.com/ploomber/jupysql/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/ploomber/jupysql/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ euxane ]; }; diff --git a/pkgs/development/python-modules/jupyter-client/default.nix b/pkgs/development/python-modules/jupyter-client/default.nix index 4066a9f80b34..e584fbb3f7a1 100644 --- a/pkgs/development/python-modules/jupyter-client/default.nix +++ b/pkgs/development/python-modules/jupyter-client/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "jupyter-client"; - version = "8.6.3"; + version = "8.8.0"; pyproject = true; src = fetchPypi { pname = "jupyter_client"; inherit version; - hash = "sha256-NbOglHxKbp1Ynrl9fUzV6Q+RDucxAWEfASg3Mr1tlBk="; + hash = "sha256-1VaBFBmk8tlshprzToVOPwWbfMLW0Bqc2chcJnaRvj4="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/jupyter-core/default.nix b/pkgs/development/python-modules/jupyter-core/default.nix index 3908e7391d19..b64fa6a120c0 100644 --- a/pkgs/development/python-modules/jupyter-core/default.nix +++ b/pkgs/development/python-modules/jupyter-core/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "jupyter-core"; - version = "5.8.1"; + version = "5.9.1"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "jupyter"; repo = "jupyter_core"; tag = "v${version}"; - hash = "sha256-opTFYVDqzkjeFC+9IZXPRCoV2QCTm1ze6ldrOZN0aUc="; + hash = "sha256-mAvfyiN8Fdm9U3Ar7xicwOinKfTqk9qrfq/SGiaxNvU="; }; patches = [ ./tests_respect_pythonpath.patch ]; @@ -66,7 +66,7 @@ buildPythonPackage rec { meta = { description = "Base package on which Jupyter projects rely"; homepage = "https://jupyter.org/"; - changelog = "https://github.com/jupyter/jupyter_core/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/jupyter/jupyter_core/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.bsd3; teams = [ lib.teams.jupyter ]; }; diff --git a/pkgs/development/python-modules/jupyter-lsp/default.nix b/pkgs/development/python-modules/jupyter-lsp/default.nix index c17d1bf0d465..b6111cd4785d 100644 --- a/pkgs/development/python-modules/jupyter-lsp/default.nix +++ b/pkgs/development/python-modules/jupyter-lsp/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "jupyter-lsp"; - version = "2.2.6"; + version = "2.3.0"; pyproject = true; src = fetchPypi { pname = "jupyter_lsp"; inherit version; - hash = "sha256-BWa9m7BP2eZ3SpN+0BUitVW6eL43vr73h8irIt5MA2E="; + hash = "sha256-RYqlkzncho+3hNczZPF9vOiDbpBs11/UcaMly6AuAkU="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix index 4b511f747f91..f624965d200c 100644 --- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "jupyter-repo2docker"; - version = "2025.08.0"; + version = "2025.12.0"; pyproject = true; src = fetchFromGitHub { owner = "jupyterhub"; repo = "repo2docker"; tag = version; - hash = "sha256-vqLZbqshEl3xC5hcE4OkWfZpPSlSfv70oygEYPFqyFE="; + hash = "sha256-9ZRew9DspRENxhqpWFTSdP8KcQQHA4vMMECLikt+nsw="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/jupyter-server-terminals/default.nix b/pkgs/development/python-modules/jupyter-server-terminals/default.nix index 4d64c3e3ee39..4fb3ed7a7899 100644 --- a/pkgs/development/python-modules/jupyter-server-terminals/default.nix +++ b/pkgs/development/python-modules/jupyter-server-terminals/default.nix @@ -18,14 +18,14 @@ let self = buildPythonPackage rec { pname = "jupyter-server-terminals"; - version = "0.5.3"; + version = "0.5.4"; pyproject = true; src = fetchFromGitHub { owner = "jupyter-server"; repo = "jupyter_server_terminals"; tag = "v${version}"; - hash = "sha256-af7jBscGkbekXgfDxwAfrJSY1uEuIGfzzSsjaPdlYcY="; + hash = "sha256-gVR34Ajfv567isVmbP7Zx4AiptrdNqd032QxdMBpsTE="; }; nativeBuildInputs = [ hatchling ]; @@ -48,7 +48,7 @@ let }; meta = { - changelog = "https://github.com/jupyter-server/jupyter_server_terminals/releases/tag/v${version}"; + changelog = "https://github.com/jupyter-server/jupyter_server_terminals/releases/tag/${src.tag}"; description = "Jupyter Server Extension Providing Support for Terminals"; homepage = "https://github.com/jupyter-server/jupyter_server_terminals"; license = lib.licenses.bsd3; diff --git a/pkgs/development/python-modules/jupyter-ui-poll/default.nix b/pkgs/development/python-modules/jupyter-ui-poll/default.nix index bfe25e5e617c..51d658a6e6ab 100644 --- a/pkgs/development/python-modules/jupyter-ui-poll/default.nix +++ b/pkgs/development/python-modules/jupyter-ui-poll/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "jupyter-ui-poll"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "Kirill888"; repo = "jupyter-ui-poll"; tag = "v${version}"; - hash = "sha256-mlgLd6uFDSxRBj4+Eidea2CE7FuG6NzJLWGec4KPd9k="; + hash = "sha256-Q+y0Xr7wuo8ZwCHEELSi0QSXa8DLtfZ8XQc48eOk4bw="; }; build-system = [ setuptools ]; @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = { description = "Block jupyter cell execution while interacting with widgets"; homepage = "https://github.com/Kirill888/jupyter-ui-poll"; - changelog = "https://github.com/Kirill888/jupyter-ui-poll/releases/tag/v${version}"; + changelog = "https://github.com/Kirill888/jupyter-ui-poll/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/jupyterlab-execute-time/default.nix b/pkgs/development/python-modules/jupyterlab-execute-time/default.nix index 3734c7d0bcd5..0f2bcac650b1 100644 --- a/pkgs/development/python-modules/jupyterlab-execute-time/default.nix +++ b/pkgs/development/python-modules/jupyterlab-execute-time/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "jupyterlab-execute-time"; - version = "3.2.0"; + version = "3.3.0"; pyproject = true; src = fetchPypi { pname = "jupyterlab_execute_time"; inherit version; - hash = "sha256-mxO2XCwTm/q7P2/xcGxNM+1aViA6idApdggzThW8nAs="; + hash = "sha256-kA/Rrrv9PZQ9NiXu+XPu1VW7J0XUmEBAJ4OVnIod/Do="; }; # jupyterlab is required to build from source but we use the pre-build package diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix index e118bd9f9f27..e2b45e47cc93 100644 --- a/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "jupyterlab-git"; - version = "0.51.2"; + version = "0.51.4"; pyproject = true; src = fetchFromGitHub { owner = "jupyterlab"; repo = "jupyterlab-git"; tag = "v${version}"; - hash = "sha256-YQWS+/GfQzkQ/n0xBq+K8lJ9tjvIRJxa3w3AzNARpDo="; + hash = "sha256-8/XspIMT2x/buBKbUTknpyh0VGionozavjgi67gg1/k="; }; nativeBuildInputs = [ @@ -88,7 +88,7 @@ buildPythonPackage rec { meta = { description = "Jupyter lab extension for version control with Git"; homepage = "https://github.com/jupyterlab/jupyterlab-git"; - changelog = "https://github.com/jupyterlab/jupyterlab-git/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/jupyterlab/jupyterlab-git/blob/${src.tag}/CHANGELOG.md"; license = with lib.licenses; [ bsd3 ]; maintainers = with lib.maintainers; [ chiroptical ]; }; diff --git a/pkgs/development/python-modules/jupyterlab-widgets/default.nix b/pkgs/development/python-modules/jupyterlab-widgets/default.nix index 34b5ecf2ef4c..3923a0abfd45 100644 --- a/pkgs/development/python-modules/jupyterlab-widgets/default.nix +++ b/pkgs/development/python-modules/jupyterlab-widgets/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "jupyterlab-widgets"; - version = "3.0.15"; + version = "3.0.16"; pyproject = true; src = fetchPypi { pname = "jupyterlab_widgets"; inherit version; - hash = "sha256-KSCIigwpIjUakgKBeVemjAfZlnNQTWzTc0UpnpcbsIs="; + hash = "sha256-Qj2gUHHVXPJ6nmAiFtNaOmWj5BzfnF07ZDuBTOOMGeA="; }; # jupyterlab is required to build from source but we use the pre-build package diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 5a4c9bbfb203..ac36656e0dce 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "4.5.0"; + version = "4.5.3"; pyproject = true; src = fetchFromGitHub { owner = "jupyterlab"; repo = "jupyterlab"; tag = "v${version}"; - hash = "sha256-3vKz79/19F4kZeTjHSChgwAsM8quzIVBmjiRekA/8vo="; + hash = "sha256-QQ8g1+nB5aeXSrjwuL22L49S84cm2oiiNCqWj+dk7XI="; }; nativeBuildInputs = [ @@ -45,7 +45,7 @@ buildPythonPackage rec { offlineCache = yarn-berry_3.fetchYarnBerryDeps { inherit src; sourceRoot = "${src.name}/jupyterlab/staging"; - hash = "sha256-3Gvbsi/oi8lTRrCYut126zsksjSSWmfJCoRxDmjne1E="; + hash = "sha256-a+pTp1IqY/RLCjClKbb7LMvUblYULChtT/knGgTlI7U="; }; preBuild = '' diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index 0d21d83fff6c..c4fc55b2bd62 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "jupytext"; - version = "1.17.3"; + version = "1.18.1"; pyproject = true; src = fetchFromGitHub { owner = "mwouts"; repo = "jupytext"; tag = "v${version}"; - hash = "sha256-qxQU3b+u9sQD0mtvZz6fw0jYmdfQmwtKaGxUc/qOcTE="; + hash = "sha256-D7Ps/lHF3F/7Jm4ozcjO8YsTPA1GQPqZVpPod/riGvA="; }; patches = [ diff --git a/pkgs/development/python-modules/kaggle/default.nix b/pkgs/development/python-modules/kaggle/default.nix index 1420a581833a..07d04f48de9e 100644 --- a/pkgs/development/python-modules/kaggle/default.nix +++ b/pkgs/development/python-modules/kaggle/default.nix @@ -2,50 +2,51 @@ bleach, buildPythonPackage, certifi, - charset-normalizer, fetchPypi, hatchling, - idna, + kagglesdk, lib, + packaging, python-dateutil, python-slugify, requests, - setuptools, six, - text-unidecode, tqdm, urllib3, - webencodings, protobuf, }: buildPythonPackage rec { pname = "kaggle"; - version = "1.7.4.5"; + version = "1.8.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-HZghvWpqFHB0HHbSZJWhhHW1p7/gyAsZGRJUsnNdQd0="; + hash = "sha256-MzXaV1KuKEPDqgUjt6ftkajdVQXBnLQDH51XZRw0YQY="; }; build-system = [ hatchling ]; + pythonRemoveDeps = [ + "black" + "mypy" + "types-requests" + "types-tqdm" + ]; + dependencies = [ bleach certifi - charset-normalizer - idna + kagglesdk + packaging + protobuf python-dateutil python-slugify requests - setuptools six - text-unidecode tqdm urllib3 - webencodings - protobuf ]; # Tests try to access the network. diff --git a/pkgs/development/python-modules/kaldi-active-grammar/default.nix b/pkgs/development/python-modules/kaldi-active-grammar/default.nix index e9edd1c17252..192e48ab78f1 100644 --- a/pkgs/development/python-modules/kaldi-active-grammar/default.nix +++ b/pkgs/development/python-modules/kaldi-active-grammar/default.nix @@ -24,14 +24,14 @@ let in buildPythonPackage rec { pname = "kaldi-active-grammar"; - version = "3.1.0"; + version = "3.2.0"; format = "setuptools"; src = fetchFromGitHub { owner = "daanzu"; repo = "kaldi-active-grammar"; - rev = "v${version}"; - sha256 = "0lilk6yjzcy31avy2z36bl9lr60gzwhmyqwqn8akq11qc3mbffsk"; + tag = "v${version}"; + sha256 = "sha256-VyVshIEVp/ep4Ih7Kj66GF02JEZ4nwgJOtgR2DarzdY="; }; KALDI_BRANCH = "foo"; diff --git a/pkgs/development/python-modules/kalshi-python/default.nix b/pkgs/development/python-modules/kalshi-python/default.nix index 1bfe5dd51e7c..e7317c3e616e 100644 --- a/pkgs/development/python-modules/kalshi-python/default.nix +++ b/pkgs/development/python-modules/kalshi-python/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "kalshi-python"; - version = "2.0.0"; + version = "2.1.4"; pyproject = true; src = fetchPypi { inherit version; pname = "kalshi_python"; - hash = "sha256-ybO7O+rxS3rSo6GN/FZC/BhSnlfH5/+TpJkSxhRBYYw="; + hash = "sha256-FsHRuqfmdF31l5E/L08/eVhWkN7JhgJkFSUzMrYNuOY="; }; dependencies = [ diff --git a/pkgs/development/python-modules/kanidm/default.nix b/pkgs/development/python-modules/kanidm/default.nix index 39675905e0d1..caf784b8f063 100644 --- a/pkgs/development/python-modules/kanidm/default.nix +++ b/pkgs/development/python-modules/kanidm/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "kanidm"; - version = "1.2.0"; + version = "1.8.5"; pyproject = true; src = fetchFromGitHub { owner = "kanidm"; repo = "kanidm"; - rev = "1774f9428ccdc357d514652acbcae49f6b16687a"; - hash = "sha256-SE3b9Ug0EZFygGf9lsmVsQzmop9qOMiCUsbO//1QWF8="; + tag = "v${version}"; + hash = "sha256-lJX/eObXi468iFOzeFjAnNkPiQ8VbBnfqD1518LDm2s="; }; sourceRoot = "${src.name}/pykanidm"; diff --git a/pkgs/development/python-modules/kde-material-you-colors/default.nix b/pkgs/development/python-modules/kde-material-you-colors/default.nix index cd49235e4274..88a3d7b2397e 100644 --- a/pkgs/development/python-modules/kde-material-you-colors/default.nix +++ b/pkgs/development/python-modules/kde-material-you-colors/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "kde-material-you-colors"; - version = "1.10.1"; + version = "2.0.2"; pyproject = true; src = fetchFromGitHub { owner = "luisbocanegra"; repo = "kde-material-you-colors"; tag = "v${finalAttrs.version}"; - hash = "sha256-qiaFHu4eyX73cAbMdoP46SiiFjNWx2vXWVzEbCsTNBI="; + hash = "sha256-fvDWBcXCIviCXMlLFPowJttNmpX1JO1OZsnSPyNhLv8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index e07e79fa3460..27095bc830bb 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch, # build-system setuptools, @@ -47,6 +48,14 @@ buildPythonPackage (finalAttrs: { hash = "sha256-7s3bJdkS/G/Ydj9txbtGrqGCE3PjjS1ZiuoGOzk+UIg="; }; + patches = [ + (fetchpatch { + name = "numpy-2.4-compat.patch"; + url = "https://github.com/keras-team/keras/commit/bc3bc4fc167049eb35136deaf5680cdaacc80371.patch"; + hash = "sha256-+eN3QVBpHGIv67hbRxzVHeKjFZIz5LCdbNO0AL65OoQ="; + }) + ]; + build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix index 17af66042e67..a61ea5957552 100644 --- a/pkgs/development/python-modules/kiwisolver/default.nix +++ b/pkgs/development/python-modules/kiwisolver/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "kiwisolver"; - version = "1.4.8"; + version = "1.4.9"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-I9XwI73Ix+VOtl8Dyl1bsltgHqxNfxoEKIih9FI3mH4="; + hash = "sha256-w7IsJsb9aBGwroNjuVyozk6jwgLT0JdbKRQxDOsbzE0="; }; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getInclude stdenv.cc.libcxx}/include/c++/v1"; diff --git a/pkgs/development/python-modules/kopf/default.nix b/pkgs/development/python-modules/kopf/default.nix index e003a6bef744..51e42eb0bd91 100644 --- a/pkgs/development/python-modules/kopf/default.nix +++ b/pkgs/development/python-modules/kopf/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "kopf"; - version = "1.38.0"; + version = "1.40.0"; pyproject = true; src = fetchFromGitHub { owner = "nolar"; repo = "kopf"; tag = version; - hash = "sha256-H2Q5nDIODp2VFtMIJ0g8b+/SMZzLueRGBkh1g6LBbgc="; + hash = "sha256-AXaEV3+p5NytKhuUkoaWBG4oNhPKQwoCRTmUkmb26RQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/kotsu/default.nix b/pkgs/development/python-modules/kotsu/default.nix index 4ed9b51a2879..794d4f6e2998 100644 --- a/pkgs/development/python-modules/kotsu/default.nix +++ b/pkgs/development/python-modules/kotsu/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "kotsu"; - version = "0.3.3"; + version = "0.4.0"; format = "setuptools"; src = fetchFromGitHub { owner = "datavaluepeople"; repo = "kotsu"; - rev = "v${version}"; - hash = "sha256-V5OkgiLUTRNbNt6m94+aYUZd9Nw+/60LfhrqqdFhiUw="; + tag = "v${version}"; + hash = "sha256-7bRrHowRKq3xiBiAkfS4ZL9PXHIUmZc99q9pHex9BLg="; }; propagatedBuildInputs = [ @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = { description = "Lightweight framework for structured and repeatable model validation"; homepage = "https://github.com/datavaluepeople/kotsu"; - changelog = "https://github.com/datavaluepeople/kotsu/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/datavaluepeople/kotsu/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/krb5/default.nix b/pkgs/development/python-modules/krb5/default.nix index 0d8cd32055a9..163b0763cd48 100644 --- a/pkgs/development/python-modules/krb5/default.nix +++ b/pkgs/development/python-modules/krb5/default.nix @@ -12,14 +12,19 @@ buildPythonPackage rec { pname = "krb5"; - version = "0.7.1"; + version = "0.9.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-7V8T1QMUibENhlXAraKKgcI5Gz7LigjG1znh5YNbxFA="; + hash = "sha256-TN0shf9HcBCO2vSP7fGYiM+Vb/N04ul+QPhBKwSMruY="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "Cython ==" "Cython >=" + ''; + build-system = [ cython setuptools diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index e732c10cd9a3..d54dfa71d8b4 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "kubernetes"; - version = "33.1.0"; + version = "35.0.0"; pyproject = true; src = fetchFromGitHub { owner = "kubernetes-client"; repo = "python"; tag = "v${version}"; - hash = "sha256-+jL0XS7Y8qOqzZ5DcG/hZFUpj7krJAaA4fgPNSEgIAE="; + hash = "sha256-q52LqOz8aQkzWPwEy1c2jUQJ3hQ2sDVrYGkOgOc7Mm0="; }; build-system = [ diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index d9ecab3a9771..30d0ac79492c 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -29,14 +29,14 @@ }: let - version = "7.2.0"; + version = "7.3.0"; pyproject = true; src = fetchFromGitHub { owner = "Labelbox"; repo = "labelbox-python"; tag = "v${version}"; - hash = "sha256-2of/yiw+wBHc0BFLKFdWV4Xm1Dcs4SsT8DkpmruaLT0="; + hash = "sha256-3xsV7X5M6s1wXYrThFC2SdvWgXAt1Hlw4OGQB/bKCCY="; }; lbox-clients = buildPythonPackage { diff --git a/pkgs/development/python-modules/langchain-classic/default.nix b/pkgs/development/python-modules/langchain-classic/default.nix index 55b1d910d58f..b6302540fc5d 100644 --- a/pkgs/development/python-modules/langchain-classic/default.nix +++ b/pkgs/development/python-modules/langchain-classic/default.nix @@ -30,7 +30,7 @@ pytest-mock, pytest-socket, pytest-xdist, - pytestCheckHook, + pytest8_3CheckHook, requests-mock, responses, syrupy, @@ -88,7 +88,7 @@ buildPythonPackage rec { pytest-mock pytest-socket pytest-xdist - pytestCheckHook + pytest8_3CheckHook requests-mock responses syrupy diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix index 222ebdfec726..ccc254acac7d 100644 --- a/pkgs/development/python-modules/langchain-community/default.nix +++ b/pkgs/development/python-modules/langchain-community/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, pythonAtLeast, @@ -122,6 +121,10 @@ buildPythonPackage rec { disabledTestPaths = [ # depends on Pydantic v1 notations, will not load "tests/unit_tests/document_loaders/test_gitbook.py" + # pytest.PytestRemovedIn9Warning: Marks applied to fixtures have no effect + # https://docs.pytest.org/en/stable/deprecations.html#applying-a-mark-to-a-fixture-function + "tests/unit_tests/document_loaders/test_hugging_face.py" + "tests/unit_tests/indexes/test_sql_record_manager.py" ]; passthru.updateScript = gitUpdater { diff --git a/pkgs/development/python-modules/langchain-tests/default.nix b/pkgs/development/python-modules/langchain-tests/default.nix index 15356490fd7a..bb08244095a2 100644 --- a/pkgs/development/python-modules/langchain-tests/default.nix +++ b/pkgs/development/python-modules/langchain-tests/default.nix @@ -48,7 +48,9 @@ buildPythonPackage rec { ]; pythonRelaxDeps = [ + "pytest" "syrupy" + "vcrpy" ]; dependencies = [ diff --git a/pkgs/development/python-modules/langcodes/default.nix b/pkgs/development/python-modules/langcodes/default.nix index 2b633356e30e..c67c26f70349 100644 --- a/pkgs/development/python-modules/langcodes/default.nix +++ b/pkgs/development/python-modules/langcodes/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "langcodes"; - version = "3.5.0"; + version = "3.5.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Hu+BaNB+UeExokl//srUtmP2II58OuO43BXFFzSm+AE="; + hash = "sha256-QL/zFeAbAdEcKuOSjdT1y9dN04+b2RLBK5o2BsFD9zE="; }; build-system = [ @@ -35,6 +35,10 @@ buildPythonPackage rec { disabledTests = [ # AssertionError: assert 'Unknown language [aqk]' == 'Aninka' "test_updated_iana" + # doctest mismatches + "speaking_population" + "writing_population" + "README.md" ]; pythonImportsCheck = [ "langcodes" ]; diff --git a/pkgs/development/python-modules/langfuse/default.nix b/pkgs/development/python-modules/langfuse/default.nix index 9527031f45cb..064abf7f8823 100644 --- a/pkgs/development/python-modules/langfuse/default.nix +++ b/pkgs/development/python-modules/langfuse/default.nix @@ -22,14 +22,14 @@ buildPythonPackage (finalAttrs: { pname = "langfuse"; - version = "3.11.2"; + version = "3.12.0"; pyproject = true; src = fetchFromGitHub { owner = "langfuse"; repo = "langfuse-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-CZa1nzgGHQSx/cPkOxbDsfkWpgr/veWRN8zgHeYrJOw="; + hash = "sha256-LHKNy5KSJhRhxkrp4+pjD0GGHTooaj7adrRA7I4mbdo="; }; # https://github.com/langfuse/langfuse/issues/9618 diff --git a/pkgs/development/python-modules/langgraph-checkpoint-mongodb/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-mongodb/default.nix index 18c0059bf130..db21b3b8fad7 100644 --- a/pkgs/development/python-modules/langgraph-checkpoint-mongodb/default.nix +++ b/pkgs/development/python-modules/langgraph-checkpoint-mongodb/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "langgraph-checkpoint-mongodb"; - version = "0.3.0"; + version = "0.11.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain-mongodb"; - tag = "libs/langgraph-checkpoint-mongodb/v${version}"; - hash = "sha256-pfgqJ7QPtAxV86HEEaRBMAOCKC8y/iTlZmPzu1szE/o="; + tag = "libs/langchain-mongodb/v${version}"; + hash = "sha256-dO0dASjyNMxnbxZ/ry8lcJxedPdrv6coYiTjOcaT8/0="; }; sourceRoot = "${src.name}/libs/langgraph-checkpoint-mongodb"; diff --git a/pkgs/development/python-modules/langgraph-store-mongodb/default.nix b/pkgs/development/python-modules/langgraph-store-mongodb/default.nix index 1ec43c58a853..cda323bee18d 100644 --- a/pkgs/development/python-modules/langgraph-store-mongodb/default.nix +++ b/pkgs/development/python-modules/langgraph-store-mongodb/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "langgraph-store-mongodb"; - version = "0.1.1"; + version = "0.11.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain-mongodb"; - tag = "libs/langgraph-store-mongodb/v${version}"; - hash = "sha256-/dafQK6iy85rMt7FMVb3ssaIop9JjjrwajaHAfBUp7g="; + tag = "libs/langchain-mongodb/v${version}"; + hash = "sha256-dO0dASjyNMxnbxZ/ry8lcJxedPdrv6coYiTjOcaT8/0="; }; sourceRoot = "${src.name}/libs/langgraph-store-mongodb"; diff --git a/pkgs/development/python-modules/language-data/default.nix b/pkgs/development/python-modules/language-data/default.nix index b164dda78ccb..702bbc61261d 100644 --- a/pkgs/development/python-modules/language-data/default.nix +++ b/pkgs/development/python-modules/language-data/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "language-data"; - version = "1.3.0"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "georgkrause"; repo = "language_data"; tag = "v${version}"; - hash = "sha256-qHPie07GtVPKP/PFlP72XVVrl6j+5A8fIO729aPRsrc="; + hash = "sha256-cWjeb2toGrnNSsK566e18NgWhv6YdQrKEzFPilmBdoA="; }; build-system = [ setuptools-scm ]; @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = { description = "Supplement module for langcodes"; homepage = "https://github.com/georgkrause/language_data"; - changelog = "https://github.com/georgkrause/language_data/releases/tag/v${version}"; + changelog = "https://github.com/georgkrause/language_data/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/lark/default.nix b/pkgs/development/python-modules/lark/default.nix index ae628d9e4a74..373d470fa71a 100644 --- a/pkgs/development/python-modules/lark/default.nix +++ b/pkgs/development/python-modules/lark/default.nix @@ -4,24 +4,28 @@ fetchFromGitHub, regex, setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "lark"; - version = "1.2.2"; + version = "1.3.1"; pyproject = true; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; tag = version; - hash = "sha256-02NX/2bHTYSVTDLLudJmEU2DcQNn0Ke+5ayilKLlwqA="; + hash = "sha256-JDtLSbVjypaHqamkknHDSql1GTMf1LA4TgJXqTn4Q20="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; # Optional import, but fixes some re known bugs & allows advanced regex features - propagatedBuildInputs = [ regex ]; + dependencies = [ regex ]; pythonImportsCheck = [ "lark" @@ -36,7 +40,7 @@ buildPythonPackage rec { meta = { description = "Modern parsing library for Python, implementing Earley & LALR(1) and an easy interface"; homepage = "https://lark-parser.readthedocs.io/"; - changelog = "https://github.com/lark-parser/lark/releases/tag/${version}"; + changelog = "https://github.com/lark-parser/lark/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/laspy/default.nix b/pkgs/development/python-modules/laspy/default.nix index 14978d91f8af..8f6d531dc69a 100644 --- a/pkgs/development/python-modules/laspy/default.nix +++ b/pkgs/development/python-modules/laspy/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "laspy"; - version = "2.6.1"; + version = "2.7.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-zpy5oYUosqK5hVg99ApN6mjN2nmV5H5LALbUjfDojao="; + hash = "sha256-9W/rVEXnXW/xLugUqrajUzkpDnUmT/J3xr9VPzAlo/U="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/lazy-object-proxy/default.nix b/pkgs/development/python-modules/lazy-object-proxy/default.nix index 6d8ac6476b48..110406f69a48 100644 --- a/pkgs/development/python-modules/lazy-object-proxy/default.nix +++ b/pkgs/development/python-modules/lazy-object-proxy/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "lazy-object-proxy"; - version = "1.11.0"; + version = "1.12.0"; pyproject = true; src = fetchFromGitHub { owner = "ionelmc"; repo = "python-lazy-object-proxy"; tag = "v${version}"; - hash = "sha256-iOftyGx5wLxIUwlmo1lY06MXqgxfZek6RR1S5UydOEs="; + hash = "sha256-80+QJlm2X2u0OGEkYbEsdg8OiAXLiBwrkVXOF9NBL+I="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/leather/default.nix b/pkgs/development/python-modules/leather/default.nix index c2ea8fe968c5..bec3ea53e10a 100644 --- a/pkgs/development/python-modules/leather/default.nix +++ b/pkgs/development/python-modules/leather/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "leather"; - version = "0.4.0"; + version = "0.4.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-+WS+wghvMVOmwW5wfyDLcY+BH1evEWB19MD0gFxgi5U="; + hash = "sha256-ZxGcKu6TvoIfB3GTvYU04pbAWzi9F02cWoDEqjHRpNM="; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/leb128/default.nix b/pkgs/development/python-modules/leb128/default.nix index 52e9c6a29e0a..a19f9b92ed0c 100644 --- a/pkgs/development/python-modules/leb128/default.nix +++ b/pkgs/development/python-modules/leb128/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "leb128"; - version = "1.0.8"; + version = "1.0.9"; pyproject = true; # fetchPypi doesn't include files required for tests @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "mohanson"; repo = "leb128"; tag = "v${version}"; - hash = "sha256-7ZjDqxGUANk3FfB3HPTc5CB5YcIi2ee0igXWAYXaZ88="; + hash = "sha256-X3iBYiANzM97M91dCyjEU/Onhqcid3MMsNzzKtcRcyA="; }; build-system = [ setuptools ]; @@ -26,7 +26,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "leb128" ]; meta = { - changelog = "https://github.com/mohanson/leb128/releases/tag/v${version}"; + changelog = "https://github.com/mohanson/leb128/releases/tag/${src.tag}"; description = "Utility to encode and decode Little Endian Base 128"; homepage = "https://github.com/mohanson/leb128"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/lerobot/default.nix b/pkgs/development/python-modules/lerobot/default.nix index 4caebc2ea200..90730adc2769 100644 --- a/pkgs/development/python-modules/lerobot/default.nix +++ b/pkgs/development/python-modules/lerobot/default.nix @@ -60,6 +60,7 @@ buildPythonPackage (finalAttrs: { "datasets" "draccus" "gymnasium" + "huggingface-hub" "opencv" "rerun-sdk" "torch" @@ -92,9 +93,7 @@ buildPythonPackage (finalAttrs: { torchvision wandb ] - ++ imageio.optional-dependencies.ffmpeg - ++ huggingface-hub.optional-dependencies.hf_transfer - ++ huggingface-hub.optional-dependencies.cli; + ++ imageio.optional-dependencies.ffmpeg; pythonImportsCheck = [ "lerobot" ]; diff --git a/pkgs/development/python-modules/levenshtein/cython-3.2-compat.patch b/pkgs/development/python-modules/levenshtein/cython-3.2-compat.patch new file mode 100644 index 000000000000..f57095760350 --- /dev/null +++ b/pkgs/development/python-modules/levenshtein/cython-3.2-compat.patch @@ -0,0 +1,13 @@ +diff --git a/src/Levenshtein/CMakeLists.txt b/src/Levenshtein/CMakeLists.txt +index 721f7a7..f6159ed 100644 +--- a/src/Levenshtein/CMakeLists.txt ++++ b/src/Levenshtein/CMakeLists.txt +@@ -9,7 +9,7 @@ function(create_cython_target _name) + MAIN_DEPENDENCY "${CMAKE_CURRENT_LIST_DIR}/${_name}.pyx" + VERBATIM + COMMAND +- Python::Interpreter -m cython "${CMAKE_CURRENT_LIST_DIR}/${_name}.pyx" ++ Python::Interpreter -m cython --cplus "${CMAKE_CURRENT_LIST_DIR}/${_name}.pyx" + --output-file "${CMAKE_CURRENT_BINARY_DIR}/${_name}.cxx") + + set(${_name} diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix index a365bcf924a6..a9bba86076d7 100644 --- a/pkgs/development/python-modules/levenshtein/default.nix +++ b/pkgs/development/python-modules/levenshtein/default.nix @@ -23,6 +23,9 @@ buildPythonPackage rec { hash = "sha256-iKWS7gm0t3yPgeX5N09cTa3N1C6GXvIALueO8DlfLfE="; }; + # https://github.com/rapidfuzz/Levenshtein/pull/84 + patches = [ ./cython-3.2-compat.patch ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "Cython>=3.1.6,<3.2.0" Cython diff --git a/pkgs/development/python-modules/lib4sbom/default.nix b/pkgs/development/python-modules/lib4sbom/default.nix index dcf9bc60f149..51f8942e736e 100644 --- a/pkgs/development/python-modules/lib4sbom/default.nix +++ b/pkgs/development/python-modules/lib4sbom/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "lib4sbom"; - version = "0.9.1"; + version = "0.9.3"; pyproject = true; src = fetchFromGitHub { owner = "anthonyharrison"; repo = "lib4sbom"; tag = "v${version}"; - hash = "sha256-GYXkxnZU7QYczKbJUiU+8TmboZQG9nkg00S1IRXeK6c="; + hash = "sha256-HnRr8ij/NFFMgXIlLFKrX8dBdGN1VZnUsE5QcWx4AZc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/lib50/default.nix b/pkgs/development/python-modules/lib50/default.nix index d8c6bb8b55b7..2b02437b578d 100644 --- a/pkgs/development/python-modules/lib50/default.nix +++ b/pkgs/development/python-modules/lib50/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "lib50"; - version = "3.2.0"; + version = "3.2.1"; pyproject = true; # latest GitHub release is several years old. Pypi is up to date. src = fetchPypi { pname = "lib50"; inherit version; - hash = "sha256-C9p5yKFkOGvUCpcZUsWF11frXOusVC9fBj4jUEVQUrg="; + hash = "sha256-p+g7rMxrpfMVmeWfzy9wh//dhF0L5H922dkqyqlWolM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/libbs/default.nix b/pkgs/development/python-modules/libbs/default.nix index 838084bacd5d..cf4a3b03e00b 100644 --- a/pkgs/development/python-modules/libbs/default.nix +++ b/pkgs/development/python-modules/libbs/default.nix @@ -24,20 +24,20 @@ let binaries = fetchFromGitHub { owner = "binsync"; repo = "bs-artifacts"; - rev = "514c2d6ef1875435c9d137bb5d99b6fc74063817"; + tag = "514c2d6ef1875435c9d137bb5d99b6fc74063817"; hash = "sha256-P7+BTJgdC9W8cC/7xQduFYllF+0ds1dSlm59/BFvZ2g="; }; in buildPythonPackage rec { pname = "libbs"; - version = "2.16.5"; + version = "3.3.0"; pyproject = true; src = fetchFromGitHub { owner = "binsync"; repo = "libbs"; tag = "v${version}"; - hash = "sha256-JE/eDs9vOiislIrsgBUx36XFenxgcoLtHA/veOMj2IY="; + hash = "sha256-Xe47JZPkbROHFlqc2o/htqvZWjknsv5KekJBqXA44O4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/libevdev/default.nix b/pkgs/development/python-modules/libevdev/default.nix index 315f02759c91..18830563af60 100644 --- a/pkgs/development/python-modules/libevdev/default.nix +++ b/pkgs/development/python-modules/libevdev/default.nix @@ -1,22 +1,21 @@ { lib, buildPythonPackage, - isPy27, fetchPypi, replaceVars, pkgs, + hatchling, pytestCheckHook, }: buildPythonPackage rec { pname = "libevdev"; - version = "0.12"; - format = "setuptools"; - disabled = isPy27; + version = "0.13.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-AulSYy7GwknLucZvb6AAEupEiwZgbHfNE5EzvC/kawg="; + hash = "sha256-3DNpzRQBdnueyxEXzWtz+rqQOOO9nhaVpxCp6dlBXo0="; }; patches = [ @@ -25,6 +24,8 @@ buildPythonPackage rec { }) ]; + build-system = [ hatchling ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = { diff --git a/pkgs/development/python-modules/libevdev/fix-paths.patch b/pkgs/development/python-modules/libevdev/fix-paths.patch index e73c360b1460..88bb638b41b1 100644 --- a/pkgs/development/python-modules/libevdev/fix-paths.patch +++ b/pkgs/development/python-modules/libevdev/fix-paths.patch @@ -1,20 +1,20 @@ diff --git a/libevdev/_clib.py b/libevdev/_clib.py -index 6e4ab2c..9db54d1 100644 +index c99fe4a..cdf94ad 100644 --- a/libevdev/_clib.py +++ b/libevdev/_clib.py -@@ -120,7 +120,7 @@ class Libevdev(_LibraryWrapper): +@@ -133,7 +133,7 @@ class Libevdev(_LibraryWrapper): @staticmethod - def _cdll(): + def _cdll() -> ctypes.CDLL: - return ctypes.CDLL("libevdev.so.2", use_errno=True) + return ctypes.CDLL("@libevdev@/lib/libevdev.so.2", use_errno=True) _api_prototypes = { # const char *libevdev_event_type_get_name(unsigned int type); -@@ -910,7 +910,7 @@ class UinputDevice(_LibraryWrapper): +@@ -950,7 +950,7 @@ class UinputDevice(_LibraryWrapper): @staticmethod - def _cdll(): + def _cdll() -> ctypes.CDLL: - return ctypes.CDLL("libevdev.so.2", use_errno=True) + return ctypes.CDLL("@libevdev@/lib/libevdev.so.2", use_errno=True) diff --git a/pkgs/development/python-modules/librt/default.nix b/pkgs/development/python-modules/librt/default.nix new file mode 100644 index 000000000000..15ae4cdcbe15 --- /dev/null +++ b/pkgs/development/python-modules/librt/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + mypy-extensions, + python, +}: + +buildPythonPackage rec { + pname = "librt"; + version = "0.7.8"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mypyc"; + repo = "librt"; + tag = "v${version}"; + hash = "sha256-FlLilZQMsXAYfreBAfYoutCEww8IVoU7jjxvvJr8pTk="; + }; + + # https://github.com/mypyc/librt/blob/v0.7.8/.github/workflows/buildwheels.yml#L90-L93 + postPatch = '' + cp -rv lib-rt/* . + ''; + + build-system = [ + setuptools + ]; + + nativeCheckInputs = [ + mypy-extensions + ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} smoke_tests.py + runHook postCheck + ''; + + pythonImportsCheck = [ + "librt" + "librt.internal" + ]; + + meta = { + description = "Mypyc runtime library"; + homepage = "https://github.com/mypyc/librt"; + license = lib.licenses.mit; + maintainers = [ ]; + }; +} diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index 836447ae1b4c..ccdf1b16b6b5 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "libtmux"; - version = "0.47.0"; + version = "0.53.0"; pyproject = true; src = fetchFromGitHub { owner = "tmux-python"; repo = "libtmux"; tag = "v${version}"; - hash = "sha256-yrz9fMr33yj/u0uGUNHYv0zOTvtfJ2u0TKToBO8ha6U="; + hash = "sha256-lGi5hjq1lcZtotCbNmwE0tPqwwEj5c9CJLx78eibg6Y="; }; postPatch = '' @@ -63,7 +63,7 @@ buildPythonPackage rec { meta = { description = "Typed scripting library / ORM / API wrapper for tmux"; homepage = "https://libtmux.git-pull.com/"; - changelog = "https://github.com/tmux-python/libtmux/raw/v${version}/CHANGES"; + changelog = "https://github.com/tmux-python/libtmux/raw/${src.tag}/CHANGES"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ otavio ]; }; diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix index 6d5eae15b9bf..b096ab7ca3fe 100644 --- a/pkgs/development/python-modules/limits/default.nix +++ b/pkgs/development/python-modules/limits/default.nix @@ -100,6 +100,22 @@ buildPythonPackage rec { "TestSlidingWindow" ]; + disabledTestMarks = [ + "flaky" + "memcached" + "mongodb" + "redis" + "redis_cluster" + "redis_sentinel" + "valkey" + "valkey_cluster" + ]; + + disabledTestPaths = [ + # docker + "tests/benchmarks/test_storage.py" + ]; + pythonImportsCheck = [ "limits" ]; meta = { diff --git a/pkgs/development/python-modules/linearmodels/default.nix b/pkgs/development/python-modules/linearmodels/default.nix index 8210ae5d0a5f..1e54b035f249 100644 --- a/pkgs/development/python-modules/linearmodels/default.nix +++ b/pkgs/development/python-modules/linearmodels/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "linearmodels"; - version = "6.1"; + version = "7.0"; pyproject = true; src = fetchFromGitHub { owner = "bashtage"; repo = "linearmodels"; tag = "v${version}"; - hash = "sha256-oWVBsFSKnv/8AHYP5sxO6+u5+hsOw/uQlOetse5ue88="; + hash = "sha256-/unFszNGaEPsoXDtaS3tsLnsX4A6e7Y88O8pDrf4nKc="; }; postPatch = '' @@ -64,7 +64,7 @@ buildPythonPackage rec { meta = { description = "Models for panel data, system regression, instrumental variables and asset pricing"; homepage = "https://bashtage.github.io/linearmodels/"; - changelog = "https://github.com/bashtage/linearmodels/releases/tag/v${version}"; + changelog = "https://github.com/bashtage/linearmodels/releases/tag/${src.tag}"; license = lib.licenses.ncsa; maintainers = with lib.maintainers; [ jherland ]; }; diff --git a/pkgs/development/python-modules/litestar/default.nix b/pkgs/development/python-modules/litestar/default.nix index 946f3d70db2b..b953d0435ea3 100644 --- a/pkgs/development/python-modules/litestar/default.nix +++ b/pkgs/development/python-modules/litestar/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, pythonAtLeast, + pythonOlder, # build-system hatchling, @@ -10,19 +11,16 @@ # dependencies annotated-types, anyio, - asyncpg, attrs, brotli, click, cryptography, - fsspec, httpx, jinja2, jsbeautifier, litestar-htmx, mako, minijinja, - fast-query-parsers, msgspec, multidict, multipart, @@ -30,7 +28,6 @@ polyfactory, piccolo, prometheus-client, - psutil, opentelemetry-instrumentation-asgi, pydantic-extra-types, pydantic, @@ -40,11 +37,12 @@ redis, rich-click, rich, + sniffio, structlog, time-machine, typing-extensions, uvicorn, - # valkey, + valkey, # tests addBinToPathHook, @@ -76,20 +74,17 @@ buildPythonPackage (finalAttrs: { dependencies = [ anyio - asyncpg click - fast-query-parsers - fsspec httpx litestar-htmx msgspec multidict multipart polyfactory - psutil pyyaml rich rich-click + sniffio typing-extensions ]; @@ -100,9 +95,9 @@ buildPythonPackage (finalAttrs: { cli = [ jsbeautifier uvicorn - ]; + ] + ++ uvicorn.optional-dependencies.standard; cryptography = [ cryptography ]; - htmx = [ litestar-htmx ]; jinja = [ jinja2 ]; jwt = [ cryptography @@ -112,8 +107,7 @@ buildPythonPackage (finalAttrs: { minijinja = [ minijinja ]; opentelemetry = [ opentelemetry-instrumentation-asgi ]; piccolo = [ piccolo ]; - picologging = [ picologging ]; - polyfactory = [ polyfactory ]; + picologging = lib.optionals (pythonOlder "3.13") [ picologging ]; prometheus = [ prometheus-client ]; pydantic = [ pydantic @@ -122,9 +116,14 @@ buildPythonPackage (finalAttrs: { ]; redis = [ redis ] ++ redis.optional-dependencies.hiredis; # sqlalchemy = [ advanced-alchemy ]; + standard = [ + jinja2 + jsbeautifier + uvicorn + ] + ++ uvicorn.optional-dependencies.standard; structlog = [ structlog ]; - # valkey = [ valkey ] ++ valkey.optional-dependencies.libvalkey; - yaml = [ pyyaml ]; + valkey = [ valkey ] ++ valkey.optional-dependencies.libvalkey; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/livekit-api/default.nix b/pkgs/development/python-modules/livekit-api/default.nix index e7f406ac979f..be2c9cac49a0 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.7"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "livekit"; repo = "python-sdks"; tag = "api-v${version}"; - hash = "sha256-yS7Nzzrgyo3Q/O4z9acIfPXzS/SRv27BEiO4cMP11Z0="; + hash = "sha256-Z9ZyzESPUR+j9s9LXSTDx3pB+bltbqTeb8WVKaKk80A="; }; pypaBuildFlags = [ "livekit-api" ]; @@ -47,6 +47,7 @@ buildPythonPackage rec { passthru.updateScript = gitUpdater { rev-prefix = "api-v"; }; meta = { + changelog = "https://github.com/livekit/python-sdks/releases/tag/${src.tag}"; description = "LiveKit real-time and server SDKs for Python"; homepage = "https://github.com/livekit/python-sdks/"; license = lib.licenses.asl20; diff --git a/pkgs/development/python-modules/livekit-protocol/default.nix b/pkgs/development/python-modules/livekit-protocol/default.nix index e65c0962917d..59a23bc78228 100644 --- a/pkgs/development/python-modules/livekit-protocol/default.nix +++ b/pkgs/development/python-modules/livekit-protocol/default.nix @@ -2,26 +2,26 @@ lib, buildPythonPackage, fetchFromGitHub, - setuptools, + hatchling, protobuf, gitUpdater, }: buildPythonPackage rec { pname = "livekit-protocol"; - version = "1.1.0"; + version = "1.1.2"; pyproject = true; src = fetchFromGitHub { owner = "livekit"; repo = "python-sdks"; tag = "protocol-v${version}"; - hash = "sha256-u89KM1Lio1gELIzwhmBJFCf1c29cfGu0WsMf8Vvsi8M="; + hash = "sha256-/QXjIz3q5dF6Y1CkyCP+3hWoXMGs7+eUgtehBJBF7LY="; }; pypaBuildFlags = [ "livekit-protocol" ]; - build-system = [ setuptools ]; + build-system = [ hatchling ]; dependencies = [ protobuf diff --git a/pkgs/development/python-modules/lizard/default.nix b/pkgs/development/python-modules/lizard/default.nix index 7b4de209182d..0d9b2aeb2460 100644 --- a/pkgs/development/python-modules/lizard/default.nix +++ b/pkgs/development/python-modules/lizard/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "terryyin"; repo = "lizard"; - rev = version; + tag = version; hash = "sha256-HNpCg/ScD0aDdpVXA9Nb9QU+4ww6Kp2qIeu9Lj0O7A4="; }; @@ -40,7 +40,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "lizard" ]; meta = { - changelog = "https://github.com/terryyin/lizard/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/terryyin/lizard/blob/${src.tag}/CHANGELOG.md"; description = "Code analyzer without caring the C/C++ header files"; mainProgram = "lizard"; downloadPage = "https://github.com/terryyin/lizard"; diff --git a/pkgs/development/python-modules/llama-index-readers-docling/default.nix b/pkgs/development/python-modules/llama-index-readers-docling/default.nix index 508bfcacb95f..5fc57ee0e5c1 100644 --- a/pkgs/development/python-modules/llama-index-readers-docling/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-docling/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "llama-index-readers-docling"; - version = "0.4.1"; + version = "0.4.2"; pyproject = true; src = fetchPypi { pname = "llama_index_readers_docling"; inherit version; - hash = "sha256-Et17yfWK+SSeWZymN26J4PjKx4FimGaJmMZaXazq5B0="; + hash = "sha256-mOZtVcvbWkri9SZeWAfGxjgKS9J8uF3sk/O/ydQgj+s="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/llama-parse/default.nix b/pkgs/development/python-modules/llama-parse/default.nix index ea9562a5b7ea..12e22cde1bb0 100644 --- a/pkgs/development/python-modules/llama-parse/default.nix +++ b/pkgs/development/python-modules/llama-parse/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "llama-parse"; - version = "0.6.79"; + version = "0.6.90"; pyproject = true; src = fetchPypi { pname = "llama_parse"; inherit version; - hash = "sha256-QT2tN24GUhkKPAzjx9IIBVnufW28yBKVw5cMZvE8B7g="; + hash = "sha256-7OqBGrj6lKe4Y90NNYQRPGMFRRM2i64ix6LYtnzPOu0="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index 00cca426e33f..433b33e9b9d1 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { meta = { description = "Python bindings for the low-level FUSE API"; homepage = "https://github.com/python-llfuse/python-llfuse"; - changelog = "https://github.com/python-llfuse/python-llfuse/raw/release-${version}/Changes.rst"; + changelog = "https://github.com/python-llfuse/python-llfuse/raw/release-${src.tag}/Changes.rst"; license = lib.licenses.lgpl2Plus; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ diff --git a/pkgs/development/python-modules/localstack-client/default.nix b/pkgs/development/python-modules/localstack-client/default.nix index b8c347c33e20..024146b3abb0 100644 --- a/pkgs/development/python-modules/localstack-client/default.nix +++ b/pkgs/development/python-modules/localstack-client/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "localstack-client"; - version = "2.10"; + version = "2.11"; format = "setuptools"; src = fetchPypi { pname = "localstack_client"; inherit version; - hash = "sha256-cyoH4j//1qWBrycUu+AGrW+ISsT4rJVSEaimMyHNxAk="; + hash = "sha256-HL178fA7m1U//n6hD+E39E6NaQo3r5xlFeumGiN5/EY="; }; propagatedBuildInputs = [ boto3 ]; diff --git a/pkgs/development/python-modules/localstack-ext/default.nix b/pkgs/development/python-modules/localstack-ext/default.nix index 2b55a08d46e9..2eda9e086882 100644 --- a/pkgs/development/python-modules/localstack-ext/default.nix +++ b/pkgs/development/python-modules/localstack-ext/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "localstack-ext"; - version = "4.8.0"; + version = "4.12.0"; pyproject = true; src = fetchPypi { pname = "localstack_ext"; inherit version; - hash = "sha256-XW7ZjZ1Y/yIYcSxFEc5XeED5QYsE+k/AOLEymYpl7KY="; + hash = "sha256-AQrG6iRTBarinrGgJeLr5OYguuN7KWyxRUYNMHz4mlE="; }; build-system = [ diff --git a/pkgs/development/python-modules/locust/default.nix b/pkgs/development/python-modules/locust/default.nix index dcc74be52e0a..5fc4fb0e3b7b 100644 --- a/pkgs/development/python-modules/locust/default.nix +++ b/pkgs/development/python-modules/locust/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "locust"; - version = "2.42.2"; + version = "2.43.1"; pyproject = true; src = fetchFromGitHub { owner = "locustio"; repo = "locust"; tag = version; - hash = "sha256-Myek56kHUX0rFNJcEhfMTSE7xwYhm4AmogxIcUNzrR0="; + hash = "sha256-+0B4S524UjvaYl7VTZ1IY7UuBuDjUBqOvjHu0UVOi6A="; }; postPatch = '' diff --git a/pkgs/development/python-modules/logbook/default.nix b/pkgs/development/python-modules/logbook/default.nix index e521d183b682..1eced7911e03 100644 --- a/pkgs/development/python-modules/logbook/default.nix +++ b/pkgs/development/python-modules/logbook/default.nix @@ -2,7 +2,7 @@ lib, brotli, buildPythonPackage, - cython, + cargo, execnet, fetchFromGitHub, jinja2, @@ -10,27 +10,41 @@ pytest-rerunfailures, pyzmq, redis, + rustc, + rustPlatform, setuptools, + setuptools-rust, sqlalchemy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "logbook"; - version = "1.8.2"; - format = "setuptools"; + version = "1.9.2"; + pyproject = true; src = fetchFromGitHub { owner = "getlogbook"; repo = "logbook"; - tag = version; - hash = "sha256-21323iXtjyUAxAEFMsU6t1/nNLEN5G3jHcubNCEYQ3c="; + tag = finalAttrs.version; + hash = "sha256-/oaBUIMsDwyxjQU57BpwXQfDMBNSDAI7fqtem/4QqKw="; }; - nativeBuildInputs = [ - cython + build-system = [ setuptools + setuptools-rust ]; + nativeBuildInputs = [ + cargo + rustc + rustPlatform.cargoSetupHook + ]; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname version src; + hash = "sha256-xIjcK69rwtE86DfvD9qXEn8MDIvU0Dl+d4Fmw9BUuCM="; + }; + optional-dependencies = { execnet = [ execnet ]; sqlalchemy = [ sqlalchemy ]; @@ -52,7 +66,7 @@ buildPythonPackage rec { pytestCheckHook pytest-rerunfailures ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; @@ -67,8 +81,8 @@ buildPythonPackage rec { meta = { description = "Logging replacement for Python"; homepage = "https://logbook.readthedocs.io/"; - changelog = "https://github.com/getlogbook/logbook/blob/${src.tag}/CHANGES"; + changelog = "https://github.com/getlogbook/logbook/blob/${finalAttrs.src.tag}/CHANGES"; license = lib.licenses.bsd3; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/logical-unification/default.nix b/pkgs/development/python-modules/logical-unification/default.nix index 749c975f784f..3363a64e862f 100644 --- a/pkgs/development/python-modules/logical-unification/default.nix +++ b/pkgs/development/python-modules/logical-unification/default.nix @@ -9,21 +9,28 @@ pytestCheckHook, pytest-html, pytest-benchmark, + setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "logical-unification"; - version = "0.4.6"; - format = "setuptools"; + version = "0.4.7"; + pyproject = true; src = fetchFromGitHub { owner = "pythological"; repo = "unification"; tag = "v${version}"; - hash = "sha256-uznmlkREFONU1YoI/+mcfb+Yg30NinWvsMxTfHCXzOU="; + hash = "sha256-m1wB7WOGb/io4Z7Zfl/rckh08j6IKSiiwFKMvl5UzHg="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ toolz multipledispatch ]; diff --git a/pkgs/development/python-modules/losant-rest/default.nix b/pkgs/development/python-modules/losant-rest/default.nix index 3e4838bb06f2..4e694b7a0e48 100644 --- a/pkgs/development/python-modules/losant-rest/default.nix +++ b/pkgs/development/python-modules/losant-rest/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "losant-rest"; - version = "1.22.1"; + version = "2.1.1"; pyproject = true; src = fetchFromGitHub { owner = "Losant"; repo = "losant-rest-python"; tag = "v${version}"; - hash = "sha256-7H7jmNsz5UTcM0i1KiVwQb2UMlLRQ/3W2rhM79+Q4Es="; + hash = "sha256-B4r3ZCXt3jC/8vtBzct1HEBuMq9NpF2qOlmlhZk9a3Q="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/lox/default.nix b/pkgs/development/python-modules/lox/default.nix index f127251e8ac1..bdbd10cd637c 100644 --- a/pkgs/development/python-modules/lox/default.nix +++ b/pkgs/development/python-modules/lox/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "lox"; - version = "0.13.0"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "BrianPugh"; repo = "lox"; tag = "v${version}"; - hash = "sha256-I/+/wl+H3OLAN26qJVqyqgW72GoTddm59j2Y6fsz8AM="; + hash = "sha256-PZKs+D1TmrBr+1M4ni7kKLywQ8Z6YCVjH2HFF6QjHdY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/lru-dict/default.nix b/pkgs/development/python-modules/lru-dict/default.nix index 31617fadb7c7..c3ee3649e044 100644 --- a/pkgs/development/python-modules/lru-dict/default.nix +++ b/pkgs/development/python-modules/lru-dict/default.nix @@ -1,25 +1,29 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pytestCheckHook, setuptools, }: -let +buildPythonPackage (finalAttrs: { pname = "lru-dict"; - version = "1.3.0"; -in -buildPythonPackage { - inherit pname version; + version = "1.4.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-VP0ZZta9H83ngVlsuGBoIU7e6/8dsTos6hEHnj/Qe2s="; + src = fetchFromGitHub { + owner = "amitdev"; + repo = "lru-dict"; + tag = "v${finalAttrs.version}"; + hash = "sha256-pHjBTAXoOUyTSzzHzOBZeMFkJhzspylMhxwqXYLFOQg="; }; - nativeBuildInputs = [ setuptools ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools==" "setuptools>=" + ''; + + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -28,8 +32,8 @@ buildPythonPackage { meta = { description = "Fast and memory efficient LRU cache for Python"; homepage = "https://github.com/amitdev/lru-dict"; - changelog = "https://github.com/amitdev/lru-dict/releases/tag/v${version}"; + changelog = "https://github.com/amitdev/lru-dict/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ hexa ]; }; -} +}) diff --git a/pkgs/development/python-modules/luma-core/default.nix b/pkgs/development/python-modules/luma-core/default.nix index 3e51efd37cca..845f7d21f53d 100644 --- a/pkgs/development/python-modules/luma-core/default.nix +++ b/pkgs/development/python-modules/luma-core/default.nix @@ -12,12 +12,12 @@ }: buildPythonPackage rec { pname = "luma-core"; - version = "2.5.2"; + version = "2.5.3"; src = fetchPypi { pname = "luma_core"; inherit version; - hash = "sha256-Lkb4dW3OSdO1OT2re1IcO8ba1vXmpiCLVbygtxGt+zE="; + hash = "sha256-7PscEvwy+O5s/w9hOASyYJOHwXVH9znQAmSfLm1W7C8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index ca4523d99cf1..2892a70dd7c4 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -7,6 +7,7 @@ # build-system cython, setuptools, + pkg-config, # native dependencies libxml2, @@ -40,8 +41,7 @@ buildPythonPackage rec { # required for build time dependency check nativeBuildInputs = [ - libxml2.dev - libxslt.dev + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix index a9f3869d284e..b3c51f507f4e 100644 --- a/pkgs/development/python-modules/lz4/default.nix +++ b/pkgs/development/python-modules/lz4/default.nix @@ -11,20 +11,18 @@ setuptools-scm, }: -buildPythonPackage { +buildPythonPackage (finalAttrs: { pname = "lz4"; - version = "4.4.4-unstable-2025-10-21"; + version = "4.4.5"; pyproject = true; src = fetchFromGitHub { owner = "python-lz4"; repo = "python-lz4"; - rev = "59b2d8176072bdee50d38cc68ec65c33b928a980"; + tag = "v${finalAttrs.version}"; hash = "sha256-2D30n5j5r4+gcrjEXPu+WpZ4QsugCPyC1xCZuJIPcI0="; }; - env.SETUPTOOLS_SCM_PRETEND_VERSION = "4.4.4"; - build-system = [ pkgconfig setuptools-scm @@ -54,9 +52,10 @@ buildPythonPackage { ''; meta = { + changelog = "https://github.com/python-lz4/python-lz4/releases/tag/${finalAttrs.src.tag}"; description = "LZ4 Bindings for Python"; homepage = "https://github.com/python-lz4/python-lz4"; license = lib.licenses.bsd3; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/mac-alias/default.nix b/pkgs/development/python-modules/mac-alias/default.nix index 8a8cad4e8df2..027998d7f19f 100644 --- a/pkgs/development/python-modules/mac-alias/default.nix +++ b/pkgs/development/python-modules/mac-alias/default.nix @@ -7,15 +7,19 @@ buildPythonPackage rec { pname = "mac-alias"; - version = "2.2.2"; + version = "2.2.3"; pyproject = true; src = fetchPypi { pname = "mac_alias"; inherit version; - hash = "sha256-yZxyjrUS6VXBHxpiA6D/qIg7JlSeiv5ogEAxql2oVrc="; + hash = "sha256-HH+jZ2h9ZpefLOTRqLJxbPHJ+4EXQcqzzzyjVlVcK+s="; }; + postPatch = '' + substituteInPlace pyproject.toml --replace-fail "setuptools==80.9.0" "setuptools" + ''; + nativeBuildInputs = [ setuptools ]; # pypi package does not include tests; diff --git a/pkgs/development/python-modules/mac-vendor-lookup/default.nix b/pkgs/development/python-modules/mac-vendor-lookup/default.nix index a088973a28e3..a801b06d4476 100644 --- a/pkgs/development/python-modules/mac-vendor-lookup/default.nix +++ b/pkgs/development/python-modules/mac-vendor-lookup/default.nix @@ -2,27 +2,30 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, aiofiles, aiohttp, }: -buildPythonPackage { +buildPythonPackage (finalAttrs: { pname = "mac-vendor-lookup"; - version = "0.1.12"; - format = "setuptools"; + version = "0.1.15"; + pyproject = true; src = fetchFromGitHub { owner = "bauerj"; repo = "mac_vendor_lookup"; - rev = "90dbea48f8a9d567b5f9039ebd151ddfe7d12a19"; - hash = "sha256-mPPJDrWdyvkTdb4WfeTNYwuC+Ek9vH7ORKRTREg+vK8="; + tag = finalAttrs.version; + hash = "sha256-RLCEyDalwQUVmcZdVPN1cyKLIPbWcZfjzIkClUZCeJU="; }; postPatch = '' sed -i '/mac-vendors.txt/d' setup.py ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ aiofiles aiohttp ]; @@ -38,4 +41,4 @@ buildPythonPackage { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ hexa ]; }; -} +}) diff --git a/pkgs/development/python-modules/mailsuite/default.nix b/pkgs/development/python-modules/mailsuite/default.nix index ccdba459a699..c402453f7e42 100644 --- a/pkgs/development/python-modules/mailsuite/default.nix +++ b/pkgs/development/python-modules/mailsuite/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "mailsuite"; - version = "1.10.1"; + version = "1.11.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-+QPGSQQZaUjDmTGhZZoyTGegKV9DBqrgnxdQpEgszrI="; + hash = "sha256-ilcOH27lVKhh/xFO/dkWZkwtx6wPYrKTWR3n1xqoUdk="; }; pythonRelaxDeps = [ "mail-parser" ]; diff --git a/pkgs/development/python-modules/mapbox-earcut/default.nix b/pkgs/development/python-modules/mapbox-earcut/default.nix index 339aef73b3e9..716dc5dfb6d0 100644 --- a/pkgs/development/python-modules/mapbox-earcut/default.nix +++ b/pkgs/development/python-modules/mapbox-earcut/default.nix @@ -6,7 +6,7 @@ # build-system cmake, ninja, - pybind11, + nanobind, scikit-build-core, # dependencies @@ -18,18 +18,18 @@ buildPythonPackage rec { pname = "mapbox-earcut"; - version = "1.0.3"; + version = "2.0.0"; pyproject = true; src = fetchFromGitHub { owner = "skogler"; repo = "mapbox_earcut_python"; tag = "v${version}"; - hash = "sha256-2dUZ78yWSudjozV2zIRNQgUeaNrkL+NXnF51q4T+dRU="; + hash = "sha256-R5YDJbfDNf6jAvG3VJQMYay6i8dw616SUs0tPgrJt6I="; }; build-system = [ - pybind11 + nanobind scikit-build-core ]; @@ -44,6 +44,10 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + preCheck = '' + rm -rf mapbox_earcut + ''; + pythonImportsCheck = [ "mapbox_earcut" ]; meta = { diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index b93886a5f17a..4a5463ee2faa 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -32,13 +32,13 @@ buildPythonPackage rec { pname = "marimo"; - version = "0.15.2"; + version = "0.19.4"; pyproject = true; # The github archive does not include the static assets src = fetchPypi { inherit pname version; - hash = "sha256-cmkz/ZyVYfpz4yOxghsXPF4PhRluwqSXo1CcwvwkXFg="; + hash = "sha256-7sO3ZcP9mNY+IBfFagJOd5ppI8tW52gueIdtT+SUCbc="; }; patches = [ diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix index 23854dc060bc..226b2465b612 100644 --- a/pkgs/development/python-modules/markdown/default.nix +++ b/pkgs/development/python-modules/markdown/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "markdown"; - version = "3.10.0"; + version = "3.10.1"; pyproject = true; src = fetchFromGitHub { owner = "Python-Markdown"; repo = "markdown"; tag = version; - hash = "sha256-GqYmlSNCJ8qLz4uJBJJAkiMwa+Q96f1S0jPuHrHwqpE="; + hash = "sha256-WBkWB91wq4er+SDMW2pbl6PYCxIE/rzuqREc4Jy0wDE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/marko/default.nix b/pkgs/development/python-modules/marko/default.nix index 70ab8cbb3b43..e85ca6a0caf1 100644 --- a/pkgs/development/python-modules/marko/default.nix +++ b/pkgs/development/python-modules/marko/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "marko"; - version = "2.2.0"; + version = "2.2.2"; pyproject = true; src = fetchFromGitHub { owner = "frostming"; repo = "marko"; tag = "v${version}"; - hash = "sha256-3ACZdroZzp/ld/MgH/2QAQ3hdFbwSW66Wkdb7N3V2Ds="; + hash = "sha256-gJmxYURSvh8Gd3pboGJGkPhIBeViX0apvummoDhPqfk="; }; build-system = [ diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index e6cae12601b0..a76693c0b793 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "marshmallow"; - version = "4.1.2"; + version = "4.2.0"; pyproject = true; src = fetchFromGitHub { owner = "marshmallow-code"; repo = "marshmallow"; tag = version; - hash = "sha256-qEjq1tEWoYqlN7L/cECnpFGPinSdZXexJHZfXreLAZc="; + hash = "sha256-UrkaKQUZ4fjemaAqd+T5nD5S1vuS1AS1CNZVDhJY9Y8="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/matplotlib-inline/default.nix b/pkgs/development/python-modules/matplotlib-inline/default.nix index a93b0e5d17bd..f1c2c27c7145 100644 --- a/pkgs/development/python-modules/matplotlib-inline/default.nix +++ b/pkgs/development/python-modules/matplotlib-inline/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - setuptools, + flit-core, traitlets, # tests @@ -11,17 +11,17 @@ buildPythonPackage rec { pname = "matplotlib-inline"; - version = "0.1.7"; + version = "0.2.1"; pyproject = true; src = fetchFromGitHub { owner = "ipython"; repo = "matplotlib-inline"; tag = version; - hash = "sha256-y7T8BshNa8NVWzH8oLS4dTAyhG+YmkkYQJFAyMXsJFA="; + hash = "sha256-qExS0SsbnYgu0wFTew90z5QwPyJ+UWGVEgFURSMedSY="; }; - build-system = [ setuptools ]; + build-system = [ flit-core ]; dependencies = [ traitlets ]; diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index c733274ab686..d07dfb2c0254 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -76,13 +76,13 @@ let in buildPythonPackage rec { - version = "3.10.5"; + version = "3.10.8"; pname = "matplotlib"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-NS7WzPt5mKAIgWkvOLTKCDxpHT4nW0FFQjcEw0yQkHY="; + hash = "sha256-Ipk3LBnVa801zwWic4MIdY0yuertI3GJjY9b0z8ISqM="; }; env.XDG_RUNTIME_DIR = "/tmp"; diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index 7763f318c4c3..69caaedc1126 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -18,30 +18,22 @@ aiosqlite, asyncpg, ruamel-yaml, - fetchpatch, withOlm ? false, }: buildPythonPackage rec { pname = "mautrix"; - version = "0.20.8"; + version = "0.21.0"; pyproject = true; src = fetchFromGitHub { owner = "mautrix"; repo = "python"; tag = "v${version}"; - hash = "sha256-giK8JZ6nzsA8SV6CzDNEbJmbwDju9t6fLJr/oXNjvKs="; + hash = "sha256-4nEjKIWzXd0e/cLL4py9SS+/YIcGHq2f+cCTEY2ENmE="; }; - patches = [ - (fetchpatch { - url = "https://github.com/mautrix/python/commit/0349445bd6992ac8f294582e85c3f61ce5c863b3.patch"; - hash = "sha256-JYuFuzdwnyOdnxWg094uVKcaGza6I6hNUXUp75msRTI="; - }) - ]; - build-system = [ setuptools ]; dependencies = [ @@ -75,7 +67,7 @@ buildPythonPackage rec { meta = { description = "Asyncio Matrix framework"; homepage = "https://github.com/tulir/mautrix-python"; - changelog = "https://github.com/mautrix/python/releases/tag/v${version}"; + changelog = "https://github.com/mautrix/python/releases/tag/${src.tag}"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ nyanloutre diff --git a/pkgs/development/python-modules/maxminddb/default.nix b/pkgs/development/python-modules/maxminddb/default.nix index 1b525288d295..2e3e5d65e041 100644 --- a/pkgs/development/python-modules/maxminddb/default.nix +++ b/pkgs/development/python-modules/maxminddb/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "maxminddb"; - version = "2.8.2"; + version = "3.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-JqjlNiKNjMKMW49XSlcaJwS+/OOzaM7KWTp21WtlkPk="; + hash = "sha256-l5KxliWUXf8Ubi4xh/nkcLgjMKkS986lWBuL1a8w2os="; }; buildInputs = [ libmaxminddb ]; diff --git a/pkgs/development/python-modules/md-toc/default.nix b/pkgs/development/python-modules/md-toc/default.nix index 9eb6421b2360..ac469ca14ea4 100644 --- a/pkgs/development/python-modules/md-toc/default.nix +++ b/pkgs/development/python-modules/md-toc/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "md-toc"; - version = "8.2.3"; + version = "9.0.0"; pyproject = true; src = fetchFromGitHub { owner = "frnmst"; repo = "md-toc"; tag = version; - hash = "sha256-nKkKtLEW0pohXiMtjWl2Kzh7SRwZJ/yzhXpDyluLodc="; + hash = "sha256-YVDFYxxKMKOrHyymewLTTkmBgg6YVqWou4hTKHJmbOg="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/md2pdf/default.nix b/pkgs/development/python-modules/md2pdf/default.nix index e3cdf1cfe9b8..ba17df6e1393 100644 --- a/pkgs/development/python-modules/md2pdf/default.nix +++ b/pkgs/development/python-modules/md2pdf/default.nix @@ -1,6 +1,5 @@ { buildPythonPackage, - click, fetchFromGitHub, hatchling, jinja2, @@ -8,28 +7,30 @@ markdown, pygments, pymdown-extensions, + pypdf, pytest-cov-stub, pytestCheckHook, python-frontmatter, + typer, + watchfiles, weasyprint, }: buildPythonPackage rec { pname = "md2pdf"; - version = "2.0.0"; + version = "3.1.0"; pyproject = true; src = fetchFromGitHub { owner = "jmaupetit"; repo = "md2pdf"; tag = "v${version}"; - hash = "sha256-Do4GW3Z1LmcFSOSCQ0ESztJSrtaNp+2gfci2tDH3+E8="; + hash = "sha256-ksccl9K0o0mZleyLe1K1ob78W2MKZksTFtu6/dZUWeg="; }; build-system = [ hatchling ]; dependencies = [ - click jinja2 markdown pygments @@ -38,17 +39,37 @@ buildPythonPackage rec { weasyprint ]; + optional-dependencies = { + cli = [ + typer + watchfiles + ]; + latex = [ + # FIXME package markdown-latex + ]; + }; + pythonImportsCheck = [ "md2pdf" ]; nativeCheckInputs = [ + pypdf pytest-cov-stub pytestCheckHook - ]; + ] + ++ lib.concatAttrValues optional-dependencies; preCheck = '' export PATH="$out/bin:$PATH" ''; + disabledTests = [ + # AssertionError caused by + # glyph rendered for Unicode string unsupported by fonts: "👋" (U+1F44B) + "test_generate_pdf_with_jinja_context_input" + "test_generate_pdf_with_jinja_frontmatter_and_context_input" + "test_generate_pdf_with_jinja_frontmatter_input" + ]; + meta = { changelog = "https://github.com/jmaupetit/md2pdf/blob/${src.tag}/CHANGELOG.md"; description = "Markdown to PDF conversion tool"; diff --git a/pkgs/development/python-modules/mdformat-toc/default.nix b/pkgs/development/python-modules/mdformat-toc/default.nix index 9d399dac5b58..f1929b1191f7 100644 --- a/pkgs/development/python-modules/mdformat-toc/default.nix +++ b/pkgs/development/python-modules/mdformat-toc/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "mdformat-toc"; - version = "0.3.0"; + version = "0.5.0"; pyproject = true; src = fetchFromGitHub { owner = "hukkin"; repo = "mdformat-toc"; tag = version; - hash = "sha256-3EX6kGez408tEYiR9VSvi3GTrb4ds+HJwpFflv77nkg="; + hash = "sha256-Rj1lp5Ub+UriOuE896tywN4myovna2RLYO3LRa96FCM="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/mdtraj/default.nix b/pkgs/development/python-modules/mdtraj/default.nix index 54292509ab70..d4632b852af6 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.11.0"; + version = "1.11.1"; pyproject = true; src = fetchFromGitHub { owner = "mdtraj"; repo = "mdtraj"; tag = version; - hash = "sha256-Re8noXZGT+WEW8HzdoHSsr52R06TzLPzfPzHdvweRdQ="; + hash = "sha256-xSXfV/lrUy33RSOpz3FsX5HP1Wr84rKCYmEKNVVnQao="; }; patches = [ diff --git a/pkgs/development/python-modules/mediafile/default.nix b/pkgs/development/python-modules/mediafile/default.nix index 8c3892461ca2..ceef20eb37f0 100644 --- a/pkgs/development/python-modules/mediafile/default.nix +++ b/pkgs/development/python-modules/mediafile/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - flit-core, + poetry-core, filetype, mutagen, pytestCheckHook, @@ -10,17 +10,17 @@ buildPythonPackage rec { pname = "mediafile"; - version = "0.13.0"; + version = "0.14.0"; pyproject = true; src = fetchFromGitHub { owner = "beetbox"; repo = "mediafile"; tag = "v${version}"; - hash = "sha256-Knp91nVPFkE2qYSZoWcOsMBNY+OBfWCPPNn+T1L8v0o="; + hash = "sha256-D5LRGncdeGcmJkrHVvI2cevov4SFO0wuhLxMqP+Ryb8="; }; - build-system = [ flit-core ]; + build-system = [ poetry-core ]; dependencies = [ filetype diff --git a/pkgs/development/python-modules/mediapy/default.nix b/pkgs/development/python-modules/mediapy/default.nix index e43b46ddccdc..de5dc2ed90eb 100644 --- a/pkgs/development/python-modules/mediapy/default.nix +++ b/pkgs/development/python-modules/mediapy/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "mediapy"; - version = "1.2.4"; + version = "1.2.5"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-BSlHpnbr00kTWaaUOxRFWf3EFPdBsDoFx4+ntikeaxI="; + hash = "sha256-LHpMUXBLJmQnNxkKbl++qCYLAn/enZnGRKZwJVquhg8="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/meraki/default.nix b/pkgs/development/python-modules/meraki/default.nix index a43e59c0c3db..53c4e96a37aa 100644 --- a/pkgs/development/python-modules/meraki/default.nix +++ b/pkgs/development/python-modules/meraki/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "meraki"; - version = "2.0.3"; + version = "2.1.0"; pyproject = true; src = fetchFromGitHub { owner = "meraki"; repo = "dashboard-api-python"; tag = version; - hash = "sha256-dAy295DB213TotVkVGvLYIzzHk1M9PycMNgyX+wD7ms="; + hash = "sha256-B9eda7ccpCRGuBB2XfRI/Fz+MVBUIjFZzHYWfckQT2g="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/merge3/default.nix b/pkgs/development/python-modules/merge3/default.nix index d16bd6e9e5ce..0d18d729e320 100644 --- a/pkgs/development/python-modules/merge3/default.nix +++ b/pkgs/development/python-modules/merge3/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "merge3"; - version = "0.0.15"; + version = "0.0.16"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-0+rCE9hNVt/J45VSrIJGx4YKlAlk6+7YqL5EIvZJK68="; + hash = "sha256-CFLeQ4HLRr5e9O1J46wgxaSgzUao/0u7hwvCeqtUMwY="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/meshcore/default.nix b/pkgs/development/python-modules/meshcore/default.nix index 1545c54d96dd..3a45c35ad729 100644 --- a/pkgs/development/python-modules/meshcore/default.nix +++ b/pkgs/development/python-modules/meshcore/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "meshcore"; - version = "2.2.4"; + version = "2.2.5"; pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "sha256-uI61YDj1zYNsdcUZ2VoHQz0Xr5ja/tNH6UyBUjL8B6w="; + sha256 = "sha256-FYGBUKaoOAiDwrJyNW+rrQurEH87lDjP1mW8nKA9HRc="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/meson-python/default.nix b/pkgs/development/python-modules/meson-python/default.nix index 261d58b12e41..35e9e0c350b4 100644 --- a/pkgs/development/python-modules/meson-python/default.nix +++ b/pkgs/development/python-modules/meson-python/default.nix @@ -11,6 +11,7 @@ pyproject-metadata, # tests + cmake, cython, gitMinimal, pytestCheckHook, @@ -19,23 +20,15 @@ buildPythonPackage rec { pname = "meson-python"; - version = "0.18.0"; + version = "0.19.0"; pyproject = true; src = fetchPypi { inherit version; pname = "meson_python"; - hash = "sha256-xWqZ7J32aaQGYv5GlgMhr25LFBBsFNsihwnBYo4jhI0="; + hash = "sha256-mVnRmKpptX/P01SjRRjG95W3gac+0GVvTQFmAWDMJVM="; }; - patches = [ - (fetchpatch { - # TODO: Remove in 0.19.0 - url = "https://github.com/mesonbuild/meson-python/commit/1e69e7a23f2b24d688dc4220e93de6f0e2bcf9d2.patch"; - hash = "sha256-FC2ll/OrLV1R0CDB6UkrknVASJQ7rSU+sApdAk75x44="; - }) - ]; - build-system = [ meson ninja @@ -49,12 +42,15 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + cmake cython gitMinimal pytestCheckHook pytest-mock ]; + dontUseCmakeConfigure = true; + # meson-python respectes MACOSX_DEPLOYMENT_TARGET, but compares it with the # actual platform version during tests, which mismatches. # https://github.com/mesonbuild/meson-python/issues/760 diff --git a/pkgs/development/python-modules/meteo-lt-pkg/default.nix b/pkgs/development/python-modules/meteo-lt-pkg/default.nix index dd1639485fce..6b556f7a5e82 100644 --- a/pkgs/development/python-modules/meteo-lt-pkg/default.nix +++ b/pkgs/development/python-modules/meteo-lt-pkg/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "meteo-lt-pkg"; - version = "0.2.4"; + version = "0.4.0"; pyproject = true; src = fetchFromGitHub { owner = "Brunas"; repo = "meteo_lt-pkg"; tag = "v${version}"; - hash = "sha256-OjIBgIOSJ65ryIF4D/UUUa1Oq0sPkKnaQEJeviimqhE="; + hash = "sha256-JYuWO9w0JHjmx4pnjh/WSKJNxVePkqWzPew0wd06uJ8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/mindsdb-evaluator/default.nix b/pkgs/development/python-modules/mindsdb-evaluator/default.nix index a90cf30825e5..b31f3bd509be 100644 --- a/pkgs/development/python-modules/mindsdb-evaluator/default.nix +++ b/pkgs/development/python-modules/mindsdb-evaluator/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "mindsdb-evaluator"; - version = "0.0.20"; + version = "0.0.21"; pyproject = true; src = fetchFromGitHub { owner = "mindsdb"; repo = "mindsdb_evaluator"; tag = "v${version}"; - hash = "sha256-ZeJABMbyRdGrZGkWWXcjleOeDQBSicGR06hZAPUKvgI="; + hash = "sha256-eUdGtHLbI6T7HsUqkVkTp040pbq7qVzgaldQxPAzjTc="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/minexr/default.nix b/pkgs/development/python-modules/minexr/default.nix index 48dbc0ed2b73..3a8435e72744 100644 --- a/pkgs/development/python-modules/minexr/default.nix +++ b/pkgs/development/python-modules/minexr/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "minexr"; - version = "1.0.1"; + version = "1.0.2"; format = "setuptools"; src = fetchFromGitHub { owner = "cheind"; repo = "py-minexr"; - rev = "v${version}"; - hash = "sha256-Om67ttAHxu7C3IwPB+JHYi78E9qBi1E6layMVg4+S3M="; + tag = version; + hash = "sha256-p42rlhaHq0A9+zk6c0evRDjNR1H/ruWJqPF5+nCTR8o="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/mirakuru/default.nix b/pkgs/development/python-modules/mirakuru/default.nix index aba0bb7a4920..dc4aeeb39041 100644 --- a/pkgs/development/python-modules/mirakuru/default.nix +++ b/pkgs/development/python-modules/mirakuru/default.nix @@ -5,6 +5,7 @@ fetchFromGitHub, pytestCheckHook, pytest-rerunfailures, + pytest-xdist, setuptools, psutil, netcat, @@ -14,14 +15,14 @@ buildPythonPackage rec { pname = "mirakuru"; - version = "2.6.0"; + version = "3.0.1"; pyproject = true; src = fetchFromGitHub { owner = "ClearcodeHQ"; repo = "mirakuru"; tag = "v${version}"; - hash = "sha256-R5prLIub2kVhsKRGWbZMf/v0U7oOBieoLiHwMRDEs0I="; + hash = "sha256-3WyjvHxr+6kG+cLSCEZkHoA70mSoT66ubmp0W9g2yJM="; }; build-system = [ setuptools ]; @@ -33,9 +34,13 @@ buildPythonPackage rec { ps python-daemon pytest-rerunfailures + pytest-xdist pytestCheckHook ]; + # socket bind races, but requires xdist_group + dontUsePytestXdist = true; + pythonImportsCheck = [ "mirakuru" ]; # Necessary for the tests to pass on Darwin with sandbox enabled. @@ -57,7 +62,7 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/dbfixtures/mirakuru"; description = "Process orchestration tool designed for functional and integration tests"; - changelog = "https://github.com/ClearcodeHQ/mirakuru/blob/v${version}/CHANGES.rst"; + changelog = "https://github.com/ClearcodeHQ/mirakuru/blob/${src.tag}/CHANGES.rst"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/mistletoe/default.nix b/pkgs/development/python-modules/mistletoe/default.nix index bd588b73787d..c1497b121808 100644 --- a/pkgs/development/python-modules/mistletoe/default.nix +++ b/pkgs/development/python-modules/mistletoe/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "mistletoe"; - version = "1.4.0"; + version = "1.5.1"; format = "setuptools"; src = fetchFromGitHub { owner = "miyuchina"; repo = "mistletoe"; tag = "v${version}"; - hash = "sha256-jFU16vdASGVSPq+TJ/6cN7IGkE/61SL9BWCOPsVqNaU="; + hash = "sha256-h2gKvh3P4pUUPwVYTIjz43/3CwZdWbhO3aJnwFBNR+Q="; }; pythonImportsCheck = [ "mistletoe" ]; @@ -31,7 +31,7 @@ buildPythonPackage rec { description = "Fast and extensible Markdown parser"; mainProgram = "mistletoe"; homepage = "https://github.com/miyuchina/mistletoe"; - changelog = "https://github.com/miyuchina/mistletoe/releases/tag/v${version}"; + changelog = "https://github.com/miyuchina/mistletoe/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ eadwu ]; }; diff --git a/pkgs/development/python-modules/mistune/default.nix b/pkgs/development/python-modules/mistune/default.nix index 724fe7fbbbd0..a130857e1a71 100644 --- a/pkgs/development/python-modules/mistune/default.nix +++ b/pkgs/development/python-modules/mistune/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mistune"; - version = "3.1.4"; + version = "3.2.0"; pyproject = true; src = fetchFromGitHub { owner = "lepture"; repo = "mistune"; tag = "v${version}"; - hash = "sha256-mCqOcLrgLtUL1le82Y+QVqqXGq+n0ZY76hqtyJsCKhE="; + hash = "sha256-rUEZNVuMT5+GsMakrkK6rshKSKtTTN72kK92AmQ8bl8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/mixpanel/default.nix b/pkgs/development/python-modules/mixpanel/default.nix index 5f232d58047b..275c23b1a0c6 100644 --- a/pkgs/development/python-modules/mixpanel/default.nix +++ b/pkgs/development/python-modules/mixpanel/default.nix @@ -3,37 +3,48 @@ fetchFromGitHub, lib, - # Python Dependencies - six, - urllib3, + # build-system + setuptools, + + # dependencies + asgiref, + httpx, + pydantic, requests, # tests + pytest-asyncio, pytestCheckHook, responses, + respx, }: buildPythonPackage rec { pname = "mixpanel"; - version = "4.10.1"; - format = "setuptools"; + version = "5.0.0"; + pyproject = true; src = fetchFromGitHub { owner = "mixpanel"; repo = "mixpanel-python"; tag = "v${version}"; - hash = "sha256-i5vT5FTnw+BanHHrlRsPJ3EooZjQcaosbaHoh/uPRmQ="; + hash = "sha256-Q8Kn2dyID1hYjKmEv0e+R/y5dsp/JEkqCdNqQHJsOrI="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ + asgiref + httpx + pydantic requests - six - urllib3 ]; nativeCheckInputs = [ + pytest-asyncio pytestCheckHook responses + respx ]; meta = { diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index dc191c126b2d..5c3f2b43c712 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "mkdocs-material"; - version = "9.7.0"; + version = "9.7.1"; pyproject = true; src = fetchFromGitHub { owner = "squidfunk"; repo = "mkdocs-material"; tag = version; - hash = "sha256-lZ2GDB8Kb25GYVNZ+6vDbJVj7dYBVk3r6Lm3mRXVzc4="; + hash = "sha256-+DMxYTj3PYjhv3M3XQS+XgLRSMFAfFeZYiMEzl7Wo6o="; }; build-system = [ diff --git a/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix b/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix index 085773cd0459..8681e1697c13 100644 --- a/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "mkdocs-rss-plugin"; - version = "1.17.4"; + version = "1.17.9"; pyproject = true; src = fetchFromGitHub { owner = "Guts"; repo = "mkdocs-rss-plugin"; tag = version; - hash = "sha256-K+cqBJmTz4WzkeXp3pGQoizfLMuxR17Q33Fc0xc5eWo="; + hash = "sha256-rUMjS0+895SsU7qNckLL3BprUQa/3lJDjpwhMkF0jYg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/mkdocs-simple-blog/default.nix b/pkgs/development/python-modules/mkdocs-simple-blog/default.nix index 2ca00316fd64..35331433d83d 100644 --- a/pkgs/development/python-modules/mkdocs-simple-blog/default.nix +++ b/pkgs/development/python-modules/mkdocs-simple-blog/default.nix @@ -7,14 +7,14 @@ }: buildPythonPackage rec { pname = "mkdocs-simple-blog"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { owner = "FernandoCelmer"; repo = "mkdocs-simple-blog"; tag = "v${version}"; - hash = "sha256-pzoQb5cBzd7Gt2jbai4cr37i5n30y0lfaukhQETSsjA="; + hash = "sha256-1RzorEsGXA8mRzMSS9S5vbPqJXK0vPMlRixo+Yrq27U="; }; build-system = [ setuptools ]; @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = { description = "Simple blog generator plugin for MkDocs"; homepage = "https://fernandocelmer.github.io/mkdocs-simple-blog/"; - changelog = "https://github.com/FernandoCelmer/mkdocs-simple-blog/releases/tag/v${version}"; + changelog = "https://github.com/FernandoCelmer/mkdocs-simple-blog/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ guelakais ]; }; diff --git a/pkgs/development/python-modules/mkl-service/default.nix b/pkgs/development/python-modules/mkl-service/default.nix index 7131fbcaf605..792f0cfe9863 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.5.2"; + version = "2.6.1"; pyproject = true; src = fetchFromGitHub { owner = "IntelPython"; repo = "mkl-service"; - tag = "v${version}"; - hash = "sha256-uP4TzBLhlpT83FIYCjolP3QN5/90YjBOnauy780gUJc="; + tag = version; + hash = "sha256-qiypoeCWUIghLmEYVOJaT4XUT7TNAJjWxnIq7HOZlkY="; }; build-system = [ diff --git a/pkgs/development/python-modules/ml-dtypes/default.nix b/pkgs/development/python-modules/ml-dtypes/default.nix index 5a6c426b2921..fb7f135e6462 100644 --- a/pkgs/development/python-modules/ml-dtypes/default.nix +++ b/pkgs/development/python-modules/ml-dtypes/default.nix @@ -30,6 +30,11 @@ buildPythonPackage rec { fetchSubmodules = true; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools~=" "setuptools>=" + ''; + build-system = [ setuptools ]; dependencies = [ numpy ]; diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 79cee0a8c20e..59f17be0867a 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -16,20 +16,24 @@ docker, fastapi, flask, + flask-cors, gitpython, graphene, gunicorn, + huey, importlib-metadata, jinja2, markdown, matplotlib, numpy, opentelemetry-api, + opentelemetry-proto, opentelemetry-sdk, packaging, pandas, protobuf, pyarrow, + python-dotenv, pyyaml, requests, scikit-learn, @@ -72,14 +76,14 @@ buildPythonPackage rec { pname = "mlflow"; - version = "3.3.1"; + version = "3.8.1"; pyproject = true; src = fetchFromGitHub { owner = "mlflow"; repo = "mlflow"; tag = "v${version}"; - hash = "sha256-5zObSnGx7+cCrqRfvcnprQN05NqVBCeWcAZEE1Jpeuo="; + hash = "sha256-QjRFQRShVjTnCN7/+LJ0iiB/h0+P4GJJV4RaviQdS2U="; }; pythonRelaxDeps = [ @@ -104,21 +108,25 @@ buildPythonPackage rec { docker fastapi flask + flask-cors gitpython graphene gunicorn + huey importlib-metadata jinja2 markdown matplotlib numpy opentelemetry-api + opentelemetry-proto opentelemetry-sdk packaging pandas protobuf pyarrow pydantic + python-dotenv pyyaml requests scikit-learn diff --git a/pkgs/development/python-modules/mlx-lm/default.nix b/pkgs/development/python-modules/mlx-lm/default.nix index 78abdade37e5..f1212400dd5e 100644 --- a/pkgs/development/python-modules/mlx-lm/default.nix +++ b/pkgs/development/python-modules/mlx-lm/default.nix @@ -24,14 +24,14 @@ buildPythonPackage (finalAttrs: { pname = "mlx-lm"; - version = "0.30.5"; + version = "0.30.7"; pyproject = true; src = fetchFromGitHub { owner = "ml-explore"; repo = "mlx-lm"; tag = "v${finalAttrs.version}"; - hash = "sha256-GXz9VtNJ0ldh8aDAyBvSR2DhZq/NctpPup58WLrIt6Y="; + hash = "sha256-Jc+JyReOH8Wja8sh9BvOO6X090xutKrVSbv+lEODPls="; }; build-system = [ diff --git a/pkgs/development/python-modules/mlxtend/default.nix b/pkgs/development/python-modules/mlxtend/default.nix index 8771435d892f..c6ff6cfdbd23 100644 --- a/pkgs/development/python-modules/mlxtend/default.nix +++ b/pkgs/development/python-modules/mlxtend/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "mlxtend"; - version = "0.23.4"; + version = "0.24.0"; pyproject = true; disabled = isPy27; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "rasbt"; repo = "mlxtend"; tag = "v${version}"; - hash = "sha256-xoAHYRmqN5SrEWlc18ntTZ6WAznBlVZdf+x5Yev3ysE="; + hash = "sha256-zDMFfm8VqEfAQd11PZNp7HsoLcqrj3nMqnvKhXaeA04="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/mobi/default.nix b/pkgs/development/python-modules/mobi/default.nix index ad16c1a23b05..c5e5d1e898c4 100644 --- a/pkgs/development/python-modules/mobi/default.nix +++ b/pkgs/development/python-modules/mobi/default.nix @@ -3,33 +3,35 @@ buildPythonPackage, fetchFromGitHub, loguru, - poetry-core, - setuptools, + hatchling, standard-imghdr, + pytestCheckHook, }: buildPythonPackage rec { pname = "mobi"; - version = "0.3.3"; + version = "0.4.1"; pyproject = true; src = fetchFromGitHub { owner = "iscc"; repo = "mobi"; tag = "v${version}"; - hash = "sha256-g1L72MkJdrKQRsEdew+Qsn8LfCn8+cmj2pmY6s4nv2U="; + hash = "sha256-Hbw4TX/yKkuxYQ9vZZp/wasDCop8pvyQc5zWloMQbng="; }; + build-system = [ hatchling ]; + pythonRelaxDeps = [ "loguru" ]; - dependencies = [ standard-imghdr ]; - - nativeBuildInputs = [ - poetry-core - setuptools + dependencies = [ + loguru + standard-imghdr ]; - propagatedBuildInputs = [ loguru ]; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "mobi" ]; diff --git a/pkgs/development/python-modules/mockfs/default.nix b/pkgs/development/python-modules/mockfs/default.nix index 852fd1defb8a..e7ff0b0c61fc 100644 --- a/pkgs/development/python-modules/mockfs/default.nix +++ b/pkgs/development/python-modules/mockfs/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "mockfs"; - version = "1.1.4"; + version = "2.0.2"; pyproject = true; src = fetchFromGitHub { owner = "mockfs"; repo = "mockfs"; - rev = "v${version}"; - hash = "sha256-JwSkOI0dz9ZetfE0ZL3CthvcCSXGFYX+yQZy/oC6VBk="; + tag = "v${version}"; + hash = "sha256-fTN9HLzlVCn0O8nYy4UUM+JIsYJ3qDPw3h41yhcilJ8="; }; postPatch = '' @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = { description = "Simple mock filesystem for use in unit tests"; homepage = "https://github.com/mockfs/mockfs"; - changelog = "https://github.com/mockfs/mockfs/blob/${src.rev}/CHANGES.rst"; + changelog = "https://github.com/mockfs/mockfs/blob/${src.tag}/CHANGES.rst"; license = lib.licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/momepy/default.nix b/pkgs/development/python-modules/momepy/default.nix index 6ff60ac39ab8..f024c7ae5372 100644 --- a/pkgs/development/python-modules/momepy/default.nix +++ b/pkgs/development/python-modules/momepy/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "momepy"; - version = "0.10.0"; + version = "0.11.0"; pyproject = true; src = fetchFromGitHub { owner = "pysal"; repo = "momepy"; tag = "v${version}"; - hash = "sha256-9A1g2WSH1kIXO/BeF8ebcigshfcR8MrT2Ut5K/oxVM4="; + hash = "sha256-Og7W+35k9HIIEFGcDmsxggb1BT5cwnaMIi3HO3VRAX0="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix index 326c44d761df..ed87a53aac5e 100644 --- a/pkgs/development/python-modules/more-itertools/default.nix +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "more-itertools"; - version = "10.7.0"; + version = "10.8.0"; pyproject = true; src = fetchFromGitHub { owner = "more-itertools"; repo = "more-itertools"; tag = "v${version}"; - hash = "sha256-4ZzuWVRrihhEoYRDAoYLZINR11iHs0sXF/bRm6gQoEA="; + hash = "sha256-ZKvucnPFCA6Q4EQn/nKC9LIevOdSYXHIJ3w3Frregic="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/morecantile/default.nix b/pkgs/development/python-modules/morecantile/default.nix index c013377c3143..3b4322d27bb6 100644 --- a/pkgs/development/python-modules/morecantile/default.nix +++ b/pkgs/development/python-modules/morecantile/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "morecantile"; - version = "6.2.0"; + version = "7.0.2"; pyproject = true; src = fetchFromGitHub { owner = "developmentseed"; repo = "morecantile"; tag = version; - hash = "sha256-ohTSgkjgaANS/Pli4fao+THA4ltts6svj5CdJEgorz0="; + hash = "sha256-VDe39J4z5aSmdARaYknon4BK7OpovEzni0OVCxKRAkE="; }; build-system = [ flit ]; diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 406037dfcfc8..20c817a47442 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -29,6 +29,7 @@ pyyaml, requests, responses, + sagemaker, setuptools, werkzeug, xmltodict, @@ -36,14 +37,14 @@ buildPythonPackage rec { pname = "moto"; - version = "5.1.11"; + version = "5.1.20"; pyproject = true; src = fetchFromGitHub { owner = "getmoto"; repo = "moto"; tag = version; - hash = "sha256-krZrPzH8/pOGvQTcofT2TzyytDXs9FTpqh9JK0QN44E="; + hash = "sha256-YYRXGsdAsPk/0U8VTOBBTBs84xjskar1IczWOxoEFLQ="; }; build-system = [ @@ -297,6 +298,7 @@ buildPythonPackage rec { pytest-order pytest-xdist pytestCheckHook + sagemaker ] ++ optional-dependencies.server; @@ -387,7 +389,7 @@ buildPythonPackage rec { meta = { description = "Allows your tests to easily mock out AWS Services"; homepage = "https://github.com/getmoto/moto"; - changelog = "https://github.com/getmoto/moto/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/getmoto/moto/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ onny ]; }; diff --git a/pkgs/development/python-modules/mozart-api/default.nix b/pkgs/development/python-modules/mozart-api/default.nix index 79b890ae60ca..7c6c36702e9a 100644 --- a/pkgs/development/python-modules/mozart-api/default.nix +++ b/pkgs/development/python-modules/mozart-api/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "mozart-api"; - version = "5.3.1.108.0"; + version = "5.3.1.108.1"; pyproject = true; src = fetchPypi { pname = "mozart_api"; inherit version; - hash = "sha256-12qjXQKQS3k1hDRLW0UkR5OqHM/QmXKOnfoJVguhHWQ="; + hash = "sha256-e4tlcwYC1AQA29uPg+UgFcy2ahIZuIaNlhicJiemVgo="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/mozilla-django-oidc/cryptography.patch b/pkgs/development/python-modules/mozilla-django-oidc/cryptography.patch deleted file mode 100644 index 2217168cc026..000000000000 --- a/pkgs/development/python-modules/mozilla-django-oidc/cryptography.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/tests/test_auth.py -+++ b/tests/test_auth.py -@@ -1234,7 +1234,7 @@ class OIDCAuthenticationBackendES256WithJwksEndpointTestCase(TestCase): - self.backend = OIDCAuthenticationBackend() - - # Generate a private key to create a test token with -- private_key = ec.generate_private_key(ec.SECP256R1, default_backend()) -+ private_key = ec.generate_private_key(ec.SECP256R1(), default_backend()) - private_key_pem = private_key.private_bytes( - serialization.Encoding.PEM, - serialization.PrivateFormat.PKCS8, diff --git a/pkgs/development/python-modules/mozilla-django-oidc/default.nix b/pkgs/development/python-modules/mozilla-django-oidc/default.nix index d3eb5ead33d9..d2ef30891c07 100644 --- a/pkgs/development/python-modules/mozilla-django-oidc/default.nix +++ b/pkgs/development/python-modules/mozilla-django-oidc/default.nix @@ -5,31 +5,32 @@ setuptools, djangorestframework, django, - josepy, + pyjwt, requests, cryptography, }: buildPythonPackage rec { pname = "mozilla-django-oidc"; - version = "4.0.1"; + version = "5.0.2"; pyproject = true; src = fetchFromGitHub { owner = "mozilla"; repo = "mozilla-django-oidc"; - rev = version; - hash = "sha256-72F1aLLIId+YClTrpOz3bL8LSq6ZhZjjtv8V/GJGkqs="; + tag = version; + hash = "sha256-5J2lzGGdjoXzdzfKdmfUaSM7KQ6Hn7KerBtoKzFsZfY="; }; - # Fix test with latest cryptography - # Upstream PR: https://github.com/mozilla/mozilla-django-oidc/pull/556 - patches = [ - ./cryptography.patch + build-system = [ + setuptools ]; - nativeBuildInputs = [ - setuptools + dependencies = [ + django + pyjwt + requests + cryptography ]; nativeCheckInputs = [ @@ -44,17 +45,10 @@ buildPythonPackage rec { runHook postCheck ''; - dependencies = [ - django - josepy - requests - cryptography - ]; - meta = { description = "Django OpenID Connect library"; homepage = "https://github.com/mozilla/mozilla-django-oidc"; - changelog = "https://github.com/mozilla/mozilla-django-oidc/releases/tag/${src.rev}"; + changelog = "https://github.com/mozilla/mozilla-django-oidc/releases/tag/${src.tag}"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ felbinger ]; }; diff --git a/pkgs/development/python-modules/mplhep-data/default.nix b/pkgs/development/python-modules/mplhep-data/default.nix index 27c2399e2c7c..6f8d0f42716b 100644 --- a/pkgs/development/python-modules/mplhep-data/default.nix +++ b/pkgs/development/python-modules/mplhep-data/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "mplhep-data"; - version = "0.0.4"; + version = "0.0.5"; pyproject = true; src = fetchPypi { pname = "mplhep_data"; inherit version; - hash = "sha256-zR8606+dv/M67550BtITDWJKC9HVqllw/HE6ZCEWWk4="; + hash = "sha256-TlxOrj5CN2LrPUrVQgYPG+fxIsGKFxZPf8/tz5Q/rH0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mpv/default.nix b/pkgs/development/python-modules/mpv/default.nix index 0b66d508d1c3..a4076d57c0cd 100644 --- a/pkgs/development/python-modules/mpv/default.nix +++ b/pkgs/development/python-modules/mpv/default.nix @@ -3,41 +3,43 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch, mpv, setuptools, + pytestCheckHook, + pyvirtualdisplay, + xvfb, }: buildPythonPackage rec { pname = "mpv"; - version = "1.0.7"; + version = "1.0.8"; pyproject = true; src = fetchFromGitHub { owner = "jaseg"; repo = "python-mpv"; - rev = "v${version}"; - hash = "sha256-2sYWTzj7+ozezNX0uFdJW+A0K6bwAmiVvqo/lr9UToA="; + tag = "v${version}"; + hash = "sha256-MHdQnnjxnbOkIf56VLGi7vgNbrjhU/ODUBdZoXjxXxE="; }; - patches = [ - # https://github.com/jellyfin/jellyfin-mpv-shim/issues/448 - (fetchpatch { - url = "https://github.com/jaseg/python-mpv/commit/12850b34bd3b64704f8abd30341a647a73719267.patch"; - hash = "sha256-2O7w8PeWinCzrigGX3IV+9PVCtU9KCM2UJ32Y1kE6m0="; - }) - ]; - - nativeBuildInputs = [ setuptools ]; - - buildInputs = [ mpv ]; - postPatch = '' substituteInPlace mpv.py \ --replace-fail "sofile = ctypes.util.find_library('mpv')" \ 'sofile = "${mpv}/lib/libmpv${stdenv.hostPlatform.extensions.sharedLibrary}"' ''; + build-system = [ setuptools ]; + + buildInputs = [ mpv ]; + + nativeCheckInputs = [ + pytestCheckHook + pyvirtualdisplay + ] + ++ lib.optionals stdenv.isLinux [ + xvfb + ]; + pythonImportsCheck = [ "mpv" ]; meta = { diff --git a/pkgs/development/python-modules/mqtt2influxdb/default.nix b/pkgs/development/python-modules/mqtt2influxdb/default.nix index 64f4e0cf1d3b..23882c552314 100644 --- a/pkgs/development/python-modules/mqtt2influxdb/default.nix +++ b/pkgs/development/python-modules/mqtt2influxdb/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "mqtt2influxdb"; - version = "1.5.2"; + version = "2.0.6"; pyproject = true; src = fetchFromGitHub { owner = "hardwario"; repo = "bch-mqtt2influxdb"; tag = "v${version}"; - hash = "sha256-YDgMoxnH4vCCa7b857U6iVBhYLxk8ZjytGziryn24bg="; + hash = "sha256-DS1k3JcTUK0yXRkJSFMeIZHSXpiIgSXJPZb3+72Wqko="; }; postPatch = '' @@ -51,7 +51,7 @@ buildPythonPackage rec { meta = { description = "Flexible MQTT to InfluxDB Bridge"; homepage = "https://github.com/hardwario/bch-mqtt2influxdb"; - changelog = "https://github.com/hardwario/bch-mqtt2influxdb/releases/tag/v${version}"; + changelog = "https://github.com/hardwario/bch-mqtt2influxdb/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ cynerd ]; mainProgram = "mqtt2influxdb"; diff --git a/pkgs/development/python-modules/mrsqm/default.nix b/pkgs/development/python-modules/mrsqm/default.nix index 1cf61685cda8..e1c70f23bc72 100644 --- a/pkgs/development/python-modules/mrsqm/default.nix +++ b/pkgs/development/python-modules/mrsqm/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "mrsqm"; - version = "0.0.7"; + version = "4"; pyproject = true; build-system = [ @@ -25,8 +25,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 41f60f319432..cdb5e476e79c 100644 --- a/pkgs/development/python-modules/msal/default.nix +++ b/pkgs/development/python-modules/msal/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "msal"; - version = "1.33.0"; + version = "1.34.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-g2rYD6o+JafXEBXJkM5h9wSocyix5zvLsGI6GMvxdRA="; + hash = "sha256-drqDtxbqWm11sCecCsNToOBbggyh9mgsDrf0UZDEPC8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/msgpack/default.nix b/pkgs/development/python-modules/msgpack/default.nix index 7b7b43e2460a..a1c3b14b6303 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.1"; + version = "1.1.2"; pyproject = true; src = fetchFromGitHub { owner = "msgpack"; repo = "msgpack-python"; tag = "v${version}"; - hash = "sha256-j1MpdnfG6tCgAFlza64erMhJm/MkSK2QnixNv7MrQes="; + hash = "sha256-9iFTQPAM6AAogcRUoCw5/bECNiGUwmAarEiwMJ+rqbk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix index 703260e1e041..2120bed89958 100644 --- a/pkgs/development/python-modules/msgspec/default.nix +++ b/pkgs/development/python-modules/msgspec/default.nix @@ -13,6 +13,7 @@ pytest, pyyaml, setuptools, + setuptools-scm, sphinx, sphinx-copybutton, sphinx-design, @@ -21,7 +22,7 @@ buildPythonPackage rec { pname = "msgspec"; - version = "0.19.0"; + version = "0.20.0"; pyproject = true; src = fetchFromGitHub { @@ -32,10 +33,13 @@ buildPythonPackage rec { # use `$Format:%d$` in msgspec/_version.py, and GitHub produces different # tarballs depending on whether tagged commit is the last commit, see # https://github.com/NixOS/nixpkgs/issues/84312 - hash = "sha256-CajdPNAkssriY/sie5gR+4k31b3Wd7WzqcsFmrlSoPY="; + hash = "sha256-DWDmnSuo12oXl9NVfNhIOtWrQeJ9DMmHxOyHY33Datk="; }; - build-system = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; optional-dependencies = { dev = [ @@ -72,7 +76,7 @@ buildPythonPackage rec { meta = { description = "Module to handle JSON/MessagePack"; homepage = "https://github.com/jcrist/msgspec"; - changelog = "https://github.com/jcrist/msgspec/releases/tag/${version}"; + changelog = "https://github.com/jcrist/msgspec/releases/tag/${src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/msrest/default.nix b/pkgs/development/python-modules/msrest/default.nix index 228f55b547ad..83756a617e41 100644 --- a/pkgs/development/python-modules/msrest/default.nix +++ b/pkgs/development/python-modules/msrest/default.nix @@ -1,19 +1,25 @@ { lib, + buildPythonPackage, + fetchFromGitHub, + pythonAtLeast, + + # build-system + setuptools, + + # dependencies aiodns, aiohttp, azure-core, - buildPythonPackage, certifi, - fetchFromGitHub, - httpretty, isodate, - pytest-aiohttp, - pytestCheckHook, - pythonAtLeast, requests, requests-oauthlib, - setuptools, + + # tests + pytestCheckHook, + pytest-aiohttp, + httpretty, trio, }: @@ -25,17 +31,18 @@ buildPythonPackage { src = fetchFromGitHub { owner = "Azure"; repo = "msrest-for-python"; - # no tag for 0.7.1 + # no tag for 0.7.1 see: + # https://github.com/Azure/msrest-for-python/issues/254 rev = "2d8fd04f68a124d0f3df7b81584accc3270b1afc"; hash = "sha256-1EXXXflhDeU+erdI+NsWxSX76ooDTl3+MyQwRzm2xV0="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ - azure-core + dependencies = [ aiodns aiohttp + azure-core certifi isodate requests @@ -60,13 +67,23 @@ buildPythonPackage { "test_conf_async_trio_requests" ] ++ lib.optionals (pythonAtLeast "3.12") [ - # AttributeError: 'TestAuthentication' object has no attribute... + # See https://github.com/Azure/msrest-for-python/issues/261 + # Upstream ignores the following patch that should fix it: + # https://github.com/Azure/msrest-for-python/pull/262 + # And it doesn't apply anymore. "test_apikey_auth" "test_cs_auth" "test_eventgrid_auth" "test_eventgrid_domain_auth" ]; + disabledTestPaths = [ + # 2 AssertionErrors... See: + # https://github.com/Azure/msrest-for-python/issues/267 + "tests/asynctests/test_async_client.py::TestServiceClient::test_client_send" + "tests/test_client.py::TestServiceClient::test_client_send" + ]; + pythonImportsCheck = [ "msrest" ]; meta = { diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index c2e2f86000ad..52005f32ac10 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "multidict"; - version = "6.7.0"; + version = "6.7.1"; pyproject = true; src = fetchFromGitHub { owner = "aio-libs"; repo = "multidict"; tag = "v${version}"; - hash = "sha256-NEiUXHwY7bas7+Ddf9hdR6m/N+wbRG/NguoMROIWjeU="; + hash = "sha256-HOQRfSxf0+HeXsV4ShwfUDjNVyg2SjNuE157JLRlAL0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/multiprocess/default.nix b/pkgs/development/python-modules/multiprocess/default.nix index f08b76ddd02e..28c25a6bbb3e 100644 --- a/pkgs/development/python-modules/multiprocess/default.nix +++ b/pkgs/development/python-modules/multiprocess/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "multiprocess"; - version = "0.70.18"; + version = "0.70.19"; format = "setuptools"; src = fetchFromGitHub { owner = "uqfoundation"; repo = "multiprocess"; tag = version; - hash = "sha256-VDlbo+rXyOxY73JJz5SWEuq3lZLKWYKk9DKbHzpQesU="; + hash = "sha256-dH6SWecBxBQYqLohCg1gPWu6cQ7iKtRmIet9UlDMkWs="; }; propagatedBuildInputs = [ dill ]; diff --git a/pkgs/development/python-modules/multiscale-spatial-image/default.nix b/pkgs/development/python-modules/multiscale-spatial-image/default.nix index e2524919efb5..b946c4cfe038 100644 --- a/pkgs/development/python-modules/multiscale-spatial-image/default.nix +++ b/pkgs/development/python-modules/multiscale-spatial-image/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "multiscale-spatial-image"; - version = "2.0.3"; + version = "2.1.0"; pyproject = true; src = fetchFromGitHub { owner = "spatial-image"; repo = "multiscale-spatial-image"; tag = "v${version}"; - hash = "sha256-wKSzhlNXIXOFEK8+xfKF6zTFr0+mdFhhvjWiHAKphk0="; + hash = "sha256-uF9ZccLvP1ref6qn3l6EpedsoK29Q8lAdr68JjsYMis="; }; build-system = [ hatchling ]; @@ -71,7 +71,7 @@ buildPythonPackage rec { meta = { description = "Generate a multiscale, chunked, multi-dimensional spatial image data structure that can serialized to OME-NGFF"; homepage = "https://github.com/spatial-image/multiscale-spatial-image"; - changelog = "https://github.com/spatial-image/multiscale-spatial-image/releases/tag/v${version}"; + changelog = "https://github.com/spatial-image/multiscale-spatial-image/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix index a1a70f65192d..98f1e102b2d1 100644 --- a/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage, - fetchPypi, + fetchFromGitHub, grpcio-tools, lib, mypy-protobuf, @@ -11,14 +11,16 @@ types-protobuf, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mypy-protobuf"; - version = "3.6.0"; + version = "5.0.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-AvJC6zQJ9miJ8rGjqlg1bsTZCc3Q+TEVYi6ecDZuyjw="; + src = fetchFromGitHub { + owner = "nipunn1313"; + repo = "mypy-protobuf"; + rev = "47fa102ae5d2bd2a1fdde2adf94cf006a3e939a4"; # not tagged, but on pypi + hash = "sha256-VYDTJmiezHAVC3QV+HM7C5y5WaFvoInzupWhnB/iNgA="; }; pythonRelaxDeps = [ "protobuf" ]; @@ -43,11 +45,11 @@ buildPythonPackage rec { }; meta = { - changelog = "https://github.com/nipunn1313/mypy-protobuf/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/nipunn1313/mypy-protobuf/blob/v${finalAttrs.version}/CHANGELOG.md"; description = "Generate mypy stub files from protobuf specs"; homepage = "https://github.com/nipunn1313/mypy-protobuf"; license = lib.licenses.asl20; mainProgram = "protoc-gen-mypy"; maintainers = with lib.maintainers; [ lnl7 ]; }; -} +}) diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index 7912af69d1a3..e3cbdc382901 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -15,6 +15,7 @@ types-setuptools, # propagates + librt, mypy-extensions, tomli, typing-extensions, @@ -33,7 +34,7 @@ buildPythonPackage rec { pname = "mypy"; - version = "1.17.1"; + version = "1.19.1"; pyproject = true; # relies on several CPython internals @@ -43,18 +44,9 @@ buildPythonPackage rec { owner = "python"; repo = "mypy"; tag = "v${version}"; - hash = "sha256-FfONUCCMU1bJXHx3GHH46Tu+wYU5FLPOqeCSCi1bRSs="; + hash = "sha256-REUJgYd00qr36hoHevkJEWK/+2hE/caymjD/asqa6eI="; }; - patches = [ - # Fix the build on Darwin with a case‐sensitive store. - # Remove on next release. - (fetchpatch { - url = "https://github.com/python/mypy/commit/7534898319cb7f16738c11e4bc1bdcef0eb13c38.patch"; - hash = "sha256-5jD0JBRnirmoMlUz9+n8G4AqHqCi8BaUX5rEl9NnLts="; - }) - ]; - passthru.updateScript = gitUpdater { rev-prefix = "v"; }; @@ -69,6 +61,7 @@ buildPythonPackage rec { ]; dependencies = [ + librt mypy-extensions pathspec typing-extensions diff --git a/pkgs/development/python-modules/mysql-connector/0001-Revert-Fix-MacOS-wheels-platform-tag.patch b/pkgs/development/python-modules/mysql-connector/0001-Revert-Fix-MacOS-wheels-platform-tag.patch index 4b8e40d6588b..0e942f269f73 100644 --- a/pkgs/development/python-modules/mysql-connector/0001-Revert-Fix-MacOS-wheels-platform-tag.patch +++ b/pkgs/development/python-modules/mysql-connector/0001-Revert-Fix-MacOS-wheels-platform-tag.patch @@ -2,16 +2,16 @@ diff --git a/cpydist/__init__.py b/cpydist/__init__.py index 7fdbaf2..3c427da 100644 --- a/cpydist/__init__.py +++ b/cpydist/__init__.py -@@ -38,7 +38,7 @@ import tempfile +@@ -37,7 +37,7 @@ import tempfile from glob import glob from pathlib import Path - from subprocess import PIPE, Popen, check_call + from subprocess import PIPE, Popen -from sysconfig import get_config_vars, get_python_version +from sysconfig import get_python_version from setuptools import Command from setuptools.command.build_ext import build_ext -@@ -68,8 +68,6 @@ version_py = os.path.join("lib", "mysql", "connector", "version.py") +@@ -67,8 +67,6 @@ version_py = os.path.join("lib", "mysql", "connector", "version.py") with open(version_py, "rb") as fp: exec(compile(fp.read(), version_py, "exec")) @@ -19,4 +19,4 @@ index 7fdbaf2..3c427da 100644 - get_config_vars()["MACOSX_DEPLOYMENT_TARGET"] = "11.0" COMMON_USER_OPTIONS = [ - ( \ No newline at end of file + ( diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix index e342d1aa8e0f..87ee1887ed02 100644 --- a/pkgs/development/python-modules/mysql-connector/default.nix +++ b/pkgs/development/python-modules/mysql-connector/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mysql-connector"; - version = "8.0.33"; + version = "9.6.0"; format = "setuptools"; setupPyBuildFlags = [ @@ -25,10 +25,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mysql"; repo = "mysql-connector-python"; - rev = version; - hash = "sha256-GtMq7E2qBqFu54hjUotzPyxScTKXNdEQcmgHnS7lBhc="; + tag = version; + hash = "sha256-EwdJpiyplck26Tc9SiczxGieJ3GcTGMQva/fDzhzWn4="; }; + sourceRoot = "${src.name}/mysql-connector-python"; + patches = [ # mysql-connector overrides MACOSX_DEPLOYMENT_TARGET to 11. # This makes the installation with nixpkgs fail. I suspect, that's @@ -60,7 +62,7 @@ buildPythonPackage rec { implements the DB API v2.0 specification. ''; homepage = "https://github.com/mysql/mysql-connector-python"; - changelog = "https://raw.githubusercontent.com/mysql/mysql-connector-python/${version}/CHANGES.txt"; + changelog = "https://raw.githubusercontent.com/mysql/mysql-connector-python/${src.tag}/CHANGES.txt"; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ neosimsim diff --git a/pkgs/development/python-modules/myst-docutils/default.nix b/pkgs/development/python-modules/myst-docutils/default.nix index 6d13adde465a..2cf526518173 100644 --- a/pkgs/development/python-modules/myst-docutils/default.nix +++ b/pkgs/development/python-modules/myst-docutils/default.nix @@ -69,7 +69,7 @@ buildPythonPackage rec { meta = { description = "Extended commonmark compliant parser, with bridges to docutils/sphinx"; homepage = "https://github.com/executablebooks/MyST-Parser"; - changelog = "https://github.com/executablebooks/MyST-Parser/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/executablebooks/MyST-Parser/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/myst-parser/default.nix b/pkgs/development/python-modules/myst-parser/default.nix index b79a05db5375..bb91e8e228b1 100644 --- a/pkgs/development/python-modules/myst-parser/default.nix +++ b/pkgs/development/python-modules/myst-parser/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonOlder, # build-system flit-core, @@ -25,14 +26,16 @@ }: buildPythonPackage (finalAttrs: { pname = "myst-parser"; - version = "4.0.1"; + version = "5.0.0"; pyproject = true; + disabled = pythonOlder "3.11"; + src = fetchFromGitHub { owner = "executablebooks"; repo = "myst-parser"; tag = "v${finalAttrs.version}"; - hash = "sha256-/Prauz4zuJY39EK2BmgBbH1uwjF4K38e5X5hPYwRBl0="; + hash = "sha256-0lGejdGVVvZar3sPBbvThXzJML7PcR5+shyDHTTtVEY="; }; build-system = [ flit-core ]; @@ -60,15 +63,9 @@ buildPythonPackage (finalAttrs: { ] ++ markdown-it-py.optional-dependencies.linkify; - disabledTests = [ - # sphinx 8.2 compat - # https://github.com/executablebooks/MyST-Parser/issues/1030 - "test_commonmark" - "test_extended_syntaxes" - "test_fieldlist_extension" - "test_includes" - "test_references_singlehtml" - "test_sphinx_directives" + disabledTestPaths = [ + # outdated sphinx fixtures + "tests/test_renderers/test_fixtures_sphinx.py" ]; pythonImportsCheck = [ "myst_parser" ]; diff --git a/pkgs/development/python-modules/napalm/default.nix b/pkgs/development/python-modules/napalm/default.nix index bab62cb93601..b320922db902 100644 --- a/pkgs/development/python-modules/napalm/default.nix +++ b/pkgs/development/python-modules/napalm/default.nix @@ -32,31 +32,21 @@ mock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "napalm"; - version = "5.0.0"; + version = "5.1.0"; pyproject = true; src = fetchFromGitHub { owner = "napalm-automation"; repo = "napalm"; - tag = version; - hash = "sha256-Abw3h69qTFwOOFeAfivqAIWLozErJ1yZZfx7CbMy1AI="; + tag = finalAttrs.version; + hash = "sha256-kIQgr5W9xkdcQkscJkOiABJ5HBxZOT9D7jSKWGNoBGA="; }; - patches = [ - (fetchpatch { - url = "https://github.com/napalm-automation/napalm/commit/7e509869f7cb56892380629d1cb5f99e3e2c6190.patch"; - hash = "sha256-vJDACa5SmSJ/rcmKEow4Prqju/jYcCrzGpTdEYsAPq0="; - includes = [ - "napalm/ios/ios.py" - ]; - }) - ]; + build-system = [ setuptools ]; - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ + dependencies = [ cffi jinja2 junos-eznc @@ -89,4 +79,4 @@ buildPythonPackage rec { homepage = "https://github.com/napalm-automation/napalm"; license = lib.licenses.asl20; }; -} +}) diff --git a/pkgs/development/python-modules/narwhals/default.nix b/pkgs/development/python-modules/narwhals/default.nix index 33c0d42a2988..09c0e3768645 100644 --- a/pkgs/development/python-modules/narwhals/default.nix +++ b/pkgs/development/python-modules/narwhals/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "narwhals"; - version = "2.14.0"; + version = "2.16.0"; pyproject = true; src = fetchFromGitHub { owner = "narwhals-dev"; repo = "narwhals"; tag = "v${version}"; - hash = "sha256-5yynyaY5NuxSGEro4pDzFFkf0PsYArzlB23lXYmzydY="; + hash = "sha256-k7CeM8Q4JgKbkLisAaVrljro4diOf0K0immek6AI0vM="; }; build-system = [ hatchling ]; @@ -81,6 +81,10 @@ buildPythonPackage rec { # ibis improvements cause strict XPASS failures (tests expected to fail now pass) "test_empty_scalar_reduction_with_columns" "test_collect_empty" + "test_first_last_expr_over_order_by" + "test_first_expr_broadcasting" + # sqlframe improvements cause strict XPASS failures (tests expected to fail now pass) + "test_unique_expr" ]; disabledTestPaths = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index dcf3aecce1ee..64450a6901f8 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -19,14 +19,14 @@ let nbclient = buildPythonPackage rec { pname = "nbclient"; - version = "0.10.2"; + version = "0.10.4"; pyproject = true; src = fetchFromGitHub { owner = "jupyter"; repo = "nbclient"; tag = "v${version}"; - hash = "sha256-+qSed6yy4YVZ25GigNTap+kMaoDiMYSJO85wurbzeDs="; + hash = "sha256-D7pgrNRrPT0fGOaHrNt3qeDXdbt1wJk5qfkQeLxsc7g="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/pkgs/development/python-modules/nbsphinx/default.nix index 15434b8f4fee..22501d467876 100644 --- a/pkgs/development/python-modules/nbsphinx/default.nix +++ b/pkgs/development/python-modules/nbsphinx/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "nbsphinx"; - version = "0.9.7"; + version = "0.9.8"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-q9KYpobVX6iU72l8UdRPJOU6oxLa2uOOgpIPJQpUVv4="; + hash = "sha256-0HZZCDmajuK1e+euiBzy6ljWbbOve78z5utI+DvqVJU="; }; patches = [ (fetchpatch { diff --git a/pkgs/development/python-modules/nebula3-python/default.nix b/pkgs/development/python-modules/nebula3-python/default.nix index 115c9f11f898..29f054559f59 100644 --- a/pkgs/development/python-modules/nebula3-python/default.nix +++ b/pkgs/development/python-modules/nebula3-python/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "nebula3-python"; - version = "3.8.3"; + version = "5.2.0"; pyproject = true; src = fetchFromGitHub { owner = "vesoft-inc"; repo = "nebula-python"; - tag = "v${version}"; - hash = "sha256-p2dXpcOwVKbdfRKKTAc4LhaNuTjvPd8BBBI8aUivaZ4="; + tag = version; + hash = "sha256-WVbLywb/uVHWjtzXHSSlvBUwFz0p3VtiYwAl/0CcMDw="; }; build-system = [ pdm-backend ]; @@ -55,7 +55,7 @@ buildPythonPackage rec { meta = { description = "Client API of Nebula Graph in Python"; homepage = "https://github.com/vesoft-inc/nebula-python"; - changelog = "https://github.com/vesoft-inc/nebula-python/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/vesoft-inc/nebula-python/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/nested-multipart-parser/default.nix b/pkgs/development/python-modules/nested-multipart-parser/default.nix index d83060194d01..be8d2c9eb78d 100644 --- a/pkgs/development/python-modules/nested-multipart-parser/default.nix +++ b/pkgs/development/python-modules/nested-multipart-parser/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "nested-multipart-parser"; - version = "1.5.0"; + version = "1.6.0"; pyproject = true; src = fetchFromGitHub { owner = "remigermain"; repo = "nested-multipart-parser"; - tag = version; - hash = "sha256-9IGfYb6mVGkoE/6iDg0ap8c+0vrBDKK1DxzLRyfeWOk="; + tag = "v${version}"; + hash = "sha256-FFALem8Y43tKL32VSZE1pIlOKEPh5Ryzbu509Xjd+VY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/netbox-attachments/default.nix b/pkgs/development/python-modules/netbox-attachments/default.nix index f784719f2177..85b34faedfba 100644 --- a/pkgs/development/python-modules/netbox-attachments/default.nix +++ b/pkgs/development/python-modules/netbox-attachments/default.nix @@ -10,7 +10,7 @@ }: buildPythonPackage rec { pname = "netbox-attachments"; - version = "9.0.0"; + version = "10.0.1"; pyproject = true; disabled = python.pythonVersion != netbox.python.pythonVersion; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Kani999"; repo = "netbox-attachments"; - tag = version; - hash = "sha256-lm1+MWDT9N6Y+Uf1t3jTrFRF8jRy86JNdZSL1RQO7cw="; + tag = "v${version}"; + hash = "sha256-ZsK6RKYkfzn6YSS9ern9QxLsRdcwzt8BmMdYGJTMOKM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/netbox-bgp/default.nix b/pkgs/development/python-modules/netbox-bgp/default.nix index a5b89ce17477..2c9aa21a1b0c 100644 --- a/pkgs/development/python-modules/netbox-bgp/default.nix +++ b/pkgs/development/python-modules/netbox-bgp/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "netbox-bgp"; - version = "0.17.0"; + version = "0.18.0"; pyproject = true; src = fetchFromGitHub { owner = "netbox-community"; repo = "netbox-bgp"; tag = "v${version}"; - hash = "sha256-2Ss1ImJTqhr1FTRpnk1cwpFbHPjoNuUdpXoJJ9mjzHQ="; + hash = "sha256-Y2+TsGBpiBfj0e3mVdE2CjKlp0wX6zaFNcnc3gRKaHM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/netbox-floorplan-plugin/default.nix b/pkgs/development/python-modules/netbox-floorplan-plugin/default.nix index 61b703f8b37d..fa7e9619841b 100644 --- a/pkgs/development/python-modules/netbox-floorplan-plugin/default.nix +++ b/pkgs/development/python-modules/netbox-floorplan-plugin/default.nix @@ -10,7 +10,7 @@ }: buildPythonPackage rec { pname = "netbox-floorplan-plugin"; - version = "0.8.0"; + version = "0.9.0"; pyproject = true; disabled = python.pythonVersion != netbox.python.pythonVersion; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "netbox-community"; repo = "netbox-floorplan-plugin"; tag = version; - hash = "sha256-27rVf3b1MNiTil+yx+PWtf6CzQ24oyCqLgeoYUje14o="; + hash = "sha256-soz6W/x4/lSBrH5kKOBOBlkPB353vpk4yJ333bvqx0k="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/netbox-napalm-plugin/default.nix b/pkgs/development/python-modules/netbox-napalm-plugin/default.nix index 59f659f20540..64d9456ac9ff 100644 --- a/pkgs/development/python-modules/netbox-napalm-plugin/default.nix +++ b/pkgs/development/python-modules/netbox-napalm-plugin/default.nix @@ -10,7 +10,7 @@ }: buildPythonPackage rec { pname = "netbox-napalm-plugin"; - version = "0.3.3"; + version = "0.3.4"; pyproject = true; disabled = python.pythonVersion != netbox.python.pythonVersion; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "netbox-community"; repo = "netbox-napalm-plugin"; tag = "v${version}"; - hash = "sha256-qo16Bwq2a9AbO80qnQo0WtJ7HbrqqGChMJaqYYD5Aqg="; + hash = "sha256-PdX69SS0SAeUuN2zwcv54Ooih1hyR9a19e7sc5tJvuQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/netbox-qrcode/default.nix b/pkgs/development/python-modules/netbox-qrcode/default.nix index f3153a0ca32f..f42b7cd7c69c 100644 --- a/pkgs/development/python-modules/netbox-qrcode/default.nix +++ b/pkgs/development/python-modules/netbox-qrcode/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "netbox-qrcode"; - version = "0.0.19"; + version = "0.0.20"; pyproject = true; src = fetchFromGitHub { owner = "netbox-community"; repo = "netbox-qrcode"; tag = "v${version}"; - hash = "sha256-hrVnNEgLL3r1BtZdBaJu6H5b/tuXUxzGjKcITTopE60="; + hash = "sha256-7dPMpuJ2nuj9rRmVrfthD+xrEHoUaLFqDJWC6cGGCwY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/netbox-topology-views/default.nix b/pkgs/development/python-modules/netbox-topology-views/default.nix index 5ec93614badc..f28fb4593707 100644 --- a/pkgs/development/python-modules/netbox-topology-views/default.nix +++ b/pkgs/development/python-modules/netbox-topology-views/default.nix @@ -10,7 +10,7 @@ }: buildPythonPackage rec { pname = "netbox-topology-views"; - version = "4.4.0"; + version = "4.5.0"; pyproject = true; disabled = python.pythonVersion != netbox.python.pythonVersion; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "netbox-community"; repo = "netbox-topology-views"; tag = "v${version}"; - hash = "sha256-HsG5joHdqVuL6viBwZ8AyvFBCLmcq0YB+2ehLO5gsFc="; + hash = "sha256-1KEkNfo++lX0uF0xS9JOyG7dQBQYYo2cSGkjicJ5+vE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/nethsm/default.nix b/pkgs/development/python-modules/nethsm/default.nix index b7eea7a95882..d67f4df89645 100644 --- a/pkgs/development/python-modules/nethsm/default.nix +++ b/pkgs/development/python-modules/nethsm/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "nethsm"; - version = "1.4.1"; + version = "2.0.1"; pyproject = true; src = fetchFromGitHub { owner = "Nitrokey"; repo = "nethsm-sdk-py"; tag = "v${version}"; - hash = "sha256-guW3KKIrRKSw8TsvPMTPJUyzISBNUoBqsGBWuv7Nf7M="; + hash = "sha256-wqnyI6QmsBfQW7NbJrk92Ufw0+IFmc8/0ZsUp5XswYw="; }; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix index 7acca70a262e..fcf2f626fed5 100644 --- a/pkgs/development/python-modules/networkx/default.nix +++ b/pkgs/development/python-modules/networkx/default.nix @@ -28,24 +28,14 @@ buildPythonPackage rec { pname = "networkx"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "3.5"; + version = "3.6.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-1Mb5z4H1LWkjCGZ5a4KvvM3sPbeuT70bZep1D+7VADc="; + hash = "sha256-JrfDV6zMDIzeVYrUhig3KLZbapXYXuHNZrr6tMgWhQk="; }; - # backport patch to fix tests with Python 3.13.4 - # FIXME: remove in next update - patches = [ - (fetchpatch { - url = "https://github.com/networkx/networkx/commit/d85b04a8b9619580d8901f35400414f612c83113.patch"; - includes = [ "networkx/generators/lattice.py" ]; - hash = "sha256-6y/aJBDgNkUzmQ6o52CGVVzqoQgkCEXA4iAXhv1cS0c="; - }) - ]; - nativeBuildInputs = [ setuptools ]; optional-dependencies = { diff --git a/pkgs/development/python-modules/nextcloudmonitor/default.nix b/pkgs/development/python-modules/nextcloudmonitor/default.nix index 6201899cf07a..9333a1679db2 100644 --- a/pkgs/development/python-modules/nextcloudmonitor/default.nix +++ b/pkgs/development/python-modules/nextcloudmonitor/default.nix @@ -2,31 +2,22 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, setuptools, requests, }: buildPythonPackage rec { pname = "nextcloudmonitor"; - version = "1.5.2"; + version = "1.6.0"; pyproject = true; src = fetchFromGitHub { owner = "meichthys"; repo = "nextcloud_monitor"; tag = "v${version}"; - hash = "sha256-9iohznUmDusNY7iJZBcv9yn2wp3X5cS8n3Fbj/G1u0g="; + hash = "sha256-748cDMxPjOQFKdSt1GrQqZHmPgz20HN1+lMzo2vMj6c="; }; - patches = [ - (fetchpatch2 { - # https://github.com/meichthys/nextcloud_monitor/pull/10 - url = "https://github.com/meichthys/nextcloud_monitor/commit/cf6191d148e0494de5ae3cbe8fc5ffdba71b6c21.patch"; - hash = "sha256-BSTX5dw+k+ItT6qvpjLiDsH9rW1NmkaBeGO9TlNZZis="; - }) - ]; - build-system = [ setuptools ]; dependencies = [ requests ]; diff --git a/pkgs/development/python-modules/nexusformat/default.nix b/pkgs/development/python-modules/nexusformat/default.nix index 9d5120f42a35..b9c9ffdc7117 100644 --- a/pkgs/development/python-modules/nexusformat/default.nix +++ b/pkgs/development/python-modules/nexusformat/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "nexusformat"; - version = "1.0.8"; + version = "2.0.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-zsIOnWgMbUaJl3tHnpQiF3+Qy48dwKDAvFlg6z8hW/M="; + hash = "sha256-mIGbmpT9+ZPD3X999fhZSdSg/XgI/SdbEoE/oarjuS0="; }; build-system = [ diff --git a/pkgs/development/python-modules/nglview/default.nix b/pkgs/development/python-modules/nglview/default.nix index 9b9e37dd2565..f31c5470c826 100644 --- a/pkgs/development/python-modules/nglview/default.nix +++ b/pkgs/development/python-modules/nglview/default.nix @@ -32,14 +32,14 @@ let in buildPythonPackage rec { pname = "nglview"; - version = "3.1.4"; + version = "4.0"; pyproject = true; src = fetchFromGitHub { owner = "nglviewer"; repo = "nglview"; tag = "v${version}"; - hash = "sha256-QY7rn6q67noWeoLn0RU2Sn5SeJON+Br/j+aNMlK1PDo="; + hash = "sha256-Dacsg3+asY0THJ5qrM7+IZCnc2rhCOrbOfN7Xai63Ac="; }; build-system = [ @@ -88,7 +88,7 @@ buildPythonPackage rec { meta = { description = "IPython/Jupyter widget to interactively view molecular structures and trajectories"; homepage = "https://github.com/nglviewer/nglview"; - changelog = "https://github.com/nglviewer/nglview/releases/tag/v${version}"; + changelog = "https://github.com/nglviewer/nglview/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ guelakais ]; }; diff --git a/pkgs/development/python-modules/nice-go/default.nix b/pkgs/development/python-modules/nice-go/default.nix index 7412237b72d2..c640f55c8638 100644 --- a/pkgs/development/python-modules/nice-go/default.nix +++ b/pkgs/development/python-modules/nice-go/default.nix @@ -29,7 +29,10 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - pythonRelaxDeps = [ "tenacity" ]; + pythonRelaxDeps = [ + "aiobotocore" + "tenacity" + ]; dependencies = [ aiobotocore diff --git a/pkgs/development/python-modules/nidaqmx/default.nix b/pkgs/development/python-modules/nidaqmx/default.nix index 864a3b98381e..60de3d7e2a85 100644 --- a/pkgs/development/python-modules/nidaqmx/default.nix +++ b/pkgs/development/python-modules/nidaqmx/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "nidaqmx"; - version = "1.2.0"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "ni"; repo = "nidaqmx-python"; tag = version; - hash = "sha256-uxf+1nmJ+YFS3zGu+0YP4zOdBlSCHPYC8euqZIGwb00="; + hash = "sha256-Khydb14+yJKWYcO4pROfbainXw3bHceXK5Gc9GCIYNo="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index e50d38e1deaf..26e876e62245 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "nilearn"; - version = "0.12.1"; + version = "0.13.0"; pyproject = true; src = fetchFromGitHub { owner = "nilearn"; repo = "nilearn"; tag = version; - hash = "sha256-jUP/gUMUVveX8m2VbyilTsx5OppuYVXH1qKeEfEVajQ="; + hash = "sha256-q+glPYxnB3Nd1DtaTzdSEJtgRtRhW+RfZmAeAUL6zX4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/niquests/default.nix b/pkgs/development/python-modules/niquests/default.nix index d6166512aac3..9f613420b2ba 100644 --- a/pkgs/development/python-modules/niquests/default.nix +++ b/pkgs/development/python-modules/niquests/default.nix @@ -2,6 +2,7 @@ buildPythonPackage, charset-normalizer, cryptography, + fastapi, fetchFromGitHub, hatchling, lib, @@ -16,14 +17,14 @@ buildPythonPackage rec { pname = "niquests"; - version = "3.16.1"; + version = "3.17.0"; pyproject = true; src = fetchFromGitHub { owner = "jawah"; repo = "niquests"; tag = "v${version}"; - hash = "sha256-SfHjzkVgoxLhqzFmR1PiPUHHrHgyHlFUfF0VPv6Ed3Y="; + hash = "sha256-HGczeExOoZMBiPS//B/gu56Wnpzz55oawhTT67ekuOs="; }; build-system = [ hatchling ]; @@ -66,6 +67,7 @@ buildPythonPackage rec { nativeCheckInputs = [ cryptography + fastapi pytest-asyncio pytest-httpbin pytestCheckHook @@ -82,10 +84,15 @@ buildPythonPackage rec { "tests/test_testserver.py" ]; - disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ - # PermissionError: [Errno 1] Operation not permitted - "test_use_proxy_from_environment" - ]; + disabledTests = + lib.optionals stdenv.hostPlatform.isLinux [ + "test_docker_version_info" + "test_docker_404_unknown_path" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # PermissionError: [Errno 1] Operation not permitted + "test_use_proxy_from_environment" + ]; meta = { changelog = "https://github.com/jawah/niquests/blob/${src.tag}/HISTORY.md"; diff --git a/pkgs/development/python-modules/nitime/default.nix b/pkgs/development/python-modules/nitime/default.nix index 7e5a53f9e4c4..43572d94e53c 100644 --- a/pkgs/development/python-modules/nitime/default.nix +++ b/pkgs/development/python-modules/nitime/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "nitime"; - version = "0.11"; + version = "0.12.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-4Ie8fuk9CKdn/64TsCfN2No2dU16ICpBRWYerqqF0/0="; + hash = "sha256-Esv0iLBlXcBaoYoMpZgt6XAwJgTkYfyS6H69m3U5tv8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/nocasedict/default.nix b/pkgs/development/python-modules/nocasedict/default.nix index 795cccae5539..369e27f7442e 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.1.0"; + version = "2.2.0"; pyproject = true; src = fetchFromGitHub { owner = "pywbem"; repo = "nocasedict"; tag = version; - hash = "sha256-6n0id4WBdrD+rYX9tFuynA6bV1n1LjVy5dj/TgXNkPw="; + hash = "sha256-e3APYlmeoby0CGoEh4g6ZK27DwWi4EZdpwsRORxly+w="; }; build-system = [ diff --git a/pkgs/development/python-modules/nocaselist/default.nix b/pkgs/development/python-modules/nocaselist/default.nix index 96dfdabc5b35..0b819851a617 100644 --- a/pkgs/development/python-modules/nocaselist/default.nix +++ b/pkgs/development/python-modules/nocaselist/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "nocaselist"; - version = "2.1.0"; + version = "2.2.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-+3MG9aPgRVNOc3q37L7uA5ul6br7xbXyMfYW1+khG2U="; + hash = "sha256-sGs9b+wavAXGB6qOgTWZOIcnoI4YwiNDHXRpz26wwGo="; }; build-system = [ diff --git a/pkgs/development/python-modules/nominal-api-protos/default.nix b/pkgs/development/python-modules/nominal-api-protos/default.nix index 0c39ac7fd383..c3b5b6eb5a2e 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.806.0"; + version = "0.1073.0"; pyproject = true; # nixpkgs-update: no auto update src = fetchPypi { inherit version; pname = "nominal_api_protos"; - hash = "sha256-wbMGgW3YYX+MVc525rH6pOk72H7NlmiyEJiFtz+Osoo="; + hash = "sha256-jI7V34IyfY6bwzUvcOi6tdQI+OkJRMdhmNq0rosMjR4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/nominal-api/default.nix b/pkgs/development/python-modules/nominal-api/default.nix index fb5a51f4cfa1..835cd230e5a8 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.806.0"; + version = "0.1073.0"; pyproject = true; # nixpkgs-update: no auto update src = fetchPypi { inherit version; pname = "nominal_api"; - hash = "sha256-V9zncQFNBi3MtgBHmwY4SoSgI9cjQuBt90PeRHjaXsw="; + hash = "sha256-jumMX6YjQlmipCgaPPeG73OemP94otHvUUL2kq+QEQ4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/nominal/default.nix b/pkgs/development/python-modules/nominal/default.nix index c4183dfa4107..fc25025b6311 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.71.0"; + version = "1.104.3"; pyproject = true; src = fetchFromGitHub { owner = "nominal-io"; repo = "nominal-client"; tag = "v${version}"; - hash = "sha256-C0afrzWlq2Z3a21MIJ/3XgvjkEZONwBgCZ+06XIYFGE="; + hash = "sha256-+hJzDQND+eQ/za+V7HXHhwoGfIusXBUUWWSYwWu39ew="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/noneprompt/default.nix b/pkgs/development/python-modules/noneprompt/default.nix index f24ecc383d4e..2be1909546a8 100644 --- a/pkgs/development/python-modules/noneprompt/default.nix +++ b/pkgs/development/python-modules/noneprompt/default.nix @@ -2,21 +2,26 @@ buildPythonPackage, fetchPypi, lib, - poetry-core, + uv-build, prompt-toolkit, }: buildPythonPackage rec { pname = "noneprompt"; - version = "0.1.9"; + version = "0.1.11"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-M4uLuJqNIu818d7bOqfBsijPE5lzvcQ8X/w+72RFfbk="; + hash = "sha256-aCJpGPKhVDqjgMqtpcOArlyjj1cpInjFv9O3KJ8axts="; }; - build-system = [ poetry-core ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "uv_build >=0.8.3, <0.9.0" uv_build + ''; + + build-system = [ uv-build ]; dependencies = [ prompt-toolkit ]; diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 7f71dc146e44..741f0d0cbac4 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.5.0"; + version = "7.5.3"; pyproject = true; src = fetchFromGitHub { owner = "jupyter"; repo = "notebook"; tag = "v${version}"; - hash = "sha256-EKfe3uqIwb+kKmSuU7aIinNj1nkRaBvg3liV6RiR3xc="; + hash = "sha256-Kxt4dAHqJ6q/tCtvP7QRow+pTe+Qmibw4aLy+YJFcu8="; }; postPatch = '' @@ -54,7 +54,7 @@ buildPythonPackage rec { offlineCache = yarn-berry_3.fetchYarnBerryDeps { inherit src missingHashes; - hash = "sha256-ILDTRK5NJ33T30YRTT3/g1mIE2sI8spGPwMsWyQ5UTc="; + hash = "sha256-OYGueULuo7L59wiqyRrsIYquRCRTCip5HaJQHZ5diMA="; }; build-system = [ diff --git a/pkgs/development/python-modules/nsapi/default.nix b/pkgs/development/python-modules/nsapi/default.nix index cb92ca9806d0..2f50f218aee6 100644 --- a/pkgs/development/python-modules/nsapi/default.nix +++ b/pkgs/development/python-modules/nsapi/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "nsapi"; - version = "3.1.3"; + version = "3.2.1"; pyproject = true; src = fetchFromGitHub { owner = "aquatix"; repo = "ns-api"; tag = "v${version}"; - hash = "sha256-Buhc0643WeX/4ZU/RkzNWiFjfEAJUtNL6uJ98unTnCg="; + hash = "sha256-eZT6DU68wcEYyoFejECuluzit9MDA269zaKVFWpSuc8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix index b957e543bcda..cd83ce167b1d 100644 --- a/pkgs/development/python-modules/ntc-templates/default.nix +++ b/pkgs/development/python-modules/ntc-templates/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "ntc-templates"; - version = "7.9.0"; + version = "8.1.0"; pyproject = true; src = fetchFromGitHub { owner = "networktocode"; repo = "ntc-templates"; tag = "v${version}"; - hash = "sha256-ujWPcVqwdtMlCkTZP/PJ3oMR60F6IHrZXXhcNT7JmmM="; + hash = "sha256-J1Icf9UG5IMYBH90Mfxd+p+rk57z2OXQENnoRAaepN4="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix index acde02d89404..268e825b5239 100644 --- a/pkgs/development/python-modules/nuitka/default.nix +++ b/pkgs/development/python-modules/nuitka/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "nuitka"; - version = "2.7.15"; + version = "2.8.10"; pyproject = true; src = fetchFromGitHub { owner = "Nuitka"; repo = "Nuitka"; - rev = version; - hash = "sha256-o+rXk8Qh9SeBpuSppPBap9TL69gy9ag7PCArFSNSv7g="; + tag = version; + hash = "sha256-+CevWpYvqY3SX3/QE7SPlbsFtXkdlNTg9m91VtZCHvM="; }; build-system = [ diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 6feebfa49809..506f0e10dfd6 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -1,21 +1,25 @@ { lib, stdenv, - pythonAtLeast, fetchFromGitHub, - fetchpatch2, - python, buildPythonPackage, - setuptools, - numpy, - numpy_1, - llvmlite, replaceVars, - writers, + fetchpatch, + + # nativeBuildInputs + setuptools, + + # dependencies + llvmlite, + numpy, + + # tests numba, pytestCheckHook, - - config, + writableTmpDirAsHomeHook, + numpy_1, + writers, + python, # CUDA-only dependencies: addDriverRunpath, @@ -23,6 +27,7 @@ cudaPackages, # CUDA flags: + config, cudaSupport ? config.cudaSupport, testsWithoutSandbox ? false, doFullCheck ? false, @@ -31,7 +36,7 @@ let cudatoolkit = cudaPackages.cuda_nvcc; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "0.63.1"; pname = "numba"; pyproject = true; @@ -39,14 +44,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "numba"; repo = "numba"; - tag = version; + tag = finalAttrs.version; # Upstream uses .gitattributes to inject information about the revision # hash and the refname into `numba/_version.py`, see: # # - https://git-scm.com/docs/gitattributes#_export_subst and # - https://github.com/numba/numba/blame/5ef7c86f76a6e8cc90e9486487294e0c34024797/numba/_version.py#L25-L31 postFetch = '' - sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${src.tag})"/' $out/numba/_version.py + sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${finalAttrs.src.tag})"/' $out/numba/_version.py ''; hash = "sha256-M7Hdc1Qakclz7i/HujBUqVEWFsHj9ZGQDzb8Ze9AztA="; }; @@ -79,7 +84,25 @@ buildPythonPackage rec { llvmlite ]; - patches = lib.optionals cudaSupport [ + patches = [ + # Support Numpy 2.4, see: + # + # - https://github.com/numba/numba/pull/10393 + # - https://github.com/numba/numba/issues/10263 + (fetchpatch { + url = "https://github.com/numba/numba/commit/7ec267efb80d87f0652c00535e8843f35d006f20.patch"; + hash = "sha256-oAOZa2/m2qs8CeX13/0lmRTg/lQj5aDIaaQeDeLAghc="; + excludes = [ + "azure-pipelines.yml" + "buildscripts/azure/azure-windows.yml" + ]; + }) + # The above doesn't fix the source's build and run time checks of Numpy's + # version, it only fixes the tests and API. Upstream puts these checks only + # in release tarballs, and hence the patch has to be vendored. + ./numpy2.4.patch + ] + ++ lib.optionals cudaSupport [ (replaceVars ./cuda_path.patch { cuda_toolkit_path = cudatoolkit; cuda_toolkit_lib_path = lib.getLib cudatoolkit; @@ -88,11 +111,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + writableTmpDirAsHomeHook ]; + # https://github.com/NixOS/nixpkgs/issues/255262 preCheck = '' - export HOME="$(mktemp -d)" - # https://github.com/NixOS/nixpkgs/issues/255262 cd $out ''; @@ -146,10 +169,10 @@ buildPythonPackage rec { }; meta = { - changelog = "https://numba.readthedocs.io/en/stable/release/${version}-notes.html"; + changelog = "https://numba.readthedocs.io/en/stable/release/${finalAttrs.version}-notes.html"; description = "Compiling Python code using LLVM"; homepage = "https://numba.pydata.org/"; license = lib.licenses.bsd2; mainProgram = "numba"; }; -} +}) diff --git a/pkgs/development/python-modules/numba/numpy2.4.patch b/pkgs/development/python-modules/numba/numpy2.4.patch new file mode 100644 index 000000000000..37fd13bd9582 --- /dev/null +++ b/pkgs/development/python-modules/numba/numpy2.4.patch @@ -0,0 +1,28 @@ +diff --git a/numba/__init__.py b/numba/__init__.py +index 33f752018..7d3b3ae8d 100644 +--- a/numba/__init__.py ++++ b/numba/__init__.py +@@ -39,8 +39,8 @@ def _ensure_critical_deps(): + f"{numpy_version[0]}.{numpy_version[1]}.") + raise ImportError(msg) + +- if numpy_version > (2, 3): +- msg = (f"Numba needs NumPy 2.3 or less. Got NumPy " ++ if numpy_version > (2, 4): ++ msg = (f"Numba needs NumPy 2.4 or less. Got NumPy " + f"{numpy_version[0]}.{numpy_version[1]}.") + raise ImportError(msg) + +diff --git a/setup.py b/setup.py +index 9eaa191cb..a5febef1e 100644 +--- a/setup.py ++++ b/setup.py +@@ -23,7 +23,7 @@ min_python_version = "3.10" + max_python_version = "3.15" # exclusive + min_numpy_build_version = "2.0.0rc1" + min_numpy_run_version = "1.22" +-max_numpy_run_version = "2.4" ++max_numpy_run_version = "2.5" + min_llvmlite_version = "0.46.0dev0" + max_llvmlite_version = "0.47" + diff --git a/pkgs/development/python-modules/numpy-typing-compat/default.nix b/pkgs/development/python-modules/numpy-typing-compat/default.nix index 9015e25826b7..57270f3b9463 100644 --- a/pkgs/development/python-modules/numpy-typing-compat/default.nix +++ b/pkgs/development/python-modules/numpy-typing-compat/default.nix @@ -8,20 +8,15 @@ buildPythonPackage rec { pname = "numpy-typing-compat"; - version = "20250818.2.3"; + version = "20251206.2.4"; pyproject = true; src = fetchPypi { pname = "numpy_typing_compat"; inherit version; - hash = "sha256-cug9U1tjXWaLpzFeQ66AvhRppvrqb8ltMSUW85s9j6U="; + hash = "sha256-WYgtI6r/BUolNtqAVkASzc4zSHZXvk15xZJbuHBfyrw="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail '"uv_build>=0.8.11,<0.9.0"' '"uv_build>=0.8.11"' - ''; - build-system = [ uv-build ]; diff --git a/pkgs/development/python-modules/numpy/1.nix b/pkgs/development/python-modules/numpy/1.nix index ca33bdca1994..3e6b5a712564 100644 --- a/pkgs/development/python-modules/numpy/1.nix +++ b/pkgs/development/python-modules/numpy/1.nix @@ -3,7 +3,6 @@ stdenv, fetchPypi, python, - numpy_1, pythonAtLeast, buildPythonPackage, writeTextFile, @@ -33,37 +32,14 @@ assert (!blas.isILP64) && (!lapack.isILP64); -let - cfg = writeTextFile { - name = "site.cfg"; - text = lib.generators.toINI { } { - ${blas.implementation} = { - include_dirs = "${lib.getDev blas}/include:${lib.getDev lapack}/include"; - library_dirs = "${blas}/lib:${lapack}/lib"; - runtime_library_dirs = "${blas}/lib:${lapack}/lib"; - libraries = "lapack,lapacke,blas,cblas"; - }; - lapack = { - include_dirs = "${lib.getDev lapack}/include"; - library_dirs = "${lapack}/lib"; - runtime_library_dirs = "${lapack}/lib"; - }; - blas = { - include_dirs = "${lib.getDev blas}/include"; - library_dirs = "${blas}/lib"; - runtime_library_dirs = "${blas}/lib"; - }; - }; - }; -in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "numpy"; version = "1.26.4"; pyproject = true; disabled = pythonAtLeast "3.13"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "tar.gz"; hash = "sha256-KgKrqe0S5KxOs+qUIcQgMBoMZGDZgw10qd+H76SRIBA="; }; @@ -123,7 +99,7 @@ buildPythonPackage rec { ''; preBuild = '' - ln -s ${cfg} site.cfg + ln -s ${finalAttrs.passthru.cfg} site.cfg ''; enableParallelBuilding = true; @@ -180,8 +156,29 @@ buildPythonPackage rec { # just for backwards compatibility blas = blas.provider; blasImplementation = blas.implementation; - inherit cfg; - coreIncludeDir = "${numpy_1}/${python.sitePackages}/numpy/core/include"; + buildConfig = { + ${blas.implementation} = { + include_dirs = "${lib.getDev blas}/include:${lib.getDev lapack}/include"; + library_dirs = "${blas}/lib:${lapack}/lib"; + runtime_library_dirs = "${blas}/lib:${lapack}/lib"; + libraries = "lapack,lapacke,blas,cblas"; + }; + lapack = { + include_dirs = "${lib.getDev lapack}/include"; + library_dirs = "${lapack}/lib"; + runtime_library_dirs = "${lapack}/lib"; + }; + blas = { + include_dirs = "${lib.getDev blas}/include"; + library_dirs = "${blas}/lib"; + runtime_library_dirs = "${blas}/lib"; + }; + }; + cfg = writeTextFile { + name = "site.cfg"; + text = lib.generators.toINI { } finalAttrs.finalPackage.buildConfig; + }; + coreIncludeDir = "${finalAttrs.finalPackage}/${python.sitePackages}/numpy/core/include"; tests = { inherit sage; }; @@ -192,10 +189,10 @@ buildPythonPackage rec { env.NOSE_EXCLUDE = "test_large_file_support"; meta = { - changelog = "https://github.com/numpy/numpy/releases/tag/v${version}"; + changelog = "https://github.com/numpy/numpy/releases/tag/v${finalAttrs.version}"; description = "Scientific tools for Python"; mainProgram = "f2py"; homepage = "https://numpy.org/"; license = lib.licenses.bsd3; }; -} +}) diff --git a/pkgs/development/python-modules/numpy/2.nix b/pkgs/development/python-modules/numpy/2.nix index f61e0710f6c5..681b659d3f01 100644 --- a/pkgs/development/python-modules/numpy/2.nix +++ b/pkgs/development/python-modules/numpy/2.nix @@ -2,9 +2,7 @@ lib, stdenv, fetchFromGitHub, - fetchpatch2, python, - numpy_2, pythonAtLeast, buildPythonPackage, writeTextFile, @@ -35,61 +33,25 @@ assert (!blas.isILP64) && (!lapack.isILP64); -let - cfg = writeTextFile { - name = "site.cfg"; - text = lib.generators.toINI { } { - ${blas.implementation} = { - include_dirs = "${lib.getDev blas}/include:${lib.getDev lapack}/include"; - library_dirs = "${blas}/lib:${lapack}/lib"; - runtime_library_dirs = "${blas}/lib:${lapack}/lib"; - libraries = "lapack,lapacke,blas,cblas"; - }; - lapack = { - include_dirs = "${lib.getDev lapack}/include"; - library_dirs = "${lapack}/lib"; - runtime_library_dirs = "${lapack}/lib"; - }; - blas = { - include_dirs = "${lib.getDev blas}/include"; - library_dirs = "${blas}/lib"; - runtime_library_dirs = "${blas}/lib"; - }; - }; - }; -in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "numpy"; - version = "2.3.5"; + version = "2.4.2"; pyproject = true; src = fetchFromGitHub { owner = "numpy"; repo = "numpy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-CMgJmsjPLgMCWN2iJk0OzcKIlnRRcayrTAns51S4B6k="; + hash = "sha256-HFNa7siXRIBBjWrkqQd8QAPWQQsTrYFXNq2DRzVmkQk="; }; - patches = - lib.optionals python.hasDistutilsCxxPatch [ - # We patch cpython/distutils to fix https://bugs.python.org/issue1222585 - # Patching of numpy.distutils is needed to prevent it from undoing the - # patch to distutils. - ./numpy-distutils-C++.patch - ] - ++ - lib.optionals - (pythonAtLeast "3.14" && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) - [ - # don't assert RecursionError in monster dtype test - # see https://github.com/numpy/numpy/pull/30375 - (fetchpatch2 { - url = "https://github.com/numpy/numpy/commit/eeaf04662e07cc8e2041f3e25bbd3698949a0c02.patch?full_index=1"; - excludes = [ ".github/workflows/macos.yml" ]; - hash = "sha256-bLPLExlKnX18MXhbZxzCHniaAE0yTSyK9WuQyFyYHOI="; - }) - ]; + patches = lib.optionals python.hasDistutilsCxxPatch [ + # We patch cpython/distutils to fix https://bugs.python.org/issue1222585 + # Patching of numpy.distutils is needed to prevent it from undoing the + # patch to distutils. + ./numpy-distutils-C++.patch + ]; postPatch = '' # remove needless reference to full Python path stored in built wheel @@ -124,7 +86,7 @@ buildPythonPackage rec { ]; preBuild = '' - ln -s ${cfg} site.cfg + ln -s ${finalAttrs.finalPackage.passthru.cfg} site.cfg ''; enableParallelBuilding = true; @@ -190,18 +152,39 @@ buildPythonPackage rec { # just for backwards compatibility blas = blas.provider; blasImplementation = blas.implementation; - inherit cfg; - coreIncludeDir = "${numpy_2}/${python.sitePackages}/numpy/_core/include"; + buildConfig = { + ${blas.implementation} = { + include_dirs = "${lib.getDev blas}/include:${lib.getDev lapack}/include"; + library_dirs = "${blas}/lib:${lapack}/lib"; + runtime_library_dirs = "${blas}/lib:${lapack}/lib"; + libraries = "lapack,lapacke,blas,cblas"; + }; + lapack = { + include_dirs = "${lib.getDev lapack}/include"; + library_dirs = "${lapack}/lib"; + runtime_library_dirs = "${lapack}/lib"; + }; + blas = { + include_dirs = "${lib.getDev blas}/include"; + library_dirs = "${blas}/lib"; + runtime_library_dirs = "${blas}/lib"; + }; + }; + cfg = writeTextFile { + name = "site.cfg"; + text = lib.generators.toINI { } finalAttrs.finalPackage.buildConfig; + }; + coreIncludeDir = "${finalAttrs.finalPackage}/${python.sitePackages}/numpy/_core/include"; tests = { inherit sage; }; }; meta = { - changelog = "https://github.com/numpy/numpy/releases/tag/${src.tag}"; + changelog = "https://github.com/numpy/numpy/releases/tag/${finalAttrs.src.tag}"; description = "Scientific tools for Python"; homepage = "https://numpy.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ doronbehar ]; }; -} +}) diff --git a/pkgs/development/python-modules/numpydoc/default.nix b/pkgs/development/python-modules/numpydoc/default.nix index 47f0d43187b0..e076cbb4686e 100644 --- a/pkgs/development/python-modules/numpydoc/default.nix +++ b/pkgs/development/python-modules/numpydoc/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "numpydoc"; - version = "1.9.0"; + version = "1.10.0"; pyproject = true; src = fetchPypi { inherit pname; inherit version; - hash = "sha256-X+xkkI/gQazEs6/CoyxJqrFUDPWBh29VY9aLsSnifFs="; + hash = "sha256-P3lw9u7jCRImCmsxrHK7okMoMM1nIlaewX7o0+9f+gE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/oca-port/default.nix b/pkgs/development/python-modules/oca-port/default.nix index 71194b3233c0..ba74b024b644 100644 --- a/pkgs/development/python-modules/oca-port/default.nix +++ b/pkgs/development/python-modules/oca-port/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "oca-port"; - version = "0.18"; + version = "0.19"; pyproject = true; src = fetchFromGitHub { @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "OCA"; repo = "oca-port"; tag = "v${version}"; - hash = "sha256-r32ePlbg0GjryB5HDx0nQTq71lG/o+4sUFRdKW/K5ys="; + hash = "sha256-5Iw9gbc8+x82huAMrqMHKXmJ12Drtaz3USdCucx1ruY="; }; build-system = [ diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 9c6b6aa84987..9b06a7f458b0 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "oci"; - version = "2.160.3"; + version = "2.165.1"; pyproject = true; src = fetchFromGitHub { owner = "oracle"; repo = "oci-python-sdk"; tag = "v${version}"; - hash = "sha256-Nz3/aGumNTMItE/HL5tAdh0QbZngeO02CfJKq4GZ+qY="; + hash = "sha256-pF3+0Hogk4FmPOp20ROVb3304+mGs0iUYeiNkszCGPY="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 0d4a256d4af9..8081bd64140a 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, deprecation, fetchFromGitHub, + fpdf2, ghostscript_headless, hatch-vcs, hatchling, @@ -16,19 +17,22 @@ pillow, pluggy, pngquant, + pydantic, + pypdfium2, pytest-xdist, pytestCheckHook, rich, reportlab, replaceVars, tesseract, + uharfbuzz, unpaper, installShellFiles, }: buildPythonPackage rec { pname = "ocrmypdf"; - version = "16.13.0"; + version = "17.1.0"; pyproject = true; src = fetchFromGitHub { @@ -41,7 +45,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-xxVtncIQ72echi0VogfgqwfB8IA7JEKVUV2lmL1coeU="; + hash = "sha256-MlsrssmuEzFXy+N6kWjkF3wtcDCncjYmAi43PUeYuJg="; }; patches = [ @@ -64,6 +68,7 @@ buildPythonPackage rec { dependencies = [ deprecation + fpdf2 img2pdf packaging pdfminer-six @@ -71,7 +76,10 @@ buildPythonPackage rec { pikepdf pillow pluggy + pydantic + pypdfium2 rich + uharfbuzz ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/ocrmypdf_16/default.nix b/pkgs/development/python-modules/ocrmypdf_16/default.nix new file mode 100644 index 000000000000..a700f0bd8358 --- /dev/null +++ b/pkgs/development/python-modules/ocrmypdf_16/default.nix @@ -0,0 +1,113 @@ +{ + lib, + buildPythonPackage, + deprecation, + fetchFromGitHub, + fpdf2, + ghostscript_headless, + hatch-vcs, + hatchling, + hypothesis, + img2pdf, + jbig2enc, + packaging, + pdfminer-six, + pillow-heif, + pikepdf, + pillow, + pluggy, + pngquant, + pydantic, + pypdfium2, + pytest-xdist, + pytestCheckHook, + rich, + reportlab, + replaceVars, + tesseract, + uharfbuzz, + unpaper, + installShellFiles, +}: + +buildPythonPackage rec { + pname = "ocrmypdf"; + version = "16.13.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ocrmypdf"; + repo = "OCRmyPDF"; + tag = "v${version}"; + # The content of .git_archival.txt is substituted upon tarball creation, + # which creates indeterminism if master no longer points to the tag. + # See https://github.com/ocrmypdf/OCRmyPDF/issues/841 + postFetch = '' + rm "$out/.git_archival.txt" + ''; + hash = "sha256-xxVtncIQ72echi0VogfgqwfB8IA7JEKVUV2lmL1coeU="; + }; + + patches = [ + ./use-pillow-heif.patch + (replaceVars ./paths.patch { + gs = lib.getExe ghostscript_headless; + jbig2 = lib.getExe jbig2enc; + pngquant = lib.getExe pngquant; + tesseract = lib.getExe tesseract; + unpaper = lib.getExe unpaper; + }) + ]; + + build-system = [ + hatch-vcs + hatchling + ]; + + nativeBuildInputs = [ installShellFiles ]; + + dependencies = [ + deprecation + fpdf2 + img2pdf + packaging + pdfminer-six + pillow-heif + pikepdf + pillow + pluggy + pydantic + pypdfium2 + rich + uharfbuzz + ]; + + nativeCheckInputs = [ + hypothesis + pytest-xdist + pytestCheckHook + reportlab + ]; + + pythonImportsCheck = [ "ocrmypdf" ]; + + postInstall = '' + installShellCompletion --cmd ocrmypdf \ + --bash misc/completion/ocrmypdf.bash \ + --fish misc/completion/ocrmypdf.fish + ''; + + meta = { + homepage = "https://github.com/ocrmypdf/OCRmyPDF"; + description = "Adds an OCR text layer to scanned PDF files, allowing them to be searched"; + license = with lib.licenses; [ + mpl20 + mit + ]; + maintainers = with lib.maintainers; [ + dotlambda + ]; + changelog = "https://github.com/ocrmypdf/OCRmyPDF/blob/${src.tag}/docs/release_notes.md"; + mainProgram = "ocrmypdf"; + }; +} diff --git a/pkgs/development/python-modules/ocrmypdf_16/paths.patch b/pkgs/development/python-modules/ocrmypdf_16/paths.patch new file mode 100644 index 000000000000..164b7f66a4dc --- /dev/null +++ b/pkgs/development/python-modules/ocrmypdf_16/paths.patch @@ -0,0 +1,119 @@ +diff --git a/src/ocrmypdf/_exec/ghostscript.py b/src/ocrmypdf/_exec/ghostscript.py +index eaa48117..30201d97 100644 +--- a/src/ocrmypdf/_exec/ghostscript.py ++++ b/src/ocrmypdf/_exec/ghostscript.py +@@ -31,7 +31,7 @@ COLOR_CONVERSION_STRATEGIES = frozenset( + ] + ) + # Ghostscript executable - gswin32c is not supported +-GS = 'gswin64c' if os.name == 'nt' else 'gs' ++GS = '@gs@' + + + log = logging.getLogger(__name__) +diff --git a/src/ocrmypdf/_exec/jbig2enc.py b/src/ocrmypdf/_exec/jbig2enc.py +index 1c6dd5fe..b689a091 100644 +--- a/src/ocrmypdf/_exec/jbig2enc.py ++++ b/src/ocrmypdf/_exec/jbig2enc.py +@@ -15,7 +15,7 @@ from ocrmypdf.subprocess import get_version, run + + def version() -> Version: + try: +- version = get_version('jbig2', regex=r'jbig2enc (\d+(\.\d+)*).*') ++ version = get_version('@jbig2@', regex=r'jbig2enc (\d+(\.\d+)*).*') + except CalledProcessError as e: + # TeX Live for Windows provides an incompatible jbig2.EXE which may + # be on the PATH. +@@ -33,7 +33,7 @@ def available(): + + def convert_group(cwd, infiles, out_prefix, threshold): + args = [ +- 'jbig2', ++ '@jbig2@', + '-b', + out_prefix, + '--symbol-mode', # symbol mode (lossy) +@@ -50,7 +50,7 @@ def convert_group(cwd, infiles, out_prefix, threshold): + + + def convert_single(cwd, infile, outfile, threshold): +- args = ['jbig2', '--pdf', '-t', str(threshold), infile] ++ args = ['@jbig2@', '--pdf', '-t', str(threshold), infile] + with open(outfile, 'wb') as fstdout: + proc = run(args, cwd=cwd, stdout=fstdout, stderr=PIPE) + proc.check_returncode() +diff --git a/src/ocrmypdf/_exec/pngquant.py b/src/ocrmypdf/_exec/pngquant.py +index 5b8600d0..fcad771b 100644 +--- a/src/ocrmypdf/_exec/pngquant.py ++++ b/src/ocrmypdf/_exec/pngquant.py +@@ -15,7 +15,7 @@ from ocrmypdf.subprocess import get_version, run + + + def version() -> Version: +- return Version(get_version('pngquant', regex=r'(\d+(\.\d+)*).*')) ++ return Version(get_version('@pngquant@', regex=r'(\d+(\.\d+)*).*')) + + + def available(): +@@ -37,7 +37,7 @@ def quantize(input_file: Path, output_file: Path, quality_min: int, quality_max: + """ + with open(input_file, 'rb') as input_stream: + args = [ +- 'pngquant', ++ '@pngquant@', + '--force', + '--skip-if-larger', + '--quality', +diff --git a/src/ocrmypdf/_exec/tesseract.py b/src/ocrmypdf/_exec/tesseract.py +index 102bdab8..bfef4400 100644 +--- a/src/ocrmypdf/_exec/tesseract.py ++++ b/src/ocrmypdf/_exec/tesseract.py +@@ -95,7 +95,7 @@ class TesseractVersion(Version): + + + def version() -> Version: +- return TesseractVersion(get_version('tesseract', regex=r'tesseract\s(.+)')) ++ return TesseractVersion(get_version('@tesseract@', regex=r'tesseract\s(.+)')) + + + def has_thresholding() -> bool: +@@ -113,7 +113,7 @@ def get_languages() -> set[str]: + msg += output + return msg + +- args_tess = ['tesseract', '--list-langs'] ++ args_tess = ['@tesseract@', '--list-langs'] + try: + proc = run( + args_tess, +@@ -135,7 +135,7 @@ def get_languages() -> set[str]: + + + def tess_base_args(langs: list[str], engine_mode: int | None) -> list[str]: +- args = ['tesseract'] ++ args = ['@tesseract@'] + if langs: + args.extend(['-l', '+'.join(langs)]) + if engine_mode is not None: +diff --git a/src/ocrmypdf/_exec/unpaper.py b/src/ocrmypdf/_exec/unpaper.py +index a5a92f4c..6cf56eb3 100644 +--- a/src/ocrmypdf/_exec/unpaper.py ++++ b/src/ocrmypdf/_exec/unpaper.py +@@ -48,7 +48,7 @@ class UnpaperImageTooLargeError(Exception): + + + def version() -> Version: +- return Version(get_version('unpaper', regex=r'(?m).*?(\d+(\.\d+)(\.\d+)?)')) ++ return Version(get_version('@unpaper@', regex=r'(?m).*?(\d+(\.\d+)(\.\d+)?)')) + + + @contextmanager +@@ -70,7 +70,7 @@ def _setup_unpaper_io(input_file: Path) -> Iterator[tuple[Path, Path, Path]]: + def run_unpaper( + input_file: Path, output_file: Path, *, dpi: DecFloat, mode_args: list[str] + ) -> None: +- args_unpaper = ['unpaper', '-v', '--dpi', str(round(dpi, 6))] + mode_args ++ args_unpaper = ['@unpaper@', '-v', '--dpi', str(round(dpi, 6))] + mode_args + + with _setup_unpaper_io(input_file) as (input_png, output_pnm, tmpdir): + # To prevent any shenanigans from accepting arbitrary parameters in diff --git a/pkgs/development/python-modules/ocrmypdf_16/use-pillow-heif.patch b/pkgs/development/python-modules/ocrmypdf_16/use-pillow-heif.patch new file mode 100644 index 000000000000..0137ea02453d --- /dev/null +++ b/pkgs/development/python-modules/ocrmypdf_16/use-pillow-heif.patch @@ -0,0 +1,26 @@ +diff --git a/pyproject.toml b/pyproject.toml +index 2caa0e75..f6fcf60a 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -16,7 +16,7 @@ dependencies = [ + "img2pdf>=0.5", + "packaging>=20", + "pdfminer.six>=20220319", +- "pi-heif", # Heif image format - maintainers: if this is removed, it will NOT break ++ "pillow-heif", # Heif image format - maintainers: if this is removed, it will NOT break + "pikepdf>=10", + "Pillow>=10.0.1", + "pluggy>=1", +diff --git a/src/ocrmypdf/_pipeline.py b/src/ocrmypdf/_pipeline.py +index 90524d58..0be5a0f8 100644 +--- a/src/ocrmypdf/_pipeline.py ++++ b/src/ocrmypdf/_pipeline.py +@@ -42,7 +42,7 @@ from ocrmypdf.pdfinfo import Colorspace, Encoding, PageInfo, PdfInfo + from ocrmypdf.pluginspec import OrientationConfidence + + try: +- from pi_heif import register_heif_opener ++ from pillow_heif import register_heif_opener + except ImportError: + + def register_heif_opener(): diff --git a/pkgs/development/python-modules/odc-geo/default.nix b/pkgs/development/python-modules/odc-geo/default.nix index 671d79881f05..1f14b41b9219 100644 --- a/pkgs/development/python-modules/odc-geo/default.nix +++ b/pkgs/development/python-modules/odc-geo/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, # build-system - setuptools, + flit-core, # dependencies affine, @@ -30,18 +30,18 @@ buildPythonPackage rec { pname = "odc-geo"; - version = "0.4.10"; + version = "0.5.0"; pyproject = true; src = fetchFromGitHub { owner = "opendatacube"; repo = "odc-geo"; tag = "v${version}"; - hash = "sha256-f4wUUzcv4NM44zrCvW3sBRybppIBZEAm+oiTSW1B+Fw="; + hash = "sha256-qFHFT68hJKCBcYKZypSoQufHYXVm3LiD7mn5eQtYYO8="; }; build-system = [ - setuptools + flit-core ]; dependencies = [ @@ -96,6 +96,8 @@ buildPythonPackage rec { "test_warp_nan" # requires imagecodecs package (currently not available on nixpkgs) "test_cog_with_dask_smoke_test" + # xarray compat issue + "test_xr_reproject" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/odc-loader/default.nix b/pkgs/development/python-modules/odc-loader/default.nix index 70b9f86b74fd..01e38e8dc752 100644 --- a/pkgs/development/python-modules/odc-loader/default.nix +++ b/pkgs/development/python-modules/odc-loader/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "odc-loader"; - version = "0.5.1"; + version = "0.6.4"; pyproject = true; src = fetchFromGitHub { owner = "opendatacube"; repo = "odc-loader"; - tag = "v${version}"; - hash = "sha256-yBCityE9e29wUnPuD09MTeyyVY/o9X/1lUq3Su8sd6g="; + tag = version; + hash = "sha256-nJSC93+uPzsZY0ZHmrodPkCIk2FZnZ2ksfJIvr+x0As="; }; build-system = [ @@ -72,7 +72,7 @@ buildPythonPackage rec { meta = { description = "Tools for constructing xarray objects from parsed metadata"; homepage = "https://github.com/opendatacube/odc-loader/"; - changelog = "https://github.com/opendatacube/odc-loader/releases/tag/${version}"; + changelog = "https://github.com/opendatacube/odc-loader/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ daspk04 ]; }; diff --git a/pkgs/development/python-modules/odc-stac/default.nix b/pkgs/development/python-modules/odc-stac/default.nix index 650aaa3f6782..e55ad75b3486 100644 --- a/pkgs/development/python-modules/odc-stac/default.nix +++ b/pkgs/development/python-modules/odc-stac/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "odc-stac"; - version = "0.4.1"; + version = "0.5.2"; pyproject = true; src = fetchFromGitHub { owner = "opendatacube"; repo = "odc-stac"; tag = "v${version}"; - hash = "sha256-Zug52tjbdtRNpLMBUR+hksr/V2D3W4sXbtvdxSPyVlM="; + hash = "sha256-OlqUFyysbteZ+Ek48+F4U0YLrTx624974O7DnnUuxag="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/okta/default.nix b/pkgs/development/python-modules/okta/default.nix index 65f3755bcba3..a943be280a92 100644 --- a/pkgs/development/python-modules/okta/default.nix +++ b/pkgs/development/python-modules/okta/default.nix @@ -2,11 +2,13 @@ lib, aenum, aiohttp, + blinker, buildPythonPackage, fetchPypi, flatdict, jwcrypto, pycryptodomex, + pydantic, pydash, pyfakefs, pyjwt, @@ -14,7 +16,9 @@ pytest-mock, pytest-recording, pytestCheckHook, + python-dateutil, pyyaml, + requests, setuptools, xmltodict, yarl, @@ -22,12 +26,12 @@ buildPythonPackage rec { pname = "okta"; - version = "2.9.13"; + version = "3.1.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-jY6SZ1G3+NquF5TfLsGw6T9WO4smeBYT0gXLnRDoN+8="; + hash = "sha256-7ZYDrup+HJxlrOmSBGsWD4Ku8HRlQR4E68olWQtcazg="; }; build-system = [ setuptools ]; @@ -35,12 +39,16 @@ buildPythonPackage rec { dependencies = [ aenum aiohttp + blinker flatdict jwcrypto pycryptodomex + pydantic pydash pyjwt + python-dateutil pyyaml + requests xmltodict yarl ]; diff --git a/pkgs/development/python-modules/onnxslim/default.nix b/pkgs/development/python-modules/onnxslim/default.nix index 3a05d26fff97..4ef246442c5a 100644 --- a/pkgs/development/python-modules/onnxslim/default.nix +++ b/pkgs/development/python-modules/onnxslim/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "onnxslim"; - version = "0.1.78"; + version = "0.1.82"; pyproject = true; src = fetchFromGitHub { owner = "inisis"; repo = "OnnxSlim"; tag = "v${version}"; - hash = "sha256-xLT00z9zeO4o5JN9W+5AfpANjc2+qAtFNnncLJptCoA="; + hash = "sha256-hrrCodLaHVo/YRq0HczxogcZQSwZKxZthyLYxz/+XJ0="; }; build-system = [ diff --git a/pkgs/development/python-modules/openai-agents/default.nix b/pkgs/development/python-modules/openai-agents/default.nix index 8ae73edda134..c09e4bb7db4f 100644 --- a/pkgs/development/python-modules/openai-agents/default.nix +++ b/pkgs/development/python-modules/openai-agents/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "openai-agents"; - version = "0.4.2"; + version = "0.6.9"; pyproject = true; src = fetchPypi { inherit version; pname = "openai_agents"; - hash = "sha256-KByv+DmzqyzzvFIRCr6TysoASYXEG/B96OYNA8SnUo4="; + hash = "sha256-5VYjgntKGxHWbsAIS9K56ixtYPIz4EVHgDr0M5Z+L9s="; }; build-system = [ diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 645dcca9dd8a..b4ffbdd52c10 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -51,14 +51,14 @@ buildPythonPackage rec { pname = "openai"; - version = "2.15.0"; + version = "2.21.0"; pyproject = true; src = fetchFromGitHub { owner = "openai"; repo = "openai-python"; tag = "v${version}"; - hash = "sha256-FmOmWtkp+Pe3pICi0uvzsb1nsP4M4yc/34U3Bd2q/KE="; + hash = "sha256-Pe9Odm/0tHnXigu9Ix2EYrb9ttMjF3itvXFLlpiOM98="; }; postPatch = ''substituteInPlace pyproject.toml --replace-fail "hatchling==1.26.3" "hatchling"''; diff --git a/pkgs/development/python-modules/openfga-sdk/default.nix b/pkgs/development/python-modules/openfga-sdk/default.nix index 0b2305b6de1d..b2394cb47fc6 100644 --- a/pkgs/development/python-modules/openfga-sdk/default.nix +++ b/pkgs/development/python-modules/openfga-sdk/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "openfga-sdk"; - version = "0.9.5"; + version = "0.9.9"; pyproject = true; src = fetchFromGitHub { owner = "openfga"; repo = "python-sdk"; tag = "v${version}"; - hash = "sha256-e/Pgyj7A1HtcDPeRy0QK+Nok2ruWBiU9A1Yh7RZvtVI="; + hash = "sha256-bkDeIQJ+5VDMkBDorEMczsN7Ex04SaxhxulXLtUW/CM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/openstep-plist/default.nix b/pkgs/development/python-modules/openstep-plist/default.nix index 3016f05b9db8..143485ee5b52 100644 --- a/pkgs/development/python-modules/openstep-plist/default.nix +++ b/pkgs/development/python-modules/openstep-plist/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - fetchpatch, cython, setuptools, setuptools-scm, @@ -11,13 +10,13 @@ buildPythonPackage rec { pname = "openstep-plist"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; src = fetchPypi { pname = "openstep_plist"; inherit version; - hash = "sha256-2vOGZSrghrzosYeExZqCUlI/rKOx3th2u/OTWU2GK3g="; + hash = "sha256-AGgwTRLOwP4TLE+dIHfHG/pP9DkEmU/SosqX1aB2M44="; }; build-system = [ @@ -26,14 +25,6 @@ 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/optimum-onnx/default.nix b/pkgs/development/python-modules/optimum-onnx/default.nix index bfe9f27c387b..02e65623a6b9 100644 --- a/pkgs/development/python-modules/optimum-onnx/default.nix +++ b/pkgs/development/python-modules/optimum-onnx/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "optimum-onnx"; - version = "0.0.3"; + version = "0.1.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "optimum-onnx"; tag = "v${version}"; - hash = "sha256-IFXtKkJwmrcdjfXE2YccbRylU723fTG70Z6c9fIL5mE="; + hash = "sha256-Thx3QPLgi8w8znvMGSuCyRu/tUynCkQFywtKKv7UhuA="; }; build-system = [ diff --git a/pkgs/development/python-modules/optimum/default.nix b/pkgs/development/python-modules/optimum/default.nix index 4b1a80ca7efb..e19e48bcffc8 100644 --- a/pkgs/development/python-modules/optimum/default.nix +++ b/pkgs/development/python-modules/optimum/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "optimum"; - version = "2.0.0"; + version = "2.1.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "optimum"; tag = "v${version}"; - hash = "sha256-aeGWjzktpxY6Xym1licGCZf+Vzia9BdUnXE80Ja28jg="; + hash = "sha256-nA73afFr9wqJWmobBw5hOIjRvQ6I8QvVZoRJnYnXzUc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/optree/default.nix b/pkgs/development/python-modules/optree/default.nix index f27db5e912f3..e7d6f3fe4cb8 100644 --- a/pkgs/development/python-modules/optree/default.nix +++ b/pkgs/development/python-modules/optree/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "optree"; - version = "0.17.0"; + version = "0.18.0"; pyproject = true; src = fetchFromGitHub { owner = "metaopt"; repo = "optree"; tag = "v${version}"; - hash = "sha256-4ZkUdGF+Fauy6KWbyrGQ684Ay5XlFT2S2I9lv/1KeWs="; + hash = "sha256-i/vn9Lo5UiY3+1Mh6FMSMjEyDcs8dtWSL3ESZ8CyHPw="; }; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/optuna-dashboard/default.nix b/pkgs/development/python-modules/optuna-dashboard/default.nix index f3cbcf6dd40b..fa35b83940a2 100644 --- a/pkgs/development/python-modules/optuna-dashboard/default.nix +++ b/pkgs/development/python-modules/optuna-dashboard/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "optuna-dashboard"; - version = "0.20.0b1"; + version = "0.20.0"; pyproject = true; src = fetchFromGitHub { owner = "optuna"; repo = "optuna-dashboard"; tag = "v${version}"; - hash = "sha256-+mS9D71cwVkO0AqtU0pxK0PBvwCOxA6dPJyTVps4X+g="; + hash = "sha256-pg1R8tZjfLDDzDWiLRmaU1a1mKDzeZliPC2X0UV+xEw="; }; dependencies = [ diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index 48c9a87e0a8b..69fe3b5c66fc 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.5.0"; + version = "4.7.0"; pyproject = true; src = fetchFromGitHub { owner = "optuna"; repo = "optuna"; tag = "v${version}"; - hash = "sha256-qaCOpqKRepm/a1Nh98PV6RcRkadLK5E429pn1zaWQDA="; + hash = "sha256-SbEmJ4V4pyxMUx3GPMqBUDLq4AslwichbZNmNwmNm0o="; }; build-system = [ diff --git a/pkgs/development/python-modules/optype/default.nix b/pkgs/development/python-modules/optype/default.nix index a39616345d0a..96b42b3cea20 100644 --- a/pkgs/development/python-modules/optype/default.nix +++ b/pkgs/development/python-modules/optype/default.nix @@ -10,18 +10,23 @@ pytestCheckHook, }: -buildPythonPackage { +buildPythonPackage (finalAttrs: { pname = "optype"; - version = "0.14.0"; + version = "0.15.0"; pyproject = true; src = fetchFromGitHub { owner = "jorenham"; repo = "optype"; - rev = "5f16def3546222caf81a3411a27b007a00819172"; - hash = "sha256-52cY+u0wjhJFQDLsjND/h6cfln4rCTtcy+HqaoH/re0="; + tag = "v${finalAttrs.version}"; + hash = "sha256-tzbS+CeWGxMXK1LFN/LslI6kfbVQPjqYlDB7fX0ogfU="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "uv_build>=0.9.16,<0.10.0" uv_build + ''; + build-system = [ uv-build ]; @@ -54,4 +59,4 @@ buildPythonPackage { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ jolars ]; }; -} +}) diff --git a/pkgs/development/python-modules/opuslib/default.nix b/pkgs/development/python-modules/opuslib/default.nix index 4061aa2f7db8..b7a02b04a9d8 100644 --- a/pkgs/development/python-modules/opuslib/default.nix +++ b/pkgs/development/python-modules/opuslib/default.nix @@ -54,6 +54,12 @@ buildPythonPackage { "tests/hl_encoder.py" ]; + disabledTests = [ + # Likely related to libopus 1.5.2 -> 1.6.1 bump + # AssertionError: 1500000 not less than 700000 + "test_bitrate" + ]; + meta = { description = "Python bindings to the libopus, IETF low-delay audio codec"; homepage = "https://github.com/orion-labs/opuslib"; diff --git a/pkgs/development/python-modules/oracledb/default.nix b/pkgs/development/python-modules/oracledb/default.nix index 4e0816a20010..e9b2c1d054e3 100644 --- a/pkgs/development/python-modules/oracledb/default.nix +++ b/pkgs/development/python-modules/oracledb/default.nix @@ -5,12 +5,12 @@ cython, fetchFromGitHub, setuptools, - wheel, + typing-extensions, }: buildPythonPackage rec { pname = "oracledb"; - version = "3.3.0"; + version = "3.4.1"; pyproject = true; src = fetchFromGitHub { @@ -18,21 +18,18 @@ buildPythonPackage rec { repo = "python-oracledb"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-SHIEl4pzuQBJ02KRPmOydFtmVD9qF3LGk9WPiDSpVzQ="; + hash = "sha256-Pwbb+/vzNnliBpcDmOpkkNMVI/cPbJY+yMIKKR6m01w="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "cython == 3.1" "cython" - ''; - build-system = [ cython setuptools - wheel ]; - dependencies = [ cryptography ]; + dependencies = [ + cryptography + typing-extensions + ]; # Checks need an Oracle database doCheck = false; @@ -42,7 +39,7 @@ buildPythonPackage rec { meta = { description = "Python driver for Oracle Database"; homepage = "https://oracle.github.io/python-oracledb"; - changelog = "https://github.com/oracle/python-oracledb/blob/v${version}/doc/src/release_notes.rst"; + changelog = "https://github.com/oracle/python-oracledb/blob/${src.tag}/doc/src/release_notes.rst"; license = with lib.licenses; [ asl20 # and or upl diff --git a/pkgs/development/python-modules/orange-canvas-core/default.nix b/pkgs/development/python-modules/orange-canvas-core/default.nix index 7b496befe1f4..cbd34fc8f8aa 100644 --- a/pkgs/development/python-modules/orange-canvas-core/default.nix +++ b/pkgs/development/python-modules/orange-canvas-core/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "orange-canvas-core"; - version = "0.2.6"; + version = "0.2.7"; pyproject = true; src = fetchFromGitHub { owner = "biolab"; repo = "orange-canvas-core"; tag = version; - hash = "sha256-cEy9ADU/jZoKmGXVlqwG+qWKZ22STjALgCb1IxAwpO0="; + hash = "sha256-mJSF2OWSIxBn1blQReLFlf8Uu/vP7F3vJrcrAz0uWFY="; }; build-system = [ diff --git a/pkgs/development/python-modules/orange-widget-base/default.nix b/pkgs/development/python-modules/orange-widget-base/default.nix index f24813598ffa..dbf027a8d181 100644 --- a/pkgs/development/python-modules/orange-widget-base/default.nix +++ b/pkgs/development/python-modules/orange-widget-base/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "orange-widget-base"; - version = "4.26.0"; + version = "4.27.0"; pyproject = true; src = fetchFromGitHub { owner = "biolab"; repo = "orange-widget-base"; tag = version; - hash = "sha256-XoQlZaY6pAflL0vWzSALDABOPybqV28xB/AS8L0DcBc="; + hash = "sha256-RTPzdeqz7HRyH726qXC0FMrAcwk6qZ8gmkXL7s5bl74="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/orange3/default.nix b/pkgs/development/python-modules/orange3/default.nix index 945b5ef986aa..7959fca6cf8c 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.39.0"; + version = "3.40.0"; pyproject = true; src = fetchFromGitHub { owner = "biolab"; repo = "orange3"; tag = version; - hash = "sha256-P2e3Wq33UXnTmGSxkoW8kYYCBfYBB9Z50v4g7n//Fbw="; + hash = "sha256-AOQGqOYaP3bPZtgjsVCxhA1T34Y9EIR5VeMwhZWmI88="; }; build-system = [ diff --git a/pkgs/development/python-modules/orderedmultidict/default.nix b/pkgs/development/python-modules/orderedmultidict/default.nix index b84ce2379f7a..d29a048a279a 100644 --- a/pkgs/development/python-modules/orderedmultidict/default.nix +++ b/pkgs/development/python-modules/orderedmultidict/default.nix @@ -1,21 +1,23 @@ { lib, buildPythonPackage, - fetchPypi, - flake8, + fetchFromGitHub, pytestCheckHook, setuptools, six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "orderedmultidict"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-BAcLu16HKRzJv6Ud9BNnf68hQcc8YdKl97Jr6jzYgq0="; + src = fetchFromGitHub { + owner = "gruns"; + repo = "orderedmultidict"; + # https://github.com/gruns/orderedmultidict/issues/32 + rev = "901194bed9c2de9e336358f3328132a81a14314e"; + hash = "sha256-XJKmchG3BmPKrw20BEMLe2V6XlN9tXcgkf5G+P97uAQ="; }; build-system = [ setuptools ]; @@ -31,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/gruns/orderedmultidict"; license = lib.licenses.unlicense; }; -} +}) diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix index 9bd80679a4aa..2bcbfc0f9c2c 100644 --- a/pkgs/development/python-modules/orjson/default.nix +++ b/pkgs/development/python-modules/orjson/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "orjson"; - version = "3.11.4"; + version = "3.11.5"; pyproject = true; src = fetchFromGitHub { owner = "ijl"; repo = "orjson"; tag = version; - hash = "sha256-LK3Up6bAWZkou791nrA9iHlgfDLbk196iTn3CBfeyYc="; + hash = "sha256-MWNAP8p4TN5yXFtXKWCyguv3EnFpZHMG8YEIiFF1Vug="; }; patches = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ @@ -46,7 +46,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-TdZtbb9zR0T+0eauEgRVrDKN2eyCNfEQCJziPlKPWpI="; + hash = "sha256-sRVa1cCbZQJq4bASn7oreEKpzTvuDoMzVs/IbojQa8s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ormar/default.nix b/pkgs/development/python-modules/ormar/default.nix index 291bc5fd2ff8..9970cd906aac 100644 --- a/pkgs/development/python-modules/ormar/default.nix +++ b/pkgs/development/python-modules/ormar/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "ormar"; - version = "0.20.2"; + version = "0.21.0"; pyproject = true; src = fetchFromGitHub { owner = "collerek"; repo = "ormar"; tag = version; - hash = "sha256-jg1qgOJiRBJCRThhq/jaXNmSoL0FmceIOWMKNxtyGJI="; + hash = "sha256-DjqjHvRmlFyOQt1FlqZ9iT1zy25FdizRrXfKwMy2uI0="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/osc-sdk-python/default.nix b/pkgs/development/python-modules/osc-sdk-python/default.nix index 1833fbf101bf..e45a25b0fca3 100644 --- a/pkgs/development/python-modules/osc-sdk-python/default.nix +++ b/pkgs/development/python-modules/osc-sdk-python/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "osc-sdk-python"; - version = "0.36.0"; + version = "0.38.1"; pyproject = true; src = fetchFromGitHub { owner = "outscale"; repo = "osc-sdk-python"; tag = "v${version}"; - hash = "sha256-PzTdQ5/ZtMAJ+niQNTlXCstjqhpuSCnRo0CybUfsz7s="; + hash = "sha256-dS4vwBSvsjPu8JToXPww2tfN+zzCK/qzbxyZwA/n6js="; fetchSubmodules = true; }; @@ -30,10 +30,9 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "ruamel.yaml==0.17.32" "ruamel.yaml" - ''; + pythonRelaxDeps = [ + "ruamel.yaml" + ]; # Only keep test not requiring access and secret keys enabledTestPaths = [ "tests/test_net.py" ]; diff --git a/pkgs/development/python-modules/oscpy/default.nix b/pkgs/development/python-modules/oscpy/default.nix index 3f81b0d0e937..6b6b727c613b 100644 --- a/pkgs/development/python-modules/oscpy/default.nix +++ b/pkgs/development/python-modules/oscpy/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "oscpy"; - version = "0.6.0"; + version = "0.6.1"; format = "setuptools"; src = fetchFromGitHub { owner = "kivy"; repo = "oscpy"; - rev = "v${version}"; - hash = "sha256-Luj36JLgU9xbBMydeobyf98U5zs5VwWQOPGV7TPXQwA="; + tag = "v${version}"; + hash = "sha256-sumpJ2y9lpd0UhQjk4zVDp3SipBwh3NBkJ3dqWs18IE="; }; patches = [ diff --git a/pkgs/development/python-modules/osxphotos/default.nix b/pkgs/development/python-modules/osxphotos/default.nix index b6a6d124d7c5..6b1c02676856 100644 --- a/pkgs/development/python-modules/osxphotos/default.nix +++ b/pkgs/development/python-modules/osxphotos/default.nix @@ -41,14 +41,14 @@ buildPythonPackage (finalAttrs: { pname = "osxphotos"; - version = "0.74.2"; + version = "0.75.1"; pyproject = true; src = fetchFromGitHub { owner = "RhetTbull"; repo = "osxphotos"; tag = "v${finalAttrs.version}"; - hash = "sha256-dvY6ShScIpJ+HcTJFPOBSETibzfiV8meILI4WrQLsaU="; + hash = "sha256-aX+4wgjqWxoIez/pJ7ioes5OTHFijztSFTvTxdND6Eo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/otxv2/default.nix b/pkgs/development/python-modules/otxv2/default.nix index 6dc9b8138e3c..8c18a76de545 100644 --- a/pkgs/development/python-modules/otxv2/default.nix +++ b/pkgs/development/python-modules/otxv2/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "otxv2"; - version = "1.5.12"; + version = "1.41"; pyproject = true; src = fetchFromGitHub { owner = "AlienVault-OTX"; repo = "OTX-Python-SDK"; tag = version; - hash = "sha256-JAjBXNsX0Cuni+4L6I1RuaSfors5cBAZ2krPLhIFluY="; + hash = "sha256-ifBDvUXTEQZo8DY2YD5DrH6rFJSjAhKAKCBOpG8+/zE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/overrides/default.nix b/pkgs/development/python-modules/overrides/default.nix index c938ee0d8506..6e039f28c807 100644 --- a/pkgs/development/python-modules/overrides/default.nix +++ b/pkgs/development/python-modules/overrides/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonAtLeast, pytestCheckHook, setuptools, }: @@ -19,15 +18,13 @@ buildPythonPackage rec { hash = "sha256-gQDw5/RpAFNYWFOuxIAArPkCOoBYWUnsDtv1FEFteHo="; }; - nativeBuildInputs = [ setuptools ]; + # https://github.com/mkorpela/overrides/pull/136 + patches = [ ./pytest9-compat.patch ]; + + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = lib.optionals (pythonAtLeast "3.12") [ - # KeyError: 'assertRaises' - "test_enforcing_when_incompatible" - ]; - pythonImportsCheck = [ "overrides" ]; meta = { diff --git a/pkgs/development/python-modules/overrides/pytest9-compat.patch b/pkgs/development/python-modules/overrides/pytest9-compat.patch new file mode 100644 index 000000000000..e810f60c76f5 --- /dev/null +++ b/pkgs/development/python-modules/overrides/pytest9-compat.patch @@ -0,0 +1,19 @@ +diff --git a/conftest.py b/conftest.py +index a00ac4e..51f37fe 100644 +--- a/conftest.py ++++ b/conftest.py +@@ -1,11 +1,10 @@ + import sys ++from pathlib import Path + from typing import Optional + +-import py + +- +-def pytest_ignore_collect(path: py.path.local, config: "Config") -> Optional[bool]: ++def pytest_ignore_collect(collection_path: Path) -> Optional[bool]: + if sys.version_info[0] == 3 and sys.version_info[1] < 8: +- if str(path).endswith("__py38.py"): ++ if str(collection_path.name).endswith("__py38.py"): + return True + return None diff --git a/pkgs/development/python-modules/packageurl-python/default.nix b/pkgs/development/python-modules/packageurl-python/default.nix index 7983208de268..a165b4a4c05a 100644 --- a/pkgs/development/python-modules/packageurl-python/default.nix +++ b/pkgs/development/python-modules/packageurl-python/default.nix @@ -1,33 +1,39 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + pydantic, pytestCheckHook, setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "packageurl-python"; - version = "0.17.5"; + version = "0.17.6"; pyproject = true; - src = fetchPypi { - pname = "packageurl_python"; - inherit version; - hash = "sha256-p74/O6cNcF9zis6b9hJPMZICRaSfpp1LQW2nA33S3mE="; + src = fetchFromGitHub { + owner = "package-url"; + repo = "packageurl-python"; + tag = "v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-jH4zJN3XGPFBnto26pcvADXogpooj3dqpqkWnKXgICY="; }; build-system = [ setuptools ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pydantic + pytestCheckHook + ]; pythonImportsCheck = [ "packageurl" ]; meta = { description = "Python parser and builder for package URLs"; homepage = "https://github.com/package-url/packageurl-python"; - changelog = "https://github.com/package-url/packageurl-python/blob/v${version}/CHANGELOG.rst"; + changelog = "https://github.com/package-url/packageurl-python/blob/${finalAttrs.src.tag}/CHANGELOG.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ armijnhemel ]; }; -} +}) diff --git a/pkgs/development/python-modules/packvers/default.nix b/pkgs/development/python-modules/packvers/default.nix index b7181bdceda3..82890f16474f 100644 --- a/pkgs/development/python-modules/packvers/default.nix +++ b/pkgs/development/python-modules/packvers/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "packvers"; - version = "21.5"; + version = "22.0"; pyproject = true; src = fetchFromGitHub { owner = "nexB"; repo = "packvers"; tag = version; - hash = "sha256-nCSYL0g7mXi9pGFt24pOXbmmYsaRuB+rRZrygf8DTLE="; + hash = "sha256-19jCW3BK6XIcukDsFd1jERc2+g8Hcs/gdm3+dBzQS14="; }; build-system = [ setuptools ]; @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = { description = "Module for version handling of modules"; homepage = "https://github.com/aboutcode-org/packvers"; - changelog = "https://github.com/nexB/packvers/blob/${version}/CHANGELOG.rst"; + changelog = "https://github.com/nexB/packvers/blob/${src.tag}/CHANGELOG.rst"; license = with lib.licenses; [ asl20 # and bsd2 diff --git a/pkgs/development/python-modules/paddlex/default.nix b/pkgs/development/python-modules/paddlex/default.nix index ad83787eb906..94ec2bdc687f 100644 --- a/pkgs/development/python-modules/paddlex/default.nix +++ b/pkgs/development/python-modules/paddlex/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "paddlex"; - version = "3.3.12"; + version = "3.3.13"; pyproject = true; src = fetchFromGitHub { owner = "PaddlePaddle"; repo = "PaddleX"; tag = "v${version}"; - hash = "sha256-IK+Mk2IWrDGCLH3nw5/WR0uPIFBAsb/h4/MMmSlxT9s="; + hash = "sha256-ZihftxrU2Ydo8S6CWum0l6xHxeyl6X4urHtV8zo3vpg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/paho-mqtt/default.nix b/pkgs/development/python-modules/paho-mqtt/default.nix index e311946def5f..ac25b8275f16 100644 --- a/pkgs/development/python-modules/paho-mqtt/default.nix +++ b/pkgs/development/python-modules/paho-mqtt/default.nix @@ -46,6 +46,12 @@ buildPythonPackage rec { export PYTHONPATH=".:$PYTHONPATH" ''; + disabledTests = [ + # Fails during teardown + # RuntimeError: Client 01-zero-length-clientid.py exited with code None, expected 0 + "test_01_zero_length_clientid" + ]; + meta = { changelog = "https://github.com/eclipse/paho.mqtt.python/blob/${src.rev}/ChangeLog.txt"; description = "MQTT version 5.0/3.1.1 client class"; diff --git a/pkgs/development/python-modules/pandas-stubs/default.nix b/pkgs/development/python-modules/pandas-stubs/default.nix index 4359bf17c765..c4003e943cac 100644 --- a/pkgs/development/python-modules/pandas-stubs/default.nix +++ b/pkgs/development/python-modules/pandas-stubs/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "pandas-stubs"; - version = "2.3.2.250926"; + version = "2.3.3.260113"; pyproject = true; src = fetchFromGitHub { owner = "pandas-dev"; repo = "pandas-stubs"; tag = "v${version}"; - hash = "sha256-nyyuDvhF9GY+vKGHpup7nrsrNf+Y3dYNawXyfxGPEpQ="; + hash = "sha256-DJS3aG79IZowiTqHeOEgDdlH9Z1SXrbZ7yplCrFTtzw="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 23858cc70ba4..947122608e8c 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, # build-system - cython, + cython_3_1, meson-python, meson, pkg-config, @@ -90,7 +90,7 @@ let ''; build-system = [ - cython + cython_3_1 meson-python meson numpy diff --git a/pkgs/development/python-modules/pandera/default.nix b/pkgs/development/python-modules/pandera/default.nix index 7b92c0fd8703..5ca0ab0a1bee 100644 --- a/pkgs/development/python-modules/pandera/default.nix +++ b/pkgs/development/python-modules/pandera/default.nix @@ -43,14 +43,14 @@ buildPythonPackage rec { pname = "pandera"; - version = "0.27.1"; + version = "0.28.1"; pyproject = true; src = fetchFromGitHub { owner = "unionai-oss"; repo = "pandera"; tag = "v${version}"; - hash = "sha256-p4oyPlrz+fsAj3PXQnt3HOG48bkWbbG4BVU8pm2P2aU="; + hash = "sha256-PXcLJwebJ6BQ4nUtXUZFGb0vQp/g6jj+afewTTMt84s="; }; build-system = [ diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index 755ae203d8f2..af7574ee8e4c 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.5"; + version = "1.8.5"; format = "wheel"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; format = "wheel"; - hash = "sha256-HDtKM11W1aoM9dbhw2hKKX4kpiz5k0XF6euFUoN7l8M="; + hash = "sha256-srrwEPz6xMku7/5x9GmQey9/rc/9025C+HxUHLtIw7M="; dist = "py3"; python = "py3"; }; diff --git a/pkgs/development/python-modules/parallel-ssh/default.nix b/pkgs/development/python-modules/parallel-ssh/default.nix index a98411d293bd..c891d1e9e63d 100644 --- a/pkgs/development/python-modules/parallel-ssh/default.nix +++ b/pkgs/development/python-modules/parallel-ssh/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "parallel-ssh"; - version = "2.14.0"; + version = "2.16.0.post1"; format = "setuptools"; src = fetchFromGitHub { owner = "ParallelSSH"; repo = "parallel-ssh"; tag = version; - hash = "sha256-TeNQitaNVbK96Aui8OcKin2sHpF8VlMQmb5ODT2lQh4="; + hash = "sha256-jwigzgW94pYkSfYbmyIg776DcML6zH5nYKK1aFs68j8="; }; build-system = [ diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix index 1c565bf36dc1..7850cc3c04a4 100644 --- a/pkgs/development/python-modules/param/default.nix +++ b/pkgs/development/python-modules/param/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "param"; - version = "2.2.1"; + version = "2.3.1"; pyproject = true; src = fetchFromGitHub { owner = "holoviz"; repo = "param"; tag = "v${version}"; - hash = "sha256-tucF37o4Yf1OkGz4TUUFI/cGNlVLvTMcak+SmbztCMA="; + hash = "sha256-lC3XIaL1WQJoNaiiXeMvZ2JNMgHF+mAwLpnMu0sa9wY="; }; build-system = [ diff --git a/pkgs/development/python-modules/parsedmarc/default.nix b/pkgs/development/python-modules/parsedmarc/default.nix index 3a9252f15d06..377a6ff634fe 100644 --- a/pkgs/development/python-modules/parsedmarc/default.nix +++ b/pkgs/development/python-modules/parsedmarc/default.nix @@ -48,14 +48,14 @@ let in buildPythonPackage rec { pname = "parsedmarc"; - version = "8.18.6"; + version = "9.0.10"; pyproject = true; src = fetchFromGitHub { owner = "domainaware"; repo = "parsedmarc"; tag = version; - hash = "sha256-wwncnkZnd8GsjvwsuJEgFYCtapzGYYcVBRYoJ1cwVEw="; + hash = "sha256-FrLqR9YTZ75YQDWKdFCVTYiY3wTj0OlKSvMukDwDiHs="; }; build-system = [ diff --git a/pkgs/development/python-modules/parselmouth/default.nix b/pkgs/development/python-modules/parselmouth/default.nix index 855089e2a5c7..6fcff81e9a78 100644 --- a/pkgs/development/python-modules/parselmouth/default.nix +++ b/pkgs/development/python-modules/parselmouth/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "parselmouth"; - version = "0.4.6"; + version = "0.4.7"; pyproject = true; src = fetchFromGitHub { @@ -21,7 +21,7 @@ buildPythonPackage rec { repo = "Parselmouth"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-ish9FQWdDCJ54S3s3ELZa40ttCs3opTRtFAQNg9lEIM="; + hash = "sha256-gogNiKZVQaAzu/VeP4+bg61GtdptZeNkQatcJ/cjXFI="; }; configurePhase = '' diff --git a/pkgs/development/python-modules/parsimonious/default.nix b/pkgs/development/python-modules/parsimonious/default.nix index 0047a8098616..7a28188e2d58 100644 --- a/pkgs/development/python-modules/parsimonious/default.nix +++ b/pkgs/development/python-modules/parsimonious/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "parsimonious"; - version = "0.10.0"; + version = "0.11.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-goFgDaGA7IrjVCekq097gr/sHj0eUvgMtg6oK5USUBw="; + hash = "sha256-4IA3fZiVe+7AU1gNOK5U/N98Rw+3hnC6S/i1+dXK0qk="; }; propagatedBuildInputs = [ regex ]; diff --git a/pkgs/development/python-modules/parsy/default.nix b/pkgs/development/python-modules/parsy/default.nix index f040c469880c..3f2a031d87c1 100644 --- a/pkgs/development/python-modules/parsy/default.nix +++ b/pkgs/development/python-modules/parsy/default.nix @@ -3,20 +3,23 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "parsy"; - version = "2.1"; - format = "setuptools"; + version = "2.2"; + pyproject = true; src = fetchFromGitHub { repo = "parsy"; owner = "python-parsy"; - tag = "v${version}"; - hash = "sha256-/Bu3xZUpXI4WiYJKKWTJTdSFq8pwC1PFDw0Kr8s3Fe8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-EzIpKlT0Yvh0XWP6tb24tvuOe4BH8KuwJ5WCUzAM8mY="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "parsy" ]; @@ -24,8 +27,8 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/python-parsy/parsy"; description = "Easy-to-use parser combinators, for parsing in pure Python"; - changelog = "https://github.com/python-parsy/parsy/blob/v${version}/docs/history.rst"; + changelog = "https://github.com/python-parsy/parsy/blob/${finalAttrs.src.tag}/docs/history.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ milibopp ]; }; -} +}) diff --git a/pkgs/development/python-modules/partd/default.nix b/pkgs/development/python-modules/partd/default.nix index b8f041253ed2..1f6756170992 100644 --- a/pkgs/development/python-modules/partd/default.nix +++ b/pkgs/development/python-modules/partd/default.nix @@ -2,10 +2,10 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, # build-system setuptools, + versioneer, # dependencies locket, @@ -23,26 +23,21 @@ buildPythonPackage rec { pname = "partd"; - version = "1.4.1"; + version = "1.4.2"; pyproject = true; src = fetchFromGitHub { owner = "dask"; repo = "partd"; tag = version; - hash = "sha256-EK+HNSPh2b7jwpc6jwH/n+6HDgHhRfBeaRuiDIWVG28="; + hash = "sha256-GtIo6n87TmM5aRgtRyxhhXXAINpPCFbjZ/sQz/vkcoA="; }; - patches = [ - (fetchpatch2 { - # python 3.12 support; https://github.com/dask/partd/pull/70 - url = "https://github.com/dask/partd/pull/70/commits/c96a034367cb9fee0a0900f758b802aeef8a8a41.patch"; - hash = "sha256-QlSIrFQQQo9We/gf7WSgmWrxdt3rxXQcyvJnFm8R5cM="; - }) + nativeBuildInputs = [ + setuptools + versioneer ]; - nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ locket toolz diff --git a/pkgs/development/python-modules/particle/default.nix b/pkgs/development/python-modules/particle/default.nix index 0e36fb70419f..0850c92c811a 100644 --- a/pkgs/development/python-modules/particle/default.nix +++ b/pkgs/development/python-modules/particle/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "particle"; - version = "0.25.4"; + version = "0.26.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-v6d9iqBz5rSY8a4tTUkmtwdmKwYPsj65hqfNtJMfWK8="; + hash = "sha256-EHaY0K2NVtZWjvlzZ/Qk5dZyoUCHpd4xU51iGCV1kMc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/patch-ng/default.nix b/pkgs/development/python-modules/patch-ng/default.nix index 5b114e81d774..8c7a65c5e626 100644 --- a/pkgs/development/python-modules/patch-ng/default.nix +++ b/pkgs/development/python-modules/patch-ng/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "1.18.1"; # note: `conan` package may require a hardcoded one + version = "1.19.0"; # note: `conan` package may require a hardcoded one format = "setuptools"; pname = "patch-ng"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Uv1G7kb2yGZ2kmgsH9cTTtxlotLQhOvsHSlaYIf8ApE="; + sha256 = "sha256-J0hHkvSsHBX+Lz5M7PdLuYM9M7dccVtx0Zn34efR94Y="; }; meta = { diff --git a/pkgs/development/python-modules/pathos/default.nix b/pkgs/development/python-modules/pathos/default.nix index aad1ff0c04ad..f351081d3475 100644 --- a/pkgs/development/python-modules/pathos/default.nix +++ b/pkgs/development/python-modules/pathos/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pathos"; - version = "0.3.4"; + version = "0.3.5"; format = "setuptools"; src = fetchFromGitHub { owner = "uqfoundation"; repo = "pathos"; tag = version; - hash = "sha256-oVqWrX40umazNw/ET/s3pKUwvh8ctgF9sS0U8WwFQkA="; + hash = "sha256-9ejrHHgSbDrbuq1bktyiKPJnQ1l52ug/lnJJbac7x4s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/patiencediff/default.nix b/pkgs/development/python-modules/patiencediff/default.nix index e846d1ca75dc..405afb734533 100644 --- a/pkgs/development/python-modules/patiencediff/default.nix +++ b/pkgs/development/python-modules/patiencediff/default.nix @@ -2,23 +2,44 @@ lib, buildPythonPackage, fetchFromGitHub, + cargo, + rustPlatform, + rustc, setuptools, + setuptools-rust, pytestCheckHook, }: buildPythonPackage rec { pname = "patiencediff"; - version = "0.2.15"; + version = "0.2.18"; pyproject = true; src = fetchFromGitHub { owner = "breezy-team"; repo = "patiencediff"; tag = "v${version}"; - hash = "sha256-SFu1oN1yE9tKeBgWhgWjDpR31AptGrls0D5kKQed+HI="; + hash = "sha256-jwApncXyyc3m3XSsftaRNO/LeXIhdduaiBDm0KEDc98="; }; - nativeBuildInputs = [ setuptools ]; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit pname version src; + hash = "sha256-GFVam/41RVziU7smtyI45unPe945OCLLQ0MqLqUK2JU="; + }; + + # make rust bindings non-optional + env.CIBUILDWHEEL = "1"; + + nativeBuildInputs = [ + cargo + rustPlatform.cargoSetupHook + rustc + ]; + + build-system = [ + setuptools + setuptools-rust + ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -28,7 +49,7 @@ buildPythonPackage rec { description = "C implementation of patiencediff algorithm for Python"; mainProgram = "patiencediff"; homepage = "https://github.com/breezy-team/patiencediff"; - changelog = "https://github.com/breezy-team/patiencediff/releases/tag/v${version}"; + changelog = "https://github.com/breezy-team/patiencediff/releases/tag/${src.tag}"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ wildsebastian ]; }; diff --git a/pkgs/development/python-modules/patsy/default.nix b/pkgs/development/python-modules/patsy/default.nix index c269b4a6ae38..6f5b046cd148 100644 --- a/pkgs/development/python-modules/patsy/default.nix +++ b/pkgs/development/python-modules/patsy/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "patsy"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; src = fetchFromGitHub { owner = "pydata"; repo = "patsy"; tag = "v${version}"; - hash = "sha256-gtkvFxNzMFiBBiuKhelSSsTilA/fLJSC5QHqDLiRrWE="; + hash = "sha256-queErA3RdYBxIgOh3f2EfKPixpNfmevxLfNtjzcCCaI="; }; build-system = [ setuptools ]; @@ -32,7 +32,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "patsy" ]; meta = { - changelog = "https://github.com/pydata/patsy/releases/tag/v${version}"; + changelog = "https://github.com/pydata/patsy/releases/tag/${src.tag}"; description = "Python package for describing statistical models"; homepage = "https://github.com/pydata/patsy"; license = lib.licenses.bsd2; diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index 2c4d342f03e1..d0ea8d49103c 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pbr"; - version = "7.0.1"; + version = "7.0.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-PsvLEdK4VRWI7IFrN1ax60OUGGw7aJsX4EhQ38IPflc="; + hash = "sha256-tGAE7DClMkZyaD7ISK7Z6PxQCw0mHUCjIpwtK7/O3Ck="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pbr/tests.nix b/pkgs/development/python-modules/pbr/tests.nix index ede61b0dc11c..9f46dfe83b18 100644 --- a/pkgs/development/python-modules/pbr/tests.nix +++ b/pkgs/development/python-modules/pbr/tests.nix @@ -9,6 +9,7 @@ testresources, testscenarios, virtualenv, + wheel, }: buildPythonPackage { @@ -38,6 +39,7 @@ buildPythonPackage { testresources testscenarios virtualenv + wheel ]; checkPhase = '' diff --git a/pkgs/development/python-modules/pcffont/default.nix b/pkgs/development/python-modules/pcffont/default.nix index b131a44277c5..96d6fac2addc 100644 --- a/pkgs/development/python-modules/pcffont/default.nix +++ b/pkgs/development/python-modules/pcffont/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pcffont"; - version = "0.0.21"; + version = "0.0.24"; pyproject = true; src = fetchPypi { pname = "pcffont"; inherit version; - hash = "sha256-RWmR6shNFuJytOfRAVTiNdIJMRpkBchBj8zOy4ybE9o="; + hash = "sha256-Sax3bUs6ogQ+LuUAy6k1zEfN4WT81zm1LzP2s/6Pecg="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pcre2-py/default.nix b/pkgs/development/python-modules/pcre2-py/default.nix index 893ca748162f..2aa396f8d5f2 100644 --- a/pkgs/development/python-modules/pcre2-py/default.nix +++ b/pkgs/development/python-modules/pcre2-py/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "pcre2-py"; - version = "0.5.2"; + version = "0.6.0"; pyproject = true; src = fetchFromGitHub { owner = "grtetrault"; repo = "pcre2.py"; tag = "v${version}"; - hash = "sha256-W3oKluXC4orw1ThYM1Beeu8+6rNMr8FSCqep84SmXLE="; + hash = "sha256-XSEYhVxOZnioFEX5kdODwF8SbPm5k6+TENsdOH9Yr1k="; fetchSubmodules = false; }; @@ -82,7 +82,7 @@ buildPythonPackage rec { meta = { description = "Python bindings for the PCRE2 library created by Philip Hazel"; homepage = "https://github.com/grtetrault/pcre2.py"; - changelog = "https://github.com/grtetrault/pcre2.py/releases/tag/v${version}"; + changelog = "https://github.com/grtetrault/pcre2.py/releases/tag/${src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ tochiaha ]; }; diff --git a/pkgs/development/python-modules/pdbfixer/default.nix b/pkgs/development/python-modules/pdbfixer/default.nix index aefb43c91215..ac71263ccfe0 100644 --- a/pkgs/development/python-modules/pdbfixer/default.nix +++ b/pkgs/development/python-modules/pdbfixer/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pdbfixer"; - version = "1.11"; + version = "1.12"; pyproject = true; src = fetchFromGitHub { owner = "openmm"; repo = "pdbfixer"; tag = "v${version}"; - hash = "sha256-Xk3m2w1p3Wu4g6qKGOH679wkKT0LKZLgGn/ARn219fQ="; + hash = "sha256-X2P5cWmdvAjY9dMFB+R21advkdYizR8PmevMPR0RR0o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pdfminer-six/default.nix b/pkgs/development/python-modules/pdfminer-six/default.nix index 0676e645e4e8..1894e5d7b256 100644 --- a/pkgs/development/python-modules/pdfminer-six/default.nix +++ b/pkgs/development/python-modules/pdfminer-six/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pdfminer-six"; - version = "20251230"; + version = "20260107"; pyproject = true; src = fetchFromGitHub { owner = "pdfminer"; repo = "pdfminer.six"; tag = version; - hash = "sha256-//rcpcEn4lYYEkji2bo801AWj1ThEZPRuq1hNYYyVVk="; + hash = "sha256-spWDwPoBLdySysYblCWABIWtokOMoJdpYQ6qxX94wIE="; }; build-system = [ @@ -58,7 +58,7 @@ buildPythonPackage rec { }; meta = { - changelog = "https://github.com/pdfminer/pdfminer.six/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/pdfminer/pdfminer.six/blob/${src.tag}/CHANGELOG.md"; description = "PDF parser and analyzer"; homepage = "https://github.com/pdfminer/pdfminer.six"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/peewee-migrate/default.nix b/pkgs/development/python-modules/peewee-migrate/default.nix index 330e00333682..fb377f030480 100644 --- a/pkgs/development/python-modules/peewee-migrate/default.nix +++ b/pkgs/development/python-modules/peewee-migrate/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "peewee-migrate"; - version = "1.13.0"; + version = "1.14.0"; pyproject = true; src = fetchFromGitHub { owner = "klen"; repo = "peewee_migrate"; tag = version; - hash = "sha256-sC63WH/4EmoQYfvl3HyBHDzT/jMZW/G7mTC138+ZHHU="; + hash = "sha256-WO6XTlHenEh8gO1eYJHaysQFMMmAOAdHYcISBZaNcrE="; }; postPatch = '' @@ -45,11 +45,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # sqlite3.OperationalError: error in table order after drop column... - "test_migrator" - ]; - meta = { description = "Simple migration engine for Peewee"; homepage = "https://github.com/klen/peewee_migrate"; diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index 3e43a05f99dd..f7b40872522a 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.18.3"; + version = "3.19.0"; pyproject = true; src = fetchFromGitHub { owner = "coleifer"; repo = "peewee"; tag = version; - hash = "sha256-gMoU6YQMlEfL6onRAA/8v/08Je2jeLoZ3zw+2n1fmw4="; + hash = "sha256-EO8gS5fMZ1GgJV2YMjy15XQGZa72fZF7dgG7RZUE9dA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix index d5efdc0e0349..5b65eefe4b9c 100644 --- a/pkgs/development/python-modules/persistent/default.nix +++ b/pkgs/development/python-modules/persistent/default.nix @@ -15,19 +15,14 @@ buildPythonPackage rec { pname = "persistent"; - version = "6.1.1"; + version = "6.5"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-LTIbYOsH75APhals8HH/jDua7m5nm+zEjEbzRX6NnS8="; + hash = "sha256-RwkiFZZTKYZRBcSMFSTp0mF6o88INaxiXDeUBPbL298="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "setuptools < 74" "setuptools" - ''; - build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index 61347f3b20ac..b0248aabda7e 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.31.4"; + version = "1.31.5"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-5+zOQzmJHyewsi4veeue/kQRi9OEIHNZ/Bg1D3iKzgA="; + hash = "sha256-RuuwO+UrenfAPHJcedosooHW6PWVd8pmsXyQCWGMrng="; }; build-system = [ diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index 1e6523e2ee59..d1048ca94524 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -1,35 +1,45 @@ { lib, buildPythonPackage, - fetchPypi, + cython, + fetchFromGitHub, pytest-cov-stub, - pytest, + pytestCheckHook, setuptools, }: buildPythonPackage rec { pname = "pglast"; - version = "7.10"; + version = "7.11"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-AHJauP7dc0MEfhK8ZimUHKE5V/TC8t88XSri2gUnlsk="; + src = fetchFromGitHub { + owner = "lelit"; + repo = "pglast"; + tag = "v${version}"; + fetchSubmodules = true; + hash = "sha256-b8NrgfPhneERu3kXrrLmhGUSmcnz44SUuv3tBvZ55rE="; }; - build-system = [ setuptools ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail cython==3.2.3 cython \ + --replace-fail setuptools==80.9.0 setuptools + ''; - dependencies = [ setuptools ]; + build-system = [ + cython + setuptools + ]; nativeCheckInputs = [ - pytest + pytestCheckHook pytest-cov-stub ]; - # pytestCheckHook doesn't work - # ImportError: cannot import name 'parse_sql' from 'pglast' - checkPhase = '' - pytest + preCheck = '' + # import from $out + rm -r pglast ''; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pgsanity/default.nix b/pkgs/development/python-modules/pgsanity/default.nix index debb75faae01..7ef9a4d74568 100644 --- a/pkgs/development/python-modules/pgsanity/default.nix +++ b/pkgs/development/python-modules/pgsanity/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pgsanity"; - version = "0.2.9"; + version = "0.3.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "de0bbd6fe4f98bf5139cb5f466eac2e2abaf5a7b050b9e4867b87bf360873173"; + sha256 = "sha256-Po/DPQpk54w1gWOL9aArN6I8dmMb7uRYxuRMI6MIDKU="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index d137592ef2a5..d2b3cd0b33cc 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "9.0.10"; + version = "9.0.22"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-wtFaap0FNLFKd2T1EkatqZVj4mP2W4CwJR0adgrEobo="; + hash = "sha256-7/mFxlV1dJ0dVOB8VsNRfVJD4D4I5KYZF2HfmqsiePI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index f9a1b3ba5046..f8fff2da8374 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "phonopy"; - version = "2.43.2"; + version = "2.47.1"; pyproject = true; src = fetchFromGitHub { owner = "phonopy"; repo = "phonopy"; tag = "v${version}"; - hash = "sha256-5STe2CQsAj+e+cOH1XAQTmFoDDXVJ2eBQz6W6Wk30t0="; + hash = "sha256-zHEhYzSQKGre3LLtY555F3oTA8BowBy6InU79Mn2Cxo="; }; build-system = [ diff --git a/pkgs/development/python-modules/picos/default.nix b/pkgs/development/python-modules/picos/default.nix index 51f013b9f438..25d3eb02d79f 100644 --- a/pkgs/development/python-modules/picos/default.nix +++ b/pkgs/development/python-modules/picos/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "picos"; - version = "2.6.1"; + version = "2.6.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-u9yaKeP34YW55+PyVy3wPR0p0jBmiLywvZzw2zWdd6g="; + hash = "sha256-869PnpjwxEnrS2Atfk4CzAkn56kJSqU/XXmnSHZZ5DM="; }; # Needed only for the tests diff --git a/pkgs/development/python-modules/pijuice/default.nix b/pkgs/development/python-modules/pijuice/default.nix index 2baad57e2384..db6da3fbdaa2 100644 --- a/pkgs/development/python-modules/pijuice/default.nix +++ b/pkgs/development/python-modules/pijuice/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pijuice"; - version = "1.7"; + version = "1.8"; format = "setuptools"; src = fetchFromGitHub { @@ -16,8 +16,8 @@ buildPythonPackage rec { repo = "PiJuice"; # Latest commit that fixes using the library against python 3.9 by renaming # isAlive() to is_alive(). The former function was removed in python 3.9. - rev = "e2dca1f8dcfa12e009952a882c0674a545d193d6"; - sha256 = "07Jr7RSjqI8j0tT0MNAjrN1sjF1+mI+V0vtKInvtxj8="; + tag = "V${version}"; + sha256 = "sha256-tPYuI+VzbxmTeY/L3s0oDoydRDXJ6t76KmLUyJzxUvU="; }; patches = [ diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index d2608ce2d957..a3b790027e75 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "10.1.0"; + version = "10.3.0"; pyproject = true; src = fetchFromGitHub { @@ -37,7 +37,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-bNRzdG5oNj+653Tr2A9JGrABWNH8ZAWDOfhOafGZOjQ="; + hash = "sha256-fEIzmC17RYic4CFwBh5FdGbJmaWaiaPBK7eCQ7RCmr0="; }; patches = [ diff --git a/pkgs/development/python-modules/pillow-heif/default.nix b/pkgs/development/python-modules/pillow-heif/default.nix index f18cf4eeb124..e71dd2b293d5 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 = "1.1.1"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "bigcat88"; repo = "pillow_heif"; tag = "v${version}"; - hash = "sha256-hYBQA9DcY87e17SezK853xF6tRk8DoStmFryb/tQdRk="; + hash = "sha256-szpS6sl/Wj8nBZ2cYUt3r+8TvZKaB0DngGjjyG3kYrg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pinecone-client/default.nix b/pkgs/development/python-modules/pinecone-client/default.nix index e27e6f11251c..4d08354b6eeb 100644 --- a/pkgs/development/python-modules/pinecone-client/default.nix +++ b/pkgs/development/python-modules/pinecone-client/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "pinecone-client"; - version = "7.3.0"; + version = "8.0.0"; pyproject = true; src = fetchFromGitHub { owner = "pinecone-io"; repo = "pinecone-python-client"; tag = "v${version}"; - hash = "sha256-PT8Jr3sq5iZ9VFt6H6t4lLk72FXnHdyPUbcNGftg4QU="; + hash = "sha256-4oj1TBVykWvPtmfdRUgRojTds9bCWj9XOrcNRzUspKA="; }; build-system = [ diff --git a/pkgs/development/python-modules/pinecone-plugin-assistant/default.nix b/pkgs/development/python-modules/pinecone-plugin-assistant/default.nix index 9cbabf17e9e3..73184a3a1572 100644 --- a/pkgs/development/python-modules/pinecone-plugin-assistant/default.nix +++ b/pkgs/development/python-modules/pinecone-plugin-assistant/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pinecone-plugin-assistant"; - version = "1.8.0"; + version = "3.0.1"; pyproject = true; src = fetchPypi { pname = "pinecone_plugin_assistant"; inherit version; - hash = "sha256-joaCz/MPm66SQ7OEAhq6cckfTm7xZQ6dY+5kqrg8uoc="; + hash = "sha256-awDpTvG/Ve1gHSMW7m9x+W+TvyFVJ3qCZjg5XhCQ3eM="; }; build-system = [ diff --git a/pkgs/development/python-modules/pint-xarray/default.nix b/pkgs/development/python-modules/pint-xarray/default.nix index a12c127294fa..5eab0ba7c153 100644 --- a/pkgs/development/python-modules/pint-xarray/default.nix +++ b/pkgs/development/python-modules/pint-xarray/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pint-xarray"; - version = "0.5.1"; + version = "0.6.0"; pyproject = true; src = fetchFromGitHub { owner = "xarray-contrib"; repo = "pint-xarray"; tag = "v${version}"; - hash = "sha256-bPvLTtaROCYr8yWI6vQK7pYbBYUlsMzy7ALnufAT7Xo="; + hash = "sha256-mMAd315ijNseXbPc6UydoLcemXWlVOUAbFYLWRD6ZLA="; }; build-system = [ diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix index b2a305a1e183..c02656ed592b 100644 --- a/pkgs/development/python-modules/pint/default.nix +++ b/pkgs/development/python-modules/pint/default.nix @@ -15,7 +15,6 @@ # tests pytestCheckHook, - pytest-subtests, pytest-benchmark, numpy, matplotlib, @@ -55,7 +54,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-subtests pytest-benchmark matplotlib writableTmpDirAsHomeHook diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix index 8b081e6decd0..5e5d8dd7e8f4 100644 --- a/pkgs/development/python-modules/pipdeptree/default.nix +++ b/pkgs/development/python-modules/pipdeptree/default.nix @@ -15,23 +15,16 @@ buildPythonPackage rec { pname = "pipdeptree"; - version = "2.28.0"; + version = "2.30.0"; pyproject = true; src = fetchFromGitHub { owner = "tox-dev"; repo = "pipdeptree"; tag = version; - hash = "sha256-PYlNMAomqN9T60b8bRqb8mnLjFRn3JnI79Tynncxje8="; + hash = "sha256-nDCd4Bk5P65+fnFM/kC3cbfPanj5P35/bta86/E65i0="; }; - postPatch = '' - # only set to ensure py3.13 compat - # https://github.com/tox-dev/pipdeptree/pull/406 - substituteInPlace pyproject.toml \ - --replace-fail '"pip>=24.2"' '"pip"' - ''; - build-system = [ hatchling hatch-vcs diff --git a/pkgs/development/python-modules/pixel-font-builder/default.nix b/pkgs/development/python-modules/pixel-font-builder/default.nix index fdbd963b4080..b4882e65a6b7 100644 --- a/pkgs/development/python-modules/pixel-font-builder/default.nix +++ b/pkgs/development/python-modules/pixel-font-builder/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "pixel-font-builder"; - version = "0.0.39"; + version = "0.0.47"; pyproject = true; src = fetchPypi { pname = "pixel_font_builder"; inherit version; - hash = "sha256-osEaZDmby0Xcg3oec4m6TEXJQDfMvWeJeLOCIOwEMZA="; + hash = "sha256-O3HtwoZUp89mUgVMMcAd4CCPFqQpsyqlmug+QgNpgNQ="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pixel-font-knife/default.nix b/pkgs/development/python-modules/pixel-font-knife/default.nix index c5b4bac1528c..6559128b8f88 100644 --- a/pkgs/development/python-modules/pixel-font-knife/default.nix +++ b/pkgs/development/python-modules/pixel-font-knife/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pixel-font-knife"; - version = "0.0.16"; + version = "0.0.21"; pyproject = true; disabled = pythonOlder "3.12"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pixel_font_knife"; inherit version; - hash = "sha256-zF2NKR8/8EhtzxwJFKfP6EZf58QXmbut81kfpLqDDV8="; + hash = "sha256-QTwrxXn5uAp44D/rgbZiCaFP+rDU4H4LGw75n2hQJGs="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pkg-about/default.nix b/pkgs/development/python-modules/pkg-about/default.nix index 7bedbd047309..c807817a0576 100644 --- a/pkgs/development/python-modules/pkg-about/default.nix +++ b/pkgs/development/python-modules/pkg-about/default.nix @@ -7,18 +7,20 @@ importlib-resources, setuptools, packaging, + typing-extensions, + appdirs, pytestCheckHook, }: buildPythonPackage rec { pname = "pkg-about"; - version = "2.0.1"; + version = "2.0.12"; pyproject = true; src = fetchPypi { pname = "pkg_about"; inherit version; - hash = "sha256-hgQOmp+R4ZWbq8hKRUQQzMO4hl/pHAGiJK9c4lxEkaI="; + hash = "sha256-WFhOMeBvAPaU/AIGoGlSziJ633TrGBgOcbfBxAm3H8E="; }; # tox is listed in build requirements but not actually used to build @@ -38,9 +40,13 @@ buildPythonPackage rec { importlib-resources packaging setuptools + typing-extensions ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + appdirs + pytestCheckHook + ]; pythonImportsCheck = [ "pkg_about" ]; diff --git a/pkgs/development/python-modules/pkginfo2/default.nix b/pkgs/development/python-modules/pkginfo2/default.nix index 23aa3c41945b..feacfa7f9643 100644 --- a/pkgs/development/python-modules/pkginfo2/default.nix +++ b/pkgs/development/python-modules/pkginfo2/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pkginfo2"; - version = "30.0.0"; + version = "30.1.0"; pyproject = true; src = fetchFromGitHub { owner = "nexB"; repo = "pkginfo2"; tag = "v${version}"; - hash = "sha256-E9EyaN3ncf/34vvvhRe0rwV28VrjqJo79YFgXq2lKWU="; + hash = "sha256-M6fJbW1XCe+LKyjIupKnLmVkH582r1+AH44r9JA0Sxg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/plastexshowmore/default.nix b/pkgs/development/python-modules/plastexshowmore/default.nix index 907869829a03..7414c8c1f865 100644 --- a/pkgs/development/python-modules/plastexshowmore/default.nix +++ b/pkgs/development/python-modules/plastexshowmore/default.nix @@ -10,16 +10,16 @@ plasTeX, }: -buildPythonPackage { +buildPythonPackage (finalAttrs: { pname = "plastexshowmore"; - version = "0.0.2"; + version = "0.1.0"; pyproject = true; src = fetchFromGitHub { repo = "plastexshowmore"; owner = "PatrickMassot"; - rev = "0.0.2"; - hash = "sha256-b45VHHEwFA41FaInDteix56O7KYDzyKiRRSl7heHqEA="; + tag = finalAttrs.version; + hash = "sha256-fKjGt3bMAGUjUAea3IDo9wmcE/IJDB9vLEvFbqgWvDM="; }; build-system = [ setuptools ]; @@ -32,4 +32,4 @@ buildPythonPackage { maintainers = with lib.maintainers; [ niklashh ]; license = lib.licenses.asl20; }; -} +}) diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix index bc07d4c4948d..fd0cc9667c0d 100644 --- a/pkgs/development/python-modules/platformdirs/default.nix +++ b/pkgs/development/python-modules/platformdirs/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "platformdirs"; - version = "4.5.0"; + version = "4.5.1"; pyproject = true; src = fetchFromGitHub { owner = "tox-dev"; repo = "platformdirs"; tag = version; - hash = "sha256-ESXp9I6SL13BdsQLCUcfS8kwqayURCEguhINnK6Dd6k="; + hash = "sha256-wDhhfS8r0fCYOUJUu2kwH+fyTPmS+aPUiqWN21Fedoc="; }; build-system = [ diff --git a/pkgs/development/python-modules/plotpy/default.nix b/pkgs/development/python-modules/plotpy/default.nix index 16d654dc7e81..92b1c410f741 100644 --- a/pkgs/development/python-modules/plotpy/default.nix +++ b/pkgs/development/python-modules/plotpy/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "plotpy"; - version = "2.7.5"; + version = "2.8.3"; pyproject = true; src = fetchFromGitHub { owner = "PlotPyStack"; repo = "PlotPy"; tag = "v${version}"; - hash = "sha256-g26CWUQTaky7h1wHd9CAB4AEvk24frN7f6wqs1fefJw="; + hash = "sha256-MhJY9ENKAbsD0usHeCQhJFDKP2SoDVPXlnQ8OMi2YjU="; }; build-system = [ diff --git a/pkgs/development/python-modules/pluthon/default.nix b/pkgs/development/python-modules/pluthon/default.nix index 328d6272f3ad..ac8786c9cde6 100644 --- a/pkgs/development/python-modules/pluthon/default.nix +++ b/pkgs/development/python-modules/pluthon/default.nix @@ -10,15 +10,15 @@ buildPythonPackage rec { pname = "pluthon"; - version = "1.1.0"; + version = "1.3.5"; pyproject = true; src = fetchFromGitHub { owner = "OpShin"; repo = "pluthon"; - rev = version; - hash = "sha256-t8KWm2eBq6CzFPAWN9pgbpF62hvNNZWCpphJsY5T2OQ="; + tag = version; + hash = "sha256-9I4GLdaBxp1xG/3rFZvagugIhB0Vs21bMzPTI1/eKcE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pmdsky-debug-py/default.nix b/pkgs/development/python-modules/pmdsky-debug-py/default.nix index c1893d5a9577..f4c65ec627d1 100644 --- a/pkgs/development/python-modules/pmdsky-debug-py/default.nix +++ b/pkgs/development/python-modules/pmdsky-debug-py/default.nix @@ -8,7 +8,7 @@ #This python library is auto-generated. It should be possible to rebuild it from upstream, but seems unnecessary buildPythonPackage rec { pname = "pmdsky-debug-py"; - version = "10.0.48"; + version = "10.2.26"; pyproject = true; # SkyTemple specifically require this version. This is used when patching the binary, # and risk to be a bit problematic if using the latest version, given it doesn’t follow semver. @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SkyTemple"; repo = "pmdsky-debug-py"; - rev = version; - sha256 = "sha256-JTvLyYUwOEp1O0rtO313VIT6AYOqXWVFUleTrb6BN6Q="; + tag = version; + sha256 = "sha256-klgtuNjxNQcW01VkKCR69ahpno2XYoQy7MfZSOZ5H9Q="; }; prePatch = "cd src"; diff --git a/pkgs/development/python-modules/podcats/default.nix b/pkgs/development/python-modules/podcats/default.nix index f95fb719212f..6f2ed525f0e5 100644 --- a/pkgs/development/python-modules/podcats/default.nix +++ b/pkgs/development/python-modules/podcats/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "podcats"; - version = "0.5.0"; + version = "0.6.3"; pyproject = true; src = fetchFromGitHub { owner = "jakubroztocil"; repo = "podcats"; - rev = "v${version}"; - sha256 = "0zjdgry5n209rv19kj9yaxy7c7zq5gxr488izrgs4sc75vdzz8xc"; + tag = version; + sha256 = "sha256-1Jg9bR/3qMim3q5qVwUVbxeLNaXaCU6SplBUaRXeLpo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index 3cc932fa292f..82233e52f167 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "poetry-core"; - version = "2.2.1"; + version = "2.3.0"; pyproject = true; src = fetchFromGitHub { owner = "python-poetry"; repo = "poetry-core"; tag = version; - hash = "sha256-l5WTjKa+A66QfWLmrjCQq7ZrSaeuylGIRZr8jsiYq+A="; + hash = "sha256-oE0kv6ofe+qBFJq+OrgDIHsaysN+y5D9bIy8IB5n5y8="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/polyline/default.nix b/pkgs/development/python-modules/polyline/default.nix index 5927b0c6cabe..bb3b7a4a73a9 100644 --- a/pkgs/development/python-modules/polyline/default.nix +++ b/pkgs/development/python-modules/polyline/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "polyline"; - version = "2.0.3"; + version = "2.0.4"; pyproject = true; src = fetchFromGitHub { owner = "frederickjansen"; repo = "polyline"; tag = "v${version}"; - hash = "sha256-HUdjebUMcYGW+7dyOpVgBnBcesmqDWpw1NgYigOxmQ8="; + hash = "sha256-PaQLHz256ZZ+0PdSSeGM+rjubSnT4fQfpD1Uj3JfBt8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/posthog/default.nix b/pkgs/development/python-modules/posthog/default.nix index c244464031cd..361fe861a03e 100644 --- a/pkgs/development/python-modules/posthog/default.nix +++ b/pkgs/development/python-modules/posthog/default.nix @@ -65,6 +65,8 @@ buildPythonPackage (finalAttrs: { "test_upload" # AssertionError: 2 != 3 "test_flush_interval" + # len(client.distinct_ids_feature_flags_reported) = 101 != i % 100 + 1 + "test_capture_multiple_users_doesnt_out_of_memory" ] ++ lib.optionals (pythonAtLeast "3.14") [ # Pydantic V1 functionality isn't compatible with Python 3.14 diff --git a/pkgs/development/python-modules/pot/default.nix b/pkgs/development/python-modules/pot/default.nix index dd132b4e5ac0..36f22f78c3bd 100644 --- a/pkgs/development/python-modules/pot/default.nix +++ b/pkgs/development/python-modules/pot/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "pot"; - version = "0.9.5"; + version = "0.9.6.post1"; pyproject = true; src = fetchFromGitHub { owner = "PythonOT"; repo = "POT"; tag = version; - hash = "sha256-sEK3uhZtjVJGEN1Gs8N0AMtiEOo9Kpn/zOSWUfGc/qE="; + hash = "sha256-db4fKXqvg9DEmbI/RTQWcOdw+3ccPk74ME0VDsXZlsQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/pox/default.nix b/pkgs/development/python-modules/pox/default.nix index 88d26a073b3c..bc117dd5e3c2 100644 --- a/pkgs/development/python-modules/pox/default.nix +++ b/pkgs/development/python-modules/pox/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pox"; - version = "0.3.6"; + version = "0.3.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-hO7tOWABWaYoBKrPwA41Pt6q5n2MZHzKqrc6bv7T9gU="; + hash = "sha256-BlL28hA/5tS6Y4vrb6jT6KaP1EvLYzFcYUEYUVvMOvs="; }; # Test sare failing the sandbox diff --git a/pkgs/development/python-modules/price-parser/default.nix b/pkgs/development/python-modules/price-parser/default.nix index ecbed54a7c36..4b9b5b1ca7b0 100644 --- a/pkgs/development/python-modules/price-parser/default.nix +++ b/pkgs/development/python-modules/price-parser/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "price-parser"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; src = fetchFromGitHub { owner = "scrapinghub"; repo = "price-parser"; tag = version; - hash = "sha256-9f/+Yw94SVvg9fl9zYR9YEMwAgKHwySG5cysPMomnA0="; + hash = "sha256-1aMWRyrmvilON+crWibrREIN2Rf3hCzewI+vmRppvrg="; }; build-system = [ setuptools ]; @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = { description = "Extract price amount and currency symbol from a raw text string"; homepage = "https://github.com/scrapinghub/price-parser"; - changelog = "https://github.com/scrapinghub/price-parser/blob/${version}/CHANGES.rst"; + changelog = "https://github.com/scrapinghub/price-parser/blob/${src.tag}/CHANGES.rst"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ thanegill ]; }; diff --git a/pkgs/development/python-modules/prometheus-client/default.nix b/pkgs/development/python-modules/prometheus-client/default.nix index f704ff1d4ce7..db3849ebbb45 100644 --- a/pkgs/development/python-modules/prometheus-client/default.nix +++ b/pkgs/development/python-modules/prometheus-client/default.nix @@ -4,29 +4,39 @@ buildPythonPackage, fetchFromGitHub, setuptools, + asgiref, twisted, + pytest-benchmark, pytestCheckHook, }: buildPythonPackage rec { pname = "prometheus-client"; - version = "0.22.1"; + version = "0.24.1"; pyproject = true; src = fetchFromGitHub { owner = "prometheus"; repo = "client_python"; tag = "v${version}"; - hash = "sha256-DEuIoVpRDJTd9qXBeHa5jrBscmGgosCKAluqCuUBzuU="; + hash = "sha256-4swqhoCVrD7GflFbQX+QH9yGVDjbfwXvd7trs30STQQ="; }; build-system = [ setuptools ]; + dependencies = [ asgiref ]; + optional-dependencies.twisted = [ twisted ]; __darwinAllowLocalNetworking = true; - nativeCheckInputs = [ pytestCheckHook ] ++ lib.concatAttrValues optional-dependencies; + nativeCheckInputs = [ + pytest-benchmark + pytestCheckHook + ] + ++ lib.concatAttrValues optional-dependencies; + + pytestFlags = [ "--benchmark-disable" ]; pythonImportsCheck = [ "prometheus_client" ]; diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix index 26477b186423..1db90239a52a 100644 --- a/pkgs/development/python-modules/proto-plus/default.nix +++ b/pkgs/development/python-modules/proto-plus/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "proto-plus"; - version = "1.26.1"; + version = "1.27.0"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "proto-plus-python"; tag = "v${version}"; - hash = "sha256-7FonHHXpgJC0vg9Y26bqz0g1NmLWwaZWyFZ0kv7PjY8="; + hash = "sha256-Ya7BY0ZyAAEzomJVExd1cF5r11gTHXeHcjPRqkBjeuQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/protobuf/6.nix b/pkgs/development/python-modules/protobuf/6.nix index 5c601b531683..1d05e4ad3346 100644 --- a/pkgs/development/python-modules/protobuf/6.nix +++ b/pkgs/development/python-modules/protobuf/6.nix @@ -7,14 +7,14 @@ protobuf, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "protobuf"; - version = "6.33.3"; + version = "6.33.5"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-yHlN6+tAKWP93/QaWV4fZJvNdmFrpWyDVkXKtFOegQ4="; + inherit (finalAttrs) pname version; + hash = "sha256-bdysKggfi3uWQsCUBrxqQpASj85fRxzd0WWWC7kRnlw="; }; build-system = [ setuptools ]; @@ -26,7 +26,7 @@ buildPythonPackage rec { doCheck = # https://protobuf.dev/support/cross-version-runtime-guarantee/#backwards # The non-python protobuf provides the protoc binary which must not be newer. - assert lib.versionAtLeast version ("6." + protobuf.version); + assert lib.versionAtLeast finalAttrs.version ("6." + protobuf.version); # the pypi source archive does not ship tests false; @@ -50,9 +50,9 @@ buildPythonPackage rec { description = "Protocol Buffers are Google's data interchange format"; homepage = "https://developers.google.com/protocol-buffers/"; changelog = "https://github.com/protocolbuffers/protobuf/releases/v${ - builtins.substring 2 (-1) version + builtins.substring 2 (-1) finalAttrs.version }"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ GaetanLepage ]; }; -} +}) diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index 8a60fac56e20..e78a124b749f 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -5,20 +5,21 @@ fetchFromGitHub, setuptools, pytestCheckHook, - python, + pytest-instafail, + pytest-xdist, gitUpdater, }: buildPythonPackage rec { pname = "psutil"; - version = "7.1.3"; + version = "7.2.1"; pyproject = true; src = fetchFromGitHub { owner = "giampaolo"; repo = "psutil"; tag = "release-${version}"; - hash = "sha256-vMGUoiPr+QIe1N+I++d/DM9i2jeHTI68npGoJ2vKF10="; + hash = "sha256-HGIFf7E356o0OcgLOPjACmrPXneQt/8IhzyudKKuLdg="; }; postPatch = '' @@ -31,7 +32,11 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-instafail + pytest-xdist + ]; # Segfaults on darwin: # https://github.com/giampaolo/psutil/issues/1715 @@ -43,7 +48,7 @@ buildPythonPackage rec { # - the other disabled tests are likely due to sandboxing (missing specific errors) enabledTestPaths = [ # Note: $out must be referenced as test import paths are relative - "${placeholder "out"}/${python.sitePackages}/psutil/tests/test_system.py" + "tests/test_system.py" ]; disabledTests = [ @@ -59,6 +64,10 @@ buildPythonPackage rec { "test_disk_partitions" # problematic on Hydra's Linux builders, apparently ]; + preCheck = '' + rm -rf psutil + ''; + pythonImportsCheck = [ "psutil" ]; passthru.updateScript = gitUpdater { diff --git a/pkgs/development/python-modules/psygnal/default.nix b/pkgs/development/python-modules/psygnal/default.nix index 5f18da5f0780..0a9f7516762c 100644 --- a/pkgs/development/python-modules/psygnal/default.nix +++ b/pkgs/development/python-modules/psygnal/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "psygnal"; - version = "0.14.0"; + version = "0.15.1"; pyproject = true; src = fetchFromGitHub { owner = "pyapp-kit"; repo = "psygnal"; tag = "v${version}"; - hash = "sha256-RQ53elonwvna5UDVell3JI1dcZSMHREyB51r+ddsW2M="; + hash = "sha256-7d9ejzdafoH14fKvYJd3OwYS0RGwDmMeLlj74qvsvjE="; }; build-system = [ diff --git a/pkgs/development/python-modules/pulp/cbc_path_fixes.patch b/pkgs/development/python-modules/pulp/cbc_path_fixes.patch new file mode 100644 index 000000000000..e64988788638 --- /dev/null +++ b/pkgs/development/python-modules/pulp/cbc_path_fixes.patch @@ -0,0 +1,24 @@ +diff --git a/pulp/apis/coin_api.py b/pulp/apis/coin_api.py +index c69d278..e299069 100644 +--- a/pulp/apis/coin_api.py ++++ b/pulp/apis/coin_api.py +@@ -48,7 +48,7 @@ import ctypes + import warnings + from tempfile import mktemp + +-cbc_path = "cbc" ++cbc_path = "@cbc@" + if operating_system == "win": + cbc_path += ".exe" + +@@ -56,9 +56,7 @@ coinMP_path = ["libCoinMP.so"] + # workaround for (https://github.com/coin-or/pulp/issues/802) + if operating_system == "osx": + arch = "i64" +-pulp_cbc_path = os.path.join( +- os.path.dirname(__file__), f"../solverdir/cbc/{operating_system}/{arch}/{cbc_path}" +-) ++pulp_cbc_path = "@cbc@" + + + class COIN_CMD(LpSolver_CMD): diff --git a/pkgs/development/python-modules/pulp/default.nix b/pkgs/development/python-modules/pulp/default.nix index a0fc01838b8b..cb95a6599cae 100644 --- a/pkgs/development/python-modules/pulp/default.nix +++ b/pkgs/development/python-modules/pulp/default.nix @@ -6,27 +6,30 @@ fetchFromGitHub, pyparsing, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "pulp"; - version = "2.8.0"; - format = "setuptools"; + version = "3.3.0"; + pyproject = true; src = fetchFromGitHub { owner = "coin-or"; repo = "pulp"; tag = version; - hash = "sha256-lpbk1GeC8F/iLGV8G5RPHghnaM9eL82YekUYEt9+mvc="; + hash = "sha256-b9qTJqSC8G3jxcqS4mkQ1gOLLab+YzYaNClRwD6I/hk="; }; + patches = [ ./cbc_path_fixes.patch ]; + postPatch = '' - sed -i pulp/pulp.cfg.linux \ - -e 's|CbcPath = .*|CbcPath = ${cbc}/bin/cbc|' \ - -e 's|PulpCbcPath = .*|PulpCbcPath = ${cbc}/bin/cbc|' + substituteInPlace pulp/apis/coin_api.py --subst-var-by "cbc" "${lib.getExe' cbc "cbc"}" ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ amply pyparsing ]; diff --git a/pkgs/development/python-modules/pulsar-client/default.nix b/pkgs/development/python-modules/pulsar-client/default.nix index d622143b68da..cfe1cfa6b322 100644 --- a/pkgs/development/python-modules/pulsar-client/default.nix +++ b/pkgs/development/python-modules/pulsar-client/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "pulsar-client"; - version = "3.8.0"; + version = "3.9.0"; pyproject = true; src = fetchFromGitHub { owner = "apache"; repo = "pulsar-client-python"; tag = "v${version}"; - hash = "sha256-0EeQiYEYdER6qPQUYsk/OwYKiPWG0oymG5eiB01Oysk="; + hash = "sha256-TxX+om+uKjZlgG10qcLAddiUisBWLxBfBSHEHGix1d4="; }; build-system = [ diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index 981e049b149d..87f00db235ec 100644 --- a/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/pkgs/development/python-modules/pulumi-aws/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independent of pulumi's. - version = "7.15.0"; + version = "7.16.0"; pyproject = true; src = fetchFromGitHub { owner = "pulumi"; repo = "pulumi-aws"; tag = "v${version}"; - hash = "sha256-aCTXhaWQgYcDyUMc6ulo/PtEGU/6Mb5MlIjtJI/V1Mw="; + hash = "sha256-Vy6Azt3rRQliskt26Jjeos/Tj4MEz26owtyfhRPzSP0="; }; sourceRoot = "${src.name}/sdk/python"; diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix index cd42acc0c142..385ea8fa975e 100644 --- a/pkgs/development/python-modules/pvlib/default.nix +++ b/pkgs/development/python-modules/pvlib/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "pvlib"; - version = "0.13.1"; + version = "0.14.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-qT/RGNBIt4fbZsI0SGwFwMZc8J2zRNggg5YbyCat9G8="; + hash = "sha256-nmpmhlJAzk4xy+nTYKKNbreVO6u2KsQDry+QrtFqRQk="; }; build-system = [ diff --git a/pkgs/development/python-modules/py-cid/default.nix b/pkgs/development/python-modules/py-cid/default.nix index f6c48e04c861..f60f46f4c2f6 100644 --- a/pkgs/development/python-modules/py-cid/default.nix +++ b/pkgs/development/python-modules/py-cid/default.nix @@ -9,28 +9,27 @@ morphys, py-multihash, hypothesis, + pytest-cov-stub, + setuptools, }: buildPythonPackage rec { pname = "py-cid"; - version = "0.3.0"; - format = "setuptools"; + version = "0.4.0"; + pyproject = true; src = fetchFromGitHub { owner = "ipld"; repo = "py-cid"; - rev = "v${version}"; - hash = "sha256-aN7ee25ghKKa90+FoMDCdGauToePc5AzDLV3tONvh4U="; + tag = "v${version}"; + hash = "sha256-IYjk7sajHFWgsOMxwk1tWvKtTfPN8vHoNeENQed7MiU="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "base58>=1.0.2,<2.0" "base58>=1.0.2" \ - --replace "py-multihash>=0.2.0,<1.0.0" "py-multihash>=0.2.0" \ - --replace "'pytest-runner'," "" - ''; + pythonRelaxDeps = [ "base58" ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ base58 py-multibase py-multicodec @@ -40,6 +39,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + pytest-cov-stub hypothesis ]; @@ -48,6 +48,7 @@ buildPythonPackage rec { meta = { description = "Self-describing content-addressed identifiers for distributed systems implementation in Python"; homepage = "https://github.com/ipld/py-cid"; + changelog = "https://github.com/ipld/py-cid/blob/${src.tag}/HISTORY.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ Luflosi ]; }; diff --git a/pkgs/development/python-modules/py-dactyl/default.nix b/pkgs/development/python-modules/py-dactyl/default.nix index bab4f248a9e5..8bed0ba855bc 100644 --- a/pkgs/development/python-modules/py-dactyl/default.nix +++ b/pkgs/development/python-modules/py-dactyl/default.nix @@ -6,18 +6,19 @@ pytestCheckHook, requests, setuptools, + websocket-client, }: buildPythonPackage rec { pname = "py-dactyl"; - version = "2.1.0"; + version = "2.1.2"; pyproject = true; src = fetchFromGitHub { owner = "iamkubi"; repo = "pydactyl"; tag = "v${version}"; - hash = "sha256-1bvdJ9ATF0cRy7WE8H2IV2WIMbiSnRnelGpWIN7VBRQ="; + hash = "sha256-/bmk4RIS8pEi+RbJ+6tOchwFj246hdoTXv6WBNisKuc="; }; build-system = [ setuptools ]; @@ -25,6 +26,7 @@ buildPythonPackage rec { dependencies = [ aiohttp requests + websocket-client ]; pythonImportsCheck = [ "pydactyl" ]; diff --git a/pkgs/development/python-modules/py-deprecate/default.nix b/pkgs/development/python-modules/py-deprecate/default.nix index 76c5a630ea8c..e9fd672de125 100644 --- a/pkgs/development/python-modules/py-deprecate/default.nix +++ b/pkgs/development/python-modules/py-deprecate/default.nix @@ -8,7 +8,7 @@ let pname = "py-deprecate"; - version = "0.3.2"; + version = "0.4.0"; in buildPythonPackage { inherit pname version; @@ -17,8 +17,8 @@ buildPythonPackage { src = fetchFromGitHub { owner = "Borda"; repo = "pyDeprecate"; - rev = "v${version}"; - hash = "sha256-84RmQvLxwtLPQk3hX7Q6eeJeejhrO3t+mc95W1E85Fg="; + tag = "v${version}"; + hash = "sha256-Rc/5Y3myEUjbXRr2uE+1iaIrCZK+eeKXy05+C75sn3g="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/py-desmume/default.nix b/pkgs/development/python-modules/py-desmume/default.nix index ac3763f97227..1acb05e39698 100644 --- a/pkgs/development/python-modules/py-desmume/default.nix +++ b/pkgs/development/python-modules/py-desmume/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "py-desmume"; - version = "0.0.7"; + version = "0.0.9"; format = "setuptools"; src = fetchFromGitHub { owner = "SkyTemple"; repo = "py-desmume"; tag = version; - hash = "sha256-aH7f/BI89VLUGqwA8Y7ThSpmKxWffYRETT/+EjPVTg8="; + hash = "sha256-AlejNgCgncZGCS/xOb3FZiLuEtMsMcprnhnM759aKgY="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/py-evm/default.nix b/pkgs/development/python-modules/py-evm/default.nix index b1e79891093c..58767884c199 100644 --- a/pkgs/development/python-modules/py-evm/default.nix +++ b/pkgs/development/python-modules/py-evm/default.nix @@ -64,6 +64,11 @@ buildPythonPackage rec { pycryptodome ]; + pytestFlags = [ + # 'asyncio.iscoroutinefunction' is deprecated and slated for removal in Python 3.16; use inspect.iscoroutinefunction() instead + "-Wignore::DeprecationWarning" + ]; + disabledTests = [ # side-effect: runs pip online check and is blocked by sandbox "test_install_local_wheel" diff --git a/pkgs/development/python-modules/py-multiaddr/default.nix b/pkgs/development/python-modules/py-multiaddr/default.nix index b2ad11184d14..9b002fd4058e 100644 --- a/pkgs/development/python-modules/py-multiaddr/default.nix +++ b/pkgs/development/python-modules/py-multiaddr/default.nix @@ -1,38 +1,45 @@ { lib, + base58, buildPythonPackage, fetchFromGitHub, - varint, - base58, - netaddr, idna, + netaddr, py-cid, py-multicodec, + trio, pytestCheckHook, + setuptools, + psutil, + varint, + dnspython, + trio-typing, }: buildPythonPackage rec { pname = "py-multiaddr"; - version = "0.0.10"; - format = "setuptools"; + version = "0.0.11"; + pyproject = true; src = fetchFromGitHub { owner = "multiformats"; repo = "py-multiaddr"; tag = "v${version}"; - hash = "sha256-N46D2H3RG6rtdBrSyDjh8UxD+Ph/FXEa4FcEI2uz4y8="; + hash = "sha256-mlHcuLVtczp3APXJFkWbjeY7xU39eFERa8hhiOEwBSU="; }; - postPatch = '' - substituteInPlace setup.py --replace "'pytest-runner'," "" - ''; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ varint base58 netaddr + dnspython + trio-typing + trio idna py-cid + psutil py-multicodec ]; @@ -40,9 +47,22 @@ buildPythonPackage rec { pythonImportsCheck = [ "multiaddr" ]; + disabledTests = [ + # Test is outdated + "test_resolve_cancellation_with_error" + # AssertionError + "test_ipv4_wildcard" + ]; + + disabledTestPaths = [ + # Tests require network access + "tests/test_resolvers.py" + ]; + meta = { description = "Composable and future-proof network addresses"; homepage = "https://github.com/multiformats/py-multiaddr"; + changelog = "https://github.com/multiformats/py-multiaddr/releases/tag/${src.tag}"; license = with lib.licenses; [ mit asl20 diff --git a/pkgs/development/python-modules/py-multibase/default.nix b/pkgs/development/python-modules/py-multibase/default.nix index 532c501a8926..f4d4995c0a9f 100644 --- a/pkgs/development/python-modules/py-multibase/default.nix +++ b/pkgs/development/python-modules/py-multibase/default.nix @@ -1,31 +1,28 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, morphys, pytestCheckHook, python-baseconv, + setuptools, six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "py-multibase"; - version = "1.0.3"; - format = "setuptools"; + version = "2.0.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-0oog78u2Huwo9VgnoL8ynHzqgP/9kzrsrqauhDEmf+Q="; + src = fetchFromGitHub { + owner = "multiformats"; + repo = "py-multibase"; + tag = "v${finalAttrs.version}"; + hash = "sha256-k5vQqrSe1glT2YIcD+FIhQTpCZQvx5D4z1n7omuypcI="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "[pytest]" "" \ - --replace "python_classes = *TestCase" "" - substituteInPlace setup.py \ - --replace "'pytest-runner'," "" - ''; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ morphys python-baseconv six @@ -38,8 +35,8 @@ buildPythonPackage rec { meta = { description = "Module for distinguishing base encodings and other simple string encodings"; homepage = "https://github.com/multiformats/py-multibase"; - changelog = "https://github.com/multiformats/py-multibase/blob/v${version}/HISTORY.rst"; + changelog = "https://github.com/multiformats/py-multibase/blob/${finalAttrs.src.tag}/HISTORY.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ rakesh4g ]; }; -} +}) diff --git a/pkgs/development/python-modules/py-multicodec/default.nix b/pkgs/development/python-modules/py-multicodec/default.nix index d28a2e8d1fe8..4ad4500bc54b 100644 --- a/pkgs/development/python-modules/py-multicodec/default.nix +++ b/pkgs/development/python-modules/py-multicodec/default.nix @@ -2,36 +2,26 @@ lib, buildPythonPackage, fetchFromGitHub, - morphys, pytestCheckHook, - six, + setuptools, varint, }: buildPythonPackage rec { pname = "py-multicodec"; - version = "0.2.1"; - format = "setuptools"; + version = "1.0.0"; + pyproject = true; src = fetchFromGitHub { owner = "multiformats"; repo = "py-multicodec"; tag = "v${version}"; - hash = "sha256-2aK+bfhqCMqSO+mtrHIfNQmQpQHpwd7yHseI/3O7Sp4="; + hash = "sha256-0s2ICkPkfF+D7HRrnPS2IRm380UhdVg5NCS7VFTP1P4="; }; - # Error when not substituting: - # Failed: [pytest] section in setup.cfg files is no longer supported, change to [tool:pytest] instead. - postPatch = '' - substituteInPlace setup.cfg \ - --replace "[pytest]" "[tool:pytest]" - substituteInPlace setup.py \ - --replace "'pytest-runner'," "" - ''; + build-system = [ setuptools ]; - propagatedBuildInputs = [ - morphys - six + dependencies = [ varint ]; diff --git a/pkgs/development/python-modules/py-multihash/default.nix b/pkgs/development/python-modules/py-multihash/default.nix index dc6540b559f8..e0cc18fd9077 100644 --- a/pkgs/development/python-modules/py-multihash/default.nix +++ b/pkgs/development/python-modules/py-multihash/default.nix @@ -1,34 +1,36 @@ { lib, base58, + blake3, buildPythonPackage, fetchFromGitHub, + mmh3, morphys, pytestCheckHook, + setuptools, six, varint, }: buildPythonPackage rec { pname = "py-multihash"; - version = "2.0.1"; - format = "setuptools"; + version = "3.0.0"; + pyproject = true; src = fetchFromGitHub { owner = "multiformats"; repo = "py-multihash"; tag = "v${version}"; - hash = "sha256-z1lmSypGCMFWJNzNgV9hx/IStyXbpd5jvrptFpewuOA="; + hash = "sha256-hdjJJh77P4dJQAIGTlPGolz1qDumvNOaIMyfxmWMzUk="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "'pytest-runner', " "" - ''; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ base58 + blake3 morphys + mmh3 six varint ]; diff --git a/pkgs/development/python-modules/py-partiql-parser/default.nix b/pkgs/development/python-modules/py-partiql-parser/default.nix index 7427e76591e0..5c71251ab1f3 100644 --- a/pkgs/development/python-modules/py-partiql-parser/default.nix +++ b/pkgs/development/python-modules/py-partiql-parser/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "py-partiql-parser"; - version = "0.6.1"; + version = "0.6.3"; pyproject = true; src = fetchFromGitHub { owner = "getmoto"; repo = "py-partiql-parser"; tag = version; - hash = "sha256-2qCGNRoeMRe5fPzoWFD9umZgUDW6by7jNfO/BByQGwE="; + hash = "sha256-99GkYfsscifVAws+Rgn1Tb2FZxY/4OtNvOoXGGmzbco="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/py-vapid/cryptography.patch b/pkgs/development/python-modules/py-vapid/cryptography.patch deleted file mode 100644 index d38088931b44..000000000000 --- a/pkgs/development/python-modules/py-vapid/cryptography.patch +++ /dev/null @@ -1,270 +0,0 @@ ---- a/py_vapid/__init__.py -+++ b/py_vapid/__init__.py -@@ -25,6 +25,7 @@ - - class VapidException(Exception): - """An exception wrapper for Vapid.""" -+ - pass - - -@@ -34,6 +35,7 @@ class Vapid01(object): - https://tools.ietf.org/html/draft-ietf-webpush-vapid-01 - - """ -+ - _private_key = None - _public_key = None - _schema = "WebPush" -@@ -65,14 +67,14 @@ def from_raw(cls, private_raw): - key = ec.derive_private_key( - int(binascii.hexlify(b64urldecode(private_raw)), 16), - curve=ec.SECP256R1(), -- backend=default_backend()) -+ backend=default_backend(), -+ ) - return cls(key) - - @classmethod - def from_raw_public(cls, public_raw): - key = ec.EllipticCurvePublicKey.from_encoded_point( -- curve=ec.SECP256R1(), -- data=b64urldecode(public_raw) -+ curve=ec.SECP256R1(), data=b64urldecode(public_raw) - ) - ss = cls() - ss._public_key = key -@@ -87,8 +89,7 @@ def from_pem(cls, private_key): - - """ - # not sure why, but load_pem_private_key fails to deserialize -- return cls.from_der( -- b''.join(private_key.splitlines()[1:-1])) -+ return cls.from_der(b"".join(private_key.splitlines()[1:-1])) - - @classmethod - def from_der(cls, private_key): -@@ -98,9 +99,9 @@ def from_der(cls, private_key): - :type private_key: bytes - - """ -- key = serialization.load_der_private_key(b64urldecode(private_key), -- password=None, -- backend=default_backend()) -+ key = serialization.load_der_private_key( -+ b64urldecode(private_key), password=None, backend=default_backend() -+ ) - return cls(key) - - @classmethod -@@ -118,13 +119,13 @@ def from_file(cls, private_key_file=None): - vapid.generate_keys() - vapid.save_key(private_key_file) - return vapid -- with open(private_key_file, 'r') as file: -+ with open(private_key_file, "r") as file: - private_key = file.read() - try: - if "-----BEGIN" in private_key: -- vapid = cls.from_pem(private_key.encode('utf8')) -+ vapid = cls.from_pem(private_key.encode("utf8")) - else: -- vapid = cls.from_der(private_key.encode('utf8')) -+ vapid = cls.from_der(private_key.encode("utf8")) - return vapid - except Exception as exc: - logging.error("Could not open private key file: %s", repr(exc)) -@@ -156,11 +157,10 @@ def verify(cls, key, auth): - type key: str - - """ -- tokens = auth.rsplit(' ', 1)[1].rsplit('.', 1) -+ tokens = auth.rsplit(" ", 1)[1].rsplit(".", 1) - kp = cls().from_raw_public(key.encode()) - return kp.verify_token( -- validation_token=tokens[0].encode(), -- verification_token=tokens[1] -+ validation_token=tokens[0].encode(), verification_token=tokens[1] - ) - - @property -@@ -197,20 +197,19 @@ def public_key(self): - - def generate_keys(self): - """Generate a valid ECDSA Key Pair.""" -- self.private_key = ec.generate_private_key(ec.SECP256R1, -- default_backend()) -+ self.private_key = ec.generate_private_key(curve=ec.SECP256R1(), backend=default_backend()) - - def private_pem(self): - return self.private_key.private_bytes( - encoding=serialization.Encoding.PEM, - format=serialization.PrivateFormat.PKCS8, -- encryption_algorithm=serialization.NoEncryption() -+ encryption_algorithm=serialization.NoEncryption(), - ) - - def public_pem(self): - return self.public_key.public_bytes( - encoding=serialization.Encoding.PEM, -- format=serialization.PublicFormat.SubjectPublicKeyInfo -+ format=serialization.PublicFormat.SubjectPublicKeyInfo, - ) - - def save_key(self, key_file): -@@ -245,14 +244,14 @@ def verify_token(self, validation_token, verification_token): - :rtype: boolean - - """ -- hsig = b64urldecode(verification_token.encode('utf8')) -+ hsig = b64urldecode(verification_token.encode("utf8")) - r = int(binascii.hexlify(hsig[:32]), 16) - s = int(binascii.hexlify(hsig[32:]), 16) - try: - self.public_key.verify( - ecutils.encode_dss_signature(r, s), - validation_token, -- signature_algorithm=ec.ECDSA(hashes.SHA256()) -+ signature_algorithm=ec.ECDSA(hashes.SHA256()), - ) - return True - except InvalidSignature: -@@ -260,23 +259,25 @@ def verify_token(self, validation_token, verification_token): - - def _base_sign(self, claims): - cclaims = copy.deepcopy(claims) -- if not cclaims.get('exp'): -- cclaims['exp'] = int(time.time()) + 86400 -- if not self.conf.get('no-strict', False): -- valid = _check_sub(cclaims.get('sub', '')) -+ if not cclaims.get("exp"): -+ cclaims["exp"] = int(time.time()) + 86400 -+ if not self.conf.get("no-strict", False): -+ valid = _check_sub(cclaims.get("sub", "")) - else: -- valid = cclaims.get('sub') is not None -+ valid = cclaims.get("sub") is not None - if not valid: - raise VapidException( - "Missing 'sub' from claims. " -- "'sub' is your admin email as a mailto: link.") -- if not re.match(r"^https?://[^/:]+(:\d+)?$", -- cclaims.get("aud", ""), -- re.IGNORECASE): -+ "'sub' is your admin email as a mailto: link." -+ ) -+ if not re.match( -+ r"^https?://[^/:]+(:\d+)?$", cclaims.get("aud", ""), re.IGNORECASE -+ ): - raise VapidException( - "Missing 'aud' from claims. " - "'aud' is the scheme, host and optional port for this " -- "transaction e.g. https://example.com:8080") -+ "transaction e.g. https://example.com:8080" -+ ) - return cclaims - - def sign(self, claims, crypto_key=None): -@@ -292,19 +293,22 @@ def sign(self, claims, crypto_key=None): - - """ - sig = sign(self._base_sign(claims), self.private_key) -- pkey = 'p256ecdsa=' -+ pkey = "p256ecdsa=" - pkey += b64urlencode( - self.public_key.public_bytes( - serialization.Encoding.X962, -- serialization.PublicFormat.UncompressedPoint -- )) -+ serialization.PublicFormat.UncompressedPoint, -+ ) -+ ) - if crypto_key: -- crypto_key = crypto_key + ';' + pkey -+ crypto_key = crypto_key + ";" + pkey - else: - crypto_key = pkey - -- return {"Authorization": "{} {}".format(self._schema, sig.strip('=')), -- "Crypto-Key": crypto_key} -+ return { -+ "Authorization": "{} {}".format(self._schema, sig.strip("=")), -+ "Crypto-Key": crypto_key, -+ } - - - class Vapid02(Vapid01): -@@ -313,6 +317,7 @@ class Vapid02(Vapid01): - https://tools.ietf.org/html/rfc8292 - - """ -+ - _schema = "vapid" - - def sign(self, claims, crypto_key=None): -@@ -329,14 +334,11 @@ def sign(self, claims, crypto_key=None): - """ - sig = sign(self._base_sign(claims), self.private_key) - pkey = self.public_key.public_bytes( -- serialization.Encoding.X962, -- serialization.PublicFormat.UncompressedPoint -- ) -- return{ -+ serialization.Encoding.X962, serialization.PublicFormat.UncompressedPoint -+ ) -+ return { - "Authorization": "{schema} t={t},k={k}".format( -- schema=self._schema, -- t=sig, -- k=b64urlencode(pkey) -+ schema=self._schema, t=sig, k=b64urlencode(pkey) - ) - } - -@@ -349,27 +351,23 @@ def verify(cls, auth): - :rtype: bool - - """ -- pref_tok = auth.rsplit(' ', 1) -- assert pref_tok[0].lower() == cls._schema, ( -- "Incorrect schema specified") -+ pref_tok = auth.rsplit(" ", 1) -+ assert pref_tok[0].lower() == cls._schema, "Incorrect schema specified" - parts = {} -- for tok in pref_tok[1].split(','): -- kv = tok.split('=', 1) -+ for tok in pref_tok[1].split(","): -+ kv = tok.split("=", 1) - parts[kv[0]] = kv[1] -- assert 'k' in parts.keys(), ( -- "Auth missing public key 'k' value") -- assert 't' in parts.keys(), ( -- "Auth missing token set 't' value") -- kp = cls().from_raw_public(parts['k'].encode()) -- tokens = parts['t'].rsplit('.', 1) -+ assert "k" in parts.keys(), "Auth missing public key 'k' value" -+ assert "t" in parts.keys(), "Auth missing token set 't' value" -+ kp = cls().from_raw_public(parts["k"].encode()) -+ tokens = parts["t"].rsplit(".", 1) - return kp.verify_token( -- validation_token=tokens[0].encode(), -- verification_token=tokens[1] -+ validation_token=tokens[0].encode(), verification_token=tokens[1] - ) - - - def _check_sub(sub): -- """ Check to see if the `sub` is a properly formatted `mailto:` -+ """Check to see if the `sub` is a properly formatted `mailto:` - - a `mailto:` should be a SMTP mail address. Mind you, since I run - YouFailAtEmail.com, you have every right to yell about how terrible -@@ -382,9 +380,7 @@ def _check_sub(sub): - :rtype: bool - - """ -- pattern = ( -- r"^(mailto:.+@((localhost|[%\w-]+(\.[%\w-]+)+|([0-9a-f]{1,4}):+([0-9a-f]{1,4})?)))|https:\/\/(localhost|[\w-]+\.[\w\.-]+|([0-9a-f]{1,4}:+)+([0-9a-f]{1,4})?)$" # noqa -- ) -+ pattern = r"^(mailto:.+@((localhost|[%\w-]+(\.[%\w-]+)+|([0-9a-f]{1,4}):+([0-9a-f]{1,4})?)))|https:\/\/(localhost|[\w-]+\.[\w\.-]+|([0-9a-f]{1,4}:+)+([0-9a-f]{1,4})?)$" # noqa - return re.match(pattern, sub, re.IGNORECASE) is not None diff --git a/pkgs/development/python-modules/py-vapid/default.nix b/pkgs/development/python-modules/py-vapid/default.nix index 660a758a5614..a52c49987037 100644 --- a/pkgs/development/python-modules/py-vapid/default.nix +++ b/pkgs/development/python-modules/py-vapid/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchPypi, - setuptools, + hatchling, mock, pytestCheckHook, cryptography, @@ -10,22 +10,16 @@ buildPythonPackage rec { pname = "py-vapid"; - version = "1.9.2"; + version = "1.9.4"; pyproject = true; src = fetchPypi { pname = "py_vapid"; inherit version; - hash = "sha256-PIlzts+DhK0MmuZNYnDMxIDguSxwLY9eoswD5rUSR/k="; + hash = "sha256-oAQCNWDLxU40/AY4CgWA8E/8x4joT7bRnpM57rZVGig="; }; - patches = [ - # Fix tests with latest cryptography - # Upstream PR: https://github.com/web-push-libs/vapid/pull/110 - ./cryptography.patch - ]; - - build-system = [ setuptools ]; + build-system = [ hatchling ]; dependencies = [ cryptography ]; diff --git a/pkgs/development/python-modules/py7zr/default.nix b/pkgs/development/python-modules/py7zr/default.nix index 0a96e999ec49..4c3ab83bdd40 100644 --- a/pkgs/development/python-modules/py7zr/default.nix +++ b/pkgs/development/python-modules/py7zr/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "py7zr"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "miurahr"; repo = "py7zr"; tag = "v${version}"; - hash = "sha256-uV4zBQZlHfHgM/NiVSjI5I9wJRk9i4ihJn4B2R6XRuM="; + hash = "sha256-lWZni9yhS5otWL1cyi8qZx2JLExbDiTPTadKKnDB2Ds="; }; build-system = [ @@ -51,6 +51,12 @@ buildPythonPackage rec { texttable ]; + pythonRelaxDeps = [ + "pyppmd" + "pybcj" + "inflate64" + ]; + nativeCheckInputs = [ py-cpuinfo pytest-benchmark diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index e7cd3a388e44..0d8f11491abc 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "pytelegrambotapi"; - version = "4.29.1"; + version = "4.30.0"; pyproject = true; src = fetchFromGitHub { owner = "eternnoir"; repo = "pyTelegramBotAPI"; tag = version; - hash = "sha256-djiuIHTcPiKIfMxFevCa4c3V8ydGpSqH4mo0qH+Cpw8="; + hash = "sha256-WFikKZxc9PjqcAcKrZIXaFO7XiUBAg8y60/UH2so4Vc="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pyadjoint-ad/default.nix b/pkgs/development/python-modules/pyadjoint-ad/default.nix index fb4d5d2eec2c..c3417350b646 100644 --- a/pkgs/development/python-modules/pyadjoint-ad/default.nix +++ b/pkgs/development/python-modules/pyadjoint-ad/default.nix @@ -10,14 +10,14 @@ buildPythonPackage (finalAttrs: { pname = "pyadjoint-ad"; - version = "2025.10.0"; + version = "2025.10.1"; pyproject = true; src = fetchFromGitHub { owner = "dolfin-adjoint"; repo = "pyadjoint"; tag = finalAttrs.version; - hash = "sha256-caW2X4q0mHnD8CEh5jjelD4xBth/R/8/P3m0tTeO/LQ="; + hash = "sha256-UI1eRB9hy4lb/s18NjaAyjH3HvDwRbRzk0ZuWxf1Uuc="; }; build-system = [ diff --git a/pkgs/development/python-modules/pyads/default.nix b/pkgs/development/python-modules/pyads/default.nix index 59668800caaa..23b0fee8e682 100644 --- a/pkgs/development/python-modules/pyads/default.nix +++ b/pkgs/development/python-modules/pyads/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyads"; - version = "3.5.0"; + version = "3.5.1"; pyproject = true; src = fetchFromGitHub { owner = "stlehmann"; repo = "pyads"; tag = version; - hash = "sha256-eQC2ozJ5bKuhyInZDq8ZZNa9OGIN3tRjSHEPoqIU/jc="; + hash = "sha256-Uh8QS9l0O1UCOM03eZ3Wo8aohgUxSbErRX2/zEUP10k="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyamg/default.nix b/pkgs/development/python-modules/pyamg/default.nix index 2fb5afb14400..4a00b7de772b 100644 --- a/pkgs/development/python-modules/pyamg/default.nix +++ b/pkgs/development/python-modules/pyamg/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "pyamg"; - version = "5.2.1"; + version = "5.3.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-9EnZNCJOUDQB7nLNLuzhop2JO3q+NfYqRNUrqDEZjvo="; + hash = "sha256-UyPQ8aTNmZviRqkNWAyeHptYS5iIf2KY05dhEIfvhgs="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pyannote-audio/default.nix b/pkgs/development/python-modules/pyannote-audio/default.nix index ea4a25888d37..cd74ebb3583d 100644 --- a/pkgs/development/python-modules/pyannote-audio/default.nix +++ b/pkgs/development/python-modules/pyannote-audio/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "pyannote-audio"; - version = "4.0.1"; + version = "4.0.3"; pyproject = true; src = fetchFromGitHub { @@ -52,7 +52,7 @@ buildPythonPackage rec { repo = "pyannote-audio"; tag = version; fetchSubmodules = true; - hash = "sha256-hYrwpph+Powt+AuQjKo0kkBW+5jJGfzGTILzL9j22YI="; + hash = "sha256-tgXYcqkmMaEgFU55TQ5ESMNrZiBQkiVLmIoR1bhCOKI="; }; build-system = [ diff --git a/pkgs/development/python-modules/pyannote-database/default.nix b/pkgs/development/python-modules/pyannote-database/default.nix index 8b060139d4a5..19b292939c76 100644 --- a/pkgs/development/python-modules/pyannote-database/default.nix +++ b/pkgs/development/python-modules/pyannote-database/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "pyannote-database"; - version = "6.1.0"; + version = "6.1.1"; pyproject = true; src = fetchFromGitHub { owner = "pyannote"; repo = "pyannote-database"; tag = version; - hash = "sha256-WDAkxoSI/IW2nIXCDoKa+p2ep1xcWW6WGNHCCZT51tY="; + hash = "sha256-72H1tVLtDSYHAgjHWmI7pPQhKGchHz5VP0eRU6NRj2g="; }; build-system = [ diff --git a/pkgs/development/python-modules/pyasn1/default.nix b/pkgs/development/python-modules/pyasn1/default.nix index 6c5cefba7cd7..788939ad6a7e 100644 --- a/pkgs/development/python-modules/pyasn1/default.nix +++ b/pkgs/development/python-modules/pyasn1/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pyasn1"; - version = "0.6.1"; + version = "0.6.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-b1gNK92ENlOAgwrPRVUPJRFGn2c8tKWuOFejFwEosDQ="; + hash = "sha256-m1mislun5PgZfbdobAn7M+ZYuYM5+tuCbpUSYpAXgzs="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix index 17cb86213199..a88929a8733a 100644 --- a/pkgs/development/python-modules/pyathena/default.nix +++ b/pkgs/development/python-modules/pyathena/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "pyathena"; - version = "3.17.1"; + version = "3.25.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-jlS6qjOG2syTpsY/jNkplOULiDPXR3cmWSMa5O9EGPc="; + hash = "sha256-YOc1YTRUZxNT+Iqa2vZH8QwdwQ2mdJGaDVmTOSsFt6s="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pyavm/default.nix b/pkgs/development/python-modules/pyavm/default.nix index e7e1186ae4f1..d883106314fa 100644 --- a/pkgs/development/python-modules/pyavm/default.nix +++ b/pkgs/development/python-modules/pyavm/default.nix @@ -16,13 +16,12 @@ buildPythonPackage rec { pname = "pyavm"; - version = "0.9.6"; + version = "0.9.8"; pyproject = true; src = fetchPypi { - pname = "PyAVM"; - inherit version; - hash = "sha256-s7eLPoAHDbY9tPt3RA5zJg+NuTtVV/SqpUUR3NrG8m0="; + inherit pname version; + hash = "sha256-zhHCeex1vfgj0MOGEkoVKKXns2+l3U0mSZInk58Rf4g="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix index d5de3d7dcd95..6f58d6d37199 100644 --- a/pkgs/development/python-modules/pybase64/default.nix +++ b/pkgs/development/python-modules/pybase64/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pybase64"; - version = "1.4.2"; + version = "1.4.3"; pyproject = true; src = fetchFromGitHub { @@ -18,7 +18,7 @@ buildPythonPackage rec { repo = "pybase64"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-VSCMBKyDgNjwRUvT29z3KdN/dReqbmaaNeWomnyFJFg="; + hash = "sha256-cR8Ht6QbHXCED86xCbiLg4bxt1Hkv4Ota7R+voZE3yo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pybreaker/default.nix b/pkgs/development/python-modules/pybreaker/default.nix new file mode 100644 index 000000000000..e3c5f20c7ee3 --- /dev/null +++ b/pkgs/development/python-modules/pybreaker/default.nix @@ -0,0 +1,42 @@ +{ + buildPythonPackage, + fakeredis, + fetchFromGitHub, + flit-core, + lib, + pybreaker, + pytestCheckHook, + redis, + tornado, +}: + +buildPythonPackage rec { + pname = "pybreaker"; + version = "1.4.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "danielfm"; + repo = "pybreaker"; + tag = "v${version}"; + hash = "sha256-Cxer6EDfi4fvs7XENwpUUMcCiRX6eDNJz0s57l9U+zQ="; + }; + + build-system = [ flit-core ]; + + pythonImportsCheck = [ "pybreaker" ]; + + nativeCheckInputs = [ + fakeredis + pytestCheckHook + tornado + ]; + + meta = { + changelog = "https://github.com/danielfm/pybreaker/blob/${src.tag}/CHANGELOG"; + description = "Python implementation of the Circuit Breaker pattern"; + homepage = "https://github.com/danielfm/pybreaker"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index 1575b0275583..93a065938bcf 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pycairo"; - version = "1.28.0"; + version = "1.29.0"; pyproject = false; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pygobject"; repo = "pycairo"; tag = "v${version}"; - hash = "sha256-OAF1Yv9aoUctklGzH2xM+cVu5csyEnX2AV9n0OeoFUw="; + hash = "sha256-ErWxSQFYpqTZ9TPrcEUjVTa0LU619nm04TWTshGgttQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pycapnp/default.nix b/pkgs/development/python-modules/pycapnp/default.nix index d0d460762cb9..2a60d3958e18 100644 --- a/pkgs/development/python-modules/pycapnp/default.nix +++ b/pkgs/development/python-modules/pycapnp/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, replaceVars, fetchFromGitHub, - fetchpatch2, setuptools, wheel, capnproto, @@ -15,14 +14,14 @@ buildPythonPackage rec { pname = "pycapnp"; - version = "2.0.0"; + version = "2.2.2"; pyproject = true; src = fetchFromGitHub { owner = "capnproto"; repo = "pycapnp"; tag = "v${version}"; - hash = "sha256-SVeBRJMMR1Z8+S+QoiUKGRFGUPS/MlmWLi1qRcGcPoE="; + hash = "sha256-oRgO/FuNxNMSUla+jIypD/dAvFi27TkEfCHbqovhq9I="; }; patches = [ @@ -36,11 +35,6 @@ buildPythonPackage rec { # other than the builtin schemas (based on quick GitHub code search), so I don't # think it's worthwhile. (replaceVars ./include-paths.patch { inherit capnproto; }) - (fetchpatch2 { - name = "cython-3.patch"; - url = "https://github.com/capnproto/pycapnp/pull/334.diff?full_index=1"; - hash = "sha256-we7v4RaL7c1tePWl+oYfzMHAfnvnpdMkQgVu9YLwC6Y="; - }) ]; build-system = [ @@ -69,7 +63,7 @@ buildPythonPackage rec { meta = { description = "Cython wrapping of the C++ Cap'n Proto library"; homepage = "https://capnproto.github.io/pycapnp/"; - changelog = "https://github.com/capnproto/pycapnp/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/capnproto/pycapnp/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ Liamolucko ]; }; diff --git a/pkgs/development/python-modules/pycares/default.nix b/pkgs/development/python-modules/pycares/default.nix index ee421e0b2a8e..0772a8c5526d 100644 --- a/pkgs/development/python-modules/pycares/default.nix +++ b/pkgs/development/python-modules/pycares/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, c-ares, cffi, + cmake, fetchPypi, idna, setuptools, @@ -12,14 +13,17 @@ buildPythonPackage rec { pname = "pycares"; - version = "4.9.0"; + version = "5.0.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-juSE3bI9vsTYjRTtW21ZLBlg0uk8OF1eUrb61WTYI5U="; + hash = "sha256-WjwknIMEMmMUOYFfmoGEY0FvKoy9semI54dX3prnUIE="; }; + nativeBuildInputs = [ cmake ]; + dontUseCmakeConfigure = true; + build-system = [ setuptools ]; buildInputs = [ c-ares ]; diff --git a/pkgs/development/python-modules/pycasbin/default.nix b/pkgs/development/python-modules/pycasbin/default.nix index 4332bd6750ff..c721792fcc85 100644 --- a/pkgs/development/python-modules/pycasbin/default.nix +++ b/pkgs/development/python-modules/pycasbin/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pycasbin"; - version = "2.2.0"; + version = "2.7.1"; pyproject = true; src = fetchFromGitHub { owner = "casbin"; repo = "pycasbin"; tag = "v${version}"; - hash = "sha256-JSaQq5BX+aXJ2iaCudzbCcMwNnf4INS/iWfMOua6fjw="; + hash = "sha256-UYl+n0quHOfC0lTAdLi7EbrvwcGa8Gzh+1ofc38rPx8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pycep-parser/default.nix b/pkgs/development/python-modules/pycep-parser/default.nix index 4aa0f240cca0..429be94b3019 100644 --- a/pkgs/development/python-modules/pycep-parser/default.nix +++ b/pkgs/development/python-modules/pycep-parser/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pycep-parser"; - version = "0.5.1"; + version = "0.7.0"; pyproject = true; src = fetchFromGitHub { owner = "gruebel"; repo = "pycep"; tag = version; - hash = "sha256-yCcJUN+gDeuifFoYyFsS5Ak/AYxLo0Q8edmhFYfi/eA="; + hash = "sha256-pEFgpLfGcJhUWfs/nG1r7GfIS045cfNh7MVQokluXmM="; }; nativeBuildInputs = [ poetry-core ]; @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = { description = "Python based Bicep parser"; homepage = "https://github.com/gruebel/pycep"; - changelog = "https://github.com/gruebel/pycep/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/gruebel/pycep/blob/${src.tag}/CHANGELOG.md"; license = with lib.licenses; [ asl20 ]; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pycookiecheat/default.nix b/pkgs/development/python-modules/pycookiecheat/default.nix index 652806390e30..c6524a7b7e2d 100644 --- a/pkgs/development/python-modules/pycookiecheat/default.nix +++ b/pkgs/development/python-modules/pycookiecheat/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pycookiecheat"; - version = "0.8.0"; + version = "0.11"; pyproject = true; src = fetchFromGitHub { owner = "n8henrie"; repo = "pycookiecheat"; - tag = "v${version}"; - hash = "sha256-jOyTfh2ZhKW/pMU7T5tfxaM0l/g59N+mirnbc0FLPbQ="; + tag = version; + hash = "sha256-hP4J41ctAkrC6HIeKu6ITzK3W0PB7/tCz0cjP42I/J8="; }; pythonRelaxDeps = [ @@ -64,7 +64,7 @@ buildPythonPackage rec { meta = { description = "Borrow cookies from your browser's authenticated session for use in Python scripts"; homepage = "https://github.com/n8henrie/pycookiecheat"; - changelog = "https://github.com/n8henrie/pycookiecheat/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/n8henrie/pycookiecheat/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab diff --git a/pkgs/development/python-modules/pycparser/default.nix b/pkgs/development/python-modules/pycparser/default.nix index 9f2068a0e72f..fd1e492b627b 100644 --- a/pkgs/development/python-modules/pycparser/default.nix +++ b/pkgs/development/python-modules/pycparser/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pycparser"; - version = "2.23"; + version = "3.00"; pyproject = true; src = fetchFromGitHub { owner = "eliben"; repo = "pycparser"; tag = "release_v${version}"; - hash = "sha256-dkteM8VizYf9ZLPOe8od5CZgg7a3fs4Hy+t8bGLV/GI="; + hash = "sha256-6eKc+p3xLyRPo3oCWP/dbMpHlkBXLy8XiGR0gTEHI2E="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyct/default.nix b/pkgs/development/python-modules/pyct/default.nix index 96aad663367f..97beb6234262 100644 --- a/pkgs/development/python-modules/pyct/default.nix +++ b/pkgs/development/python-modules/pyct/default.nix @@ -5,7 +5,8 @@ pythonAtLeast, # build-system - setuptools, + hatchling, + hatch-vcs, # dependencies param, @@ -18,16 +19,17 @@ buildPythonPackage rec { pname = "pyct"; - version = "0.5.0"; + version = "0.6.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-3Z9KxcvY43w1LAQDYGLTxfZ+/sdtQEdh7xawy/JqpqA="; + hash = "sha256-1OUTss81thZWBa5fzl8qSZhbxnRzxXnehRNLjHHTdKg="; }; build-system = [ - setuptools + hatchling + hatch-vcs ]; dependencies = [ diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index 14e0df82310b..c2a3c43c9289 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -23,12 +23,12 @@ let in buildPythonPackage rec { pname = "pycuda"; - version = "2025.1.2"; + version = "2026.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-DdgpEdctjgPGMSiuROmc+3tGiQlKumzFGT2OlEcXqvo="; + hash = "sha256-dZUWFgYougbzLOflY+P1uSFGkdyVKKA+qZ6hBz9OFLo="; }; preConfigure = with lib.versions; '' diff --git a/pkgs/development/python-modules/pydantic-extra-types/default.nix b/pkgs/development/python-modules/pydantic-extra-types/default.nix index 62cbec965209..ea0f6d053597 100644 --- a/pkgs/development/python-modules/pydantic-extra-types/default.nix +++ b/pkgs/development/python-modules/pydantic-extra-types/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pydantic-extra-types"; - version = "2.10.6"; + version = "2.11.0"; pyproject = true; src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic-extra-types"; tag = "v${version}"; - hash = "sha256-g2a7tfldt39RCZxd9ta/JTPYnfZTTsLE6kA2fuo3fFg="; + hash = "sha256-aXhlfDBCpk8h3F4gXAQ40fVKxsoFvkmfO/roaqrGxho="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pydantic-settings/default.nix b/pkgs/development/python-modules/pydantic-settings/default.nix index 630f298ffe23..206e8ff3b554 100644 --- a/pkgs/development/python-modules/pydantic-settings/default.nix +++ b/pkgs/development/python-modules/pydantic-settings/default.nix @@ -13,14 +13,14 @@ let self = buildPythonPackage rec { pname = "pydantic-settings"; - version = "2.10.1"; + version = "2.12.0"; pyproject = true; src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic-settings"; - tag = version; - hash = "sha256-Bi5MIXB9fVE5hoyk8QxxaGa9+puAlW+YGdi/WMNf/RQ="; + tag = "v${version}"; + hash = "sha256-5SfF5Wfs/iLThd5xL/5C+qOQfg8s/9WUCSc5qag7CY0="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index 2047ef5c4388..a34ffbb95b29 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "pydantic"; - version = "2.12.4"; + version = "2.12.5"; pyproject = true; src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic"; tag = "v${version}"; - hash = "sha256-CHJahAgs+vQQzhIZjP+6suvbmRrGZI0H5UxoXg4I90o="; + hash = "sha256-9TRLtVNBw2WHQnS0XFHg16Q7FdpTf3e2nb5qE5rlLUA="; }; patches = lib.optionals (lib.versionAtLeast python.version "3.14.1") [ diff --git a/pkgs/development/python-modules/pydyf/default.nix b/pkgs/development/python-modules/pydyf/default.nix index 13cfc01a1cb3..5f7fed5402e8 100644 --- a/pkgs/development/python-modules/pydyf/default.nix +++ b/pkgs/development/python-modules/pydyf/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pydyf"; - version = "0.11.0"; + version = "0.12.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-OU3d9hnMqdDFVxXjxV6hIam/nLx4DNwSAaJCeRe4a2Q="; + hash = "sha256-+9fnWVQaxyXCnFBmEgA945Mkm5QxDqeK5Eyx0EsiAJU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyee/default.nix b/pkgs/development/python-modules/pyee/default.nix index eb61c6b0b880..b006dc85785f 100644 --- a/pkgs/development/python-modules/pyee/default.nix +++ b/pkgs/development/python-modules/pyee/default.nix @@ -23,6 +23,11 @@ buildPythonPackage rec { hash = "sha256-s5HjxaQ00fURiiVhUAHbyPZpz0EKtn0ExNTgfFVIHDc="; }; + postPatch = '' + # specifies a string for addopts, but must be a list since pytest9 + sed -i '/addopts/d' pyproject.toml + ''; + nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/pyeiscp/default.nix b/pkgs/development/python-modules/pyeiscp/default.nix deleted file mode 100644 index c951f0b9ff86..000000000000 --- a/pkgs/development/python-modules/pyeiscp/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - netifaces, -}: - -buildPythonPackage { - pname = "pyeiscp"; - version = "0.0.7"; - pyproject = true; - - src = fetchFromGitHub { - owner = "winterscar"; - repo = "python-eiscp"; - rev = "5f9ab5428ffa27a813dbfb00d392a0f76055137a"; # this is 0.0.7; tags are weird and from the original project this was forked from - hash = "sha256-jmOPX0PnrKOs9kQZxlEpvp6Ck0kYXfWE6TgtKsOAHfs="; - }; - - build-system = [ - setuptools - ]; - - dependencies = [ - netifaces - ]; - - doCheck = false; # no useful tests - - pythonImportsCheck = [ - "pyeiscp" - ]; - - meta = { - description = "Python asyncio module to interface with Anthem AVM and MRX receivers"; - homepage = "https://github.com/winterscar/python-eiscp"; - license = lib.licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python-modules/pyfaidx/default.nix b/pkgs/development/python-modules/pyfaidx/default.nix index 9ef083e558b3..a87c464922d6 100644 --- a/pkgs/development/python-modules/pyfaidx/default.nix +++ b/pkgs/development/python-modules/pyfaidx/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pyfaidx"; - version = "0.8.1.4"; + version = "0.9.0.3"; pyproject = true; src = fetchFromGitHub { owner = "mdshw5"; repo = "pyfaidx"; tag = "v${version}"; - hash = "sha256-SDnmOJbuYYrg6vUQJTEuiqct9hhspN8B9Tpn8UojKFk="; + hash = "sha256-R8k1h2FAlA/6eTJqH/Z2jHAyis2w5VDd1LcyE1hgbFc="; }; build-system = [ diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index d9893289e78d..6efb2f9d68af 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "pyfakefs"; - version = "5.9.2"; + version = "6.0.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ZsXGzNQJe0hPh4L5pQeP7gUz1GXg2cr1lMkVfVQ4JVM="; + hash = "sha256-BZ/QshdL/u1JnssKWbzP9VfyZ8xtiFr8Dlt254ttUNo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/pkgs/development/python-modules/pyftpdlib/default.nix index 742fe697d35d..2bb8828400a7 100644 --- a/pkgs/development/python-modules/pyftpdlib/default.nix +++ b/pkgs/development/python-modules/pyftpdlib/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "pyftpdlib"; - version = "2.0.1"; + version = "2.1.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-7w0XKoK/rhDi3sIi6HUzUUYJ1Bv0sP0PB+KdQ4D7lr8="; + hash = "sha256-XpLnujfD5FjsRY5cIB4t65kstgEclj5qhRKmNNjYARY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix index bebf0f3eecd7..9fa3b108c53f 100644 --- a/pkgs/development/python-modules/pygal/default.nix +++ b/pkgs/development/python-modules/pygal/default.nix @@ -21,12 +21,12 @@ buildPythonPackage rec { pname = "pygal"; - version = "3.0.5"; + version = "3.1.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-wKDzTlvBwBl1wr+4NCrVIeKTrULlJWmd0AxNelLBS3E="; + hash = "sha256-+97nNRp0I+eQf7ipw7dzBfa1Z4yy5v0Ns2qIJeQpVew="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index ddc9c97205f4..76673d096c22 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.19.0"; + version = "1.19.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-yl2285WnQWagGdd3iV+WvLIR7mDOC+QTKxOWA+AGbYM="; + hash = "sha256-MWX3hKrlajCaJ9jurnkj1T2i6PYJQwjH9bQo3uySXPk="; }; preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index e68d088371d8..001de77758f4 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -27,7 +27,7 @@ }: buildPythonPackage rec { - version = "2.1.11"; + version = "2.1.12"; pname = "pyglet"; pyproject = true; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "pyglet"; repo = "pyglet"; tag = "v${version}"; - hash = "sha256-aGMEjC7Huykdwx4JW9Uoo8a7diJ85iaXM9XCbbyQXk8="; + hash = "sha256-stzz7sxPH6cduhG2ySw/Zg+wdTE/Y0ZeBU90D0Aa2oU="; }; # find_library doesn't reliably work with nix (https://github.com/NixOS/nixpkgs/issues/7307). diff --git a/pkgs/development/python-modules/pygobject-stubs/default.nix b/pkgs/development/python-modules/pygobject-stubs/default.nix index 075d1d75b871..16c93b13bc6d 100644 --- a/pkgs/development/python-modules/pygobject-stubs/default.nix +++ b/pkgs/development/python-modules/pygobject-stubs/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pygobject-stubs"; - version = "2.14.0"; + version = "2.16.0"; pyproject = true; src = fetchFromGitHub { owner = "pygobject"; repo = "pygobject-stubs"; tag = "v${version}"; - hash = "sha256-pConIc8FBq2a7yrfRHa07p2e/Axgrv4p+W0nq1WzERw="; + hash = "sha256-3gWz/mWAMoXAHMfCFv3ri680iuMm0WLtGyMODujq31M="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index ac5d4ac44758..ecdaa3e02e9a 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -51,6 +51,12 @@ buildPythonPackage rec { gobject-introspection # e.g. try building: python3Packages.urwid python3Packages.pydbus ]; + # Fixes https://github.com/NixOS/nixpkgs/issues/378447 + preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) '' + export PKG_CONFIG_PATH=${lib.getDev python}/lib/pkgconfig:$PKG_CONFIG_PATH + export PKG_CONFIG_PATH_FOR_BUILD=${lib.getDev python}/lib/pkgconfig:$PKG_CONFIG_PATH_FOR_BUILD + ''; + mesonFlags = [ # This is only used for figuring out what version of Python is in # use, and related stuff like figuring out what the install prefix diff --git a/pkgs/development/python-modules/pygsl/default.nix b/pkgs/development/python-modules/pygsl/default.nix index 887ea6e9d6a3..029d4d55e970 100644 --- a/pkgs/development/python-modules/pygsl/default.nix +++ b/pkgs/development/python-modules/pygsl/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pygsl"; - version = "2.6.2"; + version = "2.6.4"; pyproject = true; src = fetchFromGitHub { owner = "pygsl"; repo = "pygsl"; tag = "v${version}"; - hash = "sha256-1aAc2qGVlClnsw70D1QqPbSsyij0JNgfIXsLzelYx3E="; + hash = "sha256-dZIWOwRRrF1bux9UTIxN31/S380wPT4gpQ/gYbUO4FQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyhepmc/default.nix b/pkgs/development/python-modules/pyhepmc/default.nix index 17e02d233914..28339c457468 100644 --- a/pkgs/development/python-modules/pyhepmc/default.nix +++ b/pkgs/development/python-modules/pyhepmc/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pyhepmc"; - version = "2.14.0"; + version = "2.16.1"; pyproject = true; src = fetchFromGitHub { owner = "scikit-hep"; repo = "pyhepmc"; - tag = "v${version}"; - hash = "sha256-yh02Z1nPGjghZYHkPBlClDEztq4VQsW3H+kuco/lBpk="; + tag = version; + hash = "sha256-FMxcebZikZXwgEW3BIlHtDVQPweN8zBku0K8FOmF6vA="; fetchSubmodules = true; }; @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = { description = "Easy-to-use Python bindings for HepMC3"; homepage = "https://github.com/scikit-hep/pyhepmc"; - changelog = "https://github.com/scikit-hep/pyhepmc/releases/tag/v${version}"; + changelog = "https://github.com/scikit-hep/pyhepmc/releases/tag/${src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ veprbl ]; }; diff --git a/pkgs/development/python-modules/pyhumps/default.nix b/pkgs/development/python-modules/pyhumps/default.nix index 6c40599cbd26..d4dcb867a3b9 100644 --- a/pkgs/development/python-modules/pyhumps/default.nix +++ b/pkgs/development/python-modules/pyhumps/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyhumps"; - version = "3.8.0"; + version = "3.9.0"; pyproject = true; src = fetchFromGitHub { owner = "nficano"; repo = "humps"; - rev = "v${version}"; - hash = "sha256-ElL/LY2V2Z3efdV5FnDy9dSoBltULrzxsjaOx+7W9Oo="; + tag = "v${version}"; + hash = "sha256-PvfjW56UVCcjd2jJiQW/goVJ1BC8xQ973xuZ6izwclw="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pyicloud/default.nix b/pkgs/development/python-modules/pyicloud/default.nix index 5d4f00956e14..0cb2d3d116d5 100644 --- a/pkgs/development/python-modules/pyicloud/default.nix +++ b/pkgs/development/python-modules/pyicloud/default.nix @@ -30,6 +30,11 @@ buildPythonPackage rec { hash = "sha256-sejOJOzgZD531U5tHMoTwDH0ZkAi0sZ/nPp7uQDIZvU="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools >= 77.0,< 80.10" setuptools + ''; + build-system = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/pyinstaller/default.nix b/pkgs/development/python-modules/pyinstaller/default.nix index b80a5945fbc8..0b53470a0c5b 100644 --- a/pkgs/development/python-modules/pyinstaller/default.nix +++ b/pkgs/development/python-modules/pyinstaller/default.nix @@ -5,7 +5,7 @@ fetchPypi, # build-system - setuptools, + hatchling, # native dependencies zlib, @@ -25,15 +25,15 @@ buildPythonPackage rec { pname = "pyinstaller"; - version = "6.15.0"; + version = "6.18.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-pI/EZE7kqiqio157UfSW+PvX7s9qIVBka78WE60HvC0="; + hash = "sha256-zcUHVCeDURytSFb85YL9w36fKWZcpZaInGY8g+yMbsk="; }; - build-system = [ setuptools ]; + build-system = [ hatchling ]; buildInputs = [ zlib.dev ]; diff --git a/pkgs/development/python-modules/pyixapi/default.nix b/pkgs/development/python-modules/pyixapi/default.nix index 242d725ae3aa..eb1dee50762c 100644 --- a/pkgs/development/python-modules/pyixapi/default.nix +++ b/pkgs/development/python-modules/pyixapi/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyixapi"; - version = "0.2.6"; + version = "0.2.7"; pyproject = true; src = fetchFromGitHub { owner = "peering-manager"; repo = "pyixapi"; tag = version; - hash = "sha256-NS8rVzLpEtpuLal6sApXI3hjASiIeXZuZ4xyj9Zv1k0="; + hash = "sha256-pKIm9YCWf5HCwJ76NLm6AmcJWGVErZu9dwl23p8maXs="; }; pythonRelaxDeps = [ "pyjwt" ]; diff --git a/pkgs/development/python-modules/pykaleidescape/default.nix b/pkgs/development/python-modules/pykaleidescape/default.nix index 15ed82eef4fc..363875d0ec39 100644 --- a/pkgs/development/python-modules/pykaleidescape/default.nix +++ b/pkgs/development/python-modules/pykaleidescape/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pykaleidescape"; - version = "1.1.1"; + version = "2022.2.3"; pyproject = true; src = fetchFromGitHub { owner = "SteveEasley"; repo = "pykaleidescape"; tag = "v${version}"; - hash = "sha256-HhHlgQ94aPac6zRgXBSsHxXuAj2OnGdWkJHMOqTwKcI="; + hash = "sha256-h5G7wV4Z+sf8Qq4GNFsp8DVDSgQgS0dLGf+DzK/egYM="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix index b7ce149a0018..27157b779cc4 100644 --- a/pkgs/development/python-modules/pylast/default.nix +++ b/pkgs/development/python-modules/pylast/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pylast"; - version = "7.0.1"; + version = "7.0.2"; pyproject = true; src = fetchFromGitHub { owner = "pylast"; repo = "pylast"; tag = version; - hash = "sha256-MV7NLh++2GxRvnF30Q3zBOgM6dT8tI/KpQ1YB4rMd1s="; + hash = "sha256-NA49V9s4k0l0icoiKVjxTAdhC+MuNgbbeImAjzGB8Xo="; }; build-system = [ diff --git a/pkgs/development/python-modules/pylette/default.nix b/pkgs/development/python-modules/pylette/default.nix index 14a2a7fc59e5..71d09c374313 100644 --- a/pkgs/development/python-modules/pylette/default.nix +++ b/pkgs/development/python-modules/pylette/default.nix @@ -14,14 +14,14 @@ }: buildPythonPackage rec { pname = "pylette"; - version = "4.1.0"; + version = "5.1.1"; pyproject = true; src = fetchFromGitHub { owner = "qTipTip"; repo = "Pylette"; tag = version; - hash = "sha256-6OZeCcF47xjj266+IasJYub042R46KRaNXGCv+hlWdY="; + hash = "sha256-BDKJtinSMZQ+6ok9i9IYeCs4XjB44W1zJntXsE/MeGw="; }; build-system = [ diff --git a/pkgs/development/python-modules/pylink-square/default.nix b/pkgs/development/python-modules/pylink-square/default.nix index 8dbc0145b610..fb88358c0be1 100644 --- a/pkgs/development/python-modules/pylink-square/default.nix +++ b/pkgs/development/python-modules/pylink-square/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pylink-square"; - version = "1.6.0"; + version = "2.0.0"; pyproject = true; src = fetchFromGitHub { owner = "square"; repo = "pylink"; tag = "v${version}"; - hash = "sha256-rkkdnpkl9UHcBDjp6lsFXR1zNn7tH1KeTQ7wV+yJ3m0="; + hash = "sha256-QitJGJGgXeSl5RaYW6+VtwOrV9AYDA9+kUHNtopDgVc="; }; patches = [ diff --git a/pkgs/development/python-modules/pylsqpack/default.nix b/pkgs/development/python-modules/pylsqpack/default.nix index ca5c4c706225..90d04f5ab694 100644 --- a/pkgs/development/python-modules/pylsqpack/default.nix +++ b/pkgs/development/python-modules/pylsqpack/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pylsqpack"; - version = "0.3.22"; + version = "0.3.23"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-tn9xGzyDcNn0D39/U2qmAY2JAPoJ+kn3Lww/E4hs7No="; + hash = "sha256-9VsSaUDYsxVzMfEj1EKNcDppim22Wmp4kffsG5DIbFY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pylzma/default.nix b/pkgs/development/python-modules/pylzma/default.nix index 1dd9404761bd..52cdb76d9ad1 100644 --- a/pkgs/development/python-modules/pylzma/default.nix +++ b/pkgs/development/python-modules/pylzma/default.nix @@ -2,29 +2,23 @@ lib, buildPythonPackage, fetchPypi, - fetchpatch, + setuptools, }: buildPythonPackage rec { pname = "pylzma"; - version = "0.5.0"; - format = "setuptools"; + version = "0.6.0"; + pyproject = true; # This vendors an old LZMA SDK # After some discussion, it seemed most reasonable to keep it that way # xz, and uefi-firmware-parser also does this src = fetchPypi { inherit pname version; - sha256 = "074anvhyjgsv2iby2ql1ixfvjgmhnvcwjbdz8gk70xzkzcm1fx5q"; + hash = "sha256-OwCniSKNBaBvqZXNK0H/SpZXhKoZSKBthLPKa4cwQfA="; }; - patches = [ - # https://github.com/fancycode/pylzma/pull/82/ - (fetchpatch { - url = "https://github.com/fancycode/pylzma/commit/2fe0a4ed0588fd572931da4be10ad955636afde4.patch"; - hash = "sha256-sWdMAmOPVTDnxNTjzPlqQYxqnjmRpK+OqwWF6jpXvIw="; - }) - ]; + build-system = [ setuptools ]; pythonImportsCheck = [ "pylzma" ]; diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index c3a42c082a73..09d7227c6f6c 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { pname = "pymatgen"; - version = "2025.6.14"; + version = "2025.10.7"; pyproject = true; disabled = pythonAtLeast "3.13"; @@ -62,7 +62,7 @@ buildPythonPackage rec { owner = "materialsproject"; repo = "pymatgen"; tag = "v${version}"; - hash = "sha256-HMYYhXT5k/EjG1sIBq/53K9ogeSk8ZEJQBrDHCgz+SA="; + hash = "sha256-pbnWSmU2rtqUbjZBmzJz3HE1t5zZTJv7HSfrcVUFxmU="; }; build-system = [ setuptools ]; @@ -169,7 +169,7 @@ buildPythonPackage rec { meta = { description = "Robust materials analysis code that defines core object representations for structures and molecules"; homepage = "https://pymatgen.org/"; - changelog = "https://github.com/materialsproject/pymatgen/releases/tag/v${version}"; + changelog = "https://github.com/materialsproject/pymatgen/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/pymdown-extensions/default.nix b/pkgs/development/python-modules/pymdown-extensions/default.nix index 628a9a3bf8d4..80f1dec7ceba 100644 --- a/pkgs/development/python-modules/pymdown-extensions/default.nix +++ b/pkgs/development/python-modules/pymdown-extensions/default.nix @@ -45,14 +45,14 @@ let in buildPythonPackage rec { pname = "pymdown-extensions"; - version = "10.17.2"; + version = "10.20"; pyproject = true; src = fetchFromGitHub { owner = "facelessuser"; repo = "pymdown-extensions"; tag = version; - hash = "sha256-eE7DgMdUqSzjeDU7hZ7FCZC8Oyj2YpPtjAQbaLPKOhk="; + hash = "sha256-ei1qbWDH/gpyj111TXeUR3uxmpg+wbfuPscqahjIEOU="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pymicro-vad/default.nix b/pkgs/development/python-modules/pymicro-vad/default.nix index 8c796390bf15..6d625c26185f 100644 --- a/pkgs/development/python-modules/pymicro-vad/default.nix +++ b/pkgs/development/python-modules/pymicro-vad/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pymicro-vad"; - version = "1.0.2"; + version = "2.0.1"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "pymicro-vad"; - tag = version; - hash = "sha256-yKy/oD6nl2qZW64+aAHZRAEFextCXT6RpMfPThB8DXE="; + tag = "v${version}"; + hash = "sha256-76/n9p+zulq8Uvqurbi9tNFkBXGchEftwqeFycY3NO0="; }; build-system = [ @@ -33,7 +33,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pymicro_vad" ]; meta = { - changelog = "https://github.com/rhasspy/pymicro-vad/releases/tag/${version}"; + changelog = "https://github.com/rhasspy/pymicro-vad/releases/tag/${src.tag}"; description = "Self-contained voice activity detector"; homepage = "https://github.com/rhasspy/pymicro-vad"; license = lib.licenses.asl20; diff --git a/pkgs/development/python-modules/pymilvus/default.nix b/pkgs/development/python-modules/pymilvus/default.nix index 5d4eb0f66c2f..84d498e0c224 100644 --- a/pkgs/development/python-modules/pymilvus/default.nix +++ b/pkgs/development/python-modules/pymilvus/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "pymilvus"; - version = "2.5.14"; + version = "2.6.6"; pyproject = true; src = fetchFromGitHub { owner = "milvus-io"; repo = "pymilvus"; tag = "v${version}"; - hash = "sha256-h+HjDM+uhmcz7fKXE4RWtqD2+Evd9rqG3Zd5jsDyCNE="; + hash = "sha256-UVpsciVM6MUyTH6VxndQHUvd+lkZQKSyckiBHhzVRS0="; }; build-system = [ diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index 50bf8ff31f7a..5d9982586783 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "pymongo"; - version = "4.13.2"; + version = "4.16.0"; pyproject = true; src = fetchPypi { inherit version; pname = "pymongo"; - hash = "sha256-D2TGRpwjYpYubOlyWK4Tkau6FWapU6SSVi0pJLRIFcI="; + hash = "sha256-i6hAUGX24lim+HL+YteXoo84OhIXjHFTwB7QToRcYAw="; }; build-system = [ diff --git a/pkgs/development/python-modules/pymsgbox/default.nix b/pkgs/development/python-modules/pymsgbox/default.nix index 4e38b9bb0690..238077376569 100644 --- a/pkgs/development/python-modules/pymsgbox/default.nix +++ b/pkgs/development/python-modules/pymsgbox/default.nix @@ -2,21 +2,24 @@ lib, fetchPypi, buildPythonPackage, + setuptools, tkinter, }: buildPythonPackage rec { pname = "pymsgbox"; - version = "1.0.9"; - format = "setuptools"; + version = "2.0.1"; + pyproject = true; src = fetchPypi { - pname = "PyMsgBox"; + pname = "pymsgbox"; inherit version; - hash = "sha256-IZQifei/96PW2lQYSHBaFV3LsqBu4SDZ8oCh1/USY/8="; + hash = "sha256-mNBVxJpRHcwQ+gjDBD5xAtRo9eSzqDxtPGHfcix9eY0="; }; - propagatedBuildInputs = [ tkinter ]; + build-system = [ setuptools ]; + + dependencies = [ tkinter ]; # Finding tests fails doCheck = false; diff --git a/pkgs/development/python-modules/pymupdf4llm/default.nix b/pkgs/development/python-modules/pymupdf4llm/default.nix index d1eb118e26b7..695dc03b962e 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.27"; + version = "0.2.9"; pyproject = true; src = fetchFromGitHub { owner = "pymupdf"; repo = "RAG"; - tag = "v${version}"; - hash = "sha256-rezdDsjNCDetvrX3uvykYuL/y40MZnr0fFMvQY3JRr0="; + tag = version; + hash = "sha256-iuffv49voZLiuabwhag+YC3j3Oa2IAevZtcJtMVzX/4="; }; sourceRoot = "${src.name}/pymupdf4llm"; diff --git a/pkgs/development/python-modules/pymysql/default.nix b/pkgs/development/python-modules/pymysql/default.nix index 4064b432fbb2..db536ce794a6 100644 --- a/pkgs/development/python-modules/pymysql/default.nix +++ b/pkgs/development/python-modules/pymysql/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pymysql"; - version = "1.1.1"; + version = "1.1.2"; pyproject = true; src = fetchPypi { pname = "pymysql"; inherit version; - hash = "sha256-4SdhGq8rQXQDxgv03FcBJK60pX9fN7jpWuOZpC+QTNA="; + hash = "sha256-SWHT4WVhSuZQFONhgRpyTiBErT6jc53pkDrnwh9TnwM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pynest2d/default.nix b/pkgs/development/python-modules/pynest2d/default.nix index 597d2b808775..4e499fd47080 100644 --- a/pkgs/development/python-modules/pynest2d/default.nix +++ b/pkgs/development/python-modules/pynest2d/default.nix @@ -11,15 +11,15 @@ }: buildPythonPackage rec { - version = "4.12.0"; + version = "5.3.0"; pname = "pynest2d"; pyproject = false; src = fetchFromGitHub { owner = "Ultimaker"; repo = "pynest2d"; - rev = version; - hash = "sha256-QQdTDhO4i9NVhegGTmdEQSNv3gooaZzTX/Rv86h3GEo="; + tag = version; + hash = "sha256-J7QFzWvqOaUx4Gfi5VLLWi0hJIyfYc0Htu2CM7ze6xA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pynndescent/default.nix b/pkgs/development/python-modules/pynndescent/default.nix index 74b9773ffb17..22d4e586f3bd 100644 --- a/pkgs/development/python-modules/pynndescent/default.nix +++ b/pkgs/development/python-modules/pynndescent/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "pynndescent"; - version = "0.5.13"; + version = "0.6.0"; pyproject = true; src = fetchFromGitHub { owner = "lmcinnes"; repo = "pynndescent"; tag = "release-${version}"; - hash = "sha256-oE/oy5doHduESHlRPuPHruiw1yUZmuUTe6PrgQlT6O8="; + hash = "sha256-RfIbPPyx+Y7niuFrLjA02cUDHTSv9s5E4JiXv4ZBNEc="; }; build-system = [ setuptools ]; @@ -46,7 +46,7 @@ buildPythonPackage rec { meta = { description = "Nearest Neighbor Descent"; homepage = "https://github.com/lmcinnes/pynndescent"; - changelog = "https://github.com/lmcinnes/pynndescent/releases/tag/release-${version}"; + changelog = "https://github.com/lmcinnes/pynndescent/releases/tag/release-${src.tag}"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ mic92 ]; badPlatforms = [ diff --git a/pkgs/development/python-modules/pyocd/default.nix b/pkgs/development/python-modules/pyocd/default.nix index 2cfb1bc754fe..50712f5bdc93 100644 --- a/pkgs/development/python-modules/pyocd/default.nix +++ b/pkgs/development/python-modules/pyocd/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "pyocd"; - version = "0.41.0"; + version = "0.42.0"; pyproject = true; src = fetchFromGitHub { owner = "pyocd"; repo = "pyOCD"; tag = "v${version}"; - hash = "sha256-LQnvTSyXjIByB70thi6Gu4n5HdQQzIHHboWUvyVki5s="; + hash = "sha256-VSEItt+mXiV3u3SAKQc8uGiJdT6b4nER/u6BwfaX2CM="; }; pythonRelaxDeps = [ "capstone" ]; diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix index e84f991ae68e..59a6d9aebeb4 100644 --- a/pkgs/development/python-modules/pyodbc/default.nix +++ b/pkgs/development/python-modules/pyodbc/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyodbc"; - version = "5.2.0"; + version = "5.3.0"; format = "setuptools"; disabled = isPyPy; # use pypypdbc instead src = fetchPypi { inherit pname version; - hash = "sha256-3ovjmAnI3e7uJqS4dqZGNSnNSHpg0Tk+sqk+m81EqPU="; + hash = "sha256-L+DgY9j7Zu/QrG3DkjbE3hpF8Xwz6t7Q1VPSHBmfTQU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyogrio/default.nix b/pkgs/development/python-modules/pyogrio/default.nix index 15602490840c..fe5268a592a6 100644 --- a/pkgs/development/python-modules/pyogrio/default.nix +++ b/pkgs/development/python-modules/pyogrio/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pyogrio"; - version = "0.11.1"; + version = "0.12.1"; pyproject = true; src = fetchFromGitHub { owner = "geopandas"; repo = "pyogrio"; tag = "v${version}"; - hash = "sha256-F6XfkihN3k2xquYS8jJMlqtLXzaTORaduJ2Q9LhSQGM="; + hash = "sha256-c3bd8gxsHCzLKmy8baiIUbTXzZWms/NlDg7Az6TWrfM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyopengl/default.nix b/pkgs/development/python-modules/pyopengl/default.nix index 07350fd593e0..5d0e8665499c 100644 --- a/pkgs/development/python-modules/pyopengl/default.nix +++ b/pkgs/development/python-modules/pyopengl/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pyopengl"; - version = "3.1.9"; + version = "3.1.10"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-KOvYLF9EkaQYrsqWct/7Otvn0zs56tpFSKW06MA/YMg="; + hash = "sha256-xKAtaGa1TrEZyOmz+wT6g1qVq4At2WYHq0zbABLfgzU="; }; build-system = [ setuptools ]; @@ -32,7 +32,6 @@ buildPythonPackage rec { # so pyopengl can find them at runtime. substituteInPlace OpenGL/platform/glx.py \ --replace-fail "'OpenGL'" '"${pkgs.libGL}/lib/libOpenGL${ext}"' \ - --replace-fail '"GL",' '"${pkgs.libGL}/lib/libGL${ext}",' \ --replace-fail "'GL'" '"${pkgs.libGL}/lib/libGL${ext}"' \ --replace-fail '"GLU",' '"${pkgs.libGLU}/lib/libGLU${ext}",' \ --replace-fail "'GLX'" '"${pkgs.libglvnd}/lib/libGLX${ext}"' \ diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 4d1273ad71fd..d4df365b9399 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pyopenssl"; - version = "25.1.0"; + version = "25.3.0"; pyproject = true; src = fetchFromGitHub { owner = "pyca"; repo = "pyopenssl"; tag = version; - hash = "sha256-QF511MVyjfddmkTd2H7RNJeoWs+e0me4i55YGP4t910="; + hash = "sha256-lNXS3lIGFPeM7DKMFTLBiOWn+AwZtenXF5KGN5DRwO4="; }; outputs = [ diff --git a/pkgs/development/python-modules/pyosmium/default.nix b/pkgs/development/python-modules/pyosmium/default.nix index 7ad9f2b2cc3f..76bbe05115ef 100644 --- a/pkgs/development/python-modules/pyosmium/default.nix +++ b/pkgs/development/python-modules/pyosmium/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "pyosmium"; - version = "4.0.2"; + version = "4.2.0"; pyproject = true; disabled = isPyPy; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "osmcode"; repo = "pyosmium"; tag = "v${version}"; - hash = "sha256-pW2w/M4P4DtGhnTy72w0wjMtpLtSgvYGaemme/rRrwM="; + hash = "sha256-AkldgvZmn1CLa9Ze7RHBhL5wLLJ+mBnNj+yyV98nzZ8="; }; build-system = [ setuptools ]; @@ -65,7 +65,7 @@ buildPythonPackage rec { meta = { description = "Python bindings for libosmium"; homepage = "https://osmcode.org/pyosmium"; - changelog = "https://github.com/osmcode/pyosmium/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/osmcode/pyosmium/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ sikmir ]; }; diff --git a/pkgs/development/python-modules/pypaperless/default.nix b/pkgs/development/python-modules/pypaperless/default.nix index b6ce03d6b228..31f5989b0081 100644 --- a/pkgs/development/python-modules/pypaperless/default.nix +++ b/pkgs/development/python-modules/pypaperless/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pypaperless"; - version = "5.1.0"; + version = "5.2.2"; pyproject = true; src = fetchFromGitHub { owner = "tb1337"; repo = "paperless-api"; tag = "v${version}"; - hash = "sha256-J2YAUVgiXcb9jM0yDkBkg3X7k8B7hT3dxeEI5Tn2QLY="; + hash = "sha256-hlXoV7eusK3Zl8VVP7U6RIHWj2pisLMCasqECXmi3Qk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix index 3423ca11050f..6c0fb3b06528 100644 --- a/pkgs/development/python-modules/pyparsing/default.nix +++ b/pkgs/development/python-modules/pyparsing/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pyparsing"; - version = "3.2.3"; + version = "3.3.2"; pyproject = true; src = fetchFromGitHub { owner = "pyparsing"; repo = "pyparsing"; tag = version; - hash = "sha256-irRSylY16Vcm2zsue1Iv+1eqYGZSAqhkqHrdjdhznlM="; + hash = "sha256-TlYl57JdMJzpCUkHMLiQuCb24UXoNFFTShfqcgrmZm8="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/pypika/default.nix b/pkgs/development/python-modules/pypika/default.nix index bd29b60e11f6..3594aff65d0a 100644 --- a/pkgs/development/python-modules/pypika/default.nix +++ b/pkgs/development/python-modules/pypika/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, parameterized, unittestCheckHook, setuptools, @@ -10,25 +9,16 @@ buildPythonPackage (finalAttrs: { pname = "pypika"; - version = "0.49.0"; + version = "0.50.0"; pyproject = true; src = fetchFromGitHub { owner = "kayak"; repo = "pypika"; tag = "v${finalAttrs.version}"; - hash = "sha256-Lawsc19sJ3U7rCOnYvDWhWqK/J+Hd3zKG6TrhDsTtVs="; + hash = "sha256-gjHr4tWy1kL7IxOe5QmH0S/HB+MsF/IOIQcTu3yjv6c="; }; - patches = [ - # Fix ast deprecation warnings, https://github.com/HENNGE/arsenic/pull/160 - (fetchpatch { - name = "ast-deprecation.patch"; - url = "https://github.com/pyctrl/pypika/commit/e302e4d1c26242bcff61b50e0e8f157f181e1bc0.patch"; - hash = "sha256-pbJwOE5xaAapMKdm1xsNrISbCzHIKuhCgA2lA0vB1T8="; - }) - ]; - build-system = [ setuptools ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pyplatec/default.nix b/pkgs/development/python-modules/pyplatec/default.nix index 4b960f0f7461..85374c323004 100644 --- a/pkgs/development/python-modules/pyplatec/default.nix +++ b/pkgs/development/python-modules/pyplatec/default.nix @@ -6,13 +6,12 @@ buildPythonPackage rec { pname = "pyplatec"; - version = "1.4.0"; + version = "1.4.3"; format = "setuptools"; src = fetchPypi { - pname = "PyPlatec"; - inherit version; - sha256 = "0kqx33flcrrlipccmqs78d14pj5749bp85b6k5fgaq2c7yzz02jg"; + inherit pname version; + sha256 = "sha256-PXQlJtC4Z0ifphqTelOuBQS5wubxCH/f0PSWnE7OeNg="; }; env.NIX_CFLAGS_COMPILE = "-std=c++11"; diff --git a/pkgs/development/python-modules/pyppeteer/default.nix b/pkgs/development/python-modules/pyppeteer/default.nix index 2f6a9e14d273..4fd2c95a0a2d 100644 --- a/pkgs/development/python-modules/pyppeteer/default.nix +++ b/pkgs/development/python-modules/pyppeteer/default.nix @@ -17,23 +17,16 @@ buildPythonPackage rec { pname = "pyppeteer"; - version = "1.0.2"; + version = "2.0.0"; pyproject = true; src = fetchFromGitHub { owner = "pyppeteer"; repo = "pyppeteer"; tag = version; - hash = "sha256-izMaWtJdkLHMQbyq7o7n46xB8dOHXZ5uO0UXt+twjL4="; + hash = "sha256-LYyV4Wzz4faewSsGjNe0i/9BLbCHzzEns2ZL2MYkGWw="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'pyee = "^8.1.0"' 'pyee = "*"' \ - --replace 'urllib3 = "^1.25.8"' 'urllib3 = "*"' \ - --replace 'websockets = "^10.0"' 'websockets = "*"' - ''; - nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ @@ -46,6 +39,12 @@ buildPythonPackage rec { websockets ]; + pythonRelaxDeps = [ + "pyee" + "urllib3" + "websockets" + ]; + nativeCheckInputs = [ syncer pytest-xdist @@ -85,7 +84,7 @@ buildPythonPackage rec { description = "Headless chrome/chromium automation library (unofficial port of puppeteer)"; mainProgram = "pyppeteer-install"; homepage = "https://github.com/pyppeteer/pyppeteer"; - changelog = "https://github.com/pyppeteer/pyppeteer/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/pyppeteer/pyppeteer/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ kmein ]; }; diff --git a/pkgs/development/python-modules/pyproject-metadata/default.nix b/pkgs/development/python-modules/pyproject-metadata/default.nix index 6175dddef22c..625c65d4ccdd 100644 --- a/pkgs/development/python-modules/pyproject-metadata/default.nix +++ b/pkgs/development/python-modules/pyproject-metadata/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pyproject-metadata"; - version = "0.9.1"; + version = "0.10.0"; pyproject = true; src = fetchPypi { pname = "pyproject_metadata"; inherit version; - hash = "sha256-uLIlPdG3Bit4z5SaEV8Cun+kEUqr5j+hBSjp4alUqBY="; + hash = "sha256-f1vQ7zmLYBaVVssX6iYdcVyvf4VhI4FR9RsjBQhLqNQ="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/pyproject-parser/default.nix b/pkgs/development/python-modules/pyproject-parser/default.nix index d05c1ca6fc1e..42f4925c87a1 100644 --- a/pkgs/development/python-modules/pyproject-parser/default.nix +++ b/pkgs/development/python-modules/pyproject-parser/default.nix @@ -11,6 +11,7 @@ domdf-python-tools, hatchling, hatch-requirements-txt, + license-expression, natsort, packaging, readme-renderer, @@ -20,13 +21,13 @@ }: buildPythonPackage rec { pname = "pyproject-parser"; - version = "0.13.0"; + version = "0.14.0"; pyproject = true; src = fetchPypi { pname = "pyproject_parser"; inherit version; - hash = "sha256-/x3bXUJsbYs4rXPNotXK8/VohSy04M+Gk0XInoyg+3Y="; + hash = "sha256-QEe9miURXkABmeZyzZ2Pi6QF2BSNZadsvzr7z3fpZuI="; }; build-system = [ @@ -39,6 +40,7 @@ buildPythonPackage rec { attrs dom-toml domdf-python-tools + license-expression natsort packaging shippinglabel diff --git a/pkgs/development/python-modules/pyqodeng-angr/default.nix b/pkgs/development/python-modules/pyqodeng-angr/default.nix index 13013db56184..9c32a3014afe 100644 --- a/pkgs/development/python-modules/pyqodeng-angr/default.nix +++ b/pkgs/development/python-modules/pyqodeng-angr/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyqodeng-angr"; - version = "0.0.13"; + version = "2.11.0"; pyproject = true; src = fetchFromGitHub { owner = "angr"; repo = "pyqodeng"; - tag = "v${version}"; - hash = "sha256-t4LcPVQfktAaTqTr9L2VDCEHbSO7qxCvUDz6rj0Zre4="; + tag = version; + hash = "sha256-mRwZaQ9jLQrLZYMpAjmgcHTBuY2agbX5XEjASjcSBhc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyqt-builder/default.nix b/pkgs/development/python-modules/pyqt-builder/default.nix index 82ae97e76fbd..e1b7ae4a0869 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.2"; + version = "1.19.1"; pyproject = true; src = fetchPypi { pname = "pyqt_builder"; inherit version; - hash = "sha256-Vt/qRhSEqHqPDIsCKRkN78Q21+xd5xEC4gs15WORgLw="; + hash = "sha256-avZka6KWaHUbA5v9ztUWQstRDjAHlrWKTWi3+VagJNg="; }; build-system = [ diff --git a/pkgs/development/python-modules/pyqt6-charts/default.nix b/pkgs/development/python-modules/pyqt6-charts/default.nix index b34216937d78..92eb9ac0b9d7 100644 --- a/pkgs/development/python-modules/pyqt6-charts/default.nix +++ b/pkgs/development/python-modules/pyqt6-charts/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pyqt6-charts"; - version = "6.9.0"; + version = "6.10.0"; pyproject = true; src = fetchPypi { pname = "pyqt6_charts"; inherit version; - hash = "sha256-fvvpu35q1PmEUhGg7+D5HKXhT5Ni7RuoTVXyuFFQkfc="; + hash = "sha256-keFeKNARyqTIOIGpBoezXj0F71cpDN2XYIJMlb2saj4="; }; # 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 8cafdbf543be..d1894ca206dd 100644 --- a/pkgs/development/python-modules/pyqt6-webengine/default.nix +++ b/pkgs/development/python-modules/pyqt6-webengine/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "pyqt6-webengine"; - version = "6.9.0"; + version = "6.10.0"; pyproject = true; src = fetchPypi { pname = "pyqt6_webengine"; inherit version; - hash = "sha256-auU347vaBrjgZTXkhSKX4Lw7AFQ8R5KVQfzJsRmBqiU="; + hash = "sha256-Jn0nJ10Mea4nC8pLA1IKQfp+hcKk2WMtqMucwjOlWtE="; }; patches = [ diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/pkgs/development/python-modules/pyqtgraph/default.nix index fcc6e51f8bbf..64833cb7323a 100644 --- a/pkgs/development/python-modules/pyqtgraph/default.nix +++ b/pkgs/development/python-modules/pyqtgraph/default.nix @@ -3,12 +3,12 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch, # build-system setuptools, # dependencies + colorama, scipy, numpy, pyopengl, @@ -28,32 +28,22 @@ let in buildPythonPackage rec { pname = "pyqtgraph"; - version = "0.13.7"; + version = "0.14.0"; pyproject = true; src = fetchFromGitHub { owner = "pyqtgraph"; repo = "pyqtgraph"; tag = "pyqtgraph-${version}"; - hash = "sha256-MUwg1v6oH2TGmJ14Hp9i6KYierJbzPggK59QaHSXHVA="; + hash = "sha256-T5rhaBtcKP/sYjCmYNMYR0BGttkiLhWTfEbZNeAdJJ0="; }; - patches = [ - # Fixes a segmentation fault in tests with Qt 6.10. See: - # https://github.com/pyqtgraph/pyqtgraph/issues/3390 - # The patch is the merge commit of: - # https://github.com/pyqtgraph/pyqtgraph/pull/3370 - (fetchpatch { - url = "https://github.com/pyqtgraph/pyqtgraph/commit/bf38b8527e778c9c0bb653bc0df7bb36018dcbae.patch"; - hash = "sha256-Tv4QK/OZvmDO3MOjswjch7DpF96U1uRN0dr8NIQ7+LY="; - }) - ]; - build-system = [ setuptools ]; dependencies = [ + colorama numpy scipy pyopengl @@ -79,17 +69,22 @@ buildPythonPackage rec { "tests" ]; - disabledTests = - lib.optionals (!stdenv.hostPlatform.isx86) [ - # small precision-related differences on other architectures, - # upstream doesn't consider it serious. - # https://github.com/pyqtgraph/pyqtgraph/issues/2110 - "test_PolyLineROI" - ] - ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ - # https://github.com/pyqtgraph/pyqtgraph/issues/2645 - "test_rescaleData" - ]; + disabledTests = [ + # ZeroDivisionError: float division by zero + "test_maps_tick_values_to_local_times" + "test_maps_hour_ticks_to_local_times_when_skip_greater_than_one" + + ] + ++ lib.optionals (!stdenv.hostPlatform.isx86) [ + # small precision-related differences on other architectures, + # upstream doesn't consider it serious. + # https://github.com/pyqtgraph/pyqtgraph/issues/2110 + "test_PolyLineROI" + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # https://github.com/pyqtgraph/pyqtgraph/issues/2645 + "test_rescaleData" + ]; meta = { description = "Scientific Graphics and GUI Library for Python"; diff --git a/pkgs/development/python-modules/pyquil/default.nix b/pkgs/development/python-modules/pyquil/default.nix index f98214e86bd0..ce438b6f3c74 100644 --- a/pkgs/development/python-modules/pyquil/default.nix +++ b/pkgs/development/python-modules/pyquil/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "pyquil"; - version = "4.16.2"; + version = "4.17.0"; pyproject = true; src = fetchFromGitHub { owner = "rigetti"; repo = "pyquil"; tag = "v${version}"; - hash = "sha256-itDy42rhHiX9oXQQ+eKE3/Xdh4cBzdS3jetanTrxuFo="; + hash = "sha256-El0eMBUOYpB0v+duPEnIQTbJLKTguq4yTsItbriRbg4="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pyqwikswitch/default.nix b/pkgs/development/python-modules/pyqwikswitch/default.nix index 0a22ec145f06..5f7ceb36511c 100644 --- a/pkgs/development/python-modules/pyqwikswitch/default.nix +++ b/pkgs/development/python-modules/pyqwikswitch/default.nix @@ -1,50 +1,56 @@ { lib, buildPythonPackage, - fetchpatch, - fetchPypi, + fetchFromGitHub, attrs, - requests, - setuptools, + aiohttp, + uv-build, + aioresponses, + pytest-asyncio, + pytest-cov-stub, + pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyqwikswitch"; - version = "0.94"; + version = "1.0.2"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-IpyWz+3EMr0I+xULBJJhBgdnQHNPJIM1SqKFLpszhQc="; + src = fetchFromGitHub { + owner = "kellerza"; + repo = "pyqwikswitch"; + tag = "v${finalAttrs.version}"; + hash = "sha256-yx3rCPVuhsemAtFuEhPvFPHOFm2UWrXmWF3d/ZtPGo8="; }; - patches = [ - # https://github.com/kellerza/pyqwikswitch/pull/7 - (fetchpatch { - name = "replace-async-timeout-with-asyncio.timeout.patch"; - url = "https://github.com/kellerza/pyqwikswitch/commit/7b3f2211962b30bb6beea9a4fe17cd04cdf8e27f.patch"; - hash = "sha256-sdO5jzIgKdneNY5dTngIzUFtyRg7HBGaZA1BBeAJxu4="; - }) - ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "uv-build>=0.8.20,<0.9" uv-build + ''; - build-system = [ setuptools ]; + build-system = [ uv-build ]; dependencies = [ + aiohttp attrs - requests ]; pythonImportsCheck = [ "pyqwikswitch" - "pyqwikswitch.threaded" ]; - doCheck = false; # no tests in sdist + nativeCheckInputs = [ + aioresponses + pytest-asyncio + pytest-cov-stub + pytestCheckHook + ]; meta = { + changelog = "https://github.com/kellerza/pyqwikswitch/blob/${finalAttrs.src.tag}/CHANGELOG.md"; description = "QwikSwitch USB Modem API binding for Python"; homepage = "https://github.com/kellerza/pyqwikswitch"; license = lib.licenses.mit; teams = [ lib.teams.home-assistant ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyrevolve/default.nix b/pkgs/development/python-modules/pyrevolve/default.nix index bb9602627a72..568a2a6089d1 100644 --- a/pkgs/development/python-modules/pyrevolve/default.nix +++ b/pkgs/development/python-modules/pyrevolve/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyrevolve"; - version = "2.2.6"; + version = "2.2.7"; pyproject = true; src = fetchFromGitHub { owner = "devitocodes"; repo = pname; tag = "v${version}"; - hash = "sha256-jjiFOlxXjaa4L4IEtojeeS0jx4GsftAeIGBpJLhUcY4="; + hash = "sha256-JNK/+9Fl9CKmRSdkmvN6XENrldFuX1ybIwYOMbGO7uI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyrfc3339/default.nix b/pkgs/development/python-modules/pyrfc3339/default.nix index 19ad6dbe5808..9c732c4dbc0d 100644 --- a/pkgs/development/python-modules/pyrfc3339/default.nix +++ b/pkgs/development/python-modules/pyrfc3339/default.nix @@ -5,6 +5,7 @@ # build-system setuptools, + setuptools-scm, # dependencies pytz, @@ -15,17 +16,20 @@ buildPythonPackage rec { pname = "pyrfc3339"; - version = "2.0.1"; + version = "2.1.0"; pyproject = true; src = fetchFromGitHub { owner = "kurtraschke"; repo = "pyRFC3339"; tag = "v${version}"; - hash = "sha256-iLzWm2xt7EuzqU0G+66sXTTvWTv1cf0BmTDciSL68+A="; + hash = "sha256-pNtv60ecJ7kceS+dDMuKVCQGARf0SbNVBLqqTIzHDj0="; }; - build-system = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; dependencies = [ pytz ]; diff --git a/pkgs/development/python-modules/pyro5/default.nix b/pkgs/development/python-modules/pyro5/default.nix index 5f296a4727f6..36d4674830e7 100644 --- a/pkgs/development/python-modules/pyro5/default.nix +++ b/pkgs/development/python-modules/pyro5/default.nix @@ -2,23 +2,27 @@ lib, stdenv, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, serpent, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyro5"; - version = "5.15"; - format = "setuptools"; + version = "5.16"; + pyproject = true; - src = fetchPypi { - pname = "Pyro5"; - inherit version; - hash = "sha256-gsPfyYYLSfiXso/yT+ZxbIQWcsYAr4/kDQ46f6yaP14="; + src = fetchFromGitHub { + owner = "irmen"; + repo = "Pyro5"; + tag = "v${finalAttrs.version}"; + hash = "sha256-8ORwfzPpcNQdGRNe1EnY0A/+9itmSY3ouvreOcc18u8="; }; - propagatedBuildInputs = [ serpent ]; + build-system = [ setuptools ]; + + dependencies = [ serpent ]; __darwinAllowLocalNetworking = true; @@ -41,8 +45,8 @@ buildPythonPackage rec { meta = { description = "Distributed object middleware for Python (RPC)"; homepage = "https://github.com/irmen/Pyro5"; - changelog = "https://github.com/irmen/Pyro5/releases/tag/v${version}"; + changelog = "https://github.com/irmen/Pyro5/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ peterhoeg ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyroma/default.nix b/pkgs/development/python-modules/pyroma/default.nix index c515f22dd20e..b4a5f7802f00 100644 --- a/pkgs/development/python-modules/pyroma/default.nix +++ b/pkgs/development/python-modules/pyroma/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "pyroma"; - version = "4.2"; + version = "5.0.1"; pyproject = true; # https://github.com/regebro/pyroma/issues/104 @@ -31,8 +31,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "regebro"; repo = "pyroma"; - rev = version; - sha256 = "sha256-ElSw+bY6fbHJPTX7O/9JZ4drttfbUQsU/fv3Cqqb/J4="; + tag = version; + sha256 = "sha256-J5+/1jc/Dvh7aPV9FgG/uhxWG4DbQISgx+kX4Ayd1cU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyside6-qtads/default.nix b/pkgs/development/python-modules/pyside6-qtads/default.nix index 77493ba43056..41abea11a295 100644 --- a/pkgs/development/python-modules/pyside6-qtads/default.nix +++ b/pkgs/development/python-modules/pyside6-qtads/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyside6-qtads"; - version = "4.4.1"; + version = "4.5.0"; pyproject = true; src = fetchFromGitHub { owner = "mborgerson"; repo = "pyside6_qtads"; tag = "v${version}"; - hash = "sha256-XEPhZBFAZOvr3Kelz9mplkJiQH3zUf2QZJs/NNJE114="; + hash = "sha256-rAkv6dFyS4Nw3FDLwZ1zp0EU4BhD/xrhNgUiIIktJ8s="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/pysignalr/default.nix b/pkgs/development/python-modules/pysignalr/default.nix index 1dd2ec3e5912..ec93d51da902 100644 --- a/pkgs/development/python-modules/pysignalr/default.nix +++ b/pkgs/development/python-modules/pysignalr/default.nix @@ -34,6 +34,8 @@ buildPythonPackage rec { websockets ]; + pythonRelaxDeps = [ "websockets" ]; + pythonImportsCheck = [ "pysignalr" ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index 764cc5e85d51..ebb7207be285 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pyspark"; - version = "3.5.5"; + version = "4.1.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-bv/Jzpjt8jH01oP9FPcnBim/hFjGKNaiYg3tS7NPPLk="; + hash = "sha256-d/eJhKqE++hlxxfdN7SZE7TlyX1272gk+TLxrvpmIew="; }; # pypandoc is broken with pandoc2, so we just lose docs. diff --git a/pkgs/development/python-modules/pyspcwebgw/default.nix b/pkgs/development/python-modules/pyspcwebgw/default.nix index 8b3439db6a3e..d60ca74c597c 100644 --- a/pkgs/development/python-modules/pyspcwebgw/default.nix +++ b/pkgs/development/python-modules/pyspcwebgw/default.nix @@ -8,7 +8,7 @@ fetchpatch, poetry-core, pytest-asyncio, - pytestCheckHook, + pytest8_3CheckHook, }: buildPythonPackage rec { @@ -42,7 +42,7 @@ buildPythonPackage rec { nativeCheckInputs = [ aioresponses pytest-asyncio - pytestCheckHook + pytest8_3CheckHook ]; pythonImportsCheck = [ "pyspcwebgw" ]; diff --git a/pkgs/development/python-modules/pyspeex-noise/default.nix b/pkgs/development/python-modules/pyspeex-noise/default.nix index 493ba3b44375..c686097363b4 100644 --- a/pkgs/development/python-modules/pyspeex-noise/default.nix +++ b/pkgs/development/python-modules/pyspeex-noise/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyspeex-noise"; - version = "1.0.2"; + version = "2.0.0"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "pyspeex-noise"; - tag = version; - hash = "sha256-XtLA5yVVCZdpALPu3fx+U+aaA729Vs1UeOJsIm6/S+k="; + tag = "v${version}"; + hash = "sha256-sOm3zYXI84c/8Qh4rvEZGcBo/avqS+ul+uLwtmCCc1I="; }; build-system = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/rhasspy/pyspeex-noise/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/rhasspy/pyspeex-noise/blob/${src.tag}/CHANGELOG.md"; description = "Noise suppression and automatic gain with speex"; homepage = "https://github.com/rhasspy/pyspeex-noise"; license = with lib.licenses; [ diff --git a/pkgs/development/python-modules/pystardict/default.nix b/pkgs/development/python-modules/pystardict/default.nix index 4938fac38e6b..d6ed140de4ba 100644 --- a/pkgs/development/python-modules/pystardict/default.nix +++ b/pkgs/development/python-modules/pystardict/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pystardict"; - version = "0.8"; + version = "0.9"; format = "setuptools"; src = fetchFromGitHub { owner = "lig"; repo = "pystardict"; - rev = version; - hash = "sha256-YrZpIhyxfA3G7rP0SJ+EvzGwAXlne80AYilkj6cIDnA="; + tag = "v${version}"; + hash = "sha256-VWOxggAKifN5f6nSN1xsSbg0hpKzrHDw+UqnAOzsXj0="; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/pystemd/default.nix b/pkgs/development/python-modules/pystemd/default.nix index 67143d6bfd49..b193fb80a5f0 100644 --- a/pkgs/development/python-modules/pystemd/default.nix +++ b/pkgs/development/python-modules/pystemd/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pystemd"; - version = "0.13.4"; + version = "0.15.3"; pyproject = true; src = fetchFromGitHub { owner = "systemd"; repo = "pystemd"; tag = "v${version}"; - hash = "sha256-Ph0buiyH2cLRXyqgA8DmpE9crb/x8OaerIoZuv8hjMI="; + hash = "sha256-qFBa2hIcF0hyb+QyVpFG0qOpWsVVVTGCqgfChic6JCI="; }; buildInputs = [ systemd ]; diff --git a/pkgs/development/python-modules/pystemmer/default.nix b/pkgs/development/python-modules/pystemmer/default.nix index 39c0cfa07056..8e589b2a48ed 100644 --- a/pkgs/development/python-modules/pystemmer/default.nix +++ b/pkgs/development/python-modules/pystemmer/default.nix @@ -2,7 +2,6 @@ lib, python, fetchFromGitHub, - fetchpatch2, buildPythonPackage, cython, setuptools, @@ -11,7 +10,7 @@ buildPythonPackage rec { pname = "pystemmer"; - version = "2.2.0.1"; + version = "3.0.0"; format = "setuptools"; pyproejct = true; @@ -19,18 +18,9 @@ buildPythonPackage rec { owner = "snowballstem"; repo = "pystemmer"; tag = "v${version}"; - hash = "sha256-ngPx95ybgJmndpNPBwCa3BCNsozRg+dlEw+nhlIwI58="; + hash = "sha256-c3ucbneUo5UBfdrd5Ktl4HriVusvWBEA1brrgahEQ9A="; }; - patches = [ - (fetchpatch2 { - # relax cython constraint - name = "pystemmer-relax-cython.patch"; - url = "https://github.com/snowballstem/pystemmer/commit/d3d423dc877b4f49e0ab1776f7edaff37feb6799.patch"; - hash = "sha256-9K6gy/cLFPfW82XYHVVPXUbQhf8XyB4NUi4YqNtyWcw="; - }) - ]; - build-system = [ cython setuptools diff --git a/pkgs/development/python-modules/pytask/default.nix b/pkgs/development/python-modules/pytask/default.nix index 3e6be0731046..543a1d5c2f9f 100644 --- a/pkgs/development/python-modules/pytask/default.nix +++ b/pkgs/development/python-modules/pytask/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "pytask"; - version = "0.5.7"; + version = "0.5.8"; pyproject = true; src = fetchFromGitHub { owner = "pytask-dev"; repo = "pytask"; tag = "v${version}"; - hash = "sha256-qXqmI3IRJUTTsTdLlkjHc5+Vdct4j4MJYgnrRx3gTR8="; + hash = "sha256-tQUvqqbFUO3cw+dVPfCKiYyhwX31vqUBXr7GrRfPC+A="; }; build-system = [ diff --git a/pkgs/development/python-modules/pytest-aiohttp/default.nix b/pkgs/development/python-modules/pytest-aiohttp/default.nix index 104dbc50d3f2..ba963a0b67b7 100644 --- a/pkgs/development/python-modules/pytest-aiohttp/default.nix +++ b/pkgs/development/python-modules/pytest-aiohttp/default.nix @@ -38,7 +38,10 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pytestFlags = [ "-Wignore::pytest.PytestDeprecationWarning" ]; + pytestFlags = [ + "-Wignore::DeprecationWarning" + "-Wignore::pytest.PytestDeprecationWarning" + ]; meta = { homepage = "https://github.com/aio-libs/pytest-aiohttp/"; diff --git a/pkgs/development/python-modules/pytest-asyncio/0.nix b/pkgs/development/python-modules/pytest-asyncio/0.nix index d95da94300ff..84b0a933a5d2 100644 --- a/pkgs/development/python-modules/pytest-asyncio/0.nix +++ b/pkgs/development/python-modules/pytest-asyncio/0.nix @@ -28,6 +28,8 @@ buildPythonPackage rec { buildInputs = [ pytest ]; + pythonRelaxDeps = [ "pytest" ]; + postInstall = '' mkdir $testout cp -R tests $testout/tests diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index 2808d27182f5..87062960a7cb 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -28,6 +28,8 @@ buildPythonPackage rec { build-system = [ setuptools-scm ]; + pythonRelaxDeps = [ "pytest" ]; + buildInputs = [ pytest ]; dependencies = lib.optionals (pythonOlder "3.13") [ diff --git a/pkgs/development/python-modules/pytest-codspeed/default.nix b/pkgs/development/python-modules/pytest-codspeed/default.nix index 4b3eebde0119..440edf8161d1 100644 --- a/pkgs/development/python-modules/pytest-codspeed/default.nix +++ b/pkgs/development/python-modules/pytest-codspeed/default.nix @@ -24,14 +24,14 @@ in buildPythonPackage rec { pname = "pytest-codspeed"; - version = "4.0.0"; + version = "4.2.0"; pyproject = true; src = fetchFromGitHub { owner = "CodSpeedHQ"; repo = "pytest-codspeed"; tag = "v${version}"; - hash = "sha256-5fdG7AEiLD3ZZzU/7zBK0+LDacTZooyDUo+FefcE4uQ="; + hash = "sha256-MrdMUTNXRatGNsfw7Ghp/PIXPnocEgEMBjAwML/tMos="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix index 72233498e3cc..2d6a6ea0641d 100644 --- a/pkgs/development/python-modules/pytest-cov/default.nix +++ b/pkgs/development/python-modules/pytest-cov/default.nix @@ -4,23 +4,27 @@ fetchPypi, pytest, coverage, - setuptools, + hatchling, + hatch-fancy-pypi-readme, toml, tomli, }: buildPythonPackage rec { pname = "pytest-cov"; - version = "6.2.1"; + version = "7.0.0"; pyproject = true; src = fetchPypi { pname = "pytest_cov"; inherit version; - hash = "sha256-JcxswKU1ggS4EI7O3FGptXs0zGuMlnzCwBpOANimfaI="; + hash = "sha256-M8l+2i4EmgxSmOkfUZMCoTNMJqxlwaSD1iBv1Fg2GvE="; }; - build-system = [ setuptools ]; + build-system = [ + hatchling + hatch-fancy-pypi-readme + ]; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-datafiles/default.nix b/pkgs/development/python-modules/pytest-datafiles/default.nix index ef8016b140b2..dc7b2e3325ac 100644 --- a/pkgs/development/python-modules/pytest-datafiles/default.nix +++ b/pkgs/development/python-modules/pytest-datafiles/default.nix @@ -2,27 +2,26 @@ lib, buildPythonPackage, fetchFromGitHub, - py, + hatchling, pytest, pytestCheckHook, }: buildPythonPackage rec { pname = "pytest-datafiles"; - version = "3.0.0"; - format = "setuptools"; + version = "3.0.1"; + pyproject = true; src = fetchFromGitHub { owner = "omarkohl"; repo = "pytest-datafiles"; tag = version; - hash = "sha256-YFD8M5TG6VtLRX04R3u0jtYDDlaK32D4ArWxS6x2b/E="; + hash = "sha256-xB96JAUlEicIrTET1L363H8O2JwCTuUWr9jX/70uFvs="; }; - buildInputs = [ - py - pytest - ]; + build-system = [ hatchling ]; + + buildInputs = [ pytest ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-describe/default.nix b/pkgs/development/python-modules/pytest-describe/default.nix index 7259cb1aafbe..3c88f2f6f66b 100644 --- a/pkgs/development/python-modules/pytest-describe/default.nix +++ b/pkgs/development/python-modules/pytest-describe/default.nix @@ -28,6 +28,11 @@ buildPythonPackage { hash = "sha256-ygrZwd1cO9arekdzqn5Axjz4i9Q0QKFA/OS6QSIvP9Y="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "uv_build>=0.9.4,<0.10.0" uv_build + ''; + build-system = [ uv-build ]; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index d6a010793db0..57f7acd6ba02 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pytest-doctestplus"; - version = "1.4.0"; + version = "1.7.0"; pyproject = true; src = fetchFromGitHub { owner = "scientific-python"; repo = "pytest-doctestplus"; tag = "v${version}"; - hash = "sha256-hKxTniN7BHDdIHqxNGOuvD7Rk5ChSh1Zn6fo6G+Uty4="; + hash = "sha256-64I0K0+yYU1omGkVgfxeD9r9s9yHp0ik1HAsEc1NNtA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pytest-env/default.nix b/pkgs/development/python-modules/pytest-env/default.nix index 610e5142ec8d..f9d3cd20cc76 100644 --- a/pkgs/development/python-modules/pytest-env/default.nix +++ b/pkgs/development/python-modules/pytest-env/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pytest-env"; - version = "1.1.5"; + version = "1.2.0"; pyproject = true; src = fetchPypi { pname = "pytest_env"; inherit version; - hash = "sha256-kSCYQKoOQzhQc6xGSlVK0pR8wv1mOp3r+I0DsB4Mwc8="; + hash = "sha256-R14uvoYmzuAfSR8wSnSxITd0I5fWx4TqS8JY8GkjK4A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-fixture-classes/default.nix b/pkgs/development/python-modules/pytest-fixture-classes/default.nix index 6765247d940f..ce787261fb81 100644 --- a/pkgs/development/python-modules/pytest-fixture-classes/default.nix +++ b/pkgs/development/python-modules/pytest-fixture-classes/default.nix @@ -2,34 +2,40 @@ lib, buildPythonPackage, fetchFromGitHub, - - poetry-core, - pytest, - pytestCheckHook, + hatchling, typing-extensions, + pytest-asyncio, + pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-fixture-classes"; - version = "1.0.3"; - format = "pyproject"; + version = "1.0.4"; + pyproject = true; src = fetchFromGitHub { owner = "zmievsa"; repo = "pytest-fixture-classes"; - tag = version; - hash = "sha256-A3HsDhCGxoJnkl841tZ/7lIn8UyGy5NRjVWODZV7aOQ="; + tag = finalAttrs.version; + hash = "sha256-we4Eax6wHlsbDoCzSUcbfwX+o2h3xCTaQZ3f5wStvZM="; }; - build-system = [ poetry-core ]; + build-system = [ + hatchling + ]; dependencies = [ typing-extensions ]; - pythonImportsCheck = [ "pytest_fixture_classes" ]; + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; - nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ + "pytest_fixture_classes" + ]; meta = { description = "Fixtures as classes that work well with dependency injection, autocompletetion, type checkers, and language servers"; @@ -37,4 +43,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ taranarmo ]; }; -} +}) diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix index 95e2f7941511..03fddb9abb2b 100644 --- a/pkgs/development/python-modules/pytest-forked/default.nix +++ b/pkgs/development/python-modules/pytest-forked/default.nix @@ -33,6 +33,8 @@ buildPythonPackage rec { url = "https://github.com/pytest-dev/pytest-forked/commit/b2742322d39ebda97d5170922520f3bb9c73f614.patch"; hash = "sha256-tTRW0p3tOotQMtjjJ6RUKdynsAnKRz0RAV8gAUHiNNA="; }) + # https://github.com/pytest-dev/pytest-forked/pull/96 + ./pytest9-compat.patch ]; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-forked/pytest9-compat.patch b/pkgs/development/python-modules/pytest-forked/pytest9-compat.patch new file mode 100644 index 000000000000..0d665bb9177f --- /dev/null +++ b/pkgs/development/python-modules/pytest-forked/pytest9-compat.patch @@ -0,0 +1,30 @@ +From a4e8e78f2ba6d44b6255e2cb9eb4d4b0655b8e56 Mon Sep 17 00:00:00 2001 +From: Scott Talbert +Date: Sun, 14 Dec 2025 22:25:51 -0500 +Subject: [PATCH] Adapt tests to pytest 9 output format + +--- + testing/test_xfail_behavior.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/testing/test_xfail_behavior.py b/testing/test_xfail_behavior.py +index 2b8946a..fdad433 100644 +--- a/testing/test_xfail_behavior.py ++++ b/testing/test_xfail_behavior.py +@@ -8,6 +8,7 @@ + FAILED_WORD = "FAILED" if IS_PYTEST4_PLUS else "FAIL" + PYTEST_GTE_7_2 = hasattr(pytest, "version_tuple") and pytest.version_tuple >= (7, 2) # type: ignore[attr-defined] + PYTEST_GTE_8_0 = hasattr(pytest, "version_tuple") and pytest.version_tuple >= (8, 0) # type: ignore[attr-defined] ++PYTEST_GTE_9_0 = hasattr(pytest, "version_tuple") and pytest.version_tuple >= (9, 0) # type: ignore[attr-defined] + + pytestmark = pytest.mark.skipif( # pylint: disable=invalid-name + not hasattr(os, "fork"), # noqa: WPS421 +@@ -72,6 +73,8 @@ def test_xfail(is_crashing, is_strict, testdir): + ) + if expected_lowercase == "xfailed" and PYTEST_GTE_7_2: + short_test_summary += " - " + reason_string ++ if expected_lowercase == "failed" and PYTEST_GTE_9_0: ++ short_test_summary += " - [XPASS(strict)] The process gets termin..." + total_summary_line = f"*==== 1 {expected_lowercase!s} in 0.*s* ====*" + + expected_lines = ( diff --git a/pkgs/development/python-modules/pytest-golden/default.nix b/pkgs/development/python-modules/pytest-golden/default.nix index 4167ab618d6a..45114a76a0e9 100644 --- a/pkgs/development/python-modules/pytest-golden/default.nix +++ b/pkgs/development/python-modules/pytest-golden/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, fetchFromGitHub, ruamel-yaml, - poetry-core, + hatchling, pytest, pytestCheckHook, testfixtures, @@ -12,27 +12,20 @@ buildPythonPackage rec { pname = "pytest-golden"; - version = "0.2.2"; + version = "1.0.1"; pyproject = true; src = fetchFromGitHub { owner = "oprypin"; repo = "pytest-golden"; tag = "v${version}"; - hash = "sha256-l5fXWDK6gWJc3dkYFTokI9tWvawMRnF0td/lSwqkYXE="; + hash = "sha256-mjb8lBAoZxwUCN4AIMK/n70aC41Y4IV/+hrW11S9rcw="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "poetry>=0.12" poetry-core \ - --replace-fail poetry.masonry.api poetry.core.masonry.api - ''; - pythonRelaxDeps = [ "testfixtures" ]; build-system = [ - # hatchling used for > 0.2.2 - poetry-core + hatchling ]; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-html/default.nix b/pkgs/development/python-modules/pytest-html/default.nix index 656c14cf3c6b..8cf26462b2eb 100644 --- a/pkgs/development/python-modules/pytest-html/default.nix +++ b/pkgs/development/python-modules/pytest-html/default.nix @@ -11,19 +11,19 @@ }: let pname = "pytest-html"; - version = "4.1.1"; + version = "4.2.0"; src = fetchPypi { pname = "pytest_html"; inherit version; - hash = "sha256-cKAeiuWAD0oHS1akyxAlyPT5sDi7pf4x48mOuZZobwc="; + hash = "sha256-tqiMulB1ANhwmVkgHi51fTlB6Fn9F8/U7Yexb8DGeRI="; }; web-assets = buildNpmPackage { pname = "${pname}-web-assets"; inherit version src; - npmDepsHash = "sha256-aRod+SzVSb4bqEJzthfl/mH+DpbIe+j2+dNtrrhO2xU="; + npmDepsHash = "sha256-WJ0Ff0Y1u4EiIauEDGeOqLwY5Wk9wgjIvOGUmDog8rQ="; installPhase = '' runHook preInstall diff --git a/pkgs/development/python-modules/pytest-httpx/default.nix b/pkgs/development/python-modules/pytest-httpx/default.nix index d6a66988f1cf..ddbfe2a0e713 100644 --- a/pkgs/development/python-modules/pytest-httpx/default.nix +++ b/pkgs/development/python-modules/pytest-httpx/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pytest-httpx"; - version = "0.35.0"; + version = "0.36.0"; pyproject = true; src = fetchFromGitHub { owner = "Colin-b"; repo = "pytest_httpx"; tag = "v${version}"; - hash = "sha256-O5nLkXmGmLRA7tUYYDQ/w9JSxoiaWSLdHIYGrBjkGPE="; + hash = "sha256-WuvfhLRKbfhVehyz/0PAUlIYbwfTYlQMRC8uTWD1T00="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-jupyter/default.nix b/pkgs/development/python-modules/pytest-jupyter/default.nix index 777aca7f61ab..2db44b409091 100644 --- a/pkgs/development/python-modules/pytest-jupyter/default.nix +++ b/pkgs/development/python-modules/pytest-jupyter/default.nix @@ -24,14 +24,14 @@ let self = buildPythonPackage rec { pname = "pytest-jupyter"; - version = "0.10.1"; + version = "0.11.0"; pyproject = true; src = fetchFromGitHub { owner = "jupyter-server"; repo = "pytest-jupyter"; tag = "v${version}"; - hash = "sha256-RTpXBbVCRj0oyZ1TXXDv3M7sAI4kA6f3ouzTr0rXjwY="; + hash = "sha256-x3Q9Ei4WIMDjjrYfWees30eooWep60EljGYyUyypxqQ="; }; nativeBuildInputs = [ hatchling ]; @@ -69,7 +69,7 @@ let }; meta = { - changelog = "https://github.com/jupyter-server/pytest-jupyter/releases/tag/v${version}"; + changelog = "https://github.com/jupyter-server/pytest-jupyter/releases/tag/${src.tag}"; description = "Pytest plugin for testing Jupyter core libraries and extensions"; homepage = "https://github.com/jupyter-server/pytest-jupyter"; license = lib.licenses.bsd3; diff --git a/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix b/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix index 5cae30d4ac6d..2a9c5ef6ae7e 100644 --- a/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix +++ b/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix @@ -4,19 +4,20 @@ fetchFromGitHub, hatchling, pytest, + pytest-fixture-classes, pytestCheckHook, }: buildPythonPackage rec { pname = "pytest-lazy-fixtures"; - version = "1.3.2"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "dev-petrov"; repo = "pytest-lazy-fixtures"; tag = version; - hash = "sha256-h2Zm8Vbw3L9WeXaeFE/fJqiOgI3r+XnJUnnELDkmyaU="; + hash = "sha256-mKRWuRz8DDjdtG4Fx5Wcy5PIg2ao3+n9RFbiha7+f5I="; }; postPatch = '' @@ -30,7 +31,10 @@ buildPythonPackage rec { dependencies = [ pytest ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-fixture-classes + pytestCheckHook + ]; disabledTestPaths = [ # missing pytest-deadfixtures diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix index 3a8840b3d7b2..6ec6681962df 100644 --- a/pkgs/development/python-modules/pytest-localserver/default.nix +++ b/pkgs/development/python-modules/pytest-localserver/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pytest-localserver"; - version = "0.9.0.post0"; + version = "0.10.0"; pyproject = true; src = fetchPypi { pname = "pytest_localserver"; inherit version; - hash = "sha256-gDOjb7OC0rxIUPms/iw/tWVM1fDRY69tr0fykNt9X/A="; + hash = "sha256-JgcZfzkJEqslUl0SmsQ8PIdQSSVzaLP+CbXNA9zFJq8="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix index 7f18ddc71ca8..f3f672324d35 100644 --- a/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/pkgs/development/python-modules/pytest-mpl/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, setuptools-scm, pytest, @@ -14,12 +14,14 @@ buildPythonPackage rec { pname = "pytest-mpl"; - version = "0.17.0"; + version = "0.18.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-++8F1+ZktLM0UvtpisGI5SJ5HzJ9405+o329/p1SysY="; + src = fetchFromGitHub { + owner = "matplotlib"; + repo = "pytest-mpl"; + tag = "v${version}"; + hash = "sha256-9fMhVgeEL4bjNIegmJV7lisrdzp27h0syn9pMwzX4Gg="; }; build-system = [ diff --git a/pkgs/development/python-modules/pytest-randomly/default.nix b/pkgs/development/python-modules/pytest-randomly/default.nix index 732b15ee597b..021852839749 100644 --- a/pkgs/development/python-modules/pytest-randomly/default.nix +++ b/pkgs/development/python-modules/pytest-randomly/default.nix @@ -4,6 +4,7 @@ factory-boy, faker, fetchFromGitHub, + model-bakery, numpy, pytest, pytest-xdist, @@ -13,14 +14,14 @@ buildPythonPackage rec { pname = "pytest-randomly"; - version = "3.13.0"; + version = "4.0.1"; pyproject = true; src = fetchFromGitHub { repo = "pytest-randomly"; owner = "pytest-dev"; tag = version; - hash = "sha256-bxbW22Nf/0hfJYSiz3xdrNCzrb7vZwuVvSIrWl0Bkv4="; + hash = "sha256-UQ1G9o4dsVEEo4y2u1TYYurJPfih7QlbilkwPqi39H0="; }; build-system = [ setuptools ]; @@ -30,6 +31,7 @@ buildPythonPackage rec { nativeCheckInputs = [ factory-boy faker + model-bakery numpy pytest-xdist pytestCheckHook diff --git a/pkgs/development/python-modules/pytest-regressions/default.nix b/pkgs/development/python-modules/pytest-regressions/default.nix index 6b52348ea5f4..bc07443a8ccc 100644 --- a/pkgs/development/python-modules/pytest-regressions/default.nix +++ b/pkgs/development/python-modules/pytest-regressions/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pytest-regressions"; - version = "2.8.1"; + version = "2.9.1"; pyproject = true; src = fetchFromGitHub { owner = "ESSS"; repo = "pytest-regressions"; tag = "v${version}"; - hash = "sha256-8FbPWKYHy/0ITrCx9044iYOR7B9g8tgEdV+QfUg4esk="; + hash = "sha256-pqlRfpi5Z9b6zrvU6M1sNRz5ltZLAFiJITFvex7YqcE="; }; build-system = [ setuptools-scm ]; @@ -61,7 +61,15 @@ buildPythonPackage rec { "-Wignore::DeprecationWarning" ]; - disabledTests = lib.optionals (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isBigEndian) [ + disabledTests = [ + # https://github.com/ESSS/pytest-regressions/issues/225 + "test_categorical" + "test_dataframe_with" + "test_different_data_types" + "test_nonrange_index" + "test_string_array" + ] + ++ lib.optionals (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isBigEndian) [ # https://github.com/ESSS/pytest-regressions/issues/156 # i686-linux not listed in the report, but seems to have this issue as well "test_different_data_types" diff --git a/pkgs/development/python-modules/pytest-run-parallel/default.nix b/pkgs/development/python-modules/pytest-run-parallel/default.nix index 4a061f97c686..838212cd38e0 100644 --- a/pkgs/development/python-modules/pytest-run-parallel/default.nix +++ b/pkgs/development/python-modules/pytest-run-parallel/default.nix @@ -15,19 +15,20 @@ # tests pytest-cov-stub, pytest-order, + pytest-xdist, pytestCheckHook, }: buildPythonPackage rec { pname = "pytest-run-parallel"; - version = "0.6.0"; + version = "0.8.2"; pyproject = true; src = fetchFromGitHub { owner = "Quansight-Labs"; repo = "pytest-run-parallel"; tag = "v${version}"; - hash = "sha256-6cfpPJItOmb79KERqpKz/nQlyTrAj4yv+bGM8SXrsXg="; + hash = "sha256-/EoIemQvQFgo9Ic+ZcQJk7fC8S+OHOHaHODrsivarhY="; }; build-system = [ setuptools ]; @@ -43,6 +44,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-cov-stub pytest-order + pytest-xdist pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-subtests/default.nix b/pkgs/development/python-modules/pytest-subtests/default.nix deleted file mode 100644 index eb1dd0ccab46..000000000000 --- a/pkgs/development/python-modules/pytest-subtests/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - - # build-system - setuptools, - setuptools-scm, - - # dependencies - attrs, - - # tests - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "pytest-subtests"; - version = "0.14.2"; - pyproject = true; - - src = fetchPypi { - pname = "pytest_subtests"; - inherit version; - hash = "sha256-cVSoZl/VKO5wp20AIWpE0TncPJyDUhoPd597CtT4AN4="; - }; - - nativeBuildInputs = [ - setuptools - setuptools-scm - ]; - - propagatedBuildInputs = [ attrs ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - pythonImportsCheck = [ "pytest_subtests" ]; - - meta = { - description = "Pytest plugin for unittest subTest() support and subtests fixture"; - homepage = "https://github.com/pytest-dev/pytest-subtests"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/pytest-sugar/default.nix b/pkgs/development/python-modules/pytest-sugar/default.nix index 3c89086a1db4..d5d761cf6418 100644 --- a/pkgs/development/python-modules/pytest-sugar/default.nix +++ b/pkgs/development/python-modules/pytest-sugar/default.nix @@ -17,6 +17,12 @@ buildPythonPackage rec { hash = "sha256-c7i2UWPr8Q+fZx76ue7T1W8g0spovag/pkdAqSwI9l0="; }; + postPatch = '' + # pytest 9 compat + substituteInPlace test_sugar.py \ + --replace-fail "startdir" "start_path" + ''; + build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index 39826f6418c5..70fa48173753 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, setuptools, setuptools-scm, pytestCheckHook, @@ -24,6 +25,19 @@ buildPythonPackage rec { hash = "sha256-2x3znm92wo8DCshf5sYK0stnESg0oVXbxsWRAaTj6oQ="; }; + patches = [ + (fetchpatch { + name = "pytest9-compat-1.patch"; + url = "https://github.com/pytest-dev/pytest-xdist/commit/44f4bea2652e06e7cd5d4a063aa2673b5ef701ee.patch"; + hash = "sha256-BQfcr5f4S+e8xZP2UQwr65hp+iVzmbXYAzO/7iE9lmw="; + }) + (fetchpatch { + name = "pytest9-compat-2.patch"; + url = "https://github.com/pytest-dev/pytest-xdist/commit/0c984478f39d7a01aa24c061f2581bdfd071cb6a.patch"; + hash = "sha256-zxdKy7Z0m5UB4qwmdrolSYeBUTgMe2bQkkeX+M0RRHs="; + }) + ]; + build-system = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index a9e44aba5833..dac23d2351cd 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -26,12 +26,12 @@ buildPythonPackage rec { pname = "pytest"; - version = "8.4.2"; + version = "9.0.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-hsDQuTMGuWHVjWKk20h58n/iVRPUuWnfNRq93bPDDgE="; + hash = "sha256-dRhmUakr2JYR0dn8IPC0NF/YJ8QczVwpmoaKBdcO3xE="; }; outputs = [ diff --git a/pkgs/development/python-modules/python-arango/default.nix b/pkgs/development/python-modules/python-arango/default.nix index 28813f8c35aa..3c2d83ea6e00 100644 --- a/pkgs/development/python-modules/python-arango/default.nix +++ b/pkgs/development/python-modules/python-arango/default.nix @@ -31,14 +31,14 @@ in buildPythonPackage rec { pname = "python-arango"; - version = "8.2.5"; + version = "8.2.6"; pyproject = true; src = fetchFromGitHub { owner = "arangodb"; repo = "python-arango"; tag = version; - hash = "sha256-WzoQ3pwFDbPoXjHPdX03S9MAnNJTwe6MqXhq0g/pAs0="; + hash = "sha256-MEhM561YsbetKu+A2umbp+E2cKUr9iUxOLYd0v0uXKc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-barcode/default.nix b/pkgs/development/python-modules/python-barcode/default.nix index 534391757d0c..45a77360e200 100644 --- a/pkgs/development/python-modules/python-barcode/default.nix +++ b/pkgs/development/python-modules/python-barcode/default.nix @@ -1,24 +1,30 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, setuptools-scm, pillow, pytestCheckHook, pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-barcode"; - version = "0.15.1"; - format = "setuptools"; + version = "0.16.1"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-Oxgl+9sR5ZdGbf9ChrTqmx6GpXcXtZ5WOuZ5cm/IVN4="; + src = fetchFromGitHub { + owner = "WhyNotHugo"; + repo = "python-barcode"; + tag = "v${finalAttrs.version}"; + hash = "sha256-a/w2JxFBm/jqIRnqIB7ZtkdiLnBNjbR0V5SNuau/YxY="; }; - propagatedBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; optional-dependencies = { images = [ pillow ]; @@ -28,7 +34,7 @@ buildPythonPackage rec { pytestCheckHook pytest-cov-stub ] - ++ optional-dependencies.images; + ++ finalAttrs.passthru.optional-dependencies.images; pythonImportsCheck = [ "barcode" ]; @@ -36,8 +42,8 @@ buildPythonPackage rec { description = "Create standard barcodes with Python"; mainProgram = "python-barcode"; homepage = "https://github.com/WhyNotHugo/python-barcode"; - changelog = "https://github.com/WhyNotHugo/python-barcode/blob/v${version}/docs/changelog.rst"; + changelog = "https://github.com/WhyNotHugo/python-barcode/blob/${finalAttrs.src.tag}/docs/changelog.rst"; license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/python-constraint/default.nix b/pkgs/development/python-modules/python-constraint/default.nix index be842e6fd999..3b28590268c1 100644 --- a/pkgs/development/python-modules/python-constraint/default.nix +++ b/pkgs/development/python-modules/python-constraint/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "python-constraint"; - version = "2.4.0"; + version = "2.5.0"; pyproject = true; src = fetchFromGitHub { owner = "python-constraint"; repo = "python-constraint"; tag = version; - sha256 = "sha256-Vi+dD/QmHfUrL0l5yTb7B1ILuXj3HYfT0QINdyfoqFo="; + sha256 = "sha256-VTecK82VSDoUOkPnuC+PnQYPjPBsaPeWCqm2st6Wwvg="; }; build-system = [ diff --git a/pkgs/development/python-modules/python-creole/default.nix b/pkgs/development/python-modules/python-creole/default.nix index 295f798bb1c1..3c5b990e8ec9 100644 --- a/pkgs/development/python-modules/python-creole/default.nix +++ b/pkgs/development/python-modules/python-creole/default.nix @@ -68,6 +68,9 @@ buildPythonPackage rec { # rendering mismatches, likely docutils version mismatch "test_headlines1" "test_simple_table" + # - :5: (ERROR/3) Document or section may not begin with a transition. + # + :5: (WARNING/2) Document or section may not begin with a transition. + "test_non_valid_readme" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix index 6465fb7014ac..9c9f237843c9 100644 --- a/pkgs/development/python-modules/python-dbusmock/default.nix +++ b/pkgs/development/python-modules/python-dbusmock/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, runCommand, # build-system @@ -32,24 +31,16 @@ let in buildPythonPackage rec { pname = "python-dbusmock"; - version = "0.36.0"; + version = "0.37.2"; pyproject = true; src = fetchFromGitHub { owner = "martinpitt"; repo = "python-dbusmock"; tag = version; - hash = "sha256-9YnMOQUuwAcrL0ZaQr7iGly9esZaSRIFThQRNUtSndo="; + hash = "sha256-Q149NcbpbIgXCd7WujALC9I9vAM/tZh+enTJh0d84Kg="; }; - patches = lib.optionals doCheck [ - (fetchpatch { - name = "networkmanager-1.54.2.patch"; - url = "https://github.com/martinpitt/python-dbusmock/commit/1ce6196a687d324a55fbf1f74e0f66a4e83f7a15.patch"; - hash = "sha256-Wo7AhmZu74cTHT9I36+NGGSU9dcFwmcDvtzgseTj/yA="; - }) - ]; - build-system = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/python-docs-theme/default.nix b/pkgs/development/python-modules/python-docs-theme/default.nix index efb296b45dad..aa382404f39d 100644 --- a/pkgs/development/python-modules/python-docs-theme/default.nix +++ b/pkgs/development/python-modules/python-docs-theme/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "python-docs-theme"; - version = "2025.10"; + version = "2025.12"; pyproject = true; disabled = pythonOlder "3.12"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "python"; repo = "python-docs-theme"; tag = version; - hash = "sha256-vuQsGHj39znL3RvSvnc9ET1g30/FcSnDnFby2bm84hY="; + hash = "sha256-isKfYgakIsPdMSATx9tjjb+U8oERN560NkBDkbt9AeM="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index f3dbcc0eeedc..0c350953d300 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "7.0.0"; + version = "7.1.0"; pyproject = true; src = fetchPypi { pname = "python_gitlab"; inherit version; - hash = "sha256-5Nk0Qw9k78CeYgi3gsYcwKM4lSd2XgP/vvF/QyPc5EE="; + hash = "sha256-HDTaPeQK0hZ114gTb3PSCmBklRPmkvUsWpcgQ025fEY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix index 6fa1a76b10cb..f10db5422aea 100644 --- a/pkgs/development/python-modules/python-gnupg/default.nix +++ b/pkgs/development/python-modules/python-gnupg/default.nix @@ -1,31 +1,32 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, gnupg, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-gnupg"; - version = "0.5.5"; - + version = "0.5.6"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-P9yvdvYKG5SP+ON9w5jQPPnOdCcGXVgwgrktp6T/WmM="; + src = fetchFromGitHub { + owner = "vsajip"; + repo = "python-gnupg"; + tag = finalAttrs.version; + hash = "sha256-ztwITune/rO4c3wUCsw6wBN09jnpWpElgwQx7JCXsVw="; }; postPatch = '' substituteInPlace gnupg.py \ - --replace "gpgbinary='gpg'" "gpgbinary='${gnupg}/bin/gpg'" + --replace "gpgbinary='gpg'" "gpgbinary='${lib.getExe gnupg}'" substituteInPlace test_gnupg.py \ - --replace "os.environ.get('GPGBINARY', 'gpg')" "os.environ.get('GPGBINARY', '${gnupg}/bin/gpg')" + --replace "os.environ.get('GPGBINARY', 'gpg')" "os.environ.get('GPGBINARY', '${lib.getExe gnupg}')" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -39,8 +40,8 @@ buildPythonPackage rec { meta = { description = "API for the GNU Privacy Guard (GnuPG)"; homepage = "https://github.com/vsajip/python-gnupg"; - changelog = "https://github.com/vsajip/python-gnupg/releases/tag/${version}"; + changelog = "https://github.com/vsajip/python-gnupg/releases/tag/${finalAttrs.version}"; license = lib.licenses.bsd3; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/python-idzip/default.nix b/pkgs/development/python-modules/python-idzip/default.nix index 829283bdefc4..dea5a63508ae 100644 --- a/pkgs/development/python-modules/python-idzip/default.nix +++ b/pkgs/development/python-modules/python-idzip/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "python-idzip"; - version = "0.3.9"; + version = "0.3.10"; pyproject = true; src = fetchFromGitHub { owner = "bauman"; repo = "python-idzip"; tag = version; - hash = "sha256-ChzwC/Afn0qeo5anq4anIu2eI9i6XDnSvB7jAwY7rSw="; + hash = "sha256-LAai0yRenGhBRdgTKA/T0bBrL0Aq+idFHt0NDMSLHMk="; }; patches = [ @@ -56,7 +56,7 @@ buildPythonPackage rec { description = "Seekable, gzip compatible, compression format"; mainProgram = "idzip"; homepage = "https://github.com/bauman/python-idzip"; - changelog = "https://github.com/bauman/python-idzip/releases/tag/${version}"; + changelog = "https://github.com/bauman/python-idzip/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ vizid ]; }; diff --git a/pkgs/development/python-modules/python-json-logger/default.nix b/pkgs/development/python-modules/python-json-logger/default.nix index 58f1a0679bd2..73ff37cb702a 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.3.0"; + version = "4.0.0"; pyproject = true; src = fetchFromGitHub { owner = "nhairs"; repo = "python-json-logger"; tag = "v${version}"; - hash = "sha256-q1s+WRU5xTmF4YW20DrDnXbMeW6vGYzVekxxIDVt8gw="; + hash = "sha256-YFtM+YWXDCaipqhQntdGeGbTmWO5XMGfpWhgQwicxFQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-keycloak/default.nix b/pkgs/development/python-modules/python-keycloak/default.nix index 456bf0455c7e..0ac6c2b31550 100644 --- a/pkgs/development/python-modules/python-keycloak/default.nix +++ b/pkgs/development/python-modules/python-keycloak/default.nix @@ -1,8 +1,10 @@ { lib, + aiofiles, buildPythonPackage, deprecation, fetchFromGitHub, + httpx, jwcrypto, poetry-core, requests, @@ -11,14 +13,14 @@ buildPythonPackage rec { pname = "python-keycloak"; - version = "4.0.0"; + version = "7.0.2"; pyproject = true; src = fetchFromGitHub { owner = "marcospereirampj"; repo = "python-keycloak"; tag = "v${version}"; - hash = "sha256-ZXS29bND4GsJNhTGiUsLo+4FYd8Tubvg/+PJ33tqovY="; + hash = "sha256-3JHmVfGd5X5aEZt8O7Aj/UfYpLtDsI6MPwWxLo7SGBs="; }; postPatch = '' @@ -30,7 +32,9 @@ buildPythonPackage rec { build-system = [ poetry-core ]; dependencies = [ + aiofiles deprecation + httpx jwcrypto requests requests-toolbelt @@ -44,7 +48,7 @@ buildPythonPackage rec { meta = { description = "Provides access to the Keycloak API"; homepage = "https://github.com/marcospereirampj/python-keycloak"; - changelog = "https://github.com/marcospereirampj/python-keycloak/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/marcospereirampj/python-keycloak/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/python-multipart/default.nix b/pkgs/development/python-modules/python-multipart/default.nix index 639b696624a2..d298510eddab 100644 --- a/pkgs/development/python-modules/python-multipart/default.nix +++ b/pkgs/development/python-modules/python-multipart/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "python-multipart"; - version = "0.0.20"; + version = "0.0.21"; pyproject = true; src = fetchFromGitHub { owner = "Kludex"; repo = "python-multipart"; tag = version; - hash = "sha256-y8wLGRvc7xSmkSyK77Tl5V6mMneS+dtmqBLZOhvmRSY="; + hash = "sha256-fvqXqQwU0JC4Pkvho5WGe/itlxttk1lKL7R5Vt0oKpA="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/python-pkcs11/default.nix b/pkgs/development/python-modules/python-pkcs11/default.nix index 1cf70ac288c1..cad6d6d32ca5 100644 --- a/pkgs/development/python-modules/python-pkcs11/default.nix +++ b/pkgs/development/python-modules/python-pkcs11/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "python-pkcs11"; - version = "0.9.1"; + version = "0.9.3"; pyproject = true; src = fetchFromGitHub { owner = "danni"; repo = "python-pkcs11"; tag = "v${version}"; - sha256 = "sha256-3OfX7PlVyH8X8oJs0DpmZp0xbWzdahVXOvgnKwCDrPo="; + sha256 = "sha256-ursQHwyTUz4kCg66+Rnvo8bI3fzA3k9FsmbnUvpq/aY="; }; build-system = [ diff --git a/pkgs/development/python-modules/python-secp256k1-cardano/default.nix b/pkgs/development/python-modules/python-secp256k1-cardano/default.nix index ce5b0ad023da..4204421e7fc6 100644 --- a/pkgs/development/python-modules/python-secp256k1-cardano/default.nix +++ b/pkgs/development/python-modules/python-secp256k1-cardano/default.nix @@ -2,28 +2,30 @@ lib, fetchFromGitHub, buildPythonPackage, + setuptools, pkg-config, cffi, secp256k1, pytestCheckHook, }: -buildPythonPackage { +buildPythonPackage (finalAttrs: { pname = "python-secp256k1-cardano"; - version = "0.2.3"; - - format = "setuptools"; + version = "0.2.4"; + pyproject = true; src = fetchFromGitHub { owner = "OpShin"; repo = "python-secp256k1"; - rev = "5a8f761a4b9a1594653cc4deebadc3398b07533c"; # No tags in repo - hash = "sha256-6bE4/G2gW2F8h5FWtI3TZ6FtijsB/slvFT/SIVv7VIY="; + tag = finalAttrs.version; + hash = "sha256-vYCg/VpuB0tR8LKT6AjAMXZGQDQkw1GjY5qIvPU1jVE="; }; nativeBuildInputs = [ pkg-config ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ cffi secp256k1 ]; @@ -45,4 +47,4 @@ buildPythonPackage { license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ aciceri ]; }; -} +}) diff --git a/pkgs/development/python-modules/python-socks/default.nix b/pkgs/development/python-modules/python-socks/default.nix index dafade0eb522..8c77598f91cf 100644 --- a/pkgs/development/python-modules/python-socks/default.nix +++ b/pkgs/development/python-modules/python-socks/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "python-socks"; - version = "2.7.3"; + version = "2.8.0"; pyproject = true; __darwinAllowLocalNetworking = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "romis2012"; repo = "python-socks"; tag = "v${version}"; - hash = "sha256-n+RFHFGXy6/H3KwiK2kxY9KTe7PcYDcIoAYhnv7X62A="; + hash = "sha256-b19DfvoJo/9NCjgZ+07WdZGnXNS7/f+FgGdU8s1k2io="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-tado/default.nix b/pkgs/development/python-modules/python-tado/default.nix index 90cba957bc02..890dc22bd703 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 (finalAttrs: { pname = "python-tado"; - version = "0.18.16"; + version = "0.19.2"; pyproject = true; src = fetchFromGitHub { owner = "wmalgadey"; repo = "PyTado"; tag = finalAttrs.version; - hash = "sha256-jHPTu0/DYJXbSqiJXQzmiK6gmtJf88Y0BV1wj/X+qpc="; + 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/python-tds/default.nix b/pkgs/development/python-modules/python-tds/default.nix index 1577e1b5c259..1b6fa7f8d92d 100644 --- a/pkgs/development/python-modules/python-tds/default.nix +++ b/pkgs/development/python-modules/python-tds/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "python-tds"; - version = "1.13.0"; + version = "1.17.1"; pyproject = true; src = fetchFromGitHub { owner = "denisenkom"; repo = "pytds"; - rev = version; - hash = "sha256-ubAXCifSfNtxbFIJZD8IuK/8oPT9vo77YBCexoO9zsw="; + tag = version; + hash = "sha256-W9Sk2X2bSMjtRu1XPnjWXOLjVVa+MYC7+ttrZc48c4I="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-ulid/default.nix b/pkgs/development/python-modules/python-ulid/default.nix index 43d7161a9798..45a1db278c3c 100644 --- a/pkgs/development/python-modules/python-ulid/default.nix +++ b/pkgs/development/python-modules/python-ulid/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "python-ulid"; - version = "3.0.0"; + version = "3.1.0"; pyproject = true; src = fetchFromGitHub { owner = "mdomke"; repo = "python-ulid"; tag = version; - hash = "sha256-ZMz1LqGJDgaMq4BNU33OPOQfoXFFuwFGcplnqtXSOHA="; + hash = "sha256-13yGd6vYnwzTi+KGJgoQ/z6Cy67FKVC4popaj2uPOlQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/python-xz/default.nix b/pkgs/development/python-modules/python-xz/default.nix index b2f9fa7c66cc..810b1ecbf62e 100644 --- a/pkgs/development/python-modules/python-xz/default.nix +++ b/pkgs/development/python-modules/python-xz/default.nix @@ -2,23 +2,32 @@ lib, buildPythonPackage, fetchPypi, - setuptools-scm, + hatchling, + hatch-vcs, + pytestCheckHook, + pytest-cov-stub, }: buildPythonPackage rec { pname = "python-xz"; - version = "0.5.0"; + version = "0.6.0"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-oYjwQ26BFFXxvaYdzp2+bw/BQwM0v/n1r9DmaLs1R3Q="; + inherit version; + pname = "python_xz"; + hash = "sha256-yNxRBweZ7p533dndIHoRzJFw6SmFQvgecYcHLg1UNHg="; }; - build-system = [ setuptools-scm ]; + build-system = [ + hatchling + hatch-vcs + ]; - # Module has no tests - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; pythonImportsCheck = [ "xz" ]; diff --git a/pkgs/development/python-modules/python-yate/default.nix b/pkgs/development/python-modules/python-yate/default.nix index c7d73bb9eeb8..2244ebfb0e3d 100644 --- a/pkgs/development/python-modules/python-yate/default.nix +++ b/pkgs/development/python-modules/python-yate/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "python-yate"; - version = "0.4.1"; + version = "0.5.0"; format = "setuptools"; src = fetchFromGitHub { owner = "eventphone"; repo = "python-yate"; tag = "v${version}"; - hash = "sha256-AdnlNsEOFuzuGTBmfV9zKyv2iFHEJ4eLMrC6SHHf7m0="; + hash = "sha256-/tlDme4RmO9XH5PNTvK2yVzbF+iDNeCY21nArq6NU+g="; }; propagatedBuildInputs = [ @@ -32,7 +32,7 @@ buildPythonPackage rec { description = "Python library for the yate telephony engine"; mainProgram = "yate_callgen"; homepage = "https://github.com/eventphone/python-yate"; - changelog = "https://github.com/eventphone/python-yate/releases/tag/v${version}"; + changelog = "https://github.com/eventphone/python-yate/releases/tag/${src.tag}"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ clerie ]; }; diff --git a/pkgs/development/python-modules/pythran/default.nix b/pkgs/development/python-modules/pythran/default.nix index a20b4ecf5373..b8c65d3151f1 100644 --- a/pkgs/development/python-modules/pythran/default.nix +++ b/pkgs/development/python-modules/pythran/default.nix @@ -24,14 +24,14 @@ let in buildPythonPackage rec { pname = "pythran"; - version = "0.18.0"; + version = "0.18.1"; pyproject = true; src = fetchFromGitHub { owner = "serge-sans-paille"; repo = "pythran"; tag = version; - hash = "sha256-GZSVcB4JIx02eiUb9d7o5cUAyICIoH6m0mz4TL7a9PY="; + hash = "sha256-H13FGApWCgBLWOtoZ5yEIV4Z+KAOK3Xs4KFM4oLmKmk="; }; patches = [ @@ -59,6 +59,11 @@ buildPythonPackage rec { setuptools ]; + pythonRelaxDeps = [ + "gast" + "beniget" + ]; + pythonImportsCheck = [ "pythran" "pythran.backend" @@ -72,7 +77,7 @@ buildPythonPackage rec { doCheck = false; meta = { - changelog = "https://github.com/serge-sans-paille/pythran/blob/${src.rev}/Changelog"; + changelog = "https://github.com/serge-sans-paille/pythran/blob/${src.tag}/Changelog"; description = "Ahead of Time compiler for numeric kernels"; homepage = "https://github.com/serge-sans-paille/pythran"; license = lib.licenses.bsd3; diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index 1abb5f08653c..592b266b3ecd 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "pytools"; - version = "2025.2.4"; + version = "2025.2.5"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-nLgr50dW0ZIcArrTx2fr3kZ50tFDqFpMNY0y9lRuVG8="; + hash = "sha256-p/U1BkTUbZjunH5ntLQWkzCKoPXpsYjY8GlLJ9yU46I="; }; build-system = [ hatchling ]; @@ -38,7 +38,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "pytools" - "pytools.batchjob" "pytools.lex" ]; diff --git a/pkgs/development/python-modules/pytorch3d/default.nix b/pkgs/development/python-modules/pytorch3d/default.nix index c0894da45073..98896630ae81 100644 --- a/pkgs/development/python-modules/pytorch3d/default.nix +++ b/pkgs/development/python-modules/pytorch3d/default.nix @@ -15,14 +15,14 @@ assert cudaSupport -> torch.cudaSupport; buildPythonPackage rec { pname = "pytorch3d"; - version = "0.7.8"; + version = "0.7.9"; pyproject = true; src = fetchFromGitHub { owner = "facebookresearch"; repo = "pytorch3d"; - rev = "V${version}"; - hash = "sha256-DEEWWfjwjuXGc0WQInDTmtnWSIDUifyByxdg7hpdHlo="; + tag = "v${version}"; + hash = "sha256-k+hqAy0T5ZReJ8jWuKJ/VTzjqd4qo8rrcFo8y4LJhhY="; }; nativeBuildInputs = lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ]; diff --git a/pkgs/development/python-modules/pytubefix/default.nix b/pkgs/development/python-modules/pytubefix/default.nix index f93143056c71..6e524411e0f8 100644 --- a/pkgs/development/python-modules/pytubefix/default.nix +++ b/pkgs/development/python-modules/pytubefix/default.nix @@ -3,22 +3,30 @@ aiohttp, buildPythonPackage, fetchFromGitHub, + replaceVars, + nodejs, setuptools, pytestCheckHook, }: buildPythonPackage rec { pname = "pytubefix"; - version = "9.5.1"; + version = "10.3.6"; pyproject = true; src = fetchFromGitHub { owner = "JuanBindez"; repo = "pytubefix"; tag = "v${version}"; - hash = "sha256-r8bzgDQK3csx3Myh90lVnv4Zs3cJq6B+PmpVAUCMRLs="; + hash = "sha256-GSXz89BztDOcAmAMPi3SIIDnUbvYJjnHf4DcWf1hqjY="; }; + patches = [ + (replaceVars ./replace-nodejs-wheel-binaries.patch { + inherit nodejs; + }) + ]; + build-system = [ setuptools ]; dependencies = [ aiohttp ]; @@ -37,6 +45,8 @@ buildPythonPackage rec { ]; disabledTests = [ + "test_get_initial_function_name_with_no_match_should_error" + "test_get_throttling_function_name" "test_playlist_failed_pagination" "test_playlist_pagination" "test_create_mock_html_json" diff --git a/pkgs/development/python-modules/pytubefix/replace-nodejs-wheel-binaries.patch b/pkgs/development/python-modules/pytubefix/replace-nodejs-wheel-binaries.patch new file mode 100644 index 000000000000..95be07567927 --- /dev/null +++ b/pkgs/development/python-modules/pytubefix/replace-nodejs-wheel-binaries.patch @@ -0,0 +1,54 @@ +diff --git a/pyproject.toml b/pyproject.toml +index 3762b62..dfee082 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -33,7 +33,7 @@ classifiers = [ + "Topic :: Terminals", + "Topic :: Utilities", + ] +-dependencies = ["aiohttp >=3.12.13", "nodejs-wheel-binaries >= 22.20.0"] ++dependencies = ["aiohttp >=3.12.13"] + + [project.urls] + "Homepage" = "https://github.com/juanbindez/pytubefix" +diff --git a/pytubefix/botGuard/bot_guard.py b/pytubefix/botGuard/bot_guard.py +index d7bde7e..ca10816 100644 +--- a/pytubefix/botGuard/bot_guard.py ++++ b/pytubefix/botGuard/bot_guard.py +@@ -1,11 +1,10 @@ + import os + import subprocess + import sys +-import nodejs_wheel.executable + + PLATFORM = sys.platform + +-NODE_DIR = nodejs_wheel.executable.ROOT_DIR ++NODE_DIR = "@nodejs@" + + def _node_path() -> str: + suffix = ".exe" if os.name == "nt" else "" +diff --git a/pytubefix/sig_nsig/node_runner.py b/pytubefix/sig_nsig/node_runner.py +index 9ac068a..a7a2c72 100644 +--- a/pytubefix/sig_nsig/node_runner.py ++++ b/pytubefix/sig_nsig/node_runner.py +@@ -1,11 +1,10 @@ + import os + import json + import subprocess +-import nodejs_wheel.executable + + + RUNNER_PATH = os.path.join(os.path.dirname(__file__), "vm", "runner.js") +-NODE_DIR = nodejs_wheel.executable.ROOT_DIR ++NODE_DIR = "@nodejs@" + + class NodeRunner: + def __init__(self, code: str): +@@ -44,4 +43,4 @@ class NodeRunner: + def close(self): + self.proc.stdin.close() + self.proc.terminate() +- self.proc.wait() +\ No newline at end of file ++ self.proc.wait() diff --git a/pkgs/development/python-modules/pyudev/default.nix b/pkgs/development/python-modules/pyudev/default.nix index c7d1d1f3b5a2..267d8040c762 100644 --- a/pkgs/development/python-modules/pyudev/default.nix +++ b/pkgs/development/python-modules/pyudev/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "pyudev"; - version = "0.24.3"; + version = "0.24.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-LpRUJ6IWdIk7uXYyQB22ITnZHOoe6WE3zHsHrSIZj8c="; + hash = "sha256-54i7mDcAsahO/C6IhisKUa8qmV1bhryZl1RlBc97Nrw="; }; postPatch = lib.optionalString stdenvNoCC.hostPlatform.isLinux '' diff --git a/pkgs/development/python-modules/pyvisa/default.nix b/pkgs/development/python-modules/pyvisa/default.nix index bf0961889b01..80adedb63ed1 100644 --- a/pkgs/development/python-modules/pyvisa/default.nix +++ b/pkgs/development/python-modules/pyvisa/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyvisa"; - version = "1.15.0"; + version = "1.16.1"; pyproject = true; src = fetchFromGitHub { owner = "pyvisa"; repo = "pyvisa"; tag = version; - hash = "sha256-cjKOyBn5O7ThZI7pi6JXeLhe47xGbhQaSRcAqXb3lV8="; + hash = "sha256-PHIhCiIfgLlvK490ue5DgLtkYYPMj+eC3ArYZbUANrc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pywal/convert.patch b/pkgs/development/python-modules/pywal/convert.patch deleted file mode 100644 index 999bc1abeaf1..000000000000 --- a/pkgs/development/python-modules/pywal/convert.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/pywal/backends/wal.py b/pywal/backends/wal.py -index a75fdc5..4339680 100644 ---- a/pywal/backends/wal.py -+++ b/pywal/backends/wal.py -@@ -21,15 +21,7 @@ def imagemagick(color_count, img, magick_command): - - def has_im(): - """Check to see if the user has im installed.""" -- if shutil.which("magick"): -- return ["magick", "convert"] -- -- if shutil.which("convert"): -- return ["convert"] -- -- logging.error("Imagemagick wasn't found on your system.") -- logging.error("Try another backend. (wal --backend)") -- sys.exit(1) -+ return ["@convert@"] - - - def gen_colors(img): diff --git a/pkgs/development/python-modules/pywal/default.nix b/pkgs/development/python-modules/pywal/default.nix deleted file mode 100644 index 7f683b3733cf..000000000000 --- a/pkgs/development/python-modules/pywal/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - imagemagick, - feh, - isPy3k, -}: - -buildPythonPackage rec { - pname = "pywal"; - version = "3.3.0"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "1drha9kshidw908k7h3gd9ws2bl64ms7bjcsa83pwb3hqa9bkspg"; - }; - - patches = [ - ./convert.patch - ./feh.patch - ]; - - postPatch = '' - substituteInPlace pywal/backends/wal.py --subst-var-by convert "${imagemagick}/bin/convert" - substituteInPlace pywal/wallpaper.py --subst-var-by feh "${feh}/bin/feh" - ''; - - # Invalid syntax - disabled = !isPy3k; - - preCheck = '' - mkdir tmp - HOME=$PWD/tmp - - for f in tests/test_export.py tests/test_util.py ; do - substituteInPlace "$f" \ - --replace '/tmp/' "$TMPDIR/" - done - ''; - - meta = { - description = "Generate and change colorschemes on the fly. A 'wal' rewrite in Python 3"; - mainProgram = "wal"; - homepage = "https://github.com/dylanaraps/pywal"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ Fresheyeball ]; - }; -} diff --git a/pkgs/development/python-modules/pywal/feh.patch b/pkgs/development/python-modules/pywal/feh.patch deleted file mode 100644 index 985e601d6257..000000000000 --- a/pkgs/development/python-modules/pywal/feh.patch +++ /dev/null @@ -1,39 +0,0 @@ -commit c31faa212e09aa62c232d9008e05976b1cdc9ee5 -Author: Frederik Rietdijk -Date: Wed Dec 26 12:54:32 2018 +0100 - - nix: hardcode feh - -diff --git a/pywal/wallpaper.py b/pywal/wallpaper.py -index ba61e66..fad34f7 100644 ---- a/pywal/wallpaper.py -+++ b/pywal/wallpaper.py -@@ -47,27 +47,7 @@ def xfconf(path, img): - - def set_wm_wallpaper(img): - """Set the wallpaper for non desktop environments.""" -- if shutil.which("feh"): -- util.disown(["feh", "--bg-fill", img]) -- -- elif shutil.which("nitrogen"): -- util.disown(["nitrogen", "--set-zoom-fill", img]) -- -- elif shutil.which("bgs"): -- util.disown(["bgs", "-z", img]) -- -- elif shutil.which("hsetroot"): -- util.disown(["hsetroot", "-fill", img]) -- -- elif shutil.which("habak"): -- util.disown(["habak", "-mS", img]) -- -- elif shutil.which("display"): -- util.disown(["display", "-backdrop", "-window", "root", img]) -- -- else: -- logging.error("No wallpaper setter found.") -- return -+ return util.disown(["@feh@", "--bg-fill", img]) - - - def set_desktop_wallpaper(desktop, img): diff --git a/pkgs/development/python-modules/pywal16/default.nix b/pkgs/development/python-modules/pywal16/default.nix new file mode 100644 index 000000000000..0f3021f994c7 --- /dev/null +++ b/pkgs/development/python-modules/pywal16/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + imagemagick, + feh, + pytestCheckHook, + writableTmpDirAsHomeHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "pywal16"; + version = "3.8.13"; + pyproject = true; + + src = fetchFromGitHub { + owner = "eylles"; + repo = "pywal16"; + tag = finalAttrs.version; + hash = "sha256-BKLvEmasMTcuH5olgZHzFN3DZT4lXD1FNBU8l8QGQAM="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ + feh + imagemagick + pytestCheckHook + writableTmpDirAsHomeHook + ]; + + meta = { + description = "Generate and change colorschemes on the fly. A 'wal' rewrite in Python 3"; + mainProgram = "wal"; + homepage = "https://github.com/eylles/pywal16"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Fresheyeball ]; + }; +}) diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix index d5ca03329117..8c676f9a165f 100644 --- a/pkgs/development/python-modules/pywbem/default.nix +++ b/pkgs/development/python-modules/pywbem/default.nix @@ -26,12 +26,12 @@ buildPythonPackage rec { pname = "pywbem"; - version = "1.8.1"; + version = "1.9.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-P+/sNPckpVHkLKOJ0ILQKf7QO0/xSsyO9cfLkv3aE1s="; + hash = "sha256-ZcH/lyzqLwF7BnlfR8CtdEL4Q0/2Q6VEBQwQcmcE9qs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pywebpush/default.nix b/pkgs/development/python-modules/pywebpush/default.nix index ce4b9afe3b32..69efe0b30b6d 100644 --- a/pkgs/development/python-modules/pywebpush/default.nix +++ b/pkgs/development/python-modules/pywebpush/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "pywebpush"; - version = "2.0.3"; + version = "2.2.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-WEh448JD6HOiLbiJVQXZVxW8eW73TMG4/pn1lhdBYeM="; + hash = "sha256-1MDuSYHnrAjPFHKf7ItsOu7FjVTm2jiGNcVwb8wts/Y="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyx/default.nix b/pkgs/development/python-modules/pyx/default.nix index 87e078f0ceb7..ec965674a16d 100644 --- a/pkgs/development/python-modules/pyx/default.nix +++ b/pkgs/development/python-modules/pyx/default.nix @@ -7,14 +7,13 @@ buildPythonPackage rec { pname = "pyx"; - version = "0.16"; + version = "0.17"; format = "setuptools"; disabled = !isPy3k; src = fetchPypi { - pname = "PyX"; - inherit version; - hash = "sha256-TY4+RxzT6am9E9UIbN98CvGww/PhledPX2MxjcQKZtg="; + inherit pname version; + hash = "sha256-O8iqgJExVZ96XA4fESm0LHGt423wMyET9cV3k4SjmvE="; }; # No tests in archive diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index 7a8e7b3b97cb..ac3efb94d953 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "pyzmq"; - version = "27.0.1"; + version = "27.1.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-RcVJIEvCDnSE/9JVX2zwLlckQOzy873WDUQEsg/d9ks="; + hash = "sha256-rAdl49REVa223b9EF9zORg/ECgWXjAjv3ylIBy9ttUA="; }; build-system = [ diff --git a/pkgs/development/python-modules/pyzstd/default.nix b/pkgs/development/python-modules/pyzstd/default.nix index 6f5393fa7a7b..2e358544d59e 100644 --- a/pkgs/development/python-modules/pyzstd/default.nix +++ b/pkgs/development/python-modules/pyzstd/default.nix @@ -1,45 +1,42 @@ { + backports-zstd, buildPythonPackage, fetchFromGitHub, lib, + hatchling, + hatch-vcs, pytestCheckHook, pythonOlder, - setuptools, typing-extensions, zstd-c, }: buildPythonPackage rec { pname = "pyzstd"; - version = "0.18.0"; + version = "0.19.1"; pyproject = true; src = fetchFromGitHub { owner = "Rogdham"; repo = "pyzstd"; tag = version; - hash = "sha256-15+GqJ/AMYs1R9ywo+muNVVbPkkzTMj//Zn/PPI+MCI="; + hash = "sha256-1oUqnZCBJYu8haFIQ+T2KaSQaa1xnZyJHLzOQg4Fdw8="; }; postPatch = '' - # pyzst specifies setuptools<74 because 74+ drops `distutils.msvc9compiler`, - # required for Python 3.9 under Windows - substituteInPlace pyproject.toml \ - --replace-fail '"setuptools>=64,<74"' '"setuptools"' - # pyzst needs a copy of upstream zstd's license ln -s ${zstd-c.src}/LICENSE zstd ''; - nativeBuildInputs = [ - setuptools - ]; - build-system = [ - setuptools + hatchling + hatch-vcs ]; - dependencies = lib.optionals (pythonOlder "3.13") [ + dependencies = [ + backports-zstd + ] + ++ lib.optionals (pythonOlder "3.13") [ typing-extensions ]; @@ -66,7 +63,7 @@ buildPythonPackage rec { meta = { description = "Python bindings to Zstandard (zstd) compression library"; homepage = "https://pyzstd.readthedocs.io"; - changelog = "https://github.com/Rogdham/pyzstd/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/Rogdham/pyzstd/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ MattSturgeon diff --git a/pkgs/development/python-modules/qasync/default.nix b/pkgs/development/python-modules/qasync/default.nix index 59ab02f7cffa..5ef1ad8242de 100644 --- a/pkgs/development/python-modules/qasync/default.nix +++ b/pkgs/development/python-modules/qasync/default.nix @@ -4,12 +4,12 @@ fetchFromGitHub, pyqt5, pytestCheckHook, - poetry-core, + uv-build, }: buildPythonPackage rec { pname = "qasync"; - version = "0.27.1"; + version = "0.28.0"; pyproject = true; @@ -17,22 +17,27 @@ buildPythonPackage rec { owner = "CabbageDevelopment"; repo = "qasync"; tag = "v${version}"; - hash = "sha256-oXzwilhJ1PhodQpOZjnV9gFuoDy/zXWva9LhhK3T00g="; + hash = "sha256-eQJ1Yszl95IycggSyWcD3opAO1rfBdNp14y8eHDMJY4="; }; postPatch = '' - rm qasync/_windows.py # Ignoring it is not taking effect and it will not be used on Linux + substituteInPlace pyproject.toml \ + --replace-fail "uv_build>=0.8.3,<0.9.0" uv_build ''; - buildInputs = [ poetry-core ]; + build-system = [ uv-build ]; - propagatedBuildInputs = [ pyqt5 ]; + dependencies = [ pyqt5 ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "qasync" ]; - disabledTestPaths = [ "tests/test_qeventloop.py" ]; + # crashes the interpreter + disabledTestPaths = [ + "tests/test_qeventloop.py" + "tests/test_run.py" + ]; meta = { description = "Allows coroutines to be used in PyQt/PySide applications by providing an implementation of the PEP 3156 event-loop"; diff --git a/pkgs/development/python-modules/qiskit-machine-learning/default.nix b/pkgs/development/python-modules/qiskit-machine-learning/default.nix index 8343055cf1e7..3db09bded56b 100644 --- a/pkgs/development/python-modules/qiskit-machine-learning/default.nix +++ b/pkgs/development/python-modules/qiskit-machine-learning/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "qiskit-machine-learning"; - version = "0.8.3"; + version = "0.9.0"; pyproject = true; src = fetchFromGitHub { owner = "qiskit"; repo = pname; tag = version; - hash = "sha256-XnLCejK6m8p/OC5gKCoP1UXVblISChu3lKF8BnrnRbk="; + hash = "sha256-l7lzdGSarj1DiC0igeyr6kP+GYYE+eGKdW9+IN+2uh8="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/qiskit-optimization/default.nix b/pkgs/development/python-modules/qiskit-optimization/default.nix index 2b63c5c56236..ab1c66a47774 100644 --- a/pkgs/development/python-modules/qiskit-optimization/default.nix +++ b/pkgs/development/python-modules/qiskit-optimization/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "qiskit-optimization"; - version = "0.6.1"; + version = "0.7.0"; pyproject = true; src = fetchFromGitHub { owner = "qiskit"; repo = pname; tag = version; - hash = "sha256-kzEuICajlV8mgD0YLhwFJaDQVxYZo9jv3sr/r/P0VG0="; + hash = "sha256-aonL08avVZlpGQ/FCZnrsPMvu1lbhRiadzKf/oPndZk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/quart-schema/default.nix b/pkgs/development/python-modules/quart-schema/default.nix index cdd5bf8c2662..f81fedf03ecc 100644 --- a/pkgs/development/python-modules/quart-schema/default.nix +++ b/pkgs/development/python-modules/quart-schema/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "quart-schema"; - version = "0.22.0"; + version = "0.23.0"; pyproject = true; src = fetchFromGitHub { owner = "pgjones"; repo = "quart-schema"; tag = finalAttrs.version; - hash = "sha256-saKV8iasc9ZynmUQI4bAYS9h8nGXgXR0Vm5oIDHedB4="; + hash = "sha256-xrCQNGxX9CC1fOy3CT40Sdvsd94KgE1k8B5UgIWZ8kY="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/quaternion/default.nix b/pkgs/development/python-modules/quaternion/default.nix index 10ec92522049..bcd0b0698239 100644 --- a/pkgs/development/python-modules/quaternion/default.nix +++ b/pkgs/development/python-modules/quaternion/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "quaternion"; - version = "2024.0.12"; + version = "2024.0.13"; pyproject = true; src = fetchFromGitHub { owner = "moble"; repo = "quaternion"; tag = "v${version}"; - hash = "sha256-HZDzzXf9lsvxa5yLayYvk3lgutEw0gEH8m0jkzwMAF8="; + hash = "sha256-W35R+S6yzcKTpKtemjiLzH9v5owduUtos9DyoY28qbc="; }; build-system = [ diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix index f05728d01d1b..4014c1310060 100644 --- a/pkgs/development/python-modules/qutip/default.nix +++ b/pkgs/development/python-modules/qutip/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "qutip"; - version = "5.2.1"; + version = "5.2.2"; pyproject = true; src = fetchFromGitHub { owner = "qutip"; repo = "qutip"; tag = "v${version}"; - hash = "sha256-iM+RptMvLFF51v7OJPESYFB4WaYF5HxnfpqjYWAjAKU="; + hash = "sha256-Av6OVw3dwZUA13W+5kJ2EwGzIMhNn9lZwEsk5EKTbyk="; }; postPatch = diff --git a/pkgs/development/python-modules/rapidgzip/default.nix b/pkgs/development/python-modules/rapidgzip/default.nix index ac8e104ce9af..26bf7b15bb14 100644 --- a/pkgs/development/python-modules/rapidgzip/default.nix +++ b/pkgs/development/python-modules/rapidgzip/default.nix @@ -9,24 +9,23 @@ buildPythonPackage rec { pname = "rapidgzip"; - version = "0.14.5"; + version = "0.16.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-+u1GAToaYqUZPElhWolmg+pcFO1HRLy0vRhpsUIFUdg="; + hash = "sha256-ixJPKbwS3kJJq4HoPlrTXmd0KhqP9Ky2G3TA2f2hwU4="; }; - prePatch = '' - # pythonRelaxDeps doesn't work here + postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools >= 61.2, < 72" "setuptools" \ - --replace-fail "cython >= 3, < 3.1" cython + --replace-fail "setuptools >= 61.2, < 72" setuptools ''; - nativeBuildInputs = [ + nativeBuildInputs = [ nasm ]; + + build-system = [ cython - nasm setuptools ]; diff --git a/pkgs/development/python-modules/rapidocr/default.nix b/pkgs/development/python-modules/rapidocr/default.nix index e70f956e6809..ae351083b6c8 100644 --- a/pkgs/development/python-modules/rapidocr/default.nix +++ b/pkgs/development/python-modules/rapidocr/default.nix @@ -23,13 +23,13 @@ requests, }: let - version = "3.4.1"; + version = "3.5.0"; src = fetchFromGitHub { owner = "RapidAI"; repo = "RapidOCR"; tag = "v${version}"; - hash = "sha256-Q8QtjI+5QDv6zQ96aXLyEepHfMh75DR+ZWj/ygVx3o0="; + hash = "sha256-GX3dZSuK6YjARZXX4LPbCJW37ZItZvw/Ow6G4CoKoP4="; }; models = diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 30161b345ed1..98f7fe5f1918 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -38,19 +38,19 @@ buildPythonPackage rec { pname = "rasterio"; - version = "1.4.4"; + version = "1.5.0"; pyproject = true; src = fetchFromGitHub { owner = "rasterio"; repo = "rasterio"; tag = version; - hash = "sha256-6y55JJ3R/JEEneM10UPHIDpSopaybY5XHJPiU+77ke4="; + hash = "sha256-Jg9GNw93uA+Lg7/kiQb+tfXXuoggQI0Nkz7cwRqq8FQ="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "cython~=3.1.0" cython + --replace-fail "cython>=3.1,<=3.2" cython ''; build-system = [ @@ -134,7 +134,7 @@ buildPythonPackage rec { description = "Python package to read and write geospatial raster data"; mainProgram = "rio"; homepage = "https://rasterio.readthedocs.io/"; - changelog = "https://github.com/rasterio/rasterio/blob/${version}/CHANGES.txt"; + changelog = "https://github.com/rasterio/rasterio/blob/${src.tag}/CHANGES.txt"; license = lib.licenses.bsd3; teams = [ lib.teams.geospatial ]; }; diff --git a/pkgs/development/python-modules/readchar/default.nix b/pkgs/development/python-modules/readchar/default.nix index 1e21838fdc2d..1fb0049f76e9 100644 --- a/pkgs/development/python-modules/readchar/default.nix +++ b/pkgs/development/python-modules/readchar/default.nix @@ -25,6 +25,9 @@ buildPythonPackage rec { hash = "sha256-r+dKGv0a7AU+Ef94AGCCJLQolLqTTxaNmqRQYkxk15s="; }; + # https://github.com/magmax/python-readchar/pull/129 + patches = [ ./pytest9-compat.patch ]; + postPatch = '' # Tags on GitHub still have a postfix (-dev0) sed -i 's/\(version = "\)[^"]*\(".*\)/\1${version}\2/' pyproject.toml diff --git a/pkgs/development/python-modules/readchar/pytest9-compat.patch b/pkgs/development/python-modules/readchar/pytest9-compat.patch new file mode 100644 index 000000000000..4641eb82f604 --- /dev/null +++ b/pkgs/development/python-modules/readchar/pytest9-compat.patch @@ -0,0 +1,39 @@ +From 5165992002f211fe85175bcbb4f9a60d5e90fdac Mon Sep 17 00:00:00 2001 +From: Martin Weinelt +Date: Sun, 25 Jan 2026 02:05:23 +0100 +Subject: [PATCH] Fix pytest 9 compatibility + +The path argument has been deprecated in favor of the collection_path +argument beecause the former uses the deprecated py library, where the +latter uses pathlib. +--- + tests/linux/conftest.py | 2 +- + tests/windows/conftest.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/linux/conftest.py b/tests/linux/conftest.py +index 038203f..3283724 100644 +--- a/tests/linux/conftest.py ++++ b/tests/linux/conftest.py +@@ -8,7 +8,7 @@ + + + # ignore all tests in this folder if not on linux +-def pytest_ignore_collect(path, config): ++def pytest_ignore_collect(collection_path, config): + if not sys.platform.startswith("linux"): + return True + +diff --git a/tests/windows/conftest.py b/tests/windows/conftest.py +index 492d7d7..e0264e8 100644 +--- a/tests/windows/conftest.py ++++ b/tests/windows/conftest.py +@@ -4,7 +4,7 @@ + + + # ignore all tests in this folder if not on windows +-def pytest_ignore_collect(path, config): ++def pytest_ignore_collect(collection_path, config): + if sys.platform not in ("win32", "cygwin"): + return True + diff --git a/pkgs/development/python-modules/readme-renderer/default.nix b/pkgs/development/python-modules/readme-renderer/default.nix index 4aa98f49e278..0132864c422c 100644 --- a/pkgs/development/python-modules/readme-renderer/default.nix +++ b/pkgs/development/python-modules/readme-renderer/default.nix @@ -29,6 +29,11 @@ buildPythonPackage rec { url = "https://github.com/pypa/readme_renderer/commit/04d5cfe76850192364eff344be7fe27730af8484.patch"; hash = "sha256-QBU3zL3DB8gYYwtKrIC8+H8798pU9Sz3T9e/Q/dXksw="; }) + (fetchpatch2 { + name = "docutils-0.22-compat.patch"; + url = "https://github.com/pypa/readme_renderer/commit/d047a29755a204afca8873a6ecf30e686ccf6a27.patch"; + hash = "sha256-GHTfRuOZr5c4mwu4s8K5IpvG1ZP1o/qd0U4H09BzhE8="; + }) ]; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix deleted file mode 100644 index c373c4b69d8f..000000000000 --- a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - setuptools, - requests, - pytestCheckHook, - mock, - sphinx, -}: - -buildPythonPackage rec { - pname = "readthedocs-sphinx-ext"; - version = "2.2.5"; - pyproject = true; - - src = fetchPypi { - inherit pname version; - hash = "sha256-7l/VuZ258MGAsjlsvOUoqjZnGVG5UmuwJy2/zlUXvSc="; - }; - - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ requests ]; - - nativeCheckInputs = [ - pytestCheckHook - mock - sphinx - ]; - - meta = { - description = "Sphinx extension for Read the Docs overrides"; - homepage = "https://github.com/rtfd/readthedocs-sphinx-ext"; - license = lib.licenses.mit; - }; -} diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix index 102f467bc864..e6d6d8d62ac6 100644 --- a/pkgs/development/python-modules/redis/default.nix +++ b/pkgs/development/python-modules/redis/default.nix @@ -1,20 +1,24 @@ { lib, - fetchPypi, + fetchFromGitHub, buildPythonPackage, + pythonOlder, # build-system hatchling, # dependencies async-timeout, - deprecated, - packaging, - typing-extensions, + + # extras: circuit_breaker + pybreaker, # extras: hiredis hiredis, + # extras: jwt + pyjwt, + # extras: ocsp cryptography, pyopenssl, @@ -23,25 +27,26 @@ buildPythonPackage rec { pname = "redis"; - version = "6.2.0"; + version = "7.1.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-6CHxKbdd3my5ndNeXHboxJUSpaDY39xWCy+9RLhcqXc="; + src = fetchFromGitHub { + owner = "redis"; + repo = "redis-py"; + tag = "v${version}"; + hash = "sha256-EhhE2l0UdkGWhCwKAF7fuSxq4ooj75Cxwg2zXjJJRzA="; }; build-system = [ hatchling ]; - dependencies = [ + dependencies = lib.optionals (pythonOlder "3.11") [ async-timeout - deprecated - packaging - typing-extensions ]; optional-dependencies = { + circuit_breaker = [ pybreaker ]; hiredis = [ hiredis ]; + jwt = [ pyjwt ]; ocsp = [ cryptography pyopenssl @@ -65,7 +70,8 @@ buildPythonPackage rec { meta = { description = "Python client for Redis key-value store"; homepage = "https://github.com/redis/redis-py"; - changelog = "https://github.com/redis/redis-py/releases/tag/v${version}"; - license = with lib.licenses; [ mit ]; + changelog = "https://github.com/redis/redis-py/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.dotlambda ]; }; } diff --git a/pkgs/development/python-modules/referencing/default.nix b/pkgs/development/python-modules/referencing/default.nix index 8126df5d8017..c1122921b9d2 100644 --- a/pkgs/development/python-modules/referencing/default.nix +++ b/pkgs/development/python-modules/referencing/default.nix @@ -6,7 +6,6 @@ hatch-vcs, hatchling, jsonschema, - pytest-subtests, pytestCheckHook, rpds-py, typing-extensions, @@ -15,7 +14,7 @@ let self = buildPythonPackage rec { pname = "referencing"; - version = "0.36.2"; + version = "0.37.0"; pyproject = true; src = fetchFromGitHub { @@ -23,7 +22,7 @@ let repo = "referencing"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-VwViFiquacwJlELNDp01DRbtYQHOY4qXS2CjD7YmS6g="; + hash = "sha256-4e06rzvIOyWAgkpzAisc4uUK8pWshDZiQ6qpvJCq3GY="; }; build-system = [ @@ -39,7 +38,6 @@ let nativeCheckInputs = [ jsonschema - pytest-subtests pytestCheckHook ]; diff --git a/pkgs/development/python-modules/reflex-chakra/default.nix b/pkgs/development/python-modules/reflex-chakra/default.nix index 637a54fa1cec..99f76ae0c952 100644 --- a/pkgs/development/python-modules/reflex-chakra/default.nix +++ b/pkgs/development/python-modules/reflex-chakra/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "reflex-chakra"; - version = "0.8.2"; + version = "0.8.2post1"; pyproject = true; src = fetchFromGitHub { owner = "reflex-dev"; repo = "reflex-chakra"; tag = "v${version}"; - hash = "sha256-6KWIpTtr2tNBxXoj2hY0zuX0bpSUvsoA1Y7uwln3HDY="; + hash = "sha256-DugZRZpGP90EFkBjpAS1XkjrNPG6WWwCQPUcEZJ0ff8="; }; build-system = [ diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index ab9091e13fc5..9a7e1bbf8cdd 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -7,7 +7,7 @@ }: let - version = "2025.11.3"; + version = "2026.1.15"; in buildPythonPackage { pname = "regex"; @@ -18,7 +18,7 @@ buildPythonPackage { owner = "mrabarnett"; repo = "mrab-regex"; tag = version; - hash = "sha256-KEn+8DoAAq2OBqnl7vluqn1UPBpIfmO1v4wxKUZrcyA="; + hash = "sha256-siSyt5maiAjeU4LjOLUo82ubsjtNCeRbdwgYu2DdwBE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/remarshal/default.nix b/pkgs/development/python-modules/remarshal/default.nix index ddab449fb324..561923f7ea5e 100644 --- a/pkgs/development/python-modules/remarshal/default.nix +++ b/pkgs/development/python-modules/remarshal/default.nix @@ -13,6 +13,7 @@ pyyaml, rich-argparse, ruamel-yaml, + tomli, tomlkit, u-msgpack-python, @@ -22,14 +23,14 @@ buildPythonPackage rec { pname = "remarshal"; - version = "1.2.0"; # test with `nix-build pkgs/pkgs-lib/format` + version = "1.3.0"; # test with `nix-build pkgs/pkgs-lib/format` pyproject = true; src = fetchFromGitHub { owner = "dbohdan"; repo = "remarshal"; tag = "v${version}"; - hash = "sha256-y/odWWFJ7KDehYzUKSM/cprcCd+UaArEZFoYbtyW0Ok="; + hash = "sha256-/K8x6ij23pk5O1+XJdFHaGbZ47nFMbXzp+4UMO5dGp4="; }; build-system = [ poetry-core ]; @@ -41,6 +42,7 @@ buildPythonPackage rec { pyyaml rich-argparse ruamel-yaml + tomli tomlkit u-msgpack-python ]; @@ -48,7 +50,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; meta = { - changelog = "https://github.com/remarshal-project/remarshal/releases/tag/v${version}"; + changelog = "https://github.com/remarshal-project/remarshal/releases/tag/${src.tag}"; description = "Convert between TOML, YAML and JSON"; license = lib.licenses.mit; homepage = "https://github.com/dbohdan/remarshal"; diff --git a/pkgs/development/python-modules/repl-python-wakatime/default.nix b/pkgs/development/python-modules/repl-python-wakatime/default.nix index 8a88ff234af7..93ee11c75742 100644 --- a/pkgs/development/python-modules/repl-python-wakatime/default.nix +++ b/pkgs/development/python-modules/repl-python-wakatime/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "repl-python-wakatime"; - version = "0.1.1"; + version = "0.1.6"; pyproject = true; src = fetchFromGitHub { owner = "wakatime"; repo = "repl-python-wakatime"; tag = version; - hash = "sha256-1uzW3Q1PE4Gdpo354JewzkR8UREPrAFMXiwOKEMbW3M="; + hash = "sha256-U7p0TnGtjxssYAMk6QteeU1Vdq7mrjdDZvwYhyNOIoY="; }; build-system = [ @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = { description = "Python REPL plugin for automatic time tracking and metrics generated from your programming activity"; homepage = "https://github.com/wakatime/repl-python-wakatime"; - changelog = "https://github.com/wakatime/repl-python-wakatime/releases/tag/${version}"; + changelog = "https://github.com/wakatime/repl-python-wakatime/releases/tag/${src.tag}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ jfvillablanca ]; }; diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix index b4124166062e..abe15fe783b1 100644 --- a/pkgs/development/python-modules/reproject/default.nix +++ b/pkgs/development/python-modules/reproject/default.nix @@ -6,6 +6,7 @@ buildPythonPackage, cython, dask, + dask-image, extension-helpers, fetchFromGitHub, fsspec, @@ -26,14 +27,14 @@ buildPythonPackage rec { pname = "reproject"; - version = "0.15.0"; + version = "0.19.0"; pyproject = true; src = fetchFromGitHub { owner = "astropy"; repo = "reproject"; tag = "v${version}"; - hash = "sha256-gv5LOxXTNdHSx4Q4ydi/QBHhc7/E/DXJD7WuPBAH0dE="; + hash = "sha256-30u/APFJiMA1fY50jKLE7MdXMDmUMMZ+ER6mmhx7CJc="; }; build-system = [ @@ -48,6 +49,7 @@ buildPythonPackage rec { astropy astropy-healpix dask + dask-image fsspec numpy pillow diff --git a/pkgs/development/python-modules/requests-gssapi/default.nix b/pkgs/development/python-modules/requests-gssapi/default.nix index 176d8b43e45d..6853eb0d4fa1 100644 --- a/pkgs/development/python-modules/requests-gssapi/default.nix +++ b/pkgs/development/python-modules/requests-gssapi/default.nix @@ -10,12 +10,13 @@ buildPythonPackage rec { pname = "requests-gssapi"; - version = "1.3.0"; + version = "1.4.0"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-TVK/jCqiqCkTDvzKhcFJQ/3QqnVFWquYWyuHJhWcIMo="; + inherit version; + pname = "requests_gssapi"; + hash = "sha256-uifrMp9IQNllvI+l02DGJ8dDSe+mFWylAa2Jr8ahNPQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/requests-mock/default.nix b/pkgs/development/python-modules/requests-mock/default.nix index 0f159f2a2020..0a3b3d33a087 100644 --- a/pkgs/development/python-modules/requests-mock/default.nix +++ b/pkgs/development/python-modules/requests-mock/default.nix @@ -22,6 +22,11 @@ buildPythonPackage rec { hash = "sha256-6eEuMztSUVboKjyFLyIBa5FYIg0vR0VN6crop303FAE="; }; + postPatch = '' + substituteInPlace tests/test_mocker.py \ + --replace-fail assertEquals assertEqual + ''; + build-system = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/requests-ratelimiter/default.nix b/pkgs/development/python-modules/requests-ratelimiter/default.nix index d945b9c869af..08da327b0acd 100644 --- a/pkgs/development/python-modules/requests-ratelimiter/default.nix +++ b/pkgs/development/python-modules/requests-ratelimiter/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { broken = lib.versionAtLeast pyrate-limiter.version "3"; description = "Module for rate-limiting for requests"; homepage = "https://github.com/JWCook/requests-ratelimiter"; - changelog = "https://github.com/JWCook/requests-ratelimiter/blob/${src.rev}/HISTORY.md"; + changelog = "https://github.com/JWCook/requests-ratelimiter/blob/${src.tag}/HISTORY.md"; license = lib.licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/resolvelib/default.nix b/pkgs/development/python-modules/resolvelib/default.nix index 232bc2223c7e..f45fc2288b41 100644 --- a/pkgs/development/python-modules/resolvelib/default.nix +++ b/pkgs/development/python-modules/resolvelib/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "resolvelib"; - version = "1.2.0"; + version = "1.2.1"; pyproject = true; src = fetchFromGitHub { owner = "sarugaku"; repo = "resolvelib"; tag = version; - hash = "sha256-8ffJ1Jlb/hzKY4pfE3B95ip2e1CxUByiR0cul/ZnxxA="; + hash = "sha256-AxxW6z51fZGqs5UwY3NEBQL8894uQDuRyVrKzol3ny0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index 81e69eb00e78..badf42cfa893 100644 --- a/pkgs/development/python-modules/responses/default.nix +++ b/pkgs/development/python-modules/responses/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "responses"; - version = "0.25.7"; + version = "0.25.8"; pyproject = true; __darwinAllowLocalNetworking = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "responses"; tag = version; - hash = "sha256-eiJwu0sRtr3S4yAnbsIak7g03CNqOTS16rNXoXRQumA="; + hash = "sha256-7vl8+7cpyJFhGDTzklQn7p5NyEFpzX9Yiz2g7fDCPGk="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/restructuredtext-lint/default.nix b/pkgs/development/python-modules/restructuredtext-lint/default.nix index add3298e2a2f..b1c62cd661ce 100644 --- a/pkgs/development/python-modules/restructuredtext-lint/default.nix +++ b/pkgs/development/python-modules/restructuredtext-lint/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "restructuredtext-lint"; - version = "1.4.0"; + version = "2.0.2"; pyproject = true; src = fetchPypi { pname = "restructuredtext_lint"; inherit version; - hash = "sha256-GyNcDJIjQatsUwOQiS656S+QubdQRgY+BHys+w8FDEU="; + hash = "sha256-3SUgm54Lcmkp2DBjOfr3I3NKMTfbOCvPJylPoYprxSs="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/returns/default.nix b/pkgs/development/python-modules/returns/default.nix index dd956259f4fb..e66ffc6ef9fb 100644 --- a/pkgs/development/python-modules/returns/default.nix +++ b/pkgs/development/python-modules/returns/default.nix @@ -10,7 +10,6 @@ pytest-aio, pytest-mypy, pytest-mypy-plugins, - pytest-subtests, pytestCheckHook, setuptools, trio, @@ -55,7 +54,6 @@ buildPythonPackage rec { pytest-aio pytest-mypy pytest-mypy-plugins - pytest-subtests setuptools trio ]; diff --git a/pkgs/development/python-modules/rich-argparse/default.nix b/pkgs/development/python-modules/rich-argparse/default.nix index acbf637dfc01..d7bbc910a363 100644 --- a/pkgs/development/python-modules/rich-argparse/default.nix +++ b/pkgs/development/python-modules/rich-argparse/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + python, fetchFromGitHub, hatchling, pytestCheckHook, @@ -9,14 +10,14 @@ buildPythonPackage rec { pname = "rich-argparse"; - version = "1.7.1"; + version = "1.7.2"; pyproject = true; src = fetchFromGitHub { owner = "hamdanal"; repo = "rich-argparse"; tag = "v${version}"; - hash = "sha256-gLXFiWgGMDOUbTyoSgTr0XfotVfDxwMqPdsfE4KHzXM="; + hash = "sha256-gzPz8vRxZyZ6Du2r4PdqHjeeLkXZV8eDdX0d+TMrVUc="; }; build-system = [ hatchling ]; @@ -25,6 +26,15 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = [ + # coloring mismatch in fixture + "test_subparsers_usage" + ] + ++ lib.optionals (!python.isPy313) [ + # solid vs dash line mismatch + "test_rich_renderables" + ]; + pythonImportsCheck = [ "rich_argparse" ]; meta = { diff --git a/pkgs/development/python-modules/rich-click/default.nix b/pkgs/development/python-modules/rich-click/default.nix index 24768e3d1661..1dfb80c6c200 100644 --- a/pkgs/development/python-modules/rich-click/default.nix +++ b/pkgs/development/python-modules/rich-click/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "rich-click"; - version = "1.8.9"; + version = "1.9.5"; pyproject = true; src = fetchFromGitHub { owner = "ewels"; repo = "rich-click"; tag = "v${version}"; - hash = "sha256-uFb4Pcor9o4BPM/xx/sAKu9DoXvGO/RZg/3dVhbjgk0="; + hash = "sha256-VSaPSC49icIB4z3ZPHtedh2gXkYBIODrG362T++i0Eo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/rich-rst/default.nix b/pkgs/development/python-modules/rich-rst/default.nix index cb2d5b44f9e1..10698741bb32 100644 --- a/pkgs/development/python-modules/rich-rst/default.nix +++ b/pkgs/development/python-modules/rich-rst/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, setuptools, + setuptools-scm, docutils, rich, pytestCheckHook, @@ -10,17 +11,20 @@ buildPythonPackage rec { pname = "rich-rst"; - version = "1.3.1"; + version = "1.3.2"; pyproject = true; src = fetchFromGitHub { owner = "wasi-master"; repo = "rich-rst"; tag = "v${version}"; - hash = "sha256-jbzGTEth5Qoc0ORFCS3sZMrGUpoQQOVsd+l3/zMWy20="; + hash = "sha256-NL5Y3m8KcAiZIH6IvuPp75Tbxh/X9Ob5qUWtYfuq8Bc="; }; - build-system = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; dependencies = [ docutils diff --git a/pkgs/development/python-modules/rich-toolkit/default.nix b/pkgs/development/python-modules/rich-toolkit/default.nix index 901a0681dfba..bac82024c583 100644 --- a/pkgs/development/python-modules/rich-toolkit/default.nix +++ b/pkgs/development/python-modules/rich-toolkit/default.nix @@ -13,19 +13,20 @@ # tests inline-snapshot, + pydantic, pytestCheckHook, }: buildPythonPackage rec { pname = "rich-toolkit"; - version = "0.15.1"; + version = "0.17.1"; pyproject = true; src = fetchFromGitHub { owner = "patrick91"; repo = "rich-toolkit"; tag = version; - hash = "sha256-NcdABfbqE+VzE6bptBO98Cf7jetlfVqa/LB5Chg/P8Y="; + hash = "sha256-69x760lnMdwrNFUL1g9PBlTRGz34Ur2CHWbJq7PqBmk="; }; build-system = [ hatchling ]; @@ -38,6 +39,7 @@ buildPythonPackage rec { nativeCheckInputs = [ inline-snapshot + pydantic pytestCheckHook ]; diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index b22e2001e8df..8c0e9f34b409 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + python, # build-system poetry-core, @@ -27,14 +28,18 @@ buildPythonPackage rec { pname = "rich"; - version = "14.2.0"; + version = if python.isPy313 then "14.2.0" else "14.3.3"; pyproject = true; src = fetchFromGitHub { owner = "Textualize"; repo = "rich"; tag = "v${version}"; - hash = "sha256-oQbxRbZnVr/Ln+i/hpBw5FlpUp3gcp/7xsxi6onPkn8="; + hash = + if python.isPy313 then + "sha256-oQbxRbZnVr/Ln+i/hpBw5FlpUp3gcp/7xsxi6onPkn8=" + else + "sha256-6udVO7N17ineQozlCG/tI9jJob811gqb4GtY50JZFb0="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/rio-tiler/default.nix b/pkgs/development/python-modules/rio-tiler/default.nix index 2042d589672f..5539cd672c9b 100644 --- a/pkgs/development/python-modules/rio-tiler/default.nix +++ b/pkgs/development/python-modules/rio-tiler/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "rio-tiler"; - version = "7.8.1"; + version = "8.0.5"; pyproject = true; src = fetchFromGitHub { owner = "cogeotiff"; repo = "rio-tiler"; tag = version; - hash = "sha256-w7uw5PY3uiJmxsgSB1YDbtG7IY1pd4WU3JExZRc40gs="; + hash = "sha256-FOTwP4iTLfWl81KKarLOQQyp4gpi6Q+pjUXfZrXXsfo="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/roadtx/default.nix b/pkgs/development/python-modules/roadtx/default.nix index 77ae3723384f..85e63038ab23 100644 --- a/pkgs/development/python-modules/roadtx/default.nix +++ b/pkgs/development/python-modules/roadtx/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "roadtx"; - version = "1.18.0"; + version = "1.21.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-tJLsxo8XQ0FGyob2SSpjvN9RgVYYhDxGcbP6jytcjaU="; + hash = "sha256-UxyyvVWuRE/Uh7zUtSN6GdRdintNpFAHVQ+ufc+uFjU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix index 726b48bcdae0..6e8b52c11cb7 100644 --- a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "robotframework-databaselibrary"; - version = "2.1.4"; + version = "2.4.1"; pyproject = true; src = fetchFromGitHub { owner = "MarketSquare"; repo = "Robotframework-Database-Library"; - tag = "v.${version}"; - hash = "sha256-ZZOhGZTJGWYCHyvJXDYGn9BMuPioCVIu0KONGkXsRmk="; + tag = "v${version}"; + hash = "sha256-RGTx5Xn40MHr5M6DUb3dkR2OU7B0JKuFYP1o18o3Ct4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix b/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix index 5a29edf4b1b9..0cc2b99553ee 100644 --- a/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix +++ b/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "robotframework-pythonlibcore"; - version = "4.4.1"; + version = "4.5.0"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "robotframework"; repo = "PythonLibCore"; tag = "v${version}"; - hash = "sha256-5RUi65+DljCqWoB8vZxc0hyIefEFOWuKluplXrD0SkI="; + hash = "sha256-tkPESNRO34q5yH5Y2iHMQe/z18QiAvvzhjhMafxxUWI="; }; build-system = [ setuptools ]; @@ -37,7 +37,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "robotlibcore" ]; meta = { - changelog = "https://github.com/robotframework/PythonLibCore/blob/${src.rev}/docs/PythonLibCore-${version}.rst"; + changelog = "https://github.com/robotframework/PythonLibCore/blob/${src.tag}/docs/PythonLibCore-${src.tag}.rst"; description = "Tools to ease creating larger test libraries for Robot Framework using Python"; homepage = "https://github.com/robotframework/PythonLibCore"; license = lib.licenses.asl20; diff --git a/pkgs/development/python-modules/robotsuite/default.nix b/pkgs/development/python-modules/robotsuite/default.nix index 110e20d69db5..d7a99364fb03 100644 --- a/pkgs/development/python-modules/robotsuite/default.nix +++ b/pkgs/development/python-modules/robotsuite/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "robotsuite"; - version = "2.3.2"; + version = "3.0.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-sPmOoR5K+gMfyPk2QMbiDNmWPRcqKrsz6ZPBAKR/3XY="; + hash = "sha256-3lKSPeZdq1z9umtiEAEQO7jVL6zRS/rCt76ildDe90U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/roman-numerals-py/default.nix b/pkgs/development/python-modules/roman-numerals/default.nix similarity index 64% rename from pkgs/development/python-modules/roman-numerals-py/default.nix rename to pkgs/development/python-modules/roman-numerals/default.nix index 7324a776a861..0360ef4b7909 100644 --- a/pkgs/development/python-modules/roman-numerals-py/default.nix +++ b/pkgs/development/python-modules/roman-numerals/default.nix @@ -4,27 +4,21 @@ fetchFromGitHub, flit-core, pytestCheckHook, - sphinx, }: -buildPythonPackage rec { - pname = "roman-numerals-py"; - version = "3.1.0"; +buildPythonPackage (finalAttrs: { + pname = "roman-numerals"; + version = "4.1.0"; pyproject = true; src = fetchFromGitHub { owner = "AA-Turner"; repo = "roman-numerals"; - tag = "v${version}"; - hash = "sha256-YLF09jYwXq48iMvmqbj/cocYJPp7RsCXzbN0DV9gpis="; + tag = "v${finalAttrs.version}"; + hash = "sha256-v+aPIcsggjRJ3l6Xfw97b3zcqpyWNY4XWy2+5aWyitY="; }; - postPatch = '' - ls -lah - cp LICENCE.rst python/ - - cd python - ''; + sourceRoot = "${finalAttrs.src.name}/python"; build-system = [ flit-core ]; @@ -35,9 +29,8 @@ buildPythonPackage rec { meta = { description = "Manipulate roman numerals"; homepage = "https://github.com/AA-Turner/roman-numerals/"; - changelog = "https://github.com/AA-Turner/roman-numerals/blob/${src.tag}/CHANGES.rst"; + changelog = "https://github.com/AA-Turner/roman-numerals/blob/${finalAttrs.src.tag}/CHANGES.rst"; license = lib.licenses.cc0; - mainProgram = "roman-numerals-py"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/development/python-modules/rpds-py/default.nix b/pkgs/development/python-modules/rpds-py/default.nix index 6a44c859e5f7..1407f4fa43c6 100644 --- a/pkgs/development/python-modules/rpds-py/default.nix +++ b/pkgs/development/python-modules/rpds-py/default.nix @@ -12,18 +12,18 @@ buildPythonPackage rec { pname = "rpds-py"; - version = "0.28.0"; + version = "0.30.0"; pyproject = true; src = fetchPypi { pname = "rpds_py"; inherit version; - hash = "sha256-q9TfIEhaCYPiyjNKIWJJthhtbjwWJ+EGZRlD29t5Guo="; + hash = "sha256-3Y/3z5ABSvDA94fuo0eU6/ZBUkLuHW+pHqunJcxEHoQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-mhFAV3KTVIUG/hU524cyeLv3sELv8wMtx820kPWeftE="; + hash = "sha256-2m2DW1rknZR+UztgUcRaQk4gY19eXmT089U2YlV16d8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index 9e5e8e1e3948..907ccdf3fd0d 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -48,6 +48,10 @@ buildPythonPackage rec { versionCheckHook ]; + preCheck = '' + redisTestPort=6379 + ''; + __darwinAllowLocalNetworking = true; # redisTestHook does not work on darwin-x86_64 diff --git a/pkgs/development/python-modules/rsa/default.nix b/pkgs/development/python-modules/rsa/default.nix index c1dec194932c..a8392a452856 100644 --- a/pkgs/development/python-modules/rsa/default.nix +++ b/pkgs/development/python-modules/rsa/default.nix @@ -5,7 +5,6 @@ poetry-core, pyasn1, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { @@ -20,10 +19,6 @@ buildPythonPackage rec { hash = "sha256-PwaRe+ICy0UoguXSMSh3PFl5R+YAhJwNdNN9isadlJY="; }; - preConfigure = lib.optionalString (pythonOlder "3.7") '' - substituteInPlace setup.py --replace "open('README.md')" "open('README.md',encoding='utf-8')" - ''; - nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ pyasn1 ]; diff --git a/pkgs/development/python-modules/rtfunicode/default.nix b/pkgs/development/python-modules/rtfunicode/default.nix index cfe34f1195f9..b7dc233e0249 100644 --- a/pkgs/development/python-modules/rtfunicode/default.nix +++ b/pkgs/development/python-modules/rtfunicode/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "rtfunicode"; - version = "2.0"; + version = "2.3"; format = "setuptools"; src = fetchFromGitHub { owner = "mjpieters"; repo = "rtfunicode"; - tag = version; - hash = "sha256-mo3kuuK1epcH0Iyi9GYpZOYsUI4etWheyEPdw/S3tJE="; + tag = "v${version}"; + hash = "sha256-dmPpMplCQIJMHhNFzOIjKwEHVio2mjFEbDmq1Y9UJkA="; }; nativeBuildInputs = [ unittestCheckHook ]; @@ -26,6 +26,6 @@ buildPythonPackage rec { maintainers = [ lib.maintainers.lucasew ]; license = lib.licenses.bsd2; homepage = "https://github.com/mjpieters/rtfunicode"; - changelog = "https://github.com/mjpieters/rtfunicode/releases/tag/${version}"; + changelog = "https://github.com/mjpieters/rtfunicode/releases/tag/${src.tag}"; }; } diff --git a/pkgs/development/python-modules/ruamel-yaml-clib/default.nix b/pkgs/development/python-modules/ruamel-yaml-clib/default.nix index 8602efb9ca32..c9bf6ef59b27 100644 --- a/pkgs/development/python-modules/ruamel-yaml-clib/default.nix +++ b/pkgs/development/python-modules/ruamel-yaml-clib/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "ruamel-yaml-clib"; - version = "0.2.14"; + version = "0.2.15"; pyproject = true; src = fetchhg { url = "http://hg.code.sf.net/p/ruamel-yaml-clib/code"; rev = version; - hash = "sha256-fy+nzq/L3OKGujf6ExDowdxTWDnZGzVnDxL2e5t0Xcs="; + hash = "sha256-SnMELcG2L2ei3UjImljjG1sSCHHROhXYcLe5kAR6h8E="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ruamel-yaml/default.nix b/pkgs/development/python-modules/ruamel-yaml/default.nix index 4e7cc9b1b801..3d811e098d7b 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.16"; + version = "0.19.1"; pyproject = true; src = fetchPypi { - pname = "ruamel.yaml"; + pname = "ruamel_yaml"; inherit version; - hash = "sha256-puWHUS88mYsiJdaKofNREcKfrRSu1WGibnP6tynsXlo="; + hash = "sha256-U+tmzSeEnv+Wjr+PC/YfRs2sLaHR81dt1MzumyXDGZM="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/rubicon-objc/default.nix b/pkgs/development/python-modules/rubicon-objc/default.nix index 3878ebe5ad9b..311e0211b0de 100644 --- a/pkgs/development/python-modules/rubicon-objc/default.nix +++ b/pkgs/development/python-modules/rubicon-objc/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "rubicon-objc"; - version = "0.5.2"; + version = "0.5.3"; pyproject = true; src = fetchFromGitHub { owner = "beeware"; repo = "rubicon-objc"; tag = "v${version}"; - hash = "sha256-ahlsY4eU9n+BRexE4wNVXMcgSiGW7pU25zJif9lGTUs="; + hash = "sha256-h2KMfV6vduhO0AsMNiZ+nFJubhrrt4rNXpdngelDMpU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/rubymarshal/default.nix b/pkgs/development/python-modules/rubymarshal/default.nix index 61fb9164acfa..02ef62e63cff 100644 --- a/pkgs/development/python-modules/rubymarshal/default.nix +++ b/pkgs/development/python-modules/rubymarshal/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "rubymarshal"; - version = "1.2.9"; + version = "1.2.10"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-OqTbHV2duO4SmP6O9+tfaSD7fKOJ/PmzX5dUW9eoBBg="; + hash = "sha256-iZtG5khSANCHhY/1YpWIF2T/Umj2/fAbfsxOTgPT7Xw="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 7669ea249b5e..63e91a184f73 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -68,7 +68,7 @@ buildPythonPackage rec { meta = { description = "Pythonic file interface for S3"; homepage = "https://github.com/fsspec/s3fs"; - changelog = "https://github.com/fsspec/s3fs/blob/${version}/docs/source/changelog.rst"; + changelog = "https://github.com/fsspec/s3fs/blob/${src.tag}/docs/source/changelog.rst"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ teh ]; }; diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index 5ee2504ae640..37b16612de83 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "s3transfer"; - version = "0.13.1"; + version = "0.16.0"; pyproject = true; src = fetchFromGitHub { owner = "boto"; repo = "s3transfer"; tag = version; - hash = "sha256-NDm1Lc0PXW1hbNftwdM2b87wFXSCBPCxZmwcRFmIyY8="; + hash = "sha256-dpDlsZtLjd6r4kLkIDPG6ZPFFs6/4elYiHk2HDpa9+4="; }; build-system = [ @@ -51,7 +51,7 @@ buildPythonPackage rec { meta = { description = "Library for managing Amazon S3 transfers"; homepage = "https://github.com/boto/s3transfer"; - changelog = "https://github.com/boto/s3transfer/blob/${version}/CHANGELOG.rst"; + changelog = "https://github.com/boto/s3transfer/blob/${src.tag}/CHANGELOG.rst"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ nickcao ]; }; diff --git a/pkgs/development/python-modules/safety-schemas/default.nix b/pkgs/development/python-modules/safety-schemas/default.nix index ef36bce3bb24..f7336cf4cbae 100644 --- a/pkgs/development/python-modules/safety-schemas/default.nix +++ b/pkgs/development/python-modules/safety-schemas/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "safety-schemas"; - version = "0.0.16"; + version = "0.0.18"; pyproject = true; src = fetchPypi { pname = "safety_schemas"; inherit version; - hash = "sha256-O7BNEb1LXMefn6GDxlimqM+CepzuxEOl/6bu04pQok4="; + hash = "sha256-OhJ6U7ruCoglMGtdG+SGZmks+YuqzpeF0Xv2BOkGSUo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix index 692bc4c80694..6c01e6d32e1e 100644 --- a/pkgs/development/python-modules/safety/default.nix +++ b/pkgs/development/python-modules/safety/default.nix @@ -50,6 +50,7 @@ buildPythonPackage rec { "filelock" "pydantic" "psutil" + "safety-schemas" ]; dependencies = [ diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 74f942db1a2f..fd07cb3593ac 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -41,14 +41,14 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.254.1"; + version = "2.256.1"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "sagemaker-python-sdk"; tag = "v${version}"; - hash = "sha256-tE8AD/nVrlP96ihVjzpos1IUGPR2T47HAMczCGP3S9M="; + hash = "sha256-Q5JeXWehj2TxP4SolNvn6B6lI8yxvUYzbardJvVfgaU="; }; build-system = [ diff --git a/pkgs/development/python-modules/saiph/default.nix b/pkgs/development/python-modules/saiph/default.nix index db2628231ca0..33b088eda076 100644 --- a/pkgs/development/python-modules/saiph/default.nix +++ b/pkgs/development/python-modules/saiph/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "saiph"; - version = "2.0.3"; + version = "2.0.7"; src = fetchFromGitHub { owner = "octopize"; repo = "saiph"; tag = "saiph-v${version}"; - hash = "sha256-8AbV3kjPxjZo28CgahfbdNl9+ESWOfUt8YT+mWwbo5Q="; + hash = "sha256-KBef23kv3oylSNyo1Q6pQFlhX7HJCV37d8EEs0MubDw="; }; pyproject = true; diff --git a/pkgs/development/python-modules/samplerate/default.nix b/pkgs/development/python-modules/samplerate/default.nix index 06db20871e6a..5c2eb0e33e6e 100644 --- a/pkgs/development/python-modules/samplerate/default.nix +++ b/pkgs/development/python-modules/samplerate/default.nix @@ -32,6 +32,11 @@ buildPythonPackage rec { hash = "sha256-7FAdIqsYCapmEAYiAuoS5m/jFExXZX3hn3kwxn9NWEc="; }; + patches = [ + # https://github.com/tuxu/python-samplerate/pull/33 + ./numpy-2.4-compat.patch + ]; + postPatch = '' # unvendor pybind11, libsamplerate rm -r external diff --git a/pkgs/development/python-modules/samplerate/numpy-2.4-compat.patch b/pkgs/development/python-modules/samplerate/numpy-2.4-compat.patch new file mode 100644 index 000000000000..6e980aa31ba9 --- /dev/null +++ b/pkgs/development/python-modules/samplerate/numpy-2.4-compat.patch @@ -0,0 +1,13 @@ +diff --git a/tests/test_api.py b/tests/test_api.py +index 1fef8de..f5b8fac 100644 +--- a/tests/test_api.py ++++ b/tests/test_api.py +@@ -48,7 +48,7 @@ def test_simple(data, converter_type, ratio=2.0): + def test_process(data, converter_type, ratio=2.0): + num_channels, input_data = data + src = samplerate.Resampler(converter_type, num_channels) +- src.process(input_data, ratio) ++ src.process(input_data.copy(), ratio) + + + def test_match(data, converter_type, ratio=2.0): diff --git a/pkgs/development/python-modules/sanic-ext/default.nix b/pkgs/development/python-modules/sanic-ext/default.nix index 17c33e3563fa..cd8eb48eab12 100644 --- a/pkgs/development/python-modules/sanic-ext/default.nix +++ b/pkgs/development/python-modules/sanic-ext/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "sanic-ext"; - version = "24.12.0"; + version = "25.12.0"; pyproject = true; src = fetchFromGitHub { owner = "sanic-org"; repo = "sanic-ext"; tag = "v${version}"; - hash = "sha256-H1tqiPQ4SwlNGj7GtB2h7noZpU+gbGXIbmRK1TSSqVA="; + hash = "sha256-h1yN5VYFPFUZoeZeJ6+CfGE3m/5zz+/G3BbetDKtZAo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index a4c8742fc153..0738dddcd0be 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -26,16 +26,19 @@ buildPythonPackage rec { pname = "sanic"; - version = "25.3.0"; + version = "25.12.0"; pyproject = true; src = fetchFromGitHub { owner = "sanic-org"; repo = "sanic"; tag = "v${version}"; - hash = "sha256-tucLXWYPpALQrPYf+aiovKHYf2iouu6jezvNdukEu9w="; + hash = "sha256-ygMTULkavd/5Mqxn/iS1TC29hfFcF6q3/kT8S7V1Xdo="; }; + # test compat for testing with pytest-asyncio + patches = [ ./pytest9-compat.patch ]; + build-system = [ setuptools ]; dependencies = [ @@ -59,7 +62,7 @@ buildPythonPackage rec { nativeCheckInputs = [ beautifulsoup4 gunicorn - pytest-asyncio + pytest-asyncio # upstream tests with anyio + pytest-sanic instead pytestCheckHook sanic-testing uvicorn @@ -101,6 +104,9 @@ buildPythonPackage rec { "test_create_server_trigger_events" "test_multiple_uvloop_configs_display_warning" "test_uvloop_cannot_never_called_with_create_server" + # Our mailcap database has a different mime type name for xml documentations + # AssertionError: assert 'text/xml; charset=utf-8' == 'application/xml' + "test_guess_content_type" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/sanic/pytest9-compat.patch b/pkgs/development/python-modules/sanic/pytest9-compat.patch new file mode 100644 index 000000000000..1f47760614ad --- /dev/null +++ b/pkgs/development/python-modules/sanic/pytest9-compat.patch @@ -0,0 +1,21 @@ +diff --git a/tests/http3/test_http_receiver.py b/tests/http3/test_http_receiver.py +index 9641791b..29cf3926 100644 +--- a/tests/http3/test_http_receiver.py ++++ b/tests/http3/test_http_receiver.py +@@ -1,6 +1,7 @@ + from unittest.mock import Mock + + import pytest ++import pytest_asyncio + + from aioquic.h3.connection import H3Connection + from aioquic.h3.events import DataReceived, HeadersReceived +@@ -27,7 +28,7 @@ except ImportError: + pytestmark = pytest.mark.asyncio + + +-@pytest.fixture(autouse=True) ++@pytest_asyncio.fixture(autouse=True) + async def setup(app: Sanic): + @app.get("/") + async def handler(*_): diff --git a/pkgs/development/python-modules/scalar-fastapi/default.nix b/pkgs/development/python-modules/scalar-fastapi/default.nix index c86b95fc6f66..78a68b2cc8e6 100644 --- a/pkgs/development/python-modules/scalar-fastapi/default.nix +++ b/pkgs/development/python-modules/scalar-fastapi/default.nix @@ -23,13 +23,13 @@ buildPythonPackage rec { pname = "scalar-fastapi"; - version = "1.4.2"; + version = "1.6.1"; pyproject = true; src = fetchPypi { pname = "scalar_fastapi"; inherit version; - hash = "sha256-mXeUxDobSdZmxWWiuF2C+oY5Zvh6LljdZQc9/YwdqGI="; + hash = "sha256-XTzJbw84TTiLWKuldqkDuQfjyY2sqxM5ByIQ6UbE8DM="; }; build-system = [ diff --git a/pkgs/development/python-modules/schedula/default.nix b/pkgs/development/python-modules/schedula/default.nix index 93b58d9606ea..d43ba5db2c2e 100644 --- a/pkgs/development/python-modules/schedula/default.nix +++ b/pkgs/development/python-modules/schedula/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "schedula"; - version = "1.5.72"; + version = "1.5.78"; pyproject = true; src = fetchFromGitHub { owner = "vinci1it2000"; repo = "schedula"; tag = "v${version}"; - hash = "sha256-UfUe9Uv4y61SOEvqW5bbK891F7ysZS+jxtp1zN5JAGM="; + hash = "sha256-fhcG2N524KlwaG+inOyQJaXKoMhmR6Yddff8CDi8lhk="; }; build-system = [ setuptools ]; @@ -86,7 +86,7 @@ buildPythonPackage rec { meta = { description = "Smart function scheduler for dynamic flow-based programming"; homepage = "https://github.com/vinci1it2000/schedula"; - changelog = "https://github.com/vinci1it2000/schedula/blob/v${version}/CHANGELOG.rst"; + changelog = "https://github.com/vinci1it2000/schedula/blob/${src.tag}/CHANGELOG.rst"; license = lib.licenses.eupl11; maintainers = with lib.maintainers; [ flokli ]; # at least some tests fail on Darwin diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix index b092a4202141..17de4fa288ea 100644 --- a/pkgs/development/python-modules/schema-salad/default.nix +++ b/pkgs/development/python-modules/schema-salad/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "schema-salad"; - version = "8.9.20250723145140"; + version = "8.9.20251102115403"; pyproject = true; src = fetchFromGitHub { owner = "common-workflow-language"; repo = "schema_salad"; tag = version; - hash = "sha256-FEdv0VORkvXhqXPrmyCZ1Ib5Lz4fKwRkEqEcEXpfGq8="; + hash = "sha256-3axwM3fSxDIG1P0CvcqzqwpdDkhg/5pY7AmjUpU3mEk="; }; pythonRelaxDeps = [ "mistune" ]; diff --git a/pkgs/development/python-modules/schema/default.nix b/pkgs/development/python-modules/schema/default.nix index 7b6a2249203f..912ecffacdfd 100644 --- a/pkgs/development/python-modules/schema/default.nix +++ b/pkgs/development/python-modules/schema/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "schema"; - version = "0.7.7"; + version = "0.7.8"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-faVTq9KVihncJUfDiM3lM5izkZYXWpvlnqHK9asKGAc="; + hash = "sha256-6GzAjt1v5uJSJkj05H46MZIKdugszok3U1Qi4xCGKrU="; }; pythonRemoveDeps = [ "contextlib2" ]; diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix index c8e1cba068b1..d687f32d0a89 100644 --- a/pkgs/development/python-modules/scikit-bio/default.nix +++ b/pkgs/development/python-modules/scikit-bio/default.nix @@ -29,14 +29,14 @@ buildPythonPackage (finalAttrs: { pname = "scikit-bio"; - version = "0.7.0"; + version = "0.7.1.post1"; pyproject = true; src = fetchFromGitHub { owner = "scikit-bio"; repo = "scikit-bio"; tag = finalAttrs.version; - hash = "sha256-M0P5DUAMlRTkaIPbxSvO99N3y5eTrkg4NMlkIpGr4/g="; + hash = "sha256-fnZpLhn2F/KoP3q7WmdaDXeC9i7hduGRkUWlCwwME3Q="; }; 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 7a2bfd7d9d48..b4f68998eb7f 100644 --- a/pkgs/development/python-modules/scikit-build-core/default.nix +++ b/pkgs/development/python-modules/scikit-build-core/default.nix @@ -1,7 +1,9 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch, # build-system hatch-vcs, @@ -25,18 +27,28 @@ wheel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "scikit-build-core"; - version = "0.11.5"; + version = "0.11.6"; pyproject = true; src = fetchFromGitHub { owner = "scikit-build"; repo = "scikit-build-core"; - tag = "v${version}"; - hash = "sha256-4DwODJw1U/0+K/d7znYtDO2va71lzp1gDm4Bg9OBjQY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-zBTDacTkeclz+/X0SUl1xkxLz4zsfeLOD4Ew0V1Y1iU="; }; + # TODO: Rebuild avoidance; clean up on `staging`. + ${if stdenv.hostPlatform.isDarwin then "patches" else null} = [ + # Backport an upstream commit to fix the tests on Darwin. + (fetchpatch { + url = "https://github.com/scikit-build/scikit-build-core/commit/c30f52a3b2bd01dc05f23d3b89332c213006afe0.patch"; + excludes = [ ".github/workflows/ci.yml" ]; + hash = "sha256-5E9QfF5UcSNY1wzHzieEEHEPYzPjUTb66CKCodYb9vo="; + }) + ]; + postPatch = ""; build-system = [ @@ -84,8 +96,8 @@ buildPythonPackage rec { meta = { 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.tag}/docs/about/changelog.md"; + changelog = "https://github.com/scikit-build/scikit-build-core/blob/${finalAttrs.src.tag}/docs/about/changelog.md"; license = with lib.licenses; [ asl20 ]; maintainers = with lib.maintainers; [ veprbl ]; }; -} +}) diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix index af270a36233d..a792adea40de 100644 --- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.5.8"; + version = "0.6.0"; pyproject = true; src = fetchFromGitHub { owner = "scikit-hep"; repo = "scikit-hep-testdata"; tag = "v${version}"; - hash = "sha256-NAb+2AwU6BwPkgYr0WQn47hdeS+cRLgYckcDT2/dHpU="; + hash = "sha256-mefyBbZRHNwCApnkhB0xrTLiQl9G+JsVNEaW2PDa6AM="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index f503c781b7d4..a75e0e565e6a 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -34,18 +34,21 @@ let installedPackageRoot = "${placeholder "out"}/${python.sitePackages}"; self = buildPythonPackage rec { pname = "scikit-image"; - version = "0.25.2"; + version = "0.26.0"; pyproject = true; src = fetchFromGitHub { owner = "scikit-image"; repo = "scikit-image"; tag = "v${version}"; - hash = "sha256-viRX7Uh9coacueI6gJHBtOay/UIiUQkBfjpmDLJgyZ4="; + hash = "sha256-VpvlG2ECbq+FWLZ4RfdbbR3V6Fbw0RIvnVp+w0Rp+8o="; }; postPatch = '' - patchShebangs skimage/_build_utils/{version,cythoner}.py + patchShebangs src/skimage/_build_utils/{version,cythoner}.py + + substituteInPlace src/skimage/_build_utils/version.py \ + --replace-fail "version = version_from_init()" "version = \"${version}\"" ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index 4849a5851db9..b48f5a5d8f72 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -25,22 +25,23 @@ buildPythonPackage rec { __structuredAttrs = true; pname = "scikit-learn"; - version = "1.7.2"; + version = "1.8.0"; pyproject = true; src = fetchPypi { pname = "scikit_learn"; inherit version; - hash = "sha256-IOnkns0TBZjxyjih2FCQ4aYAFHucAvpvFdactT2Wj9o="; + hash = "sha256-m8y7O0Dj3hA1H49QaOEF0PQIOxpl+ge2Y0+8QBpih/0="; }; postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "Cython>=3.0.10,<3.2.0" "Cython>=3.0.10" - substituteInPlace meson.build --replace-fail \ "run_command('sklearn/_build_utils/version.py', check: true).stdout().strip()," \ "'${version}'," + substituteInPlace pyproject.toml \ + --replace-fail "meson-python>=0.17.1,<0.19.0" meson-python \ + --replace-fail "numpy>=2,<2.4.0" numpy \ + --replace-fail "scipy>=1.10.0,<1.17.0" scipy ''; buildInputs = [ diff --git a/pkgs/development/python-modules/scikit-rf/default.nix b/pkgs/development/python-modules/scikit-rf/default.nix index 848624dfbef7..4d90c831fbcb 100644 --- a/pkgs/development/python-modules/scikit-rf/default.nix +++ b/pkgs/development/python-modules/scikit-rf/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "scikit-rf"; - version = "1.8.0"; + version = "1.9.0"; pyproject = true; src = fetchFromGitHub { owner = "scikit-rf"; repo = "scikit-rf"; tag = "v${version}"; - hash = "sha256-wQOphwG5/4Bfa+re3S0d7lS4CJlKRjrRqnFZKaTG70M="; + hash = "sha256-iOKTQOOJTsj6YIQaJVWFcp9HdUEj43aytpo7VzItxr8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/scim2-models/default.nix b/pkgs/development/python-modules/scim2-models/default.nix index 3bf220fd9227..310afb70b370 100644 --- a/pkgs/development/python-modules/scim2-models/default.nix +++ b/pkgs/development/python-modules/scim2-models/default.nix @@ -2,14 +2,14 @@ lib, buildPythonPackage, fetchFromGitHub, - hatchling, + uv-build, pydantic, pytestCheckHook, }: buildPythonPackage (finalAttrs: { pname = "scim2-models"; - version = "0.4.1"; + version = "0.5.1"; pyproject = true; @@ -17,20 +17,20 @@ buildPythonPackage (finalAttrs: { owner = "python-scim"; repo = "scim2-models"; tag = finalAttrs.version; - hash = "sha256-cc9nSqED+gfBHC3QpeHnQ6lBnmvdHa6edp/WGiuiDfc="; + hash = "sha256-ahwHmWsM9IoK+yq0Qd0c2+kagMlXGi80/rAB4UQsf6U="; }; - build-system = [ hatchling ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "uv_build>=0.8.9,<0.9.0" "uv_build" + ''; + + build-system = [ uv-build ]; dependencies = [ pydantic ] ++ pydantic.optional-dependencies.email; nativeCheckInputs = [ pytestCheckHook ]; - preCheck = '' - substituteInPlace doc/tutorial.rst \ - --replace-fail "TzInfo(UTC)" "TzInfo(0)" - ''; - pythonImportsCheck = [ "scim2_models" ]; meta = { diff --git a/pkgs/development/python-modules/scim2-tester/default.nix b/pkgs/development/python-modules/scim2-tester/default.nix index 16cf2cc0cfd1..0b1e5f0824ce 100644 --- a/pkgs/development/python-modules/scim2-tester/default.nix +++ b/pkgs/development/python-modules/scim2-tester/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "scim2-tester"; - version = "0.1.14"; + version = "0.2.4"; pyproject = true; src = fetchPypi { inherit version; pname = "scim2_tester"; - hash = "sha256-QoqD0dgEuL0VJ6vc6K76G7ipl7rKjlzJuTwFCnfS/64="; + hash = "sha256-r67e3AnqhLWVmtOFDj3P2Baa2Ch3TjyHm3Ol8ZwXH/g="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/scipy-stubs/default.nix b/pkgs/development/python-modules/scipy-stubs/default.nix index ea35166924a6..9ca5818092a0 100644 --- a/pkgs/development/python-modules/scipy-stubs/default.nix +++ b/pkgs/development/python-modules/scipy-stubs/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "scipy-stubs"; - version = "1.16.3.0"; + version = "1.17.0.1"; pyproject = true; src = fetchFromGitHub { owner = "scipy"; repo = "scipy-stubs"; tag = "v${version}"; - hash = "sha256-TLqLJirbOGIm718cLhWcEi4VHms9imIJZadGfYphXBk="; + hash = "sha256-wzXRnTaSYOePt3XvZ/OeBOQCKObuCL1rWrVDo73yM1I="; }; postPatch = '' diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index c5b1f9d3a3f6..3bbd316e8178 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - writeText, + writeTextFile, python, buildPythonPackage, fetchFromGitHub, @@ -28,7 +28,7 @@ pybind11, pooch, xsimd, - boost188, + boost189, qhull, # dependencies @@ -43,45 +43,16 @@ sage, }: -let +buildPythonPackage (finalAttrs: { pname = "scipy"; - # DON'T UPDATE THESE ATTRIBUTES MANUALLY - USE: - # - # 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.3"; - srcHash = "sha256-2NVmsJqsUjWSD7oEJhRkRjbKvqwikBJenAhBio/+IuU="; - datasetsHashes = { - ascent = "1qjp35ncrniq9rhzb14icwwykqg2208hcssznn3hz27w39615kh3"; - ecg = "1bwbjp43b7znnwha5hv6wiz3g0bhwrpqpi75s12zidxrbwvd62pj"; - face = "11i8x29h80y7hhyqhil1fg8mxag5f827g33lhnsf44qk116hp2wx"; - }; - datasets = lib.mapAttrs ( - d: hash: - fetchurl { - url = "https://raw.githubusercontent.com/scipy/dataset-${d}/main/${d}.dat"; - sha256 = hash; - } - ) datasetsHashes; - # Additional cross compilation related properties that scipy reads in scipy/meson.build - crossFileScipy = writeText "cross-file-scipy.conf" '' - [properties] - numpy-include-dir = '${numpy.coreIncludeDir}' - pythran-include-dir = '${pythran}/${python.sitePackages}/pythran' - host-python-path = '${python.interpreter}' - host-python-version = '${python.pythonVersion}' - ''; -in -buildPythonPackage { - inherit pname version; + version = "1.17.0"; pyproject = true; src = fetchFromGitHub { owner = "scipy"; repo = "scipy"; - tag = "v${version}"; - hash = srcHash; + tag = "v${finalAttrs.version}"; + hash = "sha256-bDcM/RGfce/ZTYpTBNpKmX/7rXDqQs7rYkAmeXtzkZk="; fetchSubmodules = true; }; @@ -106,8 +77,7 @@ buildPythonPackage { # that override globally the `numpy` attribute to point to `numpy_1`. postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "Cython>=3.0.8,<3.2.0" "Cython>=3.0.8" \ - --replace-fail "numpy>=2.0.0,<2.6" numpy + --replace-fail "numpy>=2.0.0,<2.7" numpy ''; build-system = [ @@ -133,7 +103,7 @@ buildPythonPackage { pybind11 pooch xsimd - boost188 + boost189 qhull ]; @@ -158,6 +128,7 @@ buildPythonPackage { "hyp2f1_test_case3" "test_uint64_max" "test_large_m4" # https://github.com/scipy/scipy/issues/22466 + "test_spiral_cleanup" ] ++ lib.optionals (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isBigEndian) [ # https://github.com/scipy/scipy/issues/24090 @@ -189,7 +160,7 @@ buildPythonPackage { d: dpath: # Actually copy the datasets "cp ${dpath} scipy-data/${d}.dat" - ) datasets + ) finalAttrs.finalPackage.passthru.datasets )); mesonFlags = [ @@ -198,7 +169,7 @@ buildPythonPackage { # We always run what's necessary for cross compilation, which is passing to # meson the proper cross compilation related arguments. See also: # https://docs.scipy.org/doc/scipy/building/cross_compilation.html - "--cross-file=${crossFileScipy}" + "--cross-file=${finalAttrs.finalPackage.passthru.crossFile}" "-Duse-system-libraries=all" ]; @@ -222,6 +193,10 @@ buildPythonPackage { preCheck = '' export OMP_NUM_THREADS=$(( $NIX_BUILD_CORES / 4 )) + if [ $OMP_NUM_THREADS -eq 0 ]; then + export OMP_NUM_THREADS=1 + fi + cd $out ''; @@ -229,26 +204,53 @@ buildPythonPackage { passthru = { inherit blas; - updateScript = [ - ./update.sh - # Pass it this file name as argument - (builtins.unsafeGetAttrPos "pname" python.pkgs.scipy).file - ] - # Pass it the names of the datasets to update their hashes - ++ (builtins.attrNames datasetsHashes); tests = { inherit sage; }; + # NOTE: Every once in a while, these hashes might need an update. Use: + # + # nix build -Lf. --rebuild python3.pkgs.scipy.passthru.datasets + # + # To verify the hashes are correct. + datasetsHashes = { + ascent = "sha256-A84STBr8iA+HtV9rBhEQ4uHpOWeRhPVhTjjazGwZV+I="; + ecg = "sha256-8grTNl+5t/hF0OXEi2/mcIE3fuRmw6Igt/afNciVi68="; + face = "sha256-nYsLTQgTE+K0hXSMdwRy5ale0XOBRog9hMcDBJPoKIY="; + }; + datasets = lib.mapAttrs ( + d: hash: + fetchurl { + url = "https://raw.githubusercontent.com/scipy/dataset-${d}/main/${d}.dat"; + inherit hash; + } + ) finalAttrs.finalPackage.passthru.datasetsHashes; + # Additional cross compilation related properties that scipy reads in scipy/meson.build + buildConfig = { + properties = { + numpy-include-dir = numpy.coreIncludeDir; + pythran-include-dir = "${pythran}/${python.sitePackages}/pythran"; + host-python-path = python.interpreter; + host-python-version = python.pythonVersion; + }; + }; + crossFile = writeTextFile { + name = "cross-file-scipy.conf"; + text = lib.generators.toINI { + mkKeyValue = lib.generators.mkKeyValueDefault { + mkValueString = v: "'${v}'"; + } " = "; + } finalAttrs.finalPackage.passthru.buildConfig; + }; }; SCIPY_USE_G77_ABI_WRAPPER = 1; meta = { - changelog = "https://github.com/scipy/scipy/releases/tag/v${version}"; + changelog = "https://github.com/scipy/scipy/releases/tag/v${finalAttrs.version}"; description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering"; downloadPage = "https://github.com/scipy/scipy"; homepage = "https://www.scipy.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ doronbehar ]; }; -} +}) diff --git a/pkgs/development/python-modules/scipy/update.sh b/pkgs/development/python-modules/scipy/update.sh deleted file mode 100755 index c6b3dca49186..000000000000 --- a/pkgs/development/python-modules/scipy/update.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p jq nix-prefetch-github - -set -euo pipefail -echoerr() { echo "$@" 1>&2; } - -fname="$1" -echoerr got fname $fname -shift -datasets="$@" -echoerr datasets are: "$@" -latest_release=$(curl --silent https://api.github.com/repos/scipy/scipy/releases/latest) -version=$(jq -r '.tag_name' <<<"$latest_release" | cut -c2-) -# Update version, if needed -if grep -q 'version = "'$version $fname; then - echo "Current version $version is the latest available, will update only datasets' hashes (don't take long)" -else - echoerr got version $version - sed -i -E 's/(version = ").*(";)/\1'$version'\2/g' $fname - # Verify the sed command above did not fail - grep -q $version $fname - # Update srcHash - srcHash="$(nix-prefetch-github scipy scipy --rev v${version} --fetch-submodules | jq --raw-output .hash)" - sed -i -E 's#(srcHash = ").*(";)#\1'$srcHash'\2#g' $fname -fi - -for d in $datasets; do - datasetHash=$(nix-prefetch-url "https://raw.githubusercontent.com/scipy/dataset-${d}/main/${d}.dat") - sed -i 's/'$d' = "[0-9a-z]\+/'$d' = "'$datasetHash'/g' $fname - echoerr updated hash for dataset "'$d'" -done diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index f723220e3bd3..034892c0ab9e 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "3.5.2"; + version = "3.6.1"; pyproject = true; src = fetchFromGitHub { owner = "iterative"; repo = "scmrepo"; tag = version; - hash = "sha256-dZukbMrjUwJUHIBibOFrzBEs4TT0ljm4cnmKQ7rXMug="; + hash = "sha256-nkHEeslQM+F4PpNrrbSql+jCJDHmdaGfGkciluhXmHo="; }; build-system = [ diff --git a/pkgs/development/python-modules/scspell/default.nix b/pkgs/development/python-modules/scspell/default.nix index 4d85c77e9a92..79483166de88 100644 --- a/pkgs/development/python-modules/scspell/default.nix +++ b/pkgs/development/python-modules/scspell/default.nix @@ -2,35 +2,32 @@ lib, buildPythonPackage, fetchFromGitHub, - pyxdg, setuptools, versionCheckHook, writableTmpDirAsHomeHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "scspell"; - version = "2.3"; + version = "2.3.0-unstable-2025-04-06"; pyproject = true; src = fetchFromGitHub { owner = "myint"; repo = "scspell"; - tag = "v${version}"; - hash = "sha256-XiUdz+uHOJlqo+TWd1V/PvzkGJ2kPXzJJSe5Smfdgec="; + rev = "df550351f255c572c1a74852d233c83bbfbd49fb"; # Switch back to tag and remove preVersionCheck next release + hash = "sha256-mqU7Z6MluHTVYJ8fFbnN0OMWKjQFglD34YRnmJSE/jQ="; }; build-system = [ setuptools ]; - dependencies = [ - pyxdg - ]; - nativeCheckInputs = [ versionCheckHook writableTmpDirAsHomeHook ]; + preVersionCheck = "export version=2.3"; + pythonImportsCheck = [ "scspell" ]; meta = { diff --git a/pkgs/development/python-modules/sdds/default.nix b/pkgs/development/python-modules/sdds/default.nix index 15aaf9a9f01b..ab14e3a07e95 100644 --- a/pkgs/development/python-modules/sdds/default.nix +++ b/pkgs/development/python-modules/sdds/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "sdds"; - version = "0.4.2"; + version = "0.4.3"; format = "setuptools"; src = fetchFromGitHub { owner = "pylhc"; repo = "sdds"; tag = "v${version}"; - hash = "sha256-h1gEqzmKCUr8+w3Fv8lv35/0itZwela//AQsD3u0UJA="; + hash = "sha256-2lsim4FlOKBZ4Lk/iKIcItE/hvqiAK4XTkoxm52At/8="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix index 196176ce5124..290631786c57 100644 --- a/pkgs/development/python-modules/seaborn/default.nix +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -7,7 +7,7 @@ flit-core, matplotlib, pytest-xdist, - pytestCheckHook, + pytest8_3CheckHook, numpy, pandas, scipy, @@ -39,6 +39,11 @@ buildPythonPackage rec { url = "https://github.com/mwaskom/seaborn/commit/385e54676ca16d0132434bc9df6bc41ea8b2a0d4.patch"; hash = "sha256-nwGwTkP7W9QzgbbAVdb2rASgsMxqFnylMk8GnTE445w="; }) + (fetchpatch2 { + name = "numpy-2.4-compat.patch"; + url = "https://github.com/mwaskom/seaborn/commit/5023f2ee885a45200f5b63156a158ddf7272c29e.patch"; + hash = "sha256-T3OfjEEsPRRv1J6gdq9XmwcWEpPMDzul+LmK8UtV7nk="; + }) ]; nativeBuildInputs = [ flit-core ]; @@ -58,7 +63,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-xdist - pytestCheckHook + pytest8_3CheckHook ]; disabledTests = [ diff --git a/pkgs/development/python-modules/secretstorage/default.nix b/pkgs/development/python-modules/secretstorage/default.nix index 327d0209df79..e39e2e62989a 100644 --- a/pkgs/development/python-modules/secretstorage/default.nix +++ b/pkgs/development/python-modules/secretstorage/default.nix @@ -2,22 +2,26 @@ lib, buildPythonPackage, cryptography, - fetchPypi, + fetchFromGitHub, jeepney, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "secretstorage"; - version = "3.3.3"; - format = "setuptools"; + version = "3.5.0"; + pyproject = true; - src = fetchPypi { - pname = "SecretStorage"; - inherit version; - hash = "sha256-JANTPvNp7KbSuoFxhXbF4PVk1cyhtY9zqLI+fU7uvXc="; + src = fetchFromGitHub { + owner = "mitya57"; + repo = "secretstorage"; + tag = finalAttrs.version; + hash = "sha256-oDna9i6ny/mKHpOzrtfaYPnd12qsZ84TTxl4g+RWE24="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ cryptography jeepney ]; @@ -28,9 +32,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "secretstorage" ]; meta = { + changelog = "https://github.com/mitya57/secretstorage/blob/${finalAttrs.src.tag}/changelog"; description = "Python bindings to FreeDesktop.org Secret Service API"; homepage = "https://github.com/mitya57/secretstorage"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ teto ]; }; -} +}) diff --git a/pkgs/development/python-modules/securetar/default.nix b/pkgs/development/python-modules/securetar/default.nix index dd46df1b5fc1..657b3855c416 100644 --- a/pkgs/development/python-modules/securetar/default.nix +++ b/pkgs/development/python-modules/securetar/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pyproject = true; src = fetchFromGitHub { - owner = "pvizeli"; + owner = "home-assistant-libs"; repo = "securetar"; tag = version; hash = "sha256-uVzyVgS8bWxS7jhwVyv7wTNF8REW+dJIhkRaS/8/FmY="; @@ -29,8 +29,8 @@ buildPythonPackage rec { meta = { description = "Module to handle tarfile backups"; - homepage = "https://github.com/pvizeli/securetar"; - changelog = "https://github.com/pvizeli/securetar/releases/tag/${src.tag}"; + homepage = "https://github.com/home-assistant-libs/securetar"; + changelog = "https://github.com/home-assistant-libs/securetar/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/seekpath/default.nix b/pkgs/development/python-modules/seekpath/default.nix index 7954f569db90..b2909dea51df 100644 --- a/pkgs/development/python-modules/seekpath/default.nix +++ b/pkgs/development/python-modules/seekpath/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "seekpath"; - version = "2.1.0"; + version = "2.2.0"; pyproject = true; src = fetchFromGitHub { owner = "giovannipizzi"; repo = "seekpath"; - rev = "v${version}"; - hash = "sha256-8Nm8SKHda2qt1kncXZxC4T3cpicXpDZhxPzs78JICzE="; + tag = "v${version}"; + hash = "sha256-mrutQCSSiiLPt0KEohZeYcQ8aw2Jhy02bEvn6Of8w6U="; }; LC_ALL = "en_US.utf-8"; diff --git a/pkgs/development/python-modules/segyio/default.nix b/pkgs/development/python-modules/segyio/default.nix index 4901fe1f0c6f..39d37329773a 100644 --- a/pkgs/development/python-modules/segyio/default.nix +++ b/pkgs/development/python-modules/segyio/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "segyio"; - version = "1.9.13"; + version = "1.9.14"; pyproject = false; # Built with cmake patches = [ @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "equinor"; repo = "segyio"; tag = "v${version}"; - hash = "sha256-uVQ5cs9EPGUTSbaclLjFDwnbJevtv6ie94FLi+9vd94="; + hash = "sha256-Gprxxz4wUDrThCghW1Z1dHTjeJCrcDxuwguVC+i+ydc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index f538e2e5478e..a72569d8f5a0 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -7,11 +7,15 @@ certifi, pytestCheckHook, trio, + trio-typing, trio-websocket, typing-extensions, websocket-client, urllib3, + filetype, + pytest-mock, pytest-trio, + rich, nixosTests, stdenv, python, @@ -19,14 +23,14 @@ buildPythonPackage rec { pname = "selenium"; - version = "4.29.0"; + version = "4.40.0"; pyproject = true; src = fetchFromGitHub { owner = "SeleniumHQ"; repo = "selenium"; tag = "selenium-${version}" + lib.optionalString (lib.versions.patch version != "0") "-python"; - hash = "sha256-IyMXgYl/TPTpe/Y0pFyJVKj4Mp0xbkg1LSCNHzFL3bE="; + hash = "sha256-Yfm2kpAmmEUP+m48PQf09UvFPeGBxd0ukqTtVah5h+E="; }; patches = [ ./dont-build-the-selenium-manager.patch ]; @@ -44,6 +48,8 @@ buildPythonPackage rec { cp ../rb/lib/selenium/webdriver/atoms/findElements.js $DST_REMOTE cp ../javascript/cdp-support/mutation-listener.js $DST_REMOTE cp ../third_party/js/selenium/webdriver.json $DST_FF/webdriver_prefs.json + + find $out/${python.sitePackages}/ '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $DST_PREFIX/common/macos @@ -59,16 +65,49 @@ buildPythonPackage rec { dependencies = [ certifi trio + trio-typing trio-websocket - urllib3 typing-extensions + urllib3 websocket-client ] ++ urllib3.optional-dependencies.socks; + pythonRemoveDeps = [ + "types-certifi" + "types-urllib3" + ]; + nativeCheckInputs = [ + filetype pytestCheckHook + pytest-mock pytest-trio + rich + ]; + + disabledTestPaths = [ + # ERROR without error context + "test/selenium/webdriver/common/bidi_webextension_tests.py" + "test/selenium/webdriver/firefox/ff_installs_addons_tests.py" + # Fails to find browsers during test phase + "test/selenium" + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # Unsupported platform/architecture combination: linux/aarch64 + "test/unit/selenium/webdriver/common/selenium_manager_tests.py::test_errors_if_not_file" + ]; + + disabledTests = [ + # Fails to find data that is only copied into out in postInstall + "test_missing_cdp_devtools_version_falls_back" + "test_uses_windows" + "test_uses_linux" + "test_uses_mac" + "test_set_profile_with_firefox_profile" + "test_set_profile_with_path" + "test_creates_capabilities" + "test_get_connection_manager_for_certs_and_timeout" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/selenium/dont-build-the-selenium-manager.patch b/pkgs/development/python-modules/selenium/dont-build-the-selenium-manager.patch index 42ec9ce79774..87f24572a8f0 100644 --- a/pkgs/development/python-modules/selenium/dont-build-the-selenium-manager.patch +++ b/pkgs/development/python-modules/selenium/dont-build-the-selenium-manager.patch @@ -1,5 +1,5 @@ diff --git a/py/pyproject.toml b/py/pyproject.toml -index 9afa6a63c7..c28f9a4cbc 100644 +index eca3222d38..69bd19773b 100644 --- a/py/pyproject.toml +++ b/py/pyproject.toml @@ -1,5 +1,5 @@ @@ -9,13 +9,14 @@ index 9afa6a63c7..c28f9a4cbc 100644 build-backend = "setuptools.build_meta" [project] -@@ -43,9 +43,6 @@ exclude = ["test*"] - namespaces = false +@@ -66,10 +66,6 @@ exclude = ["test*"] + namespaces = true # include-package-data is `true` by default in pyproject.toml --[[tool.setuptools-rust.bins]] +-[[tool.setuptools-rust.ext-modules]] -target = "selenium.webdriver.common.selenium-manager" +-binding = "Exec" - - [project.urls] - Repository = "https://github.com/SeleniumHQ/selenium/" - BugTracker = "https://github.com/SeleniumHQ/selenium/issues" + [tool.setuptools.package-data] + "*" = [ + "*.py", diff --git a/pkgs/development/python-modules/send2trash/default.nix b/pkgs/development/python-modules/send2trash/default.nix index e11f9233eb8a..87c31c4469f9 100644 --- a/pkgs/development/python-modules/send2trash/default.nix +++ b/pkgs/development/python-modules/send2trash/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "send2trash"; - version = "1.8.3"; + version = "2.1.0"; pyproject = true; src = fetchFromGitHub { owner = "hsoft"; repo = "send2trash"; tag = version; - hash = "sha256-3RbKfluKOvl+sGJldtAt2bVfcasVKjCqVxmF6hVwh+Y="; + hash = "sha256-dBILb1tz3/X3/MnhSKujVX9pMFrTAyntQ+GQsscklQU="; }; nativeBuildInputs = [ setuptools ]; @@ -33,7 +33,7 @@ buildPythonPackage rec { description = "Send file to trash natively under macOS, Windows and Linux"; mainProgram = "send2trash"; homepage = "https://github.com/hsoft/send2trash"; - changelog = "https://github.com/arsenetar/send2trash/blob/${version}/CHANGES.rst"; + changelog = "https://github.com/arsenetar/send2trash/blob/${src.tag}/CHANGES.rst"; license = lib.licenses.bsd3; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/sentence-stream/default.nix b/pkgs/development/python-modules/sentence-stream/default.nix index 0695dd4d9e6f..9f81bae6156b 100644 --- a/pkgs/development/python-modules/sentence-stream/default.nix +++ b/pkgs/development/python-modules/sentence-stream/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "sentence-stream"; - version = "1.2.1"; + version = "1.3.0"; pyproject = true; src = fetchFromGitHub { owner = "OHF-Voice"; repo = "sentence-stream"; tag = "v${version}"; - hash = "sha256-KCKOiY2x+gj02PR0ps2e5Ei6o17tk5ujgCTr3/fkV0Y="; + hash = "sha256-UVoRto2zGf+GZFcYt4NC63Fm9iS7DWgwH7sJrrHxvXs="; }; build-system = [ diff --git a/pkgs/development/python-modules/sentence-transformers/default.nix b/pkgs/development/python-modules/sentence-transformers/default.nix index 3fb9e90e1617..08a3d12074f4 100644 --- a/pkgs/development/python-modules/sentence-transformers/default.nix +++ b/pkgs/development/python-modules/sentence-transformers/default.nix @@ -34,14 +34,14 @@ buildPythonPackage (finalAttrs: { pname = "sentence-transformers"; - version = "5.2.2"; + version = "5.2.3"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "sentence-transformers"; tag = "v${finalAttrs.version}"; - hash = "sha256-+ZJb56yo58nJtQz6LIyqsQA4yAFuDGeRRlkj0+iwUJ4="; + hash = "sha256-btbyPSsRAltd/hz5wFx70IKqn72e4VImaSgsqiFzTpM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sentinels/default.nix b/pkgs/development/python-modules/sentinels/default.nix index e922640ad783..821c7132cbef 100644 --- a/pkgs/development/python-modules/sentinels/default.nix +++ b/pkgs/development/python-modules/sentinels/default.nix @@ -2,21 +2,30 @@ lib, buildPythonPackage, fetchPypi, - setuptools, + hatchling, + hatch-vcs, pytestCheckHook, }: buildPythonPackage rec { pname = "sentinels"; - version = "1.0.0"; - format = "setuptools"; + version = "1.1.1"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "1cglkxph47pki4db4kjx5g4ikxp2milqdlcjgqwmx4p1gx6p1q3v"; + hash = "sha256-PC9k91QYfBngoaApsUi3TPWN0S7Ce04ZwOXW4itamoY="; }; - propagatedBuildInputs = [ setuptools ]; + postPatch = '' + # https://github.com/vmalloc/sentinels/pull/10 + sed -i "/testpaths/d" pyproject.toml + ''; + + build-system = [ + hatchling + hatch-vcs + ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index b609a83ff2c5..679b8a1024b1 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.48.0"; + version = "2.50.0"; pyproject = true; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-python"; tag = version; - hash = "sha256-Y8zGs5xj0PB0zQMHmg9RwbCiarOC2s8k/5/yQr+sL4k="; + hash = "sha256-wmfBLP8cTPgxb70dHL3esXPcCbW+Z8G9KgjJ49eus6c="; }; postPatch = '' diff --git a/pkgs/development/python-modules/setuptools-git-versioning/default.nix b/pkgs/development/python-modules/setuptools-git-versioning/default.nix index 477be6ebacf0..d9bd8d9e80b0 100644 --- a/pkgs/development/python-modules/setuptools-git-versioning/default.nix +++ b/pkgs/development/python-modules/setuptools-git-versioning/default.nix @@ -9,30 +9,28 @@ pytestCheckHook, pytest-rerunfailures, setuptools, - toml, + tomli-w, }: buildPythonPackage rec { pname = "setuptools-git-versioning"; - version = "2.1.0"; + version = "3.0.1"; pyproject = true; src = fetchFromGitHub { owner = "dolfinus"; repo = "setuptools-git-versioning"; tag = "v${version}"; - hash = "sha256-Slf6tq83LajdTnr98SuCiFIdm/6auzftnARLAOBgyng="; + hash = "sha256-rAJ9OvSKhQ3sMN5DlUg2tfR42Ae7jjz9en3gfRnXb3I="; }; postPatch = '' - # Because the .git dir is missing, it falls back to using version 0.0.1 - # Instead we use the version specified in the derivation - substituteInPlace setup.py --replace-fail \ - 'version=version_from_git(root=here, dev_template="{tag}.post{ccount}")' \ - "version='${version}'" + substituteInPlace pyproject.toml \ + --replace-fail 'dynamic = ["version"]' 'version = "${version}"' ''; build-system = [ + packaging setuptools ]; @@ -49,7 +47,7 @@ buildPythonPackage rec { git pytestCheckHook pytest-rerunfailures - toml + tomli-w ]; preCheck = '' @@ -71,7 +69,7 @@ buildPythonPackage rec { description = "Use git repo data (latest tag, current commit hash, etc) for building a version number according PEP-440"; mainProgram = "setuptools-git-versioning"; homepage = "https://github.com/dolfinus/setuptools-git-versioning"; - changelog = "https://github.com/dolfinus/setuptools-git-versioning/blob/${src.rev}/CHANGELOG.rst"; + changelog = "https://github.com/dolfinus/setuptools-git-versioning/blob/${src.tag}/CHANGELOG.rst"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/setuptools-scm/default.nix b/pkgs/development/python-modules/setuptools-scm/default.nix index 1c165bb9c498..876eb1e9cbd8 100644 --- a/pkgs/development/python-modules/setuptools-scm/default.nix +++ b/pkgs/development/python-modules/setuptools-scm/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "setuptools-scm"; - version = "9.0.1"; + version = "9.2.2"; pyproject = true; src = fetchPypi { pname = "setuptools_scm"; inherit version; - hash = "sha256-RuHPfooJZSthP5uk/ptV8vSW56Iz5OANJafLQflMPAs="; + hash = "sha256-HGdKtGZWhqCIfX4kwDqyXyQgHCE+guponS8+Fp7371c="; }; postPatch = null; diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 9dae458a8dcb..14448351f538 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -9,20 +9,16 @@ buildPythonPackage rec { pname = "setuptools"; - version = "80.9.0"; + version = "80.10.1"; pyproject = true; src = fetchFromGitHub { owner = "pypa"; repo = "setuptools"; tag = "v${version}"; - hash = "sha256-wueVQsV0ja/iPFRK7OKV27FQ7hYKF8cP3WH5wJeIXnI="; + hash = "sha256-s/gfJc3yxvCE6cjP03vtIZqNFmoZKR3d7+4gTPk1hQg="; }; - patches = [ - ./tag-date.patch - ]; - # Drop dependency on coherent.license, which in turn requires coherent.build postPatch = '' sed -i "/coherent.licensed/d" pyproject.toml diff --git a/pkgs/development/python-modules/setuptools/tag-date.patch b/pkgs/development/python-modules/setuptools/tag-date.patch deleted file mode 100644 index 30ed812c6740..000000000000 --- a/pkgs/development/python-modules/setuptools/tag-date.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/setup.cfg b/setup.cfg -index 38922089a..a743a2467 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -1,3 +1,3 @@ - [egg_info] - tag_build = .post --tag_date = 1 -+tag_date = 0 diff --git a/pkgs/development/python-modules/sfepy/default.nix b/pkgs/development/python-modules/sfepy/default.nix index 3c782a874b67..1899b43796e5 100644 --- a/pkgs/development/python-modules/sfepy/default.nix +++ b/pkgs/development/python-modules/sfepy/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "sfepy"; - version = "2024.4"; + version = "2025.4"; pyproject = true; src = fetchFromGitHub { owner = "sfepy"; repo = "sfepy"; tag = "release_${version}"; - hash = "sha256-3XQqPoAM1Qw/fZ649Xk+ceaeBkZ3ypI1FSRxtYbIrxw="; + hash = "sha256-rC/jqii2VpRbcvhsc6rLqlpki/y2R1lcGD7WMr41U0A="; }; postPatch = '' diff --git a/pkgs/development/python-modules/shap/default.nix b/pkgs/development/python-modules/shap/default.nix index f43c493b0df9..c8ae99419eef 100644 --- a/pkgs/development/python-modules/shap/default.nix +++ b/pkgs/development/python-modules/shap/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "shap"; - version = "0.48.0"; + version = "0.50.0"; pyproject = true; src = fetchFromGitHub { owner = "slundberg"; repo = "shap"; tag = "v${version}"; - hash = "sha256-eWZhyrFpEFlmTFPTHZng9V+uMRMXDVzFdgrqIzRQTws="; + hash = "sha256-sf9EYa15/5xEOtHSesuq97dFP4frtteoGSpHE8kGP9Q="; }; postPatch = '' @@ -64,6 +64,11 @@ buildPythonPackage rec { tqdm ]; + pythonRelaxDeps = [ + "numba" + "llvmlite" + ]; + optional-dependencies = { plots = [ matplotlib diff --git a/pkgs/development/python-modules/shared/default.nix b/pkgs/development/python-modules/shared/default.nix index 8cb21e107292..16a5510d0872 100644 --- a/pkgs/development/python-modules/shared/default.nix +++ b/pkgs/development/python-modules/shared/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchFromGitHub, + fetchPypi, kvf, paradict, probed, @@ -10,14 +10,12 @@ buildPythonPackage (finalAttrs: { pname = "shared"; - version = "0.0.9"; + version = "0.0.32"; pyproject = true; - src = fetchFromGitHub { - owner = "pyrustic"; - repo = "shared"; - tag = "v${finalAttrs.version}"; - hash = "sha256-roczP6WxpZ1AHjaD7XyjxYgb7hsP8a7hC6A3SYPNobQ="; + src = fetchPypi { + inherit (finalAttrs) pname version; + hash = "sha256-cwityVwNqxTQyZY1zYBJ0fAEzH/vc5bT/kcyPDTsWMY="; }; build-system = [ setuptools ]; @@ -36,7 +34,6 @@ buildPythonPackage (finalAttrs: { meta = { description = "Data exchange and persistence based on human-readable files"; homepage = "https://github.com/pyrustic/shared"; - changelog = "https://github.com/pyrustic/shared/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/shinychat/default.nix b/pkgs/development/python-modules/shinychat/default.nix index 8239e37249f6..d80ce48d543a 100644 --- a/pkgs/development/python-modules/shinychat/default.nix +++ b/pkgs/development/python-modules/shinychat/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "shinychat"; - version = "0.2.8"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { owner = "posit-dev"; repo = "shinychat"; - tag = "py/v${version}"; - hash = "sha256-thdLaZ+rnD8yumxhjXOLhufcSBD0oNKOWSxxDdJ9tNU="; + tag = "r/v${version}"; + hash = "sha256-d+wcZuokZ8uH/z/IthH6h2SDD81NJg1cn6+jwYwfcxE="; }; build-system = [ diff --git a/pkgs/development/python-modules/shtab/default.nix b/pkgs/development/python-modules/shtab/default.nix index 4aab5ed488bf..a86309e923d2 100644 --- a/pkgs/development/python-modules/shtab/default.nix +++ b/pkgs/development/python-modules/shtab/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, pytest-timeout, pytestCheckHook, pytest-cov-stub, @@ -13,24 +12,16 @@ buildPythonPackage rec { pname = "shtab"; - version = "1.7.2"; + version = "1.8.0"; pyproject = true; src = fetchFromGitHub { owner = "iterative"; repo = "shtab"; tag = "v${version}"; - hash = "sha256-ngTAST+6lBek0PHvULmlJZAHVU49YN5+XAu5KEk6cIM="; + hash = "sha256-VK3+JLb9Lh+YHixMa1Hjm5bYJ9vSmMPIkN6c3DeHDo8="; }; - 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 diff --git a/pkgs/development/python-modules/sigstore-models/default.nix b/pkgs/development/python-modules/sigstore-models/default.nix index 112fc565d008..12b67f761300 100644 --- a/pkgs/development/python-modules/sigstore-models/default.nix +++ b/pkgs/development/python-modules/sigstore-models/default.nix @@ -20,6 +20,11 @@ buildPythonPackage (finalAttrs: { hash = "sha256-XuCTS5rADDaCVRZprgEtJVUdGWX3ORij7kXPn87y+m4="; }; + postPatch = '' + substituteInPlace pyproject.toml --replace-fail \ + "uv_build>=0.9.0,<0.10" "uv_build" + ''; + build-system = [ uv-build ]; dependencies = [ diff --git a/pkgs/development/python-modules/simple-salesforce/default.nix b/pkgs/development/python-modules/simple-salesforce/default.nix index 6f4286c7064b..846d4da8cb19 100644 --- a/pkgs/development/python-modules/simple-salesforce/default.nix +++ b/pkgs/development/python-modules/simple-salesforce/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "simple-salesforce"; - version = "1.12.6"; + version = "1.12.9"; pyproject = true; src = fetchFromGitHub { owner = "simple-salesforce"; repo = "simple-salesforce"; tag = "v${version}"; - hash = "sha256-nrfIyXftS2X2HuuLFRZpWLz/IbRasqUzv+r/HvhxfAw="; + hash = "sha256-eMO/K6W9ROljYxR3gK9QjCHdlbAuN4DYjOyTO1WcalQ="; }; nativeBuildInputs = [ setuptools ]; @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = { description = "Very simple Salesforce.com REST API client for Python"; homepage = "https://github.com/simple-salesforce/simple-salesforce"; - changelog = "https://github.com/simple-salesforce/simple-salesforce/blob/v${version}/CHANGES"; + changelog = "https://github.com/simple-salesforce/simple-salesforce/blob/${src.tag}/CHANGES"; license = lib.licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index a19b177b0f65..dd64f16ead8b 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "sip"; - version = "6.12.0"; + version = "6.15.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-CDztlPhTFUkyMRGaY5cLK6QrHTizjnMKcOAqmRkaicY="; + hash = "sha256-3C5YwXmKdOGzHCjoNzOYIv6PpVKIrjDomG6ygQDrylo="; }; build-system = [ diff --git a/pkgs/development/python-modules/sipyco/default.nix b/pkgs/development/python-modules/sipyco/default.nix index dc550eb3fa6a..1f1e23f24d23 100644 --- a/pkgs/development/python-modules/sipyco/default.nix +++ b/pkgs/development/python-modules/sipyco/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "sipyco"; - version = "1.8"; + version = "1.10"; pyproject = true; src = fetchFromGitHub { owner = "m-labs"; repo = "sipyco"; tag = "v${version}"; - hash = "sha256-PPnAyDedUQ7Og/Cby9x5OT9wMkNGTP8GS53V6N/dk4w="; + hash = "sha256-DkcgZ0K6lsxzBWc31GTyufuSOpcorVv5OsZLHphHBtg="; }; build-system = [ setuptools ]; @@ -33,7 +33,7 @@ buildPythonPackage rec { description = "Simple Python Communications - used by the ARTIQ experimental control package"; mainProgram = "sipyco_rpctool"; homepage = "https://github.com/m-labs/sipyco"; - changelog = "https://github.com/m-labs/sipyco/releases/tag/v${version}"; + changelog = "https://github.com/m-labs/sipyco/releases/tag/${src.tag}"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ charlesbaynham ]; }; diff --git a/pkgs/development/python-modules/sismic/default.nix b/pkgs/development/python-modules/sismic/default.nix index 7dc0507c98ce..12417193fbbf 100644 --- a/pkgs/development/python-modules/sismic/default.nix +++ b/pkgs/development/python-modules/sismic/default.nix @@ -11,7 +11,7 @@ }: let - version = "1.6.10"; + version = "1.6.11"; in buildPythonPackage rec { pname = "sismic"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "AlexandreDecan"; repo = "sismic"; tag = version; - hash = "sha256-FUjOn2b4nhHf2DfYbY+wsRMaVEG90nPgLlNbNTiq3fQ="; + hash = "sha256-MD8SN3xPY1YtonogVasZZoHLADm1GU5AARSFY7ZwVPU="; }; pythonRelaxDeps = [ "behave" ]; diff --git a/pkgs/development/python-modules/skia-pathops/default.nix b/pkgs/development/python-modules/skia-pathops/default.nix index 265fc0144153..275f8814a9cb 100644 --- a/pkgs/development/python-modules/skia-pathops/default.nix +++ b/pkgs/development/python-modules/skia-pathops/default.nix @@ -16,14 +16,13 @@ buildPythonPackage rec { pname = "skia-pathops"; - version = "0.8.0.post2"; + version = "0.9.1"; pyproject = true; src = fetchPypi { pname = "skia_pathops"; inherit version; - extension = "zip"; - hash = "sha256-niUs3rbE0WLoKYbTHb2JxnXRZ3y4AZwuE+YpXUpVcmk="; + hash = "sha256-8Sc+9NojVw8z5253U5CEhOWkokaPexCJ+REMzuYpP5k="; }; postPatch = '' diff --git a/pkgs/development/python-modules/skidl/default.nix b/pkgs/development/python-modules/skidl/default.nix index 42cafe925864..eb86ee96dda7 100644 --- a/pkgs/development/python-modules/skidl/default.nix +++ b/pkgs/development/python-modules/skidl/default.nix @@ -10,14 +10,14 @@ }: buildPythonPackage rec { pname = "skidl"; - version = "2.0.1"; + version = "2.2.1"; format = "setuptools"; src = fetchFromGitHub { owner = "devbisme"; repo = "skidl"; - tag = version; - sha256 = "sha256-EzKtXdQFB6kjaIuCYAsyFPlwmkefb5RJcnpFYCVHHb8="; + tag = "v${version}"; + sha256 = "sha256-7rauFhaLXyZ5SGtEF7qoAbrj/VgP4qpl+BWUeERefb4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index bae7550aefa2..9801616ac5a8 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "skorch"; - version = "1.1.0"; + version = "1.3.1"; pyproject = true; src = fetchFromGitHub { owner = "skorch-dev"; repo = "skorch"; tag = "v${version}"; - sha256 = "sha256-f0g/kn3HhvYfGDgLpA7gAnYocJrYqHUq680KrGuoPCQ="; + sha256 = "sha256-7cCtrLy80LUlo+og7F98bexDcLim3lY/MVa7HHYlsfE="; }; # AttributeError: 'NoneType' object has no attribute 'span' with Python 3.13 diff --git a/pkgs/development/python-modules/slh-dsa/default.nix b/pkgs/development/python-modules/slh-dsa/default.nix index 2dcdf18ae02e..e6da84504c60 100644 --- a/pkgs/development/python-modules/slh-dsa/default.nix +++ b/pkgs/development/python-modules/slh-dsa/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "slh-dsa"; - version = "0.1.3"; + version = "0.2.0"; pyproject = true; src = fetchPypi { pname = "slh_dsa"; inherit version; - hash = "sha256-0OtjlI/w3F0OWu+fsQI9M3lIQY0Nx48YbvoGcQ0AJ1Y="; + hash = "sha256-p4eWMVayOFiEjFtlnsmmtH6HMfcIeYIpgdfjuB4mmAY="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/smart-open/default.nix b/pkgs/development/python-modules/smart-open/default.nix index 6ab4f547b5e2..29cf71efd35f 100644 --- a/pkgs/development/python-modules/smart-open/default.nix +++ b/pkgs/development/python-modules/smart-open/default.nix @@ -1,5 +1,6 @@ { lib, + backports-zstd, buildPythonPackage, fetchFromGitHub, awscli2, @@ -13,25 +14,26 @@ numpy, paramiko, pytest-cov-stub, + pytest-timeout, + pytest-xdist, pytestCheckHook, pyopenssl, responses, setuptools, setuptools-scm, wrapt, - zstandard, }: buildPythonPackage rec { pname = "smart-open"; - version = "7.3.1"; + version = "7.5.0"; pyproject = true; src = fetchFromGitHub { owner = "RaRe-Technologies"; repo = "smart_open"; tag = "v${version}"; - hash = "sha256-yrJmcwCVjPnkP8931xdb5fsOteBd+d/xEkg1/xahio8="; + hash = "sha256-MKQvvz75PBUZwQ9e/vR+XGdaT+pD2agZtdHOV0Gw9Kk="; }; build-system = [ @@ -52,7 +54,7 @@ buildPythonPackage rec { http = [ requests ]; webhdfs = [ requests ]; ssh = [ paramiko ]; - zst = [ zstandard ]; + zst = [ backports-zstd ]; }; pythonImportsCheck = [ "smart_open" ]; @@ -62,6 +64,8 @@ buildPythonPackage rec { moto numpy pytest-cov-stub + pytest-timeout + pytest-xdist pytestCheckHook pyopenssl responses diff --git a/pkgs/development/python-modules/smolagents/default.nix b/pkgs/development/python-modules/smolagents/default.nix index 782a446b7ebe..bdedea81f625 100644 --- a/pkgs/development/python-modules/smolagents/default.nix +++ b/pkgs/development/python-modules/smolagents/default.nix @@ -54,14 +54,14 @@ buildPythonPackage (finalAttrs: { pname = "smolagents"; - version = "1.23.0"; + version = "1.24.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "smolagents"; tag = "v${finalAttrs.version}"; - hash = "sha256-X9tJfNxF2icULyma0dWIQEllY9oKaCB+MQ4JJTdzhz4="; + hash = "sha256-I+I7XVnYGKuATP4MIN99vx6qvDhIwcn2x25GhDIg0u0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/smpclient/default.nix b/pkgs/development/python-modules/smpclient/default.nix index 1ade72dcb2dd..bf9b5569426e 100644 --- a/pkgs/development/python-modules/smpclient/default.nix +++ b/pkgs/development/python-modules/smpclient/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "smpclient"; - version = "5.1.0"; + version = "6.0.0"; pyproject = true; src = fetchFromGitHub { owner = "intercreate"; repo = "smpclient"; tag = version; - hash = "sha256-/prS2w14yTT2t/CKDAVimh6lyXx4wRT3wQ1d18dhpSo="; + hash = "sha256-1FyrJivP+sOKXVFuH5NbvIlOTOkuiUO3uIRasH8D+d8="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index 90fc474f9cb6..ae54d7cacaf9 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "3.16.0"; + version = "4.2.0"; pyproject = true; src = fetchFromGitHub { owner = "snowflakedb"; repo = "snowflake-connector-python"; tag = "v${version}"; - hash = "sha256-mow8TxmkeaMkgPTLUpx5Gucn4347gohHPyiBYjI/cDs="; + hash = "sha256-u2DIgW0W9oXSif2lIDqhlIopaXzQRS0x6tyHiYPGFLM="; }; build-system = [ diff --git a/pkgs/development/python-modules/snowflake-core/default.nix b/pkgs/development/python-modules/snowflake-core/default.nix index 17f6623df038..a02ea3d24bfe 100644 --- a/pkgs/development/python-modules/snowflake-core/default.nix +++ b/pkgs/development/python-modules/snowflake-core/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "snowflake-core"; - version = "1.8.0"; + version = "1.11.0"; pyproject = true; src = fetchPypi { pname = "snowflake_core"; inherit version; - hash = "sha256-ltbyxhpEvHLvoinDqM7y9KXU4sdWsA4BggyBR1M6i+w="; + hash = "sha256-qNwgnEXUE8P+DrGpOb32R6BapNkWwEJBbeljYYhVU5I="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix index 7788cf781a75..f8235a01f864 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.7"; + version = "1.8.2"; pyproject = true; src = fetchFromGitHub { owner = "snowflakedb"; repo = "snowflake-sqlalchemy"; tag = "v${version}"; - hash = "sha256-2JZVG2du6ANzRSfWgzVceQxhwn8tYt9L6vMv2eUlPzM="; + hash = "sha256-HxETZOHGfVcjopnoi8h37qanJa4pbjAmBk08u7HLRvA="; }; 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 b19c2fe6444e..63ed36998d90 100644 --- a/pkgs/development/python-modules/social-auth-app-django/default.nix +++ b/pkgs/development/python-modules/social-auth-app-django/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "social-auth-app-django"; - version = "5.5.1"; + version = "5.7.0"; pyproject = true; src = fetchFromGitHub { owner = "python-social-auth"; repo = "social-app-django"; tag = version; - hash = "sha256-XS7Uj0h2kb+NfO/9S5DAwZ+6LSjqeNslLwNbbVZmkTw="; + hash = "sha256-iR94psgqFeZEGcS/L/W66H8nCNNKKu+hxOUGC93N8Do="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/social-auth-core/default.nix b/pkgs/development/python-modules/social-auth-core/default.nix index c58248144707..e628f02be604 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-cov-stub, pytest-xdist, pytestCheckHook, python-jose, @@ -22,14 +23,14 @@ buildPythonPackage rec { pname = "social-auth-core"; - version = "4.7.0"; + version = "4.8.3"; pyproject = true; src = fetchFromGitHub { owner = "python-social-auth"; repo = "social-core"; tag = version; - hash = "sha256-PQPnLTTCAUE1UmaDRmEXLozY0607e2/fLsvzcJzo4bQ="; + hash = "sha256-8UDJfn1NDNHM8PBTV6n18GFSmOUqXo8UGbrJLFfLlnY="; }; nativeBuildInputs = [ setuptools ]; @@ -54,6 +55,7 @@ buildPythonPackage rec { }; nativeCheckInputs = [ + pytest-cov-stub pytest-xdist pytestCheckHook httpretty diff --git a/pkgs/development/python-modules/solc-select/default.nix b/pkgs/development/python-modules/solc-select/default.nix index e740fc0350b3..c93b89c43edf 100644 --- a/pkgs/development/python-modules/solc-select/default.nix +++ b/pkgs/development/python-modules/solc-select/default.nix @@ -5,18 +5,19 @@ setuptools, packaging, pycryptodome, + requests, }: buildPythonPackage rec { pname = "solc-select"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "crytic"; repo = "solc-select"; - tag = "v${version}"; - hash = "sha256-ZB9WM6YTWEqfs5y1DqxbSADiFw997PHIR9uVSjJg1/E="; + tag = "v.${version}"; + hash = "sha256-pPDiP8GNE/KAFS4Jm6jLpKozktxy70+f00QFUa4wMiQ="; }; build-system = [ setuptools ]; @@ -24,6 +25,7 @@ buildPythonPackage rec { dependencies = [ packaging pycryptodome + requests ]; # no tests diff --git a/pkgs/development/python-modules/solidpython2/default.nix b/pkgs/development/python-modules/solidpython2/default.nix index 893b339a6794..6b59ba0eb0e2 100644 --- a/pkgs/development/python-modules/solidpython2/default.nix +++ b/pkgs/development/python-modules/solidpython2/default.nix @@ -10,13 +10,13 @@ }: buildPythonPackage rec { pname = "solidpython2"; - version = "2.1.0"; + version = "2.1.3"; pyproject = true; src = fetchFromGitHub { owner = "jeff-dh"; repo = "SolidPython"; - rev = "v${version}"; - hash = "sha256-Tq3hrsC2MmueCqChk6mY/u/pCjF/pFuU2o3K+qw7ImY="; + tag = "v${version}"; + hash = "sha256-3A1vYqIHFUiOH2cEx/XSOien3PmNpMAhLOe3T1yubx4="; }; # NOTE: this patch makes tests runnable outside the source-tree diff --git a/pkgs/development/python-modules/soundcloud-v2/default.nix b/pkgs/development/python-modules/soundcloud-v2/default.nix index 7fccdfc6fb58..7f8b316609a5 100644 --- a/pkgs/development/python-modules/soundcloud-v2/default.nix +++ b/pkgs/development/python-modules/soundcloud-v2/default.nix @@ -1,26 +1,28 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, dacite, python-dateutil, requests, setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "soundcloud-v2"; - version = "1.6.0"; + version = "1.6.1"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-RiUTFGwP/J7HKcHGFvT3Kw3NM/gUeMZCB/Jl8HLngkM="; + src = fetchFromGitHub { + owner = "7x11x13"; + repo = "soundcloud.py"; + tag = "v${finalAttrs.version}"; + hash = "sha256-xx5F5xscPCbuN7T03zL5V9LLrTbpJnTF4lmUVEqBJA4="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ dacite python-dateutil requests @@ -37,4 +39,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix index 8481f75272eb..4a7e62dee817 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.2"; + version = "0.5.3"; pyproject = true; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-xjTVG9TpItbw+l4al1zIl8lH9h0x2p95un6jTf9Ei0k="; + hash = "sha256-y6wrYBmPurhFM2l+fEkEzIlexp1fs5c1VsnrdKRimyw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/soupsieve/default.nix b/pkgs/development/python-modules/soupsieve/default.nix index 464a6c0ea9ec..9074261f5cfa 100644 --- a/pkgs/development/python-modules/soupsieve/default.nix +++ b/pkgs/development/python-modules/soupsieve/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "soupsieve"; - version = "2.7"; + version = "2.8.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-rSgvm2kmKG0urUdQVSyKYUK8THg/1msCk1R8j+auEmo="; + hash = "sha256-Mmfx7upCUftCcott+3Ru3JrK/8SkWyfhlFC2dlhug0k="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix index da684cda3b97..df5f14130a5c 100644 --- a/pkgs/development/python-modules/spglib/default.nix +++ b/pkgs/development/python-modules/spglib/default.nix @@ -5,10 +5,11 @@ pythonOlder, # build-system + cmake, scikit-build-core, numpy, - cmake, ninja, + pybind11, setuptools-scm, # dependencies @@ -21,20 +22,21 @@ buildPythonPackage rec { pname = "spglib"; - version = "2.6.0"; + version = "2.7.0"; pyproject = true; src = fetchFromGitHub { owner = "spglib"; repo = "spglib"; tag = "v${version}"; - hash = "sha256-rmQYFFfpyUhT9pfQZk1fN5tZWTg40wwtszhPhiZpXs4="; + hash = "sha256-RFvd/j/14YRIcQTpnYPx5edeF3zbHbi90jb32i3ZU/c="; }; build-system = [ + cmake scikit-build-core numpy - cmake + pybind11 ninja setuptools-scm ]; @@ -58,7 +60,7 @@ buildPythonPackage rec { meta = { description = "Python bindings for C library for finding and handling crystal symmetries"; homepage = "https://spglib.github.io/spglib/"; - changelog = "https://github.com/spglib/spglib/raw/v${version}/ChangeLog"; + changelog = "https://github.com/spglib/spglib/raw/${src.tag}/ChangeLog"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix index dd4a5debced6..cd5c63625d9c 100644 --- a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix +++ b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix @@ -10,7 +10,7 @@ let pname = "sphinx-autodoc-typehints"; - version = "3.5.2"; + version = "3.6.2"; in buildPythonPackage { @@ -20,9 +20,15 @@ buildPythonPackage { src = fetchPypi { pname = "sphinx_autodoc_typehints"; inherit version; - hash = "sha256-X81KPreqiUJMHi4yvtymbtw4NnVpyRaagPSz6TQXH9s="; + hash = "sha256-PTdwmiG3t2WtbiCgTs78sim56wAHyyT266qKRXbqfwY="; }; + postPatch = '' + # https://github.com/tox-dev/sphinx-autodoc-typehints/issues/586 + substituteInPlace src/sphinx_autodoc_typehints/__init__.py \ + --replace-fail "sphinx.ext.autodoc.mock" "sphinx.ext.autodoc._dynamic._mock" + ''; + pythonRelaxDeps = [ "sphinx" ]; build-system = [ diff --git a/pkgs/development/python-modules/sphinx-better-theme/default.nix b/pkgs/development/python-modules/sphinx-better-theme/default.nix index 02f999b616f0..579cd77df537 100644 --- a/pkgs/development/python-modules/sphinx-better-theme/default.nix +++ b/pkgs/development/python-modules/sphinx-better-theme/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "sphinx-better-theme"; - version = "0.1.5"; + version = "0.13"; format = "setuptools"; outputs = [ "out" @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "irskep"; repo = "sphinx-better-theme"; - rev = "v${version}"; - sha256 = "07lhfmsjcfzcchsjzh6kxdq5s47j2a6lb5wv3m1kmv2hcm3gvddh"; + tag = "v${version}"; + sha256 = "sha256-eFA1U2jMeOH7xabonYg/bV6eTAFBew6+WaK2uKWlsUc="; }; nativeBuildInputs = [ sphinxHook ]; diff --git a/pkgs/development/python-modules/sphinx-design/default.nix b/pkgs/development/python-modules/sphinx-design/default.nix index 76c2186f13f7..20b0c3cdf939 100644 --- a/pkgs/development/python-modules/sphinx-design/default.nix +++ b/pkgs/development/python-modules/sphinx-design/default.nix @@ -1,34 +1,66 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + pythonOlder, + + # build-system flit-core, + + # dependencies sphinx, + + # optional-dependencies + furo, + pydata-sphinx-theme, + sphinx-rtd-theme, + sphinx-book-theme, + + # tests + defusedxml, + pytest-regressions, + pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sphinx-design"; version = "0.7.0"; - pyproject = true; - src = fetchPypi { - inherit version; - pname = "sphinx_design"; - hash = "sha256-0qP1sZwkuRattS+XxfAO+rQAnKM3gSABEJCEp0Dsm3o="; + src = fetchFromGitHub { + owner = "executablebooks"; + repo = "sphinx-design"; + tag = "v${finalAttrs.version}"; + hash = "sha256-NlAAIw8X2gW2ejeSHcFrxj7Jl6OgnpZIXPK16yzxxRQ="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ sphinx ]; + dependencies = [ sphinx ]; + + optional-dependencies = { + theme-furo = [ furo ]; + theme-pydata = [ pydata-sphinx-theme ]; + theme-rtd = [ sphinx-rtd-theme ]; + theme-sbt = [ sphinx-book-theme ]; + # TODO: theme-im = [ sphinx-immaterial ]; + }; + + pythonRelaxDeps = [ "sphinx" ]; + + nativeCheckInputs = [ + defusedxml + pytest-regressions + pytestCheckHook + ]; pythonImportsCheck = [ "sphinx_design" ]; meta = { description = "Sphinx extension for designing beautiful, view size responsive web components"; homepage = "https://github.com/executablebooks/sphinx-design"; - changelog = "https://github.com/executablebooks/sphinx-design/releases/tag/v${version}"; + changelog = "https://github.com/executablebooks/sphinx-design/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/sphinx-external-toc/default.nix b/pkgs/development/python-modules/sphinx-external-toc/default.nix index e32f0584494e..5fd663671b10 100644 --- a/pkgs/development/python-modules/sphinx-external-toc/default.nix +++ b/pkgs/development/python-modules/sphinx-external-toc/default.nix @@ -6,18 +6,19 @@ click, pyyaml, sphinx, + sphinx-multitoc-numbering, }: buildPythonPackage rec { pname = "sphinx-external-toc"; - version = "1.0.1"; + version = "1.1.0"; pyproject = true; src = fetchPypi { inherit version; pname = "sphinx_external_toc"; - hash = "sha256-p9LGPMR+xohUZEOyi8TvRmEhgn7z3Hu1Cd41S61OouA="; + hash = "sha256-+BgzhlAG9rSpslUKJHSm49fn8ssjuiMwkmBXfqZVUvY="; }; nativeBuildInputs = [ flit-core ]; @@ -26,6 +27,7 @@ buildPythonPackage rec { click pyyaml sphinx + sphinx-multitoc-numbering ]; pythonImportsCheck = [ "sphinx_external_toc" ]; diff --git a/pkgs/development/python-modules/sphinx-hoverxref/default.nix b/pkgs/development/python-modules/sphinx-hoverxref/default.nix deleted file mode 100644 index a476099165d4..000000000000 --- a/pkgs/development/python-modules/sphinx-hoverxref/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - flit-core, - # documentation build dependencies - sphinxHook, - sphinx-notfound-page, - sphinx-prompt, - sphinx-rtd-theme, - sphinx-tabs, - sphinx-version-warning, - sphinx-autoapi, - sphinxcontrib-bibtex, - sphinxemoji, - # runtime dependencies - sphinx, - sphinxcontrib-jquery, -}: - -buildPythonPackage rec { - pname = "sphinx-hoverxref"; - version = "1.5.0"; - pyproject = true; - - outputs = [ - "out" - "doc" - ]; - - src = fetchFromGitHub { - owner = "readthedocs"; - repo = "sphinx-hoverxref"; - rev = version; - hash = "sha256-JHNJGUkO/HXnnnROYBd1pAcoAEYo6b7eK4tyC+ujc+A="; - }; - - postPatch = '' - substituteInPlace docs/conf.py --replace-fail "sphinx-prompt" "sphinx_prompt" - ''; - - build-system = [ - flit-core - ]; - - nativeBuildInputs = [ - sphinxHook - sphinx-autoapi - sphinx-rtd-theme - sphinx-tabs - sphinx-prompt - sphinx-version-warning - sphinx-notfound-page - sphinxcontrib-bibtex - sphinxemoji - ]; - - dependencies = [ - sphinx - sphinxcontrib-jquery - ]; - - pythonImportsCheck = [ "hoverxref" ]; - - meta = { - description = "Sphinx extension for creating tooltips on the cross references of the documentation"; - longDescription = '' - sphinx-hoverxref is a Sphinx extension to show a floating window - (tooltips or modal dialogues) on the cross references of the - documentation embedding the content of the linked section on them. - - With sphinx-hoverxref, you don’t need to click a link to see what’s - in there. - ''; - homepage = "https://github.com/readthedocs/sphinx-hoverxref"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ kaction ]; - }; -} diff --git a/pkgs/development/python-modules/sphinx-inline-tabs/default.nix b/pkgs/development/python-modules/sphinx-inline-tabs/default.nix index 1554ba4c6544..9d8b9d51e89b 100644 --- a/pkgs/development/python-modules/sphinx-inline-tabs/default.nix +++ b/pkgs/development/python-modules/sphinx-inline-tabs/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "sphinx-inline-tabs"; - version = "2023.04.21"; + version = "2025.12.21.14"; pyproject = true; src = fetchFromGitHub { owner = "pradyunsg"; repo = "sphinx-inline-tabs"; - rev = version; - hash = "sha256-1oZheHDNOQU0vWL3YClQrJe94WyUJ72bCAF1UKtjJ0w="; + tag = version; + hash = "sha256-aHsTdCVu/e9uaM4ayOfY3IBjjivZwDiHoWA0W2vyvNA="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/sphinx-issues/default.nix b/pkgs/development/python-modules/sphinx-issues/default.nix index c56115ae1de9..fb2b81409688 100644 --- a/pkgs/development/python-modules/sphinx-issues/default.nix +++ b/pkgs/development/python-modules/sphinx-issues/default.nix @@ -1,24 +1,35 @@ { lib, buildPythonPackage, - sphinx, fetchFromGitHub, + flit-core, + pytestCheckHook, + sphinx, }: buildPythonPackage rec { pname = "sphinx-issues"; - version = "3.0.1"; - format = "setuptools"; + version = "5.0.1"; + pyproject = true; src = fetchFromGitHub { owner = "sloria"; repo = "sphinx-issues"; - rev = version; - sha256 = "1lns6isq9kwcw8z4jwgy927f7idx9srvri5adaa5zmypw5x47hha"; + tag = version; + hash = "sha256-/nc5gtZbE1ziMPWIkZTkevMfVkNtJYL/b5QLDeMhzUs="; }; - pythonImportsCheck = [ "sphinx_issues" ]; + postPatch = '' + substituteInPlace tests/test_sphinx_issues.py \ + --replace-fail 'Path(sys.executable).parent.joinpath("sphinx-build")' '"${lib.getExe' sphinx "sphinx-build"}"' + ''; - propagatedBuildInputs = [ sphinx ]; + build-system = [ flit-core ]; + + dependencies = [ sphinx ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "sphinx_issues" ]; meta = { homepage = "https://github.com/sloria/sphinx-issues"; diff --git a/pkgs/development/python-modules/sphinx-markdown-builder/default.nix b/pkgs/development/python-modules/sphinx-markdown-builder/default.nix index 9238b0c5c38b..ca5ea53928cd 100644 --- a/pkgs/development/python-modules/sphinx-markdown-builder/default.nix +++ b/pkgs/development/python-modules/sphinx-markdown-builder/default.nix @@ -33,14 +33,14 @@ buildPythonPackage rec { pname = "sphinx-markdown-builder"; - version = "0.6.8"; + version = "0.6.9"; pyproject = true; src = fetchFromGitHub { owner = "liran-funaro"; repo = "sphinx-markdown-builder"; tag = version; - hash = "sha256-dPMOOG3myh9i2ez9uhasqLnlV0BEsE9CHEbZ57VWzAo="; + hash = "sha256-DTc+yVFOGLXFyrgkwfgY3X60chyU3UDs0GwuPCzff28="; }; patches = [ diff --git a/pkgs/development/python-modules/sphinx-prompt/default.nix b/pkgs/development/python-modules/sphinx-prompt/default.nix index 7aaa75e139b9..25f1ef9c4b0d 100644 --- a/pkgs/development/python-modules/sphinx-prompt/default.nix +++ b/pkgs/development/python-modules/sphinx-prompt/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "sphinx-prompt"; - version = "1.10.0"; + version = "1.10.2"; pyproject = true; src = fetchFromGitHub { owner = "sbrunner"; repo = "sphinx-prompt"; tag = version; - hash = "sha256-JKCTn2YkdyGLvchMT9C61PxjYxuQFzt3SjCE9JvgtVc="; + hash = "sha256-ut1g4Clq8mVUYwCe0XMt4GIXUJ4Hy7k8DjWbR7GJ8Bg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sphinx-pytest/default.nix b/pkgs/development/python-modules/sphinx-pytest/default.nix index b94d899ac837..5742a61f6f22 100644 --- a/pkgs/development/python-modules/sphinx-pytest/default.nix +++ b/pkgs/development/python-modules/sphinx-pytest/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "sphinx-pytest"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { owner = "chrisjsewell"; repo = "sphinx-pytest"; tag = "v${version}"; - hash = "sha256-oSBBt+hSMs4mvGqibQHoYHXr2j/bpsGOnIMfwfTfWKQ="; + hash = "sha256-z71IrUr3e2oAPeZMjUBwMwy2SkoAA3oxtK4+iR9vLEc="; }; nativeBuildInputs = [ flit-core ]; @@ -34,8 +34,13 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # https://github.com/sphinx-extensions2/sphinx-pytest/issues/28 + "test_no_transforms" + ]; + meta = { - changelog = "https://github.com/sphinx-extensions2/sphinx-pytest/releases/tag/v${version}"; + changelog = "https://github.com/sphinx-extensions2/sphinx-pytest/releases/tag/${src.tag}"; description = "Helpful pytest fixtures for Sphinx extensions"; homepage = "https://github.com/chrisjsewell/sphinx-pytest"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/sphinx-rtd-theme/default.nix b/pkgs/development/python-modules/sphinx-rtd-theme/default.nix index 791f0b691d98..ee2301acb08c 100644 --- a/pkgs/development/python-modules/sphinx-rtd-theme/default.nix +++ b/pkgs/development/python-modules/sphinx-rtd-theme/default.nix @@ -2,38 +2,46 @@ lib, buildPythonPackage, fetchPypi, + setuptools, docutils, sphinx, - readthedocs-sphinx-ext, sphinxcontrib-jquery, pytestCheckHook, }: buildPythonPackage rec { pname = "sphinx-rtd-theme"; - version = "3.0.2"; - format = "setuptools"; + version = "3.1.0"; + pyproject = true; src = fetchPypi { pname = "sphinx_rtd_theme"; inherit version; - hash = "sha256-t0V7wl3acjsgsIamcLmVPIWeq2CioD7o6yuyPhduX4U="; + hash = "sha256-tEJ28sJ26Qkjmk9slVqmZ6qv63hZeSOxxgurx223jkw="; }; + build-system = [ setuptools ]; + preBuild = '' # Don't use NPM to fetch assets. Assets are included in sdist. export CI=1 ''; - propagatedBuildInputs = [ + dependencies = [ docutils sphinx sphinxcontrib-jquery ]; + pythonRelaxDeps = [ + "docutils" + "sphinxcontrib-jquery" + # https://github.com/readthedocs/sphinx_rtd_theme/pull/1666 + "sphinx" + ]; + nativeCheckInputs = [ pytestCheckHook - readthedocs-sphinx-ext ]; disabledTests = [ @@ -41,11 +49,6 @@ buildPythonPackage rec { "test_basic" ]; - pythonRelaxDeps = [ - "docutils" - "sphinxcontrib-jquery" - ]; - pythonImportsCheck = [ "sphinx_rtd_theme" ]; meta = { diff --git a/pkgs/development/python-modules/sphinx-togglebutton/default.nix b/pkgs/development/python-modules/sphinx-togglebutton/default.nix index 1b199aa4e982..99f177604e85 100644 --- a/pkgs/development/python-modules/sphinx-togglebutton/default.nix +++ b/pkgs/development/python-modules/sphinx-togglebutton/default.nix @@ -10,12 +10,13 @@ buildPythonPackage rec { pname = "sphinx-togglebutton"; - version = "0.3.2"; + version = "0.4.4"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-qwyLNmQnsB5MiYAtXQeEcsQn+m6dEtUhw0+gRCVZ3Ho="; + inherit version; + pname = "sphinx_togglebutton"; + hash = "sha256-BMMyaS/V9TY60CoAHmkzaXZ9bB8OWCeXcKKutXG0cqE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinx-toolbox/default.nix b/pkgs/development/python-modules/sphinx-toolbox/default.nix index 6635261717a8..f09dc61e58b3 100644 --- a/pkgs/development/python-modules/sphinx-toolbox/default.nix +++ b/pkgs/development/python-modules/sphinx-toolbox/default.nix @@ -21,13 +21,13 @@ }: buildPythonPackage rec { pname = "sphinx-toolbox"; - version = "4.0.0"; + version = "4.1.2"; pyproject = true; src = fetchPypi { inherit version; pname = "sphinx_toolbox"; - hash = "sha256-SMMUUdsuLYxxwDk55yoZ73vJLKeFCmLbY/x7uDlbZ4U="; + hash = "sha256-wwpPhsTCnpetsOuTN9NfUJPLlqRPScr/z31bxYqIt4E="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sphinx-version-warning/default.nix b/pkgs/development/python-modules/sphinx-version-warning/default.nix deleted file mode 100644 index faa4c72d6287..000000000000 --- a/pkgs/development/python-modules/sphinx-version-warning/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - fetchpatch, - setuptools, - sphinx, - sphinx-autoapi, - sphinx-prompt, - sphinx-rtd-theme, - sphinx-tabs, - sphinxemoji, - sphinxHook, -}: - -# Latest tagged release release "1.1.2" (Nov 2018) does not contain -# documentation, it was added in commits Aug 10, 2019. Repository does not have -# any activity since then. -buildPythonPackage { - pname = "sphinx-version-warning"; - version = "unstable-2019-08-10"; - pyproject = true; - - outputs = [ - "out" - "doc" - ]; - - postPatch = '' - substituteInPlace docs/conf.py --replace-fail "sphinx-prompt" "sphinx_prompt" - ''; - - src = fetchFromGitHub { - owner = "humitos"; - repo = "sphinx-version-warning"; - rev = "a82156c2ea08e5feab406514d0ccd9d48a345f48"; - hash = "sha256-WnJYMk1gPLT0dBn7lmxVDNVkLYkDCgQOtM9fQ3kc6k0="; - }; - - # It tries to write to file relative to it own location at runtime - # and gets permission denied, since Nix store is immutable. - patches = [ - (fetchpatch { - url = "https://github.com/humitos/sphinx-version-warning/commit/cb1b47becf2a0d3b2570ca9929f42f7d7e472b6f.patch"; - hash = "sha256-Vj0QAHIBmc0VxE+TTmJePzvr5nc45Sn2qqM+C/pkgtM="; - }) - ]; - - nativeBuildInputs = [ - sphinx-autoapi - sphinx-prompt - sphinx-rtd-theme - sphinx-tabs - sphinxemoji - sphinxHook - setuptools - ]; - - buildInputs = [ sphinx ]; - - pythonImportsCheck = [ "versionwarning" ]; - - meta = { - description = "Sphinx extension to show a warning banner at the top of your documentation"; - homepage = "https://github.com/humitos/sphinx-version-warning"; - changelog = "https://github.com/humitos/sphinx-version-warning/blob/master/CHANGELOG.rst"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ kaction ]; - }; -} diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 9ccb4eae1e6e..fb99c84de0bd 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, pythonAtLeast, + pythonOlder, fetchFromGitHub, isPyPy, @@ -17,7 +18,7 @@ packaging, pygments, requests, - roman-numerals-py, + roman-numerals, snowballstemmer, sphinxcontrib-applehelp, sphinxcontrib-devhelp, @@ -29,8 +30,6 @@ # check phase defusedxml, - filelock, - html5lib, pytestCheckHook, pytest-xdist, typing-extensions, @@ -42,9 +41,11 @@ buildPythonPackage rec { pname = "sphinx"; - version = "8.2.3"; + version = "9.1.0"; pyproject = true; + disabled = pythonOlder "3.12"; + src = fetchFromGitHub { owner = "sphinx-doc"; repo = "sphinx"; @@ -56,7 +57,7 @@ buildPythonPackage rec { mv tests/roots/test-images/{testimäge,testimæge}.png sed -i 's/testimäge/testimæge/g' tests/{test_build*.py,roots/test-images/index.rst} ''; - hash = "sha256-FoyCpDGDKNN2GMhE7gDpJLmWRWhbMCYlcVEaBTfXSEw="; + hash = "sha256-PgqjCeyHOhWtZjyzSZyvsPT0Q7yRyNDiW3x1fQq0K+8="; }; build-system = [ flit-core ]; @@ -70,7 +71,7 @@ buildPythonPackage rec { packaging pygments requests - roman-numerals-py + roman-numerals snowballstemmer sphinxcontrib-applehelp sphinxcontrib-devhelp @@ -86,8 +87,6 @@ buildPythonPackage rec { nativeCheckInputs = [ defusedxml - filelock - html5lib pytestCheckHook pytest-xdist typing-extensions diff --git a/pkgs/development/python-modules/sphinxcontrib-ditaa/default.nix b/pkgs/development/python-modules/sphinxcontrib-ditaa/default.nix index 18554a01e18e..8db338ac5614 100644 --- a/pkgs/development/python-modules/sphinxcontrib-ditaa/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-ditaa/default.nix @@ -9,12 +9,13 @@ buildPythonPackage rec { pname = "sphinxcontrib-ditaa"; - version = "1.0.2"; + version = "1.0.3"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-V/LhOwWbOP3olYC+ypFqxsp0VrLXBsPd6p3UiQ5fW9M="; + inherit version; + pname = "sphinxcontrib_ditaa"; + hash = "sha256-8O74Gyb4KxER/VlFQWwHKQQjiYNU1ch5n6eLneVHTCg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-mermaid/default.nix b/pkgs/development/python-modules/sphinxcontrib-mermaid/default.nix index 8c8679f3a17a..9b7011c5361a 100644 --- a/pkgs/development/python-modules/sphinxcontrib-mermaid/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-mermaid/default.nix @@ -9,13 +9,13 @@ }: buildPythonPackage rec { pname = "sphinxcontrib-mermaid"; - version = "1.2.3"; + version = "2.0.0"; pyproject = true; src = fetchPypi { inherit version; pname = "sphinxcontrib_mermaid"; - hash = "sha256-NYaZ0OySTvZ5tBhz2e3ZfQdzRG2vl2DHXhjcCt/ZE3E="; + hash = "sha256-z099RT0AETLqul0f31PUIEnwLpEyE8+DN0J0g7/KJvQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix index d52fdb65ad32..b802f80aef8f 100644 --- a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix @@ -9,12 +9,13 @@ buildPythonPackage rec { pname = "sphinxcontrib-plantuml"; - version = "0.30"; + version = "0.31"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-KhJmykO930RkCuRBBwA99EkN4rPDFUoNYnz7Y+mhab8="; + inherit version; + pname = "sphinxcontrib_plantuml"; + hash = "sha256-/XR1L46gcOZBw/ikAvzPodSkBW4JZ7VgM9KnYoLZ+VY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index ba52464aee85..8f6632c129db 100644 --- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "sphinxcontrib-spelling"; - version = "8.0.1"; + version = "8.0.2"; pyproject = true; src = fetchFromGitHub { owner = "sphinx-contrib"; repo = "spelling"; tag = version; - hash = "sha256-gN+FkgIzk7wG/ni+DzaeiePjCiK9k7Jrn2IUDgy8DOg="; + hash = "sha256-f9n3hp+d3UvfVt2KmhxYm80XsEnIx3EVkdrQJxWDxks="; }; nativeBuildInputs = [ @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = { description = "Sphinx spelling extension"; homepage = "https://github.com/sphinx-contrib/spelling"; - changelog = "https://github.com/sphinx-contrib/spelling/blob/${version}/docs/source/history.rst"; + changelog = "https://github.com/sphinx-contrib/spelling/blob/${src.tag}/docs/source/history.rst"; license = lib.licenses.bsd2; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/sphinxcontrib-svg2pdfconverter/default.nix b/pkgs/development/python-modules/sphinxcontrib-svg2pdfconverter/default.nix index 11a12dfdb2f3..1b9b31024ef1 100644 --- a/pkgs/development/python-modules/sphinxcontrib-svg2pdfconverter/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-svg2pdfconverter/default.nix @@ -17,13 +17,13 @@ assert (withCairosvg || withInkscape || withLibrsvg); buildPythonPackage rec { pname = "sphinxcontrib-svg2pdfconverter"; - version = "1.3.0"; + version = "2.0.0"; pyproject = true; src = fetchPypi { inherit version; pname = "sphinxcontrib_svg2pdfconverter"; - hash = "sha256-ZBGkzC9X7tlqDXu/oTn2jL55gwGIgeHm18RgU81pkR8="; + hash = "sha256-q5yPEIA5HiMYEtIKvyZXpp7jVXRWOxAUQU+VOWSpX6M="; }; # for enabled modules: provide the full path to the binary diff --git a/pkgs/development/python-modules/sphinxext-rediraffe/default.nix b/pkgs/development/python-modules/sphinxext-rediraffe/default.nix index 9e80cea5e725..77d4de2bf8da 100644 --- a/pkgs/development/python-modules/sphinxext-rediraffe/default.nix +++ b/pkgs/development/python-modules/sphinxext-rediraffe/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "sphinxext-rediraffe"; - version = "0.2.7"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { owner = "wpilibsuite"; repo = "sphinxext-rediraffe"; tag = "v${version}"; - hash = "sha256-g+GD1ApD26g6PwPOH/ir7aaEgH+n1QQYSr9QizYrmug="; + hash = "sha256-OW+MNQbPfJa8+jcpWZxTKD+EAv1gyo5tmcYAGba4u3c="; }; postPatch = '' @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = { description = "Sphinx extension to redirect files"; homepage = "https://github.com/wpilibsuite/sphinxext-rediraffe"; - changelog = "https://github.com/wpilibsuite/sphinxext-rediraffe/releases/tag/v${version}"; + changelog = "https://github.com/wpilibsuite/sphinxext-rediraffe/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = [ lib.maintainers.newam ]; }; diff --git a/pkgs/development/python-modules/spsdk/default.nix b/pkgs/development/python-modules/spsdk/default.nix index 177711a41367..2767a31d0702 100644 --- a/pkgs/development/python-modules/spsdk/default.nix +++ b/pkgs/development/python-modules/spsdk/default.nix @@ -50,14 +50,14 @@ buildPythonPackage rec { pname = "spsdk"; - version = "3.2.0"; + version = "3.6.0"; pyproject = true; src = fetchFromGitHub { owner = "nxp-mcuxpresso"; repo = "spsdk"; tag = "v${version}"; - hash = "sha256-unJpJjoS0C9TKsvk9/fQO8jiIOGbgfJopeXR5FcIq/g="; + hash = "sha256-eylowyX4ERXSYuhc/Gy4UEqRSG1GjmeRMJdR0mY5E9I="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix index 9a36dbb9d707..b168e4752788 100644 --- a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "sqlalchemy-continuum"; - version = "1.4.2"; + version = "1.5.2"; pyproject = true; src = fetchPypi { pname = "sqlalchemy_continuum"; inherit version; - hash = "sha256-D9K+efcY7aR8IgaHnZLsTr8YiTZGN7PK8+5dNL0ZyOM="; + hash = "sha256-JXHW62FWvIVir7OS/d3rS7MeRKH9HzeIy2Je/i9pbGM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 40c59e716df4..f3f8e36d3e29 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -43,14 +43,14 @@ buildPythonPackage rec { pname = "sqlalchemy"; - version = "2.0.45"; + version = "2.0.46"; pyproject = true; src = fetchFromGitHub { owner = "sqlalchemy"; repo = "sqlalchemy"; tag = "rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-ZAiRR456KkSdXkCiy+TXjdeOJwrLlmVxJfl1x8/XHIs="; + hash = "sha256-R0d8ipiaj7IL6mHV4c1Kyd6hV+kn5NhZexruRQsyL8c="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sqlcipher3/default.nix b/pkgs/development/python-modules/sqlcipher3/default.nix index ab7a0f063bb6..397b01d0e767 100644 --- a/pkgs/development/python-modules/sqlcipher3/default.nix +++ b/pkgs/development/python-modules/sqlcipher3/default.nix @@ -8,7 +8,7 @@ }: let pname = "sqlcipher3"; - version = "0.6.0"; + version = "0.6.2"; in buildPythonPackage { inherit pname version; @@ -16,7 +16,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-o1GuYwvWFMLBDtiYtCD3vIF+Q4FT9oP4g0jERdazqbE="; + hash = "sha256-orZ1KJuoiJ84liWiHzoB8f8VmlUbW4j7qP2S2g4COAo="; }; build-system = [ diff --git a/pkgs/development/python-modules/sqlframe/default.nix b/pkgs/development/python-modules/sqlframe/default.nix index d3306e2b2f66..998729853732 100644 --- a/pkgs/development/python-modules/sqlframe/default.nix +++ b/pkgs/development/python-modules/sqlframe/default.nix @@ -38,14 +38,14 @@ buildPythonPackage rec { pname = "sqlframe"; - version = "3.43.8"; + version = "3.46.2"; pyproject = true; src = fetchFromGitHub { owner = "eakmanrq"; repo = "sqlframe"; tag = "v${version}"; - hash = "sha256-gsWA3aBolsR2zPwseHnQXSJRngXUHFGvi55UPevgUHw="; + hash = "sha256-WTeJXiIkyj9FgO1w3P6JsCTtpGzezWnsiz/boB9PdIU="; }; build-system = [ setuptools-scm ]; @@ -97,6 +97,8 @@ buildPythonPackage rec { # duckdb.duckdb.CatalogException: Catalog Error: Table Function with name "dsdgen" is not in the catalog, but it exists in the tpcds extension. # "tests/integration/test_int_dataframe.py" "tests/integration/" + # AttributeError: module 'pyspark.sql.functions' has no attribute 'JVMView' + "tests/unit/*/test_activate.py" ]; meta = { diff --git a/pkgs/development/python-modules/sqlglot/default.nix b/pkgs/development/python-modules/sqlglot/default.nix index 969ba7fc18ec..9c1e78387ffc 100644 --- a/pkgs/development/python-modules/sqlglot/default.nix +++ b/pkgs/development/python-modules/sqlglot/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "sqlglot"; - version = "27.29.0"; + version = "28.9.0"; pyproject = true; src = fetchFromGitHub { repo = "sqlglot"; owner = "tobymao"; tag = "v${version}"; - hash = "sha256-kqtsZRtIIgQ0cTbhG5K4N+c3cq7I+Uvd+3s+b0CYLtg="; + hash = "sha256-2AmHKGAoDF8w9k8VN9d25Js3UiSh8YNqdGRHN7VqRpw="; }; build-system = [ @@ -51,7 +51,7 @@ buildPythonPackage rec { meta = { description = "No dependency Python SQL parser, transpiler, and optimizer"; homepage = "https://github.com/tobymao/sqlglot"; - changelog = "https://github.com/tobymao/sqlglot/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/tobymao/sqlglot/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ cpcloud ]; }; diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index ca66f824d0de..acc78be8aea7 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -7,6 +7,7 @@ python-dateutil, sqlite-fts4, tabulate, + pip, pluggy, pytestCheckHook, hypothesis, @@ -16,7 +17,7 @@ }: buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.38"; + version = "3.39"; pyproject = true; build-system = [ setuptools ]; @@ -24,16 +25,17 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "sqlite_utils"; - hash = "sha256-Gud7kxOEBSIFoVR41ClGT2xno6w7Tq/TxnSskA9iOqs="; + hash = "sha256-v6Lqwps+PrXJZHKDeXUn/rz079Spu7Mdl5oUoR75280="; }; dependencies = [ click click-default-group + pip + pluggy python-dateutil sqlite-fts4 tabulate - pluggy ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/sqlobject/default.nix b/pkgs/development/python-modules/sqlobject/default.nix index 542f40647f0d..f789b97a0eb2 100644 --- a/pkgs/development/python-modules/sqlobject/default.nix +++ b/pkgs/development/python-modules/sqlobject/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "sqlobject"; - version = "3.13.0"; + version = "3.13.1"; pyproject = true; src = fetchFromGitHub { owner = "sqlobject"; repo = "sqlobject"; tag = version; - hash = "sha256-KcpbGqNsR77kwbTLKwvwWpyLvF1UowIsKM7Kirs7Zw4="; + hash = "sha256-Qbb48z4DrD/M8e26+5NjPcA0b3gxHeAxj1X/jSrTwx0="; }; build-system = [ setuptools ]; @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = { description = "Object Relational Manager for providing an object interface to your database"; homepage = "https://www.sqlobject.org/"; - changelog = "https://github.com/sqlobject/sqlobject/blob/${version}/docs/News.rst"; + changelog = "https://github.com/sqlobject/sqlobject/blob/${src.tag}/docs/News.rst"; license = lib.licenses.lgpl21Only; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/sqlparse/default.nix b/pkgs/development/python-modules/sqlparse/default.nix index af0da3c3dbd5..652813e38ae4 100644 --- a/pkgs/development/python-modules/sqlparse/default.nix +++ b/pkgs/development/python-modules/sqlparse/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "sqlparse"; - version = "0.5.3"; + version = "0.5.5"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-CfZ3h/VqCxbs294b/H9dnDNxymg8/qqOb/YLSAfsknI="; + hash = "sha256-4g1KmwuFhf32OxDTAGbHyUxden7EfIiaLYOjyqk/8o4="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/srctools/default.nix b/pkgs/development/python-modules/srctools/default.nix index 981c6ef48f88..3d5b242aef70 100644 --- a/pkgs/development/python-modules/srctools/default.nix +++ b/pkgs/development/python-modules/srctools/default.nix @@ -14,7 +14,7 @@ }: let pname = "srctools"; - version = "2.6.1"; + version = "2.6.2"; in buildPythonPackage { inherit pname version; @@ -22,7 +22,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-EPdK8IALfcPhfzHiAR2FC821Z0Igkik9+mpky3eIsoM="; + hash = "sha256-c+NmrTntpNTEI782aoC4bNpoKpWe4cqSAkxpYS5HH30="; }; build-system = [ diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix index a52cf7c6b5f3..429ce5dff2f6 100644 --- a/pkgs/development/python-modules/srsly/default.nix +++ b/pkgs/development/python-modules/srsly/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "srsly"; - version = "2.5.1"; + version = "2.5.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-qxtL9s8+Kdoj2uBJPdFRf7eHB1IGUSNRQhuJtPwnx34="; + hash = "sha256-QJK8hDxxt1lcbJCgMCoZeFjFuf5DBn9irmpFvDuqHBk="; }; build-system = [ diff --git a/pkgs/development/python-modules/sse-starlette/default.nix b/pkgs/development/python-modules/sse-starlette/default.nix index 8a2882414cae..745ec3a2ce79 100644 --- a/pkgs/development/python-modules/sse-starlette/default.nix +++ b/pkgs/development/python-modules/sse-starlette/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "sse-starlette"; - version = "3.0.3"; + version = "3.2.0"; pyproject = true; src = fetchFromGitHub { owner = "sysid"; repo = "sse-starlette"; tag = "v${version}"; - hash = "sha256-2QCagK4OIVJJ54uedJFVjcGyRo2j1415iNjDIa67/mo="; + hash = "sha256-SqYLwbl+AyeqgYIwAd/Z39BSPXaYSXMnM6DAGUv3vQ8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sseclient-py/default.nix b/pkgs/development/python-modules/sseclient-py/default.nix index 251c0a3ab5ea..a74fc325b226 100644 --- a/pkgs/development/python-modules/sseclient-py/default.nix +++ b/pkgs/development/python-modules/sseclient-py/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "sseclient-py"; - version = "1.8.0"; + version = "1.9.0"; format = "setuptools"; src = fetchFromGitHub { owner = "mpetazzoni"; repo = "sseclient"; - rev = "sseclient-py-${version}"; - hash = "sha256-rNiJqR7/e+Rhi6kVBY8gZJZczqSUsyszotXkb4OKfWk="; + tag = "sseclient-py-${version}"; + hash = "sha256-AIldZFElGgSbw38aZWCWI1N35MiE+b9D1s/XhD7aIvo="; }; nativeCheckInputs = [ pytestCheckHook ]; @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "Pure-Python Server Side Events (SSE) client"; homepage = "https://github.com/mpetazzoni/sseclient"; - changelog = "https://github.com/mpetazzoni/sseclient/releases/tag/sseclient-py-${version}"; + changelog = "https://github.com/mpetazzoni/sseclient/releases/tag/sseclient-py-${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ jamiemagee ]; }; diff --git a/pkgs/development/python-modules/ssh2-python/default.nix b/pkgs/development/python-modules/ssh2-python/default.nix index c52d4485ef90..3b7401dcf650 100644 --- a/pkgs/development/python-modules/ssh2-python/default.nix +++ b/pkgs/development/python-modules/ssh2-python/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "ssh2-python"; - version = "1.1.2.post1"; + version = "1.2.0.post1"; format = "setuptools"; src = fetchFromGitHub { owner = "ParallelSSH"; repo = "ssh2-python"; tag = version; - hash = "sha256-LHIj0lSAMJ+tUvIyMl0xT/i0N4U+HbiiD62WIXzboMU="; + hash = "sha256-GhkVie+UPjM1C1Jb3/ef59kuJRYmIkauTCaoksqu1LM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/stamina/default.nix b/pkgs/development/python-modules/stamina/default.nix index 09a976bf667f..0da09382ebff 100644 --- a/pkgs/development/python-modules/stamina/default.nix +++ b/pkgs/development/python-modules/stamina/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "stamina"; - version = "25.1.0"; + version = "25.2.0"; pyproject = true; src = fetchFromGitHub { owner = "hynek"; repo = "stamina"; tag = version; - hash = "sha256-TehGqR3vbjLNByHZE2+Ytq52dpEpiL6+7TRUKwXcC1M="; + hash = "sha256-PsoEo53JeD9zrqRmvPotTiX4lM16aJXB3Gr1+mFTEYA="; }; build-system = [ diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index af9c1a98e96a..219ce1e8b7a7 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "starlette"; - version = "0.50.0"; + version = "0.52.1"; pyproject = true; src = fetchFromGitHub { owner = "encode"; repo = "starlette"; tag = version; - hash = "sha256-8REOizYQQkyLZwV4/yRiNGmGV07V0NNky7gtiAdWa7o="; + hash = "sha256-XPAeRnh9a0A1/5VGZzzGQBhlBsih1VR8QmFdkxG5cQE="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/statmake/default.nix b/pkgs/development/python-modules/statmake/default.nix index d9345f82b5c3..2a73d88a0eb1 100644 --- a/pkgs/development/python-modules/statmake/default.nix +++ b/pkgs/development/python-modules/statmake/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "statmake"; - version = "1.1.0"; + version = "2.0.1"; pyproject = true; src = fetchFromGitHub { owner = "daltonmaag"; repo = "statmake"; tag = "v${version}"; - hash = "sha256-UqL3l27Icu5DoVvFYctbOF7gvKvVV6hK1R5A1y9SYkU="; + hash = "sha256-PlMbJuJUkUjKXhkcCfLO5G3R1z9Zwf9qKYj9olOANno="; }; build-system = [ diff --git a/pkgs/development/python-modules/stop-words/default.nix b/pkgs/development/python-modules/stop-words/default.nix index ead093cd5622..996f9745fb0d 100644 --- a/pkgs/development/python-modules/stop-words/default.nix +++ b/pkgs/development/python-modules/stop-words/default.nix @@ -3,22 +3,26 @@ buildPythonPackage, fetchPypi, setuptools, - unittestCheckHook, + setuptools-scm, }: buildPythonPackage rec { pname = "stop-words"; - version = "2018.7.23"; + version = "2025.11.4"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-bfOtX13ml9qkN+REXIbHNgTmvBON0NwPrFVmSqTmsD4="; + pname = "stop_words"; + inherit version; + hash = "sha256-BFkHK1SxHkOm+0xbBb2ofSrM/E8UwWl5dPNzmvD3tD0="; }; - build-system = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; - nativeCheckInputs = [ unittestCheckHook ]; + doCheck = false; # no tests pythonImportsCheck = [ "stop_words" ]; diff --git a/pkgs/development/python-modules/storage3/default.nix b/pkgs/development/python-modules/storage3/default.nix index d3b761bff64d..c5d0dc277fd6 100644 --- a/pkgs/development/python-modules/storage3/default.nix +++ b/pkgs/development/python-modules/storage3/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "storage3"; - version = "0.12.1"; + version = "0.12.2"; pyproject = true; src = fetchFromGitHub { owner = "supabase"; repo = "storage-py"; tag = "v${version}"; - hash = "sha256-Ef309CTnzbaqKAVMdvroUYAy9RImWZZqhsnwRdpGVkk="; + hash = "sha256-ACilbwSCNEsXyr2lUTkhOgfw/SiTnwj+rA07tnuFy5A="; }; dependencies = [ diff --git a/pkgs/development/python-modules/strawberry-django/default.nix b/pkgs/development/python-modules/strawberry-django/default.nix index b5abd44e5a9b..777e3ebccbd2 100644 --- a/pkgs/development/python-modules/strawberry-django/default.nix +++ b/pkgs/development/python-modules/strawberry-django/default.nix @@ -4,8 +4,7 @@ fetchFromGitHub, # build-system - poetry-core, - setuptools, + hatchling, # dependencies asgiref, @@ -35,14 +34,14 @@ buildPythonPackage rec { pname = "strawberry-django"; - version = "0.65.1"; + version = "0.74.1"; pyproject = true; src = fetchFromGitHub { owner = "strawberry-graphql"; repo = "strawberry-django"; - tag = "v${version}"; - hash = "sha256-cX/eG6qWe/h9U4p1pMhhI+bZ5pLmiwGeYxNthKvdI6o="; + tag = version; + hash = "sha256-8T5lYM5JrxbeDCgvSGvBsimsF+tMwjS1hroqw2Gf7aA="; }; postPatch = '' @@ -51,8 +50,7 @@ buildPythonPackage rec { ''; build-system = [ - poetry-core - setuptools + hatchling ]; dependencies = [ diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index 7fed7047881e..96db30289612 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -5,6 +5,7 @@ buildPythonPackage, chalice, channels, + cross-web, daphne, django, email-validator, @@ -43,14 +44,14 @@ buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.278.0"; + version = "0.289.2"; pyproject = true; src = fetchFromGitHub { owner = "strawberry-graphql"; repo = "strawberry"; tag = version; - hash = "sha256-GNjjSD40fhbMqfvuYSuP3tU8lfOqBGJIsoGWZCfj6C4="; + hash = "sha256-eiIyAYId5MHKWmn87Cj/TCNN4YU5KkAWMEMhoMIR8xM="; }; postPatch = '' @@ -61,6 +62,7 @@ buildPythonPackage rec { build-system = [ poetry-core ]; dependencies = [ + cross-web graphql-core python-dateutil typing-extensions @@ -152,7 +154,6 @@ buildPythonPackage rec { "tests/schema/test_lazy/" "tests/sanic/test_file_upload.py" "tests/test_dataloaders.py" - "tests/utils/test_pretty_print.py" "tests/websockets/test_graphql_transport_ws.py" "tests/litestar/" ]; diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index bf6dbd0e6f36..b8daf548330a 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -3,21 +3,21 @@ buildPythonPackage, fetchPypi, requests, - setuptools, + flit-core, typing-extensions, }: buildPythonPackage rec { pname = "stripe"; - version = "12.5.1"; + version = "14.2.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-VAfQksNVwxOT52fS3LLVqMOYDKqaBzrLMtDMs8AbBLU="; + hash = "sha256-nHB8sFA+F5wtnxhzHpTxMzcFtc2dyq5pLbCZla0o1BE="; }; - build-system = [ setuptools ]; + build-system = [ flit-core ]; dependencies = [ requests diff --git a/pkgs/development/python-modules/sudachipy/default.nix b/pkgs/development/python-modules/sudachipy/default.nix index 9420c5d20b8b..e517bc836a67 100644 --- a/pkgs/development/python-modules/sudachipy/default.nix +++ b/pkgs/development/python-modules/sudachipy/default.nix @@ -9,6 +9,7 @@ sudachi-rs, setuptools-rust, pytestCheckHook, + pythonAtLeast, sudachidict-core, tokenizers, sudachipy, @@ -19,6 +20,8 @@ buildPythonPackage rec { pname = "sudachipy"; inherit (sudachi-rs) src version; + disabled = pythonAtLeast "3.14"; # The pyo3 version used does not support 3.14+ + patches = sudachi-rs.cargoPatches; cargoDeps = rustPlatform.fetchCargoVendor { diff --git a/pkgs/development/python-modules/supabase/default.nix b/pkgs/development/python-modules/supabase/default.nix index 7a9f71aa7183..e0daa7a83294 100644 --- a/pkgs/development/python-modules/supabase/default.nix +++ b/pkgs/development/python-modules/supabase/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "supabase"; - version = "2.17.0"; + version = "2.27.2"; pyproject = true; src = fetchFromGitHub { owner = "supabase"; repo = "supabase-py"; - rev = "v${version}"; - hash = "sha256-psfDs5BCtUjyPsfLwksNvzLmUKmYDvmxKIDPQE/NmQU="; + tag = "v${version}"; + hash = "sha256-TRATa+lDRm2MDuARXfBRWnWYUak8i1fW7rr5ujWN8TY="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/swagger-spec-validator/default.nix b/pkgs/development/python-modules/swagger-spec-validator/default.nix index 5a6ab5ec9bbe..32c145b8276d 100644 --- a/pkgs/development/python-modules/swagger-spec-validator/default.nix +++ b/pkgs/development/python-modules/swagger-spec-validator/default.nix @@ -2,27 +2,32 @@ lib, buildPythonPackage, fetchFromGitHub, - pyyaml, + setuptools, + importlib-resources, jsonschema, + pyyaml, six, pytestCheckHook, mock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "swagger-spec-validator"; - version = "2.7.4"; - format = "setuptools"; + version = "3.0.4"; + pyproject = true; src = fetchFromGitHub { owner = "Yelp"; repo = "swagger_spec_validator"; - rev = "v${version}"; - hash = "sha256-7+kFmtzeze0QlGf6z/M4J4F7z771a5NWewB1S3+bxn4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-8T0973g8JZKLCTpYqyScr/JAiFdBexEReUJoMQh4vO4="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pyyaml + importlib-resources jsonschema six ]; @@ -40,4 +45,4 @@ buildPythonPackage rec { description = "Validation of Swagger specifications"; maintainers = with lib.maintainers; [ vanschelven ]; }; -} +}) diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix index f9c5c5fbee3b..cd37903bee10 100644 --- a/pkgs/development/python-modules/sybil/default.nix +++ b/pkgs/development/python-modules/sybil/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "sybil"; - version = "9.1.0"; + version = "9.3.0"; pyproject = true; src = fetchFromGitHub { owner = "simplistix"; repo = "sybil"; tag = version; - hash = "sha256-ov8b8NPBbiqB/pcKgdD2D+xNSxUM1uGK8EP+20K7eGQ="; + hash = "sha256-rr6zVY1yJVL/s/Wg5S4pSljj9Zq+jo7CZ6TZvtPpxow="; }; build-system = [ setuptools ]; @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = { description = "Automated testing for the examples in your documentation"; homepage = "https://github.com/cjw296/sybil"; - changelog = "https://github.com/simplistix/sybil/blob/${version}/CHANGELOG.rst"; + changelog = "https://github.com/simplistix/sybil/blob/${src.tag}/CHANGELOG.rst"; license = lib.licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/syne-tune/default.nix b/pkgs/development/python-modules/syne-tune/default.nix index c09d9d5563dd..c5cbaf7fc275 100644 --- a/pkgs/development/python-modules/syne-tune/default.nix +++ b/pkgs/development/python-modules/syne-tune/default.nix @@ -38,14 +38,14 @@ }: buildPythonPackage rec { pname = "syne-tune"; - version = "0.14.2"; + version = "0.15.0"; pyproject = true; src = fetchFromGitHub { owner = "syne-tune"; repo = "syne-tune"; tag = "v${version}"; - hash = "sha256-51QyfJ0XOcXTeE95YOhtUmhat23joaEYvUnk7hYfksY="; + hash = "sha256-UNBpfC+aLXhkbyvCG2K00yedJnpYpfldqisZ/wDPtuA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/syrupy/default.nix b/pkgs/development/python-modules/syrupy/default.nix index a213f3a3f547..4b2b521e033c 100644 --- a/pkgs/development/python-modules/syrupy/default.nix +++ b/pkgs/development/python-modules/syrupy/default.nix @@ -1,8 +1,10 @@ { lib, + attrs, buildPythonPackage, fetchFromGitHub, poetry-core, + pydantic, pytest, pytest-xdist, invoke, @@ -10,14 +12,14 @@ buildPythonPackage rec { pname = "syrupy"; - version = "5.0.0"; + version = "5.1.0"; pyproject = true; src = fetchFromGitHub { owner = "syrupy-project"; repo = "syrupy"; tag = "v${version}"; - hash = "sha256-TRwU9+2RvZB2gbVm82DzLge8QoDflxjavcRdYZUgVfs="; + hash = "sha256-oogH5Q+0leZsfu/7r3tZmB2rxjcUOmGAsn4Z50oSlH8="; }; build-system = [ poetry-core ]; @@ -25,7 +27,9 @@ buildPythonPackage rec { buildInputs = [ pytest ]; nativeCheckInputs = [ + attrs invoke + pydantic pytest pytest-xdist ]; diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix index caa377a97f70..bda4c6ff8178 100644 --- a/pkgs/development/python-modules/tablib/default.nix +++ b/pkgs/development/python-modules/tablib/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "tablib"; - version = "3.8.0"; + version = "3.9.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-lNi83GWnFaACSm1bcBpfMeRb0VkmnmLHNzHeefBI2ys="; + hash = "sha256-G2q9jtsPNWAeBMYWHXlmD9zeSrtKVPZsyfkFS9VdX+I="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/tadasets/default.nix b/pkgs/development/python-modules/tadasets/default.nix index 50117d34678c..e38bc495a64f 100644 --- a/pkgs/development/python-modules/tadasets/default.nix +++ b/pkgs/development/python-modules/tadasets/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "tadasets"; - version = "0.2.1"; + version = "0.2.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-PWbq+dCQ8mGR81lolBDSArxjkTdis1ZpLY0MqZfZ66I="; + hash = "sha256-C+l19J0PHjZTlzAhXbojicaOyr/gjN8fuH7cLyb449w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/taskw-ng/default.nix b/pkgs/development/python-modules/taskw-ng/default.nix index 118736f94479..03f4d82ab771 100644 --- a/pkgs/development/python-modules/taskw-ng/default.nix +++ b/pkgs/development/python-modules/taskw-ng/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "taskw-ng"; - version = "0.2.7"; + version = "2.0.0"; pyproject = true; src = fetchFromGitHub { owner = "bergercookie"; repo = "taskw-ng"; - tag = "v${version}"; - hash = "sha256-KxXLSDvUclQlNbMR+Zzl6tgBrH2QxqjLVoyBK3OiKVU="; + tag = version; + hash = "sha256-hTZi6Y3jVlBI+CGQtHZ4PBU5rjEjE2l8o2rusCkEma0="; }; pythonRelaxDeps = [ @@ -48,7 +48,7 @@ buildPythonPackage rec { meta = { description = "Module to interact with the Taskwarrior API"; homepage = "https://github.com/bergercookie/taskw-ng"; - changelog = "https://github.com/bergercookie/taskw-ng/blob/${src.rev}/CHANGELOG.rst"; + changelog = "https://github.com/bergercookie/taskw-ng/blob/${src.tag}/CHANGELOG.rst"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ raitobezarius ]; }; diff --git a/pkgs/development/python-modules/tatsu-lts/default.nix b/pkgs/development/python-modules/tatsu-lts/default.nix index 48c95206cb46..8078637bf659 100644 --- a/pkgs/development/python-modules/tatsu-lts/default.nix +++ b/pkgs/development/python-modules/tatsu-lts/default.nix @@ -5,22 +5,22 @@ fetchFromGitHub, pytestCheckHook, regex, - setuptools, + hatchling, }: buildPythonPackage rec { pname = "tatsu-lts"; - version = "5.13.1"; + version = "5.16.0"; pyproject = true; src = fetchFromGitHub { owner = "dnicolodi"; repo = "TatSu-LTS"; tag = "v${version}-LTS"; - hash = "sha256-cfGAWZDAnoD3ddhVIkOHyiv7gUDgnAWu1ZBvDEiQ2AQ="; + hash = "sha256-2mMIFJ9baN6hmx2HPR3kKZHuhAWC30sTIIaRRuTc1Gg="; }; - build-system = [ setuptools ]; + build-system = [ hatchling ]; dependencies = [ colorama diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix index 047399822885..c847e7aed67d 100644 --- a/pkgs/development/python-modules/tatsu/default.nix +++ b/pkgs/development/python-modules/tatsu/default.nix @@ -5,22 +5,22 @@ fetchFromGitHub, pytestCheckHook, regex, - setuptools, + hatchling, }: buildPythonPackage rec { pname = "tatsu"; - version = "5.13.1"; + version = "5.16.0"; pyproject = true; src = fetchFromGitHub { owner = "neogeny"; repo = "TatSu"; tag = "v${version}"; - hash = "sha256-iZtYqPvQxXl6SFG2An7dN3KxaxCTvAiAkeeuXUhLuF0="; + hash = "sha256-YFNoA81J8x4OO7lLUjeN/NzQfCTEeosaWZg9UKy8C50="; }; - nativeBuildInputs = [ setuptools ]; + nativeBuildInputs = [ hatchling ]; propagatedBuildInputs = [ colorama diff --git a/pkgs/development/python-modules/tblib/default.nix b/pkgs/development/python-modules/tblib/default.nix index 68d00bd2c271..b87762590583 100644 --- a/pkgs/development/python-modules/tblib/default.nix +++ b/pkgs/development/python-modules/tblib/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "tblib"; - version = "3.1.0"; + version = "3.2.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-BkBMLJ8H9m/uLX1q1DrMxG+cM2FxTZuEJuf0fllc1lI="; + hash = "sha256-6aZSaS2Rv090PUoVvBdMC3avx1D+jHttGVzBwdbSzOw="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/tbm-utils/default.nix b/pkgs/development/python-modules/tbm-utils/default.nix index 54abd65b37c1..897884d2f1ce 100644 --- a/pkgs/development/python-modules/tbm-utils/default.nix +++ b/pkgs/development/python-modules/tbm-utils/default.nix @@ -42,6 +42,9 @@ buildPythonPackage rec { substituteInPlace pyproject.toml \ --replace-fail 'poetry>=1.0.0' 'poetry-core' \ --replace-fail 'poetry.masonry.api' 'poetry.core.masonry.api' + + substituteInPlace pytest.ini \ + --replace-fail 'strict = True' 'strict = False' ''; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/telethon/default.nix b/pkgs/development/python-modules/telethon/default.nix index 1295b1b20e40..56e716ababde 100644 --- a/pkgs/development/python-modules/telethon/default.nix +++ b/pkgs/development/python-modules/telethon/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "telethon"; - version = "1.41.1"; + version = "1.42.0"; pyproject = true; src = fetchFromGitHub { owner = "LonamiWebs"; repo = "Telethon"; tag = "v${version}"; - hash = "sha256-V38enxg1ZW1zd87xRLr0GHv+t1NK7fwDFxXDqPvCf2U="; + hash = "sha256-NMHJkSTGR3/tck0k97EfVN9f85PAWst+EZ6G7Tgrt5s="; }; patches = [ diff --git a/pkgs/development/python-modules/templateflow/default.nix b/pkgs/development/python-modules/templateflow/default.nix index 63bacf94a65b..46f042389249 100644 --- a/pkgs/development/python-modules/templateflow/default.nix +++ b/pkgs/development/python-modules/templateflow/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "templateflow"; - version = "25.0.4"; + version = "25.1.1"; pyproject = true; src = fetchFromGitHub { owner = "templateflow"; repo = "python-client"; tag = version; - hash = "sha256-7N8JJAJwnmesQIoZttcphmUW5HLEi8Rxv70MGNjOO98="; + hash = "sha256-QkscrnSURUnZp+42dtVK++EHbHklmWRixpDRhNhHM50="; }; build-system = [ diff --git a/pkgs/development/python-modules/tensorboardx/default.nix b/pkgs/development/python-modules/tensorboardx/default.nix index 52f5886b1ac7..f0658b4aad10 100644 --- a/pkgs/development/python-modules/tensorboardx/default.nix +++ b/pkgs/development/python-modules/tensorboardx/default.nix @@ -1,15 +1,16 @@ { boto3, buildPythonPackage, - crc32c, fetchFromGitHub, lib, matplotlib, moto, numpy, + packaging, protobuf, pytestCheckHook, torch, + setuptools, setuptools-scm, soundfile, stdenv, @@ -19,26 +20,33 @@ buildPythonPackage rec { pname = "tensorboardx"; - version = "2.6.2.2"; - format = "setuptools"; + version = "2.6.4"; + pyproject = true; src = fetchFromGitHub { owner = "lanpa"; repo = "tensorboardX"; tag = "v${version}"; - hash = "sha256-4eMkjya0B+r/DMQobeFJCfYHwnTOWrb+aNkkW2XvoqY="; + hash = "sha256-GZQUJCiCKVthO95jHMIzNFcBM3R85BkyxO74CKCzizc="; }; - nativeBuildInputs = [ - protobuf + postPatch = '' + # https://github.com/lanpa/tensorboardX/pull/761 + substituteInPlace tensorboardX/utils.py tests/test_utils.py \ + --replace-fail "newshape=" "shape=" + ''; + + build-system = [ + setuptools setuptools-scm ]; # required to make tests deterministic env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; - propagatedBuildInputs = [ - crc32c + dependencies = [ + packaging + protobuf numpy ]; @@ -79,7 +87,7 @@ buildPythonPackage rec { description = "Library for writing tensorboard-compatible logs"; homepage = "https://tensorboardx.readthedocs.io"; downloadPage = "https://github.com/lanpa/tensorboardX"; - changelog = "https://github.com/lanpa/tensorboardX/blob/${src.rev}/HISTORY.rst"; + changelog = "https://github.com/lanpa/tensorboardX/blob/${src.tag}/HISTORY.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ lebastr diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index f15160a2c31c..d06a317edd94 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -99,6 +99,11 @@ buildPythonPackage rec { ] ++ lib.optional (!isPy3k) mock; + pythonRemoveDeps = [ + "libclang" + "keras" + ]; + preConfigure = '' unset SOURCE_DATE_EPOCH diff --git a/pkgs/development/python-modules/termcolor/default.nix b/pkgs/development/python-modules/termcolor/default.nix index 04204e79d1c5..88501683de8d 100644 --- a/pkgs/development/python-modules/termcolor/default.nix +++ b/pkgs/development/python-modules/termcolor/default.nix @@ -9,14 +9,19 @@ buildPythonPackage rec { pname = "termcolor"; - version = "3.1.0"; + version = "3.3.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-am3X++5YGQnu7Gp1bP8df3w3YGOxTkopjcSYAwnlWXA="; + hash = "sha256-NIhxymSOxqmpg6E6tibArM4C9RW54ZgzMrF695eVIcU="; }; + postPatch = '' + # Unknown classifier, likely only once 3.15 is released + sed -i "/Programming Language :: Python :: 3.15/d" pyproject.toml + ''; + build-system = [ hatch-vcs hatchling diff --git a/pkgs/development/python-modules/termgraph/default.nix b/pkgs/development/python-modules/termgraph/default.nix index d3cfa683165a..8eeef9940d16 100644 --- a/pkgs/development/python-modules/termgraph/default.nix +++ b/pkgs/development/python-modules/termgraph/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "termgraph"; - version = "0.5.3"; + version = "0.7.5"; format = "setuptools"; src = fetchFromGitHub { owner = "mkaz"; repo = "termgraph"; tag = "v${version}"; - hash = "sha256-0J9mEpDIdNEYwO+A+HBOaSw+Ct+HsbSPwGQYuYH6NN8="; + hash = "sha256-DptokK79yAfQDuhN2d/HfcaRq//0pF81VkhMfz05Hb0="; }; propagatedBuildInputs = [ colorama ]; diff --git a/pkgs/development/python-modules/terminaltexteffects/default.nix b/pkgs/development/python-modules/terminaltexteffects/default.nix index 5c4b1afca3d9..81c51924499d 100644 --- a/pkgs/development/python-modules/terminaltexteffects/default.nix +++ b/pkgs/development/python-modules/terminaltexteffects/default.nix @@ -2,21 +2,21 @@ lib, buildPythonPackage, fetchPypi, - poetry-core, + hatchling, }: buildPythonPackage rec { pname = "terminaltexteffects"; - version = "0.12.1"; + version = "0.14.2"; pyproject = true; # no tests on pypi, no tags on github src = fetchPypi { inherit pname version; - hash = "sha256-0rBLOPm8A/xDSskyyr/UNEs19Yp+/ZNwpiorsaFi/bg="; + hash = "sha256-ITyJnOS492Q9LQVorxROEnThHkST259bBDh70XwhdxQ="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; pythonImportsCheck = [ "terminaltexteffects" ]; diff --git a/pkgs/development/python-modules/tesserocr/default.nix b/pkgs/development/python-modules/tesserocr/default.nix index 8166f0b86626..baf9dde1289b 100644 --- a/pkgs/development/python-modules/tesserocr/default.nix +++ b/pkgs/development/python-modules/tesserocr/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "tesserocr"; - version = "2.8.0"; + version = "2.9.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-vlGNGxtf9UwRqtoeD9EpQlCepwWB4KizmipHOgstvTY="; + hash = "sha256-L6H+PHlXXW/VtSd4Xnc/oZsFXwf5Iv6yrJ1sHmIjNSI="; }; patches = [ diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index ea587a10ae12..3447eb826e2a 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "9.1.0"; + version = "10.0.0"; pyproject = true; # DO NOT CONTACT upstream. # https://github.com/simplistix/ is only concerned with internal CI process. @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-UX6c81OUJyNTOuEQDKRd0n/geFw60nZQdfXLHLzgFII="; + hash = "sha256-K5gpv39C8MqGACUHYuZyVXXaWa8Y2af4Kq4sl7FPD2Y="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/testresources/default.nix b/pkgs/development/python-modules/testresources/default.nix index cb8d8458141c..7461c0f77dae 100644 --- a/pkgs/development/python-modules/testresources/default.nix +++ b/pkgs/development/python-modules/testresources/default.nix @@ -36,6 +36,12 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTestPaths = [ + # imports fixtures.test.helpers, but fixtures does not install tests anymore + # https://github.com/testing-cabal/fixtures/commit/349afbb1ec7dde2e472b4563025660a35e595153 + "testresources/tests/test_test_resource.py" + ]; + env.PBR_VERSION = version; meta = { diff --git a/pkgs/development/python-modules/testscenarios/default.nix b/pkgs/development/python-modules/testscenarios/default.nix index 81c48bafe257..1daf777f6ede 100644 --- a/pkgs/development/python-modules/testscenarios/default.nix +++ b/pkgs/development/python-modules/testscenarios/default.nix @@ -40,6 +40,8 @@ buildPythonPackage rec { testtools ]; + doCheck = false; # tests not compatible with teststools 2.8 + checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/textstat/default.nix b/pkgs/development/python-modules/textstat/default.nix index d124c09f7d09..43ac80efacaa 100644 --- a/pkgs/development/python-modules/textstat/default.nix +++ b/pkgs/development/python-modules/textstat/default.nix @@ -9,7 +9,7 @@ pytest, }: buildPythonPackage rec { - version = "0.7.8"; + version = "0.7.12"; pname = "textstat"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "textstat"; repo = "textstat"; tag = version; - hash = "sha256-EEGTmZXTAZ4fsfZk/ictvjQ6lCAi5Ma/Ae83ziGDQXQ="; + hash = "sha256-HOYeWpyWPLUEwnj21WfMNmIg9x+jQUtY1o+Sl5zJRq4="; }; build-system = [ diff --git a/pkgs/development/python-modules/textualeffects/default.nix b/pkgs/development/python-modules/textualeffects/default.nix index 5cb2b61f2f08..3c1b4dcc8cc5 100644 --- a/pkgs/development/python-modules/textualeffects/default.nix +++ b/pkgs/development/python-modules/textualeffects/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "textualeffects"; - version = "0.1.4"; + version = "0.2.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-hnCTIdSc16v0ftUTeCEwF05vXYXqFplqfDhwnDZGxGM="; + hash = "sha256-5C84ZdvcgVgxroFZycOdHdB4my3qK8b4wVxD4kd+XfE="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/tianshou/default.nix b/pkgs/development/python-modules/tianshou/default.nix index 4cb4ac39635f..c6861b965d34 100644 --- a/pkgs/development/python-modules/tianshou/default.nix +++ b/pkgs/development/python-modules/tianshou/default.nix @@ -46,14 +46,14 @@ buildPythonPackage rec { pname = "tianshou"; - version = "1.2.0"; + version = "2.0.0"; pyproject = true; src = fetchFromGitHub { owner = "thu-ml"; repo = "tianshou"; tag = "v${version}"; - hash = "sha256-lJAxjE+GMwssov1r4jOCOTf5Aonu+q6FSz5oWvZpuQQ="; + hash = "sha256-loE2klM989yZbPZ3Uun3xnGsDHrEZhzk1R0/PcH/1nM="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 7a097af95901..ab6f5ceb86ab 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "tifffile"; - version = "2025.6.11"; + version = "2026.1.14"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Ds5MLnoQZWlX1Wigk7B1E8ByjTDBvYzBJyWQH//bcUM="; + hash = "sha256-pCPFg+HuzZyiVWQtR/Rj76jX8jZaDhEOsBZ1cEk+DIw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/time-machine/default.nix b/pkgs/development/python-modules/time-machine/default.nix index 505c5927bd26..af3c2c6546a9 100644 --- a/pkgs/development/python-modules/time-machine/default.nix +++ b/pkgs/development/python-modules/time-machine/default.nix @@ -5,19 +5,20 @@ setuptools, python-dateutil, tokenize-rt, + freezegun, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "time-machine"; - version = "2.19.0"; + version = "3.2.0"; pyproject = true; src = fetchFromGitHub { owner = "adamchainz"; repo = "time-machine"; - tag = version; - hash = "sha256-bPpn+RNlvy/tkFrxDY4Q13fNlNuMFj1+br8M2uU3t9A="; + tag = finalAttrs.version; + hash = "sha256-UWoKvNz0ojVZtkIUGT02zJitza+mkyToANQMsU64xL4="; }; build-system = [ setuptools ]; @@ -31,9 +32,10 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + freezegun pytestCheckHook ] - ++ optional-dependencies.cli; + ++ finalAttrs.passthru.optional-dependencies.cli; disabledTests = [ # https://github.com/adamchainz/time-machine/issues/405 @@ -50,8 +52,8 @@ buildPythonPackage rec { meta = { description = "Travel through time in your tests"; homepage = "https://github.com/adamchainz/time-machine"; - changelog = "https://github.com/adamchainz/time-machine/blob/${src.rev}/CHANGELOG.rst"; + changelog = "https://github.com/adamchainz/time-machine/blob/${finalAttrs.src.tag}/CHANGELOG.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix index 23a7a1f91fdd..cca453789b7c 100644 --- a/pkgs/development/python-modules/tinycss2/default.nix +++ b/pkgs/development/python-modules/tinycss2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tinycss2"; - version = "1.4.0"; + version = "1.5.1"; pyproject = true; src = fetchFromGitHub { @@ -19,7 +19,7 @@ buildPythonPackage rec { tag = "v${version}"; # for tests fetchSubmodules = true; - hash = "sha256-GVymUobWAE0YS65lti9dXRIIGpx0YkwF/vSb3y7cpYY="; + hash = "sha256-ZVmdHrqfF5fvBvHLaG2B4m1zek4wfEYArkntWzOqhfM="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/tinyio/default.nix b/pkgs/development/python-modules/tinyio/default.nix index eff689b2d5ea..d969137dc5f0 100644 --- a/pkgs/development/python-modules/tinyio/default.nix +++ b/pkgs/development/python-modules/tinyio/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "tinyio"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { owner = "patrick-kidger"; repo = "tinyio"; tag = "v${version}"; - hash = "sha256-5Fk+/tT6mkyIosRKTFG5XuFtAM5wy3v0npiJjN47WV8="; + hash = "sha256-zAmsUe1fQeTxv0U++lU6abaP8YQMLlF3rkI7eyhTK0I="; }; build-system = [ @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = { description = "Dead-simple event loop for Python"; homepage = "https://github.com/patrick-kidger/tinyio"; - changelog = "https://github.com/patrick-kidger/tinyio/releases/tag/v${version}"; + changelog = "https://github.com/patrick-kidger/tinyio/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ GaetanLepage ]; }; diff --git a/pkgs/development/python-modules/tkinter/default.nix b/pkgs/development/python-modules/tkinter/default.nix index 233b2b2b0e4a..4b7a0477c15f 100644 --- a/pkgs/development/python-modules/tkinter/default.nix +++ b/pkgs/development/python-modules/tkinter/default.nix @@ -5,6 +5,7 @@ replaceVars, setuptools, python, + pythonAtLeast, pythonOlder, tcl, tclPackages, @@ -74,6 +75,18 @@ buildPythonPackage { preCheck = '' cd $NIX_BUILD_TOP/Python-*/Lib export HOME=$TMPDIR + '' + + lib.optionalString (pythonAtLeast "3.13" && pythonOlder "3.15") '' + # https://github.com/python/cpython/pull/143570 + # wantobject resources are only supported via libregrtest + substituteInPlace \ + test/test_tcl.py \ + test/test_ttk/__init__.py \ + test/test_tkinter/__init__.py \ + test/test_tkinter/support.py \ + --replace-fail \ + "support.get_resource_value('wantobjects')" \ + "0" ''; checkPhase = diff --git a/pkgs/development/python-modules/tokenize-rt/default.nix b/pkgs/development/python-modules/tokenize-rt/default.nix index 65212d177c22..0133e47553c0 100644 --- a/pkgs/development/python-modules/tokenize-rt/default.nix +++ b/pkgs/development/python-modules/tokenize-rt/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tokenize-rt"; - version = "6.1.0"; + version = "6.2.0"; pyproject = true; disabled = isPy27; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "asottile"; repo = "tokenize-rt"; - rev = "v${version}"; - hash = "sha256-7ykczY73KkqR99tYLL/5bgr9bqU444qHs2ONz+ldVyg="; + tag = "v${version}"; + hash = "sha256-25HeYVS5pN7mBllycumnrEkgP/a1HjrPNgqo6qJOStU="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/tomli/default.nix b/pkgs/development/python-modules/tomli/default.nix index 32b267ffac9c..a57cddde1f7e 100644 --- a/pkgs/development/python-modules/tomli/default.nix +++ b/pkgs/development/python-modules/tomli/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "tomli"; - version = "2.2.1"; + version = "2.4.0"; pyproject = true; src = fetchFromGitHub { owner = "hukkin"; repo = "tomli"; rev = version; - hash = "sha256-4MWp9pPiUZZkjvGXzw8/gDele743NBj8uG4jvK2ohUM="; + hash = "sha256-PVYwCUGQSuCe5WMeOBJpGXiJ4keVllzg9H3y+Il+Nr8="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix index a352884b2a0c..5cf78e0fa30e 100644 --- a/pkgs/development/python-modules/tomlkit/default.nix +++ b/pkgs/development/python-modules/tomlkit/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "tomlkit"; - version = "0.13.3"; + version = "0.14.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-QwzyR+5X3yuU7j++WI5x02KpQeu1Rd7Cm1OWHWGt0qE="; + hash = "sha256-zwDvykFdvVdXW++x9mNMT0LS2H27o3YSittCwSG4cGQ="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/torchaudio/default.nix b/pkgs/development/python-modules/torchaudio/default.nix index afea38e2ab98..a340c67d262b 100644 --- a/pkgs/development/python-modules/torchaudio/default.nix +++ b/pkgs/development/python-modules/torchaudio/default.nix @@ -78,14 +78,14 @@ let in buildPythonPackage.override { inherit stdenv; } rec { pname = "torchaudio"; - version = "2.9.1"; + version = "2.10.0"; pyproject = true; src = fetchFromGitHub { owner = "pytorch"; repo = "audio"; tag = "v${version}"; - hash = "sha256-tTilG/haU3OycSWqA5LR3egcxHVRg/yHJ8JB2rz3aKw="; + hash = "sha256-b1sjHVFXdNFDbdtXWSM2KisSRE/8IbzJI4rvzYQ4UMg="; }; patches = [ @@ -156,7 +156,7 @@ buildPythonPackage.override { inherit stdenv; } rec { meta = { description = "PyTorch audio library"; homepage = "https://pytorch.org/"; - changelog = "https://github.com/pytorch/audio/releases/tag/v${version}"; + changelog = "https://github.com/pytorch/audio/releases/tag/${src.tag}"; license = lib.licenses.bsd2; platforms = lib.platforms.linux ++ lib.optionals (!cudaSupport && !rocmSupport) lib.platforms.darwin; diff --git a/pkgs/development/python-modules/torchcodec/default.nix b/pkgs/development/python-modules/torchcodec/default.nix index 06833d43c5c0..faa871520f9e 100644 --- a/pkgs/development/python-modules/torchcodec/default.nix +++ b/pkgs/development/python-modules/torchcodec/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "torchcodec"; - version = "0.9.0"; + version = "0.9.1"; pyproject = true; src = fetchFromGitHub { owner = "meta-pytorch"; repo = "torchcodec"; tag = "v${version}"; - hash = "sha256-QG7LX9G1HV2l75jsgsbM4ts6bg0wvsNhjml19b7yYEQ="; + hash = "sha256-HyEv3WVCnFSl+hpF2Kj/5yb5zkvI3ToyD4/oSkD47LQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/torchio/default.nix b/pkgs/development/python-modules/torchio/default.nix index c6c1c3d2899a..7060b38a1a88 100644 --- a/pkgs/development/python-modules/torchio/default.nix +++ b/pkgs/development/python-modules/torchio/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "torchio"; - version = "0.21.1"; + version = "0.21.2"; pyproject = true; src = fetchFromGitHub { owner = "TorchIO-project"; repo = "torchio"; tag = "v${version}"; - hash = "sha256-ut1uRak87J5b1bjLkupUB2HZEog8WVFwLMHNtNhmC4s="; + hash = "sha256-HyhoF3F4EsJCOkWmoQkFqNsx8YbBsUFlQC+AggaXLXI="; }; build-system = [ diff --git a/pkgs/development/python-modules/torchtune/default.nix b/pkgs/development/python-modules/torchtune/default.nix index 61d4a5e1eefa..df6795d344f9 100644 --- a/pkgs/development/python-modules/torchtune/default.nix +++ b/pkgs/development/python-modules/torchtune/default.nix @@ -71,8 +71,7 @@ buildPythonPackage (finalAttrs: { # Not explicitly listed as requirements, but effectively imported at runtime torchao torchvision - ] - ++ huggingface-hub.optional-dependencies.hf_transfer; + ]; pythonImportsCheck = [ "torchtune" ]; diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index ce38cc74401c..372ac01463a1 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -28,7 +28,7 @@ let inherit (torch) cudaCapabilities cudaPackages cudaSupport; pname = "torchvision"; - version = "0.24.1"; + version = "0.25.0"; in buildPythonPackage.override { stdenv = torch.stdenv; } { format = "setuptools"; @@ -38,7 +38,7 @@ buildPythonPackage.override { stdenv = torch.stdenv; } { owner = "pytorch"; repo = "vision"; tag = "v${version}"; - hash = "sha256-ddJWD2xjoNAuyZIaZD7ctcuSQZ9lSUGExWCq1W5prI8="; + hash = "sha256-oktJHcT6T4f58pUO+HSBpbyS1ISH3zDlTsXQh6PcMy4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix index ea2ba29af13b..4327db46ac9e 100644 --- a/pkgs/development/python-modules/tornado/default.nix +++ b/pkgs/development/python-modules/tornado/default.nix @@ -20,20 +20,23 @@ buildPythonPackage rec { pname = "tornado"; - version = "6.5.2"; + version = "6.5.4"; pyproject = true; src = fetchFromGitHub { owner = "tornadoweb"; repo = "tornado"; tag = "v${version}"; - hash = "sha256-jy/HnMY459yZX3HW9V61/ZSSanCJEZakBU/2pocGc/s="; + hash = "sha256-d6lKg8yrQqaCeKxdPjQNzv7Nc23U/v8d5x3sE3trRM4="; }; build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; + # To allow tests to pass on slower/high-load machines + env.ASYNC_TEST_TIMEOUT = 30; + disabledTestPaths = [ # additional tests that have extra dependencies, run slowly, or produce more output than a simple pass/fail # https://github.com/tornadoweb/tornado/blob/v6.2.0/maint/test/README diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 2676888849e7..f0fe6f08287d 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "tox"; - version = "4.32.0"; + version = "4.34.1"; pyproject = true; src = fetchFromGitHub { owner = "tox-dev"; repo = "tox"; tag = version; - hash = "sha256-n2tKjT0t8bm6iatukKKcGw0PC+5EJrQEABMIAumRaqE="; + hash = "sha256-pfftPTY7n47tCQFGCZRwsq0vCWZUeukFZO99gj5mTeo="; }; build-system = [ diff --git a/pkgs/development/python-modules/tracerite/default.nix b/pkgs/development/python-modules/tracerite/default.nix index b7f067dda72e..6133ab920dfe 100644 --- a/pkgs/development/python-modules/tracerite/default.nix +++ b/pkgs/development/python-modules/tracerite/default.nix @@ -2,25 +2,28 @@ lib, buildPythonPackage, fetchFromGitHub, - setuptools-scm, + hatchling, + hatch-vcs, html5tagger, - setuptools, python, }: buildPythonPackage rec { pname = "tracerite"; - version = "1.1.3"; - format = "setuptools"; + version = "2.3.1"; + pyproject = true; src = fetchFromGitHub { owner = "sanic-org"; repo = "tracerite"; tag = "v${version}"; - hash = "sha256-T210vRXFWlTs5ke13DVvZEVsonXiT+g6xSI63+DxLXc="; + hash = "sha256-UXIQc5rXVaZuZj5xu2X9H38vKWAM+AoKrKfudovUhwA="; }; - build-system = [ setuptools-scm ]; + build-system = [ + hatchling + hatch-vcs + ]; dependencies = [ html5tagger diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix index 086c2590a8ad..7bc0d8c5bd9e 100644 --- a/pkgs/development/python-modules/traitlets/default.nix +++ b/pkgs/development/python-modules/traitlets/default.nix @@ -36,8 +36,6 @@ buildPythonPackage rec { disabledTests = [ # https://github.com/ipython/traitlets/issues/902 "test_complete_custom_completers" - ] - ++ lib.optionals (pythonAtLeast "3.14") [ # https://github.com/ipython/traitlets/issues/925 "test_complete_simple_app" "test_complete_subcommands_subapp1" diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 030aad8ae43a..e3f1050f8f45 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -7,183 +7,205 @@ setuptools, # dependencies - filelock, huggingface-hub, numpy, - protobuf, packaging, pyyaml, regex, - requests, - tokenizers, safetensors, + tokenizers, tqdm, + typer, # optional-dependencies - diffusers, + # sklearn scikit-learn, - tensorflow, - onnxconverter-common, - opencv4, - tf2onnx, + # torch torch, accelerate, + # deepspeed + # deepspeed, + # codecarbon + # codecarbon, + # retrieval faiss, datasets, - jax, - jaxlib, - flax, - optax, - ftfy, - onnxruntime, - onnxruntime-tools, - cookiecutter, + # ja + fugashi, + ipadic, + sudachipy, + # sudachidict_core, + # unidic_lite, + unidic, + # rhoknp, + # sagemaker sagemaker, - fairscale, + # optuna optuna, + # ray ray, + # kernels + kernels, + # serving + openai, pydantic, uvicorn, fastapi, starlette, + rich, + # audio librosa, + # pyctcdecode, phonemizer, + # kenlm, torchaudio, + # vision pillow, + # timm timm, + # torch-vision torchvision, + # video av, + # num2words + num2words, + # sentencepiece sentencepiece, - hf-xet, + protobuf, + # tiktoken + tiktoken, + blobfile, + # mistral-common + mistral-common, + # chat_template + jinja2, + jmespath, + # quality + ruff, + gitpython, + urllib3, + libcst, + # opentelemetry + opentelemetry-api, + opentelemetry-exporter-otlp, + opentelemetry-sdk, }: buildPythonPackage (finalAttrs: { pname = "transformers"; - version = "4.57.6"; + version = "5.2.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "transformers"; tag = "v${finalAttrs.version}"; - hash = "sha256-a78ornUAYlOpr30iFdq1oUiWQTm6GeT0iq8ras5i3DQ="; + hash = "sha256-vus4Y+1QXUNqwBO1ZK0gWd+sJBPwrqWW7O2sn0EBvno="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "typer-slim" "typer" + ''; + build-system = [ setuptools ]; dependencies = [ - filelock huggingface-hub numpy packaging pyyaml regex - requests - tokenizers safetensors + tokenizers tqdm + typer ]; - optional-dependencies = - let - audio = [ - librosa - # pyctcdecode - phonemizer - # kenlm - ]; - vision = [ pillow ]; - in - { - agents = [ - diffusers - accelerate - datasets - torch - sentencepiece - opencv4 - pillow - ]; - ja = [ - # fugashi - # ipadic - # rhoknp - # sudachidict_core - # sudachipy - # unidic - # unidic_lite - ]; - sklearn = [ scikit-learn ]; - tf = [ - tensorflow - onnxconverter-common - tf2onnx - # tensorflow-text - # keras-nlp - ]; - torch = [ - torch - accelerate - ]; - retrieval = [ - faiss - datasets - ]; - flax = [ - jax - jaxlib - flax - optax - ]; - hf_xet = [ - hf-xet - ]; - tokenizers = [ tokenizers ]; - ftfy = [ ftfy ]; - onnxruntime = [ - onnxruntime - onnxruntime-tools - ]; - onnx = [ - onnxconverter-common - tf2onnx - onnxruntime - onnxruntime-tools - ]; - modelcreation = [ cookiecutter ]; - sagemaker = [ sagemaker ]; - deepspeed = [ - # deepspeed - accelerate - ]; - fairscale = [ fairscale ]; - optuna = [ optuna ]; - ray = [ ray ] ++ ray.optional-dependencies.tune; - # sigopt = [ sigopt ]; - # integrations = ray ++ optuna ++ sigopt; - serving = [ - pydantic - uvicorn - fastapi - starlette - ]; - audio = audio; - speech = [ torchaudio ] ++ audio; - torch-speech = [ torchaudio ] ++ audio; - tf-speech = audio; - flax-speech = audio; - timm = [ timm ]; - torch-vision = [ torchvision ] ++ vision; - # natten = [ natten ]; - # codecarbon = [ codecarbon ]; - video = [ - av - ]; - sentencepiece = [ - sentencepiece - protobuf - ]; - }; + optional-dependencies = lib.fix (self: { + ja = [ + fugashi + ipadic + # unidic_lite + unidic + # rhoknp + sudachipy + # sudachidict_core + ]; + sklearn = [ scikit-learn ]; + torch = [ + torch + accelerate + ]; + accelerate = [ accelerate ]; + retrieval = [ + faiss + datasets + ]; + sagemaker = [ sagemaker ]; + deepspeed = [ + # deepspeed + ] + ++ self.accelerate; + optuna = [ optuna ]; + ray = [ ray ] ++ ray.optional-dependencies.tune; + kernels = [ kernels ]; + codecarbon = [ + # codecarbon + ]; + integrations = self.kernels ++ self.optuna ++ self.codecarbon ++ self.ray; + serving = [ + openai + pydantic + uvicorn + fastapi + starlette + rich + ] + ++ self.torch; + audio = [ + torchaudio + librosa + # pyctcdecode + phonemizer + ]; + vision = [ + torchvision + pillow + ]; + timm = [ timm ]; + video = [ av ]; + num2words = [ num2words ]; + sentencepiece = [ + sentencepiece + protobuf + ]; + tiktoken = [ + tiktoken + blobfile + ]; + mistral-common = [ mistral-common ] ++ mistral-common.optional-dependencies.image; + chat-template = [ + jinja2 + jmespath + ]; + quality = [ + datasets + ruff + gitpython + urllib3 + libcst + rich + ]; + benchmark = [ + # optimum-benchmark + ]; + open-telemetry = [ + opentelemetry-api + opentelemetry-exporter-otlp + opentelemetry-sdk + ]; + }); # Many tests require internet access. doCheck = false; @@ -198,6 +220,7 @@ buildPythonPackage (finalAttrs: { license = lib.licenses.asl20; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ + GaetanLepage pashashocky happysalada ]; diff --git a/pkgs/development/python-modules/trino-python-client/default.nix b/pkgs/development/python-modules/trino-python-client/default.nix index a068a7bf33d2..61899625be11 100644 --- a/pkgs/development/python-modules/trino-python-client/default.nix +++ b/pkgs/development/python-modules/trino-python-client/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "trino-python-client"; - version = "0.334.0"; + version = "0.336.0"; pyproject = true; src = fetchFromGitHub { repo = "trino-python-client"; owner = "trinodb"; tag = version; - hash = "sha256-cSwMmzIUFYX8VgSwobth8EsARUff3hhfBf+IrhuFSYM="; + hash = "sha256-Vii9WMcOQZy93Dlc6d0qzswQTdcYyHoRVuCqcbWUF4s="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/trl/default.nix b/pkgs/development/python-modules/trl/default.nix index 63672d76bbab..3a9e73c30233 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.25.1"; + version = "0.27.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "trl"; tag = "v${version}"; - hash = "sha256-f7XCrARel9DEJPe+oiGFyoaKY7jSvHo9YtQS0OWQ76s="; + hash = "sha256-NEvIWrirHqcLJpyA894NgNFPn/Svg+ND/xDMIRHW8d0="; }; build-system = [ diff --git a/pkgs/development/python-modules/troposphere/default.nix b/pkgs/development/python-modules/troposphere/default.nix index ef626df9bd36..eaf331ea9b56 100644 --- a/pkgs/development/python-modules/troposphere/default.nix +++ b/pkgs/development/python-modules/troposphere/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "troposphere"; - version = "4.9.4"; + version = "4.9.6"; format = "setuptools"; src = fetchFromGitHub { owner = "cloudtools"; repo = "troposphere"; tag = version; - hash = "sha256-s7eb8W/QjD+lNmq3bPhCP3tH8VV/xNf3cE2dGzWAgFk="; + hash = "sha256-eiwz1rpEhlCIvI7hrZrknbkEhDkG2SMZkN3Mk6pfuLA="; }; propagatedBuildInputs = [ cfn-flip ]; diff --git a/pkgs/development/python-modules/trove-classifiers/default.nix b/pkgs/development/python-modules/trove-classifiers/default.nix index 97b6fb4e6ead..3164ac119050 100644 --- a/pkgs/development/python-modules/trove-classifiers/default.nix +++ b/pkgs/development/python-modules/trove-classifiers/default.nix @@ -10,13 +10,13 @@ let self = buildPythonPackage rec { pname = "trove-classifiers"; - version = "2025.12.1.14"; + version = "2026.1.14.14"; pyproject = true; src = fetchPypi { pname = "trove_classifiers"; inherit version; - hash = "sha256-p08EAFJPyDYgqb50oHB0tcvnWU/U2X/Uwr/eYl/cFjM="; + hash = "sha256-AEklRaFAKwnUhYYFuhkOozJD02HisBycKWzga1wzJfM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index e360ef6311d9..e3dfe613033d 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -29,12 +29,12 @@ buildPythonPackage rec { pname = "trytond"; - version = "7.8.1"; + version = "7.8.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-F2sb3JgbNjbmgS5o9vUCWOBgII4Vv2E8Ml6ijTQA8D8="; + hash = "sha256-9X7/+cP4rKUJcfj3wa3ONyMkpXaHz36hrIZxeGvOpp4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tskit/default.nix b/pkgs/development/python-modules/tskit/default.nix index 393b6f9be758..a871cccd4e04 100644 --- a/pkgs/development/python-modules/tskit/default.nix +++ b/pkgs/development/python-modules/tskit/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "tskit"; - version = "0.6.4"; + version = "1.0.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-vawbt+OuPR9WLsGRtdhAFW4ILdKtxq98QbFwxPsb55I="; + hash = "sha256-d6XzOSPVh1jsRg1A49aMWFyWVN29naYyYVXs82KQ0OA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/tt-flash/default.nix b/pkgs/development/python-modules/tt-flash/default.nix index f7f9d7a27cca..3d3503f5f5da 100644 --- a/pkgs/development/python-modules/tt-flash/default.nix +++ b/pkgs/development/python-modules/tt-flash/default.nix @@ -11,14 +11,14 @@ }: buildPythonPackage rec { pname = "tt-flash"; - version = "3.3.3"; + version = "3.6.0"; pyproject = true; src = fetchFromGitHub { owner = "tenstorrent"; repo = "tt-flash"; tag = "v${version}"; - hash = "sha256-edWogH/HZZlGwyiqGbj6vunNxhsCr/+3LzmFgFGzjck="; + hash = "sha256-io3+fNQWS1Gxb0L0HcQQocOT+ROjQUk4mw7xG3om7oU="; }; build-system = [ diff --git a/pkgs/development/python-modules/tt-tools-common/default.nix b/pkgs/development/python-modules/tt-tools-common/default.nix index bdff5a7aa6ee..f2f3914e87b5 100644 --- a/pkgs/development/python-modules/tt-tools-common/default.nix +++ b/pkgs/development/python-modules/tt-tools-common/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - fetchpatch, fetchFromGitHub, setuptools, distro, @@ -11,20 +10,21 @@ rich, textual, requests, + tomli, tqdm, pydantic, setuptools-scm, }: buildPythonPackage rec { pname = "tt-tools-common"; - version = "1.4.28"; + version = "1.6.0"; pyproject = true; src = fetchFromGitHub { owner = "tenstorrent"; repo = "tt-tools-common"; tag = "v${version}"; - hash = "sha256-L7MYrzQXb0LakQCx5CMlgTo0EjBoLLKC8u38eXksvoo="; + hash = "sha256-xy1UxETmuuqDmZYf67+qx8Yr8tWQ6VKmjb3md8IaInE="; }; build-system = [ @@ -40,6 +40,7 @@ buildPythonPackage rec { rich textual requests + tomli tqdm pydantic ]; diff --git a/pkgs/development/python-modules/ttkbootstrap/default.nix b/pkgs/development/python-modules/ttkbootstrap/default.nix index 626030ea4d8a..df2b776f5d8d 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.14.2"; + version = "1.20.0"; pyproject = true; src = fetchFromGitHub { owner = "israel-dryer"; repo = "ttkbootstrap"; tag = "v${version}"; - hash = "sha256-D1Gx+gP6xbeOhKcjb2uhwhHlYFhma9y04tp0ibJCw6g="; + hash = "sha256-CahjPHHcCWmZDTIWotPhMCEEIoCqnPCGpB9q/Cu7/ok="; }; build-system = [ diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index 72ecb51b2cdf..6082e3384240 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "twine"; - version = "6.1.0"; + version = "6.2.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-vjJPYnLv+R0H7pPyUe3yMvxkeTXdWFrAA1ObQkBKjb0="; + hash = "sha256-5e0NL9cMmVl3Dc5RyPOciUXFdOGBc6e4GALatRtLdc8="; }; build-system = [ diff --git a/pkgs/development/python-modules/type-infer/default.nix b/pkgs/development/python-modules/type-infer/default.nix index a085c462b164..51b629f98c70 100644 --- a/pkgs/development/python-modules/type-infer/default.nix +++ b/pkgs/development/python-modules/type-infer/default.nix @@ -25,7 +25,7 @@ let d.stopwords ]); - version = "0.0.25"; + version = "0.0.26"; tag = "v${version}"; in buildPythonPackage { @@ -37,7 +37,7 @@ buildPythonPackage { owner = "mindsdb"; repo = "type_infer"; inherit tag; - hash = "sha256-WL/2WSy3e2Mg/jNS8afUEnCt10wpXho4uOPAkVdzHWA="; + hash = "sha256-6zfe9C/werr2CbF//UuzuvP2fpwOVRy4VIlGE8UgY0o="; }; patches = [ diff --git a/pkgs/development/python-modules/typecode/default.nix b/pkgs/development/python-modules/typecode/default.nix index 6081949be6e1..68ae5ac23069 100644 --- a/pkgs/development/python-modules/typecode/default.nix +++ b/pkgs/development/python-modules/typecode/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "typecode"; - version = "30.0.2"; + version = "30.1.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-F2idIK8K5hFueX7yxd5l8M6AkSjPDmhHmzS9a6S8OJg="; + hash = "sha256-/KNhekPDB1eGVtcGNMKHx9oyruP97of7ydzx+9P7dQ8="; }; dontConfigure = true; diff --git a/pkgs/development/python-modules/types-greenlet/default.nix b/pkgs/development/python-modules/types-greenlet/default.nix index acc25f83a0e4..c571ec00b414 100644 --- a/pkgs/development/python-modules/types-greenlet/default.nix +++ b/pkgs/development/python-modules/types-greenlet/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "types-greenlet"; - version = "3.2.0.20250915"; + version = "3.3.0.20251206"; pyproject = true; src = fetchPypi { pname = "types_greenlet"; inherit version; - hash = "sha256-gxo5Cx1HibFzsGesVGpAJPqcQ4JdufZhlJFt0MheOSU="; + hash = "sha256-PhqzEqtxVMCO3C6BEPvwDZkgMj7cEUStRZt7AFIGMFU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-mock/default.nix b/pkgs/development/python-modules/types-mock/default.nix index 1c006723ea44..b96715b880dd 100644 --- a/pkgs/development/python-modules/types-mock/default.nix +++ b/pkgs/development/python-modules/types-mock/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "types-mock"; - version = "5.2.0.20250809"; + version = "5.2.0.20250924"; pyproject = true; src = fetchPypi { pname = "types_mock"; inherit version; - hash = "sha256-lUjrwvuzhZ8HZcghXwsGOJeliliTD5VGeoFKnJ3naxY="; + hash = "sha256-lTGXVDtBg/ADY+jmJvbHq+oaP3pN1p0Zmt23CwG2uzU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-psutil/default.nix b/pkgs/development/python-modules/types-psutil/default.nix index 1e10b10ca1d2..d740c0e012f2 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.20250822"; + version = "7.2.1.20260116"; format = "setuptools"; src = fetchPypi { pname = "types_psutil"; inherit version; - hash = "sha256-Imy8DA6pzApQuKvMHZGibIdty0C+I4Ex9peINpBBlpg="; + hash = "sha256-RmG+XV16zV2K+wKpLQUWCmy7LOdHIyRbUfe6ff25+YE="; }; # 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 ac125b8946d6..bd02670b76ce 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.20250708"; + version = "2.9.0.20251115"; pyproject = true; src = fetchPypi { pname = "types_python_dateutil"; inherit version; - hash = "sha256-zNvXXastbJaWw1BXnzTP/iwoHkxfJ6WFsqJDjdHVyKs="; + hash = "sha256-ikfyw5IPUqmUBWuHhjCbQxQ/qlpk1Muyci1q3avfGlg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-pyyaml/default.nix b/pkgs/development/python-modules/types-pyyaml/default.nix index b9ee469c1c78..ccf561b1583f 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.20250516"; + version = "6.0.12.20250915"; pyproject = true; src = fetchPypi { pname = "types_pyyaml"; inherit version; - hash = "sha256-nyGnAhb8D6GyFqgXbbX54K9us10vKTKsuHaJ0Dpb9ro="; + hash = "sha256-D4tUpSjDA/Dm9xZWh90z+vqByAf8rCP2MrY6piTO0dM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index e0d604bd1d63..7bc8d05232ad 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.32.4.20250913"; + version = "2.32.4.20260107"; pyproject = true; src = fetchPypi { pname = "types_requests"; inherit version; - hash = "sha256-q9bU+c46k4PyaXdamDWkwk5c1rn2R9ZPiKpGE8M9710="; + hash = "sha256-AYoRrBWPgBv6hIV93sFlB1Djk9+KAEqKmuKpvsb8sk8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index 1d50f1116e12..3131b16db495 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 = "80.9.0.20250822"; + version = "80.9.0.20251223"; pyproject = true; src = fetchPypi { pname = "types_setuptools"; inherit version; - hash = "sha256-Bw6ncWlo7GeoTH93aNmVL/JNKLZbZZR5ekZPGzBm+WU="; + hash = "sha256-00EQWa4vXwOYUhfYasYITv6iyenKzV8Iae+VDzCBabI="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/typesense/default.nix b/pkgs/development/python-modules/typesense/default.nix index 78441621aa8d..f3fb86c02caf 100644 --- a/pkgs/development/python-modules/typesense/default.nix +++ b/pkgs/development/python-modules/typesense/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "typesense"; - version = "1.1.1"; + version = "1.3.0"; pyproject = true; src = fetchFromGitHub { owner = "typesense"; repo = "typesense-python"; tag = "v${version}"; - hash = "sha256-vo9DW4kinb00zWW4yX8ibyelQxW3eVabn+oMddPEd18="; + hash = "sha256-b3t4l02tOiSMrkqZACV6l5f+Kb5Wfcnq9ZZCld1SKBU="; }; patches = [ diff --git a/pkgs/development/python-modules/tyro/default.nix b/pkgs/development/python-modules/tyro/default.nix index cc9a2665cd74..82c71552339d 100644 --- a/pkgs/development/python-modules/tyro/default.nix +++ b/pkgs/development/python-modules/tyro/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "tyro"; - version = "0.9.35"; + version = "1.0.5"; pyproject = true; src = fetchFromGitHub { owner = "brentyi"; repo = "tyro"; tag = "v${version}"; - hash = "sha256-W1AtdZslaQ+lBR8vTmiq+MprDjqXc8fSWZ/63mS2obY="; + hash = "sha256-/6z3XDN5WdVPVfA1LckpIAUis3dNOwg5hobR2sHlocA="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/tzdata/default.nix b/pkgs/development/python-modules/tzdata/default.nix index 7989a6016e12..100722bc9c06 100644 --- a/pkgs/development/python-modules/tzdata/default.nix +++ b/pkgs/development/python-modules/tzdata/default.nix @@ -2,26 +2,24 @@ lib, buildPythonPackage, fetchPypi, - pytest-subtests, pytestCheckHook, setuptools, }: buildPythonPackage rec { pname = "tzdata"; - version = "2025.2"; + version = "2025.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-tgpjj8wNr/rfgv4PV+U9Br3sLzbE32YoCuebzmvW8rk="; + hash = "sha256-3jnCyl3HsDRPLrqG9J1hQBnSnwYPxOvIpBeJamILVqc="; }; nativeBuildInputs = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook - pytest-subtests ]; pythonImportsCheck = [ "tzdata" ]; diff --git a/pkgs/development/python-modules/uharfbuzz/default.nix b/pkgs/development/python-modules/uharfbuzz/default.nix index 6579fe9fc7bd..b561db482b80 100644 --- a/pkgs/development/python-modules/uharfbuzz/default.nix +++ b/pkgs/development/python-modules/uharfbuzz/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "uharfbuzz"; - version = "0.51.1"; + version = "0.53.2"; pyproject = true; src = fetchFromGitHub { @@ -19,14 +19,9 @@ buildPythonPackage rec { repo = "uharfbuzz"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-mVxG0unTjMjb0/6w58Py+TARw8YmOWljTlQQwUEdMpg="; + hash = "sha256-EY5jAzcAHY4lmGsitVFtFMijEfAaSCifCjkdJhU2N1g="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "setuptools >= 36.4, < 72.2" setuptools - ''; - build-system = [ cython pkgconfig diff --git a/pkgs/development/python-modules/uhi/default.nix b/pkgs/development/python-modules/uhi/default.nix index cea807af4ebc..5c19109236cd 100644 --- a/pkgs/development/python-modules/uhi/default.nix +++ b/pkgs/development/python-modules/uhi/default.nix @@ -1,22 +1,30 @@ { lib, fetchPypi, + boost-histogram, buildPythonPackage, + h5py, hatchling, hatch-vcs, + hist, fastjsonschema, numpy, + packaging, pytestCheckHook, + pythonOlder, + tomli, + typing-extensions, + uhi, }: buildPythonPackage rec { pname = "uhi"; - version = "0.5.0"; + version = "1.0.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-lVm78vOPGKL8HY9zE5OWBo+I+JjWqa/IMyB+wP1Zoxw="; + hash = "sha256-MxGIlJsaScjbnvnVC3xNTfRgYRXRR97ZfE8FDagnDnQ="; }; build-system = [ @@ -25,11 +33,29 @@ buildPythonPackage rec { ]; dependencies = [ - fastjsonschema numpy + ] + ++ lib.optionals (pythonOlder "3.11") [ + typing-extensions ]; - checkInputs = [ pytestCheckHook ]; + optional-dependencies = { + schema = [ fastjsonschema ]; + hdf5 = [ h5py ]; + }; + + doCheck = false; # Prevents infinite recursion; use passthru.tests instead + + nativeCheckInputs = [ + boost-histogram + hist + fastjsonschema + packaging + pytestCheckHook + ] + ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + + passthru.tests.uhi = uhi.overridePythonAttrs { doCheck = true; }; meta = { description = "Universal Histogram Interface"; diff --git a/pkgs/development/python-modules/ujson/default.nix b/pkgs/development/python-modules/ujson/default.nix index 5795f3c89a1b..79049b56dc9d 100644 --- a/pkgs/development/python-modules/ujson/default.nix +++ b/pkgs/development/python-modules/ujson/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "ujson"; - version = "5.10.0"; + version = "5.11.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-s82PPF2MdzglfxAYiARE97fZtmIyxkZJ9WLXuoatS8E="; + hash = "sha256-4gSub5CfCZumtrlCExzuNZ3dorbk6jnBLri5kf4gEOA="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix index 5c4743fdbae2..b6b16b5b5d42 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.9.post2"; + version = "0.5.11"; pyproject = true; src = fetchFromGitHub { owner = "lmcinnes"; repo = "umap"; tag = "release-${version}"; - hash = "sha256-ollUXPVB07v6DkQ/d1eke0/j1f4Ekfygo1r6CtIRTuk="; + hash = "sha256-V63W9ax7iOq5+oZFRWaQbAws942JBeufnQ3IF4rcgko="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index 62e913d57463..d58e1916717b 100644 --- a/pkgs/development/python-modules/uncompyle6/default.nix +++ b/pkgs/development/python-modules/uncompyle6/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "uncompyle6"; - version = "3.9.2"; + version = "3.9.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-b3CYD/4IpksRS2hxgy/QLYbJkDX4l2qPH4Eh2tb8pCU="; + hash = "sha256-eLdk1MhDsEVfs5223rQhpI1dPruEZTe6ZESv4QfE68E="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/unearth/default.nix b/pkgs/development/python-modules/unearth/default.nix index ef0d2dfea8b4..8ff4f4590a36 100644 --- a/pkgs/development/python-modules/unearth/default.nix +++ b/pkgs/development/python-modules/unearth/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "unearth"; - version = "0.17.5"; + version = "0.18.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-oZ4cAuZLQFGNCIB5x0FvxBtFpki4GkEoqsAllyNO5ro="; + hash = "sha256-HlPX9S9G3V+HXnf/HFWxJHfiFaCS5LZsl2SnffSptSA="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/unidata-blocks/default.nix b/pkgs/development/python-modules/unidata-blocks/default.nix index a10fcc7794fd..fe2b5e3a8807 100644 --- a/pkgs/development/python-modules/unidata-blocks/default.nix +++ b/pkgs/development/python-modules/unidata-blocks/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "unidata-blocks"; - version = "0.0.18"; + version = "0.0.24"; pyproject = true; src = fetchPypi { pname = "unidata_blocks"; inherit version; - hash = "sha256-ptmkFJKRXXPE+EE5sXR562rChzQr/WOWZoQno6EFQ8U="; + hash = "sha256-yQJW4u0v9TrYNPOeEqhOnCcuyrgpj4Qy1ayLBeCgp2E="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/unittest-xml-reporting/default.nix b/pkgs/development/python-modules/unittest-xml-reporting/default.nix index 5f7aea1a8143..c991f1b6cf5f 100644 --- a/pkgs/development/python-modules/unittest-xml-reporting/default.nix +++ b/pkgs/development/python-modules/unittest-xml-reporting/default.nix @@ -6,21 +6,25 @@ pytestCheckHook, pythonAtLeast, setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "unittest-xml-reporting"; - version = "3.2.0"; + version = "4.0.0"; pyproject = true; src = fetchFromGitHub { owner = "xmlrunner"; repo = "unittest-xml-reporting"; tag = version; - hash = "sha256-lOJ/+8CVJUXdIaZLLF5PpPkG0DzlNgo46kRZ1Xy7Ju0="; + hash = "sha256-9gV/DX/G12bthonBJlMDKaS6Iwt9nF5DrNG33KK7KbU="; }; - build-system = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; dependencies = [ lxml ]; @@ -39,7 +43,7 @@ buildPythonPackage rec { meta = { description = "Unittest-based test runner with Ant/JUnit like XML reporting"; homepage = "https://github.com/xmlrunner/unittest-xml-reporting"; - changelog = "https://github.com/xmlrunner/unittest-xml-reporting/releases/tag/${version}"; + changelog = "https://github.com/xmlrunner/unittest-xml-reporting/releases/tag/${src.tag}"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ rprospero ]; }; diff --git a/pkgs/development/python-modules/universal-pathlib/default.nix b/pkgs/development/python-modules/universal-pathlib/default.nix index e4a094d63976..ddcc59e9f0eb 100644 --- a/pkgs/development/python-modules/universal-pathlib/default.nix +++ b/pkgs/development/python-modules/universal-pathlib/default.nix @@ -5,17 +5,18 @@ setuptools, setuptools-scm, fsspec, + pathlib-abc, }: buildPythonPackage rec { pname = "universal-pathlib"; - version = "0.2.6"; + version = "0.3.8"; pyproject = true; src = fetchPypi { pname = "universal_pathlib"; inherit version; - hash = "sha256-UIF6rqqfQWPLHnb1vfhCB/oFznKLI/13lHmzRi5UMKw="; + hash = "sha256-6tK2W8o99uEcO3yzb8mEY0C8PC2071cTFVAmBCKwo+g="; }; build-system = [ @@ -23,7 +24,10 @@ buildPythonPackage rec { setuptools-scm ]; - dependencies = [ fsspec ]; + dependencies = [ + fsspec + pathlib-abc + ]; pythonImportsCheck = [ "upath" ]; diff --git a/pkgs/development/python-modules/unsloth-zoo/default.nix b/pkgs/development/python-modules/unsloth-zoo/default.nix index 98cd71469681..8549a8c0ee5c 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.9.5"; + version = "2026.1.3"; pyproject = true; # no tags on GitHub src = fetchPypi { pname = "unsloth_zoo"; inherit version; - hash = "sha256-wlKlXTgEdfkz4j//LHw23CmeL7toINg5IUxcpwrPtAw="; + hash = "sha256-njArRI9y6EKwZamJnQoWQIvmYzV6t0syUIi1d7DzX4U="; }; # 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 9b6fa8befe4b..c5e1a8425c41 100644 --- a/pkgs/development/python-modules/unsloth/default.nix +++ b/pkgs/development/python-modules/unsloth/default.nix @@ -53,14 +53,14 @@ in buildPythonPackage rec { pname = "unsloth"; - version = "2025.9.4"; + version = "2026.1.3"; pyproject = true; # Tags on the GitHub repo don't match src = fetchPypi { pname = "unsloth"; inherit version; - hash = "sha256-aT/RS48hBMZT1ab1Rx1lpSMi6yyEzJCASzDAP0d6ixA="; + hash = "sha256-Vq47dKdOyRm+sQmGkfEQ8vM1A1Xq7NwqyE2NGhgyK/s="; }; build-system = [ diff --git a/pkgs/development/python-modules/unstructured-inference/default.nix b/pkgs/development/python-modules/unstructured-inference/default.nix index 443d93f4a95c..dc9162b7732a 100644 --- a/pkgs/development/python-modules/unstructured-inference/default.nix +++ b/pkgs/development/python-modules/unstructured-inference/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "unstructured-inference"; - version = "1.1.4"; + version = "1.1.7"; pyproject = true; src = fetchFromGitHub { owner = "Unstructured-IO"; repo = "unstructured-inference"; tag = version; - hash = "sha256-2yLBP2FNEn3tQV63qtlpz6mMjE4rsDr3JItYnpIU3iM="; + hash = "sha256-RY+acfyAGP2r8axfifQkTSkbwkrZ0u6KvFwds24IkMc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix index 9d811ac4b06f..e46a48df4554 100644 --- a/pkgs/development/python-modules/unstructured/default.nix +++ b/pkgs/development/python-modules/unstructured/default.nix @@ -91,6 +91,7 @@ et-xmlfile, networkx, numpy, + numba, openpyxl, pandas, xlrd, @@ -116,7 +117,7 @@ grpcio, }: let - version = "0.18.27"; + version = "0.18.28"; in buildPythonPackage rec { pname = "unstructured"; @@ -127,7 +128,7 @@ buildPythonPackage rec { owner = "Unstructured-IO"; repo = "unstructured"; tag = version; - hash = "sha256-QPCnMDKk10AeiMRNFMRekvSdqKoAyCJmwMnr9qJIzmg="; + hash = "sha256-zs7T52SkC9PDnx0O/XChHMfnRnPwbbOz8/8ea3jyjNA="; }; build-system = [ setuptools ]; @@ -160,6 +161,7 @@ buildPythonPackage rec { mypy-extensions nest-asyncio nltk + numba numpy olefile orderly-set diff --git a/pkgs/development/python-modules/uplc/default.nix b/pkgs/development/python-modules/uplc/default.nix index 127f75b41ec2..31a18e3c13fc 100644 --- a/pkgs/development/python-modules/uplc/default.nix +++ b/pkgs/development/python-modules/uplc/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "uplc"; - version = "1.0.10"; + version = "1.3.2"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "OpShin"; repo = "uplc"; tag = version; - hash = "sha256-Owo4W4jChrdYnz11BbWQdm2SiwFwOJlqjYutuRyjpxs="; + hash = "sha256-E9uCt1SW8nlhvsgALd24aD5QWjTyM2aO1d7+GZ+IHrA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix index d4e326bb40ef..fe37b4ad0c47 100644 --- a/pkgs/development/python-modules/uritools/default.nix +++ b/pkgs/development/python-modules/uritools/default.nix @@ -2,18 +2,21 @@ lib, buildPythonPackage, fetchPypi, + setuptools, }: buildPythonPackage rec { pname = "uritools"; - version = "5.0.0"; - format = "setuptools"; + version = "6.0.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-aBgMrRVAYr1bXZ/83UZPjeaTRBSyVGKugHsAuN+TRd4="; + hash = "sha256-L56cuVTnh3Iysshj9ySkSgbrmNnH691pkUh26Uh7lPg="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "uritools" ]; meta = { diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index 30ab03edc694..047c47c2dcbe 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -31,12 +31,12 @@ let self = buildPythonPackage rec { pname = "urllib3"; - version = "2.6.0"; + version = "2.6.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-y5vO9aSzRdXaXRRdw+MINPWOgBiCjLxyTTC0y31NSfE="; + hash = "sha256-G2K2iElEpX2+MhUJq5T9TTswcHXgwurpkaxx7hWtOO0="; }; build-system = [ diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 81f6bf4b83b3..fee9037a6092 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -7,6 +7,7 @@ pygobject3, pyserial, pytestCheckHook, + pythonOlder, pyzmq, setuptools, setuptools-scm, @@ -19,14 +20,14 @@ buildPythonPackage rec { pname = "urwid"; - version = "3.0.4"; + version = "3.0.5"; pyproject = true; src = fetchFromGitHub { owner = "urwid"; repo = "urwid"; tag = version; - hash = "sha256-mKBLAoEBiqr//1Gl8DAmpUJ9woq6Zf2HhbYEirAoi2M="; + hash = "sha256-9ajcpyQTSASz8A4eM78vPjL+9Rk07Q30JmIrSx0Crpo="; }; postPatch = '' @@ -44,12 +45,10 @@ buildPythonPackage rec { ]; optional-dependencies = { + curses = [ ]; glib = [ pygobject3 ]; tornado = [ tornado ]; - trio = [ - exceptiongroup - trio - ]; + trio = [ trio ] ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ]; twisted = [ twisted ]; zmq = [ pyzmq ]; serial = [ pyserial ]; diff --git a/pkgs/development/python-modules/uv-build/built-by-uv.nix b/pkgs/development/python-modules/uv-build/built-by-uv.nix index aa3ba16693ff..7b4d35d85556 100644 --- a/pkgs/development/python-modules/uv-build/built-by-uv.nix +++ b/pkgs/development/python-modules/uv-build/built-by-uv.nix @@ -1,6 +1,5 @@ { buildPythonPackage, - uv, uv-build, anyio, pytestCheckHook, @@ -10,7 +9,7 @@ buildPythonPackage { version = "0.1.0"; pyproject = true; - src = "${uv.src}/scripts/packages/built-by-uv"; + src = "${uv-build.src}/test/packages/built-by-uv"; build-system = [ uv-build ]; diff --git a/pkgs/development/python-modules/uv-build/default.nix b/pkgs/development/python-modules/uv-build/default.nix index 02db3b5064ae..c37b17d316c7 100644 --- a/pkgs/development/python-modules/uv-build/default.nix +++ b/pkgs/development/python-modules/uv-build/default.nix @@ -7,16 +7,16 @@ callPackage, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "uv-build"; - version = "0.9.9"; + version = "0.10.0"; pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; - tag = version; - hash = "sha256-i9vdpHA9EfXmw5fhK1tTZG0T2zOlDbjPCGBIizvQzZw="; + tag = finalAttrs.version; + hash = "sha256-nD26zqKMK5LNkeYdqVYteeYL4mYaQQ/QlyjbMDDhLAY="; }; nativeBuildInputs = [ @@ -25,8 +25,8 @@ buildPythonPackage rec { ]; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; - hash = "sha256-RZkIjHQElqrj+UAz+q6w1CYW3E5/YW9uy2E5KpKvw+w="; + inherit (finalAttrs) pname version src; + hash = "sha256-lEynVemQHCI7ZKD2+1n4K/AtEYRld2+aRLkDMSX8ejM="; }; buildAndTestSubdir = "crates/uv-build"; @@ -41,7 +41,7 @@ buildPythonPackage rec { # Run the tests of a package built by `uv_build`. passthru = { - tests.built-by-uv = callPackage ./built-by-uv.nix { inherit (pkgs) uv; }; + tests.built-by-uv = callPackage ./built-by-uv.nix { }; # updateScript is not needed here, as updating is done on staging }; @@ -52,4 +52,4 @@ buildPythonPackage rec { inherit (pkgs.uv.meta) changelog license; maintainers = with lib.maintainers; [ bengsparks ]; }; -} +}) diff --git a/pkgs/development/python-modules/uv-dynamic-versioning/default.nix b/pkgs/development/python-modules/uv-dynamic-versioning/default.nix index 7c7b85951e23..178ab5803106 100644 --- a/pkgs/development/python-modules/uv-dynamic-versioning/default.nix +++ b/pkgs/development/python-modules/uv-dynamic-versioning/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "uv-dynamic-versioning"; - version = "0.12.0"; + version = "0.13.0"; pyproject = true; src = fetchFromGitHub { @@ -28,7 +28,7 @@ buildPythonPackage rec { tag = "v${version}"; # Tests perform mock operations on the local repo leaveDotGit = true; - hash = "sha256-wa77MZnKa8Kvswli2cymUtpXRumnocaJ0xn4h3J/DAs="; + hash = "sha256-MI4LRo9XDmafXQ/xN1G8vtrBVE20qviwspMo5vIabFI="; }; build-system = [ @@ -62,7 +62,7 @@ buildPythonPackage rec { meta = { description = "Dynamic versioning based on VCS tags for uv/hatch project"; homepage = "https://github.com/ninoseki/uv-dynamic-versioning"; - changelog = "https://github.com/ninoseki/uv-dynamic-versioning/releases/tag/v${version}"; + changelog = "https://github.com/ninoseki/uv-dynamic-versioning/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; }; diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index e1675593cf99..9bdc07615fe1 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "uvicorn"; - version = "0.38.0"; + version = "0.40.0"; pyproject = true; src = fetchFromGitHub { owner = "encode"; repo = "uvicorn"; tag = version; - hash = "sha256-A0YpFA/Oug5a37+33ac8++lh30jzRl48IhC8pflZ0S0="; + hash = "sha256-YpmvMZJxxpMdwbhFQSu+0fo7kcM6w3zJ7jI5LVamV1E="; }; outputs = [ diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index b917ea456f33..629c2cba2e0d 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "uvloop"; - version = "0.22.0"; + version = "0.22.1"; pyproject = true; src = fetchFromGitHub { owner = "MagicStack"; repo = "uvloop"; tag = "v${version}"; - hash = "sha256-LAOa+Oshssy4ZHl4eE6dn2DeZQ9d5tRDV5Hv9BCJJ3c="; + hash = "sha256-9NJugzxFycr1LLZXiDKbpeVcIvlCPHHIcYMp8jmffuE="; }; postPatch = '' @@ -99,7 +99,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; meta = { - changelog = "https://github.com/MagicStack/uvloop/releases/tag/v${version}"; + changelog = "https://github.com/MagicStack/uvloop/releases/tag/${src.tag}"; description = "Fast implementation of asyncio event loop on top of libuv"; homepage = "https://github.com/MagicStack/uvloop"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix index 31d094589845..78e41447623a 100644 --- a/pkgs/development/python-modules/vcrpy/default.nix +++ b/pkgs/development/python-modules/vcrpy/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, setuptools, pytest-httpbin, pytestCheckHook, @@ -15,24 +14,16 @@ buildPythonPackage rec { pname = "vcrpy"; - version = "7.0.0"; + version = "8.1.1"; pyproject = true; src = fetchFromGitHub { owner = "kevin1024"; repo = "vcrpy"; tag = "v${version}"; - hash = "sha256-uKVPU1DU0GcpRqPzPMSNTLLVetZeQjUMC9vcaGwy0Yk="; + hash = "sha256-X6cOoj+XP0lVvf78FTb7FkNqrq5RfXtQlQ3lcOzr3D8="; }; - patches = [ - (fetchpatch { - # python 3.14 compat - url = "https://github.com/kevin1024/vcrpy/commit/558c7fc625e66775da11ee406001f300e6188fb2.patch"; - hash = "sha256-keShvz8zwqkenEtQ+NAnGKwSLYGbtXfpfMP8Zje2p+o="; - }) - ]; - build-system = [ setuptools ]; dependencies = [ @@ -62,7 +53,7 @@ buildPythonPackage rec { meta = { description = "Automatically mock your HTTP interactions to simplify and speed up testing"; homepage = "https://github.com/kevin1024/vcrpy"; - changelog = "https://github.com/kevin1024/vcrpy/releases/tag/v${version}"; + changelog = "https://github.com/kevin1024/vcrpy/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/victron-mqtt/default.nix b/pkgs/development/python-modules/victron-mqtt/default.nix new file mode 100644 index 000000000000..582aa93285f8 --- /dev/null +++ b/pkgs/development/python-modules/victron-mqtt/default.nix @@ -0,0 +1,60 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + paho-mqtt, + pytest-asyncio, + pytest-mock, + pytestCheckHook, + victron-vrm, +}: + +buildPythonPackage (finalAttrs: { + pname = "victron-mqtt"; + version = "2026.1.8"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tomer-w"; + repo = "victron_mqtt"; + tag = "v${finalAttrs.version}"; + hash = "sha256-KSfP7kZZzMPYa6HWlLS/jF6kJWyHX8SemA9bTPsI11w="; + }; + + build-system = [ + hatchling + ]; + + dependencies = [ + paho-mqtt + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytest-mock + pytestCheckHook + ]; + + disabledTests = [ + # requires local mqtt broker + "test_connect" + "test_create_full_raw_snapshot" + "test_devices_and_metrics" + "test_two_hubs_connect" + # network access + "test_connect_auth_failure" + ]; + + pythonImportsCheck = [ + "victron_mqtt" + ]; + + meta = { + changelog = "https://github.com/tomer-w/victron_mqtt/releases/tag/${finalAttrs.src.tag}"; + description = "Victron Venus MQTT client library documentation"; + homepage = "https://github.com/tomer-w/victron_mqtt"; + license = lib.licenses.mit; + inherit (victron-vrm.meta) maintainers; + }; +}) diff --git a/pkgs/development/python-modules/victron-vrm/default.nix b/pkgs/development/python-modules/victron-vrm/default.nix index fdb916295599..597fb0b22cca 100644 --- a/pkgs/development/python-modules/victron-vrm/default.nix +++ b/pkgs/development/python-modules/victron-vrm/default.nix @@ -8,18 +8,19 @@ pytest-asyncio, pytestCheckHook, pytz, + victron-mqtt, }: buildPythonPackage rec { pname = "victron-vrm"; - version = "0.1.8"; + version = "0.1.11"; pyproject = true; src = fetchFromGitHub { owner = "KSoft-Si"; repo = "vrm-client"; tag = "v${version}"; - hash = "sha256-NxkMUwiFD8C7Nrtd7cjoFvdkbAOJkIIt+TPtkous8Nc="; + hash = "sha256-t8YwoQzrcxX24xN2luvJLYaIZSoD3+guYETWeYE4tRw="; }; build-system = [ hatchling ]; @@ -28,8 +29,11 @@ buildPythonPackage rec { aiohttp pydantic pytz + victron-mqtt ]; + pythonRelaxDeps = [ "victron-mqtt" ]; + pythonImportsCheck = [ "victron_vrm" ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/viser/default.nix b/pkgs/development/python-modules/viser/default.nix index 032bbd622ae8..169aa0c75566 100644 --- a/pkgs/development/python-modules/viser/default.nix +++ b/pkgs/development/python-modules/viser/default.nix @@ -51,14 +51,14 @@ buildPythonPackage rec { pname = "viser"; - version = "1.0.4"; + version = "1.0.20"; pyproject = true; src = fetchFromGitHub { owner = "nerfstudio-project"; repo = "viser"; tag = "v${version}"; - hash = "sha256-AS5D6pco6wzQ414yxvv0K9FB3tfP1BvqigRLJJXDduU="; + hash = "sha256-usnvEvuBNPrqRXV7jh0qw1ppmZgAe1CUhAwd/M5CvC0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/voluptuous-openapi/default.nix b/pkgs/development/python-modules/voluptuous-openapi/default.nix index e70cae321220..52400684d14e 100644 --- a/pkgs/development/python-modules/voluptuous-openapi/default.nix +++ b/pkgs/development/python-modules/voluptuous-openapi/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "voluptuous-openapi"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "voluptuous-openapi"; tag = version; - hash = "sha256-uIW+WyfSNdGxD7tA6ERf3nTp1tFhWd+lxFUNQM0O3nU="; + hash = "sha256-e94D87plGOcdXFLmZ4MhOt5xWbcoqyo3FgYbbXV8nNU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/voluptuous/default.nix b/pkgs/development/python-modules/voluptuous/default.nix index 0550cd81428b..654c992cbdfa 100644 --- a/pkgs/development/python-modules/voluptuous/default.nix +++ b/pkgs/development/python-modules/voluptuous/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "voluptuous"; - version = "0.15.2"; + version = "0.16.0"; pyproject = true; src = fetchFromGitHub { owner = "alecthomas"; repo = "voluptuous"; tag = version; - hash = "sha256-TGTdYme3ZRM51YFNX/ESFc6+3QpeO/gAXYW6MT73/Ss="; + hash = "sha256-Lph+vNsMm69Oqqk3mX27+BR1PsZNxqiI5Uu8nY8hCBc="; }; nativeBuildInputs = [ setuptools ]; @@ -30,7 +30,7 @@ buildPythonPackage rec { description = "Python data validation library"; downloadPage = "https://github.com/alecthomas/voluptuous"; homepage = "http://alecthomas.github.io/voluptuous/"; - changelog = "https://github.com/alecthomas/voluptuous/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/alecthomas/voluptuous/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/warp-lang/default.nix b/pkgs/development/python-modules/warp-lang/default.nix index d9550d87bd0f..9271b6eb8001 100644 --- a/pkgs/development/python-modules/warp-lang/default.nix +++ b/pkgs/development/python-modules/warp-lang/default.nix @@ -39,13 +39,11 @@ let effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else args.stdenv; stdenv = throw "Use effectiveStdenv instead of stdenv directly, as it may be replaced by cudaPackages.backendStdenv"; - version = "1.10.0"; - libmathdx = callPackage ./libmathdx.nix { }; in -buildPythonPackage.override { stdenv = effectiveStdenv; } { +buildPythonPackage.override { stdenv = effectiveStdenv; } (finalAttrs: { pname = "warp-lang"; - inherit version; + version = "1.11.0"; pyproject = true; # TODO(@connorbaker): Some CUDA setup hook is failing when __structuredAttrs is false, @@ -56,8 +54,8 @@ buildPythonPackage.override { stdenv = effectiveStdenv; } { src = fetchFromGitHub { owner = "NVIDIA"; repo = "warp"; - tag = "v${version}"; - hash = "sha256-9OEyYdVq+/SzxHfNT+sa/YeBKklaUfpKUiJZuiuzxhQ="; + tag = "v${finalAttrs.version}"; + hash = "sha256-wV4F6E4l0lfPB8zk/XhmdMNk649j5aJelW/DVu2R5mM="; }; patches = lib.optionals standaloneSupport [ @@ -314,9 +312,9 @@ buildPythonPackage.override { stdenv = effectiveStdenv; } { JAX and Paddle. ''; homepage = "https://github.com/NVIDIA/warp"; - changelog = "https://github.com/NVIDIA/warp/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/NVIDIA/warp/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; platforms = lib.platforms.linux ++ [ "aarch64-darwin" ]; maintainers = with lib.maintainers; [ yzx9 ]; }; -} +}) diff --git a/pkgs/development/python-modules/wcwidth/default.nix b/pkgs/development/python-modules/wcwidth/default.nix index 49bf5de180d9..8d81d4770def 100644 --- a/pkgs/development/python-modules/wcwidth/default.nix +++ b/pkgs/development/python-modules/wcwidth/default.nix @@ -1,27 +1,30 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + hatchling, + pytest-cov-stub, pytestCheckHook, - setuptools, }: buildPythonPackage rec { pname = "wcwidth"; - version = "0.2.13"; + version = "0.4.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-cuoMBjmesobZeP3ttpI6nrR+HEhs5j6bTmT8GDA5crU="; + src = fetchFromGitHub { + owner = "jquast"; + repo = "wcwidth"; + tag = version; + hash = "sha256-TQFvXmYkcsDojZSPAR76Dyq2vRUO41sII0nhC78Fd7Y="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ hatchling ]; - nativeCheckInputs = [ pytestCheckHook ]; - - # To prevent infinite recursion with pytest - doCheck = false; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "wcwidth" ]; @@ -34,7 +37,7 @@ buildPythonPackage rec { no 3rd-party dependencies. ''; homepage = "https://github.com/jquast/wcwidth"; - changelog = "https://github.com/jquast/wcwidth/releases/tag/${version}"; + changelog = "https://github.com/jquast/wcwidth/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index 68656efea693..bf076964b914 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -32,7 +32,7 @@ buildPythonPackage (finalAttrs: { pname = "weasyprint"; - version = "66.0"; + version = "68.0"; pyproject = true; __darwinAllowLocalNetworking = true; @@ -41,7 +41,7 @@ buildPythonPackage (finalAttrs: { owner = "Kozea"; repo = "WeasyPrint"; tag = "v${finalAttrs.version}"; - hash = "sha256-wmEDVEbikBpOQ5394IBPWQRjWZOLfMzEGxTtq4tt2Tw="; + hash = "sha256-kAJgSQz1RKrPwzO7I5xHXyXcXYJtvca9izjrAgTy3ek="; }; patches = [ @@ -99,6 +99,8 @@ buildPythonPackage (finalAttrs: { "test_woff_simple" # AssertionError "test_2d_transform" + # Reported upstream: https://github.com/Kozea/WeasyPrint/issues/2666 + "test_text_stroke" ]; FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; diff --git a/pkgs/development/python-modules/weasyprint/library-paths.patch b/pkgs/development/python-modules/weasyprint/library-paths.patch index dd2bbfe784e0..6053fbdc1ef0 100644 --- a/pkgs/development/python-modules/weasyprint/library-paths.patch +++ b/pkgs/development/python-modules/weasyprint/library-paths.patch @@ -1,14 +1,14 @@ diff --git a/weasyprint/text/ffi.py b/weasyprint/text/ffi.py -index b5a9cf2..9380a79 100644 +index f57da3c..c50e41d 100644 --- a/weasyprint/text/ffi.py +++ b/weasyprint/text/ffi.py -@@ -444,25 +444,12 @@ if hasattr(os, 'add_dll_directory') and not hasattr(sys, 'frozen'): # pragma: n +@@ -473,25 +473,12 @@ if hasattr(os, 'add_dll_directory') and not hasattr(sys, 'frozen'): # pragma: n with suppress((OSError, FileNotFoundError)): os.add_dll_directory(dll_directory) -gobject = _dlopen( - ffi, 'libgobject-2.0-0', 'gobject-2.0-0', 'gobject-2.0', -- 'libgobject-2.0.so.0', 'libgobject-2.0.dylib', 'libgobject-2.0-0.dll') +- 'libgobject-2.0.so.0', 'libgobject-2.0.0.dylib', 'libgobject-2.0-0.dll') -pango = _dlopen( - ffi, 'libpango-1.0-0', 'pango-1.0-0', 'pango-1.0', 'libpango-1.0.so.0', - 'libpango-1.0.dylib', 'libpango-1.0-0.dll') @@ -25,12 +25,12 @@ index b5a9cf2..9380a79 100644 -pangoft2 = _dlopen( - ffi, 'libpangoft2-1.0-0', 'pangoft2-1.0-0', 'pangoft2-1.0', - 'libpangoft2-1.0.so.0', 'libpangoft2-1.0.dylib', 'libpangoft2-1.0-0.dll') -+gobject = _dlopen(ffi, "@gobject@") -+pango = _dlopen(ffi, "@pango@") -+harfbuzz = _dlopen(ffi, "@harfbuzz@") -+harfbuzz_subset = _dlopen(ffi, "@harfbuzz_subset@", allow_fail=True) -+fontconfig = _dlopen(ffi, "@fontconfig@") -+pangoft2 = _dlopen(ffi, "@pangoft2@") ++gobject = _dlopen(ffi, '@gobject@') ++pango = _dlopen(ffi, '@pango@') ++harfbuzz = _dlopen(ffi, '@harfbuzz@') ++harfbuzz_subset = _dlopen(ffi, '@harfbuzz_subset@', allow_fail=True) ++fontconfig = _dlopen(ffi, '@fontconfig@') ++pangoft2 = _dlopen(ffi, '@pangoft2@') gobject.g_type_init() diff --git a/pkgs/development/python-modules/webargs/default.nix b/pkgs/development/python-modules/webargs/default.nix index a3b9e3349214..46e2101ef2e7 100644 --- a/pkgs/development/python-modules/webargs/default.nix +++ b/pkgs/development/python-modules/webargs/default.nix @@ -2,7 +2,6 @@ buildPythonPackage, fetchPypi, lib, - pythonAtLeast, flit-core, marshmallow, pytestCheckHook, @@ -16,26 +15,18 @@ pyramid, falcon, aiohttp, - fetchpatch, }: buildPythonPackage rec { pname = "webargs"; - version = "8.7.0"; + version = "8.7.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-DGF97BntTx/2skfNc4VelJ2HBS1xkAk4tx8Mr9kvGRs="; + hash = "sha256-eZv5A5x2wj/Y3BlREHp1qeVhIDwV1q6PicHkbiNGNsE="; }; - patches = [ - (fetchpatch { - url = "https://github.com/marshmallow-code/webargs/commit/a6a5043ee34b0a22885b3625de6d4fdffc3b715b.patch"; - hash = "sha256-EFe76SAklgmBjfM6K8PkB0vHMCSlZ9EKAW9AbnxKmPA="; - }) - ]; - build-system = [ flit-core ]; dependencies = [ marshmallow ]; diff --git a/pkgs/development/python-modules/webassets/default.nix b/pkgs/development/python-modules/webassets/default.nix index 347eadfdcfb6..0510eb6f44d8 100644 --- a/pkgs/development/python-modules/webassets/default.nix +++ b/pkgs/development/python-modules/webassets/default.nix @@ -6,43 +6,27 @@ pyyaml, jinja2, mock, - fetchpatch2, pytestCheckHook, distutils, + zope-dottedname, }: buildPythonPackage rec { pname = "webassets"; - version = "2.0"; + version = "3.0.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-FnEyM3Z3yM7clwUJD21I2j+yYsjgsnc7KfM1LwUBgc0="; + hash = "sha256-BSDl/W+8wBL0hv78YblmR02o/Bs1sFaansLLB4LxYHo="; }; - patches = [ - # remove nose and extra mock - (fetchpatch2 { - name = "remove-nose-and-mock.patch"; - url = "https://github.com/miracle2k/webassets/commit/26e203929eebbb4cdbb9967cf47fefa95df8f24d.patch?full_index=1"; - hash = "sha256-+jrMT6Sl/MOLkleUEDZkzRd5tzBTXZYNoCXRrTFVtq4="; - excludes = [ - "requirements-dev.pip" - "tox.ini" - ]; - }) - (fetchpatch2 { - name = "fix-missing-zope-skip.patch"; - url = "https://github.com/miracle2k/webassets/commit/3bfb5ea8223c46c60b922fdbbda36d9b8c5e9c9c.patch?full_index=1"; - hash = "sha256-dV8bp6vYr56mZpzw5C7ac4rXri04o4MrAhwfWUXLe4s="; - }) - ./migrate_test_setup_to_pytest.patch - ]; - build-system = [ setuptools ]; - dependencies = [ pyyaml ]; + dependencies = [ + pyyaml + zope-dottedname + ]; nativeCheckInputs = [ jinja2 @@ -51,12 +35,6 @@ buildPythonPackage rec { distutils ]; - postPatch = '' - # Fix thread attribute "isAlive" - substituteInPlace tests/test_script.py \ - --replace-fail "isAlive" "is_alive" - ''; - disabledTests = [ "TestFilterBaseClass" "TestAutoprefixer6Filter" diff --git a/pkgs/development/python-modules/webassets/migrate_test_setup_to_pytest.patch b/pkgs/development/python-modules/webassets/migrate_test_setup_to_pytest.patch deleted file mode 100644 index 134ba1df203b..000000000000 --- a/pkgs/development/python-modules/webassets/migrate_test_setup_to_pytest.patch +++ /dev/null @@ -1,591 +0,0 @@ -diff --git a/src/webassets/test.py b/src/webassets/test.py -index 232806c..a362120 100644 ---- a/src/webassets/test.py -+++ b/src/webassets/test.py -@@ -27,7 +27,7 @@ class TempDirHelper(object): - - default_files = {} - -- def setup(self): -+ def setup_method(self): - self._tempdir_created = tempfile.mkdtemp() - self.create_files(self.default_files) - -@@ -35,7 +35,7 @@ class TempDirHelper(object): - shutil.rmtree(self._tempdir_created) - - def __enter__(self): -- self.setup() -+ self.setup_method() - return self - - def __exit__(self, type, value, traceback): -@@ -136,8 +136,8 @@ class TempEnvironmentHelper(TempDirHelper): - - default_files = {'in1': 'A', 'in2': 'B', 'in3': 'C', 'in4': 'D'} - -- def setup(self): -- TempDirHelper.setup(self) -+ def setup_method(self): -+ TempDirHelper.setup_method(self) - - self.env = self._create_environment() - # Unless we explicitly test it, we don't want to use the cache -diff --git a/tests/__init__.py b/tests/__init__.py -index 7d859d3..363b641 100644 ---- a/tests/__init__.py -+++ b/tests/__init__.py -@@ -1,4 +1,4 @@ --def setup(): -+def setup_method(): - # For some strange reason (using Python 2.6.6), if a warning has - # already been raised somewhere else before a test attempts to - # capture and verify it using warnings.catch_warnings(), the warning -diff --git a/tests/test_bundle_build.py b/tests/test_bundle_build.py -index 9325bb9..86f69b9 100644 ---- a/tests/test_bundle_build.py -+++ b/tests/test_bundle_build.py -@@ -473,8 +473,8 @@ class TestAutoBuild(TempEnvironmentHelper): - generally everything involving the updater (as used by the build() method). - """ - -- def setup(self): -- TempEnvironmentHelper.setup(self) -+ def setup_method(self): -+ TempEnvironmentHelper.setup_method(self) - - class CustomUpdater(BaseUpdater): - allow = True -diff --git a/tests/test_bundle_urls.py b/tests/test_bundle_urls.py -index 317889e..9bd8753 100644 ---- a/tests/test_bundle_urls.py -+++ b/tests/test_bundle_urls.py -@@ -29,8 +29,8 @@ class BaseUrlsTester(TempEnvironmentHelper): - - default_files = {'a': '', 'b': '', 'c': '', '1': '', '2': ''} - -- def setup(self): -- TempEnvironmentHelper.setup(self) -+ def setup_method(self): -+ TempEnvironmentHelper.setup_method(self) - - self.env.url_expire = False - -@@ -282,8 +282,8 @@ class TestUrlsWithDebugTrue(BaseUrlsTester): - """Test url generation in debug mode. - """ - -- def setup(self): -- BaseUrlsTester.setup(self) -+ def setup_method(self): -+ BaseUrlsTester.setup_method(self) - self.env.debug = True - - def test_simple_bundle(self): -@@ -427,8 +427,8 @@ class TestUrlsWithDebugTrue(BaseUrlsTester): - - class TestUrlsWithDebugMerge(BaseUrlsTester): - -- def setup(self): -- BaseUrlsTester.setup(self) -+ def setup_method(self): -+ BaseUrlsTester.setup_method(self) - self.env.debug = 'merge' - - def test_simple_bundle(self): -diff --git a/tests/test_bundle_various.py b/tests/test_bundle_various.py -index b24a903..6d92eb3 100644 ---- a/tests/test_bundle_various.py -+++ b/tests/test_bundle_various.py -@@ -177,8 +177,8 @@ class TestVersionFeatures(TempEnvironmentHelper): - - default_files = {'in': 'foo'} - -- def setup(self): -- super(TestVersionFeatures, self).setup() -+ def setup_method(self): -+ super(TestVersionFeatures, self).setup_method() - self.env.manifest = DummyManifest() - self.env.versions = DummyVersion() - -@@ -371,8 +371,8 @@ class TestLoadPath(TempEnvironmentHelper): - an optional feature. - """ - -- def setup(self): -- TempEnvironmentHelper.setup(self) -+ def setup_method(self): -+ TempEnvironmentHelper.setup_method(self) - self.env.updater = False - self.env.directory = self.path('dir') - self.env.debug = True -@@ -603,8 +603,8 @@ class TestUrlContents(TempEnvironmentHelper): - """Test bundles containing a URL. - """ - -- def setup(self): -- TempEnvironmentHelper.setup(self) -+ def setup_method(self): -+ TempEnvironmentHelper.setup_method(self) - mock_opener = build_opener(MockHTTPHandler({ - 'http://foo': u'function() {}'})) - install_opener(mock_opener) -diff --git a/tests/test_cache.py b/tests/test_cache.py -index 9afbe3d..f8afb61 100644 ---- a/tests/test_cache.py -+++ b/tests/test_cache.py -@@ -89,8 +89,8 @@ class TestCacheIsUsed(TempEnvironmentHelper): - """Ensure the cache is used during the build process. - """ - -- def setup(self): -- TempEnvironmentHelper.setup(self) -+ def setup_method(self): -+ TempEnvironmentHelper.setup_method(self) - - class MyCache(BaseCache): - def __init__(self): -diff --git a/tests/test_environment.py b/tests/test_environment.py -index bd89ef6..ff36289 100644 ---- a/tests/test_environment.py -+++ b/tests/test_environment.py -@@ -13,7 +13,7 @@ from webassets import Bundle - class TestEnvApi(object): - """General Environment functionality.""" - -- def setup(self): -+ def setup_method(self): - self.m = Environment(None, None) - - def test_register_single_bundle(self): -@@ -186,7 +186,7 @@ class TestEnvConfig(object): - """Custom config values through get_config/set_config. - """ - -- def setup(self): -+ def setup_method(self): - self.m = Environment(None, None) - - def test_initial_values_override_defaults(self): -@@ -216,7 +216,7 @@ class TestSpecialProperties(object): - as a string, and would receive object instances when accessing the property. - """ - -- def setup(self): -+ def setup_method(self): - self.m = Environment('.', None) # we won't create any files - - def test_versioner(self): -diff --git a/tests/test_ext/test_jinja2.py b/tests/test_ext/test_jinja2.py -index 37139bb..155ad40 100644 ---- a/tests/test_ext/test_jinja2.py -+++ b/tests/test_ext/test_jinja2.py -@@ -12,7 +12,7 @@ from webassets.ext.jinja2 import AssetsExtension, Jinja2Loader - - class TestTemplateTag(object): - -- def setup(self): -+ def setup_method(self): - # Setup the assets environment. - assets_env = AssetsEnvironment('', '') - self.foo_bundle = Bundle() -@@ -123,8 +123,8 @@ class TestLoader(TempEnvironmentHelper): - """ - } - -- def setup(self): -- TempEnvironmentHelper.setup(self) -+ def setup_method(self): -+ TempEnvironmentHelper.setup_method(self) - self.jinja_env = JinjaEnvironment() - self.jinja_env.add_extension(AssetsExtension) - self.jinja_env.assets_environment = self.env -diff --git a/tests/test_filters.py b/tests/test_filters.py -index 9976f4e..deec66d 100644 ---- a/tests/test_filters.py -+++ b/tests/test_filters.py -@@ -79,7 +79,7 @@ class TestFilterBaseClass(object): - env = Environment(None, None) - env.config['attr1'] = 'bar' - env.config['attr4'] = 'bar' -- f = TestFilter(); f.ctx = ContextWrapper(env); f.setup() -+ f = TestFilter(); f.ctx = ContextWrapper(env); f.setup_method() - assert f.attr1 == 'bar' - assert f.attr4 is None # Was configured to not support env - -@@ -177,7 +177,7 @@ class TestExternalToolClass(object): - self.__class__.result = \ - argv, data.getvalue() if data is not None else data - -- def setup(self): -+ def setup_method(self): - if not hasattr(str, 'format'): - # A large part of this functionality is not available on Python 2.5 - pytest.skip() -@@ -630,12 +630,12 @@ class TestBuiltinFilters(TempEnvironmentHelper): - - class TestCSSPrefixer(TempEnvironmentHelper): - -- def setup(self): -+ def setup_method(self): - try: - import cssprefixer - except ImportError: - pytest.skip() -- TempEnvironmentHelper.setup(self) -+ TempEnvironmentHelper.setup_method(self) - - def test(self): - self.create_files({'in': """a { border-radius: 1em; }"""}) -@@ -650,10 +650,10 @@ class TestCSSPrefixer(TempEnvironmentHelper): - - class TestCoffeeScript(TempEnvironmentHelper): - -- def setup(self): -+ def setup_method(self): - if not find_executable('coffee'): - pytest.skip() -- TempEnvironmentHelper.setup(self) -+ TempEnvironmentHelper.setup_method(self) - - def test_default_options(self): - self.create_files({'in': "alert \"I knew it!\" if elvis?"}) -@@ -674,12 +674,12 @@ class TestCoffeeScript(TempEnvironmentHelper): - - class TestJinja2(TempEnvironmentHelper): - -- def setup(self): -+ def setup_method(self): - try: - import jinja2 - except ImportError: - pytest.skip() -- TempEnvironmentHelper.setup(self) -+ TempEnvironmentHelper.setup_method(self) - - def test_default_options(self): - self.create_files({'in': """Hi there, {{ name }}!"""}) -@@ -705,13 +705,13 @@ class TestClosure(TempEnvironmentHelper): - """ - } - -- def setup(self): -+ def setup_method(self): - try: - import closure - except ImportError: - pytest.skip() - -- TempEnvironmentHelper.setup(self) -+ TempEnvironmentHelper.setup_method(self) - - def test_closure(self): - self.mkbundle('foo.js', filters='closure_js', output='out.js').build() -@@ -832,10 +832,10 @@ class TestLess(TempEnvironmentHelper): - 'foo.less': "h1 { color: #FFFFFF; }", - } - -- def setup(self): -+ def setup_method(self): - if not find_executable('lessc'): - pytest.skip() -- TempEnvironmentHelper.setup(self) -+ TempEnvironmentHelper.setup_method(self) - - def test(self): - self.mkbundle('foo.less', filters='less', output='out.css').build() -@@ -928,14 +928,14 @@ class TestRubySass(TempEnvironmentHelper): - """, - } - -- def setup(self): -+ def setup_method(self): - if not find_executable('sass'): - pytest.skip() - - if "Ruby" not in check_output(["sass", "--version"]).decode('utf-8'): - pytest.skip() - -- TempEnvironmentHelper.setup(self) -+ TempEnvironmentHelper.setup_method(self) - - def test_sass(self): - sass = get_filter('sass_ruby', debug_info=False) -@@ -1038,10 +1038,10 @@ class TestSass(TempEnvironmentHelper): - """, - } - -- def setup(self): -+ def setup_method(self): - if not find_executable('sass'): - pytest.skip() -- TempEnvironmentHelper.setup(self) -+ TempEnvironmentHelper.setup_method(self) - - def test_sass(self): - sass = get_filter('sass') -@@ -1099,13 +1099,13 @@ class TestPyScss(TempEnvironmentHelper): - 'bar.scss': 'h1{color:red}' - } - -- def setup(self): -+ def setup_method(self): - try: - import scss - self.scss = scss - except ImportError: - pytest.skip() -- TempEnvironmentHelper.setup(self) -+ TempEnvironmentHelper.setup_method(self) - - def test(self): - self.mkbundle('foo.scss', filters='pyscss', output='out.css').build() -@@ -1136,13 +1136,13 @@ class TestLibSass(TempEnvironmentHelper): - 'b.scss': '$foo: foo !default; .test {background-color: $foo;}' - } - -- def setup(self): -+ def setup_method(self): - try: - import sass - self.sass = sass - except ImportError: - pytest.skip() -- TempEnvironmentHelper.setup(self) -+ TempEnvironmentHelper.setup_method(self) - - def test(self): - self.mkbundle('foo.scss', filters='libsass', output='out.css').build() -@@ -1198,10 +1198,10 @@ class TestCompass(TempEnvironmentHelper): - """ - } - -- def setup(self): -+ def setup_method(self): - if not find_executable('compass'): - pytest.skip() -- TempEnvironmentHelper.setup(self) -+ TempEnvironmentHelper.setup_method(self) - - def test_compass(self): - self.mkbundle('foo.sass', filters='compass', output='out.css').build() -@@ -1262,7 +1262,7 @@ class TestCompassConfig(object): - } - } - -- def setup(self): -+ def setup_method(self): - self.compass_config = CompassConfig(self.config).to_string() - - def test_compass_config_is_unicode(self): -@@ -1294,8 +1294,8 @@ class TestJST(TempEnvironmentHelper): - 'templates/bar.html': "
Im an html jst template. Go syntax highlighting!
" - } - -- def setup(self): -- TempEnvironmentHelper.setup(self) -+ def setup_method(self): -+ TempEnvironmentHelper.setup_method(self) - - def test_jst(self): - self.mkbundle('templates/*', filters='jst', output='out.js').build() -@@ -1424,10 +1424,10 @@ class TestHandlebars(TempEnvironmentHelper): - """ - } - -- def setup(self): -+ def setup_method(self): - if not find_executable('handlebars'): - pytest.skip() -- TempEnvironmentHelper.setup(self) -+ TempEnvironmentHelper.setup_method(self) - - def test_basic(self): - self.mkbundle('foo.html', 'dir/bar.html', -@@ -1461,12 +1461,12 @@ class TestJinja2JS(TempEnvironmentHelper): - ) - } - -- def setup(self): -+ def setup_method(self): - try: - import closure_soy - except: - pytest.skip() -- TempEnvironmentHelper.setup(self) -+ TempEnvironmentHelper.setup_method(self) - - def test(self): - self.mkbundle('foo.soy', filters='closure_tmpl', output='out.js').build() -@@ -1490,10 +1490,10 @@ class TestTypeScript(TempEnvironmentHelper): - 'foo.ts': """class X { z: number; }""" - } - -- def setup(self): -+ def setup_method(self): - if not find_executable('tsc'): - pytest.skip() -- TempEnvironmentHelper.setup(self) -+ TempEnvironmentHelper.setup_method(self) - - def test(self): - self.mkbundle('foo.ts', filters='typescript', output='out.js').build() -@@ -1521,10 +1521,10 @@ define("script/utils",[],function(){return{debug:console.log}}),\ - define("script/app",["./utils"],function(e){e.debug("APP")});\ - ''' - -- def setup(self): -+ def setup_method(self): - if not find_executable('r.js'): - pytest.skip('"r.js" executable not found') -- TempEnvironmentHelper.setup(self) -+ TempEnvironmentHelper.setup_method(self) - self.env.config['requirejs_config'] = self.path('requirejs.json') - self.env.config['requirejs_baseUrl'] = self.path('') - -@@ -1573,10 +1573,10 @@ class TestClosureStylesheets(TempEnvironmentHelper): - """ - } - -- def setup(self): -+ def setup_method(self): - if not 'CLOSURE_STYLESHEETS_PATH' in os.environ: - pytest.skip() -- TempEnvironmentHelper.setup(self) -+ TempEnvironmentHelper.setup_method(self) - - def test_compiler(self): - self.mkbundle('test.css', filters = 'closure_stylesheets_compiler', output = 'output.css').build() -diff --git a/tests/test_loaders.py b/tests/test_loaders.py -index f910ecb..5c183a5 100644 ---- a/tests/test_loaders.py -+++ b/tests/test_loaders.py -@@ -14,7 +14,7 @@ from webassets.exceptions import EnvironmentError - - class TestYAML(object): - -- def setup(self): -+ def setup_method(self): - yaml = pytest.importorskip("yaml") - - def loader(self, text, filename=None): -@@ -189,8 +189,8 @@ class TestPython(object): - - class TestYAMLCustomFilters(TestYAML): - -- def setup(self): -- super(TestYAMLCustomFilters, self).setup() -+ def setup_method(self): -+ super(TestYAMLCustomFilters, self).setup_method() - - # If zope.dottedname is not installed, that's OK - pytest.importorskip("zope.dottedname.resolve") -diff --git a/tests/test_script.py b/tests/test_script.py -index 84b9940..479c64b 100644 ---- a/tests/test_script.py -+++ b/tests/test_script.py -@@ -38,8 +38,8 @@ class MockBundle(Bundle): - - class TestCLI(TempEnvironmentHelper): - -- def setup(self): -- super(TestCLI, self).setup() -+ def setup_method(self): -+ super(TestCLI, self).setup_method() - self.assets_env = self.env - self.cmd_env = CommandLineEnvironment(self.assets_env, logging) - -@@ -210,8 +210,8 @@ class TestWatchCommand(TestWatchMixin, TestCLI): - - default_files = {'in': 'foo', 'out': 'bar'} - -- def setup(self): -- super(TestWatchCommand, self).setup() -+ def setup_method(self): -+ super(TestWatchCommand, self).setup_method() - - # Pay particular attention that the watch command works with auto_build - # disabled (since normally this implies no use of the updater, but -diff --git a/tests/test_updaters.py b/tests/test_updaters.py -index aaa5b72..8c5f48a 100644 ---- a/tests/test_updaters.py -+++ b/tests/test_updaters.py -@@ -15,7 +15,7 @@ class TestBundleDefBaseUpdater(object): - changes. - """ - -- def setup(self): -+ def setup_method(self): - self.env = Environment(None, None) # we won't create files - self.env.cache = MemoryCache(capacity=100) - self.bundle = Bundle(output="target") -@@ -65,8 +65,8 @@ class TestTimestampUpdater(TempEnvironmentHelper): - - default_files = {'in': '', 'out': ''} - -- def setup(self): -- TempEnvironmentHelper.setup(self) -+ def setup_method(self): -+ TempEnvironmentHelper.setup_method(self) - - # Test the timestamp updater with cache disabled, so that the - # BundleDefUpdater() base class won't interfere. -diff --git a/tests/test_version.py b/tests/test_version.py -index d83297d..3aab5eb 100644 ---- a/tests/test_version.py -+++ b/tests/test_version.py -@@ -32,8 +32,8 @@ def test_builtin_manifest_accessors(): - - class TestTimestampVersion(TempEnvironmentHelper): - -- def setup(self): -- super(TestTimestampVersion, self).setup() -+ def setup_method(self): -+ super(TestTimestampVersion, self).setup_method() - self.v = TimestampVersion() - - # Create a bunch of files with known mtimes -@@ -95,8 +95,8 @@ class TestTimestampVersion(TempEnvironmentHelper): - - class TestHashVersion(TempEnvironmentHelper): - -- def setup(self): -- super(TestHashVersion, self).setup() -+ def setup_method(self): -+ super(TestHashVersion, self).setup_method() - self.v = HashVersion() - - # Create a bunch of files with known content -@@ -140,8 +140,8 @@ class TestHashVersion(TempEnvironmentHelper): - - class TestFileManifest(TempEnvironmentHelper): - -- def setup(self): -- super(TestFileManifest, self).setup() -+ def setup_method(self): -+ super(TestFileManifest, self).setup_method() - self.bundle = self.mkbundle(output='foo') - - def test_repl(self): -@@ -177,8 +177,8 @@ class TestFileManifest(TempEnvironmentHelper): - - class TestJsonManifest(TempEnvironmentHelper): - -- def setup(self): -- super(TestJsonManifest, self).setup() -+ def setup_method(self): -+ super(TestJsonManifest, self).setup_method() - self.bundle = self.mkbundle(output='foo') - - def test_repl(self): -@@ -200,8 +200,8 @@ class TestJsonManifest(TempEnvironmentHelper): - - class TestCacheManifest(TempEnvironmentHelper): - -- def setup(self): -- super(TestCacheManifest, self).setup() -+ def setup_method(self): -+ super(TestCacheManifest, self).setup_method() - self.bundle = self.mkbundle(output='foo') - - def test_repl(self): diff --git a/pkgs/development/python-modules/websocket-client/default.nix b/pkgs/development/python-modules/websocket-client/default.nix index 664c8db18bec..0406163982b5 100644 --- a/pkgs/development/python-modules/websocket-client/default.nix +++ b/pkgs/development/python-modules/websocket-client/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "websocket-client"; - version = "1.8.0"; + version = "1.9.0"; pyproject = true; src = fetchPypi { pname = "websocket_client"; inherit version; - hash = "sha256-Mjnfn0TaYy+WASRygF1AojKBqZECfOEdL0Wm8krEw9o="; + hash = "sha256-noE2JLbrYZmZqX3HlYRpIXwxdjErOhakvRvH4IpG7Jg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index 031c44f2a9bf..237f4d9fb994 100644 --- a/pkgs/development/python-modules/websockets/default.nix +++ b/pkgs/development/python-modules/websockets/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "websockets"; - version = "15.0.1"; + version = "16.0"; pyproject = true; src = fetchFromGitHub { owner = "aaugustin"; repo = "websockets"; tag = version; - hash = "sha256-DC1nK+TvCoCqchyWJOyT4Ul4gkTYXixu7XmTqvytqEo="; + hash = "sha256-75FkU45qbOb+xbJO4VKqfWBTep+Toh6OWch2WXnU4bg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/webtest/default.nix b/pkgs/development/python-modules/webtest/default.nix index eefa2d6fa3db..c34a943a9850 100644 --- a/pkgs/development/python-modules/webtest/default.nix +++ b/pkgs/development/python-modules/webtest/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "webtest"; - version = "3.0.6"; + version = "3.0.7"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Qlb9UkJEj1bFdby5r+J14wWm8HI8SwFDjb3U3VNElEs="; + hash = "sha256-euq1D5cNRsBo56Nt0WLLJCWR7fcqHQTv0hN0dyuTF0E="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index 8cb30d3051ac..e517d5c45e88 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -27,12 +27,12 @@ buildPythonPackage rec { pname = "werkzeug"; - version = "3.1.4"; + version = "3.1.5"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-zTzZixuS3Dt7OZUDiCbGgJfcsW+bqmOr418g6v65/l4="; + hash = "sha256-alSLDoiVXdB8yyVTnX0MyXQX7p4XlnfSLHBByPB4zmc="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/wfuzz/default.nix b/pkgs/development/python-modules/wfuzz/default.nix index 7c09e1aa0674..2fdce5236819 100644 --- a/pkgs/development/python-modules/wfuzz/default.nix +++ b/pkgs/development/python-modules/wfuzz/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "wfuzz"; - version = "3.1.0"; + version = "3.1.1"; pyproject = true; src = fetchFromGitHub { owner = "xmendez"; repo = "wfuzz"; tag = "v${version}"; - hash = "sha256-RM6QM/iR00ymg0FBUtaWAtxPHIX4u9U/t5N/UT/T6sc="; + hash = "sha256-OYMZHo0ujRzwOcE+EKRNPxffxVbbiMHe+AqBz7q/u2A="; }; patches = [ @@ -80,7 +80,7 @@ buildPythonPackage rec { ''; meta = { - changelog = "https://github.com/xmendez/wfuzz/releases/tag/v${version}"; + changelog = "https://github.com/xmendez/wfuzz/releases/tag/${src.tag}"; description = "Web content fuzzer to facilitate web applications assessments"; longDescription = '' Wfuzz provides a framework to automate web applications security assessments diff --git a/pkgs/development/python-modules/wheel-filename/default.nix b/pkgs/development/python-modules/wheel-filename/default.nix index 8f0df391cf01..a1de0648a25a 100644 --- a/pkgs/development/python-modules/wheel-filename/default.nix +++ b/pkgs/development/python-modules/wheel-filename/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "wheel-filename"; - version = "1.4.2"; + version = "2.1.0"; pyproject = true; src = fetchFromGitHub { owner = "jwodder"; repo = "wheel-filename"; tag = "v${version}"; - hash = "sha256-KAuUrrSq6HJAy+5Gj6svI4M6oV6Fsle1A79E2q2FKW8="; + hash = "sha256-YlJ3mQoaNY7wiLzADLZuTET5i37e/zn2S7n9dOdcE0E="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/wheel-inspect/default.nix b/pkgs/development/python-modules/wheel-inspect/default.nix index 1548262e6ffd..f59d16e1709e 100644 --- a/pkgs/development/python-modules/wheel-inspect/default.nix +++ b/pkgs/development/python-modules/wheel-inspect/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "wheel-inspect"; - version = "1.7.2"; + version = "1.8.0"; pyproject = true; src = fetchFromGitHub { owner = "jwodder"; repo = "wheel-inspect"; tag = "v${version}"; - hash = "sha256-Mdw9IlY/2qDlb5FumNH+VHmg7vrUzo3vn+03QsUGgo8="; + hash = "sha256-yECgJLShCLiEyZmw9azNP5lwLeas10AfRu/RVMQGejg="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index e821fb93e80c..a617bb439657 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "widgetsnbextension"; - version = "4.0.14"; + version = "4.0.15"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-o2KbBOPtuJMhLfhiA4xyMvYpczc4adtQhK7XObQ3ta8="; + hash = "sha256-3oYQY5mW8VZ5UtdjpaQa+K838ldaQfmFKjj5R+uCo7k="; }; nativeBuildInputs = [ jupyter-packaging ]; diff --git a/pkgs/development/python-modules/wrapt/default.nix b/pkgs/development/python-modules/wrapt/default.nix index 49161d50a549..4f947d1c42d6 100644 --- a/pkgs/development/python-modules/wrapt/default.nix +++ b/pkgs/development/python-modules/wrapt/default.nix @@ -20,6 +20,8 @@ buildPythonPackage rec { hash = "sha256-QduT5bncXi4LeI034h5Pqtwybru0QcQIYI7cMchLy7c="; }; + patches = [ ./pytest9-compat.patch ]; + build-system = [ setuptools ]; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/wrapt/pytest9-compat.patch b/pkgs/development/python-modules/wrapt/pytest9-compat.patch new file mode 100644 index 000000000000..8ce0b26f5b84 --- /dev/null +++ b/pkgs/development/python-modules/wrapt/pytest9-compat.patch @@ -0,0 +1,59 @@ +diff --git a/tests/conftest.py b/tests/conftest.py +index 318d226..0a79281 100644 +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -18,28 +18,29 @@ def construct_dummy(path, parent): + else: + return DummyCollector(path, parent=parent) + +-def pytest_pycollect_makemodule(path, parent): +- if '_py33' in path.basename and version < (3, 3): +- return construct_dummy(path, parent) +- if '_py34' in path.basename and version < (3, 4): +- return construct_dummy(path, parent) +- if '_py35' in path.basename and version < (3, 5): +- return construct_dummy(path, parent) +- if '_py36' in path.basename and version < (3, 6): +- return construct_dummy(path, parent) +- if '_py37' in path.basename and version < (3, 7): +- return construct_dummy(path, parent) +- if '_py38' in path.basename and version < (3, 8): +- return construct_dummy(path, parent) +- if '_py39' in path.basename and version < (3, 9): +- return construct_dummy(path, parent) +- if '_py310' in path.basename and version < (3, 10): +- return construct_dummy(path, parent) +- if '_py311' in path.basename and version < (3, 11): +- return construct_dummy(path, parent) +- if '_py312' in path.basename and version < (3, 12): +- return construct_dummy(path, parent) +- if '_py3' in path.basename and version < (3, 0): +- return construct_dummy(path, parent) +- if '_py2' in path.basename and version >= (3, 0): +- return construct_dummy(path, parent) ++def pytest_pycollect_makemodule(module_path, parent): ++ name = module_path.name ++ if '_py33' in name and version < (3, 3): ++ return construct_dummy(module_path, parent) ++ if '_py34' in name and version < (3, 4): ++ return construct_dummy(module_path, parent) ++ if '_py35' in name and version < (3, 5): ++ return construct_dummy(module_path, parent) ++ if '_py36' in name and version < (3, 6): ++ return construct_dummy(module_path, parent) ++ if '_py37' in name and version < (3, 7): ++ return construct_dummy(module_path, parent) ++ if '_py38' in name and version < (3, 8): ++ return construct_dummy(module_path, parent) ++ if '_py39' in name and version < (3, 9): ++ return construct_dummy(module_path, parent) ++ if '_py310' in name and version < (3, 10): ++ return construct_dummy(module_path, parent) ++ if '_py311' in name and version < (3, 11): ++ return construct_dummy(module_path, parent) ++ if '_py312' in name and version < (3, 12): ++ return construct_dummy(module_path, parent) ++ if '_py3' in name and version < (3, 0): ++ return construct_dummy(module_path, parent) ++ if '_py2' in name and version >= (3, 0): ++ return construct_dummy(module_path, parent) diff --git a/pkgs/development/python-modules/wrf-python/default.nix b/pkgs/development/python-modules/wrf-python/default.nix index f2c4609b4510..7b0b942fa909 100644 --- a/pkgs/development/python-modules/wrf-python/default.nix +++ b/pkgs/development/python-modules/wrf-python/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "wrf-python"; - version = "1.4.0"; + version = "1.4.2"; format = "setuptools"; src = fetchFromGitHub { owner = "NCAR"; repo = "wrf-python"; tag = "v${version}"; - hash = "sha256-LvNorZ28j/O8fs9z6jhYWC8RcCDIwh7k5iR9iumCvnQ="; + hash = "sha256-4k0HsWIthFdkXQ5ld65vEcUtR1vqwKuH08lgQdcDh2E="; }; nativeBuildInputs = [ gfortran ]; diff --git a/pkgs/development/python-modules/wsproto/default.nix b/pkgs/development/python-modules/wsproto/default.nix index 4e4d6988067f..4f45ac1343a0 100644 --- a/pkgs/development/python-modules/wsproto/default.nix +++ b/pkgs/development/python-modules/wsproto/default.nix @@ -2,21 +2,24 @@ lib, buildPythonPackage, fetchPypi, + setuptools, h11, pytestCheckHook, }: buildPythonPackage rec { pname = "wsproto"; - version = "1.2.0"; - format = "setuptools"; + version = "1.3.2"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-rVZfJuy5JYij5DvD2WFk3oTNmQJIKxMNDduqlmSoUGU="; + hash = "sha256-uGiF3PKU4VIEkZlQ9mbgb/xsfBFMqQCwYNbhYpNSgpQ="; }; - propagatedBuildInputs = [ h11 ]; + build-system = [ setuptools ]; + + dependencies = [ h11 ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/wtf-peewee/default.nix b/pkgs/development/python-modules/wtf-peewee/default.nix index e65ca905bb0d..a35846e4edb2 100644 --- a/pkgs/development/python-modules/wtf-peewee/default.nix +++ b/pkgs/development/python-modules/wtf-peewee/default.nix @@ -1,26 +1,28 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, peewee, wtforms, python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "wtf-peewee"; - version = "3.0.6"; + version = "3.1.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-gZZEam46tk8SJ/ulqKsxvoF3X3PYGfdfyv7P1cDAC5I="; + src = fetchFromGitHub { + owner = "coleifer"; + repo = "wtf-peewee"; + tag = finalAttrs.version; + hash = "sha256-9gVvcPFVA3051Y0sn0mLq1ejKqcGlKZVbIaQ/uH5f4Y="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ peewee wtforms ]; @@ -37,4 +39,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 5ae515b7c5fd..823d1bcada2e 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -37,14 +37,14 @@ buildPythonPackage rec { pname = "xarray"; - version = "2025.12.0"; + version = "2026.02.0"; pyproject = true; src = fetchFromGitHub { owner = "pydata"; repo = "xarray"; tag = "v${version}"; - hash = "sha256-7MTZ/0BbJb3mg2FHvtsV+v4TsgoxD0Tpco7J4DgT/hY="; + hash = "sha256-g1cKI0Et3RToWOxn+bELtT5jAaB8e1N+k9doCU+OgfY="; }; postPatch = '' @@ -96,6 +96,13 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio pytestCheckHook + scipy + ]; + + disabledTestPaths = [ + # https://github.com/pydata/xarray/issues/11183 + "xarray/tests/test_dataarray.py::TestDataArray::test_curvefit_helpers" # Failed: DID NOT RAISE + "xarray/tests/test_variable.py::TestIndexVariable::test_concat_periods" # ValueError: Could not convert Size: 40B ]; pythonImportsCheck = [ "xarray" ]; diff --git a/pkgs/development/python-modules/xattr/default.nix b/pkgs/development/python-modules/xattr/default.nix index 08a9777e0c07..b97ea7668358 100644 --- a/pkgs/development/python-modules/xattr/default.nix +++ b/pkgs/development/python-modules/xattr/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "xattr"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-pkyOIe/xvhQ6zPgP07j94+KKR4w32imHQq9kesPl4Kc="; + hash = "sha256-MEOfq9feB4eyfppuHVacWVmFTLMi9kznOA/tv6UDUDY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/xcffib/default.nix b/pkgs/development/python-modules/xcffib/default.nix index 743330ba39a9..ef40831c9516 100644 --- a/pkgs/development/python-modules/xcffib/default.nix +++ b/pkgs/development/python-modules/xcffib/default.nix @@ -4,26 +4,30 @@ cffi, fetchPypi, pytestCheckHook, - xvfb, - xeyes, + setuptools, libxcb, + xeyes, + xvfb, }: buildPythonPackage rec { pname = "xcffib"; - version = "1.9.0"; - format = "setuptools"; + version = "1.12.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-K6xgY2lnVOiHHC9AcwR7Uz792Cx33fhnYgEWcJfMUlM="; + hash = "sha256-Q0Ut5QnBJk1bzqS8Alyhv2gnLSQO8m0zQLRuEfY9PUo="; }; postPatch = '' # Hardcode cairo library path - sed -e 's,ffi\.dlopen(,&"${libxcb.out}/lib/" + ,' -i xcffib/__init__.py + substituteInPlace xcffib/__init__.py \ + --replace-fail "lib = ffi.dlopen(soname)" "lib = ffi.dlopen('${lib.getLib libxcb}/lib/' + soname)" ''; + build-system = [ setuptools ]; + propagatedNativeBuildInputs = [ cffi ]; propagatedBuildInputs = [ cffi ]; diff --git a/pkgs/development/python-modules/xgrammar/default.nix b/pkgs/development/python-modules/xgrammar/default.nix index a84c28aeec4b..e62f29a55c8c 100644 --- a/pkgs/development/python-modules/xgrammar/default.nix +++ b/pkgs/development/python-modules/xgrammar/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "xgrammar"; - version = "0.1.24"; + version = "0.1.31"; pyproject = true; src = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { repo = "xgrammar"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-K+GCHuWKF449JaGWr7FQrDeJS3pxmVKnGf68L53LrK0="; + hash = "sha256-Baa/DiRoNcIv4UOC+msi4PgfRWnwprnZpLG2v7qB2h4="; }; patches = [ diff --git a/pkgs/development/python-modules/xlsxwriter/default.nix b/pkgs/development/python-modules/xlsxwriter/default.nix index 700a1bb6f93d..0f3bce1ce92b 100644 --- a/pkgs/development/python-modules/xlsxwriter/default.nix +++ b/pkgs/development/python-modules/xlsxwriter/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "xlsxwriter"; - version = "3.2.5"; + version = "3.2.9"; pyproject = true; src = fetchFromGitHub { owner = "jmcnamara"; repo = "XlsxWriter"; - rev = "RELEASE_${version}"; - hash = "sha256-Z384IYFQzGViJXJQe+zovXn5X+MyOqGv0NKKlktcF4o="; + tag = "RELEASE_${version}"; + hash = "sha256-nr7Qw24BzQo/qEpyM9687mUaebzzHv1FAPmsBVdMekg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/xmlsec/default.nix b/pkgs/development/python-modules/xmlsec/default.nix index 1e1db9c44ddd..40ad5d477d7f 100644 --- a/pkgs/development/python-modules/xmlsec/default.nix +++ b/pkgs/development/python-modules/xmlsec/default.nix @@ -16,14 +16,19 @@ buildPythonPackage rec { pname = "xmlsec"; - version = "1.3.16"; + version = "1.3.17"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-K2xwVExtHUygBqqjFJWODvNRTcgf/94bI/LsQaV5H50="; + hash = "sha256-8/rJrmefZlhZJcwAxfaDmuNsHQMVdhlXHe4YrMBbnAE="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools==" "setuptools>=" + ''; + build-system = [ setuptools-scm ]; nativeBuildInputs = [ @@ -48,9 +53,6 @@ buildPythonPackage rec { disabledTestPaths = [ # Full git clone required for test_doc_examples "tests/test_doc_examples.py" - # test_reinitialize_module segfaults python - # https://github.com/mehcode/python-xmlsec/issues/203 - "tests/test_xmlsec.py" ]; pythonImportsCheck = [ "xmlsec" ]; diff --git a/pkgs/development/python-modules/xstatic-bootstrap/default.nix b/pkgs/development/python-modules/xstatic-bootstrap/default.nix index a51fbaafffb8..1e1933d4412f 100644 --- a/pkgs/development/python-modules/xstatic-bootstrap/default.nix +++ b/pkgs/development/python-modules/xstatic-bootstrap/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "xstatic-bootstrap"; - version = "4.5.3.1"; + version = "5.3.8.0"; format = "setuptools"; src = fetchPypi { - pname = "XStatic-Bootstrap"; + pname = "xstatic_bootstrap"; inherit version; - sha256 = "cf67d205437b32508a88b69a7e7c5bbe2ca5a8ae71097391a6a6f510ebfd2820"; + hash = "sha256-BPXMlbvlQ40ehR0GxMoa1/hL02oJtN5aH1S1JOhQaFk="; }; # no tests implemented diff --git a/pkgs/development/python-modules/xtensor-python/default.nix b/pkgs/development/python-modules/xtensor-python/default.nix index 617460d7072f..ccce60a27dd5 100644 --- a/pkgs/development/python-modules/xtensor-python/default.nix +++ b/pkgs/development/python-modules/xtensor-python/default.nix @@ -13,13 +13,13 @@ toPythonModule ( stdenv.mkDerivation (finalAttrs: { pname = "xtensor-python"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "xtensor-stack"; repo = "xtensor-python"; tag = finalAttrs.version; - hash = "sha256-xByqAYtSRKOnllMUFdRM25bXGft/43EEpEMIlcjdrgE="; + hash = "sha256-GN1X46gmeXh3pM6sw9sSUahLOxnSoimoY+K66vy8SxM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/xvfbwrapper/default.nix b/pkgs/development/python-modules/xvfbwrapper/default.nix index 4a11aeb783a4..4163f2e3197f 100644 --- a/pkgs/development/python-modules/xvfbwrapper/default.nix +++ b/pkgs/development/python-modules/xvfbwrapper/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "xvfbwrapper"; - version = "0.2.16"; + version = "0.2.18"; pyproject = true; src = fetchFromGitHub { owner = "cgoldberg"; repo = "xvfbwrapper"; tag = version; - sha256 = "sha256-2ExEhqq1XMjGniRII5qw4fj2cDqYjTa4BjKNYo6ZJCw="; + sha256 = "sha256-iqWDXDzoGAs6Ze1XHrM3HzeqTHbiYU2/CpeZQNzwl0s="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/xxhash/default.nix b/pkgs/development/python-modules/xxhash/default.nix index 4379528dc7c9..3bbd4f7bb2c2 100644 --- a/pkgs/development/python-modules/xxhash/default.nix +++ b/pkgs/development/python-modules/xxhash/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "xxhash"; - version = "3.5.0"; + version = "3.6.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-hPLK3flRycv43C4iqJ1Mz12GORrGQY/oHjxn0M9gtF8="; + hash = "sha256-8BYqeLE6DXYXsoRbkMdjM50fHYK7BKSwf0q1NcxeBdY="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/xyzservices/default.nix b/pkgs/development/python-modules/xyzservices/default.nix index c96c0c65d028..38ee26580511 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.4.0"; + version = "2025.11.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-b+dkcTZI+sU0UPvGGjw2bLauUzWhsq4MN5a0ld43Cdg="; + hash = "sha256-L8crSVArJQI/1x6PUy+0vt278KoSTZDqJdukT1ReF84="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/yangson/default.nix b/pkgs/development/python-modules/yangson/default.nix index 1e11c86edbd8..deaa4bac689e 100644 --- a/pkgs/development/python-modules/yangson/default.nix +++ b/pkgs/development/python-modules/yangson/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "yangson"; - version = "1.6.3"; + version = "1.6.6"; pyproject = true; src = fetchFromGitHub { owner = "CZ-NIC"; repo = "yangson"; tag = version; - hash = "sha256-WOeSGGOd5+g+8dSyeml+mdehEjaSHtUkNSdkGl4xSao="; + hash = "sha256-vpQCbHyQslPhY2tz5+6aLGeyI2+6tt43Zr04EABDuPM="; }; build-system = [ poetry-core ]; @@ -29,6 +29,9 @@ buildPythonPackage rec { pythonRelaxDeps = [ "elementpath" ]; + # only used for docs build + pythonRemoveDeps = [ "sphinxcontrib-shtest" ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "yangson" ]; diff --git a/pkgs/development/python-modules/yaspin/default.nix b/pkgs/development/python-modules/yaspin/default.nix index e000584d3095..504e49151738 100644 --- a/pkgs/development/python-modules/yaspin/default.nix +++ b/pkgs/development/python-modules/yaspin/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, poetry-core, + pytest-mock, pytest-xdist, pytestCheckHook, termcolor, @@ -10,14 +11,14 @@ buildPythonPackage rec { pname = "yaspin"; - version = "3.1.0"; + version = "3.4.0"; pyproject = true; src = fetchFromGitHub { owner = "pavdmyt"; repo = "yaspin"; tag = "v${version}"; - hash = "sha256-4IWaAPqzGri7V8X2gL607F5GlWfIFDlBBpDwSe4sz9I="; + hash = "sha256-uHW0lSkmNYZh4OGCFgaiIoqhY6KFojSyyEezTNxYqMw="; }; build-system = [ poetry-core ]; @@ -29,6 +30,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytest-mock pytest-xdist pytestCheckHook ]; diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 28a85f7bb6a0..c229d04f885b 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.2.66"; + version = "1.0"; pyproject = true; src = fetchFromGitHub { owner = "ranaroussi"; repo = "yfinance"; tag = version; - hash = "sha256-v8K/mVNnun7ogBixaKAVYwSQgSrnnfvVw40/BeClCKY="; + hash = "sha256-84iiRqroaoqcvJqGvgk7baJ/vdgmyWy4V8KRNUtwnoU="; }; build-system = [ setuptools ]; @@ -55,6 +55,8 @@ buildPythonPackage rec { websockets ]; + pythonRelaxDeps = [ "curl_cffi" ]; + optional-dependencies = { nospam = [ requests-cache diff --git a/pkgs/development/python-modules/youtube-search/default.nix b/pkgs/development/python-modules/youtube-search/default.nix index 9b7d81d7d52e..3422103e28fa 100644 --- a/pkgs/development/python-modules/youtube-search/default.nix +++ b/pkgs/development/python-modules/youtube-search/default.nix @@ -7,12 +7,13 @@ buildPythonPackage rec { pname = "youtube-search"; - version = "2.1.2"; + version = "2.2.0"; format = "setuptools"; src = fetchPypi { - inherit pname version; - hash = "sha256-V0mm2Adv2mVVfJE2fw+rCTYpDs3qRXyDHJ8/BZGKOqI="; + inherit version; + pname = "youtube_search"; + hash = "sha256-U5inzWXZt1qLrCfvaJ7ARKurPL+h8g0Z2wJ3ZZrHDZg="; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/zc-buildout/default.nix b/pkgs/development/python-modules/zc-buildout/default.nix index 329d39e1f7a0..ec2e9853cf0d 100644 --- a/pkgs/development/python-modules/zc-buildout/default.nix +++ b/pkgs/development/python-modules/zc-buildout/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "zc-buildout"; - version = "4.1.12"; + version = "5.1.1"; pyproject = true; src = fetchFromGitHub { owner = "buildout"; repo = "buildout"; tag = version; - hash = "sha256-4MutmUuF4WdoD/wdhYtpVvOYBJEv+2JVkskmO6sz24U="; + hash = "sha256-Z47j0RbQXP4DjJM+Fz0FXP2DuXwqluV64uCbioWtqW4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/zc-lockfile/default.nix b/pkgs/development/python-modules/zc-lockfile/default.nix index e4c4066fc25d..aec617d98153 100644 --- a/pkgs/development/python-modules/zc-lockfile/default.nix +++ b/pkgs/development/python-modules/zc-lockfile/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, pytestCheckHook, zope-testing, @@ -9,15 +9,21 @@ buildPythonPackage rec { pname = "zc-lockfile"; - version = "3.0.post1"; + version = "4.0"; pyproject = true; - src = fetchPypi { - pname = "zc.lockfile"; - inherit version; - hash = "sha256-rbLubZ5qIzPJEXjcssm5aldEx47bdxLceEp9dWSOgew="; + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "zc.lockfile"; + tag = version; + hash = "sha256-74FE2KEf4RpE8Kum1zW3M7f5/pZujaZFGo6TJjqfMyw="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools ==" "setuptools >=" + ''; + build-system = [ setuptools ]; pythonImportsCheck = [ "zc.lockfile" ]; @@ -33,7 +39,7 @@ buildPythonPackage rec { meta = { description = "Inter-process locks"; - homepage = "https://www.python.org/pypi/zc.lockfile"; + homepage = "https://github.com/zopefoundation/zc.lockfile"; changelog = "https://github.com/zopefoundation/zc.lockfile/blob/${version}/CHANGES.rst"; license = lib.licenses.zpl21; maintainers = [ ]; diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix index 1ff7cd4d6608..bb739b974cca 100644 --- a/pkgs/development/python-modules/zconfig/default.nix +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -13,20 +13,16 @@ buildPythonPackage rec { pname = "zconfig"; - version = "4.2"; + version = "4.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-oOS1J3xM7oBgzjNaV4rEWPgsJArpaxZlkgDbxNmL/M4="; + hash = "sha256-RyIz5RX6Kb5shz54uKK0UMLNJdATPLRZYIN/M/GrT+M="; }; patches = lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch; - postPatch = '' - substituteInPlace pyproject.toml --replace-fail 'setuptools <= 75.6.0' 'setuptools' - ''; - build-system = [ setuptools ]; buildInputs = [ diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index 17c2751c7c30..f20cbc16cffc 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -28,18 +28,16 @@ buildPythonPackage rec { pname = "zeep"; - version = "4.3.1"; + version = "4.3.2"; pyproject = true; src = fetchFromGitHub { owner = "mvantellingen"; repo = "python-zeep"; tag = version; - hash = "sha256-Bt0QqzJMKPXV91hZYETy9DKoQAELUWlYIh8w/IFTE8E="; + hash = "sha256-mGX61fAbFwheamOgK5lq/A/3FmTCuv0UfAlhOUwX2zg="; }; - patches = [ ./httpx-compat.patch ]; - build-system = [ setuptools ]; dependencies = [ @@ -89,7 +87,7 @@ buildPythonPackage rec { ''; meta = { - changelog = "https://github.com/mvantellingen/python-zeep/releases/tag/${version}"; + changelog = "https://github.com/mvantellingen/python-zeep/releases/tag/${src.tag}"; description = "Python SOAP client"; homepage = "http://docs.python-zeep.org"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/zeep/httpx-compat.patch b/pkgs/development/python-modules/zeep/httpx-compat.patch deleted file mode 100644 index 930ab5c10ac3..000000000000 --- a/pkgs/development/python-modules/zeep/httpx-compat.patch +++ /dev/null @@ -1,129 +0,0 @@ -From 4e2568574271e5e37de5e5c86e4bb12a5e661c6b Mon Sep 17 00:00:00 2001 -From: aschollmeier-gcmlp -Date: Wed, 4 Dec 2024 16:34:22 -0600 -Subject: [PATCH 1/3] Update proxy argument in httpx Client/AsyncClient - -Ref: https://github.com/encode/httpx/blob/master/CHANGELOG.md#0260-20th-december-2023 ---- - src/zeep/transports.py | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/zeep/transports.py b/src/zeep/transports.py -index 2a1ee8bd..0cbb05f2 100644 ---- a/src/zeep/transports.py -+++ b/src/zeep/transports.py -@@ -183,15 +183,17 @@ def __init__( - - self._close_session = False - self.cache = cache -+ proxy_kwarg_name = "proxy" if httpx.__version__ >= "0.26.0" else "proxies" -+ proxy_kwargs = {proxy_kwarg_name: proxy} - self.wsdl_client = wsdl_client or httpx.Client( - verify=verify_ssl, -- proxies=proxy, - timeout=timeout, -+ **proxy_kwargs, - ) - self.client = client or httpx.AsyncClient( - verify=verify_ssl, -- proxies=proxy, - timeout=operation_timeout, -+ **proxy_kwargs, - ) - self.logger = logging.getLogger(__name__) - - -From 411ea4ef7ec4d160dd2cb2d29288c9d34466f286 Mon Sep 17 00:00:00 2001 -From: aschollmeier-gcmlp -Date: Sat, 14 Dec 2024 09:34:53 -0600 -Subject: [PATCH 2/3] Correct httpx version comparison - ---- - pyproject.toml | 5 ++++- - src/zeep/transports.py | 19 +++++++++++++++---- - 2 files changed, 19 insertions(+), 5 deletions(-) - -diff --git a/pyproject.toml b/pyproject.toml -index c151100a..414e83c2 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -53,7 +53,10 @@ test = [ - "flake8-debugger==4.1.2", - "flake8-imports==0.1.1", - ] --async = ["httpx>=0.15.0"] -+async = [ -+ "httpx>=0.15.0", -+ "packaging", -+] - xmlsec = ["xmlsec>=0.6.1"] - - [build-system] -diff --git a/src/zeep/transports.py b/src/zeep/transports.py -index 0cbb05f2..f1b00565 100644 ---- a/src/zeep/transports.py -+++ b/src/zeep/transports.py -@@ -16,6 +16,15 @@ - except ImportError: - httpx = None - -+try: -+ from packaging.version import Version -+ if Version(httpx.__version__) >= Version("0.26.0"): -+ HTTPX_PROXY_KWARG_NAME = "proxy" -+ else: -+ HTTPX_PROXY_KWARG_NAME = "proxies" -+except ImportError: -+ Version = None -+ HTTPX_PROXY_KWARG_NAME = None - - __all__ = ["AsyncTransport", "Transport"] - -@@ -178,13 +187,15 @@ def __init__( - verify_ssl=True, - proxy=None, - ): -- if httpx is None: -- raise RuntimeError("The AsyncTransport is based on the httpx module") -+ if httpx is None or HTTPX_PROXY_KWARG_NAME is None: -+ raise RuntimeError( -+ "To use AsyncTransport, install zeep with the async extras, " -+ "e.g., `pip install zeep[async]`" -+ ) - - self._close_session = False - self.cache = cache -- proxy_kwarg_name = "proxy" if httpx.__version__ >= "0.26.0" else "proxies" -- proxy_kwargs = {proxy_kwarg_name: proxy} -+ proxy_kwargs = {HTTPX_PROXY_KWARG_NAME: proxy} - self.wsdl_client = wsdl_client or httpx.Client( - verify=verify_ssl, - timeout=timeout, - -From c20b7ba21d815377cb5d5095eb9e9f5918fb678d Mon Sep 17 00:00:00 2001 -From: aschollmeier-gcmlp -Date: Sat, 14 Dec 2024 10:00:17 -0600 -Subject: [PATCH 3/3] Avoid potential AttributeError in httpx version check - ---- - src/zeep/transports.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/zeep/transports.py b/src/zeep/transports.py -index f1b00565..d2136373 100644 ---- a/src/zeep/transports.py -+++ b/src/zeep/transports.py -@@ -18,10 +18,10 @@ - - try: - from packaging.version import Version -- if Version(httpx.__version__) >= Version("0.26.0"): -- HTTPX_PROXY_KWARG_NAME = "proxy" -- else: -+ if httpx is None or Version(httpx.__version__) < Version("0.26.0"): - HTTPX_PROXY_KWARG_NAME = "proxies" -+ else: -+ HTTPX_PROXY_KWARG_NAME = "proxy" - except ImportError: - Version = None - HTTPX_PROXY_KWARG_NAME = None diff --git a/pkgs/development/python-modules/zeroc-ice/default.nix b/pkgs/development/python-modules/zeroc-ice/default.nix index f95f770d5652..e30a88321754 100644 --- a/pkgs/development/python-modules/zeroc-ice/default.nix +++ b/pkgs/development/python-modules/zeroc-ice/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zeroc-ice"; - version = "3.7.10.1"; + version = "3.8.0.post1"; pyproject = true; # Upstream PR: https://github.com/zeroc-ice/ice/pull/2910 @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "zeroc_ice"; inherit version; - hash = "sha256-sGOq/aNg33EfdpRVKbtUFXbyZr5B5dWi3Xf10yDBhmQ="; + hash = "sha256-SwR/4BSH/8+cYWVKA7aE3bnFOL52fWzynFehZr5VC9c="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/zimports/default.nix b/pkgs/development/python-modules/zimports/default.nix index f76f386e6a0e..d5a16beec9c1 100644 --- a/pkgs/development/python-modules/zimports/default.nix +++ b/pkgs/development/python-modules/zimports/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zimports"; - version = "0.6.2"; + version = "0.7.0"; 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,7 +22,7 @@ buildPythonPackage rec { owner = "sqlalchemyorg"; repo = "zimports"; tag = "v${version}"; - hash = "sha256-yI/ZTNqVIu76xivXJ+MoLpPupf0RQjQOnP6OWMPajBo="; + hash = "sha256-5RSVRI1sgCXkkkMQo4azKj8AlShxDWEF6qQoU3VfoI8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index de464ac22409..9981e18a166e 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -11,14 +11,14 @@ let zipp = buildPythonPackage rec { pname = "zipp"; - version = "3.23.0"; + version = "3.23.1"; pyproject = true; src = fetchFromGitHub { owner = "jaraco"; repo = "zipp"; tag = "v${version}"; - hash = "sha256-iao7Aco1Ktvyt1uQCD/le4tAdyVpxfKPi3TRT12YHuU="; + hash = "sha256-SC5aMiQsAPLNjCdOHDAMYX2iDSwZltjXxAJJgZnPlJ0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix index 6af24eb7f7d6..1403943236da 100644 --- a/pkgs/development/python-modules/zodbpickle/default.nix +++ b/pkgs/development/python-modules/zodbpickle/default.nix @@ -8,19 +8,14 @@ buildPythonPackage rec { pname = "zodbpickle"; - version = "4.2"; + version = "4.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-WoUUT7psNPxnvQDH8InW1TLcQ6A0R9/F4jhGyRkjCkU="; + hash = "sha256-3qcOi0CBZ9BjrCOk2vRTJGrNENvljLCmwNew+Gl+oqs="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "setuptools <= 75.6.0" "setuptools" - ''; - build-system = [ setuptools ]; pythonImportsCheck = [ "zodbpickle" ]; diff --git a/pkgs/development/python-modules/zope-event/default.nix b/pkgs/development/python-modules/zope-event/default.nix index 61c26a939355..0c33629346d7 100644 --- a/pkgs/development/python-modules/zope-event/default.nix +++ b/pkgs/development/python-modules/zope-event/default.nix @@ -8,21 +8,16 @@ buildPythonPackage rec { pname = "zope-event"; - version = "6.0"; + version = "6.1"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.event"; tag = version; - hash = "sha256-1ZdhJwxzYsMT2s+z4MLR71cLFzIEmwE0KFilwg7BQ1E="; + hash = "sha256-ugyHPqqFcObgldThkkUQgZnl1fVEcXYFnXyAxNwUFIE="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "setuptools ==" "setuptools >=" - ''; - build-system = [ setuptools ]; pythonImportsCheck = [ "zope.event" ]; diff --git a/pkgs/development/python-modules/zope-hookable/default.nix b/pkgs/development/python-modules/zope-hookable/default.nix index e0454193f299..1f72a9914162 100644 --- a/pkgs/development/python-modules/zope-hookable/default.nix +++ b/pkgs/development/python-modules/zope-hookable/default.nix @@ -8,21 +8,16 @@ buildPythonPackage rec { pname = "zope-hookable"; - version = "8.0"; + version = "8.2"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.hookable"; tag = version; - hash = "sha256-5ps/H9bL2oN9IHxXzpWw/9uMLhwV+OpQ26kXlsP4hgw="; + hash = "sha256-pryx55dzvg+6jSUj4avskTnGKe6w1HkEh6v6OOlHIXY="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "setuptools ==" "setuptools >=" - ''; - build-system = [ setuptools ]; pythonImportsCheck = [ "zope.hookable" ]; diff --git a/pkgs/development/python-modules/zope-i18nmessageid/default.nix b/pkgs/development/python-modules/zope-i18nmessageid/default.nix index f236aae772a3..0d25f8b20f37 100644 --- a/pkgs/development/python-modules/zope-i18nmessageid/default.nix +++ b/pkgs/development/python-modules/zope-i18nmessageid/default.nix @@ -4,22 +4,27 @@ fetchFromGitHub, setuptools, unittestCheckHook, + zope-interface, }: buildPythonPackage rec { pname = "zope-i18nmessageid"; - version = "8.0"; + version = "8.2"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.i18nmessageid"; tag = version; - hash = "sha256-lMHmKWwR9D9HW+paV1mDVAirOe0wBD8VrJ67NZoROtg="; + hash = "sha256-JDCbk7zh+9Ic5T3Pt1apQDN1Q59cLUdk5KCAIu5mlC4="; }; build-system = [ setuptools ]; + dependencies = [ + zope-interface + ]; + nativeCheckInputs = [ unittestCheckHook ]; @@ -33,7 +38,7 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/zopefoundation/zope.i18nmessageid"; description = "Message Identifiers for internationalization"; - changelog = "https://github.com/zopefoundation/zope.i18nmessageid/blob/${version}/CHANGES.rst"; + changelog = "https://github.com/zopefoundation/zope.i18nmessageid/blob/${src.tag}/CHANGES.rst"; license = lib.licenses.zpl21; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/zope-interface/default.nix b/pkgs/development/python-modules/zope-interface/default.nix index 59f156489e38..eab1fc150221 100644 --- a/pkgs/development/python-modules/zope-interface/default.nix +++ b/pkgs/development/python-modules/zope-interface/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "zope-interface"; - version = "8.0.1"; + version = "8.2"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.interface"; tag = version; - hash = "sha256-IYtfd9mJLcwk3FGPWlD5PbrKdIwDQf1Thn6fWFa5Rpo="; + hash = "sha256-hOcg41lcdVWfmT2DqaYzzu4bJZYiG2y5boylJevBv6k="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/zope-proxy/default.nix b/pkgs/development/python-modules/zope-proxy/default.nix index 71f559e4423c..d2fe8eb17674 100644 --- a/pkgs/development/python-modules/zope-proxy/default.nix +++ b/pkgs/development/python-modules/zope-proxy/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "zope-proxy"; - version = "7.0"; + version = "7.1"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.proxy"; tag = version; - hash = "sha256-1u9Yn6j8tBMmAZmb/0L/lZUE/yC0OP8K825QBixxKQM="; + hash = "sha256-p5uDHNF7kZJkFibNbM0JLrw5BYqs+qnNH3t0UBt0Krg="; }; build-system = [ setuptools ]; @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/zopefoundation/zope.proxy"; description = "Generic Transparent Proxies"; - changelog = "https://github.com/zopefoundation/zope.proxy/blob/${version}/CHANGES.rst"; + changelog = "https://github.com/zopefoundation/zope.proxy/blob/${src.tag}/CHANGES.rst"; license = lib.licenses.zpl21; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/zope-security/default.nix b/pkgs/development/python-modules/zope-security/default.nix index 85af161d7004..59d4e9ebffd8 100644 --- a/pkgs/development/python-modules/zope-security/default.nix +++ b/pkgs/development/python-modules/zope-security/default.nix @@ -19,21 +19,16 @@ buildPythonPackage rec { pname = "zope-security"; - version = "8.1"; + version = "8.3"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.security"; tag = version; - hash = "sha256-qik1tuH0w0W21Md6YXc5csCbMrFifxaJvGgi2nB4FrI="; + hash = "sha256-iSWSBjtJe4iEvm+VUEWDvRCBdRz1R6m9mlfPLwh01Sk="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "setuptools ==" "setuptools >=" - ''; - build-system = [ setuptools zope-proxy diff --git a/pkgs/development/python-modules/zope-testing/default.nix b/pkgs/development/python-modules/zope-testing/default.nix index 4966f8e5224e..79764e7fed27 100644 --- a/pkgs/development/python-modules/zope-testing/default.nix +++ b/pkgs/development/python-modules/zope-testing/default.nix @@ -9,21 +9,16 @@ buildPythonPackage rec { pname = "zope-testing"; - version = "6.0"; + version = "6.1"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.testing"; tag = version; - hash = "sha256-px1+lS1U0lmmQrXJuxFTsX3N8e2mj5Yhckfis5++EX8="; + hash = "sha256-dAUiG8DxlhQKMBXh49P0CDC9UjqAYjB+2vVCTI36cgc="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "setuptools ==" "setuptools >=" - ''; - build-system = [ setuptools ]; doCheck = !isPyPy; @@ -39,7 +34,7 @@ buildPythonPackage rec { meta = { description = "Zope testing helpers"; homepage = "https://github.com/zopefoundation/zope.testing"; - changelog = "https://github.com/zopefoundation/zope.testing/blob/${version}/CHANGES.rst"; + changelog = "https://github.com/zopefoundation/zope.testing/blob/${src.tag}/CHANGES.rst"; license = lib.licenses.zpl21; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/zopfli/default.nix b/pkgs/development/python-modules/zopfli/default.nix index 52e6141d014f..5d6b2f1ef79f 100644 --- a/pkgs/development/python-modules/zopfli/default.nix +++ b/pkgs/development/python-modules/zopfli/default.nix @@ -7,22 +7,21 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zopfli"; - version = "0.2.3"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-28mEG+3XNgQeteaYLNktqTvuFFdF9UIvN5X28ljNxu8="; - extension = "zip"; - }; - + version = "0.4.0"; pyproject = true; - nativeBuildInputs = [ setuptools-scm ]; + src = fetchPypi { + inherit (finalAttrs) pname version; + hash = "sha256-qO6ZKyVJ4JDNPwF4v2Bt1Bop4GE6BM31BUIkZixy3OY="; + }; + + build-system = [ setuptools-scm ]; buildInputs = [ zopfli ]; - USE_SYSTEM_ZOPFLI = "True"; + + env.USE_SYSTEM_ZOPFLI = "True"; nativeCheckInputs = [ pytestCheckHook ]; @@ -32,4 +31,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = [ lib.maintainers.sternenseemann ]; }; -} +}) diff --git a/pkgs/development/python-modules/zstandard/default.nix b/pkgs/development/python-modules/zstandard/default.nix index 4b38b8406c2e..854c2c8fe910 100644 --- a/pkgs/development/python-modules/zstandard/default.nix +++ b/pkgs/development/python-modules/zstandard/default.nix @@ -11,18 +11,17 @@ buildPythonPackage rec { pname = "zstandard"; - version = "0.23.0"; + version = "0.25.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-stjGLQjnJV9o96dAuuhbPJuOVGa6qcv39X8c3grGvAk="; + hash = "sha256-dxPhF50WLPXHkG2oduwsy5w6ncvf/vDMf3DDZnogXws="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools<69.0.0" "setuptools" \ - --replace-fail "cffi==" "cffi>=" + --replace-fail "cffi~=" "cffi>=" \ ''; build-system = [ diff --git a/pkgs/development/python-modules/zstd/default.nix b/pkgs/development/python-modules/zstd/default.nix index e430ecc567b1..a2b7a7ed3006 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.7.2"; + version = "1.5.7.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-bYaExpAJvknhsY7CUaXrDX4k+TYkmQqKEkodpmqS/Io="; + hash = "sha256-QD5SBfSsBLkuawzaZUvi9R3iaCKKDbAGe8CH+qzy9JU="; }; postPatch = '' diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 847009ac3b06..fb5bc3e25fc1 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -984,7 +984,7 @@ let rustc ]; vdiffr = [ pkgs.libpng.dev ]; - V8 = [ pkgs.nodejs_22.libv8 ]; # when unpinning the version, don't forget about the other usages later + V8 = [ pkgs.nodejs-slim_22.libv8 ]; # when unpinning the version, don't forget about the other usages later xactonomial = with pkgs; [ cargo rustc @@ -2588,8 +2588,8 @@ let preConfigure = '' # when unpinning the version, don't forget about the other usage earlier - export INCLUDE_DIR=${pkgs.nodejs_22.libv8}/include - export LIB_DIR=${pkgs.nodejs_22.libv8}/lib + export INCLUDE_DIR=${pkgs.nodejs-slim_22.libv8}/include + export LIB_DIR=${pkgs.nodejs-slim_22.libv8}/lib patchShebangs configure ''; diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 14bc45594041..2fb99eb718e6 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -31,7 +31,7 @@ which, libiconv, libpq, - nodejs, + nodejs-slim, clang, sqlite, zlib, @@ -338,7 +338,7 @@ in mini_racer = attrs: { buildFlags = [ - "--with-v8-dir=\"${nodejs.libv8}\"" + "--with-v8-dir=\"${nodejs-slim.libv8}\"" ]; dontBuild = false; postPatch = '' @@ -699,7 +699,7 @@ in }; execjs = attrs: { - propagatedBuildInputs = [ nodejs.libv8 ]; + propagatedBuildInputs = [ nodejs-slim.libv8 ]; }; libxml-ruby = attrs: { diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index 10ea06c415bd..a3bace939814 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -113,7 +113,10 @@ lib.makeOverridable ( inherit dontBuild; inherit dontStrip; inherit suffix; + inherit version; gemType = type; + pname = gemName; + name = attrs.name or "${namePrefix}${gemName}-${suffix}"; nativeBuildInputs = [ ruby @@ -128,9 +131,6 @@ lib.makeOverridable ( ] ++ buildInputs; - #name = builtins.trace (attrs.name or "no attr.name" ) "${namePrefix}${gemName}-${version}"; - name = attrs.name or "${namePrefix}${gemName}-${suffix}"; - inherit src; unpackPhase = diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix index cf41ad80d670..bdb4bcaff32c 100644 --- a/pkgs/development/tools/language-servers/nixd/default.nix +++ b/pkgs/development/tools/language-servers/nixd/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, boost, gtest, @@ -133,6 +134,17 @@ in // { pname = "nixd"; + patches = [ + # Pull upstream fix for boost-1.89 & boost 1.87 support: + # https://github.com/nix-community/nixd/pull/783 + (fetchpatch { + name = "boost-1.89.patch"; + url = "https://github.com/nix-community/nixd/commit/11dfdf5f2db2e0fc1fea0349fb68739a9c747a41.patch"; + hash = "sha256-aCb9wRKqZSuUXmamzjpYe0vRqEQh4tenwoScv+juYK8="; + stripLen = 1; + }) + ]; + sourceRoot = "${common.src.name}/nixd"; buildInputs = [ diff --git a/pkgs/development/tools/ocaml/dune-release/default.nix b/pkgs/development/tools/ocaml/dune-release/default.nix index 78d34121d1f7..202b8504184b 100644 --- a/pkgs/development/tools/ocaml/dune-release/default.nix +++ b/pkgs/development/tools/ocaml/dune-release/default.nix @@ -40,13 +40,13 @@ let coreutils ]; in -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "dune-release"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://github.com/ocamllabs/${pname}/releases/download/${version}/${pname}-${version}.tbz"; - hash = "sha256-bhDf/zb6mnSB53ibb1yb8Yf1TTmVEu8rb8KUnJieCnY="; + url = "https://github.com/ocamllabs/dune-release/releases/download/${finalAttrs.version}/dune-release-${finalAttrs.version}.tbz"; + hash = "sha256-VxwXtG+n1TeVFp4CsAWmG7X3unbIAK09konm+KTW8G4="; }; nativeBuildInputs = [ makeWrapper ] ++ runtimeInputs; @@ -98,8 +98,8 @@ buildDunePackage rec { description = "Release dune packages in opam"; mainProgram = "dune-release"; homepage = "https://github.com/ocamllabs/dune-release"; - changelog = "https://github.com/tarides/dune-release/blob/${version}/CHANGES.md"; + changelog = "https://github.com/tarides/dune-release/blob/${finalAttrs.version}/CHANGES.md"; license = lib.licenses.isc; maintainers = with lib.maintainers; [ sternenseemann ]; }; -} +}) diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index 20a9d6d5d862..b768c92da1f8 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -30,7 +30,7 @@ runCommand "systemtap-${systemtap-unwrapped.version}" stapBuild = systemtap-unwrapped; nativeBuildInputs = [ makeWrapper ]; passthru.tests = { inherit (nixosTests.systemtap) linux_default linux_latest; }; - inherit (systemtap-unwrapped) meta; + inherit (systemtap-unwrapped) meta version pname; } ( '' diff --git a/pkgs/development/web/nodejs/corepack.nix b/pkgs/development/web/nodejs/corepack.nix index d96f3bad0e21..a94d1fa20729 100644 --- a/pkgs/development/web/nodejs/corepack.nix +++ b/pkgs/development/web/nodejs/corepack.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { pname = "corepack-nodejs"; inherit (nodejs) version; - nativeBuildInputs = [ nodejs ]; + nativeBuildInputs = [ nodejs.corepack ]; + buildInputs = [ nodejs ]; dontUnpack = true; diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index c3e8548004d8..32473cad4ec3 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -58,7 +58,6 @@ }: { - enableNpm ? true, version, sha256, patches ? [ ], @@ -69,7 +68,7 @@ let majorVersion = lib.versions.major version; minorVersion = lib.versions.minor version; - pname = if enableNpm then "nodejs" else "nodejs-slim"; + pname = "nodejs-slim"; canExecute = stdenv.buildPlatform.canExecute stdenv.hostPlatform; emulator = stdenv.hostPlatform.emulator buildPackages; @@ -179,6 +178,8 @@ let builtins.attrNames sharedLibDeps ); + bundlesCorepack = !lib.versionAtLeast version "25.0.0"; + # Currently stdenv sets CC/LD/AR/etc environment variables to program names # instead of absolute paths. If we add cctools to nativeBuildInputs, that # would shadow stdenv’s bintools and potentially break other parts of the @@ -279,7 +280,9 @@ let outputs = [ "out" "libv8" + "npm" ] + ++ lib.optional bundlesCorepack "corepack" ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ "dev" ]; setOutputFlags = false; moveToDev = false; @@ -304,7 +307,6 @@ let "--emulator=${emulator}" ] ++ lib.optionals (lib.versionOlder version "19") [ "--without-dtrace" ] - ++ lib.optionals (!enableNpm) [ "--without-npm" ] ++ lib.concatMap (name: [ "--shared-${name}" "--shared-${name}-libpath=${lib.getLib sharedLibDeps.${name}}/lib" @@ -357,12 +359,18 @@ let inherit patches; - postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + postPatch = '' + substituteInPlace tools/install.py \ + --replace-fail ' corepack_files(options, action)' " oip=options.install_path;options.install_path='$corepack';corepack_files(options, action);options.install_path=oip" \ + --replace-fail ' npm_files(options, action)' " oip=options.install_path;options.install_path='$npm';npm_files(options, action);options.install_path=oip" + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace test/parallel/test-macos-app-sandbox.js \ --subst-var-by codesign '${darwin.sigtool}/bin/codesign' ''; __darwinAllowLocalNetworking = true; # for tests + __structuredAttrs = true; # for outputChecks doCheck = canExecute; @@ -503,6 +511,35 @@ let }" ]; + outputChecks = { + out = { + disallowedReferences = [ + "libv8" + "npm" + ] + ++ lib.optional bundlesCorepack "corepack"; + }; + corepack = { + disallowedReferences = [ + "libv8" + "npm" + ]; + }; + libv8 = { + disallowedReferences = [ + "out" + "npm" + ] + ++ lib.optional bundlesCorepack "corepack"; + }; + npm = { + disallowedReferences = [ + "libv8" + ] + ++ lib.optional bundlesCorepack "corepack"; + }; + }; + sandboxProfile = '' (allow file-read* (literal "/Library/Keychains/System.keychain") @@ -540,24 +577,14 @@ let '' + '' - HOST_PATH=$out/bin patchShebangs --host $out - ${lib.optionalString canExecute '' $out/bin/node --completion-bash > node.bash installShellCompletion node.bash ''} - ${lib.optionalString enableNpm '' - mkdir -p $out/share/bash-completion/completions - ln -s $out/lib/node_modules/npm/lib/utils/completion.sh \ - $out/share/bash-completion/completions/npm - for dir in "$out/lib/node_modules/npm/man/"*; do - mkdir -p $out/share/man/$(basename "$dir") - for page in "$dir"/*; do - ln -rs $page $out/share/man/$(basename "$dir") - done - done - ''} + mkdir -p $npm/share/bash-completion/completions + ln -s $npm/lib/node_modules/npm/lib/utils/completion.sh \ + $npm/share/bash-completion/completions/npm # install the missing headers for node-gyp # TODO: use propagatedBuildInputs instead of copying headers. @@ -596,6 +623,17 @@ let cp -r $out/include $dev/include ''; + postFixup = '' + HOST_PATH=$out/bin patchShebangs --host $out ${lib.optionalString bundlesCorepack "$corepack"} $npm + + for dir in "$npm/lib/node_modules/npm/man/"*; do + mkdir -p $npm/share/man/$(basename "$dir") + for page in "$dir"/*; do + ln -rs $page $npm/share/man/$(basename "$dir") + done + done + ''; + passthru.tests = { version = testers.testVersion { package = self; diff --git a/pkgs/development/web/nodejs/symlink.nix b/pkgs/development/web/nodejs/symlink.nix new file mode 100644 index 000000000000..87bbdbec6314 --- /dev/null +++ b/pkgs/development/web/nodejs/symlink.nix @@ -0,0 +1,14 @@ +{ + lib, + nodejs-slim, + symlinkJoin, +}: +symlinkJoin { + pname = "nodejs"; + inherit (nodejs-slim) version passthru meta; + paths = [ + nodejs-slim + nodejs-slim.npm + ] + ++ lib.optional (builtins.hasAttr "corepack" nodejs-slim) nodejs-slim.corepack; +} diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index c0bccf940de6..977390b0dd67 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -5,7 +5,6 @@ fetchpatch2, openssl, python3, - enableNpm ? true, }: let @@ -35,7 +34,6 @@ let ]; in buildNodejs { - inherit enableNpm; version = "20.20.0"; sha256 = "5294d9d2915620e819e6892fd7e545b98d650bad36dae54e6527eaac482add98"; patches = [ diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix index 69e909ecad7a..046d655161f8 100644 --- a/pkgs/development/web/nodejs/v22.nix +++ b/pkgs/development/web/nodejs/v22.nix @@ -6,7 +6,6 @@ fetchpatch2, openssl, python3, - enableNpm ? true, }: let @@ -22,7 +21,6 @@ let [ ]; in buildNodejs { - inherit enableNpm; version = "22.22.0"; sha256 = "4c138012bb5352f49822a8f3e6d1db71e00639d0c36d5b6756f91e4c6f30b683"; patches = diff --git a/pkgs/development/web/nodejs/v24.nix b/pkgs/development/web/nodejs/v24.nix index 8213ee1229ad..3b11c99c347c 100644 --- a/pkgs/development/web/nodejs/v24.nix +++ b/pkgs/development/web/nodejs/v24.nix @@ -6,7 +6,6 @@ fetchpatch2, openssl, python3, - enableNpm ? true, }: let @@ -24,7 +23,6 @@ let [ ]; in buildNodejs { - inherit enableNpm; version = "24.13.0"; sha256 = "320fe909cbb347dcf516201e4964ef177b8138df9a7f810d0d54950481b3158b"; patches = diff --git a/pkgs/development/web/nodejs/v25.nix b/pkgs/development/web/nodejs/v25.nix index 50f7d9baf93c..28609675644c 100644 --- a/pkgs/development/web/nodejs/v25.nix +++ b/pkgs/development/web/nodejs/v25.nix @@ -6,7 +6,6 @@ fetchpatch2, openssl, python3, - enableNpm ? true, }: let @@ -24,7 +23,6 @@ let [ ]; in buildNodejs { - inherit enableNpm; version = "25.6.1"; sha256 = "cf756781c8b4dc5ee030f87ddf9d51b8d5bf219ad56cbd9855c4a3bdc832c78e"; patches = diff --git a/pkgs/development/web/playwright/chromium-headless-shell.nix b/pkgs/development/web/playwright/chromium-headless-shell.nix index d691b7676181..4003d077365d 100644 --- a/pkgs/development/web/playwright/chromium-headless-shell.nix +++ b/pkgs/development/web/playwright/chromium-headless-shell.nix @@ -10,6 +10,7 @@ alsa-lib, at-spi2-atk, + expat, glib, libxcomposite, libxdamage, @@ -44,6 +45,7 @@ let buildInputs = [ alsa-lib at-spi2-atk + expat glib libxcomposite libxdamage diff --git a/pkgs/kde/gear/kdenlive/default.nix b/pkgs/kde/gear/kdenlive/default.nix index b4a64e85b363..50ffa2dc4b4b 100644 --- a/pkgs/kde/gear/kdenlive/default.nix +++ b/pkgs/kde/gear/kdenlive/default.nix @@ -16,7 +16,6 @@ kio-extras, opentimelineio, frei0r, - shaderc, }: mkKdeDerivation { pname = "kdenlive"; @@ -32,9 +31,6 @@ mkKdeDerivation { "-DFETCH_OTIO=0" ]; - # Workaround until https://github.com/NixOS/nixpkgs/pull/480475 hits master - NIX_LDFLAGS = [ "-L${shaderc.lib}/lib -lshaderc_shared" ]; - extraNativeBuildInputs = [ pkg-config shared-mime-info diff --git a/pkgs/os-specific/darwin/sigtool/default.nix b/pkgs/os-specific/darwin/sigtool/default.nix index f9872578826f..226956ba1cdd 100644 --- a/pkgs/os-specific/darwin/sigtool/default.nix +++ b/pkgs/os-specific/darwin/sigtool/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/thefloweringash/sigtool"; license = lib.licenses.mit; platforms = lib.platforms.unix; + mainProgram = "sigtool"; }; } diff --git a/pkgs/os-specific/linux/ajantv2/default.nix b/pkgs/os-specific/linux/ajantv2/default.nix index d9e664b1c3d0..ffaa13efbce5 100644 --- a/pkgs/os-specific/linux/ajantv2/default.nix +++ b/pkgs/os-specific/linux/ajantv2/default.nix @@ -4,8 +4,10 @@ kernelModuleMakeFlags, libajantv2, }: -stdenv.mkDerivation { - name = "ajantv2-module-${libajantv2.version}-${kernel.version}"; +stdenv.mkDerivation (finalAttrs: { + name = "${finalAttrs.version}-${finalAttrs.version}-${kernel.version}"; + pname = "ajantv2-module"; + version = libajantv2.version; inherit (libajantv2) src; sourceRoot = "${libajantv2.src.name}/driver/linux"; @@ -46,4 +48,4 @@ stdenv.mkDerivation { # FTB for hardened 5.10/5.15 kernels broken = kernel.kernelOlder "6" && kernel.isHardened; }; -} +}) diff --git a/pkgs/os-specific/linux/asus-ec-sensors/default.nix b/pkgs/os-specific/linux/asus-ec-sensors/default.nix index 08f3e367f8cc..65aad572b638 100644 --- a/pkgs/os-specific/linux/asus-ec-sensors/default.nix +++ b/pkgs/os-specific/linux/asus-ec-sensors/default.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation rec { - name = "asus-ec-sensors-${version}-${kernel.version}"; + name = "${pname}-${version}-${kernel.version}"; + pname = "asus-ec-sensors"; version = "0.1.0-unstable-2025-12-11"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index 7b0a04c1e52b..6d55fe64d23b 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -8,15 +8,10 @@ runtimeShell, }: -let - baseName = "bbswitch"; +stdenv.mkDerivation (finalAttrs: { + name = "${finalAttrs.pname}-${finalAttrs.version}-${kernel.version}"; + pname = "bbswitch"; version = "unstable-2021-11-29"; - name = "${baseName}-${version}-${kernel.version}"; - -in - -stdenv.mkDerivation { - inherit name; src = fetchFromGitHub { owner = "Bumblebee-Project"; @@ -72,4 +67,4 @@ stdenv.mkDerivation { maintainers = [ ]; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 54b0c8de54a9..c2d8b0cfacb6 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -65,8 +65,10 @@ let "wl-kmod-035_kernel_6.17_adaptation_fix_functions_prototypes.patch" ]; in -stdenv.mkDerivation { - name = "broadcom-sta-${version}-${release}-${kernel.version}"; +stdenv.mkDerivation (finalAttrs: { + name = "${finalAttrs.pname}-${finalAttrs.version}-${release}-${kernel.version}"; + pname = "broadcom-sta"; + inherit version; src = fetchurl { url = "https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/${tarball}"; @@ -123,4 +125,4 @@ stdenv.mkDerivation { ) ]; }; -} +}) diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index 6957307b89b0..be0718d9b5dd 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -8,16 +8,16 @@ }: let rev-prefix = "ena_linux_"; - version = "2.16.0"; in -stdenv.mkDerivation { - inherit version; - name = "ena-${version}-${kernel.version}"; +stdenv.mkDerivation (finalAttrs: { + version = "2.16.0"; + pname = "ena"; + name = "${finalAttrs.pname}-${finalAttrs.version}-${kernel.version}"; src = fetchFromGitHub { owner = "amzn"; repo = "amzn-drivers"; - rev = "${rev-prefix}${version}"; + rev = "${rev-prefix}${finalAttrs.version}"; hash = "sha256-7gPo3wPMpKPOkmZJzzpt0GdCdX/1N/Xqty1Hg+fQQlU="; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation { ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/os-specific/linux/facetimehd/default.nix b/pkgs/os-specific/linux/facetimehd/default.nix index ccb2f71e0210..20293d82745c 100644 --- a/pkgs/os-specific/linux/facetimehd/default.nix +++ b/pkgs/os-specific/linux/facetimehd/default.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation rec { - name = "facetimehd-${version}-${kernel.version}"; + name = "${pname}-${version}-${kernel.version}"; + pname = "facetimehd"; version = "0.6.13"; # Note: When updating this revision: diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index c91c014045b2..9a9a8b6dd7d3 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -110,7 +110,9 @@ stdenv.mkDerivation rec { argp-standalone ]; - NIX_LDFLAGS = lib.optionalString (!stdenv.hostPlatform.isGnu) "-largp"; + env = lib.optionalAttrs (!stdenv.hostPlatform.isGnu) { + NIX_LDFLAGS = "-largp"; + }; enableParallelBuilding = true; dontWrapQtApps = true; diff --git a/pkgs/os-specific/linux/isgx/default.nix b/pkgs/os-specific/linux/isgx/default.nix index 332e682bee2b..df9b51f9e65c 100644 --- a/pkgs/os-specific/linux/isgx/default.nix +++ b/pkgs/os-specific/linux/isgx/default.nix @@ -6,7 +6,8 @@ }: stdenv.mkDerivation rec { - name = "isgx-${version}-${kernel.version}"; + name = "${pname}-${version}-${kernel.version}"; + pname = "isgx"; version = "2.14"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/it87/default.nix b/pkgs/os-specific/linux/it87/default.nix index 0167ce81528c..33ae1e1fa258 100644 --- a/pkgs/os-specific/linux/it87/default.nix +++ b/pkgs/os-specific/linux/it87/default.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation rec { - name = "it87-${version}-${kernel.version}"; + name = "${pname}-${version}-${kernel.version}"; + pname = "it87"; version = "unstable-2025-12-26"; # Original is no longer maintained. diff --git a/pkgs/os-specific/linux/ixgbevf/default.nix b/pkgs/os-specific/linux/ixgbevf/default.nix index 6a299d97dea5..91d90d22fed1 100644 --- a/pkgs/os-specific/linux/ixgbevf/default.nix +++ b/pkgs/os-specific/linux/ixgbevf/default.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation rec { - name = "ixgbevf-${version}-${kernel.version}"; + name = "${pname}-${version}-${kernel.version}"; + pname = "ixgbevf"; version = "4.6.1"; src = fetchurl { diff --git a/pkgs/os-specific/linux/jool/default.nix b/pkgs/os-specific/linux/jool/default.nix index b9694444867a..bd705872a474 100644 --- a/pkgs/os-specific/linux/jool/default.nix +++ b/pkgs/os-specific/linux/jool/default.nix @@ -12,8 +12,10 @@ let sourceAttrs = (import ./source.nix) { inherit fetchFromGitHub; }; in -stdenv.mkDerivation { - name = "jool-${sourceAttrs.version}-${kernel.version}"; +stdenv.mkDerivation (finalAttrs: { + name = "${finalAttrs.pname}-${finalAttrs.version}-${kernel.version}"; + pname = "jool"; + inherit (sourceAttrs) version; src = sourceAttrs.src; @@ -49,4 +51,4 @@ stdenv.mkDerivation { license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ fpletz ]; }; -} +}) diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index cba9997b325e..7a7531738fae 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -152,13 +152,13 @@ in linuxHeaders = let - version = "6.18"; + version = "6.18.7"; in makeLinuxHeaders { inherit version; src = fetchurl { url = "mirror://kernel/linux/kernel/v${lib.versions.major version}.x/linux-${version}.tar.xz"; - hash = "sha256-kQakYF2p4x/xdlnZWHgrgV+VkaswjQOw7iGq1sfc7Us="; + hash = "sha256-tyak0Vz5rgYhm1bYeCB3bjTYn7wTflX7VKm5wwFbjx4="; }; patches = [ ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index 5924b1567a40..11a00c6261cf 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { outputs = [ "out" + "man" "dev" "lib" ] diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index 7bf2759bea04..956fe3e37b9d 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.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "libbpf"; repo = "libbpf"; rev = "v${version}"; - hash = "sha256-igjjwirg3O5mC3DzGCAO9OgrH2drnE/gV6NH7ZLNnFE="; + hash = "sha256-poLBZDogSL2ip90Es0xJ7X/xJ8+g9FJHnXSX0+N15es="; }; patches = [ diff --git a/pkgs/os-specific/linux/liquidtux/default.nix b/pkgs/os-specific/linux/liquidtux/default.nix index 5b29487d4112..e604c8acd775 100644 --- a/pkgs/os-specific/linux/liquidtux/default.nix +++ b/pkgs/os-specific/linux/liquidtux/default.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation rec { - name = "liquidtux-${version}-${kernel.version}"; + name = "${pname}-${version}-${kernel.version}"; + pname = "liquidtux"; version = "0.1.0-unstable-2025-01-16"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/minimal-bootstrap/bash/common.nix b/pkgs/os-specific/linux/minimal-bootstrap/bash/common.nix index 5746075ff687..f161c42dc2ba 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/bash/common.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/bash/common.nix @@ -6,5 +6,6 @@ license = lib.licenses.gpl3Plus; teams = [ lib.teams.minimal-bootstrap ]; platforms = lib.platforms.unix; + mainProgram = "bash"; }; } diff --git a/pkgs/os-specific/linux/minimal-bootstrap/bash/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/bash/default.nix index c4d4d0284824..ed4518807879 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/bash/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/bash/default.nix @@ -83,8 +83,14 @@ bootBash.runCommand "${pname}-${version}" coreutils ] ); + passthru = (env.passthru or { }) // { + isFromMinBootstrap = true; + }; } - // (removeAttrs env [ "nativeBuildInputs" ]) + // (removeAttrs env [ + "nativeBuildInputs" + "passthru" + ]) ); passthru.tests.get-version = result: diff --git a/pkgs/os-specific/linux/minimal-bootstrap/bash/static.nix b/pkgs/os-specific/linux/minimal-bootstrap/bash/static.nix index 38ad81155493..742379b94603 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/bash/static.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/bash/static.nix @@ -72,4 +72,5 @@ bash.runCommand "${pname}-${version}" # Install make -j $NIX_BUILD_CORES install-strip rm $out/bin/bashbug + ln -s $out/bin/bash $out/bin/sh '' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/default.nix index 25cedd7548b4..7149ef167f0e 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/default.nix @@ -28,395 +28,416 @@ lib.makeScope ) ) ( - self: with self; { + self: + with self; + ( + { + supportedSystems = [ + "i686-linux" + "x86_64-linux" + ]; - bash_2_05 = callPackage ./bash/2.nix { tinycc = tinycc-mes; }; + bash_2_05 = callPackage ./bash/2.nix { tinycc = tinycc-mes; }; - bash = callPackage ./bash { - bootBash = bash_2_05; - tinycc = tinycc-musl; - coreutils = coreutils-musl; - gnumake = gnumake-musl; - gnutar = gnutar-musl; - }; + bash = callPackage ./bash { + bootBash = bash_2_05; + tinycc = tinycc-musl; + coreutils = coreutils-musl; + gnumake = gnumake-musl; + gnutar = gnutar-musl; + }; - bash-static = callPackage ./bash/static.nix { - gcc = gcc-latest; - gnumake = gnumake-musl; - gnutar = gnutar-latest; - }; + bash-static = callPackage ./bash/static.nix { + gcc = gcc-latest; + gnumake = gnumake-musl; + gnutar = gnutar-latest; + }; - binutils = callPackage ./binutils { - tinycc = tinycc-musl; - gnumake = gnumake-musl; - gnutar = gnutar-musl; - }; + binutils = callPackage ./binutils { + tinycc = tinycc-musl; + gnumake = gnumake-musl; + gnutar = gnutar-musl; + }; - binutils-static = callPackage ./binutils/static.nix { - gcc = gcc-latest; - gnumake = gnumake-musl; - gnutar = gnutar-latest; - }; + binutils-static = callPackage ./binutils/static.nix { + gcc = gcc-latest; + gnumake = gnumake-musl; + gnutar = gnutar-latest; + }; - bison = callPackage ./bison { - gcc = gcc-latest; - gnumake = gnumake-musl; - gnutar = gnutar-latest; - }; + bison = callPackage ./bison { + gcc = gcc-latest; + gnumake = gnumake-musl; + gnutar = gnutar-latest; + }; - busybox-static = callPackage ./busybox/static.nix { - gcc = gcc-latest; - gnumake = gnumake-musl; - gnutar = gnutar-latest; - }; + busybox-static = callPackage ./busybox/static.nix { + gcc = gcc-latest; + gnumake = gnumake-musl; + gnutar = gnutar-latest; + }; - bzip2 = callPackage ./bzip2 { - tinycc = tinycc-musl; - gnumake = gnumake-musl; - gnutar = gnutar-musl; - }; + bzip2 = callPackage ./bzip2 { + tinycc = tinycc-musl; + gnumake = gnumake-musl; + gnutar = gnutar-musl; + }; - bzip2-static = callPackage ./bzip2/static.nix { - gcc = gcc-latest; - gnumake = gnumake-musl; - gnutar = gnutar-latest; - }; + bzip2-static = callPackage ./bzip2/static.nix { + gcc = gcc-latest; + gnumake = gnumake-musl; + gnutar = gnutar-latest; + }; - coreutils = callPackage ./coreutils { tinycc = tinycc-mes; }; + coreutils = callPackage ./coreutils { tinycc = tinycc-mes; }; - coreutils-musl = callPackage ./coreutils/musl.nix { - bash = bash_2_05; - tinycc = tinycc-musl; - gnumake = gnumake-musl; - gnutar = gnutar-musl; - }; - coreutils-static = callPackage ./coreutils/static.nix { - gcc = gcc-latest; - gnumake = gnumake-musl; - gnutar = gnutar-latest; - }; - - diffutils = callPackage ./diffutils { - bash = bash_2_05; - tinycc = tinycc-musl; - gnumake = gnumake-musl; - gnutar = gnutar-musl; - }; - - diffutils-static = callPackage ./diffutils/static.nix { - gcc = gcc-latest; - gnumake = gnumake-musl; - gnutar = gnutar-latest; - }; - - findutils = callPackage ./findutils { - tinycc = tinycc-musl; - gnumake = gnumake-musl; - gnutar = gnutar-musl; - }; - - gawk-mes = callPackage ./gawk/mes.nix { - bash = bash_2_05; - tinycc = tinycc-mes; - gnused = gnused-mes; - }; - findutils-static = callPackage ./findutils/static.nix { - gcc = gcc-latest; - gnumake = gnumake-musl; - gnutar = gnutar-latest; - }; - - gawk = callPackage ./gawk { - bash = bash_2_05; - tinycc = tinycc-musl; - gnumake = gnumake-musl; - gnutar = gnutar-musl; - bootGawk = gawk-mes; - }; - - gcc46 = callPackage ./gcc/4.6.nix { - tinycc = tinycc-musl; - gnumake = gnumake-musl; - gnutar = gnutar-musl; - }; - - gcc46-cxx = callPackage ./gcc/4.6.cxx.nix { - gcc = gcc46; - gnumake = gnumake-musl; - gnutar = gnutar-musl; - }; - - gcc10 = callPackage ./gcc/10.nix { - gcc = gcc46-cxx; - gnumake = gnumake-musl; - gnutar = gnutar-latest; - }; - - gcc-latest = callPackage ./gcc/latest.nix { - gcc = gcc10; - gnumake = gnumake-musl; - gnutar = gnutar-latest; - }; - - gcc-glibc = callPackage ./gcc/glibc.nix { - gcc = gcc-latest; - gnumake = gnumake-musl; - gnutar = gnutar-latest; - }; - - glibc = callPackage ./glibc { - gcc = gcc-latest; - gnumake = gnumake-musl; - gnutar = gnutar-latest; - gnugrep = gnugrep-static; - }; - - gnugrep = callPackage ./gnugrep { - bash = bash_2_05; - tinycc = tinycc-mes; - }; - - gnugrep-static = callPackage ./gnugrep/static.nix { - gcc = gcc-latest; - gnumake = gnumake-musl; - gnutar = gnutar-latest; - }; - - gnum4 = callPackage ./gnum4 { - gcc = gcc-latest; - gnumake = gnumake-musl; - gnutar = gnutar-latest; - }; - - gnumake = callPackage ./gnumake { tinycc = tinycc-bootstrappable; }; - - gnumake-musl = callPackage ./gnumake/musl.nix { - bash = bash_2_05; - tinycc = tinycc-musl; - gawk = gawk-mes; - gnumakeBoot = gnumake; - }; - - gnumake-static = callPackage ./gnumake/static.nix { - gcc = gcc-latest; - gnumake = gnumake-musl; - gnutar = gnutar-latest; - }; - - gnupatch = callPackage ./gnupatch { tinycc = tinycc-mes; }; - - gnupatch-static = callPackage ./gnupatch/static.nix { - gcc = gcc-latest; - gnumake = gnumake-musl; - gnutar = gnutar-latest; - }; - - gnused = callPackage ./gnused { - bash = bash_2_05; - tinycc = tinycc-musl; - gnused = gnused-mes; - }; - - gnused-mes = callPackage ./gnused/mes.nix { - bash = bash_2_05; - tinycc = tinycc-bootstrappable; - }; - - gnused-static = callPackage ./gnused/static.nix { - gcc = gcc-latest; - gnumake = gnumake-musl; - gnutar = gnutar-latest; - }; - - gnutar = callPackage ./gnutar/mes.nix { - bash = bash_2_05; - tinycc = tinycc-mes; - gnused = gnused-mes; - }; - - # FIXME: better package naming scheme - gnutar-latest = callPackage ./gnutar/latest.nix { - gcc = gcc46; - gnumake = gnumake-musl; - gnutarBoot = gnutar-musl; - }; - - gnutar-musl = callPackage ./gnutar/musl.nix { - bash = bash_2_05; - tinycc = tinycc-musl; - gnused = gnused-mes; - }; - - gnutar-static = callPackage ./gnutar/static.nix { - gcc = gcc-latest; - gnumake = gnumake-musl; - gnutarBoot = gnutar-latest; - }; - - gzip-static = callPackage ./gzip/static.nix { - gcc = gcc-latest; - gnumake = gnumake-musl; - gnutar = gnutar-latest; - }; - - gzip = callPackage ./gzip { - bash = bash_2_05; - tinycc = tinycc-bootstrappable; - gnused = gnused-mes; - }; - - heirloom = callPackage ./heirloom { - bash = bash_2_05; - tinycc = tinycc-mes; - }; - - heirloom-devtools = callPackage ./heirloom-devtools { tinycc = tinycc-mes; }; - - linux-headers = callPackage ./linux-headers { - gcc = gcc-latest; - gnumake = gnumake-musl; - gnutar = gnutar-latest; - }; - - ln-boot = callPackage ./ln-boot { }; - - mes = callPackage ./mes { }; - - mes-libc = callPackage ./mes/libc.nix { }; - - musl-tcc-intermediate = callPackage ./musl/tcc.nix { - bash = bash_2_05; - tinycc = tinycc-mes; - gnused = gnused-mes; - }; - - musl-tcc = callPackage ./musl/tcc.nix { - bash = bash_2_05; - tinycc = tinycc-musl-intermediate; - gnused = gnused-mes; - }; - - musl = callPackage ./musl { - gcc = gcc46; - gnumake = gnumake-musl; - }; - - patchelf-static = callPackage ./patchelf/static.nix { - gcc = gcc-latest; - gnumake = gnumake-musl; - gnutar = gnutar-latest; - }; - - python = callPackage ./python { - gcc = gcc-latest; - gnumake = gnumake-musl; - gnutar = gnutar-latest; - }; - - stage0-posix = callPackage ./stage0-posix { }; - - inherit (self.stage0-posix) - kaem - m2libc - mescc-tools - mescc-tools-extra - ; - - tinycc-bootstrappable = lib.recurseIntoAttrs (callPackage ./tinycc/bootstrappable.nix { }); - - tinycc-mes = lib.recurseIntoAttrs (callPackage ./tinycc/mes.nix { }); - - tinycc-musl-intermediate = lib.recurseIntoAttrs ( - callPackage ./tinycc/musl.nix { + coreutils-musl = callPackage ./coreutils/musl.nix { + bash = bash_2_05; + tinycc = tinycc-musl; + gnumake = gnumake-musl; + gnutar = gnutar-musl; + }; + coreutils-static = callPackage ./coreutils/static.nix { + gcc = gcc-latest; + gnumake = gnumake-musl; + gnutar = gnutar-latest; + }; + + diffutils = callPackage ./diffutils { + bash = bash_2_05; + tinycc = tinycc-musl; + gnumake = gnumake-musl; + gnutar = gnutar-musl; + }; + + diffutils-static = callPackage ./diffutils/static.nix { + gcc = gcc-latest; + gnumake = gnumake-musl; + gnutar = gnutar-latest; + }; + + findutils = callPackage ./findutils { + tinycc = tinycc-musl; + gnumake = gnumake-musl; + gnutar = gnutar-musl; + }; + + findutils-static = callPackage ./findutils/static.nix { + gcc = gcc-latest; + gnumake = gnumake-musl; + gnutar = gnutar-latest; + }; + + gawk-mes = callPackage ./gawk/mes.nix { bash = bash_2_05; - musl = musl-tcc-intermediate; tinycc = tinycc-mes; - } - ); + gnused = gnused-mes; + }; - tinycc-musl = lib.recurseIntoAttrs ( - callPackage ./tinycc/musl.nix { + gawk = callPackage ./gawk { + bash = bash_2_05; + tinycc = tinycc-musl; + gnumake = gnumake-musl; + gnutar = gnutar-musl; + bootGawk = gawk-mes; + }; + + gcc46 = callPackage ./gcc/4.6.nix { + tinycc = tinycc-musl; + gnumake = gnumake-musl; + gnutar = gnutar-musl; + }; + + gcc46-cxx = callPackage ./gcc/4.6.cxx.nix { + gcc = gcc46; + gnumake = gnumake-musl; + gnutar = gnutar-musl; + }; + + gcc10 = callPackage ./gcc/10.nix { + gcc = gcc46-cxx; + gnumake = gnumake-musl; + gnutar = gnutar-latest; + }; + + gcc-latest = callPackage ./gcc/latest.nix { + gcc = gcc10; + gnumake = gnumake-musl; + gnutar = gnutar-latest; + }; + + gnugrep = callPackage ./gnugrep { + bash = bash_2_05; + tinycc = tinycc-mes; + }; + + gnugrep-static = callPackage ./gnugrep/static.nix { + gcc = gcc-latest; + gnumake = gnumake-musl; + gnutar = gnutar-latest; + }; + + gnum4 = callPackage ./gnum4 { + gcc = gcc-latest; + gnumake = gnumake-musl; + gnutar = gnutar-latest; + }; + + gnumake = callPackage ./gnumake { tinycc = tinycc-bootstrappable; }; + + gnumake-musl = callPackage ./gnumake/musl.nix { + bash = bash_2_05; + tinycc = tinycc-musl; + gawk = gawk-mes; + gnumakeBoot = gnumake; + }; + + gnumake-static = callPackage ./gnumake/static.nix { + gcc = gcc-latest; + gnumake = gnumake-musl; + gnutar = gnutar-latest; + }; + + gnupatch = callPackage ./gnupatch { tinycc = tinycc-mes; }; + + gnupatch-static = callPackage ./gnupatch/static.nix { + gcc = gcc-latest; + gnumake = gnumake-musl; + gnutar = gnutar-latest; + }; + + gnused = callPackage ./gnused { + bash = bash_2_05; + tinycc = tinycc-musl; + gnused = gnused-mes; + }; + + gnused-mes = callPackage ./gnused/mes.nix { + bash = bash_2_05; + tinycc = tinycc-bootstrappable; + }; + + gnused-static = callPackage ./gnused/static.nix { + gcc = gcc-latest; + gnumake = gnumake-musl; + gnutar = gnutar-latest; + }; + + gnutar = callPackage ./gnutar/mes.nix { + bash = bash_2_05; + tinycc = tinycc-mes; + gnused = gnused-mes; + }; + + # FIXME: better package naming scheme + gnutar-latest = callPackage ./gnutar/latest.nix { + gcc = gcc46; + gnumake = gnumake-musl; + gnutarBoot = gnutar-musl; + }; + + gnutar-musl = callPackage ./gnutar/musl.nix { + bash = bash_2_05; + tinycc = tinycc-musl; + gnused = gnused-mes; + }; + + gnutar-static = callPackage ./gnutar/static.nix { + gcc = gcc-latest; + gnumake = gnumake-musl; + gnutarBoot = gnutar-latest; + }; + + gzip-static = callPackage ./gzip/static.nix { + gcc = gcc-latest; + gnumake = gnumake-musl; + gnutar = gnutar-latest; + }; + + gzip = callPackage ./gzip { + bash = bash_2_05; + tinycc = tinycc-bootstrappable; + gnused = gnused-mes; + }; + + heirloom = callPackage ./heirloom { + bash = bash_2_05; + tinycc = tinycc-mes; + }; + + heirloom-devtools = callPackage ./heirloom-devtools { tinycc = tinycc-mes; }; + + linux-headers = callPackage ./linux-headers { + gcc = gcc-latest; + gnumake = gnumake-musl; + gnutar = gnutar-latest; + }; + + ln-boot = callPackage ./ln-boot { }; + + mes = callPackage ./mes { }; + + mes-libc = callPackage ./mes/libc.nix { }; + + musl-tcc-intermediate = callPackage ./musl/tcc.nix { + bash = bash_2_05; + tinycc = tinycc-mes; + gnused = gnused-mes; + }; + + musl-tcc = callPackage ./musl/tcc.nix { bash = bash_2_05; - musl = musl-tcc; tinycc = tinycc-musl-intermediate; - } - ); + gnused = gnused-mes; + }; - gawk-static = callPackage ./gawk/static.nix { - gcc = gcc-latest; - gnumake = gnumake-musl; - gnutar = gnutar-latest; - }; + musl = callPackage ./musl { + gcc = gcc46; + gnumake = gnumake-musl; + }; - xz = callPackage ./xz { - bash = bash_2_05; - tinycc = tinycc-musl; - gnumake = gnumake-musl; - gnutar = gnutar-musl; - }; + musl-static = callPackage ./musl/static.nix { + gcc = gcc-latest; + gnumake = gnumake-musl; + }; - zlib = callPackage ./zlib { - gcc = gcc-latest; - gnumake = gnumake-musl; - gnutar = gnutar-latest; - }; + patchelf-static = callPackage ./patchelf/static.nix { + gcc = gcc-latest; + gnumake = gnumake-musl; + gnutar = gnutar-latest; + }; - inherit (callPackage ./utils.nix { }) derivationWithMeta writeTextFile writeText; - test = kaem.runCommand "minimal-bootstrap-test" { } ( - '' - echo ${bash.tests.get-version} - echo ${bash-static.tests.get-version} - echo ${bash_2_05.tests.get-version} - echo ${binutils.tests.get-version} - echo ${binutils-static.tests.get-version} - echo ${bison.tests.get-version} - echo ${busybox-static.tests.get-version} - echo ${bzip2.tests.get-version} - echo ${bzip2-static.tests.get-version} - echo ${coreutils-musl.tests.get-version} - echo ${coreutils-static.tests.get-version} - echo ${diffutils.tests.get-version} - echo ${diffutils-static.tests.get-version} - echo ${findutils.tests.get-version} - echo ${findutils-static.tests.get-version} - echo ${gawk.tests.get-version} - echo ${gawk-mes.tests.get-version} - echo ${gawk-static.tests.get-version} - echo ${gcc46.tests.get-version} - echo ${gcc46-cxx.tests.hello-world} - echo ${gcc10.tests.hello-world} - echo ${gcc-latest.tests.hello-world} - echo ${gnugrep.tests.get-version} - echo ${gnugrep-static.tests.get-version} - echo ${gnum4.tests.get-version} - echo ${gnumake-musl.tests.get-version} - echo ${gnumake-static.tests.get-version} - echo ${gnupatch-static.tests.get-version} - echo ${gnused.tests.get-version} - echo ${gnused-mes.tests.get-version} - echo ${gnused-static.tests.get-version} - echo ${gnutar.tests.get-version} - echo ${gnutar-latest.tests.get-version} - echo ${gnutar-musl.tests.get-version} - echo ${gnutar-static.tests.get-version} - echo ${gzip.tests.get-version} - echo ${gzip-static.tests.get-version} - echo ${heirloom.tests.get-version} - echo ${mes.compiler.tests.get-version} - echo ${musl.tests.hello-world} - echo ${patchelf-static.tests.get-version} - echo ${python.tests.get-version} - echo ${tinycc-mes.compiler.tests.chain} - echo ${tinycc-musl.compiler.tests.hello-world} - echo ${xz.tests.get-version} - '' - + (lib.strings.optionalString (hostPlatform.libc == "glibc") '' - echo ${gcc-glibc.tests.hello-world} - echo ${glibc.tests.hello-world} - '') - + '' - mkdir ''${out} - '' - ); - } + python = callPackage ./python { + gcc = gcc-latest; + gnumake = gnumake-musl; + gnutar = gnutar-latest; + }; + + stage0-posix = callPackage ./stage0-posix { }; + + inherit (self.stage0-posix) + kaem + m2libc + mescc-tools + mescc-tools-extra + ; + + tinycc-bootstrappable = lib.recurseIntoAttrs (callPackage ./tinycc/bootstrappable.nix { }); + + tinycc-mes = lib.recurseIntoAttrs (callPackage ./tinycc/mes.nix { }); + + tinycc-musl-intermediate = lib.recurseIntoAttrs ( + callPackage ./tinycc/musl.nix { + bash = bash_2_05; + musl = musl-tcc-intermediate; + tinycc = tinycc-mes; + } + ); + + tinycc-musl = lib.recurseIntoAttrs ( + callPackage ./tinycc/musl.nix { + bash = bash_2_05; + musl = musl-tcc; + tinycc = tinycc-musl-intermediate; + } + ); + + gawk-static = callPackage ./gawk/static.nix { + gcc = gcc-latest; + gnumake = gnumake-musl; + gnutar = gnutar-latest; + }; + + xz = callPackage ./xz { + bash = bash_2_05; + tinycc = tinycc-musl; + gnumake = gnumake-musl; + gnutar = gnutar-musl; + }; + + xz-static = callPackage ./xz/static.nix { + gcc = gcc-latest; + gnumake = gnumake-musl; + gnutar = gnutar-latest; + }; + + zlib = callPackage ./zlib { + gcc = gcc-latest; + gnumake = gnumake-musl; + gnutar = gnutar-latest; + }; + + inherit (callPackage ./utils.nix { }) derivationWithMeta writeTextFile writeText; + test = kaem.runCommand "minimal-bootstrap-test" { } ( + '' + echo ${bash.tests.get-version} + echo ${bash-static.tests.get-version} + echo ${bash_2_05.tests.get-version} + echo ${binutils.tests.get-version} + echo ${binutils-static.tests.get-version} + echo ${bison.tests.get-version} + echo ${busybox-static.tests.get-version} + echo ${bzip2.tests.get-version} + echo ${bzip2-static.tests.get-version} + echo ${coreutils-musl.tests.get-version} + echo ${coreutils-static.tests.get-version} + echo ${diffutils.tests.get-version} + echo ${diffutils-static.tests.get-version} + echo ${findutils.tests.get-version} + echo ${findutils-static.tests.get-version} + echo ${gawk.tests.get-version} + echo ${gawk-mes.tests.get-version} + echo ${gawk-static.tests.get-version} + echo ${gcc46.tests.get-version} + echo ${gcc46-cxx.tests.hello-world} + echo ${gcc10.tests.hello-world} + echo ${gcc-latest.tests.hello-world} + echo ${gnugrep.tests.get-version} + echo ${gnugrep-static.tests.get-version} + echo ${gnum4.tests.get-version} + echo ${gnumake-musl.tests.get-version} + echo ${gnumake-static.tests.get-version} + echo ${gnupatch-static.tests.get-version} + echo ${gnused.tests.get-version} + echo ${gnused-mes.tests.get-version} + echo ${gnused-static.tests.get-version} + echo ${gnutar.tests.get-version} + echo ${gnutar-latest.tests.get-version} + echo ${gnutar-musl.tests.get-version} + echo ${gnutar-static.tests.get-version} + echo ${gzip.tests.get-version} + echo ${gzip-static.tests.get-version} + echo ${heirloom.tests.get-version} + echo ${mes.compiler.tests.get-version} + echo ${musl.tests.hello-world} + echo ${patchelf-static.tests.get-version} + echo ${python.tests.get-version} + echo ${tinycc-mes.compiler.tests.chain} + echo ${tinycc-musl.compiler.tests.hello-world} + echo ${xz.tests.get-version} + '' + + (lib.strings.optionalString (hostPlatform.libc == "glibc") '' + echo ${gcc-glibc.tests.hello-world} + echo ${glibc.tests.hello-world} + '') + + '' + mkdir ''${out} + '' + ); + } + // (lib.optionalAttrs (hostPlatform.libc == "glibc")) { + gcc-glibc = callPackage ./gcc/glibc.nix { + gcc = gcc-latest; + gnumake = gnumake-musl; + gnutar = gnutar-latest; + }; + + glibc = callPackage ./glibc { + gcc = gcc-latest; + gnumake = gnumake-musl; + gnutar = gnutar-latest; + gnugrep = gnugrep-static; + }; + } + ) ) diff --git a/pkgs/os-specific/linux/minimal-bootstrap/musl/static.nix b/pkgs/os-specific/linux/minimal-bootstrap/musl/static.nix new file mode 100644 index 000000000000..452a4256f483 --- /dev/null +++ b/pkgs/os-specific/linux/minimal-bootstrap/musl/static.nix @@ -0,0 +1,93 @@ +{ + lib, + buildPlatform, + hostPlatform, + fetchurl, + bash, + gcc, + binutils, + gnumake, + gnugrep, + gnused, + gnutar, + gzip, + linux-headers, +}: +let + inherit (import ./common.nix { inherit lib; }) pname meta; + version = "1.2.5"; + + src = fetchurl { + url = "https://musl.libc.org/releases/musl-${version}.tar.gz"; + hash = "sha256-qaEYu+hNh2TaDqDSizqz+uhHf8fkCF2QECuFlvx8deQ="; + }; +in +bash.runCommand "${pname}-${version}" + { + inherit pname version meta; + + nativeBuildInputs = [ + gcc + binutils + gnumake + gnused + gnugrep + gnutar + gzip + ]; + + passthru.tests.hello-world = + result: + bash.runCommand "${pname}-simple-program-${version}" + { + nativeBuildInputs = [ + gcc + binutils + result + ]; + } + '' + cat <> test.c + #include + int main() { + printf("Hello World!\n"); + return 0; + } + EOF + musl-gcc -o test test.c + ./test + mkdir $out + ''; + } + '' + # Unpack + tar xzf ${src} + cd musl-${version} + + # Patch + # https://github.com/ZilchOS/bootstrap-from-tcc/blob/2e0c68c36b3437386f786d619bc9a16177f2e149/using-nix/2a3-intermediate-musl.nix + sed -i 's|/bin/sh|${lib.getExe bash}|' \ + tools/*.sh + # patch popen/system to search in PATH instead of hardcoding /bin/sh + sed -i 's|posix_spawn(&pid, "/bin/sh",|posix_spawnp(\&pid, "sh",|' \ + src/stdio/popen.c src/process/system.c + sed -i 's|execl("/bin/sh", "sh", "-c",|execlp("sh", "-c",|'\ + src/misc/wordexp.c + + # Configure + bash ./configure \ + --prefix=$out \ + --build=${buildPlatform.config} \ + --host=${hostPlatform.config} \ + --syslibdir=$out/lib \ + --enable-wrapper + + # Build + make -j $NIX_BUILD_CORES + + # Install + make -j $NIX_BUILD_CORES install + sed -i 's|/bin/sh|${lib.getExe bash}|' $out/bin/* + ln -s ../lib/libc.so $out/bin/ldd + ln -s $(ls -d ${linux-headers}/include/* | grep -v scsi\$) $out/include/ + '' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/xz/static.nix b/pkgs/os-specific/linux/minimal-bootstrap/xz/static.nix new file mode 100644 index 000000000000..459722161829 --- /dev/null +++ b/pkgs/os-specific/linux/minimal-bootstrap/xz/static.nix @@ -0,0 +1,87 @@ +{ + lib, + buildPlatform, + hostPlatform, + fetchurl, + bash, + binutils, + gcc, + gnumake, + gnused, + gnugrep, + gawk, + gnutar, + gzip, + musl, +}: +let + pname = "xz"; + version = "5.8.2"; + + src = fetchurl { + url = "https://tukaani.org/xz/xz-${version}.tar.gz"; + hash = "sha256-zgnFCllieGuD5do4nJDdLBXs0JgKJY3QH3D5585YqPE="; + }; +in +bash.runCommand "${pname}-${version}" + { + inherit pname version; + + nativeBuildInputs = [ + binutils + gcc + musl + gnumake + gnused + gnugrep + gawk + gnutar + gzip + ]; + + passthru.tests.get-version = + result: + bash.runCommand "${pname}-get-version-${version}" { } '' + ${lib.getExe result} --version + mkdir $out + ''; + + meta = { + description = "General-purpose data compression software, successor of LZMA"; + homepage = "https://tukaani.org/xz"; + license = with lib.licenses; [ + gpl2Plus + lgpl21Plus + ]; + teams = [ lib.teams.minimal-bootstrap ]; + platforms = lib.platforms.unix; + mainProgram = "xz"; + }; + } + '' + # Unpack + tar xzf ${src} + cd xz-${version} + + # Configure + export CC=musl-gcc + export CFLAGS=-static + export CXXFLAGS=-static + export LDFLAGS=-static + bash ./configure \ + --prefix=$out \ + --build=${buildPlatform.config} \ + --host=${hostPlatform.config} \ + --disable-debug \ + --disable-dependency-tracking \ + --disable-silent-rules \ + --disable-nls \ + --disable-shared \ + --disable-assembler + + # Build + make -j $NIX_BUILD_CORES + + # Install + make -j $NIX_BUILD_CORES install + '' diff --git a/pkgs/os-specific/linux/ndiswrapper/default.nix b/pkgs/os-specific/linux/ndiswrapper/default.nix index 270dfa993024..fd8438acf2c3 100644 --- a/pkgs/os-specific/linux/ndiswrapper/default.nix +++ b/pkgs/os-specific/linux/ndiswrapper/default.nix @@ -7,12 +7,11 @@ kmod, elfutils, }: -let + +stdenv.mkDerivation (finalAttrs: { + name = "${finalAttrs.pname}-${finalAttrs.version}-${kernel.version}"; + pname = "ndiswrapper"; version = "1.63"; -in -stdenv.mkDerivation { - name = "ndiswrapper-${version}-${kernel.version}"; - inherit version; hardeningDisable = [ "pic" ]; @@ -38,7 +37,7 @@ stdenv.mkDerivation { ''; src = fetchurl { - url = "mirror://sourceforge/ndiswrapper/files/stable/ndiswrapper-${version}.tar.gz"; + url = "mirror://sourceforge/ndiswrapper/files/stable/ndiswrapper-${finalAttrs.version}.tar.gz"; sha256 = "1v6b66jhisl110jfl00hm43lmnrav32vs39d85gcbxrjqnmcx08g"; }; @@ -57,4 +56,4 @@ stdenv.mkDerivation { ]; broken = lib.versionAtLeast kernel.version "5.8"; }; -} +}) diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix index a3efee9ad0bc..cad8c516b766 100644 --- a/pkgs/os-specific/linux/net-tools/default.nix +++ b/pkgs/os-specific/linux/net-tools/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { "CC=${stdenv.cc.targetPrefix}cc" "AR=${stdenv.cc.targetPrefix}ar" "BASEDIR=$(out)" + # multiple-outputs.sh will move these manpages to $man automatically "mandir=/share/man" "HAVE_ARP_TOOLS=1" "HAVE_PLIP_TOOLS=1" @@ -38,6 +39,10 @@ stdenv.mkDerivation rec { "HAVE_HOSTNAME_SYMLINKS=1" "HAVE_MII=1" ]; + outputs = [ + "out" + "man" + ]; meta = { homepage = "http://net-tools.sourceforge.net/"; diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 9f65d0b135dd..4ee461ed8cbf 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -143,7 +143,8 @@ let in stdenv.mkDerivation (finalAttrs: { - name = "nvidia-${if useFabricmanager then "dc" else "x11"}-${version}${nameSuffix}"; + name = "${finalAttrs.pname}-${finalAttrs.version}${nameSuffix}"; + pname = "nvidia-${if useFabricmanager then "dc" else "x11"}"; builder = ./builder.sh; diff --git a/pkgs/os-specific/linux/nvidiabl/default.nix b/pkgs/os-specific/linux/nvidiabl/default.nix index c9921629191c..c031bf82cf08 100644 --- a/pkgs/os-specific/linux/nvidiabl/default.nix +++ b/pkgs/os-specific/linux/nvidiabl/default.nix @@ -6,7 +6,8 @@ }: stdenv.mkDerivation rec { - name = "nvidiabl-${version}-${kernel.version}"; + name = "${pname}-${version}-${kernel.version}"; + pname = "nvidiabl"; version = "2020-10-01"; # We use a fork which adds support for newer kernels -- upstream has been abandoned. diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index 71038f75ca94..921107506fb9 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch2, fetchurl, ncurses, pkg-config, @@ -23,12 +24,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "procps"; - version = "4.0.4"; + version = "4.0.6"; # The project's releases are on SF, but git repo on gitlab. src = fetchurl { url = "mirror://sourceforge/procps-ng/procps-ng-${finalAttrs.version}.tar.xz"; - hash = "sha256-IocNb+skeK22F85PCaeHrdry0mDFqKp7F9iJqWLF5C4="; + hash = "sha256-Z76m+8OkKlNaAjDJ6JHl3ftNnTlCLUZWWimQ0azhUhY="; }; buildInputs = [ ncurses ] ++ lib.optionals withSystemd [ systemdLibs ]; @@ -47,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: { "--enable-watch8bit" ] ++ lib.optionals withSystemd [ "--with-systemd" ] + ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ "--disable-pidwait" ] # Requires (Linux-only) `pidfd_open` ++ lib.optionals stdenv.hostPlatform.isMusl [ "--disable-w" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" diff --git a/pkgs/os-specific/linux/r8168/default.nix b/pkgs/os-specific/linux/r8168/default.nix index 703a33868906..7c82b1cbb28c 100644 --- a/pkgs/os-specific/linux/r8168/default.nix +++ b/pkgs/os-specific/linux/r8168/default.nix @@ -11,7 +11,8 @@ let in stdenv.mkDerivation rec { - name = "r8168-${kernel.version}-${version}"; + name = "${pname}-${version}-${kernel.version}"; + pname = "r8168"; # on update please verify that the source matches the realtek version version = "8.055.00"; diff --git a/pkgs/os-specific/linux/rtl8189es/default.nix b/pkgs/os-specific/linux/rtl8189es/default.nix index a6a2345f2c06..19ce8e60a490 100644 --- a/pkgs/os-specific/linux/rtl8189es/default.nix +++ b/pkgs/os-specific/linux/rtl8189es/default.nix @@ -9,7 +9,8 @@ }: stdenv.mkDerivation rec { - name = "rtl8189es-${kernel.version}-${version}"; + name = "${pname}-${version}-${kernel.version}"; + pname = "rtl8189es"; version = "2025-09-26"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/rtl8189fs/default.nix b/pkgs/os-specific/linux/rtl8189fs/default.nix index 8c36baaeca9c..76ab17ac0365 100644 --- a/pkgs/os-specific/linux/rtl8189fs/default.nix +++ b/pkgs/os-specific/linux/rtl8189fs/default.nix @@ -7,7 +7,8 @@ # rtl8189fs is a branch of the rtl8189es driver rtl8189es.overrideAttrs (drv: rec { - name = "rtl8189fs-${kernel.version}-${version}"; + name = "${pname}-${version}-${kernel.version}"; + pname = "rtl8189fs"; version = "2025-09-26"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/sgx/sdk/default.nix b/pkgs/os-specific/linux/sgx/sdk/default.nix index a1070d23b959..b9cf66d2e283 100644 --- a/pkgs/os-specific/linux/sgx/sdk/default.nix +++ b/pkgs/os-specific/linux/sgx/sdk/default.nix @@ -12,7 +12,6 @@ git, libtool, linkFarmFromDrvs, - ocaml, ocamlPackages, openssl, perl, @@ -83,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { cmake file git - ocaml + ocamlPackages.ocaml ocamlPackages.ocamlbuild perl python3 diff --git a/pkgs/os-specific/linux/sheep-net/default.nix b/pkgs/os-specific/linux/sheep-net/default.nix index 115e73b1eb35..61083960b102 100644 --- a/pkgs/os-specific/linux/sheep-net/default.nix +++ b/pkgs/os-specific/linux/sheep-net/default.nix @@ -6,7 +6,8 @@ lib, }: stdenv.mkDerivation (finalAttrs: { - name = "sheep_net"; + name = "${finalAttrs.pname}-${finalAttrs.version}-${kernel.version}"; + pname = "sheep_net"; version = basiliskii.version; src = basiliskii.src; sourceRoot = "${finalAttrs.src.name}/BasiliskII/src/Unix/Linux/NetDriver"; diff --git a/pkgs/os-specific/linux/shufflecake/default.nix b/pkgs/os-specific/linux/shufflecake/default.nix index 6d18f4cf89e2..327fb031e606 100644 --- a/pkgs/os-specific/linux/shufflecake/default.nix +++ b/pkgs/os-specific/linux/shufflecake/default.nix @@ -8,7 +8,8 @@ lvm2, }: stdenv.mkDerivation (finalAttrs: { - name = "shufflecake"; + name = "${finalAttrs.pname}-${finalAttrs.version}-${kernel.version}"; + pname = "shufflecake"; version = "0.5.5"; src = fetchFromCodeberg { diff --git a/pkgs/os-specific/linux/system76-acpi/default.nix b/pkgs/os-specific/linux/system76-acpi/default.nix index 40c8fb09165a..181695a948ed 100644 --- a/pkgs/os-specific/linux/system76-acpi/default.nix +++ b/pkgs/os-specific/linux/system76-acpi/default.nix @@ -5,7 +5,8 @@ kernel, }: stdenv.mkDerivation (finalAttrs: { - name = "system76-acpi-module-${finalAttrs.version}-${kernel.version}"; + name = "${finalAttrs.pname}-${finalAttrs.version}-${kernel.version}"; + pname = "system76-acpi-module"; version = "1.0.2"; passthru.moduleName = "system76_acpi"; diff --git a/pkgs/os-specific/linux/system76-io/default.nix b/pkgs/os-specific/linux/system76-io/default.nix index 06c37a1475f2..c3c6bd0c7dce 100644 --- a/pkgs/os-specific/linux/system76-io/default.nix +++ b/pkgs/os-specific/linux/system76-io/default.nix @@ -6,18 +6,19 @@ kernelModuleMakeFlags, }: let - version = "1.0.4"; hash = "sha256-VE6sCehjXlRuOVcK4EN2H+FhaVaBi/jrAYx4TZjbreA="; in -stdenv.mkDerivation { - name = "system76-io-module-${version}-${kernel.version}"; +stdenv.mkDerivation (finalAttrs: { + name = "${finalAttrs.pname}-${finalAttrs.version}-${kernel.version}"; + pname = "system76-io-module"; + version = "1.0.4"; passthru.moduleName = "system76_io"; src = fetchFromGitHub { owner = "pop-os"; repo = "system76-io-dkms"; - rev = version; + rev = finalAttrs.version; inherit hash; }; @@ -48,4 +49,4 @@ stdenv.mkDerivation { description = "DKMS module for controlling System76 Io board"; homepage = "https://github.com/pop-os/system76-io-dkms"; }; -} +}) diff --git a/pkgs/os-specific/linux/system76/default.nix b/pkgs/os-specific/linux/system76/default.nix index 191167473ce7..aaf33eb2eff4 100644 --- a/pkgs/os-specific/linux/system76/default.nix +++ b/pkgs/os-specific/linux/system76/default.nix @@ -6,18 +6,19 @@ kernelModuleMakeFlags, }: let - version = "1.0.17"; hash = "sha256-9/t+Mvfnq0KkPbe1mnrVy4mzNaK7vAgLuhUnOeEvBfI="; in -stdenv.mkDerivation { - name = "system76-module-${version}-${kernel.version}"; +stdenv.mkDerivation (finalAttrs: { + name = "${finalAttrs.pname}-${finalAttrs.version}-${kernel.version}"; + pname = "system76-module"; + version = "1.0.17"; passthru.moduleName = "system76"; src = fetchFromGitHub { owner = "pop-os"; repo = "system76-dkms"; - rev = version; + rev = finalAttrs.version; inherit hash; }; @@ -51,4 +52,4 @@ stdenv.mkDerivation { some of the hotkeys and allows for custom fan control. ''; }; -} +}) 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 d1dcbfd37a0f..9e6f0ba7be7b 100644 --- a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch +++ b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch @@ -14,10 +14,10 @@ Original-Author: Eelco Dolstra 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c -index 57ab68deb6..8e281b8f2c 100644 +index 25e229bf3e..b9af1c3b13 100644 --- a/src/shared/fstab-util.c +++ b/src/shared/fstab-util.c -@@ -72,6 +72,8 @@ bool fstab_is_extrinsic(const char *mount, const char *opts) { +@@ -76,6 +76,8 @@ bool fstab_is_extrinsic(const char *mount, const char *opts) { /* Don't bother with the OS data itself */ if (PATH_IN_SET(mount, "/", @@ -27,7 +27,7 @@ index 57ab68deb6..8e281b8f2c 100644 "/etc")) return true; diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c -index 45c6db9245..d7283b7fa6 100644 +index 46f208824a..3a625ad2a6 100644 --- a/src/shutdown/umount.c +++ b/src/shutdown/umount.c @@ -178,8 +178,10 @@ int mount_points_list_get(FILE *f, MountPoint **head) { diff --git a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch index 3815c140d495..f8f3fc1ad62c 100644 --- a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch +++ b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch @@ -10,10 +10,10 @@ container, so checking early whether it exists will fail. 1 file changed, 2 insertions(+) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index ab8746c442..480a9c55c6 100644 +index e4fccaa3a7..05e6be8874 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -6165,6 +6165,7 @@ static int run(int argc, char *argv[]) { +@@ -6208,6 +6208,7 @@ static int run(int argc, char *argv[]) { goto finish; } } else { @@ -21,7 +21,7 @@ index ab8746c442..480a9c55c6 100644 _cleanup_free_ char *p = NULL; if (arg_pivot_root_new) -@@ -6184,6 +6185,7 @@ static int run(int argc, char *argv[]) { +@@ -6227,6 +6228,7 @@ static int run(int argc, char *argv[]) { log_error_errno(r, "Unable to determine if %s looks like it has an OS tree (i.e. whether /usr/ exists): %m", arg_directory); goto finish; } diff --git a/pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch b/pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch index 81d17a57fb2f..0c9f1d206d6b 100644 --- a/pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch +++ b/pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch @@ -16,7 +16,7 @@ Original-Author: Eelco Dolstra 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in -index 58f2463104..0c263430a7 100644 +index 862d57dcb6..8ba0ca4486 100644 --- a/src/core/systemd.pc.in +++ b/src/core/systemd.pc.in @@ -46,10 +46,10 @@ systemdsystemconfdir=${systemd_system_conf_dir} @@ -46,10 +46,10 @@ index 58f2463104..0c263430a7 100644 systemd_sleep_dir=${prefix}/lib/systemd/system-sleep diff --git a/src/libsystemd/sd-path/path-lookup.c b/src/libsystemd/sd-path/path-lookup.c -index 3ddbda0e9f..3eddc80c90 100644 +index 389d7e2ad9..0819689ffa 100644 --- a/src/libsystemd/sd-path/path-lookup.c +++ b/src/libsystemd/sd-path/path-lookup.c -@@ -64,11 +64,7 @@ int runtime_directory(RuntimeScope scope, const char *suffix, char **ret) { +@@ -86,11 +86,7 @@ int runtime_directory(RuntimeScope scope, const char *fallback_suffix, char **re } static const char* const user_data_unit_paths[] = { @@ -61,7 +61,7 @@ index 3ddbda0e9f..3eddc80c90 100644 NULL }; -@@ -476,16 +472,13 @@ int lookup_paths_init( +@@ -498,16 +494,13 @@ int lookup_paths_init( persistent_config, SYSTEM_CONFIG_UNIT_DIR, "/etc/systemd/system", @@ -79,7 +79,7 @@ index 3ddbda0e9f..3eddc80c90 100644 STRV_IFNOTNULL(generator_late)); break; -@@ -503,13 +496,10 @@ int lookup_paths_init( +@@ -525,13 +518,10 @@ int lookup_paths_init( add = strv_new(persistent_config, USER_CONFIG_UNIT_DIR, "/etc/systemd/user", @@ -95,7 +95,7 @@ index 3ddbda0e9f..3eddc80c90 100644 break; case RUNTIME_SCOPE_USER: -@@ -648,7 +638,6 @@ void lookup_paths_log(LookupPaths *lp) { +@@ -670,7 +660,6 @@ void lookup_paths_log(LookupPaths *lp) { static const char* const system_generator_paths[] = { "/run/systemd/system-generators", "/etc/systemd/system-generators", @@ -103,7 +103,7 @@ index 3ddbda0e9f..3eddc80c90 100644 SYSTEM_GENERATOR_DIR, NULL, }; -@@ -656,7 +645,6 @@ static const char* const system_generator_paths[] = { +@@ -678,7 +667,6 @@ static const char* const system_generator_paths[] = { static const char* const user_generator_paths[] = { "/run/systemd/user-generators", "/etc/systemd/user-generators", @@ -111,7 +111,7 @@ index 3ddbda0e9f..3eddc80c90 100644 USER_GENERATOR_DIR, NULL, }; -@@ -664,7 +652,6 @@ static const char* const user_generator_paths[] = { +@@ -686,7 +674,6 @@ static const char* const user_generator_paths[] = { static const char* const system_env_generator_paths[] = { "/run/systemd/system-environment-generators", "/etc/systemd/system-environment-generators", @@ -119,7 +119,7 @@ index 3ddbda0e9f..3eddc80c90 100644 SYSTEM_ENV_GENERATOR_DIR, NULL, }; -@@ -672,7 +659,6 @@ static const char* const system_env_generator_paths[] = { +@@ -694,7 +681,6 @@ static const char* const system_env_generator_paths[] = { static const char* const user_env_generator_paths[] = { "/run/systemd/user-environment-generators", "/etc/systemd/user-environment-generators", 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 2f7139911220..8b8000c29d1e 100644 --- a/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch +++ b/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch @@ -13,10 +13,10 @@ in containers. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/manager.c b/src/core/manager.c -index d85896577f..2a4782a55e 100644 +index 7938c989af..c1ae20dfc0 100644 --- a/src/core/manager.c +++ b/src/core/manager.c -@@ -1575,7 +1575,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) { +@@ -1578,7 +1578,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) { if (!unit_is_bound_by_inactive(u, &culprit)) continue; diff --git a/pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch b/pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch index b43dddb3d420..82f9198d7d4e 100644 --- a/pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch +++ b/pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch @@ -11,7 +11,7 @@ Subject: [PATCH] hostnamed, localed, timedated: disable methods that change 3 files changed, 25 insertions(+) diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c -index 06fb3f2878..b656e511b7 100644 +index fbe1b2fa7a..30e7c75279 100644 --- a/src/hostname/hostnamed.c +++ b/src/hostname/hostnamed.c @@ -1388,6 +1388,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_ @@ -35,7 +35,7 @@ index 06fb3f2878..b656e511b7 100644 context_read_machine_info(c); diff --git a/src/locale/localed.c b/src/locale/localed.c -index 11d9130bbc..dd4d9e59ea 100644 +index 041ba29cd8..02fbe3e278 100644 --- a/src/locale/localed.c +++ b/src/locale/localed.c @@ -221,6 +221,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er @@ -69,7 +69,7 @@ index 11d9130bbc..dd4d9e59ea 100644 r = x11_context_verify_and_warn(&in, LOG_ERR, error); diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c -index 662cc29ac5..57f3413dc6 100644 +index d1ef772b56..9b1fe439f1 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c @@ -678,6 +678,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error * 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 254a63c1a107..6bb741e08c0e 100644 --- a/pkgs/os-specific/linux/systemd/0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch +++ b/pkgs/os-specific/linux/systemd/0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch @@ -35,10 +35,10 @@ index 3a13e04a27..4fd58068a1 100644 Etc/UTC. The resulting link should lead to the corresponding binary diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index 55931a2546..2e00bd7539 100644 +index 8c776960e1..2e0563bd00 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c -@@ -1410,7 +1410,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) { +@@ -1443,7 +1443,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) { assert(ret); @@ -47,7 +47,7 @@ index 55931a2546..2e00bd7539 100644 if (!f) return -errno; -@@ -1451,7 +1451,7 @@ static int get_timezones_from_tzdata_zi(char ***ret) { +@@ -1488,7 +1488,7 @@ static int get_timezones_from_tzdata_zi(char ***ret) { assert(ret); @@ -56,7 +56,7 @@ index 55931a2546..2e00bd7539 100644 if (!f) return -errno; -@@ -1562,7 +1562,7 @@ int verify_timezone(const char *name, int log_level) { +@@ -1603,7 +1603,7 @@ int verify_timezone(const char *name, int log_level) { if (p - name >= PATH_MAX) return -ENAMETOOLONG; @@ -65,7 +65,7 @@ index 55931a2546..2e00bd7539 100644 fd = open(t, O_RDONLY|O_CLOEXEC); if (fd < 0) -@@ -1614,7 +1614,7 @@ int get_timezone(char **ret) { +@@ -1675,7 +1675,7 @@ int get_timezone(char **ret) { if (r < 0) return r; /* Return EINVAL if not a symlink */ @@ -75,19 +75,19 @@ index 55931a2546..2e00bd7539 100644 return -EINVAL; if (!timezone_is_valid(e, LOG_DEBUG)) diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c -index 5ed6d3a9d2..f922d91a9d 100644 +index 55bd273f21..d00aa16592 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c -@@ -618,7 +618,7 @@ static int prompt_timezone(int rfd) { +@@ -571,7 +571,7 @@ static int prompt_timezone(int rfd, sd_varlink **mute_console_link) { - static int process_timezone(int rfd) { + static int process_timezone(int rfd, sd_varlink **mute_console_link) { _cleanup_close_ int pfd = -EBADF; - _cleanup_free_ char *f = NULL, *relpath = NULL; + _cleanup_free_ char *f = NULL; const char *e; int r; -@@ -664,12 +664,9 @@ static int process_timezone(int rfd) { +@@ -617,12 +617,9 @@ static int process_timezone(int rfd, sd_varlink **mute_console_link) { if (isempty(arg_timezone)) return 0; @@ -103,10 +103,10 @@ index 5ed6d3a9d2..f922d91a9d 100644 return log_error_errno(r, "Failed to create /etc/localtime symlink: %m"); diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 480a9c55c6..02c9ae6608 100644 +index 05e6be8874..6dc00ff416 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -1821,8 +1821,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid +@@ -1808,8 +1808,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid static const char *timezone_from_path(const char *path) { return PATH_STARTSWITH_SET( path, @@ -118,7 +118,7 @@ index 480a9c55c6..02c9ae6608 100644 static bool etc_writable(void) { diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c -index 57f3413dc6..6a456fe601 100644 +index 9b1fe439f1..916886aeff 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c @@ -266,7 +266,7 @@ static int context_read_data(Context *c) { diff --git a/pkgs/os-specific/linux/systemd/0008-localectl-use-etc-X11-xkb-for-list-x11.patch b/pkgs/os-specific/linux/systemd/0008-localectl-use-etc-X11-xkb-for-list-x11.patch index 6c348219872f..d2eb05c290be 100644 --- a/pkgs/os-specific/linux/systemd/0008-localectl-use-etc-X11-xkb-for-list-x11.patch +++ b/pkgs/os-specific/linux/systemd/0008-localectl-use-etc-X11-xkb-for-list-x11.patch @@ -10,15 +10,15 @@ NixOS has an option to link the xkb data files to /etc/X11, but not to 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locale/localectl.c b/src/locale/localectl.c -index c595f81b40..90033f6566 100644 +index 63703007ad..50def81940 100644 --- a/src/locale/localectl.c +++ b/src/locale/localectl.c -@@ -302,7 +302,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) { - } state = NONE, look_for; - int r; +@@ -295,7 +295,7 @@ static const char* xkb_directory(void) { + static const char *cached = NULL; -- f = fopen("/usr/share/X11/xkb/rules/base.lst", "re"); -+ f = fopen("/etc/X11/xkb/rules/base.lst", "re"); - if (!f) - return log_error_errno(errno, "Failed to open keyboard mapping list: %m"); + if (!cached) +- cached = secure_getenv("SYSTEMD_XKB_DIRECTORY") ?: "/usr/share/X11/xkb"; ++ cached = secure_getenv("SYSTEMD_XKB_DIRECTORY") ?: "/etc/X11/xkb"; + return cached; + } diff --git a/pkgs/os-specific/linux/systemd/0009-add-rootprefix-to-lookup-dir-paths.patch b/pkgs/os-specific/linux/systemd/0009-add-rootprefix-to-lookup-dir-paths.patch index beb8acc61732..6b02907d6d60 100644 --- a/pkgs/os-specific/linux/systemd/0009-add-rootprefix-to-lookup-dir-paths.patch +++ b/pkgs/os-specific/linux/systemd/0009-add-rootprefix-to-lookup-dir-paths.patch @@ -12,7 +12,7 @@ files that I might have missed. 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/basic/constants.h b/src/basic/constants.h -index 7a09fbf878..ee3378f109 100644 +index a26cff4062..3800c37e1b 100644 --- a/src/basic/constants.h +++ b/src/basic/constants.h @@ -40,13 +40,15 @@ diff --git a/pkgs/os-specific/linux/systemd/0010-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch b/pkgs/os-specific/linux/systemd/0010-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch index b05fc609d6ed..76ed16737834 100644 --- a/pkgs/os-specific/linux/systemd/0010-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch +++ b/pkgs/os-specific/linux/systemd/0010-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch @@ -10,10 +10,10 @@ This is needed for NixOS to use such scripts as systemd directory is immutable. 1 file changed, 1 insertion(+) diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c -index 3317068e47..021a3c0699 100644 +index 25882970ef..599dd0a63f 100644 --- a/src/shutdown/shutdown.c +++ b/src/shutdown/shutdown.c -@@ -358,6 +358,7 @@ static void notify_supervisor(void) { +@@ -329,6 +329,7 @@ static void notify_supervisor(void) { int main(int argc, char *argv[]) { static const char* const dirs[] = { SYSTEM_SHUTDOWN_PATH, diff --git a/pkgs/os-specific/linux/systemd/0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch b/pkgs/os-specific/linux/systemd/0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch index bfded1bba554..7e7587a897d8 100644 --- a/pkgs/os-specific/linux/systemd/0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch +++ b/pkgs/os-specific/linux/systemd/0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch @@ -9,7 +9,7 @@ This is needed for NixOS to use such scripts as systemd directory is immutable. 1 file changed, 1 insertion(+) diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c -index 3390ebe0c0..affc823bc4 100644 +index 4fa6f16fcd..012cf16f90 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c @@ -248,6 +248,7 @@ static int execute( diff --git a/pkgs/os-specific/linux/systemd/0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch b/pkgs/os-specific/linux/systemd/0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch index e49f506639d5..9b2955528b8d 100644 --- a/pkgs/os-specific/linux/systemd/0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch +++ b/pkgs/os-specific/linux/systemd/0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch @@ -10,7 +10,7 @@ systemd itself uses extensively. 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/basic/path-util.h b/src/basic/path-util.h -index a3a82574dd..b836dba7f1 100644 +index 5b2baef4e1..7f366e4544 100644 --- a/src/basic/path-util.h +++ b/src/basic/path-util.h @@ -9,11 +9,11 @@ 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 1c4ce37dde34..f1b17f5b76f7 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 2a4782a55e..8dfdc227a1 100644 +index c1ae20dfc0..c120e555a2 100644 --- a/src/core/manager.c +++ b/src/core/manager.c -@@ -3977,9 +3977,17 @@ static int build_generator_environment(Manager *m, char ***ret) { +@@ -3994,9 +3994,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 9f73ff0de547..b8ab9c30c9b5 100644 --- a/pkgs/os-specific/linux/systemd/0015-tpm2_context_init-fix-driver-name-checking.patch +++ b/pkgs/os-specific/linux/systemd/0015-tpm2_context_init-fix-driver-name-checking.patch @@ -27,10 +27,10 @@ filename_is_valid with path_is_valid. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c -index 57e7a91f93..faf45e4807 100644 +index e089cfbc5e..35e135945b 100644 --- a/src/shared/tpm2-util.c +++ b/src/shared/tpm2-util.c -@@ -724,7 +724,7 @@ int tpm2_context_new(const char *device, Tpm2Context **ret_context) { +@@ -741,7 +741,7 @@ int tpm2_context_new(const char *device, Tpm2Context **ret_context) { fn = strjoina("libtss2-tcti-", driver, ".so.0"); /* Better safe than sorry, let's refuse strings that cannot possibly be valid driver early, before going to disk. */ @@ -38,4 +38,4 @@ index 57e7a91f93..faf45e4807 100644 + if (!path_is_valid(fn)) return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), "TPM2 driver name '%s' not valid, refusing.", driver); - context->tcti_dl = dlopen(fn, RTLD_NOW|RTLD_NODELETE); + const char *dle = NULL; 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 de846e9410b3..e106791f3115 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,11 +30,11 @@ 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 53bc57186a..0ed12ce931 100644 +index a28180922a..22c9c8fdbd 100644 --- a/src/systemctl/systemctl-edit.c +++ b/src/systemctl/systemctl-edit.c -@@ -330,6 +330,9 @@ int verb_edit(int argc, char *argv[], void *userdata) { - sd_bus *bus; +@@ -336,6 +336,9 @@ int verb_edit(int argc, char *argv[], void *userdata) { + sd_bus *bus = NULL; int r; + if (!arg_runtime && arg_runtime_scope == RUNTIME_SCOPE_SYSTEM) 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 2e3ada02a901..2bd396c210af 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 238b935372..b0b67c9b99 100644 +index 4746146a98..c13b72af56 100644 --- a/meson.build +++ b/meson.build -@@ -2791,7 +2791,6 @@ install_data('LICENSE.GPL2', +@@ -2859,7 +2859,6 @@ install_data('LICENSE.GPL2', install_subdir('LICENSES', install_dir : docdir) diff --git a/pkgs/os-specific/linux/systemd/0018-meson-Don-t-link-ssh-dropins.patch b/pkgs/os-specific/linux/systemd/0018-meson-Don-t-link-ssh-dropins.patch index 472bd260caf3..2e6f9677fa4a 100644 --- a/pkgs/os-specific/linux/systemd/0018-meson-Don-t-link-ssh-dropins.patch +++ b/pkgs/os-specific/linux/systemd/0018-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 b0b67c9b99..4721b7482b 100644 +index c13b72af56..32f6e791e7 100644 --- a/meson.build +++ b/meson.build -@@ -219,13 +219,13 @@ sshconfdir = get_option('sshconfdir') +@@ -214,13 +214,13 @@ sshconfdir = get_option('sshconfdir') if sshconfdir == '' sshconfdir = sysconfdir / 'ssh/ssh_config.d' endif diff --git a/pkgs/os-specific/linux/systemd/0019-install-unit_file_exists_full-follow-symlinks.patch b/pkgs/os-specific/linux/systemd/0019-install-unit_file_exists_full-follow-symlinks.patch index 7372b5214e59..b28703c2a3c5 100644 --- a/pkgs/os-specific/linux/systemd/0019-install-unit_file_exists_full-follow-symlinks.patch +++ b/pkgs/os-specific/linux/systemd/0019-install-unit_file_exists_full-follow-symlinks.patch @@ -8,7 +8,7 @@ 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 8195436564..dfbc35f357 100644 +index a22c6df2f7..7e900c8bcd 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -3227,7 +3227,7 @@ int unit_file_exists_full(RuntimeScope scope, const LookupPaths *lp, const char diff --git a/pkgs/os-specific/linux/systemd/0020-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch b/pkgs/os-specific/linux/systemd/0020-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch index be03316306b6..bf6ebeebe59a 100644 --- a/pkgs/os-specific/linux/systemd/0020-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch +++ b/pkgs/os-specific/linux/systemd/0020-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch @@ -13,7 +13,7 @@ directly. 1 file changed, 11 insertions(+) diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c -index 40305c046b..c3ed57c54e 100644 +index 96d0dd5c2b..ee7cc4bd17 100644 --- a/src/timesync/timesyncd.c +++ b/src/timesync/timesyncd.c @@ -25,6 +25,11 @@ @@ -28,7 +28,7 @@ index 40305c046b..c3ed57c54e 100644 static int advance_tstamp(int fd, usec_t epoch) { assert(fd >= 0); -@@ -203,6 +208,12 @@ static int run(int argc, char *argv[]) { +@@ -204,6 +209,12 @@ static int run(int argc, char *argv[]) { if (r < 0) return log_error_errno(r, "Failed to parse fallback server strings: %m"); diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index d454e6d5beb4..77d8b4666219 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -25,7 +25,6 @@ python3Packages, # Mandatory dependencies - libcap, util-linux, kbd, kmod, @@ -203,17 +202,17 @@ let # command: # $ curl -s https://api.github.com/repos/systemd/systemd/releases/latest | \ # jq '.created_at|strptime("%Y-%m-%dT%H:%M:%SZ")|mktime' - releaseTimestamp = "1734643670"; + releaseTimestamp = "1766012573"; in stdenv.mkDerivation (finalAttrs: { inherit pname; - version = "258.3"; + version = "259"; src = fetchFromGitHub { owner = "systemd"; repo = "systemd"; rev = "v${finalAttrs.version}"; - hash = "sha256-wpg/0z7xrB8ysPaa/zNp1mz+yYRCGyXz0ODZcKapovM="; + hash = "sha256-lJUX1sWRouhEEPZoA9UjjOy5IUZYGGV8pltAU0E4Dsg="; }; # On major changes, or when otherwise required, you *must* : @@ -252,39 +251,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu) [ ./0020-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch - ] - ++ lib.optionals stdenv.hostPlatform.isMusl [ - # Patchset to build with musl by an upstream systemd contributor: - # https://github.com/systemd/systemd/pull/37788 - # This is vendored here because of the lack of permanent patch urls for the unmerged PR - ./musl/0001-musl-meson-allow-to-choose-libc-implementation.patch - ./musl/0002-musl-meson-do-not-use-libcrypt-libxcrypt.patch - ./musl/0003-musl-meson-explicitly-link-with-libintl-when-necessa.patch - ./musl/0004-musl-meson-explicitly-set-_LARGEFILE64_SOURCE.patch - ./musl/0005-musl-meson-make-musl-not-define-wchar_t-in-their-hea.patch - ./musl/0006-musl-meson-check-existence-of-renameat2.patch - ./musl/0007-musl-meson-gracefully-disable-gshadow-idn-nss-and-ut.patch - ./musl/0008-musl-introduce-dummy-gshadow-header-file-for-userdb.patch - ./musl/0009-musl-add-fallback-parse_printf_format-implementation.patch - ./musl/0010-musl-introduce-GNU-specific-version-of-strerror_r.patch - ./musl/0011-musl-make-strptime-accept-z.patch - ./musl/0012-musl-make-strtoll-accept-strings-start-with-dot.patch - ./musl/0013-musl-introduce-strerrorname_np.patch - ./musl/0014-musl-introduce-dummy-functions-for-mallinfo-malloc_i.patch - ./musl/0015-musl-introduce-dummy-function-for-gnu_get_libc_versi.patch - ./musl/0016-musl-define-__THROW-when-not-defined.patch - ./musl/0017-musl-replace-sys-prctl.h-with-our-own-implementation.patch - ./musl/0018-musl-replace-netinet-if_ether.h-with-our-own-impleme.patch - ./musl/0019-musl-add-missing-FTW_CONTINUE-macro.patch - ./musl/0020-musl-add-several-missing-statx-macros.patch - ./musl/0021-musl-avoid-conflict-between-fcntl.h-and-our-forward..patch - ./musl/0022-musl-redefine-HOST_NAME_MAX-as-64.patch - ./musl/0023-musl-avoid-multiple-evaluations-in-CPU_ISSET_S-macro.patch - ./musl/0024-musl-core-there-is-one-less-usable-signal-when-built.patch - ./musl/0025-musl-build-path-fix-reading-DT_RUNPATH-or-DT_RPATH.patch - ./musl/0026-musl-format-util-use-llu-for-formatting-rlim_t.patch - ./musl/0027-musl-time-util-skip-tm.tm_wday-check.patch - ./musl/0028-musl-glob-util-filter-out-.-and-.-even-if-GLOB_ALTDI.patch ]; postPatch = '' @@ -366,7 +332,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libxcrypt - (if withPam then libcap else libcap.override { usePam = false; }) libuuid linuxHeaders ] @@ -481,6 +446,10 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonOption "mount-path" "${lib.getOutput "mount" util-linux}/bin/mount") (lib.mesonOption "umount-path" "${lib.getOutput "mount" util-linux}/bin/umount") + # Swap + (lib.mesonOption "swapon-path" "${lib.getOutput "swap" util-linux}/sbin/swapon") + (lib.mesonOption "swapoff-path" "${lib.getOutput "swap" util-linux}/sbin/swapoff") + # SSH (lib.mesonOption "sshconfdir" "") (lib.mesonOption "sshdconfdir" "no") @@ -620,19 +589,6 @@ stdenv.mkDerivation (finalAttrs: { "man/systemd-makefs@.service.xml" ]; } - { - search = "/sbin/swapon"; - replacement = "${lib.getOutput "swap" util-linux}/sbin/swapon"; - where = [ - "src/core/swap.c" - "src/basic/unit-def.h" - ]; - } - { - search = "/sbin/swapoff"; - replacement = "${lib.getOutput "swap" util-linux}/sbin/swapoff"; - where = [ "src/core/swap.c" ]; - } { search = "/bin/echo"; replacement = "${coreutils}/bin/echo"; @@ -766,29 +722,23 @@ stdenv.mkDerivation (finalAttrs: { --replace "SYSTEMD_CGROUP_AGENTS_PATH" "_SYSTEMD_CGROUP_AGENT_PATH" ''; - env.NIX_CFLAGS_COMPILE = toString ( - [ - # Can't say ${polkit.bin}/bin/pkttyagent here because that would - # lead to a cyclic dependency. - "-UPOLKIT_AGENT_BINARY_PATH" - "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\"" + env.NIX_CFLAGS_COMPILE = toString [ + # Can't say ${polkit.bin}/bin/pkttyagent here because that would + # lead to a cyclic dependency. + "-UPOLKIT_AGENT_BINARY_PATH" + "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\"" - # Set the release_agent on /sys/fs/cgroup/systemd to the - # currently running systemd (/run/current-system/systemd) so - # that we don't use an obsolete/garbage-collected release agent. - "-USYSTEMD_CGROUP_AGENTS_PATH" - "-DSYSTEMD_CGROUP_AGENTS_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\"" + # Set the release_agent on /sys/fs/cgroup/systemd to the + # currently running systemd (/run/current-system/systemd) so + # that we don't use an obsolete/garbage-collected release agent. + "-USYSTEMD_CGROUP_AGENTS_PATH" + "-DSYSTEMD_CGROUP_AGENTS_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\"" - "-USYSTEMD_BINARY_PATH" - "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\"" + "-USYSTEMD_BINARY_PATH" + "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\"" + ]; - ] - ++ lib.optionals stdenv.hostPlatform.isMusl [ - "-D__UAPI_DEF_ETHHDR=0" - ] - ); - - doCheck = true; + doCheck = false; # trigger the test -n "$DESTDIR" || mutate in upstreams build system preInstall = '' diff --git a/pkgs/os-specific/linux/systemd/musl/0001-musl-meson-allow-to-choose-libc-implementation.patch b/pkgs/os-specific/linux/systemd/musl/0001-musl-meson-allow-to-choose-libc-implementation.patch deleted file mode 100644 index a40515f9ec29..000000000000 --- a/pkgs/os-specific/linux/systemd/musl/0001-musl-meson-allow-to-choose-libc-implementation.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 0e2b9909fed24a682c8566f9df8bbac4e9347186 Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Mon, 7 Jul 2025 14:11:19 +0900 -Subject: [PATCH 01/30] musl: meson: allow to choose libc implementation - -This also introduces skelton directories for storing musl specific code. ---- - meson.build | 17 +++++++++++++++-- - meson_options.txt | 2 ++ - src/libc/meson.build | 2 ++ - src/libc/musl/meson.build | 5 +++++ - 4 files changed, 24 insertions(+), 2 deletions(-) - create mode 100644 src/libc/musl/meson.build - -diff --git a/meson.build b/meson.build -index 238b935372..bea62f0eb6 100644 ---- a/meson.build -+++ b/meson.build -@@ -72,7 +72,10 @@ conf.set10('SD_BOOT', false) - - # Create a title-less summary section early, so it ends up first in the output. - # More items are added later after they have been detected. --summary({'build mode' : get_option('mode')}) -+summary({ -+ 'libc' : get_option('libc'), -+ 'build mode' : get_option('mode'), -+}) - - ##################################################################### - -@@ -2042,7 +2045,14 @@ dbus_programs = [] - boot_stubs = [] - - # This is similar to system_includes below, but for passing custom_target(). --system_include_args = [ -+system_include_args = [] -+if get_option('libc') == 'musl' -+ system_include_args += [ -+ '-isystem', meson.project_build_root() / 'src/include/musl', -+ '-isystem', meson.project_source_root() / 'src/include/musl', -+ ] -+endif -+system_include_args += [ - '-isystem', meson.project_build_root() / 'src/include/override', - '-isystem', meson.project_source_root() / 'src/include/override', - '-isystem', meson.project_build_root() / 'src/include/uapi', -@@ -2060,6 +2070,9 @@ system_includes = [ - is_system : true, - ), - ] -+if get_option('libc') == 'musl' -+ system_includes += include_directories('src/include/musl', is_system : true) -+endif - - basic_includes = [ - include_directories( -diff --git a/meson_options.txt b/meson_options.txt -index d8dec33ec4..ad203ba301 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -397,6 +397,8 @@ option('ima', type : 'boolean', - option('ipe', type : 'boolean', - description : 'IPE support') - -+option('libc', type : 'combo', choices : ['glibc', 'musl'], -+ description : 'libc implementation to be used') - option('acl', type : 'feature', deprecated : { 'true' : 'enabled', 'false' : 'disabled' }, - description : 'libacl support') - option('audit', type : 'feature', deprecated : { 'true' : 'enabled', 'false' : 'disabled' }, -diff --git a/src/libc/meson.build b/src/libc/meson.build -index eeee98c9d6..306512ffd7 100644 ---- a/src/libc/meson.build -+++ b/src/libc/meson.build -@@ -16,6 +16,8 @@ libc_wrapper_sources = files( - 'xattr.c', - ) - -+subdir('musl') -+ - sources += libc_wrapper_sources - - libc_wrapper_static = static_library( -diff --git a/src/libc/musl/meson.build b/src/libc/musl/meson.build -new file mode 100644 -index 0000000000..a876230c67 ---- /dev/null -+++ b/src/libc/musl/meson.build -@@ -0,0 +1,5 @@ -+# SPDX-License-Identifier: LGPL-2.1-or-later -+ -+if get_option('libc') != 'musl' -+ subdir_done() -+endif --- -2.51.0 - diff --git a/pkgs/os-specific/linux/systemd/musl/0002-musl-meson-do-not-use-libcrypt-libxcrypt.patch b/pkgs/os-specific/linux/systemd/musl/0002-musl-meson-do-not-use-libcrypt-libxcrypt.patch deleted file mode 100644 index b59b77dd7712..000000000000 --- a/pkgs/os-specific/linux/systemd/musl/0002-musl-meson-do-not-use-libcrypt-libxcrypt.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 03010a0716f509b448c84a35bc2723a6f08e0c09 Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Wed, 23 Jul 2025 10:24:14 +0900 -Subject: [PATCH 02/30] musl: meson: do not use libcrypt/libxcrypt - -Otherwise, when both glibc and musl are installed, libxcrypt or glibc's -libcrypt may be picked even when we are building systemd with musl. -Let's not use libcrypt/libxcrypt in that case. ---- - meson.build | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/meson.build b/meson.build -index bea62f0eb6..06be36409f 100644 ---- a/meson.build -+++ b/meson.build -@@ -1013,10 +1013,14 @@ else - libatomic = [] - endif - --libcrypt = dependency('libcrypt', 'libxcrypt', required : false) --if not libcrypt.found() -- # fallback to use find_library() if libcrypt is provided by glibc, e.g. for LibreELEC. -- libcrypt = cc.find_library('crypt') -+if get_option('libc') == 'musl' -+ libcrypt = [] -+else -+ libcrypt = dependency('libcrypt', 'libxcrypt', required : false) -+ if not libcrypt.found() -+ # fallback to use find_library() if libcrypt is provided by glibc, e.g. for LibreELEC. -+ libcrypt = cc.find_library('crypt') -+ endif - endif - - foreach func : [ --- -2.51.0 - diff --git a/pkgs/os-specific/linux/systemd/musl/0003-musl-meson-explicitly-link-with-libintl-when-necessa.patch b/pkgs/os-specific/linux/systemd/musl/0003-musl-meson-explicitly-link-with-libintl-when-necessa.patch deleted file mode 100644 index 000c6c65d6f6..000000000000 --- a/pkgs/os-specific/linux/systemd/musl/0003-musl-meson-explicitly-link-with-libintl-when-necessa.patch +++ /dev/null @@ -1,56 +0,0 @@ -From bf4cb5aeeef23c5f12e6d2258bb8f3d12059f59f Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Sat, 6 Sep 2025 16:25:41 +0900 -Subject: [PATCH 03/30] musl: meson: explicitly link with libintl when - necessary - -On some musl based distributions provides dgettext() by libintl.so. -Hence, we need to add dependency in that case. ---- - meson.build | 17 +++++++++++++++++ - src/home/meson.build | 1 + - 2 files changed, 18 insertions(+) - -diff --git a/meson.build b/meson.build -index 06be36409f..054752c339 100644 ---- a/meson.build -+++ b/meson.build -@@ -1002,6 +1002,23 @@ libm = cc.find_library('m') - libdl = cc.find_library('dl') - libcap = dependency('libcap') - -+# On some distributions that uses musl (e.g. Alpine), libintl.h may be provided by gettext rather than musl. -+# In that case, we need to explicitly link with libintl.so. -+if get_option('libc') == 'musl' -+ if cc.has_function('dgettext', prefix : '''#include ''', args : '-D_GNU_SOURCE') -+ libintl = [] -+ else -+ libintl = cc.find_library('intl') -+ if not cc.has_function('dgettext', prefix : '''#include ''', args : '-D_GNU_SOURCE', -+ dependencies : libintl) -+ error('dgettext() not found.') -+ endif -+ endif -+else -+ # When building with glibc, we assume that libintl.h is provided by glibc. -+ libintl = [] -+endif -+ - # On some architectures, libatomic is required. But on some installations, - # it is found, but actual linking fails. So let's try to use it opportunistically. - # If it is installed, but not needed, it will be dropped because of --as-needed. -diff --git a/src/home/meson.build b/src/home/meson.build -index 1937e6f56c..3305334707 100644 ---- a/src/home/meson.build -+++ b/src/home/meson.build -@@ -115,6 +115,7 @@ modules += [ - 'sources' : pam_systemd_home_sources, - 'dependencies' : [ - libcrypt, -+ libintl, - libpam_misc, - libpam, - threads, --- -2.51.0 - diff --git a/pkgs/os-specific/linux/systemd/musl/0004-musl-meson-explicitly-set-_LARGEFILE64_SOURCE.patch b/pkgs/os-specific/linux/systemd/musl/0004-musl-meson-explicitly-set-_LARGEFILE64_SOURCE.patch deleted file mode 100644 index 17de4bd3b5dd..000000000000 --- a/pkgs/os-specific/linux/systemd/musl/0004-musl-meson-explicitly-set-_LARGEFILE64_SOURCE.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 59f993d1acb069f3f2b7d6c71b91696388692702 Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Tue, 10 Jun 2025 00:29:46 +0900 -Subject: [PATCH 04/30] musl: meson: explicitly set _LARGEFILE64_SOURCE - -glibc sets it when _GNU_SOURCE is defined, however, musl does not. -Let's explicitly define it to make getdents64() and struct dirent64 -available even when building with musl. ---- - meson.build | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/meson.build b/meson.build -index 054752c339..37fb1c2765 100644 ---- a/meson.build -+++ b/meson.build -@@ -560,6 +560,12 @@ conf.set10('HAVE_WARNING_ZERO_AS_NULL_POINTER_CONSTANT', have) - conf.set('_GNU_SOURCE', 1) - conf.set('__SANE_USERSPACE_TYPES__', true) - -+if get_option('libc') == 'musl' -+ # glibc always defines _LARGEFILE64_SOURCE when _GNU_SOURCE is set, but musl does not do that, -+ # and it is necessary for making getdents64() and struct dirent64 exist. -+ conf.set('_LARGEFILE64_SOURCE', 1) -+endif -+ - conf.set('SIZEOF_DEV_T', cc.sizeof('dev_t', prefix : '#include ')) - conf.set('SIZEOF_INO_T', cc.sizeof('ino_t', prefix : '#include ')) - conf.set('SIZEOF_RLIM_T', cc.sizeof('rlim_t', prefix : '#include ')) --- -2.51.0 - diff --git a/pkgs/os-specific/linux/systemd/musl/0005-musl-meson-make-musl-not-define-wchar_t-in-their-hea.patch b/pkgs/os-specific/linux/systemd/musl/0005-musl-meson-make-musl-not-define-wchar_t-in-their-hea.patch deleted file mode 100644 index faab7be7ca92..000000000000 --- a/pkgs/os-specific/linux/systemd/musl/0005-musl-meson-make-musl-not-define-wchar_t-in-their-hea.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a8cc582e42dd9fd6b2304003f3e5ab7637c21b73 Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Mon, 9 Jun 2025 13:37:38 +0900 -Subject: [PATCH 05/30] musl: meson: make musl not define wchar_t in their - header - -Otherwise, musl defines wchar_t as int, which conflicts with the -assumption by sd-boot, i.e. wchar_t is 2 bytes. ---- - src/boot/meson.build | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/boot/meson.build b/src/boot/meson.build -index ba0b309acf..bea96bb2e3 100644 ---- a/src/boot/meson.build -+++ b/src/boot/meson.build -@@ -179,6 +179,11 @@ if get_option('mode') == 'developer' and get_option('debug') - efi_c_args += '-DEFI_DEBUG' - endif - -+if get_option('libc') == 'musl' -+ # To make musl not define wchar_t as int, rather than short. -+ efi_c_args += '-D__DEFINED_wchar_t' -+endif -+ - efi_c_ld_args = [ - '-nostdlib', - '-static-pie', --- -2.51.0 - diff --git a/pkgs/os-specific/linux/systemd/musl/0006-musl-meson-check-existence-of-renameat2.patch b/pkgs/os-specific/linux/systemd/musl/0006-musl-meson-check-existence-of-renameat2.patch deleted file mode 100644 index 9109275b4eb8..000000000000 --- a/pkgs/os-specific/linux/systemd/musl/0006-musl-meson-check-existence-of-renameat2.patch +++ /dev/null @@ -1,91 +0,0 @@ -From b9904ed6818232d9ad9bb496747b79a6c9606819 Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Mon, 9 Jun 2025 13:00:37 +0900 -Subject: [PATCH 06/30] musl: meson: check existence of renameat2() - -musl-1.2.5 does not provide renameat2(). Note, it is added by -https://github.com/kraj/musl/commit/05ce67fea99ca09cd4b6625cff7aec9cc222dd5a, -hence hopefully it will be provided by musl-1.2.6 or newer. ---- - meson.build | 5 +++++ - src/include/musl/stdio.h | 13 +++++++++++++ - src/libc/musl/meson.build | 4 ++++ - src/libc/musl/stdio.c | 11 +++++++++++ - 4 files changed, 33 insertions(+) - create mode 100644 src/include/musl/stdio.h - create mode 100644 src/libc/musl/stdio.c - -diff --git a/meson.build b/meson.build -index 37fb1c2765..71e422f545 100644 ---- a/meson.build -+++ b/meson.build -@@ -581,6 +581,7 @@ assert(long_max > 100000) - conf.set_quoted('LONG_MAX_STR', '@0@'.format(long_max)) - - foreach ident : [ -+ ['renameat2', '''#include ''', get_option('libc') == 'musl'], # since musl-1.2.6 - ['set_mempolicy', '''#include '''], # declared at numaif.h provided by libnuma, which we do not use - ['get_mempolicy', '''#include '''], # declared at numaif.h provided by libnuma, which we do not use - ['strerrorname_np', '''#include '''], # since glibc-2.32 -@@ -614,6 +615,10 @@ foreach ident : [ - ['pivot_root', '''#include '''], # no known header declares pivot_root - ] - -+ if ident.length() >= 3 and not ident[2] -+ continue -+ endif -+ - have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE') - conf.set10('HAVE_' + ident[0].to_upper(), have) - endforeach -diff --git a/src/include/musl/stdio.h b/src/include/musl/stdio.h -new file mode 100644 -index 0000000000..d677201f45 ---- /dev/null -+++ b/src/include/musl/stdio.h -@@ -0,0 +1,13 @@ -+/* SPDX-License-Identifier: LGPL-2.1-or-later */ -+#pragma once -+ -+#include_next -+ -+#if !HAVE_RENAMEAT2 -+# define RENAME_NOREPLACE (1 << 0) -+# define RENAME_EXCHANGE (1 << 1) -+# define RENAME_WHITEOUT (1 << 2) -+ -+int missing_renameat2(int __oldfd, const char *__old, int __newfd, const char *__new, unsigned __flags); -+# define renameat2 missing_renameat2 -+#endif -diff --git a/src/libc/musl/meson.build b/src/libc/musl/meson.build -index a876230c67..8d06d919ef 100644 ---- a/src/libc/musl/meson.build -+++ b/src/libc/musl/meson.build -@@ -3,3 +3,7 @@ - if get_option('libc') != 'musl' - subdir_done() - endif -+ -+libc_wrapper_sources += files( -+ 'stdio.c', -+) -diff --git a/src/libc/musl/stdio.c b/src/libc/musl/stdio.c -new file mode 100644 -index 0000000000..102a22cd5c ---- /dev/null -+++ b/src/libc/musl/stdio.c -@@ -0,0 +1,11 @@ -+/* SPDX-License-Identifier: LGPL-2.1-or-later */ -+ -+#include -+#include -+#include -+ -+#if !HAVE_RENAMEAT2 -+int missing_renameat2(int __oldfd, const char *__old, int __newfd, const char *__new, unsigned __flags) { -+ return syscall(__NR_renameat2, __oldfd, __old, __newfd, __new, __flags); -+} -+#endif --- -2.51.0 - diff --git a/pkgs/os-specific/linux/systemd/musl/0007-musl-meson-gracefully-disable-gshadow-idn-nss-and-ut.patch b/pkgs/os-specific/linux/systemd/musl/0007-musl-meson-gracefully-disable-gshadow-idn-nss-and-ut.patch deleted file mode 100644 index 8f3d16510d20..000000000000 --- a/pkgs/os-specific/linux/systemd/musl/0007-musl-meson-gracefully-disable-gshadow-idn-nss-and-ut.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 1a5f752e2a80e206474f04fe5c1990fdb08742bd Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Sun, 22 Jun 2025 02:16:25 +0900 -Subject: [PATCH 07/30] musl: meson: gracefully disable gshadow, idn, nss, and - utmp support - -- musl does not support gshadow, and does not provide gshadow.h, -- musl does not provide NI_IDN flag, -- musl does not support nss, and does not provide nss.h which is necessary - for each nss modules, -- musl does not support utmp, and all utmp related functions do nothing, - see https://github.com/kraj/musl/blob/v1.2.5/src/legacy/utmpx.c ---- - meson.build | 33 ++++++++++++++++++++++++--------- - 1 file changed, 24 insertions(+), 9 deletions(-) - -diff --git a/meson.build b/meson.build -index 71e422f545..5f235d5113 100644 ---- a/meson.build -+++ b/meson.build -@@ -1638,11 +1638,9 @@ foreach term : ['analyze', - 'efi', - 'environment-d', - 'firstboot', -- 'gshadow', - 'hibernate', - 'hostnamed', - 'hwdb', -- 'idn', - 'ima', - 'ipe', - 'initrd', -@@ -1654,8 +1652,6 @@ foreach term : ['analyze', - 'mountfsd', - 'networkd', - 'nsresourced', -- 'nss-myhostname', -- 'nss-systemd', - 'oomd', - 'portabled', - 'pstore', -@@ -1671,7 +1667,6 @@ foreach term : ['analyze', - 'tmpfiles', - 'tpm', - 'userdb', -- 'utmp', - 'vconsole', - 'xdg-autostart'] - have = get_option(term) -@@ -1681,14 +1676,34 @@ endforeach - - enable_sysusers = conf.get('ENABLE_SYSUSERS') == 1 - -+foreach term : ['gshadow', -+ 'idn', -+ 'nss-myhostname', -+ 'nss-systemd', -+ 'utmp'] -+ -+ have = get_option(term) -+ if have and get_option('libc') == 'musl' -+ warning('@0@ support is requested but it is not supported when building with musl, disabling it.'.format(term)) -+ have = false -+ endif -+ name = 'ENABLE_' + term.underscorify().to_upper() -+ conf.set10(name, have) -+endforeach -+ - foreach tuple : [['nss-mymachines', 'machined'], - ['nss-resolve', 'resolve']] - want = get_option(tuple[0]) -- if want.allowed() -- have = get_option(tuple[1]) -- if want.enabled() and not have -- error('@0@ is requested but @1@ is disabled'.format(tuple[0], tuple[1])) -+ if want.enabled() -+ if get_option('libc') == 'musl' -+ error('@0@ is requested but it is not supported when building with musl.'.format(tuple[0])) - endif -+ if not get_option(tuple[1]) -+ error('@0@ is requested but @1@ is disabled.'.format(tuple[0], tuple[1])) -+ endif -+ have = true -+ elif want.allowed() -+ have = get_option(tuple[1]) and get_option('libc') != 'musl' - else - have = false - endif --- -2.51.0 - diff --git a/pkgs/os-specific/linux/systemd/musl/0008-musl-introduce-dummy-gshadow-header-file-for-userdb.patch b/pkgs/os-specific/linux/systemd/musl/0008-musl-introduce-dummy-gshadow-header-file-for-userdb.patch deleted file mode 100644 index 50bc22cfe678..000000000000 --- a/pkgs/os-specific/linux/systemd/musl/0008-musl-introduce-dummy-gshadow-header-file-for-userdb.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 7e023763fb7f56b7c1ea6fa139d79ec2c3e0164f Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Sun, 21 Sep 2025 15:24:06 +0900 -Subject: [PATCH 08/30] musl: introduce dummy gshadow header file for userdb - -Even 'gshadow' meson option is disabled, src/shared/userdb.c and -src/shared/user-record-nss.c include gshadow.h unconditionally. -Let's introduce dummy header to make them compiled gracefully. ---- - src/include/musl/gshadow.h | 22 ++++++++++++++++++++++ - 1 file changed, 22 insertions(+) - create mode 100644 src/include/musl/gshadow.h - -diff --git a/src/include/musl/gshadow.h b/src/include/musl/gshadow.h -new file mode 100644 -index 0000000000..b57c74ca83 ---- /dev/null -+++ b/src/include/musl/gshadow.h -@@ -0,0 +1,22 @@ -+/* SPDX-License-Identifier: LGPL-2.1-or-later */ -+#pragma once -+ -+#include -+#include -+ -+struct sgrp { -+ char *sg_namp; -+ char *sg_passwd; -+ char **sg_adm; -+ char **sg_mem; -+}; -+ -+static inline int getsgnam_r( -+ const char *__name, -+ struct sgrp *__result_buf, -+ char *__buffer, -+ size_t __buflen, -+ struct sgrp **__result) { -+ -+ return EOPNOTSUPP; /* this function returns positive errno in case of error. */ -+} --- -2.51.0 - diff --git a/pkgs/os-specific/linux/systemd/musl/0009-musl-add-fallback-parse_printf_format-implementation.patch b/pkgs/os-specific/linux/systemd/musl/0009-musl-add-fallback-parse_printf_format-implementation.patch deleted file mode 100644 index d4347746067e..000000000000 --- a/pkgs/os-specific/linux/systemd/musl/0009-musl-add-fallback-parse_printf_format-implementation.patch +++ /dev/null @@ -1,447 +0,0 @@ -From 444acef17881cbc27057bd85b7dc07b332c03d67 Mon Sep 17 00:00:00 2001 -From: Emil Renner Berthing -Date: Sat, 22 May 2021 20:26:24 +0200 -Subject: [PATCH 09/30] musl: add fallback parse_printf_format() implementation - -musl does not provide parse_printf_format(). Let's introduce a fallback -method. - -Co-authored-by: Yu Watanabe ---- - src/include/musl/printf.h | 35 +++++ - src/libc/musl/meson.build | 1 + - src/libc/musl/printf.c | 276 ++++++++++++++++++++++++++++++++++++++ - src/test/meson.build | 6 + - src/test/test-printf.c | 67 +++++++++ - 5 files changed, 385 insertions(+) - create mode 100644 src/include/musl/printf.h - create mode 100644 src/libc/musl/printf.c - create mode 100644 src/test/test-printf.c - -diff --git a/src/include/musl/printf.h b/src/include/musl/printf.h -new file mode 100644 -index 0000000000..4242392c89 ---- /dev/null -+++ b/src/include/musl/printf.h -@@ -0,0 +1,35 @@ -+/* SPDX-License-Identifier: LGPL-2.1-or-later */ -+/* Copyright 2014 Emil Renner Berthing */ -+#pragma once -+ -+#include -+#include -+ -+#ifdef __GLIBC__ -+#include_next -+#else -+ -+enum { /* C type: */ -+ PA_INT, /* int */ -+ PA_CHAR, /* int, cast to char */ -+ PA_WCHAR, /* wide char */ -+ PA_STRING, /* const char *, a '\0'-terminated string */ -+ PA_WSTRING, /* const wchar_t *, wide character string */ -+ PA_POINTER, /* void * */ -+ PA_FLOAT, /* float */ -+ PA_DOUBLE, /* double */ -+ PA_LAST, -+}; -+ -+/* Flag bits that can be set in a type returned by `parse_printf_format'. */ -+# define PA_FLAG_MASK 0xff00 -+# define PA_FLAG_LONG_LONG (1 << 8) -+# define PA_FLAG_LONG_DOUBLE PA_FLAG_LONG_LONG -+# define PA_FLAG_LONG (1 << 9) -+# define PA_FLAG_SHORT (1 << 10) -+# define PA_FLAG_PTR (1 << 11) -+ -+# define parse_printf_format missing_parse_printf_format -+#endif -+ -+size_t missing_parse_printf_format(const char *fmt, size_t n, int *types); -diff --git a/src/libc/musl/meson.build b/src/libc/musl/meson.build -index 8d06d919ef..3e205e1eb1 100644 ---- a/src/libc/musl/meson.build -+++ b/src/libc/musl/meson.build -@@ -5,5 +5,6 @@ if get_option('libc') != 'musl' - endif - - libc_wrapper_sources += files( -+ 'printf.c', - 'stdio.c', - ) -diff --git a/src/libc/musl/printf.c b/src/libc/musl/printf.c -new file mode 100644 -index 0000000000..33c4acd27f ---- /dev/null -+++ b/src/libc/musl/printf.c -@@ -0,0 +1,276 @@ -+/* SPDX-License-Identifier: LGPL-2.1-or-later */ -+/* Copyright 2014 Emil Renner Berthing */ -+ -+#include -+#include <../musl/printf.h> /* This file is also compiled when built with glibc. */ -+#include -+#include -+ -+static const char* consume_nonarg(const char *fmt) { -+ do { -+ if (*fmt == '\0') -+ return fmt; -+ } while (*fmt++ != '%'); -+ return fmt; -+} -+ -+static const char* consume_num(const char *fmt) { -+ for (;*fmt >= '0' && *fmt <= '9'; fmt++) -+ /* do nothing */; -+ return fmt; -+} -+ -+static const char* consume_argn(const char *fmt, size_t *arg) { -+ const char *p = fmt; -+ size_t val = 0; -+ -+ if (*p < '1' || *p > '9') -+ return fmt; -+ do { -+ val = 10*val + (*p++ - '0'); -+ } while (*p >= '0' && *p <= '9'); -+ -+ if (*p != '$') -+ return fmt; -+ *arg = val; -+ return p+1; -+} -+ -+static const char* consume_flags(const char *fmt) { -+ for (;;) -+ switch (*fmt) { -+ case '#': -+ case '0': -+ case '-': -+ case ' ': -+ case '+': -+ case '\'': -+ case 'I': -+ fmt++; -+ continue; -+ default: -+ return fmt; -+ } -+} -+ -+enum state { -+ BARE, -+ LPRE, -+ LLPRE, -+ HPRE, -+ HHPRE, -+ BIGLPRE, -+ ZTPRE, -+ JPRE, -+ STOP, -+}; -+ -+enum type { -+ NONE, -+ PTR, -+ STR, -+ WSTR, -+ INT, -+ LONG, -+ LLONG, -+ SHORT, -+ IMAX, -+ SIZET, -+ CHAR, -+ WCHAR, -+ PDIFF, -+ DBL, -+ LDBL, -+ NPTR, -+ MAXTYPE, -+}; -+ -+static const short pa_types[MAXTYPE] = { -+ [NONE] = PA_INT, -+ [PTR] = PA_POINTER, -+ [STR] = PA_STRING, -+ [WSTR] = PA_WSTRING, -+ [INT] = PA_INT, -+ [SHORT] = PA_INT | PA_FLAG_SHORT, -+ [LONG] = PA_INT | PA_FLAG_LONG, -+ [CHAR] = PA_CHAR, -+ [WCHAR] = PA_WCHAR, -+ [DBL] = PA_DOUBLE, -+ [LDBL] = PA_DOUBLE | PA_FLAG_LONG_DOUBLE, -+ [NPTR] = PA_FLAG_PTR, -+}; -+ -+static int state_to_pa_type(unsigned state) { -+ switch (state) { -+ case LLONG: -+#if LONG_MAX != LLONG_MAX -+ return PA_INT | PA_FLAG_LONG_LONG; -+#else -+ return PA_INT | PA_FLAG_LONG; -+#endif -+ -+ case IMAX: -+#if LONG_MAX != LLONG_MAX -+ if (sizeof(intmax_t) > sizeof(long)) -+ return PA_INT | PA_FLAG_LONG_LONG; -+#endif -+ if (sizeof(intmax_t) > sizeof(int)) -+ return PA_INT | PA_FLAG_LONG; -+ return PA_INT; -+ -+ case SIZET: -+#if LONG_MAX != LLONG_MAX -+ if (sizeof(size_t) > sizeof(long)) -+ return PA_INT | PA_FLAG_LONG_LONG; -+#endif -+ if (sizeof(size_t) > sizeof(int)) -+ return PA_INT | PA_FLAG_LONG; -+ return PA_INT; -+ default: -+ return pa_types[state]; -+ } -+} -+ -+#define S(x) [(x)-'A'] -+#define E(x) (STOP + (x)) -+ -+static const unsigned char states[]['z'-'A'+1] = { -+ { /* 0: bare types */ -+ S('d') = E(INT), S('i') = E(INT), -+ S('o') = E(INT), S('u') = E(INT), S('x') = E(INT), S('X') = E(INT), -+ S('e') = E(DBL), S('f') = E(DBL), S('g') = E(DBL), S('a') = E(DBL), -+ S('E') = E(DBL), S('F') = E(DBL), S('G') = E(DBL), S('A') = E(DBL), -+ S('c') = E(CHAR), S('C') = E(WCHAR), -+ S('s') = E(STR), S('S') = E(WSTR), S('p') = E(PTR), -+ S('n') = E(NPTR), -+ S('m') = E(NONE), -+ S('l') = LPRE, S('q') = LLPRE, S('h') = HPRE, S('L') = BIGLPRE, -+ S('z') = ZTPRE, S('Z') = ZTPRE, S('j') = JPRE, S('t') = ZTPRE, -+ }, -+ { /* 1: l-prefixed */ -+ S('d') = E(LONG), S('i') = E(LONG), -+ S('o') = E(LONG), S('u') = E(LONG), S('x') = E(LONG), S('X') = E(LONG), -+ S('e') = E(DBL), S('f') = E(DBL), S('g') = E(DBL), S('a') = E(DBL), -+ S('E') = E(DBL), S('F') = E(DBL), S('G') = E(DBL), S('A') = E(DBL), -+ S('c') = E(CHAR), S('s') = E(STR), -+ S('n') = E(NPTR), -+ S('l') = LLPRE, -+ }, -+ { /* 2: ll-prefixed */ -+ S('d') = E(LLONG), S('i') = E(LLONG), -+ S('o') = E(LLONG), S('u') = E(LLONG), S('x') = E(LLONG), S('X') = E(LLONG), -+ S('n') = E(NPTR), -+ }, -+ { /* 3: h-prefixed */ -+ S('d') = E(SHORT), S('i') = E(SHORT), -+ S('o') = E(SHORT), S('u') = E(SHORT), S('x') = E(SHORT), S('X') = E(SHORT), -+ S('n') = E(NPTR), -+ S('h') = HHPRE, -+ }, -+ { /* 4: hh-prefixed */ -+ S('d') = E(CHAR), S('i') = E(CHAR), -+ S('o') = E(CHAR), S('u') = E(CHAR), S('x') = E(CHAR), S('X') = E(CHAR), -+ S('n') = E(NPTR), -+ }, -+ { /* 5: L-prefixed */ -+ S('e') = E(LDBL), S('f') = E(LDBL), S('g') = E(LDBL), S('a') = E(LDBL), -+ S('E') = E(LDBL), S('F') = E(LDBL), S('G') = E(LDBL), S('A') = E(LDBL), -+ }, -+ { /* 6: z- or t-prefixed (assumed to be same size) */ -+ S('d') = E(SIZET), S('i') = E(SIZET), -+ S('o') = E(SIZET), S('u') = E(SIZET), S('x') = E(SIZET), S('X') = E(SIZET), -+ S('n') = E(NPTR), -+ }, -+ { /* 7: j-prefixed */ -+ S('d') = E(IMAX), S('i') = E(IMAX), -+ S('o') = E(IMAX), S('u') = E(IMAX), S('x') = E(IMAX), S('X') = E(IMAX), -+ S('n') = E(NPTR), -+ }, -+}; -+ -+size_t missing_parse_printf_format(const char *fmt, size_t n, int *types) { -+ size_t i = 0; -+ size_t last = 0; -+ -+ memset(types, 0, n); -+ -+ for (;;) { -+ size_t arg; -+ -+ fmt = consume_nonarg(fmt); -+ if (*fmt == '\0') -+ break; -+ if (*fmt == '%') { -+ fmt++; -+ continue; -+ } -+ arg = 0; -+ fmt = consume_argn(fmt, &arg); -+ /* flags */ -+ fmt = consume_flags(fmt); -+ /* width */ -+ if (*fmt == '*') { -+ size_t warg = 0; -+ fmt = consume_argn(fmt+1, &warg); -+ if (warg == 0) -+ warg = ++i; -+ if (warg > last) -+ last = warg; -+ if (warg <= n && types[warg-1] == NONE) -+ types[warg-1] = INT; -+ } else -+ fmt = consume_num(fmt); -+ /* precision */ -+ if (*fmt == '.') { -+ fmt++; -+ if (*fmt == '*') { -+ size_t parg = 0; -+ fmt = consume_argn(fmt+1, &parg); -+ if (parg == 0) -+ parg = ++i; -+ if (parg > last) -+ last = parg; -+ if (parg <= n && types[parg-1] == NONE) -+ types[parg-1] = INT; -+ } else { -+ if (*fmt == '-') -+ fmt++; -+ fmt = consume_num(fmt); -+ } -+ } -+ /* length modifier and conversion specifier */ -+ unsigned state = BARE; -+ for (;;) { -+ unsigned char c = *fmt; -+ -+ if (c == '\0') -+ break; -+ -+ fmt++; -+ -+ if (c < 'A' || c > 'z') -+ break; -+ -+ state = states[state]S(c); -+ if (state == 0 || state >= STOP) -+ break; -+ } -+ -+ if (state <= STOP) /* %m or invalid format */ -+ continue; -+ -+ if (arg == 0) -+ arg = ++i; -+ if (arg > last) -+ last = arg; -+ if (arg <= n) -+ types[arg-1] = state - STOP; -+ } -+ -+ if (last > n) -+ last = n; -+ for (i = 0; i < last; i++) -+ types[i] = state_to_pa_type(types[i]); -+ -+ return last; -+} -diff --git a/src/test/meson.build b/src/test/meson.build -index da04b82d47..1dd61effc0 100644 ---- a/src/test/meson.build -+++ b/src/test/meson.build -@@ -403,6 +403,12 @@ executables += [ - 'dependencies' : libacl, - 'type' : 'manual', - }, -+ test_template + { -+ 'sources' : files( -+ 'test-printf.c', -+ '../libc/musl/printf.c' -+ ), -+ }, - test_template + { - 'sources' : files('test-process-util.c'), - 'dependencies' : threads, -diff --git a/src/test/test-printf.c b/src/test/test-printf.c -new file mode 100644 -index 0000000000..28497e902d ---- /dev/null -+++ b/src/test/test-printf.c -@@ -0,0 +1,67 @@ -+/* SPDX-License-Identifier: LGPL-2.1-or-later */ -+ -+#include <../musl/printf.h> -+ -+#include "memory-util.h" -+#include "strv.h" -+#include "tests.h" -+ -+static void test_parse_printf_format_one(const char *fmt) { -+ int arg_types_x[128] = {}, arg_types_y[128] = {}; -+ size_t x, y; -+ -+ log_debug("/* %s(%s) */", __func__, fmt); -+ -+ x = parse_printf_format(fmt, ELEMENTSOF(arg_types_x), arg_types_x); -+ y = missing_parse_printf_format(fmt, ELEMENTSOF(arg_types_y), arg_types_y); -+ -+ for (size_t i = 0; i < x; i++) -+ log_debug("x[%zu]=%i", i, arg_types_x[i]); -+ for (size_t i = 0; i < y; i++) -+ log_debug("y[%zu]=%i", i, arg_types_y[i]); -+ -+ ASSERT_EQ(memcmp_nn(arg_types_x, x * sizeof(int), arg_types_y, y * sizeof(int)), 0); -+} -+ -+TEST(parse_printf_format) { -+ FOREACH_STRING(s, "d", "i", "o", "u", "x", "X", "n") -+ FOREACH_STRING(p, "", "hh", "h", "l", "ll", "j", "z", "Z", "t") { -+ _cleanup_free_ char *fmt = NULL; -+ -+ ASSERT_NOT_NULL(fmt = strjoin("%", p, s)); -+ test_parse_printf_format_one(fmt); -+ } -+ -+ FOREACH_STRING(s, "e", "E", "f", "F", "g", "G", "a", "A") -+ FOREACH_STRING(p, "", "L") { -+ _cleanup_free_ char *fmt = NULL; -+ -+ ASSERT_NOT_NULL(fmt = strjoin("%", p, s)); -+ test_parse_printf_format_one(fmt); -+ } -+ -+ FOREACH_STRING(s, "c", "s") -+ FOREACH_STRING(p, "", "l") { -+ _cleanup_free_ char *fmt = NULL; -+ -+ ASSERT_NOT_NULL(fmt = strjoin("%", p, s)); -+ test_parse_printf_format_one(fmt); -+ } -+ -+ FOREACH_STRING(s, "C", "S", "p", "m", "%") { -+ _cleanup_free_ char *fmt = NULL; -+ -+ ASSERT_NOT_NULL(fmt = strjoin("%", s)); -+ test_parse_printf_format_one(fmt); -+ } -+ -+ test_parse_printf_format_one("asfhghejmlahpgakdmsalc"); -+ test_parse_printf_format_one("%d%i%o%u%x%X"); -+ test_parse_printf_format_one("%e%E%f%F%g%G%a%A"); -+ test_parse_printf_format_one("%c%s%C%S%p%n%m%%"); -+ test_parse_printf_format_one("%03d%-05d%+i%hhu%hu%hx%lx"); -+ test_parse_printf_format_one("%llx%x%LE%ji%zi%zu%zi%zu%Zi%Zu%tu"); -+ test_parse_printf_format_one("%l"); -+} -+ -+DEFINE_TEST_MAIN(LOG_DEBUG); --- -2.51.0 - diff --git a/pkgs/os-specific/linux/systemd/musl/0010-musl-introduce-GNU-specific-version-of-strerror_r.patch b/pkgs/os-specific/linux/systemd/musl/0010-musl-introduce-GNU-specific-version-of-strerror_r.patch deleted file mode 100644 index dd09c69ce95f..000000000000 --- a/pkgs/os-specific/linux/systemd/musl/0010-musl-introduce-GNU-specific-version-of-strerror_r.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 8fd471ff028cd3d5df5ee944fdbcefc7e77abc3d Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Mon, 23 Jan 2023 23:39:46 -0800 -Subject: [PATCH 10/30] musl: introduce GNU specific version of strerror_r() - -musl provides XSI compliant strerror_r(), and it is slightly different -from the one by glibc. -Let's introduce a tiny wrapper to convert XSI strerror_r() to GNU one. ---- - src/include/musl/string.h | 7 +++++++ - src/libc/musl/meson.build | 1 + - src/libc/musl/string.c | 26 ++++++++++++++++++++++++++ - 3 files changed, 34 insertions(+) - create mode 100644 src/include/musl/string.h - create mode 100644 src/libc/musl/string.c - -diff --git a/src/include/musl/string.h b/src/include/musl/string.h -new file mode 100644 -index 0000000000..cc3da63012 ---- /dev/null -+++ b/src/include/musl/string.h -@@ -0,0 +1,7 @@ -+/* SPDX-License-Identifier: LGPL-2.1-or-later */ -+#pragma once -+ -+#include_next -+ -+char* strerror_r_gnu(int errnum, char *buf, size_t buflen); -+#define strerror_r strerror_r_gnu -diff --git a/src/libc/musl/meson.build b/src/libc/musl/meson.build -index 3e205e1eb1..a64f292081 100644 ---- a/src/libc/musl/meson.build -+++ b/src/libc/musl/meson.build -@@ -7,4 +7,5 @@ endif - libc_wrapper_sources += files( - 'printf.c', - 'stdio.c', -+ 'string.c', - ) -diff --git a/src/libc/musl/string.c b/src/libc/musl/string.c -new file mode 100644 -index 0000000000..c2a9f4a169 ---- /dev/null -+++ b/src/libc/musl/string.c -@@ -0,0 +1,26 @@ -+/* SPDX-License-Identifier: LGPL-2.1-or-later */ -+ -+#include -+#include -+#include -+ -+/* The header errno.h overrides strerror_r with strerror_r_gnu, hence we need to undef it here. */ -+#undef strerror_r -+ -+char* strerror_r_gnu(int errnum, char *buf, size_t buflen) { -+ int saved_errno = errno; -+ const char *msg = strerror(errnum); -+ size_t l = strlen(msg); -+ if (l >= buflen) { -+ if (buflen > 0) { -+ if (buflen > 1) -+ memcpy(buf, msg, buflen - 1); -+ buf[buflen - 1] = '\0'; -+ } -+ errno = ERANGE; -+ } else { -+ memcpy(buf, msg, l + 1); -+ errno = saved_errno; -+ } -+ return buf; -+} --- -2.51.0 - diff --git a/pkgs/os-specific/linux/systemd/musl/0011-musl-make-strptime-accept-z.patch b/pkgs/os-specific/linux/systemd/musl/0011-musl-make-strptime-accept-z.patch deleted file mode 100644 index bbffbc8c8a53..000000000000 --- a/pkgs/os-specific/linux/systemd/musl/0011-musl-make-strptime-accept-z.patch +++ /dev/null @@ -1,137 +0,0 @@ -From bf670a5af2a78f81ee9396b5b5da49b2df07fcfd Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Tue, 9 Sep 2025 08:31:22 +0900 -Subject: [PATCH 11/30] musl: make strptime() accept "%z" - -musl v1.2.5 does not support %z specifier in strptime(). Since -https://github.com/kraj/musl/commit/fced99e93daeefb0192fd16304f978d4401d1d77 -%z is supported, but it only supports strict RFC-822/ISO 8601 format, -that is, 4 digits with sign (e.g. +0900 or -1400), but does not support -extended format: 2 digits or colon separated 4 digits (e.g. +09 or -14:00). -Let's add fallback logic to make it support the extended timezone spec. ---- - src/include/musl/time.h | 7 ++++ - src/libc/musl/meson.build | 1 + - src/libc/musl/time.c | 86 +++++++++++++++++++++++++++++++++++++++ - 3 files changed, 94 insertions(+) - create mode 100644 src/include/musl/time.h - create mode 100644 src/libc/musl/time.c - -diff --git a/src/include/musl/time.h b/src/include/musl/time.h -new file mode 100644 -index 0000000000..349f9a3577 ---- /dev/null -+++ b/src/include/musl/time.h -@@ -0,0 +1,7 @@ -+/* SPDX-License-Identifier: LGPL-2.1-or-later */ -+#pragma once -+ -+#include_next -+ -+char* strptime_fallback(const char *s, const char *format, struct tm *tm); -+#define strptime strptime_fallback -diff --git a/src/libc/musl/meson.build b/src/libc/musl/meson.build -index a64f292081..5fb590e868 100644 ---- a/src/libc/musl/meson.build -+++ b/src/libc/musl/meson.build -@@ -8,4 +8,5 @@ libc_wrapper_sources += files( - 'printf.c', - 'stdio.c', - 'string.c', -+ 'time.c', - ) -diff --git a/src/libc/musl/time.c b/src/libc/musl/time.c -new file mode 100644 -index 0000000000..12108166b2 ---- /dev/null -+++ b/src/libc/musl/time.c -@@ -0,0 +1,86 @@ -+/* SPDX-License-Identifier: LGPL-2.1-or-later */ -+ -+#include -+#include -+#include -+ -+/* The header time.h overrides strptime with strerror_fallback, hence we need to undef it here. */ -+#undef strptime -+ -+char* strptime_fallback(const char *s, const char *format, struct tm *tm) { -+ /* First try native strptime() as is, and if it succeeds, return the resuit as is. */ -+ char *k = strptime(s, format, tm); -+ if (k) -+ return k; -+ -+ /* Check inputs for safety. */ -+ if (!s || !format || !tm) -+ return NULL; -+ -+ /* We only fallback if the format is exactly "%z". */ -+ if (strcmp(format, "%z") != 0) -+ return NULL; -+ -+ /* In the below, we parse timezone specifiction compatible with RFC-822/ISO 8601 and its extensions -+ * (e.g. +06, +0900, or -03:00). */ -+ -+ bool positive; -+ switch (*s) { -+ case '+': -+ positive = true; -+ break; -+ case '-': -+ positive = false; -+ break; -+ default: -+ return NULL; -+ } -+ -+ s++; -+ -+ if (*s < '0' || *s > '9') -+ return NULL; -+ long t = (*s - '0') * 10 * 60 * 60; -+ -+ s++; -+ -+ if (*s < '0' || *s > '9') -+ return NULL; -+ t += (*s - '0') * 60 * 60; -+ -+ s++; -+ -+ if (*s == '\0') /* 2 digits case */ -+ goto finalize; -+ -+ if (*s == ':') /* skip colon */ -+ s++; -+ -+ if (*s < '0' || *s >= '6') /* refuse minutes equal to or larger than 60 */ -+ return NULL; -+ t += (*s - '0') * 10 * 60; -+ -+ s++; -+ -+ if (*s < '0' || *s > '9') -+ return NULL; -+ t += (*s - '0') * 60; -+ -+ s++; -+ -+ if (*s != '\0') -+ return NULL; -+ -+finalize: -+ if (t > 24 * 60 * 60) /* refuse larger than 24 hours */ -+ return NULL; -+ -+ if (!positive) -+ t = -t; -+ -+ *tm = (struct tm) { -+ .tm_gmtoff = t, -+ }; -+ -+ return (char*) s; -+} --- -2.51.0 - diff --git a/pkgs/os-specific/linux/systemd/musl/0012-musl-make-strtoll-accept-strings-start-with-dot.patch b/pkgs/os-specific/linux/systemd/musl/0012-musl-make-strtoll-accept-strings-start-with-dot.patch deleted file mode 100644 index 2833a951a3d2..000000000000 --- a/pkgs/os-specific/linux/systemd/musl/0012-musl-make-strtoll-accept-strings-start-with-dot.patch +++ /dev/null @@ -1,69 +0,0 @@ -From d97f38a2ffd0aca2a1d7b8a5bbbd1994e786c7bc Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Tue, 9 Sep 2025 09:10:44 +0900 -Subject: [PATCH 12/30] musl: make strtoll() accept strings start with dot - -glibc accepts strings start with '.' and returns 0, but musl refuses -them. Let's accept them, as our code assumes the function accept such -strings. ---- - src/include/musl/stdlib.h | 7 +++++++ - src/libc/musl/meson.build | 1 + - src/libc/musl/stdlib.c | 19 +++++++++++++++++++ - 3 files changed, 27 insertions(+) - create mode 100644 src/include/musl/stdlib.h - create mode 100644 src/libc/musl/stdlib.c - -diff --git a/src/include/musl/stdlib.h b/src/include/musl/stdlib.h -new file mode 100644 -index 0000000000..ecfd6ccb43 ---- /dev/null -+++ b/src/include/musl/stdlib.h -@@ -0,0 +1,7 @@ -+/* SPDX-License-Identifier: LGPL-2.1-or-later */ -+#pragma once -+ -+#include_next -+ -+long long strtoll_fallback(const char *nptr, char **endptr, int base); -+#define strtoll strtoll_fallback -diff --git a/src/libc/musl/meson.build b/src/libc/musl/meson.build -index 5fb590e868..ea09af9fa5 100644 ---- a/src/libc/musl/meson.build -+++ b/src/libc/musl/meson.build -@@ -7,6 +7,7 @@ endif - libc_wrapper_sources += files( - 'printf.c', - 'stdio.c', -+ 'stdlib.c', - 'string.c', - 'time.c', - ) -diff --git a/src/libc/musl/stdlib.c b/src/libc/musl/stdlib.c -new file mode 100644 -index 0000000000..d4e2714217 ---- /dev/null -+++ b/src/libc/musl/stdlib.c -@@ -0,0 +1,19 @@ -+/* SPDX-License-Identifier: LGPL-2.1-or-later */ -+ -+#include -+ -+/* The header stdlib.h overrides strtoll with strtoll_fallback, hence we need to undef it here. */ -+#undef strtoll -+ -+long long strtoll_fallback(const char *nptr, char **endptr, int base) { -+ /* glibc returns 0 if the first character is '.' without error, but musl returns as an error. -+ * As our code assumes the glibc behavior, let's accept string starts with '.'. */ -+ if (nptr && *nptr == '.') { -+ if (endptr) -+ *endptr = (char*) nptr; -+ return 0; -+ } -+ -+ /* Otherwise, use the native strtoll(). */ -+ return strtoll(nptr, endptr, base); -+} --- -2.51.0 - diff --git a/pkgs/os-specific/linux/systemd/musl/0013-musl-introduce-strerrorname_np.patch b/pkgs/os-specific/linux/systemd/musl/0013-musl-introduce-strerrorname_np.patch deleted file mode 100644 index 5203caf09f3d..000000000000 --- a/pkgs/os-specific/linux/systemd/musl/0013-musl-introduce-strerrorname_np.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 96b9f85d08be6f60768d1ebcdaf77e8e5dafebf6 Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Fri, 5 Sep 2025 09:20:50 +0900 -Subject: [PATCH 13/30] musl: introduce strerrorname_np() - -musl does not provide strerrorname_np(). Thus, we need to implement it. ---- - src/include/musl/string.h | 2 ++ - src/libc/musl/generate-strerrorname_np.sh | 39 +++++++++++++++++++++++ - src/libc/musl/meson.build | 7 ++++ - 3 files changed, 48 insertions(+) - create mode 100755 src/libc/musl/generate-strerrorname_np.sh - -diff --git a/src/include/musl/string.h b/src/include/musl/string.h -index cc3da63012..7317c8dea0 100644 ---- a/src/include/musl/string.h -+++ b/src/include/musl/string.h -@@ -5,3 +5,5 @@ - - char* strerror_r_gnu(int errnum, char *buf, size_t buflen); - #define strerror_r strerror_r_gnu -+ -+const char* strerrorname_np(int errnum); -diff --git a/src/libc/musl/generate-strerrorname_np.sh b/src/libc/musl/generate-strerrorname_np.sh -new file mode 100755 -index 0000000000..0e0fb8b187 ---- /dev/null -+++ b/src/libc/musl/generate-strerrorname_np.sh -@@ -0,0 +1,39 @@ -+#!/usr/bin/env bash -+# SPDX-License-Identifier: LGPL-2.1-or-later -+set -eu -+set -o pipefail -+ -+# This is based on src/basic/generate-errno-list.sh. -+ -+# ECANCELLED, EDEADLOCK, ENOTSUP, EREFUSED, and EWOULDBLOCK are defined as aliases of -+# ECANCELED, EDEADLK, EOPNOTSUPP, ECONNREFUSED, and EAGAIN, respectively. Let's drop them. -+ -+CC=${1:?} -+shift -+ -+cat <<'EOF' -+/* SPDX-License-Identifier: LGPL-2.1-or-later */ -+ -+#include -+#include -+#include -+ -+static const char * const errno_table[] = { -+EOF -+ -+$CC -dM -include errno.h - = sizeof(errno_table) / sizeof(errno_table[0])) -+ return NULL; -+ return errno_table[errnum]; -+} -+EOF -diff --git a/src/libc/musl/meson.build b/src/libc/musl/meson.build -index ea09af9fa5..1cb6bf28c1 100644 ---- a/src/libc/musl/meson.build -+++ b/src/libc/musl/meson.build -@@ -11,3 +11,10 @@ libc_wrapper_sources += files( - 'string.c', - 'time.c', - ) -+ -+generator= files('generate-strerrorname_np.sh') -+libc_wrapper_sources += custom_target( -+ input : generator, -+ output : 'strerrorname_np.c', -+ command : [env, 'bash', generator, cpp], -+ capture : true) --- -2.51.0 - diff --git a/pkgs/os-specific/linux/systemd/musl/0014-musl-introduce-dummy-functions-for-mallinfo-malloc_i.patch b/pkgs/os-specific/linux/systemd/musl/0014-musl-introduce-dummy-functions-for-mallinfo-malloc_i.patch deleted file mode 100644 index 41a8c6b4e2aa..000000000000 --- a/pkgs/os-specific/linux/systemd/musl/0014-musl-introduce-dummy-functions-for-mallinfo-malloc_i.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 331e8b9158f1bb3b4ff5db2c17a16a60640e0c12 Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Tue, 10 Jun 2025 00:40:59 +0900 -Subject: [PATCH 14/30] musl: introduce dummy functions for mallinfo(), - malloc_info(), and malloc_trim() - -These functions are not provided by musl. ---- - src/include/musl/malloc.h | 39 +++++++++++++++++++++++++++++++++++++++ - 1 file changed, 39 insertions(+) - create mode 100644 src/include/musl/malloc.h - -diff --git a/src/include/musl/malloc.h b/src/include/musl/malloc.h -new file mode 100644 -index 0000000000..9d15d4bf91 ---- /dev/null -+++ b/src/include/musl/malloc.h -@@ -0,0 +1,39 @@ -+/* SPDX-License-Identifier: LGPL-2.1-or-later */ -+#pragma once -+ -+#include -+#include -+ -+/* struct mallinfo2 will be defined and struct mallinfo is converted to struct mallinfo2 in -+ * override/malloc.h. Hence, here we define struct mallinfo. */ -+ -+struct mallinfo { -+ int arena; /* non-mmapped space allocated from system */ -+ int ordblks; /* number of free chunks */ -+ int smblks; /* number of fastbin blocks */ -+ int hblks; /* number of mmapped regions */ -+ int hblkhd; /* space in mmapped regions */ -+ int usmblks; /* always 0, preserved for backwards compatibility */ -+ int fsmblks; /* space available in freed fastbin blocks */ -+ int uordblks; /* total allocated space */ -+ int fordblks; /* total free space */ -+ int keepcost; /* top-most, releasable (via malloc_trim) space */ -+}; -+ -+static inline struct mallinfo mallinfo(void) { -+ return (struct mallinfo) {}; -+} -+ -+static inline int malloc_info(int options, FILE *stream) { -+ if (options != 0) -+ errno = EINVAL; -+ else -+ errno = EOPNOTSUPP; -+ return -1; -+} -+ -+static inline int malloc_trim(size_t pad) { -+ return 0; -+} -+ -+#include_next --- -2.51.0 - diff --git a/pkgs/os-specific/linux/systemd/musl/0015-musl-introduce-dummy-function-for-gnu_get_libc_versi.patch b/pkgs/os-specific/linux/systemd/musl/0015-musl-introduce-dummy-function-for-gnu_get_libc_versi.patch deleted file mode 100644 index 4ec71eb7e25a..000000000000 --- a/pkgs/os-specific/linux/systemd/musl/0015-musl-introduce-dummy-function-for-gnu_get_libc_versi.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 5067b1cfac07dbb50d7813b2a900b1b6f8e6e4bd Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Sun, 8 Jun 2025 10:07:54 +0900 -Subject: [PATCH 15/30] musl: introduce dummy function for - gnu_get_libc_version() - -As the header gnu/libc-version.h and gnu_get_libc_version() function -are glibc specific, and musl does not provide them. ---- - src/include/musl/gnu/libc-version.h | 8 ++++++++ - src/shared/condition.c | 9 +++++++-- - src/test/test-condition.c | 8 +++++--- - 3 files changed, 20 insertions(+), 5 deletions(-) - create mode 100644 src/include/musl/gnu/libc-version.h - -diff --git a/src/include/musl/gnu/libc-version.h b/src/include/musl/gnu/libc-version.h -new file mode 100644 -index 0000000000..8ad0ed16b8 ---- /dev/null -+++ b/src/include/musl/gnu/libc-version.h -@@ -0,0 +1,8 @@ -+/* SPDX-License-Identifier: LGPL-2.1-or-later */ -+#pragma once -+ -+#include -+ -+static inline const char* gnu_get_libc_version(void) { -+ return NULL; -+} -diff --git a/src/shared/condition.c b/src/shared/condition.c -index b09eff1bfb..b27b24aba7 100644 ---- a/src/shared/condition.c -+++ b/src/shared/condition.c -@@ -255,8 +255,13 @@ static int condition_test_version(Condition *c, char **env) { - if (streq(word, "systemd")) - return condition_test_version_cmp(p, STRINGIFY(PROJECT_VERSION)); - -- if (streq(word, "glibc")) -- return condition_test_version_cmp(p, gnu_get_libc_version()); -+ if (streq(word, "glibc")) { -+ const char *v = gnu_get_libc_version(); -+ if (!v) -+ return false; /* built with musl */ -+ -+ return condition_test_version_cmp(p, v); -+ } - - /* if no predicate has been set, default to "kernel" and use the whole parameter as condition */ - if (!streq(word, "kernel")) -diff --git a/src/test/test-condition.c b/src/test/test-condition.c -index 11b3a42418..898c111ffe 100644 ---- a/src/test/test-condition.c -+++ b/src/test/test-condition.c -@@ -669,8 +669,10 @@ TEST(condition_test_version) { - condition_free(condition); - - /* Test glibc version */ -+ bool expected = !!gnu_get_libc_version(); -+ - ASSERT_NOT_NULL((condition = condition_new(CONDITION_VERSION, "glibc > 1", false, false))); -- ASSERT_OK_POSITIVE(condition_test(condition, environ)); -+ ASSERT_OK_EQ(condition_test(condition, environ), expected); - condition_free(condition); - - ASSERT_NOT_NULL((condition = condition_new(CONDITION_VERSION, "glibc < 2", false, false))); -@@ -678,7 +680,7 @@ TEST(condition_test_version) { - condition_free(condition); - - ASSERT_NOT_NULL((condition = condition_new(CONDITION_VERSION, "glibc < 9999", false, false))); -- ASSERT_OK_POSITIVE(condition_test(condition, environ)); -+ ASSERT_OK_EQ(condition_test(condition, environ), expected); - condition_free(condition); - - ASSERT_NOT_NULL((condition = condition_new(CONDITION_VERSION, "glibc > 9999", false, false))); -@@ -688,7 +690,7 @@ TEST(condition_test_version) { - v = strjoina("glibc = ", gnu_get_libc_version()); - - ASSERT_NOT_NULL((condition = condition_new(CONDITION_VERSION, v, false, false))); -- ASSERT_OK_POSITIVE(condition_test(condition, environ)); -+ ASSERT_OK_EQ(condition_test(condition, environ), expected); - condition_free(condition); - - v = strjoina("glibc != ", gnu_get_libc_version()); --- -2.51.0 - diff --git a/pkgs/os-specific/linux/systemd/musl/0016-musl-define-__THROW-when-not-defined.patch b/pkgs/os-specific/linux/systemd/musl/0016-musl-define-__THROW-when-not-defined.patch deleted file mode 100644 index 16fc6570320a..000000000000 --- a/pkgs/os-specific/linux/systemd/musl/0016-musl-define-__THROW-when-not-defined.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 65a6110f75e3bcf980aa4138ad18c06f351b78f5 Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Mon, 9 Jun 2025 14:00:55 +0900 -Subject: [PATCH 16/30] musl: define __THROW when not defined - -__THROW is internally used by glibc headers, hence our implementation of -net/if.h and sys/mount.h also use it. However, musl does not provide -the macro. Let's define it when not defined. ---- - src/include/musl/features.h | 8 ++++++++ - 1 file changed, 8 insertions(+) - create mode 100644 src/include/musl/features.h - -diff --git a/src/include/musl/features.h b/src/include/musl/features.h -new file mode 100644 -index 0000000000..bd6d00a9d4 ---- /dev/null -+++ b/src/include/musl/features.h -@@ -0,0 +1,8 @@ -+/* SPDX-License-Identifier: LGPL-2.1-or-later */ -+#pragma once -+ -+#include_next -+ -+#ifndef __THROW -+#define __THROW -+#endif --- -2.51.0 - diff --git a/pkgs/os-specific/linux/systemd/musl/0017-musl-replace-sys-prctl.h-with-our-own-implementation.patch b/pkgs/os-specific/linux/systemd/musl/0017-musl-replace-sys-prctl.h-with-our-own-implementation.patch deleted file mode 100644 index 4d733f000d47..000000000000 --- a/pkgs/os-specific/linux/systemd/musl/0017-musl-replace-sys-prctl.h-with-our-own-implementation.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 75aa46c9399664d2a1cdabefcad2899ebfabc741 Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Mon, 23 Jun 2025 16:00:21 +0900 -Subject: [PATCH 17/30] musl: replace sys/prctl.h with our own implementation - -To avoid conflicts between musl's sys/prctl.h and linux/prctl.h. ---- - src/include/musl/sys/prctl.h | 9 +++++++++ - 1 file changed, 9 insertions(+) - create mode 100644 src/include/musl/sys/prctl.h - -diff --git a/src/include/musl/sys/prctl.h b/src/include/musl/sys/prctl.h -new file mode 100644 -index 0000000000..2c830d2649 ---- /dev/null -+++ b/src/include/musl/sys/prctl.h -@@ -0,0 +1,9 @@ -+/* SPDX-License-Identifier: LGPL-2.1-or-later */ -+#pragma once -+ -+/* This is for avoiding conflicts between musl's sys/prctl.h and linux/prctl.h. */ -+ -+#include -+#include /* IWYU pragma: export */ -+ -+int prctl(int, ...); --- -2.51.0 - diff --git a/pkgs/os-specific/linux/systemd/musl/0018-musl-replace-netinet-if_ether.h-with-our-own-impleme.patch b/pkgs/os-specific/linux/systemd/musl/0018-musl-replace-netinet-if_ether.h-with-our-own-impleme.patch deleted file mode 100644 index c0044956ad0f..000000000000 --- a/pkgs/os-specific/linux/systemd/musl/0018-musl-replace-netinet-if_ether.h-with-our-own-impleme.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 6e77a74ca91e689a43651d9eeb5f8f40893eed76 Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Mon, 23 Jun 2025 16:08:37 +0900 -Subject: [PATCH 18/30] musl: replace netinet/if_ether.h with our own - implementation - -musl's netinet/if_ether.h conflicts with linux/if_ether.h. -The reimplementation is mostly equivalent with what glibc does. - -This also unset __UAPI_DEF_ETHHDR before including linux/if_ether.h, -otherwise struct ethhdr may not be defined by the header when it is -defined. ---- - src/include/musl/linux/if_ether.h | 5 +++++ - src/include/musl/netinet/if_ether.h | 33 +++++++++++++++++++++++++++++ - 2 files changed, 38 insertions(+) - create mode 100644 src/include/musl/linux/if_ether.h - create mode 100644 src/include/musl/netinet/if_ether.h - -diff --git a/src/include/musl/linux/if_ether.h b/src/include/musl/linux/if_ether.h -new file mode 100644 -index 0000000000..e28cd4a014 ---- /dev/null -+++ b/src/include/musl/linux/if_ether.h -@@ -0,0 +1,5 @@ -+/* SPDX-License-Identifier: LGPL-2.1-or-later */ -+#pragma once -+ -+#undef __UAPI_DEF_ETHHDR -+#include_next -diff --git a/src/include/musl/netinet/if_ether.h b/src/include/musl/netinet/if_ether.h -new file mode 100644 -index 0000000000..62f4ac03b3 ---- /dev/null -+++ b/src/include/musl/netinet/if_ether.h -@@ -0,0 +1,33 @@ -+/* SPDX-License-Identifier: LGPL-2.1-or-later */ -+#pragma once -+ -+/* glibc's netinet/if_ether.h does the following: -+ * - include linux/if_ether.h, net/ethernet.h, and net/if_arp.h, -+ * - define struct ether_arp, and relevant macros, -+ * - define ETHER_MAP_IP_MULTICAST() macro (currently we do not use it). -+ * However, musl's netinet/if_ether.h conflicts with linux/if_ether.h. -+ * Let's use the same way that glibc uses. */ -+ -+#include /* IWYU pragma: export */ -+#include /* IWYU pragma: export */ -+#include /* IWYU pragma: export */ -+ -+/* -+ * Ethernet Address Resolution Protocol. -+ * -+ * See RFC 826 for protocol description. Structure below is adapted -+ * to resolving internet addresses. Field names used correspond to -+ * RFC 826. -+ */ -+struct ether_arp { -+ struct arphdr ea_hdr; /* fixed-size header */ -+ uint8_t arp_sha[ETH_ALEN]; /* sender hardware address */ -+ uint8_t arp_spa[4]; /* sender protocol address */ -+ uint8_t arp_tha[ETH_ALEN]; /* target hardware address */ -+ uint8_t arp_tpa[4]; /* target protocol address */ -+}; -+#define arp_hrd ea_hdr.ar_hrd -+#define arp_pro ea_hdr.ar_pro -+#define arp_hln ea_hdr.ar_hln -+#define arp_pln ea_hdr.ar_pln -+#define arp_op ea_hdr.ar_op --- -2.51.0 - diff --git a/pkgs/os-specific/linux/systemd/musl/0019-musl-add-missing-FTW_CONTINUE-macro.patch b/pkgs/os-specific/linux/systemd/musl/0019-musl-add-missing-FTW_CONTINUE-macro.patch deleted file mode 100644 index 24855be78c21..000000000000 --- a/pkgs/os-specific/linux/systemd/musl/0019-musl-add-missing-FTW_CONTINUE-macro.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 7d4b4e49729f7c7d5164ba2c5040ed522d68ee7a Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Mon, 25 Feb 2019 15:00:06 +0800 -Subject: [PATCH 19/30] musl: add missing FTW_CONTINUE macro -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This is to avoid build failures like below for musl. - - test-recurse-dir.c:23:24: error: ‘FTW_CONTINUE’ undeclared - -Co-authored-by: Yu Watanabe ---- - src/include/musl/ftw.h | 8 ++++++++ - 1 file changed, 8 insertions(+) - create mode 100644 src/include/musl/ftw.h - -diff --git a/src/include/musl/ftw.h b/src/include/musl/ftw.h -new file mode 100644 -index 0000000000..fd153734d0 ---- /dev/null -+++ b/src/include/musl/ftw.h -@@ -0,0 +1,8 @@ -+/* SPDX-License-Identifier: LGPL-2.1-or-later */ -+#pragma once -+ -+#include_next -+ -+#ifndef FTW_CONTINUE -+#define FTW_CONTINUE 0 -+#endif --- -2.51.0 - diff --git a/pkgs/os-specific/linux/systemd/musl/0020-musl-add-several-missing-statx-macros.patch b/pkgs/os-specific/linux/systemd/musl/0020-musl-add-several-missing-statx-macros.patch deleted file mode 100644 index 6dd1589019b0..000000000000 --- a/pkgs/os-specific/linux/systemd/musl/0020-musl-add-several-missing-statx-macros.patch +++ /dev/null @@ -1,90 +0,0 @@ -From c306693ac26aef3d5fb06fa0981d911bda9b93d7 Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Sun, 22 Jun 2025 00:38:58 +0900 -Subject: [PATCH 20/30] musl: add several missing statx macros - -glibc's sys/stat.h includes linux/stat.h, and we have copy of it from -the latest kernel, hence all new flags are always defined. -However, musl's sys/stat.h does not include linux/stat.h, and moreover, -they conflict with each other, hence we cannot include both header -simultaneously. Let's define missing macros to support musl. ---- - src/include/musl/sys/stat.h | 66 +++++++++++++++++++++++++++++++++++++ - 1 file changed, 66 insertions(+) - create mode 100644 src/include/musl/sys/stat.h - -diff --git a/src/include/musl/sys/stat.h b/src/include/musl/sys/stat.h -new file mode 100644 -index 0000000000..610dd3e699 ---- /dev/null -+++ b/src/include/musl/sys/stat.h -@@ -0,0 +1,66 @@ -+/* SPDX-License-Identifier: LGPL-2.1-or-later */ -+#pragma once -+ -+#include_next -+ -+#include -+#include -+ -+/* musl's sys/stat.h does not include linux/stat.h, and unfortunately they conflict with each other. -+ * Hence, some relatively new macros need to be explicitly defined here. */ -+ -+/* Before 23ab04a8630225371455d5f4538fd078665bb646, statx.stx_mnt_id is not defined. */ -+#ifndef STATX_MNT_ID -+static_assert(offsetof(struct statx, __pad1) == offsetof(struct statx, stx_dev_minor) + sizeof(uint32_t), ""); -+#define stx_mnt_id __pad1[0] -+#endif -+ -+#ifndef STATX_MNT_ID -+#define STATX_MNT_ID 0x00001000U -+#endif -+#ifndef STATX_DIOALIGN -+#define STATX_DIOALIGN 0x00002000U -+#endif -+#ifndef STATX_MNT_ID_UNIQUE -+#define STATX_MNT_ID_UNIQUE 0x00004000U -+#endif -+#ifndef STATX_SUBVOL -+#define STATX_SUBVOL 0x00008000U -+#endif -+#ifndef STATX_WRITE_ATOMIC -+#define STATX_WRITE_ATOMIC 0x00010000U -+#endif -+#ifndef STATX_DIO_READ_ALIGN -+#define STATX_DIO_READ_ALIGN 0x00020000U -+#endif -+ -+#ifndef STATX_ATTR_COMPRESSED -+#define STATX_ATTR_COMPRESSED 0x00000004 -+#endif -+#ifndef STATX_ATTR_IMMUTABLE -+#define STATX_ATTR_IMMUTABLE 0x00000010 -+#endif -+#ifndef STATX_ATTR_APPEND -+#define STATX_ATTR_APPEND 0x00000020 -+#endif -+#ifndef STATX_ATTR_NODUMP -+#define STATX_ATTR_NODUMP 0x00000040 -+#endif -+#ifndef STATX_ATTR_ENCRYPTED -+#define STATX_ATTR_ENCRYPTED 0x00000800 -+#endif -+#ifndef STATX_ATTR_AUTOMOUNT -+#define STATX_ATTR_AUTOMOUNT 0x00001000 -+#endif -+#ifndef STATX_ATTR_MOUNT_ROOT -+#define STATX_ATTR_MOUNT_ROOT 0x00002000 -+#endif -+#ifndef STATX_ATTR_VERITY -+#define STATX_ATTR_VERITY 0x00100000 -+#endif -+#ifndef STATX_ATTR_DAX -+#define STATX_ATTR_DAX 0x00200000 -+#endif -+#ifndef STATX_ATTR_WRITE_ATOMIC -+#define STATX_ATTR_WRITE_ATOMIC 0x00400000 -+#endif --- -2.51.0 - diff --git a/pkgs/os-specific/linux/systemd/musl/0021-musl-avoid-conflict-between-fcntl.h-and-our-forward..patch b/pkgs/os-specific/linux/systemd/musl/0021-musl-avoid-conflict-between-fcntl.h-and-our-forward..patch deleted file mode 100644 index a024e58f2d25..000000000000 --- a/pkgs/os-specific/linux/systemd/musl/0021-musl-avoid-conflict-between-fcntl.h-and-our-forward..patch +++ /dev/null @@ -1,36 +0,0 @@ -From a8209a45e73f4c8b1f4e4e174d2d5fbc8a9ac4df Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Tue, 22 Jul 2025 03:37:37 +0900 -Subject: [PATCH 21/30] musl: avoid conflict between fcntl.h and our forward.h - -glibc defines AT_FDCWD as -100, but musl defines it as (-100). -In forward.h, we also define AT_FDCWD as -100, hence musl's fcntl.h -conflicts with forward.h. This is for avoiding the conflict. ---- - src/include/musl/fcntl.h | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - create mode 100644 src/include/musl/fcntl.h - -diff --git a/src/include/musl/fcntl.h b/src/include/musl/fcntl.h -new file mode 100644 -index 0000000000..e69f13087d ---- /dev/null -+++ b/src/include/musl/fcntl.h -@@ -0,0 +1,14 @@ -+/* SPDX-License-Identifier: LGPL-2.1-or-later */ -+#pragma once -+ -+/* glibc defines AT_FDCWD as -100, but musl defines it as (-100). Hence, musl's fcntl.h conflicts with -+ * forward.h. To avoid the conflict, here temporary undef AT_FDCWD before including fcntl.h. */ -+#ifdef AT_FDCWD -+#undef AT_FDCWD -+#endif -+ -+#include_next -+ -+/* Then, undef AT_FDCWD by fcntl.h and redefine it as consistent with forward.h */ -+#undef AT_FDCWD -+#define AT_FDCWD -100 --- -2.51.0 - diff --git a/pkgs/os-specific/linux/systemd/musl/0022-musl-redefine-HOST_NAME_MAX-as-64.patch b/pkgs/os-specific/linux/systemd/musl/0022-musl-redefine-HOST_NAME_MAX-as-64.patch deleted file mode 100644 index 4e47c4c14e1d..000000000000 --- a/pkgs/os-specific/linux/systemd/musl/0022-musl-redefine-HOST_NAME_MAX-as-64.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 4a06464ea72d06859c54fca4d7bc361e2f4b069c Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Sun, 7 Sep 2025 06:16:02 +0900 -Subject: [PATCH 22/30] musl: redefine HOST_NAME_MAX as 64 - -glibc defines HOST_NAME_MAX as 64 and our code rely on that, but musl -defines the constant as 255. Let's redefine it. ---- - src/include/musl/limits.h | 8 ++++++++ - 1 file changed, 8 insertions(+) - create mode 100644 src/include/musl/limits.h - -diff --git a/src/include/musl/limits.h b/src/include/musl/limits.h -new file mode 100644 -index 0000000000..fadf71d66f ---- /dev/null -+++ b/src/include/musl/limits.h -@@ -0,0 +1,8 @@ -+/* SPDX-License-Identifier: LGPL-2.1-or-later */ -+#pragma once -+ -+#include_next -+ -+/* HOST_NAME_MAX should be 64 on linux, but musl uses the one by POSIX (255). */ -+#undef HOST_NAME_MAX -+#define HOST_NAME_MAX 64 --- -2.51.0 - diff --git a/pkgs/os-specific/linux/systemd/musl/0023-musl-avoid-multiple-evaluations-in-CPU_ISSET_S-macro.patch b/pkgs/os-specific/linux/systemd/musl/0023-musl-avoid-multiple-evaluations-in-CPU_ISSET_S-macro.patch deleted file mode 100644 index a397f554fb89..000000000000 --- a/pkgs/os-specific/linux/systemd/musl/0023-musl-avoid-multiple-evaluations-in-CPU_ISSET_S-macro.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 1aecd86536aef53e92a4903794259300815a9e62 Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Tue, 1 Jul 2025 12:53:14 +0900 -Subject: [PATCH 23/30] musl: avoid multiple evaluations in CPU_ISSET_S() macro -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -musl's CPU_ISSET_S() macro does not avoid multiple evaluations, and it -only accepts simple variable or constant. - -Fixes the following error. -``` -../src/shared/cpu-set-util.c: In function ‘cpu_set_to_mask_string’: -../src/shared/cpu-set-util.c:101:41: warning: operation on ‘i’ may be undefined [-Werror=sequence-point] - 101 | if (CPU_ISSET_S(--i, c->allocated, c->set)) - | ^ -``` ---- - src/include/musl/sched.h | 30 ++++++++++++++++++++++++++++++ - 1 file changed, 30 insertions(+) - create mode 100644 src/include/musl/sched.h - -diff --git a/src/include/musl/sched.h b/src/include/musl/sched.h -new file mode 100644 -index 0000000000..d6e7100ee4 ---- /dev/null -+++ b/src/include/musl/sched.h -@@ -0,0 +1,30 @@ -+/* SPDX-License-Identifier: LGPL-2.1-or-later */ -+#pragma once -+ -+#include_next -+ -+/* This is for avoiding multiple evaluations in musl's __CPU_op_S() macro. */ -+ -+#undef __CPU_op_S -+#undef CPU_SET_S -+#undef CPU_CLR_S -+#undef CPU_ISSET_S -+#undef CPU_SET -+#undef CPU_CLR -+#undef CPU_ISSET -+ -+#define __CPU_op_S(i, size, set, op) \ -+ ({ \ -+ typeof(i) _i = (i); \ -+ \ -+ _i / 8U >= (size) ? 0 : \ -+ (((unsigned long*) (set))[_i / 8 / sizeof(long)] op (1UL << (_i % (8 * sizeof(long))))); \ -+ }) -+ -+#define CPU_SET_S(i, size, set) __CPU_op_S(i, size, set, |=) -+#define CPU_CLR_S(i, size, set) __CPU_op_S(i, size, set, &=~) -+#define CPU_ISSET_S(i, size, set) __CPU_op_S(i, size, set, &) -+ -+#define CPU_SET(i, set) CPU_SET_S(i, sizeof(cpu_set_t), set) -+#define CPU_CLR(i, set) CPU_CLR_S(i, sizeof(cpu_set_t), set) -+#define CPU_ISSET(i, set) CPU_ISSET_S(i, sizeof(cpu_set_t), set) --- -2.51.0 - diff --git a/pkgs/os-specific/linux/systemd/musl/0024-musl-core-there-is-one-less-usable-signal-when-built.patch b/pkgs/os-specific/linux/systemd/musl/0024-musl-core-there-is-one-less-usable-signal-when-built.patch deleted file mode 100644 index 5a173be962be..000000000000 --- a/pkgs/os-specific/linux/systemd/musl/0024-musl-core-there-is-one-less-usable-signal-when-built.patch +++ /dev/null @@ -1,57 +0,0 @@ -From c00d31373a8f5b922dd947a6d6d6098df0429762 Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Sun, 7 Sep 2025 08:53:07 +0900 -Subject: [PATCH 24/30] musl: core: there is one less usable signal when built - with musl - -musl internally reserves one more signal, hence we can only use 29 -signals. ---- - src/core/manager.c | 4 ++-- - src/test/test-signal-util.c | 7 ++++++- - 2 files changed, 8 insertions(+), 3 deletions(-) - -diff --git a/src/core/manager.c b/src/core/manager.c -index d85896577f..86cb11905f 100644 ---- a/src/core/manager.c -+++ b/src/core/manager.c -@@ -526,7 +526,7 @@ static int manager_setup_signals(Manager *m) { - assert_se(sigaction(SIGCHLD, &sa, NULL) == 0); - - /* We make liberal use of realtime signals here. On Linux/glibc we have 30 of them, between -- * SIGRTMIN+0 ... SIGRTMIN+30 (aka SIGRTMAX). */ -+ * SIGRTMIN+0 ... SIGRTMIN+30 (aka SIGRTMAX). When musl is used SIGRTMAX is SIGRTMIN+29. */ - - assert_se(sigemptyset(&mask) == 0); - sigset_add_many(&mask, -@@ -571,7 +571,7 @@ static int manager_setup_signals(Manager *m) { - SIGRTMIN+28, /* systemd: set log target to kmsg */ - SIGRTMIN+29, /* systemd: set log target to syslog-or-kmsg (obsolete) */ - -- /* ... one free signal here SIGRTMIN+30 ... */ -+ /* ... one free signal here SIGRTMIN+30 (glibc only) ... */ - -1); - assert_se(sigprocmask(SIG_SETMASK, &mask, NULL) == 0); - -diff --git a/src/test/test-signal-util.c b/src/test/test-signal-util.c -index 7d069a7fb2..f26b48f3f2 100644 ---- a/src/test/test-signal-util.c -+++ b/src/test/test-signal-util.c -@@ -13,8 +13,13 @@ TEST(rt_signals) { - info(SIGRTMIN); - info(SIGRTMAX); - -- /* We use signals SIGRTMIN+0 to SIGRTMIN+30 unconditionally */ -+ /* We use signals SIGRTMIN+0 to SIGRTMIN+29 unconditionally. SIGRTMIN+30 can be used only when -+ * built with glibc. */ -+#ifdef __GLIBC__ - assert_se(SIGRTMAX - SIGRTMIN >= 30); -+#else -+ assert_se(SIGRTMAX - SIGRTMIN >= 29); -+#endif - } - - static void test_signal_to_string_one(int val) { --- -2.51.0 - diff --git a/pkgs/os-specific/linux/systemd/musl/0025-musl-build-path-fix-reading-DT_RUNPATH-or-DT_RPATH.patch b/pkgs/os-specific/linux/systemd/musl/0025-musl-build-path-fix-reading-DT_RUNPATH-or-DT_RPATH.patch deleted file mode 100644 index 4a78440837ed..000000000000 --- a/pkgs/os-specific/linux/systemd/musl/0025-musl-build-path-fix-reading-DT_RUNPATH-or-DT_RPATH.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 7cade54777e9b715ca5b1023dd8fead64d1f4b3e Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Sat, 6 Sep 2025 12:06:06 +0900 -Subject: [PATCH 25/30] musl: build-path: fix reading DT_RUNPATH or DT_RPATH - -musl records DT_STRTAB as offset, rather than address. So, need to add -obtained bias to read runpath or rpath. ---- - src/basic/build-path.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/basic/build-path.c b/src/basic/build-path.c -index 577ff72bce..3212089379 100644 ---- a/src/basic/build-path.c -+++ b/src/basic/build-path.c -@@ -34,11 +34,11 @@ static int get_runpath_from_dynamic(const ElfW(Dyn) *d, ElfW(Addr) bias, const c - break; - - case DT_STRTAB: -- /* On MIPS and RISC-V DT_STRTAB records an offset, not a valid address, so it has to be adjusted -- * using the bias calculated earlier. */ -+ /* On MIPS, RISC-V, or with musl, DT_STRTAB records an offset, not a valid address, -+ * so it has to be adjusted using the bias calculated earlier. */ - if (d->d_un.d_val != 0) - strtab = (const char *) ((uintptr_t) d->d_un.d_val --#if defined(__mips__) || defined(__riscv) -+#if defined(__mips__) || defined(__riscv) || !defined(__GLIBC__) - + bias - #endif - ); --- -2.51.0 - diff --git a/pkgs/os-specific/linux/systemd/musl/0026-musl-format-util-use-llu-for-formatting-rlim_t.patch b/pkgs/os-specific/linux/systemd/musl/0026-musl-format-util-use-llu-for-formatting-rlim_t.patch deleted file mode 100644 index e59e6aeae62c..000000000000 --- a/pkgs/os-specific/linux/systemd/musl/0026-musl-format-util-use-llu-for-formatting-rlim_t.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 65cd003563fe1b8f1f1b3e1c1198b3d63f993820 Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Mon, 9 Jun 2025 12:00:01 +0900 -Subject: [PATCH 26/30] musl: format-util: use %llu for formatting rlim_t - -glibc uses uint32_t or uint64_t for rlim_t, while musl uses unsigned long long. ---- - meson.build | 7 +++++++ - src/basic/format-util.h | 14 ++++++++------ - 2 files changed, 15 insertions(+), 6 deletions(-) - -diff --git a/meson.build b/meson.build -index 5f235d5113..66579b9182 100644 ---- a/meson.build -+++ b/meson.build -@@ -572,6 +572,13 @@ conf.set('SIZEOF_RLIM_T', cc.sizeof('rlim_t', prefix : '#include ')) - conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('typeof(((struct timex *)0)->freq)', prefix : '#include ')) - -+if get_option('libc') == 'musl' -+ if conf.get('SIZEOF_RLIM_T') != 8 -+ error('Unexpected size of rlim_t: @0@'.format(conf.get('SIZEOF_RLIM_T'))) -+ endif -+ conf.set_quoted('RLIM_FMT', '%llu') -+endif -+ - long_max = cc.compute_int( - 'LONG_MAX', - prefix : '#include ', -diff --git a/src/basic/format-util.h b/src/basic/format-util.h -index e42f788ce6..d40ca5818a 100644 ---- a/src/basic/format-util.h -+++ b/src/basic/format-util.h -@@ -39,12 +39,14 @@ assert_cc(sizeof(gid_t) == sizeof(uint32_t)); - # error Unknown timex member size - #endif - --#if SIZEOF_RLIM_T == 8 --# define RLIM_FMT "%" PRIu64 --#elif SIZEOF_RLIM_T == 4 --# define RLIM_FMT "%" PRIu32 --#else --# error Unknown rlim_t size -+#ifndef RLIM_FMT -+# if SIZEOF_RLIM_T == 8 -+# define RLIM_FMT "%" PRIu64 -+# elif SIZEOF_RLIM_T == 4 -+# define RLIM_FMT "%" PRIu32 -+# else -+# error Unknown rlim_t size -+# endif - #endif - - #if SIZEOF_DEV_T == 8 --- -2.51.0 - diff --git a/pkgs/os-specific/linux/systemd/musl/0027-musl-time-util-skip-tm.tm_wday-check.patch b/pkgs/os-specific/linux/systemd/musl/0027-musl-time-util-skip-tm.tm_wday-check.patch deleted file mode 100644 index fd9a00fb3b5d..000000000000 --- a/pkgs/os-specific/linux/systemd/musl/0027-musl-time-util-skip-tm.tm_wday-check.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 524396a3058a08955683038dae86cf5aaaf10847 Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Mon, 8 Sep 2025 15:08:49 +0900 -Subject: [PATCH 27/30] musl: time-util: skip tm.tm_wday check - -musl does not set tm_wday when it is explicitly requested. -The check is not necessary at all, it is just for safety. -Let's skip it when built with musl. ---- - src/basic/time-util.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index 38591b0604..c890141a99 100644 ---- a/src/basic/time-util.c -+++ b/src/basic/time-util.c -@@ -668,10 +668,14 @@ static int parse_timestamp_impl( - _cleanup_free_ char *t_alloc = NULL; - usec_t usec, plus = 0, minus = 0; - bool with_tz = false; -- int r, weekday = -1; - unsigned fractional = 0; - const char *k; - struct tm tm, copy; -+ int r; -+#ifndef __GLIBC__ -+ _unused_ -+#endif -+ int weekday = -1; - - /* Allowed syntaxes: - * -@@ -921,8 +925,11 @@ from_tm: - assert(plus == 0); - assert(minus == 0); - -+#ifdef __GLIBC__ -+ /* musl does not set tm_wday field and set 0 unless it is explicitly requested by %w or so. */ - if (weekday >= 0 && tm.tm_wday != weekday) - return -EINVAL; -+#endif - - if (gmtoff < 0) { - plus = -gmtoff * USEC_PER_SEC; --- -2.51.0 - diff --git a/pkgs/os-specific/linux/systemd/musl/0028-musl-glob-util-filter-out-.-and-.-even-if-GLOB_ALTDI.patch b/pkgs/os-specific/linux/systemd/musl/0028-musl-glob-util-filter-out-.-and-.-even-if-GLOB_ALTDI.patch deleted file mode 100644 index de2b0a251f02..000000000000 --- a/pkgs/os-specific/linux/systemd/musl/0028-musl-glob-util-filter-out-.-and-.-even-if-GLOB_ALTDI.patch +++ /dev/null @@ -1,205 +0,0 @@ -From d59cd7edd78901db8fd88c86258f6830e35e91df Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Mon, 25 Feb 2019 14:56:21 +0800 -Subject: [PATCH 28/30] musl: glob-util: filter out . and .. even if - GLOB_ALTDIRFUNC is not supported - -musl neither support GLOB_ALTDIRFUNC nor GLOB_BRACE. -Let's make safe_glob() work even when GLOB_ALTDIRFUNC is not supported. -Currently, GLOB_BRACE is simply ignored when it is not supported. ---- - src/basic/glob-util.c | 75 +++++++++++++++++++++++++++++++++++++-- - src/basic/glob-util.h | 9 ++++- - src/include/musl/glob.h | 21 +++++++++++ - src/test/test-glob-util.c | 10 ++++++ - 4 files changed, 112 insertions(+), 3 deletions(-) - create mode 100644 src/include/musl/glob.h - -diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c -index 5843ef088f..84b369be87 100644 ---- a/src/basic/glob-util.c -+++ b/src/basic/glob-util.c -@@ -9,9 +9,42 @@ - #include "string-util.h" - #include "strv.h" - -+static bool safe_glob_verify(const char *p, const char *prefix) { -+ if (isempty(p)) -+ return false; /* should not happen, but for safey. */ -+ -+ if (prefix) { -+ /* Skip the prefix, as we allow dots in prefix. -+ * Note, glob() does not normalize paths, hence do not use path_startswith(). */ -+ p = startswith(p, prefix); -+ if (!p) -+ return false; /* should not happen, but for safety. */ -+ } -+ -+ for (;;) { -+ p += strspn(p, "/"); -+ if (*p == '\0') -+ return true; -+ if (*p == '.') { -+ p++; -+ if (IN_SET(*p, '/', '\0')) -+ return false; /* refuse dot */ -+ if (*p == '.') { -+ p++; -+ if (IN_SET(*p, '/', '\0')) -+ return false; /* refuse dot dot */ -+ } -+ } -+ -+ p += strcspn(p, "/"); -+ if (*p == '\0') -+ return true; -+ } -+} -+ - DEFINE_TRIVIAL_DESTRUCTOR(closedir_wrapper, void, closedir); - --int safe_glob_full(const char *path, int flags, opendir_t opendir_func, char ***ret) { -+int safe_glob_internal(const char *path, int flags, bool use_gnu_extension, opendir_t opendir_func, char ***ret) { - _cleanup_(globfree) glob_t g = { - .gl_closedir = closedir_wrapper, - .gl_readdir = (struct dirent* (*)(void *)) readdir_no_dot, -@@ -23,8 +56,16 @@ int safe_glob_full(const char *path, int flags, opendir_t opendir_func, char *** - - assert(path); - -+ // TODO: expand braces if GLOB_BRACE is specified but not supported. -+ -+#if GLOB_ALTDIRFUNC == 0 -+ use_gnu_extension = false; -+#else -+ SET_FLAG(flags, GLOB_ALTDIRFUNC, use_gnu_extension); -+#endif -+ - errno = 0; -- r = glob(path, flags | GLOB_ALTDIRFUNC, NULL, &g); -+ r = glob(path, flags, NULL, &g); - if (r == GLOB_NOMATCH) - return -ENOENT; - if (r == GLOB_NOSPACE) -@@ -32,6 +73,36 @@ int safe_glob_full(const char *path, int flags, opendir_t opendir_func, char *** - if (r != 0) - return errno_or_else(EIO); - -+ if (!use_gnu_extension) { -+ _cleanup_free_ char *prefix = NULL; -+ r = glob_non_glob_prefix(path, &prefix); -+ if (r < 0 && r != -ENOENT) -+ return r; -+ -+ _cleanup_strv_free_ char **filtered = NULL; -+ size_t n_filtered = 0; -+ STRV_FOREACH(p, g.gl_pathv) { -+ if (!safe_glob_verify(*p, prefix)) -+ continue; -+ -+ if (!ret) -+ return 0; /* Found at least one entry, let's return earlier. */ -+ -+ /* When musl is used, each entry is not a head of allocated memory. Hence, it is -+ * necessary to copy the string. */ -+ r = strv_extend_with_size(&filtered, &n_filtered, *p); -+ if (r < 0) -+ return r; -+ } -+ -+ if (n_filtered == 0) -+ return -ENOENT; -+ -+ assert(ret); -+ *ret = TAKE_PTR(filtered); -+ return 0; -+ } -+ - if (strv_isempty(g.gl_pathv)) - return -ENOENT; - -diff --git a/src/basic/glob-util.h b/src/basic/glob-util.h -index ea3e869319..36bfd6716c 100644 ---- a/src/basic/glob-util.h -+++ b/src/basic/glob-util.h -@@ -7,7 +7,14 @@ - - typedef DIR* (*opendir_t)(const char *); - --int safe_glob_full(const char *path, int flags, opendir_t opendir_func, char ***ret); -+int safe_glob_internal(const char *path, int flags, bool use_gnu_extension, opendir_t opendir_func, char ***ret); -+static inline int safe_glob_test(const char *path, int flags, char ***ret) { -+ /* This is for testing the fallback logic for the case GLOB_ALTDIRFUNC is not supported. */ -+ return safe_glob_internal(path, flags, false, NULL, ret); -+} -+static inline int safe_glob_full(const char *path, int flags, opendir_t opendir_func, char ***ret) { -+ return safe_glob_internal(path, flags, true, opendir_func, ret); -+} - static inline int safe_glob(const char *path, int flags, char ***ret) { - return safe_glob_full(path, flags, NULL, ret); - } -diff --git a/src/include/musl/glob.h b/src/include/musl/glob.h -new file mode 100644 -index 0000000000..58e6c50678 ---- /dev/null -+++ b/src/include/musl/glob.h -@@ -0,0 +1,21 @@ -+/* SPDX-License-Identifier: LGPL-2.1-or-later */ -+#pragma once -+ -+#include_next -+ -+/* Here, we set 0 to GLOB_ALTDIRFUNC and GLOB_BRACE, rather than the values used by glibc, -+ * to indicate that glob() does not support these flags. */ -+ -+#ifndef GLOB_ALTDIRFUNC -+#define GLOB_ALTDIRFUNC 0 -+#define gl_flags __dummy1 -+#define gl_closedir __dummy2[0] -+#define gl_readdir __dummy2[1] -+#define gl_opendir __dummy2[2] -+#define gl_lstat __dummy2[3] -+#define gl_stat __dummy2[4] -+#endif -+ -+#ifndef GLOB_BRACE -+#define GLOB_BRACE 0 -+#endif -diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c -index a9880f15c8..730961d172 100644 ---- a/src/test/test-glob-util.c -+++ b/src/test/test-glob-util.c -@@ -61,20 +61,30 @@ TEST(safe_glob) { - - fn = strjoina(template, "/*"); - ASSERT_ERROR(safe_glob(fn, /* flags = */ 0, &v), ENOENT); -+ ASSERT_ERROR(safe_glob_test(fn, /* flags = */ 0, &v), ENOENT); - - fn2 = strjoina(template, "/.*"); - ASSERT_ERROR(safe_glob(fn2, GLOB_NOSORT|GLOB_BRACE, &v), ENOENT); -+ ASSERT_ERROR(safe_glob_test(fn2, GLOB_NOSORT|GLOB_BRACE, &v), ENOENT); - - fname = strjoina(template, "/.foobar"); - ASSERT_OK(touch(fname)); - - ASSERT_ERROR(safe_glob(fn, /* flags = */ 0, &v), ENOENT); -+ ASSERT_ERROR(safe_glob_test(fn, /* flags = */ 0, &v), ENOENT); - - ASSERT_OK(safe_glob(fn2, GLOB_NOSORT|GLOB_BRACE, &v)); - ASSERT_EQ(strv_length(v), 1u); - ASSERT_STREQ(v[0], fname); - ASSERT_NULL(v[1]); - -+ v = strv_free(v); -+ -+ ASSERT_OK(safe_glob_test(fn2, GLOB_NOSORT|GLOB_BRACE, &v)); -+ ASSERT_EQ(strv_length(v), 1u); -+ ASSERT_STREQ(v[0], fname); -+ ASSERT_NULL(v[1]); -+ - (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL); - } - --- -2.51.0 - diff --git a/pkgs/os-specific/linux/systemd/musl/0029-musl-test-several-random-fixlets-for-unit-tests.patch b/pkgs/os-specific/linux/systemd/musl/0029-musl-test-several-random-fixlets-for-unit-tests.patch deleted file mode 100644 index 4e8fa289dd41..000000000000 --- a/pkgs/os-specific/linux/systemd/musl/0029-musl-test-several-random-fixlets-for-unit-tests.patch +++ /dev/null @@ -1,380 +0,0 @@ -From 2c3c84939b930986b31bc0f28e9a08bf43786255 Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Tue, 9 Sep 2025 13:34:31 +0900 -Subject: [PATCH 29/30] musl: test: several random fixlets for unit tests - ---- - src/boot/test-efi-string.c | 36 ++++++++++++++++++++------ - src/libsystemd/sd-bus/test-bus-error.c | 6 +++++ - src/test/meson.build | 1 + - src/test/test-errno-util.c | 12 ++++++++- - src/test/test-fileio.c | 10 ++++++- - src/test/test-locale-util.c | 7 ++++- - src/test/test-os-util.c | 6 ++++- - src/test/test-seccomp.c | 8 ++++-- - src/test/test-time-util.c | 24 +++++++++++++++++ - test/meson.build | 2 ++ - test/test-sysusers.sh.in | 22 +++++++++++++++- - 11 files changed, 119 insertions(+), 15 deletions(-) - -diff --git a/src/boot/test-efi-string.c b/src/boot/test-efi-string.c -index e0d3bd9b71..af6dd1fb64 100644 ---- a/src/boot/test-efi-string.c -+++ b/src/boot/test-efi-string.c -@@ -410,13 +410,27 @@ TEST(startswith8) { - ASSERT_NULL(startswith8(NULL, "")); - } - --#define TEST_FNMATCH_ONE(pattern, haystack, expect) \ -- ({ \ -- ASSERT_EQ(fnmatch(pattern, haystack, 0), expect ? 0 : FNM_NOMATCH); \ -- ASSERT_EQ(efi_fnmatch(u##pattern, u##haystack), expect); \ -+#define TEST_FNMATCH_ONE_FULL(pattern, haystack, expect, skip_libc) \ -+ ({ \ -+ if (!skip_libc) \ -+ ASSERT_EQ(fnmatch(pattern, haystack, 0), expect ? 0 : FNM_NOMATCH); \ -+ ASSERT_EQ(efi_fnmatch(u##pattern, u##haystack), expect); \ - }) - -+#define TEST_FNMATCH_ONE(pattern, haystack, expect) \ -+ TEST_FNMATCH_ONE_FULL(pattern, haystack, expect, false) -+ - TEST(efi_fnmatch) { -+ bool skip_libc; -+ -+#ifdef __GLIBC__ -+ skip_libc = false; -+#else -+ /* It seems musl is too strict in handling "[]" (or has a bug?). Anyway, let's skip some test cases -+ * when built with musl. The behavior of efi_fnmatch() does not need to match musl's fnmatch(). */ -+ skip_libc = true; -+#endif -+ - TEST_FNMATCH_ONE("", "", true); - TEST_FNMATCH_ONE("abc", "abc", true); - TEST_FNMATCH_ONE("aBc", "abc", false); -@@ -447,18 +461,18 @@ TEST(efi_fnmatch) { - TEST_FNMATCH_ONE("[abc", "a", false); - TEST_FNMATCH_ONE("[][!] [][!] [][!]", "[ ] !", true); - TEST_FNMATCH_ONE("[]-] []-]", "] -", true); -- TEST_FNMATCH_ONE("[1\\]] [1\\]]", "1 ]", true); -+ TEST_FNMATCH_ONE_FULL("[1\\]] [1\\]]", "1 ]", true, skip_libc); - TEST_FNMATCH_ONE("[$-\\+]", "&", true); - TEST_FNMATCH_ONE("[1-3A-C] [1-3A-C]", "2 B", true); - TEST_FNMATCH_ONE("[3-5] [3-5] [3-5]", "3 4 5", true); - TEST_FNMATCH_ONE("[f-h] [f-h] [f-h]", "f g h", true); -- TEST_FNMATCH_ONE("[a-c-f] [a-c-f] [a-c-f] [a-c-f] [a-c-f]", "a b c - f", true); -- TEST_FNMATCH_ONE("[a-c-f]", "e", false); -+ TEST_FNMATCH_ONE_FULL("[a-c-f] [a-c-f] [a-c-f] [a-c-f] [a-c-f]", "a b c - f", true, skip_libc); -+ TEST_FNMATCH_ONE_FULL("[a-c-f]", "e", false, skip_libc); - TEST_FNMATCH_ONE("[--0] [--0] [--0]", "- . 0", true); - TEST_FNMATCH_ONE("[+--] [+--] [+--]", "+ , -", true); - TEST_FNMATCH_ONE("[f-l]", "m", false); - TEST_FNMATCH_ONE("[b]", "z-a", false); -- TEST_FNMATCH_ONE("[a\\-z]", "b", false); -+ TEST_FNMATCH_ONE_FULL("[a\\-z]", "b", false, skip_libc); - TEST_FNMATCH_ONE("?a*b[.-0]c", "/a/b/c", true); - TEST_FNMATCH_ONE("debian-*-*-*.*", "debian-jessie-2018-06-17-kernel-image-5.10.0-16-amd64.efi", true); - -@@ -674,8 +688,14 @@ TEST(xvasprintf_status) { - test_printf_one("string"); - test_printf_one("%%-%%%%"); - -+#ifdef __GLIBC__ - test_printf_one("%p %p %32p %*p %*p", NULL, (void *) 0xF, &errno, 0, &saved_argc, 20, &saved_argv); - test_printf_one("%-10p %-32p %-*p %-*p", NULL, &errno, 0, &saved_argc, 20, &saved_argv); -+#else -+ /* musl prints NULL as 0, while glibc and our implementation print it as (nil). */ -+ test_printf_one("%p %32p %*p %*p", (void *) 0xF, &errno, 0, &saved_argc, 20, &saved_argv); -+ test_printf_one("%-32p %-*p %-*p", &errno, 0, &saved_argc, 20, &saved_argv); -+#endif - - test_printf_one("%c %3c %*c %*c %-8c", '1', '!', 0, 'a', 9, '_', '>'); - -diff --git a/src/libsystemd/sd-bus/test-bus-error.c b/src/libsystemd/sd-bus/test-bus-error.c -index c6b86be621..d69eb984dc 100644 ---- a/src/libsystemd/sd-bus/test-bus-error.c -+++ b/src/libsystemd/sd-bus/test-bus-error.c -@@ -232,7 +232,13 @@ TEST(sd_bus_error_set_errnof) { - errno = EACCES; - assert_se(asprintf(&str, "%m") >= 0); - assert_se(streq(error.message, str)); -+#ifdef __GLIBC__ - assert_se(error._need_free == 0); -+#else -+ /* musl's strerror_l() always writes error message in the given buffer, hence the we need to -+ * free it. */ -+ assert_se(error._need_free == 1); -+#endif - - str = mfree(str); - sd_bus_error_free(&error); -diff --git a/src/test/meson.build b/src/test/meson.build -index 1dd61effc0..4bdfc65f04 100644 ---- a/src/test/meson.build -+++ b/src/test/meson.build -@@ -16,6 +16,7 @@ test_env = { - 'PROJECT_BUILD_ROOT' : meson.project_build_root(), - 'SYSTEMD_SLOW_TESTS' : want_slow_tests ? '1' : '0', - 'PYTHONDONTWRITEBYTECODE' : '1', -+ 'SYSTEMD_LIBC' : get_option('libc'), - } - if conf.get('ENABLE_LOCALED') == 1 - test_env += {'SYSTEMD_LANGUAGE_FALLBACK_MAP' : language_fallback_map} -diff --git a/src/test/test-errno-util.c b/src/test/test-errno-util.c -index 1a0154fb05..1ad067b2c7 100644 ---- a/src/test/test-errno-util.c -+++ b/src/test/test-errno-util.c -@@ -26,18 +26,28 @@ TEST(STRERROR) { - log_info("STRERROR(%d), STRERROR(%d) → %s, %s", 200, 201, STRERROR(200), STRERROR(201)); - - const char *a = STRERROR(200), *b = STRERROR(201); -+#ifdef __GLIBC__ - ASSERT_NOT_NULL(strstr(a, "200")); - ASSERT_NOT_NULL(strstr(b, "201")); -+#else -+ /* musl provides catch all error message for unknown error number. */ -+ ASSERT_STREQ(a, "No error information"); -+ ASSERT_STREQ(b, "No error information"); -+#endif - - /* Check with negative values */ - ASSERT_STREQ(a, STRERROR(-200)); - ASSERT_STREQ(b, STRERROR(-201)); - - const char *c = STRERROR(INT_MAX); -+ log_info("STRERROR(%d) → %s", INT_MAX, c); -+#ifdef __GLIBC__ - char buf[DECIMAL_STR_MAX(int)]; - xsprintf(buf, "%d", INT_MAX); /* INT_MAX is hexadecimal, use printf to convert to decimal */ -- log_info("STRERROR(%d) → %s", INT_MAX, c); - ASSERT_NOT_NULL(strstr(c, buf)); -+#else -+ ASSERT_STREQ(c, "No error information"); -+#endif - } - - TEST(STRERROR_OR_ELSE) { -diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c -index e0ae30bbb9..ad572056c2 100644 ---- a/src/test/test-fileio.c -+++ b/src/test/test-fileio.c -@@ -400,7 +400,15 @@ TEST(write_string_stream) { - - f = fdopen(fd, "r"); - assert_se(f); -- assert_se(write_string_stream(f, "boohoo", 0) < 0); -+#ifdef __GLIBC__ -+ ASSERT_ERROR(write_string_stream(f, "boohoo", 0), EBADF); -+#else -+ /* Even the file is opened with the read-only mode, fputs() and fputc() by musl succeed but nothing -+ * actually written, thus write_string_stream() also succeeds. */ -+ ASSERT_OK(write_string_stream(f, "boohoo", 0)); -+ rewind(f); -+ ASSERT_NULL(fgets(buf, sizeof(buf), f)); -+#endif - f = safe_fclose(f); - - f = fopen(fn, "r+"); -diff --git a/src/test/test-locale-util.c b/src/test/test-locale-util.c -index e264cff5dd..faa7ac4211 100644 ---- a/src/test/test-locale-util.c -+++ b/src/test/test-locale-util.c -@@ -50,7 +50,12 @@ TEST(locale_is_installed) { - assert_se(locale_is_installed("\x01gar\x02 bage\x03") == 0); - - /* Definitely not installed */ -- assert_se(locale_is_installed("zz_ZZ") == 0); -+#ifdef __GLIBC__ -+ ASSERT_OK_ZERO(locale_is_installed("zz_ZZ")); -+#else -+ /* musl seems to return a non-null locale object even if it is not installed. */ -+ ASSERT_OK_POSITIVE(locale_is_installed("zz_ZZ")); -+#endif - } - - TEST(keymaps) { -diff --git a/src/test/test-os-util.c b/src/test/test-os-util.c -index fcab1139c2..902062560f 100644 ---- a/src/test/test-os-util.c -+++ b/src/test/test-os-util.c -@@ -127,7 +127,11 @@ TEST(os_release_support_ended) { - - ASSERT_TRUE(os_release_support_ended("1999-01-01", false, NULL)); - ASSERT_FALSE(os_release_support_ended("2037-12-31", false, NULL)); -- assert_se(os_release_support_ended("-1-1-1", true, NULL) == -EINVAL); -+#ifdef __GLIBC__ -+ ASSERT_ERROR(os_release_support_ended("-1-1-1", true, NULL), EINVAL); -+#else -+ ASSERT_ERROR(os_release_support_ended("-1-1-1", true, NULL), ERANGE); -+#endif - - r = os_release_support_ended(NULL, false, NULL); - if (r < 0) -diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c -index 13c65a93cd..a9953b2c98 100644 ---- a/src/test/test-seccomp.c -+++ b/src/test/test-seccomp.c -@@ -553,9 +553,13 @@ TEST(memory_deny_write_execute_mmap) { - assert_se(seccomp_memory_deny_write_execute() >= 0); - - p = mmap(NULL, page_size(), PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0); --#if defined(__x86_64__) || defined(__i386__) || defined(__powerpc64__) || defined(__arm__) || defined(__aarch64__) || defined(__loongarch_lp64) -+#if defined(__x86_64__) || defined(__i386__) || defined(__powerpc64__) || defined(__arm__) || defined(__aarch64__) || defined(__loongarch_lp64) || !defined(__GLIBC__) - assert_se(p == MAP_FAILED); -- assert_se(errno == EPERM); -+# ifdef __GLIBC__ -+ ASSERT_EQ(errno, EPERM); -+# else -+ ASSERT_EQ(errno, ENOMEM); -+# endif - #endif - /* Depending on kernel, libseccomp, and glibc versions, other architectures - * might fail or not. Let's not assert success. */ -diff --git a/src/test/test-time-util.c b/src/test/test-time-util.c -index 7569f89ca0..203f8a148d 100644 ---- a/src/test/test-time-util.c -+++ b/src/test/test-time-util.c -@@ -406,6 +406,25 @@ static void test_format_timestamp_impl(usec_t x) { - const char *xx = FORMAT_TIMESTAMP(x); - ASSERT_NOT_NULL(xx); - -+#ifndef __GLIBC__ -+ /* Because of the timezone change, format_timestamp() may set timezone that is currently unused. -+ * E.g. Africa/Juba may set EAT, but currently it uses CAT/CAST. */ -+ const char *space; -+ ASSERT_NOT_NULL(space = strrchr(xx, ' ')); -+ const char *tz = space + 1; -+ if (!streq_ptr(tz, tzname[0]) && -+ !streq_ptr(tz, tzname[1]) && -+ parse_gmtoff(tz, NULL) < 0) { -+ -+ log_warning("@" USEC_FMT " → %s, timezone '%s' is currently unused, ignoring.", x, xx, tz); -+ -+ /* Verify the generated string except for the timezone part. Of course, in most cases, parsed -+ * time does not match with the input, hence only check if it is parsable. */ -+ ASSERT_OK(parse_timestamp(strndupa_safe(xx, space - xx), NULL)); -+ return; -+ } -+#endif -+ - usec_t y; - ASSERT_OK(parse_timestamp(xx, &y)); - const char *yy = FORMAT_TIMESTAMP(y); -@@ -1116,7 +1135,12 @@ TEST(in_utc_timezone) { - assert_se(setenv("TZ", ":UTC", 1) >= 0); - assert_se(in_utc_timezone()); - ASSERT_STREQ(tzname[0], "UTC"); -+#ifdef __GLIBC__ - ASSERT_STREQ(tzname[1], "UTC"); -+#else -+ /* musl sets an empty string to tzname[1] when DST is not used by the timezone. */ -+ ASSERT_STREQ(tzname[1], ""); -+#endif - assert_se(timezone == 0); - assert_se(daylight == 0); - -diff --git a/test/meson.build b/test/meson.build -index 505a14aa81..1f1ec0a0e1 100644 ---- a/test/meson.build -+++ b/test/meson.build -@@ -13,6 +13,7 @@ if conf.get('ENABLE_SYSUSERS') == 1 - # https://github.com/mesonbuild/meson/issues/2681 - args : exe.full_path(), - depends : exe, -+ env : test_env, - suite : 'sysusers') - - if have_standalone_binaries -@@ -22,6 +23,7 @@ if conf.get('ENABLE_SYSUSERS') == 1 - # https://github.com/mesonbuild/meson/issues/2681 - args : exe.full_path(), - depends : exe, -+ env : test_env, - suite : 'sysusers') - endif - endif -diff --git a/test/test-sysusers.sh.in b/test/test-sysusers.sh.in -index 3218923590..ae7bfee2fe 100755 ---- a/test/test-sysusers.sh.in -+++ b/test/test-sysusers.sh.in -@@ -13,6 +13,12 @@ TESTDIR=$(mktemp --tmpdir --directory "test-sysusers.XXXXXXXXXX") - # shellcheck disable=SC2064 - trap "rm -rf '$TESTDIR'" EXIT INT QUIT PIPE - -+skip_nis() { -+ # musl seems to not support NIS entries. Let's skip the test case for NIS entries. -+ local path=${1:?} -+ [[ "${SYSTEMD_LIBC:-}" == musl && "${path##*/}" == "test-11.input" ]] -+} -+ - prepare_testdir() { - mkdir -p "$TESTDIR/etc/sysusers.d/" - mkdir -p "$TESTDIR/usr/lib/sysusers.d/" -@@ -50,6 +56,7 @@ rm -f "$TESTDIR"/etc/sysusers.d/* "$TESTDIR"/usr/lib/sysusers.d/* - - # happy tests - for f in $(find "$SOURCE"/test-*.input | sort -V); do -+ skip_nis "$f" && continue - echo "*** Running $f" - prepare_testdir "${f%.input}" - cp "$f" "$TESTDIR/usr/lib/sysusers.d/test.conf" -@@ -59,6 +66,7 @@ for f in $(find "$SOURCE"/test-*.input | sort -V); do - done - - for f in $(find "$SOURCE"/test-*.input | sort -V); do -+ skip_nis "$f" && continue - echo "*** Running $f on stdin" - prepare_testdir "${f%.input}" - touch "$TESTDIR/etc/sysusers.d/test.conf" -@@ -68,6 +76,7 @@ for f in $(find "$SOURCE"/test-*.input | sort -V); do - done - - for f in $(find "$SOURCE"/test-*.input | sort -V); do -+ skip_nis "$f" && continue - echo "*** Running $f on stdin with --replace" - prepare_testdir "${f%.input}" - touch "$TESTDIR/etc/sysusers.d/test.conf" -@@ -133,6 +142,7 @@ SYS_GID_MAX999 - EOF - - for f in $(find "$SOURCE"/test-*.input | sort -V); do -+ skip_nis "$f" && continue - echo "*** Running $f (with login.defs)" - prepare_testdir "${f%.input}" - cp "$f" "$TESTDIR/usr/lib/sysusers.d/test.conf" -@@ -149,6 +159,7 @@ mv "$TESTDIR/etc/login.defs" "$TESTDIR/etc/login.defs.moved" - ln -s ../../../../../etc/login.defs.moved "$TESTDIR/etc/login.defs" - - for f in $(find "$SOURCE"/test-*.input | sort -V); do -+ skip_nis "$f" && continue - echo "*** Running $f (with login.defs symlinked)" - prepare_testdir "${f%.input}" - cp "$f" "$TESTDIR/usr/lib/sysusers.d/test.conf" -@@ -161,13 +172,22 @@ done - - rm -f "$TESTDIR"/etc/sysusers.d/* "$TESTDIR"/usr/lib/sysusers.d/* - -+preprocess_error() { -+ # Convert error message for ERANGE from glibc to musl. -+ if [[ "${SYSTEMD_LIBC:-}" == musl ]]; then -+ sed -e 's/Numerical result out of range/Result not representable/' "${1:?}" -+ else -+ cat "${1:?}" -+ fi -+} -+ - # tests for error conditions - for f in $(find "$SOURCE"/unhappy-*.input | sort -V); do - echo "*** Running test $f" - prepare_testdir "${f%.input}" - cp "$f" "$TESTDIR/usr/lib/sysusers.d/test.conf" - SYSTEMD_LOG_LEVEL=info "$SYSUSERS" --root="$TESTDIR" 2>&1 | tail -n1 | sed -r 's/^[^:]+:[^:]+://' >"$TESTDIR/err" -- if ! diff -u "$TESTDIR/err" "${f%.*}.expected-err" >&2; then -+ if ! diff -u "$TESTDIR/err" <(preprocess_error "${f%.*}.expected-err") >&2; then - echo >&2 "**** Unexpected error output for $f" - cat >&2 "$TESTDIR/err" - exit 1 --- -2.51.0 - diff --git a/pkgs/os-specific/linux/systemd/musl/0030-musl-ci-add-build-test-and-unit-tests.patch b/pkgs/os-specific/linux/systemd/musl/0030-musl-ci-add-build-test-and-unit-tests.patch deleted file mode 100644 index 51eec7e78ac3..000000000000 --- a/pkgs/os-specific/linux/systemd/musl/0030-musl-ci-add-build-test-and-unit-tests.patch +++ /dev/null @@ -1,352 +0,0 @@ -From b9a6cd49a4d4c6a40968224f5aac20586273b171 Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Tue, 9 Sep 2025 13:42:24 +0900 -Subject: [PATCH 30/30] musl: ci: add build test and unit tests - ---- - .github/workflows/build-test-musl.sh | 125 ++++++++++++++++++++++++++ - .github/workflows/linter.yml | 9 ++ - .github/workflows/unit-tests-musl.sh | 55 ++++++++++++ - .github/workflows/unit-tests-musl.yml | 112 +++++++++++++++++++++++ - 4 files changed, 301 insertions(+) - create mode 100755 .github/workflows/build-test-musl.sh - create mode 100755 .github/workflows/unit-tests-musl.sh - create mode 100644 .github/workflows/unit-tests-musl.yml - -diff --git a/.github/workflows/build-test-musl.sh b/.github/workflows/build-test-musl.sh -new file mode 100755 -index 0000000000..bc38924666 ---- /dev/null -+++ b/.github/workflows/build-test-musl.sh -@@ -0,0 +1,125 @@ -+#!/bin/bash -+# SPDX-License-Identifier: LGPL-2.1-or-later -+ -+set -eux -+ -+if ! command -v musl-gcc 2>/dev/null; then -+ echo "musl-gcc is not installed, skipping the test." -+ exit 0 -+fi -+ -+. /etc/os-release -+ -+TMPDIR=$(mktemp -d) -+ -+cleanup() ( -+ set +e -+ -+ if [[ -d "$TMPDIR" ]]; then -+ rm -rf "$TMPDIR" -+ fi -+) -+ -+trap cleanup EXIT ERR INT TERM -+ -+mkdir -p "${TMPDIR}/build" -+mkdir -p "${TMPDIR}/include" -+ -+CFLAGS="-idirafter ${TMPDIR}/include" -+ -+LINKS=( -+ acl -+ archive.h -+ archive_entry.h -+ asm-generic -+ audit-records.h -+ audit_logging.h -+ bpf -+ bzlib.h -+ dwarf.h -+ elfutils -+ fido.h -+ gcrypt.h -+ gelf.h -+ gnutls -+ idn2.h -+ libaudit.h -+ libcryptsetup.h -+ libelf.h -+ libkmod.h -+ lz4.h -+ lz4frame.h -+ lz4hc.h -+ lzma -+ lzma.h -+ microhttpd.h -+ mtd -+ openssl -+ pcre2.h -+ pwquality.h -+ qrencode.h -+ seccomp-syscalls.h -+ seccomp.h -+ security -+ sys/acl.h -+ sys/capability.h -+ tss2 -+ xen -+ xkbcommon -+ zconf.h -+ zlib.h -+ zstd.h -+ zstd_errors.h -+) -+ -+if [[ "$ID" == arch ]]; then -+ LINKS+=( -+ asm -+ curl -+ gpg-error.h -+ libiptc -+ linux -+ ) -+elif [[ "$ID" == centos ]]; then -+ LINKS+=( -+ asm -+ curl -+ gpg-error.h -+ linux -+ selinux -+ ) -+elif [[ "$ID" == fedora ]]; then -+ LINKS+=( -+ asm -+ curl -+ gpg-error.h -+ libiptc -+ linux -+ selinux -+ ) -+elif [[ "$ID" == debian ]] || [[ "$ID" == ubuntu ]]; then -+ # Currently, debian/ubuntu does not provide crypt.h for musl. Hence, this does not work. -+ -+ CFLAGS="$CFLAGS -idirafter /usr/include/$(uname -m)-linux-gnu" -+ -+ LINKS+=( -+ linux -+ selinux -+ sys/apparmor.h -+ ) -+fi -+ -+for t in "${LINKS[@]}"; do -+ [[ -e "/usr/include/$t" ]] -+ link="${TMPDIR}/include/${t}" -+ mkdir -p "${link%/*}" -+ ln -s "/usr/include/$t" "$link" -+done -+ -+env CC=musl-gcc \ -+ CXX=musl-gcc \ -+ CFLAGS="$CFLAGS" \ -+ CXXFLAGS="$CFLAGS" \ -+ meson setup --werror -Ddbus-interfaces-dir=no -Dlibc=musl "${TMPDIR}/build" -+ -+ninja -v -C "${TMPDIR}/build" -diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml -index c107b2da1e..b92a00478c 100644 ---- a/.github/workflows/linter.yml -+++ b/.github/workflows/linter.yml -@@ -49,6 +49,12 @@ jobs: - [Build] - ToolsTreeDistribution=fedora - ToolsTreeRelease=rawhide -+ -+ [Content] -+ Packages= -+ libgcrypt-devel -+ libgpg-error-devel -+ musl-gcc - EOF - - mkosi -f box -- true -@@ -77,3 +83,6 @@ jobs: - - - name: Run clang-tidy - run: mkosi box -- meson test -C build --suite=clang-tidy --print-errorlogs --no-stdsplit -+ -+ - name: Build with musl -+ run: mkosi box -- .github/workflows/build-test-musl.sh -diff --git a/.github/workflows/unit-tests-musl.sh b/.github/workflows/unit-tests-musl.sh -new file mode 100755 -index 0000000000..f6e2b2f536 ---- /dev/null -+++ b/.github/workflows/unit-tests-musl.sh -@@ -0,0 +1,55 @@ -+#!/usr/bin/env bash -+# SPDX-License-Identifier: LGPL-2.1-or-later -+ -+# shellcheck disable=SC2206 -+PHASES=(${@:-SETUP BUILD RUN CLEANUP}) -+ -+function info() { -+ echo -e "\033[33;1m$1\033[0m" -+} -+function run_meson() { -+ if ! meson "$@"; then -+ find . -type f -name meson-log.txt -exec cat '{}' + -+ return 1 -+ fi -+} -+ -+set -ex -+ -+for phase in "${PHASES[@]}"; do -+ case $phase in -+ SETUP) -+ info "Setup phase" -+ # Alpine still uses split-usr. -+ for i in /bin/* /sbin/*; do -+ ln -rs "$i" "/usr/$i"; -+ done -+ ;; -+ BUILD) -+ info "Build phase" -+ run_meson setup --werror -Dtests=unsafe -Dslow-tests=true -Dfuzz-tests=true -Dlibc=musl build -+ ninja -C build -v -+ ;; -+ RUN) -+ info "Run phase" -+ # Create dummy machine ID. -+ echo '052e58f661f94bd080e258b96aea3f7b' > /etc/machine-id -+ -+ # Start dbus for several unit tests. -+ mkdir -p /var/run/dbus -+ /usr/bin/dbus-daemon --system || : -+ -+ # Here, we explicitly set SYSTEMD_IN_CHROOT=yes as unfortunately runnin_in_chroot() does not -+ # correctly detect the environment. -+ env \ -+ SYSTEMD_IN_CHROOT=yes \ -+ meson test -C build -v -+ ;; -+ CLEANUP) -+ info "Cleanup phase" -+ ;; -+ *) -+ echo >&2 "Unknown phase '$phase'" -+ exit 1 -+ esac -+done -diff --git a/.github/workflows/unit-tests-musl.yml b/.github/workflows/unit-tests-musl.yml -new file mode 100644 -index 0000000000..e30974254c ---- /dev/null -+++ b/.github/workflows/unit-tests-musl.yml -@@ -0,0 +1,112 @@ -+--- -+# vi: ts=2 sw=2 et: -+# SPDX-License-Identifier: LGPL-2.1-or-later -+# -+name: Unit tests (musl) -+on: -+ pull_request: -+ paths: -+ - '**/meson.build' -+ - '.github/workflows/**' -+ - 'meson_options.txt' -+ - 'src/**' -+ - 'test/fuzz/**' -+ -+permissions: -+ contents: read -+ -+jobs: -+ build: -+ runs-on: ubuntu-latest -+ steps: -+ - name: Repository checkout -+ uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 -+ -+ - name: Install build dependencies -+ uses: jirutka/setup-alpine@v1 -+ with: -+ arch: x86_64 -+ branch: edge -+ packages: > -+ acl -+ acl-dev -+ audit-dev -+ bash -+ bash-completion-dev -+ bpftool -+ build-base -+ bzip2-dev -+ coreutils -+ cryptsetup-dev -+ curl-dev -+ dbus -+ dbus-dev -+ elfutils-dev -+ gettext-dev -+ git -+ glib-dev -+ gnutls-dev -+ gperf -+ grep -+ iproute2 -+ iptables-dev -+ kbd -+ kexec-tools -+ kmod -+ kmod-dev -+ libapparmor-dev -+ libarchive-dev -+ libbpf-dev -+ libcap-dev -+ libcap-utils -+ libfido2-dev -+ libgcrypt-dev -+ libidn2-dev -+ libmicrohttpd-dev -+ libpwquality-dev -+ libqrencode-dev -+ libseccomp-dev -+ libselinux-dev -+ libxkbcommon-dev -+ linux-pam-dev -+ lz4-dev -+ meson -+ openssl -+ openssl-dev -+ p11-kit-dev -+ pcre2-dev -+ pkgconf -+ polkit-dev -+ py3-elftools -+ py3-jinja2 -+ py3-pefile -+ py3-pytest -+ py3-lxml -+ quota-tools -+ rsync -+ sfdisk -+ tpm2-tss-dev -+ tpm2-tss-esys -+ tpm2-tss-rc -+ tpm2-tss-tcti-device -+ tzdata -+ util-linux-dev -+ util-linux-login -+ util-linux-misc -+ valgrind-dev -+ xen-dev -+ zlib-dev -+ zstd-dev -+ -+ - name: Setup -+ run: .github/workflows/unit-tests-musl.sh SETUP -+ shell: alpine.sh --root {0} -+ - name: Build -+ run: .github/workflows/unit-tests-musl.sh BUILD -+ shell: alpine.sh {0} -+ - name: Run -+ run: .github/workflows/unit-tests-musl.sh RUN -+ shell: alpine.sh --root {0} -+ - name: Cleanup -+ run: .github/workflows/unit-tests-musl.sh CLEANUP -+ shell: alpine.sh --root {0} --- -2.51.0 - diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix index be403267f9aa..799c252a684f 100644 --- a/pkgs/os-specific/linux/tp_smapi/default.nix +++ b/pkgs/os-specific/linux/tp_smapi/default.nix @@ -6,7 +6,8 @@ }: stdenv.mkDerivation (finalAttrs: { - name = "tp_smapi-${finalAttrs.version}-${kernel.version}"; + name = "${finalAttrs.pname}-${finalAttrs.version}-${kernel.version}"; + pname = "tp_smapi"; version = "0.45"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/usbip/default.nix b/pkgs/os-specific/linux/usbip/default.nix index 4f03d9377fde..9e5e4f6bfc91 100644 --- a/pkgs/os-specific/linux/usbip/default.nix +++ b/pkgs/os-specific/linux/usbip/default.nix @@ -11,7 +11,8 @@ }: stdenv.mkDerivation { - name = "usbip-${kernel.name}"; + pname = "usbip-${kernel.pname}"; + version = kernel.version; src = kernel.src; diff --git a/pkgs/os-specific/linux/virtio_vmmci/default.nix b/pkgs/os-specific/linux/virtio_vmmci/default.nix index a14808e85403..5d635e95892f 100644 --- a/pkgs/os-specific/linux/virtio_vmmci/default.nix +++ b/pkgs/os-specific/linux/virtio_vmmci/default.nix @@ -6,14 +6,15 @@ kernelModuleMakeFlags, }: -stdenv.mkDerivation rec { - name = "virtio_vmmci"; +stdenv.mkDerivation (finalAttrs: { + name = "${finalAttrs.pname}-${finalAttrs.version}-${kernel.version}"; + pname = "virtio_vmmci"; version = "0.6.2"; src = fetchFromGitHub { owner = "voutilad"; repo = "virtio_vmmci"; - rev = version; + rev = finalAttrs.version; hash = "sha256-h8yu4+vTgpAD+sKa1KnVD+qubiIlkYtG2nmQnXOi/sk="; }; @@ -43,4 +44,4 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; -} +}) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index f3d4ad4637b2..0248e3c6612d 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -4,11 +4,9 @@ callPackage, fetchFromGitHub, fetchPypi, - fetchpatch, python313, replaceVars, ffmpeg-headless, - ffmpeg_7-headless, inetutils, nixosTests, home-assistant, @@ -318,14 +316,6 @@ python.pkgs.buildPythonApplication rec { (replaceVars ./patches/ffmpeg-path.patch { ffmpeg = "${lib.getExe ffmpeg-headless}"; }) - - (fetchpatch { - # pytest 9 renames some snapshots - name = "revert-to-pytest-8.patch"; - url = "https://github.com/home-assistant/core/commit/3f22dbaa2e1a7776185ec443bf26f90e90e55efa.patch"; - revert = true; - hash = "sha256-rHXpmHUNCr+lhYqiOVrCSQTWvWJ+jHNwPJzUeFtDPIw="; - }) ]; postPatch = '' @@ -465,6 +455,10 @@ python.pkgs.buildPythonApplication rec { "tests/test_test_fixtures.py::test_evict_faked_translations" "tests/helpers/test_backup.py::test_async_get_manager" "tests/helpers/test_trigger.py::test_platform_multiple_triggers[sync_action]" + # various failing after python-updates + "tests/helpers/test_entity_platform.py::test_platform_warn_slow_setup" # ValueError: not enough values to unpack (expected 2, got 0) + "tests/helpers/test_entity_component.py::test_set_scan_interval_via_config" # assert 10 == 30.0 + "tests/helpers/test_entity_component.py::test_set_entity_namespace_via_config" # AssertionError: assert [] == ['test_domain...named_device'] ]; preCheck = '' diff --git a/pkgs/servers/sql/postgresql/ext/plv8/package.nix b/pkgs/servers/sql/postgresql/ext/plv8/package.nix index c023eaf8c163..ad7935687f1a 100644 --- a/pkgs/servers/sql/postgresql/ext/plv8/package.nix +++ b/pkgs/servers/sql/postgresql/ext/plv8/package.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, lib, - nodejs_20, + nodejs-slim_20, perl, postgresql, postgresqlBuildExtension, @@ -13,7 +13,7 @@ }: let - libv8 = nodejs_20.libv8; + libv8 = nodejs-slim_20.libv8; in postgresqlBuildExtension (finalAttrs: { pname = "plv8"; diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index c3d68f588251..7f79dffe6fd8 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -43,7 +43,7 @@ fetchPnpmDeps, pnpmConfigHook, svgo, - nodejs_22, + nodejs-slim_22, jq, moreutils, terser, @@ -72,7 +72,7 @@ let gnutar git brotli - nodejs_22 + nodejs-slim_22 # Misc required system utils which @@ -193,9 +193,9 @@ let cd ../.. mkdir -p vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/ - ln -s "${nodejs_22.libv8}/lib/libv8.a" vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/libv8_monolith.a + ln -s "${nodejs-slim_22.libv8}/lib/libv8.a" vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/libv8_monolith.a - ln -s ${nodejs_22.libv8}/include vendor/v8/include + ln -s ${nodejs-slim_22.libv8}/include vendor/v8/include mkdir -p ext/libv8-node echo '--- !ruby/object:Libv8::Node::Location::Vendor {}' >ext/libv8-node/.location.yml @@ -318,7 +318,7 @@ let terser jq moreutils - nodejs_22 + nodejs-slim_22 pnpmConfigHook pnpm_9 ]; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index a63e0c9b074b..385a315f9c87 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -28,6 +28,7 @@ assert crossSystem == localSystem; let inherit (localSystem) system; + llvmVersion = "21"; # This needs to be updated when the default LLVM version is changed. sdkMajorVersion = lib.versions.major localSystem.darwinSdkVersion; commonImpureHostDeps = [ @@ -44,6 +45,15 @@ let # Dependencies in dependency sets should be mutually exclusive. mergeDisjointAttrs = lib.foldl' lib.attrsets.unionOfDisjoint { }; + # Workaround for losing `override` after using `overrideScope` + # https://github.com/NixOS/nixpkgs/issues/447012 + overrideLlvmPackagesScope = + llvmPackages: f: + let + override = args: (llvmPackages.override args).overrideScope f; + in + lib.makeOverridable (lib.mirrorFunctionArgs llvmPackages.override override) { }; + commonPreHook = '' export NIX_ENFORCE_NO_NATIVE=''${NIX_ENFORCE_NO_NATIVE-1} export NIX_ENFORCE_PURITY=''${NIX_ENFORCE_PURITY-1} @@ -90,64 +100,7 @@ let }: let - cc = - if prevStage.llvmPackages.clang-unwrapped == null then - null - else - prevStage.wrapCCWith { - name = "${name}-clang-wrapper"; - - nativeTools = false; - nativeLibc = false; - - expand-response-params = lib.optionalString ( - prevStage.stdenv.hasCC or false && prevStage.stdenv.cc != "/dev/null" - ) prevStage.expand-response-params; - - extraPackages = [ prevStage.llvmPackages.compiler-rt ]; - - extraBuildCommands = - let - inherit (prevStage.llvmPackages) clang-unwrapped compiler-rt; - in - '' - function clangResourceRootIncludePath() { - clangLib="$1/lib/clang" - if (( $(ls "$clangLib" | wc -l) > 1 )); then - echo "Multiple LLVM versions were found at "$clangLib", but there must only be one used when building the stdenv." >&2 - exit 1 - fi - echo "$clangLib/$(ls -1 "$clangLib")/include" - } - - rsrc="$out/resource-root" - mkdir "$rsrc" - ln -s "$(clangResourceRootIncludePath "${lib.getLib clang-unwrapped}")" "$rsrc" - ln -s "${compiler-rt.out}/lib" "$rsrc/lib" - ln -s "${compiler-rt.out}/share" "$rsrc/share" - echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - ''; - - cc = prevStage.llvmPackages.clang-unwrapped; - bintools = prevStage.darwin.binutils; - - isClang = true; - inherit (prevStage) libc; - # TODO: replace with `darwin.libcxx` once the bootstrap tools no longer have libc++. - libcxx = - if - prevStage.darwin.libcxx == null || name == "bootstrap-stage1" || name == "bootstrap-stage-xclang" - then - prevStage.llvmPackages.libcxx - else - prevStage.darwin.libcxx; - - inherit lib; - inherit (prevStage) coreutils gnugrep; - - stdenvNoCC = prevStage.ccWrapperStdenv; - runtimeShell = prevStage.ccWrapperStdenv.shell; - }; + cc = if prevStage.clang == null then null else prevStage.clang; bashNonInteractive = prevStage.bashNonInteractive or bootstrapTools; @@ -304,18 +257,17 @@ let disallowedPackages = prevStage: { inherit (prevStage) binutils-unwrapped curl; }; # LLVM tools packages are staged separately (xclang, stage3) from LLVM libs (xclang). - llvmLibrariesPackages = prevStage: { inherit (prevStage.llvmPackages) compiler-rt libcxx; }; + llvmLibrariesPackages = prevStage: { + inherit (prevStage."llvmPackages_${llvmVersion}") compiler-rt libcxx; + }; llvmLibrariesDarwinDepsNoCC = prevStage: { inherit (prevStage.darwin) libcxx; }; llvmLibrariesDeps = _: { }; llvmToolsPackages = prevStage: { - inherit (prevStage.llvmPackages) - clang-unwrapped + inherit (prevStage."llvmPackages_${llvmVersion}") libclang libllvm lld - llvm - llvm-manpages ; }; @@ -378,9 +330,10 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check sigtool = null; }; - llvmPackages = { - clang-unwrapped = null; + clang = null; + "llvmPackages_${llvmVersion}" = { compiler-rt = null; + libclang = null; libcxx = null; libllvm = null; }; @@ -414,6 +367,16 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check gnugrep = bootstrapTools; pbzx = bootstrapTools; + # Build expand-response-params with an unwrapped clang. This works because the SDK has headers and stubs, + # which is all that’s needed. + expand-response-params = super.expand-response-params.overrideAttrs (old: { + buildPhase = '' + CC=${bootstrapTools}/bin/clang + export SDKROOT=${self.apple-sdk.sdkroot} + '' + + old.buildPhase; + }); + jq = bootstrapTools; cctools = bootstrapTools // { @@ -429,21 +392,9 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check darwin = super.darwin.overrideScope ( selfDarwin: superDarwin: { - binutils = super.wrapBintoolsWith { - name = "bootstrap-stage0-binutils-wrapper"; - - nativeTools = false; - nativeLibc = false; - - expand-response-params = ""; - libc = selfDarwin.libSystem; - - inherit lib; - inherit (self) stdenvNoCC coreutils gnugrep; - runtimeShell = self.stdenvNoCC.shell; - - bintools = selfDarwin.binutils-unwrapped; - }; + # The bootstrap tools provide a libc++ that is definitely compatible with the Clang in the bootstrap tools. + # Otherwise, it is possible for the bootstrap tools Clang to be too old for the system libc++ headers. + inherit (self.llvmPackages) libcxx; binutils-unwrapped = (superDarwin.binutils-unwrapped.override { enableManpages = false; }).overrideAttrs @@ -466,91 +417,95 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check } ); - llvmPackages = - (super.llvmPackages.overrideScope ( - selfLlvmPackages: _: { - libclang = self.stdenv.mkDerivation { - name = "bootstrap-stage0-clang"; - version = "boot"; - outputs = [ - "out" - "lib" + "llvmPackages_${llvmVersion}" = overrideLlvmPackagesScope super."llvmPackages_${llvmVersion}" ( + selfLlvmPackages: _: { + libclang = self.stdenv.mkDerivation { + name = "bootstrap-stage0-clang"; + version = "boot"; + outputs = [ + "out" + "lib" + ]; + buildCommand = '' + mkdir -p $out + ln -s $out $lib + ln -s ${bootstrapTools}/bin $out/bin + ln -s ${bootstrapTools}/include $out + + # The version of clang in the bootstrap tools may be different from the default, but that’s okay. + # Symlink its resource-dir to the default version just to get past the first stage. + if (( $(ls "$clangLib" | wc -l) > 1 )); then + echo "Multiple LLVM versions were found at "$clangLib", but there must only be one used when building the stdenv." >&2 + exit 1 + fi + mkdir -p $out/lib/clang + ln -s ${bootstrapTools}/lib/clang/$(ls -1 ${bootstrapTools}/lib/clang) $out/lib/clang/${llvmVersion} + ''; + passthru = { + isClang = true; + isFromBootstrapFiles = true; + hardeningUnsupportedFlags = [ + "fortify3" + "pacret" + "shadowstack" + "stackclashprotection" + "zerocallusedregs" ]; - buildCommand = '' - mkdir -p $out/lib - ln -s $out $lib - ln -s ${bootstrapTools}/bin $out/bin - ln -s ${bootstrapTools}/lib/clang $out/lib - ln -s ${bootstrapTools}/include $out - ''; - passthru = { - isFromBootstrapFiles = true; - hardeningUnsupportedFlags = [ - "fortify3" - "pacret" - "shadowstack" - "stackclashprotection" - "zerocallusedregs" - ]; - }; }; - libllvm = self.stdenv.mkDerivation { - name = "bootstrap-stage0-llvm"; - outputs = [ - "out" - "lib" - ]; - buildCommand = '' - mkdir -p $out/bin $out/lib - ln -s $out $lib - for tool in ${toString super.darwin.binutils-unwrapped.llvm_cmds}; do - cctoolsTool=''${tool//-/_} - toolsrc="${bootstrapTools}/bin/$cctoolsTool" - if [ -e "$toolsrc" ]; then - ln -s "$toolsrc" $out/bin/llvm-$tool - fi - done - ln -s ${bootstrapTools}/bin/dsymutil $out/bin/dsymutil - ln -s ${bootstrapTools}/bin/llvm-readtapi $out/bin/llvm-readtapi - ln -s ${bootstrapTools}/lib/libLLVM* $out/lib - ''; - passthru.isFromBootstrapFiles = true; + }; + libllvm = self.stdenv.mkDerivation { + name = "bootstrap-stage0-llvm"; + outputs = [ + "out" + "lib" + ]; + buildCommand = '' + mkdir -p $out/bin $out/lib + ln -s $out $lib + for tool in ${toString super.darwin.binutils-unwrapped.llvm_cmds}; do + cctoolsTool=''${tool//-/_} + toolsrc="${bootstrapTools}/bin/$cctoolsTool" + if [ -e "$toolsrc" ]; then + ln -s "$toolsrc" $out/bin/llvm-$tool + fi + done + ln -s ${bootstrapTools}/bin/dsymutil $out/bin/dsymutil + ln -s ${bootstrapTools}/bin/llvm-readtapi $out/bin/llvm-readtapi + ln -s ${bootstrapTools}/lib/libLLVM* $out/lib + ''; + passthru.isFromBootstrapFiles = true; + }; + lld = self.stdenv.mkDerivation { + name = "bootstrap-stage0-lld"; + buildCommand = ""; + passthru = { + isLLVM = true; + isFromBootstrapFiles = true; }; - llvm-manpages = self.llvmPackages.libllvm; - lld = self.stdenv.mkDerivation { - name = "bootstrap-stage0-lld"; - buildCommand = ""; - passthru = { - isLLVM = true; - isFromBootstrapFiles = true; - }; + }; + compiler-rt = self.stdenv.mkDerivation { + name = "bootstrap-stage0-compiler-rt"; + buildCommand = '' + mkdir -p $out/lib $out/share + ln -s ${bootstrapTools}/lib/libclang_rt* $out/lib + ln -s ${bootstrapTools}/lib/darwin $out/lib + ''; + passthru.isFromBootstrapFiles = true; + }; + libcxx = self.stdenv.mkDerivation { + name = "bootstrap-stage0-libcxx"; + buildCommand = '' + mkdir -p $out/lib $out/include + ln -s ${bootstrapTools}/lib/libc++.dylib $out/lib + ln -s ${bootstrapTools}/include/c++ $out/include + ''; + passthru = { + isLLVM = true; + isFromBootstrapFiles = true; }; - compiler-rt = self.stdenv.mkDerivation { - name = "bootstrap-stage0-compiler-rt"; - buildCommand = '' - mkdir -p $out/lib $out/share - ln -s ${bootstrapTools}/lib/libclang_rt* $out/lib - ln -s ${bootstrapTools}/lib/darwin $out/lib - ''; - passthru.isFromBootstrapFiles = true; - }; - libcxx = self.stdenv.mkDerivation { - name = "bootstrap-stage0-libcxx"; - buildCommand = '' - mkdir -p $out/lib $out/include - ln -s ${bootstrapTools}/lib/libc++.dylib $out/lib - ln -s ${bootstrapTools}/include/c++ $out/include - ''; - passthru = { - isLLVM = true; - isFromBootstrapFiles = true; - }; - }; - } - )) - // { - inherit (super.llvmPackages) override; - }; + }; + } + ); }; extraPreHook = '' @@ -657,14 +612,19 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check xar = super.xarMinimal; darwin = super.darwin.overrideScope ( - selfDarwin: superDarwin: { + selfDarwin: superDarwin: + llvmLibrariesDarwinDepsNoCC prevStage + // { + # The bootstrap tools provide a libc++ that is definitely compatible with the Clang in the bootstrap tools. + # Otherwise, it is possible for the bootstrap tools Clang to be too old for the system libc++ headers. + inherit (self.llvmPackages) libcxx; + signingUtils = prevStage.darwin.signingUtils.override { inherit (selfDarwin) sigtool; }; # Rewrap binutils with the real libSystem binutils = superDarwin.binutils.override { - inherit (self) coreutils; + inherit (self) coreutils libc; bintools = selfDarwin.binutils-unwrapped; - libc = selfDarwin.libSystem; }; # Avoid building unnecessary Python dependencies due to building LLVM manpages. @@ -675,13 +635,9 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check } ); - llvmPackages = - (super.llvmPackages.overrideScope ( - _: _: llvmToolsPackages prevStage // llvmLibrariesPackages prevStage - )) - // { - inherit (super.llvmPackages) override; - }; + "llvmPackages_${llvmVersion}" = overrideLlvmPackagesScope super."llvmPackages_${llvmVersion}" ( + _: _: llvmToolsPackages prevStage // llvmLibrariesPackages prevStage + ); }; extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [ @@ -820,28 +776,20 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check darwin = super.darwin.overrideScope ( selfDarwin: superDarwin: darwinPackages prevStage + // llvmLibrariesDarwinDepsNoCC prevStage // { inherit (prevStage.darwin) binutils-unwrapped; # Rewrap binutils so it uses the rebuilt Libsystem. binutils = superDarwin.binutils.override { inherit (prevStage) expand-response-params; - libc = selfDarwin.libSystem; + inherit (self) libc; }; } ); - llvmPackages = - (super.llvmPackages.overrideScope ( - _: _: - llvmToolsPackages prevStage - // llvmLibrariesPackages prevStage - // { - inherit (prevStage.llvmPackages) clangNoCompilerRtWithLibc; - } - )) - // { - inherit (super.llvmPackages) override; - }; + "llvmPackages_${llvmVersion}" = overrideLlvmPackagesScope super."llvmPackages_${llvmVersion}" ( + _: _: llvmToolsPackages prevStage // llvmLibrariesPackages prevStage + ); } ]; @@ -903,6 +851,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check selfDarwin: superDarwin: darwinPackages prevStage // sdkDarwinPackages prevStage + // llvmLibrariesDarwinDepsNoCC prevStage # Rebuild darwin.binutils with the new LLVM, so only inherit libSystem from the previous stage. // { inherit (prevStage.darwin) libSystem; @@ -916,9 +865,9 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check } ); - llvmPackages = (super.llvmPackages.overrideScope (_: _: llvmLibrariesPackages prevStage)) // { - inherit (super.llvmPackages) override; - }; + "llvmPackages_${llvmVersion}" = overrideLlvmPackagesScope super."llvmPackages_${llvmVersion}" ( + _: _: llvmLibrariesPackages prevStage + ); } ]; @@ -977,60 +926,17 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check darwin = super.darwin.overrideScope ( _: superDarwin: sdkDarwinPackages prevStage + // llvmLibrariesDarwinDepsNoCC prevStage // { inherit (prevStage.darwin) binutils-unwrapped libSystem; - binutils = superDarwin.binutils.override { - # Build expand-response-params with last stage like below - inherit (prevStage) expand-response-params; - }; # Avoid rebuilding bmake (and Python) just for locales locale = superDarwin.locale.override { inherit (prevStage) bmake; }; } ); - llvmPackages = - (super.llvmPackages.overrideScope ( - _: _: - llvmToolsPackages prevStage - // llvmLibrariesPackages prevStage - // { - systemLibcxxClang = super.wrapCCWith rec { - nativeTools = false; - nativeLibc = false; - - inherit (prevStage) expand-response-params; - - extraPackages = [ self.llvmPackages.compiler-rt ]; - - extraBuildCommands = '' - rsrc="$out/resource-root" - mkdir "$rsrc" - ln -s "${lib.getLib cc}/lib/clang/${lib.versions.major (lib.getVersion cc)}/include" "$rsrc" - echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - ln -s "${prevStage.llvmPackages.compiler-rt.out}/lib" "$rsrc/lib" - ln -s "${prevStage.llvmPackages.compiler-rt.out}/share" "$rsrc/share" - ''; - - cc = self.llvmPackages.clang-unwrapped; - bintools = self.darwin.binutils; - - isClang = true; - libc = self.darwin.libSystem; - inherit (self.darwin) libcxx; - - inherit lib; - inherit (self) - stdenvNoCC - coreutils - gnugrep - runtimeShell - ; - }; - } - )) - // { - inherit (super.llvmPackages) override; - }; + "llvmPackages_${llvmVersion}" = overrideLlvmPackagesScope super."llvmPackages_${llvmVersion}" ( + _: _: llvmToolsPackages prevStage // llvmLibrariesPackages prevStage + ); } ]; @@ -1074,7 +980,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check ]; let - cc = prevStage.llvmPackages.clang; + cc = prevStage."llvmPackages_${llvmVersion}".clang; in { inherit config overlays; @@ -1109,7 +1015,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check extraAttrs = { inherit bootstrapTools; - libc = prevStage.darwin.libSystem; + inherit (prevStage) libc; shellPackage = prevStage.bashNonInteractive; }; @@ -1128,8 +1034,6 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check cctools cctools.libtool coreutils - darwin.binutils - darwin.binutils.bintools diffutils ed file @@ -1165,10 +1069,12 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check ) ++ lib.optionals localSystem.isAarch64 [ prevStage.updateAutotoolsGnuConfigScriptsHook - prevStage.gnu-config + prevStage.updateAutotoolsGnuConfigScriptsHook.gnu_config ] ++ lib.optionals localSystem.isx86_64 [ prevStage.darwin.Csu ] ++ (with prevStage.darwin; [ + binutils + binutils.bintools libcxx libiconv.out libresolv.out @@ -1176,15 +1082,15 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check libSystem locale ]) - ++ (with prevStage.llvmPackages; [ + ++ (with prevStage."llvmPackages_${llvmVersion}"; [ bintools-unwrapped - clang-unwrapped - (lib.getLib clang-unwrapped) compiler-rt compiler-rt.dev + libclang + libclang.lib + libllvm + libllvm.lib lld - llvm - llvm.lib ]); __stdenvImpureHostDeps = commonImpureHostDeps; @@ -1217,6 +1123,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check darwin = super.darwin.overrideScope ( _: _: sdkDarwinPackages prevStage + // llvmLibrariesDarwinDepsNoCC prevStage // { inherit (prevStage.darwin) libSystem locale sigtool; } @@ -1227,32 +1134,37 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check } # These have to be dropped from the overlay when cross-compiling. Wrappers are obviously target-specific. # darwin.binutils is not yet ready to be target-independent. - ( - lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) (bintoolsPackages prevStage) - // { - inherit (prevStage.llvmPackages) clang; - } - ) - # Since LLVM should be the same regardless of target platform, overlay it to avoid an unnecessary - # rebuild when cross-compiling from Darwin to another platform using clang. + (lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) (bintoolsPackages prevStage)) { - - "llvmPackages_${lib.versions.major prevStage.llvmPackages.release_version}" = - let - llvmVersion = lib.versions.major prevStage.llvmPackages.release_version; - in - (super."llvmPackages_${llvmVersion}".overrideScope ( - _: _: - llvmToolsPackages prevStage - // llvmLibrariesPackages prevStage - // { - inherit (super."llvmPackages_${llvmVersion}") llvm-manpages; - } - )) + "llvmPackages_${llvmVersion}" = overrideLlvmPackagesScope super."llvmPackages_${llvmVersion}" ( + finalLLVM: _: + # These are defined explicitly to make sure that overriding their dependencies using `overrideScope` + # still works. `llvmPackages.libcxx` is not included because it’s not part of the Darwin stdenv. + { + inherit (prevStage."llvmPackages_${llvmVersion}") libllvm; + libclang = prevStage."llvmPackages_${llvmVersion}".libclang.override { + inherit (finalLLVM) libllvm; + }; + lld = prevStage."llvmPackages_${llvmVersion}".lld.override { + inherit (finalLLVM) libllvm; + }; + } + # Avoid using the llvm-manpages package from the bootstrap, which won’t build due to needing curl. // { - inherit (super."llvmPackages_${llvmVersion}") override; - recurseForDerivations = true; - }; + inherit (super."llvmPackages_${llvmVersion}") llvm-manpages; + } + // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) { + # Make sure the following are all the same in the local == target case: + # - clang + # - llvmPackages.stdenv.cc + # - llvmPackages.systemLibcxxClang. + # - llvmPackages.clang + # - stdenv.cc + systemLibcxxClang = prevStage."llvmPackages_${llvmVersion}".systemLibcxxClang.override { + cc = finalLLVM.clang-unwrapped; + }; + } + ); } ]; }; @@ -1284,24 +1196,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check assert prevStage.libiconv == prevStage.darwin.libiconv; { - inherit (prevStage) config overlays; - # This should be done in the `overrideScope` above, but it causes rebuilds. - # TODO: Move it there once https://github.com/NixOS/nixpkgs/pull/445668 is merged. - stdenv = prevStage.stdenv // { - overrides = - self: super: - (prevStage.stdenv.overrides self super) - // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) ( - let - llvmVersion = lib.versions.major prevStage.llvmPackages.release_version; - in - { - "llvmPackages_${llvmVersion}" = prevStage."llvmPackages_${llvmVersion}" // { - inherit (prevStage) clang; - }; - } - ); - }; + inherit (prevStage) config overlays stdenv; } ) ] diff --git a/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix b/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix index 2a83899d77cc..eb92abd71c1f 100644 --- a/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix @@ -59,7 +59,10 @@ stdenv.mkDerivation (finalAttrs: { # Increase header size to be able to inject extra RPATHs. Otherwise # x86_64-darwin build fails as: # https://cache.nixos.org/log/g5wyq9xqshan6m3kl21bjn1z88hx48rh-stdenv-bootstrap-tools.drv - NIX_LDFLAGS = (prevAttrs.NIX_LDFLAGS or "") + " -headerpad_max_install_names"; + env = prevAttrs.env // { + NIX_LDFLAGS = + (prevAttrs.env.NIX_LDFLAGS or prevAttrs.NIX_LDFLAGS or "") + " -headerpad_max_install_names"; + }; }); # Avoid messing with libkrb5 and libnghttp2. diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 8a13194e6110..74c64f080c2d 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -4,6 +4,8 @@ let argsStdenv@{ name ? "stdenv", + pname ? name, + version ? lib.trivial.release + "pre-git", preHook ? "", initialPath, @@ -102,7 +104,7 @@ let outputHashMode = "recursive"; } // { - inherit name; + inherit name pname version; inherit disallowedRequisites; # Nix itself uses the `system` field of a derivation to decide where to diff --git a/pkgs/stdenv/linux/bootstrap-files/i686-unknown-linux-gnu.nix b/pkgs/stdenv/linux/bootstrap-files/i686-unknown-linux-gnu.nix deleted file mode 100644 index 91709d7c6670..000000000000 --- a/pkgs/stdenv/linux/bootstrap-files/i686-unknown-linux-gnu.nix +++ /dev/null @@ -1,21 +0,0 @@ -# Autogenerated by maintainers/scripts/bootstrap-files/refresh-tarballs.bash as: -# $ ./refresh-tarballs.bash --targets=i686-unknown-linux-gnu -# -# Metadata: -# - nixpkgs revision: 125cefd4cf8f857e5ff1aceaef9230ba578a033d -# - hydra build: https://hydra.nixos.org/job/nixpkgs/trunk/stdenvBootstrapTools.i686-unknown-linux-gnu.build/latest -# - resolved hydra build: https://hydra.nixos.org/build/247889988 -# - instantiated derivation: /nix/store/chcf0brhdyn7ihmb14n0w4rm2a59gqrw-stdenv-bootstrap-tools.drv -# - output directory: /nix/store/5x6dldhza7if5s6wsicaxa8fbndyixps-stdenv-bootstrap-tools -# - build time: Fri, 26 Jan 2024 22:04:03 +0000 -{ - bootstrapTools = import { - url = "http://tarballs.nixos.org/stdenv/i686-unknown-linux-gnu/125cefd4cf8f857e5ff1aceaef9230ba578a033d/bootstrap-tools.tar.xz"; - hash = "sha256-KTAh3t91aJMiMO/7NFOjUz6fXI9Iu+H7cuODreWz9N8="; - }; - busybox = import { - url = "http://tarballs.nixos.org/stdenv/i686-unknown-linux-gnu/125cefd4cf8f857e5ff1aceaef9230ba578a033d/busybox"; - hash = "sha256-omz+ZT0bhMkAZcDs9evA2PNpO6VHUozdtjMgdui6fxw="; - executable = true; - }; -} diff --git a/pkgs/stdenv/linux/bootstrap-files/x86_64-unknown-linux-gnu.nix b/pkgs/stdenv/linux/bootstrap-files/x86_64-unknown-linux-gnu.nix deleted file mode 100644 index 122039786e7f..000000000000 --- a/pkgs/stdenv/linux/bootstrap-files/x86_64-unknown-linux-gnu.nix +++ /dev/null @@ -1,21 +0,0 @@ -# Autogenerated by maintainers/scripts/bootstrap-files/refresh-tarballs.bash as: -# $ ./refresh-tarballs.bash --targets=x86_64-unknown-linux-gnu -# -# Metadata: -# - nixpkgs revision: 82b583ba2ba2e5706b35dbe23f31362e62be2a9d -# - hydra build: https://hydra.nixos.org/job/nixpkgs/trunk/stdenvBootstrapTools.x86_64-unknown-linux-gnu.build/latest -# - resolved hydra build: https://hydra.nixos.org/build/249165517 -# - instantiated derivation: /nix/store/7g8mrv13mi4zrx66fw0hy4c46j752wfd-stdenv-bootstrap-tools.drv -# - output directory: /nix/store/dw6vr6m5w7ysrdrbs0s5wdgbjmbnr7gx-stdenv-bootstrap-tools -# - build time: Sat, 10 Feb 2024 01:29:55 +0000 -{ - bootstrapTools = import { - url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-linux-gnu/82b583ba2ba2e5706b35dbe23f31362e62be2a9d/bootstrap-tools.tar.xz"; - hash = "sha256-YQlr088HPoVWBU2jpPhpIMyOyoEDZYDw1y60SGGbUM0="; - }; - busybox = import { - url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-linux-gnu/82b583ba2ba2e5706b35dbe23f31362e62be2a9d/busybox"; - hash = "sha256-QrTEnQTBM1Y/qV9odq8irZkQSD9uOMbs2Q5NgCvKCNQ="; - executable = true; - }; -} diff --git a/pkgs/stdenv/linux/bootstrap-files/x86_64-unknown-linux-musl.nix b/pkgs/stdenv/linux/bootstrap-files/x86_64-unknown-linux-musl.nix deleted file mode 100644 index fb9f4827b298..000000000000 --- a/pkgs/stdenv/linux/bootstrap-files/x86_64-unknown-linux-musl.nix +++ /dev/null @@ -1,21 +0,0 @@ -# Autogenerated by maintainers/scripts/bootstrap-files/refresh-tarballs.bash as: -# $ ./refresh-tarballs.bash --targets=x86_64-unknown-linux-musl -# -# Metadata: -# - nixpkgs revision: 8c29968b3a942f2903f90797f9623737c215737c -# - hydra build: https://hydra.nixos.org/job/nixpkgs/trunk/stdenvBootstrapTools.x86_64-unknown-linux-musl.build/latest -# - resolved hydra build: https://hydra.nixos.org/build/315356522 -# - instantiated derivation: /nix/store/783rl6mlrc2wpp9apclcvc8x7vwi842s-stdenv-bootstrap-tools.drv -# - output directory: /nix/store/f881dxkvjal4vflnznfbz7g6pn4q0c56-stdenv-bootstrap-tools -# - build time: Mon, 01 Dec 2025 18:29:47 +0000 -{ - bootstrapTools = import { - url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-linux-musl/8c29968b3a942f2903f90797f9623737c215737c/bootstrap-tools.tar.xz"; - hash = "sha256-WwA4q0JNEdnSAhTwcPGIrwuOha33T0aRG7tR/YgA7L4="; - }; - busybox = import { - url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-linux-musl/8c29968b3a942f2903f90797f9623737c215737c/busybox"; - hash = "sha256-XJTiB2U3KkP31G5s68Ho7wQY5yz72CZkLSarR+56zKw="; - executable = true; - }; -} diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 6881718eb362..a6115d05440c 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -65,8 +65,6 @@ let table = { glibc = { - i686-linux = import ./bootstrap-files/i686-unknown-linux-gnu.nix; - x86_64-linux = import ./bootstrap-files/x86_64-unknown-linux-gnu.nix; armv5tel-linux = import ./bootstrap-files/armv5tel-unknown-linux-gnueabi.nix; armv6l-linux = import ./bootstrap-files/armv6l-unknown-linux-gnueabihf.nix; armv7l-linux = import ./bootstrap-files/armv7l-unknown-linux-gnueabihf.nix; @@ -92,7 +90,6 @@ musl = { aarch64-linux = import ./bootstrap-files/aarch64-unknown-linux-musl.nix; armv6l-linux = import ./bootstrap-files/armv6l-unknown-linux-musleabihf.nix; - x86_64-linux = import ./bootstrap-files/x86_64-unknown-linux-musl.nix; }; }; @@ -127,7 +124,8 @@ let inherit (localSystem) system; isFromNixpkgs = pkg: !(isFromBootstrapFiles pkg); - isFromBootstrapFiles = pkg: pkg.passthru.isFromBootstrapFiles or false; + isFromBootstrapFiles = + pkg: pkg.passthru.isFromBootstrapFiles or pkg.passthru.isFromMinBootstrap or false; isBuiltByNixpkgsCompiler = pkg: isFromNixpkgs pkg && isFromNixpkgs pkg.stdenv.cc.cc; isBuiltByBootstrapFilesCompiler = pkg: isFromNixpkgs pkg && isFromBootstrapFiles pkg.stdenv.cc.cc; @@ -155,12 +153,13 @@ let # Create a standard environment by downloading pre-built binaries of # coreutils, GCC, etc. - - # Download and unpack the bootstrap tools (coreutils, GCC, Glibc, ...). - bootstrapTools = import ./bootstrap-tools { - inherit (localSystem) libc system; - inherit lib bootstrapFiles config; - isFromBootstrapFiles = true; + stage0 = import ./stage0.nix { + inherit + lib + config + localSystem + bootstrapFiles + ; }; # This function builds the various standard environments used during @@ -175,21 +174,20 @@ let }: let - thisStdenv = import ../generic { name = "${name}-stdenv-linux"; buildPlatform = localSystem; hostPlatform = localSystem; targetPlatform = localSystem; inherit config extraNativeBuildInputs; + inherit (stage0) initialPath; preHook = '' # Don't patch #!/interpreter because it leads to retained # dependencies on the bootstrapTools in the final stdenv. dontPatchShebangs=1 ${commonPreHook} ''; - shell = "${bootstrapTools}/bin/bash"; - initialPath = [ bootstrapTools ]; + shell = "${stage0.bash}/bin/bash"; fetchurlBoot = import ../../build-support/fetchurl/boot.nix { inherit system; @@ -237,7 +235,6 @@ let }; in -assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check [ ( @@ -254,60 +251,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check # Build a dummy stdenv with no GCC or working fetchurl. This is # because we need a stdenv to build the GCC wrapper and fetchurl. - ( - prevStage: - stageFun prevStage { - name = "bootstrap-stage0"; - - overrides = self: super: { - # We thread stage0's stdenv through under this name so downstream stages - # can use it for wrapping gcc too. This way, downstream stages don't need - # to refer to this stage directly, which violates the principle that each - # stage should only access the stage that came before it. - ccWrapperStdenv = self.stdenv; - # The Glibc include directory cannot have the same prefix as the - # GCC include directory, since GCC gets confused otherwise (it - # will search the Glibc headers before the GCC headers). So - # create a dummy Glibc here, which will be used in the stdenv of - # stage1. - ${localSystem.libc} = self.stdenv.mkDerivation { - pname = "bootstrap-stage0-${localSystem.libc}"; - strictDeps = true; - version = "bootstrapFiles"; - enableParallelBuilding = true; - buildCommand = '' - mkdir -p $out - ln -s ${bootstrapTools}/lib $out/lib - '' - + lib.optionalString (localSystem.libc == "glibc") '' - ln -s ${bootstrapTools}/include-glibc $out/include - '' - + lib.optionalString (localSystem.libc == "musl") '' - ln -s ${bootstrapTools}/include-libc $out/include - ''; - passthru.isFromBootstrapFiles = true; - }; - gcc-unwrapped = bootstrapTools; - binutils = import ../../build-support/bintools-wrapper { - name = "bootstrap-stage0-binutils-wrapper"; - nativeTools = false; - nativeLibc = false; - expand-response-params = ""; - inherit lib; - inherit (self) - stdenvNoCC - coreutils - gnugrep - libc - ; - bintools = bootstrapTools; - runtimeShell = "${bootstrapTools}/bin/bash"; - }; - coreutils = bootstrapTools; - gnugrep = bootstrapTools; - }; - } - ) + (prevStage: stageFun prevStage stage0.dummyStdenv) # Create the first "real" standard environment. This one consists # of bootstrap tools only, and a minimal Glibc to keep the GCC @@ -407,7 +351,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check # Historically, the wrapper didn't use runtimeShell, so the used shell had to be changed explicitly # (or stdenvNoCC.shell would be used) which happened in stage4. binutils = super.binutils.override { - runtimeShell = "${bootstrapTools}/bin/bash"; + runtimeShell = "${stage0.bash}/bin/bash"; }; gcc-unwrapped = (super.gcc-unwrapped.override ( @@ -781,11 +725,17 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check inherit (prevStage.stdenv) fetchurlBoot; extraAttrs = { - inherit bootstrapTools; + inherit stage0; shellPackage = prevStage.bash; - }; + } + // (lib.optionalAttrs stage0.isMinimalBootstrap { + inherit (stage0) minimal-bootstrap; + }) + // (lib.optionalAttrs (!stage0.isMinimalBootstrap) { + inherit (stage0) bootstrapTools; + }); - disallowedRequisites = [ bootstrapTools.out ]; + disallowedRequisites = stage0.disallowedInFinalStdenv; # Mainly avoid reference to bootstrap tools allowedRequisites = @@ -875,7 +825,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check ++ lib.optionals (localSystem.libc == "musl") [ fortify-headers ] ++ [ prevStage.updateAutotoolsGnuConfigScriptsHook - prevStage.gnu-config + prevStage.updateAutotoolsGnuConfigScriptsHook.gnu_config ] ++ [ gcc-unwrapped.gmp diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 09e29f081b39..d69cc836a19e 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -43,6 +43,5 @@ lib.mapAttrs (n: make) ( aarch64-unknown-linux-musl = aarch64-multiplatform-musl; armv6l-unknown-linux-musleabihf = muslpi; riscv64-unknown-linux-musl = riscv64-musl; - x86_64-unknown-linux-musl = musl64; } ) diff --git a/pkgs/stdenv/linux/stage0.nix b/pkgs/stdenv/linux/stage0.nix new file mode 100644 index 000000000000..53e5605d65ef --- /dev/null +++ b/pkgs/stdenv/linux/stage0.nix @@ -0,0 +1,185 @@ +{ + localSystem, + config, + lib, + bootstrapFiles, +}: +let + minbootSupportedSystems = [ + "i686-linux" + "x86_64-linux" + ]; + minbootSupported = builtins.elem localSystem.system minbootSupportedSystems; +in +if minbootSupported then + let + callPackage = lib.callPackageWith { inherit lib config; }; + minimal-bootstrap = lib.recurseIntoAttrs ( + import ../../os-specific/linux/minimal-bootstrap { + buildPlatform = localSystem; + hostPlatform = localSystem; + inherit lib config; + fetchurl = import ../../build-support/fetchurl/boot.nix { + system = localSystem; + inherit (config) rewriteURL; + }; + checkMeta = callPackage ../generic/check-meta.nix { hostPlatform = localSystem; }; + } + ); + compilerPackage = + if localSystem.libc == "glibc" then + minimal-bootstrap.gcc-glibc + else if localSystem.libc == "musl" then + minimal-bootstrap.gcc-latest + else + throw "Can't bootstrap on ${localSystem.config}"; + libcPackage = + if localSystem.libc == "glibc" then + minimal-bootstrap.glibc + else if localSystem.libc == "musl" then + minimal-bootstrap.musl-static + else + throw "Can't bootstrap on ${localSystem.config}"; + in + assert minimal-bootstrap.bash-static.passthru.isFromMinBootstrap or false; # sanity check + { + inherit minimal-bootstrap; + isMinimalBootstrap = true; + + dummyStdenv = { + name = "bootstrap-stage0"; + + overrides = self: super: { + # We thread stage0's stdenv through under this name so downstream stages + # can use it for wrapping gcc too. This way, downstream stages don't need + # to refer to this stage directly, which violates the principle that each + # stage should only access the stage that came before it. + ccWrapperStdenv = self.stdenv; + # The Glibc include directory cannot have the same prefix as the + # GCC include directory, since GCC gets confused otherwise (it + # will search the Glibc headers before the GCC headers). So + # create a dummy Glibc here, which will be used in the stdenv of + # stage1. + ${localSystem.libc} = self.stdenv.mkDerivation { + pname = "bootstrap-stage0-${localSystem.libc}"; + strictDeps = true; + version = "minimal-bootstrap"; + enableParallelBuilding = true; + buildCommand = '' + mkdir -p $out + ln -s ${libcPackage}/lib $out/lib + ln -s ${libcPackage}/include $out/include + ''; + passthru.isFromBootstrapFiles = true; + }; + gcc-unwrapped = compilerPackage; + binutils = import ../../build-support/bintools-wrapper { + name = "bootstrap-stage0-binutils-wrapper"; + nativeTools = false; + nativeLibc = false; + expand-response-params = ""; + inherit lib; + inherit (self) + stdenvNoCC + coreutils + gnugrep + libc + ; + bintools = minimal-bootstrap.binutils-static; + runtimeShell = "${minimal-bootstrap.bash}/bin/bash"; + }; + coreutils = minimal-bootstrap.coreutils-static; + gnugrep = minimal-bootstrap.gnugrep-static; + }; + }; + bash = minimal-bootstrap.bash-static; + initialPath = with minimal-bootstrap; [ + bash-static + binutils-static + bzip2-static + compilerPackage + coreutils-static + diffutils-static + findutils-static + gawk-static + gnugrep-static + gnumake-static + gnupatch-static + gnused-static + gnutar-static + gzip-static + patchelf-static + xz-static + ]; + disallowedInFinalStdenv = lib.attrsets.catAttrs "out" ( + builtins.filter (drv: lib.attrsets.isDerivation drv) (builtins.attrValues minimal-bootstrap) + ); + } +else + let + # Download and unpack the bootstrap tools (coreutils, GCC, Glibc, ...). + bootstrapTools = import ./bootstrap-tools { + inherit (localSystem) libc system; + inherit lib bootstrapFiles config; + isFromBootstrapFiles = true; + }; + in + assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check + { + inherit bootstrapTools; + isMinimalBootstrap = false; + dummyStdenv = { + name = "bootstrap-stage0"; + + overrides = self: super: { + # We thread stage0's stdenv through under this name so downstream stages + # can use it for wrapping gcc too. This way, downstream stages don't need + # to refer to this stage directly, which violates the principle that each + # stage should only access the stage that came before it. + ccWrapperStdenv = self.stdenv; + # The Glibc include directory cannot have the same prefix as the + # GCC include directory, since GCC gets confused otherwise (it + # will search the Glibc headers before the GCC headers). So + # create a dummy Glibc here, which will be used in the stdenv of + # stage1. + ${localSystem.libc} = self.stdenv.mkDerivation { + pname = "bootstrap-stage0-${localSystem.libc}"; + strictDeps = true; + version = "bootstrap-tools"; + enableParallelBuilding = true; + buildCommand = '' + mkdir -p $out + ln -s ${bootstrapTools}/lib $out/lib + '' + + lib.optionalString (localSystem.libc == "glibc") '' + ln -s ${bootstrapTools}/include-glibc $out/include + '' + + lib.optionalString (localSystem.libc == "musl") '' + ln -s ${bootstrapTools}/include-libc $out/include + ''; + passthru.isFromBootstrapFiles = true; + }; + gcc-unwrapped = bootstrapTools; + binutils = import ../../build-support/bintools-wrapper { + name = "bootstrap-stage0-binutils-wrapper"; + nativeTools = false; + nativeLibc = false; + expand-response-params = ""; + inherit lib; + inherit (self) + stdenvNoCC + coreutils + gnugrep + libc + ; + bintools = bootstrapTools; + runtimeShell = "${bootstrapTools}/bin/bash"; + }; + coreutils = bootstrapTools; + gnugrep = bootstrapTools; + }; + }; + bash = bootstrapTools; + initialPath = [ bootstrapTools ]; + disallowedInFinalStdenv = [ bootstrapTools ]; + } diff --git a/pkgs/test/auto-patchelf-structured-log/default.nix b/pkgs/test/auto-patchelf-structured-log/default.nix new file mode 100644 index 000000000000..b8e73f040964 --- /dev/null +++ b/pkgs/test/auto-patchelf-structured-log/default.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenv, + fetchurl, + + auto-patchelf, + dpkg, + freetype, + jq, +}: + +stdenv.mkDerivation { + name = "auto-patchelf-structured-log-test"; + + src = fetchurl { + url = "https://tonelib.net/download/221222/ToneLib-Jam-amd64.deb"; + sha256 = "sha256-c6At2lRPngQPpE7O+VY/Hsfw+QfIb3COIuHfbqqIEuM="; + }; + + unpackCmd = '' + dpkg -x $curSrc source + ''; + + nativeBuildInputs = [ + dpkg + auto-patchelf + jq + ]; + + installPhase = '' + auto-patchelf \ + --paths ./usr/bin/ToneLib-Jam \ + --libs ${lib.getLib freetype}/lib \ + --ignore-missing "libasound.so.*" "libGL.so.*" \ + --structured-logs | tee log.jsonl + + # Expect 1 SetInterpreter line + jq -e -s '[.[] | select(has("SetInterpreter"))] | length == 1' log.jsonl + + # We expect 3 Dependency lines + jq -e -s '[.[] | select(has("Dependency"))] | length == 3' log.jsonl + + # We expect 2 IgnoredDependency lines + jq -e -s '[.[] | select(has("IgnoredDependency"))] | length == 2' log.jsonl + + # Expect there to be a SetRpath event using the expected rpath + jq -e -s 'any(.[]; . == { + "SetRpath": { + "file": "usr/bin/ToneLib-Jam", + "rpath": "${lib.getLib freetype}/lib" + } + })' log.jsonl + + cp log.jsonl $out + ''; + +} diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 3823ce88bc80..efcd4963136d 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -227,6 +227,8 @@ in buildFHSEnv = recurseIntoAttrs (callPackages ./buildFHSEnv { }); + auto-patchelf-structured-log = callPackage ./auto-patchelf-structured-log { }; + auto-patchelf-hook = callPackage ./auto-patchelf-hook { }; auto-patchelf-hook-preserve-origin = callPackage ./auto-patchelf-hook-preserve-origin { }; diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix index 27080839c752..d15c5021422a 100644 --- a/pkgs/test/stdenv/default.nix +++ b/pkgs/test/stdenv/default.nix @@ -10,9 +10,10 @@ }: let - # tests can be based on builtins.derivation and bootstrapTools directly to minimize rebuilds + # tests can be based on builtins.derivation and stage0 or bootstrapTools directly to minimize rebuilds # see test 'make-symlinks-relative' in ./hooks.nix as an example. - bootstrapTools = stdenv.bootstrapTools; + initialBash = if stdenv ? stage0 then stdenv.stage0.bash else stdenv.bootstrapTools; + initialPath = if stdenv ? stage0 then stdenv.stage0.initialPath else [ stdenv.bootstrapTools ]; # early enough not to rebuild gcc but late enough to have patchelf earlyPkgs = stdenv.__bootPackages.stdenv.__bootPackages or pkgs; earlierPkgs = @@ -244,7 +245,7 @@ in import ./hooks.nix { stdenv = bootStdenv; pkgs = earlyPkgs; - inherit bootstrapTools lib; + inherit initialPath initialBash lib; } ); @@ -459,10 +460,9 @@ in derivation { name = "ensure-no-execve-in-setup-sh"; inherit (stdenv.hostPlatform) system; - builder = "${stdenv.bootstrapTools}/bin/bash"; - PATH = "${pkgs.strace}/bin:${stdenv.bootstrapTools}/bin"; - initialPath = [ - stdenv.bootstrapTools + builder = "${initialBash}/bin/bash"; + PATH = "${pkgs.strace}/bin:${lib.strings.makeSearchPath "bin" initialPath}"; + initialPath = initialPath ++ [ pkgs.strace ]; args = [ @@ -505,7 +505,7 @@ in import ./hooks.nix { stdenv = bootStdenvStructuredAttrsByDefault; pkgs = earlyPkgs; - inherit bootstrapTools lib; + inherit initialBash initialPath lib; } ); diff --git a/pkgs/test/stdenv/hooks.nix b/pkgs/test/stdenv/hooks.nix index 70daaf5d403e..38e17095f8fa 100644 --- a/pkgs/test/stdenv/hooks.nix +++ b/pkgs/test/stdenv/hooks.nix @@ -1,5 +1,6 @@ { - bootstrapTools, + initialBash, + initialPath, stdenv, pkgs, lib, @@ -29,13 +30,13 @@ [[ -e $out/share/man/small-man.1.gz ]] ''; }; - # test based on bootstrapTools to minimize rebuilds + # test based on stage0 to minimize rebuilds make-symlinks-relative = (derivation { name = "test-make-symlinks-relative"; system = stdenv.system; - builder = "${bootstrapTools}/bin/bash"; - initialPath = "${bootstrapTools}"; + builder = "${initialBash}/bin/bash"; + inherit initialPath; outputs = [ "out" "out2" diff --git a/pkgs/test/stdenv/patch-shebangs.nix b/pkgs/test/stdenv/patch-shebangs.nix index 33d84dab9875..487d144e7733 100644 --- a/pkgs/test/stdenv/patch-shebangs.nix +++ b/pkgs/test/stdenv/patch-shebangs.nix @@ -13,6 +13,9 @@ let earlyBash = stdenv.__bootPackages.stdenv.__bootPackages.bashNonInteractive or pkgs.bashNonInteractive; earlyCoreutils = stdenv.__bootPackages.stdenv.__bootPackages.coreutils or pkgs.coreutils; + earlyDiffutils = stdenv.__bootPackages.stdenv.__bootPackages.diffutils or pkgs.diffutils; + earlyFindutils = stdenv.__bootPackages.stdenv.__bootPackages.findutils or pkgs.findutils; + earlySed = stdenv.__bootPackages.stdenv.__bootPackages.gnused or pkgs.gnused; tests = { bad-shebang = stdenv.mkDerivation { @@ -114,9 +117,13 @@ let (derivation { name = "read-only-script"; system = stdenv.buildPlatform.system; - builder = "${earlyBash}/bin/bash"; + builder = lib.getExe earlyBash; initialPath = [ + earlyBash earlyCoreutils + earlyDiffutils + earlyFindutils + earlySed ]; strictDeps = false; args = [ @@ -132,7 +139,7 @@ let patchShebangs $out/bin/test '' ]; - assertion = "grep '^#!${stdenv.shell}' $out/bin/test > /dev/null"; + assertion = "grep '^#!${lib.getExe earlyBash}' $out/bin/test > /dev/null"; }) // { meta = { }; @@ -142,9 +149,12 @@ let (derivation { name = "preserves-read-only"; system = stdenv.buildPlatform.system; - builder = "${earlyBash}/bin/bash"; + builder = lib.getExe earlyBash; initialPath = [ + earlyBash earlyCoreutils + earlyFindutils + earlySed ]; strictDeps = false; args = [ @@ -166,7 +176,7 @@ let fi '' ]; - assertion = "grep '^#!${stdenv.shell}' $out/bin/test > /dev/null"; + assertion = "grep '^#!${lib.getExe earlyBash}' $out/bin/test > /dev/null"; }) // { meta = { }; @@ -177,9 +187,13 @@ let (derivation { name = "preserves-timestamp"; system = stdenv.buildPlatform.system; - builder = "${earlyBash}/bin/bash"; + builder = lib.getExe earlyBash; initialPath = [ + earlyBash earlyCoreutils + earlyDiffutils + earlyFindutils + earlySed ]; strictDeps = false; args = [ @@ -203,7 +217,7 @@ let fi '' ]; - assertion = "grep '^#!${stdenv.shell}' $out/bin/test > /dev/null"; + assertion = "grep '^#!${lib.getExe earlyBash}' $out/bin/test > /dev/null"; }) // { meta = { }; @@ -213,9 +227,13 @@ let (derivation { name = "preserves-binary-data"; system = stdenv.buildPlatform.system; - builder = "${earlyBash}/bin/bash"; + builder = lib.getExe earlyBash; initialPath = [ + earlyBash earlyCoreutils + earlyDiffutils + earlyFindutils + earlySed ]; strictDeps = false; args = [ @@ -241,7 +259,7 @@ let fi '' ]; - assertion = "grep '^#!${stdenv.shell}' $out/bin/test > /dev/null"; + assertion = "grep '^#!${lib.getExe earlyBash}' $out/bin/test > /dev/null"; }) // { meta = { }; diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 1c42df0c00c1..c09bc4ff35d0 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -16,6 +16,7 @@ selinuxSupport ? false, libselinux, libsepol, + texinfo, # No openssl in default version, so openssl-induced rebuilds aren't too big. # It makes *sum functions significantly faster. minimal ? true, @@ -45,13 +46,15 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "coreutils" + (optionalString (!minimal) "-full"); - version = "9.9"; + version = "9.10"; # TODO: remove texinfo dep and the patch on next release. src = fetchurl { url = "mirror://gnu/coreutils/coreutils-${finalAttrs.version}.tar.xz"; - hash = "sha256-Gby2yoZxg8V9dxVerpRsXs7YgYMUO0XKUa19JsYoynU="; + hash = "sha256-FlNamt8LEANzZOLWEqrT2fTso6NElJztdNEvr0vVHSU="; }; + patches = [ ./fix-kill-doctest.patch ]; + postPatch = '' # The test tends to fail on btrfs, f2fs and maybe other unusual filesystems. sed '2i echo Skipping dd sparse test && exit 77' -i ./tests/dd/sparse.sh @@ -131,6 +134,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ perl + texinfo xz.bin ]; @@ -151,6 +155,8 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--with-packager=https://nixos.org" + "--with-selinux" + "--enable-install-program=kill,uptime" ] ++ optional (singleBinary != false) ( "--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}" @@ -232,27 +238,19 @@ stdenv.mkDerivation (finalAttrs: { # # binlore only spots exec in runcon on some platforms (i.e., not # darwin; see comment on inverse case below) - binlore.out = binlore.synthesize finalAttrs.finalPackage ( - '' - execer can bin/{chroot,env,install,nice,nohup,sort,split,stdbuf,timeout} - execer cannot bin/{[,b2sum,base32,base64,basename,basenc,cat,chgrp,chmod,chown,cksum,comm,cp,csplit,cut,date,dd,df,dir,dircolors,dirname,du,echo,expand,expr,factor,false,fmt,fold,groups,head,hostid,id,join,kill,link,ln,logname,ls,md5sum,mkdir,mkfifo,mknod,mktemp,mv,nl,nproc,numfmt,od,paste,pathchk,pinky,pr,printenv,printf,ptx,pwd,readlink,realpath,rm,rmdir,seq,sha1sum,sha224sum,sha256sum,sha384sum,sha512sum,shred,shuf,sleep,stat,stty,sum,sync,tac,tail,tee,test,touch,tr,true,truncate,tsort,tty,uname,unexpand,uniq,unlink,uptime,users,vdir,wc,who,whoami,yes} - '' - + optionalString selinuxSupport '' - execer can bin/runcon - execer cannot bin/chcon - '' - ); + binlore.out = binlore.synthesize finalAttrs.finalPackage '' + execer can bin/{chroot,env,install,nice,nohup,runcon,sort,split,stdbuf,timeout} + execer cannot bin/{[,b2sum,base32,base64,basename,basenc,cat,chcon,chgrp,chmod,chown,cksum,comm,cp,csplit,cut,date,dd,df,dir,dircolors,dirname,du,echo,expand,expr,factor,false,fmt,fold,groups,head,hostid,id,join,kill,link,ln,logname,ls,md5sum,mkdir,mkfifo,mknod,mktemp,mv,nl,nproc,numfmt,od,paste,pathchk,pinky,pr,printenv,printf,ptx,pwd,readlink,realpath,rm,rmdir,seq,sha1sum,sha224sum,sha256sum,sha384sum,sha512sum,shred,shuf,sleep,stat,stty,sum,sync,tac,tail,tee,test,touch,tr,true,truncate,tsort,tty,uname,unexpand,uniq,unlink,uptime,users,vdir,wc,who,whoami,yes} + ''; } // optionalAttrs (singleBinary == false) { # binlore only spots exec in runcon on some platforms (i.e., not # darwin; I have a note that the behavior may need selinux?). # hard-set it so people working on macOS don't miss cases of # runcon until ofBorg fails. - binlore.out = binlore.synthesize finalAttrs.finalPackage ( - optionalString selinuxSupport '' - execer can bin/runcon - '' - ); + binlore.out = binlore.synthesize finalAttrs.finalPackage '' + execer can bin/runcon + ''; }; meta = { diff --git a/pkgs/tools/misc/coreutils/fix-kill-doctest.patch b/pkgs/tools/misc/coreutils/fix-kill-doctest.patch new file mode 100644 index 000000000000..1e54ed3fc783 --- /dev/null +++ b/pkgs/tools/misc/coreutils/fix-kill-doctest.patch @@ -0,0 +1,61 @@ +From 088c011bfc66643a16b22db77a3c458bb7412ea2 Mon Sep 17 00:00:00 2001 +From: Collin Funk +Date: Thu, 5 Feb 2026 21:18:25 -0800 +Subject: [PATCH] doc: kill: adjust documentation to produce html anchors for + --help + +* doc/coreutils.texi (kill invocation): Adjust documentation to use the +@optItem macros. +Fixes https://bugs.gnu.org/80339 +Fixes https://github.com/coreutils/coreutils/issues/185 +--- + doc/coreutils.texi | 36 ++++++++++++++++++++++++------------ + 1 file changed, 24 insertions(+), 12 deletions(-) + +diff --git a/doc/coreutils.texi b/doc/coreutils.texi +index a02e8d73b0..4559307462 100644 +--- a/doc/coreutils.texi ++++ b/doc/coreutils.texi +@@ -18354,18 +18354,30 @@ The first form of the @command{kill} command succeeds if every @var{pid} + argument specifies at least one process that the signal was sent to. + + The second form of the @command{kill} command lists signal information. +-Either the @option{-l} or @option{--list} option, or the @option{-t} +-or @option{--table} option must be specified. Without any +-@var{signal} argument, all supported signals are listed. The output +-of @option{-l} or @option{--list} is a list of the signal names, one +-per line; if @var{signal} is already a name, the signal number is +-printed instead. The output of @option{-t} or @option{--table} is a +-table of signal numbers, names, and descriptions. This form of the +-@command{kill} command succeeds if all @var{signal} arguments are valid +-and if there is no output error. +- +-The @command{kill} command also supports the @option{--help} and +-@option{--version} options. @xref{Common options}. ++This form of the @command{kill} command succeeds if all @var{signal} ++arguments are valid and if there is no output error. ++ ++The program accepts the following options. Also see @ref{Common options}. ++ ++@table @samp ++ ++@optAnchor{kill,-SIGNAL} ++@optItem{kill,-s,} ++@optItemx{kill,--signal,} ++Specify the name or number of the signal to be sent. ++ ++@optItem{kill,-l,} ++@optItemx{kill,--list,} ++List the supported signal names one per line if the @var{signal} option ++is omitted. If one or more @var{signal} options are provided, they are ++converted between signal names and signal numbers. ++ ++@optItem{kill,-t,} ++@optItemx{kill,--table,} ++This option behaves the same way as @option{--list} except it prints a ++table of signal numbers, names, and descriptions. ++ ++@end table + + A @var{signal} may be a signal name like @samp{HUP}, or a signal + number like @samp{1}, or an exit status of a process terminated by the diff --git a/pkgs/tools/security/gnupg/24.nix b/pkgs/tools/security/gnupg/24.nix index ce2e7553deac..e2ffda108211 100644 --- a/pkgs/tools/security/gnupg/24.nix +++ b/pkgs/tools/security/gnupg/24.nix @@ -36,11 +36,11 @@ assert guiSupport -> !enableMinimal; stdenv.mkDerivation rec { pname = "gnupg"; - version = "2.4.8"; + version = "2.4.9"; src = fetchurl { url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2"; - hash = "sha256-tYyA15sE0yQ/9JwcP8a1+DE46zeEaJVjvN0GBZUxhhY="; + hash = "sha256-3RerLpoE/XnTnYU/WZy8hSBi3bmrUqTd60F2/YswKWQ="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -87,8 +87,8 @@ stdenv.mkDerivation rec { domain = "gitlab.com"; owner = "freepg"; repo = "gnupg"; - rev = "361c223eb00ca372fbf9506f5150ddbec193936f"; - hash = "sha256-hRuwrB6G2vjp7Md6m+cwoi7g4GtW0sazAEN5RC+AKdg="; + tag = "source-2.4.9-freepg"; + hash = "sha256-wF+iR0OgnU8VI90NlFOXtN5aCRC0YY/X7sPiDXjJm5M="; }; patches = [ @@ -128,6 +128,7 @@ stdenv.mkDerivation rec { "0029-Add-keyboxd-systemd-support.patch" "0033-Support-large-RSA-keygen-in-non-batch-mode.patch" "0034-gpg-Verify-Text-mode-Signatures-over-binary-Literal-.patch" + "0039-gpg-Do-not-use-a-default-when-asking-for-another-out.patch" ]; postPatch = @@ -139,7 +140,10 @@ stdenv.mkDerivation rec { # 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 + substituteInPlace configure configure.ac \ + --replace-fail "hkps://keyserver.ubuntu.com" "hkps://keys.openpgp.org" + substituteInPlace doc/gnupg.info-1 doc/dirmngr.texi \ + --replace-fail "https://keyserver.ubuntu.com" "https://keys.openpgp.org" '' + lib.optionalString (stdenv.hostPlatform.isLinux && withPcsc) '' sed -i 's,"libpcsclite\.so[^"]*","${lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c diff --git a/pkgs/tools/security/gnupg/static.patch b/pkgs/tools/security/gnupg/static.patch index ce1b75aaf210..cfa7b7ea41d5 100644 --- a/pkgs/tools/security/gnupg/static.patch +++ b/pkgs/tools/security/gnupg/static.patch @@ -1,4 +1,4 @@ -From 6a426b8093cf6633425d08a2d33ed24d200473a0 Mon Sep 17 00:00:00 2001 +From 5eec11089067947bd850e069651cfa9bf4c48d07 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 9 Feb 2025 08:51:32 +0100 Subject: [PATCH] build: use pkg-config to find tss2-esys @@ -8,15 +8,15 @@ won't be linked when tss2-esys is a static library. --- Link: https://dev.gnupg.org/D606 - configure | 131 +++++++++++++++++++++++++++++---------------------- + configure | 132 ++++++++++++++++++++++++++++----------------------- configure.ac | 5 +- - 2 files changed, 76 insertions(+), 60 deletions(-) + 2 files changed, 75 insertions(+), 62 deletions(-) diff --git a/configure b/configure -index 59f027d..f53c99d 100755 +index f5d8bef90..e7f4fb175 100755 --- a/configure +++ b/configure -@@ -669,12 +669,12 @@ TEST_LIBTSS_FALSE +@@ -696,12 +696,12 @@ TEST_LIBTSS_FALSE TEST_LIBTSS_TRUE HAVE_LIBTSS_FALSE HAVE_LIBTSS_TRUE @@ -31,7 +31,7 @@ index 59f027d..f53c99d 100755 W32SOCKLIBS NETLIBS CROSS_COMPILING_FALSE -@@ -1005,7 +1005,9 @@ PKG_CONFIG_LIBDIR +@@ -1030,7 +1030,9 @@ PKG_CONFIG_LIBDIR SQLITE3_CFLAGS SQLITE3_LIBS LIBGNUTLS_CFLAGS @@ -42,7 +42,7 @@ index 59f027d..f53c99d 100755 # Initialize some variables set by options. -@@ -1771,6 +1773,9 @@ Some influential environment variables: +@@ -1805,6 +1807,9 @@ Some influential environment variables: C compiler flags for LIBGNUTLS, overriding pkg-config LIBGNUTLS_LIBS linker flags for LIBGNUTLS, overriding pkg-config @@ -52,15 +52,16 @@ index 59f027d..f53c99d 100755 Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -@@ -15465,64 +15470,77 @@ else +@@ -16616,67 +16621,77 @@ else $as_nop fi elif test "$with_tss" = intel; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing Esys_Initialize" >&5 --$as_echo_n "checking for library containing Esys_Initialize... " >&6; } --if ${ac_cv_search_Esys_Initialize+:} false; then : -- $as_echo_n "(cached) " >&6 --else +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing Esys_Initialize" >&5 +-printf %s "checking for library containing Esys_Initialize... " >&6; } +-if test ${ac_cv_search_Esys_Initialize+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ @@ -68,52 +69,54 @@ index 59f027d..f53c99d 100755 -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif -char Esys_Initialize (); -int --main () +-main (void) -{ -return Esys_Initialize (); - ; - return 0; -} -_ACEOF --for ac_lib in '' tss2-esys; do +-for ac_lib in '' tss2-esys +-do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi -- if ac_fn_c_try_link "$LINENO"; then : +- if ac_fn_c_try_link "$LINENO" +-then : - ac_cv_search_Esys_Initialize=$ac_res -fi --rm -f core conftest.err conftest.$ac_objext \ +-rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext -- if ${ac_cv_search_Esys_Initialize+:} false; then : +- if test ${ac_cv_search_Esys_Initialize+y} +-then : - break -fi -done --if ${ac_cv_search_Esys_Initialize+:} false; then : +-if test ${ac_cv_search_Esys_Initialize+y} +-then : +pkg_failed=no -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBTSS" >&5 -+$as_echo_n "checking for LIBTSS... " >&6; } ++{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBTSS" >&5 ++printf %s "checking for LIBTSS... " >&6; } +-else $as_nop +- ac_cv_search_Esys_Initialize=no +if test -n "$LIBTSS_CFLAGS"; then + pkg_cv_LIBTSS_CFLAGS="$LIBTSS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tss2-esys tss2-mu tss2-rc tss2-tctildr\""; } >&5 ++ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tss2-esys tss2-mu tss2-rc tss2-tctildr\""; } >&5 + ($PKG_CONFIG --exists --print-errors "tss2-esys tss2-mu tss2-rc tss2-tctildr") 2>&5 + ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBTSS_CFLAGS=`$PKG_CONFIG --cflags "tss2-esys tss2-mu tss2-rc tss2-tctildr" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes - else -- ac_cv_search_Esys_Initialize=no ++else + pkg_failed=yes fi -rm conftest.$ac_ext @@ -121,25 +124,27 @@ index 59f027d..f53c99d 100755 + else + pkg_failed=untried fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_Esys_Initialize" >&5 --$as_echo "$ac_cv_search_Esys_Initialize" >&6; } +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_Esys_Initialize" >&5 +-printf "%s\n" "$ac_cv_search_Esys_Initialize" >&6; } -ac_res=$ac_cv_search_Esys_Initialize --if test "$ac_res" != no; then : +-if test "$ac_res" != no +-then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - have_libtss=Intel +-else $as_nop +- as_fn_error $? "Intel TPM Software Stack requested but not found" "$LINENO" 5 +if test -n "$LIBTSS_LIBS"; then + pkg_cv_LIBTSS_LIBS="$LIBTSS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tss2-esys tss2-mu tss2-rc tss2-tctildr\""; } >&5 ++ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tss2-esys tss2-mu tss2-rc tss2-tctildr\""; } >&5 + ($PKG_CONFIG --exists --print-errors "tss2-esys tss2-mu tss2-rc tss2-tctildr") 2>&5 + ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBTSS_LIBS=`$PKG_CONFIG --libs "tss2-esys tss2-mu tss2-rc tss2-tctildr" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes - else -- as_fn_error $? "Intel TPM Software Stack requested but not found" "$LINENO" 5 ++else + pkg_failed=yes +fi + else @@ -149,8 +154,8 @@ index 59f027d..f53c99d 100755 + + +if test $pkg_failed = yes; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++printf "%s\n" "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes @@ -167,29 +172,29 @@ index 59f027d..f53c99d 100755 + + as_fn_error $? "Intel TPM Software Stack requested but not found" "$LINENO" 5 +elif test $pkg_failed = untried; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++printf "%s\n" "no" >&6; } + as_fn_error $? "Intel TPM Software Stack requested but not found" "$LINENO" 5 +else + LIBTSS_CFLAGS=$pkg_cv_LIBTSS_CFLAGS + LIBTSS_LIBS=$pkg_cv_LIBTSS_LIBS -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++printf "%s\n" "yes" >&6; } + have_libtss=Intel +fi else as_fn_error $? "Invalid TPM Software Stack requested: $with_tss" "$LINENO" 5 fi -@@ -15616,7 +15634,6 @@ $as_echo "$as_me: WARNING: Need Esys_TR_GetTpmHandle API (usually requires Intel +@@ -16768,7 +16783,6 @@ printf "%s\n" "$as_me: WARNING: Need Esys_TR_GetTpmHandle API (usually requires fi - LIBTSS_LIBS="$LIBS -ltss2-mu -ltss2-rc -ltss2-tctildr" - $as_echo "#define HAVE_INTEL_TSS 1" >>confdefs.h + printf "%s\n" "#define HAVE_INTEL_TSS 1" >>confdefs.h diff --git a/configure.ac b/configure.ac -index dc44465..92880e6 100644 +index 94bc80583..e88d0f650 100644 --- a/configure.ac +++ b/configure.ac @@ -1574,8 +1574,8 @@ if test "$build_tpm2d" = "yes"; then @@ -212,5 +217,5 @@ index dc44465..92880e6 100644 fi LIBS="$_save_libs" -- -2.47.2 +2.51.0 diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index f9e2b7668110..4bcd050f7cbf 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -180,6 +180,8 @@ stdenv.mkDerivation rec { (lib.enableFeature true "generate-man-pages") ]; + NIX_CFLAGS_LINK = "-lz"; + passthru.tests = { nixos-rsyslogd = nixosTests.rsyslogd; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b9be552bcdea..a69895799605 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1643,6 +1643,7 @@ mapAliases { python-qt = throw "python-qt has been removed, because hard to maintain and not required by anything"; # Added 2025-01-14 pythonFull = throw "'pythonFull' previously pointed to Python 2; use `python3` or `python2Full` if necessary"; # Converted to throw 2025-10-27 pythonPackages = throw "`pythonPackages` previously pointed to Python 2; use `python3Packages` or `python2.pkgs` if necessary"; # Converted to throw 2025-10-27 + pywal = pywal16; # Added 2026-02-01 q2pro = throw "'q2pro' has been removed as upstream repository was deleted and no direct active forks were available."; # Added 2025-12-27 qcachegrind = throw "'qcachegrind' has been removed, as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20 qes = throw "'qes' has been removed, as it has been merged into shkd"; # Added 2025-12-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d8274e01453..7248bde9e8d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -287,7 +287,9 @@ with pkgs; updateAutotoolsGnuConfigScriptsHook = makeSetupHook { name = "update-autotools-gnu-config-scripts-hook"; substitutions = { - gnu_config = gnu-config; + gnu_config = gnu-config.override { + runtimeShell = targetPackages.stdenv.shell; + }; }; } ../build-support/setup-hooks/update-autotools-gnu-config-scripts.sh; @@ -1104,6 +1106,7 @@ with pkgs; osxkeychainSupport = false; pythonSupport = false; perlSupport = false; + rustSupport = false; # Needed for bootstrap withpcre2 = false; }; @@ -2782,8 +2785,6 @@ with pkgs; md2gemini = with python3.pkgs; toPythonApplication md2gemini; - md2pdf = with python3Packages; toPythonApplication md2pdf; - mdcat = callPackage ../tools/text/mdcat { inherit (python3Packages) ansi2html; }; @@ -2820,20 +2821,20 @@ with pkgs; nodejs = nodejs_24; nodejs-slim = nodejs-slim_24; - nodejs_20 = callPackage ../development/web/nodejs/v20.nix { }; - nodejs-slim_20 = callPackage ../development/web/nodejs/v20.nix { enableNpm = false; }; - corepack_20 = callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_20; }; + nodejs-slim_20 = callPackage ../development/web/nodejs/v20.nix { }; + nodejs_20 = callPackage ../development/web/nodejs/symlink.nix { nodejs-slim = nodejs-slim_20; }; + corepack_20 = callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs-slim_20; }; - nodejs_22 = callPackage ../development/web/nodejs/v22.nix { }; - nodejs-slim_22 = callPackage ../development/web/nodejs/v22.nix { enableNpm = false; }; - corepack_22 = callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_22; }; + nodejs-slim_22 = callPackage ../development/web/nodejs/v22.nix { }; + nodejs_22 = callPackage ../development/web/nodejs/symlink.nix { nodejs-slim = nodejs-slim_22; }; + corepack_22 = callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs-slim_22; }; - nodejs_24 = callPackage ../development/web/nodejs/v24.nix { }; - nodejs-slim_24 = callPackage ../development/web/nodejs/v24.nix { enableNpm = false; }; - corepack_24 = callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_24; }; + nodejs-slim_24 = callPackage ../development/web/nodejs/v24.nix { }; + nodejs_24 = callPackage ../development/web/nodejs/symlink.nix { nodejs-slim = nodejs-slim_24; }; + corepack_24 = callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs-slim_24; }; - nodejs_25 = callPackage ../development/web/nodejs/v25.nix { }; - nodejs-slim_25 = callPackage ../development/web/nodejs/v25.nix { enableNpm = false; }; + nodejs-slim_25 = callPackage ../development/web/nodejs/v25.nix { }; + nodejs_25 = callPackage ../development/web/nodejs/symlink.nix { nodejs-slim = nodejs-slim_25; }; # Update this when adding the newest nodejs major version! nodejs_latest = nodejs_25; @@ -3308,8 +3309,6 @@ with pkgs; pydeps = with python3Packages; toPythonApplication pydeps; - pywal = with python3Packages; toPythonApplication pywal; - remarshal = with python3Packages; toPythonApplication remarshal; riseup-vpn = qt6Packages.callPackage ../tools/networking/bitmask-vpn { @@ -4332,6 +4331,10 @@ with pkgs; haxePackages = recurseIntoAttrs (callPackage ./haxe-packages.nix { }); inherit (haxePackages) hxcpp; + heptagon = callPackage ../by-name/he/heptagon/package.nix { + ocamlPackages = ocaml-ng.ocamlPackages_5_3; + }; + dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix { }); gwe = callPackage ../tools/misc/gwe { @@ -4647,9 +4650,12 @@ with pkgs; ocamlformat_0_26_2 ; + inherit (ocaml-ng.ocamlPackages_5_3) + ocamlformat_0_27_0 + ; + inherit (ocamlPackages) ocamlformat # latest version - ocamlformat_0_27_0 ocamlformat_0_28_1 ; @@ -4681,15 +4687,15 @@ with pkgs; wrapRustcWith = { rustc-unwrapped, ... }@args: callPackage ../build-support/rust/rustc-wrapper args; wrapRustc = rustc-unwrapped: wrapRustcWith { inherit rustc-unwrapped; }; - rust_1_92 = callPackage ../development/compilers/rust/1_92.nix { }; - rust = rust_1_92; + rust_1_93 = callPackage ../development/compilers/rust/1_93.nix { }; + rust = rust_1_93; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { }; - rustPackages_1_92 = rust_1_92.packages.stable; - rustPackages = rustPackages_1_92; + rustPackages_1_93 = rust_1_93.packages.stable; + rustPackages = rustPackages_1_93; inherit (rustPackages) cargo @@ -5320,8 +5326,8 @@ with pkgs; ruby_4_0 ; - ruby = ruby_3_3; - rubyPackages = rubyPackages_3_3; + ruby = ruby_3_4; + rubyPackages = rubyPackages_3_4; rubyPackages_3_3 = recurseIntoAttrs ruby_3_3.gems; rubyPackages_3_4 = recurseIntoAttrs ruby_3_4.gems; @@ -6238,7 +6244,7 @@ with pkgs; boost190 ; - boost = boost187; + boost = boost189; botanEsdm = botan3.override { withEsdm = true; }; @@ -7315,7 +7321,7 @@ with pkgs; # this version should align with the static protobuf version linked into python3.pkgs.tensorflow # $ nix-shell -I nixpkgs=$(git rev-parse --show-toplevel) -p python3.pkgs.tensorflow --run "python3 -c 'import google.protobuf; print(google.protobuf.__version__)'" - protobuf = protobuf_32; + protobuf = protobuf_33; inherit ({ @@ -7923,14 +7929,6 @@ with pkgs; ]; }; - sbcl_2_5_10 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.5.10"; }; - faslExt = "fasl"; - flags = [ - "--dynamic-space-size" - "3000" - ]; - }; sbcl_2_6_0 = wrapLisp { pkg = callPackage ../development/compilers/sbcl { version = "2.6.0"; }; @@ -7940,7 +7938,15 @@ with pkgs; "3000" ]; }; - sbcl = sbcl_2_6_0; + sbcl_2_6_1 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.6.1"; }; + faslExt = "fasl"; + flags = [ + "--dynamic-space-size" + "3000" + ]; + }; + sbcl = sbcl_2_6_1; sbclPackages = recurseIntoAttrs sbcl.pkgs; @@ -8296,7 +8302,7 @@ with pkgs; toPythonApplication ( napalm.overridePythonAttrs (attrs: { # add community frontends that depend on the napalm python package - propagatedBuildInputs = attrs.propagatedBuildInputs ++ [ + dependencies = attrs.dependencies ++ [ napalm-hp-procurve ]; }) @@ -8920,7 +8926,9 @@ with pkgs; rfkill_udev = callPackage ../os-specific/linux/rfkill/udev.nix { }; - sgx-sdk = callPackage ../os-specific/linux/sgx/sdk { }; + sgx-sdk = callPackage ../os-specific/linux/sgx/sdk { + ocamlPackages = ocaml-ng.ocamlPackages_5_3; + }; sgx-psw = callPackage ../os-specific/linux/sgx/psw { protobuf = protobuf_21; @@ -9949,8 +9957,6 @@ with pkgs; libde265Support = false; }; - imagemagick6 = callPackage ../applications/graphics/ImageMagick/6.x.nix { }; - imagemagick6Big = imagemagick6.override { ghostscriptSupport = true; }; @@ -9980,11 +9986,6 @@ with pkgs; } ); - imagemagick = lowPrio ( - callPackage ../applications/graphics/ImageMagick { - } - ); - imagemagickBig = lowPrio ( imagemagick.override { ghostscriptSupport = true; diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix index c54b878ecb5d..e588a4287d09 100644 --- a/pkgs/top-level/emscripten-packages.nix +++ b/pkgs/top-level/emscripten-packages.nix @@ -35,7 +35,7 @@ rec { -o ./test1.js echo "Using node to execute the test which basically outputs an error on stderr which we grep for" - ${pkgs.nodejs}/bin/node ./test1.js + ${pkgs.lib.getExe pkgs.nodejs-slim} ./test1.js set +x if [ $? -ne 0 ]; then @@ -77,7 +77,7 @@ rec { --embed-file ./test/xmlid/id_err1.xml echo "Using node to execute the test which basically outputs an error on stderr which we grep for" - ${pkgs.nodejs}/bin/node ./xmllint.test.js --noout test/xmlid/id_err1.xml 2>&1 | grep 0bar + ${pkgs.lib.getExe pkgs.nodejs-slim} ./xmllint.test.js --noout test/xmlid/id_err1.xml 2>&1 | grep 0bar set +x if [ $? -ne 0 ]; then @@ -184,7 +184,7 @@ rec { -L. libz.a -I . -o example.js echo "Using node to execute the test" - ${pkgs.nodejs}/bin/node ./example.js + ${pkgs.lib.getExe pkgs.nodejs-slim} ./example.js set +x if [ $? -ne 0 ]; then diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index ce44a1a21147..27dac458b558 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -48,6 +48,7 @@ rec { inherit (callPackage ../development/interpreters/lua-5/hooks { }) luarocksMoveDataFolder luarocksCheckHook + bustedCheckHook ; inherit lua; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 0247134879da..b751fbaebd43 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -91,6 +91,7 @@ let backoff = callPackage ../development/ocaml-modules/backoff { }; bap = callPackage ../development/ocaml-modules/bap { + cmdliner = cmdliner_1; inherit (pkgs.llvmPackages) llvm; }; @@ -122,7 +123,9 @@ let biotk = callPackage ../development/ocaml-modules/biotk { }; - bisect_ppx = callPackage ../development/ocaml-modules/bisect_ppx { }; + bisect_ppx = callPackage ../development/ocaml-modules/bisect_ppx { + cmdliner = cmdliner_1; + }; bistro = callPackage ../development/ocaml-modules/bistro { }; @@ -220,7 +223,9 @@ let caqti-type-calendar = callPackage ../development/ocaml-modules/caqti/type-calendar.nix { }; - carton = callPackage ../development/ocaml-modules/carton { }; + carton = callPackage ../development/ocaml-modules/carton { + cmdliner = cmdliner_1; + }; carton-git = callPackage ../development/ocaml-modules/carton/git.nix { }; @@ -244,13 +249,11 @@ let cmarkit = callPackage ../development/ocaml-modules/cmarkit { }; - # The 1.1.0 release broke a lot of packages and is not compatible with - # OCaml < 4.08. - cmdliner = if lib.versionAtLeast ocaml.version "4.08" then cmdliner_1_1 else cmdliner_1_0; + cmdliner = callPackage ../development/ocaml-modules/cmdliner { }; - cmdliner_1_0 = callPackage ../development/ocaml-modules/cmdliner/1_0.nix { }; + cmdliner_1_0 = cmdliner.override { version = "1.0.4"; }; - cmdliner_1_1 = callPackage ../development/ocaml-modules/cmdliner/1_1.nix { }; + cmdliner_1 = cmdliner.override { version = "1.3.0"; }; cohttp = callPackage ../development/ocaml-modules/cohttp { }; @@ -1021,7 +1024,9 @@ let kafka = callPackage ../development/ocaml-modules/kafka { }; - kafka_lwt = callPackage ../development/ocaml-modules/kafka/lwt.nix { }; + kafka_lwt = callPackage ../development/ocaml-modules/kafka/lwt.nix { + cmdliner = cmdliner_1; + }; kcas = callPackage ../development/ocaml-modules/kcas { }; @@ -1066,6 +1071,7 @@ let lambda-term = callPackage ../development/ocaml-modules/lambda-term { }; lambdapi = callPackage ../development/ocaml-modules/lambdapi { + cmdliner = cmdliner_1; why3 = pkgs.why3.override { ocamlPackages = self; }; }; @@ -1608,7 +1614,9 @@ let odig = callPackage ../development/ocaml-modules/odig { }; - odoc = callPackage ../development/ocaml-modules/odoc { }; + odoc = callPackage ../development/ocaml-modules/odoc { + cmdliner = cmdliner_1; + }; odoc-parser = callPackage ../development/ocaml-modules/odoc-parser { }; @@ -1721,6 +1729,7 @@ let piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { }; plotkicadsch = callPackage ../development/ocaml-modules/plotkicadsch { + cmdliner = cmdliner_1; inherit (pkgs) coreutils imagemagick; }; @@ -1766,7 +1775,9 @@ let ppx_deriving = callPackage ../development/ocaml-modules/ppx_deriving { }; - ppx_deriving_cmdliner = callPackage ../development/ocaml-modules/ppx_deriving_cmdliner { }; + ppx_deriving_cmdliner = callPackage ../development/ocaml-modules/ppx_deriving_cmdliner { + cmdliner = cmdliner_1; + }; ppx_deriving_protobuf = callPackage ../development/ocaml-modules/ppx_deriving_protobuf { }; @@ -2317,6 +2328,7 @@ let // lib.optionalAttrs config.allowAliases { biocaml = throw "biocaml has been removed"; # 2025-06-04 chacha = throw "chacha has been removed because it has been marked as broken since at least November 2024. It is now vendored inside mirage-crypto, consider using that instead."; # Added 2025-10-11 + cmdliner_1_1 = cmdliner_1; # Added 2026-01-28 dune_2 = pkgs.dune_2; # Added 2025-12-08 dune_3 = pkgs.dune_3; # Added 2025-12-08 gd4o = throw "ocamlPackages.gd4o is not maintained, use ocamlPackages.gd instead"; @@ -2359,7 +2371,7 @@ rec { ocamlPackages_latest = ocamlPackages_5_4; - ocamlPackages = ocamlPackages_5_3; + ocamlPackages = ocamlPackages_5_4; # We still have packages that rely on unsafe-string, which is deprecated in OCaml 4.06.0. # Below are aliases for porting them to the latest versions of the OCaml 4 series. diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 14b32d371f3f..dc644c06733c 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -368,6 +368,7 @@ mapAliases { pycrc = throw "'pycrc' has been removed because its source is unavailable"; # Added 2025-12-22 pydns = throw "'pydns' has been renamed to/replaced by 'py3dns'"; # Converted to throw 2025-10-29 pyechonest = throw "pyechonest was removed because it was broken and unmaintained"; # added 2025-08-26 + pyeiscp = throw "'pyeiscp' was removed because it was an unmaintained leaf package."; # added 2026-01-22 pyezviz = throw "pyeziz has been removed in favor of pyevizapi, where development continues"; # added 2025-06-11 pyfantom = throw "pyfantom has been removed because it does not work with python3 and has not been updated for 12 years"; # added 2025-03-25 pyflick = throw "pyflick was removed because Flick Electric no longer exists"; # added 2025-12-03 @@ -418,6 +419,7 @@ mapAliases { pytado = throw "'pytado' has been renamed to/replaced by 'python-tado'"; # Converted to throw 2025-10-29 pytedee-async = aiotedee; # added 2025-07-06 pytest-pep8 = throw "'pytest-pep8' has been renamed to/replaced by 'pytestpep8'"; # Converted to throw 2025-10-29 + pytest-subtests = throw "'pytest-subtests' has been integrated into pytest 9."; # Added 2026-01-21 pytest_6 = throw "'pytest_6' has been renamed to/replaced by 'pytest'"; # Converted to throw 2025-10-29 pytest_xdist = throw "'pytest_xdist' has been renamed to/replaced by 'pytest-xdist'"; # Converted to throw 2025-10-29 pytestcov = throw "'pytestcov' has been renamed to/replaced by 'pytest-cov'"; # Converted to throw 2025-10-29 @@ -449,6 +451,7 @@ mapAliases { pyvicare-neo = throw "'pyvicare-neo' has been renamed to/replaced by 'pyvicare'"; # Converted to throw 2025-10-29 PyVirtualDisplay = throw "'PyVirtualDisplay' has been renamed to/replaced by 'pyvirtualdisplay'"; # Converted to throw 2025-10-29 pyvoro = throw "pyvoro has been removed because it is unmaintained upstream and has been marked as broken since 2023."; # Added 2025-10-11 + pywal = pywal16; # added 2026-02-01 qds_sdk = throw "'qds_sdk' has been renamed to/replaced by 'qds-sdk'"; # Converted to throw 2025-10-29 qiskit-ibmq-provider = throw "qiskit-imbq-provider has been removed, since it was deprecated upstream"; # added 2025-09-13 qiskit-ignis = throw "qiskit-ignis has been removed, since it was deprecated upstream"; # added 2025-09-13 @@ -461,6 +464,7 @@ mapAliases { radio_beam = throw "'radio_beam' has been renamed to/replaced by 'radio-beam'"; # Converted to throw 2025-10-29 random-user-agent = throw "random-user-agent has been removed as it was abandoned upstream in 2018; use fake-useragent instead"; # Added 2025-10-17 readme_renderer = throw "'readme_renderer' has been renamed to/replaced by 'readme-renderer'"; # Converted to throw 2025-10-29 + readthedocs-sphinx-ext = throw "'readthedocs-sphinx-ext' has been removed because it was archived upstream."; # added 2025-12-03 recursivePthLoader = throw "'recursivePthLoader' has been renamed to/replaced by 'recursive-pth-loader'"; # Converted to throw 2025-10-29 repeated_test = throw "'repeated_test' has been renamed to/replaced by 'repeated-test'"; # Converted to throw 2025-10-29 repoze_lru = throw "'repoze_lru' has been renamed to/replaced by 'repoze-lru'"; # Converted to throw 2025-10-29 @@ -475,6 +479,7 @@ mapAliases { retworkx = throw "'retworkx' has been renamed to/replaced by 'rustworkx'"; # Converted to throw 2025-10-29 rki-covid-parser = throw "rki-covid-parser has been removed because it is unmaintained and broken"; # added 2025-09-20 robotframework-tools = "'robotframework-tools' has been removed because it is unmaintained"; # Added 2026-01-19 + roman-numerals-py = roman-numerals; # added 2025-12-03 ROPGadget = throw "'ROPGadget' has been renamed to/replaced by 'ropgadget'"; # Converted to throw 2025-10-29 rtslib = throw "'rtslib' has been renamed to/replaced by 'rtslib-fb'"; # Converted to throw 2025-10-29 rtsp-to-webrtc = throw "rtsp-to-webrtc has been removed because it is unmaintained"; # added 2025-09-20 @@ -505,7 +510,9 @@ mapAliases { spark_parser = throw "'spark_parser' has been renamed to/replaced by 'spark-parser'"; # Converted to throw 2025-10-29 SPARQLWrapper = throw "'SPARQLWrapper' has been renamed to/replaced by 'sparqlwrapper'"; # Converted to throw 2025-10-29 sparsezoo = throw "sparsezoo has been removed since it is abandonned"; # added 2025-09-01 + sphinx-hoverxref = throw "'sphinx-hoverxref' has been deprecated upstream. It's functionality was merged into the readthedocs.org admin panel."; # Added 2026-01-18" sphinx-jquery = throw "'sphinx-jquery' has been renamed to/replaced by 'sphinxcontrib-jquery'"; # Converted to throw 2025-10-29 + sphinx-version-warning = throw "'sphinx-version-warning' has been abandoned upstream in 2019"; # Added 2026-01-18 sphinx_rtd_theme = throw "'sphinx_rtd_theme' has been renamed to/replaced by 'sphinx-rtd-theme'"; # Converted to throw 2025-10-29 sphinxcontrib-autoapi = throw "'sphinxcontrib-autoapi' has been renamed to/replaced by 'sphinx-autoapi'"; # Converted to throw 2025-10-29 sphinxcontrib_httpdomain = throw "'sphinxcontrib_httpdomain' has been renamed to/replaced by 'sphinxcontrib-httpdomain'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fb6a3121815c..46f90c876445 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -880,6 +880,8 @@ self: super: with self; { apsw = callPackage ../development/python-modules/apsw { }; + apswutils = callPackage ../development/python-modules/apswutils { }; + apsystems-ez1 = callPackage ../development/python-modules/apsystems-ez1 { }; apt-repo = callPackage ../development/python-modules/apt-repo { }; @@ -3280,6 +3282,8 @@ self: super: with self; { crontab = callPackage ../development/python-modules/crontab { }; + cross-web = callPackage ../development/python-modules/cross-web { }; + crossandra = callPackage ../development/python-modules/crossandra { }; crossplane = callPackage ../development/python-modules/crossplane { }; @@ -3474,6 +3478,17 @@ self: super: with self; { cython_0 = callPackage ../development/python-modules/cython/0.nix { }; + cython_3_1 = self.cython.overrideAttrs rec { + version = "3.1.8"; + + src = pkgs.fetchFromGitHub { + owner = "cython"; + repo = "cython"; + tag = version; + hash = "sha256-U/vxKpLT4BvjpIfwvZTJ93oiZJT7fvh+doz51KPRGAs="; + }; + }; + cytoolz = callPackage ../development/python-modules/cytoolz { }; cyvest = callPackage ../development/python-modules/cyvest { }; @@ -4355,6 +4370,8 @@ self: super: with self; { django-tenants = callPackage ../development/python-modules/django-tenants { }; + django-test-migrations = callPackage ../development/python-modules/django-test-migrations { }; + django-timezone-field = callPackage ../development/python-modules/django-timezone-field { }; django-tinymce = callPackage ../development/python-modules/django-tinymce { }; @@ -4388,6 +4405,8 @@ self: super: with self; { django_5 = callPackage ../development/python-modules/django/5.nix { }; + django_6 = callPackage ../development/python-modules/django/6.nix { }; + djangocms-admin-style = callPackage ../development/python-modules/djangocms-admin-style { }; djangocms-alias = callPackage ../development/python-modules/djangocms-alias { }; @@ -5332,12 +5351,16 @@ self: super: with self; { fastgit = callPackage ../development/python-modules/fastgit { }; + fasthtml = callPackage ../development/python-modules/fasthtml { }; + fastimport = callPackage ../development/python-modules/fastimport { }; fastjet = callPackage ../development/python-modules/fastjet { }; fastjsonschema = callPackage ../development/python-modules/fastjsonschema { }; + fastlite = callPackage ../development/python-modules/fastlite { }; + fastmcp = callPackage ../development/python-modules/fastmcp { }; fastmri = callPackage ../development/python-modules/fastmri { }; @@ -6418,6 +6441,10 @@ self: super: with self; { google-cloud-storage = callPackage ../development/python-modules/google-cloud-storage { }; + google-cloud-storage-control = + callPackage ../development/python-modules/google-cloud-storage-control + { }; + google-cloud-tasks = callPackage ../development/python-modules/google-cloud-tasks { }; google-cloud-testutils = callPackage ../development/python-modules/google-cloud-testutils { }; @@ -6829,6 +6856,8 @@ self: super: with self; { hatch-min-requirements = callPackage ../development/python-modules/hatch-min-requirements { }; + hatch-mypyc = callPackage ../development/python-modules/hatch-mypyc { }; + hatch-nodejs-version = callPackage ../development/python-modules/hatch-nodejs-version { }; hatch-odoo = callPackage ../development/python-modules/hatch-odoo { }; @@ -8701,6 +8730,8 @@ self: super: with self; { librouteros = callPackage ../development/python-modules/librouteros { }; + librt = callPackage ../development/python-modules/librt { }; + libsass = callPackage ../development/python-modules/libsass { inherit (pkgs) libsass; }; libsavitar = callPackage ../development/python-modules/libsavitar { }; @@ -11194,6 +11225,10 @@ self: super: with self; { ocrmypdf = callPackage ../development/python-modules/ocrmypdf { tesseract = pkgs.tesseract5; }; + ocrmypdf_16 = callPackage ../development/python-modules/ocrmypdf_16 { + tesseract = pkgs.tesseract5; + }; + od = callPackage ../development/python-modules/od { }; odc-geo = callPackage ../development/python-modules/odc-geo { }; @@ -13165,6 +13200,8 @@ self: super: with self; { pybravia = callPackage ../development/python-modules/pybravia { }; + pybreaker = callPackage ../development/python-modules/pybreaker { }; + pybrowserid = callPackage ../development/python-modules/pybrowserid { }; pybrowsers = callPackage ../development/python-modules/pybrowsers { }; @@ -13461,8 +13498,6 @@ self: super: with self; { pyeight = callPackage ../development/python-modules/pyeight { }; - pyeiscp = callPackage ../development/python-modules/pyeiscp { }; - pyelectra = callPackage ../development/python-modules/pyelectra { }; pyelftools = callPackage ../development/python-modules/pyelftools { }; @@ -15229,8 +15264,6 @@ self: super: with self; { pytest-subtesthack = callPackage ../development/python-modules/pytest-subtesthack { }; - pytest-subtests = callPackage ../development/python-modules/pytest-subtests { }; - pytest-sugar = callPackage ../development/python-modules/pytest-sugar { }; pytest-tap = callPackage ../development/python-modules/pytest-tap { }; @@ -15984,7 +16017,7 @@ self: super: with self; { pyw800rf32 = callPackage ../development/python-modules/pyw800rf32 { }; - pywal = callPackage ../development/python-modules/pywal { }; + pywal16 = callPackage ../development/python-modules/pywal16 { }; pywatchman = callPackage ../development/python-modules/pywatchman { }; @@ -16351,8 +16384,6 @@ self: super: with self; { readme-renderer = callPackage ../development/python-modules/readme-renderer { }; - readthedocs-sphinx-ext = callPackage ../development/python-modules/readthedocs-sphinx-ext { }; - real-ladybug = callPackage ../development/python-modules/real-ladybug { }; realtime = callPackage ../development/python-modules/realtime { }; @@ -16760,7 +16791,7 @@ self: super: with self; { roman = callPackage ../development/python-modules/roman { }; - roman-numerals-py = callPackage ../development/python-modules/roman-numerals-py { }; + roman-numerals = callPackage ../development/python-modules/roman-numerals { }; romy = callPackage ../development/python-modules/romy { }; @@ -17900,8 +17931,6 @@ self: super: with self; { sphinx-fortran = callPackage ../development/python-modules/sphinx-fortran { }; - sphinx-hoverxref = callPackage ../development/python-modules/sphinx-hoverxref { }; - sphinx-inline-tabs = callPackage ../development/python-modules/sphinx-inline-tabs { }; sphinx-intl = callPackage ../development/python-modules/sphinx-intl { }; @@ -17964,8 +17993,6 @@ self: super: with self; { sphinx-toolbox = callPackage ../development/python-modules/sphinx-toolbox { }; - sphinx-version-warning = callPackage ../development/python-modules/sphinx-version-warning { }; - sphinx-versions = callPackage ../development/python-modules/sphinx-versions { }; sphinxawesome-theme = callPackage ../development/python-modules/sphinxawesome-theme { }; @@ -20465,6 +20492,8 @@ self: super: with self; { viaggiatreno-ha = callPackage ../development/python-modules/viaggiatreno-ha { }; + victron-mqtt = callPackage ../development/python-modules/victron-mqtt { }; + victron-vrm = callPackage ../development/python-modules/victron-vrm { }; videocr = callPackage ../development/python-modules/videocr { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index e7bc54d06c14..58c73a157878 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -66,8 +66,6 @@ makeScopeWithSplicing' { accounts-qt = callPackage ../development/libraries/accounts-qt { }; - appstream-qt = callPackage ../development/libraries/appstream/qt.nix { }; - dxflib = callPackage ../development/libraries/dxflib { }; drumstick = callPackage ../development/libraries/drumstick { }; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 4998871272b3..69f212340c29 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -255,7 +255,6 @@ let cachix # carp broken on 2024-04-09 changelog-d - cedille client-ip-echo cornelis codd @@ -533,7 +532,7 @@ let ] released; Cabal_3_12_1_0 = released; Cabal_3_14_2_0 = released; - Cabal_3_16_0_0 = released; + Cabal_3_16_1_0 = released; cabal2nix = released; cabal2nix-unstable = released; funcmp = released; diff --git a/pkgs/top-level/unixtools.nix b/pkgs/top-level/unixtools.nix index 1d93417d23a6..ed0678b24dd1 100644 --- a/pkgs/top-level/unixtools.nix +++ b/pkgs/top-level/unixtools.nix @@ -42,9 +42,9 @@ let priority = 10; platforms = platforms.${stdenv.hostPlatform.parsed.kernel.name} or platforms.all; }; + inherit (provider) version pname; passthru = { inherit provider; - inherit (provider) version; } // lib.optionalAttrs (builtins.hasAttr "binlore" providers) { binlore.out = (binlore.synthesize (getBin bins.${cmd}) providers.binlore); @@ -74,9 +74,7 @@ let more_compat = runCommand pkgs.less.name { - passthru = { - inherit (pkgs.less) version; - }; + inherit (pkgs.less) version pname; } '' mkdir -p $out/bin @@ -269,8 +267,7 @@ let makeCompat = pname: paths: buildEnv { - name = "${pname}-${version}"; - inherit paths; + inherit paths pname version; }; # Compatibility derivations diff --git a/pkgs/top-level/variants.nix b/pkgs/top-level/variants.nix index e3a12fcadcf5..7015617c174d 100644 --- a/pkgs/top-level/variants.nix +++ b/pkgs/top-level/variants.nix @@ -73,9 +73,9 @@ self: super: { # All packages built with the Musl libc. This will override the # default GNU libc on Linux systems. Non-Linux systems are not - # supported. 32-bit is also not supported. + # supported. 32-bit is also not supported, except for x86. pkgsMusl = - if stdenv.hostPlatform.isLinux && stdenv.buildPlatform.is64bit then + if stdenv.hostPlatform.isLinux && (stdenv.buildPlatform.is64bit || stdenv.buildPlatform.isx86) then nixpkgsFun { overlays = [ (self': super': { @@ -88,7 +88,7 @@ self: super: { }; } else - throw "Musl libc only supports 64-bit Linux systems."; + throw "Musl libc only supports 64-bit Linux systems, and i686-linux."; # x86_64-darwin packages for aarch64-darwin users to use with Rosetta for incompatible packages pkgsx86_64Darwin =