diff --git a/lib/systems/default.nix b/lib/systems/default.nix index f8bc6ac987b3..e04f079035db 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -389,6 +389,8 @@ let "${pkgs.qemu-user}/bin/qemu-${final.qemuArch}" else if final.isWasi then "${pkgs.wasmtime}/bin/wasmtime" + else if final.isGhcjs then + "${pkgs.nodejs-slim}/bin/node" else if final.isMmix then "${pkgs.mmixware}/bin/mmix" else diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 752bb5a64c63..f0a06a71c1e7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -25159,6 +25159,13 @@ githubId = 94006354; name = "steamwalker"; }; + Stebalien = { + email = "steven@stebalien.com"; + github = "Stebalien"; + githubId = 310393; + name = "Steven Allen"; + keys = [ { fingerprint = "327B 20CE 21EA 68CF A774 8675 7C92 3221 5899 410C"; } ]; + }; steeleduncan = { email = "steeleduncan@hotmail.com"; github = "steeleduncan"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index f12ce735d58a..2153056117c9 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -300,6 +300,7 @@ with lib.maintainers; gitlab = { members = [ + gabyx krav leona talyz diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix index 0161208d9af0..bb07dd16bb58 100644 --- a/nixos/modules/services/databases/influxdb.nix +++ b/nixos/modules/services/databases/influxdb.nix @@ -7,106 +7,7 @@ let cfg = config.services.influxdb; - configOptions = lib.recursiveUpdate { - meta = { - bind-address = ":8088"; - commit-timeout = "50ms"; - dir = "${cfg.dataDir}/meta"; - election-timeout = "1s"; - heartbeat-timeout = "1s"; - hostname = "localhost"; - leader-lease-timeout = "500ms"; - retention-autocreate = true; - }; - - data = { - dir = "${cfg.dataDir}/data"; - wal-dir = "${cfg.dataDir}/wal"; - max-wal-size = 104857600; - wal-enable-logging = true; - wal-flush-interval = "10m"; - wal-partition-flush-delay = "2s"; - }; - - cluster = { - shard-writer-timeout = "5s"; - write-timeout = "5s"; - }; - - retention = { - enabled = true; - check-interval = "30m"; - }; - - http = { - enabled = true; - auth-enabled = false; - bind-address = ":8086"; - https-enabled = false; - log-enabled = true; - pprof-enabled = false; - write-tracing = false; - }; - - monitor = { - store-enabled = false; - store-database = "_internal"; - store-interval = "10s"; - }; - - admin = { - enabled = true; - bind-address = ":8083"; - https-enabled = false; - }; - - graphite = [ - { - enabled = false; - } - ]; - - udp = [ - { - enabled = false; - } - ]; - - collectd = [ - { - enabled = false; - typesdb = "${pkgs.collectd-data}/share/collectd/types.db"; - database = "collectd_db"; - bind-address = ":25826"; - } - ]; - - opentsdb = [ - { - enabled = false; - } - ]; - - continuous_queries = { - enabled = true; - log-enabled = true; - recompute-previous-n = 2; - recompute-no-older-than = "10m"; - compute-runs-per-interval = 10; - compute-no-more-than = "2m"; - }; - - hinted-handoff = { - enabled = true; - dir = "${cfg.dataDir}/hh"; - max-size = 1073741824; - max-age = "168h"; - retry-rate-limit = 0; - retry-interval = "1s"; - }; - } cfg.extraConfig; - - configFile = (pkgs.formats.toml { }).generate "config.toml" configOptions; + settingsFormat = pkgs.formats.toml { }; in { @@ -116,11 +17,7 @@ in services.influxdb = { - enable = lib.mkOption { - default = false; - description = "Whether to enable the influxdb server"; - type = lib.types.bool; - }; + enable = lib.mkEnableOption "the influxdb server"; package = lib.mkPackageOption pkgs "influxdb" { }; @@ -142,10 +39,116 @@ in type = lib.types.path; }; - extraConfig = lib.mkOption { + settings = lib.mkOption { default = { }; description = "Extra configuration options for influxdb"; - type = lib.types.attrs; + type = lib.types.submodule { + freeformType = settingsFormat.type; + config = + let + mkAllOptionDefault = lib.mapAttrs (n: lib.mkOptionDefault); + in + { + meta = mkAllOptionDefault { + bind-address = ":8088"; + commit-timeout = "50ms"; + dir = "${cfg.dataDir}/meta"; + election-timeout = "1s"; + heartbeat-timeout = "1s"; + hostname = "localhost"; + leader-lease-timeout = "500ms"; + retention-autocreate = true; + }; + + data = mkAllOptionDefault { + dir = "${cfg.dataDir}/data"; + wal-dir = "${cfg.dataDir}/wal"; + max-wal-size = 104857600; + wal-enable-logging = true; + wal-flush-interval = "10m"; + wal-partition-flush-delay = "2s"; + }; + + cluster = mkAllOptionDefault { + shard-writer-timeout = "5s"; + write-timeout = "5s"; + }; + + retention = mkAllOptionDefault { + enabled = true; + check-interval = "30m"; + }; + + http = mkAllOptionDefault { + enabled = true; + auth-enabled = false; + bind-address = ":8086"; + https-enabled = false; + log-enabled = true; + pprof-enabled = false; + write-tracing = false; + }; + + monitor = mkAllOptionDefault { + store-enabled = false; + store-database = "_internal"; + store-interval = "10s"; + }; + + admin = mkAllOptionDefault { + enabled = true; + bind-address = ":8083"; + https-enabled = false; + }; + + # We can't make lists sensibly overrideable, so you have to override + # them whole + graphite = lib.mkOptionDefault [ + { + enabled = false; + } + ]; + + udp = lib.mkOptionDefault [ + { + enabled = false; + } + ]; + + collectd = lib.mkOptionDefault [ + { + enabled = false; + typesdb = "${pkgs.collectd-data}/share/collectd/types.db"; + database = "collectd_db"; + bind-address = ":25826"; + } + ]; + + opentsdb = lib.mkOptionDefault [ + { + enabled = false; + } + ]; + + continuous_queries = mkAllOptionDefault { + enabled = true; + log-enabled = true; + recompute-previous-n = 2; + recompute-no-older-than = "10m"; + compute-runs-per-interval = 10; + compute-no-more-than = "2m"; + }; + + hinted-handoff = mkAllOptionDefault { + enabled = true; + dir = "${cfg.dataDir}/hh"; + max-size = 1073741824; + max-age = "168h"; + retry-rate-limit = 0; + retry-interval = "1s"; + }; + }; + }; }; }; }; @@ -163,17 +166,16 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; serviceConfig = { - ExecStart = ''${cfg.package}/bin/influxd -config "${configFile}"''; + ExecStart = ''${cfg.package}/bin/influxd -config "${settingsFormat.generate "config.toml" cfg.settings}"''; User = cfg.user; Group = cfg.group; Restart = "on-failure"; }; postStart = let - scheme = if configOptions.http.https-enabled then "-k https" else "http"; - bindAddr = (ba: if lib.hasPrefix ":" ba then "127.0.0.1${ba}" else "${ba}") ( - toString configOptions.http.bind-address - ); + scheme = if cfg.settings.http.https-enabled or false then "-k https" else "http"; + inherit (cfg.settings.http) bind-address; + bindAddr = if lib.hasPrefix ":" bind-address then "127.0.0.1${bind-address}" else bind-address; in lib.mkBefore '' until ${pkgs.curl.bin}/bin/curl -s -o /dev/null ${scheme}://${bindAddr}/ping; do @@ -182,7 +184,7 @@ in ''; }; - users.users = lib.optionalAttrs (cfg.user == "influxdb") { + users.users = lib.mkIf (cfg.user == "influxdb") { influxdb = { uid = config.ids.uids.influxdb; group = "influxdb"; @@ -190,9 +192,16 @@ in }; }; - users.groups = lib.optionalAttrs (cfg.group == "influxdb") { + users.groups = lib.mkIf (cfg.group == "influxdb") { influxdb.gid = config.ids.gids.influxdb; }; }; + imports = [ + # FIXME remove after 26.11 + (lib.mkRenamedOptionModule + [ "services" "influxdb" "extraConfig" ] + [ "services" "influxdb" "settings" ] + ) + ]; } diff --git a/nixos/modules/services/display-managers/generic.nix b/nixos/modules/services/display-managers/generic.nix index 59daa7f8f8bc..0195d33d337c 100644 --- a/nixos/modules/services/display-managers/generic.nix +++ b/nixos/modules/services/display-managers/generic.nix @@ -51,6 +51,8 @@ in '') ]; + services.displayManager.enable = true; + systemd.services.display-manager = { description = "Display Manager"; after = [ diff --git a/nixos/modules/services/display-managers/ly.nix b/nixos/modules/services/display-managers/ly.nix index d49869530e84..073f26e16b1a 100644 --- a/nixos/modules/services/display-managers/ly.nix +++ b/nixos/modules/services/display-managers/ly.nix @@ -17,13 +17,14 @@ let iniFmt = pkgs.formats.iniWithGlobalSection { }; inherit (lib) - concatMapStrings attrNames + concatMapStrings getAttr mkIf mkOption mkEnableOption mkPackageOption + optionalAttrs ; xserverWrapper = pkgs.writeShellScript "xserver-wrapper" '' @@ -47,6 +48,11 @@ let setup_cmd = dmcfg.sessionData.wrapper; brightness_up_cmd = "${lib.getExe pkgs.brightnessctl} -q -n s +10%"; brightness_down_cmd = "${lib.getExe pkgs.brightnessctl} -q -n s 10%-"; + } + // optionalAttrs dmcfg.autoLogin.enable { + auto_login_service = "ly-autologin"; + auto_login_session = dmcfg.sessionData.autologinSession; + auto_login_user = dmcfg.autoLogin.user; }; finalConfig = defaultConfig // cfg.settings; @@ -84,17 +90,32 @@ in assertions = [ { - assertion = !dmcfg.autoLogin.enable; + assertion = dmcfg.autoLogin.enable -> dmcfg.sessionData.autologinSession != null; message = '' - ly doesn't support auto login. + ly auto-login requires that services.displayManager.defaultSession is set. ''; } ]; - security.pam.services.ly = { - startSession = true; - unixAuth = true; - enableGnomeKeyring = lib.mkDefault config.services.gnome.gnome-keyring.enable; + security.pam.services = { + ly = { + startSession = true; + unixAuth = true; + enableGnomeKeyring = lib.mkDefault config.services.gnome.gnome-keyring.enable; + }; + } + // optionalAttrs dmcfg.autoLogin.enable { + ly-autologin.text = '' + auth requisite pam_nologin.so + auth required pam_succeed_if.so uid >= 1000 quiet + auth required pam_permit.so + + account include ly + + password include ly + + session include ly + ''; }; environment = { diff --git a/nixos/modules/services/matrix/continuwuity.nix b/nixos/modules/services/matrix/continuwuity.nix index 7651080c91d1..dfa782fa01eb 100644 --- a/nixos/modules/services/matrix/continuwuity.nix +++ b/nixos/modules/services/matrix/continuwuity.nix @@ -11,6 +11,10 @@ let format = pkgs.formats.toml { }; configFile = format.generate "continuwuity.toml" cfg.settings; + + conduwuitWrapper = pkgs.writeShellScriptBin "conduwuit" '' + exec ${lib.getExe cfg.package} --config ${configFile} "$@" + ''; in { meta.maintainers = with lib.maintainers; [ @@ -169,9 +173,22 @@ in for details on supported values. ''; }; + + admin = { + enable = lib.mkOption { + type = lib.types.bool; + default = cfg.enable; + defaultText = lib.literalExpression "config.services.matrix-continuwuity.enable"; + description = "Add conduwuit command to PATH for administration"; + }; + }; }; config = lib.mkIf cfg.enable { + environment = lib.mkIf cfg.admin.enable { + systemPackages = [ conduwuitWrapper ]; + }; + assertions = [ { assertion = !(cfg.settings ? global.unix_socket_path) || !(cfg.settings ? global.address); diff --git a/nixos/modules/services/networking/coredns.nix b/nixos/modules/services/networking/coredns.nix index 46202fa088f1..4cfa23649ec3 100644 --- a/nixos/modules/services/networking/coredns.nix +++ b/nixos/modules/services/networking/coredns.nix @@ -42,7 +42,6 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - PermissionsStartOnly = true; LimitNPROC = 512; LimitNOFILE = 1048576; CapabilityBoundingSet = "cap_net_bind_service"; diff --git a/nixos/modules/services/x11/picom.nix b/nixos/modules/services/x11/picom.nix index 399f2a66370b..33d53930dff0 100644 --- a/nixos/modules/services/x11/picom.nix +++ b/nixos/modules/services/x11/picom.nix @@ -20,8 +20,43 @@ let mkDefaultAttrs = mapAttrs (n: v: mkDefault v); - libconfig = pkgs.formats.libconfig { }; - configFile = libconfig.generate "picom.conf" cfg.settings; + # Basically a tinkered lib.generators.mkKeyValueDefault + # It either serializes a top-level definition "key: { values };" + # or an expression "key = { values };" + mkAttrsString = + top: + mapAttrsToList ( + k: v: + let + sep = if (top && isAttrs v) then ":" else "="; + in + "${escape [ sep ] k}${sep}${mkValueString v};" + ); + + # This serializes a Nix expression to the libconfig format. + mkValueString = + v: + if types.bool.check v then + boolToString v + else if types.int.check v then + toString v + else if types.float.check v then + toString v + else if types.str.check v then + "\"${escape [ "\"" ] v}\"" + else if builtins.isList v then + "[ ${concatMapStringsSep " , " mkValueString v} ]" + else if types.attrs.check v then + "{ ${concatStringsSep " " (mkAttrsString false v)} }" + else + throw '' + invalid expression used in option services.picom.settings: + ${v} + ''; + + toConf = attrs: concatStringsSep "\n" (mkAttrsString true cfg.settings); + + configFile = pkgs.writeText "picom.conf" (toConf cfg.settings); in { @@ -244,22 +279,56 @@ in ''; }; - settings = mkOption { - type = libconfig.type; - default = { }; - example = literalExpression '' - blur = - { method = "gaussian"; - size = 10; - deviation = 5.0; + settings = + with types; + let + scalar = + oneOf [ + bool + int + float + str + ] + // { + description = "scalar types"; }; - ''; - description = '' - Picom settings. Use this option to configure Picom settings not exposed - in a NixOS option or to bypass one. For the available options see the - CONFIGURATION FILES section at {manpage}`picom(1)`. - ''; - }; + + libConfig = + oneOf [ + scalar + (listOf libConfig) + (attrsOf libConfig) + ] + // { + description = "libconfig type"; + }; + + topLevel = attrsOf libConfig // { + description = '' + libconfig configuration. The format consists of an attributes + set (called a group) of settings. Each setting can be a scalar type + (boolean, integer, floating point number or string), a list of + scalars or a group itself + ''; + }; + + in + mkOption { + type = topLevel; + default = { }; + example = literalExpression '' + blur = + { method = "gaussian"; + size = 10; + deviation = 5.0; + }; + ''; + description = '' + Picom settings. Use this option to configure Picom settings not exposed + in a NixOS option or to bypass one. For the available options see the + CONFIGURATION FILES section at {manpage}`picom(1)`. + ''; + }; }; config = mkIf cfg.enable { diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index cb9f5509c102..f04ad6e393ed 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -810,8 +810,6 @@ in ###### implementation config = mkIf cfg.enable { - services.displayManager.enable = true; - services.xserver.displayManager.lightdm.enable = let dmConf = cfg.displayManager; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 41b2128e2bb4..50c27ec6da79 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1288,7 +1288,7 @@ in { }; postfix-tlspol = runTest ./postfix-tlspol.nix; postgres-websockets = runTest ./postgres-websockets.nix; - postgresql = handleTest ./postgresql { }; + postgresql = import ./postgresql { inherit runTest pkgs; }; postgrest = runTest ./postgrest.nix; power-profiles-daemon = runTest ./power-profiles-daemon.nix; powerdns = runTest ./powerdns.nix; diff --git a/nixos/tests/ly.nix b/nixos/tests/ly.nix index a9c74c5f3ca7..2d9303308001 100644 --- a/nixos/tests/ly.nix +++ b/nixos/tests/ly.nix @@ -23,6 +23,18 @@ in services.displayManager.defaultSession = "none+icewm"; services.xserver.windowManager.icewm.enable = true; }; + nodes.machineAutologin = + { ... }: + lib.attrsets.recursiveUpdate machineBase { + services.displayManager.ly.x11Support = true; + services.xserver.enable = true; + services.displayManager.defaultSession = "none+icewm"; + services.xserver.windowManager.icewm.enable = true; + services.displayManager.autoLogin = { + enable = true; + user = "alice"; + }; + }; nodes.machineNoX11 = { ... }: lib.attrsets.recursiveUpdate machineBase { @@ -83,6 +95,14 @@ in machine.sleep(2) machine.screenshot("icewm") + machineAutologin.wait_until_succeeds("getfacl /dev/dri/card0 | grep video") + machineAutologin.send_key("ctrl-alt-f1") + machineAutologin.wait_for_file("/run/user/${toString user.uid}/lyxauth") + machineAutologin.succeed("xauth merge /run/user/${toString user.uid}/lyxauth") + machineAutologin.wait_for_window("^IceWM ") + machineAutologin.sleep(2) + machineAutologin.screenshot("autologin-icewm") + machineNoX11.wait_until_tty_matches("1", "password") machineNoX11.send_key("ctrl-alt-f1") machineNoX11.sleep(1) diff --git a/nixos/tests/postgresql/anonymizer.nix b/nixos/tests/postgresql/anonymizer.nix index a5853e5ed533..4b37a4f8be5d 100644 --- a/nixos/tests/postgresql/anonymizer.nix +++ b/nixos/tests/postgresql/anonymizer.nix @@ -1,114 +1,115 @@ { - pkgs, - makeTest, + runTest, genTests, + ... }: let - inherit (pkgs) lib; - makeTestFor = package: - makeTest { - name = "postgresql_anonymizer-${package.name}"; - meta.maintainers = [ - lib.maintainers.leona - lib.maintainers.osnyx - ]; + runTest ( + { lib, pkgs, ... }: + { + name = "postgresql_anonymizer-${package.name}"; + meta.maintainers = [ + lib.maintainers.leona + lib.maintainers.osnyx + ]; - nodes.machine = - { pkgs, ... }: - { - environment.systemPackages = [ (pkgs.pg-dump-anon.override { postgresql = package; }) ]; - services.postgresql = { - inherit package; - enable = true; - extensions = ps: [ ps.anonymizer ]; - settings.shared_preload_libraries = [ "anon" ]; + nodes.machine = + { pkgs, ... }: + { + environment.systemPackages = [ (pkgs.pg-dump-anon.override { postgresql = package; }) ]; + services.postgresql = { + inherit package; + enable = true; + extensions = ps: [ ps.anonymizer ]; + settings.shared_preload_libraries = [ "anon" ]; + }; }; - }; - testScript = '' - start_all() - machine.wait_for_unit("multi-user.target") - machine.wait_for_unit("postgresql.target") + testScript = '' + start_all() + machine.wait_for_unit("multi-user.target") + machine.wait_for_unit("postgresql.target") - with subtest("Setup"): - machine.succeed("sudo -u postgres psql --command 'create database demo'") - machine.succeed( - "sudo -u postgres psql -d demo -f ${pkgs.writeText "init.sql" '' - create extension anon cascade; - select anon.init(); - create table player(id serial, name text, points int); - insert into player(id,name,points) values (1,'Foo', 23); - insert into player(id,name,points) values (2,'Bar',42); - security label for anon on column player.name is 'MASKED WITH FUNCTION anon.fake_last_name()'; - security label for anon on column player.points is 'MASKED WITH VALUE NULL'; - ''}" - ) + with subtest("Setup"): + machine.succeed("sudo -u postgres psql --command 'create database demo'") + machine.succeed( + "sudo -u postgres psql -d demo -f ${pkgs.writeText "init.sql" '' + create extension anon cascade; + select anon.init(); + create table player(id serial, name text, points int); + insert into player(id,name,points) values (1,'Foo', 23); + insert into player(id,name,points) values (2,'Bar',42); + security label for anon on column player.name is 'MASKED WITH FUNCTION anon.fake_last_name()'; + security label for anon on column player.points is 'MASKED WITH VALUE NULL'; + ''}" + ) - def get_player_table_contents(): - return [ - x.split(',') for x in machine.succeed("sudo -u postgres psql -d demo --csv --command 'select * from player'").splitlines()[1:] - ] + def get_player_table_contents(): + return [ + x.split(',') for x in machine.succeed("sudo -u postgres psql -d demo --csv --command 'select * from player'").splitlines()[1:] + ] - def check_anonymized_row(row, id, original_name): - t.assertEqual(row[0], id) - t.assertNotEqual(row[1], original_name) - t.assertFalse(bool(row[2])) + def check_anonymized_row(row, id, original_name): + t.assertEqual(row[0], id) + t.assertNotEqual(row[1], original_name) + t.assertFalse(bool(row[2])) - def find_xsv_in_dump(dump, sep=','): - """ - Expecting to find a CSV (for pg_dump_anon) or TSV (for pg_dump) structure, looking like + def find_xsv_in_dump(dump, sep=','): + """ + Expecting to find a CSV (for pg_dump_anon) or TSV (for pg_dump) structure, looking like - COPY public.player ... - 1,Shields, - 2,Salazar, - \\. + COPY public.player ... + 1,Shields, + 2,Salazar, + \\. - in the given dump (the commas are tabs in case of pg_dump). - Extract the CSV lines and split by `sep`. - """ + in the given dump (the commas are tabs in case of pg_dump). + Extract the CSV lines and split by `sep`. + """ - try: - from itertools import dropwhile, takewhile - return [x.split(sep) for x in list(takewhile( - lambda x: x != "\\.", - dropwhile( - lambda x: not x.startswith("COPY public.player"), - dump.splitlines() - ) - ))[1:]] - except: - print(f"Dump to process: {dump}") - raise + try: + from itertools import dropwhile, takewhile + return [x.split(sep) for x in list(takewhile( + lambda x: x != "\\.", + dropwhile( + lambda x: not x.startswith("COPY public.player"), + dump.splitlines() + ) + ))[1:]] + except: + print(f"Dump to process: {dump}") + raise - def check_original_data(output): - t.assertEqual(output[0], ["1", "Foo", "23"]) - t.assertEqual(output[1], ["2", "Bar", "42"]) + def check_original_data(output): + t.assertEqual(output[0], ["1", "Foo", "23"]) + t.assertEqual(output[1], ["2", "Bar", "42"]) - def check_anonymized_rows(output): - check_anonymized_row(output[0], '1', 'Foo') - check_anonymized_row(output[1], '2', 'Bar') + def check_anonymized_rows(output): + check_anonymized_row(output[0], '1', 'Foo') + check_anonymized_row(output[1], '2', 'Bar') - with subtest("Check initial state"): - check_original_data(get_player_table_contents()) + with subtest("Check initial state"): + check_original_data(get_player_table_contents()) - with subtest("Anonymous dumps"): - check_original_data(find_xsv_in_dump( - machine.succeed("sudo -u postgres pg_dump demo"), - sep='\t' - )) - check_anonymized_rows(find_xsv_in_dump( - machine.succeed("sudo -u postgres pg_dump_anon -U postgres -h /run/postgresql -d demo"), - sep=',' - )) + with subtest("Anonymous dumps"): + check_original_data(find_xsv_in_dump( + machine.succeed("sudo -u postgres pg_dump demo"), + sep='\t' + )) + check_anonymized_rows(find_xsv_in_dump( + machine.succeed("sudo -u postgres pg_dump_anon -U postgres -h /run/postgresql -d demo"), + sep=',' + )) - with subtest("Anonymize"): - machine.succeed("sudo -u postgres psql -d demo --command 'select anon.anonymize_database();'") - check_anonymized_rows(get_player_table_contents()) - ''; - }; + with subtest("Anonymize"): + machine.succeed("sudo -u postgres psql -d demo --command 'select anon.anonymize_database();'") + check_anonymized_rows(get_player_table_contents()) + ''; + } + ); in genTests { inherit makeTestFor; diff --git a/nixos/tests/postgresql/default.nix b/nixos/tests/postgresql/default.nix index a8b03a29280b..a5d363a709ee 100644 --- a/nixos/tests/postgresql/default.nix +++ b/nixos/tests/postgresql/default.nix @@ -1,11 +1,8 @@ { - system ? builtins.currentSystem, - config ? { }, - pkgs ? import ../../.. { inherit system config; }, + runTest, + pkgs, }: -with import ../../lib/testing-python.nix { inherit system pkgs; }; - let inherit (pkgs.lib) recurseIntoAttrs @@ -25,7 +22,12 @@ let } ); - importWithArgs = path: import path { inherit pkgs makeTest genTests; }; + importWithArgs = + path: + import path { + inherit runTest genTests; + inherit (pkgs) lib; + }; in { # postgresql diff --git a/nixos/tests/postgresql/pgjwt.nix b/nixos/tests/postgresql/pgjwt.nix index 6fc43d771b92..b16efeb97ad6 100644 --- a/nixos/tests/postgresql/pgjwt.nix +++ b/nixos/tests/postgresql/pgjwt.nix @@ -1,51 +1,52 @@ { - pkgs, - makeTest, + runTest, genTests, + ... }: let - inherit (pkgs) lib; - makeTestFor = package: - makeTest { - name = "pgjwt-${package.name}"; - meta = with lib.maintainers; { - maintainers = [ - spinus - ]; - }; - - nodes.master = - { ... }: - { - services.postgresql = { - inherit package; - enable = true; - extensions = - ps: with ps; [ - pgjwt - pgtap - ]; - }; + runTest ( + { lib, pkgs, ... }: + { + name = "pgjwt-${package.name}"; + meta = with lib.maintainers; { + maintainers = [ + spinus + ]; }; - testScript = - { nodes, ... }: - let - sqlSU = "${nodes.master.services.postgresql.superUser}"; - pgProve = "${pkgs.perlPackages.TAPParserSourceHandlerpgTAP}"; - inherit (nodes.master.services.postgresql.package.pkgs) pgjwt; - in - '' - start_all() - master.wait_for_unit("postgresql.target") - master.succeed( - "${pkgs.sudo}/bin/sudo -u ${sqlSU} ${pgProve}/bin/pg_prove -d postgres -v -f ${pgjwt.src}/test.sql" - ) - ''; - }; + nodes.master = + { ... }: + { + services.postgresql = { + inherit package; + enable = true; + extensions = + ps: with ps; [ + pgjwt + pgtap + ]; + }; + }; + + testScript = + { nodes, ... }: + let + sqlSU = "${nodes.master.services.postgresql.superUser}"; + pgProve = "${pkgs.perlPackages.TAPParserSourceHandlerpgTAP}"; + inherit (nodes.master.services.postgresql.package.pkgs) pgjwt; + in + '' + start_all() + master.wait_for_unit("postgresql.target") + master.succeed( + "${pkgs.sudo}/bin/sudo -u ${sqlSU} ${pgProve}/bin/pg_prove -d postgres -v -f ${pgjwt.src}/test.sql" + ) + ''; + } + ); in genTests { inherit makeTestFor; diff --git a/nixos/tests/postgresql/postgresql-jit.nix b/nixos/tests/postgresql/postgresql-jit.nix index 347534c8bd85..de62b355d62b 100644 --- a/nixos/tests/postgresql/postgresql-jit.nix +++ b/nixos/tests/postgresql/postgresql-jit.nix @@ -1,53 +1,54 @@ { - pkgs, - makeTest, + runTest, genTests, + ... }: let - inherit (pkgs) lib; - makeTestFor = package: - makeTest { - name = "postgresql-jit-${package.name}"; - meta.maintainers = with lib.maintainers; [ ma27 ]; + runTest ( + { lib, pkgs, ... }: + { + name = "postgresql-jit-${package.name}"; + meta.maintainers = with lib.maintainers; [ ma27 ]; - nodes.machine = - { pkgs, ... }: - { - services.postgresql = { - inherit package; - enable = true; - enableJIT = true; - initialScript = pkgs.writeText "init.sql" '' - create table demo (id int); - insert into demo (id) select generate_series(1, 5); - ''; + nodes.machine = + { pkgs, ... }: + { + services.postgresql = { + inherit package; + enable = true; + enableJIT = true; + initialScript = pkgs.writeText "init.sql" '' + create table demo (id int); + insert into demo (id) select generate_series(1, 5); + ''; + }; }; - }; - testScript = '' - machine.start() - machine.wait_for_unit("postgresql.target") + testScript = '' + machine.start() + machine.wait_for_unit("postgresql.target") - with subtest("JIT is enabled"): - machine.succeed("sudo -u postgres psql <<<'show jit;' | grep 'on'") + with subtest("JIT is enabled"): + machine.succeed("sudo -u postgres psql <<<'show jit;' | grep 'on'") - with subtest("Test JIT works fine"): - output = machine.succeed( - "cat ${pkgs.writeText "test.sql" '' - set jit_above_cost = 1; - EXPLAIN ANALYZE SELECT CONCAT('jit result = ', SUM(id)) FROM demo; - SELECT CONCAT('jit result = ', SUM(id)) from demo; - ''} | sudo -u postgres psql" - ) - t.assertIn("JIT:", output) - t.assertIn("jit result = 15", output) + with subtest("Test JIT works fine"): + output = machine.succeed( + "cat ${pkgs.writeText "test.sql" '' + set jit_above_cost = 1; + EXPLAIN ANALYZE SELECT CONCAT('jit result = ', SUM(id)) FROM demo; + SELECT CONCAT('jit result = ', SUM(id)) from demo; + ''} | sudo -u postgres psql" + ) + t.assertIn("JIT:", output) + t.assertIn("jit result = 15", output) - machine.shutdown() - ''; - }; + machine.shutdown() + ''; + } + ); in genTests { inherit makeTestFor; diff --git a/nixos/tests/postgresql/postgresql-replication.nix b/nixos/tests/postgresql/postgresql-replication.nix index b828c2d7bb49..6df0becdf115 100644 --- a/nixos/tests/postgresql/postgresql-replication.nix +++ b/nixos/tests/postgresql/postgresql-replication.nix @@ -1,125 +1,127 @@ { - pkgs, - makeTest, + runTest, genTests, + ... }: let - inherit (pkgs) lib; makeTestFor = package: - makeTest { - name = "postgresql-replication-${package.name}"; - meta.maintainers = with lib.maintainers; [ bouk ]; + runTest ( + { lib, ... }: + { + name = "postgresql-replication-${package.name}"; + meta.maintainers = with lib.maintainers; [ bouk ]; - nodes = { - primary = - { ... }: - { - services.postgresql = { - inherit package; - enable = true; - enableTCPIP = true; - settings = { - wal_level = "replica"; - max_wal_senders = 10; - max_replication_slots = 10; + nodes = { + primary = + { ... }: + { + services.postgresql = { + inherit package; + enable = true; + enableTCPIP = true; + settings = { + wal_level = "replica"; + max_wal_senders = 10; + max_replication_slots = 10; + }; + authentication = '' + local replication postgres peer + host replication replication all trust + ''; + ensureUsers = [ + { + name = "replication"; + ensureClauses.replication = true; + } + ]; }; - authentication = '' - local replication postgres peer - host replication replication all trust - ''; - ensureUsers = [ - { - name = "replication"; - ensureClauses.replication = true; - } - ]; + networking.firewall.allowedTCPPorts = [ 5432 ]; }; - networking.firewall.allowedTCPPorts = [ 5432 ]; - }; - replica = - { nodes, ... }: - { - services.postgresql = { - inherit package; - enable = true; - settings = { - hot_standby = "on"; - primary_conninfo = "host=${nodes.primary.networking.primaryIPAddress} user=replication"; - primary_slot_name = "replica_slot"; + replica = + { nodes, ... }: + { + services.postgresql = { + inherit package; + enable = true; + settings = { + hot_standby = "on"; + primary_conninfo = "host=${nodes.primary.networking.primaryIPAddress} user=replication"; + primary_slot_name = "replica_slot"; + }; }; }; - }; - }; + }; - testScript = '' - start_all() - primary.wait_for_unit("postgresql.target") + testScript = '' + start_all() + primary.wait_for_unit("postgresql.target") - primary.succeed( - "sudo -u postgres psql -c \"SELECT * FROM pg_create_physical_replication_slot('replica_slot');\"" - ) + primary.succeed( + "sudo -u postgres psql -c \"SELECT * FROM pg_create_physical_replication_slot('replica_slot');\"" + ) - primary.succeed( - "sudo -u postgres pg_basebackup -D /tmp/basebackup -S replica_slot -X stream" - ) - primary.succeed("tar -C /tmp -cf /tmp/shared/basebackup.tar basebackup") + primary.succeed( + "sudo -u postgres pg_basebackup -D /tmp/basebackup -S replica_slot -X stream" + ) + primary.succeed("tar -C /tmp -cf /tmp/shared/basebackup.tar basebackup") - replica.wait_for_unit("postgresql.target") - replica.succeed("systemctl stop postgresql") + replica.wait_for_unit("postgresql.target") + replica.succeed("systemctl stop postgresql") - replica_data_dir = "/var/lib/postgresql/${package.psqlSchema}" - replica.succeed(f"rm -rf {replica_data_dir}") - replica.succeed(f"mkdir -p {replica_data_dir}") - replica.succeed(f"tar -C {replica_data_dir} --strip-components=1 -xf /tmp/shared/basebackup.tar") - replica.succeed(f"touch {replica_data_dir}/standby.signal") - replica.succeed(f"chown -R postgres:postgres {replica_data_dir}") - replica.succeed(f"chmod 700 {replica_data_dir}") + replica_data_dir = "/var/lib/postgresql/${package.psqlSchema}" + replica.succeed(f"rm -rf {replica_data_dir}") + replica.succeed(f"mkdir -p {replica_data_dir}") + replica.succeed(f"tar -C {replica_data_dir} --strip-components=1 -xf /tmp/shared/basebackup.tar") + replica.succeed(f"touch {replica_data_dir}/standby.signal") + replica.succeed(f"chown -R postgres:postgres {replica_data_dir}") + replica.succeed(f"chmod 700 {replica_data_dir}") - replica.succeed("systemctl start postgresql") - replica.wait_for_unit("postgresql.target") + replica.succeed("systemctl start postgresql") + replica.wait_for_unit("postgresql.target") - replica.wait_until_succeeds( - "sudo -u postgres psql -tAc 'SELECT pg_is_in_recovery();' | grep t" - ) + replica.wait_until_succeeds( + "sudo -u postgres psql -tAc 'SELECT pg_is_in_recovery();' | grep t" + ) - primary.succeed( - "sudo -u postgres psql -c 'CREATE TABLE test_replication (id serial PRIMARY KEY, data text);'" - ) - primary.succeed( - "sudo -u postgres psql -c \"INSERT INTO test_replication (data) VALUES ('hello');\"" - ) + primary.succeed( + "sudo -u postgres psql -c 'CREATE TABLE test_replication (id serial PRIMARY KEY, data text);'" + ) + primary.succeed( + "sudo -u postgres psql -c \"INSERT INTO test_replication (data) VALUES ('hello');\"" + ) - replica.wait_until_succeeds( - "sudo -u postgres psql -c 'SELECT * FROM test_replication;' | grep hello", - timeout=30 - ) + replica.wait_until_succeeds( + "sudo -u postgres psql -c 'SELECT * FROM test_replication;' | grep hello", + timeout=30 + ) - with subtest("Verify replica is in recovery mode"): - result = replica.succeed("sudo -u postgres psql -tAc 'SELECT pg_is_in_recovery();'") - t.assertEqual(result.strip(), "t") + with subtest("Verify replica is in recovery mode"): + result = replica.succeed("sudo -u postgres psql -tAc 'SELECT pg_is_in_recovery();'") + t.assertEqual(result.strip(), "t") - with subtest("Verify replication slot is active"): - result = primary.succeed( - "sudo -u postgres psql -tAc \"SELECT active FROM pg_replication_slots WHERE slot_name = 'replica_slot';\"" - ) - t.assertEqual(result.strip(), "t") + with subtest("Verify replication slot is active"): + result = primary.succeed( + "sudo -u postgres psql -tAc \"SELECT active FROM pg_replication_slots WHERE slot_name = 'replica_slot';\"" + ) + t.assertEqual(result.strip(), "t") - with subtest("Insert more data and verify replication"): - primary.succeed( - "sudo -u postgres psql -c \"INSERT INTO test_replication (data) VALUES ('world');\"" - ) - replica.wait_until_succeeds( - "sudo -u postgres psql -c 'SELECT * FROM test_replication;' | grep world", - timeout=30 - ) + with subtest("Insert more data and verify replication"): + primary.succeed( + "sudo -u postgres psql -c \"INSERT INTO test_replication (data) VALUES ('world');\"" + ) + replica.wait_until_succeeds( + "sudo -u postgres psql -c 'SELECT * FROM test_replication;' | grep world", + timeout=30 + ) - primary.shutdown() - replica.shutdown() - ''; - }; + primary.shutdown() + replica.shutdown() + ''; + } + ); in genTests { inherit makeTestFor; } diff --git a/nixos/tests/postgresql/postgresql-tls-client-cert.nix b/nixos/tests/postgresql/postgresql-tls-client-cert.nix index acb531780f76..19af512e28ff 100644 --- a/nixos/tests/postgresql/postgresql-tls-client-cert.nix +++ b/nixos/tests/postgresql/postgresql-tls-client-cert.nix @@ -1,145 +1,147 @@ { - pkgs, - makeTest, + runTest, genTests, + ... }: let - inherit (pkgs) lib; - - runWithOpenSSL = - file: cmd: - pkgs.runCommand file { - buildInputs = [ pkgs.openssl ]; - } cmd; - caKey = runWithOpenSSL "ca.key" "openssl ecparam -name prime256v1 -genkey -noout -out $out"; - caCert = runWithOpenSSL "ca.crt" '' - openssl req -new -x509 -sha256 -key ${caKey} -out $out -subj "/CN=test.example" -days 36500 - ''; - serverKey = runWithOpenSSL "server.key" "openssl ecparam -name prime256v1 -genkey -noout -out $out"; - serverKeyPath = "/var/lib/postgresql"; - serverCert = runWithOpenSSL "server.crt" '' - openssl req -new -sha256 -key ${serverKey} -out server.csr -subj "/CN=db.test.example" - openssl x509 -req -in server.csr -CA ${caCert} -CAkey ${caKey} \ - -CAcreateserial -out $out -days 36500 -sha256 - ''; - clientKey = runWithOpenSSL "client.key" "openssl ecparam -name prime256v1 -genkey -noout -out $out"; - clientCert = runWithOpenSSL "client.crt" '' - openssl req -new -sha256 -key ${clientKey} -out client.csr -subj "/CN=test" - openssl x509 -req -in client.csr -CA ${caCert} -CAkey ${caKey} \ - -CAcreateserial -out $out -days 36500 -sha256 - ''; - clientKeyPath = "/root"; - makeTestFor = package: - makeTest { - name = "postgresql-tls-client-cert-${package.name}"; - meta.maintainers = with lib.maintainers; [ erictapen ]; + runTest ( + { lib, pkgs, ... }: + let + runWithOpenSSL = + file: cmd: + pkgs.runCommand file { + buildInputs = [ pkgs.openssl ]; + } cmd; + caKey = runWithOpenSSL "ca.key" "openssl ecparam -name prime256v1 -genkey -noout -out $out"; + caCert = runWithOpenSSL "ca.crt" '' + openssl req -new -x509 -sha256 -key ${caKey} -out $out -subj "/CN=test.example" -days 36500 + ''; + serverKey = runWithOpenSSL "server.key" "openssl ecparam -name prime256v1 -genkey -noout -out $out"; + serverKeyPath = "/var/lib/postgresql"; + serverCert = runWithOpenSSL "server.crt" '' + openssl req -new -sha256 -key ${serverKey} -out server.csr -subj "/CN=db.test.example" + openssl x509 -req -in server.csr -CA ${caCert} -CAkey ${caKey} \ + -CAcreateserial -out $out -days 36500 -sha256 + ''; + clientKey = runWithOpenSSL "client.key" "openssl ecparam -name prime256v1 -genkey -noout -out $out"; + clientCert = runWithOpenSSL "client.crt" '' + openssl req -new -sha256 -key ${clientKey} -out client.csr -subj "/CN=test" + openssl x509 -req -in client.csr -CA ${caCert} -CAkey ${caKey} \ + -CAcreateserial -out $out -days 36500 -sha256 + ''; + clientKeyPath = "/root"; + in + { + name = "postgresql-tls-client-cert-${package.name}"; + meta.maintainers = with lib.maintainers; [ erictapen ]; - nodes.server = - { ... }: - { - systemd.services.create-keys = { - wantedBy = [ "postgresql.target" ]; + nodes.server = + { ... }: + { + systemd.services.create-keys = { + wantedBy = [ "postgresql.target" ]; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + + script = '' + mkdir -p '${serverKeyPath}' + cp '${serverKey}' '${serverKeyPath}/server.key' + chown postgres:postgres '${serverKeyPath}/server.key' + chmod 600 '${serverKeyPath}/server.key' + ''; }; - - script = '' - mkdir -p '${serverKeyPath}' - cp '${serverKey}' '${serverKeyPath}/server.key' - chown postgres:postgres '${serverKeyPath}/server.key' - chmod 600 '${serverKeyPath}/server.key' - ''; - }; - services.postgresql = { - inherit package; - enable = true; - enableTCPIP = true; - ensureUsers = [ - { - name = "test"; - ensureDBOwnership = true; - } - ]; - ensureDatabases = [ "test" ]; - settings = { - ssl = "on"; - ssl_ca_file = toString caCert; - ssl_cert_file = toString serverCert; - ssl_key_file = "${serverKeyPath}/server.key"; - }; - authentication = '' - hostssl test test ::/0 cert clientcert=verify-full - ''; - }; - networking = { - interfaces.eth1 = { - ipv6.addresses = [ + services.postgresql = { + inherit package; + enable = true; + enableTCPIP = true; + ensureUsers = [ { - address = "fc00::1"; - prefixLength = 120; + name = "test"; + ensureDBOwnership = true; } ]; + ensureDatabases = [ "test" ]; + settings = { + ssl = "on"; + ssl_ca_file = toString caCert; + ssl_cert_file = toString serverCert; + ssl_key_file = "${serverKeyPath}/server.key"; + }; + authentication = '' + hostssl test test ::/0 cert clientcert=verify-full + ''; }; - firewall.allowedTCPPorts = [ 5432 ]; - }; - }; - - nodes.client = - { ... }: - { - systemd.services.create-keys = { - wantedBy = [ "multi-user.target" ]; - - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - }; - - script = '' - mkdir -p '${clientKeyPath}' - cp '${clientKey}' '${clientKeyPath}/client.key' - chown root:root '${clientKeyPath}/client.key' - chmod 600 '${clientKeyPath}/client.key' - ''; - }; - environment = { - variables = { - PGHOST = "db.test.example"; - PGPORT = "5432"; - PGDATABASE = "test"; - PGUSER = "test"; - PGSSLMODE = "verify-full"; - PGSSLCERT = clientCert; - PGSSLKEY = "${clientKeyPath}/client.key"; - PGSSLROOTCERT = caCert; - }; - systemPackages = [ package ]; - }; - networking = { - interfaces.eth1 = { - ipv6.addresses = [ - { - address = "fc00::2"; - prefixLength = 120; - } - ]; - }; - hosts = { - "fc00::1" = [ "db.test.example" ]; + networking = { + interfaces.eth1 = { + ipv6.addresses = [ + { + address = "fc00::1"; + prefixLength = 120; + } + ]; + }; + firewall.allowedTCPPorts = [ 5432 ]; }; }; - }; - testScript = '' - server.wait_for_unit("multi-user.target") - client.wait_for_unit("multi-user.target") - client.succeed("psql -c \"SELECT 1;\"") - ''; - }; + nodes.client = + { ... }: + { + systemd.services.create-keys = { + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + + script = '' + mkdir -p '${clientKeyPath}' + cp '${clientKey}' '${clientKeyPath}/client.key' + chown root:root '${clientKeyPath}/client.key' + chmod 600 '${clientKeyPath}/client.key' + ''; + }; + environment = { + variables = { + PGHOST = "db.test.example"; + PGPORT = "5432"; + PGDATABASE = "test"; + PGUSER = "test"; + PGSSLMODE = "verify-full"; + PGSSLCERT = clientCert; + PGSSLKEY = "${clientKeyPath}/client.key"; + PGSSLROOTCERT = caCert; + }; + systemPackages = [ package ]; + }; + networking = { + interfaces.eth1 = { + ipv6.addresses = [ + { + address = "fc00::2"; + prefixLength = 120; + } + ]; + }; + hosts = { + "fc00::1" = [ "db.test.example" ]; + }; + }; + }; + + testScript = '' + server.wait_for_unit("multi-user.target") + client.wait_for_unit("multi-user.target") + client.succeed("psql -c \"SELECT 1;\"") + ''; + } + ); in genTests { inherit makeTestFor; } diff --git a/nixos/tests/postgresql/postgresql-wal-receiver.nix b/nixos/tests/postgresql/postgresql-wal-receiver.nix index c233a582546c..f929596cf614 100644 --- a/nixos/tests/postgresql/postgresql-wal-receiver.nix +++ b/nixos/tests/postgresql/postgresql-wal-receiver.nix @@ -1,111 +1,112 @@ { - pkgs, - makeTest, + runTest, genTests, + ... }: let - inherit (pkgs) lib; - makeTestFor = package: - let - postgresqlDataDir = "/var/lib/postgresql/${package.psqlSchema}"; - replicationUser = "wal_receiver_user"; - replicationSlot = "wal_receiver_slot"; - replicationConn = "postgresql://${replicationUser}@localhost"; - baseBackupDir = "/var/cache/wals/pg_basebackup"; - walBackupDir = "/var/cache/wals/pg_wal"; - recoveryFile = pkgs.writeTextDir "recovery.signal" ""; - in - makeTest { - name = "postgresql-wal-receiver-${package.name}"; - meta.maintainers = with lib.maintainers; [ euxane ]; + runTest ( + { lib, pkgs, ... }: + let + postgresqlDataDir = "/var/lib/postgresql/${package.psqlSchema}"; + replicationUser = "wal_receiver_user"; + replicationSlot = "wal_receiver_slot"; + replicationConn = "postgresql://${replicationUser}@localhost"; + baseBackupDir = "/var/cache/wals/pg_basebackup"; + walBackupDir = "/var/cache/wals/pg_wal"; + recoveryFile = pkgs.writeTextDir "recovery.signal" ""; + in + { + name = "postgresql-wal-receiver-${package.name}"; + meta.maintainers = with lib.maintainers; [ euxane ]; - nodes.machine = - { ... }: - { - systemd.tmpfiles.rules = [ - "d /var/cache/wals 0750 postgres postgres - -" - ]; + nodes.machine = + { ... }: + { + systemd.tmpfiles.rules = [ + "d /var/cache/wals 0750 postgres postgres - -" + ]; - services.postgresql = { - inherit package; - enable = true; - settings = { - max_replication_slots = 10; - max_wal_senders = 10; - recovery_end_command = "touch recovery.done"; - restore_command = "cp ${walBackupDir}/%f %p"; - wal_level = "archive"; # alias for replica on pg >= 9.6 + services.postgresql = { + inherit package; + enable = true; + settings = { + max_replication_slots = 10; + max_wal_senders = 10; + recovery_end_command = "touch recovery.done"; + restore_command = "cp ${walBackupDir}/%f %p"; + wal_level = "archive"; # alias for replica on pg >= 9.6 + }; + authentication = '' + host replication ${replicationUser} all trust + ''; + initialScript = pkgs.writeText "init.sql" '' + create user ${replicationUser} replication; + select * from pg_create_physical_replication_slot('${replicationSlot}'); + ''; }; - authentication = '' - host replication ${replicationUser} all trust - ''; - initialScript = pkgs.writeText "init.sql" '' - create user ${replicationUser} replication; - select * from pg_create_physical_replication_slot('${replicationSlot}'); - ''; + + services.postgresqlWalReceiver.receivers.main = { + postgresqlPackage = package; + connection = replicationConn; + slot = replicationSlot; + directory = walBackupDir; + }; + # This is only to speedup test, it isn't time racing. Service is set to autorestart always, + # default 60sec is fine for real system, but is too much for a test + systemd.services.postgresql-wal-receiver-main.serviceConfig.RestartSec = lib.mkForce 5; + systemd.services.postgresql.serviceConfig.ReadWritePaths = [ "/var/cache/wals" ]; }; - services.postgresqlWalReceiver.receivers.main = { - postgresqlPackage = package; - connection = replicationConn; - slot = replicationSlot; - directory = walBackupDir; - }; - # This is only to speedup test, it isn't time racing. Service is set to autorestart always, - # default 60sec is fine for real system, but is too much for a test - systemd.services.postgresql-wal-receiver-main.serviceConfig.RestartSec = lib.mkForce 5; - systemd.services.postgresql.serviceConfig.ReadWritePaths = [ "/var/cache/wals" ]; - }; + testScript = '' + # make an initial base backup + machine.wait_for_unit("postgresql.target") + machine.wait_for_unit("postgresql-wal-receiver-main") + # WAL receiver healthchecks PG every 5 seconds, so let's be sure they have connected each other + # required only for 9.4 + machine.sleep(5) + machine.succeed( + "${package}/bin/pg_basebackup --dbname=${replicationConn} --pgdata=${baseBackupDir}" + ) - testScript = '' - # make an initial base backup - machine.wait_for_unit("postgresql.target") - machine.wait_for_unit("postgresql-wal-receiver-main") - # WAL receiver healthchecks PG every 5 seconds, so let's be sure they have connected each other - # required only for 9.4 - machine.sleep(5) - machine.succeed( - "${package}/bin/pg_basebackup --dbname=${replicationConn} --pgdata=${baseBackupDir}" - ) + # create a dummy table with 100 records + machine.succeed( + "sudo -u postgres psql --command='create table dummy as select * from generate_series(1, 100) as val;'" + ) - # create a dummy table with 100 records - machine.succeed( - "sudo -u postgres psql --command='create table dummy as select * from generate_series(1, 100) as val;'" - ) + # stop postgres and destroy data + machine.systemctl("stop postgresql") + machine.systemctl("stop postgresql-wal-receiver-main") + machine.succeed("rm -r ${postgresqlDataDir}/{base,global,pg_*}") - # stop postgres and destroy data - machine.systemctl("stop postgresql") - machine.systemctl("stop postgresql-wal-receiver-main") - machine.succeed("rm -r ${postgresqlDataDir}/{base,global,pg_*}") + # restore the base backup + machine.succeed( + "cp -r ${baseBackupDir}/* ${postgresqlDataDir} && chown postgres:postgres -R ${postgresqlDataDir}" + ) - # restore the base backup - machine.succeed( - "cp -r ${baseBackupDir}/* ${postgresqlDataDir} && chown postgres:postgres -R ${postgresqlDataDir}" - ) + # prepare WAL and recovery + machine.succeed("chmod a+rX -R ${walBackupDir}") + machine.execute( + "for part in ${walBackupDir}/*.partial; do mv $part ''${part%%.*}; done" + ) # make use of partial segments too + machine.succeed( + "cp ${recoveryFile}/* ${postgresqlDataDir}/ && chmod 666 ${postgresqlDataDir}/recovery*" + ) - # prepare WAL and recovery - machine.succeed("chmod a+rX -R ${walBackupDir}") - machine.execute( - "for part in ${walBackupDir}/*.partial; do mv $part ''${part%%.*}; done" - ) # make use of partial segments too - machine.succeed( - "cp ${recoveryFile}/* ${postgresqlDataDir}/ && chmod 666 ${postgresqlDataDir}/recovery*" - ) + # replay WAL + machine.systemctl("start postgresql") + machine.wait_for_file("${postgresqlDataDir}/recovery.done") + machine.systemctl("restart postgresql") + machine.wait_for_unit("postgresql.target") - # replay WAL - machine.systemctl("start postgresql") - machine.wait_for_file("${postgresqlDataDir}/recovery.done") - machine.systemctl("restart postgresql") - machine.wait_for_unit("postgresql.target") - - # check that our records have been restored - machine.succeed( - "test $(sudo -u postgres psql --pset='pager=off' --tuples-only --command='select count(distinct val) from dummy;') -eq 100" - ) - ''; - }; + # check that our records have been restored + machine.succeed( + "test $(sudo -u postgres psql --pset='pager=off' --tuples-only --command='select count(distinct val) from dummy;') -eq 100" + ) + ''; + } + ); in genTests { inherit makeTestFor; } diff --git a/nixos/tests/postgresql/postgresql.nix b/nixos/tests/postgresql/postgresql.nix index 32a096346445..d832f5caa4e9 100644 --- a/nixos/tests/postgresql/postgresql.nix +++ b/nixos/tests/postgresql/postgresql.nix @@ -1,12 +1,11 @@ { - pkgs, - makeTest, + runTest, genTests, + lib, + ... }: let - inherit (pkgs) lib; - makeTestFor = package: lib.recurseIntoAttrs { @@ -15,263 +14,271 @@ let postgresql-clauses = makeEnsureTestFor package; }; - test-sql = pkgs.writeText "postgresql-test" '' - CREATE EXTENSION pgcrypto; -- just to check if lib loading works - CREATE TABLE sth ( - id int - ); - INSERT INTO sth (id) VALUES (1); - INSERT INTO sth (id) VALUES (1); - INSERT INTO sth (id) VALUES (1); - INSERT INTO sth (id) VALUES (1); - INSERT INTO sth (id) VALUES (1); - CREATE TABLE xmltest ( doc xml ); - INSERT INTO xmltest (doc) VALUES ('ok'); -- check if libxml2 enabled - - -- check if hardening gets relaxed - CREATE EXTENSION plv8; - -- try to trigger the V8 JIT, which requires MemoryDenyWriteExecute - DO $$ - let xs = []; - for (let i = 0, n = 400000; i < n; i++) { - xs.push(Math.round(Math.random() * n)) - } - console.log(xs.reduce((acc, x) => acc + x, 0)); - $$ LANGUAGE plv8; - ''; - makeTestForWithBackupAll = package: backupAll: - makeTest { - name = "postgresql${lib.optionalString backupAll "-backup-all"}-${package.name}"; - meta = with lib.maintainers; { - maintainers = [ zagy ]; - }; + runTest ( + { lib, pkgs, ... }: + let + test-sql = pkgs.writeText "postgresql-test" '' + CREATE EXTENSION pgcrypto; -- just to check if lib loading works + CREATE TABLE sth ( + id int + ); + INSERT INTO sth (id) VALUES (1); + INSERT INTO sth (id) VALUES (1); + INSERT INTO sth (id) VALUES (1); + INSERT INTO sth (id) VALUES (1); + INSERT INTO sth (id) VALUES (1); + CREATE TABLE xmltest ( doc xml ); + INSERT INTO xmltest (doc) VALUES ('ok'); -- check if libxml2 enabled - nodes.machine = - { config, ... }: - { - services.postgresql = { - inherit package; - enable = true; - identMap = '' - postgres root postgres - ''; - # TODO(@Ma27) split this off into its own VM test and move a few other - # extension tests to use postgresqlTestExtension. - extensions = ps: with ps; [ plv8 ]; - }; + -- check if hardening gets relaxed + CREATE EXTENSION plv8; + -- try to trigger the V8 JIT, which requires MemoryDenyWriteExecute + DO $$ + let xs = []; + for (let i = 0, n = 400000; i < n; i++) { + xs.push(Math.round(Math.random() * n)) + } + console.log(xs.reduce((acc, x) => acc + x, 0)); + $$ LANGUAGE plv8; + ''; - services.postgresqlBackup = { - enable = true; - databases = lib.optional (!backupAll) "postgres"; - pgdumpOptions = "--restrict-key=ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - pgdumpAllOptions = "--restrict-key=ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - }; + in + { + name = "postgresql${lib.optionalString backupAll "-backup-all"}-${package.name}"; + meta = with lib.maintainers; { + maintainers = [ zagy ]; }; - testScript = - let - backupName = if backupAll then "all" else "postgres"; - backupService = if backupAll then "postgresqlBackup" else "postgresqlBackup-postgres"; - backupFileBase = "/var/backup/postgresql/${backupName}"; - in - '' - def check_count(statement, lines): - return 'test $(psql -U postgres postgres -tAc "{}"|wc -l) -eq {}'.format( - statement, lines - ) + nodes.machine = + { config, ... }: + { + services.postgresql = { + inherit package; + enable = true; + identMap = '' + postgres root postgres + ''; + # TODO(@Ma27) split this off into its own VM test and move a few other + # extension tests to use postgresqlTestExtension. + extensions = ps: with ps; [ plv8 ]; + }; + + services.postgresqlBackup = { + enable = true; + databases = lib.optional (!backupAll) "postgres"; + pgdumpOptions = "--restrict-key=ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + pgdumpAllOptions = "--restrict-key=ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + }; + }; + + testScript = + let + backupName = if backupAll then "all" else "postgres"; + backupService = if backupAll then "postgresqlBackup" else "postgresqlBackup-postgres"; + backupFileBase = "/var/backup/postgresql/${backupName}"; + in + '' + def check_count(statement, lines): + return 'test $(psql -U postgres postgres -tAc "{}"|wc -l) -eq {}'.format( + statement, lines + ) - machine.start() - machine.wait_for_unit("postgresql.target") + machine.start() + machine.wait_for_unit("postgresql.target") - with subtest("Postgresql is available just after unit start"): - machine.succeed( - "cat ${test-sql} | sudo -u postgres psql" - ) + with subtest("Postgresql is available just after unit start"): + machine.succeed( + "cat ${test-sql} | sudo -u postgres psql" + ) - with subtest("Postgresql survives restart (bug #1735)"): - machine.shutdown() - import time - time.sleep(2) - machine.start() - machine.wait_for_unit("postgresql.target") + with subtest("Postgresql survives restart (bug #1735)"): + machine.shutdown() + import time + time.sleep(2) + machine.start() + machine.wait_for_unit("postgresql.target") - machine.fail(check_count("SELECT * FROM sth;", 3)) - machine.succeed(check_count("SELECT * FROM sth;", 5)) - machine.fail(check_count("SELECT * FROM sth;", 4)) - machine.succeed(check_count("SELECT xpath('/test/text()', doc) FROM xmltest;", 1)) + machine.fail(check_count("SELECT * FROM sth;", 3)) + machine.succeed(check_count("SELECT * FROM sth;", 5)) + machine.fail(check_count("SELECT * FROM sth;", 4)) + machine.succeed(check_count("SELECT xpath('/test/text()', doc) FROM xmltest;", 1)) - with subtest("killing postgres process should trigger an automatic restart"): - machine.succeed("systemctl kill -s KILL postgresql") + with subtest("killing postgres process should trigger an automatic restart"): + machine.succeed("systemctl kill -s KILL postgresql") - machine.wait_until_succeeds("systemctl is-active postgresql.service") - machine.wait_until_succeeds("systemctl is-active postgresql.target") + machine.wait_until_succeeds("systemctl is-active postgresql.service") + machine.wait_until_succeeds("systemctl is-active postgresql.target") - with subtest("Backup service works"): - machine.succeed( - "systemctl start ${backupService}.service", - "zcat ${backupFileBase}.sql.gz | grep 'ok'", - "ls -hal /var/backup/postgresql/ >/dev/console", - "stat -c '%a' ${backupFileBase}.sql.gz | grep 600", - ) - with subtest("Backup service removes prev files"): - machine.succeed( - # Create dummy prev files. - "touch ${backupFileBase}.prev.sql{,.gz,.zstd}", - "chown postgres:postgres ${backupFileBase}.prev.sql{,.gz,.zstd}", + with subtest("Backup service works"): + machine.succeed( + "systemctl start ${backupService}.service", + "zcat ${backupFileBase}.sql.gz | grep 'ok'", + "ls -hal /var/backup/postgresql/ >/dev/console", + "stat -c '%a' ${backupFileBase}.sql.gz | grep 600", + ) + with subtest("Backup service removes prev files"): + machine.succeed( + # Create dummy prev files. + "touch ${backupFileBase}.prev.sql{,.gz,.zstd}", + "chown postgres:postgres ${backupFileBase}.prev.sql{,.gz,.zstd}", - # Run backup. - "systemctl start ${backupService}.service", - "ls -hal /var/backup/postgresql/ >/dev/console", + # Run backup. + "systemctl start ${backupService}.service", + "ls -hal /var/backup/postgresql/ >/dev/console", - # Since nothing has changed in the database, the cur and prev files - # should match. - "zcat ${backupFileBase}.sql.gz | grep 'ok'", - "cmp ${backupFileBase}.sql.gz ${backupFileBase}.prev.sql.gz", + # Since nothing has changed in the database, the cur and prev files + # should match. + "zcat ${backupFileBase}.sql.gz | grep 'ok'", + "cmp ${backupFileBase}.sql.gz ${backupFileBase}.prev.sql.gz", - # The prev files with unused suffix should be removed. - "[ ! -f '${backupFileBase}.prev.sql' ]", - "[ ! -f '${backupFileBase}.prev.sql.zstd' ]", + # The prev files with unused suffix should be removed. + "[ ! -f '${backupFileBase}.prev.sql' ]", + "[ ! -f '${backupFileBase}.prev.sql.zstd' ]", - # Both cur and prev file should only be accessible by the postgres user. - "stat -c '%a' ${backupFileBase}.sql.gz | grep 600", - "stat -c '%a' '${backupFileBase}.prev.sql.gz' | grep 600", - ) - with subtest("Backup service fails gracefully"): - # Sabotage the backup process - machine.succeed("rm /run/postgresql/.s.PGSQL.5432") - machine.fail( - "systemctl start ${backupService}.service", - ) - machine.succeed( - "ls -hal /var/backup/postgresql/ >/dev/console", - "zcat ${backupFileBase}.prev.sql.gz | grep 'ok'", - "stat ${backupFileBase}.in-progress.sql.gz", - ) - # In a previous version, the second run would overwrite prev.sql.gz, - # so we test a second run as well. - machine.fail( - "systemctl start ${backupService}.service", - ) - machine.succeed( - "stat ${backupFileBase}.in-progress.sql.gz", - "zcat ${backupFileBase}.prev.sql.gz | grep 'ok'", - ) + # Both cur and prev file should only be accessible by the postgres user. + "stat -c '%a' ${backupFileBase}.sql.gz | grep 600", + "stat -c '%a' '${backupFileBase}.prev.sql.gz' | grep 600", + ) + with subtest("Backup service fails gracefully"): + # Sabotage the backup process + machine.succeed("rm /run/postgresql/.s.PGSQL.5432") + machine.fail( + "systemctl start ${backupService}.service", + ) + machine.succeed( + "ls -hal /var/backup/postgresql/ >/dev/console", + "zcat ${backupFileBase}.prev.sql.gz | grep 'ok'", + "stat ${backupFileBase}.in-progress.sql.gz", + ) + # In a previous version, the second run would overwrite prev.sql.gz, + # so we test a second run as well. + machine.fail( + "systemctl start ${backupService}.service", + ) + machine.succeed( + "stat ${backupFileBase}.in-progress.sql.gz", + "zcat ${backupFileBase}.prev.sql.gz | grep 'ok'", + ) - with subtest("Initdb works"): - machine.succeed("sudo -u postgres initdb -D /tmp/testpostgres2") + with subtest("Initdb works"): + machine.succeed("sudo -u postgres initdb -D /tmp/testpostgres2") - machine.log(machine.execute("systemd-analyze security postgresql.service | grep -v ✓")[1]) + machine.log(machine.execute("systemd-analyze security postgresql.service | grep -v ✓")[1]) - machine.shutdown() - ''; - }; + machine.shutdown() + ''; + } + ); makeEnsureTestFor = package: - makeTest { - name = "postgresql-clauses-${package.name}"; - meta = with lib.maintainers; { - maintainers = [ zagy ]; - }; - - nodes.machine = - { ... }: - { - services.postgresql = { - inherit package; - enable = true; - ensureUsers = [ - { - name = "all-clauses"; - ensureClauses = { - superuser = true; - createdb = true; - createrole = true; - "inherit" = true; - login = true; - replication = true; - bypassrls = true; - # SCRAM-SHA-256 hashed password for "password" - password = "SCRAM-SHA-256$4096:SZEJF5Si4QZ6l4fedrZZWQ==$6u3PWVcz+dts+NdpByPIjKa4CaSnoXGG3M2vpo76bVU=:WSZ0iGUCmVtKYVvNX0pFOp/60IgsdJ+90Y67Eun+QE0="; - connection_limit = 5; - }; - } - { - name = "default-clauses"; - } - ]; - }; + runTest ( + { lib, ... }: + { + name = "postgresql-clauses-${package.name}"; + meta = with lib.maintainers; { + maintainers = [ zagy ]; }; - testScript = - let - getClausesQuery = - user: - lib.concatStringsSep " " [ - "SELECT row_to_json(row)" - "FROM (" - "SELECT" - "rolsuper," - "rolinherit," - "rolcreaterole," - "rolcreatedb," - "rolcanlogin," - "rolreplication," - "rolbypassrls," - "rolconnlimit," - "rolpassword" - "FROM pg_authid" - "WHERE rolname = '${user}'" - ") row;" - ]; - in - '' - import json - machine.start() - machine.wait_for_unit("postgresql.target") + nodes.machine = + { ... }: + { + services.postgresql = { + inherit package; + enable = true; + ensureUsers = [ + { + name = "all-clauses"; + ensureClauses = { + superuser = true; + createdb = true; + createrole = true; + "inherit" = true; + login = true; + replication = true; + bypassrls = true; + # SCRAM-SHA-256 hashed password for "password" + password = "SCRAM-SHA-256$4096:SZEJF5Si4QZ6l4fedrZZWQ==$6u3PWVcz+dts+NdpByPIjKa4CaSnoXGG3M2vpo76bVU=:WSZ0iGUCmVtKYVvNX0pFOp/60IgsdJ+90Y67Eun+QE0="; + connection_limit = 5; + }; + } + { + name = "default-clauses"; + } + ]; + }; + }; - with subtest("All user permissions are set according to the ensureClauses attr"): - clauses = json.loads( - machine.succeed( - "sudo -u postgres psql -tc \"${getClausesQuery "all-clauses"}\"" + testScript = + let + getClausesQuery = + user: + lib.concatStringsSep " " [ + "SELECT row_to_json(row)" + "FROM (" + "SELECT" + "rolsuper," + "rolinherit," + "rolcreaterole," + "rolcreatedb," + "rolcanlogin," + "rolreplication," + "rolbypassrls," + "rolconnlimit," + "rolpassword" + "FROM pg_authid" + "WHERE rolname = '${user}'" + ") row;" + ]; + in + '' + import json + machine.start() + machine.wait_for_unit("postgresql.target") + + with subtest("All user permissions are set according to the ensureClauses attr"): + clauses = json.loads( + machine.succeed( + "sudo -u postgres psql -tc \"${getClausesQuery "all-clauses"}\"" + ) ) - ) - print(clauses) - t.assertTrue(clauses["rolsuper"]) - t.assertTrue(clauses["rolinherit"]) - t.assertTrue(clauses["rolcreaterole"]) - t.assertTrue(clauses["rolcreatedb"]) - t.assertTrue(clauses["rolcanlogin"]) - t.assertTrue(clauses["rolreplication"]) - t.assertTrue(clauses["rolbypassrls"]) - t.assertTrue(clauses["rolconnlimit"] == 5) - t.assertTrue(clauses["rolpassword"]) - machine.succeed( - "PGPASSWORD='password' psql -h localhost -U all-clauses -d postgres -c \"SELECT 1\"" - ) - - with subtest("All user permissions default when ensureClauses is not provided"): - clauses = json.loads( + print(clauses) + t.assertTrue(clauses["rolsuper"]) + t.assertTrue(clauses["rolinherit"]) + t.assertTrue(clauses["rolcreaterole"]) + t.assertTrue(clauses["rolcreatedb"]) + t.assertTrue(clauses["rolcanlogin"]) + t.assertTrue(clauses["rolreplication"]) + t.assertTrue(clauses["rolbypassrls"]) + t.assertTrue(clauses["rolconnlimit"] == 5) + t.assertTrue(clauses["rolpassword"]) machine.succeed( - "sudo -u postgres psql -tc \"${getClausesQuery "default-clauses"}\"" + "PGPASSWORD='password' psql -h localhost -U all-clauses -d postgres -c \"SELECT 1\"" ) - ) - t.assertFalse(clauses["rolsuper"]) - t.assertTrue(clauses["rolinherit"]) - t.assertFalse(clauses["rolcreaterole"]) - t.assertFalse(clauses["rolcreatedb"]) - t.assertTrue(clauses["rolcanlogin"]) - t.assertFalse(clauses["rolreplication"]) - t.assertFalse(clauses["rolbypassrls"]) - t.assertFalse(clauses["rolconnlimit"] == 5) - t.assertFalse(clauses["rolpassword"]) - machine.shutdown() - ''; - }; + with subtest("All user permissions default when ensureClauses is not provided"): + clauses = json.loads( + machine.succeed( + "sudo -u postgres psql -tc \"${getClausesQuery "default-clauses"}\"" + ) + ) + t.assertFalse(clauses["rolsuper"]) + t.assertTrue(clauses["rolinherit"]) + t.assertFalse(clauses["rolcreaterole"]) + t.assertFalse(clauses["rolcreatedb"]) + t.assertTrue(clauses["rolcanlogin"]) + t.assertFalse(clauses["rolreplication"]) + t.assertFalse(clauses["rolbypassrls"]) + t.assertFalse(clauses["rolconnlimit"] == 5) + t.assertFalse(clauses["rolpassword"]) + + machine.shutdown() + ''; + } + ); in genTests { inherit makeTestFor; } diff --git a/nixos/tests/postgresql/wal2json.nix b/nixos/tests/postgresql/wal2json.nix index 708c24ebabd6..511b1a7a2e8c 100644 --- a/nixos/tests/postgresql/wal2json.nix +++ b/nixos/tests/postgresql/wal2json.nix @@ -1,47 +1,48 @@ { - pkgs, - makeTest, + runTest, genTests, + ... }: let - inherit (pkgs) lib; - makeTestFor = package: - makeTest { - name = "wal2json-${package.name}"; - meta.maintainers = with pkgs.lib.maintainers; [ euank ]; + runTest ( + { lib, pkgs, ... }: + { + name = "wal2json-${package.name}"; + meta.maintainers = with pkgs.lib.maintainers; [ euank ]; - nodes.machine = { - services.postgresql = { - inherit package; - enable = true; - extensions = with package.pkgs; [ wal2json ]; - settings = { - wal_level = "logical"; - max_replication_slots = "10"; - max_wal_senders = "10"; + nodes.machine = { + services.postgresql = { + inherit package; + enable = true; + extensions = with package.pkgs; [ wal2json ]; + settings = { + wal_level = "logical"; + max_replication_slots = "10"; + max_wal_senders = "10"; + }; }; }; - }; - testScript = '' - machine.wait_for_unit("postgresql.target") - machine.succeed( - "sudo -u postgres psql -qAt -f ${./wal2json/example2.sql} postgres > /tmp/example2.out" - ) - machine.succeed( - "diff ${./wal2json/example2.out} /tmp/example2.out" - ) - machine.succeed( - "sudo -u postgres psql -qAt -f ${./wal2json/example3.sql} postgres > /tmp/example3.out" - ) - machine.succeed( - "diff ${./wal2json/example3.out} /tmp/example3.out" - ) - ''; - }; + testScript = '' + machine.wait_for_unit("postgresql.target") + machine.succeed( + "sudo -u postgres psql -qAt -f ${./wal2json/example2.sql} postgres > /tmp/example2.out" + ) + machine.succeed( + "diff ${./wal2json/example2.out} /tmp/example2.out" + ) + machine.succeed( + "sudo -u postgres psql -qAt -f ${./wal2json/example3.sql} postgres > /tmp/example3.out" + ) + machine.succeed( + "diff ${./wal2json/example3.out} /tmp/example3.out" + ) + ''; + } + ); in genTests { inherit makeTestFor; diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 1c1488350a68..45c0d9964a03 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -1008,6 +1008,9 @@ let # missing optional dependencies conda = addPackageRequires super.conda [ self.projectile ]; + # https://github.com/NixOS/nixpkgs/issues/483425 + consult = addPackageRequires super.consult [ self.flymake ]; + # needs network during compilation, also native-ice consult-gh = ignoreCompilationError ( super.consult-gh.overrideAttrs (old: { diff --git a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix index bdce756a7ae0..09663744d933 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix @@ -10,12 +10,12 @@ vimUtils, }: let - version = "6b01f95-unstable-2026-01-24"; + version = "0523fe3-unstable-2026-01-25"; src = fetchFromGitHub { owner = "dmtrKovalenko"; repo = "fff.nvim"; - rev = "6b01f95ca6305511ef28175c42b250925376f181"; - hash = "sha256-vI1oOVzpTpYZ0ea6w0e2wyKa0TsyLFFauOZkhYbXLYM="; + rev = "0523fe39ffc59373de0648ba636705d35a6fdfc2"; + hash = "sha256-7rP6C/zPhpTMcsewR9LZlB23Ot7W23E2WM7Fnj89rlA="; }; fff-nvim-lib = rustPlatform.buildRustPackage { pname = "fff-nvim-lib"; diff --git a/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix b/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix index 5ad265dbabba..8090dadcaa6f 100644 --- a/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix +++ b/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-augment"; publisher = "augment"; - version = "0.754.2"; - hash = "sha256-PWcJr6hTCGeDLMG0h54x5D2n6zrK/bEqv7kygSZS/qo="; + version = "0.754.3"; + hash = "sha256-y7vBumet1aiLFP45QRSXMYFqqqkGvBMRD0k8A/CPoC8="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index aebda037324d..581caea33f36 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1005,8 +1005,8 @@ let mktplcRef = { name = "coder-remote"; publisher = "coder"; - version = "1.11.6"; - hash = "sha256-yMhbOnG7jVO0oPzLa+El5i7KlD1GCYTOcfF0cOUf5hQ="; + version = "1.12.2"; + hash = "sha256-0ZX0EQnPIqREsIy5dSML94PXD0Z+UZCIKwdqXVYTc1Q="; }; meta = { description = "Extension for Visual Studio Code to open any Coder workspace in VS Code with a single click"; diff --git a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix index 24012d54e91d..759160d1fa16 100644 --- a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix +++ b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "basedpyright"; publisher = "detachhead"; - version = "1.37.1"; - hash = "sha256-xucPJrYqKM+uCxHktfx0o4c0btpluIBMyNigr7d1FJU="; + version = "1.37.2"; + hash = "sha256-5ZkC84924JZe53EcXHHKeMw840O6DIFjydd6zT1QzLQ="; }; meta = { changelog = "https://github.com/detachhead/basedpyright/releases"; diff --git a/pkgs/applications/editors/vscode/extensions/oracle.oracle-java/default.nix b/pkgs/applications/editors/vscode/extensions/oracle.oracle-java/default.nix index 5dfd63e0dd48..a94b3bff2e48 100644 --- a/pkgs/applications/editors/vscode/extensions/oracle.oracle-java/default.nix +++ b/pkgs/applications/editors/vscode/extensions/oracle.oracle-java/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "oracle-java"; publisher = "oracle"; - version = "25.0.0"; - hash = "sha256-e0DO+42+3CyMP3+25gj0kLDFK53vkv4UqD2pQhXmqng="; + version = "25.0.1"; + hash = "sha256-6l1StFyGixGCvOfpq4iyHkoGQb1UZGlB4j0IQxAuXl8="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/teamtype.teamtype/default.nix b/pkgs/applications/editors/vscode/extensions/teamtype.teamtype/default.nix index 67356471a408..e5a043b390c0 100644 --- a/pkgs/applications/editors/vscode/extensions/teamtype.teamtype/default.nix +++ b/pkgs/applications/editors/vscode/extensions/teamtype.teamtype/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "teamtype"; name = "teamtype"; - version = "0.8.0"; - hash = "sha256-p9bynTMmCn6pu7SVEABeSawv9VjWpE8KecQOeIsE/LE="; + version = "0.8.2"; + hash = "sha256-qVZf+fOrdnDJzRUVA3GhTUDLhdJrH2tPRgvYW+ymVGw="; }; meta = { diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index f7d67e8d8baf..e8d4f2090b88 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -36,20 +36,20 @@ let hash = { - x86_64-linux = "sha256-qYthiZlioD6fWCyDPfg7Yfo5PqCHzcenk8NjgobLW7c="; - x86_64-darwin = "sha256-zwvdrstg6UtoG8EE87VXjDORT3zEbbKCFdAP0wPsD9s="; - aarch64-linux = "sha256-7DBRwwdQm06nyxRMR3wOH+4DqlnPvXGL/rMdq7jpxTw="; - aarch64-darwin = "sha256-YXmTzpsRSwdtbmoQLDRcJ5hcDURZnrkh5p8e8rYnA0Y="; - armv7l-linux = "sha256-VQ4/Ae4qeZYCFAJcTh8h8BWM15u8QEAfyJpkFx+1Xc8="; + x86_64-linux = "sha256-RqBae6s6y2XnXqtKbrKkMRwALKLfNE7mBFwOwwomG10="; + x86_64-darwin = "sha256-3N7xZIJsgQPX6izaH8ZoXy3SLcbXCNwJvE8ahFwVfF8="; + aarch64-linux = "sha256-8WigXl83hXEA7qsG6dOYKVSVISRDDpqJyv7L+9ks40Q="; + aarch64-darwin = "sha256-ZJ0QKqkFQYz3V7TEalM3sFJnqYnKBgQVqPXdsi2c+80="; + armv7l-linux = "sha256-m78hRkaI1nlqdeeP3t0HiNCUzNneMXxyenC8RmtuC68="; } .${system} or throwSystem; # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.108.1"; + version = "1.108.2"; # This is used for VS Code - Remote SSH test - rev = "585eba7c0c34fd6b30faac7c62a42050bfbc0086"; + rev = "c9d77990917f3102ada88be140d28b038d1dd7c7"; in buildVscode { pname = "vscode" + lib.optionalString isInsiders "-insiders"; @@ -82,7 +82,7 @@ buildVscode { src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - hash = "sha256-YilQLV1vQ1vHLa9pztvDIsaRz1CKzxcjT/INETrJy1I="; + hash = "sha256-bUnM+editWCYiiqR3mlIw4BRrM5gHd6T2GO65VKTDSE="; }; stdenv = stdenvNoCC; }; diff --git a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix index 74248a1b7d40..469dabe79cc8 100644 --- a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix +++ b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "dosbox-pure"; - version = "0-unstable-2026-01-20"; + version = "0-unstable-2026-01-25"; src = fetchFromGitHub { owner = "schellingb"; repo = "dosbox-pure"; - rev = "c69ecd250eb76cdceae1dbb962116f706e4fa661"; - hash = "sha256-cCUHTaHDNn7k5mK589RoNXiPgFvEBCxCSyp+8azUtpg="; + rev = "38c84798aac5239a06d75e85469225a2ad9c4707"; + hash = "sha256-3N2/v9yv44GdSEoPjC2yne43f4WqLTlWr8dYRrb+GxY="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix index 0df791b64b80..be33f5b49855 100644 --- a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix +++ b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "genesis-plus-gx"; - version = "0-unstable-2026-01-16"; + version = "0-unstable-2026-01-23"; src = fetchFromGitHub { owner = "libretro"; repo = "Genesis-Plus-GX"; - rev = "3f0f44787b3c9f51eaad3abfbeb86f345d6d8fb1"; - hash = "sha256-ZrJIZqkJC39vreiNPeEm764vDW42uv6kZb0rFo4bAXw="; + rev = "c858c9c5eebef46ea1a69427091853f9f1edbd23"; + hash = "sha256-3Rzoy2G517Pc3mAQY+b2dvAMDxUoUmyR8FCyg4BR5bc="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/play.nix b/pkgs/applications/emulators/libretro/cores/play.nix index 4dbaeac266a9..7bf4deaa6132 100644 --- a/pkgs/applications/emulators/libretro/cores/play.nix +++ b/pkgs/applications/emulators/libretro/cores/play.nix @@ -14,13 +14,13 @@ }: mkLibretroCore { core = "play"; - version = "0-unstable-2026-01-19"; + version = "0-unstable-2026-01-26"; src = fetchFromGitHub { owner = "jpd002"; repo = "Play-"; - rev = "bf245b03076b97eed14abd54c79537a59ecc2bd9"; - hash = "sha256-2Tm/CQt+LwAIEWsBRtgm/rZngSHqEohx45UlkaTCHbA="; + rev = "900e599dd26e4b292ff55738cc8881530eed46ce"; + hash = "sha256-9lr7RDSdQ/FN3mgoh8ZTsL1J8vXyab+TqhvM8yp7G7c="; fetchSubmodules = true; }; diff --git a/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix b/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix index 663a8b14c8de..b440af5f92e0 100644 --- a/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix +++ b/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix @@ -81,7 +81,7 @@ python3.pkgs.buildPythonApplication rec { ''; postFixup = '' - wrapPythonProgramsIn "$out/share/inkscape/extensions/" "$out $pythonPath" + wrapPythonProgramsIn "$out/share/inkscape/extensions/" "$out ''${pythonPath[*]}" ''; meta = { diff --git a/pkgs/applications/graphics/inkscape/extensions/textext/default.nix b/pkgs/applications/graphics/inkscape/extensions/textext/default.nix index aada64492ece..e11e744e393b 100644 --- a/pkgs/applications/graphics/inkscape/extensions/textext/default.nix +++ b/pkgs/applications/graphics/inkscape/extensions/textext/default.nix @@ -113,7 +113,7 @@ python3.pkgs.buildPythonApplication rec { postFixup = '' # Wrap the project so it can find runtime dependencies. - wrapPythonProgramsIn "$out/share/inkscape/extensions/textext" "$out $pythonPath" + wrapPythonProgramsIn "$out/share/inkscape/extensions/textext" "$out ''${pythonPath[*]}" cp ${launchScript} $out/share/inkscape/extensions/textext/launch.sh ''; diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix index 9432ebdfcf4e..06af2c764027 100644 --- a/pkgs/applications/misc/dupeguru/default.nix +++ b/pkgs/applications/misc/dupeguru/default.nix @@ -67,7 +67,7 @@ python3Packages.buildPythonApplication rec { # Executable in $out/bin is a symlink to $out/share/dupeguru/run.py # so wrapPythonPrograms hook does not handle it automatically. postFixup = '' - wrapPythonProgramsIn "$out/share/dupeguru" "$out $pythonPath" + wrapPythonProgramsIn "$out/share/dupeguru" "$out ''${pythonPath[*]}" ''; meta = { diff --git a/pkgs/applications/misc/pure-maps/default.nix b/pkgs/applications/misc/pure-maps/default.nix index 4da7653baac7..ecc5c97a7254 100644 --- a/pkgs/applications/misc/pure-maps/default.nix +++ b/pkgs/applications/misc/pure-maps/default.nix @@ -50,7 +50,7 @@ mkDerivation rec { pythonPath = with python3.pkgs; [ gpxpy ]; preInstall = '' - buildPythonPath "$pythonPath" + buildPythonPath "''${pythonPath[*]}" qtWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH") ''; diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index faf1cf87777c..df29572cffb0 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -813,7 +813,7 @@ } }, "ungoogled-chromium": { - "version": "144.0.7559.96", + "version": "144.0.7559.109", "deps": { "depot_tools": { "rev": "2e88a3f08bd8c4a0014eae82729beca935f7f188", @@ -825,16 +825,16 @@ "hash": "sha256-04h38X/hqWwMiAOVsVu4OUrt8N+S7yS/JXc5yvRGo1I=" }, "ungoogled-patches": { - "rev": "144.0.7559.96-1", - "hash": "sha256-gbEKKGGi6FBhRoCEerSdJJtn5vXaFo9G74lYHDsz0Xs=" + "rev": "144.0.7559.109-1", + "hash": "sha256-PPZ87jk8zISyWcoI3cf5/Z11uA15+cb+K9EKxT93u0M=" }, "npmHash": "sha256-13sgV/5BD7QvDLBAEmoLN5vongw+S5v5znvZcctxhWc=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "d7b80622cfab91c265741194e7942eefd2d21811", - "hash": "sha256-Cz3iDS0raJHRh+byrs7GYp6sck54mJq7yzsjLUWDWqA=", + "rev": "6a8d5e49388fcc8a7d56d2a275e4ef424eb10960", + "hash": "sha256-3Wwc7Vb8dM2VGqQs6GOPehsTVBgcZ9in+kC1vN9S1FI=", "recompress": true }, "src/third_party/clang-format/script": { @@ -1619,8 +1619,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "6c2c296f23a5487ccb2536cf7c90d01f35d03077", - "hash": "sha256-gBzwGvl/tqj4Z6acdLN326I80kBLEk+Nn8oN6D193o4=" + "rev": "d75d178c137447df1a3e8830eae86b0bd72b9ac6", + "hash": "sha256-5oQP3+kpnKfUInGBYcTvL/uLK9UlcWCz1mDFGeXBnmM=" } } } diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix index 7e0984150dc0..b809fcc9b0fe 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix @@ -10,11 +10,11 @@ buildMozillaMach rec { pname = "firefox-beta"; binaryName = "firefox-beta"; - version = "148.0b6"; + version = "148.0b8"; applicationName = "Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "a8dfcff028d28d63dc635f9cda8e2dcf2f6b55363ac4e1686561c77aff56216d3f897b1d3686bf32f388eed4e1df146d3795a55eb2a696523dc7c176bb63cd07"; + sha512 = "7fc53c1f4545d09e5ec790ba12e1a0eb1d3c3949a5d92ff98f294e80bd6e37e1ba2ef6b76661cdd9717043ad7823ff9392f7138070f3f2418b414072f020b316"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix index 44f0afe16557..bf2ae40be7f8 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix @@ -10,13 +10,13 @@ buildMozillaMach rec { pname = "firefox-devedition"; binaryName = "firefox-devedition"; - version = "148.0b4"; + version = "148.0b8"; applicationName = "Firefox Developer Edition"; requireSigning = false; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "951da65733ab4226839cf23fa0f667d8bcdeeb8c2e729b6395d7ee39b10263a4409380eebde132156f8acc56ab5b4bf96eed1991a31820037b57214a1d22e520"; + sha512 = "28c0efc1d7d287f6ed77b6e3d4c8e4a3d65b9dc6dc4ef48f9a6da9a889c24e1d03ef2bd1d484e67f260e08ababbe1c32a81cfb81e36934b54beb4e26dc11f726"; }; # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index 4d506781fee4..a317577efc0e 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "34.0.0"; + version = "34.0.1"; src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}"; @@ -173,11 +173,11 @@ stdenv.mkDerivation (finalAttrs: { { gtk3 = fetchzip { urls = urlRegionVariants "gtk3"; - hash = "sha256-TC/Lmn/be2RR0De3DgIo9zWm0IumlOju+CuMCJ8Rggs="; + hash = "sha256-kZ0MCMtAzSzGZomoB/dtNgSsPfFLZXitGSZ9aB1K/9g="; }; gtk2 = fetchzip { urls = urlRegionVariants "gtk2"; - hash = "sha256-LGZP1sVS0LYZmHE9l68RPa/BOew5bgCDqyxXs0BYLjw="; + hash = "sha256-yhnQuRtyl5nLn1ggG6zjUTXM0ym7510QXMe+jvwG9GM="; }; }; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ff56208f2d27..f3738390af49 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -54,11 +54,11 @@ "vendorHash": "sha256-ogQLStDbsM0aRf4QIbITB8Z+L9DUtZwoAPK6T4xylXI=" }, "aminueza_minio": { - "hash": "sha256-gl1mD4Ital/xhtWZW9UbalTJqYLJ2tr8ImDFLiTyyFg=", + "hash": "sha256-Rhwf0vnVzCxbv2Ikyk6YSGn/mJshEFfmqOSOZORfU2M=", "homepage": "https://registry.terraform.io/providers/aminueza/minio", "owner": "aminueza", "repo": "terraform-provider-minio", - "rev": "v3.13.0", + "rev": "v3.14.0", "spdx": "AGPL-3.0", "vendorHash": "sha256-6Tw4rCOzrvN2pK83NejdJJBjljfDfHEniIX+EdfqujA=" }, @@ -364,13 +364,13 @@ "vendorHash": "sha256-u/ycUCnEYlCBrDcI0VCkob4CGXrXYdGWwiw5EeJyuiw=" }, "e-breuninger_netbox": { - "hash": "sha256-nY0V4Pi5sF2ZiXBDfbXeJKz9ystKZpwhntoWRYMiefg=", + "hash": "sha256-gIqmj/skEUOmpZocx3nazRueUrNdvWcBszveqTOcblw=", "homepage": "https://registry.terraform.io/providers/e-breuninger/netbox", "owner": "e-breuninger", "repo": "terraform-provider-netbox", - "rev": "v5.0.1", + "rev": "v5.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-6dmHJzJGnpMWzYYelIuriMIrjOXD0KyJeVo1AUuYIRo=" + "vendorHash": "sha256-dzgI9WOABHVv8bJ1p36RAty4/2UAqDHagVJFPdEAnRU=" }, "equinix_equinix": { "hash": "sha256-F9WKIO8msltYTmxVjbF5FXkUX1jLK91zecOIq6xrGqY=", @@ -1247,11 +1247,11 @@ "vendorHash": "sha256-HWAUI0mowVP8FPw44xYaFOTh6jjkfXa7fuPk2zoSZJ8=" }, "spotinst_spotinst": { - "hash": "sha256-0KjAzRrPsjBh1SadyKT4KTLvF7+cl5Hq5mWbv6uHNaA=", + "hash": "sha256-aPOqAzK/FdDDTbl2WMKxA99a5w6ZM0xK/BLjzPnvuws=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.232.1", + "rev": "v1.232.3", "spdx": "MPL-2.0", "vendorHash": "sha256-Cj7RVITkFxIjAZAqHFhnoTa4lTZFXG22ny801g0Y+NE=" }, @@ -1310,11 +1310,11 @@ "vendorHash": "sha256-omxEb+ntQuHDfS2Rmt0rj0BF0Q2T8DLhobLua2uU/0o=" }, "tencentcloudstack_tencentcloud": { - "hash": "sha256-kXdu7rtGo4J9waREkVMWqFf4/Ki22fm6p/Nhtts/Ycs=", + "hash": "sha256-l5aywIsyAlQCX8SjvjJkEizqH+aZGmFN9zBbt/V/ri8=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.82.57", + "rev": "v1.82.62", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1499,12 +1499,12 @@ "vendorHash": "sha256-Z4DfoG4ApXbPNXZs9YvBWQj1bH7moLNI6P+nKDHt/Jc=" }, "yandex-cloud_yandex": { - "hash": "sha256-lNVCxNXYai+da2Hcg1+tcoYzoYRLRoCjzAQ/UB1WW4g=", + "hash": "sha256-UyrHFZDY2mQqF0yosPc1xS/Zm9nrGGhMH6awf3pdFdI=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.179.0", + "rev": "v0.181.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-JW8aCDhY0XLoeFN864bM9ZWPxDrGk7VGTAUhx3PiQ+E=" + "vendorHash": "sha256-Gj6ApI9xUL42KF4xYdvC8uwsAPNHJmouRkoz69yVVXQ=" } } diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 839899a9d760..a11cd031d39f 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -194,8 +194,8 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.14.3"; - hash = "sha256-QPVKWtpm67z13hmPgM/YXm+CBOqiI8qZwttx2h6LboU="; + version = "1.14.4"; + hash = "sha256-fEuIAKmR+shKHNldUlU6qvel9tjYFdKnc25JWtxRPHs="; vendorHash = "sha256-NDtBLa8vokrSRDCNX10lQyfMDzTrodoEj5zbDanL4bk="; patches = [ ./provider-path-0_15.patch ]; passthru = { diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index ce71099f1391..5cb96168fce9 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { pythonPath = with python3.pkgs; requiredPythonModules extraPythonPackages; preFixup = '' - buildPythonPath "$out $pythonPath" + buildPythonPath "$out ''${pythonPath[*]}" gappsWrapperArgs+=( --prefix PYTHONPATH : "$program_PYTHONPATH" ) diff --git a/pkgs/applications/science/logic/easycrypt/default.nix b/pkgs/applications/science/logic/easycrypt/default.nix index bbc37bb7dcd5..b23e7c110863 100644 --- a/pkgs/applications/science/logic/easycrypt/default.nix +++ b/pkgs/applications/science/logic/easycrypt/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { runHook preInstall dune install --prefix $out easycrypt rm $out/bin/ec-runtest - wrapPythonProgramsIn "$out/lib/easycrypt/commands" "$pythonPath" + wrapPythonProgramsIn "$out/lib/easycrypt/commands" "''${pythonPath[*]}" runHook postInstall ''; diff --git a/pkgs/applications/science/robotics/sumorobot-manager/default.nix b/pkgs/applications/science/robotics/sumorobot-manager/default.nix index f6f846bc4585..64539e3f8aee 100644 --- a/pkgs/applications/science/robotics/sumorobot-manager/default.nix +++ b/pkgs/applications/science/robotics/sumorobot-manager/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { preFixup = '' patchShebangs $out/opt/sumorobot-manager/main.py - wrapPythonProgramsIn "$out/opt" "$pythonPath" + wrapPythonProgramsIn "$out/opt" "''${pythonPath[*]}" ''; meta = { diff --git a/pkgs/applications/system/coolercontrol/coolercontrold.nix b/pkgs/applications/system/coolercontrol/coolercontrold.nix index 75142ec80f49..e185235f4906 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrold.nix +++ b/pkgs/applications/system/coolercontrol/coolercontrold.nix @@ -52,7 +52,7 @@ rustPlatform.buildRustPackage { postFixup = '' addDriverRunpath "$out/bin/coolercontrold" - buildPythonPath "$pythonPath" + buildPythonPath "''${pythonPath[*]}" wrapProgram "$out/bin/coolercontrold" \ --prefix PATH : $program_PATH \ --prefix PYTHONPATH : $program_PYTHONPATH diff --git a/pkgs/applications/version-management/cgit/default.nix b/pkgs/applications/version-management/cgit/default.nix index 06b801a9dcbf..4ff7ca269e82 100644 --- a/pkgs/applications/version-management/cgit/default.nix +++ b/pkgs/applications/version-management/cgit/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation { mkdir -p "$out/share/man/man5" cp cgitrc.5 "$out/share/man/man5" - wrapPythonProgramsIn "$out/lib/cgit/filters" "$out $pythonPath" + wrapPythonProgramsIn "$out/lib/cgit/filters" "$out ''${pythonPath[*]}" for script in $out/lib/cgit/filters/*.sh $out/lib/cgit/filters/html-converters/txt2html; do wrapProgram $script --prefix PATH : '${ diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix index 56866e101bee..65a25fb06dfa 100644 --- a/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -10,13 +10,13 @@ buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; - version = "7.3.0.1"; + version = "7.4.0"; src = fetchFromGitHub { owner = "anxdpanic"; repo = "plugin.video.youtube"; rev = "v${version}"; - hash = "sha256-e9V58R6hMaDGS0RKqtAU5IAjY9HED6bYMBz6hQJ606o="; + hash = "sha256-IEfgpl/uuELQ+4dVqek7/iCHW+sooVZ5eiASNXnm5EA="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix index 374f6afe34d7..2cec30a4f719 100644 --- a/pkgs/applications/virtualization/docker/buildx.nix +++ b/pkgs/applications/virtualization/docker/buildx.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "docker-buildx"; - version = "0.30.1"; + version = "0.31.0"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - hash = "sha256-SffXgJWPPB+ZImknbYWU8AyypAfk2coXxyqWy6UCNMk="; + hash = "sha256-SQO9wAU+OS4ct+Evny2ZZXP7AUU2IyNwwgR1AaEzTmA="; }; doCheck = false; diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix index fb6fcc815c9b..de9afda8d1bb 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix @@ -46,14 +46,14 @@ let # "use of glibc_multi is only supported on x86_64-linux" isMultiBuild = multiArch && stdenv.system == "x86_64-linux"; - # What should lib be linked to: lib32 or lib64? + # What should $out/usr/lib be linked to: lib32 or lib64? defaultLib = - { - "i686-linux" = "lib32"; - "x86_64-linux" = "lib64"; - "aarch64-linux" = "lib64"; - } - .${stdenv.system} or (throw "Please expand list of system with defaultLib for '${stdenv.system}'"); + if stdenv.hostPlatform.is64bit then + "lib64" + else if stdenv.hostPlatform.is32bit then + "lib32" + else + throw "buildFHSEnvBubblewrap: defaultLib cannot handle system ${stdenv.hostPlatform.system} (expected 64bit or 32bit)"; # list of packages (usually programs) which match the host's architecture # (which includes stuff from multiPkgs) diff --git a/pkgs/by-name/_3/_3cpio/package.nix b/pkgs/by-name/_3/_3cpio/package.nix index 41b1672176c9..c1322dfab15e 100644 --- a/pkgs/by-name/_3/_3cpio/package.nix +++ b/pkgs/by-name/_3/_3cpio/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "3cpio"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "bdrung"; repo = "3cpio"; tag = version; - hash = "sha256-4ERSH5Kz/e2MuIIgi3XQVnhW0csBPDIvdmEw05OdREA="; + hash = "sha256-LZu+g5ISpG/9ZZimTedvTjUEofhAaYKJdpLTex3ehQE="; }; - cargoHash = "sha256-ER1OQZHHtHBNPoEl4NJ5p5KYjzFgJnFR8nXcmCk2HTA="; + cargoHash = "sha256-YP6fCmY9fQD4hmKV6gLoElvce/BlRc9vAqyli7aaBNI="; # Tests attempt to access arbitrary filepaths doCheck = false; diff --git a/pkgs/by-name/ai/airwindows/package.nix b/pkgs/by-name/ai/airwindows/package.nix index 084830f733f3..0aa162ce2756 100644 --- a/pkgs/by-name/ai/airwindows/package.nix +++ b/pkgs/by-name/ai/airwindows/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation { pname = "airwindows"; - version = "0-unstable-2026-01-18"; + version = "0-unstable-2026-01-25"; src = fetchFromGitHub { owner = "airwindows"; repo = "airwindows"; - rev = "fe67011732dada5da0cdba5550d4244c657d0aaa"; - hash = "sha256-/eAa8qLRoplQoEYocdrczEI5RSCTMTxSezw0WAtk47w="; + rev = "597fcb482ef48a7f7a68736ea37b0badeecbb3c7"; + hash = "sha256-J+ZtneHb7hXZ1W7vt+5MSYS1P466tUVjH7zKMzn284Y="; }; # we patch helpers because honestly im spooked out by where those variables diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix index 14f2cb2f732d..f627593c1e82 100644 --- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix +++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "ananicy-rules-cachyos"; - version = "0-unstable-2026-01-20"; + version = "0-unstable-2026-01-22"; src = fetchFromGitHub { owner = "CachyOS"; repo = "ananicy-rules"; - rev = "e1f6574e77386282cbb917b981c968648fbab601"; - hash = "sha256-TR+c6OACVrETAVAlza62JSIKBvKMrDg/G4xBdMkJJlk="; + rev = "6c6ec8e27ccaf8da4544f30af8a65440e3cb8915"; + hash = "sha256-nDFaF1DqO0jTUY5+VbkQTADPk3jc224QVFarCJDrR/8="; }; dontConfigure = true; diff --git a/pkgs/by-name/an/anki/addons/anki-utils.nix b/pkgs/by-name/an/anki/addons/anki-utils.nix index 49bb331a0774..958defb8c241 100644 --- a/pkgs/by-name/an/anki/addons/anki-utils.nix +++ b/pkgs/by-name/an/anki/addons/anki-utils.nix @@ -21,6 +21,7 @@ runHook preBuild runHook postBuild '', + strictDeps ? true, dontPatchELF ? true, dontStrip ? true, passthru ? { }, @@ -35,6 +36,7 @@ inherit configurePhase buildPhase + strictDeps dontPatchELF dontStrip ; diff --git a/pkgs/by-name/ap/apko/package.nix b/pkgs/by-name/ap/apko/package.nix index 1abcceb294dd..c9a671fb7242 100644 --- a/pkgs/by-name/ap/apko/package.nix +++ b/pkgs/by-name/ap/apko/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "apko"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = "apko"; tag = "v${finalAttrs.version}"; - hash = "sha256-18i2xiVDjIRG0RD5R7t2BsyB9N+hhYOOByV6snGBCkM="; + hash = "sha256-7KDyTXqIM4hUnNVJt4xwsuUdP0eYSF+fSBRuSKs8VzQ="; # 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; @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-P8/0VSx4JfWgbMUuvo1Z0BhtC1TgGITSHLMHSzigeEg="; + vendorHash = "sha256-vHTJCfXVlbBLQXC/tsXJsGoACcxAhJmFlU/tq10836Q="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ap/appium-inspector/package.nix b/pkgs/by-name/ap/appium-inspector/package.nix index d7bfdf16faef..14b4a78fc1de 100644 --- a/pkgs/by-name/ap/appium-inspector/package.nix +++ b/pkgs/by-name/ap/appium-inspector/package.nix @@ -11,7 +11,7 @@ let electron = electron_39; - version = "2026.1.2"; + version = "2026.1.3"; in buildNpmPackage { @@ -22,10 +22,10 @@ buildNpmPackage { owner = "appium"; repo = "appium-inspector"; tag = "v${version}"; - hash = "sha256-uNRm6XHgK55gayl4ab9atV4+i9uCnxEcl4C6HEOX6Ro="; + hash = "sha256-9WhSQq3is2qucL1cGQIYPuLM9VkCFIWq2XVU2QioRMo="; }; - npmDepsHash = "sha256-MraVLbKNgEhwT9sTyNhi4uDfyXOEAGOznvSs0B+mEUA="; + npmDepsHash = "sha256-2DNUTvZ6yFL9U8JKw4ZFR81a6Mv9rPXtRu/v/Il/Rhw="; npmFlags = [ "--ignore-scripts" ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/ar/arubaotp-seed-extractor/package.nix b/pkgs/by-name/ar/arubaotp-seed-extractor/package.nix index 09474578ee73..17df0d4ae94f 100644 --- a/pkgs/by-name/ar/arubaotp-seed-extractor/package.nix +++ b/pkgs/by-name/ar/arubaotp-seed-extractor/package.nix @@ -33,7 +33,7 @@ python3Packages.buildPythonApplication { mkdir -p "$libdir" cp scripts/* "$libdir" chmod +x "$libdir/main.py" - wrapPythonProgramsIn "$libdir" "$pythonPath" + wrapPythonProgramsIn "$libdir" "''${pythonPath[*]}" mkdir -p $out/bin ln -s "$libdir/main.py" $out/bin/arubaotp-seed-extractor ''; diff --git a/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix b/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix index b5a07237c8b9..81120245a6dd 100644 --- a/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix +++ b/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix @@ -3,46 +3,28 @@ aws-encryption-sdk-cli, fetchPypi, nix-update-script, - python3, + python3Packages, testers, }: -let - localPython = python3.override { - self = localPython; - packageOverrides = final: prev: { - urllib3 = prev.urllib3.overridePythonAttrs (prev: rec { - version = "1.26.18"; - build-system = with final; [ - setuptools - ]; - postPatch = null; - src = prev.src.override { - inherit version; - hash = "sha256-+OzBu6VmdBNFfFKauVW/jGe0XbeZ0VkGYmFxnjKFgKA="; - }; - }); - }; - }; -in - -localPython.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "aws-encryption-sdk-cli"; - version = "4.2.0"; + version = "4.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-gORrscY+Bgmz2FrKdSBd56jP0yuEklytMeA3wr8tTZU="; + inherit version; + pname = "aws_encryption_sdk_cli"; + hash = "sha256-FfLgR7gocZ0cLV7bxqvKNI+Fs7kQF0XhR3zf6tHXwOE="; }; pythonRelaxDeps = [ "aws-encryption-sdk" ]; - build-system = with localPython.pkgs; [ + build-system = with python3Packages; [ setuptools ]; - dependencies = with localPython.pkgs; [ + dependencies = with python3Packages; [ attrs aws-encryption-sdk base64io @@ -52,7 +34,7 @@ localPython.pkgs.buildPythonApplication rec { doCheck = true; - nativeCheckInputs = with localPython.pkgs; [ + nativeCheckInputs = with python3Packages; [ mock pytest-mock pytest7CheckHook diff --git a/pkgs/by-name/ba/bada-bib/package.nix b/pkgs/by-name/ba/bada-bib/package.nix index db5081f25753..84a31e1f89cf 100644 --- a/pkgs/by-name/ba/bada-bib/package.nix +++ b/pkgs/by-name/ba/bada-bib/package.nix @@ -69,7 +69,7 @@ python3Packages.buildPythonApplication rec { ''; postFixup = '' - wrapPythonProgramsIn "$out/libexec" "$out $pythonPath" + wrapPythonProgramsIn "$out/libexec" "$out ''${pythonPath[*]}" ''; meta = { diff --git a/pkgs/by-name/bc/bcc/package.nix b/pkgs/by-name/bc/bcc/package.nix index 4d28265f8c64..ccc87a826181 100644 --- a/pkgs/by-name/bc/bcc/package.nix +++ b/pkgs/by-name/bc/bcc/package.nix @@ -118,7 +118,7 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "bcc" ]; postFixup = '' - wrapPythonProgramsIn "$out/share/bcc/tools" "$out $pythonPath" + wrapPythonProgramsIn "$out/share/bcc/tools" "$out ''${pythonPath[*]}" ''; outputs = [ diff --git a/pkgs/by-name/be/better-control/package.nix b/pkgs/by-name/be/better-control/package.nix index 0fdd29c4c0c4..4d1db6f4fbe0 100644 --- a/pkgs/by-name/be/better-control/package.nix +++ b/pkgs/by-name/be/better-control/package.nix @@ -88,7 +88,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; postFixup = '' - wrapPythonProgramsIn "$out/share/better-control" "$out $pythonPath" + wrapPythonProgramsIn "$out/share/better-control" "$out ''${pythonPath[*]}" ''; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/bi/biome/package.nix b/pkgs/by-name/bi/biome/package.nix index 892bce100900..91a59708f93f 100644 --- a/pkgs/by-name/bi/biome/package.nix +++ b/pkgs/by-name/bi/biome/package.nix @@ -7,19 +7,20 @@ rust-jemalloc-sys, zlib, gitMinimal, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "biome"; - version = "2.3.12"; + version = "2.3.13"; src = fetchFromGitHub { owner = "biomejs"; repo = "biome"; rev = "@biomejs/biome@${finalAttrs.version}"; - hash = "sha256-v/m7yS9bE3/WpfuqZoW+tgIEm1ARsXze/0PRUWi+mHA="; + hash = "sha256-WvEY3YslLu0FdIG8OcL4pPpfB945coU+W+YGLLecTc0="; }; - cargoHash = "sha256-ldxw6znHscxfgg91BpaexsEvy3Dw2UMjcvI72VLUKG0="; + cargoHash = "sha256-iIKs6tzhMZ7f8tKh95Db+FdE21vqiw3ksT72xacpPf8="; nativeBuildInputs = [ pkg-config ]; @@ -57,6 +58,8 @@ rustPlatform.buildRustPackage (finalAttrs: { unset BIOME_VERSION ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Toolchain of the web"; homepage = "https://biomejs.dev/"; diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index 33630f2a2b26..4c53c3a5afd0 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -345,7 +345,7 @@ stdenv'.mkDerivation (finalAttrs: { mv $out/Blender.app $out/Applications '' + '' - buildPythonPath "$pythonPath" + buildPythonPath "''${pythonPath[*]}" wrapProgram $blenderExecutable \ --prefix PATH : $program_PATH \ --prefix PYTHONPATH : "$program_PYTHONPATH" \ diff --git a/pkgs/by-name/bl/blender/wrapper.nix b/pkgs/by-name/bl/blender/wrapper.nix index 5606de21aeb8..5a7ede86a46e 100644 --- a/pkgs/by-name/bl/blender/wrapper.nix +++ b/pkgs/by-name/bl/blender/wrapper.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { cp -r $src/share/doc $out/share cp -r $src/share/icons $out/share - buildPythonPath "$pythonPath" + buildPythonPath "''${pythonPath[*]}" makeWrapper ${blender}/bin/blender $out/bin/${finalAttrs.finalPackage.pname} \ --prefix PATH : $program_PATH \ diff --git a/pkgs/by-name/bl/blightmud/package.nix b/pkgs/by-name/bl/blightmud/package.nix index aa9341e472c3..a07ceb831dc5 100644 --- a/pkgs/by-name/bl/blightmud/package.nix +++ b/pkgs/by-name/bl/blightmud/package.nix @@ -55,9 +55,8 @@ rustPlatform.buildRustPackage (finalAttrs: { "test_tls_init_no_verify" "test_tls_init_verify" ]; - skipFlag = test: "--skip " + test; in - builtins.concatStringsSep " " (map skipFlag skipList); + builtins.map (x: "--skip=" + x) skipList; meta = { description = "Terminal MUD client written in Rust"; diff --git a/pkgs/by-name/bl/blueberry/package.nix b/pkgs/by-name/bl/blueberry/package.nix index 9c0462c54985..f8c1bdedce49 100644 --- a/pkgs/by-name/bl/blueberry/package.nix +++ b/pkgs/by-name/bl/blueberry/package.nix @@ -84,7 +84,7 @@ python3Packages.buildPythonApplication rec { postFixup = '' makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - wrapPythonProgramsIn $out/lib "$out $pythonPath" + wrapPythonProgramsIn $out/lib "$out ''${pythonPath[*]}" ''; meta = { diff --git a/pkgs/by-name/bl/blueman/package.nix b/pkgs/by-name/bl/blueman/package.nix index 8255698f799d..b859efccfed5 100644 --- a/pkgs/by-name/bl/blueman/package.nix +++ b/pkgs/by-name/bl/blueman/package.nix @@ -89,8 +89,8 @@ stdenv.mkDerivation rec { postFixup = '' # This mimics ../../../development/interpreters/python/wrap.sh - wrapPythonProgramsIn "$out/bin" "$out $pythonPath" - wrapPythonProgramsIn "$out/libexec" "$out $pythonPath" + wrapPythonProgramsIn "$out/bin" "$out ''${pythonPath[*]}" + wrapPythonProgramsIn "$out/libexec" "$out ''${pythonPath[*]}" ''; meta = { diff --git a/pkgs/by-name/bo/botamusique/package.nix b/pkgs/by-name/bo/botamusique/package.nix index 1b2702ac5734..55b85a96111d 100644 --- a/pkgs/by-name/bo/botamusique/package.nix +++ b/pkgs/by-name/bo/botamusique/package.nix @@ -113,7 +113,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share $out/bin cp -r . $out/share/botamusique chmod +x $out/share/botamusique/mumbleBot.py - wrapPythonProgramsIn $out/share/botamusique "$out $pythonPath" + wrapPythonProgramsIn $out/share/botamusique "$out ''${pythonPath[*]}" # Convenience binary and wrap with ffmpeg dependency makeWrapper $out/share/botamusique/mumbleBot.py $out/bin/botamusique \ diff --git a/pkgs/by-name/bu/budgie-media-player-applet/package.nix b/pkgs/by-name/bu/budgie-media-player-applet/package.nix index 630103b5a5dc..7fde79947fef 100644 --- a/pkgs/by-name/bu/budgie-media-player-applet/package.nix +++ b/pkgs/by-name/bu/budgie-media-player-applet/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { ''; postFixup = '' - buildPythonPath "$out $pythonPath" + buildPythonPath "$out ''${pythonPath[*]}" patchPythonScript "$out/lib/budgie-desktop/plugins/budgie-media-player-applet/applet.py" ''; diff --git a/pkgs/by-name/bu/bun/package.nix b/pkgs/by-name/bu/bun/package.nix index 760c670baae4..4fd66457f47b 100644 --- a/pkgs/by-name/bu/bun/package.nix +++ b/pkgs/by-name/bu/bun/package.nix @@ -17,7 +17,7 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { - version = "1.3.6"; + version = "1.3.7"; pname = "bun"; src = @@ -71,35 +71,29 @@ stdenvNoCC.mkDerivation (finalAttrs: { && !(stdenvNoCC.hostPlatform.isDarwin && stdenvNoCC.hostPlatform.isx86_64) ) '' - completions_dir=$(mktemp -d) - - SHELL="bash" $out/bin/bun completions $completions_dir - SHELL="zsh" $out/bin/bun completions $completions_dir - SHELL="fish" $out/bin/bun completions $completions_dir - - installShellCompletion --name bun \ - --bash $completions_dir/bun.completion.bash \ - --zsh $completions_dir/_bun \ - --fish $completions_dir/bun.fish + installShellCompletion --cmd bun \ + --bash <(SHELL="bash" $out/bin/bun completions) \ + --zsh <(SHELL="zsh" $out/bin/bun completions) \ + --fish <(SHELL="fish" $out/bin/bun completions) ''; passthru = { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${finalAttrs.version}/bun-darwin-aarch64.zip"; - hash = "sha256-KvHshDd1mrBbOw6kIf6eIubHBctMsHUcMmmCZC2s6Po="; + hash = "sha256-FnAeSUmY5HZNSa8vvmLSXsWc88ee5pbrod7yz+kEnWQ="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${finalAttrs.version}/bun-linux-aarch64.zip"; - hash = "sha256-Wv0Ss2a6LYKXJFzCnAOUFjNN2HIVLB2wLlyKqMZulrE="; + hash = "sha256-1cfWUUI8K8WuP5LTaDf/st3G7pGElnJQC3/o5aUVn7w="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${finalAttrs.version}/bun-darwin-x64-baseline.zip"; - hash = "sha256-stiZTUz3BkE2bWm4dCC4BdHZhPTqfhajUt8VaUlHT6U="; + hash = "sha256-nCwa7m1y6WGVwwUfkSMlBHWVB6qusJPVtw+IaX4ajq8="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${finalAttrs.version}/bun-linux-x64.zip"; - hash = "sha256-m6mNITRVDWaQh1sjpPXEjnS3yyZ+jMG49SYFkhxsEe8="; + hash = "sha256-K9Lg4L3wlIO+Z6cEYHhI6+csKEIIJOTOdyzj2mLCPWU="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/pkgs/by-name/ca/cambalache/package.nix b/pkgs/by-name/ca/cambalache/package.nix index 984ea63e4c20..fb57a4edbab5 100644 --- a/pkgs/by-name/ca/cambalache/package.nix +++ b/pkgs/by-name/ca/cambalache/package.nix @@ -79,7 +79,7 @@ python3.pkgs.buildPythonApplication rec { postFixup = '' # Wrap a helper script in an unusual location. - wrapPythonProgramsIn "$out/${python3.sitePackages}/cambalache/priv/merengue" "$out $pythonPath" + wrapPythonProgramsIn "$out/${python3.sitePackages}/cambalache/priv/merengue" "$out ''${pythonPath[*]}" ''; passthru = { diff --git a/pkgs/by-name/ca/cargo-bisect-rustc/package.nix b/pkgs/by-name/ca/cargo-bisect-rustc/package.nix index 6138db509936..6e90d5dda528 100644 --- a/pkgs/by-name/ca/cargo-bisect-rustc/package.nix +++ b/pkgs/by-name/ca/cargo-bisect-rustc/package.nix @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-SigRm2ZC7jH1iCEGRpka1G/e9kBEieFVU0YDBl2LfTM="; checkFlags = [ - "--skip test_github" # requires internet + "--skip=test_github" # requires internet ]; meta = { diff --git a/pkgs/by-name/ca/cargo-deadlinks/package.nix b/pkgs/by-name/ca/cargo-deadlinks/package.nix index 3e55dea4f82e..6ffb9137fab9 100644 --- a/pkgs/by-name/ca/cargo-deadlinks/package.nix +++ b/pkgs/by-name/ca/cargo-deadlinks/package.nix @@ -20,15 +20,16 @@ rustPlatform.buildRustPackage rec { checkFlags = [ # uses internet - "--skip non_existent_http_link --skip working_http_check" + "--skip=non_existent_http_link" + "--skip=working_http_check" # makes assumption about HTML paths that changed in rust 1.82.0 - "--skip simple_project::it_checks_okay_project_correctly" - "--skip cli_args::it_passes_arguments_through_to_cargo" + "--skip=simple_project::it_checks_okay_project_correctly" + "--skip=cli_args::it_passes_arguments_through_to_cargo" ] - ++ - lib.optional (stdenv.hostPlatform.system != "x86_64-linux") - # assumes the target is x86_64-unknown-linux-gnu - "--skip simple_project::it_checks_okay_project_correctly"; + ++ lib.optionals (stdenv.hostPlatform.system != "x86_64-linux") [ + # assumes the target is x86_64-unknown-linux-gnu + "--skip=simple_project::it_checks_okay_project_correctly" + ]; meta = { description = "Cargo subcommand to check rust documentation for broken links"; diff --git a/pkgs/by-name/ca/cargo-geiger/package.nix b/pkgs/by-name/ca/cargo-geiger/package.nix index adb07a71445a..62b5a3b23da4 100644 --- a/pkgs/by-name/ca/cargo-geiger/package.nix +++ b/pkgs/by-name/ca/cargo-geiger/package.nix @@ -53,21 +53,21 @@ rustPlatform.buildRustPackage (finalAttrs: { # skip tests with networking or other failures checkFlags = [ # panics - "--skip serialize_test2_quick_report" - "--skip serialize_test3_quick_report" - "--skip serialize_test6_quick_report" - "--skip serialize_test2_report" - "--skip serialize_test3_report" - "--skip serialize_test6_report" + "--skip=serialize_test2_quick_report" + "--skip=serialize_test3_quick_report" + "--skip=serialize_test6_quick_report" + "--skip=serialize_test2_report" + "--skip=serialize_test3_report" + "--skip=serialize_test6_report" # requires networking - "--skip test_package::case_2" - "--skip test_package::case_3" - "--skip test_package::case_6" - "--skip test_package::case_9" + "--skip=test_package::case_2" + "--skip=test_package::case_3" + "--skip=test_package::case_6" + "--skip=test_package::case_9" # panics, snapshot assertions fails - "--skip test_package_update_readme::case_2" - "--skip test_package_update_readme::case_3" - "--skip test_package_update_readme::case_5" + "--skip=test_package_update_readme::case_2" + "--skip=test_package_update_readme::case_3" + "--skip=test_package_update_readme::case_5" ]; passthru.tests.version = testers.testVersion { diff --git a/pkgs/by-name/ca/cargo-sweep/package.nix b/pkgs/by-name/ca/cargo-sweep/package.nix index 03ae04c8b331..2ef3124650aa 100644 --- a/pkgs/by-name/ca/cargo-sweep/package.nix +++ b/pkgs/by-name/ca/cargo-sweep/package.nix @@ -19,9 +19,9 @@ rustPlatform.buildRustPackage rec { checkFlags = [ # Requires a rustup toolchain to be installed. - "--skip check_toolchain_listing_on_multiple_projects" + "--skip=check_toolchain_listing_on_multiple_projects" # Does not work with a `--target` build in the environment - "--skip empty_project_output" + "--skip=empty_project_output" ]; meta = { diff --git a/pkgs/by-name/ca/cargo-valgrind/package.nix b/pkgs/by-name/ca/cargo-valgrind/package.nix index 7d99d1afc462..a9d021379ac8 100644 --- a/pkgs/by-name/ca/cargo-valgrind/package.nix +++ b/pkgs/by-name/ca/cargo-valgrind/package.nix @@ -33,9 +33,9 @@ rustPlatform.buildRustPackage rec { ''; checkFlags = [ - "--skip tests_are_runnable" - "--skip default_cargo_project_reports_no_violations" - "--skip empty_tests_not_leak_in_release_mode" + "--skip=tests_are_runnable" + "--skip=default_cargo_project_reports_no_violations" + "--skip=empty_tests_not_leak_in_release_mode" ]; meta = { diff --git a/pkgs/by-name/ca/carla/package.nix b/pkgs/by-name/ca/carla/package.nix index 5e89d64292bf..8304378c4c7c 100644 --- a/pkgs/by-name/ca/carla/package.nix +++ b/pkgs/by-name/ca/carla/package.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' # Also sets program_PYTHONPATH and program_PATH variables wrapPythonPrograms - wrapPythonProgramsIn "$out/share/carla/resources" "$out $pythonPath" + wrapPythonProgramsIn "$out/share/carla/resources" "$out ''${pythonPath[*]}" find "$out/share/carla" -maxdepth 1 -type f -not -name "*.py" -print0 | while read -d "" f; do patchPythonScript "$f" diff --git a/pkgs/by-name/ca/cartridges/package.nix b/pkgs/by-name/ca/cartridges/package.nix index f7dbb0751844..782d47f455da 100644 --- a/pkgs/by-name/ca/cartridges/package.nix +++ b/pkgs/by-name/ca/cartridges/package.nix @@ -60,7 +60,7 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ]; postFixup = '' - wrapPythonProgramsIn $out/libexec $out $pythonPath + wrapPythonProgramsIn $out/libexec "$out ''${pythonPath[*]}" ''; # NOTE: `postCheck` is intentionally not used here, as the entire checkPhase diff --git a/pkgs/by-name/cc/ccze/package.nix b/pkgs/by-name/cc/ccze/package.nix index 79aeb2f40538..7df2b5e1e0ee 100644 --- a/pkgs/by-name/cc/ccze/package.nix +++ b/pkgs/by-name/cc/ccze/package.nix @@ -42,6 +42,13 @@ stdenv.mkDerivation (finalAttrs: { # provide correct pcre2-config for cross env.PCRE_CONFIG = lib.getExe' (lib.getDev pcre2) "pcre2-config"; + outputs = [ + "out" + "man" + "dev" + "lib" + ]; + meta = { mainProgram = "ccze"; description = "Fast, modular log colorizer"; diff --git a/pkgs/by-name/cd/cdk8s-cli/package.nix b/pkgs/by-name/cd/cdk8s-cli/package.nix index cdc4ae59661a..1d50a6c36d46 100644 --- a/pkgs/by-name/cd/cdk8s-cli/package.nix +++ b/pkgs/by-name/cd/cdk8s-cli/package.nix @@ -12,18 +12,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "cdk8s-cli"; - version = "2.203.18"; + version = "2.204.3"; src = fetchFromGitHub { owner = "cdk8s-team"; repo = "cdk8s-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-P/I8e7FWC4HgqPUe5839oh8sRrIQoCJqCvlw6+Wz/aw="; + hash = "sha256-2f9ddwSpNg+7ZMKlHw1Lu10Qp/MoJTqBOz++0yCrXH0="; }; yarnOfflineCache = fetchYarnDeps { inherit (finalAttrs) src; - hash = "sha256-IefCjyrUlHAFC8563M5/UM7d+4Sx9zvW7QMLxW5pJgQ="; + hash = "sha256-dO/h9ebnaH4KSASht8Nec/p/fq0LHJyL7fFgCYvsq6w="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ch/check-jsonschema/package.nix b/pkgs/by-name/ch/check-jsonschema/package.nix index 361f9ffc2f25..249c84287918 100644 --- a/pkgs/by-name/ch/check-jsonschema/package.nix +++ b/pkgs/by-name/ch/check-jsonschema/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "check-jsonschema"; - version = "0.36.0"; + version = "0.36.1"; pyproject = true; src = fetchFromGitHub { owner = "python-jsonschema"; repo = "check-jsonschema"; tag = version; - hash = "sha256-volbCQ0qxd614CDu0GIFKPXF1qSvgf5tTnJ8skcnnTg="; + hash = "sha256-s8a/9kWKSu+WuHQyoBsK4Vn30c+EA/eld/OD3kHYvbk="; }; build-system = with python3Packages; [ setuptools ]; diff --git a/pkgs/by-name/ch/checkmake/package.nix b/pkgs/by-name/ch/checkmake/package.nix index af78a16cbd7d..080e8e0fbfc2 100644 --- a/pkgs/by-name/ch/checkmake/package.nix +++ b/pkgs/by-name/ch/checkmake/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "checkmake"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "checkmake"; repo = "checkmake"; tag = "v${finalAttrs.version}"; - hash = "sha256-W+4bKERQL4nsPxrcCP19uYAwSw+tK9mAQp/fufzYcYg="; + hash = "sha256-5GIqmcIj1jU4lOqrFxuI8lDNYYpsRnUSft6RYGRbiAE="; }; vendorHash = "sha256-Iv3MFhHnwDLIuUH7G6NYyQUSAaivBYqYDWephHnBIho="; diff --git a/pkgs/by-name/ch/chirpstack-rest-api/package.nix b/pkgs/by-name/ch/chirpstack-rest-api/package.nix index 45acd2ff014d..eb67488ce189 100644 --- a/pkgs/by-name/ch/chirpstack-rest-api/package.nix +++ b/pkgs/by-name/ch/chirpstack-rest-api/package.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "chirpstack-rest-api"; - version = "4.15.0"; + version = "4.16.1"; src = fetchFromGitHub { owner = "chirpstack"; repo = "chirpstack-rest-api"; rev = "v${version}"; - hash = "sha256-YSMdE0f3usedyUItSvdtJ77L/x4rwrgIJa1TTg9ODek="; + hash = "sha256-utXayqQGlBYzmf7xW+s1Fh4oRhpBdfnV5g73X2ILKko="; }; - vendorHash = "sha256-+lAfgFb45WxZYh5fzONECRwTlXA64nl58rfstOPsDEg="; + vendorHash = "sha256-JnQaClgU+Yyz07lELoEyLYHLJwcmET5SLci2XQoFGKc="; ldflags = [ "-s" diff --git a/pkgs/by-name/ci/ciscoPacketTracer9/package.nix b/pkgs/by-name/ci/ciscoPacketTracer9/package.nix new file mode 100644 index 000000000000..d0e59507f916 --- /dev/null +++ b/pkgs/by-name/ci/ciscoPacketTracer9/package.nix @@ -0,0 +1,90 @@ +{ + appimageTools, + dpkg, + lib, + libpng, + libxkbfile, + requireFile, + stdenvNoCC, + version ? "9.0.0", +}: + +let + pname = "ciscoPacketTracer9"; + + appimage = stdenvNoCC.mkDerivation { + pname = "ciscoPacketTracer9-appimage"; + inherit version; + + src = + let + sources = { + "9.0.0" = { + name = "CiscoPacketTracer_900_Ubuntu_64bit.deb"; + hash = "sha256-3ZrA1Mf8N9y2j2J/18fm+m1CAMFEklJuVhi5vRcu2SA="; + }; + }; + in + requireFile { + inherit (sources."${version}") name hash; + url = "https://www.netacad.com/resources/lab-downloads"; + }; + + nativeBuildInputs = [ + dpkg + ]; + + installPhase = '' + runHook preInstall + + cp opt/pt/packettracer.AppImage $out + + runHook postInstall + ''; + }; + +in +appimageTools.wrapType2 rec { + inherit pname version; + src = appimage; + + extraPkgs = _: [ + libpng + libxkbfile + ]; + + extraBwrapArgs = [ + # fixes launch on wayland when the user sets QT_QPA_PLATFORM=wayland: + # "Fatal: This application failed to start because no Qt platform plugin could be initialized." + "--setenv QT_QPA_PLATFORM xcb" + ]; + + extraInstallCommands = + let + contents = appimageTools.extract { inherit pname version src; }; + in + '' + mv $out/bin/${pname} $out/bin/packettracer9 + + install -Dm444 ${contents}/CiscoPacketTracer-9.0.0.desktop $out/share/applications/cisco-packet-tracer-9.desktop + install -Dm444 ${contents}/CiscoPacketTracerPtsa-9.0.0.desktop $out/share/applications/cisco-packet-tracer-ptsa-9.desktop + substituteInPlace $out/share/applications/* \ + --replace-fail "Exec=@EXEC_PATH@" "Exec=packettracer9" \ + --replace-fail "Icon=app" "Icon=cisco-packet-tracer-9" + + install -Dm444 ${contents}/usr/share/icons/hicolor/48x48/apps/app.png $out/share/icons/hicolor/48x48/apps/cisco-packet-tracer-9.png + cp -r ${contents}/usr/share/icons/gnome/48x48/mimetypes $out/share/icons/hicolor/48x48/ + ''; + + meta = { + description = "Network simulation tool from Cisco"; + homepage = "https://www.netacad.com/courses/packet-tracer"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ + gepbird + ]; + mainProgram = "packettracer9"; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/pkgs/by-name/cl/clapper-enhancers/package.nix b/pkgs/by-name/cl/clapper-enhancers/package.nix index 96bba08885a2..3a3feb421334 100644 --- a/pkgs/by-name/cl/clapper-enhancers/package.nix +++ b/pkgs/by-name/cl/clapper-enhancers/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { ]; postFixup = '' - buildPythonPath "$out $pythonPath" + buildPythonPath "$out ''${pythonPath[*]}" for yt_plugin in $out/lib/clapper-enhancers/plugins/yt-dlp/*.py; do patchPythonScript $yt_plugin done diff --git a/pkgs/by-name/cl/claude-code-bin/manifest.json b/pkgs/by-name/cl/claude-code-bin/manifest.json index ce6494a756e8..7edfca54ea37 100644 --- a/pkgs/by-name/cl/claude-code-bin/manifest.json +++ b/pkgs/by-name/cl/claude-code-bin/manifest.json @@ -1,34 +1,34 @@ { - "version": "2.1.20", - "buildDate": "2026-01-27T00:41:34Z", + "version": "2.1.21", + "buildDate": "2026-01-28T01:39:36Z", "platforms": { "darwin-arm64": { - "checksum": "c5703596ed854ae8e5775cf38de5d71d8a56ecfe3f36904812870e9e34178c8c", - "size": 181661168 + "checksum": "e8265d8719f131ab8f2863e66ce69cc829c4f55387ae2286e45d4a06b802c6fd", + "size": 181892336 }, "darwin-x64": { - "checksum": "0d38292770c88bd9b13b0684afb0d2dc0028a1437d0c09be3449d2b3d369b045", - "size": 187958208 + "checksum": "1824c9a01e0266bef1c0da880503e49db08823cf7eb6a54fef2a385028c2bb05", + "size": 188189376 }, "linux-arm64": { - "checksum": "eb8801c7a4a8501b21c235f36674f17328e65e796cf8a6196b3bf9a23ae16f99", - "size": 216047898 + "checksum": "e043ed95e4df4282a9adb34eb51ee14d59a53f2feeeb19884a6b4edeccbe7f3a", + "size": 216288068 }, "linux-x64": { - "checksum": "f9d3698f5378a486db2d4eea5c80f95c2ceb410fbcea9ffc5703b5aac9574fcc", - "size": 223852550 + "checksum": "35fcccfced2e8669dc4aacf2bb76fab9816bcc5fc566e66b5ae42f4e7b4474b1", + "size": 224093184 }, "linux-arm64-musl": { - "checksum": "2a7d24d2b85068c5aca6c014dd5f3f94bd8d55803a06f0d39eea776ab3282d76", - "size": 211311930 + "checksum": "5e453c59b3c8fea4e6848e0972ab093e8eda4711e2be20b68dd4ebaea12db4e1", + "size": 211552100 }, "linux-x64-musl": { - "checksum": "0b392cc1c268f0e48ceedee384535451013f69887a61e23f989e3b743373796a", - "size": 216541126 + "checksum": "afa929dbccd23f746b01821699b1985eb7cc35018d0a8e9bbab678764ea58fb7", + "size": 216781760 }, "win32-x64": { - "checksum": "12e88d78570b6e979f5cf290652dc45ca8b9327f43bb27e275f87146190bef05", - "size": 233703072 + "checksum": "325abe8bb0b907c008e229085815c938037864411ced6c553dbb52e0be587efe", + "size": 233936544 } } } diff --git a/pkgs/by-name/cl/clickhouse/lts.nix b/pkgs/by-name/cl/clickhouse/lts.nix index 0e2134aa2883..fcc816d71fb9 100644 --- a/pkgs/by-name/cl/clickhouse/lts.nix +++ b/pkgs/by-name/cl/clickhouse/lts.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "25.8.14.17-lts"; - rev = "85bdcee459593cd55faef3154a5e487b60119ff4"; - hash = "sha256-Ydx46Y7uFHVUzsqY8dBExg2r78Y+PeJUkMSIVAn6eXQ="; + version = "25.8.15.35-lts"; + rev = "7a0b36cf8934881236312e9fea094baaf5c709a4"; + hash = "sha256-zCMqZaw+QO/MAdJhgyrZYvdFPO8o11EXbuGHS5++dZw="; lts = true; } diff --git a/pkgs/by-name/cl/clojure/package.nix b/pkgs/by-name/cl/clojure/package.nix index 919a936984b1..fca070991764 100644 --- a/pkgs/by-name/cl/clojure/package.nix +++ b/pkgs/by-name/cl/clojure/package.nix @@ -13,12 +13,12 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "clojure"; - version = "1.12.4.1582"; + version = "1.12.4.1602"; src = fetchurl { # https://github.com/clojure/brew-install/releases url = "https://github.com/clojure/brew-install/releases/download/${finalAttrs.version}/clojure-tools-${finalAttrs.version}.tar.gz"; - hash = "sha256-/Vhk8ivy7DAxH5zjyvPTF5ngTWU7ZX7NtPCDb+ly/yE="; + hash = "sha256-B9ld7oGEVcoI/QJb/SBHGAhSI7E1vc1LXQA5scxvkqM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/comma/package.nix b/pkgs/by-name/co/comma/package.nix index e6dfa9cbfb56..6d38d4f30acd 100644 --- a/pkgs/by-name/co/comma/package.nix +++ b/pkgs/by-name/co/comma/package.nix @@ -12,14 +12,14 @@ buildPackages, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "comma"; version = "2.3.3"; src = fetchFromGitHub { owner = "nix-community"; repo = "comma"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-dNek1a8Yt3icWc8ZpVe1NGuG+eSoTDOmAAJbkYmMocU="; }; @@ -67,4 +67,4 @@ rustPlatform.buildRustPackage rec { mainProgram = "comma"; maintainers = with lib.maintainers; [ artturin ]; }; -} +}) diff --git a/pkgs/by-name/co/complgen/package.nix b/pkgs/by-name/co/complgen/package.nix index 077bf1f8d3e1..7dede6691e85 100644 --- a/pkgs/by-name/co/complgen/package.nix +++ b/pkgs/by-name/co/complgen/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "complgen"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "adaszko"; repo = "complgen"; tag = "v${finalAttrs.version}"; - hash = "sha256-fHSDYrfCoLQ4tU1DbrpD3iApufBv5qAGTIFri229pyE="; + hash = "sha256-DNmStSwuAFsLGC4pLU6dO2qhBQgxObPiUJxZoJf1d5A="; }; - cargoHash = "sha256-a6bGE2xxv8IdKlo98X8KNeQl8e//dc9pfaBgGHhx+5M="; + cargoHash = "sha256-whve1rNmqOLWjrM8gqxgocRTTWpEQ/VxT/0t+12uSKw="; meta = { changelog = "https://github.com/adaszko/complgen/blob/v${finalAttrs.version}/CHANGELOG.md"; diff --git a/pkgs/by-name/cu/cue/package.nix b/pkgs/by-name/cu/cue/package.nix index 093773a0de66..a2862b4f2bce 100644 --- a/pkgs/by-name/cu/cue/package.nix +++ b/pkgs/by-name/cu/cue/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "cue"; - version = "0.15.3"; + version = "0.15.4"; src = fetchFromGitHub { owner = "cue-lang"; repo = "cue"; tag = "v${finalAttrs.version}"; - hash = "sha256-xonTaZyJ3oyk4jcnyLIlOEP201jfM4cB7jNR6GxfK1E="; + hash = "sha256-5qu+CilTLYdTCfW15ifGIhr/fVH7NshrFxecwED1hkQ="; }; vendorHash = "sha256-ivFw62+pg503EEpRsdGSQrFNah87RTUrRXUSPZMFLG4="; diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index 4f31401403ce..ce77767dc46f 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -8,7 +8,7 @@ openjdk21, gnused, autoPatchelfHook, - autoSignDarwinBinariesHook, + darwin, wrapGAppsHook3, gtk3, glib, @@ -55,7 +55,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [ undmg - autoSignDarwinBinariesHook + darwin.autoSignDarwinBinariesHook ]; dontConfigure = true; @@ -144,7 +144,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.asl20; - platforms = with lib.platforms; linux ++ darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ gepbird mkg20001 diff --git a/pkgs/by-name/de/deck/package.nix b/pkgs/by-name/de/deck/package.nix index 735936bd27f2..8be259cb3d5a 100644 --- a/pkgs/by-name/de/deck/package.nix +++ b/pkgs/by-name/de/deck/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "deck"; - version = "1.54.0"; + version = "1.55.0"; src = fetchFromGitHub { owner = "Kong"; repo = "deck"; tag = "v${version}"; - hash = "sha256-DVj4VHmU3yORL4zytWzXIPEjrS1P+WLE18Vdcdbibos="; + hash = "sha256-Xw8IROfseCo4e0yDC5Y6aD/aTu9JYsGYjeSzSVIXd+E="; }; nativeBuildInputs = [ installShellFiles ]; @@ -28,7 +28,7 @@ buildGoModule rec { ]; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-x+nL+bnwXio/z3XFC9A9G9T7mtB5BsnNgLWT54OJLCE="; + vendorHash = "sha256-LmYsPrHKTYu07jLkAo7UsIV74sVyLSdhAwUV6Cu0JNQ="; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd deck \ diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix index 6c6707235f1c..c68775de7da8 100644 --- a/pkgs/by-name/de/deno/package.nix +++ b/pkgs/by-name/de/deno/package.nix @@ -29,17 +29,17 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "deno"; - version = "2.6.5"; + version = "2.6.6"; src = fetchFromGitHub { owner = "denoland"; repo = "deno"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; # required for tests - hash = "sha256-oNZXPBW61IQdA3MFS1gxNoInSCt6mUitedAXx+tuFaw="; + hash = "sha256-QqzV4Ikr5iWrOX+KJH/65S1HHhxOB0SmHj7yejVJp3M="; }; - cargoHash = "sha256-H1vX/aiB5inK6Fo0l3sEZnvqgRImTpjkxRZHLBPgz0U="; + cargoHash = "sha256-soJ2ZKpxlBskl2b3pz4pn6zMaWUXjYOBRKBuoxHokes="; patches = [ ./patches/0002-tests-replace-hardcoded-paths.patch diff --git a/pkgs/by-name/do/doppler/package.nix b/pkgs/by-name/do/doppler/package.nix index b5240b78209e..1bfbc54cf883 100644 --- a/pkgs/by-name/do/doppler/package.nix +++ b/pkgs/by-name/do/doppler/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "doppler"; - version = "3.75.1"; + version = "3.75.2"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - hash = "sha256-YyhDvBgdcy3CtVpQj60XQ0aqE2zT1LV9QXQJiJvlaic="; + hash = "sha256-S6g2wtF676Cc3nEKP1GpyhQRYyjKUQa9ACe41269vHY="; }; - vendorHash = "sha256-tSRtgkDPvDlEfwuNhahvs3Pvt4h7QAJrJtb1XQXGaFM="; + vendorHash = "sha256-u6SB3SXCqu7Y2aUoTAJ01mtDCxMofVQLAde1jDxVvks="; ldflags = [ "-s -w" diff --git a/pkgs/by-name/du/dunst/package.nix b/pkgs/by-name/du/dunst/package.nix index ee2838fa65d3..edcdae052fde 100644 --- a/pkgs/by-name/du/dunst/package.nix +++ b/pkgs/by-name/du/dunst/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dunst"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "dunst-project"; repo = "dunst"; tag = "v${finalAttrs.version}"; - hash = "sha256-HPmIcOLoYDD1GEgTh1elA9xiZGFKt1In4vsAtRsOukE="; + hash = "sha256-F7CONYJ95aKNZ+BpWNUerCBMflgJYgSaLAqp6XJ1G5k="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/du/duplicity/package.nix b/pkgs/by-name/du/duplicity/package.nix index 8dc193ec0e6e..7cdb8eff47f2 100644 --- a/pkgs/by-name/du/duplicity/package.nix +++ b/pkgs/by-name/du/duplicity/package.nix @@ -143,7 +143,7 @@ let # tests need writable $HOME HOME=$PWD/.home - wrapPythonProgramsIn "$PWD/testing/overrides/bin" "$pythonPath" + wrapPythonProgramsIn "$PWD/testing/overrides/bin" "''${pythonPath[*]}" ''; doCheck = true; diff --git a/pkgs/by-name/ed/editorconfig-checker/package.nix b/pkgs/by-name/ed/editorconfig-checker/package.nix index 4c846ebe7329..f344bb156d43 100644 --- a/pkgs/by-name/ed/editorconfig-checker/package.nix +++ b/pkgs/by-name/ed/editorconfig-checker/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "editorconfig-checker"; - version = "3.6.0"; + version = "3.6.1"; src = fetchFromGitHub { owner = "editorconfig-checker"; repo = "editorconfig-checker"; tag = "v${finalAttrs.version}"; - hash = "sha256-HQYZXwxysGpbNDAzgAruzBtSlPxfwrLuzirkZSV2Xhs="; + hash = "sha256-kvRORmfquabvNoIchQdXEXKYKLpNjy8tgvkS6a0vmEk="; }; - vendorHash = "sha256-zlARI7bKf+4bdgCha9AlDZyTRbrOHtmvHeExJWhB85I="; + vendorHash = "sha256-Olp21Sbey3zW/OCc59w0wqcnq8lwRigu/De7A82H6YU="; # Tests run on source and don't expect vendor dir. doCheck = false; diff --git a/pkgs/by-name/eg/ego/package.nix b/pkgs/by-name/eg/ego/package.nix index bffa1ea6ec8f..1c1ee7fdf561 100644 --- a/pkgs/by-name/eg/ego/package.nix +++ b/pkgs/by-name/eg/ego/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { # requires access to /root checkFlags = [ - "--skip tests::test_check_user_homedir" + "--skip=tests::test_check_user_homedir" ]; postInstall = '' diff --git a/pkgs/by-name/ei/eigenwallet/package.nix b/pkgs/by-name/ei/eigenwallet/package.nix index c76e941dc1ae..9fc7b7afc79c 100644 --- a/pkgs/by-name/ei/eigenwallet/package.nix +++ b/pkgs/by-name/ei/eigenwallet/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "eigenwallet"; - version = "3.6.6"; + version = "3.6.7"; src = fetchurl { url = "https://github.com/eigenwallet/core/releases/download/${finalAttrs.version}/eigenwallet_${finalAttrs.version}_amd64.deb"; - hash = "sha256-2K1sls8YYvDirk9knVDoL5KDfjlxD7UbeKLIe+Z+wrc="; + hash = "sha256-kIu0TLFw5hxUnCItgSNB+XuxpC1gKXvu+k4vQH1UitA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/el/element-web/package.nix b/pkgs/by-name/el/element-web/package.nix index a5dbaf77b7b4..a469750f50dd 100644 --- a/pkgs/by-name/el/element-web/package.nix +++ b/pkgs/by-name/el/element-web/package.nix @@ -3,7 +3,8 @@ stdenv, jq, element-web-unwrapped, - conf ? { }, + config, + conf ? config.element-web.conf or { }, }: if (conf == { }) then diff --git a/pkgs/by-name/es/espeak-ng/package.nix b/pkgs/by-name/es/espeak-ng/package.nix index 0afba656b601..2dcc47110610 100644 --- a/pkgs/by-name/es/espeak-ng/package.nix +++ b/pkgs/by-name/es/espeak-ng/package.nix @@ -74,6 +74,12 @@ stdenv.mkDerivation rec { url = "https://github.com/espeak-ng/espeak-ng/commit/83e646e711af608fafa8c01dd812cd29e073f644.patch"; hash = "sha256-UHuURyqRy/JVYYJH5EI5J2cpBfCNeTE24sMmheb+D2Q="; }) + # Remove after next release. + (fetchpatch { + name = "cmake-default-ESPEAK_COMPAT-to-ON.patch"; + url = "https://github.com/espeak-ng/espeak-ng/commit/3dcbe7ea3ea85a9212968d0f05172dde4259e770.patch"; + hash = "sha256-U694hGe+cwy7qLe/6XmNHYIhccJGsbM0CzPZT5pIpUI="; + }) ] ++ lib.optionals mbrolaSupport [ # Hardcode correct mbrola paths. diff --git a/pkgs/by-name/ex/exo/package.nix b/pkgs/by-name/ex/exo/package.nix index b416735d340e..7a63cd3e0d92 100644 --- a/pkgs/by-name/ex/exo/package.nix +++ b/pkgs/by-name/ex/exo/package.nix @@ -18,13 +18,13 @@ nix-update-script, }: let - version = "1.0.65"; + version = "1.0.67"; src = fetchFromGitHub { name = "exo"; owner = "exo-explore"; repo = "exo"; tag = "v${version}"; - hash = "sha256-Zj174EySIILdj7+QJVT6ZGYvjO+jXHj+GizVsve2lFk="; + hash = "sha256-hipCiAqCkkyrVcQXEZKbGoVbgjM3hykUcazNPEbT+q8="; }; pyo3-bindings = python3Packages.buildPythonPackage (finalAttrs: { @@ -55,6 +55,10 @@ let enabledTestPaths = [ "rust/exo_pyo3_bindings/tests/" ]; + + # RuntimeError + # Attempted to create a NULL object + doCheck = !stdenv.hostPlatform.isDarwin; }); dashboard = buildNpmPackage (finalAttrs: { @@ -74,6 +78,19 @@ let hash = "sha256-3ZgE1ysb1OeB4BNszvlrnYcc7gOo7coPfOEQmMHC6E0="; }; }); + + # exo requires building mlx-lm from its main branch to use the kimi-k2.5 model + mlx-lm-unstable = python3Packages.mlx-lm.overridePythonAttrs (old: { + version = "0.30.4-unstable-2026-01-27"; + src = old.src.override { + rev = "96699e6dadb13b82b28285bb131a0741997d19ae"; + tag = null; + hash = "sha256-L1ws8XA8VhR18pRuRGbVal/yEfJaFNW8QzS16C1dFpE="; + }; + meta = old.meta // { + changelog = "https://github.com/ml-explore/mlx-lm/releases/tag/v0.30.5"; + }; + }); in python3Packages.buildPythonApplication (finalAttrs: { pname = "exo"; @@ -134,7 +151,7 @@ python3Packages.buildPythonApplication (finalAttrs: { loguru mflux mlx - mlx-lm + mlx-lm-unstable nvidia-ml-py openai openai-harmony diff --git a/pkgs/by-name/fa/factorio/package.nix b/pkgs/by-name/fa/factorio/package.nix index 3de81b7191f8..62511cc4c77b 100644 --- a/pkgs/by-name/fa/factorio/package.nix +++ b/pkgs/by-name/fa/factorio/package.nix @@ -16,7 +16,7 @@ libxkbcommon, makeDesktopItem, makeWrapper, - releaseType, + releaseType ? "alpha", stdenv, wayland, diff --git a/pkgs/by-name/fa/fast-downward/package.nix b/pkgs/by-name/fa/fast-downward/package.nix index a3a7d1a48248..7b379a5017c8 100644 --- a/pkgs/by-name/fa/fast-downward/package.nix +++ b/pkgs/by-name/fa/fast-downward/package.nix @@ -51,8 +51,8 @@ stdenv.mkDerivation rec { mkdir -p $out/${python3.sitePackages} cp -r driver $out/${python3.sitePackages} - wrapPythonProgramsIn $out/bin "$out $pythonPath" - wrapPythonProgramsIn $out/libexec/fast-downward/translate "$out $pythonPath" + wrapPythonProgramsIn $out/bin "$out ''${pythonPath[*]}" + wrapPythonProgramsIn $out/libexec/fast-downward/translate "$out ''${pythonPath[*]}" # Because fast-downward calls `python translate.py` we need to return wrapped scripts back. for i in $out/libexec/fast-downward/translate/.*-wrapped; do name="$(basename "$i")" diff --git a/pkgs/by-name/fi/fio/package.nix b/pkgs/by-name/fi/fio/package.nix index a5fd7b26072c..4450b03001df 100644 --- a/pkgs/by-name/fi/fio/package.nix +++ b/pkgs/by-name/fi/fio/package.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { ]; postInstall = '' - wrapPythonProgramsIn "$out/bin" "$out $pythonPath" + wrapPythonProgramsIn "$out/bin" "$out ''${pythonPath[*]}" ''; meta = { diff --git a/pkgs/by-name/fl/flip-link/package.nix b/pkgs/by-name/fl/flip-link/package.nix index 20781ad67400..20cf4ba03f71 100644 --- a/pkgs/by-name/fl/flip-link/package.nix +++ b/pkgs/by-name/fl/flip-link/package.nix @@ -23,9 +23,9 @@ rustPlatform.buildRustPackage rec { checkFlags = [ # requires embedded toolchains - "--skip should_link_example_firmware::case_1_normal" - "--skip should_link_example_firmware::case_2_custom_linkerscript" - "--skip should_verify_memory_layout" + "--skip=should_link_example_firmware::case_1_normal" + "--skip=should_link_example_firmware::case_2_custom_linkerscript" + "--skip=should_verify_memory_layout" ]; meta = { diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index 8f0e21779ecf..fb0e6d316401 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -49,17 +49,17 @@ let in buildGoModule rec { pname = "forgejo-runner"; - version = "12.6.2"; + version = "12.6.3"; src = fetchFromGitea { domain = "code.forgejo.org"; owner = "forgejo"; repo = "runner"; rev = "v${version}"; - hash = "sha256-Y5dX1iemh4o5dZrDyhWeMEiocpplEe66p8UadtbJ4Jw="; + hash = "sha256-YBPUxKFHB6eqYyDAFBEbVVTLe5tfHwtLYfR+uCU73hc="; }; - vendorHash = "sha256-fvSiEIE4XSJ8Ot4Tcmt8chD11fHVsECD2/8xrgIKhJs="; + vendorHash = "sha256-MrumzEpSuLVmtrySnlI7Nb7GqxmW8Yk9agsaH4HA6QU="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/fr/freelens-bin/darwin.nix b/pkgs/by-name/fr/freelens-bin/darwin.nix index 546eeecf1639..40044b8a0f49 100644 --- a/pkgs/by-name/fr/freelens-bin/darwin.nix +++ b/pkgs/by-name/fr/freelens-bin/darwin.nix @@ -5,7 +5,8 @@ src, passthru, meta, - undmg, + _7zz, + autoSignDarwinBinariesHook, }: stdenvNoCC.mkDerivation { @@ -19,16 +20,18 @@ stdenvNoCC.mkDerivation { sourceRoot = "."; - nativeBuildInputs = [ undmg ]; + # APFS format is unsupported by undmg + nativeBuildInputs = [ + _7zz + autoSignDarwinBinariesHook + ]; installPhase = '' runHook preInstall mkdir -p "$out/Applications" - cp -R "Freelens.app" "$out/Applications/Freelens.app" + cp -R Freelens*/Freelens.app "$out/Applications/Freelens.app" runHook postInstall ''; - - dontFixup = true; } diff --git a/pkgs/by-name/fr/freelens-bin/package.nix b/pkgs/by-name/fr/freelens-bin/package.nix index b81d7a082d89..ed52fbae4962 100644 --- a/pkgs/by-name/fr/freelens-bin/package.nix +++ b/pkgs/by-name/fr/freelens-bin/package.nix @@ -5,7 +5,8 @@ lib, appimageTools, makeWrapper, - undmg, + _7zz, + darwin, writeShellScript, nix-update, jq, @@ -81,8 +82,9 @@ if stdenv.hostPlatform.isDarwin then src passthru meta - undmg + _7zz ; + autoSignDarwinBinariesHook = darwin.autoSignDarwinBinariesHook; } else import ./linux.nix { diff --git a/pkgs/by-name/fr/freetube/darwin-targets.patch b/pkgs/by-name/fr/freetube/darwin-targets.patch new file mode 100644 index 000000000000..509bca6a34cd --- /dev/null +++ b/pkgs/by-name/fr/freetube/darwin-targets.patch @@ -0,0 +1,13 @@ +diff --git a/_scripts/build.js b/_scripts/build.js +index ee1b7fa1c..1a4c9c6b2 100644 +--- a/_scripts/build.js ++++ b/_scripts/build.js +@@ -16,7 +16,7 @@ if (platform === 'darwin') { + arch = Arch.arm64 + } + +- targets = Platform.MAC.createTarget(['DMG', 'zip', '7z'], arch) ++ targets = Platform.MAC.createTarget(['dir'], arch) + } else if (platform === 'win32') { + let arch = Arch.x64 + diff --git a/pkgs/by-name/fr/freetube/package.nix b/pkgs/by-name/fr/freetube/package.nix index 26ed6654cbb2..539e54b68cb3 100644 --- a/pkgs/by-name/fr/freetube/package.nix +++ b/pkgs/by-name/fr/freetube/package.nix @@ -33,8 +33,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { postUnpack = if stdenvNoCC.hostPlatform.isDarwin then '' - cp -r ${electron.dist} electron-dist - chmod -R u+w electron-dist + cp -r ${electron.dist} source/electron-dist + chmod -R u+w source/electron-dist '' else '' @@ -45,6 +45,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { (replaceVars ./patch-build-script.patch { electron-version = electron.version; }) + ./darwin-targets.patch ]; yarnOfflineCache = fetchYarnDeps { @@ -74,7 +75,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { install -D _icons/icon.svg $out/share/icons/hicolor/scalable/apps/freetube.svg '' + lib.optionalString stdenvNoCC.hostPlatform.isDarwin '' - mkdir -p $out/Applications + mkdir -p $out/Applications $out/bin cp -r build/mac*/FreeTube.app $out/Applications ln -s "$out/Applications/FreeTube.app/Contents/MacOS/FreeTube" $out/bin/freetube '' @@ -110,11 +111,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { sigmasquadron ddogfoodd ]; - badPlatforms = [ - # output app is called "Electron.app" while derivation expects "FreeTube.app" - #see: https://github.com/NixOS/nixpkgs/pull/384596#issuecomment-2677141349 - lib.systems.inspect.patterns.isDarwin - ]; inherit (electron.meta) platforms; mainProgram = "freetube"; }; diff --git a/pkgs/by-name/ga/gat/package.nix b/pkgs/by-name/ga/gat/package.nix index ae55038e7adf..550e5c3004d2 100644 --- a/pkgs/by-name/ga/gat/package.nix +++ b/pkgs/by-name/ga/gat/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "gat"; - version = "0.26.0"; + version = "0.26.1"; src = fetchFromGitHub { owner = "koki-develop"; repo = "gat"; tag = "v${version}"; - hash = "sha256-aWGSn5eeFTfBrAsYj38jcf6Xsrz0X5crjjOe0fNu1Mo="; + hash = "sha256-tlRXWI8jdns+MFLBl5ZzcGo2qli6dKhlT9ekwSrxi+s="; }; - vendorHash = "sha256-C1Nm4czf6F2u/OU4jdRQLTXWKBo3mF0TqypbF1pO8yc="; + vendorHash = "sha256-0kNtZOTpWpeFVyRHFIf6ybM7gAWb5/JWVljm0FO5fK8="; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/gd/gdal/package.nix b/pkgs/by-name/gd/gdal/package.nix index e788c5123485..ea009b46261b 100644 --- a/pkgs/by-name/gd/gdal/package.nix +++ b/pkgs/by-name/gd/gdal/package.nix @@ -221,7 +221,7 @@ stdenv.mkDerivation (finalAttrs: { pythonPath = [ python3Packages.numpy ]; postInstall = '' - wrapPythonProgramsIn "$out/bin" "$out $pythonPath" + wrapPythonProgramsIn "$out/bin" "$out ''${pythonPath[*]}" '' + lib.optionalString useJava '' cd $out/lib diff --git a/pkgs/by-name/ge/geis/package.nix b/pkgs/by-name/ge/geis/package.nix index 540c84ca8446..4e049ccbc44a 100644 --- a/pkgs/by-name/ge/geis/package.nix +++ b/pkgs/by-name/ge/geis/package.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { ''; preFixup = '' - buildPythonPath "$out $pythonPath" + buildPythonPath "$out ''${pythonPath[*]}" gappsWrapperArgs+=(--set PYTHONPATH "$program_PYTHONPATH") ''; diff --git a/pkgs/by-name/gi/gitlab-clippy/package.nix b/pkgs/by-name/gi/gitlab-clippy/package.nix index 8ab667701379..afc3a0dfcbaf 100644 --- a/pkgs/by-name/gi/gitlab-clippy/package.nix +++ b/pkgs/by-name/gi/gitlab-clippy/package.nix @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-O3Pey0XwZITePTiVHrG5EVZpIp96sRWjUf1vzZ/JnCw="; - # TODO re-add theses tests once they get fixed in upstream + # TODO re-add these tests once they get fixed in upstream checkFlags = [ - "--skip cli::converts_error_from_pipe" - "--skip cli::converts_warnings_from_pipe" + "--skip=cli::converts_error_from_pipe" + "--skip=cli::converts_warnings_from_pipe" ]; meta = { diff --git a/pkgs/by-name/gn/gnome-tweaks/package.nix b/pkgs/by-name/gn/gnome-tweaks/package.nix index 3e4afc36e2f1..1a2f81b2bebb 100644 --- a/pkgs/by-name/gn/gnome-tweaks/package.nix +++ b/pkgs/by-name/gn/gnome-tweaks/package.nix @@ -79,7 +79,7 @@ python3Packages.buildPythonApplication rec { ''; postFixup = '' - wrapPythonProgramsIn "$out/libexec" "$out $pythonPath" + wrapPythonProgramsIn "$out/libexec" "$out ''${pythonPath[*]}" ''; passthru = { diff --git a/pkgs/by-name/gp/gpsd/package.nix b/pkgs/by-name/gp/gpsd/package.nix index 9cdd4b352dc1..66df5e3c6b95 100644 --- a/pkgs/by-name/gp/gpsd/package.nix +++ b/pkgs/by-name/gp/gpsd/package.nix @@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: { # remove binaries for x-less install because xgps sconsflag is partially broken postFixup = '' - wrapPythonProgramsIn $out/bin "$out $pythonPath" + wrapPythonProgramsIn $out/bin "$out ''${pythonPath[*]}" ''; meta = { diff --git a/pkgs/by-name/gr/grcov/package.nix b/pkgs/by-name/gr/grcov/package.nix index 2197d4fafd72..1444dea0bf22 100644 --- a/pkgs/by-name/gr/grcov/package.nix +++ b/pkgs/by-name/gr/grcov/package.nix @@ -30,9 +30,8 @@ rustPlatform.buildRustPackage (finalAttrs: { "test_integration_zip_dir" "test_integration_zip_zip" ]; - skipFlag = test: "--skip " + test; in - builtins.concatStringsSep " " (map skipFlag skipList); + builtins.map (x: "--skip=" + x) skipList; meta = { description = "Rust tool to collect and aggregate code coverage data for multiple source files"; diff --git a/pkgs/by-name/gr/grpc-gateway/package.nix b/pkgs/by-name/gr/grpc-gateway/package.nix index 3ce546e565f6..c83c4b793759 100644 --- a/pkgs/by-name/gr/grpc-gateway/package.nix +++ b/pkgs/by-name/gr/grpc-gateway/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "grpc-gateway"; - version = "2.27.5"; + version = "2.27.6"; src = fetchFromGitHub { owner = "grpc-ecosystem"; repo = "grpc-gateway"; tag = "v${version}"; - sha256 = "sha256-xPm5oBxmtCfrOAIKoLMQFZA7PAp/buz6QRwQ8HFFpq4="; + sha256 = "sha256-Ll4iq8OLDM4UR6ZzVSqqHOzMAd4vwVSb9iKMRcKvIVg="; }; - vendorHash = "sha256-eEif65wAE06UNkkmDHz781DDuFPOTLkdvDq++XSP8XY="; + vendorHash = "sha256-SOAbRrzMf2rbKaG9PGSnPSLY/qZVgbHcNjOLmVonycY="; ldflags = [ "-X=main.version=${version}" diff --git a/pkgs/by-name/gv/gvm-libs/package.nix b/pkgs/by-name/gv/gvm-libs/package.nix index cda5cebaec15..b6627bf56cfd 100644 --- a/pkgs/by-name/gv/gvm-libs/package.nix +++ b/pkgs/by-name/gv/gvm-libs/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gvm-libs"; - version = "22.35.2"; + version = "22.35.4"; src = fetchFromGitHub { owner = "greenbone"; repo = "gvm-libs"; tag = "v${finalAttrs.version}"; - hash = "sha256-DVYU+6hUps2nwgkTWu228wVYtke4oDFUqXM73DEN6LM="; + hash = "sha256-fD8pi3eSmeSC0qPhX0DpATYMkblnat74VMzwBqWe5n4="; }; postPatch = '' diff --git a/pkgs/by-name/ha/hamster/package.nix b/pkgs/by-name/ha/hamster/package.nix index edd963ee9b5c..ea37f4237962 100644 --- a/pkgs/by-name/ha/hamster/package.nix +++ b/pkgs/by-name/ha/hamster/package.nix @@ -62,7 +62,7 @@ python3Packages.buildPythonApplication rec { ''; postFixup = '' - wrapPythonProgramsIn $out/libexec "$out $pythonPath" + wrapPythonProgramsIn $out/libexec "$out ''${pythonPath[*]}" ''; meta = { diff --git a/pkgs/by-name/he/hexpatch/package.nix b/pkgs/by-name/he/hexpatch/package.nix index f765181dd649..e829d5c015b3 100644 --- a/pkgs/by-name/he/hexpatch/package.nix +++ b/pkgs/by-name/he/hexpatch/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "hexpatch"; - version = "1.12.4"; + version = "1.12.5"; src = fetchFromGitHub { owner = "Etto48"; repo = "HexPatch"; tag = "v${version}"; - hash = "sha256-ThHRf3zLNpOiIpB7drLqMBdyRl6MqW45oFpz44uBwsY="; + hash = "sha256-2FTFVKFql28S3/03M64FJyrwWuI0Zeg8z/nrWZJzGIo="; }; - cargoHash = "sha256-kMLLtrXjduQ2nyiNtiZOhlEfADhn1IKysF29WO6R8CE="; + cargoHash = "sha256-PQEq6g+VItcIG3GBl5sOFtPVZem27+n2JTPjK23xIt8="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/hi/hisat2/package.nix b/pkgs/by-name/hi/hisat2/package.nix index c8d98a4ea45c..6b392319ad2f 100644 --- a/pkgs/by-name/hi/hisat2/package.nix +++ b/pkgs/by-name/hi/hisat2/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "hisat2"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "DaehwanKimLab"; repo = "hisat2"; rev = "v${version}"; - sha256 = "0lmzdhzjkvxw7n5w40pbv5fgzd4cz0f9pxczswn3d4cr0k10k754"; + sha256 = "sha256-Ub7Oe363bU+R1xGiWVDkbXGV0PWJ5x2D9de+jTJSwOA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hm/hmcl/package.nix b/pkgs/by-name/hm/hmcl/package.nix index 6958fc4ad4b1..aa7a55dd59d2 100644 --- a/pkgs/by-name/hm/hmcl/package.nix +++ b/pkgs/by-name/hm/hmcl/package.nix @@ -41,8 +41,8 @@ libpulseaudio, gobject-introspection, callPackage, + gtk3, }: - stdenv.mkDerivation (finalAttrs: { pname = "hmcl"; version = "3.9.2"; @@ -153,6 +153,7 @@ stdenv.mkDerivation (finalAttrs: { libpulseaudio wayland alsa-lib + gtk3 ]; installPhase = '' @@ -181,6 +182,7 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' makeShellWrapper ${hmclJdk}/bin/java $out/bin/hmcl \ --add-flags "-jar $out/lib/hmcl/hmcl-terracotta-patch.jar" \ + --add-flags "-Djdk.gtk.version=3" \ --set LD_LIBRARY_PATH ${lib.makeLibraryPath finalAttrs.runtimeDeps} \ --prefix PATH : "${ lib.makeBinPath (minecraftJdks ++ lib.optional stdenv.hostPlatform.isLinux xrandr) diff --git a/pkgs/by-name/hp/hplip/package.nix b/pkgs/by-name/hp/hplip/package.nix index f0e1896d2db6..d4e4f9f48528 100644 --- a/pkgs/by-name/hp/hplip/package.nix +++ b/pkgs/by-name/hp/hplip/package.nix @@ -306,7 +306,7 @@ python3Packages.buildPythonApplication { dontWrapGApps = true; dontWrapQtApps = true; preFixup = '' - buildPythonPath "$out $pythonPath" + buildPythonPath "$out ''${pythonPath[*]}" for bin in $out/bin/*; do py=$(readlink -m $bin) diff --git a/pkgs/by-name/hu/hullcaster/package.nix b/pkgs/by-name/hu/hullcaster/package.nix index 7919a88a2630..c8e2775ada0d 100644 --- a/pkgs/by-name/hu/hullcaster/package.nix +++ b/pkgs/by-name/hu/hullcaster/package.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { # work around error: Could not create filepath: /homeless-shelter/.local/share checkFlags = [ - "--skip gpodder::tests::gpodder" + "--skip=gpodder::tests::gpodder" ]; meta = { diff --git a/pkgs/by-name/hy/hypnotix/package.nix b/pkgs/by-name/hy/hypnotix/package.nix index 19f11b1d33eb..479326f6f0c3 100644 --- a/pkgs/by-name/hy/hypnotix/package.nix +++ b/pkgs/by-name/hy/hypnotix/package.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - buildPythonPath "$out $pythonPath" + buildPythonPath "$out ''${pythonPath[*]}" # yt-dlp is needed for mpv to play YouTube channels. wrapProgram $out/bin/hypnotix \ diff --git a/pkgs/by-name/hy/hyprshutdown/package.nix b/pkgs/by-name/hy/hyprshutdown/package.nix index 8f3bb9df54ea..92fd6d6ae4f0 100644 --- a/pkgs/by-name/hy/hyprshutdown/package.nix +++ b/pkgs/by-name/hy/hyprshutdown/package.nix @@ -18,13 +18,13 @@ gcc15Stdenv.mkDerivation (finalAttrs: { pname = "hyprshutdown"; - version = "0-unstable-2026-01-11"; + version = "0-unstable-2026-01-27"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprshutdown"; - rev = "0c9cec7809a715c5c9a99a585db0b596bfb96a59"; - hash = "sha256-JMpLic41Jw6kDXXMtj6tEYUMu3QQ0Sg/M8EBxmAwapU="; + rev = "9f18be9c4e1a484c65b22dd53280815dc79a5a56"; + hash = "sha256-dp5lyZzKsjdqJLfwr0S4ILets8eu1kLfBB2y/LxspsU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/im/immer/package.nix b/pkgs/by-name/im/immer/package.nix index d2b5caf584ea..e6286f24d358 100644 --- a/pkgs/by-name/im/immer/package.nix +++ b/pkgs/by-name/im/immer/package.nix @@ -1,44 +1,62 @@ { lib, stdenv, - catch2, + catch2_3, fetchFromGitHub, cmake, + boehmgc, + boost, + fmt, nix-update-script, }: - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "immer"; - version = "0.8.1"; + + version = "0.9.1"; src = fetchFromGitHub { owner = "arximboldi"; repo = "immer"; - tag = "v${version}"; - hash = "sha256-Tyj2mNyLhrcFNQEn4xHC8Gz7/jtA4Dnkjtk8AAXJEw8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Qrr5mDbPF9cbLi9T2IVAKPN3CkTxffoivvqGNGLdkxE="; }; - nativeBuildInputs = [ - cmake - ]; + nativeBuildInputs = [ cmake ]; - buildInputs = [ - catch2 - ]; + cmakeFlags = [ (lib.cmakeBool "immer_BUILD_TESTS" finalAttrs.finalPackage.doCheck) ]; + + # immer is a header only library + dontBuild = true; + buildInputs = [ ]; + dontUseCmakeBuildDir = true; + + doCheck = false; strictDeps = true; - dontBuild = true; - dontUseCmakeBuildDir = true; - - passthru.updateScript = nix-update-script { }; + passthru = { + tests.test = finalAttrs.finalPackage.overrideAttrs (attrs: { + pname = "${attrs.pname}-test"; + doCheck = true; + checkInputs = [ + catch2_3 + boehmgc + boost + fmt + ]; + checkPhase = '' + make check + ''; + }); + updateScript = nix-update-script { }; + }; meta = { description = "Postmodern immutable and persistent data structures for C++ — value semantics at scale"; homepage = "https://sinusoid.es/immer"; - changelog = "https://github.com/arximboldi/immer/releases/tag/v${version}"; + changelog = "https://github.com/arximboldi/immer/releases/tag/v${finalAttrs.version}"; license = lib.licenses.boost; maintainers = with lib.maintainers; [ sifmelcara ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/in/ingen/package.nix b/pkgs/by-name/in/ingen/package.nix index 81bd40c8207a..f4668ea2f31d 100644 --- a/pkgs/by-name/in/ingen/package.nix +++ b/pkgs/by-name/in/ingen/package.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation { ]; postInstall = '' - wrapPythonProgramsIn "$out/bin" "$out $pythonPath" + wrapPythonProgramsIn "$out/bin" "$out ''${pythonPath[*]}" wrapProgram "$out/bin/ingen" --set INGEN_UI_PATH "$out/share/ingen/ingen_gui.ui" ''; diff --git a/pkgs/by-name/in/interactsh/package.nix b/pkgs/by-name/in/interactsh/package.nix index 101e2ddf9398..bea8db7101cd 100644 --- a/pkgs/by-name/in/interactsh/package.nix +++ b/pkgs/by-name/in/interactsh/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "interactsh"; - version = "1.2.4"; + version = "1.3.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "interactsh"; tag = "v${version}"; - hash = "sha256-28d+ghJ/A/dg6aeypqPF4EAhDp8k3yXLYylxnQR/J+M="; + hash = "sha256-hbhVa+tXXJxSOeQqSFWcKKFv3tjcXhnCjqxLzg7/d+Q="; }; - vendorHash = "sha256-1ZTvIGgFEXxW//d3bD4kYRYj5+n/NzJW2oSnbjyXLGA="; + vendorHash = "sha256-g7dGmkxqj2UWap7TfNxocb93C7K0R76sAKD+n2kxDGo="; modRoot = "."; subPackages = [ diff --git a/pkgs/by-name/io/iosevka-bin/package.nix b/pkgs/by-name/io/iosevka-bin/package.nix index b209f8275ce4..db722f309e65 100644 --- a/pkgs/by-name/io/iosevka-bin/package.nix +++ b/pkgs/by-name/io/iosevka-bin/package.nix @@ -17,7 +17,7 @@ let in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "34.0.0"; + version = "34.1.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip"; diff --git a/pkgs/by-name/io/iosevka-bin/variants.nix b/pkgs/by-name/io/iosevka-bin/variants.nix index 87ce658cd745..1bb2a41d4eda 100644 --- a/pkgs/by-name/io/iosevka-bin/variants.nix +++ b/pkgs/by-name/io/iosevka-bin/variants.nix @@ -1,93 +1,93 @@ # This file was autogenerated. DO NOT EDIT! { - Iosevka = "049xg34s93adwnrj2ilwzprx19v1x76cwn1nj4fl6rhq188lxy5l"; - IosevkaAile = "0nx0i65fvsh4nhal2wkc7q97vr9bndnmdzn3kh2fyfyly9g35gwp"; - IosevkaCurly = "0b51fp7brgy0jy8md5zaryd2fj6lb1bnz1yrs5pbp65sqga1myvx"; - IosevkaCurlySlab = "12xn0639bxpc2zf64ygxli9j98q4nwsnfz75mpma5qd8viq8vr3k"; - IosevkaEtoile = "04clc64sqsqsm5bj5g3rabz1i3hhhi2lqm3ch43z2l9zb8jbn1bz"; - IosevkaSlab = "103b9zl481p3dy3d59sy0wn788hk72vlmvym3dfcdphclj6m2q2a"; - IosevkaSS01 = "00zvzi9s34xdy6q7lgh3g5qnrsprjqc71p773x82qzigzmr2x9ac"; - IosevkaSS02 = "1wnqpkl0jyd9hyy0ghizjhnw4rn84xzlj6dng438k9hbvjv4m81l"; - IosevkaSS03 = "1z250kgfslddc2k1nx03kan8i9ddngwskff0bsyaqwyxsbgvpkpv"; - IosevkaSS04 = "07b7g4bz4nvqhmklpn55rarzk0zyg6bwla88amkg9v6y86rs36d5"; - IosevkaSS05 = "0x4himbsrjw3c9c00ayqrb5dsyv56dh652ddagmx8ayx1dly78zs"; - IosevkaSS06 = "0nh9nf40ac1jw1wc2bpmw1dv7v9klbrjikhjrgjh4pa8ix63y93n"; - IosevkaSS07 = "17g7synzlkhq9kv8j0j5zg29v735ysfkik2nwcxs6jr3mq8b6c91"; - IosevkaSS08 = "1han2rn8x196v716zs78nz3nm9mlpdanx4ji6fnavlli7mrqqrr4"; - IosevkaSS09 = "16nlyw2z20jxs6cmi57vaswmjxd2fipbdva21dl9aq42q3f01v4y"; - IosevkaSS10 = "134fyhyi8hqjp72p4v734g0cbpb4wc49x8qvnw2lyv1c3zs806xh"; - IosevkaSS11 = "02yc1mmsrigp41l9d8pcksc2fmxrv3byyvafidialrwy134sp10n"; - IosevkaSS12 = "08f9754fai7xvyfyjxa010m7p3qg4cmbj6nbz1ij2r27clz3drpw"; - IosevkaSS13 = "16dmz5mj6l98ni8py3cj6ic5hvh7nhnlkyi7y9990zclr6jm75yc"; - IosevkaSS14 = "138i59bspwmf1lbpvzvbi5l1qaiqyh0gl7xrlv03vrn25bc2rlki"; - IosevkaSS15 = "1kwk5lr3r1rc45l05drgw0zkv3nsyn7yjphyrb61w3hiw8jvdrf3"; - IosevkaSS16 = "1acmn8danv4gmspj6ghfxrqdlnwdibf8b62zbgslb3zg2q4cxs46"; - IosevkaSS17 = "16pm15m0hklb75wf6kf3wr7dw9wsalsxlwrcwba0bpbcn3qd80ay"; - IosevkaSS18 = "1jlfxh6av584ng1szzqk47g7k4ii745s06i69scp4adag7n50gls"; - SGr-Iosevka = "0ak5vq49cc1lvj6kwz70yg0g82pvp5xzhn1g945hr04q3bg6k7kz"; - SGr-IosevkaCurly = "1ryh7v1aqvqj658q537hlkaglhb5xfqkskyp4sa2mmvv3hm9b0ch"; - SGr-IosevkaCurlySlab = "047vksiiw3vz37yn5y7a0c07ii5q9v8apbsqcx82cqjlgdy3yrfp"; - SGr-IosevkaFixed = "0f9zvwcxn652fsjynhvm8wpdiz8iz5h2iclzvgrgw74mb95rcpw6"; - SGr-IosevkaFixedCurly = "0llbli2mcadyjsgma4fg7m9sp8m4rknm4pfx4j8jls216c4hvkmq"; - SGr-IosevkaFixedCurlySlab = "1q3mwp7d1s8nc26p5lb6swv5qrjv4arcm5pisxxkgx8pgw35xmkb"; - SGr-IosevkaFixedSlab = "1xxphzvhhxnj612nxhin0kchxjqf4i3mm4nnaw0rrnwnmfk9kxd0"; - SGr-IosevkaFixedSS01 = "17ncsp460qsbwnvmcmbij1xw9cid978kmnks55fqjm7awqpylqak"; - SGr-IosevkaFixedSS02 = "076ai8i8a8m5akrra0czn9d7b8lc6wb3mlyxnzpfjblzdmzv2ca6"; - SGr-IosevkaFixedSS03 = "00jznjxv9gvzcgim21h67iszlcm9hhk5aig5nbbn38jnwcdpdmiw"; - SGr-IosevkaFixedSS04 = "1lahi2nip6qnrxpd8r5jjimlczcabk5hxzcb84h2aw3466ka84c1"; - SGr-IosevkaFixedSS05 = "0lhml3fzzhfzhs9nyk05aa4q075r69bvrqw3n3p0889j9zhp032h"; - SGr-IosevkaFixedSS06 = "12b50b4r3ipgx2wli3qn4gcpy23bhvmgibbcbyi80l3khrd1n72a"; - SGr-IosevkaFixedSS07 = "166vcyj3svawm3lmsdbs9mn50f1shn347jvwapr0q29pjkqf6wmw"; - SGr-IosevkaFixedSS08 = "0iml98i1bjxkhx7jw5wsc3r47qv3lzxy45p6ysvrldqp9rn6cyl9"; - SGr-IosevkaFixedSS09 = "0wr1s4qrnmi8ywch05m5x2bx22c4z2qywjcx2hy9sganhcpywdi8"; - SGr-IosevkaFixedSS10 = "0if1rlrb1lgxxyvl56f4lw8bfxp3178a0qiw9vsqlxrr23l697nr"; - SGr-IosevkaFixedSS11 = "1w1lsb0kmdn777xc38h2d6riwjiyhq5fml2zj4zv2vakjd7fsvzk"; - SGr-IosevkaFixedSS12 = "01krwyq4cfxwhji304k4ihm5q8ankiwi6fajmyc1x3xxxnqx7x57"; - SGr-IosevkaFixedSS13 = "1g4va6k35z732xm6q8pmjmif9fbddlcj6i3znypnqy1c9aklbdkc"; - SGr-IosevkaFixedSS14 = "1p10v2gwxiwim49xws9pnr9l286pl7l7syxc5hpy4xwsalb74mjl"; - SGr-IosevkaFixedSS15 = "1mci65bn9b70y7rzbabdgr0rchrjq1qrk6cvj740w6rym66v96pc"; - SGr-IosevkaFixedSS16 = "1cpclj67qbggai3cqp575b2q2dn0m0zp9w8mjgnm317q5kfhxlyp"; - SGr-IosevkaFixedSS17 = "130a2y4jkcnrgm71nn03060dx5017vjpsw9jwz97wff0akffdbbx"; - SGr-IosevkaFixedSS18 = "1s8p1cm8shjzklkfkzj2v9xhl7y33ckwq231kcawmam9njy8dazs"; - SGr-IosevkaSlab = "1i9b0rqxnivfd5vw425r7jpmfck7rk96kzj8shzms8jlxp7s83hj"; - SGr-IosevkaSS01 = "1qvshwpcrbiap0fmbmc4fgl08jfwrx6japkb56ps0bp8hcl4fbq4"; - SGr-IosevkaSS02 = "09z8qmq8g6dp6z82l6ax12xyz0fmblz2kwmkck82m9fd5x1y15hk"; - SGr-IosevkaSS03 = "1x141y7dgd6h0mpl6vlqkgzbva0pw31fjzdhakk9gnlkg7mqrrq4"; - SGr-IosevkaSS04 = "1jgxziyjsvvjr058plqwqmk0v9p25s3djqmh3b304q8pzwh8n5nv"; - SGr-IosevkaSS05 = "0gkiq20zbiqhv0dn34giv3ynnvmdry1spgfanjjqpc464lp9vnf7"; - SGr-IosevkaSS06 = "1lafg32clw1hl3nb46ypd0w43nz0gfcyg359pyplahfqil4k0y07"; - SGr-IosevkaSS07 = "1cwkvmmb4w9if4iha2yrnl636c8nmsb43a0r1qmmi7hrljnwqv66"; - SGr-IosevkaSS08 = "10zai3iw7bm9c848amkxf1p5bcd9bwb5pyvhlrld8x97hx86ah38"; - SGr-IosevkaSS09 = "01nr0lgg0hbr9j7xk4f73xwjjh8rwq5cpgrrbm7ix3n9zvwcppzl"; - SGr-IosevkaSS10 = "1akp2nndwkx0jfayq79yz3lpyf6d5qi5f5j2njpz0blmf9bxk513"; - SGr-IosevkaSS11 = "0f1z8qix2nd8xqknlm0962v1aylwd8aavsm9g8qhixjcp0zycb56"; - SGr-IosevkaSS12 = "02jcyagl2w0ky94fnm5g55r09fjzi6ny9a9ndh31dw4y1df0rq56"; - SGr-IosevkaSS13 = "152xkjjpp687523v93z62whj767jdmrq1103k49jdz0jsx719qs8"; - SGr-IosevkaSS14 = "0bjmyrwizasvj12wxmh4s2xz8fvjyrfxqlrrmjfcx2m7xl5fnpw8"; - SGr-IosevkaSS15 = "0v1yn16gwmkpabj4282db3vq9ww85p1n68gvr1fhvq9np5p51dbs"; - SGr-IosevkaSS16 = "0j7czrj6na618hdvgzk0pgf3wd19rr0d5pxp0a2mm08n4ba54zdx"; - SGr-IosevkaSS17 = "0fwjlsl5fmadqgim0pk3qz97wwf4mdds5vvw8p0j6gx131m0ghbx"; - SGr-IosevkaSS18 = "1588l6d7gdhbg8b3halbllfbr2ysz0nrxs7cbdj2fakvf4vbkwcn"; - SGr-IosevkaTerm = "07m9zsjpr1q8lbswakllwy9fxwfwy8j346ymqfcj9s2qdm0wliz2"; - SGr-IosevkaTermCurly = "1wcdjbdrlkjhapqz5r5v24dj5319nxib4gmgwqyp13wvl4s7w12r"; - SGr-IosevkaTermCurlySlab = "1y5j4a0mhdr02d5rnpfpjc11nmblgwl1sfm0kgqy9ching5a6wmg"; - SGr-IosevkaTermSlab = "0ydpajym193aisgqd31ibqal7f5d6klxbz36ifyvp1bi5xs1k4m3"; - SGr-IosevkaTermSS01 = "0f38yascmkla7dfn9sswczab707whamnj4nh83svwhdcn12zv24s"; - SGr-IosevkaTermSS02 = "1jj02783rfd7pyxypya8kqcs37q5vh6w7cxhx7dzsgf97rk73gxl"; - SGr-IosevkaTermSS03 = "0g8ki2gn56jx93y2m5np6g3gmvbgd2a2znf1pbf7zxpapqsr6d1f"; - SGr-IosevkaTermSS04 = "1v8zc59sbkqjf32cpw078ym2i429bqjrsylj8rnw7g1lfjgjzwk9"; - SGr-IosevkaTermSS05 = "04rdk0vajpyrpqlgb7y5ayvkiy7h65m53dk1m3mxnr6m6kix3ql4"; - SGr-IosevkaTermSS06 = "1rsk13m3w51nqpzvqzl8q056407kc8bg8minb2i4rrr41jaxkjp8"; - SGr-IosevkaTermSS07 = "0zbf4vgigz5hjv357zh460zarnrbmjy7z751vdn2l2nx5lrf3rln"; - SGr-IosevkaTermSS08 = "1x216ky05xmk28ydncbbgspbdzbdv0mglsz4v257lgqm36rkqm1s"; - SGr-IosevkaTermSS09 = "084chb52qrlv9jg1pxhvy5h31jpifqnls2ljg5hqpjj0b7c281rg"; - SGr-IosevkaTermSS10 = "1gvzd4wca9jv60m9rwnca3s7fka0zc917wsncn24ykp4rfiq5gw5"; - SGr-IosevkaTermSS11 = "11hr5dg08bp7ffcvn3cxz4c0flphbipbx1hagfqrmxl7q7bws7z6"; - SGr-IosevkaTermSS12 = "1687hy6bvgc0i3s4xfvg2cxvxywx2pszg811cn6r5prirf7w084f"; - SGr-IosevkaTermSS13 = "1gf28sgaswl2p7m4nvasp2i41k43bz6p7x09p5pja37jwfydvcpw"; - SGr-IosevkaTermSS14 = "0krgh1wq0n5z1gag90f4jfkah6a0qlwfbyggfbl4m4j9ha3ij3ya"; - SGr-IosevkaTermSS15 = "0sxsb4svrkbj9y18jby1z5ykh91dpkqkkifmm9sslzkw6if6dl1x"; - SGr-IosevkaTermSS16 = "06gv6xyh1ji54sqx6km43gfhprqzz11cmpnayszqflhcfc6ggkgy"; - SGr-IosevkaTermSS17 = "1daqp42rdw2qkc0vdncg99l62iamn03iyawwdmjpnqx8mhy0yvda"; - SGr-IosevkaTermSS18 = "02nnd8fjc5h0a3qs3gi3g5ffrgkvrhwv5ww5xnmnjp1ps8am680f"; + Iosevka = "1ks27r2aq6039qm6ds846ff0naazpn2f73qr2acy0d58g92mh1yn"; + IosevkaAile = "04y1c94ndhl7ffav80fk2pllxi4w8lp9gh78a2g8fkfsp032b834"; + IosevkaCurly = "0f70jjfagcv2xv7ni6p9ja7sfzfm7vjmkbmb7mrw1pabbxv1qv70"; + IosevkaCurlySlab = "1bhns6wfhpklir350xyvbqli11gv6ngv1hnqindfskvbjdgvksya"; + IosevkaEtoile = "1rj08pv191p5zh6x4lzb5wri39759jwif3vk6lbpdavjmh7n6ifb"; + IosevkaSlab = "1nwpgvmhfsrz9sarmjm4bv3fjw8v9xdnhgsk1qmail1ikd0r558b"; + IosevkaSS01 = "0rr9dpyjdf0zl6dnsd3ywx5bgsmxrmmdcvklr02xypbh0r48yk41"; + IosevkaSS02 = "0fms0w7k41g511haqc7g6a4y2mv053rrvlyymrldxpczavfmb452"; + IosevkaSS03 = "1mrk1shgz4b8gh71bz44mq7fc2rqj2dlqwzil3zhfmipp35khr8p"; + IosevkaSS04 = "0bfqg20pgyxxw9yxn1fn633w5rx87rij0scz37rrwx2ax21b9714"; + IosevkaSS05 = "1i4s47gwbhpipbcybwh7dj8zqhj3dibcxkm68zz7cqj7d0a3pgz1"; + IosevkaSS06 = "0b100pni0hfp9cwijasvhwv387zd0ss9ii4hrll6wwxdvl85kygp"; + IosevkaSS07 = "1138pcqknbs9qd08930q5ymgspvqfqmbvkmzza148q55pypakmhj"; + IosevkaSS08 = "170sfv87mi6n7mp60dfpkkqg2dckc4537vg1pa7kjqsdlz68w8cj"; + IosevkaSS09 = "0ggw8pw6rp3bzai453k0cxldjm5aah04h770k76izh8qcmdfn9cx"; + IosevkaSS10 = "07gpishi3kdvrj4rhiyzbh8689lq4idfwn9qwz8v2177k5hrc3xj"; + IosevkaSS11 = "0vgnmr4qqhxxqxfcn1i6fb81129gbcyyfx6s2hhsd0412m82za1m"; + IosevkaSS12 = "1am7l8kbjgzcdrh3rs4lll8rsdbl6nkfigj05ijxj99vy709b3ay"; + IosevkaSS13 = "0c4mljjijw5jdlcazz88fwaax1mlmslpvqjx04j4fa6y01b5lbwi"; + IosevkaSS14 = "00hc45hk39fnr1q1nfycyybipv8p7svnpd0v5a8gs2yziwp4lgmy"; + IosevkaSS15 = "0xklpd7hzbwr0hin7j2rmql5brsp9pnczkwmkv02dkz8wpaplsnh"; + IosevkaSS16 = "149vn4df6hqhhg4azvbg6ydrddfa2s9w6jl53y4jzh16k1qg299j"; + IosevkaSS17 = "0rhfkl90balv9q4kvlj7kqnpsq65v695y2420lgm0795jpzjjjqj"; + IosevkaSS18 = "0jlri23v1skwczqh5jlfgn48h9ax2l3c43ylr5j85ilnj141v83l"; + SGr-Iosevka = "13wh9xpd9snskargz50g6r12p7c605c9d021cidmrd17gv7xc9gy"; + SGr-IosevkaCurly = "02v5n4llvsfn5bz5f5bzwjg9sjddyy9g2by5x6vys28lrj1kjdpx"; + SGr-IosevkaCurlySlab = "1kcahdm2qh65979kjwma64kpqy07rx0vsbbm4nfq97dp89sf1r1v"; + SGr-IosevkaFixed = "1aqmz56378nsmk714y9zz5zpzn1y7qxir25fswb1q9i1d2a6jrjp"; + SGr-IosevkaFixedCurly = "08hz11jrg9d3kymfsdvv0pg3l15pfm58ywwwrz7x2s293v7dinij"; + SGr-IosevkaFixedCurlySlab = "1z7qzlam1611yfaa1x63qii40kv6ammiiq45z8h9ip1y1g89psfk"; + SGr-IosevkaFixedSlab = "1dh26p28jpcsvfw4rp9r59dzizg2b85a7sx49lzx420nq329nps1"; + SGr-IosevkaFixedSS01 = "0vba40a2yfxf30q8zskjw4xbyjynm4ddydgydclkbw4xk3lpv81c"; + SGr-IosevkaFixedSS02 = "06flqwi0xj6fcrf1kba4wmrixx8jp0ki5bl40jlk4b73y77pjdzl"; + SGr-IosevkaFixedSS03 = "1na81p6944raqfncwlamb6qq8iq3asy6pf3djbqb27q620vs1h2g"; + SGr-IosevkaFixedSS04 = "14mrnnxadlmkj289n89c0wjhpq9vsqp69jf4iknr0aw0zbxdzygg"; + SGr-IosevkaFixedSS05 = "096dxrl43955x1jxxmqrgblwcp09rm0bibwvlfzrhd858836ykgb"; + SGr-IosevkaFixedSS06 = "0g7iws86053z6cz9ccawfakbf5kc5hnv4pvkgw82nvczhswzj9w4"; + SGr-IosevkaFixedSS07 = "0zrsndf0kgzyar2ciskgnnq69761fz577w5x05cn8fi1j3bk8jw0"; + SGr-IosevkaFixedSS08 = "0i0b168zs4ivmphb6iv2pk738paqn9kqpxyy8p1hbnpxmhh6567k"; + SGr-IosevkaFixedSS09 = "1lqj8hac38g4apfy6mdhhvvghvfsicyw0mnihb1dhxfjrfglbgwv"; + SGr-IosevkaFixedSS10 = "1csr7pl77qcx89669215s52lk1xjk886xdhrxla8a14770vyqhc6"; + SGr-IosevkaFixedSS11 = "1r6hizv0bfk97sm98yr7frkrni6j3rdfrzkx8dg4k4kdawzgwl52"; + SGr-IosevkaFixedSS12 = "1g9azwdq9bymj77fvf4qkf19f0bc65z94xj1a47cc2m90q6lh64m"; + SGr-IosevkaFixedSS13 = "1f550yn0f8yi0wpmakvqxn841b40y3d2g2mkb0y6msh6lbknsyzv"; + SGr-IosevkaFixedSS14 = "059blzwwhc0vq2k4icxxv446srp3yx001r2pwb4yx9wvxz3s41iv"; + SGr-IosevkaFixedSS15 = "1f7cbs0zl3bz0bhm41c7155kdiqhz6csmkj9m56imdb9i43bc8dy"; + SGr-IosevkaFixedSS16 = "14f3ddmdhb3b97dv6hlp1h69xmxbyhya10nm97nhxx978wfb03wi"; + SGr-IosevkaFixedSS17 = "04ksk0479a6argapgw7cz948g18ji2lz6bgs9y6wgs2j23bdd202"; + SGr-IosevkaFixedSS18 = "0rrrb9qmr8mcs2w9j8ydgbi9mzh5qixc9wvvq243wf21f2ryyiv7"; + SGr-IosevkaSlab = "0104yjl6a90cfs1c0c7sv3w2bzxidrl3zwifi1cl7a9knmzf6q8c"; + SGr-IosevkaSS01 = "0w00c66pxah6cnh8i6da2k6rlj5wl5bjj1w78pc874y7l04bi5sh"; + SGr-IosevkaSS02 = "02gr60dcvlz961f99xcs3p76g8bdwbavm4qmgyadr9hla97bag5h"; + SGr-IosevkaSS03 = "01gsp69k7i3188z0gcrfbyl5ik5nhrpqm8qc5iafgdflw1cq3nbj"; + SGr-IosevkaSS04 = "11yj0r0fpxxbqz9wka4sl2b2yjy6ckk1srg0xf0zjj92ch5snp0c"; + SGr-IosevkaSS05 = "071y7zs923ngmiaiwfh87pirg5c65029wmbpk7ld3flqfclhcq52"; + SGr-IosevkaSS06 = "1p3fcwpf67v2br0c6q7ippx5blvj9qybx0kk3q823832i1ncrpxl"; + SGr-IosevkaSS07 = "15f2i563ii226gi9ysprw2gk9w5p71i8a7yqnx80m4ifhvvgchlc"; + SGr-IosevkaSS08 = "0jx9igvs79qskcdrjcj7cbkkdyj63m19smhv8dc34p189yf1ik3i"; + SGr-IosevkaSS09 = "108b1qnpm838sp82car9gg2y407r0nwdh4abaqlrgyr8dzk5f58n"; + SGr-IosevkaSS10 = "10g4bzfdk199qaplr4w3np6nkgh4mf1v7d9qsbvc3nrj8ll2aq5n"; + SGr-IosevkaSS11 = "0gxz2w0p0f0363c58nqfhks43r8wqq6pjy0v09yfdmnhqj6z7j9x"; + SGr-IosevkaSS12 = "1z9qzsmdgw34vcpzi3nbh5yj8hmxw6sxjgw4ixyhz43c4swf4cbn"; + SGr-IosevkaSS13 = "06lbzy7m3kdqk0f0hssbxidyqhzzgl2n2mpsg4yyxbyvbgdbhj8f"; + SGr-IosevkaSS14 = "0s8afcg7bcsc8s7rakg8bb561q4mfnf0wz1f5jxs19k1050zs0yd"; + SGr-IosevkaSS15 = "1q257hagk63bazl0prml0a1d47qyaq1v11f3j5aksdqw8pyd11g2"; + SGr-IosevkaSS16 = "1kwyrf0q077rn7x2qs454xbyr569a133c0k9a0al8jwjbpg7hsxw"; + SGr-IosevkaSS17 = "1l1mm2yz6dxzw73myd6spcbzdp2sy7zkg6j7mg06vlbnydk5xnz8"; + SGr-IosevkaSS18 = "04ppzgbb00anc4x6x6s82aih82pqz8n0isqnm65y4k1hddrm4h3i"; + SGr-IosevkaTerm = "0v21aqnfrnpkfkfzh6il344nfb3icmd9r5kiamigscc4vwqz6pn3"; + SGr-IosevkaTermCurly = "1955wg65w556blq2hi6ghgbayb53xq9lq5ajmk13x5hkp5fwbwpw"; + SGr-IosevkaTermCurlySlab = "0zh61dgfv4plwha45cz5ly3xgb1zk2c9wr0zlfjj30b1nqfffv4l"; + SGr-IosevkaTermSlab = "0wgq8d8cim0c2kw2qcp7pp65kpbkxkn7z9qsg5qmyv420p5fbckf"; + SGr-IosevkaTermSS01 = "1mfvqqa98wgsxfb17z3bcrgzblj9kqsah0jpmnblhvn6hrfcssyh"; + SGr-IosevkaTermSS02 = "1dklck1121y0i32c1vp5qnw8qy7fynn1858wmjq2rj0lzxbxv16s"; + SGr-IosevkaTermSS03 = "10nrg9bfzn6b7m0fnmy05dj6ma738bmxfcsd4cc2dnwcwj7ijckh"; + SGr-IosevkaTermSS04 = "0laxpzz7aayv8k8awdqaamaic7cvhnvbcpdgs6qm184vbxgkh25m"; + SGr-IosevkaTermSS05 = "0cppv8pywxi64mfd6r55l3pqwkdnkgiv3jxws8bx1sddy62vgwgm"; + SGr-IosevkaTermSS06 = "02mklk15iims5pqamlnmahwmsm1svsdc8066xrf3hncgavd493xg"; + SGr-IosevkaTermSS07 = "0xph1nanliln6vbd4n1yiz7rm0z5xniszlp9mhahqdpz0fd2rbfr"; + SGr-IosevkaTermSS08 = "15arp1z8yzhfmmf2z4xm7lwdyblr6xv1gqqrzw524xk24654hnq8"; + SGr-IosevkaTermSS09 = "01psmw8vbw1vbxmm70dq5cqgyh6fhpz26v9aics3dw1fdlpzk723"; + SGr-IosevkaTermSS10 = "01d7qnx3247cbcfq35q9dj937jwjlmb6k0c68bayc8ipnh6g6nmz"; + SGr-IosevkaTermSS11 = "019hg1vkj1smy20gkv277a59nr6bahprc38cql2pf3543cijwgzq"; + SGr-IosevkaTermSS12 = "14dnnxar7iig9iw8q45hsrilmjx7ygi4b8hm1x3hh1jcri3bywnb"; + SGr-IosevkaTermSS13 = "03ijmmhhah6994bllnfhjw2kf6llhawbslwrk0p2z92l8xia4cwn"; + SGr-IosevkaTermSS14 = "0znfgrcyrif6kdhywzzrv7dsq7k473kkm84rmk43crp3459jh7h1"; + SGr-IosevkaTermSS15 = "0d417ccl9q4zffq3c178g99wqranzqgaf07sna98x645anhyqqyg"; + SGr-IosevkaTermSS16 = "0fz2zn4gz6vyi4jw7jb8h2k99ll61sxzpfnw1x2gcbxap9qa7bgh"; + SGr-IosevkaTermSS17 = "0v92f25nqqd6hy84hy1522qspcbcrw5whz8r0vzvhf6k9bz2wma9"; + SGr-IosevkaTermSS18 = "0pijgwmf6ri92fjz0yv7z72bc4fqs1xwva0r55iibbmmk4n0lwch"; } diff --git a/pkgs/by-name/io/iotop-c/package.nix b/pkgs/by-name/io/iotop-c/package.nix index c1aa0d81d3f1..6096dddb5d6e 100644 --- a/pkgs/by-name/io/iotop-c/package.nix +++ b/pkgs/by-name/io/iotop-c/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "iotop-c"; - version = "1.30"; + version = "1.31"; src = fetchFromGitHub { owner = "Tomas-M"; repo = "iotop"; rev = "v${version}"; - sha256 = "sha256-L0zChYDtlEi9tdHdNNWO0KugTorFIbYK0zDPNcLUMuo="; + sha256 = "sha256-zJI6zPkkd9GIpnAfRMVLR9Xqog0sgxTnO/NTN3hsjKU="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ju/jumpnbump/package.nix b/pkgs/by-name/ju/jumpnbump/package.nix index c025e519b78e..ff09b9cf43cb 100644 --- a/pkgs/by-name/ju/jumpnbump/package.nix +++ b/pkgs/by-name/ju/jumpnbump/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation { pillow ]; preFixup = '' - buildPythonPath "$out $pythonPath" + buildPythonPath "$out ''${pythonPath[*]}" ''; postFixup = '' wrapPythonPrograms diff --git a/pkgs/by-name/ka/karlender/package.nix b/pkgs/by-name/ka/karlender/package.nix index 09a183858dd2..072a5d8fa82b 100644 --- a/pkgs/by-name/ka/karlender/package.nix +++ b/pkgs/by-name/ka/karlender/package.nix @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { ]; checkFlags = [ - "--skip domain::time::tests::test_get_correct_offset_for_dst" # Need time + "--skip=domain::time::tests::test_get_correct_offset_for_dst" # Need time ]; preBuild = '' diff --git a/pkgs/by-name/kc/kcc/package.nix b/pkgs/by-name/kc/kcc/package.nix index 79268f40b27f..7ebc90b14db1 100644 --- a/pkgs/by-name/kc/kcc/package.nix +++ b/pkgs/by-name/kc/kcc/package.nix @@ -15,14 +15,14 @@ python3.pkgs.buildPythonApplication rec { pname = "kcc"; - version = "9.3.3"; + version = "9.4.3"; pyproject = true; src = fetchFromGitHub { owner = "ciromattia"; repo = "kcc"; tag = "v${version}"; - hash = "sha256-ftS5umfaj6EQV81CuR6xGDrijuBe6ZiFOvBrNtD1Nxk="; + hash = "sha256-TBQ7v63zti+KgaFCFgoIOMIhYaLnU3JH1YU52+idIQQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ki/kicad/package.nix b/pkgs/by-name/ki/kicad/package.nix index 80b1acb7b60e..11e14c5d7ed7 100644 --- a/pkgs/by-name/ki/kicad/package.nix +++ b/pkgs/by-name/ki/kicad/package.nix @@ -283,7 +283,7 @@ stdenv.mkDerivation rec { (concatStringsSep "\n" (flatten [ "runHook preInstall" - (optionalString withScripting "buildPythonPath \"${base} $pythonPath\" \n") + (optionalString withScripting ''buildPythonPath "${base} ''${pythonPath[*]}"'') # wrap each of the directly usable tools (map ( diff --git a/pkgs/by-name/ki/kickoff/package.nix b/pkgs/by-name/ki/kickoff/package.nix index ea10295d8691..ac2bfd7e72da 100644 --- a/pkgs/by-name/ki/kickoff/package.nix +++ b/pkgs/by-name/ki/kickoff/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "kickoff"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitHub { owner = "j0ru"; repo = "kickoff"; rev = "v${finalAttrs.version}"; - hash = "sha256-V4MkVjg5Q8eAJ80V/4SvEIwjVy35/HVewaR1caYLguw="; + hash = "sha256-hDonn6as5TGoYOOFVzhWxOUKzqEQ66aFWz0O3gtBGS4="; }; - cargoHash = "sha256-bkum6NOQL0LVsLvOmKljFHE86ZU3lLDR8+I3wL0Efmk="; + cargoHash = "sha256-DOkgKcLPZzZaC+2vWNZ4BoaR0HhoaaKYQS7IQUJtK44="; libPath = lib.makeLibraryPath [ wayland diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix index 4099e27c8c16..d5d1425396a8 100644 --- a/pkgs/by-name/ki/kitty/package.nix +++ b/pkgs/by-name/ki/kitty/package.nix @@ -43,7 +43,7 @@ buildGo124Module, nix-update-script, makeBinaryWrapper, - autoSignDarwinBinariesHook, + darwin, cairo, fetchpatch, }: @@ -117,7 +117,7 @@ buildPythonApplication rec { ++ lib.optionals stdenv.hostPlatform.isDarwin [ imagemagick libicns # For the png2icns tool. - autoSignDarwinBinariesHook + darwin.autoSignDarwinBinariesHook ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland-scanner diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index 77c6df960b9b..72e31aeac710 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -116,7 +116,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { ''; postFixup = '' - wrapPythonProgramsIn "$out/bin" "$pythonPath" + wrapPythonProgramsIn "$out/bin" "''${pythonPath[*]}" makeWrapper "$out/bin/koboldcpp.unwrapped" "$out/bin/koboldcpp" \ --prefix PATH : ${lib.makeBinPath [ tk ]} ${libraryPathWrapperArgs} ''; diff --git a/pkgs/by-name/la/lanraragi/lower-version-reqs.patch b/pkgs/by-name/la/lanraragi/lower-version-reqs.patch new file mode 100644 index 000000000000..ee590f206fdc --- /dev/null +++ b/pkgs/by-name/la/lanraragi/lower-version-reqs.patch @@ -0,0 +1,13 @@ +diff --git a/tools/cpanfile b/tools/cpanfile +index e70c6e7..1fb5860 100644 +--- a/tools/cpanfile ++++ b/tools/cpanfile +@@ -33,7 +33,7 @@ requires 'Test::Harness', 3.42; + requires 'Test::MockObject', 1.20200122; + requires 'Test::Trap', 0.3.4; + requires 'Test::Deep', 1.130; +-requires 'Test::MockModule', 0.180; ++requires 'Test::MockModule', 0.177; + + # Mojo stuff + requires 'Mojolicious', 9.39; diff --git a/pkgs/by-name/la/lanraragi/package.nix b/pkgs/by-name/la/lanraragi/package.nix index 6d98a0d42a96..407fef1f22d7 100644 --- a/pkgs/by-name/la/lanraragi/package.nix +++ b/pkgs/by-name/la/lanraragi/package.nix @@ -3,21 +3,23 @@ stdenv, buildNpmPackage, fetchFromGitHub, + replaceVars, makeBinaryWrapper, perl, ghostscript, + vips, nixosTests, }: buildNpmPackage rec { pname = "lanraragi"; - version = "0.9.50"; + version = "0.9.60"; src = fetchFromGitHub { owner = "Difegue"; repo = "LANraragi"; tag = "v.${version}"; - hash = "sha256-WwAY74sFPFJNfrTcGfXEZE8svuOxoCXR70SFyHb2Y40="; + hash = "sha256-ieYil/3n8iSWdfO6MQ1sW8q/TnQekpCx24n/BDfeLNg="; }; patches = [ @@ -28,16 +30,23 @@ buildNpmPackage rec { # Skip running `npm ci` and unnecessary build-time checks ./install.patch + # Lower the version requirement of Test::MockModule + ./lower-version-reqs.patch + # Don't assume that the cwd is $out/share/lanraragi # Put logs and temp files into the cwd by default, instead of into $out/share/lanraragi ./fix-paths.patch + (replaceVars ./vips-lib-path.patch { + vips_lib = "${lib.getLib vips}/lib"; + }) + # Expose the password hashing logic that can be used by the NixOS module # to set the admin password ./expose-password-hashing.patch ]; - npmDepsHash = "sha256-+vS/uoEmJJM3G9jwdwQTlhV0VkjAhhVd60x+PcYyWSw="; + npmDepsHash = "sha256-9SuimhLvEuruvFXuFm62DzgldngfiJneV6MDedGy6LY="; nativeBuildInputs = [ perl @@ -88,6 +97,7 @@ buildNpmPackage rec { CHI # CHI::Driver::FastMmap (part of CHI) CacheFastMmap + FFIPlatypus ] # deps listed in `tools/install.pm`: ++ [ @@ -116,6 +126,7 @@ buildNpmPackage rec { TestMockObject TestTrap TestDeep + TestMockModule ]; checkPhase = '' diff --git a/pkgs/by-name/la/lanraragi/vips-lib-path.patch b/pkgs/by-name/la/lanraragi/vips-lib-path.patch new file mode 100644 index 000000000000..44aafc789af3 --- /dev/null +++ b/pkgs/by-name/la/lanraragi/vips-lib-path.patch @@ -0,0 +1,13 @@ +diff --git a/lib/LANraragi/Utils/Vips.pm b/lib/LANraragi/Utils/Vips.pm +index fba395e..0579bdc 100644 +--- a/lib/LANraragi/Utils/Vips.pm ++++ b/lib/LANraragi/Utils/Vips.pm +@@ -20,7 +20,7 @@ my $glib_ffi = undef; + my $gobject_ffi = undef; + + if (IS_UNIX) { +- my @vips_libs = find_lib(lib => [ 'vips', 'vips-42' ]); ++ my @vips_libs = find_lib(lib => [ 'vips', 'vips-42' ], libpath => '@vips_lib@'); + my $lib_path; + + if (@vips_libs) { diff --git a/pkgs/by-name/la/last/package.nix b/pkgs/by-name/la/last/package.nix index a582d8fd6c1d..e3c044822221 100644 --- a/pkgs/by-name/la/last/package.nix +++ b/pkgs/by-name/la/last/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1648"; + version = "1651"; src = fetchFromGitLab { owner = "mcfrith"; repo = "last"; tag = version; - hash = "sha256-U1FGP6jzB36HLwTFKm/VMZWPPjo6mVuV/ePhGIkQgpg="; + hash = "sha256-TAc9prYydX5XO31f6p5DD7XMxVbNOW9ROtB7Agd7t8c="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/la/lavat/package.nix b/pkgs/by-name/la/lavat/package.nix index 9e202f92ae6a..6bcec57bb110 100644 --- a/pkgs/by-name/la/lavat/package.nix +++ b/pkgs/by-name/la/lavat/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: let - version = "2.2.0"; + version = "3.0.0"; in stdenv.mkDerivation { pname = "lavat"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { owner = "AngelJumbo"; repo = "lavat"; rev = "v${version}"; - hash = "sha256-SNRhel2RmaAPqoYpcq7F9e/FcbCJ0E3VJN/G9Ya4TeY="; + hash = "sha256-yroJQzcg8a0dSZu1I4jcqgrjwhtd5065+9rwtU5/vpc="; }; installPhase = '' diff --git a/pkgs/by-name/li/libation/deps.json b/pkgs/by-name/li/libation/deps.json index 8475769658d2..21ae112a1a8f 100644 --- a/pkgs/by-name/li/libation/deps.json +++ b/pkgs/by-name/li/libation/deps.json @@ -1,13 +1,13 @@ [ { "pname": "AAXClean", - "version": "2.1.0.1", - "hash": "sha256-dQJKHzET1QXKwxXqEb6X/B+vN6f8tF5jchxSGxUVeTs=" + "version": "2.1.1.1", + "hash": "sha256-SjM74bfcqb3L6Ux+crofEsOWoHB0O78afNrld9WEFY0=" }, { "pname": "AAXClean.Codecs", - "version": "2.1.3.1", - "hash": "sha256-GeIQgSPzAhpNfulGWA9tJmnFDN1CsSnerq9rKaK8poE=" + "version": "2.1.3.2", + "hash": "sha256-la4yuCQi75bCRr700CDD2huNEjk5ZKrTzwrtuUjyWAk=" }, { "pname": "AudibleApi", diff --git a/pkgs/by-name/li/libation/package.nix b/pkgs/by-name/li/libation/package.nix index 05082cc8beda..4a100780ccfc 100644 --- a/pkgs/by-name/li/libation/package.nix +++ b/pkgs/by-name/li/libation/package.nix @@ -15,13 +15,13 @@ buildDotnetModule rec { pname = "libation"; - version = "13.1.3"; + version = "13.1.4"; src = fetchFromGitHub { owner = "rmcrackan"; repo = "Libation"; tag = "v${version}"; - hash = "sha256-gK0UZ+3EZGVEiy+O47GhU4wsHmdPIbrHWyHnUOtWrm8="; + hash = "sha256-KKdyDBT+EAqOVRxt3SH05Kd+u3g3O40MNZbrwc3GeFQ="; }; sourceRoot = "${src.name}/Source"; diff --git a/pkgs/by-name/li/libks/package.nix b/pkgs/by-name/li/libks/package.nix index 35d17fcd4efb..e2e30187b84c 100644 --- a/pkgs/by-name/li/libks/package.nix +++ b/pkgs/by-name/li/libks/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libks"; - version = "2.0.8"; + version = "2.0.9"; src = fetchFromGitHub { owner = "signalwire"; repo = "libks"; tag = "v${version}"; - hash = "sha256-cBNNCOm+NcIvozN4Z4XnZWBBqq0LVELVqXubQB4JMTU="; + hash = "sha256-XnNyzH+VdBHligJ5+ct835Mekw2DbxMboC06Umm2Zak="; }; patches = [ @@ -63,6 +63,9 @@ stdenv.mkDerivation rec { # Something seems to go wrong with testwebsock2 when using parallelism enableParallelChecking = false; + # Some tests require this on Darwin + __darwinAllowLocalNetworking = true; + passthru = { tests.freeswitch = freeswitch; updateScript = nix-update-script { }; diff --git a/pkgs/by-name/li/lightdm-slick-greeter/package.nix b/pkgs/by-name/li/lightdm-slick-greeter/package.nix index ae76e71e78b5..b50a3188827e 100644 --- a/pkgs/by-name/li/lightdm-slick-greeter/package.nix +++ b/pkgs/by-name/li/lightdm-slick-greeter/package.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - buildPythonPath "$out $pythonPath" + buildPythonPath "$out ''${pythonPath[*]}" gappsWrapperArgs+=( --prefix PYTHONPATH : "$program_PYTHONPATH" --prefix XDG_DATA_DIRS : "${lib.makeSearchPath "share" [ xapp-symbolic-icons ]}" diff --git a/pkgs/by-name/li/lighthouse/package.nix b/pkgs/by-name/li/lighthouse/package.nix index b308db4f483c..fa09eb2b4509 100644 --- a/pkgs/by-name/li/lighthouse/package.nix +++ b/pkgs/by-name/li/lighthouse/package.nix @@ -67,10 +67,15 @@ rustPlatform.buildRustPackage rec { hash = "sha256-aeTeHRT3QtxBRSNMCITIWmx89vGtox2OzSff8vZ+RYY="; }; - LIGHTHOUSE_DEPOSIT_CONTRACT_SPEC_URL = "file://${depositContractSpec}"; - LIGHTHOUSE_DEPOSIT_CONTRACT_TESTNET_URL = "file://${testnetDepositContractSpec}"; + env = { + LIGHTHOUSE_DEPOSIT_CONTRACT_SPEC_URL = "file://${depositContractSpec}"; + LIGHTHOUSE_DEPOSIT_CONTRACT_TESTNET_URL = "file://${testnetDepositContractSpec}"; - OPENSSL_NO_VENDOR = true; + OPENSSL_NO_VENDOR = true; + + # This is needed by the unit tests. + FORK_NAME = "capella"; + }; cargoBuildFlags = [ "--package lighthouse" @@ -96,229 +101,229 @@ rustPlatform.buildRustPackage rec { # All of these tests require network access checkFlags = [ - "--skip tests::broadcast_should_send_to_all_bns" - "--skip tests::check_candidate_order" - "--skip tests::first_success_should_try_nodes_in_order" - "--skip tests::update_all_candidates_should_update_sync_status" - "--skip engine_api::http::test::forkchoice_updated_v1_request" - "--skip engine_api::http::test::forkchoice_updated_v1_with_payload_attributes_request" - "--skip engine_api::http::test::get_block_by_hash_request" - "--skip engine_api::http::test::get_block_by_number_request" - "--skip engine_api::http::test::get_payload_v1_request" - "--skip engine_api::http::test::geth_test_vectors" - "--skip engine_api::http::test::new_payload_v1_request" - "--skip test::finds_valid_terminal_block_hash" - "--skip test::produce_three_valid_pos_execution_blocks" - "--skip test::rejects_invalid_terminal_block_hash" - "--skip test::rejects_terminal_block_with_equal_timestamp" - "--skip test::rejects_unknown_terminal_block_hash" - "--skip test::test_forked_terminal_block" - "--skip test::verifies_valid_terminal_block_hash" - "--skip deposit_tree::cache_consistency" - "--skip deposit_tree::double_update" - "--skip deposit_tree::updating" - "--skip eth1_cache::big_skip" - "--skip eth1_cache::double_update" - "--skip eth1_cache::pruning" - "--skip eth1_cache::simple_scenario" - "--skip fast::deposit_cache_query" - "--skip http::incrementing_deposits" - "--skip persist::test_persist_caches" - "--skip can_read_finalized_block" - "--skip invalid_attestation_delayed_slot" - "--skip invalid_attestation_empty_bitfield" - "--skip invalid_attestation_future_block" - "--skip invalid_attestation_future_epoch" - "--skip invalid_attestation_inconsistent_ffg_vote" - "--skip invalid_attestation_past_epoch" - "--skip invalid_attestation_target_epoch" - "--skip invalid_attestation_unknown_beacon_block_root" - "--skip invalid_attestation_unknown_target_root" - "--skip invalid_block_finalized_descendant" - "--skip invalid_block_finalized_slot" - "--skip invalid_block_future_slot" - "--skip invalid_block_unknown_parent" - "--skip justified_and_finalized_blocks" - "--skip justified_balances" - "--skip justified_checkpoint_updates_with_descendent" - "--skip justified_checkpoint_updates_with_descendent_first_justification" - "--skip justified_checkpoint_updates_with_non_descendent" - "--skip progressive_balances_cache_attester_slashing" - "--skip progressive_balances_cache_proposer_slashing" - "--skip valid_attestation" - "--skip valid_attestation_skip_across_epoch" - "--skip weak_subjectivity_check_epoch_boundary_is_skip_slot" - "--skip weak_subjectivity_check_epoch_boundary_is_skip_slot_failure" - "--skip weak_subjectivity_check_fails_early_epoch" - "--skip weak_subjectivity_check_fails_incorrect_root" - "--skip weak_subjectivity_check_fails_late_epoch" - "--skip weak_subjectivity_check_passes" - "--skip weak_subjectivity_pass_on_startup" - "--skip basic" - "--skip returns_200_ok" - "--skip release_tests::attestation_aggregation_insert_get_prune" - "--skip release_tests::attestation_duplicate" - "--skip release_tests::attestation_get_max" - "--skip release_tests::attestation_pairwise_overlapping" - "--skip release_tests::attestation_rewards" - "--skip release_tests::cross_fork_attester_slashings" - "--skip release_tests::cross_fork_exits" - "--skip release_tests::cross_fork_proposer_slashings" - "--skip release_tests::duplicate_proposer_slashing" - "--skip release_tests::max_coverage_attester_proposer_slashings" - "--skip release_tests::max_coverage_different_indices_set" - "--skip release_tests::max_coverage_effective_balances" - "--skip release_tests::overlapping_max_cover_attester_slashing" - "--skip release_tests::prune_attester_slashing_noop" - "--skip release_tests::prune_proposer_slashing_noop" - "--skip release_tests::simple_max_cover_attester_slashing" - "--skip release_tests::sync_contribution_aggregation_insert_get_prune" - "--skip release_tests::sync_contribution_duplicate" - "--skip release_tests::sync_contribution_with_fewer_bits" - "--skip release_tests::sync_contribution_with_more_bits" - "--skip release_tests::test_earliest_attestation" - "--skip per_block_processing::tests::block_replayer_peeking_state_roots" - "--skip per_block_processing::tests::fork_spanning_exit" - "--skip per_block_processing::tests::invalid_attester_slashing_1_invalid" - "--skip per_block_processing::tests::invalid_attester_slashing_2_invalid" - "--skip per_block_processing::tests::invalid_attester_slashing_not_slashable" - "--skip per_block_processing::tests::invalid_bad_proposal_1_signature" - "--skip per_block_processing::tests::invalid_bad_proposal_2_signature" - "--skip per_block_processing::tests::invalid_block_header_state_slot" - "--skip per_block_processing::tests::invalid_block_signature" - "--skip per_block_processing::tests::invalid_deposit_bad_merkle_proof" - "--skip per_block_processing::tests::invalid_deposit_count_too_small" - "--skip per_block_processing::tests::invalid_deposit_deposit_count_too_big" - "--skip per_block_processing::tests::invalid_deposit_invalid_pub_key" - "--skip per_block_processing::tests::invalid_deposit_wrong_sig" - "--skip per_block_processing::tests::invalid_parent_block_root" - "--skip per_block_processing::tests::invalid_proposer_slashing_duplicate_slashing" - "--skip per_block_processing::tests::invalid_proposer_slashing_proposal_epoch_mismatch" - "--skip per_block_processing::tests::invalid_proposer_slashing_proposals_identical" - "--skip per_block_processing::tests::invalid_proposer_slashing_proposer_unknown" - "--skip per_block_processing::tests::invalid_randao_reveal_signature" - "--skip per_block_processing::tests::valid_4_deposits" - "--skip per_block_processing::tests::valid_block_ok" - "--skip per_block_processing::tests::valid_insert_attester_slashing" - "--skip per_block_processing::tests::valid_insert_proposer_slashing" - "--skip per_epoch_processing::tests::release_tests::altair_state_on_base_fork" - "--skip per_epoch_processing::tests::release_tests::base_state_on_altair_fork" - "--skip per_epoch_processing::tests::runs_without_error" - "--skip exit::custom_tests::valid" - "--skip exit::custom_tests::valid_three" - "--skip exit::tests::invalid_bad_signature" - "--skip exit::tests::invalid_duplicate" - "--skip exit::tests::invalid_exit_already_initiated" - "--skip exit::tests::invalid_future_exit_epoch" - "--skip exit::tests::invalid_not_active_after_exit_epoch" - "--skip exit::tests::invalid_not_active_before_activation_epoch" - "--skip exit::tests::invalid_too_young_by_a_lot" - "--skip exit::tests::invalid_too_young_by_one_epoch" - "--skip exit::tests::invalid_validator_unknown" - "--skip exit::tests::valid_genesis_epoch" - "--skip exit::tests::valid_previous_epoch" - "--skip exit::tests::valid_single_exit" - "--skip exit::tests::valid_three_exits" - "--skip iter::test::block_root_iter" - "--skip iter::test::state_root_iter" - "--skip beacon_state::committee_cache::tests::initializes_with_the_right_epoch" - "--skip beacon_state::committee_cache::tests::min_randao_epoch_correct" - "--skip beacon_state::committee_cache::tests::shuffles_for_the_right_epoch" - "--skip beacon_state::tests::beacon_proposer_index" - "--skip beacon_state::tests::cache_initialization" - "--skip beacon_state::tests::committees::current_epoch_committee_consistency" - "--skip beacon_state::tests::committees::next_epoch_committee_consistency" - "--skip beacon_state::tests::committees::previous_epoch_committee_consistency" - "--skip tests::hd_validator_creation" - "--skip tests::invalid_pubkey" - "--skip tests::keystore_validator_creation" - "--skip tests::keystores::check_get_set_fee_recipient" - "--skip tests::keystores::check_get_set_gas_limit" - "--skip tests::keystores::delete_concurrent_with_signing" - "--skip tests::keystores::delete_keystores_twice" - "--skip tests::keystores::delete_nonexistent_keystores" - "--skip tests::keystores::delete_nonexistent_remotekey" - "--skip tests::keystores::delete_remotekey_then_reimport_different_url" - "--skip tests::keystores::delete_remotekeys_twice" - "--skip tests::keystores::delete_then_reimport" - "--skip tests::keystores::delete_then_reimport_remotekeys" - "--skip tests::keystores::get_auth_no_token" - "--skip tests::keystores::get_empty_keystores" - "--skip tests::keystores::get_empty_remotekeys" - "--skip tests::keystores::get_web3_signer_keystores" - "--skip tests::keystores::import_and_delete_conflicting_web3_signer_keystores" - "--skip tests::keystores::import_invalid_slashing_protection" - "--skip tests::keystores::import_keystores_wrong_password" - "--skip tests::keystores::import_new_keystores" - "--skip tests::keystores::import_new_remotekeys" - "--skip tests::keystores::import_only_duplicate_keystores" - "--skip tests::keystores::import_only_duplicate_remotekeys" - "--skip tests::keystores::import_remote_and_local_keys" - "--skip tests::keystores::import_remotekey_web3signer" - "--skip tests::keystores::import_remotekey_web3signer_disabled" - "--skip tests::keystores::import_remotekey_web3signer_enabled" - "--skip tests::keystores::import_same_local_and_remote_keys" - "--skip tests::keystores::import_same_remote_and_local_keys" - "--skip tests::keystores::import_same_remotekey_different_url" - "--skip tests::keystores::import_some_duplicate_keystores" - "--skip tests::keystores::import_some_duplicate_remotekeys" - "--skip tests::keystores::import_wrong_number_of_passwords" - "--skip tests::keystores::migrate_all_with_slashing_protection" - "--skip tests::keystores::migrate_some_extra_slashing_protection" - "--skip tests::keystores::migrate_some_missing_slashing_protection" - "--skip tests::keystores::migrate_some_with_slashing_protection" - "--skip tests::prefer_builder_proposals_validator" - "--skip tests::routes_with_invalid_auth" - "--skip tests::simple_getters" - "--skip tests::validator_builder_boost_factor" - "--skip tests::validator_builder_boost_factor_global_builder_proposals_false" - "--skip tests::validator_builder_boost_factor_global_builder_proposals_true" - "--skip tests::validator_builder_boost_factor_global_prefer_builder_proposals_true" - "--skip tests::validator_builder_boost_factor_global_prefer_builder_proposals_true_override" - "--skip tests::validator_builder_proposals" - "--skip tests::validator_derived_builder_boost_factor_with_process_defaults" - "--skip tests::validator_enabling" - "--skip tests::validator_exit" - "--skip tests::validator_gas_limit" - "--skip tests::validator_graffiti" - "--skip tests::validator_graffiti_api" - "--skip tests::web3signer_validator_creation" - "--skip create_validators::tests::bogus_bn_url" - "--skip delete_validators::test::delete_multiple_validators" - "--skip import_validators::tests::create_one_validator" - "--skip import_validators::tests::create_one_validator_keystore_format" - "--skip import_validators::tests::create_one_validator_with_offset" - "--skip import_validators::tests::create_one_validator_with_offset_keystore_format" - "--skip import_validators::tests::create_three_validators" - "--skip import_validators::tests::create_three_validators_with_offset" - "--skip import_validators::tests::import_duplicates_when_allowed" - "--skip import_validators::tests::import_duplicates_when_allowed_keystore_format" - "--skip import_validators::tests::import_duplicates_when_disallowed" - "--skip import_validators::tests::import_duplicates_when_disallowed_keystore_format" - "--skip list_validators::test::list_all_validators" - "--skip move_validators::test::no_validators" - "--skip move_validators::test::one_validator_move_all" - "--skip move_validators::test::one_validator_move_all_with_password_files" - "--skip move_validators::test::one_validator_move_one" - "--skip move_validators::test::one_validator_to_non_empty_dest" - "--skip move_validators::test::one_validators_move_two_by_count" - "--skip move_validators::test::three_validators_move_all" - "--skip move_validators::test::three_validators_move_one" - "--skip move_validators::test::three_validators_move_one_by_count" - "--skip move_validators::test::three_validators_move_three" - "--skip move_validators::test::three_validators_move_two" - "--skip move_validators::test::three_validators_move_two_by_count" - "--skip move_validators::test::two_validator_move_all_and_back_again" - "--skip move_validators::test::two_validator_move_all_passwords_removed" - "--skip move_validators::test::two_validator_move_all_passwords_removed_failed_password_attempt" - "--skip move_validators::test::two_validators_move_all_where_one_is_a_duplicate" - "--skip move_validators::test::two_validators_move_one_where_one_is_a_duplicate" - "--skip move_validators::test::two_validators_move_one_with_identical_password_files" + "--skip=tests::broadcast_should_send_to_all_bns" + "--skip=tests::check_candidate_order" + "--skip=tests::first_success_should_try_nodes_in_order" + "--skip=tests::update_all_candidates_should_update_sync_status" + "--skip=engine_api::http::test::forkchoice_updated_v1_request" + "--skip=engine_api::http::test::forkchoice_updated_v1_with_payload_attributes_request" + "--skip=engine_api::http::test::get_block_by_hash_request" + "--skip=engine_api::http::test::get_block_by_number_request" + "--skip=engine_api::http::test::get_payload_v1_request" + "--skip=engine_api::http::test::geth_test_vectors" + "--skip=engine_api::http::test::new_payload_v1_request" + "--skip=test::finds_valid_terminal_block_hash" + "--skip=test::produce_three_valid_pos_execution_blocks" + "--skip=test::rejects_invalid_terminal_block_hash" + "--skip=test::rejects_terminal_block_with_equal_timestamp" + "--skip=test::rejects_unknown_terminal_block_hash" + "--skip=test::test_forked_terminal_block" + "--skip=test::verifies_valid_terminal_block_hash" + "--skip=deposit_tree::cache_consistency" + "--skip=deposit_tree::double_update" + "--skip=deposit_tree::updating" + "--skip=eth1_cache::big_skip" + "--skip=eth1_cache::double_update" + "--skip=eth1_cache::pruning" + "--skip=eth1_cache::simple_scenario" + "--skip=fast::deposit_cache_query" + "--skip=http::incrementing_deposits" + "--skip=persist::test_persist_caches" + "--skip=can_read_finalized_block" + "--skip=invalid_attestation_delayed_slot" + "--skip=invalid_attestation_empty_bitfield" + "--skip=invalid_attestation_future_block" + "--skip=invalid_attestation_future_epoch" + "--skip=invalid_attestation_inconsistent_ffg_vote" + "--skip=invalid_attestation_past_epoch" + "--skip=invalid_attestation_target_epoch" + "--skip=invalid_attestation_unknown_beacon_block_root" + "--skip=invalid_attestation_unknown_target_root" + "--skip=invalid_block_finalized_descendant" + "--skip=invalid_block_finalized_slot" + "--skip=invalid_block_future_slot" + "--skip=invalid_block_unknown_parent" + "--skip=justified_and_finalized_blocks" + "--skip=justified_balances" + "--skip=justified_checkpoint_updates_with_descendent" + "--skip=justified_checkpoint_updates_with_descendent_first_justification" + "--skip=justified_checkpoint_updates_with_non_descendent" + "--skip=progressive_balances_cache_attester_slashing" + "--skip=progressive_balances_cache_proposer_slashing" + "--skip=valid_attestation" + "--skip=valid_attestation_skip_across_epoch" + "--skip=weak_subjectivity_check_epoch_boundary_is_skip_slot" + "--skip=weak_subjectivity_check_epoch_boundary_is_skip_slot_failure" + "--skip=weak_subjectivity_check_fails_early_epoch" + "--skip=weak_subjectivity_check_fails_incorrect_root" + "--skip=weak_subjectivity_check_fails_late_epoch" + "--skip=weak_subjectivity_check_passes" + "--skip=weak_subjectivity_pass_on_startup" + "--skip=basic" + "--skip=returns_200_ok" + "--skip=release_tests::attestation_aggregation_insert_get_prune" + "--skip=release_tests::attestation_duplicate" + "--skip=release_tests::attestation_get_max" + "--skip=release_tests::attestation_pairwise_overlapping" + "--skip=release_tests::attestation_rewards" + "--skip=release_tests::cross_fork_attester_slashings" + "--skip=release_tests::cross_fork_exits" + "--skip=release_tests::cross_fork_proposer_slashings" + "--skip=release_tests::duplicate_proposer_slashing" + "--skip=release_tests::max_coverage_attester_proposer_slashings" + "--skip=release_tests::max_coverage_different_indices_set" + "--skip=release_tests::max_coverage_effective_balances" + "--skip=release_tests::overlapping_max_cover_attester_slashing" + "--skip=release_tests::prune_attester_slashing_noop" + "--skip=release_tests::prune_proposer_slashing_noop" + "--skip=release_tests::simple_max_cover_attester_slashing" + "--skip=release_tests::sync_contribution_aggregation_insert_get_prune" + "--skip=release_tests::sync_contribution_duplicate" + "--skip=release_tests::sync_contribution_with_fewer_bits" + "--skip=release_tests::sync_contribution_with_more_bits" + "--skip=release_tests::test_earliest_attestation" + "--skip=per_block_processing::tests::block_replayer_peeking_state_roots" + "--skip=per_block_processing::tests::fork_spanning_exit" + "--skip=per_block_processing::tests::invalid_attester_slashing_1_invalid" + "--skip=per_block_processing::tests::invalid_attester_slashing_2_invalid" + "--skip=per_block_processing::tests::invalid_attester_slashing_not_slashable" + "--skip=per_block_processing::tests::invalid_bad_proposal_1_signature" + "--skip=per_block_processing::tests::invalid_bad_proposal_2_signature" + "--skip=per_block_processing::tests::invalid_block_header_state_slot" + "--skip=per_block_processing::tests::invalid_block_signature" + "--skip=per_block_processing::tests::invalid_deposit_bad_merkle_proof" + "--skip=per_block_processing::tests::invalid_deposit_count_too_small" + "--skip=per_block_processing::tests::invalid_deposit_deposit_count_too_big" + "--skip=per_block_processing::tests::invalid_deposit_invalid_pub_key" + "--skip=per_block_processing::tests::invalid_deposit_wrong_sig" + "--skip=per_block_processing::tests::invalid_parent_block_root" + "--skip=per_block_processing::tests::invalid_proposer_slashing_duplicate_slashing" + "--skip=per_block_processing::tests::invalid_proposer_slashing_proposal_epoch_mismatch" + "--skip=per_block_processing::tests::invalid_proposer_slashing_proposals_identical" + "--skip=per_block_processing::tests::invalid_proposer_slashing_proposer_unknown" + "--skip=per_block_processing::tests::invalid_randao_reveal_signature" + "--skip=per_block_processing::tests::valid_4_deposits" + "--skip=per_block_processing::tests::valid_block_ok" + "--skip=per_block_processing::tests::valid_insert_attester_slashing" + "--skip=per_block_processing::tests::valid_insert_proposer_slashing" + "--skip=per_epoch_processing::tests::release_tests::altair_state_on_base_fork" + "--skip=per_epoch_processing::tests::release_tests::base_state_on_altair_fork" + "--skip=per_epoch_processing::tests::runs_without_error" + "--skip=exit::custom_tests::valid" + "--skip=exit::custom_tests::valid_three" + "--skip=exit::tests::invalid_bad_signature" + "--skip=exit::tests::invalid_duplicate" + "--skip=exit::tests::invalid_exit_already_initiated" + "--skip=exit::tests::invalid_future_exit_epoch" + "--skip=exit::tests::invalid_not_active_after_exit_epoch" + "--skip=exit::tests::invalid_not_active_before_activation_epoch" + "--skip=exit::tests::invalid_too_young_by_a_lot" + "--skip=exit::tests::invalid_too_young_by_one_epoch" + "--skip=exit::tests::invalid_validator_unknown" + "--skip=exit::tests::valid_genesis_epoch" + "--skip=exit::tests::valid_previous_epoch" + "--skip=exit::tests::valid_single_exit" + "--skip=exit::tests::valid_three_exits" + "--skip=iter::test::block_root_iter" + "--skip=iter::test::state_root_iter" + "--skip=beacon_state::committee_cache::tests::initializes_with_the_right_epoch" + "--skip=beacon_state::committee_cache::tests::min_randao_epoch_correct" + "--skip=beacon_state::committee_cache::tests::shuffles_for_the_right_epoch" + "--skip=beacon_state::tests::beacon_proposer_index" + "--skip=beacon_state::tests::cache_initialization" + "--skip=beacon_state::tests::committees::current_epoch_committee_consistency" + "--skip=beacon_state::tests::committees::next_epoch_committee_consistency" + "--skip=beacon_state::tests::committees::previous_epoch_committee_consistency" + "--skip=tests::hd_validator_creation" + "--skip=tests::invalid_pubkey" + "--skip=tests::keystore_validator_creation" + "--skip=tests::keystores::check_get_set_fee_recipient" + "--skip=tests::keystores::check_get_set_gas_limit" + "--skip=tests::keystores::delete_concurrent_with_signing" + "--skip=tests::keystores::delete_keystores_twice" + "--skip=tests::keystores::delete_nonexistent_keystores" + "--skip=tests::keystores::delete_nonexistent_remotekey" + "--skip=tests::keystores::delete_remotekey_then_reimport_different_url" + "--skip=tests::keystores::delete_remotekeys_twice" + "--skip=tests::keystores::delete_then_reimport" + "--skip=tests::keystores::delete_then_reimport_remotekeys" + "--skip=tests::keystores::get_auth_no_token" + "--skip=tests::keystores::get_empty_keystores" + "--skip=tests::keystores::get_empty_remotekeys" + "--skip=tests::keystores::get_web3_signer_keystores" + "--skip=tests::keystores::import_and_delete_conflicting_web3_signer_keystores" + "--skip=tests::keystores::import_invalid_slashing_protection" + "--skip=tests::keystores::import_keystores_wrong_password" + "--skip=tests::keystores::import_new_keystores" + "--skip=tests::keystores::import_new_remotekeys" + "--skip=tests::keystores::import_only_duplicate_keystores" + "--skip=tests::keystores::import_only_duplicate_remotekeys" + "--skip=tests::keystores::import_remote_and_local_keys" + "--skip=tests::keystores::import_remotekey_web3signer" + "--skip=tests::keystores::import_remotekey_web3signer_disabled" + "--skip=tests::keystores::import_remotekey_web3signer_enabled" + "--skip=tests::keystores::import_same_local_and_remote_keys" + "--skip=tests::keystores::import_same_remote_and_local_keys" + "--skip=tests::keystores::import_same_remotekey_different_url" + "--skip=tests::keystores::import_some_duplicate_keystores" + "--skip=tests::keystores::import_some_duplicate_remotekeys" + "--skip=tests::keystores::import_wrong_number_of_passwords" + "--skip=tests::keystores::migrate_all_with_slashing_protection" + "--skip=tests::keystores::migrate_some_extra_slashing_protection" + "--skip=tests::keystores::migrate_some_missing_slashing_protection" + "--skip=tests::keystores::migrate_some_with_slashing_protection" + "--skip=tests::prefer_builder_proposals_validator" + "--skip=tests::routes_with_invalid_auth" + "--skip=tests::simple_getters" + "--skip=tests::validator_builder_boost_factor" + "--skip=tests::validator_builder_boost_factor_global_builder_proposals_false" + "--skip=tests::validator_builder_boost_factor_global_builder_proposals_true" + "--skip=tests::validator_builder_boost_factor_global_prefer_builder_proposals_true" + "--skip=tests::validator_builder_boost_factor_global_prefer_builder_proposals_true_override" + "--skip=tests::validator_builder_proposals" + "--skip=tests::validator_derived_builder_boost_factor_with_process_defaults" + "--skip=tests::validator_enabling" + "--skip=tests::validator_exit" + "--skip=tests::validator_gas_limit" + "--skip=tests::validator_graffiti" + "--skip=tests::validator_graffiti_api" + "--skip=tests::web3signer_validator_creation" + "--skip=create_validators::tests::bogus_bn_url" + "--skip=delete_validators::test::delete_multiple_validators" + "--skip=import_validators::tests::create_one_validator" + "--skip=import_validators::tests::create_one_validator_keystore_format" + "--skip=import_validators::tests::create_one_validator_with_offset" + "--skip=import_validators::tests::create_one_validator_with_offset_keystore_format" + "--skip=import_validators::tests::create_three_validators" + "--skip=import_validators::tests::create_three_validators_with_offset" + "--skip=import_validators::tests::import_duplicates_when_allowed" + "--skip=import_validators::tests::import_duplicates_when_allowed_keystore_format" + "--skip=import_validators::tests::import_duplicates_when_disallowed" + "--skip=import_validators::tests::import_duplicates_when_disallowed_keystore_format" + "--skip=list_validators::test::list_all_validators" + "--skip=move_validators::test::no_validators" + "--skip=move_validators::test::one_validator_move_all" + "--skip=move_validators::test::one_validator_move_all_with_password_files" + "--skip=move_validators::test::one_validator_move_one" + "--skip=move_validators::test::one_validator_to_non_empty_dest" + "--skip=move_validators::test::one_validators_move_two_by_count" + "--skip=move_validators::test::three_validators_move_all" + "--skip=move_validators::test::three_validators_move_one" + "--skip=move_validators::test::three_validators_move_one_by_count" + "--skip=move_validators::test::three_validators_move_three" + "--skip=move_validators::test::three_validators_move_two" + "--skip=move_validators::test::three_validators_move_two_by_count" + "--skip=move_validators::test::two_validator_move_all_and_back_again" + "--skip=move_validators::test::two_validator_move_all_passwords_removed" + "--skip=move_validators::test::two_validator_move_all_passwords_removed_failed_password_attempt" + "--skip=move_validators::test::two_validators_move_all_where_one_is_a_duplicate" + "--skip=move_validators::test::two_validators_move_one_where_one_is_a_duplicate" + "--skip=move_validators::test::two_validators_move_one_with_identical_password_files" ] ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) [ - "--skip subnet_service::tests::attestation_service::test_subscribe_same_subnet_several_slots_apart" - "--skip subnet_service::tests::sync_committee_service::same_subscription_with_lower_until_epoch" - "--skip subnet_service::tests::sync_committee_service::subscribe_and_unsubscribe" + "--skip=subnet_service::tests::attestation_service::test_subscribe_same_subnet_several_slots_apart" + "--skip=subnet_service::tests::sync_committee_service::same_subscription_with_lower_until_epoch" + "--skip=subnet_service::tests::sync_committee_service::subscribe_and_unsubscribe" ]; passthru = { @@ -332,9 +337,6 @@ rustPlatform.buildRustPackage rec { enableParallelBuilding = true; - # This is needed by the unit tests. - FORK_NAME = "capella"; - meta = { description = "Ethereum consensus client in Rust"; homepage = "https://lighthouse.sigmaprime.io/"; diff --git a/pkgs/by-name/li/linyaps/package.nix b/pkgs/by-name/li/linyaps/package.nix index df7d2c833006..b21f0f3a125c 100644 --- a/pkgs/by-name/li/linyaps/package.nix +++ b/pkgs/by-name/li/linyaps/package.nix @@ -38,13 +38,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "linyaps"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "OpenAtom-Linyaps"; repo = finalAttrs.pname; tag = finalAttrs.version; - hash = "sha256-qPHDAwEQVnHLWGioEfgz11ZWhlEBJynap3a0hgfL050="; + hash = "sha256-iGdZc+i1l/+raI7Pjpj3LOtxvSJ37fUth3VsKaV54u0="; }; patches = [ diff --git a/pkgs/by-name/ma/martin/package.nix b/pkgs/by-name/ma/martin/package.nix index 5a6e76ae2ce0..dd2596a01ffe 100644 --- a/pkgs/by-name/ma/martin/package.nix +++ b/pkgs/by-name/ma/martin/package.nix @@ -24,33 +24,33 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ]; checkFlags = [ - "--skip function_source_schemas" - "--skip function_source_tile" - "--skip function_source_tilejson" - "--skip pg_get_function_tiles" - "--skip pg_get_function_source_ok_rewrite" - "--skip pg_get_function_source_ok" - "--skip pg_get_composite_source_tile_minmax_zoom_ok" - "--skip pg_get_function_source_query_params_ok" - "--skip pg_get_composite_source_tile_ok" - "--skip pg_get_catalog" - "--skip pg_get_composite_source_ok" - "--skip pg_get_health_returns_ok" - "--skip pg_get_table_source_ok" - "--skip pg_get_table_source_rewrite" - "--skip pg_null_functions" - "--skip utils::test_utils::tests::test_bad_os_str" - "--skip utils::test_utils::tests::test_get_env_str" - "--skip pg_get_table_source_multiple_geom_tile_ok" - "--skip pg_get_table_source_tile_minmax_zoom_ok" - "--skip pg_tables_feature_id" - "--skip pg_get_table_source_tile_ok" - "--skip table_source_schemas" - "--skip tables_srid_ok" - "--skip tables_tile_ok" - "--skip table_source" - "--skip tables_tilejson" - "--skip tables_multiple_geom_ok" + "--skip=function_source_schemas" + "--skip=function_source_tile" + "--skip=function_source_tilejson" + "--skip=pg_get_function_tiles" + "--skip=pg_get_function_source_ok_rewrite" + "--skip=pg_get_function_source_ok" + "--skip=pg_get_composite_source_tile_minmax_zoom_ok" + "--skip=pg_get_function_source_query_params_ok" + "--skip=pg_get_composite_source_tile_ok" + "--skip=pg_get_catalog" + "--skip=pg_get_composite_source_ok" + "--skip=pg_get_health_returns_ok" + "--skip=pg_get_table_source_ok" + "--skip=pg_get_table_source_rewrite" + "--skip=pg_null_functions" + "--skip=utils::test_utils::tests::test_bad_os_str" + "--skip=utils::test_utils::tests::test_get_env_str" + "--skip=pg_get_table_source_multiple_geom_tile_ok" + "--skip=pg_get_table_source_tile_minmax_zoom_ok" + "--skip=pg_tables_feature_id" + "--skip=pg_get_table_source_tile_ok" + "--skip=table_source_schemas" + "--skip=tables_srid_ok" + "--skip=tables_tile_ok" + "--skip=table_source" + "--skip=tables_tilejson" + "--skip=tables_multiple_geom_ok" ]; meta = { diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix index c15411e0183f..25611febd675 100644 --- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix +++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix @@ -14,14 +14,14 @@ python3Packages.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.145.0"; + version = "1.146.0"; pyproject = true; src = fetchFromGitHub { owner = "element-hq"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-JFMxnp4//Q8t6LZf6L2jJxaShE51r4MY7eJvD9JhhVo="; + hash = "sha256-XeDXXiGmY4Lsn5qNVvsBUdQYlTz40fuVVus7jRsUNW4="; }; cargoDeps = rustPlatform.fetchCargoVendor { diff --git a/pkgs/by-name/mc/mcp-grafana/package.nix b/pkgs/by-name/mc/mcp-grafana/package.nix index bebf21bcc8f0..959b1485c45d 100644 --- a/pkgs/by-name/mc/mcp-grafana/package.nix +++ b/pkgs/by-name/mc/mcp-grafana/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "mcp-grafana"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "grafana"; repo = "mcp-grafana"; tag = "v${finalAttrs.version}"; - hash = "sha256-oMCRZaAkvotP0oD4MjdNASDRk0FUYnH2vR22IojilN8="; + hash = "sha256-oFSV/F63HZGN8zurdJG8/tf62Fu1k54E+wXUBZCzhxU="; }; vendorHash = "sha256-SjzOmWU+mrEdLsgeT1Y2+A3skOzWHxJXxWke7aHrt+A="; diff --git a/pkgs/by-name/mc/mcp-nixos/package.nix b/pkgs/by-name/mc/mcp-nixos/package.nix index 345861f53f63..a152758f67b0 100644 --- a/pkgs/by-name/mc/mcp-nixos/package.nix +++ b/pkgs/by-name/mc/mcp-nixos/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "mcp-nixos"; - version = "2.1.0"; + version = "2.1.1"; pyproject = true; src = fetchFromGitHub { owner = "utensils"; repo = "mcp-nixos"; tag = "v${version}"; - hash = "sha256-rnpIDY/sy/uV+1dsW+MrFwAFE/RHg5K/6aa5k7Yt1Dc="; + hash = "sha256-ZScQ79z7SwjpI5ZnrwXhRNqOnYQTI9MayvPjv00hiyY="; }; build-system = [ python3Packages.hatchling ]; diff --git a/pkgs/by-name/md/mdbook-pandoc/package.nix b/pkgs/by-name/md/mdbook-pandoc/package.nix index a5776acdf01e..51d25f543b6d 100644 --- a/pkgs/by-name/md/mdbook-pandoc/package.nix +++ b/pkgs/by-name/md/mdbook-pandoc/package.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optional stdenv.buildPlatform.isDarwin "pandoc::tests::five_item_deep_list"; in - builtins.map (x: "--skip " + x) skippedTests; + builtins.map (x: "--skip=" + x) skippedTests; passthru = { wrapper = callPackage ./wrapper.nix { }; diff --git a/pkgs/by-name/md/mdserve/package.nix b/pkgs/by-name/md/mdserve/package.nix index 3e6ddf1b91c1..087e9ebae6f3 100644 --- a/pkgs/by-name/md/mdserve/package.nix +++ b/pkgs/by-name/md/mdserve/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ # times out on darwin during nixpkgs-review - "--skip test_file_modification_updates_via_websocket" + "--skip=test_file_modification_updates_via_websocket" ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/me/meilisearch/package.nix b/pkgs/by-name/me/meilisearch/package.nix index 22abda087c41..844f540e3cee 100644 --- a/pkgs/by-name/me/meilisearch/package.nix +++ b/pkgs/by-name/me/meilisearch/package.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "meilisearch"; - version = "1.34.1"; + version = "1.34.3"; src = fetchFromGitHub { owner = "meilisearch"; repo = "meilisearch"; tag = "v${finalAttrs.version}"; - hash = "sha256-1wNaf36z4CIyhyhNOLZbKSSSIRjhTRB84hdkgtHU7rA="; + hash = "sha256-aO2OEXnYnejG3/7rVtpgIuPJkFW2clj4HooIWoEWDcE="; }; cargoBuildFlags = [ "--package=meilisearch" ]; - cargoHash = "sha256-8o4q2K93geIs3Ru7yUFShqCqELchVb0N2p4qEle6wss="; + cargoHash = "sha256-ZnztQOL+q+Bk+Vms5NiBVG2FrzKS0Cn+S3COWMe+tbw="; # Default features include mini dashboard which downloads something from the internet. buildNoDefaultFeatures = true; diff --git a/pkgs/by-name/me/meshtasticd/package.nix b/pkgs/by-name/me/meshtasticd/package.nix index 7a9ec6d4a12a..8c7a1efa6c16 100644 --- a/pkgs/by-name/me/meshtasticd/package.nix +++ b/pkgs/by-name/me/meshtasticd/package.nix @@ -16,13 +16,6 @@ libuv, libxkbcommon, ulfius, - openssl, - gnutls, - jansson, - zlib, - libmicrohttpd, - orcania, - yder, yaml-cpp, udevCheckHook, versionCheckHook, @@ -73,22 +66,15 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ bluez - gnutls i2c-tools - jansson libX11 libgpiod_1 libinput - libmicrohttpd libusb1 libuv libxkbcommon - openssl - orcania ulfius yaml-cpp - yder - zlib ]; preConfigure = '' diff --git a/pkgs/by-name/mi/micro/package.nix b/pkgs/by-name/mi/micro/package.nix index 9db5cb978321..9515b2c9fe69 100644 --- a/pkgs/by-name/mi/micro/package.nix +++ b/pkgs/by-name/mi/micro/package.nix @@ -5,6 +5,7 @@ fetchFromGitHub, installShellFiles, stdenv, + versionCheckHook, # Deprecated options # Remove them as soon as possible withXclip ? null, @@ -69,6 +70,9 @@ let wrapper = callPackage ./wrapper.nix { micro = self; }; }; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + meta = { homepage = "https://micro-editor.github.io"; changelog = "https://github.com/micro-editor/micro/releases/"; diff --git a/pkgs/by-name/mi/micro/tests/version.nix b/pkgs/by-name/mi/micro/tests/version.nix deleted file mode 100644 index 14d63a3a450b..000000000000 --- a/pkgs/by-name/mi/micro/tests/version.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ micro, testers }: - -testers.testVersion { - package = micro; - command = "micro -version"; -} diff --git a/pkgs/by-name/mi/mininet/package.nix b/pkgs/by-name/mi/mininet/package.nix index 9550417068e6..5f57a874aa91 100644 --- a/pkgs/by-name/mi/mininet/package.nix +++ b/pkgs/by-name/mi/mininet/package.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - wrapPythonProgramsIn "$out/bin" "$py $pythonPath" + wrapPythonProgramsIn "$out/bin" "$py ''${pythonPath[*]}" wrapProgram "$out/bin/mnexec" \ --prefix PATH : "${generatedPath}" wrapProgram "$out/bin/mn" \ diff --git a/pkgs/by-name/mi/miro/package.nix b/pkgs/by-name/mi/miro/package.nix index d8242fb5b98a..8e234870e376 100644 --- a/pkgs/by-name/mi/miro/package.nix +++ b/pkgs/by-name/mi/miro/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "miro"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "vincent-uden"; repo = "miro"; tag = "v${finalAttrs.version}"; - hash = "sha256-2RyBjWeb94bxiZ7hy//654YP1bc6bl13slNxRwrhtyk="; + hash = "sha256-HSI6sAXy+PtZdla2GMuWFwoClUIf3E4rc3NHh7Wz1BE="; }; - cargoHash = "sha256-wRlze8VZ9I4O/eycWvlNPUsa/ucBeZ8SWtD9eJ+Uxvs="; + cargoHash = "sha256-yYpHB7LwGxBy5r16vzXflqaygJmibEV4XteD0BV0HoA="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/mi/mistral-vibe/package.nix b/pkgs/by-name/mi/mistral-vibe/package.nix index 8bd7b1a49181..0a03eb3aa178 100644 --- a/pkgs/by-name/mi/mistral-vibe/package.nix +++ b/pkgs/by-name/mi/mistral-vibe/package.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "mistral-vibe"; - version = "2.0.0"; + version = "2.0.1"; pyproject = true; src = fetchFromGitHub { owner = "mistralai"; repo = "mistral-vibe"; tag = "v${finalAttrs.version}"; - hash = "sha256-2waDKL1TWVw2BXl0oqV9+kH86w7dWpz1j61VQSxJW5Q="; + hash = "sha256-GqJHFgeaq2oBF1HI0g30IJ+QSj2szvCUUiT7up4VOpk="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/mo/monado/package.nix b/pkgs/by-name/mo/monado/package.nix index 8aa4ad3ce5f8..c6485a846c2b 100644 --- a/pkgs/by-name/mo/monado/package.nix +++ b/pkgs/by-name/mo/monado/package.nix @@ -12,8 +12,7 @@ eigen, elfutils, glslang, - gst-plugins-base, - gstreamer, + gst_all_1, hidapi, libbsd, libdrm, @@ -94,8 +93,8 @@ stdenv.mkDerivation (finalAttrs: { dbus eigen elfutils - gst-plugins-base - gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gstreamer hidapi libbsd libdrm diff --git a/pkgs/by-name/mo/monkeysAudio/package.nix b/pkgs/by-name/mo/monkeysAudio/package.nix index 3fb4ec1c991c..2969c8faa569 100644 --- a/pkgs/by-name/mo/monkeysAudio/package.nix +++ b/pkgs/by-name/mo/monkeysAudio/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "12.02"; + version = "12.05"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-4/WKQJr9ZSFM7IiMGwwVAoyPxJegjlLqjyXOOc3KR2k="; + hash = "sha256-QmowAu/v1jqDa3MvhGlviGFZQbk7ADROLPV/R7IpsHE="; stripRoot = false; }; diff --git a/pkgs/by-name/mp/mprocs/package.nix b/pkgs/by-name/mp/mprocs/package.nix index 416f9c76f93c..a61d447d706d 100644 --- a/pkgs/by-name/mp/mprocs/package.nix +++ b/pkgs/by-name/mp/mprocs/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mprocs"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "pvolok"; repo = "mprocs"; tag = "v${finalAttrs.version}"; - hash = "sha256-77uXHlQjhIDbRbnkr3jvZKuLOcvbOIuum8FRsUv8cYw="; + hash = "sha256-8p8hPATAyc7ms2iXktrSEAmi6/ax85F5xwF6e7H4XRE="; }; - cargoHash = "sha256-T8zG2Z7UP4MZUGeUypG9ugO49rbicwYrdRZiGJN3H0E="; + cargoHash = "sha256-wQNUHiOaq5fgZbwUEEco5MjX8xH2NoQnKCtM1cHchUQ="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/mp/mpv/scripts/uosc-danmaku.nix b/pkgs/by-name/mp/mpv/scripts/uosc-danmaku.nix new file mode 100644 index 000000000000..ea673c52b76f --- /dev/null +++ b/pkgs/by-name/mp/mpv/scripts/uosc-danmaku.nix @@ -0,0 +1,41 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + gitUpdater, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "uosc-danmaku"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "Tony15246"; + repo = "uosc_danmaku"; + tag = "v${finalAttrs.version}"; + hash = "sha256-r4HcrDh4iW8ErfClfX1gkEWp7lVKbLE88fpj3tjYBAI="; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + install -Dm644 main.lua $out/share/mpv/scripts/uosc_danmaku/main.lua + cp -r modules apis dicts $out/share/mpv/scripts/uosc_danmaku/ + + runHook postInstall + ''; + + passthru = { + updateScript = gitUpdater { }; + scriptName = "uosc_danmaku"; + }; + + meta = { + description = "Load DanDanPlay danmaku in MPV player"; + homepage = "https://github.com/Tony15246/uosc_danmaku"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ puiyq ]; + }; +}) diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix index 72c64f5b9ab5..88e2977b6510 100644 --- a/pkgs/by-name/my/myks/package.nix +++ b/pkgs/by-name/my/myks/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "myks"; - version = "5.6.0"; + version = "5.7.0"; src = fetchFromGitHub { owner = "mykso"; repo = "myks"; tag = "v${version}"; - hash = "sha256-0bK5ZnzGhQc0s0nQiNTGe5Z45BpwqXiv8kt0ne8EkpE="; + hash = "sha256-WxbADpvay7k0niTpKjf/1YqjQBxlMfdWl4MXY6+5iFY="; }; - vendorHash = "sha256-jNPo6TotuBhG2GW9vHu1zC6BYCIRfyqRZB6vbtCNCpI="; + vendorHash = "sha256-Va8x5kvrms/3/DH6TgcpndBh6MQ0fFatJApcOeH6gwc="; subPackages = "."; diff --git a/pkgs/by-name/na/naja/package.nix b/pkgs/by-name/na/naja/package.nix index 11235fa1cce7..19a9e0dc50fa 100644 --- a/pkgs/by-name/na/naja/package.nix +++ b/pkgs/by-name/na/naja/package.nix @@ -17,13 +17,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "naja"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "najaeda"; repo = "naja"; tag = "v${finalAttrs.version}"; - hash = "sha256-Oh1rAS20bQRp8P/8qMPjoCTC9wghBRhmRRh7J/+NG0A="; + hash = "sha256-VD1ObfP6EbGUsqo0D4DLwBS1svLSsxhJB1iskybt/YI="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/na/natscli/package.nix b/pkgs/by-name/na/natscli/package.nix index 39b6d185c02d..93fcf7b62394 100644 --- a/pkgs/by-name/na/natscli/package.nix +++ b/pkgs/by-name/na/natscli/package.nix @@ -5,26 +5,26 @@ versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "natscli"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "nats-io"; repo = "natscli"; - tag = "v${version}"; - hash = "sha256-GaP1qC90agVJa7t8aAyB+t++URxbQzkrCJ+KAVFqoBA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Y68AnYHud7tUVwd7+3/XmuQcyzFWVrh3UlKQ7uvsDxE="; }; proxyVendor = true; - vendorHash = "sha256-8Kva9aMWzGctpq51jVOz6umVTNB9NaGHIGoKmw7gl3I="; + vendorHash = "sha256-nPdLCRhTbj1gBm1oXOM3tUEYk5iwBS6lpzfY8fqoMBM="; subPackages = [ "nats" ]; ldflags = [ "-s" "-w" - "-X=main.version=${version}" + "-X=main.version=${finalAttrs.version}" ]; nativeInstallCheckInputs = [ versionCheckHook ]; @@ -40,7 +40,7 @@ buildGoModule rec { meta = { description = "NATS Command Line Interface"; homepage = "https://github.com/nats-io/natscli"; - changelog = "https://github.com/nats-io/natscli/releases/tag/${src.tag}"; + changelog = "https://github.com/nats-io/natscli/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ bengsparks @@ -48,4 +48,4 @@ buildGoModule rec { ]; mainProgram = "nats"; }; -} +}) diff --git a/pkgs/by-name/nc/ncps/package.nix b/pkgs/by-name/nc/ncps/package.nix index ba228bc5c248..e857a342c383 100644 --- a/pkgs/by-name/nc/ncps/package.nix +++ b/pkgs/by-name/nc/ncps/package.nix @@ -33,13 +33,13 @@ let finalAttrs = { pname = "ncps"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "kalbasit"; repo = "ncps"; tag = "v${finalAttrs.version}"; - hash = "sha256-qc6h1gnU7dFyb0GiBq++E2yf49K7mO86Vwdf8y3817U="; + hash = "sha256-6mpEe0i5NYQb5WK2/478VFkMNa6xqAIU1uwwhH2zc2M="; }; vendorHash = "sha256-nnt4HIG4Fs7RhHjVb7mYJ39UgvFKc46Cu42cURMmr1s="; diff --git a/pkgs/by-name/ne/neard/package.nix b/pkgs/by-name/ne/neard/package.nix index 947fe729a231..963168dfd6fc 100644 --- a/pkgs/by-name/ne/neard/package.nix +++ b/pkgs/by-name/ne/neard/package.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation { preFixup = '' makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - wrapPythonProgramsIn "$out/lib/neard" "$pythonPath" + wrapPythonProgramsIn "$out/lib/neard" "''${pythonPath[*]}" ''; meta = { diff --git a/pkgs/by-name/ni/nixseparatedebuginfod2/package.nix b/pkgs/by-name/ni/nixseparatedebuginfod2/package.nix index 42f9613df285..d01deb4f7902 100644 --- a/pkgs/by-name/ni/nixseparatedebuginfod2/package.nix +++ b/pkgs/by-name/ni/nixseparatedebuginfod2/package.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { passthru.tests = { inherit (nixosTests) nixseparatedebuginfod2; }; # flaky tests - checkFlags = [ "--skip substituter::http" ]; + checkFlags = [ "--skip=substituter::http" ]; meta = { description = "Downloads and provides debug symbols and source code for nix derivations to gdb and other debuginfod-capable debuggers as needed"; diff --git a/pkgs/by-name/ni/nixtamal/package.nix b/pkgs/by-name/ni/nixtamal/package.nix new file mode 100644 index 000000000000..b09b8969a834 --- /dev/null +++ b/pkgs/by-name/ni/nixtamal/package.nix @@ -0,0 +1,106 @@ +{ + lib, + fetchdarcs, + python3Packages, + ocamlPackages, + makeBinaryWrapper, + coreutils, + nix-prefetch-darcs, + nix-prefetch-git, + nix-prefetch-pijul, + testers, + nixtamal, +}: + +ocamlPackages.buildDunePackage (finalAttrs: { + pname = "nixtamal"; + version = "0.1.1-beta"; + release_year = 2026; + + minimalOCamlVersion = "5.3"; + + src = fetchdarcs { + url = "https://darcs.toastal.in.th/nixtamal/stable/"; + mirrors = [ "https://smeder.ee/~toastal/nixtamal.darcs" ]; + rev = finalAttrs.version; + hash = "sha256-8HrW7VH2LAcTyduGfToC3+oqU7apILdvgd76c8r8NIw="; + }; + + nativeBuildInputs = [ + makeBinaryWrapper + # For manpages + python3Packages.docutils + python3Packages.pygments + ]; + + buildInputs = with ocamlPackages; [ + camomile + cmdliner + eio + eio_main + fmt + jingoo + (jsont.override { + withBrr = false; + withBytesrw = true; + }) + kdl + logs + ppx_deriving + ppx_deriving_qcheck + saturn + stdint + uri + ]; + + checkInputs = with ocamlPackages; [ + alcotest + qcheck + qcheck-alcotest + ]; + + postPatch = '' + substituteInPlace bin/main.ml --subst-var version + substituteInPlace lib/lock_loader.ml --subst-var release_year + ''; + + doCheck = true; + + postInstall = '' + wrapProgram "$out/bin/nixtamal" --prefix PATH : ${ + lib.makeBinPath [ + coreutils + nix-prefetch-darcs + nix-prefetch-git + nix-prefetch-pijul + ] + } + ''; + + passthru.tests.version = testers.testVersion { + package = nixtamal; + command = "${nixtamal.meta.mainProgram} --version"; + }; + + meta = { + license = with lib.licenses; [ gpl3Plus ]; + platforms = lib.platforms.unix; + mainProgram = "nixtamal"; + homepage = "https://nixtamal.toast.al"; + changelog = "https://nixtamal.toast.al/changelog/"; + description = "Fulfilling, pure input pinning for Nix"; + longDescription = '' + Nixtamal’s keys features + + • Automate the manual work of input pinning, allowing to lock & refresh inputs + • Declaritive KDL manifest file over imperative CLI flags + • Host, forge, VCS-agnostic + • Fetchers from Nixpkgs not supported by the builtins (currently Darcs, Pijul) + • Supports mirrors + • Override hash algorithm on a per-project & per-input basis — including BLAKE3 support + • Custom freshness commands + • No experimental Nix features required + ''; + maintainers = with lib.maintainers; [ toastal ]; + }; +}) diff --git a/pkgs/by-name/nn/nnd/package.nix b/pkgs/by-name/nn/nnd/package.nix index f7ba0cfc44c3..e5defaf68909 100644 --- a/pkgs/by-name/nn/nnd/package.nix +++ b/pkgs/by-name/nn/nnd/package.nix @@ -8,16 +8,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "nnd"; - version = "0.68"; + version = "0.69"; src = fetchFromGitHub { owner = "al13n321"; repo = "nnd"; tag = "v${finalAttrs.version}"; - hash = "sha256-77WKsk/kKWJjSwikXtLDWY0pRf1pC6YkY9c9xDtheUI="; + hash = "sha256-LvCA6UXnsf4ZCSqb2dI5UzMFgiKk2kaiE0zpzcbs3uI="; }; - cargoHash = "sha256-I9TcZQqKjR4awufmT8fM883YDeyNZUozHaoZfEaE6+0="; + cargoHash = "sha256-FY6+EkkOvgg4irb7Fr1xE2szScAREkn1qFIle8JGZX0="; meta = { description = "Debugger for Linux"; diff --git a/pkgs/by-name/nu/nuclei/package.nix b/pkgs/by-name/nu/nuclei/package.nix index 815a31caa2c5..63c11e8c55cf 100644 --- a/pkgs/by-name/nu/nuclei/package.nix +++ b/pkgs/by-name/nu/nuclei/package.nix @@ -5,18 +5,18 @@ versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "nuclei"; - version = "3.6.2"; + version = "3.7.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei"; - tag = "v${version}"; - hash = "sha256-cWfX1W9foaCmqH17RDNHq38SYbl9enzZmyYZKkHz36k="; + tag = "v${finalAttrs.version}"; + hash = "sha256-MAOyMpcJsw4O+oC3IhEBF1XR6KSLBHhYZDnmNnwX4mo="; }; - vendorHash = "sha256-yXXjYsLO3jQI0fS7f5LG/KTVpRg+ROc0DPUVYdNOW8I="; + vendorHash = "sha256-XaRcVKFgsQnPngqmp7QIcx2jV7h51EafNlZjSd9lUIE="; proxyVendor = true; # hash mismatch between Linux and Darwin @@ -46,7 +46,7 @@ buildGoModule rec { CVEs across targets that are known and easily detectable. ''; homepage = "https://github.com/projectdiscovery/nuclei"; - changelog = "https://github.com/projectdiscovery/nuclei/releases/tag/v${version}"; + changelog = "https://github.com/projectdiscovery/nuclei/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab @@ -54,4 +54,4 @@ buildGoModule rec { ]; mainProgram = "nuclei"; }; -} +}) diff --git a/pkgs/by-name/op/open-fprintd/package.nix b/pkgs/by-name/op/open-fprintd/package.nix index 6ddfed95dd47..d0f61119f0ce 100644 --- a/pkgs/by-name/op/open-fprintd/package.nix +++ b/pkgs/by-name/op/open-fprintd/package.nix @@ -49,7 +49,7 @@ python3Packages.buildPythonPackage rec { makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ]; postFixup = '' - wrapPythonProgramsIn "$out/lib/open-fprintd" "$out $pythonPath" + wrapPythonProgramsIn "$out/lib/open-fprintd" "$out ''${pythonPath[*]}" ''; meta = { diff --git a/pkgs/by-name/op/openbox/package.nix b/pkgs/by-name/op/openbox/package.nix index 306cdd851948..8281275cb594 100644 --- a/pkgs/by-name/op/openbox/package.nix +++ b/pkgs/by-name/op/openbox/package.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/openbox-session" --prefix XDG_DATA_DIRS : "$out/share" wrapProgram "$out/bin/openbox-gnome-session" --prefix XDG_DATA_DIRS : "$out/share" wrapProgram "$out/bin/openbox-kde-session" --prefix XDG_DATA_DIRS : "$out/share" - wrapPythonProgramsIn "$out/libexec" "$out $pythonPath" + wrapPythonProgramsIn "$out/libexec" "$out ''${pythonPath[*]}" ''; meta = { diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index 75b0f26c0230..ef966abafd9d 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -3,11 +3,11 @@ stdenvNoCC, bun, fetchFromGitHub, - fzf, makeBinaryWrapper, models-dev, nix-update-script, ripgrep, + sysctl, installShellFiles, versionCheckHook, writableTmpDirAsHomeHook, @@ -81,11 +81,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { writableTmpDirAsHomeHook ]; - patches = [ - # NOTE: Remove special and windows build targes - ./remove-special-and-windows-build-targets.patch - ]; - postPatch = '' # NOTE: Relax Bun version check to be a warning instead of an error substituteInPlace packages/script/src/index.ts \ @@ -105,16 +100,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { env.OPENCODE_VERSION = finalAttrs.version; env.OPENCODE_CHANNEL = "stable"; - preBuild = '' - chmod -R u+w ./packages/opencode/node_modules - pushd ./packages/opencode/node_modules/@opentui/ - for pkg in ../../../../node_modules/.bun/@opentui+core-*; do - linkName=$(basename "$pkg" | sed 's/@.*+\(.*\)@.*/\1/') - ln -sf "$pkg/node_modules/@opentui/$linkName" "$linkName" - done - popd - ''; - buildPhase = '' runHook preBuild @@ -136,16 +121,21 @@ stdenvNoCC.mkDerivation (finalAttrs: { postInstall = lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) '' installShellCompletion --cmd opencode \ - --bash <($out/bin/opencode completion) + --bash <($out/bin/opencode completion) \ + --zsh <(SHELL=/bin/zsh $out/bin/opencode completion) ''; postFixup = '' wrapProgram $out/bin/opencode \ --prefix PATH : ${ - lib.makeBinPath [ - fzf - ripgrep - ] + lib.makeBinPath ( + [ + ripgrep + ] + ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [ + sysctl + ] + ) } ''; diff --git a/pkgs/by-name/op/opencode/remove-special-and-windows-build-targets.patch b/pkgs/by-name/op/opencode/remove-special-and-windows-build-targets.patch deleted file mode 100644 index 50f5601f334a..000000000000 --- a/pkgs/by-name/op/opencode/remove-special-and-windows-build-targets.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 4d0a82e8f3cf8bf011e2592677db4aa31b6b290b Mon Sep 17 00:00:00 2001 -From: Thierry Delafontaine -Date: Sun, 4 Jan 2026 20:55:49 +0100 -Subject: [PATCH] Remove special and windows build targets - ---- - packages/opencode/script/build.ts | 70 +++++++++++++++---------------- - 1 file changed, 35 insertions(+), 35 deletions(-) - -diff --git a/packages/opencode/script/build.ts b/packages/opencode/script/build.ts -index f51cb2924..ee3c0e863 100755 ---- a/packages/opencode/script/build.ts -+++ b/packages/opencode/script/build.ts -@@ -33,27 +33,27 @@ const allTargets: { - os: "linux", - arch: "x64", - }, -- { -- os: "linux", -- arch: "x64", -- avx2: false, -- }, -- { -- os: "linux", -- arch: "arm64", -- abi: "musl", -- }, -- { -- os: "linux", -- arch: "x64", -- abi: "musl", -- }, -- { -- os: "linux", -- arch: "x64", -- abi: "musl", -- avx2: false, -- }, -+ // { -+ // os: "linux", -+ // arch: "x64", -+ // avx2: false, -+ // }, -+ // { -+ // os: "linux", -+ // arch: "arm64", -+ // abi: "musl", -+ // }, -+ // { -+ // os: "linux", -+ // arch: "x64", -+ // abi: "musl", -+ // }, -+ // { -+ // os: "linux", -+ // arch: "x64", -+ // abi: "musl", -+ // avx2: false, -+ // }, - { - os: "darwin", - arch: "arm64", -@@ -62,20 +62,20 @@ const allTargets: { - os: "darwin", - arch: "x64", - }, -- { -- os: "darwin", -- arch: "x64", -- avx2: false, -- }, -- { -- os: "win32", -- arch: "x64", -- }, -- { -- os: "win32", -- arch: "x64", -- avx2: false, -- }, -+ // { -+ // os: "darwin", -+ // arch: "x64", -+ // avx2: false, -+ // }, -+ // { -+ // os: "win32", -+ // arch: "x64", -+ // }, -+ // { -+ // os: "win32", -+ // arch: "x64", -+ // avx2: false, -+ // }, - ] - - const targets = singleFlag --- -2.52.0 - diff --git a/pkgs/by-name/or/or-tools/package.nix b/pkgs/by-name/or/or-tools/package.nix index c2f7071a90fe..eb334bcd0b4d 100644 --- a/pkgs/by-name/or/or-tools/package.nix +++ b/pkgs/by-name/or/or-tools/package.nix @@ -232,7 +232,12 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' cmake . -DBUILD_EXAMPLES=OFF -DBUILD_PYTHON=OFF -DBUILD_SAMPLES=OFF cmake --install . - pip install --prefix="$python" python/ + + # Install the Python bindings. + # --no-build-isolation: Required because Nix provides build tools (setuptools/wheel) + # locally; without this, pip tries to download them from the internet. + # --no-index: Prevents pip from searching PyPI for packages. + pip install --no-index --no-build-isolation --prefix="$python" python/ ''; outputs = [ @@ -249,5 +254,10 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "fzn-cp-sat"; maintainers = with lib.maintainers; [ andersk ]; platforms = with lib.platforms; linux ++ darwin; + + # Only version 9.15 adds support for Python 3.14: https://github.com/google/or-tools/releases/tag/v9.15 + # Also this package is tied to pybind 2.13.6, and only 3.0.0 supports Python 3.14: https://github.com/pybind/pybind11/releases/tag/v3.0.0 + # Also, nix review fails to build python314Packages.ortools + broken = python3.pythonAtLeast "3.14"; }; }) diff --git a/pkgs/by-name/ox/oxker/package.nix b/pkgs/by-name/ox/oxker/package.nix index 07037c28429a..61c330f71359 100644 --- a/pkgs/by-name/ox/oxker/package.nix +++ b/pkgs/by-name/ox/oxker/package.nix @@ -20,9 +20,9 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-X5iNAwp0DcXoT82ZLq37geifztvJ/zZgOgM3SycAazA="; checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ - "--skip ui::draw_blocks::help::tests::test_draw_blocks_help_custom_keymap_one_definition" - "--skip ui::draw_blocks::help::tests::test_draw_blocks_help_custom_keymap_two_definitions" - "--skip ui::draw_blocks::help::tests::test_draw_blocks_help_one_and_two_definitions" + "--skip=ui::draw_blocks::help::tests::test_draw_blocks_help_custom_keymap_one_definition" + "--skip=ui::draw_blocks::help::tests::test_draw_blocks_help_custom_keymap_two_definitions" + "--skip=ui::draw_blocks::help::tests::test_draw_blocks_help_one_and_two_definitions" ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pa/patchance/package.nix b/pkgs/by-name/pa/patchance/package.nix index 04f9d2cdca17..1db0ef140796 100644 --- a/pkgs/by-name/pa/patchance/package.nix +++ b/pkgs/by-name/pa/patchance/package.nix @@ -47,7 +47,7 @@ python3Packages.buildPythonApplication rec { ''; postFixup = '' - wrapPythonProgramsIn "$out/share/patchance/src" "$out $pythonPath" + wrapPythonProgramsIn "$out/share/patchance/src" "$out ''${pythonPath[*]}" for file in $out/bin/*; do wrapQtApp "$file" done diff --git a/pkgs/by-name/ph/phira-unwrapped/package.nix b/pkgs/by-name/ph/phira-unwrapped/package.nix index 0aaeb78b1638..ee551e73766c 100644 --- a/pkgs/by-name/ph/phira-unwrapped/package.nix +++ b/pkgs/by-name/ph/phira-unwrapped/package.nix @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-6mRb3M56G20fA+px1cZyrGpel0v54qoVAQK2ZgTzkmI="; # The developer put assets necessary for this test in gitignore, so it cannot run. - checkFlags = [ "--skip test_parse_chart" ]; + checkFlags = [ "--skip=test_parse_chart" ]; desktopItems = [ (makeDesktopItem { diff --git a/pkgs/by-name/ph/phpstan/package.nix b/pkgs/by-name/ph/phpstan/package.nix index eb47f69e6e59..9caba6cca770 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.1.35"; + version = "2.1.37"; src = fetchFromGitHub { owner = "phpstan"; repo = "phpstan"; tag = finalAttrs.version; - hash = "sha256-1X+Z4z7VN36DbxWCOu1mvEWQaAJL9tbh3JWMAaHnT5c="; + hash = "sha256-Ov4wCIKHuVtVKCTLBR9d2W2yNw49U2gGZkygEPhXTRA="; }; nativeBuildInputs = [ @@ -49,6 +49,9 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.mit; mainProgram = "phpstan"; - maintainers = [ lib.maintainers.patka ]; + maintainers = with lib.maintainers; [ + patka + piotrkwiecinski + ]; }; }) diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix index a457b8c8356a..885ea20c2294 100644 --- a/pkgs/by-name/ph/phpunit/package.nix +++ b/pkgs/by-name/ph/phpunit/package.nix @@ -8,16 +8,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phpunit"; - version = "12.5.6"; + version = "12.5.8"; src = fetchFromGitHub { owner = "sebastianbergmann"; repo = "phpunit"; tag = finalAttrs.version; - hash = "sha256-F2/LMJwLzLz7YuJPq2J6ypgtY9ps5ExiHX6UGvtKh3E="; + hash = "sha256-93y2V+QgsjQb1is91kTbxcu1dY8MyM474qIpGRa0pp0="; }; - vendorHash = "sha256-YqDdlspt9hGMzSoC41pMZLucP/luv6Fo2VGQ7pPa5pk="; + vendorHash = "sha256-q5qTQRxxsiE+B22LU+npM4ada0ddAt2f7KNz+cb6yYY="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pi/pince/package.nix b/pkgs/by-name/pi/pince/package.nix index 44e0a0e2a7dd..5786610043ec 100644 --- a/pkgs/by-name/pi/pince/package.nix +++ b/pkgs/by-name/pi/pince/package.nix @@ -164,7 +164,7 @@ python3Packages.buildPythonApplication rec { ''; postFixup = '' - wrapPythonProgramsIn "$out/lib/pince" "$out $pythonPath" + wrapPythonProgramsIn "$out/lib/pince" "$out ''${pythonPath[*]}" ''; passthru = { diff --git a/pkgs/by-name/po/pokete/package.nix b/pkgs/by-name/po/pokete/package.nix index a0ab1709dd02..357047356d24 100644 --- a/pkgs/by-name/po/pokete/package.nix +++ b/pkgs/by-name/po/pokete/package.nix @@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication rec { ''; postFixup = '' - wrapPythonProgramsIn $out/share/pokete "$pythonPath" + wrapPythonProgramsIn $out/share/pokete "''${pythonPath[*]}" ''; passthru.tests = { diff --git a/pkgs/by-name/po/pomerium-cli/package.nix b/pkgs/by-name/po/pomerium-cli/package.nix index bf89b42e9c05..4c9fd773b419 100644 --- a/pkgs/by-name/po/pomerium-cli/package.nix +++ b/pkgs/by-name/po/pomerium-cli/package.nix @@ -14,16 +14,16 @@ let in buildGoModule rec { pname = "pomerium-cli"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "pomerium"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-m/qiNpkNQdQLC2vBbN5aj3oWTWZeFdplcXQCa0PiOKk="; + sha256 = "sha256-dxN3pVDt6v/xEnBwvmOFf8gf6YZWv23a4K6mTRovv+k="; }; - vendorHash = "sha256-a1E9pLMJ7JynV+YLANuO3iJ0IzkdEy0KBRUhsfz3D+U="; + vendorHash = "sha256-pDoV7CzQFiAi6OAqqW8b6/Sl9PSQou9pU2c5nU7Rt0A="; subPackages = [ "cmd/pomerium-cli" diff --git a/pkgs/by-name/pr/prek/package.nix b/pkgs/by-name/pr/prek/package.nix index c4b42b2ce913..b3dd6ced7c50 100644 --- a/pkgs/by-name/pr/prek/package.nix +++ b/pkgs/by-name/pr/prek/package.nix @@ -54,125 +54,131 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoTestFlags = [ "--no-fail-fast" ]; - checkFlags = map (t: "--skip ${t}") [ - # these tests require internet access - "check_added_large_files_hook" - "check_json_hook" - "end_of_file_fixer_hook" - "mixed_line_ending_hook" - "install_hooks_only" - "install_with_hooks" - "golang" - "node" - "script" - "check_useless_excludes_remote" - "run_worktree" - "try_repo_relative_path" - "languages::tests::test_native_tls" - "rust::additional_dependencies_cli" - "rust::rustup_installer" - "rust::remote_hooks" - "rust::remote_hooks_with_lib_deps" - "unsupported::unsupported_language" - "remote_hook_non_workspace" - # "meta_hooks" - "reuse_env" - "docker::docker" - "docker::workspace_docker" - "docker_image::docker_image" - "pygrep::basic_case_sensitive" - "pygrep::case_insensitive" - "pygrep::case_insensitive_multiline" - "pygrep::complex_regex_patterns" - "pygrep::invalid_args" - "pygrep::invalid_regex" - "pygrep::multiline_mode" - "pygrep::negate_mode" - "pygrep::negate_multiline_mode" - "pygrep::pattern_not_found" - "pygrep::python_regex_quirks" - "python::additional_dependencies" - "python::can_not_download" - "python::hook_stderr" - "python::language_version" - "ruby::additional_gem_dependencies" - "ruby::environment_isolation" - "ruby::gemspec_workflow" - "ruby::language_version_default" - "ruby::local_hook_with_gemspec" - "ruby::native_gem_dependency" - "ruby::native_gem_dependency" - "ruby::process_files" - "ruby::specific_ruby_available" - "ruby::specific_ruby_unavailable" - "ruby::system_ruby" - # can't checkout pre-commit-hooks - "cjk_hook_name" - "fail_fast" - "file_types" - "files_and_exclude" - "git_commit_a" - "log_file" - "merge_conflicts" - "pass_env_vars" - "restore_on_interrupt" - "run_basic" - "run_last_commit" - "same_repo" - "skips" - "staged_files_only" - "subdirectory" - "check_yaml_hook" - "check_yaml_multiple_document" - "builtin_hooks_workspace_mode" - "fix_byte_order_marker_hook" - "fix_byte_order_marker" - "check_merge_conflict_hook" - "check_merge_conflict_without_assume_flag" - "check_symlinks_hook_unix" - "check_xml_hook" - "check_xml_with_features" - "detect_private_key_hook" - "no_commit_to_branch_hook" - "no_commit_to_branch_hook_with_custom_branches" - "no_commit_to_branch_hook_with_patterns" - "check_executables_have_shebangs_various_cases" - "check_executables_have_shebangs_hook" - # does not properly use TMP - "hook_impl" - # problems with environment - "try_repo_specific_hook" - "try_repo_specific_rev" - # lua path is hardcoded - "lua::additional_dependencies" - "lua::health_check" - "lua::hook_stderr" - "lua::lua_environment" - "lua::remote_hook" - # error message differs - "run_in_non_git_repo" - # depends on locale - "init_nonexistent_repo" - # https://github.com/astral-sh/uv/issues/8635 - "alternate_config_file" - "basic_discovery" - "color" - "cookiecutter_template_directories_are_skipped" - "empty_entry" - "git_dir_respected" - "git_env_vars_not_leaked_to_pip_install" - "gitignore_respected" - "invalid_entry" - "local_python_hook" - "orphan_projects" - "run_with_selectors" - "run_with_stdin_closed" - "show_diff_on_failure" - "submodule_discovery" - "workspace_install_hooks" - # We don't have git info; we run versionCheckHook instead - "version_info" - ]; + checkFlags = + lib.concatMap + (t: [ + "--skip" + "${t}" + ]) + [ + # these tests require internet access + "check_added_large_files_hook" + "check_json_hook" + "end_of_file_fixer_hook" + "mixed_line_ending_hook" + "install_hooks_only" + "install_with_hooks" + "golang" + "node" + "script" + "check_useless_excludes_remote" + "run_worktree" + "try_repo_relative_path" + "languages::tests::test_native_tls" + "rust::additional_dependencies_cli" + "rust::rustup_installer" + "rust::remote_hooks" + "rust::remote_hooks_with_lib_deps" + "unsupported::unsupported_language" + "remote_hook_non_workspace" + # "meta_hooks" + "reuse_env" + "docker::docker" + "docker::workspace_docker" + "docker_image::docker_image" + "pygrep::basic_case_sensitive" + "pygrep::case_insensitive" + "pygrep::case_insensitive_multiline" + "pygrep::complex_regex_patterns" + "pygrep::invalid_args" + "pygrep::invalid_regex" + "pygrep::multiline_mode" + "pygrep::negate_mode" + "pygrep::negate_multiline_mode" + "pygrep::pattern_not_found" + "pygrep::python_regex_quirks" + "python::additional_dependencies" + "python::can_not_download" + "python::hook_stderr" + "python::language_version" + "ruby::additional_gem_dependencies" + "ruby::environment_isolation" + "ruby::gemspec_workflow" + "ruby::language_version_default" + "ruby::local_hook_with_gemspec" + "ruby::native_gem_dependency" + "ruby::native_gem_dependency" + "ruby::process_files" + "ruby::specific_ruby_available" + "ruby::specific_ruby_unavailable" + "ruby::system_ruby" + # can't checkout pre-commit-hooks + "cjk_hook_name" + "fail_fast" + "file_types" + "files_and_exclude" + "git_commit_a" + "log_file" + "merge_conflicts" + "pass_env_vars" + "restore_on_interrupt" + "run_basic" + "run_last_commit" + "same_repo" + "skips" + "staged_files_only" + "subdirectory" + "check_yaml_hook" + "check_yaml_multiple_document" + "builtin_hooks_workspace_mode" + "fix_byte_order_marker_hook" + "fix_byte_order_marker" + "check_merge_conflict_hook" + "check_merge_conflict_without_assume_flag" + "check_symlinks_hook_unix" + "check_xml_hook" + "check_xml_with_features" + "detect_private_key_hook" + "no_commit_to_branch_hook" + "no_commit_to_branch_hook_with_custom_branches" + "no_commit_to_branch_hook_with_patterns" + "check_executables_have_shebangs_various_cases" + "check_executables_have_shebangs_hook" + # does not properly use TMP + "hook_impl" + # problems with environment + "try_repo_specific_hook" + "try_repo_specific_rev" + # lua path is hardcoded + "lua::additional_dependencies" + "lua::health_check" + "lua::hook_stderr" + "lua::lua_environment" + "lua::remote_hook" + # error message differs + "run_in_non_git_repo" + # depends on locale + "init_nonexistent_repo" + # https://github.com/astral-sh/uv/issues/8635 + "alternate_config_file" + "basic_discovery" + "color" + "cookiecutter_template_directories_are_skipped" + "empty_entry" + "git_dir_respected" + "git_env_vars_not_leaked_to_pip_install" + "gitignore_respected" + "invalid_entry" + "local_python_hook" + "orphan_projects" + "run_with_selectors" + "run_with_stdin_closed" + "show_diff_on_failure" + "submodule_discovery" + "workspace_install_hooks" + # We don't have git info; we run versionCheckHook instead + "version_info" + ]; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/pr/prmt/package.nix b/pkgs/by-name/pr/prmt/package.nix index 390cb945f73f..ed694fd6be6d 100644 --- a/pkgs/by-name/pr/prmt/package.nix +++ b/pkgs/by-name/pr/prmt/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-Vc2uCFD3A3huSFaYbgZHRWgiQnxXkz7BzvmdT7AsnoY="; # Fail to run in sandbox environment - checkFlags = map (t: "--skip ${t}") [ + checkFlags = map (t: "--skip=${t}") [ "modules::path::tests::relative_path_inside_home_renders_tilde" "modules::path::tests::relative_path_with_shared_prefix_is_not_tilde" "test_git_module" diff --git a/pkgs/by-name/py/pyrefly/package.nix b/pkgs/by-name/py/pyrefly/package.nix index b0857f17b8d4..3c699febe550 100644 --- a/pkgs/by-name/py/pyrefly/package.nix +++ b/pkgs/by-name/py/pyrefly/package.nix @@ -10,17 +10,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "pyrefly"; - version = "0.49.0"; + version = "0.50.0"; src = fetchFromGitHub { owner = "facebook"; repo = "pyrefly"; tag = finalAttrs.version; - hash = "sha256-r0KNzXZA02J9fYUI0oEoH188OemVzambC+GKlQaq5oU="; + hash = "sha256-F8r+kJx2nBwekeU2d2xLo+pggAzVWy0V0CV8Z0ZfLs8="; }; buildAndTestSubdir = "pyrefly"; - cargoHash = "sha256-nL703jB01JI7LILJKl4FiaRHNyjxNluZpQmJCTTzVdY="; + cargoHash = "sha256-vkqxRIbNEKJWNIIAMtny1XF6TSzV7KCpZPl+OCDEiPo="; buildInputs = [ rust-jemalloc-sys ]; diff --git a/pkgs/by-name/qr/qrrs/package.nix b/pkgs/by-name/qr/qrrs/package.nix index 5aec1bfd279f..057c507fd99b 100644 --- a/pkgs/by-name/qr/qrrs/package.nix +++ b/pkgs/by-name/qr/qrrs/package.nix @@ -6,16 +6,16 @@ }: rustPlatform.buildRustPackage rec { pname = "qrrs"; - version = "0.1.10"; + version = "0.1.11"; src = fetchFromGitHub { owner = "lenivaya"; repo = "qrrs"; rev = "v${version}"; - hash = "sha256-L8sqvLbh85b8Ds9EvXNkyGVXm8BF3ejFd8ZH7QoxJdU="; + hash = "sha256-lXfqKMJx9vtljQlYvbUAONFqMO3HKa4hx/29/YERw2U="; }; - cargoHash = "sha256-/aRr5UeGKGt+H9+C9MWcpMriPeIVEwp7xnigrUvMUiw="; + cargoHash = "sha256-blBZOnrKdNfq010b6u1NmTLY3W9Q2BjQAVbW+oNbDlE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ra/raysession/package.nix b/pkgs/by-name/ra/raysession/package.nix index 914be3150f61..8314bb5b85e0 100644 --- a/pkgs/by-name/ra/raysession/package.nix +++ b/pkgs/by-name/ra/raysession/package.nix @@ -54,7 +54,7 @@ python3Packages.buildPythonApplication rec { ]; postFixup = '' - wrapPythonProgramsIn "$out/share/raysession/src" "$out $pythonPath" + wrapPythonProgramsIn "$out/share/raysession/src" "$out ''${pythonPath[*]}" for file in $out/bin/*; do wrapQtApp "$file" done diff --git a/pkgs/by-name/re/redu/package.nix b/pkgs/by-name/re/redu/package.nix index 6d27b9b7a05a..153b264a1172 100644 --- a/pkgs/by-name/re/redu/package.nix +++ b/pkgs/by-name/re/redu/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "redu"; - version = "0.2.14"; + version = "0.2.15"; src = fetchFromGitHub { owner = "drdo"; repo = "redu"; tag = "v${finalAttrs.version}"; - hash = "sha256-E5itus0l1eENVWaSXUQHumxfo0ZMfSsguJuVSw0Uauk="; + hash = "sha256-ByXQ3tcvXbCUZwZ+e7WJVUUjvhMf0ivJJiswFlLap4I="; }; - cargoHash = "sha256-ZUA9zmWzPvyFmqQFW3ShnQRqG3TODN7K8Ex1jrOZxd0="; + cargoHash = "sha256-JnjXe2CHO9Namp++UI/V6ND2Y0/WQtaVA2EcUyXUnjQ="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/re/rescript-language-server/package.nix b/pkgs/by-name/re/rescript-language-server/package.nix index 71ea91149d41..143d0ffc0211 100644 --- a/pkgs/by-name/re/rescript-language-server/package.nix +++ b/pkgs/by-name/re/rescript-language-server/package.nix @@ -6,9 +6,10 @@ esbuild, nix-update-script, versionCheckHook, - rescript-editor-analysis, + vscode-extensions, }: let + inherit (vscode-extensions.chenglou92.rescript-vscode) rescript-editor-analysis; platformDir = if stdenv.hostPlatform.isLinux then "linux" diff --git a/pkgs/by-name/ro/roc/package.nix b/pkgs/by-name/ro/roc/package.nix index 687a63744e9c..db7bd4492e71 100755 --- a/pkgs/by-name/ro/roc/package.nix +++ b/pkgs/by-name/ro/roc/package.nix @@ -86,12 +86,12 @@ rustPlatform.buildRustPackage { checkPhase = lib.optionalString stdenv.isLinux '' runHook preCheck - NIX_GLIBC_PATH=${glibc.out}/lib NIX_LIBGCC_S_PATH=${stdenv.cc.cc.lib}/lib cargo test --release --workspace --exclude test_mono --exclude uitest -- --skip glue_cli_tests --skip test_snapshots + NIX_GLIBC_PATH=${glibc.out}/lib NIX_LIBGCC_S_PATH=${stdenv.cc.cc.lib}/lib cargo test --release --workspace --exclude test_mono --exclude uitest -- --skip=glue_cli_tests --skip=test_snapshots runHook postCheck '' + lib.optionalString (!stdenv.isLinux) '' runHook preCheck - cargo test --release --workspace --exclude test_mono --exclude uitest -- --skip glue_cli_tests --skip test_snapshots + cargo test --release --workspace --exclude test_mono --exclude uitest -- --skip=glue_cli_tests --skip=test_snapshots runHook postCheck ''; diff --git a/pkgs/by-name/ro/rofimoji/package.nix b/pkgs/by-name/ro/rofimoji/package.nix index aa7cca6eb539..f30040df2022 100644 --- a/pkgs/by-name/ro/rofimoji/package.nix +++ b/pkgs/by-name/ro/rofimoji/package.nix @@ -3,9 +3,10 @@ python3Packages, fetchFromGitHub, installShellFiles, + stdenv, - waylandSupport ? true, - x11Support ? true, + waylandSupport ? (!stdenv.hostPlatform.isDarwin), + x11Support ? (!stdenv.hostPlatform.isDarwin), wl-clipboard, wtype, @@ -60,7 +61,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/fdw/rofimoji"; changelog = "https://github.com/fdw/rofimoji/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.mit; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ justinlovinger ]; }; } diff --git a/pkgs/by-name/ru/rumdl/package.nix b/pkgs/by-name/ru/rumdl/package.nix index 58abb555c215..1449a2fc2e5f 100644 --- a/pkgs/by-name/ru/rumdl/package.nix +++ b/pkgs/by-name/ru/rumdl/package.nix @@ -9,26 +9,21 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rumdl"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "rvben"; repo = "rumdl"; tag = "v${finalAttrs.version}"; - hash = "sha256-cJRJVo/YoSst5NJXAZPJFhXFM6Fmqy/UfuOK2OGLi2o="; + hash = "sha256-8K+jZL/yo7ur5WD+5+L+ZHhFkhYo83brgD6Gg1Xo6js="; }; - cargoHash = "sha256-Y1KqqDGEjp2+0BwdAgooBjPOQtGbNDwwuXFH97XvXb4="; + cargoHash = "sha256-dpHV5+DJLsjwvLkxtXOS7CYUNKXW57o0O541pO8vN5U="; cargoBuildFlags = [ "--bin=rumdl" ]; - # Non-specific tests often fail on Darwin (especially aarch64-darwin), - # on both Hydra and GitHub-hosted runners, even with __darwinAllowLocalNetworking enabled. - # proptest fails frequently - doCheck = false; - nativeCheckInputs = [ gitMinimal ]; @@ -36,13 +31,8 @@ rustPlatform.buildRustPackage (finalAttrs: { useNextest = true; cargoTestFlags = [ - "--profile ci" - ]; - - checkFlags = [ - # Skip Windows tests - "--skip comprehensive_windows_tests" - "--skip windows_vscode_tests" + # Prefer the "smoke" profile over "ci" to exclude flaky tests: https://github.com/rvben/rumdl/pull/341 + "--profile smoke" ]; doInstallCheck = true; diff --git a/pkgs/by-name/sc/scala-cli/sources.json b/pkgs/by-name/sc/scala-cli/sources.json index 3097a1892d0e..df2afca2a53d 100644 --- a/pkgs/by-name/sc/scala-cli/sources.json +++ b/pkgs/by-name/sc/scala-cli/sources.json @@ -1,21 +1,21 @@ { - "version": "1.12.0", + "version": "1.12.1", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "1jax22azbc5v0dchw5hmv1kg3gb4aa9d886b2nlqirn96b60jayn" + "sha256": "10p8q6pf3yh286xlfw54mdsnydafm7fvzn64i7h9gn6avxkh5zc6" }, "aarch64-linux": { "asset": "scala-cli-aarch64-pc-linux.gz", - "sha256": "1hbx1vzc8x13zwv94cx0922279hcafc8aq30pvr0xc91345m5xv2" + "sha256": "096b2pzjww258xrdv5h2ni8p2jcal0y0n9j079pm7jlghsv1njw0" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "18p015h3v5ppcqdvh7vrkxnlyx9lbjdz27cmw0fypbdfc2p2gwqs" + "sha256": "1g27vrm38nmn1pa6jc5b5a0r003cmsy2p99h891mihf92w0pplnw" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "0cymryl1vv1vn7jqcrsy6n98gj3393q3n6mk6nxspmx94zrwdhia" + "sha256": "0vzl9l9xvf27h5c3320yg7rsab7cln8qjprjjwfba9qahl7jisjw" } } } diff --git a/pkgs/by-name/sh/sheldon/package.nix b/pkgs/by-name/sh/sheldon/package.nix index 43af10bad1e3..3bda66ec4afb 100644 --- a/pkgs/by-name/sh/sheldon/package.nix +++ b/pkgs/by-name/sh/sheldon/package.nix @@ -35,27 +35,27 @@ rustPlatform.buildRustPackage rec { # Needs network connection checkFlags = [ - "--skip lock::plugin::tests::external_plugin_lock_git_with_matches" - "--skip lock::plugin::tests::external_plugin_lock_git_with_matches_not_each" - "--skip lock::plugin::tests::external_plugin_lock_git_with_uses" - "--skip lock::plugin::tests::external_plugin_lock_remote" - "--skip lock::source::git::tests::git_checkout_resolve_branch" - "--skip lock::source::git::tests::git_checkout_resolve_rev" - "--skip lock::source::git::tests::git_checkout_resolve_tag" - "--skip lock::source::git::tests::lock_git_and_reinstall" - "--skip lock::source::git::tests::lock_git_https_with_checkout" - "--skip lock::source::local::tests::lock_local" - "--skip lock::source::remote::tests::lock_remote_and_reinstall" - "--skip lock::source::tests::lock_with_git" - "--skip lock::source::tests::lock_with_remote" - "--skip lock::tests::locked_config_clean" - "--skip directories_default" - "--skip directories_old" - "--skip directories_xdg_from_env" - "--skip lock_and_source_github" - "--skip lock_and_source_hooks" - "--skip lock_and_source_inline" - "--skip lock_and_source_profiles" + "--skip=lock::plugin::tests::external_plugin_lock_git_with_matches" + "--skip=lock::plugin::tests::external_plugin_lock_git_with_matches_not_each" + "--skip=lock::plugin::tests::external_plugin_lock_git_with_uses" + "--skip=lock::plugin::tests::external_plugin_lock_remote" + "--skip=lock::source::git::tests::git_checkout_resolve_branch" + "--skip=lock::source::git::tests::git_checkout_resolve_rev" + "--skip=lock::source::git::tests::git_checkout_resolve_tag" + "--skip=lock::source::git::tests::lock_git_and_reinstall" + "--skip=lock::source::git::tests::lock_git_https_with_checkout" + "--skip=lock::source::local::tests::lock_local" + "--skip=lock::source::remote::tests::lock_remote_and_reinstall" + "--skip=lock::source::tests::lock_with_git" + "--skip=lock::source::tests::lock_with_remote" + "--skip=lock::tests::locked_config_clean" + "--skip=directories_default" + "--skip=directories_old" + "--skip=directories_xdg_from_env" + "--skip=lock_and_source_github" + "--skip=lock_and_source_hooks" + "--skip=lock_and_source_inline" + "--skip=lock_and_source_profiles" ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' diff --git a/pkgs/by-name/si/siglo/package.nix b/pkgs/by-name/si/siglo/package.nix index e53f0f819ecc..5e75a8057335 100644 --- a/pkgs/by-name/si/siglo/package.nix +++ b/pkgs/by-name/si/siglo/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ]; preFixup = '' - buildPythonPath "$out $pythonPath" + buildPythonPath "$out ''${pythonPath[*]}" gappsWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH") ''; diff --git a/pkgs/by-name/si/sioyek/package.nix b/pkgs/by-name/si/sioyek/package.nix index 343b511b978b..f9d0a7a8b784 100644 --- a/pkgs/by-name/si/sioyek/package.nix +++ b/pkgs/by-name/si/sioyek/package.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "sioyek"; - version = "2.0.0-unstable-2025-12-19"; + version = "2.0.0-unstable-2026-01-23"; src = fetchFromGitHub { owner = "ahrm"; repo = "sioyek"; - rev = "ed389b9c3b3b9ee2c777b021c7825416c460ed64"; - hash = "sha256-bavnyTRNGVSuoxNVsn94AJfbddHYg9skkW/4G/ExNeU="; + rev = "70f998d013b418f34fbeb055b282730deeef2212"; + hash = "sha256-1dVIa2WVcR+PQ8xkEaps3YEWwMjnjcV7mBv0i2AzzAI="; }; buildInputs = [ diff --git a/pkgs/by-name/so/sourcepawn-studio/package.nix b/pkgs/by-name/so/sourcepawn-studio/package.nix index d0ad1266047d..04cb0fc52393 100644 --- a/pkgs/by-name/so/sourcepawn-studio/package.nix +++ b/pkgs/by-name/so/sourcepawn-studio/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { checkFlags = [ # requires rustup and rustfmt - "--skip tests::sourcegen::generate_node_kinds" + "--skip=tests::sourcegen::generate_node_kinds" ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sq/sqlfluff/package.nix b/pkgs/by-name/sq/sqlfluff/package.nix index 38bd3102085a..c0b18b15c760 100644 --- a/pkgs/by-name/sq/sqlfluff/package.nix +++ b/pkgs/by-name/sq/sqlfluff/package.nix @@ -5,23 +5,22 @@ versionCheckHook, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "sqlfluff"; - version = "3.5.0"; + version = "4.0.0"; pyproject = true; src = fetchFromGitHub { owner = "sqlfluff"; repo = "sqlfluff"; - tag = version; - hash = "sha256-fO4a1DCDM5RCeaPUHtPPGgTtZPRHOl9nuxbipDJZy7A="; + tag = finalAttrs.version; + hash = "sha256-hXiy3PGoBe6O9FaACN31Tss3xMBfiw4YuVLxbGi+/tA="; }; + pythonRelaxDeps = [ "click" ]; + build-system = with python3Packages; [ setuptools ]; - pythonRelaxDeps = [ - "click" - ]; dependencies = with python3Packages; [ appdirs cached-property @@ -47,6 +46,7 @@ python3Packages.buildPythonApplication rec { pytestCheckHook versionCheckHook ]; + versionCheckProgramArg = "--version"; disabledTestPaths = [ @@ -71,9 +71,9 @@ python3Packages.buildPythonApplication rec { meta = { description = "SQL linter and auto-formatter"; homepage = "https://www.sqlfluff.com/"; - changelog = "https://github.com/sqlfluff/sqlfluff/blob/${src.tag}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + changelog = "https://github.com/sqlfluff/sqlfluff/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "sqlfluff"; }; -} +}) diff --git a/pkgs/by-name/st/step-cli/package.nix b/pkgs/by-name/st/step-cli/package.nix index 0d6be886a07a..87f1e0f4062b 100644 --- a/pkgs/by-name/st/step-cli/package.nix +++ b/pkgs/by-name/st/step-cli/package.nix @@ -4,9 +4,11 @@ buildGoModule, fetchFromGitHub, installShellFiles, + openssl, + unixtools, }: let - version = "0.28.6"; + version = "0.29.0"; in buildGoModule { pname = "step-cli"; @@ -16,7 +18,7 @@ buildGoModule { owner = "smallstep"; repo = "cli"; tag = "v${version}"; - hash = "sha256-9tw/d6n6tzhBhBqizDG1dGhj8se9GF2DtrfYwwhvsLs="; + hash = "sha256-JUJeW9/m3fTaDfUublFDSQ3R5gT6Xvn97c5VokBvZ30="; # this file change depending on git branch status (via .gitattributes) # https://github.com/NixOS/nixpkgs/issues/84312 postFetch = '' @@ -33,11 +35,17 @@ buildGoModule { preCheck = '' # Tries to connect to smallstep.com rm command/certificate/remote_test.go + + patchShebangs integration/openssl-jwt.sh ''; - vendorHash = "sha256-+pHc2uBgQwMkJ7BTgHGHDPgfBpLlN0Yxf+6Enhb7cys="; + vendorHash = "sha256-0ZnuqyB2/fgfADCvYHj2o4PFwf0Btn6+GouXCPqzKmk="; nativeBuildInputs = [ installShellFiles ]; + nativeCheckInputs = [ + openssl + unixtools.xxd + ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd step \ diff --git a/pkgs/by-name/st/sticky/package.nix b/pkgs/by-name/st/sticky/package.nix index 56c03f2882e0..aaf20f4d3437 100644 --- a/pkgs/by-name/st/sticky/package.nix +++ b/pkgs/by-name/st/sticky/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ]; preFixup = '' - buildPythonPath "$out $pythonPath" + buildPythonPath "$out ''${pythonPath[*]}" gappsWrapperArgs+=( --prefix PYTHONPATH : "$program_PYTHONPATH" diff --git a/pkgs/by-name/su/supercell-wx/package.nix b/pkgs/by-name/su/supercell-wx/package.nix index 1f4f94076ee6..34e274c8c2c0 100644 --- a/pkgs/by-name/su/supercell-wx/package.nix +++ b/pkgs/by-name/su/supercell-wx/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + gcc14Stdenv, fetchFromGitHub, replaceVars, tracy, @@ -33,6 +34,8 @@ zlib, }: let + buildStdenv = if stdenv.cc.isGNU then gcc14Stdenv else stdenv; + gtestSkip = [ # Skip tests requiring network access "AwsLevel*DataProvider.FindKeyFixed" @@ -54,7 +57,7 @@ let "MarkerModelTest.*" ]; in -stdenv.mkDerivation (finalAttrs: { +buildStdenv.mkDerivation (finalAttrs: { pname = "supercell-wx"; version = "0.5.3"; diff --git a/pkgs/by-name/ta/tattoy/package.nix b/pkgs/by-name/ta/tattoy/package.nix index 1738d66ced11..c22678cb8163 100644 --- a/pkgs/by-name/ta/tattoy/package.nix +++ b/pkgs/by-name/ta/tattoy/package.nix @@ -40,16 +40,22 @@ rustPlatform.buildRustPackage (attrs: { watch ]; - checkFlags = [ - # e2e tests currently fail - # see https://github.com/tattoy-org/tattoy/pull/104/files for discussion - # re-enable after PR merged - "--skip e2e" - "--skip gpu" - ]; - useNextest = true; + checkFlags = + lib.concatMap + (t: [ + "--skip" + "${t}" + ]) + [ + # e2e tests currently fail + # see https://github.com/tattoy-org/tattoy/pull/104/files for discussion + # re-enable after PR merged + "e2e" + "gpu" + ]; + meta = { description = "Text-based compositor for modern terminals"; homepage = "https://github.com/tattoy-org/tattoy"; diff --git a/pkgs/by-name/te/teamtype/package.nix b/pkgs/by-name/te/teamtype/package.nix index 539f9a503049..e3cc9c0df571 100644 --- a/pkgs/by-name/te/teamtype/package.nix +++ b/pkgs/by-name/te/teamtype/package.nix @@ -9,18 +9,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "teamtype"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "teamtype"; repo = "teamtype"; tag = "v${finalAttrs.version}"; - hash = "sha256-B/4xR16cEG90fK12XQqjlpWzd6tyUVYXOBXK0j5fvNU="; + hash = "sha256-74MufpLTACkPevzOyaXw2Rr7S7VvaFEYHEyTQYwKVT8="; }; sourceRoot = "${finalAttrs.src.name}/daemon"; - cargoHash = "sha256-yuAk4SqYzNK1gD6lqVVDOyAJNq/NIf44DWdZ3aM/Q8s="; + cargoHash = "sha256-OIOffnCC9PlT/SXPOuTnKx3feZnkHP+jzbQIJWX0tzk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/tg/tg-archive/package.nix b/pkgs/by-name/tg/tg-archive/package.nix index d3971c3ca4ef..85218ba5ac96 100644 --- a/pkgs/by-name/tg/tg-archive/package.nix +++ b/pkgs/by-name/tg/tg-archive/package.nix @@ -6,7 +6,7 @@ let pname = "tg-archive"; - version = "1.3.0"; + version = "1.3.1"; in python3.pkgs.buildPythonApplication { @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication { owner = "knadh"; repo = "tg-archive"; tag = "v${version}"; - hash = "sha256-/b9LmHOyFqaKiQ5FHemLmg6DZU+3zzh1jLBEI7RTu4Q="; + hash = "sha256-GAy3dKkrrLO9IlRBUYaKxm4AswQK4cYUKIjezcBok/k="; }; pyproject = true; diff --git a/pkgs/by-name/tl/tldr/package.nix b/pkgs/by-name/tl/tldr/package.nix index d3ca9c8cd38b..5dce21705931 100644 --- a/pkgs/by-name/tl/tldr/package.nix +++ b/pkgs/by-name/tl/tldr/package.nix @@ -1,47 +1,42 @@ { - stdenv, lib, + stdenv, + python3Packages, fetchFromGitHub, installShellFiles, - python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "tldr"; - version = "3.3.0"; + version = "3.4.3"; pyproject = true; src = fetchFromGitHub { owner = "tldr-pages"; repo = "tldr-python-client"; - tag = version; - hash = "sha256-lc0Jen8vW4BNg784td1AZa2GTYvXC1d83FnAe5RZqpY="; + tag = finalAttrs.version; + hash = "sha256-YdVmgV7N67XswcGlUN1hhXpRXGMHhY34VBxfr7i/MBs="; }; build-system = with python3Packages; [ - setuptools - wheel + hatchling ]; dependencies = with python3Packages; [ termcolor - colorama shtab ]; nativeBuildInputs = [ installShellFiles ]; nativeCheckInputs = with python3Packages; [ - pytest + pytestCheckHook ]; - checkPhase = '' - runHook preCheck - pytest -k 'not test_error_message' - runHook postCheck - ''; - - doCheck = true; + disabledTests = [ + # Requires internet access + "test_error_message" + ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd tldr \ @@ -56,7 +51,7 @@ python3Packages.buildPythonApplication rec { through a man page for the correct flags. ''; homepage = "https://tldr.sh"; - changelog = "https://github.com/tldr-pages/tldr-python-client/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/tldr-pages/tldr-python-client/blob/${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ taeer @@ -65,4 +60,4 @@ python3Packages.buildPythonApplication rec { ]; mainProgram = "tldr"; }; -} +}) diff --git a/pkgs/by-name/tu/tuhi/package.nix b/pkgs/by-name/tu/tuhi/package.nix index afa77bd2f295..36b503e6e31c 100644 --- a/pkgs/by-name/tu/tuhi/package.nix +++ b/pkgs/by-name/tu/tuhi/package.nix @@ -62,7 +62,7 @@ python3Packages.buildPythonApplication rec { --replace "/usr/bin/env sh" "sh" ''; postFixup = '' - wrapPythonProgramsIn $out/libexec "$out $pythonPath" + wrapPythonProgramsIn $out/libexec "$out ''${pythonPath[*]}" ''; meta = { diff --git a/pkgs/by-name/ty/typescript-go/package.nix b/pkgs/by-name/ty/typescript-go/package.nix index 83ae24763093..90588477bcdc 100644 --- a/pkgs/by-name/ty/typescript-go/package.nix +++ b/pkgs/by-name/ty/typescript-go/package.nix @@ -10,13 +10,13 @@ let in buildGoModule { pname = "typescript-go"; - version = "0-unstable-2026-01-21"; + version = "0-unstable-2026-01-28"; src = fetchFromGitHub { owner = "microsoft"; repo = "typescript-go"; - rev = "01cac67dfdfcce7262431f282e6f515861897ed0"; - hash = "sha256-6Ukhujb0EVJr3PYVTuM3MKPMpzshMy1NphSsgXsHRgQ="; + rev = "463b6b461f23114073ccc0c4071a7f2a21477ac2"; + hash = "sha256-ozCm3O8ObaecE7TN7vYyeyjA3gGD8FprB93aJcDwSw0="; fetchSubmodules = false; }; diff --git a/pkgs/by-name/ul/ulfius/package.nix b/pkgs/by-name/ul/ulfius/package.nix index 7b44f35fcdbe..21542df0d6ad 100644 --- a/pkgs/by-name/ul/ulfius/package.nix +++ b/pkgs/by-name/ul/ulfius/package.nix @@ -2,7 +2,18 @@ lib, stdenv, fetchFromGitHub, + + withJson ? true, + withHttps ? true, + withWebsockets ? true, + withCurl ? true, + withLogger ? true, + withUwsc ? withWebsockets, # uwsc depends on websockets + + # nativeBuildInputs cmake, + + # Optional dependencies curl, gnutls, jansson, @@ -29,14 +40,24 @@ stdenv.mkDerivation (finalAttrs: { cmake ]; - buildInputs = [ - curl - gnutls - jansson + propagatedBuildInputs = [ libmicrohttpd orcania - yder - zlib + ] + ++ lib.optionals withJson [ jansson ] + ++ lib.optionals withCurl [ curl ] + ++ lib.optionals (withHttps || withWebsockets) [ gnutls ] + ++ lib.optionals withLogger [ yder ] + ++ lib.optionals withWebsockets [ zlib ]; + + cmakeFlags = [ + (lib.cmakeBool "WITH_CURL" withCurl) + (lib.cmakeBool "WITH_JANSSON" withJson) + (lib.cmakeBool "WITH_GNUTLS" (withHttps || withWebsockets)) + (lib.cmakeBool "WITH_YDER" withLogger) + (lib.cmakeBool "BUILD_UWSC" (withUwsc && withWebsockets)) + (lib.cmakeBool "WITH_WEBSOCKET" withWebsockets) + (lib.cmakeBool "WITH_WEBSOCKET_MESSAGE_LIST" withWebsockets) ]; meta = { @@ -45,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/babelouest/ulfius/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.lgpl21Only; maintainers = with lib.maintainers; [ drupol ]; - mainProgram = "uwsc"; platforms = lib.platforms.all; - }; + } + // lib.optionalAttrs (withUwsc && withWebsockets) { mainProgram = "uwsc"; }; }) diff --git a/pkgs/by-name/un/unrar-free/package.nix b/pkgs/by-name/un/unrar-free/package.nix index 550d83115bdf..4fe0e9d8d41c 100644 --- a/pkgs/by-name/un/unrar-free/package.nix +++ b/pkgs/by-name/un/unrar-free/package.nix @@ -1,21 +1,23 @@ { lib, stdenv, + argp-standalone, fetchFromGitLab, autoreconfHook, libarchive, pkg-config, + versionCheckHook, }: stdenv.mkDerivation (finalAttrs: { pname = "unrar-free"; - version = "0.3.1-unstable-2024-09-19"; + version = "0.3.3"; src = fetchFromGitLab { owner = "bgermann"; repo = "unrar-free"; - rev = "a7f9a157276ae68987fb44fe5ccf4f4255eb0a5e"; - hash = "sha256-aCO1vklG5MneEiqS/IBvC09YrvWa+OndfvCblDFKA1E="; + tag = finalAttrs.version; + hash = "sha256-3eI8vWc6E+gj+LwBG6jG1l8h8EXXcAQ44W0ALzwOOFg="; }; nativeBuildInputs = [ @@ -23,10 +25,20 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = [ libarchive ]; + buildInputs = [ + libarchive + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + argp-standalone + ]; + + env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-largp"; setupHook = ./setup-hook.sh; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + meta = { description = "Free utility to extract files from RAR archives"; longDescription = '' @@ -41,8 +53,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.com/bgermann/unrar-free"; license = lib.licenses.gpl2Plus; mainProgram = "unrar-free"; - maintainers = with lib.maintainers; [ thiagokokada ]; + maintainers = with lib.maintainers; [ + anthonyroussel + thiagokokada + ]; platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/by-name/up/upsun/versions.json b/pkgs/by-name/up/upsun/versions.json index fc3506cc4d12..9c1debd7b395 100644 --- a/pkgs/by-name/up/upsun/versions.json +++ b/pkgs/by-name/up/upsun/versions.json @@ -1,19 +1,19 @@ { - "version": "5.8.0", + "version": "5.9.0", "darwin-amd64": { - "hash": "sha256-2nPuxOHrCa0j2HMYV8yeKfsRQOFdksp6KNQVQmSiS4I=", - "url": "https://github.com/platformsh/cli/releases/download/5.8.0/upsun_5.8.0_darwin_all.tar.gz" + "hash": "sha256-B1F+01ltzErGujECC1CM8tPRuVMUOIkcKSpypqlRG2M=", + "url": "https://github.com/platformsh/cli/releases/download/5.9.0/upsun_5.9.0_darwin_all.tar.gz" }, "darwin-arm64": { - "hash": "sha256-2nPuxOHrCa0j2HMYV8yeKfsRQOFdksp6KNQVQmSiS4I=", - "url": "https://github.com/platformsh/cli/releases/download/5.8.0/upsun_5.8.0_darwin_all.tar.gz" + "hash": "sha256-B1F+01ltzErGujECC1CM8tPRuVMUOIkcKSpypqlRG2M=", + "url": "https://github.com/platformsh/cli/releases/download/5.9.0/upsun_5.9.0_darwin_all.tar.gz" }, "linux-amd64": { - "hash": "sha256-9t4dktUu0u3+bUuYLlhfUOyHbfIizLeOUj7AXQ0VQGI=", - "url": "https://github.com/platformsh/cli/releases/download/5.8.0/upsun_5.8.0_linux_amd64.tar.gz" + "hash": "sha256-J8A4h39dEgMAJHKLwmgWBsj4Al9STIccUAal6JctPyQ=", + "url": "https://github.com/platformsh/cli/releases/download/5.9.0/upsun_5.9.0_linux_amd64.tar.gz" }, "linux-arm64": { - "hash": "sha256-8p1SUUuwaSLbt6j+tjcefom08dyW0NW/F2uxDMWaiv4=", - "url": "https://github.com/platformsh/cli/releases/download/5.8.0/upsun_5.8.0_linux_arm64.tar.gz" + "hash": "sha256-gyVqD4cBYo6L1Y0xMLl06WK4/sKvudFXLiqvEmcrRPE=", + "url": "https://github.com/platformsh/cli/releases/download/5.9.0/upsun_5.9.0_linux_arm64.tar.gz" } } diff --git a/pkgs/by-name/us/usb-modeswitch/data.nix b/pkgs/by-name/us/usb-modeswitch-data/package.nix similarity index 100% rename from pkgs/by-name/us/usb-modeswitch/data.nix rename to pkgs/by-name/us/usb-modeswitch-data/package.nix diff --git a/pkgs/by-name/uu/uutils-hostname/package.nix b/pkgs/by-name/uu/uutils-hostname/package.nix index f9de647f54b9..8d4b85bf4b76 100644 --- a/pkgs/by-name/uu/uutils-hostname/package.nix +++ b/pkgs/by-name/uu/uutils-hostname/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uutils-hostname"; - version = "0.0.1-unstable-2026-01-08"; + version = "0-unstable-2026-01-28"; src = fetchFromGitHub { owner = "uutils"; repo = "hostname"; - rev = "a5590e823e2cb488ad14f61dee92e04cb4dc2704"; - hash = "sha256-nWRkqONxbSwhphULpM+m14H/DSPmM4XdLJ7q2D4kooo="; + rev = "99bba3d33b03da1ff7d961d542ad5804d007b76c"; + hash = "sha256-f5LTvSsBsFbK9+MMiJQRvY2ze1t4qE2mEUsV0+2oO9A="; }; - cargoHash = "sha256-1H4h01IqLVZrXNjnI36lGgsmg8rxHDAn9sbuvUxqPEQ="; + cargoHash = "sha256-nbpyflP4J6V6aEeCp5I+FP2NNmXDS4JhbGWUBbOyJEc="; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; diff --git a/pkgs/by-name/uu/uutils-login/package.nix b/pkgs/by-name/uu/uutils-login/package.nix index c1bb42b59a8a..477bf720ca41 100644 --- a/pkgs/by-name/uu/uutils-login/package.nix +++ b/pkgs/by-name/uu/uutils-login/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uutils-login"; - version = "0.0.1-unstable-2026-01-08"; + version = "0-unstable-2026-01-28"; src = fetchFromGitHub { owner = "uutils"; repo = "login"; - rev = "24c158ef78ef8e769337a91c563223a1bf1b58a7"; - hash = "sha256-1pJhFtY3zJTDIKX9SXuv3yfrvPMNCiC/b7WKdBU1Nqk="; + rev = "ec2c270122a4fdb5f7cae5d8ff5ae9c66018fb69"; + hash = "sha256-LqlxsztC+9XgCqErtTLt7lYcBKz9Ht7pvWLclptW834="; }; - cargoHash = "sha256-V0Cb3Vz3MpVxqaHpIxrfYD+EAjjQ0jKI9Qc6pN13deg="; + cargoHash = "sha256-1Ph+vJeRTWYTfj2Qu74T7L8GpT1PiI1GKyOHTwo0HXA="; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; diff --git a/pkgs/by-name/uu/uutils-tar/package.nix b/pkgs/by-name/uu/uutils-tar/package.nix index 31a8d514bc64..7e296e5dd65b 100644 --- a/pkgs/by-name/uu/uutils-tar/package.nix +++ b/pkgs/by-name/uu/uutils-tar/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uutils-tar"; - version = "0.0.1-unstable-2026-01-08"; + version = "0-unstable-2026-01-28"; src = fetchFromGitHub { owner = "uutils"; repo = "tar"; - rev = "a73ac381d8fd78f8cb05236d26edfdae37a80ee3"; - hash = "sha256-b8Nzp5zZuULH5YkCexVOPxioPiuauGL4+KarBAdVAd4="; + rev = "113912e981c979efb95b4112d218563fa0ef6329"; + hash = "sha256-ZNK3dpdJx4L8un35LQPZgtXiPC6hcOTFIJ26YKAqSNg="; }; - cargoHash = "sha256-UFRe+dBQhsV91tenZY4uqw9gs4ZqbYDtvBeA98dk3po="; + cargoHash = "sha256-cpYhIH6aYaWCcD8IA4iYuHMrcDCkLvkiwkwPc+UJw3g="; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 1a3f5a6bfd40..c0c96583bde9 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uv"; - version = "0.9.26"; + version = "0.9.27"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-qvfMB62/0Hvc7m5h+QitvUcS6YZWAV1uGPg8JpCKPNU="; + hash = "sha256-2ArneGmQZhEcFlPm5hlQkHR8wnok7bEzTYBkeR+Gk6U="; }; - cargoHash = "sha256-3ncKhauappl1MR3EG1bwYVrwhM7gCFRcRyRvYrsDaok="; + cargoHash = "sha256-Qx1oEqmYVpf2M36dsDCIn+xbkjkxlcAHCC+Vlokybf0="; buildInputs = [ rust-jemalloc-sys diff --git a/pkgs/by-name/va/vanillatd/package.nix b/pkgs/by-name/va/vanillatd/package.nix index 5d5ccf4b8147..7cff83871c5a 100644 --- a/pkgs/by-name/va/vanillatd/package.nix +++ b/pkgs/by-name/va/vanillatd/package.nix @@ -24,7 +24,7 @@ symlinkJoin, rsync, - appName, + appName ? "vanillatd", CMAKE_BUILD_TYPE ? "RelWithDebInfo", # "Choose the type of build, recommended options are: Debug Release RelWithDebInfo" }: assert lib.assertOneOf "appName" appName [ diff --git a/pkgs/by-name/vj/vja/package.nix b/pkgs/by-name/vj/vja/package.nix index 65c683a25c8f..fe98be476726 100644 --- a/pkgs/by-name/vj/vja/package.nix +++ b/pkgs/by-name/vj/vja/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "vja"; - version = "4.10.1"; + version = "5.0.0"; pyproject = true; src = fetchFromGitLab { owner = "ce72"; repo = "vja"; tag = version; - hash = "sha256-J2GX0t7hPLqqI2n8H0kDboGfpRff3+lHM3026fTX5rs="; + hash = "sha256-ny0ZKsAwjHgN/8XBewYRiKt3YK3XyKshmJVQsKJrwog="; }; build-system = [ diff --git a/pkgs/by-name/vt/vtfedit/package.nix b/pkgs/by-name/vt/vtfedit/package.nix index f222b329cc13..525eaf3ec79a 100644 --- a/pkgs/by-name/vt/vtfedit/package.nix +++ b/pkgs/by-name/vt/vtfedit/package.nix @@ -7,10 +7,12 @@ copyDesktopItems, makeWrapper, - wine, + wineWowPackages, winetricks, }: - +let + wine = wineWowPackages.staging; +in stdenv.mkDerivation rec { pname = "vtfedit"; version = "1.3.3"; diff --git a/pkgs/by-name/we/websurfx/package.nix b/pkgs/by-name/we/websurfx/package.nix index 4c24e97cc2e3..de317949693f 100644 --- a/pkgs/by-name/we/websurfx/package.nix +++ b/pkgs/by-name/we/websurfx/package.nix @@ -6,7 +6,7 @@ pkg-config, }: let - version = "1.24.35"; + version = "1.24.36"; in rustPlatform.buildRustPackage { pname = "websurfx"; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage { owner = "neon-mmd"; repo = "websurfx"; tag = "v${version}"; - hash = "sha256-qf8RU7cNHzXSjyzlRtHxuoxGlkSWNYTmYu/Z0hiqQpc="; + hash = "sha256-Iw/wG6IKp+KdBVhmC/wVU55h9B/Ew8qrb4ZrMfVF+Ic="; }; nativeBuildInputs = [ @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage { openssl ]; - cargoHash = "sha256-A9Cg9zZ4FNTTdA+oIvxVH2D2627t+mhNLnRKDsVeKb8="; + cargoHash = "sha256-S8XGsOfYK1Ua2rCt7kKyLKXMXs1G1G7M6kqJ9UcdBjc="; postPatch = '' substituteInPlace src/handler.rs \ diff --git a/pkgs/by-name/we/wechat/package.nix b/pkgs/by-name/we/wechat/package.nix index ed0298af3de3..aa1005ff20f2 100644 --- a/pkgs/by-name/we/wechat/package.nix +++ b/pkgs/by-name/we/wechat/package.nix @@ -30,14 +30,14 @@ let # https://dldir1.qq.com/weixin/mac/mac-release.xml any-darwin = let - version = "4.1.6.47-33480"; + version = "4.1.7.30-34346"; version' = lib.replaceString "-" "_" version; in { inherit version; src = fetchurl { url = "https://dldir1v6.qq.com/weixin/Universal/Mac/xWeChatMac_universal_${version'}.dmg"; - hash = "sha256-oEaMi1O6zdCIxPHQt61QYLQMqO+GAFO5d+zHUuJUk9U="; + hash = "sha256-/QbIkJ83EFCUBbmFUnY8aBbjPP9B5yw8qmRbhXxSwYE="; }; }; in diff --git a/pkgs/by-name/wi/wike/package.nix b/pkgs/by-name/wi/wike/package.nix index b01cd436151a..5410baeb5dab 100644 --- a/pkgs/by-name/wi/wike/package.nix +++ b/pkgs/by-name/wi/wike/package.nix @@ -60,7 +60,7 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; postFixup = '' - wrapPythonProgramsIn "$out/share/wike" "$out $pythonPath" + wrapPythonProgramsIn "$out/share/wike" "$out ''${pythonPath[*]}" ''; passthru = { diff --git a/pkgs/by-name/wi/wiremix/package.nix b/pkgs/by-name/wi/wiremix/package.nix index bf92c32a7d0e..3fb9751d0a59 100644 --- a/pkgs/by-name/wi/wiremix/package.nix +++ b/pkgs/by-name/wi/wiremix/package.nix @@ -8,14 +8,14 @@ rustPlatform.buildRustPackage rec { pname = "wiremix"; - version = "0.8.0"; + version = "0.9.0"; src = fetchCrate { inherit pname version; - hash = "sha256-wBE7gYR2fVbSc9NA8IGI2SGJwMACoPi1NTTdGq4UVF8="; + hash = "sha256-gs6KqluASHTf4fURZKEmNvERguQEH5UDc4044uJddrU="; }; - cargoHash = "sha256-0O8Oe4EppvvFIF9e0MzNSAGp0ZmnW3wr8DHw7G00UWY="; + cargoHash = "sha256-WqC+JVjE0zxvn9/64eGmMIwSqIBXj/OsEmvUHnGKEkA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/wr/wrangler/package.nix b/pkgs/by-name/wr/wrangler/package.nix index 745040d45a32..983d6c33ec1f 100644 --- a/pkgs/by-name/wr/wrangler/package.nix +++ b/pkgs/by-name/wr/wrangler/package.nix @@ -19,13 +19,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "wrangler"; - version = "4.60.0"; + version = "4.61.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "workers-sdk"; rev = "wrangler@${finalAttrs.version}"; - hash = "sha256-lRdQrUgEr7KS/05BXZW7h3JS91d3gM8w+RLlaLC98RU="; + hash = "sha256-mNJPb66q0+UvcBpNBhqdZN2X5BKCBTXrWSWUgkjYS80="; }; pnpmDeps = fetchPnpmDeps { @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { ; pnpm = pnpm_9; fetcherVersion = 2; - hash = "sha256-r3J4xNZJlWmNtnpLfx/eKK3TDKcrjZmR7oxp6TDuwxg="; + hash = "sha256-cwvAlqyglMSrPW/YIdV01VkT6LMQenFrjCXZmrcg954="; }; # pnpm packageManager version in workers-sdk root package.json may not match nixpkgs postPatch = '' diff --git a/pkgs/by-name/wt/wttrbar/package.nix b/pkgs/by-name/wt/wttrbar/package.nix index b9a41a5055d9..a7b3d12f4c67 100644 --- a/pkgs/by-name/wt/wttrbar/package.nix +++ b/pkgs/by-name/wt/wttrbar/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "wttrbar"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "bjesus"; repo = "wttrbar"; tag = finalAttrs.version; - hash = "sha256-TDjEIrxFkh6d0x89LxaiarsP0BIzP5+rxu3YCdXIQ2U="; + hash = "sha256-tOsyPBpZaotlwzV1atW9FnfFbemtR3v51cg7UFIwI6U="; }; - cargoHash = "sha256-yiShp9k5oiGAtj59jGDEFsQKujDFajO+Nwq0bLh/PtA="; + cargoHash = "sha256-C1PkpKYsb62s6H4VgRSo7WzHFBaUv1Yk6IXm9ep20p8="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/wv/wvkbd/package.nix b/pkgs/by-name/wv/wvkbd/package.nix index f7023d52f5fe..387f0be4cbdf 100644 --- a/pkgs/by-name/wv/wvkbd/package.nix +++ b/pkgs/by-name/wv/wvkbd/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "wvkbd"; - version = "0.19"; + version = "0.19.2"; src = fetchFromGitHub { owner = "jjsullivan5196"; repo = "wvkbd"; tag = "v${version}"; - hash = "sha256-oaySfijJBzD+tsaNMmXQ168un9Z0IMwN+7sxAmVr3xs="; + hash = "sha256-PHbgARSy2Zlr1dgzuUFbPxtqFvOYoayMK9vGLR6yaTA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/xe/xen/package.nix b/pkgs/by-name/xe/xen/package.nix index 9b1dd141fd73..934a9af7caa7 100644 --- a/pkgs/by-name/xe/xen/package.nix +++ b/pkgs/by-name/xe/xen/package.nix @@ -329,7 +329,7 @@ stdenv.mkDerivation (finalAttrs: { # We also need to wrap pygrub, which lies in $out/libexec/xen/bin. '' wrapPythonPrograms - wrapPythonProgramsIn "$out/libexec/xen/bin" "$out $pythonPath" + wrapPythonProgramsIn "$out/libexec/xen/bin" "$out ''${pythonPath[*]}" ''; postFixup = '' diff --git a/pkgs/by-name/xf/xfce4-dockbarx-plugin/package.nix b/pkgs/by-name/xf/xfce4-dockbarx-plugin/package.nix index a20c8f3a9e60..581f39005fa6 100644 --- a/pkgs/by-name/xf/xfce4-dockbarx-plugin/package.nix +++ b/pkgs/by-name/xf/xfce4-dockbarx-plugin/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { postFixup = '' makeWrapperArgs+=("''${gappsWrapperArgs[@]}") chmod +x $out/share/dockbarx/xfce4-panel-plug - wrapPythonProgramsIn "$out/share/dockbarx" "$out $pythonPath" + wrapPythonProgramsIn "$out/share/dockbarx" "$out ''${pythonPath[*]}" ''; meta = { diff --git a/pkgs/by-name/xt/xtf/package.nix b/pkgs/by-name/xt/xtf/package.nix index 80fc617684a6..8102cea82101 100644 --- a/pkgs/by-name/xt/xtf/package.nix +++ b/pkgs/by-name/xt/xtf/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation { # This is necessary because the real xtf-runner should # be in the same directory as the tests/ directory. + '' - wrapPythonProgramsIn "''${!outputBin}/share/xtf" "''${!outputBin} $pythonPath" + wrapPythonProgramsIn "''${!outputBin}/share/xtf" "''${!outputBin} ''${pythonPath[*]}" mkdir -p ''${!outputBin}/bin ln -s ''${!outputBin}/share/xtf/xtf-runner ''${!outputBin}/bin/xtf-runner ''; diff --git a/pkgs/by-name/xw/xwin/package.nix b/pkgs/by-name/xw/xwin/package.nix index 210f71b342f3..d1cf0bcb63ad 100644 --- a/pkgs/by-name/xw/xwin/package.nix +++ b/pkgs/by-name/xw/xwin/package.nix @@ -36,8 +36,8 @@ rustPlatform.buildRustPackage (finalAttrs: { doCheck = true; # Requires network access checkFlags = [ - "--skip verify_compiles" - "--skip verify_deterministic" + "--skip=verify_compiles" + "--skip=verify_deterministic" ]; doInstallCheck = true; diff --git a/pkgs/by-name/ya/yaralyzer/package.nix b/pkgs/by-name/ya/yaralyzer/package.nix index a14e39ae1404..8484eb40fd9b 100644 --- a/pkgs/by-name/ya/yaralyzer/package.nix +++ b/pkgs/by-name/ya/yaralyzer/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "yaralyzer"; - version = "1.0.14"; + version = "1.3.10"; pyproject = true; src = fetchFromGitHub { owner = "michelcrypt4d4mus"; repo = "yaralyzer"; tag = "v${finalAttrs.version}"; - hash = "sha256-MhfZ/8JJaWDiDVUA4av32LzqfQmJr9L9x6AdCU0jo2c="; + hash = "sha256-OhZ1TG1dqxlUoW+OI+BFn0LsujLytqg6L7aNdYnfRPQ="; }; build-system = with python3.pkgs; [ poetry-core ]; diff --git a/pkgs/by-name/za/zapzap/package.nix b/pkgs/by-name/za/zapzap/package.nix index 3f66e0c4d7a1..2abe48e3b903 100644 --- a/pkgs/by-name/za/zapzap/package.nix +++ b/pkgs/by-name/za/zapzap/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "zapzap"; - version = "6.2.7"; + version = "6.2.8"; pyproject = true; src = fetchFromGitHub { owner = "rafatosta"; repo = "zapzap"; tag = version; - hash = "sha256-CCCQOkoTMk718DSuArt5CoooOfGb/8uYVsAkqHmCFj0="; + hash = "sha256-GV2Z1ZhcrCUCoOyc68oXKslVdQqIsXRiAI+w+hQIj5o="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index d12ccac8c903..f3d33f9322fa 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -106,7 +106,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.220.6"; + version = "0.221.4"; outputs = [ "out" @@ -119,7 +119,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-jwSh2QkQpShDvTurJPPvt4khGaNQmoVbJyiLcccp2PU="; + hash = "sha256-Uiwfs80eCjbd/rnXkOmv85NY05XeY9Qu0vf8I+cDElo="; }; postPatch = '' @@ -139,7 +139,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rm -r $out/git/*/candle-book/ ''; - cargoHash = "sha256-KWsxxAPz1BoO/fKiRG6cpXB8IBGC+n4ZdommcTauXdQ="; + cargoHash = "sha256-kwV6tejCUwkFLdBCClm/AOxTieSUXnE/dP2UERlLv7U="; nativeBuildInputs = [ cmake diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index 337096fb279a..0bb30250b8ff 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { ]; postFixup = '' - buildPythonPath "$pythonPath" + buildPythonPath "''${pythonPath[*]}" patchPythonScript $out/lib/pluma/plugins/snippets/Snippet.py ''; diff --git a/pkgs/development/compilers/llvm/common/clang-tools/wrapper b/pkgs/development/compilers/llvm/common/clang-tools/wrapper index fa74a18b3c9f..bfd1da73cf61 100755 --- a/pkgs/development/compilers/llvm/common/clang-tools/wrapper +++ b/pkgs/development/compilers/llvm/common/clang-tools/wrapper @@ -1,6 +1,24 @@ #!/bin/sh buildcpath() { + local path after + while (( $# )); do + case $1 in + -isystem) + shift + path=$path${path:+':'}$1 + ;; + -idirafter) + shift + after=$after${after:+':'}$1 + ;; + esac + shift + done + echo $path${after:+':'}$after +} + +buildcpluspath() { local path after while (( $# )); do case $1 in @@ -29,12 +47,12 @@ for arg in "$@"; do done if [ "$extendcpath" = true ]; then - export CPATH=${CPATH}${CPATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \ - $(<@clang@/nix-support/libc-cflags)) + export C_INCLUDE_PATH=${CPATH}${CPATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \ + $(<@clang@/nix-support/libc-cflags)) - export CPLUS_INCLUDE_PATH=${CPLUS_INCLUDE_PATH}${CPLUS_INCLUDE_PATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \ - $(<@clang@/nix-support/libcxx-cxxflags) \ - $(<@clang@/nix-support/libc-cflags)) + export CPLUS_INCLUDE_PATH=${CPLUS_INCLUDE_PATH}${CPLUS_INCLUDE_PATH:+':'}$(buildcpluspath ${NIX_CFLAGS_COMPILE} \ + $(<@clang@/nix-support/libcxx-cxxflags) \ + $(<@clang@/nix-support/libc-cflags)) fi @out@/bin/$(basename $0)-unwrapped "$@" diff --git a/pkgs/development/compilers/openjdk/25/source.json b/pkgs/development/compilers/openjdk/25/source.json index 26056e281d80..8b5ae1c9057e 100644 --- a/pkgs/development/compilers/openjdk/25/source.json +++ b/pkgs/development/compilers/openjdk/25/source.json @@ -1,6 +1,6 @@ { - "hash": "sha256-t5eUiWhAst3Aa16YVx7sMaHK6BHwLWyvxGfTq0C+Z4M=", + "hash": "sha256-MtvWyxN+4Dhv/VWYIYB0eH4LrsdvfGxoW3hkpikZSg0=", "owner": "openjdk", "repo": "jdk25u", - "rev": "refs/tags/jdk-25.0.1+8" + "rev": "refs/tags/jdk-25.0.2+10" } diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0342841c315d..a50b965a1bd5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -705,10 +705,14 @@ with haskellLib; hash = "sha256-feGEuALVJ0Zl8zJPIfgEFry9eH/MxA0Aw7zlDq0PC/s="; }) super.algebraic-graphs; - # Relies on DWARF <-> register mappings in GHC, not available for every arch & ABI - # (check dwarfReturnRegNo in compiler/GHC/CmmToAsm/Dwarf/Constants.hs, that's where ppc64 elfv1 gives up) inspection-testing = overrideCabal (drv: { - broken = with pkgs.stdenv.hostPlatform; !(isx86 || (isPower64 && isAbiElfv2) || isAarch64); + broken = + with pkgs.stdenv.hostPlatform; + # Relies on DWARF <-> register mappings in GHC, not available for every arch & ABI + # (check dwarfReturnRegNo in compiler/GHC/CmmToAsm/Dwarf/Constants.hs, that's where ppc64 elfv1 gives up) + !(isx86 || (isPower64 && isAbiElfv2) || isAarch64) + # We compile static with -fexternal-interpreter which is incompatible with plugins + || (isStatic && lib.versionAtLeast self.ghc.version "9.10"); }) super.inspection-testing; # Too strict bounds on filepath, hpsec, tasty, tasty-quickcheck, transformers diff --git a/pkgs/development/libraries/boost/1.90.nix b/pkgs/development/libraries/boost/1.90.nix new file mode 100644 index 000000000000..27069ab5ae0b --- /dev/null +++ b/pkgs/development/libraries/boost/1.90.nix @@ -0,0 +1,19 @@ +{ callPackage, fetchurl, ... }@args: + +callPackage ./generic.nix ( + args + // rec { + version = "1.90.0"; + + src = fetchurl { + urls = [ + "mirror://sourceforge/boost/boost_${builtins.replaceStrings [ "." ] [ "_" ] version}.tar.bz2" + "https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${ + builtins.replaceStrings [ "." ] [ "_" ] version + }.tar.bz2" + ]; + # SHA256 from http://www.boost.org/users/history/version_1_90_0.html + sha256 = "49551aff3b22cbc5c5a9ed3dbc92f0e23ea50a0f7325b0d198b705e8ee3fc305"; + }; + } +) diff --git a/pkgs/development/libraries/boost/default.nix b/pkgs/development/libraries/boost/default.nix index db7a48fc3aa5..87449ec03aa0 100644 --- a/pkgs/development/libraries/boost/default.nix +++ b/pkgs/development/libraries/boost/default.nix @@ -31,4 +31,5 @@ in boost187 = makeBoost ./1.87.nix; boost188 = makeBoost ./1.88.nix; boost189 = makeBoost ./1.89.nix; + boost190 = makeBoost ./1.90.nix; } diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 3ce6b0acb111..b4aff30cb3c0 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -429,8 +429,8 @@ in }; openssl_3 = common { - version = "3.0.18"; - hash = "sha256-2Aw09c+QLczx8bXfXruG0DkuNwSeXXPfGzq65y5P/os="; + version = "3.0.19"; + hash = "sha256-+lpBQ7iq4YvlPvLzyvKaLgdHQwuLx00y2IM1uUq2MHI="; patches = [ # Support for NIX_SSL_CERT_FILE, motivation: diff --git a/pkgs/development/libraries/openssl/use-etc-ssl-certs-darwin.patch b/pkgs/development/libraries/openssl/use-etc-ssl-certs-darwin.patch index 2c98ccfa7ed0..1699cbfb20e5 100644 --- a/pkgs/development/libraries/openssl/use-etc-ssl-certs-darwin.patch +++ b/pkgs/development/libraries/openssl/use-etc-ssl-certs-darwin.patch @@ -3,11 +3,11 @@ index 329ef62..9a8df64 100644 --- a/include/internal/cryptlib.h +++ b/include/internal/cryptlib.h @@ -56,7 +56,7 @@ DEFINE_LHASH_OF(MEM); - # ifndef OPENSSL_SYS_VMS - # define X509_CERT_AREA OPENSSLDIR - # define X509_CERT_DIR OPENSSLDIR "/certs" --# define X509_CERT_FILE OPENSSLDIR "/cert.pem" -+# define X509_CERT_FILE "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt" - # define X509_PRIVATE_DIR OPENSSLDIR "/private" - # define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf" - # else + #ifndef OPENSSL_SYS_VMS + #define X509_CERT_AREA OPENSSLDIR + #define X509_CERT_DIR OPENSSLDIR "/certs" +-#define X509_CERT_FILE OPENSSLDIR "/cert.pem" ++#define X509_CERT_FILE "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt" + #define X509_PRIVATE_DIR OPENSSLDIR "/private" + #define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf" + #else diff --git a/pkgs/development/libraries/openssl/use-etc-ssl-certs.patch b/pkgs/development/libraries/openssl/use-etc-ssl-certs.patch index 67d199681f96..7750efbe0083 100644 --- a/pkgs/development/libraries/openssl/use-etc-ssl-certs.patch +++ b/pkgs/development/libraries/openssl/use-etc-ssl-certs.patch @@ -3,11 +3,11 @@ index 329ef62..9a8df64 100644 --- a/include/internal/cryptlib.h +++ b/include/internal/cryptlib.h @@ -56,7 +56,7 @@ DEFINE_LHASH_OF(MEM); - # ifndef OPENSSL_SYS_VMS - # define X509_CERT_AREA OPENSSLDIR - # define X509_CERT_DIR OPENSSLDIR "/certs" --# define X509_CERT_FILE OPENSSLDIR "/cert.pem" -+# define X509_CERT_FILE "/etc/ssl/certs/ca-certificates.crt" - # define X509_PRIVATE_DIR OPENSSLDIR "/private" - # define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf" - # else + #ifndef OPENSSL_SYS_VMS + #define X509_CERT_AREA OPENSSLDIR + #define X509_CERT_DIR OPENSSLDIR "/certs" +-#define X509_CERT_FILE OPENSSLDIR "/cert.pem" ++#define X509_CERT_FILE "/etc/ssl/certs/ca-certificates.crt" + #define X509_PRIVATE_DIR OPENSSLDIR "/private" + #define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf" + #else diff --git a/pkgs/development/libraries/qodeassist-plugin/default.nix b/pkgs/development/libraries/qodeassist-plugin/default.nix index 7db16e90f0a7..d4439ec2602e 100644 --- a/pkgs/development/libraries/qodeassist-plugin/default.nix +++ b/pkgs/development/libraries/qodeassist-plugin/default.nix @@ -17,13 +17,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "qodeassist-plugin"; - version = "0.9.8"; + version = "0.9.9"; src = fetchFromGitHub { owner = "Palm1r"; repo = "QodeAssist"; tag = "v${finalAttrs.version}"; - hash = "sha256-1Lr46N/M4SXpHjY/HLIz33IRf3C6MIyMF9lCyaJ17Uc="; + hash = "sha256-qxXlWgi/iKHPYzHzGsnrbEZKmcai30PeW6q2Lw8BE8k="; }; dontWrapQtApps = true; diff --git a/pkgs/development/ocaml-modules/eio/default.nix b/pkgs/development/ocaml-modules/eio/default.nix index f9714ee8fbf1..d666f11d4b45 100644 --- a/pkgs/development/ocaml-modules/eio/default.nix +++ b/pkgs/development/ocaml-modules/eio/default.nix @@ -42,13 +42,13 @@ let } ."${version}"; in -buildDunePackage rec { +buildDunePackage { pname = "eio"; inherit version; inherit (param) minimalOCamlVersion; src = fetchurl { - url = "https://github.com/ocaml-multicore/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + url = "https://github.com/ocaml-multicore/eio/releases/download/v${version}/eio-${version}.tbz"; inherit (param) hash; }; @@ -75,8 +75,8 @@ buildDunePackage rec { ]; meta = { - homepage = "https://github.com/ocaml-multicore/${pname}"; - changelog = "https://github.com/ocaml-multicore/${pname}/raw/v${version}/CHANGES.md"; + homepage = "https://github.com/ocaml-multicore/eio"; + changelog = "https://github.com/ocaml-multicore/eio/raw/v${version}/CHANGES.md"; description = "Effects-Based Parallel IO for OCaml"; license = with lib.licenses; [ isc ]; maintainers = with lib.maintainers; [ toastal ]; diff --git a/pkgs/development/php-packages/imagick/default.nix b/pkgs/development/php-packages/imagick/default.nix index f3ed1d1d8e73..bea439c59417 100644 --- a/pkgs/development/php-packages/imagick/default.nix +++ b/pkgs/development/php-packages/imagick/default.nix @@ -11,8 +11,8 @@ buildPecl { pname = "imagick"; - version = "3.8.0"; - sha256 = "sha256-vaZ0YchU8g1hBXgrdpxST8NziLddRIHZUWRNIWf/7sY="; + version = "3.8.1"; + sha256 = "sha256-OjWHwKUkwX0NrZZzoWC5DNd26DaDhHThc7VJ7YZDUu4="; configureFlags = [ "--with-imagick=${imagemagick.dev}" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/aioboto3/boto3-compat.patch b/pkgs/development/python-modules/aioboto3/boto3-compat.patch deleted file mode 100644 index 7f4b2272e509..000000000000 --- a/pkgs/development/python-modules/aioboto3/boto3-compat.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/aioboto3/session.py b/aioboto3/session.py -index b6c2129..c97eaaf 100644 ---- a/aioboto3/session.py -+++ b/aioboto3/session.py -@@ -79,7 +79,9 @@ class Session(boto3.session.Session): - - if any(creds): - if self._account_id_set_without_credentials( -- aws_account_id, aws_access_key_id, aws_secret_access_key -+ aws_account_id=aws_account_id, -+ aws_access_key_id=aws_access_key_id, -+ aws_secret_access_key=aws_secret_access_key - ): - raise NoCredentialsError() - diff --git a/pkgs/development/python-modules/aioboto3/default.nix b/pkgs/development/python-modules/aioboto3/default.nix index 6632580490ed..8f3a56165f65 100644 --- a/pkgs/development/python-modules/aioboto3/default.nix +++ b/pkgs/development/python-modules/aioboto3/default.nix @@ -16,19 +16,16 @@ buildPythonPackage rec { pname = "aioboto3"; - version = "15.1.0"; + version = "15.5.0"; pyproject = true; src = fetchFromGitHub { owner = "terricain"; repo = "aioboto3"; tag = "v${version}"; - hash = "sha256-H/hAfFyBfeBoR6nW0sv3/AzFPATUl2uJ+JbzNB5xemo="; + hash = "sha256-yGKjcZlXs1f72OGX5rUWvfDKZAYU3ZV2RVQnd0InxBQ="; }; - # https://github.com/terricain/aioboto3/pull/377 - patches = [ ./boto3-compat.patch ]; - pythonRelaxDeps = [ "aiobotocore" ]; diff --git a/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix index 0950409b3c55..68eefa41a963 100644 --- a/pkgs/development/python-modules/aioguardian/default.nix +++ b/pkgs/development/python-modules/aioguardian/default.nix @@ -18,7 +18,7 @@ buildPythonPackage (finalAttrs: { pname = "aioguardian"; - version = "2026.01.0"; + version = "2026.01.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage (finalAttrs: { owner = "bachya"; repo = "aioguardian"; tag = finalAttrs.version; - hash = "sha256-p0rSN00CxTJsoo5iD3jsnTPUIl3G/fDc6tMjj0H0MuE="; + hash = "sha256-55jMGJ4pRMjvSAYsXIclzzMcz+PqS/334Fd7hoY8YTk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiosmtplib/default.nix b/pkgs/development/python-modules/aiosmtplib/default.nix index d85337e2deef..b9f2e56b4f21 100644 --- a/pkgs/development/python-modules/aiosmtplib/default.nix +++ b/pkgs/development/python-modules/aiosmtplib/default.nix @@ -10,16 +10,16 @@ trustme, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiosmtplib"; - version = "5.0.0"; + version = "5.1.0"; pyproject = true; src = fetchFromGitHub { owner = "cole"; repo = "aiosmtplib"; - tag = "v${version}"; - hash = "sha256-ICG7yVH2UcvQAsVGbxu7LibWUj/NEPV/f5iDc25XuzU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-+aMtU8ea8yy1jxPPQGSu4kW3PX9N9qYQ90CSduPPgYc="; }; build-system = [ hatchling ]; @@ -37,8 +37,8 @@ buildPythonPackage rec { meta = { description = "Module which provides a SMTP client"; homepage = "https://github.com/cole/aiosmtplib"; - changelog = "https://github.com/cole/aiosmtplib/releases/tag/v${version}"; + changelog = "https://github.com/cole/aiosmtplib/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/amaranth-soc/default.nix b/pkgs/development/python-modules/amaranth-soc/default.nix index 6107b35ae50c..0823af52f151 100644 --- a/pkgs/development/python-modules/amaranth-soc/default.nix +++ b/pkgs/development/python-modules/amaranth-soc/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "amaranth-soc"; - version = "0.1a-unstable-2024-10-12"; + version = "0.1a-unstable-2026-01-28"; pyproject = true; # from `pdm show` realVersion = @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth-soc"; - rev = "5c43cf58f15d9cd9c69ff83c97997708d386b2dc"; - hash = "sha256-o9xjH/nmV7ovw6bQ6PaFGLcjz5gDGb+eQ9eGNRPnBV8="; + rev = "12a83ad650ae88fcc1b0821a4bb6f4bbf7e19707"; + hash = "sha256-qW2Uie4E/PeIHjTCEnnZwBO3mv4UBMH+vlYK+fHFh+Q="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/arelle/default.nix b/pkgs/development/python-modules/arelle/default.nix index 8be34e9c8af6..ec4f7521fe4b 100644 --- a/pkgs/development/python-modules/arelle/default.nix +++ b/pkgs/development/python-modules/arelle/default.nix @@ -52,14 +52,14 @@ buildPythonPackage (finalAttrs: { pname = "arelle${lib.optionalString (!gui) "-headless"}"; - version = "2.38.4"; + version = "2.38.7"; pyproject = true; src = fetchFromGitHub { owner = "Arelle"; repo = "Arelle"; tag = finalAttrs.version; - hash = "sha256-ngFhY6yngr2OVQ6gsdpk5UAhzIpIrwiw+S+HK3oqfec="; + hash = "sha256-9ARMEXqoiBuAnj8hRrA1PqArmTMmRMP1BwASekOTQoc="; }; outputs = [ diff --git a/pkgs/development/python-modules/arxiv/default.nix b/pkgs/development/python-modules/arxiv/default.nix index 0e969d47a6bb..f80714fc8081 100644 --- a/pkgs/development/python-modules/arxiv/default.nix +++ b/pkgs/development/python-modules/arxiv/default.nix @@ -4,7 +4,8 @@ fetchFromGitHub, # build-system - setuptools, + hatchling, + hatch-vcs, # dependencies feedparser, @@ -16,17 +17,20 @@ }: buildPythonPackage rec { pname = "arxiv"; - version = "2.3.1"; + version = "2.4.0"; pyproject = true; src = fetchFromGitHub { owner = "lukasschwab"; repo = "arxiv.py"; tag = version; - hash = "sha256-7TGepKZ6Y/WTgJK70oOGR2TlXRwK0YgzslXAnklRSCA="; + hash = "sha256-96m2UHNoilRhbMnzArUFbm0wZDQS6j97etgOJ7qZmEc="; }; - build-system = [ setuptools ]; + build-system = [ + hatchling + hatch-vcs + ]; dependencies = [ feedparser diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix index 11c6c725dc62..8863c76bc48b 100644 --- a/pkgs/development/python-modules/bugsnag/default.nix +++ b/pkgs/development/python-modules/bugsnag/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "bugsnag"; - version = "4.8.0"; + version = "4.8.1"; pyproject = true; src = fetchFromGitHub { owner = "bugsnag"; repo = "bugsnag-python"; tag = "v${version}"; - hash = "sha256-aN7/MpTdsRsAINPXOmSau4pG1+F8gmvjlx5czKpx7H8="; + hash = "sha256-WXBdlgUoWdptv1weJf82qyH8TTqNCC1rYFEa972TqDY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix index e3e6dd547673..b0f3ab52c877 100644 --- a/pkgs/development/python-modules/cohere/default.nix +++ b/pkgs/development/python-modules/cohere/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "cohere"; - version = "5.20.2"; + version = "5.20.3"; pyproject = true; src = fetchFromGitHub { owner = "cohere-ai"; repo = "cohere-python"; tag = version; - hash = "sha256-Z0EEtDjVWYkE19nyo1ZQF0qE+Pe0VXlORaLtriPGSDQ="; + hash = "sha256-KHuUsZYg3k0YogjAC9kCnj59isUOnkIJ2e8M4ZcWAnY="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/cpe-search/default.nix b/pkgs/development/python-modules/cpe-search/default.nix index 030cd7613c0d..803042148c44 100644 --- a/pkgs/development/python-modules/cpe-search/default.nix +++ b/pkgs/development/python-modules/cpe-search/default.nix @@ -13,14 +13,14 @@ buildPythonPackage (finalAttrs: { pname = "cpe-search"; - version = "0.2.4"; + version = "0.2.5"; pyproject = true; src = fetchFromGitHub { owner = "ra1nb0rn"; repo = "cpe_search"; tag = "v${finalAttrs.version}"; - hash = "sha256-wnUKLJUUj3idQLv3FSpcUZksa0FvwMxKDId6/hjpEZw="; + hash = "sha256-GZzMS1zmI7w8L2qVa57KtY3sb/quULyXrPQYTcPFxTI="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index 14f5d0a0458b..6a73a14fc8b2 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -12,6 +12,7 @@ # dependencies clarabel, cvxopt, + highspy, osqp, scipy, scs, @@ -23,16 +24,16 @@ useOpenmp ? (!stdenv.hostPlatform.isDarwin), }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cvxpy"; - version = "1.7.5"; + version = "1.8.0"; pyproject = true; src = fetchFromGitHub { owner = "cvxpy"; repo = "cvxpy"; - tag = "v${version}"; - hash = "sha256-ze9znWob/Asba20AVpNeVCuz7UayiYeW40nc7eZlXHU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-RBRosw7mNQNdVxXU5aW0ehwM0OV2krPqP+ULBGGhrxM="; }; postPatch = @@ -53,6 +54,7 @@ buildPythonPackage rec { dependencies = [ clarabel cvxopt + highspy numpy osqp scipy @@ -92,8 +94,8 @@ buildPythonPackage rec { description = "Domain-specific language for modeling convex optimization problems in Python"; homepage = "https://www.cvxpy.org/"; downloadPage = "https://github.com/cvxpy/cvxpy//releases"; - changelog = "https://github.com/cvxpy/cvxpy/releases/tag/v${version}"; + changelog = "https://github.com/cvxpy/cvxpy/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.GaetanLepage ]; }; -} +}) diff --git a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix index 4ead484e8b06..5be90321586c 100644 --- a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix +++ b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "dbt-semantic-interfaces"; - version = "0.10.3"; + version = "0.10.4"; pyproject = true; src = fetchFromGitHub { owner = "dbt-labs"; repo = "dbt-semantic-interfaces"; tag = "v${version}"; - hash = "sha256-uTlz41eIcEqMvD9d9jvn7g9sZs4uEKUdsmZ0fwWkIuY="; + hash = "sha256-1FTK+vi2iFvb1knFe3WKfCtEdYioT7eeONb410RnmNU="; }; pythonRelaxDeps = [ "importlib-metadata" ]; diff --git a/pkgs/development/python-modules/docling-ibm-models/default.nix b/pkgs/development/python-modules/docling-ibm-models/default.nix index b4791aa59494..78665be7beab 100644 --- a/pkgs/development/python-modules/docling-ibm-models/default.nix +++ b/pkgs/development/python-modules/docling-ibm-models/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "docling-ibm-models"; - version = "3.10.3"; + version = "3.11.0"; pyproject = true; src = fetchFromGitHub { owner = "docling-project"; repo = "docling-ibm-models"; tag = "v${version}"; - hash = "sha256-eX0dnXh+WB/TIgKJzkpp1SOqJ2KSxoOD4JL+nsfqkLM="; + hash = "sha256-foRoxuTqwNqn2q/3pAXNoiUYrAKwzXVnAabNRietZ40="; }; build-system = [ diff --git a/pkgs/development/python-modules/fastapi-versionizer/default.nix b/pkgs/development/python-modules/fastapi-versionizer/default.nix new file mode 100644 index 000000000000..b04648edd38b --- /dev/null +++ b/pkgs/development/python-modules/fastapi-versionizer/default.nix @@ -0,0 +1,58 @@ +{ + buildPythonPackage, + fetchFromGitHub, + lib, + + # build-system + setuptools, + + # dependencies + fastapi, + natsort, + + # test dependencies + httpx, + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "fastapi-versionizer"; + version = "4.0.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "alexschimpf"; + repo = "fastapi-versionizer"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Kj7tjy8TDV9MYhqJdVUBRohkIsYoqbQX5qnnkNBJPig="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + fastapi + natsort + ]; + + pythonImportsCheck = [ + "fastapi_versionizer" + "fastapi_versionizer.versionizer" + ]; + + nativeCheckInputs = [ + httpx + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/alexschimpf/fastapi-versionizer/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + description = "API versionizer for FastAPI web applications"; + downloadPage = "https://github.com/alexschimpf/fastapi-versionizer/releases/tag/${finalAttrs.src.tag}"; + homepage = "https://github.com/alexschimpf/fastapi-versionizer"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; + }; +}) diff --git a/pkgs/development/python-modules/fastmcp/default.nix b/pkgs/development/python-modules/fastmcp/default.nix index 017b9894c07c..b37187a8c73c 100644 --- a/pkgs/development/python-modules/fastmcp/default.nix +++ b/pkgs/development/python-modules/fastmcp/default.nix @@ -158,6 +158,9 @@ buildPythonPackage (finalAttrs: { # AssertionError: assert len(caplog.records) == 1 "test_log" + # assert [TextContent(...e, meta=None)] == [TextContent(...e, meta=None)] + "test_read_resource_tool_works" + # fastmcp.exceptions.ToolError: Unknown tool "test_multi_client_with_logging" "test_multi_client_with_elicitation" @@ -165,6 +168,9 @@ buildPythonPackage (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isDarwin [ # RuntimeError: Server failed to start after 10 attempts "test_unauthorized_access" + + # Failed: DID NOT RAISE + "test_stateless_proxy" ]; disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/development/python-modules/gattlib/default.nix b/pkgs/development/python-modules/gattlib/default.nix index 82aa2b4e3df8..e9bf36c3d599 100644 --- a/pkgs/development/python-modules/gattlib/default.nix +++ b/pkgs/development/python-modules/gattlib/default.nix @@ -7,7 +7,6 @@ # build pkg-config, - glibc, python, setuptools, bluez, @@ -46,7 +45,6 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config - glibc ]; buildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-run/default.nix b/pkgs/development/python-modules/google-cloud-run/default.nix index 26d895b62960..94e152fbdc93 100644 --- a/pkgs/development/python-modules/google-cloud-run/default.nix +++ b/pkgs/development/python-modules/google-cloud-run/default.nix @@ -11,15 +11,15 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-run"; - version = "0.13.0"; + version = "0.15.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_run"; - inherit version; - hash = "sha256-l1NK1206LCBH0STAoKKUpIIvzCQzHroPKUyt+xk8Sa0="; + inherit (finalAttrs) version; + hash = "sha256-FY8mRkP5gr+k9PGPnijFbqAOqVwki8inRuFZtTivq1c="; }; build-system = [ setuptools ]; @@ -41,8 +41,8 @@ buildPythonPackage rec { meta = { description = "Google Cloud Run API client library"; homepage = "https://pypi.org/project/google-cloud-run/"; - changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-run-v${version}/packages/google-cloud-run/CHANGELOG.md"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-run-v${finalAttrs.version}/packages/google-cloud-run/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/helium/default.nix b/pkgs/development/python-modules/helium/default.nix index 2c73e9c642e3..e230b0042c7d 100644 --- a/pkgs/development/python-modules/helium/default.nix +++ b/pkgs/development/python-modules/helium/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "helium"; - version = "5.1.2"; + version = "6.0.0"; pyproject = true; src = fetchFromGitHub { owner = "mherrmann"; repo = "helium"; tag = "v${version}"; - hash = "sha256-0XpXG4G9iANHZ5YPhHFtgQmCnug6PlmAdErCYgBLOgs="; + hash = "sha256-d64nzFB8nzLZ7nmhh+xcui3jPFAbyAF+diRksnujzGU="; }; build-system = [ diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index 8eef3ec95d97..a51eb1755cf3 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.202601271"; + version = "0.1.202601281"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-bOnbWxSV3Aoukh403YS61SCkIsjp20cVpSOXcsQQj6U="; + hash = "sha256-xixOMQC8/gZO7xfA740qd5j9hiRphpotfJdPVKjBIrA="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix index afa64d0f522f..a6383e0573b1 100644 --- a/pkgs/development/python-modules/isbnlib/default.nix +++ b/pkgs/development/python-modules/isbnlib/default.nix @@ -2,20 +2,28 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonAtLeast, + + # build-system + setuptools, + + # tests pytestCheckHook, pytest-cov-stub, - setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "isbnlib"; version = "3.10.14"; pyproject = true; + # Several tests fail and suggest that the package is incompatible with python >= 3.14 + disabled = pythonAtLeast "3.14"; + src = fetchFromGitHub { owner = "xlcnd"; repo = "isbnlib"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-d6p0wv7kj+NOZJRE2rzQgb7PXv+E3tASIibYCjzCdx8="; }; @@ -32,8 +40,8 @@ buildPythonPackage rec { enabledTestPaths = [ "isbnlib/test/" ]; - # All disabled tests require a network connection disabledTests = [ + # Require a network connection "test_cache" "test_editions_any" "test_editions_merge" @@ -66,8 +74,8 @@ buildPythonPackage rec { meta = { description = "Extract, clean, transform, hyphenate and metadata for ISBNs"; homepage = "https://github.com/xlcnd/isbnlib"; - changelog = "https://github.com/xlcnd/isbnlib/blob/v${version}/CHANGES.txt"; + changelog = "https://github.com/xlcnd/isbnlib/blob/${finalAttrs.src.tag}/CHANGES.txt"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix index 2ab11955dceb..7f53c3e36a00 100644 --- a/pkgs/development/python-modules/islpy/default.nix +++ b/pkgs/development/python-modules/islpy/default.nix @@ -20,14 +20,14 @@ buildPythonPackage (finalAttrs: { pname = "islpy"; - version = "2025.2.5"; + version = "2026.1"; pyproject = true; src = fetchFromGitHub { owner = "inducer"; repo = "islpy"; tag = "v${finalAttrs.version}"; - hash = "sha256-E3DRj1WpMr79BVFUeJftp1JZafP2+Zn6yyf9ClfdWqI="; + hash = "sha256-WZl9ix9ZwJsoUCJ23bYcuYGiJzcOMh7I38PHVxWrPBo="; }; build-system = [ diff --git a/pkgs/development/python-modules/jishaku/default.nix b/pkgs/development/python-modules/jishaku/default.nix index 3bb5b74c6b16..582b1a306064 100644 --- a/pkgs/development/python-modules/jishaku/default.nix +++ b/pkgs/development/python-modules/jishaku/default.nix @@ -3,7 +3,6 @@ bash, buildPythonPackage, fetchFromGitHub, - fetchpatch, setuptools, discordpy, click, @@ -12,28 +11,20 @@ tabulate, pytestCheckHook, pytest-asyncio, - youtube-dl, + typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jishaku"; - version = "2.6.0"; + version = "2.6.3"; pyproject = true; src = fetchFromGitHub { owner = "Gorialis"; repo = "jishaku"; - tag = version; - hash = "sha256-+J8Tr8jPN9K3eHLOuJTaP3We5A1kiyn9/yI1KChbuMY="; + tag = finalAttrs.version; + hash = "sha256-8kSdzrut7LYjglpHc5dToOIQTrPsW4lVAeIWY4rzdmU="; }; - patches = [ - (fetchpatch { - # add entrypoint for install script - url = "https://github.com/Gorialis/jishaku/commit/b96cd55a1c2fd154c548f08019ccd6f7be9c7f90.patch"; - hash = "sha256-laPoupwCC1Zthib8G+c1BXqTwZK0Z6up1DKVkhFicJ0="; - }) - ]; - postPatch = '' substituteInPlace jishaku/shell.py \ --replace-fail '"/bin/bash"' '"${lib.getExe bash}"' @@ -47,12 +38,12 @@ buildPythonPackage rec { braceexpand tabulate import-expression + typing-extensions ]; nativeCheckInputs = [ pytestCheckHook pytest-asyncio - youtube-dl ]; pythonImportsCheck = [ @@ -64,9 +55,9 @@ buildPythonPackage rec { meta = { description = "Debugging and testing cog for discord.py bots"; homepage = "https://jishaku.readthedocs.io/en/latest"; - changelog = "https://github.com/Gorialis/jishaku/releases/tag/${src.tag}"; + changelog = "https://github.com/Gorialis/jishaku/releases/tag/${finalAttrs.src.tag}"; maintainers = [ ]; mainProgram = "jishaku"; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/development/python-modules/llama-index-embeddings-google/default.nix b/pkgs/development/python-modules/llama-index-embeddings-google/default.nix index f74e0406567d..593f08cf91d3 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-google/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-google/default.nix @@ -7,15 +7,15 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "llama-index-embeddings-google"; - version = "0.4.1"; + version = "0.4.2"; pyproject = true; src = fetchPypi { pname = "llama_index_embeddings_google"; - inherit version; - hash = "sha256-bVVg+oHf8KPb04F/HE/2XVkn4NY/Bb+PPj3fypkJ/zE="; + inherit (finalAttrs) version; + hash = "sha256-dWV2fKudLsxfpHTGrGljMBU62vYUqzf8NarQ3Nl9poI="; }; pythonRelaxDeps = [ "google-generativeai" ]; @@ -38,4 +38,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/logfire-api/default.nix b/pkgs/development/python-modules/logfire-api/default.nix new file mode 100644 index 000000000000..c559c97bd8b1 --- /dev/null +++ b/pkgs/development/python-modules/logfire-api/default.nix @@ -0,0 +1,23 @@ +{ + buildPythonPackage, + logfire, + + # build system + hatchling, +}: + +buildPythonPackage (finalAttrs: { + pname = "logfire-api"; + inherit (logfire) version src; + pyproject = true; + + sourceRoot = "${finalAttrs.src.name}/logfire-api"; + + build-system = [ hatchling ]; + + pythonImportsCheck = [ "logfire_api" ]; + + meta = logfire.meta // { + description = "Shim for the Logfire SDK which does nothing unless Logfire is installed"; + }; +}) diff --git a/pkgs/development/python-modules/logfire/default.nix b/pkgs/development/python-modules/logfire/default.nix new file mode 100644 index 000000000000..e74853425256 --- /dev/null +++ b/pkgs/development/python-modules/logfire/default.nix @@ -0,0 +1,200 @@ +{ + buildPythonPackage, + callPackage, + fetchFromGitHub, + lib, + + # build-system + hatchling, + + # dependencies + executing, + opentelemetry-exporter-otlp-proto-http, + opentelemetry-instrumentation, + opentelemetry-sdk, + protobuf, + rich, + tomli, + typing-extensions, + + # optional dependencies + opentelemetry-instrumentation-aiohttp-client, + opentelemetry-instrumentation-asgi, + opentelemetry-instrumentation-celery, + opentelemetry-instrumentation-django, + opentelemetry-instrumentation-fastapi, + opentelemetry-instrumentation-flask, + opentelemetry-instrumentation-httpx, + opentelemetry-instrumentation-psycopg2, + opentelemetry-instrumentation-redis, + opentelemetry-instrumentation-requests, + opentelemetry-instrumentation-sqlalchemy, + opentelemetry-instrumentation-wsgi, + packaging, + + # test dependencies + anthropic, + anyio, + asyncpg, + cloudpickle, + dirty-equals, + google-genai, + inline-snapshot, + logfire-api, + loguru, + mysql-connector, + openai-agents, + pandas, + psycopg, + pymongo, + pymysql, + pytest-django, + pytest-vcr, + pytest-xdist, + pytestCheckHook, + redis, + requests-mock, + sqlmodel, + structlog, + testcontainers, +}: + +buildPythonPackage (finalAttrs: { + pname = "logfire"; + version = "4.6.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pydantic"; + repo = "logfire"; + tag = "v${finalAttrs.version}"; + hash = "sha256-dAkT3xh0RsGTnW7Mqml2wV16VHJGUUkjjxiFLg9bUKc="; + }; + + build-system = [ hatchling ]; + + dependencies = [ + executing + opentelemetry-exporter-otlp-proto-http + opentelemetry-instrumentation + opentelemetry-sdk + protobuf + rich + tomli + typing-extensions + ]; + + # Some optional dependencies are commented out because the deps they require + # are not in nixpkgs as of writing + optional-dependencies = { + aiohttp = [ opentelemetry-instrumentation-aiohttp-client ]; + aiohttp-client = [ opentelemetry-instrumentation-aiohttp-client ]; + # aiohttp-server = [ opentelemetry-instrumentation-aiohttp-server ]; + asgi = [ opentelemetry-instrumentation-asgi ]; + # asyncpg = [ opentelemetry-instrumentation-asyncpg ]; + # aws-lambda = [ opentelemetry-instrumentation-aws-lambda ]; + celery = [ opentelemetry-instrumentation-celery ]; + django = [ + opentelemetry-instrumentation-asgi + opentelemetry-instrumentation-django + ]; + # dspy = [ opentelemetry-instrumentation-dspy ]; + fastapi = [ opentelemetry-instrumentation-fastapi ]; + flask = [ opentelemetry-instrumentation-flask ]; + # google-genai = [ opentelemetry-instrumentation-google-genai ]; + httpx = [ opentelemetry-instrumentation-httpx ]; + # litellm = [ opentelemetry-instrumentation-litellm ]; + # mysql = [ opentelemetry-instrumentation-mysql ]; + psycopg = [ + # opentelemetry-instrumentation-psycopg + packaging + ]; + psycopg2 = [ + opentelemetry-instrumentation-psycopg2 + packaging + ]; + # pymongo = [ opentelemetry-instrumentation-pymongo ]; + redis = [ opentelemetry-instrumentation-redis ]; + requests = [ opentelemetry-instrumentation-requests ]; + sqlalchemy = [ opentelemetry-instrumentation-sqlalchemy ]; + # sqlite3 = [ opentelemetry-instrumentation-sqlite3 ]; + # starlette = [ opentelemetry-instrumentation-starlette ]; + # system-metrics = [ opentelemetry-instrumentation-system-metrics ]; + wsgi = [ opentelemetry-instrumentation-wsgi ]; + }; + + pythonImportsCheck = [ "logfire" ]; + + # Too many outdated snapshots that fail with inline-snapshot + doCheck = false; + + nativeCheckInputs = [ + anthropic + anyio + asyncpg + cloudpickle + dirty-equals + google-genai + inline-snapshot + logfire-api + loguru + mysql-connector + openai-agents + pandas + psycopg + pymongo + pymysql + pytest-django + pytest-vcr + pytest-xdist + pytestCheckHook + redis + requests-mock + sqlmodel + structlog + testcontainers + ] + ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; + + disabledTestPaths = [ + # Tests that require the commented optional dependencies above + "tests/otel_integrations/test_aiohttp_server.py" + "tests/otel_integrations/test_asyncpg.py" + "tests/otel_integrations/test_aws_lambda.py" + "tests/otel_integrations/test_google_genai.py" + "tests/otel_integrations/test_mysql.py" + "tests/otel_integrations/test_psycopg.py" + "tests/otel_integrations/test_pymongo.py" + "tests/otel_integrations/test_sqlalchemy.py" + "tests/otel_integrations/test_sqlite3.py" + "tests/otel_integrations/test_starlette.py" + "tests/otel_integrations/test_system_metrics.py" + + # No module named 'litellm' + "tests/otel_integrations/test_litellm.py::test_litellm_instrumentation" + + # No module named 'pydantic_ai' + "tests/otel_integrations/test_pydantic_ai.py" + + # DeprecationWarning: The @wait_container_is_ready decorator is deprecated and will be removed in a future version. Use structured wait strategies instead: container.waiting_for(HttpWaitStrategy(8080).for_status_code(200)) or container.waiting_for(LogMessageWaitStrategy('ready')) + "tests/otel_integrations/test_celery.py" + "tests/otel_integrations/test_redis.py" + + # Requires network + "tests/test_query_client.py" + "tests/otel_integrations/test_openai.py" + "tests/otel_integrations/test_openai_agents.py" + ]; + + meta = { + changelog = "https://logfire.pydantic.dev/docs/release-notes"; + description = "Uncomplicated Observability for Python and beyond"; + downloadPage = "https://github.com/pydantic/logfire/releases/tag/${finalAttrs.src.tag}"; + homepage = "https://logfire.pydantic.dev"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; + }; +}) diff --git a/pkgs/development/python-modules/maubot/wrapper.nix b/pkgs/development/python-modules/maubot/wrapper.nix index db2823e17eaa..c41d485d53ce 100644 --- a/pkgs/development/python-modules/maubot/wrapper.nix +++ b/pkgs/development/python-modules/maubot/wrapper.nix @@ -58,7 +58,9 @@ let mkdir -p $out/bin cp $unwrapped/bin/.mbc-wrapped $out/bin/mbc cp $unwrapped/bin/.maubot-wrapped $out/bin/maubot - wrapPythonProgramsIn "$out/bin" "${lib.optionalString (baseConfig != null) "$out "}$pythonPath" + wrapPythonProgramsIn "$out/bin" "${ + lib.optionalString (baseConfig != null) "$out " + }''${pythonPath[*]}" ''; passthru = { diff --git a/pkgs/development/python-modules/mcp/default.nix b/pkgs/development/python-modules/mcp/default.nix index 9df48a47c598..b8536ececaa5 100644 --- a/pkgs/development/python-modules/mcp/default.nix +++ b/pkgs/development/python-modules/mcp/default.nix @@ -40,16 +40,16 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mcp"; - version = "1.25.0"; + version = "1.26.0"; pyproject = true; src = fetchFromGitHub { owner = "modelcontextprotocol"; repo = "python-sdk"; - tag = "v${version}"; - hash = "sha256-fSQCvKaNMeCzguM2tcTJJlAeZQmzSJmbfEK35D8pQcs="; + tag = "v${finalAttrs.version}"; + hash = "sha256-TGkAyuBcIstL2BCZYBWoi7PhnhoBvap67sLWGe0QUoU="; }; # time.sleep(0.1) feels a bit optimistic and it has been flaky whilst @@ -106,7 +106,7 @@ buildPythonPackage rec { pytestCheckHook requests ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies); disabledTests = [ # attempts to run the package manager uv @@ -152,7 +152,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; meta = { - changelog = "https://github.com/modelcontextprotocol/python-sdk/releases/tag/${src.tag}"; + changelog = "https://github.com/modelcontextprotocol/python-sdk/releases/tag/${finalAttrs.src.tag}"; description = "Official Python SDK for Model Context Protocol servers and clients"; homepage = "https://github.com/modelcontextprotocol/python-sdk"; license = lib.licenses.mit; @@ -161,4 +161,4 @@ buildPythonPackage rec { josh ]; }; -} +}) diff --git a/pkgs/development/python-modules/mizani/default.nix b/pkgs/development/python-modules/mizani/default.nix index 6035a4a37efd..d7f0c24b64b3 100644 --- a/pkgs/development/python-modules/mizani/default.nix +++ b/pkgs/development/python-modules/mizani/default.nix @@ -17,16 +17,16 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mizani"; - version = "0.14.3"; + version = "0.14.4"; pyproject = true; src = fetchFromGitHub { owner = "has2k1"; repo = "mizani"; - tag = "v${version}"; - hash = "sha256-LUustvdD+8J6xu4HrvdFlVHlPGnt+h/0ZvGH7ZiVBUY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-aBBT0zrBFi2LW1pU83sxeRJh0B2IXa/0UNyXMfWSyAI="; }; build-system = [ setuptools-scm ]; @@ -48,8 +48,8 @@ buildPythonPackage rec { meta = { description = "Scales for Python"; homepage = "https://github.com/has2k1/mizani"; - changelog = "https://github.com/has2k1/mizani/releases/tag/v${version}"; + changelog = "https://github.com/has2k1/mizani/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ samuela ]; }; -} +}) diff --git a/pkgs/development/python-modules/mkdocstrings/default.nix b/pkgs/development/python-modules/mkdocstrings/default.nix index 03f5472230c2..04cf5cc0f818 100644 --- a/pkgs/development/python-modules/mkdocstrings/default.nix +++ b/pkgs/development/python-modules/mkdocstrings/default.nix @@ -13,21 +13,21 @@ dirty-equals, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mkdocstrings"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; src = fetchFromGitHub { owner = "mkdocstrings"; repo = "mkdocstrings"; - tag = version; - hash = "sha256-dRDelPj2zO31gZzPDh7BxdBemGNaTPbzhlmWH1JYmaM="; + tag = finalAttrs.version; + hash = "sha256-fdWHcg6WijOXsE6+03iPRineUHtMDU/Yfra3S9lkMWs="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail 'dynamic = ["version"]' 'version = "${version}"' + --replace-fail 'dynamic = ["version"]' 'version = "${finalAttrs.version}"' ''; build-system = [ pdm-backend ]; @@ -65,8 +65,8 @@ buildPythonPackage rec { meta = { description = "Automatic documentation from sources for MkDocs"; homepage = "https://github.com/mkdocstrings/mkdocstrings"; - changelog = "https://github.com/mkdocstrings/mkdocstrings/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/mkdocstrings/mkdocstrings/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.isc; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/notobuilder/default.nix b/pkgs/development/python-modules/notobuilder/default.nix index c9fb6b26e16f..6f4198953ea1 100644 --- a/pkgs/development/python-modules/notobuilder/default.nix +++ b/pkgs/development/python-modules/notobuilder/default.nix @@ -21,14 +21,14 @@ buildPythonPackage { pname = "notobuilder"; - version = "0-unstable-2026-01-09"; + version = "0-unstable-2026-01-27"; pyproject = true; src = fetchFromGitHub { owner = "notofonts"; repo = "notobuilder"; - rev = "424667c0603ecae86424961ad7f8dee97e6b134c"; - hash = "sha256-FzxYm602w2h58g8D9rk8cJAYWgxMJNMngeWUWnpRfdA="; + rev = "5d66754065c6257278d5cb780f6b8dc80d2a686b"; + hash = "sha256-ba9+X1ybaHW8ZWfrIuZnnJXeFZhkcXO9RXrc37mVz4U="; }; postPatch = '' diff --git a/pkgs/development/python-modules/nvidia-ml-py/default.nix b/pkgs/development/python-modules/nvidia-ml-py/default.nix index 1b5289d0a540..3be09eaad685 100644 --- a/pkgs/development/python-modules/nvidia-ml-py/default.nix +++ b/pkgs/development/python-modules/nvidia-ml-py/default.nix @@ -9,16 +9,16 @@ nvidia-ml-py, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nvidia-ml-py"; - version = "13.590.44"; + version = "13.590.48"; pyproject = true; src = fetchPypi { pname = "nvidia_ml_py"; - inherit version; - hash = "sha256-s1jHYUsP3upLlfBG8ckBI7/iXRSKuTuxwAJIuDRwM3M="; + inherit (finalAttrs) version; + hash = "sha256-gYTRvlKRSsfwmRzRwNlGxl3IioQMdUzRLCdLd7iHYN0="; }; patches = [ @@ -61,4 +61,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ GaetanLepage ]; }; -} +}) diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index 2a6a1f2ee37a..b4e0f5e341d2 100644 --- a/pkgs/development/python-modules/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, fetchpatch2, + pythonAtLeast, # build-system hatchling, @@ -45,16 +46,26 @@ pytest-cov-stub, sphinx, sphinx-click, + writableTmpDirAsHomeHook, }: -buildPythonPackage rec { + +buildPythonPackage (finalAttrs: { pname = "papis"; version = "0.14.1"; pyproject = true; + patches = [ + (fetchpatch2 { + name = "fix-support-new-click-in-papisrunner.patch"; + url = "https://github.com/papis/papis/commit/0e3ffff4bd1b62cdf0a9fdc7f54d6a2e2ab90082.patch?full_index=1"; + hash = "sha256-KUw5U5izTTWqXHzGWLibtqHWAsVxla6SA8x6SJ07/zU="; + }) + ]; + src = fetchFromGitHub { owner = "papis"; repo = "papis"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-V4YswLNYwfBYe/Td0PEeDG++ClZoF08yxXjUXuyppPI="; }; @@ -81,7 +92,7 @@ buildPythonPackage rec { requests stevedore ] - ++ lib.optionals withOptDeps optional-dependencies.complete; + ++ lib.optionals withOptDeps finalAttrs.passthru.optional-dependencies.complete; optional-dependencies = { complete = [ @@ -102,12 +113,9 @@ buildPythonPackage rec { pytest-cov-stub sphinx sphinx-click + writableTmpDirAsHomeHook ]; - preCheck = '' - export HOME=$(mktemp -d); - ''; - enabledTestPaths = [ "papis" "tests" @@ -126,23 +134,15 @@ buildPythonPackage rec { "test_git_cli" ]; - patches = [ - (fetchpatch2 { - name = "fix-support-new-click-in-papisrunner.patch"; - url = "https://github.com/papis/papis/commit/0e3ffff4bd1b62cdf0a9fdc7f54d6a2e2ab90082.patch?full_index=1"; - hash = "sha256-KUw5U5izTTWqXHzGWLibtqHWAsVxla6SA8x6SJ07/zU="; - }) - ]; - meta = { description = "Powerful command-line document and bibliography manager"; mainProgram = "papis"; homepage = "https://papis.readthedocs.io/"; - changelog = "https://github.com/papis/papis/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/papis/papis/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ nico202 teto ]; }; -} +}) diff --git a/pkgs/development/python-modules/paramax/default.nix b/pkgs/development/python-modules/paramax/default.nix index c224505027b8..26394247a3ee 100644 --- a/pkgs/development/python-modules/paramax/default.nix +++ b/pkgs/development/python-modules/paramax/default.nix @@ -16,16 +16,16 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "paramax"; - version = "0.0.3"; + version = "0.0.5"; pyproject = true; src = fetchFromGitHub { owner = "danielward27"; repo = "paramax"; - tag = "v${version}"; - hash = "sha256-aPbYG3UGR8YbRa2GLLrZvYPxRK5LRGMF8HBTpaZmKds="; + tag = "v${finalAttrs.version}"; + hash = "sha256-UPSnFtypQYtnDRl2GCoy+OQ8Ws7eX+iPsd8WWBsgmlo="; }; build-system = [ @@ -48,8 +48,8 @@ buildPythonPackage rec { meta = { description = "Small library of paramaterizations and parameter constraints for PyTrees"; homepage = "https://github.com/danielward27/paramax"; - changelog = "https://github.com/danielward27/paramax/releases/tag/v${version}"; + changelog = "https://github.com/danielward27/paramax/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; }; -} +}) diff --git a/pkgs/development/python-modules/prophet/default.nix b/pkgs/development/python-modules/prophet/default.nix index e557f03774ed..d12564bae9b1 100644 --- a/pkgs/development/python-modules/prophet/default.nix +++ b/pkgs/development/python-modules/prophet/default.nix @@ -20,14 +20,14 @@ buildPythonPackage (finalAttrs: { pname = "prophet"; - version = "1.2.1"; + version = "1.3.0"; pyproject = true; src = fetchFromGitHub { owner = "facebook"; repo = "prophet"; tag = "v${finalAttrs.version}"; - hash = "sha256-rG21Q4V0XQjReIHd7vV/aFOUvnLEw/dm8AobXRDUfuA="; + hash = "sha256-Bu+ztg6sj1jh2iair6v1CdbF0Fi4b+h8yLzB3xTMD3Y="; }; sourceRoot = "${finalAttrs.src.name}/python"; diff --git a/pkgs/development/python-modules/py-key-value-aio/default.nix b/pkgs/development/python-modules/py-key-value-aio/default.nix index fbfc67f3e665..ca7f2530637e 100644 --- a/pkgs/development/python-modules/py-key-value-aio/default.nix +++ b/pkgs/development/python-modules/py-key-value-aio/default.nix @@ -58,7 +58,6 @@ inline-snapshot, py-key-value-shared-test, pytest-asyncio, - pytest-xdist, pytestCheckHook, }: @@ -81,6 +80,18 @@ buildPythonPackage (finalAttrs: { --replace-fail \ "uv_build>=0.8.2,<0.9.0" \ "uv_build" + '' + # Tests fail when using pytest-xdist ('Worker crashes') + # https://github.com/strawgate/py-key-value/issues/266 + + '' + substituteInPlace pyproject.toml \ + --replace-fail \ + '"-n=auto",' \ + "" + substituteInPlace pyproject.toml \ + --replace-fail \ + '"--dist=loadfile",' \ + "" ''; build-system = [ @@ -160,7 +171,6 @@ buildPythonPackage (finalAttrs: { inline-snapshot py-key-value-shared-test pytest-asyncio - pytest-xdist pytestCheckHook ] ++ finalAttrs.passthru.optional-dependencies.disk @@ -183,6 +193,10 @@ buildPythonPackage (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isDarwin [ # keyring.errors.PasswordSetError: Can't store password on keychain: (-61, 'Unknown Error') "tests/stores/keyring/test_keyring.py" + + # Worker crashes + # https://github.com/strawgate/py-key-value/issues/266 + "tests/stores/rocksdb/test_rocksdb.py" ]; meta = { diff --git a/pkgs/development/python-modules/pysmarlaapi/default.nix b/pkgs/development/python-modules/pysmarlaapi/default.nix index a80fb0d190ec..f887d40e93ca 100644 --- a/pkgs/development/python-modules/pysmarlaapi/default.nix +++ b/pkgs/development/python-modules/pysmarlaapi/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pysmarlaapi"; - version = "0.9.3"; + version = "0.10.0"; pyproject = true; src = fetchFromGitHub { owner = "Explicatis-GmbH"; repo = "pysmarlaapi"; tag = version; - hash = "sha256-VnWGBTbs6c5WU1mGcUNRsFjdWUN5yA6TOD9qmQASxIw="; + hash = "sha256-aHwmZIesBco6XyxKv321p+0p3Gibvi+X7xs+7RkwbVc="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/pytest-markdown-docs/default.nix b/pkgs/development/python-modules/pytest-markdown-docs/default.nix index c13985c253b5..ef8627f4aea5 100644 --- a/pkgs/development/python-modules/pytest-markdown-docs/default.nix +++ b/pkgs/development/python-modules/pytest-markdown-docs/default.nix @@ -2,26 +2,36 @@ lib, buildPythonPackage, fetchFromGitHub, - poetry-core, + + # build-system + hatchling, + + # dependencies markdown-it-py, pytest, + + # tests + mdit-py-plugins, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-markdown-docs"; - version = "0.5.1"; + version = "0.9.1"; pyproject = true; src = fetchFromGitHub { owner = "modal-com"; repo = "pytest-markdown-docs"; - tag = "v${version}"; - hash = "sha256-mclN28tfPcoFxswECjbrkeOI51XXSqUXfbvuSHrd7Sw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-7fGuKTHeaMEbsHD9Zje0ODP2FRWSi0WrCZsPwRYP6rg="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; + pythonRelaxDeps = [ + "markdown-it-py" + ]; dependencies = [ markdown-it-py pytest @@ -29,7 +39,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "pytest_markdown_docs" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + mdit-py-plugins + pytestCheckHook + ]; meta = { description = "Run pytest on markdown code fence blocks"; @@ -37,4 +50,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; }; -} +}) diff --git a/pkgs/development/python-modules/python-aodhclient/default.nix b/pkgs/development/python-modules/python-aodhclient/default.nix index 60432f3f033a..38943e805d59 100644 --- a/pkgs/development/python-modules/python-aodhclient/default.nix +++ b/pkgs/development/python-modules/python-aodhclient/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "python-aodhclient"; - version = "3.9.1"; + version = "3.10.0"; pyproject = true; src = fetchFromGitHub { owner = "openstack"; repo = "python-aodhclient"; tag = version; - hash = "sha256-ymOMCHhntoWr3mROI1M/PN7oWWaDTN58Z9xb97qnP+w="; + hash = "sha256-+VBtsx9bjO7YIS5mGd6AaxvQyxg4En5gP5mKmoIFAtU="; }; env.PBR_VERSION = version; diff --git a/pkgs/development/python-modules/python-ironicclient/default.nix b/pkgs/development/python-modules/python-ironicclient/default.nix index 4949b5d88091..3e65f843cef4 100644 --- a/pkgs/development/python-modules/python-ironicclient/default.nix +++ b/pkgs/development/python-modules/python-ironicclient/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "python-ironicclient"; - version = "5.14.0"; + version = "5.15.0"; pyproject = true; src = fetchFromGitHub { owner = "openstack"; repo = "python-ironicclient"; tag = version; - hash = "sha256-Mang/QJAgkxiKnwx8+q37hy+aRAnsw2uOQgniO545yc="; + hash = "sha256-suN1Eam+vHhpvaQ+QyEQPsbyb0D8G9m7FnAZgnhWS80="; }; build-system = [ diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index e981bc874b27..4641d32ffa59 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -34,13 +34,13 @@ buildPythonPackage rec { pname = "python-openstackclient"; - version = "8.2.0"; + version = "8.3.0"; pyproject = true; src = fetchPypi { pname = "python_openstackclient"; inherit version; - hash = "sha256-1hKvGN/GbMjzHmzpZpC2wnOt6KJA7EC39INaiJb7vgE="; + hash = "sha256-zHsy5F8Lju2SFeAhiuoCUmYZpeewaCsngXaRNK/Xb/g="; }; build-system = [ diff --git a/pkgs/development/python-modules/python3-application/default.nix b/pkgs/development/python-modules/python3-application/default.nix index 212a90f2bede..4131d859d98e 100644 --- a/pkgs/development/python-modules/python3-application/default.nix +++ b/pkgs/development/python-modules/python3-application/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "python3-application"; - version = "3.0.9"; + version = "3.0.10"; pyproject = true; disabled = !isPy3k; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "AGProjects"; repo = "python3-application"; rev = "release-${version}"; - hash = "sha256-79Uu9zaBIuuc+1O5Y7Vp4Qg2/aOrwvmdi5G/4AvL+T4="; + hash = "sha256-ZVy5zfZPOYt6gxIGayeCMpcCG9GXCECDHM1S8SmODMY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/qpageview/default.nix b/pkgs/development/python-modules/qpageview/default.nix index 8ba43af1dcc4..a62b0bedbd0b 100644 --- a/pkgs/development/python-modules/qpageview/default.nix +++ b/pkgs/development/python-modules/qpageview/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "qpageview"; - version = "1.0.2"; + version = "1.0.3"; pyproject = true; src = fetchFromGitHub { owner = "frescobaldi"; repo = "qpageview"; tag = "v${version}"; - hash = "sha256-bUZI3ML3MN+0KLQxrPfQOC7lxdpvl3sxJ4zi0phsiCw="; + hash = "sha256-cKidVtsqNXGuWNTTgvVOP3Wyf6M+Xctwaq7pOZb8eeo="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix index 0df9b6176396..f05728d01d1b 100644 --- a/pkgs/development/python-modules/qutip/default.nix +++ b/pkgs/development/python-modules/qutip/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, diff --git a/pkgs/development/python-modules/roadrecon/default.nix b/pkgs/development/python-modules/roadrecon/default.nix index 553fc6b515b2..315ad9e6094a 100644 --- a/pkgs/development/python-modules/roadrecon/default.nix +++ b/pkgs/development/python-modules/roadrecon/default.nix @@ -17,12 +17,12 @@ buildPythonPackage (finalAttrs: { pname = "roadrecon"; - version = "1.7.2"; + version = "1.7.3"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-fvfwgUqVr74JdL3dteX0UXbALva3vWQWEpotk8QQAiI="; + hash = "sha256-k800N0IN3I6liqgVbsgyywkg013/8GNWsShDPkK214w="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 3cf9a73b8458..7669ea249b5e 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2025.12.0"; + version = "2026.1.0"; pyproject = true; src = fetchFromGitHub { owner = "fsspec"; repo = "s3fs"; tag = version; - hash = "sha256-/r+2eXOXUcMQ7TxyrEofZ79S8n8sA3++pJxdH3eQrYw="; + hash = "sha256-wkcDViE2Vr1fFMMFz3o7ewlI5UvVnWV7jIa9Es8d9Do="; }; build-system = [ diff --git a/pkgs/development/python-modules/schwifty/default.nix b/pkgs/development/python-modules/schwifty/default.nix index 817227b07921..ba5cb0e4ee65 100644 --- a/pkgs/development/python-modules/schwifty/default.nix +++ b/pkgs/development/python-modules/schwifty/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "schwifty"; - version = "2025.9.0"; + version = "2026.1.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-QoO4pMAtrsgaJ1yUYHc+otG3eMpw67W8sS7B/H3AoJk="; + hash = "sha256-VhZBQDAewy23iyMfli9Xsf1zIAKO6Q38OWNEOW9pdJg="; }; build-system = [ diff --git a/pkgs/development/python-modules/scikit-base/default.nix b/pkgs/development/python-modules/scikit-base/default.nix index b40849b52738..cef15ad00a88 100644 --- a/pkgs/development/python-modules/scikit-base/default.nix +++ b/pkgs/development/python-modules/scikit-base/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "scikit-base"; - version = "0.13.0"; + version = "0.13.1"; pyproject = true; src = fetchFromGitHub { owner = "sktime"; repo = "skbase"; tag = "v${version}"; - hash = "sha256-fZytQprnp4WAxTJxXp+AAe7xDRfcxaCAELPS6eAfK4g="; + hash = "sha256-aprudD39bcQrCQbDU/IYcOZykKvSv6ZpakAwTCwCtGA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/starlink-grpc-core/default.nix b/pkgs/development/python-modules/starlink-grpc-core/default.nix index a59d52310271..54fd3c36daf4 100644 --- a/pkgs/development/python-modules/starlink-grpc-core/default.nix +++ b/pkgs/development/python-modules/starlink-grpc-core/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "starlink-grpc-core"; - version = "1.2.3"; + version = "1.2.4"; pyproject = true; src = fetchFromGitHub { owner = "sparky8512"; repo = "starlink-grpc-tools"; tag = "v${version}"; - hash = "sha256-TXj8cU5abVIA81vEylYgZCIAUk31BppwRdHMl9kOEPQ="; + hash = "sha256-kOs/kzlWXMRDGi3bhpT+rqznaqZ1609X9n2BnOaqTFQ="; }; pypaBuildFlags = [ "packaging" ]; diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index a83ed24524df..5bf037937635 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage (finalAttrs: { pname = "tencentcloud-sdk-python"; - version = "3.1.38"; + version = "3.1.39"; pyproject = true; src = fetchFromGitHub { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = finalAttrs.version; - hash = "sha256-YwCouaDX41sKJ45O5a1gGuXBKdEpZ+UVOVn1F2VtKd8="; + hash = "sha256-4C9icsmK8wpFUGTLXD4Lvt88iJT3HzFG0FX8YMKRlKA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/torch/bin/binary-hashes.nix b/pkgs/development/python-modules/torch/bin/binary-hashes.nix index 7257fb72c9c0..58f8030a5095 100644 --- a/pkgs/development/python-modules/torch/bin/binary-hashes.nix +++ b/pkgs/development/python-modules/torch/bin/binary-hashes.nix @@ -7,81 +7,81 @@ version: builtins.getAttr version { - "2.9.1" = { + "2.10.0" = { x86_64-linux-310 = { - name = "torch-2.9.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torch-2.9.1%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl"; - hash = "sha256-yNZwqgvm++zSsOe31RShBNve/MN4bKRGzww0FQQ+pAo="; + name = "torch-2.10.0-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torch-2.10.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl"; + hash = "sha256-NjaFB7VuqlGsvTyWrIiTu5qGmR/80Gmf6joadKK4vcs="; }; x86_64-linux-311 = { - name = "torch-2.9.1-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torch-2.9.1%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl"; - hash = "sha256-Kh2pQPB1diHQmMl1X3UE15GnKkCSDshaT9mLICU/yk4="; + name = "torch-2.10.0-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torch-2.10.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl"; + hash = "sha256-HQH/rr9kcVwPUHo5RjFJyxnllv9wK9S8+GJgHyiB2rw="; }; x86_64-linux-312 = { - name = "torch-2.9.1-cp312-cp312-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torch-2.9.1%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl"; - hash = "sha256-fLQBj0zmi2H9Pvh9wcTKUgcxx7WyAONgrUe2EteEQGM="; + name = "torch-2.10.0-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torch-2.10.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl"; + hash = "sha256-Yo6JvVEQztfevuKlfGmVlyW3+8ZOq4GjndcORsfii6U="; }; x86_64-linux-313 = { - name = "torch-2.9.1-cp313-cp313-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torch-2.9.1%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl"; - hash = "sha256-YzgaEJpWmygO0zGdqJ06/lz5q1yHmTY4KiEq/7XJBVI="; + name = "torch-2.10.0-cp313-cp313-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torch-2.10.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl"; + hash = "sha256-e0vSPtY96XRW/MgcJv6p8C7gLOERIRHE2sDYz+V0sj4="; }; x86_64-linux-314 = { - name = "torch-2.9.1-cp314-cp314-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torch-2.9.1%2Bcu128-cp314-cp314-manylinux_2_28_x86_64.whl"; - hash = "sha256-d4jT0D2TnPAPk6wNpatSCEb2ZBHjOc+/UZqAbo+s9Rk="; + name = "torch-2.10.0-cp314-cp314-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torch-2.10.0%2Bcu128-cp314-cp314-manylinux_2_28_x86_64.whl"; + hash = "sha256-N9cf7qBod2hVaGoVEgWN8/GfbwQKFR8FWqdGYBZ4dE8="; }; aarch64-darwin-310 = { - name = "torch-2.9.1-cp310-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.9.1-cp310-none-macosx_11_0_arm64.whl"; - hash = "sha256-vx5oz7k1riBGN0/wKnqnPdpwNRtGNChG9VcFWzpUC/A="; + name = "torch-2.10.0-cp310-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.10.0-cp310-none-macosx_11_0_arm64.whl"; + hash = "sha256-LRar/ObJJYTO6wDDsmZdV5hCTdntI16mm3LgRc1Trpc="; }; aarch64-darwin-311 = { - name = "torch-2.9.1-cp311-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.9.1-cp311-none-macosx_11_0_arm64.whl"; - hash = "sha256-pSlSqMkKQiwUYn6pm5gmt1VyA7RrTQdy08pcdplpJCU="; + name = "torch-2.10.0-cp311-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.10.0-cp311-none-macosx_11_0_arm64.whl"; + hash = "sha256-RYSrFnmVwEefaCHj3OrxmcgWbIEdOtu6XY7tu/pnZP0="; }; aarch64-darwin-312 = { - name = "torch-2.9.1-cp312-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.9.1-cp312-none-macosx_11_0_arm64.whl"; - hash = "sha256-KHJC3R+DCEYJi17KhH+BeqXGAV6lerTBKHgJ7+p7d+s="; + name = "torch-2.10.0-cp312-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.10.0-cp312-none-macosx_11_0_arm64.whl"; + hash = "sha256-RaHFBXYpRErrHEUsGCmPp/MPL3rq3U3EH500CYApRAc="; }; aarch64-darwin-313 = { - name = "torch-2.9.1-cp313-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.9.1-cp313-none-macosx_11_0_arm64.whl"; - hash = "sha256-vO5krnqmWHbO6ubcrr51EJSFshNSjHSTlgIgiiBwbj8="; + name = "torch-2.10.0-cp313-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.10.0-cp313-none-macosx_11_0_arm64.whl"; + hash = "sha256-hANR2lnO23vLxRmBiABQgTwZ72uJin/s9zo6/HGv8/4="; }; aarch64-darwin-314 = { - name = "torch-2.9.1-cp314-cp314-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.9.1-cp314-cp314-macosx_11_0_arm64.whl"; - hash = "sha256-3vrb6wVc/PXe9Y9wk3FFrsvXpLwpUjje0dDoWuLPDh0="; + name = "torch-2.10.0-cp314-cp314-macosx_14_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.10.0-cp314-cp314-macosx_14_0_arm64.whl"; + hash = "sha256-yIsRKf1OFPD4gpY8ZygxXKrjXS9HN00X7e7R7cdpdJc="; }; aarch64-linux-310 = { - name = "torch-2.9.1-cp310-cp310-manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.9.1%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl"; - hash = "sha256-EIZsikjEqlrj9IU43IoFW5nFfZxq8r9d1xU3TZ1t3KM="; + name = "torch-2.10.0-cp310-cp310-manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.10.0%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl"; + hash = "sha256-1j7mqAmC/XP+RLtw2X0pduAQMS/224HXv7kWewbdRbk="; }; aarch64-linux-311 = { - name = "torch-2.9.1-cp311-cp311-manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.9.1%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl"; - hash = "sha256-DmEc+xZyTmIlK2fTEHO8XEkMuD6S7NwRknYlNeDkRIc="; + name = "torch-2.10.0-cp311-cp311-manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.10.0%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl"; + hash = "sha256-HPy5sVWMblLf/Q1O/86DsTxa5dlzOBZMNyBIwh+c/Ms="; }; aarch64-linux-312 = { - name = "torch-2.9.1-cp312-cp312-manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.9.1%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl"; - hash = "sha256-O/m0QqUaKUjkEhanbXqwDwaUz8qqUbb5vKtXt/iYQ+Y="; + name = "torch-2.10.0-cp312-cp312-manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.10.0%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl"; + hash = "sha256-F5RRcWSH+MsJtWRZZn+h9cTAlGwedfvq53z8QKV2jYc="; }; aarch64-linux-313 = { - name = "torch-2.9.1-cp313-cp313-manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.9.1%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl"; - hash = "sha256-PlMuVTs37oWSBamy0ceXf9aSL1O7sbm/3VvcANGmDtQ="; + name = "torch-2.10.0-cp313-cp313-manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.10.0%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl"; + hash = "sha256-5RmUSSzbdu3OKdqI3jZyowIvnvD/2QNFQ2lI1Jkr4sc="; }; aarch64-linux-314 = { - name = "torch-2.9.1-cp314-cp314-manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.9.1%2Bcpu-cp314-cp314-manylinux_2_28_aarch64.whl"; - hash = "sha256-ZQEKtKrM5smh3fyTX5hsADyoY43tBDSP0ybD50NGI3w="; + name = "torch-2.10.0-cp314-cp314-manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.10.0%2Bcpu-cp314-cp314-manylinux_2_28_aarch64.whl"; + hash = "sha256-oo/bz6L7rP/sgTAPJN0b7SsMz9vtEHqCPP8SvB2wcPY="; }; }; } diff --git a/pkgs/development/python-modules/torch/bin/default.nix b/pkgs/development/python-modules/torch/bin/default.nix index 705186bfa128..3d2b37967128 100644 --- a/pkgs/development/python-modules/torch/bin/default.nix +++ b/pkgs/development/python-modules/torch/bin/default.nix @@ -16,6 +16,7 @@ cudaPackages, # dependencies + cuda-bindings, filelock, jinja2, networkx, @@ -34,7 +35,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "2.9.1"; + version = "2.10.0"; in buildPythonPackage { inherit version; @@ -96,6 +97,9 @@ buildPythonPackage { sympy typing-extensions ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + cuda-bindings + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) [ triton ]; postInstall = '' diff --git a/pkgs/development/python-modules/torch/bin/prefetch.sh b/pkgs/development/python-modules/torch/bin/prefetch.sh index 354d28362a90..e29955d6a0ff 100755 --- a/pkgs/development/python-modules/torch/bin/prefetch.sh +++ b/pkgs/development/python-modules/torch/bin/prefetch.sh @@ -11,41 +11,41 @@ linux_cpu_bucket="https://download.pytorch.org/whl/cpu" darwin_bucket="https://download.pytorch.org/whl/cpu" url_and_key_list=( - "x86_64-linux-310 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp310-cp310-manylinux_2_28_x86_64.whl torch-${version}-cp310-cp310-linux_x86_64.whl" - "x86_64-linux-311 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp311-cp311-manylinux_2_28_x86_64.whl torch-${version}-cp311-cp311-linux_x86_64.whl" - "x86_64-linux-312 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp312-cp312-manylinux_2_28_x86_64.whl torch-${version}-cp312-cp312-linux_x86_64.whl" - "x86_64-linux-313 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp313-cp313-manylinux_2_28_x86_64.whl torch-${version}-cp313-cp313-linux_x86_64.whl" - "x86_64-linux-314 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp314-cp314-manylinux_2_28_x86_64.whl torch-${version}-cp314-cp314-linux_x86_64.whl" - "aarch64-darwin-310 $darwin_bucket/torch-${version}-cp310-none-macosx_11_0_arm64.whl torch-${version}-cp310-none-macosx_11_0_arm64.whl" - "aarch64-darwin-311 $darwin_bucket/torch-${version}-cp311-none-macosx_11_0_arm64.whl torch-${version}-cp311-none-macosx_11_0_arm64.whl" - "aarch64-darwin-312 $darwin_bucket/torch-${version}-cp312-none-macosx_11_0_arm64.whl torch-${version}-cp312-none-macosx_11_0_arm64.whl" - "aarch64-darwin-313 $darwin_bucket/torch-${version}-cp313-none-macosx_11_0_arm64.whl torch-${version}-cp313-none-macosx_11_0_arm64.whl" - "aarch64-darwin-314 $darwin_bucket/torch-${version}-cp314-cp314-macosx_11_0_arm64.whl torch-${version}-cp314-cp314-macosx_11_0_arm64.whl" - "aarch64-linux-310 $linux_cpu_bucket/torch-${version}%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl torch-${version}-cp310-cp310-manylinux_2_28_aarch64.whl" - "aarch64-linux-311 $linux_cpu_bucket/torch-${version}%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl torch-${version}-cp311-cp311-manylinux_2_28_aarch64.whl" - "aarch64-linux-312 $linux_cpu_bucket/torch-${version}%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl torch-${version}-cp312-cp312-manylinux_2_28_aarch64.whl" - "aarch64-linux-313 $linux_cpu_bucket/torch-${version}%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl torch-${version}-cp313-cp313-manylinux_2_28_aarch64.whl" - "aarch64-linux-314 $linux_cpu_bucket/torch-${version}%2Bcpu-cp314-cp314-manylinux_2_28_aarch64.whl torch-${version}-cp314-cp314-manylinux_2_28_aarch64.whl" + "x86_64-linux-310 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp310-cp310-manylinux_2_28_x86_64.whl torch-${version}-cp310-cp310-linux_x86_64.whl" + "x86_64-linux-311 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp311-cp311-manylinux_2_28_x86_64.whl torch-${version}-cp311-cp311-linux_x86_64.whl" + "x86_64-linux-312 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp312-cp312-manylinux_2_28_x86_64.whl torch-${version}-cp312-cp312-linux_x86_64.whl" + "x86_64-linux-313 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp313-cp313-manylinux_2_28_x86_64.whl torch-${version}-cp313-cp313-linux_x86_64.whl" + "x86_64-linux-314 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp314-cp314-manylinux_2_28_x86_64.whl torch-${version}-cp314-cp314-linux_x86_64.whl" + "aarch64-darwin-310 $darwin_bucket/torch-${version}-cp310-none-macosx_11_0_arm64.whl torch-${version}-cp310-none-macosx_11_0_arm64.whl" + "aarch64-darwin-311 $darwin_bucket/torch-${version}-cp311-none-macosx_11_0_arm64.whl torch-${version}-cp311-none-macosx_11_0_arm64.whl" + "aarch64-darwin-312 $darwin_bucket/torch-${version}-cp312-none-macosx_11_0_arm64.whl torch-${version}-cp312-none-macosx_11_0_arm64.whl" + "aarch64-darwin-313 $darwin_bucket/torch-${version}-cp313-none-macosx_11_0_arm64.whl torch-${version}-cp313-none-macosx_11_0_arm64.whl" + "aarch64-darwin-314 $darwin_bucket/torch-${version}-cp314-cp314-macosx_14_0_arm64.whl torch-${version}-cp314-cp314-macosx_14_0_arm64.whl" + "aarch64-linux-310 $linux_cpu_bucket/torch-${version}%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl torch-${version}-cp310-cp310-manylinux_2_28_aarch64.whl" + "aarch64-linux-311 $linux_cpu_bucket/torch-${version}%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl torch-${version}-cp311-cp311-manylinux_2_28_aarch64.whl" + "aarch64-linux-312 $linux_cpu_bucket/torch-${version}%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl torch-${version}-cp312-cp312-manylinux_2_28_aarch64.whl" + "aarch64-linux-313 $linux_cpu_bucket/torch-${version}%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl torch-${version}-cp313-cp313-manylinux_2_28_aarch64.whl" + "aarch64-linux-314 $linux_cpu_bucket/torch-${version}%2Bcpu-cp314-cp314-manylinux_2_28_aarch64.whl torch-${version}-cp314-cp314-manylinux_2_28_aarch64.whl" ) hashfile="binary-hashes-$version.nix" echo " \"$version\" = {" >>$hashfile for url_and_key in "${url_and_key_list[@]}"; do - key=$(echo "$url_and_key" | cut -d' ' -f1) - url=$(echo "$url_and_key" | cut -d' ' -f2) - name=$(echo "$url_and_key" | cut -d' ' -f3) + key=$(echo "$url_and_key" | cut -d' ' -f1) + url=$(echo "$url_and_key" | cut -d' ' -f2) + name=$(echo "$url_and_key" | cut -d' ' -f3) - echo "prefetching ${url}..." - hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 $(nix-prefetch-url "$url" --name "$name")) + echo "prefetching ${url}..." + hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 $(nix-prefetch-url "$url" --name "$name")) - echo " $key = {" >>$hashfile - echo " name = \"$name\";" >>$hashfile - echo " url = \"$url\";" >>$hashfile - echo " hash = \"$hash\";" >>$hashfile - echo " };" >>$hashfile + echo " $key = {" >>$hashfile + echo " name = \"$name\";" >>$hashfile + echo " url = \"$url\";" >>$hashfile + echo " hash = \"$hash\";" >>$hashfile + echo " };" >>$hashfile - echo + echo done echo " };" >>$hashfile diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix index 1a66c24e6172..2e9e5bd3f533 100644 --- a/pkgs/development/python-modules/torchaudio/bin.nix +++ b/pkgs/development/python-modules/torchaudio/bin.nix @@ -20,16 +20,17 @@ torch-bin, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "torchaudio"; - version = "2.9.1"; + version = "2.10.0"; format = "wheel"; src = let pyVerNoDot = lib.replaceStrings [ "." ] [ "" ] python.pythonVersion; unsupported = throw "Unsupported system"; - srcs = (import ./binary-hashes.nix version)."${stdenv.system}-${pyVerNoDot}" or unsupported; + srcs = + (import ./binary-hashes.nix finalAttrs.version)."${stdenv.system}-${pyVerNoDot}" or unsupported; in fetchurl srcs; @@ -72,7 +73,7 @@ buildPythonPackage rec { meta = { description = "PyTorch audio library"; homepage = "https://pytorch.org/"; - changelog = "https://github.com/pytorch/audio/releases/tag/v${version}"; + changelog = "https://github.com/pytorch/audio/releases/tag/v${finalAttrs.version}"; # Includes CUDA and Intel MKL, but redistributions of the binary are not limited. # https://docs.nvidia.com/cuda/eula/index.html # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html @@ -88,4 +89,4 @@ buildPythonPackage rec { junjihashimoto ]; }; -} +}) diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix index bba21e33b8b7..fc17cc5d28bd 100644 --- a/pkgs/development/python-modules/torchaudio/binary-hashes.nix +++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix @@ -7,81 +7,81 @@ version: builtins.getAttr version { - "2.9.1" = { + "2.10.0" = { x86_64-linux-310 = { - name = "torchaudio-2.9.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchaudio-2.9.1%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl"; - hash = "sha256-YrFkJK9jwOEr6m7+OIm+NYsCBHqWEZmCZz8H8StzmIg="; + name = "torchaudio-2.10.0-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchaudio-2.10.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl"; + hash = "sha256-cGW9EKtplNMGZ1aOjGSYeUZ4zh7iPS8HVvsozm1iNII="; }; x86_64-linux-311 = { - name = "torchaudio-2.9.1-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchaudio-2.9.1%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl"; - hash = "sha256-Qwwi7N3ZsYQRe/ZNQdX02NPwNTu2hPMYI2O/gYDj6KU="; + name = "torchaudio-2.10.0-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchaudio-2.10.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl"; + hash = "sha256-xQ7R9L9nQ6gvjmIe7REI/9ZsWBLQCp9pXHSfnOX+zeQ="; }; x86_64-linux-312 = { - name = "torchaudio-2.9.1-cp312-cp312-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchaudio-2.9.1%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl"; - hash = "sha256-VOsZ5jS4xWeIahtTtBhFBtlDw7pRORmOn+G5QbxWbzA="; + name = "torchaudio-2.10.0-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchaudio-2.10.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl"; + hash = "sha256-0muRoXPO5tuav/aLSNZCNpUP/FYo0GRI7N16xWhB4Qo="; }; x86_64-linux-313 = { - name = "torchaudio-2.9.1-cp313-cp313-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchaudio-2.9.1%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl"; - hash = "sha256-Uil7fft8QuMROFVyvJwBhuYC6hpfIMQpI3Zbrqma/4M="; + name = "torchaudio-2.10.0-cp313-cp313-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchaudio-2.10.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl"; + hash = "sha256-18a6jlE7lM2dX0Pu1HgHN+8bUJQd8RKt+19AHBsha3o="; }; x86_64-linux-314 = { - name = "torchaudio-2.9.1-cp314-cp314-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchaudio-2.9.1%2Bcu128-cp314-cp314-manylinux_2_28_x86_64.whl"; - hash = "sha256-EsPj06r4VtZ5MopanUbYZryItMUpDyEo8war/5dfpR4="; + name = "torchaudio-2.10.0-cp314-cp314-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchaudio-2.10.0%2Bcu128-cp314-cp314-manylinux_2_28_x86_64.whl"; + hash = "sha256-kIUsvrHzUZuLXZHO15RYJ+kq1TBIaHOEp6PEAa61zO0="; }; aarch64-darwin-310 = { - name = "torchaudio-2.9.1-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.1-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-t8tRcrbOZ8q8zFYLgSPe+VA2zRWH4RTcaXont7gdsT0="; + name = "torchaudio-2.10.0-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.10.0-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-pbp+nADlp4aZSkaEU9ooWJkz6O+JyzMN15n+Y6hckrk="; }; aarch64-darwin-311 = { - name = "torchaudio-2.9.1-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.1-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-5qTHlrG129ggvoM4jCCdDxY+9ddKQ6BtUZNg/azTbtE="; + name = "torchaudio-2.10.0-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.10.0-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-KIE2ZMTIZVeSHwrg7w9iTgZRMrAsUlv/WZ52VuGe9yc="; }; aarch64-darwin-312 = { - name = "torchaudio-2.9.1-cp312-cp312-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.1-cp312-cp312-macosx_11_0_arm64.whl"; - hash = "sha256-x3nAOA+7oS1j9WwJPdk74SItbMPK8UCtHYnEpgso7/E="; + name = "torchaudio-2.10.0-cp312-cp312-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.10.0-cp312-cp312-macosx_11_0_arm64.whl"; + hash = "sha256-CF8bcjOeQyEAW5qs19BrHGTl86Lj/5/GrVmL+2/ezsQ="; }; aarch64-darwin-313 = { - name = "torchaudio-2.9.1-cp313-cp313-macosx_12_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.1-cp313-cp313-macosx_12_0_arm64.whl"; - hash = "sha256-HFIen3D6sugl9rgxrDFKedw39RyNEc1UmMDzyIChIuE="; + name = "torchaudio-2.10.0-cp313-cp313-macosx_12_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.10.0-cp313-cp313-macosx_12_0_arm64.whl"; + hash = "sha256-vSp2B4YHmOWEdH1zVrPxG0OtppWyZCFc5ae29o/g81U="; }; aarch64-darwin-314 = { - name = "torchaudio-2.9.1-cp314-cp314-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.1-cp314-cp314-macosx_11_0_arm64.whl"; - hash = "sha256-MrZ6VRA+mxElNDErHRlsKmtn4hpXY7qzCPNb9HmFcYU="; + name = "torchaudio-2.10.0-cp314-cp314-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.10.0-cp314-cp314-macosx_11_0_arm64.whl"; + hash = "sha256-6o8HhIRjaezV2yZs9+sUhLXstzSG0puROt3SZ9e/Vks="; }; aarch64-linux-310 = { - name = "torchaudio-2.9.1-cp310-cp310-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.1-cp310-cp310-manylinux_2_28_aarch64.whl"; - hash = "sha256-asvWO+ZK9MstF1vwZo7mpgRgTO8XxlPoBYZvp5V3Q00="; + name = "torchaudio-2.10.0-cp310-cp310-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.10.0-cp310-cp310-manylinux_2_28_aarch64.whl"; + hash = "sha256-8YL6GRdwG7wk+z4q63gBwVls9C0CPX1+NBBdLyfXKZg="; }; aarch64-linux-311 = { - name = "torchaudio-2.9.1-cp311-cp311-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.1-cp311-cp311-manylinux_2_28_aarch64.whl"; - hash = "sha256-nTlW4rz4pn5+hGjXYCCa7Qpd48+91G5K37qAo7wtDXs="; + name = "torchaudio-2.10.0-cp311-cp311-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.10.0-cp311-cp311-manylinux_2_28_aarch64.whl"; + hash = "sha256-01kA9GicsBZBlbMSY6dpmHyJU0Ehl6a0t1ghjS4tvIY="; }; aarch64-linux-312 = { - name = "torchaudio-2.9.1-cp312-cp312-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.1-cp312-cp312-manylinux_2_28_aarch64.whl"; - hash = "sha256-9vqIK3UDhf2woqpSFaagS5fPlmizdhcDioFMdjCy3I0="; + name = "torchaudio-2.10.0-cp312-cp312-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.10.0-cp312-cp312-manylinux_2_28_aarch64.whl"; + hash = "sha256-SlEfXVXuA0gFJnDlg0gAd05CbOFoXYe0gqyeIyQHS7c="; }; aarch64-linux-313 = { - name = "torchaudio-2.9.1-cp313-cp313-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.1-cp313-cp313-manylinux_2_28_aarch64.whl"; - hash = "sha256-Cz/sxrz+Rvy5BeqCbvY+mgUqbZ0eLNcT9ZpTpQn8i1w="; + name = "torchaudio-2.10.0-cp313-cp313-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.10.0-cp313-cp313-manylinux_2_28_aarch64.whl"; + hash = "sha256-3Y7Rtym0aU8Bd2rpXn20MrGoCNtDd/mVlv50wkzLor4="; }; aarch64-linux-314 = { - name = "torchaudio-2.9.1-cp314-cp314-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.1-cp314-cp314-manylinux_2_28_aarch64.whl"; - hash = "sha256-CnA1PulFIGit4h1hgbXaCVn1HThpocgR7O8Xy01nGBw="; + name = "torchaudio-2.10.0-cp314-cp314-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.10.0-cp314-cp314-manylinux_2_28_aarch64.whl"; + hash = "sha256-DxEeF2oX3R9uygFmLbr8G/o2ZBTd64bxCmUzD8rP8L8="; }; }; } diff --git a/pkgs/development/python-modules/torchaudio/prefetch.sh b/pkgs/development/python-modules/torchaudio/prefetch.sh index 4b289f99bb31..bd9fed5959d1 100755 --- a/pkgs/development/python-modules/torchaudio/prefetch.sh +++ b/pkgs/development/python-modules/torchaudio/prefetch.sh @@ -11,41 +11,41 @@ linux_cpu_bucket="https://download.pytorch.org/whl/cpu" darwin_bucket="https://download.pytorch.org/whl/cpu" url_and_key_list=( - "x86_64-linux-310 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp310-cp310-manylinux_2_28_x86_64.whl torchaudio-${version}-cp310-cp310-linux_x86_64.whl" - "x86_64-linux-311 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp311-cp311-manylinux_2_28_x86_64.whl torchaudio-${version}-cp311-cp311-linux_x86_64.whl" - "x86_64-linux-312 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp312-cp312-manylinux_2_28_x86_64.whl torchaudio-${version}-cp312-cp312-linux_x86_64.whl" - "x86_64-linux-313 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp313-cp313-manylinux_2_28_x86_64.whl torchaudio-${version}-cp313-cp313-linux_x86_64.whl" - "x86_64-linux-314 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp314-cp314-manylinux_2_28_x86_64.whl torchaudio-${version}-cp314-cp314-linux_x86_64.whl" - "aarch64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl" - "aarch64-darwin-311 $darwin_bucket/torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl" - "aarch64-darwin-312 $darwin_bucket/torchaudio-${version}-cp312-cp312-macosx_11_0_arm64.whl torchaudio-${version}-cp312-cp312-macosx_11_0_arm64.whl" - "aarch64-darwin-313 $darwin_bucket/torchaudio-${version}-cp313-cp313-macosx_12_0_arm64.whl torchaudio-${version}-cp313-cp313-macosx_12_0_arm64.whl" - "aarch64-darwin-314 $darwin_bucket/torchaudio-${version}-cp314-cp314-macosx_11_0_arm64.whl torchaudio-${version}-cp314-cp314-macosx_11_0_arm64.whl" - "aarch64-linux-310 $linux_cpu_bucket/torchaudio-${version}-cp310-cp310-manylinux_2_28_aarch64.whl torchaudio-${version}-cp310-cp310-manylinux2014_aarch64.whl" - "aarch64-linux-311 $linux_cpu_bucket/torchaudio-${version}-cp311-cp311-manylinux_2_28_aarch64.whl torchaudio-${version}-cp311-cp311-manylinux2014_aarch64.whl" - "aarch64-linux-312 $linux_cpu_bucket/torchaudio-${version}-cp312-cp312-manylinux_2_28_aarch64.whl torchaudio-${version}-cp312-cp312-manylinux2014_aarch64.whl" - "aarch64-linux-313 $linux_cpu_bucket/torchaudio-${version}-cp313-cp313-manylinux_2_28_aarch64.whl torchaudio-${version}-cp313-cp313-manylinux2014_aarch64.whl" - "aarch64-linux-314 $linux_cpu_bucket/torchaudio-${version}-cp314-cp314-manylinux_2_28_aarch64.whl torchaudio-${version}-cp314-cp314-manylinux2014_aarch64.whl" + "x86_64-linux-310 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp310-cp310-manylinux_2_28_x86_64.whl torchaudio-${version}-cp310-cp310-linux_x86_64.whl" + "x86_64-linux-311 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp311-cp311-manylinux_2_28_x86_64.whl torchaudio-${version}-cp311-cp311-linux_x86_64.whl" + "x86_64-linux-312 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp312-cp312-manylinux_2_28_x86_64.whl torchaudio-${version}-cp312-cp312-linux_x86_64.whl" + "x86_64-linux-313 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp313-cp313-manylinux_2_28_x86_64.whl torchaudio-${version}-cp313-cp313-linux_x86_64.whl" + "x86_64-linux-314 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp314-cp314-manylinux_2_28_x86_64.whl torchaudio-${version}-cp314-cp314-linux_x86_64.whl" + "aarch64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl" + "aarch64-darwin-311 $darwin_bucket/torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl" + "aarch64-darwin-312 $darwin_bucket/torchaudio-${version}-cp312-cp312-macosx_11_0_arm64.whl torchaudio-${version}-cp312-cp312-macosx_11_0_arm64.whl" + "aarch64-darwin-313 $darwin_bucket/torchaudio-${version}-cp313-cp313-macosx_12_0_arm64.whl torchaudio-${version}-cp313-cp313-macosx_12_0_arm64.whl" + "aarch64-darwin-314 $darwin_bucket/torchaudio-${version}-cp314-cp314-macosx_11_0_arm64.whl torchaudio-${version}-cp314-cp314-macosx_11_0_arm64.whl" + "aarch64-linux-310 $linux_cpu_bucket/torchaudio-${version}-cp310-cp310-manylinux_2_28_aarch64.whl torchaudio-${version}-cp310-cp310-manylinux2014_aarch64.whl" + "aarch64-linux-311 $linux_cpu_bucket/torchaudio-${version}-cp311-cp311-manylinux_2_28_aarch64.whl torchaudio-${version}-cp311-cp311-manylinux2014_aarch64.whl" + "aarch64-linux-312 $linux_cpu_bucket/torchaudio-${version}-cp312-cp312-manylinux_2_28_aarch64.whl torchaudio-${version}-cp312-cp312-manylinux2014_aarch64.whl" + "aarch64-linux-313 $linux_cpu_bucket/torchaudio-${version}-cp313-cp313-manylinux_2_28_aarch64.whl torchaudio-${version}-cp313-cp313-manylinux2014_aarch64.whl" + "aarch64-linux-314 $linux_cpu_bucket/torchaudio-${version}-cp314-cp314-manylinux_2_28_aarch64.whl torchaudio-${version}-cp314-cp314-manylinux2014_aarch64.whl" ) hashfile=binary-hashes-"$version".nix echo " \"$version\" = {" >>$hashfile for url_and_key in "${url_and_key_list[@]}"; do - key=$(echo "$url_and_key" | cut -d' ' -f1) - url=$(echo "$url_and_key" | cut -d' ' -f2) - name=$(echo "$url_and_key" | cut -d' ' -f3) + key=$(echo "$url_and_key" | cut -d' ' -f1) + url=$(echo "$url_and_key" | cut -d' ' -f2) + name=$(echo "$url_and_key" | cut -d' ' -f3) - echo "prefetching ${url}..." - hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 $(nix-prefetch-url "$url" --name "$name")) + echo "prefetching ${url}..." + hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 $(nix-prefetch-url "$url" --name "$name")) - echo " $key = {" >>$hashfile - echo " name = \"$name\";" >>$hashfile - echo " url = \"$url\";" >>$hashfile - echo " hash = \"$hash\";" >>$hashfile - echo " };" >>$hashfile + echo " $key = {" >>$hashfile + echo " name = \"$name\";" >>$hashfile + echo " url = \"$url\";" >>$hashfile + echo " hash = \"$hash\";" >>$hashfile + echo " };" >>$hashfile - echo + echo done echo " };" >>$hashfile diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix index 955c9cf29bf1..d689cf36db58 100644 --- a/pkgs/development/python-modules/torchvision/bin.nix +++ b/pkgs/development/python-modules/torchvision/bin.nix @@ -23,7 +23,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "0.24.1"; + version = "0.25.0"; in buildPythonPackage { inherit version; diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix index ed3f6f9a1a4a..cf209e7d61f7 100644 --- a/pkgs/development/python-modules/torchvision/binary-hashes.nix +++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix @@ -7,81 +7,81 @@ version: builtins.getAttr version { - "0.24.1" = { + "0.25.0" = { x86_64-linux-310 = { - name = "torchvision-0.24.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchvision-0.24.1%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl"; - hash = "sha256-h/bjLS2Y0nefn6WKqTz2rwSeP4doE0SiCI4vx9ndPgA="; + name = "torchvision-0.25.0-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchvision-0.25.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl"; + hash = "sha256-QzUMoRPp8iTe25Cw28MYU/3k8yJ5TL5KdYn8yrV2jww="; }; x86_64-linux-311 = { - name = "torchvision-0.24.1-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchvision-0.24.1%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl"; - hash = "sha256-G0T2fL2PNuKli/qjF201s331VgSt9ZKeiQBuUx+En6o="; + name = "torchvision-0.25.0-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchvision-0.25.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl"; + hash = "sha256-6/K0lcdgl3lrmi6skpDvvK6W4P2eWuUsQO/xiGELtEA="; }; x86_64-linux-312 = { - name = "torchvision-0.24.1-cp312-cp312-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchvision-0.24.1%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl"; - hash = "sha256-z4Tq4dLRKn0mGnSW7KAN2Se3F5IBGx6E1BYslQ6zIB0="; + name = "torchvision-0.25.0-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchvision-0.25.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl"; + hash = "sha256-ElWgyiv5h6z58QO5bFxM/jQV/Eoe7xf6CK9SegSk9XM="; }; x86_64-linux-313 = { - name = "torchvision-0.24.1-cp313-cp313-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchvision-0.24.1%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl"; - hash = "sha256-X3xeD6CNLL7pO24Eu+3Vm14RRiz/bO/QeUkhcmXfI3A="; + name = "torchvision-0.25.0-cp313-cp313-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchvision-0.25.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl"; + hash = "sha256-qcDeiT3OnCkTyceuiKkWkQ+S0CuZ2hSWeIBtGOgHnyk="; }; x86_64-linux-314 = { - name = "torchvision-0.24.1-cp314-cp314-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchvision-0.24.1%2Bcu128-cp314-cp314-manylinux_2_28_x86_64.whl"; - hash = "sha256-O3LjI3fl6ROY3cRXnHd4SyaWUqV5X0sgpaHUyA6b090="; + name = "torchvision-0.25.0-cp314-cp314-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchvision-0.25.0%2Bcu128-cp314-cp314-manylinux_2_28_x86_64.whl"; + hash = "sha256-W3rT+2zwPvKi/WF8tLTkHvqbsBQ8Z/UGwqPmdlx7Eq0="; }; aarch64-darwin-310 = { - name = "torchvision-0.24.1-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.1-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-62yB50mCzCWBhdmHAG7Xg1xuWJNSfuKBKUyFovP3JYo="; + name = "torchvision-0.25.0-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.25.0-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-eBCEGRaiqHDL+1gfQIS1lHmQj7nbbt/feBOZMTkthnc="; }; aarch64-darwin-311 = { - name = "torchvision-0.24.1-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.1-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-c0gffA2jjsGgQCHy2WcoLIfaSKL4MyvpYAkWcs/+gGs="; + name = "torchvision-0.25.0-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.25.0-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-p2znuNT84pGiVyHuL5IceDrMbb1Pwy3HQe0qHVqN3i8="; }; aarch64-darwin-312 = { - name = "torchvision-0.24.1-cp312-cp312-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.1-cp312-cp312-macosx_11_0_arm64.whl"; - hash = "sha256-TwlWglurWTLdUzlN6OEQXtkYJQKzZ/8Eddvw5plVBhI="; + name = "torchvision-0.25.0-cp312-cp312-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.25.0-cp312-cp312-macosx_11_0_arm64.whl"; + hash = "sha256-ck8hKlig0NdYZJziiGAQVrX0agHeVFcC9CvMxbJcsMw="; }; aarch64-darwin-313 = { - name = "torchvision-0.24.1-cp313-cp313-macosx_12_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.1-cp313-cp313-macosx_12_0_arm64.whl"; - hash = "sha256-yFj5RO/qIXCsvaL4AWE7FRk75J6EGcmMIE6fXoxlqVU="; + name = "torchvision-0.25.0-cp313-cp313-macosx_12_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.25.0-cp313-cp313-macosx_12_0_arm64.whl"; + hash = "sha256-bERBGcavj6SLecWfFSn8FaRaK7+CPPhfhR5yA9hPcn8="; }; aarch64-darwin-314 = { - name = "torchvision-0.24.1-cp314-cp314-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.1-cp314-cp314-macosx_11_0_arm64.whl"; - hash = "sha256-mDmEiv9H2Y53JKvRowdhIduWBmwy3bMZtoXf4Hc2D0A="; + name = "torchvision-0.25.0-cp314-cp314-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.25.0-cp314-cp314-macosx_11_0_arm64.whl"; + hash = "sha256-pkrlQ/4KBXqTlUr5TCOWKXI9sZbtZQkOZ3XxNnJrIvg="; }; aarch64-linux-310 = { - name = "torchvision-0.24.1-cp310-cp310-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.1-cp310-cp310-manylinux_2_28_aarch64.whl"; - hash = "sha256-VnnMvWaaiLq5ghwyI00kBzXTZJkpGIfyYqSS8Nlti4I="; + name = "torchvision-0.25.0-cp310-cp310-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.25.0%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl"; + hash = "sha256-c84E3qZJFP8REACDESBMNmEH1lHTsE+qDb7nfvtxM7c="; }; aarch64-linux-311 = { - name = "torchvision-0.24.1-cp311-cp311-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.1-cp311-cp311-manylinux_2_28_aarch64.whl"; - hash = "sha256-RScwj/tX9tLBfoLuCOJb+9CkHxN99tDqiAWyPvKvDms="; + name = "torchvision-0.25.0-cp311-cp311-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.25.0%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl"; + hash = "sha256-Wb6Z0cRw70cLE0Roqmr6b5aAgaUDrLTuiD1wMy+CLjU="; }; aarch64-linux-312 = { - name = "torchvision-0.24.1-cp312-cp312-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.1-cp312-cp312-manylinux_2_28_aarch64.whl"; - hash = "sha256-KBV2SXWPuXSR3g20eNXW5zwjtQjlTeIK28NeazqnJEM="; + name = "torchvision-0.25.0-cp312-cp312-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.25.0%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl"; + hash = "sha256-cnM06achz8GsKWzgv55p2UhoIb+lsedaj+tveAQdtIE="; }; aarch64-linux-313 = { - name = "torchvision-0.24.1-cp313-cp313-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.1-cp313-cp313-manylinux_2_28_aarch64.whl"; - hash = "sha256-Wd2+V3mUOvmaiX/NWJR1eufP/rHCWlGbec2TOBiKhmQ="; + name = "torchvision-0.25.0-cp313-cp313-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.25.0%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl"; + hash = "sha256-/lTL1ZQs0LJqkPF0jw1EIcr2e+NcKBxsO4VzczoD1jA="; }; aarch64-linux-314 = { - name = "torchvision-0.24.1-cp314-cp314-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.1-cp314-cp314-manylinux_2_28_aarch64.whl"; - hash = "sha256-MqXOmewggf1aswTaCqlpG27AR9EqMpwNmRxp0KG+7kU="; + name = "torchvision-0.25.0-cp314-cp314-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.25.0%2Bcpu-cp314-cp314-manylinux_2_28_aarch64.whl"; + hash = "sha256-DC0NqbwBGg/eHRJa85ao++lNmb7PnTE3ZPJMp2V6NEg="; }; }; } diff --git a/pkgs/development/python-modules/torchvision/prefetch.sh b/pkgs/development/python-modules/torchvision/prefetch.sh index d3e2b8f0362f..f1f1612e42d1 100755 --- a/pkgs/development/python-modules/torchvision/prefetch.sh +++ b/pkgs/development/python-modules/torchvision/prefetch.sh @@ -7,44 +7,44 @@ version=$1 linux_cuda_version="cu128" linux_bucket="https://download.pytorch.org/whl/${linux_cuda_version}" -darwin_bucket="https://download.pytorch.org/whl/cpu" +cpu_bucket="https://download.pytorch.org/whl/cpu" url_and_key_list=( - "x86_64-linux-310 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp310-cp310-manylinux_2_28_x86_64.whl torchvision-${version}-cp310-cp310-linux_x86_64.whl" - "x86_64-linux-311 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp311-cp311-manylinux_2_28_x86_64.whl torchvision-${version}-cp311-cp311-linux_x86_64.whl" - "x86_64-linux-312 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp312-cp312-manylinux_2_28_x86_64.whl torchvision-${version}-cp312-cp312-linux_x86_64.whl" - "x86_64-linux-313 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp313-cp313-manylinux_2_28_x86_64.whl torchvision-${version}-cp313-cp313-linux_x86_64.whl" - "x86_64-linux-314 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp314-cp314-manylinux_2_28_x86_64.whl torchvision-${version}-cp314-cp314-linux_x86_64.whl" - "aarch64-darwin-310 $darwin_bucket/torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl" - "aarch64-darwin-311 $darwin_bucket/torchvision-${version}-cp311-cp311-macosx_11_0_arm64.whl torchvision-${version}-cp311-cp311-macosx_11_0_arm64.whl" - "aarch64-darwin-312 $darwin_bucket/torchvision-${version}-cp312-cp312-macosx_11_0_arm64.whl torchvision-${version}-cp312-cp312-macosx_11_0_arm64.whl" - "aarch64-darwin-313 $darwin_bucket/torchvision-${version}-cp313-cp313-macosx_12_0_arm64.whl torchvision-${version}-cp313-cp313-macosx_12_0_arm64.whl" - "aarch64-darwin-314 $darwin_bucket/torchvision-${version}-cp314-cp314-macosx_11_0_arm64.whl torchvision-${version}-cp314-cp314-macosx_11_0_arm64.whl" - "aarch64-linux-310 $darwin_bucket/torchvision-${version}-cp310-cp310-manylinux_2_28_aarch64.whl torchvision-${version}-cp310-cp310-linux_aarch64.whl" - "aarch64-linux-311 $darwin_bucket/torchvision-${version}-cp311-cp311-manylinux_2_28_aarch64.whl torchvision-${version}-cp311-cp311-linux_aarch64.whl" - "aarch64-linux-312 $darwin_bucket/torchvision-${version}-cp312-cp312-manylinux_2_28_aarch64.whl torchvision-${version}-cp312-cp312-linux_aarch64.whl" - "aarch64-linux-313 $darwin_bucket/torchvision-${version}-cp313-cp313-manylinux_2_28_aarch64.whl torchvision-${version}-cp313-cp313-linux_aarch64.whl" - "aarch64-linux-314 $darwin_bucket/torchvision-${version}-cp314-cp314-manylinux_2_28_aarch64.whl torchvision-${version}-cp314-cp314-linux_aarch64.whl" + "x86_64-linux-310 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp310-cp310-manylinux_2_28_x86_64.whl torchvision-${version}-cp310-cp310-linux_x86_64.whl" + "x86_64-linux-311 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp311-cp311-manylinux_2_28_x86_64.whl torchvision-${version}-cp311-cp311-linux_x86_64.whl" + "x86_64-linux-312 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp312-cp312-manylinux_2_28_x86_64.whl torchvision-${version}-cp312-cp312-linux_x86_64.whl" + "x86_64-linux-313 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp313-cp313-manylinux_2_28_x86_64.whl torchvision-${version}-cp313-cp313-linux_x86_64.whl" + "x86_64-linux-314 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp314-cp314-manylinux_2_28_x86_64.whl torchvision-${version}-cp314-cp314-linux_x86_64.whl" + "aarch64-darwin-310 $cpu_bucket/torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl" + "aarch64-darwin-311 $cpu_bucket/torchvision-${version}-cp311-cp311-macosx_11_0_arm64.whl torchvision-${version}-cp311-cp311-macosx_11_0_arm64.whl" + "aarch64-darwin-312 $cpu_bucket/torchvision-${version}-cp312-cp312-macosx_11_0_arm64.whl torchvision-${version}-cp312-cp312-macosx_11_0_arm64.whl" + "aarch64-darwin-313 $cpu_bucket/torchvision-${version}-cp313-cp313-macosx_12_0_arm64.whl torchvision-${version}-cp313-cp313-macosx_12_0_arm64.whl" + "aarch64-darwin-314 $cpu_bucket/torchvision-${version}-cp314-cp314-macosx_11_0_arm64.whl torchvision-${version}-cp314-cp314-macosx_11_0_arm64.whl" + "aarch64-linux-310 $cpu_bucket/torchvision-${version}%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl torchvision-${version}-cp310-cp310-linux_aarch64.whl" + "aarch64-linux-311 $cpu_bucket/torchvision-${version}%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl torchvision-${version}-cp311-cp311-linux_aarch64.whl" + "aarch64-linux-312 $cpu_bucket/torchvision-${version}%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl torchvision-${version}-cp312-cp312-linux_aarch64.whl" + "aarch64-linux-313 $cpu_bucket/torchvision-${version}%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl torchvision-${version}-cp313-cp313-linux_aarch64.whl" + "aarch64-linux-314 $cpu_bucket/torchvision-${version}%2Bcpu-cp314-cp314-manylinux_2_28_aarch64.whl torchvision-${version}-cp314-cp314-linux_aarch64.whl" ) hashfile="binary-hashes-$version.nix" echo " \"$version\" = {" >>$hashfile for url_and_key in "${url_and_key_list[@]}"; do - key=$(echo "$url_and_key" | cut -d' ' -f1) - url=$(echo "$url_and_key" | cut -d' ' -f2) - name=$(echo "$url_and_key" | cut -d' ' -f3) + key=$(echo "$url_and_key" | cut -d' ' -f1) + url=$(echo "$url_and_key" | cut -d' ' -f2) + name=$(echo "$url_and_key" | cut -d' ' -f3) - echo "prefetching ${url}..." - hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 $(nix-prefetch-url "$url" --name "$name")) + echo "prefetching ${url}..." + hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 $(nix-prefetch-url "$url" --name "$name")) - echo " $key = {" >>$hashfile - echo " name = \"$name\";" >>$hashfile - echo " url = \"$url\";" >>$hashfile - echo " hash = \"$hash\";" >>$hashfile - echo " };" >>$hashfile + echo " $key = {" >>$hashfile + echo " name = \"$name\";" >>$hashfile + echo " url = \"$url\";" >>$hashfile + echo " hash = \"$hash\";" >>$hashfile + echo " };" >>$hashfile - echo + echo done echo " };" >>$hashfile diff --git a/pkgs/development/python-modules/triton/bin.nix b/pkgs/development/python-modules/triton/bin.nix index ce7915b6308c..b78e4fd38707 100644 --- a/pkgs/development/python-modules/triton/bin.nix +++ b/pkgs/development/python-modules/triton/bin.nix @@ -6,21 +6,20 @@ fetchurl, python, autoPatchelfHook, - filelock, - lit, zlib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "triton"; - version = "3.5.1"; + version = "3.6.0"; format = "wheel"; src = let pyVerNoDot = lib.replaceStrings [ "." ] [ "" ] python.pythonVersion; unsupported = throw "Unsupported system"; - srcs = (import ./binary-hashes.nix version)."${stdenv.system}-${pyVerNoDot}" or unsupported; + srcs = + (import ./binary-hashes.nix finalAttrs.version)."${stdenv.system}-${pyVerNoDot}" or unsupported; in fetchurl srcs; @@ -36,12 +35,6 @@ buildPythonPackage rec { autoPatchelfHook ]; - propagatedBuildInputs = [ - filelock - lit - zlib - ]; - dontStrip = true; # If this breaks, consider replacing with "${cuda_nvcc}/bin/ptxas" @@ -53,7 +46,7 @@ buildPythonPackage rec { meta = { description = "Language and compiler for custom Deep Learning operations"; homepage = "https://github.com/triton-lang/triton/"; - changelog = "https://github.com/triton-lang/triton/releases/tag/v${version}"; + changelog = "https://github.com/triton-lang/triton/releases/tag/v${finalAttrs.version}"; # Includes NVIDIA's ptxas, but redistributions of the binary are not limited. # https://docs.nvidia.com/cuda/eula/index.html # triton's license is MIT. @@ -68,4 +61,4 @@ buildPythonPackage rec { junjihashimoto ]; }; -} +}) diff --git a/pkgs/development/python-modules/triton/binary-hashes.nix b/pkgs/development/python-modules/triton/binary-hashes.nix index c2c2a907dd96..f70a6a3619ca 100644 --- a/pkgs/development/python-modules/triton/binary-hashes.nix +++ b/pkgs/development/python-modules/triton/binary-hashes.nix @@ -7,56 +7,56 @@ version: builtins.getAttr version { - "3.5.1" = { - aarch64-linux-310 = { - name = "triton-3.5.1-cp310-cp310-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/triton-3.5.1-cp310-cp310-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; - hash = "sha256-XMiYppML/CzkHCVU6HnTUoDNeLWIPYOfLuqU2nYQpjo="; - }; + "3.6.0" = { x86_64-linux-310 = { - name = "triton-3.5.1-cp310-cp310-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; - url = "https://download.pytorch.org/whl/triton-3.5.1-cp310-cp310-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; - hash = "sha256-cHolosLulgnG8H5aJIQOsVA5+LikI9NZRXlWdP5lPfc="; - }; - aarch64-linux-311 = { - name = "triton-3.5.1-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/triton-3.5.1-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; - hash = "sha256-YTFb3ZLjVUFsVXuET5UpeE/Ynyl7UhCa25ZXWxkKCFU="; + name = "triton-3.6.0-cp310-cp310-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; + url = "https://download.pytorch.org/whl/triton-3.6.0-cp310-cp310-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; + hash = "sha256-ctaz7qoTREyim6ZdVfxXtkETc6K45hn2OuWWLT2eokk="; }; x86_64-linux-311 = { - name = "triton-3.5.1-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; - url = "https://download.pytorch.org/whl/triton-3.5.1-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; - hash = "sha256-2rz9BHCOdgjqukx4te7HcpJz2WweyK30Hbf6OxLQXQQ="; - }; - aarch64-linux-312 = { - name = "triton-3.5.1-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/triton-3.5.1-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; - hash = "sha256-xSJNyhWMHg6yNePHCL0ZzvqWi61D0vu5Sx1fo5fr9cU="; + name = "triton-3.6.0-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; + url = "https://download.pytorch.org/whl/triton-3.6.0-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; + hash = "sha256-4CHofo8mbG+HvzebZpxDwoAKrGJHvfXVGMtVPjxAPAA="; }; x86_64-linux-312 = { - name = "triton-3.5.1-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; - url = "https://download.pytorch.org/whl/triton-3.5.1-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; - hash = "sha256-jOm87b0Ss5PRMJ+4meBoGGJMfndlxSMepXSYUAFcdNg="; - }; - aarch64-linux-313 = { - name = "triton-3.5.1-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/triton-3.5.1-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; - hash = "sha256-NOAuVAYZSnBxpwPJ/d3hM6WQNppnCtgam0oOmDIGF6k="; + name = "triton-3.6.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; + url = "https://download.pytorch.org/whl/triton-3.6.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; + hash = "sha256-b1ko5tRMNKl7vhZMzt3A7yAHEhyJ68+6VBXPRS3n7p8="; }; x86_64-linux-313 = { - name = "triton-3.5.1-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; - url = "https://download.pytorch.org/whl/triton-3.5.1-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; - hash = "sha256-5c+hPLJzzuEEP7+cthxEON6xbVezeywne5Re8YWJDGY="; - }; - aarch64-linux-314 = { - name = "triton-3.5.1-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/triton-3.5.1-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; - hash = "sha256-R2l6CpY32b0q70HXjXHiiitluDWgf4XezgyJ4ZbUgvU="; + name = "triton-3.6.0-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; + url = "https://download.pytorch.org/whl/triton-3.6.0-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; + hash = "sha256-AHUDn/J3ZUgAg7GhCZmb8nEQ81QvH5+tlfD5Blo22nk="; }; x86_64-linux-314 = { - name = "triton-3.5.1-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; - url = "https://download.pytorch.org/whl/triton-3.5.1-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; - hash = "sha256-RWYEuwz08mXKMTroiwJcvYCSxEnh7iIoi5v3o/Nsfyg="; + name = "triton-3.6.0-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; + url = "https://download.pytorch.org/whl/triton-3.6.0-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; + hash = "sha256-ttgAvaZm675+whRuP16yce6H+PrHJAEdx/Jd7pv7X38="; + }; + aarch64-linux-310 = { + name = "triton-3.6.0-cp310-cp310-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/triton-3.6.0-cp310-cp310-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; + hash = "sha256-otC3ubTymt4xz3vXwje1DScKJIfPlD0DSzB6mz9z2cc="; + }; + aarch64-linux-311 = { + name = "triton-3.6.0-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/triton-3.6.0-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; + hash = "sha256-KQaH9PMQznlKB9akP6lN6pvahmFb8EV4UzN4UDvtcVo="; + }; + aarch64-linux-312 = { + name = "triton-3.6.0-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/triton-3.6.0-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; + hash = "sha256-bkLQhIZNErh4Rzb+UaDNBfbMVndbJcgQLJ2AxCH04pg="; + }; + aarch64-linux-313 = { + name = "triton-3.6.0-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/triton-3.6.0-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; + hash = "sha256-WNV9Z5awAEB2MVQzUm/p1K9CBE1DCv3uHmzUKna9bQk="; + }; + aarch64-linux-314 = { + name = "triton-3.6.0-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/triton-3.6.0-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; + hash = "sha256-IO0vdw9yF7iplMupnnysN+e+c1o5kTRJkLgKtP6pZMQ="; }; }; } diff --git a/pkgs/development/python-modules/triton/default.nix b/pkgs/development/python-modules/triton/default.nix index 1906e1c6f75b..9b904f5b1728 100644 --- a/pkgs/development/python-modules/triton/default.nix +++ b/pkgs/development/python-modules/triton/default.nix @@ -258,6 +258,11 @@ buildPythonPackage rec { ps.triton ps.torch-no-triton ]; + + gpuCheckArgs.nativeBuildInputs = [ + # PermissionError: [Errno 13] Permission denied: '/homeless-shelter' + writableTmpDirAsHomeHook + ]; } '' # Adopted from Philippe Tillet https://triton-lang.org/main/getting-started/tutorials/01-vector-add.html diff --git a/pkgs/development/python-modules/triton/prefetch.sh b/pkgs/development/python-modules/triton/prefetch.sh new file mode 100755 index 000000000000..8ee367b783ac --- /dev/null +++ b/pkgs/development/python-modules/triton/prefetch.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-prefetch-scripts + +set -eou pipefail + +version=$1 + +bucket="https://download.pytorch.org/whl" + +url_and_key_list=( + "x86_64-linux-310 $bucket/triton-${version}-cp310-cp310-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl triton-${version}-cp310-cp310-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl" + "x86_64-linux-311 $bucket/triton-${version}-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl triton-${version}-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl" + "x86_64-linux-312 $bucket/triton-${version}-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl triton-${version}-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl" + "x86_64-linux-313 $bucket/triton-${version}-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl triton-${version}-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl" + "x86_64-linux-314 $bucket/triton-${version}-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl triton-${version}-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl" + "aarch64-linux-310 $bucket/triton-${version}-cp310-cp310-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl triton-${version}-cp310-cp310-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl" + "aarch64-linux-311 $bucket/triton-${version}-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl triton-${version}-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl" + "aarch64-linux-312 $bucket/triton-${version}-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl triton-${version}-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl" + "aarch64-linux-313 $bucket/triton-${version}-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl triton-${version}-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl" + "aarch64-linux-314 $bucket/triton-${version}-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl triton-${version}-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl" +) + +hashfile="binary-hashes-$version.nix" +echo " \"$version\" = {" >>$hashfile + +for url_and_key in "${url_and_key_list[@]}"; do + key=$(echo "$url_and_key" | cut -d' ' -f1) + url=$(echo "$url_and_key" | cut -d' ' -f2) + name=$(echo "$url_and_key" | cut -d' ' -f3) + + echo "prefetching ${url}..." + hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 $(nix-prefetch-url "$url" --name "$name")) + + echo " $key = {" >>$hashfile + echo " name = \"$name\";" >>$hashfile + echo " url = \"$url\";" >>$hashfile + echo " hash = \"$hash\";" >>$hashfile + echo " };" >>$hashfile + + echo +done + +echo " };" >>$hashfile +echo "done." diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index e994464202aa..ebcb284b3953 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "uproot"; - version = "5.6.9"; + version = "5.7.0"; pyproject = true; src = fetchFromGitHub { owner = "scikit-hep"; repo = "uproot5"; tag = "v${version}"; - hash = "sha256-y1+BPSIFWH+6QI0RaeyoCzVYJkvPqY/jictRNa5qfOY="; + hash = "sha256-G3UP+hz2uz58Col3THATDRIiXX8wczFy6ob75iRP9b0="; }; build-system = [ diff --git a/pkgs/development/tools/godot/common.nix b/pkgs/development/tools/godot/common.nix index 5f312cdb6937..80e2c029aa1a 100644 --- a/pkgs/development/tools/godot/common.nix +++ b/pkgs/development/tools/godot/common.nix @@ -1,8 +1,10 @@ { alsa-lib, + apple-sdk_26, autoPatchelfHook, buildPackages, callPackage, + darwin, dbus, dotnetCorePackages, embree, @@ -38,6 +40,7 @@ makeWrapper, mbedtls, miniupnpc, + moltenvk, openxr-loader, pcre2, perl, @@ -49,29 +52,34 @@ speechd-minimal, stdenv, stdenvNoCC, + strip-nondeterminism, testers, udev, + unzip, updateScript, version, vulkan-loader, wayland, wayland-scanner, - withAlsa ? true, + withAlsa ? stdenv.hostPlatform.isLinux, withDbus ? true, withFontconfig ? true, withMono ? false, nugetDeps ? null, - withPlatform ? "linuxbsd", + # only linux supports builtin_ flags properly + withBuiltins ? !stdenv.hostPlatform.isLinux, + withPlatform ? if stdenv.hostPlatform.isDarwin then "macos" else "linuxbsd", withPrecision ? "single", withPulseaudio ? true, withSpeechd ? true, withTouch ? true, - withUdev ? true, + withUdev ? stdenv.hostPlatform.isLinux, # Wayland in Godot requires X11 until upstream fix is merged # https://github.com/godotengine/godot/pull/73504 - withWayland ? true, - withX11 ? true, + withWayland ? stdenv.hostPlatform.isLinux, + withX11 ? stdenv.hostPlatform.isLinux, wslay, + zip, zstd, }: assert lib.asserts.assertOneOf "withPrecision" withPrecision [ @@ -90,6 +98,8 @@ let dottedVersion = lib.replaceStrings [ "-" ] [ "." ] version + lib.optionalString withMono ".mono"; + harfbuzz-icu = harfbuzz.override { withIcu = true; }; + mkTarget = target: let @@ -116,8 +126,14 @@ let } // lib.optionalAttrs editor ( let + platform = + { + linuxbsd = "Linux"; + macos = "macOS"; + } + .${withPlatform}; project-src = - runCommand "${pkg.name}-project-src" + runCommand "${pkg.name}-6" { nativeBuildInputs = [ pkg ] ++ lib.optional (dotnet-sdk != null) dotnet-sdk; } @@ -144,12 +160,19 @@ let monoNode.owner = node '' + '' + ${""} var scene = PackedScene.new() var scenePath = "res://test.tscn" scene.pack(node) node.free() var x = ResourceSaver.save(scene, scenePath) ProjectSettings["application/run/main_scene"] = scenePath + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + ${""} + ProjectSettings["rendering/textures/vram_compression/import_etc2_astc"] = true + '' + + '' ProjectSettings.save() quit() EOF @@ -164,13 +187,18 @@ let cat >export_presets.cfg <<'EOF' [preset.0] name="build" - platform="Linux" + platform="${platform}" runnable=true export_filter="all_resources" include_filter="" exclude_filter="" [preset.0.options] - binary_format/architecture="${arch}" + binary_format/architecture="${if stdenv.hostPlatform.isDarwin then "universal" else arch}" + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + application/bundle_identifier="test" + '' + + '' EOF '' + lib.optionalString withMono '' @@ -224,8 +252,11 @@ let runHook preBuild export HOME=$(mktemp -d) - mkdir -p $HOME/.local/share/godot/ - ln -s "${final.export-template}"/share/godot/export_templates "$HOME"/.local/share/godot/ + local dataDir="$HOME/${ + if stdenv.hostPlatform.isDarwin then "Library/Application Support/Godot" else ".local/share/godot" + }/" + mkdir -p "$dataDir" + ln -s "${final.export-template}"/share/godot/export_templates "$dataDir" godot${suffix} --headless --build-solutions -s create-scene.gd @@ -236,7 +267,7 @@ let runHook preInstall mkdir -p "$out"/bin - godot${suffix} --headless --export-release build "$out"/bin/test + godot${suffix} --headless --export-release build "$out"/bin/test${lib.optionalString stdenv.hostPlatform.isDarwin ".app"} runHook postInstall ''; @@ -247,7 +278,7 @@ let ( set -eo pipefail HOME=$(mktemp -d) - "${final.export}"/bin/test --headless | tail -n+3 | ( + "${final.export}"/bin/test${lib.optionalString stdenv.hostPlatform.isDarwin ".app/Contents/MacOS/Unnamed"} --headless | tail -n+3 | ( '' + lib.optionalString withMono '' # indent @@ -280,9 +311,8 @@ let export-template = pkg.export-templates-bin; export = prev.export.overrideAttrs (prev: { - nativeBuildInputs = prev.nativeBuildInputs or [ ] ++ [ - autoPatchelfHook - ]; + nativeBuildInputs = + prev.nativeBuildInputs or [ ] ++ lib.optional stdenv.hostPlatform.isElf autoPatchelfHook; # stripping dlls results in: # Failed to load System.Private.CoreLib.dll (error code 0x8007000B) @@ -291,15 +321,17 @@ let runtimeDependencies = prev.runtimeDependencies or [ ] ++ map lib.getLib [ - alsa-lib libpulseaudio libX11 libXcursor libXext libXi libXrandr - udev vulkan-loader + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + udev ]; }); } @@ -359,6 +391,11 @@ let dotnet restore modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk.sln ''; + # darwin needs $HOME/.cache/clang/ModuleCache + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' + export HOME=$(mktemp -d) + ''; + # From: https://github.com/godotengine/godot/blob/4.2.2-stable/SConstruct sconsFlags = mkSconsFlagsFromAttrSet ( { @@ -385,7 +422,8 @@ let # aliasing bugs exist with hardening+LTO # https://github.com/godotengine/godot/pull/104501 ccflags = "-fno-strict-aliasing"; - linkflags = "-Wl,--build-id"; + # on darwin: ld: unknown option: --build-id + linkflags = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-Wl,--build-id"; # libraries that aren't available in nixpkgs builtin_msdfgen = true; @@ -408,12 +446,19 @@ let // lib.optionalAttrs (lib.versionAtLeast version "4.5") { redirect_build_objects = false; # Avoid copying build objects to output } + // lib.optionalAttrs stdenv.hostPlatform.isDarwin { + generate_bundle = "yes"; + } ); enableParallelBuilding = true; strictDeps = true; + propagatedSandboxProfile = lib.optionalString stdenv.hostPlatform.isDarwin '' + (allow file-read* (subpath "/System/Library/CoreServices/SystemAppearance.bundle")) + ''; + patches = [ ./Linux-fix-missing-library-with-builtin_glslang-false.patch ] @@ -431,12 +476,17 @@ let # Fix a crash in the mono test project build. It no longer seems to # happen in 4.4, but an existing fix couldn't be identified. ./CSharpLanguage-fix-crash-in-reload_assemblies-after-.patch - ]; + ] + ++ lib.optional ( + stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "4.4" + ) ./fix-moltenvk-detection.patch; postPatch = '' # this stops scons from hiding e.g. NIX_CFLAGS_COMPILE perl -pi -e '{ $r += s:(env = Environment\(.*):\1\nenv["ENV"] = os.environ: } END { exit ($r != 1) }' SConstruct + '' + + lib.optionalString (!withBuiltins) '' # disable all builtin libraries by default perl -pi -e '{ $r |= s:(opts.Add\(BoolVariable\("builtin_.*, )True(\)\)):\1False\2: } END { exit ($r != 1) }' SConstruct @@ -444,9 +494,8 @@ let + lib.optionalString (lib.versionOlder version "4.6") '' substituteInPlace platform/linuxbsd/detect.py \ --replace-fail /usr/include/recastnavigation ${lib.escapeShellArg (lib.getDev recastnavigation)}/include/recastnavigation - '' - + '' + + lib.optionalString (libGL != null) '' substituteInPlace thirdparty/glad/egl.c \ --replace-fail \ 'static const char *NAMES[] = {"libEGL.so.1", "libEGL.so"}' \ @@ -461,69 +510,103 @@ let --replace-fail \ '"libGL.so.1"' \ '"${lib.getLib libGL}/lib/libGL.so"' - + '' + + '' substituteInPlace thirdparty/volk/volk.c \ --replace-fail \ 'dlopen("libvulkan.so.1"' \ 'dlopen("${lib.getLib vulkan-loader}/lib/libvulkan.so"' - ''; + '' + + lib.optionalString stdenv.hostPlatform.isDarwin ( + '' + substituteInPlace platform/macos/export/export_plugin.cpp \ + --replace-fail \ + /usr/bin/codesign \ + '${lib.getExe' darwin.sigtool "sigtool"}' + '' + # https://github.com/godotengine/godot/issues/107199 + + lib.optionalString (lib.versionAtLeast version "4.5") '' + substituteInPlace drivers/metal/SCsub \ + --replace-fail \ + 'env_metal.Append(CCFLAGS=["-fmodules", "-fcxx-modules"])' \ + "" + '' + # godot zips these files and fails if mtime < 1980 + + lib.optionalString (!editor) '' + find misc/dist/macos_template.app -exec touch {} \; + '' + ); depsBuildBuild = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ buildPackages.stdenv.cc pkg-config ]; - buildInputs = [ - embree - enet - freetype - glslang - graphite2 - (harfbuzz.override { withIcu = true; }) - icu - libtheora - libwebp - mbedtls - miniupnpc - openxr-loader - pcre2 - recastnavigation - wslay - zstd - ] - ++ lib.optionals (lib.versionAtLeast version "4.5") [ - libjpeg_turbo - sdl3 - ] - ++ lib.optionals (editor && withMono) dotnet-sdk.packages - ++ lib.optional withAlsa alsa-lib - ++ lib.optional (withX11 || withWayland) libxkbcommon - ++ lib.optionals withX11 [ - libX11 - libXcursor - libXext - libXfixes - libXi - libXinerama - libXrandr - libXrender - ] - ++ lib.optionals withWayland [ - libdecor - wayland - ] - ++ lib.optionals withDbus [ - dbus - ] - ++ lib.optionals withFontconfig [ - fontconfig - ] - ++ lib.optional withPulseaudio libpulseaudio - ++ lib.optionals withSpeechd [ - speechd-minimal - glib - ] - ++ lib.optional withUdev udev; + env.NIX_CFLAGS_COMPILE = toString ( + lib.optionals stdenv.hostPlatform.isDarwin [ + "-I${lib.getDev harfbuzz-icu}/include/harfbuzz" + "-I${lib.getDev recastnavigation}/include/recastnavigation" + ] + ); + + buildInputs = + lib.optionals (!withBuiltins) ( + [ + embree + enet + freetype + glslang + graphite2 + harfbuzz-icu + icu + libtheora + libwebp + mbedtls + miniupnpc + openxr-loader + pcre2 + recastnavigation + wslay + zstd + ] + ++ lib.optionals (lib.versionAtLeast version "4.5") [ + libjpeg_turbo + sdl3 + ] + ) + ++ lib.optionals (editor && withMono) dotnet-sdk.packages + ++ lib.optional withAlsa alsa-lib + ++ lib.optional (withX11 || withWayland) libxkbcommon + ++ lib.optionals withX11 [ + libX11 + libXcursor + libXext + libXfixes + libXi + libXinerama + libXrandr + libXrender + ] + ++ lib.optionals withWayland [ + libdecor + wayland + ] + ++ lib.optionals withDbus [ + dbus + ] + ++ lib.optionals withFontconfig [ + fontconfig + ] + ++ lib.optional withPulseaudio libpulseaudio + ++ lib.optionals withSpeechd [ + speechd-minimal + glib + ] + ++ lib.optional withUdev udev + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_26 + moltenvk + ]; nativeBuildInputs = [ installShellFiles @@ -535,7 +618,17 @@ let ++ lib.optional (editor && withMono) [ makeWrapper dotnet-sdk - ]; + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin ( + [ + darwin.sigtool + ] + ++ lib.optionals (!editor) [ + strip-nondeterminism + unzip + zip + ] + ); postBuild = lib.optionalString (editor && withMono) '' echo "Generating Glue" @@ -548,7 +641,7 @@ let runHook preInstall mkdir -p "$out"/{bin,libexec} - cp -r bin/* "$out"/libexec + cp -r bin/${binary} "$out"/libexec/ cd "$out"/bin ln -s ../libexec/${binary} godot${lib.versions.majorMinor version}${suffix} @@ -574,12 +667,17 @@ let cp icon.png "$out/share/icons/godot.png" '' + lib.optionalString withMono '' + cp -r bin/GodotSharp "$out"/libexec/ mkdir -p "$out"/share/nuget mv "$out"/libexec/GodotSharp/Tools/nupkgs "$out"/share/nuget/source wrapProgram "$out"/libexec/${binary} \ --prefix NUGET_FALLBACK_PACKAGES ';' "$out"/share/nuget/packages/ '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p "$out"/Applications + cp -r bin/godot_macos_editor.app "$out"/Applications/Godot.app + '' else let template = @@ -588,6 +686,7 @@ let [ { linuxbsd = "linux"; + macos = "macos"; } .${withPlatform} ] @@ -601,6 +700,15 @@ let mkdir -p "$templates" ln -s "$out"/libexec/${binary} "$templates"/${template} '' + # TODO: teach godot to use a template that isn't zipped. for now we + # just need to make it uncompressed so it doesn't break dependencies + + lib.optionalString stdenv.hostPlatform.isDarwin '' + cd bin + unzip godot_macos${lib.optionalString withMono "_mono"}.zip + zip -rq0 "$templates"/macos.zip macos_template.app + strip-nondeterminism --type zip "$templates"/macos.zip + cd - + '' ) + '' runHook postInstall @@ -639,7 +747,12 @@ let "x86_64-linux" "aarch64-linux" ] - ++ lib.optional (!withMono) "i686-linux"; + ++ lib.optional (!withMono) "i686-linux" + # 4.3 doesn't compile on darwin, and 4.4 doesn't pass tests + ++ lib.optionals (lib.versionAtLeast version "4.5") [ + "x86_64-darwin" + "aarch64-darwin" + ]; maintainers = with lib.maintainers; [ shiryel corngood diff --git a/pkgs/development/tools/godot/fix-moltenvk-detection.patch b/pkgs/development/tools/godot/fix-moltenvk-detection.patch new file mode 100644 index 000000000000..33a944c279cd --- /dev/null +++ b/pkgs/development/tools/godot/fix-moltenvk-detection.patch @@ -0,0 +1,16 @@ +diff --git a/platform/macos/detect.py b/platform/macos/detect.py +index 227738877d..5a4bfa77d9 100644 +--- a/platform/macos/detect.py ++++ b/platform/macos/detect.py +@@ -265,11 +265,6 @@ def configure(env: "SConsEnvironment"): + + if mvk_path != "": + env.Append(LINKFLAGS=["-L" + mvk_path]) +- else: +- print_error( +- "MoltenVK SDK installation directory not found, use 'vulkan_sdk_path' SCons parameter to specify SDK path." +- ) +- sys.exit(255) + + if len(extra_frameworks) > 0: + frameworks = [item for key in extra_frameworks for item in ["-framework", key]] diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix index 3bfa8858b03d..c6e0d821bb99 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix @@ -727,6 +727,18 @@ }; }; + phpdoc = { + version = "0.1.8"; + url = "github:claytonrcarter/tree-sitter-phpdoc"; + hash = "sha256-X+ElKI0ZMLCmxEanKsDRL/1KzGZfBrG7zITsT+jSrtQ="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + Stebalien + ]; + }; + }; + pioasm = { version = "0-unstable-2024-10-12"; url = "github:leo60228/tree-sitter-pioasm/afece58efdb30440bddd151ef1347fa8d6f744a9"; diff --git a/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix b/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix index 575c12ab8d8d..5976de1dd8e2 100644 --- a/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix +++ b/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "jwillemsen"; domain = "daikin_onecta"; - version = "4.4.5"; + version = "4.4.6"; src = fetchFromGitHub { owner = "jwillemsen"; repo = "daikin_onecta"; tag = "v${version}"; - hash = "sha256-NO0ZRNSKE3fSSTpw9cwyD8jmKVV986bEKh27d4iiJpk="; + hash = "sha256-EKDl60Zna+VWoJ80YmE3eXaIppvaJiYmjN0YrM7Y8+A="; }; meta = { diff --git a/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix b/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix index 80cb2a78c9de..cd35ff8d896c 100644 --- a/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix +++ b/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix @@ -10,13 +10,13 @@ buildHomeAssistantComponent rec { owner = "jmcollin78"; domain = "versatile_thermostat"; - version = "8.6.1"; + version = "8.6.2"; src = fetchFromGitHub { inherit owner; repo = domain; tag = version; - hash = "sha256-yQMTuNinRVHIsaS8Q7aqGozN1sTbkLGvXFhEw47jUkA="; + hash = "sha256-jd6+detoxlx9yDHEBQeFema+HLdN1C4lw1/Tk314xas="; }; dependencies = [ diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 8957d2359201..241319fe01aa 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -70,7 +70,7 @@ in }; tomcat11 = common { - version = "11.0.15"; - hash = "sha256-xRWg7bJzhGtNeSb6gXWqpGkF9F1eKvWI4BeD41qJppw="; + version = "11.0.18"; + hash = "sha256-9P5rc7LkEXinCDMuPeyasq4hNQDBiVdUYRvaKUXbKas="; }; } diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 11d0970720d3..43a0cc71034a 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -21,7 +21,7 @@ buildGoModule (finalAttrs: { pname = "grafana"; - version = "12.3.1"; + version = "12.3.2"; subPackages = [ "pkg/cmd/grafana" @@ -33,7 +33,7 @@ buildGoModule (finalAttrs: { owner = "grafana"; repo = "grafana"; rev = "v${finalAttrs.version}"; - hash = "sha256-OGk7dq5jr3rEGqkWLBHrna02ireXHfYoLWJcWIY6Ccg="; + hash = "sha256-yyToc7jVLqCwZINhya35KGuCRP24TzWouHUm8Yd8e1o="; }; # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22 @@ -49,12 +49,12 @@ buildGoModule (finalAttrs: { # Since this is not a dependency attribute the buildPackages has to be specified. offlineCache = buildPackages.yarn-berry_4-fetcher.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes; - hash = "sha256-mdQC0QCqOcP+uQaS1j2QktigEQKUQxLD3wkiMBVVuHE="; + hash = "sha256-RnYxki15s2crHHBDjpw7vLIMt5fIzM9rWTNjwQlLJ/o="; }; disallowedRequisites = [ finalAttrs.offlineCache ]; - vendorHash = "sha256-xT99rvarFwidwpnxUGchv3Ny0v2hLHAcG8epV01Vc30="; + vendorHash = "sha256-PN5YM0qstHm68ZvBsHBcRVD9NfrJ48EvBJlbwfsyBVY="; # Grafana seems to just set it to the latest version available # nowadays. diff --git a/pkgs/servers/sql/postgresql/ext/pgmq.nix b/pkgs/servers/sql/postgresql/ext/pgmq.nix index 9fcf42afeea0..ca1ab9c44226 100644 --- a/pkgs/servers/sql/postgresql/ext/pgmq.nix +++ b/pkgs/servers/sql/postgresql/ext/pgmq.nix @@ -7,13 +7,13 @@ postgresqlBuildExtension (finalAttrs: { pname = "pgmq"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "tembo-io"; repo = "pgmq"; tag = "v${finalAttrs.version}"; - hash = "sha256-iPls5ABcpYUXd/Lqk0U8GFzM4iq0lqMbJO4v4z27tNI="; + hash = "sha256-Rgs3iZfnKAijz8mk9A2tM1WuL8uMFYE3IRa+JgWk0LE="; }; sourceRoot = "${finalAttrs.src.name}/pgmq-extension"; diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index 6bd614eaa089..8a60c8fa1acb 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -37,7 +37,7 @@ buildPythonApplication rec { # Can't just symlink to the main script, since it uses __file__ to # import bundled packages and manage the service makeWrapper $out/libexec/tautulli/Tautulli.py $out/bin/tautulli - wrapPythonProgramsIn "$out/libexec/tautulli" "$pythonPath" + wrapPythonProgramsIn "$out/libexec/tautulli" "''${pythonPath[*]}" # Creat backwards compatibility symlink to bin/plexpy ln -s $out/bin/tautulli $out/bin/plexpy diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index 4e16c34739eb..53ccae41455f 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,24 +1,24 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.216.0"; + version = "3.217.1"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.216.0-linux-x64.tar.gz"; - sha256 = "0l1jw58739vaffsl16h0r0jnnvx8pvczqbx5gc8ga0za13m3p2lv"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.217.1-linux-x64.tar.gz"; + sha256 = "0bgzkjkkawivd8qhqmgfrj5i67lm47kn3ih4gi5j3876ks978k44"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.47.0-linux-amd64.tar.gz"; - sha256 = "1dc0b32pc3qapygvc4ialwqxn7ii67lswf4fk1y861vq99j0njch"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.48.0-linux-amd64.tar.gz"; + sha256 = "02ffwlprcqn8n7ghpmb6s33gfg03vizvah4zxkqi69dp6q3l3hws"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.3.0-linux-amd64.tar.gz"; sha256 = "1c8bd6m2kk6nzbmq3csb5babmbma83cxsvqxv7z0s59b2p6jc9r5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.92.0-linux-amd64.tar.gz"; - sha256 = "1pm5mx1fnxcljswry0z7qsmvv63xwiaxgjkryijwsmb76jy4np00"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.93.0-linux-amd64.tar.gz"; + sha256 = "1v67g9k97f5yzhfd66p5jg55vdvx9mk8n2nhf0nqn56cd0rhsmvi"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.1-linux-amd64.tar.gz"; @@ -117,16 +117,16 @@ sha256 = "1jhqqiy6nrkkhg7rnhcjgzm97jy5z0508b2bh8mhcjsqgbc8kxrk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.19.0-linux-amd64.tar.gz"; - sha256 = "0mhib1zn7l2rlhyv4yih48b2kk9g27gkfjjwbrhq4b2lc7n6giqd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.19.1-linux-amd64.tar.gz"; + sha256 = "127bwpfwkcq9ab0v190m3nr9zjwxbp8wfabm211jfccia2fx00zi"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.11.0-linux-amd64.tar.gz"; sha256 = "1ljw7va47k5db54s709a9z5haa2rygrx9h179139qhd3lrsml3yb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.128.1-linux-amd64.tar.gz"; - sha256 = "1w4bfps99km0xck81f20yh2lfy48rz7nh5kfz1l0r1xs5r9cwsgk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.128.2-linux-amd64.tar.gz"; + sha256 = "09bp5pw07hwfdas458va9j1wplnw5im75pdsjiyi9lb9b792frpp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-linux-amd64.tar.gz"; @@ -163,20 +163,20 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.216.0-darwin-x64.tar.gz"; - sha256 = "0hjllanz2zw7w1wy4vzj1csw4nzmsi6hsqlwgbsmx9hygmmzrdhh"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.217.1-darwin-x64.tar.gz"; + sha256 = "1avfk98qhk8aycf9d97nbcqvmsj0qn4xf0mk0n631csfiyidp6wn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.47.0-darwin-amd64.tar.gz"; - sha256 = "07fzvgf283kqir5bajmncr2lz9vkbp4y6zdn82kvv0fymw5x7q3x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.48.0-darwin-amd64.tar.gz"; + sha256 = "1zjs31cdhc9wryxigf5x1r88hkcvqsizkxdwydd1cn2svlc1pkik"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.3.0-darwin-amd64.tar.gz"; sha256 = "08i28x0fp4pxb14klgjdqi05hyw4ilj0iz5ri53mpmviyl1mrmaq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.92.0-darwin-amd64.tar.gz"; - sha256 = "06pz8jyd5g3i07h59bblvfmc5nzj4zvifbhhdpi1sch972m2frb7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.93.0-darwin-amd64.tar.gz"; + sha256 = "0zcr8a29n9a2wwm4jl0jqxjn2hbaywr1raajpdy51s5ij69vvw79"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.1-darwin-amd64.tar.gz"; @@ -275,16 +275,16 @@ sha256 = "0xyswa7bcci8maw1y0hzhmckcycnpvm492i8qihlmbsvz9ps7yk5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.19.0-darwin-amd64.tar.gz"; - sha256 = "02nm0d2vfi1nkzr06435npnq3wig5pib72frxrjgj0jcfy8z42p7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.19.1-darwin-amd64.tar.gz"; + sha256 = "0qqzq2p451znbkjj2zfx2rpj3y5iqk8yvhw74fj7ni6fzbhkdqih"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.11.0-darwin-amd64.tar.gz"; sha256 = "055pqfcqlns5hg92nlwx6gh0rfkb3r50g8s363xnvmksjhl655nm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.128.1-darwin-amd64.tar.gz"; - sha256 = "04hhzbns61fzd7qwyfpnm8lzq03z1vp95kqrph0sl6v2ygxvsqg4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.128.2-darwin-amd64.tar.gz"; + sha256 = "14waym55vv7yysyg709xk6h4nk97fqzplad6jpgi4wccrxbvan8p"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-darwin-amd64.tar.gz"; @@ -321,20 +321,20 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.216.0-linux-arm64.tar.gz"; - sha256 = "0y4j4fi6nxasp83b5awfn3p0g4xplapi81hkwpscy3m79f8vfkx5"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.217.1-linux-arm64.tar.gz"; + sha256 = "1g553c1c7mpx5v6fykly399rs9fvj4kk2br7x5d52v2jnhyqrw2w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.47.0-linux-arm64.tar.gz"; - sha256 = "051s1qdxwy68d2zpmgg7gwy491y0gf3z5d7vnid3wlfwfrs2zld9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.48.0-linux-arm64.tar.gz"; + sha256 = "0l2chxskd3lafgg7b04zv8y9p4hm3q29v1vjlky99anbcg0wjknw"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.3.0-linux-arm64.tar.gz"; sha256 = "0l3sgb5l0rjxj9msff6ywkvygn3pq96nbif3b85xssq7a0qsvh3c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.92.0-linux-arm64.tar.gz"; - sha256 = "01m7jgkhsjv6pkf5g6z8difpn3nk7w3f3izzb82jdrgn1rcc4r3b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.93.0-linux-arm64.tar.gz"; + sha256 = "0s96qfbfv0dj1w9p2rqzl2vcq5zcny5r35c5fwbvwsjfmkjyyhwl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.1-linux-arm64.tar.gz"; @@ -433,16 +433,16 @@ sha256 = "02gnjz35rzs3333x282wcy9hjshnkwgl4nwravvgaiwipc3w7bgz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.19.0-linux-arm64.tar.gz"; - sha256 = "0ljwx3zdjqbayxlya02lnb82pvcm9mlj5adx23zvj63bdl9qpsz6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.19.1-linux-arm64.tar.gz"; + sha256 = "0ik976ygv03axshcrwr3k3s1zvz90zywzqs6pmk2zs1z3n1vznag"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.11.0-linux-arm64.tar.gz"; sha256 = "0b6vzycqbb0cpv6mmgxd08xdn62v5b1vswn2gx6ky2ajsw4m68ia"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.128.1-linux-arm64.tar.gz"; - sha256 = "0qkvsxzabswb782680m6kv2flhjxbnag89nhw26wb5b68w5vb6i7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.128.2-linux-arm64.tar.gz"; + sha256 = "1mkd94igd6nwfaawc59vvam4zd2k075h9q0r4hm5r888izl3qfvz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-linux-arm64.tar.gz"; @@ -479,20 +479,20 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.216.0-darwin-arm64.tar.gz"; - sha256 = "0yxj3ss8lxzlni8wkzrg5fjiw4li4d3cdg9j85zl2cgw604xzvbx"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.217.1-darwin-arm64.tar.gz"; + sha256 = "1xxv3d1wqq596wq4qh6wr9ci0w037sq5x7h4bdxn5wb0751yh51d"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.47.0-darwin-arm64.tar.gz"; - sha256 = "0zi46nr0gjw58pxclggjjn9431hbbn4wh34y3d04qk46nyrwfhiy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.48.0-darwin-arm64.tar.gz"; + sha256 = "027y13r0f84kqcpfirwzyilnsmbn9240dsbdk1jl97m04zp0djhn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.3.0-darwin-arm64.tar.gz"; sha256 = "0hbrmmgh3pbsqcm20lz3kimxwls4s10cqssp19m344f9jwp33chq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.92.0-darwin-arm64.tar.gz"; - sha256 = "1s5v5jmvgld7ysm4dyzdk8614srbilx9l51hwx0kglp7hjhhv63k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.93.0-darwin-arm64.tar.gz"; + sha256 = "1gj2qx6vfc5kkajmz2r0qmwhjx3bxzdhw7c08bq2qkshfxhd78dg"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.1-darwin-arm64.tar.gz"; @@ -591,16 +591,16 @@ sha256 = "03xqhx0adxlqggk5fgs6wr8krd1jjwpsm7l594hd0ln892x5m80x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.19.0-darwin-arm64.tar.gz"; - sha256 = "1k7r06pxy1vwcl9i7n412bq6yr1rx7bnma6dam2sawvwsk8bysjy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.19.1-darwin-arm64.tar.gz"; + sha256 = "0ix35xf0l6jn5x9k0ic2jlk5jzyb8a7s34wvwsi24n1aw4cccdaa"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.11.0-darwin-arm64.tar.gz"; sha256 = "02dmd2qcljp4nv9q3sskv73hdga0bnq83zrr13llq66924lj7baf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.128.1-darwin-arm64.tar.gz"; - sha256 = "1dqb8b9bsqyriz9vn1i4ncv2h33hnpxw5m8fh4wpkcb9gp7wjn9n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.128.2-darwin-arm64.tar.gz"; + sha256 = "1cwv5v3ljjj3w937d814jypi9gzc3narx89i40ni9mdlrcyn0l4v"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 55c9deff20d3..ef000562d406 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { doInstallCheck = true; postInstall = '' - buildPythonPath "$out $pythonPath" + buildPythonPath "$out ''${pythonPath[*]}" gappsWrapperArgs+=( --prefix PATH : "$program_PATH" --set CUPS_DATADIR "${libcupsfilters}/share/cups" diff --git a/pkgs/tools/package-management/nix/modular/src/libstore/package.nix b/pkgs/tools/package-management/nix/modular/src/libstore/package.nix index 6c5978bfd7e8..3039120e37dc 100644 --- a/pkgs/tools/package-management/nix/modular/src/libstore/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libstore/package.nix @@ -25,7 +25,8 @@ withAWS ? # Default is this way because there have been issues building this dependency - lib.meta.availableOn stdenv.hostPlatform aws-c-common, + # TODO: aws-crt-cpp is broken on cygwin, find a good way to check that here + lib.meta.availableOn stdenv.hostPlatform aws-c-common && !stdenv.hostPlatform.isCygwin, }: mkMesonLibrary (finalAttrs: { diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index 90211ef1b393..613abfc30bde 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -41,14 +41,14 @@ rustPlatform.buildRustPackage rec { nativeCheckInputs = [ ansi2html ]; # Skip tests that use the network and that include files. checkFlags = [ - "--skip magic::tests::detect_mimetype_of_larger_than_magic_param_bytes_max_length" - "--skip magic::tests::detect_mimetype_of_magic_param_bytes_max_length" - "--skip magic::tests::detect_mimetype_of_png_image" - "--skip magic::tests::detect_mimetype_of_svg_image" - "--skip resources::tests::read_url_with_http_url_fails_when_size_limit_is_exceeded" - "--skip resources::tests::read_url_with_http_url_fails_when_status_404" - "--skip resources::tests::read_url_with_http_url_returns_content_when_status_200" - "--skip iterm2_tests_render_md_samples_images_md" + "--skip=magic::tests::detect_mimetype_of_larger_than_magic_param_bytes_max_length" + "--skip=magic::tests::detect_mimetype_of_magic_param_bytes_max_length" + "--skip=magic::tests::detect_mimetype_of_png_image" + "--skip=magic::tests::detect_mimetype_of_svg_image" + "--skip=resources::tests::read_url_with_http_url_fails_when_size_limit_is_exceeded" + "--skip=resources::tests::read_url_with_http_url_fails_when_status_404" + "--skip=resources::tests::read_url_with_http_url_returns_content_when_status_200" + "--skip=iterm2_tests_render_md_samples_images_md" ]; postInstall = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ab11ab15070..7d3d396b73cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1345,10 +1345,6 @@ with pkgs; ### APPLICATIONS/TERMINAL-EMULATORS - kitty = callPackage ../by-name/ki/kitty/package.nix { - inherit (darwin) autoSignDarwinBinariesHook; - }; - mlterm-wayland = mlterm.override { enableX11 = false; }; @@ -1796,10 +1792,6 @@ with pkgs; easyocr = with python3.pkgs; toPythonApplication easyocr; - element-web = callPackage ../by-name/el/element-web/package.nix { - conf = config.element-web.conf or { }; - }; - espanso-wayland = espanso.override { x11Support = false; waylandSupport = !stdenv.hostPlatform.isDarwin; @@ -1943,10 +1935,6 @@ with pkgs; mobilizon-frontend = callPackage ../servers/mobilizon/frontend.nix { }; }; - monado = callPackage ../by-name/mo/monado/package.nix { - inherit (gst_all_1) gstreamer gst-plugins-base; - }; - nltk-data = recurseIntoAttrs (callPackage ../tools/text/nltk-data { }); seabios-coreboot = seabios.override { ___build-type = "coreboot"; }; @@ -2156,8 +2144,6 @@ with pkgs; unify = with python3Packages; toPythonApplication unify; - usb-modeswitch-data = callPackage ../by-name/us/usb-modeswitch/data.nix { }; - persistent-evdev = python3Packages.callPackage ../servers/persistent-evdev { }; inherit (import ../development/libraries/libsbsms pkgs) @@ -6276,10 +6262,6 @@ with pkgs; replay-node-cli ; - rescript-language-server = callPackage ../by-name/re/rescript-language-server/package.nix { - rescript-editor-analysis = vscode-extensions.chenglou92.rescript-vscode.rescript-editor-analysis; - }; - rnginline = with python3Packages; toPythonApplication rnginline; rr = callPackage ../development/tools/analysis/rr { }; @@ -6486,6 +6468,7 @@ with pkgs; boost187 boost188 boost189 + boost190 ; boost = boost187; @@ -7994,10 +7977,6 @@ with pkgs; gtkVersion = "4"; }; - vtfedit = callPackage ../by-name/vt/vtfedit/package.nix { - wine = wineWowPackages.staging; - }; - inherit (callPackage ../development/libraries/vtk { }) vtk_9_5; vtk = vtk_9_5; @@ -10025,10 +10004,6 @@ with pkgs; extraIntegrations = extras; }; - dbeaver-bin = callPackage ../by-name/db/dbeaver-bin/package.nix { - inherit (darwin) autoSignDarwinBinariesHook; - }; - deadbeefPlugins = recurseIntoAttrs { headerbar-gtk3 = callPackage ../applications/audio/deadbeef/plugins/headerbar-gtk3.nix { }; lyricbar = callPackage ../applications/audio/deadbeef/plugins/lyricbar.nix { }; @@ -12049,9 +12024,7 @@ with pkgs; pmars-x11 = pmars.override { enableXwinGraphics = true; }; - vanillatd = callPackage ../by-name/va/vanillatd/package.nix { appName = "vanillatd"; }; - - vanillara = callPackage ../by-name/va/vanillatd/package.nix { appName = "vanillara"; }; + vanillara = vanillatd.override { appName = "vanillara"; }; anki-utils = callPackage ../by-name/an/anki/addons/anki-utils.nix { }; ankiAddons = recurseIntoAttrs (callPackage ../by-name/an/anki/addons { }); @@ -12103,8 +12076,6 @@ with pkgs; d2x-rebirth-full ; - factorio = callPackage ../by-name/fa/factorio/package.nix { releaseType = "alpha"; }; - factorio-experimental = factorio.override { releaseType = "alpha"; experimental = true; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4886e9aa6060..1791abfe97d8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12997,10 +12997,10 @@ with self; FFIPlatypus = buildPerlPackage { pname = "FFI-Platypus"; - version = "2.09"; + version = "2.10"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/FFI-Platypus-2.09.tar.gz"; - hash = "sha256-nTEjEiieeHNbRcMRt6wWqejaCT93m/aUaccK+sTdW2M="; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/FFI-Platypus-2.10.tar.gz"; + hash = "sha256-ZxFcAjF7I9EZtu4aXm1fJvr4mFlD61PPiGLFcZ54+28="; }; buildInputs = [ AlienFFI diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a00111cb5d7a..abd85a81e1d8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5278,6 +5278,8 @@ self: super: with self; { fastapi-sso = callPackage ../development/python-modules/fastapi-sso { }; + fastapi-versionizer = callPackage ../development/python-modules/fastapi-versionizer { }; + fastavro = callPackage ../development/python-modules/fastavro { }; fastbencode = callPackage ../development/python-modules/fastbencode { }; @@ -9114,6 +9116,10 @@ self: super: with self; { logboth = callPackage ../development/python-modules/logboth { }; + logfire = callPackage ../development/python-modules/logfire { }; + + logfire-api = callPackage ../development/python-modules/logfire-api { }; + logfury = callPackage ../development/python-modules/logfury { }; logging-journald = callPackage ../development/python-modules/logging-journald { };