diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index d99395705c91..bc0471611676 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -212,6 +212,9 @@ - `pkgs.nextcloud28` has been removed since it's out of support upstream. +- Emacs lisp build helpers, such as `emacs.pkgs.melpaBuild`, now enables `__structuredAttrs` by default. + Environment variables have to be passed via the `env` attribute. + - `buildGoModule` now passes environment variables via the `env` attribute. `CGO_ENABLED` should now be specified with `env.CGO_ENABLED` when passing to buildGoModule. Direct specification of `CGO_ENABLED` is now redirected by a compatibility layer with a warning, but will become an error in future releases. Go-related environment variables previously shadowed by `buildGoModule` now results in errors when specified directly. Such variables include `GOOS` and `GOARCH`. diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index a4e5a4aac790..7fcd525263b1 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -102,10 +102,10 @@ with lib; stdenv stdenvNoCC # for runCommand busybox - jq # for closureInfo # For boot.initrd.systemd makeInitrdNGTool - ]; + ] + ++ jq.all; # for closureInfo boot.swraid.enable = true; # remove warning about unset mail diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index e3760c9e2012..b0c143d21537 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -5,6 +5,7 @@ fetchpatch, updateAutotoolsGnuConfigScriptsHook, autoreconfHook, + freebsd, }: stdenv.mkDerivation rec { @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { }) ] ++ [ - # Has to come after darwin patches + # Has to come after darwin patches and before freebsd patches ./fix_private_keyword.patch # Order does not matter ./configure.patch @@ -62,13 +63,98 @@ stdenv.mkDerivation rec { hash = "sha256-krfprwls0L3hsNfoj2j69J5k1RTKEQtzE0fLYG9EJKo="; }) ] - ++ lib.optional stdenv.hostPlatform.isMusl ./utils.patch; + ++ lib.optional stdenv.hostPlatform.isMusl ./utils.patch + ++ [ + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-interface_low__interface.h"; + hash = "sha256-bXrcRFCbU7/7/N+J8VGKGSxIB1m8XwoAlc/KTnt9wN0="; + extraPrefix = ""; + postFetch = '' + sed -E -i -e 's/\/__linux__/g' $out + ''; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-interface_scan__devices.c"; + hash = "sha256-UD7SXeypF3bAqT7Y24UOrGZNaD8ZmpS2V7XQU+3VKXk="; + extraPrefix = ""; + postFetch = '' + sed -E -i -e 's/\/private_data/g' $out + sed -E -i -e 's/\/__linux__/g' $out + ''; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-interface_cdda__interface.h"; + hash = "sha256-JL4qe4LwmNp2jQFqTvyRjc6bixGqYr6BZmqsYIY9xhw="; + extraPrefix = ""; + postFetch = '' + sed -E -i -e 's/\/__linux__/g' $out + ''; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-interface_common__interface.c"; + hash = "sha256-vw0oFM6w15YBaAK01FwVcSN+oztSfo5jL6OlGy0iWBg="; + extraPrefix = ""; + postFetch = '' + sed -E -i -e 's/\/__linux__/g' $out + ''; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-interface_cooked__interface.c"; + hash = "sha256-g39dhxb8+K9BIb2/5cmkQ9GYjg4gDjj6sv+dXx93kQ4="; + extraPrefix = ""; + postFetch = '' + sed -E -i -e 's/\/__linux__/g' $out + ''; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-interface_interface.c"; + hash = "sha256-LMWfbqLjbQM3L4H3orAxyyAHf1hVtFwfmZY8NmBLKzs="; + extraPrefix = ""; + postFetch = '' + sed -E -i -e 's/\/private_data/g' $out + sed -E -i -e 's/\/__linux__/g' $out + ''; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-interface_scsi__interface.c"; + hash = "sha256-dx6YCWW8J0e455phaYDUMiOCvp4DsfINjSEiEfnHaNI="; + extraPrefix = ""; + postFetch = '' + sed -E -i -e 's/\/private_data/g' $out + sed -E -i -e 's/\/__linux__/g' $out + ''; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-Makefile.in"; + hash = "sha256-Wje2d58xrSWHJNktQRHcNSbh5yh6vMtpgc/3G4D1vrI="; + extraPrefix = ""; + postFetch = '' + sed -E -i -e 's/\/__linux__/g' $out + ''; + }) + ]; nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook autoreconfHook ]; + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isFreeBSD [ + # cdparanoia shipped headers have #include + # (it is part of the freebsd base system so this is reasonable + # but we want to keep the default freebsd libs, freebsd.libc, small) + freebsd.libcam + ]; + + env = + lib.optionalAttrs stdenv.hostPlatform.isFreeBSD { + NIX_LDFLAGS = "-lcam"; + } + // { + BSD_INSTALL_PROGRAM = "install"; + BSD_INSTALL_LIB = "install"; + }; + # Build system reuses the same object file names for shared and static # library. Occasionally fails in the middle: # gcc -O2 -fsigned-char -g -O2 -c scan_devices.c diff --git a/pkgs/applications/editors/emacs/build-support/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix index ddab4bc70a00..b4e96f6490fb 100644 --- a/pkgs/applications/editors/emacs/build-support/generic.nix +++ b/pkgs/applications/editors/emacs/build-support/generic.nix @@ -61,6 +61,7 @@ lib.extendMkDerivation { propagatedUserEnvPkgs = finalAttrs.packageRequires ++ propagatedUserEnvPkgs; strictDeps = args.strictDeps or true; + __structuredAttrs = args.__structuredAttrs or true; inherit turnCompilationWarningToError ignoreCompilationError; diff --git a/pkgs/applications/misc/sl1-to-photon/default.nix b/pkgs/applications/misc/sl1-to-photon/default.nix index f9bd5c9d0c1f..5c78d28b090e 100644 --- a/pkgs/applications/misc/sl1-to-photon/default.nix +++ b/pkgs/applications/misc/sl1-to-photon/default.nix @@ -31,7 +31,6 @@ buildPythonApplication rec { ]; format = "setuptools"; - dontUseSetuptoolsCheck = true; installPhase = '' install -D -m 0755 SL1_to_Photon.py $out/bin/${pname} diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index 5fa4c086482b..c8dc6e41ce9c 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -83,7 +83,6 @@ buildPythonPackage rec { PKGVER = version; - dontUseSetuptoolsCheck = true; pythonImportsCheck = [ "srht" ]; meta = with lib; { diff --git a/pkgs/applications/version-management/sourcehut/scm.nix b/pkgs/applications/version-management/sourcehut/scm.nix index ea7ba30aa656..cdccbe1a56e6 100644 --- a/pkgs/applications/version-management/sourcehut/scm.nix +++ b/pkgs/applications/version-management/sourcehut/scm.nix @@ -37,8 +37,6 @@ buildPythonPackage rec { export PKGVER=${version} ''; - dontUseSetuptoolsCheck = true; - pythonImportsCheck = [ "scmsrht" ]; meta = with lib; { diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix index e920333c3115..de43d829fb4e 100644 --- a/pkgs/applications/version-management/sourcehut/todo.nix +++ b/pkgs/applications/version-management/sourcehut/todo.nix @@ -72,8 +72,6 @@ buildPythonPackage rec { pytest factory-boy ]; - - dontUseSetuptoolsCheck = true; pythonImportsCheck = [ "todosrht" ]; meta = with lib; { diff --git a/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh b/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh index 9abd07e99525..039263e9aaca 100644 --- a/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh +++ b/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh @@ -1,15 +1,35 @@ needsTarget=true +targetValue="" + +declare -i n=0 +nParams=${#params[@]} +while (("$n" < "$nParams")); do + p=${params[n]} + v=${params[n + 1]:-} # handle `p` being last one + n+=1 -for p in "${params[@]}"; do case "$p" in - -target | --target=*) + -target) + if [ -z "$v" ]; then + echo "Error: -target requires an argument" >&2 + exit 1 + fi needsTarget=false - - echo "Warning: supplying the --target argument to a nix-wrapped compiler may not work correctly - cc-wrapper is currently not designed with multi-target compilers in mind. You may want to use an un-wrapped compiler instead." >&2 + targetValue=$v + # skip parsing the value of -target + n+=1 + ;; + --target=*) + needsTarget=false + targetValue="${p#*=}" ;; esac done +if ! $needsTarget && [[ "$targetValue" != "@defaultTarget@" ]]; then + echo "Warning: supplying the --target $targetValue != @defaultTarget@ argument to a nix-wrapped compiler may not work correctly - cc-wrapper is currently not designed with multi-target compilers in mind. You may want to use an un-wrapped compiler instead." >&2 +fi + if $needsTarget && [[ $0 != *cpp ]]; then extraBefore+=(-target @defaultTarget@ @machineFlags@) fi diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index ef591a4d9aa5..946db43afdee 100644 --- a/pkgs/build-support/kernel/make-initrd.nix +++ b/pkgs/build-support/kernel/make-initrd.nix @@ -20,7 +20,6 @@ let in { stdenvNoCC, - perl, cpio, ubootTools, lib, @@ -101,7 +100,6 @@ stdenvNoCC.mkDerivation ( builder = ./make-initrd.sh; nativeBuildInputs = [ - perl cpio ] ++ lib.optional makeUInitrd ubootTools; @@ -121,14 +119,7 @@ stdenvNoCC.mkDerivation ( symlinks = map (x: x.symlink) contents; suffices = map (x: if x ? suffix then x.suffix else "none") contents; - # For obtaining the closure of `contents'. - # Note: we don't use closureInfo yet, as that won't build with nix-1.x. - # See #36268. - exportReferencesGraph = lib.zipListsWith (x: i: [ - ("closure-${toValidStoreName (baseNameOf x.symlink)}-${toString i}") - x.object - ]) contents (lib.range 0 (lib.length contents - 1)); - pathsFromGraph = ./paths-from-graph.pl; + closureInfo = "${pkgsBuildHost.closureInfo { rootPaths = objects; }}"; } // lib.optionalAttrs makeUInitrd { uInitrdCompression = uInitrdCompression; diff --git a/pkgs/build-support/kernel/make-initrd.sh b/pkgs/build-support/kernel/make-initrd.sh index defa8a7d9b8e..cc67c14a6a50 100644 --- a/pkgs/build-support/kernel/make-initrd.sh +++ b/pkgs/build-support/kernel/make-initrd.sh @@ -24,7 +24,7 @@ done # Get the paths in the closure of `object'. -storePaths=$(perl $pathsFromGraph closure-*) +storePaths="$(cat $closureInfo/store-paths)" # Paths in cpio archives *must* be relative, otherwise the kernel diff --git a/pkgs/build-support/kernel/paths-from-graph.pl b/pkgs/build-support/kernel/paths-from-graph.pl deleted file mode 100644 index 1465b73fddb6..000000000000 --- a/pkgs/build-support/kernel/paths-from-graph.pl +++ /dev/null @@ -1,68 +0,0 @@ -# NOTE: this script is deprecated. Use closureInfo instead. - -# Parses a /nix/store/*-closure file and prints -# various information. -# By default, the nodes in the graph are printed to stdout. -# If printRegistration is set, then the graph is written -# as a registration file for a manifest is written -# in the `nix-store --load-db' format. - -use strict; -use File::Basename; - -my %storePaths; -my %refs; - -# Each argument on the command line is a graph file. -# The graph file contains line-triples and a variable -# number of references: -# -# -# -# -# ... -# -foreach my $graph (@ARGV) { - open GRAPH, "<$graph" or die; - - while () { - chomp; - my $storePath = "$_"; - $storePaths{$storePath} = 1; - - my $deriver = ; chomp $deriver; - my $count = ; chomp $count; - - my @refs = (); - for (my $i = 0; $i < $count; ++$i) { - my $ref = ; chomp $ref; - push @refs, $ref; - } - $refs{$storePath} = \@refs; - - } - - close GRAPH; -} - - -if ($ENV{"printRegistration"} eq "1") { - # This is the format used by `nix-store --register-validity - # --hash-given' / `nix-store --load-db'. - foreach my $storePath (sort (keys %storePaths)) { - print "$storePath\n"; - print "0000000000000000000000000000000000000000000000000000000000000000\n"; # !!! fix - print "0\n"; # !!! fix - print "\n"; # don't care about preserving the deriver - print scalar(@{$refs{$storePath}}), "\n"; - foreach my $ref (@{$refs{$storePath}}) { - print "$ref\n"; - } - } -} - -else { - foreach my $storePath (sort (keys %storePaths)) { - print "$storePath\n"; - } -} diff --git a/pkgs/build-support/rust/hooks/cargo-build-hook.sh b/pkgs/build-support/rust/hooks/cargo-build-hook.sh index d372d3a3f9d3..f0e155633503 100644 --- a/pkgs/build-support/rust/hooks/cargo-build-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-build-hook.sh @@ -38,7 +38,7 @@ cargoBuildHook() { concatTo flagsArray cargoBuildFlags echoCmd 'cargoBuildHook flags' "${flagsArray[@]}" - cargo build "${flagsArray[@]}" + @setEnv@ cargo build "${flagsArray[@]}" if [ -n "${buildAndTestSubdir-}" ]; then popd diff --git a/pkgs/build-support/rust/hooks/cargo-check-hook.sh b/pkgs/build-support/rust/hooks/cargo-check-hook.sh index ee07b0f86512..241061e7c7ba 100644 --- a/pkgs/build-support/rust/hooks/cargo-check-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-check-hook.sh @@ -37,7 +37,7 @@ cargoCheckHook() { concatTo flagsArray cargoTestFlags checkFlags checkFlagsArray echoCmd 'cargoCheckHook flags' "${flagsArray[@]}" - cargo test "${flagsArray[@]}" + @setEnv@ cargo test "${flagsArray[@]}" if [[ -n "${buildAndTestSubdir-}" ]]; then popd diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix index 76baa7d18168..21278ec382d1 100644 --- a/pkgs/build-support/rust/hooks/default.nix +++ b/pkgs/build-support/rust/hooks/default.nix @@ -27,6 +27,8 @@ name = "cargo-build-hook.sh"; substitutions = { inherit (stdenv.targetPlatform.rust) rustcTarget; + inherit (rust.envVars) setEnv; + }; passthru.tests = { @@ -44,6 +46,7 @@ name = "cargo-check-hook.sh"; substitutions = { inherit (stdenv.targetPlatform.rust) rustcTarget; + inherit (rust.envVars) setEnv; }; passthru.tests = { @@ -136,6 +139,8 @@ ]; substitutions = { inherit (stdenv.targetPlatform.rust) rustcTarget; + inherit (rust.envVars) setEnv; + }; } ./maturin-build-hook.sh ) { }; diff --git a/pkgs/build-support/rust/hooks/maturin-build-hook.sh b/pkgs/build-support/rust/hooks/maturin-build-hook.sh index 2039339fc80c..77972c2fe171 100644 --- a/pkgs/build-support/rust/hooks/maturin-build-hook.sh +++ b/pkgs/build-support/rust/hooks/maturin-build-hook.sh @@ -31,7 +31,7 @@ maturinBuildHook() { concatTo flagsArray maturinBuildFlags echoCmd 'maturinBuildHook flags' "${flagsArray[@]}" - maturin build "${flagsArray[@]}" + @setEnv@ maturin build "${flagsArray[@]}" if [ -n "${buildAndTestSubdir-}" ]; then popd diff --git a/pkgs/build-support/setup-hooks/no-broken-symlinks.sh b/pkgs/build-support/setup-hooks/no-broken-symlinks.sh index e2694c2b7bde..c51e4ae22ce2 100644 --- a/pkgs/build-support/setup-hooks/no-broken-symlinks.sh +++ b/pkgs/build-support/setup-hooks/no-broken-symlinks.sh @@ -13,7 +13,8 @@ postFixupHooks+=(noBrokenSymlinksInAllOutputs) # A symlink is "dangling" if it points to a non-existent target. # A symlink is "reflexive" if it points to itself. -# A symlink is considered "broken" if it is either dangling or reflexive. +# A symlink is "unreadable" if the readlink command fails, e.g. because of permission errors. +# A symlink is considered "broken" if it is either dangling, reflexive or unreadable. noBrokenSymlinks() { local -r output="${1:?}" local path @@ -21,6 +22,7 @@ noBrokenSymlinks() { local symlinkTarget local -i numDanglingSymlinks=0 local -i numReflexiveSymlinks=0 + local -i numUnreadableSymlinks=0 # NOTE(@connorbaker): This hook doesn't check for cycles in symlinks. @@ -33,7 +35,11 @@ noBrokenSymlinks() { # NOTE: path is absolute because we're running `find` against an absolute path (`output`). while IFS= read -r -d $'\0' path; do pathParent="$(dirname "$path")" - symlinkTarget="$(readlink "$path")" + if ! symlinkTarget="$(readlink "$path")"; then + nixErrorLog "the symlink $path is unreadable" + numUnreadableSymlinks+=1 + continue + fi # Canonicalize symlinkTarget to an absolute path. if [[ $symlinkTarget == /* ]]; then @@ -61,8 +67,8 @@ noBrokenSymlinks() { fi done < <(find "$output" -type l -print0) - if ((numDanglingSymlinks > 0 || numReflexiveSymlinks > 0)); then - nixErrorLog "found $numDanglingSymlinks dangling symlinks and $numReflexiveSymlinks reflexive symlinks" + if ((numDanglingSymlinks > 0 || numReflexiveSymlinks > 0 || numUnreadableSymlinks > 0)); then + nixErrorLog "found $numDanglingSymlinks dangling symlinks, $numReflexiveSymlinks reflexive symlinks and $numUnreadableSymlinks unreadable symlinks" exit 1 fi return 0 diff --git a/pkgs/by-name/bo/bonmin/package.nix b/pkgs/by-name/bo/bonmin/package.nix index a38f3a6b4de5..8104e34ad4bd 100644 --- a/pkgs/by-name/bo/bonmin/package.nix +++ b/pkgs/by-name/bo/bonmin/package.nix @@ -57,12 +57,6 @@ stdenv.mkDerivation rec { "--with-asl-lib=-lipoptamplinterface -lamplsolver" ]; - # FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009 - postConfigure = '' - substituteInPlace libtool \ - --replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a' - ''; - # Fix doc install. Should not be necessary after next release # ref https://github.com/coin-or/Bonmin/commit/4f665bc9e489a73cb867472be9aea518976ecd28 sourceRoot = "${src.name}/Bonmin"; diff --git a/pkgs/by-name/bo/borgmatic/package.nix b/pkgs/by-name/bo/borgmatic/package.nix index 475edb9ad0c1..6456f44e3e6e 100644 --- a/pkgs/by-name/bo/borgmatic/package.nix +++ b/pkgs/by-name/bo/borgmatic/package.nix @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { [ flexmock pytestCheckHook - pytest-cov + pytest-cov-stub ] ++ optional-dependencies.apprise; @@ -40,11 +40,6 @@ python3Packages.buildPythonApplication rec { "test_borgmatic_version_matches_news_version" ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace '--cov-fail-under=100' "" - ''; - nativeBuildInputs = [ installShellFiles ]; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/cf/cfitsio/package.nix b/pkgs/by-name/cf/cfitsio/package.nix index 3cc37833a80b..d2b6324d92c4 100644 --- a/pkgs/by-name/cf/cfitsio/package.nix +++ b/pkgs/by-name/cf/cfitsio/package.nix @@ -31,6 +31,12 @@ stdenv.mkDerivation (finalAttrs: { "--enable-reentrant" ]; + env = lib.optionalAttrs stdenv.hostPlatform.isFreeBSD { + # concerning. upstream defines XOPEN_SOURCE=700 which makes FreeBSD very insistent on + # not showing us gethostbyname() + NIX_CFLAGS_COMPILE = "-D__BSD_VISIBLE=1"; + }; + hardeningDisable = [ "format" ]; # Shared-only build @@ -58,6 +64,6 @@ stdenv.mkDerivation (finalAttrs: { xbreak hjones2199 ]; - platforms = lib.platforms.linux ++ lib.platforms.darwin; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/ch/chromaprint/package.nix b/pkgs/by-name/ch/chromaprint/package.nix index 539e6333419d..61b8766d6501 100644 --- a/pkgs/by-name/ch/chromaprint/package.nix +++ b/pkgs/by-name/ch/chromaprint/package.nix @@ -1,22 +1,31 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, fetchpatch2 -, cmake -, ninja -, ffmpeg -, darwin -, zlib +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + fetchpatch2, + fetchurl, + cmake, + ninja, + ffmpeg-headless, + darwin, + zlib, + testers, + validatePkgConfig, + nix-update-script, + withExamples ? true, + withTools ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "chromaprint"; version = "1.5.1"; - src = fetchurl { - url = "https://github.com/acoustid/chromaprint/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-oarY+juLGLeNN1Wzdn+v+au2ckLgG0eOyaZOGQ8zXhw="; + src = fetchFromGitHub { + owner = "acoustid"; + repo = "chromaprint"; + tag = "v${finalAttrs.version}"; + hash = "sha256-bFplHaqXYvGbl8E8b/HUNFO4X+B/HPZjGTmuVFPjS3g="; }; patches = [ @@ -40,18 +49,64 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake ninja ]; + nativeBuildInputs = [ + cmake + ninja + validatePkgConfig + ]; - buildInputs = [ ffmpeg ] ++ lib.optionals stdenv.hostPlatform.isDarwin - (with darwin.apple_sdk.frameworks; [ Accelerate CoreGraphics CoreVideo zlib ]); + buildInputs = + [ ffmpeg-headless ] + ++ lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + Accelerate + CoreGraphics + CoreVideo + zlib + ] + ); - cmakeFlags = [ "-DBUILD_EXAMPLES=ON" "-DBUILD_TOOLS=ON" ]; + cmakeFlags = [ + (lib.cmakeBool "BUILD_EXAMPLES" withExamples) + (lib.cmakeBool "BUILD_TOOLS" withTools) + ]; - meta = with lib; { - homepage = "https://acoustid.org/chromaprint"; - description = "AcoustID audio fingerprinting library"; - mainProgram = "fpcalc"; - license = licenses.lgpl21Plus; - platforms = platforms.unix; + passthru = { + updateScript = nix-update-script { }; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; -} + + doCheck = true; + checkPhase = + let + exampleAudio = fetchurl { + name = "Dvorak_Symphony_9_1.mp3"; + url = "https://archive.org/download/Dvorak_Symphony_9/01.Adagio-Allegro_Molto.mp3"; + hash = "sha256-I+Ve3/OpL+3Joc928F8M21LhCH2eQfRtaJVx9mNOLW0="; + meta.license = lib.licenses.publicDomain; + }; + + # sha256 because actual output of fpcalc is quite long + expectedHash = "c47ae40e02caf798ff5ab4d91ff00cfdca8f6786c581662436941d3e000c9aac"; + in + '' + runHook preCheck + tests/all_tests + ${lib.optionalString withTools "diff -u <(src/cmd/fpcalc ${exampleAudio} | sha256sum | cut -c-64) <(echo '${expectedHash}')"} + runHook postCheck + ''; + + meta = + { + changelog = "https://github.com/acoustid/chromaprint/releases/tag/v${finalAttrs.version}"; + homepage = "https://acoustid.org/chromaprint"; + description = "AcoustID audio fingerprinting library"; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.unix; + pkgConfigModules = [ "libchromaprint" ]; + } + // lib.attrsets.optionalAttrs withTools { + mainProgram = "fpcalc"; + }; +}) diff --git a/pkgs/by-name/cr/cryptsetup/package.nix b/pkgs/by-name/cr/cryptsetup/package.nix index 8c35acda3e72..3e2b74a4d588 100644 --- a/pkgs/by-name/cr/cryptsetup/package.nix +++ b/pkgs/by-name/cr/cryptsetup/package.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { ++ (lib.mapAttrsToList (lib.flip lib.enableFeature)) programs; nativeBuildInputs = [ pkg-config ] ++ lib.optionals rebuildMan [ asciidoctor ]; - buildInputs = [ + propagatedBuildInputs = [ lvm2 json_c openssl @@ -106,7 +106,10 @@ stdenv.mkDerivation rec { changelog = "https://gitlab.com/cryptsetup/cryptsetup/-/raw/v${version}/docs/v${version}-ReleaseNotes"; license = lib.licenses.gpl2Plus; mainProgram = "cryptsetup"; - maintainers = with lib.maintainers; [ raitobezarius ]; + maintainers = with lib.maintainers; [ + numinit + raitobezarius + ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/by-name/ec/eclib/package.nix b/pkgs/by-name/ec/eclib/package.nix index 17765450dd38..8eb4a1f0bab0 100644 --- a/pkgs/by-name/ec/eclib/package.nix +++ b/pkgs/by-name/ec/eclib/package.nix @@ -41,13 +41,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - - # FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009 - postConfigure = '' - substituteInPlace libtool \ - --replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a' - ''; - doCheck = true; meta = with lib; { description = "Elliptic curve tools"; diff --git a/pkgs/by-name/fa/faad2/package.nix b/pkgs/by-name/fa/faad2/package.nix index 328e06960eb5..d4fa16c7f68c 100644 --- a/pkgs/by-name/fa/faad2/package.nix +++ b/pkgs/by-name/fa/faad2/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "faad2"; - version = "2.11.1"; + version = "2.11.2"; src = fetchFromGitHub { owner = "knik0"; repo = "faad2"; rev = version; - hash = "sha256-E6oe7yjYy1SJo8xQkyUk1sSucKDMPxwUFVSAyrf4Pd8="; + hash = "sha256-JvmblrmE3doUMUwObBN2b+Ej+CDBWNemBsyYSCXGwo8="; }; outputs = [ diff --git a/pkgs/by-name/fa/fast-float/package.nix b/pkgs/by-name/fa/fast-float/package.nix index edebd6278d60..9ecdb4239114 100644 --- a/pkgs/by-name/fa/fast-float/package.nix +++ b/pkgs/by-name/fa/fast-float/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fast-float"; - version = "8.0.0"; + version = "8.0.1"; src = fetchFromGitHub { owner = "fastfloat"; repo = "fast_float"; rev = "v${finalAttrs.version}"; - hash = "sha256-shP+me3iqTRrsPGYrvcbnJNRZouQbW62T24xfkEgGSE="; + hash = "sha256-Y13JdBk8pZyg748fEOj+O/6gMAaqNXIE2fLY5tsMGB0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/fl/flite/package.nix b/pkgs/by-name/fl/flite/package.nix index 514ded67728a..641697bf286a 100644 --- a/pkgs/by-name/fl/flite/package.nix +++ b/pkgs/by-name/fl/flite/package.nix @@ -31,14 +31,20 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Tq5pyg3TiQt8CPqGXTyLOaGgaeLTmPp+Duw3+2VAF9g="; }; - # https://github.com/festvox/flite/pull/60. - # Replaces `ar` with `$(AR)` in config/common_make_rules. - # Improves cross-compilation compatibility. patches = [ + # https://github.com/festvox/flite/pull/60. + # Replaces `ar` with `$(AR)` in config/common_make_rules. + # Improves cross-compilation compatibility. (fetchpatch { url = "https://github.com/festvox/flite/commit/54c65164840777326bbb83517568e38a128122ef.patch"; hash = "sha256-hvKzdX7adiqd9D+9DbnfNdqEULg1Hhqe1xElYxNM1B8="; }) + # patch missing bsd conditions in configure + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/0d316feccaf89c1bd804d6001274426a7135c93a/audio/flite/files/patch-configure"; + hash = "sha256-D2wOtmHFcuA8JRtIds03yPrBGtMuhLJHuufEQdpcB58="; + extraPrefix = ""; + }) ]; buildInputs = lib.optional stdenv.hostPlatform.isLinux ( diff --git a/pkgs/by-name/gi/gi-docgen/package.nix b/pkgs/by-name/gi/gi-docgen/package.nix index 0f350cdbbd62..0401fedd1290 100644 --- a/pkgs/by-name/gi/gi-docgen/package.nix +++ b/pkgs/by-name/gi/gi-docgen/package.nix @@ -9,13 +9,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gi-docgen"; - version = "2024.1"; + version = "2025.3"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/gi-docgen/${lib.versions.major version}/gi-docgen-${version}.tar.xz"; - hash = "sha256-hwx3+WIEYszknjVUKkLcFhL8hYcz6D274kjFNUWK7B4="; + hash = "sha256-iomli8D3ffw+iioONJf8OfVBOuNeVZfp7GFgq/juFNg="; }; depsBuildBuild = [ diff --git a/pkgs/by-name/gi/giac/package.nix b/pkgs/by-name/gi/giac/package.nix index 0341f051d14a..cf218da403a0 100644 --- a/pkgs/by-name/gi/giac/package.nix +++ b/pkgs/by-name/gi/giac/package.nix @@ -106,12 +106,6 @@ stdenv.mkDerivation rec { substituteInPlace src/global.cc --replace 'browser="mozilla"' 'browser="xdg-open"' ''; - # FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009 - postConfigure = '' - substituteInPlace libtool \ - --replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a' - ''; - nativeBuildInputs = [ autoreconfHook texliveSmall diff --git a/pkgs/by-name/gl/glib/package.nix b/pkgs/by-name/gl/glib/package.nix index 5556e85f8566..04a4a43e6b96 100644 --- a/pkgs/by-name/gl/glib/package.nix +++ b/pkgs/by-name/gl/glib/package.nix @@ -76,7 +76,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.82.4"; + version = "2.82.5"; outputs = [ "bin" @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - hash = "sha256-N90Id/6WTNFemicQsEShgw+xvZNlKm0Mtriy3/GHxwk="; + hash = "sha256-BcIDH5vfa1q6egbKhPC0rO0osZvxtQxqslzGdSd8vD8="; }; patches = @@ -249,7 +249,6 @@ stdenv.mkDerivation (finalAttrs: { "-Dlibelf=disabled" ] ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ - "-Db_lundef=false" "-Dxattr=false" "-Dsysprof=disabled" # sysprof-capture does not build on FreeBSD ]; diff --git a/pkgs/by-name/gl/glusterfs/package.nix b/pkgs/by-name/gl/glusterfs/package.nix index f14002019a28..efe75a0f89cc 100644 --- a/pkgs/by-name/gl/glusterfs/package.nix +++ b/pkgs/by-name/gl/glusterfs/package.nix @@ -159,12 +159,6 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ]; - # FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009 - postConfigure = '' - substituteInPlace libtool \ - --replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a' - ''; - nativeBuildInputs = [ autoconf automake diff --git a/pkgs/by-name/gp/gpodder/package.nix b/pkgs/by-name/gp/gpodder/package.nix index adad02f16cb7..738983a6322f 100644 --- a/pkgs/by-name/gp/gpodder/package.nix +++ b/pkgs/by-name/gp/gpodder/package.nix @@ -2,7 +2,6 @@ lib, fetchFromGitHub, gitUpdater, - glibcLocales, adwaita-icon-theme, gobject-introspection, gtk3, @@ -35,7 +34,6 @@ python311Packages.buildPythonApplication rec { nativeBuildInputs = [ intltool wrapGAppsHook3 - glibcLocales gobject-introspection ]; @@ -73,10 +71,6 @@ python311Packages.buildPythonApplication rec { "share/dbus-1/services/org.gpodder.service" ]; - preBuild = '' - export LC_ALL="en_US.UTF-8" - ''; - installCheckPhase = '' LC_ALL=C PYTHONPATH=src/:$PYTHONPATH pytest --ignore=tests --ignore=src/gpodder/utilwin32ctypes.py --doctest-modules src/gpodder/util.py src/gpodder/jsonconfig.py LC_ALL=C PYTHONPATH=src/:$PYTHONPATH pytest tests --ignore=src/gpodder/utilwin32ctypes.py --ignore=src/mygpoclient --cov=gpodder diff --git a/pkgs/by-name/hi/hifiscan/package.nix b/pkgs/by-name/hi/hifiscan/package.nix index deedff446c16..3f8ad858d683 100644 --- a/pkgs/by-name/hi/hifiscan/package.nix +++ b/pkgs/by-name/hi/hifiscan/package.nix @@ -20,8 +20,6 @@ python3Packages.buildPythonApplication { pyqtgraph ]; - dontUseSetuptoolsCheck = true; - src = fetchPypi { inherit pname version hash; }; diff --git a/pkgs/by-name/hw/hwdata/package.nix b/pkgs/by-name/hw/hwdata/package.nix index fd1125591b87..6edf714d2919 100644 --- a/pkgs/by-name/hw/hwdata/package.nix +++ b/pkgs/by-name/hw/hwdata/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "hwdata"; - version = "0.392"; + version = "0.393"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${version}"; - hash = "sha256-DjtPoPZZwFmVRZTOG4A+2KXI6zw68QEwq0iFRoV+5c4="; + hash = "sha256-RDp5NY9VYD0gylvzYpg9BytfRdQ6dim1jJtv32yeF3k="; }; configureFlags = [ "--datadir=${placeholder "out"}/share" ]; diff --git a/pkgs/by-name/le/lerc/package.nix b/pkgs/by-name/le/lerc/package.nix index 08a7cb63afbf..1443ce855449 100644 --- a/pkgs/by-name/le/lerc/package.nix +++ b/pkgs/by-name/le/lerc/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + buildPackages, fetchFromGitHub, fetchpatch, cmake, @@ -23,14 +24,28 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-IHY9QtNYsxPz/ksxRMZGHleT+/bawfTYNVRSTAuYQ7Y="; }; - patches = [ - # https://github.com/Esri/lerc/pull/227 - (fetchpatch { - name = "use-cmake-install-full-dir.patch"; - url = "https://github.com/Esri/lerc/commit/5462ca7f7dfb38c65e16f5abfd96873af177a0f8.patch"; - hash = "sha256-qaNR3QwLe0AB6vu1nXOh9KhlPdWM3DmgCJj4d0VdOUk="; - }) - ]; + # Required to get the freebsd-ports patch to apply. + # There seem to be inconsistent line endings in this project - just converting the patch doesn't work + prePatch = lib.optionalString stdenv.hostPlatform.isFreeBSD '' + ${buildPackages.dos2unix}/bin/dos2unix src/LercLib/fpl_EsriHuffman.cpp src/LercLib/fpl_Lerc2Ext.cpp + ''; + + patches = + [ + # https://github.com/Esri/lerc/pull/227 + (fetchpatch { + name = "use-cmake-install-full-dir.patch"; + url = "https://github.com/Esri/lerc/commit/5462ca7f7dfb38c65e16f5abfd96873af177a0f8.patch"; + hash = "sha256-qaNR3QwLe0AB6vu1nXOh9KhlPdWM3DmgCJj4d0VdOUk="; + }) + ] + ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/ee9e39ceb1af729ac33854b5f3de652cb5ce0eca/graphics/lerc/files/patch-_assert"; + hash = "sha256-agvGqgIsKS8v43UZdTVxDRDGbZdj2+AzKoQONvQumB4="; + extraPrefix = ""; + }) + ]; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/li/libcap/package.nix b/pkgs/by-name/li/libcap/package.nix index f648e896d262..498081caac2a 100644 --- a/pkgs/by-name/li/libcap/package.nix +++ b/pkgs/by-name/li/libcap/package.nix @@ -21,11 +21,11 @@ assert usePam -> pam != null; stdenv.mkDerivation rec { pname = "libcap"; - version = "2.73"; + version = "2.74"; src = fetchurl { url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz"; - hash = "sha256-ZAX2CJz0zdjCcVQM2ZBlTXjdCxmJstm9og+TOnWnlaU="; + hash = "sha256-64UnHyiTGIZEtkUc7Izpn0VBSY8W/5+Eh3wvyHJxdxQ="; }; outputs = [ "out" "dev" "lib" "man" "doc" ] diff --git a/pkgs/by-name/li/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch b/pkgs/by-name/li/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch deleted file mode 100644 index b1f9d0978cec..000000000000 --- a/pkgs/by-name/li/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch +++ /dev/null @@ -1,13 +0,0 @@ -Common subdirectories: libid3tag-0.15.1b/msvc++ and libid3tag-0.15.1b-patched/msvc++ -diff -uwp libid3tag-0.15.1b/utf16.c libid3tag-0.15.1b-patched/utf16.c ---- libid3tag-0.15.1b/utf16.c 2004-01-23 10:41:32.000000000 +0100 -+++ libid3tag-0.15.1b-patched/utf16.c 2018-11-01 13:12:00.866050641 +0100 -@@ -250,6 +250,8 @@ id3_ucs4_t *id3_utf16_deserialize(id3_by - id3_ucs4_t *ucs4; - - end = *ptr + (length & ~1); -+ if (end == *ptr) -+ return 0; - - utf16 = malloc((length / 2 + 1) * sizeof(*utf16)); - if (utf16 == 0) diff --git a/pkgs/by-name/li/libid3tag/debian-patches.patch b/pkgs/by-name/li/libid3tag/debian-patches.patch deleted file mode 100644 index 0a828b334cf8..000000000000 --- a/pkgs/by-name/li/libid3tag/debian-patches.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff --git a/compat.gperf b/compat.gperf -index 4e24613..5635980 100644 ---- a/compat.gperf -+++ b/compat.gperf -@@ -236,6 +236,10 @@ int id3_compat_fixup(struct id3_tag *tag) - - encoding = id3_parse_uint(&data, 1); - string = id3_parse_string(&data, end - data, encoding, 0); -+ if (!string) -+ { -+ continue; -+ } - - if (id3_ucs4_length(string) < 4) { - free(string); -diff --git a/genre.dat b/genre.dat -index 17acab5..1f02779 100644 ---- a/genre.dat -+++ b/genre.dat -@@ -277,8 +277,8 @@ static id3_ucs4_t const genre_PUNK_ROCK[] = - { 'P', 'u', 'n', 'k', ' ', 'R', 'o', 'c', 'k', 0 }; - static id3_ucs4_t const genre_DRUM_SOLO[] = - { 'D', 'r', 'u', 'm', ' ', 'S', 'o', 'l', 'o', 0 }; --static id3_ucs4_t const genre_A_CAPPELLA[] = -- { 'A', ' ', 'C', 'a', 'p', 'p', 'e', 'l', 'l', 'a', 0 }; -+static id3_ucs4_t const genre_A_CAPELLA[] = -+ { 'A', ' ', 'C', 'a', 'p', 'e', 'l', 'l', 'a', 0 }; - static id3_ucs4_t const genre_EURO_HOUSE[] = - { 'E', 'u', 'r', 'o', '-', 'H', 'o', 'u', 's', 'e', 0 }; - static id3_ucs4_t const genre_DANCE_HALL[] = -@@ -452,7 +452,7 @@ static id3_ucs4_t const *const genre_table[] = { - genre_DUET, - genre_PUNK_ROCK, - genre_DRUM_SOLO, -- genre_A_CAPPELLA, -+ genre_A_CAPELLA, - genre_EURO_HOUSE, - genre_DANCE_HALL, - genre_GOA, -diff --git a/genre.dat.in b/genre.dat.in -index 872de40..e71e34b 100644 ---- a/genre.dat.in -+++ b/genre.dat.in -@@ -153,7 +153,7 @@ Freestyle - Duet - Punk Rock - Drum Solo --A Cappella -+A Capella - Euro-House - Dance Hall - Goa -diff --git a/parse.c b/parse.c -index 86a3f21..947c249 100644 ---- a/parse.c -+++ b/parse.c -@@ -165,6 +165,9 @@ id3_ucs4_t *id3_parse_string(id3_byte_t const **ptr, id3_length_t length, - case ID3_FIELD_TEXTENCODING_UTF_8: - ucs4 = id3_utf8_deserialize(ptr, length); - break; -+ default: -+ /* FIXME: Unknown encoding! Print warning? */ -+ return NULL; - } - - if (ucs4 && !full) { -diff --git a/utf16.c b/utf16.c -index 70ee9d5..6e60a75 100644 ---- a/utf16.c -+++ b/utf16.c -@@ -282,5 +282,18 @@ id3_ucs4_t *id3_utf16_deserialize(id3_byte_t const **ptr, id3_length_t length, - - free(utf16); - -+ if (end == *ptr && length % 2 != 0) -+ { -+ /* We were called with a bogus length. It should always -+ * be an even number. We can deal with this in a few ways: -+ * - Always give an error. -+ * - Try and parse as much as we can and -+ * - return an error if we're called again when we -+ * already tried to parse everything we can. -+ * - tell that we parsed it, which is what we do here. -+ */ -+ (*ptr)++; -+ } -+ - return ucs4; - } \ No newline at end of file diff --git a/pkgs/by-name/li/libid3tag/id3tag.pc b/pkgs/by-name/li/libid3tag/id3tag.pc deleted file mode 100644 index e3df7b3f9df0..000000000000 --- a/pkgs/by-name/li/libid3tag/id3tag.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@out@ -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=@dev@/include - -Name: libid3tag -Description: ID3 tag manipulation library -Version: @version@ - -Libs: -L${libdir} -lid3tag -Cflags: -I${includedir} diff --git a/pkgs/by-name/li/libid3tag/package.nix b/pkgs/by-name/li/libid3tag/package.nix index c8c9d8bf5103..e287ee6cdcd2 100644 --- a/pkgs/by-name/li/libid3tag/package.nix +++ b/pkgs/by-name/li/libid3tag/package.nix @@ -1,48 +1,50 @@ -{ lib, stdenv, fetchurl, zlib, gperf_3_0 }: +{ + lib, + stdenv, + fetchFromGitea, + cmake, + gperf, + zlib, +}: stdenv.mkDerivation rec { pname = "libid3tag"; - version = "0.15.1b"; + version = "0.16.3"; - src = fetchurl { - url = "mirror://sourceforge/mad/libid3tag-${version}.tar.gz"; - sha256 = "63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151"; + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "tenacityteam"; + repo = "libid3tag"; + rev = version; + hash = "sha256-6/49rk7pmIpJRj32WmxC171NtdIOaMNhX8RD7o6Jbzs="; }; - outputs = [ "out" "dev" ]; - setOutputFlags = false; + postPatch = '' + substituteInPlace packaging/id3tag.pc.in \ + --replace-fail "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" "@CMAKE_INSTALL_FULL_LIBDIR@" + ''; strictDeps = true; - nativeBuildInputs = [ gperf_3_0 ]; - - buildInputs = [ zlib ]; - - patches = [ - ./debian-patches.patch - ./CVE-2017-11550-and-CVE-2017-11551.patch + nativeBuildInputs = [ + cmake + gperf ]; - preConfigure = '' - configureFlagsArray+=( - --includedir=$dev/include - ) - ''; + buildInputs = [ + zlib + ]; - postInstall = '' - mkdir -p $dev/lib/pkgconfig - cp ${./id3tag.pc} $dev/lib/pkgconfig/id3tag.pc - substituteInPlace $dev/lib/pkgconfig/id3tag.pc \ - --subst-var-by out $out \ - --subst-var-by dev $dev \ - --subst-var-by version "${version}" - ''; - - meta = with lib; { + meta = { description = "ID3 tag manipulation library"; - homepage = "https://mad.sourceforge.net/"; - license = licenses.gpl2; + homepage = "https://codeberg.org/tenacityteam/libid3tag"; + license = lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/li/liblc3/package.nix b/pkgs/by-name/li/liblc3/package.nix index 8ab037e596bb..4428d1e5220b 100644 --- a/pkgs/by-name/li/liblc3/package.nix +++ b/pkgs/by-name/li/liblc3/package.nix @@ -8,7 +8,7 @@ let name = "liblc3"; - version = "1.1.2"; + version = "1.1.3"; in stdenv.mkDerivation { pname = name; @@ -18,7 +18,7 @@ stdenv.mkDerivation { owner = "google"; repo = "liblc3"; rev = "v${version}"; - sha256 = "sha256-OWuj68+YztIh/dPvwqjW7ch7Ph3aiEIDvO9rMkVIrQ8="; + sha256 = "sha256-4KsvCQ1JZaj0yCT7En7ZcNk0rA8LyDwwcSga2IoVd6A="; }; outputs = [ diff --git a/pkgs/by-name/li/libnotify/package.nix b/pkgs/by-name/li/libnotify/package.nix index 655211524f7e..edd43c88da27 100644 --- a/pkgs/by-name/li/libnotify/package.nix +++ b/pkgs/by-name/li/libnotify/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, meson, ninja, pkg-config, @@ -19,7 +20,7 @@ stdenv.mkDerivation rec { pname = "libnotify"; - version = "0.8.3"; + version = "0.8.4"; outputs = [ "out" @@ -29,9 +30,20 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-7o8++UYVatNAb99F/u29zZMtvSEatPFvdeuk82+y9sA="; + hash = "sha256-j6BNTr3BVbCiOd+IvZ8J6PJznVcHoTkLQnq0mF+D0lo="; }; + patches = [ + # Revert to avoid manpages breakage: + # https://gitlab.gnome.org/GNOME/libnotify/-/merge_requests/37#note_2366448 + (fetchpatch { + revert = true; + name = "unbreak-man.path"; + url = "https://gitlab.gnome.org/GNOME/libnotify/-/commit/2f99025b7ad54f29dc5236aa7dfcfa97d1c8efde.patch"; + hash = "sha256-/qbBs+bJjzCR2I7swy0RTsTaXap+gkYzvfchobeOzPQ="; + }) + ]; + mesonFlags = [ # disable tests as we don't need to depend on GTK (2/3) "-Dtests=false" diff --git a/pkgs/by-name/li/libqmi/build_doc_deps_by_default.patch b/pkgs/by-name/li/libqmi/build_doc_deps_by_default.patch new file mode 100644 index 000000000000..f9ffbb589bf7 --- /dev/null +++ b/pkgs/by-name/li/libqmi/build_doc_deps_by_default.patch @@ -0,0 +1,12 @@ +diff --git a/docs/reference/libqmi-glib/meson.build b/docs/reference/libqmi-glib/meson.build +index 2f5cfc3..14e1aea 100644 +--- a/docs/reference/libqmi-glib/meson.build ++++ b/docs/reference/libqmi-glib/meson.build +@@ -57,6 +57,7 @@ sections_txt = custom_target( + capture: true, + command: [find_program('cat'), '@INPUT@'] + gen_sections, + depends: gen_sections_deps, ++ build_by_default: true, + ) + + version_xml = configure_file( diff --git a/pkgs/by-name/li/libqmi/package.nix b/pkgs/by-name/li/libqmi/package.nix index 1bd3a50715ef..daa61c7d3a1e 100644 --- a/pkgs/by-name/li/libqmi/package.nix +++ b/pkgs/by-name/li/libqmi/package.nix @@ -88,6 +88,10 @@ stdenv.mkDerivation rec { ]; doCheck = true; + patches = [ + # https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/issues/124 + ./build_doc_deps_by_default.patch + ]; postPatch = '' patchShebangs \ diff --git a/pkgs/by-name/li/libraw/package.nix b/pkgs/by-name/li/libraw/package.nix index 700092119a7e..b16a69fea358 100644 --- a/pkgs/by-name/li/libraw/package.nix +++ b/pkgs/by-name/li/libraw/package.nix @@ -40,6 +40,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postPatch = lib.optionalString stdenv.hostPlatform.isFreeBSD '' + substituteInPlace libraw*.pc.in --replace-fail -lstdc++ "" + ''; + passthru.tests = { inherit imagemagick hdrmerge freeimage; inherit (python3.pkgs) rawkit; diff --git a/pkgs/by-name/li/libredirect/package.nix b/pkgs/by-name/li/libredirect/package.nix index a19d7151dd56..168c36168bc5 100644 --- a/pkgs/by-name/li/libredirect/package.nix +++ b/pkgs/by-name/li/libredirect/package.nix @@ -104,6 +104,7 @@ else # Provide a setup hook that injects our library into every process. mkdir -p "$hook/nix-support" cat < "$hook/nix-support/setup-hook" + echo "Setting up libredirect" ${ if stdenv.hostPlatform.isDarwin then '' diff --git a/pkgs/by-name/li/libsepol/package.nix b/pkgs/by-name/li/libsepol/package.nix index 09feeb1e2fdf..ea4a5e45838a 100644 --- a/pkgs/by-name/li/libsepol/package.nix +++ b/pkgs/by-name/li/libsepol/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "libsepol"; - version = "3.8"; + version = "3.8.1"; se_url = "https://github.com/SELinuxProject/selinux/releases/download"; outputs = [ @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${se_url}/${version}/libsepol-${version}.tar.gz"; - sha256 = "sha256-hE+9vwIzS5zgODOtimcQU/Z7QHbXLbTwPg7iZl7C61U="; + sha256 = "sha256-DnhwUwX5VavUwGVNN6VHfuJjSat0254rA6eGiJeuHd8="; }; postPatch = lib.optionalString stdenv.hostPlatform.isStatic '' diff --git a/pkgs/by-name/li/libvisual/package.nix b/pkgs/by-name/li/libvisual/package.nix deleted file mode 100644 index a2a559deccf2..000000000000 --- a/pkgs/by-name/li/libvisual/package.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch, - SDL, - autoreconfHook, - autoconf-archive, - glib, - pkg-config, -}: - -stdenv.mkDerivation rec { - pname = "libvisual"; - version = "0.4.2"; - - src = fetchFromGitHub { - owner = "Libvisual"; - repo = "libvisual"; - rev = "libvisual-${version}"; - hash = "sha256-bDnpQODXB2Z6hezVoh7c6cklp6qpyDzVBAnwZD8Gros="; - }; - - sourceRoot = "${src.name}/libvisual"; - - outputs = [ - "out" - "dev" - ]; - - strictDeps = true; - nativeBuildInputs = [ - autoreconfHook - autoconf-archive - pkg-config - ]; - buildInputs = [ - SDL - glib - ]; - - configureFlags = - lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - # Remove when 0.5.x is published. - "--disable-lv-tool" - ] - ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - "ac_cv_func_malloc_0_nonnull=yes" - "ac_cv_func_realloc_0_nonnull=yes" - ]; - - meta = { - description = "Abstraction library for audio visualisations"; - homepage = "https://sourceforge.net/projects/libvisual/"; - license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.linux ++ lib.platforms.freebsd; - }; -} diff --git a/pkgs/by-name/li/libvmaf/package.nix b/pkgs/by-name/li/libvmaf/package.nix index 00ee04515b5c..eea42c1c5730 100644 --- a/pkgs/by-name/li/libvmaf/package.nix +++ b/pkgs/by-name/li/libvmaf/package.nix @@ -31,6 +31,14 @@ stdenv.mkDerivation (finalAttrs: { xxd ]; + postPatch = lib.optionalString stdenv.hostPlatform.isFreeBSD '' + substituteInPlace meson.build --replace-fail '_XOPEN_SOURCE=600' '_XOPEN_SOURCE=700' + ''; + + env = lib.optionalAttrs stdenv.hostPlatform.isFreeBSD { + NIX_CFLAGS_COMPILE = "-D__BSD_VISIBLE=1"; + }; + mesonFlags = [ "-Denable_avx512=true" ]; outputs = [ diff --git a/pkgs/by-name/me/mediagoblin/package.nix b/pkgs/by-name/me/mediagoblin/package.nix index 309b4abe50c5..af2ed13dce4b 100644 --- a/pkgs/by-name/me/mediagoblin/package.nix +++ b/pkgs/by-name/me/mediagoblin/package.nix @@ -15,6 +15,12 @@ let celery = prev.celery.overridePythonAttrs { doCheck = false; }; + + kombu = prev.kombu.overridePythonAttrs { + # avoid conflicts with test only dependencies + doCheck = false; + }; + sqlalchemy = prev.sqlalchemy_1_4; }; }; diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix index b8acdb939ab7..bdefa68e0390 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -144,6 +144,7 @@ python3.pkgs.buildPythonApplication rec { ''; setupHook = ./setup-hook.sh; + env.hostPlatform = stdenv.targetPlatform.system; meta = { homepage = "https://mesonbuild.com"; diff --git a/pkgs/by-name/me/meson/setup-hook.sh b/pkgs/by-name/me/meson/setup-hook.sh index 1885265eabbf..5aa5b7ed3c02 100644 --- a/pkgs/by-name/me/meson/setup-hook.sh +++ b/pkgs/by-name/me/meson/setup-hook.sh @@ -26,6 +26,11 @@ mesonConfigurePhase() { "--buildtype=${mesonBuildType:-plain}" ) + # --no-undefined is universally a bad idea on freebsd because environ is in the csu + if [[ "@hostPlatform@" == *-freebsd ]]; then + flagsArray+=("-Db_lundef=false") + fi + concatTo flagsArray mesonFlags mesonFlagsArray echoCmd 'mesonConfigurePhase flags' "${flagsArray[@]}" diff --git a/pkgs/by-name/mp/mp3fs/package.nix b/pkgs/by-name/mp/mp3fs/package.nix index 6a98b78348b8..0e9ee3fd0bac 100644 --- a/pkgs/by-name/mp/mp3fs/package.nix +++ b/pkgs/by-name/mp/mp3fs/package.nix @@ -10,6 +10,7 @@ autoreconfHook, pkg-config, pandoc, + zlib, }: stdenv.mkDerivation rec { @@ -25,21 +26,23 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/mp3fs.cc \ - --replace "#include " "" \ - --replace "osxfuse_version()" "fuse_version()" + --replace-fail "#include " "" \ + --replace-fail "osxfuse_version()" "fuse_version()" ''; + nativeBuildInputs = [ + autoreconfHook + pkg-config + pandoc + ]; + buildInputs = [ flac fuse lame libid3tag libvorbis - ]; - nativeBuildInputs = [ - autoreconfHook - pkg-config - pandoc + zlib ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/oc/octoprint/package.nix b/pkgs/by-name/oc/octoprint/package.nix index 3085de0f0c64..2e2ba6466773 100644 --- a/pkgs/by-name/oc/octoprint/package.nix +++ b/pkgs/by-name/oc/octoprint/package.nix @@ -238,8 +238,6 @@ let setup.py ''; - dontUseSetuptoolsCheck = true; - preCheck = '' export HOME=$(mktemp -d) rm pytest.ini diff --git a/pkgs/by-name/op/openh264/package.nix b/pkgs/by-name/op/openh264/package.nix index c4518d3124ae..f62ea69a3e21 100644 --- a/pkgs/by-name/op/openh264/package.nix +++ b/pkgs/by-name/op/openh264/package.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + fetchpatch, gtest, meson, nasm, @@ -26,6 +27,15 @@ stdenv.mkDerivation (finalAttrs: { "dev" ]; + patches = [ + # https://github.com/cisco/openh264/pull/3867 + (fetchpatch { + name = "freebsd-configure.patch"; + url = "https://github.com/cisco/openh264/commit/ea8a1ad5791ee5c4e2ecf459aec235128d69b35b.patch"; + hash = "sha256-pJvh9eRxFZQ+ob4WPu/x+jr1CCpgnug1uBViLfAtBDg="; + }) + ]; + nativeBuildInputs = [ meson nasm @@ -58,6 +68,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.platforms.aarch64 ++ lib.platforms.loongarch64 ++ lib.platforms.riscv64 - ) (lib.platforms.linux ++ lib.platforms.darwin); + ) lib.platforms.unix; }; }) diff --git a/pkgs/by-name/pe/persepolis/package.nix b/pkgs/by-name/pe/persepolis/package.nix index f76b8848e311..dce1e844d5f0 100644 --- a/pkgs/by-name/pe/persepolis/package.nix +++ b/pkgs/by-name/pe/persepolis/package.nix @@ -38,15 +38,6 @@ python3.pkgs.buildPythonApplication rec { "\${qtWrapperArgs[@]}" ]; - # The presence of these dependencies is checked during setuptoolsCheckPhase, - # but apart from that, they're not required during build, only runtime - nativeCheckInputs = [ - libnotify - pulseaudio - sound-theme-freedesktop - ffmpeg - ]; - propagatedBuildInputs = [ pulseaudio sound-theme-freedesktop diff --git a/pkgs/by-name/po/poetry/unwrapped.nix b/pkgs/by-name/po/poetry/unwrapped.nix index 21a7e9032ccb..0ef2a0f2ee9e 100644 --- a/pkgs/by-name/po/poetry/unwrapped.nix +++ b/pkgs/by-name/po/poetry/unwrapped.nix @@ -142,6 +142,12 @@ buildPythonPackage rec { "test_env_system_packages_are_relative_to_lib" "test_install_warning_corrupt_root" "test_project_plugins_are_installed_in_project_folder" + "test_application_command_not_found_messages" + # PermissionError: [Errno 13] Permission denied: '/build/pytest-of-nixbld/pytest-0/popen-gw3/test_find_poetry_managed_pytho1/.local/share/pypoetry/python/pypy@3.10.8/bin/python' + "test_list_poetry_managed" + "test_list_poetry_managed" + "test_find_all_with_poetry_managed" + "test_find_poetry_managed_pythons" ]; pytestFlagsArray = [ diff --git a/pkgs/by-name/po/polkit/0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch b/pkgs/by-name/po/polkit/0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch index 4e38660217fe..bef49a26ad44 100644 --- a/pkgs/by-name/po/polkit/0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch +++ b/pkgs/by-name/po/polkit/0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch @@ -1,4 +1,4 @@ -From 7ba07551dfcd4ef9a87b8f0d9eb8b91fabcb41b3 Mon Sep 17 00:00:00 2001 +From 5db2dee82bf652cca5fd782c19c8cc8e7ad5ed3e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 1 Nov 2021 14:17:17 +0100 Subject: [PATCH] build: Use datarootdir in Meson-generated pkg-config files @@ -29,18 +29,17 @@ in the generated pkg-config files, mirroring Autotools. 2. https://www.gnu.org/prep/standards/html_node/Directory-Variables.html 3. https://blogs.gnome.org/hughsie/2014/06/16/datarootdir-v-s-datadir/ --- - src/polkit/meson.build | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) + src/polkit/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/polkit/meson.build b/src/polkit/meson.build -index 63dc1e85..c92cb70f 100644 +index a7ce02b..9192a36 100644 --- a/src/polkit/meson.build +++ b/src/polkit/meson.build -@@ -113,9 +113,8 @@ pkg.generate( +@@ -114,8 +114,8 @@ pkg.generate( requires: common_deps, variables: [ 'exec_prefix=${prefix}', -- 'datadir=' + ('${prefix}' / pk_datadir), - 'policydir=' + ('${datadir}' / pk_actiondir), - 'actiondir=' + ('${datadir}' / pk_actiondir), + 'policydir=' + ('${prefix}' / 'share' / pk_actiondir), @@ -49,5 +48,5 @@ index 63dc1e85..c92cb70f 100644 ], ) -- -GitLab +2.48.1 diff --git a/pkgs/by-name/po/polkit/elogind.patch b/pkgs/by-name/po/polkit/elogind.patch deleted file mode 100644 index e7d97a7b131c..000000000000 --- a/pkgs/by-name/po/polkit/elogind.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 78e625dbafa8543b17ffaf9c42cf90c9cf9a612e Mon Sep 17 00:00:00 2001 -From: Alyssa Ross -Date: Wed, 8 May 2024 11:20:42 +0200 -Subject: [PATCH] Fix configuration with elogind - -Previously, it would try to get sysusers_dir from systemd even though -systemd_dep was undefined. Determining systemd_systemdsystemunitdir -from systemd was already checking for systemd logind specifically, and -systemd_sysusers_dir is only used in the systemd logind case, so move -both of those into the systemd-logind-specific branch above. - -(cherry picked from commit b58b58af10c390ab9a11a4cfe6a4ff3d50cc0fa5) ---- - meson.build | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) - -diff --git a/meson.build b/meson.build -index 2f81c90..0888322 100644 ---- a/meson.build -+++ b/meson.build -@@ -202,6 +202,16 @@ if enable_logind - if not logind_dep.found() - logind_dep = dependency('libsystemd-login', not_found_message: 'libsystemd support requested but libsystemd or libsystemd-login library not found') - endif -+ -+ # systemd unit / service files -+ systemd_systemdsystemunitdir = get_option('systemdsystemunitdir') -+ if systemd_systemdsystemunitdir == '' and session_tracking == 'libsystemd-login' -+ systemd_dep = dependency('systemd', not_found_message: 'systemd required but not found, please provide a valid systemd user unit dir or disable it') -+ # FIXME: systemd.pc file does not use variables with relative paths, so `define_variable` cannot be used -+ systemd_systemdsystemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir') -+ endif -+ -+ systemd_sysusers_dir = systemd_dep.get_pkgconfig_variable('sysusers_dir', default: '/usr/lib/sysusers.d') - else - logind_dep = dependency('libelogind', not_found_message: 'libelogind support requested but libelogind library not found') - endif -@@ -210,16 +220,6 @@ if enable_logind - config_h.set10('HAVE_' + func.to_upper(), cc.has_function(func, dependencies: logind_dep)) - func = 'sd_pidfd_get_session' - config_h.set10('HAVE_' + func.to_upper(), cc.has_function(func, dependencies: logind_dep)) -- -- # systemd unit / service files -- systemd_systemdsystemunitdir = get_option('systemdsystemunitdir') -- if systemd_systemdsystemunitdir == '' and session_tracking == 'libsystemd-login' -- systemd_dep = dependency('systemd', not_found_message: 'systemd required but not found, please provide a valid systemd user unit dir or disable it') -- # FIXME: systemd.pc file does not use variables with relative paths, so `define_variable` cannot be used -- systemd_systemdsystemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir') -- endif -- -- systemd_sysusers_dir = systemd_dep.get_pkgconfig_variable('sysusers_dir', default: '/usr/lib/sysusers.d') - endif - config_h.set('HAVE_LIBSYSTEMD', enable_logind) - -@@ -404,7 +404,7 @@ output += ' introspection: ' + enable_introspection.to_string( - output += ' Distribution/OS: ' + os_type + '\n' - output += ' Authentication framework: ' + auth_fw + '\n' - output += ' Session tracking: ' + session_tracking + '\n' --if enable_logind -+if session_tracking == 'logind' - output += ' systemdsystemunitdir: ' + systemd_systemdsystemunitdir + '\n' - endif - output += ' polkitd user: ' + polkitd_user + ' \n' --- -2.44.0 - diff --git a/pkgs/by-name/po/polkit/package.nix b/pkgs/by-name/po/polkit/package.nix index a02a4dbbc1c1..1ecf173e5608 100644 --- a/pkgs/by-name/po/polkit/package.nix +++ b/pkgs/by-name/po/polkit/package.nix @@ -17,10 +17,10 @@ libxslt, docbook-xsl-nons, dbus, + util-linux, docbook_xml_dtd_412, gtk-doc, coreutils, - fetchpatch, useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal, systemdMinimal, elogind, @@ -41,7 +41,7 @@ let in stdenv.mkDerivation rec { pname = "polkit"; - version = "124"; + version = "126"; outputs = [ "bin" @@ -54,22 +54,13 @@ stdenv.mkDerivation rec { owner = "polkit-org"; repo = "polkit"; rev = version; - hash = "sha256-Vc9G2xK6U1cX+xW2BnKp3oS/ACbSXS/lztbFP5oJOlM="; + hash = "sha256-ZSqgW//q5DFIsmY17U93mJcK/CHSCHphKTHsTxp40q8="; }; patches = [ # Allow changing base for paths in pkg-config file as before. # https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/100 ./0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch - - ./elogind.patch - - # FIXME: remove in the next release - # https://github.com/NixOS/nixpkgs/issues/18012 - (fetchpatch { - url = "https://github.com/polkit-org/polkit/commit/f93c7466039ea3403e0576928aeb620b806d0cce.patch"; - sha256 = "sha256-cF0nNovYmyr+XixpBgQFF0A+oJeSPGZgTkgDQkQuof8="; - }) ]; depsBuildBuild = [ @@ -116,6 +107,7 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ dbus + util-linux # for mount (python3.pythonOnBuildForHost.withPackages ( pp: with pp; [ dbus-python @@ -127,67 +119,50 @@ stdenv.mkDerivation rec { )) ]; - env = - { - PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; - PKG_CONFIG_SYSTEMD_SYSUSERS_DIR = "${placeholder "out"}/lib/sysusers.d"; + env = { + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + PKG_CONFIG_SYSTEMD_SYSUSERS_DIR = "${placeholder "out"}/lib/sysusers.d"; + PKG_CONFIG_SYSTEMD_TMPFILES_DIR = "${placeholder "out"}/lib/tmpfiles.d"; - # HACK: We want to install policy files files to $out/share but polkit - # should read them from /run/current-system/sw/share on a NixOS system. - # Similarly for config files in /etc. - # With autotools, it was possible to override Make variables - # at install time but Meson does not support this - # so we need to convince it to install all files to a temporary - # location using DESTDIR and then move it to proper one in postInstall. - DESTDIR = "dest"; - } - // lib.optionalAttrs (stdenv.cc.isGNU || stdenv.cc.isClang) { - NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - }; + # HACK: We want to install policy files files to $out/share but polkit + # should read them from /run/current-system/sw/share on a NixOS system. + # Similarly for config files in /etc. + # With autotools, it was possible to override Make variables + # at install time but Meson does not support this + # so we need to convince it to install all files to a temporary + # location using DESTDIR and then move it to proper one in postInstall. + DESTDIR = "dest"; + }; mesonFlags = [ "--datadir=${system}/share" "--sysconfdir=/etc" "-Dpolkitd_user=polkituser" # TODO? config.ids.uids.polkituser - "-Dos_type=redhat" # only affects PAM includes + "-Dos_type=redhat" # affects PAM includes and privileged group name (wheel) "-Dintrospection=${lib.boolToString withIntrospection}" "-Dtests=${lib.boolToString doCheck}" "-Dgtk_doc=${lib.boolToString withIntrospection}" "-Dman=true" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - "-Dsession_tracking=${if useSystemd then "libsystemd-login" else "libelogind"}" + "-Dsession_tracking=${if useSystemd then "logind" else "elogind"}" ]; inherit doCheck; postPatch = '' - patchShebangs test/polkitbackend/polkitbackendjsauthoritytest-wrapper.py + patchShebangs \ + test/wrapper.py # ‘libpolkit-agent-1.so’ should call the setuid wrapper on # NixOS. Hard-coding the path is kinda ugly. Maybe we can just # call through $PATH, but that might have security implications. substituteInPlace src/polkitagent/polkitagentsession.c \ - --replace 'PACKAGE_PREFIX "/lib/polkit-1/' '"${setuid}/' + --replace-fail 'PACKAGE_PREFIX "/lib/polkit-1/' '"${setuid}/' substituteInPlace test/data/etc/polkit-1/rules.d/10-testing.rules \ - --replace /bin/true ${coreutils}/bin/true \ - --replace /bin/false ${coreutils}/bin/false - ''; - - postConfigure = lib.optionalString doCheck '' - # Unpacked by meson - chmod +x subprojects/mocklibc-1.0/bin/mocklibc - patchShebangs subprojects/mocklibc-1.0/bin/mocklibc - ''; - - checkPhase = '' - runHook preCheck - - # tests need access to the system bus - dbus-run-session --config-file=${./system_bus.conf} -- sh -c 'DBUS_SYSTEM_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS meson test --print-errorlogs' - - runHook postCheck + --replace-fail /bin/true ${coreutils}/bin/true \ + --replace-fail /bin/false ${coreutils}/bin/false ''; postInstall = '' @@ -212,6 +187,6 @@ stdenv.mkDerivation rec { # mandatory libpolkit-gobject shared library lib.systems.inspect.platformPatterns.isStatic ]; - maintainers = teams.freedesktop.members ++ (with maintainers; [ ]); + maintainers = teams.freedesktop.members; }; } diff --git a/pkgs/by-name/po/polkit/system_bus.conf b/pkgs/by-name/po/polkit/system_bus.conf deleted file mode 100644 index 435b4740a2f7..000000000000 --- a/pkgs/by-name/po/polkit/system_bus.conf +++ /dev/null @@ -1,58 +0,0 @@ - - - - system - - - - - - - - - EXTERNAL - - - unix:path=/tmp/system_bus_socket - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pkgs/by-name/pr/pre-commit/package.nix b/pkgs/by-name/pr/pre-commit/package.nix index 9a8d5bd3a662..8c3b9aca06e6 100644 --- a/pkgs/by-name/pr/pre-commit/package.nix +++ b/pkgs/by-name/pr/pre-commit/package.nix @@ -7,7 +7,6 @@ coursier, dotnet-sdk, gitMinimal, - glibcLocales, go, nodejs, perl, @@ -52,7 +51,6 @@ buildPythonApplication rec { [ cargo gitMinimal - glibcLocales go libiconv # For rust tests on Darwin perl @@ -101,7 +99,7 @@ buildPythonApplication rec { + '' export GIT_AUTHOR_NAME=test GIT_COMMITTER_NAME=test \ GIT_AUTHOR_EMAIL=test@example.com GIT_COMMITTER_EMAIL=test@example.com \ - VIRTUALENV_NO_DOWNLOAD=1 PRE_COMMIT_NO_CONCURRENCY=1 LANG=en_US.UTF-8 + VIRTUALENV_NO_DOWNLOAD=1 PRE_COMMIT_NO_CONCURRENCY=1 '' + lib.optionalString (!i686Linux) '' # Resolve `.NET location: Not found` errors for dotnet tests diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index db4805612854..c5baa51d8dbe 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -103,6 +103,7 @@ python.pkgs.buildPythonApplication rec { "protobuf" "pycryptodome" "pyjwt" + "pypdf" "python-bidi" "qrcode" "redis" diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix index fb5b99f841dd..3bfa13310d3f 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.394"; + version = "1.1.396"; src = fetchFromGitHub { owner = "Microsoft"; repo = "pyright"; tag = version; - hash = "sha256-zOJtv9ETolo3XmH+ztNJEmX319rV/CABDIw2crSxqqw="; + hash = "sha256-6YvjpLV1Jj5N0CgN9hE7C2X9BMYZBJegB0xpSBW8n5c="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -44,7 +44,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-RE1ZwMKgWu686/ejMB0E1CRix8MLv6lNoEkyAkvOC6U="; + npmDepsHash = "sha256-HwwVshop15nHE5oFuPIFmL5AduJ2z208cv2TbEAEMnY="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -58,7 +58,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-sQeHXfhm6u0at4vhFjGPwMmTdDomU6cJnolOFO6ynXA="; + npmDepsHash = "sha256-ywQimf2w5xXbNqcluv6Bi/wH7/QQG0U/r6Ferx9vbis="; postPatch = '' chmod +w ../../ diff --git a/pkgs/by-name/re/redis/package.nix b/pkgs/by-name/re/redis/package.nix index 8e6b697aaa39..ce343567c8a2 100644 --- a/pkgs/by-name/re/redis/package.nix +++ b/pkgs/by-name/re/redis/package.nix @@ -66,6 +66,7 @@ stdenv.mkDerivation (finalAttrs: { hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ]; env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ "-std=c11" ]); + env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isFreeBSD "-lexecinfo"; # darwin currently lacks a pure `pgrep` which is extensively used here doCheck = !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/se/selenium-manager/disable-telemetry.patch b/pkgs/by-name/se/selenium-manager/disable-telemetry.patch index 0591c5b2d438..28db72d7595b 100644 --- a/pkgs/by-name/se/selenium-manager/disable-telemetry.patch +++ b/pkgs/by-name/se/selenium-manager/disable-telemetry.patch @@ -1,7 +1,7 @@ -diff --git a/rust/src/config.rs b/rust/src/config.rs +diff --git a/src/config.rs b/src/config.rs index f7cd4f32ec..ec454127be 100644 ---- a/rust/src/config.rs -+++ b/rust/src/config.rs +--- a/src/config.rs ++++ b/src/config.rs @@ -120,7 +120,7 @@ impl ManagerConfig { avoid_browser_download: BooleanKey("avoid-browser-download", false).get_value(), language_binding: StringKey(vec!["language-binding"], "").get_value(), diff --git a/pkgs/by-name/se/selenium-manager/package.nix b/pkgs/by-name/se/selenium-manager/package.nix index 9b33ee7b7672..44f92db58aed 100644 --- a/pkgs/by-name/se/selenium-manager/package.nix +++ b/pkgs/by-name/se/selenium-manager/package.nix @@ -7,25 +7,23 @@ rustPlatform.buildRustPackage rec { pname = "selenium-manager"; - version = "4.28.0"; + version = "4.29.0"; src = fetchFromGitHub { owner = "SeleniumHQ"; repo = "selenium"; tag = "selenium-${version}"; - hash = "sha256-b5xwuZ4lcwLbGhJuEmHYrFXoaTW/M0ABdK3dvbpj8oM="; + hash = "sha256-IyMXgYl/TPTpe/Y0pFyJVKj4Mp0xbkg1LSCNHzFL3bE="; }; + sourceRoot = "${src.name}/rust"; + patches = [ ./disable-telemetry.patch ]; - postPatch = '' - cd rust - ''; - useFetchCargoVendor = true; - cargoHash = "sha256-hXtF3qFzzM2TqpEP9JWdi7uU5TgFHF9lZO5bmZcEuDk="; + cargoHash = "sha256-MgnmEJif4Z4CcmBFkC5BJR67DMGm1ttObtl4LhAFw4g="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/by-name/se/setools/package.nix b/pkgs/by-name/se/setools/package.nix index 47cd6fcbcc19..d00a1b9789f9 100644 --- a/pkgs/by-name/se/setools/package.nix +++ b/pkgs/by-name/se/setools/package.nix @@ -1,16 +1,17 @@ { lib, fetchFromGitHub, - python3, + python3Packages, libsepol, libselinux, checkpolicy, withGraphics ? false, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "setools"; version = "4.5.1"; + pyproject = true; src = fetchFromGitHub { owner = "SELinuxProject"; @@ -19,25 +20,32 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-/6dOzSz2Do4d6TSS50fuak0CysoQ532zJ0bJ532BUCE="; }; - nativeBuildInputs = [ python3.pkgs.cython ]; + build-system = with python3Packages; [ + cython + setuptools + ]; + buildInputs = [ libsepol ]; - propagatedBuildInputs = - with python3.pkgs; + + dependencies = + with python3Packages; [ - enum34 libselinux - networkx setuptools ] ++ lib.optionals withGraphics [ pyqt5 ]; + optional-dependencies = { + analysis = with python3Packages; [ + networkx + pygraphviz + ]; + }; + nativeCheckInputs = [ - python3.pkgs.tox + python3Packages.tox checkpolicy ]; - preCheck = '' - export CHECKPOLICY=${checkpolicy}/bin/checkpolicy - ''; setupPyBuildFlags = [ "-i" ]; @@ -45,10 +53,19 @@ python3.pkgs.buildPythonApplication rec { export SEPOL="${lib.getLib libsepol}/lib/libsepol.a" ''; - meta = with lib; { + preCheck = '' + export CHECKPOLICY=${lib.getExe checkpolicy} + ''; + + meta = { description = "SELinux Policy Analysis Tools"; homepage = "https://github.com/SELinuxProject/setools"; - license = licenses.gpl2Only; - platforms = platforms.linux; + changelog = "https://github.com/SELinuxProject/setools/blob/${version}/ChangeLog"; + license = with lib.licenses; [ + gpl2Only + lgpl21Plus + ]; + maintainers = [ ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/si/singular/package.nix b/pkgs/by-name/si/singular/package.nix index cddb360c5885..40fa34b87761 100644 --- a/pkgs/by-name/si/singular/package.nix +++ b/pkgs/by-name/si/singular/package.nix @@ -119,12 +119,6 @@ stdenv.mkDerivation rec { -i '{}' ';' ''; - # FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009 - preConfigure = '' - substituteInPlace build-aux/ltmain.sh \ - --replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a' - ''; - hardeningDisable = lib.optional stdenv.hostPlatform.isi686 "stackprotector"; doCheck = true; # very basic checks, does not test any libraries diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix index 076c9316c158..719547bc59f0 100644 --- a/pkgs/by-name/ut/util-linux/package.nix +++ b/pkgs/by-name/ut/util-linux/package.nix @@ -8,6 +8,11 @@ capabilitiesSupport ? stdenv.hostPlatform.isLinux, libcap_ng, libxcrypt, + # Disable this by default because `mount` is setuid. However, we also support + # "dlopen" as a value here. Note that the nixpkgs setuid wrapper and ld-linux.so will filter out LD_LIBRARY_PATH + # if you set this to dlopen, so ensure you're accessing it without the wrapper if you depend on that. + cryptsetupSupport ? false, + cryptsetup, ncursesSupport ? true, ncurses, pamSupport ? true, @@ -24,9 +29,11 @@ gitUpdater, }: +let + isMinimal = cryptsetupSupport == false && !nlsSupport && !ncursesSupport && !systemdSupport; +in stdenv.mkDerivation rec { - pname = - "util-linux" + lib.optionalString (!nlsSupport && !ncursesSupport && !systemdSupport) "-minimal"; + pname = "util-linux" + lib.optionalString isMinimal "-minimal"; version = "2.40.4"; src = fetchurl { @@ -88,6 +95,14 @@ stdenv.mkDerivation rec { "--disable-su" # provided by shadow (lib.enableFeature writeSupport "write") (lib.enableFeature nlsSupport "nls") + (lib.withFeatureAs (cryptsetupSupport != false) "cryptsetup" ( + if cryptsetupSupport == true then + "yes" + else if cryptsetupSupport == "dlopen" then + "dlopen" + else + throw "invalid cryptsetupSupport value: ${toString cryptsetupSupport}" + )) (lib.withFeature ncursesSupport "ncursesw") (lib.withFeature systemdSupport "systemd") (lib.withFeatureAs systemdSupport "systemdsystemunitdir" "${placeholder "bin"}/lib/systemd/system/") @@ -113,10 +128,13 @@ stdenv.mkDerivation rec { "usrsbin_execdir=${placeholder "bin"}/sbin" ]; - nativeBuildInputs = [ - pkg-config - installShellFiles - ] ++ lib.optionals translateManpages [ po4a ]; + nativeBuildInputs = + [ + pkg-config + installShellFiles + ] + ++ lib.optionals translateManpages [ po4a ] + ++ lib.optionals (cryptsetupSupport == "dlopen") [ cryptsetup ]; buildInputs = [ @@ -124,6 +142,7 @@ stdenv.mkDerivation rec { libxcrypt sqlite ] + ++ lib.optionals (cryptsetupSupport == true) [ cryptsetup ] ++ lib.optionals pamSupport [ pam ] ++ lib.optionals capabilitiesSupport [ libcap_ng ] ++ lib.optionals ncursesSupport [ ncurses ] @@ -174,12 +193,12 @@ stdenv.mkDerivation rec { hasCol = stdenv.hostPlatform.libc == "glibc"; }; - meta = with lib; { + meta = { homepage = "https://www.kernel.org/pub/linux/utils/util-linux/"; description = "Set of system utilities for Linux"; changelog = "https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v${lib.versions.majorMinor version}/v${version}-ReleaseNotes"; # https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/tree/README.licensing - license = with licenses; [ + license = with lib.licenses; [ gpl2Only gpl2Plus gpl3Plus @@ -188,7 +207,8 @@ stdenv.mkDerivation rec { bsdOriginalUC publicDomain ]; - platforms = platforms.unix; + maintainers = with lib.maintainers; [ numinit ]; + platforms = lib.platforms.unix; pkgConfigModules = [ "blkid" "fdisk" diff --git a/pkgs/by-name/wa/waydroid/package.nix b/pkgs/by-name/wa/waydroid/package.nix index 63a9a0343518..d97feb4bd87d 100644 --- a/pkgs/by-name/wa/waydroid/package.nix +++ b/pkgs/by-name/wa/waydroid/package.nix @@ -57,7 +57,6 @@ python3Packages.buildPythonApplication rec { dontUseSetuptoolsBuild = true; dontUsePipInstall = true; - dontUseSetuptoolsCheck = true; dontWrapPythonPrograms = true; dontWrapGApps = true; diff --git a/pkgs/by-name/za/zap-chip/package.nix b/pkgs/by-name/za/zap-chip/package.nix index 882f72805bb1..cd665e81cbc0 100644 --- a/pkgs/by-name/za/zap-chip/package.nix +++ b/pkgs/by-name/za/zap-chip/package.nix @@ -10,16 +10,16 @@ buildNpmPackage rec { pname = "zap-chip"; - version = "2024.09.27"; + version = "2025.02.26"; src = fetchFromGitHub { owner = "project-chip"; repo = "zap"; rev = "v${version}"; - hash = "sha256-Dc5rU4jJ6aJpk8mwL+XNSmtisYxF86VzXd/Aacd4p0o="; + hash = "sha256-oYw1CxeCr4dUpw7hhXjtB+QwTfBI7rG9jgfxWKZYsSc="; }; - npmDepsHash = "sha256-ZFksGwKlXkz6XTs2QdalGB0hR16HfB69XQOFWI9X/KY="; + npmDepsHash = "sha256-dcnJfxgF1S2gyR+wPnBD4AFzix5Sdq2ZqDlXvWAFb8s="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; env.CYPRESS_INSTALL_BINARY = "0"; diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index 4b2026436f4b..b39f302274a3 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -46,12 +46,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-update-mimedb" ]; - # FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009 - postConfigure = '' - substituteInPlace libtool \ - --replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a' - ''; - enableParallelBuilding = true; passthru.updateScript = mateUpdateScript { inherit pname; }; diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index 6f680692aa97..01566f483a6b 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -50,12 +50,6 @@ stdenv.mkDerivation rec { hicolor-icon-theme ]; - # FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009 - postConfigure = '' - substituteInPlace libtool \ - --replace-warn 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a' - ''; - enableParallelBuilding = true; passthru.updateScript = mateUpdateScript { inherit pname; }; diff --git a/pkgs/development/compilers/gcc/common/builder.nix b/pkgs/development/compilers/gcc/common/builder.nix index 47b3ed1d3adc..4900af162adf 100644 --- a/pkgs/development/compilers/gcc/common/builder.nix +++ b/pkgs/development/compilers/gcc/common/builder.nix @@ -278,7 +278,6 @@ originalAttrs: targetLibDir="''${targetConfig+$targetConfig/}lib" moveToOutput "$targetLibDir/lib*.so*" "''${!outputLib}" - moveToOutput "$targetLibDir/lib*.la" "''${!outputLib}" moveToOutput "$targetLibDir/lib*.dylib" "''${!outputLib}" moveToOutput "$targetLibDir/lib*.dll.a" "''${!outputLib}" moveToOutput "$targetLibDir/lib*.dll" "''${!outputLib}" @@ -288,19 +287,18 @@ originalAttrs: moveToOutput "$targetLibDir/lib*.a" "''${!outputLib}" fi - for i in "''${!outputLib}"/$targetLibDir/*.{la,py}; do + for i in "''${!outputLib}"/$targetLibDir/*.py; do substituteInPlace "$i" --replace "$out" "''${!outputLib}" done # Multilib and cross can't exist at the same time, so just use lib64 here if [ -n "$enableMultilib" ]; then moveToOutput "lib64/lib*.so*" "''${!outputLib}" - moveToOutput "lib64/lib*.la" "''${!outputLib}" moveToOutput "lib64/lib*.dylib" "''${!outputLib}" moveToOutput "lib64/lib*.dll.a" "''${!outputLib}" moveToOutput "lib64/lib*.dll" "''${!outputLib}" - for i in "''${!outputLib}"/lib64/*.{la,py}; do + for i in "''${!outputLib}"/lib64/*.py; do substituteInPlace "$i" --replace "$out" "''${!outputLib}" done fi @@ -313,6 +311,12 @@ originalAttrs: # More dependencies with the previous gcc or some libs (gccbug stores the build command line) rm -rf $out/bin/gccbug + # Remove .la files, they're not adjusted for the makeCompatibilitySymlink magic, + # which confuses libtool and leads to weird linking errors. + # Removing the files just makes libtool link .so files directly, which is usually + # what we want anyway. + find $out -name '*.la' -delete + if type "install_name_tool"; then for i in "''${!outputLib}"/lib/*.*.dylib "''${!outputLib}"/lib/*.so.[0-9]; do install_name_tool -id "$i" "$i" || true diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 88f7ea48fdc8..fec3603260ed 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -20,12 +20,12 @@ let }; # By unofficial and very loose convention we keep the latest version of # SBCL, and the previous one in case someone quickly needs to roll back. - "2.5.0" = { - sha256 = "sha256-Lhiv0Ijkot8ht3uuLhcM5XDRHabSdgcpImXxzGqKGbE="; - }; "2.5.1" = { sha256 = "sha256-QTOzbNFtFNYzlpw3/VHCyJqOpdbhYRVSgZ2R9xshn4s="; }; + "2.5.2" = { + sha256 = "sha256-XcJ+un3aQz31P9dEHeixFHSoLNrBaJwfbOVfoGXWX6w="; + }; }; # 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/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 38afdb3026b9..d8b8f661ee2a 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -146,13 +146,60 @@ in }; pytestCheckHook = callPackage ( - { makePythonHook, pytest }: + { + makePythonHook, + pytest, + # For package tests + testers, + objprint, + }: makePythonHook { name = "pytest-check-hook"; propagatedBuildInputs = [ pytest ]; substitutions = { inherit pythonCheckInterpreter; }; + passthru = { + tests = { + basic = objprint.overridePythonAttrs (previousPythonAttrs: { + pname = "test-pytestCheckHook-basic-${previousPythonAttrs.pname}"; + }); + disabledTests = objprint.overridePythonAttrs (previousPythonAttrs: { + pname = "test-pytestCheckHook-disabledTests-${previousPythonAttrs.pname}"; + disabledTests = [ + "test_print" + ] ++ previousPythonAttrs.disabledTests or [ ]; + }); + disabledTestPaths = objprint.overridePythonAttrs (previousPythonAttrs: { + pname = "test-pytestCheckHook-disabledTestPaths-${previousPythonAttrs.pname}"; + disabledTestPaths = [ + "tests/test_basic.py" + ] ++ previousPythonAttrs.disabledTestPaths or [ ]; + }); + disabledTestPaths-nonexistent = testers.testBuildFailure ( + objprint.overridePythonAttrs (previousPythonAttrs: { + pname = "test-pytestCheckHook-disabledTestPaths-nonexistent-${previousPythonAttrs.pname}"; + disabledTestPaths = [ + "tests/test_foo.py" + ] ++ previousPythonAttrs.disabledTestPaths or [ ]; + }) + ); + disabledTestPaths-glob = objprint.overridePythonAttrs (previousPythonAttrs: { + pname = "test-pytestCheckHook-disabledTestPaths-glob-${previousPythonAttrs.pname}"; + disabledTestPaths = [ + "tests/test_obj*.py" + ] ++ previousPythonAttrs.disabledTestPaths or [ ]; + }); + disabledTestPaths-glob-nonexistent = testers.testBuildFailure ( + objprint.overridePythonAttrs (previousPythonAttrs: { + pname = "test-pytestCheckHook-disabledTestPaths-glob-nonexistent-${previousPythonAttrs.pname}"; + disabledTestPaths = [ + "tests/test_foo*.py" + ] ++ previousPythonAttrs.disabledTestPaths or [ ]; + }) + ); + }; + }; } ./pytest-check-hook.sh ) { }; diff --git a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh index 855c770e31b1..ff95f73ba20c 100644 --- a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh @@ -18,7 +18,7 @@ function pytestCheckPhase() { concatTo _pathsArray disabledTestPaths for path in "${_pathsArray[@]}"; do # Check if every path glob matches at least one path - @pythonCheckInterpreter@ <(cat < $GDK_PIXBUF/loaders.cache.tmp diff --git a/pkgs/development/libraries/qca/default.nix b/pkgs/development/libraries/qca/default.nix index 1f9524357c34..0412c725079c 100644 --- a/pkgs/development/libraries/qca/default.nix +++ b/pkgs/development/libraries/qca/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { pname = "qca"; - version = "2.3.9"; + version = "2.3.10"; src = fetchurl { url = "mirror://kde/stable/qca/${version}/qca-${version}.tar.xz"; - sha256 = "sha256-xVXVKYzde2uv4rH5YQbzDPpUOiPUWdUMipHqwzxHbk4="; + sha256 = "sha256-HFtyLak9VZNlcZImuxIccm7DwNxMZ96jTx5Q5ODRSgI="; }; buildInputs = [ diff --git a/pkgs/development/libraries/webrtc-audio-processing/0.3.nix b/pkgs/development/libraries/webrtc-audio-processing/0.3.nix index c9141b34a94d..92567d5c69e2 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/0.3.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/0.3.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, darwin }: +{ lib, stdenv, fetchurl, fetchpatch, darwin, autoreconfHook, pkg-config }: stdenv.mkDerivation rec { pname = "webrtc-audio-processing"; @@ -20,8 +20,25 @@ stdenv.mkDerivation rec { url = "https://gitlab.freedesktop.org/pulseaudio/pulseaudio/uploads/2994c0512aaa76ebf41ce11c7b9ba23e/webrtc-audio-processing-0.2-big-endian.patch"; hash = "sha256-zVAj9H8SJureQd0t5O5v1je4ia8/gHJOXYxuEBEB6gg="; }) + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/2f3c3b1d9dadc25356da4b612130bf4dea27b817/audio/webrtc-audio-processing0/files/patch-configure.ac"; + hash = "sha256-IOSW3ZLIuRXY/M+MU813M9o0Vu4mcGoAtdNRlJwESHw="; + extraPrefix = ""; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/27f26f19a34755fe4b939a7210d8ba7ee9358a0d/audio/webrtc-audio-processing0/files/patch-webrtc_base_stringutils.h"; + hash = "sha256-j85CdFpDIPhhEquwA3P0r5djnMEGVnvfsPM2bYbURt8="; + extraPrefix = ""; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/0d316feccaf89c1bd804d6001274426a7135c93a/audio/webrtc-audio-processing0/files/patch-webrtc_base_platform__thread.cc"; + hash = "sha256-MsZtNWv3bwxJLxpQaMqj34XIBhqAaO2NkBHjlFWZreA="; + extraPrefix = ""; + }) ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); patchPhase = lib.optionalString stdenv.hostPlatform.isMusl '' diff --git a/pkgs/development/python-modules/adguardhome/default.nix b/pkgs/development/python-modules/adguardhome/default.nix index 55d050b6ecaa..af0172724753 100644 --- a/pkgs/development/python-modules/adguardhome/default.nix +++ b/pkgs/development/python-modules/adguardhome/default.nix @@ -6,6 +6,7 @@ fetchFromGitHub, poetry-core, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, yarl, @@ -27,7 +28,6 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "--cov" "" \ --replace-fail '"0.0.0"' '"${version}"' ''; @@ -43,6 +43,7 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses pytest-asyncio + pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index fd057e035489..d4a473ebeefe 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, setuptools, @@ -32,13 +33,14 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail " --cov aioconsole --strict-markers --count 2 -vv" "" + --replace-fail " --strict-markers --count 2 -vv" "" ''; build-system = [ setuptools ]; nativeCheckInputs = [ pytest-asyncio + pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aiocron/default.nix b/pkgs/development/python-modules/aiocron/default.nix index 0701fdab407a..a6a14212c761 100644 --- a/pkgs/development/python-modules/aiocron/default.nix +++ b/pkgs/development/python-modules/aiocron/default.nix @@ -7,6 +7,7 @@ croniter, tzlocal, pytestCheckHook, + pytest-cov-stub, }: buildPythonPackage rec { @@ -28,11 +29,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + pytest-cov-stub tzlocal ]; postPatch = '' - sed -i "/--cov/d" setup.cfg sed -i "/--ignore/d" setup.cfg ''; diff --git a/pkgs/development/python-modules/aiohttp-asyncmdnsresolver/default.nix b/pkgs/development/python-modules/aiohttp-asyncmdnsresolver/default.nix index 19ae19352c2b..f20c0156768b 100644 --- a/pkgs/development/python-modules/aiohttp-asyncmdnsresolver/default.nix +++ b/pkgs/development/python-modules/aiohttp-asyncmdnsresolver/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiohttp-asyncmdnsresolver"; - version = "0.1.0"; + version = "0.1.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "aiohttp-asyncmdnsresolver"; rev = "v${version}"; - hash = "sha256-z0m8dlzl6mglTOW9BwLbFcRjxcF14yz8+SE8SqjNu+c="; + hash = "sha256-gtB5vnlOVeAFACnhR5DIS5p3caZkOXrollXFINl/7hQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix b/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix index 77ca01bfda4c..691166682984 100644 --- a/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix +++ b/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "aiohttp-fast-zlib"; - version = "0.2.1"; + version = "0.2.3"; pyproject = true; src = fetchFromGitHub { owner = "bdraco"; repo = "aiohttp-fast-zlib"; tag = "v${version}"; - hash = "sha256-OVxt1SQXOFbgnmA3FP56xixmgh5gOe/HDgzPVlr0JPg="; + hash = "sha256-PQ44XFdaolxGQTwzssv1inOUAGAyYghS3SVLq4w5SoA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix index 080e154ef496..57af49298227 100644 --- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -5,6 +5,7 @@ fetchPypi, jinja2, pytest-aiohttp, + pytest-cov-stub, pytestCheckHook, pythonOlder, setuptools, @@ -31,16 +32,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-aiohttp + pytest-cov-stub pytestCheckHook ]; __darwinAllowLocalNetworking = true; - postPatch = '' - substituteInPlace pytest.ini \ - --replace-fail "--cov=aiohttp_jinja2/ --cov=tests/ --cov-report term" "" - ''; - pytestFlagsArray = [ "-W" "ignore::DeprecationWarning" diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index 80fb02ce03ad..4f6a11849078 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -8,6 +8,7 @@ pytestCheckHook, pytest-aiohttp, pytest-asyncio, + pytest-cov-stub, pythonOlder, setuptools, }: @@ -28,8 +29,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail 'version = "0.0.0"' 'version = "${version}"' \ - --replace-fail "--cov" "" + --replace-fail 'version = "0.0.0"' 'version = "${version}"' ''; build-system = [ setuptools ]; @@ -44,6 +44,7 @@ buildPythonPackage rec { pytestCheckHook pytest-asyncio pytest-aiohttp + pytest-cov-stub ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/aiokef/default.nix b/pkgs/development/python-modules/aiokef/default.nix index 52289adda842..ed6251b4ce04 100644 --- a/pkgs/development/python-modules/aiokef/default.nix +++ b/pkgs/development/python-modules/aiokef/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, + pytest-cov-stub, pythonOlder, tenacity, }: @@ -23,7 +24,6 @@ buildPythonPackage rec { postPatch = '' substituteInPlace tox.ini \ - --replace "--cov --cov-append --cov-fail-under=30 --cov-report=" "" \ --replace "--mypy" "" ''; @@ -32,7 +32,10 @@ buildPythonPackage rec { tenacity ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; pytestFlagsArray = [ "tests" ]; pythonImportsCheck = [ "aiokef" ]; diff --git a/pkgs/development/python-modules/aiolimiter/default.nix b/pkgs/development/python-modules/aiolimiter/default.nix index 1603d1009da3..f6f5dfdc575b 100644 --- a/pkgs/development/python-modules/aiolimiter/default.nix +++ b/pkgs/development/python-modules/aiolimiter/default.nix @@ -5,6 +5,7 @@ poetry-core, importlib-metadata, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, toml, @@ -30,15 +31,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio + pytest-cov-stub pytestCheckHook toml ]; - postPatch = '' - substituteInPlace tox.ini \ - --replace " --cov=aiolimiter --cov-config=tox.ini --cov-report term-missing" "" - ''; - pythonImportsCheck = [ "aiolimiter" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/aiopvpc/default.nix b/pkgs/development/python-modules/aiopvpc/default.nix index ae8d7c7c72d8..0db3a0ba5c85 100644 --- a/pkgs/development/python-modules/aiopvpc/default.nix +++ b/pkgs/development/python-modules/aiopvpc/default.nix @@ -7,6 +7,7 @@ poetry-core, pytest-asyncio, pytest-timeout, + pytest-cov-stub, pytestCheckHook, pythonOlder, python-dotenv, @@ -26,11 +27,6 @@ buildPythonPackage rec { hash = "sha256-1xeXfhoXRfJ7vrpRPeYmwcAGjL09iNCOm/f4pPvuZLU="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail " --cov --cov-report term --cov-report html" "" - ''; - build-system = [ poetry-core ]; dependencies = [ @@ -41,6 +37,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio pytest-timeout + pytest-cov-stub pytestCheckHook python-dotenv ]; diff --git a/pkgs/development/python-modules/aioshutil/default.nix b/pkgs/development/python-modules/aioshutil/default.nix index 44058048114f..9dda013dff72 100644 --- a/pkgs/development/python-modules/aioshutil/default.nix +++ b/pkgs/development/python-modules/aioshutil/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, setuptools-scm, @@ -22,15 +23,11 @@ buildPythonPackage rec { hash = "sha256-hSUNx43sIUPs4YfQ+H39FXTpj3oCMUqRzDdHX2OdRdE="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace-fail " --cov aioshutil --cov-report xml" "" - ''; - nativeBuildInputs = [ setuptools-scm ]; nativeCheckInputs = [ pytest-asyncio + pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aiosignal/default.nix b/pkgs/development/python-modules/aiosignal/default.nix index cf74cfca0fb1..128e8c4f2d9b 100644 --- a/pkgs/development/python-modules/aiosignal/default.nix +++ b/pkgs/development/python-modules/aiosignal/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, frozenlist, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, }: @@ -26,13 +27,13 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio + pytest-cov-stub pytestCheckHook ]; postPatch = '' substituteInPlace setup.cfg \ - --replace "filterwarnings = error" "" \ - --replace "--cov=aiosignal" "" + --replace "filterwarnings = error" "" ''; pythonImportsCheck = [ "aiosignal" ]; diff --git a/pkgs/development/python-modules/aiosonic/default.nix b/pkgs/development/python-modules/aiosonic/default.nix index 739daea01132..29c7ad646fa3 100644 --- a/pkgs/development/python-modules/aiosonic/default.nix +++ b/pkgs/development/python-modules/aiosonic/default.nix @@ -18,6 +18,7 @@ proxy-py, pytest-aiohttp, pytest-asyncio, + pytest-cov-stub, pytest-django, pytest-mock, pytest-sugar, @@ -51,8 +52,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pytest.ini --replace-fail \ - "addopts = --black --cov=aiosonic --cov-report term --cov-report html --doctest-modules" \ - "addopts = --doctest-modules" + "addopts = --black " \ + "addopts = " ''; build-system = [ poetry-core ]; @@ -74,6 +75,7 @@ buildPythonPackage rec { proxy-py pytest-aiohttp pytest-asyncio + pytest-cov-stub pytest-django pytest-mock pytest-sugar diff --git a/pkgs/development/python-modules/aiosqlite/default.nix b/pkgs/development/python-modules/aiosqlite/default.nix index e96151d4df66..6c9e50a7dd6e 100644 --- a/pkgs/development/python-modules/aiosqlite/default.nix +++ b/pkgs/development/python-modules/aiosqlite/default.nix @@ -4,27 +4,24 @@ fetchFromGitHub, flit-core, pytestCheckHook, - pythonOlder, typing-extensions, }: buildPythonPackage rec { pname = "aiosqlite"; - version = "0.20.0"; - format = "pyproject"; - - disabled = pythonOlder "3.8"; + version = "0.21.0"; + pyproject = true; src = fetchFromGitHub { owner = "omnilib"; - repo = pname; + repo = "aiosqlite"; tag = "v${version}"; - hash = "sha256-JQ9iNxK7FvBhPyr825d+8P5ZYFztDIX3gOwp4FPfyU4="; + hash = "sha256-3l/uR97WuLlkAEdogL9iYoXp89bsAcpH6XEtMELsX9o="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ typing-extensions ]; + dependencies = [ typing-extensions ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -36,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Asyncio bridge to the standard sqlite3 module"; homepage = "https://github.com/jreese/aiosqlite"; - changelog = "https://github.com/omnilib/aiosqlite/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/omnilib/aiosqlite/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/aiosteamist/default.nix b/pkgs/development/python-modules/aiosteamist/default.nix index 3ab9437204ca..dc4e98180c40 100644 --- a/pkgs/development/python-modules/aiosteamist/default.nix +++ b/pkgs/development/python-modules/aiosteamist/default.nix @@ -5,6 +5,7 @@ fetchFromGitHub, poetry-core, pytestCheckHook, + pytest-cov-stub, pythonOlder, xmltodict, }: @@ -23,11 +24,6 @@ buildPythonPackage rec { hash = "sha256-e7Nt/o2A1qn2nSpWv6ZsZHn/WpcXKzol+f+JNJaSb4w="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "--cov=aiosteamist" "" - ''; - build-system = [ poetry-core ]; dependencies = [ @@ -37,6 +33,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + pytest-cov-stub ]; pythonImportsCheck = [ "aiosteamist" ]; diff --git a/pkgs/development/python-modules/aioweenect/default.nix b/pkgs/development/python-modules/aioweenect/default.nix index f1074a83ed59..dda6c9234ce4 100644 --- a/pkgs/development/python-modules/aioweenect/default.nix +++ b/pkgs/development/python-modules/aioweenect/default.nix @@ -6,6 +6,7 @@ fetchFromGitHub, hatchling, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, }: @@ -26,7 +27,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "--cov --cov-report term-missing --cov=src/aioweenect --asyncio-mode=auto" "" + --replace-fail "--asyncio-mode=auto" "" ''; pythonRelaxDeps = [ "aiohttp" ]; @@ -38,6 +39,7 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses pytest-asyncio + pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aiozoneinfo/default.nix b/pkgs/development/python-modules/aiozoneinfo/default.nix index f0f0c22aa8b6..e177eb55607e 100644 --- a/pkgs/development/python-modules/aiozoneinfo/default.nix +++ b/pkgs/development/python-modules/aiozoneinfo/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, poetry-core, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, tzdata, @@ -23,17 +24,13 @@ buildPythonPackage rec { hash = "sha256-7qd6Yk/K4BLocu8eQK0hLaw2r1jhWIHBr9W4KsAvmx8="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "--cov=aiozoneinfo --cov-report=term-missing:skip-covered" "" - ''; - build-system = [ poetry-core ]; dependencies = [ tzdata ]; nativeCheckInputs = [ pytest-asyncio + pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 4cc93413c77f..41c124768b13 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "alembic"; - version = "1.14.0"; + version = "1.14.1"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-sAiStTs2QtC42+26I02/GSS2m+g6mnadWmJLAQlOMEs="; + hash = "sha256-SW6IgkWlOt8UmPyrMXE6Rpxlg2+N524BOZqhw+kN0hM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 5c6bf0175247..7cf89891c004 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -8,7 +8,6 @@ setuptools, ansible, cryptography, - importlib-resources, jinja2, junit-xml, lxml, @@ -16,7 +15,6 @@ packaging, paramiko, ansible-pylibssh, - passlib, pexpect, psutil, pycrypto, @@ -31,13 +29,15 @@ buildPythonPackage rec { pname = "ansible-core"; - version = "2.18.2"; + version = "2.18.3"; pyproject = true; + disabled = pythonOlder "3.11"; + src = fetchPypi { pname = "ansible_core"; inherit version; - hash = "sha256-clsEfTWUIwTrMi65NLmMxUQqw/SdM4J9lxccI4xLabk="; + hash = "sha256-jE6spAhFI44mAbm8nb+9T27TUCy4smMnifdc5Hir/e4="; }; # ansible_connection is already wrapped, so don't pass it through @@ -66,34 +66,30 @@ buildPythonPackage rec { build-system = [ setuptools ]; - dependencies = - [ - # depend on ansible instead of the other way around - ansible - # from requirements.txt - cryptography - jinja2 - packaging - passlib - pyyaml - resolvelib - # optional dependencies - junit-xml - lxml - ncclient - paramiko - ansible-pylibssh - pexpect - psutil - pycrypto - requests - scp - xmltodict - ] - ++ lib.optionals windowsSupport [ pywinrm ] - ++ lib.optionals (pythonOlder "3.10") [ importlib-resources ]; + dependencies = [ + # depend on ansible instead of the other way around + ansible + # from requirements.txt + cryptography + jinja2 + packaging + pyyaml + resolvelib + # optional dependencies + junit-xml + lxml + ncclient + paramiko + ansible-pylibssh + pexpect + psutil + pycrypto + requests + scp + xmltodict + ] ++ lib.optionals windowsSupport [ pywinrm ]; - pythonRelaxDeps = lib.optionals (pythonOlder "3.10") [ "importlib-resources" ]; + pythonRelaxDeps = [ "resolvelib" ]; postInstall = '' export HOME="$(mktemp -d)" diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index 893a4f569b90..df8c6e7b8400 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -3,6 +3,7 @@ pythonOlder, buildPythonPackage, fetchPypi, + setuptools, jsonschema, jxmlease, ncclient, @@ -22,25 +23,27 @@ let pname = "ansible"; - version = "11.2.0"; + version = "11.3.0"; in buildPythonPackage { inherit pname version; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-XFbXubyf2F+iDxT0gB6ImkWnq4O7EXdq11no+mdRCtQ="; + hash = "sha256-kLQJ9jDcbVWCJECaOUgxTt4bzabbLQPBdwjO9hF6YQM="; }; - postPatch = '' - # we make ansible-core depend on ansible, not the other way around - sed -Ei '/ansible-core/d' setup.py - ''; + # we make ansible-core depend on ansible, not the other way around, + # since when you install ansible-core you will not have ansible + # executables installed in the PATH variable + pythonRemoveDeps = [ "ansible-core" ]; - propagatedBuildInputs = lib.unique ( + build-system = [ setuptools ]; + + dependencies = lib.unique ( [ # Support ansible collections by default, make all others optional # ansible.netcommon @@ -62,7 +65,7 @@ buildPythonPackage { # add the dependencies for the collections you need conditionally and install # ansible using overrides to enable the collections you need. ] - ++ lib.optionals (withJunos) [ + ++ lib.optionals withJunos [ # ansible_collections/junipernetworks/junos/requirements.txt jxmlease ncclient @@ -71,7 +74,7 @@ buildPythonPackage { scp xmltodict ] - ++ lib.optionals (withNetbox) [ + ++ lib.optionals withNetbox [ # ansible_collections/netbox/netbox/pyproject.toml pynetbox ] diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix index 382f7a5827c8..847b9eca0a38 100644 --- a/pkgs/development/python-modules/asdf/default.nix +++ b/pkgs/development/python-modules/asdf/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "asdf"; - version = "4.0.0"; + version = "4.1.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "asdf-format"; repo = "asdf"; tag = version; - hash = "sha256-4fR9hc6Ez6uwi/QwOQwRyRfpbHsmGsJEtWZIj4k+9FY="; + hash = "sha256-h7OkLq9+sW507Va22cF0eez6xrI7iIaLV5D7EZFWxJQ="; }; build-system = [ @@ -60,6 +60,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # AssertionError: assert 527033 >= 1048801 + "test_update_add_array_at_end" + ]; + pythonImportsCheck = [ "asdf" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/async-modbus/default.nix b/pkgs/development/python-modules/async-modbus/default.nix index 7e2cf669e603..83efbef9a9cb 100644 --- a/pkgs/development/python-modules/async-modbus/default.nix +++ b/pkgs/development/python-modules/async-modbus/default.nix @@ -4,7 +4,7 @@ connio, fetchFromGitHub, fetchpatch, - pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, setuptools, @@ -35,8 +35,6 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace '"--cov=async_modbus",' "" \ - --replace '"--cov-report=html", "--cov-report=term",' "" \ --replace '"--durations=2", "--verbose"' "" ''; @@ -48,7 +46,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytest-asyncio + pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/asyncua/default.nix b/pkgs/development/python-modules/asyncua/default.nix index 3ba537f7ca8e..078be97adfb7 100644 --- a/pkgs/development/python-modules/asyncua/default.nix +++ b/pkgs/development/python-modules/asyncua/default.nix @@ -11,6 +11,7 @@ pytest-mock, pytestCheckHook, python-dateutil, + pythonAtLeast, pythonOlder, pytz, setuptools, @@ -66,6 +67,11 @@ buildPythonPackage rec { # Failed: DID NOT RAISE "test_publish" ] + ++ lib.optionals (pythonAtLeast "3.13") [ + # dbm.sqlite3.error: SQLite objects created in a thread can only be used in that same thread. + # The object was created in thread id 140737220687552 and this is thread id 140737343690560. + "test_runTest" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # OSError: [Errno 48] error while attempting to bind on address ('127.0.0.1',... "test_anonymous_rejection" diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix index f8824a6fef31..2781a4bfb978 100644 --- a/pkgs/development/python-modules/attrs/default.nix +++ b/pkgs/development/python-modules/attrs/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "attrs"; - version = "24.3.0"; + version = "25.1.0"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-j1wHMz1UMQNUG6e+Dizhbu7oEwyws/kjirkEzh6Fuv8="; + hash = "sha256-HJcHioDIFCc6drKimKky62gch0FcEd7gppId5/GwLD4="; }; patches = [ diff --git a/pkgs/development/python-modules/babel/default.nix b/pkgs/development/python-modules/babel/default.nix index 0499c1f52c94..e8ee122cde0c 100644 --- a/pkgs/development/python-modules/babel/default.nix +++ b/pkgs/development/python-modules/babel/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "babel"; - version = "2.16.0"; + version = "2.17.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0fNVTKJmBf4XPz3gxl91D1pC+SRJm/E03mQjWCKY4xY="; + hash = "sha256-DFTP+xn2kM3MUqO1C8v3HgeoCNHIDVSfJFm50s8K+50="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index a8ed1cac5987..2c46f8599ff6 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "bcrypt"; - version = "4.2.1"; + version = "4.3.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Z2U4bjq4f1abJ2mIdCA5uqsIeyzbAegJ1050UDwvqv4="; + hash = "sha256-Oj/SIEF4ttKtzwnLT2Qm/+9UdiV3p8m1TBWQCMsojBg="; }; cargoRoot = "src/_bcrypt"; @@ -36,7 +36,7 @@ buildPythonPackage rec { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-tCeXgypF5Tqnzv7KfoliUZeO6B83YK5cYORhwlvBVnY="; + hash = "sha256-HgHvfMBspPsSYhllnKBg5XZB6zxFIqJj+4//xKG8HwA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/beanhub-extract/default.nix b/pkgs/development/python-modules/beanhub-extract/default.nix index 4a1857bfdd7e..bf21ebb68d4a 100644 --- a/pkgs/development/python-modules/beanhub-extract/default.nix +++ b/pkgs/development/python-modules/beanhub-extract/default.nix @@ -26,6 +26,8 @@ buildPythonPackage rec { build-system = [ poetry-core ]; + pythonRelaxDeps = [ "pytz" ]; + dependencies = [ iso8601 pytz diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index 3890c2b57da8..0f1e74be5faa 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -4,20 +4,23 @@ fetchPypi, python, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "bitarray"; - version = "3.0.0"; - format = "setuptools"; + version = "3.1.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ogg9wg8Ngop833oWsg2uVqqw9D3E80ejswOfZXeZKwM="; + hash = "sha256-cXVxcaRerFh4KGHEkTe6O+0NpIkVUxGFf2n06br4H6Q="; }; + build-system = [ setuptools ]; + checkPhase = '' cd $out ${python.interpreter} -c 'import bitarray; bitarray.test()' diff --git a/pkgs/development/python-modules/bitlist/default.nix b/pkgs/development/python-modules/bitlist/default.nix index 76d2b45b2605..0744302e4af5 100644 --- a/pkgs/development/python-modules/bitlist/default.nix +++ b/pkgs/development/python-modules/bitlist/default.nix @@ -6,6 +6,7 @@ wheel, parts, pytestCheckHook, + pytest-cov-stub, pythonOlder, }: @@ -21,11 +22,6 @@ buildPythonPackage rec { hash = "sha256-+/rBno+OH7yEiN4K9VC6BCEPuOv8nNp0hU+fWegjqPw="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail '--cov=bitlist --cov-report term-missing' "" - ''; - build-system = [ setuptools wheel @@ -35,7 +31,10 @@ buildPythonPackage rec { dependencies = [ parts ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; pythonImportsCheck = [ "bitlist" ]; diff --git a/pkgs/development/python-modules/bitstring/default.nix b/pkgs/development/python-modules/bitstring/default.nix index a1c17c7a4aff..3f750ea48eca 100644 --- a/pkgs/development/python-modules/bitstring/default.nix +++ b/pkgs/development/python-modules/bitstring/default.nix @@ -23,6 +23,8 @@ buildPythonPackage rec { hash = "sha256-0AaOVjroVb/maFBaB55ahwWyRHHnofja4pgSgjQMsT8="; }; + pythonRelaxDeps = [ "bitarray" ]; + build-system = [ setuptools ]; dependencies = [ bitarray ]; @@ -47,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for binary data manipulation"; homepage = "https://github.com/scott-griffiths/bitstring"; + changelog = "https://github.com/scott-griffiths/bitstring/releases/tag/${src.tag}"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index 369fe4f14e73..27f18cca5279 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "black"; - version = "24.10.0"; + version = "25.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-hG6mTJev47xne3YXh5k75JkYEOzHpKk3gW3Wvd7cSHU="; + hash = "sha256-M0ltXNEiKtczkTUrSujaFSU8Xeibk6gLPiyNmhnsJmY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index 3ddfbf0b8503..fe09f4028541 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -92,10 +92,6 @@ buildPythonPackage rec { # TODO: Write a NixOS VM test? doCheck = false; - # Fails with: TypeError: don't know how to make test from: - # - dontUseSetuptoolsCheck = true; - meta = { description = "Python module for system storage configuration"; homepage = "https://github.com/storaged-project/blivet"; diff --git a/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix b/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix index 0a42ad1da817..cd888a28b16b 100644 --- a/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix +++ b/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, home-assistant-bluetooth, poetry-core, + pytest-cov-stub, pytestCheckHook, pythonOlder, sensor-state-data, @@ -23,11 +24,6 @@ buildPythonPackage rec { hash = "sha256-W+gU9YlxoCh5zRht44Ovq3Doms8UtCvUNLlSUpzsQwA="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail " --cov=bluetooth_sensor_state_data --cov-report=term-missing:skip-covered" "" - ''; - build-system = [ poetry-core ]; dependencies = [ @@ -35,7 +31,10 @@ buildPythonPackage rec { sensor-state-data ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "bluetooth_sensor_state_data" ]; diff --git a/pkgs/development/python-modules/boltons/default.nix b/pkgs/development/python-modules/boltons/default.nix index d0ef10d178b9..0f19424445c9 100644 --- a/pkgs/development/python-modules/boltons/default.nix +++ b/pkgs/development/python-modules/boltons/default.nix @@ -2,14 +2,15 @@ lib, buildPythonPackage, fetchFromGitHub, + flit-core, pytestCheckHook, pythonOlder, }: buildPythonPackage rec { pname = "boltons"; - version = "24.1.0"; - format = "setuptools"; + version = "25.0.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -17,9 +18,11 @@ buildPythonPackage rec { owner = "mahmoud"; repo = "boltons"; tag = version; - hash = "sha256-rKBuqJ4EAm0OH97oeGOgcTcMWsloyU2u/PaBEKhm8dA="; + hash = "sha256-kBOU17/jRRAGb4MGawY0PY31OJf5arVz+J7xGBoMBkg="; }; + build-system = [ flit-core ]; + nativeCheckInputs = [ pytestCheckHook ]; # Tests bind to localhost diff --git a/pkgs/development/python-modules/booleanoperations/default.nix b/pkgs/development/python-modules/booleanoperations/default.nix index 9ade956db688..f0d01e3756e5 100644 --- a/pkgs/development/python-modules/booleanoperations/default.nix +++ b/pkgs/development/python-modules/booleanoperations/default.nix @@ -41,6 +41,18 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # started failing with fonttools update from 4.55.3 -> 4.56.0 + "test_QTail_reversed_difference" + "test_QTail_reversed_intersection" + "test_QTail_reversed_union" + "test_QTail_reversed_xor" + "test_Q_difference" + "test_Q_intersection" + "test_Q_union" + "test_Q_xor" + ]; + meta = { description = "Boolean operations on paths"; homepage = "https://github.com/typemytype/booleanOperations"; diff --git a/pkgs/development/python-modules/brunt/default.nix b/pkgs/development/python-modules/brunt/default.nix index 232dae5cf1d3..a74b3725ba75 100644 --- a/pkgs/development/python-modules/brunt/default.nix +++ b/pkgs/development/python-modules/brunt/default.nix @@ -5,6 +5,7 @@ fetchPypi, aiohttp, requests, + pytest-cov-stub, pytestCheckHook, }: @@ -21,16 +22,15 @@ buildPythonPackage rec { sha256 = "e704627dc7b9c0a50c67ae90f1d320b14f99f2b2fc9bf1ef0461b141dcf1bce9"; }; - postPatch = '' - sed -i '/--cov/d' setup.cfg - ''; - propagatedBuildInputs = [ aiohttp requests ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; # tests require Brunt hardware doCheck = false; diff --git a/pkgs/development/python-modules/cached-ipaddress/default.nix b/pkgs/development/python-modules/cached-ipaddress/default.nix index 4ef791086c42..8843d82df51b 100644 --- a/pkgs/development/python-modules/cached-ipaddress/default.nix +++ b/pkgs/development/python-modules/cached-ipaddress/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "cached-ipaddress"; - version = "0.9.2"; + version = "0.10.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "cached-ipaddress"; tag = "v${version}"; - hash = "sha256-ojPza3DeeAJgUO0OS1J5YXTtzNWqLUf6YiOG9hohc+A="; + hash = "sha256-g6ffp08SXckCJthGICeuEqZ71XeLklKmz6Ziz/AHBOg="; }; build-system = [ diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index 93561a2d194e..4411b9c91bf1 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "cachetools"; - version = "5.5.0"; + version = "5.5.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "tkem"; repo = "cachetools"; tag = "v${version}"; - hash = "sha256-WG9PiUMVGaEXXHKbtOFEGjLiSbNnpSI2fXCogpGj1PI="; + hash = "sha256-CWgl2UW7+rBXRQ6N/QY3vJiLsrPfmplmQbxPp2vcdU0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix index 0779eae1c92d..bbcdbfb5fff8 100644 --- a/pkgs/development/python-modules/cairocffi/default.nix +++ b/pkgs/development/python-modules/cairocffi/default.nix @@ -56,6 +56,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "cairocffi" ]; + # Cairo tries to load system fonts by default. + # It's surfaced as a Cairo "out of memory" error in tests. + __impureHostDeps = [ "/System/Library/Fonts" ]; + meta = with lib; { changelog = "https://github.com/Kozea/cairocffi/blob/v${version}/NEWS.rst"; homepage = "https://github.com/SimonSapin/cairocffi"; diff --git a/pkgs/development/python-modules/certauth/default.nix b/pkgs/development/python-modules/certauth/default.nix index d68cbd3481c2..a3d1b9f25c95 100644 --- a/pkgs/development/python-modules/certauth/default.nix +++ b/pkgs/development/python-modules/certauth/default.nix @@ -5,6 +5,7 @@ setuptools, pyopenssl, tldextract, + pytest-cov-stub, pytestCheckHook, pythonOlder, }: @@ -24,11 +25,6 @@ buildPythonPackage rec { hash = "sha256-Rso5N0jb9k7bdorjPIUMNiZZPnzwbkxFNiTpsJ9pco0="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace-fail "--cov certauth " "" - ''; - nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ @@ -36,7 +32,10 @@ buildPythonPackage rec { tldextract ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "certauth" ]; diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix index 6fb12a08ee81..a125dc86da39 100644 --- a/pkgs/development/python-modules/certifi/default.nix +++ b/pkgs/development/python-modules/certifi/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "certifi"; - version = "2024.12.14"; + version = "2025.01.31"; pyproject = true; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = pname; repo = "python-certifi"; rev = version; - hash = "sha256-VXkgMqS+uDuKv/6VIfLwfTcYhupQtyB8g2q0NkkukYI="; + hash = "sha256-LHoFI9+vrrrRzyhWNchQYp4AAiFcQwZHdeNzMjTJ8jk="; }; patches = [ diff --git a/pkgs/development/python-modules/cfn-flip/default.nix b/pkgs/development/python-modules/cfn-flip/default.nix index e10440bd3d3e..e5ae3494d88b 100644 --- a/pkgs/development/python-modules/cfn-flip/default.nix +++ b/pkgs/development/python-modules/cfn-flip/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, click, fetchFromGitHub, + pytest-cov-stub, pytestCheckHook, pythonOlder, pyyaml, @@ -29,11 +30,10 @@ buildPythonPackage rec { six ]; - nativeCheckInputs = [ pytestCheckHook ]; - - postPatch = '' - sed -i "/--cov/d" tox.ini - ''; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; disabledTests = [ # TypeError: load() missing 1 required positional argument: 'Loader' diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix index ef33cb69e1ce..06ef5881e993 100644 --- a/pkgs/development/python-modules/cftime/default.nix +++ b/pkgs/development/python-modules/cftime/default.nix @@ -4,6 +4,7 @@ cython, fetchPypi, numpy, + pytest-cov-stub, pytestCheckHook, pythonOlder, }: @@ -20,10 +21,6 @@ buildPythonPackage rec { hash = "sha256-UKx2zJ8Qq3vUbkSnHFGmknBRtJm0QH308pqxPXQblC8="; }; - postPatch = '' - sed -i "/--cov/d" setup.cfg - ''; - nativeBuildInputs = [ cython numpy @@ -31,7 +28,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "cftime" ]; diff --git a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix index d22abf8c9164..4b4ab02edc77 100644 --- a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix +++ b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix @@ -13,6 +13,7 @@ cryptography, # tests + pytest-cov-stub, pytestCheckHook, }: @@ -46,12 +47,10 @@ buildPythonPackage { pythonImportsCheck = [ "chacha20poly1305_reuseable" ]; - preCheck = '' - substituteInPlace pyproject.toml \ - --replace-fail "--cov=chacha20poly1305_reuseable --cov-report=term-missing:skip-covered" "" - ''; - - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; meta = with lib; { description = "ChaCha20Poly1305 that is reuseable for asyncio"; diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 7f3bd134f29f..fbef13be43ad 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -10,6 +10,7 @@ path, portend, pyopenssl, + pytest-cov-stub, pytest-forked, pytest-services, pytestCheckHook, @@ -38,10 +39,7 @@ buildPythonPackage rec { postPatch = '' # Disable doctest plugin because times out substituteInPlace pytest.ini \ - --replace-fail "--doctest-modules" "-vvv" \ - --replace-fail "-p pytest_cov" "" \ - --replace-fail "--no-cov-on-fail" "" - sed -i "/--cov/d" pytest.ini + --replace-fail "--doctest-modules" "-vvv" ''; build-system = [ setuptools-scm ]; @@ -57,6 +55,7 @@ buildPythonPackage rec { nativeCheckInputs = [ objgraph path + pytest-cov-stub pytest-forked pytest-services pytestCheckHook diff --git a/pkgs/development/python-modules/cleo/default.nix b/pkgs/development/python-modules/cleo/default.nix index 0bad39ef1ed2..c9b21515f69e 100644 --- a/pkgs/development/python-modules/cleo/default.nix +++ b/pkgs/development/python-modules/cleo/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "cleo"; - version = "2.1.0"; + version = "2.2.1"; format = "pyproject"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; tag = version; - hash = "sha256-reo/7aPFU5uvZ1YPRTJDRmcMSMFru8e5ss5YmjSe3QU="; + hash = "sha256-+OvE09hbF6McdXpXdv5UBdZ0LiSOTL8xyE/+bBNIFNk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/click-option-group/default.nix b/pkgs/development/python-modules/click-option-group/default.nix index 11de4c4bc52e..5d51836c69ff 100644 --- a/pkgs/development/python-modules/click-option-group/default.nix +++ b/pkgs/development/python-modules/click-option-group/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + setuptools, click, pytestCheckHook, }: @@ -10,20 +11,26 @@ buildPythonPackage rec { pname = "click-option-group"; version = "0.5.6"; - format = "setuptools"; + pyproject = true; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "click-contrib"; - repo = pname; + repo = "click-option-group"; tag = "v${version}"; hash = "sha256-uR5rIZPPT6pRk/jJEy2rZciOXrHWVWN6BfGroQ3znas="; }; - propagatedBuildInputs = [ click ]; + build-system = [ setuptools ]; + + dependencies = [ click ]; nativeCheckInputs = [ pytestCheckHook ]; + # https://github.com/click-contrib/click-option-group/issues/65 + disabledTests = [ "test_missing_group_decl_first_api" ]; + pythonImportsCheck = [ "click_option_group" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/click-repl/default.nix b/pkgs/development/python-modules/click-repl/default.nix index 66acdd9d145d..201e0d8d4253 100644 --- a/pkgs/development/python-modules/click-repl/default.nix +++ b/pkgs/development/python-modules/click-repl/default.nix @@ -12,6 +12,7 @@ six, # tests + pytest-cov-stub, pytestCheckHook, }: @@ -27,10 +28,6 @@ buildPythonPackage rec { hash = "sha256-xCT3w0DDY73dtDL5jbssXM05Zlr44OOcy4vexgHyWiE="; }; - postPatch = '' - sed -i '/--cov=/d' pyproject.toml - ''; - nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ @@ -39,7 +36,10 @@ buildPythonPackage rec { six ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; meta = with lib; { homepage = "https://github.com/click-contrib/click-repl"; diff --git a/pkgs/development/python-modules/cligj/default.nix b/pkgs/development/python-modules/cligj/default.nix index 9be9ce2f5aca..1d3c57b3edfc 100644 --- a/pkgs/development/python-modules/cligj/default.nix +++ b/pkgs/development/python-modules/cligj/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, click, pytest, - glibcLocales, }: buildPythonPackage rec { @@ -23,11 +22,10 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest - glibcLocales ]; checkPhase = '' - LC_ALL=en_US.utf-8 pytest tests + pytest tests ''; meta = with lib; { diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index 2c9981db34a6..e8b45599e1ea 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, pytestCheckHook, @@ -27,10 +26,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - preConfigure = '' - export LC_ALL=${if stdenv.hostPlatform.isDarwin then "en_US" else "C"}.UTF-8 - ''; - meta = with lib; { description = "Updated configparser from Python 3.7 for Python 2.6+"; homepage = "https://github.com/jaraco/configparser"; diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index ec87fbe89d23..24041f83ea99 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "cryptography"; - version = "44.0.1"; # Also update the hash in vectors.nix + version = "44.0.2"; # Also update the hash in vectors.nix pyproject = true; disabled = pythonOlder "3.7"; @@ -33,13 +33,13 @@ buildPythonPackage rec { owner = "pyca"; repo = "cryptography"; tag = version; - hash = "sha256-PM7InFrRY0ho8qcBcVqqcXV9eVP8fF0ma/y4C0gx1Ic="; + hash = "sha256-nXwW6v+U47/+CmjhREHcuQ7QQi/b26gagWBQ3F16DuQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-hjfSjmwd/mylVZKyXsj/pP2KvAGDpfthuT+w219HAiA="; + hash = "sha256-HbUsV+ABE89UvhCRZYXr+Q/zRDKUy+HgCVdQFHqaP4o="; }; postPatch = '' diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index d62321188676..0c9f40976766 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -15,10 +15,10 @@ buildPythonPackage rec { src = fetchPypi { pname = "cryptography_vectors"; inherit version; - hash = "sha256-WphmsURl3PrxK837wzkph7tVnzesi4pMm2NZvno9fqA="; + hash = "sha256-qzLhVrbn6vbYxyejIkWWfczgSUhzAUgvyjjAxf3ITks="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; # No tests included doCheck = false; diff --git a/pkgs/development/python-modules/cython/default.nix b/pkgs/development/python-modules/cython/default.nix index 9921c3e86f9b..41c4230dc194 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.0.11-1"; + version = "3.0.12"; pyproject = true; src = fetchFromGitHub { owner = "cython"; repo = "cython"; tag = version; - hash = "sha256-P2k21uNC6X+R6a1dWAIspGnUc6JwAzRXUleVfZG+vqY="; + hash = "sha256-clJXjQb6rVECirKRUGX0vD5a6LILzPwNo7+6KKYs2pI="; }; build-system = [ diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index f347cc0a1a5b..508382d0dd48 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "deepdiff"; - version = "8.1.1"; + version = "8.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "seperman"; repo = "deepdiff"; tag = version; - hash = "sha256-b1L+8xOqxY2nI8UxZHxs3x28mVAzaRuPjYlPSqSapwk="; + hash = "sha256-5RiYVNdKfTRNeqtbKwFdbB5Z12eAMNdaOFCNevR6H6w="; }; build-system = [ diff --git a/pkgs/development/python-modules/deprecated/default.nix b/pkgs/development/python-modules/deprecated/default.nix index 4c2d6b1b2b95..b330d700489a 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.15"; + version = "1.2.18"; pyproject = true; outputs = [ @@ -23,14 +23,9 @@ buildPythonPackage rec { owner = "tantale"; repo = "deprecated"; tag = "v${version}"; - hash = "sha256-slMPL2L0TZ7L19nfHMOM4jQlkJ7HIyyDPlfC9yhhd98="; + hash = "sha256-gx5D1KAPELKfb2U93lvuztv3Ea3V+PshcfshIS6uwCo="; }; - patches = [ - # https://github.com/laurent-laporte-pro/deprecated/pull/79 - ./sphinx8-compat.patch - ]; - build-system = [ setuptools ]; nativeBuildInputs = [ sphinxHook ]; diff --git a/pkgs/development/python-modules/deprecated/sphinx8-compat.patch b/pkgs/development/python-modules/deprecated/sphinx8-compat.patch deleted file mode 100644 index 7e8a7801efdf..000000000000 --- a/pkgs/development/python-modules/deprecated/sphinx8-compat.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/docs/source/conf.py b/docs/source/conf.py -index bed3b95..bd81db5 100644 ---- a/docs/source/conf.py -+++ b/docs/source/conf.py -@@ -173,9 +173,9 @@ texinfo_documents = [ - - # Example configuration for intersphinx: refer to the Python standard library. - intersphinx_mapping = { -- 'https://docs.python.org/3/': None, -- 'https://wrapt.readthedocs.io/en/latest/': None, -- 'http://flask.pocoo.org/docs/1.0/': None, -+ 'python': ('https://docs.python.org/3/', None), -+ 'wrapt': ('https://wrapt.readthedocs.io/en/latest/', None), -+ 'flask': ('http://flask.pocoo.org/docs/1.0/', None), - 'django': ('https://docs.djangoproject.com/en/2.1/', 'https://docs.djangoproject.com/en/2.1/_objects/'), - } - diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix index c175f21bc01b..44c17f782993 100644 --- a/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/pkgs/development/python-modules/django-cors-headers/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "django-cors-headers"; - version = "4.6.0"; + version = "4.7.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "adamchainz"; repo = "django-cors-headers"; tag = version; - hash = "sha256-Dvsuj+U1YFC9jT5qkh2h1aL71JkRsAyXW4rxhLzEbOw="; + hash = "sha256-xKdHUGsl9H724IQn/AFtdumB/TH8m2pUUXs263gYsEg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index b5183c00d9dd..f1e54fc8dd9a 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { pname = "django"; - version = "4.2.19"; + version = "4.2.20"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -54,7 +54,7 @@ buildPythonPackage rec { owner = "django"; repo = "django"; rev = "refs/tags/${version}"; - hash = "sha256-aSTrtZs8WyZ/wr01N7Mi7M3A8MlZ6rB9fBuMdCkKkok="; + hash = "sha256-RmClB0ntPzcUzsy1lKn3G5IUoNiXiYuM+/LLj0JyFfQ="; }; patches = diff --git a/pkgs/development/python-modules/docutils/default.nix b/pkgs/development/python-modules/docutils/default.nix index 260befeb00f4..2789c78eca25 100644 --- a/pkgs/development/python-modules/docutils/default.nix +++ b/pkgs/development/python-modules/docutils/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, fetchFromRepoOrCz, buildPythonPackage, @@ -34,13 +33,9 @@ let nativeCheckInputs = [ pillow ]; - # Only Darwin needs LANG, but we could set it in general. - # It's done here conditionally to prevent mass-rebuilds. - checkPhase = - lib.optionalString stdenv.hostPlatform.isDarwin ''LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" '' - + '' - ${python.interpreter} test/alltests.py - ''; + checkPhase = '' + ${python.interpreter} test/alltests.py + ''; # Create symlinks lacking a ".py" suffix, many programs depend on these names postFixup = '' diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index f22c8193f27d..22be832388d2 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "dulwich"; - version = "0.22.7"; + version = "0.22.8"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "jelmer"; repo = "dulwich"; tag = "dulwich-${version}"; - hash = "sha256-BjDTqrApdinC9T62hhZIMS1udpaiAg1+7nvryF6d6pU="; + hash = "sha256-T0Tmu5sblTkqiak9U4ltkGbWw8ZE91pTlhPVMRi5Pxk="; }; build-system = [ diff --git a/pkgs/development/python-modules/enum34/default.nix b/pkgs/development/python-modules/enum34/default.nix deleted file mode 100644 index 940fe7af28d3..000000000000 --- a/pkgs/development/python-modules/enum34/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - pythonAtLeast, - unittestCheckHook, -}: - -if pythonAtLeast "3.4" then - null -else - buildPythonPackage rec { - pname = "enum34"; - version = "1.1.10"; - - src = fetchPypi { - inherit pname version; - sha256 = "cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248"; - }; - - nativeCheckInputs = [ unittestCheckHook ]; - - meta = with lib; { - homepage = "https://pypi.python.org/pypi/enum34"; - description = "Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4"; - license = licenses.bsd0; - }; - } diff --git a/pkgs/development/python-modules/ephem/default.nix b/pkgs/development/python-modules/ephem/default.nix index c3c0a9c0bc1b..1ac8fe9bef59 100644 --- a/pkgs/development/python-modules/ephem/default.nix +++ b/pkgs/development/python-modules/ephem/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - glibcLocales, pytest, }: @@ -17,13 +16,12 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - glibcLocales pytest ]; # JPLTest uses assets not distributed in package checkPhase = '' - LC_ALL="en_US.UTF-8" pytest --pyargs ephem.tests -k "not JPLTest" + pytest --pyargs ephem.tests -k "not JPLTest" ''; pythonImportsCheck = [ "ephem" ]; diff --git a/pkgs/development/python-modules/eventkit/default.nix b/pkgs/development/python-modules/eventkit/default.nix index fb25e87fd953..c9c36d91d534 100644 --- a/pkgs/development/python-modules/eventkit/default.nix +++ b/pkgs/development/python-modules/eventkit/default.nix @@ -15,7 +15,6 @@ buildPythonPackage { src = fetchPypi { inherit pname version hash; }; propagatedBuildInputs = [ numpy ]; - dontUseSetuptoolsCheck = true; meta = with lib; { homepage = "https://github.com/erdewit/eventkit"; diff --git a/pkgs/development/python-modules/executing/default.nix b/pkgs/development/python-modules/executing/default.nix index fcd5c8a8b6f3..58c766811fe1 100644 --- a/pkgs/development/python-modules/executing/default.nix +++ b/pkgs/development/python-modules/executing/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, pythonAtLeast, pythonOlder, @@ -19,8 +18,8 @@ buildPythonPackage rec { pname = "executing"; - version = "2.1.0"; - format = "pyproject"; + version = "2.2.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -28,18 +27,10 @@ buildPythonPackage rec { owner = "alexmojaki"; repo = pname; rev = "v${version}"; - hash = "sha256-epgKMPOvPdkpRp0n5A22gZ5DeXLyI60bqzLTx5JFlLk="; + hash = "sha256-2BT4VTZBAJx8Gk4qTTyhSoBMjJvKzmL4PO8IfTpN+2g="; }; - patches = [ - (fetchpatch { - name = "python-3.12.6.patch"; - url = "https://github.com/alexmojaki/executing/commit/3f11fdcd7a017fbdca8a3a9de23dab18d3ba2100.patch"; - hash = "sha256-ZnTO9lT+bj4nekPx4D0DxjhJOCkZn6lDm5xdLrziB+4="; - }) - ]; - - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; diff --git a/pkgs/development/python-modules/explorerscript/default.nix b/pkgs/development/python-modules/explorerscript/default.nix index 329e6baf2149..e612e1fe1d9b 100644 --- a/pkgs/development/python-modules/explorerscript/default.nix +++ b/pkgs/development/python-modules/explorerscript/default.nix @@ -26,6 +26,11 @@ buildPythonPackage rec { fetchSubmodules = true; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "scikit-build-core>=0.10.7, < 0.11" "scikit-build-core" + ''; + build-system = [ setuptools scikit-build-core diff --git a/pkgs/development/python-modules/factory-boy/default.nix b/pkgs/development/python-modules/factory-boy/default.nix index b7362eb13913..0f64af0a7992 100644 --- a/pkgs/development/python-modules/factory-boy/default.nix +++ b/pkgs/development/python-modules/factory-boy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "factory-boy"; - version = "3.3.1"; + version = "3.3.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "factory_boy"; inherit version; - hash = "sha256-gxeqUonN/EX5yuVw/rB6YXcxbILjTRTfPC4fIvJqvvA="; + hash = "sha256-hmhi0iYSjfrH8rQWAofomdr1TyYSd4Mn3QPQ4ssePQM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 90279e317403..968a93b8dd6e 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -8,18 +8,19 @@ python-dateutil, setuptools, typing-extensions, + tzdata, ukpostcodeparser, validators, }: buildPythonPackage rec { pname = "faker"; - version = "33.3.1"; + version = "36.1.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Sd3jsGpWAhd7wq0BMUm29gopC3FUU5GA03tvh2rnmyA="; + hash = "sha256-fLK71MjwQOSjQK5AGemki2zx22pxvaTlph2NE7e+8o0="; }; build-system = [ setuptools ]; @@ -27,6 +28,7 @@ buildPythonPackage rec { dependencies = [ python-dateutil typing-extensions + tzdata ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index 6fe29c6e3037..ab0e2d87992b 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.115.6"; + version = "0.115.11"; pyproject = true; disabled = pythonOlder "3.7"; @@ -50,7 +50,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = "fastapi"; tag = version; - hash = "sha256-yNYjFD77q5x5DtcYdywmScuuVdyWhBoxbLYJhu1Fmno="; + hash = "sha256-fE6Bp8iaoamVe2RrFNSVUiiNzt84P1WGum1dfWAX9hk="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/fastdtw/default.nix b/pkgs/development/python-modules/fastdtw/default.nix index 09c03c5b433c..5d55886302b0 100644 --- a/pkgs/development/python-modules/fastdtw/default.nix +++ b/pkgs/development/python-modules/fastdtw/default.nix @@ -37,7 +37,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "fastdtw.fastdtw" ]; nativeCheckInputs = [ pytestCheckHook ]; - dontUseSetuptoolsCheck = true; # looks for pytest-runner preCheck = '' echo "Temporarily moving tests to $OUT to find cython modules" export PACKAGEDIR=$out/${python.sitePackages} diff --git a/pkgs/development/python-modules/fastjsonschema/default.nix b/pkgs/development/python-modules/fastjsonschema/default.nix index 4b518e5f8ef1..ad250ee1715c 100644 --- a/pkgs/development/python-modules/fastjsonschema/default.nix +++ b/pkgs/development/python-modules/fastjsonschema/default.nix @@ -3,15 +3,15 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch2, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "fastjsonschema"; - version = "2.19.1"; - format = "setuptools"; + version = "2.21.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,21 +20,13 @@ buildPythonPackage rec { repo = "python-fastjsonschema"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-UxcxVB4ldnGAYJKWEccivon1CwZD588mNiVJOJPNeN8="; + hash = "sha256-H/jmvm5U4RB9KuD5EgCedbc499Fl8L2S9Y5SXy51JP0="; }; - patches = [ - (fetchpatch2 { - name = "fastjsonschema-pytest8-compat.patch"; - url = "https://github.com/horejsek/python-fastjsonschema/commit/efc04daf4124a598182dfcfd497615cd1e633d18.patch"; - hash = "sha256-G1/PIpdN+KFfRP9pUFf/ANXLq3mzrocEHyBNWQMVOZM="; - }) - ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; - dontUseSetuptoolsCheck = true; - disabledTests = [ "benchmark" @@ -46,10 +38,16 @@ buildPythonPackage rec { "test_compile_to_code_custom_format" # cannot import temporary module created during test ]; + pytestFlagsArray = [ + # fastjsonschema.exceptions.JsonSchemaDefinitionException: Unknown format uuid/duration + "--deselect=tests/json_schema/test_draft2019.py::test" + ]; + pythonImportsCheck = [ "fastjsonschema" ]; meta = with lib; { description = "JSON schema validator for Python"; + downloadPage = "https://github.com/horejsek/python-fastjsonschema"; homepage = "https://horejsek.github.io/python-fastjsonschema/"; license = licenses.bsd3; maintainers = with maintainers; [ drewrisinger ]; diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index c162a229cac2..930498cc5a6e 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "fastparquet"; - version = "2024.5.0"; + version = "2024.11.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "dask"; repo = "fastparquet"; tag = version; - hash = "sha256-YiaVkpPzH8ZmTiEtCom9xLbKzByIt7Ilig/WlmGrYH4="; + hash = "sha256-GJ6dr36hGjpfEKcA96RpEqY8I1vXooLDGwc0A57yFTY="; }; build-system = [ diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix index 3aa7faeae458..d5d16efaeb01 100644 --- a/pkgs/development/python-modules/filelock/default.nix +++ b/pkgs/development/python-modules/filelock/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "filelock"; - version = "3.16.1"; + version = "3.17.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-wkn7/NXbR+Xi1tYhmOVlR17mXkgx4lYcjjE/p+uWFDU="; + hash = "sha256-7k53QB71duuzjNfxO5soiTGUrMIKjmjhhzC6nA5UZg4="; }; build-system = [ diff --git a/pkgs/development/python-modules/findpython/default.nix b/pkgs/development/python-modules/findpython/default.nix index 16cb43c7d198..b755709b553a 100644 --- a/pkgs/development/python-modules/findpython/default.nix +++ b/pkgs/development/python-modules/findpython/default.nix @@ -16,7 +16,7 @@ let pname = "findpython"; - version = "0.6.2"; + version = "0.6.3"; in buildPythonPackage { inherit pname version; @@ -26,7 +26,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-4MdbqfNaf5u0Qj6zG9FzWMzPFXYbaDcxdxkXeu/0ZyM="; + hash = "sha256-WGPqVVVtiq3Gk0gaFKxPNiSVJxnvwcVZGrsLSp6WXJQ="; }; nativeBuildInputs = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/geoip2/default.nix b/pkgs/development/python-modules/geoip2/default.nix index a6b7b7081e2b..605b7f67b1dc 100644 --- a/pkgs/development/python-modules/geoip2/default.nix +++ b/pkgs/development/python-modules/geoip2/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "geoip2"; - version = "4.8.1"; + version = "5.0.1"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-muouq0s+YlL0dFZSiunDWxBMRSd2OcE/zhvofJL4Qlc="; + hash = "sha256-kK+LbTaH877yUfJwitAXsw1ifRFEwAQOq8TJAXqAfYY="; }; build-system = [ diff --git a/pkgs/development/python-modules/geometric/default.nix b/pkgs/development/python-modules/geometric/default.nix index 696e4d19feec..f773239c6118 100644 --- a/pkgs/development/python-modules/geometric/default.nix +++ b/pkgs/development/python-modules/geometric/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "leeping"; repo = "geomeTRIC"; tag = version; - hash = "sha256-8kM6zaQPxtFiJGT8ZW0ivg7bJc/8sdfoTv7NGW2wwR8="; + hash = "sha256-hxNzyuupktUWDzZXXJNsVoC6m/kyE1fbfY5K6LiO+x0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/glyphsets/default.nix b/pkgs/development/python-modules/glyphsets/default.nix index 8643b21c0416..d2a33b40cb12 100644 --- a/pkgs/development/python-modules/glyphsets/default.nix +++ b/pkgs/development/python-modules/glyphsets/default.nix @@ -29,6 +29,11 @@ buildPythonPackage rec { hash = "sha256-jza6VQ3PZAQPku2hyo0KeO59r64Q9TpqLCI0dIX/URU="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "setuptools_scm>=8.1.0,<8.2" setuptools_scm + ''; + env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; build-system = [ diff --git a/pkgs/development/python-modules/google-cloud-testutils/default.nix b/pkgs/development/python-modules/google-cloud-testutils/default.nix index 5d191bfc25ee..c5b6f750cbb3 100644 --- a/pkgs/development/python-modules/google-cloud-testutils/default.nix +++ b/pkgs/development/python-modules/google-cloud-testutils/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "google-cloud-testutils"; - version = "1.5.0"; + version = "1.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_testutils"; inherit version; - hash = "sha256-ds2JgVD7rbW1A6ce41hJEodqJdtWT2wiPIuvswp3kag="; + hash = "sha256-wuCpUpc5Iny6MFoh7u9d175wL9DWHz4ZLM1f+DE+V6U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-genai/default.nix b/pkgs/development/python-modules/google-genai/default.nix index ff0bb2113fdf..e069c41cb882 100644 --- a/pkgs/development/python-modules/google-genai/default.nix +++ b/pkgs/development/python-modules/google-genai/default.nix @@ -26,6 +26,8 @@ buildPythonPackage rec { build-system = [ setuptools ]; + pythonRelaxDeps = [ "websockets" ]; + dependencies = [ google-auth httpx diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix index d8ea529bb1d8..7323ae9bc69d 100644 --- a/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/pkgs/development/python-modules/google-resumable-media/default.nix @@ -1,6 +1,7 @@ { lib, aiohttp, + brotli, buildPythonPackage, fetchPypi, google-auth, @@ -40,6 +41,7 @@ buildPythonPackage rec { }; nativeCheckInputs = [ + brotli google-cloud-testutils mock pytest-asyncio diff --git a/pkgs/development/python-modules/gruut/default.nix b/pkgs/development/python-modules/gruut/default.nix index ce857f574982..052cc3c69cf0 100644 --- a/pkgs/development/python-modules/gruut/default.nix +++ b/pkgs/development/python-modules/gruut/default.nix @@ -22,7 +22,6 @@ rapidfuzz, # checks - glibcLocales, pytestCheckHook, }: @@ -91,7 +90,6 @@ buildPythonPackage rec { ]); nativeCheckInputs = [ - glibcLocales pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); @@ -104,10 +102,6 @@ buildPythonPackage rec { "test_ar" ]; - preCheck = '' - export LC_ALL=en_US.utf-8 - ''; - pythonImportsCheck = [ "gruut" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/h5netcdf/default.nix b/pkgs/development/python-modules/h5netcdf/default.nix index 722f5b17a8f8..fee1fb5c7010 100644 --- a/pkgs/development/python-modules/h5netcdf/default.nix +++ b/pkgs/development/python-modules/h5netcdf/default.nix @@ -34,8 +34,6 @@ buildPythonPackage rec { netcdf4 ]; - dontUseSetuptoolsCheck = true; - pythonImportsCheck = [ "h5netcdf" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index ceb79e3d04a0..8abf7a6543de 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "hypothesis"; - version = "6.125.2"; + version = "6.127.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis"; rev = "hypothesis-python-${version}"; - hash = "sha256-W+rTh9ymJTvq7KA4w8YrG6Z10tcfrtKGJ1MW716nVHs="; + hash = "sha256-Ef0DbK2+HnU94F2TxcotJEt3rcIU/QOhStLOUTn7o2k="; }; # I tried to package sphinx-selective-exclude, but it throws @@ -51,9 +51,9 @@ buildPythonPackage rec { postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ attrs sortedcontainers ] ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ]; diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index a89c1d4c5271..93ca544d6ae6 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -41,33 +41,24 @@ buildPythonPackage rec { responses ]; - disabledTests = - [ - # Various tests try to access credential files which are not included with the source distribution - "test_configure_service" - "test_cp4d_authenticator" - "test_cwd" - "test_files_dict" - "test_files_duplicate_parts" - "test_files_list" - "test_get_authenticator" - "test_gzip_compression_external" - "test_iam" - "test_read_external_sources_2" - "test_retry_config_external" - # assertion error due to requests brotli support - "test_http_client" - # Tests require network access - "test_tls_v1_2" - ] - ++ lib.optionals (pythonAtLeast "3.12") [ - # Tests are blocking or failing - "test_abstract_class_instantiation" - "test_abstract_class_instantiation" - ]; + disabledTests = [ + # Various tests try to access credential files which are not included with the source distribution + "test_configure_service" + "test_cp4d_authenticator" + "test_cwd" + "test_files_dict" + "test_files_duplicate_parts" + "test_files_list" + "test_get_authenticator" + "test_gzip_compression_external" + "test_iam" + "test_read_external_sources_2" + "test_retry_config_external" + # Tests require network access + "test_tls_v1_2" + ]; disabledTestPaths = [ - "test/test_container_token_manager.py" # Tests require credentials "test_integration/" ]; diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index c4272412d087..3e1cc903fd56 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "8.5.0"; + version = "8.6.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "importlib_metadata"; inherit version; - hash = "sha256-cVImVvCrrOHQcrnlSBpI8HwTjgDwecOMj4g4I/nCa9c="; + hash = "sha256-MQtB11VEXXRWn5k8z8IoOCldn+AFQlCU+tlT1/FchYA="; }; build-system = [ diff --git a/pkgs/development/python-modules/inline-snapshot/default.nix b/pkgs/development/python-modules/inline-snapshot/default.nix index 84cf1fe0faf9..03f450d6dd10 100644 --- a/pkgs/development/python-modules/inline-snapshot/default.nix +++ b/pkgs/development/python-modules/inline-snapshot/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "inline-snapshot"; - version = "0.19.3"; + version = "0.20.5"; pyproject = true; disabled = pythonOlder "3.10"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "15r10nk"; repo = "inline-snapshot"; tag = version; - hash = "sha256-bgzDjlcZOxS3OCv8xj7qKllaZcfJaxySXOu7OwY2EIQ="; + hash = "sha256-hIOavNdD2SaYuvG1rdlIkVRALjaJDfXkanrlF9TcPo0="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/isal/default.nix b/pkgs/development/python-modules/isal/default.nix index 2626fe2e4ef5..bc4cca3eb2cd 100644 --- a/pkgs/development/python-modules/isal/default.nix +++ b/pkgs/development/python-modules/isal/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "isal"; - version = "1.7.1"; + version = "1.7.2"; pyproject = true; src = fetchFromGitHub { owner = "pycompression"; repo = "python-isal"; rev = "v${version}"; - hash = "sha256-KLnSE7QLM3q8DdoWnCEN6dOxsMr8eSH9k3FqFquZFlE="; + hash = "sha256-gvUVSGarPA4KupQTd61x75CfqNVqZfFC1zq0R21Clf8="; }; patches = [ diff --git a/pkgs/development/python-modules/jeepney/default.nix b/pkgs/development/python-modules/jeepney/default.nix index fafcfb0df3d8..0455732a5a83 100644 --- a/pkgs/development/python-modules/jeepney/default.nix +++ b/pkgs/development/python-modules/jeepney/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitLab, pythonOlder, flit-core, async-timeout, @@ -15,18 +15,17 @@ buildPythonPackage rec { pname = "jeepney"; - version = "0.8.0"; + version = "0.9"; + pyproject = true; - disabled = pythonOlder "3.7"; - - format = "pyproject"; - - src = fetchPypi { - inherit pname version; - sha256 = "5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806"; + src = fetchFromGitLab { + owner = "takluyver"; + repo = "jeepney"; + tag = version; + hash = "sha256-d8w/4PtDviTYDHO4EwaVbxlYk7CXtlv7vuR+o4LhfRs="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; nativeCheckInputs = [ async-timeout @@ -57,6 +56,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://gitlab.com/takluyver/jeepney/-/blob/${src.tag}/docs/release-notes.rst"; homepage = "https://gitlab.com/takluyver/jeepney"; description = "Pure Python DBus interface"; license = licenses.mit; diff --git a/pkgs/development/python-modules/jieba/default.nix b/pkgs/development/python-modules/jieba/default.nix index d6ea70b40011..efce378d706b 100644 --- a/pkgs/development/python-modules/jieba/default.nix +++ b/pkgs/development/python-modules/jieba/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - glibcLocales, python, isPy3k, }: @@ -20,15 +19,12 @@ buildPythonPackage rec { sha256 = "028vmd6sj6wn9l1ilw7qfmlpyiysnlzdgdlhwxs6j4fvq0gyrwxk"; }; - nativeCheckInputs = [ glibcLocales ]; - # UnicodeEncodeError doCheck = isPy3k; # Citing https://github.com/fxsjy/jieba/issues/384: "testcases is in a mess" # So just picking random ones that currently work checkPhase = '' - export LC_ALL=en_US.UTF-8 ${python.interpreter} test/test.py ${python.interpreter} test/test_tokenize.py ''; diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index d9c5c674eb9e..ccd2577b09af 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -2,7 +2,6 @@ lib, stdenv, python, - pythonAtLeast, buildPythonPackage, pythonOlder, fetchPypi, @@ -21,14 +20,14 @@ buildPythonPackage rec { pname = "jinja2"; - version = "3.1.5"; + version = "3.1.6"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-j+//jcMDTie7gNZ8Zx64qbxCTA70wIJu2/8wTM7/Q7s="; + hash = "sha256-ATf7BZkNNfEnWlh+mu5tVtqCH8g0kaD7g4GDvkP2bW0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/json5/default.nix b/pkgs/development/python-modules/json5/default.nix index 86ae590811bd..1f6944bcd88a 100644 --- a/pkgs/development/python-modules/json5/default.nix +++ b/pkgs/development/python-modules/json5/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "json5"; - version = "0.9.28"; + version = "0.10.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "dpranke"; repo = "pyjson5"; tag = "v${version}"; - hash = "sha256-CE9l+SOLTcdtyPZH/iz6y6K22UQS+CxC3HoLYlkIV8M="; + hash = "sha256-J5xZN6o9UwvCdrzEY6o3NxYaxbtiUhmTtCQJia4JmI4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/jsonlines/default.nix b/pkgs/development/python-modules/jsonlines/default.nix index fbe7007b248f..b5f3da6150ff 100644 --- a/pkgs/development/python-modules/jsonlines/default.nix +++ b/pkgs/development/python-modules/jsonlines/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "jsonlines"; - version = "3.1.0"; + version = "4.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "wbolster"; repo = pname; rev = version; - hash = "sha256-eMpUk5s49OyD+cNGdAeKA2LvpXdKta2QjZIFDnIBKC8="; + hash = "sha256-KNEJdAxEgd0NGPnk9J51C3yUN2e6Cvvevth0iKOMlhE="; }; propagatedBuildInputs = [ attrs ]; diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix index 1bf5b065445f..cbc896e89018 100644 --- a/pkgs/development/python-modules/jsonpickle/default.nix +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "jsonpickle"; - version = "4.0.1"; + version = "4.0.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-tTNhRNkClYuSywi8Hna/pHGZuK/UVDA2k4lN79L6UMU="; + hash = "sha256-PmULmFOtzaudnWKohBK2026aWbpCOwHKzwzU7oBzOso="; }; build-system = [ diff --git a/pkgs/development/python-modules/jsonschema-path/default.nix b/pkgs/development/python-modules/jsonschema-path/default.nix index feaf410959c9..074d8a997993 100644 --- a/pkgs/development/python-modules/jsonschema-path/default.nix +++ b/pkgs/development/python-modules/jsonschema-path/default.nix @@ -1,35 +1,28 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, poetry-core, pathable, pyyaml, referencing, + pytest-cov-stub, pytestCheckHook, responses, }: buildPythonPackage rec { pname = "jsonschema-path"; - version = "0.3.3"; - - disabled = pythonOlder "3.8"; - + version = "0.3.4"; pyproject = true; src = fetchFromGitHub { owner = "p1c2u"; repo = "jsonschema-path"; tag = version; - hash = "sha256-oBzB6Ke19QDcMQm4MpnaS132/prrtnCekAXuPMloZx4="; + hash = "sha256-rCepDnVAOEsokKjWCuqDYbGIq6/wn4rsQRx5dXTUsYo="; }; - postPatch = '' - sed -i '/--cov/d' pyproject.toml - ''; - build-system = [ poetry-core ]; pythonRelaxDeps = [ "referencing" ]; @@ -43,6 +36,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "jsonschema_path" ]; nativeCheckInputs = [ + pytest-cov-stub pytestCheckHook responses ]; diff --git a/pkgs/development/python-modules/karton-core/default.nix b/pkgs/development/python-modules/karton-core/default.nix index 1e32e25ca339..2e5742546175 100644 --- a/pkgs/development/python-modules/karton-core/default.nix +++ b/pkgs/development/python-modules/karton-core/default.nix @@ -26,6 +26,8 @@ buildPythonPackage rec { build-system = [ setuptools ]; + pythonRelaxDeps = [ "boto3" ]; + dependencies = [ boto3 orjson diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix index 9e8ea3dec57c..a218eec80568 100644 --- a/pkgs/development/python-modules/levenshtein/default.nix +++ b/pkgs/development/python-modules/levenshtein/default.nix @@ -13,15 +13,14 @@ buildPythonPackage rec { pname = "levenshtein"; - version = "0.27.0"; + version = "0.27.1"; pyproject = true; src = fetchFromGitHub { owner = "maxbachmann"; repo = "Levenshtein"; tag = "v${version}"; - hash = "sha256-kiYu46qv8sBBcPoCo3PN1q9F0EJ1s5hAMKavPaztM4s="; - fetchSubmodules = true; # # for vendored `rapidfuzz-cpp` + hash = "sha256-EFEyP7eqB4sUQ2ksD67kCr0BEShTiKWbk1PxXOUOGc4="; }; build-system = [ diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index 87a225095f66..f3f520f6ffb8 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "lxml"; - version = "5.3.0"; + version = "5.3.1"; pyproject = true; src = fetchFromGitHub { owner = "lxml"; repo = "lxml"; tag = "lxml-${version}"; - hash = "sha256-xhKtqsh5FfgXt1fKUhN/Aib/004P7epArv3/XxDSBtw="; + hash = "sha256-TGv2ZZQ7GU+fAWRApESUL1bbxQobbmLai8wr09xYOUw="; }; # setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix index 3e3a0438a60b..048cc8e163f7 100644 --- a/pkgs/development/python-modules/lz4/default.nix +++ b/pkgs/development/python-modules/lz4/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "lz4"; - version = "4.4.1"; + version = "4.4.3"; pyproject = true; disabled = pythonOlder "3.5"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "python-lz4"; repo = "python-lz4"; tag = "v${version}"; - hash = "sha256-dqu1sRqvtb1eyjxrCFu1vom9//qDGhgCMnPhKnIktjw="; + hash = "sha256-Jnmi2eyTGbPuqw0llQ5xpUWlj+8QvRHMwkak/GsypU0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mako/default.nix b/pkgs/development/python-modules/mako/default.nix index 4c2f7ae8c5f3..f2d95cfff5d3 100644 --- a/pkgs/development/python-modules/mako/default.nix +++ b/pkgs/development/python-modules/mako/default.nix @@ -1,10 +1,8 @@ { - stdenv, lib, buildPythonPackage, pythonOlder, fetchFromGitHub, - fetchpatch, isPyPy, # build-system @@ -25,7 +23,7 @@ buildPythonPackage rec { pname = "mako"; - version = "1.3.8"; + version = "1.3.9"; pyproject = true; disabled = pythonOlder "3.7"; @@ -34,17 +32,9 @@ buildPythonPackage rec { owner = "sqlalchemy"; repo = "mako"; tag = "rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-7KttExqHxv//q8ol7eOFIrgRHbQySQTvL7Rd9VooX0Y="; + hash = "sha256-BC1PSmMG9KzD+w8tDUW9WXJS25HNsELgwDpkTHYO9j0="; }; - patches = [ - (fetchpatch { - name = "float-precision.patch"; - url = "https://github.com/sqlalchemy/mako/commit/188d5431a5c93b937da03e70c4c2c8c42cd9a502.patch"; - hash = "sha256-/ROS6WkSqYXJsX6o1AejUg/faS3lUAimrRJzS74Bwws="; - }) - ]; - build-system = [ setuptools ]; dependencies = [ markupsafe ]; diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index a8e2768f1fbd..9e520493597b 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -89,7 +89,7 @@ let in buildPythonPackage rec { - version = "3.10.0"; + version = "3.10.1"; pname = "matplotlib"; pyproject = true; @@ -97,7 +97,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-uIbQKlgblnBMnR/+VXCeSbTS1ScJzOvEvkLbhW5REng="; + hash = "sha256-6NLQ44gbEpJoWFv0dlrT7nOkWR13uaGMIUrH46efsro="; }; env.XDG_RUNTIME_DIR = "/tmp"; diff --git a/pkgs/development/python-modules/meep/default.nix b/pkgs/development/python-modules/meep/default.nix index e9810167d395..acb4a056ef87 100644 --- a/pkgs/development/python-modules/meep/default.nix +++ b/pkgs/development/python-modules/meep/default.nix @@ -95,7 +95,6 @@ buildPythonPackage rec { dontUseSetuptoolsBuild = true; dontUsePipInstall = true; - dontUseSetuptoolsCheck = true; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/mistune/default.nix b/pkgs/development/python-modules/mistune/default.nix index 45f128abb7e8..adbe92f6f151 100644 --- a/pkgs/development/python-modules/mistune/default.nix +++ b/pkgs/development/python-modules/mistune/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "mistune"; - version = "3.1.0"; + version = "3.1.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "lepture"; repo = "mistune"; tag = "v${version}"; - hash = "sha256-gXCFBe58Ij6CiwTddsI4tkPsGBR2z9D8dnxlvTXGSMw="; + hash = "sha256-XvDp+X/+s6TsUC889qjTGzrde6s/BYoXUw2AblaATnI="; }; dependencies = lib.optionals (pythonOlder "3.11") [ diff --git a/pkgs/development/python-modules/mnist/default.nix b/pkgs/development/python-modules/mnist/default.nix index 25f2106e20cb..7e9d02346c01 100644 --- a/pkgs/development/python-modules/mnist/default.nix +++ b/pkgs/development/python-modules/mnist/default.nix @@ -24,8 +24,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - dontUseSetuptoolsCheck = true; - # disable tests which fail due to socket related errors disabledTests = [ "test_test_images_has_right_size" diff --git a/pkgs/development/python-modules/mock/default.nix b/pkgs/development/python-modules/mock/default.nix index 20c78bf4f18e..9f8895131c6d 100644 --- a/pkgs/development/python-modules/mock/default.nix +++ b/pkgs/development/python-modules/mock/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mock"; - version = "5.1.0"; + version = "5.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Xpaq1czaRxjgointlLICTfdcwtVVdbpXYtMfV2e4dn0="; + hash = "sha256-TkYOgYYptLFz8y0IvzDTr4Ejr7uOBLtXB6H9R5nlA/A="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index d824661a8bcd..366004b12cdb 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pname = "moto"; - version = "5.0.28"; + version = "5.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -46,7 +46,7 @@ buildPythonPackage rec { owner = "getmoto"; repo = "moto"; tag = version; - hash = "sha256-++kkPiI3AOTF+VlvPWhjhuiIjiHQPa3M0Nmh3+1PHSE="; + hash = "sha256-KMIOLM7KQqF2JwYWHWAD9GVKRTd2adVBubwWrnlHGoQ="; }; build-system = [ @@ -351,6 +351,9 @@ buildPythonPackage rec { # Parameter validation fails "test_conditional_write" + + # Requires newer botocore version + "test_dynamodb_with_account_id_routing" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index 780a3ce968dd..1ffadd2005f6 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "mypy"; - version = "1.14.1"; + version = "1.15.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "python"; repo = "mypy"; tag = "v${version}"; - hash = "sha256-Ha7icLFc4BL7a3NECcwX4dtWmkXctANCqu/IbrEnmjw="; + hash = "sha256-y67kt5i8mT9TcSbUGwnNuTAeqjy9apvWIbA2QD96LS4="; }; passthru.updateScript = gitUpdater { diff --git a/pkgs/development/python-modules/myst-parser/default.nix b/pkgs/development/python-modules/myst-parser/default.nix index 681a73f05723..8e1ab236ac48 100644 --- a/pkgs/development/python-modules/myst-parser/default.nix +++ b/pkgs/development/python-modules/myst-parser/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, flit-core, pythonOlder, defusedxml, @@ -21,8 +20,8 @@ }: buildPythonPackage rec { pname = "myst-parser"; - version = "4.0.0"; - format = "pyproject"; + version = "4.0.1"; + pyproject = true; disabled = pythonOlder "3.10"; @@ -30,17 +29,9 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; tag = "v${version}"; - hash = "sha256-QbFENC/Msc4pkEOPdDztjyl+2TXtAbMTHPJNAsUB978="; + hash = "sha256-/Prauz4zuJY39EK2BmgBbH1uwjF4K38e5X5hPYwRBl0="; }; - patches = [ - (fetchpatch2 { - # Sphinx 8.1 compat - url = "https://github.com/executablebooks/MyST-Parser/commit/9fe724ebf1d02fd979632d82387f802c91e0d6f6.patch"; - hash = "sha256-KkAV9tP+dFax9KuxqkhqNlGWx6wSO6M2dWpah+GYG0E="; - }) - ]; - build-system = [ flit-core ]; dependencies = [ @@ -63,9 +54,12 @@ buildPythonPackage rec { ] ++ markdown-it-py.optional-dependencies.linkify; disabledTests = [ - # sphinx 7.4 compat - "test_amsmath" - # pygments 2.19 compat + # sphinx 8.2 compat + # https://github.com/executablebooks/MyST-Parser/issues/1030 + "test_sphinx_directives" + "test_references_singlehtml" + "test_extended_syntaxes" + "test_fieldlist_extension" "test_includes" ]; diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix index e68941e7d37d..29cdab78a4d7 100644 --- a/pkgs/development/python-modules/napari/default.nix +++ b/pkgs/development/python-modules/napari/default.nix @@ -99,8 +99,6 @@ mkDerivationWith buildPythonPackage rec { wrapt ] ++ dask.optional-dependencies.array; - dontUseSetuptoolsCheck = true; - postFixup = '' wrapQtApp $out/bin/napari ''; diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index fd4b616682f3..a41b34aa4b5b 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -93,7 +93,7 @@ buildPythonPackage rec { doCheck = !stdenv.hostPlatform.isDarwin; # ignore tests which incorrect fail to detect xvfb checkPhase = '' - LC_ALL="en_US.UTF-8" pytest nipype/tests -k 'not display and not test_no_et_multiproc' + pytest nipype/tests -k 'not display and not test_no_et_multiproc' ''; pythonImportsCheck = [ "nipype" ]; diff --git a/pkgs/development/python-modules/numpydoc/default.nix b/pkgs/development/python-modules/numpydoc/default.nix index a0420c27548d..1b3e649e3c9f 100644 --- a/pkgs/development/python-modules/numpydoc/default.nix +++ b/pkgs/development/python-modules/numpydoc/default.nix @@ -51,6 +51,9 @@ buildPythonPackage rec { "test_mangle_docstring_validation_exclude" "test_mangle_docstring_validation_warnings" "test_mangle_docstrings_overrides" + # AttributeError: 'MockBuilder' object has no attribute '_translator' + "test_mangle_docstrings_basic" + "test_mangle_docstrings_inherited_class_members" ]; pythonImportsCheck = [ "numpydoc" ]; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 2a96029a4139..122d5d1b538d 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -53,7 +53,6 @@ # tests adv_cmds, glibc, - glibcLocales, hypothesis, pytestCheckHook, pytest-xdist, @@ -179,7 +178,6 @@ let nativeCheckInputs = [ - glibcLocales hypothesis pytest-asyncio pytest-xdist @@ -231,7 +229,6 @@ let preCheck = '' export HOME=$TMPDIR - export LC_ALL="en_US.UTF-8" cd $out/${python.sitePackages}/pandas '' # TODO: Get locale and clipboard support working on darwin. diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index c439b1b04cf9..5e5663c054af 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -5,7 +5,6 @@ six, pythonOlder, scandir ? null, - glibcLocales, typing, }: @@ -25,11 +24,6 @@ buildPythonPackage rec { scandir typing ]; - nativeCheckInputs = [ glibcLocales ]; - - preCheck = '' - export LC_ALL="en_US.UTF-8" - ''; meta = with lib; { description = "This module offers classes representing filesystem paths with semantics appropriate for different operating systems"; diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index d500a215be11..fe52ff5b7da9 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pbr"; - version = "6.1.0"; + version = "6.1.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-eIGD44Lj0ddwfbCJeCOZZei55OXtQmab9HWBhnNNXyQ="; + hash = "sha256-k+pyzmmJ6y7tmdD3VyFHT2mtiBKK/e9aw3freXxL92s="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 40f4865c49f4..fd6b9ff7003c 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.13.53"; + version = "8.13.55"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tzCPIYN976VntPlhkltsZS3VFI8+D629FYoQdYzGPZE="; + hash = "sha256-V8mJ3aPqurG1qePSRDijnr0DL6AXK/aL/ZCrcLPV4Is="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 9d44c2e383e0..b5491d6e3474 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pip-tools"; version = "7.4.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -31,9 +31,9 @@ buildPythonPackage rec { patches = [ ./fix-setup-py-bad-syntax-detection.patch ]; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ build click pep517 @@ -68,6 +68,19 @@ buildPythonPackage rec { "test_cli_compile_all_extras_with_multiple_packages" # Deprecations "test_error_in_pyproject_toml" + + # pip 25.0 compat issues + # https://github.com/jazzband/pip-tools/issues/2112 + # requirement doesn't end with semicolon + "test_resolver" + "test_resolver__custom_unsafe_deps" + # constraints.txt is now in a tmpdir + "test_preserve_via_requirements_constrained_dependencies_when_run_twice" + "test_annotate_option" + # TypeError("'<' not supported between instances of 'InstallationCandidate' and 'InstallationCandidate'")>.exit_code + "test_no_candidates" + "test_no_candidates_pre" + "test_failure_of_legacy_resolver_prompts_for_backtracking" ]; pythonImportsCheck = [ "piptools" ]; diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index eb946a955c67..fb3cce10c235 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -10,6 +10,7 @@ # docs sphinx, + sphinx-issues, # checks freezegun, @@ -30,14 +31,14 @@ let self = buildPythonPackage rec { pname = "pip"; - version = "24.0"; + version = "25.0.1"; format = "pyproject"; src = fetchFromGitHub { owner = "pypa"; repo = pname; tag = version; - hash = "sha256-yojk2T5wuPkS1OKusilj253AT+xyKwXCWKBNUEH2Mgo="; + hash = "sha256-V069rAL6U5KBnSc09LRCu0M7qQCH5NbMghVttlmIoRY="; }; postPatch = '' @@ -53,6 +54,7 @@ let # docs sphinx + sphinx-issues ]; outputs = [ @@ -69,7 +71,7 @@ let # sphinx.ext.intersphinx requires network connection or packaged object.inv files for python and pypug # sphinxcontrib.towncrier is not currently packaged for ext in sphinx.ext.intersphinx sphinx_copybutton sphinx_inline_tabs sphinxcontrib.towncrier myst_parser; do - substituteInPlace html/conf.py --replace '"'$ext'",' "" + substituteInPlace html/conf.py --replace-fail '"'$ext'",' "" done PYTHONPATH=$src/src:$PYTHONPATH sphinx-build -v \ diff --git a/pkgs/development/python-modules/pkg-about/default.nix b/pkgs/development/python-modules/pkg-about/default.nix index e99565720026..0ad54bbd83fb 100644 --- a/pkgs/development/python-modules/pkg-about/default.nix +++ b/pkgs/development/python-modules/pkg-about/default.nix @@ -1,28 +1,27 @@ { lib, buildPythonPackage, + docutils, fetchPypi, pythonOlder, importlib-metadata, importlib-resources, setuptools, packaging, - tomli, pytestCheckHook, }: buildPythonPackage rec { pname = "pkg-about"; - version = "1.1.8"; - format = "pyproject"; + version = "1.2.9"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.11"; src = fetchPypi { pname = "pkg_about"; inherit version; - extension = "zip"; - hash = "sha256-GVV3l0rU8gkxedOiMVVAt0bEqCtyO+1LSHxIKjBlbPk="; + hash = "sha256-NXty1yFvBLSpN5e3/KNCMOU+owkCTBaX0KINzVrUgzM="; }; # tox is listed in build requirements but not actually used to build @@ -31,17 +30,17 @@ buildPythonPackage rec { sed -i "/requires/s/, 'tox>=[^']*'//" pyproject.toml ''; - nativeBuildInputs = [ + build-system = [ packaging setuptools ]; - propagatedBuildInputs = [ + dependencies = [ + docutils importlib-metadata importlib-resources packaging setuptools - tomli ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pkginfo/default.nix b/pkgs/development/python-modules/pkginfo/default.nix index 0048c0a12607..da9483a54b5d 100644 --- a/pkgs/development/python-modules/pkginfo/default.nix +++ b/pkgs/development/python-modules/pkginfo/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pkginfo"; - version = "1.12.0"; + version = "1.12.1.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-itkaBEWgNngrk2bvi4wsUCkfg6VTR4uoWAxz0yFXAM8="; + hash = "sha256-XNlXgkrDbxQCYJZOujxr5kQqg1m4xI9K35AhDzOgS3s="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/posthog/default.nix b/pkgs/development/python-modules/posthog/default.nix index 8e27c4e00d6b..98496c26958f 100644 --- a/pkgs/development/python-modules/posthog/default.nix +++ b/pkgs/development/python-modules/posthog/default.nix @@ -1,12 +1,15 @@ { lib, + anthropic, backoff, buildPythonPackage, + distro, fetchFromGitHub, freezegun, mock, monotonic, openai, + parameterized, pytestCheckHook, python-dateutil, requests, @@ -16,20 +19,21 @@ buildPythonPackage rec { pname = "posthog"; - version = "3.8.3"; + version = "3.18.1"; pyproject = true; src = fetchFromGitHub { owner = "PostHog"; repo = "posthog-python"; tag = "v${version}"; - hash = "sha256-s4MVpJb5sRe4TIW9Bb068JTnUkObGOG3VlbWVuPPTM4="; + hash = "sha256-1jJACzDf8J4Vsrvtj0PgeK1Ck2Bzy5ThHm0Ohd+LyYs="; }; build-system = [ setuptools ]; dependencies = [ backoff + distro monotonic python-dateutil requests @@ -37,9 +41,11 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + anthropic freezegun mock openai + parameterized pytestCheckHook ]; @@ -59,7 +65,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for interacting with PostHog"; homepage = "https://github.com/PostHog/posthog-python"; - changelog = "https://github.com/PostHog/posthog-python/releases/tag/${src.tag}"; + changelog = "https://github.com/PostHog/posthog-python/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ happysalada ]; }; diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix index 32257b5ffa9a..69e14b308ef5 100644 --- a/pkgs/development/python-modules/prettytable/default.nix +++ b/pkgs/development/python-modules/prettytable/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "prettytable"; - version = "3.12.0"; + version = "3.15.1"; pyproject = true; src = fetchFromGitHub { owner = "jazzband"; repo = "prettytable"; tag = version; - hash = "sha256-RoBPmnuAOtTET898Gdm1zzPIst26GdCY5nU1PyJ+Nro="; + hash = "sha256-18FXxC1j5EWGnKzgNOr0TRRnlRXzQ9IwSe7YGx92Gf4="; }; build-system = [ diff --git a/pkgs/development/python-modules/prompt-toolkit/default.nix b/pkgs/development/python-modules/prompt-toolkit/default.nix index caa4e679ea71..a0c274dac938 100644 --- a/pkgs/development/python-modules/prompt-toolkit/default.nix +++ b/pkgs/development/python-modules/prompt-toolkit/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "prompt-toolkit"; - version = "3.0.48"; + version = "3.0.50"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "prompt_toolkit"; inherit version; - hash = "sha256-1mI6sEd6gN905ka9vJNiEUP1yvEEIGqikpTVPeGgPZA="; + hash = "sha256-VEdI84YKJiPKXNbSeV56FPPQ4cPJcoNZAT95h3/Im6s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/propcache/default.nix b/pkgs/development/python-modules/propcache/default.nix index 00a03b737ed4..6c3d35544bec 100644 --- a/pkgs/development/python-modules/propcache/default.nix +++ b/pkgs/development/python-modules/propcache/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "propcache"; - version = "0.2.1"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,9 +23,14 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "propcache"; tag = "v${version}"; - hash = "sha256-j2PjSaOx0IKijoMjhtYVNrpqEwRjVFsON5OU/Fv5idc="; + hash = "sha256-3jsQnRkXBB7/6xY44kv7JuAXz/P8oxUg8Hyg1O5w2Cg="; }; + postPatch = '' + substituteInPlace packaging/pep517_backend/_backend.py \ + --replace "Cython ~= 3.0.12" Cython + ''; + build-system = [ cython expandvars @@ -44,7 +49,7 @@ buildPythonPackage rec { meta = { description = "Fast property caching"; homepage = "https://github.com/aio-libs/propcache"; - changelog = "https://github.com/aio-libs/propcache/blob/${src.rev}/CHANGES.rst"; + changelog = "https://github.com/aio-libs/propcache/blob/${src.tag}/CHANGES.rst"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index 4e1cbc07fd08..84a994cc2d61 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "psutil"; - version = "6.1.1"; + version = "7.0.0"; pyproject = true; inherit stdenv; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-z4SWcowY8tC0UZjwaJW+UvNmEXEXRrfzDEZLQitQ4vU="; + hash = "sha256-e+nD66OL7Mtkleozr9mCpEB0t48oxDSh9RzAf9MVxFY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 46a1151edd04..9b0cf844422a 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -142,8 +142,6 @@ buildPythonPackage rec { disabledTests = [ "GcsFileSystem" ]; - dontUseSetuptoolsCheck = true; - preCheck = '' shopt -s extglob diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index b1f0e5eba83e..883a879d3b1f 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -37,6 +37,10 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + # Cairo tries to load system fonts by default. + # It's surfaced as a Cairo "out of memory" error in tests. + __impureHostDeps = [ "/System/Library/Fonts" ]; + 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/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix index 8f987478655d..9b3733939c02 100644 --- a/pkgs/development/python-modules/pycodestyle/default.nix +++ b/pkgs/development/python-modules/pycodestyle/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pycodestyle"; - version = "2.12.0"; + version = "2.12.1"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = "pycodestyle"; rev = version; - hash = "sha256-YN1KOJ8f+VY9vJTWm3aTOOai66dveKOKOpeBkZKkC2A="; + hash = "sha256-rQkOjDikJPHCBqrqxFQ9PLikYSeQZwJnHAmPGRUZecA="; }; pythonImportsCheck = [ "pycodestyle" ]; diff --git a/pkgs/development/python-modules/pycoin/default.nix b/pkgs/development/python-modules/pycoin/default.nix index f947b3a3e4f5..f1dc2cbe8fd7 100644 --- a/pkgs/development/python-modules/pycoin/default.nix +++ b/pkgs/development/python-modules/pycoin/default.nix @@ -25,8 +25,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - dontUseSetuptoolsCheck = true; - # Disable tests depending on online services disabledTests = [ "ServicesTest" diff --git a/pkgs/development/python-modules/pydantic-settings/default.nix b/pkgs/development/python-modules/pydantic-settings/default.nix index 63d0e997fd7a..69b1b43cdf92 100644 --- a/pkgs/development/python-modules/pydantic-settings/default.nix +++ b/pkgs/development/python-modules/pydantic-settings/default.nix @@ -14,7 +14,7 @@ let self = buildPythonPackage rec { pname = "pydantic-settings"; - version = "2.7.1"; + version = "2.8.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ let owner = "pydantic"; repo = "pydantic-settings"; tag = "v${version}"; - hash = "sha256-kxXH8GNBSF70pWXdALAAQ0Tg7Zx1VRO0Ej4xSncR0Mo="; + hash = "sha256-Bvdq4ATOhLjowkyR39y0Jxi+wuPbpVW30qtbsXa9+HA="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index 8d901cd1f892..4d8da843963d 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "pydantic"; - version = "2.10.5"; + version = "2.10.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "pydantic"; repo = "pydantic"; tag = "v${version}"; - hash = "sha256-SEgBuhof1rqnKFI7O1aajkgp17EgaPNcfJzbh/j4ebg="; + hash = "sha256-vkXvHQ5ipcLfx4qJKY6J4rKXCAfP2rj88GnwGMjM2go="; }; buildInputs = lib.optionals (pythonOlder "3.9") [ libxcrypt ]; diff --git a/pkgs/development/python-modules/pyelftools/default.nix b/pkgs/development/python-modules/pyelftools/default.nix index 783951abde8b..e4ec7a9b55d0 100644 --- a/pkgs/development/python-modules/pyelftools/default.nix +++ b/pkgs/development/python-modules/pyelftools/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyelftools"; - version = "0.31"; + version = "0.32"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "eliben"; repo = "pyelftools"; tag = "v${version}"; - hash = "sha256-kX89fMXqrEvhMAAjqKHzHmrYizKBt1uCWMOJtFNNhy4="; + hash = "sha256-58Twjf7ECOPynQ5KPCTDQWdD3nb7ADJZISozWGRGoXM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix index 2eef6797cbf5..2585c7dda9f5 100644 --- a/pkgs/development/python-modules/pygal/default.nix +++ b/pkgs/development/python-modules/pygal/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchPypi, pythonOlder, + stdenv, # build-system setuptools, @@ -55,6 +56,14 @@ buildPythonPackage rec { export LANG=en_US.UTF-8 ''; + # Cairo tries to load system fonts by default. + # It's surfaced as a Cairo "out of memory" error in tests. + __impureHostDeps = [ "/System/Library/Fonts" ]; + + postCheck = '' + export LANG=${if stdenv.isDarwin then "en_US.UTF-8" else "C.UTF-8"} + ''; + meta = with lib; { description = "Module for dynamic SVG charting"; homepage = "http://www.pygal.org"; diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index e662589d9621..ce93e38dd4b5 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -70,8 +70,6 @@ buildPythonPackage rec { "-v" ]; - dontUseSetuptoolsCheck = true; - preCheck = '' export HOME=$TEMPDIR ''; diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/pkgs/development/python-modules/pymediainfo/default.nix index 016b5ee6bf24..7ebd4dbc5503 100644 --- a/pkgs/development/python-modules/pymediainfo/default.nix +++ b/pkgs/development/python-modules/pymediainfo/default.nix @@ -6,7 +6,6 @@ libmediainfo, setuptools-scm, pytest, - glibcLocales, pythonOlder, }: @@ -35,12 +34,10 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; nativeCheckInputs = [ - glibcLocales pytest ]; checkPhase = '' - export LC_ALL=en_US.UTF-8 py.test -k 'not test_parse_url' tests ''; diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index 1e1f16f531e8..426853bd6544 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pymongo"; - version = "4.10.1"; + version = "4.11.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "pymongo"; - hash = "sha256-qd4CvlO2u5jv4LntqE/6HsAn/LI6LeYsT5Qdmi8vMzA="; + hash = "sha256-0O4+AnX2e93Ng7ImOBi3xK568eyv6+frf9FjiUV+whA="; }; build-system = [ diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 44a525bcb695..f70aef65ec33 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -6,6 +6,7 @@ openssl, setuptools, cryptography, + typing-extensions, pytestCheckHook, pretend, sphinxHook, @@ -15,14 +16,14 @@ buildPythonPackage rec { pname = "pyopenssl"; - version = "24.3.0"; + version = "25.0.0"; pyproject = true; src = fetchFromGitHub { owner = "pyca"; repo = "pyopenssl"; tag = version; - hash = "sha256-otK7Y7Kb/l3QOErhAcuDHB/CKG9l1vH2BTnOieAWNc0="; + hash = "sha256-CQHLEtNb2jX7WNAYlmv5EIgepetMl81Xl3AJuRqOHow="; }; outputs = [ @@ -41,7 +42,10 @@ buildPythonPackage rec { pythonRelaxDeps = [ "cryptography" ]; - dependencies = [ cryptography ]; + dependencies = [ + cryptography + typing-extensions + ]; nativeCheckInputs = [ pretend @@ -51,10 +55,6 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - preCheck = '' - export LANG="en_US.UTF-8" - ''; - disabledTests = [ # https://github.com/pyca/pyopenssl/issues/692 diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix index 24456e08cea4..1fe59a9681a5 100644 --- a/pkgs/development/python-modules/pypdf/default.nix +++ b/pkgs/development/python-modules/pypdf/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "pypdf"; - version = "5.1.0"; + version = "5.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { tag = version; # fetch sample files used in tests fetchSubmodules = true; - hash = "sha256-ziJTYl7MQUCE8US0yeiq6BPDVbBsxWhti0NyiDnKtfE="; + hash = "sha256-4q4Se/8psa6hl+PA1vnh/3HpQsihDL8UCg0ScNLg61o="; }; outputs = [ diff --git a/pkgs/development/python-modules/pyphotonfile/default.nix b/pkgs/development/python-modules/pyphotonfile/default.nix index 315d9c9496ed..9cac35c226d0 100644 --- a/pkgs/development/python-modules/pyphotonfile/default.nix +++ b/pkgs/development/python-modules/pyphotonfile/default.nix @@ -13,7 +13,6 @@ buildPythonPackage { format = "setuptools"; inherit version; - dontUseSetuptoolsCheck = true; propagatedBuildInputs = [ pillow numpy diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix index 77f863139ed5..9d7df731dfb1 100644 --- a/pkgs/development/python-modules/pyproj/default.nix +++ b/pkgs/development/python-modules/pyproj/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pyproj"; - version = "3.7.0"; + version = "3.7.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "pyproj4"; repo = "pyproj"; tag = version; - hash = "sha256-uCoWmJ0xtbJ/DHts5+9KR6d6p8vmZqDrI4RFjXQn2fM="; + hash = "sha256-tVzifc+Y5u9Try5FHt67rj/+zaok0JNn3M8plMqX90g="; }; # force pyproj to use ${proj} diff --git a/pkgs/development/python-modules/pyproject-api/default.nix b/pkgs/development/python-modules/pyproject-api/default.nix index 023a61e6137a..043db0acb7c8 100644 --- a/pkgs/development/python-modules/pyproject-api/default.nix +++ b/pkgs/development/python-modules/pyproject-api/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "pyproject-api"; - version = "1.8.0"; + version = "1.9.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pyproject-api"; tag = version; - hash = "sha256-zFV44xqbwe1QsIVurvsjqY+zxC+X2hCljZ5u70kNTSU="; + hash = "sha256-4oX/h3EiLZIfHhU6zBD9ZQYnHGrid93LkJzaC6swBdI="; }; outputs = [ diff --git a/pkgs/development/python-modules/pyrect/default.nix b/pkgs/development/python-modules/pyrect/default.nix index 3b673068adaa..757ad7ef886b 100644 --- a/pkgs/development/python-modules/pyrect/default.nix +++ b/pkgs/development/python-modules/pyrect/default.nix @@ -22,10 +22,6 @@ buildPythonPackage rec { pygame ]; - preCheck = '' - export LC_ALL="en_US.UTF-8" - ''; - pythonImportsCheck = [ "pyrect" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index 82b18bc8869c..7950aaf6e921 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.25.2"; # N.B.: when updating, tests bleak and aioesphomeapi tests + version = "0.25.3"; # N.B.: when updating, tests bleak and aioesphomeapi tests pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pytest-dev"; repo = "pytest-asyncio"; tag = "v${version}"; - hash = "sha256-GLKcqf6NXCMNU/lVLQP8s/FDC1OcpPF1RxzKDItJSiU="; + hash = "sha256-/uG8/uhKYeWrXifAJ7iqvpgXe70YduiqH8FSq2rD7f0="; }; outputs = [ diff --git a/pkgs/development/python-modules/pytest-codspeed/default.nix b/pkgs/development/python-modules/pytest-codspeed/default.nix index 2d042bff058f..dbf611fa5b1a 100644 --- a/pkgs/development/python-modules/pytest-codspeed/default.nix +++ b/pkgs/development/python-modules/pytest-codspeed/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "pytest-codspeed"; - version = "3.1.2"; + version = "3.2.0"; pyproject = true; src = fetchFromGitHub { owner = "CodSpeedHQ"; repo = "pytest-codspeed"; tag = "v${version}"; - hash = "sha256-HtjfXA5Ifs2ytheHOb0HUM62foBYFEMwsV4h9lTNd38="; + hash = "sha256-SNVJtnanaSQTSeX3EFG+21GFC1WFCQTbaNyi7QjQROw="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index 63032480164a..c35057d20b6a 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pytest-django"; - version = "4.9.0"; + version = "4.10.0"; pyproject = true; src = fetchPypi { pname = "pytest_django"; inherit version; - hash = "sha256-i/e8NYya5vb8UbbOuxkP4gISGW5oBxIfEb1qOwNCgxQ="; + hash = "sha256-EJGyDqFJH9BKMQ/Jqv9MAbToRQ47FXaHYl4WprXzo2Y="; }; build-system = [ diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix index e8971271a397..99146020d6ca 100644 --- a/pkgs/development/python-modules/pytest-httpbin/default.nix +++ b/pkgs/development/python-modules/pytest-httpbin/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytest-httpbin"; - version = "2.0.0"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "kevin1024"; repo = "pytest-httpbin"; tag = "v${version}"; - hash = "sha256-tq9nz2na94HkLACt7xB1MUanh9/JOoe2vyEm5sAq0/4="; + hash = "sha256-gESU1SDpqSQs8GRcGJclWM0WpS4DZicfdtwxk2sQubQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytest-httpserver/default.nix b/pkgs/development/python-modules/pytest-httpserver/default.nix index 8f64b14c6d71..6a136e9d3c05 100644 --- a/pkgs/development/python-modules/pytest-httpserver/default.nix +++ b/pkgs/development/python-modules/pytest-httpserver/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytest-httpserver"; - version = "1.1.0"; + version = "1.1.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "csernazs"; repo = "pytest-httpserver"; tag = version; - hash = "sha256-BkdbCrpZKjHYikZk1mL4iSGe5gRjWUVN/w222QkmFLQ="; + hash = "sha256-41JrZ3ubaJHNzwGDWUSseJ3Z405k21SOpwW7jG5rNxg="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pytest-unordered/default.nix b/pkgs/development/python-modules/pytest-unordered/default.nix index 4057319ff1e8..dc5aacf40ce2 100644 --- a/pkgs/development/python-modules/pytest-unordered/default.nix +++ b/pkgs/development/python-modules/pytest-unordered/default.nix @@ -2,27 +2,31 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, + mock, pytest, - pytest7CheckHook, + pytestCheckHook, }: buildPythonPackage rec { pname = "pytest-unordered"; - version = "0.5.2"; - format = "setuptools"; + version = "0.6.1"; + pyproject = true; src = fetchFromGitHub { owner = "utapyngo"; repo = "pytest-unordered"; tag = "v${version}"; - hash = "sha256-51UJjnGBO7qBvQlY8F0B29n8+EO2aa3DF3WOwcjZzSo="; + hash = "sha256-nANsX28+G8jcSe8X0dB6Tu3HYHd9ebGkh1AUx8Xq8HM="; }; + build-system = [ setuptools ]; + buildInputs = [ pytest ]; nativeCheckInputs = [ - # https://github.com/utapyngo/pytest-unordered/issues/15 - pytest7CheckHook + mock + pytestCheckHook ]; pythonImportsCheck = [ "pytest_unordered" ]; diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 44d6ba780ea2..97be4c03335e 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -29,12 +29,12 @@ buildPythonPackage rec { pname = "pytest"; - version = "8.3.4"; + version = "8.3.5"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-llNw0GK84R5zho4DNausMbTT3g6C9AB0CNJCtPhhB2E="; + hash = "sha256-9O/nDMFOURVlrEdrV8J54SqFWxH0jyEq8QgO8iY9OEU="; }; outputs = [ diff --git a/pkgs/development/python-modules/python-constraint/default.nix b/pkgs/development/python-modules/python-constraint/default.nix index 2a9dfd05a459..ae00c34c3354 100644 --- a/pkgs/development/python-modules/python-constraint/default.nix +++ b/pkgs/development/python-modules/python-constraint/default.nix @@ -19,7 +19,6 @@ buildPythonPackage rec { }; nativeCheckInputs = [ pytestCheckHook ]; - dontUseSetuptoolsCheck = true; meta = with lib; { description = "Constraint Solving Problem resolver for Python"; diff --git a/pkgs/development/python-modules/python-fsutil/default.nix b/pkgs/development/python-modules/python-fsutil/default.nix index ecc7cbd02df8..f88377959251 100644 --- a/pkgs/development/python-modules/python-fsutil/default.nix +++ b/pkgs/development/python-modules/python-fsutil/default.nix @@ -10,26 +10,24 @@ buildPythonPackage rec { pname = "python-fsutil"; - version = "0.14.1"; + version = "0.15.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "fabiocaccamo"; repo = "python-fsutil"; tag = version; - hash = "sha256-Cs78zpf3W5UZJkkUBEP6l6fi2J4OtJXGvqqQ8PWKx+8="; + hash = "sha256-hzPNj6hqNCnMx1iRK1c6Y70dUU/H4u6o+waEgOhyhuA="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ requests ]; + dependencies = [ requests ]; nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests/test.py" ]; - disabledTests = [ # Tests require network access "test_download_file" diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix index c84659014b71..ee9503865f70 100644 --- a/pkgs/development/python-modules/python-magic/default.nix +++ b/pkgs/development/python-modules/python-magic/default.nix @@ -44,6 +44,10 @@ buildPythonPackage rec { export LC_ALL=en_US.UTF-8 ''; + postCheck = '' + unset LC_ALL + ''; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { diff --git a/pkgs/development/python-modules/python3-eventlib/default.nix b/pkgs/development/python-modules/python3-eventlib/default.nix index 0181dfebb87e..0904441944de 100644 --- a/pkgs/development/python-modules/python3-eventlib/default.nix +++ b/pkgs/development/python-modules/python3-eventlib/default.nix @@ -28,8 +28,6 @@ buildPythonPackage rec { greenlet ]; - dontUseSetuptoolsCheck = true; - pythonImportsCheck = [ "eventlib" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix index 2d69cfdb0cfb..bf3397672538 100644 --- a/pkgs/development/python-modules/pytz/default.nix +++ b/pkgs/development/python-modules/pytz/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pytz"; - version = "2024.2"; + version = "2025.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-KqNVCDxQoPk/pYFwnerAya1lzKip6b6sZgrcvUk8eYo="; + hash = "sha256-wttCviolGLKOZfkgfE0F5v9UfR76QIZGnvhV5KtwF44="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytzdata/default.nix b/pkgs/development/python-modules/pytzdata/default.nix deleted file mode 100644 index 8b66daba06af..000000000000 --- a/pkgs/development/python-modules/pytzdata/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - lib, - fetchPypi, - buildPythonPackage, -}: - -buildPythonPackage rec { - pname = "pytzdata"; - version = "2020.1"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "3efa13b335a00a8de1d345ae41ec78dd11c9f8807f522d39850f2dd828681540"; - }; - - # No tests - doCheck = false; - - meta = with lib; { - description = "Timezone database for Python"; - homepage = "https://github.com/sdispater/pytzdata"; - license = licenses.mit; - }; -} diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix index f5a4ad76af47..a2e0af522d83 100644 --- a/pkgs/development/python-modules/pyupgrade/default.nix +++ b/pkgs/development/python-modules/pyupgrade/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyupgrade"; - version = "3.15.0"; + version = "3.19.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "asottile"; repo = pname; rev = "v${version}"; - hash = "sha256-n6WlJc7Hh7SArJ8Z0fikxidtpXaPQvKTDGn6HukL2q8="; + hash = "sha256-bijW1uxoaVKLO0Psv3JeAG6rKeTwGa9ZW06VU1qFrrU="; }; propagatedBuildInputs = [ tokenize-rt ]; diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index 6f7ecf6b10b6..5cc7e7a9def5 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "pyzmq"; - version = "26.2.0"; + version = "26.2.1"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-BwZywlhYHI5PZAtRWSl1gKmXSwJgQ71KsEcL6e0yTx8="; + hash = "sha256-F9cqdOXp/zgp3rcol6F1Mz0+9bVBOUjK489+vwsC7Mo="; }; build-system = [ diff --git a/pkgs/development/python-modules/qiskit-ignis/default.nix b/pkgs/development/python-modules/qiskit-ignis/default.nix index a51ad99805b9..940b5bd556f1 100644 --- a/pkgs/development/python-modules/qiskit-ignis/default.nix +++ b/pkgs/development/python-modules/qiskit-ignis/default.nix @@ -50,7 +50,6 @@ buildPythonPackage rec { # Tests pythonImportsCheck = [ "qiskit.ignis" ]; - dontUseSetuptoolsCheck = true; preCheck = '' export HOME=$TMPDIR ''; diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 71a7c6188da3..e3551b0373ad 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -8,7 +8,6 @@ cython, ninja, scikit-build-core, - setuptools, numpy, hypothesis, pandas, @@ -19,7 +18,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "3.12.1"; + version = "3.12.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,14 +27,9 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "RapidFuzz"; tag = "v${version}"; - hash = "sha256-33NwGWulBJ7WAMAE0163OJM9kL04FuHa5P7m66PZL6s="; + hash = "sha256-keV+IBBHkdDpKuT1o6xNA5UAHlG1I9vkt13W8dafiDw="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "Cython >=3.0.11, <3.1.0" "Cython" - ''; - build-system = [ cmake cython diff --git a/pkgs/development/python-modules/recommonmark/default.nix b/pkgs/development/python-modules/recommonmark/default.nix index 0569adc5b93e..a61f2804d71f 100644 --- a/pkgs/development/python-modules/recommonmark/default.nix +++ b/pkgs/development/python-modules/recommonmark/default.nix @@ -28,8 +28,6 @@ buildPythonPackage rec { sphinx ]; - dontUseSetuptoolsCheck = true; - disabledTests = [ # https://github.com/readthedocs/recommonmark/issues/164 "test_lists" diff --git a/pkgs/development/python-modules/referencing/default.nix b/pkgs/development/python-modules/referencing/default.nix index 55a29aed8458..2283c7758de9 100644 --- a/pkgs/development/python-modules/referencing/default.nix +++ b/pkgs/development/python-modules/referencing/default.nix @@ -16,7 +16,7 @@ let self = buildPythonPackage rec { pname = "referencing"; - version = "0.36.1"; + version = "0.36.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ let repo = "referencing"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-kMYn41tlBMPb2hMMwHg+o6sNrwp3CHRQwmBzQHsgG1I="; + hash = "sha256-VwViFiquacwJlELNDp01DRbtYQHOY4qXS2CjD7YmS6g="; }; build-system = [ diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index dd638a7b6b9c..275bfbb32cb4 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -6,7 +6,6 @@ freetype, pillow, setuptools, - glibcLocales, python, isPyPy, }: @@ -49,12 +48,10 @@ buildPythonPackage rec { pillow ]; - nativeCheckInputs = [ glibcLocales ]; - checkPhase = '' runHook preCheck pushd tests - LC_ALL="en_US.UTF-8" ${python.interpreter} runAll.py + ${python.interpreter} runAll.py popd runHook postCheck ''; diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index 6ffe869c0a6a..cc80e5bb0de0 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, - brotlicffi, buildPythonPackage, certifi, chardet, @@ -37,7 +36,6 @@ buildPythonPackage rec { ]; dependencies = [ - brotlicffi certifi charset-normalizer idna diff --git a/pkgs/development/python-modules/resolvelib/default.nix b/pkgs/development/python-modules/resolvelib/default.nix index 98e8e8d6487d..3bb181342c65 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.0.1"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "sarugaku"; repo = "resolvelib"; rev = version; - hash = "sha256-oxyPn3aFPOyx/2aP7Eg2ThtPbyzrFT1JzWqy6GqNbzM="; + hash = "sha256-UBdgFN+fvbjz+rp8+rog8FW2jwO/jCfUPV7UehJKiV8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/rich-click/default.nix b/pkgs/development/python-modules/rich-click/default.nix index e3087e105d95..c271a27557d1 100644 --- a/pkgs/development/python-modules/rich-click/default.nix +++ b/pkgs/development/python-modules/rich-click/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "rich-click"; - version = "1.8.5"; + version = "1.8.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ewels"; repo = "rich-click"; tag = "v${version}"; - hash = "sha256-S03cCQWs+tpX+5a9KmCOInXC9++gUXS1J7hTARz7VZQ="; + hash = "sha256-3spiDhSpVobhJMKfU7ZvQf9srD4goKowIl6LiBziiLA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/roman-numerals-py/default.nix b/pkgs/development/python-modules/roman-numerals-py/default.nix new file mode 100644 index 000000000000..5a2b5008b350 --- /dev/null +++ b/pkgs/development/python-modules/roman-numerals-py/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + flit-core, + pytestCheckHook, + sphinx, +}: + +buildPythonPackage rec { + pname = "roman-numerals-py"; + version = "3.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "AA-Turner"; + repo = "roman-numerals"; + tag = "v${version}"; + hash = "sha256-YLF09jYwXq48iMvmqbj/cocYJPp7RsCXzbN0DV9gpis="; + }; + + postPatch = '' + ls -lah + cp LICENCE.rst python/ + + cd python + ''; + + build-system = [ flit-core ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "roman_numerals" ]; + + 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"; + license = lib.licenses.cc0; + maintainers = sphinx.meta.maintainers; + 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 8db7f97929bb..297f76820a11 100644 --- a/pkgs/development/python-modules/rpds-py/default.nix +++ b/pkgs/development/python-modules/rpds-py/default.nix @@ -12,19 +12,19 @@ buildPythonPackage rec { pname = "rpds-py"; - version = "0.22.3"; + version = "0.23.1"; pyproject = true; src = fetchPypi { pname = "rpds_py"; inherit version; - hash = "sha256-4y/uirRdPC222hmlMjvDNiI3yLZTxwGUQUuJL9BqCA0="; + hash = "sha256-fzJA3PoU0ZjbokuLnLOxCMBraNRbe6vZ7vwQOP335wc="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-2skrDC80g0EKvTEeBI4t4LD7ZXb6jp2Gw+owKFrkZzc="; + hash = "sha256-Iq8uthR4k+NN8hCwWLBW1kLNZ0Pvwz1xMDT6zHcIPb8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix index ffbbe1092b13..69de04c60202 100644 --- a/pkgs/development/python-modules/safety/default.nix +++ b/pkgs/development/python-modules/safety/default.nix @@ -52,7 +52,9 @@ buildPythonPackage rec { build-system = [ hatchling ]; pythonRelaxDeps = [ + "filelock" "pydantic" + "psutil" ]; dependencies = [ diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 0a9d5f4ccc9c..e2373ad00b69 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -39,6 +39,9 @@ buildPythonPackage rec { hash = "sha256-17Nr0iNeZC1sHm0JETIufdMVqrhORts1WxCh8cukCKg="; }; + # https://github.com/sanic-org/sanic/issues/3031 + patches = [ ./websockets-14.2-compat.patch ]; + build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/sanic/websockets-14.2-compat.patch b/pkgs/development/python-modules/sanic/websockets-14.2-compat.patch new file mode 100644 index 000000000000..9acf47757335 --- /dev/null +++ b/pkgs/development/python-modules/sanic/websockets-14.2-compat.patch @@ -0,0 +1,13 @@ +diff --git a/sanic/server/protocols/websocket_protocol.py b/sanic/server/protocols/websocket_protocol.py +index beee1d26..5a3e70f2 100644 +--- a/sanic/server/protocols/websocket_protocol.py ++++ b/sanic/server/protocols/websocket_protocol.py +@@ -147,7 +147,7 @@ class WebSocketProtocol(HttpProtocol): + "".join([f"{k}: {v}\r\n" for k, v in resp.headers.items()]) + ).encode() + rbody += b"\r\n" +- if resp.body is not None: ++ if resp.body: + rbody += resp.body + rbody += b"\r\n\r\n" + await super().send(rbody) diff --git a/pkgs/development/python-modules/scikit-build-core/default.nix b/pkgs/development/python-modules/scikit-build-core/default.nix index 2cb10a86a1c1..9ff1f0125f06 100644 --- a/pkgs/development/python-modules/scikit-build-core/default.nix +++ b/pkgs/development/python-modules/scikit-build-core/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, pythonOlder, # build-system @@ -31,25 +30,16 @@ buildPythonPackage rec { pname = "scikit-build-core"; - version = "0.10.7"; + version = "0.11.0"; pyproject = true; src = fetchFromGitHub { owner = "scikit-build"; repo = "scikit-build-core"; rev = "refs/tags/v${version}"; - hash = "sha256-R6/Y9brIYBA1P3YeG8zGaoPcxWFUDqZlqbZpWu3MIIw="; + hash = "sha256-t22/681GHA3tKBTNQ2b3A8cgMTsUiYUGptRtC2i9W6g="; }; - patches = [ - (fetchpatch2 { - name = "setuptools-75_8-compatibility.patch"; - url = "https://github.com/scikit-build/scikit-build-core/commit/e4e92bc28651001e91999e9759c44fb67cd3d211.patch"; - includes = [ "tests/test_setuptools_pep517.py" ]; - hash = "sha256-nqng1FAY90Qm/yVRkALTsKchqNvsxutbBr51/Q4IKPA="; - }) - ]; - postPatch = lib.optionalString (pythonOlder "3.11") '' substituteInPlace pyproject.toml \ --replace-fail '"error",' '"error", "ignore::UserWarning",' diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index 5aca6b4dabc5..d5439693c4fc 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -35,7 +35,7 @@ let installedPackageRoot = "${builtins.placeholder "out"}/${python.sitePackages}"; self = buildPythonPackage rec { pname = "scikit-image"; - version = "0.25.0"; + version = "0.25.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -44,7 +44,7 @@ let owner = "scikit-image"; repo = "scikit-image"; tag = "v${version}"; - hash = "sha256-v2bgazzx+7aoUgoOQvqhYJkSOzSJ5TWwEwBgHxRP318="; + hash = "sha256-viRX7Uh9coacueI6gJHBtOay/UIiUQkBfjpmDLJgyZ4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index 356d8f5598da..cc4cb5485140 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "selenium"; - version = "4.28.0"; + version = "4.29.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "SeleniumHQ"; repo = "selenium"; tag = "selenium-${version}" + lib.optionalString (lib.versions.patch version != "0") "-python"; - hash = "sha256-b5xwuZ4lcwLbGhJuEmHYrFXoaTW/M0ABdK3dvbpj8oM="; + hash = "sha256-IyMXgYl/TPTpe/Y0pFyJVKj4Mp0xbkg1LSCNHzFL3bE="; }; patches = [ ./dont-build-the-selenium-manager.patch ]; diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix index 29f439d74b05..0886e5fedb2c 100644 --- a/pkgs/development/python-modules/semver/default.nix +++ b/pkgs/development/python-modules/semver/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "semver"; - version = "3.0.3"; + version = "3.0.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "python-semver"; repo = "python-semver"; tag = version; - hash = "sha256-/E2wJcAmEnmK9QSl7a4aLMHCIh0glq9VIlYls6GhfXM="; + hash = "sha256-ry6r2cY/DRTiPxT+ZiumgFbQyHNzL8i1QcQbLWjnDVE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/setproctitle/default.nix b/pkgs/development/python-modules/setproctitle/default.nix index f88055d575da..05452c56951a 100644 --- a/pkgs/development/python-modules/setproctitle/default.nix +++ b/pkgs/development/python-modules/setproctitle/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "setproctitle"; - version = "1.3.4"; + version = "1.3.5"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-O0DTKj4fBOlCMe1t/uDankO0+ca1RQ1T5t13VMNODFA="; + hash = "sha256-Hm6ur4pzTUKKldjBBGQ7Oa99JH1gT0CnvrzzlgqFPF4="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/setuptools-scm/default.nix b/pkgs/development/python-modules/setuptools-scm/default.nix index cc82356de85a..9ce94f6c964f 100644 --- a/pkgs/development/python-modules/setuptools-scm/default.nix +++ b/pkgs/development/python-modules/setuptools-scm/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "setuptools-scm"; - version = "8.1.0"; + version = "8.2.0"; pyproject = true; src = fetchPypi { pname = "setuptools_scm"; inherit version; - hash = "sha256-Qt6htldxy6k7elFdZaZdgkblYHaKZrkQalksjn8myKc="; + hash = "sha256-oYOWobwCGcl00adGErEfnc4NW9ix3FXGX2rH/WCejCg="; }; build-system = [ setuptools ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index bc4bb700a9f9..c4ffa9e95b14 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "setuptools"; - version = "75.8.0"; + version = "75.8.2"; format = "pyproject"; src = fetchFromGitHub { owner = "pypa"; repo = "setuptools"; tag = "v${version}"; - hash = "sha256-dSzsj0lnsc1Y+D/N0cnAPbS/ZYb+qC41b/KfPmL1zI4="; + hash = "sha256-nD6c2JOjBL/SfgNchBlNasuwnrRl6XIuppjOt6Hr7CE="; }; patches = [ diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index 7eb59d7abf70..49b0c3061747 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "simplejson"; - version = "3.19.3"; + version = "3.20.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = pname; tag = "v${version}"; - hash = "sha256-M6ohYhw7xvZiNVm9uhotvPHeVsBOwYjDpj2sfXAzf0U="; + hash = "sha256-wE/jqBMXVtmbc/78X4lgfvuj074CrzfLJL1CM6LCfas="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix index bebf413b2b58..46ec8597a9ef 100644 --- a/pkgs/development/python-modules/spglib/default.nix +++ b/pkgs/development/python-modules/spglib/default.nix @@ -21,12 +21,12 @@ buildPythonPackage rec { pname = "spglib"; - version = "2.5.0"; + version = "2.6.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-+LtjiJe+kbnb1MCF2f3h9pBI9ZSeIPODLLlDjldBjUs="; + hash = "sha256-1m7aK6AKHhT9luycO02/irD7PxJGQ+NXhcce5FW0COs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix index 827a9dc29813..a3cb24baa9c5 100644 --- a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix +++ b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix @@ -11,7 +11,7 @@ let pname = "sphinx-autodoc-typehints"; - version = "3.0.1"; + version = "3.1.0"; in buildPythonPackage { @@ -23,7 +23,7 @@ buildPythonPackage { src = fetchPypi { pname = "sphinx_autodoc_typehints"; inherit version; - hash = "sha256-ubQN0V3uVPb4EMkk+GP5zxxU+fMmXElRQOoBvn9E+lU="; + hash = "sha256-prewtt8KOAeDzlspFQwtMDUnRvAno+KU03GDmV0/I+0="; }; pythonRelaxDeps = [ "sphinx" ]; diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 2f951573b860..e578f401e936 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -19,6 +19,7 @@ packaging, pygments, requests, + roman-numerals-py, snowballstemmer, sphinxcontrib-applehelp, sphinxcontrib-devhelp, @@ -43,10 +44,10 @@ buildPythonPackage rec { pname = "sphinx"; - version = "8.1.3"; + version = "8.2.3"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "sphinx-doc"; @@ -59,14 +60,9 @@ 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-AObNQz2gKoPHfvC5aoefynXfQMe3bnQpEx6KrLNQBoQ="; + hash = "sha256-FoyCpDGDKNN2GMhE7gDpJLmWRWhbMCYlcVEaBTfXSEw="; }; - patches = [ - # https://github.com/sphinx-doc/sphinx/commit/5ff3740063c1ac57f17ecd697bcd06cc1de4e75c - ./pygments-2.19-compat.patch - ]; - build-system = [ flit-core ]; dependencies = @@ -79,6 +75,7 @@ buildPythonPackage rec { packaging pygments requests + roman-numerals-py snowballstemmer sphinxcontrib-applehelp sphinxcontrib-devhelp @@ -132,8 +129,11 @@ buildPythonPackage rec { "test_cython" # Could not fetch remote image: http://localhost:7777/sphinx.png "test_copy_images" - # https://github.com/sphinx-doc/sphinx/issues/13223 - "test_html_multi_line_copyright" + # ModuleNotFoundError: No module named 'fish_licence.halibut' + "test_import_native_module_stubs" + # Racy tex file creation + "test_literalinclude_namedlink_latex" + "test_literalinclude_caption_latex" ] ++ lib.optionals (pythonAtLeast "3.12") [ # https://github.com/sphinx-doc/sphinx/issues/12430 diff --git a/pkgs/development/python-modules/sphinx/pygments-2.19-compat.patch b/pkgs/development/python-modules/sphinx/pygments-2.19-compat.patch deleted file mode 100644 index 37330e0f1f06..000000000000 --- a/pkgs/development/python-modules/sphinx/pygments-2.19-compat.patch +++ /dev/null @@ -1,213 +0,0 @@ -diff --git a/tests/test_builders/test_build_html_code.py b/tests/test_builders/test_build_html_code.py -index d32c0b3e2..02684b22e 100644 ---- a/tests/test_builders/test_build_html_code.py -+++ b/tests/test_builders/test_build_html_code.py -@@ -1,3 +1,6 @@ -+from __future__ import annotations -+ -+import pygments - import pytest - - -@@ -32,11 +35,16 @@ def test_html_codeblock_linenos_style_inline(app): - - @pytest.mark.sphinx('html', testroot='reST-code-role') - def test_html_code_role(app): -+ if tuple(map(int, pygments.__version__.split('.')[:2])) >= (2, 19): -+ sp = ' ' -+ else: -+ sp = ' ' -+ - app.build() - content = (app.outdir / 'index.html').read_text(encoding='utf8') - - common_content = ( -- 'def foo' -+ f'def{sp}foo' - '(' - '1 ' - '+ ' -diff --git a/tests/test_builders/test_build_latex.py b/tests/test_builders/test_build_latex.py -index ea6dc7475..6ba2a375c 100644 ---- a/tests/test_builders/test_build_latex.py -+++ b/tests/test_builders/test_build_latex.py -@@ -8,6 +8,7 @@ from pathlib import Path - from shutil import copyfile - from subprocess import CalledProcessError - -+import pygments - import pytest - - from sphinx.builders.latex import default_latex_documents -@@ -2127,12 +2128,16 @@ def test_latex_container(app): - - @pytest.mark.sphinx('latex', testroot='reST-code-role') - def test_latex_code_role(app): -+ if tuple(map(int, pygments.__version__.split('.')[:2])) >= (2, 19): -+ sp = r'\PYG{+w}{ }' -+ else: -+ sp = ' ' -+ - app.build() - content = (app.outdir / 'projectnamenotset.tex').read_text(encoding='utf8') - - common_content = ( -- r'\PYG{k}{def} ' -- r'\PYG{n+nf}{foo}' -+ r'\PYG{k}{def}' + sp + r'\PYG{n+nf}{foo}' - r'\PYG{p}{(}' - r'\PYG{l+m+mi}{1} ' - r'\PYG{o}{+} ' -diff --git a/tests/test_directives/test_directive_code.py b/tests/test_directives/test_directive_code.py -index 65e16b805..2876dbc05 100644 ---- a/tests/test_directives/test_directive_code.py -+++ b/tests/test_directives/test_directive_code.py -@@ -2,6 +2,7 @@ - - import os.path - -+import pygments - import pytest - from docutils import nodes - -@@ -393,6 +394,11 @@ def test_literal_include_block_start_with_comment_or_brank(app): - - @pytest.mark.sphinx('html', testroot='directive-code') - def test_literal_include_linenos(app): -+ if tuple(map(int, pygments.__version__.split('.')[:2])) >= (2, 19): -+ sp = ' ' -+ else: -+ sp = ' ' -+ - app.build(filenames=[app.srcdir / 'linenos.rst']) - html = (app.outdir / 'linenos.html').read_text(encoding='utf8') - -@@ -410,7 +416,7 @@ def test_literal_include_linenos(app): - - # :lines: 5-9 - assert ( -- '5class ' -+ f'5class{sp}' - 'Foo:' - ) in html - -@@ -560,12 +566,17 @@ def test_code_block_highlighted(app): - - @pytest.mark.sphinx('html', testroot='directive-code') - def test_linenothreshold(app): -+ if tuple(map(int, pygments.__version__.split('.')[:2])) >= (2, 19): -+ sp = ' ' -+ else: -+ sp = ' ' -+ - app.build(filenames=[app.srcdir / 'linenothreshold.rst']) - html = (app.outdir / 'linenothreshold.html').read_text(encoding='utf8') - - # code-block using linenothreshold - assert ( -- '1class ' -+ f'1class{sp}' - 'Foo:' - ) in html - -diff --git a/tests/test_extensions/test_ext_viewcode.py b/tests/test_extensions/test_ext_viewcode.py -index eeef391c1..996db00fd 100644 ---- a/tests/test_extensions/test_ext_viewcode.py -+++ b/tests/test_extensions/test_ext_viewcode.py -@@ -6,6 +6,7 @@ import re - import shutil - from typing import TYPE_CHECKING - -+import pygments - import pytest - - if TYPE_CHECKING: -@@ -13,6 +14,11 @@ if TYPE_CHECKING: - - - def check_viewcode_output(app: SphinxTestApp) -> str: -+ if tuple(map(int, pygments.__version__.split('.')[:2])) >= (2, 19): -+ sp = ' ' -+ else: -+ sp = ' ' -+ - warnings = re.sub(r'\\+', '/', app.warning.getvalue()) - assert re.findall( - r"index.rst:\d+: WARNING: Object named 'func1' not found in include " -@@ -41,7 +47,7 @@ def check_viewcode_output(app: SphinxTestApp) -> str: - '[docs]\n' - ) in result - assert '@decorator\n' in result -- assert 'class Class1:\n' in result -+ assert f'class{sp}Class1:\n' in result - assert ' """\n' in result - assert ' this is Class1\n' in result - assert ' """\n' in result -diff --git a/tests/test_highlighting.py b/tests/test_highlighting.py -index 430d569c0..2d08162aa 100644 ---- a/tests/test_highlighting.py -+++ b/tests/test_highlighting.py -@@ -10,7 +10,8 @@ from pygments.token import Name, Text - - from sphinx.highlighting import PygmentsBridge - --if tuple(map(int, pygments.__version__.split('.')))[:2] < (2, 18): -+ -+if tuple(map(int, pygments.__version__.split('.')[:2])) < (2, 18): - from pygments.formatter import Formatter - - Formatter.__class_getitem__ = classmethod(lambda cls, name: cls) # type: ignore[attr-defined] -diff --git a/tests/test_intl/test_intl.py b/tests/test_intl/test_intl.py -index 6f343e03d..9125612af 100644 ---- a/tests/test_intl/test_intl.py -+++ b/tests/test_intl/test_intl.py -@@ -10,6 +10,7 @@ import shutil - import time - from io import StringIO - -+import pygments - import pytest - from babel.messages import mofile, pofile - from babel.messages.catalog import Catalog -@@ -1473,6 +1474,11 @@ def test_xml_strange_markup(app): - @pytest.mark.sphinx('html', testroot='intl') - @pytest.mark.test_params(shared_result='test_intl_basic') - def test_additional_targets_should_not_be_translated(app): -+ if tuple(map(int, pygments.__version__.split('.')[:2])) >= (2, 19): -+ sp = ' ' -+ else: -+ sp = ' ' -+ - app.build() - # [literalblock.txt] - result = (app.outdir / 'literalblock.html').read_text(encoding='utf8') -@@ -1511,7 +1517,7 @@ def test_additional_targets_should_not_be_translated(app): - # doctest block should not be translated but be highlighted - expected_expr = ( - """>>> """ -- """import sys """ -+ f"""import{sp}sys """ - """# sys importing""" - ) - assert_count(expected_expr, result, 1) -@@ -1556,6 +1562,11 @@ def test_additional_targets_should_not_be_translated(app): - }, - ) - def test_additional_targets_should_be_translated(app): -+ if tuple(map(int, pygments.__version__.split('.')[:2])) >= (2, 19): -+ sp = ' ' -+ else: -+ sp = ' ' -+ - app.build() - # [literalblock.txt] - result = (app.outdir / 'literalblock.html').read_text(encoding='utf8') -@@ -1605,7 +1616,7 @@ def test_additional_targets_should_be_translated(app): - # doctest block should not be translated but be highlighted - expected_expr = ( - """>>> """ -- """import sys """ -+ f"""import{sp}sys """ - """# SYS IMPORTING""" - ) - assert_count(expected_expr, result, 1) diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index fff3fe067247..83823e97ce42 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { pname = "sqlalchemy"; - version = "2.0.38"; + version = "2.0.39"; pyproject = true; disabled = pythonOlder "3.7"; @@ -52,7 +52,7 @@ buildPythonPackage rec { owner = "sqlalchemy"; repo = "sqlalchemy"; tag = "rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-If4PEBD67pm0fs1TZkJTKNuFPRfc6SxIEm94ymyDvow="; + hash = "sha256-AuzaBrVR58kuyXF87GEQRrSb/b8yZqjOeWMz3JagoqA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix index 41d052471810..d7a5b5a18507 100644 --- a/pkgs/development/python-modules/srsly/default.nix +++ b/pkgs/development/python-modules/srsly/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchPypi, pythonOlder, - cython_0, + cython, catalogue, mock, numpy, @@ -26,12 +26,12 @@ buildPythonPackage rec { hash = "sha256-qxtL9s8+Kdoj2uBJPdFRf7eHB1IGUSNRQhuJtPwnx34="; }; - nativeBuildInputs = [ - cython_0 + build-system = [ + cython setuptools ]; - propagatedBuildInputs = [ catalogue ]; + dependencies = [ catalogue ]; nativeCheckInputs = [ mock diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index 81e1bb316b14..fad89171e164 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "starlette"; - version = "0.45.2"; + version = "0.46.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "encode"; repo = "starlette"; tag = version; - hash = "sha256-c4PAFrsp/KZMwUyvU6sgIyVKzoKM5zrt3is/SAQX3oM="; + hash = "sha256-4lybbJwisjNfqzJsZ5eNni+/KLYBwUU4CiTRshGD5Yo="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 373201e835a9..42b7fac621ec 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "11.5.0"; + version = "11.6.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-vD4DWP/CPV7PqKr+wfpPBI7oEHwyN7ywAAPmjIyW+gI="; + hash = "sha256-DO18ziOmyxo5PIah9/lDXJ2Drny9VWNihoyvYstEqSw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix index a05d13f466ee..a6c5d1fca425 100644 --- a/pkgs/development/python-modules/sympy/default.nix +++ b/pkgs/development/python-modules/sympy/default.nix @@ -27,10 +27,6 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "sympy" ]; - preCheck = '' - export LANG="en_US.UTF-8" - ''; - passthru.tests = { inherit sage; }; diff --git a/pkgs/development/python-modules/teamcity-messages/default.nix b/pkgs/development/python-modules/teamcity-messages/default.nix index da1738716d4b..d2c43108acd3 100644 --- a/pkgs/development/python-modules/teamcity-messages/default.nix +++ b/pkgs/development/python-modules/teamcity-messages/default.nix @@ -4,22 +4,25 @@ fetchFromGitHub, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "teamcity-messages"; version = "1.33"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "JetBrains"; - repo = pname; + repo = "teamcity-messages"; tag = "v${version}"; hash = "sha256-BAwAfe54J+gbbiz03Yiu3eC/9RnI7P0mfR3nfM1oKZw="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "tests/unit-tests/" ]; @@ -29,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python unit test reporting to TeamCity"; homepage = "https://github.com/JetBrains/teamcity-messages"; + changelog = "https://github.com/JetBrains/teamcity-messages/releases/tag/v${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/three-merge/default.nix b/pkgs/development/python-modules/three-merge/default.nix index e20e1aea09ac..62d2892a48a4 100644 --- a/pkgs/development/python-modules/three-merge/default.nix +++ b/pkgs/development/python-modules/three-merge/default.nix @@ -17,8 +17,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ diff-match-patch ]; - dontUseSetuptoolsCheck = true; - pythonImportsCheck = [ "three_merge" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/time-machine/default.nix b/pkgs/development/python-modules/time-machine/default.nix index 6794870e32d1..b7d5585e8617 100644 --- a/pkgs/development/python-modules/time-machine/default.nix +++ b/pkgs/development/python-modules/time-machine/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "time-machine"; - version = "2.15.0"; + version = "2.16.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "adamchainz"; repo = "time-machine"; tag = version; - hash = "sha256-0WYmkrMMeCkBYxy2qGovdxftzrYW9x/3tdeBcYC47Z0="; + hash = "sha256-xNoLtgON1dfKAgK0XhSMLHLsUr/nST3lepy15YWDEcE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tokenize-rt/default.nix b/pkgs/development/python-modules/tokenize-rt/default.nix index 1634f7681363..b3e994e26020 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 = "5.2.0"; + version = "6.1.0"; pyproject = true; disabled = isPy27; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "asottile"; repo = pname; rev = "v${version}"; - hash = "sha256-G4Dn6iZLVOovzfEt9eMzp93mTX+bo0tHI5cCbaJLxBQ="; + hash = "sha256-7ykczY73KkqR99tYLL/5bgr9bqU444qHs2ONz+ldVyg="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/tomli/default.nix b/pkgs/development/python-modules/tomli/default.nix index 20ae66d60fcd..ea17a226873e 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.0.1"; + version = "2.2.1"; format = "pyproject"; src = fetchFromGitHub { owner = "hukkin"; repo = pname; rev = version; - hash = "sha256-v0ZMrHIIaGeORwD4JiBeLthmnKZODK5odZVL0SY4etA="; + hash = "sha256-4MWp9pPiUZZkjvGXzw8/gDele743NBj8uG4jvK2ohUM="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/trio-websocket/default.nix b/pkgs/development/python-modules/trio-websocket/default.nix index 2804bcaa76e5..afcc26350ee9 100644 --- a/pkgs/development/python-modules/trio-websocket/default.nix +++ b/pkgs/development/python-modules/trio-websocket/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "trio-websocket"; - version = "0.11.1"; + version = "0.12.2"; pyproject = true; src = fetchFromGitHub { owner = "HyperionGray"; repo = "trio-websocket"; rev = version; - hash = "sha256-ddLbYkb1m9zRjv3Lb7YwUzj26gYbK4nYN6jN+FAuiOs="; + hash = "sha256-TGFf4WUeZDrjp/UiQ9O/GoaK5BRC2aaGZVPfqZ4Ip9I="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index 7c24edb26354..bc5b4ee8b440 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -35,7 +35,7 @@ let in buildPythonPackage rec { pname = "trio"; - version = "0.28.0"; + version = "0.29.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "python-trio"; repo = "trio"; tag = "v${version}"; - hash = "sha256-ru5Q7YHpnA/hLwh2Og5Hp3z6XJCv/BHHW0S26N1oTJ0="; + hash = "sha256-f77HXhXkPu2GMKCFqahfiP0EgpjyRqWaxzduqM2oXtA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/trove-classifiers/default.nix b/pkgs/development/python-modules/trove-classifiers/default.nix index c39c058b8aca..c6c33f37ac57 100644 --- a/pkgs/development/python-modules/trove-classifiers/default.nix +++ b/pkgs/development/python-modules/trove-classifiers/default.nix @@ -11,7 +11,7 @@ let self = buildPythonPackage rec { pname = "trove-classifiers"; - version = "2025.1.15.22"; + version = "2025.3.3.18"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ let src = fetchPypi { pname = "trove_classifiers"; inherit version; - hash = "sha256-kK90NY06AbNTK8ezyI2MaglML9UKVj0T2VdheTJtftk="; + hash = "sha256-P/z6kKQorf3hpdkOOqG4f+R0xdvb9cy8p07Wm6g8XKc="; }; build-system = [ diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index 69493dca3e5b..15d06f3946cc 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "typeguard"; - version = "4.4.1"; + version = "4.4.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-DSKonQC0U7R8SYdfQrZgG5YXV1QaLh4O9Re24kITwhs="; + hash = "sha256-pvEGWBPjLvNlvDs/UDr4qW+d1OADOgLCjEpJg96MbEk="; }; outputs = [ diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index f9384b1fee22..f97ce9b36a65 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "typer"; - version = "0.15.1"; + version = "0.15.2"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-oFiMCn+mihl4oGmBhld3j4ar5v9epqv0cvlAoIv+Two="; + hash = "sha256-qy+rR1M6gTxJ/h8WsaNw/VgZCZwAsRngYz32XyIUS6U="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/types-decorator/default.nix b/pkgs/development/python-modules/types-decorator/default.nix index 88874e3be565..6f3cdd6c4a13 100644 --- a/pkgs/development/python-modules/types-decorator/default.nix +++ b/pkgs/development/python-modules/types-decorator/default.nix @@ -7,15 +7,16 @@ buildPythonPackage rec { pname = "types-decorator"; - version = "5.1.8.20240310"; + version = "5.2.0.20250224"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-UuMWsDeDiGqKKr3CKPcHFoC6ZYlFRc0ghevjz4hoSg4="; + pname = "types_decorator"; + inherit version; + hash = "sha256-1oqi9Vz1BFEN19AbSeaN0yw6IA0LwMu4RZXboaEZVP8="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; # Modules doesn't have tests doCheck = false; diff --git a/pkgs/development/python-modules/types-deprecated/default.nix b/pkgs/development/python-modules/types-deprecated/default.nix index 3d26a47ee404..e6cde7039037 100644 --- a/pkgs/development/python-modules/types-deprecated/default.nix +++ b/pkgs/development/python-modules/types-deprecated/default.nix @@ -7,16 +7,16 @@ buildPythonPackage rec { pname = "types-deprecated"; - version = "1.2.15.20241117"; + version = "1.2.15.20250304"; pyproject = true; src = fetchPypi { - pname = "types-Deprecated"; + pname = "types_deprecated"; inherit version; - hash = "sha256-kkACyLf93sUbpJSXiKcCQRouNjbNmyozq9juEZcB134="; + hash = "sha256-wykDBVMCneXMbLMPJpwR9OAOWYxCQSkBefY82n0z9xk="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; # Modules has no tests doCheck = false; @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Typing stubs for Deprecated"; homepage = "https://pypi.org/project/types-Deprecated/"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/types-lxml/default.nix b/pkgs/development/python-modules/types-lxml/default.nix index df4ed0262b68..df8cc5976f63 100644 --- a/pkgs/development/python-modules/types-lxml/default.nix +++ b/pkgs/development/python-modules/types-lxml/default.nix @@ -5,29 +5,30 @@ cssselect, fetchFromGitHub, html5lib, + hypothesis, lxml, + mypy, pdm-backend, + pook, pyright, pytestCheckHook, - pythonOlder, typeguard, types-beautifulsoup4, + types-html5lib, typing-extensions, - hypothesis, + urllib3, }: buildPythonPackage rec { pname = "types-lxml"; - version = "2024.12.13"; + version = "2025.03.04"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "abelcheung"; repo = "types-lxml"; tag = version; - hash = "sha256-iqIOwQIg6EB/m8FIoUzkvh1W0w4bKmS9zi4Z+5qlC+0="; + hash = "sha256-dA9sspqEChHarwk2LrK2F7Ehri2ffjOlGk3nj4KFsfU="; }; build-system = [ pdm-backend ]; @@ -35,18 +36,25 @@ buildPythonPackage rec { dependencies = [ cssselect types-beautifulsoup4 + types-html5lib typing-extensions ]; + optional-dependencies = { + mypy = [ mypy ]; + pyright = [ pyright ]; + }; + nativeCheckInputs = [ beautifulsoup4 html5lib hypothesis lxml - pyright + pook pytestCheckHook typeguard - ]; + urllib3 + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "lxml-stubs" ]; diff --git a/pkgs/development/python-modules/types-mock/default.nix b/pkgs/development/python-modules/types-mock/default.nix index 37b313bc59e9..0f9dac90ddd8 100644 --- a/pkgs/development/python-modules/types-mock/default.nix +++ b/pkgs/development/python-modules/types-mock/default.nix @@ -7,15 +7,16 @@ buildPythonPackage rec { pname = "types-mock"; - version = "5.1.0.20240425"; + version = "5.2.0.20250306"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-UoGmRdcugn1wBD48wUT+M7HAA9sIT3idwgOqkOgSpaQ="; + pname = "types_mock"; + inherit version; + hash = "sha256-FYgstc+ZgFh6dgfjGJCAEiOAHXmX9VloaAXOCbZTYIc="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; # Module has no tests doCheck = false; diff --git a/pkgs/development/python-modules/types-psutil/default.nix b/pkgs/development/python-modules/types-psutil/default.nix index 2284290e8f69..7d9e9eb9de4d 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 = "6.1.0.20241221"; + version = "7.0.0.20250218"; format = "setuptools"; src = fetchPypi { pname = "types_psutil"; inherit version; - hash = "sha256-YA9aNr1eDriIfw4/P/LPFU2QaQrYEjyKcHu6SrlNMYU="; + hash = "sha256-HmQs2v6DeyQClbI7HL1GkdgLCKB9KZMhQ8u64w6w25w="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-psycopg2/default.nix b/pkgs/development/python-modules/types-psycopg2/default.nix index 19234ab8ae0c..31c8d6091516 100644 --- a/pkgs/development/python-modules/types-psycopg2/default.nix +++ b/pkgs/development/python-modules/types-psycopg2/default.nix @@ -7,15 +7,16 @@ buildPythonPackage rec { pname = "types-psycopg2"; - version = "2.9.21.20241019"; + version = "2.9.21.20250121"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-vKibmI0uvRm80IsXfSKod+qLhB3ssQ7RMK/POUBGEvo="; + pname = "types_psycopg2"; + inherit version; + hash = "sha256-Kw4s0PN0evGuJacCeJhxbYAglgR3DvPL81D+BVucNJs="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; pythonImportsCheck = [ "psycopg2-stubs" ]; diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 124bcfe8874f..dfc2d80fdefd 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -9,12 +9,13 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.32.0.20241016"; + version = "2.32.0.20250306"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-DZytLydRXQ4+PacTShtvKPuXEp2GuGfyTZxyZFJjTZU="; + pname = "types_requests"; + inherit version; + hash = "sha256-CWI1JpTsWy+V/ah37mChWavfhKD8b9rOWZ8grLQaA9E="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index cfea4f817fd9..88001456803a 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 = "75.8.0.20250110"; + version = "75.8.2.20250305"; pyproject = true; src = fetchPypi { pname = "types_setuptools"; inherit version; - hash = "sha256-lvfsi71uClTqGA1mrWiteh15VOcoGnEOot5141VUUnE="; + hash = "sha256-qYcmm0lIjyGWGh2Zqo0oG2EWJYg972OSqThVsxVE5AU="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/tzdata/default.nix b/pkgs/development/python-modules/tzdata/default.nix index 7ef57e00a0e8..640592a71fc2 100644 --- a/pkgs/development/python-modules/tzdata/default.nix +++ b/pkgs/development/python-modules/tzdata/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "tzdata"; - version = "2024.2"; + version = "2025.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-fYXMQW6TguaQlbe99K/Z44gEGKJBP+7HBp1TPWtOMcw="; + hash = "sha256-JIlJCeiM2yi9FjbGiHgB32TLSFvVk/L9g+8pB1qB1pQ="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix index a4e6ba12061c..6f100cfb5a7a 100644 --- a/pkgs/development/python-modules/tzlocal/default.nix +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "tzlocal"; - version = "5.2"; # version needs to be compatible with APScheduler + version = "5.3.1"; # version needs to be compatible with APScheduler disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-jTmSBVePGpNCgWQJzB5GqT69V1XjnqLYUzS+qRG/Dm4="; + hash = "sha256-zO/8ft7O/qH1lVQdvW6ZDLHqPRm/AbKAnzYqA915If0="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/ulid-transform/default.nix b/pkgs/development/python-modules/ulid-transform/default.nix index a776a9e1b27b..1f412bdefd1f 100644 --- a/pkgs/development/python-modules/ulid-transform/default.nix +++ b/pkgs/development/python-modules/ulid-transform/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "ulid-transform"; - version = "1.2.0"; + version = "1.2.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "ulid-transform"; tag = "v${version}"; - hash = "sha256-+P5sd3FSk9SYmeHkatB88EE+/1vktyiJJeaecbBkBhI="; + hash = "sha256-Rg9es24nsHy+y7uV0da120n1FDGJ9buSRi94L23H59c="; }; build-system = [ diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 51670c928404..1b428a61e764 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "20.29.1"; + version = "20.29.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uLiXATjTL7YGGSy5f2zUu2RPpIa+kwj7m2P4EJG13DU="; + hash = "sha256-/aq+v20DtbqDrgoCz+lvSKcW9PrlVkYdGAglhm91tyg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index 89e705b4fcad..50b2c11c4b53 100644 --- a/pkgs/development/python-modules/websockets/default.nix +++ b/pkgs/development/python-modules/websockets/default.nix @@ -7,11 +7,12 @@ pythonAtLeast, pythonOlder, setuptools, + werkzeug, }: buildPythonPackage rec { pname = "websockets"; - version = "14.1"; + version = "15.0.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "aaugustin"; repo = "websockets"; tag = version; - hash = "sha256-lH4BPP8AjR13rnl4m7IP52iSGHjKE4q1AmHv4t+PRXw="; + hash = "sha256-DC1nK+TvCoCqchyWJOyT4Ul4gkTYXixu7XmTqvytqEo="; }; build-system = [ setuptools ]; @@ -46,7 +47,10 @@ buildPythonPackage rec { "test_reject_invalid_server_certificate" ]; - nativeCheckInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ + unittestCheckHook + werkzeug + ]; preCheck = '' # https://github.com/python-websockets/websockets/issues/1509 diff --git a/pkgs/development/python-modules/webtest/default.nix b/pkgs/development/python-modules/webtest/default.nix index 706cf030e930..1759284570c1 100644 --- a/pkgs/development/python-modules/webtest/default.nix +++ b/pkgs/development/python-modules/webtest/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "webtest"; - version = "3.0.3"; + version = "3.0.4"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-tjX2/mWEvJc3SWtocVXpNz89AbyxtGFpAH2g97piOPk="; + hash = "sha256-lHeNGaN+Wr1ziNrU2Th0QQ7M7VOhc5qOX/Lby6HPwMQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/wrapt/default.nix b/pkgs/development/python-modules/wrapt/default.nix index e355d96aa9bd..46cdbd4f9071 100644 --- a/pkgs/development/python-modules/wrapt/default.nix +++ b/pkgs/development/python-modules/wrapt/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "wrapt"; - version = "1.17.1"; + version = "1.17.2"; pyproject = true; src = fetchFromGitHub { owner = "GrahamDumpleton"; repo = "wrapt"; tag = version; - hash = "sha256-k1OuGzUFF2gRsx3xrJ5/YwpXB6ksK0TsaZq6x3+ckf0="; + hash = "sha256-QduT5bncXi4LeI034h5Pqtwybru0QcQIYI7cMchLy7c="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/wtforms-sqlalchemy/default.nix b/pkgs/development/python-modules/wtforms-sqlalchemy/default.nix index b4bb6534a58d..d60a9aa186e2 100644 --- a/pkgs/development/python-modules/wtforms-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/wtforms-sqlalchemy/default.nix @@ -2,8 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + hatchling, pytestCheckHook, - setuptools, sqlalchemy, wtforms, }: @@ -21,7 +21,7 @@ buildPythonPackage rec { }; build-system = [ - setuptools + hatchling ]; dependencies = [ diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 22b130aea67f..db52743bc0ec 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "xarray"; - version = "2025.01.1"; + version = "2025.01.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pydata"; repo = "xarray"; tag = "v${version}"; - hash = "sha256-BUpMNdYu72/R36r6XXHQqwIWL/ip+O+yE4WxcQQ3ZLY="; + hash = "sha256-Ub3XHMhMnJ9i746o701PYSai8ulTdjLx4OWal2KUTLM="; }; build-system = [ diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix index aa75150a1b3f..d1a77f0ab25a 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -41,7 +41,6 @@ importlib-resources, packaging, unidiff, - glibcLocales, nixosTests, }: @@ -136,7 +135,6 @@ buildPythonApplication rec { parameterized git openssh - glibcLocales ]; patches = [ @@ -155,7 +153,6 @@ buildPythonApplication rec { doCheck = !stdenv.hostPlatform.isAarch64; preCheck = '' - export LC_ALL="en_US.UTF-8" export PATH="$out/bin:$PATH" ''; diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libcam.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libcam.nix new file mode 100644 index 000000000000..90341417d67f --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libcam.nix @@ -0,0 +1,16 @@ +{ + lib, + libsbuf, + mkDerivation, +}: +mkDerivation { + path = "lib/libcam"; + extraPaths = [ + "sys/cam" + ]; + buildInputs = [ + libsbuf + ]; + MK_TESTS = "no"; + meta.platforms = lib.platforms.freebsd; +} diff --git a/pkgs/os-specific/linux/lvm2/2_03.nix b/pkgs/os-specific/linux/lvm2/2_03.nix index d45fb41336ba..3e9e4fc5539b 100644 --- a/pkgs/os-specific/linux/lvm2/2_03.nix +++ b/pkgs/os-specific/linux/lvm2/2_03.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "2.03.30"; - hash = "sha256-rXar7LjciHcz4GxEnLmt0Eo1BvnweAwSiBem4aF87AU="; + version = "2.03.31"; + hash = "sha256-XbKVagD7+H2SJ0zMySQ2OH7Aw/qt7OdBPs4bocEMmP8="; } diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 3018a5ad98d2..4fc80eee8ae4 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -108,8 +108,7 @@ withDocumentation ? true, withEfi ? stdenv.hostPlatform.isEfi, withFido2 ? true, - # conflicts with the NixOS /etc management - withFirstboot ? false, + withFirstboot ? true, withGcrypt ? true, withHomed ? !stdenv.hostPlatform.isMusl, withHostnamed ? true, diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 24863ebaf41a..7603a39a1bfc 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1123,11 +1123,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libX11 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpthreadstubs, libxcb, xtrans, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libX11"; - version = "1.8.11"; + version = "1.8.12"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libX11-1.8.11.tar.xz"; - sha256 = "120f716wl7ay33yshicl1l0w62b9jx16ik3qnyh4ajwj8clyhx1v"; + url = "mirror://xorg/individual/lib/libX11-1.8.12.tar.xz"; + sha256 = "16lspc3bw2pg3jal7zyq6mxmxmmaax0fz6lgh1n4skqjn2dny0ps"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -2143,11 +2143,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xauth = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXext, libXmu, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xauth"; - version = "1.1.3"; + version = "1.1.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xauth-1.1.3.tar.xz"; - sha256 = "0cwxzq7lv932rcfad3baanr541qcjjdhyrhxy0bzjcp3pac581z7"; + url = "mirror://xorg/individual/app/xauth-1.1.4.tar.xz"; + sha256 = "1466a5hj0rm7sm0cr253hmy9f3yjy20aar451zfb9msa8r0q2cg9"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -4363,11 +4363,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xtrans = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xtrans"; - version = "1.5.2"; + version = "1.6.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/xtrans-1.5.2.tar.xz"; - sha256 = "0v7qvys42md6nvm16xynhb3b8zz534fc60wg0hfi7ab48zivyp2w"; + url = "mirror://xorg/individual/lib/xtrans-1.6.0.tar.xz"; + sha256 = "14ly6m6ww8rl45fdmlf58m0l1ihfji936ncx7lbiligjdcbfmbzs"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index a995b1a7d2aa..819c9ac4e934 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -21,7 +21,7 @@ mirror://xorg/individual/app/transset-1.0.3.tar.xz mirror://xorg/individual/app/twm-1.0.12.tar.xz mirror://xorg/individual/app/viewres-1.0.7.tar.xz mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2 -mirror://xorg/individual/app/xauth-1.1.3.tar.xz +mirror://xorg/individual/app/xauth-1.1.4.tar.xz mirror://xorg/individual/app/xbacklight-1.2.3.tar.bz2 mirror://xorg/individual/app/xcalc-1.1.2.tar.xz mirror://xorg/individual/app/xclock-1.1.1.tar.xz @@ -172,7 +172,7 @@ mirror://xorg/individual/lib/libICE-1.1.2.tar.xz mirror://xorg/individual/lib/libpciaccess-0.18.1.tar.xz mirror://xorg/individual/lib/libSM-1.2.5.tar.xz mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 -mirror://xorg/individual/lib/libX11-1.8.11.tar.xz +mirror://xorg/individual/lib/libX11-1.8.12.tar.xz mirror://xorg/individual/lib/libXau-1.0.12.tar.xz mirror://xorg/individual/lib/libXaw-1.0.16.tar.xz mirror://xorg/individual/lib/libxcb-1.17.0.tar.xz @@ -207,7 +207,7 @@ mirror://xorg/individual/lib/libXxf86dga-1.1.6.tar.xz mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2 mirror://xorg/individual/lib/libXxf86vm-1.1.6.tar.xz mirror://xorg/individual/lib/xcb-util-cursor-0.1.5.tar.xz -mirror://xorg/individual/lib/xtrans-1.5.2.tar.xz +mirror://xorg/individual/lib/xtrans-1.6.0.tar.xz mirror://xorg/individual/proto/xcb-proto-1.17.0.tar.xz mirror://xorg/individual/proto/xorgproto-2024.1.tar.xz mirror://xorg/individual/util/bdftopcf-1.1.2.tar.xz diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh index 2d8d784982a8..991cb4379511 100644 --- a/pkgs/stdenv/generic/builder.sh +++ b/pkgs/stdenv/generic/builder.sh @@ -19,5 +19,5 @@ mkdir $out # in stdenv. mkdir $out/nix-support if [ "$propagatedUserEnvPkgs" ]; then - printf '%s ' $propagatedUserEnvPkgs > $out/nix-support/propagated-user-env-packages + printf '%s ' "${propagatedUserEnvPkgs[@]}" > $out/nix-support/propagated-user-env-packages fi diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 57a58eb2ebe4..4bb5be6021f7 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -69,6 +69,7 @@ let defaultNativeBuildInputs = extraNativeBuildInputs ++ [ + ../../build-support/setup-hooks/no-broken-symlinks.sh ../../build-support/setup-hooks/audit-tmpdir.sh ../../build-support/setup-hooks/compress-man-pages.sh ../../build-support/setup-hooks/make-symlinks-relative.sh @@ -77,7 +78,6 @@ let ../../build-support/setup-hooks/move-sbin.sh ../../build-support/setup-hooks/move-systemd-user-units.sh ../../build-support/setup-hooks/multiple-outputs.sh - ../../build-support/setup-hooks/no-broken-symlinks.sh ../../build-support/setup-hooks/patch-shebangs.sh ../../build-support/setup-hooks/prune-libtool-files.sh ../../build-support/setup-hooks/reproducible-builds.sh diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 958fc54f277f..e37134e98ced 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1644,8 +1644,7 @@ fixupPhase() { if [ -n "${propagatedUserEnvPkgs:-}" ]; then mkdir -p "${!outputBin}/nix-support" - # shellcheck disable=SC2086 - printWords $propagatedUserEnvPkgs > "${!outputBin}/nix-support/propagated-user-env-packages" + printWords "${propagatedUserEnvPkgs[@]}" > "${!outputBin}/nix-support/propagated-user-env-packages" fi runHook postFixup diff --git a/pkgs/test/stdenv/hooks.nix b/pkgs/test/stdenv/hooks.nix index 83e82b77b24b..aa138040d50f 100644 --- a/pkgs/test/stdenv/hooks.nix +++ b/pkgs/test/stdenv/hooks.nix @@ -7,6 +7,9 @@ # ordering should match defaultNativeBuildInputs { + no-broken-symlinks = lib.recurseIntoAttrs ( + import ./no-broken-symlinks.nix { inherit stdenv lib pkgs; } + ); # TODO: add audit-tmpdir compress-man-pages = let @@ -97,7 +100,6 @@ [[ -e $out/bin/foo ]] ''; }; - no-broken-symlinks = import ./no-broken-symlinks.nix { inherit stdenv lib pkgs; }; # TODO: add multiple-outputs patch-shebangs = import ./patch-shebangs.nix { inherit stdenv lib pkgs; }; prune-libtool-files = diff --git a/pkgs/test/stdenv/no-broken-symlinks.nix b/pkgs/test/stdenv/no-broken-symlinks.nix index 9c8ea72a2c7d..af23373c5630 100644 --- a/pkgs/test/stdenv/no-broken-symlinks.nix +++ b/pkgs/test/stdenv/no-broken-symlinks.nix @@ -17,6 +17,18 @@ let ln -s${optionalString (!absolute) "r"} "$out/reflexive-symlink" "$out/reflexive-symlink" ''; + # Some platforms implement permissions for symlinks, while others - including Linux - ignore them. + # As a result, testing this hook's handling of unreadable symlinks requires careful attention to + # which kind of platform we're on. See the comments by `lib.optionalAttrs` below for details. + hasSymlinkPermissions = with stdenv.hostPlatform; isDarwin || isBSD; + mkUnreadableSymlink = absolute: '' + touch "$out/unreadable-symlink-target" + ( + umask 777 + ln -s${optionalString (!absolute) "r"} "$out/unreadable-symlink-target" "$out/unreadable-symlink" + ) + ''; + mkValidSymlink = absolute: '' touch "$out/valid" ln -s${optionalString (!absolute) "r"} "$out/valid" "$out/valid-symlink" @@ -61,7 +73,7 @@ in } '' (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) - grep -F 'found 1 dangling symlinks and 0 reflexive symlinks' "$failed/testBuildFailure.log" + grep -F 'found 1 dangling symlinks, 0 reflexive symlinks and 0 unreadable symlinks' "$failed/testBuildFailure.log" touch $out ''; @@ -81,7 +93,7 @@ in } '' (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) - grep -F 'found 1 dangling symlinks and 0 reflexive symlinks' "$failed/testBuildFailure.log" + grep -F 'found 1 dangling symlinks, 0 reflexive symlinks and 0 unreadable symlinks' "$failed/testBuildFailure.log" touch $out ''; @@ -101,7 +113,7 @@ in } '' (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) - grep -F 'found 0 dangling symlinks and 1 reflexive symlinks' "$failed/testBuildFailure.log" + grep -F 'found 0 dangling symlinks, 1 reflexive symlinks and 0 unreadable symlinks' "$failed/testBuildFailure.log" touch $out ''; @@ -121,7 +133,7 @@ in } '' (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) - grep -F 'found 0 dangling symlinks and 1 reflexive symlinks' "$failed/testBuildFailure.log" + grep -F 'found 0 dangling symlinks, 1 reflexive symlinks and 0 unreadable symlinks' "$failed/testBuildFailure.log" touch $out ''; @@ -131,6 +143,7 @@ in derivationArgs.dontCheckForBrokenSymlinks = true; }; + # Leave the unreadable symlink out of the combined 'broken' test since it doesn't work on all platforms. fail-broken-symlinks-relative = runCommand "fail-broken-symlinks-relative" { @@ -144,7 +157,7 @@ in } '' (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) - grep -F 'found 1 dangling symlinks and 1 reflexive symlinks' "$failed/testBuildFailure.log" + grep -F 'found 1 dangling symlinks, 1 reflexive symlinks and 0 unreadable symlinks' "$failed/testBuildFailure.log" touch $out ''; @@ -170,7 +183,7 @@ in } '' (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) - grep -F 'found 1 dangling symlinks and 1 reflexive symlinks' "$failed/testBuildFailure.log" + grep -F 'found 1 dangling symlinks, 1 reflexive symlinks and 0 unreadable symlinks' "$failed/testBuildFailure.log" touch $out ''; @@ -183,6 +196,10 @@ in derivationArgs.dontCheckForBrokenSymlinks = true; }; + # The `all-broken` tests include unreadable symlinks along with the other kinds of broken links. + # They should be run/skipped on the same sets platforms as the corresponding `unreadable` tests. + # See below. + pass-valid-symlink-relative = testBuilder { name = "pass-valid-symlink-relative"; commands = [ (mkValidSymlink false) ]; @@ -203,3 +220,111 @@ in commands = [ (mkValidSymlinkOutsideNixStore true) ]; }; } +# Skip these tests if symlink permissions are not supported, since the hook won't have anything to report. +// lib.optionalAttrs hasSymlinkPermissions { + fail-unreadable-symlink-relative = + runCommand "fail-unreadable-symlink-relative" + { + failed = testBuildFailure (testBuilder { + name = "fail-unreadable-symlink-relative-inner"; + commands = [ (mkUnreadableSymlink false) ]; + }); + } + '' + (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) + grep -F 'found 0 dangling symlinks, 0 reflexive symlinks and 1 unreadable symlinks' "$failed/testBuildFailure.log" + touch $out + ''; + + fail-unreadable-symlink-absolute = + runCommand "fail-unreadable-symlink-absolute" + { + failed = testBuildFailure (testBuilder { + name = "fail-unreadable-symlink-absolute-inner"; + commands = [ (mkUnreadableSymlink true) ]; + }); + } + '' + (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) + grep -F 'found 0 dangling symlinks, 0 reflexive symlinks and 1 unreadable symlinks' "$failed/testBuildFailure.log" + touch $out + ''; + + fail-all-broken-symlinks-relative = + runCommand "fail-all-broken-symlinks-relative" + { + failed = testBuildFailure (testBuilder { + name = "fail-all-broken-symlinks-relative-inner"; + commands = [ + (mkDanglingSymlink false) + (mkReflexiveSymlink false) + (mkUnreadableSymlink false) + ]; + }); + } + '' + (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) + if ! grep -F 'found 1 dangling symlinks, 1 reflexive symlinks and 1 unreadable symlinks' "$failed/testBuildFailure.log"; then + grep -F 'symlink permissions not supported' "$failed/testBuildFailure.log" + grep -F 'found 1 dangling symlinks, 1 reflexive symlinks and 0 unreadable symlinks' "$failed/testBuildFailure.log" + fi + touch $out + ''; + + fail-all-broken-symlinks-absolute = + runCommand "fail-all-broken-symlinks-absolute" + { + failed = testBuildFailure (testBuilder { + name = "fail-all-broken-symlinks-absolute-inner"; + commands = [ + (mkDanglingSymlink true) + (mkReflexiveSymlink true) + (mkUnreadableSymlink true) + ]; + }); + } + '' + (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) + if ! grep -F 'found 1 dangling symlinks, 1 reflexive symlinks and 1 unreadable symlinks' "$failed/testBuildFailure.log"; then + grep -F 'symlink permissions not supported' "$failed/testBuildFailure.log" + grep -F 'found 1 dangling symlinks, 1 reflexive symlinks and 0 unreadable symlinks' "$failed/testBuildFailure.log" + fi + touch $out + ''; + +} +# These tests will break on platforms that do use symlink permissions, because even though this hook will be okay, later ones will error out. +# They should be safe to run on other platforms, just to make sure the hook isn't completely broken. It won't have anything to report, though. +// lib.optionalAttrs (!hasSymlinkPermissions) { + pass-unreadable-symlink-relative-allowed = testBuilder { + name = "pass-unreadable-symlink-relative-allowed"; + commands = [ (mkUnreadableSymlink false) ]; + derivationArgs.dontCheckForBrokenSymlinks = true; + }; + + pass-unreadable-symlink-absolute-allowed = testBuilder { + name = "pass-unreadable-symlink-absolute-allowed"; + commands = [ (mkUnreadableSymlink true) ]; + derivationArgs.dontCheckForBrokenSymlinks = true; + }; + + pass-all-broken-symlinks-relative-allowed = testBuilder { + name = "pass-all-broken-symlinks-relative-allowed"; + commands = [ + (mkDanglingSymlink false) + (mkReflexiveSymlink false) + (mkUnreadableSymlink false) + ]; + derivationArgs.dontCheckForBrokenSymlinks = true; + }; + + pass-all-broken-symlinks-absolute-allowed = testBuilder { + name = "pass-all-broken-symlinks-absolute-allowed"; + commands = [ + (mkDanglingSymlink true) + (mkReflexiveSymlink true) + (mkUnreadableSymlink true) + ]; + derivationArgs.dontCheckForBrokenSymlinks = true; + }; +} diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 103690caf3aa..9454c6698b36 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "11.9.2"; + version = "11.9.3"; outputs = [ "bin" "out" "dev" ]; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "4998"; - sha256 = "sha256-lpPTvsRNsATmcg3eCGs9rqxeWw5CaNZP2DUU4yCOmyc="; + rev = "5027"; + sha256 = "sha256-fz4SvJwQAYV6agXC7oMwo8rUIHMRav25MuWiwoEONkE="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/maubot/default.nix b/pkgs/tools/networking/maubot/default.nix index f5e5ab4ec45e..21db3534cb74 100644 --- a/pkgs/tools/networking/maubot/default.nix +++ b/pkgs/tools/networking/maubot/default.nix @@ -93,9 +93,6 @@ let rm $out/example-config.yaml ''; - # Setuptools is trying to do python -m maubot test - dontUseSetuptoolsCheck = true; - pythonImportsCheck = [ "maubot" ]; diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix index 767fc3011fd8..96dae1f4c682 100644 --- a/pkgs/tools/networking/s3cmd/default.nix +++ b/pkgs/tools/networking/s3cmd/default.nix @@ -22,8 +22,6 @@ buildPythonApplication rec { python-dateutil ]; - dontUseSetuptoolsCheck = true; - meta = with lib; { homepage = "https://s3tools.org/s3cmd"; description = "Command line tool for managing Amazon S3 and CloudFront services"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3e309a95bd4d..cbc8189dff4f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1155,6 +1155,7 @@ mapAliases { panopticon = throw "'panopticon' has been removed because it is unmaintained upstream"; # Added 2025-01-25 paperoni = throw "paperoni has been removed, because it is unmaintained"; # Added 2024-07-14 paperless = throw "'paperless' has been renamed to/replaced by 'paperless-ngx'"; # Converted to throw 2024-10-17 + pathsFromGraph = throw "pathsFromGraph has been removed, use closureInfo instead";# Added 2025-01-23 paperless-ng = paperless-ngx; # Added 2022-04-11 partition-manager = makePlasma5Throw "partitionmanager"; # Added 2024-01-08 patchelfStable = patchelf; # Added 2024-01-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac7fd2d9f463..62e24ac3cc28 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -734,8 +734,6 @@ with pkgs; callPackages ../build-support/setup-hooks/patch-rc-path-hooks { } ) patchRcPathBash patchRcPathCsh patchRcPathFish patchRcPathPosix; - pathsFromGraph = ../build-support/kernel/paths-from-graph.pl; - pruneLibtoolFiles = makeSetupHook { name = "prune-libtool-files"; } ../build-support/setup-hooks/prune-libtool-files.sh; @@ -10977,17 +10975,17 @@ with pkgs; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl_2_5_0 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.5.0"; }; - faslExt = "fasl"; - flags = [ "--dynamic-space-size" "3000" ]; - }; sbcl_2_5_1 = wrapLisp { pkg = callPackage ../development/compilers/sbcl { version = "2.5.1"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl = sbcl_2_5_1; + sbcl_2_5_2 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.5.2"; }; + faslExt = "fasl"; + flags = [ "--dynamic-space-size" "3000" ]; + }; + sbcl = sbcl_2_5_2; sbclPackages = recurseIntoAttrs sbcl.pkgs; @@ -12404,6 +12402,7 @@ with pkgs; usbrelayd = callPackage ../os-specific/linux/usbrelay/daemon.nix { }; util-linuxMinimal = util-linux.override { + cryptsetupSupport = false; nlsSupport = false; ncursesSupport = false; pamSupport = false; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index ccf71248b1fc..6994edcfd581 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -205,6 +205,7 @@ mapAliases ({ email_validator = email-validator; # added 2022-06-22 enhancements = throw "enhancements is unmaintained upstream and has therefore been removed"; # added 2023-10-27 enum-compat = throw "enum-compat is a virtual package providing enum34, which does not do anything since Python 3.4"; # added 2025-02-15 + enum34 = throw "enum34 is no longer needed since Python 3.4"; # added 2025-03-06 et_xmlfile = et-xmlfile; # added 2023-10-16 etebase-server = throw "pkgs.python3.etebase-server has been removed, use pkgs.etebase-server"; # added 2024-07-16 ev3dev2 = python-ev3dev2; # added 2023-06-19 @@ -598,6 +599,7 @@ mapAliases ({ pytorchWithCuda = torchWithCuda; # added 2022-09-30 pytorchWithoutCuda = torchWithoutCuda; # added 2022-09-30 pytwitchapi = twitchapi; # added 2022-03-07 + pytzdata = throw "pytzdata has been removed, because iit is unmaintained upstream. Use pytz or tzdata instead."; # added 2025-03-03 pyuavcan = throw "pyuavcan has been renamed to pycyphal and the old package deprecated, use pycyphal instead"; # added 2024-02-09 pyunifiprotect = throw "pyunifiprotect has disappeared from GitHub and PyPI, use uiprotect instead"; # added 2024-09-17 pyutilib = throw "pyutilib has been removed, since it is no longer maintained"; # added 2024-07-28 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0c046157350e..2378f810288a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4275,8 +4275,6 @@ self: super: with self; { enturclient = callPackage ../development/python-modules/enturclient { }; - enum34 = callPackage ../development/python-modules/enum34 { }; - env-canada = callPackage ../development/python-modules/env-canada { }; environmental-override = callPackage ../development/python-modules/environmental-override { }; @@ -13833,8 +13831,6 @@ self: super: with self; { pytz-deprecation-shim = callPackage ../development/python-modules/pytz-deprecation-shim { }; - pytzdata = callPackage ../development/python-modules/pytzdata { }; - pyu2f = callPackage ../development/python-modules/pyu2f { }; pyudev = callPackage ../development/python-modules/pyudev { @@ -14605,6 +14601,8 @@ self: super: with self; { roma = callPackage ../development/python-modules/roma { }; + roman-numerals-py = callPackage ../development/python-modules/roman-numerals-py { }; + roman = callPackage ../development/python-modules/roman { }; romy = callPackage ../development/python-modules/romy { }; diff --git a/pkgs/top-level/unixtools.nix b/pkgs/top-level/unixtools.nix index b5c34fe6ba07..7e2e97200d93 100644 --- a/pkgs/top-level/unixtools.nix +++ b/pkgs/top-level/unixtools.nix @@ -107,7 +107,7 @@ let darwin = pkgs.darwin.diskdev_cmds; }; hexdump = { - linux = pkgs.util-linux; + linux = pkgs.util-linuxMinimal; darwin = pkgs.darwin.shell_cmds; }; hostname = {