diff --git a/ci/OWNERS b/ci/OWNERS
index 364f759d8e4f..93fc4a0f2745 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -374,10 +374,6 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
# LuaPackages
/pkgs/development/lua-modules @NixOS/lua
-# mpvScripts
-/pkgs/by-name/mp/mpv/scripts @uninsane
-/pkgs/by-name/mp/mpv/scripts.nix @uninsane
-
# Neovim
/pkgs/applications/editors/neovim @NixOS/neovim
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index cbb68a96f28c..12bf2e4f5b49 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9351,12 +9351,6 @@
githubId = 16470252;
name = "Gemini Lasswell";
};
- gbpdt = {
- email = "nix@pdtpartners.com";
- github = "gbpdt";
- githubId = 25106405;
- name = "Graham Bennett";
- };
gbtb = {
email = "goodbetterthebeast3@gmail.com";
github = "gbtb";
@@ -11277,12 +11271,6 @@
name = "Silvan Mosberger";
keys = [ { fingerprint = "6C2B 55D4 4E04 8266 6B7D DA1A 422E 9EDA E015 7170"; } ];
};
- ingenieroariel = {
- email = "ariel@nunez.co";
- github = "ingenieroariel";
- githubId = 54999;
- name = "Ariel Nunez";
- };
insipx = {
email = "github@andrewplaza.dev";
github = "insipx";
@@ -18958,6 +18946,11 @@
github = "nitsky";
githubId = 492793;
};
+ nivalux = {
+ name = "Nivalux";
+ github = "Nivalux";
+ githubId = 88719017;
+ };
nix-julia = {
name = "nix-julia";
github = "nix-julia";
diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md
index f76d36d33ae2..e7c6095be34b 100644
--- a/nixos/doc/manual/release-notes/rl-2605.section.md
+++ b/nixos/doc/manual/release-notes/rl-2605.section.md
@@ -71,6 +71,8 @@ of pulling the upstream container image from Docker Hub. If you want the old beh
- Support for `reiserfs` in nixpkgs has been removed, following the removal in Linux 6.13.
+- support for `ecryptfs` in nixpkgs has been removed.
+
- The `networking.wireless` module has been security hardened: the `wpa_supplicant` daemon now runs under an unprivileged user with restricted access to the system.
As part of these changes, `/etc/wpa_supplicant.conf` has been deprecated: the NixOS-generated configuration file is now linked to `/etc/wpa_supplicant/nixos.conf` and `/etc/wpa_supplicant/imperative.conf` has been added for imperatively configuring `wpa_supplicant` or when using [allowAuxiliaryImperativeNetworks](#opt-networking.wireless.allowAuxiliaryImperativeNetworks).
diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix
index 0980e6f385a2..1affb234e418 100644
--- a/nixos/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
@@ -89,7 +89,6 @@ in
"devfs"
"devpts"
"devtmpfs"
- "ecryptfs"
"eventpollfs"
"exofs"
"futexfs"
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 3046b73f731b..f9adc3f3230f 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -202,7 +202,6 @@
./programs/droidcam.nix
./programs/dsearch.nix
./programs/dublin-traceroute.nix
- ./programs/ecryptfs.nix
./programs/ente-auth.nix
./programs/environment.nix
./programs/envision.nix
@@ -1918,7 +1917,6 @@
./tasks/filesystems/bindfs.nix
./tasks/filesystems/btrfs.nix
./tasks/filesystems/cifs.nix
- ./tasks/filesystems/ecryptfs.nix
./tasks/filesystems/envfs.nix
./tasks/filesystems/erofs.nix
./tasks/filesystems/exfat.nix
diff --git a/nixos/modules/programs/ecryptfs.nix b/nixos/modules/programs/ecryptfs.nix
deleted file mode 100644
index 37b3699c20a8..000000000000
--- a/nixos/modules/programs/ecryptfs.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- config,
- lib,
- pkgs,
- ...
-}:
-
-let
- cfg = config.programs.ecryptfs;
-
-in
-{
- options.programs.ecryptfs = {
- enable = lib.mkEnableOption "ecryptfs setuid mount wrappers";
- };
-
- config = lib.mkIf cfg.enable {
- security.wrappers = {
-
- "mount.ecryptfs_private" = {
- setuid = true;
- owner = "root";
- group = "root";
- source = "${lib.getBin pkgs.ecryptfs}/bin/mount.ecryptfs_private";
- };
- "umount.ecryptfs_private" = {
- setuid = true;
- owner = "root";
- group = "root";
- source = "${lib.getBin pkgs.ecryptfs}/bin/umount.ecryptfs_private";
- };
-
- };
- };
-}
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index d2152082a042..f3fcf6055946 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -74,6 +74,10 @@ in
"programs"
"cardboard"
] "The corresponding package was removed from nixpkgs.")
+ (mkRemovedOptionModule [
+ "programs"
+ "ecryptfs"
+ ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [
"programs"
"gnome-documents"
@@ -452,6 +456,9 @@ in
(mkRemovedOptionModule [ "services" "simplesamlphp" ] ''
services.simplesamlphp has been vulnerable and unmaintained in nixpkgs.
'')
+ (mkRemovedOptionModule [ "security" "pam" "enableEcryptfs" ] ''
+ security.pam.enableFscrypt was removed since it was unmaintained in nixpkgs.
+ '')
(mkRemovedOptionModule [ "security" "rngd" ] ''
rngd is not necessary for any device that the kernel recognises
as an hardware RNG, as it will automatically run the krngd task
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 3bcac1371081..12fdf781e9ec 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -965,8 +965,7 @@ let
(
(cfg.unixAuth || config.services.homed.enable)
&& (
- config.security.pam.enableEcryptfs
- || config.security.pam.enableFscrypt
+ config.security.pam.enableFscrypt
|| cfg.pamMount
|| cfg.kwallet.enable
|| cfg.enableGnomeKeyring
@@ -996,15 +995,6 @@ let
likeauth = true;
};
}
- {
- name = "ecryptfs";
- enable = config.security.pam.enableEcryptfs;
- control = "optional";
- modulePath = "${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so";
- settings = {
- unwrap = true;
- };
- }
{
name = "fscrypt";
enable = config.security.pam.enableFscrypt;
@@ -1191,12 +1181,6 @@ let
yescrypt = true;
};
}
- {
- name = "ecryptfs";
- enable = config.security.pam.enableEcryptfs;
- control = "optional";
- modulePath = "${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so";
- }
{
name = "fscrypt";
enable = config.security.pam.enableFscrypt;
@@ -1331,12 +1315,6 @@ let
silent = true;
};
}
- {
- name = "ecryptfs";
- enable = config.security.pam.enableEcryptfs;
- control = "optional";
- modulePath = "${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so";
- }
# Work around https://github.com/systemd/systemd/issues/8598
# Skips the pam_fscrypt module for systemd-user sessions which do not have a password
# anyways.
@@ -2223,7 +2201,6 @@ in
security.pam.enableUMask = lib.mkEnableOption "umask PAM module";
- security.pam.enableEcryptfs = lib.mkEnableOption "eCryptfs PAM module (mounting ecryptfs home directory on login)";
security.pam.enableFscrypt = lib.mkEnableOption ''
fscrypt, to automatically unlock directories with the user's login password.
@@ -2324,8 +2301,6 @@ in
++ lib.optionals config.security.pam.enableFscrypt [ pkgs.fscrypt-experimental ]
++ lib.optionals config.security.pam.u2f.enable [ pkgs.pam_u2f ];
- boot.supportedFilesystems = lib.mkIf config.security.pam.enableEcryptfs [ "ecryptfs" ];
-
security.wrappers = {
unix_chkpwd = {
setuid = true;
diff --git a/nixos/modules/services/networking/mycelium.nix b/nixos/modules/services/networking/mycelium.nix
index 1574db67fd8a..4fb1040c0fad 100644
--- a/nixos/modules/services/networking/mycelium.nix
+++ b/nixos/modules/services/networking/mycelium.nix
@@ -30,7 +30,7 @@ in
default = null;
description = ''
Optional path to a file containing the mycelium key material.
- If unset, the default location (`/var/lib/mycelium/key.bin`) will be used.
+ If unset, the location `/var/lib/mycelium/key.bin` will be used.
If no key exist at this location, it will be generated on startup.
'';
};
diff --git a/nixos/modules/tasks/filesystems/ecryptfs.nix b/nixos/modules/tasks/filesystems/ecryptfs.nix
deleted file mode 100644
index 8b489d65d843..000000000000
--- a/nixos/modules/tasks/filesystems/ecryptfs.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- config,
- lib,
- pkgs,
- ...
-}:
-# TODO: make ecryptfs work in initramfs?
-
-with lib;
-
-{
- config = mkIf (config.boot.supportedFilesystems.ecryptfs or false) {
- system.fsPackages = [ pkgs.ecryptfs ];
- security.wrappers = {
- "mount.ecryptfs_private" = {
- setuid = true;
- owner = "root";
- group = "root";
- source = "${pkgs.ecryptfs.out}/bin/mount.ecryptfs_private";
- };
- "umount.ecryptfs_private" = {
- setuid = true;
- owner = "root";
- group = "root";
- source = "${pkgs.ecryptfs.out}/bin/umount.ecryptfs_private";
- };
- };
- };
-}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index ddd09ceb28d2..957882749b9a 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -502,7 +502,6 @@ in
ec2-image = runTest ./ec2-image.nix;
ec2-nixops = (handleTestOn [ "x86_64-linux" ] ./ec2.nix { }).boot-ec2-nixops or { };
echoip = runTest ./echoip.nix;
- ecryptfs = runTest ./ecryptfs.nix;
ejabberd = runTest ./xmpp/ejabberd.nix;
elk = handleTestOn [ "x86_64-linux" ] ./elk.nix { };
emacs-daemon = runTest ./emacs-daemon.nix;
diff --git a/nixos/tests/ecryptfs.nix b/nixos/tests/ecryptfs.nix
deleted file mode 100644
index e0deaa7e5013..000000000000
--- a/nixos/tests/ecryptfs.nix
+++ /dev/null
@@ -1,87 +0,0 @@
-{ ... }:
-{
- name = "ecryptfs";
-
- nodes.machine =
- { pkgs, ... }:
- {
- imports = [ ./common/user-account.nix ];
- boot.kernelModules = [ "ecryptfs" ];
- security.pam.enableEcryptfs = true;
- environment.systemPackages = with pkgs; [ keyutils ];
- };
-
- testScript = ''
- def login_as_alice():
- machine.wait_until_tty_matches("1", "login: ")
- machine.send_chars("alice\n")
- machine.wait_until_tty_matches("1", "Password: ")
- machine.send_chars("foobar\n")
- machine.wait_until_tty_matches("1", "alice\@machine")
-
-
- def logout():
- machine.send_chars("logout\n")
- machine.wait_until_tty_matches("1", "login: ")
-
-
- machine.wait_for_unit("default.target")
-
- with subtest("Set alice up with a password and a home"):
- machine.succeed("(echo foobar; echo foobar) | passwd alice")
- machine.succeed("chown -R alice.users ~alice")
-
- with subtest("Migrate alice's home"):
- out = machine.succeed("echo foobar | ecryptfs-migrate-home -u alice")
- machine.log(f"ecryptfs-migrate-home said: {out}")
-
- with subtest("Log alice in (ecryptfs passwhrase is wrapped during first login)"):
- login_as_alice()
- machine.send_chars("logout\n")
- machine.wait_until_tty_matches("1", "login: ")
-
- # Why do I need to do this??
- machine.succeed("su alice -c ecryptfs-umount-private || true")
- machine.sleep(1)
-
- with subtest("check that encrypted home is not mounted"):
- machine.fail("mount | grep ecryptfs")
-
- with subtest("Show contents of the user keyring"):
- out = machine.succeed("su - alice -c 'keyctl list \@u'")
- machine.log(f"keyctl unlink said: {out}")
-
- with subtest("Log alice again"):
- login_as_alice()
-
- with subtest("Create some files in encrypted home"):
- machine.succeed("su alice -c 'touch ~alice/a'")
- machine.succeed("su alice -c 'echo c > ~alice/b'")
-
- with subtest("Logout"):
- logout()
-
- # Why do I need to do this??
- machine.succeed("su alice -c ecryptfs-umount-private || true")
- machine.sleep(1)
-
- with subtest("Check that the filesystem is not accessible"):
- machine.fail("mount | grep ecryptfs")
- machine.succeed("su alice -c 'test \! -f ~alice/a'")
- machine.succeed("su alice -c 'test \! -f ~alice/b'")
-
- with subtest("Log alice once more"):
- login_as_alice()
-
- with subtest("Check that the files are there"):
- machine.sleep(1)
- machine.succeed("su alice -c 'test -f ~alice/a'")
- machine.succeed("su alice -c 'test -f ~alice/b'")
- machine.succeed('test "$(cat ~alice/b)" = "c"')
-
- with subtest("Catch https://github.com/NixOS/nixpkgs/issues/16766"):
- machine.succeed("su alice -c 'ls -lh ~alice/'")
-
- logout()
- '';
-}
diff --git a/pkgs/applications/editors/sublime/4/common.nix b/pkgs/applications/editors/sublime/4/common.nix
index 6242e71b856e..0dfc59a083e9 100644
--- a/pkgs/applications/editors/sublime/4/common.nix
+++ b/pkgs/applications/editors/sublime/4/common.nix
@@ -142,15 +142,13 @@ stdenv.mkDerivation rec {
dontUnpack = true;
- ${primaryBinary} = binaryPackage;
-
nativeBuildInputs = [
makeWrapper
];
installPhase = ''
mkdir -p "$out/bin"
- makeWrapper "''$${primaryBinary}/${primaryBinary}" "$out/bin/${primaryBinary}"
+ makeWrapper "${binaryPackage}/${primaryBinary}" "$out/bin/${primaryBinary}"
''
+ builtins.concatStringsSep "" (
map (binaryAlias: "ln -s $out/bin/${primaryBinary} $out/bin/${binaryAlias}\n") primaryBinaryAliases
@@ -159,18 +157,20 @@ stdenv.mkDerivation rec {
mkdir -p "$out/share/applications"
substitute \
- "''$${primaryBinary}/${primaryBinary}.desktop" \
+ "${binaryPackage}/${primaryBinary}.desktop" \
"$out/share/applications/${primaryBinary}.desktop" \
--replace-fail "/opt/${primaryBinary}/${primaryBinary}" "${primaryBinary}"
- for directory in ''$${primaryBinary}/Icon/*; do
+ for directory in ${binaryPackage}/Icon/*; do
size=$(basename $directory)
mkdir -p "$out/share/icons/hicolor/$size/apps"
- ln -s ''$${primaryBinary}/Icon/$size/* $out/share/icons/hicolor/$size/apps
+ ln -s ${binaryPackage}/Icon/$size/* $out/share/icons/hicolor/$size/apps
done
'';
passthru = {
+ unwrapped = binaryPackage;
+
updateScript =
let
script = writeShellScript "${packageAttribute}-update-script" ''
@@ -191,7 +191,7 @@ stdenv.mkDerivation rec {
fi
for platform in ${lib.escapeShellArgs meta.platforms}; do
- update-source-version "${packageAttribute}.${primaryBinary}" "$latestVersion" --ignore-same-version --file="$versionFile" --version-key=buildVersion --source-key="sources.$platform"
+ update-source-version "${packageAttribute}".unwrapped "$latestVersion" --ignore-same-version --file="$versionFile" --version-key=buildVersion --source-key="sources.$platform"
done
'';
in
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 099f36cbb1cc..ae9cad30b8d7 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -4,6 +4,7 @@
buildVimPlugin,
buildNeovimPlugin,
fetchFromGitHub,
+ fetchFromGitea,
}:
final: prev: {
@@ -10503,6 +10504,20 @@ final: prev: {
meta.hydraPlatforms = [ ];
};
+ nidhogg-nvim = buildVimPlugin {
+ pname = "nidhogg.nvim";
+ version = "0-unstable-2026-01-11";
+ src = fetchFromGitea {
+ domain = "codeberg.org";
+ owner = "koibtw";
+ repo = "nidhogg.nvim";
+ rev = "a8c72aa204f68d5bd79a2508fbbed7b0ad2290cf";
+ hash = "sha256-x8CryNcg3u5uCncCMTgK7yzCvk5MiomjKpdjNEoCQu4=";
+ };
+ meta.homepage = "https://codeberg.org/koibtw/nidhogg.nvim/";
+ meta.hydraPlatforms = [ ];
+ };
+
night-owl-nvim = buildVimPlugin {
pname = "night-owl.nvim";
version = "0.5-beta-unstable-2024-09-12";
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
index 478371bfb52a..0d728b27c171 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
@@ -12,12 +12,12 @@
pkgs,
}:
let
- version = "0.0.27-unstable-2026-01-04";
+ version = "0.0.27-unstable-2026-01-09";
src = fetchFromGitHub {
owner = "yetone";
repo = "avante.nvim";
- rev = "a27b821cc1f9fec70d7b7dc4a42c6dbd76266997";
- hash = "sha256-Hm1Zr10xH9B4GzRyCKI/qsbhkJCD69qo8gC+Njna/5w=";
+ rev = "e89eb79abf5754645e20aa6074da10ed20bba33c";
+ hash = "sha256-jxbDBvaVtgC0L/MSyoZjGjBxvRUdNofRsiUHwntab7c=";
};
avante-nvim-lib = rustPlatform.buildRustPackage {
pname = "avante-nvim-lib";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 5f769dfd235c..daaa5dd2b5e9 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -806,6 +806,7 @@ https://github.com/fiatjaf/neuron.vim/,,
https://github.com/Olical/nfnl/,main,
https://github.com/joeveiga/ng.nvim/,HEAD,
https://github.com/chr4/nginx.vim/,,
+https://codeberg.org/koibtw/nidhogg.nvim,HEAD,
https://github.com/oxfist/night-owl.nvim/,,
https://github.com/bluz71/vim-nightfly-colors/,,nightfly
https://github.com/EdenEast/nightfox.nvim/,,
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 7f7452aa53af..c2a1008731b0 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -27,13 +27,13 @@
"vendorHash": null
},
"aiven_aiven": {
- "hash": "sha256-cr/Z1sMm2TcO1GbOLTdMJ9JOly5kYrDxwbYgQVPFJ9M=",
+ "hash": "sha256-KOEXMx0QRvvxtKH1zjjfZH29lyAiukIGvk7POVs5KQo=",
"homepage": "https://registry.terraform.io/providers/aiven/aiven",
"owner": "aiven",
"repo": "terraform-provider-aiven",
- "rev": "v4.48.0",
+ "rev": "v4.49.0",
"spdx": "MIT",
- "vendorHash": "sha256-ki9PKr+1++mDQoclXSYOagMTzPJnXew1/TiciEjR3B4="
+ "vendorHash": "sha256-ctEZoEULhdsWahsRBXVv1QfSvQ17I5PYUB6++pTFJE8="
},
"akamai_akamai": {
"hash": "sha256-HjrBPaLYeJ8/9gmdn+BGHtu5dmyT5MeTsIBgzS0X0gY=",
@@ -580,13 +580,13 @@
"vendorHash": "sha256-6re5ARUiWmpkND7hfjSDm2aOX5vlESp7UrcPJDNIJ+s="
},
"hashicorp_google-beta": {
- "hash": "sha256-rgN9FJGz5BxYkVqmDLQH+Sw4HRwOs+PbBB4hMmYmTTU=",
+ "hash": "sha256-LcCuSoOXHLoRwk4AxMSjQkSWieNDqmWzEPXu4BFISQw=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
"owner": "hashicorp",
"repo": "terraform-provider-google-beta",
- "rev": "v7.15.0",
+ "rev": "v7.16.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-FcKZHfUWzJj8unXxhCsuw3131uyWFYzJyALv1vSGCsQ="
+ "vendorHash": "sha256-DfvtZVbke4Rydp5PaD6QQr2bITHOaK1rNU773zDqdXQ="
},
"hashicorp_helm": {
"hash": "sha256-S4Fe65f+gEWWxRMC+/i93dwwe7QigPccx4wiqNBpcL8=",
diff --git a/pkgs/applications/networking/instant-messengers/franz/generic.nix b/pkgs/applications/networking/instant-messengers/franz/generic.nix
index d9326450a3f0..e8019c32595c 100644
--- a/pkgs/applications/networking/instant-messengers/franz/generic.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix
@@ -26,6 +26,8 @@
libgbm,
libglvnd,
libappindicator-gtk3,
+ pipewire,
+ libpulseaudio,
}:
# Helper function for building a derivation for Franz and forks.
@@ -99,6 +101,8 @@ stdenv.mkDerivation (
cups
expat
stdenv.cc.cc
+ pipewire
+ libpulseaudio
];
runtimeDependencies = [
libglvnd
@@ -106,6 +110,8 @@ stdenv.mkDerivation (
(lib.getLib udev)
libnotify
libappindicator-gtk3
+ pipewire
+ libpulseaudio
];
installPhase = ''
diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix
index 293b28e074c7..b351009d549c 100644
--- a/pkgs/applications/networking/maestral-qt/default.nix
+++ b/pkgs/applications/networking/maestral-qt/default.nix
@@ -14,8 +14,6 @@ python3.pkgs.buildPythonApplication rec {
version = "1.9.5";
pyproject = true;
- disabled = python3.pythonOlder "3.7";
-
src = fetchFromGitHub {
owner = "SamSchott";
repo = "maestral-qt";
diff --git a/pkgs/applications/radio/gnuradio/shared.nix b/pkgs/applications/radio/gnuradio/shared.nix
index a5722c9058ee..578748363ced 100644
--- a/pkgs/applications/radio/gnuradio/shared.nix
+++ b/pkgs/applications/radio/gnuradio/shared.nix
@@ -29,6 +29,8 @@ in
{
outputs = [
"out"
+ ]
+ ++ lib.optionals (hasFeature "man-pages") [
"man"
];
src =
diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix
index 075244027f29..c3e0e5147448 100644
--- a/pkgs/applications/version-management/sublime-merge/common.nix
+++ b/pkgs/applications/version-management/sublime-merge/common.nix
@@ -144,8 +144,6 @@ stdenv.mkDerivation rec {
dontUnpack = true;
- ${primaryBinary} = binaryPackage;
-
nativeBuildInputs = [
makeWrapper
];
@@ -153,7 +151,7 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
mkdir -p "$out/bin"
- makeWrapper "''$${primaryBinary}/${primaryBinary}" "$out/bin/${primaryBinary}"
+ makeWrapper "${binaryPackage}/${primaryBinary}" "$out/bin/${primaryBinary}"
''
+ builtins.concatStringsSep "" (
map (binaryAlias: "ln -s $out/bin/${primaryBinary} $out/bin/${binaryAlias}\n") primaryBinaryAliases
@@ -162,19 +160,21 @@ stdenv.mkDerivation rec {
mkdir -p "$out/share/applications"
substitute \
- "''$${primaryBinary}/${primaryBinary}.desktop" \
+ "${binaryPackage}/${primaryBinary}.desktop" \
"$out/share/applications/${primaryBinary}.desktop" \
--replace-fail "/opt/${primaryBinary}/${primaryBinary}" "${primaryBinary}"
- for directory in ''$${primaryBinary}/Icon/*; do
+ for directory in ${binaryPackage}/Icon/*; do
size=$(basename $directory)
mkdir -p "$out/share/icons/hicolor/$size/apps"
- ln -s ''$${primaryBinary}/Icon/$size/* $out/share/icons/hicolor/$size/apps
+ ln -s ${binaryPackage}/Icon/$size/* $out/share/icons/hicolor/$size/apps
done
runHook postInstall
'';
passthru = {
+ unwrapped = binaryPackage;
+
updateScript =
let
script = writeShellScript "${packageAttribute}-update-script" ''
@@ -196,7 +196,7 @@ stdenv.mkDerivation rec {
fi
for platform in ${lib.escapeShellArgs meta.platforms}; do
- update-source-version "${packageAttribute}.${primaryBinary}" "$latestVersion" --ignore-same-version --file="$versionFile" --version-key=buildVersion --source-key="sources.$platform"
+ update-source-version "${packageAttribute}".unwrapped "$latestVersion" --ignore-same-version --file="$versionFile" --version-key=buildVersion --source-key="sources.$platform"
done
'';
in
diff --git a/pkgs/by-name/an/ansible-navigator/package.nix b/pkgs/by-name/an/ansible-navigator/package.nix
index 27a12241227e..bf69dc2a68a9 100644
--- a/pkgs/by-name/an/ansible-navigator/package.nix
+++ b/pkgs/by-name/an/ansible-navigator/package.nix
@@ -5,15 +5,14 @@
fetchPypi,
ansible-lint,
}:
-python3Packages.buildPythonApplication rec {
+
+python3Packages.buildPythonApplication (finalAttrs: {
pname = "ansible-navigator";
version = "25.12.0";
pyproject = true;
- disabled = python3Packages.pythonOlder "3.10";
-
src = fetchPypi {
- inherit version;
+ inherit (finalAttrs) version;
pname = "ansible_navigator";
hash = "sha256-i6yw282NWUaCZBtAYi3rQsLk+GGyp8QHyqBi7nwwIlo=";
};
@@ -43,8 +42,8 @@ python3Packages.buildPythonApplication rec {
meta = {
description = "Text-based user interface (TUI) for Ansible";
homepage = "https://ansible.readthedocs.io/projects/navigator/";
- changelog = "https://github.com/ansible/ansible-navigator/releases/tag/v${version}";
+ changelog = "https://github.com/ansible/ansible-navigator/releases/tag/v${finalAttrs.version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ melkor333 ];
};
-}
+})
diff --git a/pkgs/by-name/ap/apache-airflow/python-package.nix b/pkgs/by-name/ap/apache-airflow/python-package.nix
index f9800b0700ec..bf4281e0baad 100644
--- a/pkgs/by-name/ap/apache-airflow/python-package.nix
+++ b/pkgs/by-name/ap/apache-airflow/python-package.nix
@@ -346,8 +346,6 @@ buildPythonPackage rec {
changelog = "https://airflow.apache.org/docs/apache-airflow/${version}/release_notes.html";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
- gbpdt
- ingenieroariel
taranarmo
];
};
diff --git a/pkgs/by-name/av/avalonia/0004-disable-windows-desktop.patch b/pkgs/by-name/av/avalonia/0004-disable-windows-desktop.patch
new file mode 100644
index 000000000000..b9ad7048b7cc
--- /dev/null
+++ b/pkgs/by-name/av/avalonia/0004-disable-windows-desktop.patch
@@ -0,0 +1,14 @@
+diff --git a/dirs.proj b/dirs.proj
+index 28a91c8..cd9b8b4 100644
+--- a/dirs.proj
++++ b/dirs.proj
+@@ -22,6 +22,9 @@
+
+
+
++
++
++
+
+
+
diff --git a/pkgs/by-name/av/avalonia/deps.json b/pkgs/by-name/av/avalonia/deps.json
index 7e9cd863612a..5ec6c561ffb2 100644
--- a/pkgs/by-name/av/avalonia/deps.json
+++ b/pkgs/by-name/av/avalonia/deps.json
@@ -44,6 +44,11 @@
"version": "2.4.3",
"hash": "sha256-pTyYP26uXXLe6ejCb/yVYpb23ad/Dkl2Ka8NWwQeiqk="
},
+ {
+ "pname": "CommunityToolkit.Mvvm",
+ "version": "8.4.0",
+ "hash": "sha256-a0D550q+ffreU9Z+kQPdzJYPNaj1UjgyPofLzUg02ZI="
+ },
{
"pname": "dotnet-ilrepack",
"version": "1.0.0",
@@ -59,16 +64,6 @@
"version": "3.11.0",
"hash": "sha256-OLKoHGsBOlGDrwjbSHHITl2mWKbUXoRBbTjNMCkzDQg="
},
- {
- "pname": "DynamicData",
- "version": "7.12.8",
- "hash": "sha256-MIR66d5vWwpOo06b8f3UDJXMlwyiGl/9JsedtVAh6LA="
- },
- {
- "pname": "DynamicData",
- "version": "8.4.1",
- "hash": "sha256-r+haH5VlmZFJTEJ3UedsYybw+oddn/CSvfm6x7PrrQ4="
- },
{
"pname": "GdkSharp",
"version": "3.24.24.95",
@@ -880,16 +875,6 @@
"version": "0.11.4-experimental",
"hash": "sha256-b3oKUKbr+3Udfl7RWzUY9BR/XWNsN+VmEkBxk6KiFo0="
},
- {
- "pname": "Microsoft.WindowsDesktop.App.Ref",
- "version": "6.0.36",
- "hash": "sha256-K8l2UQgrEOJt6w3Q4Jy7dJlXAI1gG6o+2NEBgmG8dG4="
- },
- {
- "pname": "Microsoft.WindowsDesktop.App.Ref",
- "version": "8.0.22",
- "hash": "sha256-F8DQPfK1IiD8+H8A85QSBHhzJIo1fmAXwXaSge7EhBE="
- },
{
"pname": "Mono.Cecil",
"version": "0.11.5",
@@ -1020,21 +1005,6 @@
"version": "2.0.9",
"hash": "sha256-DLkL5i3q+y2AOg68oe6ROxgcwkPaLg7ViI3pytJd80k="
},
- {
- "pname": "ReactiveUI",
- "version": "18.4.1",
- "hash": "sha256-IqaIu3xmShw3m/ko34SytnL9sIm/LQnTUZcda7CF7tA="
- },
- {
- "pname": "ReactiveUI",
- "version": "20.1.1",
- "hash": "sha256-p9l2GMzBRchKb4gW9pQ3DIKhs2O9fX3t/V7jDDztBqE="
- },
- {
- "pname": "ReactiveUI.Validation",
- "version": "3.0.22",
- "hash": "sha256-f/1yGwrQb/Nauj+0lqBV6xxbfp8qCQvJxbxUy2VhS8I="
- },
{
"pname": "runtime.any.System.Collections",
"version": "4.0.11",
@@ -1790,16 +1760,6 @@
"version": "2.88.9",
"hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
},
- {
- "pname": "Splat",
- "version": "14.5.1",
- "hash": "sha256-qv/N4VN3MtCW3t/OJ77NGUMfPON2kHIq5BtrMTQLRUQ="
- },
- {
- "pname": "Splat",
- "version": "15.1.1",
- "hash": "sha256-WipAVaUx2HrYNQ9LcYm496LndmSpVbuzJxzP9FA6Ohg="
- },
{
"pname": "System.AppContext",
"version": "4.1.0",
@@ -1920,11 +1880,6 @@
"version": "4.5.0",
"hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="
},
- {
- "pname": "System.ComponentModel.Annotations",
- "version": "5.0.0",
- "hash": "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg="
- },
{
"pname": "System.ComponentModel.Primitives",
"version": "4.3.0",
@@ -1980,11 +1935,6 @@
"version": "4.3.1",
"hash": "sha256-6vgjSBp0rBpp5qcpCWHNVSUJBzRign1h8cdk4Q75lNw="
},
- {
- "pname": "System.Diagnostics.Contracts",
- "version": "4.3.0",
- "hash": "sha256-K74oyUn0Vriv3mwrbZwQFQ6EA0M7Hm9YlcWLRjLjqr8="
- },
{
"pname": "System.Diagnostics.Debug",
"version": "4.0.11",
@@ -2440,11 +2390,6 @@
"version": "5.0.0",
"hash": "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE="
},
- {
- "pname": "System.Reactive",
- "version": "6.0.0",
- "hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y="
- },
{
"pname": "System.Reactive",
"version": "6.0.1",
@@ -2930,11 +2875,6 @@
"version": "6.0.0",
"hash": "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo="
},
- {
- "pname": "System.Text.Encodings.Web",
- "version": "8.0.0",
- "hash": "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="
- },
{
"pname": "System.Text.Json",
"version": "4.7.0",
@@ -2945,11 +2885,6 @@
"version": "6.0.0",
"hash": "sha256-9AE/5ds4DqEfb0l+27fCBTSeYCdRWhxh2Bhg8IKvIuo="
},
- {
- "pname": "System.Text.Json",
- "version": "8.0.3",
- "hash": "sha256-ljBBGkResXv3MbrA14hR6QXo8SFLLV52GkpA+wxKdEo="
- },
{
"pname": "System.Text.RegularExpressions",
"version": "4.1.0",
@@ -3230,11 +3165,6 @@
"version": "1.4.13",
"hash": "sha256-pLtx0/2oTKYO1Y1Vg3k/Eli2OWHT5uorGdBp2uXvFfw="
},
- {
- "pname": "Xunit.StaFact",
- "version": "1.2.46-alpha",
- "hash": "sha256-GkHy4fEg8nvT2K+N/8KDPpJAtwLgVCLERZa5kO08e2E="
- },
{
"pname": "YamlDotNet",
"version": "11.2.1",
diff --git a/pkgs/by-name/av/avalonia/package.nix b/pkgs/by-name/av/avalonia/package.nix
index 538b29b58c21..19a69b17e4aa 100644
--- a/pkgs/by-name/av/avalonia/package.nix
+++ b/pkgs/by-name/av/avalonia/package.nix
@@ -46,14 +46,14 @@ stdenvNoCC.mkDerivation (
}
rec {
pname = "Avalonia";
- version = "11.3.9";
+ version = "11.3.11";
src = fetchFromGitHub {
owner = "AvaloniaUI";
repo = "Avalonia";
tag = version;
fetchSubmodules = true;
- hash = "sha256-qvkQKlz9GQayAxCPITYJbCk+w4d9xJNo+P1I9J1SYho=";
+ hash = "sha256-lB0Td/YmQc8GtTpoinxDYHfxnDLQPTWXsp/X0ddslFM=";
};
patches = [
@@ -65,6 +65,9 @@ stdenvNoCC.mkDerivation (
# Microsoft.Common.CurrentVersion.targets(5034,5): error MSB3021: Unable to copy file "[...]/JetBrains.Annotations.dll" to "bin/Debug/JetBrains.Annotations.dll". Access to the path '/build/source/nukebuild/bin/Debug/JetBrains.Annotations.dll' is denied. [/build/source/nukebuild/_build.csproj]
# This happens because the source packages have symlinks due to linkNuGetPackagesAndSources.
./0003-disable-hard-links.patch
+ # Remove dependencies on Microsoft.WindowsDesktop.App.Ref, which sdk
+ # specific and currently not packaged in nixpkgs
+ ./0004-disable-windows-desktop.patch
];
# this needs to be match the version being patched above
diff --git a/pkgs/by-name/bi/bitwarden-cli/fix-lockfile.patch b/pkgs/by-name/bi/bitwarden-cli/fix-lockfile.patch
index 0b65d6552040..5acd9a8072a3 100644
--- a/pkgs/by-name/bi/bitwarden-cli/fix-lockfile.patch
+++ b/pkgs/by-name/bi/bitwarden-cli/fix-lockfile.patch
@@ -1,8 +1,8 @@
diff --git a/package-lock.json b/package-lock.json
-index 1b4fe5f40e..fe3166797e 100644
+index 32d5abebb913..fea866c148c9 100644
--- a/package-lock.json
+++ b/package-lock.json
-@@ -230,51 +230,6 @@
+@@ -231,51 +231,6 @@
"bw": "build/bw.js"
}
},
@@ -53,515 +53,4 @@ index 1b4fe5f40e..fe3166797e 100644
- },
"apps/desktop": {
"name": "@bitwarden/desktop",
- "version": "2025.9.0",
-@@ -4913,33 +4868,6 @@
- }
- }
- },
-- "node_modules/@compodoc/compodoc/node_modules/@angular-devkit/schematics/node_modules/chokidar": {
-- "version": "3.6.0",
-- "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-- "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
-- "dev": true,
-- "license": "MIT",
-- "optional": true,
-- "peer": true,
-- "dependencies": {
-- "anymatch": "~3.1.2",
-- "braces": "~3.0.2",
-- "glob-parent": "~5.1.2",
-- "is-binary-path": "~2.1.0",
-- "is-glob": "~4.0.1",
-- "normalize-path": "~3.0.0",
-- "readdirp": "~3.6.0"
-- },
-- "engines": {
-- "node": ">= 8.10.0"
-- },
-- "funding": {
-- "url": "https://paulmillr.com/funding/"
-- },
-- "optionalDependencies": {
-- "fsevents": "~2.3.2"
-- }
-- },
- "node_modules/@compodoc/compodoc/node_modules/@babel/core": {
- "version": "7.25.8",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.8.tgz",
-@@ -5122,21 +5050,6 @@
- "dev": true,
- "license": "MIT"
- },
-- "node_modules/@compodoc/compodoc/node_modules/glob-parent": {
-- "version": "5.1.2",
-- "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-- "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-- "dev": true,
-- "license": "ISC",
-- "optional": true,
-- "peer": true,
-- "dependencies": {
-- "is-glob": "^4.0.1"
-- },
-- "engines": {
-- "node": ">= 6"
-- }
-- },
- "node_modules/@compodoc/compodoc/node_modules/magic-string": {
- "version": "0.30.11",
- "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz",
-@@ -5147,36 +5060,6 @@
- "@jridgewell/sourcemap-codec": "^1.5.0"
- }
- },
-- "node_modules/@compodoc/compodoc/node_modules/readdirp": {
-- "version": "3.6.0",
-- "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-- "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-- "dev": true,
-- "license": "MIT",
-- "optional": true,
-- "peer": true,
-- "dependencies": {
-- "picomatch": "^2.2.1"
-- },
-- "engines": {
-- "node": ">=8.10.0"
-- }
-- },
-- "node_modules/@compodoc/compodoc/node_modules/readdirp/node_modules/picomatch": {
-- "version": "2.3.1",
-- "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-- "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-- "dev": true,
-- "license": "MIT",
-- "optional": true,
-- "peer": true,
-- "engines": {
-- "node": ">=8.6"
-- },
-- "funding": {
-- "url": "https://github.com/sponsors/jonschlinkert"
-- }
-- },
- "node_modules/@compodoc/live-server": {
- "version": "1.2.3",
- "resolved": "https://registry.npmjs.org/@compodoc/live-server/-/live-server-1.2.3.tgz",
-@@ -5908,28 +5791,6 @@
- "node": ">=16.4"
- }
- },
-- "node_modules/@electron/windows-sign": {
-- "version": "1.2.2",
-- "resolved": "https://registry.npmjs.org/@electron/windows-sign/-/windows-sign-1.2.2.tgz",
-- "integrity": "sha512-dfZeox66AvdPtb2lD8OsIIQh12Tp0GNCRUDfBHIKGpbmopZto2/A8nSpYYLoedPIHpqkeblZ/k8OV0Gy7PYuyQ==",
-- "dev": true,
-- "license": "BSD-2-Clause",
-- "optional": true,
-- "peer": true,
-- "dependencies": {
-- "cross-dirname": "^0.1.0",
-- "debug": "^4.3.4",
-- "fs-extra": "^11.1.1",
-- "minimist": "^1.2.8",
-- "postject": "^1.0.0-alpha.6"
-- },
-- "bin": {
-- "electron-windows-sign": "bin/electron-windows-sign.js"
-- },
-- "engines": {
-- "node": ">=14.14"
-- }
-- },
- "node_modules/@emnapi/core": {
- "version": "1.4.3",
- "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.4.3.tgz",
-@@ -8285,21 +8146,6 @@
- "@msgpack/msgpack": "^2.7.0"
- }
- },
-- "node_modules/@microsoft/signalr/node_modules/utf-8-validate": {
-- "version": "5.0.10",
-- "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz",
-- "integrity": "sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==",
-- "hasInstallScript": true,
-- "license": "MIT",
-- "optional": true,
-- "peer": true,
-- "dependencies": {
-- "node-gyp-build": "^4.3.0"
-- },
-- "engines": {
-- "node": ">=6.14.2"
-- }
-- },
- "node_modules/@microsoft/signalr/node_modules/ws": {
- "version": "7.5.10",
- "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
-@@ -11310,21 +11156,6 @@
- "linux"
- ]
- },
-- "node_modules/@rollup/rollup-linux-riscv64-musl": {
-- "version": "4.44.0",
-- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.44.0.tgz",
-- "integrity": "sha512-TDKO8KlHJuvTEdfw5YYFBjhFts2TR0VpZsnLLSYmB7AaohJhM8ctDSdDnUGq77hUh4m/djRafw+9zQpkOanE2Q==",
-- "cpu": [
-- "riscv64"
-- ],
-- "dev": true,
-- "license": "MIT",
-- "optional": true,
-- "os": [
-- "linux"
-- ],
-- "peer": true
-- },
- "node_modules/@rollup/rollup-linux-s390x-gnu": {
- "version": "4.34.8",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.34.8.tgz",
-@@ -18997,15 +18828,6 @@
- "integrity": "sha512-vQOuWmBgsgG1ovGeDi8m6Zeu1JaqH/JncrxKmaqMbv/LunyOQdLiQhPHtOsNlbUI05TocR5nod/Mbs3HYtr6sQ==",
- "license": "MIT"
- },
-- "node_modules/cross-dirname": {
-- "version": "0.1.0",
-- "resolved": "https://registry.npmjs.org/cross-dirname/-/cross-dirname-0.1.0.tgz",
-- "integrity": "sha512-+R08/oI0nl3vfPcqftZRpytksBXDzOUveBq/NBVx0sUp1axwzPQrKinNx5yd5sxPu8j1wIy8AfnVQ+5eFdha6Q==",
-- "dev": true,
-- "license": "MIT",
-- "optional": true,
-- "peer": true
-- },
- "node_modules/cross-env": {
- "version": "10.0.0",
- "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-10.0.0.tgz",
-@@ -33661,36 +33483,6 @@
- "dev": true,
- "license": "MIT"
- },
-- "node_modules/postject": {
-- "version": "1.0.0-alpha.6",
-- "resolved": "https://registry.npmjs.org/postject/-/postject-1.0.0-alpha.6.tgz",
-- "integrity": "sha512-b9Eb8h2eVqNE8edvKdwqkrY6O7kAwmI8kcnBv1NScolYJbo59XUF0noFq+lxbC1yN20bmC0WBEbDC5H/7ASb0A==",
-- "dev": true,
-- "license": "MIT",
-- "optional": true,
-- "peer": true,
-- "dependencies": {
-- "commander": "^9.4.0"
-- },
-- "bin": {
-- "postject": "dist/cli.js"
-- },
-- "engines": {
-- "node": ">=14.0.0"
-- }
-- },
-- "node_modules/postject/node_modules/commander": {
-- "version": "9.5.0",
-- "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz",
-- "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==",
-- "dev": true,
-- "license": "MIT",
-- "optional": true,
-- "peer": true,
-- "engines": {
-- "node": "^12.20.0 || >=14"
-- }
-- },
- "node_modules/prebuild-install": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz",
-@@ -39330,291 +39122,6 @@
- }
- }
- },
-- "node_modules/vite/node_modules/@rollup/rollup-android-arm-eabi": {
-- "version": "4.44.0",
-- "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.44.0.tgz",
-- "integrity": "sha512-xEiEE5oDW6tK4jXCAyliuntGR+amEMO7HLtdSshVuhFnKTYoeYMyXQK7pLouAJJj5KHdwdn87bfHAR2nSdNAUA==",
-- "cpu": [
-- "arm"
-- ],
-- "dev": true,
-- "license": "MIT",
-- "optional": true,
-- "os": [
-- "android"
-- ],
-- "peer": true
-- },
-- "node_modules/vite/node_modules/@rollup/rollup-android-arm64": {
-- "version": "4.44.0",
-- "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.44.0.tgz",
-- "integrity": "sha512-uNSk/TgvMbskcHxXYHzqwiyBlJ/lGcv8DaUfcnNwict8ba9GTTNxfn3/FAoFZYgkaXXAdrAA+SLyKplyi349Jw==",
-- "cpu": [
-- "arm64"
-- ],
-- "dev": true,
-- "license": "MIT",
-- "optional": true,
-- "os": [
-- "android"
-- ],
-- "peer": true
-- },
-- "node_modules/vite/node_modules/@rollup/rollup-darwin-arm64": {
-- "version": "4.44.0",
-- "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.44.0.tgz",
-- "integrity": "sha512-VGF3wy0Eq1gcEIkSCr8Ke03CWT+Pm2yveKLaDvq51pPpZza3JX/ClxXOCmTYYq3us5MvEuNRTaeyFThCKRQhOA==",
-- "cpu": [
-- "arm64"
-- ],
-- "dev": true,
-- "license": "MIT",
-- "optional": true,
-- "os": [
-- "darwin"
-- ],
-- "peer": true
-- },
-- "node_modules/vite/node_modules/@rollup/rollup-darwin-x64": {
-- "version": "4.44.0",
-- "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.44.0.tgz",
-- "integrity": "sha512-fBkyrDhwquRvrTxSGH/qqt3/T0w5Rg0L7ZIDypvBPc1/gzjJle6acCpZ36blwuwcKD/u6oCE/sRWlUAcxLWQbQ==",
-- "cpu": [
-- "x64"
-- ],
-- "dev": true,
-- "license": "MIT",
-- "optional": true,
-- "os": [
-- "darwin"
-- ],
-- "peer": true
-- },
-- "node_modules/vite/node_modules/@rollup/rollup-freebsd-arm64": {
-- "version": "4.44.0",
-- "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.44.0.tgz",
-- "integrity": "sha512-u5AZzdQJYJXByB8giQ+r4VyfZP+walV+xHWdaFx/1VxsOn6eWJhK2Vl2eElvDJFKQBo/hcYIBg/jaKS8ZmKeNQ==",
-- "cpu": [
-- "arm64"
-- ],
-- "dev": true,
-- "license": "MIT",
-- "optional": true,
-- "os": [
-- "freebsd"
-- ],
-- "peer": true
-- },
-- "node_modules/vite/node_modules/@rollup/rollup-freebsd-x64": {
-- "version": "4.44.0",
-- "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.44.0.tgz",
-- "integrity": "sha512-qC0kS48c/s3EtdArkimctY7h3nHicQeEUdjJzYVJYR3ct3kWSafmn6jkNCA8InbUdge6PVx6keqjk5lVGJf99g==",
-- "cpu": [
-- "x64"
-- ],
-- "dev": true,
-- "license": "MIT",
-- "optional": true,
-- "os": [
-- "freebsd"
-- ],
-- "peer": true
-- },
-- "node_modules/vite/node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-- "version": "4.44.0",
-- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.44.0.tgz",
-- "integrity": "sha512-x+e/Z9H0RAWckn4V2OZZl6EmV0L2diuX3QB0uM1r6BvhUIv6xBPL5mrAX2E3e8N8rEHVPwFfz/ETUbV4oW9+lQ==",
-- "cpu": [
-- "arm"
-- ],
-- "dev": true,
-- "license": "MIT",
-- "optional": true,
-- "os": [
-- "linux"
-- ],
-- "peer": true
-- },
-- "node_modules/vite/node_modules/@rollup/rollup-linux-arm-musleabihf": {
-- "version": "4.44.0",
-- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.44.0.tgz",
-- "integrity": "sha512-1exwiBFf4PU/8HvI8s80icyCcnAIB86MCBdst51fwFmH5dyeoWVPVgmQPcKrMtBQ0W5pAs7jBCWuRXgEpRzSCg==",
-- "cpu": [
-- "arm"
-- ],
-- "dev": true,
-- "license": "MIT",
-- "optional": true,
-- "os": [
-- "linux"
-- ],
-- "peer": true
-- },
-- "node_modules/vite/node_modules/@rollup/rollup-linux-arm64-gnu": {
-- "version": "4.44.0",
-- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.44.0.tgz",
-- "integrity": "sha512-ZTR2mxBHb4tK4wGf9b8SYg0Y6KQPjGpR4UWwTFdnmjB4qRtoATZ5dWn3KsDwGa5Z2ZBOE7K52L36J9LueKBdOQ==",
-- "cpu": [
-- "arm64"
-- ],
-- "dev": true,
-- "license": "MIT",
-- "optional": true,
-- "os": [
-- "linux"
-- ],
-- "peer": true
-- },
-- "node_modules/vite/node_modules/@rollup/rollup-linux-arm64-musl": {
-- "version": "4.44.0",
-- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.44.0.tgz",
-- "integrity": "sha512-GFWfAhVhWGd4r6UxmnKRTBwP1qmModHtd5gkraeW2G490BpFOZkFtem8yuX2NyafIP/mGpRJgTJ2PwohQkUY/Q==",
-- "cpu": [
-- "arm64"
-- ],
-- "dev": true,
-- "license": "MIT",
-- "optional": true,
-- "os": [
-- "linux"
-- ],
-- "peer": true
-- },
-- "node_modules/vite/node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-- "version": "4.44.0",
-- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.44.0.tgz",
-- "integrity": "sha512-xw+FTGcov/ejdusVOqKgMGW3c4+AgqrfvzWEVXcNP6zq2ue+lsYUgJ+5Rtn/OTJf7e2CbgTFvzLW2j0YAtj0Gg==",
-- "cpu": [
-- "loong64"
-- ],
-- "dev": true,
-- "license": "MIT",
-- "optional": true,
-- "os": [
-- "linux"
-- ],
-- "peer": true
-- },
-- "node_modules/vite/node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-- "version": "4.44.0",
-- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.44.0.tgz",
-- "integrity": "sha512-bKGibTr9IdF0zr21kMvkZT4K6NV+jjRnBoVMt2uNMG0BYWm3qOVmYnXKzx7UhwrviKnmK46IKMByMgvpdQlyJQ==",
-- "cpu": [
-- "ppc64"
-- ],
-- "dev": true,
-- "license": "MIT",
-- "optional": true,
-- "os": [
-- "linux"
-- ],
-- "peer": true
-- },
-- "node_modules/vite/node_modules/@rollup/rollup-linux-riscv64-gnu": {
-- "version": "4.44.0",
-- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.44.0.tgz",
-- "integrity": "sha512-vV3cL48U5kDaKZtXrti12YRa7TyxgKAIDoYdqSIOMOFBXqFj2XbChHAtXquEn2+n78ciFgr4KIqEbydEGPxXgA==",
-- "cpu": [
-- "riscv64"
-- ],
-- "dev": true,
-- "license": "MIT",
-- "optional": true,
-- "os": [
-- "linux"
-- ],
-- "peer": true
-- },
-- "node_modules/vite/node_modules/@rollup/rollup-linux-s390x-gnu": {
-- "version": "4.44.0",
-- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.44.0.tgz",
-- "integrity": "sha512-8541GEyktXaw4lvnGp9m84KENcxInhAt6vPWJ9RodsB/iGjHoMB2Pp5MVBCiKIRxrxzJhGCxmNzdu+oDQ7kwRA==",
-- "cpu": [
-- "s390x"
-- ],
-- "dev": true,
-- "license": "MIT",
-- "optional": true,
-- "os": [
-- "linux"
-- ],
-- "peer": true
-- },
-- "node_modules/vite/node_modules/@rollup/rollup-linux-x64-gnu": {
-- "version": "4.44.0",
-- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.44.0.tgz",
-- "integrity": "sha512-iUVJc3c0o8l9Sa/qlDL2Z9UP92UZZW1+EmQ4xfjTc1akr0iUFZNfxrXJ/R1T90h/ILm9iXEY6+iPrmYB3pXKjw==",
-- "cpu": [
-- "x64"
-- ],
-- "dev": true,
-- "license": "MIT",
-- "optional": true,
-- "os": [
-- "linux"
-- ],
-- "peer": true
-- },
-- "node_modules/vite/node_modules/@rollup/rollup-linux-x64-musl": {
-- "version": "4.44.0",
-- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.44.0.tgz",
-- "integrity": "sha512-PQUobbhLTQT5yz/SPg116VJBgz+XOtXt8D1ck+sfJJhuEsMj2jSej5yTdp8CvWBSceu+WW+ibVL6dm0ptG5fcA==",
-- "cpu": [
-- "x64"
-- ],
-- "dev": true,
-- "license": "MIT",
-- "optional": true,
-- "os": [
-- "linux"
-- ],
-- "peer": true
-- },
-- "node_modules/vite/node_modules/@rollup/rollup-win32-arm64-msvc": {
-- "version": "4.44.0",
-- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.44.0.tgz",
-- "integrity": "sha512-M0CpcHf8TWn+4oTxJfh7LQuTuaYeXGbk0eageVjQCKzYLsajWS/lFC94qlRqOlyC2KvRT90ZrfXULYmukeIy7w==",
-- "cpu": [
-- "arm64"
-- ],
-- "dev": true,
-- "license": "MIT",
-- "optional": true,
-- "os": [
-- "win32"
-- ],
-- "peer": true
-- },
-- "node_modules/vite/node_modules/@rollup/rollup-win32-ia32-msvc": {
-- "version": "4.44.0",
-- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.44.0.tgz",
-- "integrity": "sha512-3XJ0NQtMAXTWFW8FqZKcw3gOQwBtVWP/u8TpHP3CRPXD7Pd6s8lLdH3sHWh8vqKCyyiI8xW5ltJScQmBU9j7WA==",
-- "cpu": [
-- "ia32"
-- ],
-- "dev": true,
-- "license": "MIT",
-- "optional": true,
-- "os": [
-- "win32"
-- ],
-- "peer": true
-- },
-- "node_modules/vite/node_modules/@rollup/rollup-win32-x64-msvc": {
-- "version": "4.44.0",
-- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.44.0.tgz",
-- "integrity": "sha512-Q2Mgwt+D8hd5FIPUuPDsvPR7Bguza6yTkJxspDGkZj7tBRn2y4KSWYuIXpftFSjBra76TbKerCV7rgFPQrn+wQ==",
-- "cpu": [
-- "x64"
-- ],
-- "dev": true,
-- "license": "MIT",
-- "optional": true,
-- "os": [
-- "win32"
-- ],
-- "peer": true
-- },
- "node_modules/vite/node_modules/rollup": {
- "version": "4.44.0",
- "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.44.0.tgz",
+ "version": "2025.12.1",
diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix
index 1d09457302a8..ed68612a6314 100644
--- a/pkgs/by-name/bi/bitwarden-cli/package.nix
+++ b/pkgs/by-name/bi/bitwarden-cli/package.nix
@@ -14,16 +14,17 @@
buildNpmPackage (finalAttrs: {
pname = "bitwarden-cli";
- version = "2025.12.0";
+ version = "2025.12.1";
src = fetchFromGitHub {
owner = "bitwarden";
repo = "clients";
tag = "cli-v${finalAttrs.version}";
- hash = "sha256-Pas9NQKLblVuB0Gx4j6Y64Mb2+RaCg7iquSWtN4K7kU=";
+ hash = "sha256-yER9LDFwTQkOdjB84UhEiWUDE+5Qa2vlRzq1/Qc/soY=";
};
patches = [
+ # https://github.com/bitwarden/clients/pull/18308
./fix-lockfile.patch
];
@@ -34,7 +35,7 @@ buildNpmPackage (finalAttrs: {
nodejs = nodejs_22;
- npmDepsHash = "sha256-N7e8WKk2REEH4gP5c7k5zsu3n44hFFLxQ2X35viMuwM=";
+ npmDepsHash = "sha256-kgYXuiHeyqAKW0gVitL3b7eZMiZPFCeVeNtxClEJRfc=";
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
perl
diff --git a/pkgs/by-name/bl/blackshades/package.nix b/pkgs/by-name/bl/blackshades/package.nix
index 137c4c902555..b26ecf1b0b17 100644
--- a/pkgs/by-name/bl/blackshades/package.nix
+++ b/pkgs/by-name/bl/blackshades/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
} $ZIG_GLOBAL_CACHE_DIR/p
'';
- nativeBuildInputs = [ zig_0_14.hook ];
+ nativeBuildInputs = [ zig_0_14 ];
buildInputs = [
glfw
diff --git a/pkgs/by-name/bo/bold/package.nix b/pkgs/by-name/bo/bold/package.nix
index e9438a35a704..b6892bc699a0 100644
--- a/pkgs/by-name/bo/bold/package.nix
+++ b/pkgs/by-name/bo/bold/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
nativeBuildInputs = [
- zig.hook
+ zig
];
doInstallCheck = true;
diff --git a/pkgs/by-name/bo/bork/package.nix b/pkgs/by-name/bo/bork/package.nix
index e19a6bbcb65c..d3b22a18a342 100644
--- a/pkgs/by-name/bo/bork/package.nix
+++ b/pkgs/by-name/bo/bork/package.nix
@@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation {
};
nativeBuildInputs = [
- zig.hook
+ zig
];
buildInputs = [
diff --git a/pkgs/by-name/br/brutalmaze/package.nix b/pkgs/by-name/br/brutalmaze/package.nix
index 6c246383e93f..93982705deb1 100644
--- a/pkgs/by-name/br/brutalmaze/package.nix
+++ b/pkgs/by-name/br/brutalmaze/package.nix
@@ -8,7 +8,6 @@ python312Packages.buildPythonApplication rec {
pname = "brutalmaze";
version = "1.1.1";
pyproject = true;
- disabled = python312Packages.pythonOlder "3.7";
src = fetchFromSourcehut {
owner = "~cnx";
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 63e1482f669e..074e7b75e78a 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -4,11 +4,14 @@
# ```
{
lib,
+ stdenv,
buildNpmPackage,
fetchzip,
- procps,
- writableTmpDirAsHomeHook,
versionCheckHook,
+ writableTmpDirAsHomeHook,
+ bubblewrap,
+ procps,
+ socat,
}:
buildNpmPackage (finalAttrs: {
pname = "claude-code";
@@ -44,9 +47,17 @@ buildNpmPackage (finalAttrs: {
--set DISABLE_AUTOUPDATER 1 \
--unset DEV \
--prefix PATH : ${
- lib.makeBinPath [
- procps # claude-code uses [node-tree-kill](https://github.com/pkrumins/node-tree-kill) which requires procps's pgrep(darwin) or ps(linux)
- ]
+ lib.makeBinPath (
+ [
+ # claude-code uses [node-tree-kill](https://github.com/pkrumins/node-tree-kill) which requires procps's pgrep(darwin) or ps(linux)
+ procps
+ ]
+ # the following packages are required for the sandbox to work (Linux only)
+ ++ lib.optionals stdenv.hostPlatform.isLinux [
+ bubblewrap
+ socat
+ ]
+ )
}
'';
diff --git a/pkgs/by-name/co/colordiff/package.nix b/pkgs/by-name/co/colordiff/package.nix
index 9a9e149ba90e..66d7183d1a1c 100644
--- a/pkgs/by-name/co/colordiff/package.nix
+++ b/pkgs/by-name/co/colordiff/package.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "colordiff";
- version = "1.0.21";
+ version = "1.0.22";
src = fetchFromGitHub {
owner = "daveewart";
repo = "colordiff";
rev = "v${version}";
- sha256 = "sha256-TNOw6dqsT0dOIddRoGwEF85CaQF8ICMFUi+GiG5WWpk=";
+ sha256 = "sha256-ZFxBY/QrKlRC7glEGWpB/79Jup0e4RCnS82Ct6lhK4Y=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/cr/creek/package.nix b/pkgs/by-name/cr/creek/package.nix
index e68f872896fa..13f51ec04587 100644
--- a/pkgs/by-name/cr/creek/package.nix
+++ b/pkgs/by-name/cr/creek/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [
- zig.hook
+ zig
pkg-config
wayland-scanner
];
diff --git a/pkgs/by-name/dt/dt-schema/package.nix b/pkgs/by-name/dt/dt-schema/package.nix
index 098f74517f05..446e47f7b9ef 100644
--- a/pkgs/by-name/dt/dt-schema/package.nix
+++ b/pkgs/by-name/dt/dt-schema/package.nix
@@ -10,7 +10,6 @@ let
# see https://github.com/devicetree-org/dt-schema/issues/108
jsonschema = super.jsonschema.overridePythonAttrs (old: rec {
version = "4.17.3";
- disabled = self.pythonOlder "3.7";
src = old.src.override {
inherit version;
diff --git a/pkgs/by-name/dt/dt/package.nix b/pkgs/by-name/dt/dt/package.nix
index 3a4e6da36c35..0e1211ca2de3 100644
--- a/pkgs/by-name/dt/dt/package.nix
+++ b/pkgs/by-name/dt/dt/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-pfTlOMJpOPbXZaJJvOKDUyCZxFHNLRRUteJFWT9IKOU=";
};
- nativeBuildInputs = [ zig_0_13.hook ];
+ nativeBuildInputs = [ zig_0_13 ];
passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
diff --git a/pkgs/by-name/ec/ecryptfs/package.nix b/pkgs/by-name/ec/ecryptfs/package.nix
deleted file mode 100644
index e2ca444fcead..000000000000
--- a/pkgs/by-name/ec/ecryptfs/package.nix
+++ /dev/null
@@ -1,107 +0,0 @@
-{
- lib,
- stdenv,
- fetchurl,
- pkg-config,
- perl,
- util-linux,
- keyutils,
- nss,
- nspr,
- python2,
- pam,
- enablePython ? false,
- intltool,
- makeWrapper,
- coreutils,
- bash,
- gettext,
- cryptsetup,
- lvm2,
- rsync,
- which,
- lsof,
- nixosTests,
-}:
-
-stdenv.mkDerivation rec {
- pname = "ecryptfs";
- version = "111";
-
- src = fetchurl {
- url = "https://launchpad.net/ecryptfs/trunk/${version}/+download/ecryptfs-utils_${version}.orig.tar.gz";
- sha256 = "0zwq19siiwf09h7lwa7n7mgmrr8cxifp45lmwgcfr8c1gviv6b0i";
- };
-
- # TODO: replace wrapperDir below with from config.security.wrapperDir;
- wrapperDir = "/run/wrappers/bin";
-
- postPatch = ''
- FILES="$(grep -r '/bin/sh' src/utils -l; find src -name \*.c)"
- for file in $FILES; do
- substituteInPlace "$file" \
- --replace /bin/mount ${util-linux}/bin/mount \
- --replace /bin/umount ${util-linux}/bin/umount \
- --replace /sbin/mount.ecryptfs_private ${wrapperDir}/mount.ecryptfs_private \
- --replace /sbin/umount.ecryptfs_private ${wrapperDir}/umount.ecryptfs_private \
- --replace /sbin/mount.ecryptfs $out/sbin/mount.ecryptfs \
- --replace /sbin/umount.ecryptfs $out/sbin/umount.ecryptfs \
- --replace /usr/bin/ecryptfs-rewrite-file $out/bin/ecryptfs-rewrite-file \
- --replace /usr/bin/ecryptfs-mount-private $out/bin/ecryptfs-mount-private \
- --replace /usr/bin/ecryptfs-setup-private $out/bin/ecryptfs-setup-private \
- --replace /sbin/cryptsetup ${cryptsetup}/sbin/cryptsetup \
- --replace /sbin/dmsetup ${lvm2}/sbin/dmsetup \
- --replace /sbin/unix_chkpwd ${wrapperDir}/unix_chkpwd \
- --replace /bin/bash ${bash}/bin/bash
- done
- '';
-
- configureFlags = [ " --disable-openssl" ] ++ lib.optionals (!enablePython) [ "--disable-pywrap" ];
-
- nativeBuildInputs = [
- pkg-config
- makeWrapper
- intltool
- ]
- # if python2 support is requested, it is needed at builtime as well as runtime.
- ++ lib.optionals enablePython [ python2 ];
- buildInputs = [
- perl
- nss
- nspr
- pam
- ]
- ++ lib.optionals enablePython [ python2 ];
- propagatedBuildInputs = [
- coreutils
- gettext
- cryptsetup
- lvm2
- rsync
- keyutils
- which
- ];
-
- postInstall = ''
- FILES="$(grep -r '/bin/sh' $out/bin -l)"
- for file in $FILES; do
- wrapProgram $file \
- --prefix PATH ":" "${coreutils}/bin" \
- --prefix PATH ":" "${gettext}/bin" \
- --prefix PATH ":" "${rsync}/bin" \
- --prefix PATH ":" "${keyutils}/bin" \
- --prefix PATH ":" "${which}/bin" \
- --prefix PATH ":" "${lsof}/bin" \
- --prefix PATH ":" "$out/bin"
- done
- '';
-
- passthru.tests = { inherit (nixosTests) ecryptfs; };
-
- meta = {
- description = "Enterprise-class stacked cryptographic filesystem";
- license = lib.licenses.gpl2Plus;
- maintainers = with lib.maintainers; [ obadz ];
- platforms = lib.platforms.linux;
- };
-}
diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json
index 1702d1eb7f2a..f4cb61ea6057 100644
--- a/pkgs/by-name/fa/factorio/versions.json
+++ b/pkgs/by-name/fa/factorio/versions.json
@@ -3,14 +3,14 @@
"alpha": {
"experimental": {
"candidateHashFilenames": [
- "factorio_linux_2.0.72.tar.xz"
+ "factorio_linux_2.0.73.tar.xz"
],
- "name": "factorio_alpha_x64-2.0.72.tar.xz",
+ "name": "factorio_alpha_x64-2.0.73.tar.xz",
"needsAuth": true,
- "sha256": "87d9f593569cbdf2f7a160f6a573f4939cbf01206209fbcdbaebf0385c2c7331",
+ "sha256": "68280b39bd01d7647df0cfa0e291d82c8123ffc2d522c8565860f6d52a7673eb",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/2.0.72/alpha/linux64",
- "version": "2.0.72"
+ "url": "https://factorio.com/get-download/2.0.73/alpha/linux64",
+ "version": "2.0.73"
},
"stable": {
"candidateHashFilenames": [
@@ -27,14 +27,14 @@
"demo": {
"experimental": {
"candidateHashFilenames": [
- "factorio-demo_linux_2.0.70.tar.xz"
+ "factorio-demo_linux_2.0.73.tar.xz"
],
- "name": "factorio_demo_x64-2.0.70.tar.xz",
+ "name": "factorio_demo_x64-2.0.73.tar.xz",
"needsAuth": false,
- "sha256": "3be56bbfde644a3a97ab925a1fc2a32f9620e595fa14700bdcfbb127bc528bc8",
+ "sha256": "1c04ab58fe5e47eb83ba984014e355e8edbc7f941f655bad0b1ff0c5e68bd0f2",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/2.0.70/demo/linux64",
- "version": "2.0.70"
+ "url": "https://factorio.com/get-download/2.0.73/demo/linux64",
+ "version": "2.0.73"
},
"stable": {
"candidateHashFilenames": [
@@ -51,14 +51,14 @@
"expansion": {
"experimental": {
"candidateHashFilenames": [
- "factorio-space-age_linux_2.0.72.tar.xz"
+ "factorio-space-age_linux_2.0.73.tar.xz"
],
- "name": "factorio_expansion_x64-2.0.72.tar.xz",
+ "name": "factorio_expansion_x64-2.0.73.tar.xz",
"needsAuth": true,
- "sha256": "9a667dd899ad4c8c410739a1da3a9318b46a5f34ee190e8b75ec22beac708249",
+ "sha256": "85d7223258f0001cd943004f30cb4d4f4c1a05d1f0fd3d19e05bc42c42b0d7a4",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/2.0.72/expansion/linux64",
- "version": "2.0.72"
+ "url": "https://factorio.com/get-download/2.0.73/expansion/linux64",
+ "version": "2.0.73"
},
"stable": {
"candidateHashFilenames": [
@@ -75,15 +75,15 @@
"headless": {
"experimental": {
"candidateHashFilenames": [
- "factorio-headless_linux_2.0.72.tar.xz",
- "factorio_headless_x64_2.0.72.tar.xz"
+ "factorio-headless_linux_2.0.73.tar.xz",
+ "factorio_headless_x64_2.0.73.tar.xz"
],
- "name": "factorio_headless_x64-2.0.72.tar.xz",
+ "name": "factorio_headless_x64-2.0.73.tar.xz",
"needsAuth": false,
- "sha256": "cf3057340dbc9d82bd5161949ae3e7b8fad912ec7ca07b8a3151e0424a5568cd",
+ "sha256": "752025f81b5ec1229919edc869f9c8773db4bb548a90d370f85938236c857d9a",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/2.0.72/headless/linux64",
- "version": "2.0.72"
+ "url": "https://factorio.com/get-download/2.0.73/headless/linux64",
+ "version": "2.0.73"
},
"stable": {
"candidateHashFilenames": [
diff --git a/pkgs/by-name/fa/fancy-cat/package.nix b/pkgs/by-name/fa/fancy-cat/package.nix
index 641b50a7d707..09e69e28712d 100644
--- a/pkgs/by-name/fa/fancy-cat/package.nix
+++ b/pkgs/by-name/fa/fancy-cat/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
patches = [ ./0001-changes.patch ];
nativeBuildInputs = [
- zig_0_14.hook
+ zig_0_14
];
zigBuildFlags = [ "--release=fast" ];
diff --git a/pkgs/by-name/fi/findup/package.nix b/pkgs/by-name/fi/findup/package.nix
index 9f10c1f2130e..0f5fd7506215 100644
--- a/pkgs/by-name/fi/findup/package.nix
+++ b/pkgs/by-name/fi/findup/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-6/rQ4xNfzJQwJgrpvFRuirqlx6fVn7sLXfVRFsG3fUw=";
};
- nativeBuildInputs = [ zig.hook ];
+ nativeBuildInputs = [ zig ];
passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
diff --git a/pkgs/by-name/fo/foomatic-db/package.nix b/pkgs/by-name/fo/foomatic-db/package.nix
index 685f649bb756..0fd0492f58a9 100644
--- a/pkgs/by-name/fo/foomatic-db/package.nix
+++ b/pkgs/by-name/fo/foomatic-db/package.nix
@@ -14,15 +14,15 @@
stdenv.mkDerivation (finalAttrs: {
pname = "foomatic-db";
- version = "0-unstable-2025-11-22";
+ version = "0-unstable-2026-01-13";
src = fetchFromGitHub {
# there is also a daily snapshot at the `downloadPage`,
# but it gets deleted quickly and would provoke 404 errors
owner = "OpenPrinting";
repo = "foomatic-db";
- rev = "d4774d0c39bcdf970ccb335452f48d9241ec1f71";
- hash = "sha256-r2Lb7qUoaBI1c/RVOvTuue8UkFnUbUKfBjB93qaC1pQ=";
+ rev = "abdfdb89a56edb0d1b7e0de2e01ce30cd0dbed22";
+ hash = "sha256-D0ULsTIVv7rJWdgK9EqH7visZoJONc8zGsV0r1uVNKE=";
};
buildInputs = [
diff --git a/pkgs/by-name/fs/fstar/z3/default.nix b/pkgs/by-name/fs/fstar/z3/default.nix
index e4973e669ac4..33d200e8c854 100644
--- a/pkgs/by-name/fs/fstar/z3/default.nix
+++ b/pkgs/by-name/fs/fstar/z3/default.nix
@@ -98,11 +98,9 @@ stdenvNoCC.mkDerivation {
ln -s ${lib.getExe fstarOldZ3} $out/bin/z3-${lib.escapeShellArg fstarOldZ3.version}
'';
- passthru = rec {
- new = fstarNewZ3;
- "z3_${lib.replaceStrings [ "." ] [ "_" ] fstarNewZ3.version}" = new;
+ passthru = {
+ "z3_${lib.replaceStrings [ "." ] [ "_" ] fstarNewZ3.version}" = fstarNewZ3;
- old = fstarOldZ3;
- "z3_${lib.replaceStrings [ "." ] [ "_" ] fstarOldZ3.version}" = old;
+ "z3_${lib.replaceStrings [ "." ] [ "_" ] fstarOldZ3.version}" = fstarOldZ3;
};
}
diff --git a/pkgs/by-name/gd/gdtoolkit_4/package.nix b/pkgs/by-name/gd/gdtoolkit_4/package.nix
index 23eabade70f8..253f4a131d93 100644
--- a/pkgs/by-name/gd/gdtoolkit_4/package.nix
+++ b/pkgs/by-name/gd/gdtoolkit_4/package.nix
@@ -37,8 +37,6 @@ python.pkgs.buildPythonApplication rec {
hash = "sha256-Jam7Txm+Fq5zEkJZMmbWW5Ok4ThsPyi6NIeawQot0RE=";
};
- disabled = python.pythonOlder "3.7";
-
propagatedBuildInputs = with python.pkgs; [
docopt
lark
diff --git a/pkgs/by-name/gh/ghostty/package.nix b/pkgs/by-name/gh/ghostty/package.nix
index b08023c70e1c..2baa4e26ffc2 100644
--- a/pkgs/by-name/gh/ghostty/package.nix
+++ b/pkgs/by-name/gh/ghostty/package.nix
@@ -24,8 +24,7 @@
wrapGAppsHook4,
zig_0_14,
- # Usually you would override `zig.hook` with this, but we do that internally
- # since upstream recommends a non-default level
+ # Upstream recommends a non-default level
# https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/PACKAGING.md#build-options
optimizeLevel ? "ReleaseFast",
}:
diff --git a/pkgs/by-name/gi/git-wt/package.nix b/pkgs/by-name/gi/git-wt/package.nix
index 3172e9624534..8759dae9adda 100644
--- a/pkgs/by-name/gi/git-wt/package.nix
+++ b/pkgs/by-name/gi/git-wt/package.nix
@@ -7,13 +7,13 @@
buildGoModule (finalAttrs: {
pname = "git-wt";
- version = "0.13.0";
+ version = "0.13.1";
src = fetchFromGitHub {
owner = "k1LoW";
repo = "git-wt";
tag = "v${finalAttrs.version}";
- hash = "sha256-513y6uB32ln1k3N4f8L2ph6sf2/1tLfLSO+4kEc4nB8=";
+ hash = "sha256-uyvLbWsDN2ZxPzkLqHM782L/YyfarOgd8jDfmjtLNRY=";
};
vendorHash = "sha256-K5geAvG+mvnKeixOyZt0C1T5ojSBFmx2K/Msol0HsSg=";
diff --git a/pkgs/by-name/gl/glsl_analyzer/package.nix b/pkgs/by-name/gl/glsl_analyzer/package.nix
index 0b53a622d192..86d6f4d25a5b 100644
--- a/pkgs/by-name/gl/glsl_analyzer/package.nix
+++ b/pkgs/by-name/gl/glsl_analyzer/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
};
nativeBuildInputs = [
- zig.hook
+ zig
];
postPatch = ''
diff --git a/pkgs/by-name/go/gorilla-cli/package.nix b/pkgs/by-name/go/gorilla-cli/package.nix
index 589f33e292e7..e42282b668bb 100644
--- a/pkgs/by-name/go/gorilla-cli/package.nix
+++ b/pkgs/by-name/go/gorilla-cli/package.nix
@@ -5,7 +5,7 @@
nix-update-script,
}:
-python3.pkgs.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "gorilla-cli";
version = "0.0.9";
pyproject = true;
@@ -13,13 +13,11 @@ python3.pkgs.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "gorilla-llm";
repo = "gorilla-cli";
- rev = version;
+ tag = finalAttrs.version;
hash = "sha256-3h3QtBDKswTDL7zNM2C4VWiGCqknm/bxhP9sw4ieIcQ=";
};
- build-system = with python3.pkgs; [
- setuptools
- ];
+ build-system = with python3.pkgs; [ setuptools ];
dependencies = with python3.pkgs; [
requests
@@ -35,9 +33,9 @@ python3.pkgs.buildPythonApplication rec {
meta = {
description = "LLMs for your CLI";
homepage = "https://github.com/gorilla-llm/gorilla-cli";
- changelog = "https://github.com/gorilla-llm/gorilla-cli/releases/tag/${version}";
+ changelog = "https://github.com/gorilla-llm/gorilla-cli/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ happysalada ];
mainProgram = "gorilla";
};
-}
+})
diff --git a/pkgs/by-name/go/goverlay/package.nix b/pkgs/by-name/go/goverlay/package.nix
index e3a8fbc13694..3702638479a4 100644
--- a/pkgs/by-name/go/goverlay/package.nix
+++ b/pkgs/by-name/go/goverlay/package.nix
@@ -24,13 +24,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "goverlay";
- version = "1.6.8";
+ version = "1.7.0";
src = fetchFromGitHub {
owner = "benjamimgois";
repo = "goverlay";
tag = finalAttrs.version;
- hash = "sha256-88Ev83onTrtH+xPu11RNTZN4pCsWJ+eTJc6J2XTN7Z4=";
+ hash = "sha256-xfc+ht1piVnjXK+hxHKbhdpp63p/DMLPSzvJq+mYhFs=";
};
outputs = [
diff --git a/pkgs/by-name/ha/hamrs-pro/package.nix b/pkgs/by-name/ha/hamrs-pro/package.nix
index bb5f488f3dad..7511c63418ae 100644
--- a/pkgs/by-name/ha/hamrs-pro/package.nix
+++ b/pkgs/by-name/ha/hamrs-pro/package.nix
@@ -8,29 +8,29 @@
let
pname = "hamrs-pro";
- version = "2.45.0";
+ version = "2.47.0";
throwSystem = throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}";
srcs = {
x86_64-linux = fetchurl {
url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-linux-x86_64.AppImage";
- hash = "sha256-XnG0hOjngq1lJEfw1JivsHfUhwaTaXDMP5HPJrPNHc4=";
+ hash = "sha256-TFiU3bbDm3NpjfOJcbzp9Rpyn2YkvZYTf25vgOwlCvE=";
};
aarch64-linux = fetchurl {
url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-linux-arm64.AppImage";
- hash = "sha256-cNanQy2OYX5v20pD5UOwjS1/aBCXCMeuXkhNnYJCXxk=";
+ hash = "sha256-AH93E5WCIffEshtPiy6Yq9f1DLc2w9o9f6KcnYP5EI0=";
};
x86_64-darwin = fetchurl {
url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-mac-x64.dmg";
- hash = "sha256-//diABsf82kg5u5NjT6r5soo+dAxMe5QNGLdDAUJJ6w=";
+ hash = "sha256-/tEaRfviWGxvSP/TsR3ZOa3FFOqxdV2uwhg1TNSsTxU=";
};
aarch64-darwin = fetchurl {
url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-mac-arm64.dmg";
- hash = "sha256-ljRB2XqiIWl/uIAi74F4/xQ8qPnPl8Iriu0rwe9JXLA=";
+ hash = "sha256-MXz5d1GeXeoOG29FxecXGunSFwRSVbFf1dozsAhTzE0=";
};
};
diff --git a/pkgs/by-name/he/hevi/package.nix b/pkgs/by-name/he/hevi/package.nix
index 9e30696da500..91c72dda0583 100644
--- a/pkgs/by-name/he/hevi/package.nix
+++ b/pkgs/by-name/he/hevi/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
};
nativeBuildInputs = [
- zig.hook
+ zig
];
postPatch = ''
diff --git a/pkgs/by-name/im/impression/package.nix b/pkgs/by-name/im/impression/package.nix
index ec7f3858a8c8..41013ce31dd3 100644
--- a/pkgs/by-name/im/impression/package.nix
+++ b/pkgs/by-name/im/impression/package.nix
@@ -24,18 +24,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "impression";
- version = "3.5.5";
+ version = "3.6.0";
src = fetchFromGitLab {
owner = "adhami3310";
repo = "Impression";
tag = "v${finalAttrs.version}";
- hash = "sha256-ldWINEU4ne15neinuPhs90X2bTkg44xcalyEW0g6TdA=";
+ hash = "sha256-jxfleGDIetTxh0YltKYz2KYE00opwZb+rnaR76beGWA=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
- hash = "sha256-QjGtPA2RO+0BF/bTlBz8xx8DRO9lRwTOQIgRmZB6Fbs=";
+ hash = "sha256-RR27VE1/8jG2HgeWtIwGsF9HUlI3Kky9J4X6kZnA+kw=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/in/intel-compute-runtime/package.nix b/pkgs/by-name/in/intel-compute-runtime/package.nix
index 4d522c41d229..fd9b87b2c791 100644
--- a/pkgs/by-name/in/intel-compute-runtime/package.nix
+++ b/pkgs/by-name/in/intel-compute-runtime/package.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "intel-compute-runtime";
- version = "25.48.36300.8";
+ version = "26.01.36711.4";
src = fetchFromGitHub {
owner = "intel";
repo = "compute-runtime";
tag = version;
- hash = "sha256-ymXvbDX01WnsQ2pxCnQU1dKhK+/Jzz1m3Tgg665mdcM=";
+ hash = "sha256-77fVA2T6niK2a9i6v6sAR98fHnExbHqRdHexKBkqd7M=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/ju/just-lsp/package.nix b/pkgs/by-name/ju/just-lsp/package.nix
index a3f4bec19cdc..7e05e307a959 100644
--- a/pkgs/by-name/ju/just-lsp/package.nix
+++ b/pkgs/by-name/ju/just-lsp/package.nix
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "just-lsp";
- version = "0.3.1";
+ version = "0.3.2";
src = fetchFromGitHub {
owner = "terror";
repo = "just-lsp";
tag = finalAttrs.version;
- hash = "sha256-43w5kA/rGEt7mZCPWlSzYQAme7YJ4EZ97zHmNiDzZ0c=";
+ hash = "sha256-wcUDzrI8jR8fedwu1Z9eY1NLJytDgZsdVK3ay2q6IbM=";
};
- cargoHash = "sha256-/Y9GCKsam5x1FjWcNxKiwf3LiYRg3SWILWGnuyhptrc=";
+ cargoHash = "sha256-ajZUTE/J0I0jEQebLRw/4lstOQNxe+Nh7HTINN0g5K8=";
passthru = {
updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ka/kanboard/package.nix b/pkgs/by-name/ka/kanboard/package.nix
index 5c0ba4b216e4..f1abc2a49b1f 100644
--- a/pkgs/by-name/ka/kanboard/package.nix
+++ b/pkgs/by-name/ka/kanboard/package.nix
@@ -9,13 +9,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "kanboard";
- version = "1.2.48";
+ version = "1.2.49";
src = fetchFromGitHub {
owner = "kanboard";
repo = "kanboard";
tag = "v${finalAttrs.version}";
- hash = "sha256-qaVQ0urVdy5ADlLY7v9FJB8TSEuuopuX/XUYRzwbgY0=";
+ hash = "sha256-d74XjURu7vJwn+6p/br76jp4zJiYhYJLSjvxLamt48Q=";
};
dontBuild = true;
diff --git a/pkgs/by-name/li/libphonenumber/package.nix b/pkgs/by-name/li/libphonenumber/package.nix
index e334b09f1232..06684e596f7a 100644
--- a/pkgs/by-name/li/libphonenumber/package.nix
+++ b/pkgs/by-name/li/libphonenumber/package.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libphonenumber";
- version = "9.0.21";
+ version = "9.0.22";
src = fetchFromGitHub {
owner = "google";
repo = "libphonenumber";
tag = "v${finalAttrs.version}";
- hash = "sha256-2YiTjudHEKl3JJMF4jV/DpQFZbBEb4z6WZxU+jdGVx0=";
+ hash = "sha256-gQcMpwVf49m/f62ABd7/IluLe8mUjapNtnrPSmaLJJ0=";
};
patches = [
diff --git a/pkgs/by-name/li/libpqxx/package.nix b/pkgs/by-name/li/libpqxx/package.nix
index ad7e333c3f25..4eff4a03f24e 100644
--- a/pkgs/by-name/li/libpqxx/package.nix
+++ b/pkgs/by-name/li/libpqxx/package.nix
@@ -1,12 +1,18 @@
{
lib,
stdenv,
+ gcc14Stdenv,
fetchFromGitHub,
libpq,
python3,
+ postgresql,
+ postgresqlTestHook,
+ autoreconfHook,
}:
-stdenv.mkDerivation (finalAttrs: {
+# Work around issue reported in https://github.com/NixOS/nixpkgs/issues/476278.
+# Should be solved when libpqxx 8.x is released.
+gcc14Stdenv.mkDerivation (finalAttrs: {
pname = "libpqxx";
version = "7.10.5";
@@ -23,6 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
];
nativeBuildInputs = [
+ # Needed because Makefile.am is patched to disable the tools/lint test.
+ autoreconfHook
python3
];
@@ -30,8 +38,19 @@ stdenv.mkDerivation (finalAttrs: {
libpq
];
+ nativeCheckInputs = [
+ postgresql
+ postgresqlTestHook
+ ];
+
postPatch = ''
+ # Disable linting step for tests, it tries to install packages with pip.
+ substituteInPlace Makefile.am \
+ --replace-fail "TESTS = tools/lint" ""
+
patchShebangs ./tools/splitconfig.py
+ # Needed for autoreconfHook
+ patchShebangs tools/*.py
'';
configureFlags = [
@@ -39,6 +58,12 @@ stdenv.mkDerivation (finalAttrs: {
"--enable-shared"
];
+ doCheck = true;
+
+ enableParallelBuilding = true;
+
+ __structuredAttrs = true;
+
strictDeps = true;
meta = {
diff --git a/pkgs/by-name/li/linuxwave/package.nix b/pkgs/by-name/li/linuxwave/package.nix
index 8f7b2d92f14f..328365d834bb 100644
--- a/pkgs/by-name/li/linuxwave/package.nix
+++ b/pkgs/by-name/li/linuxwave/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
installShellFiles
- zig.hook
+ zig
];
postInstall = ''
diff --git a/pkgs/by-name/ls/lsr/package.nix b/pkgs/by-name/ls/lsr/package.nix
index ba458cf30419..01c70c41c696 100644
--- a/pkgs/by-name/ls/lsr/package.nix
+++ b/pkgs/by-name/ls/lsr/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
installShellFiles
- zig.hook
+ zig
];
doInstallCheck = true;
diff --git a/pkgs/by-name/ly/ly/package.nix b/pkgs/by-name/ly/ly/package.nix
index a89eea2df810..d92c7aaefb39 100644
--- a/pkgs/by-name/ly/ly/package.nix
+++ b/pkgs/by-name/ly/ly/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
makeBinaryWrapper
- zig_0_15.hook
+ zig_0_15
];
buildInputs = [
linux-pam
diff --git a/pkgs/by-name/ma/maltego/package.nix b/pkgs/by-name/ma/maltego/package.nix
index 5b2d2cc3d322..da6d9bf30637 100644
--- a/pkgs/by-name/ma/maltego/package.nix
+++ b/pkgs/by-name/ma/maltego/package.nix
@@ -13,11 +13,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "maltego";
- version = "4.11.0";
+ version = "4.11.1";
src = fetchzip {
url = "https://downloads.maltego.com/maltego-v4/linux/Maltego.v${finalAttrs.version}.linux.zip";
- hash = "sha256-+kbQsXIp9BAr6NxleMiGbmvIFWTDJzYQC6vtzYlK39Y=";
+ hash = "sha256-9VDArX8fc4Orh5xCILX7n2teB6cRUABTkCYaStPoa80=";
};
postPatch = ''
diff --git a/pkgs/by-name/me/mepo/package.nix b/pkgs/by-name/me/mepo/package.nix
index 074ba71d7cdb..d2fc9166a9ce 100644
--- a/pkgs/by-name/me/mepo/package.nix
+++ b/pkgs/by-name/me/mepo/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
pkg-config
- zig_0_14.hook
+ zig_0_14
makeWrapper
];
diff --git a/pkgs/by-name/mi/minizign/package.nix b/pkgs/by-name/mi/minizign/package.nix
index 2271e1b57eab..3bab3ac74526 100644
--- a/pkgs/by-name/mi/minizign/package.nix
+++ b/pkgs/by-name/mi/minizign/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
};
nativeBuildInputs = [
- zig.hook
+ zig
];
meta = {
diff --git a/pkgs/by-name/mo/mongoaudit/package.nix b/pkgs/by-name/mo/mongoaudit/package.nix
index b80668bef553..7e30b64c70a5 100644
--- a/pkgs/by-name/mo/mongoaudit/package.nix
+++ b/pkgs/by-name/mo/mongoaudit/package.nix
@@ -4,23 +4,19 @@
python3,
}:
-python3.pkgs.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "mongoaudit";
version = "0.1.1";
pyproject = true;
- disabled = python3.pythonOlder "3.8";
-
src = fetchFromGitHub {
owner = "stampery";
repo = "mongoaudit";
- rev = version;
- sha256 = "17k4vw5d3kr961axl49ywid4cf3n7zxvm885c4lv15w7s2al1425";
+ tag = finalAttrs.version;
+ hash = "sha256-RZBAldCHl7ApYQWhuvs/djhGWuQ+EdpVMCnP0QrfZJ4=";
};
- build-system = with python3.pkgs; [
- setuptools
- ];
+ build-system = with python3.pkgs; [ setuptools ];
dependencies = with python3.pkgs; [
pymongo
@@ -28,19 +24,16 @@ python3.pkgs.buildPythonApplication rec {
urwid
];
- nativeCheckInputs = with python3.pkgs; [
- pytestCheckHook
- ];
+ nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ];
- pythonImportsCheck = [
- "mongoaudit"
- ];
+ pythonImportsCheck = [ "mongoaudit" ];
meta = {
description = "MongoDB auditing and pentesting tool";
homepage = "https://github.com/stampery/mongoaudit";
- license = with lib.licenses; [ mit ];
+ changelog = "https://github.com/stampery/mongoaudit/releases/tag/${finalAttrs.src.tag}";
+ license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
mainProgram = "mongoaudit";
};
-}
+})
diff --git a/pkgs/by-name/mp/mpv-unwrapped/package.nix b/pkgs/by-name/mp/mpv-unwrapped/package.nix
index 52a21ac4a12e..80193dc6af98 100644
--- a/pkgs/by-name/mp/mpv-unwrapped/package.nix
+++ b/pkgs/by-name/mp/mpv-unwrapped/package.nix
@@ -327,6 +327,7 @@ stdenv.mkDerivation (finalAttrs: {
];
mainProgram = "mpv";
maintainers = with lib.maintainers; [
+ colinsane
fpletz
SchweGELBin
];
diff --git a/pkgs/by-name/mu/mutmut/package.nix b/pkgs/by-name/mu/mutmut/package.nix
index 9fcec251b046..3604b653a107 100644
--- a/pkgs/by-name/mu/mutmut/package.nix
+++ b/pkgs/by-name/mu/mutmut/package.nix
@@ -20,8 +20,6 @@ python3Packages.buildPythonApplication rec {
substituteInPlace requirements.txt --replace-fail 'junit-xml==1.8' 'junit-xml==1.9'
'';
- disabled = python3Packages.pythonOlder "3.7";
-
doCheck = false;
build-system = with python3Packages; [ setuptools ];
diff --git a/pkgs/by-name/my/mycelium/package.nix b/pkgs/by-name/my/mycelium/package.nix
index d1dead302c73..a1e7ceccbf27 100644
--- a/pkgs/by-name/my/mycelium/package.nix
+++ b/pkgs/by-name/my/mycelium/package.nix
@@ -10,7 +10,7 @@
rustPlatform.buildRustPackage rec {
pname = "mycelium";
- version = "0.6.1";
+ version = "0.7.1";
sourceRoot = "${src.name}/myceliumd";
@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec {
owner = "threefoldtech";
repo = "mycelium";
rev = "v${version}";
- hash = "sha256-DP6gCTuWraCwprY5C0JlTR1VrOwrOnUMSVxuPSVMjo0=";
+ hash = "sha256-9/9vPUGIEGzbD8uMu3J8uQvNItc7UB4+X21riYjtDD8=";
};
- cargoHash = "sha256-5TyJNYBTULSu886D+vy8YRh50oFBubNZ9KkMu1/PvgU=";
+ cargoHash = "sha256-F8zHaFDOfgTolW1tO4T8QpGaPoN3kehhqKgwv2KouRM=";
nativeBuildInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/nc/ncdu/package.nix b/pkgs/by-name/nc/ncdu/package.nix
index f1cc506086fb..ad12df23228e 100644
--- a/pkgs/by-name/nc/ncdu/package.nix
+++ b/pkgs/by-name/nc/ncdu/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
};
nativeBuildInputs = [
- zig_0_15.hook
+ zig_0_15
installShellFiles
pkg-config
];
diff --git a/pkgs/by-name/ni/nile/package.nix b/pkgs/by-name/ni/nile/package.nix
index fb7a9f744c17..7b4d5854b25c 100644
--- a/pkgs/by-name/ni/nile/package.nix
+++ b/pkgs/by-name/ni/nile/package.nix
@@ -5,24 +5,21 @@
fetchFromGitHub,
}:
-let
- version = "1.1.2";
-in
-python3Packages.buildPythonApplication {
+python3Packages.buildPythonApplication (finalAttrs: {
pname = "nile";
- inherit version;
+ version = "1.1.2";
pyproject = true;
src = fetchFromGitHub {
owner = "imLinguin";
repo = "nile";
- rev = "v${version}";
+ tag = "v${finalAttrs.version}";
hash = "sha256-/C4b8wPKWHGgiheuAN7AvU+KcD5aj5i6KzgFSdTIkNI=";
};
- disabled = python3Packages.pythonOlder "3.8";
+ build-system = with python3Packages; [ setuptools ];
- propagatedBuildInputs = with python3Packages; [
+ dependencies = with python3Packages; [
setuptools
requests
protobuf
@@ -43,14 +40,16 @@ python3Packages.buildPythonApplication {
pythonImportsCheck = [ "nile" ];
- meta = {
- description = "Unofficial Amazon Games client";
- mainProgram = "nile";
- homepage = "https://github.com/imLinguin/nile";
- license = with lib.licenses; [ gpl3 ];
- };
-
passthru.updateScript = gitUpdater {
rev-prefix = "v";
};
-}
+
+ meta = {
+ description = "Unofficial Amazon Games client";
+ homepage = "https://github.com/imLinguin/nile";
+ changelog = "https://github.com/imLinguin/nile/releases/tag/v${finalAttrs.src.tag}";
+ license = lib.licenses.gpl3Only;
+ mainProgram = "nile";
+ maintainers = [ ];
+ };
+})
diff --git a/pkgs/by-name/ni/nimbo/package.nix b/pkgs/by-name/ni/nimbo/package.nix
index 661db2d69d89..e1f974e4f1bf 100644
--- a/pkgs/by-name/ni/nimbo/package.nix
+++ b/pkgs/by-name/ni/nimbo/package.nix
@@ -1,13 +1,13 @@
{
lib,
stdenv,
- python3,
+ awscli,
fetchFromGitHub,
installShellFiles,
- awscli,
+ python3,
}:
-python3.pkgs.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "nimbo";
version = "0.3.0";
format = "setuptools";
@@ -15,33 +15,40 @@ python3.pkgs.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "nimbo-sh";
repo = "nimbo";
- rev = "v${version}";
- sha256 = "YC5T02Sw22Uczufbyts8l99oCQW4lPq0gPMRXCoKsvw=";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-YC5T02Sw22Uczufbyts8l99oCQW4lPq0gPMRXCoKsvw=";
};
- # Rich + Colorama are added in `propagatedBuildInputs`
postPatch = ''
+ # Wrong format specifier in awscli dependency
substituteInPlace setup.py \
- --replace "awscli>=1.19<2.0" "" \
- --replace "colorama==0.4.3" "" \
- --replace "rich>=10.1.0" ""
+ --replace-fail "awscli>=1.19<2.0" "awscli>=1.19,<2.0"
'';
+ pythonRelaxDeps = [
+ "awscli"
+ "colorama"
+ "rich"
+ ];
+
+ build-system = with python3.pkgs; [ setuptools ];
+
nativeBuildInputs = [ installShellFiles ];
- propagatedBuildInputs = with python3.pkgs; [
- setuptools
+ dependencies = with python3.pkgs; [
boto3
- requests
click
- pyyaml
- pydantic
- rich
colorama
+ pydantic
+ pyyaml
+ requests
+ rich
+ setuptools
];
# nimbo tests require an AWS instance
doCheck = false;
+
pythonImportsCheck = [ "nimbo" ];
makeWrapperArgs = [
@@ -51,17 +58,10 @@ python3.pkgs.buildPythonApplication rec {
(lib.makeBinPath [ awscli ])
];
- postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
- installShellCompletion --cmd nimbo \
- --zsh <(_NIMBO_COMPLETE=source_zsh $out/bin/nimbo) \
- --bash <(_NIMBO_COMPLETE=source_bash $out/bin/nimbo) \
- --fish <(_NIMBO_COMPLETE=source_fish $out/bin/nimbo)
- '';
-
meta = {
description = "Run machine learning jobs on AWS with a single command";
homepage = "https://github.com/nimbo-sh/nimbo";
license = lib.licenses.bsl11;
maintainers = with lib.maintainers; [ noreferences ];
};
-}
+})
diff --git a/pkgs/by-name/od/odiff/package.nix b/pkgs/by-name/od/odiff/package.nix
index 60f009609911..9341e8a6fd19 100644
--- a/pkgs/by-name/od/odiff/package.nix
+++ b/pkgs/by-name/od/odiff/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
installShellFiles
- zig.hook
+ zig
nasm
];
diff --git a/pkgs/by-name/of/offpunk/package.nix b/pkgs/by-name/of/offpunk/package.nix
index 462acbcc275e..01c0431ee483 100644
--- a/pkgs/by-name/of/offpunk/package.nix
+++ b/pkgs/by-name/of/offpunk/package.nix
@@ -17,8 +17,6 @@ python3Packages.buildPythonApplication rec {
version = "2.8";
pyproject = true;
- disabled = python3Packages.pythonOlder "3.7";
-
src = fetchFromSourcehut {
owner = "~lioploum";
repo = "offpunk";
diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
index 2eab4fa97557..721ac2a49234 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -138,16 +138,16 @@ in
goBuild (finalAttrs: {
pname = "ollama";
# don't forget to invalidate all hashes each update
- version = "0.13.5";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "ollama";
repo = "ollama";
tag = "v${finalAttrs.version}";
- hash = "sha256-4K1+GE96Uu5w1otSiP69vNDJ03tFvr78VluIEHMzFGQ=";
+ hash = "sha256-hJeEWkIWQHITxzo6VGqkWJHOktBJyVNIEKtUdSPyD24=";
};
- vendorHash = "sha256-NM0vtue0MFrAJCjmpYJ/rPEDWBxWCzBrWDb0MVOhY+Q=";
+ vendorHash = "sha256-WdHAjCD20eLj0d9v1K6VYP8vJ+IZ8BEZ3CciYLLMtxc=";
env =
lib.optionalAttrs enableRocm {
diff --git a/pkgs/by-name/on/oniux/package.nix b/pkgs/by-name/on/oniux/package.nix
index 1d2beb22012f..30ceeb04a62c 100644
--- a/pkgs/by-name/on/oniux/package.nix
+++ b/pkgs/by-name/on/oniux/package.nix
@@ -7,17 +7,17 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "oniux";
- version = "0.6.1";
+ version = "0.7.0";
src = fetchFromGitLab {
domain = "gitlab.torproject.org";
owner = "tpo/core";
repo = "oniux";
tag = "v${finalAttrs.version}";
- hash = "sha256-icrNKF9cGPBZPbaGCj2c8OtdP6A14whPoP39zhs4wlo=";
+ hash = "sha256-MUSLyNKJTLwFxDLglNN9YoX58yBDrtW2Atds/zvnmFY=";
};
- cargoHash = "sha256-juWtf0aX70xJTx9KpXOATyXARhk7aTaveUFN0OPKrbs=";
+ cargoHash = "sha256-MoAjUn6rBiIK3sZDEcJjRZdfFOTSUT4/eeC3ymsQs14=";
nativeBuildInputs = [
perl
diff --git a/pkgs/by-name/op/opencode/bundle.ts b/pkgs/by-name/op/opencode/bundle.ts
deleted file mode 100644
index 768e3e204e21..000000000000
--- a/pkgs/by-name/op/opencode/bundle.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env bun
-
-import solidPlugin from "./node_modules/@opentui/solid/scripts/solid-plugin"
-import fs from "fs"
-
-const version = process.env.OPENCODE_VERSION!
-const channel = process.env.OPENCODE_CHANNEL!
-
-const result = await Bun.build({
- target: "bun",
- outdir: "./dist",
- entrypoints: [
- "./src/index.ts",
- "./src/cli/cmd/tui/worker.ts"
- ],
- plugins: [solidPlugin],
- naming: {
- entry: "[dir]/[name].js"
- },
- define: {
- OPENCODE_VERSION: JSON.stringify(version),
- OPENCODE_CHANNEL: JSON.stringify(channel),
- },
- external: [
- "@opentui/core-*",
- ],
-})
-
-if (!result.success) {
- console.error("Bundle failed:", result.logs)
- process.exit(1)
-}
-
-// Move worker file to worker.ts at the dist root so the code can find it
-if (fs.existsSync("./dist/cli/cmd/tui/worker.js")) {
- fs.renameSync("./dist/cli/cmd/tui/worker.js", "./dist/worker.ts")
- fs.rmdirSync("./dist/cli/cmd/tui", { recursive: true })
-}
diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index fe31e9ff9243..cab871206cbb 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -8,8 +8,8 @@
models-dev,
nix-update-script,
ripgrep,
- testers,
installShellFiles,
+ versionCheckHook,
writableTmpDirAsHomeHook,
}:
let
@@ -19,7 +19,7 @@ let
owner = "anomalyco";
repo = "opencode";
tag = "v${version}";
- hash = "sha256-B0NkJ4HSxgdjBuydvjcNcoaW5WIYcuKV8qHYapAaDmU=";
+ hash = "sha256-uNeje6WZ/FJVOtxdTdWXbWhPl7BwMws+7/Iz2Hz/stw=";
};
node_modules = stdenvNoCC.mkDerivation {
@@ -41,20 +41,15 @@ let
buildPhase = ''
runHook preBuild
- export BUN_INSTALL_CACHE_DIR=$(mktemp -d)
-
bun install \
--cpu="*" \
- --filter=./packages/opencode \
- --force \
--frozen-lockfile \
--ignore-scripts \
--no-progress \
- --os="*" \
- --production
+ --os="*"
- bun run ./nix/scripts/canonicalize-node-modules.ts
- bun run ./nix/scripts/normalize-bun-binaries.ts
+ bun --bun ./nix/scripts/canonicalize-node-modules.ts
+ bun --bun ./nix/scripts/normalize-bun-binaries.ts
runHook postBuild
'';
@@ -71,7 +66,7 @@ let
# NOTE: Required else we get errors that our fixed-output derivation references store paths
dontFixup = true;
- outputHash = "sha256-vRIWQt02VljcoYG3mwJy8uCihSTB/OLypyw+vt8LuL8=";
+ outputHash = "sha256-OJ3C4RMzfbbG1Fwa/5yru0rlISj+28UPITMNBEU5AeM=";
outputHashAlgo = "sha256";
outputHashMode = "recursive";
};
@@ -95,37 +90,38 @@ stdenvNoCC.mkDerivation (finalAttrs: {
patches = [
# NOTE: Relax Bun version check to be a warning instead of an error
./relax-bun-version-check.patch
+ # NOTE: Remove special and windows build targes
+ ./remove-special-and-windows-build-targets.patch
];
- dontConfigure = true;
+ configurePhase = ''
+ runHook preConfigure
+
+ cp -R ${node_modules}/. .
+
+ runHook postConfigure
+ '';
env.MODELS_DEV_API_JSON = "${models-dev}/dist/_api.json";
env.OPENCODE_VERSION = finalAttrs.version;
env.OPENCODE_CHANNEL = "stable";
+ preBuild = ''
+ chmod -R u+w ./packages/opencode/node_modules
+ pushd ./packages/opencode/node_modules/@opentui/
+ for pkg in ../../../../node_modules/.bun/@opentui+core-*; do
+ linkName=$(basename "$pkg" | sed 's/@.*+\(.*\)@.*/\1/')
+ ln -sf "$pkg/node_modules/@opentui/$linkName" "$linkName"
+ done
+ popd
+ '';
+
buildPhase = ''
runHook preBuild
- # Copy all node_modules including the .bun directory with actual packages
- cp -r ${finalAttrs.node_modules}/node_modules .
- cp -r ${finalAttrs.node_modules}/packages .
-
- (
- cd packages/opencode
-
- # Fix symlinks to workspace packages
- chmod -R u+w ./node_modules
- mkdir -p ./node_modules/@opencode-ai
- rm -f ./node_modules/@opencode-ai/{script,sdk,plugin}
- ln -s $(pwd)/../../packages/script ./node_modules/@opencode-ai/script
- ln -s $(pwd)/../../packages/sdk/js ./node_modules/@opencode-ai/sdk
- ln -s $(pwd)/../../packages/plugin ./node_modules/@opencode-ai/plugin
-
- # Use upstream bundle.ts for Nix-compatible bundling
- cp ../../nix/bundle.ts ./bundle.ts
- chmod +x ./bundle.ts
- bun run ./bundle.ts
- )
+ cd ./packages/opencode
+ bun --bun ./script/build.ts --single --skip-install
+ bun --bun ./script/schema.ts schema.json
runHook postBuild
'';
@@ -133,93 +129,37 @@ stdenvNoCC.mkDerivation (finalAttrs: {
installPhase = ''
runHook preInstall
- cd packages/opencode
- if [ ! -d dist ]; then
- echo "ERROR: dist directory missing after bundle step"
- exit 1
- fi
-
- mkdir -p $out/lib/opencode
- cp -r dist $out/lib/opencode/
- chmod -R u+w $out/lib/opencode/dist
-
- # Select bundled worker assets deterministically (sorted find output)
- worker_file=$(find "$out/lib/opencode/dist" -type f \( -path '*/tui/worker.*' -o -name 'worker.*' \) | sort | head -n1)
- parser_worker_file=$(find "$out/lib/opencode/dist" -type f -name 'parser.worker.*' | sort | head -n1)
- if [ -z "$worker_file" ]; then
- echo "ERROR: bundled worker not found"
- exit 1
- fi
-
- main_wasm=$(printf '%s\n' "$out"/lib/opencode/dist/tree-sitter-*.wasm | sort | head -n1)
- wasm_list=$(find "$out/lib/opencode/dist" -maxdepth 1 -name 'tree-sitter-*.wasm' -print)
- for patch_file in "$worker_file" "$parser_worker_file"; do
- [ -z "$patch_file" ] && continue
- [ ! -f "$patch_file" ] && continue
- if [ -n "$wasm_list" ] && grep -q 'tree-sitter' "$patch_file"; then
- # Rewrite wasm references to absolute store paths to avoid runtime resolve failures.
- bun --bun ../../nix/scripts/patch-wasm.ts "$patch_file" "$main_wasm" $wasm_list
- fi
- done
-
- mkdir -p $out/lib/opencode/node_modules
- cp -r ../../node_modules/.bun $out/lib/opencode/node_modules/
- mkdir -p $out/lib/opencode/node_modules/@opentui
-
- # Generate and install JSON schema
- mkdir -p $out/share/opencode
- HOME=$TMPDIR bun --bun script/schema.ts $out/share/opencode/schema.json
-
- mkdir -p $out/bin
- makeWrapper ${lib.getExe bun} $out/bin/opencode \
- --add-flags "run" \
- --add-flags "$out/lib/opencode/dist/src/index.js" \
- --prefix PATH : ${
- lib.makeBinPath [
- fzf
- ripgrep
- ]
- } \
- --argv0 opencode
+ install -Dm755 dist/opencode-*/bin/opencode $out/bin/opencode
+ install -Dm644 schema.json $out/share/opencode/schema.json
runHook postInstall
'';
- postInstall = ''
- # Add symlinks for platform-specific native modules
- pkgs=(
- $out/lib/opencode/node_modules/.bun/@opentui+core-*
- $out/lib/opencode/node_modules/.bun/@opentui+solid-*
- $out/lib/opencode/node_modules/.bun/@opentui+core@*
- $out/lib/opencode/node_modules/.bun/@opentui+solid@*
- )
- for pkg in "''${pkgs[@]}"; do
- if [ -d "$pkg" ]; then
- pkgName=$(basename "$pkg" | sed 's/@opentui+\([^@]*\)@.*/\1/')
- ln -sf ../.bun/$(basename "$pkg")/node_modules/@opentui/$pkgName \
- $out/lib/opencode/node_modules/@opentui/$pkgName
- fi
- done
-
- ${lib.optionalString
- (
- (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform)
- && (stdenvNoCC.hostPlatform.system != "x86_64-darwin")
- )
- ''
- installShellCompletion --cmd opencode \
- --bash <($out/bin/opencode completion)
- ''
- }
+ postInstall = lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) ''
+ installShellCompletion --cmd opencode \
+ --bash <($out/bin/opencode completion)
'';
+ postFixup = ''
+ wrapProgram $out/bin/opencode \
+ --prefix PATH : ${
+ lib.makeBinPath [
+ fzf
+ ripgrep
+ ]
+ }
+ '';
+
+ nativeInstallCheckInputs = [
+ versionCheckHook
+ writableTmpDirAsHomeHook
+ ];
+ doInstallCheck = true;
+ versionCheckKeepEnvironment = [ "HOME" ];
+ versionCheckProgramArg = "--version";
+
passthru = {
jsonschema = "${placeholder "out"}/share/opencode/schema.json";
- tests.version = testers.testVersion {
- package = finalAttrs.finalPackage;
- command = "HOME=$(mktemp -d) opencode --version";
- inherit (finalAttrs) version;
- };
updateScript = nix-update-script {
extraArgs = [
"--subpackage"
@@ -230,11 +170,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
meta = {
description = "AI coding agent built for the terminal";
- longDescription = ''
- OpenCode is a terminal-based agent that can build anything.
- It combines a TypeScript/JavaScript core with a Go-based TUI
- to provide an interactive AI coding experience.
- '';
homepage = "https://github.com/anomalyco/opencode";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ delafthi ];
diff --git a/pkgs/by-name/op/opencode/remove-special-and-windows-build-targets.patch b/pkgs/by-name/op/opencode/remove-special-and-windows-build-targets.patch
new file mode 100644
index 000000000000..50f5601f334a
--- /dev/null
+++ b/pkgs/by-name/op/opencode/remove-special-and-windows-build-targets.patch
@@ -0,0 +1,100 @@
+From 4d0a82e8f3cf8bf011e2592677db4aa31b6b290b Mon Sep 17 00:00:00 2001
+From: Thierry Delafontaine
+Date: Sun, 4 Jan 2026 20:55:49 +0100
+Subject: [PATCH] Remove special and windows build targets
+
+---
+ packages/opencode/script/build.ts | 70 +++++++++++++++----------------
+ 1 file changed, 35 insertions(+), 35 deletions(-)
+
+diff --git a/packages/opencode/script/build.ts b/packages/opencode/script/build.ts
+index f51cb2924..ee3c0e863 100755
+--- a/packages/opencode/script/build.ts
++++ b/packages/opencode/script/build.ts
+@@ -33,27 +33,27 @@ const allTargets: {
+ os: "linux",
+ arch: "x64",
+ },
+- {
+- os: "linux",
+- arch: "x64",
+- avx2: false,
+- },
+- {
+- os: "linux",
+- arch: "arm64",
+- abi: "musl",
+- },
+- {
+- os: "linux",
+- arch: "x64",
+- abi: "musl",
+- },
+- {
+- os: "linux",
+- arch: "x64",
+- abi: "musl",
+- avx2: false,
+- },
++ // {
++ // os: "linux",
++ // arch: "x64",
++ // avx2: false,
++ // },
++ // {
++ // os: "linux",
++ // arch: "arm64",
++ // abi: "musl",
++ // },
++ // {
++ // os: "linux",
++ // arch: "x64",
++ // abi: "musl",
++ // },
++ // {
++ // os: "linux",
++ // arch: "x64",
++ // abi: "musl",
++ // avx2: false,
++ // },
+ {
+ os: "darwin",
+ arch: "arm64",
+@@ -62,20 +62,20 @@ const allTargets: {
+ os: "darwin",
+ arch: "x64",
+ },
+- {
+- os: "darwin",
+- arch: "x64",
+- avx2: false,
+- },
+- {
+- os: "win32",
+- arch: "x64",
+- },
+- {
+- os: "win32",
+- arch: "x64",
+- avx2: false,
+- },
++ // {
++ // os: "darwin",
++ // arch: "x64",
++ // avx2: false,
++ // },
++ // {
++ // os: "win32",
++ // arch: "x64",
++ // },
++ // {
++ // os: "win32",
++ // arch: "x64",
++ // avx2: false,
++ // },
+ ]
+
+ const targets = singleFlag
+--
+2.52.0
+
diff --git a/pkgs/by-name/ou/outfieldr/package.nix b/pkgs/by-name/ou/outfieldr/package.nix
index 569c2a8180e2..08f2a011a238 100644
--- a/pkgs/by-name/ou/outfieldr/package.nix
+++ b/pkgs/by-name/ou/outfieldr/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
};
nativeBuildInputs = [
- zig.hook
+ zig
];
meta = {
diff --git a/pkgs/by-name/pe/peru/package.nix b/pkgs/by-name/pe/peru/package.nix
index 1c632f013ed9..da3e3ea5bdf4 100644
--- a/pkgs/by-name/pe/peru/package.nix
+++ b/pkgs/by-name/pe/peru/package.nix
@@ -4,19 +4,19 @@
python3Packages,
}:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication (finalAttrs: {
pname = "peru";
- version = "1.3.4";
+ version = "1.3.5";
pyproject = true;
src = fetchFromGitHub {
owner = "buildinspace";
repo = "peru";
- rev = version;
- sha256 = "sha256-ubkDB/McG2Tp3s0K5PbL6QpHbpqRLAUSHa7v+u/n6hI=";
+ tag = finalAttrs.version;
+ hash = "sha256-RFf4JWjt5FqM3At0boBNmg4GStLehyxuueA8hCc0sxg=";
};
- build-system = with python3Packages; [ setuptools ];
+ build-system = with python3Packages; [ hatchling ];
dependencies = with python3Packages; [
pyyaml
@@ -29,11 +29,12 @@ python3Packages.buildPythonApplication rec {
pythonImportsCheck = [ "peru" ];
meta = {
- homepage = "https://github.com/buildinspace/peru";
description = "Tool for including other people's code in your projects";
+ homepage = "https://github.com/buildinspace/peru";
+ changelog = "https://github.com/buildinspace/peru/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
+ maintainers = [ ];
platforms = lib.platforms.unix;
mainProgram = "peru";
};
-
-}
+})
diff --git a/pkgs/by-name/po/poop/package.nix b/pkgs/by-name/po/poop/package.nix
index ad25fd8920f1..18fc82adc275 100644
--- a/pkgs/by-name/po/poop/package.nix
+++ b/pkgs/by-name/po/poop/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
};
nativeBuildInputs = [
- zig_0_13.hook
+ zig_0_13
];
meta = {
diff --git a/pkgs/by-name/re/regexploit/package.nix b/pkgs/by-name/re/regexploit/package.nix
index b51ccfa456cd..00afe1b51696 100644
--- a/pkgs/by-name/re/regexploit/package.nix
+++ b/pkgs/by-name/re/regexploit/package.nix
@@ -4,38 +4,31 @@
python3,
}:
-python3.pkgs.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "regexploit";
version = "1.0.0";
pyproject = true;
- disabled = python3.pythonOlder "3.8";
-
src = fetchFromGitHub {
owner = "doyensec";
repo = "regexploit";
- rev = "v${version}";
- sha256 = "0z3fghsyw0ll36in7ihc0qi3gy7mqi6cw1mi8m8c8xb1nlwpfr0y";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-HmR3ObVhdcRQRbEGzkzE9fg3IgYMxmOjGZQC7jV8bnw=";
};
- build-system = with python3.pkgs; [
- setuptools
- ];
+ build-system = with python3.pkgs; [ setuptools ];
- dependencies = with python3.pkgs; [
- pyyaml
- ];
+ dependencies = with python3.pkgs; [ pyyaml ];
- nativeCheckInputs = with python3.pkgs; [
- pytestCheckHook
- ];
+ nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ];
pythonImportsCheck = [ "regexploit" ];
meta = {
description = "Tool to find regular expressions which are vulnerable to ReDoS";
homepage = "https://github.com/doyensec/regexploit";
- license = with lib.licenses; [ asl20 ];
+ changelog = "https://github.com/doyensec/regexploit/releases/tag/v${finalAttrs.src.tag}";
+ license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ fab ];
};
-}
+})
diff --git a/pkgs/by-name/re/retool/package.nix b/pkgs/by-name/re/retool/package.nix
index de942afff097..664862da8380 100644
--- a/pkgs/by-name/re/retool/package.nix
+++ b/pkgs/by-name/re/retool/package.nix
@@ -6,27 +6,24 @@
qt6,
}:
-python3.pkgs.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "retool";
version = "2.4.5";
-
pyproject = true;
- disabled = python3.pkgs.pythonOlder "3.10";
src = fetchFromGitHub {
owner = "unexpectedpanda";
repo = "retool";
- tag = "v${version}";
+ tag = "v${finalAttrs.version}";
hash = "sha256-q1v/VPcKIMGcAtnELKUpVgRGPyMmL8zJr5RdOClCwoc=";
};
- nativeBuildInputs = with python3.pkgs; [
- hatchling
- qt6.wrapQtAppsHook
- ];
-
pythonRelaxDeps = true;
+ build-system = with python3.pkgs; [ hatchling ];
+
+ nativeBuildInputs = [ qt6.wrapQtAppsHook ];
+
buildInputs = [
qt6.qtbase
]
@@ -34,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
qt6.qtwayland
];
- propagatedBuildInputs = with python3.pkgs; [
+ dependencies = with python3.pkgs; [
alive-progress
darkdetect
lxml
@@ -50,8 +47,8 @@ python3.pkgs.buildPythonApplication rec {
meta = {
description = "Better filter tool for Redump and No-Intro dats";
homepage = "https://github.com/unexpectedpanda/retool";
- changelog = "https://github.com/unexpectedpanda/retool/blob/${src.tag}/changelog.md";
+ changelog = "https://github.com/unexpectedpanda/retool/blob/${finalAttrs.src.tag}/changelog.md";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ thiagokokada ];
};
-}
+})
diff --git a/pkgs/by-name/ri/river-bedload/package.nix b/pkgs/by-name/ri/river-bedload/package.nix
index 00ca3732a887..746a0e3dd395 100644
--- a/pkgs/by-name/ri/river-bedload/package.nix
+++ b/pkgs/by-name/ri/river-bedload/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
pkg-config
- zig.hook
+ zig
];
buildInputs = [
diff --git a/pkgs/by-name/ri/river-classic/package.nix b/pkgs/by-name/ri/river-classic/package.nix
index 4fb8c9af942d..4a2960157a7f 100644
--- a/pkgs/by-name/ri/river-classic/package.nix
+++ b/pkgs/by-name/ri/river-classic/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
pkg-config
wayland-scanner
xwayland
- zig_0_15.hook
+ zig_0_15
]
++ lib.optional withManpages scdoc;
diff --git a/pkgs/by-name/ri/river-ultitile/package.nix b/pkgs/by-name/ri/river-ultitile/package.nix
index 83c5c351a7a7..9127515a4977 100644
--- a/pkgs/by-name/ri/river-ultitile/package.nix
+++ b/pkgs/by-name/ri/river-ultitile/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
};
nativeBuildInputs = [
- zig.hook
+ zig
pkg-config
wayland
wayland-scanner
diff --git a/pkgs/by-name/ri/rivercarro/package.nix b/pkgs/by-name/ri/rivercarro/package.nix
index 4e6cc44df1a0..c88e5ec61589 100644
--- a/pkgs/by-name/ri/rivercarro/package.nix
+++ b/pkgs/by-name/ri/rivercarro/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
wayland
wayland-protocols
wayland-scanner
- zig.hook
+ zig
];
postPatch = ''
diff --git a/pkgs/by-name/ro/roslyn/deps.json b/pkgs/by-name/ro/roslyn/deps.json
index 029e5361d178..af798de0b9a9 100644
--- a/pkgs/by-name/ro/roslyn/deps.json
+++ b/pkgs/by-name/ro/roslyn/deps.json
@@ -155,18 +155,6 @@
"hash": "sha256-pfhN5HDSWbo6hmlSnCVWvnkYTqSjs8PNtSyHCEEtUjI=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.threading.analyzers/17.13.2/microsoft.visualstudio.threading.analyzers.17.13.2.nupkg"
},
- {
- "pname": "Microsoft.WindowsDesktop.App.Ref",
- "version": "8.0.22",
- "hash": "sha256-F8DQPfK1IiD8+H8A85QSBHhzJIo1fmAXwXaSge7EhBE=",
- "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.windowsdesktop.app.ref/8.0.22/microsoft.windowsdesktop.app.ref.8.0.22.nupkg"
- },
- {
- "pname": "Microsoft.WindowsDesktop.App.Ref",
- "version": "9.0.11",
- "hash": "sha256-i9M6vgo3DOA04FzxnWIjleUySW7Wy7d5elyUp6tI5OY=",
- "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.windowsdesktop.app.ref/9.0.11/microsoft.windowsdesktop.app.ref.9.0.11.nupkg"
- },
{
"pname": "NETStandard.Library",
"version": "2.0.3",
diff --git a/pkgs/by-name/ro/roslyn/package.nix b/pkgs/by-name/ro/roslyn/package.nix
index f4cb2dce61ba..ff882e15ee4d 100644
--- a/pkgs/by-name/ro/roslyn/package.nix
+++ b/pkgs/by-name/ro/roslyn/package.nix
@@ -47,6 +47,11 @@ buildDotnetModule rec {
--replace-fail "patch" "latestFeature"
'';
+ dotnetFlags = [
+ # this removes the Microsoft.WindowsDesktop.App.Ref dependency
+ "-p:EnableWindowsTargeting=false"
+ ];
+
buildPhase = ''
runHook preBuild
@@ -54,7 +59,8 @@ buildDotnetModule rec {
-p:Configuration=Release \
-p:RepositoryUrl="${meta.homepage}" \
-p:RepositoryCommit="v${version}" \
- src/NuGet/Microsoft.Net.Compilers.Toolset/Framework/Microsoft.Net.Compilers.Toolset.Framework.Package.csproj
+ $dotnetFlags \
+ $dotnetProjectFiles
runHook postBuild
'';
diff --git a/pkgs/by-name/sc/scitokens-cpp/package.nix b/pkgs/by-name/sc/scitokens-cpp/package.nix
index edefd93b6b20..324edc7b1218 100644
--- a/pkgs/by-name/sc/scitokens-cpp/package.nix
+++ b/pkgs/by-name/sc/scitokens-cpp/package.nix
@@ -12,14 +12,14 @@
stdenv.mkDerivation {
pname = "scitokens-cpp";
- version = "1.1.3";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "scitokens";
repo = "scitokens-cpp";
- rev = "v1.1.3";
- hash = "sha256-5EVN/Q4/veNsIdTKcULdKJ+BmRodelfo+CTdrfvkkK8=";
+ rev = "v1.2.0";
+ hash = "sha256-Sc3+g2MMxVnPNI4V/f8Ss8Z3SOQScC9fj8woJDm2O/A=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/sg/sg-323/package.nix b/pkgs/by-name/sg/sg-323/package.nix
index 8299ca0f9aea..4bc66659bc2f 100644
--- a/pkgs/by-name/sg/sg-323/package.nix
+++ b/pkgs/by-name/sg/sg-323/package.nix
@@ -19,14 +19,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "SG-323";
- version = "1.0.1";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "greyboxaudio";
repo = "SG-323";
tag = finalAttrs.version;
fetchSubmodules = true;
- hash = "sha256-DvA9Y7eAG0pWLmHEZmJlo0JLU+0B4c8rlkX1bbVcnL8=";
+ hash = "sha256-yAC4YQt8f5kQ03ECAxvoM9wcqna98F4XKcwUQg6l4E0=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/su/superhtml/package.nix b/pkgs/by-name/su/superhtml/package.nix
index e097b3ff019c..2ade74c68c09 100644
--- a/pkgs/by-name/su/superhtml/package.nix
+++ b/pkgs/by-name/su/superhtml/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
};
nativeBuildInputs = [
- zig.hook
+ zig
];
postPatch = ''
diff --git a/pkgs/by-name/sy/synology-drive-client/package.nix b/pkgs/by-name/sy/synology-drive-client/package.nix
index 6e0d223348db..9991da0558a5 100644
--- a/pkgs/by-name/sy/synology-drive-client/package.nix
+++ b/pkgs/by-name/sy/synology-drive-client/package.nix
@@ -17,7 +17,7 @@
let
pname = "synology-drive-client";
baseUrl = "https://global.synologydownload.com/download/Utility/SynologyDriveClient";
- version = "3.5.1-16101";
+ version = "4.0.1-17885";
buildNumber = lib.last (lib.splitString "-" version);
meta = {
description = "Desktop application to synchronize files and folders between the computer and the Synology Drive server";
@@ -27,6 +27,7 @@ let
maintainers = with lib.maintainers; [
jcouyang
MoritzBoehme
+ nivalux
];
platforms = [
"x86_64-linux"
@@ -37,14 +38,19 @@ let
};
passthru.updateScript = writeScript "update-synology-drive-client" ''
#!/usr/bin/env nix-shell
- #!nix-shell -i bash -p curl common-updater-scripts
+ #!nix-shell -i bash -p curl jq common-updater-scripts
set -eu -o pipefail
- version="$(curl -s https://www.synology.com/en-uk/releaseNote/SynologyDriveClient \
- | grep -oP '(?<=data-version=")(\d.){2}\d-\d{5}' \
- | head -1)"
- update-source-version synology-drive-client "$version"
+ version=$(curl -s "https://www.synology.com/api/releaseNote/findChangeLog?identify=SynologyDriveClient&lang=en-uk" \
+ | jq -r '.info.versions | to_entries | .[0].value.all_versions[0].version')
+
+ if [[ "$version" =~ ^[0-9.]+(-[0-9]+)?$ ]]; then
+ update-source-version synology-drive-client "$version"
+ else
+ echo "Error: Invalid version format: '$version'"
+ exit 1
+ fi
'';
linux = stdenv.mkDerivation {
@@ -57,7 +63,7 @@ let
src = fetchurl {
url = "${baseUrl}/${version}/Ubuntu/Installer/synology-drive-client-${buildNumber}.x86_64.deb";
- sha256 = "sha256-VeS5bPcMM4JDCSH5GXkl4OgQjrPKaNDh5PfX28/zqaU=";
+ sha256 = "sha256-DMHqh8o0RknWTycANSbMpJj133/MZ8uZ18ytDZVaKMg=";
};
nativeBuildInputs = [
@@ -77,6 +83,10 @@ let
mkdir -p $out
dpkg -x $src $out
rm -rf $out/usr/lib/nautilus
+ rm -rf $out/lib/x86_64-linux-gnu/nautilus
+ rm -rf $out/usr/lib/x86_64-linux-gnu/nautilus
+
+ find $out -name "libqpdf.so" -delete
rm -rf $out/opt/Synology/SynologyDrive/package/cloudstation/icon-overlay
'';
@@ -101,7 +111,7 @@ let
src = fetchurl {
url = "${baseUrl}/${version}/Mac/Installer/synology-drive-client-${buildNumber}.dmg";
- sha256 = "sha256-VyhROpQCeVHNxxYgPUZdAlng15aJ1/IYadz30FThlsw=";
+ sha256 = "sha256-0rK7w4/RCv4qml+8XYPwLQmxHen3pB793Co4DvnDVuU=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/tb/tbump/package.nix b/pkgs/by-name/tb/tbump/package.nix
index 820f4b5b3138..7f70ee535ddd 100644
--- a/pkgs/by-name/tb/tbump/package.nix
+++ b/pkgs/by-name/tb/tbump/package.nix
@@ -1,19 +1,22 @@
{
lib,
- fetchPypi,
+ fetchFromGitHub,
+ gitMinimal,
+ gitSetupHook,
python3Packages,
+ writableTmpDirAsHomeHook,
}:
-python3Packages.buildPythonApplication rec {
+
+python3Packages.buildPythonApplication (finalAttrs: {
pname = "tbump";
version = "6.11.0";
pyproject = true;
- disabled = python3Packages.pythonOlder "3.8";
-
- src = fetchPypi {
- inherit version;
- pname = "tbump";
- hash = "sha256-OF5xDu3wqKb/lZzx6fPP0XyHNhcTL8DsX2Ka8MNVyHA=";
+ src = fetchFromGitHub {
+ owner = "your-tools";
+ repo = "tbump";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-+H4C4q+/QlYFgz9hvDZhKtREpa8yN1xLx99odSI3WlY=";
};
pythonRelaxDeps = [ "tomlkit" ];
@@ -29,11 +32,20 @@ python3Packages.buildPythonApplication rec {
cli-ui
];
+ nativeCheckInputs = with python3Packages; [
+ gitMinimal
+ gitSetupHook
+ pytest-mock
+ pytestCheckHook
+ writableTmpDirAsHomeHook
+ ];
+
meta = {
description = "Bump software releases";
homepage = "https://github.com/your-tools/tbump";
+ changelog = "https://github.com/your-tools/tbump/releases/tag/v${finalAttrs.version}";
license = lib.licenses.bsd3;
mainProgram = "tbump";
maintainers = with lib.maintainers; [ slashformotion ];
};
-}
+})
diff --git a/pkgs/by-name/te/tegola/package.nix b/pkgs/by-name/te/tegola/package.nix
index 23f05d771b59..382be621df08 100644
--- a/pkgs/by-name/te/tegola/package.nix
+++ b/pkgs/by-name/te/tegola/package.nix
@@ -51,7 +51,6 @@ buildGoModule {
homepage = "https://www.tegola.io/";
description = "Mapbox Vector Tile server";
mainProgram = "tegola";
- maintainers = with lib.maintainers; [ ingenieroariel ];
teams = [ lib.teams.geospatial ];
license = lib.licenses.mit;
};
diff --git a/pkgs/by-name/tu/tuatara/package.nix b/pkgs/by-name/tu/tuatara/package.nix
index 56fd5d90cf67..b473431a23a5 100644
--- a/pkgs/by-name/tu/tuatara/package.nix
+++ b/pkgs/by-name/tu/tuatara/package.nix
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
strictDeps = true;
- nativeBuildInputs = [ zig_0_13.hook ];
+ nativeBuildInputs = [ zig_0_13 ];
preBuild = ''
export ZIG_LOCAL_CACHE_DIR=$TMPDIR/zig-cache
diff --git a/pkgs/by-name/us/usbrip/package.nix b/pkgs/by-name/us/usbrip/package.nix
index 11e25d1053b6..f7629d99a9ec 100644
--- a/pkgs/by-name/us/usbrip/package.nix
+++ b/pkgs/by-name/us/usbrip/package.nix
@@ -4,7 +4,7 @@
python3,
}:
-python3.pkgs.buildPythonApplication {
+python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "usbrip";
version = "0-unstable-2021-07-02";
pyproject = true;
@@ -13,9 +13,16 @@ python3.pkgs.buildPythonApplication {
owner = "snovvcrash";
repo = "usbrip";
rev = "0f3701607ba13212ebefb4bbd9e68ec0e22d76ac";
- sha256 = "1vws8ybhv7szpqvlbmv0hrkys2fhhaa5bj9dywv3q2y1xmljl0py";
+ hash = "sha256-/gIqae3BCzw29y3JVZSC0AntZ4Zg10U3vl+fDZdHmu8=";
};
+ postPatch = ''
+ # Remove install helpers which we don't need
+ substituteInPlace setup.py \
+ --replace-fail "resolve('wheel')" "" \
+ --replace-fail "'install': LocalInstallCommand," ""
+ '';
+
build-system = with python3.pkgs; [ setuptools ];
dependencies = with python3.pkgs; [
@@ -24,13 +31,6 @@ python3.pkgs.buildPythonApplication {
tqdm
];
- postPatch = ''
- # Remove install helpers which we don't need
- substituteInPlace setup.py \
- --replace-fail "resolve('wheel')" "" \
- --replace-fail "'install': LocalInstallCommand," ""
- '';
-
# Project has no tests
doCheck = false;
@@ -38,10 +38,10 @@ python3.pkgs.buildPythonApplication {
meta = {
description = "Tool to track the history of USB events";
- mainProgram = "usbrip";
homepage = "https://github.com/snovvcrash/usbrip";
- license = with lib.licenses; [ gpl3Plus ];
+ license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ fab ];
+ mainProgram = "usbrip";
platforms = lib.platforms.linux;
};
-}
+})
diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index 5c191539a1d0..f2cd83c041e4 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,16 +18,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "uv";
- version = "0.9.24";
+ version = "0.9.25";
src = fetchFromGitHub {
owner = "astral-sh";
repo = "uv";
tag = finalAttrs.version;
- hash = "sha256-ZgZhEgSzCje7penbL1bgSyt2zu42dar9v9RBQUMv96U=";
+ hash = "sha256-LwfcClkx/apazspYuGJ2wx9wK2/tin9zusSUrqJSmO8=";
};
- cargoHash = "sha256-D00LMdCQ3j5Uguc6aU1TYkSezy35r0+yRtI17HxAX64=";
+ cargoHash = "sha256-9CPxOMFk2lz1UXFN/gvXDLtDlHBkRRs/ayS+UYF06is=";
buildInputs = [
rust-jemalloc-sys
diff --git a/pkgs/by-name/wa/waylock/package.nix b/pkgs/by-name/wa/waylock/package.nix
index 7996b1e15786..3c5e8ccdafe1 100644
--- a/pkgs/by-name/wa/waylock/package.nix
+++ b/pkgs/by-name/wa/waylock/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
pkg-config
scdoc
wayland-scanner
- zig_0_15.hook
+ zig_0_15
];
buildInputs = [
diff --git a/pkgs/by-name/wa/wayprompt/package.nix b/pkgs/by-name/wa/wayprompt/package.nix
index 6079149de5ae..a52ab9091391 100644
--- a/pkgs/by-name/wa/wayprompt/package.nix
+++ b/pkgs/by-name/wa/wayprompt/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
deps = callPackage ./build.zig.zon.nix { };
nativeBuildInputs = [
- zig_0_13.hook
+ zig_0_13
pkg-config
wayland
wayland-scanner
diff --git a/pkgs/by-name/xc/xcat/package.nix b/pkgs/by-name/xc/xcat/package.nix
index cff20eecb07c..bbde932a59f0 100644
--- a/pkgs/by-name/xc/xcat/package.nix
+++ b/pkgs/by-name/xc/xcat/package.nix
@@ -4,24 +4,21 @@
python3,
}:
-python3.pkgs.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "xcat";
version = "1.2.0";
- disabled = python3.pythonOlder "3.7";
pyproject = true;
src = fetchFromGitHub {
owner = "orf";
repo = "xcat";
- rev = "v${version}";
- sha256 = "01r5998gdvqjdrahpk0ci27lx9yghbddlanqcspr3qp5y5930i0s";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-GkQwUvHl4pGvZtgq2tqCz6dOj4gMzAtVbhLv9lBKJQc=";
};
- nativeBuildInputs = with python3.pkgs; [
- poetry-core
- ];
+ build-system = with python3.pkgs; [ poetry-core ];
- propagatedBuildInputs = with python3.pkgs; [
+ dependencies = with python3.pkgs; [
aiodns
aiohttp
appdirs
@@ -34,11 +31,11 @@ python3.pkgs.buildPythonApplication rec {
# Project has no tests
doCheck = false;
+
pythonImportsCheck = [ "xcat" ];
meta = {
description = "XPath injection tool";
- mainProgram = "xcat";
longDescription = ''
xcat is an advanced tool for exploiting XPath injection vulnerabilities,
featuring a comprehensive set of features to read the entire file being
@@ -46,8 +43,9 @@ python3.pkgs.buildPythonApplication rec {
and directories.
'';
homepage = "https://github.com/orf/xcat";
- changelog = "https://github.com/orf/xcat/releases/tag/v${version}";
- license = with lib.licenses; [ mit ];
+ changelog = "https://github.com/orf/xcat/releases/tag/${finalAttrs.src.tag}";
+ license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
+ mainProgram = "xcat";
};
-}
+})
diff --git a/pkgs/by-name/xx/xxh/package.nix b/pkgs/by-name/xx/xxh/package.nix
index 70e6e5b5e098..466b14ab2dac 100644
--- a/pkgs/by-name/xx/xxh/package.nix
+++ b/pkgs/by-name/xx/xxh/package.nix
@@ -5,7 +5,8 @@
openssh,
nixosTests,
}:
-python3.pkgs.buildPythonApplication rec {
+
+python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "xxh";
version = "0.8.14";
pyproject = true;
@@ -13,19 +14,19 @@ python3.pkgs.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "xxh";
repo = "xxh";
- tag = version;
+ tag = finalAttrs.version;
hash = "sha256-Y1yTn0lZemQgWsW9wlW+aNndyTXGo46PCbCl0TGYspQ=";
};
- build-system = [
- python3.pkgs.setuptools
- ];
+ build-system = with python3.pkgs; [ setuptools ];
dependencies = [
- python3.pkgs.pexpect
- python3.pkgs.pyyaml
openssh
- ];
+ ]
+ ++ (with python3.pkgs; [
+ pexpect
+ pyyaml
+ ]);
passthru.tests = {
inherit (nixosTests) xxh;
@@ -34,7 +35,8 @@ python3.pkgs.buildPythonApplication rec {
meta = {
description = "Bring your favorite shell wherever you go through SSH";
homepage = "https://github.com/xxh/xxh";
+ changelog = "https://github.com/xxh/xxh/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [ pasqui23 ];
};
-}
+})
diff --git a/pkgs/by-name/ze/zerobin/package.nix b/pkgs/by-name/ze/zerobin/package.nix
index ba73962d9833..1ff4b914e546 100644
--- a/pkgs/by-name/ze/zerobin/package.nix
+++ b/pkgs/by-name/ze/zerobin/package.nix
@@ -17,8 +17,6 @@ python3Packages.buildPythonApplication rec {
sha256 = "1dfy3h823ylz4w2vv3mrmnmiyvf6rvyvsp4j3llr074w9id0zy16";
};
- disabled = python3Packages.pythonOlder "3.7";
-
nativeBuildInputs = [
python3Packages.doit
python3Packages.pyscss
diff --git a/pkgs/by-name/zi/zig-zlint/package.nix b/pkgs/by-name/zi/zig-zlint/package.nix
index cfce73d35be6..55ced9c402e5 100644
--- a/pkgs/by-name/zi/zig-zlint/package.nix
+++ b/pkgs/by-name/zi/zig-zlint/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
};
nativeBuildInputs = [
- zig_0_14.hook
+ zig_0_14
];
zigBuildFlags = [
diff --git a/pkgs/by-name/zi/zigfetch/package.nix b/pkgs/by-name/zi/zigfetch/package.nix
index 6a94023f9c0f..7b30fbe27fe4 100644
--- a/pkgs/by-name/zi/zigfetch/package.nix
+++ b/pkgs/by-name/zi/zigfetch/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
];
nativeBuildInputs = [
- zig.hook
+ zig
];
buildInputs = [
diff --git a/pkgs/by-name/zi/zigimports/package.nix b/pkgs/by-name/zi/zigimports/package.nix
index 75e40f07299f..4b8b0d5f0a87 100644
--- a/pkgs/by-name/zi/zigimports/package.nix
+++ b/pkgs/by-name/zi/zigimports/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
};
nativeBuildInputs = [
- zig_0_13.hook
+ zig_0_13
];
# Remove the system suffix on the program name.
diff --git a/pkgs/by-name/zo/zon2nix/package.nix b/pkgs/by-name/zo/zon2nix/package.nix
index 1d2bdd9cefe5..bb757978c460 100644
--- a/pkgs/by-name/zo/zon2nix/package.nix
+++ b/pkgs/by-name/zo/zon2nix/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
};
nativeBuildInputs = [
- zig_0_14.hook
+ zig_0_14
];
zigBuildFlags = [
diff --git a/pkgs/by-name/zs/zsnow/package.nix b/pkgs/by-name/zs/zsnow/package.nix
index 253e95081101..61f5488d0e20 100644
--- a/pkgs/by-name/zs/zsnow/package.nix
+++ b/pkgs/by-name/zs/zsnow/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
};
nativeBuildInputs = [
- zig.hook
+ zig
pkg-config
wayland-scanner
];
diff --git a/pkgs/by-name/zt/ztags/package.nix b/pkgs/by-name/zt/ztags/package.nix
index 9113ff02aca3..2c407cb74d6c 100644
--- a/pkgs/by-name/zt/ztags/package.nix
+++ b/pkgs/by-name/zt/ztags/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
scdoc
- zig.hook
+ zig
];
postInstall = ''
diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix
index 44fa0e462b08..715c88951512 100644
--- a/pkgs/desktops/mate/libmateweather/default.nix
+++ b/pkgs/desktops/mate/libmateweather/default.nix
@@ -18,13 +18,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libmateweather";
- version = "1.28.1";
+ version = "1.28.2";
src = fetchFromGitHub {
owner = "mate-desktop";
repo = "libmateweather";
tag = "v${finalAttrs.version}";
- hash = "sha256-W0p4+OMr2sgkQP10DGjZLf2VTSGa2A+5ey+nYBr+HJQ=";
+ hash = "sha256-D9A9zHd0stCV5Lynyb0N9LuenBk1eJa4ZdQcZQf6UpU=";
};
patches = [
diff --git a/pkgs/development/ada-modules/gnatcoll/db.nix b/pkgs/development/ada-modules/gnatcoll/db.nix
index d24791fcf40b..5d9ac5a59e22 100644
--- a/pkgs/development/ada-modules/gnatcoll/db.nix
+++ b/pkgs/development/ada-modules/gnatcoll/db.nix
@@ -49,19 +49,19 @@ let
];
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
+ version = "25.0.0";
# executables don't adhere to the string gnatcoll-* scheme
pname =
if onlyExecutable then
builtins.replaceStrings [ "_" ] [ "-" ] component
else
"gnatcoll-${component}";
- version = "25.0.0";
src = fetchFromGitHub {
owner = "AdaCore";
repo = "gnatcoll-db";
- rev = "v${version}";
+ rev = "v${finalAttrs.version}";
sha256 = "0q35ii0aa4hh59v768l5cilg1b30a4ckcvlbfy0lkcbp3rcfnbz3";
};
@@ -108,4 +108,4 @@ stdenv.mkDerivation rec {
maintainers = [ lib.maintainers.sternenseemann ];
platforms = lib.platforms.all;
};
-}
+})
diff --git a/pkgs/development/compilers/arocc/package.nix b/pkgs/development/compilers/arocc/package.nix
index 5b9766308ae5..0351472a757a 100644
--- a/pkgs/development/compilers/arocc/package.nix
+++ b/pkgs/development/compilers/arocc/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
pname = "arocc";
inherit version src;
- nativeBuildInputs = [ zig.hook ];
+ nativeBuildInputs = [ zig ];
passthru = {
inherit zig;
diff --git a/pkgs/development/compilers/dotnet/packages.nix b/pkgs/development/compilers/dotnet/packages.nix
index d35fd57145b3..ea526b2212a5 100644
--- a/pkgs/development/compilers/dotnet/packages.nix
+++ b/pkgs/development/compilers/dotnet/packages.nix
@@ -32,6 +32,9 @@ let
)
);
inherit (vmr) targetRid releaseManifest;
+ sdkVersion = releaseManifest.sdkVersion;
+ runtimeVersion = releaseManifest.runtimeVersion;
+ aspnetcoreVersion = releaseManifest.aspNetCoreVersion or releaseManifest.runtimeVersion;
# TODO: do this properly
hostRid = targetRid;
@@ -114,9 +117,9 @@ let
];
};
- sdk = mkCommon "sdk" rec {
+ sdk = mkCommon "sdk" {
pname = "${baseName}-sdk";
- version = releaseManifest.sdkVersion;
+ version = sdkVersion;
src = vmr;
dontUnpack = true;
@@ -136,7 +139,7 @@ let
runHook preInstall
mkdir -p "$out"/share
- cp -r "$src"/lib/dotnet-sdk-${version}-${targetRid} "$out"/share/dotnet
+ cp -r "$src"/lib/dotnet-sdk-${sdkVersion}-${targetRid} "$out"/share/dotnet
chmod +w "$out"/share/dotnet
mkdir "$out"/bin
ln -s "$out"/share/dotnet/dotnet "$out"/bin/dotnet
@@ -159,7 +162,10 @@ let
'';
${
- if stdenvNoCC.hostPlatform.isDarwin && lib.versionAtLeast version "10" then "postInstall" else null
+ if stdenvNoCC.hostPlatform.isDarwin && lib.versionAtLeast sdkVersion "10" then
+ "postInstall"
+ else
+ null
} =
''
mkdir -p "$out"/nix-support
@@ -182,9 +188,9 @@ let
};
};
- runtime = mkCommon "runtime" rec {
+ runtime = mkCommon "runtime" {
pname = "${baseName}-runtime";
- version = releaseManifest.runtimeVersion;
+ version = runtimeVersion;
src = vmr;
dontUnpack = true;
@@ -193,7 +199,7 @@ let
runHook preInstall
mkdir -p "$out"/share
- cp -r "$src/lib/dotnet-runtime-${version}-${targetRid}" "$out"/share/dotnet
+ cp -r "$src/lib/dotnet-runtime-${runtimeVersion}-${targetRid}" "$out"/share/dotnet
chmod +w "$out"/share/dotnet
mkdir "$out"/bin
ln -s "$out"/share/dotnet/dotnet "$out"/bin/dotnet
@@ -210,9 +216,9 @@ let
};
};
- aspnetcore = mkCommon "aspnetcore" rec {
+ aspnetcore = mkCommon "aspnetcore" {
pname = "${baseName}-aspnetcore-runtime";
- version = releaseManifest.aspNetCoreVersion or releaseManifest.runtimeVersion;
+ version = aspnetcoreVersion;
src = vmr;
dontUnpack = true;
@@ -226,7 +232,7 @@ let
mkdir "$out"/bin
ln -s "$out"/share/dotnet/dotnet "$out"/bin/dotnet
- cp -Tr "$src/lib/aspnetcore-runtime-${version}-${targetRid}"/shared/Microsoft.AspNetCore.App "$out"/share/dotnet/shared/Microsoft.AspNetCore.App
+ cp -Tr "$src/lib/aspnetcore-runtime-${aspnetcoreVersion}-${targetRid}"/shared/Microsoft.AspNetCore.App "$out"/share/dotnet/shared/Microsoft.AspNetCore.App
chmod +w "$out"/share/dotnet/shared
runHook postInstall
diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix
index 4e976cd73ba8..907ce3cc9869 100644
--- a/pkgs/development/compilers/dotnet/vmr.nix
+++ b/pkgs/development/compilers/dotnet/vmr.nix
@@ -59,10 +59,11 @@ let
_icu = if isDarwin then darwin.ICU else icu;
-in
-stdenv.mkDerivation rec {
- pname = "${baseName}-vmr";
version = release;
+in
+stdenv.mkDerivation {
+ pname = "${baseName}-vmr";
+ inherit version;
# TODO: fix this in the binary sdk packages
preHook = lib.optionalString stdenv.hostPlatform.isDarwin ''
diff --git a/pkgs/development/python-modules/asynctest/default.nix b/pkgs/development/python-modules/asynctest/default.nix
index ffd3c0e7bdbf..62333d77a3a5 100644
--- a/pkgs/development/python-modules/asynctest/default.nix
+++ b/pkgs/development/python-modules/asynctest/default.nix
@@ -2,7 +2,6 @@
lib,
buildPythonPackage,
fetchPypi,
- pythonOlder,
python,
pythonAtLeast,
}:
@@ -26,9 +25,6 @@ buildPythonPackage rec {
--replace "test_events_watched_outside_test_are_ignored" "xtest_events_watched_outside_test_are_ignored"
'';
- # https://github.com/Martiusweb/asynctest/issues/132
- doCheck = pythonOlder "3.7";
-
checkPhase = ''
${python.interpreter} -m unittest test
'';
diff --git a/pkgs/development/python-modules/braq/default.nix b/pkgs/development/python-modules/braq/default.nix
new file mode 100644
index 000000000000..d48f763b5543
--- /dev/null
+++ b/pkgs/development/python-modules/braq/default.nix
@@ -0,0 +1,31 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchPypi,
+ setuptools,
+ pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+ pname = "braq";
+ version = "0.0.12";
+ pyproject = true;
+
+ src = fetchPypi {
+ inherit (finalAttrs) pname version;
+ hash = "sha256-UdrlG4Y8u6LNN9oWPfBrfcUSSQTSwmuSvaVMG95m10s=";
+ };
+
+ build-system = [ setuptools ];
+
+ nativeCheckInputs = [ pytestCheckHook ];
+
+ pythonImportsCheck = [ "braq" ];
+
+ meta = {
+ description = "Section-based human-readable data format";
+ homepage = "https://github.com/pyrustic/braq";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ fab ];
+ };
+})
diff --git a/pkgs/development/python-modules/fipy/default.nix b/pkgs/development/python-modules/fipy/default.nix
index c2dcdd60488d..40d8434a88d3 100644
--- a/pkgs/development/python-modules/fipy/default.nix
+++ b/pkgs/development/python-modules/fipy/default.nix
@@ -15,7 +15,6 @@
openssh,
fetchFromGitHub,
pythonAtLeast,
- pythonOlder,
}:
buildPythonPackage rec {
@@ -26,7 +25,7 @@ buildPythonPackage rec {
# Python 3.12 is not yet supported.
# https://github.com/usnistgov/fipy/issues/997
# https://github.com/usnistgov/fipy/pull/1023
- disabled = pythonOlder "3.7" || pythonAtLeast "3.12";
+ disabled = pythonAtLeast "3.12";
src = fetchFromGitHub {
owner = "usnistgov";
diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index a26b39a41bc1..02270db22de5 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage (finalAttrs: {
pname = "iamdata";
- version = "0.1.202601131";
+ version = "0.1.202601141";
pyproject = true;
src = fetchFromGitHub {
owner = "cloud-copilot";
repo = "iam-data-python";
tag = "v${finalAttrs.version}";
- hash = "sha256-FIsB/t36rnquArxqWGA+wQUzyGsPxhGTaimE1rJALxg=";
+ hash = "sha256-jehKBabFf7aMVViJtThjzgJsH4gmA0wUu6H0ScFxFsw=";
};
__darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/jupyter-server-fileid/default.nix b/pkgs/development/python-modules/jupyter-server-fileid/default.nix
index 7e39775da161..cb61e0d69844 100644
--- a/pkgs/development/python-modules/jupyter-server-fileid/default.nix
+++ b/pkgs/development/python-modules/jupyter-server-fileid/default.nix
@@ -1,7 +1,6 @@
{
lib,
buildPythonPackage,
- pythonOlder,
fetchFromGitHub,
hatchling,
jupyter-events,
@@ -16,8 +15,6 @@ buildPythonPackage rec {
version = "0.9.3";
pyproject = true;
- disables = pythonOlder "3.7";
-
src = fetchFromGitHub {
owner = "jupyter-server";
repo = "jupyter_server_fileid";
diff --git a/pkgs/development/python-modules/kvf/default.nix b/pkgs/development/python-modules/kvf/default.nix
new file mode 100644
index 000000000000..ac333b93f82a
--- /dev/null
+++ b/pkgs/development/python-modules/kvf/default.nix
@@ -0,0 +1,38 @@
+{
+ lib,
+ braq,
+ buildPythonPackage,
+ fetchPypi,
+ paradict,
+ setuptools,
+}:
+
+buildPythonPackage (finalAttrs: {
+ pname = "kvf";
+ version = "0.0.3";
+ pyproject = true;
+
+ src = fetchPypi {
+ inherit (finalAttrs) pname version;
+ hash = "sha256-9IhbG75myMIP2r5c7es8Dl0SpUrElfnl/Pb+0ODFG3M=";
+ };
+
+ build-system = [ setuptools ];
+
+ dependencies = [
+ braq
+ paradict
+ ];
+
+ pythonImportsCheck = [ "kvf" ];
+
+ # Module has no tests
+ doCheck = false;
+
+ meta = {
+ description = "The key-value file format with sections";
+ homepage = "https://pypi.org/project/kvf/";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ fab ];
+ };
+})
diff --git a/pkgs/development/python-modules/lmtpd/default.nix b/pkgs/development/python-modules/lmtpd/default.nix
index 9e50439a0a1f..5f7f89a357c1 100644
--- a/pkgs/development/python-modules/lmtpd/default.nix
+++ b/pkgs/development/python-modules/lmtpd/default.nix
@@ -3,7 +3,6 @@
buildPythonPackage,
fetchPypi,
pythonAtLeast,
- pythonOlder,
setuptools,
}:
@@ -13,7 +12,7 @@ buildPythonPackage rec {
pyproject = true;
# smtpd will be removed in version 3.12
- disabled = pythonOlder "3.7" || pythonAtLeast "3.12";
+ disabled = pythonAtLeast "3.12";
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix
index f993c7a61b00..9d0aa801707e 100644
--- a/pkgs/development/python-modules/mahotas/default.nix
+++ b/pkgs/development/python-modules/mahotas/default.nix
@@ -49,10 +49,11 @@ buildPythonPackage rec {
pythonImportsCheck = [ "mahotas" ];
- disabled = stdenv.hostPlatform.isi686; # Failing tests
-
meta = {
- broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
+ broken =
+ (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64)
+ # Failing tests
+ || stdenv.hostPlatform.isi686;
description = "Computer vision package based on numpy";
homepage = "https://mahotas.readthedocs.io/";
maintainers = with lib.maintainers; [ luispedro ];
diff --git a/pkgs/development/python-modules/manifestoo-core/default.nix b/pkgs/development/python-modules/manifestoo-core/default.nix
index e74437bf5405..1235fef6fb30 100644
--- a/pkgs/development/python-modules/manifestoo-core/default.nix
+++ b/pkgs/development/python-modules/manifestoo-core/default.nix
@@ -1,12 +1,9 @@
{
buildPythonPackage,
- typing-extensions,
fetchPypi,
lib,
nix-update-script,
hatch-vcs,
- pythonOlder,
- importlib-resources,
}:
buildPythonPackage rec {
@@ -22,10 +19,6 @@ buildPythonPackage rec {
nativeBuildInputs = [ hatch-vcs ];
- propagatedBuildInputs =
- lib.optionals (pythonOlder "3.7") [ importlib-resources ]
- ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
-
passthru.updateScript = nix-update-script { };
meta = {
diff --git a/pkgs/development/python-modules/md2pdf/default.nix b/pkgs/development/python-modules/md2pdf/default.nix
index cb866fe9eedb..e3cdf1cfe9b8 100644
--- a/pkgs/development/python-modules/md2pdf/default.nix
+++ b/pkgs/development/python-modules/md2pdf/default.nix
@@ -1,37 +1,40 @@
{
buildPythonPackage,
- docopt,
+ click,
fetchFromGitHub,
+ hatchling,
+ jinja2,
lib,
- markdown2,
+ markdown,
+ pygments,
+ pymdown-extensions,
pytest-cov-stub,
pytestCheckHook,
- setuptools,
+ python-frontmatter,
weasyprint,
}:
buildPythonPackage rec {
pname = "md2pdf";
- version = "1.0.1";
+ version = "2.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "jmaupetit";
repo = "md2pdf";
- tag = version;
- hash = "sha256-9B1vVfcBHk+xdE2Xouu95j3Hp4xm9d5DgPv2zKwCvHY=";
+ tag = "v${version}";
+ hash = "sha256-Do4GW3Z1LmcFSOSCQ0ESztJSrtaNp+2gfci2tDH3+E8=";
};
- postPatch = ''
- substituteInPlace setup.py \
- --replace-fail '"pytest-runner",' ""
- '';
-
- build-system = [ setuptools ];
+ build-system = [ hatchling ];
dependencies = [
- docopt
- markdown2
+ click
+ jinja2
+ markdown
+ pygments
+ pymdown-extensions
+ python-frontmatter
weasyprint
];
@@ -47,7 +50,7 @@ buildPythonPackage rec {
'';
meta = {
- changelog = "https://github.com/jmaupetit/md2pdf/blob/${src.rev}/CHANGELOG.md";
+ changelog = "https://github.com/jmaupetit/md2pdf/blob/${src.tag}/CHANGELOG.md";
description = "Markdown to PDF conversion tool";
homepage = "https://github.com/jmaupetit/md2pdf";
license = lib.licenses.mit;
diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix
index 08be1bf506e2..1c3ba200b8bb 100644
--- a/pkgs/development/python-modules/mezzanine/default.nix
+++ b/pkgs/development/python-modules/mezzanine/default.nix
@@ -14,7 +14,6 @@
pytestCheckHook,
pytest-cov-stub,
pytest-django,
- pythonOlder,
pytz,
requests,
requests-oauthlib,
@@ -28,7 +27,7 @@ buildPythonPackage rec {
version = "6.1.1";
format = "setuptools";
- disabled = pythonOlder "3.7" || isPyPy;
+ disabled = isPyPy;
src = fetchFromGitHub {
owner = "stephenmcd";
diff --git a/pkgs/development/python-modules/mfusepy/default.nix b/pkgs/development/python-modules/mfusepy/default.nix
index 668ec2506ec3..0dcd575fbc81 100644
--- a/pkgs/development/python-modules/mfusepy/default.nix
+++ b/pkgs/development/python-modules/mfusepy/default.nix
@@ -8,7 +8,7 @@
}:
let
- version = "3.0.0";
+ version = "3.1.0";
in
buildPythonPackage {
pname = "mfusepy";
@@ -19,7 +19,7 @@ buildPythonPackage {
owner = "mxmlnkn";
repo = "mfusepy";
tag = "v${version}";
- hash = "sha256-a0F8zcPfKwkYgbXMrLZZ3+kkMfn+ohqoBFa98yNr8uE=";
+ hash = "sha256-HOibpS6lbrIwhdnbML9nLK9XUo8ILDqAp8ZjGiMKYMQ=";
};
# If fuse library path cannot be found, use fuse library path in nixpkgs
diff --git a/pkgs/development/python-modules/mistral-common/default.nix b/pkgs/development/python-modules/mistral-common/default.nix
index 2daf4cf77c13..227ea66cd923 100644
--- a/pkgs/development/python-modules/mistral-common/default.nix
+++ b/pkgs/development/python-modules/mistral-common/default.nix
@@ -33,14 +33,14 @@
buildPythonPackage rec {
pname = "mistral-common";
- version = "1.8.5";
+ version = "1.8.8";
pyproject = true;
src = fetchFromGitHub {
owner = "mistralai";
repo = "mistral-common";
tag = "v${version}";
- hash = "sha256-k0En4QHQGzuUm6kdAyPQhbCrmwX3ay/xJ/ktCxiZIBk=";
+ hash = "sha256-rvW2idAqdCZi7+DsHJXczJKbfceZQ4lQyHScLOqxFIc=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/mlx-lm/default.nix b/pkgs/development/python-modules/mlx-lm/default.nix
index b94e090f8063..1143ebebd08f 100644
--- a/pkgs/development/python-modules/mlx-lm/default.nix
+++ b/pkgs/development/python-modules/mlx-lm/default.nix
@@ -62,13 +62,11 @@ buildPythonPackage (finalAttrs: {
# Requires network access to huggingface.co
"tests/test_datsets.py"
"tests/test_generate.py"
+ "tests/test_prompt_cache.py::TestPromptCache"
"tests/test_server.py"
"tests/test_tokenizers.py"
"tests/test_utils.py::TestUtils::test_convert"
"tests/test_utils.py::TestUtils::test_load"
- "tests/test_prompt_cache.py::TestPromptCache::test_cache_to_quantized"
- "tests/test_prompt_cache.py::TestPromptCache::test_cache_with_generate"
- "tests/test_prompt_cache.py::TestPromptCache::test_trim_cache_with_generate"
# RuntimeError: [metal_kernel] No GPU back-end.
"tests/test_losses.py"
@@ -84,8 +82,5 @@ buildPythonPackage (finalAttrs: {
homepage = "https://github.com/ml-explore/mlx-lm";
changelog = "https://github.com/ml-explore/mlx-lm/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
- platforms = [
- "aarch64-darwin"
- ];
};
})
diff --git a/pkgs/development/python-modules/moocore/default.nix b/pkgs/development/python-modules/moocore/default.nix
index e349a345a300..d83f3ed3ddd8 100644
--- a/pkgs/development/python-modules/moocore/default.nix
+++ b/pkgs/development/python-modules/moocore/default.nix
@@ -16,19 +16,19 @@
writableTmpDirAsHomeHook,
}:
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
pname = "moocore";
- version = "0.1.10";
+ version = "0.2.0";
pyproject = true;
src = fetchFromGitHub {
owner = "multi-objective";
repo = "moocore";
- tag = "v${version}";
- hash = "sha256-ByWQpd2QuagctTeoO5BIyYiI2bSlEPzNht4ciWCCJtM=";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-a0UA06no7pZd+8WQIUUrB5u87T3PoPv7dldBChEh4bw=";
};
- sourceRoot = "${src.name}/python";
+ sourceRoot = "${finalAttrs.src.name}/python";
build-system = [
cffi
@@ -59,4 +59,4 @@ buildPythonPackage rec {
license = lib.licenses.lgpl21Plus;
maintainers = with lib.maintainers; [ GaetanLepage ];
};
-}
+})
diff --git a/pkgs/development/python-modules/notobuilder/default.nix b/pkgs/development/python-modules/notobuilder/default.nix
index d8c65dd778e3..c9fb6b26e16f 100644
--- a/pkgs/development/python-modules/notobuilder/default.nix
+++ b/pkgs/development/python-modules/notobuilder/default.nix
@@ -21,14 +21,14 @@
buildPythonPackage {
pname = "notobuilder";
- version = "0-unstable-2025-09-29";
+ version = "0-unstable-2026-01-09";
pyproject = true;
src = fetchFromGitHub {
owner = "notofonts";
repo = "notobuilder";
- rev = "39cc80d40b046765a46f77771430622d6e11d179";
- hash = "sha256-/miHt4AOjaU1iflsjP5Z3TwBygXcfSllUQAxtiTS5pM=";
+ rev = "424667c0603ecae86424961ad7f8dee97e6b134c";
+ hash = "sha256-FzxYm602w2h58g8D9rk8cJAYWgxMJNMngeWUWnpRfdA=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/objgraph/default.nix b/pkgs/development/python-modules/objgraph/default.nix
index b249f096b331..7188d5daac6d 100644
--- a/pkgs/development/python-modules/objgraph/default.nix
+++ b/pkgs/development/python-modules/objgraph/default.nix
@@ -6,7 +6,6 @@
graphvizPkgs,
isPyPy,
python,
- pythonOlder,
replaceVars,
setuptools,
}:
@@ -16,7 +15,7 @@ buildPythonPackage rec {
version = "3.6.2";
pyproject = true;
- disabled = pythonOlder "3.7" || isPyPy;
+ disabled = isPyPy;
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/ospd/default.nix b/pkgs/development/python-modules/ospd/default.nix
index cffeb4e6cb68..615ff3c2693f 100644
--- a/pkgs/development/python-modules/ospd/default.nix
+++ b/pkgs/development/python-modules/ospd/default.nix
@@ -9,7 +9,6 @@
paramiko,
psutil,
pytestCheckHook,
- pythonOlder,
}:
buildPythonPackage rec {
@@ -17,8 +16,6 @@ buildPythonPackage rec {
version = "21.4.4";
format = "setuptools";
- disabled = pythonOlder "3.7" || stdenv.hostPlatform.isDarwin;
-
src = fetchFromGitHub {
owner = "greenbone";
repo = "ospd";
@@ -44,5 +41,6 @@ buildPythonPackage rec {
changelog = "https://github.com/greenbone/ospd/releases/tag/v${version}";
license = with lib.licenses; [ agpl3Plus ];
maintainers = with lib.maintainers; [ fab ];
+ broken = stdenv.hostPlatform.isDarwin;
};
}
diff --git a/pkgs/development/python-modules/paradict/default.nix b/pkgs/development/python-modules/paradict/default.nix
new file mode 100644
index 000000000000..ee63ce602ea8
--- /dev/null
+++ b/pkgs/development/python-modules/paradict/default.nix
@@ -0,0 +1,31 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchPypi,
+ setuptools,
+ pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+ pname = "paradict";
+ version = "0.0.16";
+ pyproject = true;
+
+ src = fetchPypi {
+ inherit (finalAttrs) pname version;
+ hash = "sha256-2QnRIr9HAopFM06yKA0eG8tAH9qJmGr0LDn9L6353k0=";
+ };
+
+ build-system = [ setuptools ];
+
+ nativeCheckInputs = [ pytestCheckHook ];
+
+ pythonImportsCheck = [ "paradict" ];
+
+ meta = {
+ description = "Streamable multi-format serialization";
+ homepage = "https://pypi.org/project/paradict/";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ fab ];
+ };
+})
diff --git a/pkgs/development/python-modules/probed/default.nix b/pkgs/development/python-modules/probed/default.nix
new file mode 100644
index 000000000000..7cebcf8be184
--- /dev/null
+++ b/pkgs/development/python-modules/probed/default.nix
@@ -0,0 +1,31 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchPypi,
+ setuptools,
+}:
+
+buildPythonPackage (finalAttrs: {
+ pname = "probed";
+ version = "0.0.11";
+ pyproject = true;
+
+ src = fetchPypi {
+ inherit (finalAttrs) pname version;
+ hash = "sha256-LaTMF1pNbXsbqp/LMT9NTWHYYfNr1Su15AB+UXBwAzw=";
+ };
+
+ build-system = [ setuptools ];
+
+ pythonImportsCheck = [ "probed" ];
+
+ #- Module has no tests
+ doCheck = false;
+
+ meta = {
+ description = "Module to check data collections";
+ homepage = "https://github.com/pyrustic/probed";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ fab ];
+ };
+})
diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix
index 5a308bc148bc..e84f991ae68e 100644
--- a/pkgs/development/python-modules/pyodbc/default.nix
+++ b/pkgs/development/python-modules/pyodbc/default.nix
@@ -3,7 +3,6 @@
buildPythonPackage,
fetchPypi,
isPyPy,
- pythonOlder,
unixODBC,
}:
@@ -12,7 +11,7 @@ buildPythonPackage rec {
version = "5.2.0";
format = "setuptools";
- disabled = pythonOlder "3.7" || isPyPy; # use pypypdbc instead
+ disabled = isPyPy; # use pypypdbc instead
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/pyosmium/default.nix b/pkgs/development/python-modules/pyosmium/default.nix
index 2928d134a2c3..7ad9f2b2cc3f 100644
--- a/pkgs/development/python-modules/pyosmium/default.nix
+++ b/pkgs/development/python-modules/pyosmium/default.nix
@@ -10,7 +10,6 @@
bzip2,
zlib,
pybind11,
- pythonOlder,
pytest-httpserver,
pytestCheckHook,
setuptools,
@@ -26,7 +25,7 @@ buildPythonPackage rec {
version = "4.0.2";
pyproject = true;
- disabled = pythonOlder "3.7" || isPyPy;
+ disabled = isPyPy;
src = fetchFromGitHub {
owner = "osmcode";
diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix
index 39bbd1fa3c9c..65046f312226 100644
--- a/pkgs/development/python-modules/pypdf/default.nix
+++ b/pkgs/development/python-modules/pypdf/default.nix
@@ -27,7 +27,7 @@
buildPythonPackage rec {
pname = "pypdf";
- version = "6.4.2";
+ version = "6.6.0";
pyproject = true;
src = fetchFromGitHub {
@@ -36,7 +36,7 @@ buildPythonPackage rec {
tag = version;
# fetch sample files used in tests
fetchSubmodules = true;
- hash = "sha256-GkCNw7XvDPvLIiIUAgXsTLQ2OBbqhpf3xHQZpB/f2ys=";
+ hash = "sha256-C1ZFqqLFtxWOuLUT7KFSfWIE6a9xDPCFtOakzYP4NMY=";
};
outputs = [
diff --git a/pkgs/development/python-modules/pyportainer/default.nix b/pkgs/development/python-modules/pyportainer/default.nix
index b56e7674c12c..d2ef003fab1f 100644
--- a/pkgs/development/python-modules/pyportainer/default.nix
+++ b/pkgs/development/python-modules/pyportainer/default.nix
@@ -13,16 +13,16 @@
yarl,
}:
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
pname = "pyportainer";
- version = "1.0.22";
+ version = "1.0.23";
pyproject = true;
src = fetchFromGitHub {
owner = "erwindouna";
repo = "pyportainer";
- tag = "v${version}";
- hash = "sha256-rbRXrfORFxU0ar4scmAA1Rgaaci5zHSceItTwOOTogQ=";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-bPVAqL25kJ5EsnM7bUA+sqn0Q5uTOuFuKzneviK6078=";
};
build-system = [ hatchling ];
@@ -44,10 +44,10 @@ buildPythonPackage rec {
];
meta = {
- changelog = "https://github.com/erwindouna/pyportainer/releases/tag/${src.tag}";
+ changelog = "https://github.com/erwindouna/pyportainer/releases/tag/${finalAttrs.src.tag}";
description = "Asynchronous Python client for the Portainer API";
homepage = "https://github.com/erwindouna/pyportainer";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.dotlambda ];
};
-}
+})
diff --git a/pkgs/development/python-modules/qingping-ble/default.nix b/pkgs/development/python-modules/qingping-ble/default.nix
index 4cf09f1f7f39..063895928c03 100644
--- a/pkgs/development/python-modules/qingping-ble/default.nix
+++ b/pkgs/development/python-modules/qingping-ble/default.nix
@@ -10,16 +10,16 @@
sensor-state-data,
}:
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
pname = "qingping-ble";
- version = "1.0.1";
+ version = "1.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "bluetooth-devices";
repo = "qingping-ble";
- tag = "v${version}";
- hash = "sha256-YESOD2wdSD9Z7cHgzQq3Dkem0yxerOBsX9rFNEbBZfo=";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-74cTx3BSltrBUjN9qY9NBhXqKwcyitkJr+jf6jbzS+Y=";
};
build-system = [ poetry-core ];
@@ -40,8 +40,8 @@ buildPythonPackage rec {
meta = {
description = "Library for Qingping BLE devices";
homepage = "https://github.com/bluetooth-devices/qingping-ble";
- changelog = "https://github.com/Bluetooth-Devices/qingping-ble/blob/v${version}/CHANGELOG.md";
+ changelog = "https://github.com/Bluetooth-Devices/qingping-ble/blob/v${finalAttrs.version}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
};
-}
+})
diff --git a/pkgs/development/python-modules/raincloudy/default.nix b/pkgs/development/python-modules/raincloudy/default.nix
index 58973cc8a0a0..120ffc25b80f 100644
--- a/pkgs/development/python-modules/raincloudy/default.nix
+++ b/pkgs/development/python-modules/raincloudy/default.nix
@@ -10,7 +10,6 @@
pytest-aiohttp,
pytestCheckHook,
pythonAtLeast,
- pythonOlder,
requests,
requests-mock,
setuptools,
@@ -25,7 +24,7 @@ buildPythonPackage rec {
pypriject = true;
# https://github.com/vanstinator/raincloudy/issues/65
- disabled = pythonOlder "3.7" || pythonAtLeast "3.12";
+ disabled = pythonAtLeast "3.12";
src = fetchFromGitHub {
owner = "vanstinator";
diff --git a/pkgs/development/python-modules/rocketchat-api/default.nix b/pkgs/development/python-modules/rocketchat-api/default.nix
index 2fbbab895ce1..340e71a418e1 100644
--- a/pkgs/development/python-modules/rocketchat-api/default.nix
+++ b/pkgs/development/python-modules/rocketchat-api/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "rocketchat-api";
- version = "1.37.0";
+ version = "2.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "jadolg";
repo = "rocketchat_API";
tag = version;
- hash = "sha256-N0IEPYN3H/KYZuTQZFTGZaDFZseGG1M6Kn5WX29afB8=";
+ hash = "sha256-CIC2pVFN+cN9HCdIHX1VFXJ5eqIgdNXBSmzt/9LH1JE=";
};
build-system = [
diff --git a/pkgs/development/python-modules/shared/default.nix b/pkgs/development/python-modules/shared/default.nix
new file mode 100644
index 000000000000..8cb21e107292
--- /dev/null
+++ b/pkgs/development/python-modules/shared/default.nix
@@ -0,0 +1,43 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchFromGitHub,
+ kvf,
+ paradict,
+ probed,
+ setuptools,
+}:
+
+buildPythonPackage (finalAttrs: {
+ pname = "shared";
+ version = "0.0.9";
+ pyproject = true;
+
+ src = fetchFromGitHub {
+ owner = "pyrustic";
+ repo = "shared";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-roczP6WxpZ1AHjaD7XyjxYgb7hsP8a7hC6A3SYPNobQ=";
+ };
+
+ build-system = [ setuptools ];
+
+ dependencies = [
+ kvf
+ paradict
+ probed
+ ];
+
+ pythonImportsCheck = [ "shared" ];
+
+ # Module has no tests
+ doCheck = false;
+
+ meta = {
+ description = "Data exchange and persistence based on human-readable files";
+ homepage = "https://github.com/pyrustic/shared";
+ changelog = "https://github.com/pyrustic/shared/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ fab ];
+ };
+})
diff --git a/pkgs/development/python-modules/sklearn-compat/default.nix b/pkgs/development/python-modules/sklearn-compat/default.nix
index 7b8bb532d1c5..59da0f123eb9 100644
--- a/pkgs/development/python-modules/sklearn-compat/default.nix
+++ b/pkgs/development/python-modules/sklearn-compat/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "sklearn-compat";
- version = "0.1.4";
+ version = "0.1.5";
pyproject = true;
src = fetchFromGitHub {
owner = "sklearn-compat";
repo = "sklearn-compat";
tag = version;
- hash = "sha256-HTVEmvoXzhcmrJUs5nOXuENORmpc522bCW1rOlMAgxA=";
+ hash = "sha256-7YgNXYm/uMPRRZ1ApHQ8PPyeNBURuwHao5GSXJFCYZ0=";
};
build-system = [
diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix
index f54e7bf9b29a..3b0165fed65a 100644
--- a/pkgs/development/python-modules/sopel/default.nix
+++ b/pkgs/development/python-modules/sopel/default.nix
@@ -10,7 +10,6 @@
praw,
pyenchant,
pytestCheckHook,
- pythonOlder,
pytz,
sqlalchemy,
xmltodict,
@@ -23,7 +22,7 @@ buildPythonPackage rec {
version = "8.0.4";
pyproject = true;
- disabled = isPyPy || pythonOlder "3.7";
+ disabled = isPyPy;
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/soundfile/default.nix b/pkgs/development/python-modules/soundfile/default.nix
index aec21950eed7..a2c86469efd9 100644
--- a/pkgs/development/python-modules/soundfile/default.nix
+++ b/pkgs/development/python-modules/soundfile/default.nix
@@ -15,8 +15,7 @@ buildPythonPackage rec {
pname = "soundfile";
version = "0.13.1";
pyproject = true;
- # https://github.com/bastibe/python-soundfile/issues/157
- disabled = isPyPy || stdenv.hostPlatform.isi686;
+ disabled = isPyPy;
src = fetchPypi {
inherit pname version;
@@ -45,5 +44,7 @@ buildPythonPackage rec {
description = "Audio library based on libsndfile, CFFI and NumPy";
license = lib.licenses.bsd3;
homepage = "https://github.com/bastibe/python-soundfile";
+ # https://github.com/bastibe/python-soundfile/issues/157
+ broken = stdenv.hostPlatform.isi686;
};
}
diff --git a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix
index 6c353ade162f..43d8d212b0d6 100644
--- a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix
@@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "sphinxcontrib-confluencebuilder";
- version = "2.16.0";
+ version = "2.17.1";
pyproject = true;
src = fetchPypi {
pname = "sphinxcontrib_confluencebuilder";
inherit version;
- hash = "sha256-/DAmVxbqFbEuYp0wpJXL/orw8GMDeDkLrXq2XAHTKOA=";
+ hash = "sha256-Cc5ogZn3QpqNsPHyYpyvtMVEnQK+QHO1pSxg3pDrMLM=";
};
build-system = [ flit-core ];
diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index 70a78b461dc2..514b6ceb64be 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage (finalAttrs: {
pname = "tencentcloud-sdk-python";
- version = "3.1.30";
+ version = "3.1.31";
pyproject = true;
src = fetchFromGitHub {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
tag = finalAttrs.version;
- hash = "sha256-W5/rrDxlLJHYGZxq5pPSPlxuUXV7JqCzJRjxec/piAU=";
+ hash = "sha256-JcWKoSN92QQdvCkhuSexMwYEr+boanOAyviFuMf2bmo=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index d4d8e8fa85c5..75cd0d771d71 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -329,8 +329,10 @@ let
jsoncpp
libjpeg_turbo
libpng
- (pybind11.overridePythonAttrs (_: {
- inherit stdenv;
+ (pybind11.override (prev: {
+ buildPythonPackage = prev.buildPythonPackage.override {
+ inherit stdenv;
+ };
}))
snappy-cpp
sqlite
diff --git a/pkgs/development/python-modules/tzdata/default.nix b/pkgs/development/python-modules/tzdata/default.nix
index e489e3e4c41c..7989a6016e12 100644
--- a/pkgs/development/python-modules/tzdata/default.nix
+++ b/pkgs/development/python-modules/tzdata/default.nix
@@ -2,10 +2,8 @@
lib,
buildPythonPackage,
fetchPypi,
- importlib-resources,
pytest-subtests,
pytestCheckHook,
- pythonOlder,
setuptools,
}:
@@ -24,8 +22,7 @@ buildPythonPackage rec {
nativeCheckInputs = [
pytestCheckHook
pytest-subtests
- ]
- ++ lib.optionals (pythonOlder "3.7") [ importlib-resources ];
+ ];
pythonImportsCheck = [ "tzdata" ];
diff --git a/pkgs/development/python-modules/walrus/default.nix b/pkgs/development/python-modules/walrus/default.nix
index d9a6263d530f..20c1702276c5 100644
--- a/pkgs/development/python-modules/walrus/default.nix
+++ b/pkgs/development/python-modules/walrus/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage (finalAttrs: {
pname = "walrus";
- version = "0.9.6";
+ version = "0.9.7";
pyproject = true;
src = fetchFromGitHub {
owner = "coleifer";
repo = "walrus";
tag = finalAttrs.version;
- hash = "sha256-9YUN1OJKOmAHpMnM9gQ0J2sy/iYuadrT/fgH9d1RIZ8=";
+ hash = "sha256-CXy6jjGIG8nuqnF39DqDLvYDGq7N1VL2yitVQrNMEzI=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/watermark/default.nix b/pkgs/development/python-modules/watermark/default.nix
index 304404668496..5c94535e5347 100644
--- a/pkgs/development/python-modules/watermark/default.nix
+++ b/pkgs/development/python-modules/watermark/default.nix
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "watermark";
- version = "2.5.1";
+ version = "2.6.0";
pyproject = true;
src = fetchFromGitHub {
owner = "rasbt";
repo = "watermark";
tag = "v${version}";
- hash = "sha256-vHnXPGHPQz6+y2ZvfmUouL/3JlATGo4fmZ8AIk+bNEU=";
+ hash = "sha256-WeHMzSt4HUJZ9M9/Yu1h3VB5GuD/I9x+v6VyUhsmFhU=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/zimports/default.nix b/pkgs/development/python-modules/zimports/default.nix
index 000338a49034..f76f386e6a0e 100644
--- a/pkgs/development/python-modules/zimports/default.nix
+++ b/pkgs/development/python-modules/zimports/default.nix
@@ -8,7 +8,6 @@
setuptools,
pytestCheckHook,
pythonAtLeast,
- pythonOlder,
}:
buildPythonPackage rec {
@@ -17,7 +16,7 @@ buildPythonPackage rec {
format = "setuptools";
# upstream technically support 3.7 through 3.9, but 3.10 happens to work while 3.11 breaks with an import error
- disabled = pythonOlder "3.7" || pythonAtLeast "3.11";
+ disabled = pythonAtLeast "3.11";
src = fetchFromGitHub {
owner = "sqlalchemyorg";
diff --git a/pkgs/development/tools/zls/default.nix b/pkgs/development/tools/zls/default.nix
index 31b58ca0121d..849309893cdf 100644
--- a/pkgs/development/tools/zls/default.nix
+++ b/pkgs/development/tools/zls/default.nix
@@ -38,7 +38,7 @@ lib.mapAttrs (_: extension: stdenv.mkDerivation (lib.extends common extension))
hash = "sha256-A5Mn+mfIefOsX+eNBRHrDVkqFDVrD3iXDNsUL4TPhKo=";
};
- nativeBuildInputs = [ zig_0_14.hook ];
+ nativeBuildInputs = [ zig_0_14 ];
postPatch = ''
ln -s ${callPackage ./deps_0_14.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
@@ -56,7 +56,7 @@ lib.mapAttrs (_: extension: stdenv.mkDerivation (lib.extends common extension))
hash = "sha256-6IkRtQkn+qUHDz00QvCV/rb2yuF6xWEXug41CD8LLw8=";
};
- nativeBuildInputs = [ zig_0_15.hook ];
+ nativeBuildInputs = [ zig_0_15 ];
postPatch = ''
ln -s ${callPackage ./deps_0_15.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
diff --git a/pkgs/games/dwarf-fortress/df.lock.json b/pkgs/games/dwarf-fortress/df.lock.json
index e17862c54e9c..f9731927c865 100644
--- a/pkgs/games/dwarf-fortress/df.lock.json
+++ b/pkgs/games/dwarf-fortress/df.lock.json
@@ -1,28 +1,28 @@
{
"game": {
"latest": {
- "linux": "53.08",
+ "linux": "53.10",
"darwin": "0.47.05"
},
"versions": {
- "53.08": {
+ "53.10": {
"df": {
- "version": "53.08",
+ "version": "53.10",
"urls": {
"linux": {
- "url": "https://www.bay12games.com/dwarves/df_53_08_linux.tar.bz2",
- "outputHash": "sha256-0h6vA9n33Qt/y4v9UIuQl7p//SuQOkRV8Moe3MYAfIw="
+ "url": "https://www.bay12games.com/dwarves/df_53_10_linux.tar.bz2",
+ "outputHash": "sha256-JdG48F1EJ1lvnJQUq7fMCgBKWXX2nyJj8odkOtDi/fY="
}
}
},
"hack": {
- "version": "53.08-r1",
+ "version": "53.10-r1",
"git": {
"url": "https://github.com/DFHack/dfhack.git",
- "revision": "53.08-r1",
- "outputHash": "sha256-LM3lsM1SZR1fKyhfTdbYBOYe+qbGcIkpvJYT3j16OSM="
+ "revision": "53.10-r1",
+ "outputHash": "sha256-PSmZY8QK9hHgxh+VHYn1bFN9LScpBjpVzFaGHTEGCaY="
},
- "xmlRev": "da0b52eb3ad79866b1228a880be3b734cfac7b55"
+ "xmlRev": "3826f45ef0fad7bd3357a6d55d5c9d28b56614c2"
}
},
"52.05": {
diff --git a/pkgs/servers/sql/postgresql/ext/pg-gvm.nix b/pkgs/servers/sql/postgresql/ext/pg-gvm.nix
index 0fc9e58cbb83..052b605c830a 100644
--- a/pkgs/servers/sql/postgresql/ext/pg-gvm.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg-gvm.nix
@@ -14,13 +14,13 @@
postgresqlBuildExtension (finalAttrs: {
pname = "pg-gvm";
- version = "22.6.12";
+ version = "22.6.13";
src = fetchFromGitHub {
owner = "greenbone";
repo = "pg-gvm";
tag = "v${finalAttrs.version}";
- hash = "sha256-x+RTB4/Uj8Cif+JTVQjRU0UZxa3+LHwtooJi9eoB8vE=";
+ hash = "sha256-kdYDKChjlXtolpzt9H+ijb39bZq3ABsxw5ofUKs6E5g=";
};
nativeBuildInputs = [
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f74111e1ecec..e2e2d54edcce 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -566,6 +566,7 @@ mapAliases {
easyloggingpp = throw "easyloggingpp has been removed, as it is deprecated upstream and does not build with CMake 4"; # Added 2025-09-17
EBTKS = throw "'EBTKS' has been renamed to/replaced by 'ebtks'"; # Converted to throw 2025-10-27
ec2-utils = throw "'ec2-utils' has been renamed to/replaced by 'amazon-ec2-utils'"; # Converted to throw 2025-10-27
+ ecryptfs = throw "'ecryptfs' has been removed due to lack of maintenance. Consider using 'fscrypt', 'gocryptfs' or 'cryfs' instead."; # Added 2026-01-14
edid-decode = v4l-utils; # Added 2025-06-20
eidolon = throw "eidolon was removed as it is unmaintained upstream."; # Added 2025-05-28
eintopf = throw "'eintopf' has been renamed to/replaced by 'lauti'"; # Converted to throw 2025-10-27
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 56376101a6cb..a4895fcee920 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2231,6 +2231,8 @@ self: super: with self; {
branca = callPackage ../development/python-modules/branca { };
+ braq = callPackage ../development/python-modules/braq { };
+
bravado-core = callPackage ../development/python-modules/bravado-core { };
bravia-tv = callPackage ../development/python-modules/bravia-tv { };
@@ -8193,6 +8195,8 @@ self: super: with self; {
kuzu = callPackage ../development/python-modules/kuzu { };
+ kvf = callPackage ../development/python-modules/kvf { };
+
l18n = callPackage ../development/python-modules/l18n { };
la-panic = callPackage ../development/python-modules/la-panic { };
@@ -11790,6 +11794,8 @@ self: super: with self; {
para = callPackage ../development/python-modules/para { };
+ paradict = callPackage ../development/python-modules/paradict { };
+
paragraphs = callPackage ../development/python-modules/paragraphs { };
parallel-ssh = callPackage ../development/python-modules/parallel-ssh { };
@@ -12549,6 +12555,8 @@ self: super: with self; {
prison = callPackage ../development/python-modules/prison { };
+ probed = callPackage ../development/python-modules/probed { };
+
process-tests = callPackage ../development/python-modules/process-tests { };
procmon-parser = callPackage ../development/python-modules/procmon-parser { };
@@ -17193,6 +17201,8 @@ self: super: with self; {
shaperglot = callPackage ../development/python-modules/shaperglot { };
+ shared = callPackage ../development/python-modules/shared { };
+
sharedmem = callPackage ../development/python-modules/sharedmem { };
sharkiq = callPackage ../development/python-modules/sharkiq { };