diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 953444abe586..ad943c98fc9b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -160,7 +160,6 @@ ./misc/wordlist.nix ./programs/_1password-gui.nix ./programs/_1password.nix - ./programs/adb.nix ./programs/alvr.nix ./programs/amnezia-vpn.nix ./programs/appgate-sdp.nix diff --git a/nixos/modules/programs/adb.nix b/nixos/modules/programs/adb.nix deleted file mode 100644 index 4ae2569049ed..000000000000 --- a/nixos/modules/programs/adb.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -{ - meta.maintainers = [ lib.maintainers.mic92 ]; - - ###### interface - options = { - programs.adb = { - enable = lib.mkOption { - default = false; - type = lib.types.bool; - description = '' - Whether to configure system to use Android Debug Bridge (adb). - ''; - }; - }; - }; - - ###### implementation - config = lib.mkIf config.programs.adb.enable { - environment.systemPackages = [ pkgs.android-tools ]; - }; -} diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 1f01c20575c3..0a661c984c2c 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -63,6 +63,13 @@ in "networking" "wicd" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule + [ + "programs" + "adb" + ] + "This option is no longer needed as systemd 258 handles uaccess rules automatically. Please add `pkgs.android-tools` to your system packages to get the adb command." + ) (mkRemovedOptionModule [ "programs" "cardboard" diff --git a/nixos/modules/services/networking/cgit.nix b/nixos/modules/services/networking/cgit.nix index 63d247a9e068..db0fa913cde4 100644 --- a/nixos/modules/services/networking/cgit.nix +++ b/nixos/modules/services/networking/cgit.nix @@ -217,7 +217,8 @@ in When enabled you must also configure `strict-export = "git-daemon-export-ok"` in `settings` to make cgit check for the same files. ''; - type = lib.types.bool; + type = lib.types.nullOr lib.types.bool; + default = null; }; }; } @@ -235,18 +236,24 @@ in } { assertion = - !cfg.enable - || !cfg.gitHttpBackend.enable - || !cfg.gitHttpBackend.checkExportOkFiles - || cfg.settings.strict-export == "git-daemon-export-ok"; + cfg.enable -> cfg.gitHttpBackend.enable -> cfg.gitHttpBackend.checkExportOkFiles != null; + message = "Misconfigured services.cgit.${vhost}: When gitHttpBackend.enable is true then gitHttpBackend.checkExportOkFiles must be set, see the documentation for the option for further information."; + } + { + assertion = + cfg.enable + -> cfg.gitHttpBackend.enable + -> cfg.gitHttpBackend.checkExportOkFiles + -> (cfg.settings ? strict-export && cfg.settings.strict-export == "git-daemon-export-ok"); message = "Misconfigured services.cgit.${vhost}: When gitHttpBackend.checkExportOkFiles is true then settings.strict-export must be \"git-daemon-export-ok\"."; } { assertion = - !cfg.enable - || !cfg.gitHttpBackend.enable - || cfg.settings.strict-export == null - || cfg.gitHttpBackend.checkExportOkFiles; + cfg.enable + -> cfg.gitHttpBackend.enable + -> !cfg.gitHttpBackend.checkExportOkFiles + -> cfg.settings ? strict-export + -> cfg.settings.strict-export == null; message = "Misconfigured services.cgit.${vhost}: settings.strict-export is set but the gitHttpBackend is enabled and checkExportOkFiles is false."; } ]) cfgs diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index cc57325a1959..c197e2d42838 100644 --- a/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -99,7 +99,7 @@ with lib; Compared to `listen` this only sets the addresses and the ports are chosen automatically. - Note: This option overrides `enableIPv6` + Note: This option overrides `networking.enableIPv6` ''; default = [ ]; example = [ diff --git a/pkgs/applications/emulators/libretro/cores/vba-m.nix b/pkgs/applications/emulators/libretro/cores/vba-m.nix index 4653c11652ec..0e0d9cd98671 100644 --- a/pkgs/applications/emulators/libretro/cores/vba-m.nix +++ b/pkgs/applications/emulators/libretro/cores/vba-m.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "vbam"; - version = "0-unstable-2025-12-10"; + version = "0-unstable-2026-01-04"; src = fetchFromGitHub { owner = "libretro"; repo = "vbam-libretro"; - rev = "b269c9c3eb05da5e2adf3a512873224e3164dea3"; - hash = "sha256-SwBLeCa233RMp4lJf3pv7aegy9jd/M/GO7T9jbIuBY8="; + rev = "894948f85303253d4e70ae03c9eff8865d95f427"; + hash = "sha256-0KgCJSYn0PUL/5cGLzFEfRCAMtsdY4N6wY5hbNteRFI="; }; makefile = "Makefile"; diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix index aefd57fbe0b4..2c1276a886e6 100644 --- a/pkgs/build-support/build-mozilla-mach/default.nix +++ b/pkgs/build-support/build-mozilla-mach/default.nix @@ -51,7 +51,7 @@ in autoconf, cargo, dump_syms, - makeWrapper, + makeBinaryWrapper, mimalloc, nodejs, perl, @@ -354,7 +354,7 @@ buildStdenv.mkDerivation { cargo gnum4 llvmPackagesBuildBuild.bintools - makeWrapper + makeBinaryWrapper nodejs perl python3 @@ -658,9 +658,6 @@ buildStdenv.mkDerivation { # Remove SDK cruft. FIXME: move to a separate output? rm -rf $out/share/idl $out/include $out/lib/${binaryName}-devel-* - # Needed to find Mozilla runtime - gappsWrapperArgs+=(--argv0 "$out/bin/.${binaryName}-wrapped") - resourceDir=$out/lib/${binaryName} '' + '' diff --git a/pkgs/build-support/prefer-remote-fetch/default.nix b/pkgs/build-support/prefer-remote-fetch/default.nix index d686533f69e0..c39caf4d6b4d 100644 --- a/pkgs/build-support/prefer-remote-fetch/default.nix +++ b/pkgs/build-support/prefer-remote-fetch/default.nix @@ -10,24 +10,38 @@ # $ mkdir ~/.config/nixpkgs/overlays/ # $ echo 'self: super: super.prefer-remote-fetch self super' > ~/.config/nixpkgs/overlays/prefer-remote-fetch.nix # -self: super: { - binary-cache = args: super.binary-cache ({ preferLocalBuild = false; } // args); - buildenv = args: super.buildenv ({ preferLocalBuild = false; } // args); - fetchfossil = args: super.fetchfossil ({ preferLocalBuild = false; } // args); - fetchdocker = args: super.fetchdocker ({ preferLocalBuild = false; } // args); - fetchgit = args: super.fetchgit ({ preferLocalBuild = false; } // args); - fetchgx = args: super.fetchgx ({ preferLocalBuild = false; } // args); - fetchhg = args: super.fetchhg ({ preferLocalBuild = false; } // args); - fetchipfs = args: super.fetchipfs ({ preferLocalBuild = false; } // args); - fetchrepoproject = args: super.fetchrepoproject ({ preferLocalBuild = false; } // args); - fetchs3 = args: super.fetchs3 ({ preferLocalBuild = false; } // args); - fetchsvn = args: super.fetchsvn ({ preferLocalBuild = false; } // args); - fetchurl = - fpArgs: - super.fetchurl ( - super.lib.extends (finalAttrs: args: { preferLocalBuild = args.preferLocalBuild or false; }) ( - super.lib.toFunction fpArgs - ) - ); - mkNugetSource = args: super.mkNugetSource ({ preferLocalBuild = false; } // args); +self: super: +let + preferLocal = + orig: + self.lib.extendMkDerivation { + constructDrv = orig; + extendDrvArgs = + finalAttrs: + { + preferLocalBuild ? false, + ... + }: + { + inherit preferLocalBuild; + }; + }; + +in +{ + binary-cache = preferLocal super.binary-cache; + buildenv = preferLocal super.buildenv; + fetchfossil = preferLocal super.fetchfossil; + fetchdocker = preferLocal super.fetchdocker; + fetchgit = (preferLocal super.fetchgit) // { + inherit (super.fetchgit) getRevWithTag; + }; + fetchgx = preferLocal super.fetchgx; + fetchhg = preferLocal super.fetchhg; + fetchipfs = preferLocal super.fetchipfs; + fetchrepoproject = preferLocal super.fetchrepoproject; + fetchs3 = preferLocal super.fetchs3; + fetchsvn = preferLocal super.fetchsvn; + fetchurl = preferLocal super.fetchurl; + mkNugetSource = preferLocal super.mkNugetSource; } diff --git a/pkgs/build-support/prefer-remote-fetch/tests.nix b/pkgs/build-support/prefer-remote-fetch/tests.nix new file mode 100644 index 000000000000..a9bd1f2b2e24 --- /dev/null +++ b/pkgs/build-support/prefer-remote-fetch/tests.nix @@ -0,0 +1,49 @@ +{ pkgs, ... }: + +let + pkgs' = pkgs.extend (self: super: super.prefer-remote-fetch self super); + + check = + fn: args: + let + drv = pkgs'.testers.invalidateFetcherByDrvHash fn args; + in + if drv.preferLocalBuild then throw "Fetcher must not prefer local builds" else drv; + +in +pkgs'.callPackage ( + { + testers, + fetchgit, + fetchFromGitHub, + fetchurl, + fetchzip, + ... + }: + { + fetchgit = check fetchgit { + name = "simple-nix-source"; + url = "https://github.com/NixOS/nix"; + rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a"; + sha256 = "sha256-7DszvbCNTjpzGRmpIVAWXk20P0/XTrWZ79KSOGLrUWY="; + }; + + fetchFromGitHub = check fetchFromGitHub { + name = "simple-nix-source"; + owner = "NixOS"; + repo = "nix"; + rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a"; + hash = "sha256-7DszvbCNTjpzGRmpIVAWXk20P0/XTrWZ79KSOGLrUWY="; + }; + + fetchurl = check fetchurl { + url = "https://gist.github.com/glandium/01d54cefdb70561b5f6675e08f2990f2/archive/2f430f0c136a69b0886281d0c76708997d8878af.zip"; + sha256 = "sha256-J/ZWC23GmFfew/56NQvPqKzqkWgjOaPvbMicFJnuJxI="; + }; + + fetchzip = check fetchzip { + url = "https://gist.github.com/glandium/01d54cefdb70561b5f6675e08f2990f2/archive/2f430f0c136a69b0886281d0c76708997d8878af.zip"; + sha256 = "sha256-0ecwgL8qUavSj1+WkaxpmRBmu7cvj53V5eXQV71fddU="; + }; + } +) { } diff --git a/pkgs/by-name/an/angrr/package.nix b/pkgs/by-name/an/angrr/package.nix index 8c1d4c2c4367..c40bf8caadba 100644 --- a/pkgs/by-name/an/angrr/package.nix +++ b/pkgs/by-name/an/angrr/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "angrr"; - version = "0.2.0"; + version = "0.2.3"; src = fetchFromGitHub { owner = "linyinfeng"; repo = "angrr"; tag = "v${finalAttrs.version}"; - hash = "sha256-Z+B0MO5ZoPJveO571mlzNVedBEac7P4RE7Cq8e/9bJk="; + hash = "sha256-8UrQ9e+gx7AR6ASNX94P2K3SvNOzvR98U3ub/odqybM="; }; - cargoHash = "sha256-j36vyfIP63Qmd55vaVb9buqrCItXwFalelzU8BlKm9s="; + cargoHash = "sha256-pVFIsFIdOIgBilBRYtGZdjVOyaERrfiJJT2WT/YoXeQ="; buildAndTestSubdir = "angrr"; diff --git a/pkgs/by-name/an/antares/package.nix b/pkgs/by-name/an/antares/package.nix index a83b1f09bede..be56fc44203a 100644 --- a/pkgs/by-name/an/antares/package.nix +++ b/pkgs/by-name/an/antares/package.nix @@ -3,7 +3,7 @@ lib, buildNpmPackage, electron, - nodejs, + nodejs_22, makeDesktopItem, copyDesktopItems, icoutils, @@ -29,7 +29,9 @@ buildNpmPackage rec { ./npm-lock.patch ]; - buildInputs = [ nodejs ]; + nodejs = nodejs_22; + + buildInputs = [ nodejs_22 ]; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/by-name/ao/aocl-utils/package.nix b/pkgs/by-name/ao/aocl-utils/package.nix index af9c835cbeb4..59f81da125bc 100644 --- a/pkgs/by-name/ao/aocl-utils/package.nix +++ b/pkgs/by-name/ao/aocl-utils/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aocl-utils"; - version = "5.1"; + version = "5.2"; src = fetchFromGitHub { owner = "amd"; repo = "aocl-utils"; tag = version; - hash = "sha256-1g5gERVxXKAeCyNR9/HheUfj+MPxJso3NzqDonvuyMo="; + hash = "sha256-wPnKfPbkW9ILu1YgyymKmg5gZj0l0cWio3/JTXtbylA="; }; patches = [ ./pkg-config.patch ]; diff --git a/pkgs/by-name/ap/apparmor-utils/package.nix b/pkgs/by-name/ap/apparmor-utils/package.nix index 68959cdab171..c7f958887967 100644 --- a/pkgs/by-name/ap/apparmor-utils/package.nix +++ b/pkgs/by-name/ap/apparmor-utils/package.nix @@ -3,12 +3,11 @@ makeWrapper, gawk, perl, - bash, + runtimeShellPackage, stdenv, which, linuxHeaders ? stdenv.cc.libc.linuxHeaders, python3Packages, - bashNonInteractive, buildPackages, # apparmor deps @@ -23,7 +22,7 @@ python3Packages.buildPythonApplication { inherit (libapparmor) version src; postPatch = '' - patchShebangs . + patchShebangs common cd utils substituteInPlace aa-remove-unknown \ @@ -45,13 +44,12 @@ python3Packages.buildPythonApplication { nativeBuildInputs = [ makeWrapper which - bashNonInteractive python3Packages.setuptools ]; buildInputs = [ - bash perl + runtimeShellPackage ]; pythonPath = [ diff --git a/pkgs/by-name/be/bento/package.nix b/pkgs/by-name/be/bento/package.nix index 65b3b2d82626..45889d77b3bf 100644 --- a/pkgs/by-name/be/bento/package.nix +++ b/pkgs/by-name/be/bento/package.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "bento"; - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "warpstreamlabs"; repo = "bento"; tag = "v${version}"; - hash = "sha256-5UzicbR+JzLgPLilPHO9HKteC632cJc5EQanPPc0lj8="; + hash = "sha256-60hWz6DgJk5PJR/W19lFVxIubZBPLZ3SENc/3bpA9hs="; }; proxyVendor = true; - vendorHash = "sha256-wZPhjzDD2T7CYz0Y0QkFarnTOsJzm5snlp9KnBuOc3U="; + vendorHash = "sha256-G9slXTly5cJT93wQrD8eITsF0rVdrpRW4r/YTYqW/Mc="; subPackages = [ "cmd/bento" diff --git a/pkgs/by-name/bi/bingrep/package.nix b/pkgs/by-name/bi/bingrep/package.nix index d66c76afc307..51ffde524857 100644 --- a/pkgs/by-name/bi/bingrep/package.nix +++ b/pkgs/by-name/bi/bingrep/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "bingrep"; - version = "0.11.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "m4b"; repo = "bingrep"; rev = "v${version}"; - hash = "sha256-bHu3/f25U1QtRZv1z5OQSDMayOpLU6tbNaV00K55ZY8="; + hash = "sha256-1GSAYhxFg5nXR8+vWBN10JLV7qUIxT1hYNXdnpE5Uag="; }; - cargoHash = "sha256-cGDFbf8fUGbuxl8tOvKss5tqpBd1TY7TcwNzWwdw12A="; + cargoHash = "sha256-llyItFYNnvWjPYoTrY8oS4z8tU9IuKYCfvHSURDKNDk="; meta = { description = "Greps through binaries from various OSs and architectures, and colors them"; diff --git a/pkgs/by-name/cr/crun/package.nix b/pkgs/by-name/cr/crun/package.nix index 6c2fa30a251b..65e73259621c 100644 --- a/pkgs/by-name/cr/crun/package.nix +++ b/pkgs/by-name/cr/crun/package.nix @@ -41,13 +41,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "crun"; - version = "1.25.1"; + version = "1.26"; src = fetchFromGitHub { owner = "containers"; repo = "crun"; tag = finalAttrs.version; - hash = "sha256-WBAwyDODMrUDlgonRbxaNQ+aN8K6YicY2JVArXDJem8="; + hash = "sha256-h9X9UNPXNLSN+b9ka1kXMfApxkU4j5zU3yyyBQyYmwE="; fetchSubmodules = true; leaveDotGit = true; postFetch = '' diff --git a/pkgs/by-name/gi/git/package.nix b/pkgs/by-name/gi/git/package.nix index c4a4bd7e8334..fd9a5f2f5179 100644 --- a/pkgs/by-name/gi/git/package.nix +++ b/pkgs/by-name/gi/git/package.nix @@ -171,6 +171,10 @@ stdenv.mkDerivation (finalAttrs: { docbook_xsl docbook_xml_dtd_45 libxslt + ] + ++ lib.optionals rustSupport [ + cargo + rustc ]; buildInputs = [ curl @@ -189,10 +193,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals withLibsecret [ glib libsecret - ] - ++ lib.optionals rustSupport [ - cargo - rustc ]; # required to support pthread_cancel() diff --git a/pkgs/by-name/go/gocatcli/package.nix b/pkgs/by-name/go/gocatcli/package.nix index 63a51f85a9ea..af9584391016 100644 --- a/pkgs/by-name/go/gocatcli/package.nix +++ b/pkgs/by-name/go/gocatcli/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "gocatcli"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "deadc0de6"; repo = "gocatcli"; tag = "v${version}"; - hash = "sha256-a76vQGfw5LnLVurPkAXdwVtdCn+hjmC5Q5oNYSHRsjo="; + hash = "sha256-MUOyxDdU5xCQ7mQpNP1sS1zKGe/6/bqN1sSu5JqW36o="; }; - vendorHash = "sha256-aT56Xx6m/AlvzPmlaJR4wiqTsxjWk0lyPXShNaHPoaU="; + vendorHash = "sha256-Zp9m0v/F4AJ9b3GH3/SoZx1jijHGR854f8KhhcIPjS8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/hy/hydralauncher/package.nix b/pkgs/by-name/hy/hydralauncher/package.nix index dc24d414a84f..1c98d0bed83d 100644 --- a/pkgs/by-name/hy/hydralauncher/package.nix +++ b/pkgs/by-name/hy/hydralauncher/package.nix @@ -6,10 +6,10 @@ }: let pname = "hydralauncher"; - version = "3.7.6"; + version = "3.8.0"; src = fetchurl { url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage"; - hash = "sha256-6ERgFwJkRZH1Cj6ucswLU0EpwmjDE0gcmFYm5JbLuK0="; + hash = "sha256-8dRnGr9nVu+GNIVcH90iPDF0VoMibiKqL6dGRdmZl94="; }; appimageContents = appimageTools.extractType2 { inherit pname src version; }; diff --git a/pkgs/by-name/hy/hyprtoolkit/package.nix b/pkgs/by-name/hy/hyprtoolkit/package.nix index bf97ca524c9e..6bc8429b4451 100644 --- a/pkgs/by-name/hy/hyprtoolkit/package.nix +++ b/pkgs/by-name/hy/hyprtoolkit/package.nix @@ -25,13 +25,13 @@ gcc15Stdenv.mkDerivation (finalAttrs: { pname = "hyprtoolkit"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprtoolkit"; tag = "v${finalAttrs.version}"; - hash = "sha256-qxWKwg99yIV72E+xAUz82+TD3X3+VPgnGHBX6mOLp9Q="; + hash = "sha256-AEnLjthDHNqD1uPBsVWdo7Pb+Xveh4DzwAPFM2stzNM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/jr/jrnl/package.nix b/pkgs/by-name/jr/jrnl/package.nix index d83601ab2173..387e197e66f2 100644 --- a/pkgs/by-name/jr/jrnl/package.nix +++ b/pkgs/by-name/jr/jrnl/package.nix @@ -24,6 +24,10 @@ python3.pkgs.buildPythonApplication rec { --replace-fail "from pytest_bdd.steps import inject_fixture" "from pytest_bdd.compat import inject_fixture" ''; + disabledTests = [ + "test_override_configured_linewrap_with_a_value_of_23" + ]; + build-system = with python3.pkgs; [ poetry-core ]; dependencies = with python3.pkgs; [ diff --git a/pkgs/by-name/ka/kando/package.nix b/pkgs/by-name/ka/kando/package.nix index c00687e01d9f..285f5bbd9e11 100644 --- a/pkgs/by-name/ka/kando/package.nix +++ b/pkgs/by-name/ka/kando/package.nix @@ -5,7 +5,7 @@ fetchFromGitHub, electron, - nodejs, + nodejs_22, cmake, zip, @@ -21,18 +21,21 @@ wayland, }: -buildNpmPackage rec { +let + nodejs = nodejs_22; # NPM v11 included in nodejs_24 doesn't work with the current lockfile +in +buildNpmPackage.override { inherit nodejs; } rec { pname = "kando"; - version = "2.0.0"; + version = "2.1.2"; src = fetchFromGitHub { owner = "kando-menu"; repo = "kando"; tag = "v${version}"; - hash = "sha256-pgHhMzObj8Fh6pw1wjJXjghjKzKiM64lXS4Xlwh3omY="; + hash = "sha256-x+emk0N5AL5Nfk9d1+RehdLoEvqVe5DafZL1WRPFdrc="; }; - npmDepsHash = "sha256-vytwJdVnkm1AlDoM86xh5Vx5lsaDRcNdwjhP43A6KF8="; + npmDepsHash = "sha256-zbPrQpm2IgIMqGvMzj6fzEV/lV/FszfU3fnFx3kPHr4="; npmFlags = [ "--ignore-scripts" ]; diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix index 3bbb4abb2fe8..382894ea6d2b 100644 --- a/pkgs/by-name/la/ladybird/package.nix +++ b/pkgs/by-name/la/ladybird/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, unicode-emoji, unicode-character-database, unicode-idna, @@ -29,17 +30,18 @@ unstableGitUpdater, libtommath, sdl3, + icu78, }: stdenv.mkDerivation (finalAttrs: { pname = "ladybird"; - version = "0-unstable-2025-12-03"; + version = "0-unstable-2025-12-24"; src = fetchFromGitHub { owner = "LadybirdBrowser"; repo = "ladybird"; - rev = "9b4d9966da96b7f6421b59eb0adfe90d484ee920"; - hash = "sha256-dqTxW1ENc3k9pk8z2BFPsVJVren9ZkFovKKhNAcs1eo="; + rev = "5b4341996b2d22e549f0bc6f749b188e5014847f"; + hash = "sha256-EVP8OoFqOySAhy02nQpc4CKYCV/rPW87pjMxb/IdBxM="; }; postPatch = '' @@ -100,8 +102,17 @@ stdenv.mkDerivation (finalAttrs: { # Remove when/if this gets upstreamed in skia. "extra_cflags+=[\"-DSKCMS_API=[[gnu::visibility(\\\"default\\\")]]\"]" ]; + # Ladybird depends on the vcpkg-packaged version of skia, + # which includes this patch that exposes deprecated interfaces. + patches = prev.patches or [ ] ++ [ + (fetchpatch { + url = "https://github.com/microsoft/vcpkg/raw/64e1fbee7d9f40eab5d112aaff648c4dcffe9e47/ports/skia/skpath-enable-edit-methods.patch"; + hash = "sha256-r5+HqSjACINn8igXqBANQsq0K+fn+Ut8L2VRs40FkTM="; + }) + ]; })) woff2 + icu78 ] ++ lib.optional stdenv.hostPlatform.isLinux [ libpulseaudio.dev @@ -114,6 +125,9 @@ stdenv.mkDerivation (finalAttrs: { # Disable network operations "-DLADYBIRD_CACHE_DIR=Caches" "-DENABLE_NETWORK_DOWNLOADS=OFF" + # Ladybird requires icu 78, but without this flag the default icu + # from other dependencies gets picked up instead. + (lib.cmakeFeature "ICU_ROOT" (toString icu78.dev)) ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-DCMAKE_INSTALL_LIBEXECDIR=libexec" diff --git a/pkgs/by-name/li/libmilter/package.nix b/pkgs/by-name/li/libmilter/package.nix index 471d7e6bf3b5..6a9addcb8e24 100644 --- a/pkgs/by-name/li/libmilter/package.nix +++ b/pkgs/by-name/li/libmilter/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libmilter"; - version = "8.18.1"; + version = "8.18.2"; src = fetchurl { url = "ftp://ftp.sendmail.org/pub/sendmail/sendmail.${version}.tar.gz"; - sha256 = "sha256-y/HzCcOOSAb3zz6tJCYPF9H+j7YyVtE+2zzdGgmPB3A="; + sha256 = "sha256-GghfqorOUs/94vXpvGEb21+BSByqq/RvBDe3GcoInS8="; }; buildPhase = '' diff --git a/pkgs/by-name/li/libtraceevent/package.nix b/pkgs/by-name/li/libtraceevent/package.nix index fb595a712243..0a646a97aac0 100644 --- a/pkgs/by-name/li/libtraceevent/package.nix +++ b/pkgs/by-name/li/libtraceevent/package.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { pname = "libtraceevent"; - version = "1.8.6"; + version = "1.8.7"; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git"; rev = "libtraceevent-${version}"; - hash = "sha256-k084Sl0Uv+/mQM+Voktz3jjcKmXSi7n2VWpZLRcKSrY="; + hash = "sha256-9rDgAHK1m369CGKxC+NEkW7fzOJsgKTQtk9GLfVEoLg="; }; postPatch = '' diff --git a/pkgs/by-name/mp/mpls/package.nix b/pkgs/by-name/mp/mpls/package.nix index ce7229790821..b2e71a124d95 100644 --- a/pkgs/by-name/mp/mpls/package.nix +++ b/pkgs/by-name/mp/mpls/package.nix @@ -7,13 +7,13 @@ }: buildGoModule rec { pname = "mpls"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "mhersson"; repo = "mpls"; tag = "v${version}"; - hash = "sha256-xNgbtVyjhimvhZ1ua8NoTS3bV7ZSbX5j9VnFSYXuGpI="; + hash = "sha256-O//9AeJ9x8WF+0ub6KK91efPr9Hdbx1Ab4X0oaUhwss="; }; vendorHash = "sha256-QtNQnJtYLmSTTLwKKQ8P6O6wyctgwN8OcGZkMXa+Ark="; diff --git a/pkgs/by-name/ng/ngrep/package.nix b/pkgs/by-name/ng/ngrep/package.nix index 028e8e8f8f68..b29a1e025e64 100644 --- a/pkgs/by-name/ng/ngrep/package.nix +++ b/pkgs/by-name/ng/ngrep/package.nix @@ -2,39 +2,31 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, autoreconfHook, libpcap, - pcre, + pcre2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ngrep"; - version = "1.47"; + version = "1.48.3"; src = fetchFromGitHub { owner = "jpr5"; repo = "ngrep"; - rev = "V${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "1x2fyd7wdqlj1r76ilal06cl2wmbz0ws6i3ys204sbjh1cj6dcl7"; + tag = "v${finalAttrs.version}"; + hash = "sha256-2fYv9iLS+YLFLMjTpi/K4BLRSLTbkLGATlToA2ivrTo="; }; - patches = [ - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/jpr5/ngrep/pull/11.patch"; - sha256 = "0k5qzvj8j3r1409qwwvzp7m3clgs2g7hs4q68bhrqbrsvvb2h5dh"; - }) - ]; - nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libpcap - pcre + pcre2 ]; configureFlags = [ "--enable-ipv6" - "--enable-pcre" + "--enable-pcre2" "--disable-pcap-restart" "--with-pcap-includes=${libpcap}/include" ]; @@ -65,4 +57,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.bjornfor ]; mainProgram = "ngrep"; }; -} +}) diff --git a/pkgs/by-name/ni/nitrotpm-tools/package.nix b/pkgs/by-name/ni/nitrotpm-tools/package.nix new file mode 100644 index 000000000000..2ac90fe24fd0 --- /dev/null +++ b/pkgs/by-name/ni/nitrotpm-tools/package.nix @@ -0,0 +1,47 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + openssl, + tpm2-tss, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "nitrotpm-tools"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "aws"; + repo = "NitroTPM-Tools"; + rev = "v${version}"; + hash = "sha256-ZTASHHa+LQ/hNaM0qfsaGdNwkZQQZnR9+f05DHbviLw="; + }; + + cargoHash = "sha256-z0b0bLKrnLdMfGKp9aIg3DPW3MJnEhjy9GjCYy44TTQ="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + tpm2-tss + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Collection of utilities for working with NitroTPM attestation"; + longDescription = '' + A collection of utilities for working with NitroTPM attestation on AWS EC2. + Includes nitro-tpm-attest for requesting attestation documents and + nitro-tpm-pcr-compute for precomputing PCR values of UKIs (Unified Kernel Images). + ''; + homepage = "https://github.com/aws/NitroTPM-Tools"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ arianvp ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/ni/nix-converter/package.nix b/pkgs/by-name/ni/nix-converter/package.nix index 318e181fcac2..1e7ed5b459ca 100644 --- a/pkgs/by-name/ni/nix-converter/package.nix +++ b/pkgs/by-name/ni/nix-converter/package.nix @@ -4,16 +4,15 @@ fetchFromGitHub, nix-update-script, }: - -buildGoModule { +buildGoModule (finalAttrs: { pname = "nix-converter"; - version = "0-unstable-2025-12-29"; + version = "1.0.0"; src = fetchFromGitHub { owner = "theobori"; repo = "nix-converter"; - rev = "6e5c00e94f078a1eea610e736e7e1fb8349b1ab5"; - hash = "sha256-Pdw/vUgfEws+EOyFT9WK8SjZP6DCVJkWWJgI01+5+KI="; + tag = finalAttrs.version; + hash = "sha256-RfZcQsDPZJZXggvjF0JQqUXg5p2WnMjYANkDXkQZIhU="; }; vendorHash = "sha256-Ay1f9sk8RuJyOS7hl/lrscpxdlIgm9dMow/xTFoR+H4="; @@ -35,4 +34,4 @@ buildGoModule { ]; mainProgram = "nix-converter"; }; -} +}) diff --git a/pkgs/by-name/op/opendmarc/package.nix b/pkgs/by-name/op/opendmarc/package.nix index 815abcd88711..34bafbc67d8b 100644 --- a/pkgs/by-name/op/opendmarc/package.nix +++ b/pkgs/by-name/op/opendmarc/package.nix @@ -27,6 +27,11 @@ stdenv.mkDerivation rec { "doc" ]; + env.NIX_CFLAGS_COMPILE = toString [ + # gcc15 build failure + "-std=gnu17" + ]; + buildInputs = [ perl ]; nativeBuildInputs = [ autoreconfHook diff --git a/pkgs/by-name/qu/qui/package.nix b/pkgs/by-name/qu/qui/package.nix index f43a5a277fa9..89a73f6946a6 100644 --- a/pkgs/by-name/qu/qui/package.nix +++ b/pkgs/by-name/qu/qui/package.nix @@ -13,12 +13,12 @@ }: buildGoModule (finalAttrs: { pname = "qui"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "autobrr"; repo = "qui"; tag = "v${finalAttrs.version}"; - hash = "sha256-ioyFTTJu2B0m+U+GgY/VOIesAZLQI3mRZ5ZBh77emFY="; + hash = "sha256-j0d8aJ9qcK3+/g+qNBsH84U5zQho6bl5TdzHQRQsabs="; }; qui-web = stdenvNoCC.mkDerivation (finalAttrs': { @@ -43,7 +43,7 @@ buildGoModule (finalAttrs: { ; pnpm = pnpm_9; fetcherVersion = 2; - hash = "sha256-6brOEC1UAxjIZB4pujhA624jKTTxfZQiiz/PzqooPeA="; + hash = "sha256-3TAB5StrKBmgit02J7GiMfk6EDl8oiLvcOAnCJ9ian4="; }; postBuild = '' @@ -55,7 +55,7 @@ buildGoModule (finalAttrs: { ''; }); - vendorHash = "sha256-clVC3xPV/vJpWogDs1a977osQgPyhvZ4CRnHnKEZMs0="; + vendorHash = "sha256-hdgTC/oA2ZUc7mqA3v1vunXcu+aeKGw2fEUBBeerCeg="; preBuild = '' cp -r ${finalAttrs.qui-web}/* web/dist @@ -84,7 +84,10 @@ buildGoModule (finalAttrs: { license = lib.licenses.gpl2Plus; homepage = "https://github.com/autobrr/qui"; changelog = "https://github.com/autobrr/qui/releases/tag/v${finalAttrs.version}"; - maintainers = with lib.maintainers; [ pta2002 ]; + maintainers = with lib.maintainers; [ + pta2002 + tmarkus + ]; mainProgram = "qui"; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/ro/rosa/package.nix b/pkgs/by-name/ro/rosa/package.nix index 9ae4e0dcb08c..8dbb866d21fe 100644 --- a/pkgs/by-name/ro/rosa/package.nix +++ b/pkgs/by-name/ro/rosa/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "rosa"; - version = "1.2.57"; + version = "1.2.59"; src = fetchFromGitHub { owner = "openshift"; repo = "rosa"; rev = "v${version}"; - hash = "sha256-oRW5CUQzepQialxi7lHoskNm6ZXLiPWGatKo61GEVLQ="; + hash = "sha256-/5J0R8LMNnKv2jMgMg9O1IBU84/bAznra5uXt5HvsUY="; }; vendorHash = null; diff --git a/pkgs/by-name/sa/sage/sage-src.nix b/pkgs/by-name/sa/sage/sage-src.nix index 89f8e4c25ab2..e810df08abcc 100644 --- a/pkgs/by-name/sa/sage/sage-src.nix +++ b/pkgs/by-name/sa/sage/sage-src.nix @@ -60,10 +60,10 @@ stdenv.mkDerivation rec { # a more conservative version of https://github.com/sagemath/sage/pull/37951 ./patches/gap-element-crash.patch - # https://github.com/sagemath/sage/pull/40895, positively reviewed + # https://github.com/sagemath/sage/pull/40895, landed in 10.8.beta6 (fetchpatch2 { name = "doctest-absolute-path.patch"; - url = "https://github.com/sagemath/sage/commit/3de32dccd2e32e5452ca3adf5bd63cbacb64ba9d.patch?full_index=1"; + url = "https://github.com/sagemath/sage/commit/3a5904d43f552bf63ed1eed9154f87b1f0de53fb.patch?full_index=1"; hash = "sha256-rp+9d8Y6kifWzufE07GWU68txPn//w7uMn4LcpITaBs="; }) ]; @@ -82,6 +82,13 @@ stdenv.mkDerivation rec { hash = "sha256-PZyOXRsgcsPvgceGGZXet5URJgWiIlCfFx8tvwpLk5A="; excludes = [ "src/doc/zh/constructions/rep_theory.rst" ]; }) + + # https://github.com/sagemath/sage/pull/41141, landed in 10.8.beta9 + (fetchpatch2 { + name = "ipython-9_7_0-unicode_to_str.patch"; + url = "https://github.com/sagemath/sage/commit/fa00696112fde95e0c4241ad6063936200ce6f68.patch?full_index=1"; + hash = "sha256-eFDpNu/2gcQATELmQ7/VzXI35xIzaVrD8bhhJ57e2gc="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/by-name/se/seatd/package.nix b/pkgs/by-name/se/seatd/package.nix index d9197f5dafdc..85dfc8d1911e 100644 --- a/pkgs/by-name/se/seatd/package.nix +++ b/pkgs/by-name/se/seatd/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "seatd"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromSourcehut { owner = "~kennylevinsen"; repo = "seatd"; rev = finalAttrs.version; - hash = "sha256-6F+TPSpcEwX4wW5GPy5Ck2AeHyH/Ba2oBUSUnVyAMeA="; + hash = "sha256-B1MIPnf5rO+Jj2/0xuWvsigShmcRF/8/KP2Xh4YTseY="; }; outputs = [ diff --git a/pkgs/by-name/se/seaweedfs/package.nix b/pkgs/by-name/se/seaweedfs/package.nix index 657e512b5a20..b72571740214 100644 --- a/pkgs/by-name/se/seaweedfs/package.nix +++ b/pkgs/by-name/se/seaweedfs/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "seaweedfs"; - version = "3.97"; + version = "4.05"; src = fetchFromGitHub { owner = "seaweedfs"; repo = "seaweedfs"; tag = finalAttrs.version; - hash = "sha256-h8pyjC/hbKfvt4hEKuq0v5osLMWNU+6mYqFGqsZFqXs="; + hash = "sha256-R59I/xRr/JsRVfQGsZ5dzzQbpBOOCxhsr/q9QQ/Nang="; }; - vendorHash = "sha256-KRO0aDGOVx1neXcGsYYqcpD0tAqtR3GSBDhFz5TbQBs="; + vendorHash = "sha256-kTkEiUwUEXB3IPXW8LjdGSHXKGmes0rjueTNyf8Bgf0="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libredirect.hook ]; @@ -48,7 +48,7 @@ buildGoModule (finalAttrs: { # Test all targets. unset subPackages # Remove unmaintained tests and those that require additional services. - rm -rf unmaintained test/s3 test/fuse_integration + rm -rf unmaintained test/s3 test/fuse_integration test/kafka test/sftp # TestECEncodingVolumeLocationTimingBug, TestECEncodingMasterTimingRaceCondition: weed binary not found export PATH=$PATH:$NIX_BUILD_TOP/go/bin '' diff --git a/pkgs/by-name/sk/skia/package.nix b/pkgs/by-name/sk/skia/package.nix index 09c3c3851a62..d1395ac59e5e 100644 --- a/pkgs/by-name/sk/skia/package.nix +++ b/pkgs/by-name/sk/skia/package.nix @@ -30,19 +30,21 @@ stdenv.mkDerivation (finalAttrs: { # Version from https://skia.googlesource.com/skia/+/refs/heads/main/RELEASE_NOTES.md # or https://chromiumdash.appspot.com/releases # plus date of the tip of the corresponding chrome/m$version branch - version = "129-unstable-2024-09-18"; + version = "144-unstable-2025-12-02"; src = fetchgit { url = "https://skia.googlesource.com/skia.git"; # Tip of the chrome/m$version branch - rev = "dda581d538cb6532cda841444e7b4ceacde01ec9"; - hash = "sha256-NZiZFsABebugszpYsBusVlTYnYda+xDIpT05cZ8Jals="; + rev = "ee20d565acb08dece4a32e3f209cdd41119015ca"; + hash = "sha256-0LiFK/8873gei70iVhNGRlcFeGIp7tjDEfxTBz1LYv8="; }; postPatch = '' + substituteInPlace BUILD.gn \ + --replace-fail 'rebase_path("//bin/gn")' '"gn"' # System zlib detection bug workaround substituteInPlace BUILD.gn \ - --replace-fail 'deps = [ "//third_party/zlib" ]' 'deps = []' + --replace-fail '"//third_party/zlib",' "" ''; strictDeps = true; diff --git a/pkgs/by-name/sy/systemd-lsp/package.nix b/pkgs/by-name/sy/systemd-lsp/package.nix index ab0b87c851c8..2d4ed253a1a6 100644 --- a/pkgs/by-name/sy/systemd-lsp/package.nix +++ b/pkgs/by-name/sy/systemd-lsp/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "systemd-lsp"; - version = "2025.10.16"; + version = "2025.12.30"; src = fetchFromGitHub { owner = "JFryy"; repo = "systemd-lsp"; tag = "v${finalAttrs.version}"; - hash = "sha256-xhk1jUAA81Rkq9Nmcw+XyWrSbq3ygRvS615Z56j0WBM="; + hash = "sha256-iDVyWV+j1zdcF5Fpl1X7y/itHNLg3cxcvi4UrDrgicg="; }; - cargoHash = "sha256-6hePUny2iBjslkIk8wVXHnuAHzG3WpBdcj8D5FM9Bc4="; + cargoHash = "sha256-D8XkMzh6dxXGGrDpkREUl0RkN/vhbw9uQYtqdiTcfBE="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix index f5da6e9c8111..2a6ed9950e2b 100644 --- a/pkgs/by-name/ty/ty/package.nix +++ b/pkgs/by-name/ty/ty/package.nix @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ty"; - version = "0.0.8"; + version = "0.0.9"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ty"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-PSw+yRAj6i2qld+10FEMWRxOaqzqu+4CYJcO0PAgG0g="; + hash = "sha256-6f1qm0n8kPPFGCVi+McsqlnMsV1qG1Um2BA/i+YT8Wg="; }; # For Darwin platforms, remove the integration test for file notifications, @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoBuildFlags = [ "--package=ty" ]; - cargoHash = "sha256-XRiIngGFG8j3zQd6QMAFoZ64M7X4NkXCwYiUKA6oefA="; + cargoHash = "sha256-AWYxIPp+/pzTBjv1VjHumKuNfjU/ByspfONezEFE+FY="; nativeBuildInputs = [ installShellFiles ]; @@ -62,6 +62,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "--skip=python_environment::ty_environment_and_active_environment" "--skip=python_environment::ty_environment_is_only_environment" "--skip=python_environment::ty_environment_is_system_not_virtual" + "--skip=python_environment::ty_environment_and_discovered_venv" ]; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix index 34da2fe8cb61..1de6b5e985a4 100644 --- a/pkgs/by-name/yt/ytdl-sub/package.nix +++ b/pkgs/by-name/yt/ytdl-sub/package.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication rec { pname = "ytdl-sub"; - version = "2025.12.30"; + version = "2025.12.31.post5"; pyproject = true; src = fetchFromGitHub { owner = "jmbannon"; repo = "ytdl-sub"; tag = version; - hash = "sha256-MRDLtrfxGJIWz5yk4tW4MMSY9muhgZz0w8+1XWmSAks="; + hash = "sha256-Ksm3aXqE+rhuc9nDN4uFqePrrIonvPTSz+J6WkxlnTg="; }; postPatch = '' diff --git a/pkgs/by-name/ze/zerofs/package.nix b/pkgs/by-name/ze/zerofs/package.nix index 7ea50507fce6..b99f34beaad3 100644 --- a/pkgs/by-name/ze/zerofs/package.nix +++ b/pkgs/by-name/ze/zerofs/package.nix @@ -11,18 +11,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "zerofs"; - version = "0.22.9"; + version = "0.22.11"; src = fetchFromGitHub { owner = "Barre"; repo = "ZeroFS"; tag = "v${finalAttrs.version}"; - hash = "sha256-eAH2zOM5FOUaLRfMQp2Dsa6ghKmOGVVbOz7JETnVRzU="; + hash = "sha256-Gy3yZEQ7jLOed6ZmXfegd4YN+i20N5D1E2rleA52FDc="; }; sourceRoot = "${finalAttrs.src.name}/zerofs"; - cargoHash = "sha256-U/ZsjZ42PxTd/g2G1DfDazCSOIvsULtt/zufyBVZFyQ="; + cargoHash = "sha256-IUWzbZG/uHHjkxe/4moZ1mDUC+ROuxBZjQlAZcGutUc="; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/ocaml-modules/frama-c-luncov/default.nix b/pkgs/development/ocaml-modules/frama-c-luncov/default.nix new file mode 100644 index 000000000000..16ccfc348e7d --- /dev/null +++ b/pkgs/development/ocaml-modules/frama-c-luncov/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildDunePackage, + dune-site, + fetchzip, + frama-c, + menhir, + unionFind, + why3, +}: + +buildDunePackage (finalAttrs: { + pname = "frama-c-luncov"; + version = "0.2.4"; + + src = fetchzip { + url = "https://git.frama-c.com/pub/ltest/luncov/-/archive/${finalAttrs.version}/luncov-${finalAttrs.version}.tar.bz2"; + hash = "sha256-E7zzm9qs34V+sRHElpe1JKHjeyXGALXVj1DNMVzlWn0="; + }; + + nativeBuildInputs = [ + menhir + ]; + + propagatedBuildInputs = [ + dune-site + frama-c + unionFind + why3 + ]; + + meta = { + description = "Luncov plugin of Frama-C, part of the LTest suite"; + homepage = "https://frama-c.com/fc-plugins/ltest.html"; + license = lib.licenses.lgpl2; + maintainers = with lib.maintainers; [ redianthus ]; + }; +}) diff --git a/pkgs/development/ocaml-modules/smtml/default.nix b/pkgs/development/ocaml-modules/smtml/default.nix index bc474a3ed6d6..d628399608cf 100644 --- a/pkgs/development/ocaml-modules/smtml/default.nix +++ b/pkgs/development/ocaml-modules/smtml/default.nix @@ -36,16 +36,21 @@ buildDunePackage (finalAttrs: { hash = "sha256-s72m7N9Ovd2Vl4F+hb2MsNmnF1hFQGkf2s7TrJ9IWI8="; }; + minimalOCamlVersion = "4.14"; + nativeBuildInputs = [ menhir ]; + buildInputs = [ + dune-build-info + ]; + propagatedBuildInputs = [ bos cmdliner dolmen_model dolmen_type - dune-build-info fpath hc menhirLib diff --git a/pkgs/development/python-modules/aiobtclientapi/default.nix b/pkgs/development/python-modules/aiobtclientapi/default.nix index 6af43695037d..0bd027871905 100644 --- a/pkgs/development/python-modules/aiobtclientapi/default.nix +++ b/pkgs/development/python-modules/aiobtclientapi/default.nix @@ -12,7 +12,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiobtclientapi"; version = "1.1.4"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { domain = "codeberg.org"; owner = "plotski"; repo = "aiobtclientapi"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ga3EyKhfdEKkjFktUlgLSX54QbTc/a48vmWjmRqa+4w="; }; @@ -64,4 +64,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ ambroisie ]; }; -} +}) diff --git a/pkgs/development/python-modules/aiobtclientrpc/default.nix b/pkgs/development/python-modules/aiobtclientrpc/default.nix index 928647d5d5d3..b206e8912923 100644 --- a/pkgs/development/python-modules/aiobtclientrpc/default.nix +++ b/pkgs/development/python-modules/aiobtclientrpc/default.nix @@ -15,7 +15,7 @@ fetchpatch, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiobtclientrpc"; version = "5.0.1"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { domain = "codeberg.org"; owner = "plotski"; repo = "aiobtclientrpc"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2nBrIMlYUI4PwirkiSJSkw5zw2Kc/KoVRyIIYYx4iYs="; }; @@ -80,4 +80,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ ambroisie ]; }; -} +}) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 8cc4ec81f630..cb06400a549d 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "43.6.0"; + version = "43.10.1"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "aioesphomeapi"; tag = "v${version}"; - hash = "sha256-ghm+44EEgzlIfbcHrIrOLVyCSYH+Sj2b7RWIhD3mgUA="; + hash = "sha256-UzeCXjWqcwEuoZY9YotbIGfvoSsJpGLMLErdF1Ld5AI="; }; build-system = [ diff --git a/pkgs/development/python-modules/beancount-black/default.nix b/pkgs/development/python-modules/beancount-black/default.nix index 98155e951df7..2bbd162a8caf 100644 --- a/pkgs/development/python-modules/beancount-black/default.nix +++ b/pkgs/development/python-modules/beancount-black/default.nix @@ -9,7 +9,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "beancount-black"; version = "1.0.5"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "LaunchPlatform"; repo = "beancount-black"; - tag = version; + tag = finalAttrs.version; hash = "sha256-vo11mlgDhyc8YFnULJ4AFrANWmGpAMNX5jJ6QaUNqk0="; }; @@ -41,4 +41,4 @@ buildPythonPackage rec { license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ ambroisie ]; }; -} +}) diff --git a/pkgs/development/python-modules/beancount-parser/default.nix b/pkgs/development/python-modules/beancount-parser/default.nix index 620f0f199a8c..5951efbadfac 100644 --- a/pkgs/development/python-modules/beancount-parser/default.nix +++ b/pkgs/development/python-modules/beancount-parser/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "beancount-parser"; version = "1.2.3"; format = "pyproject"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "LaunchPlatform"; repo = "beancount-parser"; - tag = version; + tag = finalAttrs.version; hash = "sha256-8YcrsLdSRTixKXU/IM821kNcBo0jB/8DXA1/KiedsBY="; }; @@ -33,8 +33,8 @@ buildPythonPackage rec { meta = { description = "Standalone Lark based Beancount syntax parser"; homepage = "https://github.com/LaunchPlatform/beancount-parser/"; - changelog = "https://github.com/LaunchPlatform/beancount-parser/releases/tag/${version}"; + changelog = "https://github.com/LaunchPlatform/beancount-parser/releases/tag/${finalAttrs.version}"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ ambroisie ]; }; -} +}) diff --git a/pkgs/development/python-modules/bleach-allowlist/default.nix b/pkgs/development/python-modules/bleach-allowlist/default.nix index 3aa7e57a71cd..575d33f4f5e2 100644 --- a/pkgs/development/python-modules/bleach-allowlist/default.nix +++ b/pkgs/development/python-modules/bleach-allowlist/default.nix @@ -5,13 +5,13 @@ bleach, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bleach-allowlist"; version = "1.0.3"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-VuIghgeaDmoxAK6Z5NuvIOslhUhlmOsOmUAIoRQo2ps="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ ambroisie ]; }; -} +}) diff --git a/pkgs/development/python-modules/countryguess/default.nix b/pkgs/development/python-modules/countryguess/default.nix index 19d7f86c0256..21df86b448a9 100644 --- a/pkgs/development/python-modules/countryguess/default.nix +++ b/pkgs/development/python-modules/countryguess/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "countryguess"; version = "0.4.9"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { domain = "codeberg.org"; owner = "plotski"; repo = "countryguess"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-RlOOao6aU3MylghDyOeg3poYQw+0UhljN79/ZBLjq24="; }; @@ -37,4 +37,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ ambroisie ]; }; -} +}) diff --git a/pkgs/development/python-modules/django-annoying/default.nix b/pkgs/development/python-modules/django-annoying/default.nix index 20d5d3eee1fa..5ececfb35041 100644 --- a/pkgs/development/python-modules/django-annoying/default.nix +++ b/pkgs/development/python-modules/django-annoying/default.nix @@ -9,7 +9,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-annoying"; version = "0.10.8"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "skorokithakis"; repo = "django-annoying"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-zBOHVar4iKb+BioIwmDosNZKi/0YcjYfBusn0Lv8pMw="; }; @@ -38,8 +38,8 @@ buildPythonPackage rec { meta = { description = "Django application that tries to eliminate annoying things in the Django framework"; homepage = "https://skorokithakis.github.io/django-annoying/"; - changelog = "https://github.com/skorokithakis/django-annoying/releases/tag/v$version"; + changelog = "https://github.com/skorokithakis/django-annoying/releases/tag/v${finalAttrs.version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ ambroisie ]; }; -} +}) diff --git a/pkgs/development/python-modules/django-autocomplete-light/default.nix b/pkgs/development/python-modules/django-autocomplete-light/default.nix index df0b8b33a0d7..dfb98c2a1841 100644 --- a/pkgs/development/python-modules/django-autocomplete-light/default.nix +++ b/pkgs/development/python-modules/django-autocomplete-light/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-autocomplete-light"; version = "3.12.1"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "yourlabs"; repo = "django-autocomplete-light"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ctNbbmTUgrkLGCo7tgPIJpLn7RmkZSuj54/5RBe/sdA="; }; @@ -42,8 +42,8 @@ buildPythonPackage rec { meta = { description = "Fresh approach to autocomplete implementations, specially for Django"; homepage = "https://django-autocomplete-light.readthedocs.io"; - changelog = "https://github.com/yourlabs/django-autocomplete-light/blob/${version}/CHANGELOG"; + changelog = "https://github.com/yourlabs/django-autocomplete-light/blob/${finalAttrs.version}/CHANGELOG"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ ambroisie ]; }; -} +}) diff --git a/pkgs/development/python-modules/django-bootstrap4/default.nix b/pkgs/development/python-modules/django-bootstrap4/default.nix index 1e504aa7d2cb..68d0de112c6a 100644 --- a/pkgs/development/python-modules/django-bootstrap4/default.nix +++ b/pkgs/development/python-modules/django-bootstrap4/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "django-bootstrap4"; - version = "25.3"; + version = "26.1"; pyproject = true; src = fetchFromGitHub { owner = "zostera"; repo = "django-bootstrap4"; tag = "v${version}"; - hash = "sha256-aayR9yXsC1Kt4PtlhhdnaPA5cqYuL4CV0UY1fvA/ntk="; + hash = "sha256-g66JJVPB+YQjN5IHSu/jqKVu5gS8Llb+mALJ9f5H2ds="; }; build-system = [ uv-build ]; diff --git a/pkgs/development/python-modules/django-crispy-forms/default.nix b/pkgs/development/python-modules/django-crispy-forms/default.nix index c46fc7d9a48e..8776334d18fa 100644 --- a/pkgs/development/python-modules/django-crispy-forms/default.nix +++ b/pkgs/development/python-modules/django-crispy-forms/default.nix @@ -8,7 +8,7 @@ pytest-django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-crispy-forms"; version = "2.5"; format = "pyproject"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "django-crispy-forms"; repo = "django-crispy-forms"; - tag = version; + tag = finalAttrs.version; hash = "sha256-UZw860dOmQOAHcOPn5JO5OPe0kei4Mivy5FTh25Zo1s="; }; @@ -49,4 +49,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ ambroisie ]; }; -} +}) diff --git a/pkgs/development/python-modules/django-hcaptcha/default.nix b/pkgs/development/python-modules/django-hcaptcha/default.nix index a045811aeec9..9f51677dbdaa 100644 --- a/pkgs/development/python-modules/django-hcaptcha/default.nix +++ b/pkgs/development/python-modules/django-hcaptcha/default.nix @@ -5,13 +5,13 @@ django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-hcaptcha"; version = "0.2.0"; format = "setuptools"; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "django-hCaptcha"; hash = "sha256-slGerwzJeGWscvglMBEixc9h4eSFLWiVmUFgIirLbBo="; }; @@ -29,4 +29,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ ambroisie ]; }; -} +}) diff --git a/pkgs/development/python-modules/django-js-reverse/default.nix b/pkgs/development/python-modules/django-js-reverse/default.nix index 5acf47d3a565..46f066f3246d 100644 --- a/pkgs/development/python-modules/django-js-reverse/default.nix +++ b/pkgs/development/python-modules/django-js-reverse/default.nix @@ -10,7 +10,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-js-reverse"; version = "0.10.2"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vintasoftware"; repo = "django-js-reverse"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0S1g8tLWaJVV2QGPeiBOevhz9f0ueINxA9HOcnXuyYg="; }; @@ -46,8 +46,8 @@ buildPythonPackage rec { meta = { description = "Javascript URL handling for Django"; homepage = "https://django-js-reverse.readthedocs.io/"; - changelog = "https://github.com/vintasoftware/django-js-reverse/releases/tag/${src.tag}"; + changelog = "https://github.com/vintasoftware/django-js-reverse/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ambroisie ]; }; -} +}) diff --git a/pkgs/development/python-modules/django-scopes/default.nix b/pkgs/development/python-modules/django-scopes/default.nix index 648c4c0544c9..94a1ef052f4d 100644 --- a/pkgs/development/python-modules/django-scopes/default.nix +++ b/pkgs/development/python-modules/django-scopes/default.nix @@ -7,7 +7,7 @@ pytest-django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "django-scopes"; version = "2.0.0"; format = "setuptools"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "raphaelm"; repo = "django-scopes"; - tag = version; + tag = finalAttrs.version; hash = "sha256-CtToztLVvSb91pMpPNL8RysQJzlRkeXuQbpvbkX3jfM="; }; @@ -28,10 +28,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "django_scopes" ]; - meta = { + meta = with lib; { description = "Safely separate multiple tenants in a Django database"; homepage = "https://github.com/raphaelm/django-scopes"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ ambroisie ]; + license = licenses.asl20; + maintainers = with maintainers; [ ambroisie ]; }; -} +}) diff --git a/pkgs/development/python-modules/drawsvg/default.nix b/pkgs/development/python-modules/drawsvg/default.nix index 2360b947dee7..cb8f1d7a4adc 100644 --- a/pkgs/development/python-modules/drawsvg/default.nix +++ b/pkgs/development/python-modules/drawsvg/default.nix @@ -1,27 +1,24 @@ { lib, buildPythonPackage, - fetchFromGitHub, - setuptools, - pythonOlder, - numpy, - imageio, cairosvg, + fetchFromGitHub, imageio-ffmpeg, + imageio, + numpy, pwkit, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "drawsvg"; version = "2.4.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "cduck"; repo = "drawsvg"; - tag = version; + tag = finalAttrs.version; hash = "sha256-JC7u6bEB7RCJVLeYnNqACmddLI5F5PyaaBxaAZ+N/5s="; }; @@ -29,21 +26,21 @@ buildPythonPackage rec { optional-dependencies = { all = [ - numpy - imageio cairosvg + imageio imageio-ffmpeg + numpy pwkit ]; raster = [ - numpy - imageio cairosvg + imageio imageio-ffmpeg + numpy ]; color = [ - pwkit numpy + pwkit ]; }; @@ -58,4 +55,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/drf-writable-nested/default.nix b/pkgs/development/python-modules/drf-writable-nested/default.nix index 227fad5b5b04..966e07b48e2a 100644 --- a/pkgs/development/python-modules/drf-writable-nested/default.nix +++ b/pkgs/development/python-modules/drf-writable-nested/default.nix @@ -8,7 +8,7 @@ pytest-django, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "drf-writable-nested"; version = "0.7.2"; format = "setuptools"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "beda-software"; repo = "drf-writable-nested"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-VkQ3Di3vXxQAmvuMP8KpGVVdx7LMYcQFEF4ZsuA9KeA="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ ambroisie ]; }; -} +}) diff --git a/pkgs/development/python-modules/extruct/default.nix b/pkgs/development/python-modules/extruct/default.nix index 6b8718b46bbe..24e1835f8859 100644 --- a/pkgs/development/python-modules/extruct/default.nix +++ b/pkgs/development/python-modules/extruct/default.nix @@ -16,7 +16,7 @@ w3lib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "extruct"; version = "0.18.0"; pyproject = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scrapinghub"; repo = "extruct"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-hUSlIlWxrsxGLCE8/DAGSqxx9+7TEkynmXrVnXGjDQ8="; }; @@ -60,8 +60,8 @@ buildPythonPackage rec { description = "Extract embedded metadata from HTML markup"; mainProgram = "extruct"; homepage = "https://github.com/scrapinghub/extruct"; - changelog = "https://github.com/scrapinghub/extruct/blob/v${version}/HISTORY.rst"; + changelog = "https://github.com/scrapinghub/extruct/blob/v${finalAttrs.version}/HISTORY.rst"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ ambroisie ]; }; -} +}) diff --git a/pkgs/development/python-modules/flatbencode/default.nix b/pkgs/development/python-modules/flatbencode/default.nix index c7511dd7e8aa..5ed38818a6a1 100644 --- a/pkgs/development/python-modules/flatbencode/default.nix +++ b/pkgs/development/python-modules/flatbencode/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flatbencode"; version = "0.2.1"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "acatton"; repo = "flatbencode"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-1/4w41E8IKygJTBcQOexiDytV6BvVBwIjajKz2uCfu8="; }; @@ -36,4 +36,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ ambroisie ]; }; -} +}) diff --git a/pkgs/development/python-modules/gfsubsets/default.nix b/pkgs/development/python-modules/gfsubsets/default.nix index 8572b3182cc9..13f6e574abb5 100644 --- a/pkgs/development/python-modules/gfsubsets/default.nix +++ b/pkgs/development/python-modules/gfsubsets/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, fonttools, importlib-resources, setuptools, @@ -11,12 +11,13 @@ buildPythonPackage rec { pname = "gfsubsets"; - version = "2024.9.25"; - gitTag = "v2024.02.05"; + version = "2025.11.04"; - src = fetchPypi { - inherit pname version; - hash = "sha256-jEuIBNQ89Le3Rbk0W4PLl9LE7rP0IcE6RAzyfhZb7lY="; + src = fetchFromGitHub { + owner = "googlefonts"; + repo = "nam-files"; + tag = "v${version}"; + hash = "sha256-mMsmccIuilKeOUjt68etYefibuorjlW32gLcLgV8jxo="; }; pyproject = true; @@ -39,7 +40,7 @@ buildPythonPackage rec { meta = { description = "Codepoint definitions for the Google Fonts subsetter"; homepage = "https://github.com/googlefonts/nam-files"; - changelog = "https://github.com/googlefonts/nam-files/releases/tag/${gitTag}"; + changelog = "https://github.com/googlefonts/nam-files/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ danc86 ]; }; diff --git a/pkgs/development/python-modules/grpclib/default.nix b/pkgs/development/python-modules/grpclib/default.nix index 3dc8d48cb010..675f3f95439e 100644 --- a/pkgs/development/python-modules/grpclib/default.nix +++ b/pkgs/development/python-modules/grpclib/default.nix @@ -1,14 +1,14 @@ { lib, + async-timeout, buildPythonPackage, certifi, faker, fetchFromGitHub, - fetchpatch, googleapis-common-protos, h2, multidict, - pytest-asyncio_0, + pytest-asyncio, pytestCheckHook, pythonOlder, setuptools, @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "grpclib"; - version = "0.4.8"; + version = "0.4.9"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,18 +25,9 @@ buildPythonPackage rec { owner = "vmagamedov"; repo = "grpclib"; tag = "v${version}"; - hash = "sha256-Z+DMwGMUxNTQ7ABd4q/FgMHEZ/NCOtst+6QfQJm3jVU="; + hash = "sha256-9ElCIL084B+KihV1AXYJejBletj8y6LnoWRGEj4E1tQ="; }; - patches = [ - # https://github.com/vmagamedov/grpclib/pull/209 - (fetchpatch { - name = "replace-async-timeout-with-asyncio-timeout-patch"; - url = "https://github.com/vmagamedov/grpclib/commit/36b23ce3ca3f1742e39b50f939d13cd08b4f28ac.patch"; - hash = "sha256-3ztLBOFpTK8CFIp8a6suhWXY5kIBCBRWBX/oAyYU4yI="; - }) - ]; - build-system = [ setuptools ]; dependencies = [ @@ -46,12 +37,15 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-asyncio_0 + pytest-asyncio + async-timeout faker googleapis-common-protos certifi ]; + __darwinAllowLocalNetworking = true; + pythonImportsCheck = [ "grpclib" ]; meta = { diff --git a/pkgs/development/python-modules/hdfury/default.nix b/pkgs/development/python-modules/hdfury/default.nix index f34d9decb16b..3401e62ea7aa 100644 --- a/pkgs/development/python-modules/hdfury/default.nix +++ b/pkgs/development/python-modules/hdfury/default.nix @@ -6,16 +6,16 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hdfury"; - version = "1.3.0"; + version = "1.3.1"; pyproject = true; src = fetchFromGitHub { owner = "glenndehaan"; repo = "python-hdfury"; - tag = version; - hash = "sha256-cV9cqZ0ogxXF2IHtywV5EyC0aIsgzRQOIQHfOT1uq8c="; + tag = finalAttrs.version; + hash = "sha256-vEIlDhDWC7My9mqXxHseDpvW/vWe9jWkYzcgz3xFhyQ="; }; build-system = [ hatchling ]; @@ -30,8 +30,8 @@ buildPythonPackage rec { meta = { description = "Python client for HDFury devices"; homepage = "https://github.com/glenndehaan/python-hdfury"; - changelog = "https://github.com/glenndehaan/python-hdfury/releases/tag/${src.tag}"; + changelog = "https://github.com/glenndehaan/python-hdfury/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/html-text/default.nix b/pkgs/development/python-modules/html-text/default.nix index 6964221e31ac..c212d4bae740 100644 --- a/pkgs/development/python-modules/html-text/default.nix +++ b/pkgs/development/python-modules/html-text/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "html-text"; version = "0.6.2"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zytedata"; repo = "html-text"; - tag = version; + tag = finalAttrs.version; hash = "sha256-e9gkibQv8mn1Jbt77UmpauOeTqhJQhY9R5Sge/iYi+U="; }; @@ -37,8 +37,8 @@ buildPythonPackage rec { meta = { description = "Extract text from HTML"; homepage = "https://github.com/zytedata/html-text"; - changelog = "https://github.com/zytedata/html-text/blob/${version}/CHANGES.rst"; + changelog = "https://github.com/zytedata/html-text/blob/${finalAttrs.version}/CHANGES.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ambroisie ]; }; -} +}) diff --git a/pkgs/development/python-modules/language-tags/default.nix b/pkgs/development/python-modules/language-tags/default.nix index e25827f76dbc..167164aff9b1 100644 --- a/pkgs/development/python-modules/language-tags/default.nix +++ b/pkgs/development/python-modules/language-tags/default.nix @@ -5,7 +5,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "language-tags"; version = "1.2.0"; format = "setuptools"; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "OnroerendErfgoed"; repo = "language-tags"; - tag = version; + tag = finalAttrs.version; hash = "sha256-T9K290seKhQLqW36EfA9kn3WveKCmyjN4Mx2j50qIEk="; }; @@ -21,10 +21,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "language_tags" ]; - meta = { + meta = with lib; { description = "Dealing with IANA language tags in Python"; homepage = "https://language-tags.readthedocs.io/en/latest/"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ambroisie ]; + license = licenses.mit; + maintainers = with maintainers; [ ambroisie ]; }; -} +}) diff --git a/pkgs/development/python-modules/mf2py/default.nix b/pkgs/development/python-modules/mf2py/default.nix index 9d5d69ca4ebb..9b327245e460 100644 --- a/pkgs/development/python-modules/mf2py/default.nix +++ b/pkgs/development/python-modules/mf2py/default.nix @@ -12,7 +12,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mf2py"; version = "2.0.1"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "microformats"; repo = "mf2py"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-mhJ+s1rtXEJ6DqVmiyWNEK+3cdDLpR63Q4QGmD9wVio="; }; @@ -45,8 +45,8 @@ buildPythonPackage rec { meta = { description = "Microformats2 parser written in Python"; homepage = "https://microformats.org/wiki/mf2py"; - changelog = "https://github.com/microformats/mf2py/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/microformats/mf2py/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ambroisie ]; }; -} +}) diff --git a/pkgs/development/python-modules/microdata/default.nix b/pkgs/development/python-modules/microdata/default.nix index cb3e852900c0..b5d14da3657b 100644 --- a/pkgs/development/python-modules/microdata/default.nix +++ b/pkgs/development/python-modules/microdata/default.nix @@ -6,7 +6,7 @@ unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "microdata"; version = "0.8.0"; format = "setuptools"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "edsu"; repo = "microdata"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-BAygCLBLxZ033ZWRFSR52dSM2nPY8jXplDXQ8WW3KPo="; }; @@ -31,4 +31,4 @@ buildPythonPackage rec { license = lib.licenses.cc0; maintainers = with lib.maintainers; [ ambroisie ]; }; -} +}) diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix index 4f5b83854004..700e5b1e6247 100644 --- a/pkgs/development/python-modules/netutils/default.nix +++ b/pkgs/development/python-modules/netutils/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "netutils"; - version = "1.15.1"; + version = "1.15.2"; pyproject = true; src = fetchFromGitHub { owner = "networktocode"; repo = "netutils"; tag = "v${version}"; - hash = "sha256-bT/a6PhjNZ7vYXio7XOKNnzRfh7UqRn3+OYbhlYL3/I="; + hash = "sha256-2IPmv86b2dvvUTmvSex3hTpBi3CzHJzA5qfM3E7gv08="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pyimgbox/default.nix b/pkgs/development/python-modules/pyimgbox/default.nix index 284fcc559774..225ed464998d 100644 --- a/pkgs/development/python-modules/pyimgbox/default.nix +++ b/pkgs/development/python-modules/pyimgbox/default.nix @@ -11,7 +11,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyimgbox"; version = "1.0.7"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { domain = "codeberg.org"; owner = "plotski"; repo = "pyimgbox"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-HYKi5nYXJ+5ytQEFVMMm1HxEsD1zMU7cE2mOdwuZxvk="; }; @@ -48,4 +48,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ ambroisie ]; }; -} +}) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 698da478fced..b53e0011d383 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -13,6 +13,7 @@ pytest-timeout, pytest-xdist, pytest7CheckHook, + pythonAtLeast, pythonOlder, requests, setuptools, @@ -96,6 +97,10 @@ buildPythonPackage rec { # AssertionError: assert [('specializa..., 'Ancestor')] == [('aggregatio..., 'Ancestor')] "test_functional_relation_extraction" ] + ++ lib.optionals (pythonAtLeast "3.14") [ + # ModuleNotFoundError: No module named 'completely_unknown' + "test_do_not_import_files_from_local_directory" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_parallel_execution" "test_py3k_jobs_option" diff --git a/pkgs/development/python-modules/pyparsebluray/default.nix b/pkgs/development/python-modules/pyparsebluray/default.nix index 100e5d651ba1..024be33d2cd3 100644 --- a/pkgs/development/python-modules/pyparsebluray/default.nix +++ b/pkgs/development/python-modules/pyparsebluray/default.nix @@ -5,7 +5,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyparsebluray"; version = "0.1.4"; pyproject = true; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Ichunjo"; repo = "pyparsebluray"; - tag = version; + tag = finalAttrs.version; hash = "sha256-9G+pf4kZnj5ZkJj8qmymqdxCRVUTfGy3m9iF5BjiCxM="; }; @@ -27,4 +27,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ ambroisie ]; }; -} +}) diff --git a/pkgs/development/python-modules/pypdf3/default.nix b/pkgs/development/python-modules/pypdf3/default.nix index e74677c2b0bd..78b230965674 100644 --- a/pkgs/development/python-modules/pypdf3/default.nix +++ b/pkgs/development/python-modules/pypdf3/default.nix @@ -7,14 +7,14 @@ tqdm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pypdf3"; version = "1.0.6"; format = "setuptools"; src = fetchPypi { pname = "PyPDF3"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-yUbzJzQZ43JY415yJz9JkEqxVyPYenYcERXvmXmfjF8="; }; @@ -33,4 +33,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ ambroisie ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyrdfa3/default.nix b/pkgs/development/python-modules/pyrdfa3/default.nix index e0fab4a58ad9..5a4813d69cfb 100644 --- a/pkgs/development/python-modules/pyrdfa3/default.nix +++ b/pkgs/development/python-modules/pyrdfa3/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyrdfa3"; version = "3.6.4"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ZHEtGkvyGCllKzlxW62m58A7zxnLSfliwZCjj0YXIkM="; }; @@ -37,8 +37,8 @@ buildPythonPackage rec { meta = { description = "RDFa 1.1 distiller/parser library"; homepage = "https://github.com/prrvchr/pyrdfa3/"; - changelog = "https://github.com/prrvchr/pyrdfa3/releases/tag/v${version}"; + changelog = "https://github.com/prrvchr/pyrdfa3/releases/tag/v${finalAttrs.version}"; license = lib.licenses.w3c; maintainers = with lib.maintainers; [ ambroisie ]; }; -} +}) diff --git a/pkgs/development/python-modules/pytest-describe/default.nix b/pkgs/development/python-modules/pytest-describe/default.nix index a8635b38d0f2..7259cb1aafbe 100644 --- a/pkgs/development/python-modules/pytest-describe/default.nix +++ b/pkgs/development/python-modules/pytest-describe/default.nix @@ -15,7 +15,7 @@ let pname = "pytest-describe"; - version = "3.0.0"; + version = "3.1.0"; in buildPythonPackage { inherit pname version; @@ -25,7 +25,7 @@ buildPythonPackage { owner = "pytest-dev"; repo = "pytest-describe"; tag = version; - hash = "sha256-rMO+Hkz3iWFML8UUq4aDl+t7epzqXmYGZrgRB9OYf6w="; + hash = "sha256-ygrZwd1cO9arekdzqn5Axjz4i9Q0QKFA/OS6QSIvP9Y="; }; build-system = [ uv-build ]; diff --git a/pkgs/development/python-modules/pytest-gitconfig/default.nix b/pkgs/development/python-modules/pytest-gitconfig/default.nix index b1f5e4206e50..a243a4063291 100644 --- a/pkgs/development/python-modules/pytest-gitconfig/default.nix +++ b/pkgs/development/python-modules/pytest-gitconfig/default.nix @@ -8,16 +8,16 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-gitconfig"; - version = "0.8.0"; + version = "0.9.0"; pyproject = true; src = fetchFromGitHub { owner = "noirbizarre"; repo = "pytest-gitconfig"; - tag = version; - hash = "sha256-5DfG74mEvsWHH2xPyG1mNcWp9/DgpveLbaSEOoRzD+g="; + tag = finalAttrs.version; + hash = "sha256-z3W9AL74i47k/eYCbFMn3foVaD2h7lFrGzyOnbDwkyc="; }; build-system = [ pdm-backend ]; @@ -34,8 +34,8 @@ buildPythonPackage rec { meta = { description = "Pytest gitconfig sandbox"; homepage = "https://github.com/noirbizarre/pytest-gitconfig"; - changelog = "https://github.com/noirbizarre/pytest-gitconfig/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/noirbizarre/pytest-gitconfig/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/recipe-scrapers/default.nix b/pkgs/development/python-modules/recipe-scrapers/default.nix index 46372966bb99..dbbc5bf6de11 100644 --- a/pkgs/development/python-modules/recipe-scrapers/default.nix +++ b/pkgs/development/python-modules/recipe-scrapers/default.nix @@ -15,7 +15,7 @@ nixosTests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "recipe-scrapers"; version = "15.11.0"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hhursev"; repo = "recipe-scrapers"; - tag = version; + tag = finalAttrs.version; hash = "sha256-S0/RPVeEr/lAPJZSUwCippuXyirYnmaAuesWGYwg6kE="; }; @@ -64,8 +64,8 @@ buildPythonPackage rec { meta = { description = "Python package for scraping recipes data"; homepage = "https://github.com/hhursev/recipe-scrapers"; - changelog = "https://github.com/hhursev/recipe-scrapers/releases/tag/${src.tag}"; + changelog = "https://github.com/hhursev/recipe-scrapers/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ambroisie ]; }; -} +}) diff --git a/pkgs/development/python-modules/reflink-copy/default.nix b/pkgs/development/python-modules/reflink-copy/default.nix index 9cc908b73f49..714b19bac5cd 100644 --- a/pkgs/development/python-modules/reflink-copy/default.nix +++ b/pkgs/development/python-modules/reflink-copy/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "reflink-copy"; version = "0.3.3"; pyproject = true; @@ -14,12 +14,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "iterative"; repo = "reflink-copy"; - tag = version; + tag = finalAttrs.version; hash = "sha256-HxUAsqV5kjstfBfY/nEGJ3epUVT5WXoTqKerUggKDyo="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-TBKVf0kRRYn+1aYvhQHCHmJEsT0khFxp8iuyEWX9xyI="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ ambroisie ]; }; -} +}) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 0727c34b77a6..dfc0d6cc201e 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -7,16 +7,16 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tencentcloud-sdk-python"; - version = "3.1.24"; + version = "3.1.25"; pyproject = true; src = fetchFromGitHub { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; - tag = version; - hash = "sha256-jRuQOcmBBbzpQHapezXmHwCfGJXv6zkXrdpW+W8biaQ="; + tag = finalAttrs.version; + hash = "sha256-z4GpifopGTRUo2WWWfA8GkN7L+T+FkIN8xYchA5V3DI="; }; build-system = [ setuptools ]; @@ -38,8 +38,8 @@ buildPythonPackage rec { meta = { description = "Tencent Cloud API 3.0 SDK for Python"; homepage = "https://github.com/TencentCloud/tencentcloud-sdk-python"; - changelog = "https://github.com/TencentCloud/tencentcloud-sdk-python/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/TencentCloud/tencentcloud-sdk-python/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/torf/default.nix b/pkgs/development/python-modules/torf/default.nix index c467e3b373de..625e2e91d37b 100644 --- a/pkgs/development/python-modules/torf/default.nix +++ b/pkgs/development/python-modules/torf/default.nix @@ -17,7 +17,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "torf"; version = "4.3.0"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rndusr"; repo = "torf"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-vJapB4Tbn3tLLUIH9LemU9kTqG7TsByiotkWM52lsno="; }; @@ -67,4 +67,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ ambroisie ]; }; -} +}) diff --git a/pkgs/development/python-modules/tuf/default.nix b/pkgs/development/python-modules/tuf/default.nix index d8245d540bb6..e22c473fa5ff 100644 --- a/pkgs/development/python-modules/tuf/default.nix +++ b/pkgs/development/python-modules/tuf/default.nix @@ -23,6 +23,11 @@ buildPythonPackage rec { hash = "sha256-CPbZOpUYi7MWKLMj7kwTsmEkxLCf4wU7IOCcbzMkPlU="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "hatchling==1.27.0" "hatchling" + ''; + build-system = [ flit-core hatchling diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 4c613135e977..cf49620be100 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -246,4 +246,8 @@ in build-environment-info = callPackage ./build-environment-info { }; rust-hooks = recurseIntoAttrs (callPackages ../build-support/rust/hooks/test { }); + + prefer-remote-fetch = recurseIntoAttrs ( + callPackages ../build-support/prefer-remote-fetch/tests.nix { } + ); } diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index c96214519966..34f58c1f92a8 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - file, + buildPackages, zlib, libgnurx, updateAutotoolsGnuConfigScriptsHook, @@ -51,14 +51,16 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook - ] - ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; + ]; buildInputs = [ zlib ] ++ lib.optional stdenv.hostPlatform.isMinGW libgnurx; # https://bugs.astron.com/view.php?id=382 doCheck = !stdenv.buildPlatform.isMusl; - makeFlags = lib.optional stdenv.hostPlatform.isWindows "FILE_COMPILE=file"; + # In native builds, it will use the newly-compiled file instead. + makeFlags = lib.optional ( + !lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform + ) "FILE_COMPILE=${lib.getExe buildPackages.file}"; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 72914913e83d..a76afd838755 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -198,25 +198,17 @@ lib.makeExtensible ( nix_2_31 = addTests "nix_2_31" self.nixComponents_2_31.nix-everything; - nixComponents_2_32 = - (nixDependencies.callPackage ./modular/packages.nix rec { - version = "2.32.4"; - inherit (self.nix_2_31.meta) maintainers teams; - otherSplices = generateSplicesForNixComponents "nixComponents_2_32"; - src = fetchFromGitHub { - owner = "NixOS"; - repo = "nix"; - tag = version; - hash = "sha256-8QYnRyGOTm3h/Dp8I6HCmQzlO7C009Odqyp28pTWgcY="; - }; - }).appendPatches - [ - (fetchpatch2 { - name = "nix-2.32-14693-mdbook-0.5-support.patch"; - url = "https://github.com/NixOS/nix/commit/ba5bede9f51f126b29aaa01a3170da281cef0231.patch"; - hash = "sha256-jY5fWnJSBfHRmB0RnBKeu3aYQ8wmDKYVqTj85cWVZRA="; - }) - ]; + nixComponents_2_32 = nixDependencies.callPackage ./modular/packages.nix rec { + version = "2.32.5"; + inherit (self.nix_2_31.meta) maintainers teams; + otherSplices = generateSplicesForNixComponents "nixComponents_2_32"; + src = fetchFromGitHub { + owner = "NixOS"; + repo = "nix"; + tag = version; + hash = "sha256-vnlVgJ5VXn2LVvdzf1HUZeGq0pqa6vII11C8u5Q/YgM="; + }; + }; nix_2_32 = addTests "nix_2_32" self.nixComponents_2_32.nix-everything; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index db0116e80d75..d45ed5935a2d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -660,6 +660,8 @@ let frama-c-lannotate = callPackage ../development/ocaml-modules/frama-c-lannotate { }; + frama-c-luncov = callPackage ../development/ocaml-modules/frama-c-luncov { }; + frei0r = callPackage ../development/ocaml-modules/frei0r { inherit (pkgs) frei0r; };