diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3ad79be89fb8..2b5db0ef9971 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3444,12 +3444,6 @@
githubId = 20448408;
keys = [ { fingerprint = "D446 E58D 87A0 31C7 EC15 88D7 B461 2924 45C6 E696"; } ];
};
- berce = {
- email = "bert.moens@gmail.com";
- github = "berce";
- githubId = 10439709;
- name = "Bert Moens";
- };
bergey = {
email = "bergey@teallabs.org";
github = "bergey";
@@ -4445,12 +4439,6 @@
githubId = 54632731;
name = "Cameron Dugan";
};
- cameronfyfe = {
- email = "cameron.j.fyfe@gmail.com";
- github = "cameronfyfe";
- githubId = 21013281;
- name = "Cameron Fyfe";
- };
cameronnemo = {
email = "cnemo@tutanota.com";
github = "CameronNemo";
@@ -18478,13 +18466,6 @@
github = "mohe2015";
githubId = 13287984;
};
- momeemt = {
- name = "Mutsuha Asada";
- email = "me@momee.mt";
- github = "momeemt";
- githubId = 43488453;
- keys = [ { fingerprint = "D94F EA9F 5B08 F6A1 7B8F EB8B ACB5 4F0C BC6A A7C6"; } ];
- };
monaaraj = {
name = "Mon Aaraj";
email = "owo69uwu69@gmail.com";
@@ -19376,6 +19357,12 @@
githubId = 137805;
name = "Alexander Tsvyashchenko";
};
+ ndom91 = {
+ email = "nix@ndo.dev";
+ github = "ndom91";
+ githubId = 7415984;
+ name = "Nico Domino";
+ };
nealfennimore = {
email = "hi@neal.codes";
github = "nealfennimore";
@@ -28962,6 +28949,14 @@
githubId = 110242808;
name = "Vasilii Pustovoit";
};
+ vavakado = {
+ email = "xor@vavakado.xyz";
+ github = "vavakado";
+ githubId = 80159210;
+ name = "Vladimir Rubin";
+ matrix = "@vavakado:imagisphe.re";
+ keys = [ { fingerprint = "A054 0374 CD37 2C71 FE6D E0CF CAB7 4472 7F36 B524"; } ];
+ };
vbgl = {
email = "Vincent.Laporte@gmail.com";
github = "vbgl";
diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md
index 5e4bea763284..a36490122096 100644
--- a/nixos/doc/manual/release-notes/rl-2611.section.md
+++ b/nixos/doc/manual/release-notes/rl-2611.section.md
@@ -30,6 +30,8 @@
- Python 2 has been removed from the top-level package set, as it is long past end-of-life. The `python2`, `python27`, `python2Full`, `python27Full`, `python2Packages`, and `python27Packages` attributes, along with the legacy `python`, `pythonFull`, and `pythonPackages` aliases, now throw an error directing you to `python3`. The `isPy2` and `isPy27` package flags have been removed accordingly. The only remaining Python 2 interpreter is vendored inside the `resholve` package for its `oil` dependency and is not exposed for general use.
+- `security.polkit.enablePkexecWrapper` has been introduced, making the `pkexec` setuid wrapper opt-in.
+
- `systemd.user.extraConfig` has been removed in favor of the structured [](#opt-systemd.user.settings.Manager) option. Use `systemd.user.settings.Manager` to set any `systemd-user.conf(5)` option directly. For example, replace `systemd.user.extraConfig = "DefaultTimeoutStartSec=60";` with `systemd.user.settings.Manager.DefaultTimeoutStartSec = 60;`.
- `services.timesyncd.extraConfig` has been removed in favor of the structured [](#opt-services.timesyncd.settings.Time) option. Use `services.timesyncd.settings.Time` to set any `timesyncd.conf(5)` option directly. For example, replace `services.timesyncd.extraConfig = "PollIntervalMaxSec=180";` with `services.timesyncd.settings.Time.PollIntervalMaxSec = 180;`.
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index 62214cacc101..16b22841ac14 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -127,6 +127,38 @@ let
'';
+ # user defined font aliases
+ # priority 53
+ aliases =
+ let
+ mkFontBlock =
+ key: fonts:
+ lib.optionalString ((builtins.length fonts) > 0) ''
+ <${key}>
+ ${lib.concatMapStrings (font: "${font}") fonts}
+
+ '';
+
+ mkAliasBlock = family: opts: ''
+
+ ${family}
+ ${mkFontBlock "prefer" opts.prefer}
+ ${mkFontBlock "accept" opts.accept}
+ ${mkFontBlock "default" opts.default}
+
+ '';
+ in
+ pkgs.writeText "fc-53-user-aliases.conf" ''
+
+
+
+
+
+ ${lib.concatStrings (lib.mapAttrsToList mkAliasBlock cfg.aliases)}
+
+
+ '';
+
# bitmap font options
# priority 53
rejectBitmaps = pkgs.writeText "fc-53-no-bitmaps.conf" ''
@@ -245,6 +277,9 @@ let
# 53-no-bitmaps.conf
ln -s ${rejectBitmaps} $dst/53-no-bitmaps.conf
+ # 53-user-aliases.conf
+ ln -s ${aliases} $dst/53-user-aliases.conf
+
${lib.optionalString (!cfg.allowType1) ''
# 53-nixos-reject-type1.conf
ln -s ${rejectType1} $dst/53-nixos-reject-type1.conf
@@ -522,6 +557,69 @@ in
description = "Use embedded bitmaps in fonts like Calibri.";
};
+ aliases = lib.mkOption {
+ type = lib.types.attrsOf (
+ lib.types.submodule {
+ options = {
+ binding = lib.mkOption {
+ type = lib.types.enum [
+ "same"
+ "weak"
+ "strong"
+ ];
+ default = "same";
+ description = ''
+ Binding precedence for this font family. See
+ fontconfig "Font Matching" section for details.
+ '';
+ };
+
+ prefer = lib.mkOption {
+ type = lib.types.listOf lib.types.str;
+ default = [ ];
+ description = ''
+ Fonts whose glyphs are chosen preferentially prior
+ to fonts which match the alias family.
+ '';
+ };
+
+ accept = lib.mkOption {
+ type = lib.types.listOf lib.types.str;
+ default = [ ];
+ description = ''
+ Fonts that are chosen if none of the preferred
+ fonts, nor the alias family could provide the
+ desired glyph.
+ '';
+ };
+
+ default = lib.mkOption {
+ type = lib.types.listOf lib.types.str;
+ default = [ ];
+ description = ''
+ Last chance fallback fonts which are chosen by
+ default if none of the other options could
+ provide the desired glyph.
+ '';
+ };
+ };
+ }
+ );
+ default = { };
+ example = lib.literalExpression ''
+ {
+ # use FreeSans for Greek symbols missing in Helvetica
+ "Helvetica" = {
+ default = [ "FreeSans" ];
+ };
+ };
+ '';
+ description = ''
+ Font aliases that can substitute preferential fonts,
+ or specify custom fallback fonts.
+ '';
+ };
+
};
};
@@ -557,6 +655,9 @@ in
# 52-nixos-default-fonts.conf
r ${defaultFontsConf},
+ # 53-user-aliases.conf
+ r ${aliases},
+
# 53-no-bitmaps.conf
r ${rejectBitmaps},
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nix
index 097a4eca51d5..59e050fe2846 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nix
@@ -11,6 +11,9 @@ in
{
imports = [ ./installation-cd-graphical-base.nix ];
+ # required for calamares
+ security.polkit.enablePkexecWrapper = true;
+
# required for kpmcore to work correctly
programs.partition-manager.enable = true;
diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix
deleted file mode 100644
index 997423e45257..000000000000
--- a/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ config, ... }:
-{
- imports = [
- ../sd-card/sd-image-aarch64-new-kernel-installer.nix
- ];
- config = {
- warnings = [
- ''
- .../cd-dvd/sd-image-aarch64-new-kernel.nix is deprecated and will eventually be removed.
- Please switch to .../sd-card/sd-image-aarch64-new-kernel-installer.nix, instead.
- ''
- ];
- };
-}
diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
deleted file mode 100644
index e7afffb81a5a..000000000000
--- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ config, ... }:
-{
- imports = [
- ../sd-card/sd-image-aarch64-installer.nix
- ];
- config = {
- warnings = [
- ''
- .../cd-dvd/sd-image-aarch64.nix is deprecated and will eventually be removed.
- Please switch to .../sd-card/sd-image-aarch64-installer.nix, instead.
- ''
- ];
- };
-}
diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
deleted file mode 100644
index c16b82256b4f..000000000000
--- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ config, ... }:
-{
- imports = [
- ../sd-card/sd-image-armv7l-multiplatform-installer.nix
- ];
- config = {
- warnings = [
- ''
- .../cd-dvd/sd-image-armv7l-multiplatform.nix is deprecated and will eventually be removed.
- Please switch to .../sd-card/sd-image-armv7l-multiplatform-installer.nix, instead.
- ''
- ];
- };
-}
diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
deleted file mode 100644
index b870d3a8b24e..000000000000
--- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ config, ... }:
-{
- imports = [
- ../sd-card/sd-image-raspberrypi-installer.nix
- ];
- config = {
- warnings = [
- ''
- .../cd-dvd/sd-image-raspberrypi.nix is deprecated and will eventually be removed.
- Please switch to .../sd-card/sd-image-raspberrypi-installer.nix, instead.
- ''
- ];
- };
-}
diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix
deleted file mode 100644
index 8f8efff4d41d..000000000000
--- a/nixos/modules/installer/cd-dvd/sd-image.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ config, ... }:
-{
- imports = [
- ../sd-card/sd-image.nix
- ];
- config = {
- warnings = [
- ''
- .../cd-dvd/sd-image.nix is deprecated and will eventually be removed.
- Please switch to .../sd-card/sd-image.nix, instead.
- ''
- ];
- };
-}
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 8fd268ee0d2d..23a0bebe388c 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -330,7 +330,7 @@ in
'';
config = lib.mkIf config.system.tools.nixos-rebuild.enableRun0Elevation {
- security.polkit.enable = lib.mkDefault true;
+ security.run0.enable = lib.mkDefault true;
environment.systemPackages = [ pkgs.polkit-stdin-agent ];
};
}
diff --git a/nixos/modules/programs/gamemode.nix b/nixos/modules/programs/gamemode.nix
index 834ae6f54a1d..3e568f9a68aa 100644
--- a/nixos/modules/programs/gamemode.nix
+++ b/nixos/modules/programs/gamemode.nix
@@ -60,7 +60,10 @@ in
};
security = {
- polkit.enable = true;
+ polkit = {
+ enable = true;
+ enablePkexecWrapper = lib.mkDefault true;
+ };
wrappers = lib.mkIf cfg.enableRenice {
gamemoded = {
owner = "root";
diff --git a/nixos/modules/programs/throne.nix b/nixos/modules/programs/throne.nix
index 2023055892dd..a64178c77757 100644
--- a/nixos/modules/programs/throne.nix
+++ b/nixos/modules/programs/throne.nix
@@ -64,32 +64,36 @@ in
# 3. Put ThroneCore into a systemd service, and let polkit check service name.
# This is the most secure and convenient way but requires heavy modification
# to Throne source code. Would be good to let upstream support that eventually.
- security.polkit.extraConfig =
- lib.mkIf (cfg.tunMode.enable && (!cfg.tunMode.setuid) && config.services.resolved.enable)
- ''
- polkit.addRule(function(action, subject) {
- const allowedActionIds = [
- "org.freedesktop.resolve1.revert",
- "org.freedesktop.resolve1.set-domains",
- "org.freedesktop.resolve1.set-default-route",
- "org.freedesktop.resolve1.set-dns-servers"
- ];
+ security.polkit = {
+ enable = true;
+ enablePkexecWrapper = lib.mkDefault true;
+ extraConfig =
+ lib.mkIf (cfg.tunMode.enable && (!cfg.tunMode.setuid) && config.services.resolved.enable)
+ ''
+ polkit.addRule(function(action, subject) {
+ const allowedActionIds = [
+ "org.freedesktop.resolve1.revert",
+ "org.freedesktop.resolve1.set-domains",
+ "org.freedesktop.resolve1.set-default-route",
+ "org.freedesktop.resolve1.set-dns-servers"
+ ];
- if (allowedActionIds.indexOf(action.id) !== -1) {
- try {
- var parentPid = polkit.spawn(["${lib.getExe' pkgs.procps "ps"}", "-o", "ppid=", subject.pid]).trim();
- var parentCap = polkit.spawn(["${lib.getExe' pkgs.libcap "getpcaps"}", parentPid]).trim();
- if (parentCap.includes("cap_net_admin") && parentCap.includes("cap_net_raw")) {
- return polkit.Result.YES;
- } else {
+ if (allowedActionIds.indexOf(action.id) !== -1) {
+ try {
+ var parentPid = polkit.spawn(["${lib.getExe' pkgs.procps "ps"}", "-o", "ppid=", subject.pid]).trim();
+ var parentCap = polkit.spawn(["${lib.getExe' pkgs.libcap "getpcaps"}", parentPid]).trim();
+ if (parentCap.includes("cap_net_admin") && parentCap.includes("cap_net_raw")) {
+ return polkit.Result.YES;
+ } else {
+ return polkit.Result.NOT_HANDLED;
+ }
+ } catch (e) {
return polkit.Result.NOT_HANDLED;
}
- } catch (e) {
- return polkit.Result.NOT_HANDLED;
}
- }
- })
- '';
+ })
+ '';
+ };
};
meta.maintainers = with lib.maintainers; [ aleksana ];
diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix
index c2bbe706529f..6ea840d4ccf3 100644
--- a/nixos/modules/security/polkit.nix
+++ b/nixos/modules/security/polkit.nix
@@ -6,27 +6,52 @@
}:
let
- cfg = config.security.polkit;
+ inherit (lib)
+ mkEnableOption
+ mkOption
+ mkIf
+ mkPackageOption
+ mkRemovedOptionModule
+ types
+ ;
+ cfg = config.security.polkit;
in
{
+ imports = [
+ (mkRemovedOptionModule [ "security" "polkit" "debug" ] "Use security.polkit.extraArgs instead")
+ ];
- options = {
+ options.security.polkit = {
+ enable = mkEnableOption "polkit";
- security.polkit.enable = lib.mkEnableOption "polkit";
+ enablePkexecWrapper = mkEnableOption "the setuid pkexec wrapper";
- security.polkit.package = lib.mkPackageOption pkgs "polkit" { };
+ package = mkPackageOption pkgs "polkit" { };
- security.polkit.debug = lib.mkEnableOption "debug logs from polkit. This is required in order to see log messages from rule definitions";
+ extraArgs = mkOption {
+ type = types.listOf types.str;
+ default = [
+ "--no-debug"
+ "--log-level=notice"
+ ];
+ description = ''
+ List of arguments to pass to the polkitd executable.
- security.polkit.extraConfig = lib.mkOption {
- type = lib.types.lines;
+ ::: {.note}
+ To see debug logs you need to negate the default `--no-debug` setting.
+ :::
+ '';
+ };
+
+ extraConfig = mkOption {
+ type = types.lines;
default = "";
example = ''
/* Log authorization checks. */
polkit.addRule(function(action, subject) {
- // Make sure to set { security.polkit.debug = true; } in configuration.nix
+ // Make sure to negate --no-debug in services.polkit.extraArgs: { security.polkit.extraArgs = [ "--log-level=notice" ]; }
polkit.log("user " + subject.user + " is attempting action " + action.id + " from PID " + subject.pid);
});
@@ -41,8 +66,8 @@ in
'';
};
- security.polkit.adminIdentities = lib.mkOption {
- type = lib.types.listOf lib.types.str;
+ adminIdentities = mkOption {
+ type = with types; listOf str;
default = [ "unix-group:wheel" ];
example = [
"unix-user:alice"
@@ -58,25 +83,34 @@ in
};
- config = lib.mkIf cfg.enable {
+ config = mkIf cfg.enable {
environment.systemPackages = [
cfg.package.bin
cfg.package.out
];
+ services.dbus.packages = [ cfg.package.out ];
+
systemd.packages = [ cfg.package.out ];
- systemd.services.polkit.serviceConfig.ExecStart = [
- ""
- "${cfg.package.out}/lib/polkit-1/polkitd ${lib.optionalString (!cfg.debug) "--no-debug"}"
- ];
-
- systemd.services.polkit.restartTriggers = [ config.system.path ];
- systemd.services.polkit.reloadTriggers = [
- config.environment.etc."polkit-1/rules.d/10-nixos.rules".source
- ];
- systemd.services.polkit.stopIfChanged = false;
+ systemd.services.polkit = {
+ restartTriggers = [ config.system.path ];
+ reloadTriggers = [
+ config.environment.etc."polkit-1/rules.d/10-nixos.rules".source
+ ];
+ serviceConfig.ExecStart = [
+ # nuke default ExecStart
+ ""
+ # provide our own instead
+ (toString (
+ [
+ "${lib.getLib cfg.package}/lib/polkit-1/polkitd"
+ ]
+ ++ cfg.extraArgs
+ ))
+ ];
+ };
systemd.sockets."polkit-agent-helper".wantedBy = [ "sockets.target" ];
@@ -89,7 +123,7 @@ in
# The upstream unit uses PrivateDevices=yes and ProtectHome=yes,
# which prevents PAM modules from accessing hardware (e.g. FIDO
# tokens via /dev/hidraw*) or reading key files from home directories.
- (lib.mkIf config.security.pam.u2f.enable {
+ (mkIf config.security.pam.u2f.enable {
# Override upstream PrivateDevices=yes to allow access to /dev/hidraw*
PrivateDevices = false;
DeviceAllow = [
@@ -100,7 +134,7 @@ in
# ~/.config/Yubico/u2f_keys (the default key file location)
ProtectHome = "read-only";
})
- (lib.mkIf config.security.pam.zfs.enable {
+ (mkIf config.security.pam.zfs.enable {
PrivateDevices = false;
DeviceAllow = [
"/dev/zfs rw"
@@ -120,23 +154,16 @@ in
${cfg.extraConfig}
''; # TODO: validation on compilation (at least against typos)
- services.dbus.packages = [ cfg.package.out ];
-
security.pam.services.polkit-1 = { };
security.wrappers.pkexec = {
+ enable = cfg.enablePkexecWrapper;
setuid = true;
owner = "root";
group = "root";
- source = "${cfg.package.bin}/bin/pkexec";
+ source = lib.getExe' cfg.package "pkexec";
};
- systemd.tmpfiles.rules = [
- # Probably no more needed, clean up
- "R /var/lib/polkit-1"
- "R /var/lib/PolicyKit"
- ];
-
users.users.polkituser = {
description = "PolKit daemon";
uid = config.ids.uids.polkituser;
diff --git a/nixos/modules/security/run0.nix b/nixos/modules/security/run0.nix
index 22296a76c95e..6aa7f9ad3155 100644
--- a/nixos/modules/security/run0.nix
+++ b/nixos/modules/security/run0.nix
@@ -6,6 +6,13 @@
}:
let
+ inherit (lib)
+ mkEnableOption
+ mkIf
+ mkMerge
+ mkOption
+ ;
+
cfg = config.security.run0;
sudoAlias = pkgs.writeShellScriptBin "sudo" ''
@@ -18,7 +25,9 @@ let
in
{
options.security.run0 = {
- wheelNeedsPassword = lib.mkOption {
+ enable = mkEnableOption "support for run0";
+
+ wheelNeedsPassword = mkOption {
type = lib.types.bool;
default = true;
description = ''
@@ -27,26 +36,45 @@ in
'';
};
- enableSudoAlias = lib.mkEnableOption "make {command}`sudo` an alias to {command}`run0`.";
+ enableSudoAlias = mkEnableOption "make {command}`sudo` an alias to {command}`run0`.";
};
- config = {
- assertions = [
- {
- assertion =
- cfg.enableSudoAlias -> (!config.security.sudo.enable && !config.security.sudo-rs.enable);
- message = "`security.run0.enableSudoAlias` cannot be enabled if `security.sudo` or `security.sudo-rs` are enabled.";
- }
- ];
-
- security.polkit.extraConfig = lib.mkIf (!cfg.wheelNeedsPassword) ''
- polkit.addRule(function(action, subject) {
- if (action.id == "org.freedesktop.systemd1.manage-units" && subject.isInGroup("wheel")) {
- return polkit.Result.YES;
+ config = mkMerge [
+ {
+ # Late introduction of the enable toggle, this should help during migration.
+ # TODO: Remove after 26.11 release
+ assertions = [
+ {
+ assertion = !cfg.wheelNeedsPassword -> cfg.enable;
+ message = "`security.run0.enable` is currently disabled, but is required for the `security.run0.wheelNeedsPassword` option to take effect";
}
- });
- '';
+ {
+ assertion = cfg.enableSudoAlias -> cfg.enable;
+ message = "`security.run0.enableSudoAlias` depends on `security.run0.enable`, which is disabled.";
+ }
+ ];
+ }
+ (mkIf cfg.enable {
+ assertions = [
+ {
+ assertion =
+ cfg.enableSudoAlias -> (!config.security.sudo.enable && !config.security.sudo-rs.enable);
+ message = "`security.run0.enableSudoAlias` cannot be enabled if `security.sudo` or `security.sudo-rs` are enabled.";
+ }
+ ];
- environment.systemPackages = lib.optional cfg.enableSudoAlias sudoAlias;
- };
+ security.polkit = {
+ enable = true;
+ extraConfig = mkIf (!cfg.wheelNeedsPassword) ''
+ polkit.addRule(function(action, subject) {
+ if (action.id == "org.freedesktop.systemd1.manage-units" && subject.isInGroup("wheel")) {
+ return polkit.Result.YES;
+ }
+ });
+ '';
+ };
+
+ environment.systemPackages = lib.optional cfg.enableSudoAlias sudoAlias;
+ })
+ ];
}
diff --git a/nixos/modules/services/audio/music-assistant.nix b/nixos/modules/services/audio/music-assistant.nix
index a2a383bce8cd..6ff098a67723 100644
--- a/nixos/modules/services/audio/music-assistant.nix
+++ b/nixos/modules/services/audio/music-assistant.nix
@@ -83,7 +83,18 @@ in
lib.optional cfg.enable 8097 # Music Assistant stream port
++ lib.optional (lib.elem "airplay" cfg.providers) 7000
++ lib.optional (lib.elem "sendspin" cfg.providers) 8927
- ++ lib.optional (lib.elem "snapcast" cfg.providers) 1780;
+ ++ lib.optional (lib.elem "snapcast" cfg.providers) 1780
+ ++ lib.optionals (lib.elem "squeezelite" cfg.providers) [
+ # https://lyrion.org/reference/slimproto-protocol/
+ 3483 # Slimproto control
+ # https://lyrion.org/reference/cli/using-the-cli/
+ 9000 # Slimproto JSON-RPC
+ 9090 # Slimproto CLI
+ ];
+ allowedUDPPorts = lib.optionals (lib.elem "squeezelite" cfg.providers) [
+ # https://lyrion.org/reference/slimproto-protocol/
+ 3483 # Slimproto discovery
+ ];
# The information published by Apple 1 seem to not apply to libraop.
# The closest we could find that represents the port range being used as observed by tcpdump is the ephemeral port range.
# 1: https://support.apple.com/en-us/103229#:~:text=49152%E2%80%93-,65535,-TCP%2C%20UDP
diff --git a/nixos/modules/services/desktop-managers/budgie.nix b/nixos/modules/services/desktop-managers/budgie.nix
index 29bdb469d7f1..807d6b019b72 100644
--- a/nixos/modules/services/desktop-managers/budgie.nix
+++ b/nixos/modules/services/desktop-managers/budgie.nix
@@ -243,6 +243,8 @@ in
# Required by Budgie's Polkit Dialog.
security.polkit.enable = mkDefault true;
+ # Required by Budige's Control Center and Desktop
+ security.polkit.enablePkexecWrapper = mkDefault true;
# Required by Budgie Panel plugins and/or Budgie Control Center panels.
networking.networkmanager.enable = mkDefault true; # for BCC's Network panel.
diff --git a/nixos/modules/services/desktop-managers/cosmic.nix b/nixos/modules/services/desktop-managers/cosmic.nix
index c780a5164922..3d367f01defe 100644
--- a/nixos/modules/services/desktop-managers/cosmic.nix
+++ b/nixos/modules/services/desktop-managers/cosmic.nix
@@ -146,7 +146,10 @@ in
environment.sessionVariables.X11_EXTRA_RULES_XML = "${config.services.xserver.xkb.dir}/rules/base.extras.xml";
programs.dconf.enable = true;
programs.dconf.packages = [ pkgs.cosmic-session ];
- security.polkit.enable = true;
+ security.polkit = {
+ enable = true;
+ enablePkexecWrapper = lib.mkDefault true;
+ };
security.rtkit.enable = true;
services.accounts-daemon.enable = true;
services.displayManager.sessionPackages = [ pkgs.cosmic-session ];
diff --git a/nixos/modules/services/desktop-managers/gnome.nix b/nixos/modules/services/desktop-managers/gnome.nix
index 3747a491098f..1d850f1f26e5 100644
--- a/nixos/modules/services/desktop-managers/gnome.nix
+++ b/nixos/modules/services/desktop-managers/gnome.nix
@@ -325,7 +325,11 @@ in
i18n.inputMethod.enable = mkDefault true;
i18n.inputMethod.type = mkDefault "ibus";
programs.dconf.enable = true;
- security.polkit.enable = true;
+ security.polkit = {
+ enable = true;
+ # Required by gnome-initial-setup, gnome-system-monitor, gvfs for admin://
+ enablePkexecWrapper = lib.mkDefault true;
+ };
security.rtkit.enable = mkDefault true;
services.accounts-daemon.enable = true;
services.dleyna.enable = mkDefault true;
diff --git a/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix b/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix
index 958fbb546dc3..eaa9399862a4 100644
--- a/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix
+++ b/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix
@@ -22,6 +22,10 @@
config = lib.mkIf config.services.gnome.gnome-remote-desktop.enable {
services.pipewire.enable = true;
services.dbus.packages = [ pkgs.gnome-remote-desktop ];
+ security.polkit = {
+ enable = true;
+ enablePkexecWrapper = lib.mkDefault true;
+ };
environment.systemPackages = [ pkgs.gnome-remote-desktop ];
diff --git a/nixos/modules/services/hardware/tuned.nix b/nixos/modules/services/hardware/tuned.nix
index 65a857f4fde8..f399dc55c306 100644
--- a/nixos/modules/services/hardware/tuned.nix
+++ b/nixos/modules/services/hardware/tuned.nix
@@ -246,7 +246,10 @@ in
systemPackages = [ cfg.package ];
};
- security.polkit.enable = lib.mkDefault true;
+ security.polkit = {
+ enable = lib.mkDefault true;
+ enablePkexecWrapper = lib.mkDefault true;
+ };
services = {
dbus.packages = [ cfg.package ];
diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index a625111fc2f0..96ab896356f6 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -114,7 +114,6 @@ let
"restic"
"rtl_433"
"sabnzbd"
- "scaphandre"
"script"
"shelly"
"smartctl"
@@ -521,26 +520,6 @@ in
'services.prometheus.exporters.sql.configFile'
'';
}
- {
- assertion = cfg.scaphandre.enable -> (pkgs.stdenv.targetPlatform.isx86_64 == true);
- message = ''
- Scaphandre only support x86_64 architectures.
- '';
- }
- {
- assertion =
- cfg.scaphandre.enable
- -> ((lib.kernel.whenHelpers pkgs.linux.version).whenOlder "5.11" true).condition == false;
- message = ''
- Scaphandre requires a kernel version newer than '5.11', '${pkgs.linux.version}' given.
- '';
- }
- {
- assertion = cfg.scaphandre.enable -> (builtins.elem "intel_rapl_common" config.boot.kernelModules);
- message = ''
- Scaphandre needs 'intel_rapl_common' kernel module to be enabled. Please add it in 'boot.kernelModules'.
- '';
- }
{
assertion =
cfg.idrac.enable -> ((cfg.idrac.configurationPath == null) != (cfg.idrac.configuration == null));
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/scaphandre.nix b/nixos/modules/services/monitoring/prometheus/exporters/scaphandre.nix
deleted file mode 100644
index a3dadccfda19..000000000000
--- a/nixos/modules/services/monitoring/prometheus/exporters/scaphandre.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- config,
- lib,
- pkgs,
- options,
- ...
-}:
-
-let
- logPrefix = "services.prometheus.exporter.scaphandre";
- cfg = config.services.prometheus.exporters.scaphandre;
-in
-{
- port = 8080;
- extraOpts = {
- telemetryPath = lib.mkOption {
- type = lib.types.str;
- default = "/metrics";
- description = ''
- Path under which to expose metrics.
- '';
- };
- };
-
- serviceOpts = {
- serviceConfig = {
- ExecStart = ''
- ${pkgs.scaphandre}/bin/scaphandre prometheus \
- --address ${cfg.listenAddress} \
- --port ${toString cfg.port} \
- --suffix ${cfg.telemetryPath} \
- ${lib.concatStringsSep " \\\n " cfg.extraFlags}
- '';
- };
- };
-}
diff --git a/nixos/modules/services/networking/xrdp.nix b/nixos/modules/services/networking/xrdp.nix
index a1e9f9c23d80..8938293fee28 100644
--- a/nixos/modules/services/networking/xrdp.nix
+++ b/nixos/modules/services/networking/xrdp.nix
@@ -19,7 +19,7 @@ let
cat > $out/startwm.sh < = {
* exporterConfig = {
@@ -168,6 +171,7 @@ let
blackbox =
{ pkgs, ... }:
{
+ testBackend = "nodes";
exporterConfig = {
enable = true;
configFile = pkgs.writeText "config.yml" (
@@ -373,16 +377,23 @@ let
};
dovecot =
- { ... }:
+ { pkgs, ... }:
{
+ testBackend = "nodes";
exporterConfig = {
enable = true;
scopes = [ "global" ];
- socketPath = "/var/run/dovecot2/old-stats";
+ socketPath = "/var/run/dovecot2/stats-reader";
user = "root"; # <- don't use user root in production
};
metricProvider = {
- services.dovecot2.enable = true;
+ services.dovecot2 = {
+ enable = true;
+ settings = {
+ dovecot_config_version = pkgs.dovecot.version;
+ dovecot_storage_version = pkgs.dovecot.version;
+ };
+ };
};
exporterTest = ''
wait_for_unit("prometheus-dovecot-exporter.service")
@@ -423,6 +434,7 @@ let
ebpf =
{ ... }:
{
+ testBackend = "nodes";
exporterConfig = {
enable = true;
names = [ "timers" ];
@@ -447,7 +459,6 @@ let
# `services.elasticsearch` is unmaintained; OpenSearch is the same
# engine class and is explicitly supported by the exporter.
services.opensearch.enable = true;
- virtualisation.memorySize = 2048;
};
exporterTest = ''
wait_for_unit("opensearch.service")
@@ -463,6 +474,7 @@ let
fail2ban =
{ ... }:
{
+ testBackend = "nodes"; # setfacl
exporterConfig = {
enable = true;
exitOnError = true;
@@ -964,6 +976,7 @@ let
modemmanager =
{ ... }:
{
+ testBackend = "nodes";
exporterConfig = {
enable = true;
refreshRate = "10s";
@@ -1099,7 +1112,7 @@ let
wait_for_unit("nginx.service")
wait_for_unit("prometheus-nextcloud-exporter.service")
wait_for_open_port(9205)
- succeed("curl -sSf http://localhost:9205/metrics | grep 'nextcloud_up 1'")
+ wait_until_succeeds("curl -sSf http://localhost:9205/metrics | grep 'nextcloud_up 1'")
'';
};
@@ -1658,24 +1671,6 @@ let
'';
};
- scaphandre =
- { ... }:
- {
- exporterConfig = {
- enable = true;
- };
- metricProvider = {
- boot.kernelModules = [ "intel_rapl_common" ];
- };
- exporterTest = ''
- wait_for_unit("prometheus-scaphandre-exporter.service")
- wait_for_open_port(8080)
- wait_until_succeeds(
- "curl -sSf 'localhost:8080/metrics'"
- )
- '';
- };
-
shelly =
{ pkgs, ... }:
{
@@ -2143,6 +2138,7 @@ let
zfs =
{ ... }:
{
+ testBackend = "nodes"; # zfs kmod
exporterConfig = {
enable = true;
};
@@ -2165,13 +2161,14 @@ lib.mapAttrs (
{ pkgs, lib, ... }:
let
testConfig = testConfigFun { inherit pkgs lib; };
- nodeName = testConfig.nodeName or exporter;
+ testBackend = testConfig.testBackend or "containers";
+ nodeName = "machine";
in
{
name = "prometheus-${exporter}-exporter";
node.pkgsReadOnly = testConfig.pkgsReadOnly or true;
- nodes.${nodeName} = lib.mkMerge [
+ ${testBackend}.${nodeName} = lib.mkMerge [
{
services.prometheus.exporters.${exporter} = testConfig.exporterConfig;
}
@@ -2196,7 +2193,6 @@ lib.mapAttrs (
"${nodeName}.${line}"
) (lib.splitString "\n" (lib.removeSuffix "\n" testConfig.exporterTest))
)}
- ${nodeName}.shutdown()
'';
meta.maintainers = [ ];
diff --git a/nixos/tests/rtkit.nix b/nixos/tests/rtkit.nix
index 74bf69e02a83..295fd36a1391 100644
--- a/nixos/tests/rtkit.nix
+++ b/nixos/tests/rtkit.nix
@@ -55,7 +55,7 @@
# Provide a little logging of polkit checks - otherwise it's
# impossible to know what's going on.
- security.polkit.debug = true;
+ security.polkit.extraArgs = [ "--log-level=notice" ];
security.polkit.extraConfig = ''
polkit.addRule(function(action, subject) {
const ns = "org.freedesktop.RealtimeKit1.";
diff --git a/nixos/tests/scaphandre.nix b/nixos/tests/scaphandre.nix
deleted file mode 100644
index bf9854b1c919..000000000000
--- a/nixos/tests/scaphandre.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- name = "scaphandre";
-
- nodes.scaphandre =
- { pkgs, ... }:
- {
- boot.kernelModules = [ "intel_rapl_common" ];
-
- environment.systemPackages = [ pkgs.scaphandre ];
- };
-
- testScript = ''
- scaphandre.start()
- scaphandre.wait_until_succeeds(
- "scaphandre stdout -t 4",
- )
- '';
-}
diff --git a/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix b/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix
index 5ab21bee0195..7b8c53283a79 100644
--- a/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix
+++ b/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix
@@ -17,7 +17,7 @@ import ./make-test-python.nix (
hexa
];
};
- nodes = {
+ containers = {
# The ISP's routers job is to delegate IPv6 prefixes via DHCPv6. Like with
# regular IPv6 auto-configuration it will also emit IPv6 router
@@ -38,6 +38,7 @@ import ./make-test-python.nix (
interfaces.eth1 = lib.mkForce { }; # Don't use scripted networking
};
+ services.resolved.enable = false;
systemd.network = {
enable = true;
@@ -204,6 +205,7 @@ import ./make-test-python.nix (
interfaces.eth1.ipv6.addresses = lib.mkForce [ ];
};
+ services.resolved.enable = false;
systemd.network = {
networks = {
# systemd-networkd will load the first network unit file
@@ -300,6 +302,7 @@ import ./make-test-python.nix (
client = {
virtualisation.vlans = [ 2 ];
systemd.services.systemd-networkd.environment.SYSTEMD_LOG_LEVEL = "debug";
+ services.resolved.enable = false;
networking = {
useNetworkd = true;
useDHCP = false;
diff --git a/nixos/tests/timekpr.nix b/nixos/tests/timekpr.nix
index 1ae793d8f70e..9f832d2b62dd 100644
--- a/nixos/tests/timekpr.nix
+++ b/nixos/tests/timekpr.nix
@@ -1,13 +1,15 @@
-{ pkgs, lib, ... }:
+{
+ lib,
+ ...
+}:
+
{
name = "timekpr";
meta.maintainers = [ lib.maintainers.atry ];
- nodes.machine =
- { pkgs, lib, ... }:
- {
- services.timekpr.enable = true;
- };
+ containers.machine = {
+ services.timekpr.enable = true;
+ };
testScript = ''
start_all()
diff --git a/nixos/tests/web-apps/pretalx.nix b/nixos/tests/web-apps/pretalx.nix
index 03fa6684b8b5..f6d61786e893 100644
--- a/nixos/tests/web-apps/pretalx.nix
+++ b/nixos/tests/web-apps/pretalx.nix
@@ -4,37 +4,38 @@
name = "pretalx";
meta.maintainers = pkgs.pretalx.meta.maintainers;
- nodes = {
- pretalx =
- { config, ... }:
- {
- networking.extraHosts = ''
- 127.0.0.1 talks.local
- '';
+ containers.pretalx =
+ { config, ... }:
+ {
+ networking.extraHosts = ''
+ 127.0.0.1 talks.local
+ '';
- services.pretalx = {
- enable = true;
- plugins = with config.services.pretalx.package.plugins; [
- pages
- ];
- nginx.domain = "talks.local";
- settings = {
- site.url = "http://talks.local";
- };
+ services.pretalx = {
+ enable = true;
+ plugins = with config.services.pretalx.package.plugins; [
+ pages
+ ];
+ nginx.domain = "talks.local";
+ settings = {
+ site.url = "http://talks.local";
};
};
- };
+ };
- testScript = ''
- start_all()
+ testScript =
+ # python
+ ''
+ start_all()
- pretalx.wait_for_unit("pretalx-web.service")
- pretalx.wait_for_unit("pretalx-worker.service")
+ pretalx.wait_for_unit("pretalx-web.service")
+ pretalx.wait_for_unit("pretalx-worker.service")
- pretalx.wait_until_succeeds("curl -q --fail http://talks.local/orga/")
+ pretalx.wait_until_succeeds("curl -q --fail http://talks.local/orga/")
- pretalx.succeed("pretalx-manage --help")
+ pretalx.log(pretalx.succeed("id"))
+ pretalx.succeed("pretalx-manage --help | grep -q 'createsuperuser'")
- pretalx.log(pretalx.succeed("systemd-analyze security pretalx-web.service"))
- '';
+ pretalx.log(pretalx.succeed("systemd-analyze security pretalx-web.service"))
+ '';
}
diff --git a/nixos/tests/web-apps/pretix.nix b/nixos/tests/web-apps/pretix.nix
index f99bb8733547..f58ad78146d2 100644
--- a/nixos/tests/web-apps/pretix.nix
+++ b/nixos/tests/web-apps/pretix.nix
@@ -1,50 +1,47 @@
{
- lib,
pkgs,
...
}:
{
name = "pretix";
- meta.maintainers = with lib.maintainers; [ hexa ];
+ meta.maintainers = pkgs.pretix.meta.maintainers;
- nodes = {
- pretix = {
- virtualisation.memorySize = 2048;
+ containers.pretix = {
+ networking.extraHosts = ''
+ 127.0.0.1 tickets.local
+ '';
- networking.extraHosts = ''
- 127.0.0.1 tickets.local
- '';
-
- services.pretix = {
- enable = true;
- nginx.domain = "tickets.local";
- plugins = with pkgs.pretix.plugins; [
- passbook
- pages
- zugferd
- ];
- settings = {
- pretix = {
- instance_name = "NixOS Test";
- url = "http://tickets.local";
- };
- mail.from = "hello@tickets.local";
+ services.pretix = {
+ enable = true;
+ nginx.domain = "tickets.local";
+ plugins = with pkgs.pretix.plugins; [
+ passbook
+ pages
+ zugferd
+ ];
+ settings = {
+ pretix = {
+ instance_name = "NixOS Test";
+ url = "http://tickets.local";
};
+ mail.from = "hello@tickets.local";
};
};
};
- testScript = ''
- start_all()
+ testScript =
+ # python
+ ''
+ start_all()
- pretix.wait_for_unit("pretix-web.service")
- pretix.wait_for_unit("pretix-worker.service")
+ pretix.wait_for_unit("pretix-web.service")
+ pretix.wait_for_unit("pretix-worker.service")
- pretix.wait_until_succeeds("curl -q --fail http://tickets.local")
+ pretix.wait_until_succeeds("curl -q --fail http://tickets.local")
- pretix.succeed("pretix-manage --help")
+ pretix.succeed("pretix-manage --help | grep -q 'createsuperuser'")
- pretix.log(pretix.succeed("systemd-analyze security pretix-web.service"))
- '';
+ pretix.log(pretix.succeed("systemd-analyze security pretix-web.service"))
+ '';
}
diff --git a/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix b/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix
index f23e967d5687..3f7479882c59 100644
--- a/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix
+++ b/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "deadbeef-statusnotifier-plugin";
- version = "1.6";
+ version = "1.7";
src = fetchFromGitHub {
owner = "vovochka404";
repo = "deadbeef-statusnotifier-plugin";
rev = "v${finalAttrs.version}";
- sha256 = "sha256-6WEbY59vPNrL3W5GUwFQJimmSS+td8Ob+G46fPAxfV4=";
+ sha256 = "sha256-pDiQn+iHSTNWTO01j/fbEq3P374TMmnUiC5/Jn2hwBI=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
index 5f4e032acc72..f5dcd733ce3a 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
@@ -5097,6 +5097,27 @@
};
}
) { };
+ keymap-popup = callPackage (
+ {
+ elpaBuild,
+ fetchurl,
+ lib,
+ }:
+ elpaBuild {
+ pname = "keymap-popup";
+ ename = "keymap-popup";
+ version = "0.3.1.0.20260530.4";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/devel/keymap-popup-0.3.1.0.20260530.4.tar";
+ sha256 = "1k6aqp65x3azbipj2pwdg15pip045cawx4im04s84kbk91fx0fxs";
+ };
+ packageRequires = [ ];
+ meta = {
+ homepage = "https://elpa.gnu.org/devel/keymap-popup.html";
+ license = lib.licenses.free;
+ };
+ }
+ ) { };
kind-icon = callPackage (
{
elpaBuild,
diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
index 1b3e77cf6319..b106db195fb5 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
@@ -5015,6 +5015,27 @@
};
}
) { };
+ keymap-popup = callPackage (
+ {
+ elpaBuild,
+ fetchurl,
+ lib,
+ }:
+ elpaBuild {
+ pname = "keymap-popup";
+ ename = "keymap-popup";
+ version = "0.3.1";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/keymap-popup-0.3.1.tar";
+ sha256 = "0m44s8618n7g5pajxiv4k1dfx6l58gr01a3ga26fxc51j1d05q8b";
+ };
+ packageRequires = [ ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/keymap-popup.html";
+ license = lib.licenses.free;
+ };
+ }
+ ) { };
kind-icon = callPackage (
{
elpaBuild,
diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-common-overrides.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-common-overrides.nix
index 06c66787c3f1..5c71f117ea75 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-common-overrides.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-common-overrides.nix
@@ -20,5 +20,22 @@ in
yasnippet
]
);
+
+ # requires optional dependency for OMEMO support.
+ jabber = super.jabber.overrideAttrs (old: {
+ buildInputs = old.buildInputs ++ [ pkgs.mbedtls ];
+ nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ];
+
+ # We need to run this in postInstall for package directory to become available
+ postInstall =
+ (old.postInstall or "")
+ + "\n"
+ + ''
+ pushd $out/share/emacs/site-lisp/elpa/jabber-*/src
+ make CC=$CC
+ rm -r $out/share/emacs/site-lisp/elpa/jabber-*/src
+ popd
+ '';
+ });
# keep-sorted end
}
diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix
index f870cacfbf89..3b45915f44e3 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix
@@ -3225,17 +3225,21 @@
elpaBuild,
fetchurl,
fsm,
+ keymap-popup,
lib,
}:
elpaBuild {
pname = "jabber";
ename = "jabber";
- version = "0.10.5.0.20260423.192938";
+ version = "0.11.0.0.20260614.0";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/jabber-0.10.5.0.20260423.192938.tar";
- sha256 = "1q79iv4znishj6rdz1m76r0c8h72i2g47xfh6xfw2gqxbkkyilv3";
+ url = "https://elpa.nongnu.org/nongnu-devel/jabber-0.11.0.0.20260614.0.tar";
+ sha256 = "19h0w85m6vzwwpsgg6ifcyx2j082cgj6dpd7s5yd7pr438jazkn3";
};
- packageRequires = [ fsm ];
+ packageRequires = [
+ fsm
+ keymap-popup
+ ];
meta = {
homepage = "https://elpa.nongnu.org/nongnu-devel/jabber.html";
license = lib.licenses.free;
diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
index e5dfa1df3392..49c0d5cdceeb 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
@@ -3240,17 +3240,21 @@
elpaBuild,
fetchurl,
fsm,
+ keymap-popup,
lib,
}:
elpaBuild {
pname = "jabber";
ename = "jabber";
- version = "0.10.5";
+ version = "0.11.0";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu/jabber-0.10.5.tar";
- sha256 = "1vjmajcls0l6mwccqdp7gr4g4r1z6f2qaf2palnimjb7w3gzh4mk";
+ url = "https://elpa.nongnu.org/nongnu/jabber-0.11.0.tar";
+ sha256 = "1wikfd8iqj9r1qrh6cd593vgbkjndfpm9f12ilsdwxwh0nx3cpd7";
};
- packageRequires = [ fsm ];
+ packageRequires = [
+ fsm
+ keymap-popup
+ ];
meta = {
homepage = "https://elpa.nongnu.org/nongnu/jabber.html";
license = lib.licenses.free;
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 5b65f729acc2..18f312fc37fc 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
@@ -67,10 +67,10 @@ vimUtils.buildVimPlugin {
in
''
mkdir -p $out/build
- ln -s ${avante-nvim-lib}/lib/libavante_repo_map${ext} $out/build/avante_repo_map${ext}
- ln -s ${avante-nvim-lib}/lib/libavante_templates${ext} $out/build/avante_templates${ext}
- ln -s ${avante-nvim-lib}/lib/libavante_tokenizers${ext} $out/build/avante_tokenizers${ext}
- ln -s ${avante-nvim-lib}/lib/libavante_html2md${ext} $out/build/avante_html2md${ext}
+ cp ${avante-nvim-lib}/lib/libavante_repo_map${ext} $out/build/avante_repo_map${ext}
+ cp ${avante-nvim-lib}/lib/libavante_templates${ext} $out/build/avante_templates${ext}
+ cp ${avante-nvim-lib}/lib/libavante_tokenizers${ext} $out/build/avante_tokenizers${ext}
+ cp ${avante-nvim-lib}/lib/libavante_html2md${ext} $out/build/avante_html2md${ext}
# Fixes PKCE auth flows not finding libcrypto
substituteInPlace "$out/lua/avante/auth/pkce.lua" \
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix
index 028aae4c8913..c8e323df7c50 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix
@@ -11,13 +11,13 @@
}:
vimUtils.buildVimPlugin rec {
pname = "codediff.nvim";
- version = "2.45.1";
+ version = "2.49.2";
src = fetchFromGitHub {
owner = "esmuellert";
repo = "codediff.nvim";
tag = "v${version}";
- hash = "sha256-1F6z/rhZxiuI6W1ReyHP6EQFxys4qm3fbINxoy1hQZA=";
+ hash = "sha256-kT5plTJP4VfN6mFkq6voDTmr9LaZ37W80UU3QUGlKkY=";
};
dependencies = [ vimPlugins.nui-nvim ];
diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix
index 93329c9c52de..706924fa87b2 100644
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/pkgs/applications/editors/vscode/generic.nix
@@ -376,7 +376,7 @@ stdenv.mkDerivation (
)
}
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}"
- --add-flags ${lib.escapeShellArg commandLineArgs}
+ --append-flags ${lib.escapeShellArg commandLineArgs}
)
'';
diff --git a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix
index eb613fa069dc..45d52415ed39 100644
--- a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix
+++ b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix
@@ -8,13 +8,13 @@
}:
mkLibretroCore {
core = "mednafen-psx" + lib.optionalString withHw "-hw";
- version = "0-unstable-2026-06-02";
+ version = "0-unstable-2026-06-14";
src = fetchFromGitHub {
owner = "libretro";
repo = "beetle-psx-libretro";
- rev = "ee042b73f8fe2aa9c8c73408b5bf200a3ce1a67b";
- hash = "sha256-k1DvQHGQH/d6W7jTIAW9jIk0qVHUji3PeYAa8MuUP9w=";
+ rev = "d460f8342060526678e7fd8222048324c2a80d86";
+ hash = "sha256-QzlVlXfJmSwd+gp+fROMKrTj8AxCisYJN5WTff6eHLA=";
};
extraBuildInputs = lib.optionals withHw [
diff --git a/pkgs/applications/emulators/libretro/cores/fbneo.nix b/pkgs/applications/emulators/libretro/cores/fbneo.nix
index 0002e31fe4af..4b8dead1bf79 100644
--- a/pkgs/applications/emulators/libretro/cores/fbneo.nix
+++ b/pkgs/applications/emulators/libretro/cores/fbneo.nix
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "fbneo";
- version = "0-unstable-2026-06-04";
+ version = "0-unstable-2026-06-12";
src = fetchFromGitHub {
owner = "libretro";
repo = "fbneo";
- rev = "298f913aeb781908c7f6a568a2ede3940a98738d";
- hash = "sha256-UP0jNsqXMzrO+EQY8Gbkl2lIizfsAKoKiGaXGp7Nok8=";
+ rev = "9723c47c2d782ccb8cf48f96568a89a44631e6ba";
+ hash = "sha256-zYIC0up0tkvq0TLjSiypxwSTYAF1XnmHXsUTKsUQejA=";
};
makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/hatari.nix b/pkgs/applications/emulators/libretro/cores/hatari.nix
index 88480119bb42..1214fe8b1ece 100644
--- a/pkgs/applications/emulators/libretro/cores/hatari.nix
+++ b/pkgs/applications/emulators/libretro/cores/hatari.nix
@@ -6,13 +6,13 @@
}:
mkLibretroCore {
core = "hatari";
- version = "0-unstable-2026-04-20";
+ version = "0-unstable-2026-06-10";
src = fetchFromGitHub {
owner = "libretro";
repo = "hatari";
- rev = "6aa7c7079b3186025ebc6bad4b4251aa359a3947";
- hash = "sha256-17L2EpLGwkWA/9XTgtIq+PNABGvgdBQDsAfAZFRKLOE=";
+ rev = "c605d3aa342f2ad8f915f94bf03bae018e1be7b7";
+ hash = "sha256-UJyfIt5+anXaqqMmL9JNTBvXu5bmyMYloYc8fWxx2m0=";
};
extraNativeBuildInputs = [ which ];
diff --git a/pkgs/applications/emulators/libretro/cores/mame.nix b/pkgs/applications/emulators/libretro/cores/mame.nix
index 7d30ae2ed015..21e6cfd861f6 100644
--- a/pkgs/applications/emulators/libretro/cores/mame.nix
+++ b/pkgs/applications/emulators/libretro/cores/mame.nix
@@ -9,13 +9,13 @@
}:
mkLibretroCore {
core = "mame";
- version = "0-unstable-2026-05-31";
+ version = "0-unstable-2026-06-10";
src = fetchFromGitHub {
owner = "libretro";
repo = "mame";
- rev = "2ffec28bcf65eceb395722c9d721e7d4523fbb56";
- hash = "sha256-37SD78rFYgIoI7FDsgHhupYse8QbzwVRrJCXSVjpLCc=";
+ rev = "e126237dcf44622deaf18e7668f07ba96c363673";
+ hash = "sha256-6M4revCs32ffmUjhl10nL/MsVl8QRn6JQmC7NzDW1Mo=";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
index ee4d1b5a6364..5096d3568716 100644
--- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix
+++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
@@ -85,7 +85,7 @@ let
];
in
mkDerivation rec {
- version = "3.44.10";
+ version = "3.44.11";
pname = "qgis-ltr-unwrapped";
outputs = [ "out" ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) "man";
@@ -93,7 +93,7 @@ mkDerivation rec {
owner = "qgis";
repo = "QGIS";
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
- hash = "sha256-wWLbnZpLIchm0NXuU7jEXCBctrI6G1z8iqf9R2YhS8Y=";
+ hash = "sha256-gWSl9OrRSxreQdKxKKDCOUWBE5uE2w3/ebW266LCWLI=";
};
passthru = {
diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index 89a8c9f1cbd8..59d035b32d97 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -338,8 +338,6 @@ stdenv.mkDerivation (finalAttrs: {
gtk = gtk3;
};
- __structuredAttrs = true;
-
meta = {
description = "GNU Image Manipulation Program";
homepage = "https://www.gimp.org/";
diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix
index 5803d84dc9d8..f57bbe3679a2 100644
--- a/pkgs/applications/networking/cluster/cni/plugins.nix
+++ b/pkgs/applications/networking/cluster/cni/plugins.nix
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "cni-plugins";
- version = "1.9.0";
+ version = "1.9.1";
src = fetchFromGitHub {
owner = "containernetworking";
repo = "plugins";
rev = "v${version}";
- hash = "sha256-0ZonR8pV20bBbC2AkNCJhoseDVxNwwMa7coD/ON6clA=";
+ hash = "sha256-3OhUvIJPU5Ayc4/po9Rj4Tfa5536aN8bj+51M6Xg5os=";
};
vendorHash = null;
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 2811b1757f18..1ce91cebdc45 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1058,11 +1058,11 @@
"vendorHash": null
},
"oracle_oci": {
- "hash": "sha256-uIggPhDgTMQei6LpXPzAbfbsoNjVN35P60QcqqHyCIA=",
+ "hash": "sha256-SFs0BYaYgB4J/HbaYFx1Sh1raVWhRJdW/3KMWdyvX+I=",
"homepage": "https://registry.terraform.io/providers/oracle/oci",
"owner": "oracle",
"repo": "terraform-provider-oci",
- "rev": "v8.17.0",
+ "rev": "v8.18.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -1436,13 +1436,13 @@
"vendorHash": "sha256-lWBMihP6oX7qPpTuPQQwQS3IDwdyb/rEYqtBsTozb7Q="
},
"venafi_venafi": {
- "hash": "sha256-wpAckNRqZjSDt7KpCRpLSYkn6Gm+QPzn5sIJ90wRXjI=",
+ "hash": "sha256-WOCZRVAYVR9uzsyyAvCQvYReaas6YmZsbRgxxxhDF/k=",
"homepage": "https://registry.terraform.io/providers/Venafi/venafi",
"owner": "Venafi",
"repo": "terraform-provider-venafi",
- "rev": "v0.23.1",
+ "rev": "v0.23.2",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-chDZVBd7tb1VsfTXcWz7j29LzHpUnJpXKRFAyqxnR8s="
+ "vendorHash": "sha256-rqDzBez3HvhG+xvEyQ6foq/m0sFyyqrioquY9mcuWOU="
},
"vinyldns_vinyldns": {
"hash": "sha256-/M+HFMDeKpIzzdn04TkMxriVeE6vvORRiqonxF38B9Q=",
diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix
index ef4bd7b5faef..e08d463c6300 100644
--- a/pkgs/applications/networking/p2p/deluge/default.nix
+++ b/pkgs/applications/networking/p2p/deluge/default.nix
@@ -5,6 +5,7 @@
libtorrent-rasterbar,
python3Packages,
gtk3,
+ libappindicator-gtk3,
glib,
gobject-introspection,
librsvg,
@@ -54,6 +55,7 @@ let
gtk3
gobject-introspection
pygobject3
+ libappindicator-gtk3
];
nativeBuildInputs = [
diff --git a/pkgs/applications/video/kodi/addons/jellycon/default.nix b/pkgs/applications/video/kodi/addons/jellycon/default.nix
index fee86e9c401b..8c0996f7764f 100644
--- a/pkgs/applications/video/kodi/addons/jellycon/default.nix
+++ b/pkgs/applications/video/kodi/addons/jellycon/default.nix
@@ -17,13 +17,13 @@ in
buildKodiAddon rec {
pname = "jellycon";
namespace = "plugin.video.jellycon";
- version = "0.9.1";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "jellyfin";
repo = "jellycon";
rev = "v${version}";
- sha256 = "sha256-bSAzd0nKD0S3hNEM0azmCNPw9wHQK5XH6lbfcz3sW9o=";
+ sha256 = "sha256-1o9mkMjlLDIcokpTqDKmFlCOF1XjrVOxlFfy0bpZolc=";
};
nativeBuildInputs = [
diff --git a/pkgs/build-support/fetchcodeberg/default.nix b/pkgs/build-support/fetchcodeberg/default.nix
index 4277e5a5613c..aac1f97a7fdb 100644
--- a/pkgs/build-support/fetchcodeberg/default.nix
+++ b/pkgs/build-support/fetchcodeberg/default.nix
@@ -1,2 +1,11 @@
{ lib, fetchFromGitea }:
-lib.makeOverridable (args: fetchFromGitea ({ domain = "codeberg.org"; } // args))
+lib.makeOverridable (
+ args:
+ fetchFromGitea (
+ {
+ domain = "codeberg.org";
+ functionName = "fetchFromCodeberg";
+ }
+ // args
+ )
+)
diff --git a/pkgs/build-support/fetchgitea/default.nix b/pkgs/build-support/fetchgitea/default.nix
index a7910b671e9b..cfa7c592db1f 100644
--- a/pkgs/build-support/fetchgitea/default.nix
+++ b/pkgs/build-support/fetchgitea/default.nix
@@ -3,7 +3,20 @@
{ lib, fetchFromGitHub }:
lib.makeOverridable (
- { domain, ... }@args:
+ {
+ domain,
+ functionName ? "fetchFromGitea",
+ ...
+ }@args:
- fetchFromGitHub ((removeAttrs args [ "domain" ]) // { githubBase = domain; })
+ fetchFromGitHub (
+ (removeAttrs args [
+ "domain"
+ "functionName"
+ ])
+ // {
+ inherit functionName;
+ githubBase = domain;
+ }
+ )
)
diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix
index f21256f5d57b..27a19b53b18d 100644
--- a/pkgs/build-support/fetchgithub/default.nix
+++ b/pkgs/build-support/fetchgithub/default.nix
@@ -48,6 +48,7 @@ decorate (
repo,
tag ? null,
rev ? null,
+ functionName ? "fetchFromGitHub",
# TODO(@ShamrockLee): Add back after reconstruction with lib.extendMkDerivation
# name ? repoRevToNameMaybe finalAttrs.repo (lib.revOrTag finalAttrs.revCustom finalAttrs.tag) "github",
private ? false,
@@ -60,7 +61,7 @@ decorate (
assert (
lib.xor (tag == null) (rev == null)
- || throw "fetchFromGitHub requires one of either `rev` or `tag` to be provided (not both)."
+ || throw "${functionName} requires one of either `rev` or `tag` to be provided (not both)."
);
let
@@ -115,6 +116,7 @@ decorate (
"repo"
"tag"
"rev"
+ "functionName"
"private"
"githubBase"
"varPrefix"
@@ -135,7 +137,7 @@ decorate (
in
''
if [ -z "''$${varBase}USERNAME" -o -z "''$${varBase}PASSWORD" ]; then
- echo "Error: Private fetchFromGitHub requires the nix building process (nix-daemon in multi user mode) to have the ${varBase}USERNAME and ${varBase}PASSWORD env vars set." >&2
+ echo "Error: Private ${functionName} requires the nix building process (nix-daemon in multi user mode) to have the ${varBase}USERNAME and ${varBase}PASSWORD env vars set." >&2
exit 1
fi
cat > netrc < "$TMPDIR/albyhub.log" 2>&1 &
+ pid=$!
+ trap 'kill "$pid" 2>/dev/null || true' EXIT
+
+ for _ in $(seq 1 30); do
+ if grep -q "http server started" "$TMPDIR/albyhub.log"; then
+ touch "$out"
+ exit 0
+ fi
+
+ if ! kill -0 "$pid" 2>/dev/null; then
+ echo "albyhub exited before startup" >&2
+ cat "$TMPDIR/albyhub.log" >&2
+ exit 1
+ fi
+
+ sleep 1
+ done
+
+ echo "timed out waiting for albyhub to start" >&2
+ cat "$TMPDIR/albyhub.log" >&2
+ exit 1
+ '';
+
meta = {
description = "Control lightning wallets over nostr";
homepage = "https://github.com/getAlby/hub";
diff --git a/pkgs/by-name/al/algolia-cli/package.nix b/pkgs/by-name/al/algolia-cli/package.nix
index 00061b1b3f7e..ce2c6b3f0da1 100644
--- a/pkgs/by-name/al/algolia-cli/package.nix
+++ b/pkgs/by-name/al/algolia-cli/package.nix
@@ -43,6 +43,6 @@ buildGoModule {
mainProgram = "algolia";
homepage = "https://algolia.com/doc/tools/cli/";
license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ momeemt ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/by-name/al/almo/package.nix b/pkgs/by-name/al/almo/package.nix
index 818dec23a5ef..897886a97d85 100644
--- a/pkgs/by-name/al/almo/package.nix
+++ b/pkgs/by-name/al/almo/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
platforms = lib.platforms.all;
homepage = "https://github.com/abap34/almo";
changelog = "https://github.com/abap34/almo/releases/tag/${finalAttrs.src.tag}";
- maintainers = with lib.maintainers; [ momeemt ];
+ maintainers = [ ];
mainProgram = "almo";
};
})
diff --git a/pkgs/by-name/am/amnezia-vpn-bin/package.nix b/pkgs/by-name/am/amnezia-vpn-bin/package.nix
index 3b20917737ae..c063b5f8f0b4 100644
--- a/pkgs/by-name/am/amnezia-vpn-bin/package.nix
+++ b/pkgs/by-name/am/amnezia-vpn-bin/package.nix
@@ -29,13 +29,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "amnezia-vpn-bin";
- version = "4.8.16.0";
+ version = "4.8.18.0";
__structuredAttrs = true;
src = fetchzip {
url = "https://github.com/amnezia-vpn/amnezia-client/releases/download/${finalAttrs.version}/AmneziaVPN_${finalAttrs.version}_linux_x64.tar";
- hash = "sha256-0gffxBD0pNsyTvqAFdYdjI8rzCkyaXHOApSCu4waP7s=";
+ hash = "sha256-Mypzq/Lm+JI0HljRJ6/0ZDFlwOeVbZB+Lmuy33xE06M=";
};
strictDeps = true;
diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix
index 1e95356b3f79..9d550582c9d3 100644
--- a/pkgs/by-name/am/amp-cli/package.nix
+++ b/pkgs/by-name/am/amp-cli/package.nix
@@ -27,7 +27,7 @@ let
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "amp-cli";
- version = "0.0.1780564400-g2007df";
+ version = "0.0.1781370323-g977781";
src = finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system};
@@ -78,10 +78,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
url = "https://static.ampcode.com/cli/${finalAttrs.version}/amp-${platform}.gz";
hash =
{
- x86_64-linux = "sha256-7hUa1Qs1pNH2+31rrc9T99eDQ9Vq+CSwxROISyPqogY=";
- aarch64-linux = "sha256-ThT2J1YBoZM5+YanRbL40GyxYQtK/xyDqac8fv0gfZs=";
- x86_64-darwin = "sha256-VnuMqXVzqge5jgduxB+woYLVZkFtu92MEsEsrh4tJgE=";
- aarch64-darwin = "sha256-gYAI+eQitglQTBtuilHkHKd8rsYsJ7s2QKoFQR85l6o=";
+ x86_64-linux = "sha256-taXa0AE0re6IoUxr/Sa7Os/pt/u0Zm+eCxRbRW019fA=";
+ aarch64-linux = "sha256-gFfgGlFB+HpV+KAitpOtXu2ij7hQYmxzm8gzy+l79us=";
+ x86_64-darwin = "sha256-1L+J9i/y5fg2rySOfAZySnBbqgmxpM7+7h9CoREI14s=";
+ aarch64-darwin = "sha256-1I7roExnTQFjByVDDr6ym3X+70Ba9IVE9vxBHVlJQIY=";
}
.${system'};
}
diff --git a/pkgs/by-name/ap/apache-airflow/python-package.nix b/pkgs/by-name/ap/apache-airflow/python-package.nix
index 5dba14a2e683..e3cc15913a6f 100644
--- a/pkgs/by-name/ap/apache-airflow/python-package.nix
+++ b/pkgs/by-name/ap/apache-airflow/python-package.nix
@@ -88,355 +88,353 @@
enabledProviders,
}:
-let
- version = "3.2.2";
+buildPythonPackage (
+ finalAttrs:
+ let
+ inherit (finalAttrs) src version;
- src = fetchFromGitHub {
- owner = "apache";
- repo = "airflow";
- tag = version;
- hash = "sha256-nAFSLdcKmP2CNm3rx+/fwIsJnpju7wBl+fYWQV8p+sU=";
- };
+ airflowUi = stdenv.mkDerivation (uiAttrs: {
+ pname = "airflow-ui-assets";
+ inherit src version;
+ sourceRoot = "${src.name}/airflow-core/src/airflow/ui";
- pnpm = pnpm_10;
+ # vite build resolves "localhost" during the build, which the darwin
+ # sandbox blocks by default (getaddrinfo ENOTFOUND localhost).
+ __darwinAllowLocalNetworking = stdenv.hostPlatform.isDarwin;
- airflowUi = stdenv.mkDerivation rec {
- pname = "airflow-ui-assets";
- inherit src version;
- sourceRoot = "${src.name}/airflow-core/src/airflow/ui";
+ nativeBuildInputs = [
+ nodejs
+ pnpm_10
+ pnpmConfigHook
+ ];
- # vite build resolves "localhost" during the build, which the darwin
- # sandbox blocks by default (getaddrinfo ENOTFOUND localhost).
- __darwinAllowLocalNetworking = stdenv.hostPlatform.isDarwin;
+ pnpmDeps = fetchPnpmDeps {
+ pname = "airflow-ui";
+ inherit src version;
+ pnpm = pnpm_10;
+ sourceRoot = uiAttrs.sourceRoot;
+ fetcherVersion = 3;
+ hash = "sha256-wJ2u+y3umecL4IeVW/29/yDgYZ77ffOBQLHeplD3XlQ=";
+ };
- nativeBuildInputs = [
- nodejs
- pnpm
- pnpmConfigHook
+ buildPhase = ''
+ pnpm install
+ pnpm build
+ '';
+
+ installPhase = ''
+ mkdir -p $out/share/airflow/ui
+ cp -r dist $out/share/airflow/ui/
+ '';
+ });
+
+ airflowSimpleAuthUi = stdenv.mkDerivation (simpleUiAttrs: {
+ pname = "airflow-simple-ui-assets";
+ inherit src version;
+ sourceRoot = "${src.name}/airflow-core/src/airflow/api_fastapi/auth/managers/simple/ui";
+
+ __darwinAllowLocalNetworking = stdenv.hostPlatform.isDarwin;
+
+ nativeBuildInputs = [
+ nodejs
+ pnpm_10
+ pnpmConfigHook
+ ];
+
+ pnpmDeps = fetchPnpmDeps {
+ pname = "simple-auth-manager-ui";
+ inherit src version;
+ pnpm = pnpm_10;
+ sourceRoot = simpleUiAttrs.sourceRoot;
+ fetcherVersion = 3;
+ hash = "sha256-AKaafmDjIlg4eFJT1JGyelXVjcId8f0iXTR3JK4ZMq0=";
+ };
+
+ buildPhase = ''
+ pnpm install
+ pnpm build
+ '';
+
+ installPhase = ''
+ mkdir -p $out/share/airflow/simple-ui
+ cp -r dist $out/share/airflow/simple-ui/
+ '';
+ });
+
+ requiredProviders = [
+ "common_compat"
+ "common_io"
+ "common_sql"
+ "smtp"
+ "standard"
];
- pnpmDeps = fetchPnpmDeps {
- pname = "airflow-ui";
- inherit
- sourceRoot
- src
- version
- pnpm
- ;
- fetcherVersion = 3;
- hash = "sha256-wJ2u+y3umecL4IeVW/29/yDgYZ77ffOBQLHeplD3XlQ=";
- };
+ providers = import ./providers.nix;
- buildPhase = ''
- pnpm install
- pnpm build
- '';
+ buildProvider =
+ provider:
+ buildPythonPackage {
+ pname = "apache-airflow-providers-${provider}";
+ version = providers.${provider}.version;
+ pyproject = true;
- installPhase = ''
- mkdir -p $out/share/airflow/ui
- cp -r dist $out/share/airflow/ui/
- '';
- };
+ inherit src;
+ sourceRoot = "${src.name}/providers/${lib.replaceStrings [ "_" ] [ "/" ] provider}";
- airflowSimpleAuthUi = stdenv.mkDerivation rec {
- pname = "airflow-simple-ui-assets";
- inherit src version;
- sourceRoot = "${src.name}/airflow-core/src/airflow/api_fastapi/auth/managers/simple/ui";
+ buildInputs = [ flit-core ];
- __darwinAllowLocalNetworking = stdenv.hostPlatform.isDarwin;
+ dependencies = map (dep: python.pkgs.${dep}) providers.${provider}.deps;
- nativeBuildInputs = [
- nodejs
- pnpm
- pnpmConfigHook
- ];
+ pythonRemoveDeps = [
+ "apache-airflow"
+ ];
- pnpmDeps = fetchPnpmDeps {
- pname = "simple-auth-manager-ui";
- inherit
- sourceRoot
- src
- version
- pnpm
- ;
- fetcherVersion = 3;
- hash = "sha256-AKaafmDjIlg4eFJT1JGyelXVjcId8f0iXTR3JK4ZMq0=";
- };
+ pythonRelaxDeps = [
+ "flit-core"
+ ];
+ };
- buildPhase = ''
- pnpm install
- pnpm build
- '';
-
- installPhase = ''
- mkdir -p $out/share/airflow/simple-ui
- cp -r dist $out/share/airflow/simple-ui/
- '';
- };
-
- requiredProviders = [
- "common_compat"
- "common_io"
- "common_sql"
- "smtp"
- "standard"
- ];
-
- providers = import ./providers.nix;
-
- buildProvider =
- provider:
- buildPythonPackage {
- pname = "apache-airflow-providers-${provider}";
- version = providers.${provider}.version;
+ taskSdk = buildPythonPackage {
+ pname = "task-sdk";
+ inherit src version;
pyproject = true;
- inherit src;
- sourceRoot = "${src.name}/providers/${lib.replaceStrings [ "_" ] [ "/" ] provider}";
+ sourceRoot = "${src.name}/task-sdk";
- buildInputs = [ flit-core ];
+ postPatch = ''
+ # resolve cyclic dependency
+ sed -i -E 's/"apache-airflow-core[^"]+",//' pyproject.toml
- dependencies = map (dep: python.pkgs.${dep}) providers.${provider}.deps;
+ # relax dependencies
+ sed -i -E 's/"hatchling==[^"]+"/"hatchling"/' pyproject.toml
+ sed -i -E 's/"packaging==[^"]+"/"packaging"/' pyproject.toml
+ sed -i -E 's/"trove-classifiers==[^"]+"/"trove-classifiers"/' pyproject.toml
+ sed -i -E 's/"pathspec==[^"]+"/"pathspec"/' pyproject.toml
- pythonRemoveDeps = [
- "apache-airflow"
+ # task-sdk needs config.yml from core subpackage
+ mkdir -p src/airflow/config_templates
+ cp ../airflow-core/src/airflow/config_templates/* src/airflow/config_templates/
+ '';
+
+ build-system = [
+ hatchling
];
- pythonRelaxDeps = [
- "flit-core"
+ dependencies = [
+ asgiref
+ attrs
+ babel
+ colorlog
+ fsspec
+ greenback
+ httpx
+ jinja2
+ jsonschema
+ methodtools
+ msgspec
+ pendulum
+ psutil
+ pydantic
+ pygtrie
+ python-dateutil
+ requests
+ retryhttp
+ structlog
+ tenacity
+ types-requests
];
};
- airflowCore = buildPythonPackage {
- pname = "apache-airflow-core";
- inherit src version;
+ airflowCore = buildPythonPackage {
+ pname = "apache-airflow-core";
+ inherit src version;
+ pyproject = true;
+
+ sourceRoot = "${src.name}/airflow-core";
+
+ postPatch = ''
+ # remove cyclic dependency
+ sed -i -E 's/"apache-airflow-task-sdk[^"]+",//' pyproject.toml
+
+ # relax dependencies
+ sed -i -E 's/"hatchling==[^"]+"/"hatchling"/' pyproject.toml
+ sed -i -E 's/"packaging==[^"]+"/"packaging"/' pyproject.toml
+ sed -i -E 's/"GitPython==[^"]+"/"GitPython"/' pyproject.toml
+ sed -i -E 's/"trove-classifiers==[^"]+"/"trove-classifiers"/' pyproject.toml
+ sed -i -E 's/"smmap==[^"]+"/"smmap"/' pyproject.toml
+ sed -i -E 's/"pathspec==[^"]+"/"pathspec"/' pyproject.toml
+
+ # Copy built UI assets
+ cp -r ${airflowUi}/share/airflow/ui/dist src/airflow/ui/
+ cp -r ${airflowSimpleAuthUi}/share/airflow/simple-ui/dist src/airflow/api_fastapi/auth/managers/simple/ui/
+ '';
+
+ build-system = [
+ gitdb
+ gitpython
+ hatchling
+ packaging
+ smmap
+ tomli
+ trove-classifiers
+ ];
+
+ dependencies = [
+ a2wsgi
+ aiosqlite
+ alembic
+ argcomplete
+ asgiref
+ attrs
+ cachetools
+ cadwyn
+ colorlog
+ cron-descriptor
+ croniter
+ cryptography
+ deprecated
+ dill
+ fastapi
+ httpx
+ importlib-metadata
+ itsdangerous
+ jinja2
+ jsonschema
+ lazy-object-proxy
+ libcst
+ linkify-it-py
+ lockfile
+ methodtools
+ msgspec
+ natsort
+ opentelemetry-api
+ opentelemetry-exporter-otlp
+ packaging
+ pathspec
+ pendulum
+ pluggy
+ psutil
+ pydantic
+ pygments
+ pygtrie
+ pyjwt
+ python-daemon
+ python-dateutil
+ python-slugify
+ pyyaml
+ requests
+ rich
+ rich-argparse
+ rich-click
+ setproctitle
+ sqlalchemy
+ sqlalchemy-jsonfield
+ sqlalchemy-utils
+ starlette
+ structlog
+ svcs
+ tabulate
+ taskSdk
+ tenacity
+ termcolor
+ typing-extensions
+ universal-pathlib
+ uuid6
+ uvicorn
+ ]
+ ++ (map buildProvider requiredProviders);
+
+ pythonRelaxDeps = [ "starlette" ];
+ };
+ in
+ {
+ pname = "apache-airflow";
+ version = "3.2.2";
+
+ strictDeps = true;
+ __structuredAttrs = true;
+
+ src = fetchFromGitHub {
+ owner = "apache";
+ repo = "airflow";
+ tag = finalAttrs.version;
+ hash = "sha256-nAFSLdcKmP2CNm3rx+/fwIsJnpju7wBl+fYWQV8p+sU=";
+ };
+
pyproject = true;
- sourceRoot = "${src.name}/airflow-core";
-
postPatch = ''
- # remove cyclic dependency
- sed -i -E 's/"apache-airflow-task-sdk[^"]+",//' pyproject.toml
-
# relax dependencies
sed -i -E 's/"hatchling==[^"]+"/"hatchling"/' pyproject.toml
sed -i -E 's/"packaging==[^"]+"/"packaging"/' pyproject.toml
- sed -i -E 's/"GitPython==[^"]+"/"GitPython"/' pyproject.toml
sed -i -E 's/"trove-classifiers==[^"]+"/"trove-classifiers"/' pyproject.toml
- sed -i -E 's/"smmap==[^"]+"/"smmap"/' pyproject.toml
sed -i -E 's/"pathspec==[^"]+"/"pathspec"/' pyproject.toml
-
- # Copy built UI assets
- cp -r ${airflowUi}/share/airflow/ui/dist src/airflow/ui/
- cp -r ${airflowSimpleAuthUi}/share/airflow/simple-ui/dist src/airflow/api_fastapi/auth/managers/simple/ui/
'';
+ nativeBuildInputs = [ writableTmpDirAsHomeHook ];
+
build-system = [
gitdb
gitpython
hatchling
packaging
+ pathspec
+ pluggy
smmap
tomli
trove-classifiers
];
dependencies = [
- a2wsgi
- aiosqlite
- alembic
- argcomplete
- asgiref
- attrs
- cachetools
- cadwyn
- colorlog
- cron-descriptor
- croniter
- cryptography
- deprecated
- dill
- fastapi
- httpx
- importlib-metadata
- itsdangerous
- jinja2
- jsonschema
- lazy-object-proxy
- libcst
- linkify-it-py
- lockfile
- methodtools
- msgspec
- natsort
- opentelemetry-api
- opentelemetry-exporter-otlp
- packaging
- pathspec
- pendulum
- pluggy
- psutil
- pydantic
- pygments
- pygtrie
- pyjwt
- python-daemon
- python-dateutil
- python-slugify
- pyyaml
- requests
- rich
- rich-argparse
- rich-click
- setproctitle
- sqlalchemy
- sqlalchemy-jsonfield
- sqlalchemy-utils
- starlette
- structlog
- svcs
- tabulate
- taskSdk
- tenacity
- termcolor
- typing-extensions
- universal-pathlib
- uuid6
- uvicorn
+ airflowCore # subpackage from airflow src
+ taskSdk # subpackage from airflow src
]
- ++ (map buildProvider requiredProviders);
+ ++ (map buildProvider enabledProviders);
- pythonRelaxDeps = [ "starlette" ];
- };
-
- taskSdk = buildPythonPackage {
- pname = "task-sdk";
- inherit src version;
- pyproject = true;
-
- sourceRoot = "${src.name}/task-sdk";
-
- postPatch = ''
- # resolve cyclic dependency
- sed -i -E 's/"apache-airflow-core[^"]+",//' pyproject.toml
-
- # relax dependencies
- sed -i -E 's/"hatchling==[^"]+"/"hatchling"/' pyproject.toml
- sed -i -E 's/"packaging==[^"]+"/"packaging"/' pyproject.toml
- sed -i -E 's/"trove-classifiers==[^"]+"/"trove-classifiers"/' pyproject.toml
- sed -i -E 's/"pathspec==[^"]+"/"pathspec"/' pyproject.toml
-
- # task-sdk needs config.yml from core subpackage
- mkdir -p src/airflow/config_templates
- cp ../airflow-core/src/airflow/config_templates/* src/airflow/config_templates/
+ postInstall = ''
+ # Create a symlink to the airflow-core package
+ mkdir -p $out/bin
+ ln -s ${airflowCore}/bin/airflow $out/bin/airflow
'';
- build-system = [
- hatchling
- ];
+ installCheckPhase = ''
+ runHook preInstallCheck
- dependencies = [
- asgiref
- attrs
- babel
- colorlog
- fsspec
- greenback
- httpx
- jinja2
- jsonschema
- methodtools
- msgspec
- pendulum
- psutil
- pydantic
- pygtrie
- python-dateutil
- requests
- retryhttp
- structlog
- tenacity
- types-requests
- ];
- };
+ $out/bin/airflow version
+ $out/bin/airflow db reset -y
-in
-buildPythonPackage rec {
- pname = "apache-airflow";
- inherit src version;
- pyproject = true;
+ runHook postInstallCheck
+ '';
- postPatch = ''
- # relax dependencies
- sed -i -E 's/"hatchling==[^"]+"/"hatchling"/' pyproject.toml
- sed -i -E 's/"packaging==[^"]+"/"packaging"/' pyproject.toml
- sed -i -E 's/"trove-classifiers==[^"]+"/"trove-classifiers"/' pyproject.toml
- sed -i -E 's/"pathspec==[^"]+"/"pathspec"/' pyproject.toml
- '';
+ pythonImportsCheck = [
+ "airflow"
+ ]
+ ++ lib.concatMap (provider: providers.${provider}.imports) (requiredProviders ++ enabledProviders);
- nativeBuildInputs = [ writableTmpDirAsHomeHook ];
+ passthru.updateScript = ./update.sh;
+ passthru.airflowUi = airflowUi;
+ passthru.airflowSimpleAuthUi = airflowSimpleAuthUi;
- build-system = [
- gitdb
- gitpython
- hatchling
- packaging
- pathspec
- pluggy
- smmap
- tomli
- trove-classifiers
- ];
+ # Note on testing the web UI:
+ # You can (manually) test the web UI as follows:
+ #
+ # nix shell .#apache-airflow
+ # airflow version
+ # airflow db reset # WARNING: this will wipe any existing db state you might have!
+ # airflow standalone
+ #
+ # Then navigate to the localhost URL using the credentials printed, try
+ # triggering the 'example_bash_operator' DAG and see if it reports success.
- dependencies = [
- airflowCore # subpackage from airflow src
- taskSdk # subpackage from airflow src
- ]
- ++ (map buildProvider enabledProviders);
-
- postInstall = ''
- # Create a symlink to the airflow-core package
- mkdir -p $out/bin
- ln -s ${airflowCore}/bin/airflow $out/bin/airflow
- '';
-
- installCheckPhase = ''
- runHook preInstallCheck
-
- $out/bin/airflow version
- $out/bin/airflow db reset -y
-
- runHook postInstallCheck
- '';
-
- pythonImportsCheck = [
- "airflow"
- ]
- ++ lib.concatMap (provider: providers.${provider}.imports) (requiredProviders ++ enabledProviders);
-
- passthru.updateScript = ./update.sh;
- passthru.airflowUi = airflowUi;
- passthru.airflowSimpleAuthUi = airflowSimpleAuthUi;
-
- # Note on testing the web UI:
- # You can (manually) test the web UI as follows:
- #
- # nix shell .#apache-airflow
- # airflow version
- # airflow db reset # WARNING: this will wipe any existing db state you might have!
- # airflow standalone
- #
- # Then navigate to the localhost URL using the credentials printed, try
- # triggering the 'example_bash_operator' DAG and see if it reports success.
-
- meta = {
- description = "Platform to programmatically author, schedule and monitor workflows";
- homepage = "https://airflow.apache.org/";
- changelog = "https://airflow.apache.org/docs/apache-airflow/${version}/release_notes.html";
- license = lib.licenses.asl20;
- maintainers = with lib.maintainers; [
- taranarmo
- ];
- mainProgram = "airflow";
- };
-}
+ meta = {
+ description = "Platform to programmatically author, schedule and monitor workflows";
+ homepage = "https://airflow.apache.org/";
+ changelog = "https://airflow.apache.org/docs/apache-airflow/${finalAttrs.version}/release_notes.html";
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [
+ taranarmo
+ ];
+ mainProgram = "airflow";
+ };
+ }
+)
diff --git a/pkgs/by-name/as/astroterm/package.nix b/pkgs/by-name/as/astroterm/package.nix
index 924bc301471e..37364e45b8a0 100644
--- a/pkgs/by-name/as/astroterm/package.nix
+++ b/pkgs/by-name/as/astroterm/package.nix
@@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "astroterm";
- version = "1.0.10";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "da-luce";
repo = "astroterm";
tag = "v${finalAttrs.version}";
- hash = "sha256-z9KblIAoXk///NnRFHCSAFNDuNiPxDuuiliajcsyJM0=";
+ hash = "sha256-u0UKYoZCDClRmG12czmm0rmOcy3nruarSyjdh8Lu2dw=";
};
bsc5File = fetchurl {
diff --git a/pkgs/by-name/au/autologin/package.nix b/pkgs/by-name/au/autologin/package.nix
index fb7033aab148..65fa96a4b7a5 100644
--- a/pkgs/by-name/au/autologin/package.nix
+++ b/pkgs/by-name/au/autologin/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Run a command inside of a new PAM user session";
- homepage = "https://sr.ht/~kennylevinsen/autologin";
+ homepage = "https://git.sr.ht/~kennylevinsen/autologin";
changelog = "https://git.sr.ht/~kennylevinsen/autologin/refs/${finalAttrs.version}";
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/av/avell-unofficial-control-center/package.nix b/pkgs/by-name/av/avell-unofficial-control-center/package.nix
index 7802f3057deb..47c7961d686f 100644
--- a/pkgs/by-name/av/avell-unofficial-control-center/package.nix
+++ b/pkgs/by-name/av/avell-unofficial-control-center/package.nix
@@ -7,7 +7,7 @@
python3Packages.buildPythonApplication {
pname = "avell-unofficial-control-center";
version = "1.0.4";
- format = "setuptools";
+ pyproject = true;
src = fetchFromGitHub {
owner = "rodgomesc";
@@ -17,14 +17,16 @@ python3Packages.buildPythonApplication {
sha256 = "1qz1kv7p09nxffndzz9jlkzpfx26ppz66f8603zyamjq9dqdmdin";
};
- # No tests included
- doCheck = false;
+ build-system = with python3Packages; [ setuptools ];
- propagatedBuildInputs = with python3Packages; [
+ dependencies = with python3Packages; [
pyusb
elevate
];
+ # No tests included
+ doCheck = false;
+
meta = {
homepage = "https://github.com/rodgomesc/avell-unofficial-control-center";
description = "Software for controlling RGB keyboard lights on some gaming laptops that use ITE Device(8291) Rev 0.03";
diff --git a/pkgs/by-name/av/avro-tools/package.nix b/pkgs/by-name/av/avro-tools/package.nix
index 962349c2119f..eb01fac8f562 100644
--- a/pkgs/by-name/av/avro-tools/package.nix
+++ b/pkgs/by-name/av/avro-tools/package.nix
@@ -36,6 +36,6 @@ stdenv.mkDerivation (finalAttrs: {
mainProgram = "avro-tools";
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
license = lib.licenses.asl20;
- maintainers = with lib.maintainers; [ momeemt ];
+ maintainers = [ ];
};
})
diff --git a/pkgs/by-name/aw/aws-lc/package.nix b/pkgs/by-name/aw/aws-lc/package.nix
index 82c9506c9ca5..1a41182017bd 100644
--- a/pkgs/by-name/aw/aws-lc/package.nix
+++ b/pkgs/by-name/aw/aws-lc/package.nix
@@ -11,13 +11,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "aws-lc";
- version = "1.69.0";
+ version = "5.0.0";
src = fetchFromGitHub {
owner = "aws";
repo = "aws-lc";
rev = "v${finalAttrs.version}";
- hash = "sha256-ykpPbMONAJK6rEANOn0O7JfIkXPSoPXs1Zr4Bv+eXqQ=";
+ hash = "sha256-Dvy6mzEfKgimxCGp7q2fPk9urBMJMU6gZmaZXwdZfWw=";
};
outputs = [
@@ -47,6 +47,11 @@ stdenv.mkDerivation (finalAttrs: {
runHook postCheck
'';
+ postInstall = ''
+ moveToOutput lib/crypto/cmake "$dev"
+ moveToOutput lib/ssl/cmake "$dev"
+ '';
+
env.NIX_CFLAGS_COMPILE = toString (
lib.optionals stdenv.cc.isGNU [
# Needed with GCC 12 but breaks on darwin (with clang)
diff --git a/pkgs/by-name/ba/backintime-common/package.nix b/pkgs/by-name/ba/backintime-common/package.nix
index e9fb6e0d9025..7d4615325f40 100644
--- a/pkgs/by-name/ba/backintime-common/package.nix
+++ b/pkgs/by-name/ba/backintime-common/package.nix
@@ -9,6 +9,7 @@
cron,
openssh,
sshfs-fuse,
+ fuse3,
gocryptfs,
which,
ps,
@@ -73,11 +74,14 @@ stdenv.mkDerivation (finalAttrs: {
--replace-fail "share" "${python'.sitePackages}"
substituteInPlace "schedule.py" \
- --replace-fail "'crontab'" "'${cron}/bin/crontab'" \
+ --replace-fail "'crontab'" "'${lib.getExe' cron "crontab"}'" \
--replace-fail "'which'" "'${lib.getExe which}'" \
--replace-fail "'ps'" "'${lib.getExe ps}'" \
--replace-fail "'grep'" "'${lib.getExe gnugrep}'" \
+ substituteInPlace mount.py \
+ --replace-fail "'fusermount'" "'${lib.getExe' fuse3 "fusermount3"}'"
+
substituteInPlace "bitlicense.py" \
--replace-fail "/usr/share/doc" "$out/share/doc" \
'';
diff --git a/pkgs/by-name/ba/bazel-gazelle/package.nix b/pkgs/by-name/ba/bazel-gazelle/package.nix
index a6d180098248..24e3c6c62f0e 100644
--- a/pkgs/by-name/ba/bazel-gazelle/package.nix
+++ b/pkgs/by-name/ba/bazel-gazelle/package.nix
@@ -6,13 +6,13 @@
buildGoModule (finalAttrs: {
pname = "bazel-gazelle";
- version = "0.47.0";
+ version = "0.51.3";
src = fetchFromGitHub {
- owner = "bazelbuild";
+ owner = "bazel-contrib";
repo = "bazel-gazelle";
- rev = "v${finalAttrs.version}";
- hash = "sha256-rnJ8rht7ccAI8ceOv3B0mlcY0fQg9Nfy+hu+/pmQQqE=";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-ooqk4xutkjXoy9Irikos/53+6Mhdh3+WmJF7vo3JVFw=";
};
vendorHash = null;
@@ -22,14 +22,18 @@ buildGoModule (finalAttrs: {
subPackages = [ "cmd/gazelle" ];
meta = {
- homepage = "https://github.com/bazelbuild/bazel-gazelle";
+ changelog = "https://github.com/bazel-contrib/bazel-gazelle/releases/tag/${finalAttrs.src.tag}";
+ homepage = "https://github.com/bazel-contrib/bazel-gazelle";
description = ''
Gazelle is a Bazel build file generator for Bazel projects. It natively
supports Go and protobuf, and it may be extended to support new languages
and custom rule sets.
'';
license = lib.licenses.asl20;
- maintainers = with lib.maintainers; [ kalbasit ];
+ maintainers = with lib.maintainers; [
+ kalbasit
+ hythera
+ ];
mainProgram = "gazelle";
};
})
diff --git a/pkgs/by-name/ba/bazel_8/examples.nix b/pkgs/by-name/ba/bazel_8/examples.nix
index 689bb9c0a753..596600749b4b 100644
--- a/pkgs/by-name/ba/bazel_8/examples.nix
+++ b/pkgs/by-name/ba/bazel_8/examples.nix
@@ -108,10 +108,10 @@ in
bazelVendorDepsFOD = {
outputHash =
{
- aarch64-darwin = "sha256-wjVwHQEtIoApY01s9AEVExmRhy+LLQv0/B2vAxmXz+o=";
- aarch64-linux = "sha256-Z7Y8bBEaPgp9y6RZoC5Ewqvzi//vnamkpeHXGpoBFAQ=";
- x86_64-darwin = "sha256-aUTfOrsa59zUE0Wb+u5TORQR0nAGQ/7MWSRHc2hcXoo=";
- x86_64-linux = "sha256-yrXIJocCGq4NYW0jg5s2cMDEvknrtjtBQo6cZFbz8CE=";
+ aarch64-darwin = "sha256-50cAS1okGT1Mq3+TNLk2dk6OdBOAF2LdcskcYuVNOSY=";
+ aarch64-linux = "sha256-2Oia7+2nzLrWeo/bK/5L7du5Y30DY+S0jit6e1ixJXw=";
+ x86_64-darwin = "sha256-+vgvj3ABm+vvXT7U7JxjuzIMwVAiUh1gcWZnFNzcmY0=";
+ x86_64-linux = "sha256-kBnSlFRfYsotZTRMrTNhk8/106+BLzwuU6MIRXlD1jE=";
}
.${stdenv.hostPlatform.system};
outputHashAlgo = "sha256";
diff --git a/pkgs/by-name/ba/bazel_8/package.nix b/pkgs/by-name/ba/bazel_8/package.nix
index 7ea81a4c92d3..eb4388d842a1 100644
--- a/pkgs/by-name/ba/bazel_8/package.nix
+++ b/pkgs/by-name/ba/bazel_8/package.nix
@@ -31,7 +31,7 @@
cctools,
# Allow to independently override the jdks used to build and run respectively
jdk_headless,
- version ? "8.6.0",
+ version ? "8.7.0",
}:
let
@@ -45,7 +45,7 @@ let
src = fetchzip {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
- hash = "sha256-W22eB0IzHNZe3xaF8AZOkUTDCic3NXkypdqSDY61Su0=";
+ hash = "sha256-bm+gkkrAVepJWZddDEV1+jX4jRdD+tZ1TH2YG9adIyk=";
stripRoot = false;
};
diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix
index 3dfd2513b7ee..5bbbbae658e8 100644
--- a/pkgs/by-name/bi/bitwarden-desktop/package.nix
+++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix
@@ -95,9 +95,6 @@ buildNpmPackage rec {
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
- # make electron-builder not attempt to codesign the app on darwin
- env.CSC_IDENTITY_AUTO_DISCOVERY = "false";
-
nativeBuildInputs = [
cargo
dart-sass
diff --git a/pkgs/by-name/bl/blackfire/package.nix b/pkgs/by-name/bl/blackfire/package.nix
index 923a0e46d950..0652939fdc29 100644
--- a/pkgs/by-name/bl/blackfire/package.nix
+++ b/pkgs/by-name/bl/blackfire/package.nix
@@ -11,7 +11,7 @@
stdenv.mkDerivation rec {
pname = "blackfire";
- version = "2.29.7";
+ version = "2026.6.0";
src =
passthru.sources.${stdenv.hostPlatform.system}
@@ -60,23 +60,23 @@ stdenv.mkDerivation rec {
sources = {
"x86_64-linux" = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb";
- sha256 = "47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=";
+ hash = "sha256-JPhh7LNiLZXLN5iycNobZ/uJQjOhKqqYSw9P78+/BKk=";
};
"i686-linux" = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb";
- sha256 = "47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=";
+ hash = "sha256-uoqUDJ/bexqaRlf5Y692OGm91W1ErlS8Q8/l9MlsHwU=";
};
"aarch64-linux" = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb";
- sha256 = "47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=";
+ hash = "sha256-kL9s17Bnt8UYj3IiX2b7e3OWSsRLq5TSzdK6OdByD40=";
};
"aarch64-darwin" = fetchurl {
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz";
- sha256 = "TvxIm4plE7nnTIkJNfCzxzr2r0B2Aqlxdveb1M+sqL4=";
+ hash = "sha256-p9D87uaDVu25SG4cclmzaq9oKaFDlIy8/XLx3rHuIQ4=";
};
"x86_64-darwin" = fetchurl {
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz";
- sha256 = "oNDNIPBqvaARz9W967bxuvo2bpPORiHci3sryGqznsU=";
+ hash = "sha256-ppCSvk259NNlujl9olyRlmwRdNbLu/uRs+gq71S79B8=";
};
};
diff --git a/pkgs/by-name/bl/bloaty/package.nix b/pkgs/by-name/bl/bloaty/package.nix
index 08cb16425ec1..e79fe2cc40ab 100644
--- a/pkgs/by-name/bl/bloaty/package.nix
+++ b/pkgs/by-name/bl/bloaty/package.nix
@@ -86,6 +86,6 @@ stdenv.mkDerivation {
homepage = "https://github.com/google/bloaty";
license = lib.licenses.asl20;
platforms = lib.platforms.unix;
- maintainers = with lib.maintainers; [ momeemt ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/by-name/bl/blocky/package.nix b/pkgs/by-name/bl/blocky/package.nix
index 7d0cb1fae802..0c5d680dc1ea 100644
--- a/pkgs/by-name/bl/blocky/package.nix
+++ b/pkgs/by-name/bl/blocky/package.nix
@@ -7,20 +7,20 @@
buildGoModule (finalAttrs: {
pname = "blocky";
- version = "0.30.0";
+ version = "0.31.0";
src = fetchFromGitHub {
owner = "0xERR0R";
repo = "blocky";
rev = "v${finalAttrs.version}";
- hash = "sha256-SZpAPX+MIQA0HRUUmjXi7g+DEJ+jyub4rlyc0RLclew=";
+ hash = "sha256-qFGJaShWplvZo/uKRjizWWeb/OzLJCoL9YTRsKWTriY=";
};
# needs network connection and fails at
# https://github.com/0xERR0R/blocky/blob/development/resolver/upstream_resolver_test.go
doCheck = false;
- vendorHash = "sha256-DahHFf0w0ksQniuVByX45/fLcqpAga23qMjAGnZTjjY=";
+ vendorHash = "sha256-EsGaY3U6bHjQTj+rLRtjiQJoNP5WnP7/gZ2NrRX53b0=";
ldflags = [
"-s"
diff --git a/pkgs/by-name/bs/bsky-cli/package.nix b/pkgs/by-name/bs/bsky-cli/package.nix
index 9d0ec625ec3d..154f6c686220 100644
--- a/pkgs/by-name/bs/bsky-cli/package.nix
+++ b/pkgs/by-name/bs/bsky-cli/package.nix
@@ -8,16 +8,16 @@
}:
buildGoModule (finalAttrs: {
pname = "bsky-cli";
- version = "0.0.79";
+ version = "0.0.81";
src = fetchFromGitHub {
owner = "mattn";
repo = "bsky";
tag = "v${finalAttrs.version}";
- hash = "sha256-id7+g9NMCSicPbDoDSqnc7OwEMIVXbXw3O8TkeQjfmg=";
+ hash = "sha256-Su2AhHaIozuqTzK1vyAjZR/a01j0dnlayV14Q7hTcCU=";
};
- vendorHash = "sha256-m4kth6r13++53fbceWjKYu4D297meAwnkaSsCiu5zS8=";
+ vendorHash = "sha256-jGeKaAR0rAqrhoUx/FqdDwdOxA/WioppFjGyi/PsIQs=";
buildInputs = [
libpcap
diff --git a/pkgs/by-name/bu/buildpack/package.nix b/pkgs/by-name/bu/buildpack/package.nix
index a3ac52c26266..09dcb0b5cc33 100644
--- a/pkgs/by-name/bu/buildpack/package.nix
+++ b/pkgs/by-name/bu/buildpack/package.nix
@@ -42,6 +42,6 @@ buildGoModule (finalAttrs: {
description = "CLI for building apps using Cloud Native Buildpacks";
mainProgram = "pack";
license = lib.licenses.asl20;
- maintainers = with lib.maintainers; [ momeemt ];
+ maintainers = [ ];
};
})
diff --git a/pkgs/by-name/bu/bundletool/package.nix b/pkgs/by-name/bu/bundletool/package.nix
index befdb021fcb1..e9762efa20d8 100644
--- a/pkgs/by-name/bu/bundletool/package.nix
+++ b/pkgs/by-name/bu/bundletool/package.nix
@@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
homepage = "https://developer.android.com/studio/command-line/bundletool";
changelog = "https://github.com/google/bundletool/releases/tag/${finalAttrs.version}";
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
- maintainers = with lib.maintainers; [ momeemt ];
+ maintainers = [ ];
platforms = jre_headless.meta.platforms;
license = lib.licenses.asl20;
};
diff --git a/pkgs/by-name/by/byobu/package.nix b/pkgs/by-name/by/byobu/package.nix
index 95db27a77ca8..926b82cd66cc 100644
--- a/pkgs/by-name/by/byobu/package.nix
+++ b/pkgs/by-name/by/byobu/package.nix
@@ -18,13 +18,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "byobu";
- version = "6.13";
+ version = "6.15";
src = fetchFromGitHub {
owner = "dustinkirkland";
repo = "byobu";
- rev = finalAttrs.version;
- hash = "sha256-h+3BEMfBRozmpqFNRyfKzjKgevaYm8v7DsJMwkhiCQ4=";
+ tag = finalAttrs.version;
+ hash = "sha256-QovoXH8cm8CZMSYGjI7FgynHtJjahpe9R2s62F7aZvo=";
};
nativeBuildInputs = [
@@ -103,9 +103,9 @@ stdenv.mkDerivation (finalAttrs: {
Tmux terminal multiplexer, and works on most Linux, BSD, and Mac
distributions.
'';
- license = with lib.licenses; [ gpl3Plus ];
+ license = lib.licenses.gpl3Plus;
mainProgram = "byobu";
- maintainers = [ ];
+ maintainers = with lib.maintainers; [ cbrxyz ];
platforms = lib.platforms.unix;
};
})
diff --git a/pkgs/by-name/ca/caffeine-ng/fix-build.patch b/pkgs/by-name/ca/caffeine-ng/fix-build.patch
index cf075451138f..5600731771d7 100644
--- a/pkgs/by-name/ca/caffeine-ng/fix-build.patch
+++ b/pkgs/by-name/ca/caffeine-ng/fix-build.patch
@@ -13,12 +13,3 @@ index 3e4f9ea..5b82861 100644
)
dependency('pygobject-3.0')
-@@ -82,7 +78,7 @@ configure_file(
-
- install_data(
- 'share/applications/caffeine.desktop',
-- install_dir: '/etc/xdg/autostart',
-+ install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'),
- )
-
- install_data(
diff --git a/pkgs/by-name/ca/caffeine-ng/package.nix b/pkgs/by-name/ca/caffeine-ng/package.nix
index 25db55074f19..481aa8870161 100644
--- a/pkgs/by-name/ca/caffeine-ng/package.nix
+++ b/pkgs/by-name/ca/caffeine-ng/package.nix
@@ -19,14 +19,14 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "caffeine-ng";
- version = "4.2.0";
+ version = "4.3.2";
pyproject = false;
src = fetchFromCodeberg {
owner = "WhyNotHugo";
repo = "caffeine-ng";
rev = "v${finalAttrs.version}";
- hash = "sha256-uYzLRZ+6ZgIwhSuJWRBpLYHgonX7sFXgUZid0V26V0Q=";
+ hash = "sha256-eJ/0lzE5X1WFhgTAgI/SOmtxPbK7ppTk90RWobPZk2o=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/cargo-risczero/package.nix b/pkgs/by-name/ca/cargo-risczero/package.nix
index 579345d9b265..aed35ada6c6e 100644
--- a/pkgs/by-name/ca/cargo-risczero/package.nix
+++ b/pkgs/by-name/ca/cargo-risczero/package.nix
@@ -49,6 +49,6 @@ rustPlatform.buildRustPackage rec {
mainProgram = "cargo-risczero";
homepage = "https://risczero.com";
license = with lib.licenses; [ asl20 ];
- maintainers = with lib.maintainers; [ cameronfyfe ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix
index 06d2ec65d2fe..4885076909d1 100644
--- a/pkgs/by-name/cd/cdncheck/package.nix
+++ b/pkgs/by-name/cd/cdncheck/package.nix
@@ -6,13 +6,13 @@
buildGoModule (finalAttrs: {
pname = "cdncheck";
- version = "1.2.39";
+ version = "1.2.40";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "cdncheck";
tag = "v${finalAttrs.version}";
- hash = "sha256-zBxNONUM5/7i7qmLzCl/xWadbP9FO9xWD/j96ncyIBo=";
+ hash = "sha256-awlLfO9YvsRwLRguCB+qDBYuqRkQb2Z+8gdTvzwDQYs=";
};
vendorHash = "sha256-iJ1agL7sZ3ZKbW1wMA+qi8FgHdPa6gZLQ5BBPKJTNaQ=";
diff --git a/pkgs/by-name/cf/cfn-nag/package.nix b/pkgs/by-name/cf/cfn-nag/package.nix
index b5f7cd01298a..f4ba07fd8c1a 100644
--- a/pkgs/by-name/cf/cfn-nag/package.nix
+++ b/pkgs/by-name/cf/cfn-nag/package.nix
@@ -19,7 +19,6 @@ bundlerEnv {
mainProgram = "cfn_nag";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
- momeemt
mathstlouis
];
platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/cl/clean-css-cli/package.nix b/pkgs/by-name/cl/clean-css-cli/package.nix
index 4141f0731390..bfdf30b9a55e 100644
--- a/pkgs/by-name/cl/clean-css-cli/package.nix
+++ b/pkgs/by-name/cl/clean-css-cli/package.nix
@@ -26,6 +26,6 @@ buildNpmPackage (finalAttrs: {
changelog = "https://github.com/clean-css/clean-css-cli/blob/v${finalAttrs.version}/History.md";
license = lib.licenses.mit;
mainProgram = "cleancss";
- maintainers = with lib.maintainers; [ momeemt ];
+ maintainers = [ ];
};
})
diff --git a/pkgs/by-name/cl/clojure/package.nix b/pkgs/by-name/cl/clojure/package.nix
index 89657a94199b..5e6ee69fd55c 100644
--- a/pkgs/by-name/cl/clojure/package.nix
+++ b/pkgs/by-name/cl/clojure/package.nix
@@ -10,7 +10,9 @@
rlwrap,
makeWrapper,
writeScript,
+ versionCheckHook,
}:
+
stdenv.mkDerivation (finalAttrs: {
pname = "clojure";
version = "1.12.5.1654";
@@ -31,6 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
];
strictDeps = true;
+ __structuredAttrs = true;
# See https://github.com/clojure/brew-install/blob/1.10.3/src/main/resources/clojure/install/linux-install.sh
installPhase =
@@ -69,11 +72,17 @@ stdenv.mkDerivation (finalAttrs: {
doInstallCheck = true;
+ nativeInstallCheckInputs = [ versionCheckHook ];
+
installCheckPhase = ''
+ runHook preInstallCheck
+
CLJ_CONFIG=$TMPDIR CLJ_CACHE=$TMPDIR/.clj_cache $out/bin/clojure \
-Spath \
-Sverbose \
-Scp $out/libexec/clojure-tools-${finalAttrs.version}.jar
+
+ runHook postInstallCheck
'';
passthru.updateScript = writeScript "update-clojure" ''
@@ -99,6 +108,7 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://clojure.org/";
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
license = lib.licenses.epl10;
+ mainProgram = "clojure";
longDescription = ''
Clojure is a dynamic programming language that targets the Java
Virtual Machine. It is designed to be a general-purpose language,
diff --git a/pkgs/by-name/co/corefonts/package.nix b/pkgs/by-name/co/corefonts/package.nix
index bf7dc985b2c4..ce3cb273f7f3 100644
--- a/pkgs/by-name/co/corefonts/package.nix
+++ b/pkgs/by-name/co/corefonts/package.nix
@@ -3,6 +3,7 @@
stdenv,
fetchurl,
cabextract,
+ installFonts,
}:
let
@@ -76,7 +77,10 @@ stdenv.mkDerivation {
) fonts
);
- nativeBuildInputs = [ cabextract ];
+ nativeBuildInputs = [
+ cabextract
+ installFonts
+ ];
buildCommand = ''
for i in $exes; do
@@ -124,7 +128,9 @@ stdenv.mkDerivation {
mv webdings.ttf Webdings.ttf.tmp
mv Webdings.ttf.tmp Webdings.ttf
- install -m444 -Dt $out/share/fonts/truetype *.ttf
+ # using buildCommand means no phases are run
+ # so we run the function ourselves
+ installFonts
# Also put the EULA there to be on the safe side.
cp ${eula} $out/share/fonts/truetype/eula.html
diff --git a/pkgs/by-name/cp/cpufetch/darwin-x86-sysctl.patch b/pkgs/by-name/cp/cpufetch/darwin-x86-sysctl.patch
new file mode 100644
index 000000000000..a5644516fd5c
--- /dev/null
+++ b/pkgs/by-name/cp/cpufetch/darwin-x86-sysctl.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -30,7 +30,7 @@
+ HEADERS += $(SRC_DIR)freq/freq.h
+ CFLAGS += -pthread
+ endif
+- ifeq ($(os), FreeBSD)
++ ifneq (,$(filter $(os),FreeBSD Darwin))
+ SOURCE += $(SRC_COMMON)sysctl.c
+ HEADERS += $(SRC_COMMON)sysctl.h
+ endif
diff --git a/pkgs/by-name/cp/cpufetch/package.nix b/pkgs/by-name/cp/cpufetch/package.nix
index 9ccd5a422957..cd046f27b87a 100644
--- a/pkgs/by-name/cp/cpufetch/package.nix
+++ b/pkgs/by-name/cp/cpufetch/package.nix
@@ -20,6 +20,15 @@ stdenv.mkDerivation (finalAttrs: {
installShellFiles
];
+ # Upstream Makefile bug: for x86 builds, sysctl.c is only added to
+ # SOURCE on FreeBSD even though cpuid.c calls get_sys_info_by_name
+ # (defined there) on darwin too. Without this the x86_64-darwin
+ # build fails to link with "Undefined symbols: _get_sys_info_by_name".
+ # Widen the conditional to cover Darwin alongside FreeBSD.
+ patches = lib.optionals stdenv.hostPlatform.isDarwin [
+ ./darwin-x86-sysctl.patch
+ ];
+
installPhase = ''
runHook preInstall
diff --git a/pkgs/by-name/da/dashy-ui/package.nix b/pkgs/by-name/da/dashy-ui/package.nix
index dd69197b546b..5ec288bb0bec 100644
--- a/pkgs/by-name/da/dashy-ui/package.nix
+++ b/pkgs/by-name/da/dashy-ui/package.nix
@@ -17,16 +17,16 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "dashy-ui";
- version = "4.2.2";
+ version = "4.3.3";
src = fetchFromGitHub {
owner = "lissy93";
repo = "dashy";
tag = finalAttrs.version;
- hash = "sha256-8oShyf4TfHjPG/yxK1sbZA5gHyqOQYqfoUEDQlaJgU0=";
+ hash = "sha256-3uzitxmaFKWrB8NOEFs2eEOqqYDW9R8pH1VAMEutBKU=";
};
yarnOfflineCache = fetchYarnDeps {
yarnLock = finalAttrs.src + "/yarn.lock";
- hash = "sha256-5a2ypu6A4WOGdcm6HlvuzuCEgq3szd64zqTp/rmnjh4=";
+ hash = "sha256-5yYaOZk/SiR5vvM860JQkH3/TjVOFMnqwRlxxziKMr8=";
};
passthru = {
diff --git a/pkgs/by-name/de/deno/rusty-v8/default.nix b/pkgs/by-name/de/deno/rusty-v8/default.nix
index b9865c673fa4..b47f11b08365 100644
--- a/pkgs/by-name/de/deno/rusty-v8/default.nix
+++ b/pkgs/by-name/de/deno/rusty-v8/default.nix
@@ -16,6 +16,7 @@
glib,
glibc,
icu,
+ libffi,
python3,
gn,
ninja,
@@ -106,6 +107,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
buildInputs = [
glib
icu
+ libffi
]
++ lib.optionals stdenv.targetPlatform.isDarwin [
apple-sdk_15
@@ -123,6 +125,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
RUSTC_BOOTSTRAP = 1;
EXTRA_GN_ARGS = lib.concatStringsSep " " (
[
+ "use_system_libffi=true"
"use_sysroot=false" # prevent download of debian sysroot
"clang_version=\"${lib.versions.major llvmPackages.clang.version}\""
"rustc_version=\"${rustc.version}\""
diff --git a/pkgs/by-name/di/digidrie/package.nix b/pkgs/by-name/di/digidrie/package.nix
new file mode 100644
index 000000000000..0fad8cfe3d1e
--- /dev/null
+++ b/pkgs/by-name/di/digidrie/package.nix
@@ -0,0 +1,54 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ pkg-config,
+ libGL,
+ libx11,
+ libjack2,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "digidrie";
+ version = "0.3.1";
+ __structuredAttrs = true;
+ strictDeps = true;
+
+ src = fetchFromGitHub {
+ owner = "magnetophon";
+ repo = "DigiDrie";
+ tag = "v${finalAttrs.version}";
+ fetchSubmodules = true;
+ hash = "sha256-bmytfZ6/V9eoEnj5xLq3Yzlhy0VGEK6utsfS9OCYWd0=";
+ };
+
+ nativeBuildInputs = [ pkg-config ];
+
+ buildInputs = [
+ libGL
+ libx11
+ libjack2
+ ];
+
+ sourceRoot = "${finalAttrs.src.name}/plugin/dpf";
+
+ postPatch = ''
+ patchShebangs generate-ttl.sh patch/apply.sh
+ '';
+
+ enableParallelBuilding = true;
+
+ makeFlags = [ "PREFIX=${placeholder "out"}" ];
+
+ meta = {
+ description = "Monophonic Faust synth with vector synthesis, CZ-style oscillators and macro morphing (DPF: JACK/LV2/VST2/VST3/CLAP)";
+ homepage = "https://github.com/magnetophon/DigiDrie";
+ license = lib.licenses.agpl3Only;
+ maintainers = [ lib.maintainers.magnetophon ];
+ platforms = [
+ "x86_64-linux"
+ "aarch64-linux"
+ ];
+ mainProgram = "DigiDrie";
+ };
+})
diff --git a/pkgs/by-name/dn/dnsmasq/CVE-2026-6507.patch b/pkgs/by-name/dn/dnsmasq/CVE-2026-6507.patch
deleted file mode 100644
index 62249150aa3b..000000000000
--- a/pkgs/by-name/dn/dnsmasq/CVE-2026-6507.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 9ad74926d4f7f34ff902e1db5235535aa813c33f Mon Sep 17 00:00:00 2001
-From: Simon Kelley
-Date: Mon, 6 Apr 2026 22:22:43 +0100
-Subject: [PATCH] Fix 1-byte buffer overflow in relay_reply4()
-
-Potential SIGSEGV when using DHCPv4-relay.
-
-Thanks to Asim Viladi Oglu Manizada for finding this.
----
- src/rfc2131.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/rfc2131.c b/src/rfc2131.c
-index 7bdfefd..55aad03 100644
---- a/src/rfc2131.c
-+++ b/src/rfc2131.c
-@@ -3248,7 +3248,7 @@ unsigned int relay_reply4(struct dhcp_packet *mess, size_t sz, char *arrival_int
-
- /* delete agent info before return RFC 3046 para 2.1 */
- *opt = OPTION_END;
-- memset(opt + 1, 0, option_len(opt) + 2);
-+ memset(opt + 1, 0, option_len(opt) + 1);
- }
- }
- else if (mess->giaddr.s_addr == relay->local.addr4.s_addr)
---
-2.20.1
-
diff --git a/pkgs/by-name/dn/dnsmasq/package.nix b/pkgs/by-name/dn/dnsmasq/package.nix
index 6665b9776527..c46aee2aebeb 100644
--- a/pkgs/by-name/dn/dnsmasq/package.nix
+++ b/pkgs/by-name/dn/dnsmasq/package.nix
@@ -30,18 +30,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "dnsmasq";
- version = "2.92rel2";
+ version = "2.93";
src = fetchurl {
url = "https://www.thekelleys.org.uk/dnsmasq/dnsmasq-${finalAttrs.version}.tar.xz";
- hash = "sha256-Q9crjBKb3zPRe6/tyYgj9j5GtQBRKAZr8NKkcqMs4Go=";
+ hash = "sha256-DADU5cl8gwbl+5MrNIs0JpycKaDn3w6OgpWLQHCSvBk=";
};
- patches = [
- # https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=patch;h=9ad74926d4f7f34ff902e1db5235535aa813c33f
- ./CVE-2026-6507.patch
- ];
-
postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
sed '1i#include ' -i src/dhcp.c
'';
diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix
index 50b3d16f8e1e..667d62e97ce6 100644
--- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix
@@ -1,7 +1,7 @@
{ mkDprintPlugin }:
mkDprintPlugin {
description = "Biome (JS/TS/JSON) wrapper plugin";
- hash = "sha256-0zbtVqdL86r69ahRS61qJ2r7qUtRzfY1qO1FL+SWt+g=";
+ hash = "sha256-HX4IOjLOGiqacEPdoaGy6QWq7Va1SEOk0J7+U5Rz2QM=";
initConfig = {
configExcludes = [ "**/node_modules" ];
configKey = "biome";
@@ -17,6 +17,6 @@ mkDprintPlugin {
};
pname = "dprint-plugin-biome";
updateUrl = "https://plugins.dprint.dev/dprint/biome/latest.json";
- url = "https://plugins.dprint.dev/biome-0.12.12.wasm";
- version = "0.12.12";
+ url = "https://plugins.dprint.dev/biome-0.13.0.wasm";
+ version = "0.13.0";
}
diff --git a/pkgs/by-name/dr/drafting-mono/package.nix b/pkgs/by-name/dr/drafting-mono/package.nix
index a08f50c5eb13..39a2745cc21f 100644
--- a/pkgs/by-name/dr/drafting-mono/package.nix
+++ b/pkgs/by-name/dr/drafting-mono/package.nix
@@ -2,11 +2,18 @@
lib,
stdenvNoCC,
fetchFromGitHub,
+ installFonts,
}:
+
stdenvNoCC.mkDerivation {
pname = "drafting-mono";
version = "1.1-unstable-2024-06-04";
+ outputs = [
+ "out"
+ "webfont"
+ ];
+
src = fetchFromGitHub {
owner = "indestructible-type";
repo = "Drafting";
@@ -14,14 +21,7 @@ stdenvNoCC.mkDerivation {
hash = "sha256-J64mmDOzTV4MRuZO3MB2SSX5agCRjLDjXAPXuDfdlOM=";
};
- installPhase = ''
- runHook preInstall
-
- mkdir -p $out/share/fonts/truetype
- cp fonts/*/*.otf $out/share/fonts/truetype
-
- runHook postInstall
- '';
+ nativeBuildInputs = [ installFonts ];
meta = {
homepage = "https://indestructibletype.com/Drafting/";
diff --git a/pkgs/by-name/dr/drawio/package.nix b/pkgs/by-name/dr/drawio/package.nix
index f93da550e2cd..a494d80edfeb 100644
--- a/pkgs/by-name/dr/drawio/package.nix
+++ b/pkgs/by-name/dr/drawio/package.nix
@@ -64,19 +64,18 @@ stdenv.mkDerivation (finalAttrs: {
buildPhase = ''
runHook preBuild
- ''
- + lib.optionalString stdenv.hostPlatform.isDarwin ''
- cp -R ${electron.dist}/Electron.app Electron.app
- chmod -R u+w Electron.app
- export CSC_IDENTITY_AUTO_DISCOVERY=false
+ electron_dist="$(mktemp -d)"
+ cp -r ${electron.dist}/. "$electron_dist"
+ chmod -R u+w "$electron_dist"
+
sed -i "/afterSign/d" electron-builder-linux-mac.json
- ''
- + ''
+
npm exec electron-builder -- \
--dir \
- ${lib.optionalString stdenv.hostPlatform.isDarwin "--config electron-builder-linux-mac.json --config.mac.identity=null"} \
- -c.electronDist=${if stdenv.hostPlatform.isDarwin then "." else electron.dist} \
- -c.electronVersion=${electron.version}
+ --config electron-builder-linux-mac.json \
+ -c.electronDist="$electron_dist" \
+ -c.electronVersion=${electron.version} \
+ -c.mac.identity=null
runHook postBuild
'';
diff --git a/pkgs/by-name/du/dumbpipe/package.nix b/pkgs/by-name/du/dumbpipe/package.nix
index e76e8e71f581..57515cc69043 100644
--- a/pkgs/by-name/du/dumbpipe/package.nix
+++ b/pkgs/by-name/du/dumbpipe/package.nix
@@ -46,7 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
asl20
mit
];
- maintainers = with lib.maintainers; [ cameronfyfe ];
+ maintainers = [ ];
mainProgram = "dumbpipe";
};
})
diff --git a/pkgs/by-name/dv/dvdisaster/package.nix b/pkgs/by-name/dv/dvdisaster/package.nix
index e68dfba2d32c..55881bdbea47 100644
--- a/pkgs/by-name/dv/dvdisaster/package.nix
+++ b/pkgs/by-name/dv/dvdisaster/package.nix
@@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dvdisaster";
- version = "0.79.10-pl5";
+ version = "0.79.10-pl6";
src = fetchFromGitHub {
owner = "speed47";
repo = "dvdisaster";
tag = "v${finalAttrs.version}";
- hash = "sha256-lWvZDB08lZb87l4oEbrdtc6Me4mWHiW3DFNXYoYR3a0=";
+ hash = "sha256-yQldvTvmbZgIOLKzdubd1zomSRKvAkTnS6hpEYWPr8A=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/dx/dxmt/package.nix b/pkgs/by-name/dx/dxmt/package.nix
new file mode 100644
index 000000000000..2545292cb01b
--- /dev/null
+++ b/pkgs/by-name/dx/dxmt/package.nix
@@ -0,0 +1,132 @@
+{
+ lib,
+ stdenv,
+ pkgsCross,
+ fetchFromGitHub,
+ buildPackages,
+ cmake,
+ git,
+ python3,
+ meson,
+ ninja,
+ tinyxxd,
+ sqlite,
+ libz,
+ ncurses,
+ libxml2,
+ wine64,
+ darwin,
+ symlinkJoin,
+}:
+let
+ dxmt-llvm = stdenv.mkDerivation rec {
+ pname = "dxmt-llvm";
+ version = "15.0.7";
+
+ src = fetchFromGitHub {
+ owner = "llvm";
+ repo = "llvm-project";
+ tag = version;
+ hash = "sha256-wjuZQyXQ/jsmvy6y1aksCcEDXGBjuhpgngF3XQJ/T4s=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ git
+ ninja
+ python3
+ ];
+
+ cmakeFlags = [
+ "-DLLVM_ENABLE_ZSTD=OFF"
+ "-DLLVM_BUILD_TOOLS=Off"
+ "-S ../llvm"
+ ];
+ };
+ inherit (darwin) xcode;
+
+ dxmt = pkgsCross.mingwW64.stdenv.mkDerivation (finalAttrs: {
+ pname = "dxmt";
+ version = "0.80";
+
+ src = fetchFromGitHub {
+ owner = "3shain";
+ repo = "dxmt";
+ rev = "v${finalAttrs.version}";
+ hash = "sha256-HNSKqEYu8se8DyzwRbqfmHRRyBXyW6D5ddPaEdnkuL4=";
+ fetchSubmodules = true;
+ };
+
+ patches = [
+ ./winecrt0.patch
+ ];
+
+ postPatch = ''
+ substituteInPlace src/airconv/darwin/meson.build --replace-fail -lcurses -lncurses
+
+ sed -e "/find_program('xcrun')/d" \
+ -e "s,metalir_generator = generator(xcrun,metalir_generator = generator(find_program('${xcode}/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/metal')," \
+ -e "s,metallib_generator = generator(xcrun,metallib_generator = generator(find_program('${xcode}/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/metallib')," \
+ -e "s/'-sdk', 'macosx', 'metal\(lib\)\{0,1\}', //" \
+ -i meson.build
+ '';
+
+ nativeBuildInputs = [
+ meson
+ ninja
+ tinyxxd
+ buildPackages.stdenv.cc
+ ];
+
+ buildInputs = [
+ sqlite
+ libz
+ ncurses
+ libxml2
+ ];
+
+ mesonFlags = [
+ (lib.mesonOption "native_llvm_path" "${dxmt-llvm}")
+ (lib.mesonOption "wine_install_path" "${wine64}")
+ ];
+
+ preBuild = ''
+ export HOME=$TMPDIR
+ '';
+
+ __structuredAttrs = true;
+ strictDeps = true;
+
+ meta = {
+ description = "Metal-based translation layer for Direct3D 10/11";
+ homepage = "https://github.com/3shain/dxmt";
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.feyorsh ];
+ platforms = lib.platforms.windows;
+ hydraPlatforms = [ ];
+ };
+ });
+in
+symlinkJoin {
+ name = "dxmt-${dxmt.version}";
+
+ paths = [ dxmt ];
+
+ passthru = {
+ inherit dxmt;
+ };
+
+ __structuredAttrs = true;
+ strictDeps = true;
+
+ meta = {
+ inherit (dxmt.meta)
+ description
+ homepage
+ maintainers
+ license
+ ;
+ platforms = [ "x86_64-darwin" ];
+ hydraPlatforms = [ ];
+ };
+}
diff --git a/pkgs/by-name/dx/dxmt/winecrt0.patch b/pkgs/by-name/dx/dxmt/winecrt0.patch
new file mode 100644
index 000000000000..f4d0830659bb
--- /dev/null
+++ b/pkgs/by-name/dx/dxmt/winecrt0.patch
@@ -0,0 +1,33 @@
+diff --git c/src/winemetal/meson.build i/src/winemetal/meson.build
+index 858d4b3..d937e29 100644
+--- c/src/winemetal/meson.build
++++ i/src/winemetal/meson.build
+@@ -26,8 +26,19 @@ elif wine_install_path != ''
+ if not wine_install_path.startswith('/')
+ wine_install_path = join_paths(meson.project_source_root(), wine_install_path)
+ endif
+- lib_winecrt0 = cc.find_library('winecrt0', dirs : [ join_paths(wine_install_path,'lib/wine', windows_builtin_install_dir) ])
+- lib_ntdll = cc.find_library('ntdll', dirs : [ join_paths(wine_install_path, 'lib/wine', windows_builtin_install_dir)], static: true)
++ winecrt0_unix_archive = custom_target(
++ 'winecrt0_fixup',
++ output : 'libwinecrt0_fixed.a',
++ command : [
++ 'sh', '-c',
++ 'ar p "$1" unix_lib.o > unix_lib.o && ar crs "$2" unix_lib.o',
++ 'sh',
++ join_paths(wine_install_path, 'lib/wine', windows_builtin_install_dir, 'libwinecrt0.a'),
++ '@OUTPUT@',
++ ],
++ )
++ lib_winecrt0 = declare_dependency(sources : winecrt0_unix_archive)
++ lib_ntdll = cc.find_library('ntdll', dirs : [ join_paths(wine_install_path, 'lib/wine', windows_builtin_install_dir)])
+ lib_dbghelp = cc.find_library('dbghelp', dirs : [ join_paths(wine_install_path, 'lib/wine', windows_builtin_install_dir) ])
+ winebuild = join_paths(wine_install_path, 'bin/winebuild')
+ else
+@@ -59,4 +70,4 @@ custom_target('postprocess_lib',
+
+ if cpu_family == 'x86_64' or cpu_family == 'aarch64'
+ subdir('unix')
+-endif
+\ No newline at end of file
++endif
diff --git a/pkgs/by-name/ej/ejs/package.nix b/pkgs/by-name/ej/ejs/package.nix
index 60737a1dbf6f..c3d40e9ed5a7 100644
--- a/pkgs/by-name/ej/ejs/package.nix
+++ b/pkgs/by-name/ej/ejs/package.nix
@@ -32,6 +32,6 @@ buildNpmPackage {
homepage = "https://ejs.co";
license = lib.licenses.asl20;
mainProgram = "ejs";
- maintainers = with lib.maintainers; [ momeemt ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/by-name/em/emhash/package.nix b/pkgs/by-name/em/emhash/package.nix
index 91fe3bc95c49..f1fdf4641f1b 100644
--- a/pkgs/by-name/em/emhash/package.nix
+++ b/pkgs/by-name/em/emhash/package.nix
@@ -7,13 +7,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "emhash";
- version = "1.0.1";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "ktprime";
repo = "emhash";
tag = "v${finalAttrs.version}";
- hash = "sha256-dFj/QaGdTJYdcxKlS9tES6OHae8xPMnrG9ccRNM/hi8=";
+ hash = "sha256-+oJIJvtphPHXPbmRquHRV9KkI61qwuGjJw3O1hpzwIw=";
};
strictDeps = true;
diff --git a/pkgs/by-name/et/ets/package.nix b/pkgs/by-name/et/ets/package.nix
index ac3f6fd7ea5a..598f6ac6468d 100644
--- a/pkgs/by-name/et/ets/package.nix
+++ b/pkgs/by-name/et/ets/package.nix
@@ -40,7 +40,7 @@ buildGoModule (finalAttrs: {
description = "Command output timestamper";
homepage = "https://github.com/gdubicki/ets/";
license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ cameronfyfe ];
+ maintainers = [ ];
mainProgram = "ets";
};
})
diff --git a/pkgs/by-name/et/ettercap/package.nix b/pkgs/by-name/et/ettercap/package.nix
index a34721462648..ab056633e881 100644
--- a/pkgs/by-name/et/ettercap/package.nix
+++ b/pkgs/by-name/et/ettercap/package.nix
@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
analysis.
'';
homepage = "https://www.ettercap-project.org/";
- changelog = "https://github.com/Ettercap/ettercap/releases/tag/${finalAttrs.version}";
+ changelog = "https://github.com/Ettercap/ettercap/blob/master/CHANGELOG";
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ pSub ];
diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix
index 3fc1154db9e1..c21ce3611bd9 100644
--- a/pkgs/by-name/fa/fastfetch/package.nix
+++ b/pkgs/by-name/fa/fastfetch/package.nix
@@ -54,7 +54,8 @@
dbusSupport ? true,
flashfetchSupport ? false,
terminalSupport ? true,
- enlightenmentSupport ? true,
+ # NOTE: disabled by default until lib dependency closure is minimal
+ enlightenmentSupport ? false,
gnomeSupport ? true,
imageSupport ? true,
openclSupport ? true,
diff --git a/pkgs/by-name/fe/feishu-cli/package.nix b/pkgs/by-name/fe/feishu-cli/package.nix
index 939523e02ce0..d6aa77693f32 100644
--- a/pkgs/by-name/fe/feishu-cli/package.nix
+++ b/pkgs/by-name/fe/feishu-cli/package.nix
@@ -7,16 +7,16 @@
buildGoModule (finalAttrs: {
pname = "feishu-cli";
- version = "1.29.0";
+ version = "1.32.0";
src = fetchFromGitHub {
owner = "riba2534";
repo = "feishu-cli";
tag = "v${finalAttrs.version}";
- hash = "sha256-oaq0/+tUK2eWX+8BEGk/oAN4eIxZ9/qW6pildPxZPRw=";
+ hash = "sha256-kPA+t5PiIfIuskgL608J0JzmBELytO7GP13gSnkxoo8=";
};
- vendorHash = "sha256-HzyP2IZL+lNgf9n7A1681lfWcH6eAb6IrqPWvAsq25Q=";
+ vendorHash = "sha256-vRefU38o9Q4Q96aXoUXUggcRsfQePjlUrSsNERJH3YU=";
subPackages = [ "." ];
diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix
index 6805bb6bb89c..e3009818154c 100644
--- a/pkgs/by-name/fi/firebase-tools/package.nix
+++ b/pkgs/by-name/fi/firebase-tools/package.nix
@@ -46,7 +46,6 @@ buildNpmPackage rec {
license = lib.licenses.mit;
mainProgram = "firebase";
maintainers = with lib.maintainers; [
- momeemt
sarahec
];
};
diff --git a/pkgs/by-name/fl/flawz/package.nix b/pkgs/by-name/fl/flawz/package.nix
index a95d7e392108..2a39916d21da 100644
--- a/pkgs/by-name/fl/flawz/package.nix
+++ b/pkgs/by-name/fl/flawz/package.nix
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "flawz";
- version = "0.3.0";
+ version = "0.4.1";
src = fetchFromGitHub {
owner = "orhun";
repo = "flawz";
rev = "v${finalAttrs.version}";
- hash = "sha256-7p/BUXrElJutUcRMu+LxdsMxA6lCDnaci0fDaKGsawI=";
+ hash = "sha256-a+UfWoBQP54/Vj5VJ9eMKcG+wQxXtd1bXii281SwjHo=";
};
- cargoHash = "sha256-X2RyavcPOQzuAt347KxfmNtO4YsFdncwUcBWtMfxaRU=";
+ cargoHash = "sha256-MnBbxGS70pG2vRQKfqI/fuWC4gCOYehoh/ncNXsN9kI=";
nativeBuildInputs = [
pkg-config
diff --git a/pkgs/by-name/fo/fosrl-gerbil/package.nix b/pkgs/by-name/fo/fosrl-gerbil/package.nix
index e602d599da8a..d21017083031 100644
--- a/pkgs/by-name/fo/fosrl-gerbil/package.nix
+++ b/pkgs/by-name/fo/fosrl-gerbil/package.nix
@@ -7,13 +7,13 @@
buildGoModule (finalAttrs: {
pname = "gerbil";
- version = "1.4.1";
+ version = "1.4.2";
src = fetchFromGitHub {
owner = "fosrl";
repo = "gerbil";
tag = finalAttrs.version;
- hash = "sha256-wKqJfiCzmMbKZXJGB7BWoXRNDukc4t+PX60XyynJNAU=";
+ hash = "sha256-NlwP2A1SGEDgoLubLs2HHnaOPUu5L84I1kJAbXyja7Q=";
};
vendorHash = "sha256-S5olgsmX0uZR9P/u/8Rf3lzRCSIwPDcmlvSzJhhJM3w=";
diff --git a/pkgs/by-name/fy/fyne/package.nix b/pkgs/by-name/fy/fyne/package.nix
index b5f79e98b6ac..973634e06fa6 100644
--- a/pkgs/by-name/fy/fyne/package.nix
+++ b/pkgs/by-name/fy/fyne/package.nix
@@ -15,18 +15,16 @@
buildGoModule (finalAttrs: {
pname = "fyne";
- # This is the current latest version
- # version "1.26.1" was a typo of "1.7.1" - maybe, don't "upgrade" to it
- version = "1.7.1";
+ version = "1.7.2";
src = fetchFromGitHub {
owner = "fyne-io";
repo = "tools";
rev = "v${finalAttrs.version}";
- hash = "sha256-NmO0AtD2lJMBOnlgFm6dXRp6NWMuyAIlckYLHugeJ1Q=";
+ hash = "sha256-kLhh44zRYEPD6kwh+DHaRYidbV+YWq9Tc0yB3f290Z4=";
};
- vendorHash = "sha256-pTVl9NMqoLqRYrNFWSoagpELwbsW7t5kHYo+fEFQie0=";
+ vendorHash = "sha256-EzwSZDq3s74ohGk0s9NV5RwSFqlUA5AFM8DvKSZeXnM=";
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ga/galaxy-buds-client/deps.json b/pkgs/by-name/ga/galaxy-buds-client/deps.json
index 98430195aa5b..98458540dc25 100644
--- a/pkgs/by-name/ga/galaxy-buds-client/deps.json
+++ b/pkgs/by-name/ga/galaxy-buds-client/deps.json
@@ -959,6 +959,11 @@
"version": "0.21.2",
"hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI="
},
+ {
+ "pname": "Tmds.DBus.Protocol",
+ "version": "0.21.3",
+ "hash": "sha256-HVEIHSeSe29ergHxsNvWYu3o7Ai8VZKo09yFn+miTnI="
+ },
{
"pname": "Xaml.Behaviors.Avalonia",
"version": "11.3.9",
diff --git a/pkgs/by-name/ga/galaxy-buds-client/package.nix b/pkgs/by-name/ga/galaxy-buds-client/package.nix
index b95111ba1fa9..666d47379a26 100644
--- a/pkgs/by-name/ga/galaxy-buds-client/package.nix
+++ b/pkgs/by-name/ga/galaxy-buds-client/package.nix
@@ -19,13 +19,13 @@
buildDotnetModule rec {
pname = "galaxy-buds-client";
- version = "5.2.0";
+ version = "5.2.1";
src = fetchFromGitHub {
owner = "ThePBone";
repo = "GalaxyBudsClient";
tag = version;
- hash = "sha256-rFaI5coTGuWoxM3QZyCBJdvwvR6LeB2jjvcJ3xXw5X8=";
+ hash = "sha256-jPVrSkf6Bybwc5glkxId5VeWkwLBoTjOzM3CCgO6h9I=";
};
projectFile = [ "GalaxyBudsClient/GalaxyBudsClient.csproj" ];
diff --git a/pkgs/by-name/gf/gforth/package.nix b/pkgs/by-name/gf/gforth/package.nix
index ee2378a3bac5..3ba375138cea 100644
--- a/pkgs/by-name/gf/gforth/package.nix
+++ b/pkgs/by-name/gf/gforth/package.nix
@@ -17,13 +17,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "gforth";
- version = "0.7.9_20260513";
+ version = "0.7.9_20260610";
src = fetchFromGitHub {
owner = "forthy42";
repo = "gforth";
rev = finalAttrs.version;
- hash = "sha256-hx1/CE18lepkyTnT6yymGwAAJtRM8u7DAhPsKTj0gdo=";
+ hash = "sha256-gaP3Mmcp0NueRfqh62XlvtWuHN6fAnMTa1uSm7Bj+Rk=";
};
patches = [ ./use-nproc-instead-of-fhs.patch ];
diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix
index 04d19f30a190..15be16873943 100644
--- a/pkgs/by-name/gh/ghostfolio/package.nix
+++ b/pkgs/by-name/gh/ghostfolio/package.nix
@@ -12,13 +12,13 @@
buildNpmPackage (finalAttrs: {
pname = "ghostfolio";
- version = "3.3.0";
+ version = "3.10.0";
src = fetchFromGitHub {
owner = "ghostfolio";
repo = "ghostfolio";
tag = finalAttrs.version;
- hash = "sha256-74CqCDyLrn3//FiTfo6xR5jLyo4jU+daBF9ES/uQE3E=";
+ hash = "sha256-nVk4KjNOIQQRRRvyPdSodL4s3yarIb1p2t2fBNcMps4=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -28,7 +28,7 @@ buildNpmPackage (finalAttrs: {
'';
};
- npmDepsHash = "sha256-klWmB6LYf6h1WPi3AasDrdVdaPCyb5ePWuO9zqMcXys=";
+ npmDepsHash = "sha256-IMUbBYFiSS0AfsenPvxoC5HHHW7Lhxfd5DaysgV+vBU=";
postPatch = ''
substituteInPlace replace.build.mjs \
diff --git a/pkgs/by-name/gi/gif-for-cli/package.nix b/pkgs/by-name/gi/gif-for-cli/package.nix
index 8afdc6765c1d..8c8e5ac307f1 100644
--- a/pkgs/by-name/gi/gif-for-cli/package.nix
+++ b/pkgs/by-name/gi/gif-for-cli/package.nix
@@ -11,7 +11,7 @@
python3Packages.buildPythonApplication {
pname = "gif-for-cli";
version = "1.1.2";
- format = "setuptools";
+ pyproject = true;
src = fetchFromGitHub {
owner = "google";
@@ -30,16 +30,22 @@ python3Packages.buildPythonApplication {
];
# coverage is not needed to build and test this package
+ # The symlinking of third_party in setup.py doesn't work correctly with pyproject = true, so we copy instead
postPatch = ''
sed -i '/coverage>=/d' setup.py
+ cp -r third_party gif_for_cli
'';
+ build-system = with python3Packages; [
+ setuptools
+ ];
+
buildInputs = [
zlib
libjpeg
];
- propagatedBuildInputs = with python3Packages; [
+ dependencies = with python3Packages; [
ffmpeg
pillow
requests
@@ -51,7 +57,7 @@ python3Packages.buildPythonApplication {
longDescription = "Takes in a GIF, short video, or a query to the Tenor GIF API and converts it to animated ASCII art.";
homepage = "https://github.com/google/gif-for-cli";
license = lib.licenses.asl20;
- maintainers = [ ];
+ maintainers = with lib.maintainers; [ ambossmann ];
mainProgram = "gif-for-cli";
};
}
diff --git a/pkgs/by-name/gi/git-mit/package.nix b/pkgs/by-name/gi/git-mit/package.nix
index e42a226eda64..9f028c9f6a1c 100644
--- a/pkgs/by-name/gi/git-mit/package.nix
+++ b/pkgs/by-name/gi/git-mit/package.nix
@@ -9,7 +9,7 @@
}:
let
- version = "6.0.11";
+ version = "6.1.0";
in
rustPlatform.buildRustPackage {
pname = "git-mit";
@@ -19,10 +19,10 @@ rustPlatform.buildRustPackage {
owner = "PurpleBooth";
repo = "git-mit";
tag = "v${version}";
- hash = "sha256-Hnmhvql7oTbNQnBvWlV60bxddH7H7intEsjfXhV4Z2Y=";
+ hash = "sha256-2ApBtZPfpV5mrvD/6NS+qsA8/WLFZL6OGWnANJBMchI=";
};
- cargoHash = "sha256-4HNr/m+n+M1BaL67Fo/S4A9EXBYOIp7il0sAtm4rSQc=";
+ cargoHash = "sha256-ahT2jMFwU1+xQykqedmhOWjr+6mxpaUpjAMCeBwUTY0=";
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/gi/gitkraken/package.nix b/pkgs/by-name/gi/gitkraken/package.nix
index 007bafb28925..02b52fd9e2e6 100644
--- a/pkgs/by-name/gi/gitkraken/package.nix
+++ b/pkgs/by-name/gi/gitkraken/package.nix
@@ -56,24 +56,24 @@
let
pname = "gitkraken";
- version = "12.1.2";
+ version = "12.2.0";
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
srcs = {
x86_64-linux = fetchzip {
url = "https://api.gitkraken.dev/releases/production/linux/x64/${version}/gitkraken-amd64.tar.gz";
- hash = "sha256-uYEPOZ1OZwisiitByOWIjymzCayLCdN+cDzW/etktgM=";
+ hash = "sha256-ep4ZLSYxIEqzI7eubMk1H8iTOuOuLJnW1ZjdlOe54eU=";
};
x86_64-darwin = fetchzip {
url = "https://api.gitkraken.dev/releases/production/darwin/x64/${version}/GitKraken-v${version}.zip";
- hash = "sha256-BIeK1ICLmxciNbauWa23IITEUlbum/39e77D4ovNHCc=";
+ hash = "sha256-qGnoBTG7i7SjLgZ1MzGNTNkvxg6uOzSX4tUwjrk2Yvw=";
};
aarch64-darwin = fetchzip {
url = "https://api.gitkraken.dev/releases/production/darwin/arm64/${version}/GitKraken-v${version}.zip";
- hash = "sha256-1KTdxnpqNYpLKxX5G5QwY6mYP7j9GtDQoTeXwGfhv08=";
+ hash = "sha256-5t2PV2CY6izw+6k0rS0GwZMxDmfmSWGi7A/YBTVa4cc=";
};
};
diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix
index 3fd603a4ce6e..9dba84a426c7 100644
--- a/pkgs/by-name/gi/gitlab-runner/package.nix
+++ b/pkgs/by-name/gi/gitlab-runner/package.nix
@@ -12,16 +12,16 @@
buildGoModule (finalAttrs: {
pname = "gitlab-runner";
- version = "18.11.3";
+ version = "19.0.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-runner";
tag = "v${finalAttrs.version}";
- hash = "sha256-/QMmBDZz6nWmc9hODS3yVe9iyNERbebGysZ1Z4B5Gw8=";
+ hash = "sha256-uScTzj4pSRtSFCMxoOR5KqipCbPknwnydPYG6xU5dOo=";
};
- vendorHash = "sha256-xEvvYAVIwHwQDd38P2i6GcgFqf8FPnflWh5IEqmWQdE=";
+ vendorHash = "sha256-QqqTkIgR9ca1dYQ32SG7C+SpEIA07Hlf8x3lVhZ5vRQ=";
# For patchShebangs
buildInputs = [ bash ];
diff --git a/pkgs/by-name/gl/global/package.nix b/pkgs/by-name/gl/global/package.nix
index 43a1630067ef..447c653a1ea8 100644
--- a/pkgs/by-name/gl/global/package.nix
+++ b/pkgs/by-name/gl/global/package.nix
@@ -87,8 +87,6 @@ stdenv.mkDerivation (finalAttrs: {
peterhoeg
];
platforms = lib.platforms.unix;
- changelog = "https://cvs.savannah.gnu.org/viewvc/global/global/NEWS?view=markup&pathrev=VERSION-${
- lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version
- }";
+ changelog = "https://www.gnu.org/software/global/whatsnew.html";
};
})
diff --git a/pkgs/by-name/go/google-cloud-sql-proxy/package.nix b/pkgs/by-name/go/google-cloud-sql-proxy/package.nix
index 4e65566a0a90..6b89b0bad4cf 100644
--- a/pkgs/by-name/go/google-cloud-sql-proxy/package.nix
+++ b/pkgs/by-name/go/google-cloud-sql-proxy/package.nix
@@ -7,18 +7,18 @@
buildGoModule (finalAttrs: {
pname = "google-cloud-sql-proxy";
- version = "2.21.1";
+ version = "2.22.1";
src = fetchFromGitHub {
owner = "GoogleCloudPlatform";
repo = "cloud-sql-proxy";
rev = "v${finalAttrs.version}";
- hash = "sha256-3C7IfpVcv1BpzKnMV6dQJ0e7hY50owR3YijlI2+cAJQ=";
+ hash = "sha256-vTTYQ1D42X1L03EE9c5Xz/SCRE3wWROT/daY+f0vLPI=";
};
subPackages = [ "." ];
- vendorHash = "sha256-tbglk7rscPx1RrURSzVW5FgZE6b6mp4tvOXVQKMUrjQ=";
+ vendorHash = "sha256-lOT9GpZk6Bv5P8kiyMR4j+aHOO0be4pW4WvVux8hpnQ=";
checkFlags = [
"-short"
diff --git a/pkgs/by-name/gp/gpaste/package.nix b/pkgs/by-name/gp/gpaste/package.nix
index f71819236b18..3935301cd1b7 100644
--- a/pkgs/by-name/gp/gpaste/package.nix
+++ b/pkgs/by-name/gp/gpaste/package.nix
@@ -20,11 +20,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gpaste";
- version = "45.3";
+ version = "45.5";
src = fetchurl {
url = "https://www.imagination-land.org/files/gpaste/GPaste-${finalAttrs.version}.tar.xz";
- hash = "sha256-UU8pw7bqEwg2Vh7S6GTx8swI/2IhlwjQgkGNZCzoMwc=";
+ hash = "sha256-seoPqmec9F4/zwmLjpAOUBBIVvLbFRMVPZ3jcloRrZE=";
};
patches = [
@@ -36,10 +36,6 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
substituteInPlace src/libgpaste/gpaste/gpaste-settings.c \
--subst-var-by gschemasCompiled ${glib.makeSchemaPath (placeholder "out") "${finalAttrs.pname}-${finalAttrs.version}"}
-
- substituteInPlace src/gnome-shell/metadata.json.in --replace-fail \
- '"shell-version": [ "45", "46", "47", "48" ],' \
- '"shell-version": [ "45", "46", "47", "48", "49" ],'
'';
nativeBuildInputs = [
@@ -90,5 +86,6 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.bsd2;
platforms = lib.platforms.linux;
teams = [ lib.teams.gnome ];
+ maintainers = with lib.maintainers; [ fabiob ];
};
})
diff --git a/pkgs/by-name/gp/gpu-viewer/package.nix b/pkgs/by-name/gp/gpu-viewer/package.nix
index d81a56f116d2..f0b4663a0796 100644
--- a/pkgs/by-name/gp/gpu-viewer/package.nix
+++ b/pkgs/by-name/gp/gpu-viewer/package.nix
@@ -29,7 +29,7 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "gpu-viewer";
- version = "3.34";
+ version = "3.35";
pyproject = false;
__structuredAttrs = true;
@@ -37,7 +37,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
owner = "arunsivaramanneo";
repo = "gpu-viewer";
tag = "v${finalAttrs.version}";
- hash = "sha256-ovgP5RaFAT01zccQiyy1vERBj9OW77v0hMZ0SjoS74M=";
+ hash = "sha256-W8BPtHbOwLZ95bY6ZmAaKS87fh+gOWZIhxjWKqiavag=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/gr/gridtracker2/package.nix b/pkgs/by-name/gr/gridtracker2/package.nix
index aba9890cff20..338ec428b897 100644
--- a/pkgs/by-name/gr/gridtracker2/package.nix
+++ b/pkgs/by-name/gr/gridtracker2/package.nix
@@ -50,28 +50,20 @@ buildNpmPackage (finalAttrs: {
buildPhase = ''
runHook preBuild
- ''
- + lib.optionalString stdenv.hostPlatform.isDarwin ''
- # electronDist needs to be modifiable on Darwin
- cp -r ${electron.dist} electron-dist
- chmod -R u+w electron-dist
- # Disable code signing during build on macOS.
- # https://github.com/electron-userland/electron-builder/blob/fa6fc16/docs/code-signing.md#how-to-disable-code-signing-during-the-build-process-on-macos
- export CSC_IDENTITY_AUTO_DISCOVERY=false
+ # the electronDist directory needs to be outside of the working directory
+ # otherwise the electron-builder config accidentally includes it inside the .asar file
+ electron_dist="$(mktemp -d)"
+ cp -r ${electron.dist}/. "$electron_dist"
+ chmod -R u+w "$electron_dist"
npm exec electron-builder -- \
--dir \
- -c.electronDist=electron-dist \
- -c.electronVersion=${electron.version}
- ''
- + lib.optionalString stdenv.hostPlatform.isLinux ''
- npm exec electron-builder -- \
- --dir \
- -c.electronDist=${electron.dist} \
- -c.electronVersion=${electron.version}
- ''
- + ''
+ -c.electronDist="$electron_dist" \
+ -c.electronVersion=${electron.version} \
+ -c.mac.identity=null
+ # ^ disable codesigning on Darwin
+
runHook postBuild
'';
diff --git a/pkgs/by-name/gs/gscreenshot/package.nix b/pkgs/by-name/gs/gscreenshot/package.nix
index 30940413216e..e12dfc39947d 100644
--- a/pkgs/by-name/gs/gscreenshot/package.nix
+++ b/pkgs/by-name/gs/gscreenshot/package.nix
@@ -20,22 +20,22 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "gscreenshot";
version = "3.11.1";
- format = "setuptools";
+ pyproject = true;
+
+ build-system = with python3Packages; [ setuptools ];
src = fetchFromGitHub {
owner = "thenaterhood";
repo = "gscreenshot";
tag = "v${finalAttrs.version}";
- sha256 = "sha256-24eo4ihWM/sJXj7Dp3hSp0FEP1uYzvCON2emuMiONSc=";
+ hash = "sha256-24eo4ihWM/sJXj7Dp3hSp0FEP1uYzvCON2emuMiONSc=";
};
# needed for wrapGAppsHook3 to function
strictDeps = false;
- # tests require a display and fail
- doCheck = false;
nativeBuildInputs = [ wrapGAppsHook3 ];
- propagatedBuildInputs = [
+ dependencies = [
gettext
gobject-introspection
gtk3
@@ -57,7 +57,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
++ (with python3Packages; [
pillow
pygobject3
- setuptools
]);
patches = [ ./0001-Changing-paths-to-be-nix-compatible.patch ];
diff --git a/pkgs/by-name/hi/hinoirisetr/package.nix b/pkgs/by-name/hi/hinoirisetr/package.nix
new file mode 100644
index 000000000000..f81630e23e47
--- /dev/null
+++ b/pkgs/by-name/hi/hinoirisetr/package.nix
@@ -0,0 +1,60 @@
+{
+ fetchFromForgejo,
+ installShellFiles,
+ lib,
+ libnotify,
+ pandoc,
+ patchelf,
+ rustPlatform,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+ pname = "hinoirisetr";
+ version = "1.6.3";
+
+ __structuredAttrs = true;
+
+ src = fetchFromForgejo {
+ domain = "git.vavakado.xyz";
+ owner = "me";
+ repo = "hinoirisetr";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-XgIeeVCnlntf2RopA6SMuFCgbqTlTEZv6V5ezjEHVKA=";
+ };
+
+ cargoHash = "sha256-lydS9TWb+Y1PPC7C3Mn6KNVX1fsooAcDKJeKMnXWZY0=";
+
+ nativeBuildInputs = [
+ installShellFiles
+ pandoc
+ patchelf
+ ];
+
+ buildInputs = [
+ libnotify
+ ];
+
+ postFixup = ''
+ patchelf --add-rpath "${lib.getLib libnotify}/lib" $out/bin/hinoirisetr
+ '';
+
+ postBuild = ''
+ pandoc manpages/hinoirisetr.1.md -s -t man -o hinoirisetr.1
+ '';
+
+ postInstall = ''
+ installManPage hinoirisetr.1
+ '';
+
+ meta = {
+ description = "a lightweight daemon that automatically adjusts your screen's color temperature and gamma";
+ homepage = "https://git.vavakado.xyz/me/hinoirisetr";
+ changelog = "https://git.vavakado.xyz/me/hinoirisetr/releases/tag/v${finalAttrs.version}";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [
+ vavakado
+ ];
+ mainProgram = "hinoirisetr";
+ platforms = lib.platforms.linux;
+ };
+})
diff --git a/pkgs/by-name/hl/hl-log-viewer/package.nix b/pkgs/by-name/hl/hl-log-viewer/package.nix
index fd44667d6c23..cad200fb82fc 100644
--- a/pkgs/by-name/hl/hl-log-viewer/package.nix
+++ b/pkgs/by-name/hl/hl-log-viewer/package.nix
@@ -9,16 +9,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "hl-log-viewer";
- version = "0.36.2";
+ version = "0.36.3";
src = fetchFromGitHub {
owner = "pamburus";
repo = "hl";
tag = "v${finalAttrs.version}";
- hash = "sha256-r6p4gw1QzZPu1DWzbTNDnvKMi/pqZvViK4rAn4aov4A=";
+ hash = "sha256-Azt1jfBZP7N5ZAgdY2Hww6nt5ty2VEKZpaHZDodP/zM=";
};
- cargoHash = "sha256-8yb8elk8iG4snyExkQdJQn5eaKMNcPqYsAE/sIW6euk=";
+ cargoHash = "sha256-RXIXoF3z2Zleje1OakHXQxPmNkRcqHjINRZYqMXS8U0=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/ho/homebank/package.nix b/pkgs/by-name/ho/homebank/package.nix
index 83f62f87bbe9..de3635b82153 100644
--- a/pkgs/by-name/ho/homebank/package.nix
+++ b/pkgs/by-name/ho/homebank/package.nix
@@ -13,10 +13,10 @@
stdenv.mkDerivation (finalAttrs: {
pname = "homebank";
- version = "5.10";
+ version = "5.10.1";
src = fetchurl {
url = "https://www.gethomebank.org/public/sources/homebank-${finalAttrs.version}.tar.gz";
- hash = "sha256-eD/Yuy67oJcT5dfBg9RU9KQ5PoKK9XY/dotIr6vFQ4Y=";
+ hash = "sha256-Z1EtMYjqRfkqb5Mm6CnBQq9a1QkwZwLzsEV6GrYR1Co=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/ho/homepage-dashboard/package.nix b/pkgs/by-name/ho/homepage-dashboard/package.nix
index 9c2c1098ad27..fd2e91210a66 100644
--- a/pkgs/by-name/ho/homepage-dashboard/package.nix
+++ b/pkgs/by-name/ho/homepage-dashboard/package.nix
@@ -31,13 +31,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "homepage-dashboard";
- version = "1.12.3";
+ version = "1.13.1";
src = fetchFromGitHub {
owner = "gethomepage";
repo = "homepage";
tag = "v${finalAttrs.version}";
- hash = "sha256-/8JAFYi7CSRvxEvqb36TTTWUbcaIht++OgKV1rSBcmg=";
+ hash = "sha256-RKvBzHtxK/VNdSRoJSUiVmckG7jTTH75SEe6aX2xq1E=";
};
pnpmDeps = fetchPnpmDeps {
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
;
pnpm = pnpm_10;
fetcherVersion = 3;
- hash = "sha256-suevJNExlktuuCXRYEi8603qrxeEPLYaYp9MO2hnLEk=";
+ hash = "sha256-xd7F39WBSAy3ozJjI12XB+oGvijSGHIMYwQhdpaO/l8=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/hy/hygg/package.nix b/pkgs/by-name/hy/hygg/package.nix
index 4b873664a44a..6f6352e57c2f 100644
--- a/pkgs/by-name/hy/hygg/package.nix
+++ b/pkgs/by-name/hy/hygg/package.nix
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "hygg";
- version = "0.1.20";
+ version = "0.1.21";
src = fetchFromGitHub {
owner = "kruseio";
repo = "hygg";
tag = finalAttrs.version;
- hash = "sha256-lqN8n51nm+FtmlI0PEgTZATE+jWE9Wc+o3Gedrdg/fo=";
+ hash = "sha256-Gu56WH7Sp1y/fXwEOOACUAe8nshvc6d2302YwPvM+ZM=";
};
- cargoHash = "sha256-x8aZKyqLaR1cdLx9JofbXGLKwgNDWORqEi2UdcSOAzI=";
+ cargoHash = "sha256-AUkwjgF/LwOvbhOWcrK8ayvL2/MSc7GFh+/bfdZ28/8=";
nativeBuildInputs = [
writableTmpDirAsHomeHook
diff --git a/pkgs/by-name/hy/hyprwhspr-rs/package.nix b/pkgs/by-name/hy/hyprwhspr-rs/package.nix
index 27001b1ac259..f2fb3f53b564 100644
--- a/pkgs/by-name/hy/hyprwhspr-rs/package.nix
+++ b/pkgs/by-name/hy/hyprwhspr-rs/package.nix
@@ -16,16 +16,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "hyprwhspr-rs";
- version = "0.3.29";
+ version = "0.3.30";
src = fetchFromGitHub {
owner = "better-slop";
repo = "hyprwhspr-rs";
tag = "v${finalAttrs.version}";
- hash = "sha256-vJYE5+4G68CK3hiW6KafO3htWgB6n+JcHVJ/3N8FjSw=";
+ hash = "sha256-cOjxjfiJyTUr7NgHS2BRI8WQ5EaYV0Ku5oyLuhWlKwY=";
};
- cargoHash = "sha256-ZL3l6ihBWx+y2ErqP13dJyb7lUMbBX7IYf+Di0p5byA=";
+ cargoHash = "sha256-5vviwzVJDONle7baSulxkmRYOlN6NEslgN1TfyiKR2o=";
nativeBuildInputs = [
pkg-config
diff --git a/pkgs/by-name/in/inlyne/package.nix b/pkgs/by-name/in/inlyne/package.nix
index 5c56664215a4..6e5b4e15de90 100644
--- a/pkgs/by-name/in/inlyne/package.nix
+++ b/pkgs/by-name/in/inlyne/package.nix
@@ -21,21 +21,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "inlyne";
- version = "0.5.0";
+ version = "0.5.2";
src = fetchFromGitHub {
owner = "Inlyne-Project";
repo = "inlyne";
rev = "v${finalAttrs.version}";
- hash = "sha256-ueE1NKbCMBUBrrdsHkwZ5Yv6LD3tQL3ZAk2O4xoYOcw=";
+ hash = "sha256-bUM9Mn/C9l6s6ucoLRo25m4PbbW3gp5d3AvO/9GTJcI=";
};
- cargoHash = "sha256-6TwMZNYvW1bBE+9PJUXQxP5Uz7VYsjyLabmaxcX9Mbk=";
-
- cargoPatches = [
- # update metrics dependency to fix Rust 1.94 compatibility
- ./update-metrics.patch
- ];
+ cargoHash = "sha256-IaaojW5PYSUwyh1iv2HrDidIV8keEykKHY61rpcCAPc=";
nativeBuildInputs = [
installShellFiles
@@ -83,6 +78,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
lib.makeLibraryPath [
libGL
libx11
+ libxkbcommon
]
}
'';
diff --git a/pkgs/by-name/in/inlyne/update-metrics.patch b/pkgs/by-name/in/inlyne/update-metrics.patch
deleted file mode 100644
index 7bfc10569354..000000000000
--- a/pkgs/by-name/in/inlyne/update-metrics.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -2409,9 +2409,9 @@ dependencies = [
-
- [[package]]
- name = "metrics"
--version = "0.24.0"
-+version = "0.24.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8ae428771d17306715c5091d446327d1cfdedc82185c65ba8423ab404e45bf10"
-+checksum = "5d5312e9ba3771cfa961b585728215e3d972c950a3eed9252aa093d6301277e8"
- dependencies = [
- "ahash 0.8.11",
- "portable-atomic",
diff --git a/pkgs/by-name/in/inputplumber/package.nix b/pkgs/by-name/in/inputplumber/package.nix
index 8c488ba81487..939f8f9b1c1c 100644
--- a/pkgs/by-name/in/inputplumber/package.nix
+++ b/pkgs/by-name/in/inputplumber/package.nix
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "inputplumber";
- version = "0.77.3";
+ version = "0.77.5";
src = fetchFromGitHub {
owner = "ShadowBlip";
repo = "InputPlumber";
tag = "v${finalAttrs.version}";
- hash = "sha256-lcv61lzZ45vNDdFdlnJOQW/mIN8KdsAEAUsoNuuhLM0=";
+ hash = "sha256-L6Ebyh4K4l+7LlVlgDRym9o+XsQPExC7xH1EBPwyLB4=";
};
- cargoHash = "sha256-VrzePyiBWAWy+IC9QWi5vooAp2+SwuzT3n+SMG/Ntas=";
+ cargoHash = "sha256-avwKy2AvgzT2IfRw/aMwllaYa4RLx7DJPxrgjHwBY1I=";
nativeBuildInputs = [
pkg-config
diff --git a/pkgs/by-name/it/itgmania/themes/digital-dance.nix b/pkgs/by-name/it/itgmania/themes/digital-dance.nix
index 60b5134a388b..e5ce1af962b3 100644
--- a/pkgs/by-name/it/itgmania/themes/digital-dance.nix
+++ b/pkgs/by-name/it/itgmania/themes/digital-dance.nix
@@ -6,13 +6,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "digital-dance";
- version = "1.1.3-unstable-2026-06-04";
+ version = "1.1.3-unstable-2026-06-12";
src = fetchFromCodeberg {
owner = "JNero";
repo = "Digital-Dance-ITGMania";
- rev = "827d963fdc5732f11781bf3db7343a8897a10196";
- hash = "sha256-V3EmAg42BExodFiGd2u7brmTq4t3iVduWtxo5NjwGm8=";
+ rev = "d4456108422cb36e12dcc1bc227acc66b85d0395";
+ hash = "sha256-2bcI9Lh5xNfqtRbYxsmi+8LJMyQ6hUOw2OLuGQFBftE=";
};
postInstall = ''
diff --git a/pkgs/by-name/it/itgmania/themes/itg3encore.nix b/pkgs/by-name/it/itgmania/themes/itg3encore.nix
index 58c64c26968a..82d2e06b68b4 100644
--- a/pkgs/by-name/it/itgmania/themes/itg3encore.nix
+++ b/pkgs/by-name/it/itgmania/themes/itg3encore.nix
@@ -6,13 +6,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "itg3encore";
- version = "0-unstable-2026-06-05";
+ version = "0-unstable-2026-06-13";
src = fetchFromGitHub {
owner = "DarkBahamut162";
repo = "itg3encore";
- rev = "7aad94a63462efc85eb6e0e23bd0bd50be28137c";
- hash = "sha256-oaj76RMD+Ibm8n8/EiUZYVBlyy5PefpBsWhFbWEjM08=";
+ rev = "409dc62c7c7a6c3ce3a713e84c81d95995eb20a6";
+ hash = "sha256-sJLkHRngmA9dPZoQPpUdOAz1nLCHTTOPG4i/SP6rl9A=";
};
postInstall = ''
diff --git a/pkgs/by-name/ka/kando/package.nix b/pkgs/by-name/ka/kando/package.nix
index 86a4d4d372f8..d4963a5d5eeb 100644
--- a/pkgs/by-name/ka/kando/package.nix
+++ b/pkgs/by-name/ka/kando/package.nix
@@ -69,8 +69,6 @@ buildNpmPackage.override { inherit nodejs; } rec {
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
# use our own node headers since we skip downloading them
NIX_CFLAGS_COMPILE = "-I${nodejs}/include/node";
- # disable code signing on Darwin
- CSC_IDENTITY_AUTO_DISCOVERY = lib.optionalString stdenv.hostPlatform.isDarwin "false";
};
postConfigure = ''
diff --git a/pkgs/by-name/kd/kdiskmark/package.nix b/pkgs/by-name/kd/kdiskmark/package.nix
index 9b8b42fb21b3..46003e968649 100644
--- a/pkgs/by-name/kd/kdiskmark/package.nix
+++ b/pkgs/by-name/kd/kdiskmark/package.nix
@@ -8,13 +8,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "kdiskmark";
- version = "3.2.0";
+ version = "3.3.0";
src = fetchFromGitHub {
owner = "jonmagon";
repo = "kdiskmark";
rev = finalAttrs.version;
- hash = "sha256-b42PNUrG10RyGct6dPtdT89oO222tEovkSPoRcROfaQ=";
+ hash = "sha256-cdKkOe5BbzF8K+buwctsSMlw4ko0DrNHZ2HwJA9Det4=";
fetchSubmodules = true;
};
diff --git a/pkgs/by-name/la/labymod-launcher/package.nix b/pkgs/by-name/la/labymod-launcher/package.nix
index 0bcad7ad57c3..2fd80eaac300 100644
--- a/pkgs/by-name/la/labymod-launcher/package.nix
+++ b/pkgs/by-name/la/labymod-launcher/package.nix
@@ -6,12 +6,12 @@
let
pname = "labymod-launcher";
- version = "3.0.1";
+ version = "3.0.10";
src = fetchurl {
name = "labymod-launcher";
url = "https://releases.r2.labymod.net/launcher/linux/x64/LabyMod%20Launcher-${version}.AppImage";
- hash = "sha256-E4yTsurnomuF72zye06Ycd0qXg4uTHj7Y+EW6lmanoA=";
+ hash = "sha256-etrP2kfhaWVyTgRAsw8MeBy3ndScTkKi3ogXiaQZ2g0=";
};
appimageContents = appimageTools.extract { inherit pname version src; };
diff --git a/pkgs/by-name/le/leiningen/package.nix b/pkgs/by-name/le/leiningen/package.nix
index 01550fdb9768..f06f6d58ed8c 100644
--- a/pkgs/by-name/le/leiningen/package.nix
+++ b/pkgs/by-name/le/leiningen/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
license = lib.licenses.epl10;
platforms = jdk.meta.platforms;
- maintainers = with lib.maintainers; [ momeemt ];
+ maintainers = [ ];
mainProgram = "lein";
};
})
diff --git a/pkgs/by-name/le/lemminx/package.nix b/pkgs/by-name/le/lemminx/package.nix
index 725c9565142a..8371961d9431 100644
--- a/pkgs/by-name/le/lemminx/package.nix
+++ b/pkgs/by-name/le/lemminx/package.nix
@@ -26,13 +26,13 @@ let
in
maven.buildMavenPackage rec {
pname = "lemminx";
- version = "0.31.0";
+ version = "0.31.2";
src = fetchFromGitHub {
owner = "eclipse";
repo = "lemminx";
tag = version;
- hash = "sha256-a+9RN1265fsmYAUMuUTxA+VqJv7xPlzuc8HqoZwmR4M=";
+ hash = "sha256-nV+IXeGEnJ7q2GEH9LKiy8ABePHSIt8GFPj/sZzv71E=";
# Lemminx reads this git information at runtime from a git.properties
# file on the classpath
leaveDotGit = true;
diff --git a/pkgs/by-name/lh/lha/package.nix b/pkgs/by-name/lh/lha/package.nix
index 072da499622d..5f97ee673d39 100644
--- a/pkgs/by-name/lh/lha/package.nix
+++ b/pkgs/by-name/lh/lha/package.nix
@@ -29,8 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Archiver and compressor using the LZSS and Huffman encoding compression algorithms";
homepage = "https://github.com/jca02266/lha";
platforms = lib.platforms.unix;
- maintainers = with lib.maintainers; [
- momeemt
+ maintainers = [
];
# Some of the original LHa code has been rewritten and the current author
# considers adopting a "true" free and open source license for it.
diff --git a/pkgs/by-name/li/libacr38u/package.nix b/pkgs/by-name/li/libacr38u/package.nix
index 899c8dcacde0..de8c18b1faaa 100644
--- a/pkgs/by-name/li/libacr38u/package.nix
+++ b/pkgs/by-name/li/libacr38u/package.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
'';
homepage = "https://www.acs.com.hk";
license = lib.licenses.lgpl2Plus;
- maintainers = with lib.maintainers; [ berce ];
+ maintainers = [ ];
platforms = with lib.platforms; unix;
};
}
diff --git a/pkgs/by-name/li/librewolf-unwrapped/package.nix b/pkgs/by-name/li/librewolf-unwrapped/package.nix
index d279ee6ccf2c..c6384d64ce5a 100644
--- a/pkgs/by-name/li/librewolf-unwrapped/package.nix
+++ b/pkgs/by-name/li/librewolf-unwrapped/package.nix
@@ -40,6 +40,9 @@ in
maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115)
license = lib.licenses.mpl20;
mainProgram = "librewolf";
+ knownVulnerabilities = [
+ "librewolf lacks an active committer in nixpkgs, consider using an alternative"
+ ];
};
tests = { inherit (nixosTests) librewolf; };
updateScript = callPackage ./update.nix {
diff --git a/pkgs/by-name/li/libunibreak/package.nix b/pkgs/by-name/li/libunibreak/package.nix
index 12c8795e30af..5ad9b09d6aaf 100644
--- a/pkgs/by-name/li/libunibreak/package.nix
+++ b/pkgs/by-name/li/libunibreak/package.nix
@@ -5,28 +5,29 @@
autoreconfHook,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "libunibreak";
- version = "6.1";
+ version = "7.0";
src =
let
- rev_version = lib.replaceStrings [ "." ] [ "_" ] version;
+ rev_version = lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version;
in
fetchFromGitHub {
owner = "adah1972";
repo = "libunibreak";
- rev = "libunibreak_${rev_version}";
- sha256 = "sha256-8yheb+XSvc1AqITjSutF+/4OWb4+7hweedKzhKJcE1Y=";
+ tag = "libunibreak_${rev_version}";
+ hash = "sha256-J+/L5pFudppf0l0Gk/6/Rwz5I59p9Aw11cUEPRPGP/8=";
};
nativeBuildInputs = [ autoreconfHook ];
meta = {
homepage = "https://github.com/adah1972/libunibreak";
+ changelog = "https://github.com/adah1972/libunibreak/blob/${finalAttrs.src.tag}/NEWS";
description = "Implementation of line breaking and word breaking algorithms as in the Unicode standard";
license = lib.licenses.zlib;
platforms = lib.platforms.unix;
maintainers = [ ];
};
-}
+})
diff --git a/pkgs/by-name/li/libvgm/package.nix b/pkgs/by-name/li/libvgm/package.nix
index c6776d0c49da..a972536d31a3 100644
--- a/pkgs/by-name/li/libvgm/package.nix
+++ b/pkgs/by-name/li/libvgm/package.nix
@@ -38,13 +38,13 @@ assert enableTools -> enableAudio && enableEmulation && enableLibplayer;
stdenv.mkDerivation (finalAttrs: {
pname = "libvgm";
- version = "0-unstable-2026-04-06";
+ version = "0-unstable-2026-06-07";
src = fetchFromGitHub {
owner = "ValleyBell";
repo = "libvgm";
- rev = "d1151884997ba4769b070b7c7aaedeffc60a25fb";
- hash = "sha256-SiOB2M7RNo4S5uIr8wXsZ1UtS2+2N8Tqm5iJ+Am3Ep4=";
+ rev = "08471963604c29353501439c4d6f97b57bf8b07b";
+ hash = "sha256-1ddlxs/iq993DkjfYbdyCESspqfhAnmkjErALczpmdI=";
};
outputs = [
diff --git a/pkgs/by-name/lx/lxmf/package.nix b/pkgs/by-name/lx/lxmf/package.nix
new file mode 100644
index 000000000000..c3768b15a883
--- /dev/null
+++ b/pkgs/by-name/lx/lxmf/package.nix
@@ -0,0 +1,14 @@
+{
+ python3Packages,
+}:
+
+let
+ pythonPackages = python3Packages.overrideScope (
+ self: super: {
+ lxmf = super.lxmf.override {
+ propagateRns = true;
+ };
+ }
+ );
+in
+pythonPackages.toPythonApplication pythonPackages.lxmf
diff --git a/pkgs/by-name/ma/makemkv/app-id.patch b/pkgs/by-name/ma/makemkv/app-id.patch
new file mode 100644
index 000000000000..b314fd7e5b6e
--- /dev/null
+++ b/pkgs/by-name/ma/makemkv/app-id.patch
@@ -0,0 +1,14 @@
+diff --git a/makemkvgui/src/main.cpp b/makemkvgui/src/main.cpp
+index 73ce457..71f822c 100644
+--- a/makemkvgui/src/main.cpp
++++ b/makemkvgui/src/main.cpp
+@@ -65,6 +65,9 @@ int qMain(int argc, char **argv)
+ #if (QT_VERSION > 0x050000)
+ QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
+ #endif
++ // Ensure the app-id ('makemkv') is set, so that GNOME can show
++ // the correct icon in the dash.
++ QGuiApplication::setDesktopFileName("makemkv");
+
+ CApClient::ITransport* p_trans = NULL;
+
diff --git a/pkgs/by-name/ma/makemkv/package.nix b/pkgs/by-name/ma/makemkv/package.nix
index 6d4ffd64d016..71993f3e84f4 100644
--- a/pkgs/by-name/ma/makemkv/package.nix
+++ b/pkgs/by-name/ma/makemkv/package.nix
@@ -43,7 +43,12 @@ stdenv.mkDerivation (
srcs = lib.attrValues finalAttrs.passthru.srcs;
sourceRoot = "makemkv-oss-${version}";
- patches = [ ./r13y.patch ];
+ patches = [
+ ./r13y.patch
+ # This patch is sourced from NonGuix, licensed GPLv3:
+ # https://gitlab.com/nonguix/nonguix/-/blob/2d1f3691546f007c7cd96ae87e4e970fed789182/nongnu/packages/patches/makemkv-app-id.patch
+ ./app-id.patch
+ ];
enableParallelBuilding = true;
nativeBuildInputs = [
diff --git a/pkgs/by-name/ma/material-design-icons/package.nix b/pkgs/by-name/ma/material-design-icons/package.nix
index 88c7e5768793..d44886ff0b97 100644
--- a/pkgs/by-name/ma/material-design-icons/package.nix
+++ b/pkgs/by-name/ma/material-design-icons/package.nix
@@ -3,31 +3,27 @@
fetchFromGitHub,
stdenvNoCC,
nix-update-script,
+ installFonts,
}:
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
pname = "material-design-icons";
version = "7.4.47";
+ outputs = [
+ "out"
+ "webfont"
+ ];
+
src = fetchFromGitHub {
owner = "Templarian";
repo = "MaterialDesign-Webfont";
- tag = "v${version}";
+ tag = "v${finalAttrs.version}";
hash = "sha256-7t3i3nPJZ/tRslLBfY+9kXH8TR145GC2hPFYJeMHRL8=";
sparseCheckout = [ "fonts" ];
};
- installPhase = ''
- runHook preInstall
-
- mkdir -p "$out/share/fonts/"{eot,truetype,woff,woff2}
- cp fonts/*.eot "$out/share/fonts/eot/"
- cp fonts/*.ttf "$out/share/fonts/truetype/"
- cp fonts/*.woff "$out/share/fonts/woff/"
- cp fonts/*.woff2 "$out/share/fonts/woff2/"
-
- runHook postInstall
- '';
+ nativeBuildInputs = [ installFonts ];
passthru.updateScript = nix-update-script { };
@@ -46,4 +42,4 @@ stdenvNoCC.mkDerivation rec {
dixslyf
];
};
-}
+})
diff --git a/pkgs/by-name/ma/matrix-commander-rs/package.nix b/pkgs/by-name/ma/matrix-commander-rs/package.nix
index bb999e21e94c..69f29c697c08 100644
--- a/pkgs/by-name/ma/matrix-commander-rs/package.nix
+++ b/pkgs/by-name/ma/matrix-commander-rs/package.nix
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "matrix-commander-rs";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchFromGitHub {
owner = "8go";
repo = "matrix-commander-rs";
tag = "v${finalAttrs.version}";
- hash = "sha256-CvsMRxB5s891cVu03RroTQYOGA6rmhpif8VT0njXTnc=";
+ hash = "sha256-SyAKKSPGO8yjP3Pgsr2sPW5cpNyNLiYTy7CDDAXdztw=";
};
- cargoHash = "sha256-hzWq09qJTox8yZuMOQ1///hKxY4EsWn/mHKy3svxlF8=";
+ cargoHash = "sha256-X1xBhJ0B4FcC66qKtYZbcX2+92hy2R4fM/GYBI8AFTY=";
nativeBuildInputs = [
pkg-config
diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index bb30db2dfd79..0e696a287faa 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -164,11 +164,11 @@ let
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "microsoft-edge";
- version = "149.0.4022.52";
+ version = "149.0.4022.69";
src = fetchurl {
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
- hash = "sha256-3lFhfxkS80P59dk00lpBp+8IIFUvSEJVGGTfAghxw4g=";
+ hash = "sha256-0Ur+0KKJQ7VTr7IMax5BIgwSf6jNhr0Aiz+So7Hj/OE=";
};
# With strictDeps on, some shebangs were not being patched correctly
diff --git a/pkgs/by-name/mi/mitra/package.nix b/pkgs/by-name/mi/mitra/package.nix
index 0e147c1981dd..b0bc0ac14843 100644
--- a/pkgs/by-name/mi/mitra/package.nix
+++ b/pkgs/by-name/mi/mitra/package.nix
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "mitra";
- version = "4.17.0";
+ version = "5.0.0";
src = fetchFromCodeberg {
owner = "silverpill";
repo = "mitra";
rev = "v${finalAttrs.version}";
- hash = "sha256-ysV0r0K+2ivnDg/GuqwK5HWa4/jQtopXqS9g/9wWrOw=";
+ hash = "sha256-Chn3SONSg6yhwwHcry/cO2L7/ihEco35gpRlMlQVXz8=";
};
- cargoHash = "sha256-RDMLfg+KsvfXDjsCzCn53kebBRN8/6er/LsS/BzoeU0=";
+ cargoHash = "sha256-0lXwOphoUQqe1O0KbAOl98ZbMKyG8ZZOl7NhXYwSvvQ=";
# require running database
doCheck = false;
diff --git a/pkgs/by-name/mo/motrix-next/package.nix b/pkgs/by-name/mo/motrix-next/package.nix
index 0f9b3e7fc9fc..0aa6bcbb8067 100644
--- a/pkgs/by-name/mo/motrix-next/package.nix
+++ b/pkgs/by-name/mo/motrix-next/package.nix
@@ -25,16 +25,16 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "motrix-next";
- version = "3.9.3";
+ version = "3.9.4";
src = fetchFromGitHub {
owner = "AnInsomniacy";
repo = "motrix-next";
tag = "v${finalAttrs.version}";
- hash = "sha256-TK3M9fL+g1F9vFibZL4TXYCBeID1uz6+gRPtOxAAmLs=";
+ hash = "sha256-iubiVegDnOOczeYqMIU65RX43te91TbSdw2UdN/p6qQ=";
};
- cargoHash = "sha256-IUAoV6PAW4ae0BMBYfdfdezJXyOzaqKtPlqkSVCaqJk=";
+ cargoHash = "sha256-cZJ6KE28QC3WT9h8KMOmgvTMjwJLNCZ4ml+q2q7cH2c=";
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs)
diff --git a/pkgs/by-name/mp/mpv/scripts/twitch-chat.nix b/pkgs/by-name/mp/mpv/scripts/twitch-chat.nix
index 42358a60e6e4..33fb7d229737 100644
--- a/pkgs/by-name/mp/mpv/scripts/twitch-chat.nix
+++ b/pkgs/by-name/mp/mpv/scripts/twitch-chat.nix
@@ -7,13 +7,13 @@
}:
buildLua {
pname = "twitch-chat";
- version = "0-unstable-2025-05-15";
+ version = "0-unstable-2026-06-13";
src = fetchFromGitHub {
owner = "CrendKing";
repo = "mpv-twitch-chat";
- rev = "4d88ac12c843da0e916b0ed1df4d087a3418501b";
- hash = "sha256-owU0F976K4CX0kKYoRbdtz/sqCvd8kw2LqItEgY25gE=";
+ rev = "1e9d2dfcd8ab9c343cc6a3c55363994dbafe5b58";
+ hash = "sha256-vtv5YZO7qROhUL3TKCKaNfvv1uCjQv9kvfo7sno24BE=";
postFetch = "rm $out/screenshot.webp";
};
diff --git a/pkgs/by-name/mq/mqtt-explorer/package.nix b/pkgs/by-name/mq/mqtt-explorer/package.nix
index 1f09774684f6..8471ece5d4a7 100644
--- a/pkgs/by-name/mq/mqtt-explorer/package.nix
+++ b/pkgs/by-name/mq/mqtt-explorer/package.nix
@@ -56,12 +56,6 @@ stdenv.mkDerivation rec {
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
- # disable code signing on macos
- # https://github.com/electron-userland/electron-builder/blob/77f977435c99247d5db395895618b150f5006e8f/docs/code-signing.md#how-to-disable-code-signing-during-the-build-process-on-macos
- postConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
- export CSC_IDENTITY_AUTO_DISCOVERY=false
- '';
-
configurePhase = ''
runHook preConfigure
@@ -100,7 +94,9 @@ stdenv.mkDerivation rec {
yarn --offline run electron-builder --dir \
-c.electronDist="$electron_dist" \
- -c.electronVersion=${electron.version}
+ -c.electronVersion=${electron.version} \
+ -c.mac.identity=null
+ # ^ disable code signing on macos
runHook postBuild
'';
diff --git a/pkgs/by-name/mq/mqtt-exporter/package.nix b/pkgs/by-name/mq/mqtt-exporter/package.nix
index cee141656e8b..5ccf8c0798fa 100644
--- a/pkgs/by-name/mq/mqtt-exporter/package.nix
+++ b/pkgs/by-name/mq/mqtt-exporter/package.nix
@@ -23,6 +23,8 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
prometheus-client
];
+ pythonRelaxDeps = [ "prometheus-client" ];
+
nativeCheckInputs = with python3.pkgs; [
pytest-mock
pytestCheckHook
diff --git a/pkgs/by-name/ms/msedgedriver/package.nix b/pkgs/by-name/ms/msedgedriver/package.nix
index 053d4e347fac..5a7bac587d47 100644
--- a/pkgs/by-name/ms/msedgedriver/package.nix
+++ b/pkgs/by-name/ms/msedgedriver/package.nix
@@ -11,11 +11,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "msedgedriver";
- version = "149.0.4022.52";
+ version = "149.0.4022.69";
src = fetchzip {
url = "https://msedgedriver.microsoft.com/${finalAttrs.version}/edgedriver_linux64.zip";
- hash = "sha256-GLPkBOlXDTpjYrrc9odDeHXXZ8vLPiw06v1bIN1zOpo=";
+ hash = "sha256-BtyQD+zkZWv5GhnxJOg4BkVLrCdBZr7KN1bvXyvp4B8=";
stripRoot = false;
};
diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-contract/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-contract/package.nix
index ab4263a3e576..4e8111659dda 100644
--- a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-contract/package.nix
+++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-contract/package.nix
@@ -11,7 +11,7 @@
}:
buildPythonPackage (finalAttrs: {
pname = "netbox-contract";
- version = "2.4.5";
+ version = "2.4.6";
pyproject = true;
__structuredAttrs = true;
@@ -21,7 +21,7 @@ buildPythonPackage (finalAttrs: {
owner = "mlebreuil";
repo = "netbox-contract";
tag = "v${finalAttrs.version}";
- hash = "sha256-+6dw8vPDNItZRfExL0C5ul2XghoToMHotEAH90B3CmE=";
+ hash = "sha256-e8DYjU2UtlWu044e4b5eJWOA/fXDRKLl5AVtaepG0sg=";
};
build-system = [ setuptools ];
diff --git a/pkgs/by-name/ni/nixos-firewall-tool/package.nix b/pkgs/by-name/ni/nixos-firewall-tool/package.nix
index f0245905a902..08cf7b138c8a 100644
--- a/pkgs/by-name/ni/nixos-firewall-tool/package.nix
+++ b/pkgs/by-name/ni/nixos-firewall-tool/package.nix
@@ -7,8 +7,8 @@
}:
stdenvNoCC.mkDerivation {
- name = "nixos-firewall-tool";
-
+ pname = "nixos-firewall-tool";
+ version = lib.trivial.release;
src = builtins.filterSource (name: _: !(lib.hasSuffix ".nix" name)) ./.;
strictDeps = true;
diff --git a/pkgs/by-name/ni/nixtamal/package.nix b/pkgs/by-name/ni/nixtamal/package.nix
index e9f4193375a0..cb79390c8a10 100644
--- a/pkgs/by-name/ni/nixtamal/package.nix
+++ b/pkgs/by-name/ni/nixtamal/package.nix
@@ -20,7 +20,7 @@
ocamlPackages.buildDunePackage (finalAttrs: {
pname = "nixtamal";
- version = "1.5.4";
+ version = "1.6.0";
release_year = 2026;
minimalOCamlVersion = "5.3";
@@ -29,7 +29,7 @@ ocamlPackages.buildDunePackage (finalAttrs: {
url = "https://darcs.toastal.in.th/nixtamal/stable/";
mirrors = [ "https://smeder.ee/~toastal/nixtamal.darcs" ];
rev = finalAttrs.version;
- hash = "sha256-ST90m0SF3dyGOV3Q43bJ9bGuznP0WIkQsIJXUNFNPOs=";
+ hash = "sha256-OOAulI6ZJGbbUMi68jnJQ+cJpZVQYL5F5HUfdOZ3wEs=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/no/nom/package.nix b/pkgs/by-name/no/nom/package.nix
index f9b26dd51ce6..87aeb226efb2 100644
--- a/pkgs/by-name/no/nom/package.nix
+++ b/pkgs/by-name/no/nom/package.nix
@@ -7,13 +7,13 @@
}:
buildGoModule (finalAttrs: {
pname = "nom";
- version = "3.3.1";
+ version = "3.3.2";
src = fetchFromGitHub {
owner = "guyfedwards";
repo = "nom";
tag = "v${finalAttrs.version}";
- hash = "sha256-Uxsq6tbWAPNvOz9fQ8820b2E2Xo/a1Pfzq8p/2mAVoc=";
+ hash = "sha256-ZsauLHdGkD6cJ9SYwoTyOLu2CDLp8tBGqXn4jDElAMA=";
};
vendorHash = "sha256-otrK4mTqgRr9Ntf2D1f0/deQcObejRWN7BaScV4q+FY=";
diff --git a/pkgs/by-name/no/nomadnet/package.nix b/pkgs/by-name/no/nomadnet/package.nix
new file mode 100644
index 000000000000..94ed42e7f7d0
--- /dev/null
+++ b/pkgs/by-name/no/nomadnet/package.nix
@@ -0,0 +1,3 @@
+{ python3Packages }:
+
+python3Packages.toPythonApplication python3Packages.nomadnet
diff --git a/pkgs/by-name/nu/nu-lint/package.nix b/pkgs/by-name/nu/nu-lint/package.nix
index 751b4c996a02..84f69553f2b5 100644
--- a/pkgs/by-name/nu/nu-lint/package.nix
+++ b/pkgs/by-name/nu/nu-lint/package.nix
@@ -8,16 +8,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "nu-lint";
- version = "1.1.2";
+ version = "1.2.1";
src = fetchFromCodeberg {
owner = "wvhulle";
repo = "nu-lint";
tag = "v${finalAttrs.version}";
- hash = "sha256-zALlwEEzk6IapnLbqn9v/HV5QC9dvJi7VzEWgCQJT2s=";
+ hash = "sha256-5YR1Cn9/psNswLVYtDZGmvoP9AwBANa0sPHN4eqcRhQ=";
};
- cargoHash = "sha256-l1vbNnKqFFOUUPQJZgNajNNGYAHtd7nozF7+YQmLN/k=";
+ cargoHash = "sha256-FA9C7Li4wtXvI8+jDTmdFjqsop6cvGNPByRpOfvQPzw=";
nativeBuildInputs = lib.optionals stdenvNoCC.hostPlatform.isDarwin [
# Avoids "couldn't find any valid shared libraries matching: ['libclang.dylib']" error on darwin in sandbox mode.
diff --git a/pkgs/by-name/oc/oci-cli/package.nix b/pkgs/by-name/oc/oci-cli/package.nix
index d2c874b0f29b..c114c75ba567 100644
--- a/pkgs/by-name/oc/oci-cli/package.nix
+++ b/pkgs/by-name/oc/oci-cli/package.nix
@@ -31,14 +31,14 @@ in
py.pkgs.buildPythonApplication (finalAttrs: {
pname = "oci-cli";
- version = "3.85.0";
+ version = "3.86.0";
pyproject = true;
src = fetchFromGitHub {
owner = "oracle";
repo = "oci-cli";
tag = "v${finalAttrs.version}";
- hash = "sha256-10KIrd6ZI56YiqNzmo/f5jUEp5YZF5JUN6NPzbgnq9w=";
+ hash = "sha256-bdHhM7ah1dnQYOK8TXheSqSbFZn3WgMfsfQtAT24wBM=";
};
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/oe/oelint-adv/package.nix b/pkgs/by-name/oe/oelint-adv/package.nix
index 68215db4413c..60997d1a6a5a 100644
--- a/pkgs/by-name/oe/oelint-adv/package.nix
+++ b/pkgs/by-name/oe/oelint-adv/package.nix
@@ -7,14 +7,14 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "oelint-adv";
- version = "9.8.2";
+ version = "9.8.4";
pyproject = true;
src = fetchFromGitHub {
owner = "priv-kweihmann";
repo = "oelint-adv";
tag = finalAttrs.version;
- hash = "sha256-mZleG+NAVqjeJ66SlYYvF90XwJ4H1wlsMOQRBdH1qhM=";
+ hash = "sha256-bQFjf+BAmJKsjcjZcTc34+4bcSq4hgSBKgHRcYA1ai0=";
};
postPatch = ''
diff --git a/pkgs/by-name/op/openapi-changes/package.nix b/pkgs/by-name/op/openapi-changes/package.nix
index 4c8f38fabc0a..768e6071c96b 100644
--- a/pkgs/by-name/op/openapi-changes/package.nix
+++ b/pkgs/by-name/op/openapi-changes/package.nix
@@ -9,27 +9,50 @@
buildGoModule (finalAttrs: {
pname = "openapi-changes";
- version = "0.0.78";
+ version = "0.2.6";
src = fetchFromGitHub {
owner = "pb33f";
repo = "openapi-changes";
rev = "v${finalAttrs.version}";
- hash = "sha256-Ct4VyYFqdMmROg9SE/pFNOJozSkQtKpgktJVgvtW/HA=";
+ hash = "sha256-zPDZFJuru67rw4xFSa4tMucmHiin27a112wdCpIpjiQ=";
};
- # this test requires the `.git` of the project to be present
- patchPhase = ''
- rm git/read_local_test.go
- '';
+ # skip tests that require a git repository and fail in the sandbox
+ checkFlags =
+ let
+ skippedTests = [
+ "TestResolveGitRefSource"
+ "TestLoadLeftRightCommits_UsesSafeDisplayLabels"
+ "TestLoadCommitsFromArgs_GitRefUsesLeftRightDispatch"
+ "TestReportCommand_GitRefUsesLeftRightMode"
+ ];
+ in
+ [
+ "-skip"
+ "^(${lib.concatStringsSep "|" skippedTests})$"
+ ];
nativeBuildInputs = [ makeWrapper ];
+ nativeCheckInputs = [ git ];
+ __darwinAllowLocalNetworking = true;
+
+ # tests require a git repository
+ preCheck = ''
+ export HOME=$(mktemp -d)
+ git init
+ git config --global user.email "you@example.com"
+ git config --global user.name "Your Name"
+ git add .
+ git commit -m "initial commit"
+ '';
+
postInstall = ''
wrapProgram $out/bin/openapi-changes --prefix PATH : ${lib.makeBinPath [ git ]}
'';
- vendorHash = "sha256-bcQAXPw4x+oXx3L0vypbqp96nYdcjQo6M3yOwFbIdpg=";
+ vendorHash = "sha256-0Bu/UXE+EfPMEpyWh9etFCq6jpXHbRUoZOblu8T65HY=";
passthru.updateScript = gitUpdater {
rev-prefix = "v";
@@ -39,7 +62,7 @@ buildGoModule (finalAttrs: {
description = "World's sexiest OpenAPI breaking changes detector";
homepage = "https://pb33f.io/openapi-changes/";
changelog = "https://github.com/pb33f/openapi-changes/releases/tag/v${finalAttrs.version}";
- license = lib.licenses.gpl3;
+ license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ mguentner ];
};
})
diff --git a/pkgs/by-name/op/opencode-desktop/package.nix b/pkgs/by-name/op/opencode-desktop/package.nix
index 2af9b61a87bb..87b15e49ed0d 100644
--- a/pkgs/by-name/op/opencode-desktop/package.nix
+++ b/pkgs/by-name/op/opencode-desktop/package.nix
@@ -54,12 +54,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
OPENCODE_CHANNEL = "prod";
MODELS_DEV_API_JSON = "${models-dev}/dist/_api.json";
OPENCODE_DISABLE_MODELS_FETCH = true;
- }
- # Disable code signing on macOS. Public build hosts don't have Apple Developer
- # certificates, so electron-builder's `security find-identity` spawns produce
- # EPERM inside the nix sandbox.
- // lib.optionalAttrs stdenvNoCC.hostPlatform.isDarwin {
- CSC_IDENTITY_AUTO_DISCOVERY = "false";
};
postPatch = ''
diff --git a/pkgs/by-name/op/openocd-rp2040/package.nix b/pkgs/by-name/op/openocd-rp2040/package.nix
new file mode 100644
index 000000000000..7ec3aa6f8d93
--- /dev/null
+++ b/pkgs/by-name/op/openocd-rp2040/package.nix
@@ -0,0 +1,33 @@
+{
+ openocd,
+ autoreconfHook,
+ lib,
+ fetchFromGitHub,
+}:
+
+openocd.overrideAttrs (
+ finalAttrs: old: {
+ pname = "openocd-rp2040";
+ version = "2.2.0";
+ src = fetchFromGitHub {
+ owner = "raspberrypi";
+ repo = "openocd";
+ tag = "sdk-${finalAttrs.version}";
+ hash = "sha256-ZfbZVFVncHa1MvNJb4jbnU66vnlwVLBaOXPdgLqAneM=";
+ # openocd disables the vendored libraries that use submodules and replaces them with nix versions.
+ # this works out as one of the submodule sources seems to be flakey.
+ fetchSubmodules = false;
+ };
+ nativeBuildInputs = old.nativeBuildInputs ++ [
+ autoreconfHook
+ ];
+ meta = openocd.meta // {
+ description = "Raspberry Pi's downstream fork of OpenOCD for use with Pico-series devices";
+ homepage = "https://github.com/raspberrypi/openocd";
+ maintainers = with lib.maintainers; [
+ aiyion
+ lu15w1r7h
+ ];
+ };
+ }
+)
diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix
index cd4b0d4ff2d9..20e6d3947fa8 100644
--- a/pkgs/by-name/or/orca-slicer/package.nix
+++ b/pkgs/by-name/or/orca-slicer/package.nix
@@ -28,9 +28,7 @@
hicolor-icon-theme,
libsecret,
libpng,
- makeFontsConf,
mpfr,
- nanum,
nlopt,
opencascade-occt_7_6,
openvdb,
@@ -60,12 +58,6 @@ let
"--enable-secretstore"
];
});
-
- # Workaround for crash due to missing font
- # https://github.com/OrcaSlicer/OrcaSlicer/issues/11641
- fontsConf = makeFontsConf {
- fontDirectories = [ nanum ];
- };
in
stdenv.mkDerivation (finalAttrs: {
pname = "orca-slicer";
@@ -225,7 +217,6 @@ stdenv.mkDerivation (finalAttrs: {
]
}"
--set WEBKIT_DISABLE_COMPOSITING_MODE 1
- --set FONTCONFIG_FILE "${fontsConf}"
${lib.optionalString withNvidiaGLWorkaround ''
--set __GLX_VENDOR_LIBRARY_NAME mesa
--set __EGL_VENDOR_LIBRARY_FILENAMES /run/opengl-driver/share/glvnd/egl_vendor.d/50_mesa.json
diff --git a/pkgs/by-name/or/orca/package.nix b/pkgs/by-name/or/orca/package.nix
index 6cb77c9b2ed0..41769c769272 100644
--- a/pkgs/by-name/or/orca/package.nix
+++ b/pkgs/by-name/or/orca/package.nix
@@ -128,7 +128,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
Needs `services.gnome.at-spi2-core.enable = true;` in `configuration.nix`.
'';
- maintainers = with lib.maintainers; [ berce ];
teams = [ lib.teams.gnome ];
license = lib.licenses.lgpl21;
platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/os/ostrich-sans/package.nix b/pkgs/by-name/os/ostrich-sans/package.nix
index a31617e6bd4f..8638ae0bf775 100644
--- a/pkgs/by-name/os/ostrich-sans/package.nix
+++ b/pkgs/by-name/os/ostrich-sans/package.nix
@@ -2,12 +2,18 @@
lib,
fetchFromGitHub,
stdenvNoCC,
+ installFonts,
}:
stdenvNoCC.mkDerivation {
pname = "ostrich-sans";
version = "2014-04-18";
+ outputs = [
+ "out"
+ "webfont"
+ ];
+
src = fetchFromGitHub {
owner = "theleagueof";
repo = "ostrich-sans";
@@ -15,13 +21,7 @@ stdenvNoCC.mkDerivation {
hash = "sha256-vvTNtl+fO2zWooH1EvCmO/dPYYgCkj8Ckg5xfg1gtnw=";
};
- installPhase = ''
- runHook preInstall
-
- install -D -m444 -t $out/share/fonts/opentype $src/*.otf
-
- runHook postInstall
- '';
+ nativeBuildInputs = [ installFonts ];
meta = {
description = "Gorgeous modern sans-serif with a very long neck";
diff --git a/pkgs/by-name/pa/panache/package.nix b/pkgs/by-name/pa/panache/package.nix
index 16e2e3165873..9ee7b880bc32 100644
--- a/pkgs/by-name/pa/panache/package.nix
+++ b/pkgs/by-name/pa/panache/package.nix
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "panache";
- version = "2.49.0";
+ version = "2.51.0";
src = fetchFromGitHub {
owner = "jolars";
repo = "panache";
tag = "v${finalAttrs.version}";
- hash = "sha256-7IrlArMcr1Ja7jQl4nMLtsPhfoCRTp9Vsap7aD/lyDs=";
+ hash = "sha256-+008xCfLMoMIMUZJuo7/+KSxeKZOH3jrXHVpLmBkjmY=";
};
- cargoHash = "sha256-/D1yiuTtxQ/NAjqXUAPHWkHsw/+cpiBlYy1UwJOyD+Q=";
+ cargoHash = "sha256-y9lX20k2GHuVyuZeIyGgKAoLM11u1mAkf5Y+Q1A1ArI=";
nativeBuildInputs = [
installShellFiles
diff --git a/pkgs/by-name/ph/phpstan/package.nix b/pkgs/by-name/ph/phpstan/package.nix
index 4cad12cd2031..cdc91f106bd9 100644
--- a/pkgs/by-name/ph/phpstan/package.nix
+++ b/pkgs/by-name/ph/phpstan/package.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "phpstan";
- version = "2.2.1";
+ version = "2.2.2";
src = fetchFromGitHub {
owner = "phpstan";
repo = "phpstan";
tag = finalAttrs.version;
- hash = "sha256-oZ4ph5pQimUuJVjIRhGDgFg4rbrMwVGxdXC71zVh6Lc=";
+ hash = "sha256-4C3d8ae9TGpyLNspClSS+Eor6epjG1BTS/Nzy4K5zZE=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/pj/pj/package.nix b/pkgs/by-name/pj/pj/package.nix
index 5b48a60c27bc..42f65a474e6e 100644
--- a/pkgs/by-name/pj/pj/package.nix
+++ b/pkgs/by-name/pj/pj/package.nix
@@ -8,13 +8,13 @@
buildGoModule (finalAttrs: {
pname = "pj";
- version = "1.13.0";
+ version = "1.14.0";
src = fetchFromGitHub {
owner = "josephschmitt";
repo = "pj";
tag = "v${finalAttrs.version}";
- hash = "sha256-T09puEftbgvtXKcywJcXHfI+UTKGjyFaPMr7LEHDIUQ=";
+ hash = "sha256-i6BYNKizpEE3OffkOuAShFow21sMMHPyCK5RMguXCCQ=";
};
vendorHash = "sha256-rya2afSV9Y1hmUZU0wyR9NETBl3TXD/OTHv0zvVl8v8=";
diff --git a/pkgs/by-name/pl/plausible/package.nix b/pkgs/by-name/pl/plausible/package.nix
index ed170e31d665..3afdb2a5040c 100644
--- a/pkgs/by-name/pl/plausible/package.nix
+++ b/pkgs/by-name/pl/plausible/package.nix
@@ -9,23 +9,23 @@
runCommand,
nixosTests,
npm-lockfile-fix,
+ cmake,
nix-update-script,
brotli,
- tailwindcss_3,
esbuild,
buildPackages,
}:
let
pname = "plausible";
- version = "3.0.1";
+ version = "3.2.1";
mixEnv = "ce";
src = fetchFromGitHub {
owner = "plausible";
repo = "analytics";
rev = "v${version}";
- hash = "sha256-DQIRsqkH2zgIkb3yezuJEKJ99PS031GJ+bDAeHMLNUY=";
+ hash = "sha256-2roIj0s2cybYdGmmJSPJ5Rc1gNunxlYew9JR5xxMv+k=";
postFetch = ''
${lib.getExe npm-lockfile-fix} $out/assets/package-lock.json
sed -ie '
@@ -47,7 +47,7 @@ let
pname = "${pname}-assets";
inherit version;
src = "${src}/assets";
- npmDepsHash = "sha256-hPbKEC8DE/gb483COG/ZbTuEP8Y44Fs7ppHMpXphCjg=";
+ npmDepsHash = "sha256-grYxPRzpu3pcv3lyTQxx0RDhmgFhsOKZoYbzd701xjA=";
dontNpmBuild = true;
installPhase = ''
runHook preInstall
@@ -60,7 +60,7 @@ let
pname = "${pname}-tracker";
inherit version;
src = "${src}/tracker";
- npmDepsHash = "sha256-kfqJVUw3xnMT0sOkc5O42CwBxPQXiYnOQ5WpdZwzxfE";
+ npmDepsHash = "sha256-hrsvQXvbcfRDUc1qinyUJ7Oh4yMM1e+UEdYudjYyJxk=";
dontNpmBuild = true;
installPhase = ''
runHook preInstall
@@ -69,6 +69,18 @@ let
'';
};
+ # lazy_html (new dep since 3.1.0) builds a NIF against lexbor
+ # its Makefile clones lexbor at build time (which sandbox forbids)
+ # pre-seed commit in lazy_html's mix.exs so the clone target is skipped
+ # and force a build in preBuild below
+ lexborCommit = "244b84956a6dc7eec293781d051354f351274c46";
+ lexborSrc = fetchFromGitHub {
+ owner = "lexbor";
+ repo = "lexbor";
+ rev = lexborCommit;
+ hash = "sha256-Oup/lGU8a9Dqfho4Llg39t9Y9n4xfUmGk0772OkpnLQ=";
+ };
+
mixFodDeps = beamPackages.fetchMixDeps {
inherit
pname
@@ -76,7 +88,7 @@ let
src
mixEnv
;
- hash = "sha256-caCbuMEDsLcxm8xehWEJiaTfgl435crBfnQFQpzGsLY";
+ hash = "sha256-fm/elkCNpu5sduBxly06i/z30Y9BMtt+qthXmLuvlUc=";
};
mjmlNif = rustPlatform.buildRustPackage {
@@ -84,7 +96,7 @@ let
version = "";
src = "${mixFodDeps}/mjml/native/mjml_nif";
- cargoHash = "sha256-zDWOik65PWAMpIDDcG+DibprPVW/k+Q83+fjFI5vWaY=";
+ cargoHash = "sha256-a8xSRdFtMYF0n2rl7A5ZgHoaunUJLVJwHvrkc9uyZKo=";
doCheck = false;
env = {
@@ -109,7 +121,13 @@ let
file=''${lib##*/}
base=''${file%.*}
ln -s "$lib" $out/mjml/priv/native/$base.so
+ # mjml >= 4.0 loads through RustlerPrecompiled (expects NIF name w/o lib prefix)
+ ln -s "$lib" $out/mjml/priv/native/''${base#lib}.so
done
+
+ mkdir -p $out/lazy_html/_build/c/third_party/lexbor
+ cp -r --no-preserve=mode ${lexborSrc} \
+ $out/lazy_html/_build/c/third_party/lexbor/${lexborCommit}
'';
beamPackages = beam27Packages.extend (self: super: { elixir = elixir_1_18; });
@@ -126,10 +144,22 @@ beamPackages.mixRelease rec {
nativeBuildInputs = [
nodejs
brotli
+ cmake
];
+ dontUseCmakeConfigure = true;
+
mixFodDeps = patchedMixFodDeps;
+ # deps are compiled in mixRelease configurePhase
+ # so the force_build switch must be in place before then
+ # preBuild would be too late
+ preConfigure = ''
+ cat >> config/config.exs <= 3.1.0 needs tailwind v4
cat >> config/config.exs < rawMag {};
++ // Sized to cover wide / HiDPI windows; paint() additionally clamps the
++ // working width to this capacity so the buffer can never be overrun.
++ std::array rawMag {};
+
+ // Background color randomization
+ juce::Colour bgColour = juce::Colour(0xff2a2a2a); // Default dark color
diff --git a/pkgs/by-name/qu/quad-morph-filter/package.nix b/pkgs/by-name/qu/quad-morph-filter/package.nix
new file mode 100644
index 000000000000..f3949e170a63
--- /dev/null
+++ b/pkgs/by-name/qu/quad-morph-filter/package.nix
@@ -0,0 +1,126 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+
+ cmake,
+ pkg-config,
+
+ alsa-lib,
+ freetype,
+ juce,
+ xsimd,
+
+ libx11,
+ libxcursor,
+ libxext,
+ libxinerama,
+ libxrandr,
+
+ nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "quad-morph-filter";
+ version = "1.0.0";
+
+ src = fetchFromGitHub {
+ owner = "OTODESK4193";
+ repo = "QuadMorphFilter";
+ tag = "V${finalAttrs.version}";
+ hash = "sha256-xz97h8j411r7g6fSVDo8E4ARLyIP++qK26aTvDqP+Yo=";
+ };
+
+ __structuredAttrs = true;
+ strictDeps = true;
+
+ # FilterVisualizer writes a per-pixel response curve into a fixed
+ # std::array, assuming the editor is <=1024px wide. The standalone
+ # window is resizable (HiDPI/large/tiled displays make it far wider), so the
+ # write overruns the array and smashes adjacent editor members -> SIGSEGV on the
+ # first paint. Clamp the width to the buffer and size the buffer for wide windows.
+ # see https://github.com/OTODESK4193/QuadMorphFilter/issues/2
+ patches = [ ./filtervisualizer-clamp-width.patch ];
+
+ postPatch = ''
+ # Use JUCE from nixpkgs instead of a hardcoded Windows path, and drop
+ # -mavx2/-mfma: baseline x86_64-linux has no AVX2 and other platforms
+ # reject the flags. The code contains no AVX intrinsics; it compiles
+ # and runs fine without them.
+ substituteInPlace CMakeLists.txt \
+ --replace-fail 'set(JUCE_DIR "C:/JUCE")' 'find_package(JUCE CONFIG REQUIRED)' \
+ --replace-fail 'add_subdirectory(''${JUCE_DIR} build_juce)' "" \
+ --replace-fail ' -mavx2 -mfma' "" \
+ --replace-fail ' -ffast-math' ""
+
+ # The Linux WebBrowserComponent (gtk3/webkit) and curl are unused by the
+ # plugin; disable them instead of pulling the dependencies in.
+ printf '\ntarget_compile_definitions(QuadMorphFilter PUBLIC JUCE_WEB_BROWSER=0 JUCE_USE_CURL=0)\n' >> CMakeLists.txt
+ '';
+
+ nativeBuildInputs = [
+ cmake
+ pkg-config
+ ];
+ buildInputs = [
+ alsa-lib
+ freetype
+ juce # propagates fontconfig
+ libx11
+ libxcursor
+ libxext
+ libxinerama
+ libxrandr
+ xsimd
+ ];
+
+ cmakeFlags = [
+ # Upstream pulls xsimd via FetchContent; resolve it through
+ # find_package against the xsimd in buildInputs instead of the network.
+ (lib.cmakeFeature "FETCHCONTENT_TRY_FIND_PACKAGE_MODE" "ALWAYS")
+ ];
+
+ cmakeBuildType = "RelWithDebInfo";
+
+ # JUCE dlopens these at runtime, standalone executable crashes without them.
+ # Must go through `env`: with __structuredAttrs only `env` entries are
+ # exported, so a top-level NIX_LDFLAGS never reaches the ld wrapper.
+ env.NIX_LDFLAGS = toString [
+ "-lX11"
+ "-lXext"
+ "-lXcursor"
+ "-lXinerama"
+ "-lXrandr"
+ ];
+
+ # Upstream has no install rules.
+ installPhase = ''
+ runHook preInstall
+
+ install -Dm755 "QuadMorphFilter_artefacts/$cmakeBuildType/Standalone/Quad-Morph Filter" \
+ "$out/bin/quad-morph-filter"
+ mkdir -p "$out/lib/vst3"
+ cp -r "QuadMorphFilter_artefacts/$cmakeBuildType/VST3/Quad-Morph Filter.vst3" "$out/lib/vst3/"
+
+ runHook postInstall
+ '';
+
+ passthru.updateScript = nix-update-script {
+ extraArgs = [
+ "--version-regex"
+ "V(.*)"
+ ];
+ };
+
+ meta = {
+ description = "Morphing multi-filter audio plugin with 28 filter models controlled from an XY pad";
+ homepage = "https://github.com/OTODESK4193/QuadMorphFilter";
+ changelog = "https://github.com/OTODESK4193/QuadMorphFilter/releases/tag/V${finalAttrs.version}";
+ # Stated in README.md ("GPLv3, inherited via the JUCE framework");
+ # the repository ships no LICENSE file.
+ license = lib.licenses.gpl3Only;
+ maintainers = with lib.maintainers; [ magnetophon ];
+ platforms = lib.platforms.linux;
+ mainProgram = "quad-morph-filter";
+ };
+})
diff --git a/pkgs/by-name/ra/radicale/package.nix b/pkgs/by-name/ra/radicale/package.nix
index 6aa35508264c..8c9df8f7797f 100644
--- a/pkgs/by-name/ra/radicale/package.nix
+++ b/pkgs/by-name/ra/radicale/package.nix
@@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "radicale";
- version = "3.7.4";
+ version = "3.7.5";
pyproject = true;
src = fetchFromGitHub {
owner = "Kozea";
repo = "Radicale";
tag = "v${finalAttrs.version}";
- hash = "sha256-VHSlrVcPbOFUqxPx6/4HR85i3lObQZcKJmomiLE273s=";
+ hash = "sha256-P9xm/2sTDLiX7PqJ+juaIVpwbJ4r/jyBEFE/QWtl9Yo=";
};
build-system = with python3.pkgs; [
diff --git a/pkgs/by-name/ra/rapidcsv/package.nix b/pkgs/by-name/ra/rapidcsv/package.nix
index f2b3b85c5111..834b144a476c 100644
--- a/pkgs/by-name/ra/rapidcsv/package.nix
+++ b/pkgs/by-name/ra/rapidcsv/package.nix
@@ -6,13 +6,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "rapidcsv";
- version = "8.97";
+ version = "8.99";
src = fetchFromGitHub {
owner = "d99kris";
repo = "rapidcsv";
rev = "v${finalAttrs.version}";
- hash = "sha256-A0YYstmJH2lit/odHfVXWmxGDHRKyGL5v7gHtEUJGqk=";
+ hash = "sha256-TJ4IpBt2G+zUf2AEUB9wwz8Zk1UEoqqoemTVJCB+8D0=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/re/redo-apenwarr/package.nix b/pkgs/by-name/re/redo-apenwarr/package.nix
index 38aae496b40d..71b0967cd2df 100644
--- a/pkgs/by-name/re/redo-apenwarr/package.nix
+++ b/pkgs/by-name/re/redo-apenwarr/package.nix
@@ -48,6 +48,11 @@ stdenv.mkDerivation (finalAttrs: {
# See https://github.com/apenwarr/redo/pull/47
substituteInPlace minimal/do \
--replace-fail 'cd "$dodir"' 'cd "''${dodir:-.}"'
+
+ # the tests refer to /etc/passwd (as an arbitrarily-chosen absolute-path file that won't change),
+ # but that fails under sandboxing. Replace it with another arbrarily-chosen file that won't change:
+ substituteInPlace t/105-sympath/all.do \
+ --replace-fail "/etc/passwd" "${coreutils}/bin/pwd"
'';
inherit doCheck;
diff --git a/pkgs/by-name/re/redo/package.nix b/pkgs/by-name/re/redo/package.nix
index 8e3e138501e9..941f0fbd56aa 100644
--- a/pkgs/by-name/re/redo/package.nix
+++ b/pkgs/by-name/re/redo/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
homepage = "https://github.com/jdebp/redo";
description = "System for building target files from source files";
license = lib.licenses.bsd2;
- maintainers = with lib.maintainers; [ momeemt ];
+ maintainers = [ ];
mainProgram = "redo";
platforms = lib.platforms.unix;
};
diff --git a/pkgs/by-name/rh/rhodium-libre/package.nix b/pkgs/by-name/rh/rhodium-libre/package.nix
index 20e27c0945bc..f47214b2b7a0 100644
--- a/pkgs/by-name/rh/rhodium-libre/package.nix
+++ b/pkgs/by-name/rh/rhodium-libre/package.nix
@@ -2,6 +2,7 @@
lib,
stdenvNoCC,
fetchFromGitHub,
+ installFonts,
}:
stdenvNoCC.mkDerivation rec {
@@ -15,14 +16,7 @@ stdenvNoCC.mkDerivation rec {
hash = "sha256-YCQvUdjEAj4G71WCRCM0+NwiqRqwt1Ggeg9jb/oWEsY=";
};
- installPhase = ''
- runHook preInstall
-
- install -Dm444 -t $out/share/fonts/opentype/ RhodiumLibre-Regular.otf
- install -Dm444 -t $out/share/fonts/truetype/ RhodiumLibre-Regular.ttf
-
- runHook postInstall
- '';
+ nativeBuildInputs = [ installFonts ];
meta = {
description = "F/OSS/Libre font for Latin and Devanagari";
diff --git a/pkgs/by-name/rh/rhvoice/package.nix b/pkgs/by-name/rh/rhvoice/package.nix
index 409e31190028..039d8ea5fa98 100644
--- a/pkgs/by-name/rh/rhvoice/package.nix
+++ b/pkgs/by-name/rh/rhvoice/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Free and open source speech synthesizer for Russian language and others";
homepage = "https://github.com/Olga-Yakovleva/RHVoice/wiki";
license = lib.licenses.gpl3;
- maintainers = with lib.maintainers; [ berce ];
+ maintainers = [ ];
platforms = with lib.platforms; all;
mainProgram = "RHVoice-test";
};
diff --git a/pkgs/by-name/rm/rmapi/package.nix b/pkgs/by-name/rm/rmapi/package.nix
index 75f5c7e36699..3aeeab18f490 100644
--- a/pkgs/by-name/rm/rmapi/package.nix
+++ b/pkgs/by-name/rm/rmapi/package.nix
@@ -24,7 +24,10 @@ buildGoModule (finalAttrs: {
homepage = "https://github.com/ddvk/rmapi";
changelog = "https://github.com/ddvk/rmapi/blob/v${finalAttrs.version}/CHANGELOG.md";
license = lib.licenses.agpl3Only;
- maintainers = [ lib.maintainers.nickhu ];
+ maintainers = with lib.maintainers; [
+ nickhu
+ boltzmannrain
+ ];
mainProgram = "rmapi";
};
})
diff --git a/pkgs/by-name/rn/rns-proxy/package.nix b/pkgs/by-name/rn/rns-proxy/package.nix
new file mode 100644
index 000000000000..2fd9c528f42b
--- /dev/null
+++ b/pkgs/by-name/rn/rns-proxy/package.nix
@@ -0,0 +1,46 @@
+{
+ lib,
+ rustPlatform,
+ fetchFromGitHub,
+ pkg-config,
+ bzip2,
+ versionCheckHook,
+ nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+ pname = "rns-proxy";
+ version = "0.1.0";
+ __structuredAttrs = true;
+
+ src = fetchFromGitHub {
+ owner = "mytecor";
+ repo = "rns-proxy";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-+nn6BjzG/SJr8plAVj3R9c459XqvbKSGSqAnNa+QGkY=";
+ };
+
+ cargoHash = "sha256-o+tMlsTuFR89lNwSl3+s+WOTVVReGCJc1xAAwK1zklg=";
+
+ nativeBuildInputs = [
+ pkg-config
+ ];
+
+ buildInputs = [
+ bzip2
+ ];
+
+ doInstallCheck = true;
+ nativeInstallCheckInputs = [ versionCheckHook ];
+
+ passthru.updateScript = nix-update-script { };
+
+ meta = {
+ changelog = "https://github.com/mytecor/rns-proxy/releases/tag/${finalAttrs.src.tag}";
+ description = "SOCKS5 tunnels over the Reticulum Network Stack";
+ homepage = "https://github.com/mytecor/rns-proxy";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ drupol ];
+ mainProgram = "rns-proxy";
+ };
+})
diff --git a/pkgs/by-name/ro/routedns/package.nix b/pkgs/by-name/ro/routedns/package.nix
index 74e123608ca1..d82e56fbd4db 100644
--- a/pkgs/by-name/ro/routedns/package.nix
+++ b/pkgs/by-name/ro/routedns/package.nix
@@ -7,16 +7,16 @@
buildGoModule (finalAttrs: {
pname = "routedns";
- version = "0.1.191";
+ version = "0.1.208";
src = fetchFromGitHub {
owner = "folbricht";
repo = "routedns";
rev = "v${finalAttrs.version}";
- hash = "sha256-Tr15MfF0GeaKUQRbkzqaWXJhTPVtZ/kpe5foq5MCemo=";
+ hash = "sha256-u1P+i8WXRDzoElvjnNr57ybuDGWBZ6qYF4wBPBYLv4I=";
};
- vendorHash = "sha256-a4KcKb75yWv7+1vIYCypS9nnrFJ3zogXIPzUVVA7AXs=";
+ vendorHash = "sha256-e19ZqeVA+WQOILZrju7xFDii/lxmZceXk30tWY74cmM=";
subPackages = [ "./cmd/routedns" ];
diff --git a/pkgs/by-name/rs/rs-lxmf/package.nix b/pkgs/by-name/rs/rs-lxmf/package.nix
index 5de637e44fb5..3c3732e2a4ac 100644
--- a/pkgs/by-name/rs/rs-lxmf/package.nix
+++ b/pkgs/by-name/rs/rs-lxmf/package.nix
@@ -9,14 +9,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "rs-lxmf";
- version = "0.9.2";
+ version = "1.0.0";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "ratspeak";
repo = "rsLXMF";
tag = "v${finalAttrs.version}";
- hash = "sha256-jba/uiQQUO3MdmF2+6AOtdbUXYW43yqplRFUGujN0Oo=";
+ hash = "sha256-fqSd+XZayW8mYdUF3MY/KjclvhfHtO1I4y1ot3EbdnA=";
};
postPatch = ''
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
done
'';
- cargoHash = "sha256-ReWw16r9cYIEzilzSsFXYap9ZGhk1mrUVl/bKkQMcVA=";
+ cargoHash = "sha256-Lv+mxsAtpzjd9tbMioZEH+7rvYVRiPYfD3icgQc+BrU=";
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
@@ -34,6 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
passthru.updateScript = nix-update-script { };
meta = {
+ changelog = "https://github.com/ratspeak/rsLXMF/releases/tag/${finalAttrs.src.tag}";
description = "Rust implementation of LXMF for Reticulum";
homepage = "https://github.com/ratspeak/rsLXMF";
license = lib.licenses.agpl3Only;
diff --git a/pkgs/by-name/rs/rs-reticulum/package.nix b/pkgs/by-name/rs/rs-reticulum/package.nix
index 5d4ec797437e..4b2b4f81fc4e 100644
--- a/pkgs/by-name/rs/rs-reticulum/package.nix
+++ b/pkgs/by-name/rs/rs-reticulum/package.nix
@@ -1,27 +1,29 @@
{
lib,
+ stdenv,
rustPlatform,
fetchFromGitHub,
pkg-config,
bzip2,
dbus,
python3,
+ versionCheckHook,
nix-update-script,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "rs-reticulum";
- version = "0.9.4";
+ version = "1.0.1";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "ratspeak";
repo = "rsReticulum";
tag = "v${finalAttrs.version}";
- hash = "sha256-9+Xn3fXcH+iTKh+SRh2CHLoK5N9Aqmk5cSXLQEmUYB0=";
+ hash = "sha256-MSvIgB/E1Ce8M8vOaXlHQGYnxFf0lT2hg8g0tx6QY/w=";
};
- cargoHash = "sha256-uBYYK8RQ2+D51xUM51TY9K7WbYiw5oNaNouKn610YH0=";
+ cargoHash = "sha256-Kv3aVET69yI28muyaJop4YQEqOxNeyajK7j5J+jDhe0=";
nativeBuildInputs = [
pkg-config
@@ -38,13 +40,22 @@ rustPlatform.buildRustPackage (finalAttrs: {
__darwinAllowLocalNetworking = true;
+ checkFlags = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+ # Broken since 0.9.4
+ "--skip=actor::tests::test_rate_tracking"
+ ];
+
+ doInstallCheck = true;
+ nativeInstallCheckInputs = [ versionCheckHook ];
+ versionCheckProgram = "${placeholder "out"}/bin/rnid-rs";
+
passthru.updateScript = nix-update-script { };
meta = {
+ changelog = "https://github.com/ratspeak/rsReticulum/releases/tag/${finalAttrs.src.tag}";
description = "Rust implementation of the Reticulum networking stack";
homepage = "https://github.com/ratspeak/rsReticulum";
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ drupol ];
- mainProgram = "rs-reticulum";
};
})
diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix
index 8566e5251408..8aa8f51b8273 100644
--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@@ -16,7 +16,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ruff";
- version = "0.15.16";
+ version = "0.15.17";
__structuredAttrs = true;
@@ -24,12 +24,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
owner = "astral-sh";
repo = "ruff";
tag = finalAttrs.version;
- hash = "sha256-krmHCLijp+D4gBjKV9cdicPob4ry5I6QwB3MUz0z7zA=";
+ hash = "sha256-+UsKRBe+lp/LdsmK/W11wCt2RypEryA5eBPb01OKCJw=";
};
cargoBuildFlags = [ "--package=ruff" ];
- cargoHash = "sha256-d2iV7iWf7lVhj1Bbaxxk5Zao4KK3oC7whppRvk0erzA=";
+ cargoHash = "sha256-y1sKf+KXya/K+WUiIE357U6DXh/d+AQgj0SQIi1gpUw=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/ru/run0-sudo-shim/package.nix b/pkgs/by-name/ru/run0-sudo-shim/package.nix
new file mode 100644
index 000000000000..937d0da8bfae
--- /dev/null
+++ b/pkgs/by-name/ru/run0-sudo-shim/package.nix
@@ -0,0 +1,46 @@
+{
+ lib,
+ rustPlatform,
+ fetchFromGitHub,
+ nix-update-script,
+ coreutils,
+ polkit-stdin-agent,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+ pname = "run0-sudo-shim";
+ version = "1.3.1";
+
+ src = fetchFromGitHub {
+ owner = "LordGrimmauld";
+ repo = "run0-sudo-shim";
+ tag = finalAttrs.version;
+ hash = "sha256-QkDoEBgcWh/eKX8jxctMNEy08Sf8kpxXFhWbsygTWz8=";
+ };
+
+ cargoHash = "sha256-ly2e2x1Z1XEXblGqWi+/r5q2FmvpekVfzGVGm+S1xio=";
+
+ __structuredAttrs = true;
+
+ env = {
+ POLKIT_STDIN_AGENT = lib.getExe polkit-stdin-agent;
+ TRUE = lib.getExe' coreutils "true";
+ };
+
+ postInstall = ''
+ ln -s $out/bin/run0-sudo-shim $out/bin/sudo
+ '';
+
+ passthru.updateScript = nix-update-script { };
+
+ meta = {
+ description = "Shim for the sudo command that utilizes run0";
+ changelog = "https://github.com/LordGrimmauld/run0-sudo-shim/releases/tag/${finalAttrs.version}";
+ mainProgram = "sudo";
+ license = lib.licenses.bsd3;
+ maintainers = with lib.maintainers; [
+ zimward
+ kuflierl
+ grimmauld
+ ];
+ };
+})
diff --git a/pkgs/by-name/s-/s-tui/package.nix b/pkgs/by-name/s-/s-tui/package.nix
index e2e601a313f0..4051f108395e 100644
--- a/pkgs/by-name/s-/s-tui/package.nix
+++ b/pkgs/by-name/s-/s-tui/package.nix
@@ -11,7 +11,7 @@
python3Packages.buildPythonPackage (finalAttrs: {
pname = "s-tui";
- version = "1.3.0";
+ version = "1.4.0";
pyproject = true;
build-system = with python3Packages; [ setuptools ];
@@ -20,7 +20,7 @@ python3Packages.buildPythonPackage (finalAttrs: {
owner = "amanusk";
repo = "s-tui";
tag = "v${finalAttrs.version}";
- hash = "sha256-B5KQz+/RG+IROJah0jq+2e94DtnILwY2aH9qulWzHns=";
+ hash = "sha256-PDDT37W0x7VJ6OnkbwvPXttphD+vHDul0zmA3VY/Sao=";
};
dependencies = [
diff --git a/pkgs/by-name/sa/sandhole/package.nix b/pkgs/by-name/sa/sandhole/package.nix
index 33dda20b501c..e2f4c6381068 100644
--- a/pkgs/by-name/sa/sandhole/package.nix
+++ b/pkgs/by-name/sa/sandhole/package.nix
@@ -11,16 +11,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "sandhole";
- version = "0.10.0";
+ version = "0.10.1";
src = fetchFromGitHub {
owner = "EpicEric";
repo = "sandhole";
tag = "v${finalAttrs.version}";
- hash = "sha256-nOh9JRb1T85gEsQzd0BJqvR941QMoqeIjRFg4d8eASc=";
+ hash = "sha256-ZK8yXitfHT2al2xmYM8uk7is5zelLr3JYS7WcaUR834=";
};
- cargoHash = "sha256-EZxRKq5r5Cgp/WqcL1dY4ypf2K73YjaadqI5Tl+6Kec=";
+ cargoHash = "sha256-ujEIuUNEcHftpeHD6UX8CzoQ1tEcfL0sT3H0z81UBfc=";
nativeBuildInputs = [
cmake
diff --git a/pkgs/by-name/sa/satyrographos/package.nix b/pkgs/by-name/sa/satyrographos/package.nix
index 035477bf2682..2b58265306d5 100644
--- a/pkgs/by-name/sa/satyrographos/package.nix
+++ b/pkgs/by-name/sa/satyrographos/package.nix
@@ -40,7 +40,7 @@ ocamlPackages.buildDunePackage {
changelog = "https://github.com/na4zagin3/satyrographos/releases/tag/${src.rev}";
description = "Package manager for SATySFi";
homepage = "https://github.com/na4zagin3/satyrographos";
- maintainers = with lib.maintainers; [ momeemt ];
+ maintainers = [ ];
mainProgram = "satyrographos";
license = lib.licenses.lgpl3Plus;
};
diff --git a/pkgs/by-name/sa/satysfi/package.nix b/pkgs/by-name/sa/satysfi/package.nix
index 2e7de38ddd75..fe7d71c8b4be 100644
--- a/pkgs/by-name/sa/satysfi/package.nix
+++ b/pkgs/by-name/sa/satysfi/package.nix
@@ -95,7 +95,6 @@ ocamlPackages.buildDunePackage {
license = lib.licenses.lgpl3Only;
maintainers = with lib.maintainers; [
mt-caret
- momeemt
];
platforms = lib.platforms.all;
mainProgram = "satysfi";
diff --git a/pkgs/by-name/sb/sbb-tui/package.nix b/pkgs/by-name/sb/sbb-tui/package.nix
index e95e5b5cd23f..c4ffab9730ba 100644
--- a/pkgs/by-name/sb/sbb-tui/package.nix
+++ b/pkgs/by-name/sb/sbb-tui/package.nix
@@ -8,13 +8,13 @@
buildGoModule (finalAttrs: {
pname = "sbb-tui";
- version = "1.14.2";
+ version = "1.15.0";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "Necrom4";
repo = "sbb-tui";
tag = "v${finalAttrs.version}";
- hash = "sha256-kmT8wVkmAmVQLtSkRRIGInCjXiLfsYd9OrixYcDofS4=";
+ hash = "sha256-bYIIMFUogowywYmXNWRobmo7etbHqwOV8eHmaxz1AUg=";
};
vendorHash = "sha256-K4DOu3rfSlKAa5JNKCzWWpnWZlXXxtN5Po7p1Spqe1w=";
diff --git a/pkgs/by-name/sc/scaphandre/package.nix b/pkgs/by-name/sc/scaphandre/package.nix
deleted file mode 100644
index daa6a07e9faf..000000000000
--- a/pkgs/by-name/sc/scaphandre/package.nix
+++ /dev/null
@@ -1,79 +0,0 @@
-{
- lib,
- rustPlatform,
- fetchFromGitHub,
- pkg-config,
- openssl,
- nix-update-script,
- runCommand,
- dieHook,
- nixosTests,
- testers,
- scaphandre,
-}:
-
-rustPlatform.buildRustPackage rec {
- pname = "scaphandre";
- version = "1.0.2";
-
- src = fetchFromGitHub {
- owner = "hubblo-org";
- repo = "scaphandre";
- rev = "v${version}";
- hash = "sha256-I+cECdpLoIj4yuWXfirwHlcn0Hkm9NxPqo/EqFiBObw=";
- };
-
- cargoHash = "sha256-OIoQ2r/T0ZglF1pe25ND8xe/BEWgP9JbWytJp4k7yyg=";
-
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ openssl ];
-
- checkPhase = ''
- runHook preCheck
-
- # Work around to pass test due to non existing path
- # https://github.com/hubblo-org/scaphandre/blob/v1.0.2/src/sensors/powercap_rapl.rs#L29
- export SCAPHANDRE_POWERCAP_PATH="$(mktemp -d)/scaphandre"
-
- mkdir -p "$SCAPHANDRE_POWERCAP_PATH"
-
- runHook postCheck
- '';
-
- passthru = {
- updateScript = nix-update-script { };
- tests = {
- stdout =
- self:
- runCommand "${pname}-test"
- {
- buildInputs = [
- self
- dieHook
- ];
- }
- ''
- ${self}/bin/scaphandre stdout -t 4 > $out || die "Scaphandre failed to measure consumption"
- [ -s $out ]
- '';
- vm = nixosTests.scaphandre;
- version = testers.testVersion {
- inherit version;
- package = scaphandre;
- command = "scaphandre --version";
- };
- };
- };
-
- meta = {
- description = "Electrical power consumption metrology agent";
- homepage = "https://github.com/hubblo-org/scaphandre";
- license = lib.licenses.asl20;
- platforms = [ "x86_64-linux" ];
- maintainers = [ ];
- mainProgram = "scaphandre";
- # Upstream needs to decide what to do about a broken dependency
- # https://github.com/hubblo-org/scaphandre/issues/403
- broken = true;
- };
-}
diff --git a/pkgs/by-name/se/sendme/package.nix b/pkgs/by-name/se/sendme/package.nix
index 23def3c74b66..d263744fdfff 100644
--- a/pkgs/by-name/se/sendme/package.nix
+++ b/pkgs/by-name/se/sendme/package.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
asl20
mit
];
- maintainers = with lib.maintainers; [ cameronfyfe ];
+ maintainers = [ ];
mainProgram = "sendme";
};
})
diff --git a/pkgs/by-name/se/serve/package.nix b/pkgs/by-name/se/serve/package.nix
index 7c7cd1eb0713..361608fe2729 100644
--- a/pkgs/by-name/se/serve/package.nix
+++ b/pkgs/by-name/se/serve/package.nix
@@ -2,32 +2,30 @@
buildNpmPackage,
fetchFromGitHub,
lib,
- makeWrapper,
- nodejs,
- pnpm_9,
+ pnpm_10,
fetchPnpmDeps,
pnpmConfigHook,
}:
buildNpmPackage (finalAttrs: {
pname = "serve";
- version = "14.2.4";
+ version = "14.2.6";
src = fetchFromGitHub {
owner = "vercel";
repo = "serve";
- tag = finalAttrs.version;
- hash = "sha256-QVbau4MrpgEQkwlWx4tU9H93zdM0mSZgIzXpjHRM5mk=";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-lM04fuzgcLHz8/Jf4wJVYXveFcO6sFyJ9PQAcpweyjk=";
};
npmDeps = null;
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
- pnpm = pnpm_9;
- fetcherVersion = 3;
- hash = "sha256-N5oasGilHECndJZYdRHZFvAa4aYwmPtOTBZtcty4g/k=";
+ pnpm = pnpm_10;
+ fetcherVersion = 4;
+ hash = "sha256-9gejKf+GqB8BPAQtQSuZsTb6jFro3X1aL1noVfyKTPg=";
};
- nativeBuildInputs = [ pnpm_9 ];
+ nativeBuildInputs = [ pnpm_10 ];
npmConfigHook = pnpmConfigHook;
dontNpmBuild = true;
diff --git a/pkgs/by-name/sh/shpool/package.nix b/pkgs/by-name/sh/shpool/package.nix
index 7f7f9590d16b..f36b61dfb96f 100644
--- a/pkgs/by-name/sh/shpool/package.nix
+++ b/pkgs/by-name/sh/shpool/package.nix
@@ -10,13 +10,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "shpool";
- version = "0.9.8";
+ version = "0.10.1";
src = fetchFromGitHub {
owner = "shell-pool";
repo = "shpool";
rev = "v${finalAttrs.version}";
- hash = "sha256-iN4ZPayOUhbP3WlQIIyIN73PxH3CFgsQELWt8prtTJo=";
+ hash = "sha256-RBWB1jpqA/f6qqFUqrsbZBvtFZNwgkW93EAvKzXzFNk=";
};
postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
--replace-fail '/usr/bin/shpool' "$out/bin/shpool"
'';
- cargoHash = "sha256-bWA0UZLr/z9MWLrp0yxblFTZwSOEIheBhmx71Ftnbcg=";
+ cargoHash = "sha256-vKyk2aEat3jLlThd+iXVPOgv7xlHnX4/xpDz2b4FT3w=";
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ linux-pam ];
diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index d84055a39297..de8764171560 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -181,10 +181,6 @@ stdenv.mkDerivation (finalAttrs: {
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
SIGNAL_ENV = "production";
SOURCE_DATE_EPOCH = 1780508208;
- }
- // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
- # Disable code signing during local macOS builds.
- CSC_IDENTITY_AUTO_DISCOVERY = "false";
};
preBuild = ''
diff --git a/pkgs/by-name/si/sink-rotate/package.nix b/pkgs/by-name/si/sink-rotate/package.nix
index fd0b11e6abe1..87eb16ff706c 100644
--- a/pkgs/by-name/si/sink-rotate/package.nix
+++ b/pkgs/by-name/si/sink-rotate/package.nix
@@ -5,22 +5,20 @@
pipewire,
wireplumber,
makeWrapper,
+ nix-update-script,
}:
-let
- version = "2.3.0";
-in
rustPlatform.buildRustPackage {
pname = "sink-rotate";
- inherit version;
+ version = "2.3.0-unstable-2026-05-14";
src = fetchFromGitHub {
owner = "mightyiam";
repo = "sink-rotate";
- rev = "v${version}";
- hash = "sha256-gGmnji7KqmCxUaeXOGMnHMI6b8AJ6Np+xVjibqgGSKM=";
+ rev = "8bf24a2ebad7151fe5a7e8dd4577effccbd6fa2a";
+ hash = "sha256-ftSu04fWCgZ9Beu4pMAF8KKe3nfe0km1F6ExVWbmoxQ=";
};
- cargoHash = "sha256-7/EyDBWANoL5m9mx93LKMKD8hgcc3VgvrcLD6oTBXN8=";
+ cargoHash = "sha256-qiHrntm6p3j5784Pzh0NxeyQMasTQpgsfXq+DyDqies=";
nativeBuildInputs = [ makeWrapper ];
@@ -30,6 +28,10 @@ rustPlatform.buildRustPackage {
--prefix PATH : ${wireplumber}/bin/wpctl
'';
+ passthru.updateScript = nix-update-script {
+ extraArgs = [ "--version=branch" ];
+ };
+
meta = {
description = "Command that rotates the default PipeWire audio sink";
homepage = "https://github.com/mightyiam/sink-rotate";
diff --git a/pkgs/by-name/sm/smatch/package.nix b/pkgs/by-name/sm/smatch/package.nix
index 9ebdcc4f0005..7c8f27c0b5a3 100644
--- a/pkgs/by-name/sm/smatch/package.nix
+++ b/pkgs/by-name/sm/smatch/package.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Semantic analysis tool for C";
homepage = "https://sparse.docs.kernel.org/";
- maintainers = with lib.maintainers; [ momeemt ];
+ maintainers = [ ];
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.all;
};
diff --git a/pkgs/by-name/sn/snyk/package.nix b/pkgs/by-name/sn/snyk/package.nix
index 191095e39362..35312af8fff3 100644
--- a/pkgs/by-name/sn/snyk/package.nix
+++ b/pkgs/by-name/sn/snyk/package.nix
@@ -43,7 +43,7 @@ buildNpmPackage {
homepage = "https://snyk.io";
changelog = "https://github.com/snyk/cli/releases/tag/v${version}";
license = lib.licenses.asl20;
- maintainers = with lib.maintainers; [ momeemt ];
+ maintainers = [ ];
mainProgram = "snyk";
};
}
diff --git a/pkgs/by-name/sp/spacetimedb/package.nix b/pkgs/by-name/sp/spacetimedb/package.nix
index 8ffbd583c9ac..5657989c8681 100644
--- a/pkgs/by-name/sp/spacetimedb/package.nix
+++ b/pkgs/by-name/sp/spacetimedb/package.nix
@@ -15,16 +15,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "spacetimedb";
- version = "2.4.0";
+ version = "2.5.0-hotfix1";
src = fetchFromGitHub {
owner = "clockworklabs";
repo = "spacetimedb";
tag = "v${finalAttrs.version}";
- hash = "sha256-JEehx4UnvpuGneI049fQel+05JhNoPSFO5ZI2WBSqC4=";
+ hash = "sha256-CXc/AKzK4aTVhKgzIzkA5cdInYqOu7sMdCUyeSwixbc=";
};
- cargoHash = "sha256-aX45e9oHFM4aiRVNKYi6WJztaSRSpmLnyYI9oD7Pa+w=";
+ cargoHash = "sha256-iO1TGctPVmQxn1h+Md6p3pbEkfXNX91n5NZhIDK5BLI=";
nativeBuildInputs = [
pkg-config
diff --git a/pkgs/by-name/sp/spectral-language-server/package.nix b/pkgs/by-name/sp/spectral-language-server/package.nix
index df7410f77def..059177ba9e35 100644
--- a/pkgs/by-name/sp/spectral-language-server/package.nix
+++ b/pkgs/by-name/sp/spectral-language-server/package.nix
@@ -102,7 +102,7 @@ buildNpmPackage {
meta = {
homepage = "https://github.com/luizcorreia/spectral-language-server";
description = "Awesome Spectral JSON/YAML linter with OpenAPI/AsyncAPI support";
- maintainers = with lib.maintainers; [ momeemt ];
+ maintainers = [ ];
license = lib.licenses.mit;
mainProgram = "spectral-language-server";
};
diff --git a/pkgs/by-name/sp/speechd/package.nix b/pkgs/by-name/sp/speechd/package.nix
index c18482000427..e63b5db36d92 100644
--- a/pkgs/by-name/sp/speechd/package.nix
+++ b/pkgs/by-name/sp/speechd/package.nix
@@ -157,10 +157,7 @@ stdenv.mkDerivation (finalAttrs: {
"Common interface to speech synthesis" + lib.optionalString libsOnly " - client libraries only";
homepage = "https://devel.freebsoft.org/speechd";
license = lib.licenses.gpl2Plus;
- maintainers = with lib.maintainers; [
- berce
- jtojnar
- ];
+ maintainers = with lib.maintainers; [ jtojnar ];
# TODO: remove checks for `withPico` once PR #375450 is merged
platforms = if withAlsa || withPico then lib.platforms.linux else lib.platforms.unix;
mainProgram = "speech-dispatcher";
diff --git a/pkgs/by-name/st/statix/package.nix b/pkgs/by-name/st/statix/package.nix
index ea7986f959b6..3c6ed8dbb302 100644
--- a/pkgs/by-name/st/statix/package.nix
+++ b/pkgs/by-name/st/statix/package.nix
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "statix";
- version = "0-unstable-2026-05-14";
+ version = "0.5.8-unstable-2026-06-13";
src = fetchFromGitHub {
owner = "molybdenumsoftware";
repo = "statix";
- rev = "f0d256d60d9b9736b274a0edc0492be472318166";
- hash = "sha256-dylteN19qQ/MclInQ+x4vf+rBGNIsaKWJ+WgiS0ZBjI=";
+ rev = "127a42f761909e5caa79f616a353e9b6e1a0587f";
+ hash = "sha256-epwk3oW5A0ttTKSO2zgC50PkD9mTFjLtDlofTIeOdf8=";
};
- cargoHash = "sha256-lODAnIGw8MncMT5xicWORSbCChn2HQXENsOStJYHepQ=";
+ cargoHash = "sha256-bsy8p8zbfQ7EjXCDwFbVaq4qN8aEsp27Jcn9zfW2eXw=";
buildFeatures = lib.optional withJson "json";
diff --git a/pkgs/by-name/st/stylelint/package.nix b/pkgs/by-name/st/stylelint/package.nix
index 715d0d674b23..25505a25aac8 100644
--- a/pkgs/by-name/st/stylelint/package.nix
+++ b/pkgs/by-name/st/stylelint/package.nix
@@ -26,6 +26,6 @@ buildNpmPackage rec {
mainProgram = "stylelint";
homepage = "https://stylelint.io";
license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ momeemt ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix
index 9584cc17b9c7..77f6c9bd3525 100644
--- a/pkgs/by-name/su/super-productivity/package.nix
+++ b/pkgs/by-name/su/super-productivity/package.nix
@@ -78,7 +78,6 @@ buildNpmPackage rec {
env = {
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
CHROMEDRIVER_SKIP_DOWNLOAD = "true";
- CSC_IDENTITY_AUTO_DISCOVERY = "false";
};
nativeBuildInputs = [ copyDesktopItems ];
diff --git a/pkgs/by-name/su/superfile/package.nix b/pkgs/by-name/su/superfile/package.nix
index 48c85b702b36..2e99634fed01 100644
--- a/pkgs/by-name/su/superfile/package.nix
+++ b/pkgs/by-name/su/superfile/package.nix
@@ -51,7 +51,6 @@ buildGoModule {
changelog = "https://github.com/yorukot/superfile/blob/${tag}/changelog.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
- momeemt
redyf
];
mainProgram = "superfile";
diff --git a/pkgs/by-name/sy/syncthing/package.nix b/pkgs/by-name/sy/syncthing/package.nix
index de32f29866a9..7b963e50ca41 100644
--- a/pkgs/by-name/sy/syncthing/package.nix
+++ b/pkgs/by-name/sy/syncthing/package.nix
@@ -22,16 +22,16 @@ assert builtins.elem target [
buildGoModule (finalAttrs: {
pname = "syncthing";
- version = "2.0.15";
+ version = "2.1.0";
src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
tag = "v${finalAttrs.version}";
- hash = "sha256-v77ovjV+UoCRA1GteP+HDqC8dsRvtOhFX/IkSgSIf8Y=";
+ hash = "sha256-sTtFmZBPJIHMksaFFLmA3Abt9EhAC8Nz/ibdzg2LMd4=";
};
- vendorHash = "sha256-boYTLgvH+iWlh3y3Z0LPvSVGEget3X94AthtJKphhCw=";
+ vendorHash = "sha256-rOsdg98WVAKqjV7AxH+m4oSf8Z4FPru4NSbgGFtUMVE=";
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
# Recent versions of macOS seem to require binaries to be signed when
@@ -119,6 +119,7 @@ buildGoModule (finalAttrs: {
maintainers = with lib.maintainers; [
joko
peterhoeg
+ zainkergaye
];
mainProgram = target;
platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix
index f81a4bcf12d0..99d554ff36e0 100644
--- a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix
+++ b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix
@@ -1,23 +1,23 @@
{
- version = "1.27.0";
+ version = "1.27.1";
x86_64-linux = {
- url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.0/linux/amd64/sysdig-cli-scanner";
- hash = "sha256-quUO6HDBKMefpugUlRSmQe2yA4ACNWsPo/NPyHSCCHQ=";
+ url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.1/linux/amd64/sysdig-cli-scanner";
+ hash = "sha256-7YxZgSAhnTn0WfHvybxP16day1AHneX/zoG2Wuquq18=";
};
aarch64-linux = {
- url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.0/linux/arm64/sysdig-cli-scanner";
- hash = "sha256-niPKBLEq/YCPDsoTT00ZHaL7O+a3T+1hQ4VH1tPzyJk=";
+ url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.1/linux/arm64/sysdig-cli-scanner";
+ hash = "sha256-FNLYmrwn3+EJLVjCzPKRvNPWijQdCjF4RXuIB4Kryqs=";
};
x86_64-darwin = {
- url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.0/darwin/amd64/sysdig-cli-scanner";
- hash = "sha256-g6mA7qhBBKLDfyF3XX1pO5Abr2nnnKR2VHyUjhdS3k0=";
+ url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.1/darwin/amd64/sysdig-cli-scanner";
+ hash = "sha256-yNkA3BDd/S1Ml/bvosXvMA5zgy9mqL2rMXhotCo5cgE=";
};
aarch64-darwin = {
- url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.0/darwin/arm64/sysdig-cli-scanner";
- hash = "sha256-2wkM3C7DCTpYwR0A5eFiUNZHTYq7WHZxRPFb7jSHwyU=";
+ url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.1/darwin/arm64/sysdig-cli-scanner";
+ hash = "sha256-BsoVVd+bMpEU/5KeEGsyU9uE4RF1zxIdsnKorZO7AmA=";
};
}
diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix
index d6c919d4c068..6533308cff6b 100644
--- a/pkgs/by-name/te/teams-for-linux/package.nix
+++ b/pkgs/by-name/te/teams-for-linux/package.nix
@@ -37,11 +37,7 @@ buildNpmPackage rec {
doInstallCheck = stdenv.hostPlatform.isLinux;
- env = {
- # disable code signing on Darwin
- CSC_IDENTITY_AUTO_DISCOVERY = "false";
- ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
- };
+ env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
makeCacheWritable = true;
diff --git a/pkgs/by-name/tf/tflint/package.nix b/pkgs/by-name/tf/tflint/package.nix
index bd873fcaa6b5..a81576d77f10 100644
--- a/pkgs/by-name/tf/tflint/package.nix
+++ b/pkgs/by-name/tf/tflint/package.nix
@@ -61,6 +61,6 @@ buildGo125Module (finalAttrs: {
homepage = "https://github.com/terraform-linters/tflint";
changelog = "https://github.com/terraform-linters/tflint/blob/v${finalAttrs.version}/CHANGELOG.md";
license = lib.licenses.mpl20;
- maintainers = with lib.maintainers; [ momeemt ];
+ maintainers = [ ];
};
})
diff --git a/pkgs/by-name/ti/tig/package.nix b/pkgs/by-name/ti/tig/package.nix
index a593723f6d6f..0142d364f284 100644
--- a/pkgs/by-name/ti/tig/package.nix
+++ b/pkgs/by-name/ti/tig/package.nix
@@ -18,13 +18,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "tig";
- version = "2.6.0";
+ version = "2.6.1";
src = fetchFromGitHub {
owner = "jonas";
repo = "tig";
rev = "tig-${finalAttrs.version}";
- sha256 = "sha256-LJVK4y4C/TyM7sD/AZeHyavZ66SoeSh1y+hXnAAKMws=";
+ sha256 = "sha256-Zfmt2rpnH5sxiay1LAsXxvtvqvwEG4MbNI+p0GWJsMc=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/ti/tigerbeetle/package.nix b/pkgs/by-name/ti/tigerbeetle/package.nix
index 6b1ed449569b..1f7486ade69a 100644
--- a/pkgs/by-name/ti/tigerbeetle/package.nix
+++ b/pkgs/by-name/ti/tigerbeetle/package.nix
@@ -10,14 +10,14 @@ let
platform =
if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system;
hash = builtins.getAttr platform {
- "universal-macos" = "sha256-orry8BOlsAqq44OuKxAkKN/yyLK61qJTrUf6Ohk/psQ=";
- "x86_64-linux" = "sha256-p3KD0Z5JdH9IjtqWyCnaUZcZXiwKO6rwZB9wGdVKIz4=";
- "aarch64-linux" = "sha256-Z4kBc006b3e8MUROxQBImxRKaW9IWQ4NZdVgd9mkLkA=";
+ "universal-macos" = "sha256-rrOssnfHj947LhmCl1R2Dy2d9cssXPXDQBI/fcW0reY=";
+ "x86_64-linux" = "sha256-f/0F8IBPz6Y4poyjzcCxhF33kxhg+gsk2yEFHSAz9DY=";
+ "aarch64-linux" = "sha256-DjcQkiu4Hdyce9jriTK9otmXzQxeVImDDvHjjGevBVs=";
};
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "tigerbeetle";
- version = "0.17.5";
+ version = "0.17.6";
src = fetchzip {
url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip";
diff --git a/pkgs/by-name/tr/trilium-server/package.nix b/pkgs/by-name/tr/trilium-server/package.nix
index f769724efc76..02b27fca73c2 100644
--- a/pkgs/by-name/tr/trilium-server/package.nix
+++ b/pkgs/by-name/tr/trilium-server/package.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation {
meta = {
description = "Hierarchical note taking application with focus on building large personal knowledge bases";
- homepage = "https://github.com/TriliumNext/Notes";
+ homepage = "https://github.com/TriliumNext/Trilium";
license = lib.licenses.agpl3Plus;
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
platforms = [
diff --git a/pkgs/by-name/tt/ttdl/package.nix b/pkgs/by-name/tt/ttdl/package.nix
index a4b70b2f9ba4..b12b4a1edb80 100644
--- a/pkgs/by-name/tt/ttdl/package.nix
+++ b/pkgs/by-name/tt/ttdl/package.nix
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ttdl";
- version = "4.25.1";
+ version = "6.1.1";
src = fetchFromGitHub {
owner = "VladimirMarkelov";
repo = "ttdl";
rev = "v${finalAttrs.version}";
- sha256 = "sha256-gDR9EQN1EorqELaWUk+0sFwa6FxjmdkCLXudnFRjs+U=";
+ sha256 = "sha256-E2rhhg1RJOQDD0zAAYGfC52goLLmnWhbgfx6C7VSlAc=";
};
- cargoHash = "sha256-+G2F5HGv57JqKJF6G1I7gLOrQSma9RUXdG4CVsdplaE=";
+ cargoHash = "sha256-e+cpHAdJzH6UYG2Bv4DpsItLx+lcCFch+K/pTLxMNS4=";
meta = {
description = "CLI tool to manage todo lists in todo.txt format";
diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix
index c1a1f061bebe..41db756b4492 100644
--- a/pkgs/by-name/ty/ty/package.nix
+++ b/pkgs/by-name/ty/ty/package.nix
@@ -17,7 +17,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ty";
- version = "0.0.46";
+ version = "0.0.49";
__structuredAttrs = true;
src = fetchFromGitHub {
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
repo = "ty";
tag = finalAttrs.version;
fetchSubmodules = true;
- hash = "sha256-IZgQduqsQU8wMu0yW3SYypEzAJ0gmDObTJ75xG88xbA=";
+ hash = "sha256-IKeoskueujGYFjhUd3V7iwKwZjFZqG3OYfe36S6J2aw=";
};
# For Darwin platforms, remove the integration test for file notifications,
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoBuildFlags = [ "--package=ty" ];
- cargoHash = "sha256-rSvaYddm5n1qtPRHfY6du0aA1t2TsIqzTPnHQ9NHMP8=";
+ cargoHash = "sha256-y1sKf+KXya/K+WUiIE357U6DXh/d+AQgj0SQIi1gpUw=";
nativeBuildInputs = [ installShellFiles ];
buildInputs = [ rust-jemalloc-sys ];
diff --git a/pkgs/by-name/un/unigine-superposition/package.nix b/pkgs/by-name/un/unigine-superposition/package.nix
index 1d07d10fbd26..3744963f12aa 100644
--- a/pkgs/by-name/un/unigine-superposition/package.nix
+++ b/pkgs/by-name/un/unigine-superposition/package.nix
@@ -14,7 +14,7 @@
libglvnd,
libxext,
libxrandr,
- mailspring,
+ openssl,
libx11,
libice,
libxrender,
@@ -59,16 +59,17 @@ let
libglvnd
libxext
libxrandr
- mailspring
libx11
libice
libxrender
+ openssl
];
installPhase = ''
bash $src --target $name --noexec
mkdir -p $out/bin $out/lib/unigine/superposition/
cp -r $name/* $out/lib/unigine/superposition/
+ ln -s ${lib.getLib openssl}/lib/libcrypto.so $out/lib/libcrypto.so.1.0.0
echo "exec $out/lib/unigine/superposition/Superposition" >> $out/bin/superposition
chmod +x $out/bin/superposition
wrapProgram $out/lib/unigine/superposition/Superposition \
@@ -116,11 +117,11 @@ buildFHSEnv {
libglvnd
libxext
libxrandr
- mailspring
libx11
libice
libxrender
openal
+ openssl
];
runScript = "superposition";
diff --git a/pkgs/by-name/un/unityhub/package.nix b/pkgs/by-name/un/unityhub/package.nix
index 6f4b55e58262..d183faafb7a6 100644
--- a/pkgs/by-name/un/unityhub/package.nix
+++ b/pkgs/by-name/un/unityhub/package.nix
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "unityhub";
- version = "3.18.0";
+ version = "3.18.2";
src = fetchurl {
url = "https://hub-dist.unity3d.com/artifactory/hub-debian-prod-local/pool/main/u/unity/unityhub_amd64/UnityHubSetup-${version}-amd64.deb";
- hash = "sha256-JDkmF8ANvW0j5L+92prUcVFqDbUGXkxxUZPjtOqwDlk=";
+ hash = "sha256-4sluuD2g70X98N6Pk9lpC//IFpePpHZf/mowDbh0S8g=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/uu/uutils-findutils/package.nix b/pkgs/by-name/uu/uutils-findutils/package.nix
index 1292ced9cc60..7c00a3ed9748 100644
--- a/pkgs/by-name/uu/uutils-findutils/package.nix
+++ b/pkgs/by-name/uu/uutils-findutils/package.nix
@@ -1,7 +1,6 @@
{
lib,
fetchFromGitHub,
- fetchpatch2,
rustPlatform,
nix-update-script,
versionCheckHook,
@@ -9,23 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "uutils-findutils";
- version = "0.8.0";
+ version = "0.9.0";
src = fetchFromGitHub {
owner = "uutils";
repo = "findutils";
tag = finalAttrs.version;
- hash = "sha256-i+ryTF2hlZFbyFft/769c800FkzL26E4snUsxU79sKY=";
+ hash = "sha256-ILMInyjOMYlgPxrOjvLoBfkcaZ4aj6GeA/jiGPpNjiI=";
};
- cargoPatches = [
- (fetchpatch2 {
- url = "https://github.com/uutils/findutils/commit/90845d95ceb12289a1b5ee50704ed66f2f7349c3.patch";
- hash = "sha256-sCqOzfa3R45tXTK3N4344qb8YRmiW0o/lZwqHoBvgl8=";
- })
- ];
-
- cargoHash = "sha256-TQRt1eecT500JaJB2P10T1yV+z2/T8cgTNtF9r5zQpg=";
+ cargoHash = "sha256-/rQTcyRXtluPKPuuZKn/qD/3U0PQLIqyq777/ww3q/0=";
postInstall = ''
rm $out/bin/testing-commandline
diff --git a/pkgs/by-name/vg/vgmplay-libvgm/package.nix b/pkgs/by-name/vg/vgmplay-libvgm/package.nix
index af26a0038758..9401b106c985 100644
--- a/pkgs/by-name/vg/vgmplay-libvgm/package.nix
+++ b/pkgs/by-name/vg/vgmplay-libvgm/package.nix
@@ -12,15 +12,23 @@
stdenv.mkDerivation {
pname = "vgmplay-libvgm";
- version = "0.52.0-unstable-2026-01-31";
+ version = "0.52.0-unstable-2026-06-07";
src = fetchFromGitHub {
owner = "ValleyBell";
repo = "vgmplay-libvgm";
- rev = "2a8f3909bcfca4c595ca71c0f762ff495a29e130";
- hash = "sha256-TJUhE4te/nZOsckgMksWcqawsWR8r3OInJoVrv+NVAQ=";
+ rev = "01f8136fd5602a0041504d8e2ea15d46fc71b4ba";
+ hash = "sha256-1fQgRgJC8wxON3ir8ru5wxVkcIIjMSMftYksHbRxln8=";
};
+ # We don't want text files in bindir
+ postPatch = ''
+ substituteInPlace CMakeLists.txt \
+ --replace-fail \
+ 'install(FILES "''${SRC}" RENAME "''${DST}" DESTINATION "''${CMAKE_INSTALL_BINDIR}")' \
+ 'install(FILES "''${SRC}" RENAME "''${DST}" DESTINATION "''${CMAKE_INSTALL_DATADIR}/vgmplay")'
+ '';
+
nativeBuildInputs = [
cmake
pkg-config
@@ -32,14 +40,6 @@ stdenv.mkDerivation {
inih
];
- # https://github.com/ValleyBell/vgmplay-libvgm/issues/9
- # Leftover that's still in use, missing documentation & integration into CMake script rn
- env.NIX_CFLAGS_COMPILE = "-DSHARE_PREFIX=\"${placeholder "out"}\"";
-
- postInstall = ''
- install -Dm644 ../VGMPlay.ini $out/share/vgmplay/VGMPlay.ini
- '';
-
passthru.updateScript = unstableGitUpdater {
url = "https://github.com/ValleyBell/vgmplay-libvgm.git";
};
diff --git a/pkgs/by-name/vi/vips/package.nix b/pkgs/by-name/vi/vips/package.nix
index 6a2516a3e2d3..b8416afee457 100644
--- a/pkgs/by-name/vi/vips/package.nix
+++ b/pkgs/by-name/vi/vips/package.nix
@@ -58,7 +58,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "vips";
- version = "8.18.2";
+ version = "8.18.3";
outputs = [
"bin"
@@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "libvips";
repo = "libvips";
tag = "v${finalAttrs.version}";
- hash = "sha256-w42igzcvnCBoGHAvyb27Z6IciSuGeHctgSsZY30TtWo=";
+ hash = "sha256-P8qjbCcpWNgKthZrXd+GykfPoU2x6avMNoYX1I+YE+k=";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
postFetch = ''
diff --git a/pkgs/by-name/vo/voicevox/package.nix b/pkgs/by-name/vo/voicevox/package.nix
index e40181d50996..49346e310642 100644
--- a/pkgs/by-name/vo/voicevox/package.nix
+++ b/pkgs/by-name/vo/voicevox/package.nix
@@ -86,9 +86,6 @@ stdenv.mkDerivation (finalAttrs: {
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
- # disable code signing on Darwin
- env.CSC_IDENTITY_AUTO_DISCOVERY = "false";
-
buildPhase = ''
runHook preBuild
@@ -106,7 +103,9 @@ stdenv.mkDerivation (finalAttrs: {
--dir \
--config ./build/electronBuilderConfigLoader.cjs \
-c.electronDist=electron-dist \
- -c.electronVersion=${electron.version}
+ -c.electronVersion=${electron.version} \
+ -c.mac.identity=null
+ # ^ disable codesigning on Darwin
runHook postBuild
'';
diff --git a/pkgs/by-name/vo/vokoscreen-ng/package.nix b/pkgs/by-name/vo/vokoscreen-ng/package.nix
index 6bb7e40a4b83..2003ca1cb20f 100644
--- a/pkgs/by-name/vo/vokoscreen-ng/package.nix
+++ b/pkgs/by-name/vo/vokoscreen-ng/package.nix
@@ -13,13 +13,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "vokoscreen-ng";
- version = "4.8.3";
+ version = "4.9.0";
src = fetchFromGitHub {
owner = "vkohaupt";
repo = "vokoscreenNG";
tag = finalAttrs.version;
- hash = "sha256-D2E4G6rq6kFZbwjYhoccl/aROCdpuS8UJu0JKGc8wKU=";
+ hash = "sha256-ncN5ZKPd//yE+HKBzVud1Xw+2qHmw2bRNWHdMpVcGlw=";
};
qmakeFlags = [ "src/vokoscreenNG.pro" ];
diff --git a/pkgs/by-name/vt/vt323/package.nix b/pkgs/by-name/vt/vt323/package.nix
index 5f7fb67da98a..cb6c5710ddf2 100644
--- a/pkgs/by-name/vt/vt323/package.nix
+++ b/pkgs/by-name/vt/vt323/package.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
+ installFonts,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -15,9 +16,10 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-Abq0/hU/BXJMxQxzhZG1SEGIZYt+qofuXwy5/A9byQ8=";
};
- installPhase = ''
- mkdir -p $out/share/fonts/truetype
- cp fonts/ttf/VT323-Regular.ttf $out/share/fonts/truetype
+ nativeBuildInputs = [ installFonts ];
+
+ preInstall = ''
+ rm -r old
'';
meta = {
diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json
index ccc8f6fc3ee8..73b6228935a7 100644
--- a/pkgs/by-name/wa/warp-terminal/versions.json
+++ b/pkgs/by-name/wa/warp-terminal/versions.json
@@ -1,14 +1,14 @@
{
"darwin": {
- "hash": "sha256-vJE22Nn9GXfNZcdvwH74X28nhLrxESoAX8XtxzDSBmI=",
- "version": "0.2026.06.03.09.49.stable_01"
+ "hash": "sha256-t+okGBJP+1/DTpQSGJLeTJp4aIE8dgfgWXZoAheD4j8=",
+ "version": "0.2026.06.10.09.27.stable_01"
},
"linux_x86_64": {
- "hash": "sha256-dVBJ9L+e8B4WlVuMPWb0nDRdDkx8+eydbiAiJUm/OQg=",
- "version": "0.2026.06.03.09.49.stable_01"
+ "hash": "sha256-cL/usCvilNG4Hk8y0cy6Eg73s8FWhoFi5AtYQFa+Vl8=",
+ "version": "0.2026.06.10.09.27.stable_01"
},
"linux_aarch64": {
- "hash": "sha256-llYMjRqZAlpbhzQTjndW7cgcEnGvdtcaP8bPmrP8HVo=",
- "version": "0.2026.06.03.09.49.stable_01"
+ "hash": "sha256-YaiHMipeocIungev4SiitmobTr3NzFBv5kiY0rY2MNQ=",
+ "version": "0.2026.06.10.09.27.stable_01"
}
}
diff --git a/pkgs/by-name/xa/xandikos/package.nix b/pkgs/by-name/xa/xandikos/package.nix
index d04f54d121cc..d323f80d70a7 100644
--- a/pkgs/by-name/xa/xandikos/package.nix
+++ b/pkgs/by-name/xa/xandikos/package.nix
@@ -7,14 +7,14 @@
python3Packages.buildPythonApplication rec {
pname = "xandikos";
- version = "0.4.0";
+ version = "0.4.2";
pyproject = true;
src = fetchFromGitHub {
owner = "jelmer";
repo = "xandikos";
tag = "v${version}";
- hash = "sha256-lVxbqgxBhHJHxG3QozX9xvCZAOPSa85ATSE88i3zayA=";
+ hash = "sha256-nK+od6mJRj6I6qFhQmwwf6x+0kfC07VRVNKY6fkbNjc=";
};
build-system = with python3Packages; [
diff --git a/pkgs/by-name/xf/xfr/package.nix b/pkgs/by-name/xf/xfr/package.nix
index 05a371c6fcd8..f97c448f967c 100644
--- a/pkgs/by-name/xf/xfr/package.nix
+++ b/pkgs/by-name/xf/xfr/package.nix
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "xfr";
- version = "0.9.14";
+ version = "0.9.19";
src = fetchFromGitHub {
owner = "lance0";
repo = "xfr";
tag = "v${finalAttrs.version}";
- hash = "sha256-6+kjpa6zgCXjXK1s3VrOksXFyLAbnqkNOhD50r5zyMA=";
+ hash = "sha256-O6jfK3oHzimmOsUPX7eeZmm1dPNIl98RxLrg+yiEJlo=";
};
- cargoHash = "sha256-U/XOlUo/zHsZCPW6lG87BKaM7xSQgineO2rH+JBx6x4=";
+ cargoHash = "sha256-c6TYOGJN7HAzi+vibK30foBtDQN3EnBFt4YrvAnApoY=";
nativeBuildInputs = [
installShellFiles
diff --git a/pkgs/by-name/xq/xq/0000-update-onig.patch b/pkgs/by-name/xq/xq/0000-update-onig.patch
deleted file mode 100644
index 0ebebc76e1e6..000000000000
--- a/pkgs/by-name/xq/xq/0000-update-onig.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 65e50c9..2fae299 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1,6 +1,6 @@
- # This file is automatically @generated by Cargo.
- # It is not intended for manual editing.
--version = 3
-+version = 4
-
- [[package]]
- name = "aho-corasick"
-@@ -880,11 +880,11 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
-
- [[package]]
- name = "onig"
--version = "6.4.0"
-+version = "6.5.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f"
-+checksum = "336b9c63443aceef14bea841b899035ae3abe89b7c486aaf4c5bd8aafedac3f0"
- dependencies = [
-- "bitflags 1.3.2",
-+ "bitflags 2.6.0",
- "libc",
- "once_cell",
- "onig_sys",
-@@ -892,9 +892,9 @@ dependencies = [
-
- [[package]]
- name = "onig_sys"
--version = "69.8.1"
-+version = "69.9.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7"
-+checksum = "c7f86c6eef3d6df15f23bcfb6af487cbd2fed4e5581d58d5bf1f5f8b7f6727dc"
- dependencies = [
- "cc",
- "pkg-config",
diff --git a/pkgs/by-name/xq/xq/package.nix b/pkgs/by-name/xq/xq/package.nix
index 891f566119b9..ca5b771d6e9c 100644
--- a/pkgs/by-name/xq/xq/package.nix
+++ b/pkgs/by-name/xq/xq/package.nix
@@ -6,17 +6,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "xq";
- version = "0.4.1";
+ version = "0.5.0";
src = fetchCrate {
inherit (finalAttrs) pname version;
- hash = "sha256-Qe+crretlKJRoNPO2+aHxCmMO9MecqGjOuvdhr4a0NU=";
+ hash = "sha256-kgOwTQ+t5dhhb+MrilBZ5E7Ge3U6dllUpJ2I1fCX+jc=";
};
- cargoPatches = [
- ./0000-update-onig.patch
- ];
- cargoHash = "sha256-ACWbgGkKIn/+wPHx0dP+B0r2KDuKI4hunPwQavl6Xdo=";
+ cargoHash = "sha256-xQ650Yx+lk+UKIHrad48eWUB/TUHeutL6tSrYwV0Eeg=";
meta = {
description = "Pure rust implementation of jq";
diff --git a/pkgs/by-name/ya/yafc-ce/deps.json b/pkgs/by-name/ya/yafc-ce/deps.json
index b408392da3a5..8df2e60b7d7a 100644
--- a/pkgs/by-name/ya/yafc-ce/deps.json
+++ b/pkgs/by-name/ya/yafc-ce/deps.json
@@ -1,83 +1,78 @@
[
{
"pname": "Google.OrTools",
- "version": "9.11.4210",
- "hash": "sha256-5mXPEJiry7s5JKfy+o+8Crq7KZIOJnKu4BjXFYEf2nw="
+ "version": "9.15.6755",
+ "hash": "sha256-aQ6e39XNUxeH2nLrpCg+Z0+JO2bPyiLwqL/JuDqa14w="
},
{
"pname": "Google.OrTools.runtime.linux-arm64",
- "version": "9.11.4210",
- "hash": "sha256-Odd81OYE7nkpMCoeONzIP3KHYxYdXdvFcyh7qlhCXYg="
+ "version": "9.15.6755",
+ "hash": "sha256-Mri/1BAhSow+gQO9TsZVLXPcb4rIMtpPvAax7Q9q6Fw="
},
{
"pname": "Google.OrTools.runtime.linux-x64",
- "version": "9.11.4210",
- "hash": "sha256-1Eq9oKZFU/NqRlEHleVBELiCAKaRlYLxRybYy4s+4RQ="
+ "version": "9.15.6755",
+ "hash": "sha256-4ig999cIuDAqBg7q9CGK1+LI97zF943anpU5ENZhz54="
},
{
"pname": "Google.OrTools.runtime.osx-arm64",
- "version": "9.11.4210",
- "hash": "sha256-JoCCnE+ju8/b3Y82yCI3o8ZoEWV7DBns9/6ZJtpnEHY="
+ "version": "9.15.6755",
+ "hash": "sha256-BJC3fg1DRXQbcaf4uh8klCR0okbKMvQ12acGbGNGkC8="
},
{
"pname": "Google.OrTools.runtime.osx-x64",
- "version": "9.11.4210",
- "hash": "sha256-yobJIJTTu716ciGgtESLtGjqsteWqE4LtbmAloCBfb4="
+ "version": "9.15.6755",
+ "hash": "sha256-5X4AUkD13l0y1TphzJNQqQcFhETxYikWJIo4iGNK2D4="
},
{
"pname": "Google.OrTools.runtime.win-x64",
- "version": "9.11.4210",
- "hash": "sha256-v7InhZCf9jktUsXSvVwsc7REv4kPAfCvH8m3RiBBULs="
+ "version": "9.15.6755",
+ "hash": "sha256-8rTRvvKgL6HGFeS7peXNVnq9F0qOYR1Qtpqiw+GXm4E="
},
{
"pname": "Google.Protobuf",
- "version": "3.26.1",
- "hash": "sha256-1tHxDuJwwvJWZ3H9ooPFAKuaJIthSdTDlmjHlxH/euc="
+ "version": "3.33.1",
+ "hash": "sha256-GKjiqDgV21LbVguaEJ//SSNuDI7zu7n0otEbYoJZUx8="
},
{
"pname": "Microsoft.CodeAnalysis.Analyzers",
- "version": "3.11.0",
- "hash": "sha256-hQ2l6E6PO4m7i+ZsfFlEx+93UsLPo4IY3wDkNG11/Sw="
+ "version": "5.3.0-2.25625.1",
+ "hash": "sha256-W2CaLe+fpnD2/2VL6jPW/Ct17qOt4lGZKK2X8HU7MLI="
},
{
"pname": "Microsoft.CodeAnalysis.Common",
- "version": "4.14.0",
- "hash": "sha256-ne/zxH3GqoGB4OemnE8oJElG5mai+/67ASaKqwmL2BE="
+ "version": "5.3.0",
+ "hash": "sha256-O5RVbqAWXL2FcCNtn+dPAVJ/5aiaxc8nQWojJSsx61w="
},
{
"pname": "Microsoft.CodeAnalysis.CSharp",
- "version": "4.14.0",
- "hash": "sha256-5Mzj3XkYYLkwDWh17r1NEXSbXwwWYQPiOmkSMlgo1JY="
+ "version": "5.3.0",
+ "hash": "sha256-A3jxlZEyfgEn9unhoQqbOsA0wd/mA8aak6dRlu5mHIU="
},
{
"pname": "Microsoft.CodeCoverage",
- "version": "17.11.1",
- "hash": "sha256-1dLlK3NGh88PuFYZiYpT+izA96etxhU3BSgixDgdtGA="
+ "version": "18.5.1",
+ "hash": "sha256-OnahMnRBbdlGSz+igNB0GaMS7PAppefPL1fWN1+cs0w="
},
{
"pname": "Microsoft.NET.Test.Sdk",
- "version": "17.11.1",
- "hash": "sha256-0JUEucQ2lzaPgkrjm/NFLBTbqU1dfhvhN3Tl3moE6mI="
+ "version": "18.5.1",
+ "hash": "sha256-X69wQBKd5GvXfO7BaPWFcyrwfi/kZFVdH/axorIra5Y="
},
{
"pname": "Microsoft.TestPlatform.ObjectModel",
- "version": "17.11.1",
- "hash": "sha256-5vX+vCzFY3S7xfMVIv8OlMMFtdedW9UIJzc0WEc+vm4="
+ "version": "18.5.1",
+ "hash": "sha256-CUuOoANj4lXhQAE1/265X6S+afmNxhpsICEIDqNzSXk="
},
{
"pname": "Microsoft.TestPlatform.TestHost",
- "version": "17.11.1",
- "hash": "sha256-wSkY0H1fQAq0H3LcKT4u7Y5RzhAAPa6yueVN84g8HxU="
+ "version": "18.5.1",
+ "hash": "sha256-jtb74D0mqq7hu/nlCtV7IU2dXhviLrmGPER0ttdH2Dg="
},
{
"pname": "Newtonsoft.Json",
- "version": "13.0.1",
- "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="
- },
- {
- "pname": "Newtonsoft.Json",
- "version": "13.0.3",
- "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="
+ "version": "13.0.4",
+ "hash": "sha256-8JCB1FdAW681qXP6DFDWvycu1oPyVoxaYgpJ2pUvZSk="
},
{
"pname": "SDL2-CS.NetCore",
@@ -91,8 +86,8 @@
},
{
"pname": "Serilog",
- "version": "4.1.0",
- "hash": "sha256-r89nJ5JE5uZlsRrfB8QJQ1byVVfCWQbySKQ/m9PYj0k="
+ "version": "4.2.0",
+ "hash": "sha256-7f3EpCsEbDxXgsuhE430KVI14p7oDUuCtwRpOCqtnbs="
},
{
"pname": "Serilog.Enrichers.Thread",
@@ -101,13 +96,18 @@
},
{
"pname": "Serilog.Sinks.Console",
- "version": "6.0.0",
- "hash": "sha256-QH8ykDkLssJ99Fgl+ZBFBr+RQRl0wRTkeccQuuGLyro="
+ "version": "6.1.1",
+ "hash": "sha256-CfIg4Us4kSMQAn6rU2rsAeE22g6MpFiZdhoZWySpZeY="
},
{
"pname": "Serilog.Sinks.File",
- "version": "6.0.0",
- "hash": "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow="
+ "version": "7.0.0",
+ "hash": "sha256-LxZYUoUPkCjIIVarJilnXnqQiMrFNJtoRilmzTNtUjo="
+ },
+ {
+ "pname": "SharpCompress",
+ "version": "0.49.1",
+ "hash": "sha256-o2IpO605TKJ2mJLKnxWBHtCFnFJPnRj6zMQJBCGgNGw="
},
{
"pname": "System.Collections.Immutable",
@@ -115,9 +115,9 @@
"hash": "sha256-+6q5VMeoc5bm4WFsoV6nBXA9dV5pa/O4yW+gOdi8yac="
},
{
- "pname": "System.Reflection.Metadata",
- "version": "1.6.0",
- "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="
+ "pname": "System.IO.Hashing",
+ "version": "10.0.8",
+ "hash": "sha256-nsDMvCvAeKCyp566iEyp3JOWfQnTPgDU3dIFMg0iUL0="
},
{
"pname": "System.Reflection.Metadata",
@@ -126,8 +126,8 @@
},
{
"pname": "xunit",
- "version": "2.9.2",
- "hash": "sha256-h5+yTTfCmokCPy4lqdEw8RGzQlrlsQAW3Am0Jh0q7oo="
+ "version": "2.9.3",
+ "hash": "sha256-BPrpSbjlIB7PoH+ocCusqMDrMZgRQZSzeTeJzHK/I9c="
},
{
"pname": "xunit.abstractions",
@@ -136,32 +136,32 @@
},
{
"pname": "xunit.analyzers",
- "version": "1.16.0",
- "hash": "sha256-P5Bvl9hvHvF8KY1YWLg4tKiYxlfRnmHyL14jfSACDaU="
+ "version": "1.18.0",
+ "hash": "sha256-DOgamLnfi9Ua5IDm3JVm9MaOFbSSbmq5l8j2NPO3qd0="
},
{
"pname": "xunit.assert",
- "version": "2.9.2",
- "hash": "sha256-EE6r526Q4cHn0Ourf1ENpXZ37Lj/P2uNvonHgpdcnq4="
+ "version": "2.9.3",
+ "hash": "sha256-vHYOde8bd10pOmr7iTAYNtPlqHzsJl4x3t1DDuYdDCA="
},
{
"pname": "xunit.core",
- "version": "2.9.2",
- "hash": "sha256-zhjV1I5xh0RFckgTEK72tIkLxVl4CPmter2UB++oye8="
+ "version": "2.9.3",
+ "hash": "sha256-qkVQ8Jw/LZWmxirkPOwiry7bvZn3IuaRzu/sp2H8anw="
},
{
"pname": "xunit.extensibility.core",
- "version": "2.9.2",
- "hash": "sha256-MQAC/4d67Nssu3R+pHPh6vHitBXQYxEEZkVVMGW720c="
+ "version": "2.9.3",
+ "hash": "sha256-mcpVX+m0R7F0ev9CaBnbai9gtu4GVcqijEuRqe89D0g="
},
{
"pname": "xunit.extensibility.execution",
- "version": "2.9.2",
- "hash": "sha256-f+9UfoPyK3JIDhQSW0Yu9c4PGqUqZC96DMINCYi2i80="
+ "version": "2.9.3",
+ "hash": "sha256-2rxMs2Dt4cAcmOFMwP5Yd3RpP0BnmiL8cXlKysXY0jw="
},
{
"pname": "xunit.runner.visualstudio",
- "version": "2.8.2",
- "hash": "sha256-UlfK348r8kJuraywfdCtpJJxHkv04wPNzpUaz4UM/60="
+ "version": "3.1.5",
+ "hash": "sha256-O5657884QGldszsEWQFCDRTXViFBmZ4GGC+4iU+usSQ="
}
]
diff --git a/pkgs/by-name/ya/yafc-ce/package.nix b/pkgs/by-name/ya/yafc-ce/package.nix
index 222b29dd3b1b..27363b0a98cb 100644
--- a/pkgs/by-name/ya/yafc-ce/package.nix
+++ b/pkgs/by-name/ya/yafc-ce/package.nix
@@ -12,13 +12,13 @@ let
in
buildDotnetModule (finalAttrs: {
pname = "yafc-ce";
- version = "2.18.1";
+ version = "2.19.0";
src = fetchFromGitHub {
owner = "Yafc-CE";
repo = "yafc-ce";
tag = "v${finalAttrs.version}";
- hash = "sha256-MdaYAustOMFO2rim0o2FnEhFWINa9E1jEvIQS9SnEHY=";
+ hash = "sha256-O4ldYVfOgq+0lZ7xWtBATzx/xlmz3tydC+YX/fvVgY4=";
};
projectFile = [
diff --git a/pkgs/by-name/ya/yazi/plugins/allmytoes/default.nix b/pkgs/by-name/ya/yazi/plugins/allmytoes/default.nix
new file mode 100644
index 000000000000..94d83a97f6d6
--- /dev/null
+++ b/pkgs/by-name/ya/yazi/plugins/allmytoes/default.nix
@@ -0,0 +1,23 @@
+{
+ lib,
+ fetchFromGitHub,
+ mkYaziPlugin,
+}:
+mkYaziPlugin {
+ pname = "allmytoes.yazi";
+ version = "0-unstable-2025-11-22";
+
+ src = fetchFromGitHub {
+ owner = "Sonico98";
+ repo = "allmytoes.yazi";
+ rev = "acdc53be76434a82218eed8e1fda5512971bf3cc";
+ hash = "sha256-zZ9L0FrcxFvSuDJwi6VHQXDT7b/sM4DhZ3LPi/i9tig=";
+ };
+
+ meta = {
+ description = "Generate freedesktop-compatible thumbnails while using yazi";
+ homepage = "https://github.com/Sonico98/allmytoes.yazi";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ luminarleaf ];
+ };
+}
diff --git a/pkgs/by-name/ya/yazi/plugins/omni-trash/default.nix b/pkgs/by-name/ya/yazi/plugins/omni-trash/default.nix
new file mode 100644
index 000000000000..8857307ff8bd
--- /dev/null
+++ b/pkgs/by-name/ya/yazi/plugins/omni-trash/default.nix
@@ -0,0 +1,23 @@
+{
+ lib,
+ fetchFromGitHub,
+ mkYaziPlugin,
+}:
+mkYaziPlugin {
+ pname = "omni-trash.yazi";
+ version = "0-unstable-2026-06-10";
+
+ src = fetchFromGitHub {
+ owner = "goon";
+ repo = "omni-trash.yazi";
+ rev = "3c2a9923673e0552a093afc4122473df1d427a93";
+ hash = "sha256-heqqEWzJCoNt3CIJAEaWfqUX4J9BfVEw3OsU7Xjc17M=";
+ };
+
+ meta = {
+ description = "Yazi plugin to manage your trash across all drives from a single, unified interface, powered by trash-cli";
+ homepage = "https://github.com/goon/omni-trash.yazi";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ anninzy ];
+ };
+}
diff --git a/pkgs/by-name/yq/yq-go/package.nix b/pkgs/by-name/yq/yq-go/package.nix
index 2d79bfe85617..358a57af01d3 100644
--- a/pkgs/by-name/yq/yq-go/package.nix
+++ b/pkgs/by-name/yq/yq-go/package.nix
@@ -11,16 +11,16 @@
buildGoModule (finalAttrs: {
pname = "yq-go";
- version = "4.53.2";
+ version = "4.53.3";
src = fetchFromGitHub {
owner = "mikefarah";
repo = "yq";
tag = "v${finalAttrs.version}";
- hash = "sha256-So0yUblAxLgbw1/BrOp6zj9wGMTtsspjk2UQaBIBIYE=";
+ hash = "sha256-e4/Tu40Fe2DKzP7+ZLqkWty+VJ5eWGyKAwH0U07gQeg=";
};
- vendorHash = "sha256-t+u3rJNbe8JcfWBb+jMaZuTcSWYmhMiCeKbI2noVaCo=";
+ vendorHash = "sha256-B+FGknoNYfWXT8nx0teSCdT9i18VJMv8L1dv1w8gcF8=";
nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
installShellFiles
diff --git a/pkgs/by-name/za/zapzap/package.nix b/pkgs/by-name/za/zapzap/package.nix
index e58289fcc58e..f151e271f559 100644
--- a/pkgs/by-name/za/zapzap/package.nix
+++ b/pkgs/by-name/za/zapzap/package.nix
@@ -7,14 +7,14 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "zapzap";
- version = "6.5.0.0.1";
+ version = "6.5.1";
pyproject = true;
src = fetchFromGitHub {
owner = "rafatosta";
repo = "zapzap";
tag = finalAttrs.version;
- hash = "sha256-rUIM7Mn4ctBr3kfwHHnr1a7tuPc5aKEJCnwfHe92thA=";
+ hash = "sha256-elSMrH62oKZ2F6W9gkormdUi60u0r7Yy3AYOm47vGcE=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/za/zashboard/package.nix b/pkgs/by-name/za/zashboard/package.nix
index f138d9da8f52..d9fb336a683b 100644
--- a/pkgs/by-name/za/zashboard/package.nix
+++ b/pkgs/by-name/za/zashboard/package.nix
@@ -12,13 +12,13 @@ let
in
buildNpmPackage (finalAttrs: {
pname = "zashboard";
- version = "3.7.1";
+ version = "3.9.0";
src = fetchFromGitHub {
owner = "Zephyruso";
repo = "zashboard";
tag = "v${finalAttrs.version}";
- hash = "sha256-XMhMYYYxdseHIAC1iJVgd5N0A0cb9zDR/nEugLpmalk=";
+ hash = "sha256-QUu1HNGjxcT/oNO6XEiUpQ6TfMwLv9MQIsAtff+hYsY=";
};
npmDeps = null;
diff --git a/pkgs/by-name/ze/zensical/package.nix b/pkgs/by-name/ze/zensical/package.nix
index 7bf903354831..885e498be641 100644
--- a/pkgs/by-name/ze/zensical/package.nix
+++ b/pkgs/by-name/ze/zensical/package.nix
@@ -8,7 +8,7 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "zensical";
- version = "0.0.43";
+ version = "0.0.45";
pyproject = true;
# We fetch from PyPi, because GitHub repo does not contain all sources.
@@ -16,12 +16,12 @@ python3Packages.buildPythonApplication (finalAttrs: {
# We could combine sources, but then nix-update won't work.
src = fetchPypi {
inherit (finalAttrs) pname version;
- hash = "sha256-3C04BP9WJ5XBAkEw4MPOeXNkZ5MHKd2jFPCW0ONbmMg=";
+ hash = "sha256-MVvOSrBHAzjdNYit04+zJfhAhWw3VyLmgCvVigZEYmY=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
- hash = "sha256-clm+y56i2RN0FxicGpZ/JWdGxjkSo6xFf0sGE6LdSaQ=";
+ hash = "sha256-f2CNYnHLZrffyMw/lZq/cVb5sB1+CfZzlAtQUMvlwqE=";
};
nativeBuildInputs = with rustPlatform; [
diff --git a/pkgs/by-name/zi/zilla-slab/package.nix b/pkgs/by-name/zi/zilla-slab/package.nix
index e53c46b601f2..6bfb4807a8ee 100644
--- a/pkgs/by-name/zi/zilla-slab/package.nix
+++ b/pkgs/by-name/zi/zilla-slab/package.nix
@@ -2,26 +2,25 @@
lib,
stdenvNoCC,
fetchzip,
+ installFonts,
}:
stdenvNoCC.mkDerivation rec {
pname = "zilla-slab";
version = "1.002";
+ outputs = [
+ "out"
+ "webfont"
+ ];
+
src = fetchzip {
url = "https://github.com/mozilla/zilla-slab/releases/download/v${version}/Zilla-Slab-Fonts-v${version}.zip";
stripRoot = false;
hash = "sha256-yOHu+dSWlyI7w1N1teED9R1Fphso2bKAlYDC1KdqBCc=";
};
- installPhase = ''
- runHook preInstall
-
- mkdir -p $out/share/fonts/truetype
- cp -v zilla-slab/ttf/*.ttf $out/share/fonts/truetype/
-
- runHook postInstall
- '';
+ nativeBuildInputs = [ installFonts ];
meta = {
homepage = "https://github.com/mozilla/zilla-slab";
diff --git a/pkgs/by-name/zo/zotero/avoid-git.patch b/pkgs/by-name/zo/zotero/avoid-git.patch
index f0c6b4ffdeaf..dda5290a3ab2 100644
--- a/pkgs/by-name/zo/zotero/avoid-git.patch
+++ b/pkgs/by-name/zo/zotero/avoid-git.patch
@@ -1,16 +1,3 @@
-diff --git a/app/scripts/dir_build b/app/scripts/dir_build
-index 493288ad47..ccabb3722b 100755
---- a/app/scripts/dir_build
-+++ b/app/scripts/dir_build
-@@ -86,7 +86,7 @@ fi
-
- CHANNEL="source"
-
--hash=$(git -C "$ROOT_DIR" rev-parse --short HEAD)
-+hash="0000000000000000000000000000000000000000"
-
- build_dir=$(mktemp -d)
- cleanup() { rm -rf "$build_dir"; }
diff --git a/js-build/note-editor.js b/js-build/note-editor.js
index 1435730342..6eebb10c50 100644
--- a/js-build/note-editor.js
diff --git a/pkgs/by-name/zo/zotero/fix-x86_64-darwin.patch b/pkgs/by-name/zo/zotero/fix-x86_64-darwin.patch
new file mode 100644
index 000000000000..e8ffe53513a7
--- /dev/null
+++ b/pkgs/by-name/zo/zotero/fix-x86_64-darwin.patch
@@ -0,0 +1,13 @@
+diff --git a/app/mac/set-channel-prefs-channel b/app/mac/set-channel-prefs-channel
+index 2431837584..ab85d7e5c0 100755
+--- a/app/mac/set-channel-prefs-channel
++++ b/app/mac/set-channel-prefs-channel
+@@ -19,7 +19,7 @@ binary=$1
+ from_channel=$2
+ to_channel=$3
+ # `strings` has a 4-character minimum by default, but we need 3 for 'dev'
+-strings_cmd="strings -n 3"
++strings_cmd="strings -n 3 -arch all"
+
+ if [ ${#to_channel} -gt 7 ]; then
+ echo "Channel length cannot exceed 7 characters -- aborting" >&2
diff --git a/pkgs/by-name/zo/zotero/package.nix b/pkgs/by-name/zo/zotero/package.nix
index 92bdbb91bf22..326e3129cd7f 100644
--- a/pkgs/by-name/zo/zotero/package.nix
+++ b/pkgs/by-name/zo/zotero/package.nix
@@ -22,6 +22,7 @@
xvfb-run,
makeBinaryWrapper,
doCheck ? false,
+ zotero,
}:
let
# note-editor needs nodejs 22. Any newer version fails to build zotero's fork of @benrbray/prosemirror-math during npm install.
@@ -193,6 +194,7 @@ buildNpmPackage (finalAttrs: {
./js-build-fixes.patch
./avoid-xulrunner-fetch.patch
./build-fixes.patch
+ ./fix-x86_64-darwin.patch
];
postPatch = ''
@@ -223,30 +225,48 @@ buildNpmPackage (finalAttrs: {
done
'';
- buildPhase = ''
- runHook preBuild
+ buildPhase =
+ let
+ zoteroArch =
+ platform:
+ if platform.isAarch64 then
+ "arm64"
+ else if platform.isx86_64 then
+ "x64"
+ else if platform.isx86_32 then
+ "i686"
+ else
+ platform.parsed.cpu.name;
+ in
+ ''
+ runHook preBuild
- npm run build
+ npm run build
- # Place firefox files at the right place.
- # The correct firefox version can be found in zotero/app/config.sh at `GECKO_VERSION_LINUX`.
- mkdir -p app/xulrunner/
- ''
- + lib.optionalString stdenv.targetPlatform.isDarwin ''
- cp -r "${firefox-esr-140-unwrapped}/Applications/Firefox ESR.app" app/xulrunner/Firefox.app
- ''
- + lib.optionalString (!stdenv.targetPlatform.isDarwin) ''
- cp -r "${firefox-esr-140-unwrapped}/lib/firefox" "app/xulrunner/firefox-${stdenv.targetPlatform.parsed.kernel.name}-${
- lib.replaceString "aarch64" "arm64" stdenv.targetPlatform.parsed.cpu.name
- }"
- ''
- + ''
- chmod -R u+w app/xulrunner/
+ # Place firefox files at the right place.
+ # The correct firefox version can be found in zotero/app/config.sh at `GECKO_VERSION_LINUX`.
+ mkdir -p app/xulrunner/
+ ''
+ + lib.optionalString stdenv.targetPlatform.isDarwin ''
+ cp -r "${firefox-esr-140-unwrapped}/Applications/Firefox ESR.app" app/xulrunner/Firefox.app
+ ''
+ + lib.optionalString (!stdenv.targetPlatform.isDarwin) ''
+ cp -r "${firefox-esr-140-unwrapped}/lib/firefox" "app/xulrunner/firefox-${stdenv.targetPlatform.parsed.kernel.name}-${
+ lib.replaceString "aarch64" "arm64" stdenv.targetPlatform.parsed.cpu.name
+ }"
+ ''
+ + ''
+ chmod -R u+w app/xulrunner/
- ./app/scripts/dir_build
+ build_dir=$(mktemp -d)
+ ./app/scripts/prepare_build -s ./build -o "$build_dir" -c release
+ ./app/build.sh -d "$build_dir" -c release -s \
+ ${
+ if stdenv.targetPlatform.isDarwin then "-p m" else "-p l -a ${zoteroArch stdenv.targetPlatform}"
+ }
- runHook postBuild
- '';
+ runHook postBuild
+ '';
inherit doCheck;
# Build with test support if `doCheck` is enabled.
@@ -326,7 +346,12 @@ buildNpmPackage (finalAttrs: {
makeWrapper $out/Applications/Zotero.app/Contents/MacOS/zotero $out/bin/zotero
'';
- passthru.updateScript = nix-update-script { };
+ passthru = {
+ tests.build-with-checks = zotero.override {
+ doCheck = true;
+ };
+ updateScript = nix-update-script { };
+ };
meta = {
homepage = "https://www.zotero.org";
diff --git a/pkgs/by-name/zs/zsv/package.nix b/pkgs/by-name/zs/zsv/package.nix
index cac500e03400..7dda07348f8e 100644
--- a/pkgs/by-name/zs/zsv/package.nix
+++ b/pkgs/by-name/zs/zsv/package.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "zsv";
- version = "1.4.2";
+ version = "1.4.3";
src = fetchFromGitHub {
owner = "liquidaty";
repo = "zsv";
tag = "v${finalAttrs.version}";
- hash = "sha256-CrZgf9ayAbkIFz7MC4WUwXba0heWDxxJpePg71CCw2A=";
+ hash = "sha256-O3L7GJqujzYpWvhrLb7qMPmiWF0ZyPFhDjvsUQXjhzQ=";
};
buildInputs = [ jq ];
diff --git a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix
index 44640f61b509..800bc37d145c 100644
--- a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix
@@ -37,13 +37,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "lomiri-thumbnailer";
- version = "3.1.0";
+ version = "3.1.1";
src = fetchFromGitLab {
owner = "ubports";
repo = "development/core/lomiri-thumbnailer";
tag = finalAttrs.version;
- hash = "sha256-lXvXK7UCLX5aoGID8sOoeHBEMhdle7RUMACLHiWpcEo=";
+ hash = "sha256-NEFwNofW0Ry9V0oUiUeuzs7q6+Ht2B0oCEGjmc3ywck=";
};
outputs = [
@@ -66,27 +66,21 @@ stdenv.mkDerivation (finalAttrs: {
substituteInPlace plugins/Lomiri/Thumbnailer*/CMakeLists.txt \
--replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt\''${QT_VERSION_MAJOR}/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
-
- # I think this variable fails to be populated because of our toolchain, while upstream uses Debian / Ubuntu where this works fine
- # https://cmake.org/cmake/help/v3.26/variable/CMAKE_LIBRARY_ARCHITECTURE.html
- # > If the compiler passes to the linker an architecture-specific system library search directory such as
- # > /lib/ this variable contains the name if/as detected by CMake.
+ ''
+ # I think this variable fails to be populated because of our toolchain, while upstream uses Debian / Ubuntu where this works fine
+ # https://cmake.org/cmake/help/v3.26/variable/CMAKE_LIBRARY_ARCHITECTURE.html
+ # > If the compiler passes to the linker an architecture-specific system library search directory such as
+ # > /lib/ this variable contains the name if/as detected by CMake.
+ + ''
substituteInPlace tests/qml/CMakeLists.txt \
--replace-fail 'CMAKE_LIBRARY_ARCHITECTURE' 'CMAKE_SYSTEM_PROCESSOR' \
--replace-fail 'powerpc-linux-gnu' 'ppc' \
--replace-fail 's390x-linux-gnu' 's390x'
-
- # Tests run in parallel to other builds, don't suck up cores
+ ''
+ # Tests run in parallel to other builds, don't suck up cores
+ + ''
substituteInPlace tests/headers/compile_headers.py \
--replace-fail 'max_workers=multiprocessing.cpu_count()' "max_workers=1"
- ''
- # https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/merge_requests/31
- # Too simple to bother with fetchpatch
- + ''
- substituteInPlace CMakeLists.txt \
- --replace-fail \
- 'find_package(Boost COMPONENTS filesystem iostreams regex system REQUIRED)' \
- 'find_package(Boost COMPONENTS filesystem iostreams regex REQUIRED)'
'';
strictDeps = true;
diff --git a/pkgs/development/cuda-modules/packages/gdrcopy.nix b/pkgs/development/cuda-modules/packages/gdrcopy.nix
index 22afb890c603..1aeadb2ee6d5 100644
--- a/pkgs/development/cuda-modules/packages/gdrcopy.nix
+++ b/pkgs/development/cuda-modules/packages/gdrcopy.nix
@@ -22,13 +22,13 @@ backendStdenv.mkDerivation (finalAttrs: {
# NOTE: Depends on the CUDA package set, so use cudaNamePrefix.
name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}";
pname = "gdrcopy";
- version = "2.5.2";
+ version = "2.6";
src = fetchFromGitHub {
owner = "NVIDIA";
repo = "gdrcopy";
tag = "v${finalAttrs.version}";
- hash = "sha256-KfdCiJE8q5MUYjI5qsZjeFmBm9jKfdSxtrlhmQRosns=";
+ hash = "sha256-Waq/Of0LcLDqyaWaU47lorJcG30CijcdTsvf9nMqgrg=";
};
outputs = [ "out" ];
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 5a820ff6d7dc..6238f8f6b9d6 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1453,6 +1453,10 @@ with haskellLib;
revision = null;
}) super.svgcairo;
+ # Support GHC >= 9.12.3 || >= 9.14.1
+ # Patch from https://github.com/gtk2hs/gtk2hs/pull/349
+ glib = appendPatches [ ./patches/glib-support-rts-at-least-9.12.3-and-9.14.patch ] super.glib;
+
# Too strict upper bound on tasty-hedgehog (<1.5)
# https://github.com/typeclasses/ascii-predicates/pull/1
ascii-predicates = doJailbreak super.ascii-predicates;
diff --git a/pkgs/development/haskell-modules/patches/glib-support-rts-at-least-9.12.3-and-9.14.patch b/pkgs/development/haskell-modules/patches/glib-support-rts-at-least-9.12.3-and-9.14.patch
new file mode 100644
index 000000000000..deeacb0404e5
--- /dev/null
+++ b/pkgs/development/haskell-modules/patches/glib-support-rts-at-least-9.12.3-and-9.14.patch
@@ -0,0 +1,24 @@
+From 2e1ddf6f4a28819f42db45859a83f3dd7ed14c0e Mon Sep 17 00:00:00 2001
+From: Tuong Nguyen Manh
+Date: Sat, 14 Feb 2026 11:58:29 +0100
+Subject: [PATCH] Fix glib for RTS API change in GHC 9.12.3/9.14.1
+
+---
+ glib/System/Glib/hsgclosure.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/glib/System/Glib/hsgclosure.c b/glib/System/Glib/hsgclosure.c
+index 1610702b..6049827f 100644
+--- a/System/Glib/hsgclosure.c
++++ b/System/Glib/hsgclosure.c
+@@ -107,7 +107,9 @@ gtk2hs_closure_marshal(GClosure *closure,
+ WHEN_DEBUG(g_debug("gtk2hs_closure_marshal(%p): about to rts_evalIO", hc->callback));
+
+ /* perform the call */
+- #if __GLASGOW_HASKELL__>=704
++ #if (__GLASGOW_HASKELL__>=912 && __GLASGOW_HASKELL_PATCHLEVEL1__>=3) || __GLASGOW_HASKELL__>=914
++ rts_evalIO(&cap, rts_apply(CAP (HaskellObj)ghc_hs_iface->runIO_closure, call),&ret);
++ #elif __GLASGOW_HASKELL__>=704
+ rts_evalIO(&cap, rts_apply(CAP (HaskellObj)runIO_closure, call),&ret);
+ #else
+ cap=rts_evalIO(CAP rts_apply(CAP (HaskellObj)runIO_closure, call),&ret);
diff --git a/pkgs/development/libraries/libsigcxx/3.0.nix b/pkgs/development/libraries/libsigcxx/3.0.nix
index f5c76431d1ea..8162e731e3da 100644
--- a/pkgs/development/libraries/libsigcxx/3.0.nix
+++ b/pkgs/development/libraries/libsigcxx/3.0.nix
@@ -1,20 +1,22 @@
{
stdenv,
lib,
- fetchurl,
+ fetchFromGitHub,
pkg-config,
meson,
ninja,
gnome,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "libsigc++";
- version = "3.6.0";
+ version = "3.8.1";
- src = fetchurl {
- url = "mirror://gnome/sources/libsigc++/${lib.versions.majorMinor version}/libsigc++-${version}.tar.xz";
- sha256 = "w9I7N9/W458uCfCRt3sVQfv6F8Twtr9cibrvcikIDhc=";
+ src = fetchFromGitHub {
+ owner = "libsigcplusplus";
+ repo = "libsigcplusplus";
+ tag = finalAttrs.version;
+ hash = "sha256-ZV1gcq/efFaf4MkkDZP9Z1isNqwnvUWWouVwtTnpyhc=";
};
outputs = [
@@ -40,9 +42,10 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://libsigcplusplus.github.io/libsigcplusplus/";
+ changelog = "https://github.com/libsigcplusplus/libsigcplusplus/blob/${finalAttrs.src.tag}/NEWS";
description = "Typesafe callback system for standard C++";
license = lib.licenses.lgpl21Plus;
teams = [ lib.teams.gnome ];
platforms = lib.platforms.all;
};
-}
+})
diff --git a/pkgs/development/ocaml-modules/aeneas/default.nix b/pkgs/development/ocaml-modules/aeneas/default.nix
index ea17be64e274..46a5e5827b44 100644
--- a/pkgs/development/ocaml-modules/aeneas/default.nix
+++ b/pkgs/development/ocaml-modules/aeneas/default.nix
@@ -16,7 +16,7 @@
buildDunePackage (finalAttrs: {
pname = "aeneas";
- version = "2026.06.12";
+ version = "2026.06.14";
__structuredAttrs = true;
minimalOCamlVersion = "5.1";
@@ -25,7 +25,7 @@ buildDunePackage (finalAttrs: {
owner = "AeneasVerif";
repo = "aeneas";
tag = "nightly-${finalAttrs.version}";
- hash = "sha256-loTnCy4lNJki+dSShZ35jKyOWIh1XcPwN7oY7CyFa04=";
+ hash = "sha256-ef68sJtVdKlIr7IiZSehFlG87m1BjW5HSG8PYxbs3Lg=";
};
sourceRoot = "${finalAttrs.src.name}/src";
diff --git a/pkgs/development/ocaml-modules/amqp-client/default.nix b/pkgs/development/ocaml-modules/amqp-client/default.nix
index 112710d2a439..089c006646d1 100644
--- a/pkgs/development/ocaml-modules/amqp-client/default.nix
+++ b/pkgs/development/ocaml-modules/amqp-client/default.nix
@@ -25,7 +25,7 @@ buildDunePackage {
homepage = "https://github.com/andersfugmann/amqp-client";
license = lib.licenses.bsd3;
changelog = "https://raw.githubusercontent.com/andersfugmann/amqp-client/refs/tags/${version}/Changelog";
- maintainers = with lib.maintainers; [ momeemt ];
+ maintainers = [ ];
longDescription = ''
This library provides high level client bindings for amqp. The library
is tested with rabbitmq, but should work with other amqp
diff --git a/pkgs/development/ocaml-modules/ancient/default.nix b/pkgs/development/ocaml-modules/ancient/default.nix
index 78d2f5e9a637..0fc1528ee8b1 100644
--- a/pkgs/development/ocaml-modules/ancient/default.nix
+++ b/pkgs/development/ocaml-modules/ancient/default.nix
@@ -37,6 +37,6 @@ buildDunePackage (finalAttrs: {
homepage = "https://github.com/OCamlPro/ocaml-ancient";
changelog = "https://raw.githubusercontent.com/OCamlPro/ocaml-ancient/refs/tags/${finalAttrs.version}/CHANGES.md";
license = lib.licenses.lgpl21Plus;
- maintainers = with lib.maintainers; [ momeemt ];
+ maintainers = [ ];
};
})
diff --git a/pkgs/development/ocaml-modules/benchmark/default.nix b/pkgs/development/ocaml-modules/benchmark/default.nix
index e3bce24b52fb..c335b7e4380e 100644
--- a/pkgs/development/ocaml-modules/benchmark/default.nix
+++ b/pkgs/development/ocaml-modules/benchmark/default.nix
@@ -25,6 +25,6 @@ buildDunePackage (finalAttrs: {
'';
changelog = "https://raw.githubusercontent.com/Chris00/ocaml-benchmark/refs/tags/v${finalAttrs.version}/CHANGES.md";
license = lib.licenses.lgpl3;
- maintainers = with lib.maintainers; [ momeemt ];
+ maintainers = [ ];
};
})
diff --git a/pkgs/development/ocaml-modules/bisect_ppx/default.nix b/pkgs/development/ocaml-modules/bisect_ppx/default.nix
index 62356c085733..7aee95e8f1af 100644
--- a/pkgs/development/ocaml-modules/bisect_ppx/default.nix
+++ b/pkgs/development/ocaml-modules/bisect_ppx/default.nix
@@ -45,7 +45,7 @@ buildDunePackage (finalAttrs: {
description = "Bisect_ppx is a code coverage tool for OCaml and Reason. It helps you test thoroughly by showing what's not tested";
homepage = "https://github.com/aantron/bisect_ppx";
license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ momeemt ];
+ maintainers = [ ];
mainProgram = "bisect-ppx-report";
};
})
diff --git a/pkgs/development/ocaml-modules/brisk-reconciler/default.nix b/pkgs/development/ocaml-modules/brisk-reconciler/default.nix
index aa918ae4d674..4f92e924851e 100644
--- a/pkgs/development/ocaml-modules/brisk-reconciler/default.nix
+++ b/pkgs/development/ocaml-modules/brisk-reconciler/default.nix
@@ -36,7 +36,7 @@ buildDunePackage {
* stateful functions: Functions that maintain state over time. Imagine that you can take any variable in your function and manage its value over the function's invocation. Now, imagine that any function invocation really creates its own "instance" of the function which will track this state separately from other invocations of this function.
'';
homepage = "https://github.com/briskml/brisk-reconciler";
- maintainers = with lib.maintainers; [ momeemt ];
+ maintainers = [ ];
license = lib.licenses.mit;
broken = lib.versionAtLeast ocaml.version "5.3";
};
diff --git a/pkgs/development/ocaml-modules/charon/default.nix b/pkgs/development/ocaml-modules/charon/default.nix
index a1f4604666b1..a560a938ddaa 100644
--- a/pkgs/development/ocaml-modules/charon/default.nix
+++ b/pkgs/development/ocaml-modules/charon/default.nix
@@ -16,14 +16,14 @@
buildDunePackage (finalAttrs: {
pname = "charon";
- version = "2026.06.12";
+ version = "2026.06.14";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "AeneasVerif";
repo = "charon";
tag = "nightly-${finalAttrs.version}";
- hash = "sha256-XCNDFJ8HakRBQ68rWB29R5RF7zhmqmNMna098SvXDE0=";
+ hash = "sha256-EZ1Ueco4vK4mUKyOGXXHgToNLMp+1W7095HyU+1zQ2Q=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/ocaml-modules/ffmpeg/base.nix b/pkgs/development/ocaml-modules/ffmpeg/base.nix
index 418db720f5f5..72582d05f288 100644
--- a/pkgs/development/ocaml-modules/ffmpeg/base.nix
+++ b/pkgs/development/ocaml-modules/ffmpeg/base.nix
@@ -17,7 +17,6 @@ rec {
license = lib.licenses.lgpl21Only;
maintainers = with lib.maintainers; [
dandellion
- momeemt
juaningan
];
};
diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix
index 2dea0eb4c218..88288e3d2510 100644
--- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix
@@ -41,7 +41,6 @@ buildDunePackage (finalAttrs: {
];
maintainers = with lib.maintainers; [
sternenseemann
- momeemt
];
};
})
diff --git a/pkgs/development/ocaml-modules/odoc-parser/default.nix b/pkgs/development/ocaml-modules/odoc-parser/default.nix
index cac3a548369f..fb1554719b47 100644
--- a/pkgs/development/ocaml-modules/odoc-parser/default.nix
+++ b/pkgs/development/ocaml-modules/odoc-parser/default.nix
@@ -65,7 +65,7 @@ lib.throwIf (param ? max_version && lib.versionAtLeast ocaml.version param.max_v
meta = {
description = "Parser for Ocaml documentation comments";
license = lib.licenses.isc;
- maintainers = with lib.maintainers; [ momeemt ];
+ maintainers = [ ];
homepage = "https://github.com/ocaml-doc/odoc-parser";
changelog = "https://github.com/ocaml-doc/odoc-parser/raw/${version}/CHANGES.md";
};
diff --git a/pkgs/development/octave-modules/dicom/default.nix b/pkgs/development/octave-modules/dicom/default.nix
index 16892b5d61fe..7397c3a24635 100644
--- a/pkgs/development/octave-modules/dicom/default.nix
+++ b/pkgs/development/octave-modules/dicom/default.nix
@@ -11,13 +11,13 @@
buildOctavePackage rec {
pname = "dicom";
- version = "0.7.2";
+ version = "0.7.3";
src = fetchFromGitHub {
owner = "gnu-octave";
repo = "octave-dicom";
tag = "release-${version}";
- sha256 = "sha256-6FcHxNUOTvSzYqknD89G3IyKVQs/dH+heoA/5Sx4lyg=";
+ sha256 = "sha256-jvqnL9b4o5SQdqlk04LAL/U898R8B+NxC8xyV144hx4=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/aioghost/default.nix b/pkgs/development/python-modules/aioghost/default.nix
index 4aff5398247a..f1854faf7d44 100644
--- a/pkgs/development/python-modules/aioghost/default.nix
+++ b/pkgs/development/python-modules/aioghost/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage (finalAttrs: {
pname = "aioghost";
- version = "0.4.16";
+ version = "0.4.17";
pyproject = true;
src = fetchFromGitHub {
owner = "TryGhost";
repo = "aioghost";
tag = "v${finalAttrs.version}";
- hash = "sha256-ZyRPXtQVOEyKHiX1utIukoayHtCNB/gm8i/gUIEYhtg=";
+ hash = "sha256-4yywuZOfKwTTHpZdSSyE0d8t+LlJL5+AW48Xb85od+k=";
};
build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix
index dbaef81775b3..0520d55d610d 100644
--- a/pkgs/development/python-modules/anthropic/default.nix
+++ b/pkgs/development/python-modules/anthropic/default.nix
@@ -38,14 +38,15 @@
buildPythonPackage (finalAttrs: {
pname = "anthropic";
- version = "0.97.0";
+ version = "0.109.1";
pyproject = true;
+ __structuredAttrs = true;
src = fetchFromGitHub {
owner = "anthropics";
repo = "anthropic-sdk-python";
tag = "v${finalAttrs.version}";
- hash = "sha256-jekixY/D80M9wPvq14GZj20+hDBVhzpmylh8mFSdL6k=";
+ hash = "sha256-H+blENPgkKhoGPJmAtdszFsJDkAzgprlDso0o2fhwz8=";
};
postPatch = ''
@@ -98,6 +99,13 @@ buildPythonPackage (finalAttrs: {
disabledTests = [
# Test require network access
"test_copy_build_request"
+ # Tests try to launch bash and fail
+ "test_bash_session_persistence"
+ "test_bash_timeout"
+ "test_bash_sentinel_not_spoofable"
+ "test_bash_stdin_redirect"
+ "test_bash_session_closed_property"
+ "test_bash_outer_cancel_closes_subprocess_no_stale_state"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# Hangs
diff --git a/pkgs/development/python-modules/anyqt/default.nix b/pkgs/development/python-modules/anyqt/default.nix
index 7e6742b432ca..36eb77416ae1 100644
--- a/pkgs/development/python-modules/anyqt/default.nix
+++ b/pkgs/development/python-modules/anyqt/default.nix
@@ -1,31 +1,42 @@
{
lib,
+ stdenv,
buildPythonPackage,
fetchFromGitHub,
pyqt5,
pytestCheckHook,
+ qt5,
+ setuptools,
+ writableTmpDirAsHomeHook,
nix-update-script,
}:
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
pname = "anyqt";
version = "0.2.1";
- format = "setuptools";
+ pyproject = true;
src = fetchFromGitHub {
owner = "ales-erjavec";
repo = "anyqt";
- rev = version;
+ tag = finalAttrs.version;
hash = "sha256-iDUgu+x9rnpxpHzO7Rf2rJFXsheivrK7HI3FUbomkTU=";
};
+ build-system = [ setuptools ];
+
nativeCheckInputs = [
pyqt5
pytestCheckHook
+ writableTmpDirAsHomeHook
];
- # All of these fail because Qt modules cannot be imported
- disabledTestPaths = [
+ preCheck = ''
+ export QT_PLUGIN_PATH="${lib.getBin qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}"
+ export QT_QPA_PLATFORM=offscreen
+ '';
+
+ disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
"tests/test_qabstractitemview.py"
"tests/test_qaction_set_menu.py"
"tests/test_qactionevent_action.py"
@@ -43,7 +54,8 @@ buildPythonPackage rec {
meta = {
description = "PyQt/PySide compatibility layer";
homepage = "https://github.com/ales-erjavec/anyqt";
+ changelog = "https://github.com/ales-erjavec/anyqt/releases/tag/${finalAttrs.version}";
license = [ lib.licenses.gpl3Only ];
maintainers = [ lib.maintainers.lucasew ];
};
-}
+})
diff --git a/pkgs/development/python-modules/awesome-slugify/default.nix b/pkgs/development/python-modules/awesome-slugify/default.nix
deleted file mode 100644
index 30d1ebca1044..000000000000
--- a/pkgs/development/python-modules/awesome-slugify/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
- lib,
- buildPythonPackage,
- fetchPypi,
- unidecode,
- regex,
- unittestCheckHook,
-}:
-
-buildPythonPackage rec {
- pname = "awesome-slugify";
- version = "1.6.5";
- format = "setuptools";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0wgxrhr8s5vk2xmcz9s1z1aml4ppawmhkbggl9rp94c747xc7pmv";
- };
-
- prePatch = ''
- substituteInPlace setup.py \
- --replace 'Unidecode>=0.04.14,<0.05' 'Unidecode>=0.04.14'
- '';
-
- patches = [
- ./slugify_filename_test.patch # fixes broken test by new unidecode
- ];
-
- propagatedBuildInputs = [
- unidecode
- regex
- ];
-
- nativeCheckInputs = [ unittestCheckHook ];
-
- meta = {
- homepage = "https://github.com/dimka665/awesome-slugify";
- description = "Python flexible slugify function";
- license = lib.licenses.gpl3;
- platforms = lib.platforms.all;
- maintainers = [ ];
- };
-}
diff --git a/pkgs/development/python-modules/awesome-slugify/slugify_filename_test.patch b/pkgs/development/python-modules/awesome-slugify/slugify_filename_test.patch
deleted file mode 100644
index 3283d76eae05..000000000000
--- a/pkgs/development/python-modules/awesome-slugify/slugify_filename_test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git i/slugify/tests.py w/slugify/tests.py
-index 4c9fa1c..3e14328 100644
---- i/slugify/tests.py
-+++ w/slugify/tests.py
-@@ -57,7 +57,7 @@ class PredefinedSlugifyTestCase(unittest.TestCase):
- self.assertEqual(slugify_url('The Über article'), 'uber-article')
-
- def test_slugify_filename(self):
-- self.assertEqual(slugify_filename(u'Дrаft №2.txt'), u'Draft_2.txt')
-+ self.assertEqual(slugify_filename(u'Дrаft №2.txt'), u'Draft_No._2.txt')
-
-
- class ToLowerTestCase(unittest.TestCase):
diff --git a/pkgs/development/python-modules/bch/default.nix b/pkgs/development/python-modules/bch/default.nix
index c2f529fddee3..c947beafd19b 100644
--- a/pkgs/development/python-modules/bch/default.nix
+++ b/pkgs/development/python-modules/bch/default.nix
@@ -2,25 +2,30 @@
lib,
buildPythonPackage,
fetchFromGitHub,
+ setuptools,
click,
click-log,
paho-mqtt,
pyaml,
}:
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
pname = "bch";
version = "1.2.1";
- format = "setuptools";
+ pyproject = true;
+
+ __structuredAttrs = true;
src = fetchFromGitHub {
owner = "hardwario";
repo = "bch-control-tool";
- rev = "v${version}";
- sha256 = "/C+NbJ0RrWZ/scv/FiRBTh4h7u0xS4mHVDWQ0WwmlEY=";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-/C+NbJ0RrWZ/scv/FiRBTh4h7u0xS4mHVDWQ0WwmlEY=";
};
- propagatedBuildInputs = [
+ build-system = [ setuptools ];
+
+ dependencies = [
click
click-log
paho-mqtt
@@ -28,8 +33,8 @@ buildPythonPackage rec {
];
postPatch = ''
- sed -ri 's/@@VERSION@@/${version}/g' \
- bch/cli.py setup.py
+ substituteInPlace bch/cli.py setup.py \
+ --replace-fail "@@VERSION@@" "${finalAttrs.version}"
'';
pythonImportsCheck = [ "bch" ];
@@ -42,4 +47,4 @@ buildPythonPackage rec {
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ cynerd ];
};
-}
+})
diff --git a/pkgs/development/python-modules/bencode-py/default.nix b/pkgs/development/python-modules/bencode-py/default.nix
index f4c8ddf1c2e2..5d1293e6e9e5 100644
--- a/pkgs/development/python-modules/bencode-py/default.nix
+++ b/pkgs/development/python-modules/bencode-py/default.nix
@@ -2,23 +2,29 @@
lib,
buildPythonPackage,
fetchPypi,
+ setuptools,
pbr,
pytestCheckHook,
}:
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
pname = "beconde-py";
version = "4.0.0";
- format = "setuptools";
+ pyproject = true;
+
+ __structuredAttrs = true;
src = fetchPypi {
- inherit version;
+ inherit (finalAttrs) version;
pname = "bencode.py";
hash = "sha256-KiTM2hclpRplCJPQtjJgE4NZ6qKZu256CZYTUKKm4Fw=";
};
- pythonImportsCheck = [ "bencodepy" ];
+ build-system = [
+ setuptools
+ pbr
+ ];
- nativeBuildInputs = [ pbr ];
+ pythonImportsCheck = [ "bencodepy" ];
nativeCheckInputs = [ pytestCheckHook ];
@@ -28,4 +34,4 @@ buildPythonPackage rec {
license = lib.licenses.bitTorrent11;
maintainers = with lib.maintainers; [ vamega ];
};
-}
+})
diff --git a/pkgs/development/python-modules/biplist/default.nix b/pkgs/development/python-modules/biplist/default.nix
index 6128b19d823a..00c7cc807262 100644
--- a/pkgs/development/python-modules/biplist/default.nix
+++ b/pkgs/development/python-modules/biplist/default.nix
@@ -2,19 +2,24 @@
lib,
buildPythonPackage,
fetchPypi,
+ setuptools,
pytestCheckHook,
}:
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
pname = "biplist";
version = "1.0.3";
- format = "setuptools";
+ pyproject = true;
+
+ __structuredAttrs = true;
src = fetchPypi {
- inherit pname version;
- sha256 = "1im45a9z7ryrfyp1v6i39qia5qagw6i1mhif0hl0praz9iv4j1ac";
+ inherit (finalAttrs) pname version;
+ hash = "sha256-TAVJdkxf5QsoBC7CGqLhT+GiIk4jmh2ud9nn85MqpMY=";
};
+ build-system = [ setuptools ];
+
nativeCheckInputs = [ pytestCheckHook ];
disabledTests = [
@@ -40,4 +45,4 @@ buildPythonPackage rec {
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ siriobalmelli ];
};
-}
+})
diff --git a/pkgs/development/python-modules/bleak-esphome/default.nix b/pkgs/development/python-modules/bleak-esphome/default.nix
index 1e88ad92ffb5..9215ad8723ce 100644
--- a/pkgs/development/python-modules/bleak-esphome/default.nix
+++ b/pkgs/development/python-modules/bleak-esphome/default.nix
@@ -19,14 +19,14 @@
buildPythonPackage (finalAttrs: {
pname = "bleak-esphome";
- version = "3.9.1";
+ version = "3.9.4";
pyproject = true;
src = fetchFromGitHub {
owner = "bluetooth-devices";
repo = "bleak-esphome";
tag = "v${finalAttrs.version}";
- hash = "sha256-6qwg6jI9zFf3x0Yfp03C62f+LMO/RIDju+/ykoiOCI4=";
+ hash = "sha256-kH+UiXpu0HNdz55Qz8y/NJ/XzOkTk7fkah7CZE2Zets=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/brotli-asgi/default.nix b/pkgs/development/python-modules/brotli-asgi/default.nix
index a6b1cc5b3747..ea364531ee6a 100644
--- a/pkgs/development/python-modules/brotli-asgi/default.nix
+++ b/pkgs/development/python-modules/brotli-asgi/default.nix
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
+ setuptools,
# build inputs
starlette,
brotli,
@@ -11,22 +12,23 @@
mypy,
brotlipy,
}:
-let
+buildPythonPackage (finalAttrs: {
pname = "brotli-asgi";
version = "1.6.0";
-in
-buildPythonPackage {
- inherit pname version;
- format = "setuptools";
+ pyproject = true;
+
+ __structuredAttrs = true;
src = fetchFromGitHub {
owner = "fullonic";
repo = "brotli-asgi";
- rev = "v${version}";
+ tag = "v${finalAttrs.version}";
hash = "sha256-cF7A3mnkQmvtc9DgHiwqYEQQ6QagjoBGTmcBzUm6vvs=";
};
- propagatedBuildInputs = [
+ build-system = [ setuptools ];
+
+ dependencies = [
starlette
brotli
];
@@ -46,4 +48,4 @@ buildPythonPackage {
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ happysalada ];
};
-}
+})
diff --git a/pkgs/development/python-modules/btrfsutil/default.nix b/pkgs/development/python-modules/btrfsutil/default.nix
index 753ce5be3759..f2b6403ecf99 100644
--- a/pkgs/development/python-modules/btrfsutil/default.nix
+++ b/pkgs/development/python-modules/btrfsutil/default.nix
@@ -1,6 +1,7 @@
{
lib,
buildPythonPackage,
+ setuptools,
btrfs-progs,
autoreconfHook,
pkg-config,
@@ -11,8 +12,11 @@
buildPythonPackage {
pname = "btrfsutil";
inherit (btrfs-progs) version src;
- format = "setuptools";
+ pyproject = true;
+ build-system = [
+ setuptools
+ ];
buildInputs = [
btrfs-progs
e2fsprogs
@@ -41,7 +45,7 @@ buildPythonPackage {
meta = {
description = "Library for managing Btrfs filesystems";
- homepage = "https://btrfs.wiki.kernel.org/";
+ homepage = "https://btrfs.readthedocs.io/";
license = lib.licenses.lgpl21Plus;
maintainers = with lib.maintainers; [
raskin
diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix
index 2c82eae651f0..b747f7f171f1 100644
--- a/pkgs/development/python-modules/cartopy/default.nix
+++ b/pkgs/development/python-modules/cartopy/default.nix
@@ -1,39 +1,57 @@
{
lib,
buildPythonPackage,
+ fetchFromGitHub,
+
+ # build-system
cython,
- fetchPypi,
- fontconfig,
- gdal,
+ setuptools-scm,
+
+ # nativeBuildInputs
geos,
+ proj,
+
+ # dependencies
matplotlib,
numpy,
- owslib,
- pillow,
- proj,
pyproj,
pyshp,
+ shapely,
+
+ # optional-dependencies
+ # ows
+ owslib,
+ pillow,
+ # plotting
+ gdal,
+ scipy,
+
+ # tests
+ fontconfig,
pytest-mpl,
pytestCheckHook,
- scipy,
- setuptools-scm,
- shapely,
+ writableTmpDirAsHomeHook,
}:
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
pname = "cartopy";
version = "0.25.0";
pyproject = true;
+ __structuredAttrs = true;
- src = fetchPypi {
- inherit pname version;
- hash = "sha256-VfGjkOXz8HWyIcfZH7ECWK2XjbeGx5MOugbrRdKHU/4=";
+ src = fetchFromGitHub {
+ owner = "SciTools";
+ repo = "cartopy";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-qnsr8IgqgqQDyGslYBvpAr/+ccsUPOiA2yGOXge3nUw=";
};
- build-system = [ setuptools-scm ];
+ build-system = [
+ cython
+ setuptools-scm
+ ];
nativeBuildInputs = [
- cython
geos # for geos-config
proj
];
@@ -66,12 +84,12 @@ buildPythonPackage rec {
nativeCheckInputs = [
pytest-mpl
pytestCheckHook
+ writableTmpDirAsHomeHook
]
- ++ lib.concatAttrValues optional-dependencies;
+ ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;
preCheck = ''
export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf
- export HOME=$TMPDIR
'';
pytestFlags = [
@@ -85,16 +103,41 @@ buildPythonPackage rec {
];
disabledTests = [
+ # Numerical errors. Example:
+ # AssertionError: Arrays are not almost equal to 4 decimals
+ "test_LatitudeFormatter_mercator"
+ "test_cursor_values"
+ "test_default"
+ "test_extents"
+ "test_geoaxes_no_subslice"
+ "test_geoaxes_set_boundary_clipping"
+ "test_get_extent"
+ "test_gridliner_labels_zoom"
+ "test_infinite_loop_bounds"
+ "test_invalid_xy_domain_corner"
+ "test_invalid_y_domain"
+ "test_osgb_vals"
+ "test_pcolormesh_datalim"
+ "test_plot_after_contour_doesnt_shrink"
+ "test_sweep"
+ "test_tiny_point_between_boundary_points"
+ "test_transform_point"
+ "test_with_transform"
+
+ # Failed: Error: Image files did not match.
+ "test_background_img"
"test_gridliner_constrained_adjust_datalim"
- "test_gridliner_labels_bbox_style"
+ "test_imshow"
+ "test_pil_Image"
+ "test_stock_img"
];
meta = {
description = "Process geospatial data to create maps and perform analyses";
homepage = "https://scitools.org.uk/cartopy/docs/latest/";
- changelog = "https://github.com/SciTools/cartopy/releases/tag/v${version}";
+ changelog = "https://github.com/SciTools/cartopy/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.lgpl3Plus;
maintainers = [ ];
mainProgram = "feature_download";
};
-}
+})
diff --git a/pkgs/development/python-modules/cf-xarray/default.nix b/pkgs/development/python-modules/cf-xarray/default.nix
index 9d5334502e07..1c77d916cb88 100644
--- a/pkgs/development/python-modules/cf-xarray/default.nix
+++ b/pkgs/development/python-modules/cf-xarray/default.nix
@@ -18,14 +18,14 @@
buildPythonPackage (finalAttrs: {
pname = "cf-xarray";
- version = "0.11.1";
+ version = "0.11.3";
pyproject = true;
src = fetchFromGitHub {
owner = "xarray-contrib";
repo = "cf-xarray";
tag = "v${finalAttrs.version}";
- hash = "sha256-UB/aMXnfX2dOprjQp51QHYOGq9Acn030oLqjLt/avS4=";
+ hash = "sha256-njwK8wJH0YKzA7Lq8J0gBvAzNJa24XncF7IB9Dy6Lys=";
};
build-system = [
diff --git a/pkgs/development/python-modules/clickgen/default.nix b/pkgs/development/python-modules/clickgen/default.nix
index be05f3666a83..474f81daad12 100644
--- a/pkgs/development/python-modules/clickgen/default.nix
+++ b/pkgs/development/python-modules/clickgen/default.nix
@@ -3,6 +3,7 @@
stdenv,
buildPythonPackage,
fetchFromGitHub,
+ setuptools,
attrs,
pillow,
toml,
@@ -12,19 +13,21 @@
pytestCheckHook,
}:
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
pname = "clickgen";
version = "2.2.5";
- format = "setuptools";
+ pyproject = true;
src = fetchFromGitHub {
owner = "ful1e5";
repo = "clickgen";
- tag = "v${version}";
+ tag = "v${finalAttrs.version}";
hash = "sha256-yFEkE1VyeHBuebpsumc6CTvv2kpAw7XAWlyUlXibqz0=";
};
- propagatedBuildInputs = [
+ build-system = [ setuptools ];
+
+ dependencies = [
attrs
numpy
pillow
@@ -54,4 +57,4 @@ buildPythonPackage rec {
# ld: unknown option: -zdefs
broken = stdenv.hostPlatform.isDarwin;
};
-}
+})
diff --git a/pkgs/development/python-modules/co2signal/default.nix b/pkgs/development/python-modules/co2signal/default.nix
index 147e9c6e6de8..3c2e674ab5ee 100644
--- a/pkgs/development/python-modules/co2signal/default.nix
+++ b/pkgs/development/python-modules/co2signal/default.nix
@@ -2,21 +2,26 @@
lib,
buildPythonPackage,
fetchPypi,
+ setuptools,
requests,
}:
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
pname = "co2signal";
version = "0.4.2";
- format = "setuptools";
+ pyproject = true;
+
+ __structuredAttrs = true;
src = fetchPypi {
- inherit version;
+ inherit (finalAttrs) version;
pname = "CO2Signal";
hash = "sha256-8YdYbknLICRrZloGUZuscv5e1LIDZBcCPKZs6EMaNuo=";
};
- propagatedBuildInputs = [ requests ];
+ build-system = [ setuptools ];
+
+ dependencies = [ requests ];
# Modules has no tests
doCheck = false;
@@ -28,4 +33,4 @@ buildPythonPackage rec {
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ plabadens ];
};
-}
+})
diff --git a/pkgs/development/python-modules/curl-cffi/default.nix b/pkgs/development/python-modules/curl-cffi/default.nix
index 228e8037b203..1d328148d6e7 100644
--- a/pkgs/development/python-modules/curl-cffi/default.nix
+++ b/pkgs/development/python-modules/curl-cffi/default.nix
@@ -17,6 +17,7 @@
pytest-trio,
pytestCheckHook,
python-multipart,
+ rich,
trustme,
uvicorn,
websockets,
@@ -46,6 +47,7 @@ buildPythonPackage rec {
dependencies = [
cffi
certifi
+ rich
];
pythonImportsCheck = [ "curl_cffi" ];
diff --git a/pkgs/development/python-modules/e3nn/default.nix b/pkgs/development/python-modules/e3nn/default.nix
new file mode 100644
index 000000000000..4382881a2302
--- /dev/null
+++ b/pkgs/development/python-modules/e3nn/default.nix
@@ -0,0 +1,78 @@
+{
+ lib,
+ stdenv,
+ buildPythonPackage,
+ fetchFromGitHub,
+
+ # build-system
+ setuptools,
+ setuptools-scm,
+
+ # dependencies
+ opt-einsum-fx,
+ scipy,
+ sympy,
+ torch,
+
+ # tests
+ pytestCheckHook,
+ llvmPackages,
+}:
+
+buildPythonPackage (finalAttrs: {
+ pname = "e3nn";
+ version = "0.6.0";
+ pyproject = true;
+ __structuredAttrs = true;
+
+ src = fetchFromGitHub {
+ owner = "e3nn";
+ repo = "e3nn";
+ tag = finalAttrs.version;
+ hash = "sha256-gGl0DiLU8w0jqGWA/ZzvkxdZdZCvtXqtmEEZ2dIwZ2o=";
+ };
+
+ build-system = [
+ setuptools
+ setuptools-scm
+ ];
+
+ dependencies = [
+ opt-einsum-fx
+ scipy
+ sympy
+ torch
+ ];
+
+ pythonImportsCheck = [ "e3nn" ];
+
+ nativeCheckInputs = [
+ pytestCheckHook
+ ];
+
+ disabledTests = [
+ # RuntimeError: torch.compile does not support compiling torch.jit.script or
+ # torch.jit.freeze models directly
+ "test_identity"
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ # symbol not found in flat namespace '___kmpc_barrier'
+ "test_activation"
+ "test_input_weights_jit"
+ "test_variance"
+ ];
+
+ propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+ # Otherwise, torch will fail to include `omp.h`:
+ # torch._inductor.exc.InductorError: CppCompileError: C++ compile error OpenMP support not found
+ llvmPackages.openmp
+ ];
+
+ meta = {
+ description = "Modular framework for neural networks with Euclidean symmetry";
+ homepage = "https://github.com/e3nn/e3nn";
+ changelog = "https://github.com/e3nn/e3nn/releases/tag/${finalAttrs.src.tag}";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ GaetanLepage ];
+ };
+})
diff --git a/pkgs/development/python-modules/entsoe-apy/default.nix b/pkgs/development/python-modules/entsoe-apy/default.nix
index 204339240715..daf5e2ea9118 100644
--- a/pkgs/development/python-modules/entsoe-apy/default.nix
+++ b/pkgs/development/python-modules/entsoe-apy/default.nix
@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "entsoe-apy";
- version = "0.9.2";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "berrij";
repo = "entsoe-apy";
tag = "v${version}";
- hash = "sha256-szJ3UlYJjwNZMWHJ81Gp4AgdB7JQyDP0NL0MpmjTQGY=";
+ hash = "sha256-rMWpmgPmVmnA9L9pAywt39sUBadh/HL7dSwhKpEGaVI=";
};
pyproject = true;
diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix
index e2317d08a38c..2b3beaaf0149 100644
--- a/pkgs/development/python-modules/fastcore/default.nix
+++ b/pkgs/development/python-modules/fastcore/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage (finalAttrs: {
pname = "fastcore";
- version = "1.12.39";
+ version = "1.13.3";
pyproject = true;
src = fetchFromGitHub {
owner = "fastai";
repo = "fastcore";
tag = finalAttrs.version;
- hash = "sha256-4pa0h+8V7E3CJtJguM/OhEK61OeK/+JKEL7fNsWIKek=";
+ hash = "sha256-ZwiqTGgvu/OdnaJHq+oWZat33BvhF52X48d6ipcexRU=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/font-v/default.nix b/pkgs/development/python-modules/font-v/default.nix
index fe71c42d2996..d678a528b055 100644
--- a/pkgs/development/python-modules/font-v/default.nix
+++ b/pkgs/development/python-modules/font-v/default.nix
@@ -6,22 +6,25 @@
gitMinimal,
gitpython,
pytestCheckHook,
+ setuptools,
}:
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
pname = "font-v";
version = "2.1.0";
- format = "setuptools";
+ pyproject = true;
# PyPI source tarballs omit tests, fetch from Github instead
src = fetchFromGitHub {
owner = "source-foundry";
repo = "font-v";
- rev = "v${version}";
+ rev = "v${finalAttrs.version}";
hash = "sha256-ceASyYcNul5aWPAPGajCQrqsQ3bN1sE+nMbCbj7f35w=";
};
- propagatedBuildInputs = [
+ build-system = [ setuptools ];
+
+ dependencies = [
fonttools
gitpython
];
@@ -30,6 +33,7 @@ buildPythonPackage rec {
gitMinimal
pytestCheckHook
];
+
preCheck = ''
# Many tests assume they are running from a git checkout, although they
# don't care which one. Create a dummy git repo to satisfy the tests:
@@ -38,6 +42,7 @@ buildPythonPackage rec {
git config user.name Test
git commit --allow-empty --message 'Dummy commit for tests'
'';
+
disabledTests = [
# These tests assume they are actually running from a font-v git checkout,
# so just skip them:
@@ -46,9 +51,10 @@ buildPythonPackage rec {
meta = {
description = "Python utility for manipulating font version headers";
+ changelog = "https://github.com/source-foundry/font-v/blob/v${finalAttrs.version}/CHANGELOG.md";
mainProgram = "font-v";
homepage = "https://github.com/source-foundry/font-v";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ danc86 ];
};
-}
+})
diff --git a/pkgs/development/python-modules/frida-python/default.nix b/pkgs/development/python-modules/frida-python/default.nix
index cc992c53d6f0..25c2182c32cb 100644
--- a/pkgs/development/python-modules/frida-python/default.nix
+++ b/pkgs/development/python-modules/frida-python/default.nix
@@ -5,7 +5,7 @@
buildPythonPackage,
}:
let
- version = "17.5.1";
+ version = "17.9.11";
format = "wheel";
inherit (stdenvNoCC.hostPlatform) system;
@@ -13,19 +13,19 @@ let
pypiMeta =
{
x86_64-linux = {
- hash = "sha256-gUYHLjKLoUI/aXzB+aU5yvfmObcA9hctkBqLgZxHvi0=";
+ hash = "sha256-ovITi0zxPqJECChrx8cAeIw7m7NjGHa+cl1NomYL718=";
platform = "manylinux1_x86_64";
};
aarch64-linux = {
- hash = "sha256-zU9mmxU8WWs2dG3lHnSiY0oTDN2tUFTMolV22SHtBbc=";
+ hash = "sha256-kDSBWC+G2m3pZ6YWhMjkvtXfR6HMVq5zxsxZUmBprrM=";
platform = "manylinux2014_aarch64";
};
x86_64-darwin = {
- hash = "sha256-hgsUQHS/DCVXSMm8ViC4zd/UVvEqYH7uwedv4ag48Mc=";
+ hash = "sha256-op8QM6f5LKCoozKawTi8hYZRO5VJ1kzWjSk62urGJLQ=";
platform = "macosx_10_13_x86_64";
};
aarch64-darwin = {
- hash = "sha256-HgjAVeACzWis0WFgf/D40GAqMbqSmZ8XBilgID3Yk5A=";
+ hash = "sha256-9JmPcE4CxzHiNLg6jMpSt/CC0eGk0VyKr1uzUTyQRqI=";
platform = "macosx_11_0_arm64";
};
}
diff --git a/pkgs/development/python-modules/ghidra-bridge/default.nix b/pkgs/development/python-modules/ghidra-bridge/default.nix
deleted file mode 100644
index 2c50519da9bd..000000000000
--- a/pkgs/development/python-modules/ghidra-bridge/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
- lib,
- buildPythonPackage,
- fetchFromGitHub,
- jfx-bridge,
- setuptools,
-}:
-
-buildPythonPackage rec {
- pname = "ghidra-bridge";
- version = "1.0.0";
- pyproject = true;
-
- src = fetchFromGitHub {
- owner = "justfoxing";
- repo = "ghidra_bridge";
- tag = version;
- hash = "sha256-VcAl1tamsuHvZRtBP0+DCl2A9d7E6aoj2AbJhEcBNMM=";
- };
-
- patches = [ ./no-invoke-git.patch ];
-
- postPatch = ''
- substituteInPlace ./setup.py --subst-var-by version ${version}
- '';
-
- build-system = [ setuptools ];
-
- dependencies = [ jfx-bridge ];
-
- # Tests require a running server instance
- doCheck = false;
-
- pythonImportsCheck = [ "ghidra_bridge" ];
-
- meta = {
- description = "Python bridge to Ghidra's Python scripting";
- homepage = "https://github.com/justfoxing/ghidra_bridge";
- changelog = "https://github.com/justfoxing/ghidra_bridge/releases/tag/${src.tag}";
- license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ scoder12 ];
- };
-}
diff --git a/pkgs/development/python-modules/ghidra-bridge/no-invoke-git.patch b/pkgs/development/python-modules/ghidra-bridge/no-invoke-git.patch
deleted file mode 100644
index f82ebccde6ea..000000000000
--- a/pkgs/development/python-modules/ghidra-bridge/no-invoke-git.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 9a2abe0..75ce109 100644
---- a/setup.py
-+++ b/setup.py
-@@ -6,7 +6,7 @@ with open("README.md", "r") as fh:
-
- # determine the version, then write it out into the bridge.py file
- version = (
-- subprocess.check_output("git describe --tags", shell=True).decode("utf-8").strip()
-+ "@version@"
- )
- # check if this is a non-tag release and remark it as a dev release
- if "-" in version:
diff --git a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix
index da57c08873cb..fe7dbded4bd7 100644
--- a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix
+++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix
@@ -14,13 +14,13 @@
buildPythonPackage rec {
pname = "google-cloud-appengine-logging";
- version = "1.8.0";
+ version = "1.10.0";
pyproject = true;
src = fetchPypi {
pname = "google_cloud_appengine_logging";
inherit version;
- hash = "sha256-hLcFpp5BCfwvaN/jbOPfajTVw9mJ7ubQrBsCTdoLpvU=";
+ hash = "sha256-tVY+dgEKNuat8cxIliDCnuT7O5hrAG0jfpoGHrDwq7c=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
index 40653a94c682..0d5ab5be94f9 100644
--- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
+++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
@@ -13,13 +13,13 @@
buildPythonPackage rec {
pname = "google-cloud-secret-manager";
- version = "2.28.0";
+ version = "2.29.0";
pyproject = true;
src = fetchPypi {
pname = "google_cloud_secret_manager";
inherit version;
- hash = "sha256-V2P0KkScJ1l/tC1A+pPixWsC2866DEHaIC+5foEMsng=";
+ hash = "sha256-7mQTOvj9s3gK/7ZexszxCrFaARPY7eujiGZfS+h84b4=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/growattserver/default.nix b/pkgs/development/python-modules/growattserver/default.nix
index 6cd940f85681..30edba45b29b 100644
--- a/pkgs/development/python-modules/growattserver/default.nix
+++ b/pkgs/development/python-modules/growattserver/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage (finalAttrs: {
pname = "growattserver";
- version = "2.1.0";
+ version = "2.2.0";
pyproject = true;
src = fetchFromGitHub {
owner = "indykoning";
repo = "PyPi_GrowattServer";
tag = finalAttrs.version;
- hash = "sha256-MRxNPyvIlMafJYhjMNirb0cqppJYr9MUR7FxjhqQsyY=";
+ hash = "sha256-zVcKuwTxuCCIZzVKgEdjULSyKgKcb/Fb93rk3J8ztCg=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index 4b49c19db0cc..d1dbede3737d 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.202606121";
+ version = "0.1.202606131";
pyproject = true;
src = fetchFromGitHub {
owner = "cloud-copilot";
repo = "iam-data-python";
tag = "v${finalAttrs.version}";
- hash = "sha256-d7joiPl5EQaGH0co6SC1ifnjRV7FowFswGFF6mSmIcM=";
+ hash = "sha256-QPaaJ+yeRC2CYsUNTwBrqZStJ/+BxfYG0xteo+iYV/Y=";
};
__darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/iplotx/default.nix b/pkgs/development/python-modules/iplotx/default.nix
index 3f098ef33d2b..8f0ca468ca46 100644
--- a/pkgs/development/python-modules/iplotx/default.nix
+++ b/pkgs/development/python-modules/iplotx/default.nix
@@ -14,14 +14,14 @@
buildPythonPackage (finalAttrs: {
pname = "iplotx";
- version = "1.6.0";
+ version = "1.7.1";
pyproject = true;
src = fetchFromGitHub {
owner = "fabilab";
repo = "iplotx";
tag = finalAttrs.version;
- hash = "sha256-pTSY7eEYKwBSDttxZqauGCofYK5SFaxjJLXYBwSr3ew=";
+ hash = "sha256-vLYjTYdt3ctaUwnzV73vNWu2uKpER92SH8uqeLR/G7M=";
};
build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/jaxtyping/default.nix b/pkgs/development/python-modules/jaxtyping/default.nix
index e388ba7b5260..19df15b2aa7b 100644
--- a/pkgs/development/python-modules/jaxtyping/default.nix
+++ b/pkgs/development/python-modules/jaxtyping/default.nix
@@ -27,7 +27,7 @@
buildPythonPackage (finalAttrs: {
pname = "jaxtyping";
- version = "0.3.10";
+ version = "0.3.11";
pyproject = true;
__structuredAttrs = true;
@@ -35,7 +35,7 @@ buildPythonPackage (finalAttrs: {
owner = "patrick-kidger";
repo = "jaxtyping";
tag = "v${finalAttrs.version}";
- hash = "sha256-7HhStNjVKjnPfXiuXDLsvwH1efSGSMqRuCWeOtpcidw=";
+ hash = "sha256-oC8n4YiV39EjRm8vYDFrUVJmEPeH814q7uIKdmpqnJk=";
};
build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/jfx-bridge/default.nix b/pkgs/development/python-modules/jfx-bridge/default.nix
deleted file mode 100644
index 2c261be4b96a..000000000000
--- a/pkgs/development/python-modules/jfx-bridge/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{
- lib,
- buildPythonPackage,
- fetchFromGitHub,
- pytestCheckHook,
- python,
- setuptools,
-}:
-
-buildPythonPackage rec {
- pname = "jfx-bridge";
- version = "1.0.0";
- pyproject = true;
-
- src = fetchFromGitHub {
- owner = "justfoxing";
- repo = "jfx_bridge";
- tag = version;
- hash = "sha256-fpUrKNGqTpthhTfohCbwO1GBDAP/YnLWeapVhZftldg=";
- };
-
- patches = [ ./no-invoke-git.patch ];
-
- postPatch = ''
- substituteInPlace ./setup.py --subst-var-by version ${version}
- '';
-
- build-system = [ setuptools ];
-
- nativeCheckInputs = [ pytestCheckHook ];
-
- preCheck = ''
- ${python.interpreter} test_bridge_server.py &
- '';
-
- disabledTests = [
- # known to cause timeout with newer python (acknowledged in test comment)
- "test_nonreturn_marker_local"
- # the mechanisms that hook into the python import machinery seem broken on newer python
- "TestBridgeHookImport"
- ];
-
- pythonImportsCheck = [ "jfx_bridge" ];
-
- meta = {
- description = "Base Python RPC bridge used for ghidra_bridge";
- homepage = "https://github.com/justfoxing/jfx_bridge";
- changelog = "https://github.com/justfoxing/jfx_bridge/releases/tag/${src.tag}";
- license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ scoder12 ];
- };
-}
diff --git a/pkgs/development/python-modules/jfx-bridge/no-invoke-git.patch b/pkgs/development/python-modules/jfx-bridge/no-invoke-git.patch
deleted file mode 100644
index 2c1f53ca2d6c..000000000000
--- a/pkgs/development/python-modules/jfx-bridge/no-invoke-git.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 079cb01..c5e71b8 100644
---- a/setup.py
-+++ b/setup.py
-@@ -6,7 +6,7 @@ with open("README.md", "r") as fh:
- long_description = fh.read()
-
- # determine the version, then write it out into the bridge.py file
--version = subprocess.check_output("git describe --tags", shell=True).decode("utf-8").strip()
-+version = "@version@"
- # check if this is a non-tag release and remark it as a dev release
- if "-" in version:
- ver, commits, hash = version.split("-")
diff --git a/pkgs/development/python-modules/junitparser/default.nix b/pkgs/development/python-modules/junitparser/default.nix
index 6e8471c8a02c..d476d86775a9 100644
--- a/pkgs/development/python-modules/junitparser/default.nix
+++ b/pkgs/development/python-modules/junitparser/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "junitparser";
- version = "4.0.2";
+ version = "5.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "weiwei";
repo = "junitparser";
tag = version;
- hash = "sha256-+81n5xW9SEE+NZbYKxXu6xupoq4/haUZokVardh43iM=";
+ hash = "sha256-I/bQQPT6b6PTZ9bIlWCQmN/gUWnVIO42xtJh/g7L79A=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/kserve/default.nix b/pkgs/development/python-modules/kserve/default.nix
index e0503d4b0f23..ecfb16deb689 100644
--- a/pkgs/development/python-modules/kserve/default.nix
+++ b/pkgs/development/python-modules/kserve/default.nix
@@ -24,6 +24,7 @@
prometheus-client,
protobuf,
psutil,
+ pyasn1,
pydantic,
python-dateutil,
python-multipart,
@@ -59,7 +60,7 @@
buildPythonPackage (finalAttrs: {
pname = "kserve";
- version = "0.18.0";
+ version = "0.19.0";
pyproject = true;
__structuredAttrs = true;
@@ -67,7 +68,7 @@ buildPythonPackage (finalAttrs: {
owner = "kserve";
repo = "kserve";
tag = "v${finalAttrs.version}";
- hash = "sha256-qmv6DzYA/c/uGS4LNTdn3PnzhtLrhprF6r9ccngsUTU=";
+ hash = "sha256-i8eFdXwNLPTdEj2MnNAMbefxQGkMLHNwZXxg8+zv6v0=";
};
sourceRoot = "${finalAttrs.src.name}/python/kserve";
@@ -106,6 +107,7 @@ buildPythonPackage (finalAttrs: {
prometheus-client
protobuf
psutil
+ pyasn1
pydantic
python-dateutil
python-multipart
diff --git a/pkgs/development/python-modules/libbs/default.nix b/pkgs/development/python-modules/libbs/default.nix
index cf4a3b03e00b..dc7b832bb670 100644
--- a/pkgs/development/python-modules/libbs/default.nix
+++ b/pkgs/development/python-modules/libbs/default.nix
@@ -3,15 +3,13 @@
buildPythonPackage,
fetchFromGitHub,
filelock,
- ghidra-bridge,
- jfx-bridge,
networkx,
platformdirs,
ply,
prompt-toolkit,
psutil,
pycparser,
- pyhidra,
+ pyghidra,
pytestCheckHook,
setuptools,
toml,
@@ -28,7 +26,7 @@ let
hash = "sha256-P7+BTJgdC9W8cC/7xQduFYllF+0ds1dSlm59/BFvZ2g=";
};
in
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
pname = "libbs";
version = "3.3.0";
pyproject = true;
@@ -36,7 +34,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "binsync";
repo = "libbs";
- tag = "v${version}";
+ tag = "v${finalAttrs.version}";
hash = "sha256-Xe47JZPkbROHFlqc2o/htqvZWjknsv5KekJBqXA44O4=";
};
@@ -44,15 +42,13 @@ buildPythonPackage rec {
dependencies = [
filelock
- ghidra-bridge
- jfx-bridge
networkx
platformdirs
ply
prompt-toolkit
psutil
pycparser
- pyhidra
+ pyghidra
toml
tqdm
];
@@ -81,8 +77,8 @@ buildPythonPackage rec {
meta = {
description = "Library for writing plugins in any decompiler: includes API lifting, common data formatting, and GUI abstraction";
homepage = "https://github.com/binsync/libbs";
- changelog = "https://github.com/binsync/libbs/releases/tag/${src.tag}";
+ changelog = "https://github.com/binsync/libbs/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [ scoder12 ];
};
-}
+})
diff --git a/pkgs/development/python-modules/libknot/default.nix b/pkgs/development/python-modules/libknot/default.nix
index f03fb728feae..61011013734f 100644
--- a/pkgs/development/python-modules/libknot/default.nix
+++ b/pkgs/development/python-modules/libknot/default.nix
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "libknot";
- version = "3.5.4";
+ version = "3.5.5";
pyproject = true;
src = fetchPypi {
inherit pname version;
- hash = "sha256-pwXOlz5oxtDOkUXWcqTSwPc9BeYaikG4E7qJ4rbVsAk=";
+ hash = "sha256-zv8N2Nmk+9BK2U6kfqV+tVoJDQXXZ9vgV+jEYDAYN3g=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/llama-cloud/default.nix b/pkgs/development/python-modules/llama-cloud/default.nix
index d909e9f6a398..db6c820a0cd8 100644
--- a/pkgs/development/python-modules/llama-cloud/default.nix
+++ b/pkgs/development/python-modules/llama-cloud/default.nix
@@ -25,13 +25,13 @@
buildPythonPackage (finalAttrs: {
pname = "llama-cloud";
- version = "2.8.0";
+ version = "2.9.0";
pyproject = true;
src = fetchPypi {
pname = "llama_cloud";
inherit (finalAttrs) version;
- hash = "sha256-7hPs2yySQ2PrECOkNhnb0HLhgsWW7VwpK4pclbAaDOU=";
+ hash = "sha256-yNRVw2Vdelkpn3N7lmhyEpRGi76LPyL3pAsbF16oUcU=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/low-index/default.nix b/pkgs/development/python-modules/low-index/default.nix
index c753e78d2ff5..6bd1711c40ee 100644
--- a/pkgs/development/python-modules/low-index/default.nix
+++ b/pkgs/development/python-modules/low-index/default.nix
@@ -4,18 +4,19 @@
buildPythonPackage,
fetchFromGitHub,
setuptools,
+ nix-update-script,
}:
buildPythonPackage rec {
pname = "low-index";
- version = "1.2.1";
+ version = "1.3";
pyproject = true;
src = fetchFromGitHub {
owner = "3-manifolds";
repo = "low_index";
tag = "v${version}_as_released";
- hash = "sha256-T8hzC9ulikQ1pUdbXgjuKAX5oMJEycPvXWv74rCkQGY=";
+ hash = "sha256-m3p05bqu70pMOsb9drW1B6+N893eBSZBFTNNS23OY6w=";
};
build-system = [ setuptools ];
@@ -28,6 +29,13 @@ buildPythonPackage rec {
runHook postCheck
'';
+ passthru.updateScript = nix-update-script {
+ extraArgs = [
+ "--version-regex"
+ "v(.*)_as_released"
+ ];
+ };
+
meta = {
description = "Enumerates low index subgroups of a finitely presented group";
changelog = "https://github.com/3-manifolds/low_index/releases/tag/${src.tag}";
diff --git a/pkgs/development/python-modules/mace-torch/default.nix b/pkgs/development/python-modules/mace-torch/default.nix
new file mode 100644
index 000000000000..3c8b486f643b
--- /dev/null
+++ b/pkgs/development/python-modules/mace-torch/default.nix
@@ -0,0 +1,138 @@
+{
+ lib,
+ stdenv,
+ buildPythonPackage,
+ fetchFromGitHub,
+
+ # build-system
+ setuptools,
+
+ # dependencies
+ ase,
+ configargparse,
+ e3nn,
+ gitpython,
+ h5py,
+ lmdb,
+ matplotlib,
+ matscipy,
+ numpy,
+ opt-einsum,
+ orjson,
+ pandas,
+ prettytable,
+ python-hostlist,
+ pyyaml,
+ torch,
+ torch-ema,
+ torchmetrics,
+ tqdm,
+
+ # tests
+ pytestCheckHook,
+ writableTmpDirAsHomeHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+ pname = "mace-torch";
+ version = "0.3.16";
+ pyproject = true;
+ __structuredAttrs = true;
+
+ src = fetchFromGitHub {
+ owner = "acesuit";
+ repo = "mace";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-sJ/3c7kPe99vkliixUMqqQi2OiL3CCUdlcgpDZ/PUHA=";
+ };
+
+ build-system = [
+ setuptools
+ ];
+
+ pythonRelaxDeps = [
+ "e3nn"
+ ];
+ dependencies = [
+ ase
+ configargparse
+ e3nn
+ gitpython
+ h5py
+ lmdb
+ matplotlib
+ matscipy
+ numpy
+ opt-einsum
+ orjson
+ pandas
+ prettytable
+ python-hostlist
+ pyyaml
+ torch
+ torch-ema
+ torchmetrics
+ tqdm
+ ];
+
+ pythonImportsCheck = [ "mace" ];
+
+ nativeCheckInputs = [
+ pytestCheckHook
+ writableTmpDirAsHomeHook
+ ];
+
+ disabledTests = [
+ # _pickle.PickleError: ScriptFunction cannot be pickled
+ "test_run_eval_fail_with_wrong_model"
+
+ # ValueError: too many values to unpack (expected 2)
+ "test_mace_mp"
+
+ # AssertionError (tensors not close)
+ "test_run_train_dipole"
+ "test_run_train_dipole_polar"
+
+ # RuntimeError: Model download failed and no local model found
+ "test_calculator_descriptor"
+ "test_compile_foundation"
+ "test_extract_config"
+ "test_finite_difference_hessian"
+ "test_foundations"
+ "test_initial_metrics_replay_head_mh0"
+ "test_initial_metrics_replay_head_mh1"
+ "test_initial_metrics_replay_head_omol"
+ "test_mace_mh_1_elements_subset_reproduces_energy_forces"
+ "test_mace_mp_energies"
+ "test_mace_mp_stresses"
+ "test_mace_off"
+ "test_mace_omol_elements_subset_reproduces_energy_forces"
+ "test_multi_reference"
+ "test_multihead_finetuning_different_formats"
+ "test_multihead_finetuning_does_not_modify_default_keyspec"
+ "test_potential_energy_and_hessian"
+ "test_remove_pt_head_omol_multihead"
+ "test_run_train_foundation"
+ "test_run_train_foundation_elements"
+ "test_run_train_foundation_elements_multihead"
+ "test_run_train_foundation_multihead"
+ "test_run_train_foundation_multihead_json"
+ "test_run_train_foundation_multihead_pseudolabeling"
+ "test_run_train_freeze"
+ "test_run_train_mh_foundation"
+ "test_run_train_soft_freeze"
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ # symbol not found in flat namespace '___kmpc_barrier'
+ "test_mace"
+ "test_mace_compile_stress"
+ ];
+
+ meta = {
+ description = "Fast and accurate machine learning interatomic potentials with higher order equivariant message passing";
+ homepage = "https://github.com/acesuit/mace";
+ changelog = "https://github.com/acesuit/mace/releases/tag/${finalAttrs.src.tag}";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ GaetanLepage ];
+ };
+})
diff --git a/pkgs/development/python-modules/matscipy/default.nix b/pkgs/development/python-modules/matscipy/default.nix
new file mode 100644
index 000000000000..9183f200e54d
--- /dev/null
+++ b/pkgs/development/python-modules/matscipy/default.nix
@@ -0,0 +1,186 @@
+{
+ lib,
+ stdenv,
+ buildPythonPackage,
+ fetchFromGitHub,
+ pythonAtLeast,
+
+ fetchpatch,
+
+ # build-system
+ meson-python,
+ ninja,
+ numpy,
+
+ # dependencies
+ ase,
+ packaging,
+ scipy,
+
+ # optional-dependencies
+ # cli:
+ argcomplete,
+ # dislocation:
+ atomman,
+ nglview,
+ ovito,
+ # docs:
+ jupytext,
+ myst-nb,
+ numpydoc,
+ pydata-sphinx-theme,
+ sphinx,
+ sphinx-copybutton,
+ sphinx-rtd-theme,
+ sphinxcontrib-spelling,
+
+ # tests
+ pytest-subtests,
+ pytest-timeout,
+ pytest-xdist,
+ sympy,
+
+ # tests
+ pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+ pname = "matscipy";
+ version = "1.2.0";
+ pyproject = true;
+ __structuredAttrs = true;
+
+ src = fetchFromGitHub {
+ owner = "libAtoms";
+ repo = "matscipy";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-XmY13B5S8tXYiUaec9gL6e0E3bSnbaMteHHiX2ij2sw=";
+ };
+
+ patches = [
+ # API: Fix compatibility with ASE 3.27.0
+ # https://github.com/libAtoms/matscipy/pull/301
+ (fetchpatch {
+ url = "https://github.com/libAtoms/matscipy/commit/6a91a4646e30796abe51ef3efa4b479d4471aae0.patch";
+ hash = "sha256-PH9I+7+nN6fSkugVbxPCs3LqjhP/fQ5NZjiNQ7F70YU=";
+ })
+ (fetchpatch {
+ url = "https://github.com/libAtoms/matscipy/commit/f6478347bbceeab8ec177042b6ed1243e742d55f.patch";
+ hash = "sha256-DKk+1TlP+OngcmycsCIE+7s2h/7wa7Gxv9APbuIAoZg=";
+ })
+ ];
+
+ postPatch =
+ # Otherwise the script fails as it can't resolve the version with git
+ ''
+ substituteInPlace discover_version.py \
+ --replace-fail \
+ "version = get_version_from_git()" \
+ "version = '${finalAttrs.version}'"
+ ''
+ # Failed: [pytest] section in setup.cfg files is no longer supported, change to [tool:pytest] instead.
+ + ''
+ substituteInPlace setup.cfg \
+ --replace-fail \
+ "[pytest]" \
+ "[tool:pytest]"
+ '';
+
+ build-system = [
+ # meson
+ meson-python
+ ninja
+ numpy
+ ];
+
+ dependencies = [
+ ase
+ numpy
+ packaging
+ scipy
+ ];
+
+ optional-dependencies = {
+ cli = [
+ argcomplete
+ ];
+ dislocation = [
+ atomman
+ nglview
+ ovito
+ ];
+ docs = [
+ jupytext
+ # matscipy
+ myst-nb
+ numpydoc
+ pydata-sphinx-theme
+ sphinx
+ sphinx-copybutton
+ sphinx-rtd-theme
+ sphinxcontrib-spelling
+ ];
+ };
+
+ pythonImportsCheck = [ "matscipy" ];
+
+ nativeCheckInputs = [
+ pytest-subtests
+ pytest-timeout
+ pytest-xdist
+ pytestCheckHook
+ sympy
+ ];
+
+ preCheck = ''
+ rm -rf matscipy
+ '';
+
+ disabledTestPaths = [
+ # The CLI tests look for the source scripts under `../matscipy/cli` relative to the test
+ # directory, which we remove in `preCheck` so that tests run against the installed package.
+ "tests/test_electrochemistry_cli.py"
+ ]
+ ++ lib.optionals (pythonAtLeast "3.14") [
+ # ValueError: cannot resize an array that may be referenced by another object
+ "tests/manybody/test_newmb.py"
+ "tests/test_neighbours.py"
+ ];
+
+ disabledTests = [
+ # Numerical assertion failure
+ "test_birch_constants"
+
+ # numpy 2 / ase 3.28 incompatibilities in matscipy 1.2.0
+ # `ase.phonons` finite-difference reference no longer matches
+ "test_hessian_monoatomic"
+ "test_hessian_amorphous_alloy"
+ "test_hessian_crystalline_alloy"
+
+ # TypeError: only 0-dimensional arrays can be converted to Python scalars
+ "test_eam_read_write"
+
+ # AttributeError: 'Log' object has no attribute 'close'
+ "test_logger"
+ "test_usage"
+ ]
+ ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+ # AssertionError: assert np.False (numerical precision)
+ "test_fixed_line_atoms"
+ ]
+ ++ lib.optionals (pythonAtLeast "3.14") [
+ # ValueError: cannot resize an array that may be referenced by another object
+ "test_harmonic_bond"
+ "test_read_molecules_from_atoms"
+ "test_read_molecules_from_lammps_data"
+ "test_read_write_lammps_data"
+ ];
+
+ meta = {
+ description = "Materials science with Python at the atomic-scale";
+ homepage = "https://github.com/libAtoms/matscipy";
+ changelog = "https://github.com/libAtoms/matscipy/blob/${finalAttrs.src.tag}/ChangeLog.md";
+ license = lib.licenses.lgpl21Only;
+ maintainers = with lib.maintainers; [ GaetanLepage ];
+ };
+})
diff --git a/pkgs/development/python-modules/matter-ble-proxy/default.nix b/pkgs/development/python-modules/matter-ble-proxy/default.nix
index e683b6a5860a..c155dedf829d 100644
--- a/pkgs/development/python-modules/matter-ble-proxy/default.nix
+++ b/pkgs/development/python-modules/matter-ble-proxy/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage (finalAttrs: {
pname = "matter-ble-proxy";
- version = "0.8.0";
+ version = "1.0.0";
pyproject = true;
disabled = pythonOlder "3.12";
@@ -22,7 +22,7 @@ buildPythonPackage (finalAttrs: {
owner = "matter-js";
repo = "matterjs-server";
tag = "v${finalAttrs.version}";
- hash = "sha256-AjCfPovhYKUeU4Xrsh6uL0pPG+ja0n+efFTbwre83m4=";
+ hash = "sha256-c/jhQfenRgE0qHisGM1TOtqWjDy/RcwGa04RE0FzR/U=";
};
sourceRoot = "${finalAttrs.src.name}/python_ble_proxy";
diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix
index 1da37e14a025..5224d46d546a 100644
--- a/pkgs/development/python-modules/ocrmypdf/default.nix
+++ b/pkgs/development/python-modules/ocrmypdf/default.nix
@@ -32,7 +32,7 @@
buildPythonPackage rec {
pname = "ocrmypdf";
- version = "17.5.0";
+ version = "17.6.0";
pyproject = true;
src = fetchFromGitHub {
@@ -45,7 +45,7 @@ buildPythonPackage rec {
postFetch = ''
rm "$out/.git_archival.txt"
'';
- hash = "sha256-t8uczNeuGgFRMToXNn/aX/eXlfeDU5Hgq82gJl9zB1E=";
+ hash = "sha256-D8O1QJm+K1xksIn7lFSZagk8y9UHuY68MiLPYO8UqQw=";
};
patches = [
diff --git a/pkgs/development/python-modules/openslide/default.nix b/pkgs/development/python-modules/openslide/default.nix
index 663c1d30df26..72a60b005b7d 100644
--- a/pkgs/development/python-modules/openslide/default.nix
+++ b/pkgs/development/python-modules/openslide/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "openslide";
- version = "1.4.3";
+ version = "1.4.6";
pyproject = true;
src = fetchFromGitHub {
owner = "openslide";
repo = "openslide-python";
tag = "v${version}";
- hash = "sha256-v8JrZdDwZPtnWYOmvJXbq22k6/MQqMzWweD86Eof0e4=";
+ hash = "sha256-uo1jcfxbx9v9vNQGnzAhO4N/QKQycMh5y4ICWstnZA0=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/opt-einsum-fx/default.nix b/pkgs/development/python-modules/opt-einsum-fx/default.nix
new file mode 100644
index 000000000000..d183970cc557
--- /dev/null
+++ b/pkgs/development/python-modules/opt-einsum-fx/default.nix
@@ -0,0 +1,52 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchFromGitHub,
+
+ # build-system
+ setuptools,
+
+ # dependencies
+ opt-einsum,
+ torch,
+
+ # tests
+ pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+ pname = "opt-einsum-fx";
+ version = "0.1.4";
+ pyproject = true;
+ __structuredAttrs = true;
+
+ src = fetchFromGitHub {
+ owner = "Linux-cpp-lisp";
+ repo = "opt_einsum_fx";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-HamDghqmdX4Q+4zXQvCly588p3TaYFCSnzgEKLVMXSo=";
+ };
+
+ build-system = [
+ setuptools
+ ];
+
+ dependencies = [
+ opt-einsum
+ torch
+ ];
+
+ pythonImportsCheck = [ "opt_einsum_fx" ];
+
+ nativeCheckInputs = [
+ pytestCheckHook
+ ];
+
+ meta = {
+ description = "Einsum optimization using opt_einsum and PyTorch FX graph rewriting";
+ homepage = "https://github.com/Linux-cpp-lisp/opt_einsum_fx";
+ changelog = "https://github.com/Linux-cpp-lisp/opt_einsum_fx/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ GaetanLepage ];
+ };
+})
diff --git a/pkgs/development/python-modules/pinecone-plugin-assistant/default.nix b/pkgs/development/python-modules/pinecone-plugin-assistant/default.nix
index e21032893ab7..9c3e3999bf11 100644
--- a/pkgs/development/python-modules/pinecone-plugin-assistant/default.nix
+++ b/pkgs/development/python-modules/pinecone-plugin-assistant/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "pinecone-plugin-assistant";
- version = "3.0.2";
+ version = "3.0.3";
pyproject = true;
src = fetchPypi {
pname = "pinecone_plugin_assistant";
inherit version;
- hash = "sha256-BBY68oKteJW1gauJ+FDtE55N3OpyAQyt+kxXN1nVyJY=";
+ hash = "sha256-U/VI7eYKldef9I14ZaPQr9Zlztnnd1gnLmK6DGxjvSY=";
};
build-system = [
diff --git a/pkgs/development/python-modules/pipcl/default.nix b/pkgs/development/python-modules/pipcl/default.nix
index 227a4eb5f5da..44a11dfafd3f 100644
--- a/pkgs/development/python-modules/pipcl/default.nix
+++ b/pkgs/development/python-modules/pipcl/default.nix
@@ -7,14 +7,14 @@
buildPythonPackage (finalAttrs: {
pname = "pipcl";
- version = "4";
+ version = "7";
pyproject = true;
src = fetchFromGitHub {
owner = "ArtifexSoftware";
repo = "pipcl";
tag = "v${finalAttrs.version}";
- hash = "sha256-1dTjxMuOFWeK4L+m4dbllNVwV36MmhsICTplfEKIOxk=";
+ hash = "sha256-z7tDWRxEsA0CREP2bjeNYkoS9pgpHL0Cr3wcCyMPIeg=";
};
build-system = [
diff --git a/pkgs/development/python-modules/portion/default.nix b/pkgs/development/python-modules/portion/default.nix
index 7cbe2884f387..effffd8f60bd 100644
--- a/pkgs/development/python-modules/portion/default.nix
+++ b/pkgs/development/python-modules/portion/default.nix
@@ -2,21 +2,29 @@
lib,
buildPythonPackage,
fetchFromGitHub,
+
+ # build-system
hatchling,
+
+ # dependencies
sortedcontainers,
+
+ # tests
+ pytest-benchmark,
pytestCheckHook,
}:
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
pname = "portion";
- version = "2.6.1";
+ version = "2.6.2";
pyproject = true;
+ __structuredAttrs = true;
src = fetchFromGitHub {
owner = "AlexandreDecan";
repo = "portion";
- tag = version;
- hash = "sha256-K4mZn8Fm96ZBBdLTMfM9f1GKDdIrRwDRzk6ObaXSFG4=";
+ tag = finalAttrs.version;
+ hash = "sha256-ns9kUoSufegx0I3ag/KVl68ZviEIRx+zPA+BSWq3k80=";
};
build-system = [ hatchling ];
@@ -25,13 +33,16 @@ buildPythonPackage rec {
pythonImportsCheck = [ "portion" ];
- nativeCheckInputs = [ pytestCheckHook ];
+ nativeCheckInputs = [
+ pytest-benchmark
+ pytestCheckHook
+ ];
meta = {
- description = "Portion, a Python library providing data structure and operations for intervals";
+ description = "Python library providing data structure and operations for intervals";
homepage = "https://github.com/AlexandreDecan/portion";
- changelog = "https://github.com/AlexandreDecan/portion/blob/${src.rev}/CHANGELOG.md";
+ changelog = "https://github.com/AlexandreDecan/portion/blob/${finalAttrs.src.tag}/CHANGELOG.md";
license = lib.licenses.lgpl3;
maintainers = with lib.maintainers; [ GaetanLepage ];
};
-}
+})
diff --git a/pkgs/development/python-modules/protego/default.nix b/pkgs/development/python-modules/protego/default.nix
index a732efb982ac..4da1b264cb29 100644
--- a/pkgs/development/python-modules/protego/default.nix
+++ b/pkgs/development/python-modules/protego/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage (finalAttrs: {
pname = "protego";
- version = "0.6.0";
+ version = "0.6.1";
pyproject = true;
src = fetchFromGitHub {
owner = "scrapy";
repo = "protego";
tag = finalAttrs.version;
- hash = "sha256-qyOY35gNFojewFMFVT58k1s5uM4j9IZzEURnPh+3htE=";
+ hash = "sha256-Me+bSJnHHJH0ryPoSS7EN2Px5FNElCWQzvKrmWll4mQ=";
};
build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/pydroplet/default.nix b/pkgs/development/python-modules/pydroplet/default.nix
index e31c9ab1f77e..a263d417eb9d 100644
--- a/pkgs/development/python-modules/pydroplet/default.nix
+++ b/pkgs/development/python-modules/pydroplet/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "pydroplet";
- version = "2.3.4";
+ version = "2.4.0";
pyproject = true;
src = fetchFromGitHub {
owner = "Hydrific";
repo = "pydroplet";
tag = "v${version}";
- hash = "sha256-cVftXG7sKDpGRRb2jLlFxgCH2+rA6hLYTUqWL1kvh+E=";
+ hash = "sha256-XLosly9Zyvp3Mfvj0mPORYJBNBkt8JPjlHuvHinZ39w=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pyenvisalink/default.nix b/pkgs/development/python-modules/pyenvisalink/default.nix
index b2e4af32a754..50832ddd3707 100644
--- a/pkgs/development/python-modules/pyenvisalink/default.nix
+++ b/pkgs/development/python-modules/pyenvisalink/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage (finalAttrs: {
pname = "pyenvisalink";
- version = "4.9";
+ version = "4.10";
pyproject = true;
src = fetchPypi {
inherit (finalAttrs) pname version;
- hash = "sha256-WtBopLUCArWM4JwA517bnYidfOwqU3v7ApZCbsMuY/o=";
+ hash = "sha256-V/Sr49e78CO4tBRKkKMQ1Z8bA6/YeEVHdoPx2KY7+mI=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pyghmi/default.nix b/pkgs/development/python-modules/pyghmi/default.nix
index 31d8a4fce4c3..f48c56f9ff99 100644
--- a/pkgs/development/python-modules/pyghmi/default.nix
+++ b/pkgs/development/python-modules/pyghmi/default.nix
@@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "pyghmi";
- version = "1.6.16";
+ version = "1.6.17";
pyproject = true;
src = fetchPypi {
inherit pname version;
- hash = "sha256-VqMQ54Mx9fkq3UAbzEApzm0LuRKEGXQARf8HGH7yZ6U=";
+ hash = "sha256-+MkEYEzmT5744sVCEVQxb+cfAIed7m+nPndYpF5r/h0=";
};
build-system = [
diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix
index 0d793e367bf8..ca497efe8206 100644
--- a/pkgs/development/python-modules/pygit2/default.nix
+++ b/pkgs/development/python-modules/pygit2/default.nix
@@ -15,12 +15,12 @@
buildPythonPackage rec {
pname = "pygit2";
- version = "1.19.1";
+ version = "1.19.3";
pyproject = true;
src = fetchPypi {
inherit pname version;
- hash = "sha256-MWX3hKrlajCaJ9jurnkj1T2i6PYJQwjH9bQo3uySXPk=";
+ hash = "sha256-pUPm1Ou0OCVWSTV1jcI053ABb+1nO4Q3DUaulYBViDE=";
};
preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
diff --git a/pkgs/development/python-modules/pyhidra/default.nix b/pkgs/development/python-modules/pyhidra/default.nix
deleted file mode 100644
index 0afc76e3e63c..000000000000
--- a/pkgs/development/python-modules/pyhidra/default.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{
- lib,
- buildPythonPackage,
- fetchFromGitHub,
- jpype1,
- pytest-datadir,
- pytestCheckHook,
- setuptools,
-}:
-
-buildPythonPackage rec {
- pname = "pyhidra";
- version = "1.3.0";
- pyproject = true;
-
- src = fetchFromGitHub {
- owner = "dod-cyber-crime-center";
- repo = "pyhidra";
- tag = version;
- hash = "sha256-8xouU+S7Apy1ySIlvOLPerTApqKy/MNdl9vuBdt+9Vk=";
- };
-
- build-system = [ setuptools ];
-
- dependencies = [ jpype1 ];
-
- nativeCheckInputs = [
- pytest-datadir
- pytestCheckHook
- ];
-
- pythonImportsCheck = [ "pyhidra" ];
-
- disabledTests = [
- # Tests require a running Ghidra instance
- "test_invalid_jpype_keyword_arg"
- "test_invalid_vm_arg_succeed"
- "test_run_script"
- "test_open_program"
- "test_no_compiler"
- "test_no_language_with_compiler"
- "test_loader"
- "test_invalid_loader_type"
- "test_no_project"
- "test_no_program"
- "test_import_script"
- "test_import_ghidra_base_java_packages"
- ];
-
- meta = {
- description = "Provides direct access to the Ghidra API within a native CPython interpreter using jpype";
- homepage = "https://github.com/dod-cyber-crime-center/pyhidra";
- changelog = "https://github.com/dod-cyber-crime-center/pyhidra/blob/${src.tag}/CHANGELOG.md";
- license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ scoder12 ];
- };
-}
diff --git a/pkgs/development/python-modules/pysdl3/default.nix b/pkgs/development/python-modules/pysdl3/default.nix
index dbe183eb4368..86d8d5d637a9 100644
--- a/pkgs/development/python-modules/pysdl3/default.nix
+++ b/pkgs/development/python-modules/pysdl3/default.nix
@@ -19,11 +19,11 @@
let
dochash =
if stdenv.hostPlatform.isLinux then
- "sha256-ldx6r0KKNl1mkohTkaEG4rawf4VjHeJvNUdPkmrAkYA="
+ "sha256-7Uc1kfbfizpRmAr5h3rpTX565wvbZfbbbYcJh9s96DY="
else if stdenv.hostPlatform.isDarwin then
- "sha256-ga0ebb9zIPI5+Qza8APs0kbCxUIxqCmXRO/R8uWASOg="
+ "sha256-gumVIn/st/mgdPpQA/BLZD0sI5qLf1EJRQ90rKLXjvQ="
else if stdenv.hostPlatform.isWindows then
- "sha256-bBwETA9/ph0zXVNad9zMkQvfq1MmFJ08tCV+mUPwlXQ="
+ "sha256-55Ti6HUzlptSf9ozaz0kmYMz+6EAcOcnZ0R64rZYISY="
else
throw "PySDL3 does not support ${stdenv.hostPlatform.uname.system}";
lib_ext = stdenv.hostPlatform.extensions.sharedLibrary;
@@ -96,7 +96,10 @@ buildPythonPackage rec {
description = "Pure Python wrapper for SDL3";
homepage = "https://github.com/Aermoss/PySDL3";
license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ jansol ];
+ maintainers = with lib.maintainers; [
+ jansol
+ alfarel
+ ];
platforms = [
"aarch64-linux"
"x86_64-linux"
diff --git a/pkgs/development/python-modules/pysmart/default.nix b/pkgs/development/python-modules/pysmart/default.nix
index b0500ba8b982..19c133de0789 100644
--- a/pkgs/development/python-modules/pysmart/default.nix
+++ b/pkgs/development/python-modules/pysmart/default.nix
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "pysmart";
- version = "1.4.2";
+ version = "1.4.3";
pyproject = true;
src = fetchFromGitHub {
owner = "truenas";
repo = "py-SMART";
tag = "v${version}";
- hash = "sha256-h9FBAoNYLs5XvLxSajyktCCcNgiT7mIp472C+fbqZFA=";
+ hash = "sha256-A3SqSo7dUiHB3twlVxNb+7CWki1AZdxlYMQWDwCb9QQ=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/pytest-subtests/default.nix b/pkgs/development/python-modules/pytest-subtests/default.nix
new file mode 100644
index 000000000000..d4b98e40e5c3
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-subtests/default.nix
@@ -0,0 +1,52 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchFromGitHub,
+
+ # build-system
+ setuptools,
+ setuptools-scm,
+
+ # dependencies
+ attrs,
+ pytest,
+}:
+
+buildPythonPackage (finalAttrs: {
+ pname = "pytest-subtests";
+ version = "0.15.0";
+ pyproject = true;
+ __structuredAttrs = true;
+
+ src = fetchFromGitHub {
+ owner = "pytest-dev";
+ repo = "pytest-subtests";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-KJbTxhheEkvH/Xnje45dSb57526bVoi8N6GSKfUfCYA=";
+ };
+
+ build-system = [
+ setuptools
+ setuptools-scm
+ ];
+
+ dependencies = [
+ attrs
+ pytest
+ ];
+
+ pythonImportsCheck = [ "pytest_subtests" ];
+
+ # The self-tests assert on exact pytest terminal output. pytest 9 ships its
+ # own bundled subtests support and changed how subtest failures are reported,
+ # so these output-matching tests no longer match. The plugin itself works.
+ doCheck = false;
+
+ meta = {
+ description = "Unittest subTest() support and subtests fixture";
+ homepage = "https://github.com/pytest-dev/pytest-subtests";
+ changelog = "https://github.com/pytest-dev/pytest-subtests/blob/${finalAttrs.src.tag}/CHANGELOG.rst";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ GaetanLepage ];
+ };
+})
diff --git a/pkgs/development/python-modules/python-hostlist/default.nix b/pkgs/development/python-modules/python-hostlist/default.nix
new file mode 100644
index 000000000000..3de14c209422
--- /dev/null
+++ b/pkgs/development/python-modules/python-hostlist/default.nix
@@ -0,0 +1,39 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchurl,
+
+ # build-system
+ setuptools,
+
+ # tests
+ pytestCheckHook,
+}:
+buildPythonPackage (finalAttrs: {
+ pname = "python-hostlist";
+ version = "2.3.0";
+ pyproject = true;
+ __structuredAttrs = true;
+
+ src = fetchurl {
+ url = "https://www.nsc.liu.se/~kent/python-hostlist/python_hostlist-${finalAttrs.version}.tar.gz";
+ hash = "sha256-4aCxjlJaX8pXPLmGJ5nxGz8r07p67HDE7Ni5U0G7ceo=";
+ };
+
+ build-system = [
+ setuptools
+ ];
+
+ pythonImportsCheck = [ "hostlist" ];
+
+ nativeCheckInputs = [
+ pytestCheckHook
+ ];
+
+ meta = {
+ description = "Python module for hostlist handling";
+ homepage = "https://www.nsc.liu.se/~kent/python-hostlist/";
+ license = lib.licenses.gpl3Plus;
+ maintainers = with lib.maintainers; [ GaetanLepage ];
+ };
+})
diff --git a/pkgs/development/python-modules/qemu-qmp/default.nix b/pkgs/development/python-modules/qemu-qmp/default.nix
index d4acf9e0a058..5d0e925fbc58 100644
--- a/pkgs/development/python-modules/qemu-qmp/default.nix
+++ b/pkgs/development/python-modules/qemu-qmp/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "qemu-qmp";
- version = "0.0.5";
+ version = "0.0.6";
pyproject = true;
src = fetchFromGitLab {
owner = "qemu-project";
repo = "python-qemu-qmp";
tag = "v${version}";
- hash = "sha256-Mpay8JIau3cuUDxtEVn78prilr+YncmtbVX5LkBDrvk=";
+ hash = "sha256-iuYiYjUfAxXzG7w7s8I2l5oXROyTjswn++vYs9lauGA=";
};
build-system = [
diff --git a/pkgs/development/python-modules/raylib-python-cffi/default.nix b/pkgs/development/python-modules/raylib-python-cffi/default.nix
index 3f4160960c29..659109475bec 100644
--- a/pkgs/development/python-modules/raylib-python-cffi/default.nix
+++ b/pkgs/development/python-modules/raylib-python-cffi/default.nix
@@ -16,14 +16,14 @@
buildPythonPackage (finalAttrs: {
pname = "raylib-python-cffi";
- version = "5.5.0.4";
+ version = "6.0.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "electronstudio";
repo = "raylib-python-cffi";
tag = "v${finalAttrs.version}";
- hash = "sha256-MKyTpGnup4QmRui2OVBpnyn9KENATWcwYcikOmYX4c8=";
+ hash = "sha256-9eN3H62gYDloMHbJbTFiO3acif3GJuTkk4CWltzBOXg=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/rf-protocols/default.nix b/pkgs/development/python-modules/rf-protocols/default.nix
index 38d3063dd3bb..089bc108991e 100644
--- a/pkgs/development/python-modules/rf-protocols/default.nix
+++ b/pkgs/development/python-modules/rf-protocols/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage (finalAttrs: {
pname = "rf-protocols";
- version = "4.0.1";
+ version = "4.2.0";
pyproject = true;
src = fetchFromGitHub {
owner = "home-assistant-libs";
repo = "rf-protocols";
tag = finalAttrs.version;
- hash = "sha256-kO53S3MCYD6MUpRwhgP8cD2S0j38WKR6Bik5CXSaq3w=";
+ hash = "sha256-F0pvEg+Cns3czK/yI6M0hpgRpk67jUgRKqgzCBYmgUY=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/scalar-fastapi/default.nix b/pkgs/development/python-modules/scalar-fastapi/default.nix
index 78a68b2cc8e6..58349c71b6d4 100644
--- a/pkgs/development/python-modules/scalar-fastapi/default.nix
+++ b/pkgs/development/python-modules/scalar-fastapi/default.nix
@@ -1,7 +1,7 @@
{
lib,
buildPythonPackage,
- fetchPypi,
+ fetchFromGitHub,
# build-system
setuptools,
@@ -23,14 +23,18 @@
buildPythonPackage rec {
pname = "scalar-fastapi";
- version = "1.6.1";
+ version = "1.8.2";
pyproject = true;
- src = fetchPypi {
+ src = fetchFromGitHub {
+ owner = "scalar";
+ repo = "scalar";
pname = "scalar_fastapi";
- inherit version;
- hash = "sha256-XTzJbw84TTiLWKuldqkDuQfjyY2sqxM5ByIQ6UbE8DM=";
+ # The commit changed integrations/fastapi/package.json which defines version number
+ rev = "0f4bd9da2706be09a8afba017465f55a62dc0975";
+ hash = "sha256-FvbRsLEfdG2fqg14xXG0K1nn8+qX/Co9Sy2EOM0DTlg=";
};
+ sourceRoot = "${src.name}/integrations/fastapi";
build-system = [
setuptools
diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix
index 19f9a8376396..7de0016c5fa1 100644
--- a/pkgs/development/python-modules/streamlit/default.nix
+++ b/pkgs/development/python-modules/streamlit/default.nix
@@ -2,12 +2,15 @@
lib,
stdenv,
altair,
+ anyio,
blinker,
buildPythonPackage,
cachetools,
click,
fetchPypi,
gitpython,
+ httptools,
+ itsdangerous,
numpy,
packaging,
pandas,
@@ -15,24 +18,28 @@
protobuf,
pyarrow,
pydeck,
- setuptools,
+ python-multipart,
requests,
rich,
+ setuptools,
+ starlette,
tenacity,
toml,
tornado,
typing-extensions,
+ uvicorn,
watchdog,
+ websockets,
}:
buildPythonPackage (finalAttrs: {
pname = "streamlit";
- version = "1.55.0";
+ version = "1.58.0";
pyproject = true;
src = fetchPypi {
inherit (finalAttrs) pname version;
- hash = "sha256-AV5RK70C0AD0BH5REY3AhrcOfZxGtKEaM8JQlzE3liY=";
+ hash = "sha256-eKIucIWwU6985UREK/S2cHceaMUJuhvaoFa6Bwj0nD0=";
};
build-system = [ setuptools ];
@@ -44,23 +51,30 @@ buildPythonPackage (finalAttrs: {
dependencies = [
altair
+ anyio
blinker
cachetools
click
+ gitpython
+ httptools
+ itsdangerous
numpy
packaging
pandas
pillow
protobuf
pyarrow
+ pydeck
+ python-multipart
requests
rich
+ starlette
tenacity
toml
- typing-extensions
- gitpython
- pydeck
tornado
+ typing-extensions
+ uvicorn
+ websockets
]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ watchdog ];
diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix
index b28502734bd4..be52a3357bf8 100644
--- a/pkgs/development/python-modules/sunpy/default.nix
+++ b/pkgs/development/python-modules/sunpy/default.nix
@@ -60,14 +60,15 @@
buildPythonPackage (finalAttrs: {
pname = "sunpy";
- version = "7.1.0";
+ version = "7.1.2";
pyproject = true;
+ __structuredAttrs = true;
src = fetchFromGitHub {
owner = "sunpy";
repo = "sunpy";
tag = "v${finalAttrs.version}";
- hash = "sha256-FeKmg3dZfbbjt1lDliF4uXf8PvM3J5HWtYqKRriJ4l0=";
+ hash = "sha256-saq3vYJMKogXSBxKn/tqlSnE96K10EM27femC+Qx0Gw=";
};
build-system = [
@@ -179,6 +180,10 @@ buildPythonPackage (finalAttrs: {
"test_main_submodule_map"
"test_tai_seconds"
"test_utime"
+
+ # AssertionError: assert 2 == 1
+ # where 2 = len(WarningsChecker(record=True))
+ "test_sunpy_warnings_logging"
];
disabledTestPaths = [
diff --git a/pkgs/development/python-modules/symbolic/default.nix b/pkgs/development/python-modules/symbolic/default.nix
index 1dd6a24790c6..bcc2b224335a 100644
--- a/pkgs/development/python-modules/symbolic/default.nix
+++ b/pkgs/development/python-modules/symbolic/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage (finalAttrs: {
pname = "symbolic";
- version = "13.1.1";
+ version = "13.2.0";
pyproject = true;
src = fetchFromGitHub {
@@ -23,12 +23,12 @@ buildPythonPackage (finalAttrs: {
tag = finalAttrs.version;
# the `py` directory is not included in the tarball, so we fetch the source via git instead
forceFetchGit = true;
- hash = "sha256-nrEWnjMyp4KKBcdcqN0uWHIV59RHN+rJWzvJLznvh20=";
+ hash = "sha256-Nks8CClNENRFBbEGgFP3yhi5sWR/iiaLOdTayPD7M9k=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
- hash = "sha256-9yO+Y5Oxsfa/AM54TQTCEvnHr33L7/gh1q+hQq9iP3s=";
+ hash = "sha256-r+9mrGyr78UenC9BFpW1a+VjEAXgcamLOoI8V1N10Cg=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/torch-ema/default.nix b/pkgs/development/python-modules/torch-ema/default.nix
new file mode 100644
index 000000000000..a81ee06f9a19
--- /dev/null
+++ b/pkgs/development/python-modules/torch-ema/default.nix
@@ -0,0 +1,58 @@
+{
+ lib,
+ stdenv,
+ buildPythonPackage,
+ fetchFromGitHub,
+
+ # build-system
+ setuptools,
+
+ # dependencies
+ torch,
+
+ # tests
+ pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+ pname = "torch-ema";
+ version = "0.3.0";
+ pyproject = true;
+ __structuredAttrs = true;
+
+ src = fetchFromGitHub {
+ owner = "fadel";
+ repo = "pytorch_ema";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-OOF5Lb3HEIBXc1WXoUp7y44pheDc5oX/7L1vTrwNS2o=";
+ };
+
+ build-system = [
+ setuptools
+ ];
+
+ dependencies = [
+ torch
+ ];
+
+ pythonImportsCheck = [ "torch_ema" ];
+
+ nativeCheckInputs = [
+ pytestCheckHook
+ ];
+
+ disabledTests = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+ # aarch64-linux fails cpuinfo test, because /sys/devices/system/cpu/ does not exist in the sandbox:
+ # RuntimeError: Failed to initialize cpuinfo!
+ "test_state_dict_types"
+ "test_to"
+ ];
+
+ meta = {
+ description = "Tiny PyTorch library for maintaining a moving average of a collection of parameters";
+ homepage = "https://github.com/fadel/pytorch_ema";
+ changelog = "https://github.com/fadel/pytorch_ema/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ GaetanLepage ];
+ };
+})
diff --git a/pkgs/development/python-modules/torchao/default.nix b/pkgs/development/python-modules/torchao/default.nix
index 3edd4c19fe7e..ae20677483af 100644
--- a/pkgs/development/python-modules/torchao/default.nix
+++ b/pkgs/development/python-modules/torchao/default.nix
@@ -325,6 +325,7 @@ buildPythonPackage (finalAttrs: {
# TypeError: Trying to convert Float8_e4m3fn to the MPS backend but it does not have support for that dtype.
"test/quantization/quantize_/workflows/float8/test_float8_tensor.py"
+ "test/test_low_bit_optim.py::TestOptim::test_subclass_appearance_dtype_subclass2_device_mps"
# AssertionError: Torch not compiled with CUDA enabled
"test/integration/test_integration.py"
diff --git a/pkgs/development/python-modules/torchio/default.nix b/pkgs/development/python-modules/torchio/default.nix
index dae3f9f232a2..8f81347ae7d0 100644
--- a/pkgs/development/python-modules/torchio/default.nix
+++ b/pkgs/development/python-modules/torchio/default.nix
@@ -37,14 +37,14 @@
buildPythonPackage rec {
pname = "torchio";
- version = "1.2.0";
+ version = "1.2.1";
pyproject = true;
src = fetchFromGitHub {
owner = "TorchIO-project";
repo = "torchio";
tag = "v${version}";
- hash = "sha256-GFHTVBt77zcJ3YSldHCpHCPG1MINpvAZWVibRfJRoWk=";
+ hash = "sha256-v9mAtwyglY5PsszrIzGSZJ+eEK3ED3v0slai7Vz9WjA=";
};
build-system = [
diff --git a/pkgs/development/python-modules/torchrl/default.nix b/pkgs/development/python-modules/torchrl/default.nix
index 7a8f43834926..43db2040c220 100644
--- a/pkgs/development/python-modules/torchrl/default.nix
+++ b/pkgs/development/python-modules/torchrl/default.nix
@@ -83,7 +83,7 @@ buildPythonPackage (finalAttrs: {
owner = "pytorch";
repo = "rl";
tag = "v${finalAttrs.version}";
- hash = "sha256-S0jfngqmRQwIVGHM72KUnp/TlR2js+QLRpsX6abiv84=";
+ hash = "sha256-xnQLwOofHwdRvrOMNJpAEiOT7BEfxoPmrcxw2H3CTvI=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix
index fd3c517e0442..b1a0125278fa 100644
--- a/pkgs/development/python-modules/types-awscrt/default.nix
+++ b/pkgs/development/python-modules/types-awscrt/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage (finalAttrs: {
pname = "types-awscrt";
- version = "0.33.0";
+ version = "0.34.1";
pyproject = true;
src = fetchPypi {
pname = "types_awscrt";
inherit (finalAttrs) version;
- hash = "sha256-gDvH5+L2FyoKvXHfZZM2j4L8IxJ8oV0ofzYOn8vTqXc=";
+ hash = "sha256-VZqgQlD2pBmmF9+3iPPhCQOq90cA7yPlIbZKQRuDuAM=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/types-urllib3/default.nix b/pkgs/development/python-modules/types-urllib3/default.nix
index 4455be29ee79..98d0f136a4f8 100644
--- a/pkgs/development/python-modules/types-urllib3/default.nix
+++ b/pkgs/development/python-modules/types-urllib3/default.nix
@@ -2,18 +2,23 @@
lib,
buildPythonPackage,
fetchPypi,
+ setuptools,
}:
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
pname = "types-urllib3";
version = "1.26.25.14";
- format = "setuptools";
+ pyproject = true;
+
+ __structuredAttrs = true;
src = fetchPypi {
- inherit pname version;
+ inherit (finalAttrs) pname version;
hash = "sha256-Ipt/V3yVG4wbksG8Ky/bC0mEe9KvbRzCouPdNA872o8=";
};
+ build-system = [ setuptools ];
+
# Module doesn't have tests
doCheck = false;
@@ -25,4 +30,4 @@ buildPythonPackage rec {
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ fab ];
};
-}
+})
diff --git a/pkgs/development/python-modules/victron-mqtt/default.nix b/pkgs/development/python-modules/victron-mqtt/default.nix
index 93cb747c674a..ae19b7e9db66 100644
--- a/pkgs/development/python-modules/victron-mqtt/default.nix
+++ b/pkgs/development/python-modules/victron-mqtt/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage (finalAttrs: {
pname = "victron-mqtt";
- version = "2026.6.1";
+ version = "2026.6.4";
pyproject = true;
src = fetchFromGitHub {
owner = "tomer-w";
repo = "victron_mqtt";
tag = "v${finalAttrs.version}";
- hash = "sha256-0RMXl9T9Mglmg1R4rdhfYp/dhgRh1JJPmMeLOtV2/9E=";
+ hash = "sha256-lKntAZF9SkSBnlLwcwMB9wZz9PviRbSbweTMzwwzExY=";
};
build-system = [
diff --git a/pkgs/development/python-modules/vsts/default.nix b/pkgs/development/python-modules/vsts/default.nix
index e77ab7456ca0..7696690c699a 100644
--- a/pkgs/development/python-modules/vsts/default.nix
+++ b/pkgs/development/python-modules/vsts/default.nix
@@ -3,23 +3,28 @@
lib,
python,
fetchPypi,
+ setuptools,
msrest,
}:
-buildPythonPackage rec {
- version = "0.1.25";
- format = "setuptools";
+buildPythonPackage (finalAttrs: {
pname = "vsts";
+ version = "0.1.25";
+ pyproject = true;
+
+ __structuredAttrs = true;
src = fetchPypi {
- inherit pname version;
- sha256 = "15sgwqa72ynpahj101r2kc15s3dnsafg5gqx0sz3hnqz29h925ys";
+ inherit (finalAttrs) pname version;
+ hash = "sha256-2heRYBIfWzi+Bh2/8pzStg1dApsiBxAkVNd6cRTmT5c=";
};
- propagatedBuildInputs = [ msrest ];
+ build-system = [ setuptools ];
+
+ dependencies = [ msrest ];
postPatch = ''
- substituteInPlace setup.py --replace "msrest>=0.6.0,<0.7.0" "msrest"
+ substituteInPlace setup.py --replace-fail "msrest>=0.6.0,<0.7.0" "msrest"
'';
# Tests are highly impure
@@ -27,10 +32,12 @@ buildPythonPackage rec {
${python.interpreter} -c 'import vsts.version; print(vsts.version.VERSION)'
'';
+ pythonImportsCheck = [ "vsts" ];
+
meta = {
description = "Python APIs for interacting with and managing Azure DevOps";
homepage = "https://github.com/microsoft/azure-devops-python-api";
license = lib.licenses.mit;
maintainers = [ ];
};
-}
+})
diff --git a/pkgs/development/python-modules/ydiff/default.nix b/pkgs/development/python-modules/ydiff/default.nix
index 3e5fc98c2614..d778a8a9804d 100644
--- a/pkgs/development/python-modules/ydiff/default.nix
+++ b/pkgs/development/python-modules/ydiff/default.nix
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
+ setuptools,
pygments,
gitMinimal,
mercurial,
@@ -10,15 +11,17 @@
less,
}:
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
pname = "ydiff";
version = "1.5";
- format = "setuptools";
+ pyproject = true;
+
+ __structuredAttrs = true;
src = fetchFromGitHub {
owner = "ymattw";
repo = "ydiff";
- tag = version;
+ tag = finalAttrs.version;
hash = "sha256-9a7M6+CqGRvO1yainImN2RQVH3XMxE9PTLXJGKekXLg=";
};
@@ -36,6 +39,8 @@ buildPythonPackage rec {
patchShebangs tests/*.sh
'';
+ build-system = [ setuptools ];
+
nativeCheckInputs = [ pygments ];
checkPhase = ''
@@ -44,6 +49,8 @@ buildPythonPackage rec {
runHook postCheck
'';
+ pythonImportsCheck = [ "ydiff" ];
+
meta = {
description = "View colored, incremental diff in workspace or from stdin with side by side and auto pager support (Was \"cdiff\")";
mainProgram = "ydiff";
@@ -60,4 +67,4 @@ buildPythonPackage rec {
despsyched
];
};
-}
+})
diff --git a/pkgs/development/python-modules/yoyo-migrations/default.nix b/pkgs/development/python-modules/yoyo-migrations/default.nix
index 8e22ddc8eb9e..0c5c743144db 100644
--- a/pkgs/development/python-modules/yoyo-migrations/default.nix
+++ b/pkgs/development/python-modules/yoyo-migrations/default.nix
@@ -8,17 +8,21 @@
tabulate,
}:
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
pname = "yoyo-migrations";
version = "8.2.0";
- format = "setuptools";
+ pyproject = true;
+
+ __structuredAttrs = true;
src = fetchPypi {
- inherit pname version;
+ inherit (finalAttrs) pname version;
hash = "sha256-ggYGoD4mLPHNT1niVsKPpEZCUiTVuCo9EnX9eBeFI+Q=";
};
- propagatedBuildInputs = [
+ build-system = [ setuptools ];
+
+ dependencies = [
importlib-metadata
setuptools
sqlparse
@@ -35,4 +39,4 @@ buildPythonPackage rec {
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ prusnak ];
};
-}
+})
diff --git a/pkgs/development/python-modules/yubico-client/default.nix b/pkgs/development/python-modules/yubico-client/default.nix
index cb339c1572cc..f237e955cf9e 100644
--- a/pkgs/development/python-modules/yubico-client/default.nix
+++ b/pkgs/development/python-modules/yubico-client/default.nix
@@ -2,27 +2,34 @@
lib,
buildPythonPackage,
fetchPypi,
+ setuptools,
requests,
}:
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
pname = "yubico-client";
version = "1.13.0";
- format = "setuptools";
+ pyproject = true;
+
+ __structuredAttrs = true;
src = fetchPypi {
- inherit pname version;
- sha256 = "e3b86cd2a123105edfacad40551c7b26e9c1193d81ffe168ee704ebfd3d11162";
+ inherit (finalAttrs) pname version;
+ hash = "sha256-47hs0qEjEF7frK1AVRx7JunBGT2B/+Fo7nBOv9PREWI=";
};
- propagatedBuildInputs = [ requests ];
+ build-system = [ setuptools ];
+
+ dependencies = [ requests ];
# pypi package missing test_utils and github releases is behind
doCheck = false;
+ pythonImportsCheck = [ "yubico_client" ];
+
meta = {
description = "Verifying Yubico OTPs based on the validation protocol version 2.0";
homepage = "https://github.com/Kami/python-yubico-client/";
license = lib.licenses.bsd3;
};
-}
+})
diff --git a/pkgs/development/python-modules/yubico/default.nix b/pkgs/development/python-modules/yubico/default.nix
index 23b9cba70d28..9d2ff41859aa 100644
--- a/pkgs/development/python-modules/yubico/default.nix
+++ b/pkgs/development/python-modules/yubico/default.nix
@@ -2,21 +2,26 @@
lib,
buildPythonPackage,
fetchPypi,
+ setuptools,
pytestCheckHook,
pyusb,
}:
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
pname = "python-yubico";
version = "1.3.3";
- format = "setuptools";
+ pyproject = true;
+
+ __structuredAttrs = true;
src = fetchPypi {
- inherit pname version;
+ inherit (finalAttrs) pname version;
hash = "sha256-2EZkJ6pZIqxdS36cZbaTEIQnz1N9ZT1oyyEsBxPo5vU=";
};
- propagatedBuildInputs = [ pyusb ];
+ build-system = [ setuptools ];
+
+ dependencies = [ pyusb ];
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "yubico" ];
@@ -31,4 +36,4 @@ buildPythonPackage rec {
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [ s1341 ];
};
-}
+})
diff --git a/pkgs/development/python-modules/zigpy-cc/default.nix b/pkgs/development/python-modules/zigpy-cc/default.nix
index 51f8b9c3958a..36b41b0e6ff8 100644
--- a/pkgs/development/python-modules/zigpy-cc/default.nix
+++ b/pkgs/development/python-modules/zigpy-cc/default.nix
@@ -3,16 +3,19 @@
asynctest,
buildPythonPackage,
fetchFromGitHub,
+ setuptools,
pyserial-asyncio,
pytest-asyncio,
pytestCheckHook,
zigpy,
}:
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
pname = "zigpy-cc";
version = "0.5.2";
- format = "setuptools";
+ pyproject = true;
+
+ __structuredAttrs = true;
# https://github.com/Martiusweb/asynctest/issues/152
# broken by upstream python bug with asynctest and
@@ -21,11 +24,13 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "zigpy";
repo = "zigpy-cc";
- rev = version;
- sha256 = "U3S8tQ3zPlexZDt5GvCd+rOv7CBVeXJJM1NGe7nRl2o=";
+ tag = finalAttrs.version;
+ hash = "sha256-U3S8tQ3zPlexZDt5GvCd+rOv7CBVeXJJM1NGe7nRl2o=";
};
- propagatedBuildInputs = [
+ build-system = [ setuptools ];
+
+ dependencies = [
pyserial-asyncio
zigpy
];
@@ -55,4 +60,4 @@ buildPythonPackage rec {
maintainers = with lib.maintainers; [ mvnetbiz ];
platforms = lib.platforms.linux;
};
-}
+})
diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix
index a64c37640a15..ae7e1b01cbe6 100644
--- a/pkgs/development/tools/misc/gdbgui/default.nix
+++ b/pkgs/development/tools/misc/gdbgui/default.nix
@@ -5,15 +5,29 @@
gdb,
}:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication (finalAttrs: {
pname = "gdbgui";
-
version = "0.15.3.0";
- format = "setuptools";
+ pyproject = true;
+
+ __structuredAttrs = true;
+
+ src = fetchPypi {
+ inherit (finalAttrs) pname version;
+ hash = "sha256-/HyFE0JnoN03CDyCQCo/Y9RyH4YOMoeB7khReIb8t7Y=";
+ };
+
+ postPatch = ''
+ echo ${finalAttrs.version} > gdbgui/VERSION.txt
+ # relax version requirements
+ sed -i 's/==.*$//' requirements.txt
+ '';
+
+ build-system = with python3Packages; [ setuptools ];
buildInputs = [ gdb ];
- propagatedBuildInputs = with python3Packages; [
+ dependencies = with python3Packages; [
eventlet
flask-compress
flask-socketio
@@ -21,17 +35,6 @@ python3Packages.buildPythonApplication rec {
pygments
];
- src = fetchPypi {
- inherit pname version;
- hash = "sha256-/HyFE0JnoN03CDyCQCo/Y9RyH4YOMoeB7khReIb8t7Y=";
- };
-
- postPatch = ''
- echo ${version} > gdbgui/VERSION.txt
- # relax version requirements
- sed -i 's/==.*$//' requirements.txt
- '';
-
postInstall = ''
wrapProgram $out/bin/gdbgui \
--prefix PATH : ${lib.makeBinPath [ gdb ]}
@@ -51,4 +54,4 @@ python3Packages.buildPythonApplication rec {
dump_stack
];
};
-}
+})
diff --git a/pkgs/kde/third-party/karousel/default.nix b/pkgs/kde/third-party/karousel/default.nix
index 512c0bc4b900..f338a5be0d0d 100644
--- a/pkgs/kde/third-party/karousel/default.nix
+++ b/pkgs/kde/third-party/karousel/default.nix
@@ -10,19 +10,19 @@
stdenv.mkDerivation (finalAttrs: {
pname = "karousel";
- version = "0.15";
+ version = "0.17";
src = fetchFromGitHub {
owner = "peterfajdiga";
repo = "karousel";
rev = "v${finalAttrs.version}";
- hash = "sha256-pxcKfhQmudxCJ7fwteT+QZrRib03tYZEWiRjmZtVKgQ=";
+ hash = "sha256-qrsdVyeDD4VuGQKzUqxxGt+a4zA6jOI0cSxTSnBkkgQ=";
};
postPatch = ''
patchShebangs run-ts.sh
substituteInPlace Makefile \
- --replace-fail "build: lint tests" "build: tests"
+ --replace-fail "build: lint test" "build: test"
'';
nativeBuildInputs = [
diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix
index 6b61a16d94ab..a597cea10f5d 100644
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@@ -1359,6 +1359,49 @@ in
maintainers = with lib.maintainers; [ szaffarano ];
};
};
+
+ tmux-window-name = mkTmuxPlugin {
+ pluginName = "tmux-window-name";
+ version = "2024-03-08";
+ src = fetchFromGitHub {
+ owner = "ofirgall";
+ repo = "tmux-window-name";
+ rev = "34026b6f442ceb07628bf25ae1b04a0cd475e9ae";
+ sha256 = "sha256-BNgxLk/BkaQkGlB4g2WKVs39y4VHL1Y2TdTEoBy7yo0=";
+ };
+ nativeBuildInputs = [ pkgs.makeWrapper ];
+ rtpFilePath = "tmux_window_name.tmux";
+ postInstall = ''
+ script=$target/scripts/rename_session_windows.py
+
+ sed -i \
+ -e 's|^USR_BIN_REMOVER.*|USR_BIN_REMOVER = (r"^" + os.path.expanduser("~") + r"/.nix-profile/bin/(.+)( --.*)?", r"\\g<1>")|' \
+ -e 's|^\(\s*\)substitute_sets: List.*|\1substitute_sets: List[Tuple] = field(default_factory=lambda: [(os.path.expanduser("~") + r"/.nix-profile/bin/(.+) --.*", r"\\g<1>"), (r".+ipython([32])", r"ipython\\g<1>"), USR_BIN_REMOVER, (r"(bash) (.+)/(.+[ $])(.+)", r"\\g<3>\\g<4>")])|' \
+ -e 's|^\(\s*\)dir_programs: List.*|\1dir_programs: List[str] = field(default_factory=lambda: [os.path.expanduser("~") + "/.nix-profile/bin/" + p for p in ["vim", "vi", "git", "nvim"]])|' \
+ $script
+
+ for f in tmux_window_name.tmux scripts/rename_session_windows.py; do
+ wrapProgram $target/$f \
+ --prefix PATH : ${
+ lib.makeBinPath [
+ (pkgs.python3.withPackages (
+ p: with p; [
+ libtmux
+ pip
+ ]
+ ))
+ ]
+ }
+ done
+ '';
+ meta = with lib; {
+ homepage = "https://github.com/ofirgall/tmux-window-name";
+ description = "Tmux plugin to name your windows smartly, like IDE's";
+ license = licenses.mit;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ ndom91 ];
+ };
+ };
}
// lib.optionalAttrs config.allowAliases {
mkDerivation = throw "tmuxPlugins.mkDerivation is deprecated, use tmuxPlugins.mkTmuxPlugin instead"; # added 2021-03-14
diff --git a/pkgs/os-specific/darwin/by-name/po/PowerManagement/package.nix b/pkgs/os-specific/darwin/by-name/po/PowerManagement/package.nix
index 16e9c572e629..5c64820839a0 100644
--- a/pkgs/os-specific/darwin/by-name/po/PowerManagement/package.nix
+++ b/pkgs/os-specific/darwin/by-name/po/PowerManagement/package.nix
@@ -20,7 +20,7 @@ in
mkAppleDerivation {
releaseName = "PowerManagement";
- xcodeHash = "sha256-cjTF4dR6S55mLwp4GkQhkkNk9sMMKDc/5JTm46Z7/KE=";
+ xcodeHash = "sha256-06rCxqBUrYqBY7BDZ6s/vSoviUAmIbsQP1pfrvR2Gpk=";
env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include";
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index f89fa487bfe2..91bea44bf1a7 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -1420,13 +1420,10 @@ let
DRM_AMDGPU_USERPTR = yes;
# We want to prefer PREEMPT_LAZY when available, and fall back on PREEMPT_VOLUNTARY.
- # It just so happens that kconfig asks for PREEMPT_LAZY first, so doing it like this
- # does what we want.
- # FIXME: This is stupid and bad.
- # See: https://github.com/torvalds/linux/commit/7dadeaa6e851e7d67733f3e24fc53ee107781d0f
+ # The version cutoff is arbitrary, the real cutoff is somewhere around 6.13 depending on target.
PREEMPT = no;
- PREEMPT_LAZY = option yes;
- PREEMPT_VOLUNTARY = option yes;
+ PREEMPT_LAZY = whenAtLeast "6.18" yes;
+ PREEMPT_VOLUNTARY = whenOlder "6.18" yes;
X86_AMD_PLATFORM_DEVICE = lib.mkIf stdenv.hostPlatform.isx86 yes;
X86_PLATFORM_DRIVERS_DELL = lib.mkIf stdenv.hostPlatform.isx86 (whenAtLeast "5.12" yes);
diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl
index 57d3ab739cb6..18d1f2150562 100644
--- a/pkgs/os-specific/linux/kernel/generate-config.pl
+++ b/pkgs/os-specific/linux/kernel/generate-config.pl
@@ -100,7 +100,13 @@ sub runConfig {
elsif ($line =~ /choice\[(.*)\]: ###$/) {
my $answer = "";
foreach my $name (keys %choices) {
- $answer = $choices{$name} if ($answers{$name} || "") eq "y";
+ if (($answers{$name} || "") eq "y") {
+ if ($answer eq "") {
+ $answer = $choices{$name};
+ } else {
+ die "conflicting answers!"
+ }
+ }
}
print STDERR "CHOICE: $1, ANSWER: $answer\n" if $debug;
print OUT "$answer\n" if $1 =~ /-/;
diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index a44bc74bacac..43db58a4181e 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -38,5 +38,10 @@
"version": "7.0.12",
"hash": "sha256:1nk5lans9qg1avmmcwyadfps43d3hyjz9a5gjyvsc77w3sjckvap",
"lts": false
+ },
+ "7.1": {
+ "version": "7.1",
+ "hash": "sha256:18344l5fv3hgsqjrjr3dgg96lll7f294qq11lg40sydygxwl87v9",
+ "lts": false
}
}
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/auto-entities/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/auto-entities/package.nix
index e2d79d248149..2f9ffa7c6451 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/auto-entities/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/auto-entities/package.nix
@@ -6,16 +6,16 @@
buildNpmPackage rec {
pname = "auto-entities";
- version = "2.4.0";
+ version = "2.4.1";
src = fetchFromGitHub {
owner = "Lint-Free-Technology";
repo = "lovelace-auto-entities";
tag = "v${version}";
- hash = "sha256-2uZtL2w/KntBReF//3WTrHAQrYJO24jJYWJZ8/mpsIY=";
+ hash = "sha256-m8rR4IqB4k3ZJAJVR6A1lzCTutDdbuWBEIBd+6xIh6Y=";
};
- npmDepsHash = "sha256-UYpkIKr4/lAfvf+H09uZ8tksnucjpHWiWvWvPKfva2I=";
+ npmDepsHash = "sha256-jQfEUWlxavD4+RsfA1vQlwtkP0uAzNVs8aC93ccQcEk=";
installPhase = ''
runHook preInstall
diff --git a/pkgs/servers/web-apps/lemmy/pin.json b/pkgs/servers/web-apps/lemmy/pin.json
index faa9a5e851fb..d419fa5b0c1e 100644
--- a/pkgs/servers/web-apps/lemmy/pin.json
+++ b/pkgs/servers/web-apps/lemmy/pin.json
@@ -1,8 +1,8 @@
{
- "serverVersion": "0.19.18",
- "uiVersion": "0.19.18",
- "serverHash": "sha256-NUr96dsH3Gd+1ouOAgPheU0hnDI37a87EN642u482Sg=",
- "serverCargoHash": "sha256-oI8o+29kqjkAP2DIoSopPMQb5YlZNja1hV1bVmfMIvU=",
- "uiHash": "sha256-7WcPujev7VrkoX5vvGUvS0hUVJnCZjsceO5zK36jPbw=",
- "uiPNPMDepsHash": "sha256-dRUD/R7Qtlfy2saX7grfdi5qBDP8gc3L3+C2m7ro1CU="
+ "serverVersion": "0.19.19",
+ "uiVersion": "0.19.19",
+ "serverHash": "sha256-JcJV1dEWlFsbv9eH2yQMGYEZEFB/Pe1xtL1UNtKI6c4=",
+ "serverCargoHash": "sha256-cwmz8Gf7T1IsCRyxo3ap+byX+Aj7+iCTHmZ/IeMN2no=",
+ "uiHash": "sha256-67OMwzOGl+dMX5YNPPBG/QwKOVerkSa7ICbrQl4YBp4=",
+ "uiPNPMDepsHash": "sha256-T7vHfeewwT8fCH6AM6u2GFRkd+KWsp4lKj5I7I+yJAo="
}
diff --git a/pkgs/servers/web-apps/lemmy/server.nix b/pkgs/servers/web-apps/lemmy/server.nix
index 9c573d048104..c3cb5c6444e1 100644
--- a/pkgs/servers/web-apps/lemmy/server.nix
+++ b/pkgs/servers/web-apps/lemmy/server.nix
@@ -66,7 +66,7 @@ rustPlatform.buildRustPackage rec {
# This gets installed automatically by cargoInstallHook,
# but we don't actually need it, and it leaks a reference to rustc.
- postInstall = ''
+ postInstall = lib.optionals (!stdenv.hostPlatform.isDarwin) ''
rm $out/lib/libhtml2md.so
'';
diff --git a/pkgs/stdenv/generic/problems.nix b/pkgs/stdenv/generic/problems.nix
index 926075bd8229..0f03c393e384 100644
--- a/pkgs/stdenv/generic/problems.nix
+++ b/pkgs/stdenv/generic/problems.nix
@@ -48,6 +48,8 @@ rec {
groupBy
subtractLists
genAttrs
+ concatMap
+ unique
;
handlers = rec {
@@ -119,14 +121,16 @@ rec {
allowBroken = config.allowBroken || builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1";
allowBrokenPredicate =
- if config ? allowBrokenPredicate then
- lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2605)
- "config.allowBrokenPredicate is deprecated, use config.problems.handlers.myPackage.broken = \"warn\" for individual packages instead."
- config.allowBrokenPredicate
- else
- x: false;
+ lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2605)
+ "config.allowBrokenPredicate is deprecated, use config.problems.handlers.myPackage.broken = \"warn\" for individual packages instead."
+ config.allowBrokenPredicate;
in
- attrs: attrs.meta.broken or false && !allowBroken && !allowBrokenPredicate attrs;
+ if allowBroken then
+ attrs: false
+ else if config ? allowBrokenPredicate then
+ attrs: attrs ? meta.broken && attrs.meta.broken && !allowBrokenPredicate attrs
+ else
+ attrs: attrs ? meta.broken && attrs.meta.broken;
value.message = "This package is broken.";
}
];
@@ -330,7 +334,10 @@ rec {
};
};
- Returns both the structure itself for inspection and a function that can query it with very few allocations/lookups
+ Returns:
+ - the structure itself for inspection
+ - a function that can query the structure with very few allocations/lookups
+ - a list of problem kinds/names/packages that require handling
This allows collapsing arbitrarily many problem handlers/matchers into a predictable structure that can be queried in a predictable and fast way
*/
@@ -352,6 +359,20 @@ rec {
) config.problems.handlers
);
+ # Lookup table for all the kinds/names/packages that actually need to be
+ # handled
+ definedConstraints = listToAttrs (
+ map (ident: {
+ name = "${ident}s"; # plural
+ value = unique (
+ concatMap (
+ constraint:
+ optionals (constraint.${ident} != null && constraint.handler != "ignore") [ (constraint.${ident}) ]
+ ) constraints
+ );
+ }) identOrder
+ );
+
getHandler =
list:
(foldl'
@@ -410,26 +431,27 @@ rec {
switch = doLevel 0 constraints;
in
{
- inherit switch;
+ inherit switch definedConstraints;
handlerForProblem =
if isString switch then
- pname: name: kind:
+ kind: name: pname:
switch
else
- pname: name: kind:
+ kind:
let
- switch' = switch.kindSpecific.${kind} or switch.kindFallback;
+ kindSwitch = switch.kindSpecific.${kind} or switch.kindFallback;
in
- if isString switch' then
- switch'
+ if isString kindSwitch then
+ name: pname: kindSwitch
else
+ name:
let
- switch'' = switch'.nameSpecific.${name} or switch'.nameFallback;
+ nameSwitch = kindSwitch.nameSpecific.${name} or kindSwitch.nameFallback;
in
- if isString switch'' then
- switch''
+ if isString nameSwitch then
+ pname: nameSwitch
else
- switch''.packageSpecific.${pname} or switch''.packageFallback;
+ pname: nameSwitch.packageSpecific.${pname} or nameSwitch.packageFallback;
};
genCheckProblems =
@@ -438,44 +460,50 @@ rec {
# This is here so that it gets cached for a (checkProblems config) thunk
inherit (genHandlerSwitch config)
handlerForProblem
+ definedConstraints
;
- # Makes sure that automatic problems can cache with just config applied
- automaticProblemsConfigCache = map (
- problem: problem // { condition = problem.condition config; }
+
+ # All the problem kinds that actually need to be checked
+ configuredProblems = definedConstraints.kinds ++ definedConstraints.names;
+
+ # Filter out any problems that are always ignored in config.problems.
+ # Makes sure to cache the condition by appliny config, and the handler
+ # by applying the problem's kind and name
+ automaticProblemsConfigCache = concatMap (
+ problem:
+ optional (elem problem.kindName configuredProblems) {
+ condition = problem.condition config;
+ handler = handlerForProblem problem.kindName problem.kindName;
+ }
) automaticProblems;
in
attrs:
- let
- pname = getName attrs;
- manualProblems = attrs.meta.problems or { };
- in
if
# Fast path for when there's no problem that needs to be handled
- # No automatic problems that needs handling
all (
- problem:
- problem.condition attrs -> handlerForProblem pname problem.kindName problem.kindName == "ignore"
+ problem: problem.condition attrs -> problem.handler (getName attrs) == "ignore"
) automaticProblemsConfigCache
&& (
# No manual problems
- manualProblems == { }
+ !attrs ? meta.problems
# Or all manual problems are ignored
- || all (name: handlerForProblem pname name (manualProblems.${name}.kind or name) == "ignore") (
- attrNames manualProblems
- )
+ || all (
+ name: handlerForProblem (attrs.meta.problems.${name}.kind or name) name (getName attrs) == "ignore"
+ ) (attrNames attrs.meta.problems)
)
then
null
else
# Slow path, only here we actually figure out which problems we need to handle
let
+ pname = getName attrs;
problems = attrs.meta.problems or { } // genAutomaticProblems config attrs;
problemsToHandle = filter (v: v.handler != "ignore") (
mapAttrsToList (name: problem: rec {
inherit name;
# Kind falls back to the name
kind = problem.kind or name;
- handler = handlerForProblem pname name kind;
+ handler = handlerForProblem kind name pname;
inherit problem;
}) problems
);
diff --git a/pkgs/test/problems/unit.nix b/pkgs/test/problems/unit.nix
index 073ddaa12cfa..aef201508e63 100644
--- a/pkgs/test/problems/unit.nix
+++ b/pkgs/test/problems/unit.nix
@@ -2,10 +2,15 @@
let
p = import ../../stdenv/generic/problems.nix { inherit lib; };
+ genConstraintsTest = problems: expected: {
+ expr = (p.genHandlerSwitch { inherit problems; }).definedConstraints;
+ inherit expected;
+ };
+
genHandlerTest =
let
slowReference =
- config: package: name: kind:
+ config: kind: name: package:
# Try to find an explicit handler
(config.problems.handlers.${package} or { }).${name}
# Fall back, iterating through the matchers
@@ -31,7 +36,7 @@ let
map
(
name:
- map (kind: f package name kind) [
+ map (kind: f kind name package) [
"k1"
"k2"
"k3"
@@ -150,4 +155,84 @@ lib.runTests {
];
handlers = { };
};
+
+ testDefinedConstraintsEmpty =
+ genConstraintsTest
+ {
+ matchers = [ ];
+ handlers = { };
+ }
+ {
+ kinds = [ ];
+ names = [ ];
+ packages = [ ];
+ };
+
+ testDefinedConstraintsMatchers =
+ genConstraintsTest
+ {
+ handlers = { };
+ matchers = [
+ {
+ package = null;
+ name = null;
+ kind = "k1";
+ handler = "warn";
+ }
+ {
+ package = null;
+ name = null;
+ kind = "k2";
+ handler = "error";
+ }
+ {
+ package = null;
+ name = null;
+ kind = "k3";
+ handler = "ignore";
+ }
+ {
+ package = "p1";
+ name = "n1";
+ kind = null;
+ handler = "error";
+ }
+ {
+ package = "p2";
+ name = "n1";
+ kind = null;
+ handler = "warn";
+ }
+ ];
+ }
+ {
+ kinds = [
+ "k1"
+ "k2"
+ ];
+ names = [ "n1" ];
+ packages = [
+ "p1"
+ "p2"
+ ];
+ };
+
+ testDefinedConstraintsHandlers =
+ genConstraintsTest
+ {
+ matchers = [ ];
+ handlers.p1.n1 = "warn";
+ handlers.p1.n2 = "error";
+ handlers.p2.n3 = "ignore";
+ }
+ {
+ kinds = [ ];
+ names = [
+ "n1"
+ "n2"
+ ];
+ packages = [
+ "p1"
+ ];
+ };
}
diff --git a/pkgs/tools/networking/iroh/default.nix b/pkgs/tools/networking/iroh/default.nix
index 8c12e79e4def..df44ce53c60b 100644
--- a/pkgs/tools/networking/iroh/default.nix
+++ b/pkgs/tools/networking/iroh/default.nix
@@ -45,7 +45,6 @@ let
];
maintainers = with lib.maintainers; [
andreashgk
- cameronfyfe
];
mainProgram = name;
};
diff --git a/pkgs/tools/security/ghidra/extensions/findcrypt/default.nix b/pkgs/tools/security/ghidra/extensions/findcrypt/default.nix
index 94ce72957f02..e92972f9b99f 100644
--- a/pkgs/tools/security/ghidra/extensions/findcrypt/default.nix
+++ b/pkgs/tools/security/ghidra/extensions/findcrypt/default.nix
@@ -5,13 +5,13 @@
}:
buildGhidraExtension (finalAttrs: {
pname = "findcrypt";
- version = "3.1.8";
+ version = "3.1.9";
src = fetchFromGitHub {
owner = "antoniovazquezblanco";
repo = "GhidraFindcrypt";
rev = "v${finalAttrs.version}";
- hash = "sha256-2EXJ7tHDjM9LH+SGaRBx4zlK6OdGs+5ipQjsnafgwTQ=";
+ hash = "sha256-NpJx9F21wYvrgELwKjE4bqRAE3lvLwqXbvuCB0HmPgk=";
};
meta = {
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b2622edfdaf1..dac97a477fa5 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1277,6 +1277,7 @@ mapAliases {
linux_6_18 = linuxKernel.kernels.linux_6_18;
linux_6_19 = linuxKernel.kernels.linux_6_19;
linux_7_0 = linuxKernel.kernels.linux_7_0;
+ linux_7_1 = linuxKernel.kernels.linux_7_1;
linux_ham = throw "linux_ham has been removed in favour of the standard kernel packages"; # Added 2025-06-24
linux_hardened = throw "linux_hardened has been removed due to lack of maintenance"; # Added 2026-03-18
linux_latest-libre = throw "linux_latest_libre has been removed due to lack of maintenance"; # Added 2025-10-01
@@ -1312,6 +1313,7 @@ mapAliases {
linuxPackages_6_18 = linuxKernel.packages.linux_6_18;
linuxPackages_6_19 = linuxKernel.packages.linux_6_19;
linuxPackages_7_0 = linuxKernel.packages.linux_7_0;
+ linuxPackages_7_1 = linuxKernel.packages.linux_7_1;
linuxPackages_ham = throw "linux_ham has been removed in favour of the standard kernel packages"; # Added 2025-06-24
linuxPackages_hardened = throw "linuxPackages_hardened has been removed due to lack of maintenance"; # Added 2026-03-18
linuxPackages_latest-libre = throw "linux_latest_libre has been removed due to lack of maintenance"; # Added 2025-10-01
@@ -1955,6 +1957,7 @@ mapAliases {
ryujinx = throw "'ryujinx' has been replaced by 'ryubing' as the new upstream"; # Added 2025-07-30
ryujinx-greemdev = throw "'ryujinx-greemdev' has been renamed to/replaced by 'ryubing'"; # Converted to throw 2025-10-27
scantailor = throw "'scantailor' has been renamed to/replaced by 'scantailor-advanced'"; # Converted to throw 2025-10-27
+ scaphandra = throw "'scaphandra' was broken with no upstream progress since February 2025"; # Added 2026-06-14
scitoken-cpp = throw "'scitoken-cpp' has been renamed to/replaced by 'scitokens-cpp'"; # Converted to throw 2025-10-27
scudcloud = throw "'scudcloud' has been removed as it was archived by upstream"; # Added 2025-07-24
SDL2_classic = throw "'SDL2_classic' has been removed. Consider upgrading to 'sdl2-compat', also available as 'SDL2'."; # Added 2025-05-20
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8af53142a86b..500f1a8abb18 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5497,22 +5497,6 @@ with pkgs;
openai-whisper = with python3.pkgs; toPythonApplication openai-whisper;
- openocd-rp2040 = openocd.overrideAttrs (old: {
- pname = "openocd-rp2040";
- src = fetchFromGitHub {
- owner = "raspberrypi";
- repo = "openocd";
- rev = "4d87f6dcae77d3cbcd8ac3f7dc887adf46ffa504";
- hash = "sha256-bBqVoHsnNoaC2t8hqcduI8GGlO0VDMUovCB0HC+rxvc=";
- # openocd disables the vendored libraries that use submodules and replaces them with nix versions.
- # this works out as one of the submodule sources seems to be flakey.
- fetchSubmodules = false;
- };
- nativeBuildInputs = old.nativeBuildInputs ++ [
- autoreconfHook
- ];
- });
-
oprofile = callPackage ../development/tools/profiling/oprofile {
libiberty_static = libiberty.override { staticBuild = true; };
};
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index ddf456a49931..ccd896e616ee 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -100,6 +100,14 @@ in
];
};
+ linux_7_1 = callPackage ../os-specific/linux/kernel/mainline.nix {
+ branch = "7.1";
+ kernelPatches = [
+ kernelPatches.bridge_stp_helper
+ kernelPatches.request_key_helper
+ ];
+ };
+
linux_testing =
let
testing = callPackage ../os-specific/linux/kernel/mainline.nix {
@@ -667,6 +675,7 @@ in
linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12);
linux_6_18 = recurseIntoAttrs (packagesFor kernels.linux_6_18);
linux_7_0 = recurseIntoAttrs (packagesFor kernels.linux_7_0);
+ linux_7_1 = recurseIntoAttrs (packagesFor kernels.linux_7_1);
}
// lib.optionalAttrs config.allowAliases {
linux_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; # Added 2024-09-21
@@ -735,7 +744,7 @@ in
packageAliases = {
linux_default = packages.linux_6_18;
# Update this when adding the newest kernel major version!
- linux_latest = packages.linux_7_0;
+ linux_latest = packages.linux_7_1;
}
// lib.optionalAttrs config.allowAliases {
linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake";
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index a7d277f88617..4d57652c4e26 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -102,6 +102,7 @@ mapAliases {
audio-metadata = throw "'audio-metadata' has been removed as it's unmaintained since 2020"; # Added 2026-03-12
autotrash = throw "'autotrash' has been renamed to/replaced by 'super.pkgs.autotrash'"; # Converted to throw 2025-10-29
av_13 = throw "'av_13' has been renamed to/replaced by 'av'"; # Added 2026-02-01
+ awesome-slugify = throw "'awesome-slugify' has been removed as it was unmaintained upstream"; # Added 2026-06-14
Babel = throw "'Babel' has been renamed to/replaced by 'babel'"; # Converted to throw 2025-10-29
backports-functools-lru-cache = throw "'backports-functools-lru-cache' has been removed from nixpkgs as it was not longer used in python2"; # Added 2026-01-14
backports_shutil_get_terminal_size = throw "'backports_shutil_get_terminal_size' has been renamed to/replaced by 'backports-shutil-get-terminal-size'"; # Converted to throw 2025-10-29
@@ -242,6 +243,7 @@ mapAliases {
fvs = throw "'fvs' has been removed due to being unused"; # Added 2026-05-23
garminconnect-ha = throw "'garminconnect-ha' has been renamed to/replaced by 'garminconnect'"; # Converted to throw 2025-10-29
GeoIP = throw "'GeoIP' has been renamed to/replaced by 'geoip'"; # Converted to throw 2025-10-29
+ ghidra-bridge = throw "'ghidra-bridge' has been removed as it was unmaintained upstream"; # Added 2026-04-05
github3_py = throw "'github3_py' has been renamed to/replaced by 'github3-py'"; # Converted to throw 2025-10-29
GitPython = throw "'GitPython' has been renamed to/replaced by 'gitpython'"; # Converted to throw 2025-10-29
google_api_python_client = throw "'google_api_python_client' has been renamed to/replaced by 'google-api-python-client'"; # Converted to throw 2025-10-29
@@ -286,6 +288,7 @@ mapAliases {
jaraco_stream = throw "'jaraco_stream' has been renamed to/replaced by 'jaraco-stream'"; # Converted to throw 2025-10-29
jaraco_text = throw "'jaraco_text' has been renamed to/replaced by 'jaraco-text'"; # Converted to throw 2025-10-29
JayDeBeApi = throw "'JayDeBeApi' has been renamed to/replaced by 'jaydebeapi'"; # Converted to throw 2025-10-29
+ jfx-bridge = throw "'jfx-bridge' has been removed as it was unmaintained upstream"; # Added 2026-04-05
jinja2_pluralize = throw "'jinja2_pluralize' has been renamed to/replaced by 'jinja2-pluralize'"; # Converted to throw 2025-10-29
jinja2_time = throw "'jinja2_time' has been renamed to/replaced by 'jinja2-time'"; # Converted to throw 2025-10-29
JPype1 = throw "'JPype1' has been renamed to/replaced by 'jpype1'"; # Converted to throw 2025-10-29
@@ -437,6 +440,7 @@ mapAliases {
pygls_2 = pygls; # added 2026-01-05
pygtk = throw "pygtk has been removed because it was not supported by python3"; # Added 2026-01-14
pyheif = throw "pyheif has been removed due to lack of upstream maintenance and breakage. Use `pillow-heif` instead."; # added 2025-09-17
+ pyhidra = throw "'pyhidra' has been removed as it was incorporated into upstream and renamed 'pyghidra'"; # Added 2026-04-21
pyhiveapi = throw "'pyhiveapi' has been renamed to/replaced by 'pyhive-integration'"; # Converted to throw 2025-10-29
pyialarmxr = throw "'pyialarmxr' has been renamed to/replaced by 'pyialarmxr-homeassistant'"; # Converted to throw 2025-10-29
PyICU = throw "'PyICU' has been renamed to/replaced by 'pyicu'"; # Converted to throw 2025-10-29
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cb255c8fb62c..11071cbaf5cc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1343,8 +1343,6 @@ self: super: with self; {
awacs = callPackage ../development/python-modules/awacs { };
- awesome-slugify = callPackage ../development/python-modules/awesome-slugify { };
-
awesomeversion = callPackage ../development/python-modules/awesomeversion { };
awkward = callPackage ../development/python-modules/awkward { };
@@ -4905,6 +4903,8 @@ self: super: with self; {
e3-testsuite = callPackage ../development/python-modules/e3-testsuite { };
+ e3nn = callPackage ../development/python-modules/e3nn { };
+
eagle100 = callPackage ../development/python-modules/eagle100 { };
earn-e-p1 = callPackage ../development/python-modules/earn-e-p1 { };
@@ -6354,8 +6354,6 @@ self: super: with self; {
ghdiff = callPackage ../development/python-modules/ghdiff { };
- ghidra-bridge = callPackage ../development/python-modules/ghidra-bridge { };
-
ghmap = callPackage ../development/python-modules/ghmap { };
ghome-foyer-api = callPackage ../development/python-modules/ghome-foyer-api { };
@@ -8043,8 +8041,6 @@ self: super: with self; {
jenkinsapi = callPackage ../development/python-modules/jenkinsapi { };
- jfx-bridge = callPackage ../development/python-modules/jfx-bridge { };
-
jh2 = callPackage ../development/python-modules/jh2 { };
jianpu-ly = callPackage ../development/python-modules/jianpu-ly { };
@@ -9576,6 +9572,8 @@ self: super: with self; {
macaddress = callPackage ../development/python-modules/macaddress { };
+ mace-torch = callPackage ../development/python-modules/mace-torch { };
+
macfsevents = callPackage ../development/python-modules/macfsevents { };
macholib = callPackage ../development/python-modules/macholib { };
@@ -9750,6 +9748,8 @@ self: super: with self; {
matrix-nio = callPackage ../development/python-modules/matrix-nio { };
+ matscipy = callPackage ../development/python-modules/matscipy { };
+
matter-ble-proxy = callPackage ../development/python-modules/matter-ble-proxy { };
matter-python-client = callPackage ../development/python-modules/matter-python-client { };
@@ -12052,6 +12052,8 @@ self: super: with self; {
opt-einsum = callPackage ../development/python-modules/opt-einsum { };
+ opt-einsum-fx = callPackage ../development/python-modules/opt-einsum-fx { };
+
optax = callPackage ../development/python-modules/optax { };
optiland = callPackage ../development/python-modules/optiland { };
@@ -14254,8 +14256,6 @@ self: super: with self; {
pyhibp = callPackage ../development/python-modules/pyhibp { };
- pyhidra = callPackage ../development/python-modules/pyhidra { };
-
pyhik = callPackage ../development/python-modules/pyhik { };
pyhive-integration = callPackage ../development/python-modules/pyhive-integration { };
@@ -15793,6 +15793,8 @@ self: super: with self; {
pytest-subtesthack = callPackage ../development/python-modules/pytest-subtesthack { };
+ pytest-subtests = callPackage ../development/python-modules/pytest-subtests { };
+
pytest-sugar = callPackage ../development/python-modules/pytest-sugar { };
pytest-tap = callPackage ../development/python-modules/pytest-tap { };
@@ -16021,6 +16023,8 @@ self: super: with self; {
python-homewizard-energy = callPackage ../development/python-modules/python-homewizard-energy { };
+ python-hostlist = callPackage ../development/python-modules/python-hostlist { };
+
python-hosts = callPackage ../development/python-modules/python-hosts { };
python-hpilo = callPackage ../development/python-modules/python-hpilo { };
@@ -19905,6 +19909,8 @@ self: super: with self; {
torch-einops-utils = callPackage ../development/python-modules/torch-einops-utils { };
+ torch-ema = callPackage ../development/python-modules/torch-ema { };
+
torch-geometric = callPackage ../development/python-modules/torch-geometric { };
torch-memory-saver = callPackage ../development/python-modules/torch-memory-saver { };