diff --git a/lib/debug.nix b/lib/debug.nix index 8dac6bb727a0..775db5a32997 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -28,11 +28,15 @@ let generators id mapAttrs - trace ; in rec { + inherit (builtins) + trace + addErrorContext + unsafeGetAttrPos + ; # -- TRACING -- diff --git a/lib/default.nix b/lib/default.nix index 044277fa24f5..7dfa9354fa7f 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -105,15 +105,6 @@ let # network network = callLibs ./network; - # TODO: For consistency, all builtins should also be available from a sub-library; - # these are the only ones that are currently not - inherit (builtins) - addErrorContext - isPath - trace - typeOf - unsafeGetAttrPos - ; inherit (self.trivial) id const @@ -335,6 +326,7 @@ let escape escapeShellArg escapeShellArgs + isPath isStorePath isStringLike isValidPosixName @@ -351,6 +343,7 @@ let toUpper toCamelCase toSentenceCase + typeOf addContextFrom splitString splitStringBy @@ -518,6 +511,7 @@ let assertOneOf ; inherit (self.debug) + trace traceIf traceVal traceValFn @@ -528,6 +522,8 @@ let traceValSeqN traceValSeqNFn traceFnSeqN + addErrorContext + unsafeGetAttrPos runTests testAllTrue ; diff --git a/lib/trivial.nix b/lib/trivial.nix index 317b993f12d2..5e527a1614e2 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -18,6 +18,23 @@ let ; in { + # Pull in some builtins not included elsewhere. + inherit (builtins) + pathExists + readFile + isBool + isInt + isFloat + add + sub + lessThan + seq + deepSeq + genericClosure + bitAnd + bitOr + bitXor + ; ## Simple (higher order) functions @@ -388,24 +405,6 @@ in */ mapNullable = f: a: if a == null then a else f a; - # Pull in some builtins not included elsewhere. - inherit (builtins) - pathExists - readFile - isBool - isInt - isFloat - add - sub - lessThan - seq - deepSeq - genericClosure - bitAnd - bitOr - bitXor - ; - ## nixpkgs version strings /** diff --git a/maintainers/github-teams.json b/maintainers/github-teams.json index ab0fd2491d3c..2ca3ab752591 100644 --- a/maintainers/github-teams.json +++ b/maintainers/github-teams.json @@ -582,6 +582,7 @@ }, "members": { "Cryolitia": 23723294, + "Moraxyc": 69713071, "darkyzhou": 7220778, "dramforever": 2818072, "wegank": 9713184 diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9b146e5363cf..472d56cd68dd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -29588,6 +29588,12 @@ githubId = 71881325; name = "Stefan Bordei"; }; + ZZBaron = { + email = "zzbarona+nix@gmail.com"; + github = "ZZBaron"; + githubId = 157318434; + name = "ZZBaron"; + }; zzzsy = { email = "me@zzzsy.top"; github = "zzzsyyy"; diff --git a/nixos/modules/programs/wayland/hyprland.nix b/nixos/modules/programs/wayland/hyprland.nix index 1c827fc6bf31..ae9d224778c2 100644 --- a/nixos/modules/programs/wayland/hyprland.nix +++ b/nixos/modules/programs/wayland/hyprland.nix @@ -14,7 +14,7 @@ in options.programs.hyprland = { enable = lib.mkEnableOption '' Hyprland, the dynamic tiling Wayland compositor that doesn't sacrifice on its looks. - You can manually launch Hyprland by executing {command}`Hyprland` on a TTY. + You can manually launch Hyprland by executing {command}`start-hyprland` on a TTY. A configuration file will be generated in {file}`~/.config/hypr/hyprland.conf`. See for more information''; @@ -103,7 +103,7 @@ in hyprland = { prettyName = "Hyprland"; comment = "Hyprland compositor managed by UWSM"; - binPath = "/run/current-system/sw/bin/Hyprland"; + binPath = "/run/current-system/sw/bin/start-hyprland"; }; }; }) diff --git a/nixos/modules/programs/yazi.nix b/nixos/modules/programs/yazi.nix index b6c7e3133bd7..b19b7abff758 100644 --- a/nixos/modules/programs/yazi.nix +++ b/nixos/modules/programs/yazi.nix @@ -14,6 +14,7 @@ let "yazi" "theme" "keymap" + "vfs" ]; in { diff --git a/nixos/modules/services/networking/anubis.nix b/nixos/modules/services/networking/anubis.nix index fefc7001677d..37ab52b51b36 100644 --- a/nixos/modules/services/networking/anubis.nix +++ b/nixos/modules/services/networking/anubis.nix @@ -19,20 +19,8 @@ let (unixAddr settings.BIND_NETWORK settings.BIND) (unixAddr settings.METRICS_BIND_NETWORK settings.METRICS_BIND) ]; - - runtimeDirectoryPrefix = name: "/run/anubis/${instanceName name}/"; instanceUsesUnixSockets = instance: lib.length (unixSocketAddrs instance.settings) > 0; - instanceUsesDedicatedRuntimeDirectory = - name: instance: - lib.any (lib.hasPrefix (runtimeDirectoryPrefix name)) (unixSocketAddrs instance.settings); - useLegacyRuntimeDirectory = - # Set when: - # - Only one instance is configured with unix sockets. - # - No instance uses the new runtime directory prefix: /run/anubis/anubis-. - lib.count instanceUsesUnixSockets (lib.attrValues enabledInstances) == 1 - && !(lib.any (attrs: instanceUsesDedicatedRuntimeDirectory attrs.name attrs.value) ( - lib.attrsToList enabledInstances - )); + runtimeDirectoryPrefix = name: "/run/anubis/${instanceName name}/"; commonSubmodule = isDefault: @@ -204,10 +192,12 @@ let options = { # see other options above BIND = lib.mkOption { - default = "/run/anubis/${instanceName name}.sock"; + default = "${runtimeDirectoryPrefix name}anubis.sock"; description = '' The address that Anubis listens to. See Go's [`net.Listen`](https://pkg.go.dev/net#Listen) for syntax. - Use the prefix "${runtimeDirectoryPrefix ""}". The prefix "/run/anubis" is deprecated. + When using unix sockets: + - use the prefix "${runtimeDirectoryPrefix ""}" if the instance name is the empty string, + - "${runtimeDirectoryPrefix ""}" otherwise. Defaults to Unix domain sockets. To use TCP sockets, set this to a TCP address and `BIND_NETWORK` to `"tcp"`. ''; @@ -215,11 +205,13 @@ let type = types.str; }; METRICS_BIND = lib.mkOption { - default = "/run/anubis/${instanceName name}-metrics.sock"; + default = "${runtimeDirectoryPrefix name}anubis-metrics.sock"; description = '' The address Anubis' metrics server listens to. See Go's [`net.Listen`](https://pkg.go.dev/net#Listen) for syntax. - Use the prefix "${runtimeDirectoryPrefix ""}". The prefix "/run/anubis" is deprecated. + When using unix sockets: + - use the prefix "${runtimeDirectoryPrefix ""}" if the instance name is the empty string, + - "${runtimeDirectoryPrefix ""}" otherwise. The metrics server is enabled by default and may be disabled. However, due to implementation details, this is only possible by setting a command line flag. See {option}`services.anubis.defaultOptions.extraFlags` for an @@ -269,20 +261,22 @@ in }; config = lib.mkIf (enabledInstances != { }) { - warnings = lib.optional useLegacyRuntimeDirectory ''Anubis service: runtime directory is going to be migrated from "anubis" to "anubis/anubis-". Update services.anubis.instances..BIND to "${runtimeDirectoryPrefix ""}anubis.sock" and services.anubis.instances..METRICS_BIND to "${runtimeDirectoryPrefix ""}anubis-metrics.sock". Note: if is "", use the prefix "/run/anubis/anubis".''; - assertions = let validInstanceUnixSocketAddrs = - { name, value }: - lib.all (lib.hasPrefix (runtimeDirectoryPrefix name)) (unixSocketAddrs value.settings); + name: instance: + lib.all (lib.hasPrefix (runtimeDirectoryPrefix name)) (unixSocketAddrs instance.settings); in [ { - assertion = - useLegacyRuntimeDirectory - || lib.all validInstanceUnixSocketAddrs (lib.attrsToList enabledInstances); - message = ''use the prefix "${runtimeDirectoryPrefix ""}" in services.anubis.instances..BIND and services.anubis.instances..METRICS_BIND''; + assertion = lib.all (attrs: validInstanceUnixSocketAddrs attrs.name attrs.value) ( + lib.attrsToList enabledInstances + ); + message = '' + When using unix sockets in services.anubis.instances..settings.BIND and services.anubis.instances..settings.METRICS_BIND: + - use the prefix "${runtimeDirectoryPrefix ""}" if the instance name is the empty string, + - "${runtimeDirectoryPrefix ""}" otherwise. + ''; } ]; @@ -328,14 +322,7 @@ in ExecStart = lib.concatStringsSep " " ( (lib.singleton (lib.getExe cfg.package)) ++ instance.extraFlags ); - RuntimeDirectory = - if useLegacyRuntimeDirectory && instanceUsesUnixSockets instance then - # Warning: `anubis` will be deprecated eventually. - "anubis" - else if instanceUsesUnixSockets instance then - "anubis/${instanceName name}" - else - null; + RuntimeDirectory = if instanceUsesUnixSockets instance then "anubis/${instanceName name}" else null; # hardening NoNewPrivileges = true; CapabilityBoundingSet = null; diff --git a/nixos/modules/services/web-apps/freshrss.nix b/nixos/modules/services/web-apps/freshrss.nix index 758807b3c9b8..2544bd846424 100644 --- a/nixos/modules/services/web-apps/freshrss.nix +++ b/nixos/modules/services/web-apps/freshrss.nix @@ -357,15 +357,15 @@ in script = let + isUserAuth = cfg.authType == "form" || cfg.authType == "none"; + userScriptArgs = ''--user ${cfg.defaultUser} ${ optionalString (cfg.authType == "form") ''--password "$(cat ${cfg.passwordFile})"'' }''; - updateUserScript = optionalString (cfg.authType == "form" || cfg.authType == "none") '' - ./cli/update-user.php ${userScriptArgs} - ''; - createUserScript = optionalString (cfg.authType == "form" || cfg.authType == "none") '' - ./cli/create-user.php ${userScriptArgs} - ''; + mkUserScript = name: optionalString isUserAuth ''./cli/${name}.php ${userScriptArgs}''; + + updateUserScript = mkUserScript "update-user"; + createUserScript = mkUserScript "create-user"; in '' # do installation or reconfigure diff --git a/nixos/tests/anubis.nix b/nixos/tests/anubis.nix index b2b3b2f8fa82..67f21d2e55be 100644 --- a/nixos/tests/anubis.nix +++ b/nixos/tests/anubis.nix @@ -39,72 +39,6 @@ in ryand56 ]; - nodes.machineLegacy = - { config, pkgs, ... }: - { - services.anubis = { - defaultOptions = { - botPolicy = builtins.fromJSON legacyBotPolicyJSON; - settings = { - DIFFICULTY = 3; - USER_DEFINED_DEFAULT = true; - }; - }; - - instances."".settings = { - TARGET = "http://localhost:8080"; - DIFFICULTY = 5; - USER_DEFINED_INSTANCE = true; - }; - - instances."tcp" = { - user = "anubis-tcp"; - group = "anubis-tcp"; - settings = { - TARGET = "http://localhost:8080"; - BIND = "127.0.0.1:9000"; - BIND_NETWORK = "tcp"; - METRICS_BIND = "127.0.0.1:9001"; - METRICS_BIND_NETWORK = "tcp"; - }; - }; - }; - - users.users.nginx.extraGroups = [ config.users.groups.anubis.name ]; - services.nginx = { - enable = true; - recommendedProxySettings = true; - virtualHosts."basic.localhost".locations = { - "/".proxyPass = "http://unix:${config.services.anubis.instances."".settings.BIND}"; - "/metrics".proxyPass = "http://unix:${config.services.anubis.instances."".settings.METRICS_BIND}"; - }; - - virtualHosts."tcp.localhost".locations = { - "/".proxyPass = "http://${config.services.anubis.instances."tcp".settings.BIND}"; - "/metrics".proxyPass = "http://${config.services.anubis.instances."tcp".settings.METRICS_BIND}"; - }; - - # emulate an upstream with nginx, listening on tcp and unix sockets. - virtualHosts."upstream.localhost" = { - default = true; # make nginx match this vhost for `localhost` - listen = [ - { addr = "unix:/run/nginx/nginx.sock"; } - { - addr = "localhost"; - port = 8080; - } - ]; - locations."/" = { - tryFiles = "$uri $uri/index.html =404"; - root = pkgs.runCommand "anubis-test-upstream" { } '' - mkdir $out - echo "it works" >> $out/index.html - ''; - }; - }; - }; - }; - nodes.machine = { config, pkgs, ... }: { @@ -131,8 +65,6 @@ in TARGET = "http://localhost:8080"; DIFFICULTY = 5; USER_DEFINED_INSTANCE = true; - BIND = "/run/anubis/anubis/anubis.sock"; - METRICS_BIND = "/run/anubis/anubis/anubis-metrics.sock"; }; instances."tcp" = { @@ -150,16 +82,12 @@ in instances."another-unix-listen" = { settings = { TARGET = "http://localhost:8080"; - BIND = "/run/anubis/anubis-another-unix-listen/anubis.sock"; - METRICS_BIND = "/run/anubis/anubis-another-unix-listen/anubis-metrics.sock"; }; }; instances."unix-upstream" = { group = "nginx"; settings = { - BIND = "/run/anubis/anubis-unix-upstream/anubis.sock"; - METRICS_BIND = "/run/anubis/anubis-unix-upstream/anubis-metrics.sock"; TARGET = "unix:///run/nginx/nginx.sock"; }; }; @@ -168,8 +96,6 @@ in botPolicy = null; settings = { TARGET = "http://localhost:8080"; - BIND = "/run/anubis/anubis-botPolicy-default/anubis.sock"; - METRICS_BIND = "/run/anubis/anubis-botPolicy-default/anubis-metrics.sock"; }; }; @@ -177,8 +103,6 @@ in settings = { TARGET = "http://localhost:8080"; POLICY_FNAME = "/etc/anubis-botPolicy.json"; - BIND = "/run/anubis/anubis-botPolicy-file/anubis.sock"; - METRICS_BIND = "/run/anubis/anubis-botPolicy-file/anubis-metrics.sock"; }; }; }; @@ -233,61 +157,43 @@ in }; testScript = '' - with subtest("Legacy anubis service configuration: supports only a single RuntimeDirectory"): - for unit in ["nginx", "anubis", "anubis-tcp"]: - machineLegacy.wait_for_unit(unit + ".service") + for unit in ["nginx", "anubis", "anubis-another-unix-listen", "anubis-tcp", "anubis-unix-upstream"]: + machine.wait_for_unit(unit + ".service") - machineLegacy.wait_for_open_unix_socket("/run/anubis/anubis.sock") - machineLegacy.wait_for_open_unix_socket("/run/anubis/anubis-metrics.sock") + for port in [9000, 9001]: + machine.wait_for_open_port(port) - # Default unix socket mode with 1 instance listening on unix sockets. - machineLegacy.succeed('curl -f http://localhost:8080 | grep "it works"') - machineLegacy.succeed('curl -f http://basic.localhost | grep "it works"') - machineLegacy.succeed('curl -f http://basic.localhost -H "User-Agent: Mozilla" | grep anubis') - machineLegacy.succeed('curl -f http://basic.localhost/metrics | grep anubis_challenges_issued') + machine.wait_for_open_unix_socket("/run/anubis/anubis/anubis.sock") + machine.wait_for_open_unix_socket("/run/anubis/anubis/anubis-metrics.sock") + for instance in ["another-unix-listen", "unix-upstream"]: + machine.wait_for_open_unix_socket(f"/run/anubis/anubis-{instance}/anubis.sock") + machine.wait_for_open_unix_socket(f"/run/anubis/anubis-{instance}/anubis-metrics.sock") - # TCP mode. - machineLegacy.succeed('curl -f http://tcp.localhost -H "User-Agent: Mozilla" | grep anubis') - machineLegacy.succeed('curl -f http://tcp.localhost/metrics | grep anubis_challenges_issued') + machine.succeed('curl -f http://basic.localhost | grep "it works"') + machine.succeed('curl -f http://basic.localhost -H "User-Agent: Mozilla" | grep anubis') + machine.succeed('curl -f http://basic.localhost/metrics | grep anubis_challenges_issued') - with subtest("Dedicated RuntimeDirectory"): - for unit in ["nginx", "anubis", "anubis-another-unix-listen", "anubis-tcp", "anubis-unix-upstream"]: - machine.wait_for_unit(unit + ".service") + machine.succeed('curl -f http://another-unix-listen.localhost -H "User-Agent: Mozilla" | grep anubis') + machine.succeed('curl -f http://another-unix-listen.localhost/metrics | grep anubis_challenges_issued') - for port in [9000, 9001]: - machine.wait_for_open_port(port) + # Upstream is a unix socket mode. + machine.succeed('curl -f http://unix.localhost/index.html | grep "it works"') - machine.wait_for_open_unix_socket("/run/anubis/anubis/anubis.sock") - machine.wait_for_open_unix_socket("/run/anubis/anubis/anubis-metrics.sock") - for instance in ["another-unix-listen", "unix-upstream"]: - machine.wait_for_open_unix_socket(f"/run/anubis/anubis-{instance}/anubis.sock") - machine.wait_for_open_unix_socket(f"/run/anubis/anubis-{instance}/anubis-metrics.sock") + # Default user-defined environment variables. + machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "USER_DEFINED_DEFAULT"') + machine.succeed('cat /run/current-system/etc/systemd/system/anubis-tcp.service | grep "USER_DEFINED_DEFAULT"') - machine.succeed('curl -f http://basic.localhost | grep "it works"') - machine.succeed('curl -f http://basic.localhost -H "User-Agent: Mozilla" | grep anubis') - machine.succeed('curl -f http://basic.localhost/metrics | grep anubis_challenges_issued') + # Instance-specific user-specified environment variables. + machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "USER_DEFINED_INSTANCE"') + machine.fail('cat /run/current-system/etc/systemd/system/anubis-tcp.service | grep "USER_DEFINED_INSTANCE"') - machine.succeed('curl -f http://another-unix-listen.localhost -H "User-Agent: Mozilla" | grep anubis') - machine.succeed('curl -f http://another-unix-listen.localhost/metrics | grep anubis_challenges_issued') + # Make sure defaults don't overwrite themselves. + machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "DIFFICULTY=5"') + machine.succeed('cat /run/current-system/etc/systemd/system/anubis-tcp.service | grep "DIFFICULTY=3"') - # Upstream is a unix socket mode. - machine.succeed('curl -f http://unix.localhost/index.html | grep "it works"') - - # Default user-defined environment variables. - machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "USER_DEFINED_DEFAULT"') - machine.succeed('cat /run/current-system/etc/systemd/system/anubis-tcp.service | grep "USER_DEFINED_DEFAULT"') - - # Instance-specific user-specified environment variables. - machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "USER_DEFINED_INSTANCE"') - machine.fail('cat /run/current-system/etc/systemd/system/anubis-tcp.service | grep "USER_DEFINED_INSTANCE"') - - # Make sure defaults don't overwrite themselves. - machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "DIFFICULTY=5"') - machine.succeed('cat /run/current-system/etc/systemd/system/anubis-tcp.service | grep "DIFFICULTY=3"') - - # Check correct BotPolicy settings are applied - machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "POLICY_FNAME=/nix/store"') - machine.fail('cat /run/current-system/etc/systemd/system/anubis-botPolicy-default.service | grep "POLICY_FNAME="') - machine.succeed('cat /run/current-system/etc/systemd/system/anubis-botPolicy-file.service | grep "POLICY_FNAME=/etc/anubis-botPolicy.json"') + # Check correct BotPolicy settings are applied + machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "POLICY_FNAME=/nix/store"') + machine.fail('cat /run/current-system/etc/systemd/system/anubis-botPolicy-default.service | grep "POLICY_FNAME="') + machine.succeed('cat /run/current-system/etc/systemd/system/anubis-botPolicy-file.service | grep "POLICY_FNAME=/etc/anubis-botPolicy.json"') ''; } diff --git a/nixos/tests/freshrss/caddy-sqlite.nix b/nixos/tests/freshrss/caddy-sqlite.nix index 3c2e60e5e3bb..ebee8a06446d 100644 --- a/nixos/tests/freshrss/caddy-sqlite.nix +++ b/nixos/tests/freshrss/caddy-sqlite.nix @@ -22,7 +22,7 @@ testScript = '' machine.wait_for_unit("multi-user.target") machine.wait_for_open_port(80) - response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://localhost:80/i/") + response = machine.succeed("curl --fail-with-body --silent --header 'Host: freshrss' http://localhost:80/i/") assert 'Login · FreshRSS' in response, "Login page didn't load successfully" ''; } diff --git a/nixos/tests/freshrss/extensions.nix b/nixos/tests/freshrss/extensions.nix index bf624a6041b6..cbb033df4162 100644 --- a/nixos/tests/freshrss/extensions.nix +++ b/nixos/tests/freshrss/extensions.nix @@ -20,17 +20,18 @@ ]; testScript = '' + from lxml import etree + machine.wait_for_unit("multi-user.target") machine.wait_for_open_port(80) - response = machine.succeed("curl -s http://localhost:80/i/?c=extension") + response = machine.succeed("curl --fail-with-body --silent http://localhost:80/i/?c=extension") assert 'YouTube Video Feed' in response, "Extension not present in extensions page." # enable Title-Wrap extension - from lxml import etree tree = etree.HTML(response) csrf = tree.xpath("/html/body/header/nav/form/input/@value")[0] - response = machine.succeed(f"curl --fail-with-body -s 'http://localhost:80/i/?c=extension&a=enable&e=Title-Wrap' -d '_csrf={csrf}'") + machine.succeed(f"curl --fail-with-body --silent 'http://localhost:80/i/?c=extension&a=enable&e=Title-Wrap' -d '_csrf={csrf}'") # verify that the Title-Wrap css is accessible. - machine.succeed("curl --fail-with-body -s 'http://localhost:80/ext.php?1=&f=xExtension-TitleWrap/static/title_wrap.css'") + machine.succeed("curl --fail-with-body --silent 'http://localhost:80/ext.php?1=&f=xExtension-TitleWrap/static/title_wrap.css'") ''; } diff --git a/nixos/tests/freshrss/http-auth.nix b/nixos/tests/freshrss/http-auth.nix index 1f6fd1ad8e7d..c506e168bfd2 100644 --- a/nixos/tests/freshrss/http-auth.nix +++ b/nixos/tests/freshrss/http-auth.nix @@ -15,7 +15,7 @@ testScript = '' machine.wait_for_unit("multi-user.target") machine.wait_for_open_port(80) - response = machine.succeed("curl -vvv -s -H 'Host: freshrss' -H 'Remote-User: testuser' http://localhost:80/i/") + response = machine.succeed("curl --fail-with-body --silent -H 'Remote-User: testuser' http://localhost:80/i/") assert 'Account: testuser' in response, "http_auth method didn't work." ''; } diff --git a/nixos/tests/freshrss/nginx-sqlite.nix b/nixos/tests/freshrss/nginx-sqlite.nix index c8097465d8cd..9c025523ea6d 100644 --- a/nixos/tests/freshrss/nginx-sqlite.nix +++ b/nixos/tests/freshrss/nginx-sqlite.nix @@ -20,7 +20,7 @@ testScript = '' machine.wait_for_unit("multi-user.target") machine.wait_for_open_port(80) - response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://localhost:80/i/") + response = machine.succeed("curl --fail-with-body --silent http://localhost:80/i/") assert 'Login · FreshRSS' in response, "Login page didn't load successfully" ''; } diff --git a/nixos/tests/freshrss/none-auth.nix b/nixos/tests/freshrss/none-auth.nix index 77d636f88071..b87da4522538 100644 --- a/nixos/tests/freshrss/none-auth.nix +++ b/nixos/tests/freshrss/none-auth.nix @@ -14,7 +14,7 @@ testScript = '' machine.wait_for_unit("multi-user.target") machine.wait_for_open_port(80) - response = machine.succeed("curl -vvv -s http://localhost:80/i/") + response = machine.succeed("curl --fail-with-body --silent http://localhost:80/i/") assert ' · FreshRSS' in response, "FreshRSS stream page didn't load successfully" ''; } diff --git a/nixos/tests/freshrss/pgsql.nix b/nixos/tests/freshrss/pgsql.nix index 5fceb98b0efb..ec9864499fad 100644 --- a/nixos/tests/freshrss/pgsql.nix +++ b/nixos/tests/freshrss/pgsql.nix @@ -46,7 +46,7 @@ machine.wait_for_unit("multi-user.target") machine.wait_for_open_port(5432) machine.wait_for_open_port(80) - response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://localhost:80/i/") + response = machine.succeed("curl --fail-with-body --silent http://localhost:80/i/") assert 'Login · FreshRSS' in response, "Login page didn't load successfully" ''; } diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix index c5a797ec4ad4..597a74d28ab6 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix @@ -21,8 +21,6 @@ melpaBuild { files = ''(:defaults "msg")''; - passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; }; - meta = { homepage = "https://github.com/misohena/el-easydraw"; description = "Embedded drawing tool for Emacs"; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 7a366a6f796a..265712cd3940 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -763,6 +763,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + alabaster-nvim = buildVimPlugin { + pname = "alabaster.nvim"; + version = "2025-11-21"; + src = fetchFromGitHub { + owner = "p00f"; + repo = "alabaster.nvim"; + rev = "1fc9e29fbbce94f127cc8b21960b7e3c85187960"; + sha256 = "0jm5rlc1j4gni8qgcba0ssdnakdpl0hrqlm61xmipv0k2sr3wy2y"; + }; + meta.homepage = "https://github.com/p00f/alabaster.nvim/"; + meta.hydraPlatforms = [ ]; + }; + alchemist-vim = buildVimPlugin { pname = "alchemist.vim"; version = "3.5.0-unstable-2023-09-01"; @@ -947,7 +960,7 @@ final: prev: { artio-nvim = buildVimPlugin { pname = "artio.nvim"; - version = "2025-12-28"; + version = "0-unstable-2025-12-28"; src = fetchFromGitHub { owner = "comfysage"; repo = "artio.nvim"; @@ -9174,6 +9187,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + model-nvim = buildVimPlugin { + pname = "model.nvim"; + version = "0-unstable-2025-07-15"; + src = fetchFromGitHub { + owner = "gsuuon"; + repo = "model.nvim"; + rev = "c4653e9a9431c2629725b919e37eac83d0dbb6aa"; + hash = "sha256-gz97C8/tlU4SDKLaQ5Lv2NbQP8zQRsNxiIQWHoHHDJY="; + }; + meta.homepage = "https://github.com/gsuuon/model.nvim/"; + meta.hydraPlatforms = [ ]; + }; + modicator-nvim = buildVimPlugin { pname = "modicator.nvim"; version = "0-unstable-2025-10-24"; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix index 60ce3afce38b..80ea598076a8 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix @@ -18,18 +18,18 @@ nix-update-script, }: let - version = "1.3.20"; + version = "1.3.21"; src = fetchFromGitHub { owner = "michaelb"; repo = "sniprun"; tag = "v${version}"; - hash = "sha256-z8viNr1TBGfWqgjfZKYJTEa1/KytKBmLbqcQrAiTZyc="; + hash = "sha256-L/OTi6vHyfcvlVgpgjiU3MBCd6v00GKlAkUwBm4X500="; }; sniprun-bin = rustPlatform.buildRustPackage { pname = "sniprun-bin"; inherit version src; - cargoHash = "sha256-Ki1IFQzG4rOakGX5HsYWL8GeQ53dN7WAIZ113+bwcvI="; + cargoHash = "sha256-6xh4YyXGIqrU9ixQ6QDCGDtaROoPe8iSMlytclbqqtY="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/sniprun/fix-paths.patch b/pkgs/applications/editors/vim/plugins/non-generated/sniprun/fix-paths.patch index 003a8014b598..71df88215109 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/sniprun/fix-paths.patch +++ b/pkgs/applications/editors/vim/plugins/non-generated/sniprun/fix-paths.patch @@ -1,13 +1,12 @@ diff --git a/lua/sniprun.lua b/lua/sniprun.lua -index 49be442..9342351 100644 +index 2c5d460..f785caa 100644 --- a/lua/sniprun.lua +++ b/lua/sniprun.lua -@@ -3,9 +3,7 @@ M.ping_anwsered = 0 +@@ -3,8 +3,7 @@ M.ping_anwsered = 0 M.info_floatwin = {} -- See https://github.com/tjdevries/rofl.nvim/blob/632c10f2ec7c56882a3f7eda8849904bcac6e8af/lua/rofl.lua --local binary_path = vim.fn.fnamemodify( -- vim.api.nvim_get_runtime_file("lua/sniprun.lua", false)[1], ":h:h") +-local binary_path = vim.fn.fnamemodify(vim.api.nvim_get_runtime_file("lua/sniprun.lua", false)[1], ":h:h") - .. "/target/release/sniprun" +local binary_path = "@sniprun@" diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index fb3f9ae61c8f..522c06fd96f1 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -57,6 +57,7 @@ https://github.com/derekelkins/agda-vim/,, https://github.com/emmanueltouzery/agitator.nvim/,HEAD, https://github.com/aduros/ai.vim/,HEAD, https://github.com/joshuavial/aider.nvim/,HEAD, +https://github.com/p00f/alabaster.nvim/,HEAD, https://github.com/slashmili/alchemist.vim/,, https://github.com/dense-analysis/ale/,, https://github.com/vim-scripts/align/,, @@ -704,6 +705,7 @@ https://github.com/milanglacier/minuet-ai.nvim/,HEAD, https://github.com/jghauser/mkdir.nvim/,main, https://github.com/jakewvincent/mkdnflow.nvim/,HEAD, https://github.com/SidOfc/mkdx/,, +https://github.com/gsuuon/model.nvim/,HEAD, https://github.com/mawkler/modicator.nvim/,HEAD, https://github.com/miikanissi/modus-themes.nvim/,HEAD, https://github.com/tomasr/molokai/,, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 6f9d8d28ecf3..752502c43801 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1965,8 +1965,8 @@ let mktplcRef = { name = "gitlab-workflow"; publisher = "gitlab"; - version = "6.61.2"; - hash = "sha256-NLWu/4QgG/vbhTVjV57bt6J7AX2kC59/2xNkj8PMdtc="; + version = "6.62.1"; + hash = "sha256-Sbtrmla1vRZ7isSvr5QhDiP519/IG/VJ5zI9Y28UFx4="; }; meta = { description = "GitLab extension for Visual Studio Code"; @@ -5363,8 +5363,8 @@ let mktplcRef = { name = "pretty-ts-errors"; publisher = "yoavbls"; - version = "0.6.1"; - hash = "sha256-LvX21nEjgayNd9q+uXkahmdYwzfWBZOhQaF+clFUUF4="; + version = "0.7.0"; + hash = "sha256-+PKxy1YN8ZP0hstb7PXZH+5L4n2l/j5J9/ordS2cBYM="; }; meta = { description = "Make TypeScript errors prettier and human-readable in VSCode"; diff --git a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix index d83b8fbb533a..aec6ca22b052 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.36.1"; - hash = "sha256-D3bKfUb/cm9zGfUCl0G/X2nxylZqSNv406BQ8c5GtgI="; + version = "1.36.2"; + hash = "sha256-FOu5ZpjNhtWxV+7Jt9V1RZ4YrK5BZ5t8Ut06raZURFI="; }; meta = { changelog = "https://github.com/detachhead/basedpyright/releases"; diff --git a/pkgs/applications/editors/vscode/extensions/google.colab/default.nix b/pkgs/applications/editors/vscode/extensions/google.colab/default.nix index 1484591b90a3..de2b1ed5f41e 100644 --- a/pkgs/applications/editors/vscode/extensions/google.colab/default.nix +++ b/pkgs/applications/editors/vscode/extensions/google.colab/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "google"; name = "colab"; - version = "0.1.4"; - hash = "sha256-15n8e7KHMHU16oScivd6aY8v5vnzlH+4ME9Z6qt3AHw="; + version = "0.1.6"; + hash = "sha256-2WJLXQfsdjor4YThjxvUZejBRjxEEe6fVCMba9grqIQ="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/opera.nix b/pkgs/applications/emulators/libretro/cores/opera.nix index c5b47da90357..17ba3881e78b 100644 --- a/pkgs/applications/emulators/libretro/cores/opera.nix +++ b/pkgs/applications/emulators/libretro/cores/opera.nix @@ -6,13 +6,13 @@ }: mkLibretroCore { core = "opera"; - version = "0-unstable-2024-10-16"; + version = "0-unstable-2025-12-26"; src = fetchFromGitHub { owner = "libretro"; repo = "opera-libretro"; - rev = "67a29e60a4d194b675c9272b21b61eaa022f3ba3"; - hash = "sha256-8896EWNbzVyr3MS1jtWD3pLur7ZvAhhJmrwkW3ayzkU="; + rev = "345f12b7d45d7013602a4a3b72287f529bd78042"; + hash = "sha256-2FkBsiKOzf/sMtKA1vI0ixWP9/ghs/N7zA7/m6h6gZ0="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix b/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix index 907d6487e312..eb974426687a 100644 --- a/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix +++ b/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "pcsx-rearmed"; - version = "0-unstable-2025-12-16"; + version = "0-unstable-2025-12-28"; src = fetchFromGitHub { owner = "libretro"; repo = "pcsx_rearmed"; - rev = "8d91fbdff8f4db6e256370f030a9f6ac8c7f2c62"; - hash = "sha256-3DaKohQ5HoR7Un7mZF4yeFs4fQ0WfVUS15P1HQU0H+0="; + rev = "a2640fe1a0e21729054cdb74db8a21e4bf6dde17"; + hash = "sha256-HzgpqgTcFT0Dz0SIn4zW4oF4FxOTYzgg1/sFi3XDwQ4="; }; dontConfigure = true; diff --git a/pkgs/applications/emulators/libretro/cores/stella.nix b/pkgs/applications/emulators/libretro/cores/stella.nix index 84b78ba461a8..651173533abf 100644 --- a/pkgs/applications/emulators/libretro/cores/stella.nix +++ b/pkgs/applications/emulators/libretro/cores/stella.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "stella"; - version = "0-unstable-2025-12-14"; + version = "0-unstable-2025-12-28"; src = fetchFromGitHub { owner = "stella-emu"; repo = "stella"; - rev = "6d2e3783fde1d99773a57a1ff0c14bfaeec22f93"; - hash = "sha256-/1S09xhwvLg6fDgujWVpHb5jQUqydTVTtEjHk4leYUY="; + rev = "7f62c3e1390f629cbd56cbb5172f7e2143b30440"; + hash = "sha256-IMrqBu7beSuJNfl2pyzRm5yExXaMkl+si0YVDeRbAcU="; }; makefile = "Makefile"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d6a318fa7158..5273ba952ead 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1193,13 +1193,13 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "selectel_selectel": { - "hash": "sha256-/9PIbXyh+CklHQRWWoXxH42KUATi3uyPZRtWWfniB1Q=", + "hash": "sha256-2lo5CF+FmQW2JIHCoI5zGZBaquIo4RXzvD8MeNWTHhQ=", "homepage": "https://registry.terraform.io/providers/selectel/selectel", "owner": "selectel", "repo": "terraform-provider-selectel", - "rev": "v7.2.1", + "rev": "v7.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Kvolsw4lgh4Q8Vtq4PFzatD0Up/qeyZYfb+UQfwct3o=" + "vendorHash": "sha256-wAVTsN0ZizBU4dMLK2wxf3RSNE6GCbXL1jTIULpKfNU=" }, "siderolabs_talos": { "hash": "sha256-PPD4blyXt4/IalzwEn4+lvuD1Qx7VuUD/CUJILDRI5k=", diff --git a/pkgs/applications/networking/mkchromecast/default.nix b/pkgs/applications/networking/mkchromecast/default.nix index 03b835b042c4..4faad8ccaaec 100644 --- a/pkgs/applications/networking/mkchromecast/default.nix +++ b/pkgs/applications/networking/mkchromecast/default.nix @@ -11,7 +11,7 @@ vorbis-tools, pulseaudio, nodejs, - youtube-dl, + yt-dlp, opusTools, gst_all_1, enableSonos ? true, @@ -27,21 +27,21 @@ let gst_all_1.gstreamer nodejs ffmpeg - youtube-dl + yt-dlp ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pulseaudio ]; in python3Packages.buildPythonApplication { pname = "mkchromecast-unstable"; - version = "2022-10-31"; + version = "2025-12-21"; format = "setuptools"; src = fetchFromGitHub { owner = "muammar"; repo = "mkchromecast"; - rev = "0de9fd78c4122dec4f184aeae2564790b45fe6dc"; - sha256 = "sha256-dxsIcBPrZaXlsfzOEXhYj2qoK5LRducJG2ggMrMMl9Y="; + rev = "9cdc5f3f9060ef4078522366ce896356515d8e52"; + hash = "sha256-UMzOIxgeTpAFQZtYirOYPoVcKgiKdGx2zwVyWmo32w4="; }; buildInputs = lib.optional stdenv.hostPlatform.isLinux qtwayland; diff --git a/pkgs/applications/video/vdr/epgsearch/default.nix b/pkgs/applications/video/vdr/epgsearch/default.nix index 6c4c33d92102..f95f932d195f 100644 --- a/pkgs/applications/video/vdr/epgsearch/default.nix +++ b/pkgs/applications/video/vdr/epgsearch/default.nix @@ -10,12 +10,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-epgsearch"; - version = "2.4.4"; + version = "2.4.5"; src = fetchFromGitHub { repo = "vdr-plugin-epgsearch"; owner = "vdr-projects"; - sha256 = "sha256-hHTb6MbN18gNiovX1BKR6ldxxRDeDXJt4kNm722phRk="; + sha256 = "sha256-ERHy6ks5evYmOUoTXNd63ETIA2PyR67VZ7CXR6kn7x4="; rev = "v${version}"; }; diff --git a/pkgs/applications/video/vdr/markad/default.nix b/pkgs/applications/video/vdr/markad/default.nix index 95edb4e2d597..a62864b82c78 100644 --- a/pkgs/applications/video/vdr/markad/default.nix +++ b/pkgs/applications/video/vdr/markad/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-markad"; - version = "4.2.16"; + version = "4.2.17"; src = fetchFromGitHub { repo = "vdr-plugin-markad"; owner = "kfb77"; - hash = "sha256-WK4lt/UrXNExs8Dnv3de91Bl6JMgEqjPcBKbbTK1pj4="; + hash = "sha256-27Axgh8brG0Apq06gry7uN95GtJ74FC1RNYVcqTUbE0="; tag = "V${version}"; }; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix index 3bc837a2319d..079508f4262f 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix @@ -13,13 +13,13 @@ let mkHyprlandPlugin, }: let - version = "0.52.0"; + version = "0.53.0"; hyprland-plugins-src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland-plugins"; tag = "v${version}"; - hash = "sha256-hr53AWO96ooLCwS1a2v416eT1/aWQZmuQV0ULqhaBTY="; + hash = "sha256-BSRT1Uu1ot4WfMfZc6KW0nwpmt2xl9wpUqmH/JoMTfk="; }; in mkHyprlandPlugin { diff --git a/pkgs/by-name/_4/_4th/001-install-manual-fixup.diff b/pkgs/by-name/_4/_4th/001-install-manual-fixup.diff deleted file mode 100644 index 6002e7a0d99f..000000000000 --- a/pkgs/by-name/_4/_4th/001-install-manual-fixup.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur 4th-3.64.0-old/sources/Makefile 4th-3.64.0-new/sources/Makefile ---- 4th-3.64.0-old/sources/Makefile 2022-03-15 12:37:45.925122854 -0300 -+++ 4th-3.64.0-new/sources/Makefile 2022-03-15 12:38:50.987870211 -0300 -@@ -125,7 +125,7 @@ - - install: mostlyinstall - install -Dm644 ../documentation/4th.1 $(MANDIR)/man1/4th.1 -- install -Dm644 ../documentation/4tHmanual.txt $(DOCDIR)/4th/ -+ install -Dm644 ../documentation/4tHmanual.pdf $(DOCDIR)/4th/ - - uninstall: - -rm -f $(LIBRARIES)/lib4th.{a,so*} diff --git a/pkgs/by-name/_4/_4th/package.nix b/pkgs/by-name/_4/_4th/package.nix index b73c18fd613d..b0a291f9f761 100644 --- a/pkgs/by-name/_4/_4th/package.nix +++ b/pkgs/by-name/_4/_4th/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "4th"; - version = "3.64.1"; + version = "3.64.2"; src = fetchurl { url = "https://sourceforge.net/projects/forth-4th/files/4th-${finalAttrs.version}/4th-${finalAttrs.version}-unix.tar.gz"; - hash = "sha256-+W6nTNsqrf3Dvr+NbSz3uJdrXVbBI3OHR5v/rs7en+M="; + hash = "sha256-ufQiuRDPmcYzFSQf16cuZSrOEbH3itq7yZYo87zPs1g="; }; outputs = [ @@ -18,11 +18,6 @@ stdenv.mkDerivation (finalAttrs: { "man" ]; - patches = [ - # Fix install manual; report this patch to upstream - ./001-install-manual-fixup.diff - ]; - dontConfigure = true; makeFlags = [ @@ -50,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Portable Forth compiler"; license = lib.licenses.lgpl3Plus; mainProgram = "4th"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ chillcicada ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix index 294d3a1888f9..a33b90417890 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-2025-12-09"; + version = "0-unstable-2025-12-25"; src = fetchFromGitHub { owner = "CachyOS"; repo = "ananicy-rules"; - rev = "96785149f069325c349f24c21c8dcfe83f0211f4"; - hash = "sha256-eMWBvK/E/rH5iLKfMRAQx3UcD4gDZ8mEKe+oPUsQaNM="; + rev = "410a04d9af9ac9b6bfefa06cf53ae9b91f1294bd"; + hash = "sha256-vEwpJ5AQS4Xwdyvm6/jOtG3V32C50qr3W8hkEbq/IJk="; }; dontConfigure = true; diff --git a/pkgs/by-name/an/ansible-doctor/package.nix b/pkgs/by-name/an/ansible-doctor/package.nix index 885b61a33773..2700be69aa7e 100644 --- a/pkgs/by-name/an/ansible-doctor/package.nix +++ b/pkgs/by-name/an/ansible-doctor/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "ansible-doctor"; - version = "8.0.1"; + version = "8.1.1"; pyproject = true; src = fetchFromGitHub { owner = "thegeeklab"; repo = "ansible-doctor"; tag = "v${version}"; - hash = "sha256-vbI1VEtSQW+kUCIcqrHE+Ogmjjmpstgu2cpl3fDZ2rE="; + hash = "sha256-izgSdHK+vVS0UcK32gYDwBn3b1yDCzp2ImjDXZbMrzs="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/ar/arduino-cli/package.nix b/pkgs/by-name/ar/arduino-cli/package.nix index b6a430c52128..4d761c22c5c9 100644 --- a/pkgs/by-name/ar/arduino-cli/package.nix +++ b/pkgs/by-name/ar/arduino-cli/package.nix @@ -11,15 +11,15 @@ let - pkg = buildGoModule rec { + pkg = buildGoModule (finalAttrs: { pname = "arduino-cli"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "arduino"; repo = "arduino-cli"; - tag = "v${version}"; - hash = "sha256-vUa/Mgztyu5jKVIIhp+Cg79n+ulN94mlfVpxecRb6PA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-H7vccxDzJt0e/91PIV6Qg8nRD0beb/3g7AZ4uk2ebXU="; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ let subPackages = [ "." ]; - vendorHash = "sha256-msv+ZG6uabTtPDVcRksRd8UTSpoztMKw3YGxvhJr26w="; + vendorHash = "sha256-GPZLvEgL/2Ekfj58d8dsbc6e2hHB2zUapvFdIT43hhQ="; postPatch = let @@ -62,7 +62,7 @@ let ldflags = [ "-s" "-w" - "-X github.com/arduino/arduino-cli/internal/version.versionString=${version}" + "-X github.com/arduino/arduino-cli/internal/version.versionString=${finalAttrs.version}" "-X github.com/arduino/arduino-cli/internal/version.commit=unknown" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-extldflags '-static'" ]; @@ -75,10 +75,10 @@ let ''; meta = { - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; description = "Arduino from the command line"; mainProgram = "arduino-cli"; - changelog = "https://github.com/arduino/arduino-cli/releases/tag/${version}"; + changelog = "https://github.com/arduino/arduino-cli/releases/tag/${finalAttrs.version}"; license = with lib.licenses; [ gpl3Only asl20 @@ -89,7 +89,7 @@ let ]; }; - }; + }); in if stdenv.hostPlatform.isLinux then diff --git a/pkgs/by-name/aw/aws-vault/package.nix b/pkgs/by-name/aw/aws-vault/package.nix index 0b9996f402a3..0dfbf8311fee 100644 --- a/pkgs/by-name/aw/aws-vault/package.nix +++ b/pkgs/by-name/aw/aws-vault/package.nix @@ -10,13 +10,13 @@ }: buildGoModule rec { pname = "aws-vault"; - version = "7.8.5"; + version = "7.8.6"; src = fetchFromGitHub { owner = "ByteNess"; repo = "aws-vault"; rev = "v${version}"; - hash = "sha256-tJqqJl+X5LpVJXB6QGqNkjZxTSo44IK/IY/yVk2DLjQ="; + hash = "sha256-nULl68DMTqrVXlPmJlp7M3EZ+MiGR9FsWKIRaa2i91I="; }; proxyVendor = true; diff --git a/pkgs/by-name/bi/binaryninja-free/package.nix b/pkgs/by-name/bi/binaryninja-free/package.nix index 906f0b489ffd..0675fb730d59 100644 --- a/pkgs/by-name/bi/binaryninja-free/package.nix +++ b/pkgs/by-name/bi/binaryninja-free/package.nix @@ -20,11 +20,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "binaryninja-free"; - version = "5.2.8614"; + version = "5.2.8722"; src = fetchurl { url = "https://github.com/Vector35/binaryninja-api/releases/download/stable/${finalAttrs.version}/binaryninja_free_linux.zip"; - hash = "sha256-Z7hI0WTOseEgM/opZLxSGCnHYXiliEWksA1FpICLRPQ="; + hash = "sha256-YlBr/Cdjev7LWY/VsKgv/i3zHj4YR49RX69zmhhie7U="; }; icon = fetchurl { @@ -92,7 +92,10 @@ stdenv.mkDerivation (finalAttrs: { free = false; }; mainProgram = "binaryninja"; - maintainers = with lib.maintainers; [ scoder12 ]; + maintainers = with lib.maintainers; [ + scoder12 + timschumi + ]; platforms = [ "x86_64-linux" ]; }; }) diff --git a/pkgs/by-name/cc/cc-tool/package.nix b/pkgs/by-name/cc/cc-tool/package.nix index b9186467190c..95cdf5f64fcf 100644 --- a/pkgs/by-name/cc/cc-tool/package.nix +++ b/pkgs/by-name/cc/cc-tool/package.nix @@ -6,17 +6,18 @@ boost, libusb1, pkg-config, + unstableGitUpdater, }: stdenv.mkDerivation { pname = "cc-tool"; - version = "unstable-2020-05-19"; + version = "0.27-unstable-2025-10-17"; src = fetchFromGitHub { owner = "dashesy"; repo = "cc-tool"; - rev = "19e707eafaaddee8b996ad27a9f3e1aafcb900d2"; - hash = "sha256:1f78j498fdd36xbci57jkgh25gq14g3b6xmp76imdpar0jkpyljv"; + rev = "0d84df329e343e2ea5a960c04a3d4478ee039aa0"; + hash = "sha256-3zZNzH+T/Wc3rn+ZmdpQ5U0Fs6ylT/QhX1pUUD8kPoE="; }; nativeBuildInputs = [ @@ -30,15 +31,25 @@ stdenv.mkDerivation { postPatch = '' substituteInPlace udev/90-cc-debugger.rules \ - --replace 'MODE="0666"' 'MODE="0660", GROUP="plugdev", TAG+="uaccess"' + --replace-fail 'MODE="0666"' 'MODE="0660", GROUP="plugdev", TAG+="uaccess"' ''; + configureFlags = [ + "--with-boost=${lib.getDev boost}" + ]; + + enableParallelBuilding = true; + doInstallCheck = true; postInstall = '' install -D udev/90-cc-debugger.rules $out/lib/udev/rules.d/90-cc-debugger.rules ''; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; + meta = { description = "Command line tool for the Texas Instruments CC Debugger"; mainProgram = "cc-tool"; diff --git a/pkgs/by-name/ch/cht-sh/package.nix b/pkgs/by-name/ch/cht-sh/package.nix index 4f6a9927ecb2..994885f42358 100644 --- a/pkgs/by-name/ch/cht-sh/package.nix +++ b/pkgs/by-name/ch/cht-sh/package.nix @@ -12,15 +12,15 @@ stdenv.mkDerivation { pname = "cht.sh"; - version = "0-unstable-2025-08-08"; + version = "0-unstable-2025-12-23"; nativeBuildInputs = [ makeWrapper ]; src = fetchFromGitHub { owner = "chubin"; repo = "cheat.sh"; - rev = "b714a5f0d56427924a7871f083fd05e7ede6b0e4"; - sha256 = "JkqHxHgs7gUk511CSJ/sLEBWCAYig1lqfslhABDNMGI="; + rev = "031a5d3887f035aaa3bf1a3f83dff4fde2aac53d"; + sha256 = "T6v58bmdA3EvC4QUgCR+FJLonN3QdHpkdvNGauq/i5Q="; }; # Fix ".cht.sh-wrapped" in the help message diff --git a/pkgs/by-name/di/diebahn/package.nix b/pkgs/by-name/di/diebahn/package.nix index 9f10f9e61743..fcbc2bb435fd 100644 --- a/pkgs/by-name/di/diebahn/package.nix +++ b/pkgs/by-name/di/diebahn/package.nix @@ -24,18 +24,18 @@ stdenv.mkDerivation rec { pname = "diebahn"; - version = "2.9.3"; + version = "2.9.4"; src = fetchFromGitLab { owner = "schmiddi-on-mobile"; repo = "railway"; tag = version; - hash = "sha256-Bs+qn6QZnY37Kk7Xl4QE9k41T2W8gIvtcP4I5qLERNI="; + hash = "sha256-eGXTBrzKd7dV74wAOzZV9UnIhuR/Xtb20fIWOjfPqtM="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-ijbVyVC0Vq5Olo3odzRv078CosAiIZ6KJNx0Gv5YunI="; + hash = "sha256-YSki/pKhaKnUqyEMibpg/j06zR6E003AzRTK795NFQo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/dm/dmidecode/package.nix b/pkgs/by-name/dm/dmidecode/package.nix index 5f0d77d2a058..aa1ef9a3757f 100644 --- a/pkgs/by-name/dm/dmidecode/package.nix +++ b/pkgs/by-name/dm/dmidecode/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "dmidecode"; - version = "3.6"; + version = "3.7"; src = fetchurl { url = "mirror://savannah/dmidecode/dmidecode-${version}.tar.xz"; - sha256 = "sha256-5Axl8+w9r+Ma2DSaTvGpcSLTj2UATtZldeGo1XXdi64="; + sha256 = "sha256-LDrtEshaHmqUENQG1eQXxFVGbcG8fIkni7Ms98rZHoo="; }; makeFlags = [ diff --git a/pkgs/by-name/do/docker-credential-gcr/package.nix b/pkgs/by-name/do/docker-credential-gcr/package.nix index 8decf4d0cb56..f7868d4b9921 100644 --- a/pkgs/by-name/do/docker-credential-gcr/package.nix +++ b/pkgs/by-name/do/docker-credential-gcr/package.nix @@ -9,20 +9,20 @@ buildGoModule rec { pname = "docker-credential-gcr"; - version = "2.1.30"; + version = "2.1.31"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "docker-credential-gcr"; tag = "v${version}"; - hash = "sha256-ZHQLZLw5Qe+60POSxfUZ5nh9punLXHzlXbjrUVR9MKU="; + hash = "sha256-DAqMdVayRRf8MqcE+Vfm3Inh7ja7CjMaHCuvg7/AcUA="; }; postPatch = '' rm -rf ./test ''; - vendorHash = "sha256-eQ9ZsJqW+FF3XHrqaDm254/vdLxR1Mw5wt+TkWqtXBg="; + vendorHash = "sha256-6NLem27nG6SMxxoIWOg5xLyCo8ZDb8kGPSX3TKWi/N4="; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/do/doublecmd/package.nix b/pkgs/by-name/do/doublecmd/package.nix index c3e24ede3e80..cd1c4dd0f763 100644 --- a/pkgs/by-name/do/doublecmd/package.nix +++ b/pkgs/by-name/do/doublecmd/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doublecmd"; - version = "1.1.30"; + version = "1.1.31"; src = fetchFromGitHub { owner = "doublecmd"; repo = "doublecmd"; tag = "v${finalAttrs.version}"; - hash = "sha256-QEjwZ4jYkmgym4ap7GGD02O2yvEHFOw0jp6f65dfO+w="; + hash = "sha256-aIdjLpfGr98v4i/ssMNPBUJGwugEG612p4LtGUmo3cU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/du/duckmarines/love-11-support.patch b/pkgs/by-name/du/duckmarines/love-11-support.patch new file mode 100644 index 000000000000..56ad7fd4b276 --- /dev/null +++ b/pkgs/by-name/du/duckmarines/love-11-support.patch @@ -0,0 +1,842 @@ +From 95d046e287ae7b9ea3f10958180fa07d4064cf25 Mon Sep 17 00:00:00 2001 +From: apolius +Date: Sat, 1 Jun 2019 00:39:11 +0100 +Subject: [PATCH 1/4] updated setColor and getInfo + +--- + conf.lua | 2 +- + configuration.lua | 2 +- + main.lua | 2 +- + menu.lua | 10 +++++----- + messageBoxState.lua | 6 +++--- + particles.lua | 6 +++--- + pauseGameState.lua | 4 ++-- + res/{images => }/fonts/joystix.ttf | Bin + resmgr.lua | 24 ++++++------------------ + rules.lua | 2 +- + saveLevelState.lua | 6 +++--- + selectionList.lua | 12 ++++++------ + textInput.lua | 4 ++-- + 13 files changed, 34 insertions(+), 46 deletions(-) + rename res/{images => }/fonts/joystix.ttf (100%) + +diff --git a/conf.lua b/conf.lua +index 703a060..00aa34f 100644 +--- a/conf.lua ++++ b/conf.lua +@@ -1,6 +1,6 @@ + function love.conf(t) + t.identity = "duckmarines" +- t.version = "0.10.0" ++ -- t.version = "0.10.0" + t.console = false + + t.window.title = "Duck Marines" +diff --git a/configuration.lua b/configuration.lua +index 2800dbc..f2c12a2 100644 +--- a/configuration.lua ++++ b/configuration.lua +@@ -24,7 +24,7 @@ function Config:save() + end + + function Config:load() +- if love.filesystem.exists("config") then ++ if love.filesystem.getInfo("config") then + local strdata = love.filesystem.read("config") + local data = TSerial.unpack(strdata) + +diff --git a/main.lua b/main.lua +index 6443d01..16bcf1b 100644 +--- a/main.lua ++++ b/main.lua +@@ -25,7 +25,7 @@ rules = nil + + function love.load() + -- Setup user data +- if love.filesystem.exists("usermaps") == false then ++ if love.filesystem.getInfo("usermaps") == false then + love.filesystem.createDirectory("usermaps") + end + +diff --git a/menu.lua b/menu.lua +index 90f2ead..fb1060e 100644 +--- a/menu.lua ++++ b/menu.lua +@@ -84,16 +84,16 @@ function Menu:draw() + love.graphics.draw(self.imgButton, self.quadLeftEdge, v.x, v.y+3, 0, 1, v.height-6) + love.graphics.draw(self.imgButton, self.quadRightEdge, v.x+v.width-3, v.y+3, 0, 1, v.height-6) + +- love.graphics.setColor(255, 194, 49, 255) ++ love.graphics.setColor(1, 194/255, 49/255, 1) + love.graphics.rectangle("fill", v.x+3, v.y+3, v.width-6, v.height-6) +- love.graphics.setColor(255, 255, 255, 255) ++ love.graphics.setColor(1, 1, 1, 1) + if v.enabled then +- love.graphics.setColor(80, 49, 0, 255) ++ love.graphics.setColor(80/255, 49/255, 0, 1) + else +- love.graphics.setColor(80, 49, 0, 128) ++ love.graphics.setColor(80/255, 49/255, 0, 128/255) + end + love.graphics.printf(v.text, v.x, (v.y+v.height/2-9), v.width, "center") +- love.graphics.setColor(255,255,255,255) ++ love.graphics.setColor(1, 1, 1, 1) + elseif v.type == Menu.IMAGE_BUTTON then + love.graphics.draw(v.img, v.quad, v.x, v.y) + end +diff --git a/messageBoxState.lua b/messageBoxState.lua +index cf69535..1062a16 100644 +--- a/messageBoxState.lua ++++ b/messageBoxState.lua +@@ -27,11 +27,11 @@ end + + function MessageBoxState:draw() + love.graphics.setFont(ResMgr.getFont("menu")) +- love.graphics.setColor(23, 23, 23, 255) ++ love.graphics.setColor(23/255, 23/255, 23/255, 1/255) + love.graphics.rectangle("fill", self.x-25, self.y-25, self.width+50, self.height+50) +- love.graphics.setColor(241, 148, 0, 255) ++ love.graphics.setColor(241/255, 148/255, 0, 1) + love.graphics.rectangle("line", self.x-24.5, self.y-24.5, self.width+50, self.height+50) +- love.graphics.setColor(255, 255, 255, 255) ++ love.graphics.setColor(1, 1, 1, 1) + love.graphics.printf(self.message, self.x, self.y, self.width, "center") + end + +diff --git a/particles.lua b/particles.lua +index 1376e75..14a68fa 100644 +--- a/particles.lua ++++ b/particles.lua +@@ -57,7 +57,7 @@ function BonusTextParticle.create(x,y,text,color) + self.text = text + self.yspeed = 100 + self.alive = true +- self.color = color or {255, 255, 255, 255} ++ self.color = color or {1, 1, 1, 100/255} + + local number = tonumber(self.text) + if number and number <= 0 then +@@ -81,11 +81,11 @@ function BonusTextParticle:draw() + love.graphics.draw(self.bar, self.x-40, self.y+26) + + love.graphics.setFont(ResMgr.getFont("joystix30")) +- love.graphics.setColor(0, 0, 0, 255) ++ love.graphics.setColor(0, 0, 0, 100/255) + love.graphics.printf(self.text, self.x-75, self.y+3, 150, "center") + love.graphics.setColor(self.color) + love.graphics.printf(self.text, self.x-75, self.y, 150, "center") +- love.graphics.setColor(255, 255, 255, 255) ++ love.graphics.setColor(1, 1, 1, 100/255) + end + + function BonusTextParticle:getLayer() +diff --git a/pauseGameState.lua b/pauseGameState.lua +index c11a915..1a90ea4 100644 +--- a/pauseGameState.lua ++++ b/pauseGameState.lua +@@ -44,9 +44,9 @@ function PauseGameState:update() + end + + function PauseGameState:draw() +- love.graphics.setColor(0, 0, 0, 128) ++ love.graphics.setColor(0, 0, 0, 128/255) + love.graphics.rectangle("fill", 0, 0, WIDTH, HEIGHT) +- love.graphics.setColor(255,255,255,255) ++ love.graphics.setColor(1,1,1,1) + end + + function PauseGameState:buttonPressed(id, source) +diff --git a/res/images/fonts/joystix.ttf b/res/fonts/joystix.ttf +similarity index 100% +rename from res/images/fonts/joystix.ttf +rename to res/fonts/joystix.ttf +diff --git a/resmgr.lua b/resmgr.lua +index 22988cf..ece93d4 100644 +--- a/resmgr.lua ++++ b/resmgr.lua +@@ -5,26 +5,14 @@ local images = {} + local fonts = {} + local sounds = {} + +-local fontString = " 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ.,:+-?!()|x%" +- + local currentSongSource = nil + +-function ResMgr.getImage(name) +- local path = "res/images/" .. name +- if images[path] == nil then +- images[path] = love.graphics.newImage(path) +- images[path]:setWrap("repeat", "repeat") +- print("Loaded image: " .. name) +- end +- return images[path] +-end +- +-function ResMgr.loadFonts() +- fonts["bold"] = love.graphics.newImageFont(ResMgr.getImage("fonts/bold.png"), fontString, 2) +- fonts["menu"] = love.graphics.newImageFont(ResMgr.getImage("fonts/menu.png"), fontString) +- fonts["joystix30"] = love.graphics.newFont("res/images/fonts/joystix.ttf", 30) +- fonts["joystix40"] = love.graphics.newFont("res/images/fonts/joystix.ttf", 40) +-end ++ function ResMgr.loadFonts() ++-- fonts["bold"] = love.graphics.newImageFont(ResMgr.getImage("fonts/bold.png"), fontString, 2) ++-- fonts["menu"] = love.graphics.newImageFont(ResMgr.getImage("fonts/menu.png"), fontString) ++-- fonts["joystix30"] = love.graphics.newFont("res/fonts/joystix.ttf", 30) ++-- fonts["joystix40"] = love.graphics.newFont("res/fonts/joystix.ttf", 40) ++ end + + function ResMgr.getFont(name) + return fonts[name] +diff --git a/rules.lua b/rules.lua +index 84483c6..4f6c38d 100644 +--- a/rules.lua ++++ b/rules.lua +@@ -60,7 +60,7 @@ function Rules:save() + end + + function Rules:load() +- if love.filesystem.exists("rules") then ++ if love.filesystem.getInfo("rules") then + local strdata = love.filesystem.read("rules") + local data = TSerial.unpack(strdata) + +diff --git a/saveLevelState.lua b/saveLevelState.lua +index 174ae33..188f6f4 100644 +--- a/saveLevelState.lua ++++ b/saveLevelState.lua +@@ -32,11 +32,11 @@ function SaveLevelState.create(parent) + end + + function SaveLevelState:draw() +- love.graphics.setColor(23, 23, 23, 255) ++ love.graphics.setColor(23/255, 23/255, 23/255, 1) + love.graphics.rectangle("fill", 142, 96, 415, 271) +- love.graphics.setColor(241, 148, 0, 255) ++ love.graphics.setColor(241/255, 148/255, 0, 1) + love.graphics.rectangle("line", 142.5, 96.5, 415, 271) +- love.graphics.setColor(255, 255, 255, 255) ++ love.graphics.setColor(1, 1, 1, 1) + end + + function SaveLevelState:updateFileList() +diff --git a/selectionList.lua b/selectionList.lua +index a713dfb..0514c69 100644 +--- a/selectionList.lua ++++ b/selectionList.lua +@@ -19,8 +19,8 @@ function SelectionList.create(x, y, width, length, spacing, listener) + + self.items = {} + self.labels = {} +- self.backgroundColor = {0, 0, 0, 255} +- self.selectionColor = {20, 20, 20, 255} ++ self.backgroundColor = {0, 0, 0, 1} ++ self.selectionColor = {20/255, 20/255, 20/255, 1} + + self.imgButton = ResMgr.getImage("selectionlist_buttons.png") + self.quadButtonLeft = love.graphics.newQuad(0, 0, 2, 14, 49, 14) +@@ -35,7 +35,7 @@ end + function SelectionList:draw() + love.graphics.setColor(self.backgroundColor) + love.graphics.rectangle("fill", self.x, self.y+14, self.width, self.height-28) +- love.graphics.setColor(255,255,255,255) ++ love.graphics.setColor(1,1,1,1) + + -- Draw buttons + love.graphics.draw(self.imgButton, self.quadButtonLeft, self.x, self.y) +@@ -52,11 +52,11 @@ function SelectionList:draw() + end + + -- Draw sides +- love.graphics.setColor(255, 194, 49) ++ love.graphics.setColor(1, 194/255, 49/255) + love.graphics.setLineWidth(1) + love.graphics.line(self.x+1, self.y+14, self.x+1, self.y+self.height-14) + love.graphics.line(self.x+self.width, self.y, self.x+self.width, self.y+self.height) +- love.graphics.setColor(255, 255, 255) ++ love.graphics.setColor(1, 1, 1) + + love.graphics.setFont(ResMgr.getFont("bold")) + for i=1, self.length do +@@ -66,7 +66,7 @@ function SelectionList:draw() + if index == self.selection then + love.graphics.setColor(self.selectionColor) + love.graphics.rectangle("fill", self.x+1, self.y+(i-1)*self.spacing+14, self.width-2, self.spacing) +- love.graphics.setColor(255, 255, 255, 255) ++ love.graphics.setColor(1, 1, 1, 1) + end + love.graphics.print(self.labels[index], self.x+5, self.y+(i-1)*self.spacing+(self.spacing-8)/2+14) + end +diff --git a/textInput.lua b/textInput.lua +index 9f4a2b7..24ac3dc 100644 +--- a/textInput.lua ++++ b/textInput.lua +@@ -20,9 +20,9 @@ end + function TextInput:draw() + love.graphics.setColor(self.backgroundColor) + love.graphics.rectangle("fill", self.x, self.y, self.width, self.height) +- love.graphics.setColor(255, 194, 49) ++ love.graphics.setColor(1, 194/255, 49/255) + love.graphics.rectangle("line", self.x+0.5, self.y+0.5, self.width-1, self.height-1) +- love.graphics.setColor(255, 255, 255) ++ love.graphics.setColor(1, 1, 1) + + if self.active == true then + love.graphics.print(self.text.."|", self.x+4, self.y+((self.height-8)/2)) + +From dc4ae044839d624695400059d241e60bd4586373 Mon Sep 17 00:00:00 2001 +From: Karim Jerbi +Date: Sat, 1 Jun 2019 21:29:55 +0100 +Subject: [PATCH 2/4] Further setColor updates ( love api 11) + +there is still a need to update color parameter in some functions +--- + bot.lua | 4 ++-- + confirmBoxState.lua | 6 +++--- + countdownState.lua | 8 ++++---- + duckBeatState.lua | 14 +++++++------- + escapeState.lua | 4 ++-- + eventScoreState.lua | 4 ++-- + eventTextState.lua | 8 ++++---- + gameOverState.lua | 8 ++++---- + ingameState.lua | 10 +++++----- + inputSelectState.lua | 6 +++--- + levelSelectionState.lua | 4 ++-- + loadLevelState.lua | 6 +++--- + main.lua | 4 ++-- + selectionList.lua | 4 ++-- + 14 files changed, 45 insertions(+), 45 deletions(-) + +diff --git a/bot.lua b/bot.lua +index 17a84e5..89274a8 100644 +--- a/bot.lua ++++ b/bot.lua +@@ -249,7 +249,7 @@ end + + function Bot:drawPath() + local colors = { +- {191,49,63}, {56,54,136}, {255,130,46}, {119,56,130} ++ {191/255,49/255,63/255}, {56/255,54/255,136/255}, {1,130/255,46/255}, {119/255,56/255,130/255} + } + love.graphics.setColor(unpack(colors[self.player])) + for i=1, #self.allpath-1 do +@@ -257,7 +257,7 @@ function Bot:drawPath() + local p2 = self.allpath[i+1] + love.graphics.line(p1.x*48+24, p1.y*48+24, p2.x*48+24, p2.y*48+24) + end +- love.graphics.setColor(255,255,255,255) ++ love.graphics.setColor(1,1,1,1) + end + + -- Duck Dash +diff --git a/confirmBoxState.lua b/confirmBoxState.lua +index be87d5d..f6be6a1 100644 +--- a/confirmBoxState.lua ++++ b/confirmBoxState.lua +@@ -31,11 +31,11 @@ end + + function ConfirmBoxState:draw() + love.graphics.setFont(ResMgr.getFont("menu")) +- love.graphics.setColor(23, 23, 23, 255) ++ love.graphics.setColor(23/255, 23/255, 23/255, 1) + love.graphics.rectangle("fill", self.x-25, self.y-25, self.width+50, self.height+50) +- love.graphics.setColor(241, 148, 0, 255) ++ love.graphics.setColor(241/255, 148/255, 0, 1) + love.graphics.rectangle("line", self.x-24.5, self.y-24.5, self.width+50, self.height+50) +- love.graphics.setColor(255, 255, 255, 255) ++ love.graphics.setColor(1, 1, 1, 1) + love.graphics.printf(self.message, self.x, self.y, self.width, "center") + end + +diff --git a/countdownState.lua b/countdownState.lua +index eaf17da..a9f2575 100644 +--- a/countdownState.lua ++++ b/countdownState.lua +@@ -32,14 +32,14 @@ function CountdownState:draw() + + if self.time < 3 then + local quad = math.floor(self.time) +- love.graphics.setColor(0, 0, 0, 128) ++ love.graphics.setColor(0, 0, 0, 128/255) + love.graphics.draw(self.img, self.quads[quad], (WIDTH-100)/2, 176) +- love.graphics.setColor(255,255,255,255) ++ love.graphics.setColor(1,1,1,1) + love.graphics.draw(self.img, self.quads[quad], (WIDTH-100)/2, 168) + else +- love.graphics.setColor(0, 0, 0, 128) ++ love.graphics.setColor(0, 0, 0, 128/255) + love.graphics.draw(self.img, self.quads[3], (WIDTH-300)/2, 176) +- love.graphics.setColor(255,255,255,255) ++ love.graphics.setColor(1,1,1,1) + love.graphics.draw(self.img, self.quads[3], (WIDTH-300)/2, 168) + end + end +diff --git a/duckBeatState.lua b/duckBeatState.lua +index 9087a69..4cff55e 100644 +--- a/duckBeatState.lua ++++ b/duckBeatState.lua +@@ -148,10 +148,10 @@ function DuckBeatState:draw() + + -- Pulse background to beat + local alpha = 255 - 637.5*self.pulse +- love.graphics.setColor(255,255,255,alpha) ++ love.graphics.setColor(1,1,1,alpha/255) + love.graphics.rectangle("fill", 173, 0, 2, 333) + love.graphics.rectangle("fill", 400, 0, 2, 333) +- love.graphics.setColor(255,255,255,255) ++ love.graphics.setColor(1,1,1,1) + + -- Draw beats + for i,v in ipairs(self.beats) do +@@ -163,12 +163,12 @@ function DuckBeatState:draw() + if self.flash[i].time > 0 then + local alpha = self.flash[i].time * 128 + if self.flash[i].color == DuckBeatState.FLASH_RED then +- love.graphics.setColor(186, 18, 18, alpha) ++ love.graphics.setColor(186/255, 18/255, 18/255, alpha/255) + else +- love.graphics.setColor(84, 177, 33, alpha) ++ love.graphics.setColor(84/255, 177/255, 33/255, alpha/255) + end + love.graphics.rectangle("fill", 181+(i-1)*54, 0, 51, 333) +- love.graphics.setColor(255,255,255,255) ++ love.graphics.setColor(1,1,1,1) + end + end + +@@ -177,12 +177,12 @@ function DuckBeatState:draw() + + love.graphics.scale(4, 4) + love.graphics.setFont(ResMgr.getFont("bold")) +- love.graphics.setColor(0, 0, 0, 128) ++ love.graphics.setColor(0, 0, 0, 128/255) + love.graphics.print(self.points[1], 12, 19) + love.graphics.print(self.points[2], 12, 58) + love.graphics.print(self.points[3], 113, 19) + love.graphics.print(self.points[4], 113, 58) +- love.graphics.setColor(255,255,255,255) ++ love.graphics.setColor(1,1,1,1) + love.graphics.print(self.points[1], 12, 18) + love.graphics.print(self.points[2], 12, 57) + love.graphics.print(self.points[3], 113, 18) +diff --git a/escapeState.lua b/escapeState.lua +index e108dcb..4097073 100644 +--- a/escapeState.lua ++++ b/escapeState.lua +@@ -185,10 +185,10 @@ function EscapeState:draw() + love.graphics.draw(self.ducks, self.duck_quads[i], 206+(i-1)*53-self.time*250, 340-self.time*250, -6*self.time, 1+self.time, 1+self.time, 26, 42) + else + if self.time > 1 then +- love.graphics.setColor(255, 255, 255, (2-self.time)*255) ++ love.graphics.setColor(1, 1, 1, (2-self.time)) + end + love.graphics.draw(self.ghosts, self.ghost_quads[i], 181+(i-1)*53, 305-self.time*140) +- love.graphics.setColor(255,255,255,255) ++ love.graphics.setColor(1,1,1,1) + end + end + end +diff --git a/eventScoreState.lua b/eventScoreState.lua +index b9c2eb8..555b09d 100644 +--- a/eventScoreState.lua ++++ b/eventScoreState.lua +@@ -86,9 +86,9 @@ function EventScoreState:draw() + love.graphics.draw(self.duck_dolls, self.duck_quads[i], 274, 97+83*i, val*2, 1+val*8, 1+val*8, 28, 25) + end + if self.time > i*0.2+0.25 then +- love.graphics.setColor(0, 0, 0, 128) ++ love.graphics.setColor(0, 0, 0, 128/255) + love.graphics.print(math.abs(self.deltas[i+1]), 364, 79+83*i) +- love.graphics.setColor(255, 255,255,255) ++ love.graphics.setColor(1,1,1,1) + love.graphics.print(math.abs(self.deltas[i+1]), 364, 75+83*i) + if self.deltas[i+1] >= 0 then + love.graphics.draw(self.plusminus, self.quad_plus, 320, 80+83*i) +diff --git a/eventTextState.lua b/eventTextState.lua +index b5f9436..3ff2763 100644 +--- a/eventTextState.lua ++++ b/eventTextState.lua +@@ -72,16 +72,16 @@ function EventTextState:update(dt) + end + + function EventTextState:draw() +- love.graphics.setColor(0, 0, 0, 128) ++ love.graphics.setColor(0, 0, 0, 128/255) + love.graphics.rectangle("fill", 0, 0, WIDTH, HEIGHT) +- love.graphics.setColor(255, 255, 255, 255) ++ love.graphics.setColor(1,1,1,1) + + love.graphics.draw(self.imgBox, 0, self.y) + + love.graphics.setFont(self.font) +- love.graphics.setColor(0, 0, 0, 128) ++ love.graphics.setColor(0, 0, 0, 128/255) + love.graphics.print(self.text, self.offset, self.y+30+4) +- love.graphics.setColor(255, 255, 255, 255) ++ love.graphics.setColor(1,1,1,1) + love.graphics.print(self.text, self.offset, self.y+30) + end + +diff --git a/gameOverState.lua b/gameOverState.lua +index 54ed766..a6cd75d 100644 +--- a/gameOverState.lua ++++ b/gameOverState.lua +@@ -84,9 +84,9 @@ function GameOverState:update(dt) + end + + function GameOverState:draw() +- love.graphics.setColor(0, 0, 0, 128) ++ love.graphics.setColor(0, 0, 0, 128/255) + love.graphics.rectangle("fill", 116, 0, WIDTH-116, HEIGHT) +- love.graphics.setColor(255, 255, 255) ++ love.graphics.setColor(1, 1, 1) + + if self.state == GameOverState.STATE_BARS then + -- Draw bars +@@ -102,7 +102,7 @@ function GameOverState:draw() + elseif self.state == GameOverState.STATE_GRAPH then + love.graphics.setLineWidth(2) + local colors = { +- {234,73,89}, {76,74,145}, {255,130,46}, {150,75,164} ++ {234/255,73/255,89/255}, {76/255,74/255,145/255}, {1,130/255,46/255}, {150/255,75/255,164/255} + } + for i=1,4 do + for j=0,9 do +@@ -126,7 +126,7 @@ function GameOverState:draw() + love.graphics.rectangle("fill", 600, 390-self.scores[i]/self.maxstat*292, 6,6) + end + end +- love.graphics.setColor(255,255,255) ++ love.graphics.setColor(1,1,1) + end + + function GameOverState:buttonPressed(id, source) +diff --git a/ingameState.lua b/ingameState.lua +index 8c530e0..c2d96ac 100644 +--- a/ingameState.lua ++++ b/ingameState.lua +@@ -388,23 +388,23 @@ function IngameState:drawHUD() + love.graphics.scale(3, 3) + + local timeString = secsToString(self.timeLeft) +- love.graphics.setColor(0, 0, 0, 128) ++ love.graphics.setColor(0, 0, 0, 128/255) + love.graphics.printf(timeString, 0, 21, 40, "center") +- love.graphics.setColor(0, 0, 0, 255) ++ love.graphics.setColor(0, 0, 0, 1) + love.graphics.printf(timeString, 0, 20, 40, "center") + +- love.graphics.setColor(0, 0, 0, 128) ++ love.graphics.setColor(0, 0, 0, 128/255) + for i=1,4 do + love.graphics.print(string.format("%03d", self.score[i]), 8, 18+i*29) + end +- love.graphics.setColor(255, 255, 255, 255) ++ love.graphics.setColor(1,1,1,1) + for i=1,4 do + love.graphics.print(string.format("%03d", self.score[i]), 8, 17+i*29) + end + + love.graphics.pop() + +- love.graphics.setColor(255,255,255) ++ love.graphics.setColor(1,1,1) + end + + function IngameState:getInputs() +diff --git a/inputSelectState.lua b/inputSelectState.lua +index 6764356..6a71aa5 100644 +--- a/inputSelectState.lua ++++ b/inputSelectState.lua +@@ -44,12 +44,12 @@ function InputSelectState:draw() + local player = 1 + local ai = 1 + for i=1,4 do +- love.graphics.setColor(23, 23, 23, 255) ++ love.graphics.setColor(23/255, 23/255, 23/255, 1) + love.graphics.rectangle("fill", -88+i*150, 66, 126, 32) +- love.graphics.setColor(241, 148, 0, 255) ++ love.graphics.setColor(241/255, 148/255, 0, 1) + love.graphics.rectangle("line", -87.5+i*150, 66.5, 126, 32) + +- love.graphics.setColor(255, 255, 255, 255) ++ love.graphics.setColor(1,1,1,1) + + if self.inputs[i] then + love.graphics.printf("PLAYER "..player, -100+i*150, 73, 150, "center") +diff --git a/levelSelectionState.lua b/levelSelectionState.lua +index 653a4ad..b7a75a1 100644 +--- a/levelSelectionState.lua ++++ b/levelSelectionState.lua +@@ -46,9 +46,9 @@ function LevelSelectionState:draw() + + love.graphics.setColor(0, 0, 0) + love.graphics.rectangle("fill", WIDTH/2, 62, 297, 228) +- love.graphics.setColor(255, 194, 49) ++ love.graphics.setColor(1, 194/255, 49/255) + love.graphics.rectangle("line", WIDTH/2+0.5, 62.5, 297, 228) +- love.graphics.setColor(255,255,255) ++ love.graphics.setColor(1,1,1) + + love.graphics.draw(self.imgBlueprint, WIDTH/2+8, 70) + love.graphics.draw(self.batch, WIDTH/2+11, 73) +diff --git a/loadLevelState.lua b/loadLevelState.lua +index 3b078e8..38bd8f6 100644 +--- a/loadLevelState.lua ++++ b/loadLevelState.lua +@@ -32,12 +32,12 @@ function LoadLevelState.create(parent, map) + end + + function LoadLevelState:draw() +- love.graphics.setColor(23, 23, 23, 255) ++ love.graphics.setColor(23/255, 23/255, 23/255, 1) + love.graphics.rectangle("fill", 142, 96, 415, 271) +- love.graphics.setColor(241, 148, 0, 255) ++ love.graphics.setColor(241/255, 148/255, 0, 1) + love.graphics.rectangle("line", 142.5, 96.5, 415, 271) + +- love.graphics.setColor(255, 255, 255, 255) ++ love.graphics.setColor(1,1,1,1) + end + + function LoadLevelState:updateFileList() +diff --git a/main.lua b/main.lua +index 16bcf1b..b14d2fa 100644 +--- a/main.lua ++++ b/main.lua +@@ -75,9 +75,9 @@ function love.draw() + stateStack:peek(i):baseDraw() + end + if not focus then +- love.graphics.setColor(0,0,0,128) ++ love.graphics.setColor(0,0,0,128/255) + love.graphics.rectangle("fill", 0, 0, WIDTH, HEIGHT) +- love.graphics.setColor(255,255,255,255) ++ love.graphics.setColor(1,1,1,1) + end + end + +diff --git a/selectionList.lua b/selectionList.lua +index 0514c69..01c49a7 100644 +--- a/selectionList.lua ++++ b/selectionList.lua +@@ -111,11 +111,11 @@ function SelectionList:getText() + end + + function SelectionList:setBackgroundColor(r,g,b,a) +- self.backgroundColor = {r,g,b,a} ++ self.backgroundColor = {r/255,g/255,b/255,a/255} + end + + function SelectionList:setSelectionColor(r, g, b, a) +- self.selectionColor = {r,g,b,a} ++ self.selectionColor = {r/255,g/255,b/255,a/255} + end + + function SelectionList:setSelection(index) + +From 8e1f5c499ebcd445bfe7ad5e0af139314dfd10ec Mon Sep 17 00:00:00 2001 +From: Karim Jerbi +Date: Sun, 2 Jun 2019 01:02:55 +0100 +Subject: [PATCH 3/4] Fixed font issue + +--- + conf.lua | 2 +- + levelSelectionState.lua | 2 +- + resmgr.lua | 28 ++++++++++++++++++++-------- + slam.lua | 4 ++-- + 4 files changed, 24 insertions(+), 12 deletions(-) + +diff --git a/conf.lua b/conf.lua +index 00aa34f..748e20e 100644 +--- a/conf.lua ++++ b/conf.lua +@@ -1,6 +1,6 @@ + function love.conf(t) + t.identity = "duckmarines" +- -- t.version = "0.10.0" ++ t.version = "11.2" + t.console = false + + t.window.title = "Duck Marines" +diff --git a/levelSelectionState.lua b/levelSelectionState.lua +index b7a75a1..f4c18af 100644 +--- a/levelSelectionState.lua ++++ b/levelSelectionState.lua +@@ -53,7 +53,7 @@ function LevelSelectionState:draw() + love.graphics.draw(self.imgBlueprint, WIDTH/2+8, 70) + love.graphics.draw(self.batch, WIDTH/2+11, 73) + love.graphics.draw(self.imgDogear, WIDTH/2+265, 70) +- love.graphics.setBlendMode("multiply") ++ love.graphics.setBlendMode("multiply","premultiplied") + love.graphics.draw(self.imgTexture, WIDTH/2+11, 73) + love.graphics.setBlendMode("alpha") + end +diff --git a/resmgr.lua b/resmgr.lua +index ece93d4..c80e4b2 100644 +--- a/resmgr.lua ++++ b/resmgr.lua +@@ -5,14 +5,26 @@ local images = {} + local fonts = {} + local sounds = {} + ++local fontString = " 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ.,:+-?!()|x%" ++ + local currentSongSource = nil + +- function ResMgr.loadFonts() +--- fonts["bold"] = love.graphics.newImageFont(ResMgr.getImage("fonts/bold.png"), fontString, 2) +--- fonts["menu"] = love.graphics.newImageFont(ResMgr.getImage("fonts/menu.png"), fontString) +--- fonts["joystix30"] = love.graphics.newFont("res/fonts/joystix.ttf", 30) +--- fonts["joystix40"] = love.graphics.newFont("res/fonts/joystix.ttf", 40) +- end ++function ResMgr.getImage(name) ++ local path = "res/images/" .. name ++ if images[path] == nil then ++ images[path] = love.graphics.newImage(path) ++ images[path]:setWrap("repeat", "repeat") ++ print("Loaded image: " .. name) ++ end ++ return images[path] ++end ++ ++function ResMgr.loadFonts() ++ fonts["bold"] = love.graphics.newImageFont("res/images/fonts/bold.png", fontString, 2) ++ fonts["menu"] = love.graphics.newImageFont("res/images/fonts/menu.png", fontString) ++ fonts["joystix30"] = love.graphics.newFont("res/fonts/joystix.ttf", 30) ++ fonts["joystix40"] = love.graphics.newFont("res/fonts/joystix.ttf", 40) ++end + + function ResMgr.getFont(name) + return fonts[name] +@@ -37,7 +49,7 @@ function playMusic(name) + stopMusic() + + local path = "res/music/" .. name +- if love.filesystem.exists(path) == false then return end ++ if love.filesystem.getInfo(path) == nil then return end + + local source = love.audio.newSource("res/music/" .. name, "stream") + source:setLooping(true) +@@ -59,4 +71,4 @@ function updateVolume() + love.audio.tags.sfx.setVolume(config.sound_volume/5) + end + +-return ResMgr ++return ResMgr +\ No newline at end of file +diff --git a/slam.lua b/slam.lua +index 79c4879..e61d5bc 100644 +--- a/slam.lua ++++ b/slam.lua +@@ -1,4 +1,4 @@ +--- Simple LÖVE Audio Manager ++-- Simple L�VE Audio Manager + -- + -- Copyright (c) 2011 Matthias Richter + -- Permission is hereby granted, free of charge, to any person obtaining a copy +@@ -97,7 +97,7 @@ end + function Source:resume() + if not self._paused then return end + for s in pairs(self.instances) do +- s:resume() ++ s:play() + end + self._paused = false + end + +From 0342d9d02cb0dc86df480dec4766fa25b34fe0d5 Mon Sep 17 00:00:00 2001 +From: Karim Jerbi +Date: Sun, 2 Jun 2019 01:17:33 +0100 +Subject: [PATCH 4/4] Further getInfo updates + +--- + configuration.lua | 2 +- + loadLevelState.lua | 4 ++-- + main.lua | 2 +- + rules.lua | 2 +- + saveLevelState.lua | 4 ++-- + 5 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/configuration.lua b/configuration.lua +index f2c12a2..51e576d 100644 +--- a/configuration.lua ++++ b/configuration.lua +@@ -24,7 +24,7 @@ function Config:save() + end + + function Config:load() +- if love.filesystem.getInfo("config") then ++ if love.filesystem.getInfo("config") ~= nil then + local strdata = love.filesystem.read("config") + local data = TSerial.unpack(strdata) + +diff --git a/loadLevelState.lua b/loadLevelState.lua +index 38bd8f6..361e71e 100644 +--- a/loadLevelState.lua ++++ b/loadLevelState.lua +@@ -58,7 +58,7 @@ end + function LoadLevelState:buttonPressed(id, source) + if id == "Load" then + playSound("quack") +- if love.filesystem.exists(self:getFilename()) then ++ if love.filesystem.getInfo(self:getFilename()) ~= nil then + self.parent.map = Map.create(self:getFilename()) + self.parent.map:updateSpriteBatch(true) + love.timer.sleep(0.25) +@@ -69,7 +69,7 @@ function LoadLevelState:buttonPressed(id, source) + end + elseif id == "delete" then + playSound("quack") +- if love.filesystem.exists(self:getFilename()) then ++ if love.filesystem.getInfo(self:getFilename()) ~= nil then + pushState( + ConfirmBoxState.create(self, + "ARE YOU SURE YOU WANT TO DELETE " .. self.input:getText():upper() .. "?", +diff --git a/main.lua b/main.lua +index b14d2fa..de6d61e 100644 +--- a/main.lua ++++ b/main.lua +@@ -25,7 +25,7 @@ rules = nil + + function love.load() + -- Setup user data +- if love.filesystem.getInfo("usermaps") == false then ++ if love.filesystem.getInfo("usermaps") == nil then + love.filesystem.createDirectory("usermaps") + end + +diff --git a/rules.lua b/rules.lua +index 4f6c38d..5f203aa 100644 +--- a/rules.lua ++++ b/rules.lua +@@ -60,7 +60,7 @@ function Rules:save() + end + + function Rules:load() +- if love.filesystem.getInfo("rules") then ++ if love.filesystem.getInfo("rules") ~= nil then + local strdata = love.filesystem.read("rules") + local data = TSerial.unpack(strdata) + +diff --git a/saveLevelState.lua b/saveLevelState.lua +index 188f6f4..c9d3733 100644 +--- a/saveLevelState.lua ++++ b/saveLevelState.lua +@@ -57,7 +57,7 @@ end + function SaveLevelState:buttonPressed(id, source) + if id == "save" then + playSound("quack") +- if love.filesystem.exists(self:getFilename()) then ++ if love.filesystem.getInfo(self:getFilename()) ~= nil then + pushState(ConfirmBoxState.create(self, + "OVERWRITE " .. self.input:getText():upper() .. "?", + function() +@@ -75,7 +75,7 @@ function SaveLevelState:buttonPressed(id, source) + end + elseif id == "delete" then + playSound("quack") +- if love.filesystem.exists(self:getFilename()) then ++ if love.filesystem.getInfo(self:getFilename()) ~= nil then + pushState( + ConfirmBoxState.create(self, + "ARE YOU SURE YOU WANT TO DELETE " .. self.input:getText():upper() .. "?", diff --git a/pkgs/games/duckmarines/default.nix b/pkgs/by-name/du/duckmarines/package.nix similarity index 59% rename from pkgs/games/duckmarines/default.nix rename to pkgs/by-name/du/duckmarines/package.nix index 6f733132cde0..6482d1928b2c 100644 --- a/pkgs/games/duckmarines/default.nix +++ b/pkgs/by-name/du/duckmarines/package.nix @@ -1,11 +1,14 @@ { lib, stdenv, + fetchFromGitHub, fetchurl, love, lua, makeWrapper, makeDesktopItem, + strip-nondeterminism, + zip, }: stdenv.mkDerivation rec { @@ -27,24 +30,40 @@ stdenv.mkDerivation rec { categories = [ "Game" ]; }; - src = fetchurl { - url = "https://github.com/SimonLarsen/duckmarines/releases/download/v${version}/duckmarines-1.0c.love"; - sha256 = "1rvgpkvi4h9zhc4fwb4knhsa789yjcx4a14fi4vqfdyybhvg5sh9"; + src = fetchFromGitHub { + owner = "SimonLarsen"; + repo = "duckmarines"; + tag = "v${version}"; + hash = "sha256-0WzqYbK18IL8VY7NsVONwJCI5+me5SPulfkkLCifLvY="; }; - nativeBuildInputs = [ makeWrapper ]; + patches = [ + # https://github.com/SimonLarsen/duckmarines/pull/18 + ./love-11-support.patch + ]; + + nativeBuildInputs = [ + makeWrapper + strip-nondeterminism + zip + ]; buildInputs = [ lua love ]; - dontUnpack = true; + buildPhase = '' + runHook preBuild + zip -9 -r duckmarines.love ./* + strip-nondeterminism --type zip duckmarines.love + runHook postBuild + ''; installPhase = '' mkdir -p $out/bin mkdir -p $out/share/games/lovegames - cp -v ${src} $out/share/games/lovegames/duckmarines.love + cp -v duckmarines.love $out/share/games/lovegames/duckmarines.love makeWrapper ${love}/bin/love $out/bin/duckmarines --add-flags $out/share/games/lovegames/duckmarines.love @@ -57,7 +76,20 @@ stdenv.mkDerivation rec { description = "Duck-themed action puzzle video game"; platforms = lib.platforms.linux; hydraPlatforms = [ ]; - license = lib.licenses.free; + license = with lib.licenses; [ + # code + zlib + + # assets + cc-by-sa-40 + cc-by-nc-nd-40 + + # slam + mit + + # tserial + unfree + ]; downloadPage = "http://tangramgames.dk/games/duckmarines"; }; diff --git a/pkgs/by-name/ei/eigenwallet/package.nix b/pkgs/by-name/ei/eigenwallet/package.nix index 300e3ae69549..1dcaabe8b7d4 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.1"; + version = "3.6.3"; src = fetchurl { url = "https://github.com/eigenwallet/core/releases/download/${finalAttrs.version}/eigenwallet_${finalAttrs.version}_amd64.deb"; - hash = "sha256-L0JNKbirnZSVNNhEzSpwq5JstfpSGSo5E83zmxoOuXU="; + hash = "sha256-3lgHMkiwbE7P72sZZ9pcxdaN3/X8XDq3uNcaj/IV+v8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/em/emmy-lua-code-style/package.nix b/pkgs/by-name/em/emmy-lua-code-style/package.nix index 718cfca41be1..465ce8d01e37 100644 --- a/pkgs/by-name/em/emmy-lua-code-style/package.nix +++ b/pkgs/by-name/em/emmy-lua-code-style/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (self: { pname = "emmy-lua-code-style"; - version = "1.5.7"; + version = "1.6.0"; src = fetchFromGitHub { owner = "CppCXY"; repo = "EmmyLuaCodeStyle"; tag = self.version; - hash = "sha256-Lzh4ruyrWRTwU95iTMQozpLT5w92owHsDQM874XIuOg="; + hash = "sha256-FYtDO9ZL7MjC+vHzrylyYBQHTtef/GM9ipt//EcLr4w="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/em/emmylua-check/package.nix b/pkgs/by-name/em/emmylua-check/package.nix index 88832c0372f6..42425039ba02 100644 --- a/pkgs/by-name/em/emmylua-check/package.nix +++ b/pkgs/by-name/em/emmylua-check/package.nix @@ -7,18 +7,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "emmylua_check"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "EmmyLuaLs"; repo = "emmylua-analyzer-rust"; tag = finalAttrs.version; - hash = "sha256-JXe+I0CViJAXOnWzilYpjWquYFzZGIP5y6HS6KosYPU="; + hash = "sha256-bdvJInMuWJq7MZa+4wrKBn0myLTHCayhDAhB8Stjp6A="; }; buildAndTestSubdir = "crates/emmylua_check"; - cargoHash = "sha256-UVuXeGmSvAwHs/U0s/mByiZCwa2refz1l8eJvcCoagk="; + cargoHash = "sha256-bF6bdTbcHDecj+wVoNsaKBzsz96d3vo6cqp5MjSbT4E="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/et/etcd_3_5/package.nix b/pkgs/by-name/et/etcd_3_5/package.nix index f3332859236f..bb884331d84b 100644 --- a/pkgs/by-name/et/etcd_3_5/package.nix +++ b/pkgs/by-name/et/etcd_3_5/package.nix @@ -8,11 +8,11 @@ }: let - version = "3.5.25"; - etcdSrcHash = "sha256-7fCvlp/EG1SofsLC8il/twjg0rEaB/lhz6dnUxgLXik="; - etcdServerVendorHash = "sha256-R78j1BTuY3ORQiMnm2kWJGnK4jJi7am4x0udW4jjcCE="; - etcdUtlVendorHash = "sha256-J+/QgRAU1uk9LXdW8b6AhitFlxx/QU7IkJ+5Jez9MkM="; - etcdCtlVendorHash = "sha256-IiggECH1iFkb51MTeFSFnVbVVDUR1KgsQcbxz9IR4c4="; + version = "3.5.26"; + etcdSrcHash = "sha256-bEWswJM7r6Kxy9im/TkXkEQN5tEIvQK6Azd7LbIVwYA="; + etcdServerVendorHash = "sha256-pwVAy8wQXBGE0MqE3v7OLukwcKIQhEW3BjwPdSMtAYM="; + etcdUtlVendorHash = "sha256-dIxu7MUG5Yk3+DkCgfsGEmpyEklqvyz7wpWylHTDIkQ="; + etcdCtlVendorHash = "sha256-NJ1jc/0J5+GUxu1r1g9t6pnlHjx3CnmBe5NR+qWK7Dc="; src = fetchFromGitHub { owner = "etcd-io"; diff --git a/pkgs/by-name/et/etcd_3_6/package.nix b/pkgs/by-name/et/etcd_3_6/package.nix index 6da260ea77eb..0eaeb7f85d01 100644 --- a/pkgs/by-name/et/etcd_3_6/package.nix +++ b/pkgs/by-name/et/etcd_3_6/package.nix @@ -11,11 +11,11 @@ }: let - version = "3.6.6"; - etcdSrcHash = "sha256-MFkO2Rv38TQeREJ3zHgRdj3thnMK0ci3laEjn4CaXHs="; - etcdCtlVendorHash = "sha256-VxR/pPS/HR4EBPJJmQin7XqS5MvWreJe2dlOpQn3pqY="; - etcdUtlVendorHash = "sha256-xxq9t47985fA9fDvaanq2sPgUDZJDT2w46zp3pggryo="; - etcdServerVendorHash = "sha256-0uPIw2T9ZrR92MBB1xBBfbqXQUVg6sNDu8F5m1C+lEQ="; + version = "3.6.7"; + etcdSrcHash = "sha256-i8VZlK76OQQeojKHo9sdkyNR0Hdiofx0TLUDWKiXOTU="; + etcdCtlVendorHash = "sha256-jN+oNoIxNYM2Wm3s+/zDyacyXxVWaHl9t7sot8PL9xk="; + etcdUtlVendorHash = "sha256-A2rYstzlBlS3ta5yJVP/RTjgBz+9Y0I79ITr77GrqOo="; + etcdServerVendorHash = "sha256-hUFUcoXaOKTkoJ7YUwljpg7EZRhXi5tXcE2bteVRBE0="; src = applyPatches { src = fetchFromGitHub { diff --git a/pkgs/by-name/ev/evtest/package.nix b/pkgs/by-name/ev/evtest/package.nix index 7d6e4bf89f6a..1b9343aa7f84 100644 --- a/pkgs/by-name/ev/evtest/package.nix +++ b/pkgs/by-name/ev/evtest/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchgit, + fetchFromGitLab, autoreconfHook, pkg-config, libxml2, @@ -17,9 +17,11 @@ stdenv.mkDerivation rec { ]; buildInputs = [ libxml2 ]; - src = fetchgit { - url = "git://anongit.freedesktop.org/${pname}"; - rev = "refs/tags/${pname}-${version}"; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "libevdev"; + repo = "evtest"; + tag = "evtest-${version}"; sha256 = "sha256-M7AGcHklErfRIOu64+OU397OFuqkAn4dqZxx7sDfklc="; }; diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix index d23aad606d3d..bd387db9a229 100644 --- a/pkgs/by-name/fe/feishin/package.nix +++ b/pkgs/by-name/fe/feishin/package.nix @@ -14,13 +14,13 @@ }: let pname = "feishin"; - version = "0.22.0"; + version = "1.0.2"; src = fetchFromGitHub { owner = "jeffvli"; repo = "feishin"; tag = "v${version}"; - hash = "sha256-sRP89xgCl49WZ7A6KaQd/vJTIDvAfZuhRbL3mcBBnIg="; + hash = "sha256-otobV3bpANbhrAiscDxV1IGJ36i/37aPei6wdo5SDSw="; }; electron = electron_38; @@ -40,7 +40,7 @@ buildNpmPackage { src ; fetcherVersion = 2; - hash = "sha256-CpgiVKwqEjnRJ9Pinj7uSXy4llbdRrS9Vo0Tyge3+KQ="; + hash = "sha256-iZs2YtB0U8RpZXrIYHBc/cgFISDF/4tz+D13/+HlszU="; }; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; @@ -55,10 +55,6 @@ buildNpmPackage { # release/app dependencies are installed on preConfigure substituteInPlace package.json \ --replace-fail '"postinstall": "electron-builder install-app-deps",' "" - - # Don't check for updates. - substituteInPlace src/main/index.ts \ - --replace-fail "autoUpdater.checkForUpdatesAndNotify();" "" '' + lib.optionalString stdenv.hostPlatform.isLinux '' # https://github.com/electron/electron/issues/31121 @@ -100,7 +96,8 @@ buildNpmPackage { + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} cp -r dist/**/Feishin.app $out/Applications/ - makeWrapper $out/Applications/Feishin.app/Contents/MacOS/Feishin $out/bin/feishin + makeWrapper $out/Applications/Feishin.app/Contents/MacOS/Feishin $out/bin/feishin \ + --set DISABLE_AUTO_UPDATES 1 '' + lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/share/feishin @@ -115,7 +112,8 @@ buildNpmPackage { makeWrapper ${lib.getExe electron} $out/bin/feishin \ --add-flags $out/share/feishin/resources/app.asar \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ - --set ELECTRON_FORCE_IS_PACKAGED=1 \ + --set ELECTRON_FORCE_IS_PACKAGED 1 \ + --set DISABLE_AUTO_UPDATES 1 \ --inherit-argv0 for size in 32 64 128 256 512 1024; do @@ -155,6 +153,7 @@ buildNpmPackage { platforms = lib.platforms.unix; mainProgram = "feishin"; maintainers = with lib.maintainers; [ + BatteredBunny onny jlbribeiro ]; diff --git a/pkgs/by-name/fi/fingerprintx/package.nix b/pkgs/by-name/fi/fingerprintx/package.nix index 5c8d147a70e1..48b09174e36d 100644 --- a/pkgs/by-name/fi/fingerprintx/package.nix +++ b/pkgs/by-name/fi/fingerprintx/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "fingerprintx"; - version = "1.1.15"; + version = "1.1.16"; src = fetchFromGitHub { owner = "praetorian-inc"; repo = "fingerprintx"; tag = "v${version}"; - hash = "sha256-kbSP/nSdCrcEYVvLVawjZ2RDvTGv5JsHEIXXcPLA1ng="; + hash = "sha256-U6QHSvZKgFwRkbWXpHMJZQyXG68DYyl5zXA+Y7eQp8Y="; }; vendorHash = "sha256-1KSNvK2ylqWjfhxMY+NQFoDahPgqGb12nA4oGqqoFIA="; diff --git a/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json b/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json index d0de637eee4c..2c97744e808f 100644 --- a/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json +++ b/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json @@ -1,21 +1,21 @@ { - "version": "12.8.3", + "version": "12.9.2", "sources": { "aarch64-linux": { - "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.8.3/floorp-linux-aarch64.tar.xz", - "sha256": "853acf48337d439de99bc29f3a29f20299de948d58c85de6f99ced2b78a2a83d" + "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.9.2/floorp-linux-aarch64.tar.xz", + "sha256": "6a9f3a23401045bdacfcee26ff5bdd95a5f2bbd21eb08601a98e18b09df04fb5" }, "x86_64-linux": { - "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.8.3/floorp-linux-x86_64.tar.xz", - "sha256": "0e6642c8584fdcde953d347739eb87cab2e6bdc7d46571de2ec9ff4d3bbe235d" + "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.9.2/floorp-linux-x86_64.tar.xz", + "sha256": "c73cd19566b8c4d80cdd01ae8d76bbc8198b210027fbd590e250dc7ab1252032" }, "aarch64-darwin": { - "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.8.3/floorp-macOS-universal.dmg", - "sha256": "a4718b942d63a3355f31f25a59059a67b7f99b5041f3ea9d63243dd3600c0c77" + "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.9.2/floorp-macOS-universal.dmg", + "sha256": "cc27a9cd3eff0679ab916666583e2aed1fb882f0f4ea66676a133532cc8d5611" }, "x86_64-darwin": { - "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.8.3/floorp-macOS-universal.dmg", - "sha256": "a4718b942d63a3355f31f25a59059a67b7f99b5041f3ea9d63243dd3600c0c77" + "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.9.2/floorp-macOS-universal.dmg", + "sha256": "cc27a9cd3eff0679ab916666583e2aed1fb882f0f4ea66676a133532cc8d5611" } } } diff --git a/pkgs/by-name/fl/fluxcd-operator/package.nix b/pkgs/by-name/fl/fluxcd-operator/package.nix index 8d86b54fb5be..1f68e529e81d 100644 --- a/pkgs/by-name/fl/fluxcd-operator/package.nix +++ b/pkgs/by-name/fl/fluxcd-operator/package.nix @@ -9,16 +9,16 @@ }: buildGoModule (finalAttrs: { pname = "fluxcd-operator"; - version = "0.23.0"; + version = "0.38.1"; src = fetchFromGitHub { owner = "controlplaneio-fluxcd"; repo = "fluxcd-operator"; tag = "v${finalAttrs.version}"; - hash = "sha256-pNJPP49yAZ5guo6fYRkICxuY5Hz6eaF6xmuoLx/CBHo="; + hash = "sha256-thSUS3OQecOSaC6e5o1yRuI7FAyy/wZEvp+tIdJrtSo="; }; - vendorHash = "sha256-tTers8A4x8hS43/NIG2LH3mTWlGTkLBIPPk05mINsWg="; + vendorHash = "sha256-Z5oKy9u/aqxoEiyDJWBBoUS5WJYWcfh77kK5wyl/pdc="; ldflags = [ "-s" @@ -28,6 +28,8 @@ buildGoModule (finalAttrs: { subPackages = [ "cmd/cli" ]; + doCheck = false; + nativeBuildInputs = [ installShellFiles ]; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/fo/foxglove-cli/package.nix b/pkgs/by-name/fo/foxglove-cli/package.nix index f07940be3f6d..a042203b94db 100644 --- a/pkgs/by-name/fo/foxglove-cli/package.nix +++ b/pkgs/by-name/fo/foxglove-cli/package.nix @@ -11,16 +11,16 @@ }: buildGoModule (finalAttrs: { pname = "foxglove-cli"; - version = "1.0.28"; + version = "1.0.29"; src = fetchFromGitHub { owner = "foxglove"; repo = "foxglove-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-LfBcbScb+LxWr3+WJ5Y7Gbup+l3me9PHB/QdFu5tB60="; + hash = "sha256-VPL6WdolcdymPWgsyBaISGDT8tkAJa6lH073D5dZI3Y="; }; - vendorHash = "sha256-GjgDRFzW4zqVooHx9WEgWkcnZ+zQsr09OuZxtc9rZD4="; + vendorHash = "sha256-nRd9d3LJIrWoO+CQdbWLs249rOYmzfIf4u6x5dBDA2Y="; env.CGO_ENABLED = 0; tags = [ "netgo" ]; diff --git a/pkgs/by-name/gf/gf/package.nix b/pkgs/by-name/gf/gf/package.nix index c342c5c9498a..78f7413b4148 100644 --- a/pkgs/by-name/gf/gf/package.nix +++ b/pkgs/by-name/gf/gf/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation { pname = "gf"; - version = "0-unstable-2025-11-09"; + version = "0-unstable-2025-12-25"; src = fetchFromGitHub { repo = "gf"; owner = "nakst"; - rev = "64e7ece68a61d90db0dcc11a6d6eecab04af8561"; - hash = "sha256-BvPgBJ/2pEoe4hIgqYi5JXI0ihOJkc/pXAJK/Kf9lVg="; + rev = "a8c0fb67756c043d63832c008e3ad12132b121cb"; + hash = "sha256-OJE51lVkHWAgo7u/SX46s3pzQBeMW3zViiXJnB86bpo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gl/glooctl/package.nix b/pkgs/by-name/gl/glooctl/package.nix index 84715a4b78cf..2638074be719 100644 --- a/pkgs/by-name/gl/glooctl/package.nix +++ b/pkgs/by-name/gl/glooctl/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "glooctl"; - version = "1.20.4"; + version = "1.20.6"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-RPt353Rwahr9a4xodm//4TZGNuHPGOF/GurxchI2y7s="; + hash = "sha256-B3Hbj9T2ZefH9c/Zlgi7odInuIH96tFtyhrQLIiZPpU="; }; vendorHash = "sha256-zJmp3UWzZSI7G54DTOEOEo2ZIKjM6GZ0Cf5/BukaB4o="; diff --git a/pkgs/by-name/go/gopeed/package.nix b/pkgs/by-name/go/gopeed/package.nix index c67599bbcb26..9ebd3485003d 100644 --- a/pkgs/by-name/go/gopeed/package.nix +++ b/pkgs/by-name/go/gopeed/package.nix @@ -8,13 +8,13 @@ }: let - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "GopeedLab"; repo = "gopeed"; tag = "v${version}"; - hash = "sha256-KezASQIqyu4GsKaGAhge7gEYMe57GMgzjXlAbmyDI3Y="; + hash = "sha256-ze0hoTR3e3Wrgtv2FlM81faXmij61NEcPLzO4WDXIak="; }; metaCommon = { @@ -29,7 +29,7 @@ let inherit version src; pname = "libgopeed"; - vendorHash = "sha256-x9M9zwS5FhsIyGGBi0szWHMfLXCFVgqv8bfSxhHZT2Y="; + vendorHash = "sha256-rIj4T+NEqWla6/+ofosTwagL4/VMovDp1NEYMuzbOrQ="; buildPhase = '' runHook preBuild diff --git a/pkgs/by-name/gp/gparted/package.nix b/pkgs/by-name/gp/gparted/package.nix index 37948bc4807a..9b492e9f9b69 100644 --- a/pkgs/by-name/gp/gparted/package.nix +++ b/pkgs/by-name/gp/gparted/package.nix @@ -16,13 +16,29 @@ gpart, hdparm, procps, - util-linuxMinimal, polkit, wrapGAppsHook3, replaceVars, mtools, - dosfstools, xhost, + dosfstools, + e2fsprogs, + util-linuxMinimal, + withAllTools ? false, + bcachefs-tools, + btrfs-progs, + exfatprogs, + f2fs-tools, + hfsprogs, + jfsutils, + cryptsetup, + lvm2, + nilfs-utils, + ntfs3g, + reiserfsprogs, + udftools, + xfsprogs, + xfsdump, }: stdenv.mkDerivation (finalAttrs: { @@ -65,6 +81,28 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook3 ]; + runtimeDeps = [ + dosfstools + e2fsprogs + util-linuxMinimal + ] + ++ lib.optionals withAllTools [ + bcachefs-tools + btrfs-progs + exfatprogs + f2fs-tools + hfsprogs + jfsutils + cryptsetup + lvm2 + nilfs-utils + ntfs3g + reiserfsprogs + udftools + xfsprogs + xfsdump + ]; + preConfigure = '' # For ITS rules addToSearchPath "XDG_DATA_DIRS" "${polkit.out}/share" @@ -73,18 +111,19 @@ stdenv.mkDerivation (finalAttrs: { preFixup = '' gappsWrapperArgs+=( --prefix PATH : "${ - lib.makeBinPath [ - gpart - hdparm - util-linuxMinimal - procps - coreutils - gnused - gnugrep - mtools - dosfstools - xhost - ] + lib.makeBinPath ( + [ + gpart + hdparm + procps + coreutils + gnused + gnugrep + mtools + xhost + ] + ++ finalAttrs.runtimeDeps + ) }" ) ''; diff --git a/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix b/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix index e2b55249ece0..fedc4afe6d28 100644 --- a/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix +++ b/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix @@ -24,12 +24,12 @@ stdenv.mkDerivation rec { pname = "gpu-screen-recorder-gtk"; - version = "5.7.8"; + version = "5.7.9"; src = fetchgit { url = "https://repo.dec05eba.com/${pname}"; tag = version; - hash = "sha256-Vzi7IfiMsBFJZaZwC1CWZkVFCfDAfU0lmO7orRLjqgU="; + hash = "sha256-RFY5hQqv5XkLliB3+YJX4TXLxV9y1/P8PIYMi6MCbww="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gr/grpc-gateway/package.nix b/pkgs/by-name/gr/grpc-gateway/package.nix index 319d539eae78..482b1520591b 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.3"; + version = "2.27.4"; src = fetchFromGitHub { owner = "grpc-ecosystem"; repo = "grpc-gateway"; tag = "v${version}"; - sha256 = "sha256-NXcfr/+VZnYlK5A/RuTboB33WadoutG7GnACfrWBvwg="; + sha256 = "sha256-4bhEQTVV04EyX/qJGNMIAQDcMWcDVr1tFkEjBHpc2CA="; }; - vendorHash = "sha256-EgFB5ADytn9h8P2CrM9mr5siX5G4+8HGyWt/upp3yHg="; + vendorHash = "sha256-ohZW/uPdt08Y2EpIQ2yeyGSjV9O58+QbQQqYrs6O8/g="; ldflags = [ "-X=main.version=${version}" diff --git a/pkgs/by-name/gr/grpc-health-probe/package.nix b/pkgs/by-name/gr/grpc-health-probe/package.nix index ea2037cadcde..98d4f51d48da 100644 --- a/pkgs/by-name/gr/grpc-health-probe/package.nix +++ b/pkgs/by-name/gr/grpc-health-probe/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "grpc-health-probe"; - version = "0.4.42"; + version = "0.4.43"; src = fetchFromGitHub { owner = "grpc-ecosystem"; repo = "grpc-health-probe"; rev = "v${finalAttrs.version}"; - hash = "sha256-/7Xxti2QOClWRo6EwHRb369+x/NeT6LHhDDyIJSHv00="; + hash = "sha256-xmNqo+Wa/58944v52MAtFCy9G0LJVIn/XGG7JYqcCvM="; }; tags = [ @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { "-X main.versionTag=${finalAttrs.version}" ]; - vendorHash = "sha256-9NDSkfHUa6xfLByjtuDMir2UM5flaKhD6jZDa71D+0w="; + vendorHash = "sha256-WGY4vj1a+sOKKmuY+1RD/GPOKIUunfdBor0xG64IJY8="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/gt/gtree/package.nix b/pkgs/by-name/gt/gtree/package.nix index 482317815d0e..f6f44d7b229b 100644 --- a/pkgs/by-name/gt/gtree/package.nix +++ b/pkgs/by-name/gt/gtree/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gtree"; - version = "1.13.1"; + version = "1.13.2"; src = fetchFromGitHub { owner = "ddddddO"; repo = "gtree"; rev = "v${version}"; - hash = "sha256-+Prv0TtyqE02DHbYwooy8OWQn4C82Lyfikd+l0YEHZc="; + hash = "sha256-CTAUyFkIKk2WnZWVtIG6tZfjNT445DBDgeh5gTb4q6k="; }; - vendorHash = "sha256-0St9T9xJ8lOZgBUtwfzrHqSpcv6SAoxy4PNBBuuNO+A="; + vendorHash = "sha256-LWsJWh7LYkB5IWJaNJsy+K2xYNiw4mGy/YGT42at5C0="; subPackages = [ "cmd/gtree" diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix index 603f25507c6b..e70d5ad09357 100644 --- a/pkgs/by-name/ho/home-manager/package.nix +++ b/pkgs/by-name/ho/home-manager/package.nix @@ -19,14 +19,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "0-unstable-2025-12-19"; + version = "0-unstable-2025-12-25"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "bb35f07cc95a73aacbaf1f7f46bb8a3f40f265b5"; - hash = "sha256-47Ee0bTidhF/3/sHuYnWRuxcCrrm0mBNDxBkOTd3wWQ="; + rev = "91cdb0e2d574c64fae80d221f4bf09d5592e9ec2"; + hash = "sha256-GKO35onS711ThCxwWcfuvbIBKXwriahGqs+WZuJ3v9E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hy/hyprland/info.json b/pkgs/by-name/hy/hyprland/info.json index a58f9bf3c70f..88a308d2b0cc 100644 --- a/pkgs/by-name/hy/hyprland/info.json +++ b/pkgs/by-name/hy/hyprland/info.json @@ -1,7 +1,7 @@ { - "branch": "v0.52.2-b", - "commit_hash": "386376400119dd46a767c9f8c8791fd22c7b6e61", - "commit_message": "[gha] Nix: update inputs", - "date": "2025-12-03", - "tag": "v0.52.2" + "branch": "main", + "commit_hash": "ea444c35bb23b6e34505ab6753e069de7801cc25", + "commit_message": "version: bump to 0.53.0", + "date": "2025-12-29", + "tag": "v0.53.0" } diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index 3e1cdc33a198..dfd0a3eae580 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -19,6 +19,7 @@ hyprland-qtutils, hyprlang, hyprutils, + hyprwire, hyprwayland-scanner, libGL, libdrm, @@ -91,14 +92,14 @@ assert assertMsg ( customStdenv.mkDerivation (finalAttrs: { pname = "hyprland" + optionalString debug "-debug"; - version = "0.52.2"; + version = "0.53.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland"; fetchSubmodules = true; tag = "v${finalAttrs.version}"; - hash = "sha256-R2Hm7XbW8CTLEIeYCAlSQ3U5bFhn76FC17hEy/ws8EM="; + hash = "sha256-1jZK7hqNhQRqhj+2eb/JvnBoARxUgoVXKLSwp2RPmNQ="; }; postPatch = '' @@ -107,6 +108,7 @@ customStdenv.mkDerivation (finalAttrs: { # Remove extra @PREFIX@ to fix pkg-config paths sed -i "s#@PREFIX@/##g" hyprland.pc.in + sed -i "s#@PREFIX@/##g" example/hyprland.desktop.in ''; # variables used by CMake, and shown in `hyprctl version` @@ -127,6 +129,7 @@ customStdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ hyprwayland-scanner + hyprwire makeWrapper cmake # meson + ninja are used to build the hyprland-protocols submodule @@ -187,13 +190,13 @@ customStdenv.mkDerivation (finalAttrs: { strictDeps = true; cmakeFlags = mapAttrsToList cmakeBool { + "BUILT_WITH_NIX" = true; "NO_XWAYLAND" = !enableXWayland; "NO_SYSTEMD" = !withSystemd; "CMAKE_DISABLE_PRECOMPILE_HEADERS" = true; "NO_UWSM" = true; "NO_HYPRPM" = true; "TRACY_ENABLE" = false; - "BUILD_HYPRTESTER" = true; }; postInstall = '' diff --git a/pkgs/by-name/im/imgui-file-dialog/package.nix b/pkgs/by-name/im/imgui-file-dialog/package.nix new file mode 100644 index 000000000000..9e0ad4f30025 --- /dev/null +++ b/pkgs/by-name/im/imgui-file-dialog/package.nix @@ -0,0 +1,43 @@ +{ + stdenv, + lib, + cmake, + fetchFromGitHub, + imgui, + nix-update-script, +}: + +stdenv.mkDerivation rec { + pname = "imgui-file-dialog"; + version = "0.6.8"; + + src = fetchFromGitHub { + owner = "aiekick"; + repo = "ImGuiFileDialog"; + tag = "v${version}"; + hash = "sha256-v5ROW4o4of3tUGMN/p/CNH1eWT+RNRlWvhI84HUMEGo="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ imgui ]; + + # Propagate imgui so users can find the headers (ImGuiFileDialog.h includes imgui.h) + propagatedBuildInputs = [ imgui ]; + + outputs = [ + "out" + "dev" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Full featured file dialog for Dear ImGui"; + homepage = "https://github.com/aiekick/ImGuiFileDialog"; + changelog = "https://github.com/aiekick/ImGuiFileDialog/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ZZBaron ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/im/imhex/package.nix b/pkgs/by-name/im/imhex/package.nix index 794dbf6a60ae..bc563ca95895 100644 --- a/pkgs/by-name/im/imhex/package.nix +++ b/pkgs/by-name/im/imhex/package.nix @@ -20,22 +20,21 @@ fmt_11, nlohmann_json, yara, - rsync, nix-update-script, autoPatchelfHook, makeWrapper, }: let - version = "1.37.4"; - patterns_version = "1.37.4"; + version = "1.38.1"; + patterns_version = "1.38.1"; patterns_src = fetchFromGitHub { name = "ImHex-Patterns-source-${patterns_version}"; owner = "WerWolv"; repo = "ImHex-Patterns"; tag = "ImHex-v${patterns_version}"; - hash = "sha256-2NgMYaG6+XKp0fIHAn3vAcoXXa3EF4HV01nI+t1IL1U="; + hash = "sha256-MqQHzR5lKWhQI6pIX1kbAPDVG18UrMJM45mtIe/ggJE="; }; in @@ -49,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "WerWolv"; repo = "ImHex"; tag = "v${finalAttrs.version}"; - hash = "sha256-uenwAaIjtBzrtiLdy6fh5TxtbWtUJbtybNOLP3+8blA="; + hash = "sha256-lkpFiXuEF72nBkPuInv683Ct1Uu+uZ0PGejI9cVEUp0="; }; strictDeps = true; @@ -60,7 +59,6 @@ stdenv.mkDerivation (finalAttrs: { python3 perl pkg-config - rsync makeWrapper ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; @@ -78,6 +76,7 @@ stdenv.mkDerivation (finalAttrs: { mbedtls nlohmann_json yara + llvm ]; # autoPatchelfHook only searches for *.so and *.so.*, and won't find *.hexpluglib @@ -104,17 +103,18 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; # Comment out fixup_bundle in PostprocessBundle.cmake as we are not building a standalone application - postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + postPatch = '' + # Link patterns source into location expected by cmake when IMHEX_OFFLINE_BUILD is set + ln -s ${patterns_src} ImHex-Patterns + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace cmake/modules/PostprocessBundle.cmake \ --replace-fail "fixup_bundle" "#fixup_bundle" ''; - # rsync is used here so we can not copy the _schema.json files postInstall = if stdenv.hostPlatform.isLinux then '' - mkdir -p $out/share/imhex - rsync -av --exclude="*_schema.json" ${patterns_src}/{constants,encodings,includes,magic,nodes,patterns} $out/share/imhex # without this imhex is not able to find pattern files wrapProgram $out/bin/imhex --prefix XDG_DATA_DIRS : $out/share '' @@ -122,7 +122,6 @@ stdenv.mkDerivation (finalAttrs: { '' mkdir -p $out/Applications mv $out/imhex.app $out/Applications - rsync -av --exclude="*_schema.json" ${patterns_src}/{constants,encodings,includes,magic,nodes,patterns} "$out/Applications/imhex.app/Contents/MacOS" install_name_tool \ -change "$out/lib/libimhex.${finalAttrs.version}${stdenv.hostPlatform.extensions.sharedLibrary}" \ "@executable_path/../Frameworks/libimhex.${finalAttrs.version}${stdenv.hostPlatform.extensions.sharedLibrary}" \ diff --git a/pkgs/by-name/im/impala/package.nix b/pkgs/by-name/im/impala/package.nix index 9a207f17ccbb..e12c476fb83d 100644 --- a/pkgs/by-name/im/impala/package.nix +++ b/pkgs/by-name/im/impala/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "impala"; - version = "0.4.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "pythops"; repo = "impala"; rev = "v${version}"; - hash = "sha256-CRnGycN2juXXNI1LhAH5HQbmXYatBZ0GxYKYgb5SBSE="; + hash = "sha256-FU/8g2zTTHm3Sdbxt9761Z+a0zaJMdAMdHrJIwjUrYs="; }; - cargoHash = "sha256-fBeSbJdFwT/ZwK2FTJQtZakKqMiAICMY2rkbNnYOGzU="; + cargoHash = "sha256-dpTLVlDxc9eK7GwbweODoJlrBZeYwVcv1fQ2UtYbg7k="; meta = { description = "TUI for managing wifi"; diff --git a/pkgs/by-name/in/infisicalsdk/package.nix b/pkgs/by-name/in/infisicalsdk/package.nix index b36f007eff43..3ef9f1a7b82e 100644 --- a/pkgs/by-name/in/infisicalsdk/package.nix +++ b/pkgs/by-name/in/infisicalsdk/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonPackage rec { pname = "infisicalsdk"; - version = "1.0.13"; + version = "1.0.14"; pyproject = true; src = fetchFromGitHub { owner = "Infisical"; repo = "python-sdk-official"; tag = "v${version}"; - hash = "sha256-fuUun4vm8MBdl8MmR9cV+OWSRGsSaRoh7IF1vHRGm1k="; + hash = "sha256-oQdrrNJ8eoV5JWG7pTP3V8ptLg93DGCgWnTU9AVRG2Q="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/in/inputplumber/package.nix b/pkgs/by-name/in/inputplumber/package.nix index 146823380138..e187dbf6358f 100644 --- a/pkgs/by-name/in/inputplumber/package.nix +++ b/pkgs/by-name/in/inputplumber/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "inputplumber"; - version = "0.69.1"; + version = "0.70.1"; src = fetchFromGitHub { owner = "ShadowBlip"; repo = "InputPlumber"; tag = "v${version}"; - hash = "sha256-TX2AGLomQvq3r23ihL4SyMB4TTIYaavuWTuwqZciW2U="; + hash = "sha256-Sk1z1bJlpHQrbm7rSiLHiwFXCwlZ/Qcr5vyY7ydLktw="; }; - cargoHash = "sha256-HYVDign4Q6hNUPaTcjS7n00WHEVR8UtS26F+RV9KWFE="; + cargoHash = "sha256-Alnr8ppttft4GavoErFkZ7rqnAKaTDCyPhfqAcMX+R0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ip/ipxe/package.nix b/pkgs/by-name/ip/ipxe/package.nix index 7ff095a8d759..b874257659d8 100644 --- a/pkgs/by-name/ip/ipxe/package.nix +++ b/pkgs/by-name/ip/ipxe/package.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "ipxe"; - version = "1.21.1-unstable-2025-12-22"; + version = "1.21.1-unstable-2025-12-29"; nativeBuildInputs = [ mtools @@ -66,8 +66,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ipxe"; repo = "ipxe"; - rev = "3832147944209ece35557234102548413ef1b460"; - hash = "sha256-b65XWsWbMwROEYj3pVgCy6NNTreaQLkAtyCNQZ2xLPs="; + rev = "7c39c04a537ce29dccc6f2bae9749d1d371429c1"; + hash = "sha256-tqOTv9f9teCQUgt52/cdAM9kE5678Bk9956cWDTDZAg="; }; # Calling syslinux on a FAT image isn't going to work on Aarch64. diff --git a/pkgs/by-name/jd/jd-diff-patch/package.nix b/pkgs/by-name/jd/jd-diff-patch/package.nix index 2fbec7493657..7e224e360fc3 100644 --- a/pkgs/by-name/jd/jd-diff-patch/package.nix +++ b/pkgs/by-name/jd/jd-diff-patch/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "jd-diff-patch"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "josephburnett"; repo = "jd"; rev = "v${finalAttrs.version}"; - hash = "sha256-eaNP7cSJ0IxfHLmPaNAw5MQzD41AiOIjVbAjQkU8uec="; + hash = "sha256-HVbEVRe9u5D6Blfif9mEw9QZYJM7786GLB4njq3n+2U="; }; sourceRoot = "${finalAttrs.src.name}/v2"; diff --git a/pkgs/by-name/ki/kirc/package.nix b/pkgs/by-name/ki/kirc/package.nix index 2a20eb1ccd99..197ae8768bde 100644 --- a/pkgs/by-name/ki/kirc/package.nix +++ b/pkgs/by-name/ki/kirc/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "kirc"; - version = "1.0.0"; + version = "1.0.7"; src = fetchFromGitHub { owner = "mcpcpc"; repo = "kirc"; rev = version; - hash = "sha256-vcOaBVrWmKxFgqpBtMckkHwJiFG8PCDwfKHE/teGrGo="; + hash = "sha256-ModcUryLJTbf19ZKZDQ05Wqqac5vBsCN7SaT0/TD4Ro="; }; dontConfigure = true; diff --git a/pkgs/by-name/ko/kool/package.nix b/pkgs/by-name/ko/kool/package.nix index e0163bc22896..a0d8ceefeb91 100644 --- a/pkgs/by-name/ko/kool/package.nix +++ b/pkgs/by-name/ko/kool/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "kool"; - version = "3.5.2"; + version = "3.5.3"; src = fetchFromGitHub { owner = "kool-dev"; repo = "kool"; rev = version; - hash = "sha256-yUJbuMOLEa9LVRltskSwD0XBdmwwLcEaLYUHsSQOiCk="; + hash = "sha256-pZ667bDyRWIrImBNHyhkOGl/22gjHKX6KsVSTckS1U4="; }; vendorHash = "sha256-IqUkIf0uk4iUTedTO5xRzjmJwHS+p6apo4E0WEEU6cc="; diff --git a/pkgs/by-name/li/libresplit/package.nix b/pkgs/by-name/li/libresplit/package.nix index da5359b407d7..6fc585b1559a 100644 --- a/pkgs/by-name/li/libresplit/package.nix +++ b/pkgs/by-name/li/libresplit/package.nix @@ -14,13 +14,13 @@ gcc15Stdenv.mkDerivation { pname = "libresplit"; - version = "0-unstable-2025-12-22"; + version = "0-unstable-2025-12-26"; src = fetchFromGitHub { owner = "LibreSplit"; repo = "LibreSplit"; - rev = "63ed87a8eb1d8d188b613bc9b8c48d7223a37dbb"; - hash = "sha256-n8kKdv6e//v0yst6PW9PAnmB73W2lzlTdvvuELCePFY="; + rev = "11fcc57ff3ebbf58b3bb91b69575afbe4a8409b1"; + hash = "sha256-b743CPRpBZI5H+jFRn1O/s0LZzp8B5QWhjZ2N3iSz+g="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libsidplayfp/package.nix b/pkgs/by-name/li/libsidplayfp/package.nix index e4d6d581d0b6..b5baf81afc5e 100644 --- a/pkgs/by-name/li/libsidplayfp/package.nix +++ b/pkgs/by-name/li/libsidplayfp/package.nix @@ -11,6 +11,7 @@ graphviz, libexsid, libgcrypt, + libusb1, perl, pkg-config, xa, @@ -18,14 +19,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "libsidplayfp"; - version = "2.15.2"; + version = "2.16.0"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "libsidplayfp"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-/GXRqLt2wPCUiOKlaEq52APOOYWgbaejzJcppZgMgfA="; + hash = "sha256-0eupR9HNhF8TERCtNTH8qx7mohLI7im8btJtByWHoY8="; }; outputs = [ "out" ] ++ lib.optionals docSupport [ "doc" ]; @@ -50,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libexsid libgcrypt + libusb1 ]; enableParallelBuilding = true; @@ -58,6 +60,13 @@ stdenv.mkDerivation (finalAttrs: { (lib.strings.enableFeature true "hardsid") (lib.strings.withFeature true "gcrypt") (lib.strings.withFeature true "exsid") + (lib.strings.withFeature true "usbsid") + # Supposedly runtime detection only supported on GCC + # https://github.com/libsidplayfp/libsidplayfp/commit/65874166b14d44467782d2996f7b644fbde0ee87 + # __builtin_cpu_supports on GCC's list of x86 built-in functions + (lib.strings.withFeatureAs true "simd" ( + if (stdenv.cc.isGNU && stdenv.hostPlatform.isx86) then "runtime" else "none" + )) (lib.strings.enableFeature finalAttrs.finalPackage.doCheck "tests") ]; @@ -84,6 +93,7 @@ stdenv.mkDerivation (finalAttrs: { tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; updateScript = gitUpdater { rev-prefix = "v"; + ignoredVersions = "rc$"; }; }; diff --git a/pkgs/by-name/li/liferea/package.nix b/pkgs/by-name/li/liferea/package.nix index 756309b64a84..904c0af98d6e 100644 --- a/pkgs/by-name/li/liferea/package.nix +++ b/pkgs/by-name/li/liferea/package.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "liferea"; - version = "1.16.6"; + version = "1.16.7"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-D9mRmg1iwSlyYWCuYmMDzCkhUwgzDA/1DEgj49B59Lc="; + hash = "sha256-571mxEqnPVvuJ/r8hU4brtJhiVPxbBOPXhWL3XWmUTI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix index ce64197dd9b4..da183b106722 100644 --- a/pkgs/by-name/lu/lunar-client/package.nix +++ b/pkgs/by-name/lu/lunar-client/package.nix @@ -7,11 +7,11 @@ appimageTools.wrapType2 rec { pname = "lunarclient"; - version = "3.5.15"; + version = "3.5.16"; src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}-ow.AppImage"; - hash = "sha512-ALMU80lGg1kwQAETpMtuUoW/nT0I05wRhe3+FafP2rVud+OoqnVt2W8PFPhZ66wSdmS1Zs9AWvr2mQG/3aoMfg=="; + hash = "sha512-V0aeQTFRAoheUsI/gFZMaTTgWaCxQXEirkKr2mFnUhBXdesYGwnKmIJk0v1JOtK2RQT0V536yEMsRJVZgfscNw=="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/mi/mistral-vibe/package.nix b/pkgs/by-name/mi/mistral-vibe/package.nix new file mode 100644 index 000000000000..43b518af068a --- /dev/null +++ b/pkgs/by-name/mi/mistral-vibe/package.nix @@ -0,0 +1,107 @@ +{ + lib, + stdenv, + python3Packages, + fetchFromGitHub, + + # tests + uv, + versionCheckHook, + writableTmpDirAsHomeHook, +}: + +python3Packages.buildPythonApplication rec { + pname = "mistral-vibe"; + version = "1.3.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mistralai"; + repo = "mistral-vibe"; + tag = "v${version}"; + hash = "sha256-nW7pRSyv+t/7yatx84PMgxsHRTfRqqpy6rz+dQfLluU="; + }; + + build-system = with python3Packages; [ + editables + hatch-vcs + hatchling + ]; + + pythonRelaxDeps = [ + "agent-client-protocol" + "mistralai" + "pydantic" + "pydantic-settings" + "watchfiles" + ]; + dependencies = with python3Packages; [ + agent-client-protocol + aiofiles + httpx + mcp + mistralai + packaging + pexpect + pydantic + pydantic-settings + pyperclip + python-dotenv + pyyaml + rich + textual + textual-speedups + tomli-w + watchfiles + ]; + + pythonImportsCheck = [ "vibe" ]; + + nativeCheckInputs = [ + python3Packages.pytest-asyncio + python3Packages.pytest-textual-snapshot + python3Packages.pytest-xdist + python3Packages.pytestCheckHook + python3Packages.respx + uv + versionCheckHook + writableTmpDirAsHomeHook + ]; + versionCheckProgramArg = "--version"; + versionCheckKeepEnvironment = [ "HOME" ]; + pytestFlags = [ "tests/cli/test_clipboard.py" ]; + + disabledTests = [ + # AssertionError: assert '/nix/store/rlq03x4cwf8zn73hxaxnx0zn5q9kifls-bash-5.3p3/bin/sh: + # warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8): No such file or directory\n' == '' + "test_decodes_non_utf8_bytes" + "test_runs_echo_successfully" + "test_truncates_output_to_max_bytes" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # AssertionError: assert 3 == 4 + "test_get_copy_fns_with_wl_copy" + "test_get_copy_fns_with_both_system_tools" + "test_get_copy_fns_with_xclip" + ]; + + disabledTestPaths = [ + # All snapshot tests fail with AssertionError + "tests/snapshots/" + + # ACP tests require network access + "tests/acp/test_acp.py" + ]; + + meta = { + description = "Minimal CLI coding agent by Mistral"; + homepage = "https://github.com/mistralai/mistral-vibe"; + changelog = "https://github.com/mistralai/mistral-vibe/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + GaetanLepage + shikanime + ]; + mainProgram = "vibe"; + }; +} diff --git a/pkgs/by-name/ml/mlkit/package.nix b/pkgs/by-name/ml/mlkit/package.nix index f2f1d05163b0..14f55744684d 100644 --- a/pkgs/by-name/ml/mlkit/package.nix +++ b/pkgs/by-name/ml/mlkit/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "mlkit"; - version = "4.7.14"; + version = "4.7.17"; src = fetchFromGitHub { owner = "melsman"; repo = "mlkit"; rev = "v${version}"; - sha256 = "sha256-0nAQHBcQgGdcWd4SFhDon7I0zi5U+YRTdGvG78tri6A="; + sha256 = "sha256-1MLxBK/XYk4flBac34D2y6MJMuuxT6wT+Yo1WFaiYI4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix index 8ed8fee1bdbe..4a582a1a6055 100644 --- a/pkgs/by-name/mo/models-dev/package.nix +++ b/pkgs/by-name/mo/models-dev/package.nix @@ -9,12 +9,12 @@ }: let pname = "models-dev"; - version = "0-unstable-2025-12-23"; + version = "0-unstable-2025-12-29"; src = fetchFromGitHub { owner = "sst"; repo = "models.dev"; - rev = "d54bc052ebe97f8fc494e9fbb47a5d6266d20066"; - hash = "sha256-HiIHiiP2AzMkUtshFBgZJ+wheOO0L+eOn44+C7xzYxA="; + rev = "53afc6aefb7b7f777c7b708098e7dbf83bd3797a"; + hash = "sha256-I79MLfT9rCJK7LOfJNN23wM9/lJsVL+fw3hBUPykIxM="; }; node_modules = stdenvNoCC.mkDerivation { diff --git a/pkgs/by-name/mu/multitime/package.nix b/pkgs/by-name/mu/multitime/package.nix index 378f8731eed7..6447521edbd0 100644 --- a/pkgs/by-name/mu/multitime/package.nix +++ b/pkgs/by-name/mu/multitime/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "multitime"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "ltratt"; repo = "multitime"; rev = "multitime-${version}"; - sha256 = "1p6m4gyy6dw7nxnpsk32qiijagmiq9vwch0fbc25qvmybwqp8qc0"; + sha256 = "sha256-oLtBUJbu+tVhzsUv+toz2oLeXCVLYKHQXUNsqpCZBGc="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/by-name/my/mycli/package.nix b/pkgs/by-name/my/mycli/package.nix index cd1094e64f37..c9c12deea349 100644 --- a/pkgs/by-name/my/mycli/package.nix +++ b/pkgs/by-name/my/mycli/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "mycli"; - version = "1.41.2"; + version = "1.42.0"; pyproject = true; src = fetchFromGitHub { owner = "dbcli"; repo = "mycli"; tag = "v${version}"; - hash = "sha256-k6GgJpgjn2sFzdoPNVmsfOzAwIUiq5rSW7faLbijpnk="; + hash = "sha256-V8HqrhC+bVEgXlRPAZEo5KI8Bpz8qWbqd0qyLzSbSEQ="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix index 4e1ad54ad9ef..718fb15a7ca8 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.4.0"; + version = "5.5.0"; src = fetchFromGitHub { owner = "mykso"; repo = "myks"; tag = "v${version}"; - hash = "sha256-Q8Qtxb+eUaw0eX3F/jkgKKHmjApZ/UsTE+LeJ1FKoCg="; + hash = "sha256-swfzmuw7TtRvYeAlRTP1v3zvuSUsD/j1FddPfMDekbs="; }; - vendorHash = "sha256-wHP/l8Evu6F9Kzm88EQv9JMONI3OlWB3jB+88RgzKmo="; + vendorHash = "sha256-Gi/y6fCrfphBrF4Zag1zkAXuRhvvl9sTm3Magm6k0Q0="; subPackages = "."; diff --git a/pkgs/by-name/nc/ncps/package.nix b/pkgs/by-name/nc/ncps/package.nix index fc0a5886c30c..0bf753a556b1 100644 --- a/pkgs/by-name/nc/ncps/package.nix +++ b/pkgs/by-name/nc/ncps/package.nix @@ -13,13 +13,13 @@ let finalAttrs = { pname = "ncps"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "kalbasit"; repo = "ncps"; tag = "v${finalAttrs.version}"; - hash = "sha256-3ncDDJ0vqmM6Aer/qnEgGZ/eglFmY0oAnMsLJseMQg8="; + hash = "sha256-dPCzfy29wjRL5eXaueM8qLtKMmsNcwTqtSDBNOJ4NMc="; }; ldflags = [ diff --git a/pkgs/by-name/ne/nextvi/package.nix b/pkgs/by-name/ne/nextvi/package.nix index 761a78828170..d8a525841c6a 100644 --- a/pkgs/by-name/ne/nextvi/package.nix +++ b/pkgs/by-name/ne/nextvi/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nextvi"; - version = "3.0"; + version = "3.1"; src = fetchFromGitHub { owner = "kyx0r"; repo = "nextvi"; tag = finalAttrs.version; - hash = "sha256-SMPPG/pDtuS87PLyeUvmEqyqD9+Pye9rPQW1TpDGNc4="; + hash = "sha256-joIb+kJd0Oe1Irpz5zo48G+27umrr3Q1kKoLwpRiD8w="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/nn/nnd/package.nix b/pkgs/by-name/nn/nnd/package.nix index f8e871dd752a..2c028872621c 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.65"; + version = "0.66"; src = fetchFromGitHub { owner = "al13n321"; repo = "nnd"; tag = "v${finalAttrs.version}"; - hash = "sha256-fOCPxNkQKHVfaumds4G4+0GL8CtBa5UyuG2IzllUS3Q="; + hash = "sha256-92M5HSkXxlup+4vuQlf2AYIhYfIpRc5yGFgRcpLnHQY="; }; - cargoHash = "sha256-bNlC8yHiA6EBX2TK4QBvSp01+FjxRFr1/pSm1T/SFNU="; + cargoHash = "sha256-lS/nfRuf5u6+0ZBbuBfeQNU6G4jDWj02OBie7LxpYsc="; meta = { description = "Debugger for Linux"; diff --git a/pkgs/by-name/nu/numix-icon-theme-square/package.nix b/pkgs/by-name/nu/numix-icon-theme-square/package.nix index 372b6c7f7ad4..80418717a368 100644 --- a/pkgs/by-name/nu/numix-icon-theme-square/package.nix +++ b/pkgs/by-name/nu/numix-icon-theme-square/package.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "25.12.15"; + version = "25.12.27"; src = fetchFromGitHub { owner = "numixproject"; repo = "numix-icon-theme-square"; rev = version; - sha256 = "sha256-89OyttP8Mc1zRqIbIE9gpY9BHINLGJwUqkGVfeULCH4="; + sha256 = "sha256-D4Tclt0GQ70Ka4tmMPhOPVSHL/42hAB2D0PLe9iyN+U="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index fc5d4ee7ab59..7939b12b3b64 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -13,12 +13,12 @@ }: let pname = "opencode"; - version = "1.0.184"; + version = "1.0.210"; src = fetchFromGitHub { owner = "sst"; repo = "opencode"; tag = "v${version}"; - hash = "sha256-qEVFORKMoaLTsBbs2D9aLaD1W4vbQppJ6fB+bHWLcgM="; + hash = "sha256-0bWhOquP17U7F2NO+f8pubulqfOG03wMxzPpD/yqe3A="; }; node_modules = stdenvNoCC.mkDerivation { @@ -70,7 +70,7 @@ let # NOTE: Required else we get errors that our fixed-output derivation references store paths dontFixup = true; - outputHash = "sha256-NaLKlLke9K2/1+2NhrWIlsNRFL674PraWmBCbzkEk6c="; + outputHash = "sha256-P9ZiSW8aZWEUGE1OCej/S2biyJzSwlObcuRzBxJsEZU="; outputHashAlgo = "sha256"; outputHashMode = "recursive"; }; diff --git a/pkgs/by-name/pa/pax-utils/package.nix b/pkgs/by-name/pa/pax-utils/package.nix index e93d7989ee33..b7bb2dc83645 100644 --- a/pkgs/by-name/pa/pax-utils/package.nix +++ b/pkgs/by-name/pa/pax-utils/package.nix @@ -5,7 +5,9 @@ buildPackages, docbook_xml_dtd_44, docbook_xsl, + withFuzzing ? stdenv.hostPlatform.isLinux, withLibcap ? stdenv.hostPlatform.isLinux, + withSeccomp ? stdenv.hostPlatform.isLinux, libcap, pkg-config, meson, @@ -18,18 +20,20 @@ stdenv.mkDerivation rec { pname = "pax-utils"; - version = "1.3.8"; + version = "1.3.10"; src = fetchgit { url = "https://anongit.gentoo.org/git/proj/pax-utils.git"; rev = "v${version}"; - hash = "sha256-fOdiZcS1ZWGN8U5v65LzGIZJD6hCl5dbLMHDpSyms+8="; + hash = "sha256-qoFXQ/RqvdjsVhXVZZjWKnE0khak9HjOGi/UrfTLS8M="; }; strictDeps = true; mesonFlags = [ + (lib.mesonBool "use_fuzzing" withFuzzing) (lib.mesonEnable "use_libcap" withLibcap) + (lib.mesonBool "use_seccomp" withSeccomp) ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/by-name/po/podman-tui/package.nix b/pkgs/by-name/po/podman-tui/package.nix index cea5a5f98f37..c52bf4a97da7 100644 --- a/pkgs/by-name/po/podman-tui/package.nix +++ b/pkgs/by-name/po/podman-tui/package.nix @@ -55,7 +55,7 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/containers/podman-tui"; description = "Podman Terminal UI"; license = lib.licenses.asl20; - maintainers = [ ]; + maintainers = with lib.maintainers; [ aaronjheng ]; mainProgram = "podman-tui"; }; }) diff --git a/pkgs/by-name/pr/prometheus-node-cert-exporter/package.nix b/pkgs/by-name/pr/prometheus-node-cert-exporter/package.nix index ca7579e02db0..888089dce35a 100644 --- a/pkgs/by-name/pr/prometheus-node-cert-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-node-cert-exporter/package.nix @@ -1,32 +1,51 @@ { lib, - buildGoModule, fetchFromGitHub, + + go, + buildGoModule, + + versionCheckHook, + nix-update-script, }: -buildGoModule { +buildGoModule (finalAttrs: { pname = "node-cert-exporter"; - version = "1.1.7-unstable-2024-12-26"; + version = "1.1.7-unstable-2025-03-10"; src = fetchFromGitHub { owner = "amimof"; repo = "node-cert-exporter"; - rev = "v1.1.7"; - sha256 = "sha256-VYJPgNVsfEs/zh/SEdOrFn0FK6S+hNFGDhonj2syutQ="; + rev = "eef1b8207b5fdb4d6690fcfa543caf823cff0754"; + hash = "sha256-/z2wQmcCEsPKEMKj7OunD0e+9OvXv6NV6Bn8myW6HLk="; }; - vendorHash = "sha256-31MHX3YntogvoJmbOytl0rXS6qtdBSBJe8ejKyu6gqM="; - # Required otherwise we get a few: # vendor/github.com/golang/glog/internal/logsink/logsink.go:129:41: # predeclared any requires go1.18 or later (-lang was set to go1.16; check go.mod) patches = [ ./gomod.patch ]; + vendorHash = "sha256-Y/JgjWb2eFe4aCTU/v05rB5xH9TgZgZt2WITalj1nwc="; + + ldflags = [ + "-s" + "-X main.VERSION=${finalAttrs.version}" + "-X main.COMMIT=${finalAttrs.src.rev}" + "-X main.BRANCH=master" + "-X main.GOVERSION=${go.version}" + ]; + + doInstallCheck = true; + versionCheckProgramArg = "--version"; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + meta = { description = "Prometheus exporter for SSL certificate"; - mainProgram = "node-cert-exporter"; homepage = "https://github.com/amimof/node-cert-exporter"; license = lib.licenses.asl20; + mainProgram = "node-cert-exporter"; maintainers = with lib.maintainers; [ ibizaman ]; }; -} +}) diff --git a/pkgs/by-name/pu/pulumi-esc/package.nix b/pkgs/by-name/pu/pulumi-esc/package.nix index 3f714a6c7680..e825a91eb9f8 100644 --- a/pkgs/by-name/pu/pulumi-esc/package.nix +++ b/pkgs/by-name/pu/pulumi-esc/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "pulumi-esc"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "pulumi"; repo = "esc"; rev = "v${version}"; - hash = "sha256-ZS5mwRua/IYAhA5W+EEZxttArTm+vLArA1RM8SFOK60="; + hash = "sha256-oTCCPwdepaZif2LJfJtBuw4jQDUwDU+wGNgl+mB52Ko="; }; subPackages = "cmd/esc"; - vendorHash = "sha256-IcQaWo5/EoPJjn5pDKwHjd56JeareznE7iSansJIfso="; + vendorHash = "sha256-QDevyfNos1+kZmBJDKQH43EJ66XyrRPjdAkrhRqFJNU="; ldflags = [ "-s" diff --git a/pkgs/by-name/qu/quisk/package.nix b/pkgs/by-name/qu/quisk/package.nix index 2b303b16c3b8..efdf6160d408 100644 --- a/pkgs/by-name/qu/quisk/package.nix +++ b/pkgs/by-name/qu/quisk/package.nix @@ -9,12 +9,12 @@ python3.pkgs.buildPythonApplication rec { pname = "quisk"; - version = "4.2.48"; + version = "4.2.50"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-5N8uogS/V5nwYhHsdsc81GgjS9NblLx3KpdoEaXtpJI="; + hash = "sha256-HFZhVJxDUeFDFboWYGiuJYG8fb+xeWBKKi/6uBiDp84="; }; buildInputs = [ diff --git a/pkgs/by-name/sd/sdl-jstest/package.nix b/pkgs/by-name/sd/sdl-jstest/package.nix index 7eb0e8a218eb..e7b66c27ad24 100644 --- a/pkgs/by-name/sd/sdl-jstest/package.nix +++ b/pkgs/by-name/sd/sdl-jstest/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { pname = "sdl-jstest"; - version = "0.2.2-unstable-2025-12-05"; + version = "0.2.2-unstable-2025-11-28"; src = fetchFromGitHub { owner = "Grumbel"; diff --git a/pkgs/by-name/se/seadrive-gui/package.nix b/pkgs/by-name/se/seadrive-gui/package.nix index 87a6bed2e916..38d97e356b51 100644 --- a/pkgs/by-name/se/seadrive-gui/package.nix +++ b/pkgs/by-name/se/seadrive-gui/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "seadrive-gui"; - version = "3.0.18"; + version = "3.0.19"; src = fetchFromGitHub { owner = "haiwen"; repo = "seadrive-gui"; rev = "v${finalAttrs.version}"; - hash = "sha256-TAmLHoJmFZyGa0wMBBPBWYOOdBCiMBdVfrIBTCZ8Sig="; + hash = "sha256-gT0GKDy/tsQex3LNcBgMdZL2obtvU1BE4EAAIvIFiHM="; }; # Fix cmake modernization warning. diff --git a/pkgs/by-name/sh/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix b/pkgs/by-name/sh/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix index 936bfa00758d..e357ed6b3746 100644 --- a/pkgs/by-name/sh/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix +++ b/pkgs/by-name/sh/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix @@ -6,13 +6,13 @@ callPackage ../generic.nix rec { pname = "tower-pixel-dungeon"; - version = "1.0.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "FixAkaTheFix"; repo = "Tower-Pixel-Dungeon"; tag = "TPDv${lib.replaceStrings [ "." ] [ "" ] version}"; - hash = "sha256-8q1Wt+FXhw58+fK9WMiAcwNrwJfBa5oRBztFmfQz0Uk="; + hash = "sha256-/s+3FarO1iSW7f6SMkVxb9OSSEgVpM3gFUWFd+orcp4="; }; sourceRoot = src.name + "/pixel-towers-master"; diff --git a/pkgs/by-name/sh/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json b/pkgs/by-name/sh/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json index c4ba3f9b408d..2692102d85f7 100644 --- a/pkgs/by-name/sh/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json +++ b/pkgs/by-name/sh/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json @@ -1,6 +1,65 @@ { "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", "!version": 1, + "https://central.sonatype.com/repository/maven-snapshots/com/badlogicgames": { + "gdx#gdx-backend-lwjgl3/1.13.6-20251016.105554-34/SNAPSHOT": { + "jar": "sha256-unqPp0fol5ow2OPp46AmljGbt/b/zaDG8AP2QcKrVjU=", + "module": "sha256-3lbjdtsywfNKS5fxEeIEh8f8EunPNrEHieih8rqJXpE=", + "pom": "sha256-P7DA/UDAWmA+/t4H3EJkktKK/e9+pX0gH4fpljqZXWQ=" + }, + "gdx#gdx-freetype-platform/1.13.6-20251016.105554-35/SNAPSHOT": { + "pom": "sha256-kTnggHqjEcoBlUTM+K15WHCqKodiKvGPrgnTHuTKU4o=" + }, + "gdx#gdx-freetype-platform/1.13.6-20251016.105554-35/SNAPSHOT/natives-desktop": { + "jar": "sha256-TJvhHfQ9qRTZCDnOvymAn4PXmS6CziqEKN7yv5ioIQU=" + }, + "gdx#gdx-freetype/1.13.6-20251016.105554-35/SNAPSHOT": { + "jar": "sha256-qZWM1tkaKatC6U1h/Jgo9fV6/Six9XOuNU4qpVYhzsg=", + "module": "sha256-tyz5DG0UTrK0tt4ZK1BgJb35T5EBuNpj1gZLe6zoCTI=", + "pom": "sha256-wi92v9kAtTv++AZjKT3wJYBeISF98NLNy26X9kEVFSk=" + }, + "gdx#gdx-platform/1.13.6-20251016.105554-34/SNAPSHOT": { + "pom": "sha256-UW0w1+UTHDD4HaYruY6QVmd/ur/0vHS4wYDZ5hDCEuQ=" + }, + "gdx#gdx-platform/1.13.6-20251016.105554-34/SNAPSHOT/natives-desktop": { + "jar": "sha256-hCVxiuw/clRgnObDu+eM/OhDnTXEHhVt/gUmHTyzcgU=" + }, + "gdx#gdx/1.13.6-20251016.105554-34/SNAPSHOT": { + "jar": "sha256-40W5tyVSTXgmSdHtQQoll9OiGhDLhDqRPPWjrrspunM=", + "module": "sha256-4xOqM5QcQy7HCliD3TZNk+QvjI0FWI62x1pKpRNzwVs=", + "pom": "sha256-aDtJJZT/VHJyxd5RKFrQbc32IFT2wk9R7LeDvhBt8v4=" + }, + "gdx/gdx-backend-lwjgl3/1.13.6-SNAPSHOT/maven-metadata": { + "xml": { + "groupId": "com.badlogicgames.gdx", + "lastUpdated": "20251017222916" + } + }, + "gdx/gdx-freetype-platform/1.13.6-SNAPSHOT/maven-metadata": { + "xml": { + "groupId": "com.badlogicgames.gdx", + "lastUpdated": "20251212063147" + } + }, + "gdx/gdx-freetype/1.13.6-SNAPSHOT/maven-metadata": { + "xml": { + "groupId": "com.badlogicgames.gdx", + "lastUpdated": "20251017222931" + } + }, + "gdx/gdx-platform/1.13.6-SNAPSHOT/maven-metadata": { + "xml": { + "groupId": "com.badlogicgames.gdx", + "lastUpdated": "20251218070227" + } + }, + "gdx/gdx/1.13.6-SNAPSHOT/maven-metadata": { + "xml": { + "groupId": "com.badlogicgames.gdx", + "lastUpdated": "20251017222908" + } + } + }, "https://plugins.gradle.org/m2/org": { "beryx#badass-runtime-plugin/1.12.7": { "jar": "sha256-N3Mx2VyxIFb6U6Qt9/RfF4svqG1sWF9w74TRIz0RB0U=", @@ -41,50 +100,25 @@ } }, "https://repo.maven.apache.org/maven2": { - "com/badlogicgames/gdx#gdx-backend-lwjgl3/1.11.0": { - "jar": "sha256-my0CJorGB5QwSi4E5ep1H62fX5bsyvFdgCOm4LF6994=", - "module": "sha256-o7gpPFXSp2lb60LCcKrfKpQcK4NqQL8Ob4W6OOY0VwY=", - "pom": "sha256-wa55d83hp9muWlhfDe8Ap2d4LzcR5/+RYTX2UPA2HOo=" + "com/badlogicgames/gdx#gdx-jnigen-loader/2.5.2": { + "jar": "sha256-34HyPP1nhcUtNeEI7qo5MPVZ1NJ3CmEC51ynv6b58no=", + "module": "sha256-jwtii5G9Ez24XxUuFZMprPf0tmeDvR32AcNZfcJRIiQ=", + "pom": "sha256-i0dgu2bbPz+ZuEBj7z6ZDWOhzZx81XSlatf07kvRdoc=" }, - "com/badlogicgames/gdx#gdx-freetype-platform/1.11.0": { - "pom": "sha256-a5PHPPIyrqNpnueP5GEkJ14KwbsROJkXUcz96l8Au9c=" + "com/badlogicgames/gdx-controllers#gdx-controllers-core/2.2.4": { + "jar": "sha256-BNpnYnsaNkbvjyFMkdKWdCp8BVl9vCFnqqsJy9zHdHA=", + "module": "sha256-dxOP5TsOdeRf4dOROsublicWFxCuVPJUR0sizmp6pIA=", + "pom": "sha256-k7HO3nAet8GNZfFei7eds5zzGk6u5pMceIl84NgOMlQ=" }, - "com/badlogicgames/gdx#gdx-freetype-platform/1.11.0/natives-desktop": { - "jar": "sha256-9GCzmqhP9bnWC4mT4j/zKtpWellmThTrfha7VcWk9yE=" + "com/badlogicgames/gdx-controllers#gdx-controllers-desktop/2.2.4": { + "jar": "sha256-jjkOWcYhHtI+Cm/UAYzvo3+LmGXe5pmVaZBTSWuAHWw=", + "module": "sha256-zhrDRlPnkWGq8Nycm+vdDb1zQW0pHSz8ljavonod9mU=", + "pom": "sha256-2pO01ZTa8EMd+Q7bPPEOHjpGnCgCDHZb5P+fYKD6bTY=" }, - "com/badlogicgames/gdx#gdx-freetype/1.11.0": { - "jar": "sha256-u5hP1RQ13YCN0HaSWOqzJikXG19OnkPzmvRUPh7E3yI=", - "module": "sha256-n5oGuAY9dyn7H94+ippXm3vuPUqevY+xrDubsj78b/M=", - "pom": "sha256-xkjQNIE46uOtYmScUTA8R5rr5czpsbXQeLX3rkVQG+0=" - }, - "com/badlogicgames/gdx#gdx-jnigen-loader/2.3.1": { - "jar": "sha256-ZJDdoiWmHHYCwnu+xOSBE3/1lfjOCy3bpBTww0Bq7mA=", - "module": "sha256-nNWFK9nlHTbRJxrypGzZfOwk5XEHblQTbsmtNxhGua8=", - "pom": "sha256-7e2XZPzSpbw8peeAUEHppiAZ+ovkNLWZ8D1JR+KkQng=" - }, - "com/badlogicgames/gdx#gdx-platform/1.11.0": { - "pom": "sha256-8cBBk8LQnXP8lVNQL05ZFMIOgDWrdpoZ0z4bxJJ0AkA=" - }, - "com/badlogicgames/gdx#gdx-platform/1.11.0/natives-desktop": { - "jar": "sha256-yUFpxwl25LGMCL1qKWtETqiLtUlF67EtHy5DK5L4OTA=" - }, - "com/badlogicgames/gdx#gdx/1.11.0": { - "jar": "sha256-IxU8Z+GVYGROD6EjUjK12F7kHPKJKBwtp+yMKONXULk=", - "module": "sha256-twUVE1CLWninINOZQrsifRvrOrzgBpskstIAA2TPbbM=", - "pom": "sha256-2W6H3BZixRugifIY1Cy3/U3b3sZQiytosvCsZ5dvJSU=" - }, - "com/badlogicgames/gdx-controllers#gdx-controllers-core/2.2.3": { - "jar": "sha256-mONKsUmJoPsqyIG6IaxNEqbOTeQoPzmypPFlumEqOlA=", - "pom": "sha256-UFwJ02ifZMr31qLz/PeKizwEFLIuRH4BlTHJDBCqmGU=" - }, - "com/badlogicgames/gdx-controllers#gdx-controllers-desktop/2.2.3": { - "jar": "sha256-UkirjqKl+0SixFdVEQLsNAP/JYm6hKImCti8cv6X6oM=", - "pom": "sha256-yc9KDEo6Bu+vBLORaza3fL3F71YdCpy6GhdiPxH8Tt8=" - }, - "com/badlogicgames/jamepad#jamepad/2.0.20.0": { - "jar": "sha256-6fFqB9SpRCSs0DiOw6P+TsZLfhiWxlgUwv9rRisTs2Y=", - "module": "sha256-vXFX36GUJsdj2VgYbnHR3+lKnBRgBeEI9pwUameDrmY=", - "pom": "sha256-+gwaoDndosNqw/VslH3vLEOptLnkbCPhrqddHQaZ3eQ=" + "com/badlogicgames/jamepad#jamepad/2.26.5.0": { + "jar": "sha256-sO+RC6Uxyt/gQYSWow2Hy6xGAhsGJUf1tZR+A1Q1cRo=", + "module": "sha256-KGmFPVwJdU2vuY9u6veZLc2Q6K3uFxL/bgjmUgBKflA=", + "pom": "sha256-Up7mQ8lbw+6SfuSnRqwFaOQSnbb5dscD82IjN9/6Inc=" }, "com/badlogicgames/jlayer#jlayer/1.0.1-gdx": { "jar": "sha256-qrze3C4/pBxOE4hwUj10MzfxiZMQgGMLoaIoVTjNAPs=", @@ -98,130 +132,130 @@ "jar": "sha256-gT835IIPGFTopOtPgN+UvxsfLsbDtyaS8jq5pVYlavY=", "pom": "sha256-ZMFVQ6PV2yeaIK6w36A0oqecIVn4zUAd6kj/DyNMGN0=" }, - "org/lwjgl#lwjgl-glfw/3.3.1": { - "jar": "sha256-CLvDTrdS+GPjf4OrHHsMIvfLJtD4+wpKSoxgKKxFs4U=", - "pom": "sha256-TKQrQ8iqDodIWWB0d0C5lFqqH99+QTTm+iTo+d8cF2A=" + "org/lwjgl#lwjgl-glfw/3.3.3": { + "jar": "sha256-vtx1f9KxslUUbbJrdLnL0fz1ZEuJtHsQT6chx0FgQlk=", + "pom": "sha256-fJuPWGrEz36esvNnrphUzK7i2Nf2LiOHxJ0sGvrtirM=" }, - "org/lwjgl#lwjgl-glfw/3.3.1/natives-linux": { - "jar": "sha256-Ze0Ev/fQf+ybf958OxHEBShsjWbk609Mm3kuJn7OWwY=" + "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux": { + "jar": "sha256-uDBgYrF3QfNCaQiHUUIfGsIaWXv7vQxsYSJjAc3nRLg=" }, - "org/lwjgl#lwjgl-glfw/3.3.1/natives-linux-arm32": { - "jar": "sha256-hOvo8klGPrF84PrpnYsto8G/kcjUEHOjtYNFd7dS4/s=" + "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux-arm32": { + "jar": "sha256-3Z1NZxT8k1nUfdoNR8HYyLvkmQG393wj/Kepyb/CmFg=" }, - "org/lwjgl#lwjgl-glfw/3.3.1/natives-linux-arm64": { - "jar": "sha256-IgDyzcENHaZ215o+oFybpVnaCZUFwbdWtu0iL2FagSA=" + "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux-arm64": { + "jar": "sha256-zGE5yD95nQ4UhOpMIByM5tV8jHokSlIXEWqAax60F5s=" }, - "org/lwjgl#lwjgl-glfw/3.3.1/natives-macos": { - "jar": "sha256-G2z/nmSKci7gzBRmlhIFKqW6gJRp+os/sh8kw6vnDek=" + "org/lwjgl#lwjgl-glfw/3.3.3/natives-macos": { + "jar": "sha256-qJtVNirsnlo7vRNkYBu4WxR9trrmiJHKmiMtbPstVew=" }, - "org/lwjgl#lwjgl-glfw/3.3.1/natives-macos-arm64": { - "jar": "sha256-nHlVeHSNWPQtXUcu2A0ulpk71Psf/ABYztosYx7zmJo=" + "org/lwjgl#lwjgl-glfw/3.3.3/natives-macos-arm64": { + "jar": "sha256-uUUdZ7wXyQb7goKlUi8liwIvMFaeC2LaAB1ZChe0Xhk=" }, - "org/lwjgl#lwjgl-glfw/3.3.1/natives-windows": { - "jar": "sha256-nnROy4QCnXrO2uh24lV2WRhKKa/uVeRT9KslZzSb+Ek=" + "org/lwjgl#lwjgl-glfw/3.3.3/natives-windows": { + "jar": "sha256-mBVbRR38b1hQid7HehL5wFeJxNzrjaRy+dMIFgEBpw0=" }, - "org/lwjgl#lwjgl-glfw/3.3.1/natives-windows-x86": { - "jar": "sha256-pYAgBm4ePVP/xMf7ShWMDLP/tPM6rrPlTSVScyGUxBI=" + "org/lwjgl#lwjgl-glfw/3.3.3/natives-windows-x86": { + "jar": "sha256-lkZVXUBfDSo6lXa1BvV8FjKvZPaaiuWMsESK4EqceCQ=" }, - "org/lwjgl#lwjgl-jemalloc/3.3.1": { - "jar": "sha256-7kn8Co2UVkUuVM1vd3gj7aZm4sY/wU1lsv0sws/tXb4=", - "pom": "sha256-+ZSGEVVV8RPaHOOs1f7LyWk7X9o1P/era9Lj1//dsn4=" + "org/lwjgl#lwjgl-jemalloc/3.3.3": { + "jar": "sha256-6Z4xJp5meKS/xi7yTFCkgcAcvdAEhh7Omlm6EnaMZRY=", + "pom": "sha256-IJuMfX+cGXLVyNX5zhmjUW/5BxRD0N+Khm2hNDvS46k=" }, - "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-linux": { - "jar": "sha256-m3mvXH/Q2UkG7h0qU6NCCidQfWYiS0/0a59ncmRd7TQ=" + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux": { + "jar": "sha256-TkoT1wFdQmBbvPfvn66tRt6sZAnkN3qO1K6oFfFGNLM=" }, - "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-linux-arm32": { - "jar": "sha256-Bj8Lsu2V5d4q0G4Q0xJ/hJDdviBKyj5qOc5C3pF4TF8=" + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux-arm32": { + "jar": "sha256-5IM/wmIeLnMCBXPmKZcJIPHNHfmE/hyc7bszSNzDeG8=" }, - "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-linux-arm64": { - "jar": "sha256-X4nVRq4fr1Gv+/sMZBR60swze/ajLwv4fEbTTDQvxdU=" + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux-arm64": { + "jar": "sha256-44PVJBwNR/QBKnU+C//+Ra/DDQBiGbm9iQN1ahA3ibU=" }, - "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-macos": { - "jar": "sha256-B6qwMJQFjjiph2upM54IoiQDlO+Ii35/z9R2I1j22Wg=" + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-macos": { + "jar": "sha256-ICTapcaqQHhmQUi3OQ+4sjHyNw6g4X1AeJTbp+nlZOw=" }, - "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-macos-arm64": { - "jar": "sha256-500OE6wC9BAsIMF/DUFmCK2FNDSV7K4wAp32VousLSc=" + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-macos-arm64": { + "jar": "sha256-Y5Vuokb/ZKqpzg4dbjzK1obPv5N9H81suNX0T2OCFgw=" }, - "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-windows": { - "jar": "sha256-Il8331UAYUZ1vprLYnjLbJyAo0kmR5iyz8fsQ08e1HI=" + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-windows": { + "jar": "sha256-mUnI5JmYvQyHjYQohAEfE4PihRAFCR4LK897dnG4SOs=" }, - "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-windows-x86": { - "jar": "sha256-Y5uy113z3Vnqewv4uEfgr1cHRpTXk5ILoclTeJeyw9g=" + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-windows-x86": { + "jar": "sha256-2bTgbiqEIFWD+wVEDSI4OFqRywGgYN2x03YiOuIl8Uo=" }, - "org/lwjgl#lwjgl-openal/3.3.1": { - "jar": "sha256-cyXuG5GooQwGJsabVXqI8t9qwb3KDlLiqS0yQknyytA=", - "pom": "sha256-+ZzowctqhyXSbdyzNFxAPNu8x8qO6WYIu/PCxP2WaiE=" + "org/lwjgl#lwjgl-openal/3.3.3": { + "jar": "sha256-rg6Cdnys8Ikh9Xj7qdhHU93rAM6toFEKK0qIK+KPv5U=", + "pom": "sha256-f6aiEbvk5FuCmHU31kN6e1KUM07TrBbLhElV70PV5w8=" }, - "org/lwjgl#lwjgl-openal/3.3.1/natives-linux": { - "jar": "sha256-C3OB9R7cYQy2ByRdw0p2LSsht0R4FARAaKGmADu4eDg=" + "org/lwjgl#lwjgl-openal/3.3.3/natives-linux": { + "jar": "sha256-kDD+2SinHqwv30zhZDzE7HJNhxDjtDe9znUL3J6YKyo=" }, - "org/lwjgl#lwjgl-openal/3.3.1/natives-linux-arm32": { - "jar": "sha256-PQ39lwowYdM7FdvxjT7u/PB83EFx6skgUU8DhkY4mmI=" + "org/lwjgl#lwjgl-openal/3.3.3/natives-linux-arm32": { + "jar": "sha256-xyXRfh5GJsf0O29NCKRnSW4JECXnHxn0+x8xN8Tabmc=" }, - "org/lwjgl#lwjgl-openal/3.3.1/natives-linux-arm64": { - "jar": "sha256-RPO9inlEGNtNU+51Rtkdl9nK9/QuE+ojU2PMM18u9ig=" + "org/lwjgl#lwjgl-openal/3.3.3/natives-linux-arm64": { + "jar": "sha256-q/OSSHs1h9qJtlUlAAjfSjYKL9Xh7gCr1h9/UpFSBaE=" }, - "org/lwjgl#lwjgl-openal/3.3.1/natives-macos": { - "jar": "sha256-UYTKJLjf6XJVtstVjFKb1qOImBu+VeITcY4/0r2ehuQ=" + "org/lwjgl#lwjgl-openal/3.3.3/natives-macos": { + "jar": "sha256-gmSuMqyfQTxPRQGGPF9udXam/avcXQUtMoG7rMM3fx0=" }, - "org/lwjgl#lwjgl-openal/3.3.1/natives-macos-arm64": { - "jar": "sha256-wi7Lzvj+5K7q+YEDLfPiy8MKkRqQJS7awfFJeX1YdXU=" + "org/lwjgl#lwjgl-openal/3.3.3/natives-macos-arm64": { + "jar": "sha256-OZJGOhao3xn2MRewiD6tDtko3U3wF/VbXk4St6JwSJo=" }, - "org/lwjgl#lwjgl-openal/3.3.1/natives-windows": { - "jar": "sha256-X35maqJMqLP7dY5ywD/7nYCbMEicantH6tZ8aXf/ZU4=" + "org/lwjgl#lwjgl-openal/3.3.3/natives-windows": { + "jar": "sha256-49p8PbJcgduNQl7x49v6FQALBA1mnwCLCBPJQzOslsg=" }, - "org/lwjgl#lwjgl-openal/3.3.1/natives-windows-x86": { - "jar": "sha256-fVtbb61e+7Lowk80dgDHy8bv3RNh/TewtaEzGSMehR4=" + "org/lwjgl#lwjgl-openal/3.3.3/natives-windows-x86": { + "jar": "sha256-hSyk42sf390++2zkLwi30PlXsExLz714BXsMeZ85kjE=" }, - "org/lwjgl#lwjgl-opengl/3.3.1": { - "jar": "sha256-5DbSFE86Nv/3cv1kIzMWgJt5XzkN79TVVmD8aG58KDQ=", - "pom": "sha256-LL9XxnqNBGatgI4aJ/4908EQ6KwC3IqyushKhRl3VUE=" + "org/lwjgl#lwjgl-opengl/3.3.3": { + "jar": "sha256-UGLadQ5ffsieJ+i2e31A+oxLFokBWeNfgoEWzmyOyh4=", + "pom": "sha256-RDkltWQq0xjUnfrpe66c3QnkkCWzAqlLAQf8iIm+bN0=" }, - "org/lwjgl#lwjgl-opengl/3.3.1/natives-linux": { - "jar": "sha256-vPzZ+N/SKUiK2ew1PUjHsC3lyiG63UCS8ZAiOaHtBpA=" + "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux": { + "jar": "sha256-2COpLGooELURLaME3MarzUyxAnBvdPfpNKIjzqIFElA=" }, - "org/lwjgl#lwjgl-opengl/3.3.1/natives-linux-arm32": { - "jar": "sha256-IDPJfXY+YL2sAX/bsI06Q7vlwXqjZ7QsU3ycw6tAYY8=" + "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux-arm32": { + "jar": "sha256-BbGiXD+3Ipdao78siIQ3I9puEFmhktVo3e/AGkV/qkc=" }, - "org/lwjgl#lwjgl-opengl/3.3.1/natives-linux-arm64": { - "jar": "sha256-EFjEunNUzavz75NZUeKT91tJYedT13/XU13ccy4oPyg=" + "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux-arm64": { + "jar": "sha256-Cyt1Mn1HRRY0EjNI1VUDrgPlFVGwyIea6QyOS04aT5w=" }, - "org/lwjgl#lwjgl-opengl/3.3.1/natives-macos": { - "jar": "sha256-cR8plyiIUJJiqVfxsxOL+ptQVRnRHfbldj0cmj+LPF0=" + "org/lwjgl#lwjgl-opengl/3.3.3/natives-macos": { + "jar": "sha256-TBBz0OWumZZtDvHWp3lXWEdtJH2TD9xewYZeOMuEfM4=" }, - "org/lwjgl#lwjgl-opengl/3.3.1/natives-macos-arm64": { - "jar": "sha256-29EQBE6uitvKjjx6cwUpo1FVnnTOqIe7PNbvDcAW8pU=" + "org/lwjgl#lwjgl-opengl/3.3.3/natives-macos-arm64": { + "jar": "sha256-8bPx3oP5c6uuOkvDLbWyKa5dVcyA27xffIQYEv4gtf4=" }, - "org/lwjgl#lwjgl-opengl/3.3.1/natives-windows": { - "jar": "sha256-hRubWTysIeOvUd1MMD6N8/5qNEo/gda5vMGG5+VAv9o=" + "org/lwjgl#lwjgl-opengl/3.3.3/natives-windows": { + "jar": "sha256-9F5fYFlrA7Lj2LmKEjyFXr0LUVTIFV3CpWuJDMyQdHc=" }, - "org/lwjgl#lwjgl-opengl/3.3.1/natives-windows-x86": { - "jar": "sha256-aD2K09DQl3puoYuIpMvn6P1PBsGrIbq+2riDCXQLzGA=" + "org/lwjgl#lwjgl-opengl/3.3.3/natives-windows-x86": { + "jar": "sha256-nZnSA95OMShsrnU6HfuYE2fJNzTxlEZEunG+Uhs68sw=" }, - "org/lwjgl#lwjgl-stb/3.3.1": { - "jar": "sha256-ZOXMzi/Hy88Mg0pb6GQtniSYzj/jHBT/HfdBh4o/gSE=", - "pom": "sha256-dKgsbPvqhNIxAk2f2FgO2VumPCAafUeqsmO6hofDCVk=" + "org/lwjgl#lwjgl-stb/3.3.3": { + "jar": "sha256-DP96pG6p1w/MIIVwFSk+qA+/Ia3Kw0YAyE2puBpEypM=", + "pom": "sha256-jR2kP3mIdcV5yokH95rk/D6tFVQl6pVVxvqqsT1Q5J0=" }, - "org/lwjgl#lwjgl-stb/3.3.1/natives-linux": { - "jar": "sha256-+BuZjoxdYj1XHi/NRvy4e30w7SXfd95jrsjP7bNMSnA=" + "org/lwjgl#lwjgl-stb/3.3.3/natives-linux": { + "jar": "sha256-xEiQaN3G3ESxAwcZQ/gBotB2Y01LdNtHCSf4SjCCGeE=" }, - "org/lwjgl#lwjgl-stb/3.3.1/natives-linux-arm32": { - "jar": "sha256-6xnGjFt5MUjKOT24bzHQ3pVALZ9MFOUADjkYSA9iKkc=" + "org/lwjgl#lwjgl-stb/3.3.3/natives-linux-arm32": { + "jar": "sha256-/WYDpBauUJJiAxV7ajQOiPX60GyAjvQcsDUBcTn+Lzw=" }, - "org/lwjgl#lwjgl-stb/3.3.1/natives-linux-arm64": { - "jar": "sha256-XOyb0h8xIAJaLIOB3BCax+yI5o5xX9fK27kPXVVfZZs=" + "org/lwjgl#lwjgl-stb/3.3.3/natives-linux-arm64": { + "jar": "sha256-F/DPG45SLuprS5fBkHCznlT1+H7YT7iVhXR+QPkF4ds=" }, - "org/lwjgl#lwjgl-stb/3.3.1/natives-macos": { - "jar": "sha256-oXjWYDA5nGmJeN/kqVALdVep2vTAYeg8iHAzfpsL0+c=" + "org/lwjgl#lwjgl-stb/3.3.3/natives-macos": { + "jar": "sha256-MpN6NS20usPpKqG72uKYipWOS5B6tbVXdky6gtsgupc=" }, - "org/lwjgl#lwjgl-stb/3.3.1/natives-macos-arm64": { - "jar": "sha256-DXoP8tto86vkFpFn4vSJ3/d72igvQvhuQelEvnxDbdg=" + "org/lwjgl#lwjgl-stb/3.3.3/natives-macos-arm64": { + "jar": "sha256-sfZYdf2d3SgJe+YHYCniuPq168FibiHO92FhHfynFcI=" }, - "org/lwjgl#lwjgl-stb/3.3.1/natives-windows": { - "jar": "sha256-/W/3om6GRa95oNIcpz6NyeRz80AtEzPlRKgdIcpQd+c=" + "org/lwjgl#lwjgl-stb/3.3.3/natives-windows": { + "jar": "sha256-0Sq4Zv4RaekkrFtNa7d2eueEKp/IZSeYaCwAabtz/PI=" }, - "org/lwjgl#lwjgl-stb/3.3.1/natives-windows-x86": { - "jar": "sha256-v3PjtRu0MOWIvRWOlsyimOmMoS8p3FzxRFwfDFw5uhs=" + "org/lwjgl#lwjgl-stb/3.3.3/natives-windows-x86": { + "jar": "sha256-RkJORUWXM7JsSnsN0mlSCctpONr6OpASxqVoLJSixA4=" }, "org/lwjgl#lwjgl-tinyfd/3.3.1": { "jar": "sha256-SI9R7ZXw+sSNHYfLDjusCMAS3L9u88FohoXXCM28zVY=", @@ -242,30 +276,30 @@ "org/lwjgl#lwjgl-tinyfd/3.3.1/natives-windows": { "jar": "sha256-7McVIQloBZdWnZsyIEXynBp93uxxgs9pGJ2uFUE4ucg=" }, - "org/lwjgl#lwjgl/3.3.1": { - "jar": "sha256-z4P5DjL7lz/17fyk7zX1XKUbtwpXm2ofKQdE9VLo5IQ=", - "pom": "sha256-xMXHr6uOt4JTZqIwhsPf7droMIwRXF1iF6gm7DJLN+M=" + "org/lwjgl#lwjgl/3.3.3": { + "jar": "sha256-3Jx7LUjoOW1oiV+JAv+gHkYlPeRN/pJ1M/8JRX6/7sQ=", + "pom": "sha256-gx1Gb8AWKUUrRhNzEeFYI8CWx9b66VKYxke5+/XWgfQ=" }, - "org/lwjgl#lwjgl/3.3.1/natives-linux": { - "jar": "sha256-Iu8q+jGhdAozfsnGgGxrjZfpMaY+LEMnDLrxT7P2/E4=" + "org/lwjgl#lwjgl/3.3.3/natives-linux": { + "jar": "sha256-5mNzjFGaBvbWWYgvqOTgmvfxDpIZKe5cxUp1h/Yu1Mk=" }, - "org/lwjgl#lwjgl/3.3.1/natives-linux-arm32": { - "jar": "sha256-9rVYGOx25ewBfiW8OvbsTbe3ol56KhdW+i/6uojIZWQ=" + "org/lwjgl#lwjgl/3.3.3/natives-linux-arm32": { + "jar": "sha256-cNP3SNRawTWDKplV6lGcpv7Tqn0dR+tnR8uHk2hGyUE=" }, - "org/lwjgl#lwjgl/3.3.1/natives-linux-arm64": { - "jar": "sha256-T9lq94+cKTsXAAEcfbGg7AI3xNGIPjf6vgj3To0uAiQ=" + "org/lwjgl#lwjgl/3.3.3/natives-linux-arm64": { + "jar": "sha256-OXp5pdiQcobUAY0CbLw3NYxTu7aqvDoVNPGf8jt/hVg=" }, - "org/lwjgl#lwjgl/3.3.1/natives-macos": { - "jar": "sha256-9I5hCpgdylFbm75zRcx240UME0BLBS2Kw1fvCvjpCr8=" + "org/lwjgl#lwjgl/3.3.3/natives-macos": { + "jar": "sha256-ApTuTi3X72vvr/r8C7maKom3YHC1zYMC89dWJLZ4bQM=" }, - "org/lwjgl#lwjgl/3.3.1/natives-macos-arm64": { - "jar": "sha256-cZfomrgKKiGDtO6SXMtE5XLwy3V6kndq34JlJpIAo2o=" + "org/lwjgl#lwjgl/3.3.3/natives-macos-arm64": { + "jar": "sha256-UKycoJ5Z8FHcrPTcCyFF6ekW5qsUYzt1aUIxv+WTFKg=" }, - "org/lwjgl#lwjgl/3.3.1/natives-windows": { - "jar": "sha256-CT0T1ipkNLxla/EKOzfiUw/ZrzsLwg+OlUW+WGWdFEM=" + "org/lwjgl#lwjgl/3.3.3/natives-windows": { + "jar": "sha256-XuY6GRh+/lu4dH/ST3sTJX2zSN9a1kEROjaV5D8hOVk=" }, - "org/lwjgl#lwjgl/3.3.1/natives-windows-x86": { - "jar": "sha256-6QwfnPVwGu7ymC6/CQWiuZH0YiuKf4JQ6vCHO1oKAiM=" + "org/lwjgl#lwjgl/3.3.3/natives-windows-x86": { + "jar": "sha256-IqIjOCYlVOteEzyEQd7u2shNoILrO6yE0DLaT682l0k=" }, "org/sonatype/oss#oss-parent/7": { "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" diff --git a/pkgs/by-name/si/simpleDBus/package.nix b/pkgs/by-name/si/simpleDBus/package.nix index 7357a3754a92..672b85ee54c9 100644 --- a/pkgs/by-name/si/simpleDBus/package.nix +++ b/pkgs/by-name/si/simpleDBus/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "simpleDBus"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "OpenBluetoothToolbox"; repo = "SimpleBLE"; rev = "v${finalAttrs.version}"; - hash = "sha256-eEbptFy5tlIHuBu+HbPxsgdb9CVNXq8r2KKP0E8SIuE="; + hash = "sha256-KNSrw+NhfHRuvDwkWpWTSnP6LWoSVWAa33fVikb60A8="; }; outputs = [ diff --git a/pkgs/by-name/sl/slade-unstable/package.nix b/pkgs/by-name/sl/slade-unstable/package.nix index 2193cca056ca..3de4868c10a0 100644 --- a/pkgs/by-name/sl/slade-unstable/package.nix +++ b/pkgs/by-name/sl/slade-unstable/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation { pname = "slade"; - version = "3.2.9-unstable-2025-12-01"; + version = "3.2.9-unstable-2025-12-26"; src = fetchFromGitHub { owner = "sirjuddington"; repo = "SLADE"; - rev = "e76a6921b3295d34066f5ceedad9d3604b0354c3"; - hash = "sha256-BwxooUtblNa9fdZ62hgxh6RU0g1reCJrEMV77A8Y9dQ="; + rev = "23c0c881780316304e4441e3f910f9db2b1ea2f9"; + hash = "sha256-egzcc1rqlZdUAjyumHXqmL6XP3G6YzkS2iaX48ZBJiA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sl/slurm/package.nix b/pkgs/by-name/sl/slurm/package.nix index 047c39b11bfc..9c775ad623fd 100644 --- a/pkgs/by-name/sl/slurm/package.nix +++ b/pkgs/by-name/sl/slurm/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, runCommand, config, pkg-config, @@ -41,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "slurm"; - version = "25.05.3.1"; + version = "25.11.1.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -50,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "slurm"; # The release tags use - instead of . rev = "slurm-${builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version}"; - hash = "sha256-W/q9eN4Ov3pxp2qyr3b7G4ayDaNtFUPQeAcOHCB23Q8="; + hash = "sha256-Hv0rqogwZH5GafwlELghAbKLwurd8x30u9DJZylBQP0="; }; outputs = [ @@ -58,6 +59,15 @@ stdenv.mkDerivation (finalAttrs: { "dev" ]; + patches = [ + # upstream patch; remove with next upgrade. + (fetchpatch { + name = "pmix-509-compatability.patch"; + url = "https://github.com/SchedMD/slurm/commit/be063f0c646d2bfe10d358fa7063f2b64e19e063.patch"; + hash = "sha256-QbKMBMl+VTLrzdXhPtcqwC7OcAXcJBxDS8jRZ2EoJL4="; + }) + ]; + prePatch = '' substituteInPlace src/common/env.c \ --replace "/bin/echo" "${lib.getExe' coreutils "echo"}" diff --git a/pkgs/by-name/sm/smuxi/package.nix b/pkgs/by-name/sm/smuxi/package.nix index 9bb651dfb673..bda6517471dd 100644 --- a/pkgs/by-name/sm/smuxi/package.nix +++ b/pkgs/by-name/sm/smuxi/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ]; preConfigure = '' - NOCONFIGURE=1 NOGIT=1 ./autogen.sh + NOCONFIGURE=1 NOGIT=1 ACLOCAL_FLAGS="-I ${gettext}/share/gettext/m4" ./autogen.sh ''; configureFlags = [ diff --git a/pkgs/by-name/sq/sqls/package.nix b/pkgs/by-name/sq/sqls/package.nix index 13d3e55ad6cc..44af7f46ceab 100644 --- a/pkgs/by-name/sq/sqls/package.nix +++ b/pkgs/by-name/sq/sqls/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "sqls"; - version = "0.2.28"; + version = "0.2.30"; src = fetchFromGitHub { owner = "sqls-server"; repo = "sqls"; rev = "v${version}"; - hash = "sha256-b3zLyj2n+eKOPBRooS68GfM0bsiTVXDblYKyBYKiYug="; + hash = "sha256-vsU0EZZ7Wwo2esv7StmSB4DbQXCwp4Mi+KsylCL0WcM="; }; - vendorHash = "sha256-6IFJvdT7YLnWsg7Icd3nKXXHM6TZKZ+IG9nEBosRCwA="; + vendorHash = "sha256-BSGKFSw/ReeADnB3FuEJoxstkCcJx434vNaFf5A+Gbw="; ldflags = [ "-s" diff --git a/pkgs/by-name/st/stasis/package.nix b/pkgs/by-name/st/stasis/package.nix index 4213a0744e15..ddd5c444f98b 100644 --- a/pkgs/by-name/st/stasis/package.nix +++ b/pkgs/by-name/st/stasis/package.nix @@ -14,16 +14,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "stasis"; - version = "0.8.5"; + version = "0.9.0"; src = fetchFromGitHub { owner = "saltnpepper97"; repo = "stasis"; tag = "v${finalAttrs.version}"; - hash = "sha256-K5aKcmmWltsX2rz85+NIGdD8249TphTmxFZyPEAdIJI="; + hash = "sha256-ILv0TY1x7DdZw+AqTSs1+TW8bdxlCIN0/tiLsAuIpXc="; }; - cargoHash = "sha256-LQCxCFMabbsMHhGyqSReyklJTliVVi+CUCF2yL2NeuE="; + cargoHash = "sha256-reu0SJt5gQ/+XOx508PXzg9VL1+iBFwvUiyJyQC+oR0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/tf/tfmigrate/package.nix b/pkgs/by-name/tf/tfmigrate/package.nix index 54460e85527c..33d7e793a7ef 100644 --- a/pkgs/by-name/tf/tfmigrate/package.nix +++ b/pkgs/by-name/tf/tfmigrate/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "tfmigrate"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "minamijoyo"; repo = "tfmigrate"; tag = "v${finalAttrs.version}"; - hash = "sha256-tuLbcxJj8TsG3I/o3cHO2DtQm9ql3wlhYBtYiMbRW7o="; + hash = "sha256-633b7VZ0/JNWuBh0C9CtbG5XdgTD2zLuotBbgv0a2e8="; }; vendorHash = "sha256-TqZi5NZ+4eSzq98/ZM4Gab7Sud7bz1DNHrp5nGaGHDE="; diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix index 06f44f3036fc..73d4a973d2af 100644 --- a/pkgs/by-name/tp/tpnote/package.nix +++ b/pkgs/by-name/tp/tpnote/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tpnote"; - version = "1.25.16"; + version = "1.25.17"; src = fetchFromGitHub { owner = "getreu"; repo = "tp-note"; tag = "v${finalAttrs.version}"; - hash = "sha256-gltzK1C+4qddJ49vv+OZ8AVuMeBWArwOZkL+v7cxFzw="; + hash = "sha256-XOoqPhWS50kj2n48A0SyOuUZHsoP7YxMrWpzgpTr/DY="; }; - cargoHash = "sha256-OH3aSQdcAGNRJWGmgQ4LNnD89hqCIEh+ieHosjFhAbk="; + cargoHash = "sha256-4e06W8Q+pJTcUgfDSHU1ZTMG/55mYvJ6DAX3QeAa9TI="; nativeBuildInputs = [ cmake @@ -34,6 +34,16 @@ rustPlatform.buildRustPackage (finalAttrs: { oniguruma ]; + postPatch = '' + # In these `Cargo.toml`s, local dependencies should be specified by path, + # otherwise they will be looked up in vendored dependencies. + substituteInPlace tpnote/Cargo.toml \ + --replace-fail 'tpnote-lib = { version =' 'tpnote-lib = { path = "../tpnote-lib", version =' + + substituteInPlace tpnote-lib/Cargo.toml \ + --replace-fail 'tpnote-html2md = { version =' 'tpnote-html2md = { path = "../tpnote-html2md", version =' + ''; + postInstall = '' installManPage docs/build/man/man1/tpnote.1 ''; @@ -61,6 +71,9 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://blog.getreu.net/projects/tp-note/"; license = lib.licenses.mit; mainProgram = "tpnote"; - maintainers = with lib.maintainers; [ getreu ]; + maintainers = with lib.maintainers; [ + getreu + starryreverie + ]; }; }) diff --git a/pkgs/by-name/tp/tproxy/package.nix b/pkgs/by-name/tp/tproxy/package.nix index 3d864c06552c..ba2c425c94f8 100644 --- a/pkgs/by-name/tp/tproxy/package.nix +++ b/pkgs/by-name/tp/tproxy/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "tproxy"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "kevwan"; repo = "tproxy"; tag = "v${version}"; - hash = "sha256-Ck7WtCxWiZxkKlx7D/N0EZmFEgrW7MpPj5ATvJxGXgg="; + hash = "sha256-rVcPI0cB1TMiG4swdflOwFq+W23suM97qqPs6T4vmqw="; }; - vendorHash = "sha256-xYPF3RGrOQ1e2EPHtvlM9QKSE+V4cnG8f9JTS0hkAYU="; + vendorHash = "sha256-ygaRcSIYNesA1zWdUlL0AqSxec4dwIE0cbGImHX7+wU="; ldflags = [ "-w" diff --git a/pkgs/by-name/tu/tun2proxy/package.nix b/pkgs/by-name/tu/tun2proxy/package.nix index 3454f9bdedb0..40f205111f98 100644 --- a/pkgs/by-name/tu/tun2proxy/package.nix +++ b/pkgs/by-name/tu/tun2proxy/package.nix @@ -8,15 +8,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tun2proxy"; - version = "0.7.18"; + version = "0.7.19"; src = fetchCrate { pname = "tun2proxy"; inherit (finalAttrs) version; - hash = "sha256-abgknJuP0p5QS2iTyix0Uq6xiQkeTGK+M/weIHoZNgI="; + hash = "sha256-mg1GGtWCjxSPhlb0pjFNPVTblZWfUXQa3643T9siD20="; }; - cargoHash = "sha256-8DGlQCXXrq5s0TkqpWhgb2Gw1ve8LCxT0KNzZLvd0zY="; + cargoHash = "sha256-ZoLy3iknPUq2OmXQUomVVWij+mexixB6eDvGhrlsWDk="; env.GIT_HASH = "000000000000000000000000000000000000000000000000000"; diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 532cdee531dc..113c53af2120 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.18"; + version = "0.9.20"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-hef79QdqCgK0oni4wZVVJzyEkqTob7ek9l6GazbmygY="; + hash = "sha256-q8NoNzsqSCsnQNGXNYhW1shSwrpRjoiqq6L8LEHUbVU="; }; - cargoHash = "sha256-ulbznI3qQDrzPircibC7xdEwCk/OVsFQW5lCYWrjfkg="; + cargoHash = "sha256-E+ruzlsiyolctbnNi7vvkNO6j/5HpAir3UXz6uTbJos="; buildInputs = [ rust-jemalloc-sys diff --git a/pkgs/by-name/wa/warzone2100/package.nix b/pkgs/by-name/wa/warzone2100/package.nix index 5db194848747..4f050b508f6d 100644 --- a/pkgs/by-name/wa/warzone2100/package.nix +++ b/pkgs/by-name/wa/warzone2100/package.nix @@ -9,7 +9,7 @@ asciidoctor, gettext, - SDL2, + sdl3, libtheora, libvorbis, libopus, @@ -49,15 +49,15 @@ in stdenv.mkDerivation (finalAttrs: { inherit pname; - version = "4.6.1"; + version = "4.6.2"; src = fetchurl { url = "mirror://sourceforge/project/warzone2100/releases/${finalAttrs.version}/warzone2100_src.tar.xz"; - hash = "sha256-JqxVOEYCQ/ihSdMSZNpxyqTTPvaoAQA37/JOdyeMpQs="; + hash = "sha256-hWIW2r6vLgOuj351jDlbJ9IYif6LX+RfOvznAP3n1x8="; }; buildInputs = [ - SDL2 + sdl3 libtheora libvorbis libopus diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix index 42082188e02a..dc6ba744b26c 100644 --- a/pkgs/by-name/we/weblate/package.nix +++ b/pkgs/by-name/we/weblate/package.nix @@ -9,6 +9,7 @@ gdk-pixbuf, glib, gobject-introspection, + askalono, borgbackup, writeText, nixosTests, @@ -23,7 +24,7 @@ let in python.pkgs.buildPythonApplication rec { pname = "weblate"; - version = "5.14.3"; + version = "5.15.1"; pyproject = true; @@ -36,7 +37,7 @@ python.pkgs.buildPythonApplication rec { owner = "WeblateOrg"; repo = "weblate"; tag = "weblate-${version}"; - hash = "sha256-DwoJ24yGLJt+bItN/9SW0ruf+Lz3A9JxvD4QjlKaqzw="; + hash = "sha256-9k6H9/XW7vbXix+zadxHCNl9UJ3yE1ONa/+VRvIGk28="; }; build-system = with python.pkgs; [ setuptools ]; @@ -68,6 +69,7 @@ python.pkgs.buildPythonApplication rec { "certifi" "cyrtranslit" "django-appconf" + "urllib3" ]; dependencies = @@ -80,6 +82,7 @@ python.pkgs.buildPythonApplication rec { celery certifi charset-normalizer + confusable-homoglyphs crispy-bootstrap3 crispy-bootstrap5 cryptography @@ -104,6 +107,7 @@ python.pkgs.buildPythonApplication rec { docutils drf-spectacular drf-standardized-errors + fedora-messaging filelock fluent-syntax gitpython @@ -118,6 +122,7 @@ python.pkgs.buildPythonApplication rec { packaging phply pillow + pyaskalono pycairo pygments pygobject3 @@ -133,7 +138,6 @@ python.pkgs.buildPythonApplication rec { siphashc social-auth-app-django social-auth-core - standardwebhooks tesserocr translate-toolkit translation-finder @@ -145,7 +149,10 @@ python.pkgs.buildPythonApplication rec { ++ django.optional-dependencies.argon2 ++ celery.optional-dependencies.redis ++ drf-spectacular.optional-dependencies.sidecar - ++ drf-standardized-errors.optional-dependencies.openapi; + ++ drf-standardized-errors.optional-dependencies.openapi + ++ translate-toolkit.optional-dependencies.toml + ++ urllib3.optional-dependencies.brotli + ++ urllib3.optional-dependencies.zstd; optional-dependencies = { postgres = with python.pkgs; [ psycopg ]; diff --git a/pkgs/by-name/xp/xpipe/package.nix b/pkgs/by-name/xp/xpipe/package.nix index 8b92a1ef70f1..5d020a2a955c 100644 --- a/pkgs/by-name/xp/xpipe/package.nix +++ b/pkgs/by-name/xp/xpipe/package.nix @@ -39,7 +39,7 @@ let hash = { - x86_64-linux = "sha256-yXvIRbp9fgfDlBR4Gyoneu1P9ymJRNHb4SLGPe0Of8Y="; + x86_64-linux = "sha256-Yj2rS2STksxyk6ORoGGAXBdRGg8Ng/cpVzhyNnfbElU="; } .${system} or throwSystem; @@ -48,7 +48,7 @@ let in stdenvNoCC.mkDerivation rec { pname = "xpipe"; - version = "19.6"; + version = "20.0"; src = fetchzip { url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz"; diff --git a/pkgs/by-name/xs/xsnow/package.nix b/pkgs/by-name/xs/xsnow/package.nix index 41da59b450f1..683b91ea075b 100644 --- a/pkgs/by-name/xs/xsnow/package.nix +++ b/pkgs/by-name/xs/xsnow/package.nix @@ -12,11 +12,11 @@ }: stdenv.mkDerivation rec { pname = "xsnow"; - version = "3.8.5"; + version = "3.9.0"; src = fetchurl { url = "https://ratrabbit.nl/downloads/xsnow/xsnow-${version}.tar.gz"; - sha256 = "sha256-NkoD/oMxdJwnx9QCBM8dwFOTPg7YzOZLnNiEOQt36cU="; + sha256 = "sha256-PMZsxZUmVHZwU6+KBPMq8sjyt42jlrXazgk7DGc9bvo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ya/yaookctl/package.nix b/pkgs/by-name/ya/yaookctl/package.nix index 4d2b30e5deb0..880f72a1dbfa 100644 --- a/pkgs/by-name/ya/yaookctl/package.nix +++ b/pkgs/by-name/ya/yaookctl/package.nix @@ -6,13 +6,13 @@ }: python3.pkgs.buildPythonApplication { pname = "yaookctl"; - version = "0-unstable-2025-11-18"; + version = "0-unstable-2025-12-12"; src = fetchFromGitLab { owner = "yaook"; repo = "yaookctl"; - rev = "cc339565b136ec9bad36f9eb3dc1b3da728cc0ec"; - hash = "sha256-9UCF1qo6OOfOBoWqsQMxlHZNJD7OQnSFONJ+cXT0LUs="; + rev = "94215db203cd8e471616d557cd83d71f0bc9918d"; + hash = "sha256-rAd69fJQSqo6Xe0yL4CmPn0/HmygWkojwBXPEOAY1dE="; }; pyproject = true; diff --git a/pkgs/by-name/ya/yaydl/package.nix b/pkgs/by-name/ya/yaydl/package.nix index 5a5a6ba01c06..7d5caaf5c19c 100644 --- a/pkgs/by-name/ya/yaydl/package.nix +++ b/pkgs/by-name/ya/yaydl/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "yaydl"; - version = "0.18.3"; + version = "0.19.0"; src = fetchFromGitHub { owner = "dertuxmalwieder"; repo = "yaydl"; rev = "release-${version}"; - sha256 = "sha256-mfyh26pft3FnfAAxXBpOBCTJ4HATUmrCvaN+HAiDHGc="; + sha256 = "sha256-X5D4kC5P5qHLSlTa9sQUAql1zK+Iut24224wvqihfAY="; }; - cargoHash = "sha256-iVhaIkJeaofMLlvBrJZtAJ4SsBb1VBdMg6XoZhjGV5g="; + cargoHash = "sha256-nt9S9KrHO8Vp75XZMQ0RAiALpdQ5LxI2Yaf3LRQD+fE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ya/yazi/package.nix b/pkgs/by-name/ya/yazi/package.nix index 7248aa46f9f3..2b08089ee729 100644 --- a/pkgs/by-name/ya/yazi/package.nix +++ b/pkgs/by-name/ya/yazi/package.nix @@ -51,6 +51,7 @@ let "yazi" "theme" "keymap" + "vfs" ]; configHome = diff --git a/pkgs/by-name/yg/yggdrasil/package.nix b/pkgs/by-name/yg/yggdrasil/package.nix index e0fd47e12134..d9cd97588864 100644 --- a/pkgs/by-name/yg/yggdrasil/package.nix +++ b/pkgs/by-name/yg/yggdrasil/package.nix @@ -38,6 +38,7 @@ buildGoModule rec { description = "Experiment in scalable routing as an encrypted IPv6 overlay network"; homepage = "https://yggdrasil-network.github.io/"; license = lib.licenses.lgpl3; + mainProgram = "yggdrasil"; maintainers = with lib.maintainers; [ gazally lassulus diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix index 69da8b25b3e1..2f07f44e1c8c 100644 --- a/pkgs/by-name/yt/ytdl-sub/package.nix +++ b/pkgs/by-name/yt/ytdl-sub/package.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication rec { pname = "ytdl-sub"; - version = "2025.12.26"; + version = "2025.12.30"; pyproject = true; src = fetchFromGitHub { owner = "jmbannon"; repo = "ytdl-sub"; tag = version; - hash = "sha256-NRIA8vbkRCkL43p5YkhQtPk58iW1rH0LqBbYAyfyv0I="; + hash = "sha256-MRDLtrfxGJIWz5yk4tW4MMSY9muhgZz0w8+1XWmSAks="; }; postPatch = '' diff --git a/pkgs/by-name/ze/zed-discord-presence/package.nix b/pkgs/by-name/ze/zed-discord-presence/package.nix index ad301d2e0dd6..b35a35688760 100644 --- a/pkgs/by-name/ze/zed-discord-presence/package.nix +++ b/pkgs/by-name/ze/zed-discord-presence/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-discord-presence"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "xhyrom"; repo = "zed-discord-presence"; tag = "v${finalAttrs.version}"; - hash = "sha256-tbtccnG81YrDVk4vY1yImjiezIQrBAhVWdZs7MmUAog="; + hash = "sha256-BvhAt4tA3efu2XHQLEA0eTNInol0fWRiCtzBplLDzMo="; }; cargoBuildFlags = [ "--package discord-presence-lsp" ]; - cargoHash = "sha256-HNyxaiX+nHnWqu3TZmNbmazT9GkQTukbHTz+7kJXEDo="; + cargoHash = "sha256-/25WO/zTgQPuctXowRtVF1GxXdmJzsL5HjhLaxcj0Ao="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ze/zerofs/package.nix b/pkgs/by-name/ze/zerofs/package.nix index 93a0ddfdc521..7ea50507fce6 100644 --- a/pkgs/by-name/ze/zerofs/package.nix +++ b/pkgs/by-name/ze/zerofs/package.nix @@ -11,18 +11,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "zerofs"; - version = "0.22.8"; + version = "0.22.9"; src = fetchFromGitHub { owner = "Barre"; repo = "ZeroFS"; tag = "v${finalAttrs.version}"; - hash = "sha256-YasJ72o/jTgYG9soYbOJpwdzs6I63gaJg4P2sgjwfnQ="; + hash = "sha256-eAH2zOM5FOUaLRfMQp2Dsa6ghKmOGVVbOz7JETnVRzU="; }; sourceRoot = "${finalAttrs.src.name}/zerofs"; - cargoHash = "sha256-0RgChmyqtvqBdmhLfbtOfLJpAmsPHzBfS483TFFboDw="; + cargoHash = "sha256-U/ZsjZ42PxTd/g2G1DfDazCSOIvsULtt/zufyBVZFyQ="; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/compilers/ghc/9.12.3.nix b/pkgs/development/compilers/ghc/9.12.3.nix new file mode 100644 index 000000000000..87301e687994 --- /dev/null +++ b/pkgs/development/compilers/ghc/9.12.3.nix @@ -0,0 +1,4 @@ +import ./common-hadrian.nix { + version = "9.12.3"; + sha256 = "209023906ce460e5288c9844b728a7f704868269489dc724ed097da550f6e869"; +} diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 2ea294a8b129..e343cd33cef8 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,5 +1,5 @@ import ./common-hadrian.nix { - version = "9.15.20250811"; - rev = "c8d76a2994b8620c54adc2069f4728135d6b5059"; - sha256 = "001rf9z5a1v2xpm9qjzz2p966m5bxmqcnykq0xgb3qf40vi9rnh4"; + version = "9.15.20251225"; + rev = "a3afae0c85fa57479378a5df5bbde2e3a8da8a06"; + sha256 = "sha256-inZFFKnCb8C7RTlKP2bnHOLfc1GveGi6Wy0uAaLv1Kk="; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix index 51f9eb8df649..07e33c894c29 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix @@ -124,7 +124,5 @@ with haskellLib; # Test failure because of GHC bug: # https://gitlab.haskell.org/ghc/ghc/-/issues/25937 # https://github.com/sol/interpolate/issues/20 - interpolate = - assert super.ghc.version == "9.12.2"; - dontCheck super.interpolate; + interpolate = dontCheckIf (lib.versionOlder self.ghc.version "9.12.3") super.interpolate; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.16.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.16.x.nix index 2a09d3f258c0..625165fd46a0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.16.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.16.x.nix @@ -45,6 +45,8 @@ self: super: { stm = null; system-cxx-std-lib = null; template-haskell = null; + template-haskell-lift = null; + template-haskell-quasiquoter = null; terminfo = null; text = null; time = null; diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix index 6e33b3ba3c60..ecf54354a8b7 100644 --- a/pkgs/development/interpreters/php/8.2.nix +++ b/pkgs/development/interpreters/php/8.2.nix @@ -4,8 +4,8 @@ let base = callPackage ./generic.nix ( _args // { - version = "8.2.29"; - hash = "sha256-UZeejRmMut4qrU/+n1PdPwT5YC0wieWXmYXgWK3kJnw="; + version = "8.2.30"; + hash = "sha256-EEggtsj8lZ3eSzNCE19CvavyRuhpGKFjgaF9hEfIZvo="; } ); in diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix index c1155c1eadef..1d72efb4be84 100644 --- a/pkgs/development/interpreters/php/8.3.nix +++ b/pkgs/development/interpreters/php/8.3.nix @@ -4,8 +4,8 @@ let base = callPackage ./generic.nix ( _args // { - version = "8.3.28"; - hash = "sha256-1bOF7jUexGPIXUfutTtRFW80g+rz/0OnrVCAwrbUxVc="; + version = "8.3.29"; + hash = "sha256-xzNyEuZVMl1JnqgQj6dvad3eL/98sPrTaqY+7VQMuKU="; } ); in diff --git a/pkgs/development/interpreters/php/8.4.nix b/pkgs/development/interpreters/php/8.4.nix index 4aaa4f3e02b4..6e5c02fcfceb 100644 --- a/pkgs/development/interpreters/php/8.4.nix +++ b/pkgs/development/interpreters/php/8.4.nix @@ -4,8 +4,8 @@ let base = callPackage ./generic.nix ( _args // { - version = "8.4.15"; - hash = "sha256-txVb3UmNYNY+S8Mg3CJIY5dtMbW9kzlplybJYSVaMZc="; + version = "8.4.16"; + hash = "sha256-bEjGXrpqL3oQKSXQh3Ijmx9FEQrtIYf92BuTPtQ5xpI="; } ); in diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 15a90e41c5e4..420c883e290c 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -413,8 +413,8 @@ in }; ruby_4_0 = generic { - version = rubyVersion "4" "0" "0" "preview3"; - hash = "sha256-Q9CSbndvvVWZrcx7zLTMyAThCfQCogaGB6KoZWLCzcA="; + version = rubyVersion "4" "0" "0" ""; + hash = "sha256-LoOJyMByy2WMk6E3JzLZ6shAgsiLBldQ2x5SpaxjAnE="; cargoHash = "sha256-z7NwWc4TaR042hNx0xgRkh/BQEpEJtE53cfrN0qNiE0="; }; diff --git a/pkgs/development/python-modules/adax-local/default.nix b/pkgs/development/python-modules/adax-local/default.nix index 62f9a37d1072..0dea9d257e5f 100644 --- a/pkgs/development/python-modules/adax-local/default.nix +++ b/pkgs/development/python-modules/adax-local/default.nix @@ -2,6 +2,7 @@ lib, aiohttp, bleak, + bleak-retry-connector, buildPythonPackage, fetchFromGitHub, async-timeout, @@ -10,14 +11,14 @@ buildPythonPackage rec { pname = "adax-local"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyAdaxLocal"; tag = version; - hash = "sha256-HdhatjlN4oUzBV1cf/PfgOJbEks4KBdw4vH8Y/z6efQ="; + hash = "sha256-8gVpUYQoE4V3ATR6zFAz/sARyEmHu9lYyGchTpS1eX8="; }; build-system = [ setuptools ]; @@ -25,6 +26,7 @@ buildPythonPackage rec { dependencies = [ aiohttp bleak + bleak-retry-connector async-timeout ]; diff --git a/pkgs/development/python-modules/agent-client-protocol/default.nix b/pkgs/development/python-modules/agent-client-protocol/default.nix new file mode 100644 index 000000000000..647eed219ba2 --- /dev/null +++ b/pkgs/development/python-modules/agent-client-protocol/default.nix @@ -0,0 +1,66 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + pdm-backend, + + # dependencies + pydantic, + + # optional-dependencies + opentelemetry-sdk, + + # tests + pytest-asyncio, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "agent-client-protocol"; + version = "0.7.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "agentclientprotocol"; + repo = "python-sdk"; + tag = version; + hash = "sha256-pUOs6TUc0qmY+/AWTtm5kKouHKL8cLMhJ+nZT4r+6sI="; + }; + + build-system = [ + pdm-backend + ]; + + dependencies = [ + pydantic + ]; + + optional-dependencies = { + logfire = [ + # logfire (unpackaged) + opentelemetry-sdk + ]; + }; + + pythonImportsCheck = [ "acp" ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + disabledTests = [ + # Hangs forever + "test_spawn_agent_process_roundtrip" + ]; + + meta = { + description = "Python SDK for ACP clients and agents"; + homepage = "https://github.com/agentclientprotocol/python-sdk"; + changelog = "https://github.com/agentclientprotocol/python-sdk/releases/tag/${src.tag}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/aiosendspin/default.nix b/pkgs/development/python-modules/aiosendspin/default.nix index 98c8ee6d800c..752a8aeaf527 100644 --- a/pkgs/development/python-modules/aiosendspin/default.nix +++ b/pkgs/development/python-modules/aiosendspin/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "aiosendspin"; - version = "1.1.5"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "Sendspin"; repo = "aiosendspin"; tag = version; - hash = "sha256-QHRxY4KAH+mBGLP9S0mIwXLog5qjWQo2HtQ6v1k8pHE="; + hash = "sha256-3vTEfXeFqouPswRKST/9U7yg9ah7J9m2KAMoxaBZNR0="; }; build-system = [ diff --git a/pkgs/development/python-modules/aiosenz/default.nix b/pkgs/development/python-modules/aiosenz/default.nix deleted file mode 100644 index c2870b79b0cc..000000000000 --- a/pkgs/development/python-modules/aiosenz/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - authlib, - buildPythonPackage, - fetchFromGitHub, - httpx, - pythonOlder, - setuptools, -}: - -buildPythonPackage rec { - pname = "aiosenz"; - version = "1.0.0"; - format = "pyproject"; - - disabled = pythonOlder "3.8"; - - src = fetchFromGitHub { - owner = "milanmeu"; - repo = "aiosenz"; - rev = version; - hash = "sha256-ODdWPS14zzptxuS6mff51f0s1SYnIqjF40DmvT0sL0w="; - }; - - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ - httpx - authlib - ]; - - # Project has no tests - doCheck = false; - - pythonImportsCheck = [ "aiosenz" ]; - - meta = { - description = "Python wrapper for the nVent Raychem SENZ RestAPI"; - homepage = "https://github.com/milanmeu/aiosenz"; - license = with lib.licenses; [ lgpl3Plus ]; - maintainers = with lib.maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/altcha/default.nix b/pkgs/development/python-modules/altcha/default.nix index d087445691a7..e8f05bd7c524 100644 --- a/pkgs/development/python-modules/altcha/default.nix +++ b/pkgs/development/python-modules/altcha/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "altcha"; - version = "0.2.0"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "altcha-org"; repo = "altcha-lib-py"; tag = "v${version}"; - hash = "sha256-QZSj24dyfdgAeHSCWcmWKr35VWjGM3kQyh9o77bHOgY="; + hash = "sha256-N30luHhGFkd+XvVKhVnR6degEf0Nm/K/GEaqoEEuZMU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/asyncer/default.nix b/pkgs/development/python-modules/asyncer/default.nix index db2a6b3b3ddf..8f779c1f26b2 100644 --- a/pkgs/development/python-modules/asyncer/default.nix +++ b/pkgs/development/python-modules/asyncer/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "asyncer"; - version = "0.0.11"; + version = "0.0.12"; pyproject = true; src = fetchFromGitHub { owner = "fastapi"; repo = "asyncer"; tag = version; - hash = "sha256-Akp76yZKkI/LRJH/tdLMviIB1tcfsLay7l0pCbvZThk="; + hash = "sha256-ViPCy9N93qcpaAeawuUoSnLiW1jVGFM14K9LC/AQ+Fc="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/bambi/default.nix b/pkgs/development/python-modules/bambi/default.nix index 905fc1d0b2cf..8a947ff6ce9d 100644 --- a/pkgs/development/python-modules/bambi/default.nix +++ b/pkgs/development/python-modules/bambi/default.nix @@ -91,9 +91,10 @@ buildPythonPackage rec { "test_model_without_intercept" "test_non_distributional_model" "test_normal_with_splines" - "test_predict_new_groups_fail" "test_predict_new_groups" + "test_predict_new_groups_fail" "test_predict_offset" + "test_same_variable_conditional_and_group" "test_set_alias_warnings" "test_subplot_kwargs" "test_transforms" @@ -113,8 +114,6 @@ buildPythonPackage rec { ]; disabledTestPaths = [ - # bayeux-ml is not available - "tests/test_alternative_samplers.py" # Tests require network access "tests/test_interpret.py" "tests/test_interpret_messages.py" diff --git a/pkgs/development/python-modules/crewai/default.nix b/pkgs/development/python-modules/crewai/default.nix index e128cba62b36..3f2abc025855 100644 --- a/pkgs/development/python-modules/crewai/default.nix +++ b/pkgs/development/python-modules/crewai/default.nix @@ -7,8 +7,8 @@ hatchling, # dependencies + aiosqlite, appdirs, - blinker, chromadb, click, instructor, @@ -16,6 +16,7 @@ json5, jsonref, litellm, + mcp, openai, opentelemetry-api, opentelemetry-exporter-otlp-proto-http, @@ -27,8 +28,6 @@ pydantic-settings, pyjwt, python-dotenv, - pyvis, - qdrant-client, regex, tokenizers, tomli, @@ -37,37 +36,56 @@ # tests pytestCheckHook, + pytest-asyncio, pytest-xdist, + qdrant-client, + vcrpy, versionCheckHook, writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "crewai"; - version = "0.203.1"; + version = "1.7.2"; pyproject = true; src = fetchFromGitHub { owner = "crewAIInc"; repo = "crewAI"; tag = version; - hash = "sha256-vy3JdJjuiFbi66IDNo+dQ7MZqlHqvHt/zUb6eblPT7A="; + hash = "sha256-liJS3hrNsyAt49ROUi3/pWXfMP2wA/bFyy6yEOV6Rrk="; }; + sourceRoot = "${src.name}/lib/crewai"; + build-system = [ hatchling ]; pythonRelaxDeps = [ "chromadb" + "click" "json-repair" + "json5" "litellm" + "mcp" + "openai" + "opentelemetry-api" + "opentelemetry-exporter-otlp-proto-http" + "opentelemetry-sdk" + "pdfplumber" "portalocker" "pydantic" - "pyvis" + "pydantic-settings" + "pyjwt" + "regex" + "tokenizers" + "tomli" + "tomli-w" + "uv" ]; dependencies = [ + aiosqlite appdirs - blinker chromadb click instructor @@ -75,6 +93,7 @@ buildPythonPackage rec { json5 jsonref litellm + mcp openai opentelemetry-api opentelemetry-exporter-otlp-proto-http @@ -86,7 +105,6 @@ buildPythonPackage rec { pydantic-settings pyjwt python-dotenv - pyvis regex tokenizers tomli @@ -108,6 +126,27 @@ buildPythonPackage rec { # ImportError: cannot import name 'InitFrom' from 'qdrant_client.models' "tests/rag/qdrant/test_client.py" + + # Tests requiring optional dependencies + "tests/llms/anthropic" + "tests/llms/azure" + "tests/llms/bedrock" + "tests/llms/google" + "tests/llms/litellm" + "tests/llms/hooks/test_anthropic_interceptor.py" + "tests/llms/hooks/test_unsupported_providers.py" + + # Tests requiring network/API access + "tests/llms/openai" + "tests/telemetry" + "tests/tracing" + "tests/test_streaming_integration.py" + "tests/hooks" + "tests/llms/hooks/test_openai_interceptor.py" + "tests/test_llm.py" + + # Tests requiring crewai-tools + "tests/agents/test_lite_agent.py" ]; disabledTests = [ @@ -372,16 +411,40 @@ buildPythonPackage rec { "test_asearch_wrong_client_type" "test_areset_wrong_client_type" "test_adelete_collection" + + # Tests requiring litellm + "test_litellm_anthropic_error_handling" + "test_litellm_auth_error_handling" + "test_crew_agent_executor_litellm_auth_error" + "test_agent_with_callbacks" + "test_crew_memoization" + "test_task_guardrail" + "test_crew_name" + "test_get_conversion_instructions_non_gpt" + "test_supports_function_calling_false" + + # Tests requiring network + "test_agent_max_iterations_stops_loop" + "test_task_output_includes_messages" + + # Not work with nixpkgs-review + "test_concurrent_ainvoke_calls" ]; nativeCheckInputs = [ pytestCheckHook + pytest-asyncio pytest-xdist qdrant-client + vcrpy versionCheckHook writableTmpDirAsHomeHook ]; + pytestFlagsArray = [ + "--override-ini=addopts=" + ]; + versionCheckProgramArg = "--version"; meta = { diff --git a/pkgs/development/python-modules/css-inline/Cargo.lock b/pkgs/development/python-modules/css-inline/Cargo.lock index 94af65d4e777..2b77983ff7d4 100644 --- a/pkgs/development/python-modules/css-inline/Cargo.lock +++ b/pkgs/development/python-modules/css-inline/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "allocator-api2" @@ -53,15 +53,15 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.19.0" +version = "3.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" +checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510" [[package]] name = "bytes" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" +checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" [[package]] name = "cargo-lock" @@ -77,9 +77,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.44" +version = "1.2.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37521ac7aabe3d13122dc382493e20c9416f299d2ccd5b3a5340a2570cdeb0f3" +checksum = "7a0aeaff4ff1a90589618835a598e545176939b97874f7abc7851caa0618f203" dependencies = [ "find-msvc-tools", "shlex", @@ -141,11 +141,10 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "css-inline" -version = "0.18.0" +version = "0.19.0" dependencies = [ "cssparser", "html5ever", - "indexmap", "lru", "precomputed-hash", "reqwest", @@ -157,7 +156,7 @@ dependencies = [ [[package]] name = "css-inline-python" -version = "0.18.0" +version = "0.19.0" dependencies = [ "built", "css-inline", @@ -169,9 +168,9 @@ dependencies = [ [[package]] name = "cssparser" -version = "0.35.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e901edd733a1472f944a45116df3f846f54d37e67e68640ac8bb69689aca2aa" +checksum = "dae61cf9c0abb83bd659dab65b7e4e38d8236824c85f0f804f173567bda257d2" dependencies = [ "cssparser-macros", "dtoa-short", @@ -192,21 +191,22 @@ dependencies = [ [[package]] name = "derive_more" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" +checksum = "d751e9e49156b02b44f9c1815bcb94b984cdcc4396ecc32521c739452808b134" dependencies = [ "derive_more-impl", ] [[package]] name = "derive_more-impl" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" +checksum = "799a97264921d8623a957f6c3b9011f3b5492f557bbb7a5a19b7fa6d06ba8dcb" dependencies = [ "proc-macro2", "quote", + "rustc_version", "syn", ] @@ -223,9 +223,9 @@ dependencies = [ [[package]] name = "dtoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6add3b8cff394282be81f3fc1a0605db594ed69890078ca6e2cab1c408bcf04" +checksum = "4c3cf4824e2d5f025c7b531afcb2325364084a16806f6d47fbc1f5fbd9960590" [[package]] name = "dtoa-short" @@ -249,16 +249,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] -name = "find-msvc-tools" -version = "0.1.4" +name = "fastrand" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] -name = "fnv" -version = "1.0.7" +name = "find-msvc-tools" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +checksum = "645cbb3a84e60b7531617d5ae4e57f7e27308f6445f5abf653209ea76dec8dff" [[package]] name = "foldhash" @@ -364,9 +364,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" dependencies = [ "allocator-api2", "equivalent", @@ -381,23 +381,21 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "html5ever" -version = "0.35.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55d958c2f74b664487a2035fe1dadb032c48718a03b63f3ab0b8537db8549ed4" +checksum = "6452c4751a24e1b99c3260d505eaeee76a050573e61f30ac2c924ddc7236f01e" dependencies = [ "log", "markup5ever", - "match_token", ] [[package]] name = "http" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" +checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" dependencies = [ "bytes", - "fnv", "itoa", ] @@ -432,9 +430,9 @@ checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" [[package]] name = "hyper" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e" +checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11" dependencies = [ "atomic-waker", "bytes", @@ -470,9 +468,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.17" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8" +checksum = "727805d60e7938b76b826a6ef209eb70eaa1812794f9424d4a4e2d740662df5f" dependencies = [ "base64", "bytes", @@ -564,9 +562,9 @@ checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" [[package]] name = "icu_properties" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99" +checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec" dependencies = [ "icu_collections", "icu_locale_core", @@ -578,9 +576,9 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899" +checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af" [[package]] name = "icu_provider" @@ -620,9 +618,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.12.0" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f" +checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2" dependencies = [ "equivalent", "hashbrown", @@ -645,9 +643,9 @@ checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" [[package]] name = "iri-string" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f867b9d1d896b67beb18518eda36fdb77a32ea590de864f1325b294a6d14397" +checksum = "c91338f0783edbd6195decb37bae672fd3b165faffb89bf7b9e6942f8b1a731a" dependencies = [ "memchr", "serde", @@ -655,15 +653,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" +checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" [[package]] name = "js-sys" -version = "0.3.82" +version = "0.3.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65" +checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8" dependencies = [ "once_cell", "wasm-bindgen", @@ -671,9 +669,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.177" +version = "0.2.178" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" +checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091" [[package]] name = "litemap" @@ -692,9 +690,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.28" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" +checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "lru" @@ -719,26 +717,15 @@ checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" [[package]] name = "markup5ever" -version = "0.35.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "311fe69c934650f8f19652b3946075f0fc41ad8757dbb68f1ca14e7900ecc1c3" +checksum = "6c3294c4d74d0742910f8c7b466f44dda9eb2d5742c1e430138df290a1e8451c" dependencies = [ "log", "tendril", "web_atoms", ] -[[package]] -name = "match_token" -version = "0.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac84fd3f360fcc43dc5f5d186f02a94192761a080e8bc58621ad4d12296a58cf" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "memchr" version = "2.7.6" @@ -756,9 +743,9 @@ dependencies = [ [[package]] name = "mio" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873" +checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" dependencies = [ "libc", "wasi", @@ -817,19 +804,20 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "phf" -version = "0.11.3" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" +checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf" dependencies = [ "phf_macros", "phf_shared", + "serde", ] [[package]] name = "phf_codegen" -version = "0.11.3" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a" +checksum = "49aa7f9d80421bca176ca8dbfebe668cc7a2684708594ec9f3c0db0805d5d6e1" dependencies = [ "phf_generator", "phf_shared", @@ -837,19 +825,19 @@ dependencies = [ [[package]] name = "phf_generator" -version = "0.11.3" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" +checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737" dependencies = [ + "fastrand", "phf_shared", - "rand 0.8.5", ] [[package]] name = "phf_macros" -version = "0.11.3" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216" +checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef" dependencies = [ "phf_generator", "phf_shared", @@ -860,9 +848,9 @@ dependencies = [ [[package]] name = "phf_shared" -version = "0.11.3" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" +checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266" dependencies = [ "siphasher", ] @@ -881,9 +869,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "portable-atomic" -version = "1.11.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" +checksum = "f89776e4d69bb58bc6993e99ffa1d11f228b839984854c7daeb5d37f87cbe950" [[package]] name = "potential_utf" @@ -911,18 +899,18 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "proc-macro2" -version = "1.0.103" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" +checksum = "9695f8df41bb4f3d222c95a67532365f569318332d03d5f3f67f37b20e6ebdf0" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37a6df7eab65fc7bee654a421404947e10a0f7085b6951bf2ea395f4659fb0cf" +checksum = "ab53c047fcd1a1d2a8820fe84f05d6be69e9526be40cb03b73f86b6b03e6d87d" dependencies = [ "indoc", "libc", @@ -937,9 +925,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f77d387774f6f6eec64a004eac0ed525aab7fa1966d94b42f743797b3e395afb" +checksum = "b455933107de8642b4487ed26d912c2d899dec6114884214a0b3bb3be9261ea6" dependencies = [ "target-lexicon", ] @@ -952,9 +940,9 @@ checksum = "4bf83fcee540452241ba030140f50418b973e840a64727c967b9266660f0a690" [[package]] name = "pyo3-ffi" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dd13844a4242793e02df3e2ec093f540d948299a6a77ea9ce7afd8623f542be" +checksum = "1c85c9cbfaddf651b1221594209aed57e9e5cff63c4d11d1feead529b872a089" dependencies = [ "libc", "pyo3-build-config", @@ -962,9 +950,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf8f9f1108270b90d3676b8679586385430e5c0bb78bb5f043f95499c821a71" +checksum = "0a5b10c9bf9888125d917fb4d2ca2d25c8df94c7ab5a52e13313a07e050a3b02" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -974,9 +962,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a3b2274450ba5288bc9b8c1b69ff569d1d61189d4bff38f8d22e03d17f932b" +checksum = "03b51720d314836e53327f5871d4c0cfb4fb37cc2c4a11cc71907a86342c40f9" dependencies = [ "heck", "proc-macro2", @@ -1014,7 +1002,7 @@ dependencies = [ "bytes", "getrandom 0.3.4", "lru-slab", - "rand 0.9.2", + "rand", "ring", "rustc-hash", "rustls", @@ -1055,15 +1043,6 @@ version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "rand_core 0.6.4", -] - [[package]] name = "rand" version = "0.9.2" @@ -1071,7 +1050,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" dependencies = [ "rand_chacha", - "rand_core 0.9.3", + "rand_core", ] [[package]] @@ -1081,15 +1060,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" dependencies = [ "ppv-lite86", - "rand_core 0.9.3", + "rand_core", ] -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" - [[package]] name = "rand_core" version = "0.9.3" @@ -1130,9 +1103,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.24" +version = "0.12.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f" +checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" dependencies = [ "base64", "bytes", @@ -1188,6 +1161,15 @@ version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver", +] + [[package]] name = "rustls" version = "0.23.35" @@ -1204,9 +1186,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.13.0" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94182ad936a0c91c324cd46c6511b9510ed16af436d7b5bab34beab0afd55f7a" +checksum = "21e6f2ab2928ca4291b86736a8bd920a277a399bba1589409d72154ff87c1282" dependencies = [ "web-time", "zeroize", @@ -1231,9 +1213,9 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "ryu" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" +checksum = "a50f4cf475b65d88e057964e0e9bb1f0aa9bbb2036dc65c64596b42932536984" [[package]] name = "scopeguard" @@ -1243,9 +1225,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "selectors" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09975d3195f34dce9c7b381cb0f00c3c13381d4d3735c0f1a9c894b283b302ab" +checksum = "feef350c36147532e1b79ea5c1f3791373e61cbd9a6a2615413b3807bb164fb7" dependencies = [ "bitflags", "cssparser", @@ -1302,15 +1284,15 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.145" +version = "1.0.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" +checksum = "3084b546a1dd6289475996f182a22aba973866ea8e8b02c51d9f46b1336a22da" dependencies = [ "itoa", "memchr", - "ryu", "serde", "serde_core", + "zmij", ] [[package]] @@ -1336,9 +1318,9 @@ dependencies = [ [[package]] name = "servo_arc" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "204ea332803bd95a0b60388590d59cf6468ec9becf626e2451f1d26a1d972de4" +checksum = "170fb83ab34de17dc69aa7c67482b22218ddb85da56546f9bd6b929e32a05930" dependencies = [ "stable_deref_trait", ] @@ -1385,9 +1367,9 @@ checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "string_cache" -version = "0.8.9" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf776ba3fa74f83bf4b63c3dcbbf82173db2632ed8452cb2d891d33f459de70f" +checksum = "a18596f8c785a729f2819c0f6a7eae6ebeebdfffbfe4214ae6b087f690e31901" dependencies = [ "new_debug_unreachable", "parking_lot", @@ -1398,9 +1380,9 @@ dependencies = [ [[package]] name = "string_cache_codegen" -version = "0.5.4" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c711928715f1fe0fe509c53b43e993a9a557babc2d0a3567d0a3006f1ac931a0" +checksum = "585635e46db231059f76c5849798146164652513eb9e8ab2685939dd90f29b69" dependencies = [ "phf_generator", "phf_shared", @@ -1416,9 +1398,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.109" +version = "2.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f17c7e013e88258aa9543dcbe81aca68a667a9ac37cd69c9fbc07858bfe0e2f" +checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87" dependencies = [ "proc-macro2", "quote", @@ -1447,9 +1429,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c" +checksum = "b1dd07eb858a2067e2f3c7155d54e929265c264e6f37efe3ee7a8d1b5a1dd0ba" [[package]] name = "tendril" @@ -1589,9 +1571,9 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" +checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" dependencies = [ "bitflags", "bytes", @@ -1619,9 +1601,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.41" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" +checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" dependencies = [ "pin-project-lite", "tracing-core", @@ -1629,9 +1611,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.34" +version = "0.1.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" +checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" dependencies = [ "once_cell", ] @@ -1710,9 +1692,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60" +checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd" dependencies = [ "cfg-if", "once_cell", @@ -1723,9 +1705,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.55" +version = "0.4.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "551f88106c6d5e7ccc7cd9a16f312dd3b5d36ea8b4954304657d5dfba115d4a0" +checksum = "836d9622d604feee9e5de25ac10e3ea5f2d65b41eac0d9ce72eb5deae707ce7c" dependencies = [ "cfg-if", "js-sys", @@ -1736,9 +1718,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2" +checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1746,9 +1728,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc" +checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40" dependencies = [ "bumpalo", "proc-macro2", @@ -1759,18 +1741,18 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76" +checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4" dependencies = [ "unicode-ident", ] [[package]] name = "web-sys" -version = "0.3.82" +version = "0.3.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1" +checksum = "9b32828d774c412041098d182a8b38b16ea816958e07cf40eec2bc080ae137ac" dependencies = [ "js-sys", "wasm-bindgen", @@ -1788,9 +1770,9 @@ dependencies = [ [[package]] name = "web_atoms" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ffde1dc01240bdf9992e3205668b235e59421fd085e8a317ed98da0178d414" +checksum = "acd0c322f146d0f8aad130ce6c187953889359584497dac6561204c8e17bb43d" dependencies = [ "phf", "phf_codegen", @@ -2024,9 +2006,9 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] name = "winnow" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf" +checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" dependencies = [ "memchr", ] @@ -2068,18 +2050,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.27" +version = "0.8.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" +checksum = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.27" +version = "0.8.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" +checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a" dependencies = [ "proc-macro2", "quote", @@ -2145,3 +2127,9 @@ dependencies = [ "quote", "syn", ] + +[[package]] +name = "zmij" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f4a4e8e9dc5c62d159f04fcdbe07f4c3fb710415aab4754bf11505501e3251d" diff --git a/pkgs/development/python-modules/css-inline/default.nix b/pkgs/development/python-modules/css-inline/default.nix index 2359023fc984..f974430b6bca 100644 --- a/pkgs/development/python-modules/css-inline/default.nix +++ b/pkgs/development/python-modules/css-inline/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "css-inline"; - version = "0.18.0"; + version = "0.19.0"; pyproject = true; src = fetchFromGitHub { owner = "Stranger6667"; repo = "css-inline"; rev = "python-v${version}"; - hash = "sha256-sJOt7CX02uoECdki0iUZin4sAIgLafBLb5kjXEgYcYg="; + hash = "sha256-IIZmSshcXC3H6kaH0iEiJEhDrZQtN0i5KNQ8H5aCGf4="; }; postPatch = '' @@ -43,7 +43,7 @@ buildPythonPackage rec { cd bindings/python ln -s ${./Cargo.lock} Cargo.lock ''; - hash = "sha256-LpknrrsIZ38NlQDMGpiA7cftspvCo/mQ8KAwKRkdVEc="; + hash = "sha256-cLBF3Teb2vcYUoE6Et6XgC5SAqV4MEpjTbpgb/TkMG0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dataclass-wizard/default.nix b/pkgs/development/python-modules/dataclass-wizard/default.nix index 8b3ac4b2419a..1a55c38d4044 100644 --- a/pkgs/development/python-modules/dataclass-wizard/default.nix +++ b/pkgs/development/python-modules/dataclass-wizard/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "dataclass-wizard"; - version = "0.37.0"; + version = "0.38.2"; pyproject = true; src = fetchFromGitHub { owner = "rnag"; repo = "dataclass-wizard"; tag = "v${version}"; - hash = "sha256-BXZyzdFBOG8ZTlZQLV0+Xi/wCGlg9AzlSbcJKwUz6rg="; + hash = "sha256-/Afw7O7BNKUyg7lGP5CgkkOijaLfQsEqhDkBU7z8l+o="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/dbt-common/default.nix b/pkgs/development/python-modules/dbt-common/default.nix index a88166b0ee9b..092ab62a40ae 100644 --- a/pkgs/development/python-modules/dbt-common/default.nix +++ b/pkgs/development/python-modules/dbt-common/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "dbt-common"; - version = "1.36.0-unstable-2025-11-10"; + version = "1.37.2-unstable-2025-12-15"; pyproject = true; src = fetchFromGitHub { owner = "dbt-labs"; repo = "dbt-common"; - rev = "e306773b935738838cedd52de762224330f9840e"; # They don't tag releases - hash = "sha256-LuM9St90M7yGIqYJZTNLNYGZ1Dva2o2z3Q6ZPw4HP8g="; + rev = "88b14473573d0e4e8c3b02d6ee573d346c84b0db"; # They don't tag releases + hash = "sha256-NnuYga3pHo0dIg6nr15DQINskF1bkKGfWXcUaEK38Kc="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index c5b254174737..df1014ec53a2 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.9.8"; + version = "1.10.0"; pyproject = true; src = fetchFromGitHub { owner = "fastai"; repo = "fastcore"; tag = version; - hash = "sha256-alw1QQJ0w9LEWztCvY0gCfQVPGVkyl+IPd8+YgDWyr8="; + hash = "sha256-hPcL1FB7O/+YCq+p32KWykfoDTs3g+sk1oBCtrZZERU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/fastprogress/default.nix b/pkgs/development/python-modules/fastprogress/default.nix index 374b62262c29..b8c12fabd7ba 100644 --- a/pkgs/development/python-modules/fastprogress/default.nix +++ b/pkgs/development/python-modules/fastprogress/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "fastprogress"; - version = "1.0.3"; + version = "1.0.5"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-ehfStDiJD4OMBI7vzjLE3tRxl+zI6gQs7MM9PeuAIvU="; + hash = "sha256-WMoWqYHwKSgE2QXy4AQq1gjXiL9svmq5a3HsSyBFOu8="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/flask-socketio/default.nix b/pkgs/development/python-modules/flask-socketio/default.nix index 769cd6bff6f2..9eb34ef0fd92 100644 --- a/pkgs/development/python-modules/flask-socketio/default.nix +++ b/pkgs/development/python-modules/flask-socketio/default.nix @@ -6,27 +6,24 @@ flask, pytestCheckHook, python-socketio, - pythonOlder, redis, }: buildPythonPackage rec { pname = "flask-socketio"; - version = "5.5.1"; - format = "pyproject"; - - disabled = pythonOlder "3.6"; + version = "5.6.0"; + pyproject = true; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "Flask-SocketIO"; tag = "v${version}"; - hash = "sha256-C/eNyvAfyu2oTBZUFvDhTZqyyB+aohAHDNzShqbD4O4="; + hash = "sha256-1FMAooXktrbA4FDHrS0CQuqoTV6B4xWh5IIxRTDAzLs="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ flask python-socketio ]; diff --git a/pkgs/development/python-modules/funsor/default.nix b/pkgs/development/python-modules/funsor/default.nix index 5cd1266db7cd..3288521439b6 100644 --- a/pkgs/development/python-modules/funsor/default.nix +++ b/pkgs/development/python-modules/funsor/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + fetchpatch, # build-system setuptools, @@ -43,6 +44,14 @@ buildPythonPackage rec { hash = "sha256-Prj1saT0yoPAP8rDE0ipBEpR3QMk4PS12VSJlxc22p8="; }; + patches = [ + # Compatibility with torch >= 2.5 (arg_constraints is now a property) + (fetchpatch { + url = "https://github.com/pyro-ppl/funsor/commit/c5e2a48d73cad4e98058147af4090171272a44e5.patch"; + hash = "sha256-sTR+hbJtS0Th5sIqlvB2bReEC0wnEbnB7gAiZKiqjAQ="; + }) + ]; + build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix index db5816d5c512..b0d26e52a3bd 100644 --- a/pkgs/development/python-modules/gradio/default.nix +++ b/pkgs/development/python-modules/gradio/default.nix @@ -81,14 +81,14 @@ let in buildPythonPackage rec { pname = "gradio"; - version = "6.1.0"; + version = "6.2.0"; pyproject = true; src = fetchFromGitHub { owner = "gradio-app"; repo = "gradio"; tag = "gradio@${version}"; - hash = "sha256-CvlMZlZ0aN/oreCiSL7RCVz8hq9Q9EGPrnQMIxCTVUs="; + hash = "sha256-lD0tMqkbuLMLAkdjT52ZXx9I+Cs3OVI0oQmN+VPEBts="; }; pnpmDeps = fetchPnpmDeps { diff --git a/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix b/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix index dae6d98f7650..061e669dafca 100644 --- a/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix +++ b/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix @@ -2,20 +2,18 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, setuptools, }: buildPythonPackage rec { pname = "insteon-frontend-home-assistant"; - version = "0.5.0"; + version = "0.6.0"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchPypi { - inherit pname version; - hash = "sha256-NZwnx8tlXnsVCk4nvNjOg3cjSr2CnjqWcZG7xFTC2wA="; + pname = "insteon_frontend_home_assistant"; + inherit version; + hash = "sha256-oBTk7gblJA6/w0wSx+efdEmY5ioJiRMUfDqjyg0LkFg="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/kserve/default.nix b/pkgs/development/python-modules/kserve/default.nix index 23df8624b55e..bd7125cffe1a 100644 --- a/pkgs/development/python-modules/kserve/default.nix +++ b/pkgs/development/python-modules/kserve/default.nix @@ -63,6 +63,18 @@ buildPythonPackage rec { hash = "sha256-f6ILZMLxfckEpy7wSgCqUx89JWSnn0DbQiqRSHcQHms="; }; + # Fix vllm 0.12.0 compatibility + # Patch submitted upstream: https://github.com/kserve/kserve/pull/4882 + postPatch = '' + substituteInPlace kserve/protocol/rest/openai/types/__init__.py \ + --replace-fail \ + "from vllm.entrypoints.openai.protocol import EmbeddingRequest, EmbeddingResponse as Embedding, EmbeddingResponseData, EmbeddingCompletionRequest" \ + "from vllm.entrypoints.pooling.embed.protocol import EmbeddingRequest, EmbeddingResponse as Embedding, EmbeddingResponseData, EmbeddingCompletionRequest" \ + --replace-fail \ + "from vllm.entrypoints.openai.protocol import RerankRequest, RerankResponse as Rerank" \ + "from vllm.entrypoints.pooling.score.protocol import RerankRequest, RerankResponse as Rerank" + ''; + sourceRoot = "${src.name}/python/kserve"; pythonRelaxDeps = [ @@ -161,6 +173,14 @@ buildPythonPackage rec { ]; disabledTests = [ + # Started failing since vllm was updated to 0.13.0 + # pydantic_core._pydantic_core.ValidationError: 1 validation error for RerankResponse + # usage.prompt_tokens + # Field required [type=missing, input_value={'total_tokens': 100}, input_type=dict] + # For further information visit https://errors.pydantic.dev/2.11/v/missing + "test_create_rerank" + "test_create_embedding" + # AssertionError: assert CompletionReq...lm_xargs=None) == CompletionReq...lm_xargs=None) "test_convert_params" diff --git a/pkgs/development/python-modules/llama-index-readers-file/default.nix b/pkgs/development/python-modules/llama-index-readers-file/default.nix index 54e32d8e5762..9738fd1c4fac 100644 --- a/pkgs/development/python-modules/llama-index-readers-file/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-file/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "llama-index-readers-file"; - version = "0.5.5"; + version = "0.5.6"; pyproject = true; src = fetchPypi { pname = "llama_index_readers_file"; inherit version; - hash = "sha256-AkuEHP32035OJM6myJ7frF8Or/y8/EkE5LCxaYR8EOU="; + hash = "sha256-HAixT6zC3+kzYiqqJtx9KnpgI8QtPbiWoslIeJ7a8eo="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/mlx-vlm/default.nix b/pkgs/development/python-modules/mlx-vlm/default.nix index bcbebf882df4..9a5f6d6bc133 100644 --- a/pkgs/development/python-modules/mlx-vlm/default.nix +++ b/pkgs/development/python-modules/mlx-vlm/default.nix @@ -15,7 +15,6 @@ opencv-python, pillow, requests, - scipy, soundfile, tqdm, transformers, @@ -29,14 +28,14 @@ buildPythonPackage rec { pname = "mlx-vlm"; - version = "0.3.3"; + version = "0.3.9"; pyproject = true; src = fetchFromGitHub { owner = "Blaizzy"; repo = "mlx-vlm"; tag = "v${version}"; - hash = "sha256-KhppKqIJPmtjgSXSC3n5HTMm3fDUJaoYJEiGfQ5vGNQ="; + hash = "sha256-L+llrfFo4C++JZ3GjpZi16wMZNXtKrYh3pxhZ5N1n/4="; }; build-system = [ @@ -55,7 +54,6 @@ buildPythonPackage rec { opencv-python pillow requests - scipy soundfile tqdm transformers @@ -76,6 +74,7 @@ buildPythonPackage rec { "test_multi_modality" # RuntimeError: [metal_kernel] No GPU back-end + "test_glm4v" "test_glm4v_moe" "test_kimi_vl" ]; @@ -92,8 +91,11 @@ buildPythonPackage rec { meta = { description = "Inference and fine-tuning of Vision Language Models (VLMs) on your Mac using MLX"; homepage = "https://github.com/Blaizzy/mlx-vlm"; - changelog = "https://github.com/Blaizzy/mlx-vlm/releases/tag/v${version}"; + changelog = "https://github.com/Blaizzy/mlx-vlm/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; + platforms = [ + "aarch64-darwin" + ]; }; } diff --git a/pkgs/development/python-modules/numdifftools/default.nix b/pkgs/development/python-modules/numdifftools/default.nix index 316a17e58caf..4bdc3bde6feb 100644 --- a/pkgs/development/python-modules/numdifftools/default.nix +++ b/pkgs/development/python-modules/numdifftools/default.nix @@ -3,25 +3,25 @@ buildPythonPackage, fetchFromGitHub, numpy, - pythonOlder, scipy, + pdm-backend, }: buildPythonPackage rec { pname = "numdifftools"; - version = "0.9.41"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "0.9.42"; + pyproject = true; src = fetchFromGitHub { owner = "pbrod"; repo = "numdifftools"; - rev = "v${version}"; - hash = "sha256-HYacLaowSDdrwkxL1h3h+lw/8ahzaecpXEnwrCqMCWk="; + tag = "v${version}"; + hash = "sha256-tNPv+KJuSmMHItHfRUjMIFtAFB+vC530sp+Am0VRG44="; }; - propagatedBuildInputs = [ + build-system = [ pdm-backend ]; + + dependencies = [ numpy scipy ]; @@ -29,20 +29,12 @@ buildPythonPackage rec { # Tests requires algopy and other modules which are optional and/or not available doCheck = false; - postPatch = '' - substituteInPlace setup.py \ - --replace '"pytest-runner"' "" - # Remove optional dependencies - substituteInPlace requirements.txt \ - --replace "algopy>=0.4" "" \ - --replace "statsmodels>=0.6" "" - ''; - pythonImportsCheck = [ "numdifftools" ]; meta = { description = "Library to solve automatic numerical differentiation problems in one or more variables"; homepage = "https://github.com/pbrod/numdifftools"; + changelog = "https://github.com/pbrod/numdifftools/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/numpyro/default.nix b/pkgs/development/python-modules/numpyro/default.nix index 58d5604d0005..e4a9c508b8ee 100644 --- a/pkgs/development/python-modules/numpyro/default.nix +++ b/pkgs/development/python-modules/numpyro/default.nix @@ -75,9 +75,17 @@ buildPythonPackage rec { # Chains will be drawn sequentially. If you are running MCMC in CPU, consider using `numpyro.set_host_device_count(2)` at the beginning of your program. # You can double-check how many devices are available in your system using `jax.local_device_count()`. "-Wignore::UserWarning" + + # FutureWarning: In the future `np.object` will be defined as the corresponding NumPy scalar. + "-Wignore::FutureWarning" ]; disabledTests = [ + # ValueError: Found unexpected Arrays on value of type in static attribute 'layers' + # of Pytree type '.MLP'>'. + # This is an error starting from Flax version 0.12.0. + "test_random_nnx_module_mcmc_sequence_param" + # AssertionError, assert GLOBAL["count"] == 4 (assert 5 == 4) "test_mcmc_parallel_chain" diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 3ca1f494841e..2a04d326b1d2 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20251223"; + version = "1.0.2.20251229"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ENje3AleagrKul/SGRvjUG04nBuucap675+HW2oXigo="; + hash = "sha256-v+BeApvsCqf4QNaN+b+6oYyKz7/KUSRf8fgIFcYIz/4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/py-melissa-climate/default.nix b/pkgs/development/python-modules/py-melissa-climate/default.nix index f1167d2b04a4..b59562421f63 100644 --- a/pkgs/development/python-modules/py-melissa-climate/default.nix +++ b/pkgs/development/python-modules/py-melissa-climate/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "py-melissa-climate"; - version = "3.0.2"; + version = "3.0.3"; pyproject = true; src = fetchFromGitHub { owner = "kennedyshead"; repo = "py-melissa-climate"; - tag = "v${version}"; - hash = "sha256-VSKSa7K2fF6NMLN39HzkqK7/9vGHmmmPFw6mIiJNZ84="; + tag = "V${version}"; + hash = "sha256-vKnIFrviCJLMqYUdKKJtqOmD1ZtgtMBMLApG+YiqZdY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyaskalono/default.nix b/pkgs/development/python-modules/pyaskalono/default.nix new file mode 100644 index 000000000000..4107badf2fc2 --- /dev/null +++ b/pkgs/development/python-modules/pyaskalono/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + rustPlatform, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "pyaskalono"; + version = "0.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "kumekay"; + repo = "pyaskalono"; + tag = "v${version}"; + hash = "sha256-gNQCtubPs8XjE+ZTuTTzZGkxOhK3/Fv3lDLparaUdaQ="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit pname version src; + hash = "sha256-rQP6So9tG/9cjB588v+6lp2h+0SjaiWPhKrSXgDYugE="; + }; + + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "askalono" ]; + + meta = { + description = "Python wrapper for askalono"; + homepage = "https://github.com/kumekay/pyaskalono/"; + changelog = "https://github.com/kumekay/pyaskalono/releases/tag/v${version}"; + license = [ lib.licenses.asl20 ]; + maintainers = with lib.maintainers; [ erictapen ]; + }; +} diff --git a/pkgs/development/python-modules/pycomm3/default.nix b/pkgs/development/python-modules/pycomm3/default.nix index 3b14843b68f3..7fac991ad082 100644 --- a/pkgs/development/python-modules/pycomm3/default.nix +++ b/pkgs/development/python-modules/pycomm3/default.nix @@ -4,21 +4,18 @@ fetchFromGitHub, setuptools, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "pycomm3"; - version = "1.2.14"; + version = "1.2.16"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "ottowayi"; repo = "pycomm3"; tag = "v${version}"; - hash = "sha256-KdvmISMH2HHU8N665QevVw7q9Qs5CwjXxcWpLoziY/Y="; + hash = "sha256-xcN0TKwWg23CDBmwMRZlPFuKYpeLg7KSXzhRtNuP6Ls="; }; build-system = [ setuptools ]; @@ -37,7 +34,7 @@ buildPythonPackage rec { meta = { description = "Python Ethernet/IP library for communicating with Allen-Bradley PLCs"; homepage = "https://github.com/ottowayi/pycomm3"; - changelog = "https://github.com/ottowayi/pycomm3/releases/tag/v${version}"; + changelog = "https://github.com/ottowayi/pycomm3/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pydevccu/default.nix b/pkgs/development/python-modules/pydevccu/default.nix index a04a1da50dbc..73bf92fd7646 100644 --- a/pkgs/development/python-modules/pydevccu/default.nix +++ b/pkgs/development/python-modules/pydevccu/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pydevccu"; - version = "0.1.19"; + version = "0.1.20"; pyproject = true; disabled = pythonOlder "3.13"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "SukramJ"; repo = "pydevccu"; tag = version; - hash = "sha256-VWnujpPzlGcHGosqjtBLATR2+SFKRjXPqQMY3R5tRlc="; + hash = "sha256-DqXekG5WyXuEwn4lmsTBzRxlGBHGWFXOh3Mg/u9O7X8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index bffe28479845..b0aa72f92149 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.3.6"; + version = "0.3.7"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-uSmogOsUoPSsihuS1BtNZVrFa706GKaepgXwTNoKqn8="; + hash = "sha256-S5Uiu5Boz0674pEE+Mbt/xvD6UAwHVHQHeAwJ8SyVWc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix index a017f9320c59..feb82d14628f 100644 --- a/pkgs/development/python-modules/pymc/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -18,18 +18,20 @@ scipy, threadpoolctl, typing-extensions, + + writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "pymc"; - version = "5.26.1"; + version = "5.27.0"; pyproject = true; src = fetchFromGitHub { owner = "pymc-devs"; repo = "pymc"; tag = "v${version}"; - hash = "sha256-j1v8MzAFfOmkN7pDcF91dS5Xprls8qfTQHWdaFUO4GU="; + hash = "sha256-wBeWydrHrF+wNZnqWa2k8tCaUvjcoiSrmY85LUhrQds="; }; build-system = [ @@ -50,6 +52,13 @@ buildPythonPackage rec { typing-extensions ]; + nativeBuildInputs = [ + # Arviz (imported by pymc) wants to write a stamp file to the homedir at import time. + # Without $HOME being writable, `pythonImportsCheck` fails. + # https://github.com/arviz-devs/arviz/commit/4db612908f588d89bb5bfb6b83a08ada3d54fd02 + writableTmpDirAsHomeHook + ]; + # The test suite is computationally intensive and test failures are not # indicative for package usability hence tests are disabled by default. doCheck = false; diff --git a/pkgs/development/python-modules/pypdfium2/default.nix b/pkgs/development/python-modules/pypdfium2/default.nix index cab24eaee3ab..4d3684d3e025 100644 --- a/pkgs/development/python-modules/pypdfium2/default.nix +++ b/pkgs/development/python-modules/pypdfium2/default.nix @@ -36,14 +36,14 @@ let in buildPythonPackage rec { pname = "pypdfium2"; - version = "5.1.0"; + version = "5.2.0"; pyproject = true; src = fetchFromGitHub { owner = "pypdfium2-team"; repo = "pypdfium2"; tag = version; - hash = "sha256-u/bmvik6HRrSksO5QKRAqTr5r/qBPNFlooIZxWNoA+Y="; + hash = "sha256-A/NNyEmGXk21r5eXOYqIx6LXceOKnj2jUQFhUJbl7nU="; }; build-system = [ diff --git a/pkgs/development/python-modules/pysenz/default.nix b/pkgs/development/python-modules/pysenz/default.nix new file mode 100644 index 000000000000..7b6729592a3a --- /dev/null +++ b/pkgs/development/python-modules/pysenz/default.nix @@ -0,0 +1,41 @@ +{ + authlib, + buildPythonPackage, + fetchFromGitHub, + httpx, + lib, + setuptools, +}: + +buildPythonPackage rec { + pname = "pysenz"; + version = "1.0.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "nordicopen"; + repo = "pysenz"; + tag = "v${version}"; + hash = "sha256-gS9dsGQ8waOlUbHWHiJbQrvh4RdFb4SNEH4J4TbT2x8="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + authlib + httpx + ]; + + pythonImportsCheck = [ "pysenz" ]; + + # upstream has no tests + doCheck = false; + + meta = { + changelog = "https://github.com/nordicopen/pysenz/releases/tag/${src.tag}"; + description = "Async Typed Python package for the Chemelex (nVent) RAYCHEM SENZ RestAPI"; + homepage = "https://github.com/nordicopen/pysenz"; + license = lib.licenses.lgpl3Plus; + maintainers = [ lib.maintainers.dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix index 8c10e0ec811f..923b148212f9 100644 --- a/pkgs/development/python-modules/pytensor/default.nix +++ b/pkgs/development/python-modules/pytensor/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch, # build-system setuptools, @@ -33,7 +34,7 @@ buildPythonPackage rec { pname = "pytensor"; - version = "2.36.0"; + version = "2.36.1"; pyproject = true; src = fetchFromGitHub { @@ -43,9 +44,18 @@ buildPythonPackage rec { postFetch = '' sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${src.tag})"/' $out/pytensor/_version.py ''; - hash = "sha256-tzwiPp0+xNKmndTn9Y1AXiqscQWaCC8gKgQHEtkyGag="; + hash = "sha256-rXLtrkuwmEe5+64Aao490VqD96LJ37/mxekWOzWRMlw="; }; + patches = [ + # https://github.com/pymc-devs/pytensor/pull/1805 + (fetchpatch { + name = "fix-test-tri-nonconcrete-jax-compatibility.patch"; + url = "https://github.com/pymc-devs/pytensor/commit/86310f074267e24d1b3b99ecf3d9cc0b593b170d.patch"; + hash = "sha256-KRywJLixmdDJ1GGYsd5Twjiwgce0ZFxUidhTgM6Obmg="; + }) + ]; + build-system = [ setuptools cython @@ -160,7 +170,6 @@ buildPythonPackage rec { # Don't run the most compute-intense tests "tests/scan/" "tests/tensor/" - "tests/sparse/sandbox/" ]; passthru.updateScript = nix-update-script { diff --git a/pkgs/development/python-modules/python-arango/default.nix b/pkgs/development/python-modules/python-arango/default.nix index 4762e862fdb3..7ff598a4aedf 100644 --- a/pkgs/development/python-modules/python-arango/default.nix +++ b/pkgs/development/python-modules/python-arango/default.nix @@ -32,7 +32,7 @@ in buildPythonPackage rec { pname = "python-arango"; - version = "8.2.4"; + version = "8.2.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "arangodb"; repo = "python-arango"; tag = version; - hash = "sha256-xkUUpkkRBIcEjE4mETEtADL8rGUcf4n3cSxqaykF3v8="; + hash = "sha256-WzoQ3pwFDbPoXjHPdX03S9MAnNJTwe6MqXhq0g/pAs0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-crfsuite/default.nix b/pkgs/development/python-modules/python-crfsuite/default.nix index 5c062e50f607..6a7624d74835 100644 --- a/pkgs/development/python-modules/python-crfsuite/default.nix +++ b/pkgs/development/python-modules/python-crfsuite/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "python-crfsuite"; - version = "0.9.11"; + version = "0.9.12"; format = "setuptools"; src = fetchPypi { inherit version; pname = "python_crfsuite"; - hash = "sha256-bv+WXKcFZzltgiyaNep0sPftsn2UcVJJl72r56baX1o="; + hash = "sha256-2zf8zDvY8MScKKdpfKecidZ7P9W/EZEihmFpJArExIA="; }; preCheck = '' @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = { description = "Python binding for CRFsuite"; homepage = "https://github.com/scrapinghub/python-crfsuite"; + changelog = "https://github.com/scrapinghub/python-crfsuite/blob/${version}/CHANGES.rst"; license = lib.licenses.mit; teams = [ lib.teams.tts ]; }; diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index 8747c3758aa9..f03b4ac35538 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "3.19.0"; + version = "4.1.1"; pyproject = true; src = fetchFromGitHub { owner = "Python-roborock"; repo = "python-roborock"; tag = "v${version}"; - hash = "sha256-nCewSP0ZgQvjZ4Ie4/kTzxxmJ5Zsm5i3EuW4ZiDBPMg="; + hash = "sha256-Wf9nJDcNOLIuIskiDyGYo4TwekQprW4o99oJLkaV5X4="; }; pythonRelaxDeps = [ "pycryptodome" ]; diff --git a/pkgs/development/python-modules/reflex-hosting-cli/default.nix b/pkgs/development/python-modules/reflex-hosting-cli/default.nix index 7b50d2e066df..4dbda2be21c5 100644 --- a/pkgs/development/python-modules/reflex-hosting-cli/default.nix +++ b/pkgs/development/python-modules/reflex-hosting-cli/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "reflex-hosting-cli"; - version = "0.1.59"; + version = "0.1.61"; pyproject = true; # source is not published https://github.com/reflex-dev/reflex/issues/3762 src = fetchPypi { pname = "reflex_hosting_cli"; inherit version; - hash = "sha256-CEnpKYcQBKWpEe4yVaHfirnLuE2QdyyzN0mqNZ/cOLM="; + hash = "sha256-BkUglRVZ5zgnd7sovAO5XgQY/ZfA9pdRovAJIEU7gtg="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/session-info2/default.nix b/pkgs/development/python-modules/session-info2/default.nix index 6848cb42f96d..56dd489677ad 100644 --- a/pkgs/development/python-modules/session-info2/default.nix +++ b/pkgs/development/python-modules/session-info2/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "session-info2"; - version = "0.2.3"; + version = "0.3"; pyproject = true; src = fetchFromGitHub { owner = "scverse"; repo = "session-info2"; tag = "v${version}"; - hash = "sha256-fw5FG22MzxPibC9GrWZsRLnhMcuo/eBPNRggvkkz8ms="; + hash = "sha256-Li7Ik7AnWiG742x01m49iEYuOBg0FFx8amv/7KTe9gE="; }; build-system = [ diff --git a/pkgs/development/python-modules/stringzilla/default.nix b/pkgs/development/python-modules/stringzilla/default.nix index beb78ac69520..3d7c74681fea 100644 --- a/pkgs/development/python-modules/stringzilla/default.nix +++ b/pkgs/development/python-modules/stringzilla/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "stringzilla"; - version = "4.5.1"; + version = "4.6.0"; pyproject = true; src = fetchFromGitHub { owner = "ashvardanian"; repo = "stringzilla"; tag = "v${version}"; - hash = "sha256-0T8hQ+P6gZnIX52jkRcpF1Ofxy45+B7K/feEQr5Phf0="; + hash = "sha256-5WAD5ZpzhdIDv1kUVinc5z91N/tQVScO75kOPC1WWlY="; }; build-system = [ diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index 9e23f1c0e5a2..755a7bee60c7 100644 --- a/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -78,10 +78,12 @@ let bazel = bazel; bazelTargets = [ ":pip_pkg" ]; + bazelFlags = [ "--noenable_bzlmod" ]; + removeRulesCC = false; LIBTOOL = lib.optionalString stdenv.hostPlatform.isDarwin "${cctools}/bin/libtool"; fetchAttrs = { - sha256 = "sha256-TbWcWYidyXuAMgBnO2/k0NKCzc4wThf2uUeC3QxdBJY="; + sha256 = "sha256-7sPdIHWNFn13eaUanFgN988hFAwGnlU6cxmHOJUDpiQ="; }; buildAttrs = { @@ -146,7 +148,5 @@ buildPythonPackage { changelog = "https://github.com/tensorflow/probability/releases/tag/v${version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ GaetanLepage ]; - # Needs update for Bazel 7. - broken = true; }; } diff --git a/pkgs/development/python-modules/textual-speedups/default.nix b/pkgs/development/python-modules/textual-speedups/default.nix new file mode 100644 index 000000000000..83ace2e8fe7a --- /dev/null +++ b/pkgs/development/python-modules/textual-speedups/default.nix @@ -0,0 +1,43 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + rustPlatform, +}: + +buildPythonPackage rec { + pname = "textual-speedups"; + version = "0.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "willmcgugan"; + repo = "textual-speedups"; + tag = "v${version}"; + hash = "sha256-zsDA8qPpeiOlmL18p4pItEgXQjgrQEBVRJazrGJT9Bw="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit pname version src; + hash = "sha256-Bz4ocEziOlOX4z5F9EDry99YofeGyxL/6OTIf/WEgK4="; + }; + + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + ]; + + pythonImportsCheck = [ "textual_speedups" ]; + + # No tests + doCheck = false; + + meta = { + description = "Optional Rust speedups for Textual"; + homepage = "https://github.com/willmcgugan/textual-speedups"; + # No license (yet?) + # https://github.com/willmcgugan/textual-speedups/issues/2 + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/translate-toolkit/default.nix b/pkgs/development/python-modules/translate-toolkit/default.nix index 75feebacc1b6..3031c3843208 100644 --- a/pkgs/development/python-modules/translate-toolkit/default.nix +++ b/pkgs/development/python-modules/translate-toolkit/default.nix @@ -7,7 +7,9 @@ setuptools-scm, # dependencies - cwcwidth, + unicode-segmentation-rs, + urllib3, + tomlkit, lxml, # tests @@ -28,7 +30,7 @@ buildPythonPackage rec { pname = "translate-toolkit"; - version = "3.16.1"; + version = "3.17.5"; pyproject = true; @@ -36,16 +38,21 @@ buildPythonPackage rec { owner = "translate"; repo = "translate"; tag = version; - hash = "sha256-AEMqnTnnbqNsVQY0eE2ATn2NbV9jVPtfCo3Lve7MEmg="; + hash = "sha256-I0HpVL/bH78oFGDWkXyRvZejXzjDHXFfdPu/+iMgAQw="; }; build-system = [ setuptools-scm ]; dependencies = [ - cwcwidth + unicode-segmentation-rs + urllib3 lxml ]; + optional-dependencies = { + toml = [ tomlkit ]; + }; + nativeCheckInputs = [ aeidon charset-normalizer @@ -59,6 +66,7 @@ buildPythonPackage rec { pytestCheckHook ruamel-yaml syrupy + tomlkit vobject ]; diff --git a/pkgs/development/python-modules/ua-parser-rs/default.nix b/pkgs/development/python-modules/ua-parser-rs/default.nix index a79e9c8c58f0..9f1d8b4ba7d9 100644 --- a/pkgs/development/python-modules/ua-parser-rs/default.nix +++ b/pkgs/development/python-modules/ua-parser-rs/default.nix @@ -10,20 +10,20 @@ buildPythonPackage rec { pname = "ua-parser-rs"; - version = "0.1.3"; + version = "0.1.4"; format = "setuptools"; src = fetchFromGitHub { owner = "ua-parser"; repo = "uap-rust"; tag = "ua-parser-rs-${version}"; - hash = "sha256-Tro3aPjqDN/9c3wBUDDafDpdYXhHEAHeP8NwoU9a4u0="; + hash = "sha256-8IU4NNW0v2zl6COtL6o7FALxqYNVKBGhERugxpXIN5g="; fetchSubmodules = true; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-NZpMW8cFXXpkSP8jMcXMiDyfyIuhR5C0TUzBsJVkOEE="; + hash = "sha256-PNkyd9/0DdIqEmXbnw3dZs5ajWSo0rLhjJwRu3H06Cc="; }; buildAndTestSubdir = "ua-parser-py"; diff --git a/pkgs/development/python-modules/unicode-segmentation-rs/Cargo.lock b/pkgs/development/python-modules/unicode-segmentation-rs/Cargo.lock new file mode 100644 index 000000000000..49dd1e60262e --- /dev/null +++ b/pkgs/development/python-modules/unicode-segmentation-rs/Cargo.lock @@ -0,0 +1,218 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "autocfg" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" + +[[package]] +name = "cc" +version = "1.2.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a0aeaff4ff1a90589618835a598e545176939b97874f7abc7851caa0618f203" +dependencies = [ + "find-msvc-tools", + "shlex", +] + +[[package]] +name = "find-msvc-tools" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645cbb3a84e60b7531617d5ae4e57f7e27308f6445f5abf653209ea76dec8dff" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "indoc" +version = "2.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706" +dependencies = [ + "rustversion", +] + +[[package]] +name = "libc" +version = "0.2.178" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091" + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "once_cell" +version = "1.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + +[[package]] +name = "portable-atomic" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f59e70c4aef1e55797c2e8fd94a4f2a973fc972cfde0e0b05f683667b0cd39dd" + +[[package]] +name = "proc-macro2" +version = "1.0.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "pyo3" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab53c047fcd1a1d2a8820fe84f05d6be69e9526be40cb03b73f86b6b03e6d87d" +dependencies = [ + "indoc", + "libc", + "memoffset", + "once_cell", + "portable-atomic", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b455933107de8642b4487ed26d912c2d899dec6114884214a0b3bb3be9261ea6" +dependencies = [ + "python3-dll-a", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c85c9cbfaddf651b1221594209aed57e9e5cff63c4d11d1feead529b872a089" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-macros" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a5b10c9bf9888125d917fb4d2ca2d25c8df94c7ab5a52e13313a07e050a3b02" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03b51720d314836e53327f5871d4c0cfb4fb37cc2c4a11cc71907a86342c40f9" +dependencies = [ + "heck", + "proc-macro2", + "pyo3-build-config", + "quote", + "syn", +] + +[[package]] +name = "python3-dll-a" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d381ef313ae70b4da5f95f8a4de773c6aa5cd28f73adec4b4a31df70b66780d8" +dependencies = [ + "cc", +] + +[[package]] +name = "quote" +version = "1.0.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rustversion" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "syn" +version = "2.0.111" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "target-lexicon" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1dd07eb858a2067e2f3c7155d54e929265c264e6f37efe3ee7a8d1b5a1dd0ba" + +[[package]] +name = "unicode-ident" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" + +[[package]] +name = "unicode-segmentation" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + +[[package]] +name = "unicode-segmentation-rs" +version = "0.2.1" +dependencies = [ + "pyo3", + "unicode-segmentation", + "unicode-width", +] + +[[package]] +name = "unicode-width" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" + +[[package]] +name = "unindent" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3" diff --git a/pkgs/development/python-modules/unicode-segmentation-rs/default.nix b/pkgs/development/python-modules/unicode-segmentation-rs/default.nix new file mode 100644 index 000000000000..5e1d24790253 --- /dev/null +++ b/pkgs/development/python-modules/unicode-segmentation-rs/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + rustPlatform, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "unicode-segmentation-rs"; + version = "0.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "WeblateOrg"; + repo = "unicode-segmentation-rs"; + tag = "v${version}"; + hash = "sha256-PquKaJlo7h8TOR4iq2GrV/oz1NXmalhFR59Duvk4yoU="; + }; + + postPatch = '' + ln -s '${./Cargo.lock}' Cargo.lock + ''; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + }; + + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "unicode_segmentation_rs" ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--generate-lockfile" + ]; + }; + + meta = { + description = "Python bindings for the Rust unicode-segmentation and unicode-width crates"; + homepage = "https://github.com/WeblateOrg/unicode-segmentation-rs/"; + changelog = "https://github.com/WeblateOrg/unicode-segmentation-rs/releases/tag/${src.tag}"; + license = [ lib.licenses.mit ]; + maintainers = with lib.maintainers; [ erictapen ]; + }; +} diff --git a/pkgs/development/python-modules/vllm/0005-drop-intel-reqs.patch b/pkgs/development/python-modules/vllm/0005-drop-intel-reqs.patch index de5c9e8f0660..d6cee1f184b9 100644 --- a/pkgs/development/python-modules/vllm/0005-drop-intel-reqs.patch +++ b/pkgs/development/python-modules/vllm/0005-drop-intel-reqs.patch @@ -1,14 +1,13 @@ diff --git a/requirements/cpu.txt b/requirements/cpu.txt -index d11787df4..71575d707 100644 +index 21571be47..e91b378e2 100644 --- a/requirements/cpu.txt +++ b/requirements/cpu.txt -@@ -20,9 +20,6 @@ torchvision; platform_machine != "ppc64le" and platform_machine != "s390x" - torchvision==0.23.0; platform_machine == "ppc64le" - datasets # for benchmark scripts +@@ -14,8 +14,5 @@ torchaudio; platform_machine != "s390x" + # required for the image processor of phi3v, this must be updated alongside torch + torchvision; platform_machine != "s390x" -# Intel Extension for PyTorch, only for x86_64 CPUs -intel-openmp==2024.2.1; platform_machine == "x86_64" --intel_extension_for_pytorch==2.8.0; platform_machine == "x86_64" - triton==3.2.0; platform_machine == "x86_64" # Triton is required for torch 2.6+cpu, as it is imported in torch.compile. - +- # Use this to gather CPU info and optimize based on ARM Neoverse cores + py-cpuinfo; platform_machine == "aarch64" diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix index 5097a3202cbf..22211f4d38bd 100644 --- a/pkgs/development/python-modules/vllm/default.nix +++ b/pkgs/development/python-modules/vllm/default.nix @@ -8,7 +8,7 @@ symlinkJoin, autoAddDriverRunpath, - # build system + # build-system cmake, jinja2, ninja, @@ -52,6 +52,8 @@ importlib-metadata, partial-json-parser, compressed-tensors, + mcp, + ijson, mistral-common, msgspec, model-hosting-container-standards, @@ -154,6 +156,15 @@ let ''; }; + # grep for DEFAULT_TRITON_KERNELS_TAG in the following file + # https://github.com/vllm-project/vllm/blob/v${version}/cmake/external_projects/triton_kernels.cmake + triton-kernels = fetchFromGitHub { + owner = "triton-lang"; + repo = "triton"; + tag = "v3.5.0"; + hash = "sha256-F6T0n37Lbs+B7UHNYzoIQHjNNv3TcMtoXjNrT8ZUlxY="; + }; + # grep for GIT_TAG in the following file # https://github.com/vllm-project/vllm/blob/v${version}/cmake/external_projects/qutlass.cmake qutlass = fetchFromGitHub { @@ -175,8 +186,8 @@ let name = "flash-attention-source"; owner = "vllm-project"; repo = "flash-attention"; - rev = "58e0626a692f09241182582659e3bf8f16472659"; - hash = "sha256-ewdZd7LuBKBV0y3AaGRWISJzjg6cu59D2OtgqoDjrbM="; + rev = "86f8f157cf82aa2342743752b97788922dd7de43"; + hash = "sha256-+h43jMte/29kraNtPiloSQFfCay4W3NNIlzvs47ygyM="; }; patches = [ @@ -304,7 +315,7 @@ in buildPythonPackage rec { pname = "vllm"; - version = "0.11.2"; + version = "0.13.0"; pyproject = true; stdenv = torch.stdenv; @@ -313,7 +324,7 @@ buildPythonPackage rec { owner = "vllm-project"; repo = "vllm"; tag = "v${version}"; - hash = "sha256-DoSlkFmR3KKEtfSfdRB++0CZeeXgxmM3zZjONlxbe8U="; + hash = "sha256-pI9vQBhjRPlKOjZp6kH+n8Y0Q4t9wLYM7SnLftSfYgs="; }; patches = [ @@ -345,10 +356,6 @@ buildPythonPackage rec { --replace-fail \ 'set(PYTHON_SUPPORTED_VERSIONS' \ 'set(PYTHON_SUPPORTED_VERSIONS "${lib.versions.majorMinor python.version}"' - - # Pass build environment PYTHONPATH to vLLM's Python configuration scripts - substituteInPlace CMakeLists.txt \ - --replace-fail '$PYTHONPATH' '$ENV{PYTHONPATH}' ''; nativeBuildInputs = [ @@ -412,8 +419,10 @@ buildPythonPackage rec { cbor2 depyf fastapi + ijson llguidance lm-format-enforcer + mcp numpy openai opencv-python-headless @@ -500,6 +509,7 @@ buildPythonPackage rec { lib.optionalAttrs cudaSupport { VLLM_TARGET_DEVICE = "cuda"; CUDA_HOME = "${lib.getDev cudaPackages.cuda_nvcc}"; + TRITON_KERNELS_SRC_DIR = "${lib.getDev triton-kernels}/python/triton_kernels/triton_kernels"; } // lib.optionalAttrs rocmSupport { VLLM_TARGET_DEVICE = "rocm"; diff --git a/pkgs/development/python-modules/whenever/default.nix b/pkgs/development/python-modules/whenever/default.nix index 94f15e9026f4..82415b1fe1d7 100644 --- a/pkgs/development/python-modules/whenever/default.nix +++ b/pkgs/development/python-modules/whenever/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "whenever"; - version = "0.8.8"; + version = "0.9.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,12 +29,12 @@ buildPythonPackage rec { owner = "ariebovenberg"; repo = "whenever"; tag = version; - hash = "sha256-i9zUf0oRcG4993Q0kkfndfcEe+mLYFcqrIlg7idKDGY="; + hash = "sha256-b4xxh2Pva5+Qwv5DyifJohEY73wOO/eFc1dJeQSN3QY="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-j4sxIcJa406HCDkTJCSU8H+yo2Jth1p8+CaNWlUaIUs="; + hash = "sha256-2VXS6SQjYx61D8b42TjS5OJxcg4+e+T6dEsZfRA/gRk="; }; build-system = [ diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix index 6ac7981e1660..fc855ca615c1 100644 --- a/pkgs/development/python-modules/xdot/default.nix +++ b/pkgs/development/python-modules/xdot/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "xdot"; - version = "1.4"; + version = "1.6"; pyproject = true; src = fetchFromGitHub { owner = "jrfonseca"; repo = "xdot.py"; rev = version; - hash = "sha256-fkO1bINRkCCzVRrQg9+vIODbN+bpXq2OHBKkzzZUZNA="; + hash = "sha256-eOuD8q7qN2MAFklIy28lfR0nEMsKDqVO+HE3+M0k5T0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix index 277f9be89d16..8929ff08c0a9 100644 --- a/pkgs/development/tools/build-managers/gnumake/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/default.nix @@ -9,7 +9,6 @@ inBootstrap ? false, pkg-config, gnumake, - directoryListingUpdater, }: let @@ -53,15 +52,9 @@ stdenv.mkDerivation (finalAttrs: { ]; separateDebugInfo = true; - passthru = { - tests = { - # make sure that the override doesn't break bootstrapping - gnumakeWithGuile = gnumake.override { guileSupport = true; }; - }; - updateScript = directoryListingUpdater { - inherit (finalAttrs) pname version; - url = "https://ftp.gnu.org/gnu/make/"; - }; + passthru.tests = { + # make sure that the override doesn't break bootstrapping + gnumakeWithGuile = gnumake.override { guileSupport = true; }; }; meta = { diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 94b03f739605..fa79a63a08a7 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2025.12.4"; + version = "2025.12.5"; components = { "3_day_blinds" = ps: with ps; [ @@ -5431,7 +5431,7 @@ ]; "senz" = ps: with ps; [ - aiosenz + pysenz ]; "serial" = ps: with ps; [ diff --git a/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix b/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix index ac1e54eb8ba3..67a8fcfd161c 100644 --- a/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix +++ b/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "magico13"; domain = "emporia_vue"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "magico13"; repo = "ha-emporia-vue"; rev = "v${version}"; - hash = "sha256-p8rBO+Z64n87NE7BXNSsTT5IA7ba5RzCZjqX05LqD0A="; + hash = "sha256-IONV3jmCyVW2lXjenIicNRaJTsAyzRZ5OVmampqFD7A="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index b45659b0a0d4..a7972e6e6d9a 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -291,7 +291,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2025.12.4"; + hassVersion = "2025.12.5"; in python.pkgs.buildPythonApplication rec { @@ -312,13 +312,13 @@ python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; tag = version; - hash = "sha256-VT9JdpzPKdOJ8Q//SUDMUgTa46k6v7Mi74Yl9mEPF/I="; + hash = "sha256-RSrWk7SZIOvOhvVXBwc10w9Yyqd2rcxdUVuq2snMm9g="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-wVe5/syj878B3o7QWgQ2wOEsbdyvFWD/VMgpok1SwOQ="; + hash = "sha256-cl5kTpYhsZnf7etPRSgVWd/fH9zTc1OnkRTjbUp/M3U="; }; build-system = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index c295e971c0af..15be7a421cc9 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2025.12.4"; + version = "2025.12.5"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; tag = version; - hash = "sha256-0KJcrp0/PtOE73DeXr6XEm6oGkE2FamncR9o3Au1QUM="; + hash = "sha256-c2Vr5S7WxaT0q4/Zc3yJmSU4ErhogCBKOISj1WVXflY="; }; build-system = [ diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 392d8f233b9a..6e3775e63816 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.24.420"; + version = "0.24.532"; src = fetchFromGitHub { owner = "jackett"; repo = "jackett"; tag = "v${version}"; - hash = "sha256-mmwKrcAiLVNcYyo/IdaroDsbdypoyGBYkOjIAy5ua7o="; + hash = "sha256-9dLBQOAyR2oyN1lGLPN/QLZtGLASRKUXUCLCdvqOmmE="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/pkgs/servers/jackett/deps.json b/pkgs/servers/jackett/deps.json index a2457973c10a..376ebb06cdd9 100644 --- a/pkgs/servers/jackett/deps.json +++ b/pkgs/servers/jackett/deps.json @@ -406,13 +406,13 @@ }, { "pname": "Polly", - "version": "8.6.4", - "hash": "sha256-Z+ZbhnHWMu55qgQkxvw3yMiMd+zIMzzQiFhvn/PeQ3I=" + "version": "8.6.5", + "hash": "sha256-2YRacrP3b3C6EBCb5Pjg6fQdGj+SgbTeaWHN/oZ1d8s=" }, { "pname": "Polly.Core", - "version": "8.6.4", - "hash": "sha256-4Xrg/H481Y/WOHk1sGvFNEOfgaGrdKi+4U54PTXhh9I=" + "version": "8.6.5", + "hash": "sha256-m12obNfMZdWQWJoCaF03H5qEbFDdp9FSdHTHcIIsACQ=" }, { "pname": "runtime.any.System.Collections", diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix index e7871a6b219c..72724ac7d65b 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "grafana-metricsdrilldown-app"; - version = "1.0.25"; - zipHash = "sha256-qN4o0u9Lh/jLjQEcdWp/pOwfz+jqss8esukGeI1y3Ps="; + version = "1.0.26"; + zipHash = "sha256-XLcsIH8gxWYRlPUy9WGwsxQClj13Ct/xHLh2pseJYB0="; meta = { description = "Queryless experience for browsing Prometheus-compatible metrics. Quickly find related metrics without writing PromQL queries"; license = lib.licenses.agpl3Only; diff --git a/pkgs/servers/monitoring/prometheus/nut-exporter.nix b/pkgs/servers/monitoring/prometheus/nut-exporter.nix index c6bf38b08d80..e045d6e24d59 100644 --- a/pkgs/servers/monitoring/prometheus/nut-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nut-exporter.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "nut-exporter"; - version = "3.2.2"; + version = "3.2.3"; src = fetchFromGitHub { owner = "DRuggeri"; repo = "nut_exporter"; rev = "v${version}"; - sha256 = "sha256-p1IUJOSY7dXAzSPBpKvDKvy4etM3q3oI5OXg6l+3KLw="; + sha256 = "sha256-tgYxkVen2aegX+py9goQIQtw1eNZJ7K8CqgaKOsDgxA="; }; vendorHash = "sha256-cMZ4GSal03LIZi7ESr/sQx8zLHNepOTZGEEsdvsNhec="; diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 1c111dbbcd7f..f8a9d9bc2acb 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,18 +1,18 @@ generic: { v74 = generic { - version = "7.4.5"; - hash = "sha256-Pq5LxxL1MLLfZiTLoDziPimyoRrvrAttTCemTUJf38g="; + version = "7.4.6"; + hash = "sha256-zMGw1psEFzsOeu7KlHi7b11JmccdTtUPgXNRvwEaaYs="; }; v72 = generic { - version = "7.2.14"; - hash = "sha256-KgXP+c5x0R+dFBtPAJSirJVWmsy1awGWMfyEdQrqCVA="; + version = "7.2.15"; + hash = "sha256-twEwY7nGJWoYX25gAe/31DuDGxg6o5Ez1u5STQVw6Fw="; }; v70 = generic { - version = "7.0.21"; - hash = "sha256-p/gsFhC8AuSsQvUlfAJl+S4ytR+14EtK0p9y6XGJ0+8="; + version = "7.0.22"; + hash = "sha256-enR5SyEkYH2ANr42zBBNoFai+2U4EchKy+KfP22Xhgo="; }; v60 = generic { - version = "6.0.42"; - hash = "sha256-Ale517dbuqzjmBMYqJlAtY01F9Bd+W7spegjTHyTJWA="; + version = "6.0.43"; + hash = "sha256-FsRgW9sd1AYIIUjyz+eM8zV6uJuDdpVS4xfw+MB+HpY="; }; } diff --git a/pkgs/servers/web-apps/freshrss/extensions/default.nix b/pkgs/servers/web-apps/freshrss/extensions/default.nix index fc8176049fb8..8b3d2831e471 100644 --- a/pkgs/servers/web-apps/freshrss/extensions/default.nix +++ b/pkgs/servers/web-apps/freshrss/extensions/default.nix @@ -9,12 +9,12 @@ let buildFreshRssExtension = (callPackage ./freshrss-utils.nix { }).buildFreshRssExtension; - official_extensions_version = "unstable-2024-04-27"; + official_extensions_version = "unstable-2025-12-26"; official_extensions_src = fetchFromGitHub { owner = "FreshRSS"; repo = "Extensions"; - rev = "71de129744ba37fd4cf363b78445f5345bc6d0b7"; - hash = "sha256-A+hOjbGNfhwTOAMeo08MUdqfWxxetzLz865oQQDsQlg="; + rev = "42c32bfd9af2d816933cf310e24d25888a8e167d"; + hash = "sha256-El488QK3xWQM01GsuyBizud6VghXsRDqiOblnMfjVxE="; }; baseExtensions = @@ -107,6 +107,20 @@ let }; }; + unsafe-auto-login = buildFreshRssExtension { + FreshRssExtUniqueId = "UnsafeAutologin"; + pname = "unsafe-auto-login"; + version = official_extensions_version; + src = official_extensions_src; + sourceRoot = "${official_extensions_src.name}/xExtension-UnsafeAutologin"; + meta = { + description = "FreshRSS extension to bring back unsafe autologin functionality."; + homepage = "https://github.com/FreshRSS/Extensions/tree/master/xExtension-UnsafeAutologin"; + license = lib.licenses.agpl3Only; + maintainers = [ lib.maintainers.stunkymonkey ]; + }; + }; + youtube = buildFreshRssExtension { FreshRssExtUniqueId = "YouTube"; pname = "youtube"; diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index e424c911dfff..0bd5a47cd29b 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -5,7 +5,6 @@ makeShellWrapper, updateAutotoolsGnuConfigScriptsHook, runtimeShellPackage, - directoryListingUpdater, }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -61,13 +60,6 @@ stdenv.mkDerivation (finalAttrs: { --add-flags "\''${GZIP_NO_TIMESTAMPS:+-n}" ''; - passthru = { - updateScript = directoryListingUpdater { - inherit (finalAttrs) pname version; - url = "https://ftp.gnu.org/gnu/gzip/"; - }; - }; - meta = { homepage = "https://www.gnu.org/software/gzip/"; description = "GNU zip compression program"; diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index a93cb12a5e16..083c38138fdc 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -4,7 +4,6 @@ fetchurl, updateAutotoolsGnuConfigScriptsHook, coreutils, - directoryListingUpdater, }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -76,11 +75,6 @@ stdenv.mkDerivation (finalAttrs: { # or you can check libc/include/sys/cdefs.h in bionic source code hardeningDisable = lib.optional (stdenv.hostPlatform.libc == "bionic") "fortify"; - passthru.updateScript = directoryListingUpdater { - inherit (finalAttrs) pname version; - url = "https://ftp.gnu.org/gnu/findutils/"; - }; - meta = { homepage = "https://www.gnu.org/software/findutils/"; description = "GNU Find Utilities, the basic directory searching utilities of the GNU operating system"; diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix index ebf4a6fd6b09..e2dfa1650ce2 100644 --- a/pkgs/tools/package-management/lix/default.nix +++ b/pkgs/tools/package-management/lix/default.nix @@ -17,6 +17,7 @@ ncurses, clangStdenv, nixpkgs-review, + nixpkgs-reviewFull, nix-direnv, nix-fast-build, haskell, @@ -107,6 +108,14 @@ let nix = self.lix; }; + # surprisingly nixpkgs-reviewFull.override { nix = self.lix; } + # doesn't work, as the way nix-reviewFull is defined uses callPackage + # which does it's own makeOverridable and hides the .override + # from the derivation. + nixpkgs-reviewFull = nixpkgs-reviewFull.override { + nixpkgs-review = self.nixpkgs-review; + }; + nix-direnv = nix-direnv.override { nix = self.lix; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7cd3d4b5c16c..6d3932081892 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2719,6 +2719,8 @@ with pkgs; google-compute-engine = with python3.pkgs; toPythonApplication google-compute-engine; + gparted-full = gparted.override { withAllTools = true; }; + gdown = with python3Packages; toPythonApplication gdown; gpt4all-cuda = gpt4all.override { @@ -12606,8 +12608,6 @@ with pkgs; ddnet-server = ddnet.override { buildClient = false; }; - duckmarines = callPackage ../games/duckmarines { love = love_0_10; }; - dwarf-fortress-packages = recurseIntoAttrs (callPackage ../games/dwarf-fortress { }); inherit (dwarf-fortress-packages) dwarf-fortress dwarf-fortress-full dwarf-therapist; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index bb2248b269bd..115d8a75b70c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -178,6 +178,14 @@ in inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; inherit buildTargetLlvmPackages llvmPackages; }; + ghc9123 = callPackage ../development/compilers/ghc/9.12.3.nix { + bootPkgs = + # No suitable bindist packaged yet + bb.packages.ghc9103; + inherit (buildPackages.python3Packages) sphinx; + inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; + inherit buildTargetLlvmPackages llvmPackages; + }; ghc912 = compiler.ghc9122; ghc9141 = callPackage ../development/compilers/ghc/9.14.1.nix { bootPkgs = @@ -190,15 +198,8 @@ in ghc914 = compiler.ghc9141; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { bootPkgs = - if - stdenv.buildPlatform.isPower64 - && stdenv.buildPlatform.isBigEndian - && pkgs.stdenv.hostPlatform.isAbiElfv1 - then - # No bindist, using older source-built GHC - bb.packages.ghc910 - else - bb.packages.ghc984Binary; + # No suitable bindist packaged yet + bb.packages.ghc910; inherit (buildPackages.python3Packages) sphinx; inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; inherit buildTargetLlvmPackages llvmPackages; @@ -289,6 +290,11 @@ in ghc = bh.compiler.ghc9122; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.12.x.nix { }; }; + ghc9123 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc9123; + ghc = bh.compiler.ghc9123; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.12.x.nix { }; + }; ghc912 = packages.ghc9122; ghc9141 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc9141; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 61d5ed7e05ee..5488c550455b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -39171,10 +39171,10 @@ with self; YAMLSyck = buildPerlPackage { pname = "YAML-Syck"; - version = "1.34"; + version = "1.36"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.34.tar.gz"; - hash = "sha256-zJFWzK69p5jr/i8xthnoBld/hg7RcEJi8X/608bjQVk="; + url = "mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.36.tar.gz"; + hash = "sha256-Tc2dmzsM48ZaL/K5tMb/+LZJ/fJDv9fhiJVDvs25GlI="; }; meta = { description = "Fast, lightweight YAML loader and dumper"; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 5a2781659262..bd805eef0f1b 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -447,16 +447,6 @@ lib.makeScope pkgs.newScope ( configureFlags = [ "--enable-dom" ]; - patches = lib.optionals (lib.versionOlder php.version "8.3") [ - # Fix gh10234 test with libxml 2.15.0 - (fetchpatch { - url = "https://github.com/php/php-src/commit/d6e70e705323a50b616ffee9402245ab97de3e4e.patch"; - hash = "sha256-Axu09l3uQ83qe30aDsR+Bt29cJiF4mLknwDyQf94vic="; - includes = [ - "ext/dom/tests/gh10234.phpt" - ]; - }) - ]; } { name = "enchant"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 3db7d70f6b3a..6d7646476f0c 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -58,6 +58,7 @@ mapAliases { # keep-sorted start case=no numeric=yes abodepy = throw "'abodepy' has been renamed to/replaced by 'jaraco-abode'"; # Converted to throw 2025-10-29 + aiosenz = throw "aiosenz was removed because Home Assistant switched to pysenz"; # added 2025-12-29 amazon-kclpy = throw "amazon-kclpy has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03 amazon_kclpy = throw "'amazon_kclpy' has been renamed to/replaced by 'amazon-kclpy'"; # Converted to throw 2025-10-29 amqplib = throw "amqplib has been removed as it was unmaintained upstream"; # Added 2025-11-22 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bb80bf8f6c39..ed39d0590b69 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -138,6 +138,8 @@ self: super: with self; { agate-sql = callPackage ../development/python-modules/agate-sql { }; + agent-client-protocol = callPackage ../development/python-modules/agent-client-protocol { }; + agent-py = callPackage ../development/python-modules/agent-py { }; aggdraw = callPackage ../development/python-modules/aggdraw { }; @@ -480,8 +482,6 @@ self: super: with self; { aiosendspin = callPackage ../development/python-modules/aiosendspin { }; - aiosenz = callPackage ../development/python-modules/aiosenz { }; - aioserial = callPackage ../development/python-modules/aioserial { }; aioshelly = callPackage ../development/python-modules/aioshelly { }; @@ -12947,6 +12947,8 @@ self: super: with self; { pyarrow-hotfix = callPackage ../development/python-modules/pyarrow-hotfix { }; + pyaskalono = callPackage ../development/python-modules/pyaskalono { }; + pyasn = callPackage ../development/python-modules/pyasn { }; pyasn1 = callPackage ../development/python-modules/pyasn1 { }; @@ -14542,6 +14544,8 @@ self: super: with self; { pysensors = callPackage ../development/python-modules/pysensors { }; + pysenz = callPackage ../development/python-modules/pysenz { }; + pysequoia = callPackage ../development/python-modules/pysequoia { }; pyserial = callPackage ../development/python-modules/pyserial { }; @@ -18784,6 +18788,8 @@ self: super: with self; { textual-slider = callPackage ../development/python-modules/textual-slider { }; + textual-speedups = callPackage ../development/python-modules/textual-speedups { }; + textual-textarea = callPackage ../development/python-modules/textual-textarea { }; textual-universal-directorytree = @@ -19981,6 +19987,8 @@ self: super: with self; { unicode-rbnf = callPackage ../development/python-modules/unicode-rbnf { }; + unicode-segmentation-rs = callPackage ../development/python-modules/unicode-segmentation-rs { }; + unicodecsv = callPackage ../development/python-modules/unicodecsv { }; unicodedata2 = callPackage ../development/python-modules/unicodedata2 { }; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 2d5103f4be94..4998871272b3 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -68,7 +68,8 @@ let ghc984 ghc9102 ghc9103 - ghc9122 + ghc9122 # TODO(@sternenseemann): drop + ghc9123 ]; # packagePlatforms applied to `haskell.packages.*` @@ -528,6 +529,7 @@ let Cabal_3_10_3_0 = lib.subtractLists [ # time < 1.13 conflicts with time == 1.14.* compilerNames.ghc9122 + compilerNames.ghc9123 ] released; Cabal_3_12_1_0 = released; Cabal_3_14_2_0 = released; @@ -541,6 +543,7 @@ let compilerNames.ghc9102 compilerNames.ghc9103 compilerNames.ghc9122 + compilerNames.ghc9123 ] released; hpack = released; hsdns = released; @@ -553,9 +556,11 @@ let ghc-lib-parser-ex = released; ghc-source-gen = lib.subtractLists [ compilerNames.ghc9122 + compilerNames.ghc9123 ] released; ghc-tags = lib.subtractLists [ compilerNames.ghc9122 + compilerNames.ghc9123 ] released; hashable = released; primitive = released; @@ -568,6 +573,7 @@ let compilerNames.ghc9102 compilerNames.ghc9103 compilerNames.ghc9122 + compilerNames.ghc9123 ] released; }) {